[boinc] 01/03: Imported Upstream version 7.5.0+dfsg

Gianfranco Costamagna locutusofborg-guest at moszumanska.debian.org
Wed Apr 8 12:04:10 UTC 2015


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

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

commit b9c537461b7da29661b42d0a9a23c4a434c91463
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Wed Apr 8 12:41:10 2015 +0200

    Imported Upstream version 7.5.0+dfsg
---
 .gitignore                                         |   121 +-
 .travis.yml                                        |    73 +
 Makefile.am                                        |    10 +-
 Makefile.incl                                      |     2 +-
 README.md                                          |     5 +
 _autosetup                                         |    12 +-
 android/BOINC/AndroidManifest.xml                  |     7 +-
 android/BOINC/res/values-ca/strings.xml            |   107 +-
 android/BOINC/res/values-cs/strings.xml            |   362 +-
 android/BOINC/res/values-da/strings.xml            |   181 +-
 android/BOINC/res/values-de/strings.xml            |   134 +-
 android/BOINC/res/values-en/strings.xml            |   360 +
 android/BOINC/res/values-fr/strings.xml            |   361 +-
 android/BOINC/res/values-it-rIT/strings.xml        |   100 +-
 android/BOINC/res/values-ja/strings.xml            |   361 +-
 android/BOINC/res/values-ko/strings.xml            |   106 +-
 android/BOINC/res/values-nl/strings.xml            |   106 +-
 android/BOINC/res/values-pt-rPT/strings.xml        |   178 +-
 .../res/{values-ru => values-ru-rRU}/strings.xml   |   103 +-
 android/BOINC/res/values-ru/strings.xml            |   103 +-
 android/BOINC/res/values-sk/strings.xml            |   362 +-
 android/BOINC/res/values-tr/strings.xml            |   123 +-
 android/BOINC/res/values-uk/strings.xml            |   102 +-
 android/BOINC/res/values-zh-rCN/strings.xml        |   361 +-
 android/BOINC/res/values-zh-rTW/strings.xml        |   201 +-
 android/BOINC/res/values/strings.xml               |    11 +-
 android/build_androidtc_arm.sh                     |     2 +-
 android/build_build_app_arm.sh                     |    31 +
 android/build_build_app_mips.sh                    |    30 +
 android/build_build_app_x86.sh                     |    30 +
 api/boinc_api.cpp                                  |    51 +-
 api/boinc_api.h                                    |     8 +-
 api/graphics2.h                                    |    17 +-
 api/graphics2_util.cpp                             |    93 +-
 api/ttfont.cpp                                     |   205 -
 api/ttfont.h                                       |    67 -
 build/getWxWidgets.sh                              |    26 +
 client/Makefile.am                                 |    14 +-
 client/app.cpp                                     |     2 +-
 client/app_config.cpp                              |    14 +-
 client/app_control.cpp                             |     2 +-
 client/app_start.cpp                               |     2 +-
 client/async_file.cpp                              |     4 +-
 client/client_state.cpp                            |    28 +-
 client/client_state.h                              |     2 +
 client/coproc_sched.cpp                            |     8 +-
 client/cpu_sched.cpp                               |     2 -
 client/cs_account.cpp                              |     8 +-
 client/cs_apps.cpp                                 |     2 +-
 client/cs_files.cpp                                |     2 +-
 client/cs_notice.cpp                               |    10 +-
 client/cs_statefile.cpp                            |    12 +
 client/cs_trickle.cpp                              |     2 +-
 client/file_xfer.cpp                               |     2 +-
 client/gpu_detect.cpp                              |     3 +-
 client/gpu_opencl.cpp                              |     2 +-
 client/gui_rpc_server.cpp                          |     6 +-
 client/hostinfo_win.cpp                            |   121 +-
 client/http_curl.cpp                               |     3 +-
 client/log_flags.cpp                               |   110 +-
 client/pers_file_xfer.cpp                          |     2 +-
 client/project.cpp                                 |     2 +-
 client/rr_sim.cpp                                  |     2 +-
 client/rrsim_test.cpp                              |     4 +-
 client/sim.cpp                                     |     8 +-
 client/time_stats.cpp                              |     2 +-
 client/work_fetch.cpp                              |    13 +-
 client/work_fetch.h                                |     2 +
 clientgui/AccountManagerPropertiesPage.cpp         |     4 +-
 clientgui/AdvancedFrame.cpp                        |   263 +-
 clientgui/AdvancedFrame.h                          |     4 +
 clientgui/AsyncRPC.cpp                             |     2 +-
 clientgui/BOINCBaseFrame.cpp                       |     9 +-
 clientgui/BOINCBaseFrame.h                         |     1 +
 clientgui/BOINCBaseView.cpp                        |    93 +-
 clientgui/BOINCBaseView.h                          |    20 +-
 clientgui/BOINCClientManager.cpp                   |     4 +-
 clientgui/BOINCGUIApp.cpp                          |    81 +-
 clientgui/BOINCGUIApp.h                            |     3 +
 clientgui/BOINCListCtrl.cpp                        |   316 +-
 clientgui/BOINCListCtrl.h                          |     7 +
 clientgui/DlgAbout.cpp                             |    15 +-
 clientgui/DlgAdvPreferences.cpp                    |  1188 +-
 clientgui/DlgAdvPreferences.h                      |    25 +-
 clientgui/DlgAdvPreferencesBase.cpp                |  1100 +-
 clientgui/DlgAdvPreferencesBase.h                  |   279 +-
 clientgui/DlgEventLog.cpp                          |    31 +-
 clientgui/DlgEventLog.h                            |    14 +-
 clientgui/DlgExclusiveApps.cpp                     |   471 +
 clientgui/DlgExclusiveApps.h                       |    73 +
 clientgui/DlgHiddenColumns.cpp                     |   334 +
 clientgui/DlgHiddenColumns.h                       |    61 +
 clientgui/Events.h                                 |     3 +-
 clientgui/MainDocument.cpp                         |    19 +-
 clientgui/MainDocument.h                           |     2 +-
 clientgui/Makefile.am                              |     2 +
 clientgui/ProjectProcessingPage.cpp                |     4 +-
 clientgui/SkinManager.cpp                          |     2 +-
 clientgui/SkinManager.h                            |     1 +
 clientgui/ViewProjects.cpp                         |   105 +-
 clientgui/ViewProjects.h                           |     1 +
 clientgui/ViewResources.cpp                        |     3 -
 clientgui/ViewTransfers.cpp                        |   103 +-
 clientgui/ViewTransfers.h                          |     1 +
 clientgui/ViewWork.cpp                             |   114 +-
 clientgui/ViewWork.h                               |     1 +
 clientgui/WizardAttach.cpp                         |     4 +-
 clientgui/browser.cpp                              |     2 +-
 clientgui/gtk/taskbarex.cpp                        |     2 +-
 clientgui/res/clock.xpm                            |    31 +
 .../default/graphic/dialog_background_image.xpm    |     2 +-
 clientgui/sg_BoincSimpleFrame.cpp                  |    81 +-
 clientgui/sg_CustomControls.cpp                    |   175 +
 clientgui/sg_CustomControls.h                      |   114 +
 clientgui/sg_DlgPreferences.cpp                    |  1233 +-
 clientgui/sg_DlgPreferences.h                      |   119 +-
 clientgui/sg_TaskPanel.cpp                         |    37 +-
 clientscr/mac_saver_module.cpp                     |     2 +-
 clientscr/ss_app.cpp                               |     2 +-
 configure.ac                                       |   405 +-
 db/boinc_db.cpp                                    |    90 +-
 db/boinc_db.h                                      |    12 +
 db/boinc_db_types.h                                |    25 +-
 db/schema.sql                                      |    34 +-
 doc/concierge.php                                  |   137 +
 doc/download.php                                   |    52 +-
 doc/download_all.php                               |    19 +-
 doc/help_vol.php                                   |    10 +-
 doc/index.php                                      |     6 +-
 doc/links.php                                      |    10 +-
 doc/manager_links.php                              |    26 +-
 doc/projects.inc                                   |   180 +-
 doc/projects.php                                   |     5 +-
 doc/versions.inc                                   |   390 +-
 find-working-cvs                                   |    33 -
 html/inc/account.inc                               |   121 +
 html/inc/bbcode_html.inc                           |    23 +-
 html/inc/boinc_db.inc                              |    75 +-
 html/inc/bolt_db.inc                               |     1 +
 html/inc/bolt_util.inc                             |     2 +-
 html/inc/bolt_util_ops.inc                         |     8 +-
 html/inc/bossa_example.inc                         |     2 +-
 html/inc/bossa_example2.inc                        |     2 +-
 html/inc/cache.inc                                 |    34 +-
 html/inc/db.inc                                    |   180 +-
 html/inc/db_conn.inc                               |    34 +-
 html/inc/db_ops.inc                                |   100 +-
 html/inc/email.inc                                 |    15 +-
 html/inc/forum.inc                                 |    55 +-
 html/inc/forum_banishment_vote.inc                 |    36 +-
 html/inc/forum_db.inc                              |     4 +
 html/inc/forum_email.inc                           |    14 +-
 html/inc/forum_rss.inc                             |     4 +-
 html/inc/friend.inc                                |    14 +-
 html/inc/host.inc                                  |    28 +-
 html/inc/htmLawed.php                              |   723 +
 html/inc/kses.php                                  |   517 -
 html/inc/ldap.inc                                  |    74 +
 html/inc/news.inc                                  |     7 +-
 html/inc/notify.inc                                |     4 +
 html/inc/pm.inc                                    |    20 +-
 html/inc/prefs.inc                                 |   891 +-
 html/inc/prefs_project.inc                         |   403 +
 html/inc/prefs_util.inc                            |   377 +-
 html/inc/recaptchalib.php                          |   332 +-
 html/inc/result.inc                                |    46 +-
 html/inc/sandbox.inc                               |     6 +
 html/inc/sanitize_html.inc                         |     2 +-
 html/inc/stats_sites.inc                           |    12 +-
 html/inc/submit.inc                                |    18 +-
 html/inc/submit_db.inc                             |     1 +
 html/inc/team.inc                                  |    54 +-
 html/inc/text_transform.inc                        |    83 +-
 html/inc/time.inc                                  |     6 +-
 html/inc/translation.inc                           |     2 +-
 html/inc/uotd.inc                                  |    33 +-
 html/inc/user.inc                                  |   163 +-
 html/inc/util.inc                                  |   190 +-
 html/inc/util_basic.inc                            |    17 +-
 html/inc/util_ops.inc                              |    42 +-
 html/ops/badge_admin.php                           |    38 +-
 html/ops/badge_assign.php                          |     6 +-
 html/ops/badge_assign_custom.php                   |   189 +
 html/ops/bbcode_convert.php                        |    16 +-
 html/ops/bbcode_convert_response1.php              |    16 +-
 html/ops/bbcode_convert_response2.php              |    16 +-
 html/ops/bbcode_convert_signature.php              |    16 +-
 html/ops/block_host.php                            |     2 +-
 html/ops/bolt_admin.php                            |    10 +-
 html/ops/bolt_compare.php                          |     6 +-
 html/ops/bolt_map.php                              |     4 +-
 html/ops/bossa_admin.php                           |    10 +-
 html/ops/cancel_workunits.php                      |   166 +
 html/ops/cancel_workunits_action.php               |    70 +
 html/ops/cancel_wu_action.php                      |     2 +-
 html/ops/cancel_wu_form.php                        |     6 +-
 html/ops/clean_user_names.php                      |     6 +-
 html/ops/clear_host.php                            |    10 +-
 html/ops/credit_study.php                          |     8 +-
 html/ops/credit_test.php                           |     6 +-
 html/ops/db_action.php                             |    12 +-
 html/ops/db_cleanse.php                            |    10 +-
 html/ops/db_form.php                               |     2 +-
 html/ops/db_update.php                             |    42 +-
 html/ops/dbinfo.php                                |    56 +-
 html/ops/decay_credit_by_app.php                   |    54 +
 html/ops/delete_job_files                          |     2 +-
 html/ops/delete_spammers.php                       |   131 +-
 html/ops/eah_server_status.php                     |    14 +-
 html/ops/error_summary.php                         |    63 +
 html/ops/errorwus.php                              |     6 +-
 html/ops/export_credit_by_app.php                  |    90 +
 html/ops/failure_result_summary_by_host.php        |     6 +-
 html/ops/failure_result_summary_by_platform.php    |     6 +-
 html/ops/forum_repair.php                          |     8 +-
 html/ops/grant_credit.php                          |    32 +-
 html/ops/hrclass_summary.php                       |    30 +-
 html/ops/index.php                                 |    17 +-
 html/ops/job_times.php                             |    10 +-
 html/ops/list_new_users.php                        |    12 +-
 html/ops/login_action.php                          |     4 +-
 html/ops/main.css                                  |    64 +-
 html/ops/make_emails_lowercase.php                 |    18 +-
 html/ops/make_puser.php                            |     8 +-
 html/ops/manage_app_versions.php                   |    28 +-
 html/ops/manage_apps.php                           |    16 +-
 html/ops/manage_special_users.php                  |    10 +-
 html/ops/manage_special_users_action.php           |     4 +-
 html/ops/manage_user.php                           |    61 +-
 html/ops/mass_email.php                            |     6 +-
 html/ops/mass_email_script.php                     |    18 +-
 html/ops/news_convert.php                          |     4 +-
 html/ops/notify.php                                |    23 +-
 html/ops/opsw.php                                  |     6 +-
 html/ops/pass_percentage_by_platform.php           |     8 +-
 html/ops/problem_host.php                          |     2 +-
 html/ops/profile_screen_action.php                 |     4 +-
 html/ops/profile_screen_form.php                   |    21 +-
 html/ops/purge_profile.php                         |    12 +-
 html/ops/remind.php                                |    32 +-
 html/ops/remote_server_status.php                  |   138 +
 html/ops/repair_21812.php                          |     4 +-
 html/ops/repair_validator_problem.php              |    18 +-
 html/ops/reset_hrclass.php                         |     2 +-
 html/ops/revalidate.php                            |     2 +-
 html/ops/sample_table_stats.php                    |     6 +-
 html/ops/show_log.php                              |     2 +-
 html/ops/size_census.php                           |     4 +-
 html/ops/team_export.php                           |     1 +
 html/ops/team_import.php                           |    30 +-
 html/ops/update_forum_activities.php               |    14 +-
 html/ops/update_profile_pages.php                  |     4 +-
 html/ops/upgrade_db.php                            |     2 +-
 html/ops/user_graph.php                            |     6 +-
 html/ops/wd_nresults_changing.php                  |    12 +-
 html/ops/white.css                                 |    28 +-
 html/project.sample/cache_parameters.inc           |     6 +-
 html/project.sample/project.inc                    |    72 +-
 html/project.sample/project_specific_prefs.inc     |    59 +-
 html/queue/README                                  |     2 +
 html/queue/user/queue_new_job_form_action.php      |     2 +-
 html/user/account_finish.php                       |     8 +-
 html/user/add_venue.php                            |     1 +
 html/user/android_tasks.php                        |   137 +
 html/user/apps.php                                 |    13 +-
 html/user/bbcode.php                               |     3 +-
 html/user/black.css                                |     4 +-
 html/user/bolt.css                                 |    20 +-
 html/user/bolt.php                                 |     2 +-
 html/user/bolt_admin.css                           |     2 +-
 html/user/bolt_sched.php                           |     2 +-
 html/user/bossa_apps.php                           |     2 +-
 html/user/brand_stats.php                          |    69 +
 html/user/cpu_list.php                             |    63 +-
 html/user/create_account.php                       |     2 +-
 html/user/create_account_action.php                |     7 +-
 html/user/create_account_form.php                  |    74 +-
 html/user/create_profile.php                       |    22 +-
 html/user/donate.php                               |     4 +-
 html/user/donation_ipn.php                         |    10 +-
 html/user/donations.php                            |    20 +-
 html/user/download.php                             |   125 +
 html/user/edit_email_form.php                      |     6 +-
 html/user/edit_forum_preferences_action.php        |     2 +-
 html/user/edit_forum_preferences_form.php          |    37 +-
 html/user/edit_passwd_action.php                   |    32 +-
 html/user/edit_passwd_form.php                     |    29 +-
 html/user/edit_user_info_form.php                  |     8 +-
 html/user/ffmail_form.php                          |    10 +-
 html/user/forum_banishment_vote.php                |     5 +-
 html/user/forum_edit.php                           |     2 +-
 html/user/forum_forum.php                          |     5 +-
 html/user/forum_help_desk.php                      |     2 +-
 html/user/forum_index.php                          |     4 +-
 html/user/forum_moderate_post.php                  |     7 +-
 html/user/forum_moderate_thread.php                |     6 +-
 html/user/forum_post.php                           |     8 +-
 html/user/forum_reply.php                          |     9 +-
 html/user/forum_report_post.php                    |     4 +-
 html/user/forum_rss.php                            |     2 +-
 html/user/forum_search.php                         |    14 +-
 html/user/forum_thread.php                         |    11 +-
 html/user/forum_user_posts.php                     |     2 +-
 html/user/friend.php                               |    10 +-
 html/user/get_passwd.php                           |   101 +-
 html/user/gpu_list.php                             |    22 +-
 html/user/host_edit_form.php                       |     2 +-
 html/user/host_update_credit.php                   |     2 +-
 html/user/lammps.php                               |    10 +-
 html/user/login_action.php                         |   123 +-
 html/user/login_form.php                           |    47 +-
 html/user/main.css                                 |    62 +-
 html/user/manage_app.php                           |     6 +-
 html/user/manage_project.php                       |    10 +-
 html/user/notices.php                              |     2 +-
 html/user/per_app_list.php                         |   130 +
 html/user/pm.php                                   |    15 +-
 html/user/prefs.php                                |     1 +
 html/user/prefs_edit.php                           |     2 +
 html/user/prefs_remove.php                         |     1 +
 html/user/profile_menu.php                         |     4 +-
 html/user/profile_search_action.php                |     2 +-
 html/user/register.php                             |    55 +
 html/user/rss_main.php                             |     2 +-
 html/user/sample_index.php                         |    30 +-
 html/user/sandbox.php                              |     4 +-
 html/user/server_status.php                        |   767 +-
 html/user/show_coproc.php                          |     2 +-
 html/user/show_user.php                            |     2 +-
 html/user/stats.php                                |    11 +-
 html/user/style2.css                               |    16 +-
 html/user/submit.php                               |    12 +-
 html/user/submit_example.php                       |    10 +-
 html/user/submit_rpc_handler.php                   |    45 +-
 html/user/team_admins.php                          |     4 +-
 html/user/team_change_founder_form.php             |     4 +-
 html/user/team_create_action.php                   |     2 +-
 html/user/team_delta.php                           |     2 +-
 html/user/team_email_list.php                      |     2 +-
 html/user/team_forum.php                           |     2 +-
 html/user/team_founder_transfer_action.php         |     2 +-
 html/user/team_founder_transfer_form.php           |     4 +-
 html/user/team_join_form.php                       |     4 +-
 html/user/team_lookup.php                          |     4 +-
 html/user/team_manage.php                          |    18 +-
 html/user/team_quit_action.php                     |     2 +-
 html/user/team_quit_form.php                       |     4 +-
 html/user/team_remove_inactive_form.php            |     4 +-
 html/user/team_search.php                          |    12 +-
 html/user/top_users.php                            |     7 +-
 html/user/user_search.php                          |    37 +-
 html/user/white.css                                |    28 +-
 lib/Makefile.am                                    |    16 +-
 lib/app_ipc.cpp                                    |     2 +-
 lib/boinc_win.h                                    |    18 +-
 lib/common_defs.h                                  |    21 +
 lib/coproc.cpp                                     |    18 +-
 lib/crypt.cpp                                      |     3 +-
 lib/crypt_prog.cpp                                 |     2 +-
 lib/diagnostics.h                                  |     8 +-
 lib/error_numbers.h                                |     3 +-
 lib/md5_file.cpp                                   |     2 +
 lib/network.cpp                                    |    33 +
 lib/network.h                                      |     1 +
 lib/prefs.cpp                                      |    28 +-
 lib/prefs.h                                        |     3 +-
 lib/proc_control.cpp                               |    25 +
 lib/proc_control.h                                 |     2 +
 lib/procinfo.cpp                                   |     6 +-
 lib/procinfo_mac.cpp                               |     1 +
 lib/str_util.cpp                                   |    37 +
 lib/str_util.h                                     |     9 +
 lib/unix_util.cpp                                  |     2 +-
 lib/util.cpp                                       |    28 +-
 lib/util.h                                         |     7 +-
 lib/win_util.cpp                                   |     2 +-
 locale/ar/BOINC-Client.mo                          |   Bin 455 -> 417 bytes
 locale/ar/BOINC-Client.po                          |    46 +-
 locale/ar/BOINC-Manager.mo                         |   Bin 44386 -> 44370 bytes
 locale/ar/BOINC-Manager.po                         |   550 +-
 locale/ar/BOINC-Setup.mo                           |   Bin 485 -> 447 bytes
 locale/ar/BOINC-Setup.po                           |    24 +-
 locale/ar/BOINC-Web.mo                             |   Bin 633 -> 651 bytes
 locale/ar/BOINC-Web.po                             |   762 +-
 locale/be/BOINC-Client.mo                          |   Bin 455 -> 417 bytes
 locale/be/BOINC-Client.po                          |    46 +-
 locale/be/BOINC-Manager.mo                         |   Bin 41411 -> 41395 bytes
 locale/be/BOINC-Manager.po                         |  1005 +-
 locale/be/BOINC-Setup.mo                           |   Bin 485 -> 447 bytes
 locale/be/BOINC-Setup.po                           |    24 +-
 locale/be/BOINC-Web.mo                             |   Bin 668 -> 660 bytes
 locale/be/BOINC-Web.po                             |   827 +-
 locale/bg/BOINC-Client.mo                          |   Bin 6138 -> 6128 bytes
 locale/bg/BOINC-Client.po                          |    87 +-
 locale/bg/BOINC-Manager.mo                         |   Bin 96252 -> 96737 bytes
 locale/bg/BOINC-Manager.po                         |  3699 +--
 locale/bg/BOINC-Setup.mo                           |   Bin 3596 -> 3602 bytes
 locale/bg/BOINC-Setup.po                           |    48 +-
 locale/bg/BOINC-Web.mo                             |   Bin 45601 -> 45590 bytes
 locale/bg/BOINC-Web.po                             |  1404 +-
 locale/ca/BOINC-Client.mo                          |   Bin 4931 -> 4938 bytes
 locale/ca/BOINC-Client.po                          |   135 +-
 locale/ca/BOINC-Manager.mo                         |   Bin 76980 -> 76669 bytes
 locale/ca/BOINC-Manager.po                         |  4181 +--
 locale/ca/BOINC-Project-Generic.po                 |  4693 ++-
 locale/ca/BOINC-Setup.mo                           |   Bin 3220 -> 3050 bytes
 locale/ca/BOINC-Setup.po                           |    90 +-
 locale/ca/BOINC-Web.mo                             |   Bin 37107 -> 36923 bytes
 locale/ca/BOINC-Web.po                             |  1063 +-
 locale/cs/BOINC-Client.mo                          |   Bin 4849 -> 4871 bytes
 locale/cs/BOINC-Client.po                          |    95 +-
 locale/cs/BOINC-Manager.mo                         |   Bin 73750 -> 75577 bytes
 locale/cs/BOINC-Manager.po                         |  3970 +--
 locale/cs/BOINC-Project-Generic.po                 |  4478 ++-
 locale/cs/BOINC-Setup.mo                           |   Bin 2976 -> 3071 bytes
 locale/cs/BOINC-Setup.po                           |    65 +-
 locale/cs/BOINC-Web.mo                             |   Bin 34012 -> 36447 bytes
 locale/cs/BOINC-Web.po                             |   859 +-
 locale/da/BOINC-Client.mo                          |   Bin 4749 -> 4736 bytes
 locale/da/BOINC-Client.po                          |    60 +-
 locale/da/BOINC-Manager.mo                         |   Bin 72881 -> 73182 bytes
 locale/da/BOINC-Manager.po                         |  4189 +--
 locale/da/BOINC-Setup.mo                           |   Bin 3095 -> 2934 bytes
 locale/da/BOINC-Setup.po                           |    64 +-
 locale/da/BOINC-Web.mo                             |   Bin 20469 -> 20495 bytes
 locale/da/BOINC-Web.po                             |   944 +-
 locale/de/BOINC-Client.mo                          |   Bin 4852 -> 4868 bytes
 locale/de/BOINC-Client.po                          |   108 +-
 locale/de/BOINC-Manager.mo                         |   Bin 79596 -> 77358 bytes
 locale/de/BOINC-Manager.po                         |  3533 +--
 locale/de/BOINC-Project-Generic.po                 |  1649 +-
 locale/de/BOINC-Setup.mo                           |   Bin 3233 -> 3072 bytes
 locale/de/BOINC-Setup.po                           |    85 +-
 locale/de/BOINC-Web.mo                             |   Bin 37161 -> 37160 bytes
 locale/de/BOINC-Web.po                             |   552 +-
 locale/el/BOINC-Client.mo                          |   Bin 5441 -> 5450 bytes
 locale/el/BOINC-Client.po                          |   112 +-
 locale/el/BOINC-Manager.mo                         |   Bin 80909 -> 78271 bytes
 locale/el/BOINC-Manager.po                         |  3777 +--
 locale/el/BOINC-Setup.mo                           |   Bin 2155 -> 2164 bytes
 locale/el/BOINC-Setup.po                           |    42 +-
 locale/el/BOINC-Web.mo                             |   Bin 9197 -> 10086 bytes
 locale/el/BOINC-Web.po                             |   953 +-
 locale/en/BOINC-Manager.mo                         |   Bin 0 -> 75384 bytes
 locale/en/BOINC-Manager.po                         |  3863 +++
 locale/en/BOINC-Project-Generic.po                 |  6453 +++++
 locale/es/BOINC-Client.mo                          |   Bin 4983 -> 4822 bytes
 locale/es/BOINC-Client.po                          |   159 +-
 locale/es/BOINC-Manager.mo                         |   Bin 74823 -> 75134 bytes
 locale/es/BOINC-Manager.po                         |  3828 +--
 locale/es/BOINC-Setup.mo                           |   Bin 908 -> 3026 bytes
 locale/es/BOINC-Setup.po                           |    54 +-
 locale/es/BOINC-Web.mo                             |   Bin 37351 -> 37118 bytes
 locale/es/BOINC-Web.po                             |   932 +-
 locale/fa/BOINC-Client.mo                          |   Bin 455 -> 417 bytes
 locale/fa/BOINC-Client.po                          |    46 +-
 locale/fa/BOINC-Manager.mo                         |   Bin 715 -> 677 bytes
 locale/fa/BOINC-Manager.po                         |   398 +-
 locale/fa/BOINC-Setup.mo                           |   Bin 485 -> 447 bytes
 locale/fa/BOINC-Setup.po                           |    24 +-
 locale/fa/BOINC-Web.mo                             |   Bin 535 -> 497 bytes
 locale/fa/BOINC-Web.po                             |   345 +-
 locale/fi/BOINC-Client.mo                          |   Bin 4598 -> 4667 bytes
 locale/fi/BOINC-Client.po                          |   124 +-
 locale/fi/BOINC-Manager.mo                         |   Bin 75065 -> 78901 bytes
 locale/fi/BOINC-Manager.po                         |  2534 +-
 locale/fi/BOINC-Setup.mo                           |   Bin 3076 -> 2899 bytes
 locale/fi/BOINC-Setup.po                           |    83 +-
 locale/fi/BOINC-Web.mo                             |   Bin 34773 -> 34786 bytes
 locale/fi/BOINC-Web.po                             |   636 +-
 locale/fr/BOINC-Client.mo                          |   Bin 4989 -> 5005 bytes
 locale/fr/BOINC-Client.po                          |   117 +-
 locale/fr/BOINC-Manager.mo                         |   Bin 80770 -> 83737 bytes
 locale/fr/BOINC-Manager.po                         |  2767 +-
 locale/fr/BOINC-Project-Generic.po                 |  1633 +-
 locale/fr/BOINC-Setup.mo                           |   Bin 3339 -> 3355 bytes
 locale/fr/BOINC-Setup.po                           |    52 +-
 locale/fr/BOINC-Web.mo                             |   Bin 38132 -> 38148 bytes
 locale/fr/BOINC-Web.po                             |  1159 +-
 locale/gl/BOINC-Client.mo                          |   Bin 455 -> 417 bytes
 locale/gl/BOINC-Client.po                          |    46 +-
 locale/gl/BOINC-Manager.mo                         |   Bin 45391 -> 45396 bytes
 locale/gl/BOINC-Manager.po                         |   588 +-
 locale/gl/BOINC-Setup.mo                           |   Bin 485 -> 447 bytes
 locale/gl/BOINC-Setup.po                           |    24 +-
 locale/gl/BOINC-Web.mo                             |   Bin 1573 -> 1600 bytes
 locale/gl/BOINC-Web.po                             |   791 +-
 locale/he/BOINC-Client.mo                          |   Bin 4777 -> 4774 bytes
 locale/he/BOINC-Client.po                          |   122 +-
 locale/he/BOINC-Manager.mo                         |   Bin 71223 -> 70927 bytes
 locale/he/BOINC-Manager.po                         |  3640 +--
 locale/he/BOINC-Setup.mo                           |   Bin 592 -> 554 bytes
 locale/he/BOINC-Setup.po                           |    28 +-
 locale/he/BOINC-Web.mo                             |   Bin 7595 -> 7604 bytes
 locale/he/BOINC-Web.po                             |   407 +-
 locale/hr/BOINC-Client.mo                          |   Bin 613 -> 694 bytes
 locale/hr/BOINC-Client.po                          |    51 +-
 locale/hr/BOINC-Manager.mo                         |   Bin 8088 -> 8055 bytes
 locale/hr/BOINC-Manager.po                         |  3217 +--
 locale/hr/BOINC-Setup.mo                           |   Bin 592 -> 554 bytes
 locale/hr/BOINC-Setup.po                           |    28 +-
 locale/hr/BOINC-Web.mo                             |   Bin 681 -> 643 bytes
 locale/hr/BOINC-Web.po                             |   785 +-
 locale/hu/BOINC-Client.mo                          |   Bin 5082 -> 5059 bytes
 locale/hu/BOINC-Client.po                          |   131 +-
 locale/hu/BOINC-Manager.mo                         |   Bin 74260 -> 78220 bytes
 locale/hu/BOINC-Manager.po                         |  4240 +--
 locale/hu/BOINC-Setup.mo                           |   Bin 1020 -> 1023 bytes
 locale/hu/BOINC-Setup.po                           |    30 +-
 locale/hu/BOINC-Web.mo                             |   Bin 30235 -> 30238 bytes
 locale/hu/BOINC-Web.po                             |  1155 +-
 locale/it_IT/BOINC-Client.mo                       |   Bin 4920 -> 4948 bytes
 locale/it_IT/BOINC-Client.po                       |   114 +-
 locale/it_IT/BOINC-Manager.mo                      |   Bin 79091 -> 81334 bytes
 locale/it_IT/BOINC-Manager.po                      |  2985 +-
 locale/it_IT/BOINC-Project-Generic.po              |  4719 ++-
 locale/it_IT/BOINC-Setup.mo                        |   Bin 3177 -> 3028 bytes
 locale/it_IT/BOINC-Setup.po                        |    80 +-
 locale/it_IT/BOINC-Web.mo                          |   Bin 36761 -> 36614 bytes
 locale/it_IT/BOINC-Web.po                          |   843 +-
 locale/ja/BOINC-Client.mo                          |   Bin 5353 -> 6285 bytes
 locale/ja/BOINC-Client.po                          |   126 +-
 locale/ja/BOINC-Manager.mo                         |   Bin 74201 -> 94173 bytes
 locale/ja/BOINC-Manager.po                         |  3530 +--
 locale/ja/BOINC-Project-Generic.po                 |  5099 ++--
 locale/ja/BOINC-Setup.mo                           |   Bin 592 -> 3469 bytes
 locale/ja/BOINC-Setup.po                           |    65 +-
 locale/ja/BOINC-Web.mo                             |   Bin 32842 -> 41952 bytes
 locale/ja/BOINC-Web.po                             |   805 +-
 locale/ko/BOINC-Client.mo                          |   Bin 5153 -> 5132 bytes
 locale/ko/BOINC-Client.po                          |    75 +-
 locale/ko/BOINC-Manager.mo                         |   Bin 80994 -> 84499 bytes
 locale/ko/BOINC-Manager.po                         |  2398 +-
 locale/ko/BOINC-Project-Generic.po                 |  3806 ++-
 locale/ko/BOINC-Setup.mo                           |   Bin 3265 -> 3244 bytes
 locale/ko/BOINC-Setup.po                           |    56 +-
 locale/ko/BOINC-Web.mo                             |   Bin 38887 -> 38750 bytes
 locale/ko/BOINC-Web.po                             |   388 +-
 locale/lt/BOINC-Client.mo                          |   Bin 4817 -> 4885 bytes
 locale/lt/BOINC-Client.po                          |   100 +-
 locale/lt/BOINC-Manager.mo                         |   Bin 44240 -> 43785 bytes
 locale/lt/BOINC-Manager.po                         |  3488 +--
 locale/lt/BOINC-Setup.mo                           |   Bin 1732 -> 1814 bytes
 locale/lt/BOINC-Setup.po                           |    30 +-
 locale/lt/BOINC-Web.mo                             |   Bin 8144 -> 8225 bytes
 locale/lt/BOINC-Web.po                             |   452 +-
 locale/lv/BOINC-Client.mo                          |   Bin 4779 -> 4802 bytes
 locale/lv/BOINC-Client.po                          |    60 +-
 locale/lv/BOINC-Manager.mo                         |   Bin 74726 -> 75349 bytes
 locale/lv/BOINC-Manager.po                         |  3929 +--
 locale/lv/BOINC-Setup.mo                           |   Bin 592 -> 554 bytes
 locale/lv/BOINC-Setup.po                           |    28 +-
 locale/lv/BOINC-Web.mo                             |   Bin 681 -> 643 bytes
 locale/lv/BOINC-Web.po                             |   785 +-
 locale/ms/BOINC-Client.mo                          |   Bin 456 -> 418 bytes
 locale/ms/BOINC-Client.po                          |    49 +-
 locale/ms/BOINC-Manager.mo                         |   Bin 534 -> 418 bytes
 locale/ms/BOINC-Manager.po                         |  2745 +-
 locale/ms/BOINC-Setup.mo                           |   Bin 456 -> 418 bytes
 locale/ms/BOINC-Setup.po                           |    26 +-
 locale/ms/BOINC-Web.mo                             |   Bin 24737 -> 24728 bytes
 locale/ms/BOINC-Web.po                             |   589 +-
 locale/nb/BOINC-Client.mo                          |   Bin 4833 -> 4812 bytes
 locale/nb/BOINC-Client.po                          |    99 +-
 locale/nb/BOINC-Manager.mo                         |   Bin 72386 -> 72948 bytes
 locale/nb/BOINC-Manager.po                         |  3846 ++-
 locale/nb/BOINC-Project-Generic.po                 |     9 +-
 locale/nb/BOINC-Setup.mo                           |   Bin 3582 -> 3413 bytes
 locale/nb/BOINC-Setup.po                           |    70 +-
 locale/nb/BOINC-Web.mo                             |   Bin 9004 -> 7946 bytes
 locale/nb/BOINC-Web.po                             |   522 +-
 locale/nl/BOINC-Client.mo                          |   Bin 4860 -> 4875 bytes
 locale/nl/BOINC-Client.po                          |   104 +-
 locale/nl/BOINC-Manager.mo                         |   Bin 76321 -> 73867 bytes
 locale/nl/BOINC-Manager.po                         |  4398 +--
 locale/nl/BOINC-Project-Generic.po                 |  1571 +-
 locale/nl/BOINC-Setup.mo                           |   Bin 3097 -> 2936 bytes
 locale/nl/BOINC-Setup.po                           |    81 +-
 locale/nl/BOINC-Web.mo                             |   Bin 37116 -> 36961 bytes
 locale/nl/BOINC-Web.po                             |   847 +-
 locale/nn/BOINC-Client.mo                          |   Bin 455 -> 417 bytes
 locale/nn/BOINC-Client.po                          |    46 +-
 locale/nn/BOINC-Manager.mo                         |   Bin 715 -> 677 bytes
 locale/nn/BOINC-Manager.po                         |   398 +-
 locale/nn/BOINC-Setup.mo                           |   Bin 485 -> 447 bytes
 locale/nn/BOINC-Setup.po                           |    24 +-
 locale/nn/BOINC-Web.mo                             |   Bin 535 -> 497 bytes
 locale/nn/BOINC-Web.po                             |   345 +-
 locale/pl/BOINC-Client.mo                          |   Bin 4384 -> 4824 bytes
 locale/pl/BOINC-Client.po                          |   101 +-
 locale/pl/BOINC-Manager.mo                         |   Bin 71445 -> 71886 bytes
 locale/pl/BOINC-Manager.po                         |  4281 +--
 locale/pl/BOINC-Setup.mo                           |   Bin 592 -> 3143 bytes
 locale/pl/BOINC-Setup.po                           |    65 +-
 locale/pl/BOINC-Web.mo                             |   Bin 23502 -> 23567 bytes
 locale/pl/BOINC-Web.po                             |   930 +-
 locale/pt_BR/BOINC-Client.mo                       |   Bin 2975 -> 2975 bytes
 locale/pt_BR/BOINC-Client.po                       |    94 +-
 locale/pt_BR/BOINC-Manager.mo                      |   Bin 33747 -> 32813 bytes
 locale/pt_BR/BOINC-Manager.po                      |  3092 +-
 locale/pt_BR/BOINC-Setup.mo                        |   Bin 595 -> 557 bytes
 locale/pt_BR/BOINC-Setup.po                        |    28 +-
 locale/pt_BR/BOINC-Web.mo                          |   Bin 684 -> 615 bytes
 locale/pt_BR/BOINC-Web.po                          |   785 +-
 locale/pt_PT/BOINC-Client.mo                       |   Bin 4929 -> 4963 bytes
 locale/pt_PT/BOINC-Client.po                       |   119 +-
 locale/pt_PT/BOINC-Manager.mo                      |   Bin 79202 -> 81599 bytes
 locale/pt_PT/BOINC-Manager.po                      |  2415 +-
 locale/pt_PT/BOINC-Project-Generic.po              |  1406 +-
 locale/pt_PT/BOINC-Setup.mo                        |   Bin 3242 -> 3130 bytes
 locale/pt_PT/BOINC-Setup.po                        |    68 +-
 locale/pt_PT/BOINC-Web.mo                          |   Bin 37040 -> 36899 bytes
 locale/pt_PT/BOINC-Web.po                          |   827 +-
 locale/ro/BOINC-Client.mo                          |   Bin 4935 -> 4994 bytes
 locale/ro/BOINC-Client.po                          |    59 +-
 locale/ro/BOINC-Manager.mo                         |   Bin 77527 -> 75731 bytes
 locale/ro/BOINC-Manager.po                         |  4045 +--
 locale/ro/BOINC-Setup.mo                           |   Bin 3282 -> 3164 bytes
 locale/ro/BOINC-Setup.po                           |    66 +-
 locale/ro/BOINC-Web.mo                             |   Bin 36726 -> 36788 bytes
 locale/ro/BOINC-Web.po                             |  1110 +-
 locale/ru/BOINC-Client.mo                          |   Bin 6420 -> 6520 bytes
 locale/ru/BOINC-Client.po                          |    88 +-
 locale/ru/BOINC-Manager.mo                         |   Bin 104946 -> 108472 bytes
 locale/ru/BOINC-Manager.po                         |  2930 +-
 locale/ru/BOINC-Project-Generic.po                 |  4662 ++-
 locale/ru/BOINC-Setup.mo                           |   Bin 3967 -> 3890 bytes
 locale/ru/BOINC-Setup.po                           |    81 +-
 locale/ru/BOINC-Web.mo                             |   Bin 50235 -> 50306 bytes
 locale/ru/BOINC-Web.po                             |   595 +-
 locale/ru/wxstd.mo                                 |   Bin 48450 -> 0 bytes
 locale/sk/BOINC-Client.mo                          |   Bin 4815 -> 4835 bytes
 locale/sk/BOINC-Client.po                          |    97 +-
 locale/sk/BOINC-Manager.mo                         |   Bin 73875 -> 79904 bytes
 locale/sk/BOINC-Manager.po                         |  3189 +--
 locale/sk/BOINC-Project-Generic.po                 |  5707 ++--
 locale/sk/BOINC-Setup.mo                           |   Bin 592 -> 3003 bytes
 locale/sk/BOINC-Setup.po                           |    66 +-
 locale/sk/BOINC-Web.mo                             |   Bin 3591 -> 34848 bytes
 locale/sk/BOINC-Web.po                             |   748 +-
 locale/sl/BOINC-Client.mo                          |   Bin 2968 -> 3021 bytes
 locale/sl/BOINC-Client.po                          |    94 +-
 locale/sl/BOINC-Manager.mo                         |   Bin 56461 -> 55070 bytes
 locale/sl/BOINC-Manager.po                         |  3306 +--
 locale/sl/BOINC-Setup.mo                           |   Bin 592 -> 554 bytes
 locale/sl/BOINC-Setup.po                           |    28 +-
 locale/sl/BOINC-Web.mo                             |   Bin 7017 -> 7070 bytes
 locale/sl/BOINC-Web.po                             |   520 +-
 locale/{sv_SE => sv}/BOINC-Client.mo               |   Bin 4744 -> 4699 bytes
 locale/{sv_SE => sv}/BOINC-Client.po               |   113 +-
 locale/sv_SE/BOINC-Manager.mo                      |   Bin 75869 -> 0 bytes
 locale/sv_SE/BOINC-Manager.po                      |  4369 ---
 locale/sv_SE/BOINC-Project-Generic.po              |  6467 -----
 locale/sv_SE/BOINC-Setup.mo                        |   Bin 488 -> 0 bytes
 locale/sv_SE/BOINC-Setup.po                        |   122 -
 locale/sv_SE/BOINC-Web.mo                          |   Bin 2185 -> 0 bytes
 locale/sv_SE/BOINC-Web.po                          |   799 -
 locale/sv_SE/wxstd.mo                              |   Bin 65966 -> 0 bytes
 locale/templates/BOINC-Client.pot                  |     0
 locale/templates/BOINC-Manager.pot                 |  1608 +-
 locale/templates/BOINC-Project-Generic.pot         |  3101 +-
 locale/templates/BOINC-Setup.pot                   |     0
 locale/templates/BOINC-Web.pot                     |     0
 locale/tr/BOINC-Client.mo                          |   Bin 4952 -> 4961 bytes
 locale/tr/BOINC-Client.po                          |   116 +-
 locale/tr/BOINC-Manager.mo                         |   Bin 77571 -> 77951 bytes
 locale/tr/BOINC-Manager.po                         |  4171 ++-
 locale/tr/BOINC-Project-Generic.po                 |  1431 +-
 locale/tr/BOINC-Setup.mo                           |   Bin 1069 -> 3119 bytes
 locale/tr/BOINC-Setup.po                           |    57 +-
 locale/tr/BOINC-Web.mo                             |   Bin 36384 -> 36922 bytes
 locale/tr/BOINC-Web.po                             |   597 +-
 locale/txconfig                                    |    45 +
 locale/uk/BOINC-Client.mo                          |   Bin 6254 -> 6318 bytes
 locale/uk/BOINC-Client.po                          |    92 +-
 locale/uk/BOINC-Manager.mo                         |   Bin 104055 -> 100848 bytes
 locale/uk/BOINC-Manager.po                         |  3821 +--
 locale/uk/BOINC-Project-Generic.po                 |  1396 +-
 locale/uk/BOINC-Setup.mo                           |   Bin 3974 -> 3890 bytes
 locale/uk/BOINC-Setup.po                           |    81 +-
 locale/uk/BOINC-Web.mo                             |   Bin 49025 -> 49089 bytes
 locale/uk/BOINC-Web.po                             |   510 +-
 locale/updatetrans.sh                              |    60 +-
 locale/zh_CN/BOINC-Client.mo                       |   Bin 4717 -> 4713 bytes
 locale/zh_CN/BOINC-Client.po                       |   103 +-
 locale/zh_CN/BOINC-Manager.mo                      |   Bin 73154 -> 75519 bytes
 locale/zh_CN/BOINC-Manager.po                      |  3149 +-
 locale/zh_CN/BOINC-Project-Generic.po              |   725 +-
 locale/zh_CN/BOINC-Setup.mo                        |   Bin 2941 -> 2804 bytes
 locale/zh_CN/BOINC-Setup.po                        |    80 +-
 locale/zh_CN/BOINC-Web.mo                          |   Bin 33409 -> 33280 bytes
 locale/zh_CN/BOINC-Web.po                          |   800 +-
 locale/zh_TW/BOINC-Client.mo                       |   Bin 4560 -> 4506 bytes
 locale/zh_TW/BOINC-Client.po                       |   122 +-
 locale/zh_TW/BOINC-Manager.mo                      |   Bin 71582 -> 73142 bytes
 locale/zh_TW/BOINC-Manager.po                      |  3207 +--
 locale/zh_TW/BOINC-Project-Generic.po              |   671 +-
 locale/zh_TW/BOINC-Setup.mo                        |   Bin 2948 -> 2794 bytes
 locale/zh_TW/BOINC-Setup.po                        |    82 +-
 locale/zh_TW/BOINC-Web.mo                          |   Bin 32953 -> 32720 bytes
 locale/zh_TW/BOINC-Web.po                          |   771 +-
 m4/boinc_wxwidgets.m4                              |    19 +
 py/Boinc/boinc_db.py                               |     8 +
 py/Boinc/database.py                               |     9 +
 py/Boinc/db_base.py                                |     7 +-
 py/Boinc/setup_project.py                          |    10 +-
 py/Boinc/tools.py                                  |    11 +-
 samples/Makefile.am                                |     7 +
 samples/condor/boinc_gahp.cpp                      |     8 +-
 samples/gfx_html/browser.cpp                       |   104 +
 .../gfx_html/browser.h                             |    22 +-
 samples/gfx_html/browser.idl                       |    38 +
 samples/gfx_html/browser_win.h                     |    18 +
 samples/gfx_html/browser_win.rc                    |    96 +
 samples/gfx_html/browserctrl_win.cpp               |   290 +
 samples/gfx_html/browserctrl_win.h                 |   161 +
 samples/gfx_html/browserlog.cpp                    |    66 +
 .../gfx_html/browserlog.h                          |    17 +-
 samples/gfx_html/browsermain_win.cpp               |   235 +
 .../gfx_html/browsermain_win.h                     |    36 +-
 samples/gfx_html/browserwnd_win.cpp                |   232 +
 samples/gfx_html/browserwnd_win.h                  |    75 +
 samples/gfx_html/graphics.cpp                      |    74 +
 .../rss_main.php => samples/gfx_html/graphics.h    |    22 +-
 samples/gfx_html/mongoose.cpp                      |  5287 ++++
 samples/gfx_html/mongoose.h                        |   151 +
 samples/gfx_html/res/boinc.ico                     |   Bin 0 -> 445726 bytes
 samples/gfx_html/templates/boinc.js                |   234 +
 samples/gfx_html/templates/boinc.png               |   Bin 0 -> 4231 bytes
 samples/gfx_html/templates/index.html              |   140 +
 samples/gfx_html/vboxwrapper.cpp                   |    94 +
 .../gfx_html/vboxwrapper.h                         |    19 +-
 samples/gfx_html/webapi.cpp                        |   316 +
 .../clear_host.php => samples/gfx_html/webapi.h    |    24 +-
 samples/gfx_html/webboincjs.cpp                    |   230 +
 samples/gfx_html/webboincpng.cpp                   |   133 +
 samples/gfx_html/webindexhtml.cpp                  |   190 +
 samples/gfx_html/webserver.cpp                     |   165 +
 .../gfx_html/webserver.h                           |    18 +-
 .../rss_main.php => samples/gfx_html/webstatic.h   |    18 +-
 samples/vboxmonitor/Makefile                       |     2 +-
 samples/vboxmonitor/vboxmonitor.cpp                |    19 +-
 samples/vboxwrapper/Makefile                       |    26 +-
 samples/vboxwrapper/Makefile_mac                   |    35 +-
 samples/vboxwrapper/cernvm/cernvmwrapper.cpp       |  1197 -
 samples/vboxwrapper/deprecated/mscom/VirtualBox.h  | 28516 -------------------
 .../vboxwrapper/deprecated/mscom/VirtualBox.tlb    |   Bin 117400 -> 0 bytes
 .../vboxwrapper/deprecated/mscom/VirtualBox_i.c    |   468 -
 samples/vboxwrapper/deprecated/vbox.cpp            |   129 -
 samples/vboxwrapper/deprecated/vbox.h              |    43 -
 samples/vboxwrapper/deprecated/vbox_win.cpp        |   952 -
 samples/vboxwrapper/deprecated/vboxwrapper.cpp     |   173 -
 samples/vboxwrapper/deprecated/vm.cpp              |   141 -
 samples/vboxwrapper/deprecated/vm.h                |    62 -
 samples/vboxwrapper/floppyio.cpp                   |     1 +
 samples/vboxwrapper/floppyio.h                     |   258 +-
 samples/vboxwrapper/gbac.cpp                       |   605 +
 samples/vboxwrapper/gbac.h                         |    39 +
 samples/vboxwrapper/vbox.cpp                       |  3024 --
 samples/vboxwrapper/vbox.h                         |   235 -
 samples/vboxwrapper/vbox42.tlb                     |   Bin 0 -> 187288 bytes
 samples/vboxwrapper/vbox43.tlb                     |   Bin 0 -> 218548 bytes
 samples/vboxwrapper/vbox50.tlb                     |   Bin 0 -> 228404 bytes
 samples/vboxwrapper/vbox_common.cpp                |  1143 +
 samples/vboxwrapper/vbox_common.h                  |   246 +
 samples/vboxwrapper/vbox_mscom42.cpp               |    67 +
 .../vboxwrapper/vbox_mscom42.h                     |    25 +-
 samples/vboxwrapper/vbox_mscom43.cpp               |    68 +
 .../vboxwrapper/vbox_mscom43.h                     |    25 +-
 samples/vboxwrapper/vbox_mscom50.cpp               |    68 +
 .../vboxwrapper/vbox_mscom50.h                     |    25 +-
 samples/vboxwrapper/vbox_mscom_impl.cpp            |  2417 ++
 samples/vboxwrapper/vbox_mscom_impl.h              |    68 +
 samples/vboxwrapper/vbox_vboxmanage.cpp            |  1827 ++
 samples/vboxwrapper/vbox_vboxmanage.h              |    74 +
 samples/vboxwrapper/vboxcheckpoint.cpp             |   145 +
 .../{vboxwrapper.h => vboxcheckpoint.h}            |    35 +-
 samples/vboxwrapper/vboxjob.cpp                    |   222 +
 samples/vboxwrapper/vboxjob.h                      |   152 +
 .../vboxwrapper/vboxlog.cpp                        |    26 +-
 .../vboxwrapper/vboxlog.h                          |    15 +-
 samples/vboxwrapper/vboxlogging.cpp                |    67 +
 .../vboxwrapper/vboxlogging.h                      |    17 +-
 samples/vboxwrapper/vboxwrapper.cpp                |  1076 +-
 samples/vboxwrapper/vboxwrapper.h                  |     9 +-
 .../vboxwrapper.xcodeproj/project.pbxproj          |    70 +-
 samples/wrapper/wrapper.cpp                        |   112 +-
 sched/Makefile.am                                  |    16 +-
 sched/antique_file_deleter.cpp                     |     4 +-
 sched/assimilator.cpp                              |    14 +-
 sched/credit.cpp                                   |    62 +
 sched/credit.h                                     |     2 +
 sched/db_dump.cpp                                  |    43 +-
 sched/db_purge.cpp                                 |    60 +-
 sched/handle_request.cpp                           |   120 +-
 sched/makefile_validator_test                      |    11 +-
 sched/plan_class_spec.cpp                          |   191 +-
 sched/plan_class_spec.h                            |    10 +
 sched/sample_substr_validator.cpp                  |    27 +-
 sched/sched_array.cpp                              |    78 +-
 sched/sched_check.cpp                              |    47 +-
 sched/sched_config.cpp                             |    12 +-
 sched/sched_config.h                               |    18 +-
 sched/sched_customize.cpp                          |    72 +-
 sched/sched_locality.cpp                           |     7 +
 sched/sched_main.cpp                               |    25 +-
 sched/sched_nci.cpp                                |    10 +-
 sched/sched_result.cpp                             |    30 +-
 sched/sched_score.cpp                              |    86 +-
 sched/sched_send.cpp                               |    50 +-
 sched/sched_shmem.cpp                              |    61 +-
 sched/sched_types.cpp                              |    39 +-
 sched/sched_types.h                                |    17 +-
 sched/sched_util.cpp                               |    16 +-
 sched/sched_util.h                                 |     1 +
 sched/sched_util_basic.cpp                         |    10 +-
 sched/sched_version.cpp                            |     8 +-
 sched/script_assimilator.cpp                       |   118 +
 sched/script_validator.cpp                         |   126 +-
 sched/start                                        |     5 +-
 sched/transitioner.cpp                             |    23 +-
 sched/transitioner_catchup.php                     |     2 +-
 sched/update_stats.cpp                             |     2 +-
 sched/validate_util.cpp                            |     8 +-
 sched/validate_util.h                              |    13 +-
 sched/validator.cpp                                |     6 +
 sched/validator_test.cpp                           |    13 +-
 tools/create_work.cpp                              |    60 +-
 tools/make_project                                 |     3 +
 tools/stage_file                                   |   159 +-
 tools/update_versions                              |    63 +-
 vda/des.h                                          |     2 +-
 vda/sched_vda.cpp                                  |     6 +-
 vda/ssim.cpp                                       |     4 +-
 vda/vda.cpp                                        |     2 +-
 vda/vda_lib.cpp                                    |     6 +-
 vda/vda_lib2.cpp                                   |     4 +-
 version.h.in                                       |     2 +-
 version.log                                        |     2 +-
 xcompile/xcompile.MinGW32_on_cygwin.sh             |    92 +-
 840 files changed, 131526 insertions(+), 159928 deletions(-)

diff --git a/.gitignore b/.gitignore
index a592c25..27618d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,19 +24,128 @@
 /win_build/installerv2/redist/Windows/src/boinccas/Release95
 /win_build/installerv2/redist/Windows/src/boinccas/x64
 
+# Netbeans project files
+/html/nbproject/
+
 #
 *.pfx
 *.pvk
 *.spc
-*.o
-*.lo
-*.a
-*.la
-*.in
-/client/Makefile
 /win_build/*.filters
 /win_build/boinc.sdf
 /win_build/boinc.opensdf
 /win_build/ipch
 /win_build/installerv2/redist/Windows/src/boinccas/*.filters
 /win_build/installerv2/redist/Windows/src/boinccas/boinccas.sdf
+
+## files created by _autosetup (autoreconf):
+*.in
+*.in~
+aclocal.m4
+autom4te.cache/
+compile
+config.guess
+config.sub
+configure
+depcomp
+install-sh
+ltmain.sh
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+missing
+test-driver
+
+## files created by configure:
+Makefile
+.deps/
+boinc_path_config.py
+pkginfo
+prototype
+client/scripts/boinc-client
+config.h
+config.log
+config.status
+libtool
+py/Boinc/version.py
+py/setup.py
+stamp-h1
+test/version.inc
+
+## files created by make:
+*.o
+*.lo
+*.a
+*.la
+.libs/
+svn_version.h
+
+# list of executables
+apps/1sec
+apps/concat
+apps/upper_case
+client/boinc
+client/boinc_client
+client/boinccmd
+client/switcher
+clientgui/boincmgr
+clientscr/boincscr
+doc/manpages/appmgr.8
+doc/manpages/boinc.1
+doc/manpages/boinccmd.1
+doc/manpages/boincmgr.1
+lib/crypt_prog
+lib/parse_test
+py/lib.*/
+py/build/
+samples/example_app/uc2
+samples/example_app/ucn
+samples/sleeper/sleeper
+samples/worker/worker
+samples/wrapper/wrapper
+sched/adjust_user_priority
+sched/antique_file_deleter
+sched/census
+sched/cgi
+sched/credit_test
+sched/db_dump
+sched/db_purge
+sched/delete_file
+sched/fcgi
+sched/fcgi_file_upload_handler
+sched/feeder
+sched/file_deleter
+sched/file_upload_handler
+sched/get_file
+sched/make_work
+sched/message_handler
+sched/put_file
+sched/sample_assimilator
+sched/sample_bitwise_validator
+sched/sample_dummy_assimilator
+sched/sample_substr_validator
+sched/sample_trivial_validator
+sched/sample_work_generator
+sched/sched_driver
+sched/show_shmem
+sched/single_job_assimilator
+sched/size_regulator
+sched/status
+sched/stop
+sched/transitioner
+sched/trickle_credit
+sched/trickle_deadline
+sched/trickle_echo
+sched/update_stats
+sched/wu_check
+tools/cancel_jobs
+tools/create_work
+tools/dir_hier_move
+tools/dir_hier_path
+tools/remote_submit_test
+tools/sign_executable
+vda/ssim
+vda/vda
+vda/vdad
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..c63cab1
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,73 @@
+language: cpp
+compiler:
+  - gcc
+#  - clang
+
+branches:
+  only:
+    - master
+    - coverity_scan
+
+notifications:
+  email:
+    recipients:
+      - boinc_cvs at ssl.berkeley.edu
+    on_success: always
+    on_failure: always
+
+# This switches to the container-based infrastructure and allows caching
+sudo: false
+
+cache:
+  apt: true
+  directories:
+  - build/wxWidgets-3.0.2
+
+addons:
+  coverity_scan:
+    project:
+      name: "BOINC/boinc"
+      description: "Build submitted via Travis CI"
+    notification_email: christian.beer at posteo.de
+    build_command_prepend: "./configure --enable-apps"
+    build_command:   "make -j 4"
+    branch_pattern: coverity_scan
+  apt_packages:
+    - freeglut3-dev
+    - libxmu-dev
+    - libxi-dev
+    #- python-mysqldb
+    - libfcgi-dev
+    #- libcurl4-openssl-dev
+    #- libxss-dev
+    - libnotify-dev
+    - libxcb-util0-dev
+    - libsqlite3-dev
+    - libgtk2.0-dev
+    - libwebkitgtk-dev
+
+env:
+  global:
+    # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
+    #   via the "travis encrypt" command using the project repo's public key
+    - secure: "Rd++Hyurnwd/tvjH0PX2seO3QUZ6WOf8bSB2ZkKPfZCU6+tXVMvloyog6Mlc7vl0m3WFAzw24MDtNLFBUktRsVXOkqDup1s6PdkwwcwG+5wAnydN+kXF9PcqKyOi0xJvl48Wji+r92Y9SCLzPnQGjZg70xHET22bDZHt2FsjP80="
+  matrix:
+    - BOINC_TYPE=libs
+    - BOINC_TYPE=server
+    - BOINC_TYPE=client
+    - BOINC_TYPE=apps
+    - BOINC_TYPE=manager
+    #- BOINC_TYPE=coverity
+
+matrix:
+  fast_finish: true
+
+before_script:
+- ./_autosetup
+
+script:
+- if [[ "${BOINC_TYPE}" == "libs" ]]; then ( ./configure --disable-server --disable-client --disable-manager && make ) fi
+- if [[ "${BOINC_TYPE}" == "server" ]]; then ( ./configure --disable-client --disable-manager && make ) fi
+- if [[ "${BOINC_TYPE}" == "client" ]]; then ( ./configure --disable-server --disable-manager && make ) fi
+- if [[ "${BOINC_TYPE}" == "apps" ]]; then ( ./configure --enable-apps --disable-server --disable-client --disable-manager && make ) fi
+- if [[ "${BOINC_TYPE}" == "manager" ]]; then ( ./build/getWxWidgets.sh && ./configure --disable-server --disable-client --with-wxdir=./build/wxWidgets-3.0.2/buildgtk && make ) fi
diff --git a/Makefile.am b/Makefile.am
index 3287187..b7c09dc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,6 +13,10 @@ if ENABLE_LIBRARIES
 if ENABLE_SERVER
     API_SUBDIRS += zip
 endif
+## boinc_zip needed for wrapper
+if ENABLE_APPS
+    API_SUBDIRS += zip
+endif
 if ENABLE_BOINCZIP
     API_SUBDIRS += zip
 endif
@@ -34,9 +38,13 @@ if BUILD_X11_SCREENSAVER
 endif
 endif
 
+if ENABLE_APPS
+   APPS_SUBDIRS = samples
+endif
+
 # ORDER MATTERS below.  One must build dependencies FIRST, then things
 # that depend on them later
-SUBDIRS = m4 $(API_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS) $(CLIENTGUI_SUBDIRS) doc
+SUBDIRS = m4 $(API_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS) $(CLIENTGUI_SUBDIRS) $(APPS_SUBDIRS) doc
 
 # Putting a directory name recursively copies the entire contents - the
 # dist-hook below gets rid of CVS directories.
diff --git a/Makefile.incl b/Makefile.incl
index 582e5b8..b98b424 100644
--- a/Makefile.incl
+++ b/Makefile.incl
@@ -52,7 +52,7 @@ $(LIBBOINC):
 	cd $(top_builddir)/lib; ${MAKE} libboinc.la
 LIBBOINC_CRYPT = $(top_builddir)/lib/libboinc_crypt.la
 $(LIBBOINC_CRYPT):
-	cd $(top_builddir)/lib; ${MAKE} libboinc.la
+	cd $(top_builddir)/lib; ${MAKE} libboinc_crypt.la
 LIBBOINC_FCGI = $(top_builddir)/lib/libboinc_fcgi.la
 $(LIBBOINC_FCGI):
 	cd $(top_builddir)/lib; ${MAKE} libboinc_fcgi.la
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..c037975
--- /dev/null
+++ b/README.md
@@ -0,0 +1,5 @@
+# BOINC github mirror
+See official page on how to contribute: http://boinc.berkeley.edu/trac/wiki
+
+## Current build status
+master: [![Build Status](https://travis-ci.org/BOINC/boinc.svg?branch=master)](https://travis-ci.org/BOINC/boinc)
diff --git a/_autosetup b/_autosetup
index 775bc60..3fda0ee 100755
--- a/_autosetup
+++ b/_autosetup
@@ -17,7 +17,7 @@ esac
 ## return 0 if ok, 1 too old or not found  (-> shell conventions).
 ## ----------------------------------------------------------------------
 check_version()
-{  
+{
     dir=`pwd`
     cd /tmp
     foundit=
@@ -30,7 +30,7 @@ check_version()
 	foundit=yes;
     fi
 
-    if [ "$foundit" != yes ]; then 
+    if [ "$foundit" != yes ]; then
 	echo "Didn't find application";
 	version=0
 	success=no
@@ -63,7 +63,7 @@ check_version()
 
 
   ## --------------------------------------------------------------------------------
-  ## 'MAIN' starts here 
+  ## 'MAIN' starts here
   ## --------------------------------------------------------------------------------
   echo "Bootstrapping configure script and makefiles:"
 
@@ -93,7 +93,7 @@ check_version()
          echo >/dev/null
       elif check_version gm4 1.4; then
          have_gm4=yes;
-      else 
+      else
          echo "Couldn't find a new-enough version of 'm4', please install one!";
          echo "If you have a newer version, set the environment variable 'M4' to its path";
          exit 1;
@@ -134,6 +134,10 @@ check_version()
 
   ## ---------- now run autoreconf
   cmdline="autoreconf -i";
+  ## -- if _autosetup was invoked with -f run autoreconf with -f to force a recreation of all files
+  if [ "$1" = "-f" ]; then
+    cmdline="autoreconf -i -f";
+  fi
 echo "$cmdline"
 if eval $cmdline; then
     echo "Done, now run ./configure"
diff --git a/android/BOINC/AndroidManifest.xml b/android/BOINC/AndroidManifest.xml
index c8eed6c..33c0b70 100644
--- a/android/BOINC/AndroidManifest.xml
+++ b/android/BOINC/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <!--
   This file is part of BOINC.
   http://boinc.berkeley.edu
-  Copyright (C) 2014 University of California
+  Copyright (C) 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
@@ -20,8 +20,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="edu.berkeley.boinc"
     android:installLocation="internalOnly"
-    android:versionCode="114"
-    android:versionName="7.4.42" > <!-- installation on SD card would break boot receiver -->
+    android:versionCode="72"
+    android:versionName="7.5.0" > <!-- 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 -->
@@ -46,6 +46,7 @@
 
     <application
         android:allowBackup="true"
+        android:debuggable="true"
         android:icon="@drawable/boinc"
         android:label="@string/app_name"
         android:theme="@style/Theme.Styled"
diff --git a/android/BOINC/res/values-ca/strings.xml b/android/BOINC/res/values-ca/strings.xml
index bfc8d72..426cbc3 100644
--- a/android/BOINC/res/values-ca/strings.xml
+++ b/android/BOINC/res/values-ca/strings.xml
@@ -1,7 +1,14 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--app global-->
   <string name="app_name">BOINC</string>
+  <!--generic. used by multiple Activities/tabs-->
   <string name="generic_loading">Carregant! Si us plau, espera...</string>
+  <string name="generic_button_continue">Continuar</string>
+  <string name="generic_button_finish">Finalitzar</string>
+  <!--attach project-->
+  <!--selection list-->
+  <string name="attachproject_list_desc">Selecciona els projectes científics en els que vols participar:</string>
   <string name="attachproject_list_header">Selecciona un projecte:</string>
   <string name="attachproject_list_manual_button">Afegir projecte mitjançant URL</string>
   <string name="attachproject_list_manual_dialog_title">Introdueix la URL del projecte:</string>
@@ -9,7 +16,35 @@
   <string name="attachproject_list_manual_no_url">Si us plau introdueix la URL del projecte</string>
   <string name="attachproject_list_acctmgr_button">Afegir gestor de comptes</string>
   <string name="attachproject_list_no_internet">No hi ha connexió a Internet</string>
-  <string name="attachproject_login_loading">Contactant el servidor del projecte...</string>
+  <!--credential input-->
+  <string name="attachproject_credential_input_sing_desc">Entra la informació del teu compte:</string>
+  <string name="attachproject_credential_input_desc">Entra la informació del teu compte per els projectes seleccionats:</string>
+  <string name="attachproject_credential_input_show_pwd">Mostra la contrasenya</string>
+  <string name="attachproject_individual_credential_input">Afegir els projectes individualment:</string>
+  <!--conflicts-->
+  <string name="attachproject_conflicts_desc">S\'han produït problemes afegint els projectes:</string>
+  <string name="attachproject_conflict_undefined">No s\'ha pogut connectar</string>
+  <string name="attachproject_conflict_not_unique">El compte ja existeix amb un altre contrasenya</string>
+  <string name="attachproject_conflict_bad_password">Contrasenya incorrecte</string>
+  <string name="attachproject_conflict_unknown_user">El compte no existeix</string>
+  <string name="attachproject_conflict_unknown_user_creation_disabled">El compte no existeix, vista la pàgina web del projecte per registrar-te-hi</string>
+  <!--working-->
+  <string name="attachproject_working_attaching">Adjuntant</string>
+  <!--e.g. Attaching Einstein at Home-->
+  <!--hints-->
+  <string name="attachproject_hints_header">Ajuda</string>
+  <!--e.g. Hint 1/2-->
+  <string name="attachproject_hint_contribtion_header">Com contribuir:</string>
+  <string name="attachproject_hint_contribtion_wifi">1. Connectar a una xarxa WiFi</string>
+  <string name="attachproject_hint_contribtion_charger">2, Connectar el carregador</string>
+  <string name="attachproject_hint_contribtion_screen">3. Desactivar la Pantalla</string>
+  <string name="attachproject_hint_projectwebsite_header">Visita els llocs web dels projectes a:</string>
+  <string name="attachproject_hint_projectwebsite_science">Apren més sobre la ciència</string>
+  <string name="attachproject_hint_projectwebsite_stats">Veure les estadístiques de les contibucions</string>
+  <string name="attachproject_hint_projectwebsite_community">Posat en contacte amb altres voluntaris</string>
+  <string name="attachproject_hint_platforms_header">BOINC també està disponible per al teu ordinador o portàtil, visita boinc.berkeley.edu per aprendre més.</string>
+  <!--project login-->
+  <string name="attachproject_login_loading">Connectant amb el servidor del projecte...</string>
   <string name="attachproject_login_image_description">Logo del projecte.</string>
   <string name="attachproject_login_header_general_area">Zona general:</string>
   <string name="attachproject_login_header_specific_area">Zona específica:</string>
@@ -28,12 +63,13 @@
   <string name="attachproject_login_category_creation">Nou a</string>
   <string name="attachproject_login_header_creation_enabled">Registra un compte per participar:</string>
   <string name="attachproject_login_header_creation_client_disabled">Visita la pàgina web del projecte per crear un compte:</string>
-  <string name="attachproject_login_header_creation_disabled">Actualment el projecte permet la creació de nous comptes!</string>
+  <string name="attachproject_login_header_creation_disabled">Aquest projecte no està acceptant nous comptes.</string>
   <string name="attachproject_login_button_registration">Registre\'t</string>
   <string name="attachproject_login_button_login">Registre\'t</string>
   <string name="attachproject_login_button_forgotpw">He oblidat la contrasenya</string>
   <string name="attachproject_login_error_toast">Ha fallat la connexió amb el projecte!</string>
   <string name="attachproject_login_attached">Adjuntat</string>
+  <!--project registration-->
   <string name="attachproject_registration_header">Compte de registre per</string>
   <string name="attachproject_registration_header_url">Projecte:</string>
   <string name="attachproject_registration_header_email">Correu electrònic:</string>
@@ -42,16 +78,20 @@
   <string name="attachproject_registration_header_pwd">Contrasenya:</string>
   <string name="attachproject_registration_header_pwd_confirm">... Torna a entrar-ho:</string>
   <string name="attachproject_registration_button">Crear</string>
+  <!--account manager-->
+  <string name="attachproject_acctmgr_list_desc">Utilitza l\'administrador de comptes de BOINC per afegir i gestionar múltiples projectes</string>
   <string name="attachproject_acctmgr_header">Afegir gestor de comptes</string>
   <string name="attachproject_acctmgr_header_url">URL</string>
   <string name="attachproject_acctmgr_header_name">Usuari:</string>
   <string name="attachproject_acctmgr_header_pwd">Contrasenya:</string>
   <string name="attachproject_acctmgr_header_pwd_confirm">... Torna a entrar-ho:</string>
   <string name="attachproject_acctmgr_button">Afegeix</string>
+  <!--error strings-->
   <string name="attachproject_error_wrong_name">No s\'ha trobat aquest usuari</string>
   <string name="attachproject_error_short_pwd">La contrasenya és massa curta</string>
   <string name="attachproject_error_no_internet">Ha fallat la connexió</string>
   <string name="attachproject_error_pwd_no_match">Les contrasenyes no coincideixen</string>
+  <string name="attachproject_error_pwd_no_retype">Si us plau introdueix de nou la contrasenya</string>
   <string name="attachproject_error_no_url">Si us plau introdueix una URL</string>
   <string name="attachproject_error_no_email">Si us plau introdueix l\'adreça de correu electrònic</string>
   <string name="attachproject_error_no_pwd">Si us plau introdueix una contrasenya</string>
@@ -64,6 +104,7 @@
   <string name="attachproject_error_bad_pwd">Contrasenya rebutjada</string>
   <string name="attachproject_error_creation_disabled">La creació de comptes està desactivada en aquest projecte</string>
   <string name="attachproject_error_invalid_url">URL incorrecte</string>
+  <!--working activity-->
   <string name="attachproject_working_back_button">Enrere</string>
   <string name="attachproject_working_finish_button">Finalitza</string>
   <string name="attachproject_working_check_desc">Reeixit</string>
@@ -77,9 +118,12 @@
   <string name="attachproject_working_login">Registret</string>
   <string name="attachproject_working_acctmgr">Afegir gestor de comptes</string>
   <string name="attachproject_working_acctmgr_sync">Sincronitzar</string>
+  <!--main activity-->
+  <string name="main_noproject_warning">Prem aquí per seleccionar un projecte</string>
   <string name="main_error">Uppps</string>
   <string name="main_error_long">...això no ha de succeir!\n Feu clic a la icona per intentar-ho de nou.</string>
   <string name="main_title_icon_desc">Icona de BOINC</string>
+  <!--tab names-->
   <string name="tab_status">Estatus</string>
   <string name="tab_projects">Projectes</string>
   <string name="tab_tasks">Tasques</string>
@@ -87,6 +131,7 @@
   <string name="tab_preferences">Preferències</string>
   <string name="tab_notices">Notícies</string>
   <string name="tab_desc">Navegació</string>
+  <!--status strings-->
   <string name="status_running">Treballant</string>
   <string name="status_running_long">Gràcies per participar.</string>
   <string name="status_paused">Suspès</string>
@@ -99,6 +144,7 @@
   <string name="status_closing">Tancant...</string>
   <string name="status_benchmarking">Executamt proves...</string>
   <string name="status_image_description">imatge del projecte</string>
+  <!--preferences tab strings-->
   <string name="prefs_loading">Llegint preferències...</string>
   <string name="prefs_submit_button">Desa</string>
   <string name="prefs_dialog_title">Introdueix el nou valor:</string>
@@ -111,6 +157,15 @@
   <string name="prefs_category_memory">Memòria</string>
   <string name="prefs_category_debug">Depura</string>
   <string name="prefs_show_advanced_header">Mostra les preferències i controls avançats...</string>
+  <string name="prefs_suspend_when_screen_on">Atura el càlcul quan la pantalla estigui activa</string>
+  <string name="prefs_stationary_device_mode_header">Mode de dispositiu fix</string>
+  <string name="prefs_stationary_device_mode_description">Permet el càlcul independentment de les preferències d\'alimentació. Només activar-ho si el dispositiu no té una bateria.</string>
+  <string name="prefs_power_source_header">Fonts d\'alimentació per al càlcul</string>
+  <string name="prefs_power_source_description">Selecciona les fonts d\'energia que BOINC pot utilitzar per al càlcul.</string>
+  <string name="prefs_power_source_ac">Endoll</string>
+  <string name="prefs_power_source_usb">Connexió USB</string>
+  <string name="prefs_power_source_wireless">Carregador sense fils</string>
+  <string name="prefs_power_source_battery">Bateria</string>
   <string name="battery_charge_min_pct_header">Nivell mínim de la bateria</string>
   <string name="battery_charge_min_pct_description">BOINC atura la computació si el nivell de càrrega de la bateria per sota del definit.</string>
   <string name="battery_temperature_max_header">Temperatura màxima de la bateria</string>
@@ -119,14 +174,18 @@
   <string name="prefs_disk_max_pct_description">Quin percentatge d\'espai d\'emmagatzematge del seu dispositiu pot utilitzar BOINC?</string>
   <string name="prefs_disk_min_free_gb_header">Espai mínim d\'emmagatzematge</string>
   <string name="prefs_disk_min_free_gb_description">Quina quantitat d\'espai d\'emmagatzematge del dispositiu s\'ha de mantenir lliure?</string>
+  <string name="prefs_disk_access_interval_header">Període d\'accés</string>
+  <string name="prefs_disk_access_interval_description">Suggereix un interval entre accessos al disc</string>
   <string name="prefs_network_daily_xfer_limit_mb_header">Límit de transferència diària</string>
   <string name="prefs_network_daily_xfer_limit_mb_description">Limita el tràfic diàri de dades degut a BOINC</string>
   <string name="prefs_network_wifi_only_header">Transferir tasques només amb WiFi</string>
   <string name="prefs_autostart_header">Inici automàtic</string>
+  <string name="prefs_show_notification_notices_header">Mostra una notificació per a nous avisos</string>
+  <string name="prefs_show_notification_suspended_header">Mostra una notificació quan es suspengui</string>
   <string name="prefs_cpu_number_cpus_header">Nuclis de CPU usats</string>
   <string name="prefs_cpu_number_cpus_description">Limita el nombre de nuclis de CPU que BOINC utilitza per la computació.</string>
   <string name="prefs_cpu_other_load_suspension_header">Pausa en l\'ús de la CPU per sobre de</string>
-  <string name="prefs_cpu_other_load_suspension_description">Determina quan BOINC pausa el còmput degut a la utilització de la CPU per un altra aplicació.</string>
+  <string name="prefs_cpu_other_load_suspension_description">Determina quan BOINC pausa el còmput degut a l\'ús de la CPU per altres aplicacions.</string>
   <string name="prefs_cpu_time_max_header">Límit de CPU</string>
   <string name="prefs_cpu_time_max_description">Limita el temps de CPU que BOINC utilitza per la computació.</string>
   <string name="prefs_memory_max_idle_header">RAM límit</string>
@@ -138,12 +197,15 @@
   <string name="prefs_unit_gb">GB</string>
   <string name="prefs_unit_pct">%</string>
   <string name="prefs_unit_celcius">°C</string>
+  <string name="prefs_unit_seconds">segon</string>
+  <!--projects tab strings-->
   <string name="projects_loading">S\'estan carregant els projectes...</string>
   <string name="projects_add">Afegeix el projecte</string>
   <string name="projects_icon">Icona delprojecte</string>
   <string name="projects_credits_header">Crèdit:</string>
   <string name="projects_credits_host_header">(en aquest dispositiu)</string>
   <string name="projects_credits_user_header">(total)</string>
+  <!--project status strings-->
   <string name="projects_status_suspendedviagui">Suspès per l\'usuari</string>
   <string name="projects_status_dontrequestmorework">No descarregar tasques noves</string>
   <string name="projects_status_ended">Projecte finalitzat - CORRECTE per eliminar-lo</string>
@@ -152,6 +214,7 @@
   <string name="projects_status_schedrpcinprogress">Petició al gestor en curs</string>
   <string name="projects_status_trickleuppending">Missatge de degoteig en espera</string>
   <string name="projects_status_backoff">Comunicació del gestor a:</string>
+  <!--project controls-->
   <string name="projects_control_dialog_title">Ordres del projecte:</string>
   <string name="projects_control_visit_website">Visita el lloc web</string>
   <string name="projects_control_update">Actualitza</string>
@@ -164,16 +227,20 @@
   <string name="projects_control_dialog_title_acctmgr">Ordres del gestor de comptes:</string>
   <string name="projects_control_sync_acctmgr">Sincronitzar</string>
   <string name="projects_control_remove_acctmgr">Desactivar</string>
+  <!--project confirm dialog-->
   <string name="projects_confirm_detach_title">Eliminar el projecte?</string>
   <string name="projects_confirm_detach_message">Estàs segur que voleu eliminar</string>
   <string name="projects_confirm_detach_message2">de BOINC?</string>
   <string name="projects_confirm_detach_confirm">Elimina</string>
   <string name="projects_confirm_reset_title">Reinicia el projecte</string>
   <string name="projects_confirm_reset_message">Estàs segur que vols reiniciar</string>
+  <string name="projects_confirm_reset_message2">\?</string>
   <string name="projects_confirm_reset_confirm">Reinicia</string>
   <string name="projects_confirm_remove_acctmgr_title">Desactivar el gestor de comptes</string>
-  <string name="projects_confirm_remove_acctmgr_message">"Està segur de voler finalitzar la utilització de "</string>
+  <string name="projects_confirm_remove_acctmgr_message">Està segur de voler finalitzar la utilització de </string>
+  <string name="projects_confirm_remove_acctmgr_message2">\?</string>
   <string name="projects_confirm_remove_acctmgr_confirm">Desactivar</string>
+  <!--tasks tab strings-->
   <string name="tasks_header_name">Nom de la tasca:</string>
   <string name="tasks_header_elapsed_time">Temps transcorregut:</string>
   <string name="tasks_header_project_paused">(suspès)</string>
@@ -194,11 +261,13 @@
   <string name="tasks_custom_suspended_via_gui">suspès</string>
   <string name="tasks_custom_project_suspended_via_gui">projecte suspès</string>
   <string name="tasks_custom_ready_to_report">a punt per informar</string>
+  <!--confirmation dialog-->
   <string name="confirm_abort_task_title">Avortar la tasca?</string>
   <string name="confirm_abort_task_message">Avortar la tasca:</string>
   <string name="confirm_abort_task_confirm">Avorta</string>
   <string name="confirm_cancel">Cancel·la</string>
   <string name="confirm_image_desc">Diàleg de confirmació</string>
+  <!--transfers tab strings-->
   <string name="trans_loading">Llegint transferències...</string>
   <string name="trans_upload">Puja</string>
   <string name="trans_download">Descarrega</string>
@@ -213,14 +282,18 @@
   <string name="confirm_abort_trans_title">Avortar la transferència?</string>
   <string name="confirm_abort_trans_message">Avortar arxiu:</string>
   <string name="confirm_abort_trans_confirm">Avorta</string>
+  <!--notices tab strings-->
   <string name="notices_loading">Llegint notícies...</string>
+  <!--eventlog tab strings-->
   <string name="eventlog_loading">Carregant missatges de registre...</string>
   <string name="eventlog_client_header">Missatges del client</string>
   <string name="eventlog_gui_header">Missatges GUI</string>
   <string name="eventlog_copy_toast">Registre copiat al porta-retalls</string>
   <string name="eventlog_email_subject">Registre d\'esdeveniments de BOINC en Android:</string>
+  <!--suspend reasons-->
   <string name="suspend_unknown">Computació suspesa.</string>
   <string name="suspend_batteries">Connecta el dispositiu a un carregador per continuar el còmput.</string>
+  <string name="suspend_screen_on">Apaga la pantalla per continuar la computació.</string>
   <string name="suspend_useractive">L\'usuari està actiu.</string>
   <string name="suspend_tod">Fora del termini especificat per el còmput.</string>
   <string name="suspend_bm">BOINC està avaluant el teu dispositiu...</string>
@@ -233,12 +306,14 @@
   <string name="suspend_network_quota">BOINC ha assolit el límit de transferència per xarxa.</string>
   <string name="suspend_os">Suspès per Android.</string>
   <string name="suspend_wifi">No hi ha connexió Wifi.</string>
-  <string name="suspend_battery_charging">La bateria necessita carregar-se abans de continuar la computació.</string>
+  <string name="suspend_battery_charging">Esperant a la càrrega de la bateria.</string>
   <string name="suspend_battery_charging_long">La computació continuarà quan la bateria tingui una carregada del</string>
+  <string name="suspend_battery_charging_long2"></string>
   <string name="suspend_battery_charging_current">actual</string>
   <string name="suspend_battery_overheating">Esperant que es refredi la bateria</string>
   <string name="suspend_user_req">Continuant la computació...</string>
   <string name="suspend_network_user_req">manualment.</string>
+  <!--rpc reasons-->
   <string name="rpcreason_userreq">Sol·licitat per l\'usuari</string>
   <string name="rpcreason_needwork">Per obtenir feina</string>
   <string name="rpcreason_resultsdue">Per informar tasques finalitzades</string>
@@ -247,6 +322,7 @@
   <string name="rpcreason_init">Inicialització del projecte</string>
   <string name="rpcreason_projectreq">Sol·licitat per el projecte</string>
   <string name="rpcreason_unknown">Motiu desconegut</string>
+  <!--menu-->
   <string name="menu_refresh">Actualitza</string>
   <string name="menu_emailto">Envia per correu electrònic</string>
   <string name="menu_copy">Copia al porta-retalls</string>
@@ -256,10 +332,29 @@
   <string name="menu_run_mode_enable">Reprèn</string>
   <string name="menu_about">Sobre</string>
   <string name="menu_help">Ajuda</string>
+  <!--about dialog-->
   <string name="about_button">Retorna</string>
   <string name="about_title">Sobre</string>
   <string name="about_name">BOINC</string>
   <string name="about_version">Versió</string>
   <string name="about_name_long">Berkeley Open Infrastructure for Network Computing</string>
   <string name="about_copyright">© 2003–2013 Universitat de Califòrnia, Berkeley.\nTots els Drets Reservats.</string>
+  <string name="about_copyright_reserved">Reservats tots els drets.</string>
+  <string name="about_credits">Gràcies a l\'Institut Max Planck de Física Gravitacional, IBM Corporation i HTC Corporation pel seu suport.</string>
+  <!--notice notification-->
+  <string name="notice_notification_single_header">Nou avís de</string>
+  <!--e.g. New notice from SETI at HOME-->
+  <string name="notice_notification_multiple_header">nous avisos</string>
+  <!--e.g. 3 new notices-->
+  <!--multi BOINC compitability-->
+  <string name="nonexcl_dialog_header">Aplicació de computació voluntària detectada</string>
+  <string name="nonexcl_dialog_text">Una altra aplicació de computació voluntària s\'està executant en aquest dispositiu. Només una pot executar-se alhora.</string>
+  <string name="nonexcl_dialog_exit">Sortir</string>
+  <!--social integration-->
+  <string name="social_invite_button">Convida als teus amics</string>
+  <string name="social_invite_intent_title">Com vols compartir?</string>
+  <string name="social_invite_content_title">Estic fent ciència en el meu telèfon!</string>
+  <string name="social_invite_content_body">Estic usant el meu %1$s per fer computació per a la ciència. Tu també pots fer-ho! Descarrega l\'aplicació des 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-cs/strings.xml b/android/BOINC/res/values-cs/strings.xml
index 490c4fd..ea98039 100644
--- a/android/BOINC/res/values-cs/strings.xml
+++ b/android/BOINC/res/values-cs/strings.xml
@@ -1,3 +1,361 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-</resources>
\ No newline at end of file
+  <!--app global-->
+  <string name="app_name">BOINC</string>
+  <!--generic. used by multiple Activities/tabs-->
+  <string name="generic_loading">Načítám! Počkejte prosím...</string>
+  <string name="generic_button_continue">Pokračovat</string>
+  <string name="generic_button_finish">Dokončit</string>
+  <!--attach project-->
+  <!--selection list-->
+  <string name="attachproject_list_desc">Vyberte vědecké projekty, kterých se chcete účastnit:</string>
+  <string name="attachproject_list_header">Vyber projekt</string>
+  <string name="attachproject_list_manual_button">Přidat projekt pomocí adresy URL</string>
+  <string name="attachproject_list_manual_dialog_title">Zadejte URL adresu projektu:</string>
+  <string name="attachproject_list_manual_dialog_button">Přidat projekt</string>
+  <string name="attachproject_list_manual_no_url">Prosím zadejte URL adresu projektu</string>
+  <string name="attachproject_list_acctmgr_button">Přidat správce účtu</string>
+  <string name="attachproject_list_no_internet">Není připojení k internetu</string>
+  <!--credential input-->
+  <string name="attachproject_credential_input_sing_desc">Zadejte informace o účtu</string>
+  <string name="attachproject_credential_input_desc">Zadejte informace o účtu pro vybrané projekty:</string>
+  <string name="attachproject_credential_input_show_pwd">Zobrazit heslo</string>
+  <string name="attachproject_individual_credential_input">Připojit projekty individuálně</string>
+  <!--conflicts-->
+  <string name="attachproject_conflicts_desc">Vyskytly se problémy během připojování vědeckých projektů:</string>
+  <string name="attachproject_conflict_undefined">Nelze se připojit</string>
+  <string name="attachproject_conflict_not_unique">Existuje účet s jiným heslem</string>
+  <string name="attachproject_conflict_bad_password">Nesprávné heslo</string>
+  <string name="attachproject_conflict_unknown_user">Účet neexistuje</string>
+  <string name="attachproject_conflict_unknown_user_creation_disabled">Účet neexistuje, navštivte webové stránky projektu k registraci</string>
+  <!--working-->
+  <string name="attachproject_working_attaching">Připojování</string>
+  <!--e.g. Attaching Einstein at Home-->
+  <!--hints-->
+  <string name="attachproject_hints_header">Tip</string>
+  <!--e.g. Hint 1/2-->
+  <string name="attachproject_hint_contribtion_header">Jak přispět:</string>
+  <string name="attachproject_hint_contribtion_wifi">1. Připojte se k WiFi</string>
+  <string name="attachproject_hint_contribtion_charger">2. Připojte nabíječku</string>
+  <string name="attachproject_hint_contribtion_screen">3. Vypněte obrazovku</string>
+  <string name="attachproject_hint_projectwebsite_header">Navštivte webové stránky projektu:</string>
+  <string name="attachproject_hint_projectwebsite_science">Chvi se dozvědět více o vědě</string>
+  <string name="attachproject_hint_projectwebsite_stats">Zobrazit statistiky přispívání</string>
+  <string name="attachproject_hint_projectwebsite_community">Spojte se s ostatními dobrovolníky</string>
+  <string name="attachproject_hint_platforms_header">BOINC je také k dispozici pro váš počítač nebo notebook, návštivte boinc.berkeley.edu pro více informací.</string>
+  <!--project login-->
+  <string name="attachproject_login_loading">Připojování k serveru projektu...</string>
+  <string name="attachproject_login_image_description">Logo projektu.</string>
+  <string name="attachproject_login_header_general_area">Obecná oblast:</string>
+  <string name="attachproject_login_header_specific_area">Specifická oblast:</string>
+  <string name="attachproject_login_header_description">Popis:</string>
+  <string name="attachproject_login_header_home">Domů:</string>
+  <string name="attachproject_login_header_url">Webové stránky:</string>
+  <string name="attachproject_login_header_platform">Android:</string>
+  <string name="attachproject_login_platform_supported">Typ zařízení je podporován projektem</string>
+  <string name="attachproject_login_platform_not_supported">Zařízení není projektem podporováno</string>
+  <string name="attachproject_login_category_terms_of_use">Podmínky použití pro</string>
+  <string name="attachproject_login_accept_terms_of_use">Vytvořením účtu na tomto projektu souhlasíte s podmínkami používání, které jsou uvedeny výše.</string>
+  <string name="attachproject_login_category_login">Přihlášení pomocí stávajícího účtu</string>
+  <string name="attachproject_login_header_id_email">E-mail:</string>
+  <string name="attachproject_login_header_id_name">Jméno:</string>
+  <string name="attachproject_login_header_pwd">Heslo:</string>
+  <string name="attachproject_login_category_creation">Nový do</string>
+  <string name="attachproject_login_header_creation_enabled">Registrovat účet k účasti:</string>
+  <string name="attachproject_login_header_creation_client_disabled">Navštivte stránky projektu pro vytvoření účtu:</string>
+  <string name="attachproject_login_header_creation_disabled">Tento projekt v současné době nepřijímá nové účty.</string>
+  <string name="attachproject_login_button_registration">Registrace</string>
+  <string name="attachproject_login_button_login">Přihlásit se</string>
+  <string name="attachproject_login_button_forgotpw">Zapomenuté heslo</string>
+  <string name="attachproject_login_error_toast">Kontaktování projektu selhalo!</string>
+  <string name="attachproject_login_attached">Připojeno</string>
+  <!--project registration-->
+  <string name="attachproject_registration_header">Registrace účtu pro </string>
+  <string name="attachproject_registration_header_url">Projekt:</string>
+  <string name="attachproject_registration_header_email">E-mail:</string>
+  <string name="attachproject_registration_header_username">Jméno:</string>
+  <string name="attachproject_registration_header_teamname">Tým:</string>
+  <string name="attachproject_registration_header_pwd">Heslo:</string>
+  <string name="attachproject_registration_header_pwd_confirm">… Znovu:</string>
+  <string name="attachproject_registration_button">Vytvořit</string>
+  <!--account manager-->
+  <string name="attachproject_acctmgr_list_desc">Použít správce účtu BOINC pro přidání a správu vícero projektů</string>
+  <string name="attachproject_acctmgr_header">Přidat správce účtu</string>
+  <string name="attachproject_acctmgr_header_url">URL adresa</string>
+  <string name="attachproject_acctmgr_header_name">Uživatel:</string>
+  <string name="attachproject_acctmgr_header_pwd">Heslo:</string>
+  <string name="attachproject_acctmgr_header_pwd_confirm">… Znovu:</string>
+  <string name="attachproject_acctmgr_button">Přidat</string>
+  <!--error strings-->
+  <string name="attachproject_error_wrong_name">Uživatel nenalezen</string>
+  <string name="attachproject_error_short_pwd">Heslo je příliš krátké</string>
+  <string name="attachproject_error_no_internet">Připojení selhalo</string>
+  <string name="attachproject_error_pwd_no_match">Hesla neodpovídají</string>
+  <string name="attachproject_error_pwd_no_retype">Zadejte prosím heslo znovu</string>
+  <string name="attachproject_error_no_url">Prosím zadejte adresu URL</string>
+  <string name="attachproject_error_no_email">Zadejte e-mailovou adresu</string>
+  <string name="attachproject_error_no_pwd">Zadejte prosím heslo</string>
+  <string name="attachproject_error_no_name">Zadejte prosím uživatelské jméno</string>
+  <string name="attachproject_error_unknown">nezdařilo se</string>
+  <string name="attachproject_error_bad_username">Uživatelské jméno odmítnuto</string>
+  <string name="attachproject_error_email_in_use">E-mail je již používán</string>
+  <string name="attachproject_error_project_down">Projekt je v režimu offline</string>
+  <string name="attachproject_error_email_bad_syntax">E-mail odmítnut</string>
+  <string name="attachproject_error_bad_pwd">Heslo odmítnuto</string>
+  <string name="attachproject_error_creation_disabled">Vytvoření účtu je na tomto projektu zakázáno</string>
+  <string name="attachproject_error_invalid_url">Neplatná URL adresa</string>
+  <!--working activity-->
+  <string name="attachproject_working_back_button">Zpět</string>
+  <string name="attachproject_working_finish_button">Dokončit</string>
+  <string name="attachproject_working_check_desc">Úspěšný</string>
+  <string name="attachproject_working_failed_desc">Nezdařilo se</string>
+  <string name="attachproject_working_ongoing">…</string>
+  <string name="attachproject_working_finished">.</string>
+  <string name="attachproject_working_description">:</string>
+  <string name="attachproject_working_connect">Připojit</string>
+  <string name="attachproject_working_verify">Ověřit účet</string>
+  <string name="attachproject_working_register">Registrovat účet</string>
+  <string name="attachproject_working_login">Přihlásit se</string>
+  <string name="attachproject_working_acctmgr">Přidat správce účtu</string>
+  <string name="attachproject_working_acctmgr_sync">Synchronizovat</string>
+  <!--main activity-->
+  <string name="main_noproject_warning">Klepnutím sem vyberte projekt.</string>
+  <string name="main_error">Whooops</string>
+  <string name="main_error_long">.. tohle by se nemělo stát! \nClick na ikonu pro nový pokus.</string>
+  <string name="main_title_icon_desc">BOINC ikona</string>
+  <!--tab names-->
+  <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_preferences">Předvolby</string>
+  <string name="tab_notices">Zprávy</string>
+  <string name="tab_desc">Navigace</string>
+  <!--status strings-->
+  <string name="status_running">Počítání</string>
+  <string name="status_running_long">Děkujeme za vaši účast.</string>
+  <string name="status_paused">Pozastaveno</string>
+  <string name="status_idle">Nic k práci</string>
+  <string name="status_idle_long">Čekání na úkoly...</string>
+  <string name="status_computing_disabled">Pozastaveno</string>
+  <string name="status_computing_disabled_long">Stisknutím tlačítka play obnovíte síť a počítání.</string>
+  <string name="status_launching">Spouštění...</string>
+  <string name="status_noproject">Zvolte projekt, na kterém se chcete podílet.</string>
+  <string name="status_closing">Zavírání...</string>
+  <string name="status_benchmarking">Testuji výkon...</string>
+  <string name="status_image_description">obrázek projektu</string>
+  <!--preferences tab strings-->
+  <string name="prefs_loading">Čtení předvoleb...</string>
+  <string name="prefs_submit_button">Uložit</string>
+  <string name="prefs_dialog_title">Zadejte novou hodnotu:</string>
+  <string name="prefs_dialog_title_selection">Vyberte:</string>
+  <string name="prefs_category_general">Obecné</string>
+  <string name="prefs_category_network">Síť</string>
+  <string name="prefs_category_power">Výkon</string>
+  <string name="prefs_category_cpu">Procesor</string>
+  <string name="prefs_category_storage">Úložiště</string>
+  <string name="prefs_category_memory">Paměť</string>
+  <string name="prefs_category_debug">Ladění</string>
+  <string name="prefs_show_advanced_header">Zobrazit pokročilá nastavení a ovládání...</string>
+  <string name="prefs_suspend_when_screen_on">Pozastavit výpočet když obrazovka je zapnutá</string>
+  <string name="prefs_stationary_device_mode_header">Režim stacionárního zařízení</string>
+  <string name="prefs_stationary_device_mode_description">Povolit počítání bez ohledu na nastavení výkonu. Zapnuto pouze pokud zařízení nemá baterii.</string>
+  <string name="prefs_power_source_header">Zdroje energie pro počítání</string>
+  <string name="prefs_power_source_description">Vyberte zdroje energie, které bude BOINC moci využít pro počítání.</string>
+  <string name="prefs_power_source_ac">Nabíječka</string>
+  <string name="prefs_power_source_usb">USB připojení</string>
+  <string name="prefs_power_source_wireless">Bezdrátová nabíječka</string>
+  <string name="prefs_power_source_battery">Baterie</string>
+  <string name="battery_charge_min_pct_header">Min. úroveň baterie</string>
+  <string name="battery_charge_min_pct_description">BOINC pozastaví výpočet pokud je stav nabití baterie pod stanovenou úroveň.</string>
+  <string name="battery_temperature_max_header">Max. teplota baterie</string>
+  <string name="battery_temperature_max_description">BOINC pozastaví výpočet pokud je teplota baterie nad stanovenou hranicí. Tuto hodnotu nedoporučujeme měnit.</string>
+  <string name="prefs_disk_max_pct_header">Max. použitelné úložiště</string>
+  <string name="prefs_disk_max_pct_description">Kolik procent z vašeho úložného prostoru v zařízení může BOINC využít?</string>
+  <string name="prefs_disk_min_free_gb_header">Min. rezerva úložiště</string>
+  <string name="prefs_disk_min_free_gb_description">Kolik místa v úložišti zařízení musí zůstat volné?</string>
+  <string name="prefs_disk_access_interval_header">Interval přístupu</string>
+  <string name="prefs_disk_access_interval_description">Navrhnětě interval mezi přístupy na úložiště</string>
+  <string name="prefs_network_daily_xfer_limit_mb_header">Denní limit přenosu</string>
+  <string name="prefs_network_daily_xfer_limit_mb_description">Limituje síťová data, která může BOINC využít.</string>
+  <string name="prefs_network_wifi_only_header">Přenášej úkoly pouze na WiFi</string>
+  <string name="prefs_autostart_header">Automatické spuštění</string>
+  <string name="prefs_show_notification_notices_header">Zobrazit upozornění pro nové oznámení</string>
+  <string name="prefs_show_notification_suspended_header">Zobrazit oznámení pokud je pozastaveno</string>
+  <string name="prefs_cpu_number_cpus_header">Použitá jádra procesoru</string>
+  <string name="prefs_cpu_number_cpus_description">Omezuje počet jader procesoru, které může BOINC použít pro výpočet.</string>
+  <string name="prefs_cpu_other_load_suspension_header">Pozastav při využití procesoru nad</string>
+  <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_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>
+  <string name="prefs_gui_log_level_description">Určuje podrobnost ve výpisu zpráv GUI.</string>
+  <string name="prefs_unit_mb">MB</string>
+  <string name="prefs_unit_gb">GB</string>
+  <string name="prefs_unit_pct">%</string>
+  <string name="prefs_unit_celcius">°C</string>
+  <string name="prefs_unit_seconds">sek.</string>
+  <!--projects tab strings-->
+  <string name="projects_loading">Čtení projektů...</string>
+  <string name="projects_add">Přidat projekt</string>
+  <string name="projects_icon">Ikona projektu</string>
+  <string name="projects_credits_header">Kredit:</string>
+  <string name="projects_credits_host_header">(na tomto zařízení)</string>
+  <string name="projects_credits_user_header">(celkem)</string>
+  <!--project status strings-->
+  <string name="projects_status_suspendedviagui">Pozastaveno uživatelem</string>
+  <string name="projects_status_dontrequestmorework">Neobdrží další práci</string>
+  <string name="projects_status_ended">Projekt ukončen - nyní je možné projekt opustit</string>
+  <string name="projects_status_detachwhendone">Bude odebrán po dokončení úkolů</string>
+  <string name="projects_status_schedrpcpending">Nevyřízený požadavek plánovače</string>
+  <string name="projects_status_schedrpcinprogress">Zpracovávám požadavek plánovače</string>
+  <string name="projects_status_trickleuppending">Nevyřízené odeslání zprávy o průběhu</string>
+  <string name="projects_status_backoff">Komunikace za:</string>
+  <!--project controls-->
+  <string name="projects_control_dialog_title">Příkazy projektu:</string>
+  <string name="projects_control_visit_website">Navštívit webové stránky</string>
+  <string name="projects_control_update">Aktualizovat</string>
+  <string name="projects_control_remove">Odebrat</string>
+  <string name="projects_control_suspend">Pozastavit</string>
+  <string name="projects_control_resume">Obnovit</string>
+  <string name="projects_control_nonewtasks">Nepřijímat další práci</string>
+  <string name="projects_control_allownewtasks">Povolit další práci</string>
+  <string name="projects_control_reset">Resetovat</string>
+  <string name="projects_control_dialog_title_acctmgr">Příkazy správce účtu:</string>
+  <string name="projects_control_sync_acctmgr">Synchronizovat</string>
+  <string name="projects_control_remove_acctmgr">Zakázat</string>
+  <!--project confirm dialog-->
+  <string name="projects_confirm_detach_title">Odebrat projekt?</string>
+  <string name="projects_confirm_detach_message">Jste si jisti, že chcete odstranit</string>
+  <string name="projects_confirm_detach_message2">z BOINCu?</string>
+  <string name="projects_confirm_detach_confirm">Odebrat</string>
+  <string name="projects_confirm_reset_title">Restartovat projekt</string>
+  <string name="projects_confirm_reset_message">Jste si jisti, že chcete restartovat</string>
+  <string name="projects_confirm_reset_message2">\?</string>
+  <string name="projects_confirm_reset_confirm">Restartovat</string>
+  <string name="projects_confirm_remove_acctmgr_title">Vypnout správce účtu</string>
+  <string name="projects_confirm_remove_acctmgr_message">Jste si jisti, že chcete přestat používat</string>
+  <string name="projects_confirm_remove_acctmgr_message2">\?</string>
+  <string name="projects_confirm_remove_acctmgr_confirm">Zakázat</string>
+  <!--tasks tab strings-->
+  <string name="tasks_header_name">Název úkolu:</string>
+  <string name="tasks_header_elapsed_time">Uplynulý čas:</string>
+  <string name="tasks_header_project_paused">(pozastaveno)</string>
+  <string name="tasks_header_deadline">Odevzdat do:</string>
+  <string name="tasks_result_new">nové</string>
+  <string name="tasks_result_files_downloading">čeká na stažení</string>
+  <string name="tasks_result_files_downloaded">stahování dokončeno</string>
+  <string name="tasks_result_compute_error">chyba při výpočtu</string>
+  <string name="tasks_result_files_uploading">odesílání</string>
+  <string name="tasks_result_files_uploaded">odesílání dokončeno</string>
+  <string name="tasks_result_aborted">zrušeno</string>
+  <string name="tasks_result_upload_failed">odeslání se nezdařilo</string>
+  <string name="tasks_active_uninitialized">připraven</string>
+  <string name="tasks_active_executing">počítá</string>
+  <string name="tasks_active_suspended">pozastaveno</string>
+  <string name="tasks_active_abort_pending">ruší se</string>
+  <string name="tasks_active_quit_pending">ukončuje se</string>
+  <string name="tasks_custom_suspended_via_gui">pozastaveno</string>
+  <string name="tasks_custom_project_suspended_via_gui">projekt pozastaven</string>
+  <string name="tasks_custom_ready_to_report">připraven k nahlášení</string>
+  <!--confirmation dialog-->
+  <string name="confirm_abort_task_title">Zrušit úkol?</string>
+  <string name="confirm_abort_task_message">Zrušit úkol:</string>
+  <string name="confirm_abort_task_confirm">Zrušit</string>
+  <string name="confirm_cancel">Zpět</string>
+  <string name="confirm_image_desc">Potvrzovací dialog</string>
+  <!--transfers tab strings-->
+  <string name="trans_loading">Načítám přenosy...</string>
+  <string name="trans_upload">Odesílání</string>
+  <string name="trans_download">Stáhování</string>
+  <string name="trans_retryin">opakovat za</string>
+  <string name="trans_failed">selhalo</string>
+  <string name="trans_suspended">pozastaveno</string>
+  <string name="trans_active">probíhá</string>
+  <string name="trans_pending">vyčkává</string>
+  <string name="trans_projectbackoff">odloženo projektem</string>
+  <string name="trans_header_name">Soubor:</string>
+  <string name="trans_control_retry">Opakování přenosů</string>
+  <string name="confirm_abort_trans_title">Přerušit přenos?</string>
+  <string name="confirm_abort_trans_message">Zrušit soubor:</string>
+  <string name="confirm_abort_trans_confirm">Zrušit</string>
+  <!--notices tab strings-->
+  <string name="notices_loading">Načítám oznámení...</string>
+  <!--eventlog tab strings-->
+  <string name="eventlog_loading">Načítám zprávy...</string>
+  <string name="eventlog_client_header">Zprávy klienta</string>
+  <string name="eventlog_gui_header">Zprávy GUI</string>
+  <string name="eventlog_copy_toast">Zpráva zkopírována do schránky.</string>
+  <string name="eventlog_email_subject">Zprávy událostí z BOINC na Androidu:</string>
+  <!--suspend reasons-->
+  <string name="suspend_unknown">Výpočet pozastaven.</string>
+  <string name="suspend_batteries">Připojte zařízení k nabíječce pro pokračování ve výpočtu.</string>
+  <string name="suspend_screen_on">Vypněte obrazovku pro pokračování ve výpočtu.</string>
+  <string name="suspend_useractive">Uživatel je aktivní.</string>
+  <string name="suspend_tod">Mimo výpočtový časový rámec.</string>
+  <string name="suspend_bm">BOINC testuje výkon vašeho zařízení...</string>
+  <string name="suspend_disksize">Nedostatek místa na disku.</string>
+  <string name="suspend_cputhrottle">Plánované omezení procesoru.</string>
+  <string name="suspend_noinput">Žádná nedávná aktivita uživatele.</string>
+  <string name="suspend_delay">Zpoždění inicializace.</string>
+  <string name="suspend_exclusiveapp">Je spuštěna exkluzivní aplikace.</string>
+  <string name="suspend_cpu">Zařízení je zaneprázdněno jinými aplikacemi.</string>
+  <string name="suspend_network_quota">BOINC dosáhl limitu síťových přenosů.</string>
+  <string name="suspend_os">Zastaveno Androidem.</string>
+  <string name="suspend_wifi">Není připojen k WiFi.</string>
+  <string name="suspend_battery_charging">Čekání na větší nabití baterie.</string>
+  <string name="suspend_battery_charging_long">Výpočet bude pokračovat, když nabití baterie dosáhne</string>
+  <string name="suspend_battery_charging_long2"></string>
+  <string name="suspend_battery_charging_current">nyní</string>
+  <string name="suspend_battery_overheating">Čekání na ochlazení baterie</string>
+  <string name="suspend_user_req">Obnovuji výpočet...</string>
+  <string name="suspend_network_user_req">ručně.</string>
+  <!--rpc reasons-->
+  <string name="rpcreason_userreq">Vyžádáno uživatelem</string>
+  <string name="rpcreason_needwork">Získat novou práci</string>
+  <string name="rpcreason_resultsdue">Nahlásit dokončené úkoly</string>
+  <string name="rpcreason_trickleup">Odeslat zprávu o průběhu</string>
+  <string name="rpcreason_acctmgrreq">Vyžádáno správcem účtu</string>
+  <string name="rpcreason_init">Prvotní nastavení projektu</string>
+  <string name="rpcreason_projectreq">Vyžádáno projektem</string>
+  <string name="rpcreason_unknown">Neznámý důvod</string>
+  <!--menu-->
+  <string name="menu_refresh">Aktualizovat</string>
+  <string name="menu_emailto">Odeslat jako E-mail</string>
+  <string name="menu_copy">Kopírovat do schránky</string>
+  <string name="menu_eventlog">Protokol událostí</string>
+  <string name="menu_exit">Ukončit BOINC</string>
+  <string name="menu_run_mode_disable">Pozastavit</string>
+  <string name="menu_run_mode_enable">Obnovit</string>
+  <string name="menu_about">O BOINC</string>
+  <string name="menu_help">Nápověda</string>
+  <!--about dialog-->
+  <string name="about_button">Návrat</string>
+  <string name="about_title">O programu</string>
+  <string name="about_name">BOINC</string>
+  <string name="about_version">Verze</string>
+  <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_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>
+  <!--e.g. New notice from SETI at HOME-->
+  <string name="notice_notification_multiple_header">Nová oznámení</string>
+  <!--e.g. 3 new notices-->
+  <!--multi BOINC compitability-->
+  <string name="nonexcl_dialog_header">Dobrovolníkova výpočetní aplikace zaregistrována</string>
+  <string name="nonexcl_dialog_text">V tomto zařízení je spuštěna další výpočetní aplikace dobrovolníka. Současně lze spustit pouze jednu verzi.</string>
+  <string name="nonexcl_dialog_exit">Konec</string>
+  <!--social integration-->
+  <string name="social_invite_button">Pozvat přátele</string>
+  <string name="social_invite_intent_title">Jak chcete sdílet?</string>
+  <string name="social_invite_content_title">Podílím se na vědě díky svému chytrému telefonu!</string>
+  <string name="social_invite_content_body">Používám svůj %1$s pro vědecké výpočty. Ty můžeš taky! Stáhni si aplikaci z: %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-da/strings.xml b/android/BOINC/res/values-da/strings.xml
index e3aad88..f5ab5e3 100644
--- a/android/BOINC/res/values-da/strings.xml
+++ b/android/BOINC/res/values-da/strings.xml
@@ -1,15 +1,50 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--app global-->
   <string name="app_name">BOINC</string>
-  <string name="generic_loading">Indlæser! Vent venligst…</string>
-  <string name="attachproject_list_header">Vælg et projekt:</string>
+  <!--generic. used by multiple Activities/tabs-->
+  <string name="generic_loading">Indlæser! Vent venligst …</string>
+  <string name="generic_button_continue">Fortsæt</string>
+  <string name="generic_button_finish">Afslut</string>
+  <!--attach project-->
+  <!--selection list-->
+  <string name="attachproject_list_desc">Vælg videnskabelige projekter, du vil bidrage til:</string>
+  <string name="attachproject_list_header">Vælg et projekt</string>
   <string name="attachproject_list_manual_button">Tilføj projekt vha. URL</string>
   <string name="attachproject_list_manual_dialog_title">Indtast projekt-URL:</string>
   <string name="attachproject_list_manual_dialog_button">Tilføj projekt</string>
   <string name="attachproject_list_manual_no_url">Indtast venligst projekt-URL</string>
   <string name="attachproject_list_acctmgr_button">Tilføj kontohåndtering</string>
   <string name="attachproject_list_no_internet">Ingen Internet-forbindelse</string>
-  <string name="attachproject_login_loading">Kontakter projekt-server…</string>
+  <!--credential input-->
+  <string name="attachproject_credential_input_sing_desc">Indtast kontoinformation</string>
+  <string name="attachproject_credential_input_desc">Indtast kontoinformation for valgte projekter:</string>
+  <string name="attachproject_credential_input_show_pwd">Vis adgangskode</string>
+  <string name="attachproject_individual_credential_input">Forbind projekter individuelt</string>
+  <!--conflicts-->
+  <string name="attachproject_conflicts_desc">Der opstod problemer med at forbinde videnskabelige projekter:</string>
+  <string name="attachproject_conflict_undefined">Kunne ikke forbinde</string>
+  <string name="attachproject_conflict_not_unique">Konto eksisterer med en anden adgangskode</string>
+  <string name="attachproject_conflict_bad_password">Adgangskode ukorrekt</string>
+  <string name="attachproject_conflict_unknown_user">Konto eksisterer ikke</string>
+  <string name="attachproject_conflict_unknown_user_creation_disabled">Konto eksisterer ikke; besøg projektets webside for at registrere</string>
+  <!--working-->
+  <string name="attachproject_working_attaching">Forbinder</string>
+  <!--e.g. Attaching Einstein at Home-->
+  <!--hints-->
+  <string name="attachproject_hints_header">Tip</string>
+  <!--e.g. Hint 1/2-->
+  <string name="attachproject_hint_contribtion_header">Hvordan du kan bidrage:</string>
+  <string name="attachproject_hint_contribtion_wifi">1. Forbind til WiFi</string>
+  <string name="attachproject_hint_contribtion_charger">2. Tilslut oplader</string>
+  <string name="attachproject_hint_contribtion_screen">3. Sluk skærmen</string>
+  <string name="attachproject_hint_projectwebsite_header">Besøg projekt-websider for at:</string>
+  <string name="attachproject_hint_projectwebsite_science">Lære mere om videnskaben</string>
+  <string name="attachproject_hint_projectwebsite_stats">Se bidragsstatistik</string>
+  <string name="attachproject_hint_projectwebsite_community">Tale med andre frivillige</string>
+  <string name="attachproject_hint_platforms_header">BOINC findes også til din bærbare eller stationære computer; besøg boinc.berkeley.edu for at finde ud af mere.</string>
+  <!--project login-->
+  <string name="attachproject_login_loading">Kontakter projekt-server …</string>
   <string name="attachproject_login_image_description">Projektlogo.</string>
   <string name="attachproject_login_header_general_area">Generelt område:</string>
   <string name="attachproject_login_header_specific_area">Specifikt område:</string>
@@ -17,57 +52,63 @@
   <string name="attachproject_login_header_home">Hjem:</string>
   <string name="attachproject_login_header_url">Webside:</string>
   <string name="attachproject_login_header_platform">Android:</string>
-  <string name="attachproject_login_platform_supported">Dette projekt understøtter Android-enheder</string>
-  <string name="attachproject_login_platform_not_supported">Dette projekt understøtter ikke Android-enheder</string>
+  <string name="attachproject_login_platform_supported">Enhedstypen understøttes af dette projekt</string>
+  <string name="attachproject_login_platform_not_supported">Enheden understøttes ikke af dette projekt</string>
   <string name="attachproject_login_category_terms_of_use">Brugsvilkår for</string>
   <string name="attachproject_login_accept_terms_of_use">Ved at oprette en konto hos dette projekt, accepterer du brugsvilkårene, som vises herover.</string>
   <string name="attachproject_login_category_login">Log ind med eksisterende konto</string>
   <string name="attachproject_login_header_id_email">Email:</string>
   <string name="attachproject_login_header_id_name">Navn:</string>
-  <string name="attachproject_login_header_pwd">Kodeord:</string>
+  <string name="attachproject_login_header_pwd">Adgangskode:</string>
   <string name="attachproject_login_category_creation">Kender du ikke</string>
   <string name="attachproject_login_header_creation_enabled">Opret en konto for at deltage:</string>
   <string name="attachproject_login_header_creation_client_disabled">Besøg projektets webside for at oprette en konto:</string>
-  <string name="attachproject_login_header_creation_disabled">Projektet tillader for tiden ikke oprettelse af nye konti!</string>
+  <string name="attachproject_login_header_creation_disabled">Dette projekt tager for tiden ikke imod nye konti.</string>
   <string name="attachproject_login_button_registration">Registrér</string>
   <string name="attachproject_login_button_login">Log ind</string>
-  <string name="attachproject_login_button_forgotpw">Glemt kodeord</string>
-  <string name="attachproject_login_error_toast">Kontakt til projekt fejlede!</string>
+  <string name="attachproject_login_button_forgotpw">Glemt adgangskode</string>
+  <string name="attachproject_login_error_toast">Kontakt til projekt mislykkedes!</string>
   <string name="attachproject_login_attached">Forbundet</string>
+  <!--project registration-->
   <string name="attachproject_registration_header">Kontoregistrering for</string>
   <string name="attachproject_registration_header_url">Projekt:</string>
   <string name="attachproject_registration_header_email">Email:</string>
   <string name="attachproject_registration_header_username">Navn:</string>
   <string name="attachproject_registration_header_teamname">Hold:</string>
-  <string name="attachproject_registration_header_pwd">Kodeord:</string>
+  <string name="attachproject_registration_header_pwd">Adgangskode:</string>
   <string name="attachproject_registration_header_pwd_confirm">… Tast igen:</string>
   <string name="attachproject_registration_button">Opret</string>
+  <!--account manager-->
+  <string name="attachproject_acctmgr_list_desc">Brug BOINC kontohåndtering for at tilføje og vedligeholde adskillige projekter</string>
   <string name="attachproject_acctmgr_header">Tilføj kontohåndtering</string>
   <string name="attachproject_acctmgr_header_url">URL</string>
   <string name="attachproject_acctmgr_header_name">Bruger:</string>
-  <string name="attachproject_acctmgr_header_pwd">Kodeord:</string>
+  <string name="attachproject_acctmgr_header_pwd">Adgangskode:</string>
   <string name="attachproject_acctmgr_header_pwd_confirm">… Tast igen:</string>
   <string name="attachproject_acctmgr_button">Tilføj</string>
+  <!--error strings-->
   <string name="attachproject_error_wrong_name">Bruger ikke fundet</string>
-  <string name="attachproject_error_short_pwd">Kodeord for kort</string>
+  <string name="attachproject_error_short_pwd">Adgangskode for kort</string>
   <string name="attachproject_error_no_internet">Forbindelsesfejl</string>
-  <string name="attachproject_error_pwd_no_match">Kodeord passer ikke sammen</string>
+  <string name="attachproject_error_pwd_no_match">Adgangskoder passer ikke sammen</string>
+  <string name="attachproject_error_pwd_no_retype">Indtast venligst adgangskode igen</string>
   <string name="attachproject_error_no_url">Indtast venligst URL</string>
   <string name="attachproject_error_no_email">Indtast venligst emailadresse</string>
-  <string name="attachproject_error_no_pwd">Indtast venligst et kodeord</string>
+  <string name="attachproject_error_no_pwd">Indtast venligst en adgangskode</string>
   <string name="attachproject_error_no_name">Indtast venligst brugernavn</string>
-  <string name="attachproject_error_unknown">fejlede</string>
+  <string name="attachproject_error_unknown">mislykkedes</string>
   <string name="attachproject_error_bad_username">Brugernavn afvist</string>
   <string name="attachproject_error_email_in_use">Email er allerede i brug</string>
   <string name="attachproject_error_project_down">Projekt er offline</string>
   <string name="attachproject_error_email_bad_syntax">Email afvist</string>
-  <string name="attachproject_error_bad_pwd">Kodeord afvist</string>
+  <string name="attachproject_error_bad_pwd">Adgangskode afvist</string>
   <string name="attachproject_error_creation_disabled">Oprettelse af konti er slået fra for dette projekt</string>
   <string name="attachproject_error_invalid_url">Ugyldig URL</string>
+  <!--working activity-->
   <string name="attachproject_working_back_button">Tilbage</string>
-  <string name="attachproject_working_finish_button">Færdig</string>
+  <string name="attachproject_working_finish_button">Afslut</string>
   <string name="attachproject_working_check_desc">Succesfuldt</string>
-  <string name="attachproject_working_failed_desc">Fejlede</string>
+  <string name="attachproject_working_failed_desc">Mislykkedes</string>
   <string name="attachproject_working_ongoing">…</string>
   <string name="attachproject_working_finished">.</string>
   <string name="attachproject_working_description">:</string>
@@ -77,9 +118,12 @@
   <string name="attachproject_working_login">Log ind</string>
   <string name="attachproject_working_acctmgr">Tilføj kontohåndtering</string>
   <string name="attachproject_working_acctmgr_sync">Synkronisér</string>
+  <!--main activity-->
+  <string name="main_noproject_warning">Berør her for at vælge et projekt.</string>
   <string name="main_error">Ups</string>
-  <string name="main_error_long">…dette burde ikke ske!\nKlik på ikonet for at prøve igen.</string>
+  <string name="main_error_long">… dette burde ikke ske!\nKlik på ikonet for at prøve igen.</string>
   <string name="main_title_icon_desc">BOINC-ikon</string>
+  <!--tab names-->
   <string name="tab_status">Status</string>
   <string name="tab_projects">Projekter</string>
   <string name="tab_tasks">Opgaver</string>
@@ -87,19 +131,21 @@
   <string name="tab_preferences">Indstillinger</string>
   <string name="tab_notices">Meddelelser</string>
   <string name="tab_desc">Navigering</string>
+  <!--status strings-->
   <string name="status_running">Beregner</string>
   <string name="status_running_long">Tak for din deltagelse.</string>
   <string name="status_paused">Suspenderet</string>
   <string name="status_idle">Intet at beregne</string>
-  <string name="status_idle_long">Venter på opgaver…</string>
+  <string name="status_idle_long">Venter på opgaver …</string>
   <string name="status_computing_disabled">Suspenderet</string>
   <string name="status_computing_disabled_long">Tryk play for at genoptage netværk og beregning.</string>
-  <string name="status_launching">Starter…</string>
+  <string name="status_launching">Starter …</string>
   <string name="status_noproject">Vælg et projekt at deltage i.</string>
-  <string name="status_closing">Lukker…</string>
-  <string name="status_benchmarking">Måler ydelsesevne…</string>
+  <string name="status_closing">Lukker …</string>
+  <string name="status_benchmarking">Måler ydelsesevne …</string>
   <string name="status_image_description">projektbillede</string>
-  <string name="prefs_loading">Indlæser indstillinger…</string>
+  <!--preferences tab strings-->
+  <string name="prefs_loading">Indlæser indstillinger …</string>
   <string name="prefs_submit_button">Gem</string>
   <string name="prefs_dialog_title">Indtast ny værdi:</string>
   <string name="prefs_dialog_title_selection">Vælg:</string>
@@ -110,48 +156,65 @@
   <string name="prefs_category_storage">Lagring</string>
   <string name="prefs_category_memory">Hukommelse</string>
   <string name="prefs_category_debug">Fejlsøgning</string>
-  <string name="prefs_show_advanced_header">Vis avancerede indstillinger…</string>
+  <string name="prefs_show_advanced_header">Vis avancerede indstillinger …</string>
+  <string name="prefs_suspend_when_screen_on">Sæt beregning på pause, når skærmen er tændt</string>
+  <string name="prefs_stationary_device_mode_header">Tilstand for stationære enheder</string>
+  <string name="prefs_stationary_device_mode_description">Tillader beregning uanset strømindstillinger. Kun tilgængelig, hvis enheden ikke har et batteri.</string>
+  <string name="prefs_power_source_header">Strømkilder for beregning</string>
+  <string name="prefs_power_source_description">Vælger strømkilder, som BOINC må beregne under.</string>
+  <string name="prefs_power_source_ac">Oplader til stikkontakt</string>
+  <string name="prefs_power_source_usb">USB-forbindelse</string>
+  <string name="prefs_power_source_wireless">Trådløs oplader</string>
+  <string name="prefs_power_source_battery">Batteri</string>
   <string name="battery_charge_min_pct_header">Min. batteriniveau</string>
   <string name="battery_charge_min_pct_description">BOINC stopper beregninger under defineret batteriniveau.</string>
-  <string name="battery_temperature_max_header">Max. batteritemperatur</string>
+  <string name="battery_temperature_max_header">Maks. batteritemperatur</string>
   <string name="battery_temperature_max_description">BOINC stopper beregninger over defineret batteritemperatur. Det anbefales ikke at ændre denne værdi.</string>
   <string name="prefs_disk_max_pct_header">Maks. brugt lagringsplads</string>
   <string name="prefs_disk_max_pct_description">Hvor mange procent af din enheds lagringsplads må BOINC bruge?</string>
   <string name="prefs_disk_min_free_gb_header">Min. lagringsplads</string>
   <string name="prefs_disk_min_free_gb_description">Hvor meget af din enheds lagringsplads skal forblive ubrugt?</string>
+  <string name="prefs_disk_access_interval_header">Interval for tilgang</string>
+  <string name="prefs_disk_access_interval_description">Foreslår et interval mellem disktilgang</string>
   <string name="prefs_network_daily_xfer_limit_mb_header">Daglig begrænsning på overførsler</string>
   <string name="prefs_network_daily_xfer_limit_mb_description">Begrænser den daglige datatraffik forårsaget af BOINC.</string>
   <string name="prefs_network_wifi_only_header">Overfør kun opgaver over WiFi</string>
   <string name="prefs_autostart_header">Autostart</string>
+  <string name="prefs_show_notification_notices_header">Vis notifikation for nye meddelelser</string>
+  <string name="prefs_show_notification_suspended_header">Vis notifikation under suspendering</string>
   <string name="prefs_cpu_number_cpus_header">Brugte CPU-kerner</string>
   <string name="prefs_cpu_number_cpus_description">Begrænser antallet af CPU-kerner, som BOINC bruger til beregninger.</string>
   <string name="prefs_cpu_other_load_suspension_header">Pause ved CPU-belastning over</string>
-  <string name="prefs_cpu_other_load_suspension_description">Bestemmer hvornår BOINC sætter beregninger på pause på grund af andre app\'ers CPU-brug.</string>
+  <string name="prefs_cpu_other_load_suspension_description">Bestemmer hvornår BOINC sætter beregninger på pause på grund af andre app\'ers CPU-forbrug.</string>
   <string name="prefs_cpu_time_max_header">CPU-begrænsning</string>
   <string name="prefs_cpu_time_max_description">Begrænser CPU-tiden, som BOINC bruger til beregninger.</string>
   <string name="prefs_memory_max_idle_header">RAM-begrænsning</string>
   <string name="prefs_memory_max_idle_description">Begrænser mængden af RAM, som opgaver tillades at optage.</string>
-  <string name="prefs_client_log_flags_header">log-flag for BOINC-klient</string>
+  <string name="prefs_client_log_flags_header">Log-flag for BOINC-klient</string>
   <string name="prefs_gui_log_level_header">GUI-logniveau</string>
-  <string name="prefs_gui_log_level_description">Specificerer uddybning af GUI-logbeskeder.</string>
+  <string name="prefs_gui_log_level_description">Specificerer uddybningsniveau for GUI-logbeskeder.</string>
   <string name="prefs_unit_mb">MB</string>
   <string name="prefs_unit_gb">GB</string>
   <string name="prefs_unit_pct">%</string>
   <string name="prefs_unit_celcius">°C</string>
-  <string name="projects_loading">Indlæser projekter…</string>
+  <string name="prefs_unit_seconds">sek.</string>
+  <!--projects tab strings-->
+  <string name="projects_loading">Indlæser projekter …</string>
   <string name="projects_add">Tilføj projekt</string>
   <string name="projects_icon">Projekt-ikon</string>
   <string name="projects_credits_header">Bidragsydere:</string>
   <string name="projects_credits_host_header">(på denne enhed)</string>
   <string name="projects_credits_user_header">(total)</string>
+  <!--project status strings-->
   <string name="projects_status_suspendedviagui">Suspenderet af bruger</string>
   <string name="projects_status_dontrequestmorework">Vil ikke modtage nye opgaver</string>
-  <string name="projects_status_ended">Projekt afsluttet - O.k. for at fjerne</string>
+  <string name="projects_status_ended">Projekt afsluttet – O.k. for at fjerne</string>
   <string name="projects_status_detachwhendone">Vil blive fjernet, når opgaver er fuldført</string>
   <string name="projects_status_schedrpcpending">Planlægningsforespørgsel afventer</string>
   <string name="projects_status_schedrpcinprogress">Planlægningsforespørgsel under udførsel</string>
   <string name="projects_status_trickleuppending">Trickle-up-besked afventer</string>
   <string name="projects_status_backoff">Kommunikation planlagt om:</string>
+  <!--project controls-->
   <string name="projects_control_dialog_title">Projektkommandoer:</string>
   <string name="projects_control_visit_website">Besøg hjemmeside</string>
   <string name="projects_control_update">Opdatér</string>
@@ -164,16 +227,20 @@
   <string name="projects_control_dialog_title_acctmgr">Kommandoer for kontohåndtering:</string>
   <string name="projects_control_sync_acctmgr">Synkronisér</string>
   <string name="projects_control_remove_acctmgr">Deaktivér</string>
+  <!--project confirm dialog-->
   <string name="projects_confirm_detach_title">Fjern projekt?</string>
   <string name="projects_confirm_detach_message">Er du sikker på, at du vil fjerne</string>
   <string name="projects_confirm_detach_message2">fra BOINC?</string>
   <string name="projects_confirm_detach_confirm">Fjern</string>
   <string name="projects_confirm_reset_title">Nulstil projekt</string>
   <string name="projects_confirm_reset_message">Er du sikker på, at du vil nulstille</string>
+  <string name="projects_confirm_reset_message2">\?</string>
   <string name="projects_confirm_reset_confirm">Nulstil</string>
   <string name="projects_confirm_remove_acctmgr_title">Deaktivér kontohåndtering</string>
   <string name="projects_confirm_remove_acctmgr_message">Er du sikker på, du vil stoppe med at bruge</string>
+  <string name="projects_confirm_remove_acctmgr_message2">\?</string>
   <string name="projects_confirm_remove_acctmgr_confirm">Deaktivér</string>
+  <!--tasks tab strings-->
   <string name="tasks_header_name">Opgavenavn:</string>
   <string name="tasks_header_elapsed_time">Forgangen tid:</string>
   <string name="tasks_header_project_paused">(suspenderet)</string>
@@ -185,7 +252,7 @@
   <string name="tasks_result_files_uploading">uploader</string>
   <string name="tasks_result_files_uploaded">upload komplet</string>
   <string name="tasks_result_aborted">afbrudt</string>
-  <string name="tasks_result_upload_failed">upload fejlede</string>
+  <string name="tasks_result_upload_failed">upload mislykkedes</string>
   <string name="tasks_active_uninitialized">klar</string>
   <string name="tasks_active_executing">kører</string>
   <string name="tasks_active_suspended">suspenderet</string>
@@ -194,16 +261,18 @@
   <string name="tasks_custom_suspended_via_gui">suspenderet</string>
   <string name="tasks_custom_project_suspended_via_gui">projekt suspenderet</string>
   <string name="tasks_custom_ready_to_report">klar til at rapportere</string>
+  <!--confirmation dialog-->
   <string name="confirm_abort_task_title">Afbryd opgave?</string>
   <string name="confirm_abort_task_message">Afbryd opgave:</string>
   <string name="confirm_abort_task_confirm">Afbryd</string>
   <string name="confirm_cancel">Annullér</string>
   <string name="confirm_image_desc">Bekræftelsesdialog</string>
-  <string name="trans_loading">Indlæser overførsler…</string>
+  <!--transfers tab strings-->
+  <string name="trans_loading">Indlæser overførsler …</string>
   <string name="trans_upload">Upload</string>
   <string name="trans_download">Download</string>
   <string name="trans_retryin">prøv igen om</string>
-  <string name="trans_failed">fejlede</string>
+  <string name="trans_failed">mislykkedes</string>
   <string name="trans_suspended">suspenderet</string>
   <string name="trans_active">aktiv</string>
   <string name="trans_pending">afventer</string>
@@ -213,18 +282,22 @@
   <string name="confirm_abort_trans_title">Afbryd overførsel?</string>
   <string name="confirm_abort_trans_message">Afbryd fil:</string>
   <string name="confirm_abort_trans_confirm">Afbryd</string>
-  <string name="notices_loading">Indlæser meddelelser</string>
-  <string name="eventlog_loading">Indlæser logbeskeder…</string>
+  <!--notices tab strings-->
+  <string name="notices_loading">Indlæser meddelelser …</string>
+  <!--eventlog tab strings-->
+  <string name="eventlog_loading">Indlæser logbeskeder …</string>
   <string name="eventlog_client_header">Klientbeskeder</string>
   <string name="eventlog_gui_header">GUI-beskeder</string>
   <string name="eventlog_copy_toast">Log kopieret til udklipsholder.</string>
   <string name="eventlog_email_subject">Hændelseslog for BOINC på Android:</string>
+  <!--suspend reasons-->
   <string name="suspend_unknown">Beregning suspenderet.</string>
   <string name="suspend_batteries">Forbind din enhed til en oplader for at fortsætte beregning.</string>
+  <string name="suspend_screen_on">Sluk skærmen for at fortsætte beregning.</string>
   <string name="suspend_useractive">Bruger er aktiv.</string>
   <string name="suspend_tod">Tidsvindue for beregning brugt up.</string>
-  <string name="suspend_bm">BOINC måler din enheds ydelsesevne…</string>
-  <string name="suspend_disksize">Diskplads brugt op.</string>
+  <string name="suspend_bm">BOINC måler din enheds ydelsesevne …</string>
+  <string name="suspend_disksize">Diskplads opbrugt.</string>
   <string name="suspend_cputhrottle">CPU-neddrosling planlagt.</string>
   <string name="suspend_noinput">Ingen nylig brugeraktivitet.</string>
   <string name="suspend_delay">Initialiseringsforsinkelse.</string>
@@ -233,12 +306,14 @@
   <string name="suspend_network_quota">BOINC har nået begrænsningen for netværksoverførsel.</string>
   <string name="suspend_os">Stoppet af Android.</string>
   <string name="suspend_wifi">Ikke forbundet til WiFi.</string>
-  <string name="suspend_battery_charging">Batteri skal være under opladning, før beregning genoptages.</string>
+  <string name="suspend_battery_charging">Venter på at batteriet er mere opladet.</string>
   <string name="suspend_battery_charging_long">Beregning vil blive genoptaget, når batteriniveau når</string>
+  <string name="suspend_battery_charging_long2"></string>
   <string name="suspend_battery_charging_current">nuværende</string>
   <string name="suspend_battery_overheating">Venter på at batteri køler ned</string>
-  <string name="suspend_user_req">Genoptager beregning…</string>
+  <string name="suspend_user_req">Genoptager beregning …</string>
   <string name="suspend_network_user_req">manuelt.</string>
+  <!--rpc reasons-->
   <string name="rpcreason_userreq">Forespurgt af bruger</string>
   <string name="rpcreason_needwork">For at hente opgaver</string>
   <string name="rpcreason_resultsdue">For at rapportere komplette opgaver</string>
@@ -246,7 +321,8 @@
   <string name="rpcreason_acctmgrreq">Forespurgt af kontohåndtering</string>
   <string name="rpcreason_init">Projektinitialisering</string>
   <string name="rpcreason_projectreq">Forespurgt af projekt</string>
-  <string name="rpcreason_unknown">Ukendt begrundelse</string>
+  <string name="rpcreason_unknown">Ukendt årsag</string>
+  <!--menu-->
   <string name="menu_refresh">Opdatér</string>
   <string name="menu_emailto">Send som email</string>
   <string name="menu_copy">Kopiér til udklipsholder</string>
@@ -256,10 +332,29 @@
   <string name="menu_run_mode_enable">Genoptag</string>
   <string name="menu_about">Om</string>
   <string name="menu_help">Hjælp</string>
+  <!--about dialog-->
   <string name="about_button">Tilbage</string>
   <string name="about_title">Om</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>
-  <string name="about_copyright">© 2003–2013 University of California, Berkeley.\nAlle rettigheder forbeholdes.</string>
+  <string name="about_copyright">\u00A9 2003–2014 University of California, Berkeley.</string>
+  <string name="about_copyright_reserved">Alle rettigheder forbeholdes.</string>
+  <string name="about_credits">Tak til Max Planck Institute for Gravitational Physics, IBM Corporation og HTC Corporation for deres støtte.</string>
+  <!--notice notification-->
+  <string name="notice_notification_single_header">Ny meddelelse fra</string>
+  <!--e.g. New notice from SETI at HOME-->
+  <string name="notice_notification_multiple_header">nye meddelelser</string>
+  <!--e.g. 3 new notices-->
+  <!--multi BOINC compitability-->
+  <string name="nonexcl_dialog_header">App til frivillig beregning detekteret</string>
+  <string name="nonexcl_dialog_text">En anden app til frivillig beregning kører på denne enhed. Kun én version kan køre ad gangen.</string>
+  <string name="nonexcl_dialog_exit">Afslut</string>
+  <!--social integration-->
+  <string name="social_invite_button">Invitér venner</string>
+  <string name="social_invite_intent_title">Hvordan vil du dele?</string>
+  <string name="social_invite_content_title">Jeg bruger min smartphone til videnskab!</string>
+  <string name="social_invite_content_body">Jeg bruger min %1$s til at lave beregninger for videnskaben! Det kan du også! Download app\'en fra: %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-de/strings.xml b/android/BOINC/res/values-de/strings.xml
index 00b0232..e18b955 100644
--- a/android/BOINC/res/values-de/strings.xml
+++ b/android/BOINC/res/values-de/strings.xml
@@ -1,14 +1,49 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--app global-->
   <string name="app_name">BOINC</string>
+  <!--generic. used by multiple Activities/tabs-->
   <string name="generic_loading">Es wird geladen. Bitte warten…</string>
-  <string name="attachproject_list_header">Projekt auswählen:</string>
+  <string name="generic_button_continue">Fortsetzen</string>
+  <string name="generic_button_finish">Beenden</string>
+  <!--attach project-->
+  <!--selection list-->
+  <string name="attachproject_list_desc">Wählen Sie ein wissenschaftliches Projekt, zu dem Sie beitragen wollen:</string>
+  <string name="attachproject_list_header">Projekt auswählen</string>
   <string name="attachproject_list_manual_button">Projekt mittels URL hinzufügen</string>
   <string name="attachproject_list_manual_dialog_title">Projekt-URL eingeben:</string>
   <string name="attachproject_list_manual_dialog_button">Projekt hinzufügen</string>
   <string name="attachproject_list_manual_no_url">Bitte die Projekt-URL eingeben</string>
   <string name="attachproject_list_acctmgr_button">Kontoverwaltung hinzufügen</string>
   <string name="attachproject_list_no_internet">Keine Internetverbindung</string>
+  <!--credential input-->
+  <string name="attachproject_credential_input_sing_desc">Kontoinformationen eingeben</string>
+  <string name="attachproject_credential_input_desc">Kontoinformationen für ausgewählte Projekte eingeben:</string>
+  <string name="attachproject_credential_input_show_pwd">Passwort anzeigen</string>
+  <string name="attachproject_individual_credential_input">Projekte individuell hinzufügen</string>
+  <!--conflicts-->
+  <string name="attachproject_conflicts_desc">Es gab Probleme beim Hinzufügen der wissenschaftlichen Projekte:</string>
+  <string name="attachproject_conflict_undefined">Keine Verbindung möglich</string>
+  <string name="attachproject_conflict_not_unique">Konto existiert bereits mit anderem Passwort</string>
+  <string name="attachproject_conflict_bad_password">Falsches Passwort</string>
+  <string name="attachproject_conflict_unknown_user">Konto existiert nicht</string>
+  <string name="attachproject_conflict_unknown_user_creation_disabled">Konto existiert nicht, bitte die Projektwebseite besuchen um sich zu registrieren</string>
+  <!--working-->
+  <string name="attachproject_working_attaching">hinzufügen</string>
+  <!--e.g. Attaching Einstein at Home-->
+  <!--hints-->
+  <string name="attachproject_hints_header">Hinweis</string>
+  <!--e.g. Hint 1/2-->
+  <string name="attachproject_hint_contribtion_header">So können Sie beitragen:</string>
+  <string name="attachproject_hint_contribtion_wifi">1. WLAN Verbindung herstellen</string>
+  <string name="attachproject_hint_contribtion_charger">2. Ladegerät anschließen</string>
+  <string name="attachproject_hint_contribtion_screen">3. Bildschirm ausschalten</string>
+  <string name="attachproject_hint_projectwebsite_header">Die Projektwebseite besuchen um:</string>
+  <string name="attachproject_hint_projectwebsite_science">Mehr über die Wissenschaft zu erfahren</string>
+  <string name="attachproject_hint_projectwebsite_stats">Die Statistik zur Teilnahme zu sehen</string>
+  <string name="attachproject_hint_projectwebsite_community">Kontakt mit anderen Teilnehmern aufzunehmen</string>
+  <string name="attachproject_hint_platforms_header">BOINC ist auch für Ihren Computer oder Laptop verfügbar, auf boinc.berkeley.edu erfahren Sie mehr.</string>
+  <!--project login-->
   <string name="attachproject_login_loading">kontaktiere Projektserver…</string>
   <string name="attachproject_login_image_description">Projektlogo.</string>
   <string name="attachproject_login_header_general_area">Bereich:</string>
@@ -28,12 +63,13 @@
   <string name="attachproject_login_category_creation">Neu bei</string>
   <string name="attachproject_login_header_creation_enabled">Ein Konto erstellen um teilzunehmen:</string>
   <string name="attachproject_login_header_creation_client_disabled">Die Projektwebseite besuchen um ein Konto zu erstellen:</string>
-  <string name="attachproject_login_header_creation_disabled">Das Projekt erlaubt zur Zeit keine neuen Konten!</string>
+  <string name="attachproject_login_header_creation_disabled">Dieses Projekt erlaubt momentan keine neuen Konten.</string>
   <string name="attachproject_login_button_registration">Registrieren</string>
   <string name="attachproject_login_button_login">Anmelden</string>
   <string name="attachproject_login_button_forgotpw">Passwort vergessen</string>
   <string name="attachproject_login_error_toast">Verbindung zum Projekt fehlgeschlagen!</string>
   <string name="attachproject_login_attached">Verbunden</string>
+  <!--project registration-->
   <string name="attachproject_registration_header">Konto-Registrierung für</string>
   <string name="attachproject_registration_header_url">Projekt:</string>
   <string name="attachproject_registration_header_email">E-Mail:</string>
@@ -42,16 +78,20 @@
   <string name="attachproject_registration_header_pwd">Passwort:</string>
   <string name="attachproject_registration_header_pwd_confirm">… Bestätigung:</string>
   <string name="attachproject_registration_button">Erstellen</string>
+  <!--account manager-->
+  <string name="attachproject_acctmgr_list_desc">Eine BOINC Kontoverwaltung benutzen um mehrere Projekte hinzuzufügen und zu verwalten.</string>
   <string name="attachproject_acctmgr_header">Kontoverwaltung hinzufügen</string>
   <string name="attachproject_acctmgr_header_url">Adresse</string>
   <string name="attachproject_acctmgr_header_name">Benutzer:</string>
   <string name="attachproject_acctmgr_header_pwd">Passwort:</string>
   <string name="attachproject_acctmgr_header_pwd_confirm">… Bestätigung:</string>
   <string name="attachproject_acctmgr_button">Hinzufügen</string>
+  <!--error strings-->
   <string name="attachproject_error_wrong_name">Benutzer nicht gefunden</string>
   <string name="attachproject_error_short_pwd">Passwort ist zu kurz</string>
   <string name="attachproject_error_no_internet">Verbindungsfehler</string>
   <string name="attachproject_error_pwd_no_match">Passwörter stimmen nicht überein</string>
+  <string name="attachproject_error_pwd_no_retype">Bitte das Passwort erneut eingeben</string>
   <string name="attachproject_error_no_url">Bitte geben Sie die Adresse ein</string>
   <string name="attachproject_error_no_email">Bitte geben Sie Ihre E-Mail-Adresse ein</string>
   <string name="attachproject_error_no_pwd">Bitte Passwort eingeben</string>
@@ -59,10 +99,12 @@
   <string name="attachproject_error_unknown">fehlgeschlagen</string>
   <string name="attachproject_error_bad_username">Benutzername nicht erlaubt</string>
   <string name="attachproject_error_email_in_use">E-Mail-Adresse ist bereits registriert</string>
-  <string name="attachproject_error_email_bad_syntax">E-Mail nicht akzeptiert</string>
+  <string name="attachproject_error_project_down">Projekt nicht erreichbar</string>
+  <string name="attachproject_error_email_bad_syntax">E-Mail-Adresse nicht akzeptiert</string>
   <string name="attachproject_error_bad_pwd">Passwort zu kurz</string>
   <string name="attachproject_error_creation_disabled">Die Kontoerstellung ist bei diesem Projekt deaktiviert</string>
   <string name="attachproject_error_invalid_url">Ungültige Adresse</string>
+  <!--working activity-->
   <string name="attachproject_working_back_button">Zurück</string>
   <string name="attachproject_working_finish_button">Beenden</string>
   <string name="attachproject_working_check_desc">Erfolgreich</string>
@@ -76,9 +118,12 @@
   <string name="attachproject_working_login">Anmelden</string>
   <string name="attachproject_working_acctmgr">Kontoverwaltung hinzufügen</string>
   <string name="attachproject_working_acctmgr_sync">Synchronisieren</string>
+  <!--main activity-->
+  <string name="main_noproject_warning">Hier tippen um ein Projekt auszuwählen.</string>
   <string name="main_error">Whooops</string>
   <string name="main_error_long">…das sollte eigentlich nicht passieren!\nAuf das Symbol klicken um es erneut zu probieren.</string>
   <string name="main_title_icon_desc">BOINC Logo</string>
+  <!--tab names-->
   <string name="tab_status">Status</string>
   <string name="tab_projects">Projekte</string>
   <string name="tab_tasks">Aufgaben</string>
@@ -86,6 +131,7 @@
   <string name="tab_preferences">Einstellungen</string>
   <string name="tab_notices">Nachrichten</string>
   <string name="tab_desc">Navigation</string>
+  <!--status strings-->
   <string name="status_running">Berechnung läuft</string>
   <string name="status_running_long">Vielen Dank für Ihre Beteiligung.</string>
   <string name="status_paused">angehalten</string>
@@ -98,6 +144,7 @@
   <string name="status_closing">Beenden…</string>
   <string name="status_benchmarking">Leistungsüberprüfung…</string>
   <string name="status_image_description">Projektbild</string>
+  <!--preferences tab strings-->
   <string name="prefs_loading">lese Einstellungen…</string>
   <string name="prefs_submit_button">Speichern</string>
   <string name="prefs_dialog_title">Neuen Wert eingeben:</string>
@@ -107,9 +154,18 @@
   <string name="prefs_category_power">Energie</string>
   <string name="prefs_category_cpu">Prozessor</string>
   <string name="prefs_category_storage">Speicherplatz</string>
-  <string name="prefs_category_memory">Fehlerdiagnose</string>
+  <string name="prefs_category_memory">Arbeitsspeicher</string>
   <string name="prefs_category_debug">Fehlerdiagnose</string>
   <string name="prefs_show_advanced_header">Zeige erweiterte Einstellungen und Steuerungen…</string>
+  <string name="prefs_suspend_when_screen_on">Die Berechnung anhalten wenn der Bildschirm eingeschaltet ist</string>
+  <string name="prefs_stationary_device_mode_header">Modus für feststehende Geräte</string>
+  <string name="prefs_stationary_device_mode_description">Erlaubt die Berechnung unabhängig von Energieeinstellungen. Nur für Geräte ohne Akku auswählen.</string>
+  <string name="prefs_power_source_header">Energiequellen für Berechnung</string>
+  <string name="prefs_power_source_description">Die Energiequellen auswählen mit denen eine Berechnung erlaubt ist.</string>
+  <string name="prefs_power_source_ac">Steckdose</string>
+  <string name="prefs_power_source_usb">USB Verbindung</string>
+  <string name="prefs_power_source_wireless">Kabelloses Ladegerät</string>
+  <string name="prefs_power_source_battery">Akku</string>
   <string name="battery_charge_min_pct_header">Min. Akku-Ladestand</string>
   <string name="battery_charge_min_pct_description">BOINC hält die Berechnung an, wenn der Akkuladestand unter den gewählten Wert sinkt.</string>
   <string name="battery_temperature_max_header">Max. Akkutemperatur</string>
@@ -118,31 +174,38 @@
   <string name="prefs_disk_max_pct_description">Wie viel Prozent Ihres Speichers darf BOINC maximal verwenden?</string>
   <string name="prefs_disk_min_free_gb_header">min. freizuhaltender Speicher</string>
   <string name="prefs_disk_min_free_gb_description">Wie viel Speicher soll mindestens frei bleiben?</string>
+  <string name="prefs_disk_access_interval_header">Zugriffsintervall</string>
+  <string name="prefs_disk_access_interval_description">Vorschlag für den Zeitraum zwischen zwei Speicherzugriffen</string>
   <string name="prefs_network_daily_xfer_limit_mb_header">tägliche Transferbegrenzung</string>
   <string name="prefs_network_daily_xfer_limit_mb_description">Begrenzt die Datenmenge welche täglich durch BOINC übertragen wird.</string>
   <string name="prefs_network_wifi_only_header">Übertrage Aufgaben nur per WLAN</string>
   <string name="prefs_autostart_header">Automatisch starten</string>
+  <string name="prefs_show_notification_notices_header">Zeige Meldung für neue Nachrichten</string>
+  <string name="prefs_show_notification_suspended_header">Zeige Nachrichten wenn angehalten</string>
   <string name="prefs_cpu_number_cpus_header">Benutzte Prozessoren</string>
   <string name="prefs_cpu_number_cpus_description">Limitiert die Anzahl der Prozessoren welche BOINC nutzen darf.</string>
   <string name="prefs_cpu_other_load_suspension_header">Anhalten wenn Prozessornutzung über</string>
-  <string name="prefs_cpu_other_load_suspension_description">Bestimmt, wann BOINC aufgrund der CPU-Nutzung anderer Apps pausiert wird.</string>
+  <string name="prefs_cpu_other_load_suspension_description">Legt fest wann BOINC angehalten wird weil andere Apps die CPU benutzen.</string>
   <string name="prefs_cpu_time_max_header">Prozessorbegrenzung</string>
   <string name="prefs_cpu_time_max_description">Limitiert die Prozessorzeit, die BOINC nutzen darf.</string>
   <string name="prefs_memory_max_idle_header">Arbeitsspeicherlimit</string>
   <string name="prefs_memory_max_idle_description">Limitiert den Arbeitsspeicher welcher für Aufgaben zur Verfügung steht.</string>
   <string name="prefs_client_log_flags_header">BOINC Client Protokolleinstellungen</string>
   <string name="prefs_gui_log_level_header">GUI Protokollierstufe</string>
-  <string name="prefs_gui_log_level_description">Einstellung der Detailiertheit der GUI Protokollnachrichten.</string>
+  <string name="prefs_gui_log_level_description">Einstellung der Detailiertheit der GUI Protokollmeldungen.</string>
   <string name="prefs_unit_mb">MB</string>
   <string name="prefs_unit_gb">GB</string>
   <string name="prefs_unit_pct">%</string>
   <string name="prefs_unit_celcius">°C</string>
+  <string name="prefs_unit_seconds">sek.</string>
+  <!--projects tab strings-->
   <string name="projects_loading">Lade Projekte…</string>
   <string name="projects_add">Projekt hinzufügen</string>
   <string name="projects_icon">Projektsymbol</string>
   <string name="projects_credits_header">Punkte:</string>
   <string name="projects_credits_host_header">(auf diesem Gerät)</string>
   <string name="projects_credits_user_header">(gesamt)</string>
+  <!--project status strings-->
   <string name="projects_status_suspendedviagui">Angehalten durch Benutzer</string>
   <string name="projects_status_dontrequestmorework">Keine neuen Arbeitspakete</string>
   <string name="projects_status_ended">Projekt wurde beendet - kann jetzt entfernt werden</string>
@@ -151,6 +214,7 @@
   <string name="projects_status_schedrpcinprogress">Serveranfrage läuft</string>
   <string name="projects_status_trickleuppending">Trickle-Up Nachricht ausstehend</string>
   <string name="projects_status_backoff">nächste Kommunikation in:</string>
+  <!--project controls-->
   <string name="projects_control_dialog_title">Projektbefehle:</string>
   <string name="projects_control_visit_website">Webseite besuchen</string>
   <string name="projects_control_update">Aktualisieren</string>
@@ -163,16 +227,20 @@
   <string name="projects_control_dialog_title_acctmgr">Kontoverwaltungsbefehle:</string>
   <string name="projects_control_sync_acctmgr">Synchronisieren</string>
   <string name="projects_control_remove_acctmgr">Deaktivieren</string>
+  <!--project confirm dialog-->
   <string name="projects_confirm_detach_title">Projekt entfernen?</string>
-  <string name="projects_confirm_detach_message">Wollen Sie wirklich zurücksetzen</string>
-  <string name="projects_confirm_detach_message2">von BOINC?</string>
+  <string name="projects_confirm_detach_message">Wollen Sie wirklich</string>
+  <string name="projects_confirm_detach_message2">von BOINC entfernen?</string>
   <string name="projects_confirm_detach_confirm">Entfernen</string>
   <string name="projects_confirm_reset_title">Projekt zurücksetzen</string>
-  <string name="projects_confirm_reset_message">Sind Sie sicher, dass Sie auf Standard zurücksetzen wollen?</string>
+  <string name="projects_confirm_reset_message">Sind Sie sicher, dass Projekt neu zu initialisieren</string>
+  <string name="projects_confirm_reset_message2">\?</string>
   <string name="projects_confirm_reset_confirm">Zurücksetzen</string>
   <string name="projects_confirm_remove_acctmgr_title">Kontoverwaltung deaktivieren</string>
-  <string name="projects_confirm_remove_acctmgr_message">Sind Sie sicher die Kontoverwaltung zu beenden</string>
+  <string name="projects_confirm_remove_acctmgr_message">Sind Sie sicher die Kontoverwaltung zu entfernen</string>
+  <string name="projects_confirm_remove_acctmgr_message2">\?</string>
   <string name="projects_confirm_remove_acctmgr_confirm">Deaktivieren</string>
+  <!--tasks tab strings-->
   <string name="tasks_header_name">Aufgabenname:</string>
   <string name="tasks_header_elapsed_time">Abgelaufene Zeit:</string>
   <string name="tasks_header_project_paused">(angehalten)</string>
@@ -193,11 +261,13 @@
   <string name="tasks_custom_suspended_via_gui">angehalten</string>
   <string name="tasks_custom_project_suspended_via_gui">Projekt angehalten</string>
   <string name="tasks_custom_ready_to_report">meldebereit</string>
+  <!--confirmation dialog-->
   <string name="confirm_abort_task_title">Aufgabe abbrechen?</string>
   <string name="confirm_abort_task_message">Aufgabe abbrechen:</string>
-  <string name="confirm_abort_task_confirm">Abbrechen</string>
-  <string name="confirm_cancel">Abbrechen</string>
+  <string name="confirm_abort_task_confirm">Aufgabe abbrechen</string>
+  <string name="confirm_cancel">Zurück</string>
   <string name="confirm_image_desc">Bestätigungsdialog</string>
+  <!--transfers tab strings-->
   <string name="trans_loading">Lade Übertragungen…</string>
   <string name="trans_upload">Hochladen</string>
   <string name="trans_download">Herunterladen</string>
@@ -211,15 +281,19 @@
   <string name="trans_control_retry">Übertragung wiederholen</string>
   <string name="confirm_abort_trans_title">Übertragung abbrechen?</string>
   <string name="confirm_abort_trans_message">Abbruch-Datei:</string>
-  <string name="confirm_abort_trans_confirm">Abbrechen</string>
+  <string name="confirm_abort_trans_confirm">Übertragung abbrechen</string>
+  <!--notices tab strings-->
   <string name="notices_loading">Lade Nachrichten...</string>
-  <string name="eventlog_loading">Lade Protokollnachrichten…</string>
+  <!--eventlog tab strings-->
+  <string name="eventlog_loading">Lade Protokollmeldungen…</string>
   <string name="eventlog_client_header">Client Meldungen</string>
   <string name="eventlog_gui_header">GUI Meldungen</string>
   <string name="eventlog_copy_toast">Protokoll in die Zwischenablage kopiert.</string>
   <string name="eventlog_email_subject">Ereignisprotokoll für BOINC auf Android:</string>
+  <!--suspend reasons-->
   <string name="suspend_unknown">Berechnung angehalten.</string>
   <string name="suspend_batteries">Schließen Sie Ihr Gerät an eine Stromquelle an um weiterzurechnen.</string>
+  <string name="suspend_screen_on">Bildschirm ausschalten um Berechnung fortzusetzen.</string>
   <string name="suspend_useractive">Benutzer ist aktiv.</string>
   <string name="suspend_tod">Außerhalb der Zeitbeschränkungen.</string>
   <string name="suspend_bm">BOINC ermittelt die Leistungsfähigkeit ihres Gerätes…</string>
@@ -232,12 +306,14 @@
   <string name="suspend_network_quota">Netzwerkübertragungslimit erreicht.</string>
   <string name="suspend_os">Gestoppt von Android.</string>
   <string name="suspend_wifi">Nicht per WLAN verbunden.</string>
-  <string name="suspend_battery_charging">Der Akku muss geladen werden bevor die Berechnung fortgesetzt werden kann.</string>
-  <string name="suspend_battery_charging_long">Berechnung wird fortgesetzt wenn der Ladezustand erreicht</string>
+  <string name="suspend_battery_charging">Warten bis der Akku geladen ist.</string>
+  <string name="suspend_battery_charging_long">Berechnung wird fortgesetzt wenn der Ladezustand größer</string>
+  <string name="suspend_battery_charging_long2"></string>
   <string name="suspend_battery_charging_current">aktuell</string>
   <string name="suspend_battery_overheating">Warten bis der Akku abgekühlt ist</string>
   <string name="suspend_user_req">Berechnung wird fortgesetzt…</string>
   <string name="suspend_network_user_req">manuell.</string>
+  <!--rpc reasons-->
   <string name="rpcreason_userreq">Vom Nutzer gefordert</string>
   <string name="rpcreason_needwork">Um Arbeit zu holen</string>
   <string name="rpcreason_resultsdue">Um Aufgaben abzuliefern</string>
@@ -246,19 +322,39 @@
   <string name="rpcreason_init">Projektinitialisierung</string>
   <string name="rpcreason_projectreq">Vom Projekt angefordert</string>
   <string name="rpcreason_unknown">Unbekannter Grund</string>
+  <!--menu-->
   <string name="menu_refresh">Neu laden</string>
   <string name="menu_emailto">Als E-Mail versenden</string>
   <string name="menu_copy">In Zwischenablage kopieren</string>
-  <string name="menu_eventlog">Statusprotokoll</string>
+  <string name="menu_eventlog">Statusmeldungen</string>
   <string name="menu_exit">BOINC beenden</string>
   <string name="menu_run_mode_disable">Anhalten</string>
   <string name="menu_run_mode_enable">Fortsetzen</string>
   <string name="menu_about">Über</string>
   <string name="menu_help">Hilfe</string>
+  <!--about dialog-->
   <string name="about_button">Zurück</string>
   <string name="about_title">Über</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>
-  <string name="about_copyright">© 2003–2013 Universität von Kalifornien, Berkeley.\nAlle Rechte vorbehalten.</string>
+  <string name="about_copyright">© 2003–2014 Universität von Kalifornien, Berkeley.</string>
+  <string name="about_copyright_reserved">Alle Rechte vorbehalten.</string>
+  <string name="about_credits">Danke dem Max Planck Institut für Gravitationsphysik, IBM und HTC für die Unterstützung.</string>
+  <!--notice notification-->
+  <string name="notice_notification_single_header">Neue Nachricht von</string>
+  <!--e.g. New notice from SETI at HOME-->
+  <string name="notice_notification_multiple_header">Neue Nachrichten</string>
+  <!--e.g. 3 new notices-->
+  <!--multi BOINC compitability-->
+  <string name="nonexcl_dialog_header">Volunteer Computing App gefunden</string>
+  <string name="nonexcl_dialog_text">Eine weitere Volunteer Computing App läuft auf diesem Gerät. Es kann immer nur eine App verwendet werden.</string>
+  <string name="nonexcl_dialog_exit">Beenden</string>
+  <!--social integration-->
+  <string name="social_invite_button">Freunde einladen</string>
+  <string name="social_invite_intent_title">Wie möchten Sie andere informieren?</string>
+  <string name="social_invite_content_title">Ich betreibe Forschung mit meinem Smartphone!</string>
+  <string name="social_invite_content_body">Ich benutze mein %1$s um für die Forschung zu rechnen. Du kannst das auch! Hier gibt es die 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/android/BOINC/res/values-en/strings.xml b/android/BOINC/res/values-en/strings.xml
new file mode 100644
index 0000000..e20e2df
--- /dev/null
+++ b/android/BOINC/res/values-en/strings.xml
@@ -0,0 +1,360 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--app global-->
+  <string name="app_name">BOINC</string>
+  <!--generic. used by multiple Activities/tabs-->
+  <string name="generic_loading">Loading! Please wait…</string>
+  <string name="generic_button_continue">Continue</string>
+  <string name="generic_button_finish">Finish</string>
+  <!--attach project-->
+  <!--selection list-->
+  <string name="attachproject_list_desc">Select scientific projects you want to contribute to:</string>
+  <string name="attachproject_list_header">Choose a project</string>
+  <string name="attachproject_list_manual_button">Add project by URL</string>
+  <string name="attachproject_list_manual_dialog_title">Enter project URL:</string>
+  <string name="attachproject_list_manual_dialog_button">Add project</string>
+  <string name="attachproject_list_manual_no_url">Please enter project URL</string>
+  <string name="attachproject_list_acctmgr_button">Add account manager</string>
+  <string name="attachproject_list_no_internet">No Internet connection</string>
+  <!--credential input-->
+  <string name="attachproject_credential_input_sing_desc">Enter account information</string>
+  <string name="attachproject_credential_input_desc">Enter account information for selected projects:</string>
+  <string name="attachproject_credential_input_show_pwd">Show password</string>
+  <string name="attachproject_individual_credential_input">Attach projects individually</string>
+  <!--conflicts-->
+  <string name="attachproject_conflicts_desc">There have been problems attaching scientific projects:</string>
+  <string name="attachproject_conflict_undefined">Could not connect</string>
+  <string name="attachproject_conflict_not_unique">Account exists with different password</string>
+  <string name="attachproject_conflict_bad_password">Password incorrect</string>
+  <string name="attachproject_conflict_unknown_user">Account does not exist</string>
+  <string name="attachproject_conflict_unknown_user_creation_disabled">Account does not exist, visit project website to register</string>
+  <!--working-->
+  <string name="attachproject_working_attaching">Attaching</string>
+  <!--e.g. Attaching Einstein at Home-->
+  <!--hints-->
+  <string name="attachproject_hints_header">Hint</string>
+  <!--e.g. Hint 1/2-->
+  <string name="attachproject_hint_contribtion_header">How to contribute:</string>
+  <string name="attachproject_hint_contribtion_wifi">1. Connect to WiFi</string>
+  <string name="attachproject_hint_contribtion_charger">2. Plug in Charger</string>
+  <string name="attachproject_hint_contribtion_screen">3. Turn off Screen</string>
+  <string name="attachproject_hint_projectwebsite_header">Visit project websites to:</string>
+  <string name="attachproject_hint_projectwebsite_science">Learn more about the science</string>
+  <string name="attachproject_hint_projectwebsite_stats">View contribution statistics</string>
+  <string name="attachproject_hint_projectwebsite_community">Get in touch with other volunteers</string>
+  <string name="attachproject_hint_platforms_header">BOINC is also available for your computer or laptop, visit boinc.berkeley.edu to learn more.</string>
+  <!--project login-->
+  <string name="attachproject_login_loading">Contacting project server…</string>
+  <string name="attachproject_login_image_description">Project logo.</string>
+  <string name="attachproject_login_header_general_area">General area:</string>
+  <string name="attachproject_login_header_specific_area">Specific area:</string>
+  <string name="attachproject_login_header_description">Description:</string>
+  <string name="attachproject_login_header_home">Home:</string>
+  <string name="attachproject_login_header_url">Website:</string>
+  <string name="attachproject_login_header_platform">Android:</string>
+  <string name="attachproject_login_platform_supported">Device type is supported by this project</string>
+  <string name="attachproject_login_platform_not_supported">Device is not supported by this project</string>
+  <string name="attachproject_login_category_terms_of_use">Terms of use for</string>
+  <string name="attachproject_login_accept_terms_of_use">By creating an account with this project, you accept the terms of use as shown above.</string>
+  <string name="attachproject_login_category_login">Sign in with existing account</string>
+  <string name="attachproject_login_header_id_email">eMail:</string>
+  <string name="attachproject_login_header_id_name">Name:</string>
+  <string name="attachproject_login_header_pwd">Password:</string>
+  <string name="attachproject_login_category_creation">New to </string>
+  <string name="attachproject_login_header_creation_enabled">Register an account to participate:</string>
+  <string name="attachproject_login_header_creation_client_disabled">Visit project website to create an account:</string>
+  <string name="attachproject_login_header_creation_disabled">This project is not currently accepting new accounts.</string>
+  <string name="attachproject_login_button_registration">Register</string>
+  <string name="attachproject_login_button_login">Sign in</string>
+  <string name="attachproject_login_button_forgotpw">Forgot Password</string>
+  <string name="attachproject_login_error_toast">Contacting project failed!</string>
+  <string name="attachproject_login_attached">Attached</string>
+  <!--project registration-->
+  <string name="attachproject_registration_header">Account registration for </string>
+  <string name="attachproject_registration_header_url">Project:</string>
+  <string name="attachproject_registration_header_email">eMail:</string>
+  <string name="attachproject_registration_header_username">Name:</string>
+  <string name="attachproject_registration_header_teamname">Team:</string>
+  <string name="attachproject_registration_header_pwd">Password:</string>
+  <string name="attachproject_registration_header_pwd_confirm">… Retype:</string>
+  <string name="attachproject_registration_button">Create</string>
+  <!--account manager-->
+  <string name="attachproject_acctmgr_list_desc">Use BOINC account manager to add and manage multiple projects</string>
+  <string name="attachproject_acctmgr_header">Add account manager</string>
+  <string name="attachproject_acctmgr_header_url">URL</string>
+  <string name="attachproject_acctmgr_header_name">User:</string>
+  <string name="attachproject_acctmgr_header_pwd">Password:</string>
+  <string name="attachproject_acctmgr_header_pwd_confirm">… Retype:</string>
+  <string name="attachproject_acctmgr_button">Add</string>
+  <!--error strings-->
+  <string name="attachproject_error_wrong_name">User not found</string>
+  <string name="attachproject_error_short_pwd">Password too short</string>
+  <string name="attachproject_error_no_internet">Connection failure</string>
+  <string name="attachproject_error_pwd_no_match">Passwords do not match</string>
+  <string name="attachproject_error_pwd_no_retype">Please type password again</string>
+  <string name="attachproject_error_no_url">Please enter URL</string>
+  <string name="attachproject_error_no_email">Please enter eMail address</string>
+  <string name="attachproject_error_no_pwd">Please enter a password</string>
+  <string name="attachproject_error_no_name">Please enter user name</string>
+  <string name="attachproject_error_unknown">failed</string>
+  <string name="attachproject_error_bad_username">User name refused</string>
+  <string name="attachproject_error_email_in_use">eMail is already in use</string>
+  <string name="attachproject_error_project_down">Project is offline</string>
+  <string name="attachproject_error_email_bad_syntax">eMail refused</string>
+  <string name="attachproject_error_bad_pwd">Password refused</string>
+  <string name="attachproject_error_creation_disabled">Account creation is disabled on this project</string>
+  <string name="attachproject_error_invalid_url">Invalid URL</string>
+  <!--working activity-->
+  <string name="attachproject_working_back_button">Back</string>
+  <string name="attachproject_working_finish_button">Finish</string>
+  <string name="attachproject_working_check_desc">Successful</string>
+  <string name="attachproject_working_failed_desc">Failed</string>
+  <string name="attachproject_working_ongoing">…</string>
+  <string name="attachproject_working_finished">.</string>
+  <string name="attachproject_working_description">:</string>
+  <string name="attachproject_working_connect">Connect</string>
+  <string name="attachproject_working_verify">Verify account</string>
+  <string name="attachproject_working_register">Register account</string>
+  <string name="attachproject_working_login">Log in</string>
+  <string name="attachproject_working_acctmgr">Add account manager</string>
+  <string name="attachproject_working_acctmgr_sync">Synchronize</string>
+  <!--main activity-->
+  <string name="main_noproject_warning">Tap here to choose a project.</string>
+  <string name="main_error">Whooops</string>
+  <string name="main_error_long">…this should not happen!\nClick on the icon to try again.</string>
+  <string name="main_title_icon_desc">BOINC icon</string>
+  <!--tab names-->
+  <string name="tab_status">Status</string>
+  <string name="tab_projects">Projects</string>
+  <string name="tab_tasks">Tasks</string>
+  <string name="tab_transfers">Transfers</string>
+  <string name="tab_preferences">Preferences</string>
+  <string name="tab_notices">Notices</string>
+  <string name="tab_desc">Navigation</string>
+  <!--status strings-->
+  <string name="status_running">Computing</string>
+  <string name="status_running_long">Thank you for participating.</string>
+  <string name="status_paused">Suspended</string>
+  <string name="status_idle">Nothing to do</string>
+  <string name="status_idle_long">Waiting for tasks…</string>
+  <string name="status_computing_disabled">Suspended</string>
+  <string name="status_computing_disabled_long">Press play to resume network and computation.</string>
+  <string name="status_launching">Starting…</string>
+  <string name="status_noproject">Choose a project to participate in.</string>
+  <string name="status_closing">Closing…</string>
+  <string name="status_benchmarking">Benchmarking…</string>
+  <string name="status_image_description">project image</string>
+  <!--preferences tab strings-->
+  <string name="prefs_loading">Reading preferences…</string>
+  <string name="prefs_submit_button">Save</string>
+  <string name="prefs_dialog_title">Enter new value:</string>
+  <string name="prefs_dialog_title_selection">Select:</string>
+  <string name="prefs_category_general">General</string>
+  <string name="prefs_category_network">Network</string>
+  <string name="prefs_category_power">Power</string>
+  <string name="prefs_category_cpu">CPU</string>
+  <string name="prefs_category_storage">Storage</string>
+  <string name="prefs_category_memory">Memory</string>
+  <string name="prefs_category_debug">Debug</string>
+  <string name="prefs_show_advanced_header">Show advanced preferences and controls…</string>
+  <string name="prefs_suspend_when_screen_on">Pause computation when screen is on</string>
+  <string name="prefs_stationary_device_mode_header">Stationary device mode</string>
+  <string name="prefs_stationary_device_mode_description">Allows computation regardless of Power preferences. Only enable if device does not have a battery.</string>
+  <string name="prefs_power_source_header">Power sources for computation</string>
+  <string name="prefs_power_source_description">Selects power sources BOINC is allowed to use for computation.</string>
+  <string name="prefs_power_source_ac">Wall socket</string>
+  <string name="prefs_power_source_usb">USB connection</string>
+  <string name="prefs_power_source_wireless">Wireless charger</string>
+  <string name="prefs_power_source_battery">Battery</string>
+  <string name="battery_charge_min_pct_header">Min. battery level</string>
+  <string name="battery_charge_min_pct_description">BOINC suspends computation below defined battery charge level.</string>
+  <string name="battery_temperature_max_header">Max. battery temperature</string>
+  <string name="battery_temperature_max_description">BOINC suspends computation above defined battery temperature. It is not recommended to change this value.</string>
+  <string name="prefs_disk_max_pct_header">Max. used storage space</string>
+  <string name="prefs_disk_max_pct_description">How many percent of your device\'s storage space is BOINC allowed to use?</string>
+  <string name="prefs_disk_min_free_gb_header">Min. spare storage</string>
+  <string name="prefs_disk_min_free_gb_description">How much of your device\'s storage space shall stay free?</string>
+  <string name="prefs_disk_access_interval_header">Access interval</string>
+  <string name="prefs_disk_access_interval_description">Suggests an interval between disk accesses</string>
+  <string name="prefs_network_daily_xfer_limit_mb_header">Daily transfer limit</string>
+  <string name="prefs_network_daily_xfer_limit_mb_description">Limits the daily data traffic caused by BOINC.</string>
+  <string name="prefs_network_wifi_only_header">Transfer tasks on WiFi only</string>
+  <string name="prefs_autostart_header">Autostart</string>
+  <string name="prefs_show_notification_notices_header">Show notification for new notices</string>
+  <string name="prefs_show_notification_suspended_header">Show notification when suspended</string>
+  <string name="prefs_cpu_number_cpus_header">Used CPU cores</string>
+  <string name="prefs_cpu_number_cpus_description">Limits the number of CPU cores BOINC uses for computation.</string>
+  <string name="prefs_cpu_other_load_suspension_header">Pause at CPU usage above</string>
+  <string name="prefs_cpu_other_load_suspension_description">Determines when BOINC pauses computation due to other apps\' CPU usage.</string>
+  <string name="prefs_cpu_time_max_header">CPU limit</string>
+  <string name="prefs_cpu_time_max_description">Limits the CPU time BOINC uses for computation.</string>
+  <string name="prefs_memory_max_idle_header">RAM limit</string>
+  <string name="prefs_memory_max_idle_description">Limits the amount of RAM tasks are allowed to occupy.</string>
+  <string name="prefs_client_log_flags_header">BOINC Client log flags</string>
+  <string name="prefs_gui_log_level_header">GUI log level</string>
+  <string name="prefs_gui_log_level_description">Specifies verbosity of GUI log messages.</string>
+  <string name="prefs_unit_mb">MB</string>
+  <string name="prefs_unit_gb">GB</string>
+  <string name="prefs_unit_pct">%</string>
+  <string name="prefs_unit_celcius">°C</string>
+  <string name="prefs_unit_seconds">sec</string>
+  <!--projects tab strings-->
+  <string name="projects_loading">Reading projects…</string>
+  <string name="projects_add">Add project</string>
+  <string name="projects_icon">Project icon</string>
+  <string name="projects_credits_header">Credit:</string>
+  <string name="projects_credits_host_header">(on this device)</string>
+  <string name="projects_credits_user_header">(total)</string>
+  <!--project status strings-->
+  <string name="projects_status_suspendedviagui">Suspended by user</string>
+  <string name="projects_status_dontrequestmorework">Won\'t get new tasks</string>
+  <string name="projects_status_ended">Project ended - OK to remove</string>
+  <string name="projects_status_detachwhendone">Will remove when tasks done</string>
+  <string name="projects_status_schedrpcpending">Scheduler request pending</string>
+  <string name="projects_status_schedrpcinprogress">Scheduler request in progress</string>
+  <string name="projects_status_trickleuppending">Trickle up message pending</string>
+  <string name="projects_status_backoff">Communication scheduled in:</string>
+  <!--project controls-->
+  <string name="projects_control_dialog_title">Project commands:</string>
+  <string name="projects_control_visit_website">Visit website</string>
+  <string name="projects_control_update">Update</string>
+  <string name="projects_control_remove">Remove</string>
+  <string name="projects_control_suspend">Suspend</string>
+  <string name="projects_control_resume">Resume</string>
+  <string name="projects_control_nonewtasks">No new tasks</string>
+  <string name="projects_control_allownewtasks">Allow new tasks</string>
+  <string name="projects_control_reset">Reset</string>
+  <string name="projects_control_dialog_title_acctmgr">Account manager commands:</string>
+  <string name="projects_control_sync_acctmgr">Synchronize</string>
+  <string name="projects_control_remove_acctmgr">Disable</string>
+  <!--project confirm dialog-->
+  <string name="projects_confirm_detach_title">Remove project?</string>
+  <string name="projects_confirm_detach_message">Are you sure you want to remove</string>
+  <string name="projects_confirm_detach_message2">from BOINC?</string>
+  <string name="projects_confirm_detach_confirm">Remove</string>
+  <string name="projects_confirm_reset_title">Reset project</string>
+  <string name="projects_confirm_reset_message">Are you sure you want to reset</string>
+  <string name="projects_confirm_reset_message2">\?</string>
+  <string name="projects_confirm_reset_confirm">Reset</string>
+  <string name="projects_confirm_remove_acctmgr_title">Disable account manager</string>
+  <string name="projects_confirm_remove_acctmgr_message">Are you sure you want to stop using</string>
+  <string name="projects_confirm_remove_acctmgr_message2">\?</string>
+  <string name="projects_confirm_remove_acctmgr_confirm">Disable</string>
+  <!--tasks tab strings-->
+  <string name="tasks_header_name">Task Name:</string>
+  <string name="tasks_header_elapsed_time">Elapsed time:</string>
+  <string name="tasks_header_project_paused">(suspended)</string>
+  <string name="tasks_header_deadline">Deadline:</string>
+  <string name="tasks_result_new">new</string>
+  <string name="tasks_result_files_downloading">waiting for download</string>
+  <string name="tasks_result_files_downloaded">download complete</string>
+  <string name="tasks_result_compute_error">computation error</string>
+  <string name="tasks_result_files_uploading">uploading</string>
+  <string name="tasks_result_files_uploaded">upload complete</string>
+  <string name="tasks_result_aborted">aborted</string>
+  <string name="tasks_result_upload_failed">upload failed</string>
+  <string name="tasks_active_uninitialized">ready</string>
+  <string name="tasks_active_executing">running</string>
+  <string name="tasks_active_suspended">suspended</string>
+  <string name="tasks_active_abort_pending">suspending</string>
+  <string name="tasks_active_quit_pending">suspending</string>
+  <string name="tasks_custom_suspended_via_gui">suspended</string>
+  <string name="tasks_custom_project_suspended_via_gui">project suspended</string>
+  <string name="tasks_custom_ready_to_report">ready to report</string>
+  <!--confirmation dialog-->
+  <string name="confirm_abort_task_title">Abort task?</string>
+  <string name="confirm_abort_task_message">Abort task:</string>
+  <string name="confirm_abort_task_confirm">Abort</string>
+  <string name="confirm_cancel">Cancel</string>
+  <string name="confirm_image_desc">Confirmation dialog</string>
+  <!--transfers tab strings-->
+  <string name="trans_loading">Reading transfers…</string>
+  <string name="trans_upload">Upload</string>
+  <string name="trans_download">Download</string>
+  <string name="trans_retryin">retry in</string>
+  <string name="trans_failed">failed</string>
+  <string name="trans_suspended">suspended</string>
+  <string name="trans_active">active</string>
+  <string name="trans_pending">pending</string>
+  <string name="trans_projectbackoff">project backoff</string>
+  <string name="trans_header_name">File:</string>
+  <string name="trans_control_retry">Retry transfers</string>
+  <string name="confirm_abort_trans_title">Abort transfer?</string>
+  <string name="confirm_abort_trans_message">Abort File:</string>
+  <string name="confirm_abort_trans_confirm">Abort</string>
+  <!--notices tab strings-->
+  <string name="notices_loading">Reading notices…</string>
+  <!--eventlog tab strings-->
+  <string name="eventlog_loading">Loading log messages…</string>
+  <string name="eventlog_client_header">Client Messages</string>
+  <string name="eventlog_gui_header">GUI Messages</string>
+  <string name="eventlog_copy_toast">Log copied to clipboard.</string>
+  <string name="eventlog_email_subject">Event Log for BOINC on Android:</string>
+  <!--suspend reasons-->
+  <string name="suspend_unknown">Computation suspended.</string>
+  <string name="suspend_batteries">Connect your device to a charger to continue computing.</string>
+  <string name="suspend_screen_on">Turn screen off to continue computing.</string>
+  <string name="suspend_useractive">User is active.</string>
+  <string name="suspend_tod">Out of computation time-frame.</string>
+  <string name="suspend_bm">BOINC is benchmarking your device…</string>
+  <string name="suspend_disksize">Out of disk space.</string>
+  <string name="suspend_cputhrottle">Scheduled CPU throttle.</string>
+  <string name="suspend_noinput">No recent user activity.</string>
+  <string name="suspend_delay">Initialization delay.</string>
+  <string name="suspend_exclusiveapp">An exclusive app is running.</string>
+  <string name="suspend_cpu">Your device is busy with other apps.</string>
+  <string name="suspend_network_quota">BOINC reached network transfer limit.</string>
+  <string name="suspend_os">Stopped by Android.</string>
+  <string name="suspend_wifi">Not connected to WiFi.</string>
+  <string name="suspend_battery_charging">Waiting for battery to charge.</string>
+  <string name="suspend_battery_charging_long">Computing will resume when battery charge reaches</string>
+  <string name="suspend_battery_charging_long2"></string>
+  <string name="suspend_battery_charging_current">currently</string>
+  <string name="suspend_battery_overheating">Waiting for battery to cool down</string>
+  <string name="suspend_user_req">Resuming computation…</string>
+  <string name="suspend_network_user_req">manually.</string>
+  <!--rpc reasons-->
+  <string name="rpcreason_userreq">Requested by user</string>
+  <string name="rpcreason_needwork">To fetch work</string>
+  <string name="rpcreason_resultsdue">To report completed tasks</string>
+  <string name="rpcreason_trickleup">To send trickle-up message</string>
+  <string name="rpcreason_acctmgrreq">Requested by account manager</string>
+  <string name="rpcreason_init">Project initialization</string>
+  <string name="rpcreason_projectreq">Requested by project</string>
+  <string name="rpcreason_unknown">Unknown reason</string>
+  <!--menu-->
+  <string name="menu_refresh">Refresh</string>
+  <string name="menu_emailto">Send as Email</string>
+  <string name="menu_copy">Copy to Clipboard</string>
+  <string name="menu_eventlog">Event Log</string>
+  <string name="menu_exit">Exit BOINC</string>
+  <string name="menu_run_mode_disable">Suspend</string>
+  <string name="menu_run_mode_enable">Resume</string>
+  <string name="menu_about">About</string>
+  <string name="menu_help">Help</string>
+  <!--about dialog-->
+  <string name="about_button">Return</string>
+  <string name="about_title">About</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>
+  <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">Thanks to the Max Planck Institute for Gravitational Physics, IBM Corporation and HTC Corporation for their support.</string>
+  <!--notice notification-->
+  <string name="notice_notification_single_header">New notice from</string>
+  <!--e.g. New notice from SETI at HOME-->
+  <string name="notice_notification_multiple_header">new notices</string>
+  <!--e.g. 3 new notices-->
+  <!--multi BOINC compitability-->
+  <string name="nonexcl_dialog_header">Volunteer computing app detected</string>
+  <string name="nonexcl_dialog_text">Another volunteer computing app is running on this device. Only one version can run at a time.</string>
+  <string name="nonexcl_dialog_exit">Exit</string>
+  <!--social integration-->
+  <string name="social_invite_button">Invite friends</string>
+  <string name="social_invite_intent_title">How do you want to share?</string>
+  <string name="social_invite_content_title">I\'m doing science on my smartphone!</string>
+  <string name="social_invite_content_body">I\'m using my %1$s to do computing for science. You can too! Download the app from: %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-fr/strings.xml b/android/BOINC/res/values-fr/strings.xml
index 490c4fd..87453cb 100644
--- a/android/BOINC/res/values-fr/strings.xml
+++ b/android/BOINC/res/values-fr/strings.xml
@@ -1,3 +1,360 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-</resources>
\ No newline at end of file
+  <!--app global-->
+  <string name="app_name">BOINC</string>
+  <!--generic. used by multiple Activities/tabs-->
+  <string name="generic_loading">Veuillez patienter...</string>
+  <string name="generic_button_continue">Continuer</string>
+  <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_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>
+  <string name="attachproject_list_manual_dialog_button">Ajouter un projet</string>
+  <string name="attachproject_list_manual_no_url">Veuillez saisir l\'URL du projet</string>
+  <string name="attachproject_list_acctmgr_button">Choisir un gestionnaire de compte</string>
+  <string name="attachproject_list_no_internet">Pas de connexion Internet</string>
+  <!--credential input-->
+  <string name="attachproject_credential_input_sing_desc">Éditer les informations de compte</string>
+  <string name="attachproject_credential_input_desc">Editer les information de compte pour les projets sélectionnés:</string>
+  <string name="attachproject_credential_input_show_pwd">Montrer le mot de passe</string>
+  <string name="attachproject_individual_credential_input">Ajouter des projets individuellement</string>
+  <!--conflicts-->
+  <string name="attachproject_conflicts_desc">Il y a des problèmes pour ajouter les projets suivants:</string>
+  <string name="attachproject_conflict_undefined">Connexion impossible</string>
+  <string name="attachproject_conflict_not_unique">Un compte existe avec un mot de passe différent</string>
+  <string name="attachproject_conflict_bad_password">Mot de passe incorrect</string>
+  <string name="attachproject_conflict_unknown_user">Le compte n\'existe pas</string>
+  <string name="attachproject_conflict_unknown_user_creation_disabled">Le compte n\'existe pas, rendez vous sur le site du projet pour vous enregistrer</string>
+  <!--working-->
+  <string name="attachproject_working_attaching">Ajout du projet</string>
+  <!--e.g. Attaching Einstein at Home-->
+  <!--hints-->
+  <string name="attachproject_hints_header">Indice</string>
+  <!--e.g. Hint 1/2-->
+  <string name="attachproject_hint_contribtion_header">Comment participer:</string>
+  <string name="attachproject_hint_contribtion_wifi">1. Se connecter au WiFi</string>
+  <string name="attachproject_hint_contribtion_charger">2. Branchez votre chargeur</string>
+  <string name="attachproject_hint_contribtion_screen">3. Eteindre l\'écran</string>
+  <string name="attachproject_hint_projectwebsite_header">Visitez les site web des projets:</string>
+  <string name="attachproject_hint_projectwebsite_science">En savoir plus au sujet du projet</string>
+  <string name="attachproject_hint_projectwebsite_stats">Voir les statistiques de contribution</string>
+  <string name="attachproject_hint_projectwebsite_community">Entrer en contact avec les autres participants</string>
+  <string name="attachproject_hint_platforms_header">BOINC est également disponible pour votre ordinateur de bureau ou portable, visitez boinc.berkeley.edu pour en savoir plus.</string>
+  <!--project login-->
+  <string name="attachproject_login_loading">Connexion avec le serveur du projet...</string>
+  <string name="attachproject_login_image_description">Logo du projet.</string>
+  <string name="attachproject_login_header_general_area">Domaine de recherche:</string>
+  <string name="attachproject_login_header_specific_area">Domaine spécifique:</string>
+  <string name="attachproject_login_header_description">Description:</string>
+  <string name="attachproject_login_header_home">Accueil:</string>
+  <string name="attachproject_login_header_url">Site web:</string>
+  <string name="attachproject_login_header_platform">Android:</string>
+  <string name="attachproject_login_platform_supported">Votre appareil est supporté par ce projet</string>
+  <string name="attachproject_login_platform_not_supported">Votre appareil n\'est pas supporté par ce projet</string>
+  <string name="attachproject_login_category_terms_of_use">Conditions d\'utilisation pour</string>
+  <string name="attachproject_login_accept_terms_of_use">En créant un compte sur ce projet vous acceptez les conditions d\'utilisation montrées ci-dessus.</string>
+  <string name="attachproject_login_category_login">Se connecter avec un compte existant</string>
+  <string name="attachproject_login_header_id_email">eMail:</string>
+  <string name="attachproject_login_header_id_name">Nom:</string>
+  <string name="attachproject_login_header_pwd">Mot de passe:</string>
+  <string name="attachproject_login_category_creation">Nouveau pour</string>
+  <string name="attachproject_login_header_creation_enabled">Enregistrez un compte pour participer:</string>
+  <string name="attachproject_login_header_creation_client_disabled">Visitez le site web du projet pour créer un compte:</string>
+  <string name="attachproject_login_header_creation_disabled">Le projet ne permet pas la création de nouveaux comptes pour le moment.</string>
+  <string name="attachproject_login_button_registration">S\'inscrire</string>
+  <string name="attachproject_login_button_login">Se connecter</string>
+  <string name="attachproject_login_button_forgotpw">Mot de passe oublié</string>
+  <string name="attachproject_login_error_toast">Connexion avec le serveur du projet impossible</string>
+  <string name="attachproject_login_attached">Ajouté</string>
+  <!--project registration-->
+  <string name="attachproject_registration_header">Enregistrement du compte pour</string>
+  <string name="attachproject_registration_header_url">Projet:</string>
+  <string name="attachproject_registration_header_email">eMail:</string>
+  <string name="attachproject_registration_header_username">Nom:</string>
+  <string name="attachproject_registration_header_teamname">Equipe:</string>
+  <string name="attachproject_registration_header_pwd">Mot de passe:</string>
+  <string name="attachproject_registration_header_pwd_confirm">... saisir de nouveau:</string>
+  <string name="attachproject_registration_button">Créer</string>
+  <!--account manager-->
+  <string name="attachproject_acctmgr_list_desc">Utilisez un gestionnaire de compte BOINC pour ajouter et gérer de nombreux projets</string>
+  <string name="attachproject_acctmgr_header">Ajouter un gestionnaire de compte</string>
+  <string name="attachproject_acctmgr_header_url">URL</string>
+  <string name="attachproject_acctmgr_header_name">Utilisateur:</string>
+  <string name="attachproject_acctmgr_header_pwd">Mot de passe:</string>
+  <string name="attachproject_acctmgr_header_pwd_confirm">... saisir de nouveau:</string>
+  <string name="attachproject_acctmgr_button">Ajouter</string>
+  <!--error strings-->
+  <string name="attachproject_error_wrong_name">Utilisateur non trouvé</string>
+  <string name="attachproject_error_short_pwd">Mot de passe trop court</string>
+  <string name="attachproject_error_no_internet">Erreur de connexion</string>
+  <string name="attachproject_error_pwd_no_match">Mot de passe incorrect</string>
+  <string name="attachproject_error_pwd_no_retype">Nouveau mot de passe (vérification)</string>
+  <string name="attachproject_error_no_url">Veuillez saisir l\'URL du projet</string>
+  <string name="attachproject_error_no_email">Veuillez entrer une adresse email</string>
+  <string name="attachproject_error_no_pwd">Veuillez saisir un mot de passe</string>
+  <string name="attachproject_error_no_name">Veuillez saisir un nom d\'utilisateur.</string>
+  <string name="attachproject_error_unknown">échec</string>
+  <string name="attachproject_error_bad_username">Nom d\'utilisateur refusé</string>
+  <string name="attachproject_error_email_in_use">Adresse email déjà utilisée</string>
+  <string name="attachproject_error_project_down">Projet hors ligne</string>
+  <string name="attachproject_error_email_bad_syntax">email refusé</string>
+  <string name="attachproject_error_bad_pwd">Mot de passe refusé</string>
+  <string name="attachproject_error_creation_disabled">La création de compte est désactivée pour ce projet</string>
+  <string name="attachproject_error_invalid_url">URL non valide</string>
+  <!--working activity-->
+  <string name="attachproject_working_back_button">Retour</string>
+  <string name="attachproject_working_finish_button">Terminer</string>
+  <string name="attachproject_working_check_desc">Succès</string>
+  <string name="attachproject_working_failed_desc">Echoué</string>
+  <string name="attachproject_working_ongoing">...</string>
+  <string name="attachproject_working_finished">.</string>
+  <string name="attachproject_working_description">:</string>
+  <string name="attachproject_working_connect">Se connecter</string>
+  <string name="attachproject_working_verify">Vérifier le compte</string>
+  <string name="attachproject_working_register">Création de compte</string>
+  <string name="attachproject_working_login">Connexion</string>
+  <string name="attachproject_working_acctmgr">Choisir un gestionnaire de compte</string>
+  <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_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-->
+  <string name="tab_status">État</string>
+  <string name="tab_projects">Projets</string>
+  <string name="tab_tasks">Tâches</string>
+  <string name="tab_transfers">Transferts</string>
+  <string name="tab_preferences">Préférences</string>
+  <string name="tab_notices">Remarques</string>
+  <string name="tab_desc">Navigation</string>
+  <!--status strings-->
+  <string name="status_running">Calculs en cours</string>
+  <string name="status_running_long">Merci pour votre participation.</string>
+  <string name="status_paused">Suspendu</string>
+  <string name="status_idle">Rien à faire</string>
+  <string name="status_idle_long">En attente de tâches...</string>
+  <string name="status_computing_disabled">Suspendu</string>
+  <string name="status_computing_disabled_long">Appuyez sur lire pour reprendre les communications réseau et le calcul.</string>
+  <string name="status_launching">Démarrage...</string>
+  <string name="status_noproject">Choisissez un projet auquel participer.</string>
+  <string name="status_closing">Fermeture...</string>
+  <string name="status_benchmarking">Etalonnage...</string>
+  <string name="status_image_description">image du projet</string>
+  <!--preferences tab strings-->
+  <string name="prefs_loading">Lecture des préférences...</string>
+  <string name="prefs_submit_button">Enregistrer</string>
+  <string name="prefs_dialog_title">Saisir une nouvelle valeur:</string>
+  <string name="prefs_dialog_title_selection">Sélectionner:</string>
+  <string name="prefs_category_general">Général</string>
+  <string name="prefs_category_network">Utilisation du réseau</string>
+  <string name="prefs_category_power">Allimentation</string>
+  <string name="prefs_category_cpu">CPU</string>
+  <string name="prefs_category_storage">Stockage</string>
+  <string name="prefs_category_memory">Mémoire</string>
+  <string name="prefs_category_debug">Déboguer</string>
+  <string name="prefs_show_advanced_header">Montrer les préférences avancées...</string>
+  <string name="prefs_suspend_when_screen_on">Suspendre le calcul quand l\'écran est allumé</string>
+  <string name="prefs_stationary_device_mode_header">Mode appareil fixe</string>
+  <string name="prefs_stationary_device_mode_description">Permettre le calcul indépendamment des préférence d’alimentation. Seulement autorisé si l\'appareil n\'a pas de batterie.</string>
+  <string name="prefs_power_source_header">Sources d\'alimentation pour le calcul</string>
+  <string name="prefs_power_source_description">Choisir les sources d\'alimentation que BOINC peut utiliser pour le calcul.</string>
+  <string name="prefs_power_source_ac">Prise murale</string>
+  <string name="prefs_power_source_usb">Connexion USB</string>
+  <string name="prefs_power_source_wireless">Chargeur sans fil</string>
+  <string name="prefs_power_source_battery">Batterie</string>
+  <string name="battery_charge_min_pct_header">Niveau minimum de batterie</string>
+  <string name="battery_charge_min_pct_description">BOINC suspend le calcul en dessous du niveau de charge défini.</string>
+  <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_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_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>
+  <string name="prefs_network_daily_xfer_limit_mb_description">Limite le trafic de données journalier causé par BOINC.</string>
+  <string name="prefs_network_wifi_only_header">Transférer les tâches seulement en WiFi</string>
+  <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_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>
+  <string name="prefs_cpu_time_max_header">Limite CPU</string>
+  <string name="prefs_cpu_time_max_description">Limite le temps CPU que BOINC utilise pour les calculs.</string>
+  <string name="prefs_memory_max_idle_header">Limite RAM</string>
+  <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_unit_mb">Mo</string>
+  <string name="prefs_unit_gb">Go</string>
+  <string name="prefs_unit_pct">%</string>
+  <string name="prefs_unit_celcius">°C</string>
+  <string name="prefs_unit_seconds">s</string>
+  <!--projects tab strings-->
+  <string name="projects_loading">Lecture des projets...</string>
+  <string name="projects_add">Ajout de projet</string>
+  <string name="projects_icon">Icône de projet</string>
+  <string name="projects_credits_header">Crédits:</string>
+  <string name="projects_credits_host_header">(sur cet appareil)</string>
+  <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_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>
+  <string name="projects_status_schedrpcinprogress">Requête au planificateur en cours</string>
+  <string name="projects_status_trickleuppending">Envoi des notifications d\'avancement en attente</string>
+  <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_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_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_message">Êtes-vous sûr de vouloir supprimer </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>
+  <string name="projects_confirm_reset_message2">\?</string>
+  <string name="projects_confirm_reset_confirm">Réinitialiser</string>
+  <string name="projects_confirm_remove_acctmgr_title">Désactiver le gestionnaire de compte</string>
+  <string name="projects_confirm_remove_acctmgr_message">Êtes-vous sûr de vouloir cesser d\'utiliser </string>
+  <string name="projects_confirm_remove_acctmgr_message2">\?</string>
+  <string name="projects_confirm_remove_acctmgr_confirm">Désactiver</string>
+  <!--tasks tab strings-->
+  <string name="tasks_header_name">Nom de la tâche:</string>
+  <string name="tasks_header_elapsed_time">Temps écoulé</string>
+  <string name="tasks_header_project_paused"> (suspendu)</string>
+  <string name="tasks_header_deadline">Date limite d\'envoi:</string>
+  <string name="tasks_result_new">nouveau</string>
+  <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_uploaded">Mise à jour effectuée</string>
+  <string name="tasks_result_aborted">annulé</string>
+  <string name="tasks_result_upload_failed">échec du chargement </string>
+  <string name="tasks_active_uninitialized">prêt</string>
+  <string name="tasks_active_executing">en cours d\'exécution</string>
+  <string name="tasks_active_suspended">suspendu</string>
+  <string name="tasks_active_abort_pending">suspension en cours</string>
+  <string name="tasks_active_quit_pending">suspension en cours</string>
+  <string name="tasks_custom_suspended_via_gui">suspendu</string>
+  <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_confirm">Abandonner</string>
+  <string name="confirm_cancel">Annuler</string>
+  <string name="confirm_image_desc">Confirmation</string>
+  <!--transfers tab strings-->
+  <string name="trans_loading">Lecture des transferts...</string>
+  <string name="trans_upload">Envoi</string>
+  <string name="trans_download">Téléchargement</string>
+  <string name="trans_retryin">réessayer dans </string>
+  <string name="trans_failed">échoué</string>
+  <string name="trans_suspended">suspendu</string>
+  <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_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_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_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-->
+  <string name="suspend_unknown">Calcul suspendu.</string>
+  <string name="suspend_batteries">Connecter votre appareil à son un chargeur pour continuer les calculs.</string>
+  <string name="suspend_screen_on">Eteindre l\'écran pour continuer les calculs.</string>
+  <string name="suspend_useractive">L\'utilisateur est actif.</string>
+  <string name="suspend_tod">Plus de tranche de calcul disponible.</string>
+  <string name="suspend_bm">BOINC effectue l\'étalonnage de votre appareil...</string>
+  <string name="suspend_disksize">Plus d\'espace disque.</string>
+  <string name="suspend_cputhrottle">Régulateur de CPU programmé</string>
+  <string name="suspend_noinput">Pas d\'activité utilisateur récente.</string>
+  <string name="suspend_delay">Délai d\'initialisation.</string>
+  <string name="suspend_exclusiveapp"> Une application exclusive est en cours d\'exécution.</string>
+  <string name="suspend_cpu">Votre appareil est occupé avec d\'autres applications.</string>
+  <string name="suspend_network_quota">BOINC a atteint la limite de transfert réseau.</string>
+  <string name="suspend_os">Stoppé par Android.</string>
+  <string name="suspend_wifi">Non connecté au WiFi.</string>
+  <string name="suspend_battery_charging">En attente de la recharge de la batterie.</string>
+  <string name="suspend_battery_charging_long">Le calcul reprendra lorsque la charge de la batterie atteindra</string>
+  <string name="suspend_battery_charging_long2"></string>
+  <string name="suspend_battery_charging_current">actuellement</string>
+  <string name="suspend_battery_overheating">En attente du refroidissement de la batterie</string>
+  <string name="suspend_user_req">Reprise du calcul...</string>
+  <string name="suspend_network_user_req">manuellement.</string>
+  <!--rpc reasons-->
+  <string name="rpcreason_userreq">Demandé par l\'utilisateur</string>
+  <string name="rpcreason_needwork">Pour demander du travail</string>
+  <string name="rpcreason_resultsdue">Pour rapporter une tâche terminée</string>
+  <string name="rpcreason_trickleup">Pour envoyer les messages de progression de tâche</string>
+  <string name="rpcreason_acctmgrreq">Demandé par le gestionnaire de compte</string>
+  <string name="rpcreason_init">Initialisation du projet</string>
+  <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_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_help">Aide</string>
+  <!--about dialog-->
+  <string name="about_button">Retour</string>
+  <string name="about_title">A propos de</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>
+  <string name="about_copyright">\u00A9 2003–2014 Université de Californie, Berkeley</string>
+  <string name="about_copyright_reserved">Tous droits réservés.</string>
+  <string name="about_credits">Merci à l\'Institut Max Planck de physique gravitationnelle, IBM Corporation et HTC Corporation pour leur soutien.</string>
+  <!--notice notification-->
+  <string name="notice_notification_single_header">Nouvelle notification de</string>
+  <!--e.g. New notice from SETI at HOME-->
+  <string name="notice_notification_multiple_header">nouvelle notification</string>
+  <!--e.g. 3 new notices-->
+  <!--multi BOINC compitability-->
+  <string name="nonexcl_dialog_header">Application de calcul bénévole détectée</string>
+  <string name="nonexcl_dialog_text">Une autre application de calcul informatique bénévole fonctionne sur cet appareil. Une seule application peut fonctionner à la fois.</string>
+  <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>
+  <!--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-it-rIT/strings.xml b/android/BOINC/res/values-it-rIT/strings.xml
index d39a97b..082b314 100644
--- a/android/BOINC/res/values-it-rIT/strings.xml
+++ b/android/BOINC/res/values-it-rIT/strings.xml
@@ -1,7 +1,14 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--app global-->
   <string name="app_name">BOINC</string>
+  <!--generic. used by multiple Activities/tabs-->
   <string name="generic_loading">Caricamento in corso! Attendere prego…</string>
+  <string name="generic_button_continue">Continua</string>
+  <string name="generic_button_finish">Fine</string>
+  <!--attach project-->
+  <!--selection list-->
+  <string name="attachproject_list_desc">Seleziona il progetto al quale vuoi contribuire:</string>
   <string name="attachproject_list_header">Scegli un progetto:</string>
   <string name="attachproject_list_manual_button">Aggiungi un progetto dall\'URL</string>
   <string name="attachproject_list_manual_dialog_title">Inserisci l\'URL del progetto:</string>
@@ -9,6 +16,34 @@
   <string name="attachproject_list_manual_no_url">Aggiungi l\'URL del progetto</string>
   <string name="attachproject_list_acctmgr_button">Aggiungi un account manager</string>
   <string name="attachproject_list_no_internet">Connessione Internet assente</string>
+  <!--credential input-->
+  <string name="attachproject_credential_input_sing_desc">Inserisci le informazioni account</string>
+  <string name="attachproject_credential_input_desc">Inserisci le account informazioni per i progetti selezionati:</string>
+  <string name="attachproject_credential_input_show_pwd">Visualizza password</string>
+  <string name="attachproject_individual_credential_input">Aggiungi progetti individualmente</string>
+  <!--conflicts-->
+  <string name="attachproject_conflicts_desc">Si sono verificati errori nell\'aggiunta dei seguenti progetti:</string>
+  <string name="attachproject_conflict_undefined">Impossibile connettersi</string>
+  <string name="attachproject_conflict_not_unique">L\'account esiste già con una password differente</string>
+  <string name="attachproject_conflict_bad_password">Password errata</string>
+  <string name="attachproject_conflict_unknown_user">Account inesistente</string>
+  <string name="attachproject_conflict_unknown_user_creation_disabled">Account inesistente, visita il sito web del progetto per registrarlo</string>
+  <!--working-->
+  <string name="attachproject_working_attaching">Connessione in corso</string>
+  <!--e.g. Attaching Einstein at Home-->
+  <!--hints-->
+  <string name="attachproject_hints_header">Aiuto</string>
+  <!--e.g. Hint 1/2-->
+  <string name="attachproject_hint_contribtion_header">Come contribuire:</string>
+  <string name="attachproject_hint_contribtion_wifi">1. Connetti ad una rete WIFI</string>
+  <string name="attachproject_hint_contribtion_charger">2. Inserisci il Caricabatterie</string>
+  <string name="attachproject_hint_contribtion_screen">3. Spegni lo schermo</string>
+  <string name="attachproject_hint_projectwebsite_header">Visita il sito web del progetto a:</string>
+  <string name="attachproject_hint_projectwebsite_science">Scopri di più sul calcolo scientifico</string>
+  <string name="attachproject_hint_projectwebsite_stats">Vedi le statistiche dei contributi</string>
+  <string name="attachproject_hint_projectwebsite_community">Parla con altri volontari</string>
+  <string name="attachproject_hint_platforms_header">BOINC è anche disponibile per il tuo computer o laptop, visita boinc.berkeley.edu per saperne di più.</string>
+  <!--project login-->
   <string name="attachproject_login_loading">Comunicazione con il server progetto in corso…</string>
   <string name="attachproject_login_image_description">Logo progetto.</string>
   <string name="attachproject_login_header_general_area">Idea generale:</string>
@@ -28,12 +63,13 @@
   <string name="attachproject_login_category_creation">Nuovo</string>
   <string name="attachproject_login_header_creation_enabled">Registra un account per partecipare:</string>
   <string name="attachproject_login_header_creation_client_disabled">Visita il sito web del progetto per creare un account:</string>
-  <string name="attachproject_login_header_creation_disabled">Il progetto non permette al momento la creazione di nuovi account!</string>
+  <string name="attachproject_login_header_creation_disabled">Al momento il progetto non accetta nuovi accounts.</string>
   <string name="attachproject_login_button_registration">Registra</string>
   <string name="attachproject_login_button_login">Login</string>
   <string name="attachproject_login_button_forgotpw">Password dimenticata</string>
   <string name="attachproject_login_error_toast">Comunicazione col progetto fallita!</string>
   <string name="attachproject_login_attached">Connesso</string>
+  <!--project registration-->
   <string name="attachproject_registration_header">Registrazione account per</string>
   <string name="attachproject_registration_header_url">Progetto:</string>
   <string name="attachproject_registration_header_email">eMail:</string>
@@ -42,16 +78,20 @@
   <string name="attachproject_registration_header_pwd">Password:</string>
   <string name="attachproject_registration_header_pwd_confirm">… Ripeti:</string>
   <string name="attachproject_registration_button">Crea</string>
+  <!--account manager-->
+  <string name="attachproject_acctmgr_list_desc">Usa un account manager BOINC per aggiungere e gestire progetti multipli</string>
   <string name="attachproject_acctmgr_header">Aggiungi un account manager</string>
   <string name="attachproject_acctmgr_header_url">URL</string>
   <string name="attachproject_acctmgr_header_name">Utente:</string>
   <string name="attachproject_acctmgr_header_pwd">Password:</string>
   <string name="attachproject_acctmgr_header_pwd_confirm">… Ripeti:</string>
   <string name="attachproject_acctmgr_button">Aggiungi</string>
+  <!--error strings-->
   <string name="attachproject_error_wrong_name">Utente non trovato</string>
   <string name="attachproject_error_short_pwd">Password troppo corta</string>
   <string name="attachproject_error_no_internet">Errore connessione</string>
   <string name="attachproject_error_pwd_no_match">Password non corrispondenti</string>
+  <string name="attachproject_error_pwd_no_retype">Per favore inserisci nuovamente la password</string>
   <string name="attachproject_error_no_url">Inserire un URL</string>
   <string name="attachproject_error_no_email">Per favore inserisci un indirizzo eMail</string>
   <string name="attachproject_error_no_pwd">Per favore inserisci una password</string>
@@ -64,6 +104,7 @@
   <string name="attachproject_error_bad_pwd">Password rifiutata</string>
   <string name="attachproject_error_creation_disabled">La creazione account è disabilitata su questo progetto</string>
   <string name="attachproject_error_invalid_url">URL invalido</string>
+  <!--working activity-->
   <string name="attachproject_working_back_button">Indietro</string>
   <string name="attachproject_working_finish_button">Fine</string>
   <string name="attachproject_working_check_desc">Completato</string>
@@ -77,10 +118,12 @@
   <string name="attachproject_working_login">Log in</string>
   <string name="attachproject_working_acctmgr">Aggiungi un account manager</string>
   <string name="attachproject_working_acctmgr_sync">Sincronizza</string>
+  <!--main activity-->
   <string name="main_noproject_warning">Premi qui per scegliere un progetto.</string>
   <string name="main_error">Whooops</string>
   <string name="main_error_long">…questo non deve succedere!\nClicca sull\'icona per riprovare.</string>
   <string name="main_title_icon_desc">icona BOINC</string>
+  <!--tab names-->
   <string name="tab_status">Stato</string>
   <string name="tab_projects">Progetti</string>
   <string name="tab_tasks">Elaborazioni</string>
@@ -88,6 +131,7 @@
   <string name="tab_preferences">Preferenze</string>
   <string name="tab_notices">Avvisi</string>
   <string name="tab_desc">Navigazione</string>
+  <!--status strings-->
   <string name="status_running">Elaborazione in corso</string>
   <string name="status_running_long">Grazie per la partecipazione.</string>
   <string name="status_paused">Sospeso</string>
@@ -100,6 +144,7 @@
   <string name="status_closing">Chiusura in corso…</string>
   <string name="status_benchmarking">Benchmark in corso…</string>
   <string name="status_image_description">immagine progetto</string>
+  <!--preferences tab strings-->
   <string name="prefs_loading">Lettura preferenze in corso…</string>
   <string name="prefs_submit_button">Salva</string>
   <string name="prefs_dialog_title">Inserisci il nuovo valore:</string>
@@ -112,6 +157,15 @@
   <string name="prefs_category_memory">Memoria</string>
   <string name="prefs_category_debug">Debug</string>
   <string name="prefs_show_advanced_header">Visualizza preferenze avanzate e controlli…</string>
+  <string name="prefs_suspend_when_screen_on">Interrompi il calcolo quando lo schermo è acceso</string>
+  <string name="prefs_stationary_device_mode_header">Modalità dispositivo stazionario</string>
+  <string name="prefs_stationary_device_mode_description">Permetti il calcolo a prescindere dalle preferenze di elettricità. Abilitalo solo se il dispositivo non ha una batteria.</string>
+  <string name="prefs_power_source_header">Sorgente di elettricità per il calcolo</string>
+  <string name="prefs_power_source_description">Seleziona le sorgenti di elettricità che BOINC può usare per il calcolo.</string>
+  <string name="prefs_power_source_ac">Caricabatterie a muro</string>
+  <string name="prefs_power_source_usb">Connessione USB</string>
+  <string name="prefs_power_source_wireless">Caricabatterie wireless</string>
+  <string name="prefs_power_source_battery">Batteria</string>
   <string name="battery_charge_min_pct_header">Minimo livello batteria</string>
   <string name="battery_charge_min_pct_description">BOINC sospende l\'elaborazione sotto il livello definito di carica della batteria.</string>
   <string name="battery_temperature_max_header">Temperatura massima della batteria</string>
@@ -120,10 +174,14 @@
   <string name="prefs_disk_max_pct_description">Quanta percentuale dello spazio di salvataggio può usare BOINC?</string>
   <string name="prefs_disk_min_free_gb_header">Minimo spazio su disco</string>
   <string name="prefs_disk_min_free_gb_description">Quanto dello spazio di salvataggio del tuo dispositivo deve rimanere libero?</string>
+  <string name="prefs_disk_access_interval_header">Intervallo di accesso</string>
+  <string name="prefs_disk_access_interval_description">Suggerisci un intervallo tra le scritture su disco</string>
   <string name="prefs_network_daily_xfer_limit_mb_header">Limite trasferimento giornaliero</string>
   <string name="prefs_network_daily_xfer_limit_mb_description">Limita il traffico giornaliero causato da BOINC.</string>
   <string name="prefs_network_wifi_only_header">Trasferisce i lavori solo su WiFi</string>
   <string name="prefs_autostart_header">Avvio automatico</string>
+  <string name="prefs_show_notification_notices_header">Visualizza notifiche per nuove notizie</string>
+  <string name="prefs_show_notification_suspended_header">Visualizza notifiche quando sospeso</string>
   <string name="prefs_cpu_number_cpus_header">Usa questo numero di core CPU</string>
   <string name="prefs_cpu_number_cpus_description">Limita il numero di core CPU che BOINC usa per l\'elaborazione.</string>
   <string name="prefs_cpu_other_load_suspension_header">Pausa con utilizzo CPU superiore a</string>
@@ -139,12 +197,15 @@
   <string name="prefs_unit_gb">GB</string>
   <string name="prefs_unit_pct">%</string>
   <string name="prefs_unit_celcius">°C</string>
+  <string name="prefs_unit_seconds">secondi</string>
+  <!--projects tab strings-->
   <string name="projects_loading">Lettura progetti…</string>
   <string name="projects_add">Aggiungi progetto</string>
   <string name="projects_icon">icona Progetto</string>
   <string name="projects_credits_header">Crediti:</string>
   <string name="projects_credits_host_header">(su questo dispositivo)</string>
   <string name="projects_credits_user_header">(totale)</string>
+  <!--project status strings-->
   <string name="projects_status_suspendedviagui">Sospeso dall\'utente</string>
   <string name="projects_status_dontrequestmorework">Non chiedere nuovi lavori</string>
   <string name="projects_status_ended">Progetto terminato - Può essere rimosso</string>
@@ -153,6 +214,7 @@
   <string name="projects_status_schedrpcinprogress">Richiesta allo scheduler in corso</string>
   <string name="projects_status_trickleuppending">Messaggi trickle up in attesa</string>
   <string name="projects_status_backoff">Comunicazione tra:</string>
+  <!--project controls-->
   <string name="projects_control_dialog_title">Comandi progetto:</string>
   <string name="projects_control_visit_website">Visita il sito web</string>
   <string name="projects_control_update">Aggiorna</string>
@@ -165,16 +227,20 @@
   <string name="projects_control_dialog_title_acctmgr">Comandi dell\'account manager:</string>
   <string name="projects_control_sync_acctmgr">Sincronizza</string>
   <string name="projects_control_remove_acctmgr">Disabilita</string>
+  <!--project confirm dialog-->
   <string name="projects_confirm_detach_title">Rimuovere il progetto?</string>
   <string name="projects_confirm_detach_message">Sei sicuro di voler rimuovere</string>
   <string name="projects_confirm_detach_message2">da BOINC?</string>
   <string name="projects_confirm_detach_confirm">Rimuovi</string>
   <string name="projects_confirm_reset_title">Reset progetto</string>
   <string name="projects_confirm_reset_message">Sei sicuro di voler resettare</string>
+  <string name="projects_confirm_reset_message2">\?</string>
   <string name="projects_confirm_reset_confirm">Reset</string>
   <string name="projects_confirm_remove_acctmgr_title">Disabilita l\'account manager</string>
   <string name="projects_confirm_remove_acctmgr_message">Sei sicuro di voler terminare l\'utilizzo</string>
+  <string name="projects_confirm_remove_acctmgr_message2">\?</string>
   <string name="projects_confirm_remove_acctmgr_confirm">Disabilita</string>
+  <!--tasks tab strings-->
   <string name="tasks_header_name">Nome Lavoro:</string>
   <string name="tasks_header_elapsed_time">Tempo trascorso:</string>
   <string name="tasks_header_project_paused">(sospeso)</string>
@@ -195,11 +261,13 @@
   <string name="tasks_custom_suspended_via_gui">sospeso</string>
   <string name="tasks_custom_project_suspended_via_gui">progetto sospeso</string>
   <string name="tasks_custom_ready_to_report">pronto per il report</string>
+  <!--confirmation dialog-->
   <string name="confirm_abort_task_title">Annullare elaborazione?</string>
   <string name="confirm_abort_task_message">Annulla elaborazione:</string>
   <string name="confirm_abort_task_confirm">Annulla</string>
   <string name="confirm_cancel">Cancella</string>
   <string name="confirm_image_desc">Finestra di conferma</string>
+  <!--transfers tab strings-->
   <string name="trans_loading">Lettura trasferimenti…</string>
   <string name="trans_upload">Upload</string>
   <string name="trans_download">Download</string>
@@ -214,14 +282,18 @@
   <string name="confirm_abort_trans_title">Annullare trasferimento?</string>
   <string name="confirm_abort_trans_message">Annulla File:</string>
   <string name="confirm_abort_trans_confirm">Annulla</string>
+  <!--notices tab strings-->
   <string name="notices_loading">Lettura notizie...</string>
+  <!--eventlog tab strings-->
   <string name="eventlog_loading">Caricamento messaggi di log…</string>
   <string name="eventlog_client_header">Messaggi del Client</string>
   <string name="eventlog_gui_header">Messaggi della GUI</string>
   <string name="eventlog_copy_toast">Log copiato nella clipboard.</string>
   <string name="eventlog_email_subject">Log eventi per BOINC su Android:</string>
+  <!--suspend reasons-->
   <string name="suspend_unknown">Elaborazione sospesa.</string>
   <string name="suspend_batteries">Connetti il tuo dispositivo ad un caricabatterie per continuare l\'eleborazione.</string>
+  <string name="suspend_screen_on">Spegni lo schermo per continuare il calcolo.</string>
   <string name="suspend_useractive">Utente attivo.</string>
   <string name="suspend_tod">Fuori tempo massimo di computazione.</string>
   <string name="suspend_bm">BOINC sta facendo il benchmark del tuo dispositivo…</string>
@@ -234,12 +306,14 @@
   <string name="suspend_network_quota">BOINC ha raggiunto il limite di trasferimento dalla rete.</string>
   <string name="suspend_os">Fermato da Android.</string>
   <string name="suspend_wifi">Non connesso al WiFi</string>
-  <string name="suspend_battery_charging">La batteria necessita di essere ricaricata prima di riprendere l\'elaborazione.</string>
+  <string name="suspend_battery_charging">In attesa che la batteria si ricarichi.</string>
   <string name="suspend_battery_charging_long">L\'elaborazione riprenderà quando il livello di carica della batteria raggiunge</string>
+  <string name="suspend_battery_charging_long2"></string>
   <string name="suspend_battery_charging_current">attualmente</string>
   <string name="suspend_battery_overheating">In attesa che la batteria si raffreddi</string>
   <string name="suspend_user_req">Ripresa elaborazione…</string>
   <string name="suspend_network_user_req">manualmente.</string>
+  <!--rpc reasons-->
   <string name="rpcreason_userreq">Richiesta dall\'utente</string>
   <string name="rpcreason_needwork">Richiesta lavoro</string>
   <string name="rpcreason_resultsdue">Invio elaborazioni terminate</string>
@@ -248,6 +322,7 @@
   <string name="rpcreason_init">Inizializzazione progetto</string>
   <string name="rpcreason_projectreq">Richiesto dal progetto</string>
   <string name="rpcreason_unknown">Motivo sconosciuto</string>
+  <!--menu-->
   <string name="menu_refresh">Refresh</string>
   <string name="menu_emailto">Invia una Email</string>
   <string name="menu_copy">Copia nella Clipboard</string>
@@ -257,10 +332,29 @@
   <string name="menu_run_mode_enable">Riprendi</string>
   <string name="menu_about">About</string>
   <string name="menu_help">Help</string>
+  <!--about dialog-->
   <string name="about_button">Return</string>
   <string name="about_title">About</string>
   <string name="about_name">BOINC</string>
   <string name="about_version">Versione</string>
   <string name="about_name_long">Berkeley Open Infrastructure for Network Computing</string>
   <string name="about_copyright">© 2003–2013 University of California, Berkeley.\nTutti i diritti riservati.</string>
+  <string name="about_copyright_reserved">Tutti i Diritti Riservati.</string>
+  <string name="about_credits">Grazie all\'istituto Max Planck per la Fisica Gravitazionale, la IBM Corporation e la HTC Corporation per il loro supporto.</string>
+  <!--notice notification-->
+  <string name="notice_notification_single_header">Nuova notizia da</string>
+  <!--e.g. New notice from SETI at HOME-->
+  <string name="notice_notification_multiple_header">nuovi avvisi</string>
+  <!--e.g. 3 new notices-->
+  <!--multi BOINC compitability-->
+  <string name="nonexcl_dialog_header">Applicazione di calcolo distribuito rilevata</string>
+  <string name="nonexcl_dialog_text">Un\'altra applicazione di calcolo distribuito volontario è in uso su questo dispositivo. Solo una versione per volta può essere utilizzata.</string>
+  <string name="nonexcl_dialog_exit">Esci</string>
+  <!--social integration-->
+  <string name="social_invite_button">Invita amici</string>
+  <string name="social_invite_intent_title">Come vuoi condividere?</string>
+  <string name="social_invite_content_title">Sto facendo calcoli scientifici dal mio smartphone!</string>
+  <string name="social_invite_content_body">Sto usando il mio %1$s per fare calcolo scientifico distribuito. Anche tu puoi! Scarica l\'applicazione da: %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-ja/strings.xml b/android/BOINC/res/values-ja/strings.xml
index 490c4fd..878801b 100644
--- a/android/BOINC/res/values-ja/strings.xml
+++ b/android/BOINC/res/values-ja/strings.xml
@@ -1,3 +1,360 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-</resources>
\ No newline at end of file
+  <!--app global-->
+  <string name="app_name">BOINC</string>
+  <!--generic. used by multiple Activities/tabs-->
+  <string name="generic_loading">読み込み中! お待ちください…</string>
+  <string name="generic_button_continue">続行</string>
+  <string name="generic_button_finish">完了</string>
+  <!--attach project-->
+  <!--selection list-->
+  <string name="attachproject_list_desc">あなたが貢献したい科学プロジェクトを選択してください: </string>
+  <string name="attachproject_list_header">プロジェクトを選択してください</string>
+  <string name="attachproject_list_manual_button">URLによってプロジェクトを追加</string>
+  <string name="attachproject_list_manual_dialog_title">プロジェクトのURLを入力: </string>
+  <string name="attachproject_list_manual_dialog_button">プロジェクトを追加</string>
+  <string name="attachproject_list_manual_no_url">プロジェクトのURLを入力してください</string>
+  <string name="attachproject_list_acctmgr_button">アカウント・マネージャを追加</string>
+  <string name="attachproject_list_no_internet">インターネット接続なし</string>
+  <!--credential input-->
+  <string name="attachproject_credential_input_sing_desc">アカウント情報を入力</string>
+  <string name="attachproject_credential_input_desc">選択したプロジェクトのアカウント情報を入力: </string>
+  <string name="attachproject_credential_input_show_pwd">パスワードを表示</string>
+  <string name="attachproject_individual_credential_input">プロジェクトを個別に追加する</string>
+  <!--conflicts-->
+  <string name="attachproject_conflicts_desc">科学プロジェクトを追加中に問題が発生しました: </string>
+  <string name="attachproject_conflict_undefined">接続できませんでした</string>
+  <string name="attachproject_conflict_not_unique">異なるパスワードを持つアカウントが存在します</string>
+  <string name="attachproject_conflict_bad_password">パスワードが間違っています</string>
+  <string name="attachproject_conflict_unknown_user">アカウントが存在しません</string>
+  <string name="attachproject_conflict_unknown_user_creation_disabled">アカウントが存在しません、プロジェクトのウェブサイトを訪問し登録してください</string>
+  <!--working-->
+  <string name="attachproject_working_attaching">追加中</string>
+  <!--e.g. Attaching Einstein at Home-->
+  <!--hints-->
+  <string name="attachproject_hints_header">ヒント</string>
+  <!--e.g. Hint 1/2-->
+  <string name="attachproject_hint_contribtion_header">貢献する方法: </string>
+  <string name="attachproject_hint_contribtion_wifi">1. WiFiに接続します</string>
+  <string name="attachproject_hint_contribtion_charger">2. 充電器につなぎます</string>
+  <string name="attachproject_hint_contribtion_screen">3. 画面の電源を切ります</string>
+  <string name="attachproject_hint_projectwebsite_header">プロジェクトのウェブサイトを訪問 : </string>
+  <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>
+  <!--project login-->
+  <string name="attachproject_login_loading">プロジェクトのサーバに問い合わせ中…</string>
+  <string name="attachproject_login_image_description">プロジェクトのロゴ。</string>
+  <string name="attachproject_login_header_general_area">一般的領域: </string>
+  <string name="attachproject_login_header_specific_area">具体的領域: </string>
+  <string name="attachproject_login_header_description">説明: </string>
+  <string name="attachproject_login_header_home">ホーム: </string>
+  <string name="attachproject_login_header_url">ウェブサイト: </string>
+  <string name="attachproject_login_header_platform">Android: </string>
+  <string name="attachproject_login_platform_supported">デバイスのタイプはこのプロジェクトでサポートされています</string>
+  <string name="attachproject_login_platform_not_supported">デバイスはこのプロジェクトでサポートされていません</string>
+  <string name="attachproject_login_category_terms_of_use">下記のもののための利用規約</string>
+  <string name="attachproject_login_accept_terms_of_use">このプロジェクトのアカウントを作成することで、上記のような利用規約に同意します。</string>
+  <string name="attachproject_login_category_login">既存のアカウントでサインイン</string>
+  <string name="attachproject_login_header_id_email">Eメール: </string>
+  <string name="attachproject_login_header_id_name">名前: </string>
+  <string name="attachproject_login_header_pwd">パスワード: </string>
+  <string name="attachproject_login_category_creation">目新しい</string>
+  <string name="attachproject_login_header_creation_enabled">参加するためにアカウントを登録: </string>
+  <string name="attachproject_login_header_creation_client_disabled">アカウント作成のためプロジェクトのウェブサイトを訪問</string>
+  <string name="attachproject_login_header_creation_disabled">現在このプロジェクトは新規アカウントの登録を受け付けていません。</string>
+  <string name="attachproject_login_button_registration">登録</string>
+  <string name="attachproject_login_button_login">サインイン</string>
+  <string name="attachproject_login_button_forgotpw">パスワードを忘れた</string>
+  <string name="attachproject_login_error_toast">プロジェクトへの接触に失敗しました!</string>
+  <string name="attachproject_login_attached">追加済み</string>
+  <!--project registration-->
+  <string name="attachproject_registration_header">下記へのアカウント登録</string>
+  <string name="attachproject_registration_header_url">プロジェクト: </string>
+  <string name="attachproject_registration_header_email">Eメール: </string>
+  <string name="attachproject_registration_header_username">名前: </string>
+  <string name="attachproject_registration_header_teamname">チーム: </string>
+  <string name="attachproject_registration_header_pwd">パスワード: </string>
+  <string name="attachproject_registration_header_pwd_confirm">…もう一度入力: </string>
+  <string name="attachproject_registration_button">作成</string>
+  <!--account manager-->
+  <string name="attachproject_acctmgr_list_desc">複数のプロジェクトを追加・管理するために BOINC アカウント・マネージャを使用</string>
+  <string name="attachproject_acctmgr_header">アカウント・マネージャを追加</string>
+  <string name="attachproject_acctmgr_header_url">URL</string>
+  <string name="attachproject_acctmgr_header_name">ユーザー名: </string>
+  <string name="attachproject_acctmgr_header_pwd">パスワード: </string>
+  <string name="attachproject_acctmgr_header_pwd_confirm">…もう一度入力: </string>
+  <string name="attachproject_acctmgr_button">追加</string>
+  <!--error strings-->
+  <string name="attachproject_error_wrong_name">参加者が見つかりません</string>
+  <string name="attachproject_error_short_pwd">パスワードが短すぎます</string>
+  <string name="attachproject_error_no_internet">接続失敗</string>
+  <string name="attachproject_error_pwd_no_match">パスワードが一致しません</string>
+  <string name="attachproject_error_pwd_no_retype">パスワードを再度入力してください</string>
+  <string name="attachproject_error_no_url">URLを入力してください</string>
+  <string name="attachproject_error_no_email">Eメールアドレスを入力してください</string>
+  <string name="attachproject_error_no_pwd">パスワードを入力してください</string>
+  <string name="attachproject_error_no_name">ユーザー名を入力してください</string>
+  <string name="attachproject_error_unknown">失敗</string>
+  <string name="attachproject_error_bad_username">ユーザー名が拒否されました</string>
+  <string name="attachproject_error_email_in_use">Eメールアドレスがすでに使用されています</string>
+  <string name="attachproject_error_project_down">プロジェクトはオフラインです</string>
+  <string name="attachproject_error_email_bad_syntax">Eメールアドレスが拒否されました</string>
+  <string name="attachproject_error_bad_pwd">パスワードが拒否されました</string>
+  <string name="attachproject_error_creation_disabled">このプロジェクトではアカウント作成が無効になっています</string>
+  <string name="attachproject_error_invalid_url">無効なURL</string>
+  <!--working activity-->
+  <string name="attachproject_working_back_button">戻る</string>
+  <string name="attachproject_working_finish_button">完了</string>
+  <string name="attachproject_working_check_desc">成功</string>
+  <string name="attachproject_working_failed_desc">失敗</string>
+  <string name="attachproject_working_ongoing">…</string>
+  <string name="attachproject_working_finished">.</string>
+  <string name="attachproject_working_description">:</string>
+  <string name="attachproject_working_connect">接続</string>
+  <string name="attachproject_working_verify">アカウントを確認</string>
+  <string name="attachproject_working_register">アカウントを登録</string>
+  <string name="attachproject_working_login">ログイン</string>
+  <string name="attachproject_working_acctmgr">アカウント・マネージャを追加</string>
+  <string name="attachproject_working_acctmgr_sync">同期</string>
+  <!--main activity-->
+  <string name="main_noproject_warning">プロジェクトを選択するにはここをタップしてください。</string>
+  <string name="main_error">おっと</string>
+  <string name="main_error_long">…これは起こるべきではありません! \n 再試行するにはアイコンをクリックしてください。</string>
+  <string name="main_title_icon_desc">BOINCのアイコン</string>
+  <!--tab names-->
+  <string name="tab_status">状態</string>
+  <string name="tab_projects">プロジェクト</string>
+  <string name="tab_tasks">タスク</string>
+  <string name="tab_transfers">ファイル転送</string>
+  <string name="tab_preferences">プレファレンス(好みの設定)</string>
+  <string name="tab_notices">お知らせ</string>
+  <string name="tab_desc">誘導</string>
+  <!--status strings-->
+  <string name="status_running">計算</string>
+  <string name="status_running_long">ご参加ありがとうございます。</string>
+  <string name="status_paused">一時停止中</string>
+  <string name="status_idle">することがありません</string>
+  <string name="status_idle_long">タスクを待機中…</string>
+  <string name="status_computing_disabled">一時停止中</string>
+  <string name="status_computing_disabled_long">ネットワーク接続と計算を再開するには[play]を押してください。</string>
+  <string name="status_launching">起動中…</string>
+  <string name="status_noproject">参加するプロジェクトを選んでください。</string>
+  <string name="status_closing">終了中…</string>
+  <string name="status_benchmarking">ベンチマーク中…</string>
+  <string name="status_image_description">プロジェクトの画像</string>
+  <!--preferences tab strings-->
+  <string name="prefs_loading">プレファレンスを読み込み中…</string>
+  <string name="prefs_submit_button">保存</string>
+  <string name="prefs_dialog_title">新しい値を入力: </string>
+  <string name="prefs_dialog_title_selection">選択 : </string>
+  <string name="prefs_category_general">一般</string>
+  <string name="prefs_category_network">ネットワーク</string>
+  <string name="prefs_category_power">電源</string>
+  <string name="prefs_category_cpu">CPU</string>
+  <string name="prefs_category_storage">ストレージ</string>
+  <string name="prefs_category_memory">メモリ</string>
+  <string name="prefs_category_debug">デバッグ</string>
+  <string name="prefs_show_advanced_header">詳細なプレファレンスとコントロールを表示…</string>
+  <string name="prefs_suspend_when_screen_on">画面の電源が入っている時は計算を一時停止</string>
+  <string name="prefs_stationary_device_mode_header">固定デバイスモード</string>
+  <string name="prefs_stationary_device_mode_description">電源に関するプレファレンスに関係なく計算を許可します。端末にバッテリーが搭載されていない場合のみ有効です。</string>
+  <string name="prefs_power_source_header">計算のための電源供給源</string>
+  <string name="prefs_power_source_description">BOINC が計算を許可される電源供給源を選択してください。</string>
+  <string name="prefs_power_source_ac">コンセント</string>
+  <string name="prefs_power_source_usb">USB接続</string>
+  <string name="prefs_power_source_wireless">ワイヤレス充電器</string>
+  <string name="prefs_power_source_battery">バッテリー</string>
+  <string name="battery_charge_min_pct_header">最少バッテリー残量</string>
+  <string name="battery_charge_min_pct_description">BOINCは定められたバッテリー充電レベルを下回ると計算を一時停止します。</string>
+  <string name="battery_temperature_max_header">最高バッテリー温度</string>
+  <string name="battery_temperature_max_description">BOINCは定められたバッテリー温度を上回ると計算を一時停止します。この値を変更することは推奨されません。</string>
+  <string name="prefs_disk_max_pct_header">ストレージの最大使用量</string>
+  <string name="prefs_disk_max_pct_description">BOINCがデバイスのストレージ領域の何パーセント使用することを許可されていますか?</string>
+  <string name="prefs_disk_min_free_gb_header">最小予備記憶領域</string>
+  <string name="prefs_disk_min_free_gb_description">端末の記憶領域をどれくらい空けておきますか?</string>
+  <string name="prefs_disk_access_interval_header">アクセス間隔</string>
+  <string name="prefs_disk_access_interval_description">記憶領域への読み書き間隔</string>
+  <string name="prefs_network_daily_xfer_limit_mb_header">一日あたりの転送容量制限</string>
+  <string name="prefs_network_daily_xfer_limit_mb_description">BOINCに起因する一日あたりのデータトラフィックを制限します。</string>
+  <string name="prefs_network_wifi_only_header">WiFiでのみタスクを転送する</string>
+  <string name="prefs_autostart_header">自動起動</string>
+  <string name="prefs_show_notification_notices_header">新しいお知らせがあった場合通知を表示</string>
+  <string name="prefs_show_notification_suspended_header">一時停止中に通知を表示</string>
+  <string name="prefs_cpu_number_cpus_header">使用されるCPUコア数</string>
+  <string name="prefs_cpu_number_cpus_description">BOINCが計算のために使用するCPUコア数を制限します。</string>
+  <string name="prefs_cpu_other_load_suspension_header">超過により休止するCPU使用率</string>
+  <string name="prefs_cpu_other_load_suspension_description">他のアプリのCPU利用率が原因でBOINCが計算を休止する時を判断します。</string>
+  <string name="prefs_cpu_time_max_header">CPUの制限</string>
+  <string name="prefs_cpu_time_max_description">BOINCが計算のために使用するCPU時間を制限します。</string>
+  <string name="prefs_memory_max_idle_header">RAMの制限</string>
+  <string name="prefs_memory_max_idle_description">タスクが専有できるRAMの総計のを制限します。</string>
+  <string name="prefs_client_log_flags_header">BOINCクライアントログのフラグ</string>
+  <string name="prefs_gui_log_level_header">GUIログのレベル</string>
+  <string name="prefs_gui_log_level_description">GUIログメッセージの詳細度を指定します。</string>
+  <string name="prefs_unit_mb">MB</string>
+  <string name="prefs_unit_gb">GB</string>
+  <string name="prefs_unit_pct">%</string>
+  <string name="prefs_unit_celcius">℃</string>
+  <string name="prefs_unit_seconds">秒</string>
+  <!--projects tab strings-->
+  <string name="projects_loading">プロジェクトを読み込み中…</string>
+  <string name="projects_add">プロジェクトを追加</string>
+  <string name="projects_icon">プロジェクトのアイコン</string>
+  <string name="projects_credits_header">功績値: </string>
+  <string name="projects_credits_host_header">(このデバイスで)</string>
+  <string name="projects_credits_user_header">(合計)</string>
+  <!--project status strings-->
+  <string name="projects_status_suspendedviagui">参加者の指示により一時停止中</string>
+  <string name="projects_status_dontrequestmorework">新しいタスクを取得しない</string>
+  <string name="projects_status_ended">プロジェクトは終了しました - 削除するにはOKを押します</string>
+  <string name="projects_status_detachwhendone">タスクが完了した時に削除されます</string>
+  <string name="projects_status_schedrpcpending">スケジューラへの要求を保留</string>
+  <string name="projects_status_schedrpcinprogress">スケジューラへ要求中</string>
+  <string name="projects_status_trickleuppending">トリクルアップメッセージの送信保留あり</string>
+  <string name="projects_status_backoff">通信は次の時間内に予定: </string>
+  <!--project controls-->
+  <string name="projects_control_dialog_title">プロジェクトに関する操作: </string>
+  <string name="projects_control_visit_website">ウェブサイトを訪問</string>
+  <string name="projects_control_update">更新</string>
+  <string name="projects_control_remove">削除</string>
+  <string name="projects_control_suspend">一時停止</string>
+  <string name="projects_control_resume">再開</string>
+  <string name="projects_control_nonewtasks">新規タスクを取得しない</string>
+  <string name="projects_control_allownewtasks">新規タスクを許可</string>
+  <string name="projects_control_reset">リセット</string>
+  <string name="projects_control_dialog_title_acctmgr">アカウント・マネージャのコマンド : </string>
+  <string name="projects_control_sync_acctmgr">同期</string>
+  <string name="projects_control_remove_acctmgr">無効</string>
+  <!--project confirm dialog-->
+  <string name="projects_confirm_detach_title">プロジェクトを削除しますか?</string>
+  <string name="projects_confirm_detach_message">本当に削除しますか</string>
+  <string name="projects_confirm_detach_message2">BOINCから?</string>
+  <string name="projects_confirm_detach_confirm">削除</string>
+  <string name="projects_confirm_reset_title">プロジェクトをリセット</string>
+  <string name="projects_confirm_reset_message">本当にリセットしますか</string>
+  <string name="projects_confirm_reset_message2">\?</string>
+  <string name="projects_confirm_reset_confirm">リセット</string>
+  <string name="projects_confirm_remove_acctmgr_title">アカウント・マネージャを無効にする</string>
+  <string name="projects_confirm_remove_acctmgr_message">本当に使用を停止しますか</string>
+  <string name="projects_confirm_remove_acctmgr_message2">\?</string>
+  <string name="projects_confirm_remove_acctmgr_confirm">無効</string>
+  <!--tasks tab strings-->
+  <string name="tasks_header_name">タスク名: </string>
+  <string name="tasks_header_elapsed_time">経過時間: </string>
+  <string name="tasks_header_project_paused">(一時停止中)</string>
+  <string name="tasks_header_deadline">報告期限 : </string>
+  <string name="tasks_result_new">新規</string>
+  <string name="tasks_result_files_downloading">ダウンロード待機中</string>
+  <string name="tasks_result_files_downloaded">ダウンロード完了</string>
+  <string name="tasks_result_compute_error">計算エラー</string>
+  <string name="tasks_result_files_uploading">アップロード中</string>
+  <string name="tasks_result_files_uploaded">アップロード完了</string>
+  <string name="tasks_result_aborted">中止</string>
+  <string name="tasks_result_upload_failed">アップロード失敗</string>
+  <string name="tasks_active_uninitialized">準備完了</string>
+  <string name="tasks_active_executing">実行中</string>
+  <string name="tasks_active_suspended">一時停止中</string>
+  <string name="tasks_active_abort_pending">一時停止しています</string>
+  <string name="tasks_active_quit_pending">一時停止しています</string>
+  <string name="tasks_custom_suspended_via_gui">一時停止中</string>
+  <string name="tasks_custom_project_suspended_via_gui">プロジェクトは一時停止中</string>
+  <string name="tasks_custom_ready_to_report">報告準備完了</string>
+  <!--confirmation dialog-->
+  <string name="confirm_abort_task_title">タスクを中止しますか?</string>
+  <string name="confirm_abort_task_message">タスクを中止: </string>
+  <string name="confirm_abort_task_confirm">中止</string>
+  <string name="confirm_cancel">キャンセル</string>
+  <string name="confirm_image_desc">確認ダイアログ</string>
+  <!--transfers tab strings-->
+  <string name="trans_loading">転送を読み込み中…</string>
+  <string name="trans_upload">アップロード</string>
+  <string name="trans_download">ダウンロード</string>
+  <string name="trans_retryin">次の時間内に再試行</string>
+  <string name="trans_failed">失敗</string>
+  <string name="trans_suspended">一時停止中</string>
+  <string name="trans_active">アクティブ</string>
+  <string name="trans_pending">保留中</string>
+  <string name="trans_projectbackoff"> プロジェクトとの通信待機 </string>
+  <string name="trans_header_name">ファイル名: </string>
+  <string name="trans_control_retry">転送を再試行</string>
+  <string name="confirm_abort_trans_title">転送を中止しますか?</string>
+  <string name="confirm_abort_trans_message">ファイルを中止: </string>
+  <string name="confirm_abort_trans_confirm">中止</string>
+  <!--notices tab strings-->
+  <string name="notices_loading">お知らせを読み込み中…</string>
+  <!--eventlog tab strings-->
+  <string name="eventlog_loading">ログ・メッセージを読み込み中…</string>
+  <string name="eventlog_client_header">クライアントのメッセージ</string>
+  <string name="eventlog_gui_header">GUIメッセージ</string>
+  <string name="eventlog_copy_toast">ログをクリップボードにコピーしました。</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_disksize">ディスク領域の不足。</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_cpu">デバイスが他のアプリによって使用中です。</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>
+  <string name="suspend_battery_charging_current">現在</string>
+  <string name="suspend_battery_overheating">バッテリーが冷めるのを待機中</string>
+  <string name="suspend_user_req">計算を再開しています…</string>
+  <string name="suspend_network_user_req">手動で。</string>
+  <!--rpc reasons-->
+  <string name="rpcreason_userreq">ユーザーの指示による</string>
+  <string name="rpcreason_needwork">仕事を取りに行く</string>
+  <string name="rpcreason_resultsdue">完了したタスクを報告する</string>
+  <string name="rpcreason_trickleup">トリクルアップメッセージを送信する</string>
+  <string name="rpcreason_acctmgrreq">アカウント・マネージャの指示による</string>
+  <string name="rpcreason_init">プロジェクトの初期化</string>
+  <string name="rpcreason_projectreq">プロジェクトの指示による</string>
+  <string name="rpcreason_unknown">不明な原因</string>
+  <!--menu-->
+  <string name="menu_refresh">更新</string>
+  <string name="menu_emailto">Eメールとして送信</string>
+  <string name="menu_copy">クリップボードにコピー</string>
+  <string name="menu_eventlog">イベント・ログ</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>
+  <string name="menu_help">ヘルプ</string>
+  <!--about dialog-->
+  <string name="about_button">戻る</string>
+  <string name="about_title">バージョン情報</string>
+  <string name="about_name">BOINC</string>
+  <string name="about_version">バージョン</string>
+  <string name="about_name_long">Berkeley Open Infrastructure for Network Computing</string>
+  <string name="about_copyright">(C) 2003–2014 University of California, Berkeley.</string>
+  <string name="about_copyright_reserved">All Rights Reserved.</string>
+  <string name="about_credits">The 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">ボランティア・コンピューティング・アプリを検出しました</string>
+  <string name="nonexcl_dialog_text">このデバイスで別のボランティア・コンピューティング・アプリが動作しています。一度にひとつのバージョンのみ動作可能です。</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 を科学のための計算に使っています。あなたも出来ますよ!ここからアプリをダウンロードしてください: %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-ko/strings.xml b/android/BOINC/res/values-ko/strings.xml
index 1da5b13..405bf25 100644
--- a/android/BOINC/res/values-ko/strings.xml
+++ b/android/BOINC/res/values-ko/strings.xml
@@ -1,7 +1,14 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--app global-->
   <string name="app_name">BOINC</string>
+  <!--generic. used by multiple Activities/tabs-->
   <string name="generic_loading">로딩 중! 잠시 기다려 주세요…</string>
+  <string name="generic_button_continue">계속</string>
+  <string name="generic_button_finish">완료</string>
+  <!--attach project-->
+  <!--selection list-->
+  <string name="attachproject_list_desc">여러분이 공헌할 과학 프로젝트 선택하세요:</string>
   <string name="attachproject_list_header">프로젝트를 선택:</string>
   <string name="attachproject_list_manual_button">URL로 프로젝트 추가</string>
   <string name="attachproject_list_manual_dialog_title">프로젝트 URL 입력:</string>
@@ -9,6 +16,34 @@
   <string name="attachproject_list_manual_no_url">프로젝트 URL를 입력하세요</string>
   <string name="attachproject_list_acctmgr_button">계정 관리자 추가</string>
   <string name="attachproject_list_no_internet">인터넷 연결이 되지 않았습니다</string>
+  <!--credential input-->
+  <string name="attachproject_credential_input_sing_desc">계정 정보를 입력하세요</string>
+  <string name="attachproject_credential_input_desc">선택한 프로젝트의 계정 정보를 입력:</string>
+  <string name="attachproject_credential_input_show_pwd">비밀번호 보이기</string>
+  <string name="attachproject_individual_credential_input">개별적으로 프로젝트 추가</string>
+  <!--conflicts-->
+  <string name="attachproject_conflicts_desc">과학 프로젝트 추가 중에 문제가 발생했습니다:</string>
+  <string name="attachproject_conflict_undefined">연결 실패</string>
+  <string name="attachproject_conflict_not_unique">다른 비밀번호를 가진 계정이 이미 있습니다</string>
+  <string name="attachproject_conflict_bad_password">틀린 비밀번호</string>
+  <string name="attachproject_conflict_unknown_user">계정이 존재하지 않습니다</string>
+  <string name="attachproject_conflict_unknown_user_creation_disabled">계정이 존재하지 않습니다. 등록하려면 프로젝트 웹사이트에 방문하세요</string>
+  <!--working-->
+  <string name="attachproject_working_attaching">추가하는중</string>
+  <!--e.g. Attaching Einstein at Home-->
+  <!--hints-->
+  <string name="attachproject_hints_header">힌트</string>
+  <!--e.g. Hint 1/2-->
+  <string name="attachproject_hint_contribtion_header">공헌하는 법:</string>
+  <string name="attachproject_hint_contribtion_wifi">1. WiFi에 연결하기</string>
+  <string name="attachproject_hint_contribtion_charger">2. 충전기를 꼽으세요</string>
+  <string name="attachproject_hint_contribtion_screen">3. 화면을 끄세요</string>
+  <string name="attachproject_hint_projectwebsite_header">프로젝트 웹사이트 방문하기:</string>
+  <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>
+  <!--project login-->
   <string name="attachproject_login_loading">프로젝트 서버 연결 중…</string>
   <string name="attachproject_login_image_description">프로젝트 로고</string>
   <string name="attachproject_login_header_general_area">대분류:</string>
@@ -28,12 +63,13 @@
   <string name="attachproject_login_category_creation">신규</string>
   <string name="attachproject_login_header_creation_enabled">참여하기 위해 계정 등록:</string>
   <string name="attachproject_login_header_creation_client_disabled">계정 생성을 위해 프로젝트 웹사이트 방문하기:</string>
-  <string name="attachproject_login_header_creation_disabled">현재 프로젝트에서 신규 계정 생성을 허용하지 않았습니다!</string>
+  <string name="attachproject_login_header_creation_disabled">이 프로젝트는 현재 새로운 계정을 생성할 수 없습니다.</string>
   <string name="attachproject_login_button_registration">등록</string>
   <string name="attachproject_login_button_login">로그인</string>
   <string name="attachproject_login_button_forgotpw">비밀번호 분실</string>
   <string name="attachproject_login_error_toast">프로젝트 접속에 실패했습니다!</string>
   <string name="attachproject_login_attached">연결됨</string>
+  <!--project registration-->
   <string name="attachproject_registration_header">계정 등록</string>
   <string name="attachproject_registration_header_url">프로젝트:</string>
   <string name="attachproject_registration_header_email">이메일:</string>
@@ -42,16 +78,20 @@
   <string name="attachproject_registration_header_pwd">비밀번호:</string>
   <string name="attachproject_registration_header_pwd_confirm">… 재입력:</string>
   <string name="attachproject_registration_button">생성</string>
+  <!--account manager-->
+  <string name="attachproject_acctmgr_list_desc">여러 프로젝트를 추가 및 관리하기 위해 BOINC 계정 관리자를 이용하세요</string>
   <string name="attachproject_acctmgr_header">계정 관리자 추가</string>
   <string name="attachproject_acctmgr_header_url">URL</string>
   <string name="attachproject_acctmgr_header_name">사용자:</string>
   <string name="attachproject_acctmgr_header_pwd">비밀번호:</string>
   <string name="attachproject_acctmgr_header_pwd_confirm">… 재입력:</string>
   <string name="attachproject_acctmgr_button">추가</string>
+  <!--error strings-->
   <string name="attachproject_error_wrong_name">사용자를 찾지 못했습니다</string>
   <string name="attachproject_error_short_pwd">비밀번호가 너무 짧습니다</string>
   <string name="attachproject_error_no_internet">연결 실패</string>
   <string name="attachproject_error_pwd_no_match">비밀번호가 일치하지 않습니다</string>
+  <string name="attachproject_error_pwd_no_retype">비밀번호를 다시 입력해 주세요</string>
   <string name="attachproject_error_no_url">URL을 입력해 주십시오</string>
   <string name="attachproject_error_no_email">이메일 주소를 입력해 주세요</string>
   <string name="attachproject_error_no_pwd">비밀번호를 입력해 주세요</string>
@@ -64,6 +104,7 @@
   <string name="attachproject_error_bad_pwd">비밀번호가 틀립니다</string>
   <string name="attachproject_error_creation_disabled">이 프로젝트는 계정 생성을 할 수 없습니다</string>
   <string name="attachproject_error_invalid_url">잘못된 URL</string>
+  <!--working activity-->
   <string name="attachproject_working_back_button">뒤로</string>
   <string name="attachproject_working_finish_button">완료</string>
   <string name="attachproject_working_check_desc">성공</string>
@@ -77,10 +118,12 @@
   <string name="attachproject_working_login">로그인</string>
   <string name="attachproject_working_acctmgr">계정 관리자 추가</string>
   <string name="attachproject_working_acctmgr_sync">동기화</string>
+  <!--main activity-->
   <string name="main_noproject_warning">프로젝트를 선택하려면 여기를 누르세요.</string>
   <string name="main_error">어이쿠</string>
   <string name="main_error_long">…이 작업이 수행되지 못했어요!\n다시 시도하려면 아이콘을 클릭하세요.</string>
   <string name="main_title_icon_desc">BOINC 아이콘</string>
+  <!--tab names-->
   <string name="tab_status">상태</string>
   <string name="tab_projects">프로젝트</string>
   <string name="tab_tasks">태스크</string>
@@ -88,6 +131,7 @@
   <string name="tab_preferences">환경 설정</string>
   <string name="tab_notices">알림</string>
   <string name="tab_desc">안내</string>
+  <!--status strings-->
   <string name="status_running">연산중</string>
   <string name="status_running_long">참여해 주셔서 감사합니다.</string>
   <string name="status_paused">일시 정지됨</string>
@@ -100,6 +144,7 @@
   <string name="status_closing">닫는 중…</string>
   <string name="status_benchmarking">벤치마크 실행 중…</string>
   <string name="status_image_description">프로젝트 이미지</string>
+  <!--preferences tab strings-->
   <string name="prefs_loading">환경 설정을 읽는 중…</string>
   <string name="prefs_submit_button">저장</string>
   <string name="prefs_dialog_title">새로운 값을 입력:</string>
@@ -112,6 +157,15 @@
   <string name="prefs_category_memory">메모리</string>
   <string name="prefs_category_debug">디버그</string>
   <string name="prefs_show_advanced_header">고급 환경 설정과 제어판을 보여주기…</string>
+  <string name="prefs_suspend_when_screen_on">화면이 켜지면 연산 중지</string>
+  <string name="prefs_stationary_device_mode_header">고정 장치 모드</string>
+  <string name="prefs_stationary_device_mode_description">전원 환경설정을 무시한 연산 허용. 만약 장치에 배터리가 장착되지 않았을 때에만 활성화하세요.</string>
+  <string name="prefs_power_source_header">연산용 전원 공급 장치</string>
+  <string name="prefs_power_source_description">BOINC가 연산을 허용할 전원 공급 장치를 선택하세요.</string>
+  <string name="prefs_power_source_ac">전기 콘센트</string>
+  <string name="prefs_power_source_usb">USB 접속</string>
+  <string name="prefs_power_source_wireless">무선 충전기</string>
+  <string name="prefs_power_source_battery">배터리</string>
   <string name="battery_charge_min_pct_header">최소 배터리 량</string>
   <string name="battery_charge_min_pct_description">아래 지정된 배터리 충전량이 되면 BOINC는 연산을 일시 정지합니다.</string>
   <string name="battery_temperature_max_header">최고 배터리 온도</string>
@@ -120,14 +174,18 @@
   <string name="prefs_disk_max_pct_description">저장소 공간 중 몇 %를 BOINC가 사용하길 원하십니까?</string>
   <string name="prefs_disk_min_free_gb_header">최소로 남겨 둘 용량</string>
   <string name="prefs_disk_min_free_gb_description">저장소 공간 중 얼만큼 여유 공간으로 남겨두길 원하십니까?</string>
+  <string name="prefs_disk_access_interval_header">액세스 간격</string>
+  <string name="prefs_disk_access_interval_description">디스크 액세스 간격을 설정하세요</string>
   <string name="prefs_network_daily_xfer_limit_mb_header">하루 전송 제한량</string>
   <string name="prefs_network_daily_xfer_limit_mb_description">하루에 BOINC가 전송할 데이터 제한량</string>
   <string name="prefs_network_wifi_only_header">WiFi에서만 태스크 전송</string>
   <string name="prefs_autostart_header">자동 시작</string>
+  <string name="prefs_show_notification_notices_header">새 공지사항이 나오면 알림 바에 알려주기</string>
+  <string name="prefs_show_notification_suspended_header">일시중지되면 알림 바에 알려주기</string>
   <string name="prefs_cpu_number_cpus_header">사용할 CPU 코어 수</string>
   <string name="prefs_cpu_number_cpus_description">BOINC가 연산에 사용할 CPU 코어 수 제한</string>
   <string name="prefs_cpu_other_load_suspension_header">CPU 사용량 제한 도달시 정지</string>
-  <string name="prefs_cpu_other_load_suspension_description">다른 앱의 CPU 사용량이 설정치에 도달시 BOINC 연산을 정지합니다.</string>
+  <string name="prefs_cpu_other_load_suspension_description">다른 앱이 사용하면, BOINC가 연산을 정지할 CPU 사용량치</string>
   <string name="prefs_cpu_time_max_header">CPU 제한</string>
   <string name="prefs_cpu_time_max_description">BOINC가 연산에 사용할 CPU 시간을 제한합니다.</string>
   <string name="prefs_memory_max_idle_header">RAM 제한</string>
@@ -139,12 +197,15 @@
   <string name="prefs_unit_gb">GB</string>
   <string name="prefs_unit_pct">%</string>
   <string name="prefs_unit_celcius">°C</string>
+  <string name="prefs_unit_seconds">초</string>
+  <!--projects tab strings-->
   <string name="projects_loading">프로젝트를 불러오는 중…</string>
   <string name="projects_add">프로젝트 추가</string>
   <string name="projects_icon">프로젝트 아이콘</string>
   <string name="projects_credits_header">크레딧:</string>
   <string name="projects_credits_host_header">(해당 장치)</string>
   <string name="projects_credits_user_header">(전체)</string>
+  <!--project status strings-->
   <string name="projects_status_suspendedviagui">사용자에 의해 일시 정지됨</string>
   <string name="projects_status_dontrequestmorework">새 태스크를 원하지 않음</string>
   <string name="projects_status_ended">프로젝트 종료 - 제거하려면 OK를 누르세요</string>
@@ -153,6 +214,7 @@
   <string name="projects_status_schedrpcinprogress">스케줄러 요청 처리중</string>
   <string name="projects_status_trickleuppending">Trickle up 메세지 대기중</string>
   <string name="projects_status_backoff">예약된 통신 시각:</string>
+  <!--project controls-->
   <string name="projects_control_dialog_title">프로젝트 명령:</string>
   <string name="projects_control_visit_website">웹사이트 방문</string>
   <string name="projects_control_update">업데이트</string>
@@ -165,16 +227,20 @@
   <string name="projects_control_dialog_title_acctmgr">계정 관리자 명령어:</string>
   <string name="projects_control_sync_acctmgr">동기화</string>
   <string name="projects_control_remove_acctmgr">비활성</string>
+  <!--project confirm dialog-->
   <string name="projects_confirm_detach_title">프로젝트를 제거할까요?</string>
-  <string name="projects_confirm_detach_message">"BOINC상에서 정말로 프로젝트명: "</string>
+  <string name="projects_confirm_detach_message">BOINC상에서 정말로 프로젝트명: </string>
   <string name="projects_confirm_detach_message2">를 제거하시겠습니까?</string>
   <string name="projects_confirm_detach_confirm">제거</string>
   <string name="projects_confirm_reset_title">프로젝트 재설정</string>
-  <string name="projects_confirm_reset_message">"다음 프로젝트가 재설정됩니다 괘찮습니까: "</string>
+  <string name="projects_confirm_reset_message">다음 프로젝트가 재설정됩니다 괘찮습니까: </string>
+  <string name="projects_confirm_reset_message2">\?</string>
   <string name="projects_confirm_reset_confirm">재설정</string>
   <string name="projects_confirm_remove_acctmgr_title">계정 관리자 비활성화</string>
   <string name="projects_confirm_remove_acctmgr_message">정말로 다음 항목 사용을 중지합니까</string>
+  <string name="projects_confirm_remove_acctmgr_message2">\?</string>
   <string name="projects_confirm_remove_acctmgr_confirm">비활성화</string>
+  <!--tasks tab strings-->
   <string name="tasks_header_name">태스크 이름:</string>
   <string name="tasks_header_elapsed_time">진행 시간:</string>
   <string name="tasks_header_project_paused">(일시 정지됨)</string>
@@ -195,11 +261,13 @@
   <string name="tasks_custom_suspended_via_gui">일시 정지됨</string>
   <string name="tasks_custom_project_suspended_via_gui">프로젝트가 일시 정지됨</string>
   <string name="tasks_custom_ready_to_report">보고 준비 완료</string>
+  <!--confirmation dialog-->
   <string name="confirm_abort_task_title">태스크를 중단할까요?</string>
   <string name="confirm_abort_task_message">중단할 태스크:</string>
   <string name="confirm_abort_task_confirm">중단</string>
   <string name="confirm_cancel">취소</string>
   <string name="confirm_image_desc">확인 대화상자</string>
+  <!--transfers tab strings-->
   <string name="trans_loading">전송 목록 읽는 중…</string>
   <string name="trans_upload">업로드</string>
   <string name="trans_download">다운로드</string>
@@ -214,14 +282,18 @@
   <string name="confirm_abort_trans_title">전송을 중단할까요?</string>
   <string name="confirm_abort_trans_message">중단할 파일:</string>
   <string name="confirm_abort_trans_confirm">중단</string>
+  <!--notices tab strings-->
   <string name="notices_loading">공지사항 읽는 중...</string>
+  <!--eventlog tab strings-->
   <string name="eventlog_loading">로그 메세지 읽는 중…</string>
   <string name="eventlog_client_header">클라이언트 메세지</string>
   <string name="eventlog_gui_header">GUI 메세지</string>
   <string name="eventlog_copy_toast">로그가 클립보드에 복사되었습니다.</string>
   <string name="eventlog_email_subject">안드로이드 상의 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>
@@ -234,12 +306,14 @@
   <string name="suspend_network_quota">BOINC가 네트워크 전송 제한량에 도달했습니다.</string>
   <string name="suspend_os">안드로이드에서 정지시킴.</string>
   <string name="suspend_wifi">WiFi에 연결되지 않았습니다.</string>
-  <string name="suspend_battery_charging">연산을 재개시키기 전에 배터리를 충전해야 합니다.</string>
+  <string name="suspend_battery_charging">배터리가 충전되길 기다리는 중.</string>
   <string name="suspend_battery_charging_long">배터리가 설정량만큼 충전되면 연산이 재개됩니다</string>
+  <string name="suspend_battery_charging_long2"></string>
   <string name="suspend_battery_charging_current">현재</string>
   <string name="suspend_battery_overheating">배터리가 식길 기다리는 중</string>
   <string name="suspend_user_req">연산 재개 중…</string>
   <string name="suspend_network_user_req">수동</string>
+  <!--rpc reasons-->
   <string name="rpcreason_userreq">사용자가 요청함</string>
   <string name="rpcreason_needwork">작업 반입</string>
   <string name="rpcreason_resultsdue">완료된 태스크 보고</string>
@@ -248,6 +322,7 @@
   <string name="rpcreason_init">프로젝트 초기화</string>
   <string name="rpcreason_projectreq">프로젝트에서 요청함</string>
   <string name="rpcreason_unknown">알 수 없는 이유</string>
+  <!--menu-->
   <string name="menu_refresh">새로 고침</string>
   <string name="menu_emailto">이메일로 보내기</string>
   <string name="menu_copy">클립보드에 복사</string>
@@ -257,10 +332,29 @@
   <string name="menu_run_mode_enable">재개</string>
   <string name="menu_about">정보</string>
   <string name="menu_help">도움말</string>
+  <!--about dialog-->
   <string name="about_button">뒤로</string>
   <string name="about_title">정보</string>
   <string name="about_name">BOINC</string>
   <string name="about_version">버전</string>
   <string name="about_name_long">네트워크 컴퓨팅을 위한 Berkeley 개방형 하부구조체</string>
   <string name="about_copyright">© 2003–2013 University of California, Berkeley.\nAll Rights Reserved.</string>
+  <string name="about_copyright_reserved">모든 권리 보유</string>
+  <string name="about_credits">막스 플랑크 중력 물리학 연구소, IBM Corporation, HTC의 지원에 감사드립니다.</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">기여자 연산 앱 감지됨</string>
+  <string name="nonexcl_dialog_text">다른 기여자 연산 앱이 이 장치에서 실행되고 있습니다. 한 번에 하나씩만 실행할 수 있습니다.</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도 연산에 참여합니다. 여러분도 할 수 있습니다! 앱 다운로드: %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-nl/strings.xml b/android/BOINC/res/values-nl/strings.xml
index e6bb3ba..19a9498 100644
--- a/android/BOINC/res/values-nl/strings.xml
+++ b/android/BOINC/res/values-nl/strings.xml
@@ -1,7 +1,14 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--app global-->
   <string name="app_name">BOINC</string>
+  <!--generic. used by multiple Activities/tabs-->
   <string name="generic_loading">Bezig met laden! Even geduld...</string>
+  <string name="generic_button_continue">Ga verder</string>
+  <string name="generic_button_finish">Voltooien</string>
+  <!--attach project-->
+  <!--selection list-->
+  <string name="attachproject_list_desc">Selecteer wetenschappelijke projecten om aan deel te nemen:</string>
   <string name="attachproject_list_header">Kies een project:</string>
   <string name="attachproject_list_manual_button">Project toevoegen via URL</string>
   <string name="attachproject_list_manual_dialog_title">Projectspecifieke URL invoeren:</string>
@@ -9,6 +16,34 @@
   <string name="attachproject_list_manual_no_url">Projectspecifieke URL invoeren</string>
   <string name="attachproject_list_acctmgr_button">Account manager toevoegen</string>
   <string name="attachproject_list_no_internet">Geen internetverbinding</string>
+  <!--credential input-->
+  <string name="attachproject_credential_input_sing_desc">Vul account informatie in</string>
+  <string name="attachproject_credential_input_desc">Vul account informatie in voor geselecteerde projecten:</string>
+  <string name="attachproject_credential_input_show_pwd">Laat wachtwoord zien</string>
+  <string name="attachproject_individual_credential_input">Voeg projecten apart toe</string>
+  <!--conflicts-->
+  <string name="attachproject_conflicts_desc">Er zijn problemen met toevoegen van volgende projecten:</string>
+  <string name="attachproject_conflict_undefined">Verbinding mislukt</string>
+  <string name="attachproject_conflict_not_unique">Account bestaat met ander wachtwoord</string>
+  <string name="attachproject_conflict_bad_password">Foutief wachtwoord</string>
+  <string name="attachproject_conflict_unknown_user">Account bestaat niet</string>
+  <string name="attachproject_conflict_unknown_user_creation_disabled">Account bestaat niet, bezoek project website om te registreren</string>
+  <!--working-->
+  <string name="attachproject_working_attaching">Toevoegen</string>
+  <!--e.g. Attaching Einstein at Home-->
+  <!--hints-->
+  <string name="attachproject_hints_header">Hint</string>
+  <!--e.g. Hint 1/2-->
+  <string name="attachproject_hint_contribtion_header">Hoe deel te nemen;</string>
+  <string name="attachproject_hint_contribtion_wifi">1. Verbind met WIFI</string>
+  <string name="attachproject_hint_contribtion_charger">2. Oplader aansluiten</string>
+  <string name="attachproject_hint_contribtion_screen">3. Scherm uitzetten</string>
+  <string name="attachproject_hint_projectwebsite_header">Bezoek project website om:</string>
+  <string name="attachproject_hint_projectwebsite_science">Leer meer over de wetenschap</string>
+  <string name="attachproject_hint_projectwebsite_stats">Bekijk de gebruikers statistieken</string>
+  <string name="attachproject_hint_projectwebsite_community">In contact te komen met andere vrijwiligers</string>
+  <string name="attachproject_hint_platforms_header">BOINC is ook beschikbaar voor je computer of laptop, bezoek boinc.berkeley.edu voor meer informatie.</string>
+  <!--project login-->
   <string name="attachproject_login_loading">Verbinding maken met projectspecifieke server...</string>
   <string name="attachproject_login_image_description">Project logo.</string>
   <string name="attachproject_login_header_general_area">Vakgebied:</string>
@@ -28,12 +63,13 @@
   <string name="attachproject_login_category_creation">Nieuw bij</string>
   <string name="attachproject_login_header_creation_enabled">Een account aanmaken voor deelname:</string>
   <string name="attachproject_login_header_creation_client_disabled">Bezoek projectspecifieke website om een account aan te maken:</string>
-  <string name="attachproject_login_header_creation_disabled">Het aanmaken van een account is op dit moment niet mogelijk!</string>
+  <string name="attachproject_login_header_creation_disabled">Het project accepteert op dit moment geen nieuwe accounts.</string>
   <string name="attachproject_login_button_registration">Aanmaken</string>
   <string name="attachproject_login_button_login">Aanmelden</string>
   <string name="attachproject_login_button_forgotpw">Wachtwoord Vergeten</string>
   <string name="attachproject_login_error_toast">Verbinding met het project mislukt!</string>
   <string name="attachproject_login_attached">Bijgevoegd</string>
+  <!--project registration-->
   <string name="attachproject_registration_header">Account-registratie voor</string>
   <string name="attachproject_registration_header_url">Project:</string>
   <string name="attachproject_registration_header_email">E-mailadres:</string>
@@ -42,16 +78,20 @@
   <string name="attachproject_registration_header_pwd">Wachtwoord:</string>
   <string name="attachproject_registration_header_pwd_confirm">... Herhalen:</string>
   <string name="attachproject_registration_button">Aanmaken</string>
+  <!--account manager-->
+  <string name="attachproject_acctmgr_list_desc">Gebruik BOINC account manager om meerdere projecten te onderhouden</string>
   <string name="attachproject_acctmgr_header">Account manager toevoegen</string>
   <string name="attachproject_acctmgr_header_url">URL</string>
   <string name="attachproject_acctmgr_header_name">Gebruiker:</string>
   <string name="attachproject_acctmgr_header_pwd">Wachtwoord:</string>
   <string name="attachproject_acctmgr_header_pwd_confirm">... Herhalen:</string>
   <string name="attachproject_acctmgr_button">Toevoegen</string>
+  <!--error strings-->
   <string name="attachproject_error_wrong_name">Gebruiker niet gevonden</string>
   <string name="attachproject_error_short_pwd">Het wachtwoord is te kort</string>
   <string name="attachproject_error_no_internet">Verbinding mislukt</string>
   <string name="attachproject_error_pwd_no_match">Wachtwoorden zijn niet identiek</string>
+  <string name="attachproject_error_pwd_no_retype">Vul wachtwoord opnieuw in</string>
   <string name="attachproject_error_no_url">Vul a.u.b. URL in</string>
   <string name="attachproject_error_no_email">Voer uw e-mailadres in</string>
   <string name="attachproject_error_no_pwd">Voer een wachtwoord in</string>
@@ -64,6 +104,7 @@
   <string name="attachproject_error_bad_pwd">Wachtwoord geweigerd</string>
   <string name="attachproject_error_creation_disabled">Aanmaken van een account is voor dit project niet mogelijk</string>
   <string name="attachproject_error_invalid_url">Ongeldig URL</string>
+  <!--working activity-->
   <string name="attachproject_working_back_button">Vorige</string>
   <string name="attachproject_working_finish_button">Voltooien</string>
   <string name="attachproject_working_check_desc">Geslaagd</string>
@@ -77,10 +118,12 @@
   <string name="attachproject_working_login">Aanmelden</string>
   <string name="attachproject_working_acctmgr">Account manager toevoegen</string>
   <string name="attachproject_working_acctmgr_sync">Bijwerken</string>
+  <!--main activity-->
   <string name="main_noproject_warning">Tik hier om een project te kiezen.</string>
   <string name="main_error">Oeps</string>
   <string name="main_error_long">...dit hoort niet te gebeuren!\nKlik op het icoontje om het opneuw te proberen.</string>
   <string name="main_title_icon_desc">BOINC-icoon</string>
+  <!--tab names-->
   <string name="tab_status">Status</string>
   <string name="tab_projects">Projecten</string>
   <string name="tab_tasks">Taken</string>
@@ -88,6 +131,7 @@
   <string name="tab_preferences">Voorkeursinstellingen</string>
   <string name="tab_notices">Berichten</string>
   <string name="tab_desc">Navigatie</string>
+  <!--status strings-->
   <string name="status_running">Berekenen</string>
   <string name="status_running_long">Dank u voor uw deelname.</string>
   <string name="status_paused">Onderbroken</string>
@@ -100,6 +144,7 @@
   <string name="status_closing">Bezig met afsluiten…</string>
   <string name="status_benchmarking">Bezig met benchmark...</string>
   <string name="status_image_description">project afbeelding</string>
+  <!--preferences tab strings-->
   <string name="prefs_loading">Voorkeuren inlezen...</string>
   <string name="prefs_submit_button">Opslaan</string>
   <string name="prefs_dialog_title">Voer nieuwe waarde in:</string>
@@ -112,6 +157,15 @@
   <string name="prefs_category_memory">Geheugen</string>
   <string name="prefs_category_debug">Foutoplossing</string>
   <string name="prefs_show_advanced_header">Toon geavanceerde voorkeuren en instellingen...</string>
+  <string name="prefs_suspend_when_screen_on">Pauzeer berekening wanneer scherm ingeschakeld is</string>
+  <string name="prefs_stationary_device_mode_header">Stationaire apparaatmodus</string>
+  <string name="prefs_stationary_device_mode_description">Staat berekening toe ongeacht stroom voorkeuren. Alleen inschakelen als het apparaat niet over een batterij beschikt.</string>
+  <string name="prefs_power_source_header">Stroombronnen voor berekeningen</string>
+  <string name="prefs_power_source_description">Hiermee selecteert u stroombronnen die BOINC mag gebruiken voor berekeningen.</string>
+  <string name="prefs_power_source_ac">Wandcontactdoos</string>
+  <string name="prefs_power_source_usb">USB verbinding</string>
+  <string name="prefs_power_source_wireless">Draadloze oplader</string>
+  <string name="prefs_power_source_battery">Accu</string>
   <string name="battery_charge_min_pct_header">Min. batterijniveau</string>
   <string name="battery_charge_min_pct_description">BOINC pauzeert de berekening wanneer de batterijlading onder een gegeven niveau zakt.</string>
   <string name="battery_temperature_max_header">Max. batterij temperatuur</string>
@@ -120,14 +174,18 @@
   <string name="prefs_disk_max_pct_description">Welk percentage opslagruimte mag BOINC gebruiken op dit apparaat?</string>
   <string name="prefs_disk_min_free_gb_header">Min. reserve opslagruimte</string>
   <string name="prefs_disk_min_free_gb_description">Hoeveel van de opslagruimte moet er minimaal vrij blijven?</string>
+  <string name="prefs_disk_access_interval_header">Toegangs interval</string>
+  <string name="prefs_disk_access_interval_description">Suggereert een interval bij schijf gebruik</string>
   <string name="prefs_network_daily_xfer_limit_mb_header">Dagelijkse overdracht limiet</string>
   <string name="prefs_network_daily_xfer_limit_mb_description">Beperkt het dagelijkse dataverkeer van BOINC.</string>
   <string name="prefs_network_wifi_only_header">Taken alleen bijwerken via WiFi</string>
   <string name="prefs_autostart_header">Autostart</string>
+  <string name="prefs_show_notification_notices_header">Melding weergeven voor nieuwe berichten</string>
+  <string name="prefs_show_notification_suspended_header">Melding weergeven wanneer gepauzeerd</string>
   <string name="prefs_cpu_number_cpus_header">Gebruikte CPU cores</string>
   <string name="prefs_cpu_number_cpus_description">Beperkt het aantal gebruikte CPU cores voor BOINC berekeningen.</string>
   <string name="prefs_cpu_other_load_suspension_header">Pauzeer bij CPU gebruik van meer dan</string>
-  <string name="prefs_cpu_other_load_suspension_description">Bepaalt wanneer BOINC pauzeert bij CPU gebruik door andere apps.</string>
+  <string name="prefs_cpu_other_load_suspension_description">Bepaald wanneer BOINC pauzeert vanwege CPU gebruik door andere apps.</string>
   <string name="prefs_cpu_time_max_header">CPU limiet</string>
   <string name="prefs_cpu_time_max_description">Beperkt de CPU tijd gebruikt door BOINC voor berekeningen.</string>
   <string name="prefs_memory_max_idle_header">Geheugen limiet</string>
@@ -139,20 +197,24 @@
   <string name="prefs_unit_gb">GB</string>
   <string name="prefs_unit_pct">%</string>
   <string name="prefs_unit_celcius">°C</string>
+  <string name="prefs_unit_seconds">seconden</string>
+  <!--projects tab strings-->
   <string name="projects_loading">Projecten inlezen...</string>
   <string name="projects_add">Project toevoegen</string>
   <string name="projects_icon">Project icoon</string>
   <string name="projects_credits_header">Punten:</string>
   <string name="projects_credits_host_header">(op dit apparaat)</string>
   <string name="projects_credits_user_header">(totaal)</string>
+  <!--project status strings-->
   <string name="projects_status_suspendedviagui">Onderbroken door gebruiker</string>
   <string name="projects_status_dontrequestmorework">Krijgt geen nieuwe taken</string>
-  <string name="projects_status_ended">"Project beëindigd - OK om te verwijderen "</string>
+  <string name="projects_status_ended">Project beëindigd - OK om te verwijderen </string>
   <string name="projects_status_detachwhendone">Wordt verwijderd als taken klaar zijn</string>
   <string name="projects_status_schedrpcpending">Bijwerkverzoek in behandeling</string>
   <string name="projects_status_schedrpcinprogress">Bijwerkverzoek is bezig</string>
   <string name="projects_status_trickleuppending">Trickle up bericht in behandeling</string>
   <string name="projects_status_backoff">Communicatie gepland over:</string>
+  <!--project controls-->
   <string name="projects_control_dialog_title">Project opdrachten:</string>
   <string name="projects_control_visit_website">Bezoek website</string>
   <string name="projects_control_update">Bijwerken</string>
@@ -165,18 +227,22 @@
   <string name="projects_control_dialog_title_acctmgr">Accountmanager opdrachten:</string>
   <string name="projects_control_sync_acctmgr">Bijwerken</string>
   <string name="projects_control_remove_acctmgr">Uitzetten</string>
+  <!--project confirm dialog-->
   <string name="projects_confirm_detach_title">Project verwijderen?</string>
   <string name="projects_confirm_detach_message">Weet je zeker dat je</string>
   <string name="projects_confirm_detach_message2">uit BOINC wilt verwijderen?</string>
   <string name="projects_confirm_detach_confirm">Verwijderen</string>
   <string name="projects_confirm_reset_title">Project resetten</string>
   <string name="projects_confirm_reset_message">Weet je zeker dat je</string>
+  <string name="projects_confirm_reset_message2">\?</string>
   <string name="projects_confirm_reset_confirm">Resetten</string>
   <string name="projects_confirm_remove_acctmgr_title">Accountmanager uitzetten</string>
   <string name="projects_confirm_remove_acctmgr_message">Weet je zeker dat je wilt stoppen met het gebruik van</string>
+  <string name="projects_confirm_remove_acctmgr_message2">\?</string>
   <string name="projects_confirm_remove_acctmgr_confirm">Uitzetten</string>
+  <!--tasks tab strings-->
   <string name="tasks_header_name">Taaknaam:</string>
-  <string name="tasks_header_elapsed_time">"Verstreken tijd: "</string>
+  <string name="tasks_header_elapsed_time">Verstreken tijd: </string>
   <string name="tasks_header_project_paused">(onderbroken)</string>
   <string name="tasks_header_deadline">Deadline:</string>
   <string name="tasks_result_new">nieuw</string>
@@ -195,11 +261,13 @@
   <string name="tasks_custom_suspended_via_gui">onderbroken</string>
   <string name="tasks_custom_project_suspended_via_gui">project onderbroken</string>
   <string name="tasks_custom_ready_to_report">klaar om te rapporteren</string>
+  <!--confirmation dialog-->
   <string name="confirm_abort_task_title">Taak afbreken?</string>
   <string name="confirm_abort_task_message">Taak afbreken:</string>
   <string name="confirm_abort_task_confirm">Afbreken</string>
   <string name="confirm_cancel">Annuleren</string>
   <string name="confirm_image_desc">Bevestigingsdialoog</string>
+  <!--transfers tab strings-->
   <string name="trans_loading">Overdracht inlezen...</string>
   <string name="trans_upload">Upload</string>
   <string name="trans_download">Download</string>
@@ -214,14 +282,18 @@
   <string name="confirm_abort_trans_title">Overdracht afbreken?</string>
   <string name="confirm_abort_trans_message">Bestand afbreken:</string>
   <string name="confirm_abort_trans_confirm">Afbreken</string>
+  <!--notices tab strings-->
   <string name="notices_loading">Berichten inlezen...</string>
+  <!--eventlog tab strings-->
   <string name="eventlog_loading">Log berichten laden...</string>
   <string name="eventlog_client_header">Berichten van Cliënt</string>
   <string name="eventlog_gui_header">GUI berichten</string>
   <string name="eventlog_copy_toast">Log naar klembord gekopieerd.</string>
   <string name="eventlog_email_subject">Logberichten voor BOINC op Android:</string>
+  <!--suspend reasons-->
   <string name="suspend_unknown">Bewerking onderbroken.</string>
   <string name="suspend_batteries">Verbind het apparaat met een oplader om verder te gaan.</string>
+  <string name="suspend_screen_on">Scherm uitschakelen om met berekeningen door te gaan.</string>
   <string name="suspend_useractive">Gebruiker is actief.</string>
   <string name="suspend_tod">Niet binnen berekenings-tijdsbestek.</string>
   <string name="suspend_bm">BOINC benchmarkt je apparaat…</string>
@@ -234,12 +306,14 @@
   <string name="suspend_network_quota">BOINC transfer limiet is bereikt.</string>
   <string name="suspend_os">Gestopt door Android.</string>
   <string name="suspend_wifi">Niet verbonden met WiFi.</string>
-  <string name="suspend_battery_charging">Batterij moet opgeladen worden om berekeningen te hervatten.</string>
+  <string name="suspend_battery_charging">Wachten op laden van batterij.</string>
   <string name="suspend_battery_charging_long">Berekeningen worden hervat op batterij niveau van</string>
+  <string name="suspend_battery_charging_long2"></string>
   <string name="suspend_battery_charging_current">huidig</string>
   <string name="suspend_battery_overheating">Wacht op afkoelen batterij</string>
   <string name="suspend_user_req">Berekeningen hervatten...</string>
   <string name="suspend_network_user_req">handmatig.</string>
+  <!--rpc reasons-->
   <string name="rpcreason_userreq">Op verzoek van gebruiker</string>
   <string name="rpcreason_needwork">Om werk te verkrijgen</string>
   <string name="rpcreason_resultsdue">Om taken te rapporteren</string>
@@ -248,6 +322,7 @@
   <string name="rpcreason_init">Project instellen</string>
   <string name="rpcreason_projectreq">Op verzoek van project</string>
   <string name="rpcreason_unknown">Onbekende reden</string>
+  <!--menu-->
   <string name="menu_refresh">Ververs</string>
   <string name="menu_emailto">Verzend als email</string>
   <string name="menu_copy">Naar klembord kopiëren</string>
@@ -257,10 +332,29 @@
   <string name="menu_run_mode_enable">Hervatten</string>
   <string name="menu_about">Over</string>
   <string name="menu_help">Help</string>
+  <!--about dialog-->
   <string name="about_button">Terug</string>
   <string name="about_title">Over</string>
   <string name="about_name">BOINC</string>
   <string name="about_version">Versie</string>
   <string name="about_name_long">Berkeley Open Infrastructure for Network Computing</string>
   <string name="about_copyright">© 2003–2013 University of California, Berkeley.\nAll Rights Reserved.</string>
+  <string name="about_copyright_reserved">Alle rechten voorbehouden.</string>
+  <string name="about_credits">Met dank aan het Max Planck Instituut voor gravitationele natuurkunde, IBM Corporation en HTC Corporation voor hun steun.</string>
+  <!--notice notification-->
+  <string name="notice_notification_single_header">Nieuw bericht van</string>
+  <!--e.g. New notice from SETI at HOME-->
+  <string name="notice_notification_multiple_header">nieuwe berichten</string>
+  <!--e.g. 3 new notices-->
+  <!--multi BOINC compitability-->
+  <string name="nonexcl_dialog_header">Andere berekenings app gedetecteerd</string>
+  <string name="nonexcl_dialog_text">Een andere berekenings app draait op dit apparaat. Slechts één versie kan per keer worden uitgevoerd.</string>
+  <string name="nonexcl_dialog_exit">Afsluiten</string>
+  <!--social integration-->
+  <string name="social_invite_button">Vrienden uitnodigen</string>
+  <string name="social_invite_intent_title">Hoe wilt u dit delen?</string>
+  <string name="social_invite_content_title">Ik doe wetenschap op mijn smartphone!</string>
+  <string name="social_invite_content_body">Ik doe met behulp van mijn %1$s berekeningen voor de wetenschap. Doe dit ook! Download app van: %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-pt-rPT/strings.xml b/android/BOINC/res/values-pt-rPT/strings.xml
index 00e8851..a8e7ef2 100644
--- a/android/BOINC/res/values-pt-rPT/strings.xml
+++ b/android/BOINC/res/values-pt-rPT/strings.xml
@@ -1,14 +1,49 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--app global-->
   <string name="app_name">BOINC</string>
+  <!--generic. used by multiple Activities/tabs-->
   <string name="generic_loading">A carregar! Por favor aguarde...</string>
-  <string name="attachproject_list_header">Escolha um projecto:</string>
+  <string name="generic_button_continue">Continuar</string>
+  <string name="generic_button_finish">Terminar</string>
+  <!--attach project-->
+  <!--selection list-->
+  <string name="attachproject_list_desc">Seleccione os projectos científicos que deseja contribuir:</string>
+  <string name="attachproject_list_header">Escolha um projecto</string>
   <string name="attachproject_list_manual_button">Adicionar projecto por URL</string>
   <string name="attachproject_list_manual_dialog_title">Insira URL do projecto:</string>
   <string name="attachproject_list_manual_dialog_button">Adicionar projecto</string>
-  <string name="attachproject_list_manual_no_url">Por favor insira o URL do projecto</string>
+  <string name="attachproject_list_manual_no_url">Por favor, insira o URL do projecto</string>
   <string name="attachproject_list_acctmgr_button">Adicionar gestor de conta</string>
   <string name="attachproject_list_no_internet">Sem conexão de Internet</string>
+  <!--credential input-->
+  <string name="attachproject_credential_input_sing_desc">Insira informações da conta</string>
+  <string name="attachproject_credential_input_desc">Insira informação da conta para os projectos seleccionados:</string>
+  <string name="attachproject_credential_input_show_pwd">Mostrar palavra-passe</string>
+  <string name="attachproject_individual_credential_input">Adicionar projectos individualmente</string>
+  <!--conflicts-->
+  <string name="attachproject_conflicts_desc">Existiram problemas ao anexar os projectos científicos:</string>
+  <string name="attachproject_conflict_undefined">Não conseguiu conexão</string>
+  <string name="attachproject_conflict_not_unique">A conta existe com uma palavra-passe diferente</string>
+  <string name="attachproject_conflict_bad_password">Palavra-passe incorrecta</string>
+  <string name="attachproject_conflict_unknown_user">A conta não existe</string>
+  <string name="attachproject_conflict_unknown_user_creation_disabled">A conta não existe, visite o website do projecto para se registar</string>
+  <!--working-->
+  <string name="attachproject_working_attaching">Anexando</string>
+  <!--e.g. Attaching Einstein at Home-->
+  <!--hints-->
+  <string name="attachproject_hints_header">Dica</string>
+  <!--e.g. Hint 1/2-->
+  <string name="attachproject_hint_contribtion_header">Como contribuir:</string>
+  <string name="attachproject_hint_contribtion_wifi">1. Conectar ao WiFi</string>
+  <string name="attachproject_hint_contribtion_charger">2. Ligar o Carregador</string>
+  <string name="attachproject_hint_contribtion_screen">3. Desligar o Ecrã</string>
+  <string name="attachproject_hint_projectwebsite_header">Visite os websites do projecto para:</string>
+  <string name="attachproject_hint_projectwebsite_science">Aprenda mais sobre a ciência</string>
+  <string name="attachproject_hint_projectwebsite_stats">Ver estatísticas de contribuição</string>
+  <string name="attachproject_hint_projectwebsite_community">Entre em contacto com outros voluntários</string>
+  <string name="attachproject_hint_platforms_header">O BOINC também está disponível para o seu computador ou portátil, visite boinc.berkeley.edu para saber mais.</string>
+  <!--project login-->
   <string name="attachproject_login_loading">A contactar o servidor do projecto...</string>
   <string name="attachproject_login_image_description">Logotipo do projecto.</string>
   <string name="attachproject_login_header_general_area">Área geral:</string>
@@ -17,8 +52,8 @@
   <string name="attachproject_login_header_home">Página principal:</string>
   <string name="attachproject_login_header_url">Website:</string>
   <string name="attachproject_login_header_platform">Android:</string>
-  <string name="attachproject_login_platform_supported">Este projecto suporta dispositivos com Android</string>
-  <string name="attachproject_login_platform_not_supported">Este projecto não suporta dispositivos com Android</string>
+  <string name="attachproject_login_platform_supported">O tipo de dispositivo é suportado por este projecto</string>
+  <string name="attachproject_login_platform_not_supported">O dispositivo não é suportado por este projecto</string>
   <string name="attachproject_login_category_terms_of_use">Termos de uso para</string>
   <string name="attachproject_login_accept_terms_of_use">Ao criar uma conta neste projecto, aceita os termos de uso acima descritos.</string>
   <string name="attachproject_login_category_login">Entrar com uma conta já existente</string>
@@ -28,12 +63,13 @@
   <string name="attachproject_login_category_creation">Novo a</string>
   <string name="attachproject_login_header_creation_enabled">Registar uma conta para participar:</string>
   <string name="attachproject_login_header_creation_client_disabled">Visite o website do projecto para criar uma conta:</string>
-  <string name="attachproject_login_header_creation_disabled">O projecto não permite de momento a criação de novas contas!</string>
+  <string name="attachproject_login_header_creation_disabled">Este projecto não está a aceitar de momento novas contas.</string>
   <string name="attachproject_login_button_registration">Registar</string>
   <string name="attachproject_login_button_login">Entrar</string>
   <string name="attachproject_login_button_forgotpw">Esqueceu a Palavra-passe</string>
-  <string name="attachproject_login_error_toast">Contacto ao projecto falhou!</string>
+  <string name="attachproject_login_error_toast">Conexão ao projecto falhou!</string>
   <string name="attachproject_login_attached">Anexado</string>
+  <!--project registration-->
   <string name="attachproject_registration_header">Registo de conta para</string>
   <string name="attachproject_registration_header_url">Projecto:</string>
   <string name="attachproject_registration_header_email">e-Mail:</string>
@@ -42,29 +78,34 @@
   <string name="attachproject_registration_header_pwd">Palavra-passe:</string>
   <string name="attachproject_registration_header_pwd_confirm">... Escreva novamente:</string>
   <string name="attachproject_registration_button">Criar</string>
+  <!--account manager-->
+  <string name="attachproject_acctmgr_list_desc">Use o gestor de conta do BOINC, para adicionar ou gerir projectos múltiplos</string>
   <string name="attachproject_acctmgr_header">Adicionar gestor de conta</string>
   <string name="attachproject_acctmgr_header_url">URL</string>
   <string name="attachproject_acctmgr_header_name">Utilizador:</string>
   <string name="attachproject_acctmgr_header_pwd">Palavra-passe:</string>
   <string name="attachproject_acctmgr_header_pwd_confirm">... Escreva novamente:</string>
   <string name="attachproject_acctmgr_button">Adicionar</string>
+  <!--error strings-->
   <string name="attachproject_error_wrong_name">Utilizador não encontrado</string>
   <string name="attachproject_error_short_pwd">Palavra-passe demasiado curta</string>
   <string name="attachproject_error_no_internet">Falha de conexão</string>
   <string name="attachproject_error_pwd_no_match">As palavras-passe não coincidem</string>
-  <string name="attachproject_error_no_url">Por favor insira o URL</string>
-  <string name="attachproject_error_no_email">Por favor insira o endereço de e-Mail</string>
-  <string name="attachproject_error_no_pwd">Por favor insira a palavra-passe</string>
-  <string name="attachproject_error_no_name">Por favor insira o nome de utilizador</string>
+  <string name="attachproject_error_pwd_no_retype">Por favor, insira a palavra-passe novamente</string>
+  <string name="attachproject_error_no_url">Por favor, insira o URL</string>
+  <string name="attachproject_error_no_email">Por favor, insira o endereço de e-Mail</string>
+  <string name="attachproject_error_no_pwd">Por favor, insira a palavra-passe</string>
+  <string name="attachproject_error_no_name">Por favor, insira o nome de utilizador</string>
   <string name="attachproject_error_unknown">falhou</string>
   <string name="attachproject_error_bad_username">Nome de utilizador não aceite</string>
-  <string name="attachproject_error_email_in_use">Endereço de e-Mail já em uso</string>
+  <string name="attachproject_error_email_in_use">Endereço de e-Mail já em utilização</string>
   <string name="attachproject_error_project_down">O projecto está offline</string>
   <string name="attachproject_error_email_bad_syntax">Endereço de e-Mail não aceite</string>
   <string name="attachproject_error_bad_pwd">Palavra-passe não aceite</string>
   <string name="attachproject_error_creation_disabled">A criação de contas está desabilitada para este projecto</string>
   <string name="attachproject_error_invalid_url">URL inválido</string>
-  <string name="attachproject_working_back_button">Voltar atrás</string>
+  <!--working activity-->
+  <string name="attachproject_working_back_button">Voltar Atrás</string>
   <string name="attachproject_working_finish_button">Terminar</string>
   <string name="attachproject_working_check_desc">Bem sucedido</string>
   <string name="attachproject_working_failed_desc">Falhou</string>
@@ -77,10 +118,12 @@
   <string name="attachproject_working_login">Entrar</string>
   <string name="attachproject_working_acctmgr">Adicionar gestor de conta</string>
   <string name="attachproject_working_acctmgr_sync">Sincronizar</string>
+  <!--main activity-->
   <string name="main_noproject_warning">Carregue aqui para escolher um projecto.</string>
   <string name="main_error">Whooops</string>
-  <string name="main_error_long">...isto não deveria acontecer!\nCarregue no ícone para tentar novamente.</string>
+  <string name="main_error_long">...isto não deveria acontecer!\nClique no ícone para tentar novamente.</string>
   <string name="main_title_icon_desc">Ícone do BOINC</string>
+  <!--tab names-->
   <string name="tab_status">Estado</string>
   <string name="tab_projects">Projectos</string>
   <string name="tab_tasks">Tarefas</string>
@@ -88,20 +131,22 @@
   <string name="tab_preferences">Preferências</string>
   <string name="tab_notices">Notícias</string>
   <string name="tab_desc">Navegação</string>
-  <string name="status_running">A computar</string>
+  <!--status strings-->
+  <string name="status_running">A realizar computação</string>
   <string name="status_running_long">Obrigado por participar.</string>
   <string name="status_paused">Suspenso</string>
   <string name="status_idle">Nada para fazer</string>
   <string name="status_idle_long">A aguardar tarefas...</string>
   <string name="status_computing_disabled">Suspenso</string>
   <string name="status_computing_disabled_long">Carregue no play para resumir a actividade de rede e computação.</string>
-  <string name="status_launching">A começar...</string>
+  <string name="status_launching">Começando...</string>
   <string name="status_noproject">Escolha um projecto para participar.</string>
   <string name="status_closing">A fechar...</string>
   <string name="status_benchmarking">A executar testes de performance...</string>
   <string name="status_image_description">imagem do projecto</string>
+  <!--preferences tab strings-->
   <string name="prefs_loading">A ler preferências...</string>
-  <string name="prefs_submit_button">Salvar</string>
+  <string name="prefs_submit_button">Guardar</string>
   <string name="prefs_dialog_title">Insira novo valor:</string>
   <string name="prefs_dialog_title_selection">Seleccione:</string>
   <string name="prefs_category_general">Geral</string>
@@ -112,47 +157,64 @@
   <string name="prefs_category_memory">Memória</string>
   <string name="prefs_category_debug">Debug</string>
   <string name="prefs_show_advanced_header">Mostrar preferências avançadas e controlos...</string>
-  <string name="battery_charge_min_pct_header">Nível de bateria minímo</string>
-  <string name="battery_charge_min_pct_description">O BOINC suspende a computação abaixo do nível de bateria definido.</string>
+  <string name="prefs_suspend_when_screen_on">Pausar a computação quando o ecrã está ligado</string>
+  <string name="prefs_stationary_device_mode_header">Dispositivo em modo estacionário</string>
+  <string name="prefs_stationary_device_mode_description">Permite computação independentemente das preferências de Energia. Habilite apenas se o dispositivo não tiver uma bateria.</string>
+  <string name="prefs_power_source_header">Fontes de energia para computação</string>
+  <string name="prefs_power_source_description">Selecciona a fonte de energia permitida para o BOINC realizar computação.</string>
+  <string name="prefs_power_source_ac">Wall socket</string>
+  <string name="prefs_power_source_usb">Conexão USB</string>
+  <string name="prefs_power_source_wireless">Carregador sem fios</string>
+  <string name="prefs_power_source_battery">Bateria</string>
+  <string name="battery_charge_min_pct_header">Nível de bateria mínimo</string>
+  <string name="battery_charge_min_pct_description">O BOINC suspende a computação quando abaixo do nível de bateria definido.</string>
   <string name="battery_temperature_max_header">Temperatura máxima da bateria</string>
   <string name="battery_temperature_max_description">O BOINC suspende a computação abaixo da temperatura da bateria definida. Não é recomendada a alteração deste valor.</string>
   <string name="prefs_disk_max_pct_header">Espaço de armazenamento máximo</string>
-  <string name="prefs_disk_max_pct_description">Qual a percentagem de espaço de armazenamento no seu dispositivo que é permitida que o BOINC use?</string>
-  <string name="prefs_disk_min_free_gb_header">Espaço de armazenamento minímo</string>
+  <string name="prefs_disk_max_pct_description">Qual a percentagem de espaço de armazenamento no seu dispositivo que é permitido que o BOINC utilize?</string>
+  <string name="prefs_disk_min_free_gb_header">Espaço de armazenamento mínimo</string>
   <string name="prefs_disk_min_free_gb_description">Qual a capacidade de espaço de armazenamento no seu dispositivo que deve ficar livre?</string>
+  <string name="prefs_disk_access_interval_header">Intervalo de acesso</string>
+  <string name="prefs_disk_access_interval_description">Sugere um intervalo entre acessos ao disco</string>
   <string name="prefs_network_daily_xfer_limit_mb_header">Transferência diária limite</string>
   <string name="prefs_network_daily_xfer_limit_mb_description">Limita o tráfico diário causado pelo BOINC.</string>
   <string name="prefs_network_wifi_only_header">Transferir tarefas em WiFi apenas</string>
   <string name="prefs_autostart_header">Começo Automático</string>
-  <string name="prefs_cpu_number_cpus_header">Cores de CPU usados</string>
+  <string name="prefs_show_notification_notices_header">Mostrar notificações para novas notícias</string>
+  <string name="prefs_show_notification_suspended_header">Mostrar notificação quando suspenso</string>
+  <string name="prefs_cpu_number_cpus_header">Número de cores do CPU utilizados</string>
   <string name="prefs_cpu_number_cpus_description">Limita o número de cores de CPU que o BOINC usa para computação.</string>
   <string name="prefs_cpu_other_load_suspension_header">Pausa no CPU quando a utilização for acima de</string>
-  <string name="prefs_cpu_other_load_suspension_description">Determina quando o BOINC pausa a computação, devido ao uso de outras aplicações no CPU.</string>
+  <string name="prefs_cpu_other_load_suspension_description">Determina quando o BOINC pausa a computação, devido ao uso do CPU por outras aplicações</string>
   <string name="prefs_cpu_time_max_header">Limite do CPU</string>
   <string name="prefs_cpu_time_max_description">Limita o tempo de CPU que o BOINC usa para computação.</string>
   <string name="prefs_memory_max_idle_header">Limite de RAM</string>
   <string name="prefs_memory_max_idle_description">Limita a quantidade de RAM que é permitida que as tarefas ocupem.</string>
-  <string name="prefs_client_log_flags_header">Bandeiras de log do cliente BOINC</string>
+  <string name="prefs_client_log_flags_header">Log das Bandeiras do cliente BOINC</string>
   <string name="prefs_gui_log_level_header">Nível de log da GUI</string>
   <string name="prefs_gui_log_level_description">Especifica a verbosidade das mensagens de log da GUI.</string>
   <string name="prefs_unit_mb">MB</string>
   <string name="prefs_unit_gb">GB</string>
   <string name="prefs_unit_pct">%</string>
-  <string name="prefs_unit_celcius">ºC</string>
+  <string name="prefs_unit_celcius">°C</string>
+  <string name="prefs_unit_seconds">seg</string>
+  <!--projects tab strings-->
   <string name="projects_loading">A ler projectos...</string>
   <string name="projects_add">Adicionar projecto</string>
   <string name="projects_icon">Ícone do projecto</string>
   <string name="projects_credits_header">Créditos:</string>
   <string name="projects_credits_host_header">(neste dispositivo)</string>
   <string name="projects_credits_user_header">(total)</string>
-  <string name="projects_status_suspendedviagui">Supenso pelo utilizador</string>
-  <string name="projects_status_dontrequestmorework">Não ir buscar novas tarefas</string>
+  <!--project status strings-->
+  <string name="projects_status_suspendedviagui">Suspenso pelo utilizador</string>
+  <string name="projects_status_dontrequestmorework">Não obter novas tarefas</string>
   <string name="projects_status_ended">Projecto terminado - OK para remover</string>
   <string name="projects_status_detachwhendone">Irá remover quando as tarefas terminarem</string>
   <string name="projects_status_schedrpcpending">Solicitação agendada pendente</string>
   <string name="projects_status_schedrpcinprogress">Solicitação agendada em progresso</string>
   <string name="projects_status_trickleuppending">Mensagem de aviso pendente</string>
   <string name="projects_status_backoff">Comunicação agendada em:</string>
+  <!--project controls-->
   <string name="projects_control_dialog_title">Comandos do projecto:</string>
   <string name="projects_control_visit_website">Visitar website</string>
   <string name="projects_control_update">Actualizar</string>
@@ -165,26 +227,30 @@
   <string name="projects_control_dialog_title_acctmgr">Comandos do gestor de conta:</string>
   <string name="projects_control_sync_acctmgr">Sincronizar</string>
   <string name="projects_control_remove_acctmgr">Desabilitar</string>
+  <!--project confirm dialog-->
   <string name="projects_confirm_detach_title">Remover projecto?</string>
   <string name="projects_confirm_detach_message">Tem a certeza que quer remover</string>
   <string name="projects_confirm_detach_message2">do BOINC?</string>
   <string name="projects_confirm_detach_confirm">Remover</string>
   <string name="projects_confirm_reset_title">Fazer reset ao projecto</string>
   <string name="projects_confirm_reset_message">Tem a certeza que quer fazer reset</string>
+  <string name="projects_confirm_reset_message2">\?</string>
   <string name="projects_confirm_reset_confirm">Reset</string>
   <string name="projects_confirm_remove_acctmgr_title">Desabilitar gestor de conta</string>
-  <string name="projects_confirm_remove_acctmgr_message">Tem a certeza que quer parar de usar o</string>
+  <string name="projects_confirm_remove_acctmgr_message">Tem a certeza que quer parar de utilizar o</string>
+  <string name="projects_confirm_remove_acctmgr_message2">\?</string>
   <string name="projects_confirm_remove_acctmgr_confirm">Desabilitar</string>
+  <!--tasks tab strings-->
   <string name="tasks_header_name">Nome da Tarefa:</string>
   <string name="tasks_header_elapsed_time">Tempo decorrido:</string>
   <string name="tasks_header_project_paused">(suspenso)</string>
   <string name="tasks_header_deadline">Data Limite:</string>
   <string name="tasks_result_new">novo</string>
-  <string name="tasks_result_files_downloading">à espera de transferir</string>
-  <string name="tasks_result_files_downloaded">transferência completa</string>
+  <string name="tasks_result_files_downloading">à espera para transferir</string>
+  <string name="tasks_result_files_downloaded">transferência concluída</string>
   <string name="tasks_result_compute_error">erro de computação</string>
   <string name="tasks_result_files_uploading">a fazer upload</string>
-  <string name="tasks_result_files_uploaded">upload completo</string>
+  <string name="tasks_result_files_uploaded">upload concluído</string>
   <string name="tasks_result_aborted">abortado</string>
   <string name="tasks_result_upload_failed">upload falhado</string>
   <string name="tasks_active_uninitialized">pronto</string>
@@ -195,11 +261,13 @@
   <string name="tasks_custom_suspended_via_gui">suspenso</string>
   <string name="tasks_custom_project_suspended_via_gui">projecto suspenso</string>
   <string name="tasks_custom_ready_to_report">pronto para reportar</string>
+  <!--confirmation dialog-->
   <string name="confirm_abort_task_title">Abortar tarefa?</string>
   <string name="confirm_abort_task_message">Abortar tarefa:</string>
   <string name="confirm_abort_task_confirm">Abortar</string>
   <string name="confirm_cancel">Cancelar</string>
   <string name="confirm_image_desc">Diálogo de confirmação</string>
+  <!--transfers tab strings-->
   <string name="trans_loading">A ler transferências...</string>
   <string name="trans_upload">Upload</string>
   <string name="trans_download">Transferir</string>
@@ -214,14 +282,18 @@
   <string name="confirm_abort_trans_title">Abortar transferência?</string>
   <string name="confirm_abort_trans_message">Abortar Ficheiro:</string>
   <string name="confirm_abort_trans_confirm">Abortar</string>
+  <!--notices tab strings-->
   <string name="notices_loading">A ler notícias...</string>
-  <string name="eventlog_loading">A carregar mensagens de log...</string>
+  <!--eventlog tab strings-->
+  <string name="eventlog_loading">A carregar mensagens do log...</string>
   <string name="eventlog_client_header">Mensagens do Cliente</string>
   <string name="eventlog_gui_header">Mensagens da GUI</string>
   <string name="eventlog_copy_toast">Log copiado para a área de transferência.</string>
   <string name="eventlog_email_subject">Log de Eventos para o BOINC no Android:</string>
+  <!--suspend reasons-->
   <string name="suspend_unknown">Computação suspensa.</string>
   <string name="suspend_batteries">Conecte o seu dispositivo a um carregador para continuar a computação.</string>
+  <string name="suspend_screen_on">Desligar ecrã para continuar a computação.</string>
   <string name="suspend_useractive">O utilizador está activo</string>
   <string name="suspend_tod">Fora da janela de tempo para a computação.</string>
   <string name="suspend_bm">O BOINC está a executar testes de performance no seu dispositivo...</string>
@@ -231,36 +303,58 @@
   <string name="suspend_delay">Atraso de inicialização.</string>
   <string name="suspend_exclusiveapp">Uma aplicação exclusiva está em execução.</string>
   <string name="suspend_cpu">O seu dispositivo está ocupado com outras aplicações</string>
-  <string name="suspend_network_quota">O BOINC atingiu a transferência de rede diária limite.</string>
+  <string name="suspend_network_quota">O BOINC atingiu a transferência limite diária de rede.</string>
   <string name="suspend_os">Parado pelo Android.</string>
   <string name="suspend_wifi">Não conectado a um WiFi.</string>
-  <string name="suspend_battery_charging">A bateria precisa de ser carregada antes que a computação seja resumida.</string>
+  <string name="suspend_battery_charging">A aguardar que a bateria seja carregada</string>
   <string name="suspend_battery_charging_long">A computação será resumida quando a carga da bateria chegar a</string>
+  <string name="suspend_battery_charging_long2"></string>
   <string name="suspend_battery_charging_current">actualmente</string>
   <string name="suspend_battery_overheating">À espera que a bateria arrefeça</string>
-  <string name="suspend_user_req">A resumir a computação...</string>
+  <string name="suspend_user_req">A resumir computação...</string>
   <string name="suspend_network_user_req">manualmente.</string>
-  <string name="rpcreason_userreq">Requisitado pelo utilizador</string>
-  <string name="rpcreason_needwork">Ir buscar trabalho</string>
-  <string name="rpcreason_resultsdue">Reportar tarefas completas</string>
+  <!--rpc reasons-->
+  <string name="rpcreason_userreq">Solicitado pelo utilizador</string>
+  <string name="rpcreason_needwork">Obter trabalho</string>
+  <string name="rpcreason_resultsdue">Reportar tarefas concluídas</string>
   <string name="rpcreason_trickleup">Enviar mensagem de aviso</string>
-  <string name="rpcreason_acctmgrreq">Requisitado pelo gestor de conta</string>
+  <string name="rpcreason_acctmgrreq">Solicitado pelo gestor de conta</string>
   <string name="rpcreason_init">Inicialização do projecto</string>
-  <string name="rpcreason_projectreq">Requisitado pelo projecto</string>
+  <string name="rpcreason_projectreq">Solicitado pelo projecto</string>
   <string name="rpcreason_unknown">Razão desconhecida</string>
+  <!--menu-->
   <string name="menu_refresh">Recarregar</string>
   <string name="menu_emailto">Enviar como e-mail</string>
-  <string name="menu_copy">Copiar para a Àrea de Transferência</string>
+  <string name="menu_copy">Copiar para a Área de Transferência</string>
   <string name="menu_eventlog">Log de Eventos</string>
   <string name="menu_exit">Sair do BOINC</string>
   <string name="menu_run_mode_disable">Suspender</string>
   <string name="menu_run_mode_enable">Resumir</string>
   <string name="menu_about">Acerca de</string>
   <string name="menu_help">Ajuda</string>
+  <!--about dialog-->
   <string name="about_button">Regressar</string>
   <string name="about_title">Acerca de</string>
   <string name="about_name">BOINC</string>
   <string name="about_version">Versão</string>
   <string name="about_name_long">Infraestrutura Aberta Berkeley para a Rede de Computação</string>
-  <string name="about_copyright">© 2003-2013 Universidade da Califórnia, Berkeley.\nTodos os Direitos Reservados.</string>
+  <string name="about_copyright">\u00A9 2003-2014 Universidade da Califórnia, Berkeley</string>
+  <string name="about_copyright_reserved">Todos os Direitos Reservados.</string>
+  <string name="about_credits">Agradecimentos ao Instituto Max Planck de Física Gravitacional, IBM e HTC pelo seu suporte.</string>
+  <!--notice notification-->
+  <string name="notice_notification_single_header">Notícia nova de</string>
+  <!--e.g. New notice from SETI at HOME-->
+  <string name="notice_notification_multiple_header">notícias novas</string>
+  <!--e.g. 3 new notices-->
+  <!--multi BOINC compitability-->
+  <string name="nonexcl_dialog_header">Aplicação de computação voluntária detectada</string>
+  <string name="nonexcl_dialog_text">Outra aplicação de computação voluntária está a ser executada neste aparelho. Apenas uma pode correr de cada vez.</string>
+  <string name="nonexcl_dialog_exit">Sair</string>
+  <!--social integration-->
+  <string name="social_invite_button">Convidar amigos</string>
+  <string name="social_invite_intent_title">Como quer partilhar?</string>
+  <string name="social_invite_content_title">Estou a fazer ciência no meu smartphone!</string>
+  <string name="social_invite_content_body">Estou a utilizar o meu %1$s para realizar computação para a ciência. Também podes! Faz a transferência da aplicação 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-ru/strings.xml b/android/BOINC/res/values-ru-rRU/strings.xml
similarity index 73%
copy from android/BOINC/res/values-ru/strings.xml
copy to android/BOINC/res/values-ru-rRU/strings.xml
index 131b4d7..1c2aedf 100644
--- a/android/BOINC/res/values-ru/strings.xml
+++ b/android/BOINC/res/values-ru-rRU/strings.xml
@@ -1,7 +1,14 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--app global-->
   <string name="app_name">BOINC</string>
+  <!--generic. used by multiple Activities/tabs-->
   <string name="generic_loading">Загружается! Пожалуйста подождите…</string>
+  <string name="generic_button_continue">Продолжить</string>
+  <string name="generic_button_finish">Готово</string>
+  <!--attach project-->
+  <!--selection list-->
+  <string name="attachproject_list_desc">Выберите научные проекты, в которых Вы хотите принять участие:</string>
   <string name="attachproject_list_header">Выберите проект:</string>
   <string name="attachproject_list_manual_button">Добавить URL-адрес проекта</string>
   <string name="attachproject_list_manual_dialog_title">Введите URL проекта:</string>
@@ -9,6 +16,34 @@
   <string name="attachproject_list_manual_no_url">Пожалуйста, введите URL проекта</string>
   <string name="attachproject_list_acctmgr_button">Добавить менеджер проектов</string>
   <string name="attachproject_list_no_internet">Нет подключения к Интернету</string>
+  <!--credential input-->
+  <string name="attachproject_credential_input_sing_desc">Ввести учётную информацию</string>
+  <string name="attachproject_credential_input_desc">Введите учётную информацию для выбранных проектов:</string>
+  <string name="attachproject_credential_input_show_pwd">Показать пароль</string>
+  <string name="attachproject_individual_credential_input">Подключиться к проектам по отдельности</string>
+  <!--conflicts-->
+  <string name="attachproject_conflicts_desc">Возникли проблемы с подключением к научным проектам:</string>
+  <string name="attachproject_conflict_undefined">Не удалось подключиться</string>
+  <string name="attachproject_conflict_not_unique">Учётная запись существует с другим паролем</string>
+  <string name="attachproject_conflict_bad_password">Пароль неверен</string>
+  <string name="attachproject_conflict_unknown_user">Учётная запись не существует</string>
+  <string name="attachproject_conflict_unknown_user_creation_disabled">Учётная запись не существует, для регистрации посетите веб-сайт проекта</string>
+  <!--working-->
+  <string name="attachproject_working_attaching">Подключение</string>
+  <!--e.g. Attaching Einstein at Home-->
+  <!--hints-->
+  <string name="attachproject_hints_header">Подсказка</string>
+  <!--e.g. Hint 1/2-->
+  <string name="attachproject_hint_contribtion_header">Как помочь:</string>
+  <string name="attachproject_hint_contribtion_wifi">1. Подключиться к Wi-Fi</string>
+  <string name="attachproject_hint_contribtion_charger">2. Подключить зарядное устройство</string>
+  <string name="attachproject_hint_contribtion_screen">3. Отключить экран</string>
+  <string name="attachproject_hint_projectwebsite_header">Посетить веб-сайты проектов для:</string>
+  <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>
+  <!--project login-->
   <string name="attachproject_login_loading">Соединение с сервером проекта…</string>
   <string name="attachproject_login_image_description">Логотип проекта.</string>
   <string name="attachproject_login_header_general_area">Основная область:</string>
@@ -28,12 +63,13 @@
   <string name="attachproject_login_category_creation">Впервые в</string>
   <string name="attachproject_login_header_creation_enabled">Зарегистрировать учётную запись для участия:</string>
   <string name="attachproject_login_header_creation_client_disabled">Посетить веб-сайт проекта для создания учётной записи:</string>
-  <string name="attachproject_login_header_creation_disabled">Проект в данный момент не позволяет создавать новые учётные записи!</string>
+  <string name="attachproject_login_header_creation_disabled">Этот проект в данный момент не позволяет создавать новые учётные записи.</string>
   <string name="attachproject_login_button_registration">Зарегистрироваться</string>
   <string name="attachproject_login_button_login">Войти</string>
   <string name="attachproject_login_button_forgotpw">Восстановить пароль</string>
   <string name="attachproject_login_error_toast">Сбой при установке связи с проектом!</string>
   <string name="attachproject_login_attached">Подключен</string>
+  <!--project registration-->
   <string name="attachproject_registration_header">Регистрация учётной записи для</string>
   <string name="attachproject_registration_header_url">Проект:</string>
   <string name="attachproject_registration_header_email">Электронная почта:</string>
@@ -42,16 +78,20 @@
   <string name="attachproject_registration_header_pwd">Пароль:</string>
   <string name="attachproject_registration_header_pwd_confirm">… Повторите:</string>
   <string name="attachproject_registration_button">Создать</string>
+  <!--account manager-->
+  <string name="attachproject_acctmgr_list_desc">Используйте менеджер проектов BOINC, чтобы добавить и управлять несколькими проектами</string>
   <string name="attachproject_acctmgr_header">Добавить менеджер проектов</string>
   <string name="attachproject_acctmgr_header_url">URL</string>
   <string name="attachproject_acctmgr_header_name">Пользователь:</string>
   <string name="attachproject_acctmgr_header_pwd">Пароль:</string>
   <string name="attachproject_acctmgr_header_pwd_confirm">… Повторите:</string>
   <string name="attachproject_acctmgr_button">Добавить</string>
+  <!--error strings-->
   <string name="attachproject_error_wrong_name">Пользователь не найден</string>
   <string name="attachproject_error_short_pwd">Пароль слишком короткий</string>
   <string name="attachproject_error_no_internet">Сбой подключения</string>
   <string name="attachproject_error_pwd_no_match">Пароли не совпадают</string>
+  <string name="attachproject_error_pwd_no_retype">Пожалуйста, введите пароль ещё раз</string>
   <string name="attachproject_error_no_url">Введите URL</string>
   <string name="attachproject_error_no_email">Введите адрес электронной почты</string>
   <string name="attachproject_error_no_pwd">Введите пароль</string>
@@ -64,6 +104,7 @@
   <string name="attachproject_error_bad_pwd">Пароль не принят</string>
   <string name="attachproject_error_creation_disabled">Создание учётной записи в данном проекте отключено</string>
   <string name="attachproject_error_invalid_url">Неправильный адрес (URL)</string>
+  <!--working activity-->
   <string name="attachproject_working_back_button">Назад</string>
   <string name="attachproject_working_finish_button">Готово</string>
   <string name="attachproject_working_check_desc">Успешно</string>
@@ -77,9 +118,12 @@
   <string name="attachproject_working_login">Войти</string>
   <string name="attachproject_working_acctmgr">Добавить менеджер проектов</string>
   <string name="attachproject_working_acctmgr_sync">Синхронизировать</string>
+  <!--main activity-->
+  <string name="main_noproject_warning">Нажмите здесь, чтобы выбрать проект.</string>
   <string name="main_error">Упс</string>
   <string name="main_error_long">…этого не должно было произойти!\nНажмите на значок BOINC, чтобы попробовать ещё раз.</string>
   <string name="main_title_icon_desc">Значок BOINC</string>
+  <!--tab names-->
   <string name="tab_status">Статус</string>
   <string name="tab_projects">Проекты</string>
   <string name="tab_tasks">Задания</string>
@@ -87,6 +131,7 @@
   <string name="tab_preferences">Настройки</string>
   <string name="tab_notices">Уведомления</string>
   <string name="tab_desc">Навигация</string>
+  <!--status strings-->
   <string name="status_running">Выполнение расчётов</string>
   <string name="status_running_long">Спасибо за участие.</string>
   <string name="status_paused">Приостановлено</string>
@@ -99,6 +144,7 @@
   <string name="status_closing">Закрытие…</string>
   <string name="status_benchmarking">Тестирование производительности…</string>
   <string name="status_image_description">изображение проекта</string>
+  <!--preferences tab strings-->
   <string name="prefs_loading">Чтение настроек…</string>
   <string name="prefs_submit_button">Сохранить</string>
   <string name="prefs_dialog_title">Введите новое значение:</string>
@@ -111,6 +157,15 @@
   <string name="prefs_category_memory">Память</string>
   <string name="prefs_category_debug">Отладка</string>
   <string name="prefs_show_advanced_header">Показать дополнительные настройки и элементы управления…</string>
+  <string name="prefs_suspend_when_screen_on">Приостановить вычисления, когда экран включён</string>
+  <string name="prefs_stationary_device_mode_header">Стационарный режим работы устройства</string>
+  <string name="prefs_stationary_device_mode_description">Разрешает вычисления независимо от настроек Питания. Включать только в том случае, если устройство не оснащено аккумулятором.</string>
+  <string name="prefs_power_source_header">Источники питания для вычислений</string>
+  <string name="prefs_power_source_description">Выбор источников питания, которые BOINC может использовать для вычислений.</string>
+  <string name="prefs_power_source_ac">Розетки</string>
+  <string name="prefs_power_source_usb">USB-подключение</string>
+  <string name="prefs_power_source_wireless">Беспроводное зарядное устройство</string>
+  <string name="prefs_power_source_battery">Аккумулятор</string>
   <string name="battery_charge_min_pct_header">Мин. уровень заряда батареи</string>
   <string name="battery_charge_min_pct_description">BOINC приостановит расчёты, когда заряд батареи будет ниже указанного уровня.</string>
   <string name="battery_temperature_max_header">Макс. температура батареи</string>
@@ -119,14 +174,18 @@
   <string name="prefs_disk_max_pct_description">Сколько процентов от общего объёма памяти вашего устройства BOINC может использовать?</string>
   <string name="prefs_disk_min_free_gb_header">Мин. свободное пространство</string>
   <string name="prefs_disk_min_free_gb_description">Какой объём памяти вашего устройства должен оставаться свободным?</string>
+  <string name="prefs_disk_access_interval_header">Период доступа</string>
+  <string name="prefs_disk_access_interval_description">Предлагает интервал между обращениями к диску</string>
   <string name="prefs_network_daily_xfer_limit_mb_header">Ежедневный предел передачи</string>
   <string name="prefs_network_daily_xfer_limit_mb_description">Ограничивает ежедневный трафик данных, вызванный BOINC.</string>
   <string name="prefs_network_wifi_only_header">Передавать задания только по WiFi</string>
   <string name="prefs_autostart_header">Автозапуск</string>
+  <string name="prefs_show_notification_notices_header">Показывать уведомления о поступлении новых сообщений</string>
+  <string name="prefs_show_notification_suspended_header">Показывать уведомление когда приостановлено</string>
   <string name="prefs_cpu_number_cpus_header">Используемые ядра процессора</string>
   <string name="prefs_cpu_number_cpus_description">Ограничивает количество ядер процессора, которые использует BOINC для расчётов.</string>
   <string name="prefs_cpu_other_load_suspension_header">Пауза при использовании процессора выше</string>
-  <string name="prefs_cpu_other_load_suspension_description">Определяет, когда BOINC останавливает расчёты из-за использования процессора другими приложениями.</string>
+  <string name="prefs_cpu_other_load_suspension_description">Определяет, когда BOINC приостанавливает расчёты из-за использования процессора другими приложениями.</string>
   <string name="prefs_cpu_time_max_header">Предельное время процессора</string>
   <string name="prefs_cpu_time_max_description">Ограничивает время процессора, которое использует BOINC для расчётов.</string>
   <string name="prefs_memory_max_idle_header">Ограничение ОЗУ</string>
@@ -138,12 +197,15 @@
   <string name="prefs_unit_gb">ГБ</string>
   <string name="prefs_unit_pct">%</string>
   <string name="prefs_unit_celcius">°C</string>
+  <string name="prefs_unit_seconds">сек</string>
+  <!--projects tab strings-->
   <string name="projects_loading">Чтение проектов…</string>
   <string name="projects_add">Добавить проект</string>
   <string name="projects_icon">Значок проекта</string>
   <string name="projects_credits_header">Очки:</string>
   <string name="projects_credits_host_header">(на этом устройстве)</string>
   <string name="projects_credits_user_header">(всего)</string>
+  <!--project status strings-->
   <string name="projects_status_suspendedviagui">Приостановлен пользователем</string>
   <string name="projects_status_dontrequestmorework">Не запрашивать новые задания</string>
   <string name="projects_status_ended">Проект завершён - ОК для удаления</string>
@@ -152,6 +214,7 @@
   <string name="projects_status_schedrpcinprogress">Производится запрос информации у планировщика</string>
   <string name="projects_status_trickleuppending">Ожидание промежуточной отправки</string>
   <string name="projects_status_backoff">Связь по расписанию:</string>
+  <!--project controls-->
   <string name="projects_control_dialog_title">Команды проекта:</string>
   <string name="projects_control_visit_website">Посетить веб-сайт</string>
   <string name="projects_control_update">Обновить</string>
@@ -164,16 +227,20 @@
   <string name="projects_control_dialog_title_acctmgr">Команды менеджера проектов:</string>
   <string name="projects_control_sync_acctmgr">Синхронизировать</string>
   <string name="projects_control_remove_acctmgr">Отключить</string>
+  <!--project confirm dialog-->
   <string name="projects_confirm_detach_title">Удалить проект?</string>
   <string name="projects_confirm_detach_message">Вы действительно хотите удалить</string>
   <string name="projects_confirm_detach_message2">из BOINC?</string>
   <string name="projects_confirm_detach_confirm">Удалить</string>
   <string name="projects_confirm_reset_title">Перезапустить проект</string>
   <string name="projects_confirm_reset_message">Вы действительно хотите перезапустить</string>
+  <string name="projects_confirm_reset_message2">\?</string>
   <string name="projects_confirm_reset_confirm">Сбросить</string>
   <string name="projects_confirm_remove_acctmgr_title">Отключить менеджер проектов</string>
   <string name="projects_confirm_remove_acctmgr_message">Вы уверены, что хотите прекратить использование</string>
+  <string name="projects_confirm_remove_acctmgr_message2">\?</string>
   <string name="projects_confirm_remove_acctmgr_confirm">Отключить</string>
+  <!--tasks tab strings-->
   <string name="tasks_header_name">Название задания:</string>
   <string name="tasks_header_elapsed_time">Затрачено времени:</string>
   <string name="tasks_header_project_paused">(приостановлено)</string>
@@ -194,11 +261,13 @@
   <string name="tasks_custom_suspended_via_gui">приостановлено</string>
   <string name="tasks_custom_project_suspended_via_gui">проект приостановлен</string>
   <string name="tasks_custom_ready_to_report">готово для подтверждения</string>
+  <!--confirmation dialog-->
   <string name="confirm_abort_task_title">Прервать задание?</string>
   <string name="confirm_abort_task_message">Прервать задание:</string>
   <string name="confirm_abort_task_confirm">Прервать</string>
   <string name="confirm_cancel">Отмена</string>
   <string name="confirm_image_desc">Диалог подтверждения</string>
+  <!--transfers tab strings-->
   <string name="trans_loading">Чтение списка передач…</string>
   <string name="trans_upload">Отправка</string>
   <string name="trans_download">Загрузка</string>
@@ -213,14 +282,18 @@
   <string name="confirm_abort_trans_title">Прервать передачу?</string>
   <string name="confirm_abort_trans_message">Прервать файл:</string>
   <string name="confirm_abort_trans_confirm">Прервать</string>
+  <!--notices tab strings-->
   <string name="notices_loading">Чтение уведомлений…</string>
+  <!--eventlog tab strings-->
   <string name="eventlog_loading">Загрузка сообщений журнала…</string>
   <string name="eventlog_client_header">Сообщения клиента</string>
   <string name="eventlog_gui_header">Сообщения GUI</string>
   <string name="eventlog_copy_toast">Журнал скопирован в буфер обмена.</string>
   <string name="eventlog_email_subject">Журнал событий для BOINC на Android:</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>
@@ -233,12 +306,14 @@
   <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">Ожидание увеличения уровня заряда батареи.</string>
   <string name="suspend_battery_charging_long">Расчёты возобновятся, когда заряд батареи достигнет</string>
+  <string name="suspend_battery_charging_long2"></string>
   <string name="suspend_battery_charging_current">в данный момент</string>
   <string name="suspend_battery_overheating">Ожидание охлаждения батареи</string>
   <string name="suspend_user_req">Возобновление расчётов…</string>
   <string name="suspend_network_user_req">вручную.</string>
+  <!--rpc reasons-->
   <string name="rpcreason_userreq">Запрошено пользователем</string>
   <string name="rpcreason_needwork">Запросить задания</string>
   <string name="rpcreason_resultsdue">Сообщить о завершённых заданиях</string>
@@ -247,6 +322,7 @@
   <string name="rpcreason_init">Инициализация проекта</string>
   <string name="rpcreason_projectreq">Запрошено проектом</string>
   <string name="rpcreason_unknown">Неизвестная причина</string>
+  <!--menu-->
   <string name="menu_refresh">Обновить</string>
   <string name="menu_emailto">Отправить письмом</string>
   <string name="menu_copy">Копировать в буфер обмена</string>
@@ -256,10 +332,29 @@
   <string name="menu_run_mode_enable">Возобновить</string>
   <string name="menu_about">О</string>
   <string name="menu_help">Справка</string>
+  <!--about dialog-->
   <string name="about_button">Вернуться</string>
   <string name="about_title">О</string>
   <string name="about_name">BOINC</string>
   <string name="about_version">Версия</string>
   <string name="about_name_long">BOINC - Berkeley Open Infrastructure for Network Computing\nОткрытая Инфраструктура для Распределенных Вычислений университета Беркли</string>
   <string name="about_copyright">© 2003-2013 Калифорнийский университет, Беркли.\nВсе права защищены.</string>
+  <string name="about_copyright_reserved">Все права защищены.</string>
+  <string name="about_credits">Спасибо за поддержку Институту гравитационной физики Макса Планка, Корпорации IBM и Корпорации HTC.</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">Обнаружено приложение добровольных вычислений</string>
+  <string name="nonexcl_dialog_text">Ещё одно приложение добровольных вычислений работает на этом устройстве. Одновременно может работать только одна версия.</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 для выполнения научных расчётов. Ты тоже можешь принять участие! Скачай приложение здесь: %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-ru/strings.xml b/android/BOINC/res/values-ru/strings.xml
index 131b4d7..1c2aedf 100644
--- a/android/BOINC/res/values-ru/strings.xml
+++ b/android/BOINC/res/values-ru/strings.xml
@@ -1,7 +1,14 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--app global-->
   <string name="app_name">BOINC</string>
+  <!--generic. used by multiple Activities/tabs-->
   <string name="generic_loading">Загружается! Пожалуйста подождите…</string>
+  <string name="generic_button_continue">Продолжить</string>
+  <string name="generic_button_finish">Готово</string>
+  <!--attach project-->
+  <!--selection list-->
+  <string name="attachproject_list_desc">Выберите научные проекты, в которых Вы хотите принять участие:</string>
   <string name="attachproject_list_header">Выберите проект:</string>
   <string name="attachproject_list_manual_button">Добавить URL-адрес проекта</string>
   <string name="attachproject_list_manual_dialog_title">Введите URL проекта:</string>
@@ -9,6 +16,34 @@
   <string name="attachproject_list_manual_no_url">Пожалуйста, введите URL проекта</string>
   <string name="attachproject_list_acctmgr_button">Добавить менеджер проектов</string>
   <string name="attachproject_list_no_internet">Нет подключения к Интернету</string>
+  <!--credential input-->
+  <string name="attachproject_credential_input_sing_desc">Ввести учётную информацию</string>
+  <string name="attachproject_credential_input_desc">Введите учётную информацию для выбранных проектов:</string>
+  <string name="attachproject_credential_input_show_pwd">Показать пароль</string>
+  <string name="attachproject_individual_credential_input">Подключиться к проектам по отдельности</string>
+  <!--conflicts-->
+  <string name="attachproject_conflicts_desc">Возникли проблемы с подключением к научным проектам:</string>
+  <string name="attachproject_conflict_undefined">Не удалось подключиться</string>
+  <string name="attachproject_conflict_not_unique">Учётная запись существует с другим паролем</string>
+  <string name="attachproject_conflict_bad_password">Пароль неверен</string>
+  <string name="attachproject_conflict_unknown_user">Учётная запись не существует</string>
+  <string name="attachproject_conflict_unknown_user_creation_disabled">Учётная запись не существует, для регистрации посетите веб-сайт проекта</string>
+  <!--working-->
+  <string name="attachproject_working_attaching">Подключение</string>
+  <!--e.g. Attaching Einstein at Home-->
+  <!--hints-->
+  <string name="attachproject_hints_header">Подсказка</string>
+  <!--e.g. Hint 1/2-->
+  <string name="attachproject_hint_contribtion_header">Как помочь:</string>
+  <string name="attachproject_hint_contribtion_wifi">1. Подключиться к Wi-Fi</string>
+  <string name="attachproject_hint_contribtion_charger">2. Подключить зарядное устройство</string>
+  <string name="attachproject_hint_contribtion_screen">3. Отключить экран</string>
+  <string name="attachproject_hint_projectwebsite_header">Посетить веб-сайты проектов для:</string>
+  <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>
+  <!--project login-->
   <string name="attachproject_login_loading">Соединение с сервером проекта…</string>
   <string name="attachproject_login_image_description">Логотип проекта.</string>
   <string name="attachproject_login_header_general_area">Основная область:</string>
@@ -28,12 +63,13 @@
   <string name="attachproject_login_category_creation">Впервые в</string>
   <string name="attachproject_login_header_creation_enabled">Зарегистрировать учётную запись для участия:</string>
   <string name="attachproject_login_header_creation_client_disabled">Посетить веб-сайт проекта для создания учётной записи:</string>
-  <string name="attachproject_login_header_creation_disabled">Проект в данный момент не позволяет создавать новые учётные записи!</string>
+  <string name="attachproject_login_header_creation_disabled">Этот проект в данный момент не позволяет создавать новые учётные записи.</string>
   <string name="attachproject_login_button_registration">Зарегистрироваться</string>
   <string name="attachproject_login_button_login">Войти</string>
   <string name="attachproject_login_button_forgotpw">Восстановить пароль</string>
   <string name="attachproject_login_error_toast">Сбой при установке связи с проектом!</string>
   <string name="attachproject_login_attached">Подключен</string>
+  <!--project registration-->
   <string name="attachproject_registration_header">Регистрация учётной записи для</string>
   <string name="attachproject_registration_header_url">Проект:</string>
   <string name="attachproject_registration_header_email">Электронная почта:</string>
@@ -42,16 +78,20 @@
   <string name="attachproject_registration_header_pwd">Пароль:</string>
   <string name="attachproject_registration_header_pwd_confirm">… Повторите:</string>
   <string name="attachproject_registration_button">Создать</string>
+  <!--account manager-->
+  <string name="attachproject_acctmgr_list_desc">Используйте менеджер проектов BOINC, чтобы добавить и управлять несколькими проектами</string>
   <string name="attachproject_acctmgr_header">Добавить менеджер проектов</string>
   <string name="attachproject_acctmgr_header_url">URL</string>
   <string name="attachproject_acctmgr_header_name">Пользователь:</string>
   <string name="attachproject_acctmgr_header_pwd">Пароль:</string>
   <string name="attachproject_acctmgr_header_pwd_confirm">… Повторите:</string>
   <string name="attachproject_acctmgr_button">Добавить</string>
+  <!--error strings-->
   <string name="attachproject_error_wrong_name">Пользователь не найден</string>
   <string name="attachproject_error_short_pwd">Пароль слишком короткий</string>
   <string name="attachproject_error_no_internet">Сбой подключения</string>
   <string name="attachproject_error_pwd_no_match">Пароли не совпадают</string>
+  <string name="attachproject_error_pwd_no_retype">Пожалуйста, введите пароль ещё раз</string>
   <string name="attachproject_error_no_url">Введите URL</string>
   <string name="attachproject_error_no_email">Введите адрес электронной почты</string>
   <string name="attachproject_error_no_pwd">Введите пароль</string>
@@ -64,6 +104,7 @@
   <string name="attachproject_error_bad_pwd">Пароль не принят</string>
   <string name="attachproject_error_creation_disabled">Создание учётной записи в данном проекте отключено</string>
   <string name="attachproject_error_invalid_url">Неправильный адрес (URL)</string>
+  <!--working activity-->
   <string name="attachproject_working_back_button">Назад</string>
   <string name="attachproject_working_finish_button">Готово</string>
   <string name="attachproject_working_check_desc">Успешно</string>
@@ -77,9 +118,12 @@
   <string name="attachproject_working_login">Войти</string>
   <string name="attachproject_working_acctmgr">Добавить менеджер проектов</string>
   <string name="attachproject_working_acctmgr_sync">Синхронизировать</string>
+  <!--main activity-->
+  <string name="main_noproject_warning">Нажмите здесь, чтобы выбрать проект.</string>
   <string name="main_error">Упс</string>
   <string name="main_error_long">…этого не должно было произойти!\nНажмите на значок BOINC, чтобы попробовать ещё раз.</string>
   <string name="main_title_icon_desc">Значок BOINC</string>
+  <!--tab names-->
   <string name="tab_status">Статус</string>
   <string name="tab_projects">Проекты</string>
   <string name="tab_tasks">Задания</string>
@@ -87,6 +131,7 @@
   <string name="tab_preferences">Настройки</string>
   <string name="tab_notices">Уведомления</string>
   <string name="tab_desc">Навигация</string>
+  <!--status strings-->
   <string name="status_running">Выполнение расчётов</string>
   <string name="status_running_long">Спасибо за участие.</string>
   <string name="status_paused">Приостановлено</string>
@@ -99,6 +144,7 @@
   <string name="status_closing">Закрытие…</string>
   <string name="status_benchmarking">Тестирование производительности…</string>
   <string name="status_image_description">изображение проекта</string>
+  <!--preferences tab strings-->
   <string name="prefs_loading">Чтение настроек…</string>
   <string name="prefs_submit_button">Сохранить</string>
   <string name="prefs_dialog_title">Введите новое значение:</string>
@@ -111,6 +157,15 @@
   <string name="prefs_category_memory">Память</string>
   <string name="prefs_category_debug">Отладка</string>
   <string name="prefs_show_advanced_header">Показать дополнительные настройки и элементы управления…</string>
+  <string name="prefs_suspend_when_screen_on">Приостановить вычисления, когда экран включён</string>
+  <string name="prefs_stationary_device_mode_header">Стационарный режим работы устройства</string>
+  <string name="prefs_stationary_device_mode_description">Разрешает вычисления независимо от настроек Питания. Включать только в том случае, если устройство не оснащено аккумулятором.</string>
+  <string name="prefs_power_source_header">Источники питания для вычислений</string>
+  <string name="prefs_power_source_description">Выбор источников питания, которые BOINC может использовать для вычислений.</string>
+  <string name="prefs_power_source_ac">Розетки</string>
+  <string name="prefs_power_source_usb">USB-подключение</string>
+  <string name="prefs_power_source_wireless">Беспроводное зарядное устройство</string>
+  <string name="prefs_power_source_battery">Аккумулятор</string>
   <string name="battery_charge_min_pct_header">Мин. уровень заряда батареи</string>
   <string name="battery_charge_min_pct_description">BOINC приостановит расчёты, когда заряд батареи будет ниже указанного уровня.</string>
   <string name="battery_temperature_max_header">Макс. температура батареи</string>
@@ -119,14 +174,18 @@
   <string name="prefs_disk_max_pct_description">Сколько процентов от общего объёма памяти вашего устройства BOINC может использовать?</string>
   <string name="prefs_disk_min_free_gb_header">Мин. свободное пространство</string>
   <string name="prefs_disk_min_free_gb_description">Какой объём памяти вашего устройства должен оставаться свободным?</string>
+  <string name="prefs_disk_access_interval_header">Период доступа</string>
+  <string name="prefs_disk_access_interval_description">Предлагает интервал между обращениями к диску</string>
   <string name="prefs_network_daily_xfer_limit_mb_header">Ежедневный предел передачи</string>
   <string name="prefs_network_daily_xfer_limit_mb_description">Ограничивает ежедневный трафик данных, вызванный BOINC.</string>
   <string name="prefs_network_wifi_only_header">Передавать задания только по WiFi</string>
   <string name="prefs_autostart_header">Автозапуск</string>
+  <string name="prefs_show_notification_notices_header">Показывать уведомления о поступлении новых сообщений</string>
+  <string name="prefs_show_notification_suspended_header">Показывать уведомление когда приостановлено</string>
   <string name="prefs_cpu_number_cpus_header">Используемые ядра процессора</string>
   <string name="prefs_cpu_number_cpus_description">Ограничивает количество ядер процессора, которые использует BOINC для расчётов.</string>
   <string name="prefs_cpu_other_load_suspension_header">Пауза при использовании процессора выше</string>
-  <string name="prefs_cpu_other_load_suspension_description">Определяет, когда BOINC останавливает расчёты из-за использования процессора другими приложениями.</string>
+  <string name="prefs_cpu_other_load_suspension_description">Определяет, когда BOINC приостанавливает расчёты из-за использования процессора другими приложениями.</string>
   <string name="prefs_cpu_time_max_header">Предельное время процессора</string>
   <string name="prefs_cpu_time_max_description">Ограничивает время процессора, которое использует BOINC для расчётов.</string>
   <string name="prefs_memory_max_idle_header">Ограничение ОЗУ</string>
@@ -138,12 +197,15 @@
   <string name="prefs_unit_gb">ГБ</string>
   <string name="prefs_unit_pct">%</string>
   <string name="prefs_unit_celcius">°C</string>
+  <string name="prefs_unit_seconds">сек</string>
+  <!--projects tab strings-->
   <string name="projects_loading">Чтение проектов…</string>
   <string name="projects_add">Добавить проект</string>
   <string name="projects_icon">Значок проекта</string>
   <string name="projects_credits_header">Очки:</string>
   <string name="projects_credits_host_header">(на этом устройстве)</string>
   <string name="projects_credits_user_header">(всего)</string>
+  <!--project status strings-->
   <string name="projects_status_suspendedviagui">Приостановлен пользователем</string>
   <string name="projects_status_dontrequestmorework">Не запрашивать новые задания</string>
   <string name="projects_status_ended">Проект завершён - ОК для удаления</string>
@@ -152,6 +214,7 @@
   <string name="projects_status_schedrpcinprogress">Производится запрос информации у планировщика</string>
   <string name="projects_status_trickleuppending">Ожидание промежуточной отправки</string>
   <string name="projects_status_backoff">Связь по расписанию:</string>
+  <!--project controls-->
   <string name="projects_control_dialog_title">Команды проекта:</string>
   <string name="projects_control_visit_website">Посетить веб-сайт</string>
   <string name="projects_control_update">Обновить</string>
@@ -164,16 +227,20 @@
   <string name="projects_control_dialog_title_acctmgr">Команды менеджера проектов:</string>
   <string name="projects_control_sync_acctmgr">Синхронизировать</string>
   <string name="projects_control_remove_acctmgr">Отключить</string>
+  <!--project confirm dialog-->
   <string name="projects_confirm_detach_title">Удалить проект?</string>
   <string name="projects_confirm_detach_message">Вы действительно хотите удалить</string>
   <string name="projects_confirm_detach_message2">из BOINC?</string>
   <string name="projects_confirm_detach_confirm">Удалить</string>
   <string name="projects_confirm_reset_title">Перезапустить проект</string>
   <string name="projects_confirm_reset_message">Вы действительно хотите перезапустить</string>
+  <string name="projects_confirm_reset_message2">\?</string>
   <string name="projects_confirm_reset_confirm">Сбросить</string>
   <string name="projects_confirm_remove_acctmgr_title">Отключить менеджер проектов</string>
   <string name="projects_confirm_remove_acctmgr_message">Вы уверены, что хотите прекратить использование</string>
+  <string name="projects_confirm_remove_acctmgr_message2">\?</string>
   <string name="projects_confirm_remove_acctmgr_confirm">Отключить</string>
+  <!--tasks tab strings-->
   <string name="tasks_header_name">Название задания:</string>
   <string name="tasks_header_elapsed_time">Затрачено времени:</string>
   <string name="tasks_header_project_paused">(приостановлено)</string>
@@ -194,11 +261,13 @@
   <string name="tasks_custom_suspended_via_gui">приостановлено</string>
   <string name="tasks_custom_project_suspended_via_gui">проект приостановлен</string>
   <string name="tasks_custom_ready_to_report">готово для подтверждения</string>
+  <!--confirmation dialog-->
   <string name="confirm_abort_task_title">Прервать задание?</string>
   <string name="confirm_abort_task_message">Прервать задание:</string>
   <string name="confirm_abort_task_confirm">Прервать</string>
   <string name="confirm_cancel">Отмена</string>
   <string name="confirm_image_desc">Диалог подтверждения</string>
+  <!--transfers tab strings-->
   <string name="trans_loading">Чтение списка передач…</string>
   <string name="trans_upload">Отправка</string>
   <string name="trans_download">Загрузка</string>
@@ -213,14 +282,18 @@
   <string name="confirm_abort_trans_title">Прервать передачу?</string>
   <string name="confirm_abort_trans_message">Прервать файл:</string>
   <string name="confirm_abort_trans_confirm">Прервать</string>
+  <!--notices tab strings-->
   <string name="notices_loading">Чтение уведомлений…</string>
+  <!--eventlog tab strings-->
   <string name="eventlog_loading">Загрузка сообщений журнала…</string>
   <string name="eventlog_client_header">Сообщения клиента</string>
   <string name="eventlog_gui_header">Сообщения GUI</string>
   <string name="eventlog_copy_toast">Журнал скопирован в буфер обмена.</string>
   <string name="eventlog_email_subject">Журнал событий для BOINC на Android:</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>
@@ -233,12 +306,14 @@
   <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">Ожидание увеличения уровня заряда батареи.</string>
   <string name="suspend_battery_charging_long">Расчёты возобновятся, когда заряд батареи достигнет</string>
+  <string name="suspend_battery_charging_long2"></string>
   <string name="suspend_battery_charging_current">в данный момент</string>
   <string name="suspend_battery_overheating">Ожидание охлаждения батареи</string>
   <string name="suspend_user_req">Возобновление расчётов…</string>
   <string name="suspend_network_user_req">вручную.</string>
+  <!--rpc reasons-->
   <string name="rpcreason_userreq">Запрошено пользователем</string>
   <string name="rpcreason_needwork">Запросить задания</string>
   <string name="rpcreason_resultsdue">Сообщить о завершённых заданиях</string>
@@ -247,6 +322,7 @@
   <string name="rpcreason_init">Инициализация проекта</string>
   <string name="rpcreason_projectreq">Запрошено проектом</string>
   <string name="rpcreason_unknown">Неизвестная причина</string>
+  <!--menu-->
   <string name="menu_refresh">Обновить</string>
   <string name="menu_emailto">Отправить письмом</string>
   <string name="menu_copy">Копировать в буфер обмена</string>
@@ -256,10 +332,29 @@
   <string name="menu_run_mode_enable">Возобновить</string>
   <string name="menu_about">О</string>
   <string name="menu_help">Справка</string>
+  <!--about dialog-->
   <string name="about_button">Вернуться</string>
   <string name="about_title">О</string>
   <string name="about_name">BOINC</string>
   <string name="about_version">Версия</string>
   <string name="about_name_long">BOINC - Berkeley Open Infrastructure for Network Computing\nОткрытая Инфраструктура для Распределенных Вычислений университета Беркли</string>
   <string name="about_copyright">© 2003-2013 Калифорнийский университет, Беркли.\nВсе права защищены.</string>
+  <string name="about_copyright_reserved">Все права защищены.</string>
+  <string name="about_credits">Спасибо за поддержку Институту гравитационной физики Макса Планка, Корпорации IBM и Корпорации HTC.</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">Обнаружено приложение добровольных вычислений</string>
+  <string name="nonexcl_dialog_text">Ещё одно приложение добровольных вычислений работает на этом устройстве. Одновременно может работать только одна версия.</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 для выполнения научных расчётов. Ты тоже можешь принять участие! Скачай приложение здесь: %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 490c4fd..b43ceba 100644
--- a/android/BOINC/res/values-sk/strings.xml
+++ b/android/BOINC/res/values-sk/strings.xml
@@ -1,3 +1,361 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-</resources>
\ No newline at end of file
+  <!--app global-->
+  <string name="app_name">BOINC</string>
+  <!--generic. used by multiple Activities/tabs-->
+  <string name="generic_loading">Načítava sa! Prosím čakajte...</string>
+  <string name="generic_button_continue">Pokračovať</string>
+  <string name="generic_button_finish">Dokončiť</string>
+  <!--attach project-->
+  <!--selection list-->
+  <string name="attachproject_list_desc">Zvoľte vedecké projekty, ktorým chcete pomôcť:</string>
+  <string name="attachproject_list_header">Zvoľte projekt</string>
+  <string name="attachproject_list_manual_button">Pridať projekt pomocou URL</string>
+  <string name="attachproject_list_manual_dialog_title">Zadajte URL projektu:</string>
+  <string name="attachproject_list_manual_dialog_button">Pripojiť sa k projektu</string>
+  <string name="attachproject_list_manual_no_url">Prosím zadajte URL projektu</string>
+  <string name="attachproject_list_acctmgr_button">Pridať Správcu konta.</string>
+  <string name="attachproject_list_no_internet">Žiadne pripojenie k Internetu</string>
+  <!--credential input-->
+  <string name="attachproject_credential_input_sing_desc">Uveďte údaje o účte</string>
+  <string name="attachproject_credential_input_desc">Uveďte údaje o účte pre vybrané projekty:</string>
+  <string name="attachproject_credential_input_show_pwd">Ukázať heslo</string>
+  <string name="attachproject_individual_credential_input">Pripojiť projekty individuálne</string>
+  <!--conflicts-->
+  <string name="attachproject_conflicts_desc">Nastali problémi pri pripojení výskumných projektov:</string>
+  <string name="attachproject_conflict_undefined">Pripojenie sa nepodarilo</string>
+  <string name="attachproject_conflict_not_unique">Účet existuje s iným heslom</string>
+  <string name="attachproject_conflict_bad_password">Nesprávne heslo</string>
+  <string name="attachproject_conflict_unknown_user">Účet neexistuje</string>
+  <string name="attachproject_conflict_unknown_user_creation_disabled">Účet neexistuje, navštívte stránku projektu na registráciu</string>
+  <!--working-->
+  <string name="attachproject_working_attaching">Pripája sa</string>
+  <!--e.g. Attaching Einstein at Home-->
+  <!--hints-->
+  <string name="attachproject_hints_header">Pomôcka</string>
+  <!--e.g. Hint 1/2-->
+  <string name="attachproject_hint_contribtion_header">Ako pomôcť:</string>
+  <string name="attachproject_hint_contribtion_wifi">1. Pripojiť k WiFi</string>
+  <string name="attachproject_hint_contribtion_charger">2. Pripojte nabíjačku</string>
+  <string name="attachproject_hint_contribtion_screen">3. Vypnite obrazovku</string>
+  <string name="attachproject_hint_projectwebsite_header">Navštívte stránky projektov na:</string>
+  <string name="attachproject_hint_projectwebsite_science">Zistiť viac o vede</string>
+  <string name="attachproject_hint_projectwebsite_stats">Skontrolovať štatistiky</string>
+  <string name="attachproject_hint_projectwebsite_community">Buďte v kontakte s ďalšími dobrovoľníkmi</string>
+  <string name="attachproject_hint_platforms_header">BOINC je k dispozícii aj pre váš počítač alebo laptop. Navštívte boinc.berkley.edu pre viac informácií.</string>
+  <!--project login-->
+  <string name="attachproject_login_loading">Pripájanie na server projektu…</string>
+  <string name="attachproject_login_image_description">Logo projektu.</string>
+  <string name="attachproject_login_header_general_area">Všeobecná oblasť:</string>
+  <string name="attachproject_login_header_specific_area">Špecifická oblasť:</string>
+  <string name="attachproject_login_header_description">Popis:</string>
+  <string name="attachproject_login_header_home">Domovská stránka:</string>
+  <string name="attachproject_login_header_url">Stránka:</string>
+  <string name="attachproject_login_header_platform">Android:</string>
+  <string name="attachproject_login_platform_supported">Projekt podporuje tento typ zariadenia</string>
+  <string name="attachproject_login_platform_not_supported">Projekt nepodporuje tento typ zariadenia</string>
+  <string name="attachproject_login_category_terms_of_use">Podmienky používania </string>
+  <string name="attachproject_login_accept_terms_of_use">Vytvorením účtu súhlasíte s hore uvedenými podmienkami používania.</string>
+  <string name="attachproject_login_category_login">Prihlásiť sa s existujúcim účtom</string>
+  <string name="attachproject_login_header_id_email">e-mail</string>
+  <string name="attachproject_login_header_id_name">Meno:</string>
+  <string name="attachproject_login_header_pwd">Heslo:</string>
+  <string name="attachproject_login_category_creation">Nový v</string>
+  <string name="attachproject_login_header_creation_enabled">Zaregistrujte sa, aby ste sa mohli pridať:</string>
+  <string name="attachproject_login_header_creation_client_disabled">Navštívte stránku projektu na vytvorenie účtu:</string>
+  <string name="attachproject_login_header_creation_disabled">Tento projekt momentálne neakceptuje nové účty.</string>
+  <string name="attachproject_login_button_registration">Registrácia</string>
+  <string name="attachproject_login_button_login">Prihlásiť sa</string>
+  <string name="attachproject_login_button_forgotpw">Zabudnuté heslo</string>
+  <string name="attachproject_login_error_toast">Kontaktovanie projektu zlyhalo!</string>
+  <string name="attachproject_login_attached">Pripojené</string>
+  <!--project registration-->
+  <string name="attachproject_registration_header">Registrácia účtu na</string>
+  <string name="attachproject_registration_header_url">Projekt:</string>
+  <string name="attachproject_registration_header_email">E-mail:</string>
+  <string name="attachproject_registration_header_username">Meno:</string>
+  <string name="attachproject_registration_header_teamname">Tím:</string>
+  <string name="attachproject_registration_header_pwd">Heslo:</string>
+  <string name="attachproject_registration_header_pwd_confirm">...Zopakujte:</string>
+  <string name="attachproject_registration_button">Vytvoriť</string>
+  <!--account manager-->
+  <string name="attachproject_acctmgr_list_desc">Použiť správcu účtu BOINC na spravovanie viacerých projektov</string>
+  <string name="attachproject_acctmgr_header">Pridať správcu účtu</string>
+  <string name="attachproject_acctmgr_header_url">URL</string>
+  <string name="attachproject_acctmgr_header_name">Používateľ:</string>
+  <string name="attachproject_acctmgr_header_pwd">Heslo:</string>
+  <string name="attachproject_acctmgr_header_pwd_confirm">...Zopakujte:</string>
+  <string name="attachproject_acctmgr_button">Pridať</string>
+  <!--error strings-->
+  <string name="attachproject_error_wrong_name">Používateľ nenájdený.</string>
+  <string name="attachproject_error_short_pwd">Heslo je príliš krátke</string>
+  <string name="attachproject_error_no_internet">Pripojenie zlyhalo</string>
+  <string name="attachproject_error_pwd_no_match">Heslá sa nezhodujú</string>
+  <string name="attachproject_error_pwd_no_retype">Prosím, napíšte heslo znovu</string>
+  <string name="attachproject_error_no_url">Prosím zadajte URL</string>
+  <string name="attachproject_error_no_email">Prosím zadajte e-mailovú adresu</string>
+  <string name="attachproject_error_no_pwd">Prosím zadajte heslo</string>
+  <string name="attachproject_error_no_name">Prosím zadajte používateľské meno</string>
+  <string name="attachproject_error_unknown">zlyhalo</string>
+  <string name="attachproject_error_bad_username">Používateľské meno bolo odmietnuté</string>
+  <string name="attachproject_error_email_in_use">Emailová adresa sa už používa</string>
+  <string name="attachproject_error_project_down">Projekt je offline</string>
+  <string name="attachproject_error_email_bad_syntax">Emailová adresa bola odmietnutá</string>
+  <string name="attachproject_error_bad_pwd">Heslo bolo odmietnuté</string>
+  <string name="attachproject_error_creation_disabled">Vytváranie účtov na tomto projekte je pozastavené</string>
+  <string name="attachproject_error_invalid_url">Neplatná URL</string>
+  <!--working activity-->
+  <string name="attachproject_working_back_button">Späť</string>
+  <string name="attachproject_working_finish_button">Dokončiť</string>
+  <string name="attachproject_working_check_desc">Úspešné</string>
+  <string name="attachproject_working_failed_desc">Zlyhalo</string>
+  <string name="attachproject_working_ongoing">…</string>
+  <string name="attachproject_working_finished">.</string>
+  <string name="attachproject_working_description">:</string>
+  <string name="attachproject_working_connect">Pripojiť</string>
+  <string name="attachproject_working_verify">Overiť účet</string>
+  <string name="attachproject_working_register">Zaregistrovať účet</string>
+  <string name="attachproject_working_login">Prihlásiť sa</string>
+  <string name="attachproject_working_acctmgr">Pridať správcu účtu</string>
+  <string name="attachproject_working_acctmgr_sync">Sychronizovať</string>
+  <!--main activity-->
+  <string name="main_noproject_warning">Ťuknite sem na výber projektu</string>
+  <string name="main_error">Ojoj!</string>
+  <string name="main_error_long">...toto by sa nemalo stávať!\nKliknite na ikonu a skúste to znovu.</string>
+  <string name="main_title_icon_desc">Ikona BOINC</string>
+  <!--tab names-->
+  <string name="tab_status">Stav</string>
+  <string name="tab_projects">Projekty</string>
+  <string name="tab_tasks">Úlohy</string>
+  <string name="tab_transfers">Prenosy</string>
+  <string name="tab_preferences">Nastavenia</string>
+  <string name="tab_notices">Oznamy</string>
+  <string name="tab_desc">Navigácia</string>
+  <!--status strings-->
+  <string name="status_running">Výpočty</string>
+  <string name="status_running_long">Ďakujeme vám za účasť</string>
+  <string name="status_paused">Pozastaviť</string>
+  <string name="status_idle">Žiadne úlohy</string>
+  <string name="status_idle_long">Čakám na úlohy...</string>
+  <string name="status_computing_disabled">Pozastavené</string>
+  <string name="status_computing_disabled_long">Stlačte Play na obnovenie siete a výpočtov.</string>
+  <string name="status_launching">Spúšťa sa...</string>
+  <string name="status_noproject">Vyberte si projekt ktorého za chcete zúčastniť.</string>
+  <string name="status_closing">Zatvára sa...</string>
+  <string name="status_benchmarking">Meria sa výkon...</string>
+  <string name="status_image_description">súbor projektu</string>
+  <!--preferences tab strings-->
+  <string name="prefs_loading">Načítanie preferencií...</string>
+  <string name="prefs_submit_button">Uložiť</string>
+  <string name="prefs_dialog_title">Zadajte novú hodnotu:</string>
+  <string name="prefs_dialog_title_selection">Vybrať:</string>
+  <string name="prefs_category_general">Všeobecné</string>
+  <string name="prefs_category_network">Sieť</string>
+  <string name="prefs_category_power">Energia</string>
+  <string name="prefs_category_cpu">Procesor</string>
+  <string name="prefs_category_storage">Úložisko</string>
+  <string name="prefs_category_memory">Pamäť</string>
+  <string name="prefs_category_debug">Ladenie</string>
+  <string name="prefs_show_advanced_header">Zobraziť pokročilé nastavenia...</string>
+  <string name="prefs_suspend_when_screen_on">Pozastaviť výpočty keď je obrazovka zapnutá</string>
+  <string name="prefs_stationary_device_mode_header">Mód neprenosného zariadenia</string>
+  <string name="prefs_stationary_device_mode_description">Povolí výpočty bez ohľadu na nastavenia napájania. Zapínajte len pokiaľ ide o bezbatériové zariadenie.</string>
+  <string name="prefs_power_source_header">Zdroje energie na výpočty</string>
+  <string name="prefs_power_source_description">Zvolí zdroje napájania, ktoré BOINC môže využívať na výpočty.</string>
+  <string name="prefs_power_source_ac">Zásuvka</string>
+  <string name="prefs_power_source_usb">Pripojenie USB</string>
+  <string name="prefs_power_source_wireless">Bezdrôtová nabíjačka</string>
+  <string name="prefs_power_source_battery">Batéria</string>
+  <string name="battery_charge_min_pct_header">Minimálna úroveň stavu batérie</string>
+  <string name="battery_charge_min_pct_description">BOINC pozastaví výpočty, pokiaľ stav batérie klesne pod danú úroveň.</string>
+  <string name="battery_temperature_max_header">Maximálna teplota batérie</string>
+  <string name="battery_temperature_max_description">BOINC pozastaví výpočty, pokiaľ stav batérie klesne pod zadanú úroveň. Zmena tejto hodnoty sa neodporúča.</string>
+  <string name="prefs_disk_max_pct_header">Maximum použitého úložného priestoru</string>
+  <string name="prefs_disk_max_pct_description">Koľko percent úložného priestoru na vašom zariadení môže BOINC využívať?</string>
+  <string name="prefs_disk_min_free_gb_header">Minimum voľného miesta</string>
+  <string name="prefs_disk_min_free_gb_description">Koľko z úložného priestoru vášho zariadenia by malo ostať voľného?</string>
+  <string name="prefs_disk_access_interval_header">Interval prístupov</string>
+  <string name="prefs_disk_access_interval_description">Odporučiť interval medzi prístupmi na disk</string>
+  <string name="prefs_network_daily_xfer_limit_mb_header">Denný limit prenosov</string>
+  <string name="prefs_network_daily_xfer_limit_mb_description">Nastaví obmedzenia prenosu súborov pre BOINC.</string>
+  <string name="prefs_network_wifi_only_header">Prenos úloh len pri pripojení k WiFi</string>
+  <string name="prefs_autostart_header">Automatický štart</string>
+  <string name="prefs_show_notification_notices_header">Zobraziť upozornenia pri nových správach</string>
+  <string name="prefs_show_notification_suspended_header">Zobraziť upozornenie pri pozastavení</string>
+  <string name="prefs_cpu_number_cpus_header">Používané jadrá procesoru</string>
+  <string name="prefs_cpu_number_cpus_description">Obmedzí počet jadier procesoru ktoré BOINC používa pri výpočtoch</string>
+  <string name="prefs_cpu_other_load_suspension_header">Pozastaví pri využití procesoru nad</string>
+  <string name="prefs_cpu_other_load_suspension_description">Určí, kedy BOINC pozastaví výpočty kvôli využitiu procesora inými aplikáciami.</string>
+  <string name="prefs_cpu_time_max_header">Limit procesoru</string>
+  <string name="prefs_cpu_time_max_description">Obmedzí procesorový čas, ktorý BOINC využíva na výpočty.</string>
+  <string name="prefs_memory_max_idle_header">Limit RAM</string>
+  <string name="prefs_memory_max_idle_description">Nastaví koľko RAM môžu úlohy využiť</string>
+  <string name="prefs_client_log_flags_header">Značky záznamov BOINC klienta</string>
+  <string name="prefs_gui_log_level_header">Úroveň záznamu GUI</string>
+  <string name="prefs_gui_log_level_description">Špecifikuje stručnosť GUI záznamov</string>
+  <string name="prefs_unit_mb">MB</string>
+  <string name="prefs_unit_gb">GB</string>
+  <string name="prefs_unit_pct">%</string>
+  <string name="prefs_unit_celcius">°C</string>
+  <string name="prefs_unit_seconds">sekúnd</string>
+  <!--projects tab strings-->
+  <string name="projects_loading">Načítanie projektov...</string>
+  <string name="projects_add">Pripojiť sa k projektu</string>
+  <string name="projects_icon">Ikona projektu</string>
+  <string name="projects_credits_header">Kredit:</string>
+  <string name="projects_credits_host_header">(na tomto zariadení)</string>
+  <string name="projects_credits_user_header">(spolu)</string>
+  <!--project status strings-->
+  <string name="projects_status_suspendedviagui">Pozastavené používateľom</string>
+  <string name="projects_status_dontrequestmorework">Nebudú získané nové úlohy</string>
+  <string name="projects_status_ended">Projekt je ukončený - je možné sa od neho odpojiť</string>
+  <string name="projects_status_detachwhendone">Bude odpojený po skončení úloh</string>
+  <string name="projects_status_schedrpcpending">Žiadosť plánovača nevyriešená</string>
+  <string name="projects_status_schedrpcinprogress">Spracováva sa požiadavka plánovača</string>
+  <string name="projects_status_trickleuppending">Rýchla správa o stave čaká na odoslanie</string>
+  <string name="projects_status_backoff">Komunikácia je naplánovaná o:</string>
+  <!--project controls-->
+  <string name="projects_control_dialog_title">Príkazy projektu:</string>
+  <string name="projects_control_visit_website">Navštíviť stránku</string>
+  <string name="projects_control_update">Aktualizovať</string>
+  <string name="projects_control_remove">Odobrať</string>
+  <string name="projects_control_suspend">Pozastaviť</string>
+  <string name="projects_control_resume">Pokračovať</string>
+  <string name="projects_control_nonewtasks">Žiadne nové úlohy</string>
+  <string name="projects_control_allownewtasks">Povoliť nové úlohy</string>
+  <string name="projects_control_reset">Resetovať</string>
+  <string name="projects_control_dialog_title_acctmgr">Príkazy Správcu konta:</string>
+  <string name="projects_control_sync_acctmgr">Sychronizovať</string>
+  <string name="projects_control_remove_acctmgr">Deaktivovať</string>
+  <!--project confirm dialog-->
+  <string name="projects_confirm_detach_title">Odstrániť projekt?</string>
+  <string name="projects_confirm_detach_message">Skutočne chcete odstrániť</string>
+  <string name="projects_confirm_detach_message2">z BOINC?</string>
+  <string name="projects_confirm_detach_confirm">Odobrať</string>
+  <string name="projects_confirm_reset_title">Resetovať projekt</string>
+  <string name="projects_confirm_reset_message">Skutočne chcete resetovať</string>
+  <string name="projects_confirm_reset_message2">\?</string>
+  <string name="projects_confirm_reset_confirm">Resetovať</string>
+  <string name="projects_confirm_remove_acctmgr_title">Deaktivovať Správcu konta</string>
+  <string name="projects_confirm_remove_acctmgr_message">Skutočne chcete prestať používať</string>
+  <string name="projects_confirm_remove_acctmgr_message2">\?</string>
+  <string name="projects_confirm_remove_acctmgr_confirm">Deaktivovať</string>
+  <!--tasks tab strings-->
+  <string name="tasks_header_name">Názov úlohy:</string>
+  <string name="tasks_header_elapsed_time">Uplynutý čas:</string>
+  <string name="tasks_header_project_paused">(pozastavené)</string>
+  <string name="tasks_header_deadline">Odoslať do:</string>
+  <string name="tasks_result_new">nový</string>
+  <string name="tasks_result_files_downloading">čakanie na stiahnutie</string>
+  <string name="tasks_result_files_downloaded">sťahovanie dokončené</string>
+  <string name="tasks_result_compute_error">chyba výpočtu</string>
+  <string name="tasks_result_files_uploading">odosielanie</string>
+  <string name="tasks_result_files_uploaded">odosielanie dokončené</string>
+  <string name="tasks_result_aborted">zrušené</string>
+  <string name="tasks_result_upload_failed">odosielanie zlyhalo</string>
+  <string name="tasks_active_uninitialized">pripravené</string>
+  <string name="tasks_active_executing">beží</string>
+  <string name="tasks_active_suspended">pozastavené</string>
+  <string name="tasks_active_abort_pending">pozastavuje sa</string>
+  <string name="tasks_active_quit_pending">pozastavuje sa</string>
+  <string name="tasks_custom_suspended_via_gui">pozastavené</string>
+  <string name="tasks_custom_project_suspended_via_gui">projekt pozastavený</string>
+  <string name="tasks_custom_ready_to_report">pripravená na odoslanie</string>
+  <!--confirmation dialog-->
+  <string name="confirm_abort_task_title">Zrušiť úlohu?</string>
+  <string name="confirm_abort_task_message">Zrušiť úlohu:</string>
+  <string name="confirm_abort_task_confirm">Zrušiť</string>
+  <string name="confirm_cancel">Späť</string>
+  <string name="confirm_image_desc">Potvrdenie</string>
+  <!--transfers tab strings-->
+  <string name="trans_loading">Príprava prenosov...</string>
+  <string name="trans_upload">Odosielanie</string>
+  <string name="trans_download">Sťahovanie</string>
+  <string name="trans_retryin">zopakuje sa o </string>
+  <string name="trans_failed">zlyhalo</string>
+  <string name="trans_suspended">pozastavené</string>
+  <string name="trans_active">prebieha</string>
+  <string name="trans_pending">čaká</string>
+  <string name="trans_projectbackoff">odsunutie projektu</string>
+  <string name="trans_header_name">Súbor:</string>
+  <string name="trans_control_retry">Zopakovať prenosy</string>
+  <string name="confirm_abort_trans_title">Zrušiť prenos?</string>
+  <string name="confirm_abort_trans_message">Zrušiť súbor:</string>
+  <string name="confirm_abort_trans_confirm">Zrušiť</string>
+  <!--notices tab strings-->
+  <string name="notices_loading">Načítanie správ...</string>
+  <!--eventlog tab strings-->
+  <string name="eventlog_loading">Načítanie správ záznamu...</string>
+  <string name="eventlog_client_header">Správy klienta</string>
+  <string name="eventlog_gui_header">Správy GUI</string>
+  <string name="eventlog_copy_toast">Záznamy skopírované do schránky.</string>
+  <string name="eventlog_email_subject">Záznamy pre BOINC na Androide:</string>
+  <!--suspend reasons-->
+  <string name="suspend_unknown">Počítanie je pozastavené.</string>
+  <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_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>
+  <string name="suspend_noinput">Žiadna nedávna činnosť užívateľa.</string>
+  <string name="suspend_delay">Odloženie inicializácie.</string>
+  <string name="suspend_exclusiveapp">Beží výhradná aplikácia.</string>
+  <string name="suspend_cpu">Vaše zariadenie je zaneprázdnené inými aplikáciami.</string>
+  <string name="suspend_network_quota">BOINC dosiahol limit v prenose po sieti.</string>
+  <string name="suspend_os">Zastavené Androidom.</string>
+  <string name="suspend_wifi">Nepripojené k WiFi.</string>
+  <string name="suspend_battery_charging">Čakanie na nabitie batérie.</string>
+  <string name="suspend_battery_charging_long">Výpočty sa obnovia, keď nabitie batérie dosiahne</string>
+  <string name="suspend_battery_charging_long2"></string>
+  <string name="suspend_battery_charging_current">momentálne</string>
+  <string name="suspend_battery_overheating">Čakanie na ochladenie batérie</string>
+  <string name="suspend_user_req">Obnovovanie výpočtov...</string>
+  <string name="suspend_network_user_req">manuálne.</string>
+  <!--rpc reasons-->
+  <string name="rpcreason_userreq">Vyžiadané používateľom</string>
+  <string name="rpcreason_needwork">Získať ďalšiu prácu</string>
+  <string name="rpcreason_resultsdue">Nahlásiť dokončené úlohy</string>
+  <string name="rpcreason_trickleup">Odoslať rýchlu správu o stave</string>
+  <string name="rpcreason_acctmgrreq">Vyžiadané Správcom konta</string>
+  <string name="rpcreason_init">Prvotné nastavenie projektu</string>
+  <string name="rpcreason_projectreq">Vyžiadané projektom</string>
+  <string name="rpcreason_unknown">Neznámy dôvod</string>
+  <!--menu-->
+  <string name="menu_refresh">Obnoviť</string>
+  <string name="menu_emailto">Poslať ako email</string>
+  <string name="menu_copy">Kopírovať do schránky</string>
+  <string name="menu_eventlog">Záznam udalostí</string>
+  <string name="menu_exit">Vypnúť BOINC</string>
+  <string name="menu_run_mode_disable">Pozastaviť</string>
+  <string name="menu_run_mode_enable">Pokračovať</string>
+  <string name="menu_about">O</string>
+  <string name="menu_help">Pomoc</string>
+  <!--about dialog-->
+  <string name="about_button">Návrat</string>
+  <string name="about_title">O</string>
+  <string name="about_name">BOINC</string>
+  <string name="about_version">Verzia</string>
+  <string name="about_name_long">(Otvorená infraštruktúra pre sieťové výpočty z Berkeley)
+(Berkeley Open Infrastructure for Network Computing)</string>
+  <string name="about_copyright">\u00A9 2003–2014 Kalifornská Univerzita, Berkeley.</string>
+  <string name="about_copyright_reserved">Všetky práva vyhradené.</string>
+  <string name="about_credits">Vďaka Inštitútu gravitačnej fyziky Maxa Plancka, IBM Corporation a HTC Corporation za ich podporu.</string>
+  <!--notice notification-->
+  <string name="notice_notification_single_header">Nová správa od</string>
+  <!--e.g. New notice from SETI at HOME-->
+  <string name="notice_notification_multiple_header">nové správy</string>
+  <!--e.g. 3 new notices-->
+  <!--multi BOINC compitability-->
+  <string name="nonexcl_dialog_header">Bola nájdená aplikácia na dobrovoľnícke výpočty</string>
+  <string name="nonexcl_dialog_text">Na tomto zariadení už beží iná výpočtová aplikácia; naraz môže bežať len jedna verzia.</string>
+  <string name="nonexcl_dialog_exit">Ukončiť</string>
+  <!--social integration-->
+  <string name="social_invite_button">Pozvať priateľov</string>
+  <string name="social_invite_intent_title">Akým spôsobom chcete zdieľať?</string>
+  <string name="social_invite_content_title">Riešim vedu na mojom smartfóne!</string>
+  <string name="social_invite_content_body">Používam %1$s na výpočty pre vedu. Môžeš aj ty, len si stiahni aplikáciu z %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-tr/strings.xml b/android/BOINC/res/values-tr/strings.xml
index 0cedec9..0941ad7 100644
--- a/android/BOINC/res/values-tr/strings.xml
+++ b/android/BOINC/res/values-tr/strings.xml
@@ -1,7 +1,14 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--app global-->
   <string name="app_name">BOINC</string>
+  <!--generic. used by multiple Activities/tabs-->
   <string name="generic_loading">Yükleniyor! Lütfen bekleyin...</string>
+  <string name="generic_button_continue">Devam</string>
+  <string name="generic_button_finish">Bitir</string>
+  <!--attach project-->
+  <!--selection list-->
+  <string name="attachproject_list_desc">Katkıda bulunmak istediğiniz bilimsel projeleri seçin</string>
   <string name="attachproject_list_header">Bir proje seçin:</string>
   <string name="attachproject_list_manual_button">Adres ile proje ekle</string>
   <string name="attachproject_list_manual_dialog_title">Proje adresini girin:</string>
@@ -9,17 +16,45 @@
   <string name="attachproject_list_manual_no_url">Lütfen proje adresini girin</string>
   <string name="attachproject_list_acctmgr_button">Hesap Yöneticisi ekle</string>
   <string name="attachproject_list_no_internet">İnternet bağlantısı yok</string>
+  <!--credential input-->
+  <string name="attachproject_credential_input_sing_desc">Hesap bilgilerini girin</string>
+  <string name="attachproject_credential_input_desc">Seçilen proje için hesap bilgilerini girin</string>
+  <string name="attachproject_credential_input_show_pwd">Şifreyi göster</string>
+  <string name="attachproject_individual_credential_input">Bireysel proje ekle</string>
+  <!--conflicts-->
+  <string name="attachproject_conflicts_desc">Bilimsel projelere eklenirken sorunlar oluştu:</string>
+  <string name="attachproject_conflict_undefined">Bağlantı kurulamadı</string>
+  <string name="attachproject_conflict_not_unique">Hesap farklı bir şifreyle mevcut</string>
+  <string name="attachproject_conflict_bad_password">Şifre hatalı</string>
+  <string name="attachproject_conflict_unknown_user">Hesap yok</string>
+  <string name="attachproject_conflict_unknown_user_creation_disabled">Hesap yok, kayıt için proje web sitesini ziyaret edin</string>
+  <!--working-->
+  <string name="attachproject_working_attaching">Ekleniyor</string>
+  <!--e.g. Attaching Einstein at Home-->
+  <!--hints-->
+  <string name="attachproject_hints_header">İpucu</string>
+  <!--e.g. Hint 1/2-->
+  <string name="attachproject_hint_contribtion_header">Nasıl katkı sağlanır:</string>
+  <string name="attachproject_hint_contribtion_wifi">1. Kablosuz Ağa Bağlan</string>
+  <string name="attachproject_hint_contribtion_charger">2. Şarja Cihazını Takın</string>
+  <string name="attachproject_hint_contribtion_screen">3. Ekranı Kapat</string>
+  <string name="attachproject_hint_projectwebsite_header">Proje web sitelerine git:</string>
+  <string name="attachproject_hint_projectwebsite_science">Bilim hakkında daha fazlasını öğren</string>
+  <string name="attachproject_hint_projectwebsite_stats">Katkı istatistiklerini gör</string>
+  <string name="attachproject_hint_projectwebsite_community">Diğer gönüllülerle bağlantıya geç</string>
+  <string name="attachproject_hint_platforms_header">BOINC bilgisayarınız  için kullanılabilir, daha fazla bilgi için boinc.berkeley.edu adresini ziyaret edin.</string>
+  <!--project login-->
   <string name="attachproject_login_loading">Proje sunucusuna bağlanılıyor...</string>
   <string name="attachproject_login_image_description">Proje logosu.</string>
   <string name="attachproject_login_header_general_area">Genel alan:</string>
   <string name="attachproject_login_header_specific_area">Özel alan:</string>
   <string name="attachproject_login_header_description">Tanım:</string>
-  <string name="attachproject_login_header_home">Sahibi:</string>
+  <string name="attachproject_login_header_home">Anasayfa:</string>
   <string name="attachproject_login_header_url">Site:</string>
   <string name="attachproject_login_header_platform">Android:</string>
   <string name="attachproject_login_platform_supported">Bu proje Android cihazlarını destekliyor</string>
   <string name="attachproject_login_platform_not_supported">Bu proje Android cihazlarını desteklemiyor</string>
-  <string name="attachproject_login_category_terms_of_use">"Kural ve politikalar: "</string>
+  <string name="attachproject_login_category_terms_of_use">Kural ve politikalar: </string>
   <string name="attachproject_login_accept_terms_of_use">Bu projede bir hesap oluşturmakla, aşağıdaki kural ve politikaları kabul etmiş oluyorsunuz.</string>
   <string name="attachproject_login_category_login">Mevcut hesap ile oturum aç</string>
   <string name="attachproject_login_header_id_email">ePosta:</string>
@@ -34,7 +69,8 @@
   <string name="attachproject_login_button_forgotpw">Parolamı unuttum</string>
   <string name="attachproject_login_error_toast">Projeyle bağlantı kurulamadı!</string>
   <string name="attachproject_login_attached">Eklendi</string>
-  <string name="attachproject_registration_header">"Hesaba kaydolma: "</string>
+  <!--project registration-->
+  <string name="attachproject_registration_header">Hesaba kaydolma: </string>
   <string name="attachproject_registration_header_url">Proje:</string>
   <string name="attachproject_registration_header_email">ePosta:</string>
   <string name="attachproject_registration_header_username">İsim:</string>
@@ -42,16 +78,20 @@
   <string name="attachproject_registration_header_pwd">Parola:</string>
   <string name="attachproject_registration_header_pwd_confirm">Yeniden yazın:</string>
   <string name="attachproject_registration_button">Oluştur</string>
+  <!--account manager-->
+  <string name="attachproject_acctmgr_list_desc">Proje eklemek ya da yönetmek için BOINC hesap yöneticisini kullan</string>
   <string name="attachproject_acctmgr_header">Hesap Yöneticisi ekle</string>
   <string name="attachproject_acctmgr_header_url">Adres</string>
   <string name="attachproject_acctmgr_header_name">Kullanıcı:</string>
   <string name="attachproject_acctmgr_header_pwd">Parola:</string>
   <string name="attachproject_acctmgr_header_pwd_confirm">Yeniden yazın:</string>
   <string name="attachproject_acctmgr_button">Ekle</string>
+  <!--error strings-->
   <string name="attachproject_error_wrong_name">Kullanıcı bulunamadı</string>
   <string name="attachproject_error_short_pwd">Parola çok kısa</string>
   <string name="attachproject_error_no_internet">Bağlantı başarısız</string>
   <string name="attachproject_error_pwd_no_match">Yazdığınız parolalar aynı değil</string>
+  <string name="attachproject_error_pwd_no_retype">Lütfen şifreyi tekrar yazın</string>
   <string name="attachproject_error_no_url">Lütfen adresi yazın</string>
   <string name="attachproject_error_no_email">Lütfen ePosta adresinizi yazın</string>
   <string name="attachproject_error_no_pwd">Lütfen bir parola yazın</string>
@@ -64,6 +104,7 @@
   <string name="attachproject_error_bad_pwd">Parola kabul edilmedi</string>
   <string name="attachproject_error_creation_disabled">Hesap oluşturma bu projede devre dışı</string>
   <string name="attachproject_error_invalid_url">Geçersiz adres</string>
+  <!--working activity-->
   <string name="attachproject_working_back_button">Geri</string>
   <string name="attachproject_working_finish_button">Tamamla</string>
   <string name="attachproject_working_check_desc">Başarılı</string>
@@ -77,9 +118,12 @@
   <string name="attachproject_working_login">Giriş yap</string>
   <string name="attachproject_working_acctmgr">Hesap yöneticisi ekle</string>
   <string name="attachproject_working_acctmgr_sync">Eşitle</string>
+  <!--main activity-->
+  <string name="main_noproject_warning">Proje seçmek için buraya dokunun.</string>
   <string name="main_error">Haydaaa</string>
   <string name="main_error_long">... bu olmamalıydı!\nYeniden denemek için simgeye dokunun.</string>
   <string name="main_title_icon_desc">BOINC simgesi</string>
+  <!--tab names-->
   <string name="tab_status">Durum</string>
   <string name="tab_projects">Projeler</string>
   <string name="tab_tasks">İşler</string>
@@ -87,7 +131,8 @@
   <string name="tab_preferences">Tercihler</string>
   <string name="tab_notices">Bildirimler</string>
   <string name="tab_desc">Gezinti</string>
-  <string name="status_running">Çalışıyor</string>
+  <!--status strings-->
+  <string name="status_running">Hesaplıyor</string>
   <string name="status_running_long">Katıldığınız için teşekkürler.</string>
   <string name="status_paused">Beklemede</string>
   <string name="status_idle">Yapacak bir görev yok</string>
@@ -99,6 +144,7 @@
   <string name="status_closing">Kapanıyor...</string>
   <string name="status_benchmarking">Test ediliyor...</string>
   <string name="status_image_description">proje resmi</string>
+  <!--preferences tab strings-->
   <string name="prefs_loading">Tercihler okunuyor...</string>
   <string name="prefs_submit_button">Kaydet</string>
   <string name="prefs_dialog_title">Yeni değeri girin:</string>
@@ -111,6 +157,15 @@
   <string name="prefs_category_memory">Bellek</string>
   <string name="prefs_category_debug">Hata kaydı</string>
   <string name="prefs_show_advanced_header">Gelişmiş tercihler ve kontrolleri görüntüle...</string>
+  <string name="prefs_suspend_when_screen_on">Ekran açıkken hesaplamayı duraklat</string>
+  <string name="prefs_stationary_device_mode_header">Sabit cihaz modu</string>
+  <string name="prefs_stationary_device_mode_description">Güç tercihlerinin hesaplanmasına izin verir. Cihazın pili yoksa etkinleştirin.</string>
+  <string name="prefs_power_source_header">Hesaplama için güç kaynakları</string>
+  <string name="prefs_power_source_description">BOINC hesaplama için kullanmasına izin verilen güç kaynakları seçer.</string>
+  <string name="prefs_power_source_ac">Duvar soketi</string>
+  <string name="prefs_power_source_usb">USB bağlantı</string>
+  <string name="prefs_power_source_wireless">Kablosuz Şarj Edici</string>
+  <string name="prefs_power_source_battery">Pil</string>
   <string name="battery_charge_min_pct_header">En az pil seviyesi</string>
   <string name="battery_charge_min_pct_description">BOINC, pil seviyesi bu değerin altına düşerse hesaplamayı duraklatır.</string>
   <string name="battery_temperature_max_header">En çok pil sıcaklığı</string>
@@ -119,14 +174,18 @@
   <string name="prefs_disk_max_pct_description">BOINC, cihazınızın yüzde olarak en fazla ne kadar depolama alanını kullanabilecek?</string>
   <string name="prefs_disk_min_free_gb_header">En az boş depolama alanı</string>
   <string name="prefs_disk_min_free_gb_description">Cihazınızda en az ne kadar depolama alanı boş bırakılacak?</string>
+  <string name="prefs_disk_access_interval_header">Erişim zaman aralığı</string>
+  <string name="prefs_disk_access_interval_description">Disk erişimleri arasında bir aralık önerir</string>
   <string name="prefs_network_daily_xfer_limit_mb_header">Günlük aktarım kotası</string>
   <string name="prefs_network_daily_xfer_limit_mb_description">BOINC\'in günlük internet kullanım kotası.</string>
   <string name="prefs_network_wifi_only_header">İşleri yalnızca WiFi\'dayken aktar</string>
   <string name="prefs_autostart_header">Cihaz açılınca otomatik başla</string>
+  <string name="prefs_show_notification_notices_header">Yeni bildirimler için uyarı göster</string>
+  <string name="prefs_show_notification_suspended_header">Askıya alındığında bildirim göster</string>
   <string name="prefs_cpu_number_cpus_header">Kullanılacak CPU çekirdekleri</string>
   <string name="prefs_cpu_number_cpus_description">BOINC\'in hesaplama için kullanabileceği işlemci (CPU) çekirdeği sayısı.</string>
   <string name="prefs_cpu_other_load_suspension_header">CPU kullanımı fazlaysa duraklat</string>
-  <string name="prefs_cpu_other_load_suspension_description">BOINC, diğer uygulamaların işlemci kullanımı bu seviyeyi aşarsa, hesaplamayı duraklatır.</string>
+  <string name="prefs_cpu_other_load_suspension_description">BOINC nedeniyle diğer uygulamaların CPU kullanımı için hesaplama duraklama zamanını belirler.</string>
   <string name="prefs_cpu_time_max_header">CPU sınırı</string>
   <string name="prefs_cpu_time_max_description">BOINC\'in hesaplama için kullanabileceği CPU gücü.</string>
   <string name="prefs_memory_max_idle_header">Bellek limiti</string>
@@ -138,12 +197,15 @@
   <string name="prefs_unit_gb">GB</string>
   <string name="prefs_unit_pct">%</string>
   <string name="prefs_unit_celcius">°C</string>
+  <string name="prefs_unit_seconds">sn</string>
+  <!--projects tab strings-->
   <string name="projects_loading">Projeler okunuyor...</string>
   <string name="projects_add">Proje ekle</string>
   <string name="projects_icon">Proje simgesi</string>
   <string name="projects_credits_header">Kredi:</string>
   <string name="projects_credits_host_header">(bu cihazda)</string>
   <string name="projects_credits_user_header">(toplam)</string>
+  <!--project status strings-->
   <string name="projects_status_suspendedviagui">Kullanıcı tarafından duraklatıldı</string>
   <string name="projects_status_dontrequestmorework">Yeni işler indirilmeyecek</string>
   <string name="projects_status_ended">Proje sona erdi - Kaldırmak için Tamam\'a dokunun</string>
@@ -152,6 +214,7 @@
   <string name="projects_status_schedrpcinprogress">Zamanlanmış istek gerçekleştiriliyor</string>
   <string name="projects_status_trickleuppending">İş ilerleme mesajı kuyrukta</string>
   <string name="projects_status_backoff">İletişim ertelendi:</string>
+  <!--project controls-->
   <string name="projects_control_dialog_title">Proje komutları:</string>
   <string name="projects_control_visit_website">Sitesine git</string>
   <string name="projects_control_update">Güncelle</string>
@@ -164,16 +227,20 @@
   <string name="projects_control_dialog_title_acctmgr">Hesap Yöneticisi komutları:</string>
   <string name="projects_control_sync_acctmgr">Eşitle</string>
   <string name="projects_control_remove_acctmgr">Devredışı bırak</string>
+  <!--project confirm dialog-->
   <string name="projects_confirm_detach_title">Proje kaldırılsın mı?</string>
-  <string name="projects_confirm_detach_message">Bu proje BOINC\'ten kaldırılsın mı:</string>
-  <string name="projects_confirm_detach_message2">"? "</string>
+  <string name="projects_confirm_detach_message">Kaldırmak istediğinizden emin misiniz?</string>
+  <string name="projects_confirm_detach_message2">BOINC\'ten? </string>
   <string name="projects_confirm_detach_confirm">Kaldır</string>
   <string name="projects_confirm_reset_title">Projeyi sıfırla</string>
   <string name="projects_confirm_reset_message">Bu proje sıfırlansın mı:</string>
+  <string name="projects_confirm_reset_message2">\?</string>
   <string name="projects_confirm_reset_confirm">Sıfırla</string>
   <string name="projects_confirm_remove_acctmgr_title">Hesap Yöneticisini devredışı bırak</string>
   <string name="projects_confirm_remove_acctmgr_message">Bu hesap yöneticisini kullanmayı bırakmak istiyor musunuz:</string>
+  <string name="projects_confirm_remove_acctmgr_message2">\?</string>
   <string name="projects_confirm_remove_acctmgr_confirm">Devredışı bırak</string>
+  <!--tasks tab strings-->
   <string name="tasks_header_name">İş adı:</string>
   <string name="tasks_header_elapsed_time">Geçen süre:</string>
   <string name="tasks_header_project_paused">(beklemede)</string>
@@ -194,15 +261,17 @@
   <string name="tasks_custom_suspended_via_gui">durakladı</string>
   <string name="tasks_custom_project_suspended_via_gui">proje duraklatıldı</string>
   <string name="tasks_custom_ready_to_report">raporlanmaya hazır</string>
+  <!--confirmation dialog-->
   <string name="confirm_abort_task_title">İş iptal edilsin mi?</string>
-  <string name="confirm_abort_task_message">Bu iş iptal edilsin mi:</string>
-  <string name="confirm_abort_task_confirm">Evet</string>
-  <string name="confirm_cancel">İptal</string>
+  <string name="confirm_abort_task_message">Bu iş iptal edilsin :</string>
+  <string name="confirm_abort_task_confirm">İptal</string>
+  <string name="confirm_cancel">Vazgeç</string>
   <string name="confirm_image_desc">Onaylama sorusu</string>
+  <!--transfers tab strings-->
   <string name="trans_loading">Aktarımlar okunuyor...</string>
-  <string name="trans_upload">Gönderme</string>
+  <string name="trans_upload">Yükleme</string>
   <string name="trans_download">İndirme</string>
-  <string name="trans_retryin">"yeniden denenecek "</string>
+  <string name="trans_retryin">yeniden denenecek </string>
   <string name="trans_failed">başarısız</string>
   <string name="trans_suspended">durakladı</string>
   <string name="trans_active">sürüyor</string>
@@ -213,14 +282,18 @@
   <string name="confirm_abort_trans_title">Aktarım iptal edilsin mi?</string>
   <string name="confirm_abort_trans_message">Bu dosyanın aktarımı iptal edilsin mi:</string>
   <string name="confirm_abort_trans_confirm">Evet</string>
+  <!--notices tab strings-->
   <string name="notices_loading">Bildirimler alınıyor...</string>
+  <!--eventlog tab strings-->
   <string name="eventlog_loading">Günlük mesajları yükleniyor...</string>
   <string name="eventlog_client_header">İstemci Mesajları</string>
   <string name="eventlog_gui_header">GUI Mesajları</string>
   <string name="eventlog_copy_toast">Günlük mesajları panoya kopyalandı.</string>
   <string name="eventlog_email_subject">BONIC Android olay günlüğü:</string>
+  <!--suspend reasons-->
   <string name="suspend_unknown">Hesaplama durakladı.</string>
   <string name="suspend_batteries">Hesaplamayı sürdürmek için cihazınızı şarja takın.</string>
+  <string name="suspend_screen_on">Hesaplamaya devam etmek için ekranı kapat.</string>
   <string name="suspend_useractive">Kullanıcı faal.</string>
   <string name="suspend_tod">Hesaplama zaman sınırlaması dışında.</string>
   <string name="suspend_bm">BOINC cihazınızı test ediyor...</string>
@@ -235,10 +308,12 @@
   <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_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>
   <string name="suspend_battery_overheating">Pilin soğuması bekleniyor</string>
   <string name="suspend_user_req">Hesaplama sürdürülüyor...</string>
   <string name="suspend_network_user_req">elle.</string>
+  <!--rpc reasons-->
   <string name="rpcreason_userreq">Kullanıcı tarafından istendi</string>
   <string name="rpcreason_needwork">İş indirmek için</string>
   <string name="rpcreason_resultsdue">Tamamlanan işleri raporlamak için</string>
@@ -247,6 +322,7 @@
   <string name="rpcreason_init">Proje başlatılıyor</string>
   <string name="rpcreason_projectreq">Proje tarafından istendi</string>
   <string name="rpcreason_unknown">Bilinmeyen sebep</string>
+  <!--menu-->
   <string name="menu_refresh">Yenile</string>
   <string name="menu_emailto">ePostayla gönder</string>
   <string name="menu_copy">Panoya kopyala</string>
@@ -256,10 +332,29 @@
   <string name="menu_run_mode_enable">Sürdür</string>
   <string name="menu_about">Hakkında</string>
   <string name="menu_help">Yardım</string>
+  <!--about dialog-->
   <string name="about_button">Geri dön</string>
   <string name="about_title">Hakkında</string>
   <string name="about_name">BOINC</string>
   <string name="about_version">Sürüm</string>
   <string name="about_name_long">Berkeley Open Infrastructure for Network Computing</string>
-  <string name="about_copyright">Türkçe çeviri: Aycan Demirel\n\n© 2003-2013 Kaliforniya Üniversitesi, Berkeley.\nTüm hakları saklıdır.</string>
+  <string name="about_copyright">© 2003 - 2014 California Üniversitesi, Berkeley.</string>
+  <string name="about_copyright_reserved">Tüm Hakları Saklıdır.</string>
+  <string name="about_credits">Verdikleri destek için Max Planck Enstitüsü Yerçekimi Fizik Bölümü\'ne, IBM  ve HTC şirketlerine teşekkürler.</string>
+  <!--notice notification-->
+  <string name="notice_notification_single_header">Yeni bildirim gönderen</string>
+  <!--e.g. New notice from SETI at HOME-->
+  <string name="notice_notification_multiple_header">yeni bildirimler</string>
+  <!--e.g. 3 new notices-->
+  <!--multi BOINC compitability-->
+  <string name="nonexcl_dialog_header">Gönüllü hesaplama uygulaması tespit edildi.</string>
+  <string name="nonexcl_dialog_text">Bu cihazda başka bir gönüllü hesaplama uygulaması çalışıyor. Aynı anda sadece bir versiyon çalışabilir.</string>
+  <string name="nonexcl_dialog_exit">Çıkış</string>
+  <!--social integration-->
+  <string name="social_invite_button">Arkadaşlarını davet et</string>
+  <string name="social_invite_intent_title">Nasıl paylaşmak istiyorsunuz?</string>
+  <string name="social_invite_content_title">Akıllı telefonumdan bilim yapıyorum!</string>
+  <string name="social_invite_content_body">Bilim adına hesaplama yapmak için %1$s mı kullanıyorum. Sende katılabilirsin! Uygulamayı %2$s dan indirebilirsin.</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-uk/strings.xml b/android/BOINC/res/values-uk/strings.xml
index 164d1db..806b122 100644
--- a/android/BOINC/res/values-uk/strings.xml
+++ b/android/BOINC/res/values-uk/strings.xml
@@ -1,7 +1,14 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--app global-->
   <string name="app_name">BOINC</string>
+  <!--generic. used by multiple Activities/tabs-->
   <string name="generic_loading">Завантаження! Зачекайте, будь-ласка...</string>
+  <string name="generic_button_continue">Продовжити</string>
+  <string name="generic_button_finish">Готово</string>
+  <!--attach project-->
+  <!--selection list-->
+  <string name="attachproject_list_desc">Оберіть наукові проекти, в яких ви бажаєте прийняти участь:</string>
   <string name="attachproject_list_header">Оберіть проект:</string>
   <string name="attachproject_list_manual_button">Додати проект за адресою (URL)</string>
   <string name="attachproject_list_manual_dialog_title">Введіть адресу (URL) проекту:</string>
@@ -9,6 +16,34 @@
   <string name="attachproject_list_manual_no_url">Додати менеджер проектів</string>
   <string name="attachproject_list_acctmgr_button">Додати менеджер проектів</string>
   <string name="attachproject_list_no_internet">Відсутнє з’єднання з Інтернетом</string>
+  <!--credential input-->
+  <string name="attachproject_credential_input_sing_desc">Введіть інформацію облікового запису</string>
+  <string name="attachproject_credential_input_desc">Введіть інформацію облікового запису для обраних проектів:</string>
+  <string name="attachproject_credential_input_show_pwd">Показати пароль</string>
+  <string name="attachproject_individual_credential_input">Додати проекти окремо</string>
+  <!--conflicts-->
+  <string name="attachproject_conflicts_desc">Під час додавання проекту виникли проблеми</string>
+  <string name="attachproject_conflict_undefined">Неможливо встановити зв’язок</string>
+  <string name="attachproject_conflict_not_unique">Невірний пароль існуючого облікового запису</string>
+  <string name="attachproject_conflict_bad_password">Невірний пароль</string>
+  <string name="attachproject_conflict_unknown_user">Такий обліковий запис не існує</string>
+  <string name="attachproject_conflict_unknown_user_creation_disabled">Такий обліковий запис не існує, перейдіть на сторінку проекта для реєстрації</string>
+  <!--working-->
+  <string name="attachproject_working_attaching">Додавання</string>
+  <!--e.g. Attaching Einstein at Home-->
+  <!--hints-->
+  <string name="attachproject_hints_header">Порада</string>
+  <!--e.g. Hint 1/2-->
+  <string name="attachproject_hint_contribtion_header">Як прийняти участь:</string>
+  <string name="attachproject_hint_contribtion_wifi">1. Підключитися до WiFi</string>
+  <string name="attachproject_hint_contribtion_charger">2. Підключити до джерела живлення</string>
+  <string name="attachproject_hint_contribtion_screen">3. Вимкнути екран</string>
+  <string name="attachproject_hint_projectwebsite_header">Відвідати інтернет сторінку проекту:</string>
+  <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>
+  <!--project login-->
   <string name="attachproject_login_loading">Встановлення з’єднання із сервером проекту</string>
   <string name="attachproject_login_image_description">Логотип проекту.</string>
   <string name="attachproject_login_header_general_area">Загальна область:</string>
@@ -28,12 +63,13 @@
   <string name="attachproject_login_category_creation">Новий</string>
   <string name="attachproject_login_header_creation_enabled">Зареєструвати обліковий запис для участі:</string>
   <string name="attachproject_login_header_creation_client_disabled">Відвідати інтернет сторінку проекту для створення облікового запису:</string>
-  <string name="attachproject_login_header_creation_disabled">Зараз у проекті можна створювати нові облікові записи!</string>
+  <string name="attachproject_login_header_creation_disabled">Цей проект тимчасово не реєструє нові облікові записи</string>
   <string name="attachproject_login_button_registration">Зареєструватися</string>
   <string name="attachproject_login_button_login">Увійти</string>
   <string name="attachproject_login_button_forgotpw">Забули пароль?</string>
   <string name="attachproject_login_error_toast">Не вдалося з’єднатися з проектом!</string>
   <string name="attachproject_login_attached">Додано</string>
+  <!--project registration-->
   <string name="attachproject_registration_header">Реєстрація облікового запису для</string>
   <string name="attachproject_registration_header_url">Проект:</string>
   <string name="attachproject_registration_header_email">Електронна пошта:</string>
@@ -42,16 +78,20 @@
   <string name="attachproject_registration_header_pwd">Пароль:</string>
   <string name="attachproject_registration_header_pwd_confirm">… Повторити:</string>
   <string name="attachproject_registration_button">Створити</string>
+  <!--account manager-->
+  <string name="attachproject_acctmgr_list_desc">Використовуйте менеджер проектів BOINC, щоб додати та керувати декількома проектами</string>
   <string name="attachproject_acctmgr_header">Додати менеджер проектів</string>
   <string name="attachproject_acctmgr_header_url">Адреса (URL)</string>
   <string name="attachproject_acctmgr_header_name">Користувач:</string>
   <string name="attachproject_acctmgr_header_pwd">Пароль:</string>
   <string name="attachproject_acctmgr_header_pwd_confirm">… Повторити:</string>
   <string name="attachproject_acctmgr_button">Додати</string>
+  <!--error strings-->
   <string name="attachproject_error_wrong_name">Користувача не знайдено</string>
   <string name="attachproject_error_short_pwd">Пароль надто короткий</string>
   <string name="attachproject_error_no_internet">Невдала спроба зв’язку</string>
   <string name="attachproject_error_pwd_no_match">Паролі не збігаються</string>
+  <string name="attachproject_error_pwd_no_retype">Будь ласка, введіть пароль ще раз</string>
   <string name="attachproject_error_no_url">Будь-ласка, введіть адресу (URL)</string>
   <string name="attachproject_error_no_email">Будь ласка, вкажіть адресу електронної пошти</string>
   <string name="attachproject_error_no_pwd">Будь-ласка, введіть пароль</string>
@@ -64,6 +104,7 @@
   <string name="attachproject_error_bad_pwd">Пароль відхилено</string>
   <string name="attachproject_error_creation_disabled">Можливість створення облікових записів в даному проекті відключена</string>
   <string name="attachproject_error_invalid_url">Неправильна адреса (URL)</string>
+  <!--working activity-->
   <string name="attachproject_working_back_button">Назад</string>
   <string name="attachproject_working_finish_button">Готово</string>
   <string name="attachproject_working_check_desc">Успішно</string>
@@ -77,10 +118,12 @@
   <string name="attachproject_working_login">Увійти</string>
   <string name="attachproject_working_acctmgr">Додати менеджер проектів</string>
   <string name="attachproject_working_acctmgr_sync">Синхронізувати</string>
+  <!--main activity-->
   <string name="main_noproject_warning">Щоб обрати проект натисніть тут.</string>
   <string name="main_error">Ой!</string>
   <string name="main_error_long">…цього не повинно траплятися!\nНатисніть на іконці для повторної спроби.</string>
   <string name="main_title_icon_desc">Іконка BOINC</string>
+  <!--tab names-->
   <string name="tab_status">Статус</string>
   <string name="tab_projects">Проекти</string>
   <string name="tab_tasks">Завдання</string>
@@ -88,6 +131,7 @@
   <string name="tab_preferences">Налаштування</string>
   <string name="tab_notices">Примітки</string>
   <string name="tab_desc">Навігація</string>
+  <!--status strings-->
   <string name="status_running">Обчислення</string>
   <string name="status_running_long">Дякуємо за участь.</string>
   <string name="status_paused">Призупинено</string>
@@ -100,6 +144,7 @@
   <string name="status_closing">Закриття...</string>
   <string name="status_benchmarking">Тестування...</string>
   <string name="status_image_description">зображення проекту</string>
+  <!--preferences tab strings-->
   <string name="prefs_loading">Читання налаштувань...</string>
   <string name="prefs_submit_button">Зберегти</string>
   <string name="prefs_dialog_title">Ввести нове значення:</string>
@@ -112,6 +157,15 @@
   <string name="prefs_category_memory">Пам`ять</string>
   <string name="prefs_category_debug">Діагностика</string>
   <string name="prefs_show_advanced_header">Показати додаткові налаштування і елементи керування...</string>
+  <string name="prefs_suspend_when_screen_on">Призупиняти обчислення, коли екран увімкнуто</string>
+  <string name="prefs_stationary_device_mode_header">Стаціонарний режим роботи пристрою</string>
+  <string name="prefs_stationary_device_mode_description">Дозволяє робити обчислення не дивлячись на налаштування Живлення. Вмикати, тільки якщо пристрой на має акумулятора</string>
+  <string name="prefs_power_source_header">Джерела живлення для обчислювання</string>
+  <string name="prefs_power_source_description">Оберіть джерела живлення, які BOINC може використовувати для обчислення.</string>
+  <string name="prefs_power_source_ac">Розетка</string>
+  <string name="prefs_power_source_usb">Підключення по USB</string>
+  <string name="prefs_power_source_wireless">Бездротовий зарядний пристрій</string>
+  <string name="prefs_power_source_battery">Акумулятор</string>
   <string name="battery_charge_min_pct_header">Низький заряд батареї</string>
   <string name="battery_charge_min_pct_description">BOINC призупиняє обчислення нижче визначеного рівня заряду акумулятора.</string>
   <string name="battery_temperature_max_header">Макс. температура батареї</string>
@@ -120,14 +174,18 @@
   <string name="prefs_disk_max_pct_description">Скільки відсотків дискового простору може використовувати BOINC?</string>
   <string name="prefs_disk_min_free_gb_header">Мін. запас дискового простору</string>
   <string name="prefs_disk_min_free_gb_description">Скільки вашого дискового простору повинно залишитися вільним?</string>
+  <string name="prefs_disk_access_interval_header">Період доступу</string>
+  <string name="prefs_disk_access_interval_description">Пропонує проміжок між доступами до диску</string>
   <string name="prefs_network_daily_xfer_limit_mb_header">Денний ліміт передачі</string>
   <string name="prefs_network_daily_xfer_limit_mb_description">Обмеження щоденної передачі даних, що здійснює BOINC.</string>
   <string name="prefs_network_wifi_only_header">Передавати завдання тільки через WiFi</string>
   <string name="prefs_autostart_header">Автозапуск</string>
+  <string name="prefs_show_notification_notices_header">Сповіщати про нові повідомлення</string>
+  <string name="prefs_show_notification_suspended_header">Сповіщати навіть коли призупинено</string>
   <string name="prefs_cpu_number_cpus_header">Використано ядер ЦП</string>
   <string name="prefs_cpu_number_cpus_description">Обмежує кількість ядер ЦП, які BOINC використовує для обчислень.</string>
   <string name="prefs_cpu_other_load_suspension_header">Використання ЦП призупинене</string>
-  <string name="prefs_cpu_other_load_suspension_description">Визначає коли призупиняти обчислення BOINC через використання ЦП іншими додатками.</string>
+  <string name="prefs_cpu_other_load_suspension_description">Визначає, коли BOINC призупиняє обчислення через використання процессора іншими додатками</string>
   <string name="prefs_cpu_time_max_header">Обмеження ЦП</string>
   <string name="prefs_cpu_time_max_description">Обмежує процесорний час роботи, який BOINC використовує для обчислень.</string>
   <string name="prefs_memory_max_idle_header">обмеження RAM</string>
@@ -139,12 +197,15 @@
   <string name="prefs_unit_gb">Гб</string>
   <string name="prefs_unit_pct">%</string>
   <string name="prefs_unit_celcius">°C</string>
+  <string name="prefs_unit_seconds">секунд</string>
+  <!--projects tab strings-->
   <string name="projects_loading">Читання проектів...</string>
   <string name="projects_add">Додати проект</string>
   <string name="projects_icon">Значок проекту</string>
   <string name="projects_credits_header">Бали:</string>
   <string name="projects_credits_host_header">(на цьому пристрої)</string>
   <string name="projects_credits_user_header">(загалом)</string>
+  <!--project status strings-->
   <string name="projects_status_suspendedviagui">Призупинено користувачем</string>
   <string name="projects_status_dontrequestmorework">Не приймає нові завдання</string>
   <string name="projects_status_ended">Проект завершений - Гаразд для видалення</string>
@@ -153,6 +214,7 @@
   <string name="projects_status_schedrpcinprogress">Відбувається запит інформації у планувальника</string>
   <string name="projects_status_trickleuppending">Очікування проміжного відправлення</string>
   <string name="projects_status_backoff">Зв’язок за розкладом:</string>
+  <!--project controls-->
   <string name="projects_control_dialog_title">Команди проекту:</string>
   <string name="projects_control_visit_website">Відвідати веб-сайт</string>
   <string name="projects_control_update">Оновити</string>
@@ -165,16 +227,20 @@
   <string name="projects_control_dialog_title_acctmgr">Команди менеджера проектів:</string>
   <string name="projects_control_sync_acctmgr">Синхронізувати</string>
   <string name="projects_control_remove_acctmgr">Відключити</string>
+  <!--project confirm dialog-->
   <string name="projects_confirm_detach_title">Видалити проект?</string>
   <string name="projects_confirm_detach_message">Ви справді хочете видалити</string>
   <string name="projects_confirm_detach_message2">із BOINC?</string>
   <string name="projects_confirm_detach_confirm">Видалити</string>
   <string name="projects_confirm_reset_title">Перезапустити проект</string>
   <string name="projects_confirm_reset_message">Ви справді хочете перезапустити</string>
+  <string name="projects_confirm_reset_message2">\?</string>
   <string name="projects_confirm_reset_confirm">Скинути</string>
   <string name="projects_confirm_remove_acctmgr_title">Відключити менеджер проектів</string>
   <string name="projects_confirm_remove_acctmgr_message">Ви впевнені, що бажаєте припинити використання</string>
+  <string name="projects_confirm_remove_acctmgr_message2">\?</string>
   <string name="projects_confirm_remove_acctmgr_confirm">Відключити</string>
+  <!--tasks tab strings-->
   <string name="tasks_header_name">Назва завдання:</string>
   <string name="tasks_header_elapsed_time">Витрачено часу:</string>
   <string name="tasks_header_project_paused">(призупинено)</string>
@@ -195,11 +261,13 @@
   <string name="tasks_custom_suspended_via_gui">призупинено</string>
   <string name="tasks_custom_project_suspended_via_gui">проект призупинено</string>
   <string name="tasks_custom_ready_to_report">готовий до звітування</string>
+  <!--confirmation dialog-->
   <string name="confirm_abort_task_title">Перервати завдання?</string>
   <string name="confirm_abort_task_message">Перервати завдання:</string>
   <string name="confirm_abort_task_confirm">Перервати</string>
   <string name="confirm_cancel">Скасувати</string>
   <string name="confirm_image_desc">Діалог підтвердження</string>
+  <!--transfers tab strings-->
   <string name="trans_loading">Читання передач...</string>
   <string name="trans_upload">Відправлення</string>
   <string name="trans_download">Завантаження</string>
@@ -214,14 +282,18 @@
   <string name="confirm_abort_trans_title">Перервати передачу?</string>
   <string name="confirm_abort_trans_message">Перервати файл:</string>
   <string name="confirm_abort_trans_confirm">Перервати</string>
+  <!--notices tab strings-->
   <string name="notices_loading">Читальні примітки...</string>
+  <!--eventlog tab strings-->
   <string name="eventlog_loading">Завантаження повідомлень журналу...</string>
   <string name="eventlog_client_header">Повідомлення клієнта</string>
   <string name="eventlog_gui_header">Повідомлення GUI</string>
   <string name="eventlog_copy_toast">Журнал скопійований в буфер обміну.</string>
   <string name="eventlog_email_subject">Журнал подій для BOINC на Android:</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>
@@ -234,12 +306,14 @@
   <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">Очікування більшого рівня заряду акумулятора</string>
   <string name="suspend_battery_charging_long">Розрахунки продовжаться, коли заряд батареї досягне</string>
+  <string name="suspend_battery_charging_long2"></string>
   <string name="suspend_battery_charging_current">зараз</string>
   <string name="suspend_battery_overheating">Очікування охолодження батареї</string>
   <string name="suspend_user_req">Поновлення розрахунків...</string>
   <string name="suspend_network_user_req">вручну.</string>
+  <!--rpc reasons-->
   <string name="rpcreason_userreq">На вимогу користувача</string>
   <string name="rpcreason_needwork">Надіслати запит на завдання</string>
   <string name="rpcreason_resultsdue">Повідомити про виконані завдання</string>
@@ -248,6 +322,7 @@
   <string name="rpcreason_init">Ініціалізація проекту</string>
   <string name="rpcreason_projectreq">На запит проекту</string>
   <string name="rpcreason_unknown">Невідома причина</string>
+  <!--menu-->
   <string name="menu_refresh">Оновити</string>
   <string name="menu_emailto">Надіслати електронною поштою</string>
   <string name="menu_copy">Копіювати в буфер обміну</string>
@@ -257,10 +332,29 @@
   <string name="menu_run_mode_enable">Відновити</string>
   <string name="menu_about">Про</string>
   <string name="menu_help">Довідка</string>
+  <!--about dialog-->
   <string name="about_button">Повернутися</string>
   <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_copyright">© 2003-2013 Університет Каліфорнії, Берклі.\nВсі права захищено.</string>
+  <string name="about_copyright_reserved">Всі права захищені.</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">Знайдено додаток добровільних обчислень</string>
+  <string name="nonexcl_dialog_text">Інший додаток добровільних обчислень вже працює на цїому пристрої. Тільки один додаток може працювати одночасно.</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 для наукових обчислень. Ти також можешь прийняти участь! Завантажуй додаток звідси: %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-zh-rCN/strings.xml b/android/BOINC/res/values-zh-rCN/strings.xml
index 490c4fd..b487346 100644
--- a/android/BOINC/res/values-zh-rCN/strings.xml
+++ b/android/BOINC/res/values-zh-rCN/strings.xml
@@ -1,3 +1,360 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-</resources>
\ No newline at end of file
+  <!--app global-->
+  <string name="app_name">BOINC</string>
+  <!--generic. used by multiple Activities/tabs-->
+  <string name="generic_loading">载入中!请稍候...</string>
+  <string name="generic_button_continue">继续</string>
+  <string name="generic_button_finish">完成</string>
+  <!--attach project-->
+  <!--selection list-->
+  <string name="attachproject_list_desc">请选择您希望参加的科学项目:</string>
+  <string name="attachproject_list_header">选择一个项目</string>
+  <string name="attachproject_list_manual_button">通过URL添加项目</string>
+  <string name="attachproject_list_manual_dialog_title">输入项目网址:</string>
+  <string name="attachproject_list_manual_dialog_button">添加项目</string>
+  <string name="attachproject_list_manual_no_url">请输入项目网址</string>
+  <string name="attachproject_list_acctmgr_button">添加项目管理器</string>
+  <string name="attachproject_list_no_internet">无法连接到互联网</string>
+  <!--credential input-->
+  <string name="attachproject_credential_input_sing_desc">输入帐户信息</string>
+  <string name="attachproject_credential_input_desc">请输入所选项目的账户信息</string>
+  <string name="attachproject_credential_input_show_pwd">显示密码</string>
+  <string name="attachproject_individual_credential_input">分别添加项目</string>
+  <!--conflicts-->
+  <string name="attachproject_conflicts_desc">在添加项目时遇到以下问题:</string>
+  <string name="attachproject_conflict_undefined">无法连接</string>
+  <string name="attachproject_conflict_not_unique">账户已存在,但密码错误</string>
+  <string name="attachproject_conflict_bad_password">密码错误</string>
+  <string name="attachproject_conflict_unknown_user">账户不存在</string>
+  <string name="attachproject_conflict_unknown_user_creation_disabled">账户不存在,请到项目网站上注册</string>
+  <!--working-->
+  <string name="attachproject_working_attaching">正在添加</string>
+  <!--e.g. Attaching Einstein at Home-->
+  <!--hints-->
+  <string name="attachproject_hints_header">提示</string>
+  <!--e.g. Hint 1/2-->
+  <string name="attachproject_hint_contribtion_header">如何参与:</string>
+  <string name="attachproject_hint_contribtion_wifi">1、连接到WiFi网络</string>
+  <string name="attachproject_hint_contribtion_charger">2、插上充电器</string>
+  <string name="attachproject_hint_contribtion_screen">3、关闭屏幕(锁屏)</string>
+  <string name="attachproject_hint_projectwebsite_header">访问项目网站以:</string>
+  <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>
+  <!--project login-->
+  <string name="attachproject_login_loading">与项目服务器通信中...</string>
+  <string name="attachproject_login_image_description">项目标识</string>
+  <string name="attachproject_login_header_general_area">大致地区:</string>
+  <string name="attachproject_login_header_specific_area">具体地区:</string>
+  <string name="attachproject_login_header_description">描述:</string>
+  <string name="attachproject_login_header_home">主页:</string>
+  <string name="attachproject_login_header_url">网站:</string>
+  <string name="attachproject_login_header_platform">安卓:</string>
+  <string name="attachproject_login_platform_supported">项目支持此设备</string>
+  <string name="attachproject_login_platform_not_supported">项目不支持此设备</string>
+  <string name="attachproject_login_category_terms_of_use">使用协议</string>
+  <string name="attachproject_login_accept_terms_of_use">在项目中创建账户即代表您同意上述使用协议</string>
+  <string name="attachproject_login_category_login">用已有的账户登录</string>
+  <string name="attachproject_login_header_id_email">电子邮箱地址:</string>
+  <string name="attachproject_login_header_id_name">姓名:</string>
+  <string name="attachproject_login_header_pwd">密码:</string>
+  <string name="attachproject_login_category_creation">第一次加入</string>
+  <string name="attachproject_login_header_creation_enabled">注册帐号来参与志愿计算。</string>
+  <string name="attachproject_login_header_creation_client_disabled">访问项目网站以创建新账户:</string>
+  <string name="attachproject_login_header_creation_disabled">该项目目前不支持新建帐户。 </string>
+  <string name="attachproject_login_button_registration">注册</string>
+  <string name="attachproject_login_button_login">登陆</string>
+  <string name="attachproject_login_button_forgotpw">忘记密码</string>
+  <string name="attachproject_login_error_toast">与项目方通信失败!</string>
+  <string name="attachproject_login_attached">已添加</string>
+  <!--project registration-->
+  <string name="attachproject_registration_header">注册帐号</string>
+  <string name="attachproject_registration_header_url">项目:</string>
+  <string name="attachproject_registration_header_email">电子邮件地址:</string>
+  <string name="attachproject_registration_header_username">用户名:</string>
+  <string name="attachproject_registration_header_teamname">团队:</string>
+  <string name="attachproject_registration_header_pwd">密码:</string>
+  <string name="attachproject_registration_header_pwd_confirm">重新输入:</string>
+  <string name="attachproject_registration_button">创建</string>
+  <!--account manager-->
+  <string name="attachproject_acctmgr_list_desc">使用BOINC项目管理器来添加或管理多个项目</string>
+  <string name="attachproject_acctmgr_header">添加项目管理器</string>
+  <string name="attachproject_acctmgr_header_url">网址</string>
+  <string name="attachproject_acctmgr_header_name">用户:</string>
+  <string name="attachproject_acctmgr_header_pwd">密码:</string>
+  <string name="attachproject_acctmgr_header_pwd_confirm">重新输入:</string>
+  <string name="attachproject_acctmgr_button">添加</string>
+  <!--error strings-->
+  <string name="attachproject_error_wrong_name">未找到用户</string>
+  <string name="attachproject_error_short_pwd">密码过短</string>
+  <string name="attachproject_error_no_internet">连接失败</string>
+  <string name="attachproject_error_pwd_no_match">密码不匹配</string>
+  <string name="attachproject_error_pwd_no_retype">请重新输入密码</string>
+  <string name="attachproject_error_no_url">请输入项目网址</string>
+  <string name="attachproject_error_no_email">请输入电子邮箱地址</string>
+  <string name="attachproject_error_no_pwd">请输入密码</string>
+  <string name="attachproject_error_no_name">请输入用户名</string>
+  <string name="attachproject_error_unknown">失败</string>
+  <string name="attachproject_error_bad_username">用户名错误</string>
+  <string name="attachproject_error_email_in_use">该电子邮件地址已被使用</string>
+  <string name="attachproject_error_project_down">项目离线</string>
+  <string name="attachproject_error_email_bad_syntax">电子邮件地址错误</string>
+  <string name="attachproject_error_bad_pwd">密码错误</string>
+  <string name="attachproject_error_creation_disabled">项目不接受新的账户注册</string>
+  <string name="attachproject_error_invalid_url">错误的网址</string>
+  <!--working activity-->
+  <string name="attachproject_working_back_button">上一步</string>
+  <string name="attachproject_working_finish_button">完成</string>
+  <string name="attachproject_working_check_desc">成功!</string>
+  <string name="attachproject_working_failed_desc">失败</string>
+  <string name="attachproject_working_ongoing">…</string>
+  <string name="attachproject_working_finished">。</string>
+  <string name="attachproject_working_description">:</string>
+  <string name="attachproject_working_connect">连接</string>
+  <string name="attachproject_working_verify">验证账户</string>
+  <string name="attachproject_working_register">注册账户</string>
+  <string name="attachproject_working_login">登录</string>
+  <string name="attachproject_working_acctmgr">添加项目管理器</string>
+  <string name="attachproject_working_acctmgr_sync">同步</string>
+  <!--main activity-->
+  <string name="main_noproject_warning">点击这里来选择项目。</string>
+  <string name="main_error">哦不!</string>
+  <string name="main_error_long">...这不科学!\n点击图标再试试。</string>
+  <string name="main_title_icon_desc">BOINC 图标</string>
+  <!--tab names-->
+  <string name="tab_status">状态</string>
+  <string name="tab_projects">项目</string>
+  <string name="tab_tasks">任务</string>
+  <string name="tab_transfers">网络传输</string>
+  <string name="tab_preferences">参数设置</string>
+  <string name="tab_notices">通知</string>
+  <string name="tab_desc">导航栏</string>
+  <!--status strings-->
+  <string name="status_running">正在计算</string>
+  <string name="status_running_long">感谢您对志愿计算的贡献!</string>
+  <string name="status_paused">已暂停</string>
+  <string name="status_idle">无事可做</string>
+  <string name="status_idle_long">等待新任务中...</string>
+  <string name="status_computing_disabled">已暂停</string>
+  <string name="status_computing_disabled_long">按下开始恢复网络链接和计算。</string>
+  <string name="status_launching">启动中...</string>
+  <string name="status_noproject">选择一个项目来参与志愿计算。</string>
+  <string name="status_closing">正在关闭...</string>
+  <string name="status_benchmarking">正在进行性能基准测试...</string>
+  <string name="status_image_description">项目图像</string>
+  <!--preferences tab strings-->
+  <string name="prefs_loading">正在读取参数设置中,,,</string>
+  <string name="prefs_submit_button">保存</string>
+  <string name="prefs_dialog_title">输入新参数:</string>
+  <string name="prefs_dialog_title_selection">选择:</string>
+  <string name="prefs_category_general">一般</string>
+  <string name="prefs_category_network">网络</string>
+  <string name="prefs_category_power">电源</string>
+  <string name="prefs_category_cpu">CPU</string>
+  <string name="prefs_category_storage">储存</string>
+  <string name="prefs_category_memory">内存(RAM)</string>
+  <string name="prefs_category_debug">调试</string>
+  <string name="prefs_show_advanced_header">显示高级配置</string>
+  <string name="prefs_suspend_when_screen_on">当屏幕亮时暂停计算</string>
+  <string name="prefs_stationary_device_mode_header">交流电模式</string>
+  <string name="prefs_stationary_device_mode_description">忽略电源设置。仅当设备没有电池时选择该选项。</string>
+  <string name="prefs_power_source_header">计算时的电力来源</string>
+  <string name="prefs_power_source_description">选择允许BOINC使用的电力来源。</string>
+  <string name="prefs_power_source_ac">插座电源</string>
+  <string name="prefs_power_source_usb">USB 连接</string>
+  <string name="prefs_power_source_wireless">无线充电</string>
+  <string name="prefs_power_source_battery">电池</string>
+  <string name="battery_charge_min_pct_header">最少电量</string>
+  <string name="battery_charge_min_pct_description">当电量低于设定值时BOINC将暂停计算。</string>
+  <string name="battery_temperature_max_header">最大电池温度</string>
+  <string name="battery_temperature_max_description">BOINC 当电池温度高于设定值时会暂停运算。强烈建议不要更改此选项!!</string>
+  <string name="prefs_disk_max_pct_header">最多使用的储存空间</string>
+  <string name="prefs_disk_max_pct_description">BOINC 能使用多少比例的储存空间?</string>
+  <string name="prefs_disk_min_free_gb_header">最少使用的储存空间</string>
+  <string name="prefs_disk_min_free_gb_description">您的设备有多少剩余储存空间可以使用?</string>
+  <string name="prefs_disk_access_interval_header">访问间隔</string>
+  <string name="prefs_disk_access_interval_description">建议磁盘访问间隔</string>
+  <string name="prefs_network_daily_xfer_limit_mb_header">每日传输限制</string>
+  <string name="prefs_network_daily_xfer_limit_mb_description">限制BOINC每日数据流量。</string>
+  <string name="prefs_network_wifi_only_header">只使用WiFi传输任务</string>
+  <string name="prefs_autostart_header">自启动</string>
+  <string name="prefs_show_notification_notices_header">当有新消息时显示通知</string>
+  <string name="prefs_show_notification_suspended_header">暂停时显示通知</string>
+  <string name="prefs_cpu_number_cpus_header">使用的CPU核心</string>
+  <string name="prefs_cpu_number_cpus_description">限制BOINC为计算所使用的CPU核心数目。</string>
+  <string name="prefs_cpu_other_load_suspension_header">暂停当CPU使用量高于</string>
+  <string name="prefs_cpu_other_load_suspension_description">选择当其他APP的CPU使用量大于何值时让BOINC暂停运算。</string>
+  <string name="prefs_cpu_time_max_header">CPU 用量限制</string>
+  <string name="prefs_cpu_time_max_description">限制BOINC为计算所使用的CPU时间。</string>
+  <string name="prefs_memory_max_idle_header">RAM 用量限制</string>
+  <string name="prefs_memory_max_idle_description">限制任务占用的内存(RAM)用量。</string>
+  <string name="prefs_client_log_flags_header">BOINC客户端日志记录</string>
+  <string name="prefs_gui_log_level_header">GUI (用户界面)日志详细程度</string>
+  <string name="prefs_gui_log_level_description">指定GUI日志信息的详细程度。</string>
+  <string name="prefs_unit_mb">MB</string>
+  <string name="prefs_unit_gb">GB</string>
+  <string name="prefs_unit_pct">%</string>
+  <string name="prefs_unit_celcius">°C</string>
+  <string name="prefs_unit_seconds">秒</string>
+  <!--projects tab strings-->
+  <string name="projects_loading">正在读取项目...</string>
+  <string name="projects_add">增加项目</string>
+  <string name="projects_icon">项目图标</string>
+  <string name="projects_credits_header">积分:</string>
+  <string name="projects_credits_host_header">(在该设备上)</string>
+  <string name="projects_credits_user_header">(总计)</string>
+  <!--project status strings-->
+  <string name="projects_status_suspendedviagui">已被用户暂停</string>
+  <string name="projects_status_dontrequestmorework">禁止下载新任务</string>
+  <string name="projects_status_ended">项目已结束 - 可以删除</string>
+  <string name="projects_status_detachwhendone">将在任务完成后删除</string>
+  <string name="projects_status_schedrpcpending">等待调度请求</string>
+  <string name="projects_status_schedrpcinprogress">正在进行调度请求</string>
+  <string name="projects_status_trickleuppending">上传消息等待中</string>
+  <string name="projects_status_backoff">通讯被延迟在:</string>
+  <!--project controls-->
+  <string name="projects_control_dialog_title">项目命令:</string>
+  <string name="projects_control_visit_website">访问网站</string>
+  <string name="projects_control_update">更新</string>
+  <string name="projects_control_remove">删除</string>
+  <string name="projects_control_suspend">暂停</string>
+  <string name="projects_control_resume">继续</string>
+  <string name="projects_control_nonewtasks">没有新任务</string>
+  <string name="projects_control_allownewtasks">允许下载新任务</string>
+  <string name="projects_control_reset">重置</string>
+  <string name="projects_control_dialog_title_acctmgr">帐户管理器命令:</string>
+  <string name="projects_control_sync_acctmgr">同步</string>
+  <string name="projects_control_remove_acctmgr">已禁用</string>
+  <!--project confirm dialog-->
+  <string name="projects_confirm_detach_title">移除项目?</string>
+  <string name="projects_confirm_detach_message">您确定要删除项目吗?</string>
+  <string name="projects_confirm_detach_message2">移除?</string>
+  <string name="projects_confirm_detach_confirm">删除</string>
+  <string name="projects_confirm_reset_title">重置项目</string>
+  <string name="projects_confirm_reset_message">您确定要重置项目吗?</string>
+  <string name="projects_confirm_reset_message2">\?</string>
+  <string name="projects_confirm_reset_confirm">重置</string>
+  <string name="projects_confirm_remove_acctmgr_title">禁用帐户管理器</string>
+  <string name="projects_confirm_remove_acctmgr_message">您确定要重置</string>
+  <string name="projects_confirm_remove_acctmgr_message2">\?</string>
+  <string name="projects_confirm_remove_acctmgr_confirm">已禁用</string>
+  <!--tasks tab strings-->
+  <string name="tasks_header_name">任务名称:</string>
+  <string name="tasks_header_elapsed_time">已用时间:</string>
+  <string name="tasks_header_project_paused">(已暂停)</string>
+  <string name="tasks_header_deadline">上报期限:</string>
+  <string name="tasks_result_new">新建任务</string>
+  <string name="tasks_result_files_downloading">等待下载</string>
+  <string name="tasks_result_files_downloaded">下载完成</string>
+  <string name="tasks_result_compute_error">计算错误</string>
+  <string name="tasks_result_files_uploading">正在上传</string>
+  <string name="tasks_result_files_uploaded">更新已完成</string>
+  <string name="tasks_result_aborted">已中止</string>
+  <string name="tasks_result_upload_failed">上传失败</string>
+  <string name="tasks_active_uninitialized">已准备</string>
+  <string name="tasks_active_executing">正在运行</string>
+  <string name="tasks_active_suspended">已暂停</string>
+  <string name="tasks_active_abort_pending">正在暂停</string>
+  <string name="tasks_active_quit_pending">正在暂停</string>
+  <string name="tasks_custom_suspended_via_gui">已暂停</string>
+  <string name="tasks_custom_project_suspended_via_gui">项目已暂停</string>
+  <string name="tasks_custom_ready_to_report">等待上报</string>
+  <!--confirmation dialog-->
+  <string name="confirm_abort_task_title">中止任务?</string>
+  <string name="confirm_abort_task_message">中止任务:</string>
+  <string name="confirm_abort_task_confirm">中止</string>
+  <string name="confirm_cancel">取消</string>
+  <string name="confirm_image_desc">验证对话框</string>
+  <!--transfers tab strings-->
+  <string name="trans_loading">正在读取传输信息...</string>
+  <string name="trans_upload">上传</string>
+  <string name="trans_download">下载</string>
+  <string name="trans_retryin">稍后重试 </string>
+  <string name="trans_failed">失败</string>
+  <string name="trans_suspended">已暂停</string>
+  <string name="trans_active">活动</string>
+  <string name="trans_pending">等待中</string>
+  <string name="trans_projectbackoff">项目延后</string>
+  <string name="trans_header_name">文件:</string>
+  <string name="trans_control_retry">重试传输</string>
+  <string name="confirm_abort_trans_title">中断传输?</string>
+  <string name="confirm_abort_trans_message">中止文件:</string>
+  <string name="confirm_abort_trans_confirm">中止</string>
+  <!--notices tab strings-->
+  <string name="notices_loading">正在读取通知信息...</string>
+  <!--eventlog tab strings-->
+  <string name="eventlog_loading">正在加载日志信息...</string>
+  <string name="eventlog_client_header">客户端日志</string>
+  <string name="eventlog_gui_header">GUI 日志</string>
+  <string name="eventlog_copy_toast">日志已复制到剪贴板中。</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_disksize">储存空间不足。</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_cpu">您的设备正忙与运行其他APP。</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>
+  <string name="suspend_battery_charging_current">当前</string>
+  <string name="suspend_battery_overheating">等待电池冷却中</string>
+  <string name="suspend_user_req">正在恢复计算...</string>
+  <string name="suspend_network_user_req">手动操作。</string>
+  <!--rpc reasons-->
+  <string name="rpcreason_userreq">用户发起的请求</string>
+  <string name="rpcreason_needwork">为获取新任务</string>
+  <string name="rpcreason_resultsdue">为上报已完成任务</string>
+  <string name="rpcreason_trickleup">为发送上传消息</string>
+  <string name="rpcreason_acctmgrreq">帐户管理器发起的请求</string>
+  <string name="rpcreason_init">项目初始化</string>
+  <string name="rpcreason_projectreq">项目发起的请求</string>
+  <string name="rpcreason_unknown">未知原因</string>
+  <!--menu-->
+  <string name="menu_refresh">刷新</string>
+  <string name="menu_emailto">作为电子邮件发送</string>
+  <string name="menu_copy">复制到剪贴板</string>
+  <string name="menu_eventlog">事件日志</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>
+  <string name="menu_help">帮助</string>
+  <!--about dialog-->
+  <string name="about_button">返回</string>
+  <string name="about_title">关于</string>
+  <string name="about_name">BOINC</string>
+  <string name="about_version">版本</string>
+  <string name="about_name_long">伯克利开放式网络计算平台 ( BOINC )</string>
+  <string name="about_copyright">\u00A9 2003–2014 加州大学伯克利分校。</string>
+  <string name="about_copyright_reserved">所有权利保留。</string>
+  <string name="about_credits">感谢马克斯普朗克引力物理学研究所、IBM 公司以及 HTC 公司的大力协助。</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_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>
+  <!--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-zh-rTW/strings.xml b/android/BOINC/res/values-zh-rTW/strings.xml
index d56ecf3..82885f5 100644
--- a/android/BOINC/res/values-zh-rTW/strings.xml
+++ b/android/BOINC/res/values-zh-rTW/strings.xml
@@ -1,18 +1,53 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--app global-->
   <string name="app_name">BOINC</string>
+  <!--generic. used by multiple Activities/tabs-->
   <string name="generic_loading">載入中! 請稍後...</string>
-  <string name="attachproject_list_header">選擇一個專案:</string>
-  <string name="attachproject_list_manual_button">用網址來新增專案</string>
+  <string name="generic_button_continue">繼續</string>
+  <string name="generic_button_finish">完成</string>
+  <!--attach project-->
+  <!--selection list-->
+  <string name="attachproject_list_desc">選擇您想參與的研究專案:</string>
+  <string name="attachproject_list_header">選擇專案</string>
+  <string name="attachproject_list_manual_button">用網址新增專案</string>
   <string name="attachproject_list_manual_dialog_title">輸入專案網址:</string>
   <string name="attachproject_list_manual_dialog_button">新增專案</string>
   <string name="attachproject_list_manual_no_url">請輸入專案網址</string>
   <string name="attachproject_list_acctmgr_button">新增帳號管理服務</string>
   <string name="attachproject_list_no_internet">沒有網路連線</string>
+  <!--credential input-->
+  <string name="attachproject_credential_input_sing_desc">輸入帳號資訊</string>
+  <string name="attachproject_credential_input_desc">輸入專案的帳號資訊:</string>
+  <string name="attachproject_credential_input_show_pwd">顯示密碼</string>
+  <string name="attachproject_individual_credential_input">單獨加入專案</string>
+  <!--conflicts-->
+  <string name="attachproject_conflicts_desc">加入研究專案時發生問題:</string>
+  <string name="attachproject_conflict_undefined">無法連線</string>
+  <string name="attachproject_conflict_not_unique">帳號存在但密碼不正確</string>
+  <string name="attachproject_conflict_bad_password">密碼不正確</string>
+  <string name="attachproject_conflict_unknown_user">帳號不存在</string>
+  <string name="attachproject_conflict_unknown_user_creation_disabled">帳號不存在,請到專案網站註冊</string>
+  <!--working-->
+  <string name="attachproject_working_attaching">加入中</string>
+  <!--e.g. Attaching Einstein at Home-->
+  <!--hints-->
+  <string name="attachproject_hints_header">提示</string>
+  <!--e.g. Hint 1/2-->
+  <string name="attachproject_hint_contribtion_header">如何貢獻:</string>
+  <string name="attachproject_hint_contribtion_wifi">1.連線到WiFi</string>
+  <string name="attachproject_hint_contribtion_charger">2.接上充電器</string>
+  <string name="attachproject_hint_contribtion_screen">3.關閉螢幕</string>
+  <string name="attachproject_hint_projectwebsite_header">造訪專案網站:</string>
+  <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>
+  <!--project login-->
   <string name="attachproject_login_loading">正連線到專案伺服器...</string>
   <string name="attachproject_login_image_description">專案標誌。</string>
   <string name="attachproject_login_header_general_area">研究領域:</string>
-  <string name="attachproject_login_header_specific_area">細分領域:</string>
+  <string name="attachproject_login_header_specific_area">專業領域:</string>
   <string name="attachproject_login_header_description">描述:</string>
   <string name="attachproject_login_header_home">首頁:</string>
   <string name="attachproject_login_header_url">網站:</string>
@@ -26,14 +61,15 @@
   <string name="attachproject_login_header_id_name">名稱:</string>
   <string name="attachproject_login_header_pwd">密碼:</string>
   <string name="attachproject_login_category_creation">第一次加入</string>
-  <string name="attachproject_login_header_creation_enabled">註冊一個帳號來參加:</string>
-  <string name="attachproject_login_header_creation_client_disabled">進入專案官網來建立一個帳號:</string>
-  <string name="attachproject_login_header_creation_disabled">專案目前允許建立新帳號!</string>
+  <string name="attachproject_login_header_creation_enabled">註冊帳號加入:</string>
+  <string name="attachproject_login_header_creation_client_disabled">進入專案官網建立帳號:</string>
+  <string name="attachproject_login_header_creation_disabled">專案目前不允許建立新帳號。</string>
   <string name="attachproject_login_button_registration">註冊</string>
   <string name="attachproject_login_button_login">登入</string>
   <string name="attachproject_login_button_forgotpw">忘記密碼</string>
   <string name="attachproject_login_error_toast">與專案連線失敗!</string>
   <string name="attachproject_login_attached">已加入</string>
+  <!--project registration-->
   <string name="attachproject_registration_header">註冊帳號</string>
   <string name="attachproject_registration_header_url">專案:</string>
   <string name="attachproject_registration_header_email">電子郵件:</string>
@@ -42,16 +78,20 @@
   <string name="attachproject_registration_header_pwd">密碼:</string>
   <string name="attachproject_registration_header_pwd_confirm">… 再次輸入:</string>
   <string name="attachproject_registration_button">建立</string>
+  <!--account manager-->
+  <string name="attachproject_acctmgr_list_desc">使用BOINC帳號管理服務新增及管理多個專案</string>
   <string name="attachproject_acctmgr_header">新增帳號管理服務</string>
   <string name="attachproject_acctmgr_header_url">網址</string>
-  <string name="attachproject_acctmgr_header_name">使用者:</string>
+  <string name="attachproject_acctmgr_header_name">用戶:</string>
   <string name="attachproject_acctmgr_header_pwd">密碼:</string>
   <string name="attachproject_acctmgr_header_pwd_confirm">… 再次輸入:</string>
   <string name="attachproject_acctmgr_button">新增</string>
+  <!--error strings-->
   <string name="attachproject_error_wrong_name">找不到用戶</string>
   <string name="attachproject_error_short_pwd">密碼太短</string>
   <string name="attachproject_error_no_internet">連線失敗</string>
   <string name="attachproject_error_pwd_no_match">與密碼不符</string>
+  <string name="attachproject_error_pwd_no_retype">請再次輸入密碼</string>
   <string name="attachproject_error_no_url">請輸入用戶名稱</string>
   <string name="attachproject_error_no_email">請輸入電子郵件</string>
   <string name="attachproject_error_no_pwd">請輸入密碼</string>
@@ -64,6 +104,7 @@
   <string name="attachproject_error_bad_pwd">密碼無效</string>
   <string name="attachproject_error_creation_disabled">此專案已停用註冊功能</string>
   <string name="attachproject_error_invalid_url">網址不正確</string>
+  <!--working activity-->
   <string name="attachproject_working_back_button">返回</string>
   <string name="attachproject_working_finish_button">完成</string>
   <string name="attachproject_working_check_desc">成功</string>
@@ -77,9 +118,12 @@
   <string name="attachproject_working_login">登入</string>
   <string name="attachproject_working_acctmgr">新增帳號管理服務</string>
   <string name="attachproject_working_acctmgr_sync">同步</string>
+  <!--main activity-->
+  <string name="main_noproject_warning">點此選擇專案。</string>
   <string name="main_error">哎呀</string>
   <string name="main_error_long">…這應該不會發生!\n點擊圖示再試一次。</string>
-  <string name="main_title_icon_desc">BOINC 圖示</string>
+  <string name="main_title_icon_desc">BOINC圖示</string>
+  <!--tab names-->
   <string name="tab_status">狀態</string>
   <string name="tab_projects">專案</string>
   <string name="tab_tasks">任務</string>
@@ -87,8 +131,9 @@
   <string name="tab_preferences">偏好設定</string>
   <string name="tab_notices">通知</string>
   <string name="tab_desc">導航</string>
+  <!--status strings-->
   <string name="status_running">運算中</string>
-  <string name="status_running_long">感謝您的參加。</string>
+  <string name="status_running_long">感謝您的參與。</string>
   <string name="status_paused">已暫停</string>
   <string name="status_idle">閒置中</string>
   <string name="status_idle_long">等待任務中…</string>
@@ -99,6 +144,7 @@
   <string name="status_closing">關閉中…</string>
   <string name="status_benchmarking">效能測試中...</string>
   <string name="status_image_description">專案圖片</string>
+  <!--preferences tab strings-->
   <string name="prefs_loading">正在讀取偏好設定...</string>
   <string name="prefs_submit_button">儲存</string>
   <string name="prefs_dialog_title">輸入新參數:</string>
@@ -107,53 +153,70 @@
   <string name="prefs_category_network">網路</string>
   <string name="prefs_category_power">電源</string>
   <string name="prefs_category_cpu">CPU</string>
-  <string name="prefs_category_storage">容量</string>
+  <string name="prefs_category_storage">儲存</string>
   <string name="prefs_category_memory">記憶體</string>
   <string name="prefs_category_debug">偵錯</string>
-  <string name="prefs_show_advanced_header">顯示進階的偏好設定...</string>
+  <string name="prefs_show_advanced_header">顯示進階偏好設定...</string>
+  <string name="prefs_suspend_when_screen_on">當螢幕亮時暫停運算</string>
+  <string name="prefs_stationary_device_mode_header">固定裝置模式</string>
+  <string name="prefs_stationary_device_mode_description">忽略電源設定執行運算。僅能於裝置沒有電池時使用。</string>
+  <string name="prefs_power_source_header">運算電源選項</string>
+  <string name="prefs_power_source_description">選擇可讓BOINC使用的電力來源</string>
+  <string name="prefs_power_source_ac">充電器</string>
+  <string name="prefs_power_source_usb">USB連線</string>
+  <string name="prefs_power_source_wireless">無線充電</string>
+  <string name="prefs_power_source_battery">電池</string>
   <string name="battery_charge_min_pct_header">最低電量</string>
-  <string name="battery_charge_min_pct_description">BOINC 在低於設定的電量時即暫停運算。</string>
+  <string name="battery_charge_min_pct_description">BOINC在低於設定電量時即暫停運算。</string>
   <string name="battery_temperature_max_header">最高電池溫度</string>
-  <string name="battery_temperature_max_description">BOINC 當電池溫度高於預設值時暫停運算。不建議變更此設定值。</string>
-  <string name="prefs_disk_max_pct_header">最多使用容量</string>
-  <string name="prefs_disk_max_pct_description">BOINC 能使用多少比例的儲存空間?</string>
+  <string name="battery_temperature_max_description">BOINC當電池溫度高於預設值時暫停運算。不建議變更此設定值。</string>
+  <string name="prefs_disk_max_pct_header">最多使用儲存空間</string>
+  <string name="prefs_disk_max_pct_description">BOINC能使用多少比例的儲存空間?</string>
   <string name="prefs_disk_min_free_gb_header">最小備用容量</string>
   <string name="prefs_disk_min_free_gb_description">您的裝置有多少閒置空間可以使用?</string>
+  <string name="prefs_disk_access_interval_header">存取間隔</string>
+  <string name="prefs_disk_access_interval_description">建議存取資料間隔˙時間</string>
   <string name="prefs_network_daily_xfer_limit_mb_header">每日傳輸限制</string>
-  <string name="prefs_network_daily_xfer_limit_mb_description">限制 BOINC 的每日數據流量。</string>
-  <string name="prefs_network_wifi_only_header">只用 WiFi 傳輸</string>
+  <string name="prefs_network_daily_xfer_limit_mb_description">限制BOINC每日數據流量。</string>
+  <string name="prefs_network_wifi_only_header">只用WiFi傳輸</string>
   <string name="prefs_autostart_header">自動執行</string>
-  <string name="prefs_cpu_number_cpus_header">使用 CPU 核心</string>
-  <string name="prefs_cpu_number_cpus_description">限制 BOINC 運算時使用的核心數。</string>
-  <string name="prefs_cpu_other_load_suspension_header">暫停,當CPU使用率高於</string>
-  <string name="prefs_cpu_other_load_suspension_description">由其他應用程式使用CPU的情況來決定是否暫停BOINC。</string>
+  <string name="prefs_show_notification_notices_header">當有新訊息時顯示通知</string>
+  <string name="prefs_show_notification_suspended_header">暫停時顯示通知</string>
+  <string name="prefs_cpu_number_cpus_header">使用CPU核心</string>
+  <string name="prefs_cpu_number_cpus_description">限制BOINC運算時使用的核心數。</string>
+  <string name="prefs_cpu_other_load_suspension_header">暫停在CPU使用率高於</string>
+  <string name="prefs_cpu_other_load_suspension_description">由其他程式使用的CPU使用率決定是否暫停BOINC。</string>
   <string name="prefs_cpu_time_max_header">限制CPU</string>
-  <string name="prefs_cpu_time_max_description">限制 BOINC 運算時使用的核心數。</string>
+  <string name="prefs_cpu_time_max_description">限制BOINC運算時的CPU時間。</string>
   <string name="prefs_memory_max_idle_header">限制RAM</string>
   <string name="prefs_memory_max_idle_description">限制任務佔用 RAM 容量。</string>
-  <string name="prefs_client_log_flags_header">BOINC 客戶端紀錄檔</string>
-  <string name="prefs_gui_log_level_header">GUI 日誌等級</string>
-  <string name="prefs_gui_log_level_description">指定 GUI 紀錄的詳細程度。</string>
+  <string name="prefs_client_log_flags_header">BOINC客戶端紀錄檔標籤</string>
+  <string name="prefs_gui_log_level_header">GUI日誌等級</string>
+  <string name="prefs_gui_log_level_description">指定GUI紀錄的詳細程度。</string>
   <string name="prefs_unit_mb">MB</string>
   <string name="prefs_unit_gb">GB</string>
   <string name="prefs_unit_pct">%</string>
   <string name="prefs_unit_celcius">°C</string>
+  <string name="prefs_unit_seconds">秒</string>
+  <!--projects tab strings-->
   <string name="projects_loading">正在讀取專案…</string>
   <string name="projects_add">新增專案</string>
   <string name="projects_icon">專案圖示</string>
   <string name="projects_credits_header">積分:</string>
-  <string name="projects_credits_host_header">(在這個裝置上)</string>
+  <string name="projects_credits_host_header">(在此裝置上)</string>
   <string name="projects_credits_user_header">(總共)</string>
+  <!--project status strings-->
   <string name="projects_status_suspendedviagui">用戶已暫停</string>
   <string name="projects_status_dontrequestmorework">拒絕新任務</string>
-  <string name="projects_status_ended">專案已停止 - 按 OK 來移除</string>
+  <string name="projects_status_ended">專案已停止 - 按OK移除</string>
   <string name="projects_status_detachwhendone">當任務完成將會移除</string>
   <string name="projects_status_schedrpcpending">排程器請求等待中</string>
   <string name="projects_status_schedrpcinprogress">排程器請求處理中</string>
-  <string name="projects_status_trickleuppending">Trickle up 訊息處理中</string>
+  <string name="projects_status_trickleuppending">Trickle up訊息處理中</string>
   <string name="projects_status_backoff">排定通訊:</string>
+  <!--project controls-->
   <string name="projects_control_dialog_title">專案指令:</string>
-  <string name="projects_control_visit_website">訪問網站</string>
+  <string name="projects_control_visit_website">造訪網站</string>
   <string name="projects_control_update">更新</string>
   <string name="projects_control_remove">移除</string>
   <string name="projects_control_suspend">暫停</string>
@@ -164,27 +227,31 @@
   <string name="projects_control_dialog_title_acctmgr">帳號管理服務指令:</string>
   <string name="projects_control_sync_acctmgr">同步</string>
   <string name="projects_control_remove_acctmgr">停用</string>
+  <!--project confirm dialog-->
   <string name="projects_confirm_detach_title">移除專案?</string>
-  <string name="projects_confirm_detach_message">您確定要移除</string>
-  <string name="projects_confirm_detach_message2">從BOINC?</string>
+  <string name="projects_confirm_detach_message">您確定從BOINC將</string>
+  <string name="projects_confirm_detach_message2">移除?</string>
   <string name="projects_confirm_detach_confirm">移除</string>
   <string name="projects_confirm_reset_title">重置專案</string>
   <string name="projects_confirm_reset_message">您確定要重置</string>
+  <string name="projects_confirm_reset_message2">\?</string>
   <string name="projects_confirm_reset_confirm">重置</string>
   <string name="projects_confirm_remove_acctmgr_title">來自帳號管理員的請求</string>
   <string name="projects_confirm_remove_acctmgr_message">您確定要重置</string>
+  <string name="projects_confirm_remove_acctmgr_message2">\?</string>
   <string name="projects_confirm_remove_acctmgr_confirm">停用</string>
+  <!--tasks tab strings-->
   <string name="tasks_header_name">任務名稱:</string>
   <string name="tasks_header_elapsed_time">執行時間:</string>
   <string name="tasks_header_project_paused">(暫停)</string>
   <string name="tasks_header_deadline">上傳期限:</string>
-  <string name="tasks_result_new">新</string>
+  <string name="tasks_result_new">新任務</string>
   <string name="tasks_result_files_downloading">等待下載中</string>
   <string name="tasks_result_files_downloaded">下載完成</string>
   <string name="tasks_result_compute_error">運算錯誤</string>
   <string name="tasks_result_files_uploading">上傳中</string>
   <string name="tasks_result_files_uploaded">上傳完成</string>
-  <string name="tasks_result_aborted">已中止</string>
+  <string name="tasks_result_aborted">已停止</string>
   <string name="tasks_result_upload_failed">上傳失敗</string>
   <string name="tasks_active_uninitialized">準備</string>
   <string name="tasks_active_executing">運算中</string>
@@ -194,18 +261,20 @@
   <string name="tasks_custom_suspended_via_gui">已暫停</string>
   <string name="tasks_custom_project_suspended_via_gui">專案已暫停</string>
   <string name="tasks_custom_ready_to_report">準備回報</string>
-  <string name="confirm_abort_task_title">放棄任務?</string>
-  <string name="confirm_abort_task_message">放棄任務:</string>
+  <!--confirmation dialog-->
+  <string name="confirm_abort_task_title">停止任務?</string>
+  <string name="confirm_abort_task_message">停止任務:</string>
   <string name="confirm_abort_task_confirm">停止</string>
   <string name="confirm_cancel">取消</string>
   <string name="confirm_image_desc">確認對話框</string>
+  <!--transfers tab strings-->
   <string name="trans_loading">讀取傳輸中...</string>
   <string name="trans_upload">上傳</string>
   <string name="trans_download">下載</string>
   <string name="trans_retryin">重試</string>
   <string name="trans_failed">失敗</string>
   <string name="trans_suspended">暫停</string>
-  <string name="trans_active">活躍的</string>
+  <string name="trans_active">進行中</string>
   <string name="trans_pending">等待中</string>
   <string name="trans_projectbackoff">重新連接至專案</string>
   <string name="trans_header_name">檔案:</string>
@@ -213,53 +282,79 @@
   <string name="confirm_abort_trans_title">停止傳輸?</string>
   <string name="confirm_abort_trans_message">停止檔案:</string>
   <string name="confirm_abort_trans_confirm">停止</string>
-  <string name="notices_loading">正在讀取專案…</string>
+  <!--notices tab strings-->
+  <string name="notices_loading">正在讀取通知…</string>
+  <!--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>
+  <!--suspend reasons-->
   <string name="suspend_unknown">已暫停運算。</string>
-  <string name="suspend_batteries">將裝置連接到充電器來繼續運算。</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_disksize">硬碟空間不足。</string>
-  <string name="suspend_cputhrottle">安排 CPU 的使用。</string>
+  <string name="suspend_bm">BOINC正在測試您的裝置效能...</string>
+  <string name="suspend_disksize">儲存空間不足。</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_cpu">您的裝置忙於其他應用程式。</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_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_battery_charging">等待電池充電。</string>
   <string name="suspend_battery_charging_long">充電時將會繼續運算</string>
+  <string name="suspend_battery_charging_long2"></string>
   <string name="suspend_battery_charging_current">目前</string>
   <string name="suspend_battery_overheating">等待電池冷卻中</string>
   <string name="suspend_user_req">繼續運算...</string>
   <string name="suspend_network_user_req">手動操作。</string>
+  <!--rpc reasons-->
   <string name="rpcreason_userreq">來自用戶的請求</string>
   <string name="rpcreason_needwork">取得任務</string>
   <string name="rpcreason_resultsdue">回報完成的任務</string>
-  <string name="rpcreason_trickleup">傳送 trickle-up 訊息</string>
+  <string name="rpcreason_trickleup">傳送trickle-up訊息</string>
   <string name="rpcreason_acctmgrreq">來自帳號管理員的請求</string>
   <string name="rpcreason_init">專案初始化</string>
   <string name="rpcreason_projectreq">來自專案的請求</string>
   <string name="rpcreason_unknown">未知的原因</string>
+  <!--menu-->
   <string name="menu_refresh">重新整理</string>
   <string name="menu_emailto">用電子郵件傳送</string>
   <string name="menu_copy">複製到剪貼簿</string>
-  <string name="menu_eventlog">事件日誌</string>
-  <string name="menu_exit">離開BOINC</string>
+  <string name="menu_eventlog">事件記錄檔</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>
   <string name="menu_help">幫助</string>
+  <!--about dialog-->
   <string name="about_button">返回</string>
   <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_copyright">© 2003–2013 美國加州大學柏克萊分校\n保留所有權利。</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>
+  <!--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_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>
+  <!--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/strings.xml b/android/BOINC/res/values/strings.xml
index 59d70b3..3e3f4ec 100644
--- a/android/BOINC/res/values/strings.xml
+++ b/android/BOINC/res/values/strings.xml
@@ -59,7 +59,7 @@
     <string name="attachproject_hint_contribtion_screen">3. Turn off Screen</string>
     <string name="attachproject_hint_projectwebsite_header">Visit project websites to:</string>
     <string name="attachproject_hint_projectwebsite_science">Learn more about the science</string>
-    <string name="attachproject_hint_projectwebsite_stats">View contribtion statistics</string>
+    <string name="attachproject_hint_projectwebsite_stats">View contribution statistics</string>
     <string name="attachproject_hint_projectwebsite_community">Get in touch with other volunteers</string>
     <string name="attachproject_hint_platforms_header">BOINC is also available for your computer or laptop, visit boinc.berkeley.edu to learn more.</string>
     <!-- project login -->
@@ -82,7 +82,7 @@
     <string name="attachproject_login_category_creation">New to </string>
     <string name="attachproject_login_header_creation_enabled">Register an account to participate:</string>
     <string name="attachproject_login_header_creation_client_disabled">Visit project website to create an account:</string>
-    <string name="attachproject_login_header_creation_disabled">Project does currently now allow creation of new accounts!</string>
+    <string name="attachproject_login_header_creation_disabled">This project is not currently accepting new accounts.</string>
     <string name="attachproject_login_button_registration">Register</string>
     <string name="attachproject_login_button_login">Sign in</string>
     <string name="attachproject_login_button_forgotpw">Forgot Password</string>
@@ -208,7 +208,7 @@
     <string name="prefs_cpu_number_cpus_header">Used CPU cores</string>
     <string name="prefs_cpu_number_cpus_description">Limits the number of CPU cores BOINC uses for computation.</string>
     <string name="prefs_cpu_other_load_suspension_header">Pause at CPU usage above</string>
-    <string name="prefs_cpu_other_load_suspension_description">Determines when BOINC pauses computation due to other app\'s CPU usage.</string>
+    <string name="prefs_cpu_other_load_suspension_description">Determines when BOINC pauses computation due to other apps\' CPU usage.</string>
     <string name="prefs_cpu_time_max_header">CPU limit</string>
     <string name="prefs_cpu_time_max_description">Limits the CPU time BOINC uses for computation.</string>
     <string name="prefs_memory_max_idle_header">RAM limit</string>
@@ -220,7 +220,7 @@
     <string name="prefs_unit_gb">GB</string>
     <string name="prefs_unit_pct">%</string>
     <string name="prefs_unit_celcius">°C</string>
-    <string name="prefs_unit_seconds">s</string>
+    <string name="prefs_unit_seconds">sec</string>
 
     <!-- projects tab strings -->
     <string name="projects_loading">Reading projects…</string>
@@ -336,7 +336,7 @@
     <string name="suspend_network_quota">BOINC reached network transfer limit.</string>
     <string name="suspend_os">Stopped by Android.</string>
     <string name="suspend_wifi">Not connected to WiFi.</string>
-    <string name="suspend_battery_charging">Battery needs to charge before resuming computation.</string>
+    <string name="suspend_battery_charging">Waiting for battery to charge.</string>
     <string name="suspend_battery_charging_long">Computing will resume when battery charge reaches</string>
     <string name="suspend_battery_charging_long2"></string>
     <string name="suspend_battery_charging_current">currently</string>
@@ -392,3 +392,4 @@
     <string name="social_invite_content_url">https://play.google.com/store/apps/details?id=edu.berkeley.boinc</string>
 
 </resources>
+
diff --git a/android/build_androidtc_arm.sh b/android/build_androidtc_arm.sh
index 7264b4c..192c43a 100755
--- a/android/build_androidtc_arm.sh
+++ b/android/build_androidtc_arm.sh
@@ -9,5 +9,5 @@
 export ANDROIDTC="$HOME/androidarm-tc"
 
 if [ ! -d $ANDROIDTC/arm-linux-androideabi ]; then
-    $NDKROOT/build/tools/make-standalone-toolchain.sh --platform=android-9 --install-dir=$ANDROIDTC
+    $NDKROOT/build/tools/make-standalone-toolchain.sh --platform=android-9 --arch=arm --install-dir=$ANDROIDTC
 fi
diff --git a/android/build_build_app_arm.sh b/android/build_build_app_arm.sh
new file mode 100755
index 0000000..128c7fa
--- /dev/null
+++ b/android/build_build_app_arm.sh
@@ -0,0 +1,31 @@
+#/bin/sh
+
+#
+# See: http://boinc.berkeley.edu/trac/wiki/AndroidBuildApp
+#
+
+# Script to compile a generic application on Android
+
+export ANDROIDTC="$HOME/androidarm-tc"
+export TCBINARIES="$ANDROIDTC/bin"
+export TCINCLUDES="$ANDROIDTC/arm-linux-androideabi"
+export TCSYSROOT="$ANDROIDTC/sysroot"
+export STDCPPTC="$TCINCLUDES/lib/libstdc++.a"
+
+export PATH="$PATH:$TCBINARIES:$TCINCLUDES/bin"
+export CC=arm-linux-androideabi-gcc
+export CXX=arm-linux-androideabi-g++
+export LD=arm-linux-androideabi-ld
+export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer -fPIE"
+export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -O3 -fomit-frame-pointer -fPIE"
+export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog -fPIE -pie"
+export GDB_CFLAGS="--sysroot=$TCSYSROOT -Wall -g -I$TCINCLUDES/include"
+
+make clean
+
+if [ -e "./configure" ]; then
+./configure --host=arm-linux --prefix=$TCINCLUDES --libdir="$TCINCLUDES/lib" --disable-shared --enable-static
+fi
+
+make
+
diff --git a/android/build_build_app_mips.sh b/android/build_build_app_mips.sh
new file mode 100755
index 0000000..a5f0d2c
--- /dev/null
+++ b/android/build_build_app_mips.sh
@@ -0,0 +1,30 @@
+#/bin/sh
+
+#
+# See: http://boinc.berkeley.edu/trac/wiki/AndroidBuildApp
+#
+
+# Script to compile a generic application on Android
+
+export ANDROIDTC="$HOME/androidmips-tc"
+export TCBINARIES="$ANDROIDTC/bin"
+export TCINCLUDES="$ANDROIDTC/mipsel-linux-android"
+export TCSYSROOT="$ANDROIDTC/sysroot"
+export STDCPPTC="$TCINCLUDES/lib/libstdc++.a"
+
+export PATH="$PATH:$TCBINARIES:$TCINCLUDES/bin"
+export CC=mipsel-linux-android-gcc
+export CXX=mipsel-linux-android-g++
+export LD=mipsel-linux-android-ld
+export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer -fPIE"
+export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -O3 -fomit-frame-pointer -fPIE"
+export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog -fPIE -pie"
+export GDB_CFLAGS="--sysroot=$TCSYSROOT -Wall -g -I$TCINCLUDES/include"
+
+make clean
+
+if [ -e "./configure" ]; then
+./configure --host=mipsel-linux --prefix=$TCINCLUDES --libdir="$TCINCLUDES/lib" --disable-shared --enable-static
+fi
+
+make
diff --git a/android/build_build_app_x86.sh b/android/build_build_app_x86.sh
new file mode 100755
index 0000000..94c604f
--- /dev/null
+++ b/android/build_build_app_x86.sh
@@ -0,0 +1,30 @@
+#/bin/sh
+
+#
+# See: http://boinc.berkeley.edu/trac/wiki/AndroidBuildApp
+#
+
+# Script to compile a generic application on Android
+
+export ANDROIDTC="$HOME/androidx86-tc"
+export TCBINARIES="$ANDROIDTC/bin"
+export TCINCLUDES="$ANDROIDTC/i686-linux-android"
+export TCSYSROOT="$ANDROIDTC/sysroot"
+export STDCPPTC="$TCINCLUDES/lib/libstdc++.a"
+
+export PATH="$PATH:$TCBINARIES:$TCINCLUDES/bin"
+export CC=i686-linux-android-gcc
+export CXX=i686-linux-android-g++
+export LD=i686-linux-android-ld
+export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer -fPIE"
+export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -O3 -fomit-frame-pointer -fPIE"
+export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog -fPIE -pie"
+export GDB_CFLAGS="--sysroot=$TCSYSROOT -Wall -g -I$TCINCLUDES/include"
+
+make clean
+
+if [ -e "./confgiure" ]; then
+./configure --host=i686-linux --prefix=$TCINCLUDES --libdir="$TCINCLUDES/lib" --disable-shared --enable-static
+fi
+
+make
diff --git a/api/boinc_api.cpp b/api/boinc_api.cpp
index dea49f9..53dcd6e 100644
--- a/api/boinc_api.cpp
+++ b/api/boinc_api.cpp
@@ -135,7 +135,13 @@ static volatile bool standalone = false;
 static volatile double initial_wu_cpu_time;
 static volatile bool have_new_trickle_up = false;
 static volatile bool have_trickle_down = true;
-    // on first call, scan slot dir for msgs
+    // set if the client notified us of a trickle-down.
+    // init to true so the first call to boinc_receive_trickle_down()
+    // will scan the slot dir for old trickle-down files
+static volatile bool handle_trickle_downs = false;
+    // whether we should check for notifications of trickle_downs
+    // and file upload status.
+    // set by boinc_receive_trickle_down() and boinc_upload_file().
 static volatile int heartbeat_giveup_count;
     // interrupt count value at which to give up on client
 #ifdef _WIN32
@@ -661,7 +667,6 @@ int boinc_get_status(BOINC_STATUS *s) {
 //
 static void send_trickle_up_msg() {
     char buf[MSG_CHANNEL_SIZE];
-    BOINCINFO("Sending Trickle Up Message");
     if (standalone) return;
     strcpy(buf, "");
     if (have_new_trickle_up) {
@@ -671,6 +676,7 @@ static void send_trickle_up_msg() {
         strcat(buf, "<have_new_upload_file/>\n");
     }
     if (strlen(buf)) {
+        BOINCINFO("Sending Trickle Up Message");
         if (app_client_shm->shm->trickle_up.send_msg(buf)) {
             have_new_trickle_up = false;
             have_new_upload_file = false;
@@ -1021,7 +1027,7 @@ static void handle_upload_file_status() {
     }
 }
 
-// handle trickle and file upload messages
+// handle trickle and file upload status messages
 //
 static void handle_trickle_down_msg() {
     char buf[MSG_CHANNEL_SIZE];
@@ -1147,7 +1153,7 @@ static void timer_handler() {
         if (options.check_heartbeat) {
             handle_heartbeat_msg();
         }
-        if (options.handle_trickle_downs) {
+        if (handle_trickle_downs) {
             handle_trickle_down_msg();
         }
         if (options.handle_process_control) {
@@ -1173,18 +1179,19 @@ static void timer_handler() {
     // see if the client has died, which means we need to die too
     // (unless we're in a critical section)
     //
-    if (in_critical_section==0 && options.check_heartbeat) {
+    if (options.check_heartbeat) {
         if (client_dead()) {
             fprintf(stderr, "%s timer handler: client dead, exiting\n",
                 boinc_msg_prefix(buf, sizeof(buf))
             );
-            if (options.direct_process_action) {
+            if (options.direct_process_action && !in_critical_section) {
                 exit_from_timer_thread(0);
             } else {
                 boinc_status.no_heartbeat = true;
             }
         }
     }
+
     // don't bother reporting CPU time etc. if we're suspended
     //
     if (options.send_status_msgs && !boinc_status.suspended) {
@@ -1193,7 +1200,7 @@ static void timer_handler() {
         update_app_progress(last_wu_cpu_time, last_checkpoint_cpu_time);
     }
     
-    if (options.handle_trickle_ups) {
+    if (have_new_trickle_up || have_new_upload_file) {
         send_trickle_up_msg();
     }
     if (timer_callback) {
@@ -1359,11 +1366,13 @@ static int start_worker_signals() {
 #endif
 
 int boinc_send_trickle_up(char* variety, char* p) {
-    if (!options.handle_trickle_ups) return ERR_NO_OPTION;
     FILE* f = boinc_fopen(TRICKLE_UP_FILENAME, "wb");
     if (!f) return ERR_FOPEN;
     fprintf(f, "<variety>%s</variety>\n", variety);
-    size_t n = fwrite(p, strlen(p), 1, f);
+    size_t n = 1;
+    if (strlen(p)) {
+        n = fwrite(p, strlen(p), 1, f);
+    }
     fclose(f);
     if (n != 1) return ERR_WRITE;
     have_new_trickle_up = true;
@@ -1420,13 +1429,16 @@ void boinc_end_critical_section() {
     // See if we got suspend/quit/abort while in critical section,
     // and handle them here.
     //
-    if (boinc_status.quit_request) {
-        boinc_exit(0);
-    }
-    if (boinc_status.abort_request) {
-        boinc_exit(EXIT_ABORTED_BY_CLIENT);
-    }
     if (options.direct_process_action) {
+        if (boinc_status.no_heartbeat) {
+            boinc_exit(0);
+        }
+        if (boinc_status.quit_request) {
+            boinc_exit(0);
+        }
+        if (boinc_status.abort_request) {
+            boinc_exit(EXIT_ABORTED_BY_CLIENT);
+        }
         acquire_mutex();
         if (suspend_request) {
             suspend_request = false;
@@ -1448,7 +1460,7 @@ int boinc_receive_trickle_down(char* buf, int len) {
     std::string filename;
     char path[MAXPATHLEN];
 
-    if (!options.handle_trickle_downs) return false;
+    handle_trickle_downs = true;
 
     if (have_trickle_down) {
         relative_to_absolute("", path);
@@ -1476,10 +1488,15 @@ int boinc_upload_file(std::string& name) {
     if (!f) return ERR_FOPEN;
     have_new_upload_file = true;
     fclose(f);
+
+    // file upload status messages are on same channel as
+    // trickle down messages, so listen to that channel
+    //
+    handle_trickle_downs = true;
+
     return 0;
 }
 
-
 int boinc_upload_status(std::string& name) {
     for (unsigned int i=0; i<upload_file_status.size(); i++) {
         UPLOAD_FILE_STATUS& ufs = upload_file_status[i];
diff --git a/api/boinc_api.h b/api/boinc_api.h
index f34d8d1..003ee5b 100644
--- a/api/boinc_api.h
+++ b/api/boinc_api.h
@@ -46,11 +46,6 @@ typedef struct BOINC_OPTIONS {
     int check_heartbeat;
         // check for timeout of heartbeats from the client;
         // action is determined by direct_process_action (see below)
-    int handle_trickle_ups;
-        // periodically check for trickle-up msgs from the app
-        // must set this to use boinc_send_trickle_up()
-    int handle_trickle_downs;
-        // this process is allowed to call boinc_receive_trickle_down()
     int handle_process_control;
         // whether runtime system should read suspend/resume/quit/abort
         // msgs from client.
@@ -61,6 +56,7 @@ typedef struct BOINC_OPTIONS {
         // if heartbeat fail, or get process control msg, take
         // direction action (exit, suspend, resume).
         // Otherwise just set flag in BOINC status
+        // This is true for regular apps, false for wrappers
     int multi_thread;
         // set this if application creates threads in main process
     int multi_process;
@@ -165,8 +161,6 @@ extern bool boinc_disable_timer_thread;
 inline void boinc_options_defaults(BOINC_OPTIONS& b) {
     b.main_program = 1;
     b.check_heartbeat = 1;
-    b.handle_trickle_ups = 1;
-    b.handle_trickle_downs = 1;
     b.handle_process_control = 1;
     b.send_status_msgs = 1;
     b.direct_process_action = 1;
diff --git a/api/graphics2.h b/api/graphics2.h
index 1dc5504..1f396ce 100644
--- a/api/graphics2.h
+++ b/api/graphics2.h
@@ -18,6 +18,8 @@
 #ifndef _GRAPHICS2_H_
 #define _GRAPHICS2_H_
 
+struct BOINC_STATUS;
+
 // Functions that must be supplied by the app
 //
 extern void app_graphics_render(int xs, int ys, double time_of_day);
@@ -31,11 +33,22 @@ extern void boinc_app_key_release(int, int);
 // Functions that the app can call
 //
 extern void boinc_graphics_loop(int argc, char** argv, const char* title=0);
-extern void* boinc_graphics_make_shmem(const char*, int);
-extern void* boinc_graphics_get_shmem(const char*);
 extern void boinc_set_windows_icon(const char* icon16,const char* icon48);
 extern void boinc_close_window_and_quit(const char*);
 
+// functions for communication between main app and graphics app
+//
+extern void* boinc_graphics_make_shmem(const char*, int);
+extern void* boinc_graphics_get_shmem(const char*);
+extern int boinc_write_graphics_status(
+    double cpu_time, double elapsed_time,
+    double fraction_done
+);
+extern int boinc_parse_graphics_status(
+    double* update_time, double* cpu_time,
+    double* elapsed_time, double* fraction_done, BOINC_STATUS* status
+);
+
 // Implementation stuff
 //
 extern double boinc_max_fps;
diff --git a/api/graphics2_util.cpp b/api/graphics2_util.cpp
index 91f2dd2..169b7ab 100644
--- a/api/graphics2_util.cpp
+++ b/api/graphics2_util.cpp
@@ -27,10 +27,13 @@
 #endif
 
 #include <cstring>
+
 #include "shmem.h"
-#include "filesys.h"
 #include "app_ipc.h"
 #include "boinc_api.h"
+#include "filesys.h"
+#include "util.h"
+
 #include "graphics2.h"
 
 #ifdef __EMX__
@@ -108,3 +111,91 @@ void* boinc_graphics_get_shmem(const char* prog_name) {
     return p;
 }
 #endif
+
+#define GRAPHICS_STATUS_FILENAME "graphics_status.xml"
+
+int boinc_write_graphics_status(
+    double cpu_time, double elapsed_time,
+    double fraction_done
+){
+    MIOFILE mf;
+    FILE* f = boinc_fopen(GRAPHICS_STATUS_FILENAME, "w");
+    mf.init_file(f);
+    mf.printf(
+        "<graphics_status>\n"
+        "    <updated_time>%f</updated_time>\n"
+        "    <cpu_time>%f</cpu_time>\n"
+        "    <elapsed_time>%f</elapsed_time>\n"
+        "    <fraction_done>%f</fraction_done>\n"
+        "    <boinc_status>\n"
+        "        <no_heartbeat>%d</no_heartbeat>\n"
+        "        <suspended>%d</suspended>\n"
+        "        <quit_request>%d</quit_request>\n"
+        "        <abort_request>%d</abort_request>\n"
+        "        <network_suspended>%d</network_suspended>\n"
+        "    </boinc_status>\n"
+        "</graphics_status>\n",
+        dtime(),
+        cpu_time,
+        elapsed_time,
+        fraction_done,
+        boinc_status.no_heartbeat,
+        boinc_status.suspended,
+        boinc_status.quit_request,
+        boinc_status.abort_request,
+        boinc_status.network_suspended
+    );
+    fclose(f);
+    return 0;
+}
+
+int boinc_parse_graphics_status(
+    double* updated_time, double* cpu_time,
+    double* elapsed_time, double* fraction_done, BOINC_STATUS* status
+){
+    MIOFILE mf;
+    FILE* f = boinc_fopen(GRAPHICS_STATUS_FILENAME, "r");
+    if (!f) {
+        return ERR_FOPEN;
+    }
+    mf.init_file(f);
+    XML_PARSER xp(&mf);
+
+    *updated_time = 0;
+    *cpu_time = 0;
+    *elapsed_time = 0;
+    *fraction_done = 0;
+    memset(status, 0, sizeof(BOINC_STATUS));
+
+    if (!xp.parse_start("graphics_status")) return ERR_XML_PARSE;
+    while (!xp.get_tag()) {
+        if (!xp.is_tag) {
+            continue;
+        }
+        if (xp.match_tag("/graphics_status")) {
+            fclose(f);
+            return 0;
+        }
+        if (xp.match_tag("boinc_status")) {
+            while (!xp.get_tag()) {
+                if (!xp.is_tag) {
+                    continue;
+                }
+                if (xp.match_tag("/boinc_status")) {
+                    break;
+                }
+                else if (xp.parse_int("no_heartbeat", status->no_heartbeat)) continue;
+                else if (xp.parse_int("suspended", status->suspended)) continue;
+                else if (xp.parse_int("quit_request", status->quit_request)) continue;
+                else if (xp.parse_int("abort_request", status->abort_request)) continue;
+                else if (xp.parse_int("network_suspended", status->network_suspended)) continue;
+            }
+        }
+        else if (xp.parse_double("updated_time", *updated_time)) continue;
+        else if (xp.parse_double("cpu_time", *cpu_time)) continue;
+        else if (xp.parse_double("elapsed_time", *elapsed_time)) continue;
+        else if (xp.parse_double("fraction_done", *fraction_done)) continue;
+    }
+    fclose(f);
+    return ERR_XML_PARSE;
+}
diff --git a/api/ttfont.cpp b/api/ttfont.cpp
deleted file mode 100644
index 5dbcd01..0000000
--- a/api/ttfont.cpp
+++ /dev/null
@@ -1,205 +0,0 @@
-// This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2010 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/>.
-
-
-// utility functions for TrueType font OpenGL graphics
-
-// FTGL OpenGL TrueType/FreeType font rendering
-// you will need to build & link against freetype2 and ftgl
-// tested using ftgl version 2.1.3 rc5 and freetype version 2.4.10
-
-// ftgl library:  http://sourceforge.net/projects/ftgl/files/FTGL%20Source/
-// freetype2 library:  http://www.freetype.org/
-
-// this should basically be a drop-in for the old boinc txf_* functions i.e.
-// txf_load_fonts and txf_render_string,
-// with extra options on the latter for rotating etc
-
-// originally adapted by Carl Christensen
-
-#if defined(_WIN32) && !defined(__STDWX_H__) && !defined(_BOINC_WIN_) && !defined(_AFX_STDAFX_H_) 
-#include "boinc_win.h"
-#endif
-
-#include "boinc_gl.h"
-#include <FTGL/ftgl.h>
-
-#include "ttfont.h"
-#include "filesys.h"  // from boinc for file_exists
-
-// I put in it's own namespace so call TTFont::ttf_load_fonts() etc
-//
-namespace TTFont {  
-
-// The Liberation version 2.00.0 fonts referenced below are free 
-// fonts under the SIL Open Font License version 1.1.  You can 
-// download the license and fonts from
-// https://fedorahosted.org/liberation-fonts
-//
-// Another source of free fonts is the GNU FreeFont project 
-// at http://www.gnu.org/software/freefont
-
-// you'll want to define a 2-d array of char as appropriate for your 
-// truetype font filenames (path is set in the call to ttf_load_fonts)
-//
-static const char *g_cstrFont[] = {
-    "LiberationSans-Regular.ttf",       // 0, this is the default
-    "LiberationSans-Bold.ttf",          // 1
-    "LiberationSans-Italic.ttf",        // 2
-    "LiberationSans-BoldItalic.ttf",    // 3
-    "LiberationSerif-Regular.ttf",      // 4
-    "LiberationSerif-Bold.ttf",         // 5
-    "LiberationSerif-Italic.ttf",       // 6
-    "LiberationSerif-BoldItalic.ttf",   // 7
-    "LiberationMono-Regular.ttf",       // 8
-    "LiberationMono-Bold.ttf",          // 9
-    "LiberationMono-Italic.ttf",        // 10
-    "LiberationMono-BoldItalic.ttf"     // 11
-};
-    
-// define the number of fonts supported
-#define NUM_FONT (sizeof(g_cstrFont) / sizeof(char*))
-
-FTFont* g_font[NUM_FONT];
-int g_iFont = -1;
-
-// Load fonts. call once.
-// Pass in the font directory (normally the project directory:
-// APP_INIT_DATA::project_dir for BOINC apps),
-// and any special-scaling font name & size
-// (e.g. if I want a huge typeface for Sans-Serif Regular
-// then I pass in "LiberationSans-Regular.ttf", 3000)
-//
-void ttf_load_fonts(
-    const char* dir, const char* strScaleFont, const int& iScaleFont
-) {
-    static bool bInit = false;
-        // flag so we don't call again, otherwise we'll have memory leaks
-        // each subsequent call to new FTTextureFont etc
-    if (bInit) return; // we've already been here
-    bInit = true; // we're in now!
-    ttf_cleanup();
-    memset(g_font, 0x00, sizeof(FTFont*) * NUM_FONT);
-        // initialize to null's for error checking later
-    char vpath[MAXPATHLEN];
-    g_iFont = -1;
-    for (unsigned int i=0 ; i < NUM_FONT; i++){
-        sprintf(vpath, "%s/%s", dir, g_cstrFont[i]);
-        if (boinc_file_exists(vpath)) {
-            //g_font[i] = new FTBitmapFont(vpath);
-            //g_font[i] = new FTPixmapFont(vpath);
-            //g_font[i] = new FTPolygonFont(vpath);
-            g_font[i] = new FTTextureFont(vpath);
-            if(!g_font[i]->Error()) {
-#ifdef _DEBUG
-               fprintf(stderr, "Successfully loaded '%s'...\n", vpath);
-#endif
-                int iScale = 30;
-                if (strScaleFont && !strcmp(strScaleFont, g_cstrFont[i])) iScale = iScaleFont;
-                if(!g_font[i]->FaceSize(iScale)) {
-                    fprintf(stderr, "Failed to set size");
-                }
-
-                g_font[i]->Depth(3.);
-                g_font[i]->Outset(-.5f, 1.5f);
-
-                g_font[i]->CharMap(ft_encoding_unicode);
-                g_iFont = i;
-
-            }
-#ifdef _DEBUG
-            else {
-                fprintf(stderr, "Failed to load '%s'...\n", vpath);
-            }
-#endif
-        }
-    }  
-}
-
-// remove our objects
-//
-void ttf_cleanup() {
-    for (unsigned int i = 0; i < NUM_FONT; i++) {
-        if (g_font[i]) {
-            delete g_font[i];
-            g_font[i] = NULL;
-        }
-    }
-}
-
-
-void ttf_render_string(
-    const double& x,
-    const double& y,
-    const double& z,                // text position
-    const float& fscale,            // scale factor
-    const GLfloat* col,             // colour 4vf
-    const char* s,                  // string ptr
-    const int& iFont,               // font index
-    const float& fRotAngle,         // optional rotation angle
-    const float& fRotX,             // optional rotation vector for X
-    const float& fRotY,             // optional rotation vector for Y
-    const float& fRotZ,             // optional rotation vector for Z
-    const float& fRadius            // circular radius to draw along
-) {
-        // http://ftgl.sourceforge.net/docs/html/
-
-    // if requested font isn't available, find first one that is
-    //
-    unsigned int theFont = iFont;
-    while((theFont < NUM_FONT) && !g_font[theFont]) theFont++;
-	if((theFont >= NUM_FONT) || !g_font[theFont]) {
-        // bad font index
-        return;
-    }
-
-    int renderMode = FTGL::RENDER_FRONT; //ALL; //FRONT | FTGL::FTGL_RENDER_BACK;
-
-    glColor4fv(col);
-    glPushMatrix();
-
-    glTranslated(x, y, z);
-    glScaled(1.0f / fscale, 1.0f / fscale, 1.0f / fscale);
-    glEnable(GL_TEXTURE_2D);
-
-    if (fRotAngle != 0.0f) {
-        glRotatef(fRotAngle, fRotX, fRotY, fRotZ);
-    }
-
-    if (fRadius == 0.0f) {
-        g_font[theFont]->Render(s, -1, FTPoint(), FTPoint(), renderMode);
-    }
-    else {
-        int i = 0;
-        float fAdvance = 1.0f;
-        while ( *(s+i) ) {
-            fAdvance = g_font[theFont]->Advance((s+i), 1, FTPoint());
-            g_font[theFont]->Render((s+i), 1, FTPoint(), FTPoint(), renderMode);
-            glTranslated(fAdvance, 0.0f, 0.0f);
-            glRotatef(fRadius * fAdvance / (float) 20.0f, 0.0f, 0.0f, 1.0f);
-            i++;
-        }
-    }
-
-    glDisable(GL_TEXTURE_2D);
-
-    glPopMatrix();
-}
-
-}   // namespace
-
-
diff --git a/api/ttfont.h b/api/ttfont.h
deleted file mode 100644
index c8b1b0e..0000000
--- a/api/ttfont.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2010 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/>.
-
-
-// utility functions for TrueType font OpenGL graphics
-
-// FTGL OpenGL TrueType/FreeType font rendering
-// you will need to build & link against freetype2 and ftgl
-// tested using ftgl version 2.1.3 rc5 and freetype version 2.3.9
-
-// ftgl library:  http://sourceforge.net/projects/ftgl/files/FTGL%20Source/
-// freetype2 library:  http://www.freetype.org/
-
-// this should basically be a drop-in for the old boinc txf_* functions,
-// i.e. txf_load_font and txf_render_string,
-// with extra options on the latter for rotating etc
-
-// originally adapted by Carl Christensen
-
-
-#ifndef _TTFONT_H_
-#define _TTFONT_H_
-
-// I put in its own namespace so call TTFont::ttf_load_fonts() etc
-
-namespace TTFont {
-    extern int g_iFont;
-
-    extern void ttf_load_fonts(
-        const char* dir = NULL,
-        const char* strScaleFont = NULL,
-        const int& iScaleFont =30
-    );
-
-    extern void ttf_render_string(
-       const double& x,
-       const double& y,
-       const double& z,                     // text position
-       const float& fscale,                 // scale factor
-       const GLfloat * col,                 // colour
-       const char* s,                       // string ptr
-       const int& iFont = 0,                // font index
-       const float& fRotAngle = 0.0f,       // optional rotation angle
-       const float& fRotX = 0.0f,           // optional rotation vector for X
-       const float& fRotY = 0.0f,           // optional rotation vector for Y
-       const float& fRotZ = 1.0f,           // optional rotation vector for Z
-       const float& fRadius = 0.0f          // circular radius to draw along
-     );
-
-     void ttf_cleanup();
-}  // namespace
-
-#endif // inclusion
diff --git a/build/getWxWidgets.sh b/build/getWxWidgets.sh
new file mode 100755
index 0000000..273a199
--- /dev/null
+++ b/build/getWxWidgets.sh
@@ -0,0 +1,26 @@
+#!/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/Makefile.am b/client/Makefile.am
index 3b5e690..e86dc76 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -126,16 +126,16 @@ switcher_LDADD = $(LIBBOINC)
 
 ## since we are using libtool we need some magic to get boinc and boinc_client
 ## to both be installed properly.  The next two rules do that...
-all-local: boinc
+all-local: boinc$(EXEEXT)
 
-boinc: boinc_client
-	rm -f boinc .libs/boinc
-	$(LN) boinc_client boinc
-	if test -f .libs/boinc_client ; then $(LN) .libs/boinc_client .libs/boinc ; fi
+boinc$(EXEEXT): boinc_client$(EXEEXT)
+	rm -f boinc$(EXEEXT) .libs/boinc$(EXEEXT)
+	$(LN) boinc_client$(EXEEXT) boinc$(EXEEXT)
+	if test -f .libs/boinc_client$(EXEEXT) ; then $(LN) .libs/boinc_client$(EXEEXT) .libs/boinc$(EXEEXT) ; fi
 
 install-exec-hook:
-	rm -f $(DESTDIR)$(exec_prefix)/bin/boinc
-	$(LN) $(DESTDIR)$(exec_prefix)/bin/boinc_client $(DESTDIR)$(exec_prefix)/bin/boinc
+	rm -f $(DESTDIR)$(exec_prefix)/bin/boinc$(EXEEXT)
+	$(LN) $(DESTDIR)$(exec_prefix)/bin/boinc_client$(EXEEXT) $(DESTDIR)$(exec_prefix)/bin/boinc$(EXEEXT)
 
 ## these source files need to be specified because no rule uses them.
 
diff --git a/client/app.cpp b/client/app.cpp
index 64619d8..9bbadd2 100644
--- a/client/app.cpp
+++ b/client/app.cpp
@@ -293,7 +293,7 @@ void ACTIVE_TASK_SET::free_mem() {
 
 bool app_running(PROC_MAP& pm, const char* p) {
     PROC_MAP::iterator i;
-    for (i=pm.begin(); i!=pm.end(); i++) {
+    for (i=pm.begin(); i!=pm.end(); ++i) {
         PROCINFO& pi = i->second;
         //msg_printf(0, MSG_INFO, "running: [%s]", pi.command);
         if (!strcasecmp(pi.command, p)) {
diff --git a/client/app_config.cpp b/client/app_config.cpp
index 1f796ba..b9440a7 100644
--- a/client/app_config.cpp
+++ b/client/app_config.cpp
@@ -59,7 +59,7 @@ int APP_CONFIG::parse_gpu_versions(XML_PARSER& xp, PROJECT* p) {
         }
     }
     msg_printf_notice(p, false, NULL,
-        "missing </gpu_versions> in app_config.xml"
+        "Missing </gpu_versions> in app_config.xml"
     );
     return ERR_XML_PARSE;
 }
@@ -97,8 +97,8 @@ int APP_CONFIG::parse(XML_PARSER& xp, PROJECT* p) {
         }
         xp.skip_unexpected(log_flags.unparsed_xml, "APP_CONFIG::parse");
     }
-    msg_printf(p, MSG_USER_ALERT,
-        "missing </app> in app_config.xml"
+    msg_printf_notice(p, false, NULL,
+        "Missing </app> in app_config.xml"
     );
     return ERR_XML_PARSE;
 }
@@ -127,8 +127,8 @@ int APP_VERSION_CONFIG::parse(XML_PARSER& xp, PROJECT* p) {
         }
         xp.skip_unexpected(log_flags.unparsed_xml, "APP_VERSION_CONFIG::parse");
     }
-    msg_printf(p, MSG_USER_ALERT,
-        "missing </app_version> in app_config.xml"
+    msg_printf_notice(p, false, NULL,
+        "Missing </app_version> in app_config.xml"
     );
     return ERR_XML_PARSE;
 }
@@ -178,8 +178,8 @@ int APP_CONFIGS::parse(XML_PARSER& xp, PROJECT* p) {
 
         xp.skip_unexpected(log_flags.unparsed_xml, "APP_CONFIGS::parse");
     }
-    msg_printf(p, MSG_USER_ALERT,
-        "missing </app_config> in app_config.xml"
+    msg_printf_notice(p, false, NULL,
+        "Missing </app_config> in app_config.xml"
     );
     return ERR_XML_PARSE;
 }
diff --git a/client/app_control.cpp b/client/app_control.cpp
index bb6fb0d..73ca70d 100644
--- a/client/app_control.cpp
+++ b/client/app_control.cpp
@@ -1125,7 +1125,7 @@ int ACTIVE_TASK_SET::abort_project(PROJECT* project) {
             task_iter = active_tasks.erase(task_iter);
             delete atp;
         } else {
-            task_iter++;
+            ++task_iter;
         }
     }
     return 0;
diff --git a/client/app_start.cpp b/client/app_start.cpp
index 8ab0b69..c43ae34 100644
--- a/client/app_start.cpp
+++ b/client/app_start.cpp
@@ -672,7 +672,7 @@ int ACTIVE_TASK::start(bool test) {
     char slotdirpath[MAXPATHLEN];
     char error_msg[1024];
     char error_msg2[1024];
-    DWORD last_error;
+    DWORD last_error = 0;
     
     memset(&process_info, 0, sizeof(process_info));
     memset(&startup_info, 0, sizeof(startup_info));
diff --git a/client/async_file.cpp b/client/async_file.cpp
index 428da7b..a28a829 100644
--- a/client/async_file.cpp
+++ b/client/async_file.cpp
@@ -153,7 +153,7 @@ void remove_async_copy(ASYNC_COPY* acp) {
             async_copies.erase(i);
             break;
         }
-        i++;
+        ++i;
     }
     delete acp;
 }
@@ -291,7 +291,7 @@ void remove_async_verify(ASYNC_VERIFY* avp) {
             async_verifies.erase(i);
             break;
         }
-        i++;
+        ++i;
     }
     delete avp;
 }
diff --git a/client/client_state.cpp b/client/client_state.cpp
index 45bd9bd..755f1de 100644
--- a/client/client_state.cpp
+++ b/client/client_state.cpp
@@ -391,7 +391,11 @@ int CLIENT_STATE::init() {
     msg_printf(NULL, MSG_INFO, "Libraries: %s", curl_version());
 
     if (executing_as_daemon) {
+#ifdef _WIN32
+        msg_printf(NULL, MSG_INFO, "Running as a daemon (GPU computing disabled)");
+#else
         msg_printf(NULL, MSG_INFO, "Running as a daemon");
+#endif
     }
 
     relative_to_absolute("", buf);
@@ -1518,7 +1522,7 @@ bool CLIENT_STATE::garbage_collect_always() {
 #endif
         rp->avp->ref_cnt++;
         rp->wup->ref_cnt++;
-        result_iter++;
+        ++result_iter;
     }
 
     // delete WORKUNITs not referenced by any in-progress result;
@@ -1541,7 +1545,7 @@ bool CLIENT_STATE::garbage_collect_always() {
             for (i=0; i<wup->input_files.size(); i++) {
                 wup->input_files[i].file_info->ref_cnt++;
             }
-            wu_iter++;
+            ++wu_iter;
         }
     }
 
@@ -1571,10 +1575,10 @@ bool CLIENT_STATE::garbage_collect_always() {
                 avp_iter = app_versions.erase(avp_iter);
                 action = true;
             } else {
-                avp_iter++;
+                ++avp_iter;
             }
         } else {
-            avp_iter++;
+            ++avp_iter;
         }
     }
 
@@ -1591,7 +1595,7 @@ bool CLIENT_STATE::garbage_collect_always() {
     // reference-count sticky files not marked for deletion
     //
 
-    for (fi_iter = file_infos.begin(); fi_iter!=file_infos.end(); fi_iter++) {
+    for (fi_iter = file_infos.begin(); fi_iter!=file_infos.end(); ++fi_iter) {
         fip = *fi_iter;
         if (fip->sticky_expire_time && now > fip->sticky_expire_time) {
             fip->sticky = false;
@@ -1614,7 +1618,7 @@ bool CLIENT_STATE::garbage_collect_always() {
             delete pfx;
             pfx_iter = pers_file_xfers->pers_file_xfers.erase(pfx_iter);
         } else {
-            pfx_iter++;
+            ++pfx_iter;
         }
     }
 
@@ -1635,7 +1639,7 @@ bool CLIENT_STATE::garbage_collect_always() {
             fi_iter = file_infos.erase(fi_iter);
             action = true;
         } else {
-            fi_iter++;
+            ++fi_iter;
         }
     }
 
@@ -1714,7 +1718,7 @@ bool CLIENT_STATE::update_results() {
             }
             break;
         }
-        result_iter++;
+        ++result_iter;
     }
     return action;
 }
@@ -1936,7 +1940,7 @@ int CLIENT_STATE::reset_project(PROJECT* project, bool detaching) {
                 avp_iter = app_versions.erase(avp_iter);
                 delete avp;
             } else {
-                avp_iter++;
+                ++avp_iter;
             }
         }
 
@@ -1947,7 +1951,7 @@ int CLIENT_STATE::reset_project(PROJECT* project, bool detaching) {
                 app_iter = apps.erase(app_iter);
                 delete app;
             } else {
-                app_iter++;
+                ++app_iter;
             }
         }
         garbage_collect_always();
@@ -2005,13 +2009,13 @@ int CLIENT_STATE::detach_project(PROJECT* project) {
             fi_iter = file_infos.erase(fi_iter);
             delete fip;
         } else {
-            fi_iter++;
+            ++fi_iter;
         }
     }
 
     // find project and remove it from the vector
     //
-    for (project_iter = projects.begin(); project_iter != projects.end(); project_iter++) {
+    for (project_iter = projects.begin(); project_iter != projects.end(); ++project_iter) {
         p = *project_iter;
         if (p == project) {
             project_iter = projects.erase(project_iter);
diff --git a/client/client_state.h b/client/client_state.h
index bd2e6b4..74ff594 100644
--- a/client/client_state.h
+++ b/client/client_state.h
@@ -77,6 +77,7 @@ using std::vector;
 struct CLIENT_STATE {
     vector<PLATFORM> platforms;
     vector<PROJECT*> projects;
+        // in alphabetical order, to improve display
     vector<APP*> apps;
     vector<FILE_INFO*> file_infos;
     vector<APP_VERSION*> app_versions;
@@ -456,6 +457,7 @@ struct CLIENT_STATE {
     int write_file_transfers_gui(MIOFILE&);
     int write_tasks_gui(MIOFILE&, bool);
     void sort_results();
+    void sort_projects();
 
 // --------------- cs_trickle.cpp:
     int read_trickle_files(PROJECT*, FILE*);
diff --git a/client/coproc_sched.cpp b/client/coproc_sched.cpp
index 34d6956..ec33283 100644
--- a/client/coproc_sched.cpp
+++ b/client/coproc_sched.cpp
@@ -317,7 +317,7 @@ void assign_coprocs(vector<RESULT*>& jobs) {
             usage = avp->gpu_usage.usage;
             cp = &coprocs.coprocs[rt];
         } else {
-            job_iter++;
+            ++job_iter;
             continue;
         }
 
@@ -325,20 +325,20 @@ void assign_coprocs(vector<RESULT*>& jobs) {
         if (atp && atp->is_gpu_task_running()) {
             if (current_assignment_ok(rp, usage, cp)) {
                 confirm_current_assignment(rp, usage, cp);
-                job_iter++;
+                ++job_iter;
             } else {
                 job_iter = jobs.erase(job_iter);
             }
         } else {
             if (usage < 1) {
                 if (get_fractional_assignment(rp, usage, cp)) {
-                    job_iter++;
+                    ++job_iter;
                 } else {
                     job_iter = jobs.erase(job_iter);
                 }
             } else {
                 if (get_integer_assignment(rp, usage, cp)) {
-                    job_iter++;
+                    ++job_iter;
                 } else {
                     job_iter = jobs.erase(job_iter);
                 }
diff --git a/client/cpu_sched.cpp b/client/cpu_sched.cpp
index b8e40b7..cb4dd7d 100644
--- a/client/cpu_sched.cpp
+++ b/client/cpu_sched.cpp
@@ -1573,8 +1573,6 @@ void CLIENT_STATE::set_ncpus() {
     if (global_prefs.max_ncpus_pct) {
         ncpus = (int)((ncpus * global_prefs.max_ncpus_pct)/100);
         if (ncpus == 0) ncpus = 1;
-    } else if (global_prefs.max_ncpus && global_prefs.max_ncpus < ncpus) {
-        ncpus = global_prefs.max_ncpus;
     }
 
     if (initialized && ncpus != ncpus_old) {
diff --git a/client/cs_account.cpp b/client/cs_account.cpp
index 90858f2..155c69a 100644
--- a/client/cs_account.cpp
+++ b/client/cs_account.cpp
@@ -206,7 +206,7 @@ int PROJECT::parse_account_file_venue() {
     FILE* in = boinc_fopen(path, "r");
     if (!in) return ERR_FOPEN;
 
-	//msg_printf(this, MSG_INFO, "parsing project prefs, looking for venue %s", host_venue);
+    //msg_printf(this, MSG_INFO, "parsing project prefs, looking for venue %s", host_venue);
     MIOFILE mf;
     XML_PARSER xp(&mf);
     mf.init_file(in);
@@ -217,7 +217,7 @@ int PROJECT::parse_account_file_venue() {
         } else if (xp.match_tag("venue")) {
             parse_attr(attr_buf, "name", venue, sizeof(venue));
             if (!strcmp(venue, host_venue)) {
-				//msg_printf(this, MSG_INFO, "found venue %s", host_venue);
+                //msg_printf(this, MSG_INFO, "found venue %s", host_venue);
                 using_venue_specific_prefs = true;
                 in_right_venue = true;
 
@@ -353,6 +353,7 @@ int CLIENT_STATE::parse_account_files() {
             }
         }
     }
+    sort_projects();
     return 0;
 }
 
@@ -448,7 +449,7 @@ int CLIENT_STATE::parse_statistics_files() {
                     );
                 } else {
                     for (std::vector<DAILY_STATS>::const_iterator i=temp.statistics.begin();
-                        i!=temp.statistics.end(); i++
+                        i!=temp.statistics.end(); ++i
                     ) {
                         project->statistics.push_back(*i);
                     }
@@ -574,6 +575,7 @@ int CLIENT_STATE::add_project(
     retval = make_project_dir(*project);
     if (retval) return retval;
     projects.push_back(project);
+    sort_projects();
     project->sched_rpc_pending = RPC_REASON_INIT;
     set_client_state_dirty("Add project");
     return 0;
diff --git a/client/cs_apps.cpp b/client/cs_apps.cpp
index 0fb8b77..1b27b6c 100644
--- a/client/cs_apps.cpp
+++ b/client/cs_apps.cpp
@@ -85,7 +85,7 @@ bool CLIENT_STATE::handle_finished_apps() {
             action = true;
             break;
         default:
-            iter++;
+            ++iter;
         }
     }
     return action;
diff --git a/client/cs_files.cpp b/client/cs_files.cpp
index 0233f94..84729a5 100644
--- a/client/cs_files.cpp
+++ b/client/cs_files.cpp
@@ -446,7 +446,7 @@ bool CLIENT_STATE::create_and_delete_pers_file_xfers() {
             // `delete pfx' should have set pfx->fip->pfx to NULL
             assert (fip == NULL || fip->pers_file_xfer == NULL);
         } else {
-            iter++;
+            ++iter;
         }
     }
 
diff --git a/client/cs_notice.cpp b/client/cs_notice.cpp
index f24f44f..79587ac 100644
--- a/client/cs_notice.cpp
+++ b/client/cs_notice.cpp
@@ -143,7 +143,7 @@ void handle_sr_feeds(vector<RSS_FEED>& feeds, PROJ_AM* p) {
     while (iter != p->proj_feeds.end()) {
         RSS_FEED& rf = *iter;
         if (rf.found) {
-            iter++;
+            ++iter;
         } else {
             iter = p->proj_feeds.erase(iter);
             feed_set_changed = true;
@@ -300,7 +300,7 @@ void NOTICES::clear_keep() {
     while (i != notices.end()) {
         NOTICE& n = *i;
         n.keep = false;
-        i++;
+        ++i;
     }
 }
 
@@ -313,7 +313,7 @@ void NOTICES::unkeep(const char* url) {
             i = notices.erase(i);
             removed_something = true;
         } else {
-            i++;
+            ++i;
         }
     }
 #ifndef SIM
@@ -323,10 +323,12 @@ void NOTICES::unkeep(const char* url) {
 #endif
 }
 
+#if 0
 static inline bool same_guid(NOTICE& n1, NOTICE& n2) {
     if (!strlen(n1.guid)) return false;
     return !strcmp(n1.guid, n2.guid);
 }
+#endif
 
 // we're considering adding a notice n.
 // If there's already an identical message n2
@@ -950,7 +952,7 @@ void RSS_FEEDS::update_feed_list() {
     while (iter != feeds.end()) {
         RSS_FEED& rf = *iter;
         if (rf.found) {
-            iter++;
+            ++iter;
         } else {
             // cancel op if active
             //
diff --git a/client/cs_statefile.cpp b/client/cs_statefile.cpp
index 10c4c74..dbf80da 100644
--- a/client/cs_statefile.cpp
+++ b/client/cs_statefile.cpp
@@ -568,6 +568,18 @@ void CLIENT_STATE::sort_results() {
     }
 }
 
+static inline bool project_name_compare(PROJECT* p0, PROJECT* p1) {
+    return strcasecmp(p0->project_name, p1->project_name) < 0;
+}
+
+void CLIENT_STATE::sort_projects() {
+    std::sort(
+        projects.begin(),
+        projects.end(),
+        project_name_compare
+    );
+}
+
 #ifndef SIM
 
 // Write the client_state.xml file
diff --git a/client/cs_trickle.cpp b/client/cs_trickle.cpp
index a8c84a7..2a85966 100644
--- a/client/cs_trickle.cpp
+++ b/client/cs_trickle.cpp
@@ -277,7 +277,7 @@ void update_trickle_up_urls(PROJECT* p, vector<string> &urls) {
             delete t;
             iter = p->trickle_up_ops.erase(iter);
         } else {
-            iter++;
+            ++iter;
         }
     }
 }
diff --git a/client/file_xfer.cpp b/client/file_xfer.cpp
index ca32df4..89f128a 100644
--- a/client/file_xfer.cpp
+++ b/client/file_xfer.cpp
@@ -224,7 +224,7 @@ int FILE_XFER_SET::remove(FILE_XFER* fxp) {
             set_bandwidth_limits(fxp->is_upload);
             return 0;
         }
-        iter++;
+        ++iter;
     }
     msg_printf(fxp->fip->project, MSG_INTERNAL_ERROR,
         "File transfer for %s not found", fxp->fip->name
diff --git a/client/gpu_detect.cpp b/client/gpu_detect.cpp
index 0d6cb28..1c2b067 100644
--- a/client/gpu_detect.cpp
+++ b/client/gpu_detect.cpp
@@ -668,8 +668,9 @@ int COPROCS::launch_child_process_to_detect_gpus() {
 //
 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 count %d",
+        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].count
         );
         if (coprocs[j].count > MAX_COPROC_INSTANCES) {
diff --git a/client/gpu_opencl.cpp b/client/gpu_opencl.cpp
index 9eddf7b..4a10832 100644
--- a/client/gpu_opencl.cpp
+++ b/client/gpu_opencl.cpp
@@ -449,7 +449,7 @@ void COPROCS::get_opencl(
                 }
                 
                 // Build nvidia_opencls vector in device_num order
-                for (it=nvidia_opencls.begin(); it<nvidia_opencls.end(); it++) {
+                for (it=nvidia_opencls.begin(); it != nvidia_opencls.end(); ++it) {
                     if (it->device_num > prop.device_num) break;
                 }
                 nvidia_opencls.insert(it, prop);
diff --git a/client/gui_rpc_server.cpp b/client/gui_rpc_server.cpp
index b4c425e..ba6e749 100644
--- a/client/gui_rpc_server.cpp
+++ b/client/gui_rpc_server.cpp
@@ -421,7 +421,7 @@ bool GUI_RPC_CONN_SET::check_allowed_list(sockaddr_storage& peer_ip) {
         if (same_ip_addr(peer_ip, *remote_iter)) {
             return true;
         }
-        remote_iter++;
+        ++remote_iter;
     }
     return false;
 }
@@ -511,7 +511,7 @@ void GUI_RPC_CONN_SET::got_select(FDSET_GROUP& fg) {
             iter = gui_rpcs.erase(iter);
             continue;
         }
-        iter++;
+        ++iter;
     }
 
     // handle RPCs on connections with pending requests
@@ -533,7 +533,7 @@ void GUI_RPC_CONN_SET::got_select(FDSET_GROUP& fg) {
                 continue;
             }
         }
-        iter++;
+        ++iter;
     }
 }
 
diff --git a/client/hostinfo_win.cpp b/client/hostinfo_win.cpp
index dfaf228..b0f2c92 100644
--- a/client/hostinfo_win.cpp
+++ b/client/hostinfo_win.cpp
@@ -23,7 +23,7 @@
 #define snprintf _snprintf
 #endif
 
-#ifndef __CYGWIN__
+#ifdef HAVE_INTRIN_H
 #include <intrin.h>
 #endif
 
@@ -140,17 +140,94 @@
 #define PRODUCT_CLOUD_STORAGE_SERVER                0x0000006E
 #endif
 
+/* HAVE_DECL__XGETBV should be set by autoconf or in boinc_win.h */
+#if !defined(HAVE_DECL__XGETBV) || !HAVE_DECL__XGETBV
+#if HAVE_DECL_XGETBV
+#define _xgetbv(x) xgetbv(x)
+#elif HAVE_DECL___XGETBV
+#define _xgetbv(x) __xgetbv(x)
+#else
+static unsigned long long _xgetbv(unsigned int index){
+      unsigned int A=0, D=0;
+
+#ifdef __GNUC__
+  #ifdef ASM_SUPPORTS_XGETBV  
+      __asm__ __volatile__("xgetbv" : "=a"(A), "=d"(D) : "c"(index));
+  #else
+      __asm__ __volatile__(".byte 0x0f, 0x01, 0xd0": "=a"(A), "=d"(D) : "c"(index));
+  #endif
+#elif defined(_MSC_VER)
+  #ifdef _M_IX86
+      __asm {
+                       mov ecx,index
+                       __emit 00fh
+                       __emit 001h
+                       __emit 0d0h
+                       mov D,edx
+                       mov A,eax
+       }
+  #elif defined(_M_AMD64)
+      // damn Microsoft for not having inline assembler in 64-bit code
+      // so this is in an NASM compiled library
+      return asm_xgetbv(index);
+  #endif
+#endif
+      return ((unsigned long long)D << 32) | A;
+}
+#endif
+#endif
+
+/* HAVE_DECL___CPUID should be set by autoconf or in boinc_win.h */
+#if !defined(HAVE_DECL___CPUID) || !HAVE_DECL___CPUID
+#if HAVE_DECL_CPUID
+#define __cpuid(x,y) cpuid(x,y)
+#elif HAVE_DECL__CPUID
+#define __cpuid(x,y) _cpuid(x,y)
+#else
+static void __cpuid(unsigned int cpuinfo[4], unsigned int type)  {
+#ifdef __GNUC__
+  #ifdef ASM_SUPPORTS_CPUID  
+      __asm__ __volatile__("cpuid" 
+                            : "=a" (cpuinfo[0]), "=b" (cpuinfo[1]), 
+                              "=c" (cpuinfo[2]), "=d" (cpuinfo[3]) 
+                            : "a" (type));
+  #else
+      __asm__ __volatile__(".byte 0x0f, 0xa2" 
+                            : "=a" (cpuinfo[0]), "=b" (cpuinfo[1]), 
+                              "=c" (cpuinfo[2]), "=d" (cpuinfo[3]) 
+                            : "a" (type));
+  #endif
+#elif defined(_MSC_VER)
+  #ifdef _M_IX86
+      __asm {
+                       mov eax,type
+                       __emit 00fh
+                       __emit 0a2h
+                       mov cpuinfo[0],eax
+                       mov cpuinfo[1],ebx
+                       mov cpuinfo[2],ecx
+                       mov cpuinfo[3],edx
+       }
+  #elif defined(_M_AMD64)
+      // damn Microsoft for not having inline assembler in 64-bit code
+      // so this is in an NASM compiled library
+      asm_cpuid(cpuinfo,type);
+  #endif
+#endif
+}
+#endif
+#endif
 
 // Returns the number of seconds difference from UTC
 //
-int get_timezone(int& timezone) {
+int get_timezone(int& tz) {
     TIME_ZONE_INFORMATION tzi;
     memset(&tzi, 0, sizeof(TIME_ZONE_INFORMATION));
     DWORD result = GetTimeZoneInformation(&tzi);
     if (result == TIME_ZONE_ID_DAYLIGHT) {
-        timezone = -(tzi.Bias + tzi.DaylightBias) * 60;
+        tz = -(tzi.Bias + tzi.DaylightBias) * 60;
     } else {
-        timezone = -(tzi.Bias + tzi.StandardBias) * 60;
+        tz = -(tzi.Bias + tzi.StandardBias) * 60;
     }
     return 0;
 }
@@ -657,13 +734,12 @@ int get_os_information(
 //
 int get_cpuid(unsigned int info_type, unsigned int& a, unsigned int& b, unsigned int& c, unsigned int& d) {
 
-#ifdef _MSC_VER
 
-    // Microsoft compiler - use intrinsic
     int retval = 1;
     int CPUInfo[4] = {0,0,0,0};
-
+#ifdef _MSC_VER
     __try {
+#endif
         __cpuid(CPUInfo, info_type);
 
         a = CPUInfo[0];
@@ -672,19 +748,11 @@ int get_cpuid(unsigned int info_type, unsigned int& a, unsigned int& b, unsigned
         d = CPUInfo[3];
 
         retval = 0;
+#ifdef _MSC_VER
     }
     __except (EXCEPTION_EXECUTE_HANDLER) {}
-    return retval;
-
-#elif defined(__GNUC__)
-
-    // GCC compiler
-    __asm__ __volatile__ ("cpuid": "=a" (a), "=b" (b), "=c" (c), "=d" (d) : "a" (info_type));
-    return 0;
-
-#else
-    return 1;
 #endif
+    return retval;
 }
 
 
@@ -794,7 +862,9 @@ int get_processor_cache(int& cache) {
     return 0;
 }
 
-
+#ifndef _XCR_XFEATURE_ENABLED_MASK
+#define _XCR_XFEATURE_ENABLED_MASK 0
+#endif
 // Returns true if the AVX instruction set is supported with the current
 // combination of OS and CPU.
 // see: http://insufficientlycomplicated.wordpress.com/2011/11/07/detecting-intel-advanced-vector-extensions-avx-in-visual-studio/
@@ -803,9 +873,7 @@ bool is_avx_supported() {
 
     bool supported = false;
  
-    // If Visual Studio 2010 SP1 or later
-#if (_MSC_FULL_VER >= 160040219)
-    // Checking for AVX requires 3 things:
+    // Checking for AVX on Windows requires 3 things:
     // 1) CPUID indicates that the OS uses XSAVE and XRSTORE
     //     instructions (allowing saving YMM registers on context
     //     switch)
@@ -815,11 +883,11 @@ bool is_avx_supported() {
     //
     // Note that XGETBV is only available on 686 or later CPUs, so
     // the instruction needs to be conditionally run.
-    int cpuInfo[4];
-    __cpuid(cpuInfo, 1);
+    unsigned int a,b,c,d;
+    get_cpuid(1, a, b, c, d);
  
-    bool osUsesXSAVE_XRSTORE = cpuInfo[2] & (1 << 27) || false;
-    bool cpuAVXSuport = cpuInfo[2] & (1 << 28) || false;
+    bool osUsesXSAVE_XRSTORE = c & (1 << 27) || false;
+    bool cpuAVXSuport = c & (1 << 28) || false;
  
     if (osUsesXSAVE_XRSTORE && cpuAVXSuport)
     {
@@ -827,7 +895,6 @@ bool is_avx_supported() {
         unsigned long long xcrFeatureMask = _xgetbv(_XCR_XFEATURE_ENABLED_MASK);
         supported = (xcrFeatureMask & 0x6) || false;
     }
-#endif
  
     return supported;
 }
@@ -1140,11 +1207,9 @@ int HOST_INFO::get_host_info(bool init) {
             "get_filesystem_info(): %s", boincerror(retval)
         );
     }
-
     get_local_network_info();
 
     if (!init) return 0;
-
     ::get_memory_info(m_nbytes, m_swap);
     get_os_information(
         os_name, sizeof(os_name), os_version, sizeof(os_version)
diff --git a/client/http_curl.cpp b/client/http_curl.cpp
index 5d79cd7..5fea257 100644
--- a/client/http_curl.cpp
+++ b/client/http_curl.cpp
@@ -333,6 +333,7 @@ int HTTP_OP::init_post(
 // with optional offset,
 // and the output goes to memory (also r1, limited by r1_len)
 // This is used for file upload (both get_file_size and file_upload)
+// and for trickle-ups.
 //
 int HTTP_OP::init_post2(
     PROJECT* p, const char* url, char* r1, int r1_len, const char* in, double offset
@@ -787,7 +788,7 @@ int HTTP_OP_SET::remove(HTTP_OP* p) {
             iter = http_ops.erase(iter);
             return 0;
         }
-        iter++;
+        ++iter;
     }
     return ERR_NOT_FOUND;
 }
diff --git a/client/log_flags.cpp b/client/log_flags.cpp
index a7d4774..c33feb1 100644
--- a/client/log_flags.cpp
+++ b/client/log_flags.cpp
@@ -153,30 +153,66 @@ static void show_exclude_gpu(EXCLUDE_GPU& e) {
 //
 void CC_CONFIG::show() {
     unsigned int i;
-    if (ncpus>0) {
-        msg_printf(NULL, MSG_INFO, "Config: simulate %d CPUs", cc_config.ncpus);
+    if (allow_remote_gui_rpc) {
+        msg_printf(NULL, MSG_INFO,
+            "Config: GUI RPC allowed from any host"
+        );
     }
-    if (no_gpus) {
-        msg_printf(NULL, MSG_INFO, "Config: don't use coprocessors");
+    FILE* f = fopen(REMOTEHOST_FILE_NAME, "r");
+    if (f) {
+        msg_printf(NULL, MSG_INFO,
+            "Config: GUI RPCs allowed from:"
+        );
+        char buf[256];
+        while (fgets(buf, 256, f)) {
+            strip_whitespace(buf);
+            if (!(buf[0] =='#' || buf[0] == ';') && strlen(buf) > 0 ) {
+                msg_printf(NULL, MSG_INFO,
+                    "    %s", buf
+                );
+            }
+        }
+        fclose(f);
+    }
+    if (disallow_attach) {
+        msg_printf(NULL, MSG_INFO, "Config: disallow project attach");
+    }
+    if (dont_check_file_sizes) {
+        msg_printf(NULL, MSG_INFO, "Config: don't check file sizes");
+    }
+    if (dont_suspend_nci) {
+        msg_printf(NULL, MSG_INFO, "Config: don't suspend NCI tasks");
     }
     if (dont_use_vbox) {
         msg_printf(NULL, MSG_INFO, "Config: don't use VirtualBox");
     }
-    if (no_info_fetch) {
-        msg_printf(NULL, MSG_INFO, "Config: don't fetch project list or client version info");
-    }
-    if (no_priority_change) {
-        msg_printf(NULL, MSG_INFO, "Config: run apps at regular priority");
+    for (i=0; i<exclude_gpus.size(); i++) {
+        show_exclude_gpu(exclude_gpus[i]);
     }
-    if (report_results_immediately) {
-        msg_printf(NULL, MSG_INFO, "Config: report completed tasks immediately");
+    for (i=0; i<exclusive_apps.size(); i++) {
+        msg_printf(NULL, MSG_INFO,
+            "Config: don't compute while %s is running",
+            exclusive_apps[i].c_str()
+        );
     }
-    if (use_all_gpus) {
-        msg_printf(NULL, MSG_INFO, "Config: use all coprocessors");
+    for (i=0; i<exclusive_gpu_apps.size(); i++) {
+        msg_printf(NULL, MSG_INFO,
+            "Config: don't use GPUs while %s is running",
+            exclusive_gpu_apps[i].c_str()
+        );
     }
     if (fetch_minimal_work) {
         msg_printf(NULL, MSG_INFO, "Config: fetch minimal work");
     }
+    if (fetch_on_update) {
+        msg_printf(NULL, MSG_INFO, "Config: fetch on update");
+    }
+    if (http_1_0) {
+        msg_printf(NULL, MSG_INFO, "Config: use HTTP 1.0");
+    }
+    for (int j=1; j<NPROC_TYPES; j++) {
+        show_gpu_ignore(ignore_gpu_instance[j], j);
+    }
     if (max_event_log_lines != DEFAULT_MAX_EVENT_LOG_LINES) {
         if (max_event_log_lines) {
             msg_printf(NULL, MSG_INFO,
@@ -186,47 +222,23 @@ void CC_CONFIG::show() {
             msg_printf(NULL, MSG_INFO, "Config: event log limit disabled");
         }
     }
-    if (fetch_on_update) {
-        msg_printf(NULL, MSG_INFO, "Config: fetch on update");
-    }
-    for (int j=1; j<NPROC_TYPES; j++) {
-        show_gpu_ignore(ignore_gpu_instance[j], j);
+    if (ncpus>0) {
+        msg_printf(NULL, MSG_INFO, "Config: simulate %d CPUs", cc_config.ncpus);
     }
-    for (i=0; i<exclude_gpus.size(); i++) {
-        show_exclude_gpu(exclude_gpus[i]);
+    if (no_gpus) {
+        msg_printf(NULL, MSG_INFO, "Config: don't use coprocessors");
     }
-    for (i=0; i<exclusive_apps.size(); i++) {
-        msg_printf(NULL, MSG_INFO,
-            "Config: don't compute while %s is running",
-            exclusive_apps[i].c_str()
-        );
+    if (no_info_fetch) {
+        msg_printf(NULL, MSG_INFO, "Config: don't fetch project list or client version info");
     }
-    for (i=0; i<exclusive_gpu_apps.size(); i++) {
-        msg_printf(NULL, MSG_INFO,
-            "Config: don't use GPUs while %s is running",
-            exclusive_gpu_apps[i].c_str()
-        );
+    if (no_priority_change) {
+        msg_printf(NULL, MSG_INFO, "Config: run apps at regular priority");
     }
-    if (allow_remote_gui_rpc) {
-        msg_printf(NULL, MSG_INFO,
-            "Config: GUI RPC allowed from any host"
-        );
+    if (report_results_immediately) {
+        msg_printf(NULL, MSG_INFO, "Config: report completed tasks immediately");
     }
-    FILE* f = fopen(REMOTEHOST_FILE_NAME, "r");
-    if (f) {
-        msg_printf(NULL, MSG_INFO,
-            "Config: GUI RPCs allowed from:"
-        );
-        char buf[256];
-        while (fgets(buf, 256, f)) {
-            strip_whitespace(buf);
-            if (!(buf[0] =='#' || buf[0] == ';') && strlen(buf) > 0 ) {
-                msg_printf(NULL, MSG_INFO,
-                    "    %s", buf
-                );
-            }
-        }
-        fclose(f);
+    if (use_all_gpus) {
+        msg_printf(NULL, MSG_INFO, "Config: use all coprocessors");
     }
     if (vbox_window) {
         msg_printf(NULL, MSG_INFO,
diff --git a/client/pers_file_xfer.cpp b/client/pers_file_xfer.cpp
index de10eb7..79272e7 100644
--- a/client/pers_file_xfer.cpp
+++ b/client/pers_file_xfer.cpp
@@ -521,7 +521,7 @@ int PERS_FILE_XFER_SET::remove(PERS_FILE_XFER* pfx) {
             iter = pers_file_xfers.erase(iter);
             return 0;
         }
-        iter++;
+        ++iter;
     }
     msg_printf(
         pfx->fip->project, MSG_INTERNAL_ERROR,
diff --git a/client/project.cpp b/client/project.cpp
index 78de25f..d6c0680 100644
--- a/client/project.cpp
+++ b/client/project.cpp
@@ -692,7 +692,7 @@ void PROJECT::link_project_files() {
         }
         fref.file_info = fip;
         fip->is_project_file = true;
-        fref_iter++;
+        ++fref_iter;
     }
 }
 
diff --git a/client/rr_sim.cpp b/client/rr_sim.cpp
index a8b7e66..e62861a 100644
--- a/client/rr_sim.cpp
+++ b/client/rr_sim.cpp
@@ -299,7 +299,7 @@ void RR_SIM::pick_jobs_to_run(double reltime) {
                 } else {
                     if (rsc_work_fetch[rt].sim_nused >= gstate.ncpus) break;
                 }
-                rsc_pwf.pending_iter++;
+                ++rsc_pwf.pending_iter;
             }
 
             if (rsc_pwf.pending_iter == rsc_pwf.pending.end()) {
diff --git a/client/rrsim_test.cpp b/client/rrsim_test.cpp
index f2f07d6..9e41f2e 100644
--- a/client/rrsim_test.cpp
+++ b/client/rrsim_test.cpp
@@ -298,7 +298,7 @@ bool CLIENT_STATE::rr_simulation() {
             } else {
                 x = rp->project->rrsim_proc_rate*rpbest->rrsim_finish_delay;
                 rp->rrsim_cpu_left -= x;
-                it++;
+                ++it;
             }
         }
 
@@ -310,7 +310,7 @@ bool CLIENT_STATE::rr_simulation() {
             if (rp == rpbest) {
                 it = pbest->active.erase(it);
             } else {
-                it++;
+                ++it;
             }
         }
 
diff --git a/client/sim.cpp b/client/sim.cpp
index 3e4e82f..33c5c48 100644
--- a/client/sim.cpp
+++ b/client/sim.cpp
@@ -281,7 +281,7 @@ void CLIENT_STATE::handle_completed_results(PROJECT* p) {
             delete rp;
             result_iter = results.erase(result_iter);
         } else {
-            result_iter++;
+            ++result_iter;
         }
     }
 }
@@ -1361,7 +1361,7 @@ void cull_projects() {
         if (atp->wup->project->ignore) {
             ati = gstate.active_tasks.active_tasks.erase(ati);
         } else {
-            ati++;
+            ++ati;
         }
     }
     vector<RESULT*>::iterator ri = gstate.results.begin();
@@ -1370,7 +1370,7 @@ void cull_projects() {
         if (rp->project->ignore) {
             ri = gstate.results.erase(ri);
         } else {
-            ri++;
+            ++ri;
         }
     }
 
@@ -1380,7 +1380,7 @@ void cull_projects() {
         if (p->ignore) {
             iter = gstate.projects.erase(iter);
         } else {
-            iter++;
+            ++iter;
         }
     }
 }
diff --git a/client/time_stats.cpp b/client/time_stats.cpp
index 1bd2754..6e0c31b 100644
--- a/client/time_stats.cpp
+++ b/client/time_stats.cpp
@@ -52,7 +52,7 @@
 #define CONNECTED_STATE_UNKNOWN         2
 
 #ifndef SIM
-#ifdef _WIN32
+#if defined(_WIN32) && ( !defined(__MINGW32__) || defined(HAVE_LIBSENSAPI) )
 #include <sensapi.h>
 
 int get_connected_state() {
diff --git a/client/work_fetch.cpp b/client/work_fetch.cpp
index 7f73875..eb98c5f 100644
--- a/client/work_fetch.cpp
+++ b/client/work_fetch.cpp
@@ -517,8 +517,8 @@ void WORK_FETCH::piggyback_work_request(PROJECT* p) {
         }
         if (check_higher_priority_projects) {
             PROJECT* p2 = NULL;
-            for (unsigned int j=0; j<gstate.projects.size(); j++) {
-                p2 = gstate.projects[j];
+            for (unsigned int j=0; j<projects_sorted.size(); j++) {
+                p2 = projects_sorted[j];
                 if (p2 == p) break;
                 if (p2->sched_priority == p->sched_priority) continue;
                 if (p2->pwf.project_reason) {
@@ -627,9 +627,10 @@ void WORK_FETCH::setup() {
         }
     }
 
+    projects_sorted = gstate.projects;
     std::sort(
-        gstate.projects.begin(),
-        gstate.projects.end(),
+        projects_sorted.begin(),
+        projects_sorted.end(),
         higher_priority
     );
     if (log_flags.work_fetch_debug) {
@@ -657,8 +658,8 @@ PROJECT* WORK_FETCH::choose_project() {
     // scan projects in order of decreasing priority
     //
     bool found = false;
-    for (unsigned int j=0; j<gstate.projects.size(); j++) {
-        p = gstate.projects[j];
+    for (unsigned int j=0; j<projects_sorted.size(); j++) {
+        p = projects_sorted[j];
         WF_DEBUG(msg_printf(p, MSG_INFO, "scanning");)
         if (p->pwf.project_reason) {
             WF_DEBUG(msg_printf(p, MSG_INFO, "skip: cfwr %d", p->pwf.project_reason);)
diff --git a/client/work_fetch.h b/client/work_fetch.h
index 6c0ece6..ea23136 100644
--- a/client/work_fetch.h
+++ b/client/work_fetch.h
@@ -299,6 +299,8 @@ struct PROJECT_WORK_FETCH {
 // global work fetch state
 //
 struct WORK_FETCH {
+    std::vector<PROJECT*> projects_sorted;
+        // projects in decreasing priority order
     void setup();
     PROJECT* choose_project();
         // Find a project to ask for work.
diff --git a/clientgui/AccountManagerPropertiesPage.cpp b/clientgui/AccountManagerPropertiesPage.cpp
index 5ac422e..66c91bc 100644
--- a/clientgui/AccountManagerPropertiesPage.cpp
+++ b/clientgui/AccountManagerPropertiesPage.cpp
@@ -159,14 +159,14 @@ void CAccountManagerPropertiesPage::CreateControls()
     itemFlexGridSizer40->AddGrowableCol(2);
     itemBoxSizer37->Add(itemFlexGridSizer40, 0, wxGROW|wxALL, 5);
 
-    itemFlexGridSizer40->Add(5, 5, 0, wxGROW|wxGROW|wxALL, 5);
+    itemFlexGridSizer40->Add(5, 5, 0, wxGROW|wxALL, 5);
 
     wxBitmap itemBitmap41(GetBitmapResource(wxT("res/wizprogress01.xpm")));
     m_pProgressIndicator = new wxStaticBitmap;
     m_pProgressIndicator->Create( itemWizardPage36, ID_PROGRESSCTRL, itemBitmap41, wxDefaultPosition, wxSize(ADJUSTFORXDPI(184), ADJUSTFORYDPI(48)), 0 );
     itemFlexGridSizer40->Add(m_pProgressIndicator, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    itemFlexGridSizer40->Add(5, 5, 0, wxGROW|wxGROW|wxALL, 5);
+    itemFlexGridSizer40->Add(5, 5, 0, wxGROW|wxALL, 5);
 ////@end CAccountManagerPropertiesPage content construction
 }
 
diff --git a/clientgui/AdvancedFrame.cpp b/clientgui/AdvancedFrame.cpp
index 664faf5..2e9a58d 100644
--- a/clientgui/AdvancedFrame.cpp
+++ b/clientgui/AdvancedFrame.cpp
@@ -37,6 +37,7 @@
 #include "MainDocument.h"
 #include "BOINCBaseFrame.h"
 #include "BOINCBaseView.h"
+#include "BOINCListCtrl.h"
 #include "BOINCTaskBar.h"
 #include "BOINCClientManager.h"
 #include "BOINCDialupManager.h"
@@ -51,6 +52,7 @@
 #include "DlgAbout.h"
 #include "DlgOptions.h"
 #include "DlgDiagnosticLogFlags.h"
+#include "DlgHiddenColumns.h"
 #include "DlgGenericMessage.h"
 #include "DlgEventLog.h"
 #include "browser.h"
@@ -58,6 +60,7 @@
 #include "BOINCBaseWizard.h"
 #include "WizardAttach.h"
 #include "DlgAdvPreferences.h"
+#include "DlgExclusiveApps.h"
 
 #include "res/connect.xpm"
 #include "res/disconnect.xpm"
@@ -172,7 +175,9 @@ BEGIN_EVENT_TABLE (CAdvancedFrame, CBOINCBaseFrame)
     // Advanced
     EVT_MENU(ID_OPTIONS, CAdvancedFrame::OnOptions)
 	EVT_MENU(ID_PREFERENCES, CAdvancedFrame::OnPreferences)
+	EVT_MENU(ID_EXCLUSIVE_APPS, CAdvancedFrame::OnExclusiveApps)
 	EVT_MENU(ID_DIAGNOSTICLOGFLAGS, CAdvancedFrame::OnDiagnosticLogFlags)
+	EVT_MENU(ID_SELECTCOLUMNS, CAdvancedFrame::OnSelectColumns)
     EVT_MENU(ID_SELECTCOMPUTER, CAdvancedFrame::OnSelectComputer)
     EVT_MENU(ID_SHUTDOWNCORECLIENT, CAdvancedFrame::OnClientShutdown)
     EVT_MENU(ID_RUNBENCHMARKS, CAdvancedFrame::OnRunBenchmarks)
@@ -231,6 +236,10 @@ CAdvancedFrame::CAdvancedFrame(wxString title, wxIconBundle* icons, wxPoint posi
 
     RestoreState();
 
+    // For generic wxListCtrl, we must call Layout() for panel containing m_pNotebook
+    // after CBOINCListCtrl::RestoreState() has finished BOINCListCtrl initialization.
+    m_pNotebook->GetParent()->Layout();
+
     m_pRefreshStateTimer = new wxTimer(this, ID_REFRESHSTATETIMER);
     wxASSERT(m_pRefreshStateTimer);
     m_pRefreshStateTimer->Start(300000);            // Send event every 5 minutes
@@ -312,13 +321,37 @@ bool CAdvancedFrame::CreateMenu() {
     // File menu
     wxMenu *menuFile = new wxMenu;
 
-    // %s is the application name
-    //    i.e. 'BOINC Manager', 'GridRepublic Manager'
+    strMenuName.Printf(
+        _("New %s window..."), 
+        pSkinAdvanced->GetApplicationName().c_str()
+    );
+    strMenuDescription.Printf(
+        _("Open another %s window"), 
+        pSkinAdvanced->GetApplicationName().c_str()
+    );
+    menuFile->Append(
+        ID_LAUNCHNEWINSTANCE, 
+        strMenuName,
+        strMenuDescription
+    );
+
+    menuFile->Append(
+        ID_SELECTCOMPUTER, 
+        _("Select computer..."),
+        _("Connect to a BOINC client on another computer")
+    );
+    menuFile->Append(
+        ID_SHUTDOWNCORECLIENT, 
+        _("Shut down connected client..."),
+        _("Shut down the currently connected BOINC client")
+    );
+    menuFile->AppendSeparator();
+
     strMenuDescription.Printf(
         _("Close the %s window"), 
         pSkinAdvanced->GetApplicationName().c_str()
     );
-    strMenuName = _("&Close Window");
+    strMenuName = _("&Close window");
     strMenuName += wxT("\tCtrl+W");
     menuFile->Append(
         ID_CLOSEWINDOW,
@@ -326,22 +359,16 @@ bool CAdvancedFrame::CreateMenu() {
         strMenuDescription
     );
 
-    // %s is the application name
-    //    i.e. 'BOINC Manager', 'GridRepublic Manager'
     strMenuDescription.Printf(
         _("Exit %s"), 
         pSkinAdvanced->GetApplicationName().c_str()
     );
     if (is_boinc_started_by_manager) {
-        // %s is the application short name
-        //    i.e. 'BOINC', 'GridRepublic'
         strMenuName.Printf(
             _("Exit %s"), 
             pSkinAdvanced->GetApplicationShortName().c_str()
         );
     } else {
-        // %s is the application name
-        //    i.e. 'BOINC Manager', 'GridRepublic Manager'
         strMenuName.Printf(
             _("Exit %s"), 
             pSkinAdvanced->GetApplicationName().c_str()
@@ -356,7 +383,7 @@ bool CAdvancedFrame::CreateMenu() {
 #ifdef __WXMAC__
     menuFile->Append(
         wxID_PREFERENCES,
-        _("Preferences...")
+        _("Preferences…")
     );
 #endif
 
@@ -366,45 +393,51 @@ bool CAdvancedFrame::CreateMenu() {
     menuView->Append(
         ID_ADVNOTICESVIEW,
         _("&Notices\tCtrl+Shift+N"),
-        _("Display notices")
+        _("Show notices")
     );
 
     menuView->Append(
         ID_ADVPROJECTSVIEW,
         _("&Projects\tCtrl+Shift+P"),
-        _("Display projects")
+        _("Show projects")
     );
 
     menuView->Append(
         ID_ADVTASKSVIEW,
         _("&Tasks\tCtrl+Shift+T"),
-        _("Display tasks")
+        _("Show tasks")
     );
 
     menuView->Append(
         ID_ADVTRANSFERSVIEW,
         _("Trans&fers\tCtrl+Shift+X"),
-        _("Display transfers")
+        _("Show file transfers")
     );
 
     menuView->Append(
         ID_ADVSTATISTICSVIEW,
         _("&Statistics\tCtrl+Shift+S"),
-        _("Display statistics")
+        _("Show statistics")
     );
 
     menuView->Append(
         ID_ADVRESOURCEUSAGEVIEW,
-        _("&Disk usage\tCtrl+Shift+D"),
-        _("Display disk usage")
+        _("&Disk\tCtrl+Shift+D"),
+        _("Show disk usage")
     );
 
     menuView->AppendSeparator();
+    menuView->Append(
+        ID_EVENTLOG, 
+        _("Event Log...\tCtrl+Shift+E"),
+        _("Show diagnostic messages")
+    );
+    menuView->AppendSeparator();
 
     menuView->Append(
         ID_CHANGEGUI,
         _("Simple &View...\tCtrl+Shift+V"),
-        _("Display the simple graphical interface.")
+        _("Switch to the Simple View")
     );
 
     // Screen too small?
@@ -419,7 +452,7 @@ bool CAdvancedFrame::CreateMenu() {
         menuTools->Append(
             ID_WIZARDATTACH, 
             _("&Add project or account manager..."),
-            _("Volunteer for any or all of 30+ projects in many areas of science")
+            _("Add a new science project, or use an account manager")
         );
     } else {
         strMenuName.Printf(
@@ -450,15 +483,16 @@ bool CAdvancedFrame::CreateMenu() {
             _("Remove this computer from account manager control.")
         );
     }
+    menuTools->AppendSeparator();
     menuTools->Append(
-        ID_OPTIONS, 
-        _("&Options..."),
-        _("Configure display options and proxy settings")
+        ID_RUNBENCHMARKS, 
+        _("Run CPU &benchmarks"),
+        _("Run tests that measure CPU speed")
     );
     menuTools->Append(
-		ID_PREFERENCES, 
-        _("Computing &preferences..."),
-        _("Configure computing preferences")
+        ID_RETRYCOMMUNICATIONS, 
+        _("Retry pending transfers"),
+        _("Retry deferred file transfers and task requests")
     );
 
     // Activity menu
@@ -537,7 +571,7 @@ bool CAdvancedFrame::CreateMenu() {
 
     menuActivity->AppendRadioItem(
         ID_ADVNETWORKRUNALWAYS,
-        _("Network activity always available"),
+        _("Network activity always allowed"),
         _("Allow network activity regardless of preferences")
     );
     menuActivity->AppendRadioItem(
@@ -551,83 +585,57 @@ bool CAdvancedFrame::CreateMenu() {
         _("Stop BOINC network activity")
     );
 
-    // Advanced menu
+    // Options menu
 
-    wxMenu *menuAdvanced = new wxMenu;
+    wxMenu *menuOptions = new wxMenu;
 
-    // %s is the project name
-    //    i.e. 'BOINC', 'GridRepublic'
-    strMenuDescription.Printf(
-        _("Connect to another computer running %s"), 
-        pSkinAdvanced->GetApplicationShortName().c_str()
+    menuOptions->Append(
+		ID_PREFERENCES, 
+        _("Computing &preferences..."),
+        _("Configure computing preferences")
     );
-    menuAdvanced->Append(
-        ID_SELECTCOMPUTER, 
-        _("Select computer..."),
-        strMenuDescription
+
+    menuOptions->Append(
+		ID_EXCLUSIVE_APPS,
+        _("Exclusive applications..."),
+        _("Configure exclusive applications")
     );
-    menuAdvanced->Append(
-        ID_SHUTDOWNCORECLIENT, 
-        _("Shut down connected client..."),
-        _("Shut down the currently connected client")
+    menuOptions->AppendSeparator();
+    menuOptions->Append(
+		ID_SELECTCOLUMNS,
+        _("Select columns..."),
+        _("Select which columns to display")
     );
-    menuAdvanced->Append(
-        ID_RUNBENCHMARKS, 
-        _("Run CPU &benchmarks"),
-        _("Runs BOINC CPU benchmarks")
+    menuOptions->Append(
+		ID_DIAGNOSTICLOGFLAGS,
+        _("Event Log options...\tCtrl+Shift+F"),
+        _("Enable or disable various diagnostic messages")
     );
-    menuAdvanced->Append(
-        ID_RETRYCOMMUNICATIONS, 
-        _("Do network communication"),
-        _("Do all pending network communication")
+    menuOptions->Append(
+        ID_OPTIONS, 
+        _("&Other options..."),
+        _("Configure display options and network settings")
     );
-    menuAdvanced->Append(
+    menuOptions->AppendSeparator();
+    menuOptions->Append(
         ID_READCONFIG, 
         _("Read config files"),
         _("Read configuration info from cc_config.xml and any app_config.xml files")
     );
-    menuAdvanced->Append(
+    menuOptions->Append(
         ID_READPREFERENCES, 
         _("Read local prefs file"),
         _("Read preferences from global_prefs_override.xml.")
     );
-    // %s is the project name
-    //    i.e. 'BOINC', 'GridRepublic'
-    strMenuDescription.Printf(
-        _("Launch another instance of %s..."), 
-        pSkinAdvanced->GetApplicationName().c_str()
-    );
-    strMenuName.Printf(
-        _("Launch another %s"), 
-        pSkinAdvanced->GetApplicationName().c_str()
-    );
-    menuAdvanced->Append(
-        ID_LAUNCHNEWINSTANCE, 
-        strMenuName,
-        strMenuDescription
-    );
-    menuAdvanced->Append(
-        ID_EVENTLOG, 
-        _("Event Log...\tCtrl+Shift+E"),
-        _("Display diagnostic messages.")
-    );
-    menuAdvanced->Append(
-		ID_DIAGNOSTICLOGFLAGS,
-        _("Event Log Diagnostic Flags...\tCtrl+Shift+F"),
-        _("Enable or disable various diagnostic messages")
-    );
+
 
     // Help menu
     wxMenu *menuHelp = new wxMenu;
 
-    // %s is the project name
-    //    i.e. 'BOINC', 'GridRepublic'
     strMenuName.Printf(
         _("%s &help"), 
         pSkinAdvanced->GetApplicationShortName().c_str()
     );
-    // %s is the project name
-    //    i.e. 'BOINC', 'GridRepublic'
     strMenuDescription.Printf(
         _("Show information about %s"), 
         pSkinAdvanced->GetApplicationShortName().c_str()
@@ -638,14 +646,10 @@ bool CAdvancedFrame::CreateMenu() {
         strMenuDescription
     );
 
-    // %s is the application name
-    //    i.e. 'BOINC Manager', 'GridRepublic Manager'
     strMenuName.Printf(
         _("&%s help"), 
         pSkinAdvanced->GetApplicationName().c_str()
     );
-    // %s is the application name
-    //    i.e. 'BOINC Manager', 'GridRepublic Manager'
     strMenuDescription.Printf(
         _("Show information about the %s"), 
         pSkinAdvanced->GetApplicationName().c_str()
@@ -655,15 +659,12 @@ bool CAdvancedFrame::CreateMenu() {
         strMenuName, 
         strMenuDescription
     );
+    menuHelp->AppendSeparator();
 
-    // %s is the project name
-    //    i.e. 'BOINC', 'GridRepublic'
     strMenuName.Printf(
         _("%s &web site"), 
         pSkinAdvanced->GetApplicationShortName().c_str()
     );
-    // %s is the application name
-    //    i.e. 'BOINC Manager', 'GridRepublic Manager'
     strMenuDescription.Printf(
         _("Show information about BOINC and %s"),
         pSkinAdvanced->GetApplicationName().c_str()
@@ -673,9 +674,8 @@ bool CAdvancedFrame::CreateMenu() {
         strMenuName, 
         strMenuDescription
     );
+    menuHelp->AppendSeparator();
 
-    // %s is the project name
-    //    i.e. 'BOINC Manager', 'GridRepublic Manager'
     strMenuName.Printf(
         _("&About %s..."), 
         pSkinAdvanced->GetApplicationName().c_str()
@@ -697,16 +697,16 @@ bool CAdvancedFrame::CreateMenu() {
         _("&View")
     );
     m_pMenubar->Append(
-        menuTools,
-        _("&Tools")
-    );
-    m_pMenubar->Append(
         menuActivity,
         _("&Activity")
     );
     m_pMenubar->Append(
-        menuAdvanced,
-        _("A&dvanced")
+        menuOptions,
+        _("&Options")
+    );
+    m_pMenubar->Append(
+        menuTools,
+        _("&Tools")
     );
     m_pMenubar->Append(
         menuHelp,
@@ -814,6 +814,11 @@ bool CAdvancedFrame::CreateNotebookPage( CBOINCBaseView* pwndNewNotebookPage) {
 }
 
 
+wxNotebook* CAdvancedFrame::GetNotebook() {
+    return m_pNotebook;
+}
+
+
 bool CAdvancedFrame::CreateStatusbar() {
     wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::CreateStatusbar - Function Begin"));
 
@@ -1317,6 +1322,16 @@ void CAdvancedFrame::OnPreferences(wxCommandEvent& WXUNUSED(event)) {
 }
 
 
+void CAdvancedFrame::OnExclusiveApps(wxCommandEvent& WXUNUSED(event)) {
+    wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::OnExclusiveApps - Function Begin"));
+
+    CDlgExclusiveApps dlg(this);
+	dlg.ShowModal();
+
+    wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::OnExclusiveApps - Function End"));
+}
+
+
 void CAdvancedFrame::OnDiagnosticLogFlags(wxCommandEvent& WXUNUSED(event)) {
     wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::OnDiagnosticLogFlags - Function Begin"));
 
@@ -1327,6 +1342,16 @@ void CAdvancedFrame::OnDiagnosticLogFlags(wxCommandEvent& WXUNUSED(event)) {
 }
 
 
+void CAdvancedFrame::OnSelectColumns(wxCommandEvent& WXUNUSED(event)) {
+    wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::OnSelectColumns - Function Begin"));
+
+    CDlgHiddenColumns dlg(this);
+	dlg.ShowModal();
+
+    wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::OnSelectColumns - Function End"));
+}
+
+
 void CAdvancedFrame::OnSelectComputer(wxCommandEvent& WXUNUSED(event)) {
     wxString            hostName = wxEmptyString;
     int                 portNum = GUI_RPC_PORT;
@@ -1730,29 +1755,31 @@ void CAdvancedFrame::OnConnect(CFrameEvent& WXUNUSED(event)) {
             strProjectName, strProjectURL, strProjectAuthenticator, strProjectInstitution, strProjectDescription, strProjectKnown
         )
     ){
-        wasShown = IsShown();
-        Show();
-        wasVisible = wxGetApp().IsApplicationVisible();
-        if (!wasVisible) {
-            wxGetApp().ShowApplication(true);
-        }
+        if (!pDoc->project((char*)strProjectURL.c_str())) {
+            wasShown = IsShown();
+            Show();
+            wasVisible = wxGetApp().IsApplicationVisible();
+            if (!wasVisible) {
+                wxGetApp().ShowApplication(true);
+            }
         
-        pWizard = new CWizardAttach(this);
-
-        if (pWizard->RunSimpleProjectAttach(
-                wxURI::Unescape(strProjectName),
-                wxURI::Unescape(strProjectURL),
-                wxURI::Unescape(strProjectAuthenticator),
-                wxURI::Unescape(strProjectInstitution),
-                wxURI::Unescape(strProjectDescription),
-                wxURI::Unescape(strProjectKnown)
-            )
-        ) {
-            // If successful, display the projects tab
-            m_pNotebook->SetSelection(ID_ADVTASKSVIEW - ID_ADVVIEWBASE);
-        } else {
-            // If failure, display the notices tab
-            m_pNotebook->SetSelection(ID_ADVNOTICESVIEW - ID_ADVVIEWBASE);
+            pWizard = new CWizardAttach(this);
+
+            if (pWizard->RunSimpleProjectAttach(
+                    wxURI::Unescape(strProjectName),
+                    wxURI::Unescape(strProjectURL),
+                    wxURI::Unescape(strProjectAuthenticator),
+                    wxURI::Unescape(strProjectInstitution),
+                    wxURI::Unescape(strProjectDescription),
+                    wxURI::Unescape(strProjectKnown)
+                )
+            ) {
+                // If successful, display the projects tab
+                m_pNotebook->SetSelection(ID_ADVTASKSVIEW - ID_ADVVIEWBASE);
+            } else {
+                // If failure, display the notices tab
+                m_pNotebook->SetSelection(ID_ADVNOTICESVIEW - ID_ADVVIEWBASE);
+            }
         }
     } else if (ami.acct_mgr_url.size() && ami.have_credentials) {
         // Fall through
diff --git a/clientgui/AdvancedFrame.h b/clientgui/AdvancedFrame.h
index 393e0d7..b1bf4d4 100644
--- a/clientgui/AdvancedFrame.h
+++ b/clientgui/AdvancedFrame.h
@@ -23,6 +23,7 @@
 #pragma interface "AdvancedFrame.cpp"
 #endif
 
+#include "BOINCBaseFrame.h"
 
 class CBOINCBaseView;
 class CDlgEventLog;
@@ -71,7 +72,9 @@ public:
 
     void OnOptions( wxCommandEvent& event );
 	void OnPreferences( wxCommandEvent& event );
+    void OnExclusiveApps( wxCommandEvent& event );
 	void OnDiagnosticLogFlags( wxCommandEvent& event );
+    void OnSelectColumns( wxCommandEvent& event );
     void OnSelectComputer( wxCommandEvent& event );
     void OnClientShutdown( wxCommandEvent& event );
     void OnRunBenchmarks( wxCommandEvent& event );
@@ -100,6 +103,7 @@ public:
 
     bool RestoreState();
     bool SaveState();
+    wxNotebook* GetNotebook();
 
 #ifdef __WXMAC__
     void                OnKeyPressed(wxKeyEvent &event);
diff --git a/clientgui/AsyncRPC.cpp b/clientgui/AsyncRPC.cpp
index c638824..063e1e9 100644
--- a/clientgui/AsyncRPC.cpp
+++ b/clientgui/AsyncRPC.cpp
@@ -496,7 +496,7 @@ int CMainDocument::RequestRPC(ASYNC_RPC_REQUEST& request, bool hasPriority) {
     }
     
     // Check if a duplicate request is already on the queue
-    for (iter=RPC_requests.begin(); iter!=RPC_requests.end(); iter++) {
+    for (iter=RPC_requests.begin(); iter!=RPC_requests.end(); ++iter) {
         if (iter->isSameAs(request)) {
             return 0;
         }
diff --git a/clientgui/BOINCBaseFrame.cpp b/clientgui/BOINCBaseFrame.cpp
index ae2b9ae..14d5bc7 100644
--- a/clientgui/BOINCBaseFrame.cpp
+++ b/clientgui/BOINCBaseFrame.cpp
@@ -56,6 +56,7 @@ BEGIN_EVENT_TABLE (CBOINCBaseFrame, wxFrame)
     EVT_FRAME_INITIALIZED(CBOINCBaseFrame::OnInitialized)
     EVT_FRAME_ALERT(CBOINCBaseFrame::OnAlert)
     EVT_FRAME_REFRESH(CBOINCBaseFrame::OnRefreshView)
+    EVT_ACTIVATE(CBOINCBaseFrame::OnActivate)
     EVT_CLOSE(CBOINCBaseFrame::OnClose)
     EVT_MENU(ID_CLOSEWINDOW, CBOINCBaseFrame::OnCloseWindow)
     EVT_MENU(wxID_EXIT, CBOINCBaseFrame::OnExit)
@@ -314,6 +315,13 @@ void CBOINCBaseFrame::OnAlert(CFrameAlertEvent& event) {
 }
 
 
+void CBOINCBaseFrame::OnActivate(wxActivateEvent& event) {
+    bool isActive = event.GetActive();
+    if (isActive) wxGetApp().SetEventLogWasActive(false);
+    event.Skip();
+}
+
+
 void CBOINCBaseFrame::OnClose(wxCloseEvent& event) {
     wxLogTrace(wxT("Function Start/End"), wxT("CBOINCBaseFrame::OnClose - Function Begin"));
 
@@ -888,7 +896,6 @@ bool CBOINCBaseFrame::Show(bool bShow) {
 #else
     retval = wxFrame::Show(bShow);
 #endif
-    if (bShow) wxFrame::Raise();
 
     wxLogTrace(wxT("Function Start/End"), wxT("CBOINCBaseFrame::Show - Function End"));
     return retval;
diff --git a/clientgui/BOINCBaseFrame.h b/clientgui/BOINCBaseFrame.h
index abc3694..3e226bf 100644
--- a/clientgui/BOINCBaseFrame.h
+++ b/clientgui/BOINCBaseFrame.h
@@ -59,6 +59,7 @@ public:
     void                OnInitialized( CFrameEvent& event );
 
     virtual void        OnAlert( CFrameAlertEvent& event );
+    virtual void        OnActivate( wxActivateEvent& event );
     virtual void        OnClose( wxCloseEvent& event );
     virtual void        OnCloseWindow( wxCommandEvent& event );
     virtual void        OnExit( wxCommandEvent& event );
diff --git a/clientgui/BOINCBaseView.cpp b/clientgui/BOINCBaseView.cpp
index 6656267..6edc176 100644
--- a/clientgui/BOINCBaseView.cpp
+++ b/clientgui/BOINCBaseView.cpp
@@ -55,9 +55,13 @@ CBOINCBaseView::CBOINCBaseView(wxNotebook* pNotebook) :
     m_pTaskPane = NULL;
     m_pListPane = NULL;
     m_iProgressColumn = -1;
-    m_iSortColumn = -1;
+    m_iSortColumnID = -1;
     m_SortArrows = NULL;
     
+    m_aStdColNameOrder = NULL;
+    m_iDefaultShownColumns = NULL;
+    m_iNumDefaultShownColumns = 0;
+    
     SetName(GetViewName());
     SetAutoLayout(TRUE);
 }
@@ -111,13 +115,17 @@ CBOINCBaseView::CBOINCBaseView(wxNotebook* pNotebook, wxWindowID iTaskWindowID,
 #endif
 
     m_iProgressColumn = -1;
-    m_iSortColumn = -1;
+    m_iSortColumnID = -1;
     m_bReverseSort = false;
 
     m_SortArrows = new wxImageList(16, 16, true);
     m_SortArrows->Add( wxIcon( sortascending_xpm ) );
     m_SortArrows->Add( wxIcon( sortdescending_xpm ) );
     m_pListPane->SetImageList(m_SortArrows, wxIMAGE_LIST_SMALL);
+    
+    m_aStdColNameOrder = NULL;
+    m_iDefaultShownColumns = NULL;
+    m_iNumDefaultShownColumns = 0;
 }
 
 
@@ -135,6 +143,9 @@ CBOINCBaseView::~CBOINCBaseView() {
     m_arrSelectedKeys1.Clear();
     m_arrSelectedKeys2.Clear();
     m_iSortedIndexes.Clear();
+    if (m_aStdColNameOrder) {
+        delete m_aStdColNameOrder;
+    }
 }
 
 
@@ -275,6 +286,14 @@ void CBOINCBaseView::OnListRender(wxTimerEvent& event) {
                     wxASSERT(GetDocCount() == GetCacheCount());
 //fprintf(stderr, "CBOINCBaseView::OnListRender(): m_pListPane->RefreshItems(0, %d)\n", iDocCount - 1);
                     m_pListPane->RefreshItems(0, iDocCount - 1);
+#ifdef __WXGTK__
+                    // Work around an apparent bug in wxWidgets 3.0
+                    // which drew blank lines at the top and failed
+                    // to draw the bottom items.  This could happen
+                    // if the list was scrolled near the bottom and
+                    // the user selected "Show active tasks."
+                    m_pListPane->EnsureVisible(iDocCount - 1);
+#endif
                     m_bNeedSort = true;
                 }
             }
@@ -293,7 +312,7 @@ void CBOINCBaseView::OnListRender(wxTimerEvent& event) {
         RestoreSelections();
 
         UpdateSelection();
-        
+
         m_bProcessingListRenderEvent = false;
     }
 
@@ -315,7 +334,6 @@ bool CBOINCBaseView::OnSaveState(wxConfigBase* pConfig) {
     if (!m_pListPane->OnSaveState(pConfig)) {
         bReturnValue = false;
     }
-
     return bReturnValue;
 }
 
@@ -458,7 +476,7 @@ int CBOINCBaseView::SynchronizeCache() {
 
     iRowTotal = GetDocCount();
     iColumnTotal = m_pListPane->GetColumnCount();
-    
+
     for (iRowIndex = 0; iRowIndex < iRowTotal; iRowIndex++) {
         bNeedRefreshData = false;
 
@@ -470,8 +488,10 @@ int CBOINCBaseView::SynchronizeCache() {
                 // To reduce flicker, refresh only changed columns
                 m_pListPane->RefreshCell(iRowIndex, iColumnIndex);
 #endif
-                if (iColumnIndex == m_iSortColumn) {
-                    m_bNeedSort = true;
+                if (iColumnIndex >= 0) {
+                    if (m_iColumnIndexToColumnID[iColumnIndex] == m_iSortColumnID) {
+                        m_bNeedSort = true;
+                    }
                 }
             }
         }
@@ -498,27 +518,47 @@ bool CBOINCBaseView::SynchronizeCacheItem(wxInt32 WXUNUSED(iRowIndex), wxInt32 W
 
 void CBOINCBaseView::OnColClick(wxListEvent& event) {
     wxListItem      item;
-    int             newSortColumn = event.GetColumn();
-    wxArrayInt      selections;
-    int             i, j, m;
-
-    if (newSortColumn < 0) return;  // Clicked past last column
+    int             newSortColIndex = event.GetColumn();
+    int             oldSortColIndex = -1;
+    
+    if (newSortColIndex < 0) return;  // Clicked past last column
+    
+    if (m_iSortColumnID >= 0) {
+        oldSortColIndex = m_iColumnIDToColumnIndex[m_iSortColumnID];
+    }
     
     item.SetMask(wxLIST_MASK_IMAGE);
-    if (newSortColumn == m_iSortColumn) {
+    if (newSortColIndex == oldSortColIndex) {
         m_bReverseSort = !m_bReverseSort;
+        SetSortColumn(newSortColIndex);
     } else {
         // Remove sort arrow from old sort column
-        if (m_iSortColumn >= 0) {
+
+        if (oldSortColIndex >= 0) {
             item.SetImage(-1);
-            m_pListPane->SetColumn(m_iSortColumn, item);
+            m_pListPane->SetColumn(oldSortColIndex, item);
         }
-        m_iSortColumn = newSortColumn;
+        m_iSortColumnID = m_iColumnIndexToColumnID[newSortColIndex];
         m_bReverseSort = false;
+
+        SetSortColumn(newSortColIndex);
     }
     
+    // Write the change to the registry
+    // Do this here because SetListColumnOrder() can call SetSortColumn()
+    // even when neither m_iSortColumnID nor m_bReverseSort changes
+    wxConfigBase* pConfig = wxConfigBase::Get(false);
+    pConfig->SetPath(wxT("/") + GetViewName());
+    m_pListPane->OnSaveState(pConfig);
+}
+    
+void CBOINCBaseView::SetSortColumn(int newSortColIndex) {
+    wxListItem      item;
+    int             i, j, m;
+    wxArrayInt      selections;
+
     item.SetImage(m_bReverseSort ? 0 : 1);
-    m_pListPane->SetColumn(newSortColumn, item);
+    m_pListPane->SetColumn(newSortColIndex, item);
     
     Freeze();   // To reduce flicker
     // Remember which cache elements are selected and deselect them
@@ -544,22 +584,19 @@ void CBOINCBaseView::OnColClick(wxListEvent& event) {
     m_bIgnoreUIEvents = false;
 
     Thaw();
-    
-    // Write the change to the registry
-    wxConfigBase* pConfig = wxConfigBase::Get(false);
-    pConfig->SetPath(wxT("/") + GetViewName());
-    m_pListPane->OnSaveState(pConfig);
-
 }
 
 
 void CBOINCBaseView::InitSort() {
     wxListItem      item;
 
-    if (m_iSortColumn < 0) return;
+    if (m_iSortColumnID < 0) return;
+    int newSortColIndex = m_iColumnIDToColumnIndex[m_iSortColumnID];
+    if (newSortColIndex < 0) return;
+    
     item.SetMask(wxLIST_MASK_IMAGE);
     item.SetImage(m_bReverseSort ? 0 : 1);
-    m_pListPane->SetColumn(m_iSortColumn, item);
+    m_pListPane->SetColumn(newSortColIndex, item);
     Freeze();   // To reduce flicker
     sortData();
     Thaw();
@@ -567,7 +604,8 @@ void CBOINCBaseView::InitSort() {
 
 
 void CBOINCBaseView::sortData() {
-    if (m_iSortColumn < 0) return;
+    if (m_iSortColumnID < 0) return;
+    if (m_iColumnIDToColumnIndex[m_iSortColumnID] < 0) return;
     
     wxArrayInt oldSortedIndexes(m_iSortedIndexes);
     int i, n = (int)m_iSortedIndexes.GetCount();
@@ -885,6 +923,9 @@ wxString CBOINCBaseView::GetProgressText( long ) {
     return wxEmptyString;
 }
 
+void CBOINCBaseView::AppendColumn(int){
+}
+
 
 void CBOINCBaseView::append_to_status(wxString& existing, const wxChar* additional) {
     if (existing.size() == 0) {
diff --git a/clientgui/BOINCBaseView.h b/clientgui/BOINCBaseView.h
index 0b40d84..811fecb 100644
--- a/clientgui/BOINCBaseView.h
+++ b/clientgui/BOINCBaseView.h
@@ -114,27 +114,37 @@ public:
     int                     FireOnListGetItemImage( long item ) const;
 
     int                     GetProgressColumn() { return m_iProgressColumn; }
+    void                    SetProgressColumn(int col) { m_iProgressColumn = col; }
     virtual double          GetProgressValue(long item);
     virtual wxString        GetProgressText( long item);
-
-    void                    InitSort();
+    virtual void            AppendColumn(int columnID);
     
+    void                    InitSort();
+    void                    SetSortColumn(int newSortColIndex);
 	void                    SaveSelections();
 	void                    RestoreSelections();
 	void                    ClearSavedSelections();
 	void                    ClearSelections();
     void                    RefreshTaskPane();
-
-#ifdef __WXMAC__
+    
     CBOINCListCtrl*         GetListCtrl() { return m_pListPane; }
+    
+#ifdef __WXMAC__
     void                    OnKeyPressed(wxKeyEvent &event);
 #endif    
  
     std::vector<CTaskItemGroup*> m_TaskGroups;
 
-    int                     m_iSortColumn;
+    int                     m_iSortColumnID;  // ColumnID of sort column
     bool                    m_bReverseSort;
+    wxArrayString*          m_aStdColNameOrder;
+    wxArrayInt              m_iStdColWidthOrder;
+    wxArrayInt              m_iColumnIndexToColumnID;
+    wxArrayInt              m_iColumnIDToColumnIndex;
+    int*                    m_iDefaultShownColumns;
+    int                     m_iNumDefaultShownColumns;
 
+    
 private:
 
 	wxArrayString           m_arrSelectedKeys1;     //array for remembering the current selected rows by primary key column value
diff --git a/clientgui/BOINCClientManager.cpp b/clientgui/BOINCClientManager.cpp
index c7e9e1a..c9e2146 100644
--- a/clientgui/BOINCClientManager.cpp
+++ b/clientgui/BOINCClientManager.cpp
@@ -197,7 +197,7 @@ bool CBOINCClientManager::IsBOINCCoreRunning() {
     if (retval) return false;     // Should never happen
     
     PROC_MAP::iterator i;
-    for (i=pm.begin(); i!=pm.end(); i++) {
+    for (i=pm.begin(); i!=pm.end(); ++i) {
         PROCINFO& pi = i->second;
         if (!strcmp(pi.command, "boinc")) {
             running = true;
@@ -445,7 +445,7 @@ void CBOINCClientManager::KillClient() {
 	if (retval) return;     // Should never happen
     
     PROC_MAP::iterator i;
-    for (i=pm.begin(); i!=pm.end(); i++) {
+    for (i=pm.begin(); i!=pm.end(); ++i) {
         PROCINFO& procinfo = i->second;
         if (!strcmp(procinfo.command, "boinc")) {
             kill_program(procinfo.id);
diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp
index 31dc7a6..b37d9d2 100644
--- a/clientgui/BOINCGUIApp.cpp
+++ b/clientgui/BOINCGUIApp.cpp
@@ -370,6 +370,8 @@ bool CBOINCGUIApp::OnInit() {
     m_pDocument = NULL;
     m_pTaskBarIcon = NULL;
     m_pEventLog = NULL;
+    m_bEventLogWasActive = false;
+    m_bProcessingActivateAppEvent = false;
 #ifdef __WXMAC__
     m_pMacDockIcon = NULL;
 #endif
@@ -1191,26 +1193,38 @@ int CBOINCGUIApp::IdleTrackerDetach() {
 
 
 void CBOINCGUIApp::OnActivateApp(wxActivateEvent& event) {
-#ifdef __WXMAC__
-    // Make sure any modal dialog (such as Attach Wizard) ends up in front.
-    if (IsModalDialogDisplayed()) {
-        event.Skip();
-        return;
-    }
-#endif
+    m_bProcessingActivateAppEvent = true;
 
     if (event.GetActive()) {
-        if (m_pEventLog && !m_pEventLog->IsIconized()) {
-            m_pEventLog->Raise();
-        }
-        if (m_pFrame) {
-            m_pFrame->Raise();
-        }
 #ifdef __WXMAC__
         ShowInterface();
+#else
+#ifdef __WXGTK__
+        // Linux allows the Event Log to be brought forward and made active
+        // even if we have a modal dialog displayed (associated with our
+        // main frame.) This test is needed to allow bringing the modal
+        // dialog forward again by clicking on its title bar.
+        if (!IsModalDialogDisplayed())
+#endif
+        {
+            bool keepEventLogInFront = m_bEventLogWasActive;
+            
+            if (m_pEventLog && !m_pEventLog->IsIconized() && !keepEventLogInFront) {
+                m_pEventLog->Raise();
+            }
+            if (m_pFrame) {
+                m_pFrame->Raise();
+            }
+            if (m_pEventLog && !m_pEventLog->IsIconized() && keepEventLogInFront) {
+                m_pEventLog->Raise();
+            }
+        }
 #endif
     }
+
     event.Skip();
+    
+    m_bProcessingActivateAppEvent = false;
 }
 
 
@@ -1263,8 +1277,11 @@ int CBOINCGUIApp::StartBOINCDefaultScreensaverTest() {
 }
 
 
-// Display the Event Log, it is a modeless dialog not owned by any
-// other UI element.
+// Display the Event Log, it is a modeless dialog not owned by
+// any other UI element.
+// To work around a Linux bug in wxWidgets 3.0 which prevents
+// bringing the main frame forward on top of a modeless dialog,
+// the Event Log is now a wxFrame on Linux only.
 void CBOINCGUIApp::DisplayEventLog(bool bShowWindow) {
     if (m_pEventLog) {
         if (bShowWindow) {
@@ -1422,26 +1439,28 @@ bool CBOINCGUIApp::SetActiveGUI(int iGUISelection, bool bShowWindow) {
     }
 
     // Show the new frame if needed 
-    if (m_pFrame && bShowWindow) {
-        if (m_pEventLog) {
-            m_pEventLog->Show();
-            m_pEventLog->Raise();
-#ifdef __WXMSW__
-            ::SetForegroundWindow((HWND)m_pEventLog->GetHWND());
-#endif
-        }
+    if (!m_bProcessingActivateAppEvent) {
+        if (m_pFrame && bShowWindow) {
+            if (m_pEventLog && !m_pEventLog->IsIconized()) {
+                m_pEventLog->Show();
+                m_pEventLog->Raise();
+    #ifdef __WXMSW__
+                ::SetForegroundWindow((HWND)m_pEventLog->GetHWND());
+    #endif
+            }
 
-        if (!m_pFrame->IsShown()) {
-            m_pFrame->Show();
-        }
-        if (m_pFrame->IsIconized()) {
-            m_pFrame->Maximize(false);
-        }
-        m_pFrame->Raise();
+            if (!m_pFrame->IsShown()) {
+                m_pFrame->Show();
+            }
+            if (m_pFrame->IsIconized()) {
+                m_pFrame->Maximize(false);
+            }
+            m_pFrame->Raise();
 
 #ifdef __WXMSW__
-        ::SetForegroundWindow((HWND)m_pFrame->GetHWND());
+            ::SetForegroundWindow((HWND)m_pFrame->GetHWND());
 #endif
+        }
     }
 
     wxLogTrace(wxT("Function Start/End"), wxT("CBOINCGUIApp::SetActiveGUI - Function End"));
diff --git a/clientgui/BOINCGUIApp.h b/clientgui/BOINCGUIApp.h
index 6990d9d..ec1a8b0 100644
--- a/clientgui/BOINCGUIApp.h
+++ b/clientgui/BOINCGUIApp.h
@@ -79,6 +79,8 @@ protected:
     CMainDocument*      m_pDocument;
     CTaskBarIcon*       m_pTaskBarIcon;
     CDlgEventLog*       m_pEventLog;
+    bool                m_bEventLogWasActive;
+    bool                m_bProcessingActivateAppEvent;
 #ifdef __WXMAC__
     CTaskBarIcon*       m_pMacDockIcon;
 #endif
@@ -161,6 +163,7 @@ public:
     void                SetISOLanguageCode(wxString strISOLanguageCode)
                                                     { m_strISOLanguageCode = strISOLanguageCode; }
     
+    void                SetEventLogWasActive(bool wasActive) { m_bEventLogWasActive = wasActive; }
     void                DisplayEventLog(bool bShowWindow = true);
     void                OnEventLogClose();
 
diff --git a/clientgui/BOINCListCtrl.cpp b/clientgui/BOINCListCtrl.cpp
index 78889d8..a7ca9f1 100644
--- a/clientgui/BOINCListCtrl.cpp
+++ b/clientgui/BOINCListCtrl.cpp
@@ -25,6 +25,11 @@
 #include "Events.h"
 
 
+#ifndef wxHAS_LISTCTRL_COLUMN_ORDER
+#define GetColumnOrder(x) x
+#define GetColumnIndexFromOrder(x) x
+#endif
+
 BEGIN_EVENT_TABLE(MyEvtHandler, wxEvtHandler)
     EVT_PAINT(MyEvtHandler::OnPaint)
 END_EVENT_TABLE()
@@ -103,93 +108,103 @@ CBOINCListCtrl::~CBOINCListCtrl()
 
 bool CBOINCListCtrl::OnSaveState(wxConfigBase* pConfig) {
     wxString    strBaseConfigLocation = wxEmptyString;
-    wxListItem  liColumnInfo;
     wxInt32     iIndex = 0;
-    wxInt32     iColumnCount = 0;
-
+    wxInt32     iStdColumnCount = 0;
+    wxInt32     iActualColumnCount = GetColumnCount();
+    int         i, j;
 
     wxASSERT(pConfig);
 
-
     // Retrieve the base location to store configuration information
     // Should be in the following form: "/Projects/"
     strBaseConfigLocation = pConfig->GetPath() + wxT("/");
 
-    // Convert to a zero based index
-    iColumnCount = GetColumnCount() - 1;
+    iStdColumnCount = m_pParentView->m_iStdColWidthOrder.size();
 
-    // Which fields are we interested in?
-    liColumnInfo.SetMask(
-        wxLIST_MASK_TEXT |
-        wxLIST_MASK_WIDTH |
-        wxLIST_MASK_FORMAT
-    );
+    // Cycle through the columns recording their widths
+    for (iIndex = 0; iIndex < iActualColumnCount; iIndex++) {
+        m_pParentView->m_iStdColWidthOrder[m_pParentView->m_iColumnIndexToColumnID[iIndex]] = GetColumnWidth(iIndex);
+    }
+    
+    for (iIndex = 0; iIndex < iStdColumnCount; iIndex++) {
+        pConfig->SetPath(strBaseConfigLocation + m_pParentView->m_aStdColNameOrder->Item(iIndex));
+        pConfig->Write(wxT("Width"), m_pParentView->m_iStdColWidthOrder[iIndex]);
+    }
 
-    // Cycle through the columns recording anything interesting
-    for (iIndex = 0; iIndex <= iColumnCount; iIndex++) {
-        GetColumn(iIndex, liColumnInfo);
+    // Save sorting column and direction
+    pConfig->SetPath(strBaseConfigLocation);
+    pConfig->Write(wxT("SortColumn"), m_pParentView->m_iSortColumnID);
+    pConfig->Write(wxT("ReverseSortOrder"), m_pParentView->m_bReverseSort);
 
-        pConfig->SetPath(strBaseConfigLocation + liColumnInfo.GetText());
+    // Save Column Order
+    wxString strColumnOrder;
+    wxString strBuffer;
+    wxString strHiddenColumns;
+    wxArrayInt aOrder(iActualColumnCount);
+    CBOINCBaseView* pView = (CBOINCBaseView*)GetParent();
+    wxASSERT(wxDynamicCast(pView, CBOINCBaseView));
 
-        pConfig->Write(wxT("Width"), liColumnInfo.GetWidth());
-        
-#if (defined(__WXMAC__) &&  wxCHECK_VERSION(2,8,0))
-        pConfig->Write(wxT("Width"), GetColumnWidth(iIndex)); // Work around bug in wxMac-2.8.0 wxListCtrl::SetColumn()
+#ifdef wxHAS_LISTCTRL_COLUMN_ORDER
+    aOrder = GetColumnsOrder();
+#else
+    for (i = 0; i < iActualColumnCount; ++i) {
+        aOrder[i] = i;
+    }
 #endif
+    
+    strColumnOrder.Printf(wxT("%s"), pView->m_aStdColNameOrder->Item(pView->m_iColumnIndexToColumnID[aOrder[0]]));
+    
+    for (i = 1; i < iActualColumnCount; ++i)
+    {
+        strBuffer.Printf(wxT(";%s"), pView->m_aStdColNameOrder->Item(pView->m_iColumnIndexToColumnID[aOrder[i]]));
+        strColumnOrder += strBuffer;
     }
 
-    // Save sorting column and direction
-    pConfig->SetPath(strBaseConfigLocation);
-    pConfig->Write(wxT("SortColumn"), m_pParentView->m_iSortColumn);
-    pConfig->Write(wxT("ReverseSortOrder"), m_pParentView->m_bReverseSort);
+    pConfig->Write(wxT("ColumnOrder"), strColumnOrder);
 
+    strHiddenColumns = wxEmptyString;
+    for (i = 0; i < iStdColumnCount; ++i) {
+        bool found = false;
+        for (j = 0; j < iActualColumnCount; ++j) {
+            if (pView->m_iColumnIndexToColumnID[aOrder[j]] == i) {
+                found = true;
+                break;
+            }
+        }
+        if (found) continue;
+        if (!strHiddenColumns.IsEmpty()) {
+            strHiddenColumns += wxT(";");
+        }
+        strHiddenColumns += pView->m_aStdColNameOrder->Item(i);
+    }
+    pConfig->Write(wxT("HiddenColumns"), strHiddenColumns);
+    
     return true;
 }
 
 
 bool CBOINCListCtrl::OnRestoreState(wxConfigBase* pConfig) {
     wxString    strBaseConfigLocation = wxEmptyString;
-    wxListItem  liColumnInfo;
     wxInt32     iIndex = 0;
-    wxInt32     iColumnCount = 0;
+    wxInt32     iStdColumnCount = 0;
     wxInt32     iTempValue = 0;
 
-
     wxASSERT(pConfig);
 
-
     // Retrieve the base location to store configuration information
     // Should be in the following form: "/Projects/"
     strBaseConfigLocation = pConfig->GetPath() + wxT("/");
 
-    // Convert to a zero based index
-    iColumnCount = GetColumnCount() - 1;
-
-    // Which fields are we interested in?
-    liColumnInfo.SetMask(
-        wxLIST_MASK_TEXT | wxLIST_MASK_WIDTH | wxLIST_MASK_FORMAT
-    );
-
-    // Cycle through the columns recording anything interesting
-    for (iIndex = 0; iIndex <= iColumnCount; iIndex++) {
-        GetColumn(iIndex, liColumnInfo);
+    iStdColumnCount = m_pParentView->m_iStdColWidthOrder.size();
 
-        pConfig->SetPath(strBaseConfigLocation + liColumnInfo.GetText());
+    // Cycle through the possible columns updating column widths
+    for (iIndex = 0; iIndex < iStdColumnCount; iIndex++) {
+        pConfig->SetPath(strBaseConfigLocation + m_pParentView->m_aStdColNameOrder->Item(iIndex));
 
         pConfig->Read(wxT("Width"), &iTempValue, -1);
         if (-1 != iTempValue) {
-            liColumnInfo.SetWidth(iTempValue);
-#if (defined(__WXMAC__) &&  wxCHECK_VERSION(2,8,0))
-            SetColumnWidth(iIndex,iTempValue); // Work around bug in wxMac-2.8.0 wxListCtrl::SetColumn()
-#endif
-        }
-
-        pConfig->Read(wxT("Format"), &iTempValue, -1);
-        if (-1 != iTempValue) {
-            liColumnInfo.SetAlign((wxListColumnFormat)iTempValue);
+            m_pParentView->m_iStdColWidthOrder[iIndex] = iTempValue;
         }
-
-        SetColumn(iIndex, liColumnInfo);
     }
 
     // Restore sorting column and direction
@@ -200,14 +215,198 @@ bool CBOINCListCtrl::OnRestoreState(wxConfigBase* pConfig) {
     }
     pConfig->Read(wxT("SortColumn"), &iTempValue,-1);
     if (-1 != iTempValue) {
-            m_pParentView->m_iSortColumn = iTempValue;
-            m_pParentView->InitSort();
+        m_pParentView->m_iSortColumnID = iTempValue;
+    }
+
+    // Restore Column Order
+    wxString strColumnOrder;
+    wxString strHiddenColumns;
+    CBOINCBaseView* pView = (CBOINCBaseView*)GetParent();
+
+    if (pConfig->Read(wxT("ColumnOrder"), &strColumnOrder)) {
+        wxArrayString orderArray;
+        TokenizedStringToArray(strColumnOrder, ";", &orderArray);
+        SetListColumnOrder(orderArray);
+
+        // 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.
+        bool foundNewColumns = false;
+        
+        if (pConfig->Read(wxT("HiddenColumns"), &strHiddenColumns)) {
+            wxArrayString hiddenArray;
+            TokenizedStringToArray(strHiddenColumns, ";", &hiddenArray);
+            int shownCount = orderArray.size();
+            int hiddenCount = hiddenArray.size();
+            int totalCount = pView->m_aStdColNameOrder->size();
+            for (int i = 0; i < totalCount; ++i) {
+                wxString columnNameToFind = pView->m_aStdColNameOrder->Item(i);
+                bool found = false;
+                for (int j = 0; j < shownCount; ++j) {
+                    if (orderArray[j].IsSameAs(columnNameToFind)) {
+                        found = true;
+                        break;
+                    }
+                }
+                if (found) continue;
+
+                for (int j = 0; j < hiddenCount; ++j) {
+                    if (hiddenArray[j].IsSameAs(columnNameToFind)) {
+                        found = true;
+                        break;
+                    }
+                }
+                if (found) continue;
+                
+                foundNewColumns =  true;
+                orderArray.Add(columnNameToFind);
+            }
+        }
+        if (foundNewColumns) {
+            bool wasInStandardOrder = IsColumnOrderStandard();
+            SetListColumnOrder(orderArray);
+            if (wasInStandardOrder) SetStandardColumnOrder();
+        }
+    } else {
+        // No "ColumnOrder" tag in pConfig
+        // Show all columns in default column order
+        wxASSERT(wxDynamicCast(pView, CBOINCBaseView));
+    
+        SetDefaultColumnDisplay();
+    }
+        
+
+
+
+    if (m_pParentView->m_iSortColumnID != -1) {
+        m_pParentView->InitSort();
     }
 
     return true;
 }
 
 
+void CBOINCListCtrl::TokenizedStringToArray(wxString tokenized, char * delimiters, wxArrayString* array) {
+    wxString name;
+    
+    array->Clear();
+    wxStringTokenizer tok(tokenized, delimiters);
+    while (tok.HasMoreTokens())
+    {
+        name = tok.GetNextToken();
+        if (name.IsEmpty()) continue;
+        array->Add(name);
+    }
+}
+
+
+// SetListColumnOrder() is called mostly from OnRestoreState(), so we don't
+// call OnSaveState() from here.  CDlgHiddenColumns calls OnSaveState()
+// when we really need to do that.
+//
+// Unfortunately, we have no way of immediately calling OnSaveState() when
+// the user manually reorders columns because that does not generate a
+// notification from MS Windows so wxWidgets can't generate an event.
+void CBOINCListCtrl::SetListColumnOrder(wxArrayString& orderArray) {
+    int i, stdCount, columnPosition;
+    int colCount = GetColumnCount();
+    int shownColCount = orderArray.GetCount();
+    int columnIndex = 0;    // Column number among shown columns before re-ordering
+    int columnID = 0;       // ID of column, e.g. COLUMN_PROJECT, COLUMN_STATUS, etc.
+    int sortColumnIndex = -1;
+    wxArrayInt aOrder(shownColCount);
+    
+    CBOINCBaseView* pView = (CBOINCBaseView*)GetParent();
+    wxASSERT(wxDynamicCast(pView, CBOINCBaseView));
+    
+    pView->m_iColumnIndexToColumnID.Clear();
+    for (i=colCount-1; i>=0; --i) {
+        DeleteColumn(i);
+    }
+    
+    stdCount = pView->m_aStdColNameOrder->GetCount();
+
+    pView->m_iColumnIDToColumnIndex.Clear();
+    for (columnID=0; columnID<stdCount; ++columnID) {
+        pView->m_iColumnIDToColumnIndex.Add(-1);
+    }
+    
+    for (columnID=0; columnID<stdCount; ++columnID) {
+        for (columnPosition=0; columnPosition<shownColCount; ++columnPosition) {
+            if (orderArray[columnPosition].IsSameAs(pView->m_aStdColNameOrder->Item(columnID))) {
+                aOrder[columnPosition] = columnIndex;
+                pView->AppendColumn(columnID);
+                pView->m_iColumnIndexToColumnID.Add(columnID);
+                pView->m_iColumnIDToColumnIndex[columnID] = columnIndex;
+
+                ++columnIndex;
+                break;
+            }
+        }
+    }
+    
+    // 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];
+        if (sortColumnIndex < 0) {
+            pView->m_iSortColumnID = pView->m_iColumnIndexToColumnID[0];
+            pView->m_bReverseSort = false;
+            pView->SetSortColumn(0);
+        } else {
+            // Redraw the sort arrow, etc.
+            pView->SetSortColumn(sortColumnIndex);
+        }
+    }
+    
+#ifdef wxHAS_LISTCTRL_COLUMN_ORDER
+    SetColumnsOrder(aOrder);
+#endif
+}
+
+
+bool CBOINCListCtrl::IsColumnOrderStandard() {
+#ifdef wxHAS_LISTCTRL_COLUMN_ORDER
+    int i;
+    wxArrayInt aOrder = GetColumnsOrder();
+    int orderCount = aOrder.GetCount();
+    for (i=1; i<orderCount; ++i) {
+        if(aOrder[i] < aOrder[i-1]) return false;
+    }
+#endif
+    return true;
+}
+
+
+void CBOINCListCtrl::SetStandardColumnOrder() {
+    int i;
+    int colCount = GetColumnCount();
+    wxArrayInt aOrder(colCount);
+
+    for (i=0; i<colCount; ++i) {
+        aOrder[i] = i;
+    }
+#ifdef wxHAS_LISTCTRL_COLUMN_ORDER
+    SetColumnsOrder(aOrder);
+#endif
+}
+
+
+void CBOINCListCtrl::SetDefaultColumnDisplay() {
+    int i;
+    wxArrayString orderArray;
+    CBOINCBaseView* pView = (CBOINCBaseView*)GetParent();
+    
+    wxASSERT(wxDynamicCast(pView, CBOINCBaseView));
+
+    orderArray.Clear();
+    for (i=0; i<pView->m_iNumDefaultShownColumns; ++i) {
+        orderArray.Add(pView->m_aStdColNameOrder->Item(pView->m_iDefaultShownColumns[i]));
+    }
+    
+    SetListColumnOrder(orderArray);
+    SetStandardColumnOrder();
+}
+
+
 void CBOINCListCtrl::SelectRow(int row, bool setSelected) {
     SetItemState(row,  setSelected ? wxLIST_STATE_SELECTED : 0, wxLIST_STATE_SELECTED);
 }
@@ -248,7 +447,11 @@ void CBOINCListCtrl::DrawProgressBars()
     long topItem, numItems, numVisibleItems, row;
     wxRect r, rr;
     int w = 0, x = 0, xx, yy, ww;
-    int progressColumn = m_pParentView->GetProgressColumn();
+    int progressColumn = -1;
+    
+    if (m_pParentView->GetProgressColumn() >= 0) {
+        progressColumn = m_pParentView->m_iColumnIDToColumnIndex[m_pParentView->GetProgressColumn()];
+    }
     
 #if USE_NATIVE_LISTCONTROL
     wxClientDC dc(this);
@@ -278,8 +481,9 @@ void CBOINCListCtrl::DrawProgressBars()
         if (numItems <= (topItem + numVisibleItems)) numVisibleItems = numItems - topItem;
 
         x = 0;
-        for (int i=0; i< progressColumn; i++) {
-            x += GetColumnWidth(i);
+        int progressColumnPosition = GetColumnOrder(progressColumn);
+        for (int i=0; i<progressColumnPosition; i++) {
+            x += GetColumnWidth(GetColumnIndexFromOrder(i));
         }
         w = GetColumnWidth(progressColumn);
         
diff --git a/clientgui/BOINCListCtrl.h b/clientgui/BOINCListCtrl.h
index 5e345e0..a2628dc 100644
--- a/clientgui/BOINCListCtrl.h
+++ b/clientgui/BOINCListCtrl.h
@@ -74,6 +74,13 @@ public:
     virtual bool            OnSaveState(wxConfigBase* pConfig);
     virtual bool            OnRestoreState(wxConfigBase* pConfig);
 
+    void                    TokenizedStringToArray(wxString tokenized, char * delimiters, wxArrayString* array);
+    void                    SetListColumnOrder(wxArrayString& orderArray);
+    void                    SetStandardColumnOrder();
+    bool                    IsColumnOrderStandard();
+    void                    SetDefaultColumnDisplay();
+    void                    InsertShownColumns(wxString tokenized, char * delimiters);
+
     long                    GetFocusedItem() { return GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED); }
     long                    GetFirstSelected() { return GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); }
     long                    GetNextSelected(int i) { return GetNextItem(i, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); }
diff --git a/clientgui/DlgAbout.cpp b/clientgui/DlgAbout.cpp
index 0597847..8e4d0d5 100644
--- a/clientgui/DlgAbout.cpp
+++ b/clientgui/DlgAbout.cpp
@@ -193,12 +193,23 @@ void CDlgAbout::CreateControls() {
     itemFlexGridSizer7->Add(itemStaticText13, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
     wxStaticText* itemStaticText14 = new wxStaticText;
-    itemStaticText14->Create( itemDialog1, wxID_STATIC, _("Berkeley Open Infrastructure for Network Computing"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemStaticText14->Create( itemDialog1, wxID_STATIC, _("BOINC is distributed under the GNU Lesser General Public License v3.0."), wxDefaultPosition, wxDefaultSize, 0 );
     itemBoxSizer2->Add(itemStaticText14, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
 
+    wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxHORIZONTAL);
+    itemBoxSizer2->Add(itemBoxSizer3, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 0);
+
+    wxStaticText* itemStaticText15 = new wxStaticText;
+    itemStaticText15->Create( itemDialog1, wxID_STATIC, _("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 );
-    itemBoxSizer2->Add(m_AboutBOINCURLCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
+    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 );
diff --git a/clientgui/DlgAdvPreferences.cpp b/clientgui/DlgAdvPreferences.cpp
index 1a3ec56..1e25c07 100644
--- a/clientgui/DlgAdvPreferences.cpp
+++ b/clientgui/DlgAdvPreferences.cpp
@@ -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
@@ -32,6 +32,7 @@
 #include "res/usage.xpm"
 #include "res/xfer.xpm"
 #include "res/proj.xpm"
+#include "res/clock.xpm"
 #include "res/warning.xpm"
 
 
@@ -40,14 +41,8 @@ using std::string;
 IMPLEMENT_DYNAMIC_CLASS(CDlgAdvPreferences, wxDialog)
 
 BEGIN_EVENT_TABLE(CDlgAdvPreferences, wxDialog)
-    EVT_COMMAND_RANGE(20000,21000,wxEVT_COMMAND_CHECKBOX_CLICKED,CDlgAdvPreferences::OnHandleCommandEvent)
-    EVT_COMMAND_RANGE(20000,21000,wxEVT_COMMAND_RADIOBUTTON_SELECTED,CDlgAdvPreferences::OnHandleCommandEvent)
-    EVT_COMMAND_RANGE(20000,21000,wxEVT_COMMAND_TEXT_UPDATED,CDlgAdvPreferences::OnHandleCommandEvent)
-    // list box
-    EVT_COMMAND(ID_LISTBOX_EXCLAPPS,wxEVT_COMMAND_LISTBOX_SELECTED,CDlgAdvPreferences::OnExclusiveAppListEvent)
+    EVT_COMMAND_RANGE(ID_ADV_PREFS_START,ID_ADV_PREFS_LAST,wxEVT_COMMAND_CHECKBOX_CLICKED,CDlgAdvPreferences::OnHandleCommandEvent)
     //buttons
-    EVT_BUTTON(ID_ADDEXCLUSIVEAPPBUTTON,CDlgAdvPreferences::OnAddExclusiveApp)
-    EVT_BUTTON(ID_REMOVEEXCLUSIVEAPPBUTTON,CDlgAdvPreferences::OnRemoveExclusiveApp)
     EVT_BUTTON(wxID_OK,CDlgAdvPreferences::OnOK)
     EVT_BUTTON(ID_HELPBOINC,CDlgAdvPreferences::OnHelp)
     EVT_BUTTON(ID_BTN_CLEAR,CDlgAdvPreferences::OnClear)
@@ -55,18 +50,11 @@ END_EVENT_TABLE()
 
 /* Constructor */
 CDlgAdvPreferences::CDlgAdvPreferences(wxWindow* parent) : CDlgAdvPreferencesBase(parent,ID_ANYDIALOG) {
-    CSkinAdvanced* pSkinAdvanced = wxGetApp().GetSkinManager()->GetAdvanced();
-    wxASSERT(pSkinAdvanced);
-    wxASSERT(wxDynamicCast(pSkinAdvanced, CSkinAdvanced));
-
-    m_bInInit=false;
-    m_bPrefsDataChanged=false;
-    m_bExclusiveAppsDataChanged=false;
     m_arrTabPageIds.Add(ID_TABPAGE_PROC);
     m_arrTabPageIds.Add(ID_TABPAGE_NET);
     m_arrTabPageIds.Add(ID_TABPAGE_DISK);
-    m_arrTabPageIds.Add(ID_TABPAGE_EXCLAPPS);
-
+    m_arrTabPageIds.Add(ID_TABPAGE_SCHED);
+    
     //setting tab page images (not handled by generated code)
     int iImageIndex = 0;
     wxImageList* pImageList = m_Notebook->GetImageList();
@@ -84,25 +72,35 @@ CDlgAdvPreferences::CDlgAdvPreferences(wxWindow* parent) : CDlgAdvPreferencesBas
     iImageIndex = pImageList->Add(GetScaledBitmapFromXPMData(usage_xpm));
     m_Notebook->SetPageImage(2,iImageIndex);
 
-#ifdef __WXMSW__
-    wxSize size = wxSize(wxSystemSettings::GetMetric(wxSYS_SMALLICON_X), wxSystemSettings::GetMetric(wxSYS_SMALLICON_Y));
-    iImageIndex = pImageList->Add(pSkinAdvanced->GetApplicationSnoozeIcon()->GetIcon(size, wxIconBundle::FALLBACK_NEAREST_LARGER));
-#else
-    iImageIndex = pImageList->Add(pSkinAdvanced->GetApplicationSnoozeIcon()->GetIcon(wxSize(16,16)));
-#endif
+    iImageIndex = pImageList->Add(GetScaledBitmapFromXPMData(clock_xpm));
     m_Notebook->SetPageImage(3,iImageIndex);
 
     //setting warning bitmap
-    m_bmpWarning->SetBitmap(wxBitmap(warning_xpm));
-
-    m_removeExclusiveAppButton->Disable();
-
+    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};
+    wxCheckBox* net_cb[] = {m_chkNetSunday,m_chkNetMonday,m_chkNetTuesday,m_chkNetWednesday,m_chkNetThursday,m_chkNetFriday,m_chkNetSaturday};
+    wxTextCtrl* net_tstarts[] = {m_txtNetSundayStart,m_txtNetMondayStart,m_txtNetTuesdayStart,m_txtNetWednesdayStart,m_txtNetThursdayStart,m_txtNetFridayStart,m_txtNetSaturdayStart};
+    wxTextCtrl* net_tstops[] = {m_txtNetSundayStop,m_txtNetMondayStop,m_txtNetTuesdayStop,m_txtNetWednesdayStop,m_txtNetThursdayStop,m_txtNetFridayStop,m_txtNetSaturdayStop};
+    for (int i=0; i<7; ++i) {
+        procDayChks[i] = proc_cb[i];
+        procDayStartTxts[i] = proc_tstarts[i];
+        procDayStopTxts[i] = proc_tstops[i];
+        netDayChks[i] = net_cb[i];
+        netDayStartTxts[i] = net_tstarts[i];
+        netDayStopTxts[i] = net_tstops[i];
+    }
+    
     // init special tooltips
     SetSpecialTooltips();
     //setting the validators for correct input handling
     SetValidators();
-    //read in settings and initialisze controls
+    //read in settings and initialize controls
     ReadPreferenceSettings();
+    // Get default preference values
+    defaultPrefs.enabled_defaults();
     //
     RestoreState();
 
@@ -133,72 +131,67 @@ CDlgAdvPreferences::CDlgAdvPreferences(wxWindow* parent) : CDlgAdvPreferencesBas
 /* destructor */
 CDlgAdvPreferences::~CDlgAdvPreferences() {
     SaveState();
-    delete m_vTimeIntervalValidator;
+    delete m_vTimeValidator;
 }
 
 /* set validators for input filtering purposes only */
 void CDlgAdvPreferences::SetValidators() {
-    m_vTimeIntervalValidator = new wxTextValidator(wxFILTER_INCLUDE_CHAR_LIST);
-    m_vTimeIntervalValidator->SetCharIncludes(wxT("0123456789:-"));
+    m_vTimeValidator = new wxTextValidator(wxFILTER_INCLUDE_CHAR_LIST);
+    m_vTimeValidator->SetCharIncludes(wxT("0123456789:"));
 
-    //proc page
-    m_txtProcIdleFor->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
-    m_txtMaxLoad->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
-    m_txtProcSwitchEvery->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
+    // ######### proc usage page
     m_txtProcUseProcessors->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
     m_txtProcUseCPUTime->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
+
+    m_txtProcIdleFor->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
+    m_txtMaxLoad->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
     
-    m_txtProcMonday->SetValidator(*m_vTimeIntervalValidator);
-    m_txtProcTuesday->SetValidator(*m_vTimeIntervalValidator);
-    m_txtProcWednesday->SetValidator(*m_vTimeIntervalValidator);
-    m_txtProcThursday->SetValidator(*m_vTimeIntervalValidator);
-    m_txtProcFriday->SetValidator(*m_vTimeIntervalValidator);
-    m_txtProcSaturday->SetValidator(*m_vTimeIntervalValidator);
-    m_txtProcSunday->SetValidator(*m_vTimeIntervalValidator);
-
-    //net page
     m_txtNetConnectInterval->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
+    m_txtNetAdditionalDays->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
+    m_txtProcSwitchEvery->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
+    m_txtDiskWriteToDisk->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
+    
+    // ######### net usage page
     m_txtNetDownloadRate->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
     m_txt_daily_xfer_limit_mb->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
     m_txt_daily_xfer_period_days->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
     m_txtNetUploadRate->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
-    m_txtNetAdditionalDays->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
-
-    m_txtNetMonday->SetValidator(*m_vTimeIntervalValidator);
-    m_txtNetTuesday->SetValidator(*m_vTimeIntervalValidator);
-    m_txtNetWednesday->SetValidator(*m_vTimeIntervalValidator);
-    m_txtNetThursday->SetValidator(*m_vTimeIntervalValidator);
-    m_txtNetFriday->SetValidator(*m_vTimeIntervalValidator);
-    m_txtNetSaturday->SetValidator(*m_vTimeIntervalValidator);
-    m_txtNetSunday->SetValidator(*m_vTimeIntervalValidator);
 
-    //disk and memory page
+    // ######### disk and memory page
     m_txtDiskMaxSpace->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
     m_txtDiskLeastFree->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
     m_txtDiskMaxOfTotal->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
-    m_txtDiskWriteToDisk->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
-    m_txtDiskMaxSwap->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
     m_txtMemoryMaxInUse->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
     m_txtMemoryMaxOnIdle->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
+    m_txtDiskMaxSwap->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
+
+    // ######### daily schedules page
+    m_txtProcEveryDayStart->SetValidator(*m_vTimeValidator);
+    m_txtProcEveryDayStop->SetValidator(*m_vTimeValidator);
+    
+    m_txtNetEveryDayStart->SetValidator(*m_vTimeValidator);
+    m_txtNetEveryDayStop->SetValidator(*m_vTimeValidator);
+    
+    for (int i=0; i<7; ++i) {
+        procDayStartTxts[i]->SetValidator(*m_vTimeValidator);
+        procDayStopTxts[i]->SetValidator(*m_vTimeValidator);
+        netDayStartTxts[i]->SetValidator(*m_vTimeValidator);
+        netDayStopTxts[i]->SetValidator(*m_vTimeValidator);
+    }
 }
 
 /* some controls share the same tooltip, set them here */
 void CDlgAdvPreferences::SetSpecialTooltips() {
-    m_txtProcMonday->SetToolTip(TXT_PROC_TIME_TOOLTIP);
-    m_txtProcTuesday->SetToolTip(TXT_PROC_TIME_TOOLTIP);
-    m_txtProcWednesday->SetToolTip(TXT_PROC_TIME_TOOLTIP);
-    m_txtProcThursday->SetToolTip(TXT_PROC_TIME_TOOLTIP);
-    m_txtProcFriday->SetToolTip(TXT_PROC_TIME_TOOLTIP);
-    m_txtProcSaturday->SetToolTip(TXT_PROC_TIME_TOOLTIP);
-    m_txtProcSunday->SetToolTip(TXT_PROC_TIME_TOOLTIP);
-    //
-    m_txtNetMonday->SetToolTip(TXT_NET_TIME_TOOLTIP);
-    m_txtNetTuesday->SetToolTip(TXT_NET_TIME_TOOLTIP);
-    m_txtNetWednesday->SetToolTip(TXT_NET_TIME_TOOLTIP);
-    m_txtNetThursday->SetToolTip(TXT_NET_TIME_TOOLTIP);
-    m_txtNetFriday->SetToolTip(TXT_NET_TIME_TOOLTIP);
-    m_txtNetSaturday->SetToolTip(TXT_NET_TIME_TOOLTIP);
-    m_txtNetSunday->SetToolTip(TXT_NET_TIME_TOOLTIP);
+    wxString procDaysTimeTT(PROC_DAY_OF_WEEK_TOOLTIP_TEXT);
+    wxString netDaysTimeTT(NET_DAY_OF_WEEK_TOOLTIP_TEXT);
+    for (int i=0; i<7; ++i) {
+        procDayChks[i]->SetToolTip(procDaysTimeTT);
+        procDayStartTxts[i]->SetToolTip(procDaysTimeTT);
+        procDayStopTxts[i]->SetToolTip(procDaysTimeTT);
+        netDayChks[i]->SetToolTip(netDaysTimeTT);
+        netDayStartTxts[i]->SetToolTip(netDaysTimeTT);
+        netDayStopTxts[i]->SetToolTip(netDaysTimeTT);
+    }
 }
 
 /* saves selected tab page */
@@ -262,12 +255,27 @@ double CDlgAdvPreferences::RoundToHundredths(double td) {
     return ((double)(i) / 100.);
 }
 
+void CDlgAdvPreferences::DisplayValue(double value, wxTextCtrl* textCtrl, wxCheckBox* checkBox) {
+    wxString buffer;
+
+    wxASSERT(textCtrl);
+    
+    if (checkBox) {
+        if (! checkBox->IsChecked()) {
+            textCtrl->Clear();
+            textCtrl->Disable();
+            return;
+        }
+    }
+    buffer.Printf(wxT("%g"), value);
+    textCtrl->ChangeValue(buffer);
+    textCtrl->Enable();
+}
+
 
 /* read preferences from core client and initialize control values */
 void CDlgAdvPreferences::ReadPreferenceSettings() {
-    m_bInInit=true;//prevent dialog handlers from doing anything
     CMainDocument* pDoc = wxGetApp().GetDocument();
-    wxString buffer;
     int retval;
 
     wxASSERT(pDoc);
@@ -282,79 +290,69 @@ void CDlgAdvPreferences::ReadPreferenceSettings() {
     }
 
     // ######### proc usage page
-    // do work between
-    *m_txtProcEveryDayStart << DoubleToTimeString(prefs.cpu_times.start_hour);
-    *m_txtProcEveryDayStop << DoubleToTimeString(prefs.cpu_times.end_hour);
-    //special day times
-    wxCheckBox* aChks[] = {m_chkProcSunday,m_chkProcMonday,m_chkProcTuesday,m_chkProcWednesday,m_chkProcThursday,m_chkProcFriday,m_chkProcSaturday};
-    wxTextCtrl* aTxts[] = {m_txtProcSunday,m_txtProcMonday,m_txtProcTuesday,m_txtProcWednesday,m_txtProcThursday,m_txtProcFriday,m_txtProcSaturday};
-    for(int i=0; i< 7;i++) {
-        TIME_SPAN& cpu = prefs.cpu_times.week.days[i];
-        if(cpu.present) {
-            aChks[i]->SetValue(true);
-            wxString timeStr = DoubleToTimeString(cpu.start_hour) +
-                wxT("-") + DoubleToTimeString(cpu.end_hour
-            );
-            aTxts[i]->SetValue(timeStr);
-        }
-    }
-
+    // max cpus
+    // 0 means "no retriction" but we don't use a checkbox here
+    if (prefs.max_ncpus_pct == 0.0) prefs.max_ncpus_pct = 100.0;
+    DisplayValue(prefs.max_ncpus_pct, m_txtProcUseProcessors);
+    
+            //cpu limit
+    // 0 means "no retriction" but we don't use a checkbox here
+    if (prefs.cpu_usage_limit == 0.0) prefs.cpu_usage_limit = 100.0;
+    DisplayValue(prefs.cpu_usage_limit, m_txtProcUseCPUTime);
+    
     // on batteries
-    m_chkProcOnBatteries->SetValue(prefs.run_on_batteries);
+    m_chkProcOnBatteries->SetValue(! prefs.run_on_batteries);
+
     // in use
-    m_chkProcInUse->SetValue(prefs.run_if_user_active);
-    m_chkGPUProcInUse->SetValue(prefs.run_gpu_if_user_active);
+    m_chkProcInUse->SetValue(! prefs.run_if_user_active);
+    m_chkGPUProcInUse->SetValue(! prefs.run_gpu_if_user_active);
+    
+    //"Suspend while computer in use" implies "Suspend GPU while computer in use" so set
+    // and disable "Suspend GPU ..." checkbox, overriding its saved value if necessary.
+    if (m_chkProcInUse->IsChecked()) {
+        m_chkGPUProcInUse->SetValue(true);
+        m_chkGPUProcInUse->Disable();
+    }
+    
     // idle for X minutes
-    buffer.Printf(wxT("%.2f"),prefs.idle_time_to_run);
-    *m_txtProcIdleFor << buffer;
+    if (m_chkProcInUse->IsChecked() || m_chkGPUProcInUse->IsChecked()) {
+        m_txtProcIdleFor->Enable();
+        DisplayValue(prefs.idle_time_to_run, m_txtProcIdleFor);
+    } else {
+        m_txtProcIdleFor->Clear();
+        m_txtProcIdleFor->Disable();
+    }
 
-    buffer.Printf(wxT("%.0f"), prefs.suspend_cpu_usage);
-    *m_txtMaxLoad << buffer;
+    m_chkMaxLoad->SetValue(prefs.suspend_cpu_usage > 0.0);
+    DisplayValue(prefs.suspend_cpu_usage, m_txtMaxLoad, m_chkMaxLoad);
+
+    // connection interval
+    DisplayValue(prefs.work_buf_min_days, m_txtNetConnectInterval);
+
+    DisplayValue(prefs.work_buf_additional_days, m_txtNetAdditionalDays);
 
     // switch every X minutes
-    buffer.Printf(wxT("%.2f"),prefs.cpu_scheduling_period_minutes);
-    *m_txtProcSwitchEvery << buffer;
-    // max cpus
-    buffer.Printf(wxT("%.2f"), prefs.max_ncpus_pct);
-    *m_txtProcUseProcessors << buffer;
-    //cpu limit
-    buffer.Printf(wxT("%.2f"),prefs.cpu_usage_limit);
-    *m_txtProcUseCPUTime << buffer;
+    DisplayValue(prefs.cpu_scheduling_period_minutes, m_txtProcSwitchEvery);
+
+    // write to disk every X seconds
+    DisplayValue(prefs.disk_interval, m_txtDiskWriteToDisk);
 
     // ######### net usage page
-    // use network between
-    *m_txtNetEveryDayStart << DoubleToTimeString(prefs.net_times.start_hour);
-    *m_txtNetEveryDayStop << DoubleToTimeString(prefs.net_times.end_hour);
-    //special day times
-    wxCheckBox* aChks2[] = {m_chkNetSunday,m_chkNetMonday,m_chkNetTuesday,m_chkNetWednesday,m_chkNetThursday,m_chkNetFriday,m_chkNetSaturday};
-    wxTextCtrl* aTxts2[] = {m_txtNetSunday,m_txtNetMonday,m_txtNetTuesday,m_txtNetWednesday,m_txtNetThursday,m_txtNetFriday,m_txtNetSaturday};
-    for(int i=0; i< 7;i++) {
-        TIME_SPAN& net = prefs.net_times.week.days[i];
-        if(net.present) {
-            aChks2[i]->SetValue(true);
-            wxString timeStr = DoubleToTimeString(net.start_hour) +
-                                wxT("-") + DoubleToTimeString(net.end_hour);
-            aTxts2[i]->SetValue(timeStr);
-        }
-    }
-    // connection interval
-    buffer.Printf(wxT("%01.2f"),prefs.work_buf_min_days);
-    *m_txtNetConnectInterval << buffer;
+
     //download rate
-    buffer.Printf(wxT("%.2f"),prefs.max_bytes_sec_down / 1024);
-    *m_txtNetDownloadRate << buffer;
-    // upload rate
-    buffer.Printf(wxT("%.2f"),prefs.max_bytes_sec_up / 1024);
-    *m_txtNetUploadRate << buffer;
+    m_chkNetDownloadRate->SetValue(prefs.max_bytes_sec_down > 0.0);
+    DisplayValue((prefs.max_bytes_sec_down / 1024), m_txtNetDownloadRate, m_chkNetDownloadRate);
+
 
-    buffer.Printf(wxT("%.2f"),prefs.daily_xfer_limit_mb);
-    *m_txt_daily_xfer_limit_mb << buffer;
-    buffer.Printf(wxT("%d"),prefs.daily_xfer_period_days );
-    *m_txt_daily_xfer_period_days << buffer;
+    // upload rate
+    m_chkNetUploadRate->SetValue(prefs.max_bytes_sec_up > 0.0);
+    DisplayValue((prefs.max_bytes_sec_up / 1024), m_txtNetUploadRate, m_chkNetUploadRate);
 
+    m_chk_daily_xfer_limit->SetValue((prefs.daily_xfer_limit_mb > 0.0) && (prefs.daily_xfer_period_days > 0.0));
+    DisplayValue(prefs.daily_xfer_limit_mb, m_txt_daily_xfer_limit_mb, m_chk_daily_xfer_limit);
+    DisplayValue(prefs.daily_xfer_period_days, m_txt_daily_xfer_period_days, m_chk_daily_xfer_limit);
+    
     //
-    buffer.Printf(wxT("%.2f"),prefs.work_buf_additional_days);
-    *m_txtNetAdditionalDays << buffer;
     // skip image verification
     m_chkNetSkipImageVerification->SetValue(prefs.dont_verify_images);
     // confirm before connect
@@ -364,41 +362,64 @@ void CDlgAdvPreferences::ReadPreferenceSettings() {
 
     // ######### disk and memory usage page
     //max space used
-    buffer.Printf(wxT("%.2f"),prefs.disk_max_used_gb);
-    *m_txtDiskMaxSpace << buffer;
+    m_chkDiskMaxSpace->SetValue(prefs.disk_max_used_gb > 0.0);
+    DisplayValue(prefs.disk_max_used_gb, m_txtDiskMaxSpace, m_chkDiskMaxSpace);
+
     // min free
-    buffer.Printf(wxT("%.2f"),prefs.disk_min_free_gb);
-    *m_txtDiskLeastFree << buffer;
+    m_chkDiskLeastFree->SetValue(prefs.disk_min_free_gb > 0.0);
+    DisplayValue(prefs.disk_min_free_gb, m_txtDiskLeastFree, m_chkDiskLeastFree);
+
     // max used percentage
-    buffer.Printf(wxT("%.2f"),prefs.disk_max_used_pct);
-    *m_txtDiskMaxOfTotal << buffer;
-    // write to disk every X seconds
-    buffer.Printf(wxT("%.0f"),prefs.disk_interval);
-    *m_txtDiskWriteToDisk << buffer;
-    // max swap space (virtual memory)
-    buffer.Printf(wxT("%.2f"),prefs.vm_max_used_frac*100.0);
-    *m_txtDiskMaxSwap << buffer;
+    m_chkDiskMaxOfTotal->SetValue(prefs.disk_max_used_pct < 100.0);
+    DisplayValue(prefs.disk_max_used_pct, m_txtDiskMaxOfTotal, m_chkDiskMaxOfTotal);
+    
     // max VM used
-    buffer.Printf(wxT("%.2f"),prefs.ram_max_used_busy_frac*100.0);
-    *m_txtMemoryMaxInUse << buffer;
+    DisplayValue((prefs.ram_max_used_busy_frac*100.0), m_txtMemoryMaxInUse);
+
     // max VM idle
-    buffer.Printf(wxT("%.2f"),prefs.ram_max_used_idle_frac*100.0);
-    *m_txtMemoryMaxOnIdle << buffer;
+    DisplayValue((prefs.ram_max_used_idle_frac*100.0), m_txtMemoryMaxOnIdle);
+
     // suspend to memory
     m_chkMemoryWhileSuspended->SetValue(prefs.leave_apps_in_memory);
 
-    // Get cc_config.xml file flags
-    log_flags.init();
-    config.defaults();
-    retval = pDoc->rpc.get_cc_config(config, log_flags);
-    if (!retval) {
-        for (unsigned int i=0; i<config.exclusive_apps.size(); ++i) {
-            wxString appName = wxString(config.exclusive_apps[i].c_str(), wxConvUTF8);
-            m_exclusiveApsListBox->Append(appName);
+    // max swap space (virtual memory)
+    DisplayValue((prefs.vm_max_used_frac*100.0), m_txtDiskMaxSwap);
+
+    // ######### daily schedules page
+    // do work between
+    m_chkProcEveryDay->SetValue(prefs.cpu_times.start_hour != prefs.cpu_times.end_hour);
+    if (m_chkProcEveryDay->IsChecked()) {
+        m_txtProcEveryDayStart->ChangeValue(DoubleToTimeString(prefs.cpu_times.start_hour));
+        m_txtProcEveryDayStop->ChangeValue(DoubleToTimeString(prefs.cpu_times.end_hour));
+    }
+
+    //special day times
+    for(int i=0; i< 7;i++) {
+        TIME_SPAN& cpu = prefs.cpu_times.week.days[i];
+        if(cpu.present) {
+            procDayChks[i]->SetValue(true);
+            procDayStartTxts[i]->ChangeValue(DoubleToTimeString(cpu.start_hour));
+            procDayStopTxts[i]->ChangeValue(DoubleToTimeString(cpu.end_hour));
+        }
+    }
+    
+    // use network between
+    m_chkNetEveryDay->SetValue(prefs.net_times.start_hour != prefs.net_times.end_hour);
+    if (m_chkNetEveryDay->IsChecked()) {
+        m_txtNetEveryDayStart->ChangeValue(DoubleToTimeString(prefs.net_times.start_hour));
+        m_txtNetEveryDayStop->ChangeValue(DoubleToTimeString(prefs.net_times.end_hour));
+    }
+    
+    //special net times
+    for(int i=0; i< 7;i++) {
+        TIME_SPAN& net = prefs.net_times.week.days[i];
+        if(net.present) {
+            netDayChks[i]->SetValue(true);
+            netDayStartTxts[i]->ChangeValue(DoubleToTimeString(net.start_hour));
+            netDayStopTxts[i]->ChangeValue(DoubleToTimeString(net.end_hour));
         }
     }
 
-    m_bInInit=false;
     //update control states
     this->UpdateControlStates();
 }
@@ -409,17 +430,24 @@ bool CDlgAdvPreferences::SavePreferencesSettings() {
     double td;
 
     mask.clear();
-    //clear special times settings
-    prefs.cpu_times.week.clear();
-    prefs.net_times.week.clear();
-    //proc page
-    prefs.run_on_batteries=m_chkProcOnBatteries->GetValue();
+
+    // ######### proc usage page
+    m_txtProcUseProcessors->GetValue().ToDouble(&td);
+    prefs.max_ncpus_pct = RoundToHundredths(td);
+    mask.max_ncpus_pct=true;
+
+    //
+    m_txtProcUseCPUTime->GetValue().ToDouble(&td);
+    prefs.cpu_usage_limit=RoundToHundredths(td);
+    mask.cpu_usage_limit=true;
+    
+    prefs.run_on_batteries = ! (m_chkProcOnBatteries->GetValue());
     mask.run_on_batteries=true;
     //
-    prefs.run_if_user_active=m_chkProcInUse->GetValue();
+    prefs.run_if_user_active = (! m_chkProcInUse->GetValue());
     mask.run_if_user_active=true;
 
-    prefs.run_gpu_if_user_active=m_chkGPUProcInUse->GetValue();
+    prefs.run_gpu_if_user_active = (! m_chkGPUProcInUse->GetValue());
     mask.run_gpu_if_user_active=true;
     //
     if(m_txtProcIdleFor->IsEnabled()) {
@@ -428,67 +456,65 @@ bool CDlgAdvPreferences::SavePreferencesSettings() {
         mask.idle_time_to_run=true;
     }
 
-    m_txtMaxLoad->GetValue().ToDouble(&td);
-    prefs.suspend_cpu_usage=RoundToHundredths(td);
+    if (m_chkMaxLoad->IsChecked()) {
+        m_txtMaxLoad->GetValue().ToDouble(&td);
+        prefs.suspend_cpu_usage=RoundToHundredths(td);
+    } else {
+        prefs.suspend_cpu_usage = 0.0;
+    }
     mask.suspend_cpu_usage=true;
 
+    m_txtNetConnectInterval->GetValue().ToDouble(&td);
+    prefs.work_buf_min_days=RoundToHundredths(td);
+    mask.work_buf_min_days=true;
+
     //
-    prefs.cpu_times.start_hour=TimeStringToDouble(m_txtProcEveryDayStart->GetValue());
-    mask.start_hour = true;
-    //
-    prefs.cpu_times.end_hour=TimeStringToDouble(m_txtProcEveryDayStop->GetValue());
-    mask.end_hour = true;
+    m_txtNetAdditionalDays->GetValue().ToDouble(&td);
+    prefs.work_buf_additional_days = RoundToHundredths(td);
+    mask.work_buf_additional_days = true;
+
     //
-    wxCheckBox* aChks[] = {m_chkProcSunday,m_chkProcMonday,m_chkProcTuesday,m_chkProcWednesday,m_chkProcThursday,m_chkProcFriday,m_chkProcSaturday};
-    wxTextCtrl* aTxts[] = {m_txtProcSunday,m_txtProcMonday,m_txtProcTuesday,m_txtProcWednesday,m_txtProcThursday,m_txtProcFriday,m_txtProcSaturday};
-    for(int i=0; i< 7;i++) {
-        if(aChks[i]->GetValue()) {
-            wxString timeStr = aTxts[i]->GetValue();
-            wxString startStr = timeStr.SubString(0,timeStr.First('-'));
-            wxString endStr = timeStr.SubString(timeStr.First('-')+1,timeStr.Length());
-            prefs.cpu_times.week.set(i,
-                TimeStringToDouble(startStr),
-                TimeStringToDouble(endStr)
-                );
-        }
-    }
     m_txtProcSwitchEvery->GetValue().ToDouble(&td);
     prefs.cpu_scheduling_period_minutes=RoundToHundredths(td);
     mask.cpu_scheduling_period_minutes=true;
-    //
 
-    m_txtProcUseProcessors->GetValue().ToDouble(&td);
-    td = RoundToHundredths(td);
-    prefs.max_ncpus_pct=td;
-    mask.max_ncpus_pct=true;
+     //
+    m_txtDiskWriteToDisk->GetValue().ToDouble(&td);
+    prefs.disk_interval=RoundToHundredths(td);
+    mask.disk_interval=true;
 
+   // ######### net usage page
     //
-    m_txtProcUseCPUTime->GetValue().ToDouble(&td);
-    prefs.cpu_usage_limit=RoundToHundredths(td);
-    mask.cpu_usage_limit=true;
-    
-    // network page
-    m_txtNetConnectInterval->GetValue().ToDouble(&td);
-    prefs.work_buf_min_days=RoundToHundredths(td);
-    mask.work_buf_min_days=true;
-    //
-    m_txtNetDownloadRate->GetValue().ToDouble(&td);
-    td = RoundToHundredths(td);
-    td = td * 1024;
-    prefs.max_bytes_sec_down=td;
+    if (m_chkNetDownloadRate->IsChecked()) {
+        m_txtNetDownloadRate->GetValue().ToDouble(&td);
+        td = RoundToHundredths(td);
+        td = td * 1024;
+        prefs.max_bytes_sec_down=td;
+    } else {
+        prefs.max_bytes_sec_down = 0.0;
+    }
     mask.max_bytes_sec_down=true;
     //
-    m_txtNetUploadRate->GetValue().ToDouble(&td);
-    td = RoundToHundredths(td);
-    td = td * 1024;
-    prefs.max_bytes_sec_up=td;
+    if (m_chkNetUploadRate->IsChecked()) {
+        m_txtNetUploadRate->GetValue().ToDouble(&td);
+        td = RoundToHundredths(td);
+        td = td * 1024;
+        prefs.max_bytes_sec_up=td;
+    } else {
+        prefs.max_bytes_sec_up = 0.0;
+    }
     mask.max_bytes_sec_up=true;
 
-    m_txt_daily_xfer_limit_mb->GetValue().ToDouble(&td);
-    prefs.daily_xfer_limit_mb=RoundToHundredths(td);
+    if (m_chk_daily_xfer_limit->IsChecked()) {
+        m_txt_daily_xfer_limit_mb->GetValue().ToDouble(&td);
+        prefs.daily_xfer_limit_mb=RoundToHundredths(td);
+        m_txt_daily_xfer_period_days->GetValue().ToDouble(&td);
+        prefs.daily_xfer_period_days=(int)td;
+    } else {
+        prefs.daily_xfer_limit_mb = 0.0;
+        prefs.daily_xfer_period_days = 0.0;
+    }
     mask.daily_xfer_limit_mb=true;
-    m_txt_daily_xfer_period_days->GetValue().ToDouble(&td);
-    prefs.daily_xfer_period_days=(int)td;
     mask.daily_xfer_period_days=true;
     //
     prefs.dont_verify_images=m_chkNetSkipImageVerification->GetValue();
@@ -499,53 +525,32 @@ bool CDlgAdvPreferences::SavePreferencesSettings() {
     //
     prefs.hangup_if_dialed= m_chkNetDisconnectWhenDone->GetValue();
     mask.hangup_if_dialed=true;
-    //
-    m_txtNetAdditionalDays->GetValue().ToDouble(&td);
-    prefs.work_buf_additional_days = RoundToHundredths(td);
-    mask.work_buf_additional_days = true;
-    //
-    prefs.net_times.start_hour=TimeStringToDouble(m_txtNetEveryDayStart->GetValue());
-    mask.net_start_hour = true;
-    //
-    prefs.net_times.end_hour=TimeStringToDouble(m_txtNetEveryDayStop->GetValue());
-    mask.net_end_hour = true;
 
-    wxCheckBox* aChks2[] = {m_chkNetSunday,m_chkNetMonday,m_chkNetTuesday,m_chkNetWednesday,m_chkNetThursday,m_chkNetFriday,m_chkNetSaturday};
-    wxTextCtrl* aTxts2[] = {m_txtNetSunday,m_txtNetMonday,m_txtNetTuesday,m_txtNetWednesday,m_txtNetThursday,m_txtNetFriday,m_txtNetSaturday};
-    for(int i=0; i< 7;i++) {
-        if(aChks2[i]->GetValue()) {
-            wxString timeStr = aTxts2[i]->GetValue();
-            wxString startStr = timeStr.SubString(0,timeStr.First('-'));
-            wxString endStr = timeStr.SubString(timeStr.First('-')+1,timeStr.Length());
-            prefs.net_times.week.set(i,
-                TimeStringToDouble(startStr),
-                TimeStringToDouble(endStr)
-                );
-        }
+    // ######### disk and memory page
+
+    if (m_chkDiskMaxSpace->IsChecked()) {
+        m_txtDiskMaxSpace->GetValue().ToDouble(&td);
+        prefs.disk_max_used_gb=RoundToHundredths(td);
+    } else {
+        prefs.disk_max_used_gb = 0.0;
     }
-    //disk usage
-    m_txtDiskMaxSpace->GetValue().ToDouble(&td);
-    prefs.disk_max_used_gb=RoundToHundredths(td);
     mask.disk_max_used_gb=true;
     //
-    m_txtDiskLeastFree->GetValue().ToDouble(&td);
-    prefs.disk_min_free_gb=RoundToHundredths(td);
+    if (m_chkDiskLeastFree->IsChecked()) {
+        m_txtDiskLeastFree->GetValue().ToDouble(&td);
+        prefs.disk_min_free_gb=RoundToHundredths(td);
+    } else {
+        prefs.disk_min_free_gb = 0.0;
+    }
     mask.disk_min_free_gb=true;
     //
-    m_txtDiskMaxOfTotal->GetValue().ToDouble(&td);
-    td = RoundToHundredths(td);
-    prefs.disk_max_used_pct=td;
+    if (m_chkDiskMaxOfTotal->IsChecked()) {
+        m_txtDiskMaxOfTotal->GetValue().ToDouble(&td);
+        prefs.disk_max_used_pct = RoundToHundredths(td);
+    } else {
+        prefs.disk_max_used_pct = 100.0;
+    }
     mask.disk_max_used_pct=true;
-    //
-    m_txtDiskWriteToDisk->GetValue().ToDouble(&td);
-    prefs.disk_interval=RoundToHundredths(td);
-    mask.disk_interval=true;
-    //
-    m_txtDiskMaxSwap->GetValue().ToDouble(&td);
-    td = RoundToHundredths(td);
-    td = td / 100.0 ;
-    prefs.vm_max_used_frac=td;
-    mask.vm_max_used_frac=true;
     //Memory
     m_txtMemoryMaxInUse->GetValue().ToDouble(&td);
     td = RoundToHundredths(td);
@@ -561,14 +566,54 @@ bool CDlgAdvPreferences::SavePreferencesSettings() {
     //
     prefs.leave_apps_in_memory = m_chkMemoryWhileSuspended->GetValue();
     mask.leave_apps_in_memory=true;
+    //
+    m_txtDiskMaxSwap->GetValue().ToDouble(&td);
+    td = RoundToHundredths(td);
+    td = td / 100.0 ;
+    prefs.vm_max_used_frac=td;
+    mask.vm_max_used_frac=true;
+
+    // ######### daily schedules page
 
-    if (m_bExclusiveAppsDataChanged) {
-        wxArrayString appNames = m_exclusiveApsListBox->GetStrings();
+    if (m_chkProcEveryDay->IsChecked()) {
+        prefs.cpu_times.start_hour = TimeStringToDouble(m_txtProcEveryDayStart->GetValue());
+        prefs.cpu_times.end_hour = TimeStringToDouble(m_txtProcEveryDayStop->GetValue());
+    } else {
+        prefs.cpu_times.start_hour = prefs.cpu_times.end_hour = 0.0;
+    }
+    mask.start_hour = mask.end_hour = true;
 
-        config.exclusive_apps.clear();
-        for (unsigned int i=0; i<appNames.size(); ++i) {
-            std::string s = (const char*)appNames[i].mb_str();
-            config.exclusive_apps.push_back(s);
+    //clear special day times settings
+    prefs.cpu_times.week.clear();
+    for(int i=0; i< 7;i++) {
+        if(procDayChks[i]->GetValue()) {
+            wxString startStr = procDayStartTxts[i]->GetValue();
+            wxString endStr = procDayStopTxts[i]->GetValue();
+            prefs.cpu_times.week.set(i,
+                TimeStringToDouble(startStr),
+                TimeStringToDouble(endStr)
+                );
+        }
+    }
+
+    if (m_chkNetEveryDay->IsChecked()) {
+        prefs.net_times.start_hour = TimeStringToDouble(m_txtNetEveryDayStart->GetValue());
+        prefs.net_times.end_hour = TimeStringToDouble(m_txtNetEveryDayStop->GetValue());
+    } else {
+        prefs.net_times.start_hour = prefs.net_times.end_hour = 0.0;
+    }
+    mask.net_start_hour = mask.net_end_hour = true;
+
+    //clear special net times settings
+    prefs.net_times.week.clear();
+    for(int i=0; i< 7;i++) {
+        if(netDayChks[i]->GetValue()) {
+            wxString startStr = netDayStartTxts[i]->GetValue();
+            wxString endStr = netDayStopTxts[i]->GetValue();
+            prefs.net_times.week.set(i,
+                TimeStringToDouble(startStr),
+                TimeStringToDouble(endStr)
+                );
         }
     }
 
@@ -577,206 +622,249 @@ bool CDlgAdvPreferences::SavePreferencesSettings() {
 
 /* set state of control depending on other control's state */
 void CDlgAdvPreferences::UpdateControlStates() {
-    //proc usage page
-    m_txtProcIdleFor->Enable(!m_chkProcInUse->IsChecked() || !m_chkGPUProcInUse->IsChecked());
-    m_txtProcMonday->Enable(m_chkProcMonday->IsChecked());
-    m_txtProcTuesday->Enable(m_chkProcTuesday->IsChecked());
-    m_txtProcWednesday->Enable(m_chkProcWednesday->IsChecked());
-    m_txtProcThursday->Enable(m_chkProcThursday->IsChecked());
-    m_txtProcFriday->Enable(m_chkProcFriday->IsChecked());
-    m_txtProcSaturday->Enable(m_chkProcSaturday->IsChecked());
-    m_txtProcSunday->Enable(m_chkProcSunday->IsChecked());
-
-    //net usage page
-    m_txtNetMonday->Enable(m_chkNetMonday->IsChecked());
-    m_txtNetTuesday->Enable(m_chkNetTuesday->IsChecked());
-    m_txtNetWednesday->Enable(m_chkNetWednesday->IsChecked());
-    m_txtNetThursday->Enable(m_chkNetThursday->IsChecked());
-    m_txtNetFriday->Enable(m_chkNetFriday->IsChecked());
-    m_txtNetSaturday->Enable(m_chkNetSaturday->IsChecked());
-    m_txtNetSunday->Enable(m_chkNetSunday->IsChecked());
+    // ######### proc usage page
+    // Disable idle timeout edit text item if we allow both CPU and GPU when idle.
+    bool wasEnabled = m_txtProcIdleFor->IsEnabled();
+    bool shouldEnable = m_chkProcInUse->IsChecked() || m_chkGPUProcInUse->IsChecked();
+    m_txtProcIdleFor->Enable(shouldEnable);
+    if (wasEnabled && !shouldEnable) m_txtProcIdleFor->Clear();
+    if (shouldEnable && !wasEnabled) {
+        DisplayValue(defaultPrefs.idle_time_to_run, m_txtProcIdleFor);
+    }
+    
+    // If we suspend work when in use, disable and check "Use GPU when in use"
+    m_chkGPUProcInUse->Enable(! m_chkProcInUse->IsChecked());
+    if (m_chkProcInUse->IsChecked()) m_chkGPUProcInUse->SetValue(true);
+
+    m_txtMaxLoad->Enable(m_chkMaxLoad->IsChecked());
+    
+    // ######### disk and memory usage page
+    m_txtDiskMaxSpace->Enable(m_chkDiskMaxSpace->IsChecked());
+    m_txtDiskLeastFree->Enable(m_chkDiskLeastFree->IsChecked());
+    m_txtDiskMaxOfTotal->Enable(m_chkDiskMaxOfTotal->IsChecked());
+
+    // ######### net usage page
+    m_txtNetDownloadRate->Enable(m_chkNetDownloadRate->IsChecked());
+    m_txtNetUploadRate->Enable(m_chkNetUploadRate->IsChecked());
+    m_txt_daily_xfer_limit_mb->Enable(m_chk_daily_xfer_limit->IsChecked());
+    m_txt_daily_xfer_period_days->Enable(m_chk_daily_xfer_limit->IsChecked());
+
+    // ######### daily schedules page
+    m_txtProcEveryDayStart->Enable(m_chkProcEveryDay->IsChecked());
+    m_txtProcEveryDayStop->Enable(m_chkProcEveryDay->IsChecked());
+
+    m_txtNetEveryDayStart->Enable(m_chkNetEveryDay->IsChecked());
+    m_txtNetEveryDayStop->Enable(m_chkNetEveryDay->IsChecked());
+    
+    for (int i=0; i<7; ++i) {
+        procDayStartTxts[i]->Enable(procDayChks[i]->IsChecked());
+        procDayStopTxts[i]->Enable(procDayChks[i]->IsChecked());
+        netDayStartTxts[i]->Enable(netDayChks[i]->IsChecked());
+        netDayStopTxts[i]->Enable(netDayChks[i]->IsChecked());
+    }
 }
 
 /* validates the entered informations */
 bool CDlgAdvPreferences::ValidateInput() {
-    wxString invMsgFloat = _("invalid number");
-    wxString invMsgTime = _("invalid time, format is HH:MM");
-    wxString invMsgInterval = _("invalid time interval, format is HH:MM-HH:MM");
+    wxString invMsgFloat = _("Invalid number");
+    wxString invMsgTime = _("Invalid time, value must be between 0:00 and 24:00, format is HH:MM");
+    wxString invMsgLimit10 = _("Number must be between 0 and 10");
+    wxString invMsgLimit100 = _("Number must be between 0 and 100");
     wxString buffer;
-    //proc page
-    if(m_txtProcIdleFor->IsEnabled()) {
-        buffer = m_txtProcIdleFor->GetValue();
-        if(!IsValidFloatValue(buffer)) {
-            ShowErrorMessage(invMsgFloat,m_txtProcIdleFor);
-            return false;
-        }
-    }
-    buffer = m_txtMaxLoad->GetValue();
-    if(!IsValidFloatValueBetween(buffer, 0.0, 100.0)) {
-        ShowErrorMessage(invMsgFloat, m_txtMaxLoad);
-        return false;
-    }
 
-    buffer = m_txtProcEveryDayStart->GetValue();
-    if(!IsValidTimeValue(buffer)) {
-        ShowErrorMessage(invMsgTime,m_txtProcEveryDayStart);
-        return false;
-    }
-    buffer = m_txtProcEveryDayStop->GetValue();
-    if(!IsValidTimeValue(buffer)) {
-        ShowErrorMessage(invMsgTime,m_txtProcEveryDayStop);
-        return false;
-    }
-    //all text ctrls in proc special time panel
-    wxWindowList children = m_panelProcSpecialTimes->GetChildren();
-    wxWindowList::compatibility_iterator node = children.GetFirst();
-    while(node) {
-        if(node->GetData()->IsKindOf(CLASSINFO(wxTextCtrl))) {
-            wxTextCtrl*  txt = wxDynamicCast(node->GetData(),wxTextCtrl);
-            if(txt) {
-                if(txt->IsEnabled()) {
-                    buffer = txt->GetValue();
-                    if(!IsValidTimeIntervalValue(buffer)) {
-                        ShowErrorMessage(invMsgInterval,txt);
-                        return false;
-                    }
-                }
-            }
-        }
-        node = node->GetNext();
-    }
-    
-    buffer = m_txtProcSwitchEvery->GetValue();
-    if(!IsValidFloatValue(buffer)) {
-        ShowErrorMessage(invMsgFloat, m_txtProcSwitchEvery);
-        return false;
-    }
-    
+    // ######### proc usage page
     buffer = m_txtProcUseProcessors->GetValue();
     if(!IsValidFloatValueBetween(buffer, 0.0, 100.0)) {
-        ShowErrorMessage(invMsgFloat, m_txtProcUseProcessors);
+        ShowErrorMessage(invMsgLimit100, m_txtProcUseProcessors);
         return false;
     }
     
     buffer = m_txtProcUseCPUTime->GetValue();
     if(!IsValidFloatValueBetween(buffer, 0.0, 100.0)) {
-        ShowErrorMessage(invMsgFloat, m_txtProcUseCPUTime);
-        return false;
-    }
-    
-    //net page
-    buffer = m_txtNetDownloadRate->GetValue();
-    if(!IsValidFloatValue(buffer)) {
-        ShowErrorMessage(invMsgFloat, m_txtNetDownloadRate);
+        ShowErrorMessage(invMsgLimit100, m_txtProcUseCPUTime);
         return false;
     }
     
-    buffer = m_txtNetUploadRate->GetValue();
-    if(!IsValidFloatValue(buffer)) {
-        ShowErrorMessage(invMsgFloat, m_txtNetUploadRate);
-        return false;
-    }
-    
-    buffer = m_txt_daily_xfer_limit_mb->GetValue();
-    if(!IsValidFloatValue(buffer)) {
-        ShowErrorMessage(invMsgFloat, m_txt_daily_xfer_limit_mb);
-        return false;
+    if(m_txtProcIdleFor->IsEnabled()) {
+        buffer = m_txtProcIdleFor->GetValue();
+        if(!IsValidFloatValue(buffer)) {
+            ShowErrorMessage(invMsgFloat,m_txtProcIdleFor);
+            return false;
+        }
     }
-    
-    buffer = m_txt_daily_xfer_period_days->GetValue();
-    if(!IsValidFloatValue(buffer)) {
-        ShowErrorMessage(invMsgFloat, m_txt_daily_xfer_period_days);
-        return false;
+
+    if (m_chkMaxLoad->IsChecked()) {
+        buffer = m_txtMaxLoad->GetValue();
+        if(!IsValidFloatValueBetween(buffer, 0.0, 100.0)) {
+            ShowErrorMessage(invMsgLimit100, m_txtMaxLoad);
+            return false;
+        }
     }
     
     //limit additional days from 0 to 10
     buffer = m_txtNetConnectInterval->GetValue();
     if(!IsValidFloatValueBetween(buffer, 0.0, 10.0)) {
-        ShowErrorMessage(invMsgFloat,m_txtNetConnectInterval);
+        ShowErrorMessage(invMsgLimit100,m_txtNetConnectInterval);
         return false;
     }
     
     buffer = m_txtNetAdditionalDays->GetValue();
     if(!IsValidFloatValueBetween(buffer, 0.0, 10.0)) {
-        ShowErrorMessage(invMsgFloat,m_txtNetAdditionalDays);
+        ShowErrorMessage(invMsgLimit100,m_txtNetAdditionalDays);
         return false;
     }
 
-    buffer = m_txtNetEveryDayStart->GetValue();
-    if(!IsValidTimeValue(buffer)) {
-        ShowErrorMessage(invMsgTime,m_txtNetEveryDayStart);
+    buffer = m_txtProcSwitchEvery->GetValue();
+    if(!IsValidFloatValue(buffer)) {
+        ShowErrorMessage(invMsgFloat, m_txtProcSwitchEvery);
         return false;
+    } else {
+        double td;
+        if((!buffer.ToDouble(&td)) || (td < 1.0)) {
+            ShowErrorMessage(invMsgFloat, m_txtProcSwitchEvery);
+            return false;
+        }
     }
-
-    buffer = m_txtNetEveryDayStop->GetValue();
-    if(!IsValidTimeValue(buffer)) {
-        ShowErrorMessage(invMsgTime,m_txtNetEveryDayStop);
+    
+    buffer = m_txtDiskWriteToDisk->GetValue();
+    if(!IsValidFloatValue(buffer)) {
+        ShowErrorMessage(invMsgFloat, m_txtDiskWriteToDisk);
         return false;
     }
+    
+    // ######### net usage page
 
-    //all text ctrls in net special time panel
-
-    children = m_panelNetSpecialTimes->GetChildren();
-    node = children.GetFirst();
-    while(node) {
-        if(node->GetData()->IsKindOf(CLASSINFO(wxTextCtrl))) {
-            wxTextCtrl*  txt = wxDynamicCast(node->GetData(),wxTextCtrl);
-            if(txt) {
-                if(txt->IsEnabled()) {
-                    buffer = txt->GetValue();
-                    if(!IsValidTimeIntervalValue(buffer)) {
-                        ShowErrorMessage(invMsgInterval,txt);
-                        return false;
-                    }
-                }//if(txt->IsEnabled())
-            }//if(txt)
-        }//if(node->GetData()
-        node = node->GetNext();
-    }
-
-    //disk & memory usage page
-    buffer = m_txtDiskMaxSpace->GetValue();
-    if(!IsValidFloatValue(buffer)) {
-        ShowErrorMessage(invMsgFloat, m_txtDiskMaxSpace);
-        return false;
+    if (m_chkNetDownloadRate->IsChecked()) {
+        buffer = m_txtNetDownloadRate->GetValue();
+        if(!IsValidFloatValue(buffer)) {
+            ShowErrorMessage(invMsgFloat, m_txtNetDownloadRate);
+            return false;
+        }
     }
     
-    buffer = m_txtDiskLeastFree->GetValue();
-    if(!IsValidFloatValue(buffer)) {
-        ShowErrorMessage(invMsgFloat, m_txtDiskLeastFree);
-        return false;
+    if (m_chkNetUploadRate->IsChecked()) {
+        buffer = m_txtNetUploadRate->GetValue();
+        if(!IsValidFloatValue(buffer)) {
+            ShowErrorMessage(invMsgFloat, m_txtNetUploadRate);
+            return false;
+        }
     }
     
-    buffer = m_txtDiskMaxOfTotal->GetValue();
-    if(!IsValidFloatValueBetween(buffer, 0.0, 100.0)) {
-        ShowErrorMessage(invMsgFloat, m_txtDiskMaxOfTotal);
-        return false;
+    if (m_chk_daily_xfer_limit->IsChecked()) {
+        buffer = m_txt_daily_xfer_limit_mb->GetValue();
+        if(!IsValidFloatValue(buffer)) {
+            ShowErrorMessage(invMsgFloat, m_txt_daily_xfer_limit_mb);
+            return false;
+        }
+    
+        buffer = m_txt_daily_xfer_period_days->GetValue();
+        if(!IsValidFloatValue(buffer)) {
+            ShowErrorMessage(invMsgFloat, m_txt_daily_xfer_period_days);
+            return false;
+        }
+    }
+ 
+    // ######### disk and memory page
+    if (m_chkDiskMaxSpace->IsChecked()) {
+        buffer = m_txtDiskMaxSpace->GetValue();
+        if(!IsValidFloatValue(buffer)) {
+            ShowErrorMessage(invMsgFloat, m_txtDiskMaxSpace);
+            return false;
+        }
     }
     
-    buffer = m_txtDiskWriteToDisk->GetValue();
-    if(!IsValidFloatValue(buffer)) {
-        ShowErrorMessage(invMsgFloat, m_txtDiskWriteToDisk);
-        return false;
+    if (m_chkDiskLeastFree->IsChecked()) {
+        buffer = m_txtDiskLeastFree->GetValue();
+        if(!IsValidFloatValue(buffer)) {
+            ShowErrorMessage(invMsgFloat, m_txtDiskLeastFree);
+            return false;
+        }
     }
     
-    buffer = m_txtDiskMaxSwap->GetValue();
-    if(!IsValidFloatValueBetween(buffer, 0.0, 100.0)) {
-        ShowErrorMessage(invMsgFloat, m_txtDiskMaxSwap);
-        return false;
+    if (m_chkDiskMaxOfTotal->IsChecked()) {
+        buffer = m_txtDiskMaxOfTotal->GetValue();
+        if(!IsValidFloatValueBetween(buffer, 0.0, 100.0)) {
+            ShowErrorMessage(invMsgLimit100, m_txtDiskMaxOfTotal);
+            return false;
+        }
     }
     
     buffer = m_txtMemoryMaxInUse->GetValue();
     if(!IsValidFloatValueBetween(buffer, 0.0, 100.0)) {
-        ShowErrorMessage(invMsgFloat, m_txtMemoryMaxInUse);
+        ShowErrorMessage(invMsgLimit100, m_txtMemoryMaxInUse);
         return false;
     }
     
     buffer = m_txtMemoryMaxOnIdle->GetValue();
     if(!IsValidFloatValueBetween(buffer, 0.0, 100.0)) {
-        ShowErrorMessage(invMsgFloat, m_txtMemoryMaxOnIdle);
+        ShowErrorMessage(invMsgLimit100, m_txtMemoryMaxOnIdle);
+        return false;
+    }
+
+    buffer = m_txtDiskMaxSwap->GetValue();
+    if(!IsValidFloatValueBetween(buffer, 0.0, 100.0)) {
+        ShowErrorMessage(invMsgLimit100, m_txtDiskMaxSwap);
         return false;
     }
+    
+    // ######### daily schedules page
+    if (m_chkProcEveryDay->IsChecked()) {
+        buffer = m_txtProcEveryDayStart->GetValue();
+        if(!IsValidTimeValue(buffer)) {
+            ShowErrorMessage(invMsgTime,m_txtProcEveryDayStart);
+            return false;
+        }
+        buffer = m_txtProcEveryDayStop->GetValue();
+        if(!IsValidTimeValue(buffer)) {
+            ShowErrorMessage(invMsgTime,m_txtProcEveryDayStop);
+            return false;
+        }
+    }
+    
+    //all text ctrls in proc special time textBox
+    for(int i=0; i< 7;i++) {
+        if(procDayChks[i]->GetValue()) {
+           buffer = procDayStartTxts[i]->GetValue();
+            if(!IsValidTimeValue(buffer)) {
+                ShowErrorMessage(invMsgTime,procDayStartTxts[i]);
+                return false;
+            }
+           buffer = procDayStopTxts[i]->GetValue();
+            if(!IsValidTimeValue(buffer)) {
+                ShowErrorMessage(invMsgTime,procDayStopTxts[i]);
+                return false;
+            }
+        }
+    }
 
+    if (m_chkNetEveryDay->IsChecked()) {
+        buffer = m_txtNetEveryDayStart->GetValue();
+        if(!IsValidTimeValue(buffer)) {
+            ShowErrorMessage(invMsgTime,m_txtNetEveryDayStart);
+            return false;
+        }
+        buffer = m_txtNetEveryDayStop->GetValue();
+        if(!IsValidTimeValue(buffer)) {
+            ShowErrorMessage(invMsgTime,m_txtNetEveryDayStop);
+            return false;
+        }
+    }
+    
+    //all text ctrls in net special time textBox
+    for(int i=0; i< 7;i++) {
+        if(netDayChks[i]->GetValue()) {
+           buffer = netDayStartTxts[i]->GetValue();
+            if(!IsValidTimeValue(buffer)) {
+                ShowErrorMessage(invMsgTime,netDayStartTxts[i]);
+                return false;
+            }
+            buffer = netDayStopTxts[i]->GetValue();
+            if(!IsValidTimeValue(buffer)) {
+                ShowErrorMessage(invMsgTime,netDayStopTxts[i]);
+                return false;
+            }
+        }
+    }
     return true;
 }
 
@@ -830,11 +918,6 @@ bool CDlgAdvPreferences::IsValidTimeChar(const wxChar& ch) {
     return wxIsdigit(ch) || ch==':';
 }
 
-/* checks if ch is a valid character for time interval values */
-bool CDlgAdvPreferences::IsValidTimeIntervalChar(const wxChar& ch) {
-    return IsValidTimeChar(ch) || ch=='-';
-}
-
 /* checks if the value contains a valid float */
 bool CDlgAdvPreferences::IsValidFloatValue(const wxString& value, bool allowNegative) {
     for(unsigned int i=0; i < value.Length();i++) {
@@ -886,219 +969,100 @@ bool CDlgAdvPreferences::IsValidTimeValue(const wxString& value) {
     return true;
 }
 
-/* checks if the value is a valid time interval, format HH:MM-HH:MM */
-bool CDlgAdvPreferences::IsValidTimeIntervalValue(const wxString& value) {
-    for(unsigned int i=0; i < value.Length();i++) {
-        if(!IsValidTimeIntervalChar(value[i])) {
-            return false;
-        }
-    }
-    //all chars are valid, now what is with the value as a whole ?
-    //check for -
-    if(value.Find('-')<0) {
-        return false;
-    }
-    //split up into start and stop
-    wxString start = value.BeforeFirst('-');
-    wxString stop = value.AfterFirst('-');
-    //validate start and stop parts
-    if(!IsValidTimeValue(start) || !IsValidTimeValue(stop)) {
-        return false;
-    }
-    //ensure that start is lower than stop
-    wxDateTime dtStart,dtStop;
-    dtStart.ParseFormat(start,wxT("%H:%M"));
-    dtStop.ParseFormat(stop,wxT("%H:%M"));
-    //
-    /*if(dtStart>=dtStop) {
-        return false;
-    }*/
-    return true;
-}
 
 // ------------ Event handlers starts here
 // -------- generic command handler
 // handles all control command events
 void CDlgAdvPreferences::OnHandleCommandEvent(wxCommandEvent& ev) {
     ev.Skip();
-    if(!m_bInInit) {
-        m_bPrefsDataChanged=true;
-    }
-    UpdateControlStates();
-}
-
-// ---- Exclusive Apps list box handler
-void CDlgAdvPreferences::OnExclusiveAppListEvent(wxCommandEvent& ev) {
-    wxArrayInt selections;
-    int numSelected;
-
-    if(!m_bInInit) {
-        numSelected = m_exclusiveApsListBox->GetSelections(selections);
-        m_removeExclusiveAppButton->Enable(numSelected > 0);
-    }
-    ev.Skip();
-}
-
-// ---- command buttons handlers
-// handles Add button clicked
-void CDlgAdvPreferences::OnAddExclusiveApp(wxCommandEvent&) {
-    wxString strMachineName;
-    int i, j, n;
-    bool hostIsMac = false;
-    bool hostIsWin = false;
-    bool isDuplicate;
-    wxArrayString appNames;
-    wxChar *extension = wxT("");
-    wxString errmsg;
-    CMainDocument* pDoc = wxGetApp().GetDocument();
-
-    wxASSERT(pDoc);
-    wxASSERT(wxDynamicCast(pDoc, CMainDocument));
-
-    if (strstr(pDoc->state.host_info.os_name, "Darwin")) {
-        hostIsMac = true;
-        extension = wxT(".app");
-    } else if (strstr(pDoc->state.host_info.os_name, "Microsoft")) {
-        hostIsWin = true;
-        extension = wxT(".exe");
-    }
-
-    pDoc->GetConnectedComputerName(strMachineName);
-    if (pDoc->IsComputerNameLocal(strMachineName)) {
-#ifdef __WXMAC__
-        wxFileDialog picker(this, _("Applications to add"),
-            wxT("/Applications"), wxT(""), wxT("*.app"),
-            wxFD_OPEN|wxFD_FILE_MUST_EXIST|wxFD_MULTIPLE|wxFD_CHANGE_DIR
-        );
-#elif defined(__WXMSW__)
-//TODO: fill in the default directory for MSW
-        wxFileDialog picker(this, _("Applications to add"),
-            wxT("C:/Program Files"), wxT(""), wxT("*.exe"),
-            wxFD_OPEN|wxFD_FILE_MUST_EXIST|wxFD_MULTIPLE|wxFD_CHANGE_DIR
-        );
-#else
-//TODO: fill in the default directory for Linux
-        wxFileDialog picker(this, _("Applications to add"),
-            wxT("/usr/bin"), wxT(""), wxT("*"),
-            wxFD_OPEN|wxFD_FILE_MUST_EXIST|wxFD_MULTIPLE|wxFD_CHANGE_DIR
-        );
-#endif
-        if (picker.ShowModal() != wxID_OK) return;
-        picker.GetFilenames(appNames);
-
-        for (i=appNames.Count()-1; i>=0; --i) {
-#ifdef __WXMSW__
-            // Under Windows, filename may include paths if a shortcut selected
-            wxString appNameOnly = appNames[i].AfterLast('\\');
-            appNames[i] = appNameOnly;
-#endif
-            wxString directory = picker.GetDirectory();
-            wxFileName fn(directory, appNames[i]);
-            if (!fn.IsOk() || !fn.IsFileExecutable()) {
-                errmsg.Printf(_("'%s' is not an executable application."), appNames[i].c_str());
-                wxGetApp().SafeMessageBox(errmsg, _("Add Exclusive App"),
-                    wxOK | wxICON_EXCLAMATION, this
-                );
-                appNames.RemoveAt(i);
-                continue;
-            }
+    // If user has just set the checkbox, set textedit field to default value.
+    // Note: use ChangeValue() here to avoid generating extra events.
+    // m_txtProcIdleFor depends on 2 checkboxes, set it in UpdateControlStates().
+    switch (ev.GetId()) {
+    // processor usage page
+    case ID_CHKMAXLOAD:
+        DisplayValue(defaultPrefs.suspend_cpu_usage, m_txtMaxLoad, m_chkMaxLoad);
+        break;
+    
+    // network usage page
+    case ID_CHKNETDOWNLOADRATE:
+        DisplayValue((defaultPrefs.max_bytes_sec_down / 1024), m_txtNetDownloadRate, m_chkNetDownloadRate);
+        break;
+    case ID_CHKNETUPLOADRATE:
+        DisplayValue((defaultPrefs.max_bytes_sec_up / 1024), m_txtNetUploadRate, m_chkNetUploadRate);
+        break;
+    case ID_CHKDAILYXFERLIMIT:
+        DisplayValue(defaultPrefs.daily_xfer_limit_mb, m_txt_daily_xfer_limit_mb, m_chk_daily_xfer_limit);
+        DisplayValue(defaultPrefs.daily_xfer_period_days, m_txt_daily_xfer_period_days, m_chk_daily_xfer_limit);
+        break;
+        
+    // disk usage page
+    case ID_CHKDISKMAXSPACE:
+        DisplayValue(defaultPrefs.disk_max_used_gb, m_txtDiskMaxSpace, m_chkDiskMaxSpace);
+        break;
+    case ID_CHKDISKLEASTFREE:
+        DisplayValue(defaultPrefs.disk_min_free_gb, m_txtDiskLeastFree, m_chkDiskLeastFree);
+        break;
+    case ID_CHKDISKMAXOFTOTAL:
+        DisplayValue(defaultPrefs.disk_max_used_pct, m_txtDiskMaxOfTotal, m_chkDiskMaxOfTotal);
+        break;
+    case ID_CHKPROCEVERYDAY:
+        if (ev.IsChecked()) {
+            m_txtProcEveryDayStart->ChangeValue(DoubleToTimeString(defaultPrefs.cpu_times.start_hour));
+            m_txtProcEveryDayStop->ChangeValue(DoubleToTimeString(defaultPrefs.cpu_times.end_hour));
+        } else {
+            m_txtProcEveryDayStart->Clear();
+            m_txtProcEveryDayStop->Clear();
         }
-    } else {
-        // We can't use file picker if connected to a remote computer,
-        // so show a dialog with textedit field so user can type app name
-        wxChar path_separator = wxT('/');
-
-        wxTextEntryDialog dlg(this, _("Name of application to add?"), _("Add exclusive app"));
-        if (hostIsMac) {
-            dlg.SetValue(extension);
-        } else if (hostIsWin) {
-            dlg.SetValue(extension);
-            path_separator = wxT('\\');
+        break;
+    case ID_CHKPROCSUNDAY:
+    case ID_CHKPROCMONDAY:
+    case ID_CHKPROCTUESDAY:
+    case ID_CHKPROCWEDNESDAY:
+    case ID_CHKPROCTHURSDAY:
+    case ID_CHKPROCFRIDAY:
+    case ID_CHKPROCSATURDAY:
+        if (ev.IsChecked()) {
+            (procDayStartTxts[ev.GetId() - ID_CHKPROCSUNDAY])->ChangeValue(DoubleToTimeString(defaultPrefs.cpu_times.start_hour));
+            (procDayStopTxts[ev.GetId() - ID_CHKPROCSUNDAY])->ChangeValue(DoubleToTimeString(defaultPrefs.cpu_times.end_hour));
+        } else {
+            (procDayStartTxts[ev.GetId() - ID_CHKPROCSUNDAY])->Clear();
+            (procDayStopTxts[ev.GetId() - ID_CHKPROCSUNDAY])->Clear();
         }
-        if (dlg.ShowModal() != wxID_OK) return;
-
-        wxString theAppName = dlg.GetValue();
-        // Strip off path if present
-        appNames.Add(theAppName.AfterLast(path_separator));
-    }
-
-    for (i=0; i<(int)appNames.Count(); ++i) {
-        // wxFileName::IsFileExecutable() doesn't seem to work on Windows,
-        // and we can only perform minimal validation on remote hosts, so
-        // check filename extension on Mac and Win
-        bool bad_name = false;
-        if (hostIsMac) {
-            bad_name = !appNames[i].EndsWith(extension);
-        } else if (hostIsWin) {
-            size_t len = appNames[i].Len();
-            size_t xl = 4;
-            if (len < xl) {
-                bad_name = true;
-            } else {
-                wxString x = appNames[i].Mid(len-xl);
-                if (x.CmpNoCase(extension) != 0) {
-                    bad_name = true;
-                }
-            }
+        break;
+    case ID_CHKNETEVERYDAY:
+       if (ev.IsChecked()) {
+            m_txtNetEveryDayStart->ChangeValue(DoubleToTimeString(defaultPrefs.net_times.start_hour));
+            m_txtNetEveryDayStop->ChangeValue(DoubleToTimeString(defaultPrefs.net_times.end_hour));
+        } else {
+            m_txtNetEveryDayStart->Clear();
+            m_txtNetEveryDayStop->Clear();
         }
-        if (bad_name) {
-            errmsg.Printf(_("Application names must end with '%s'"), extension);
-            wxGetApp().SafeMessageBox(errmsg, _("Add Exclusive App"),
-                wxOK | wxICON_EXCLAMATION, this
-            );
-            return;
-        }
-
-        if (hostIsMac) {
-            int suffix = appNames[i].Find('.', true);
-            if (suffix != wxNOT_FOUND) {
-                appNames[i].Truncate(suffix);
-            }
+        break;
+    case ID_CHKNETSUNDAY:
+    case ID_CHKNETMONDAY:
+    case ID_CHKNETTUESDAY:
+    case ID_CHKNETWEDNESDAY:
+    case ID_CHKNETTHURSDAY:
+    case ID_CHKNETFRIDAY:
+    case ID_CHKNETSATURDAY:
+       if (ev.IsChecked()) {
+            (netDayStartTxts[ev.GetId() - ID_CHKNETSUNDAY])->ChangeValue(DoubleToTimeString(defaultPrefs.net_times.start_hour));
+            (netDayStopTxts[ev.GetId() - ID_CHKNETSUNDAY])->ChangeValue(DoubleToTimeString(defaultPrefs.net_times.end_hour));
+        } else {
+            (netDayStartTxts[ev.GetId() - ID_CHKNETSUNDAY])->Clear();
+            (netDayStopTxts[ev.GetId() - ID_CHKNETSUNDAY])->Clear();
         }
-
-        // Skip requests for duplicate entries
-        isDuplicate = false;
-        n = m_exclusiveApsListBox->GetCount();
-        for (j=0; j<n; ++j) {
-            if ((m_exclusiveApsListBox->GetString(j)).Cmp(appNames[i]) == 0) {
-                isDuplicate = true;
-                break;
-            }
-        }
-        if (isDuplicate) {
-            errmsg.Printf(_("'%s' is already in the list."), appNames[i].c_str());
-            wxGetApp().SafeMessageBox(errmsg, _("Add Exclusive App"),
-                wxOK | wxICON_EXCLAMATION, this
-            );
-            continue;
-        }
-
-        m_exclusiveApsListBox->Append(appNames[i]);
-        m_bExclusiveAppsDataChanged = true;
-    }
-}
-
-static int myCompareInts(int *first, int *second) {
-    return *first - *second;
-}
-
-typedef int (*sortcomparefunc)(int*, int*);
-
-// handles Remove button clicked
-void CDlgAdvPreferences::OnRemoveExclusiveApp(wxCommandEvent& ev) {
-    wxArrayInt selections;
-    int numSelected = m_exclusiveApsListBox->GetSelections(selections);
-
-    // The selection indices are returned in random order.
-    // We must sort them to ensure deleting the correct items.
-    selections.Sort((sortcomparefunc)&myCompareInts);
-    for (int i=numSelected-1; i>=0; --i) {
-        m_exclusiveApsListBox->Delete(selections[i]);
-        m_bExclusiveAppsDataChanged = true;
+        break;
+    
+    default:
+        break;
     }
-    ev.Skip();
+//    }
+    UpdateControlStates();
 }
 
+// ---- command buttons handlers
 // handles OK button clicked
 void CDlgAdvPreferences::OnOK(wxCommandEvent& ev) {
     CMainDocument*    pDoc = wxGetApp().GetDocument();
@@ -1114,12 +1078,6 @@ void CDlgAdvPreferences::OnOK(wxCommandEvent& ev) {
         pDoc->rpc.read_global_prefs_override();
     }
 
-    if (m_bExclusiveAppsDataChanged) {
-        int retval = pDoc->rpc.set_cc_config(config, log_flags);
-        if (!retval) {
-            pDoc->rpc.read_cc_config();
-        }
-    }
     ev.Skip();
 }
 
@@ -1158,7 +1116,7 @@ void CDlgAdvPreferences::OnClear(wxCommandEvent& ev) {
 
 bool CDlgAdvPreferences::ConfirmClear() {
     int res = wxGetApp().SafeMessageBox(_(
-        "Do you really want to clear all local preferences?\n(This will not affect exclusive applications.)"),
+        "Discard local preferences and use web-based preferences?"),
         _("Confirmation"),wxCENTER | wxICON_QUESTION | wxYES_NO | wxNO_DEFAULT,this);
 
     return res==wxYES;
diff --git a/clientgui/DlgAdvPreferences.h b/clientgui/DlgAdvPreferences.h
index e448efc..43c2d81 100644
--- a/clientgui/DlgAdvPreferences.h
+++ b/clientgui/DlgAdvPreferences.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
@@ -27,9 +27,6 @@
 #include "prefs.h"
 #include "cc_config.h"
 
-#define TXT_PROC_TIME_TOOLTIP _("specify work start and stop hours in format HH:MM-HH:MM")
-#define TXT_NET_TIME_TOOLTIP _("specify network usage start and stop hours in format HH:MM-HH:MM")
-
 class CDlgAdvPreferences : public CDlgAdvPreferencesBase {
 	DECLARE_DYNAMIC_CLASS( CDlgAdvPreferences )
     DECLARE_EVENT_TABLE()
@@ -46,8 +43,6 @@ class CDlgAdvPreferences : public CDlgAdvPreferencesBase {
     bool IsValidFloatValueBetween(const wxString& value, double minVal, double maxVal);
 	bool IsValidTimeChar(const wxChar& ch);
 	bool IsValidTimeValue(const wxString& value);
-	bool IsValidTimeIntervalChar(const wxChar& ch);
-	bool IsValidTimeIntervalValue(const wxString& value);
 	void ShowErrorMessage(wxString& msg,wxTextCtrl* errorCtrl);
 	bool EnsureTabPageVisible(wxTextCtrl* txtCtrl);
 	bool ConfirmClear();
@@ -59,24 +54,24 @@ public:
 	virtual ~CDlgAdvPreferences();
 	//generic event handler
 	void OnHandleCommandEvent(wxCommandEvent& ev);
-	//
-    void OnExclusiveAppListEvent(wxCommandEvent& event);
-    //
-	void OnAddExclusiveApp(wxCommandEvent& event);
-	void OnRemoveExclusiveApp(wxCommandEvent& event);
 	void OnOK(wxCommandEvent& event);
 	void OnHelp(wxCommandEvent& event);
 	void OnClear(wxCommandEvent& event);
+    void DisplayValue(double value, wxTextCtrl* textCtrl, wxCheckBox* checkBox=NULL);
 private:
     GLOBAL_PREFS      prefs;
     GLOBAL_PREFS_MASK mask;
+    GLOBAL_PREFS      defaultPrefs;
     LOG_FLAGS log_flags;
     CC_CONFIG config;
-	bool m_bExclusiveAppsDataChanged;
-	bool m_bPrefsDataChanged;
-	bool m_bInInit;
 	wxArrayInt m_arrTabPageIds;
-    wxTextValidator* m_vTimeIntervalValidator;
+    wxTextValidator* m_vTimeValidator;
+    wxCheckBox* procDayChks[7];
+    wxTextCtrl* procDayStartTxts[7];
+    wxTextCtrl* procDayStopTxts[7];
+    wxCheckBox* netDayChks[7];
+    wxTextCtrl* netDayStartTxts[7];
+    wxTextCtrl* netDayStopTxts[7];
 };
 
 #endif // _DLGADVPREFERENCES_H_
diff --git a/clientgui/DlgAdvPreferencesBase.cpp b/clientgui/DlgAdvPreferencesBase.cpp
index e8deae1..33afc86 100644
--- a/clientgui/DlgAdvPreferencesBase.cpp
+++ b/clientgui/DlgAdvPreferencesBase.cpp
@@ -1,6 +1,6 @@
 // This file is part of BOINC.
 // http://boinc.berkeley.edu
-// Copyright (C) 2010 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
@@ -28,10 +28,15 @@
 #include "parse.h"
 #include "LogBOINC.h"
 #include "BOINCGUIApp.h"
+#include "MainDocument.h"
 #include "SkinManager.h"
 
 #include "DlgAdvPreferencesBase.h"
 
+#define STATICBOXBORDERSIZE 8
+#define STATICBOXVERTICALSPACER 10
+#define DAYOFWEEKBORDERSIZE 10
+
 ///////////////////////////////////////////////////////////////////////////
 
 // NOTE: On MS Windows with wxWidgets 3.0, controls inside a wxStaticBox 
@@ -54,7 +59,7 @@ CDlgAdvPreferencesBase::CDlgAdvPreferencesBase( wxWindow* parent, int id, wxStri
     this->SetTitle(strCaption);
 
     wxBoxSizer* dialogSizer = new wxBoxSizer( wxVERTICAL );
-    wxStaticBox* topControlsStaticBox = new wxStaticBox( this, -1, wxT("") );
+    wxStaticBox* topControlsStaticBox = new wxStaticBox( this, -1, wxEmptyString );
 
     wxStaticBoxSizer* topControlsSizer = new wxStaticBoxSizer( topControlsStaticBox, wxHORIZONTAL );
 
@@ -63,15 +68,66 @@ CDlgAdvPreferencesBase::CDlgAdvPreferencesBase( wxWindow* parent, int id, wxStri
 
     topControlsSizer->Add( m_bmpWarning, 0, wxALIGN_CENTER_VERTICAL|wxALL, 0 );
 
-    m_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 (except exclusive apps)."), wxDefaultPosition, wxDefaultSize, 0 );
-    topControlsSizer->Add( m_staticText321, 1, wxALL, 1 );
+    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
+        );
+    } else {
+        legendSizer->Add(
+            new wxStaticText( topControlsStaticBox, ID_DEFAULT,
+                        _("Using web-based preferences from"),
+                        wxDefaultPosition, wxDefaultSize, 0 ),
+            0, wxALL, 1
+        );
+    }
+    
+     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 0
+    wxStaticText* staticText321 = new wxStaticText( topControlsStaticBox, ID_DEFAULT, _("This dialog controls preferences for this computer only.\nClick OK to set preferences.\nClick Clear to restore web-based settings."), wxDefaultPosition, wxDefaultSize, 0 );
+    topControlsSizer->Add( staticText321, 1, wxALL, 1 );
 
     m_btnClear = new wxButton( topControlsStaticBox, ID_BTN_CLEAR, _("Clear"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_btnClear->SetToolTip( _("clear all local preferences and close the dialog") );
+    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 );
 
-    dialogSizer->Add( topControlsSizer, 0, wxALL|wxEXPAND, 1 );
+#ifdef __WXMAC__
+    dialogSizer->Add( topControlsSizer, 0, wxTOP|wxLEFT|wxRIGHT|wxEXPAND, 10 );
+#else
+    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 );
@@ -81,42 +137,44 @@ CDlgAdvPreferencesBase::CDlgAdvPreferencesBase( wxWindow* parent, int id, wxStri
     m_Notebook = new wxNotebook( m_panelControls, ID_DEFAULT, wxDefaultPosition, wxDefaultSize, wxNB_FLAT|wxNB_TOP );
     m_Notebook->SetExtraStyle( wxWS_EX_VALIDATE_RECURSIVELY );
 
+    // Note: we must set the third AddPage argument ("select") to
+    // true for each page or ToolTips won't initialize properly.
     m_panelProcessor = createProcessorTab(m_Notebook);
-    m_Notebook->AddPage( m_panelProcessor, _("processor usage"), false );
+    m_Notebook->AddPage( m_panelProcessor, _("Computing"), true );
 
     m_panelNetwork = createNetworkTab(m_Notebook);
-    m_Notebook->AddPage( m_panelNetwork, _("network usage"), true );
+    m_Notebook->AddPage( m_panelNetwork, _("Network"), true );
 
     m_panelDiskAndMemory = createDiskAndMemoryTab(m_Notebook);
-    m_Notebook->AddPage( m_panelDiskAndMemory, _("disk and memory usage"), false );
+    m_Notebook->AddPage( m_panelDiskAndMemory, _("Disk and memory"), true );
+
+    m_panelDailySchedules = createDailySchedulesTab(m_Notebook);
+    m_Notebook->AddPage( m_panelDailySchedules, _("Daily schedules"), true );
 
-    m_panelExlusiveApps = createExclusiveAppsTab(m_Notebook);
-    m_Notebook->AddPage( m_panelExlusiveApps, _("exclusive applications"), false );
-    
     notebookSizer->Add( m_Notebook, 1, wxEXPAND | wxALL, 1 );
 
     m_panelControls->SetSizer( notebookSizer );
     m_panelControls->Layout();
     notebookSizer->Fit( m_panelControls );
 
-    dialogSizer->Add( m_panelControls, 1, wxALL|wxEXPAND, 1 );
+    dialogSizer->Add( m_panelControls, 1, wxALL|wxEXPAND, 5 );
 
     m_panelButtons = new wxPanel( this, ID_DEFAULT, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
     wxBoxSizer* buttonSizer = new wxBoxSizer( wxHORIZONTAL );
 
     m_btnOK = new wxButton( m_panelButtons, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_btnOK->SetToolTip( _("save all values and close the dialog") );
+    m_btnOK->SetToolTip( _("Save all values and close the dialog.") );
     m_btnOK->SetDefault();
     
     buttonSizer->Add( m_btnOK, 0, wxALL, 5 );
 
     m_btnCancel = new wxButton( m_panelButtons, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_btnCancel->SetToolTip( _("close the dialog without saving") );
+    m_btnCancel->SetToolTip( _("Close the dialog without saving.") );
 
     buttonSizer->Add( m_btnCancel, 0, wxALL, 5 );
 
     m_btnHelp = new wxButton( m_panelButtons, ID_HELPBOINC, _("Help"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_btnHelp->SetToolTip( _("shows the preferences web page") );
+    m_btnHelp->SetToolTip( _("Shows the preferences web page.") );
 
     buttonSizer->Add( m_btnHelp, 0, wxALL, 5 );
 
@@ -129,8 +187,48 @@ CDlgAdvPreferencesBase::CDlgAdvPreferencesBase( wxWindow* parent, int id, wxStri
     this->SetSizer( dialogSizer );
 }
 
+void CDlgAdvPreferencesBase::addNewRowToSizer(
+                wxSizer* toSizer, wxString& toolTipText,
+                wxWindow* first, wxWindow* second, wxWindow* third,
+                wxWindow* fourth, wxWindow* fifth)
+{
+    wxBoxSizer* rowSizer = new wxBoxSizer( wxHORIZONTAL );
+    
+#ifdef __WXMSW__
+    // MSW adds space to the right of checkbox label
+    if (first->IsKindOf(CLASSINFO(wxCheckBox))) {
+        rowSizer->Add(first, 0, wxTOP | wxBOTTOM |wxLEFT, 5 );
+    } else
+#endif
+        rowSizer->Add(first, 0, wxALL, 5 );
+
+    first->SetToolTip(toolTipText);
+    
+    rowSizer->Add(second, 0, wxALL, 2 );
+    second->SetToolTip(toolTipText);
+
+    rowSizer->Add(third, 0, wxALL, 5 );
+    third->SetToolTip(toolTipText);
+
+    if (fourth) {
+        rowSizer->Add(fourth, 0, wxALL, 2 );
+        fourth->SetToolTip(toolTipText);
+    }
+    
+    if (fifth) {
+        rowSizer->Add(fifth, 0, wxALL, 5 );
+        fifth->SetToolTip(toolTipText);
+    }
+    
+    toSizer->Add( rowSizer, 0, 0, 1 );
+}
+
+
 wxPanel* CDlgAdvPreferencesBase::createProcessorTab(wxNotebook* notebook)
 {
+    CSkinAdvanced*      pSkinAdvanced = wxGetApp().GetSkinManager()->GetAdvanced();
+    wxASSERT(pSkinAdvanced);
+
     wxSize textCtrlSize = getTextCtrlSize(wxT("999.99"));
     
     wxPanel* processorTab = new wxPanel( notebook, ID_TABPAGE_PROC, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
@@ -138,652 +236,705 @@ wxPanel* CDlgAdvPreferencesBase::createProcessorTab(wxNotebook* notebook)
 
     wxBoxSizer* processorTabSizer = new wxBoxSizer( wxVERTICAL );
 
-    wxStaticBox* computingAllowedStaticBox = new wxStaticBox(processorTab, -1, _("Computing allowed") );
-    wxStaticBoxSizer* computingAllowedBoxSizer = new wxStaticBoxSizer(computingAllowedStaticBox, wxVERTICAL);
+    wxStaticBox* usageLimitsStaticBox = new wxStaticBox(processorTab, -1, _("Usage limits") );
+    wxStaticBoxSizer* usageLimitsBoxSizer = new wxStaticBoxSizer(usageLimitsStaticBox, wxVERTICAL);
+    makeStaticBoxLabelItalic(usageLimitsStaticBox);
+    
+    /*xgettext:no-c-format*/
+    wxString MaxCPUPctTT(_("Keep some CPUs free for other applications. Example: 75% means use 6 cores on an 8-core CPU."));
+    wxStaticText* staticText20 = new wxStaticText(
+        usageLimitsStaticBox, ID_DEFAULT, _("Use at most"), wxDefaultPosition, wxDefaultSize, 0 );
+    
+    m_txtProcUseProcessors = new wxTextCtrl( usageLimitsStaticBox, ID_TXTPROCUSEPROCESSORS, wxEmptyString, wxDefaultPosition, textCtrlSize, wxTE_RIGHT );
+
+    /*xgettext:no-c-format*/
+    wxStaticText* staticText21 = new wxStaticText( usageLimitsStaticBox, ID_DEFAULT, _("% of the CPUs"), wxDefaultPosition, wxDefaultSize, 0 );
+
+    addNewRowToSizer(usageLimitsBoxSizer, MaxCPUPctTT, staticText20, m_txtProcUseProcessors, staticText21);
+
+    /*xgettext:no-c-format*/
+    wxString MaxCPUTimeTT(_("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."));
+    wxStaticText* staticText22 = new wxStaticText(
+        usageLimitsStaticBox, ID_DEFAULT, _("Use at most"), wxDefaultPosition, wxDefaultSize, 0 );
+
+    m_txtProcUseCPUTime = new wxTextCtrl( usageLimitsStaticBox, ID_TXTPOCUSECPUTIME, wxEmptyString, wxDefaultPosition, textCtrlSize, wxTE_RIGHT );
+
+    /*xgettext:no-c-format*/
+    wxStaticText* staticText23 = new wxStaticText( usageLimitsStaticBox, ID_DEFAULT, _("% of CPU time"), wxDefaultPosition, wxDefaultSize, 0 );
+
+    addNewRowToSizer(usageLimitsBoxSizer, MaxCPUTimeTT, staticText22, m_txtProcUseCPUTime, staticText23);
+
+    processorTabSizer->AddSpacer( STATICBOXVERTICALSPACER );
+    processorTabSizer->Add( usageLimitsBoxSizer, 0, wxLEFT | wxRIGHT | wxEXPAND, STATICBOXBORDERSIZE );
+    
+    wxStaticBox* suspendComputingStaticBox = new wxStaticBox(processorTab, -1, _("When to suspend") );
+    wxStaticBoxSizer* suspendComputingBoxSizer = new wxStaticBoxSizer(suspendComputingStaticBox, wxVERTICAL);
+    makeStaticBoxLabelItalic(suspendComputingStaticBox);
     
     m_chkProcOnBatteries = new wxCheckBox(
-        computingAllowedStaticBox, ID_CHKPROCONBATTERIES,
-        _("While computer is on batteries"), wxDefaultPosition, wxDefaultSize, 0
+        suspendComputingStaticBox, ID_CHKPROCONBATTERIES,
+        _("Suspend when computer is on battery"), wxDefaultPosition, wxDefaultSize, 0
     );
     m_chkProcOnBatteries->SetToolTip(
-        _("check this if you want this computer to do work while it runs on batteries")
+        _("Check this to suspend computing on portables when running on battery power.")
     );
-    computingAllowedBoxSizer->Add( m_chkProcOnBatteries, 0, wxALL, 5 );
+    suspendComputingBoxSizer->Add( m_chkProcOnBatteries, 0, wxALL, 5 );
 
     m_chkProcInUse = new wxCheckBox(
-        computingAllowedStaticBox, ID_CHKPROCINUSE,
-        _("While computer is in use"), wxDefaultPosition, wxDefaultSize, 0
+        suspendComputingStaticBox, ID_CHKPROCINUSE,
+        _("Suspend when computer is in use"), wxDefaultPosition, wxDefaultSize, 0
     );
     m_chkProcInUse->SetToolTip(
-        _("check this if you want this computer to do work even when you're using it")
+        _("Check this to suspend computing and file transfers when you're using the computer.")
     );
-    computingAllowedBoxSizer->Add( m_chkProcInUse, 0, wxALL, 5 );
+    suspendComputingBoxSizer->Add( m_chkProcInUse, 0, wxALL, 5 );
 
     m_chkGPUProcInUse = new wxCheckBox(
-        computingAllowedStaticBox, ID_CHKGPUPROCINUSE,
-        _("Use GPU while computer is in use"), wxDefaultPosition, wxDefaultSize, 0
+        suspendComputingStaticBox, ID_CHKGPUPROCINUSE,
+        _("Suspend GPU computing when computer is in use"), wxDefaultPosition, wxDefaultSize, 0
     );
     m_chkGPUProcInUse->SetToolTip(
-        _("check this if you want your GPU to do work even when you're using the computer")
+        _("Check this to suspend GPU computing when you're using the computer.")
     );
-    computingAllowedBoxSizer->Add( m_chkGPUProcInUse, 0, wxALL, 5 );
+    suspendComputingBoxSizer->Add( m_chkGPUProcInUse, 0, wxALL, 5 );
 
     // min idle time
-    wxFlexGridSizer* procIdleSizer = new wxFlexGridSizer( 2, 4, 0, 0 );
-    procIdleSizer->AddGrowableCol( 3 );
-    procIdleSizer->SetFlexibleDirection( wxHORIZONTAL );
-    procIdleSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-    procIdleSizer->Add(
-        new wxStaticText(
-            computingAllowedStaticBox, ID_DEFAULT,
-            _("Only after computer has been idle for"),
+    wxString ProcIdleForTT(_("This determines when the computer is considered 'in use'."));
+
+    wxStaticText* staticText24 = new wxStaticText(
+            suspendComputingStaticBox, ID_DEFAULT,
+            _("'In use' means mouse/keyboard input in last"),
             wxDefaultPosition, wxDefaultSize, 0
-        ),
-        0, wxALL, 5
-    );
+        );
+
     m_txtProcIdleFor = new wxTextCtrl(
-        computingAllowedStaticBox, ID_TXTPROCIDLEFOR, wxT(""), wxDefaultPosition, getTextCtrlSize(wxT("999.99")), wxTE_RIGHT
-    );
-    m_txtProcIdleFor->SetToolTip(
-        _("do work only after you haven't used the computer for this number of minutes")
-    );
-    procIdleSizer->Add( m_txtProcIdleFor, 0, wxALL, 1 );
-    procIdleSizer->Add(
-        new wxStaticText(
-            computingAllowedStaticBox, ID_DEFAULT, _("minutes"),
-            wxDefaultPosition, wxDefaultSize, 0
-        ),
-        0, wxALL, 5
-    );
-    procIdleSizer->Add(
-        new wxStaticText( computingAllowedStaticBox, ID_DEFAULT, wxT(""), wxDefaultPosition, wxDefaultSize, 0),
-        0, wxALL, 5
+        suspendComputingStaticBox, ID_TXTPROCIDLEFOR, wxEmptyString, wxDefaultPosition, getTextCtrlSize(wxT("999.99")), wxTE_RIGHT
     );
-    computingAllowedBoxSizer->Add( procIdleSizer, 0, wxEXPAND, 5);
+
+    wxStaticText* staticText25 = new wxStaticText(suspendComputingStaticBox, ID_DEFAULT, _("minutes"),
+            wxDefaultPosition, wxDefaultSize, 0 );
+
+    addNewRowToSizer(suspendComputingBoxSizer, ProcIdleForTT, staticText24, m_txtProcIdleFor, staticText25);
 
     // max CPU load
-    wxFlexGridSizer* maxLoadSizer = new wxFlexGridSizer( 2, 4, 0, 0 );
-    maxLoadSizer->AddGrowableCol( 3 );
-    maxLoadSizer->SetFlexibleDirection( wxHORIZONTAL );
-    maxLoadSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-    maxLoadSizer->Add(
-        new wxStaticText(
-            computingAllowedStaticBox, ID_DEFAULT,
-            _("While processor usage is less than"),
-            wxDefaultPosition, wxDefaultSize, 0
-        ),
-        0, wxALL, 5
-    );
+    wxString MaxLoadCheckBoxText = wxEmptyString;
+    MaxLoadCheckBoxText.Printf(_("Suspend when non-%s CPU usage is above"), pSkinAdvanced->GetApplicationShortName().c_str());
+
+    wxString MaxLoadTT(_("Suspend computing when your computer is busy running other programs."));
+    m_chkMaxLoad = new wxCheckBox(
+        suspendComputingStaticBox, ID_CHKMAXLOAD, MaxLoadCheckBoxText, wxDefaultPosition, wxDefaultSize, 0);
+
     m_txtMaxLoad = new wxTextCtrl(
-        computingAllowedStaticBox, ID_TXTMAXLOAD, wxT(""), wxDefaultPosition, getTextCtrlSize(wxT("100.00")), wxTE_RIGHT
+        suspendComputingStaticBox, ID_TXTMAXLOAD, wxEmptyString, wxDefaultPosition, getTextCtrlSize(wxT("100.00")), wxTE_RIGHT
     );
-    m_txtMaxLoad->SetToolTip(
-        _("suspend work if processor usage exceeds this level")
-    );
-    maxLoadSizer->Add( m_txtMaxLoad, 0, wxALL, 1 );
-    maxLoadSizer->Add(
-        new wxStaticText(
-            computingAllowedStaticBox, ID_DEFAULT, _("percent (0 means no restriction)"),
-            wxDefaultPosition, wxDefaultSize, 0
-        ),
-        0, wxALL, 5
-    );
-    maxLoadSizer->Add(
-        new wxStaticText( computingAllowedStaticBox, ID_DEFAULT, wxT(""), wxDefaultPosition, wxDefaultSize, 0),
+
+    wxStaticText* staticText26 = new wxStaticText( suspendComputingStaticBox, ID_DEFAULT, wxT("%"),
+            wxDefaultPosition, wxDefaultSize, 0 );
+
+    addNewRowToSizer(suspendComputingBoxSizer, MaxLoadTT, m_chkMaxLoad, m_txtMaxLoad, staticText26);
+
+     suspendComputingBoxSizer->Add(
+        new wxStaticText( suspendComputingStaticBox, ID_DEFAULT, wxT("To suspend by time of day, see the \"Daily Schedules\" section."), wxDefaultPosition, wxDefaultSize, 0),
         0, wxALL, 5
     );
-    computingAllowedBoxSizer->Add( maxLoadSizer, 0, wxEXPAND, 5);
-
 
-    wxBoxSizer* cpuTimesSizer = new wxBoxSizer( wxHORIZONTAL );
+    processorTabSizer->AddSpacer( STATICBOXVERTICALSPACER );
+    processorTabSizer->Add( suspendComputingBoxSizer, 0, wxLEFT | wxRIGHT | wxEXPAND, STATICBOXBORDERSIZE );
 
-    m_staticText351 = new wxStaticText( computingAllowedStaticBox, ID_DEFAULT, _("Every day between hours of"), wxDefaultPosition, wxDefaultSize, 0 );
-    cpuTimesSizer->Add( m_staticText351, 0, wxALL, 5 );
+    wxStaticBox* miscProcStaticBox = new wxStaticBox( processorTab, -1, _("Other") );
+    wxStaticBoxSizer* miscProcBoxSizer = new wxStaticBoxSizer( miscProcStaticBox, wxVERTICAL );
+    makeStaticBoxLabelItalic(miscProcStaticBox);
 
-    m_txtProcEveryDayStart = new wxTextCtrl( computingAllowedStaticBox, ID_TXTPROCEVERYDAYSTART, wxT(""), wxDefaultPosition, getTextCtrlSize(wxT("23:59")), wxTE_RIGHT );
-    m_txtProcEveryDayStart->SetToolTip( _("start work at this time") );
+    // buffer sizes
+    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
+    );
 
-    cpuTimesSizer->Add( m_txtProcEveryDayStart, 0, wxALL, 1 );
+    m_txtNetConnectInterval = new wxTextCtrl(
+        miscProcStaticBox, ID_TXTNETCONNECTINTERVAL, wxEmptyString, wxDefaultPosition, textCtrlSize, wxTE_RIGHT
+    );
 
-    m_staticText25 = new wxStaticText( computingAllowedStaticBox, ID_DEFAULT, _("and"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
-    cpuTimesSizer->Add( m_staticText25, 0, wxALL|wxEXPAND, 5 );
+    wxStaticText* staticText31 = new wxStaticText(
+        miscProcStaticBox, ID_DEFAULT, _("days of work"), wxDefaultPosition, wxDefaultSize, 0
+    );
 
-    m_txtProcEveryDayStop = new wxTextCtrl( computingAllowedStaticBox, ID_TXTPROCEVERYDAYSTOP, wxT(""), wxDefaultPosition, getTextCtrlSize(wxT("23:59")), wxTE_RIGHT );
-    m_txtProcEveryDayStop->SetToolTip( _("stop work at this time") );
+    addNewRowToSizer(miscProcBoxSizer, NetConnectIntervalTT, staticText30, m_txtNetConnectInterval, staticText31);
 
-    cpuTimesSizer->Add( m_txtProcEveryDayStop, 0, wxALL, 1 );
+    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
+    );
+    staticText331->SetToolTip(NetAdditionalDaysTT);
 
-    m_staticText55 = new wxStaticText( computingAllowedStaticBox, ID_DEFAULT, _("(no restriction if equal)"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
-    cpuTimesSizer->Add( m_staticText55, 0, wxALL|wxEXPAND, 5 );
+    m_txtNetAdditionalDays = new wxTextCtrl(
+        miscProcStaticBox, ID_TXTNETADDITIONALDAYS, wxEmptyString, wxDefaultPosition, textCtrlSize, wxTE_RIGHT
+    );
 
-    computingAllowedBoxSizer->Add( cpuTimesSizer, 0, wxEXPAND, 1 );
+    wxStaticText* staticText341 = new wxStaticText( miscProcStaticBox, ID_DEFAULT, _("days of work"), wxDefaultPosition, wxDefaultSize, 0 );
 
-    m_staticText36 = new wxStaticText( computingAllowedStaticBox, ID_DEFAULT, _("Day-of-week override:"), wxDefaultPosition, wxDefaultSize, 0 );
-    computingAllowedBoxSizer->Add( m_staticText36, 0, wxALL, 5 );
+    addNewRowToSizer(miscProcBoxSizer, NetAdditionalDaysTT, staticText331, m_txtNetAdditionalDays, staticText341);
 
-    m_panelProcSpecialTimes = new wxPanel( computingAllowedStaticBox, ID_DEFAULT, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
-    m_panelProcSpecialTimes->SetExtraStyle( wxWS_EX_VALIDATE_RECURSIVELY );
-    m_panelProcSpecialTimes->SetToolTip( _("check box to specify hours for this day of week") );
+    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 );
+    
+    m_txtProcSwitchEvery = new wxTextCtrl( miscProcStaticBox, ID_TXTPROCSWITCHEVERY, wxEmptyString, wxDefaultPosition, getTextCtrlSize(wxT("9999.99")), wxTE_RIGHT );
 
-    wxFlexGridSizer* procDaysSizer = new wxFlexGridSizer( 4, 4, 0, 0 );
-    procDaysSizer->SetFlexibleDirection( wxHORIZONTAL );
-    procDaysSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+    wxStaticText* staticText19 = new wxStaticText( miscProcStaticBox, ID_DEFAULT, _("minutes"), wxDefaultPosition, wxDefaultSize, 0 );
 
-    m_chkProcMonday = new wxCheckBox( m_panelProcSpecialTimes, ID_CHKPROCMONDAY, _("Monday"), wxDefaultPosition, wxDefaultSize, 0 );
+    addNewRowToSizer(miscProcBoxSizer, ProcSwitchEveryTT, staticText18, m_txtProcSwitchEvery, staticText19);
 
-    procDaysSizer->Add( m_chkProcMonday, 0, wxALL, 5 );
+    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 );
 
-    m_txtProcMonday = new wxTextCtrl( m_panelProcSpecialTimes, ID_TXTPROCMONDAY, wxT(""), wxDefaultPosition, getTextCtrlSize(wxT("00:00-23:59")), 0 );
-    procDaysSizer->Add( m_txtProcMonday, 0, wxALL, 1 );
+    m_txtDiskWriteToDisk = new wxTextCtrl( miscProcStaticBox, ID_TXTDISKWRITETODISK, wxEmptyString, wxDefaultPosition, textCtrlSize, wxTE_RIGHT );
 
-    m_chkProcTuesday = new wxCheckBox( m_panelProcSpecialTimes, ID_CHKPROCTUESDAY, _("Tuesday"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText* staticText47 = new wxStaticText( miscProcStaticBox, ID_DEFAULT, _("seconds"), wxDefaultPosition, wxDefaultSize, 0 );
 
-    procDaysSizer->Add( m_chkProcTuesday, 0, wxALL, 5 );
+    addNewRowToSizer(miscProcBoxSizer, DiskWriteToDiskTT, staticText46, m_txtDiskWriteToDisk, staticText47);
 
-    m_txtProcTuesday = new wxTextCtrl( m_panelProcSpecialTimes, ID_TXTPROCTUESDAY, wxT(""), wxDefaultPosition, getTextCtrlSize(wxT("00:00-23:59")), 0 );
-    procDaysSizer->Add( m_txtProcTuesday, 0, wxALL, 1 );
+    miscProcBoxSizer->AddSpacer(1); // Ensure staticText22 is fully visible on Mac
 
-    m_chkProcWednesday = new wxCheckBox( m_panelProcSpecialTimes, ID_CHKPROCWEDNESDAY, _("Wednesday"), wxDefaultPosition, wxDefaultSize, 0 );
+    processorTabSizer->AddSpacer( STATICBOXVERTICALSPACER );
+    processorTabSizer->Add( miscProcBoxSizer, 0, wxLEFT | wxRIGHT | wxEXPAND, STATICBOXBORDERSIZE );
+    processorTabSizer->AddSpacer( STATICBOXVERTICALSPACER );
 
-    procDaysSizer->Add( m_chkProcWednesday, 0, wxALL, 5 );
+    processorTab->SetSizer( processorTabSizer );
+    processorTab->Layout();
+    processorTabSizer->Fit( processorTab );
 
-    m_txtProcWednesday = new wxTextCtrl( m_panelProcSpecialTimes, ID_TXTPROCWEDNESDAY, wxT(""), wxDefaultPosition, getTextCtrlSize(wxT("00:00-23:59")), 0 );
-    procDaysSizer->Add( m_txtProcWednesday, 0, wxALL, 1 );
+    return processorTab;
+}
 
-    m_chkProcThursday = new wxCheckBox( m_panelProcSpecialTimes, ID_CHKPROCTHURSDAY, _("Thursday"), wxDefaultPosition, wxDefaultSize, 0 );
+wxPanel* CDlgAdvPreferencesBase::createNetworkTab(wxNotebook* notebook)
+{
+    CSkinAdvanced*      pSkinAdvanced = wxGetApp().GetSkinManager()->GetAdvanced();
+    wxASSERT(pSkinAdvanced);
 
-    procDaysSizer->Add( m_chkProcThursday, 0, wxALL, 5 );
+    wxSize textCtrlSize = getTextCtrlSize(wxT("9999.99"));
 
-    m_txtProcThursday = new wxTextCtrl( m_panelProcSpecialTimes, ID_TXTPROCTHURSDAY, wxT(""), wxDefaultPosition, getTextCtrlSize(wxT("00:00-23:59")), 0 );
-    procDaysSizer->Add( m_txtProcThursday, 0, wxALL, 1 );
+    wxPanel* networkTab = new wxPanel( notebook, ID_TABPAGE_NET, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    networkTab->SetExtraStyle( wxWS_EX_VALIDATE_RECURSIVELY );
 
-    m_chkProcFriday = new wxCheckBox( m_panelProcSpecialTimes, ID_CHKPROCFRIDAY, _("Friday"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxBoxSizer* networkTabSizer = new wxBoxSizer( wxVERTICAL );
 
-    procDaysSizer->Add( m_chkProcFriday, 0, wxALL, 5 );
+    wxStaticBox* networkUsageLimitsStaticBox = new wxStaticBox( networkTab, -1, _("Usage limits") );
+    wxStaticBoxSizer* networkUsageLimitsBoxSizer = new wxStaticBoxSizer( networkUsageLimitsStaticBox, wxVERTICAL );
+    makeStaticBoxLabelItalic(networkUsageLimitsStaticBox);
 
-    m_txtProcFriday = new wxTextCtrl( m_panelProcSpecialTimes, ID_TXTPROCFRIDAY, wxT(""), wxDefaultPosition, getTextCtrlSize(wxT("00:00-23:59")), 0 );
-    procDaysSizer->Add( m_txtProcFriday, 0, wxALL, 1 );
+    // upload/download rates
 
-    m_chkProcSaturday = new wxCheckBox( m_panelProcSpecialTimes, ID_CHKPROCSATURDAY, _("Saturday"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxString NetDownloadRateTT(_("Limit the download rate of file transfers."));
+    m_chkNetDownloadRate = new wxCheckBox( networkUsageLimitsStaticBox, ID_CHKNETDOWNLOADRATE, _("Limit download rate to"), wxDefaultPosition, wxDefaultSize, 0 );
+    
+    m_txtNetDownloadRate = new wxTextCtrl( networkUsageLimitsStaticBox, ID_TXTNETDOWNLOADRATE, wxEmptyString, wxDefaultPosition, textCtrlSize, wxTE_RIGHT );
 
-    procDaysSizer->Add( m_chkProcSaturday, 0, wxALL, 5 );
+    wxStaticText* staticText33 = new wxStaticText( networkUsageLimitsStaticBox, ID_DEFAULT, _("KB/second"), wxDefaultPosition, wxDefaultSize, 0 );
 
-    m_txtProcSaturday = new wxTextCtrl( m_panelProcSpecialTimes, ID_TXTPROCSATURDAY, wxT(""), wxDefaultPosition, getTextCtrlSize(wxT("00:00-23:59")), 0 );
-    procDaysSizer->Add( m_txtProcSaturday, 0, wxALL, 1 );
+    addNewRowToSizer(networkUsageLimitsBoxSizer, NetDownloadRateTT, m_chkNetDownloadRate, m_txtNetDownloadRate, staticText33);
 
-    m_chkProcSunday = new wxCheckBox( m_panelProcSpecialTimes, ID_CHKPROCSUNDAY, _("Sunday"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxString NetUploadRateTT(_("Limit the upload rate of file transfers."));
+    m_chkNetUploadRate = new wxCheckBox( networkUsageLimitsStaticBox, ID_CHKNETUPLOADRATE, _("Limit upload rate to"), wxDefaultPosition, wxDefaultSize, 0 );
 
-    procDaysSizer->Add( m_chkProcSunday, 0, wxALL, 5 );
+    m_txtNetUploadRate = new wxTextCtrl( networkUsageLimitsStaticBox, ID_TXTNETUPLOADRATE, wxEmptyString, wxDefaultPosition, textCtrlSize, wxTE_RIGHT );
 
-    m_txtProcSunday = new wxTextCtrl( m_panelProcSpecialTimes, ID_TXTPROCSUNDAY, wxT(""), wxDefaultPosition, getTextCtrlSize(wxT("00:00-23:59")), 0 );
-    procDaysSizer->Add( m_txtProcSunday, 0, wxALL, 1 );
+    wxStaticText* staticText35 = new wxStaticText( networkUsageLimitsStaticBox, ID_DEFAULT, _("KB/second"), wxDefaultPosition, wxDefaultSize, 0 );
 
-    m_panelProcSpecialTimes->SetSizer( procDaysSizer );
-    m_panelProcSpecialTimes->Layout();
-    procDaysSizer->Fit( m_panelProcSpecialTimes );
-    computingAllowedBoxSizer->Add( m_panelProcSpecialTimes, 1, wxEXPAND | wxALL, 1 );
+    addNewRowToSizer(networkUsageLimitsBoxSizer, NetUploadRateTT, m_chkNetUploadRate, m_txtNetUploadRate, staticText35);
 
-    processorTabSizer->Add( computingAllowedBoxSizer, 0, wxEXPAND, 1 );
+    // long-term quota
 
-    wxStaticBox* miscProcStaticBox = new wxStaticBox( processorTab, -1, _("Other options") );
-    wxStaticBoxSizer* miscProcBoxSizer = new wxStaticBoxSizer( miscProcStaticBox, wxVERTICAL );
+    wxString daily_xfer_limitTT = wxEmptyString;
+    daily_xfer_limitTT.Printf(_("Example: %s should transfer at most 2000 MB of data every 30 days."), pSkinAdvanced->GetApplicationShortName().c_str());
+    
+    m_chk_daily_xfer_limit = new wxCheckBox( networkUsageLimitsStaticBox, ID_CHKDAILYXFERLIMIT, _("Limit usage to"), wxDefaultPosition, wxDefaultSize, 0 );
 
-    wxFlexGridSizer* miscProcGridSizer = new wxFlexGridSizer( 3, 3, 0, 0 );
-    miscProcGridSizer->AddGrowableCol( 2 );
-    miscProcGridSizer->SetFlexibleDirection( wxHORIZONTAL );
-    miscProcGridSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+    m_txt_daily_xfer_limit_mb = new wxTextCtrl( networkUsageLimitsStaticBox, ID_TXTNETDOWNLOADRATE, wxEmptyString, wxDefaultPosition, textCtrlSize, wxTE_RIGHT );
 
-    m_staticText18 = new wxStaticText( miscProcStaticBox, ID_DEFAULT, _("Switch between applications every"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
-    miscProcGridSizer->Add( m_staticText18, 0, wxALL|wxEXPAND, 5 );
+    wxStaticText* staticText_daily_xfer2 = new wxStaticText( networkUsageLimitsStaticBox, ID_DEFAULT, _("MB every"), wxDefaultPosition, wxDefaultSize, 0 );
     
-    m_txtProcSwitchEvery = new wxTextCtrl( miscProcStaticBox, ID_TXTPROCSWITCHEVERY, wxT(""), wxDefaultPosition, textCtrlSize, wxTE_RIGHT );
-    miscProcGridSizer->Add( m_txtProcSwitchEvery, 0, wxALL, 1 );
+    m_txt_daily_xfer_period_days = new wxTextCtrl( networkUsageLimitsStaticBox, ID_TXTNETUPLOADRATE, wxEmptyString, wxDefaultPosition, getTextCtrlSize(wxT("999.99")), wxTE_RIGHT );
 
-    m_staticText19 = new wxStaticText( miscProcStaticBox, ID_DEFAULT, _("minutes"), wxDefaultPosition, wxDefaultSize, 0 );
-    miscProcGridSizer->Add( m_staticText19, 0, wxALL, 5 );
+    wxStaticText* staticText_daily_xfer4 = new wxStaticText( networkUsageLimitsStaticBox, ID_DEFAULT, _("days"), wxDefaultPosition, wxDefaultSize, 0 );
 
-    m_staticText20 = new wxStaticText( miscProcStaticBox, ID_DEFAULT, _("On multiprocessor systems, use at most"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
-    miscProcGridSizer->Add( m_staticText20, 0, wxALL|wxEXPAND, 5 );
+    addNewRowToSizer(networkUsageLimitsBoxSizer, daily_xfer_limitTT, m_chk_daily_xfer_limit, m_txt_daily_xfer_limit_mb, staticText_daily_xfer2, m_txt_daily_xfer_period_days, staticText_daily_xfer4);
 
-    m_txtProcUseProcessors = new wxTextCtrl( miscProcStaticBox, ID_TXTPROCUSEPROCESSORS, wxT(""), wxDefaultPosition, textCtrlSize, wxTE_RIGHT );
-    miscProcGridSizer->Add( m_txtProcUseProcessors, 0, wxALL, 1 );
+     networkUsageLimitsBoxSizer->Add(
+        new wxStaticText( networkUsageLimitsStaticBox, ID_DEFAULT, wxT("To limit transfers by time of day, see the \"Daily Schedules\" section."), wxDefaultPosition, wxDefaultSize, 0),
+        0, wxALL, 5
+    );
 
-    /*xgettext:no-c-format*/ 
-    m_staticText21 = new wxStaticText( miscProcStaticBox, ID_DEFAULT, _("% of the processors (0 means no restriction)"), wxDefaultPosition, wxDefaultSize, 0 );
-    miscProcGridSizer->Add( m_staticText21, 0, wxALL, 5 );
+    networkTabSizer->AddSpacer( STATICBOXVERTICALSPACER );
+    networkTabSizer->Add( networkUsageLimitsBoxSizer, 0, wxLEFT | wxRIGHT | wxEXPAND, STATICBOXBORDERSIZE );
 
-    m_staticText22 = new wxStaticText( miscProcStaticBox, ID_DEFAULT, _("Use at most"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
-    miscProcGridSizer->Add( m_staticText22, 0, wxALL|wxEXPAND, 5 );
+    wxStaticBox* connectOptionsStaticBox = new wxStaticBox( networkTab, -1, _("Other") );
+    wxStaticBoxSizer* connectOptionsSizer = new wxStaticBoxSizer( connectOptionsStaticBox, wxVERTICAL );
+    makeStaticBoxLabelItalic(connectOptionsStaticBox);
 
-    m_txtProcUseCPUTime = new wxTextCtrl( miscProcStaticBox, ID_TXTPOCUSECPUTIME, wxT(""), wxDefaultPosition, textCtrlSize, wxTE_RIGHT );
-    miscProcGridSizer->Add( m_txtProcUseCPUTime, 0, wxALL, 1 );
+    wxString NetSkipImageVerificationTT = wxEmptyString;
+    NetSkipImageVerificationTT.Printf(_("Check this only if your Internet provider modifies image files. Skipping verification reduces the security of %s."), pSkinAdvanced->GetApplicationShortName().c_str());
+    
+    m_chkNetSkipImageVerification = new wxCheckBox( connectOptionsStaticBox, ID_CHKNETSKIPIMAGEVERIFICATION, _("Skip data verification for image files"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_chkNetSkipImageVerification->SetToolTip(NetSkipImageVerificationTT);
+    connectOptionsSizer->Add( m_chkNetSkipImageVerification, 0, wxALL, 5 );
 
-    /*xgettext:no-c-format*/
-    m_staticText23 = new wxStaticText( miscProcStaticBox, ID_DEFAULT, _("% of CPU time (0 means no restriction)"), wxDefaultPosition, wxDefaultSize, 0 );
-    miscProcGridSizer->Add( m_staticText23, 0, wxALL, 5 );
+    m_chkNetConfirmBeforeConnect = new wxCheckBox( connectOptionsStaticBox, ID_CHKNETCONFIRMBEFORECONNECT, _("Confirm before connecting to Internet"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_chkNetConfirmBeforeConnect->SetToolTip( _("Useful only if you have a modem, ISDN or VPN connection.") );
+    connectOptionsSizer->Add( m_chkNetConfirmBeforeConnect, 0, wxALL, 5 );
 
-    miscProcBoxSizer->Add( miscProcGridSizer, 0, wxEXPAND, 1 );
-    miscProcBoxSizer->AddSpacer(1); // Ensure m_staticText22 is fully visible on Mac
+    m_chkNetDisconnectWhenDone = new wxCheckBox( connectOptionsStaticBox, ID_CHKNETDISCONNECTWHENDONE, _("Disconnect when done"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_chkNetDisconnectWhenDone->SetToolTip( _("Useful only if you have a modem, ISDN or VPN connection.") );
+    connectOptionsSizer->Add( m_chkNetDisconnectWhenDone, 0, wxALL, 5 );
 
-    processorTabSizer->Add( miscProcBoxSizer, 0, wxEXPAND, 1 );
+    networkTabSizer->AddSpacer( STATICBOXVERTICALSPACER );
+    networkTabSizer->Add( connectOptionsSizer, 0, wxLEFT | wxRIGHT | wxEXPAND, STATICBOXBORDERSIZE );
+    networkTabSizer->AddSpacer( STATICBOXVERTICALSPACER );
 
-    processorTab->SetSizer( processorTabSizer );
-    processorTab->Layout();
-    processorTabSizer->Fit( processorTab );
+    networkTab->SetSizer( networkTabSizer );
+    networkTab->Layout();
+    networkTabSizer->Fit( networkTab );
 
-    return processorTab;
+    return networkTab;
 }
 
-wxPanel* CDlgAdvPreferencesBase::createNetworkTab(wxNotebook* notebook)
+wxPanel* CDlgAdvPreferencesBase::createDiskAndMemoryTab(wxNotebook* notebook)
 {
-    wxSize textCtrlSize = getTextCtrlSize(wxT("9999.99"));
-
-    wxPanel* networkTab = new wxPanel( notebook, ID_TABPAGE_NET, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    networkTab->SetExtraStyle( wxWS_EX_VALIDATE_RECURSIVELY );
-
-    wxBoxSizer* networkTabSizer = new wxBoxSizer( wxVERTICAL );
-
-    wxStaticBox* networkGeneralStaticBox = new wxStaticBox( networkTab, -1, _("General options") );
-    wxStaticBoxSizer* networkGeneralBoxSizer = new wxStaticBoxSizer( networkGeneralStaticBox, wxVERTICAL );
-
-    wxFlexGridSizer* networkGeneralGridSizer = new wxFlexGridSizer(3, 0, 0 );
-    networkGeneralGridSizer->SetFlexibleDirection( wxHORIZONTAL );
-    networkGeneralGridSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
-    // upload/download rates
-
-    m_staticText32 = new wxStaticText( networkGeneralStaticBox, ID_DEFAULT, _("Maximum download rate"), wxDefaultPosition, wxDefaultSize, 0 );
-    networkGeneralGridSizer->Add( m_staticText32, 0, wxALIGN_RIGHT|wxALL, 5 );
+    CSkinAdvanced*      pSkinAdvanced = wxGetApp().GetSkinManager()->GetAdvanced();
+    wxASSERT(pSkinAdvanced);
 
-    m_txtNetDownloadRate = new wxTextCtrl( networkGeneralStaticBox, ID_TXTNETDOWNLOADRATE, wxT(""), wxDefaultPosition, textCtrlSize, wxTE_RIGHT );
-    networkGeneralGridSizer->Add( m_txtNetDownloadRate, 0, wxALL, 1 );
-
-    m_staticText33 = new wxStaticText( networkGeneralStaticBox, ID_DEFAULT, _("KBytes/second (0 means no restriction)"), wxDefaultPosition, wxDefaultSize, 0 );
-    networkGeneralGridSizer->Add( m_staticText33, 0, wxALL, 5 );
+    wxSize textCtrlSize = getTextCtrlSize(wxT("9999.99"));
     
-    m_staticText34 = new wxStaticText( networkGeneralStaticBox, ID_DEFAULT, _("Maximum upload rate"), wxDefaultPosition, wxDefaultSize, 0 );
-    networkGeneralGridSizer->Add( m_staticText34, 0, wxALIGN_RIGHT|wxALL, 5 );
-
-    m_txtNetUploadRate = new wxTextCtrl( networkGeneralStaticBox, ID_TXTNETUPLOADRATE, wxT(""), wxDefaultPosition, textCtrlSize, wxTE_RIGHT );
-    networkGeneralGridSizer->Add( m_txtNetUploadRate, 0, wxALL, 1 );
+    wxPanel* diskMemoryTab = new wxPanel( notebook, ID_TABPAGE_DISK, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    diskMemoryTab->SetExtraStyle( wxWS_EX_VALIDATE_RECURSIVELY );
 
-    m_staticText35 = new wxStaticText( networkGeneralStaticBox, ID_DEFAULT, _("KBytes/second (0 means no restriction)"), wxDefaultPosition, wxDefaultSize, 0 );
-    networkGeneralGridSizer->Add( m_staticText35, 0, wxALL, 5 );
+    wxBoxSizer* diskAndMemoryTabSizer = new wxBoxSizer( wxVERTICAL );
 
-    // buffer sizes
+    wxStaticBox* diskUsageStaticBox = new wxStaticBox( diskMemoryTab, -1, _("Disk") );
+    wxStaticBoxSizer* diskUsageBoxSizer = new wxStaticBoxSizer( diskUsageStaticBox, wxVERTICAL );
+    makeStaticBoxLabelItalic(diskUsageStaticBox);
 
-    m_staticText30 = new wxStaticText(
-        networkGeneralStaticBox, ID_DEFAULT,
-        _("Minimum work buffer"), wxDefaultPosition, wxDefaultSize, 0
+    wxString MostRestrictiveText = wxEmptyString;
+    MostRestrictiveText.Printf(_("%s will use the most restrictive of these settings:"), pSkinAdvanced->GetApplicationShortName().c_str());
+    diskUsageBoxSizer->Add(new wxStaticText( diskUsageStaticBox, -1, MostRestrictiveText, wxDefaultPosition, wxDefaultSize, 0),
+        0, wxALL, 5
     );
-    networkGeneralGridSizer->Add( m_staticText30, 0, wxALIGN_RIGHT|wxALL, 5 );
 
-    m_txtNetConnectInterval = new wxTextCtrl(
-        networkGeneralStaticBox, ID_TXTNETCONNECTINTERVAL, wxT(""), wxDefaultPosition, textCtrlSize, wxTE_RIGHT
-    );
-    m_txtNetConnectInterval->SetToolTip(
-        _("Try to maintain enough tasks to keep busy for this many days")
-    );
+    wxString DiskMaxSpaceTT = wxEmptyString;
+    DiskMaxSpaceTT.Printf(_("Limit the total amount of disk space used by %s."), pSkinAdvanced->GetApplicationShortName().c_str());
 
-    networkGeneralGridSizer->Add( m_txtNetConnectInterval, 0, wxALL, 1 );
+    m_chkDiskMaxSpace = new wxCheckBox (
+        diskUsageStaticBox, ID_CHKDISKMAXSPACE, _("Use no more than"), wxDefaultPosition, wxDefaultSize, 0 );
 
-    m_staticText31 = new wxStaticText(
-        networkGeneralStaticBox, ID_DEFAULT, _("days (maximum value: 10)"), wxDefaultPosition, wxDefaultSize, 0
-    );
-    networkGeneralGridSizer->Add( m_staticText31, 0, wxALL, 5 );
+    m_txtDiskMaxSpace = new wxTextCtrl( diskUsageStaticBox, ID_TXTDISKMAXSPACE,wxEmptyString, wxDefaultPosition, textCtrlSize, wxTE_RIGHT );
 
-    m_staticText331 = new wxStaticText(
-        networkGeneralStaticBox, ID_DEFAULT,
-        _("Max additional work buffer"), wxDefaultPosition, wxDefaultSize, 0
-    );
-    networkGeneralGridSizer->Add( m_staticText331, 0, wxALIGN_RIGHT|wxALL, 5 );
+    wxStaticText* staticText41 = new wxStaticText( diskUsageStaticBox, ID_DEFAULT, _("GB"), wxDefaultPosition, wxDefaultSize, 0 );
 
-    m_txtNetAdditionalDays = new wxTextCtrl(
-        networkGeneralStaticBox, ID_TXTNETADDITIONALDAYS, wxT(""), wxDefaultPosition, textCtrlSize, wxTE_RIGHT
-    );
-    m_txtNetAdditionalDays->SetToolTip(
-        _("In addition, maintain enough tasks for up to this many days")
-    );
-    networkGeneralGridSizer->Add( m_txtNetAdditionalDays, 0, wxALL, 1 );
+    addNewRowToSizer(diskUsageBoxSizer, DiskMaxSpaceTT, m_chkDiskMaxSpace, m_txtDiskMaxSpace, staticText41);
 
-    m_staticText341 = new wxStaticText( networkGeneralStaticBox, ID_DEFAULT, _("days (maximum value: 10)"), wxDefaultPosition, wxDefaultSize, 0 );
-    networkGeneralGridSizer->Add( m_staticText341, 0, wxALL, 5 );
+    wxString DiskLeastFreeTT = wxEmptyString;
+    DiskLeastFreeTT.Printf(_("Limit disk usage to leave this much free space on the volume where %s stores data."), pSkinAdvanced->GetApplicationShortName().c_str());
 
-    // long-term quota
+    m_chkDiskLeastFree = new wxCheckBox (
+        diskUsageStaticBox, ID_CHKDISKLEASTFREE, _("Leave at least"), wxDefaultPosition, wxDefaultSize, 0 );
 
-    m_staticText_daily_xfer1 = new wxStaticText( networkGeneralStaticBox, ID_DEFAULT, _("Transfer at most"), wxDefaultPosition, wxDefaultSize, 0 );
-    networkGeneralGridSizer->Add( m_staticText_daily_xfer1, 0, wxALIGN_RIGHT|wxALL, 5 );
+    m_txtDiskLeastFree = new wxTextCtrl( diskUsageStaticBox, ID_TXTDISKLEASTFREE, wxEmptyString, wxDefaultPosition, textCtrlSize, wxTE_RIGHT );
 
-    m_txt_daily_xfer_limit_mb = new wxTextCtrl( networkGeneralStaticBox, ID_TXTNETDOWNLOADRATE, wxT(""), wxDefaultPosition, textCtrlSize, wxTE_RIGHT );
-    networkGeneralGridSizer->Add( m_txt_daily_xfer_limit_mb, 0, wxALL, 1 );
+    wxStaticText* staticText43 = new wxStaticText( diskUsageStaticBox, ID_DEFAULT, _("GB free"), wxDefaultPosition, wxDefaultSize, 0 );
 
-    wxBoxSizer* networkTransferLimitSizer = new wxBoxSizer( wxHORIZONTAL );
+    addNewRowToSizer(diskUsageBoxSizer, DiskLeastFreeTT, m_chkDiskLeastFree, m_txtDiskLeastFree, staticText43);
 
-    m_staticText_daily_xfer2 = new wxStaticText( networkGeneralStaticBox, ID_DEFAULT, _("MBytes every"), wxDefaultPosition, wxDefaultSize, 0 );
-    networkTransferLimitSizer->Add( m_staticText_daily_xfer2, 0, wxALL, 5 );
+    wxString DiskMaxOfTotalTT = wxEmptyString;
+    DiskMaxOfTotalTT.Printf(_("Limit the percentage of disk space used by %s on the volume where it stores data."), pSkinAdvanced->GetApplicationShortName().c_str());
 
-    m_txt_daily_xfer_period_days = new wxTextCtrl( networkGeneralStaticBox, ID_TXTNETUPLOADRATE, wxT(""), wxDefaultPosition, getTextCtrlSize(wxT("999.99")), wxTE_RIGHT );
-    networkTransferLimitSizer->Add( m_txt_daily_xfer_period_days, 0, wxALL, 1 );
+    m_chkDiskMaxOfTotal = new wxCheckBox (
+        diskUsageStaticBox, ID_CHKDISKMAXOFTOTAL, _("Use no more than"), wxDefaultPosition, wxDefaultSize, 0 );
 
-    m_staticText_daily_xfer4 = new wxStaticText( networkGeneralStaticBox, ID_DEFAULT, _("days (0 means no restriction)"), wxDefaultPosition, wxDefaultSize, 0 );
-    networkTransferLimitSizer->Add( m_staticText_daily_xfer4, 0, wxALL, 5 );
+    m_txtDiskMaxOfTotal = new wxTextCtrl( diskUsageStaticBox, ID_TXTDISKMAXOFTOTAL, wxEmptyString, wxDefaultPosition, textCtrlSize, wxTE_RIGHT );
 
-    networkGeneralGridSizer->Add( networkTransferLimitSizer, 0, wxALL, 0 );
+    /*xgettext:no-c-format*/
+    wxStaticText* staticText45 = new wxStaticText( diskUsageStaticBox, ID_DEFAULT, _("% of total"), wxDefaultPosition, wxDefaultSize, 0 );
 
-    networkGeneralBoxSizer->Add( networkGeneralGridSizer, 0, wxEXPAND, 1 );
+    addNewRowToSizer(diskUsageBoxSizer, DiskMaxOfTotalTT, m_chkDiskMaxOfTotal, m_txtDiskMaxOfTotal, staticText45);
 
+    diskAndMemoryTabSizer->AddSpacer( STATICBOXVERTICALSPACER );
+    diskAndMemoryTabSizer->Add( diskUsageBoxSizer, 0, wxLEFT | wxRIGHT | wxEXPAND, STATICBOXBORDERSIZE );
 
-    m_chkNetSkipImageVerification = new wxCheckBox( networkGeneralStaticBox, ID_CHKNETSKIPIMAGEVERIFICATION, _("Skip image file verification"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticBox* memoryUsageStaticBox = new wxStaticBox( diskMemoryTab, -1, _("Memory") );
+    wxStaticBoxSizer* memoryUsageBoxSizer = new wxStaticBoxSizer( memoryUsageStaticBox, wxVERTICAL );
+    makeStaticBoxLabelItalic(memoryUsageStaticBox);
 
-    m_chkNetSkipImageVerification->SetToolTip( _("check this if your Internet provider modifies image files") );
+    wxString MemoryMaxInUseTT = wxEmptyString;
+    MemoryMaxInUseTT.Printf(_("Limit the memory used by %s when you're using the computer."), pSkinAdvanced->GetApplicationShortName().c_str());
 
-    networkGeneralBoxSizer->Add( m_chkNetSkipImageVerification, 0, wxALL, 5 );
+    wxStaticText* staticText50 = new wxStaticText( memoryUsageStaticBox, ID_DEFAULT, _("When computer is in use, use at most"), wxDefaultPosition, wxDefaultSize, 0 );
 
-    networkTabSizer->Add( networkGeneralBoxSizer, 0, wxEXPAND, 1 );
+    textCtrlSize = getTextCtrlSize(wxT("100.00"));
+    m_txtMemoryMaxInUse = new wxTextCtrl( memoryUsageStaticBox, ID_TXTMEMORYMAXINUSE, wxEmptyString, wxDefaultPosition, textCtrlSize, wxTE_RIGHT );
 
-    wxStaticBox* connectOptionsStaticBox = new wxStaticBox( networkTab, -1, _("Connect options") );
-    wxStaticBoxSizer* connectOptionsSizer = new wxStaticBoxSizer( connectOptionsStaticBox, wxVERTICAL );
+    /*xgettext:no-c-format*/ 
+    wxStaticText* staticText51 = new wxStaticText( memoryUsageStaticBox, ID_DEFAULT, _("%"), wxDefaultPosition, wxDefaultSize, 0 );
 
-    m_chkNetConfirmBeforeConnect = new wxCheckBox( connectOptionsStaticBox, ID_CHKNETCONFIRMBEFORECONNECT, _("Confirm before connecting to internet"), wxDefaultPosition, wxDefaultSize, 0 );
+    addNewRowToSizer(memoryUsageBoxSizer, MemoryMaxInUseTT, staticText50, m_txtMemoryMaxInUse, staticText51);
 
-    m_chkNetConfirmBeforeConnect->SetToolTip( _("if checked, a confirmation dialog will be displayed before trying to connect to the Internet") );
+    wxString MemoryMaxOnIdleTT = wxEmptyString;
+    MemoryMaxOnIdleTT.Printf(_("Limit the memory used by %s when you're not using the computer."), pSkinAdvanced->GetApplicationShortName().c_str());
 
-    connectOptionsSizer->Add( m_chkNetConfirmBeforeConnect, 0, wxALL, 5 );
+    wxStaticText* staticText52 = new wxStaticText( memoryUsageStaticBox, ID_DEFAULT, _("When computer is not in use, use at most"), wxDefaultPosition, wxDefaultSize, 0 );
 
-    m_chkNetDisconnectWhenDone = new wxCheckBox( connectOptionsStaticBox, ID_CHKNETDISCONNECTWHENDONE, _("Disconnect when done"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_txtMemoryMaxOnIdle = new wxTextCtrl( memoryUsageStaticBox, ID_TXTMEMORYMAXONIDLE, wxEmptyString, wxDefaultPosition, textCtrlSize, wxTE_RIGHT );
 
-    m_chkNetDisconnectWhenDone->SetToolTip( _("if checked, BOINC hangs up when network usage is done\n(only relevant for dialup-connection)") );
+    /*xgettext:no-c-format*/
+    wxStaticText* staticText53 = new wxStaticText( memoryUsageStaticBox, ID_DEFAULT, _("%"), wxDefaultPosition, wxDefaultSize, 0 );
 
-    connectOptionsSizer->Add( m_chkNetDisconnectWhenDone, 0, wxALL, 5 );
+    addNewRowToSizer(memoryUsageBoxSizer, MemoryMaxOnIdleTT, staticText52, m_txtMemoryMaxOnIdle, staticText53);
 
-    networkTabSizer->Add( connectOptionsSizer, 0, wxEXPAND, 1 );
+    m_chkMemoryWhileSuspended = new wxCheckBox( memoryUsageStaticBox, ID_CHKMEMORYWHILESUSPENDED, _("Leave non-GPU tasks in memory while suspended"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_chkMemoryWhileSuspended->SetToolTip( _("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.") );
+    memoryUsageBoxSizer->Add(m_chkMemoryWhileSuspended, 0, wxALL, 5 );
 
-    wxStaticBox* networkTimesStaticBox = new wxStaticBox( networkTab, -1, _("Network usage allowed") );
-    wxStaticBoxSizer* networkTimesBoxSizer = new wxStaticBoxSizer( networkTimesStaticBox, wxVERTICAL );
+    wxString DiskMaxSwapTT = wxEmptyString;
+    DiskMaxSwapTT.Printf(_("Limit the swap space (page file) used by %s."), pSkinAdvanced->GetApplicationShortName().c_str());
 
-    wxBoxSizer* networkTimesSizer = new wxBoxSizer( wxHORIZONTAL );
+    wxStaticText* staticText48 = new wxStaticText( memoryUsageStaticBox, ID_DEFAULT, _("Page/swap file: use at most"), wxDefaultPosition, wxDefaultSize, 0 );
 
-    m_staticText38 = new wxStaticText( networkTimesStaticBox, ID_DEFAULT, _("Every day between hours of"), wxDefaultPosition, wxDefaultSize, 0 );
-    networkTimesSizer->Add( m_staticText38, 0, wxALL, 5 );
+    m_txtDiskMaxSwap = new wxTextCtrl( memoryUsageStaticBox, ID_TXTDISKWRITETODISK, wxEmptyString, wxDefaultPosition, textCtrlSize, wxTE_RIGHT );
 
-    m_txtNetEveryDayStart = new wxTextCtrl( networkTimesStaticBox, ID_TXTNETEVERYDAYSTART, wxT(""), wxDefaultPosition, getTextCtrlSize(wxT("23:59")), 0 );
-    m_txtNetEveryDayStart->SetToolTip( _("network usage start hour") );
+    /*xgettext:no-c-format*/
+    wxStaticText* staticText49 = new wxStaticText( memoryUsageStaticBox, ID_DEFAULT, _("%"), wxDefaultPosition, wxDefaultSize, 0 );
 
-    networkTimesSizer->Add( m_txtNetEveryDayStart, 0, wxALL, 1 );
+    addNewRowToSizer(memoryUsageBoxSizer, DiskMaxSwapTT, staticText48, m_txtDiskMaxSwap, staticText49);
 
-    m_staticText37 = new wxStaticText( networkTimesStaticBox, ID_DEFAULT, _("and"), wxDefaultPosition, wxDefaultSize, 0 );
-    networkTimesSizer->Add( m_staticText37, 0, wxALL, 5 );
+    diskAndMemoryTabSizer->AddSpacer( STATICBOXVERTICALSPACER );
+    diskAndMemoryTabSizer->Add( memoryUsageBoxSizer, 0, wxLEFT | wxRIGHT | wxEXPAND, STATICBOXBORDERSIZE );
+    diskAndMemoryTabSizer->AddSpacer( STATICBOXVERTICALSPACER );
 
-    m_txtNetEveryDayStop = new wxTextCtrl( networkTimesStaticBox, ID_TXTNETEVERYDAYSTOP, wxT(""), wxDefaultPosition, getTextCtrlSize(wxT("23:59")), 0 );
-    m_txtNetEveryDayStop->SetToolTip( _("network usage stop hour") );
+    diskMemoryTab->SetSizer( diskAndMemoryTabSizer );
+    diskMemoryTab->Layout();
+    diskAndMemoryTabSizer->Fit( diskMemoryTab );
 
-    networkTimesSizer->Add( m_txtNetEveryDayStop, 0, wxALL, 1 );
+    return diskMemoryTab;
+}
 
-    m_staticText54 = new wxStaticText( networkTimesStaticBox, ID_DEFAULT, _("(no restriction if equal)"), wxDefaultPosition, wxDefaultSize, 0 );
-    networkTimesSizer->Add( m_staticText54, 0, wxALL, 5 );
 
-    networkTimesBoxSizer->Add( networkTimesSizer, 0, wxEXPAND, 1 );
+wxPanel* CDlgAdvPreferencesBase::createDailySchedulesTab(wxNotebook* notebook)
+{
+    wxSize textCtrlSize = getTextCtrlSize(wxT("23:59 "));
+    
+    wxString andString(_("and"));
+    wxString toString(wxT(" ")+_("to")+wxT(" "));
+    
+    wxPanel* dailySchedulesTab = new wxPanel( notebook, ID_TABPAGE_SCHED, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    dailySchedulesTab->SetExtraStyle( wxWS_EX_VALIDATE_RECURSIVELY );
 
-    m_staticText39 = new wxStaticText( networkTimesStaticBox, ID_DEFAULT, _("Day-of-week override:"), wxDefaultPosition, wxDefaultSize, 0 );
-    networkTimesBoxSizer->Add( m_staticText39, 0, wxALL, 5 );
+    wxBoxSizer* dailySchedulesTabSizer = new wxBoxSizer( wxVERTICAL );
 
-    m_panelNetSpecialTimes = new wxPanel( networkTimesStaticBox, ID_DEFAULT, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
-    m_panelNetSpecialTimes->SetExtraStyle( wxWS_EX_VALIDATE_RECURSIVELY );
-    m_panelNetSpecialTimes->SetToolTip( _("check box to specify hours for this day of week") );
+    // Computing schedule
+    //
+    wxStaticBox* computingTimesStaticBox = new wxStaticBox(dailySchedulesTab, -1, _("Computing") );
+    wxStaticBoxSizer* computingTimesStaticBoxSizer = new wxStaticBoxSizer(computingTimesStaticBox, wxVERTICAL);
+    makeStaticBoxLabelItalic(computingTimesStaticBox);
 
-    wxFlexGridSizer* netDaysGridSizer = new wxFlexGridSizer( 4, 4, 0, 0 );
-    netDaysGridSizer->SetFlexibleDirection( wxHORIZONTAL );
-    netDaysGridSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+    wxString ProcEveryDayTT(_("Compute only during a particular period each day."));
+    m_chkProcEveryDay = new wxCheckBox(
+        computingTimesStaticBox, ID_CHKPROCEVERYDAY,
+        _("Compute only between"), wxDefaultPosition, wxDefaultSize, 0 );
 
-    m_chkNetMonday = new wxCheckBox( m_panelNetSpecialTimes, ID_CHKNETMONDAY, _("Monday"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_txtProcEveryDayStart = new wxTextCtrl( computingTimesStaticBox, ID_TXTPROCEVERYDAYSTART, wxEmptyString, wxDefaultPosition, textCtrlSize, wxTE_RIGHT );
 
-    netDaysGridSizer->Add( m_chkNetMonday, 0, wxALL, 5 );
+    wxStaticText* staticText25 = new wxStaticText( computingTimesStaticBox, ID_DEFAULT, andString, wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
 
-    m_txtNetMonday = new wxTextCtrl( m_panelNetSpecialTimes, ID_TXTNETMONDAY, wxT(""), wxDefaultPosition, getTextCtrlSize(wxT("00:00-23:59")), 0 );
-    netDaysGridSizer->Add( m_txtNetMonday, 0, wxALL, 1 );
+    m_txtProcEveryDayStop = new wxTextCtrl( computingTimesStaticBox, ID_TXTPROCEVERYDAYSTOP, wxEmptyString, wxDefaultPosition, textCtrlSize, wxTE_RIGHT );
 
-    m_chkNetTuesday = new wxCheckBox( m_panelNetSpecialTimes, ID_CHKNETTUESDAY, _("Tuesday"), wxDefaultPosition, wxDefaultSize, 0 );
+    addNewRowToSizer(computingTimesStaticBoxSizer, ProcEveryDayTT, m_chkProcEveryDay, m_txtProcEveryDayStart, staticText25, m_txtProcEveryDayStop);
 
-    netDaysGridSizer->Add( m_chkNetTuesday, 0, wxALL, 5 );
+    wxStaticBox* procSpecialTimesStaticBox = new wxStaticBox(computingTimesStaticBox, -1, _("Day-of-week override") );
+    wxStaticBoxSizer* procSpecialTimesStaticBoxSizer = new wxStaticBoxSizer(procSpecialTimesStaticBox, wxVERTICAL);
+    makeStaticBoxLabelItalic(procSpecialTimesStaticBox);
 
-    m_txtNetTuesday = new wxTextCtrl( m_panelNetSpecialTimes, ID_TXTNETTUESDAY, wxT(""), wxDefaultPosition, getTextCtrlSize(wxT("00:00-23:59")), 0 );
-    netDaysGridSizer->Add( m_txtNetTuesday, 0, wxALL, 1 );
+    wxStaticText* staticText36 = new wxStaticText( procSpecialTimesStaticBox, ID_DEFAULT, _("Override the times above on the selected days:"), wxDefaultPosition, wxDefaultSize, 0 );
+#ifdef __WXMAC__
+    procSpecialTimesStaticBoxSizer->Add( staticText36, 0, wxLEFT, 5 );
+#else
+    procSpecialTimesStaticBoxSizer->Add( staticText36, 0, wxLEFT, DAYOFWEEKBORDERSIZE );
+#endif
+ 
+    procSpecialTimesStaticBoxSizer->AddSpacer(3);
 
-    m_chkNetWednesday = new wxCheckBox( m_panelNetSpecialTimes, ID_CHKNETWEDNESDAY, _("Wednesday"), wxDefaultPosition, wxDefaultSize, 0 );
+//    procSpecialTimesStaticBox->SetToolTip(_("On each selected \"override\" day, ignore the \"Every day\" times above and suspend if the time is outside the range shown for that day"));
+   
+    wxFlexGridSizer* procDaysSizer = new wxFlexGridSizer( 4, 9, 0, 0 );
+    procDaysSizer->SetFlexibleDirection( wxHORIZONTAL );
+    procDaysSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    netDaysGridSizer->Add( m_chkNetWednesday, 0, wxALL, 5 );
+    // Tooltips for Day-of-Week override wxCheckBoxes and wxTextCtrls are set in CDlgAdvPreferences::SetSpecialTooltips()
+    wxString procDaysTimeTT(PROC_DAY_OF_WEEK_TOOLTIP_TEXT);
 
-    m_txtNetWednesday = new wxTextCtrl( m_panelNetSpecialTimes, ID_TXTNETWEDNESDAY, wxT(""), wxDefaultPosition, getTextCtrlSize(wxT("00:00-23:59")), 0 );
-    netDaysGridSizer->Add( m_txtNetWednesday, 0, wxALL, 1 );
+    m_chkProcMonday = new wxCheckBox( procSpecialTimesStaticBox, ID_CHKPROCMONDAY, _("Monday"), wxDefaultPosition, wxDefaultSize, 0 );
+    procDaysSizer->Add( m_chkProcMonday, 0, wxTOP, 5 );
 
-    m_chkNetThursday = new wxCheckBox( m_panelNetSpecialTimes, ID_CHKNETTHURSDAY, _("Thursday"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_txtProcMondayStart = new wxTextCtrl( procSpecialTimesStaticBox, ID_TXTPROCMONDAYSTART, wxEmptyString, wxDefaultPosition, textCtrlSize, 0 );
+    procDaysSizer->Add( m_txtProcMondayStart, 0, wxALL, 1 );
 
-    netDaysGridSizer->Add( m_chkNetThursday, 0, wxALL, 5 );
+    wxStaticText* toStringProcMonday = new wxStaticText( procSpecialTimesStaticBox, ID_DEFAULT, toString, wxDefaultPosition, wxDefaultSize, 0 );
+    toStringProcMonday->SetToolTip(procDaysTimeTT);
+    procDaysSizer->Add(toStringProcMonday , 0, wxTOP, 5 );
 
-    m_txtNetThursday = new wxTextCtrl( m_panelNetSpecialTimes, ID_TXTNETTHURSDAY, wxT(""), wxDefaultPosition, getTextCtrlSize(wxT("00:00-23:59")), 0 );
-    netDaysGridSizer->Add( m_txtNetThursday, 0, wxALL, 1 );
+    m_txtProcMondayStop = new wxTextCtrl( procSpecialTimesStaticBox, ID_TXTPROCMONDAYSTOP, wxEmptyString, wxDefaultPosition, textCtrlSize, 0 );
+    procDaysSizer->Add( m_txtProcMondayStop, 0, wxALL, 1 );
 
-    m_chkNetFriday = new wxCheckBox( m_panelNetSpecialTimes, ID_CHKNETFRIDAY, _("Friday"), wxDefaultPosition, wxDefaultSize, 0 );
+    procDaysSizer->AddSpacer(15);
 
-    netDaysGridSizer->Add( m_chkNetFriday, 0, wxALL, 5 );
+    m_chkProcFriday = new wxCheckBox( procSpecialTimesStaticBox, ID_CHKPROCFRIDAY, _("Friday"), wxDefaultPosition, wxDefaultSize, 0 );
+    procDaysSizer->Add( m_chkProcFriday, 0, wxTOP, 5 );
 
-    m_txtNetFriday = new wxTextCtrl( m_panelNetSpecialTimes, ID_TXTNETFRIDAY, wxT(""), wxDefaultPosition, getTextCtrlSize(wxT("00:00-23:59")), 0 );
-    netDaysGridSizer->Add( m_txtNetFriday, 0, wxALL, 1 );
+    m_txtProcFridayStart = new wxTextCtrl( procSpecialTimesStaticBox, ID_TXTPROCFRIDAYSTART, wxEmptyString, wxDefaultPosition, textCtrlSize, 0 );
+    procDaysSizer->Add( m_txtProcFridayStart, 0, wxALL, 1 );
 
-    m_chkNetSaturday = new wxCheckBox( m_panelNetSpecialTimes, ID_CHKNETSATURDAY, _("Saturday"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText* toStringProcFriday = new wxStaticText( procSpecialTimesStaticBox, ID_DEFAULT, toString, wxDefaultPosition, wxDefaultSize, 0 );
+    toStringProcFriday->SetToolTip(procDaysTimeTT);
+    procDaysSizer->Add(toStringProcFriday , 0, wxTOP, 5 );
 
-    netDaysGridSizer->Add( m_chkNetSaturday, 0, wxALL, 5 );
+    m_txtProcFridayStop = new wxTextCtrl( procSpecialTimesStaticBox, ID_TXTPROCFRIDAYSTOP, wxEmptyString, wxDefaultPosition, textCtrlSize, 0 );
+    procDaysSizer->Add( m_txtProcFridayStop, 0, wxALL, 1 );
 
-    m_txtNetSaturday = new wxTextCtrl( m_panelNetSpecialTimes, ID_TXTNETSATURDAY, wxT(""), wxDefaultPosition, getTextCtrlSize(wxT("00:00-23:59")), 0 );
-    netDaysGridSizer->Add( m_txtNetSaturday, 0, wxALL, 1 );
+    m_chkProcTuesday = new wxCheckBox( procSpecialTimesStaticBox, ID_CHKPROCTUESDAY, _("Tuesday"), wxDefaultPosition, wxDefaultSize, 0 );
+    procDaysSizer->Add( m_chkProcTuesday, 0, wxTOP, 5 );
 
-    m_chkNetSunday = new wxCheckBox( m_panelNetSpecialTimes, ID_CHKNETSUNDAY, _("Sunday"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_txtProcTuesdayStart = new wxTextCtrl( procSpecialTimesStaticBox, ID_TXTPROCTUESDAYSTART, wxEmptyString, wxDefaultPosition, textCtrlSize, 0 );
+    procDaysSizer->Add( m_txtProcTuesdayStart, 0, wxALL, 1 );
 
-    netDaysGridSizer->Add( m_chkNetSunday, 0, wxALL, 5 );
+    wxStaticText* toStringProcTuesday = new wxStaticText( procSpecialTimesStaticBox, ID_DEFAULT, toString, wxDefaultPosition, wxDefaultSize, 0 );
+    toStringProcTuesday->SetToolTip(procDaysTimeTT);
+    procDaysSizer->Add(toStringProcTuesday , 0, wxTOP, 5 );
 
-    m_txtNetSunday = new wxTextCtrl( m_panelNetSpecialTimes, ID_TXTNETSUNDAY, wxT(""), wxDefaultPosition, getTextCtrlSize(wxT("00:00-23:59")), 0 );
-    netDaysGridSizer->Add( m_txtNetSunday, 0, wxALL, 1 );
+    m_txtProcTuesdayStop = new wxTextCtrl( procSpecialTimesStaticBox, ID_TXTPROCTUESDAYSTOP, wxEmptyString, wxDefaultPosition, textCtrlSize, 0 );
+    procDaysSizer->Add( m_txtProcTuesdayStop, 0, wxALL, 1 );
 
-    m_panelNetSpecialTimes->SetSizer( netDaysGridSizer );
-    m_panelNetSpecialTimes->Layout();
-    netDaysGridSizer->Fit( m_panelNetSpecialTimes );
-    networkTimesBoxSizer->Add( m_panelNetSpecialTimes, 0, wxEXPAND | wxALL, 1 );
+    procDaysSizer->AddSpacer(15);
 
-    networkTabSizer->Add( networkTimesBoxSizer, 0, wxEXPAND, 1 );
+    m_chkProcSaturday = new wxCheckBox( procSpecialTimesStaticBox, ID_CHKPROCSATURDAY, _("Saturday"), wxDefaultPosition, wxDefaultSize, 0 );
+    procDaysSizer->Add( m_chkProcSaturday, 0, wxTOP, 5 );
 
-    networkTab->SetSizer( networkTabSizer );
-    networkTab->Layout();
-    networkTabSizer->Fit( networkTab );
+    m_txtProcSaturdayStart = new wxTextCtrl( procSpecialTimesStaticBox, ID_TXTPROCSATURDAYSTART, wxEmptyString, wxDefaultPosition, textCtrlSize, 0 );
+    procDaysSizer->Add( m_txtProcSaturdayStart, 0, wxALL, 1 );
 
-    return networkTab;
-}
+    wxStaticText* toStringProcSaturday = new wxStaticText( procSpecialTimesStaticBox, ID_DEFAULT, toString, wxDefaultPosition, wxDefaultSize, 0 );
+    toStringProcSaturday->SetToolTip(procDaysTimeTT);
+    procDaysSizer->Add(toStringProcSaturday , 0, wxTOP, 5 );
 
-wxPanel* CDlgAdvPreferencesBase::createDiskAndMemoryTab(wxNotebook* notebook)
-{
-    wxSize textCtrlSize = getTextCtrlSize(wxT("9999.99"));
-    
-    wxPanel* diskMemoryTab = new wxPanel( notebook, ID_TABPAGE_DISK, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    diskMemoryTab->SetExtraStyle( wxWS_EX_VALIDATE_RECURSIVELY );
+    m_txtProcSaturdayStop = new wxTextCtrl( procSpecialTimesStaticBox, ID_TXTPROCSATURDAYSTOP, wxEmptyString, wxDefaultPosition, textCtrlSize, 0 );
+    procDaysSizer->Add( m_txtProcSaturdayStop, 0, wxALL, 1 );
 
-    wxBoxSizer* diskAndMemoryBoxSizer = new wxBoxSizer( wxVERTICAL );
+    m_chkProcWednesday = new wxCheckBox( procSpecialTimesStaticBox, ID_CHKPROCWEDNESDAY, _("Wednesday"), wxDefaultPosition, wxDefaultSize, 0 );
+    procDaysSizer->Add( m_chkProcWednesday, 0, wxTOP, 5 );
 
-    wxStaticBox* diskUsageStaticBox = new wxStaticBox( diskMemoryTab, -1, _("Disk usage") );
-    wxStaticBoxSizer* diskUsageBoxSizer = new wxStaticBoxSizer( diskUsageStaticBox, wxVERTICAL );
+    m_txtProcWednesdayStart = new wxTextCtrl( procSpecialTimesStaticBox, ID_TXTPROCWEDNESDAYSTART, wxEmptyString, wxDefaultPosition, textCtrlSize, 0 );
+    procDaysSizer->Add( m_txtProcWednesdayStart, 0, wxALL, 1 );
 
-    wxFlexGridSizer* diskUsageGridSizer = new wxFlexGridSizer( 5, 3, 0, 0 );
-    diskUsageGridSizer->AddGrowableCol( 2 );
-    diskUsageGridSizer->SetFlexibleDirection( wxHORIZONTAL );
-    diskUsageGridSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+    wxStaticText* toStringProcWednesday = new wxStaticText( procSpecialTimesStaticBox, ID_DEFAULT, toString, wxDefaultPosition, wxDefaultSize, 0 );
+    toStringProcWednesday->SetToolTip(procDaysTimeTT);
+    procDaysSizer->Add(toStringProcWednesday , 0, wxTOP, 5 );
 
-    m_staticText40 = new wxStaticText( diskUsageStaticBox, ID_DEFAULT, _("Use at most"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
-    diskUsageGridSizer->Add( m_staticText40, 0, wxALL|wxEXPAND, 5 );
+    m_txtProcWednesdayStop = new wxTextCtrl( procSpecialTimesStaticBox, ID_TXTPROCWEDNESDAYSTOP, wxEmptyString, wxDefaultPosition, textCtrlSize, 0 );
+    procDaysSizer->Add( m_txtProcWednesdayStop, 0, wxALL, 1 );
 
-    m_txtDiskMaxSpace = new wxTextCtrl( diskUsageStaticBox, ID_TXTDISKMAXSPACE, wxT(""), wxDefaultPosition, textCtrlSize, wxTE_RIGHT );
-    m_txtDiskMaxSpace->SetToolTip( _("the maximum disk space used by BOINC (in Gigabytes)") );
+    procDaysSizer->AddSpacer(15);
 
-    diskUsageGridSizer->Add( m_txtDiskMaxSpace, 0, wxALL, 1 );
+    m_chkProcSunday = new wxCheckBox( procSpecialTimesStaticBox, ID_CHKPROCSUNDAY, _("Sunday"), wxDefaultPosition, wxDefaultSize, 0 );
+    procDaysSizer->Add( m_chkProcSunday, 0, wxTOP, 5 );
 
-    m_staticText41 = new wxStaticText( diskUsageStaticBox, ID_DEFAULT, _("Gigabytes disk space (0 means no restriction)"), wxDefaultPosition, wxDefaultSize, 0 );
-    diskUsageGridSizer->Add( m_staticText41, 0, wxALL, 5 );
+    m_txtProcSundayStart = new wxTextCtrl( procSpecialTimesStaticBox, ID_TXTPROCSUNDAYSTART, wxEmptyString, wxDefaultPosition, textCtrlSize, 0 );
+    procDaysSizer->Add( m_txtProcSundayStart, 0, wxALL, 1 );
 
-    m_staticText42 = new wxStaticText( diskUsageStaticBox, ID_DEFAULT, _("Leave at least"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
-    diskUsageGridSizer->Add( m_staticText42, 0, wxALL|wxEXPAND, 5 );
+    wxStaticText* toStringProcSunday = new wxStaticText( procSpecialTimesStaticBox, ID_DEFAULT, toString, wxDefaultPosition, wxDefaultSize, 0 );
+    toStringProcSunday->SetToolTip(procDaysTimeTT);
+    procDaysSizer->Add(toStringProcSunday , 0, wxTOP, 5 );
 
-    m_txtDiskLeastFree = new wxTextCtrl( diskUsageStaticBox, ID_TXTDISKLEASTFREE, wxT(""), wxDefaultPosition, textCtrlSize, wxTE_RIGHT );
-    m_txtDiskLeastFree->SetToolTip( _("BOINC leaves at least this amount of disk space free (in Gigabytes)") );
+    m_txtProcSundayStop = new wxTextCtrl( procSpecialTimesStaticBox, ID_TXTPROCSUNDAYSTOP, wxEmptyString, wxDefaultPosition, textCtrlSize, 0 );
+    procDaysSizer->Add( m_txtProcSundayStop, 0, wxALL, 1 );
 
-    diskUsageGridSizer->Add( m_txtDiskLeastFree, 0, wxALL, 1 );
+    m_chkProcThursday = new wxCheckBox( procSpecialTimesStaticBox, ID_CHKPROCTHURSDAY, _("Thursday"), wxDefaultPosition, wxDefaultSize, 0 );
+    procDaysSizer->Add( m_chkProcThursday, 0, wxTOP, 5 );
 
-    m_staticText43 = new wxStaticText( diskUsageStaticBox, ID_DEFAULT, _("Gigabytes disk space free"), wxDefaultPosition, wxDefaultSize, 0 );
-    diskUsageGridSizer->Add( m_staticText43, 0, wxALL, 5 );
+    m_txtProcThursdayStart = new wxTextCtrl( procSpecialTimesStaticBox, ID_TXTPROCTHURSDAYSTART, wxEmptyString, wxDefaultPosition, textCtrlSize, 0 );
+    procDaysSizer->Add( m_txtProcThursdayStart, 0, wxALL, 1 );
 
-    m_staticText44 = new wxStaticText( diskUsageStaticBox, ID_DEFAULT, _("Use at most"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
-    diskUsageGridSizer->Add( m_staticText44, 0, wxALL|wxEXPAND, 5 );
+    wxStaticText* toStringProcThursday = new wxStaticText( procSpecialTimesStaticBox, ID_DEFAULT, toString, wxDefaultPosition, wxDefaultSize, 0 );
+    toStringProcThursday->SetToolTip(procDaysTimeTT);
+    procDaysSizer->Add(toStringProcThursday , 0, wxTOP, 5 );
 
-    m_txtDiskMaxOfTotal = new wxTextCtrl( diskUsageStaticBox, ID_TXTDISKMAXOFTOTAL, wxT(""), wxDefaultPosition, textCtrlSize, wxTE_RIGHT );
-    m_txtDiskMaxOfTotal->SetToolTip( _("BOINC uses at most this percentage of total disk space") );
+    m_txtProcThursdayStop = new wxTextCtrl( procSpecialTimesStaticBox, ID_TXTPROCTHURSDAYSTOP, wxEmptyString, wxDefaultPosition, textCtrlSize, 0 );
+    procDaysSizer->Add( m_txtProcThursdayStop, 0, wxALL, 1 );
+    
+#ifdef __WXMAC__
+    procSpecialTimesStaticBoxSizer->Add( procDaysSizer, 0, wxRIGHT | wxBOTTOM, DAYOFWEEKBORDERSIZE );
+    computingTimesStaticBoxSizer->Add( procSpecialTimesStaticBoxSizer, 0, wxRIGHT | wxBOTTOM, STATICBOXBORDERSIZE + 3 );
+#else
+    procSpecialTimesStaticBoxSizer->Add( procDaysSizer, 1, wxRIGHT | wxLEFT | wxBOTTOM, DAYOFWEEKBORDERSIZE );
+    computingTimesStaticBoxSizer->Add(procSpecialTimesStaticBoxSizer, 1, wxRIGHT | wxLEFT | wxBOTTOM, STATICBOXBORDERSIZE );
+#endif
+    dailySchedulesTabSizer->AddSpacer( STATICBOXVERTICALSPACER );
+    dailySchedulesTabSizer->Add( computingTimesStaticBoxSizer, 1, wxRIGHT | wxLEFT | wxEXPAND, STATICBOXBORDERSIZE );
+    
+    // Network schedule
+    //
+    wxStaticBox* networkTimesStaticBox = new wxStaticBox( dailySchedulesTab, -1, _("Network") );
+    wxStaticBoxSizer* networkTimesBoxSizer = new wxStaticBoxSizer( networkTimesStaticBox, wxVERTICAL );
+    makeStaticBoxLabelItalic(networkTimesStaticBox);
 
-    diskUsageGridSizer->Add( m_txtDiskMaxOfTotal, 0, wxALL, 1 );
+    wxString NetEveryDayTT(_("Transfer files only during a particular period each day."));
+    m_chkNetEveryDay = new wxCheckBox(
+        networkTimesStaticBox, ID_CHKNETEVERYDAY, _("Transfer files only between"), wxDefaultPosition, wxDefaultSize, 0 );
 
-    /*xgettext:no-c-format*/
-    m_staticText45 = new wxStaticText( diskUsageStaticBox, ID_DEFAULT, _("% of total disk space"), wxDefaultPosition, wxDefaultSize, 0 );
-    diskUsageGridSizer->Add( m_staticText45, 0, wxALL, 5 );
+    m_txtNetEveryDayStart = new wxTextCtrl( networkTimesStaticBox, ID_TXTNETEVERYDAYSTART, wxEmptyString, wxDefaultPosition, textCtrlSize, 0 );
 
-    m_staticText46 = new wxStaticText( diskUsageStaticBox, ID_DEFAULT, _("Tasks checkpoint to disk at most every"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
-    diskUsageGridSizer->Add( m_staticText46, 0, wxALL|wxEXPAND, 5 );
+    wxStaticText* staticText37 = new wxStaticText( networkTimesStaticBox, ID_DEFAULT, andString, wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
 
-    m_txtDiskWriteToDisk = new wxTextCtrl( diskUsageStaticBox, ID_TXTDISKWRITETODISK, wxT(""), wxDefaultPosition, textCtrlSize, wxTE_RIGHT );
-    diskUsageGridSizer->Add( m_txtDiskWriteToDisk, 0, wxALL, 1 );
+    m_txtNetEveryDayStop = new wxTextCtrl( networkTimesStaticBox, ID_TXTNETEVERYDAYSTOP, wxEmptyString, wxDefaultPosition, textCtrlSize, 0 );
 
-    m_staticText47 = new wxStaticText( diskUsageStaticBox, ID_DEFAULT, _("seconds"), wxDefaultPosition, wxDefaultSize, 0 );
-    diskUsageGridSizer->Add( m_staticText47, 0, wxALL, 5 );
+    addNewRowToSizer(networkTimesBoxSizer, NetEveryDayTT, m_chkNetEveryDay, m_txtNetEveryDayStart, staticText37, m_txtNetEveryDayStop);
 
-    m_staticText48 = new wxStaticText( diskUsageStaticBox, ID_DEFAULT, _("Use at most"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
-    diskUsageGridSizer->Add( m_staticText48, 0, wxALL|wxEXPAND, 5 );
+    wxStaticBox* netSpecialTimesStaticBox = new wxStaticBox(networkTimesStaticBox, -1, _("Day-of-week override") );
+    wxStaticBoxSizer* netSpecialTimesStaticBoxSizer = new wxStaticBoxSizer(netSpecialTimesStaticBox, wxVERTICAL);
+    makeStaticBoxLabelItalic(netSpecialTimesStaticBox);
+    
+    wxStaticText* staticText39 = new wxStaticText( netSpecialTimesStaticBox, ID_DEFAULT, _("Override the times above on the selected days:"), wxDefaultPosition, wxDefaultSize, 0 );
+#ifdef __WXMAC__
+    netSpecialTimesStaticBoxSizer->Add( staticText39, 0, wxLEFT, 5 );
+#else
+    netSpecialTimesStaticBoxSizer->Add( staticText39, 0, wxLEFT, DAYOFWEEKBORDERSIZE );
+#endif
+    netSpecialTimesStaticBoxSizer->AddSpacer(3);
+    
+//    netSpecialTimesStaticBox->SetToolTip(_("On each selected \"override\" day, ignore the \"Every day\" times above and suspend if the time is outside the range shown for that day"));
+   
+    // Tooltips for Day-of-Week overrides are set in CDlgAdvPreferences::SetSpecialTooltips()
+    wxString netDaysTimeTT(NET_DAY_OF_WEEK_TOOLTIP_TEXT);
 
-    m_txtDiskMaxSwap = new wxTextCtrl( diskUsageStaticBox, ID_TXTDISKWRITETODISK, wxT(""), wxDefaultPosition, textCtrlSize, wxTE_RIGHT );
-    diskUsageGridSizer->Add( m_txtDiskMaxSwap, 0, wxALL, 1 );
+    wxFlexGridSizer* netDaysGridSizer = new wxFlexGridSizer( 4, 9, 0, 0 );
+    netDaysGridSizer->SetFlexibleDirection( wxHORIZONTAL );
+    netDaysGridSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    /*xgettext:no-c-format*/
-    m_staticText49 = new wxStaticText( diskUsageStaticBox, ID_DEFAULT, _("% of page file (swap space)"), wxDefaultPosition, wxDefaultSize, 0 );
-    diskUsageGridSizer->Add( m_staticText49, 0, wxALL, 5 );
+    m_chkNetMonday = new wxCheckBox( netSpecialTimesStaticBox, ID_CHKNETMONDAY, _("Monday"), wxDefaultPosition, wxDefaultSize, 0 );
+    netDaysGridSizer->Add( m_chkNetMonday, 0, wxTOP, 5 );
 
-    diskUsageBoxSizer->Add( diskUsageGridSizer, 0, wxEXPAND, 1 );
+    m_txtNetMondayStart = new wxTextCtrl( netSpecialTimesStaticBox, ID_TXTNETMONDAYSTART, wxEmptyString, wxDefaultPosition, textCtrlSize, 0 );
+    netDaysGridSizer->Add( m_txtNetMondayStart, 0, wxALL, 1 );
 
-    diskAndMemoryBoxSizer->Add( diskUsageBoxSizer, 0, wxEXPAND, 1 );
+    wxStaticText* toStringNetMonday = new wxStaticText( netSpecialTimesStaticBox, ID_DEFAULT, toString, wxDefaultPosition, wxDefaultSize, 0 );
+    toStringNetMonday->SetToolTip(netDaysTimeTT);
+    netDaysGridSizer->Add(toStringNetMonday , 0, wxTOP, 5 );
 
-    wxStaticBox* memoryUsageStaticBox = new wxStaticBox( diskMemoryTab, -1, _("Memory usage") );
-    wxStaticBoxSizer* memoryUsageBoxSizer = new wxStaticBoxSizer( memoryUsageStaticBox, wxVERTICAL );
+    m_txtNetMondayStop = new wxTextCtrl( netSpecialTimesStaticBox, ID_TXTNETMONDAYSTOP, wxEmptyString, wxDefaultPosition, textCtrlSize, 0 );
+    netDaysGridSizer->Add( m_txtNetMondayStop, 0, wxALL, 1 );
 
-    wxFlexGridSizer* memoryUsageGridSizer = new wxFlexGridSizer( 3, 3, 0, 0 );
-    memoryUsageGridSizer->AddGrowableCol( 2 );
-    memoryUsageGridSizer->SetFlexibleDirection( wxHORIZONTAL );
-    memoryUsageGridSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+    netDaysGridSizer->AddSpacer(15);
 
-    m_staticText50 = new wxStaticText( memoryUsageStaticBox, ID_DEFAULT, _("Use at most"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
-    memoryUsageGridSizer->Add( m_staticText50, 0, wxALL|wxEXPAND, 5 );
+    m_chkNetFriday = new wxCheckBox( netSpecialTimesStaticBox, ID_CHKNETFRIDAY, _("Friday"), wxDefaultPosition, wxDefaultSize, 0 );
+    netDaysGridSizer->Add( m_chkNetFriday, 0, wxTOP, 5 );
 
-    textCtrlSize = getTextCtrlSize(wxT("100.00"));
-    m_txtMemoryMaxInUse = new wxTextCtrl( memoryUsageStaticBox, ID_TXTMEMORYMAXINUSE, wxT(""), wxDefaultPosition, textCtrlSize, wxTE_RIGHT );
-    memoryUsageGridSizer->Add( m_txtMemoryMaxInUse, 0, wxALL, 1 );
+    m_txtNetFridayStart = new wxTextCtrl( netSpecialTimesStaticBox, ID_TXTNETFRIDAYSTART, wxEmptyString, wxDefaultPosition, textCtrlSize, 0 );
+    netDaysGridSizer->Add( m_txtNetFridayStart, 0, wxALL, 1 );
 
-    /*xgettext:no-c-format*/ 
-    m_staticText51 = new wxStaticText( memoryUsageStaticBox, ID_DEFAULT, _("% when computer is in use"), wxDefaultPosition, wxDefaultSize, 0 );
-    memoryUsageGridSizer->Add( m_staticText51, 0, wxALL, 5 );
+    wxStaticText* toStringNetFriday = new wxStaticText( netSpecialTimesStaticBox, ID_DEFAULT, toString, wxDefaultPosition, wxDefaultSize, 0 );
+    toStringNetFriday->SetToolTip(netDaysTimeTT);
+    netDaysGridSizer->Add(toStringNetFriday , 0, wxTOP, 5 );
 
-    m_staticText52 = new wxStaticText( memoryUsageStaticBox, ID_DEFAULT, _("Use at most"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
-    memoryUsageGridSizer->Add( m_staticText52, 0, wxALL|wxEXPAND, 5 );
+    m_txtNetFridayStop = new wxTextCtrl( netSpecialTimesStaticBox, ID_TXTNETFRIDAYSTOP, wxEmptyString, wxDefaultPosition, textCtrlSize, 0 );
+    netDaysGridSizer->Add( m_txtNetFridayStop, 0, wxALL, 1 );
+    
+    m_chkNetTuesday = new wxCheckBox( netSpecialTimesStaticBox, ID_CHKNETTUESDAY, _("Tuesday"), wxDefaultPosition, wxDefaultSize, 0 );
+    netDaysGridSizer->Add( m_chkNetTuesday, 0, wxTOP, 5 );
 
-    m_txtMemoryMaxOnIdle = new wxTextCtrl( memoryUsageStaticBox, ID_TXTMEMORYMAXONIDLE, wxT(""), wxDefaultPosition, textCtrlSize, wxTE_RIGHT );
-    memoryUsageGridSizer->Add( m_txtMemoryMaxOnIdle, 0, wxALL, 1 );
+    m_txtNetTuesdayStart = new wxTextCtrl( netSpecialTimesStaticBox, ID_TXTNETTUESDAYSTART, wxEmptyString, wxDefaultPosition, textCtrlSize, 0 );
+    netDaysGridSizer->Add( m_txtNetTuesdayStart, 0, wxALL, 1 );
 
-    /*xgettext:no-c-format*/ 
-    m_staticText53 = new wxStaticText( memoryUsageStaticBox, ID_DEFAULT, _("% when computer is idle"), wxDefaultPosition, wxDefaultSize, 0 );
-    memoryUsageGridSizer->Add( m_staticText53, 0, wxALL, 5 );
+    wxStaticText* toStringNetTuesay = new wxStaticText( netSpecialTimesStaticBox, ID_DEFAULT, toString, wxDefaultPosition, wxDefaultSize, 0 );
+    toStringNetTuesay->SetToolTip(netDaysTimeTT);
+    netDaysGridSizer->Add(toStringNetTuesay , 0, wxTOP, 5 );
 
-    memoryUsageBoxSizer->Add( memoryUsageGridSizer, 0, wxEXPAND, 1 );
+    m_txtNetTuesdayStop = new wxTextCtrl( netSpecialTimesStaticBox, ID_TXTNETTUESDAYSTOP, wxEmptyString, wxDefaultPosition, textCtrlSize, 0 );
+    netDaysGridSizer->Add( m_txtNetTuesdayStop, 0, wxALL, 1 );
 
-    m_chkMemoryWhileSuspended = new wxCheckBox( memoryUsageStaticBox, ID_CHKMEMORYWHILESUSPENDED, _("Leave applications in memory while suspended"), wxDefaultPosition, wxDefaultSize, 0 );
+    netDaysGridSizer->AddSpacer(15);
 
-    m_chkMemoryWhileSuspended->SetToolTip( _("if checked, suspended work units are left in memory") );
+    m_chkNetSaturday = new wxCheckBox( netSpecialTimesStaticBox, ID_CHKNETSATURDAY, _("Saturday"), wxDefaultPosition, wxDefaultSize, 0 );
+    netDaysGridSizer->Add( m_chkNetSaturday, 0, wxTOP, 5 );
 
-    memoryUsageBoxSizer->Add( m_chkMemoryWhileSuspended, 0, wxALL, 5 );
+    m_txtNetSaturdayStart = new wxTextCtrl( netSpecialTimesStaticBox, ID_TXTNETSATURDAYSTART, wxEmptyString, wxDefaultPosition, textCtrlSize, 0 );
+    netDaysGridSizer->Add( m_txtNetSaturdayStart, 0, wxALL, 1 );
 
-    diskAndMemoryBoxSizer->Add( memoryUsageBoxSizer, 0, wxALL|wxEXPAND, 1 );
+    wxStaticText* toStringNetSaturday = new wxStaticText( netSpecialTimesStaticBox, ID_DEFAULT, toString, wxDefaultPosition, wxDefaultSize, 0 );
+    toStringNetSaturday->SetToolTip(netDaysTimeTT);
+    netDaysGridSizer->Add(toStringNetSaturday , 0, wxTOP, 5 );
 
-    diskMemoryTab->SetSizer( diskAndMemoryBoxSizer );
-    diskMemoryTab->Layout();
-    diskAndMemoryBoxSizer->Fit( diskMemoryTab );
+    m_txtNetSaturdayStop = new wxTextCtrl( netSpecialTimesStaticBox, ID_TXTNETSATURDAYSTOP, wxEmptyString, wxDefaultPosition, textCtrlSize, 0 );
+    netDaysGridSizer->Add( m_txtNetSaturdayStop, 0, wxALL, 1 );
 
-    return diskMemoryTab;
-}
+    m_chkNetWednesday = new wxCheckBox( netSpecialTimesStaticBox, ID_CHKNETWEDNESDAY, _("Wednesday"), wxDefaultPosition, wxDefaultSize, 0 );
+    netDaysGridSizer->Add( m_chkNetWednesday, 0, wxTOP, 5 );
 
-wxPanel* CDlgAdvPreferencesBase::createExclusiveAppsTab(wxNotebook* notebook)
-{
-    wxPanel* exclusiveAppsTab = new wxPanel( notebook, ID_TABPAGE_EXCLAPPS, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    exclusiveAppsTab->SetExtraStyle( wxWS_EX_VALIDATE_RECURSIVELY );
+    m_txtNetWednesdayStart = new wxTextCtrl( netSpecialTimesStaticBox, ID_TXTNETWEDNESDAYSTART, wxEmptyString, wxDefaultPosition, textCtrlSize, 0 );
+    netDaysGridSizer->Add( m_txtNetWednesdayStart, 0, wxALL, 1 );
 
-    wxBoxSizer* exclusiveAppsTabBoxSizer = new wxBoxSizer( wxVERTICAL );
+    wxStaticText* toStringNetWednesday = new wxStaticText( netSpecialTimesStaticBox, ID_DEFAULT, toString, wxDefaultPosition, wxDefaultSize, 0 );
+    toStringNetWednesday->SetToolTip(netDaysTimeTT);
+    netDaysGridSizer->Add(toStringNetWednesday , 0, wxTOP, 5 );
 
-    wxStaticBox* exclusiveAppsListStaticBox = new wxStaticBox( exclusiveAppsTab, -1, _("Suspend processor and network usage when these applications are running:") );
-    wxStaticBoxSizer* exclusiveAppsListBoxSizer = new wxStaticBoxSizer( exclusiveAppsListStaticBox, wxVERTICAL );
+    m_txtNetWednesdayStop = new wxTextCtrl( netSpecialTimesStaticBox, ID_TXTNETWEDNESDAYSTOP, wxEmptyString, wxDefaultPosition, textCtrlSize, 0 );
+    netDaysGridSizer->Add( m_txtNetWednesdayStop, 0, wxALL, 1 );
 
-    wxBoxSizer* exclusiveAppsBoxSizer = new wxBoxSizer( wxVERTICAL );
+    netDaysGridSizer->AddSpacer(15);
+    
+    m_chkNetSunday = new wxCheckBox( netSpecialTimesStaticBox, ID_CHKNETSUNDAY, _("Sunday"), wxDefaultPosition, wxDefaultSize, 0 );
+    netDaysGridSizer->Add( m_chkNetSunday, 0, wxTOP, 5 );
 
-    m_exclusiveApsListBox = new wxListBox(exclusiveAppsListStaticBox, ID_LISTBOX_EXCLAPPS, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_EXTENDED|wxLB_NEEDED_SB|wxLB_SORT);
-    exclusiveAppsBoxSizer->Add(m_exclusiveApsListBox, 1, wxALL|wxEXPAND, 5);
+    m_txtNetSundayStart = new wxTextCtrl( netSpecialTimesStaticBox, ID_TXTNETSUNDAYSTART, wxEmptyString, wxDefaultPosition, textCtrlSize, 0 );
+    netDaysGridSizer->Add( m_txtNetSundayStart, 0, wxALL, 1 );
 
-	wxBoxSizer* exclusiveAppsButtonSizer = new wxBoxSizer( wxHORIZONTAL );
+    wxStaticText* toStringNetSunday = new wxStaticText( netSpecialTimesStaticBox, ID_DEFAULT, toString, wxDefaultPosition, wxDefaultSize, 0 );
+    toStringNetSunday->SetToolTip(netDaysTimeTT);
+    netDaysGridSizer->Add(toStringNetSunday , 0, wxTOP, 5 );
 
-    m_addExclusiveAppButton = new wxButton( exclusiveAppsListStaticBox, ID_ADDEXCLUSIVEAPPBUTTON, _("Add..."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_addExclusiveAppButton->SetToolTip( _("Add an application to this list"));
-	exclusiveAppsButtonSizer->Add( m_addExclusiveAppButton, 0, wxRIGHT, 5 );
-    
-    exclusiveAppsButtonSizer->AddStretchSpacer();
-    
-    m_removeExclusiveAppButton = new wxButton( exclusiveAppsListStaticBox, ID_REMOVEEXCLUSIVEAPPBUTTON, _("Remove"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_removeExclusiveAppButton->SetToolTip( _("Remove an application from this list"));
-	exclusiveAppsButtonSizer->Add( m_removeExclusiveAppButton, 0, wxLEFT, 5 );
+    m_txtNetSundayStop = new wxTextCtrl( netSpecialTimesStaticBox, ID_TXTNETSUNDAYSTOP, wxEmptyString, wxDefaultPosition, textCtrlSize, 0 );
+    netDaysGridSizer->Add( m_txtNetSundayStop, 0, wxALL, 1 );
 
-    exclusiveAppsBoxSizer->Add(exclusiveAppsButtonSizer, 0, wxEXPAND|wxLEFT|wxRIGHT, 25 );
+    m_chkNetThursday = new wxCheckBox( netSpecialTimesStaticBox, ID_CHKNETTHURSDAY, _("Thursday"), wxDefaultPosition, wxDefaultSize, 0 );
+    netDaysGridSizer->Add( m_chkNetThursday, 0, wxTOP, 5 );
 
-    wxBoxSizer* moreOptionsLinkSizer = new wxBoxSizer( wxHORIZONTAL );
+    m_txtNetThursdayStart = new wxTextCtrl( netSpecialTimesStaticBox, ID_TXTNETTHURSDAYSTART, wxEmptyString, wxDefaultPosition, textCtrlSize, 0 );
+    netDaysGridSizer->Add( m_txtNetThursdayStart, 0, wxALL, 1 );
 
-    moreOptionsLinkSizer->Add(
-        new wxStaticText(
-            exclusiveAppsListStaticBox, ID_DEFAULT, _("For advanced options, refer to "),
-            wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT
-        ),
-        0, wxLEFT, 5
-    );
+    wxStaticText* toStringNetThursday = new wxStaticText( netSpecialTimesStaticBox, ID_DEFAULT, toString, wxDefaultPosition, wxDefaultSize, 0 );
+    toStringNetThursday->SetToolTip(netDaysTimeTT);
+    netDaysGridSizer->Add(toStringNetThursday , 0, wxTOP, 5 );
+
+    m_txtNetThursdayStop = new wxTextCtrl( netSpecialTimesStaticBox, ID_TXTNETTHURSDAYSTOP, wxEmptyString, wxDefaultPosition, textCtrlSize, 0 );
+    netDaysGridSizer->Add( m_txtNetThursdayStop, 0, wxALL, 1 );
 
-    moreOptionsLinkSizer->Add(
-        new wxHyperlinkCtrl(
-            exclusiveAppsListStaticBox, ID_DEFAULT, wxT("http://boinc.berkeley.edu/wiki/Client_configuration"),
-            wxT("http://boinc.berkeley.edu/wiki/Client_configuration"), 
-            wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE
-        ),
 #ifdef __WXMAC__
-        0, wxLEFT, 5
+    netSpecialTimesStaticBoxSizer->Add( netDaysGridSizer, 1, wxRIGHT | wxBOTTOM, DAYOFWEEKBORDERSIZE );
+    networkTimesBoxSizer->Add(netSpecialTimesStaticBoxSizer, 1, wxRIGHT | wxBOTTOM, STATICBOXBORDERSIZE +3 );
 #else
-        0, wxLEFT, 3
+    netSpecialTimesStaticBoxSizer->Add( netDaysGridSizer, 1, wxRIGHT | wxLEFT | wxBOTTOM, DAYOFWEEKBORDERSIZE );
+    networkTimesBoxSizer->Add(netSpecialTimesStaticBoxSizer, 1, wxRIGHT | wxLEFT | wxBOTTOM, STATICBOXBORDERSIZE );
 #endif
-    );
-
-    exclusiveAppsBoxSizer->Add(moreOptionsLinkSizer, 0, wxALL, 10);
-        
-    exclusiveAppsListBoxSizer->Add(exclusiveAppsBoxSizer, 1, wxEXPAND, 5 );
-    
-    exclusiveAppsTabBoxSizer->Add(exclusiveAppsListBoxSizer, 1, wxEXPAND, 5 );
-    exclusiveAppsTabBoxSizer->AddStretchSpacer();
-
-    exclusiveAppsTab->SetSizer( exclusiveAppsTabBoxSizer );
-    exclusiveAppsTab->Layout();
-    exclusiveAppsTabBoxSizer->Fit( exclusiveAppsTab );
-
-    return exclusiveAppsTab;
+    dailySchedulesTabSizer->AddSpacer( STATICBOXVERTICALSPACER );
+    dailySchedulesTabSizer->Add( networkTimesBoxSizer, 1, wxRIGHT | wxLEFT | wxEXPAND, STATICBOXBORDERSIZE );
+    dailySchedulesTabSizer->AddSpacer( STATICBOXVERTICALSPACER );
+   
+    dailySchedulesTab->SetSizer( dailySchedulesTabSizer );
+    dailySchedulesTab->Layout();
+    dailySchedulesTabSizer->Fit( dailySchedulesTab );
+
+    return dailySchedulesTab;
 }
 
+
 wxSize CDlgAdvPreferencesBase::getTextCtrlSize(wxString maxText) {
     int w, h, margin;
     wxSize sz;
@@ -796,3 +947,40 @@ wxSize CDlgAdvPreferencesBase::getTextCtrlSize(wxString maxText) {
     return sz;
 }
 
+bool CDlgAdvPreferencesBase::doesLocalPrefsFileExist() {
+    std::string s;
+    int retval;
+    bool local_prefs_found = false;
+    MIOFILE mf;
+    bool found_venue;
+    GLOBAL_PREFS web_prefs;
+    GLOBAL_PREFS_MASK mask;
+    CMainDocument* pDoc = wxGetApp().GetDocument();
+
+    wxASSERT(pDoc);
+    wxASSERT(wxDynamicCast(pDoc, CMainDocument));
+
+    retval = pDoc->rpc.get_global_prefs_override(s);
+    local_prefs_found = (retval == BOINC_SUCCESS);
+    
+    s.clear();
+    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);
+    
+    return local_prefs_found;
+}
+
+void CDlgAdvPreferencesBase::makeStaticBoxLabelItalic(wxStaticBox* staticBox) {
+#if defined(__WXMSW__) || defined(__WXGTK__)
+    wxFont myFont = staticBox->GetFont();
+    myFont.MakeItalic();
+    myFont.MakeBold();
+    staticBox->SetOwnFont(myFont);
+#endif
+}
+
diff --git a/clientgui/DlgAdvPreferencesBase.h b/clientgui/DlgAdvPreferencesBase.h
index 0d03c3e..bb2ec8a 100644
--- a/clientgui/DlgAdvPreferencesBase.h
+++ b/clientgui/DlgAdvPreferencesBase.h
@@ -1,6 +1,6 @@
 // This file is part of BOINC.
 // http://boinc.berkeley.edu
-// Copyright (C) 2010 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
@@ -41,71 +41,103 @@
 
 ///////////////////////////////////////////////////////////////////////////
 
+
+#define PROC_DAY_OF_WEEK_TOOLTIP_TEXT _("On this day of the week, compute only during these hours.")
+#define NET_DAY_OF_WEEK_TOOLTIP_TEXT _("On this day of the week, transfer files only during these hours.")
+
 #define ID_DEFAULT wxID_ANY // Default
-#define ID_BTN_CLEAR 20000
-#define ID_CHKMEMORYWHILESUSPENDED 20001
-#define ID_CHKNETCONFIRMBEFORECONNECT 20002
-#define ID_CHKNETDISCONNECTWHENDONE 20003
-#define ID_CHKNETFRIDAY 20004
-#define ID_CHKNETMONDAY 20005
-#define ID_CHKNETSATURDAY 20006
-#define ID_CHKNETSKIPIMAGEVERIFICATION 20007
-#define ID_CHKNETSUNDAY 20008
-#define ID_CHKNETTHURSDAY 20009
-#define ID_CHKNETTUESDAY 20010
-#define ID_CHKNETWEDNESDAY 20011
-#define ID_CHKPROCFRIDAY 20012
-#define ID_CHKPROCINUSE 20013
-#define ID_CHKPROCMONDAY 20014
-#define ID_CHKPROCONBATTERIES 20015
-#define ID_CHKPROCSATURDAY 20016
-#define ID_CHKPROCSUNDAY 20017
-#define ID_CHKPROCTHURSDAY 20018
-#define ID_CHKPROCTUESDAY 20019
-#define ID_CHKPROCWEDNESDAY 20020
-#define ID_TABPAGE_DISK 20021
-#define ID_TABPAGE_NET 20022
-#define ID_TABPAGE_PROC 20023
-#define ID_TXTDISKLEASTFREE 20024
-#define ID_TXTDISKMAXOFTOTAL 20025
-#define ID_TXTDISKMAXSPACE 20026
-#define ID_TXTDISKWRITETODISK 20027
-#define ID_TXTMEMORYMAXINUSE 20028
-#define ID_TXTMEMORYMAXONIDLE 20029
-#define ID_TXTNETADDITIONALDAYS 20030
-#define ID_TXTNETCONNECTINTERVAL 20031
-#define ID_TXTNETDOWNLOADRATE 20032
-#define ID_TXTNETEVERYDAYSTART 20033
-#define ID_TXTNETEVERYDAYSTOP 20034
-#define ID_TXTNETFRIDAY 20035
-#define ID_TXTNETMONDAY 20036
-#define ID_TXTNETSATURDAY 20037
-#define ID_TXTNETSUNDAY 20038
-#define ID_TXTNETTHURSDAY 20039
-#define ID_TXTNETTUESDAY 20040
-#define ID_TXTNETUPLOADRATE 20041
-#define ID_TXTNETWEDNESDAY 20042
-#define ID_TXTPOCUSECPUTIME 20043
-#define ID_TXTPROCEVERYDAYSTART 20044
-#define ID_TXTPROCEVERYDAYSTOP 20045
-#define ID_TXTPROCFRIDAY 20046
-#define ID_TXTPROCIDLEFOR 20047
-#define ID_TXTPROCMONDAY 20048
-#define ID_TXTPROCSATURDAY 20049
-#define ID_TXTPROCSUNDAY 20050
-#define ID_TXTPROCSWITCHEVERY 20051
-#define ID_TXTPROCTHURSDAY 20052
-#define ID_TXTPROCTUESDAY 20053
-#define ID_TXTPROCUSEPROCESSORS 20054
-#define ID_TXTPROCWEDNESDAY 20055
-#define ID_CHKGPUPROCINUSE 20056
-#define ID_TXTMAXLOAD 20057
-#define ID_DAILY_XFER_LIMIT_MB  20058
-#define ID_DAILY_XFER_PERIOD_DAYS  20059
-#define ID_TABPAGE_EXCLAPPS 20060
-#define ID_LISTBOX_EXCLAPPS 20061
-#define ID_ADDEXCLUSIVEAPPBUTTON 20062
-#define ID_REMOVEEXCLUSIVEAPPBUTTON 20063
+#define ID_ADV_PREFS_START 20000
+enum {
+    ID_BTN_CLEAR = ID_ADV_PREFS_START,
+    // These 7 must be in sequence
+    ID_CHKNETSUNDAY,
+    ID_CHKNETMONDAY,
+    ID_CHKNETTUESDAY,
+    ID_CHKNETWEDNESDAY,
+    ID_CHKNETTHURSDAY,
+    ID_CHKNETFRIDAY,
+    ID_CHKNETSATURDAY,
+
+    // These 7 must be in sequence
+    ID_CHKPROCSUNDAY,
+    ID_CHKPROCMONDAY,
+    ID_CHKPROCTUESDAY,
+    ID_CHKPROCWEDNESDAY,
+    ID_CHKPROCTHURSDAY,
+    ID_CHKPROCFRIDAY,
+    ID_CHKPROCSATURDAY,
+
+    ID_CHKDAILYXFERLIMIT,
+    ID_CHKDISKLEASTFREE,
+    ID_CHKDISKMAXOFTOTAL,
+    ID_CHKDISKMAXSPACE,
+    ID_CHKMEMORYWHILESUSPENDED,
+    ID_CHKNETCONFIRMBEFORECONNECT,
+    ID_CHKNETDISCONNECTWHENDONE,
+    ID_CHKNETDOWNLOADRATE,
+    ID_CHKNETEVERYDAY,
+    ID_CHKNETSKIPIMAGEVERIFICATION,
+    ID_CHKNETUPLOADRATE,
+    ID_CHKPROCEVERYDAY,
+    ID_CHKPROCINUSE,
+    ID_CHKMAXLOAD,
+    ID_CHKPROCONBATTERIES,
+    ID_TABPAGE_SCHED,
+    ID_TABPAGE_DISK,
+    ID_TABPAGE_NET,
+    ID_TABPAGE_PROC,
+    ID_TXTDISKLEASTFREE,
+    ID_TXTDISKMAXOFTOTAL,
+    ID_TXTDISKMAXSPACE,
+    ID_TXTDISKWRITETODISK,
+    ID_TXTMEMORYMAXINUSE,
+    ID_TXTMEMORYMAXONIDLE,
+    ID_TXTNETADDITIONALDAYS,
+    ID_TXTNETCONNECTINTERVAL,
+    ID_TXTNETDOWNLOADRATE,
+    ID_TXTNETEVERYDAYSTART,
+    ID_TXTNETEVERYDAYSTOP,
+    ID_TXTNETFRIDAYSTART,
+    ID_TXTNETFRIDAYSTOP,
+    ID_TXTNETMONDAYSTART,
+    ID_TXTNETMONDAYSTOP,
+    ID_TXTNETSATURDAYSTART,
+    ID_TXTNETSATURDAYSTOP,
+    ID_TXTNETSUNDAYSTART,
+    ID_TXTNETSUNDAYSTOP,
+    ID_TXTNETTHURSDAYSTART,
+    ID_TXTNETTHURSDAYSTOP,
+    ID_TXTNETTUESDAYSTART,
+    ID_TXTNETTUESDAYSTOP,
+    ID_TXTNETUPLOADRATE,
+    ID_TXTNETWEDNESDAYSTART,
+    ID_TXTNETWEDNESDAYSTOP,
+    ID_TXTPOCUSECPUTIME,
+    ID_TXTPROCEVERYDAYSTART,
+    ID_TXTPROCEVERYDAYSTOP,
+    ID_TXTPROCFRIDAYSTART,
+    ID_TXTPROCFRIDAYSTOP,
+    ID_TXTPROCIDLEFOR,
+    ID_TXTPROCMONDAYSTART,
+    ID_TXTPROCMONDAYSTOP,
+    ID_TXTPROCSATURDAYSTART,
+    ID_TXTPROCSATURDAYSTOP,
+    ID_TXTPROCSUNDAYSTART,
+    ID_TXTPROCSUNDAYSTOP,
+    ID_TXTPROCSWITCHEVERY,
+    ID_TXTPROCTHURSDAYSTART,
+    ID_TXTPROCTHURSDAYSTOP,
+    ID_TXTPROCTUESDAYSTART,
+    ID_TXTPROCTUESDAYSTOP,
+    ID_TXTPROCUSEPROCESSORS,
+    ID_TXTPROCWEDNESDAYSTART,
+    ID_TXTPROCWEDNESDAYSTOP,
+    ID_CHKGPUPROCINUSE,
+    ID_TXTMAXLOAD,
+    ID_DAILY_XFER_LIMIT_MB,
+    ID_DAILY_XFER_PERIOD_DAYS,
+    ID_ADV_PREFS_LAST
+};
 
 
 /**
@@ -115,134 +147,117 @@ class CDlgAdvPreferencesBase : public wxDialog
 {
 protected:
     wxStaticBitmap* m_bmpWarning;
-    wxStaticText* m_staticText321;
     wxButton* m_btnClear;
     wxPanel* m_panelControls;
     wxNotebook* m_Notebook;
     wxPanel* m_panelProcessor;
+    wxTextCtrl* m_txtProcUseProcessors;
+    wxTextCtrl* m_txtProcUseCPUTime;
     wxCheckBox* m_chkProcOnBatteries;
     wxCheckBox* m_chkProcInUse;
     wxCheckBox* m_chkGPUProcInUse;
     wxTextCtrl* m_txtProcIdleFor;
+    wxCheckBox* m_chkMaxLoad;
     wxTextCtrl* m_txtMaxLoad;
-    wxStaticText* m_staticText28;
-    wxStaticText* m_staticText351;
+    wxCheckBox* m_chkNetEveryDay;
+    wxCheckBox* m_chkProcEveryDay;
     wxTextCtrl* m_txtProcEveryDayStart;
-    wxStaticText* m_staticText25;
     wxTextCtrl* m_txtProcEveryDayStop;
-    wxStaticText* m_staticText36;
-    wxPanel* m_panelProcSpecialTimes;
     wxCheckBox* m_chkProcMonday;
-    wxTextCtrl* m_txtProcMonday;
+    wxTextCtrl* m_txtProcMondayStart;
+    wxTextCtrl* m_txtProcMondayStop;
     wxCheckBox* m_chkProcTuesday;
-    wxTextCtrl* m_txtProcTuesday;
+    wxTextCtrl* m_txtProcTuesdayStart;
+    wxTextCtrl* m_txtProcTuesdayStop;
     wxCheckBox* m_chkProcWednesday;
-    wxTextCtrl* m_txtProcWednesday;
+    wxTextCtrl* m_txtProcWednesdayStart;
+    wxTextCtrl* m_txtProcWednesdayStop;
     wxCheckBox* m_chkProcThursday;
-    wxTextCtrl* m_txtProcThursday;
+    wxTextCtrl* m_txtProcThursdayStart;
+    wxTextCtrl* m_txtProcThursdayStop;
     wxCheckBox* m_chkProcFriday;
-    wxTextCtrl* m_txtProcFriday;
+    wxTextCtrl* m_txtProcFridayStart;
+    wxTextCtrl* m_txtProcFridayStop;
     wxCheckBox* m_chkProcSaturday;
-    wxTextCtrl* m_txtProcSaturday;
+    wxTextCtrl* m_txtProcSaturdayStart;
+    wxTextCtrl* m_txtProcSaturdayStop;
     wxCheckBox* m_chkProcSunday;
-    wxTextCtrl* m_txtProcSunday;
-    wxStaticText* m_staticText18;
+    wxTextCtrl* m_txtProcSundayStart;
+    wxTextCtrl* m_txtProcSundayStop;
     wxTextCtrl* m_txtProcSwitchEvery;
-    wxStaticText* m_staticText19;
-    wxStaticText* m_staticText20;
-    wxTextCtrl* m_txtProcUseProcessors;
-    wxStaticText* m_staticText21;
-    wxStaticText* m_staticText22;
-    wxTextCtrl* m_txtProcUseCPUTime;
-    wxStaticText* m_staticText23;
+    wxTextCtrl* m_txtDiskWriteToDisk;
     wxPanel* m_panelNetwork;
-    wxStaticText* m_staticText32;
+    wxCheckBox* m_chkNetDownloadRate;
     wxTextCtrl* m_txtNetDownloadRate;
-    wxStaticText* m_staticText33;
-    wxStaticText* m_staticText34;
+    wxCheckBox* m_chkNetUploadRate;
     wxTextCtrl* m_txtNetUploadRate;
-    wxStaticText* m_staticText35;
 
-    wxStaticText* m_staticText_daily_xfer1;
+    wxCheckBox * m_chk_daily_xfer_limit;
     wxTextCtrl* m_txt_daily_xfer_limit_mb;
-    wxStaticText* m_staticText_daily_xfer2;
-    wxStaticText* m_staticText_daily_xfer3;
     wxTextCtrl* m_txt_daily_xfer_period_days;
-    wxStaticText* m_staticText_daily_xfer4;
 
-    wxStaticText* m_staticText30;
     wxTextCtrl* m_txtNetConnectInterval;
-    wxStaticText* m_staticText31;
-    wxStaticText* m_staticText331;
     wxTextCtrl* m_txtNetAdditionalDays;
-    wxStaticText* m_staticText341;
     wxCheckBox* m_chkNetSkipImageVerification;
     wxCheckBox* m_chkNetConfirmBeforeConnect;
     wxCheckBox* m_chkNetDisconnectWhenDone;
-    wxStaticText* m_staticText38;
     wxTextCtrl* m_txtNetEveryDayStart;
-    wxStaticText* m_staticText37;
     wxTextCtrl* m_txtNetEveryDayStop;
-    wxStaticText* m_staticText39;
-    wxPanel* m_panelNetSpecialTimes;
     wxCheckBox* m_chkNetMonday;
-    wxTextCtrl* m_txtNetMonday;
+    wxTextCtrl* m_txtNetMondayStart;
+    wxTextCtrl* m_txtNetMondayStop;
     wxCheckBox* m_chkNetTuesday;
-    wxTextCtrl* m_txtNetTuesday;
+    wxTextCtrl* m_txtNetTuesdayStart;
+    wxTextCtrl* m_txtNetTuesdayStop;
     wxCheckBox* m_chkNetWednesday;
-    wxTextCtrl* m_txtNetWednesday;
+    wxTextCtrl* m_txtNetWednesdayStart;
+    wxTextCtrl* m_txtNetWednesdayStop;
     wxCheckBox* m_chkNetThursday;
-    wxTextCtrl* m_txtNetThursday;
+    wxTextCtrl* m_txtNetThursdayStart;
+    wxTextCtrl* m_txtNetThursdayStop;
     wxCheckBox* m_chkNetFriday;
-    wxTextCtrl* m_txtNetFriday;
+    wxTextCtrl* m_txtNetFridayStart;
+    wxTextCtrl* m_txtNetFridayStop;
     wxCheckBox* m_chkNetSaturday;
-    wxTextCtrl* m_txtNetSaturday;
+    wxTextCtrl* m_txtNetSaturdayStart;
+    wxTextCtrl* m_txtNetSaturdayStop;
     wxCheckBox* m_chkNetSunday;
-    wxTextCtrl* m_txtNetSunday;
+    wxTextCtrl* m_txtNetSundayStart;
+    wxTextCtrl* m_txtNetSundayStop;
     wxPanel* m_panelDiskAndMemory;
-    wxStaticText* m_staticText40;
+    wxCheckBox* m_chkDiskMaxSpace;
     wxTextCtrl* m_txtDiskMaxSpace;
-    wxStaticText* m_staticText41;
-    wxStaticText* m_staticText42;
+    wxCheckBox* m_chkDiskLeastFree;
     wxTextCtrl* m_txtDiskLeastFree;
-    wxStaticText* m_staticText43;
-    wxStaticText* m_staticText44;
+    wxCheckBox* m_chkDiskMaxOfTotal;
     wxTextCtrl* m_txtDiskMaxOfTotal;
-    wxStaticText* m_staticText45;
-    wxStaticText* m_staticText46;
-    wxTextCtrl* m_txtDiskWriteToDisk;
-    wxStaticText* m_staticText47;
-    wxStaticText* m_staticText48;
     wxTextCtrl* m_txtDiskMaxSwap;
-    wxStaticText* m_staticText49;
-    wxStaticText* m_staticText50;
     wxTextCtrl* m_txtMemoryMaxInUse;
-    wxStaticText* m_staticText51;
-    wxStaticText* m_staticText52;
     wxTextCtrl* m_txtMemoryMaxOnIdle;
-    wxStaticText* m_staticText53;
-    wxStaticText* m_staticText54;
-    wxStaticText* m_staticText55;
     wxCheckBox* m_chkMemoryWhileSuspended;
-    wxPanel* m_panelExlusiveApps;
-    wxListBox* m_exclusiveApsListBox;
-    wxButton* m_addExclusiveAppButton;
-    wxButton* m_removeExclusiveAppButton;
-            
+    wxPanel* m_panelDailySchedules;
+    
     wxPanel* m_panelButtons;
     wxButton* m_btnOK;
     wxButton* m_btnCancel;
     wxButton* m_btnHelp;
+    
+    wxString *web_prefs_url;
 
 public:
     CDlgAdvPreferencesBase( wxWindow* parent, int id = -1, wxString title = wxT(""), wxPoint pos = wxDefaultPosition, wxSize size = wxDefaultSize, int style = wxDEFAULT_DIALOG_STYLE );
 
 private:
+    void addNewRowToSizer(wxSizer* toSizer, wxString& toolTipText,
+                wxWindow* first, wxWindow* second, wxWindow* third,
+                wxWindow* fourth=NULL, wxWindow* fifth=NULL);
     wxPanel* createProcessorTab(wxNotebook* notebook);
     wxPanel* createNetworkTab(wxNotebook* notebook);
     wxPanel* createDiskAndMemoryTab(wxNotebook* notebook);
-    wxPanel* createExclusiveAppsTab(wxNotebook* notebook);
+    wxPanel* createDailySchedulesTab(wxNotebook* notebook);
     wxSize getTextCtrlSize(wxString maxText);
+    bool doesLocalPrefsFileExist();
+    void makeStaticBoxLabelItalic(wxStaticBox* staticBox);
 };
 
 #endif //__DlgAdvPreferencesBase__
diff --git a/clientgui/DlgEventLog.cpp b/clientgui/DlgEventLog.cpp
index 79feef7..18fa8d2 100644
--- a/clientgui/DlgEventLog.cpp
+++ b/clientgui/DlgEventLog.cpp
@@ -66,14 +66,15 @@ static std::string s_strFilteredProjectName;
  * CDlgEventLog type definition
  */
 
-IMPLEMENT_DYNAMIC_CLASS( CDlgEventLog, wxDialog )
+IMPLEMENT_DYNAMIC_CLASS( CDlgEventLog, DlgEventLogBase )
 
 /*!
  * CDlgEventLog event table definition
  */
 
-BEGIN_EVENT_TABLE( CDlgEventLog, wxDialog )
+BEGIN_EVENT_TABLE( CDlgEventLog, DlgEventLogBase )
 ////@begin CDlgEventLog event table entries
+    EVT_ACTIVATE(CDlgEventLog::OnActivate)
     EVT_HELP(wxID_ANY, CDlgEventLog::OnHelp)
     EVT_BUTTON(wxID_OK, CDlgEventLog::OnOK)
     EVT_BUTTON(ID_COPYAll, CDlgEventLog::OnMessagesCopyAll)
@@ -215,7 +216,7 @@ bool CDlgEventLog::Create( wxWindow* parent, wxWindowID id, const wxString& capt
         oTempSize = size;
     }
 
-    wxDialog::Create( parent, id, caption, oTempPoint, oTempSize, style );
+    DlgEventLogBase::Create( parent, id, caption, oTempPoint, oTempSize, style );
 
     SetSizeHints(DLGEVENTLOG_MIN_WIDTH, DLGEVENTLOG_MIN_HEIGHT);
     SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS);
@@ -335,20 +336,6 @@ void CDlgEventLog::CreateControls()
     wxButton* itemButton44 = new wxButton(this, wxID_OK, _("&Close"),  wxDefaultPosition, wxDefaultSize);
     itemBoxSizer4->Add(itemButton44, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-#ifndef __WXMAC__
-    wxContextHelpButton* itemButton45 = new wxContextHelpButton(this);
-    itemBoxSizer4->Add(itemButton45, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-#else
-	wxButton* itemButton45 = new wxButton(this, ID_SIMPLE_HELP, _("&Help"), wxDefaultPosition, wxDefaultSize);
-    wxString helpTip;
-    helpTip.Printf(_("Get help with %s"), pSkinAdvanced->GetApplicationShortName().c_str());
-    itemButton45->SetHelpText(helpTip);
-#ifdef wxUSE_TOOLTIPS
-	itemButton45->SetToolTip(helpTip);
-#endif
-    itemBoxSizer4->Add(itemButton45, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-#endif
-
     SetFilterButtonText(); 
 }
 
@@ -395,6 +382,16 @@ void CDlgEventLog::SetTextColor() {
 
 
 /*!
+ * wxEVT_ACTIVATE event handler for ID_DLGMESSAGES
+ */
+
+void CDlgEventLog::OnActivate(wxActivateEvent& event) {
+    bool isActive = event.GetActive();
+    if (isActive) wxGetApp().SetEventLogWasActive(true);
+    event.Skip();
+}
+
+/*!
  * wxEVT_HELP event handler for ID_DLGMESSAGES
  */
 
diff --git a/clientgui/DlgEventLog.h b/clientgui/DlgEventLog.h
index e429b74..e53e9f6 100644
--- a/clientgui/DlgEventLog.h
+++ b/clientgui/DlgEventLog.h
@@ -74,7 +74,16 @@ class CDlgEventLogListCtrl;
 #define wxFIXED_MINSIZE 0
 #endif
 
-class CDlgEventLog : public wxDialog
+// To work around a Linux bug in wxWidgets 3.0 which prevents
+// bringing the main frame forward on top of a modeless dialog,
+// the Event Log is now a wxFrame on Linux only.
+#ifdef __WXGTK__
+#define DlgEventLogBase wxFrame
+#else
+#define DlgEventLogBase wxDialog
+#endif
+
+class CDlgEventLog : public DlgEventLogBase
 {
     DECLARE_DYNAMIC_CLASS( CDlgEventLog )
     DECLARE_EVENT_TABLE()
@@ -100,6 +109,9 @@ public:
     /// wxEVT_HELP event handler for ID_DLGEVENTLOG
     void OnHelp( wxHelpEvent& event );
 
+    /// wxEVT_Activate event handler for ID_DLGEVENTLOG
+    void OnActivate( wxActivateEvent& event );
+
     /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK
     void OnOK( wxCommandEvent& event );
     
diff --git a/clientgui/DlgExclusiveApps.cpp b/clientgui/DlgExclusiveApps.cpp
new file mode 100644
index 0000000..36b695e
--- /dev/null
+++ b/clientgui/DlgExclusiveApps.cpp
@@ -0,0 +1,471 @@
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2014 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 "DlgExclusiveApps.h"
+#endif
+
+#include "stdwx.h"
+#include "BOINCGUIApp.h"
+#include "MainDocument.h"
+#include "BOINCBaseFrame.h"
+#include "SkinManager.h"
+#include "Events.h"
+#include "error_numbers.h"
+#include "version.h"
+#include "DlgExclusiveApps.h"
+
+
+using std::string;
+
+IMPLEMENT_DYNAMIC_CLASS(CDlgExclusiveApps, wxDialog)
+
+BEGIN_EVENT_TABLE(CDlgExclusiveApps, wxDialog)
+    EVT_COMMAND(ID_LISTBOX_EXCLAPPS,wxEVT_COMMAND_LISTBOX_SELECTED,CDlgExclusiveApps::OnExclusiveAppListEvent)
+    EVT_COMMAND(ID_LISTBOX_EXCLGPUAPPS,wxEVT_COMMAND_LISTBOX_SELECTED,CDlgExclusiveApps::OnExclusiveGPUAppListEvent)
+    //buttons
+    EVT_BUTTON(ID_ADDEXCLUSIVEAPPBUTTON,CDlgExclusiveApps::OnAddExclusiveApp)
+    EVT_BUTTON(ID_REMOVEEXCLUSIVEAPPBUTTON,CDlgExclusiveApps::OnRemoveExclusiveApp)
+    EVT_BUTTON(ID_ADDEXCLUSIVEGPUAPPBUTTON,CDlgExclusiveApps::OnAddExclusiveGPUApp)
+    EVT_BUTTON(ID_REMOVEEXCLUSIVEGPUAPPBUTTON,CDlgExclusiveApps::OnRemoveExclusiveGPUApp)
+    EVT_BUTTON(wxID_OK,CDlgExclusiveApps::OnOK)
+    EVT_BUTTON(ID_HELPBOINC,CDlgExclusiveApps::OnHelp)
+END_EVENT_TABLE()
+
+/* Constructor */
+CDlgExclusiveApps::CDlgExclusiveApps(wxWindow* parent) :
+    wxDialog( parent, ID_ANYDIALOG, wxEmptyString, wxDefaultPosition,
+    wxDefaultSize, wxDEFAULT_DIALOG_STYLE
+    ) {
+    CSkinAdvanced* pSkinAdvanced = wxGetApp().GetSkinManager()->GetAdvanced();
+    wxASSERT(pSkinAdvanced);
+    wxASSERT(wxDynamicCast(pSkinAdvanced, CSkinAdvanced));
+
+    wxString title;
+    title.Printf(
+        _("%s - Exclusive Applications"),
+        pSkinAdvanced->GetApplicationShortName().c_str()
+    );
+
+    SetTitle(title);
+
+    m_bInInit=false;
+    m_bExclusiveAppsDataChanged=false;
+
+    wxBoxSizer* dialogSizer = new wxBoxSizer( wxVERTICAL );
+    dialogSizer->AddSpacer(10);
+
+    wxStaticBox* exclusiveAppsListStaticBox = new wxStaticBox( this, -1, _("Suspend processor and network usage when these applications are running:") );
+    wxStaticBoxSizer* exclusiveAppsListBoxSizer = new wxStaticBoxSizer( exclusiveAppsListStaticBox, wxVERTICAL );
+
+    m_exclusiveApsListBox = new wxListBox(exclusiveAppsListStaticBox, ID_LISTBOX_EXCLAPPS, wxDefaultPosition, wxSize(-1, 145), 0, NULL, wxLB_EXTENDED|wxLB_NEEDED_SB|wxLB_SORT);
+    exclusiveAppsListBoxSizer->Add(m_exclusiveApsListBox, 1, wxALL|wxEXPAND, 5);
+
+	wxBoxSizer* exclusiveAppsButtonSizer = new wxBoxSizer( wxHORIZONTAL );
+
+    m_addExclusiveAppButton = new wxButton( exclusiveAppsListStaticBox, ID_ADDEXCLUSIVEAPPBUTTON, _("Add..."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_addExclusiveAppButton->SetToolTip( _("Add an application to this list"));
+	exclusiveAppsButtonSizer->Add( m_addExclusiveAppButton, 0, wxRIGHT, 5 );
+    
+    exclusiveAppsButtonSizer->AddStretchSpacer();
+    
+    m_removeExclusiveAppButton = new wxButton( exclusiveAppsListStaticBox, ID_REMOVEEXCLUSIVEAPPBUTTON, _("Remove"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_removeExclusiveAppButton->SetToolTip( _("Remove an application from this list"));
+	exclusiveAppsButtonSizer->Add( m_removeExclusiveAppButton, 0, wxLEFT, 5 );
+
+    exclusiveAppsListBoxSizer->Add(exclusiveAppsButtonSizer, 0, wxEXPAND|wxLEFT|wxRIGHT, 25 );
+
+    dialogSizer->Add( exclusiveAppsListBoxSizer, 0, wxALL|wxEXPAND, 1 );
+
+    dialogSizer->AddSpacer(25);
+
+    wxStaticBox* exclusiveGPUAppsListStaticBox = new wxStaticBox( this, -1, _("Suspend GPU usage when these applications are running:") );
+    wxStaticBoxSizer* exclusiveGPUAppsListBoxSizer = new wxStaticBoxSizer( exclusiveGPUAppsListStaticBox, wxVERTICAL );
+
+    m_exclusiveGPUApsListBox = new wxListBox(exclusiveGPUAppsListStaticBox, ID_LISTBOX_EXCLGPUAPPS, wxDefaultPosition, wxSize(-1, 145), 0, NULL, wxLB_EXTENDED|wxLB_NEEDED_SB|wxLB_SORT);
+    exclusiveGPUAppsListBoxSizer->Add(m_exclusiveGPUApsListBox, 1, wxALL|wxEXPAND, 5);
+
+	wxBoxSizer* exclusiveGPUAppsButtonSizer = new wxBoxSizer( wxHORIZONTAL );
+
+    m_addExclusiveGPUAppButton = new wxButton( exclusiveGPUAppsListStaticBox, ID_ADDEXCLUSIVEGPUAPPBUTTON, _("Add..."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_addExclusiveGPUAppButton->SetToolTip( _("Add an application to this list"));
+	exclusiveGPUAppsButtonSizer->Add( m_addExclusiveGPUAppButton, 0, wxRIGHT, 5 );
+    
+    exclusiveGPUAppsButtonSizer->AddStretchSpacer();
+    
+    m_removeExclusiveGPUAppButton = new wxButton( exclusiveGPUAppsListStaticBox, ID_REMOVEEXCLUSIVEGPUAPPBUTTON, _("Remove"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_removeExclusiveGPUAppButton->SetToolTip( _("Remove an application from this list"));
+	exclusiveGPUAppsButtonSizer->Add( m_removeExclusiveGPUAppButton, 0, wxLEFT, 5 );
+
+    exclusiveGPUAppsListBoxSizer->Add(exclusiveGPUAppsButtonSizer, 0, wxEXPAND|wxLEFT|wxRIGHT, 25 );
+
+    dialogSizer->Add( exclusiveGPUAppsListBoxSizer, 0, wxALL|wxEXPAND, 1 );
+
+    wxBoxSizer* moreOptionsLinkSizer = new wxBoxSizer( wxHORIZONTAL );
+
+    moreOptionsLinkSizer->Add(
+        new wxStaticText(
+            this, wxID_ANY, _("For advanced options, refer to "),
+            wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT
+        ),
+        0, wxLEFT, 5
+    );
+
+    moreOptionsLinkSizer->Add(
+        new wxHyperlinkCtrl(
+            this, wxID_ANY, wxT("http://boinc.berkeley.edu/wiki/Client_configuration"),
+            wxT("http://boinc.berkeley.edu/wiki/Client_configuration"), 
+            wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE
+        ),
+#ifdef __WXMAC__
+        0, wxLEFT, 5
+#else
+        0, wxLEFT, 3
+#endif
+    );
+
+    dialogSizer->Add(moreOptionsLinkSizer, 0, wxALL, 10);
+
+    m_panelButtons = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+    wxBoxSizer* buttonSizer = new wxBoxSizer( wxHORIZONTAL );
+
+    m_btnOK = new wxButton( m_panelButtons, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_btnOK->SetToolTip( _("save all values and close the dialog") );
+    m_btnOK->SetDefault();
+    
+    buttonSizer->Add( m_btnOK, 0, wxALL, 5 );
+
+    m_btnCancel = new wxButton( m_panelButtons, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_btnCancel->SetToolTip( _("close the dialog without saving") );
+
+    buttonSizer->Add( m_btnCancel, 0, wxALL, 5 );
+
+    m_btnHelp = new wxButton( m_panelButtons, ID_HELPBOINC, _("Help"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_btnHelp->SetToolTip( _("shows the preferences web page") );
+
+    buttonSizer->Add( m_btnHelp, 0, wxALL, 5 );
+
+    m_panelButtons->SetSizer( buttonSizer );
+    m_panelButtons->Layout();
+    buttonSizer->Fit( m_panelButtons );
+    dialogSizer->Add( m_panelButtons, 0, wxALIGN_BOTTOM|wxALIGN_CENTER_HORIZONTAL|wxALL, 1 );
+
+    m_removeExclusiveAppButton->Disable();
+    m_removeExclusiveGPUAppButton->Disable();
+
+    ReadPreferenceSettings();
+
+// CAF  SetSizerAndFit(dialogSizer);
+     Layout();
+     dialogSizer->Fit( this );
+     SetSizer( dialogSizer );
+
+// CAF    Fit();
+    Centre();
+}
+
+/* destructor */
+CDlgExclusiveApps::~CDlgExclusiveApps() {
+}
+
+/* read preferences from core client and initialize control values */
+void CDlgExclusiveApps::ReadPreferenceSettings() {
+    m_bInInit=true;//prevent dialog handlers from doing anything
+    CMainDocument* pDoc = wxGetApp().GetDocument();
+    int retval;
+
+    wxASSERT(pDoc);
+    wxASSERT(wxDynamicCast(pDoc, CMainDocument));
+
+    // Get cc_config.xml file flags
+    log_flags.init();
+    config.defaults();
+    retval = pDoc->rpc.get_cc_config(config, log_flags);
+    if (!retval) {
+        for (unsigned int i=0; i<config.exclusive_apps.size(); ++i) {
+            wxString appName = wxString(config.exclusive_apps[i].c_str(), wxConvUTF8);
+            m_exclusiveApsListBox->Append(appName);
+        }
+
+        for (unsigned int i=0; i<config.exclusive_gpu_apps.size(); ++i) {
+            wxString appName = wxString(config.exclusive_gpu_apps[i].c_str(), wxConvUTF8);
+            m_exclusiveGPUApsListBox->Append(appName);
+        }
+    }
+
+    m_bInInit=false;
+}
+
+
+bool CDlgExclusiveApps::SavePreferencesSettings() {
+    if (m_bExclusiveAppsDataChanged) {
+        CMainDocument*    pDoc = wxGetApp().GetDocument();
+
+        wxASSERT(pDoc);
+        wxASSERT(wxDynamicCast(pDoc, CMainDocument));
+
+        wxArrayString appNames = m_exclusiveApsListBox->GetStrings();
+
+        config.exclusive_apps.clear();
+        for (unsigned int i=0; i<appNames.size(); ++i) {
+            std::string s = (const char*)appNames[i].mb_str();
+            config.exclusive_apps.push_back(s);
+        }
+
+       wxArrayString gpuAppNames = m_exclusiveGPUApsListBox->GetStrings();
+        config.exclusive_gpu_apps.clear();
+        for (unsigned int i=0; i<gpuAppNames.size(); ++i) {
+            std::string s = (const char*)gpuAppNames[i].mb_str();
+            config.exclusive_gpu_apps.push_back(s);
+        }
+        int retval = pDoc->rpc.set_cc_config(config, log_flags);
+        if (!retval) {
+            pDoc->rpc.read_cc_config();
+        }
+        return true;
+    }
+    return false;
+}
+
+// ------------ Event handlers starts here
+// ---- Exclusive Apps list box handler
+void CDlgExclusiveApps::OnExclusiveAppListEvent(wxCommandEvent& ev) {
+    wxArrayInt selections;
+    int numSelected;
+
+    if(!m_bInInit) {
+        numSelected = m_exclusiveApsListBox->GetSelections(selections);
+        m_removeExclusiveAppButton->Enable(numSelected > 0);
+    }
+    ev.Skip();
+}
+
+void CDlgExclusiveApps::OnExclusiveGPUAppListEvent(wxCommandEvent& ev) {
+    wxArrayInt selections;
+    int numSelected;
+
+    if(!m_bInInit) {
+        numSelected = m_exclusiveGPUApsListBox->GetSelections(selections);
+        m_removeExclusiveGPUAppButton->Enable(numSelected > 0);
+    }
+    ev.Skip();
+}
+
+// ---- command buttons handlers
+// handles Add button clicked
+void CDlgExclusiveApps::OnAddExclusiveApp(wxCommandEvent&) {
+    AddToListBox(m_exclusiveApsListBox);
+}
+
+void CDlgExclusiveApps::OnAddExclusiveGPUApp(wxCommandEvent&) {
+    AddToListBox(m_exclusiveGPUApsListBox);
+}
+
+void CDlgExclusiveApps::AddToListBox(wxListBox * theListBox) {
+    wxString strMachineName;
+    int i, j, n;
+    bool hostIsMac = false;
+    bool hostIsWin = false;
+    bool isDuplicate;
+    wxArrayString appNames;
+    wxChar *extension = wxT("");
+    wxString errmsg;
+    CMainDocument* pDoc = wxGetApp().GetDocument();
+
+    wxASSERT(pDoc);
+    wxASSERT(wxDynamicCast(pDoc, CMainDocument));
+
+    if (strstr(pDoc->state.host_info.os_name, "Darwin")) {
+        hostIsMac = true;
+        extension = wxT(".app");
+    } else if (strstr(pDoc->state.host_info.os_name, "Microsoft")) {
+        hostIsWin = true;
+        extension = wxT(".exe");
+    }
+
+    pDoc->GetConnectedComputerName(strMachineName);
+    if (pDoc->IsComputerNameLocal(strMachineName)) {
+#ifdef __WXMAC__
+        wxFileDialog picker(this, _("Applications to add"),
+            wxT("/Applications"), wxT(""), wxT("*.app"),
+            wxFD_OPEN|wxFD_FILE_MUST_EXIST|wxFD_MULTIPLE|wxFD_CHANGE_DIR
+        );
+#elif defined(__WXMSW__)
+//TODO: fill in the default directory for MSW
+        wxFileDialog picker(this, _("Applications to add"),
+            wxT("C:/Program Files"), wxT(""), wxT("*.exe"),
+            wxFD_OPEN|wxFD_FILE_MUST_EXIST|wxFD_MULTIPLE|wxFD_CHANGE_DIR
+        );
+#else
+//TODO: fill in the default directory for Linux
+        wxFileDialog picker(this, _("Applications to add"),
+            wxT("/usr/bin"), wxT(""), wxT("*"),
+            wxFD_OPEN|wxFD_FILE_MUST_EXIST|wxFD_MULTIPLE|wxFD_CHANGE_DIR
+        );
+#endif
+        if (picker.ShowModal() != wxID_OK) return;
+        picker.GetFilenames(appNames);
+
+        for (i=appNames.Count()-1; i>=0; --i) {
+#ifdef __WXMSW__
+            // Under Windows, filename may include paths if a shortcut selected
+            wxString appNameOnly = appNames[i].AfterLast('\\');
+            appNames[i] = appNameOnly;
+#endif
+            wxString directory = picker.GetDirectory();
+            wxFileName fn(directory, appNames[i]);
+            if (!fn.IsOk() || !fn.IsFileExecutable()) {
+                errmsg.Printf(_("'%s' is not an executable application."), appNames[i].c_str());
+                wxGetApp().SafeMessageBox(errmsg, _("Add Exclusive App"),
+                    wxOK | wxICON_EXCLAMATION, this
+                );
+                appNames.RemoveAt(i);
+                continue;
+            }
+        }
+    } else {
+        // We can't use file picker if connected to a remote computer,
+        // so show a dialog with textedit field so user can type app name
+        wxChar path_separator = wxT('/');
+
+        wxTextEntryDialog dlg(this, _("Name of application to add?"), _("Add exclusive app"));
+        if (hostIsMac) {
+            dlg.SetValue(extension);
+        } else if (hostIsWin) {
+            dlg.SetValue(extension);
+            path_separator = wxT('\\');
+        }
+        if (dlg.ShowModal() != wxID_OK) return;
+
+        wxString theAppName = dlg.GetValue();
+        // Strip off path if present
+        appNames.Add(theAppName.AfterLast(path_separator));
+    }
+
+    for (i=0; i<(int)appNames.Count(); ++i) {
+        // wxFileName::IsFileExecutable() doesn't seem to work on Windows,
+        // and we can only perform minimal validation on remote hosts, so
+        // check filename extension on Mac and Win
+        bool bad_name = false;
+        if (hostIsMac) {
+            bad_name = !appNames[i].EndsWith(extension);
+        } else if (hostIsWin) {
+            size_t len = appNames[i].Len();
+            size_t xl = 4;
+            if (len < xl) {
+                bad_name = true;
+            } else {
+                wxString x = appNames[i].Mid(len-xl);
+                if (x.CmpNoCase(extension) != 0) {
+                    bad_name = true;
+                }
+            }
+        }
+        if (bad_name) {
+            errmsg.Printf(_("Application names must end with '%s'"), extension);
+            wxGetApp().SafeMessageBox(errmsg, _("Add Exclusive App"),
+                wxOK | wxICON_EXCLAMATION, this
+            );
+            return;
+        }
+
+        if (hostIsMac) {
+            int suffix = appNames[i].Find('.', true);
+            if (suffix != wxNOT_FOUND) {
+                appNames[i].Truncate(suffix);
+            }
+        }
+
+        // Skip requests for duplicate entries
+        isDuplicate = false;
+        n = theListBox->GetCount();
+        for (j=0; j<n; ++j) {
+            if ((theListBox->GetString(j)).Cmp(appNames[i]) == 0) {
+                isDuplicate = true;
+                break;
+            }
+        }
+        if (isDuplicate) {
+            errmsg.Printf(_("'%s' is already in the list."), appNames[i].c_str());
+            wxGetApp().SafeMessageBox(errmsg, _("Add Exclusive App"),
+                wxOK | wxICON_EXCLAMATION, this
+            );
+            continue;
+        }
+
+        theListBox->Append(appNames[i]);
+        m_bExclusiveAppsDataChanged = true;
+    }
+}
+
+typedef int (*sortcomparefunc)(int*, int*);
+
+static int myCompareInts(int *first, int *second) {
+    return *first - *second;
+}
+// handles Remove button clicked
+void CDlgExclusiveApps::OnRemoveExclusiveApp(wxCommandEvent& ev) {
+    wxArrayInt selections;
+    int numSelected = m_exclusiveApsListBox->GetSelections(selections);
+
+    // The selection indices are returned in random order.
+    // We must sort them to ensure deleting the correct items.
+    selections.Sort((sortcomparefunc)&myCompareInts);
+    for (int i=numSelected-1; i>=0; --i) {
+        m_exclusiveApsListBox->Delete(selections[i]);
+        m_bExclusiveAppsDataChanged = true;
+    }
+    ev.Skip();
+}
+
+void CDlgExclusiveApps::OnRemoveExclusiveGPUApp(wxCommandEvent& ev) {
+    wxArrayInt selections;
+    int numSelected = m_exclusiveGPUApsListBox->GetSelections(selections);
+
+    // The selection indices are returned in random order.
+    // We must sort them to ensure deleting the correct items.
+    selections.Sort((sortcomparefunc)&myCompareInts);
+    for (int i=numSelected-1; i>=0; --i) {
+        m_exclusiveGPUApsListBox->Delete(selections[i]);
+        m_bExclusiveAppsDataChanged = true;
+    }
+    ev.Skip();
+}
+
+// handles OK button clicked
+void CDlgExclusiveApps::OnOK(wxCommandEvent& ev) {
+    SavePreferencesSettings();
+    
+    ev.Skip();
+}
+
+// handles Help button clicked
+void CDlgExclusiveApps::OnHelp(wxCommandEvent& ev) {
+    if (IsShown()) {
+
+        wxString strURL = wxGetApp().GetSkinManager()->GetAdvanced()->GetOrganizationHelpUrl();
+
+        wxString wxurl;
+        wxurl.Printf(
+            wxT("%s?target=exclusive_apps&version=%s&controlid=%d"),
+            strURL.c_str(),
+            wxString(BOINC_VERSION_STRING, wxConvUTF8).c_str(),
+            ev.GetId()
+        );
+        wxLaunchDefaultBrowser(wxurl);
+    }
+}
diff --git a/clientgui/DlgExclusiveApps.h b/clientgui/DlgExclusiveApps.h
new file mode 100644
index 0000000..ac74a57
--- /dev/null
+++ b/clientgui/DlgExclusiveApps.h
@@ -0,0 +1,73 @@
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2014 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 _DLGEXCLUSIVEAPPS_H_
+#define _DLGEXCLUSIVEAPPS_H_
+
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "DlgExclusiveApps.cpp"
+#endif
+
+
+#include "cc_config.h"
+
+#define ID_LISTBOX_EXCLAPPS 20061
+#define ID_ADDEXCLUSIVEAPPBUTTON 20062
+#define ID_REMOVEEXCLUSIVEAPPBUTTON 20063
+#define ID_LISTBOX_EXCLGPUAPPS 20064
+#define ID_ADDEXCLUSIVEGPUAPPBUTTON 20065
+#define ID_REMOVEEXCLUSIVEGPUAPPBUTTON 20066
+
+class CDlgExclusiveApps : public wxDialog  {
+	DECLARE_DYNAMIC_CLASS( CDlgExclusiveApps )
+    DECLARE_EVENT_TABLE()
+	void ReadPreferenceSettings();
+	bool SavePreferencesSettings();
+public:
+	CDlgExclusiveApps(wxWindow* parent=NULL);
+    virtual ~CDlgExclusiveApps();
+    void OnExclusiveAppListEvent(wxCommandEvent& event);
+    void OnExclusiveGPUAppListEvent(wxCommandEvent& event);
+	void OnAddExclusiveApp(wxCommandEvent& event);
+	void OnAddExclusiveGPUApp(wxCommandEvent& event);
+    void AddToListBox(wxListBox * theListBox);
+	void OnRemoveExclusiveApp(wxCommandEvent& event);
+	void OnRemoveExclusiveGPUApp(wxCommandEvent& event);
+	void OnOK(wxCommandEvent& event);
+	void OnHelp(wxCommandEvent& event);
+private:
+    LOG_FLAGS log_flags;
+    CC_CONFIG config;
+	bool m_bExclusiveAppsDataChanged;
+	bool m_bInInit;
+    
+    wxListBox* m_exclusiveApsListBox;
+    wxListBox* m_exclusiveGPUApsListBox;
+    wxButton* m_addExclusiveAppButton;
+    wxButton* m_removeExclusiveAppButton;
+    wxButton* m_addExclusiveGPUAppButton;
+    wxButton* m_removeExclusiveGPUAppButton;
+
+    wxPanel* m_panelButtons;
+    wxButton* m_btnOK;
+    wxButton* m_btnCancel;
+    wxButton* m_btnHelp;
+
+};
+
+#endif // _DLGEXCLUSIVEAPPS_H_
+
diff --git a/clientgui/DlgHiddenColumns.cpp b/clientgui/DlgHiddenColumns.cpp
new file mode 100644
index 0000000..83f7169
--- /dev/null
+++ b/clientgui/DlgHiddenColumns.cpp
@@ -0,0 +1,334 @@
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2014 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 "DlgHiddenColumns.cpp"
+#endif
+
+#include "stdwx.h"
+#include "util.h"
+#include "DlgHiddenColumns.h"
+#include "BOINCGUIApp.h"
+#include "Events.h"
+#include "error_numbers.h"
+#include "gui_rpc_client.h"
+#include "SkinManager.h"
+#include "MainDocument.h"
+#include "AdvancedFrame.h"
+#include "BOINCBaseView.h"
+#include "BOINCListCtrl.h"
+
+#define DLGDIAGNOSTICS_INITIAL_WIDTH ADJUSTFORXDPI(480)
+#define DLGDIAGNOSTICS_INITIAL_HEIGHT ADJUSTFORYDPI(480)
+#define DLGDIAGNOSTICS_MIN_WIDTH ADJUSTFORXDPI(400)
+#define DLGDIAGNOSTICS_MIN_HEIGHT ADJUSTFORYDPI(400)
+
+IMPLEMENT_DYNAMIC_CLASS(CDlgHiddenColumns, wxDialog)
+
+BEGIN_EVENT_TABLE(CDlgHiddenColumns, wxDialog)
+    EVT_SIZE(CDlgHiddenColumns::OnSize)
+    EVT_BUTTON(wxID_OK,CDlgHiddenColumns::OnOK)
+    EVT_BUTTON(ID_DEFAULTSBTN,CDlgHiddenColumns::OnSetDefaults)
+    EVT_CHECKBOX(wxID_ANY, CDlgHiddenColumns::OnCheckboxClick )
+
+
+END_EVENT_TABLE()
+
+/* Constructor */
+CDlgHiddenColumns::CDlgHiddenColumns(wxWindow* parent) :
+    wxDialog( parent, ID_ANYDIALOG, wxEmptyString, wxDefaultPosition,
+                wxSize( DLGDIAGNOSTICS_INITIAL_WIDTH,DLGDIAGNOSTICS_INITIAL_HEIGHT ),
+                wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER
+            ) {
+
+    CSkinAdvanced*     pSkinAdvanced = wxGetApp().GetSkinManager()->GetAdvanced();
+    wxASSERT(pSkinAdvanced);
+    wxASSERT(wxDynamicCast(pSkinAdvanced, CSkinAdvanced));
+
+    wxString title;
+    title.Printf(
+        _("%s Column Selection"),
+        pSkinAdvanced->GetApplicationShortName().c_str()
+    );
+
+    SetTitle(title);
+    
+    SetSizeHints(DLGDIAGNOSTICS_MIN_WIDTH, DLGDIAGNOSTICS_MIN_HEIGHT);
+    SetExtraStyle( GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY );
+    
+    wxBoxSizer* bSizer1 = new wxBoxSizer( wxVERTICAL );
+    m_headingSizer = new wxGridSizer( 1 );
+    
+    m_headingText.Printf(
+        _("Select which columns %s should show."),
+        pSkinAdvanced->GetApplicationShortName().c_str()
+    );
+    
+    m_heading = new wxStaticText(this, wxID_ANY, m_headingText);
+
+    m_headingSizer->Add(m_heading, 1, wxLEFT | wxRIGHT, 25);
+
+    bSizer1->AddSpacer(7);
+    bSizer1->Add( m_headingSizer, 0, wxEXPAND | wxALL, 5 );
+    bSizer1->AddSpacer(7);
+
+    m_scrolledWindow = new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+    m_scrolledWindow->SetScrollRate( 5, 5 );
+
+    m_scrolledSizer = new wxBoxSizer(wxVERTICAL);
+    
+    CreateCheckboxes();
+    
+    bSizer1->Add( m_scrolledWindow, 1, wxEXPAND | wxALL, 5 );
+    
+    wxBoxSizer* buttonSizer = new wxBoxSizer( wxHORIZONTAL );
+
+    m_btnOK = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_btnOK->SetToolTip( _("Save all values and close the dialog") );
+    buttonSizer->Add( m_btnOK, 0, wxALL, 5 );
+
+    wxButton* btnDefaults = new wxButton( this, ID_DEFAULTSBTN, _("Defaults"), wxDefaultPosition, wxDefaultSize, 0 );
+    btnDefaults->SetToolTip( _("Restore default settings") );
+    buttonSizer->Add( btnDefaults, 0, wxALL, 5 );
+
+    wxButton* btnCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
+    btnCancel->SetToolTip( _("Close the dialog without saving") );
+    buttonSizer->Add( btnCancel, 0, wxALL, 5 );
+
+    btnCancel->SetDefault();
+    bSizer1->Add( buttonSizer, 0, wxALIGN_RIGHT | wxALL, 15 );
+    
+    SetSizer( bSizer1 );
+    
+    RestoreState();
+    Layout();
+    Center( wxBOTH );
+    
+#if defined(__WXMSW__) || defined(__WXGTK__)
+    SetDoubleBuffered(true);
+#endif
+}
+
+// destructor
+CDlgHiddenColumns::~CDlgHiddenColumns() {
+    unsigned int i, count;
+
+    SaveState();
+
+    count = m_checkbox_list.size();
+    for (i=0; i<count; ++i) {
+        std::vector <wxCheckBox*> *checkbox_list = m_checkbox_list[i];
+        checkbox_list->clear();
+        delete checkbox_list;
+    }
+    m_checkbox_list.clear();
+    m_pBOINCBaseView.clear();
+}
+
+
+void CDlgHiddenColumns::CreateCheckboxes() {
+    int i, stdCount, actualCount;
+    bool val;
+    CAdvancedFrame* pFrame = (CAdvancedFrame*)GetParent();
+    wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame));
+    
+    wxNotebook* pNotebook = pFrame->GetNotebook();
+    wxASSERT(pNotebook);
+
+    actualCount = m_checkbox_list.size();
+    for (i=0; i<actualCount; ++i) {
+        std::vector <wxCheckBox*> *checkbox_list = m_checkbox_list[i];
+        checkbox_list->clear();
+        delete checkbox_list;
+    }
+    m_checkbox_list.clear();
+    
+    wxWindow*       pwndNotebookPage = NULL;
+    CBOINCBaseView* pView = NULL;
+    long            iIndex;
+    long            iPageCount;
+
+    iPageCount = (long)pNotebook->GetPageCount();
+
+    for (iIndex = 0; iIndex < iPageCount; iIndex++) {
+        pwndNotebookPage = pNotebook->GetPage(iIndex);
+        wxASSERT(wxDynamicCast(pwndNotebookPage, CBOINCBaseView));
+
+        pView = wxDynamicCast(pwndNotebookPage, CBOINCBaseView);
+        wxASSERT(pView);
+
+        CBOINCListCtrl* listPane = pView->GetListCtrl();
+        if (!listPane) continue;
+
+        m_pBOINCBaseView.push_back(pView);
+        
+        std::vector <wxCheckBox*> *checkbox_list = new std::vector <wxCheckBox*>;
+
+        wxStaticBox* tabStaticBox = new wxStaticBox(m_scrolledWindow, -1, pView->GetViewDisplayName());
+        wxStaticBoxSizer* tabStaticBoxSizer = new wxStaticBoxSizer( tabStaticBox, wxVERTICAL );
+        wxGridSizer* checkboxSizer = new wxGridSizer(2, wxSize(0,3));
+
+        stdCount = pView->m_aStdColNameOrder->GetCount();
+        for (i=0; i<stdCount; ++i) {
+            wxString columnLabel = pView->m_aStdColNameOrder->Item(i);
+            wxCheckBox* ckbox = new wxCheckBox(tabStaticBox, wxID_ANY, columnLabel);
+            checkboxSizer->Add(ckbox, 0, wxLEFT, 25);
+            val = false;
+            if (pView->m_iColumnIDToColumnIndex[i] >= 0) val = true;
+            ckbox->SetValue(val);
+            checkbox_list->push_back(ckbox);
+        }
+        m_checkbox_list.push_back(checkbox_list);
+        
+        tabStaticBoxSizer->Add(checkboxSizer, 0, wxEXPAND, 1 );
+        m_scrolledSizer->Add(tabStaticBoxSizer, 0, wxEXPAND, 1 );
+    }
+
+    m_scrolledWindow->SetSizer( m_scrolledSizer );
+    m_scrolledWindow->Layout();
+    m_scrolledSizer->Fit( m_scrolledWindow );
+}
+
+
+/* saves dialog size and (on Mac) position */
+bool CDlgHiddenColumns::SaveState() {
+    wxConfigBase*   pConfig = wxConfigBase::Get(FALSE);
+
+    wxASSERT(pConfig);
+    if (!pConfig) return false;
+
+    pConfig->SetPath("/DlgHiddenColumns/");
+    pConfig->Write(wxT("Width"), GetSize().GetWidth());
+    pConfig->Write(wxT("Height"), GetSize().GetHeight());
+
+    pConfig->Flush();
+    
+    return true;
+}
+
+/* restores former dialog size and (on Mac) position */
+bool CDlgHiddenColumns::RestoreState() {
+    wxConfigBase*   pConfig = wxConfigBase::Get(FALSE);
+    int                iWidth, iHeight;
+
+    wxASSERT(pConfig);
+    if (!pConfig) return false;
+
+    pConfig->SetPath("/DlgHiddenColumns/");
+
+    pConfig->Read(wxT("Width"), &iWidth, DLGDIAGNOSTICS_INITIAL_WIDTH);
+    pConfig->Read(wxT("Height"), &iHeight, DLGDIAGNOSTICS_INITIAL_HEIGHT);
+
+    // Guard against a rare situation where registry values are zero
+    if ((iWidth < 50) && (iWidth != wxDefaultCoord)) iWidth = DLGDIAGNOSTICS_INITIAL_WIDTH;
+    if ((iHeight < 50) && (iHeight != wxDefaultCoord)) iHeight = DLGDIAGNOSTICS_INITIAL_HEIGHT;
+
+    // Set size to saved values or defaults if no saved values
+    SetSize(std::max(iWidth, DLGDIAGNOSTICS_MIN_WIDTH), std::max(iHeight, DLGDIAGNOSTICS_MIN_HEIGHT));
+
+    return true;
+}
+
+
+void CDlgHiddenColumns::OnSize(wxSizeEvent& event) {
+    m_heading->SetLabel(m_headingText);
+    m_heading->Wrap(m_headingSizer->GetSize().GetWidth()-50);
+    m_headingSizer->Fit(m_heading);
+    Layout();
+    SaveState();
+    Refresh();
+    
+    event.Skip();
+}
+
+
+void CDlgHiddenColumns::OnCheckboxClick(wxCommandEvent& event){
+    bool bAllOffInGroup, bEnableOK = true;
+    
+    int actualCount = m_checkbox_list.size();
+    for (int i=0; i<actualCount; ++i) {
+        std::vector <wxCheckBox*> *checkbox_list = m_checkbox_list[i];
+        bAllOffInGroup = true;
+        for (int j=0; j<checkbox_list->size(); ++j) {
+            wxCheckBox* ckbox = (*checkbox_list)[j];
+            if (ckbox->GetValue()) {
+                bAllOffInGroup = false;
+                break;
+            }
+        }
+        if (bAllOffInGroup) {
+            bEnableOK =  false;
+            break;
+        }
+    }
+    m_btnOK->Enable(bEnableOK);
+    
+    event.Skip();
+}
+
+
+void CDlgHiddenColumns::OnOK(wxCommandEvent& event) {
+    int actualCount = m_checkbox_list.size();
+    wxASSERT (m_pBOINCBaseView.size() == actualCount);
+    
+    for (int i=0; i<actualCount; ++i) {
+        CBOINCBaseView* pView = m_pBOINCBaseView[i];
+        std::vector <wxCheckBox*> *checkbox_list = m_checkbox_list[i];
+        wxArrayString orderArray;
+        for (int j=0; j<checkbox_list->size(); ++j) {
+            wxCheckBox* ckbox = (*checkbox_list)[j];
+            if (ckbox->GetValue()) {
+                wxString name = ckbox->GetLabel();
+                orderArray.Add(name);
+            }
+        }
+        
+        CBOINCListCtrl* listPane = pView->GetListCtrl();
+        listPane->SetListColumnOrder(orderArray);
+ 
+        // Write the new column configuration to the registry
+        wxConfigBase* pConfig = wxConfigBase::Get(false);
+        pConfig->SetPath(wxT("/") + pView->GetViewName());
+        listPane->OnSaveState(pConfig);
+    }
+
+    event.Skip();
+}
+
+
+void CDlgHiddenColumns::OnSetDefaults(wxCommandEvent& ) {
+    wxMessageDialog* dlg = new wxMessageDialog(this, _("Are you sure you want to reset all list columns to the default configurations?"),
+                    _("Confirm defaults"), wxOK|wxCANCEL|wxCENTRE, wxDefaultPosition);
+        
+    if (dlg->ShowModal() != wxID_OK) return;
+    
+    int count = m_pBOINCBaseView.size();
+    for (int i=0; i<count; ++i) {
+        CBOINCBaseView* pView = m_pBOINCBaseView[i];
+        CBOINCListCtrl* listPane = pView->GetListCtrl();
+    
+        listPane->SetListColumnOrder(*(pView->m_aStdColNameOrder));
+        listPane->SetDefaultColumnDisplay();
+
+        // Write the new column configuration to the registry
+        wxConfigBase* pConfig = wxConfigBase::Get(false);
+        pConfig->SetPath(wxT("/") + pView->GetViewName());
+        listPane->OnSaveState(pConfig);
+    }
+
+    EndModal(0);
+}
diff --git a/clientgui/DlgHiddenColumns.h b/clientgui/DlgHiddenColumns.h
new file mode 100644
index 0000000..116bb86
--- /dev/null
+++ b/clientgui/DlgHiddenColumns.h
@@ -0,0 +1,61 @@
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2014 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 _DLGHIDDENCOLUMNS_H_
+#define _DLGHIDDENCOLUMNS_H_
+
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "DlgHiddenColumns.cpp"
+#endif
+
+#include "BOINCBaseView.h"
+
+#define ID_DEFAULTSBTN 10001
+
+class CDlgHiddenColumns : public wxDialog {
+	DECLARE_DYNAMIC_CLASS( CDlgHiddenColumns )
+    DECLARE_EVENT_TABLE()
+public:
+	CDlgHiddenColumns(wxWindow* parent=NULL);
+	virtual ~CDlgHiddenColumns();
+
+    void OnSize(wxSizeEvent& event);
+	void OnOK(wxCommandEvent& event);
+	void OnSetDefaults(wxCommandEvent& event);
+    void OnCheckboxClick(wxCommandEvent& event);
+    
+private:
+	//generic layout methods
+    bool SaveState();
+    bool RestoreState();
+    
+    void CreateCheckboxes();
+    
+    wxButton*           m_btnOK;
+    wxGridSizer*        m_headingSizer;
+    std::vector <std::vector <wxCheckBox*>*> m_checkbox_list;
+    std::vector <CBOINCBaseView*> m_pBOINCBaseView;
+
+protected:
+    wxString            m_headingText;
+    wxStaticText*       m_heading;
+    wxScrolledWindow*   m_scrolledWindow;
+    wxBoxSizer*         m_scrolledSizer;
+};
+
+#endif // _DLGHIDDENCOLUMNS_H_
+
diff --git a/clientgui/Events.h b/clientgui/Events.h
index 3927200..dca4dcd 100644
--- a/clientgui/Events.h
+++ b/clientgui/Events.h
@@ -87,7 +87,8 @@
 #define ID_EVENTLOG                             6058
 #define ID_LAUNCHNEWINSTANCE                    6059
 #define ID_DIAGNOSTICLOGFLAGS                   6060
-#define ID_TEST1CLICKATTACH                     6061
+#define ID_SELECTCOLUMNS                        6061
+#define ID_EXCLUSIVE_APPS                       6063
 
 // Help Menu
 #define ID_HELPBOINC                            6035  // Locked: Used by manager_links.php
diff --git a/clientgui/MainDocument.cpp b/clientgui/MainDocument.cpp
index 2c3845e..fbf882d 100644
--- a/clientgui/MainDocument.cpp
+++ b/clientgui/MainDocument.cpp
@@ -1567,7 +1567,7 @@ RUNNING_GFX_APP* CMainDocument::GetRunningGraphicsApp(
     
     for( gfx_app_iter = m_running_gfx_apps.begin(); 
         gfx_app_iter != m_running_gfx_apps.end(); 
-        gfx_app_iter++
+        ++gfx_app_iter
     ) {
          if ((slot >= 0) && ((*gfx_app_iter).slot != slot)) continue;
 
@@ -2500,18 +2500,15 @@ wxString result_description(RESULT* result, bool show_resources) {
             strBuffer += _("Project suspended by user");
         } else if (result->suspended_via_gui) {
             strBuffer += _("Task suspended by user");
-        } else if (status.task_suspend_reason && !throttled) {
+        } else if (status.task_suspend_reason && !throttled && result->active_task_state != PROCESS_EXECUTING) {
+            // an NCI process can be running even though computation is suspended
+            // (because of <dont_suspend_nci>
+            //
             strBuffer += _("Suspended - ");
             strBuffer += suspend_reason_wxstring(status.task_suspend_reason);
-            if (strlen(result->resources) && show_resources) {
-                strBuffer += wxString(wxT(" (")) + wxString(result->resources, wxConvUTF8) + wxString(wxT(")"));
-            }
         } else if (status.gpu_suspend_reason && uses_gpu(result)) {
             strBuffer += _("GPU suspended - ");
             strBuffer += suspend_reason_wxstring(status.gpu_suspend_reason);
-            if (strlen(result->resources) && show_resources) {
-                strBuffer += wxString(wxT(" (")) + wxString(result->resources, wxConvUTF8) + wxString(wxT(")"));
-            }
         } else if (result->active_task) {
             if (result->too_large) {
                 strBuffer += _("Waiting for memory");
@@ -2527,9 +2524,6 @@ wxString result_description(RESULT* result, bool show_resources) {
             } else if (result->scheduler_state == CPU_SCHED_UNINITIALIZED) {
                 strBuffer += _("Ready to start");
             }
-            if (strlen(result->resources)>1 && show_resources) {
-                strBuffer += wxString(wxT(" (")) + wxString(result->resources, wxConvUTF8) + wxString(wxT(")"));
-            }
         } else {
             strBuffer += _("Ready to start");
         }
@@ -2594,6 +2588,9 @@ wxString result_description(RESULT* result, bool show_resources) {
         }
         break;
     }
+    if (strlen(result->resources)>1 && show_resources) {
+        strBuffer += wxString(wxT(" (")) + wxString(result->resources, wxConvUTF8) + wxString(wxT(")"));
+    }
     return strBuffer;
 }
 
diff --git a/clientgui/MainDocument.h b/clientgui/MainDocument.h
index 028537d..8fe4b67 100644
--- a/clientgui/MainDocument.h
+++ b/clientgui/MainDocument.h
@@ -224,7 +224,7 @@ private:
 public:
     int                         CachedProjectStatusUpdate(bool bForce = false);
     PROJECT*                    project(unsigned int);
-	PROJECT* project(char* url);
+	PROJECT*                    project(char* url);
     float                       m_fProjectTotalResourceShare;
 
     int                         GetProjectCount();
diff --git a/clientgui/Makefile.am b/clientgui/Makefile.am
index 3fe999d..79408c6 100644
--- a/clientgui/Makefile.am
+++ b/clientgui/Makefile.am
@@ -50,8 +50,10 @@ boincmgr_SOURCES = \
     DlgDiagnosticLogFlags.cpp \
     DlgEventLog.cpp \
     DlgEventLogListCtrl.cpp \
+    DlgExclusiveApps.cpp \
     DlgExitMessage.cpp \
     DlgGenericMessage.cpp \
+    DlgHiddenColumns.cpp \
     DlgItemProperties.cpp \
     DlgOptions.cpp \
     DlgSelectComputer.cpp \
diff --git a/clientgui/ProjectProcessingPage.cpp b/clientgui/ProjectProcessingPage.cpp
index 305f84b..4dea5f2 100644
--- a/clientgui/ProjectProcessingPage.cpp
+++ b/clientgui/ProjectProcessingPage.cpp
@@ -149,14 +149,14 @@ void CProjectProcessingPage::CreateControls()
     itemFlexGridSizer40->AddGrowableCol(2);
     itemBoxSizer37->Add(itemFlexGridSizer40, 0, wxGROW|wxALL, 5);
 
-    itemFlexGridSizer40->Add(5, 5, 0, wxGROW|wxGROW|wxALL, 5);
+    itemFlexGridSizer40->Add(5, 5, 0, wxGROW|wxALL, 5);
 
     wxBitmap itemBitmap41(GetBitmapResource(wxT("res/wizprogress01.xpm")));
     m_pProgressIndicator = new wxStaticBitmap;
     m_pProgressIndicator->Create( itemWizardPage36, ID_PROGRESSCTRL, itemBitmap41, wxDefaultPosition, wxSize(ADJUSTFORXDPI(184), ADJUSTFORYDPI(48)), 0 );
     itemFlexGridSizer40->Add(m_pProgressIndicator, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    itemFlexGridSizer40->Add(5, 5, 0, wxGROW|wxGROW|wxALL, 5);
+    itemFlexGridSizer40->Add(5, 5, 0, wxGROW|wxALL, 5);
 ////@end CProjectProcessingPage content construction
 }
   
diff --git a/clientgui/SkinManager.cpp b/clientgui/SkinManager.cpp
index badfcaf..66d3dc4 100644
--- a/clientgui/SkinManager.cpp
+++ b/clientgui/SkinManager.cpp
@@ -410,7 +410,7 @@ bool CSkinSimple::InitializeDelayedValidation() {
         wxT("background"), (const char**)background_image_xpm, wxT("211:211:211")
     );
     m_DialogBackgroundImage.SetDefaults(
-        wxT("dialog background"), (const char**)dialog_background_image_xpm, wxT("211:211:211")
+        wxT("dialog background"), (const char**)dialog_background_image_xpm, wxT("255:255:255")
     );
     m_ProjectImage.SetDefaults(
         wxT("project"), (const char**)project_image_xpm
diff --git a/clientgui/SkinManager.h b/clientgui/SkinManager.h
index 232f884..5c73ee2 100644
--- a/clientgui/SkinManager.h
+++ b/clientgui/SkinManager.h
@@ -22,6 +22,7 @@
 #pragma interface "SkinManager.cpp"
 #endif
 
+#include "miofile.h"
 
 class CSkinItem : public wxObject
 {
diff --git a/clientgui/ViewProjects.cpp b/clientgui/ViewProjects.cpp
index f978343..f6080e9 100644
--- a/clientgui/ViewProjects.cpp
+++ b/clientgui/ViewProjects.cpp
@@ -34,7 +34,14 @@
 
 #include "res/proj.xpm"
 
-
+// Column IDs must be equal to the column's default
+// position (left to right, zero-based) when all
+// columns are shown.  However, any column may be
+// hidden, either by default or by the user.
+// (On MS Windows only, the user can also rearrange
+// the columns from the default order.)
+//
+// Column IDs
 #define COLUMN_PROJECT              0
 #define COLUMN_ACCOUNTNAME          1
 #define COLUMN_TEAMNAME             2
@@ -43,6 +50,16 @@
 #define COLUMN_RESOURCESHARE        5
 #define COLUMN_STATUS               6
 
+// DefaultShownColumns is an array containing the
+// columnIDs of the columns to be shown by default,
+// in ascending order.  It may or may not include
+// all columns.
+//
+// For now, show all columns by default
+static int DefaultShownColumns[] = { COLUMN_PROJECT, COLUMN_ACCOUNTNAME, COLUMN_TEAMNAME,
+                                COLUMN_TOTALCREDIT, COLUMN_AVGCREDIT,
+                                COLUMN_RESOURCESHARE, COLUMN_STATUS};
+
 // groups that contain buttons
 #define GRP_TASKS    0
 #define GRP_WEBSITES 1
@@ -114,7 +131,7 @@ static bool CompareViewProjectsItems(int iRowIndex1, int iRowIndex2) {
         return 0;
     }
 
-    switch (myCViewProjects->m_iSortColumn) {
+    switch (myCViewProjects->m_iSortColumnID) {
     case COLUMN_PROJECT:
         result = project1->m_strProjectName.CmpNoCase(project2->m_strProjectName);
         break;
@@ -220,15 +237,38 @@ CViewProjects::CViewProjects(wxNotebook* pNotebook) :
     // Create Task Pane Items
     m_pTaskPane->UpdateControls();
 
-    // Create List Pane Items
-    m_pListPane->InsertColumn(COLUMN_PROJECT, _("Project"), wxLIST_FORMAT_LEFT, 150);
-    m_pListPane->InsertColumn(COLUMN_ACCOUNTNAME, _("Account"), wxLIST_FORMAT_LEFT, 80);
-    m_pListPane->InsertColumn(COLUMN_TEAMNAME, _("Team"), wxLIST_FORMAT_LEFT, 80);
-    m_pListPane->InsertColumn(COLUMN_TOTALCREDIT, _("Work done"), wxLIST_FORMAT_RIGHT, 80);
-    m_pListPane->InsertColumn(COLUMN_AVGCREDIT, _("Avg. work done"), wxLIST_FORMAT_RIGHT, 80);
-    m_pListPane->InsertColumn(COLUMN_RESOURCESHARE, _("Resource share"), wxLIST_FORMAT_CENTRE, 85);
-    m_pListPane->InsertColumn(COLUMN_STATUS, _("Status"), wxLIST_FORMAT_LEFT, 150);
-
+    // m_aStdColNameOrder is an array of all column heading labels
+    // (localized) in order of ascending Column ID.
+    // Once initialized, it should not be modified.
+    //
+    m_aStdColNameOrder = new wxArrayString;
+    m_aStdColNameOrder->Insert(_("Project"), COLUMN_PROJECT);
+    m_aStdColNameOrder->Insert(_("Account"), COLUMN_ACCOUNTNAME);
+    m_aStdColNameOrder->Insert(_("Team"), COLUMN_TEAMNAME);
+    m_aStdColNameOrder->Insert(_("Work done"), COLUMN_TOTALCREDIT);
+    m_aStdColNameOrder->Insert(_("Avg. work done"), COLUMN_AVGCREDIT);
+    m_aStdColNameOrder->Insert(_("Resource share"), COLUMN_RESOURCESHARE);
+    m_aStdColNameOrder->Insert(_("Status"), COLUMN_STATUS);
+
+    // m_aStdColNameOrder 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.
+    //
+    m_iStdColWidthOrder.Clear();
+    m_iStdColWidthOrder.Insert(150, COLUMN_PROJECT);
+    m_iStdColWidthOrder.Insert(80, COLUMN_ACCOUNTNAME);
+    m_iStdColWidthOrder.Insert(80, COLUMN_TEAMNAME);
+    m_iStdColWidthOrder.Insert(80, COLUMN_TOTALCREDIT);
+    m_iStdColWidthOrder.Insert(80, COLUMN_AVGCREDIT);
+    m_iStdColWidthOrder.Insert(80, COLUMN_RESOURCESHARE);
+    m_iStdColWidthOrder.Insert(80, COLUMN_STATUS);
+
+    wxASSERT(m_iStdColWidthOrder.size() == m_aStdColNameOrder->size());
+
+    m_iDefaultShownColumns = DefaultShownColumns;
+    m_iNumDefaultShownColumns = sizeof(DefaultShownColumns) / sizeof(int);
     m_iProgressColumn = COLUMN_RESOURCESHARE;
  
     // Needed by static sort routine;
@@ -245,6 +285,41 @@ CViewProjects::~CViewProjects() {
 }
 
 
+// Create List Pane Items
+void CViewProjects::AppendColumn(int columnID){
+    switch(columnID) {
+        case COLUMN_PROJECT:
+            m_pListPane->AppendColumn((*m_aStdColNameOrder)[COLUMN_PROJECT],
+                    wxLIST_FORMAT_LEFT, m_iStdColWidthOrder[COLUMN_PROJECT]);
+            break;
+        case COLUMN_ACCOUNTNAME:
+            m_pListPane->AppendColumn((*m_aStdColNameOrder)[COLUMN_ACCOUNTNAME],
+                    wxLIST_FORMAT_LEFT, m_iStdColWidthOrder[COLUMN_ACCOUNTNAME]);
+            break;
+        case COLUMN_TEAMNAME:
+            m_pListPane->AppendColumn((*m_aStdColNameOrder)[COLUMN_TEAMNAME],
+                    wxLIST_FORMAT_LEFT, m_iStdColWidthOrder[COLUMN_TEAMNAME]);
+            break;
+        case COLUMN_TOTALCREDIT:
+            m_pListPane->AppendColumn((*m_aStdColNameOrder)[COLUMN_TOTALCREDIT],
+                    wxLIST_FORMAT_RIGHT, m_iStdColWidthOrder[COLUMN_TOTALCREDIT]);
+            break;
+        case COLUMN_AVGCREDIT:
+            m_pListPane->AppendColumn((*m_aStdColNameOrder)[COLUMN_AVGCREDIT],
+                    wxLIST_FORMAT_RIGHT, m_iStdColWidthOrder[COLUMN_AVGCREDIT]);
+            break;
+        case COLUMN_RESOURCESHARE:
+            m_pListPane->AppendColumn((*m_aStdColNameOrder)[COLUMN_RESOURCESHARE],
+                    wxLIST_FORMAT_CENTRE, m_iStdColWidthOrder[COLUMN_RESOURCESHARE]);
+            break;
+        case COLUMN_STATUS:
+            m_pListPane->AppendColumn((*m_aStdColNameOrder)[COLUMN_STATUS],
+                    wxLIST_FORMAT_LEFT, m_iStdColWidthOrder[COLUMN_STATUS]);
+            break;
+    }
+}
+
+
 wxString& CViewProjects::GetViewName() {
     static wxString strViewName(wxT("Projects"));
     return strViewName;
@@ -591,8 +666,8 @@ wxString CViewProjects::OnListGetItemText(long item, long column) const {
         project = NULL;
     }
 
-    if (project) {
-        switch(column) {
+    if (project && (column >= 0)) {
+        switch(m_iColumnIndexToColumnID[column]) {
             case COLUMN_PROJECT:
                 strBuffer = project->m_strProjectName;
                 break;
@@ -797,9 +872,11 @@ bool CViewProjects::SynchronizeCacheItem(wxInt32 iRowIndex, wxInt32 iColumnIndex
             return false;
     }
 
+    if (iColumnIndex < 0) return false;
+
     strDocumentText.Empty();
 
-    switch (iColumnIndex) {
+   switch (m_iColumnIndexToColumnID[iColumnIndex]) {
         case COLUMN_PROJECT:
             GetDocProjectName(m_iSortedIndexes[iRowIndex], strDocumentText);
             GetDocProjectURL(m_iSortedIndexes[iRowIndex], strDocumentText2);
diff --git a/clientgui/ViewProjects.h b/clientgui/ViewProjects.h
index c755474..28bef43 100644
--- a/clientgui/ViewProjects.h
+++ b/clientgui/ViewProjects.h
@@ -57,6 +57,7 @@ public:
 
     ~CViewProjects();
 
+    void                    AppendColumn(int columnID);
     virtual wxString&       GetViewName();
     virtual wxString&       GetViewDisplayName();
     virtual const char**    GetViewIcon();
diff --git a/clientgui/ViewResources.cpp b/clientgui/ViewResources.cpp
index 72e8022..287eaae 100644
--- a/clientgui/ViewResources.cpp
+++ b/clientgui/ViewResources.cpp
@@ -235,9 +235,6 @@ void CViewResources::OnListRender( wxTimerEvent& WXUNUSED(event) ) {
     //pDoc->disk_usage.d_allowed = 0;
 	//data for pie chart 2 (total disk usage)
 	//
-	// good source of color palettes:
-	// http://www.siteprocentral.com/cgi-bin/feed/feed.cgi
-	//
 	bool refreshTotal=false;
 	double free = pDoc->disk_usage.d_free;
 	double total = pDoc->disk_usage.d_total;
diff --git a/clientgui/ViewTransfers.cpp b/clientgui/ViewTransfers.cpp
index 0737626..34de432 100644
--- a/clientgui/ViewTransfers.cpp
+++ b/clientgui/ViewTransfers.cpp
@@ -34,6 +34,14 @@
 #include "res/xfer.xpm"
 
 
+// Column IDs must be equal to the column's default
+// position (left to right, zero-based) when all
+// columns are shown.  However, any column may be
+// hidden, either by default or by the user.
+// (On MS Windows only, the user can also rearrange
+// the columns from the default order.)
+//
+// Column IDs
 #define COLUMN_PROJECT              0
 #define COLUMN_FILE                 1
 #define COLUMN_PROGRESS             2
@@ -42,6 +50,16 @@
 #define COLUMN_SPEED                5
 #define COLUMN_STATUS               6
 
+// DefaultShownColumns is an array containing the
+// columnIDs of the columns to be shown by default,
+// in ascending order.  It may or may not include
+// all columns.
+//
+// For now, show all columns by default
+static int DefaultShownColumns[] = { COLUMN_PROJECT, COLUMN_FILE, COLUMN_PROGRESS, 
+                                COLUMN_SIZE, COLUMN_TIME, COLUMN_SPEED,
+                                COLUMN_STATUS};
+
 // buttons in the "tasks" area
 #define BTN_RETRY       0
 #define BTN_ABORT       1
@@ -100,7 +118,7 @@ static bool CompareViewTransferItems(int iRowIndex1, int iRowIndex2) {
         return 0;
     }
 
-    switch (MyCViewTransfers->m_iSortColumn) {
+    switch (MyCViewTransfers->m_iSortColumnID) {
     case COLUMN_PROJECT:
         result = transfer1->m_strProjectName.CmpNoCase(transfer2->m_strProjectName);
         break;
@@ -183,14 +201,38 @@ CViewTransfers::CViewTransfers(wxNotebook* pNotebook) :
     // Create Task Pane Items
     m_pTaskPane->UpdateControls();
 
-    // Create List Pane Items
-    m_pListPane->InsertColumn(COLUMN_PROJECT, _("Project"), wxLIST_FORMAT_LEFT, 125);
-    m_pListPane->InsertColumn(COLUMN_FILE, _("File"), wxLIST_FORMAT_LEFT, 205);
-    m_pListPane->InsertColumn(COLUMN_PROGRESS, _("Progress"), wxLIST_FORMAT_CENTRE, 60);
-    m_pListPane->InsertColumn(COLUMN_SIZE, _("Size"), wxLIST_FORMAT_LEFT, 80);
-    m_pListPane->InsertColumn(COLUMN_TIME, _("Elapsed Time"), wxLIST_FORMAT_LEFT, 80);
-    m_pListPane->InsertColumn(COLUMN_SPEED, _("Speed"), wxLIST_FORMAT_LEFT, 80);
-    m_pListPane->InsertColumn(COLUMN_STATUS, _("Status"), wxLIST_FORMAT_LEFT, 150);
+    // m_aStdColNameOrder is an array of all column heading labels
+    // (localized) in order of ascending Column ID.
+    // Once initialized, it should not be modified.
+    //
+    m_aStdColNameOrder = new wxArrayString;
+    m_aStdColNameOrder->Insert(_("Project"), COLUMN_PROJECT);
+    m_aStdColNameOrder->Insert(_("File"), COLUMN_FILE);
+    m_aStdColNameOrder->Insert(_("Progress"), COLUMN_PROGRESS);
+    m_aStdColNameOrder->Insert(_("Size"), COLUMN_SIZE);
+    m_aStdColNameOrder->Insert(_("Elapsed"), COLUMN_TIME);
+    m_aStdColNameOrder->Insert(_("Speed"), COLUMN_SPEED);
+    m_aStdColNameOrder->Insert(_("Status"), COLUMN_STATUS);
+
+    // m_aStdColNameOrder 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.
+    //
+    m_iStdColWidthOrder.Clear();
+    m_iStdColWidthOrder.Insert(125, COLUMN_PROJECT);
+    m_iStdColWidthOrder.Insert(205, COLUMN_FILE);
+    m_iStdColWidthOrder.Insert(60, COLUMN_PROGRESS);
+    m_iStdColWidthOrder.Insert(80, COLUMN_SIZE);
+    m_iStdColWidthOrder.Insert(80, COLUMN_TIME);
+    m_iStdColWidthOrder.Insert(80, COLUMN_SPEED);
+    m_iStdColWidthOrder.Insert(150, COLUMN_STATUS);
+
+    m_iDefaultShownColumns = DefaultShownColumns;
+    m_iNumDefaultShownColumns = sizeof(DefaultShownColumns) / sizeof(int);
+
+    wxASSERT(m_iStdColWidthOrder.size() == m_aStdColNameOrder->size());
 
     m_iProgressColumn = COLUMN_PROGRESS;
 
@@ -208,6 +250,41 @@ CViewTransfers::~CViewTransfers() {
 }
 
 
+// Create List Pane Items
+void CViewTransfers::AppendColumn(int columnID){
+    switch(columnID) {
+        case COLUMN_PROJECT:
+            m_pListPane->AppendColumn((*m_aStdColNameOrder)[COLUMN_PROJECT],
+                wxLIST_FORMAT_LEFT, m_iStdColWidthOrder[COLUMN_PROJECT]);
+            break;
+        case COLUMN_FILE:
+            m_pListPane->AppendColumn((*m_aStdColNameOrder)[COLUMN_FILE],
+                wxLIST_FORMAT_LEFT, m_iStdColWidthOrder[COLUMN_FILE]);
+            break;
+        case COLUMN_PROGRESS:
+            m_pListPane->AppendColumn((*m_aStdColNameOrder)[COLUMN_PROGRESS],
+                wxLIST_FORMAT_CENTRE, m_iStdColWidthOrder[COLUMN_PROGRESS]);
+            break;
+        case COLUMN_SIZE:
+            m_pListPane->AppendColumn((*m_aStdColNameOrder)[COLUMN_SIZE],
+                wxLIST_FORMAT_LEFT, m_iStdColWidthOrder[COLUMN_SIZE]);
+            break;
+        case COLUMN_TIME:
+            m_pListPane->AppendColumn((*m_aStdColNameOrder)[COLUMN_TIME],
+                wxLIST_FORMAT_LEFT, m_iStdColWidthOrder[COLUMN_TIME]);
+            break;
+        case COLUMN_SPEED:
+            m_pListPane->AppendColumn((*m_aStdColNameOrder)[COLUMN_SPEED],
+                wxLIST_FORMAT_LEFT, m_iStdColWidthOrder[COLUMN_SPEED]);
+            break;
+        case COLUMN_STATUS:
+            m_pListPane->AppendColumn((*m_aStdColNameOrder)[COLUMN_STATUS],
+                wxLIST_FORMAT_LEFT, m_iStdColWidthOrder[COLUMN_STATUS]);
+            break;
+    }
+}
+
+
 wxString& CViewTransfers::GetViewName() {
     static wxString strViewName(wxT("Transfers"));
     return strViewName;
@@ -397,8 +474,8 @@ wxString CViewTransfers::OnListGetItemText(long item, long column) const {
         transfer = NULL;
     }
 
-    if (transfer) {
-        switch(column) {
+    if (transfer && (column >= 0)) {
+        switch(m_iColumnIndexToColumnID[column]) {
         case COLUMN_PROJECT:
             strBuffer = transfer->m_strProjectName;
             break;
@@ -504,7 +581,9 @@ bool CViewTransfers::SynchronizeCacheItem(wxInt32 iRowIndex, wxInt32 iColumnInde
         return false;
     }
 
-    switch(iColumnIndex) {
+    if (iColumnIndex < 0) return false;
+
+    switch (m_iColumnIndexToColumnID[iColumnIndex]) {
         case COLUMN_PROJECT:
             GetDocProjectName(m_iSortedIndexes[iRowIndex], strDocumentText);
             GetDocProjectURL(m_iSortedIndexes[iRowIndex], strDocumentText2);
diff --git a/clientgui/ViewTransfers.h b/clientgui/ViewTransfers.h
index 16f694a..6be3850 100644
--- a/clientgui/ViewTransfers.h
+++ b/clientgui/ViewTransfers.h
@@ -56,6 +56,7 @@ public:
 
     ~CViewTransfers();
 
+    void                    AppendColumn(int columnID);
     virtual wxString&       GetViewName();
     virtual wxString&       GetViewDisplayName();
     virtual const char**    GetViewIcon();
diff --git a/clientgui/ViewWork.cpp b/clientgui/ViewWork.cpp
index 9905fd2..6238280 100644
--- a/clientgui/ViewWork.cpp
+++ b/clientgui/ViewWork.cpp
@@ -36,6 +36,14 @@
 #include "res/result.xpm"
 
 
+// Column IDs must be equal to the column's default
+// position (left to right, zero-based) when all
+// columns are shown.  However, any column may be
+// hidden, either by default or by the user.
+// (On MS Windows only, the user can also rearrange
+// the columns from the default order.)
+//
+// Column IDs
 #define COLUMN_PROJECT              0
 #define COLUMN_PROGRESS             1
 #define COLUMN_STATUS               2
@@ -45,6 +53,17 @@
 #define COLUMN_APPLICATION          6
 #define COLUMN_NAME                 7
 
+// DefaultShownColumns is an array containing the
+// columnIDs of the columns to be shown by default,
+// in ascending order.  It may or may not include
+// all columns.
+//
+// For now, show all columns by default
+static int DefaultShownColumns[] = { COLUMN_PROJECT, COLUMN_PROGRESS, COLUMN_STATUS, 
+                                COLUMN_CPUTIME, COLUMN_TOCOMPLETION,
+                                COLUMN_REPORTDEADLINE, COLUMN_APPLICATION, 
+                                COLUMN_NAME};
+
 // groups that contain buttons
 #define GRP_TASKS    0
 #define GRP_WEBSITES 1
@@ -121,7 +140,7 @@ static bool CompareViewWorkItems(int iRowIndex1, int iRowIndex2) {
         return 0;
     }
 
-    switch (myCViewWork->m_iSortColumn) {
+    switch (myCViewWork->m_iSortColumnID) {
     case COLUMN_PROJECT:
         result = work1->m_strProjectName.CmpNoCase(work2->m_strProjectName);
         break;
@@ -233,16 +252,40 @@ CViewWork::CViewWork(wxNotebook* pNotebook) :
     // Create Task Pane Items
     m_pTaskPane->UpdateControls();
 
-    // Create List Pane Items
-    m_pListPane->InsertColumn(COLUMN_PROJECT, _("Project"), wxLIST_FORMAT_LEFT, 125);
-    m_pListPane->InsertColumn(COLUMN_PROGRESS, _("Progress"), wxLIST_FORMAT_RIGHT, 60);
-    m_pListPane->InsertColumn(COLUMN_STATUS, _("Status"), wxLIST_FORMAT_LEFT, 135);
-    m_pListPane->InsertColumn(COLUMN_CPUTIME, _("Elapsed"), wxLIST_FORMAT_RIGHT, 80);
-    m_pListPane->InsertColumn(COLUMN_TOCOMPLETION, _("Remaining (estimated)"), wxLIST_FORMAT_RIGHT, 100);
-    m_pListPane->InsertColumn(COLUMN_REPORTDEADLINE, _("Deadline"), wxLIST_FORMAT_RIGHT, 150);
-    m_pListPane->InsertColumn(COLUMN_APPLICATION, _("Application"), wxLIST_FORMAT_LEFT, 95);
-    m_pListPane->InsertColumn(COLUMN_NAME, _("Name"), wxLIST_FORMAT_LEFT, 285);
-
+    // m_aStdColNameOrder is an array of all column heading labels
+    // (localized) in order of ascending Column ID.
+    // Once initialized, it should not be modified.
+    //
+    m_aStdColNameOrder = new wxArrayString;
+    m_aStdColNameOrder->Insert(_("Project"), COLUMN_PROJECT);
+    m_aStdColNameOrder->Insert(_("Progress"), COLUMN_PROGRESS);
+    m_aStdColNameOrder->Insert(_("Status"), COLUMN_STATUS);
+    m_aStdColNameOrder->Insert(_("Elapsed"), COLUMN_CPUTIME);
+    m_aStdColNameOrder->Insert(_("Remaining (estimated)"), COLUMN_TOCOMPLETION);
+    m_aStdColNameOrder->Insert(_("Deadline"), COLUMN_REPORTDEADLINE);
+    m_aStdColNameOrder->Insert(_("Application"), COLUMN_APPLICATION);
+    m_aStdColNameOrder->Insert(_("Name"), COLUMN_NAME);
+    
+    // m_aStdColNameOrder 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.
+    //
+    m_iStdColWidthOrder.Clear();
+    m_iStdColWidthOrder.Insert(125, COLUMN_PROJECT);
+    m_iStdColWidthOrder.Insert(60, COLUMN_PROGRESS);
+    m_iStdColWidthOrder.Insert(135, COLUMN_STATUS);
+    m_iStdColWidthOrder.Insert(80, COLUMN_CPUTIME);
+    m_iStdColWidthOrder.Insert(100, COLUMN_TOCOMPLETION);
+    m_iStdColWidthOrder.Insert(150, COLUMN_REPORTDEADLINE);
+    m_iStdColWidthOrder.Insert(95, COLUMN_APPLICATION);
+    m_iStdColWidthOrder.Insert(285, COLUMN_NAME);
+
+    wxASSERT(m_iStdColWidthOrder.size() == m_aStdColNameOrder->size());
+
+    m_iDefaultShownColumns = DefaultShownColumns;
+    m_iNumDefaultShownColumns = sizeof(DefaultShownColumns) / sizeof(int);
     m_iProgressColumn = COLUMN_PROGRESS;
 
     // Needed by static sort routine;
@@ -253,6 +296,45 @@ CViewWork::CViewWork(wxNotebook* pNotebook) :
 }
 
 
+// Create List Pane Items
+void CViewWork::AppendColumn(int columnID){
+    switch(columnID) {
+        case COLUMN_PROJECT:
+            m_pListPane->AppendColumn((*m_aStdColNameOrder)[COLUMN_PROJECT],
+                wxLIST_FORMAT_LEFT, m_iStdColWidthOrder[COLUMN_PROJECT]);
+            break;
+        case COLUMN_PROGRESS:
+            m_pListPane->AppendColumn((*m_aStdColNameOrder)[COLUMN_PROGRESS],
+                wxLIST_FORMAT_RIGHT, m_iStdColWidthOrder[COLUMN_PROGRESS]);
+            break;
+        case COLUMN_STATUS:
+            m_pListPane->AppendColumn((*m_aStdColNameOrder)[COLUMN_STATUS],
+                wxLIST_FORMAT_LEFT, m_iStdColWidthOrder[COLUMN_STATUS]);
+            break;
+        case COLUMN_CPUTIME:
+            m_pListPane->AppendColumn((*m_aStdColNameOrder)[COLUMN_CPUTIME],
+                wxLIST_FORMAT_RIGHT, m_iStdColWidthOrder[COLUMN_CPUTIME]);
+            break;
+        case COLUMN_TOCOMPLETION:
+            m_pListPane->AppendColumn((*m_aStdColNameOrder)[COLUMN_TOCOMPLETION],
+                wxLIST_FORMAT_RIGHT, m_iStdColWidthOrder[COLUMN_TOCOMPLETION]);
+            break;
+        case COLUMN_REPORTDEADLINE:
+            m_pListPane->AppendColumn((*m_aStdColNameOrder)[COLUMN_REPORTDEADLINE],
+                wxLIST_FORMAT_RIGHT, m_iStdColWidthOrder[COLUMN_REPORTDEADLINE]);
+            break;
+        case COLUMN_APPLICATION:
+            m_pListPane->AppendColumn((*m_aStdColNameOrder)[COLUMN_APPLICATION],
+                wxLIST_FORMAT_LEFT, m_iStdColWidthOrder[COLUMN_APPLICATION]);
+            break;
+        case COLUMN_NAME:
+            m_pListPane->AppendColumn((*m_aStdColNameOrder)[COLUMN_NAME],
+                wxLIST_FORMAT_LEFT, m_iStdColWidthOrder[COLUMN_NAME]);
+            break;
+    }
+}
+
+
 CViewWork::~CViewWork() {
     EmptyCache();
     EmptyTasks();
@@ -644,8 +726,8 @@ wxString CViewWork::OnListGetItemText(long item, long column) const {
         work = NULL;
     }
 
-    if (work) {
-        switch(column) {
+    if (work && (column >= 0)) {
+        switch(m_iColumnIndexToColumnID[column]) {
             case COLUMN_PROJECT:
                 strBuffer = work->m_strProjectName;
                 break;
@@ -904,8 +986,10 @@ bool CViewWork::SynchronizeCacheItem(wxInt32 iRowIndex, wxInt32 iColumnIndex) {
      if (GetWorkCacheAtIndex(work, m_iSortedIndexes[iRowIndex])) {
         return false;
     }
-        
-   switch (iColumnIndex) {
+    
+    if (iColumnIndex < 0) return false;
+    
+    switch (m_iColumnIndexToColumnID[iColumnIndex]) {
         case COLUMN_PROJECT:
             GetDocProjectName(m_iSortedIndexes[iRowIndex], strDocumentText);
             GetDocProjectURL(m_iSortedIndexes[iRowIndex], strDocumentText2);
diff --git a/clientgui/ViewWork.h b/clientgui/ViewWork.h
index 41231f6..74300a7 100644
--- a/clientgui/ViewWork.h
+++ b/clientgui/ViewWork.h
@@ -58,6 +58,7 @@ public:
 
     ~CViewWork();
 
+    void                    AppendColumn(int columnID);
     virtual wxString&       GetViewName();
     virtual wxString&       GetViewDisplayName();
     virtual const char**    GetViewIcon();
diff --git a/clientgui/WizardAttach.cpp b/clientgui/WizardAttach.cpp
index 94a7196..870fc56 100644
--- a/clientgui/WizardAttach.cpp
+++ b/clientgui/WizardAttach.cpp
@@ -437,7 +437,7 @@ bool CWizardAttach::HasPrevPage( wxWizardPageEx* page )
 wxWizardPageEx* CWizardAttach::_PopPageTransition() {
     wxWizardPageEx* pPage = NULL;
     if (GetCurrentPage()) {
-        if (m_PageTransition.size() > 0) {
+        if (!m_PageTransition.empty()) {
             pPage = m_PageTransition.top();
 
             wxLogTrace(wxT("Function Status"), wxT("CWizardAttach::_PopPageTransition -     Popping Page: '%p'"), pPage);
@@ -535,7 +535,7 @@ wxWizardPageEx* CWizardAttach::_PushPageTransition( wxWizardPageEx* pCurrentPage
             pPage = m_ErrProxyPage;
  
         if (pPage) {
-            if (m_PageTransition.size() == 0) {
+            if (m_PageTransition.empty()) {
                 wxLogTrace(wxT("Function Status"), wxT("CWizardAttach::_PushPageTransition -     Pushing Page: '%p'"), pPage);
                 m_PageTransition.push(NULL);
             }
diff --git a/clientgui/browser.cpp b/clientgui/browser.cpp
index 2d9c0cb..3f12c65 100644
--- a/clientgui/browser.cpp
+++ b/clientgui/browser.cpp
@@ -138,7 +138,7 @@ bool is_authenticator_valid(const std::string authenticator) {
         if (!isalpha(*it) && !isdigit(*it)) {
             return false;
         }
-        it++;
+        ++it;
     }
 
     return true;
diff --git a/clientgui/gtk/taskbarex.cpp b/clientgui/gtk/taskbarex.cpp
index fb2930d..261cbad 100644
--- a/clientgui/gtk/taskbarex.cpp
+++ b/clientgui/gtk/taskbarex.cpp
@@ -208,7 +208,7 @@ bool wxTaskBarIconEx::SetIcon(const wxIcon& icon, const wxString& message)
     gtk_status_icon_set_from_pixbuf(g_pStatusIcon, bitmap.GetPixbuf());
     if (!message.empty())
     {
-        gtk_status_icon_set_tooltip(g_pStatusIcon, message.mb_str());
+        gtk_status_icon_set_tooltip_text(g_pStatusIcon, message.mb_str());
     }
     gtk_status_icon_set_visible(g_pStatusIcon, TRUE);
 
diff --git a/clientgui/res/clock.xpm b/clientgui/res/clock.xpm
new file mode 100644
index 0000000..b6f918a
--- /dev/null
+++ b/clientgui/res/clock.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+static const char *clock_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 9 1",
+/* colors */
+"A c #D8D8D8D8D8D8",
+"B c #C8C8C8C8C8C8",
+"C c #A8A8A8A8A8A8",
+"D s bg c None",
+"E c #484848484848",
+"F c #404040404040",
+"G c #181818181818",
+"H c #000000000000",
+"I c #000000000000",
+/* pixels */
+"DDDDDDDDDDDDDDDD",
+"DDDDDDGHHHDDDDDD",
+"DDDDIHBBBBHIDDDD",
+"DDDIBBBBBBBBIDDD",
+"DDIBBBBHHBBBBIDD",
+"DDHBBBBHHBBBBHDD",
+"DHBBBBBHHBBBBBHD",
+"DHBBBBBHHCBBBBHD",
+"DHBBBBBGHHEBBBHD",
+"DHBBBBBBFHHGBBHD",
+"DDHBBBBBBAECBHDD",
+"DDIBBBBBBBBBBIDD",
+"DDDIBBBBBBBBIDDD",
+"DDDDIHBBBBHIDDDD",
+"DDDDDDHHHHDDDDDD",
+"DDDDDDDDDDDDDDDD"};
diff --git a/clientgui/res/skins/default/graphic/dialog_background_image.xpm b/clientgui/res/skins/default/graphic/dialog_background_image.xpm
index 29d6c76..f1fecf9 100644
--- a/clientgui/res/skins/default/graphic/dialog_background_image.xpm
+++ b/clientgui/res/skins/default/graphic/dialog_background_image.xpm
@@ -18,7 +18,7 @@
 static const char *dialog_background_image_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "1 1 1 1",
-"  c #D3D3D3",
+"  c #FFFFFF",
 /* pixels */
 " "
 };
diff --git a/clientgui/sg_BoincSimpleFrame.cpp b/clientgui/sg_BoincSimpleFrame.cpp
index f8a6f85..57a821f 100755
--- a/clientgui/sg_BoincSimpleFrame.cpp
+++ b/clientgui/sg_BoincSimpleFrame.cpp
@@ -114,13 +114,11 @@ CSimpleFrame::CSimpleFrame(wxString title, wxIconBundle* icons, wxPoint position
     // File menu
     wxMenu *menuFile = new wxMenu;
 
-    // %s is the application name
-    //    i.e. 'BOINC Manager', 'GridRepublic Manager'
     strMenuDescription.Printf(
         _("Close the %s window"), 
         pSkinAdvanced->GetApplicationName().c_str()
     );
-    strMenuName = _("&Close Window");
+    strMenuName = _("&Close window");
     strMenuName += wxT("\tCtrl+W");
     menuFile->Append(
         ID_CLOSEWINDOW,
@@ -147,7 +145,7 @@ CSimpleFrame::CSimpleFrame(wxString title, wxIconBundle* icons, wxPoint position
 #ifdef __WXMAC__
     menuFile->Append(
         wxID_PREFERENCES,
-        _("Preferences...")
+        _("Preferences…")
     );
 #endif
 
@@ -162,13 +160,6 @@ CSimpleFrame::CSimpleFrame(wxString title, wxIconBundle* icons, wxPoint position
     // View menu
     wxMenu *menuView = new wxMenu;
 
-    menuView->Append(
-        ID_CHANGEGUI,
-        _("Advanced View...\tCtrl+Shift+A"),
-        _("Display the advanced graphical interface.")
-    );
-
-    menuView->AppendSeparator();
 
     menuView->Append(
         ID_SGSKINSELECTOR,
@@ -181,6 +172,19 @@ CSimpleFrame::CSimpleFrame(wxString title, wxIconBundle* icons, wxPoint position
     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;
@@ -193,21 +197,17 @@ CSimpleFrame::CSimpleFrame(wxString title, wxIconBundle* icons, wxPoint position
     
     menuTools->Append(
         ID_SGOPTIONS, 
-        _("&Options..."),
+        _("&Other options..."),
         _("Configure display options and proxy settings")
     );
 
     // Help menu
     wxMenu *menuHelp = new wxMenu;
 
-    // %s is the project name
-    //    i.e. 'BOINC Manager', 'GridRepublic'
     strMenuName.Printf(
         _("%s &help"), 
         pSkinAdvanced->GetApplicationShortName().c_str()
     );
-    // %s is the project name
-    //    i.e. 'BOINC', 'GridRepublic'
     strMenuDescription.Printf(
         _("Show information about %s"), 
         pSkinAdvanced->GetApplicationShortName().c_str()
@@ -218,14 +218,10 @@ CSimpleFrame::CSimpleFrame(wxString title, wxIconBundle* icons, wxPoint position
         strMenuDescription
     );
 
-    // %s is the application name
-    //    i.e. 'BOINC Manager', 'GridRepublic Manager'
     strMenuName.Printf(
         _("&%s"), 
         pSkinAdvanced->GetApplicationName().c_str()
     );
-    // %s is the application name
-    //    i.e. 'BOINC Manager', 'GridRepublic Manager'
     strMenuDescription.Printf(
         _("Show information about the %s"), 
         pSkinAdvanced->GetApplicationName().c_str()
@@ -235,15 +231,11 @@ CSimpleFrame::CSimpleFrame(wxString title, wxIconBundle* icons, wxPoint position
         strMenuName, 
         strMenuDescription
     );
-
-    // %s is the project name
-    //    i.e. 'BOINC', 'GridRepublic'
+    menuHelp->AppendSeparator();
     strMenuName.Printf(
         _("%s &web site"), 
         pSkinAdvanced->GetApplicationShortName().c_str()
     );
-    // %s is the application name
-    //    i.e. 'BOINC Manager', 'GridRepublic Manager'
     strMenuDescription.Printf(
         _("Show information about BOINC and %s"),
         pSkinAdvanced->GetApplicationName().c_str()
@@ -253,9 +245,8 @@ CSimpleFrame::CSimpleFrame(wxString title, wxIconBundle* icons, wxPoint position
         strMenuName, 
         strMenuDescription
     );
+    menuHelp->AppendSeparator();
 
-    // %s is the project name
-    //    i.e. 'BOINC Manager', 'GridRepublic Manager'
     strMenuName.Printf(
         _("&About %s..."), 
         pSkinAdvanced->GetApplicationName().c_str()
@@ -278,7 +269,7 @@ CSimpleFrame::CSimpleFrame(wxString title, wxIconBundle* icons, wxPoint position
     );
     m_pMenubar->Append(
         menuTools,
-        _("&Tools")
+        _("&Options")
     );
     m_pMenubar->Append(
         menuHelp,
@@ -712,23 +703,25 @@ void CSimpleFrame::OnConnect(CFrameEvent& WXUNUSED(event)) {
             strProjectName, strProjectURL, strProjectAuthenticator, strProjectInstitution, strProjectDescription, strProjectKnown
         )
     ){
-        wasShown = IsShown();
-        Show();
-        wasVisible = wxGetApp().IsApplicationVisible();
-        if (!wasVisible) {
-            wxGetApp().ShowApplication(true);
-        }
+        if (!pDoc->project((char*)strProjectURL.c_str())) {
+            wasShown = IsShown();
+            Show();
+            wasVisible = wxGetApp().IsApplicationVisible();
+            if (!wasVisible) {
+                wxGetApp().ShowApplication(true);
+            }
         
-        pWizard = new CWizardAttach(this);
-
-        pWizard->RunSimpleProjectAttach(
-            wxURI::Unescape(strProjectName),
-            wxURI::Unescape(strProjectURL),
-            wxURI::Unescape(strProjectAuthenticator),
-            wxURI::Unescape(strProjectInstitution),
-            wxURI::Unescape(strProjectDescription),
-            wxURI::Unescape(strProjectKnown)
-        );
+            pWizard = new CWizardAttach(this);
+
+            pWizard->RunSimpleProjectAttach(
+                wxURI::Unescape(strProjectName),
+                wxURI::Unescape(strProjectURL),
+                wxURI::Unescape(strProjectAuthenticator),
+                wxURI::Unescape(strProjectInstitution),
+                wxURI::Unescape(strProjectDescription),
+                wxURI::Unescape(strProjectKnown)
+            );
+        }
     } else if (ami.acct_mgr_url.size() && ami.have_credentials) {
         // Fall through
         //
diff --git a/clientgui/sg_CustomControls.cpp b/clientgui/sg_CustomControls.cpp
index 2e51e33..6d58343 100644
--- a/clientgui/sg_CustomControls.cpp
+++ b/clientgui/sg_CustomControls.cpp
@@ -92,6 +92,7 @@ void CTransparentStaticText::OnPaint(wxPaintEvent& /*event*/) {
 }
 #endif
 
+
 IMPLEMENT_DYNAMIC_CLASS (CTransparentButton, wxButton)
 
 BEGIN_EVENT_TABLE(CTransparentButton, wxButton)
@@ -105,6 +106,7 @@ CTransparentButton::CTransparentButton(wxWindow* parent, wxWindowID id, const wx
     Create(parent, id, label, pos, size, style, validator, name);
 }
 
+
 bool CTransparentButton::Create(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator, const wxString& name )
 {
     bool bRetVal = wxButton::Create(parent, id, label, pos, size, style|wxTRANSPARENT_WINDOW, validator, name);
@@ -116,16 +118,90 @@ bool CTransparentButton::Create(wxWindow* parent, wxWindowID id, const wxString&
     return bRetVal;
 }
 
+
 void CTransparentButton::SetLabel(const wxString& label)
 {
     wxButton::SetLabel(label);
 }
 
+
 void CTransparentButton::OnEraseBackground(wxEraseEvent& WXUNUSED(event))
 {
 }
 
 
+IMPLEMENT_DYNAMIC_CLASS (CTransparentHyperlinkCtrl, wxHyperlinkCtrl)
+
+#ifndef __WXMAC__
+BEGIN_EVENT_TABLE(CTransparentHyperlinkCtrl, wxHyperlinkCtrl)
+    EVT_ERASE_BACKGROUND(CTransparentHyperlinkCtrl::OnEraseBackground)
+    EVT_PAINT(CTransparentHyperlinkCtrl::OnPaint)
+END_EVENT_TABLE()
+#endif
+
+CTransparentHyperlinkCtrl::CTransparentHyperlinkCtrl() {}
+
+CTransparentHyperlinkCtrl::CTransparentHyperlinkCtrl(wxWindow *parent,
+                    wxWindowID id,
+                    const wxString& label, const wxString& url,
+                    const wxPoint& pos,
+                    const wxSize& size,
+                    long style,
+                    const wxString& name,
+                    wxBitmap** parentsBgBmp)
+{
+    (void)Create(parent, id, label, url, pos, size, style, name, parentsBgBmp);
+}
+
+
+bool CTransparentHyperlinkCtrl::Create(wxWindow *parent,
+                    wxWindowID id,
+                    const wxString& label, const wxString& url,
+                    const wxPoint& pos,
+                    const wxSize& size,
+                    long style,
+                    const wxString& name,
+                    wxBitmap** parentsBgBmp)
+{
+    bool bRetVal = wxHyperlinkCtrl::Create(parent, id, label, url, pos, size, style, name);
+
+    m_pParentsBgBmp = parentsBgBmp;
+
+#ifndef __WXMAC__
+    SetBackgroundColour(parent->GetBackgroundColour());
+    SetForegroundColour(wxColour(0, 100, 225));
+    wxFont myFont = GetFont();
+    myFont.SetUnderlined(true);
+    SetFont(myFont);
+#endif
+
+    return bRetVal;
+}
+
+
+#ifndef __WXMAC__
+void CTransparentHyperlinkCtrl::OnEraseBackground(wxEraseEvent& event)
+{
+    if (m_pParentsBgBmp && *m_pParentsBgBmp) {
+        wxMemoryDC memDC(**m_pParentsBgBmp);
+        wxSize sz = GetClientSize();
+        wxDC *dc = event.GetDC();
+        wxCoord x=0, y=0, xx, yy;
+        wxWindow* win = this;
+        do {
+            win->GetPosition(&xx, &yy);
+            x += xx;
+            y += yy;
+            win = win->GetParent();
+        } while (!win->IsTopLevel());
+        dc->Blit(0, 0, sz.GetWidth(), sz.GetHeight(), &memDC, x, y, wxCOPY);
+    } else {
+        event.Skip();
+    }
+}                           								
+#endif
+
+
 IMPLEMENT_DYNAMIC_CLASS (CTransparentStaticTextAssociate, wxPanel)
 
 BEGIN_EVENT_TABLE(CTransparentStaticTextAssociate, wxPanel)
@@ -220,6 +296,105 @@ void CTransparentStaticTextAssociate::OnMouse(wxMouseEvent& event) {
 }
 
 
+#ifdef __WXMSW__
+IMPLEMENT_DYNAMIC_CLASS (CTransparentStaticBitmap, wxStaticText)
+
+BEGIN_EVENT_TABLE(CTransparentStaticBitmap, wxPanel)
+    EVT_ERASE_BACKGROUND(CTransparentStaticBitmap::OnEraseBackground)
+    EVT_PAINT(CTransparentStaticBitmap::OnPaint)
+END_EVENT_TABLE()
+
+
+CTransparentStaticBitmap::CTransparentStaticBitmap() {}
+
+CTransparentStaticBitmap::CTransparentStaticBitmap(wxWindow* parent, wxWindowID id, const wxBitmap& bitmap, const wxPoint& pos, const wxSize& size, long style, const wxString& WXUNUSED(name) ) {
+    Create(parent, id, bitmap, pos, size, style);
+}
+
+
+bool CTransparentStaticBitmap::Create(wxWindow* parent, wxWindowID id, const wxBitmap& bitmap, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) {
+    bool bRetVal = wxPanel::Create(parent, id, pos, size, style|wxTRANSPARENT_WINDOW, name);
+
+    SetBackgroundColour(parent->GetBackgroundColour());
+    SetForegroundColour(parent->GetForegroundColour());
+    
+    m_bitMap = wxBitmap(bitmap);
+
+    return bRetVal;
+}
+
+
+void CTransparentStaticBitmap::OnPaint(wxPaintEvent& /*event*/) {
+    wxPaintDC dc(this);
+    dc.DrawBitmap(m_bitMap, 0, 0, true);
+}
+#endif
+
+
+IMPLEMENT_DYNAMIC_CLASS (CTransparentCheckBox, wxCheckBox)
+
+#ifndef __WXMAC__
+BEGIN_EVENT_TABLE(CTransparentCheckBox, wxCheckBox)
+    EVT_ERASE_BACKGROUND(CTransparentCheckBox::OnEraseBackground)
+END_EVENT_TABLE()
+#endif
+
+CTransparentCheckBox::CTransparentCheckBox() {}
+
+CTransparentCheckBox::CTransparentCheckBox(wxWindow *parent, wxWindowID id, const wxString& label,
+            const wxPoint& pos,
+            const wxSize& size, long style,
+            const wxValidator& validator,
+            const wxString& name,
+            wxBitmap** parentsBgBmp
+        ) {
+        Create(parent, id, label, pos, size, style, validator, name, parentsBgBmp);
+}
+
+
+bool CTransparentCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
+            const wxPoint& pos,
+            const wxSize& size, long style,
+            const wxValidator& validator,
+            const wxString& name,
+            wxBitmap** parentsBgBmp
+            ) {
+    wxString spacedLabel = wxT(" ") + label;
+    bool bRetVal = wxCheckBox::Create(parent, id, spacedLabel, pos, size, style, validator, name);
+
+    m_pParentsBgBmp = parentsBgBmp;
+
+#ifndef __WXMAC__
+    SetBackgroundColour(parent->GetBackgroundColour());
+    SetForegroundColour(parent->GetForegroundColour());
+#endif
+    return bRetVal;
+}
+
+
+#ifndef __WXMAC__
+void CTransparentCheckBox::OnEraseBackground(wxEraseEvent& event)
+{
+    if (m_pParentsBgBmp && *m_pParentsBgBmp) {
+        wxMemoryDC memDC(**m_pParentsBgBmp);
+        wxSize sz = GetClientSize();
+        wxDC *dc = event.GetDC();
+        wxCoord x=0, y=0, xx, yy;
+        wxWindow* win = this;
+        do {
+            win->GetPosition(&xx, &yy);
+            x += xx;
+            y += yy;
+            win = win->GetParent();
+        } while (!win->IsTopLevel());
+        dc->Blit(0, 0, sz.GetWidth(), sz.GetHeight(), &memDC, x, y, wxCOPY);
+    } else {
+        event.Skip();
+    }
+}
+#endif
+
+
 IMPLEMENT_DYNAMIC_CLASS (CLinkButton, wxBitmapButton)
 
 BEGIN_EVENT_TABLE(CLinkButton, wxBitmapButton)
diff --git a/clientgui/sg_CustomControls.h b/clientgui/sg_CustomControls.h
index dc5b55e..6db1a98 100644
--- a/clientgui/sg_CustomControls.h
+++ b/clientgui/sg_CustomControls.h
@@ -134,6 +134,45 @@ public:
 };
 
 
+class CTransparentHyperlinkCtrl : public wxHyperlinkCtrl
+{
+    DECLARE_DYNAMIC_CLASS (CTransparentHyperlinkCtrl)
+
+public:
+    CTransparentHyperlinkCtrl();
+    CTransparentHyperlinkCtrl(wxWindow *parent,
+                    wxWindowID id,
+                    const wxString& label, const wxString& url,
+                    const wxPoint& pos = wxDefaultPosition,
+                    const wxSize& size = wxDefaultSize,
+                    long style = wxHL_DEFAULT_STYLE,
+                    const wxString& name = wxHyperlinkCtrlNameStr,
+                    wxBitmap** parentsBgBmp = NULL
+                    );
+
+    // Creation function (for two-step construction).
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& label, const wxString& url,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxHL_DEFAULT_STYLE,
+                const wxString& name = wxHyperlinkCtrlNameStr,
+                wxBitmap** parentsBgBmp = NULL
+                );
+
+private:
+    wxBitmap** m_pParentsBgBmp;
+
+#ifndef __WXMAC__
+    public:
+    virtual void OnEraseBackground(wxEraseEvent& event);
+
+    DECLARE_EVENT_TABLE()
+#endif
+};
+
+
 class CTransparentStaticTextAssociate : public wxPanel
 { 
     DECLARE_DYNAMIC_CLASS (CTransparentStaticTextAssociate)
@@ -175,6 +214,81 @@ private:
 }; 
 
 
+#ifndef __WXMSW__
+#define CTransparentStaticBitmap wxStaticBitmap
+#else
+class CTransparentStaticBitmap : public wxPanel
+{ 
+    DECLARE_DYNAMIC_CLASS (CTransparentStaticBitmap)
+
+public:
+    CTransparentStaticBitmap();
+    CTransparentStaticBitmap(
+        wxWindow* parent, 
+        wxWindowID id, 
+        const wxBitmap& bitmap,
+        const wxPoint& pos = wxDefaultPosition, 
+        const wxSize& size = wxDefaultSize,
+        long style = 0, 
+        const wxString& name= wxStaticBitmapNameStr
+    );
+
+    bool Create(
+        wxWindow* parent, 
+        wxWindowID id, 
+        const wxBitmap& bitmap,
+        const wxPoint& pos = wxDefaultPosition, 
+        const wxSize& size = wxDefaultSize,
+        long style = 0, 
+        const wxString& name= wxStaticBitmapNameStr
+    );
+
+    virtual bool HasTransparentBackground() { return true; };
+
+    virtual void OnEraseBackground(wxEraseEvent& /*event*/) {};
+    virtual void OnPaint(wxPaintEvent& event);
+
+    DECLARE_EVENT_TABLE()
+private:
+    wxBitmap   m_bitMap;
+};
+#endif
+
+
+class CTransparentCheckBox : public wxCheckBox
+{ 
+    DECLARE_DYNAMIC_CLASS (CTransparentCheckBox)
+
+public:
+    CTransparentCheckBox();
+    CTransparentCheckBox(wxWindow *parent, wxWindowID id, const wxString& label,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize, long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxCheckBoxNameStr,
+            wxBitmap** parentsBgBmp = NULL
+            );
+
+    bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize, long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxCheckBoxNameStr,
+            wxBitmap** parentsBgBmp = NULL
+            );
+
+private:
+    wxBitmap** m_pParentsBgBmp;
+
+#ifndef __WXMAC__
+public:
+    virtual void OnEraseBackground(wxEraseEvent& event);
+
+    DECLARE_EVENT_TABLE()
+#endif
+};
+
+
 class CLinkButton : public wxBitmapButton
 { 
     DECLARE_DYNAMIC_CLASS (CLinkButton)
diff --git a/clientgui/sg_DlgPreferences.cpp b/clientgui/sg_DlgPreferences.cpp
index 2c6c8ad..bfea64b 100644
--- a/clientgui/sg_DlgPreferences.cpp
+++ b/clientgui/sg_DlgPreferences.cpp
@@ -36,151 +36,12 @@
 #include "sg_CustomControls.h"
 #include "sg_DlgPreferences.h"
 
+#include "res/warning.xpm"
+
 #define TEST_BACKGROUND_WITH_MAGENTA_FILL 0
 
 using std::string;
 
-#ifdef __WXMAC__
-#define TINY_FONT 12
-#define SMALL_FONT 12
-#define MEDIUM_FONT 14
-#define LARGE_FONT 16
-#else
-#define TINY_FONT 8
-#define SMALL_FONT 9
-#define MEDIUM_FONT 12
-#define LARGE_FONT 16
-#endif
-
-
-////@begin includes
-////@end includes
-
-////@begin XPM images
-////@end XPM images
-
-// Useful arrays used as templates for arrays created at runtime.
-//
-int iTimeOfDayArraySize = 25;
-wxString astrTimeOfDayStrings[] = {
-    wxT("0:00"),
-    wxT("1:00"),
-    wxT("2:00"),
-    wxT("3:00"),
-    wxT("4:00"),
-    wxT("5:00"),
-    wxT("6:00"),
-    wxT("7:00"),
-    wxT("8:00"),
-    wxT("9:00"),
-    wxT("10:00"),
-    wxT("11:00"),
-    wxT("12:00"),
-    wxT("13:00"),
-    wxT("14:00"),
-    wxT("15:00"),
-    wxT("16:00"),
-    wxT("17:00"),
-    wxT("18:00"),
-    wxT("19:00"),
-    wxT("20:00"),
-    wxT("21:00"),
-    wxT("22:00"),
-    wxT("23:00"),
-    wxT("24:00")
-};
-
-
-// Used for sorting disk usage values
-static int CompareDiskUsage(const wxString& strFirst, const wxString& strSecond) {
-    long lFirstValue;
-    long lSecondValue;
-
-    // Is first measured in GB and second measured in MB?
-    if ((strFirst.Find(wxT("GB")) != -1) && (strSecond.Find(wxT("MB")) != -1)) return 1;
-
-    // Is first measured in MB and second measured in GB?
-    if ((strFirst.Find(wxT("MB")) != -1) && (strSecond.Find(wxT("GB")) != -1)) return -1;
-
-    // Convert to numbers
-    strFirst.ToLong(&lFirstValue);
-    strSecond.ToLong(&lSecondValue);
-
-    // Is lFirstValue larger than lSecondValue?
-    if (lFirstValue > lSecondValue) return 1;
-
-    // Is lFirstValue less than lSecondValue?
-    if (lFirstValue < lSecondValue) return -1;
-
-    // they must be equal
-    return 0;
-}
-
-
-int iCPUUsageArraySize = 10;
-wxString astrCPUUsageStrings[] = {
-    wxT("10%"),
-    wxT("20%"),
-    wxT("30%"),
-    wxT("40%"),
-    wxT("50%"),
-    wxT("60%"),
-    wxT("70%"),
-    wxT("80%"),
-    wxT("90%"),
-    wxT("100%")
-};
-
-// Used for sorting cpu usage values
-static int CompareCPUUsage(const wxString& strFirst, const wxString& strSecond) {
-    long lFirstValue;
-    long lSecondValue;
-
-    // Convert to numbers
-    strFirst.ToLong(&lFirstValue);
-    strSecond.ToLong(&lSecondValue);
-
-    // Is lFirstValue larger than lSecondValue?
-    if (lFirstValue > lSecondValue) return 1;
-
-    // Is lFirstValue less than lSecondValue?
-    if (lFirstValue < lSecondValue) return -1;
-
-    // they must be equal
-    return 0;
-}
-
-
-int iWorkWhenIdleArraySize = 7;
-wxString astrWorkWhenIdleStrings[] = {
-    wxT("1"),
-    wxT("3"),
-    wxT("5"),
-    wxT("10"),
-    wxT("15"),
-    wxT("30"),
-    wxT("60")
-};
-
-// Used for sorting work when idle values
-static int CompareWorkWhenIdle(const wxString& strFirst, const wxString& strSecond) {
-    long lFirstValue;
-    long lSecondValue;
-
-    // Convert to numbers
-    strFirst.ToLong(&lFirstValue);
-    strSecond.ToLong(&lSecondValue);
-
-    // Is lFirstValue larger than lSecondValue?
-    if (lFirstValue > lSecondValue) return 1;
-
-    // Is lFirstValue less than lSecondValue?
-    if (lFirstValue < lSecondValue) return -1;
-
-    // they must be equal
-    return 0;
-}
-
 
 /*!
  * CPanelPreferences type definition
@@ -194,9 +55,11 @@ IMPLEMENT_DYNAMIC_CLASS( CPanelPreferences, wxPanel )
 
 BEGIN_EVENT_TABLE( CPanelPreferences, wxPanel )
 ////@begin CPanelPreferences event table entries
+    EVT_COMMAND_RANGE(ID_SG_PREFS_START,ID_SG_PREFS_LAST,
+                        wxEVT_COMMAND_CHECKBOX_CLICKED,
+                        CPanelPreferences::OnHandleCheckboxEvent
+                    )
     EVT_ERASE_BACKGROUND( CPanelPreferences::OnEraseBackground )
-    EVT_COMBOBOX( ID_WORKBETWEENBEGIN, CPanelPreferences::OnWorkBetweenBeginSelected )
-    EVT_COMBOBOX( ID_CONNECTBETWEENBEGIN, CPanelPreferences::OnConnectBetweenBeginSelected )
     EVT_BUTTON( ID_SIMPLE_HELP, CPanelPreferences::OnButtonHelp )
 ////@end CPanelPreferences event table entries
 END_EVENT_TABLE()
@@ -217,25 +80,27 @@ CPanelPreferences::CPanelPreferences( wxWindow* parent ) :
 }
 
 
+CPanelPreferences::~CPanelPreferences( )
+{
+    if (m_backgroundBitmap) {
+        delete m_backgroundBitmap;
+        m_backgroundBitmap = NULL;
+    }
+}
+
+
 /*!
  * CPanelPreferences creator
  */
 
 bool CPanelPreferences::Create()
 {
-////@begin CPanelPreferences member initialisation
-    m_WorkBetweenBeginCtrl = NULL;
-    m_WorkBetweenEndCtrl = NULL;
-    m_ConnectBetweenBeginCtrl = NULL;
-    m_ConnectBetweenEndCtrl = NULL;
-    m_MaxDiskUsageCtrl = NULL;
-    m_MaxCPUUsageCtrl = NULL;
-    m_WorkWhileOnBatteryCtrl = NULL;
-    m_WorkWhenIdleCtrl = NULL;
-////@end CPanelPreferences member initialisation
+    m_backgroundBitmap = NULL;
 
     CreateControls();
 
+    defaultPrefs.enabled_defaults();
+
     ReadPreferenceSettings();
 
     GetSizer()->Fit(this);
@@ -259,166 +124,226 @@ void CPanelPreferences::CreateControls()
     wxASSERT(pSkinAdvanced);
     wxASSERT(wxDynamicCast(pSkinAdvanced, CSkinAdvanced));
 
+    wxSize textCtrlSize = getTextCtrlSize(wxT("999.99"));
+    wxSize timeCtrlSize = getTextCtrlSize(wxT("23:59 "));
+
     CPanelPreferences* itemDialog1 = this;
 
     wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
     itemDialog1->SetSizer(itemBoxSizer2);
 
-    wxFlexGridSizer* itemFlexGridSizer3 = new wxFlexGridSizer(1, 0, 0);
-    itemBoxSizer2->Add(itemFlexGridSizer3, 0, wxGROW|wxALL, ADJUSTFORXDPI(5));
+    wxStaticBox* topSectionStaticBox = new wxStaticBox();
+    topSectionStaticBox->SetBackgroundStyle(wxBG_STYLE_TRANSPARENT);
+    topSectionStaticBox->Create(this, -1, wxEmptyString);
 
-    CTransparentStaticText* itemStaticText4 = new CTransparentStaticText( itemDialog1, wxID_ANY, _("This dialog controls preferences for this computer only."), wxDefaultPosition, wxDefaultSize, 0 );
-    
-//    itemStaticText4->SetFont(wxFont(MEDIUM_FONT, wxSWISS, wxNORMAL, wxBOLD, false, _T("Arial")));
-    itemFlexGridSizer3->Add(itemStaticText4, 0, wxALL, 0);
+    wxStaticBoxSizer* topSectionSizer = new wxStaticBoxSizer( topSectionStaticBox, wxVERTICAL );
 
-    CTransparentStaticText* itemStaticText5 = new CTransparentStaticText( itemDialog1, wxID_ANY, _("Click OK to set preferences."), wxDefaultPosition, wxDefaultSize, 0 );
+    wxBoxSizer* topControlsSizer = new wxBoxSizer( wxHORIZONTAL );
+    topSectionSizer->Add(topControlsSizer);
     
-//    itemStaticText5->SetFont(wxFont(MEDIUM_FONT, wxSWISS, wxNORMAL, wxBOLD, false, _T("Arial")));
-    itemFlexGridSizer3->Add(itemStaticText5, 0, wxALL, 0);
-
-    CTransparentStaticText* itemStaticText6 = new CTransparentStaticText( itemDialog1, wxID_ANY, _("Click Clear to restore web-based settings for all preferences listed below."), wxDefaultPosition, wxDefaultSize, 0 );
+    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
+        );
+    }
     
-//    itemStaticText6->SetFont(wxFont(MEDIUM_FONT, wxSWISS, wxNORMAL, wxBOLD, false, _T("Arial")));
-    itemFlexGridSizer3->Add(itemStaticText6, 0, wxALL, 0);
-
-    itemFlexGridSizer3->AddSpacer(ADJUSTFORYDPI(10));
+     legendSizer->Add(
+        new CTransparentHyperlinkCtrl(
+            topSectionStaticBox, wxID_ANY, *web_prefs_url, *web_prefs_url,
+            wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE,
+            wxHyperlinkCtrlNameStr, &m_backgroundBitmap
+        ),
+        0, wxLEFT, 5
+    );
     
-    CTransparentStaticText* itemStaticText7 = new CTransparentStaticText( itemDialog1, wxID_ANY, _("For additional settings, select Computing Preferences in the Advanced View."), wxDefaultPosition, wxDefaultSize, 0 );
+    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 );
+
+    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 );
+
+    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")));
-    itemFlexGridSizer3->Add(itemStaticText7, 0, wxALL, 0);
+    topSectionSizer->Add(itemStaticText7, 0, wxALL, 0);
 
-    CTransparentStaticLine* itemStaticLine8 = new CTransparentStaticLine( itemDialog1, wxID_ANY, wxDefaultPosition, wxSize(300, 1), wxLI_HORIZONTAL|wxNO_BORDER );
-    itemStaticLine8->SetLineColor(pSkinSimple->GetStaticLineColor());
-    itemBoxSizer2->Add(itemStaticLine8, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxRIGHT, ADJUSTFORXDPI(20));
+    topSectionSizer->AddSpacer( 10 );
+#endif
+
+    topControlsSizer->Add( legendSizer, 1, wxALL, 1 );
 
-    wxFlexGridSizer* itemFlexGridSizer9 = new wxFlexGridSizer(1, 1, 0, 0);
-    itemFlexGridSizer9->AddGrowableCol(0);
-    itemBoxSizer2->Add(itemFlexGridSizer9, 0, wxGROW|wxALL, ADJUSTFORXDPI(5));
+    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 );
+#else
+    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, wxALIGN_CENTER_HORIZONTAL|wxLEFT, ADJUSTFORXDPI(20));
-
-    wxFlexGridSizer* itemFlexGridSizer15 = new wxFlexGridSizer(7, 2, 0, 0);
-    itemFlexGridSizer15->AddGrowableRow(0);
-    itemFlexGridSizer15->AddGrowableRow(1);
-    itemFlexGridSizer15->AddGrowableRow(2);
-    itemFlexGridSizer15->AddGrowableRow(3);
-    itemFlexGridSizer15->AddGrowableRow(4);
-    itemFlexGridSizer15->AddGrowableRow(5);
-    itemFlexGridSizer15->AddGrowableRow(6);
-    itemFlexGridSizer15->AddGrowableCol(0);
-    itemFlexGridSizer15->AddGrowableCol(1);
-    itemBoxSizer11->Add(itemFlexGridSizer15, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 0);
-
-    CTransparentStaticText* itemStaticText16 = new CTransparentStaticText( itemDialog1, wxID_ANY, _("Do work only between:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
-    itemStaticText16->SetFont(wxFont(SMALL_FONT, wxSWISS, wxNORMAL, wxNORMAL, false, _T("Arial")));
-    itemStaticText16->Wrap(250);
-    itemFlexGridSizer15->Add(itemStaticText16, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, ADJUSTFORXDPI(5));
-
-    wxBoxSizer* itemBoxSizer17 = new wxBoxSizer(wxHORIZONTAL);
-    itemFlexGridSizer15->Add(itemBoxSizer17, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 0);
-
-    wxString* m_WorkBetweenBeginCtrlStrings = NULL;
-    m_WorkBetweenBeginCtrl = new wxComboBox( itemDialog1, ID_WORKBETWEENBEGIN, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_WorkBetweenBeginCtrlStrings, wxCB_READONLY );
-    m_WorkBetweenBeginCtrl->Enable(false);
-    itemBoxSizer17->Add(m_WorkBetweenBeginCtrl, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, ADJUSTFORXDPI(5));
-
-    CTransparentStaticText* itemStaticText19 = new CTransparentStaticText( itemDialog1, wxID_ANY, _("and"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemStaticText19->SetFont(wxFont(SMALL_FONT, wxSWISS, wxNORMAL, wxNORMAL, false, _T("Arial")));
-    itemBoxSizer17->Add(itemStaticText19, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, ADJUSTFORXDPI(5));
-
-    wxString* m_WorkBetweenEndCtrlStrings = NULL;
-    m_WorkBetweenEndCtrl = new wxComboBox( itemDialog1, ID_WORKBETWEENEND, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_WorkBetweenEndCtrlStrings, wxCB_READONLY );
-    m_WorkBetweenEndCtrl->Enable(false);
-    itemBoxSizer17->Add(m_WorkBetweenEndCtrl, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxTOP|wxBOTTOM, ADJUSTFORXDPI(5));
-
-    CTransparentStaticText* itemStaticText21 = new CTransparentStaticText( itemDialog1, wxID_ANY, _("Connect to internet only between:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
-    itemStaticText21->SetFont(wxFont(SMALL_FONT, wxSWISS, wxNORMAL, wxNORMAL, false, _T("Arial")));
-    itemStaticText21->Wrap(250);
-    itemFlexGridSizer15->Add(itemStaticText21, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, ADJUSTFORXDPI(5));
-
-    wxBoxSizer* itemBoxSizer22 = new wxBoxSizer(wxHORIZONTAL);
-    itemFlexGridSizer15->Add(itemBoxSizer22, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 0);
-
-    wxString* m_ConnectBetweenBeginCtrlStrings = NULL;
-    m_ConnectBetweenBeginCtrl = new wxComboBox( itemDialog1, ID_CONNECTBETWEENBEGIN, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_ConnectBetweenBeginCtrlStrings, wxCB_READONLY );
-    m_ConnectBetweenBeginCtrl->Enable(false);
-    itemBoxSizer22->Add(m_ConnectBetweenBeginCtrl, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, ADJUSTFORXDPI(5));
-
-    CTransparentStaticText* itemStaticText24 = new CTransparentStaticText( itemDialog1, wxID_ANY, _("and"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemStaticText24->SetFont(wxFont(SMALL_FONT, wxSWISS, wxNORMAL, wxNORMAL, false, _T("Arial")));
-    itemBoxSizer22->Add(itemStaticText24, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, ADJUSTFORXDPI(5));
-
-    wxString* m_ConnectBetweenEndCtrlStrings = NULL;
-    m_ConnectBetweenEndCtrl = new wxComboBox( itemDialog1, ID_CONNECTBETWEENEND, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_ConnectBetweenEndCtrlStrings, wxCB_READONLY );
-    m_ConnectBetweenEndCtrl->Enable(false);
-    itemBoxSizer22->Add(m_ConnectBetweenEndCtrl, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxTOP|wxBOTTOM, ADJUSTFORXDPI(5));
-
-    CTransparentStaticText* itemStaticText26 = new CTransparentStaticText( itemDialog1, wxID_ANY, _("Use no more than:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
-    itemStaticText26->SetFont(wxFont(SMALL_FONT, wxSWISS, wxNORMAL, wxNORMAL, false, _T("Arial")));
-    itemStaticText26->Wrap(250);
-    itemFlexGridSizer15->Add(itemStaticText26, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, ADJUSTFORXDPI(5));
-
-    wxBoxSizer* itemBoxSizer27 = new wxBoxSizer(wxHORIZONTAL);
-    itemFlexGridSizer15->Add(itemBoxSizer27, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 0);
-
-    wxString* m_MaxDiskUsageCtrlStrings = NULL;
-    m_MaxDiskUsageCtrl = new wxComboBox( itemDialog1, ID_MAXDISKUSAGE, _T(""), wxDefaultPosition, wxSize(-1, -1), 0, m_MaxDiskUsageCtrlStrings, wxCB_READONLY );
-    m_MaxDiskUsageCtrl->Enable(false);
-    itemBoxSizer27->Add(m_MaxDiskUsageCtrl, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, ADJUSTFORXDPI(5));
-
-    CTransparentStaticText* itemStaticText29 = new CTransparentStaticText( itemDialog1, wxID_ANY, _("of disk space"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemStaticText29->SetFont(wxFont(SMALL_FONT, wxSWISS, wxNORMAL, wxNORMAL, false, _T("Arial")));
-    itemBoxSizer27->Add(itemStaticText29, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, ADJUSTFORXDPI(5));
-
-    CTransparentStaticText* itemStaticText30 = new CTransparentStaticText( itemDialog1, wxID_ANY, _("Use no more than:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
-    itemStaticText30->SetFont(wxFont(SMALL_FONT, wxSWISS, wxNORMAL, wxNORMAL, false, _T("Arial")));
-    itemStaticText30->Wrap(250);
-    itemFlexGridSizer15->Add(itemStaticText30, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, ADJUSTFORXDPI(5));
-
-    wxBoxSizer* itemBoxSizer31 = new wxBoxSizer(wxHORIZONTAL);
-    itemFlexGridSizer15->Add(itemBoxSizer31, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 0);
-
-    wxString* m_MaxCPUUsageCtrlStrings = NULL;
-    m_MaxCPUUsageCtrl = new wxComboBox( itemDialog1, ID_MAXCPUUSAGE, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_MaxCPUUsageCtrlStrings, wxCB_READONLY );
-    m_MaxCPUUsageCtrl->Enable(false);
-    itemBoxSizer31->Add(m_MaxCPUUsageCtrl, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, ADJUSTFORXDPI(5));
-
-    CTransparentStaticText* itemStaticText33 = new CTransparentStaticText( itemDialog1, wxID_ANY, _("of the processor"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemStaticText33->SetFont(wxFont(SMALL_FONT, wxSWISS, wxNORMAL, wxNORMAL, false, _T("Arial")));
-    itemBoxSizer31->Add(itemStaticText33, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, ADJUSTFORXDPI(5));
-
-    CTransparentStaticText* itemStaticText37 = new CTransparentStaticText( itemDialog1, wxID_ANY, _("Do work while on battery?"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
-    itemStaticText37->SetFont(wxFont(SMALL_FONT, wxSWISS, wxNORMAL, wxNORMAL, false, _T("Arial")));
-    itemStaticText37->Wrap(250);
-    itemFlexGridSizer15->Add(itemStaticText37, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, ADJUSTFORXDPI(5));
-
-    wxBoxSizer* itemBoxSizer38 = new wxBoxSizer(wxHORIZONTAL);
-    itemFlexGridSizer15->Add(itemBoxSizer38, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 0);
-
-    m_WorkWhileOnBatteryCtrl = new wxCheckBox( itemDialog1, ID_WORKWHILEONBATTERY, _T(""), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
-    m_WorkWhileOnBatteryCtrl->SetValue(false);
-    m_WorkWhileOnBatteryCtrl->Enable(false);
-    itemBoxSizer38->Add(m_WorkWhileOnBatteryCtrl, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, ADJUSTFORXDPI(5));
-
-    CTransparentStaticText* itemStaticText40 = new CTransparentStaticText( itemDialog1, wxID_ANY, _("Do work after idle for:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
-    itemStaticText40->SetFont(wxFont(SMALL_FONT, wxSWISS, wxNORMAL, wxNORMAL, false, _T("Arial")));
-    itemStaticText40->Wrap(250);
-    itemFlexGridSizer15->Add(itemStaticText40, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, ADJUSTFORXDPI(5));
-
-    wxBoxSizer* itemBoxSizer41 = new wxBoxSizer(wxHORIZONTAL);
-    itemFlexGridSizer15->Add(itemBoxSizer41, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 0);
-
-    wxString* m_WorkWhenIdleCtrlStrings = NULL;
-    m_WorkWhenIdleCtrl = new wxComboBox( itemDialog1, ID_WORKWHENIDLE, _T(""), wxDefaultPosition, wxSize(-1, -1), 0, m_WorkWhenIdleCtrlStrings, wxCB_READONLY );
-    m_WorkWhenIdleCtrl->Enable(false);
-    itemBoxSizer41->Add(m_WorkWhenIdleCtrl, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, ADJUSTFORXDPI(5));
-
-    CTransparentStaticText* itemStaticText43 = new CTransparentStaticText( itemDialog1, wxID_ANY, _("minutes"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemStaticText43->SetFont(wxFont(SMALL_FONT, wxSWISS, wxNORMAL, wxNORMAL, false, _T("Arial")));
-    itemBoxSizer41->Add(itemStaticText43, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, ADJUSTFORXDPI(5));
+    itemBoxSizer2->Add(itemBoxSizer11, 0, wxLEFT, ADJUSTFORXDPI(20));
+
+    wxString ProcOnBatteriesTT(_("Check this to suspend computing on portables when running on battery power."));
+
+    m_chkProcOnBatteries = new CTransparentCheckBox(
+        itemDialog1, ID_CHKPROCONBATTERIES,
+        _("Suspend when computer is on battery"), 
+        wxDefaultPosition, wxDefaultSize, 0,
+        wxDefaultValidator,  wxCheckBoxNameStr, 
+        &m_backgroundBitmap
+    );
+
+    m_chkProcOnBatteries->SetToolTip(ProcOnBatteriesTT);
+    
+    itemBoxSizer11->Add(m_chkProcOnBatteries, 0, wxALL, 5 );
+
+    wxString ProcInUseTT(_("Check this to suspend computing and file transfers when you're using the computer."));
+
+    m_chkProcInUse = new CTransparentCheckBox(
+        itemDialog1, ID_CHKPROCINUSE,
+        _("Suspend when computer is in use"), 
+        wxDefaultPosition, wxDefaultSize, 0,
+        wxDefaultValidator,  wxCheckBoxNameStr, 
+        &m_backgroundBitmap
+    );
+
+    m_chkProcInUse->SetToolTip(ProcInUseTT);
+
+    itemBoxSizer11->Add(m_chkProcInUse, 0, wxALL, 5 );
+
+    // min idle time
+    wxString ProcIdleForTT(_("This determines when the computer is considered 'in use'."));
+
+    CTransparentStaticText* staticText24 = new CTransparentStaticText(
+            itemDialog1, wxID_ANY,
+            _("'In use' means mouse/keyboard input in last"),
+            wxDefaultPosition, wxDefaultSize, 0
+        );
+
+    m_txtProcIdleFor = new wxTextCtrl(
+        itemDialog1, ID_TXTPROCIDLEFOR, wxEmptyString, wxDefaultPosition, textCtrlSize, wxTE_RIGHT
+    );
+
+    CTransparentStaticText* staticText25 = new CTransparentStaticText(itemDialog1, wxID_ANY, _("minutes"),
+            wxDefaultPosition, wxDefaultSize, 0 );
+
+    addNewRowToSizer(itemBoxSizer11, ProcIdleForTT, staticText24, m_txtProcIdleFor, staticText25);
+
+    wxString andString(_("and"));
+
+    wxString ProcEveryDayTT(_("Compute only during a particular period each day."));
+    m_chkProcEveryDay = new CTransparentCheckBox(
+        itemDialog1, ID_CHKPROCEVERYDAY,
+        _("Compute only between"), 
+        wxDefaultPosition, wxDefaultSize, 0,
+        wxDefaultValidator,  wxCheckBoxNameStr, 
+        &m_backgroundBitmap
+    );
+
+    m_txtProcEveryDayStart = new wxTextCtrl( itemDialog1, ID_TXTPROCEVERYDAYSTART, wxEmptyString, wxDefaultPosition, timeCtrlSize, wxTE_RIGHT );
+
+    CTransparentStaticText* staticText26 = new CTransparentStaticText( itemDialog1, wxID_ANY, andString, wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
+
+    m_txtProcEveryDayStop = new wxTextCtrl( itemDialog1, ID_TXTPROCEVERYDAYSTOP, wxEmptyString, wxDefaultPosition, timeCtrlSize, wxTE_RIGHT );
+
+    addNewRowToSizer(itemBoxSizer11, ProcEveryDayTT, m_chkProcEveryDay, m_txtProcEveryDayStart, staticText26, m_txtProcEveryDayStop);
+
+
+    /*xgettext:no-c-format*/
+    wxString MaxCPUTimeTT(_("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."));
+    CTransparentStaticText* staticText22 = new CTransparentStaticText(
+        itemDialog1, wxID_ANY, _("Use at most"), wxDefaultPosition, wxDefaultSize, 0 );
+
+    m_txtProcUseCPUTime = new wxTextCtrl( itemDialog1, ID_TXTPOCUSECPUTIME, wxEmptyString, wxDefaultPosition, textCtrlSize, wxTE_RIGHT );
+
+    /*xgettext:no-c-format*/
+    CTransparentStaticText* staticText23 = new CTransparentStaticText( itemDialog1, wxID_ANY, _("% of CPU time"), wxDefaultPosition, wxDefaultSize, 0 );
+
+    addNewRowToSizer(itemBoxSizer11, MaxCPUTimeTT, staticText22, m_txtProcUseCPUTime, staticText23);
+
+    wxString NetEveryDayTT(_("Transfer files only during a particular period each day."));
+    m_chkNetEveryDay = new CTransparentCheckBox(
+        itemDialog1, ID_CHKNETEVERYDAY, _("Transfer files only between"), 
+        wxDefaultPosition, wxDefaultSize, 0,
+        wxDefaultValidator,  wxCheckBoxNameStr, 
+        &m_backgroundBitmap
+    );
+
+    m_txtNetEveryDayStart = new wxTextCtrl( itemDialog1, ID_TXTNETEVERYDAYSTART, wxEmptyString, wxDefaultPosition, timeCtrlSize, 0 );
+
+    CTransparentStaticText* staticText37 = new CTransparentStaticText( itemDialog1, wxID_ANY, andString, wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
+
+    m_txtNetEveryDayStop = new wxTextCtrl( itemDialog1, ID_TXTNETEVERYDAYSTOP, wxEmptyString, wxDefaultPosition, timeCtrlSize, 0 );
+
+    addNewRowToSizer(itemBoxSizer11, NetEveryDayTT, m_chkNetEveryDay, m_txtNetEveryDayStart, staticText37, m_txtNetEveryDayStop);
+
+
+    wxString DiskMaxSpaceTT = wxEmptyString;
+    DiskMaxSpaceTT.Printf(_("Limit the total amount of disk space used by %s."), pSkinAdvanced->GetApplicationShortName().c_str());
+
+    m_chkDiskMaxSpace = new CTransparentCheckBox (
+        itemDialog1, ID_CHKDISKMAXSPACE, _("Use no more than"), 
+        wxDefaultPosition, wxDefaultSize, 0,
+        wxDefaultValidator,  wxCheckBoxNameStr, 
+        &m_backgroundBitmap
+    );
+
+    m_txtDiskMaxSpace = new wxTextCtrl( itemDialog1, ID_TXTDISKMAXSPACE,wxEmptyString, wxDefaultPosition, getTextCtrlSize(wxT("9999.99")), wxTE_RIGHT );
+
+    CTransparentStaticText* staticText41 = new CTransparentStaticText( itemDialog1, wxID_ANY, _("GB of disk space"), wxDefaultPosition, wxDefaultSize, 0 );
+
+    addNewRowToSizer(itemBoxSizer11, DiskMaxSpaceTT, m_chkDiskMaxSpace, m_txtDiskMaxSpace, staticText41);
 
     wxBoxSizer* itemBoxSizer44 = new wxBoxSizer(wxHORIZONTAL);
     itemBoxSizer2->Add(itemBoxSizer44, 0, wxALIGN_RIGHT|wxALL, ADJUSTFORXDPI(5));
@@ -427,10 +352,10 @@ 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") );
+//    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));
+//    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));
@@ -451,37 +376,21 @@ void CPanelPreferences::CreateControls()
 #endif
 
     // Set validators
-    m_WorkBetweenBeginCtrl->SetValidator( wxGenericValidator(& m_strWorkBetweenBegin) );
-    m_WorkBetweenEndCtrl->SetValidator( wxGenericValidator(& m_strWorkBetweenEnd) );
-    m_ConnectBetweenBeginCtrl->SetValidator( wxGenericValidator(& m_strConnectBetweenBegin) );
-    m_ConnectBetweenEndCtrl->SetValidator( wxGenericValidator(& m_strConnectBetweenEnd) );
-    m_MaxDiskUsageCtrl->SetValidator( wxGenericValidator(& m_strMaxDiskUsage) );
-    m_MaxCPUUsageCtrl->SetValidator( wxGenericValidator(& m_strMaxCPUUsage) );
-    m_WorkWhileOnBatteryCtrl->SetValidator( wxGenericValidator(& m_bWorkWhileOnBattery) );
-    m_WorkWhenIdleCtrl->SetValidator( wxGenericValidator(& m_strWorkWhenIdle) );
+    m_vTimeValidator = new wxTextValidator(wxFILTER_INCLUDE_CHAR_LIST);
+    m_vTimeValidator->SetCharIncludes(wxT("0123456789:"));
+
+    m_txtProcIdleFor->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
+    m_txtProcEveryDayStart->SetValidator(*m_vTimeValidator);
+    m_txtProcEveryDayStop->SetValidator(*m_vTimeValidator);
+    m_txtProcUseCPUTime->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
+    m_txtNetEveryDayStart->SetValidator(*m_vTimeValidator);
+    m_txtNetEveryDayStop->SetValidator(*m_vTimeValidator);
+    m_txtDiskMaxSpace->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
 ////@end CPanelPreferences content construction
 }
 
 
 /*!
- * wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_WORKBETWEENBEGIN
- */
-
-void CPanelPreferences::OnWorkBetweenBeginSelected( wxCommandEvent& /*event*/ ) {
-    UpdateControlStates();
-}
-
-
-/*!
- * wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_CONNECTBETWEENBEGIN
- */
-
-void CPanelPreferences::OnConnectBetweenBeginSelected( wxCommandEvent& /*event*/ ) {
-    UpdateControlStates();
-}
-
-
-/*!
  * wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_SIMPLE_HELP
  */
 
@@ -505,11 +414,7 @@ void CPanelPreferences::OnButtonHelp( wxCommandEvent& event ) {
 }
 
 
-/*!
- * wxEVT_ERASE_BACKGROUND event handler for ID_DLGPREFERENCES
- */
-
-void CPanelPreferences::OnEraseBackground( wxEraseEvent& event ) {
+void CPanelPreferences::MakeBackgroundBitmap() {
     CSkinSimple* pSkinSimple = wxGetApp().GetSkinManager()->GetSimple();
     
     wxASSERT(pSkinSimple);
@@ -524,24 +429,13 @@ void CPanelPreferences::OnEraseBackground( wxEraseEvent& event ) {
     // Dialog dimensions
     wxSize sz = GetClientSize();
 
-    // Create a buffered device context to reduce flicker
-    wxBufferedDC dc(event.GetDC(), sz, wxBUFFER_CLIENT_AREA);
+    m_backgroundBitmap = new wxBitmap(sz);
+    wxMemoryDC dc(*m_backgroundBitmap);
 
     // bitmap dimensions
     w = bmp.GetWidth();
     h = bmp.GetHeight();
 
-#if TEST_BACKGROUND_WITH_MAGENTA_FILL
-    // Fill the dialog with a magenta color so people can detect when something
-    //   is wrong
-    dc.SetBrush(wxBrush(wxColour(255,0,255)));
-    dc.SetPen(wxPen(wxColour(255,0,255)));
-    dc.DrawRectangle(0, 0, sz.GetWidth(), sz.GetHeight());
-#else
-    wxColour bgColor(*pSkinSimple->GetDialogBackgroundImage()->GetBackgroundColor());
-    SetBackgroundColour(bgColor);
-#endif
-
     // Is the bitmap smaller than the window?
     if ( (w < sz.x) || (h < sz.y) ) {
         // Check to see if they need to be rescaled to fit in the window
@@ -569,49 +463,86 @@ void CPanelPreferences::OnEraseBackground( wxEraseEvent& event ) {
 }
 
 
+/*!
+ * wxEVT_ERASE_BACKGROUND event handler for ID_DLGPREFERENCES
+ */
+
+void CPanelPreferences::OnEraseBackground( wxEraseEvent& event ) {
+    if (!m_backgroundBitmap) {
+        MakeBackgroundBitmap();
+    }
+    // Create a buffered device context to reduce flicker
+    wxSize sz = GetClientSize();
+    wxBufferedDC dc(event.GetDC(), sz, wxBUFFER_CLIENT_AREA);
+
+#if TEST_BACKGROUND_WITH_MAGENTA_FILL
+    // Fill the dialog with a magenta color so people can detect when something
+    //   is wrong
+    dc.SetBrush(wxBrush(wxColour(255,0,255)));
+    dc.SetPen(wxPen(wxColour(255,0,255)));
+    dc.DrawRectangle(0, 0, sz.GetWidth(), sz.GetHeight());
+#else
+    CSkinSimple* pSkinSimple = wxGetApp().GetSkinManager()->GetSimple();
+    
+    wxASSERT(pSkinSimple);
+    wxASSERT(wxDynamicCast(pSkinSimple, CSkinSimple));
+
+    wxColour bgColor(*pSkinSimple->GetDialogBackgroundImage()->GetBackgroundColor());
+    SetBackgroundColour(bgColor);
+#endif
+
+    if (m_backgroundBitmap->IsOk()) {
+       dc.DrawBitmap(*m_backgroundBitmap, 0, 0);
+    }
+}
+
+
 void CPanelPreferences::OnButtonClear() {
     CMainDocument*    pDoc = wxGetApp().GetDocument();
 
     wxASSERT(pDoc);
     wxASSERT(wxDynamicCast(pDoc, CMainDocument));
 
+#if 1
+    // Delete all local prefs (delete global_prefs_override.xml file)
+    global_preferences_override_mask.clear();
+#else
+    // Delete only those settings controlled by this dialog
     ClearPreferenceSettings();
-
+#endif
     pDoc->rpc.set_global_prefs_override_struct(global_preferences_working, global_preferences_override_mask);
     pDoc->rpc.read_global_prefs_override();
 }
 
 
-void CPanelPreferences::OnOK() {
+bool CPanelPreferences::OnOK() {
     CMainDocument*    pDoc = wxGetApp().GetDocument();
 
     wxASSERT(pDoc);
     wxASSERT(wxDynamicCast(pDoc, CMainDocument));
 
-    TransferDataFromWindow();
+    if(!ValidateInput()) {
+        return false;
+    }
     SavePreferenceSettings();
 
 	pDoc->rpc.set_global_prefs_override_struct(global_preferences_working, global_preferences_override_mask);
 	pDoc->rpc.read_global_prefs_override();
+    
+    return true;
 }
 
 
 bool CPanelPreferences::UpdateControlStates() {
-        m_WorkBetweenBeginCtrl->Enable();
-        m_WorkBetweenEndCtrl->Enable();
-        m_ConnectBetweenBeginCtrl->Enable();
-        m_ConnectBetweenEndCtrl->Enable();
-        m_MaxDiskUsageCtrl->Enable();
-        m_MaxCPUUsageCtrl->Enable();
-        m_WorkWhileOnBatteryCtrl->Enable();
-        m_WorkWhenIdleCtrl->Enable();
-
-        if (m_WorkBetweenBeginCtrl->GetValue() == _("Anytime")) {
-            m_WorkBetweenEndCtrl->Disable();
-        }
-        if (m_ConnectBetweenBeginCtrl->GetValue() == _("Anytime")) {
-            m_ConnectBetweenEndCtrl->Disable();
-        }
+    m_txtProcIdleFor->Enable(m_chkProcInUse->IsChecked());
+
+    m_txtProcEveryDayStart->Enable(m_chkProcEveryDay->IsChecked());
+    m_txtProcEveryDayStop->Enable(m_chkProcEveryDay->IsChecked());
+
+    m_txtNetEveryDayStart->Enable(m_chkNetEveryDay->IsChecked());
+    m_txtNetEveryDayStop->Enable(m_chkNetEveryDay->IsChecked());
+
+    m_txtDiskMaxSpace->Enable(m_chkDiskMaxSpace->IsChecked());
     return true;
 }
 
@@ -630,30 +561,57 @@ bool CPanelPreferences::ClearPreferenceSettings() {
 }
 
 
+// convert a Timestring HH:MM into a double
+double CPanelPreferences::TimeStringToDouble(wxString timeStr) {
+    double hour;
+    double minutes;
+    timeStr.SubString(0,timeStr.First(':')).ToDouble(&hour);
+    timeStr.SubString(timeStr.First(':')+1,timeStr.Length()).ToDouble(&minutes);
+    minutes = minutes/60.0;
+    return hour + minutes;
+}
+
+
+// convert a double into a timestring HH:MM
+wxString CPanelPreferences::DoubleToTimeString(double dt) {
+    int hour = (int)dt;
+    int minutes = (int)(60.0 * (dt - hour)+.5);
+    return wxString::Format(wxT("%02d:%02d"),hour,minutes);
+}
+
+
+// We only display 2 places past the decimal, so restrict the
+// precision of saved values to .01.  This prevents unexpected
+// behavior when, for example, a zero value means no restriction
+// and the value is displayed as 0.00 but is actually 0.001.
+double CPanelPreferences::RoundToHundredths(double td) {
+    int i = (int)((td + .005) * 100.);
+    return ((double)(i) / 100.);
+}
+
+
+void CPanelPreferences::DisplayValue(double value, wxTextCtrl* textCtrl, wxCheckBox* checkBox) {
+    wxString buffer;
+
+    wxASSERT(textCtrl);
+    
+    if (checkBox) {
+        if (! checkBox->IsChecked()) {
+            textCtrl->Clear();
+            textCtrl->Disable();
+            return;
+        }
+    }
+    buffer.Printf(wxT("%g"), value);
+    textCtrl->ChangeValue(buffer);
+    textCtrl->Enable();
+}
+
+
+/* read preferences from core client and initialize control values */
 bool CPanelPreferences::ReadPreferenceSettings() {
     CMainDocument* pDoc = wxGetApp().GetDocument();
-    GLOBAL_PREFS   display_global_preferences;
-    double         dTempValue1 = 0.0;
-    double         dTempValue2 = 0.0;
     int            retval;
-    unsigned int   i;
-
-    // We localize these because some languages (e.g., French) use
-    // different abbreviations for MB and GB.
-    // Note: _() cannot be used for static or global strings.
-    wxString astrDiskUsageStrings[] = {
-        _("100 MB"),
-        _("200 MB"),
-        _("500 MB"),
-        _("1 GB"),
-        _("2 GB"),
-        _("5 GB"),
-        _("10 GB"),
-        _("20 GB"),
-        _("50 GB"),
-        _("100 GB")
-    };
-    int iDiskUsageArraySize = 10;
 
     wxASSERT(pDoc);
     wxASSERT(wxDynamicCast(pDoc, CMainDocument));
@@ -677,225 +635,367 @@ bool CPanelPreferences::ReadPreferenceSettings() {
         m_bCustomizedPreferences = false;
     }
 #endif
-	
-	// Allow this structure to be modified for display purposes
-    display_global_preferences = global_preferences_working;
-
 
-    // Do work only between:
-    //   Start:
-    wxArrayString aWorkBetweenBegin = wxArrayString(iTimeOfDayArraySize, astrTimeOfDayStrings);
-    aWorkBetweenBegin.Insert(_("Anytime"), 0);
+    // on batteries
+    m_chkProcOnBatteries->SetValue(! global_preferences_working.run_on_batteries);
 
-    m_WorkBetweenBeginCtrl->Append(aWorkBetweenBegin);
-    if (display_global_preferences.cpu_times.start_hour == display_global_preferences.cpu_times.end_hour) {
-        m_strWorkBetweenBegin = _("Anytime");
+    // in use
+    m_chkProcInUse->SetValue(! global_preferences_working.run_if_user_active);
+    
+    if (m_chkProcInUse->IsChecked()) {
+        m_txtProcIdleFor->Enable();
+        DisplayValue(global_preferences_working.idle_time_to_run, m_txtProcIdleFor);
     } else {
-        m_strWorkBetweenBegin = astrTimeOfDayStrings[(int)display_global_preferences.cpu_times.start_hour];
+        m_txtProcIdleFor->Clear();
+        m_txtProcIdleFor->Disable();
     }
 
-    //   End:
-    m_WorkBetweenEndCtrl->Append(wxArrayString(iTimeOfDayArraySize, astrTimeOfDayStrings));
-    m_strWorkBetweenEnd = astrTimeOfDayStrings[(int)display_global_preferences.cpu_times.end_hour];
-
-    // Connect to internet only between:
-    //   Start:
-    wxArrayString aConnectBetweenBegin = wxArrayString(iTimeOfDayArraySize, astrTimeOfDayStrings);
-    aConnectBetweenBegin.Insert(_("Anytime"), 0);
+    // do work between
+    m_chkProcEveryDay->SetValue(global_preferences_working.cpu_times.start_hour != global_preferences_working.cpu_times.end_hour);
+    if (m_chkProcEveryDay->IsChecked()) {
+        m_txtProcEveryDayStart->ChangeValue(DoubleToTimeString(global_preferences_working.cpu_times.start_hour));
+        m_txtProcEveryDayStop->ChangeValue(DoubleToTimeString(global_preferences_working.cpu_times.end_hour));
+    }
 
-    m_ConnectBetweenBeginCtrl->Append(aConnectBetweenBegin);
-    if (display_global_preferences.net_times.start_hour == display_global_preferences.net_times.end_hour) {
-        m_strConnectBetweenBegin = _("Anytime");
-    } else {
-        m_strConnectBetweenBegin = astrTimeOfDayStrings[(int)display_global_preferences.net_times.start_hour];
+    //cpu limit
+    // 0 means "no retriction" but we don't use a checkbox here
+    if (global_preferences_working.cpu_usage_limit == 0.0) global_preferences_working.cpu_usage_limit = 100.0;
+    DisplayValue(global_preferences_working.cpu_usage_limit, m_txtProcUseCPUTime);
+    
+    // use network between
+    m_chkNetEveryDay->SetValue(global_preferences_working.net_times.start_hour != global_preferences_working.net_times.end_hour);
+    if (m_chkNetEveryDay->IsChecked()) {
+        m_txtNetEveryDayStart->ChangeValue(DoubleToTimeString(global_preferences_working.net_times.start_hour));
+        m_txtNetEveryDayStop->ChangeValue(DoubleToTimeString(global_preferences_working.net_times.end_hour));
     }
 
-    //   End:
-    m_ConnectBetweenEndCtrl->Append(wxArrayString(iTimeOfDayArraySize, astrTimeOfDayStrings));
-    m_strConnectBetweenEnd = astrTimeOfDayStrings[(int)display_global_preferences.net_times.end_hour];
-
-    // Use no more than %s of disk space
-    wxArrayString aDiskUsage = wxArrayString(iDiskUsageArraySize, astrDiskUsageStrings);
-    wxString strDiskUsage = wxEmptyString;
-    int iDiskUsageIndex = iDiskUsageArraySize - 1;
-
-    if (display_global_preferences.disk_max_used_gb > 0) {
-        if (display_global_preferences.disk_max_used_gb < 1) {
-            strDiskUsage.Printf(_("%d MB"), (int)(display_global_preferences.disk_max_used_gb * 1000));  
-	    } else {
-            strDiskUsage.Printf(_("%4.2f GB"), display_global_preferences.disk_max_used_gb); 
-	    }
-
-        // Null out strDiskUsage if it is a duplicate
-        for (i = 0; i < aDiskUsage.Count(); i++) {
-            strDiskUsage.ToDouble(&dTempValue1);
-            if (strDiskUsage.Find(wxT("MB")) != -1) {
-                dTempValue1 /= 1000;
-            }
-            aDiskUsage[i].ToDouble(&dTempValue2);
-            if (aDiskUsage[i].Find(wxT("MB")) != -1) {
-                dTempValue2 /= 1000;
-            }
-            if ((strDiskUsage == aDiskUsage[i]) || (dTempValue1 == dTempValue2)) {
-                strDiskUsage = wxEmptyString;
-                // Store this value so we know what to set the selection too in the
-                //   combo box.
-                iDiskUsageIndex = i;
-                break;
-            }
-        }
+    //max disk space used
+    m_chkDiskMaxSpace->SetValue(global_preferences_working.disk_max_used_gb > 0.0);
+    DisplayValue(global_preferences_working.disk_max_used_gb, m_txtDiskMaxSpace, m_chkDiskMaxSpace);
+
+    // Now make sure the UI is in sync with the settings
+    UpdateControlStates();
+
+    return true;
+}
+
+
+/* write overridden preferences to disk (global_prefs_override.xml) */
+/* IMPORTANT: Any items added here must be checked in ValidateInput()! */
+bool CPanelPreferences::SavePreferenceSettings() {
+    double td;
+
+    // on batteries
+    global_preferences_working.run_on_batteries = ! (m_chkProcOnBatteries->GetValue());
+    global_preferences_override_mask.run_on_batteries=true;
+
+    // in use
+    global_preferences_working.run_if_user_active = (! m_chkProcInUse->GetValue());
+    global_preferences_override_mask.run_if_user_active=true;
+
+    if(m_txtProcIdleFor->IsEnabled()) {
+        m_txtProcIdleFor->GetValue().ToDouble(&td);
+        global_preferences_working.idle_time_to_run=RoundToHundredths(td);
+        global_preferences_override_mask.idle_time_to_run=true;
     }
+    // else leave idle_time_to_run value and mask unchanged (in case run_gpu_if_user_active is false)
 
-    if (!strDiskUsage.IsEmpty()) {
-        aDiskUsage.Add(strDiskUsage);
-        aDiskUsage.Sort(CompareDiskUsage);
+    // do work between
+    if (m_chkProcEveryDay->IsChecked()) {
+        global_preferences_working.cpu_times.start_hour = TimeStringToDouble(m_txtProcEveryDayStart->GetValue());
+        global_preferences_working.cpu_times.end_hour = TimeStringToDouble(m_txtProcEveryDayStop->GetValue());
+    } else {
+        global_preferences_working.cpu_times.start_hour = global_preferences_working.cpu_times.end_hour = 0.0;
     }
+    global_preferences_override_mask.start_hour = global_preferences_override_mask.end_hour = true;
 
-    m_MaxDiskUsageCtrl->Append(aDiskUsage);
-    if (!strDiskUsage.IsEmpty()) {
-        m_strMaxDiskUsage = strDiskUsage;
+
+    //cpu limit
+    m_txtProcUseCPUTime->GetValue().ToDouble(&td);
+    global_preferences_working.cpu_usage_limit=RoundToHundredths(td);
+    global_preferences_override_mask.cpu_usage_limit=true;
+    
+    if (m_chkDiskMaxSpace->IsChecked()) {
+        m_txtDiskMaxSpace->GetValue().ToDouble(&td);
+        global_preferences_working.disk_max_used_gb=RoundToHundredths(td);
     } else {
-        m_strMaxDiskUsage = astrDiskUsageStrings[iDiskUsageIndex];
+        global_preferences_working.disk_max_used_gb = 0.0;
     }
+    global_preferences_override_mask.disk_max_used_gb=true;
+    
+    // use network between
+    if (m_chkNetEveryDay->IsChecked()) {
+        global_preferences_working.net_times.start_hour = TimeStringToDouble(m_txtNetEveryDayStart->GetValue());
+        global_preferences_working.net_times.end_hour = TimeStringToDouble(m_txtNetEveryDayStop->GetValue());
+    } else {
+        global_preferences_working.net_times.start_hour = global_preferences_working.net_times.end_hour = 0.0;
+    }
+    global_preferences_override_mask.net_start_hour = global_preferences_override_mask.net_end_hour = true;
+
+    //max disk space used
+    // BOINC uses the most restrictive of these 3 settings:
+    // disk_max_used_gb, disk_min_free_gb, disk_max_used_pct.
+    // Since the Simple Prefs dialog allows the user to set only
+    // disk_max_used_gb, we set the other two to "no restriction"
+    global_preferences_working.disk_min_free_gb = 0.0;
+    global_preferences_override_mask.disk_min_free_gb=true;
+    global_preferences_working.disk_max_used_pct = 100.0;
+    global_preferences_override_mask.disk_max_used_pct=true;
+
+    return true;
+}
+
+
+/* validates the entered informations */
+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 invMsgLimit100 = _("Number must be between 0 and 100");
+    wxString buffer;
 
-    // Use no more than %s of the processor
-    wxArrayString aCPUUsage = wxArrayString(iCPUUsageArraySize, astrCPUUsageStrings);
-    wxString strCPUUsage = wxEmptyString;
-    int iCPUUsageIndex = iCPUUsageArraySize - 4;
-
-    if (display_global_preferences.cpu_usage_limit > 0) {
-        strCPUUsage.Printf(_("%d%%"), (int)display_global_preferences.cpu_usage_limit); 
-
-        // Null out strCPUUsage if it is a duplicate
-        for (i=0; i < aCPUUsage.Count(); i++) {
-            strCPUUsage.ToDouble(&dTempValue1);
-            aCPUUsage[i].ToDouble(&dTempValue2);
-            if ((strCPUUsage == aCPUUsage[i]) || (dTempValue1 == dTempValue2)) {
-                strCPUUsage = wxEmptyString;
-                // Store this value so we know what to set the selection too in the
-                //   combo box.
-                iCPUUsageIndex = i;
-                break;
-            }
+    if(m_txtProcIdleFor->IsEnabled()) {
+        buffer = m_txtProcIdleFor->GetValue();
+        if(!IsValidFloatValue(buffer)) {
+            ShowErrorMessage(invMsgFloat,m_txtProcIdleFor);
+            return false;
         }
     }
 
-    if (!strCPUUsage.IsEmpty()) {
-        aCPUUsage.Add(strCPUUsage);
-        aCPUUsage.Sort(CompareCPUUsage);
+    if (m_chkProcEveryDay->IsChecked()) {
+        buffer = m_txtProcEveryDayStart->GetValue();
+        if(!IsValidTimeValue(buffer)) {
+            ShowErrorMessage(invMsgTime,m_txtProcEveryDayStart);
+            return false;
+        }
+        buffer = m_txtProcEveryDayStop->GetValue();
+        if(!IsValidTimeValue(buffer)) {
+            ShowErrorMessage(invMsgTime,m_txtProcEveryDayStop);
+            return false;
+        }
     }
-
-    m_MaxCPUUsageCtrl->Append(aCPUUsage);
-    if (!strCPUUsage.IsEmpty()) {
-        m_strMaxCPUUsage = strCPUUsage;
-    } else {
-        m_strMaxCPUUsage = astrCPUUsageStrings[iCPUUsageIndex];
+    
+    buffer = m_txtProcUseCPUTime->GetValue();
+    if(!IsValidFloatValueBetween(buffer, 0.0, 100.0)) {
+        ShowErrorMessage(invMsgLimit100, m_txtProcUseCPUTime);
+        return false;
     }
 
-    // Do work while computer is on battery?
-    m_bWorkWhileOnBattery = display_global_preferences.run_on_batteries;
-
-    // Do work after computer is idle for:
-    wxArrayString aWorkWhenIdle = wxArrayString(iWorkWhenIdleArraySize, astrWorkWhenIdleStrings);
-    wxString strWorkWhenIdle = wxEmptyString;
-    int iWorkWhenIdleIndex = 2;
-
-    aWorkWhenIdle.Insert(_("0 (Run Always)"), 0);
-
-	if (display_global_preferences.idle_time_to_run > 0) {
-        strWorkWhenIdle.Printf(_("%d"), (int)display_global_preferences.idle_time_to_run); 
-
-        // Null out strWorkWhenIdle if it is a duplicate
-        for (i=0; i < aWorkWhenIdle.Count(); i++) {
-            strWorkWhenIdle.ToDouble(&dTempValue1);
-            aWorkWhenIdle[i].ToDouble(&dTempValue2);
-            if ((strWorkWhenIdle == aWorkWhenIdle[i]) || (dTempValue1 == dTempValue2)) {
-                strWorkWhenIdle = wxEmptyString;
-                // Store this value so we know what to set the selection too in the
-                //   combo box.
-                iWorkWhenIdleIndex = i;
-                break;
-            }
+    if (m_chkNetEveryDay->IsChecked()) {
+        buffer = m_txtNetEveryDayStart->GetValue();
+        if(!IsValidTimeValue(buffer)) {
+            ShowErrorMessage(invMsgTime,m_txtNetEveryDayStart);
+            return false;
+        }
+        buffer = m_txtNetEveryDayStop->GetValue();
+        if(!IsValidTimeValue(buffer)) {
+            ShowErrorMessage(invMsgTime,m_txtNetEveryDayStop);
+            return false;
+        }
+    }
+    
+    if (m_chkDiskMaxSpace->IsChecked()) {
+        buffer = m_txtDiskMaxSpace->GetValue();
+        if(!IsValidFloatValue(buffer)) {
+            ShowErrorMessage(invMsgFloat, m_txtDiskMaxSpace);
+            return false;
         }
     }
+    
+    return true;
+}
 
-    if (!strWorkWhenIdle.IsEmpty()) {
-        aWorkWhenIdle.Add(strWorkWhenIdle);
-        aWorkWhenIdle.Sort(CompareWorkWhenIdle);
+
+/* show an error message and set the focus to the control that caused the error */
+void CPanelPreferences::ShowErrorMessage(wxString& message,wxTextCtrl* errorCtrl) {
+    if(message.IsEmpty()){
+        message = _("invalid input value detected");
     }
+    wxGetApp().SafeMessageBox(message,_("Validation Error"),wxOK | wxCENTRE | wxICON_ERROR,this);
+    errorCtrl->SetFocus();
+}
 
-    m_WorkWhenIdleCtrl->Append(aWorkWhenIdle);
 
-	if (display_global_preferences.run_if_user_active) {
-		// run_if_user_active and idle_time_to_run were merged into a single combo
-		//   box. 0 = run if active.
-		m_strWorkWhenIdle = aWorkWhenIdle[0];
-	} else {	
-		if (strWorkWhenIdle.IsEmpty()) {
-			m_strWorkWhenIdle = aWorkWhenIdle[iWorkWhenIdleIndex];
-		} else {
-			m_strWorkWhenIdle = strWorkWhenIdle;
-		}
-	}
+/* checks if ch is a valid character for float values */
+bool CPanelPreferences::IsValidFloatChar(const wxChar& ch) {
+    //don't accept the e
+    return wxIsdigit(ch) || ch=='.' || ch==',' || ch=='+' || ch=='-';}
+
+/* checks if ch is a valid character for time values */
+bool CPanelPreferences::IsValidTimeChar(const wxChar& ch) {
+    return wxIsdigit(ch) || ch==':';
+}
 
-    // Now make sure the UI is in sync with the settings
-    TransferDataToWindow();
-    UpdateControlStates();
 
+/* checks if the value contains a valid float */
+bool CPanelPreferences::IsValidFloatValue(const wxString& value, bool allowNegative) {
+    for(unsigned int i=0; i < value.Length();i++) {
+        if(!IsValidFloatChar(value[i])) {
+            return false;
+        }
+    }
+    //all chars are valid, now what is with the value as a whole ?
+    double td;
+    if(!value.ToDouble(&td)) {
+        return false;
+    }
+    if (!allowNegative) {
+        if (td < 0.0) return false;
+    }
     return true;
 }
 
 
-bool CPanelPreferences::SavePreferenceSettings() {
-    // Do work only between:
-    if (_("Anytime") == m_strWorkBetweenBegin) {
-        global_preferences_working.cpu_times.start_hour = 0;
-        global_preferences_working.cpu_times.end_hour = 0;
-    } else {
-        m_strWorkBetweenBegin.ToDouble(&global_preferences_working.cpu_times.start_hour);
-        m_strWorkBetweenEnd.ToDouble(&global_preferences_working.cpu_times.end_hour);
+bool CPanelPreferences::IsValidFloatValueBetween(const wxString& value, double minVal, double maxVal){
+    for(unsigned int i=0; i < value.Length();i++) {
+        if(!IsValidFloatChar(value[i])) {
+            return false;
+        }
     }
-    global_preferences_override_mask.start_hour = true;        
-    global_preferences_override_mask.end_hour = true;
+    //all chars are valid, now what is with the value as a whole ?
+    double td;
+    if(!value.ToDouble(&td)) {
+        return false;
+    }
+    if ((td < minVal) || (td > maxVal)) return false;
+    return true;
+}
 
-    // Connect to internet only between:
-    if (_("Anytime") == m_strConnectBetweenBegin) {
-        global_preferences_working.net_times.start_hour = 0;
-        global_preferences_working.net_times.end_hour = 0;
-    } else {
-        m_strConnectBetweenBegin.ToDouble(&global_preferences_working.net_times.start_hour);
-        m_strConnectBetweenEnd.ToDouble(&global_preferences_working.net_times.end_hour);
+
+/* checks if the value is a valid time */
+bool CPanelPreferences::IsValidTimeValue(const wxString& value) {
+    for(unsigned int i=0; i < value.Length();i++) {
+        if(!IsValidTimeChar(value[i])) {
+            return false;
+        }
     }
-    global_preferences_override_mask.net_start_hour = true;        
-    global_preferences_override_mask.net_end_hour = true;        
+    //all chars are valid, now what is with the value as a whole ?
+    wxDateTime dt;
+    const wxChar* stopChar = dt.ParseFormat(value,wxT("%H:%M"));
+    if(stopChar==NULL && value != wxT("24:00")) {
+        // conversion failed
+        return false;
+    }
+    return true;
+}
+
 
-    // Use no more than %s of disk space
-    m_strMaxDiskUsage.ToDouble((double*)&global_preferences_working.disk_max_used_gb);
-    if (m_strMaxDiskUsage.Find(wxT("MB")) != -1) {
-        global_preferences_working.disk_max_used_gb /= 1000;
+void CPanelPreferences::OnHandleCheckboxEvent(wxCommandEvent& ev) {
+    ev.Skip();
+    // If user has just set the checkbox, set textedit field to default value.
+    // Note: use ChangeValue() here to avoid generating extra events.
+    // m_txtProcIdleFor depends on 2 checkboxes, set it in UpdateControlStates().
+    switch (ev.GetId()) {
+    case ID_CHKPROCINUSE:
+        DisplayValue(defaultPrefs.idle_time_to_run, m_txtProcIdleFor, m_chkProcInUse);
+        break;
+    case ID_CHKDISKMAXSPACE:
+        DisplayValue(defaultPrefs.disk_max_used_gb, m_txtDiskMaxSpace, m_chkDiskMaxSpace);
+        break;
+    case ID_CHKPROCEVERYDAY:
+        if (ev.IsChecked()) {
+            m_txtProcEveryDayStart->ChangeValue(DoubleToTimeString(defaultPrefs.cpu_times.start_hour));
+            m_txtProcEveryDayStop->ChangeValue(DoubleToTimeString(defaultPrefs.cpu_times.end_hour));
+        } else {
+            m_txtProcEveryDayStart->Clear();
+            m_txtProcEveryDayStop->Clear();
+        }
+        break;
+    case ID_CHKNETEVERYDAY:
+       if (ev.IsChecked()) {
+            m_txtNetEveryDayStart->ChangeValue(DoubleToTimeString(defaultPrefs.net_times.start_hour));
+            m_txtNetEveryDayStop->ChangeValue(DoubleToTimeString(defaultPrefs.net_times.end_hour));
+        } else {
+            m_txtNetEveryDayStart->Clear();
+            m_txtNetEveryDayStop->Clear();
+        }
+        break;
+
+
+
+    
+    default:
+        break;
     }
-    global_preferences_override_mask.disk_max_used_gb = true;        
+    UpdateControlStates();
+}
 
-    // Use no more than %s of the processor
-    m_strMaxCPUUsage.ToDouble((double*)&global_preferences_working.cpu_usage_limit);
-    global_preferences_override_mask.cpu_usage_limit = true;        
 
-    // Do work while computer is on battery?
-    global_preferences_working.run_on_batteries = m_bWorkWhileOnBattery;
-    global_preferences_override_mask.run_on_batteries = true;        
+void CPanelPreferences::addNewRowToSizer(
+                wxSizer* toSizer, wxString& toolTipText,
+                wxWindow* first, wxWindow* second, wxWindow* third,
+                wxWindow* fourth, wxWindow* fifth)
+{
+    wxBoxSizer* rowSizer = new wxBoxSizer( wxHORIZONTAL );
+    
+#ifdef __WXMSW__
+    // MSW adds space to the right of checkbox label
+    if (first->IsKindOf(CLASSINFO(CTransparentCheckBox))) {
+        rowSizer->Add(first, 0, wxTOP | wxBOTTOM |wxLEFT, 5 );
+    } else
+#endif
+        rowSizer->Add(first, 0, wxALL, 5 );
+    
+    first->SetToolTip(toolTipText);
+    
+    rowSizer->Add(second, 0, wxALL, 2 );
+    second->SetToolTip(toolTipText);
 
-    // Do work after computer is idle for:
-    m_strWorkWhenIdle.ToDouble((double*)&global_preferences_working.idle_time_to_run);
-    if (0 == global_preferences_working.idle_time_to_run) {
-        global_preferences_working.run_if_user_active = true;
-        global_preferences_override_mask.idle_time_to_run = false;
-    } else {
-        global_preferences_working.run_if_user_active = false;
-        global_preferences_override_mask.idle_time_to_run = true;
+    rowSizer->Add(third, 0, wxALL, 5 );
+    third->SetToolTip(toolTipText);
+
+    if (fourth) {
+        rowSizer->Add(fourth, 0, wxALL, 2 );
+        fourth->SetToolTip(toolTipText);
+    }
+    
+    if (fifth) {
+        rowSizer->Add(fifth, 0, wxALL, 5 );
+        fifth->SetToolTip(toolTipText);
     }
-    global_preferences_override_mask.run_if_user_active = true;        
+    
+    toSizer->Add( rowSizer, 0, 0, 1 );
+}
 
-    return true;
+
+wxSize CPanelPreferences::getTextCtrlSize(wxString maxText) {
+    int w, h, margin;
+    wxSize sz;
+    wxFont f = GetParent()->GetFont();
+    GetTextExtent(maxText, &w, &h, NULL, NULL, &f);
+    margin = w/3;
+    if (margin < 9) margin = 9;
+    sz.x = w + margin;
+    sz.y = wxDefaultCoord;
+    return sz;
+}
+
+
+bool CPanelPreferences::doesLocalPrefsFileExist() {
+    std::string s;
+    int retval;
+    bool local_prefs_found = false;
+    MIOFILE mf;
+    bool found_venue;
+    GLOBAL_PREFS web_prefs;
+    GLOBAL_PREFS_MASK mask;
+    CMainDocument* pDoc = wxGetApp().GetDocument();
+
+    wxASSERT(pDoc);
+    wxASSERT(wxDynamicCast(pDoc, CMainDocument));
+
+    retval = pDoc->rpc.get_global_prefs_override(s);
+    local_prefs_found = (retval == BOINC_SUCCESS);
+    
+    s.clear();
+    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);
+    
+    return local_prefs_found;
 }
 
 
@@ -966,10 +1066,10 @@ bool CDlgPreferences::Create( wxWindow* parent, wxWindowID id, const wxString& c
     SetBackgroundColour(wxColour(255, 0, 255));
 #endif
 
+    wxBoxSizer* dialogSizer = new wxBoxSizer( wxVERTICAL );
+    SetSizer(dialogSizer);
     m_pBackgroundPanel = new CPanelPreferences(this);
-    wxBoxSizer* itemBoxSizer = new wxBoxSizer(wxVERTICAL);
-    SetSizer(itemBoxSizer);
-    itemBoxSizer->Add(m_pBackgroundPanel, 0, wxGROW, 0);
+    dialogSizer->Add(m_pBackgroundPanel, 0, wxGROW, 0);
     
     GetSizer()->Fit(this);
     GetSizer()->SetSizeHints(this);
@@ -1023,15 +1123,16 @@ void CDlgPreferences::OnButtonClear( wxCommandEvent& WXUNUSED(event) ) {
  */
 
 void CDlgPreferences::OnOK( wxCommandEvent& WXUNUSED(event) ) {
-    m_pBackgroundPanel->OnOK();
-    EndModal(wxID_OK);
+    if (m_pBackgroundPanel->OnOK()) {
+        EndModal(wxID_OK);
+    }
 }
 
 
 bool CDlgPreferences::ConfirmClear() {
 	int res = wxGetApp().SafeMessageBox(_(
-	    "Do you really want to clear all local preferences?\n"),
-		_("Confirmation"),wxCENTER | wxICON_QUESTION | wxYES_NO | wxNO_DEFAULT,this);
+        "Discard all local preferences and use web-based preferences?"),
+		_("Confirmation"),wxCENTER | wxICON_QUESTION | wxYES_NO | wxNO_DEFAULT, this);
 	
 	return res==wxYES;
 }
diff --git a/clientgui/sg_DlgPreferences.h b/clientgui/sg_DlgPreferences.h
index 7824f0d..3b93a43 100644
--- a/clientgui/sg_DlgPreferences.h
+++ b/clientgui/sg_DlgPreferences.h
@@ -37,7 +37,6 @@
  */
 
 ////@begin forward declarations
-class CTransparentCheckBox;
 ////@end forward declarations
 
 /*!
@@ -51,15 +50,26 @@ class CTransparentCheckBox;
 #define SYMBOL_CDLGPREFERENCES_IDNAME ID_DLGPREFERENCES
 #define SYMBOL_CDLGPREFERENCES_SIZE wxDefaultSize
 #define SYMBOL_CDLGPREFERENCES_POSITION wxDefaultPosition
-#define ID_WORKBETWEENBEGIN 10004
-#define ID_WORKBETWEENEND 10006
-#define ID_CONNECTBETWEENBEGIN 10007
-#define ID_CONNECTBETWEENEND 10009
-#define ID_MAXDISKUSAGE 10010
-#define ID_MAXCPUUSAGE 10011
-#define ID_WORKWHILEONBATTERY 10005
-#define ID_WORKWHENIDLE 10012
-#define ID_SGPREFERENCESCLEAR 10001
+
+#define ID_SG_PREFS_START ID_DLGPREFERENCES+1
+
+enum {
+    ID_SGPREFERENCESCLEAR = ID_SG_PREFS_START,
+    ID_CHKPROCONBATTERIES,
+    ID_CHKPROCINUSE,
+    ID_TXTPROCIDLEFOR,
+    ID_CHKPROCEVERYDAY,
+    ID_TXTPROCEVERYDAYSTART,
+    ID_TXTPROCEVERYDAYSTOP,
+    ID_TXTPOCUSECPUTIME,
+    ID_CHKNETEVERYDAY,
+    ID_TXTNETEVERYDAYSTART,
+    ID_TXTNETEVERYDAYSTOP,
+    ID_CHKDISKMAXSPACE,
+    ID_TXTDISKMAXSPACE,
+    ID_SG_PREFS_LAST
+};
+
 ////@end control identifiers
 
 /*!
@@ -87,12 +97,16 @@ public:
     CPanelPreferences( );
     CPanelPreferences( wxWindow* parent );
 
+    ~CPanelPreferences( );
+
     /// Creation
     bool Create();
 
     /// Creates the controls and sizers
     void CreateControls();
 
+    void MakeBackgroundBitmap();
+
 ////@begin CPanelPreferences event handler declarations
     /// wxEVT_ERASE_BACKGROUND event handler for ID_DLGPREFERENCES
     void OnEraseBackground( wxEraseEvent& event );
@@ -108,66 +122,61 @@ public:
     
 ////@end CPanelPreferences event handler declarations
 
-////@begin CPanelPreferences member function declarations
-    wxString GetWorkBetweenBegin() const { return m_strWorkBetweenBegin ; }
-    void SetWorkBetweenBegin(wxString value) { m_strWorkBetweenBegin = value ; }
-
-    wxString GetWorkBetweenEnd() const { return m_strWorkBetweenEnd ; }
-    void SetWorkBetweenEnd(wxString value) { m_strWorkBetweenEnd = value ; }
-
-    wxString GetConnectBetweenBegin() const { return m_strConnectBetweenBegin ; }
-    void SetConnectBetweenBegin(wxString value) { m_strConnectBetweenBegin = value ; }
-
-    wxString GetConnectBetweenEnd() const { return m_strConnectBetweenEnd ; }
-    void SetConnectBetweenEnd(wxString value) { m_strConnectBetweenEnd = value ; }
-
-    wxString GetMaxDiskUsage() const { return m_strMaxDiskUsage ; }
-    void SetMaxDiskUsage(wxString value) { m_strMaxDiskUsage = value ; }
-
-    wxString GetMaxCPUUsage() const { return m_strMaxCPUUsage ; }
-    void SetMaxCPUUsage(wxString value) { m_strMaxCPUUsage = value ; }
-
-    bool GetWorkWhileOnBattery() const { return m_bWorkWhileOnBattery ; }
-    void SetWorkWhileOnBattery(bool value) { m_bWorkWhileOnBattery = value ; }
-
-    wxString GetWorkWhenIdle() const { return m_strWorkWhenIdle ; }
-    void SetWorkWhenIdle(wxString value) { m_strWorkWhenIdle = value ; }
-
-////@end CPanelPreferences member function declarations
-
     void OnButtonClear();
-    void OnOK();
+    bool OnOK();
 
     bool UpdateControlStates();
 
     bool ClearPreferenceSettings();
+	wxString DoubleToTimeString(double dt);
+	double TimeStringToDouble(wxString timeStr);
+    double RoundToHundredths(double td);
+    void DisplayValue(double value, wxTextCtrl* textCtrl, wxCheckBox* checkBox=NULL);
     bool ReadPreferenceSettings();
     bool SavePreferenceSettings();
+	bool ValidateInput();
+	void ShowErrorMessage(wxString& msg,wxTextCtrl* errorCtrl);
+	bool IsValidFloatChar(const wxChar& ch);
+	bool IsValidFloatValue(const wxString& value, bool allowNegative=false);
+    bool IsValidFloatValueBetween(const wxString& value, double minVal, double maxVal);
+	bool IsValidTimeChar(const wxChar& ch);
+	bool IsValidTimeValue(const wxString& value);
+	void OnHandleCheckboxEvent(wxCommandEvent& ev);
+    
+    void addNewRowToSizer(wxSizer* toSizer, wxString& toolTipText,
+                wxWindow* first, wxWindow* second, wxWindow* third,
+                wxWindow* fourth=NULL, wxWindow* fifth=NULL);
+    wxSize getTextCtrlSize(wxString maxText);
+    bool doesLocalPrefsFileExist();
+    wxBitmap* GetBackgroundBmp() { return m_backgroundBitmap; }
 
 private:
 ////@begin CPanelPreferences member variables
-    wxComboBox* m_WorkBetweenBeginCtrl;
-    wxComboBox* m_WorkBetweenEndCtrl;
-    wxComboBox* m_ConnectBetweenBeginCtrl;
-    wxComboBox* m_ConnectBetweenEndCtrl;
-    wxComboBox* m_MaxDiskUsageCtrl;
-    wxComboBox* m_MaxCPUUsageCtrl;
-    wxCheckBox* m_WorkWhileOnBatteryCtrl;
-    wxComboBox* m_WorkWhenIdleCtrl;
-    wxString m_strWorkBetweenBegin;
-    wxString m_strWorkBetweenEnd;
-    wxString m_strConnectBetweenBegin;
-    wxString m_strConnectBetweenEnd;
-    wxString m_strMaxDiskUsage;
-    wxString m_strMaxCPUUsage;
-    bool m_bWorkWhileOnBattery;
-    wxString m_strWorkWhenIdle;
+    wxCheckBox* m_chkProcOnBatteries;
+    wxCheckBox* m_chkProcInUse;
+    wxTextCtrl* m_txtProcIdleFor;
+    wxCheckBox* m_chkProcEveryDay;
+    wxTextCtrl* m_txtProcEveryDayStart;
+    wxTextCtrl* m_txtProcEveryDayStop;
+    wxTextCtrl* m_txtProcUseCPUTime;
+    wxCheckBox* m_chkNetEveryDay;
+    wxTextCtrl* m_txtNetEveryDayStart;
+    wxTextCtrl* m_txtNetEveryDayStop;
+    wxCheckBox* m_chkDiskMaxSpace;
+    wxTextCtrl* m_txtDiskMaxSpace;
+
+    wxTextValidator* m_vTimeValidator;
     wxButton* m_btnClear;
-    
+    wxString *web_prefs_url;
+ 
+    wxBitmap* m_backgroundBitmap;
+   
 ////@end CPanelPreferences member variables
     GLOBAL_PREFS      global_preferences_working;
     GLOBAL_PREFS_MASK global_preferences_mask;
     GLOBAL_PREFS_MASK global_preferences_override_mask;
+    GLOBAL_PREFS      defaultPrefs;
+
 };
 
 
diff --git a/clientgui/sg_TaskPanel.cpp b/clientgui/sg_TaskPanel.cpp
index 6628fe2..f4a6bcb 100644
--- a/clientgui/sg_TaskPanel.cpp
+++ b/clientgui/sg_TaskPanel.cpp
@@ -1113,9 +1113,7 @@ void CSimpleTaskPanel::UpdateTaskSelectionList(bool reskin) {
     for(j = 0; j < count; ++j) {
         selData = (TaskSelectionData*)m_TaskSelectionCtrl->GetClientData(j);
         ctrlResult = selData->result;
-        if (Suspended() || ctrlResult->suspended_via_gui || ctrlResult->project_suspended_via_gui) {
-            newIcon = suspendedIcon;
-        } else if (isRunning(ctrlResult)) {
+        if (isRunning(ctrlResult)) {
             newIcon = runningIcon;
         } else if (ctrlResult->scheduler_state == CPU_SCHED_PREEMPTED) {
             newIcon = waitingIcon;
@@ -1150,25 +1148,28 @@ void CSimpleTaskPanel::UpdateTaskSelectionList(bool reskin) {
 
 
 bool CSimpleTaskPanel::isRunning(RESULT* result) {
-    bool outcome = false;
 
     // It must be scheduled to be running
-    if ( result->scheduler_state == CPU_SCHED_SCHEDULED ) {
-        // If either the project or task have been suspended, then it cannot be running
-        if ( !result->suspended_via_gui && !result->project_suspended_via_gui ) {
-            CC_STATUS status;
-            CMainDocument*      pDoc = wxGetApp().GetDocument();
-            wxASSERT(pDoc);
-            
-            pDoc->GetCoreClientStatus(status);
-            // Make sure that the core client isn't global suspended for some reason
-            if ( status.task_suspend_reason == 0 || status.task_suspend_reason == SUSPEND_REASON_CPU_THROTTLE ) {
-                outcome = true;
-            }
-        }
+    if ( result->scheduler_state != CPU_SCHED_SCHEDULED ) {
+        return false;
+    }
+    // If either the project or task have been suspended, then it cannot be running
+    if (result->suspended_via_gui || result->project_suspended_via_gui ) {
+        return false;
     }
+    CC_STATUS status;
+    CMainDocument*      pDoc = wxGetApp().GetDocument();
+    wxASSERT(pDoc);
 
-    return outcome;
+    pDoc->GetCoreClientStatus(status);
+    // Make sure that the core client isn't global suspended for some reason
+    if (status.task_suspend_reason == 0 || status.task_suspend_reason == SUSPEND_REASON_CPU_THROTTLE) {
+        return true;
+    }
+    if (result->active_task_state == PROCESS_EXECUTING) {
+        return true;
+    }
+    return false;
 }
 
 
diff --git a/clientscr/mac_saver_module.cpp b/clientscr/mac_saver_module.cpp
index 202cead..8006038 100644
--- a/clientscr/mac_saver_module.cpp
+++ b/clientscr/mac_saver_module.cpp
@@ -453,7 +453,7 @@ int CScreensaver::getSSMessage(char **theMessage, int* coveredFreq) {
                 m_bConnected = true;
                 if (IsDualGPUMacbook) {
                     ccstate.clear();
-                    ccstate.global_prefs.clear_bools();
+                    ccstate.global_prefs.init_bools();
                     int result = rpc->get_state(ccstate);
                     if (!result) {
                         OKToRunOnBatteries = ccstate.global_prefs.run_on_batteries;
diff --git a/clientscr/ss_app.cpp b/clientscr/ss_app.cpp
index 3fe5ef2..13deada 100644
--- a/clientscr/ss_app.cpp
+++ b/clientscr/ss_app.cpp
@@ -432,7 +432,7 @@ void app_graphics_render(int xs, int ys, double t) {
                 showing_project = false;
                 project_index++;
             } else {
-                int n = cc_state.results.size();
+                int n = (int)cc_state.results.size();
                 if (n) {
                     job_index += MAX_JOBS_DISPLAY;
                     job_index %= n;
diff --git a/configure.ac b/configure.ac
index f1c758d..38b8dc3 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.4.42)
+AC_INIT(BOINC, 7.5.0)
 AC_CONFIG_MACRO_DIR([m4])
 LIBBOINC_VERSION=`echo ${PACKAGE_VERSION} | sed 's/\./:/g'`
 AC_SUBST([LIBBOINC_VERSION])
 
-WRAPPER_RELEASE=26010
+WRAPPER_RELEASE=26013
 AC_SUBST([WRAPPER_RELEASE])
 
-VBOXWRAPPER_RELEASE=26089
+VBOXWRAPPER_RELEASE=26161
 AC_SUBST([VBOXWRAPPER_RELEASE])
 
 AC_CANONICAL_TARGET
@@ -32,7 +32,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AC_CONFIG_SRCDIR(lib/shmem.cpp)
 
-AC_REVISION([$Revision$]) 
+AC_REVISION([$Revision$])
 REV=`echo '$Revision$' | awk "{print $2}"`
 RDATE=`date '+%Y.%m.%d'`
 if test -d .svn ; then
@@ -42,6 +42,13 @@ fi
 AC_SUBST(REV)
 AC_SUBST(RDATE)
 
+dnl Are we compiling for windows
+if echo $host_os | egrep '^mingw|^winnt' > /dev/null ; then
+  isWIN32=yes
+else
+  isWIN32=no
+fi
+
 dnl turn dependency tracking on by default
 if test x${enable_dependency_tracking} != xno ; then
   enable_dependency_tracking=yes
@@ -65,45 +72,45 @@ AM_PROG_CC_C_O
 m4_divert_once([HELP_ENABLE],
   AS_HELP_STRING([BOINC Default enable values], [--enable-server --enable-client --enable-libraries --enable-manager: builds server, client, and libraries]))
 
-AC_ARG_ENABLE(dynamic-client-linkage, 
+AC_ARG_ENABLE(dynamic-client-linkage,
     AS_HELP_STRING([--enable-dynamic-client-linkage],
                    [dynamically link the client to the boinc libraries]),
     [dynamic_client=${enableval}],
     [dynamic_client=no])
 
-AC_ARG_ENABLE(server, 
+AC_ARG_ENABLE(server,
     AS_HELP_STRING([--disable-server],
                    [disable building the scheduling server]),
     [enable_server=${enableval}],
     [enable_server=yes])
 
-AC_ARG_ENABLE(fcgi, 
+AC_ARG_ENABLE(fcgi,
     AS_HELP_STRING([--disable-fcgi],
                    [disable building fcgi libraries or server components]),
     [enable_fcgi=${enableval}],
     [enable_fcgi=${enable_server}])
 
-AC_ARG_ENABLE(client, 
+AC_ARG_ENABLE(client,
     AS_HELP_STRING([--disable-client],
                    [disable building the client]),
     [enable_client=${enableval}],
     [enable_client=yes])
 
-AC_ARG_ENABLE(manager, 
+AC_ARG_ENABLE(manager,
     AS_HELP_STRING([--disable-manager],
                    [disable building the boinc manager gui]),
     [enable_manager=${enableval}],
     [enable_manager=yes])
 
-AC_ARG_ENABLE(libraries, 
+AC_ARG_ENABLE(libraries,
     AS_HELP_STRING([--disable-libraries],
                    [disable building the boinc client and server libraries]),
     [enable_libraries=${enableval}],
     [enable_libraries=yes])
 
-AC_ARG_ENABLE(install-headers, 
+AC_ARG_ENABLE(install-headers,
     AS_HELP_STRING([--disable-install-headers],
-                   [if building libraries do not install the boinc library 
+                   [if building libraries do not install the boinc library
                     header files]),
     [enable_install_headers=${enableval}],
     [enable_install_headers=yes])
@@ -114,7 +121,13 @@ AC_ARG_ENABLE(boinczip,
     [enable_boinczip=${enableval}],
     [enable_boinczip=no])
 
-AC_ARG_ENABLE(pkg-libs, 
+AC_ARG_ENABLE(apps,
+    AS_HELP_STRING([--enable-apps],
+                   [enable building the boinc example apps]),
+    [enable_apps=${enableval}],
+    [enable_apps=no])
+
+AC_ARG_ENABLE(pkg-libs,
     AS_HELP_STRING([--enable-pkg-libs],
                    [Builds and installs components that would be present in a
 		   boinc-libs package.  This is a synonym for --disable-server
@@ -128,10 +141,11 @@ AC_ARG_ENABLE(pkg-libs,
      enable_install_headers=no
      enable_static=no
 	 enable_boinczip=yes
+	 enable_apps=no
     ],
     [])
 
-AC_ARG_ENABLE(pkg-devel, 
+AC_ARG_ENABLE(pkg-devel,
     AS_HELP_STRING([--enable-pkg-devel],
                    [Builds and installs components that would be present in a
 		   boinc-devel package.  This is a synonym for --disable-server
@@ -144,10 +158,11 @@ AC_ARG_ENABLE(pkg-devel,
      enable_manager=no
      enable_install_headers=yes
 	 enable_boinczip=yes
+	 enable_apps=no
     ],
     [])
 
-AC_ARG_ENABLE(pkg-client, 
+AC_ARG_ENABLE(pkg-client,
     AS_HELP_STRING([--enable-pkg-client],
                    [Builds and installs components that would be present in a
 		   boinc-client package. This is a synonym for --disable-server
@@ -160,10 +175,11 @@ AC_ARG_ENABLE(pkg-client,
      enable_manager=no
      enable_install_headers=no
 	 enable_boinczip=no
+	 enable_apps=no
     ],
     [])
 
-AC_ARG_ENABLE(pkg-manager, 
+AC_ARG_ENABLE(pkg-manager,
     AS_HELP_STRING([--enable-pkg-manager],
                    [Builds and installs components that would be present in a boinc-manager package. This is a synonym for --disable-server --disable-client --disable-libraries --enable-manager
     ]),
@@ -174,6 +190,7 @@ AC_ARG_ENABLE(pkg-manager,
      enable_manager=yes
      enable_install_headers=no
 	 enable_boinczip=no
+	 enable_apps=no
     ],
     [])
 
@@ -193,6 +210,9 @@ fi
 if test x$enable_server = xyes ; then
   configured_to_build="${configured_to_build} server"
 fi
+if test x$enable_apps = xyes ; then
+  configured_to_build="${configured_to_build} apps"
+fi
 
 if test -z "${configured_to_build}" ; then
         AC_MSG_ERROR([
@@ -210,11 +230,11 @@ fi
 dnl ======================================================================
 dnl some vodoo required for building portable client-binary (client, clientgui)
 dnl ======================================================================
-AC_ARG_ENABLE([client-release], 
+AC_ARG_ENABLE([client-release],
    AS_HELP_STRING([--enable-client-release],
         [Attempt to build a portable "release-candidate": this links libstd++ and
-	other addon-libraries statically. 
-	(On GNU/Linux you might need to use gcc-3.0 for this to produce a 
+	other addon-libraries statically.
+	(On GNU/Linux you might need to use gcc-3.0 for this to produce a
 	binary that works for glibc <= 2.2 systems. => use CC=gcc-3.0 and CXX=g++-3.0)
 	(Default = no)]),
     [
@@ -232,7 +252,7 @@ WARNING:  You have requested a statically linked release build.
     also need to edit Makefiles manually in order for linking to work.
 
     It is far better to use dynamic linkage, which can resolve most
-    library interdependencies at run time.  
+    library interdependencies at run time.
 
     When the executable fails to link, and you can identify the missing
     library, you can edit the Makefile to add it, or if there is a --with
@@ -296,7 +316,7 @@ dnl AC_DEFINE_UNQUOTED([BOINC_MAJOR_VERSION], $BOINC_MAJOR_VERSION, [Major part
 dnl AC_DEFINE_UNQUOTED([BOINC_MINOR_VERSION], $BOINC_MINOR_VERSION, [Minor part of BOINC version number])
 dnl AC_DEFINE_UNQUOTED([BOINC_RELEASE], $BOINC_RELEASE, [Release part of BOINC version number])
 
-dnl Need to duplicate these AC_SUBST because some versions of autoconf wont 
+dnl Need to duplicate these AC_SUBST because some versions of autoconf wont
 dnl find AC_SUBST in a macro unless subsequently used in a DEFINE or SUBST
 dnl outside of a macro.  Dont ask me why.
 AC_SUBST([BOINC_VERSION_STRING])
@@ -324,7 +344,7 @@ dnl If we're running under cygwin, check whether we want to use X11 or WIN32
 dnl GUI
 BOINC_CHECK_CYGWIN
 
-dnl enable objective-C 
+dnl enable objective-C
 if test x$OBJC = x ; then
   OBJC="$CC"
 fi
@@ -354,7 +374,7 @@ if ( test "${enable_client_release}" = yes ) && ( test "${enable_client}" != yes
 The switch --enable-client-release is only useful for building the client and will be ignored
 --------------------------------------------------])
 fi
-   
+
 
 
 dnl Find the extensions used on shared and static libraries on this system
@@ -366,7 +386,7 @@ dnl enable debug mode on all components using standard debug flags
 dnl if test "${enable_debug}" = yes; then
     dnl CXXFLAGS="$CXXFLAGS -DDEBUG -D_DEBUG"
     dnl CFLAGS="$CFLAGS -DDEBUG -D_DEBUG"
-dnl 
+dnl
     dnl AC_SUBST(CXXFLAGS)
     dnl AC_SUBST(CFLAGS)
 dnl fi
@@ -392,15 +412,15 @@ fi
 dnl Checks for libraries.
 
 dnl NOTE: Libraries subject to version changes, or those that might not be
-dnl installed everywhere should be linked statically when building portable 
+dnl installed everywhere should be linked statically when building portable
 dnl binaries.  Put libraries that should be linked statically on every platform
-dnl in the STATIC_LIB_LIST variable before calling SAH_CHECK_LIB.  (Note: Only 
+dnl in the STATIC_LIB_LIST variable before calling SAH_CHECK_LIB.  (Note: Only
 dnl the '*' wildcard is supported).
 STATIC_LIB_LIST="stdc++* gcc gcc_s gcc_eh atk* gtk* gdk* gmodule* gthread* gobject* glib* pango* cairo* wx* tiff* jpeg* png* Xi glut socket z expat* krb5support freetype fontconfig* resolv* idn c_nonshared gpg* gss* gnutls sasl2 sqlite3"
 
-dnl We'll store these libs in a separate variable BOINC_EXTRA_LIBS for later 
-dnl post-processing instead of the default-action, which would append 
-dnl them to LIBS (note, we also dont define HAVE_LIBXXX, because 
+dnl We'll store these libs in a separate variable BOINC_EXTRA_LIBS for later
+dnl post-processing instead of the default-action, which would append
+dnl them to LIBS (note, we also dont define HAVE_LIBXXX, because
 dnl currently they arent used)
 
 dnl Special rules for specific targets go here:  It's easier to add static libs
@@ -422,7 +442,7 @@ dnl ---------- libcurl (m4/libcurl.m4) ------------------------------
 
 if test "${enable_client}" = yes; then
    LIBCURL_CHECK_CONFIG([yes], [7.17.1], [haveCurl=yes], [haveCurl=no])
-   
+
    if test "${haveCurl}" != yes; then
       AC_MSG_ERROR([
 ================================================================================
@@ -431,8 +451,8 @@ ERROR: could not find (recent enough) development-libs for libcurl.
   This library is required to build the boinc-client.
   (If you don't want to build the client, use --disable-client with configure.
 
-  If libcurl-dev is installed on your system, make sure that the script 
-  'curl-config' is found in your PATH, and that 
+  If libcurl-dev is installed on your system, make sure that the script
+  'curl-config' is found in your PATH, and that
   'curl-config --version' gives something recent enough (see above).
 
   You can download libcurl from: http://curl.haxx.se/
@@ -453,14 +473,17 @@ ERROR: could not find (recent enough) development-libs for libcurl.
       fi
       BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${LIBCURL}"
 
-   fi	
+   fi
 
 fi
 
 dnl ---------- SSL (m4/check_ssl.m4)
-CHECK_SSL
-if test "${found_ssl}" = "yes"; then
-   BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${SSL_LIBS}"
+if [[ "x${enable_client}" = "xyes" -o "x${enable_server}" = "xyes" ]]
+then
+    CHECK_SSL
+    if test "x${found_ssl}" = "xyes"; then
+       BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${SSL_LIBS}"
+    fi
 fi
 
 dnl save the libs, since SAH_CHECK_LIB() will change them
@@ -469,20 +492,30 @@ SAH_CHECK_LIB([cygipc], [shmget],
     [BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${sah_lib_last}"])
 SAH_CHECK_LIB([aio], [aio_fork],
     [BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${sah_lib_last}"])
-SAH_CHECK_LIB([dl], [dlopen], 
+SAH_CHECK_LIB([dl], [dlopen],
     [BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${sah_lib_last}"])
-SAH_CHECK_LIB([nsl], [gethostbyname], 
+SAH_CHECK_LIB([nsl], [gethostbyname],
     [BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${sah_lib_last}"])
-#SAH_CHECK_LIB([wsock32], [fopen], 
-#   [BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${sah_lib_last}"])
-#SAH_CHECK_LIB([wsock], [fopen], 
-#   [BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${sah_lib_last}"])
-SAH_CHECK_LIB([socket], [bind], 
+SAH_CHECK_LIB([freetype], [fopen],
     [BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${sah_lib_last}"])
-SAH_CHECK_LIB([z], [gzopen], 
+SAH_CHECK_LIB([socket], [bind],
+    [BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${sah_lib_last}"])
+SAH_CHECK_LIB([z], [gzopen],
     [BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${sah_lib_last}"])
 SAH_CHECK_LIB([cups], [md5_finish],
     [BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${sah_lib_last}"])
+if test "${isWIN32}" = "yes" ; then
+   SAH_CHECK_LIB([wsock32], [fopen],
+       [BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${sah_lib_last}"])
+   SAH_CHECK_LIB([wsock], [fopen],
+       [BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${sah_lib_last}"])
+   SAH_CHECK_LIB([comctl32], [fopen],
+       [BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${sah_lib_last}"])
+   SAH_CHECK_LIB([winmm], [fopen],
+       [BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${sah_lib_last}"])
+   SAH_CHECK_LIB([msimg32], [fopen],
+       [BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${sah_lib_last}"])
+fi
 
 LIBS=${SAVELIBS_AAF}
 
@@ -508,7 +541,7 @@ if test "x${libdir}" = "xNONE" -o -z "${libdir}" ; then
 fi
 
 dnl if --sysconfdir was not specified, default ${sysconfdir} to '/etc/'.
-dnl this is done to preserve the behaviour of previous BOINC versions 
+dnl this is done to preserve the behaviour of previous BOINC versions
 dnl which always installed to /etc/ in client/scripts/. Now we install
 dnl to ${sysconfdir}/.
 dnl the default value for ${sysconfdir} set by automake is '${prefix}/etc',
@@ -522,7 +555,7 @@ AC_DEFINE_UNQUOTED(BOINC_EXECPREFIX,"`eval echo ${bindir}`",[Directory where BOI
 AC_DEFINE_UNQUOTED(BOINC_LIBDIR,"`eval echo ${libdir}`",[Directory where BOINC libraries will be installed])
 
 dnl ---------- decide wether to build the graphical boinc-api libs or not
-dnl check for X11 
+dnl check for X11
 AC_PATH_X
 AC_PATH_XTRA
 
@@ -534,8 +567,10 @@ dnl check for glut and prerequesites to the glut-test: libXmu and libXi
 dnl or on windows libGDI32 and libWinMM
 AC_CHECK_LIB([Xmu], [fopen], [have_Xmu="yes"], [have_Xmu="no"])
 AC_CHECK_LIB([Xi], [fopen], [have_Xi="yes"], [have_Xi="no"])
-AC_CHECK_LIB([gdi32], [fopen])
-AC_CHECK_LIB([winmm], [fopen])
+if test "${isWIN32}" = "yes" ; then
+  AC_CHECK_LIB([gdi32], [fopen])
+  AC_CHECK_LIB([winmm], [fopen])
+fi
 
 AX_CHECK_GLUT
 if test "X${no_x}" != "Xyes" -a "$no_glut" = yes; then
@@ -545,7 +580,7 @@ if test "X${no_x}" != "Xyes" -a "$no_glut" = yes; then
    if test "$have_Xi" = no; then
    	AC_MSG_WARN([Test for glut-dev might have failed because of missing libXi-dev!])
    fi
-fi	
+fi
 
 if test "$no_gl" = yes -o "$no_glu" = yes -o "$no_glut" = yes; then
    have_glut=no
@@ -569,7 +604,7 @@ else
    echo "DEBUG: GLUT_CFLAGS = $GLUT_CFLAGS" >&5
    echo "DEBUG: GLUT_LIBS = $GLUT_LIBS" >&5
 
-   AC_CHECK_HEADERS([gl.h glu.h glut.h glaux.h GL/gl.h GL/glu.h GL/glut.h GL/glaux.h OpenGL/gl.h OpenGL/glu.h OpenGL/glut.h OpenGL/glaux.h GLUT/glut.h MesaGL/gl.h MesaGL/glu.h MesaGL/glut.h MesaGL/glaux.h libnotify/notify.h gtk/gtk.h xlocale.h])
+   AC_CHECK_HEADERS([gl.h glu.h glut.h glaux.h GL/gl.h GL/glu.h GL/glut.h GL/glaux.h OpenGL/gl.h OpenGL/glu.h OpenGL/glut.h OpenGL/glaux.h GLUT/glut.h MesaGL/gl.h MesaGL/glu.h MesaGL/glut.h MesaGL/glaux.h libnotify/notify.h gtk/gtk.h locale.h xlocale.h])
 
    AC_CHECK_LIB([jpeg], [jpeg_start_compress],[have_jpeg=1],[have_jpeg=0])
    AC_CHECK_HEADER([jpeglib.h],[have_jpeg=1],[have_jpeg=0])
@@ -579,7 +614,7 @@ else
 ================================================================================
 WARNING: libjpeg.a/jpeglib.h not found.
 
-BOINC's openGL graphics-API needs libjpeg ! 
+BOINC's openGL graphics-API needs libjpeg !
 see http://www.ijg.org/
 
 ==> I will continue building the non-graphical parts of the BOINC API library.
@@ -606,8 +641,12 @@ AH_TOP([
 ])
 AH_BOTTOM([
 
-#ifndef HAVE_XLOCALE_H
+#if !HAVE_DECL__CONFIGTHREADLOCALE
 #define NO_PER_THREAD_LOCALE 1
+#undef HAVE__CONFIGTHREADLOCALE
+#else
+#undef NO_PER_THREAD_LOCALE
+#define HAVE__CONFIGTHREADLOCALE 1
 #endif
 
 #ifndef HAVE_RES_INIT
@@ -627,41 +666,140 @@ AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 AC_HEADER_TIME
 AC_TYPE_SIGNAL
-AC_CHECK_HEADERS(winsock2.h winsock.h windows.h ws2tcpip.h winternl.h crtdbg.h sys/types.h sys/un.h arpa/inet.h dirent.h grp.h fcntl.h inttypes.h stdint.h memory.h netdb.h netinet/in.h netinet/tcp.h netinet/ether.h net/if.h net/if_arp.h signal.h strings.h sys/auxv.h sys/file.h sys/fcntl.h sys/ipc.h sys/ioctl.h sys/msg.h sys/param.h sys/resource.h sys/select.h sys/sem.h sys/shm.h sys/sockio.h sys/socket.h sys/stat.h sys/statvfs.h sys/statfs.h sys/systeminfo.h sys/time.h sys/types.h sys/ut [...]
-
-if test x${ac_cv_header_windows_h} = xyes ; then
-
-AC_CHECK_HEADERS([winhttp.h ntapi.h ddk/ntapi.h dbghelp.h delayimp.h],[], [], [[
-#if HAVE_WINDOWS_H
-# include <windows.h>
+if test "${isWIN32}" = "yes" ; then
+  AC_CHECK_HEADERS(winsock2.h winsock.h windows.h ws2tcpip.h winternl.h crtdbg.h)
+fi
+AC_CHECK_HEADERS(sys/types.h sys/un.h arpa/inet.h dirent.h grp.h fcntl.h inttypes.h stdint.h memory.h netdb.h netinet/in.h netinet/tcp.h netinet/ether.h net/if.h net/if_arp.h signal.h strings.h sys/auxv.h sys/file.h sys/fcntl.h sys/ipc.h sys/ioctl.h sys/msg.h sys/param.h sys/resource.h sys/select.h sys/sem.h sys/shm.h sys/sockio.h sys/socket.h sys/stat.h sys/statvfs.h sys/statfs.h sys/systeminfo.h sys/time.h sys/types.h sys/utsname.h sys/vmmeter.h sys/wait.h unistd.h utmp.h errno.h procf [...]
+
+save_cxxflags="${CXXFLAGS}"
+save_cppflags="${CPPFLAGS}"
+CXXFLAGS="${CXXFLAGS} -msse3"
+CPPFLAGS="${CPPFLAGS} -msse3"
+AC_CHECK_HEADERS([intrin.h x86intrin.h pmmintrin.h xmmintrin.h emmintrin.h])
+CXXFLAGS="${save_cxxflags} -mavx"
+CPPFLAGS="${save_cppflags} -mavx"
+AC_CHECK_HEADERS([immintrin.h avxintrin.h])
+
+AC_CHECK_DECLS([_xgetbv, xgetbv, __xgetbv, cpuid, _cpuid, __cpuid],
+    [],[],[[
+#if HAVE_INTRIN_H
+# include <intrin.h>
 #endif
-]])
-
-AC_CHECK_HEADER(security.h, [
-AC_DEFINE(HAVE_SECURITY_H,1,[Define to 1 if your compiler has the security.h header file])
-AC_DEFINE(SECURITY_WIN32,1,[Define to 1 if your compiler has the security.h header file])
-], [], [[
-#define SECURITY_WIN32 1
-#if HAVE_WINDOWS_H
-# include <windows.h>
+#if HAVE_IMMINTRIN_H
+# include <immintrin.h>
 #endif
-]])
-
-AC_CHECK_TYPES([SYSTEM_PROCESSES, CLIENT_ID, VM_COUNTERS, SYSTEM_THREADS, THREAD_STATE, THREAD_WAIT_REASON],[],[],[[
-#if HAVE_WINDOWS_H
-#include <windows.h>
+#if HAVE_AVXINTRIN_H
+# include <avxintrin.h>
+#endif
+#if HAVE_X86INTRIN_H
+# include <x86intrin.h>
 #endif
-#ifdef HAVE_WINTERNL_H
-#include <winternl.h>
-#elif defined(HAVE_DDK_NTAPI_H)
-#include <ddk/ntapi.h>
-#elif defined(HAVE_NTAPI_H)
-#include <ntapi.h>
+#if HAVE_PMMINTRIN_H
+# include <pmmintrin.h>
+#endif
+#if HAVE_XMMINTRIN_H
+# include <xmmintrin.h>
+#endif
+#if HAVE_EMMINTRIN_H
+# include <emmintrin.h>
 #endif
 ]])
 
+AC_MSG_CHECKING(if assembler supports xgetbv)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[asm ("xgetbv");])],
+  AC_DEFINE([ASM_SUPPORTS_XGETBV],1,[Define to 1 if the xgetbv instruction can be used in inline assember])
+  AC_MSG_RESULT(yes),
+  AC_MSG_RESULT(no)
+)
+
+CXXFLAGS="${save_cxxflags}"
+CPPFLAGS="${save_cppflags}"
+
+if test "${isWIN32}" = "yes" ; then
+  AC_CHECK_HEADERS([winhttp.h ntapi.h ddk/ntapi.h dbghelp.h delayimp.h],[], [], [[
+  #if HAVE_WINDOWS_H
+  # include <windows.h>
+  #endif
+  ]])
+
+  AC_CHECK_HEADER(security.h, [
+  AC_DEFINE(HAVE_SECURITY_H,1,[Define to 1 if your compiler has the security.h header file])
+  AC_DEFINE(SECURITY_WIN32,1,[Define to 1 if your compiler has the security.h header file])
+  ], [], [[
+  #define SECURITY_WIN32 1
+  #if HAVE_WINDOWS_H
+  # include <windows.h>
+  #endif
+  ]])
+
+  AC_CHECK_TYPES([SYSTEM_PROCESSES, CLIENT_ID, VM_COUNTERS, SYSTEM_THREADS, THREAD_STATE, THREAD_WAIT_REASON],[],[],[[
+  #if HAVE_WINDOWS_H
+  #include <windows.h>
+  #endif
+  #ifdef HAVE_WINTERNL_H
+  #include <winternl.h>
+  #elif defined(HAVE_DDK_NTAPI_H)
+  #include <ddk/ntapi.h>
+  #elif defined(HAVE_NTAPI_H)
+  #include <ntapi.h>
+  #endif
+  ]])
 fi
 
+AC_CHECK_HEADER(nvapi.h, [
+  AC_DEFINE(HAVE_NVAPI_H,1,[Define to 1 if your compiler has the nvapi.h header file])
+  ],[],[[
+  #ifdef HAVE_WINDOWS_H
+  #include <windows.h>
+  #endif
+  #ifdef HAVE_SAL_H
+  #include "sal.h"
+  #endif
+  #ifndef __success
+  #define __success(x)
+  #endif
+  #ifndef __in
+  #define __in
+  #endif
+  #ifndef __out
+  #define __out
+  #endif
+  #ifndef __in_ecount
+  #define __in_ecount(x)
+  #endif
+  #ifndef __out_ecount
+  #define __out_ecount(x)
+  #endif
+  #ifndef __in_opt
+  #define __in_opt
+  #endif
+  #ifndef __out_opt
+  #define __out_opt
+  #endif
+  #ifndef __inout
+  #define __inout
+  #endif
+  #ifndef __inout_opt
+  #define __inout_opt
+  #endif
+  #ifndef __inout_ecount
+  #define __inout_ecount(x)
+  #endif
+  #ifndef __inout_ecount_full
+  #define __inout_ecount_full(x)
+  #endif
+  #ifndef __inout_ecount_part_opt
+  #define __inout_ecount_part_opt(x,y)
+  #endif
+  #ifndef __inout_ecount_full_opt
+  #define __inout_ecount_full_opt(x,y)
+  #endif
+  #ifndef __out_ecount_full_opt
+  #define __out_ecount_full_opt(x)
+  #endif
+]])
+
+
 AC_CHECK_TYPES([socklen_t],[],[],[[
 #if HAVE_WINDOWS_H
 #include <windows.h>
@@ -789,9 +927,9 @@ AC_LANG_POP
 dnl Checks for library functions.
 AC_PROG_GCC_TRADITIONAL
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(ether_ntoa setpriority sched_setscheduler strlcpy strlcat strcasestr strcasecmp sigaction getutent setutent getisax strdup strdupa daemon stat64 putenv setenv unsetenv res_init strtoull)
+AC_CHECK_FUNCS(ether_ntoa setpriority sched_setscheduler strlcpy strlcat strcasestr strcasecmp sigaction getutent setutent getisax strdup _strdup strdupa _strdupa daemon stat64 putenv setenv unsetenv res_init strtoull localtime localtime_r gmtime gmtime_r)
 
-AC_CHECK_DECLS([_fpreset, fpreset],
+AC_CHECK_DECLS([_fpreset, fpreset, _configthreadlocale],
     [],[],[[
 #include <stdio.h>
 #if HAVE_SYS_TYPES_H
@@ -838,6 +976,12 @@ AC_CHECK_DECLS([_fpreset, fpreset],
 #ifdef HAVE_MATH_H
 #include <math.h>
 #endif
+#ifdef HAVE_LOCALE_H
+#include <locale.h>
+#endif
+#ifdef HAVE_XLOCALE_H
+#include <xlocale.h>
+#endif
 ]])
 
 dnl Checks for typedefs, structures, and compiler characteristics.
@@ -874,18 +1018,15 @@ fi
 dnl ---------- wxWidgets --------------------------------------------------
 if test "${enable_manager}" = yes ; then
   BOINC_OPTIONS_WXWIDGETS([3.0.0])
+else
+  AM_CONDITIONAL([GUI_GTK], false)
 fi
 
 dnl ---------- libNotify --------------------------------------------------
 if test "${enable_manager}" = yes ; then
   PKG_CHECK_MODULES(LIBNOTIFY, [libnotify])
 fi
- 
-dnl ---------- GTK2 -------------------------------------------------------
-if test "${enable_manager}" = yes ; then
-  PKG_CHECK_MODULES(GTK, [gtk+-2.0])
-fi
- 
+
 dnl ---------- Sqlite3 ----------------------------------------------------
 if test "${enable_manager}" = yes ; then
   AM_PATH_SQLITE3
@@ -896,7 +1037,7 @@ if test "${enable_manager}" = yes; then
     PKG_CHECK_MODULES(XCB,xcb,have_Xcb="yes",[echo "WARNING: Xcb not found, x11_screensaver will not be built"])
     PKG_CHECK_MODULES(XCBATOM,xcb-atom,have_Xcbatom="yes",[echo "WARNING: Xcb-atom not found, x11_screensaver will not be built"])
 fi
-AM_CONDITIONAL(BUILD_X11_SCREENSAVER, [ test "$have_Xcb" = yes -a "$have_Xcbatom" = yes ]) 
+AM_CONDITIONAL(BUILD_X11_SCREENSAVER, [ test "$have_Xcb" = yes -a "$have_Xcbatom" = yes ])
 dnl -----------------------------------------------------------------------
 
 dnl Heres another way to set up host-specific stuff
@@ -925,6 +1066,8 @@ AM_CONDITIONAL(ENABLE_CLIENT, [test "${enable_client}" = yes])
 AM_CONDITIONAL(ENABLE_MANAGER, [ test "x${ac_cv_have_wxwidgets}" = xyes -a "${enable_manager}" = yes ])
 AM_CONDITIONAL(ENABLE_LIBRARIES, [test "${enable_libraries}" = yes])
 AM_CONDITIONAL(ENABLE_BOINCZIP, [test "${enable_boinczip}" = yes])
+AM_CONDITIONAL(ENABLE_APPS, [test "${enable_apps}" = yes])
+AM_CONDITIONAL(ENABLE_BOINCCRYPT, [test "x${enable_server}" = xyes  || test "x${enable_client}" = xyes ])
 AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes])
 AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f ./coprocs/CUDA/posix/${boinc_platform}/libcudart.so])
 
@@ -950,7 +1093,7 @@ fi
        echo DEBUG: CLIENTLIBS=${CLIENTLIBS} >&5
 if test "$enable_release_client" = yes -a "$disable_static_linkage" = no ; then
 if test x${ac_cv_cxx_compiler_gnu} != xno ; then
-  SAH_CHECK_LIB([gcc_eh],[_Unwind_Resume],[ 
+  SAH_CHECK_LIB([gcc_eh],[_Unwind_Resume],[
     AC_DEFINE([HAVE_LIBGCC_EH],[1],[Define to 1 if you have the gcc_eh library])
     CLIENTLIBS="${sah_lib_last} ${CLIENTLIBS}"])
    echo DEBUG: CLIENTLIBS=${CLIENTLIBS} >&5
@@ -958,7 +1101,7 @@ if test x${ac_cv_cxx_compiler_gnu} != xno ; then
     AC_DEFINE([HAVE_LIBGCC],[1],[Define to 1 if you have the gcc library])
     CLIENTLIBS="${sah_lib_last} ${CLIENTLIBS}"])
    echo DEBUG: CLIENTLIBS=${CLIENTLIBS} >&5
-  SAH_CHECK_LIB([c_nonshared],[fopen],[ 
+  SAH_CHECK_LIB([c_nonshared],[fopen],[
     AC_DEFINE([HAVE_LIBC_NONSHARED],[1],[Define to 1 if you have the c_nonshared library])
     CLIENTLIBS="${sah_lib_last} ${CLIENTLIBS}"])
    echo DEBUG: CLIENTLIBS=${CLIENTLIBS} >&5
@@ -968,17 +1111,82 @@ if test x${ac_cv_cxx_compiler_gnu} != xno ; then
    echo DEBUG: CLIENTLIBS=${CLIENTLIBS} >&5
 fi
 fi
-SAH_CHECK_LIB([wsock32],[fopen],[
-    AC_DEFINE([HAVE_LIBWSOCK32],[1],[Define to 1 if you have the wsock32 library])
-    CLIENTLIBS="${sah_lib_last} ${CLIENTLIBS}"])
-   echo DEBUG: CLIENTLIBS=${CLIENTLIBS} >&5
-SAH_CHECK_LIB([userenv],[fopen],[
-    AC_DEFINE([HAVE_LIBUSERENV],[1],[Define to 1 if you have the userenv library])
+SAH_CHECK_LIB([nvapi],[fopen],[
+    AC_DEFINE([HAVE_LIBNVAPI],[1],[Define to 1 if you have the NVIDIA API library])
     CLIENTLIBS="${sah_lib_last} ${CLIENTLIBS}"])
    echo DEBUG: CLIENTLIBS=${CLIENTLIBS} >&5
+if test ${isWIN32} = "yes" ; then
+  SAH_CHECK_LIB([gdi32],[fopen],[
+      AC_DEFINE([HAVE_LIBWGDI32],[1],[Define to 1 if you have the gdi32 library])
+      CLIENTLIBS="${sah_lib_last} ${CLIENTLIBS}"])
+     echo DEBUG: CLIENTLIBS=${CLIENTLIBS} >&5
+     found_msvcrt=no
+  SAH_CHECK_LIB([msvcr110],[fopen],[
+      found_msvcrt=yes
+      AC_DEFINE([HAVE_LIBMSVCR110],[1],[Define to 1 if you have the msvcr110 library])
+      AC_DEFINE([HAVE_MSVCRT],[1],[Define to 1 if you have a visual c runtime library])
+      CLIENTLIBS="${sah_lib_last} ${CLIENTLIBS}"])
+     echo DEBUG: CLIENTLIBS=${CLIENTLIBS} >&5
+  if test $found_msvcrt = no ; then
+    SAH_CHECK_LIB([msvcr100],[fopen],[
+        found_msvcrt=yes
+        AC_DEFINE([HAVE_LIBMSVCR100],[1],[Define to 1 if you have the msvcr100 library])
+        AC_DEFINE([HAVE_MSVCRT],[1],[Define to 1 if you have a visual c runtime library])
+        CLIENTLIBS="${sah_lib_last} ${CLIENTLIBS}"])
+    echo DEBUG: CLIENTLIBS=${CLIENTLIBS} >&5
+  fi
+  if test $found_msvcrt = no ; then
+    SAH_CHECK_LIB([msvcr90d],[fopen],[
+        found_msvcrt=yes
+        AC_DEFINE([HAVE_LIBMSVCR90D],[1],[Define to 1 if you have the msvcr90d library])
+        AC_DEFINE([HAVE_MSVCRT],[1],[Define to 1 if you have a visual c runtime library])
+        CLIENTLIBS="${sah_lib_last} ${CLIENTLIBS}"])
+    echo DEBUG: CLIENTLIBS=${CLIENTLIBS} >&5
+  fi
+  if test $found_msvcrt = no ; then
+    SAH_CHECK_LIB([msvcr90],[fopen],[
+        found_msvcrt=yes
+        AC_DEFINE([HAVE_LIBMSVCR90],[1],[Define to 1 if you have the msvcr90 library])
+        AC_DEFINE([HAVE_MSVCRT],[1],[Define to 1 if you have a visual c runtime library])
+        CLIENTLIBS="${sah_lib_last} ${CLIENTLIBS}"])
+    echo DEBUG: CLIENTLIBS=${CLIENTLIBS} >&5
+  fi
+  SAH_CHECK_LIB([wininet],[fopen],[
+      AC_DEFINE([HAVE_LIBWININET],[1],[Define to 1 if you have the wininet library])
+      CLIENTLIBS="${sah_lib_last} ${CLIENTLIBS}"])
+     echo DEBUG: CLIENTLIBS=${CLIENTLIBS} >&5
+  SAH_CHECK_LIB([wsock32],[fopen],[
+      AC_DEFINE([HAVE_LIBWSOCK32],[1],[Define to 1 if you have the wsock32 library])
+      CLIENTLIBS="${sah_lib_last} ${CLIENTLIBS}"])
+     echo DEBUG: CLIENTLIBS=${CLIENTLIBS} >&5
+  SAH_CHECK_LIB([userenv],[fopen],[
+      AC_DEFINE([HAVE_LIBUSERENV],[1],[Define to 1 if you have the userenv library])
+      CLIENTLIBS="${sah_lib_last} ${CLIENTLIBS}"])
+     echo DEBUG: CLIENTLIBS=${CLIENTLIBS} >&5
+  SAH_CHECK_LIB([iphlpapi],[fopen],[
+      AC_DEFINE([HAVE_LIBIPHLPAPI],[1],[Define to 1 if you have the iphlpapi library])
+      CLIENTLIBS="${sah_lib_last} ${CLIENTLIBS}"])
+     echo DEBUG: CLIENTLIBS=${CLIENTLIBS} >&5
+  SAH_CHECK_LIB([sensapi],[fopen],[
+      AC_DEFINE([HAVE_LIBSENSAPI],[1],[Define to 1 if you have the sensapi library])
+      CLIENTLIBS="${sah_lib_last} ${CLIENTLIBS}"])
+     echo DEBUG: CLIENTLIBS=${CLIENTLIBS} >&5
+  SAH_CHECK_LIB([wtsapi32],[fopen],[
+      AC_DEFINE([HAVE_LIBWTSAPI32],[1],[Define to 1 if you have the wtsapi32 library])
+      CLIENTLIBS="${sah_lib_last} ${CLIENTLIBS}"])
+     echo DEBUG: CLIENTLIBS=${CLIENTLIBS} >&5
+  SAH_CHECK_LIB([winhttp],[fopen],[
+      AC_DEFINE([HAVE_LIBWINHTTP],[1],[Define to 1 if you have the WinHttp library])
+      CLIENTLIBS="${sah_lib_last} ${CLIENTLIBS}"])
+     echo DEBUG: CLIENTLIBS=${CLIENTLIBS} >&5
+  SAH_CHECK_LIB([secur32],[fopen],[
+      AC_DEFINE([HAVE_LIBSECUR32],[1],[Define to 1 if you have the secur32 library])
+      CLIENTLIBS="${sah_lib_last} ${CLIENTLIBS}"])
+     echo DEBUG: CLIENTLIBS=${CLIENTLIBS} >&5
+fi
 
 svlibs=$LIBS
-if test "${ac_cv_func_res_init}" != "yes" ; then 
+if test "${ac_cv_func_res_init}" != "yes" ; then
   AC_CHECK_LIB([resolv],[res_init],[
     ac_cv_func_res_init="yes"
     AC_CHECK_FUNCS([res_init])
@@ -1039,7 +1247,7 @@ if test "${enable_client_release}" = "yes" ; then
 
 
 
-   ## NOTE: its *extremely* important to always compile with __NO_CTYPE 
+   ## NOTE: its *extremely* important to always compile with __NO_CTYPE
    ## defined, because this avoids GLIBC_2.3 symbols being pulled in via ctype.h-macros,
    CPPFLAGS="${CPPFLAGS} -D__NO_CTYPE"
 fi
@@ -1114,6 +1322,7 @@ AC_CONFIG_FILES([
                  packages/solaris/CSW/boincmanager/Makefile
                  packages/solaris/CSW/boincmanager/pkginfo
                  packages/solaris/CSW/boincmanager/prototype
+                 samples/Makefile
                  test/boinc_path_config.py:py/boinc_path_config.py.in
                  test/Makefile
                  test/version.inc
diff --git a/db/boinc_db.cpp b/db/boinc_db.cpp
index d448c7b..4e3cfea 100644
--- a/db/boinc_db.cpp
+++ b/db/boinc_db.cpp
@@ -97,6 +97,8 @@ void VDA_CHUNK_HOST::clear() {memset(this, 0, sizeof(*this));}
 void BADGE::clear() {memset(this, 0, sizeof(*this));}
 void BADGE_USER::clear() {memset(this, 0, sizeof(*this));}
 void BADGE_TEAM::clear() {memset(this, 0, sizeof(*this));}
+void CREDIT_USER::clear() {memset(this, 0, sizeof(*this));}
+void CREDIT_TEAM::clear() {memset(this, 0, sizeof(*this));}
 
 DB_PLATFORM::DB_PLATFORM(DB_CONN* dc) :
     DB_BASE("platform", dc?dc:&boinc_db){}
@@ -170,6 +172,10 @@ DB_BADGE_USER::DB_BADGE_USER(DB_CONN* dc) :
     DB_BASE("badge_user", dc?dc:&boinc_db){}
 DB_BADGE_TEAM::DB_BADGE_TEAM(DB_CONN* dc) :
     DB_BASE("badge_team", dc?dc:&boinc_db){}
+DB_CREDIT_USER::DB_CREDIT_USER(DB_CONN* dc) :
+    DB_BASE("credit_user", dc?dc:&boinc_db){}
+DB_CREDIT_TEAM::DB_CREDIT_TEAM(DB_CONN* dc) :
+    DB_BASE("credit_team", dc?dc:&boinc_db){}
 
 int DB_PLATFORM::get_id() {return id;}
 int DB_APP::get_id() {return id;}
@@ -1508,15 +1514,25 @@ int DB_TRANSITIONER_ITEM_SET::enumerate(
     int retval;
     char query[MAX_QUERY_LEN];
     char mod_clause[256];;
+    char time_clause[256];
     MYSQL_ROW row;
     TRANSITIONER_ITEM new_item;
 
     if (!cursor.active) {
+        sprintf(time_clause, " wu.transition_time < %d ", transition_time);
         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(time_clause, " true ");
+            }
         } else {
             strcpy(mod_clause, "");
         }
@@ -1561,10 +1577,10 @@ int DB_TRANSITIONER_ITEM_SET::enumerate(
             "   workunit AS wu "
             "       LEFT JOIN result AS res ON wu.id = res.workunitid "
             "WHERE "
-            "   wu.transition_time < %d %s and transitioner_flags<>%d "
+            "   %s %s and transitioner_flags<>%d "
             "LIMIT "
             "   %d ",
-            transition_time, mod_clause, TRANSITION_NONE, nresult_limit
+            time_clause, mod_clause, TRANSITION_NONE, nresult_limit
         );
 
         retval = db->do_query(query);
@@ -2654,4 +2670,66 @@ void DB_BADGE_TEAM::db_parse(MYSQL_ROW &r) {
     reassign_time = atof(r[i++]);
 }
 
+void DB_CREDIT_USER::db_print(char* buf) {
+    sprintf(buf,
+        "userid=%d, "
+        "appid=%d, "
+        "njobs=%d, "
+        "total=%.15e, "
+        "expavg=%.15e, "
+        "expavg_time=%.15e, "
+        "credit_type=%d ",
+        userid,
+        appid,
+        njobs,
+        total,
+        expavg,
+        expavg_time,
+        credit_type
+    );
+}
+
+void DB_CREDIT_USER::db_parse(MYSQL_ROW &r) {
+    int i=0;
+    clear();
+    userid = atoi(r[i++]);
+    appid = atoi(r[i++]);
+    njobs = atoi(r[i++]);
+    total = atof(r[i++]);
+    expavg = atof(r[i++]);
+    expavg_time = atof(r[i++]);
+    credit_type = atoi(r[i++]);
+}
+
+void DB_CREDIT_TEAM::db_print(char* buf) {
+    sprintf(buf,
+        "teamid=%d, "
+        "appid=%d, "
+        "njobs=%d, "
+        "total=%.15e, "
+        "expavg=%.15e, "
+        "expavg_time=%.15e, "
+        "credit_type=%d ",
+        teamid,
+        appid,
+        njobs,
+        total,
+        expavg,
+        expavg_time,
+        credit_type
+    );
+}
+
+void DB_CREDIT_TEAM::db_parse(MYSQL_ROW &r) {
+    int i=0;
+    clear();
+    teamid = atoi(r[i++]);
+    appid = atoi(r[i++]);
+    njobs = atoi(r[i++]);
+    total = atof(r[i++]);
+    expavg = atof(r[i++]);
+    expavg_time = atof(r[i++]);
+    credit_type = atoi(r[i++]);
+}
+
 const char *BOINC_RCSID_ac374386c8 = "$Id$";
diff --git a/db/boinc_db.h b/db/boinc_db.h
index 79c2d6a..bf99c06 100644
--- a/db/boinc_db.h
+++ b/db/boinc_db.h
@@ -531,4 +531,16 @@ struct DB_BADGE_TEAM : public DB_BASE, public BADGE_TEAM {
     void db_parse(MYSQL_ROW&);
 };
 
+struct DB_CREDIT_USER : public DB_BASE, public CREDIT_USER {
+    DB_CREDIT_USER(DB_CONN* p=0);
+    void db_print(char*);
+    void db_parse(MYSQL_ROW&);
+};
+
+struct DB_CREDIT_TEAM : public DB_BASE, public CREDIT_TEAM {
+    DB_CREDIT_TEAM(DB_CONN* p=0);
+    void db_print(char*);
+    void db_parse(MYSQL_ROW&);
+};
+
 #endif
diff --git a/db/boinc_db_types.h b/db/boinc_db_types.h
index 26179c8..22ce07d 100644
--- a/db/boinc_db_types.h
+++ b/db/boinc_db_types.h
@@ -350,8 +350,6 @@ struct HOST {
     //
     char p_features[1024];
     char virtualbox_version[256];
-    char client_brand[256];
-        // as specific in client_brand.txt config file on client
     bool p_vm_extensions_disabled;
     int num_opencl_cpu_platforms;
     OPENCL_CPU_PROP opencl_cpu_prop[MAX_OPENCL_CPU_PLATFORMS];
@@ -801,4 +799,27 @@ struct BADGE_TEAM {
     void clear();
 };
 
+struct CREDIT_USER {
+    int userid;
+    int appid;
+        // need not be an app ID
+    int njobs;
+    double total;
+    double expavg;
+    double expavg_time;
+    int credit_type;
+    void clear();
+};
+
+struct CREDIT_TEAM {
+    int teamid;
+    int appid;
+    int njobs;
+    double total;
+    double expavg;
+    double expavg_time;
+    int credit_type;
+    void clear();
+};
+
 #endif
diff --git a/db/schema.sql b/db/schema.sql
index ffe703f..9a38801 100644
--- a/db/schema.sql
+++ b/db/schema.sql
@@ -1,5 +1,5 @@
 /*  If you add/change anything, update
-    boinc_db.C,h
+    boinc_db.cpp,h
     and if needed:
     py/Boinc/
         database.py
@@ -13,8 +13,8 @@
             create_account_action.php (user)
             team_create_action.php (team)
     sched/
-        db_dump.C (host, user, team)
-        db_purge.C (workunit, result)
+        db_dump.cpp (host, user, team)
+        db_purge.cpp (workunit, result)
 */
 /* Fields are documented in boinc_db.h */
 /* Do not replace this with an automatically generated schema */
@@ -330,7 +330,8 @@ create table user_submit (
         -- manager privileges for all apps
         -- grant/revoke permissions (except manage), change quotas
         -- create apps
-    max_jobs_in_progress    integer         not null
+    max_jobs_in_progress    integer         not null,
+    primary key (user_id)
 ) engine = InnoDB;
 
 -- (user, app) submit permissions
@@ -339,11 +340,12 @@ create table user_submit (
 create table user_submit_app (
     user_id                 integer         not null,
     app_id                  integer         not null,
-    manage                  tinyint         not null
+    manage                  tinyint         not null,
         -- can
         --   create/deprecated app versions of this app
         --   grant/revoke permissions (except admin) this app
         --   abort their jobs
+    primary key (user_id, app_id)
 ) engine = InnoDB;
 
 -- Record files present on server.
@@ -731,3 +733,25 @@ create table badge_team (
     create_time             double          not null,
     reassign_time           double          not null
 );
+
+create table credit_user (
+    userid                  integer         not null,
+    appid                   integer         not null,
+    njobs                   integer         not null,
+    total                   double          not null,
+    expavg                  double          not null,
+    expavg_time             double          not null,
+    credit_type             integer         not null,
+    primary key (userid, appid, credit_type)
+) engine=InnoDB;
+
+create table credit_team (
+    teamid                  integer         not null,
+    appid                   integer         not null,
+    njobs                   integer         not null,
+    total                   double          not null,
+    expavg                  double          not null,
+    expavg_time             double          not null,
+    credit_type             integer         not null,
+    primary key (teamid, appid, credit_type)
+) engine=InnoDB;
diff --git a/doc/concierge.php b/doc/concierge.php
new file mode 100644
index 0000000..4725da9
--- /dev/null
+++ b/doc/concierge.php
@@ -0,0 +1,137 @@
+<?php
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2014 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/>.
+
+// This script gets some info about a project and account.
+// It
+// - send cookies to the user's browser containing the project/account info,
+// - optionally starts a download of the appropriate client installer.
+
+require_once("versions.inc");
+require_once("projects.inc");
+
+function get_str($name) {
+    if (isset($_GET[$name])) {
+        return $_GET[$name];
+    }
+    return null;
+}
+
+function get_download_url($pname, $need_vbox) {
+    global $platforms;
+    global $url_base;
+
+    $need_vbox = get_str("need_vbox", true);
+    $p = $platforms[$pname];
+    $v = latest_version($p);
+    $file = $v['file'];
+    if ($need_vbox && array_key_exists('vbox_file', $v)) {
+        $file = $v['vbox_file'];
+    }
+    $url = $url_base.$file;
+    return $url;
+}
+
+// based on the agent string, return name of file to download,
+// or null if can't figure it out
+//
+function url_to_download() {
+    $client_info = $_SERVER['HTTP_USER_AGENT'];
+    if (strstr($client_info, 'Windows')) {
+        if (strstr($client_info, 'Win64')||strstr($client_info, 'WOW64')) {
+            return get_download_url('winx64');
+        } else {
+            return get_download_url('win');
+        }
+    } else if (strstr($client_info, 'Mac')) {
+        if (strstr($client_info, 'PPC Mac OS X')) {
+            return get_download_url('macppc');
+        } else {
+            return get_download_url('mac');
+        }
+    } else if (strstr($client_info, 'Linux') && strstr($client_info, 'Android')) {
+        // Check for Android before Linux,
+        // since Android contains the Linux kernel and the
+        // web browser user agent string list Linux too.
+        return get_download_url('androidarm');
+    } else if (strstr($client_info, 'Linux')) {
+        if (strstr($client_info, 'x86_64')) {
+            return get_download_url('linuxx64');
+        } else {
+            return get_download_url('linux');
+        }
+    }
+    return null;
+}
+
+$master_url = get_str("master_url");
+$project_name = get_str("project_name");
+$auth = get_str("auth");
+$user_name = get_str("user_name");
+$project_desc = get_str("project_desc");
+$project_inst = get_str("project_inst");
+$download = get_str("download");
+
+if (!$master_url || !$project_name) {
+    echo "missing arg";
+    exit;
+}
+$master_url = urldecode($master_url);
+$project_name = urldecode($project_name);
+if ($auth) $auth = urldecode($auth);
+if ($user_name) $user_name = urldecode($user_name);
+if ($project_desc) $project_desc = urldecode($project_desc);
+if ($project_inst) $project_inst = urldecode($project_inst);
+
+if ($download) {
+    $download_url = url_to_download();
+    if (!$download_url) {
+        echo "no file to download";
+        exit;
+    }
+}
+
+// see if this project is in BOINC's list;
+// if so, use the info there if the project didn't supply it
+//
+$p = lookup_project($master_url);
+if ($p) {
+    setcookie('attach_known', "1");
+    if (!$project_inst) {
+        $project_inst = $p[2];
+    }
+    if (!$project_desc) {
+        $project_desc = $p[4];
+    }
+} else {
+    setcookie('attach_known', "0");
+}
+
+$expire = time() + 24*86400;
+
+setrawcookie('attach_master_url', rawurlencode($master_url), $expire);
+setrawcookie('attach_project_name', rawurlencode($project_name), $expire);
+setrawcookie('attach_auth', rawurlencode($auth), $expire);
+setrawcookie('attach_user_name', rawurlencode($user_name), $expire);
+setrawcookie('attach_project_desc', rawurlencode($project_desc), $expire);
+setrawcookie('attach_project_inst', rawurlencode($project_inst), $expire);
+
+if ($download) {
+Header("Location: ".$download_url);
+}
+
+?>
diff --git a/doc/download.php b/doc/download.php
index cf60cf1..36fba17 100644
--- a/doc/download.php
+++ b/doc/download.php
@@ -9,17 +9,6 @@ require_once("../html/inc/translation.inc");
 
 $client_info = $_SERVER['HTTP_USER_AGENT'];
 
-function latest_version($p) {
-    $dev = false;
-    foreach ($p['versions'] as $i=>$v) {
-        if (!$dev && is_dev($v)) continue;
-        return $v;
-    }
-    foreach ($p['versions'] as $i=>$v) {
-        return $v;
-    }
-}
-
 // show a download link as a button or table row
 //
 function download_link($pname, $button=false) {
@@ -31,13 +20,16 @@ function download_link($pname, $button=false) {
     $file = $v['file'];
     if (array_key_exists('vbox_file', $v)) {
         $vbox_file = $v['vbox_file'];
+        $vbox_version = $v['vbox_version'];
+        $vbox_url = $url_base.$vbox_file;
+        $vbox_path = "dl/$vbox_file";
+        $vbox_size = number_format(filesize($vbox_path)/1000000, 2);
     } else {
         $vbox_file = null;
     }
     if (strstr($client_info, 'Windows NT 4') || strstr($client_info, 'Windows NT 5')) {
         $vbox_file = null;
     }
-    $vbox_version = $v['vbox_version'];
     $long_name = $p['name'];
     $num = $v['num'];
     $path = "dl/$file";
@@ -53,9 +45,6 @@ function download_link($pname, $button=false) {
             echo "</a>";
 
             echo "<table><tr valign=top><td>\n";
-            $vbox_url = $url_base.$vbox_file;
-            $vbox_path = "dl/$vbox_file";
-            $vbox_size = number_format(filesize($vbox_path)/1000000, 2);
             echo "
                 <table cellpadding=10><tr valign=top><td class=button>
                 <a href=\"$vbox_url\"><font size=4><u>"
@@ -91,6 +80,14 @@ function download_link($pname, $button=false) {
             echo "<p>", linux_info();
         }
     } else {
+        if ($vbox_file) {
+            echo "<tr>
+                <td class=rowlineleft>$long_name</td>
+                <td class=rowline> $num (with Virtualbox $vbox_version)</td>
+                <td class=rowlineright><a href=$vbox_url>Download</a> ($vbox_size MB)</td>
+                </tr>
+            ";
+        }
         echo "<tr>
             <td class=rowlineleft>$long_name</td>
             <td class=rowline> $num</td>
@@ -150,8 +147,8 @@ function show_download($pname) {
         list_start();
         list_heading_array(array(
             'Computer type',
-            'Current version ',
-            'Size'
+            'BOINC version ',
+            'Click to download'
         ));
         download_link('win');
         download_link('winx64');
@@ -160,16 +157,16 @@ function show_download($pname) {
         download_link('linux');
         download_link('linuxx64');
         download_link('linuxcompat');
-        end_table();
+        download_link('android');
+        list_end();
+        echo "Linux users: BOINC is available as a package for many Linux distributions.  It is available for Linux/ARM as a package for Debian and Ubuntu for ARM, and Raspbian (for Raspberry Pi).";
     }
     if ($pname != 'android') {
         echo "
             <p>
             After downloading BOINC you must <b>install</b> it:
-            <ul>
-            <li> Save the file to disk.
-            <li> Double-click on the file icon.
-            </ul>
+            typically this means double-clicking on the file icon
+            when the download is finished.
         ";
     }
     echo "
@@ -214,11 +211,12 @@ if (get_str2('all_platforms')) {
 	} else {
 		show_download('mac');
 	}
-} else if (strstr($client_info, 'Linux') && strstr($client_info, 'Android')) {
-	// Check for Android before Linux,
-  // since Android contains the Linux kernel and the
-	// web browser user agent string list Linux too.
-	show_download('androidarm');
+} else if (strstr($client_info, 'Android')) {
+    // Check for Android before Linux,
+    // since Android contains the Linux kernel and the
+    // web browser user agent string lists Linux too.
+    //
+	show_download('android');
 } else if (strstr($client_info, 'Linux')) {
 	if (strstr($client_info, 'x86_64')) {
 		show_download('linuxx64');
diff --git a/doc/download_all.php b/doc/download_all.php
index c879f04..d4c081d 100644
--- a/doc/download_all.php
+++ b/doc/download_all.php
@@ -22,7 +22,11 @@ $version = get_str2("version");
 $type_name = get_str2("type");
 $client_info = $_SERVER['HTTP_USER_AGENT'];
 
-if (!$xml) $dev=1;
+// if not XML, dev defaults to 1
+//
+if (!$xml) {
+    if ($dev === null) $dev=1;
+}
 
 function dl_item($x, $y) {
     echo "<tr><td valign=top  align=right width=\"30%\">$x</td>
@@ -105,15 +109,16 @@ function show_version($pname, $i, $v) {
     $type_text = type_text($type);
     $url = version_url($v['file']);
 
-    $link = "<a href=\"$url\"><b>Download</b></a> ($s MB)";
+    $link = "";
     if (array_key_exists('vbox_file', $v)) {
         $vbox_file = $v['vbox_file'];
         $vbox_version = $v['vbox_version'];
         $vbox_url = version_url($vbox_file);
         $vbox_path = "dl/$vbox_file";
         $vbox_size = number_format(filesize($vbox_path)/1000000, 2);
-        $link .= "<br><a href=\"$vbox_url\"><b>Download BOINC + VirtualBox $vbox_version</b></a> ($vbox_size MB)";
+        $link = "<a href=\"$vbox_url\"><b>Download BOINC + VirtualBox $vbox_version</b></a> ($vbox_size MB)<br>";
     }
+    $link .= "<a href=\"$url\"><b>Download</b></a> ($s MB)";
     echo "<tr>
        <td class=rowlineleft>$num</td>
         <td class=rowline>$status</td>
@@ -174,16 +179,16 @@ if ($pname && $version) {
 
 if ($xml) {
     header('Content-type: text/xml');
-    echo "<?xml version=\"1.0\" encoding=\"ISO-8859-1\" ?>\n
-<versions>\n
+    echo "<?xml version=\"1.0\" encoding=\"ISO-8859-1\" ?>
+<versions>
 ";
-	if (FALSE === strpos($client_info, '6.8.')) {
+    if (FALSE === strpos($client_info, '6.8.')) {
         foreach($platforms as $short_name=>$p) {
             show_platform_xml($short_name, $p, $dev);
         }
     }
     echo "
-</versions>\n
+</versions>
 ";
 } else {
     if ($pname) {
diff --git a/doc/help_vol.php b/doc/help_vol.php
index 5571e43..24e31e6 100644
--- a/doc/help_vol.php
+++ b/doc/help_vol.php
@@ -102,8 +102,8 @@ function email_contact($vol) {
     ";
 }
 
-$send_email = $_GET['send_email'];
-$rate = $_GET['rate'];
+$send_email = get_str2('send_email');
+$rate = get_str2('rate');
 session_set_cookie_params(86400*365);
 session_start();
 $uid = session_id();
@@ -201,7 +201,11 @@ if ($send_email) {
     echo "</td></tr></table><p>\n";
     echo "<table class=box cellpadding=8 width=100%><tr><td>";
     $rating = rating_vol_auth($vol->id, $uid);
-    if (!$rating) $rating->rating = -1;
+    if (!$rating) {
+        $rating = new StdClass;
+        $rating->rating = -1;
+        $rating->comment = "";
+    }
     show_rating($vol, $rating);
     echo "</td></tr></table>\n";
 
diff --git a/doc/index.php b/doc/index.php
index 05c8900..104cbb4 100644
--- a/doc/index.php
+++ b/doc/index.php
@@ -108,8 +108,11 @@ function show_participate() {
             "</a>"
         )."
         <p>
-        For Android devices, download the BOINC or <a href=http://www.htc.com/www/go/power-to-give-faqs/>HTC Power To Give</a> app from the Google Play Store.
+        For Android devices, download the BOINC or
+        <a href=http://www.htc.com/www/go/power-to-give-faqs/>HTC Power To Give</a> app from the Google Play Store.
+        <a href=http://www.htc.com/www/go/power-to-give-faqs/>
         <img align=right valign=top height=50 src=images/htc-power-to-give.jpg>
+        </a>
         </td></tr>
     ";
 }
@@ -166,6 +169,7 @@ function show_other() {
             </ul>
             </td><td valign=top>
             <ul>
+            <li> <a href=trac/wiki/SourceCodeGit>".tra("Source code")."</a>
             <li> ".tra("Help wanted")."
             <ul>
                 <li> <a href=\"trac/wiki/DevProjects\">".tra("Programming")."</a>
diff --git a/doc/links.php b/doc/links.php
index 4e8ca14..1fdc12a 100644
--- a/doc/links.php
+++ b/doc/links.php
@@ -33,11 +33,11 @@ $info_sites = array(
         "BOINC projects",
         "(in Czech)"
     ),
-    array(
-        "http://www.boincteams.com/",
-        "BOINC Team Leaders Forum",
-        "(a meeting place to chat and discuss team building on BOINC projects)"
-    ),
+//    array(
+//        "http://www.boincteams.com/",
+//        "BOINC Team Leaders Forum",
+//        "(a meeting place to chat and discuss team building on BOINC projects)"
+//    ),
     array(
         "http://www.hyper.net/dc-howto.html",
         "How to participate in grid computing projects that benefit humanity",
diff --git a/doc/manager_links.php b/doc/manager_links.php
index fa008d9..f49c049 100644
--- a/doc/manager_links.php
+++ b/doc/manager_links.php
@@ -42,7 +42,9 @@ if ($target == "notice") {
 		header('Location: http://boinc.berkeley.edu/wiki/BOINC_Help');
 	}
 } else if  ($target == "advanced_preferences") {
-    header('Location: http://boinc.berkeley.edu/wiki/Preferences');
+    header('Location: http://boinc.berkeley.edu/wiki/Local_preferences#Advanced_view');
+} else if  ($target == "simple_preferences") {
+    header('Location: http://boinc.berkeley.edu/wiki/Local_preferences#Simple_view');
 } else if (($target == "advanced") && version_compare($version, "5.10.0", ">=") && version_compare($version, "6.12.0", "<")) {
 	if ($controlid == "6024") {
 		header('Location: http://boinc.berkeley.edu');
@@ -83,8 +85,18 @@ if ($target == "notice") {
 	} else {
 		header('Location: http://boinc.berkeley.edu/wiki/BOINC_Help');
 	}
+} else if (($target == "simple") && version_compare($version, "7.2.0", ">=") && version_compare($version, "7.4.0", "<")) {
+	if ($controlid == "6024") {
+		header('Location: http://boinc.berkeley.edu');
+	} else if ($controlid == "6025") {
+		header('Location: http://boinc.berkeley.edu/wiki/Simple_view');
+	} else if ($controlid == "6035") {
+		header('Location: http://boinc.berkeley.edu/wiki/BOINC_Help');
+	} else {
+		header('Location: http://boinc.berkeley.edu/wiki/BOINC_Help');
+	}
 } else {
-    if ($target == "advanced") {
+  if ($target == "advanced") {
 		if ($controlid == "6024") {
 			header('Location: http://boinc.berkeley.edu');
 		} else if ($controlid == "6025") {
@@ -94,7 +106,7 @@ if ($target == "notice") {
 		} else {
 			header('Location: http://boinc.berkeley.edu/wiki/Advanced_view');
 		}
-	} else if ($target == "simple") {
+  } else if ($target == "simple") {
 		if ($controlid == "6024") {
 			// "Show info about BOINC" item on Mac simple-view menu
 			//
@@ -108,14 +120,18 @@ if ($target == "notice") {
 			// item on Mac simple-view menu ?? do we need this item?
 			//
 			header('Location: http://boinc.berkeley.edu/wiki/BOINC_Help');
+		} else if ($controlid >= "6400" && $controlid <= "6499") {
+			// Any control that has focus in the simple view
+			//
+			header('Location: http://boinc.berkeley.edu/wiki/Simple_view');
 		} else {
 			// the question-mark button
 			//
 			header('Location: http://boinc.berkeley.edu/wiki/BOINC_Help');
 		}
 	} else {
-        header('Location: http://boinc.berkeley.edu/wiki/BOINC_Help');
-    }
+    header('Location: http://boinc.berkeley.edu/wiki/BOINC_Help');
+  }
 }
 
 ?>
diff --git a/doc/projects.inc b/doc/projects.inc
index a4350c6..25f0182 100644
--- a/doc/projects.inc
+++ b/doc/projects.inc
@@ -1,5 +1,9 @@
 <?php
 
+// if you change anything here,
+// look at http://boinc.berkeley.edu/project_list.php in a browser to make sure
+// you didn't mess up the XML
+
 require_once("../inc/translation.inc");
 
 // 0: name
@@ -88,12 +92,12 @@ $biomed = array(
             "Study and design RNA molecules"
         ),
         array(
-            "FightMalaria at Home",
-            "http://boinc.ucd.ie/fmah/",
+            "FightNeglectedDiseases at Home",
+            "http://findah.ucd.ie/",
             tra("University College Dublin"),
             tra("Antimalarial drug discovery"),
-            tra("The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."),
-            "FMAH_banner3_wt.png",
+            tra("The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs, targeting new proteins in the parasite. The FightNeglectedDiseases at Home project is aimed at finding these new targets."),
+            "",
             "",
             "Develop malaria drugs"
         ),
@@ -201,16 +205,16 @@ $biomed = array(
             "",
             "Study diseases such as HIV, malaria, cancer, and Alzheimer's"
         ),
-        array(
-            "SIMAP",
-            "http://boincsimap.org/boincsimap/",
-            tra("University of Vienna"),
-            tra("Biology"),
-            tra("Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."),
-            "simaplogo.jpg",
-            "",
-            "Calculate similarities between proteins"
-        ),
+//        array(
+//            "SIMAP",
+//            "http://boincsimap.org/boincsimap/",
+//            tra("University of Vienna"),
+//            tra("Biology"),
+//            tra("Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."),
+//            "simaplogo.jpg",
+//            "",
+//            "Calculate similarities between proteins"
+//        ),
     ),
 );
 $earth = array(
@@ -364,16 +368,26 @@ $astro_phys_chem = array(
             "Improve the design of the Large Hadron Collider"
         ),
         array(
-            "LHC at home Test4Theory",
-            "http://lhcathome2.cern.ch/test4theory/",
+            "vLHCathome",
+            "http://lhcathome2.cern.ch/vLHCathome/",
             tra("CERN (European Organization for Nuclear Research)"),
             tra("Physics"),
-            tra("This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"),
+            tra("This project uses CERN-developed virtual machine technology for LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"),
             "t4t.png",
             "",
             "Simulate high-energy particle collisions"
         ),
         array(
+            "ATLAS at Home",
+            "http://atlasathome.cern.ch/",
+            tra("CERN (European Organization for Nuclear Research)"),
+            tra("Physics"),
+            tra("ATLAS at Home uses volunteer computing to run simulations for ATLAS, a particle physics experiment at CERN's Large Hadron Collider.  ATLAS searches for new particles and processes using head-on collisions of protons of extraordinary high energy."),
+            "atlas_at_home.jpg",
+            "",
+            "Simulate high-energy particle collisions for CERN"
+        ),
+        array(
             "SETI at home",
             "http://setiathome.berkeley.edu/",
             tra("University of California, Berkeley"),
@@ -408,6 +422,16 @@ $mixed = array(
     tra("Multiple applications"),
     array(
         array(
+            "Citizen Science Grid",
+            "http://volunteer.cs.und.edu/csg/",
+            "University of North Dakota",
+            "Molecular biology, Computer Science",
+            "The Citizen Science Grid is dedicated to supporting a wide range of research and educational projects using volunteer computing and citizen science.",
+            "",
+            "",
+            "Support science from the University of North Dakota"
+        ),
+        array(
             "CAS at home",
             "http://casathome.ihep.ac.cn/",
             tra("Chinese Academy of Sciences"),
@@ -462,16 +486,16 @@ $mixed = array(
 $math = array(
     tra("Mathematics, computing, and games"),
     array(
-        array(
-            "SubsetSum at Home",
-            "http://volunteer.cs.und.edu/subset_sum/",
-            "University of North Dakota, Computer Science Department",
-            tra("Computer Science"),
-            "Research in computational complexity",
-            "",
-            "",
-            "Study the Subset Sum problem"
-        ),
+//        array(
+//            "SubsetSum at Home",
+//            "http://volunteer.cs.und.edu/subset_sum/",
+//            "University of North Dakota, Computer Science Department",
+//            tra("Computer Science"),
+//            "Research in computational complexity",
+//            "",
+//            "",
+//            "Study the Subset Sum problem"
+//        ),
         array(
             "OProject at Home",
             "http://oproject.info/",
@@ -492,16 +516,16 @@ $math = array(
             "",
             "Do research in algebraic number theory"
         ),
-        array(
-            "VolPEx",
-            "http://volpex.cs.uh.edu/VCP/",
-            "University of Houston",
-            "Computer science",
-            "Creating effective parallel computing on multiple volatile nodes. Apply research on REMD Protein Folding.",
-            "",
-            "",
-            "Study parallel computing across multiple computers"
-        ),
+//        array(
+//            "VolPEx",
+//            "http://volpex.cs.uh.edu/VCP/",
+//            "University of Houston",
+//            "Computer science",
+//            "Creating effective parallel computing on multiple volatile nodes. Apply research on REMD Protein Folding.",
+//            "",
+//            "",
+//            "Study parallel computing across multiple computers"
+//        ),
         array(
             "SAT at home",
             "http://sat.isa.ru/pdsat/",
@@ -521,15 +545,25 @@ $math = array(
 //
 //            "mersenne_logo80.png"
 //        ),
+//        array(
+//            "DistrRTgen",
+//            "http://boinc.freerainbowtables.com/distrrtgen/",
+//            "Private",
+//            tra("Cryptography"),
+//            "To give the world's security experts the best tools available for detecting weak hashes. This can help them to force developers to use more secure methods of password protection.",
+//            "freerainbowtables_logo.png",
+//            "",
+//            "Study hash functions"
+//        ),
         array(
-            "DistrRTgen",
-            "http://boinc.freerainbowtables.com/distrrtgen/",
+            "Moo! Wrapper",
+            "http://moowrap.net/",
             "Private",
-            tra("Cryptography"),
-            "To give the world's security experts the best tools available for detecting weak hashes. This can help them to force developers to use more secure methods of password protection.",
-            "freerainbowtables_logo.png",
+            tra("Cryptography and combinatorics"),
+            "Run applications from distributed.net",
             "",
-            "Study hash functions"
+            "",
+            "Run applications from distributed.net"
         ),
         array(
             "Enigma at Home",
@@ -561,16 +595,16 @@ $math = array(
             "",
             "Study the factorization of large integers"
         ),
-        array(
-            "VTU at home",
-            "http://boinc.vgtu.lt/vtuathome/",
-            tra("Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"),
-            tra("Software testing"),
-            tra("The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."),
-            "vtuathome-white.gif",
-            "",
-            "Help Lithuanian researchers"
-        ),
+//        array(
+//            "VTU at home",
+//            "http://boinc.vgtu.lt/vtuathome/",
+//            tra("Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"),
+//            tra("Software testing"),
+//            tra("The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."),
+//            "vtuathome-white.gif",
+//            "",
+//            "Help Lithuanian researchers"
+//        ),
 //        array(
 //            "AQUA at home",
 //            "http://aqua.dwavesys.com/",
@@ -587,16 +621,16 @@ $math = array(
 //            tra("Search for collisions (weaknesses) of the widely-used SHA-1 hash function."),
 //            "LogoKryptoGroup_klein.jpg"
 //        ),
-        array(
-            "ABC at home",
-            "http://abcathome.com/",
-            tra("Mathematical Institute of Leiden University / Kennislink"),
-            tra("Mathematics"),
-            tra("Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered direc [...]
-            "abclogo.jpg",
-            "",
-            "Study the ABC conjecture"
-        ),
+//        array(
+//            "ABC at home",
+//            "http://abcathome.com/",
+//            tra("Mathematical Institute of Leiden University / Kennislink"),
+//            tra("Mathematics"),
+//            tra("Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered dir [...]
+//            "abclogo.jpg",
+//            "",
+//            "Study the ABC conjecture"
+//        ),
         array(
             "PrimeGrid",
             "http://www.primegrid.com/",
@@ -677,9 +711,29 @@ $math = array(
 //            tra("Surveill at Home is a research project that conducts end-to-end fine-grained monitoring of web sites.  The project will deploy thousands of probes, each of which repeatedly performs transactions on web sites.  This approach provides end-user failure and performance statistics."),
 //            "surveill.png"
 //        ),
+        array(
+            "Gerasim at Home",
+            "http://gerasim.boinc.ru/",
+            "Southwest State University (Russia)",
+            "Computer engineering",
+            "Testing and comparison of heuristic methods for getting separations of parallel algorithms working in the CAD system for designing logic control systems",
+            "gerasim.gif",
+            "",
+            "",
+        ),
     ),
 );
 
 $areas = array($biomed, $astro_phys_chem, $math, $earth, $mixed, $cogsci, $sensing);
 
+function lookup_project($url) {
+    foreach ($areas as $area) {
+        foreach ($area as $p) {
+            if ($p[1] == $url) return $p;
+            if (sizeof($p)>6 && $p[6] == $url) return $p;
+        }
+    }
+    return null;
+}
+
 ?>
diff --git a/doc/projects.php b/doc/projects.php
index 904de74..e3c7297 100644
--- a/doc/projects.php
+++ b/doc/projects.php
@@ -130,8 +130,9 @@ function ordered_display($areas, $sort) {
         if (array_key_exists(5, $p) && $p[5]) {
             $img= "<img align=right vspace=4 hspace=4 src=images/$p[5]>";
         }
-        $desc = addslashes($p[4]);
-        $x = "<a href=$p[1] onmouseover=\"popup('$img <b>Sponsor:</b> $p[2]<hr><b>Area:</b> $p[3]<hr><b>Goal:</b> $desc')\">$p[0]</a>";
+        $arg = "$img <b>Sponsor:</b> $p[2]<hr><b>Area:</b> $p[3]<hr><b>Goal:</b> $p[4]";
+        $arg = addslashes($arg);
+        $x = "<a href=$p[1] onmouseover=\"popup('$arg')\">$p[0]</a>";
         $home = $p[2];
         $area = $p['area'];
         $spec_area = $p[3];
diff --git a/doc/versions.inc b/doc/versions.inc
index af85221..f2b9104 100644
--- a/doc/versions.inc
+++ b/doc/versions.inc
@@ -12,12 +12,12 @@ function type_text($type) {
             return "Command-line client (no GUI)";
         case "sea":
             return "Self-extracting archive";
-		case "mac_advanced":
-			return "Standard GUI";
+        case "mac_advanced":
+            return "Standard GUI";
         case "apk":
             return "Android Installer";
         }
-	} else {
+    } else {
         switch($type) {
         case "win_old":
             return "<a href=client_windows.php>Single-mode Windows installer</a>";
@@ -27,48 +27,40 @@ function type_text($type) {
             return "<a href=bare_core.php>Command-line client (no GUI)</a>";
         case "sea":
             return "<a href=sea.php>Self-extracting archive</a>";
-		case "mac_advanced":
-			return "<a href=mac_advanced.php>Standard GUI</a>";
-		case "apk":
-			return "TBD";
-		}
+        case "mac_advanced":
+            return "<a href=mac_advanced.php>Standard GUI</a>";
+        case "apk":
+            return "TBD";
+        }
     }
 }
 
 function linux_info() {
-	return "Tested on the current Ubuntu distribution; may work on others.
+    return "Tested on the current Ubuntu distribution; may work on others.
     <br>If available, we recommend that you install a
     <a href=http://boinc.berkeley.edu/wiki/Installing_BOINC#Linux>
     distribution-specific package</a>
     instead.  ";
 }
 
-$w74dev = array(
-	"num"=>"7.3.19",
-	"status"=>"Development version",
-	"file"=>"boinc_7.3.19_windows_intelx86.exe",
-	"vbox_file"=>"boinc_7.3.19_windows_intelx86_vbox.exe",
-  "vbox_version"=>"4.3.8",
-	"date"=>"15 May 2014",
-	"type"=>"win_new",
+$w74 = array(
+    "num"=>"7.4.42",
+    "status"=>"Recommended version",
+    "file"=>"boinc_7.4.42_windows_intelx86.exe",
+    "vbox_file"=>"boinc_7.4.42_windows_intelx86_vbox.exe",
+    "vbox_version"=>"4.3.12",
+    "date"=>"10 Mar 2015",
+    "type"=>"win_new",
 );
 
 $w72 = array(
-	"num"=>"7.2.42",
-	"status"=>"Recommended version",
-	"file"=>"boinc_7.2.42_windows_intelx86.exe",
-	"vbox_file"=>"boinc_7.2.42_windows_intelx86_vbox.exe",
-  "vbox_version"=>"4.2.16",
-	"date"=>"28 Feb 2014",
-	"type"=>"win_new",
-);
-
-$w70 = array(
-	"num"=>"7.0.64",
-	"status"=>"Older version",
-	"file"=>"boinc_7.0.64_windows_intelx86.exe",
-	"date"=>"17 Apr 2013",
-	"type"=>"win_new",
+    "num"=>"7.2.42",
+    "status"=>"Older version",
+    "file"=>"boinc_7.2.42_windows_intelx86.exe",
+    "vbox_file"=>"boinc_7.2.42_windows_intelx86_vbox.exe",
+    "vbox_version"=>"4.2.16",
+    "date"=>"28 Feb 2014",
+    "type"=>"win_new",
 );
 
 $w66 = array(
@@ -87,64 +79,48 @@ $w5816 = array(
     "type"=>"win_new",
 );
 
-$w74x64dev = array(
-	"num"=>"7.3.19",
-	"status"=>"Development version",
-	"file"=>"boinc_7.3.19_windows_x86_64.exe",
-	"vbox_file"=>"boinc_7.3.19_windows_x86_64_vbox.exe",
-  "vbox_version"=>"4.3.8",
-	"date"=>"15 May 2014",
-	"type"=>"win_new",
+$w74x64 = array(
+    "num"=>"7.4.42",
+    "status"=>"Recommended version",
+    "file"=>"boinc_7.4.42_windows_x86_64.exe",
+    "vbox_file"=>"boinc_7.4.42_windows_x86_64_vbox.exe",
+    "vbox_version"=>"4.3.12",
+    "date"=>"10 Mar 2015",
+    "type"=>"win_new",
 );
 
 $w72x64 = array(
-	"num"=>"7.2.42",
-	"status"=>"Recommended version",
-	"file"=>"boinc_7.2.42_windows_x86_64.exe",
-	"vbox_file"=>"boinc_7.2.42_windows_x86_64_vbox.exe",
-  "vbox_version"=>"4.2.16",
-	"date"=>"28 Feb 2014",
-	"type"=>"win_new",
-);
-
-$w70x64 = array(
-	"num"=>"7.0.64",
-	"status"=>"Older version",
-	"file"=>"boinc_7.0.64_windows_x86_64.exe",
-	"date"=>"17 Apr 2013",
-	"type"=>"win_new",
-);
-
-$m74dev = array(
-	"num"=>"7.3.19",
-	"status"=>"Development version (standard GUI)",
-	"file"=>"boinc_7.3.19_macOSX_i686.zip",
-	"date"=>"15 May 2014",
-	"type"=>"mac_advanced",
+    "num"=>"7.2.42",
+    "status"=>"Older version",
+    "file"=>"boinc_7.2.42_windows_x86_64.exe",
+    "vbox_file"=>"boinc_7.2.42_windows_x86_64_vbox.exe",
+    "vbox_version"=>"4.2.16",
+    "date"=>"28 Feb 2014",
+    "type"=>"win_new",
 );
 
-$m72 = array(
-	"num"=>"7.2.42",
+$m74 = array(
+	"num"=>"7.4.42",
 	"status"=>"Recommended version (standard GUI)",
-	"file"=>"boinc_7.2.42_macOSX_i686.zip",
-	"date"=>"28 Feb 2014",
+	"file"=>"boinc_7.4.42_macOSX_x86_64.zip",
+	"date"=>"12 Mar 2015",
 	"type"=>"mac_advanced",
 );
 
-$m70 = array(
-	"num"=>"7.0.65",
-	"status"=>"Older version (standard GUI)",
-	"file"=>"boinc_7.0.65_macOSX_i686.zip",
-	"date"=>"17 Apr 2013",
-	"type"=>"mac_advanced",
+$m72 = array(
+    "num"=>"7.2.42",
+    "status"=>"Recommended version (standard GUI)",
+    "file"=>"boinc_7.2.42_macOSX_i686.zip",
+    "date"=>"28 Feb 2014",
+    "type"=>"mac_advanced",
 );
 
 $m612_ppc = array(
-	"num"=>"6.12.35",
-	"status"=>"Recommended version (standard GUI)",
-	"file"=>"boinc_6.12.35_macOSX_universal.zip",
-	"date"=>"11 Aug 2011",
-	"type"=>"mac_advanced",
+    "num"=>"6.12.35",
+    "status"=>"Recommended version (standard GUI)",
+    "file"=>"boinc_6.12.35_macOSX_universal.zip",
+    "date"=>"11 Aug 2011",
+    "type"=>"mac_advanced",
 );
 
 $m66 = array(
@@ -155,36 +131,28 @@ $m66 = array(
     "type"=>"mac_advanced",
 );
 
-$m74cdev = array(
-	"num"=>"7.3.19",
-	"status"=>"Development version (Unix command-line version)",
-	"file"=>"boinc_7.3.19_i686-apple-darwin.zip",
-	"date"=>"15 May 2014",
-	"type"=>"bare_core",
-);
-
-$m72c = array(
-	"num"=>"7.2.42",
+$m74c = array(
+	"num"=>"7.4.42",
 	"status"=>"Recommended version (Unix command-line version)",
-	"file"=>"boinc_7.2.42_i686-apple-darwin.zip",
-	"date"=>"28 Feb 2014",
+	"file"=>"boinc_7.4.42_x86_64-apple-darwin.zip",
+	"date"=>"12 Mar 2015",
 	"type"=>"bare_core",
 );
 
-$m70c = array(
-	"num"=>"7.0.65",
-	"status"=>"Older version (Unix command-line version)",
-	"file"=>"boinc_7.0.65_i686-apple-darwin.zip",
-	"date"=>"17 Apr 2013",
-	"type"=>"bare_core",
+$m72c = array(
+    "num"=>"7.2.42",
+    "status"=>"Recommended version (Unix command-line version)",
+    "file"=>"boinc_7.2.42_i686-apple-darwin.zip",
+    "date"=>"28 Feb 2014",
+    "type"=>"bare_core",
 );
 
 $m612c_ppc = array(
-	"num"=>"6.12.35",
-	"status"=>"Recommended version (Unix command-line version)",
-	"file"=>"boinc_6.12.35_universal-apple-darwin.zip",
-	"date"=>"11 Aug 2011",
-	"type"=>"bare_core",
+    "num"=>"6.12.35",
+    "status"=>"Recommended version (Unix command-line version)",
+    "file"=>"boinc_6.12.35_universal-apple-darwin.zip",
+    "date"=>"11 Aug 2011",
+    "type"=>"bare_core",
 );
 
 $m66c = array(
@@ -196,75 +164,75 @@ $m66c = array(
 );
 
 $l612 = array(
-	"num"=>"6.12.22",
-	"status"=>"Recommended version",
-	"file"=>"boinc_compat_6.12.22_i686-pc-linux-gnu.sh",
-	"date"=>"6 Apr 2011",
-	"type"=>"sea",
+    "num"=>"6.12.22",
+    "status"=>"Recommended version",
+    "file"=>"boinc_compat_6.12.22_i686-pc-linux-gnu.sh",
+    "date"=>"6 Apr 2011",
+    "type"=>"sea",
 );
 
-$l66 = array(
-	"num"=>"6.6.41",
-	"status"=>"Older version",
-	"file"=>"boinc_compat_6.6.41_i686-pc-linux-gnu.sh",
-	"date"=>"22 Oct 2009",
-	"type"=>"sea",
-	);
-
 $l74ubuntudev = array(
-	"num"=>"7.3.19",
-	"status"=>"Development version",
-	"file"=>"boinc_7.3.19_i686-pc-linux-gnu.sh",
-	"date"=>"15 May 2014",
-	"type"=>"sea",
+    "num"=>"7.4.22",
+    "status"=>"Development version",
+    "file"=>"boinc_7.4.22_i686-pc-linux-gnu.sh",
+    "date"=>"17 Sept 2014",
+    "type"=>"sea",
 );
 
 $l72ubuntu = array(
-	"num"=>"7.2.42",
-	"status"=>"Recommended version",
-	"file"=>"boinc_7.2.42_i686-pc-linux-gnu.sh",
-	"date"=>"28 Feb 2014",
-	"type"=>"sea",
+    "num"=>"7.2.42",
+    "status"=>"Recommended version",
+    "file"=>"boinc_7.2.42_i686-pc-linux-gnu.sh",
+    "date"=>"28 Feb 2014",
+    "type"=>"sea",
 );
 
 $l70ubuntu = array(
-	"num"=>"7.0.65",
-	"status"=>"Older version",
-	"file"=>"boinc_7.0.65_i686-pc-linux-gnu.sh",
-	"date"=>"17 Apr 2013",
-	"type"=>"sea",
+    "num"=>"7.0.65",
+    "status"=>"Older version",
+    "file"=>"boinc_7.0.65_i686-pc-linux-gnu.sh",
+    "date"=>"17 Apr 2013",
+    "type"=>"sea",
 );
 
 $l74ubuntux64dev = array(
-	"num"=>"7.3.19",
-	"status"=>"Development version",
-	"file"=>"boinc_7.3.19_x86_64-pc-linux-gnu.sh",
-	"date"=>"15 May 2014",
-	"type"=>"sea",
+    "num"=>"7.4.22",
+    "status"=>"Development version",
+    "file"=>"boinc_7.4.22_x86_64-pc-linux-gnu.sh",
+    "date"=>"17 Sept 2014",
+    "type"=>"sea",
 );
 
 $l72ubuntux64 = array(
-	"num"=>"7.2.42",
-	"status"=>"Recommended version",
-	"file"=>"boinc_7.2.42_x86_64-pc-linux-gnu.sh",
-	"date"=>"28 Feb 2014",
-	"type"=>"sea",
+    "num"=>"7.2.42",
+    "status"=>"Recommended version",
+    "file"=>"boinc_7.2.42_x86_64-pc-linux-gnu.sh",
+    "date"=>"28 Feb 2014",
+    "type"=>"sea",
 );
 
 $l70ubuntux64 = array(
-	"num"=>"7.0.65",
-	"status"=>"Older version",
-	"file"=>"boinc_7.0.65_x86_64-pc-linux-gnu.sh",
-	"date"=>"17 Apr 2013",
-	"type"=>"sea",
+    "num"=>"7.0.65",
+    "status"=>"Older version",
+    "file"=>"boinc_7.0.65_x86_64-pc-linux-gnu.sh",
+    "date"=>"17 Apr 2013",
+    "type"=>"sea",
 );
 
-$a73 = array(
-	"num"=>"7.3.7",
-	"status"=>"Recommended Version",
-	"file"=>"boinc_7.3.7.apk",
-	"date"=>"3 Mar 2014",
-	"type"=>"apk",
+$a74dev = array(
+    "num"=>"7.4.31",
+    "status"=>"Development Version",
+    "file"=>"boinc_7.4.31.apk",
+    "date"=>"26 Nov 2014",
+    "type"=>"apk",
+);
+
+$a74 = array(
+    "num"=>"7.4.41",
+    "status"=>"Recommended Version",
+    "file"=>"boinc_7.4.41.apk",
+    "date"=>"22 Jan 2015",
+    "type"=>"apk",
 );
 
 // platform descriptors.  For each one, "versions"
@@ -276,11 +244,10 @@ $windows = array(
     "description"=>"XP/Vista/7/8/8.1",
     "dbname" => "windows_intelx86",
     "versions"=>array(
-		  $w74dev,
-		  $w72,
-		  $w70,
-		  $w66,
-      $w5816,
+          $w74,
+          $w72,
+          $w66,
+          $w5816,
     )
 );
 
@@ -289,35 +256,40 @@ $windowsx64 = array(
     "description"=>"XP/Vista/7/8/8.1",
     "dbname" => "windows_x86_64",
     "versions"=>array(
-		  $w74x64dev,
-		  $w72x64,
-		  $w70x64,
+          $w74x64,
+          $w72x64,
     )
 );
 
 $mac = array(
-    "name"=>"Mac OS X (Intel only)",
+    "name"=>"Mac OS X (64-bit Intel)",
+    "description"=>"Version 10.5.0+",
+    "dbname" => "x86_64-apple-darwin",
+    "versions"=>array(
+          $m74,
+          $m74c,
+    )
+);
+
+$mac32 = array(
+    "name"=>"Mac OS X (32-bit or 64-bit Intel)",
     "description"=>"Version 10.4.0+",
     "dbname" => "x86_64-apple-darwin",
     "versions"=>array(
-		  $m74dev,
           $m72,
-		  $m70,
-          $m74cdev,
-		  $m72c,
-		  $m70c,
+          $m72c,
     )
 );
 
 $macppc = array(
-    "name"=>"Mac OS X (PowerPC and x86)",
+    "name"=>"Mac OS X (Power PC or 32-bit Intel)",
     "description"=>"Version 10.4.0+",
     "dbname" => "powerpc-apple-darwin",
     "versions"=>array(
-  		$m612_ppc,
-	  	$m612c_ppc,
-      $m66,
-      $m66c,
+        $m612_ppc,
+        $m612c_ppc,
+        $m66,
+        $m66c,
     )
 );
 
@@ -326,9 +298,9 @@ $linux = array(
     "description"=> linux_info(),
     "dbname" => "i686-pc-linux-gnu",
     "versions"=>array(
-		  $l74ubuntudev,
-		  $l72ubuntu,
-		  $l70ubuntu,
+          $l74ubuntudev,
+          $l72ubuntu,
+          $l70ubuntu,
     )
 );
 
@@ -337,66 +309,58 @@ $linuxx64 = array(
     "description"=> linux_info(),
     "dbname" => "x86_64-pc-linux-gnu",
     "versions"=>array(
-  		$l74ubuntux64dev,
-  		$l72ubuntux64,
-	  	$l70ubuntux64,
+          $l74ubuntux64dev,
+          $l72ubuntux64,
+          $l70ubuntux64,
     )
 );
 
 $linuxcompat = array(
-	"name"=>"Older Linux x86 and x64",
-	"description"=>"For older Linux versions, both x86 and x64; command-line interface only",
-	"dbname" => "i686-pc-linux-gnu",
-	"versions"=>array(
-		$l612,
-		$l66,
-	)
-);
-
-$androidarm = array(
-	"name"=>"Android/ARM",
-	"description"=>"Android version 2.3 and later<br>We recommend that, rather than downloading BOINC from here,</br>you get it from the Google Play Store or the Amazon app store (for Kindle Fire)",
-	"dbname" => "arm-android-linux-gnu",
-	"versions"=>array(
-		$a73,
-	)
-);
-
-$androidmips = array(
-	"name"=>"Android/MIPS",
-	"description"=>"Android version 2.3 and later<br>We recommend that, rather than downloading BOINC from here,</br>you get it from the Google Play Store or the Amazon app store (for Kindle Fire)",
-	"dbname" => "mips-android-linux-gnu",
-	"versions"=>array(
-		$a73,
-	)
-);
-
-$androidx86 = array(
-	"name"=>"Android/x86",
-	"description"=>"Android version 2.3 and later<br>We recommend that, rather than downloading BOINC from here,</br>you get it from the Google Play Store or the Amazon app store (for Kindle Fire)",
-	"dbname" => "x86-android-linux-gnu",
-	"versions"=>array(
-		$a73,
-	)
+    "name"=>"Older Linux x86 and x64",
+    "description"=>"For older Linux versions, both x86 and x64; command-line interface only",
+    "dbname" => "i686-pc-linux-gnu",
+    "versions"=>array(
+        $l612,
+    )
+);
+
+$android = array(
+    "name"=>"Android",
+    "description"=>"Android version 4.1 and later for ARM, MIPS, or x86<br>We recommend that, rather than downloading BOINC from here,</br>you get it from the Google Play Store or the Amazon app store (for Kindle Fire)",
+    "dbname" => "arm-android-linux-gnu",
+    "versions"=>array(
+        $a74,
+    )
 );
 
 $platforms = array(
     "win"=>$windows,
     "winx64"=>$windowsx64,
     "mac"=>$mac,
+    "mac32"=>$mac32,
     "macppc"=>$macppc,
-    "linux"=>$linux,
     "linuxx64"=>$linuxx64,
+    "linux"=>$linux,
     "linuxcompat"=>$linuxcompat,
-    "androidarm"=>$androidarm,
-    "androidmips"=>$androidmips,
-    "androidx86"=>$androidx86,
+    "android"=>$android,
 );
 
 function is_dev($v) {
     return (strstr($v["status"], "Development") != null);
 }
 
+function latest_version($p) {
+    $dev = false;
+    foreach ($p['versions'] as $i=>$v) {
+        if (!$dev && is_dev($v)) continue;
+        return $v;
+    }
+    foreach ($p['versions'] as $i=>$v) {
+        return $v;
+    }
+}
+
+
 // note: rand() is inclusive
 //switch(rand(0,3)) {
 switch(0) {
diff --git a/find-working-cvs b/find-working-cvs
deleted file mode 100755
index baeb864..0000000
--- a/find-working-cvs
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env python
-
-# $Id$
-
-# Brute-force find at what point in time the automated tests stopped working.
-# You better be using ccache!
-
-# TODO: do a binary search instead of linear search.
-
-range = ['2003-10-01', '2003-11-10']
-
-import os, time
-
-def ptime(t):
-    return time.mktime(time.strptime(t, '%Y-%m-%d'))
-
-def doit(d):
-    print 'trying', d
-    dir = '/tmp/t.' + d
-    os.system('cvs co -D %s -d %s boinc' % (d,dir))
-    os.chdir(dir)
-    if 0 == os.system('./configure && make && cd test && ./test_uc.py'):
-        raise SystemExit('Woohoo! %s' %d)
-
-range = map(ptime, range)
-
-t = range[1]
-tmin = range[0]
-
-while t > tmin:
-    d = time.strftime('%Y-%m-%d', time.localtime(t))
-    doit(d)
-    t -= 86400
diff --git a/html/inc/account.inc b/html/inc/account.inc
new file mode 100644
index 0000000..3dea844
--- /dev/null
+++ b/html/inc/account.inc
@@ -0,0 +1,121 @@
+<?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/>.
+
+// forms for account creation and login
+
+function create_account_form($teamid, $next_url) {
+    echo "
+        <form action=\"create_account_action.php\" method=\"post\">
+        <input type=hidden name=next_url value=\"$next_url\">
+    ";
+
+    if ($teamid) {
+        echo "
+            <input type=\"hidden\" name=\"teamid\" value=\"$teamid\">
+        ";
+    }
+    start_table();
+
+    // Using invitation codes to restrict access?
+    //
+    if (defined('INVITE_CODES')) {
+         row2(
+             tra("Invitation Code")."<br><p class=\"text-info\">".tra("A valid invitation code is required to create an account.")."</p>",
+             "<input type=\"text\" name=\"invite_code\" size=\"30\" >"
+         );
+    }
+
+    row2(
+        tra("Name")."<br><p class=\"text-info\">".tra("Identifies you on our web site. Use your real name or a nickname.")."</p>",
+        "<input type=\"text\" name=\"new_name\" size=\"30\">"
+    );
+    row2(
+        tra("Email Address")."<br><p class=\"text-info\">".tra("Must be a valid address of the form 'name at domain'.")."</p>",
+        "<input type=\"text\" name=\"new_email_addr\" size=\"50\">"
+    );
+    $min_passwd_length = parse_element(get_config(), "<min_passwd_length>");
+    if (!$min_passwd_length) {
+        $min_passwd_length = 6;
+    }
+
+    row2(
+        tra("Password")
+        ."<br><p class=\"text-info\">".tra("Must be at least %1 characters", $min_passwd_length)."</p>",
+        "<input type=\"password\" name=\"passwd\">"
+    );
+    row2(tra("Confirm password"), "<input type=\"password\" name=\"passwd2\">");
+    row2_init(
+        tra("Country")."<br><p class=\"text-info\">".tra("Select the country you want to represent, if any.")."</p>",
+        "<select name=\"country\">"
+    );
+    print_country_select();
+    echo "</select></td></tr>\n";
+    if (0) {
+        row2(
+            tra("Postal or ZIP Code")."<br><p class=\"text-info\">".tra("Optional")."</p>",
+            "<input type=\"text\" name=\"postal_code\" size=\"20\">"
+        );
+    }
+
+    // Check if we're reCaptcha to prevent spam accounts
+    //
+    $publickey = parse_config(get_config(), "<recaptcha_public_key>");
+    if ($publickey) {
+        row2(
+            "",
+            recaptcha_get_html($publickey)
+        );
+    }
+
+    row2("",
+        "<input class=\"btn btn-primary\" type=\"submit\" value=\"".tra("Create account")."\">"
+    );
+    end_table();
+    echo "</form>\n";
+}
+
+function login_form($next_url) {
+    echo "
+        <form name=\"f\" method=\"post\" action=\"".secure_url_base()."/login_action.php\">
+        <input type=\"hidden\" name=\"next_url\" value=\"$next_url\">
+    ";
+    start_table();
+    if (LDAP_HOST) {
+        $x = "Email address or LDAP user name:";
+    } else {
+        $x = tra("Email address:");
+    }
+    row2($x . '<br><p class="text-muted"><a href="get_passwd.php">'.tra("forgot email address?")."</a></p>",
+        "<input name=email_addr type=\"text\" size=40 tabindex=1>"
+    );
+    row2(tra("Password:") . '<br><p class="text-muted"><a href="get_passwd.php">' . tra("forgot password?") . "</a></p>",
+        '<input type="password" name="passwd" size="40" tabindex="2">'
+    );
+    row2(tra("Stay logged in"),
+        '<input type="checkbox" name="stay_logged_in" checked>'
+    );
+
+    row2("",
+        "<input class=\"btn btn-default\" type=\"submit\" name=\"mode\" value=\"".tra("Log in")."\" tabindex=\"3\"><br><br>"
+    );
+
+    end_table();
+    echo "</form>\n";
+}
+
+?>
diff --git a/html/inc/bbcode_html.inc b/html/inc/bbcode_html.inc
index aaee9c0..2754586 100644
--- a/html/inc/bbcode_html.inc
+++ b/html/inc/bbcode_html.inc
@@ -8,31 +8,34 @@ $bbcode_html = '
 <table width="40%" border="0" cellspacing="0" cellpadding="2" class="bbcode_buttons">
           <tr align="center" valign="middle">
             <td><span class="genmed">
-              <input type="button" class="button" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onClick="bbstyle(0)" title="'.tra("Bold text: [b]text[/b]  (alt+b)").'" />
+              <input type="button" class="btn btn-default btn-sm" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onClick="bbstyle(0)" title="'.tra("Bold text: [b]text[/b]  (alt+b)").'" />
               </span></td>
             <td><span class="genmed">
-              <input type="button" class="button" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onClick="bbstyle(2)" title="'.tra("Italic text: [i]text[/i]  (alt+i)").'" />
+              <input type="button" class="btn btn-default btn-sm" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onClick="bbstyle(2)" title="'.tra("Italic text: [i]text[/i]  (alt+i)").'" />
               </span></td>
             <td><span class="genmed">
-              <input type="button" class="button" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onClick="bbstyle(4)" title="'.tra("Underline text: [u]text[/u]  (alt+u)").'" />
+              <input type="button" class="btn btn-default btn-sm" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onClick="bbstyle(4)" title="'.tra("Underline text: [u]text[/u]  (alt+u)").'" />
               </span></td>
             <td><span class="genmed">
-              <input type="button" class="button" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onClick="bbstyle(6)" title="'.tra("Quote text: [quote]text[/quote]  (alt+q)").'" />
+              <input type="button" class="btn btn-default btn-sm" accesskey="k" name="addbbcode20" value=" k " style="text-decoration: line-through; width: 30px" onClick="bbstyle(20)" title="'.tra("Strikethrough text: [s]text[/s]  (alt+k)").'" />
               </span></td>
             <td><span class="genmed">
-              <input type="button" class="button" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onClick="bbstyle(8)" title="'.tra("Code display: [code]code[/code]  (alt+c)").'" />
+              <input type="button" class="btn btn-default btn-sm" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onClick="bbstyle(6)" title="'.tra("Quote text: [quote]text[/quote]  (alt+q)").'" />
               </span></td>
             <td><span class="genmed">
-              <input type="button" class="button" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onClick="bbstyle(10)" title="'.tra("List: [list]text[/list] (alt+l)").'" />
+              <input type="button" class="btn btn-default btn-sm" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onClick="bbstyle(8)" title="'.tra("Code display: [code]code[/code]  (alt+c)").'" />
               </span></td>
             <td><span class="genmed">
-              <input type="button" class="button" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onClick="bbstyle(12)" title="'.tra("Ordered list: [list=]text[/list]  (alt+o)").'" />
+              <input type="button" class="btn btn-default btn-sm" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onClick="bbstyle(10)" title="'.tra("List: [list]text[/list] (alt+l)").'" />
               </span></td>
             <td><span class="genmed">
-              <input type="button" class="button" accesskey="p" name="addbbcode14" value="Img" style="width: 40px"  onClick="bbstyle(14)" title="'.tra("Insert image: [img]http://image_url[/img]  (alt+p)").'" />
+              <input type="button" class="btn btn-default btn-sm" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onClick="bbstyle(12)" title="'.tra("Ordered list: [list=]text[/list]  (alt+o)").'" />
               </span></td>
             <td><span class="genmed">
-              <input type="button" class="button" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onClick="bbstyle(16)" title="'.tra("Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url]  (alt+w)").'" />
+              <input type="button" class="btn btn-default btn-sm" accesskey="p" name="addbbcode14" value="Img" style="width: 40px"  onClick="bbstyle(14)" title="'.tra("Insert image: [img]http://image_url[/img]  (alt+p)").'" />
+              </span></td>
+            <td><span class="genmed">
+              <input type="button" class="btn btn-default btn-sm" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onClick="bbstyle(16)" title="'.tra("Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url]  (alt+w)").'" />
               </span></td>
           </tr>
           <tr>
@@ -68,4 +71,4 @@ $bbcode_html = '
             </td>
           </tr>
         </table>
-';
\ No newline at end of file
+';
diff --git a/html/inc/boinc_db.inc b/html/inc/boinc_db.inc
index 1c471aa..9a583a8 100644
--- a/html/inc/boinc_db.inc
+++ b/html/inc/boinc_db.inc
@@ -106,6 +106,12 @@ class BoincDb extends DbConn {
         $db = self::get();
         return $db->base_error();
     }
+
+    // if your DB connection times out, call this, then call get() again
+    //
+    static function reset_connection() {
+        self::$instance = null;
+    }
 }
 
 class BoincUser {
@@ -219,6 +225,11 @@ class BoincTeam {
         $db = BoincDb::get();
         return $db->lookup('team', 'BoincTeam', $clause);
     }
+    static function lookup_name($name) {
+        $db = BoincDb::get();
+        $name = BoincDb::escape_string($name);
+        return self::lookup("name='$name'");
+    }
     function delete() {
         $db = BoincDb::get();
         return $db->delete($this, 'team');
@@ -300,6 +311,7 @@ class BoincResult {
     }
     static function lookup_name($name) {
         $db = BoincDb::get();
+        $name = BoincDb::escape_string($name);
         return $db->lookup('result', 'BoincResult', "name='$name'");
     }
     function delete() {
@@ -335,6 +347,10 @@ class BoincWorkunit {
         $db = BoincDb::get();
         return $db->update_aux('workunit', $clause);
     }
+    static function count($clause) {
+        $db = BoincDb::get();
+        return $db->count('workunit', $clause);
+    }
 }
 
 class BoincApp {
@@ -468,7 +484,7 @@ class BoincPrivateMessage {
         $db = BoincDb::get();
         return $db->delete($this, 'private_messages');
     }
-    function delete_aux($clause) {
+    static function delete_aux($clause) {
         $db = BoincDb::get();
         return $db->delete_aux('private_messages', $clause);
     }
@@ -528,6 +544,8 @@ function latest_avs_app_platform($appid, $platformid) {
             if ($av->id == $av2->id) continue;
             if ($av->plan_class == $av2->plan_class && $av->version_num > $av2->version_num) {
                 $av2->deprecated = 1;
+            } else if ($av2->beta) {
+                $av2->deprecated = 1;
             }
         }
     }
@@ -639,5 +657,60 @@ class BoincBadgeTeam {
     }
 }
 
+class BoincCreditUser {
+    static function lookup($clause) {
+        $db = BoincDb::get();
+        return $db->lookup('credit_user', 'BoincCreditUser', $clause);
+    }
+    static function enum($where_clause) {
+        $db = BoincDb::get();
+        return $db->enum('credit_user', 'BoincCreditUser', $where_clause);
+    }
+    static function sum($field, $clause) {
+        $db = BoincDb::get();
+        return $db->sum('credit_user', $field, $clause);
+    }
+    static function update($clause) {
+        $db = BoincDb::get();
+        return $db->update_aux('credit_user', $clause);
+    }
+    static function delete_user($user) {
+        $db = BoincDb::get();
+        $db->delete_aux('credit_user', "userid=$user->id");
+    }
+}
+
+class BoincCreditTeam {
+    static function lookup($clause) {
+        $db = BoincDb::get();
+        return $db->lookup('credit_team', 'BoincCreditTeam', $clause);
+    }
+    static function enum($where_clause) {
+        $db = BoincDb::get();
+        return $db->enum('credit_team', 'BoincCreditTeam', $where_clause);
+    }
+    static function sum($field, $clause) {
+        $db = BoincDb::get();
+        return $db->sum('credit_team', $field, $clause);
+    }
+    static function update($clause) {
+        $db = BoincDb::get();
+        return $db->update_aux('credit_team', $clause);
+    }
+}
+
+// DEPRECATED: use BoincDb::escape_string where possible
+// 
+// apply this to any user-supplied strings used in queries
+// 
+function boinc_real_escape_string($x) {
+    if (version_compare(phpversion(),"4.3.0")>=0) {
+        return BoincDb::escape_string($x);
+    } else {
+        $x = str_replace("'", "\'", $x);
+        $x = str_replace("\"", "\\\"", $x);
+        return $x;
+    }
+}
 
 ?>
diff --git a/html/inc/bolt_db.inc b/html/inc/bolt_db.inc
index cbfeaa7..7ef291d 100644
--- a/html/inc/bolt_db.inc
+++ b/html/inc/bolt_db.inc
@@ -139,6 +139,7 @@ class BoltCourse {
     }
     static function lookup_name($name) {
         $db = BoltDb::get();
+        $name = BoincDb::escape_string($name);
         return $db->lookup('bolt_course', 'BoltCourse', "short_name='$name'");
     }
     static function enum() {
diff --git a/html/inc/bolt_util.inc b/html/inc/bolt_util.inc
index e78d056..b238e7e 100644
--- a/html/inc/bolt_util.inc
+++ b/html/inc/bolt_util.inc
@@ -63,7 +63,7 @@ function request_info($user, $course) {
     start_table();
     row2("Birth year", birth_year_select($user));
     row2("Sex", sex_select($user));
-    row2("", "<input type=submit value=OK>");
+    row2("", "<input class=\"btn btn-default\" type=submit value=OK>");
     end_table();
     echo "</form>\n";
     page_tail();
diff --git a/html/inc/bolt_util_ops.inc b/html/inc/bolt_util_ops.inc
index 29c2807..db2ddf5 100644
--- a/html/inc/bolt_util_ops.inc
+++ b/html/inc/bolt_util_ops.inc
@@ -125,7 +125,7 @@ function compare_bar($title, $n, $width, $lo, $hi) {
     $a2 = number_format($hi*100);
     return "
         <tr>
-        <td>$title<br><span class=note>($n students)</span></td>
+        <td>$title<br><p class=\"text-muted\">($n students)</p></td>
         <td>
             <table class=bolt_bar width=$width><tr class=bolt_bar>
             <td class=bolt_bar1 width=$x1 bgcolor=lightgray align=right>$a1</td>
@@ -165,7 +165,7 @@ function outcome_graph($x, $width) {
         <table class=bolt_bar><tr>
     ";
     if ($x0) {
-        $s .= "<td class=bolt_bar height=10 width=$x0 bgcolor=#88ff88><span class=note>$t0</span></td>
+        $s .= "<td class=bolt_bar height=10 width=$x0 bgcolor=#88ff88><p class=\"text-muted\">$t0</p></td>
         ";
     }
     if ($x1) {
@@ -188,7 +188,7 @@ function time_graph($t, $w) {
     $t = number_format($t, 1);
     return "<td>
         <table class=bolt_bar><tr>
-            <td class=bolt_bar height=10 width=$x bgcolor=#ffffcc><span class=note>$t sec</span></td>
+            <td class=bolt_bar height=10 width=$x bgcolor=#ffffcc><p class=\"text-muted\">$t sec</p></td>
         </tr></table>
     </td>";
 }
@@ -202,7 +202,7 @@ function score_graph($t, $w) {
         <table class=bolt_bar><tr>
     ";
     if ($x) {
-        $s .= "<td class=bolt_bar height=10 width=$x bgcolor=#ffffcc><span class=note>$t%</span></td>
+        $s .= "<td class=bolt_bar height=10 width=$x bgcolor=#ffffcc><p class=\"text-muted\">$t%</p></td>
         ";
     }
     if ($y) {
diff --git a/html/inc/bossa_example.inc b/html/inc/bossa_example.inc
index 4b7c17b..24c6c41 100644
--- a/html/inc/bossa_example.inc
+++ b/html/inc/bossa_example.inc
@@ -30,7 +30,7 @@ function job_show($job, $inst, $user) {
         <form method=get action=bossa_job_finished.php>
         Click on the center of the ellipse.
         If you don't see one, click here:
-        <input type=submit name=submit value=None>
+        <input class=\"btn btn-default\" type=submit name=submit value=None>
         <br><br>
         <input type=hidden name=bji value=$inst->id>
         <input type=image name=pic src=$path>
diff --git a/html/inc/bossa_example2.inc b/html/inc/bossa_example2.inc
index 652b8e2..c6bf281 100644
--- a/html/inc/bossa_example2.inc
+++ b/html/inc/bossa_example2.inc
@@ -35,7 +35,7 @@ function job_show($job, $inst, $user) {
         <form method=get action=bossa_job_finished.php>
         Click on the center of the ellipse.
         If you don't see one, click here:
-        <input type=submit name=submit value=None>
+        <input class=\"btn btn-default\" type=submit name=submit value=None>
         <br><br>
         <input type=hidden name=bji value=$inst->id>
         <input type=image name=pic src=$path>
diff --git a/html/inc/cache.inc b/html/inc/cache.inc
index 18ec3ab..69c9b68 100644
--- a/html/inc/cache.inc
+++ b/html/inc/cache.inc
@@ -16,6 +16,8 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
+// mechanism for caching commonly-accessed pages
+
 require_once("../project/cache_parameters.inc");
 
 // If we can't see request headers, don't do caching
@@ -25,8 +27,6 @@ if (!function_exists("apache_request_headers")) {
     $no_cache = true;
 }
 
-// mechanism for caching commonly-accessed pages
-
 function make_cache_dirs() {
     if (!@filemtime("../cache")) {
         mkdir("../cache", 0770);
@@ -105,18 +105,15 @@ function clean_cache($max_age, $dir) {
 } 
 
 
-// check free disk space every once in a while
+// check cache size every once in a while, purge if too big
+//
 function cache_check_diskspace(){
-    if (!(rand() % CACHE_SIZE_CHECK_FREQ)) {
-        set_time_limit(0);  // this may take a while
-        $max_age = 86400;
-        while ((disk_free_space("../cache") < MIN_FREE_SPACE) ||
-            (disk_usage("../cache") > MAX_CACHE_USAGE)
-        ) {
-            clean_cache($max_age, "../cache");
-            $max_age/=2;
-        }
-    }
+    if ((rand() % CACHE_SIZE_CHECK_FREQ)) return;
+    if (disk_usage("../cache") < MAX_CACHE_USAGE) return;
+    $x = max(TEAM_PAGE_TTL, USER_PAGE_TTL, USER_HOST_TTL,
+        USER_PROFILE_TTL, TOP_PAGES_TTL, INDEX_PAGE_TTL
+    );
+    clean_cache($x, "../cache");
 }
 
 function cache_need_to_regenerate($path, $max_age){
@@ -176,6 +173,7 @@ function start_cache($max_age, $params=""){
 
     if ($max_age) {
         $path = get_path($params);
+        $cache = null;
         if (defined('MEMCACHE_SERVERS')) {
             $cache = BoincMemcache::get()->get($path);
             if ($cache) {
@@ -213,7 +211,7 @@ function start_cache($max_age, $params=""){
             Header("Last-Modified: " . gmdate("D, d M Y H:i:s",$lastmodified) . " GMT");
             Header("Expires: " . gmdate("D, d M Y H:i:s",$lastmodified+$max_age) . " GMT");
             Header("Cache-Control: public, max-age=" . $max_age );
-            if ($cache->content) {
+            if ($cache && $cache->content) {
                 echo $cache->content;
                 exit;
             }
@@ -258,17 +256,21 @@ function end_cache($max_age,$params=""){
 function set_cached_data($max_age, $data, $params=""){
     // for the benefit of hackers
     if (strstr($params, "..")) {
-        return;
+        return "bad params";
     }
     $path = get_path($params);
     if (defined('MEMCACHE_SERVERS')) {
         $cache = array('content' => $data, 'timestamp' => time());
         BoincMemcache::get()->set($path, $cache, $max_age);
     } else {
-        $fhandle = fopen($path, "w");
+        $fhandle = @fopen($path, "w");
+        if (!$fhandle) {
+            return "can't open $path";
+        }
         fwrite($fhandle, $data);
         fclose($fhandle);
     }
+    return "";
 }
 
 function clear_cache_entry($phpfile, $params) {
diff --git a/html/inc/db.inc b/html/inc/db.inc
index f7a82fb..25eb47a 100644
--- a/html/inc/db.inc
+++ b/html/inc/db.inc
@@ -16,8 +16,7 @@
 // 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/util.inc');
-require_once('../inc/boinc_db.inc');
+require_once("../inc/util_basic.inc");
 
 // database-related functions.
 // Presentation code (HTML) shouldn't be here
@@ -25,6 +24,138 @@ require_once('../inc/boinc_db.inc');
 // DEPRECATED; use boinc_db.inc instead.
 // TODO: replace calls to these functions
 
+// use mysqli if available,
+// but let projects not use it if they want
+// (put <no_mysqli/> in config.xml)
+//
+if (parse_bool(get_config(), "no_mysqli")) {
+    define("MYSQLI", false);
+} else {
+    if (class_exists("mysqli")) {
+        define("MYSQLI", true);
+        $mysqli = null;
+    } else {
+        define("MYSQLI", false);
+    }
+}
+
+if (MYSQLI) {
+    function _mysql_connect($host, $user, $pass, $dbname) {
+        global $mysqli;
+        $x = explode(":", $host);
+        if (sizeof($x)>1) {
+            $host = $x[0];
+            $port = $x[1];
+        } else {
+            $port = null;
+        }
+        $mysqli = new mysqli($host, $user, $pass, $dbname, $port);
+        return $mysqli;
+    }
+    function _mysql_query($q) {
+        global $mysqli;
+        return mysqli_query($mysqli, $q);
+    }
+    function _mysql_num_rows($r) {
+        return mysqli_num_rows($r);
+    }
+    function _mysql_num_fields($r) {
+        global $mysqli;
+        return mysqli_field_count($mysqli);
+    }
+    function _mysql_fetch_object($r) {
+        return mysqli_fetch_object($r);
+    }
+    function _mysql_fetch_row($r) {
+        return mysqli_fetch_row($r);
+    }
+    function _mysql_fetch_assoc($r) {
+        return mysqli_fetch_assoc($r);
+    }
+    function _mysql_free_result($r) {
+        return mysqli_free_result($r);
+    }
+    function _mysql_insert_id() {
+        global $mysqli;
+        return mysqli_insert_id($mysqli);
+    }
+    function _mysql_affected_rows() {
+        global $mysqli;
+        return mysqli_affected_rows($mysqli);
+    }
+    function _mysql_field_attrs($r, $i) {
+        $x = mysqli_fetch_field_direct($r, $i);
+        switch ($x->type) {
+            case 1: $x->type = 'tinyint'; break;
+            case 2: $x->type = 'smallint'; break;
+            case 3: $x->type = 'int'; break;
+            case 5: $x->type = 'double'; break;
+            case 7: $x->type = 'timestamp'; break;
+            case 252: $x->type = 'blob'; break;
+            case 253: $x->type = 'varchar'; break;
+            case 254: $x->type = 'char'; break;
+        }
+        return $x;
+    }
+    function _mysql_escape_string($x) {
+        global $mysqli;
+        return mysqli_escape_string($mysqli, $x);
+    }
+    function _mysql_error() {
+        global $mysqli;
+        return mysqli_error($mysqli);
+    }
+} else {
+    function _mysql_connect($host, $user, $pass, $db_name) {
+        $link = mysql_pconnect($host, $user, $pass);
+        if (!$link) return null;
+        if (!mysql_select_db($db_name, $link)) {
+            return null;
+        }
+        return $link;
+    }
+    function _mysql_query($q) {
+        return mysql_query($q);
+    }
+    function _mysql_num_rows($r) {
+        return mysql_num_rows($r);
+    }
+    function _mysql_num_fields($r) {
+        return mysql_num_fields($r);
+    }
+    function _mysql_fetch_object($r) {
+        return mysql_fetch_object($r);
+    }
+    function _mysql_fetch_row($r) {
+        return mysql_fetch_row($r);
+    }
+    function _mysql_fetch_assoc($r) {
+        return mysql_fetch_assoc($r);
+    }
+    function _mysql_free_result($r) {
+        return mysql_free_result($r);
+    }
+    function _mysql_insert_id() {
+        return mysql_insert_id();
+    }
+    function _mysql_affected_rows() {
+        return mysql_affected_rows();
+    }
+    function _mysql_field_attrs($r, $i) {
+        $x = new StdClass;
+        $x->name = mysql_field_name($r, $i);
+        $x->type = mysql_field_type($r, $i);
+        $x->length = mysql_field_len($r, $i);
+        return $x;
+    }
+    function _mysql_escape_string($x) {
+        return mysql_escape_string($x);
+    }
+    function _mysql_error() {
+        return mysql_error();
+    }
+}
+
 function db_init_aux($try_replica=false) {
     $config = get_config();
     $user = parse_config($config, "<db_user>");
@@ -49,6 +180,11 @@ function db_init_aux($try_replica=false) {
     if ($host == null) {
         $host = "localhost";
     }
+    if (1) {
+        if (!_mysql_connect($host, $user, $pass, $db_name)) {
+            return 1;
+        }
+    } else {
     $link = mysql_pconnect($host, $user, $pass);
     if (!$link) {
         return 1;
@@ -57,49 +193,11 @@ function db_init_aux($try_replica=false) {
         echo "selecting $db_name\n";
         return 2;
     }
+    }
 
     return 0;
 }
 
-function lookup_team($id) {
-    return BoincTeam::lookup_id($id);
-}
-
-function lookup_team_founder($id) {
-    return BoincTeam::lookup("userid=$id");
-}
-
-function lookup_team_name($name) {
-    $name = BoincDb::escape_string($name);
-    return BoincTeam::lookup("name='$name'");
-}
-
-function lookup_wu($id) {
-    return BoincWorkunit::lookup_id($id);
-}
-
-function lookup_result($id) {
-    return BoincResult::lookup_id($id);
-}
-
-function lookup_app($id) {
-    return BoincApp::lookup_id($id);
-}
-
-// DEPRECATED: use BoincDb::escape_string where possible
-// 
-// apply this to any user-supplied strings used in queries
-// 
-function boinc_real_escape_string($x) {
-    if (version_compare(phpversion(),"4.3.0")>=0) {
-        return BoincDb::escape_string($x);
-    } else {
-        $x = str_replace("'", "\'", $x);
-        $x = str_replace("\"", "\\\"", $x);
-        return $x;
-    }
-}
-
 // escape a string for MySQL "like"
 //
 function escape_pattern($str) {
diff --git a/html/inc/db_conn.inc b/html/inc/db_conn.inc
index 7f32489..671cc8a 100644
--- a/html/inc/db_conn.inc
+++ b/html/inc/db_conn.inc
@@ -16,30 +16,32 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
-// Should not be enabled for public code
-//ini_set('display_errors', 'stdout');
-//error_reporting(E_ALL);
+require_once("../inc/db.inc");
 
-/// represents a connection to a database.
+// represents a connection to a database.
 // Intended to be subclassed (e.g., BoincDb, BossaDb)
-
-if (class_exists("mysqli")) {
-    define("MYSQLI", true);
-} else {
-    define("MYSQLI", false);
-}
-
+//
 class DbConn {
     var $db_conn;
     var $db_name;
 
     function init_conn($user, $passwd, $host, $name) {
         if (MYSQLI) {
-            if (version_compare(PHP_VERSION, '5.3.0') < 0) {
-                $this->db_conn = new mysqli($host, $user, $passwd);
+            $x = explode(":", $host);
+            if (sizeof($x)>1) {
+                $host = $x[0];
+                $port = $x[1];
+            } else {
+                $port = null;
+            }
+            //if (version_compare(PHP_VERSION, '5.3.0') < 0) {
+            if (1) {        // don't use persistent connections for now
+                $this->db_conn = new mysqli($host, $user, $passwd, $name, $port);
             } else {
-                $this->db_conn = new mysqli("p:".$host, $user, $passwd);
+                $this->db_conn = new mysqli("p:".$host, $user, $passwd, $name, $port);
             }
+            global $mysqli;
+            $mysqli = $this->db_conn;
         } else {
             $this->db_conn = mysql_pconnect($host, $user, $passwd);
         }
@@ -105,6 +107,7 @@ class DbConn {
     }
 
     function lookup_id($id, $table, $classname) {
+        $id = (int)$id;
         return $this->lookup($table, $classname, "id=$id");
     }
 
@@ -172,6 +175,7 @@ class DbConn {
     }
     function get_int($query, $field) {
         $result = $this->do_query($query);
+        if (!$result) error_page("database error on query $query");
         if (MYSQLI) {
             $x = $result->fetch_object("StdClass");
             $result->free();
@@ -184,6 +188,7 @@ class DbConn {
     }
     function get_double($query, $field) {
         $result = $this->do_query($query);
+        if (!$result) error_page("database error on query $query");
         if (MYSQLI) {
             $x = $result->fetch_object("StdClass");
             $result->free();
@@ -233,6 +238,7 @@ class DbConn {
     }
     function table_exists($table_name) {
         $result = $this->do_query("show tables from DBNAME like '$table_name'");
+        if (!$result) error_page("database error on query $query");
         if (MYSQLI) {
             $t = $result->fetch_array();
             $result->free();
diff --git a/html/inc/db_ops.inc b/html/inc/db_ops.inc
index ae52f71..dc478a5 100644
--- a/html/inc/db_ops.inc
+++ b/html/inc/db_ops.inc
@@ -22,6 +22,7 @@ error_reporting(E_ALL);
 ini_set('display_errors', true);
 ini_set('display_startup_errors', true);
 
+require_once("../inc/util_basic.inc");
 require_once("../inc/result.inc");
 
 class BoincAssignment {
@@ -64,8 +65,8 @@ function mysqltime_str($x) {
 // Function prints a description of $table 
 //
 function print_describe_table_onecol($table, $which, $columns) {
-    $result=mysql_query("SELECT * from $table LIMIT 1");
-    $fields=mysql_num_fields($result);
+    $result = _mysql_query("SELECT * from $table LIMIT 1");
+    $fields = _mysql_num_fields($result);
 
     $avgnum=(int)($fields/$columns);
     if ($avgnum*$columns<$fields) {
@@ -91,9 +92,10 @@ function print_describe_table_onecol($table, $which, $columns) {
     echo "<tr><th align=\"left\">NAME</th><th align=\"left\">Type</th><th align=\"left\">Bytes</th>\n";
     for ($count=$bot; $count<$top; $count++) {
         if ($count<$fields) {
-            $name= mysql_field_name($result, $count);
-            $type= mysql_field_type($result, $count);
-            $length=mysql_field_len($result, $count);
+            $x = _mysql_field_attrs($result, $count);
+            $name = $x->name;
+            $type = $x->type;
+            $length = $x->length;
         } else {
             $name="<br/> ";
             $type="<br/>";
@@ -280,10 +282,10 @@ class SqlQueryString {
     function count() {
         $count_query = "select count(*) as cnt from $this->table $this->query";
 
-        $result = mysql_query($count_query);
+        $result = _mysql_query($count_query);
         if (!$result) return 0;
-        $res = mysql_fetch_object($result);
-        mysql_free_result($result);
+        $res = _mysql_fetch_object($result);
+        _mysql_free_result($result);
         return $res->cnt;
     }
 
@@ -443,29 +445,39 @@ SELECT COUNT(id) AS nTotal,
        SUM(case when server_state = '5' and outcome = '3' and client_state = '4' then 1 else 0 end) AS clientstate_uploading,
        SUM(case when server_state = '5' and outcome = '3' and client_state = '5' then 1 else 0 end) AS clientstate_uploaded,
        SUM(case when server_state = '5' and outcome = '3' and client_state = '6' then 1 else 0 end) AS clientstate_aborted
-FROM result WHERE 
+FROM result WHERE true
     ";
 
     if ($query_appid) {
-        $main_query .= "appid=$query_appid and ";
+        $main_query .= " and appid=$query_appid";
     }
     if ($query_wuid) {
-        $main_query .= "workunitid=$query_wuid and ";
+        $main_query .= " and workunitid=$query_wuid";
     }
     if ($query_mod_time) {
-        $main_query .= "mod_time > DATE_SUB( NOW(), INTERVAL $query_mod_time SECOND )+0 and ";
+        $start = time() - $query_mod_time;
+
+        // If file deletion is delayed by X,
+        // subtract X from mod time of  file-deleted results.
+        // Otherwise we'll show lots of irrelevant results
+        //
+        $delay = parse_config(get_config(), "<delete_delay_hours>");
+        if ($delay) {
+            $start2 = $start - $delay*3600;;
+            $main_query .= " and ((file_delete_state>1 and mod_time>FROM_UNIXTIME($start2)) or (mod_time>FROM_UNIXTIME($start)))";
+        } else {
+            $main_query .= " and mod_time > FROM_UNIXTIME($start)";
+        }
     }
 
-    $main_query .= "1=1";
-
     $urlquery = $q->urlquery;
-    $result = mysql_query($main_query);
+    $result = _mysql_query($main_query);
 
     // echo "Main query was $main_query<br/>";
 
     if ($result) {
 
-        $res = mysql_fetch_object($result);
+        $res = _mysql_fetch_object($result);
         $ntotal          = $res->nTotal;
 
         $server_state[1] = $res->serverstate_inactive;
@@ -503,7 +515,7 @@ FROM result WHERE
         $file_delete[3]  = $res->filedeletestate_error;
 
         $nfile_deleted   = $res->filedeletestate_ready + $res->filedeletestate_done + $res->filedeletestate_error;
-        mysql_free_result($result);
+        _mysql_free_result($result);
     }
 
 
@@ -950,15 +962,15 @@ function host_user_link($hostid) {
     if (!$hostid) return '---';
 
     $h = "<a href=\"db_action.php?table=host&id=$hostid\">$hostid</a>";
-    $result = mysql_query("select userid from host where id='$hostid' limit 1");
+    $result = _mysql_query("select userid from host where id='$hostid' limit 1");
     if (!$result) return $h;
-    $host = mysql_fetch_object($result);
-    mysql_free_result($result);
+    $host = _mysql_fetch_object($result);
+    _mysql_free_result($result);
     if (!$host->userid) return $h;
-    $result = mysql_query("select id, name from user where id='$host->userid' limit 1");
+    $result = _mysql_query("select id, name from user where id='$host->userid' limit 1");
     if (!$result) return $h;
-    $user = mysql_fetch_object($result);
-    mysql_free_result($result);
+    $user = _mysql_fetch_object($result);
+    _mysql_free_result($result);
     return "$h<br><small>(<a href=\"db_action.php?table=user&id=$user->id\">$user->name</a>)</small>";
 }
 
@@ -1138,31 +1150,31 @@ function show_user($user) {
 function show_user_summary($maxuser) {
     $top_country = array();
     $top_language = array();
-    $stats_res = mysql_query("select max(id) as maxuser,
+    $stats_res = _mysql_query("select max(id) as maxuser,
         SUM(case when has_profile = '1' then 1 else 0 end) as profuser,
         SUM(case when teamid != '0' then 1 else 0 end) as teamuser
         from user"
     );
-    $stats = mysql_fetch_assoc($stats_res);
+    $stats = _mysql_fetch_assoc($stats_res);
     if ($maxuser > $stats['maxuser']) {
         $maxuser = $stats['maxuser'];
     }
-    $user_res = mysql_query("select * from user order by posts desc limit ".$maxuser);
-    $profile_res = mysql_query("select * from profile order by posts desc limit ".$maxuser);
+    $user_res = _mysql_query("select * from user order by posts desc limit ".$maxuser);
+    $profile_res = _mysql_query("select * from profile order by posts desc limit ".$maxuser);
     for ($i=1;$i<=$maxuser;$i++) {
-        $user = mysql_fetch_object($user_res);
+        $user = _mysql_fetch_object($user_res);
         $top10poster[$i] = $user;
         $top_country[$user->country] += 1;
     }
     for ($i=1;$i<=$maxuser;$i++) {
-        $profile = mysql_fetch_object($profile_res);    
+        $profile = _mysql_fetch_object($profile_res);    
         if ($profile->language != '') {
             $top_language[$profile->language] += 1;
         }
     }
-    mysql_free_result($user_res);
-    mysql_free_result($profile_res);
-    mysql_free_result($stats_res);
+    _mysql_free_result($user_res);
+    _mysql_free_result($profile_res);
+    _mysql_free_result($stats_res);
     echo "<table>
           <tr valign=\"top\">
             <td><h2>General</h2></td>
@@ -1231,40 +1243,40 @@ function show_team($team) {
 }
 
 function team_name_by_id($teamid) {
-    $result = mysql_query("select * from team where id = $teamid");
-    $team = mysql_fetch_object($result);
+    $result = _mysql_query("select * from team where id = $teamid");
+    $team = _mysql_fetch_object($result);
     return $team->name;
 }
 
 function user_name_by_id($user_id) {
-    $result = mysql_query("select * from user where id = $user_id");
-    $user = mysql_fetch_object($result);
+    $result = _mysql_query("select * from user where id = $user_id");
+    $user = _mysql_fetch_object($result);
     if (!$user) return "No user";
     return $user->name;
 }
 
 function app_name_by_id($appid) {
-    $result = mysql_query("select * from app where id = $appid");
-    $app = mysql_fetch_object($result);
+    $result = _mysql_query("select * from app where id = $appid");
+    $app = _mysql_fetch_object($result);
     return $app->name;
 }
 
 function wu_name_by_id($workunitid) {
-    $result = mysql_query("select * from workunit where id = $workunitid");
-    $wu = mysql_fetch_object($result);
+    $result = _mysql_query("select * from workunit where id = $workunitid");
+    $wu = _mysql_fetch_object($result);
     if (!$wu) return "Missing workunit";
     return $wu->name;
 }
 
 function platform_name_by_id($platformid) {
-    $result = mysql_query("select * from platform where id = $platformid");
-    $plat = mysql_fetch_object($result);
+    $result = _mysql_query("select * from platform where id = $platformid");
+    $plat = _mysql_fetch_object($result);
     return $plat->name;
 }
 
 function host_name_by_id($hostid) {
-    $result = mysql_query("select * from host where id = $hostid");
-    $host = mysql_fetch_object($result);
+    $result = _mysql_query("select * from host where id = $hostid");
+    $host = _mysql_fetch_object($result);
     if (!$host) return "No host";
     if (!strlen($host->domain_name) && !strlen($host->last_ip_addr)) {
         return "(blank)";
diff --git a/html/inc/email.inc b/html/inc/email.inc
index becc511..65a22c0 100644
--- a/html/inc/email.inc
+++ b/html/inc/email.inc
@@ -22,9 +22,6 @@
 require_once("../inc/util.inc");
 require_once("../project/project.inc");
 
-$config = get_config();
-$master_url = parse_config($config, "<master_url>");
-
 // send an email, using PHPMailer or not.
 //
 function send_email($user, $subject, $body, $body_html=null) {
@@ -67,7 +64,6 @@ function send_email($user, $subject, $body, $body_html=null) {
 // 3) the user requested account key for existing account
 //
 function send_auth_email($user) {
-    global $master_url;
     $body = "";
 
     $now = time();
@@ -77,14 +73,14 @@ function send_auth_email($user) {
     $body = "This email was sent in response to a request on the ".PROJECT." web site.
 
 To log in to your ".PROJECT." account, visit:
-".$master_url."login_action.php?id=$user->id&t=$now&h=$x
+".URL_BASE."login_action.php?id=$user->id&t=$now&h=$x
 (This link is valid for 1 day).
 After logging in, you can change your account's password or email address.
 ";
 
 $body .= "
 For further information and assistance with ".PROJECT.", visit
-$master_url
+".URL_BASE."
 ";
 
     return send_email($user, $subject, $body);
@@ -96,6 +92,13 @@ $master_url
 // and C doesn't contain @ and is at least 2 chars
 //
 function is_valid_email_addr($addr) {
+    if (defined("USE_STOPFORUMSPAM") && USE_STOPFORUMSPAM) {
+        $ip_addr = $_SERVER['REMOTE_ADDR'];
+        $x = @file_get_contents("http://www.stopforumspam.com/api?ip=".$ip_addr."&email=".$addr);
+        if (substr_count($x, '<appears>yes</appears>')) {
+            return false;
+        }
+    }
     $pattern = '/^([^@]+)@([^@\.]+)\.([^@]{2,})$/';
     $match = preg_match($pattern, $addr);
     return (bool) $match;
diff --git a/html/inc/forum.inc b/html/inc/forum.inc
index ddb3e22..ba49c0b 100644
--- a/html/inc/forum.inc
+++ b/html/inc/forum.inc
@@ -19,6 +19,7 @@
 require_once("../inc/forum_db.inc");
 require_once("../inc/pm.inc");
 require_once("../inc/team.inc");
+require_once("../inc/user.inc");
 require_once("../inc/news.inc");
 require_once("../inc/text_transform.inc");
 
@@ -122,8 +123,8 @@ function show_forum_header($user) {
         <input type=\"hidden\" name=\"search_forum\" value=\"-1\">
         <input type=\"hidden\" name=\"search_sort\" value=\"5\">
         <input type=\"text\" name=\"search_keywords\">
-        <input class=\"btn\" title=\"".tra("Search for words in forum messages")."\" type=\"submit\" value=\"".tra("Search forums")."\"><br>
-        <span class=\"smalltext\"><a href=\"forum_search.php\">".tra("Advanced search")."</a></span>
+        <input class=\"btn btn-default\" title=\"".tra("Search for words in forum messages")."\" type=\"submit\" value=\"".tra("Search forums")."\"><br>
+        <small><a href=\"forum_search.php\">".tra("Advanced search")."</a></small>
         </td>
     ";
 
@@ -538,7 +539,6 @@ function show_post(
         }
     }
 
-
     // Print the special user lines, if any
     //
     global $special_user_bitfield;
@@ -566,7 +566,7 @@ function show_post(
         <div class=\"authorcol\">
     ";
 
-    echo user_links($user);
+    echo user_links($user, 0);
     echo "<br>";
     if ($user->create_time > time()-ST_NEW_TIME) $fstatus.=ST_NEW."<br>";
     if ($fstatus) echo "<font size=\"-2\">$fstatus</font>";
@@ -608,9 +608,10 @@ function show_post(
         if (defined("COUNTRY_FLAGS")) {
             if (array_key_exists($user->country, $country_to_iso3166_2)) {
                 $code = $country_to_iso3166_2[$user->country];
-                echo "<img class=flag alt=\"$user->country\" title=\"$user->country\" src=flags/$code.png><br>\n";
+                echo "<img class=flag alt=\"$user->country\" title=\"$user->country\" src=flags/$code.png>\n";
             }
         }
+        echo badges_string(true, $user, BADGE_HEIGHT_SMALL);
     }
     echo "</span></div></td>";
 
@@ -776,15 +777,26 @@ function post_rules() {
     ";
 }
 
-function post_warning() {
-    return "<br><br>
+function post_warning($forum=null) {
+    $x = "<br><br>
         <table><tr><td align=left>
+    ";
+
+    // let projects add extra instructions in specific forums,
+    // e.g. Questions and Problems
+    //
+    if (function_exists('project_forum_post_info')) {
+        $x .= project_forum_post_info($forum);
+    }
+
+    $x .= "
         <font size=-2>
         ".tra("Rules:").post_rules()."
         <a href=moderation.php>".tra("More info")."</a>
         </font>
         </td></tr></table>
     ";
+    return $x;
 }
 
 function notify_subscriber($thread, $user) {
@@ -797,6 +809,19 @@ function notify_subscriber($thread, $user) {
     BoincNotify::replace("userid=$user->id, create_time=$now, type=$type, opaque=$thread->id");
 }
 
+// notify subscribed users, except for the given user
+//
+function notify_subscribers($thread, $user) {
+    $subs = BoincSubscription::enum("threadid=$thread->id");
+    foreach ($subs as $sub) {
+        if ($user && ($user->id == $sub->userid)) continue;
+        $user2 = BoincUser::lookup_id($sub->userid);
+        if ($user2) {
+            notify_subscriber($thread, $user2);
+        }
+    }
+}
+
 // Various functions for adding/hiding/unhiding stuff.
 // These take care of counts and timestamps.
 // Don't do these things directly - use these functions
@@ -809,16 +834,8 @@ function create_post($content, $parent_id, $user, $forum, $thread, $signature) {
     $id = BoincPost::insert("(thread, user, timestamp, content, parent_post, signature) values ($thread->id, $user->id, $now, '$content', $parent_id, $sig)");
     if (!$id) return null;
 
-    // notify subscribed users
-    //
-    $subs = BoincSubscription::enum("threadid=$thread->id");
-    foreach ($subs as $sub) {
-        if ($user->id == $sub->userid) continue;
-        $user2 = BoincUser::lookup_id($sub->userid);
-        if ($user2) {
-            notify_subscriber($thread, $user2);
-        }
-    }
+    notify_subscribers($thread, $user);
+
     $user->prefs->update("posts=posts+1");
     $thread->update("replies=replies+1, timestamp=$now");
     $forum->update("posts=posts+1, timestamp=$now");
@@ -926,9 +943,11 @@ function forum_delete_user($user) {
     }
     $p = BoincForumPrefs::lookup_userid($user->id);
     if ($p) $p->delete();
+    BoincForumLogging::delete_aux("userid=$user->id");
 }
 
 function move_post($post, $old_thread, $old_forum, $new_thread, $new_forum) {
+    global $g_logged_in_user;
     $post->update("thread=$new_thread->id");
     $old_thread->update("replies=replies-1");
     $new_thread->update("replies=replies+1");
@@ -938,6 +957,7 @@ function move_post($post, $old_thread, $old_forum, $new_thread, $new_forum) {
     update_thread_timestamp($new_thread);
     update_forum_timestamp($old_forum);
     update_forum_timestamp($new_forum);
+    notify_subscribers($new_thread, $g_logged_in_user);
     return true;
 }
 
@@ -983,6 +1003,7 @@ function get_forum_threads(
     //}
         
     $sql = 'forum = ' . $forumID ;
+    $stickysql = "";
     if ($sticky){
         $stickysql = "sticky DESC, ";
     }
diff --git a/html/inc/forum_banishment_vote.inc b/html/inc/forum_banishment_vote.inc
index 6c4be66..883bd9b 100644
--- a/html/inc/forum_banishment_vote.inc
+++ b/html/inc/forum_banishment_vote.inc
@@ -27,8 +27,8 @@ db_init();
 
 function current_tally($voteid) {
     $query="select sum(yes) as ayes,count(id)-sum(yes) as nays from banishment_votes where voteid=".$voteid;
-    $result = mysql_query($query);
-    $foobar = mysql_fetch_object($result);
+    $result = _mysql_query($query);
+    $foobar = _mysql_fetch_object($result);
     echo "<b>Current Tally</b>    Ayes: ".$foobar->ayes." Nays: ".$foobar->nays."<p>";
     return true;
 }
@@ -37,13 +37,13 @@ function vote_is_in_progress($userid) {
     // check whether a vote is already ongoing
     $now=time();
     $query="select count(id) as count from banishment_vote where userid=".$userid." and end_time>".$now;
-    $result = mysql_query($query);
+    $result = _mysql_query($query);
     if (!$result) {
         echo "Database error attempting to read banishment_vote table 1.<p>";
         echo "query: $query";
         return -1;
     }
-    $foobar = mysql_fetch_object($result);
+    $foobar = _mysql_fetch_object($result);
     if (!$foobar) {
         echo "Database error attempting to read banishment_vote table 2.<p>";
         return -1;
@@ -61,22 +61,22 @@ function start_vote($config,$logged_in_user,$user,$category,$reason) {
         return 0;
     }
     $query="insert into banishment_vote (userid,modid,start_time,end_time) values (".$user->id.",".$logged_in_user->id.",".$now.",".$fin.")";
-    $result = mysql_query($query);
+    $result = _mysql_query($query);
     if (!$result) {
         echo "Database error attempting to insert to banishment_vote table.<p>";
         return 0;
     }
 
-    $voteid=mysql_insert_id();
+    $voteid=_mysql_insert_id();
     $query="insert into banishment_votes (voteid,modid,time,yes) values (". $voteid .",". $logged_in_user->id .",". $now .",1)";
-    $result = mysql_query($query);
+    $result = _mysql_query($query);
     if (!$result) {
         echo "Database error attempting to insert to banishment_votes table.<p>";
         return 0;
     }
 
     $query="update forum_preferences set banished_until=".$fin." where userid=".$user->id;
-    $result = mysql_query($query);
+    $result = _mysql_query($query);
 
     echo "Banishment vote started.<p><p>";
     current_tally($voteid);
@@ -92,8 +92,8 @@ function vote_yes($config,$logged_in_user,$user) {
     }
     // Find the voteid
     $query="select id as voteid from banishment_vote where userid=".$user->id." and end_time>".$now;
-    $result = mysql_query($query);
-    $foobar = mysql_fetch_object($result);
+    $result = _mysql_query($query);
+    $foobar = _mysql_fetch_object($result);
     if (!$foobar) {
         echo "Database error attempting to read banishment_vote table.<p>";
         return 0;
@@ -101,8 +101,8 @@ function vote_yes($config,$logged_in_user,$user) {
     $voteid=$foobar->voteid;
     // Check whether mod has voted already.
     $query="select count(id) as count from banishment_votes where voteid=".$voteid." and modid=".$logged_in_user->id;
-    $result = mysql_query($query);
-    $foobar = mysql_fetch_object($result);
+    $result = _mysql_query($query);
+    $foobar = _mysql_fetch_object($result);
     if (!$foobar) {
         echo "Database error attempting to read banishment_vote table.<p>";
         return 0;
@@ -114,7 +114,7 @@ function vote_yes($config,$logged_in_user,$user) {
     }
     // insert the vote
     $query="insert into banishment_votes (voteid,modid,time,yes) values (" . $voteid .",". $logged_in_user->id .",". $now .",1)";
-    $result = mysql_query($query);
+    $result = _mysql_query($query);
     if (!$result) {
         echo "Database error attempting to insert to banishment_votes table.<p>";
         return 0;
@@ -133,8 +133,8 @@ function vote_no($config,$logged_in_user,$user) {
     }
     // Find the voteid
     $query="select id as voteid from banishment_vote where userid=".$user->id." and end_time>".$now;
-    $result = mysql_query($query);
-    $foobar = mysql_fetch_object($result);
+    $result = _mysql_query($query);
+    $foobar = _mysql_fetch_object($result);
     if (!$foobar) {
         echo "Database error attempting to read banishment_vote table.<p>";
         return 0;
@@ -142,8 +142,8 @@ function vote_no($config,$logged_in_user,$user) {
     $voteid=$foobar->voteid;
     // Check whether mod has voted already.
     $query="select count(id) as count from banishment_votes where voteid=".$voteid ." and modid=".$logged_in_user->id;
-    $result = mysql_query($query);
-    $foobar = mysql_fetch_object($result);
+    $result = _mysql_query($query);
+    $foobar = _mysql_fetch_object($result);
     if (!$foobar) {
         echo "Database error attempting to read banishment_vote table.<p>";
         return 0;
@@ -155,7 +155,7 @@ function vote_no($config,$logged_in_user,$user) {
     }
     // insert the vote
     $query="insert into banishment_votes (voteid,modid,time,yes) values (" . $voteid .",". $logged_in_user->id .",". $now .",0)";
-    $result = mysql_query($query);
+    $result = _mysql_query($query);
     if (!$result) {
         echo "Database error attempting to insert to banishment_votes table.<p>";
         return 0;
diff --git a/html/inc/forum_db.inc b/html/inc/forum_db.inc
index 9bfe99b..98bebb3 100644
--- a/html/inc/forum_db.inc
+++ b/html/inc/forum_db.inc
@@ -270,6 +270,10 @@ class BoincFriend {
         $db = BoincDb::get();
         return $db->enum('friend', 'BoincFriend', $clause);
     }
+    static function delete_aux($clause) {
+        $db = BoincDb::get();
+        return $db->delete_aux('friend', $clause);
+    }
     static function delete($id1, $id2) {
         $db = BoincDb::get();
         $db->delete_aux('friend', "user_src=$id1 and user_dest=$id2");
diff --git a/html/inc/forum_email.inc b/html/inc/forum_email.inc
index 5a6f7a5..f36288c 100644
--- a/html/inc/forum_email.inc
+++ b/html/inc/forum_email.inc
@@ -20,8 +20,6 @@ require_once("../inc/util.inc");
 require_once("../inc/email.inc");
 require_once("../project/project.inc");
 
-define('MASTER_URL', $master_url);
-
 // send an email to admins:
 // - project forums: everyone in POST_REPORT_EMAILS
 // - team message board: team founder and admins
@@ -62,6 +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;
     $moderator=get_logged_in_user();
     $body = "";
     $user = BoincUser::lookup_id($post->user);
@@ -76,7 +75,7 @@ $explanation
 The content of your post:
 $post->content
 
-For assistance with ".PROJECT." go to ".MASTER_URL;
+For assistance with ".PROJECT." go to ".$master_url;
 
     $success = send_email($user, $subject, $body);
     pm_send($user, $user, $subject, $body, false);
@@ -99,6 +98,7 @@ $body
 function send_thread_moderation_email(
     $forum, $thread, $message, $action_name, $explanation
 ) {
+    global $master_url;
     $moderator = get_logged_in_user();
     $user = BoincUser::lookup_id($thread->owner);
     $body = "";
@@ -109,7 +109,7 @@ function send_thread_moderation_email(
 has been $action_name by moderator $moderator->name (ID $moderator->id).
 $explanation
 
-For assistance with ".PROJECT." go to ".MASTER_URL;
+For assistance with ".PROJECT." go to ".$master_url;
 
     $subject = "THREAD $action REPORT: $thread->title";
     $success = mail_report_list($forum, $subject, $body);
@@ -139,6 +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;
     $body = "";
     $owner = BoincUser::lookup_id($post->user);
 
@@ -157,7 +158,7 @@ $message
 Contents of the post:
 $post->content
 
-For assistance with ".PROJECT." go to ".MASTER_URL;
+For assistance with ".PROJECT." go to ".$master_url;
 
     $success = mail_report_list($forum, $subject, $body, true);
 
@@ -193,9 +194,10 @@ 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;
     $now=time();
     $subject = PROJECT." banishment vote underway";
-    $vote_url=parse_config(get_config(), "<master_url>")."forum_banishment_vote.php";
+    $vote_url = $master_url."forum_banishment_vote.php";
     $body = "
 A vote has been started to banish you
 from the ".PROJECT." message boards until ".date('M j,
diff --git a/html/inc/forum_rss.inc b/html/inc/forum_rss.inc
index b769645..a3f1144 100644
--- a/html/inc/forum_rss.inc
+++ b/html/inc/forum_rss.inc
@@ -16,11 +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/>.
 
-require_once("../inc/forum_db.inc");
+require_once("../inc/forum.inc");
 require_once("../inc/boinc_db.inc");
-require_once("../inc/util.inc");
 require_once("../inc/text_transform.inc");
-require_once("../project/project.inc");
 
 // return true if the given HTML may contain images or video
 //
diff --git a/html/inc/friend.inc b/html/inc/friend.inc
index 2d9afdd..b0a83e8 100644
--- a/html/inc/friend.inc
+++ b/html/inc/friend.inc
@@ -20,13 +20,13 @@
 //
 function friend_notify_req_email_line($notify) {
     $src_user = BoincUser::lookup_id($notify->opaque);
-    if (!$src_user) return "";
+    if (!$src_user) return null;
     return "$src_user->name has requested friendship with you. Please accept or decline.";
 }
 
 function friend_notify_accept_email_line($notify) {
     $src_user = BoincUser::lookup_id($notify->opaque);
-    if (!$src_user) return "";
+    if (!$src_user) return null;
     return "$src_user->name has confirmed you as a friend";
 }
 
@@ -35,6 +35,7 @@ function friend_notify_accept_email_line($notify) {
 //
 function friend_notify_req_web_line($notify) {
     $user = BoincUser::lookup_id($notify->opaque);
+    if (!$user) return null;
     return "
         <a href=friend.php?action=query&userid=$notify->opaque>Friendship request</a> from <a href=show_user.php?userid=$user->id>$user->name</a>
     ";
@@ -42,6 +43,7 @@ function friend_notify_req_web_line($notify) {
 
 function friend_notify_accept_web_line($notify) {
     $user = BoincUser::lookup_id($notify->opaque);
+    if (!$user) return null;
     return "
         <a href=friend.php?action=accepted&userid=$notify->opaque>Friendship confirmation</a> from $user->name
     ";
@@ -93,6 +95,10 @@ Do not reply to this message.
 
 function friend_req_rss($notify, &$title, &$msg, &$url) {
     $src_user = BoincUser::lookup_id($notify->opaque);
+    if (!$src_user) {
+        $msg = null;
+        return;
+    }
     $title = "Friend request";
     $msg = "$src_user->name has requested friendship with you. Please accept or decline.";
     $url = URL_BASE."friend.php?action=query&target_userid=$notify->userid&userid=$notify->opaque";
@@ -100,6 +106,10 @@ function friend_req_rss($notify, &$title, &$msg, &$url) {
 
 function friend_accept_rss($notify, &$title, &$msg, &$url) {
     $src_user = BoincUser::lookup_id($notify->opaque);
+    if (!$src_user) {
+        $msg = null;
+        return;
+    }
     $title = "Friendship confirmation";
     $msg = "$src_user->name has confirmed you as a friend";
     $url = URL_BASE."home.php";
diff --git a/html/inc/host.inc b/html/inc/host.inc
index 610973b..de1bb70 100644
--- a/html/inc/host.inc
+++ b/html/inc/host.inc
@@ -19,6 +19,7 @@
 require_once("../inc/credit.inc");
 require_once("../inc/stats_sites.inc");
 require_once("../inc/boinc_db.inc");
+require_once("../inc/user.inc");
 
 function link_to_results($host) {
     if (!$host) return tra("No host");
@@ -56,7 +57,7 @@ function location_form($host) {
         <option value=work $w>".tra("Work")."
         <option value=school $s>".tra("School")."
         </select>
-        <input type=submit value=".tra("Update").">
+        <input class=\"btn btn-primary\" type=submit value=".tra("Update").">
         </form>
     ";
     return $x;
@@ -101,7 +102,7 @@ function show_host($host, $user, $ipprivate) {
     } else {
         $owner = BoincUser::lookup_id($host->userid);
         if ($owner && $owner->show_hosts) {
-            row2(tra("Owner"), user_links($owner));
+            row2(tra("Owner"), user_links($owner, BADGE_HEIGHT_MEDIUM));
         } else {
             row2(tra("Owner"), tra("Anonymous"));
             $anonymous = true;
@@ -182,12 +183,12 @@ function show_host($host, $user, $ipprivate) {
     if ($user) {
         row2(tra("Number of times client has contacted server"), $host->rpc_seqno);
         row2(tra("Last time contacted server"), sched_log_link($host->rpc_time));
-        row2(tra("% of time BOINC is running"), number_format(100*$host->on_frac, 2)."%");
+        row2(tra("Fraction of time BOINC is running"), number_format(100*$host->on_frac, 2)."%");
         if ($host->connected_frac > 0) {
-            row2(tra("While BOINC running, % of time host has an Internet connection"), number_format(100*$host->connected_frac, 2)."%");
+            row2(tra("While BOINC is running, fraction of time computer has an Internet connection"), number_format(100*$host->connected_frac, 2)."%");
         }
-        row2(tra("While BOINC running, % of time work is allowed"), number_format(100*$host->active_frac, 2)."%");
-        row2(tra("While BOINC running, % of time GPU work is allowed"), number_format(100*$host->gpu_active_frac, 2)."%");
+        row2(tra("While BOINC is running, fraction of time computing is allowed"), number_format(100*$host->active_frac, 2)."%");
+        row2(tra("While is BOINC running, fraction of time GPU computing is allowed"), number_format(100*$host->gpu_active_frac, 2)."%");
         if ($host->cpu_efficiency) {
             row2(tra("Average CPU efficiency"), $host->cpu_efficiency);
         }
@@ -305,9 +306,14 @@ function gpu_desc($x) {
 function boinc_version($x) {
     $y = strstr($x, 'BOINC');
     if (!$y) return '';
-    $y = substr($y, 6);
     $z = explode("]", $y, 2);
-    return $z[0];
+    $a = explode('|', $z[0]);
+    $v = $a[1];
+    if (array_key_exists(2, $a)) {
+        $brand = $a[2];
+        $v .= " ($brand)";
+    }
+    return $v;
 }
 
 function cpu_desc($host) {
@@ -336,7 +342,7 @@ function show_host_row($host, $i, $private, $show_owner, $any_product_name) {
     ";
     if (!$anonymous) {
         echo "
-            <br><nobr><span class=note>".tra("Cross-project stats:")."</span></nobr><br>".cross_project_links($host);
+            <br><nobr><p class=\"text-muted\">".tra("Cross-project stats:")."</p></nobr><br>".cross_project_links($host);
     }
     echo "
         </td>
@@ -353,7 +359,7 @@ function show_host_row($host, $i, $private, $show_owner, $any_product_name) {
             if ($anonymous) {
                 echo "<td>".tra("Anonymous")."</td>\n";
             } else {
-                echo "<td>", user_links($user), "</td>\n";
+                echo "<td>", user_links($user, BADGE_HEIGHT_MEDIUM), "</td>\n";
             }
         }
     }
@@ -383,7 +389,7 @@ function show_host_row($host, $i, $private, $show_owner, $any_product_name) {
             <td>%s</td>
             <td>%s</td>
             <td>%s</td>
-            <td>%s<br><span class=note>%s</span></td>
+            <td>%s<br><p class=\"text-muted\">%s</p></td>
             <td>%s</td>
             ",
             format_credit($host->expavg_credit),
diff --git a/html/inc/htmLawed.php b/html/inc/htmLawed.php
new file mode 100644
index 0000000..e9fe818
--- /dev/null
+++ b/html/inc/htmLawed.php
@@ -0,0 +1,723 @@
+<?php 
+
+/* 
+htmLawed 1.1.18, 2 August 2014 
+Copyright Santosh Patnaik 
+Dual licensed with LGPL 3 and GPL 2+ 
+A PHP Labware internal utility; www.bioinformatics.org/phplabware/internal_utilities/htmLawed 
+
+See htmLawed_README.txt/htm 
+*/ 
+
+function htmLawed($t, $C=1, $S=array()){ 
+$C = is_array($C) ? $C : array(); 
+if(!empty($C['valid_xhtml'])){ 
+ $C['elements'] = empty($C['elements']) ? '*-center-dir-font-isindex-menu-s-strike-u' : $C['elements']; 
+ $C['make_tag_strict'] = isset($C['make_tag_strict']) ? $C['make_tag_strict'] : 2; 
+ $C['xml:lang'] = isset($C['xml:lang']) ? $C['xml:lang'] : 2; 
+} 
+// config eles 
+$e = array('a'=>1, 'abbr'=>1, 'acronym'=>1, 'address'=>1, 'applet'=>1, 'area'=>1, 'b'=>1, 'bdo'=>1, 'big'=>1, 'blockquote'=>1, 'br'=>1, 'button'=>1, 'caption'=>1, 'center'=>1, 'cite'=>1, 'code'=>1, 'col'=>1, 'colgroup'=>1, 'dd'=>1, 'del'=>1, 'dfn'=>1, 'dir'=>1, 'div'=>1, 'dl'=>1, 'dt'=>1, 'em'=>1, 'embed'=>1, 'fieldset'=>1, 'font'=>1, 'form'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'hr'=>1, 'i'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'ins'=>1, 'isindex'=>1, 'kbd'=>1, 'lab [...]
+if(!empty($C['safe'])){ 
+ unset($e['applet'], $e['embed'], $e['iframe'], $e['object'], $e['script']); 
+} 
+$x = !empty($C['elements']) ? str_replace(array("\n", "\r", "\t", ' '), '', $C['elements']) : '*'; 
+if($x == '-*'){$e = array();} 
+elseif(strpos($x, '*') === false){$e = array_flip(explode(',', $x));} 
+else{ 
+ if(isset($x[1])){ 
+  preg_match_all('`(?:^|-|\+)[^\-+]+?(?=-|\+|$)`', $x, $m, PREG_SET_ORDER); 
+  for($i=count($m); --$i>=0;){$m[$i] = $m[$i][0];} 
+  foreach($m as $v){ 
+   if($v[0] == '+'){$e[substr($v, 1)] = 1;} 
+   if($v[0] == '-' && isset($e[($v = substr($v, 1))]) && !in_array('+'. $v, $m)){unset($e[$v]);} 
+  } 
+ } 
+} 
+$C['elements'] =& $e; 
+// config attrs 
+$x = !empty($C['deny_attribute']) ? str_replace(array("\n", "\r", "\t", ' '), '', $C['deny_attribute']) : ''; 
+$x = array_flip((isset($x[0]) && $x[0] == '*') ? explode('-', $x) : explode(',', $x. (!empty($C['safe']) ? ',on*' : ''))); 
+if(isset($x['on*'])){ 
+ unset($x['on*']); 
+ $x += array('onblur'=>1, 'onchange'=>1, 'onclick'=>1, 'ondblclick'=>1, 'onfocus'=>1, 'onkeydown'=>1, 'onkeypress'=>1, 'onkeyup'=>1, 'onmousedown'=>1, 'onmousemove'=>1, 'onmouseout'=>1, 'onmouseover'=>1, 'onmouseup'=>1, 'onreset'=>1, 'onselect'=>1, 'onsubmit'=>1); 
+} 
+$C['deny_attribute'] = $x; 
+// config URL 
+$x = (isset($C['schemes'][2]) && strpos($C['schemes'], ':')) ? strtolower($C['schemes']) : 'href: aim, feed, file, ftp, gopher, http, https, irc, mailto, news, nntp, sftp, ssh, telnet; *:file, http, https'; 
+$C['schemes'] = array(); 
+foreach(explode(';', str_replace(array(' ', "\t", "\r", "\n"), '', $x)) as $v){ 
+ $x = $x2 = null; list($x, $x2) = explode(':', $v, 2); 
+ if($x2){$C['schemes'][$x] = array_flip(explode(',', $x2));} 
+} 
+if(!isset($C['schemes']['*'])){$C['schemes']['*'] = array('file'=>1, 'http'=>1, 'https'=>1,);} 
+if(!empty($C['safe']) && empty($C['schemes']['style'])){$C['schemes']['style'] = array('!'=>1);} 
+$C['abs_url'] = isset($C['abs_url']) ? $C['abs_url'] : 0; 
+if(!isset($C['base_url']) or !preg_match('`^[a-zA-Z\d.+\-]+://[^/]+/(.+?/)?$`', $C['base_url'])){ 
+ $C['base_url'] = $C['abs_url'] = 0; 
+} 
+// config rest 
+$C['and_mark'] = empty($C['and_mark']) ? 0 : 1; 
+$C['anti_link_spam'] = (isset($C['anti_link_spam']) && is_array($C['anti_link_spam']) && count($C['anti_link_spam']) == 2 && (empty($C['anti_link_spam'][0]) or hl_regex($C['anti_link_spam'][0])) && (empty($C['anti_link_spam'][1]) or hl_regex($C['anti_link_spam'][1]))) ? $C['anti_link_spam'] : 0; 
+$C['anti_mail_spam'] = isset($C['anti_mail_spam']) ? $C['anti_mail_spam'] : 0; 
+$C['balance'] = isset($C['balance']) ? (bool)$C['balance'] : 1; 
+$C['cdata'] = isset($C['cdata']) ? $C['cdata'] : (empty($C['safe']) ? 3 : 0); 
+$C['clean_ms_char'] = empty($C['clean_ms_char']) ? 0 : $C['clean_ms_char']; 
+$C['comment'] = isset($C['comment']) ? $C['comment'] : (empty($C['safe']) ? 3 : 0); 
+$C['css_expression'] = empty($C['css_expression']) ? 0 : 1; 
+$C['direct_list_nest'] = empty($C['direct_list_nest']) ? 0 : 1; 
+$C['hexdec_entity'] = isset($C['hexdec_entity']) ? $C['hexdec_entity'] : 1; 
+$C['hook'] = (!empty($C['hook']) && function_exists($C['hook'])) ? $C['hook'] : 0; 
+$C['hook_tag'] = (!empty($C['hook_tag']) && function_exists($C['hook_tag'])) ? $C['hook_tag'] : 0; 
+$C['keep_bad'] = isset($C['keep_bad']) ? $C['keep_bad'] : 6; 
+$C['lc_std_val'] = isset($C['lc_std_val']) ? (bool)$C['lc_std_val'] : 1; 
+$C['make_tag_strict'] = isset($C['make_tag_strict']) ? $C['make_tag_strict'] : 1; 
+$C['named_entity'] = isset($C['named_entity']) ? (bool)$C['named_entity'] : 1; 
+$C['no_deprecated_attr'] = isset($C['no_deprecated_attr']) ? $C['no_deprecated_attr'] : 1; 
+$C['parent'] = isset($C['parent'][0]) ? strtolower($C['parent']) : 'body'; 
+$C['show_setting'] = !empty($C['show_setting']) ? $C['show_setting'] : 0; 
+$C['style_pass'] = empty($C['style_pass']) ? 0 : 1; 
+$C['tidy'] = empty($C['tidy']) ? 0 : $C['tidy']; 
+$C['unique_ids'] = isset($C['unique_ids']) ? $C['unique_ids'] : 1; 
+$C['xml:lang'] = isset($C['xml:lang']) ? $C['xml:lang'] : 0; 
+
+if(isset($GLOBALS['C'])){$reC = $GLOBALS['C'];} 
+$GLOBALS['C'] = $C; 
+$S = is_array($S) ? $S : hl_spec($S); 
+if(isset($GLOBALS['S'])){$reS = $GLOBALS['S'];} 
+$GLOBALS['S'] = $S; 
+
+$t = preg_replace('`[\x00-\x08\x0b-\x0c\x0e-\x1f]`', '', $t); 
+if($C['clean_ms_char']){ 
+ $x = array("\x7f"=>'', "\x80"=>'€', "\x81"=>'', "\x83"=>'ƒ', "\x85"=>'…', "\x86"=>'†', "\x87"=>'‡', "\x88"=>'ˆ', "\x89"=>'‰', "\x8a"=>'Š', "\x8b"=>'‹', "\x8c"=>'Œ', "\x8d"=>'', "\x8e"=>'Ž', "\x8f"=>'', "\x90"=>'', "\x95"=>'•', "\x96"=>'–', "\x97"=>'—', "\x98"=>'˜', "\x99"=>'™', "\x9a"=>'š', "\x9b"=>'›', "\x9c"=>'œ', "\x9d"=>'', "\x9e"=>'ž', "\x9f"=>'Ÿ'); 
+ $x = $x + ($C['clean_ms_char'] == 1 ? array("\x82"=>'‚', "\x84"=>'„', "\x91"=>'‘', "\x92"=>'’', "\x93"=>'“', "\x94"=>'”') : array("\x82"=>'\'', "\x84"=>'"', "\x91"=>'\'', "\x92"=>'\'', "\x93"=>'"', "\x94"=>'"')); 
+ $t = strtr($t, $x); 
+} 
+if($C['cdata'] or $C['comment']){$t = preg_replace_callback('`<!(?:(?:--.*?--)|(?:\[CDATA\[.*?\]\]))>`sm', 'hl_cmtcd', $t);} 
+$t = preg_replace_callback('`&([A-Za-z][A-Za-z0-9]{1,30}|#(?:[0-9]{1,8}|[Xx][0-9A-Fa-f]{1,7}));`', 'hl_ent', str_replace('&', '&', $t)); 
+if($C['unique_ids'] && !isset($GLOBALS['hl_Ids'])){$GLOBALS['hl_Ids'] = array();} 
+if($C['hook']){$t = $C['hook']($t, $C, $S);} 
+if($C['show_setting'] && preg_match('`^[a-z][a-z0-9_]*$`i', $C['show_setting'])){ 
+ $GLOBALS[$C['show_setting']] = array('config'=>$C, 'spec'=>$S, 'time'=>microtime()); 
+} 
+// main 
+$t = preg_replace_callback('`<(?:(?:\s|$)|(?:[^>]*(?:>|$)))|>`m', 'hl_tag', $t); 
+$t = $C['balance'] ? hl_bal($t, $C['keep_bad'], $C['parent']) : $t; 
+$t = (($C['cdata'] or $C['comment']) && strpos($t, "\x01") !== false) ? str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05"), array('', '', '&', '<', '>'), $t) : $t; 
+$t = $C['tidy'] ? hl_tidy($t, $C['tidy'], $C['parent']) : $t; 
+unset($C, $e); 
+if(isset($reC)){$GLOBALS['C'] = $reC;} 
+if(isset($reS)){$GLOBALS['S'] = $reS;} 
+return $t; 
+// eof 
+} 
+
+function hl_attrval($t, $p){ 
+// check attr val against $S 
+$o = 1; $l = strlen($t); 
+foreach($p as $k=>$v){ 
+ switch($k){ 
+  case 'maxlen':if($l > $v){$o = 0;} 
+  break; case 'minlen': if($l < $v){$o = 0;} 
+  break; case 'maxval': if((float)($t) > $v){$o = 0;} 
+  break; case 'minval': if((float)($t) < $v){$o = 0;} 
+  break; case 'match': if(!preg_match($v, $t)){$o = 0;} 
+  break; case 'nomatch': if(preg_match($v, $t)){$o = 0;} 
+  break; case 'oneof': 
+   $m = 0; 
+   foreach(explode('|', $v) as $n){if($t == $n){$m = 1; break;}} 
+   $o = $m; 
+  break; case 'noneof': 
+   $m = 1; 
+   foreach(explode('|', $v) as $n){if($t == $n){$m = 0; break;}} 
+   $o = $m; 
+  break; default: 
+  break; 
+ } 
+ if(!$o){break;} 
+} 
+return ($o ? $t : (isset($p['default']) ? $p['default'] : 0)); 
+// eof 
+} 
+
+function hl_bal($t, $do=1, $in='div'){ 
+// balance tags 
+// by content 
+$cB = array('blockquote'=>1, 'form'=>1, 'map'=>1, 'noscript'=>1); // Block 
+$cE = array('area'=>1, 'br'=>1, 'col'=>1, 'embed'=>1, 'hr'=>1, 'img'=>1, 'input'=>1, 'isindex'=>1, 'param'=>1); // Empty 
+$cF = array('button'=>1, 'del'=>1, 'div'=>1, 'dd'=>1, 'fieldset'=>1, 'iframe'=>1, 'ins'=>1, 'li'=>1, 'noscript'=>1, 'object'=>1, 'td'=>1, 'th'=>1); // Flow; later context-wise dynamic move of ins & del to $cI 
+$cI = array('a'=>1, 'abbr'=>1, 'acronym'=>1, 'address'=>1, 'b'=>1, 'bdo'=>1, 'big'=>1, 'caption'=>1, 'cite'=>1, 'code'=>1, 'dfn'=>1, 'dt'=>1, 'em'=>1, 'font'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'i'=>1, 'kbd'=>1, 'label'=>1, 'legend'=>1, 'p'=>1, 'pre'=>1, 'q'=>1, 'rb'=>1, 'rt'=>1, 's'=>1, 'samp'=>1, 'small'=>1, 'span'=>1, 'strike'=>1, 'strong'=>1, 'sub'=>1, 'sup'=>1, 'tt'=>1, 'u'=>1, 'var'=>1); // Inline 
+$cN = array('a'=>array('a'=>1), 'button'=>array('a'=>1, 'button'=>1, 'fieldset'=>1, 'form'=>1, 'iframe'=>1, 'input'=>1, 'label'=>1, 'select'=>1, 'textarea'=>1), 'fieldset'=>array('fieldset'=>1), 'form'=>array('form'=>1), 'label'=>array('label'=>1), 'noscript'=>array('script'=>1), 'pre'=>array('big'=>1, 'font'=>1, 'img'=>1, 'object'=>1, 'script'=>1, 'small'=>1, 'sub'=>1, 'sup'=>1), 'rb'=>array('ruby'=>1), 'rt'=>array('ruby'=>1)); // Illegal 
+$cN2 = array_keys($cN); 
+$cR = array('blockquote'=>1, 'dir'=>1, 'dl'=>1, 'form'=>1, 'map'=>1, 'menu'=>1, 'noscript'=>1, 'ol'=>1, 'optgroup'=>1, 'rbc'=>1, 'rtc'=>1, 'ruby'=>1, 'select'=>1, 'table'=>1, 'tbody'=>1, 'tfoot'=>1, 'thead'=>1, 'tr'=>1, 'ul'=>1); 
+$cS = array('colgroup'=>array('col'=>1), 'dir'=>array('li'=>1), 'dl'=>array('dd'=>1, 'dt'=>1), 'menu'=>array('li'=>1), 'ol'=>array('li'=>1), 'optgroup'=>array('option'=>1), 'option'=>array('#pcdata'=>1), 'rbc'=>array('rb'=>1), 'rp'=>array('#pcdata'=>1), 'rtc'=>array('rt'=>1), 'ruby'=>array('rb'=>1, 'rbc'=>1, 'rp'=>1, 'rt'=>1, 'rtc'=>1), 'select'=>array('optgroup'=>1, 'option'=>1), 'script'=>array('#pcdata'=>1), 'table'=>array('caption'=>1, 'col'=>1, 'colgroup'=>1, 'tfoot'=>1, 'tbody'=>1, [...]
+if($GLOBALS['C']['direct_list_nest']){$cS['ol'] = $cS['ul'] += array('ol'=>1, 'ul'=>1);} 
+$cO = array('address'=>array('p'=>1), 'applet'=>array('param'=>1), 'blockquote'=>array('script'=>1), 'fieldset'=>array('legend'=>1, '#pcdata'=>1), 'form'=>array('script'=>1), 'map'=>array('area'=>1), 'object'=>array('param'=>1, 'embed'=>1)); // Other 
+$cT = array('colgroup'=>1, 'dd'=>1, 'dt'=>1, 'li'=>1, 'option'=>1, 'p'=>1, 'td'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1); // Omitable closing
+// block/inline type; ins & del both type; #pcdata: text 
+$eB = array('address'=>1, 'blockquote'=>1, 'center'=>1, 'del'=>1, 'dir'=>1, 'dl'=>1, 'div'=>1, 'fieldset'=>1, 'form'=>1, 'ins'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'hr'=>1, 'isindex'=>1, 'menu'=>1, 'noscript'=>1, 'ol'=>1, 'p'=>1, 'pre'=>1, 'table'=>1, 'ul'=>1); 
+$eI = array('#pcdata'=>1, 'a'=>1, 'abbr'=>1, 'acronym'=>1, 'applet'=>1, 'b'=>1, 'bdo'=>1, 'big'=>1, 'br'=>1, 'button'=>1, 'cite'=>1, 'code'=>1, 'del'=>1, 'dfn'=>1, 'em'=>1, 'embed'=>1, 'font'=>1, 'i'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'ins'=>1, 'kbd'=>1, 'label'=>1, 'map'=>1, 'object'=>1, 'q'=>1, 'ruby'=>1, 's'=>1, 'samp'=>1, 'select'=>1, 'script'=>1, 'small'=>1, 'span'=>1, 'strike'=>1, 'strong'=>1, 'sub'=>1, 'sup'=>1, 'textarea'=>1, 'tt'=>1, 'u'=>1, 'var'=>1); 
+$eN = array('a'=>1, 'big'=>1, 'button'=>1, 'fieldset'=>1, 'font'=>1, 'form'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'label'=>1, 'object'=>1, 'ruby'=>1, 'script'=>1, 'select'=>1, 'small'=>1, 'sub'=>1, 'sup'=>1, 'textarea'=>1); // Exclude from specific ele; $cN values 
+$eO = array('area'=>1, 'caption'=>1, 'col'=>1, 'colgroup'=>1, 'dd'=>1, 'dt'=>1, 'legend'=>1, 'li'=>1, 'optgroup'=>1, 'option'=>1, 'param'=>1, 'rb'=>1, 'rbc'=>1, 'rp'=>1, 'rt'=>1, 'rtc'=>1, 'script'=>1, 'tbody'=>1, 'td'=>1, 'tfoot'=>1, 'thead'=>1, 'th'=>1, 'tr'=>1); // Missing in $eB & $eI 
+$eF = $eB + $eI; 
+
+// $in sets allowed child 
+$in = ((isset($eF[$in]) && $in != '#pcdata') or isset($eO[$in])) ? $in : 'div'; 
+if(isset($cE[$in])){ 
+ return (!$do ? '' : str_replace(array('<', '>'), array('<', '>'), $t)); 
+} 
+if(isset($cS[$in])){$inOk = $cS[$in];} 
+elseif(isset($cI[$in])){$inOk = $eI; $cI['del'] = 1; $cI['ins'] = 1;} 
+elseif(isset($cF[$in])){$inOk = $eF; unset($cI['del'], $cI['ins']);} 
+elseif(isset($cB[$in])){$inOk = $eB; unset($cI['del'], $cI['ins']);} 
+if(isset($cO[$in])){$inOk = $inOk + $cO[$in];} 
+if(isset($cN[$in])){$inOk = array_diff_assoc($inOk, $cN[$in]);} 
+
+$t = explode('<', $t); 
+$ok = $q = array(); // $q seq list of open non-empty ele 
+ob_start(); 
+
+for($i=-1, $ci=count($t); ++$i<$ci;){ 
+ // allowed $ok in parent $p 
+ if($ql = count($q)){ 
+  $p = array_pop($q); 
+  $q[] = $p; 
+  if(isset($cS[$p])){$ok = $cS[$p];} 
+  elseif(isset($cI[$p])){$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1;} 
+  elseif(isset($cF[$p])){$ok = $eF; unset($cI['del'], $cI['ins']);} 
+  elseif(isset($cB[$p])){$ok = $eB; unset($cI['del'], $cI['ins']);} 
+  if(isset($cO[$p])){$ok = $ok + $cO[$p];} 
+  if(isset($cN[$p])){$ok = array_diff_assoc($ok, $cN[$p]);} 
+ }else{$ok = $inOk; unset($cI['del'], $cI['ins']);} 
+ // bad tags, & ele content 
+ if(isset($e) && ($do == 1 or (isset($ok['#pcdata']) && ($do == 3 or $do == 5)))){ 
+  echo '<', $s, $e, $a, '>'; 
+ } 
+ if(isset($x[0])){ 
+  if(strlen(trim($x)) && (($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql))){ 
+   echo '<div>', $x, '</div>'; 
+  } 
+  elseif($do < 3 or isset($ok['#pcdata'])){echo $x;} 
+  elseif(strpos($x, "\x02\x04")){ 
+   foreach(preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY) as $v){ 
+    echo (substr($v, 0, 2) == "\x01\x02" ? $v : ($do > 4 ? preg_replace('`\S`', '', $v) : '')); 
+   } 
+  }elseif($do > 4){echo preg_replace('`\S`', '', $x);} 
+ } 
+ // get markup 
+ if(!preg_match('`^(/?)([a-z1-6]+)([^>]*)>(.*)`sm', $t[$i], $r)){$x = $t[$i]; continue;} 
+ $s = null; $e = null; $a = null; $x = null; list($all, $s, $e, $a, $x) = $r; 
+ // close tag 
+ if($s){ 
+  if(isset($cE[$e]) or !in_array($e, $q)){continue;} // Empty/unopen 
+  if($p == $e){array_pop($q); echo '</', $e, '>'; unset($e); continue;} // Last open 
+  $add = ''; // Nesting - close open tags that need to be 
+  for($j=-1, $cj=count($q); ++$j<$cj;){   
+   if(($d = array_pop($q)) == $e){break;} 
+   else{$add .= "</{$d}>";} 
+  } 
+  echo $add, '</', $e, '>'; unset($e); continue; 
+ } 
+ // open tag 
+ // $cB ele needs $eB ele as child 
+ if(isset($cB[$e]) && strlen(trim($x))){ 
+  $t[$i] = "{$e}{$a}>"; 
+  array_splice($t, $i+1, 0, 'div>'. $x); unset($e, $x); ++$ci; --$i; continue; 
+ } 
+ if((($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql)) && !isset($eB[$e]) && !isset($ok[$e])){ 
+  array_splice($t, $i, 0, 'div>'); unset($e, $x); ++$ci; --$i; continue; 
+ } 
+ // if no open ele, $in = parent; mostly immediate parent-child relation should hold 
+ if(!$ql or !isset($eN[$e]) or !array_intersect($q, $cN2)){ 
+  if(!isset($ok[$e])){ 
+   if($ql && isset($cT[$p])){echo '</', array_pop($q), '>'; unset($e, $x); --$i;} 
+   continue; 
+  } 
+  if(!isset($cE[$e])){$q[] = $e;} 
+  echo '<', $e, $a, '>'; unset($e); continue; 
+ } 
+ // specific parent-child 
+ if(isset($cS[$p][$e])){ 
+  if(!isset($cE[$e])){$q[] = $e;} 
+  echo '<', $e, $a, '>'; unset($e); continue; 
+ } 
+ // nesting 
+ $add = ''; 
+ $q2 = array(); 
+ for($k=-1, $kc=count($q); ++$k<$kc;){ 
+  $d = $q[$k]; 
+  $ok2 = array(); 
+  if(isset($cS[$d])){$q2[] = $d; continue;} 
+  $ok2 = isset($cI[$d]) ? $eI : $eF; 
+  if(isset($cO[$d])){$ok2 = $ok2 + $cO[$d];} 
+  if(isset($cN[$d])){$ok2 = array_diff_assoc($ok2, $cN[$d]);} 
+  if(!isset($ok2[$e])){ 
+   if(!$k && !isset($inOk[$e])){continue 2;} 
+   $add = "</{$d}>"; 
+   for(;++$k<$kc;){$add = "</{$q[$k]}>{$add}";} 
+   break; 
+  } 
+  else{$q2[] = $d;} 
+ } 
+ $q = $q2; 
+ if(!isset($cE[$e])){$q[] = $e;} 
+ echo $add, '<', $e, $a, '>'; unset($e); continue; 
+} 
+
+// end 
+if($ql = count($q)){ 
+ $p = array_pop($q); 
+ $q[] = $p; 
+ if(isset($cS[$p])){$ok = $cS[$p];} 
+ elseif(isset($cI[$p])){$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1;} 
+ elseif(isset($cF[$p])){$ok = $eF; unset($cI['del'], $cI['ins']);} 
+ elseif(isset($cB[$p])){$ok = $eB; unset($cI['del'], $cI['ins']);} 
+ if(isset($cO[$p])){$ok = $ok + $cO[$p];} 
+ if(isset($cN[$p])){$ok = array_diff_assoc($ok, $cN[$p]);} 
+}else{$ok = $inOk; unset($cI['del'], $cI['ins']);} 
+if(isset($e) && ($do == 1 or (isset($ok['#pcdata']) && ($do == 3 or $do == 5)))){ 
+ echo '<', $s, $e, $a, '>'; 
+} 
+if(isset($x[0])){ 
+ if(strlen(trim($x)) && (($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql))){ 
+  echo '<div>', $x, '</div>'; 
+ } 
+ elseif($do < 3 or isset($ok['#pcdata'])){echo $x;} 
+ elseif(strpos($x, "\x02\x04")){ 
+  foreach(preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY) as $v){ 
+   echo (substr($v, 0, 2) == "\x01\x02" ? $v : ($do > 4 ? preg_replace('`\S`', '', $v) : '')); 
+  } 
+ }elseif($do > 4){echo preg_replace('`\S`', '', $x);} 
+} 
+while(!empty($q) && ($e = array_pop($q))){echo '</', $e, '>';} 
+$o = ob_get_contents(); 
+ob_end_clean(); 
+return $o; 
+// eof 
+} 
+
+function hl_cmtcd($t){ 
+// comment/CDATA sec handler 
+$t = $t[0]; 
+global $C; 
+if(!($v = $C[$n = $t[3] == '-' ? 'comment' : 'cdata'])){return $t;} 
+if($v == 1){return '';} 
+if($n == 'comment'){ 
+ if(substr(($t = preg_replace('`--+`', '-', substr($t, 4, -3))), -1) != ' '){$t .= ' ';} 
+} 
+else{$t = substr($t, 1, -1);} 
+$t = $v == 2 ? str_replace(array('&', '<', '>'), array('&', '<', '>'), $t) : $t; 
+return str_replace(array('&', '<', '>'), array("\x03", "\x04", "\x05"), ($n == 'comment' ? "\x01\x02\x04!--$t--\x05\x02\x01" : "\x01\x01\x04$t\x05\x01\x01")); 
+// eof 
+} 
+
+function hl_ent($t){ 
+// entitity handler 
+global $C; 
+$t = $t[1]; 
+static $U = array('quot'=>1,'amp'=>1,'lt'=>1,'gt'=>1); 
+static $N = array('fnof'=>'402', 'Alpha'=>'913', 'Beta'=>'914', 'Gamma'=>'915', 'Delta'=>'916', 'Epsilon'=>'917', 'Zeta'=>'918', 'Eta'=>'919', 'Theta'=>'920', 'Iota'=>'921', 'Kappa'=>'922', 'Lambda'=>'923', 'Mu'=>'924', 'Nu'=>'925', 'Xi'=>'926', 'Omicron'=>'927', 'Pi'=>'928', 'Rho'=>'929', 'Sigma'=>'931', 'Tau'=>'932', 'Upsilon'=>'933', 'Phi'=>'934', 'Chi'=>'935', 'Psi'=>'936', 'Omega'=>'937', 'alpha'=>'945', 'beta'=>'946', 'gamma'=>'947', 'delta'=>'948', 'epsilon'=>'949', 'zeta'=>'950', [...]
+if($t[0] != '#'){ 
+ return ($C['and_mark'] ? "\x06" : '&'). (isset($U[$t]) ? $t : (isset($N[$t]) ? (!$C['named_entity'] ? '#'. ($C['hexdec_entity'] > 1 ? 'x'. dechex($N[$t]) : $N[$t]) : $t) : 'amp;'. $t)). ';'; 
+} 
+if(($n = ctype_digit($t = substr($t, 1)) ? intval($t) : hexdec(substr($t, 1))) < 9 or ($n > 13 && $n < 32) or $n == 11 or $n == 12 or ($n > 126 && $n < 160 && $n != 133) or ($n > 55295 && ($n < 57344 or ($n > 64975 && $n < 64992) or $n == 65534 or $n == 65535 or $n > 1114111))){ 
+ return ($C['and_mark'] ? "\x06" : '&'). "amp;#{$t};"; 
+} 
+return ($C['and_mark'] ? "\x06" : '&'). '#'. (((ctype_digit($t) && $C['hexdec_entity'] < 2) or !$C['hexdec_entity']) ? $n : 'x'. dechex($n)). ';';
+// eof 
+} 
+
+function hl_prot($p, $c=null){ 
+// check URL scheme 
+global $C; 
+$b = $a = ''; 
+if($c == null){$c = 'style'; $b = $p[1]; $a = $p[3]; $p = trim($p[2]);} 
+$c = isset($C['schemes'][$c]) ? $C['schemes'][$c] : $C['schemes']['*']; 
+static $d = 'denied:'; 
+if(isset($c['!']) && substr($p, 0, 7) != $d){$p = "$d$p";} 
+if(isset($c['*']) or !strcspn($p, '#?;') or (substr($p, 0, 7) == $d)){return "{$b}{$p}{$a}";} // All ok, frag, query, param 
+if(preg_match('`^([^:?[@!$()*,=/\'\]]+?)(:|&#(58|x3a);|%3a|\\\\0{0,4}3a).`i', $p, $m) && !isset($c[strtolower($m[1])])){ // Denied prot 
+ return "{$b}{$d}{$p}{$a}"; 
+} 
+if($C['abs_url']){ 
+ if($C['abs_url'] == -1 && strpos($p, $C['base_url']) === 0){ // Make url rel 
+  $p = substr($p, strlen($C['base_url'])); 
+ }elseif(empty($m[1])){ // Make URL abs 
+  if(substr($p, 0, 2) == '//'){$p = substr($C['base_url'], 0, strpos($C['base_url'], ':')+1). $p;} 
+  elseif($p[0] == '/'){$p = preg_replace('`(^.+?://[^/]+)(.*)`', '$1', $C['base_url']). $p;} 
+  elseif(strcspn($p, './')){$p = $C['base_url']. $p;} 
+  else{ 
+   preg_match('`^([a-zA-Z\d\-+.]+://[^/]+)(.*)`', $C['base_url'], $m); 
+   $p = preg_replace('`(?<=/)\./`', '', $m[2]. $p); 
+   while(preg_match('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', $p)){ 
+    $p = preg_replace('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', '', $p); 
+   } 
+   $p = $m[1]. $p; 
+  } 
+ } 
+} 
+return "{$b}{$p}{$a}"; 
+// eof 
+} 
+
+function hl_regex($p){ 
+// ?regex 
+if(empty($p)){return 0;} 
+if($t = ini_get('track_errors')){$o = isset($php_errormsg) ? $php_errormsg : null;} 
+else{ini_set('track_errors', 1);} 
+unset($php_errormsg); 
+if(($d = ini_get('display_errors'))){ini_set('display_errors', 0);} 
+preg_match($p, ''); 
+if($d){ini_set('display_errors', 1);} 
+$r = isset($php_errormsg) ? 0 : 1; 
+if($t){$php_errormsg = isset($o) ? $o : null;} 
+else{ini_set('track_errors', 0);} 
+return $r; 
+// eof 
+} 
+
+function hl_spec($t){ 
+// final $spec 
+$s = array(); 
+$t = str_replace(array("\t", "\r", "\n", ' '), '', preg_replace_callback('/"(?>(`.|[^"])*)"/sm', create_function('$m', 'return substr(str_replace(array(";", "|", "~", " ", ",", "/", "(", ")", \'`"\'), array("\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07", "\x08", "\""), $m[0]), 1, -1);'), trim($t))); 
+for($i = count(($t = explode(';', $t))); --$i>=0;){ 
+ $w = $t[$i]; 
+ if(empty($w) or ($e = strpos($w, '=')) === false or !strlen(($a =  substr($w, $e+1)))){continue;} 
+ $y = $n = array(); 
+ foreach(explode(',', $a) as $v){ 
+  if(!preg_match('`^([a-z:\-\*]+)(?:\((.*?)\))?`i', $v, $m)){continue;} 
+  if(($x = strtolower($m[1])) == '-*'){$n['*'] = 1; continue;} 
+  if($x[0] == '-'){$n[substr($x, 1)] = 1; continue;} 
+  if(!isset($m[2])){$y[$x] = 1; continue;} 
+  foreach(explode('/', $m[2]) as $m){ 
+   if(empty($m) or ($p = strpos($m, '=')) == 0 or $p < 5){$y[$x] = 1; continue;} 
+   $y[$x][strtolower(substr($m, 0, $p))] = str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07", "\x08"), array(";", "|", "~", " ", ",", "/", "(", ")"), substr($m, $p+1)); 
+  } 
+  if(isset($y[$x]['match']) && !hl_regex($y[$x]['match'])){unset($y[$x]['match']);} 
+  if(isset($y[$x]['nomatch']) && !hl_regex($y[$x]['nomatch'])){unset($y[$x]['nomatch']);} 
+ } 
+ if(!count($y) && !count($n)){continue;} 
+ foreach(explode(',', substr($w, 0, $e)) as $v){ 
+  if(!strlen(($v = strtolower($v)))){continue;} 
+  if(count($y)){$s[$v] = $y;} 
+  if(count($n)){$s[$v]['n'] = $n;} 
+ } 
+} 
+return $s; 
+// eof 
+} 
+
+function hl_tag($t){ 
+// tag/attribute handler 
+global $C; 
+$t = $t[0]; 
+// invalid < > 
+if($t == '< '){return '< ';} 
+if($t == '>'){return '>';} 
+if(!preg_match('`^<(/?)([a-zA-Z][a-zA-Z1-6]*)([^>]*?)\s?>$`m', $t, $m)){ 
+ return str_replace(array('<', '>'), array('<', '>'), $t); 
+}elseif(!isset($C['elements'][($e = strtolower($m[2]))])){ 
+ return (($C['keep_bad']%2) ? str_replace(array('<', '>'), array('<', '>'), $t) : ''); 
+} 
+// attr string 
+$a = str_replace(array("\n", "\r", "\t"), ' ', trim($m[3])); 
+// tag transform 
+static $eD = array('applet'=>1, 'center'=>1, 'dir'=>1, 'embed'=>1, 'font'=>1, 'isindex'=>1, 'menu'=>1, 's'=>1, 'strike'=>1, 'u'=>1); // Deprecated
+if($C['make_tag_strict'] && isset($eD[$e])){ 
+ $trt = hl_tag2($e, $a, $C['make_tag_strict']); 
+ if(!$e){return (($C['keep_bad']%2) ? str_replace(array('<', '>'), array('<', '>'), $t) : '');} 
+} 
+// close tag 
+static $eE = array('area'=>1, 'br'=>1, 'col'=>1, 'embed'=>1, 'hr'=>1, 'img'=>1, 'input'=>1, 'isindex'=>1, 'param'=>1); // Empty ele 
+if(!empty($m[1])){ 
+ return (!isset($eE[$e]) ? (empty($C['hook_tag']) ? "</$e>" : $C['hook_tag']($e)) : (($C['keep_bad'])%2 ? str_replace(array('<', '>'), array('<', '>'), $t) : '')); 
+} 
+
+// open tag & attr 
+static $aN = array('abbr'=>array('td'=>1, 'th'=>1), 'accept-charset'=>array('form'=>1), 'accept'=>array('form'=>1, 'input'=>1), 'accesskey'=>array('a'=>1, 'area'=>1, 'button'=>1, 'input'=>1, 'label'=>1, 'legend'=>1, 'textarea'=>1), 'action'=>array('form'=>1), 'align'=>array('caption'=>1, 'embed'=>1, 'applet'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'object'=>1, 'legend'=>1, 'table'=>1, 'hr'=>1, 'div'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'p'=>1, 'col'=>1, 'colgroup'=>1, [...]
+static $aNE = array('checked'=>1, 'compact'=>1, 'declare'=>1, 'defer'=>1, 'disabled'=>1, 'ismap'=>1, 'multiple'=>1, 'nohref'=>1, 'noresize'=>1, 'noshade'=>1, 'nowrap'=>1, 'readonly'=>1, 'selected'=>1); // Empty 
+static $aNP = array('action'=>1, 'cite'=>1, 'classid'=>1, 'codebase'=>1, 'data'=>1, 'href'=>1, 'longdesc'=>1, 'model'=>1, 'pluginspage'=>1, 'pluginurl'=>1, 'usemap'=>1); // Need scheme check; excludes style, on* & src 
+static $aNU = array('class'=>array('param'=>1, 'script'=>1), 'dir'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'iframe'=>1, 'param'=>1, 'script'=>1), 'id'=>array('script'=>1), 'lang'=>array('applet'=>1, 'br'=>1, 'iframe'=>1, 'param'=>1, 'script'=>1), 'xml:lang'=>array('applet'=>1, 'br'=>1, 'iframe'=>1, 'param'=>1, 'script'=>1), 'onclick'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'ondblclick'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'f [...]
+
+if($C['lc_std_val']){ 
+ // predef attr vals for $eAL & $aNE ele 
+ static $aNL = array('all'=>1, 'baseline'=>1, 'bottom'=>1, 'button'=>1, 'center'=>1, 'char'=>1, 'checkbox'=>1, 'circle'=>1, 'col'=>1, 'colgroup'=>1, 'cols'=>1, 'data'=>1, 'default'=>1, 'file'=>1, 'get'=>1, 'groups'=>1, 'hidden'=>1, 'image'=>1, 'justify'=>1, 'left'=>1, 'ltr'=>1, 'middle'=>1, 'none'=>1, 'object'=>1, 'password'=>1, 'poly'=>1, 'post'=>1, 'preserve'=>1, 'radio'=>1, 'rect'=>1, 'ref'=>1, 'reset'=>1, 'right'=>1, 'row'=>1, 'rowgroup'=>1, 'rows'=>1, 'rtl'=>1, 'submit'=>1, 'text'=> [...]
+ static $eAL = array('a'=>1, 'area'=>1, 'bdo'=>1, 'button'=>1, 'col'=>1, 'form'=>1, 'img'=>1, 'input'=>1, 'object'=>1, 'optgroup'=>1, 'option'=>1, 'param'=>1, 'script'=>1, 'select'=>1, 'table'=>1, 'td'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1, 'xml:space'=>1); 
+ $lcase = isset($eAL[$e]) ? 1 : 0; 
+} 
+
+$depTr = 0; 
+if($C['no_deprecated_attr']){ 
+ // dep attr:applicable ele 
+ static $aND = array('align'=>array('caption'=>1, 'div'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'hr'=>1, 'img'=>1, 'input'=>1, 'legend'=>1, 'object'=>1, 'p'=>1, 'table'=>1), 'bgcolor'=>array('table'=>1, 'td'=>1, 'th'=>1, 'tr'=>1), 'border'=>array('img'=>1, 'object'=>1), 'bordercolor'=>array('table'=>1, 'td'=>1, 'tr'=>1), 'clear'=>array('br'=>1), 'compact'=>array('dl'=>1, 'ol'=>1, 'ul'=>1), 'height'=>array('td'=>1, 'th'=>1), 'hspace'=>array('img'=>1, 'object'=>1), 'langu [...]
+ static $eAD = array('a'=>1, 'br'=>1, 'caption'=>1, 'div'=>1, 'dl'=>1, 'form'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'hr'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'legend'=>1, 'li'=>1, 'map'=>1, 'object'=>1, 'ol'=>1, 'p'=>1, 'pre'=>1, 'script'=>1, 'table'=>1, 'td'=>1, 'th'=>1, 'tr'=>1, 'ul'=>1); 
+ $depTr = isset($eAD[$e]) ? 1 : 0; 
+} 
+
+// attr name-vals 
+if(strpos($a, "\x01") !== false){$a = preg_replace('`\x01[^\x01]*\x01`', '', $a);} // No comment/CDATA sec 
+$mode = 0; $a = trim($a, ' /'); $aA = array(); 
+while(strlen($a)){ 
+ $w = 0; 
+ switch($mode){ 
+  case 0: // Name 
+   if(preg_match('`^[a-zA-Z][\-a-zA-Z:]+`', $a, $m)){ 
+    $nm = strtolower($m[0]); 
+    $w = $mode = 1; $a = ltrim(substr_replace($a, '', 0, strlen($m[0]))); 
+   } 
+  break; case 1: 
+   if($a[0] == '='){ // = 
+    $w = 1; $mode = 2; $a = ltrim($a, '= '); 
+   }else{ // No val 
+    $w = 1; $mode = 0; $a = ltrim($a); 
+    $aA[$nm] = ''; 
+   } 
+  break; case 2: // Val 
+   if(preg_match('`^((?:"[^"]*")|(?:\'[^\']*\')|(?:\s*[^\s"\']+))(.*)`', $a, $m)){ 
+    $a = ltrim($m[2]); $m = $m[1]; $w = 1; $mode = 0; 
+    $aA[$nm] = trim(str_replace('<', '<', ($m[0] == '"' or $m[0] == '\'') ? substr($m, 1, -1) : $m)); 
+   } 
+  break; 
+ } 
+ if($w == 0){ // Parse errs, deal with space, " & ' 
+  $a = preg_replace('`^(?:"[^"]*("|$)|\'[^\']*(\'|$)|\S)*\s*`', '', $a); 
+  $mode = 0; 
+ } 
+} 
+if($mode == 1){$aA[$nm] = '';} 
+
+// clean attrs 
+global $S; 
+$rl = isset($S[$e]) ? $S[$e] : array(); 
+$a = array(); $nfr = 0; 
+foreach($aA as $k=>$v){ 
+  if(((isset($C['deny_attribute']['*']) ? isset($C['deny_attribute'][$k]) : !isset($C['deny_attribute'][$k])) && (isset($aN[$k][$e]) or (isset($aNU[$k]) && !isset($aNU[$k][$e]))) && !isset($rl['n'][$k]) && !isset($rl['n']['*'])) or isset($rl[$k])){ 
+  if(isset($aNE[$k])){$v = $k;} 
+  elseif(!empty($lcase) && (($e != 'button' or $e != 'input') or $k == 'type')){ // Rather loose but ?not cause issues 
+   $v = (isset($aNL[($v2 = strtolower($v))])) ? $v2 : $v; 
+  } 
+  if($k == 'style' && !$C['style_pass']){ 
+   if(false !== strpos($v, '&#')){ 
+    static $sC = array('&#x20;'=>' ', ' '=>' ', '&#x45;'=>'e', 'E'=>'e', '&#x65;'=>'e', 'e'=>'e', '&#x58;'=>'x', 'X'=>'x', '&#x78;'=>'x', 'x'=>'x', '&#x50;'=>'p', 'P'=>'p', '&#x70;'=>'p', 'p'=>'p', '&#x53;'=>'s', 'S'=>'s', '&#x73;'=>'s', 's'=>'s', '&#x49;'=>'i', 'I'=>'i', '&#x69;'=>'i', 'i'=>'i', '&#x4f;'=>'o', 'O'=>'o', '&#x6f;'=>'o', 'o'=>'o', '&#x4e;'=>'n', 'N'=>'n', '&#x6e;'=>'n', 'n'=>'n', '&#x55;'=>'u', 'U'=>'u' [...]
+    $v = strtr($v, $sC); 
+   } 
+   $v = preg_replace_callback('`(url(?:\()(?: )*(?:\'|"|&(?:quot|apos);)?)(.+?)((?:\'|"|&(?:quot|apos);)?(?: )*(?:\)))`iS', 'hl_prot', $v); 
+   $v = !$C['css_expression'] ? preg_replace('`expression`i', ' ', preg_replace('`\\\\\S|(/|(%2f))(\*|(%2a))`i', ' ', $v)) : $v; 
+  }elseif(isset($aNP[$k]) or strpos($k, 'src') !== false or $k[0] == 'o'){ 
+   $v = str_replace("\xad", ' ', (strpos($v, '&') !== false ? str_replace(array('&#xad;', '­', '­'), ' ', $v) : $v)); 
+   $v = hl_prot($v, $k); 
+   if($k == 'href'){ // X-spam 
+    if($C['anti_mail_spam'] && strpos($v, 'mailto:') === 0){ 
+     $v = str_replace('@', htmlspecialchars($C['anti_mail_spam']), $v); 
+    }elseif($C['anti_link_spam']){ 
+     $r1 = $C['anti_link_spam'][1]; 
+     if(!empty($r1) && preg_match($r1, $v)){continue;} 
+     $r0 = $C['anti_link_spam'][0]; 
+     if(!empty($r0) && preg_match($r0, $v)){ 
+      if(isset($a['rel'])){ 
+       if(!preg_match('`\bnofollow\b`i', $a['rel'])){$a['rel'] .= ' nofollow';} 
+      }elseif(isset($aA['rel'])){ 
+       if(!preg_match('`\bnofollow\b`i', $aA['rel'])){$nfr = 1;} 
+      }else{$a['rel'] = 'nofollow';} 
+     } 
+    } 
+   } 
+  } 
+  if(isset($rl[$k]) && is_array($rl[$k]) && ($v = hl_attrval($v, $rl[$k])) === 0){continue;} 
+  $a[$k] = str_replace('"', '"', $v); 
+ } 
+} 
+if($nfr){$a['rel'] = isset($a['rel']) ? $a['rel']. ' nofollow' : 'nofollow';} 
+
+// rqd attr 
+static $eAR = array('area'=>array('alt'=>'area'), 'bdo'=>array('dir'=>'ltr'), 'form'=>array('action'=>''), 'img'=>array('src'=>'', 'alt'=>'image'), 'map'=>array('name'=>''), 'optgroup'=>array('label'=>''), 'param'=>array('name'=>''), 'script'=>array('type'=>'text/javascript'), 'textarea'=>array('rows'=>'10', 'cols'=>'50')); 
+if(isset($eAR[$e])){ 
+ foreach($eAR[$e] as $k=>$v){ 
+  if(!isset($a[$k])){$a[$k] = isset($v[0]) ? $v : $k;} 
+ } 
+} 
+
+// depr attrs 
+if($depTr){ 
+ $c = array(); 
+ foreach($a as $k=>$v){ 
+  if($k == 'style' or !isset($aND[$k][$e])){continue;} 
+  if($k == 'align'){ 
+   unset($a['align']); 
+   if($e == 'img' && ($v == 'left' or $v == 'right')){$c[] = 'float: '. $v;} 
+   elseif(($e == 'div' or $e == 'table') && $v == 'center'){$c[] = 'margin: auto';} 
+   else{$c[] = 'text-align: '. $v;} 
+  }elseif($k == 'bgcolor'){ 
+   unset($a['bgcolor']); 
+   $c[] = 'background-color: '. $v; 
+  }elseif($k == 'border'){ 
+   unset($a['border']); $c[] = "border: {$v}px"; 
+  }elseif($k == 'bordercolor'){ 
+   unset($a['bordercolor']); $c[] = 'border-color: '. $v; 
+  }elseif($k == 'clear'){ 
+   unset($a['clear']); $c[] = 'clear: '. ($v != 'all' ? $v : 'both'); 
+  }elseif($k == 'compact'){ 
+   unset($a['compact']); $c[] = 'font-size: 85%'; 
+  }elseif($k == 'height' or $k == 'width'){ 
+   unset($a[$k]); $c[] = $k. ': '. ($v[0] != '*' ? $v. (ctype_digit($v) ? 'px' : '') : 'auto'); 
+  }elseif($k == 'hspace'){ 
+   unset($a['hspace']); $c[] = "margin-left: {$v}px; margin-right: {$v}px"; 
+  }elseif($k == 'language' && !isset($a['type'])){ 
+   unset($a['language']); 
+   $a['type'] = 'text/'. strtolower($v); 
+  }elseif($k == 'name'){ 
+   if($C['no_deprecated_attr'] == 2 or ($e != 'a' && $e != 'map')){unset($a['name']);} 
+   if(!isset($a['id']) && preg_match('`[a-zA-Z][a-zA-Z\d.:_\-]*`', $v)){$a['id'] = $v;} 
+  }elseif($k == 'noshade'){ 
+   unset($a['noshade']); $c[] = 'border-style: none; border: 0; background-color: gray; color: gray'; 
+  }elseif($k == 'nowrap'){ 
+   unset($a['nowrap']); $c[] = 'white-space: nowrap'; 
+  }elseif($k == 'size'){ 
+   unset($a['size']); $c[] = 'size: '. $v. 'px'; 
+  }elseif($k == 'start' or $k == 'value'){ 
+   unset($a[$k]); 
+  }elseif($k == 'type'){ 
+   unset($a['type']); 
+   static $ol_type = array('i'=>'lower-roman', 'I'=>'upper-roman', 'a'=>'lower-latin', 'A'=>'upper-latin', '1'=>'decimal'); 
+   $c[] = 'list-style-type: '. (isset($ol_type[$v]) ? $ol_type[$v] : 'decimal'); 
+  }elseif($k == 'vspace'){ 
+   unset($a['vspace']); $c[] = "margin-top: {$v}px; margin-bottom: {$v}px"; 
+  } 
+ } 
+ if(count($c)){ 
+  $c = implode('; ', $c); 
+  $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;'). '; '. $c. ';': $c. ';'; 
+ } 
+} 
+// unique ID 
+if($C['unique_ids'] && isset($a['id'])){ 
+ if(!preg_match('`^[A-Za-z][A-Za-z0-9_\-.:]*$`', ($id = $a['id'])) or (isset($GLOBALS['hl_Ids'][$id]) && $C['unique_ids'] == 1)){unset($a['id']); 
+ }else{ 
+  while(isset($GLOBALS['hl_Ids'][$id])){$id = $C['unique_ids']. $id;} 
+  $GLOBALS['hl_Ids'][($a['id'] = $id)] = 1; 
+ } 
+} 
+// xml:lang 
+if($C['xml:lang'] && isset($a['lang'])){ 
+ $a['xml:lang'] = isset($a['xml:lang']) ? $a['xml:lang'] : $a['lang']; 
+ if($C['xml:lang'] == 2){unset($a['lang']);} 
+} 
+// for transformed tag 
+if(!empty($trt)){ 
+ $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;'). '; '. $trt : $trt; 
+} 
+// return with empty ele / 
+if(empty($C['hook_tag'])){ 
+ $aA = ''; 
+ foreach($a as $k=>$v){$aA .= " {$k}=\"{$v}\"";} 
+ return "<{$e}{$aA}". (isset($eE[$e]) ? ' /' : ''). '>'; 
+} 
+else{return $C['hook_tag']($e, $a);} 
+// eof 
+} 
+
+function hl_tag2(&$e, &$a, $t=1){ 
+// transform tag 
+if($e == 'center'){$e = 'div'; return 'text-align: center;';} 
+if($e == 'dir' or $e == 'menu'){$e = 'ul'; return '';} 
+if($e == 's' or $e == 'strike'){$e = 'span'; return 'text-decoration: line-through;';} 
+if($e == 'u'){$e = 'span'; return 'text-decoration: underline;';} 
+static $fs = array('0'=>'xx-small', '1'=>'xx-small', '2'=>'small', '3'=>'medium', '4'=>'large', '5'=>'x-large', '6'=>'xx-large', '7'=>'300%', '-1'=>'smaller', '-2'=>'60%', '+1'=>'larger', '+2'=>'150%', '+3'=>'200%', '+4'=>'300%'); 
+if($e == 'font'){ 
+ $a2 = ''; 
+ if(preg_match('`face\s*=\s*(\'|")([^=]+?)\\1`i', $a, $m) or preg_match('`face\s*=(\s*)(\S+)`i', $a, $m)){ 
+  $a2 .= ' font-family: '. str_replace('"', '\'', trim($m[2])). ';'; 
+ } 
+ if(preg_match('`color\s*=\s*(\'|")?(.+?)(\\1|\s|$)`i', $a, $m)){ 
+  $a2 .= ' color: '. trim($m[2]). ';'; 
+ } 
+ if(preg_match('`size\s*=\s*(\'|")?(.+?)(\\1|\s|$)`i', $a, $m) && isset($fs[($m = trim($m[2]))])){ 
+  $a2 .= ' font-size: '. $fs[$m]. ';'; 
+ } 
+ $e = 'span'; return ltrim($a2); 
+} 
+if($t == 2){$e = 0; return 0;} 
+return ''; 
+// eof 
+} 
+
+function hl_tidy($t, $w, $p){ 
+// Tidy/compact HTM 
+if(strpos(' pre,script,textarea', "$p,")){return $t;} 
+$t = preg_replace('`\s+`', ' ', preg_replace_callback(array('`(<(!\[CDATA\[))(.+?)(\]\]>)`sm', '`(<(!--))(.+?)(-->)`sm', '`(<(pre|script|textarea)[^>]*?>)(.+?)(</\2>)`sm'), create_function('$m', 'return $m[1]. str_replace(array("<", ">", "\n", "\r", "\t", " "), array("\x01", "\x02", "\x03", "\x04", "\x05", "\x07"), $m[3]). $m[4];'), $t)); 
+if(($w = strtolower($w)) == -1){ 
+ return str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05", "\x07"), array('<', '>', "\n", "\r", "\t", ' '), $t); 
+} 
+$s = strpos(" $w", 't') ? "\t" : ' '; 
+$s = preg_match('`\d`', $w, $m) ? str_repeat($s, $m[0]) : str_repeat($s, ($s == "\t" ? 1 : 2)); 
+$N = preg_match('`[ts]([1-9])`', $w, $m) ? $m[1] : 0; 
+$a = array('br'=>1); 
+$b = array('button'=>1, 'input'=>1, 'option'=>1, 'param'=>1); 
+$c = array('caption'=>1, 'dd'=>1, 'dt'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'isindex'=>1, 'label'=>1, 'legend'=>1, 'li'=>1, 'object'=>1, 'p'=>1, 'pre'=>1, 'td'=>1, 'textarea'=>1, 'th'=>1); 
+$d = array('address'=>1, 'blockquote'=>1, 'center'=>1, 'colgroup'=>1, 'dir'=>1, 'div'=>1, 'dl'=>1, 'fieldset'=>1, 'form'=>1, 'hr'=>1, 'iframe'=>1, 'map'=>1, 'menu'=>1, 'noscript'=>1, 'ol'=>1, 'optgroup'=>1, 'rbc'=>1, 'rtc'=>1, 'ruby'=>1, 'script'=>1, 'select'=>1, 'table'=>1, 'tbody'=>1, 'tfoot'=>1, 'thead'=>1, 'tr'=>1, 'ul'=>1); 
+$T = explode('<', $t); 
+$X = 1; 
+while($X){ 
+ $n = $N; 
+ $t = $T; 
+ ob_start(); 
+ if(isset($d[$p])){echo str_repeat($s, ++$n);} 
+ echo ltrim(array_shift($t)); 
+ for($i=-1, $j=count($t); ++$i<$j;){ 
+  $r = ''; list($e, $r) = explode('>', $t[$i]); 
+  $x = $e[0] == '/' ? 0 : (substr($e, -1) == '/' ? 1 : ($e[0] != '!' ? 2 : -1)); 
+  $y = !$x ? ltrim($e, '/') : ($x > 0 ? substr($e, 0, strcspn($e, ' ')) : 0); 
+  $e = "<$e>"; 
+  if(isset($d[$y])){ 
+   if(!$x){ 
+    if($n){echo "\n", str_repeat($s, --$n), "$e\n", str_repeat($s, $n);} 
+    else{++$N; ob_end_clean(); continue 2;} 
+   } 
+   else{echo "\n", str_repeat($s, $n), "$e\n", str_repeat($s, ($x != 1 ? ++$n : $n));} 
+   echo $r; continue; 
+  } 
+  $f = "\n". str_repeat($s, $n); 
+  if(isset($c[$y])){ 
+   if(!$x){echo $e, $f, $r;} 
+   else{echo $f, $e, $r;} 
+  }elseif(isset($b[$y])){echo $f, $e, $r; 
+  }elseif(isset($a[$y])){echo $e, $f, $r; 
+  }elseif(!$y){echo $f, $e, $f, $r; 
+  }else{echo $e, $r;} 
+ } 
+ $X = 0; 
+} 
+$t = str_replace(array("\n ", " \n"), "\n", preg_replace('`[\n]\s*?[\n]+`', "\n", ob_get_contents())); 
+ob_end_clean(); 
+if(($l = strpos(" $w", 'r') ? (strpos(" $w", 'n') ? "\r\n" : "\r") : 0)){ 
+ $t = str_replace("\n", $l, $t); 
+} 
+return str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05", "\x07"), array('<', '>', "\n", "\r", "\t", ' '), $t); 
+// eof 
+} 
+
+function hl_version(){ 
+// rel 
+return '1.1.18'; 
+// eof 
+} 
+
+function kses($t, $h, $p=array('http', 'https', 'ftp', 'news', 'nntp', 'telnet', 'gopher', 'mailto')){ 
+// kses compat 
+foreach($h as $k=>$v){ 
+ $h[$k]['n']['*'] = 1; 
+} 
+$C['cdata'] = $C['comment'] = $C['make_tag_strict'] = $C['no_deprecated_attr'] = $C['unique_ids'] = 0; 
+$C['keep_bad'] = 1; 
+$C['elements'] = count($h) ? strtolower(implode(',', array_keys($h))) : '-*'; 
+$C['hook'] = 'kses_hook'; 
+$C['schemes'] = '*:'. implode(',', $p); 
+return htmLawed($t, $C, $h); 
+// eof 
+} 
+
+function kses_hook($t, &$C, &$S){ 
+// kses compat 
+return $t; 
+// eof 
+}
diff --git a/html/inc/kses.php b/html/inc/kses.php
deleted file mode 100644
index 9d0c225..0000000
--- a/html/inc/kses.php
+++ /dev/null
@@ -1,517 +0,0 @@
-<?php
-
-// Modified (by BOINC) to work with PHP 4.2.3:
-// - add array_lookup() to avoid undefined array refs
-// - reorder functions to get fix compile errors
-
-# kses 0.2.0 - HTML/XHTML filter that only allows some elements and attributes
-# Copyright (C) 2002, 2003  Ulf Harnhammar
-#
-# This program is free software and open source software; you can redistribute
-# it and/or modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of the License,
-# or (at your option) any later version.
-#
-# This program 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 General Public License for
-# more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA  or visit
-# http://www.gnu.org/licenses/gpl.html
-#
-# *** CONTACT INFORMATION ***
-#
-# E-mail:      metaur at users dot sourceforge dot net
-# Web page:    http://sourceforge.net/projects/kses
-# Paper mail:  (not at the moment)
-
-
-function kses_no_null($string)
-###############################################################################
-# This function removes any NULL characters in $string.
-###############################################################################
-{
-  $string = preg_replace('/\0+/', '', $string);
-  $string = preg_replace('/(\\\\0)+/', '', $string);
-  return $string;
-} # function kses_no_null
-
-
-function kses_stripslashes($string)
-###############################################################################
-# This function changes the character sequence  \"  to just  "
-# It leaves all other slashes alone. It's really weird, but the quoting from
-# preg_replace(//e) seems to require this.
-###############################################################################
-{
-  return preg_replace('%\\\\"%', '"', $string);
-} # function kses_stripslashes
-
-
-function kses_array_lc($inarray)
-###############################################################################
-# This function goes through an array, and changes the keys to all lower case.
-###############################################################################
-{
-  $outarray = array();
-
-  foreach ($inarray as $inkey => $inval)
-  {
-    $outkey = strtolower($inkey);
-    $outarray[$outkey] = array();
-
-    foreach ($inval as $inkey2 => $inval2)
-    {
-      $outkey2 = strtolower($inkey2);
-      $outarray[$outkey][$outkey2] = $inval2;
-    } # foreach $inval
-  } # foreach $inarray
-
-  return $outarray;
-} # function kses_array_lc
-
-
-function kses_js_entities($string)
-###############################################################################
-# This function removes the HTML JavaScript entities found in early versions of
-# Netscape 4.
-###############################################################################
-{
-  return preg_replace('%&\s*\{[^}]*(\}\s*;?|$)%', '', $string);
-} # function kses_js_entities
-
-
-function kses_html_error($string)
-###############################################################################
-# This function deals with parsing errors in kses_hair(). The general plan is
-# to remove everything to and including some whitespace, but it deals with
-# quotes and apostrophes as well.
-###############################################################################
-{
-  return preg_replace('/^("[^"]*("|$)|\'[^\']*(\'|$)|\S)*\s*/', '', $string);
-} # function kses_html_error
-
-
-function kses_bad_protocol_once($string, $allowed_protocols)
-###############################################################################
-# This function searches for URL protocols at the beginning of $string, while
-# handling whitespace and HTML entities.
-###############################################################################
-{
-  $string = preg_replace('/^((&[^;]*;|[\sA-Za-z0-9])*)'.
-                         '(:|:|&#[Xx]3[Aa];)\s*/e',
-                         'kses_bad_protocol_once2("\\1", $allowed_protocols)',
-                         $string);
-  return $string;
-} # function kses_bad_protocol_once
-
-
-function kses_bad_protocol_once2($string, $allowed_protocols)
-###############################################################################
-# This function processes URL protocols, checks to see if they're in the white
-# list or not, and returns different data depending on the answer.
-###############################################################################
-{
-  $string2 = preg_replace('/\s/', '', $string);
-  $string2 = kses_decode_entities($string2);
-  $string2 = kses_no_null($string2);
-  $string2 = strtolower($string2);
-
-  $allowed = false;
-  foreach ($allowed_protocols as $one_protocol)
-    if (strtolower($one_protocol) == $string2)
-    {
-      $allowed = true;
-      break;
-    }
-
-  if ($allowed)
-    return "$string2:";
-  else
-    return '';
-} # function kses_bad_protocol_once2
-
-
-function kses_normalize_entities($string)
-###############################################################################
-# This function normalizes HTML entities. It will convert "AT&T" to the correct
-# "AT&T", ":" to ":", "&#XYZZY;" to "&#XYZZY;" and so on.
-###############################################################################
-{
-# Disarm all entities by converting & to &
-
-  $string = str_replace('&', '&', $string);
-
-# Change back the allowed entities in our entity white list
-
-  $string = preg_replace('/&([A-Za-z][A-Za-z0-9]{0,19});/',
-                         '&\\1;', $string);
-  $string = preg_replace('/&#0*([0-9]{1,5});/e',
-                         'kses_normalize_entities2("\\1")', $string);
-  $string = preg_replace('/&#([Xx])0*(([0-9A-Fa-f]{2}){1,2});/',
-                         '&#\\1\\2;', $string);
-
-  return $string;
-} # function kses_normalize_entities
-
-
-function kses_normalize_entities2($i)
-###############################################################################
-# This function helps kses_normalize_entities() to only accept 16 bit values
-# and nothing more for &#number; entities.
-###############################################################################
-{
-  return (($i > 65535) ? "&#$i;" : "&#$i;");
-} # function kses_normalize_entities2
-
-
-function kses_decode_entities($string)
-###############################################################################
-# This function decodes numeric HTML entities (A and &#x41;). It doesn't
-# do anything with other entities like ä, but we don't need them in the
-# URL protocol white listing system anyway.
-###############################################################################
-{
-  $string = preg_replace('/&#([0-9]+);/e', 'chr("\\1")', $string);
-  $string = preg_replace('/&#[Xx]([0-9A-Fa-f]+);/e', 'chr(hexdec("\\1"))',
-                         $string);
-
-  return $string;
-} # function kses_decode_entities
-
-
-
-function kses_hook($string)
-###############################################################################
-# You add any kses hooks here.
-###############################################################################
-{
-  return $string;
-} # function kses_hook
-
-
-function kses_version()
-###############################################################################
-# This function returns kses' version number.
-###############################################################################
-{
-  return '0.2.0';
-} # function kses_version
-
-function array_lookup($arr, $key) {
-    if (!array_key_exists($key, $arr)) return null;
-    return $arr[$key];
-}
-
-function kses_split2($string, $allowed_html, $allowed_protocols)
-###############################################################################
-# This function does a lot of work. It rejects some very malformed things
-# like <:::>. It returns an empty string, if the element isn't allowed (look
-# ma, no strip_tags()!). Otherwise it splits the tag into an element and an
-# attribute list.
-###############################################################################
-{
-  $string = kses_stripslashes($string);
-
-  if (substr($string, 0, 1) != '<')
-    return '>';
-    # It matched a ">" character
-
-  if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches))
-    return '';
-    # It's seriously malformed
-
-  $slash = trim($matches[1]);
-  $elem = $matches[2];
-  $attrlist = $matches[3];
-
-  $x = strtolower($elem);
-  $y = array_lookup($allowed_html, $x);
-  if (!is_array($y))
-    return '';
-    # They are using a not allowed HTML element
-
-  return kses_attr("$slash$elem", $attrlist, $allowed_html,
-                   $allowed_protocols);
-} # function kses_split2
-
-
-function kses_split($string, $allowed_html, $allowed_protocols)
-###############################################################################
-# This function searches for HTML tags, no matter how malformed. It also
-# matches stray ">" characters.
-###############################################################################
-{
-  return preg_replace('%(<'.   # EITHER: <
-                      '[^>]*'. # things that aren't >
-                      '(>|$)'. # > or end of string
-                      '|>)%e', # OR: just a >
-                      "kses_split2('\\1', \$allowed_html, ".
-                      '$allowed_protocols)',
-                      $string);
-} # function kses_split
-
-
-
-function kses_attr($element, $attr, $allowed_html, $allowed_protocols)
-###############################################################################
-# This function removes all attributes, if none are allowed for this element.
-# If some are allowed it calls kses_hair() to split them further, and then it
-# builds up new HTML code from the data that kses_hair() returns. It also
-# removes "<" and ">" characters, if there are any left. One more thing it
-# does is to check if the tag has a closing XHTML slash, and if it does,
-# it puts one in the returned code as well.
-###############################################################################
-{
-# Is there a closing XHTML slash at the end of the attributes?
-
-  $xhtml_slash = '';
-  if (preg_match('%\s/\s*$%', $attr))
-    $xhtml_slash = ' /';
-
-# Are any attributes allowed at all for this element?
-
-  $x = array_lookup($allowed_html, strtolower($element));
-  if (count($x) == 0)
-    return "<$element$xhtml_slash>";
-
-# Split it
-
-  $attrarr = kses_hair($attr, $allowed_protocols);
-
-# Go through $attrarr, and save the allowed attributes for this element
-# in $attr2
-
-  $attr2 = '';
-
-  foreach ($attrarr as $arreach)
-  {
-    $current = array_lookup($allowed_html[strtolower($element)],
-                            strtolower($arreach['name']));
-    if ($current == '')
-      continue; # the attribute is not allowed
-
-    if (!is_array($current))
-      $attr2 .= ' '.$arreach['whole'];
-    # there are no checks
-
-    else
-    {
-    # there are some checks
-      $ok = true;
-      foreach ($current as $currkey => $currval)
-        if (!kses_check_attr_val($arreach['value'], $currkey, $currval))
-        { $ok = false; break; }
-
-      if ($ok)
-        $attr2 .= ' '.$arreach['whole']; # it passed them
-    } # if !is_array($current)
-  } # foreach
-
-# Remove any "<" or ">" characters
-
-  $attr2 = preg_replace('/[<>]/', '', $attr2);
-
-  return "<$element$attr2$xhtml_slash>";
-} # function kses_attr
-
-
-function kses_hair($attr, $allowed_protocols)
-###############################################################################
-# This function does a lot of work. It parses an attribute list into an array
-# with attribute data, and tries to do the right thing even if it gets weird
-# input. It will add quotes around attribute values that don't have any quotes
-# or apostrophes around them, to make it easier to produce HTML code that will
-# conform to W3C's HTML specification. It will also remove bad URL protocols
-# from attribute values.
-###############################################################################
-{
-  $attrarr = array();
-  $mode = 0;
-  $attrname = '';
-
-# Loop through the whole attribute list
-
-  while (strlen($attr) != 0)
-  {
-    $working = 0; # Was the last operation successful?
-
-    switch ($mode)
-    {
-      case 0: # attribute name, href for instance
-
-        if (preg_match('/^([-a-zA-Z]+)/', $attr, $match))
-        {
-          $attrname = $match[1];
-          $working = $mode = 1;
-          $attr = preg_replace('/^[-a-zA-Z]+/', '', $attr);
-        }
-
-        break;
-
-      case 1: # equals sign or just empty ("selected")
-
-        if (preg_match('/^\s*=\s*/', $attr)) # equals sign
-        {
-          $working = 1; $mode = 2;
-          $attr = preg_replace('/^\s*=\s*/', '', $attr);
-          break;
-        }
-
-        if (preg_match('/^\s+/', $attr)) # just empty
-        {
-          $working = 1; $mode = 0;
-          $attrarr[] = array
-                        ('name'  => $attrname,
-                         'value' => '',
-                         'whole' => $attrname);
-          $attr = preg_replace('/^\s+/', '', $attr);
-        }
-
-        break;
-
-      case 2: # attribute value, a URL after href= for instance
-
-        if (preg_match('/^"([^"]*)"(\s+|$)/', $attr, $match))
-         # "value"
-        {
-          $thisval = kses_bad_protocol($match[1], $allowed_protocols);
-
-          $attrarr[] = array
-                        ('name'  => $attrname,
-                         'value' => $thisval,
-                         'whole' => "$attrname=\"$thisval\"");
-          $working = 1; $mode = 0;
-          $attr = preg_replace('/^"[^"]*"(\s+|$)/', '', $attr);
-          break;
-        }
-
-        if (preg_match("/^'([^']*)'(\s+|$)/", $attr, $match))
-         # 'value'
-        {
-          $thisval = kses_bad_protocol($match[1], $allowed_protocols);
-
-          $attrarr[] = array
-                        ('name'  => $attrname,
-                         'value' => $thisval,
-                         'whole' => "$attrname='$thisval'");
-          $working = 1; $mode = 0;
-          $attr = preg_replace("/^'[^']*'(\s+|$)/", '', $attr);
-          break;
-        }
-
-        if (preg_match("%^([^\s\"']+)(\s+|$)%", $attr, $match))
-         # value
-        {
-          $thisval = kses_bad_protocol($match[1], $allowed_protocols);
-
-          $attrarr[] = array
-                        ('name'  => $attrname,
-                         'value' => $thisval,
-                         'whole' => "$attrname=\"$thisval\"");
-                         # We add quotes to conform to W3C's HTML spec.
-          $working = 1; $mode = 0;
-          $attr = preg_replace("%^[^\s\"']+(\s+|$)%", '', $attr);
-        }
-
-        break;
-    } # switch
-
-    if ($working == 0) # not well formed, remove and try again
-    {
-      $attr = kses_html_error($attr);
-      $mode = 0;
-    }
-  } # while
-
-  if ($mode == 1)
-  # special case, for when the attribute list ends with a valueless
-  # attribute like "selected"
-    $attrarr[] = array
-                  ('name'  => $attrname,
-                   'value' => '',
-                   'whole' => $attrname);
-
-  return $attrarr;
-} # function kses_hair
-
-
-function kses_check_attr_val($value, $checkname, $checkvalue)
-###############################################################################
-# This function performs different checks for attribute values. The currently
-# implemented checks are "maxlen" and "maxval".
-###############################################################################
-{
-  $ok = true;
-
-  switch (strtolower($checkname))
-  {
-    case 'maxlen':
-    # The maxlen check makes sure that the attribute value has a length not
-    # greater than the given value. This can be used to avoid Buffer Overflows
-    # in WWW clients and various Internet servers.
-
-      if (strlen($value) > $checkvalue)
-        $ok = false;
-      break;
-
-    case 'maxval':
-    # The maxval check does two things: it checks that the attribute value is
-    # an integer from 0 and up, without an excessive amount of zeroes or
-    # whitespace (to avoid Buffer Overflows). It also checks that the attribute
-    # value is not greater than the given value.
-    # This check can be used to avoid Denial of Service attacks.
-
-      if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
-        $ok = false;
-      if ($value > $checkvalue)
-        $ok = false;
-      break;
-  } # switch
-
-  return $ok;
-} # function kses_check_attr_val
-
-
-function kses_bad_protocol($string, $allowed_protocols)
-###############################################################################
-# This function removes all non-allowed protocols from the beginning of
-# $string. It ignores whitespace and the case of the letters, and it does
-# understand HTML entities. It does its work in a while loop, so it won't be
-# fooled by a string like "javascript:javascript:alert(57)".
-###############################################################################
-{
-  $string = kses_no_null($string);
-  $string2 = $string.'a';
-
-  while ($string != $string2)
-  {
-    $string2 = $string;
-    $string = kses_bad_protocol_once($string, $allowed_protocols);
-  } # while
-
-  return $string;
-} # function kses_bad_protocol
-
-function kses($string, $allowed_html, $allowed_protocols =
-               array('http', 'https', 'ftp', 'news', 'nntp', 'telnet',
-                     'gopher', 'mailto'))
-###############################################################################
-# This function makes sure that only the allowed HTML element names, attribute
-# names and attribute values plus only sane HTML entities will occur in
-# $string. You have to remove any slashes from PHP's magic quotes before you
-# call this function.
-###############################################################################
-{
-  $string = kses_no_null($string);
-  $string = kses_js_entities($string);
-  $string = kses_normalize_entities($string);
-  $string = kses_hook($string);
-  $allowed_html_fixed = kses_array_lc($allowed_html);
-  return kses_split($string, $allowed_html_fixed, $allowed_protocols);
-} # function kses
-
-?>
diff --git a/html/inc/ldap.inc b/html/inc/ldap.inc
new file mode 100644
index 0000000..9540edb
--- /dev/null
+++ b/html/inc/ldap.inc
@@ -0,0 +1,74 @@
+<?php
+
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2014 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/>.
+
+// LDAP authentication.
+// returns (user, error_msg) where user is an object with
+// $user->name
+// $user->email_addr
+//
+// your project.inc must define LDAP_HOST and LDAP_BASE_DN
+//
+function ldap_auth($uid, $passwd) {
+    $ad = @ldap_connect(LDAP_HOST);
+    if (!$ad) {
+        return array(null, "Can't connect to LDAP server");
+    }
+    ldap_set_option($ad, LDAP_OPT_PROTOCOL_VERSION, 3);
+    ldap_set_option($ad, LDAP_OPT_REFERRALS, 0);
+    $rn = "uid=$uid,".LDAP_BASE_DN;
+    $r = @ldap_bind($ad, $rn, $passwd);
+    if (!$r) {
+        return array(null, "Invalid credentials");
+    }
+    $x = ldap_search($ad, $rn, "(objectclass=*)");
+    $x = ldap_get_entries($ad, $x);
+
+    $user = new StdClass;
+    $x = $x[0];
+    $name = $x["cn"];
+    $user->name = $name[0];
+    $email = $x["mail"];
+    $user->email_addr = $email[0];
+    return array($user, null);
+}
+
+// for LDAP-authenticated users, we store LDAP:uid in user.email_addr
+//
+function ldap_email_string($uid) {
+    return "LDAP:$uid";
+}
+
+function is_ldap_email($x) {
+    return (substr($x, 0, 5) == "LDAP:");
+}
+
+function ldap_email_to_uid($x) {
+    return substr($x, 5);
+}
+
+function example_usage() {
+    list($user, $error_msg) = ldap_auth("davea", "xxx");
+    if ($error_msg) {
+        echo "error: $error_msg\n";
+    } else {
+        echo "name: $user->name; email: $user->email_addr\n";
+    }
+}
+
+?>
diff --git a/html/inc/news.inc b/html/inc/news.inc
index 4aea5d8..f18ca56 100644
--- a/html/inc/news.inc
+++ b/html/inc/news.inc
@@ -16,8 +16,6 @@
 // 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("../project/project.inc");
-
 function news_item($date, $title, $post) {
     echo "<p>";
     if ($title) {
@@ -108,12 +106,15 @@ function show_news($start, $count) {
         echo "<a href=".URL_BASE."old_news.php>... more</a>";
     }
     echo "
-        <br><br><p class=\"smalltext\">
+        <br><br><small>
     ";
     printf(tra("News is available as an %sRSS feed%s"),
         "<a href=rss_main.php>",
         "   <img src=\"img/rss_icon.gif\" alt=\"RSS\"></a>"
     );
+    echo "
+        </small>
+    ";
 }
 
 $cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
diff --git a/html/inc/notify.inc b/html/inc/notify.inc
index a047817..da1c14a 100644
--- a/html/inc/notify.inc
+++ b/html/inc/notify.inc
@@ -41,6 +41,10 @@ function show_notify_rss_item($notify) {
         subscribe_rss($notify, $title, $msg, $url);
         break;
     }
+    if (!$msg) {
+        $notify->delete();
+        return;
+    }
 
     $news_date=gmdate('D, d M Y H:i:s',$notify->create_time) . ' GMT';
     echo "<item>
diff --git a/html/inc/pm.inc b/html/inc/pm.inc
index b4f7708..268f6d9 100644
--- a/html/inc/pm.inc
+++ b/html/inc/pm.inc
@@ -72,21 +72,21 @@ function pm_form($replyto, $userid, $error = null) {
     $subject = htmlspecialchars($subject);
     
     if ($error != null) {
-        echo "<div class=\"error\">".$error."</div>\n";
+        echo "<p class=\"text-danger\">".$error."</p>\n";
     }
     
     echo "<form action=\"pm.php\" method=\"post\" name=\"post\" onsubmit=\"return checkForm(this)\">\n";
     echo "<input type=\"hidden\" name=\"action\" value=\"send\">\n";
     echo form_tokens($g_logged_in_user->authenticator);
     start_table();
-    row2(tra("To")."<br /><span class=\"smalltext\">".tra("User IDs or unique usernames, separated with commas")."</span>",
+    row2(tra("To")."<br /><small>".tra("User IDs or unique usernames, separated with commas")."</small>",
         "<input type=\"text\" name=\"to\" value=\"$writeto\" size=\"60\">"
     );
     row2(tra("Subject"), "<input type=\"text\" name=\"subject\" value=\"$subject\" size=\"60\">");
-    row2(tra("Message")."<span class=\"smalltext\">".html_info()."</span>",
-        $bbcode_html."<textarea name=\"content\" rows=\"18\" cols=\"80\">$content</textarea>"
+    row2(tra("Message")."<small>".html_info()."</small>",
+        $bbcode_html."<textarea name=\"content\" class=\"input-block-level\" rows=\"18\" cols=\"80\">$content</textarea>"
     );
-    echo "<tr><td></td><td><input type=\"submit\" name=\"preview\" value=\"".tra("Preview")."\"> <input type=\"submit\" value=\"".tra("Send message")."\"></td></tr>\n";
+    echo "<tr><td></td><td><input class=\"btn btn-default\" type=\"submit\" name=\"preview\" value=\"".tra("Preview")."\"> <input class=\"btn btn-primary\" type=\"submit\" value=\"".tra("Send message")."\"></td></tr>\n";
     end_table();
     
     page_tail();
@@ -118,12 +118,14 @@ Do not reply to this message.
 function pm_email_line($notify) {
     $pm = BoincPrivateMessage::lookup_id($notify->opaque);
     $from_user = BoincUser::lookup_id($pm->senderid);
+    if (!$pm || !$from_user) return null;
     return "$from_user->name ".tra("sent you a private message; subject:")." '$pm->subject'";
 }
 
 function pm_web_line($notify) {
     $pm = BoincPrivateMessage::lookup_id($notify->opaque);
     $from_user = BoincUser::lookup_id($pm->senderid);
+    if (!$pm || !$from_user) return null;
     return "<a href=pm.php>".tra("Private message%1 from %2, subject:" , "</a>", $from_user->name )." $pm->subject";
 }
 
@@ -181,12 +183,12 @@ function pm_notification($user) {
 
 function pm_email_remind($user) {
     if (!$user->prefs->pm_notification) {
-        return '<br><span class="note">' .
+        return "<br><p class=\"text-muted\">" .
             tra(
                 "For email notification, %1edit community prefs%2",
                 '<a href="edit_forum_preferences_form.php">', '</a>'
             ) .
-            '</span>'
+            "</p>"
         ;
     }
     return "";
@@ -195,6 +197,10 @@ function pm_email_remind($user) {
 function pm_rss($notify, &$title, &$msg, &$url) {
     $pm = BoincPrivateMessage::lookup_id($notify->opaque);
     $from_user = BoincUser::lookup_id($pm->senderid);
+    if (!$pm || !$from_user) {
+        $msg = null;
+        return;
+    }
     $title = tra("Private message");
     $msg = "You have received a <a href=".URL_BASE."pm.php>private message</a>.";
     $url = URL_BASE."pm.php";
diff --git a/html/inc/prefs.inc b/html/inc/prefs.inc
index 8cab4ae..8240e85 100644
--- a/html/inc/prefs.inc
+++ b/html/inc/prefs.inc
@@ -1,7 +1,7 @@
 <?php
 // This file is part of BOINC.
 // http://boinc.berkeley.edu
-// Copyright (C) 2010 University of California
+// Copyright (C) 2014 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
@@ -17,12 +17,10 @@
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
 
-// This file contains support functions for display and editing
-// preferences (global and project).
+// functions for display and editing global preferences.
 // Preferences are represented in two ways:
 // - As a PHP structure (usually called $prefs)
 //   This has fields run_if_user_active, etc.
-//   The fields "project_specific" is plain XML
 // - As XML (usually called $prefs_xml)
 //
 // This XML has the general structure
@@ -37,356 +35,207 @@
 //    </venue>
 // </global_preferences>
 //
-// and
-//
-// <project_preferences>
-//    <resource_share>4</resource_share>
-//    [ <allow_beta_work>0|1</allow_beta_work> ]
-//    [ <no_cpu>1</no_cpu> ]
-//    [ <no_cuda>1</no_cuda> ]
-//    [ <no_ati>1</no_ati> ]
-//    [ <no_intel_gpu>1</no_intel_gpu> ]
-//    <project-specific>
-//            ... (arbitrary project-specific XML)
-//    </project-specific>
-//    <home>
-//       ...
-//    </home>
-// </project_preferences>
-//
-// In addition there are some fields of the user table
-// (send_email and show_hosts) that are treated as project preferences
 
 // Various functions are defined below for converting between these forms,
 // and also to/from HTML form elements
 
-error_reporting(E_ALL);
-ini_set('display_errors', true);
-ini_set('display_startup_errors', true);
-
 include_once("../inc/prefs_util.inc");
-include_once("../project/project_specific_prefs.inc");
-
-$app_types = get_app_types();
-
-$venues = array("home", "school", "work");
 
 $cpu_prefs = array(
+    tra("Usage limits"),
+    new PREF_NUM(
+        tra("Use at most"),
+        // xgettext:no-php-format
+        tra("Keep some CPUs free for other applications. Example: 75% means use 6 cores on an 8-core CPU."),
+        "max_ncpus_pct",
+        // xgettext:no-php-format
+        new NUM_SPEC(tra("% of the CPUs"), 1, 100, 100)
+    ),
+    new PREF_NUM(
+        tra("Use at most"),
+        // xgettext:no-php-format
+        tra("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."),
+        "cpu_usage_limit",
+        // xgettext:no-php-format
+        new NUM_SPEC(tra("% of CPU time"), 1, 100, 100)
+    ),
+    tra("When to suspend"),
     new PREF_BOOL(
-        tra(
-            "Suspend work while computer is on battery power? %1 Matters only for portable computers %2",
-            "<br><span class=note>",
-            "</span>"
-        ),
+        tra("Suspend when computer is on battery"),
+        tra("Check this to suspend computing on portables when running on battery power."),
         "run_on_batteries",
         false, true
     ),
     new PREF_BOOL(
-        tra("Suspend work while computer is in use?"),
+        tra("Suspend when computer is in use"),
+        tra("Check this to suspend computing and file transfers when you're using the computer."),
         "run_if_user_active",
         true, true
     ),
     new PREF_BOOL(
-        tra(
-            "Suspend GPU work while computer is in use? %1 Enforced by version 6.6.21+ %2",
-            "<br><span class=note>",
-            "</span>"
-        ),
+        tra("Suspend GPU computing when computer is in use"),
+        tra("Check this to suspend GPU computing when you're using the computer."),
         "run_gpu_if_user_active",
         false, true
     ),
     new PREF_NUM(
-        tra("'In use' means mouse/keyboard activity in last"),
+        tra("'In use' means mouse/keyboard input in last"),
+        tra("This determines when the computer is considered 'in use'."),
         "idle_time_to_run",
-        new NUM_SPEC(tra("minutes"), 1, 9999, 3)
+        new NUM_SPEC(tra("minutes"), 1, 9999, 3),
+        true
     ),
-    new PREF_NUM(
-        tra(
-            "Suspend work if no mouse/keyboard activity in last %1 Needed to enter low-power mode on some computers %2",
-            "<br><span class=note>",
-            "</span>"
-        ),
+    new PREF_OPT_NUM(
+        tra("Suspend when no mouse/keyboard input in last"),
+        tra("This allows some computers to enter low-power mode when not in use."),
         "suspend_if_no_recent_input",
-        new NUM_SPEC(tra("minutes"), 0, 9999, 0)
+        new NUM_SPEC(tra("minutes"), 0, 9999, 0, 1, 60)
     ),
-    new PREF_NUM(
-        tra(
-            "Suspend work when non-BOINC CPU usage is above %1 0 means no restriction<br>Enforced by version 6.10.30+ %2",
-            "<br><span class=note>",
-            "</span>"
-        ),
+    new PREF_OPT_NUM(
+        tra("Suspend when non-BOINC CPU usage is above"),
+        tra("Suspend computing when your computer is busy running other programs."),
         "suspend_cpu_usage",
         new NUM_SPEC("%", 0, 100, 25)
     ),
     new PREF_HOUR_RANGE(
-        tra("Do work only between the hours of %1 No restriction if equal %2",
-            "<br><span class=note>",
-            "</span>"
-        ),
+        tra("Compute only between"),
+        tra("Compute only during a particular period each day."),
         "start_hour", "end_hour"
     ),
-    new PREF_BOOL(
-        tra(
-            "Leave tasks in memory while suspended? %1 Suspended tasks will consume swap space if 'yes' %2",
-            "<br><span class=note>",
-            "</span>"
-        ),
-        "leave_apps_in_memory",
-        false
-    ),
+    tra("Other"),
     new PREF_NUM(
-        tra(
-            "Switch between tasks every %1 Recommended: 60 minutes %2",
-            "<br><span class=note>",
-            "</span>"
-        ),
-        "cpu_scheduling_period_minutes",
-        new NUM_SPEC(tra("minutes"), 1, 9999, 60)
+        tra("Store at least"),
+        tra("Store at least enough tasks to keep the computer busy for this long."),
+        "work_buf_min_days",
+        new NUM_SPEC(tra("days of work"), 0, 10, .1)
     ),
     new PREF_NUM(
-        tra("On multiprocessors, use at most"),
-        "max_cpus",
-        new NUM_SPEC(tra("processors"), 0, 9999, 0)
+        tra("Store up to an additional"),
+        tra("Store additional tasks above the minimum level.  Determines how much work is requested when contacting a project."),
+        "work_buf_additional_days",
+        new NUM_SPEC(tra("days of work"), 0, 10, .5)
     ),
     new PREF_NUM(
-        tra(
-            "On multiprocessors, use at most %1 Enforced by version 6.1+ %2",
-            "<br><span class=note>",
-            "</span>"
-        ),
-        "max_ncpus_pct",
-        new NUM_SPEC(tra("% of the processors"), 0, 100, 100)
+        tra("Switch between tasks about every"),
+        tra("If you run several projects, BOINC may switch between them this often."),
+        "cpu_scheduling_period_minutes",
+        new NUM_SPEC(tra("minutes"), 1, 9999, 60)
     ),
     new PREF_NUM(
-        tra(
-            "Use at most %1 Can be used to reduce CPU heat %2",
-            "<br><span class=note>",
-            "</span>"
-        ),
-        "cpu_usage_limit",
-        new NUM_SPEC(tra("% of CPU time"), 0, 100, 100)
+        tra("Request tasks to checkpoint at most every"),
+        tra("This controls how often tasks save their state to disk, so that they can be restarted later."),
+        "disk_interval",
+        new NUM_SPEC(tra("seconds"), 0, 9999999, 60)
     ),
 );
 
 $dp = get_disk_space_config();
 
 $disk_prefs = array(
-    new PREF_NUM(
-        tra("Disk: use at most"),
+    new PREF_OPT_NUM(
+        tra("Use no more than"),
+        tra("Limit the total amount of disk space used by BOINC."),
         "disk_max_used_gb",
-        new NUM_SPEC(tra("GB"), 0, 9999999, $dp->disk_max_used_gb)
+        new NUM_SPEC(tra("GB"), 0, 9999999, $dp->disk_max_used_gb, 1, 100)
     ),
-    new PREF_NUM(
-        tra("Disk: leave free at least %1 Values smaller than %2 are ignored %3",
-            "<br><span class=note>",
-            "0.001",
-            "</span>"
-        ),
+    new PREF_OPT_NUM(
+        tra("Leave at least"),
+        tra("Limit disk usage to leave this much free space on the volume where BOINC stores data."),
         "disk_min_free_gb",
-        new NUM_SPEC(tra("GB"), 0.001, 9999999, $dp->disk_min_free_gb)
+        new NUM_SPEC(tra("GB free"), 0, 9999999, $dp->disk_min_free_gb, 1, 1)
     ),
-    new PREF_NUM(
-        tra("Disk: use at most"),
+    new PREF_OPT_NUM(
+        tra("Use no more than"),
+        tra("Limit the percentage of disk space used by BOINC on the volume where it stores data."),
         "disk_max_used_pct",
+        // xgettext:no-php-format
         new NUM_SPEC(tra("% of total"), 0, 100, $dp->disk_max_used_pct)
     ),
-    new PREF_NUM(
-        tra("Tasks checkpoint to disk at most every"),
-        "disk_interval",
-        new NUM_SPEC(tra("seconds"), 0, 9999999, 60)
-    ),
-    new PREF_NUM(
-        tra("Swap space: use at most"),
-        "vm_max_used_pct",
-        new NUM_SPEC(tra("% of total"), 0, 100, 75)
-    ),
-    new PREF_NUM(
-        tra("Memory: when computer is in use, use at most"),
-        "ram_max_used_busy_pct",
-        new NUM_SPEC(tra("% of total"), 0, 100, 50)
-    ),
-    new PREF_NUM(
-        tra("Memory: when computer is not in use, use at most"),
-        "ram_max_used_idle_pct",
-        new NUM_SPEC(tra("% of total"), 0, 100, 90)
-    ),
 );
 
-$net_prefs = array(
+$mem_prefs = array(
     new PREF_NUM(
-        tra(
-            "Maintain enough tasks to keep busy for at least%1(max 10 days).%2",
-            "<br><span class=note>",
-            "</span>"
-        ),
-        "work_buf_min_days",
-        new NUM_SPEC(tra("days"), 0, 10, .1)
+        tra("When computer is in use, use at most"),
+        tra("Limit the memory used by BOINC when you're using the computer."),
+        "ram_max_used_busy_pct",
+        // xgettext:no-php-format
+        new NUM_SPEC(tra("%"), 1, 100, 50)
     ),
     new PREF_NUM(
-        tra("... and up to an additional"),
-        "work_buf_additional_days",
-        new NUM_SPEC(tra("days"), 0, 10, .5)
-    ),
-    new PREF_BOOL(
-        tra(
-            "Confirm before connecting to Internet? %1 Matters only if you have a modem, ISDN or VPN connection %2",
-            "<br><span class=note>",
-            "</span>"
-        ),
-        "confirm_before_connecting",
-        false
+        tra("When computer is not in use, use at most"),
+        tra("Limit the memory used by BOINC when you're not using the computer."),
+        "ram_max_used_idle_pct",
+        // xgettext:no-php-format
+        new NUM_SPEC(tra("%"), 1, 100, 90)
     ),
     new PREF_BOOL(
-        tra(
-            "Disconnect when done? %1 Matters only if you have a modem, ISDN or VPN connection %2",
-            "<br><span class=note>",
-            "</span>"
-        ),
-        "hangup_if_dialed",
+        tra("Leave non-GPU tasks in memory while suspended"),
+        tra("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."),
+        "leave_apps_in_memory",
         false
     ),
     new PREF_NUM(
-        tra("Maximum download rate:"),
+        tra("Page/swap file: use at most"),
+        tra("Limit the swap space (page file) used by BOINC."),
+        "vm_max_used_pct",
+        // xgettext:no-php-format
+        new NUM_SPEC(tra("%"), 1, 100, 75)
+    ),
+);
+
+$net_prefs = array(
+    tra("Usage limits"),
+    new PREF_OPT_NUM(
+        tra("Limit download rate to"),
+        tra("Limit the download rate of file transfers."),
         "max_bytes_sec_down",
-        new NUM_SPEC(tra("Kbytes/sec"), 0, 9999999, 0, 1000)
+        new NUM_SPEC(tra("KB/second"), 0, 9999999, 0, 1000, 100)
     ),
-    new PREF_NUM(
-        tra("Maximum upload rate:"),
+    new PREF_OPT_NUM(
+        tra("Limit upload rate to"),
+        tra("Limit the upload rate of file transfers."),
         "max_bytes_sec_up",
-        new NUM_SPEC(tra("Kbytes/sec"), 0, 9999999, 0, 1000)
-    ),
-    new PREF_HOUR_RANGE(
-        tra("Use network only between the hours of"),
-        "net_start_hour", "net_end_hour"
+        new NUM_SPEC(tra("KB/second"), 0, 9999999, 0, 1000, 100)
     ),
     new PREF_NUM2(
-        tra("Transfer at most %1 Enforced by version 6.10.46+ %2",
-            "<br><span class=note>",
-            "</span>"
-        ),
+        tra("Limit usage to"),
+        tra("Example: BOINC should transfer at most 2000 MB of data every 30 days."),
         "daily_xfer_limit_mb",
         "daily_xfer_period_days",
-        new NUM_SPEC(tra("Mbytes every"), 0, 9999999, 0),
-        new NUM_SPEC(tra("days"), 0, 9999999, 0)
+        new NUM_SPEC(tra("MB every"), 0, 9999999, 0, 1, 10000),
+        new NUM_SPEC(tra("days"), 0, 9999999, 0, 1, 30)
+    ),
+    tra("When to suspend"),
+    new PREF_HOUR_RANGE(
+        tra("Transfer files only between"),
+        tra("Transfer files only during a particular period each day."),
+        "net_start_hour", "net_end_hour"
     ),
+    tra("Other"),
     new PREF_BOOL(
-        tra(
-            "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",
-            "<br><span class=note>",
-            "",
-            "</span>"
-        ),
+        tra("Skip data verification for image files"),
+        tra("Check this only if your Internet provider modifies image files. Skipping verification reduces the security of BOINC."),
         "dont_verify_images",
         false
     ),
-);
-
-$project_pref_descs = array(
-    new PREF_NUM(
-        $x = tra(
-            "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",
-            "<br><span class=note>",
-            "</span>"
-        ),
-        "resource_share",
-        new NUM_SPEC("", 0, 9999999, 100)
-    ),
-);
-
-if (isset($accelerate_gpu_apps_pref) && $accelerate_gpu_apps_pref) {
-    $project_pref_descs[] = new PREF_BOOL(
-        tra("Accelerate GPU tasks by dedicating a CPU to each one?"),
-        "accelerate_gpu_apps",
-        false
-    );
-}
-
-//if ($app_types->count > 1) {
-    if ($app_types->cpu) {
-        $project_pref_descs[] = new PREF_BOOL (
-            tra(
-                "Use CPU %1 Enforced by version 6.10+ %2",
-                "<br><span class=note>",
-                "</span>"
-            ),
-            "no_cpu",
-            false,
-            true
-        );
-    }
-    if ($app_types->ati) {
-        $project_pref_descs[] = new PREF_BOOL (
-            tra(
-                "Use ATI GPU %1 Enforced by version 6.10+ %2",
-                "<br><span class=note>",
-                "</span>"
-            ),
-            "no_ati",
-            false,
-            true
-        );
-    }
-    if ($app_types->cuda) {
-        $project_pref_descs[] = new PREF_BOOL (
-            tra(
-                "Use NVIDIA GPU %1 Enforced by version 6.10+ %2",
-                "<br><span class=note>",
-                "</span>"
-            ),
-            "no_cuda",
-            false,
-            true
-        );
-    }
-    if ($app_types->intel_gpu) {
-        $project_pref_descs[] = new PREF_BOOL (
-            tra(
-                "Use Intel GPU %1 Enforced by version 7.2+ %2",
-                "<br><span class=note>",
-                "</span>"
-            ),
-            "no_intel_gpu",
-            false,
-            true
-        );
-    }
-//}
-
-if (isset($project_has_beta) && $project_has_beta) {
-    $project_pref_descs[] = new PREF_BOOL(
-        tra(
-            "Run test applications? %1 This helps us develop applications, but may cause jobs to fail on your computer %2",
-            "<br><span class=note>",
-            "</span>"
-        ),
-        "allow_beta_work",
-        false
-    );
-}
-if (defined("EMAIL_FROM")) {
-    $x = "<br><span class=note>".tra("Emails will be sent from %1; make sure your spam filter accepts this address.", EMAIL_FROM)."</span>";
-} else {
-    $x = "";
-}
-
-$privacy_pref_descs = array (
     new PREF_BOOL(
-        tra("Is it OK for %1 and your team (if any) to email you?", PROJECT).$x,
-        "send_email",
-        true,
+        tra("Confirm before connecting to Internet"),
+        tra("Useful only if you have a modem, ISDN or VPN connection."),
+        "confirm_before_connecting",
         false
     ),
     new PREF_BOOL(
-        tra("Should %1 show your computers on its web site?", PROJECT),
-        "show_hosts",
-        true,
+        tra("Disconnect when done"),
+        tra("Useful only if you have a modem, ISDN or VPN connection."),
+        "hangup_if_dialed",
         false
     ),
 );
 
-define("DISK_LIMIT_DESC", tra("Disk and memory usage"));
-define("CPU_LIMIT_DESC", tra("Processor usage"));
-define("NETWORK_LIMIT_DESC", tra("Network usage"));
+define("CPU_LIMIT_DESC", tra("Computing"));
+define("DISK_LIMIT_DESC", tra("Disk"));
+define("MEM_LIMIT_DESC", tra("Memory"));
+define("NETWORK_LIMIT_DESC", tra("Network"));
 
 // These texts are used in multiple places in prefs_edit.php and add_venue.php
 define("PREFS_FORM_DESC1", tra("These preferences apply to all the BOINC projects in which you participate.")."<br><br>");
@@ -402,7 +251,6 @@ define("PREFS_FORM_ERROR_DESC",
 global $text;
 global $parse_result;
 global $top_parse_result;
-global $in_project_specific;
 global $venue_name;
 
 // get default settings for disk space usage so the default user
@@ -415,7 +263,7 @@ global $venue_name;
 // in config.xml so the right default is set for minimum free disk space
 // 
 function get_disk_space_config() {
-    global  $config;
+    global $config;
     $config = get_config();
     $dp = new StdClass;
     $dp->disk_max_used_gb = parse_config($config, "<default_disk_max_used_gb>");
@@ -424,7 +272,7 @@ function get_disk_space_config() {
     // set some defaults if not found
     if (!$dp->disk_max_used_gb) $dp->disk_max_used_gb = 0;  // no limit
     if (!$dp->disk_max_used_pct) $dp->disk_max_used_pct = 90; // 90 percent
-    if (!$dp->disk_min_free_gb) $dp->disk_min_free_gb=.1;   // 100 MB
+    if (!$dp->disk_min_free_gb) $dp->disk_min_free_gb = 1;   // 1 GB
     // set mininimum free space scheduler allows 
     // - depends on which scheduler is running
     $dp->new_sched_flag = 1;
@@ -437,47 +285,12 @@ function get_disk_space_config() {
     return $dp;
 }
 
-function check_venue($x) {
-    if ($x == "") return;
-    if ($x == "home") return;
-    if ($x == "work") return;
-    if ($x == "school") return;
-    error_page(tra("bad venue: %1", $x));
-}
-
-function check_subset($x) {
-    if ($x == "global") return;
-    if ($x == "project") return;
-    error_page(tra("bad subset: %1", $x));
+function group_header($t) {
+    echo "<tr><th class=subheading>$t</th><td colspan=4><br></td></tr>\n";
 }
 
 // functions to parse preferences XML into a struct
 //
-function element_start_project($parser, $name, $attrs) {
-    global $top_parse_result;
-    global $parse_result;
-    global $text;
-    global $in_project_specific;
-    global $venue_name;
-
-    switch($name) {
-    case "venue":
-        $venue_name = $attrs["name"];
-        $top_parse_result = $parse_result;
-        $parse_result = default_prefs_project();
-        break;
-    case "project_specific":
-        $in_project_specific = 1;
-        $text = "";
-        break;
-    default:
-        if ($in_project_specific) {
-            $text= $text."<$name>";
-        } else {
-            $text = "";
-        }
-    }
-}
 
 function element_start_global($parser, $name, $attrs) {
     global $top_parse_result;
@@ -495,39 +308,6 @@ function element_start_global($parser, $name, $attrs) {
     $text = "";
 }
 
-function element_end_project($parser, $name) {
-    global $text;
-    global $parse_result;
-    global $in_project_specific;
-    global $top_parse_result;
-    global $venue_name;
-    global $project_pref_descs;
-
-    foreach($project_pref_descs as $p) {
-        if ($p->xml_parse($parse_result, $name, $text)) {
-            return;
-        }
-    }
-    switch($name) {
-    case "venue":
-        $top_parse_result->$venue_name = $parse_result;
-        $parse_result = $top_parse_result;
-        break;
-    case "project_specific":
-        $parse_result->project_specific = $text;
-        $in_project_specific = false;
-        break;
-    case "project_preferences":
-        break;
-    default:
-        if ($in_project_specific) {
-            $text = $text."</$name>";
-        } else {
-            //echo "Unknown tag: $name\n";
-        }
-    }
-}
-
 function element_end_global($parser, $name) {
     global $text;
     global $parse_result;
@@ -535,10 +315,11 @@ function element_end_global($parser, $name) {
     global $venue_name;
     global $cpu_prefs;
     global $disk_prefs;
-    global $disk_prefs;
+    global $mem_prefs;
     global $net_prefs;
 
     foreach ($cpu_prefs as $p) {
+        if (is_string($p)) continue;
         if ($p->xml_parse($parse_result, $name, $text)) {
             return;
         }
@@ -548,7 +329,13 @@ function element_end_global($parser, $name) {
             return;
         }
     }
+    foreach ($mem_prefs as $p) {
+        if ($p->xml_parse($parse_result, $name, $text)) {
+            return;
+        }
+    }
     foreach ($net_prefs as $p) {
+        if (is_string($p)) continue;
         if ($p->xml_parse($parse_result, $name, $text)) {
             return;
         }
@@ -579,44 +366,29 @@ function char_handler($parser, $x) {
 function default_prefs_global() {
     global $cpu_prefs;
     global $disk_prefs;
+    global $mem_prefs;
     global $net_prefs;
 
     $p = new StdClass;
     foreach ($cpu_prefs as $pref) {
+        if (is_string($pref)) continue;
         $pref->set_default($p);
     }
     foreach ($disk_prefs as $pref) {
         $pref->set_default($p);
     }
-    foreach ($net_prefs as $pref) {
+    foreach ($mem_prefs as $pref) {
         $pref->set_default($p);
     }
-    return $p;
-}
-
-function default_prefs_project() {
-    global $project_pref_descs;
-
-    $p = new StdClass;
-    foreach ($project_pref_descs as $pref) {
+    foreach ($net_prefs as $pref) {
+        if (is_string($pref)) continue;
         $pref->set_default($p);
     }
-    $p->project_specific = project_specific_prefs_default();
     return $p;
 }
 
 // parse prefs from XML to a struct
 //
-function prefs_parse_project($prefs_xml) {
-    global $parse_result;
-    $parse_result = default_prefs_project();
-    $xml_parser = xml_parser_create();
-    xml_parser_set_option($xml_parser, XML_OPTION_CASE_FOLDING, 0);
-    xml_set_element_handler($xml_parser, "element_start_project", "element_end_project");
-    xml_set_character_data_handler($xml_parser, "char_handler");
-    xml_parse($xml_parser, $prefs_xml, 1);
-    return $parse_result;
-}
 
 function prefs_parse_global($prefs_xml) {
     global $parse_result;
@@ -629,123 +401,36 @@ function prefs_parse_global($prefs_xml) {
     return $parse_result;
 }
 
-////////////////////////////////////////////
-//
-// display preference subsets as Columns
-//
-function row_top($x, $ncols=6, $class="heading") {
-    echo "<tr><td class=$class width=35%>$x</td>";
-    echo "<td class=$class width=10%><b>".tra("Default")."</b></td>
-        <td class=$class width=10%><b>".tra("Home")."</b></td>
-        <td class=$class width=10%><b>".tra("School")."</b></td>
-        <td class=$class width=10%><b>".tra("Work")."</b></td>
-    ";
-    echo "<td width=15%><br></td></tr>\n";
-}
-
-//
-// row_defs - Display a value for all 4 venues in one row
-//
-function row_defs($pre, $item, $post, $type, $prefs) {
-    $gen = $prefs->$item;
-    $hom  = (isset($prefs->home) && isset($prefs->home->$item)) ? $prefs->home->$item : "--";
-    $schl = (isset($prefs->school) && isset($prefs->school->$item)) ? $prefs->school->$item : "--";
-    $wrk  = (isset($prefs->work) && isset($prefs->work->$item)) ? $prefs->work->$item : "--";
-
-    echo "<tr><td class=fieldname>$pre</td>";
-    row_field($gen,  $type);
-    row_field($hom,  $type);
-    row_field($schl, $type);
-    row_field($wrk,  $type);
-    echo "<td align=left>$post</td></tr>\n";
-}
-
-//
-// row_field - Display each field value, with selectable display modes
-//
-function row_field($value, $type) {
-    echo "<td class=f_val valign=top>";
-    $type = $value === "--" ? "--" : $type;
-    switch($type) {
-    case "yesno":
-        echo $value ?tra("yes"):tra("no");
-        break;
-    case "noyes":
-        echo $value ?tra("no"):tra("yes");
-        break;
-    case "limit":
-        $x = max_bytes_display_mode($value);
-        $y = "$x " . BYTE_ABBR;
-        echo $x ? "$y" : tra("no limit");
-        break;
-    case "minutes":
-        if ($value) {
-            echo $value;
-        } else {
-            echo '--';
-        }
-        break;
-    default:
-        echo $value;
-        break;
-    }
-    echo "</td>";
-}
-
-//
-// row_links - Display Edit/Add/Remove links for all venues in 1 row
-//
-function row_links($subset, $prefs) {
-    global $g_logged_in_user;
-    $tokens = url_tokens($g_logged_in_user->authenticator);
-    $pre_add  = "<a href=add_venue.php?venue=";
-    $pre_edit  = "<a href=prefs_edit.php?venue=";
-    $pre_remove = "<a href=prefs_remove.php?venue=";
-    $post_add = "&subset=$subset&cols=1$tokens>".tra("Add")."</a>";
-    $post_edit = "&subset=$subset&cols=1$tokens>".tra("Edit")."</a>";
-    $post_remove = "&subset=$subset&cols=1$tokens>".tra("Remove")."</a>";
-    $gen = "<a href=prefs_edit.php?subset=$subset&cols=1$tokens>".tra("Edit")."</a>";
-
-    $hom  = isset($prefs->home) ? $pre_edit."home".$post_edit : $pre_add."home".$post_add;
-    $schl = isset($prefs->school) ? $pre_edit."school".$post_edit : $pre_add."school".$post_add;
-    $wrk  = isset($prefs->work) ? $pre_edit."work".$post_edit : $pre_add."work".$post_add;
-
-    echo "<tr><td class=fieldname> </td>";
-    echo "<td>$gen</td>";
-    echo "<td>$hom</td>";
-    echo "<td>$schl</td>";
-    echo "<td>$wrk</td>";
-    echo "<td><br></td></tr>\n";
-
-    $hom  = isset($prefs->home) ? $pre_remove."home".$post_remove : "<br>";
-    $schl = isset($prefs->school) ? $pre_remove."school".$post_remove : "<br>";
-    $wrk  = isset($prefs->work) ? $pre_remove."work".$post_remove : "<br>";
-
-    echo "<tr><td class=fieldname> </td>";
-    echo "<td> </td>";
-    echo "<td>$hom</td>";
-    echo "<td>$schl</td>";
-    echo "<td>$wrk</td>";
-    echo "<td><br></td></tr>\n";
-}
-
 // Display all venues as columns next to descriptions
 //
 function prefs_show_columns_global($prefs) {
     global $cpu_prefs;
     global $disk_prefs;
+    global $mem_prefs;
     global $net_prefs;
 
     row_top(CPU_LIMIT_DESC);
     foreach ($cpu_prefs as $p) {
+        if (is_string($p)) {
+            group_header($p);
+            continue;
+        }
         $p->show_cols($prefs);
     }
     row_top(DISK_LIMIT_DESC);
     foreach ($disk_prefs as $p) {
         $p->show_cols($prefs);
     }
+    row_top(MEM_LIMIT_DESC);
+    foreach ($mem_prefs as $p) {
+        $p->show_cols($prefs);
+    }
     row_top(NETWORK_LIMIT_DESC);
     foreach ($net_prefs as $p) {
+        if (is_string($p)) {
+            group_header($p);
+            continue;
+        }
         $p->show_cols($prefs);
     }
     row_links("global", $prefs);
@@ -754,62 +439,37 @@ function prefs_show_columns_global($prefs) {
 function prefs_show_global($prefs) {
     global $cpu_prefs;
     global $disk_prefs;
+    global $mem_prefs;
     global $net_prefs;
 
     row1(CPU_LIMIT_DESC);
     foreach ($cpu_prefs as $p) {
+        if (is_string($p)) {
+            group_header($p);
+            continue;
+        }
         $p->show($prefs);
     }
     row1(DISK_LIMIT_DESC);
     foreach ($disk_prefs as $p) {
         $p->show($prefs);
     }
-    row1(NETWORK_LIMIT_DESC);
-    foreach ($net_prefs as $p) {
+    row1(MEM_LIMIT_DESC);
+    foreach ($mem_prefs as $p) {
         $p->show($prefs);
     }
-}
-
-function prefs_show_project($prefs, $columns=false) {
-    global $project_pref_descs;
-    if ($columns) {
-        foreach ($project_pref_descs as $p) {
-            $p->show_cols($prefs);
-        }
-    } else {
-        foreach ($project_pref_descs as $p) {
-            $p->show($prefs);
-        }
-    }
-}
-
-function prefs_show_privacy($user, $columns) {
-    global $privacy_pref_descs;
-    if ($columns) {
-        foreach ($privacy_pref_descs as $p) {
-            $p->show_cols($user);
-        }
-    } else {
-        foreach ($privacy_pref_descs as $p) {
-            $p->show($user);
+    row1(NETWORK_LIMIT_DESC);
+    foreach ($net_prefs as $p) {
+        if (is_string($p)) {
+            group_header($p);
+            continue;
         }
+        $p->show($prefs);
     }
 }
 
-function prefs_show_project_specific($prefs, $columns=false) {
-    if ($columns) {
-        $project_specific_prefs = project_specific_prefs_parse($prefs->project_specific);
-        $project_specific_prefs->home = isset($prefs->home) ? project_specific_prefs_parse($prefs->home->project_specific) : "";
-        $project_specific_prefs->work = isset($prefs->work) ? project_specific_prefs_parse($prefs->work->project_specific) : "";
-        $project_specific_prefs->school = isset($prefs->school) ? project_specific_prefs_parse($prefs->school->project_specific) : "";
-    } else {
-        $project_specific_prefs = project_specific_prefs_parse($prefs->project_specific);
-    }
-    project_specific_prefs_show($project_specific_prefs, $columns);
-}
-
 function subset_name($subset) {
-    if ($subset == "global") return tra("Computing");
+    if ($subset == "global") return tra("computing");
     return PROJECT;
 }
 
@@ -820,7 +480,7 @@ function prefs_display_venue($prefs, $venue, $subset) {
     if (isset($prefs->$venue)) $x = $prefs->$venue;
 
     if ($x) {
-        row1(tra("Separate preferences for %1", $venue), 2, "heading");
+        echo "<h2>".tra("Separate preferences for %1", $venue)."</h2>";
         echo "<tr><td colspan=2>";
         start_table();
         if ($subset == "global") {
@@ -836,77 +496,31 @@ function prefs_display_venue($prefs, $venue, $subset) {
         end_table();
         echo "</td></tr>\n";
     } else {
-        row1("<a href=add_venue.php?venue=$venue&subset=$subset$tokens>".tra("Add separate preferences for %1", $venue)."</a>", 2, "heading");
-    }
-}
-
-function print_prefs_display_project($user, $columns=false) {
-    $project_prefs = prefs_parse_project($user->project_prefs);
-
-    start_table();
-    $switch_link = " <font size=\"-2\"><a href=prefs.php?subset=project&cols=". (int)!$columns .">".tra("(Switch View)")."</a></font>";
-    if ($columns) {
-        row1(tra("Combined preferences").$switch_link, 2, "heading");
-        echo "<tr><td colspan=2>";
-        start_table();
-        prefs_show_privacy($user, true);
-        venue_show($user);
-        row_top(tra("Project specific settings"));
-        prefs_show_project($project_prefs, true);
-        prefs_show_project_specific($project_prefs, true);
-        row_links("project", $project_prefs);
-        end_table();
-        echo "</td></tr>\n";
-    } else {
-        if (isset($project_prefs->home) || isset($project_prefs->work) || isset($project_prefs->school)) {
-            row1(tra("Primary (default) preferences").$switch_link, 2, "heading");
-        }
-        echo "<tr><td colspan=2>";
-        start_table();
-        prefs_show_project($project_prefs, false);
-        prefs_show_privacy($user, false);
-        venue_show($user);
-        prefs_show_project_specific($project_prefs, false);
-        $tokens = url_tokens($user->authenticator);
-        row2("", "<a href=prefs_edit.php?subset=project$tokens>".tra("Edit %1 preferences", PROJECT)."</a>");
-        end_table();
-        echo "</td></tr>\n";
-        prefs_display_venue($project_prefs, "home", "project");
-        prefs_display_venue($project_prefs, "school", "project");
-        prefs_display_venue($project_prefs, "work", "project");
+        echo "<p><a href=add_venue.php?venue=$venue&subset=$subset$tokens>".tra("Add separate preferences for %1", $venue)."</a>";
     }
-    end_table();
 }
 
 function print_prefs_display_global($user, $columns=false) {
     $global_prefs = prefs_parse_global($user->global_prefs);
 
-    echo "<span class=note>"
-         .tra("These apply to all BOINC projects in which you participate.")
-         ."<br>"
-         .tra("On computers participating in multiple projects, the most recently modified preferences will be used.")
-         ."<br>"
-         .tra("These preferences do not apply to Android devices.")
-         ."</span><br><br>";
-    if (isset($global_prefs->mod_time)) {
-        echo tra("Preferences last modified:")." ".pretty_time_str($global_prefs->mod_time);
-    }
-    echo "<br><br>";
-    $switch_link = " <font size=\"-2\"><a href=prefs.php?subset=global&cols=". (int)!$columns .">".tra("(Switch View)")."</a></font>";
-    start_table();
+    echo tra("These settings apply to all computers using this account except")
+        ."<ul><li>"
+        .tra("computers where you have set preferences locally using the BOINC Manager")
+        ."<li>"
+        .tra("Android devices")
+        ."</ul>
+    ";
+    $switch_link = " <font size=\"-1\"><a href=prefs.php?subset=global&cols=". (int)!$columns .">".tra("(Switch view)")."</a></font>";
     if ($columns) {
-        row1(tra("Combined preferences").$switch_link, 2, "heading");
-        echo "<tr><td colspan=2>";
+        echo "<h2>".tra("Combined preferences").$switch_link."</h2>";
         start_table();
         prefs_show_columns_global($global_prefs);
         end_table();
-        echo "</td></tr>\n";
 
     } else {
         if (isset($global_prefs->home) || isset($global_prefs->work) || isset($global_prefs->school)) {
-            row1(tra("Primary (default) preferences").$switch_link, 2, "heading");
+            echo "<h2>".tra("Primary (default) preferences").$switch_link."</h2>";
         }
-        echo "<tr><td colspan=2>";
         start_table();
         prefs_show_global($global_prefs);
         $tokens = url_tokens($user->authenticator);
@@ -914,19 +528,14 @@ function print_prefs_display_global($user, $columns=false) {
             "<a href=prefs_edit.php?subset=global$tokens>".tra("Edit preferences")."</a>
         ");
         end_table();
-        echo "</td></tr>\n";
 
         prefs_display_venue($global_prefs, "home", "global");
         prefs_display_venue($global_prefs, "school", "global");
         prefs_display_venue($global_prefs, "work", "global");
     }
-    end_table();
-}
-
-function print_prefs_display($user) {
-    print_prefs_display_project($user);
-    echo "<br><br>\n";
-    print_prefs_display_global($user);
+    if (isset($global_prefs->mod_time)) {
+        echo "<p>".tra("Preferences last modified:")." ".pretty_time_str($global_prefs->mod_time)."<p>\n";
+    }
 }
 
 // This functions is used in prefs_edit.php to be able to display
@@ -968,7 +577,7 @@ function print_prefs_form(
         prefs_form_project_specific($prefs->project_specific, $project_error);
     }
 
-    row2("", "<input type=submit value=\"$submit_value\" name=\"action\">");
+    row2("", "<input class=\"btn btn-primary\" type=submit value=\"$submit_value\" name=\"action\">");
     end_table();
     echo "</form>\n";
 }
@@ -980,41 +589,35 @@ function print_prefs_form(
 function prefs_form_global($user, $prefs, $error=false) {
     global $cpu_prefs;
     global $disk_prefs;
+    global $mem_prefs;
     global $net_prefs;
 
     row1(CPU_LIMIT_DESC);
     foreach ($cpu_prefs as $p) {
+        if (is_string($p)) {
+            group_header($p);
+            continue;
+        }
         $p->show_form_row($prefs, $error);
     }
     row1(DISK_LIMIT_DESC);
     foreach ($disk_prefs as $p) {
         $p->show_form_row($prefs, $error);
     }
-    row1(NETWORK_LIMIT_DESC);
-    foreach ($net_prefs as $p) {
+    row1(MEM_LIMIT_DESC);
+    foreach ($mem_prefs as $p) {
         $p->show_form_row($prefs, $error);
     }
-}
-
-function prefs_form_privacy($user) {
-    global $privacy_pref_descs;
-    foreach ($privacy_pref_descs as $p) {
-        $p->show_form_row($user, false);
-    }
-}
-
-function prefs_form_project($prefs, $error=false) {
-    global $project_pref_descs;
-    foreach ($project_pref_descs as $p) {
+    row1(NETWORK_LIMIT_DESC);
+    foreach ($net_prefs as $p) {
+        if (is_string($p)) {
+            group_header($p);
+            continue;
+        }
         $p->show_form_row($prefs, $error);
     }
 }
 
-function prefs_form_project_specific($prefs_xml, $error=false) {
-    $prefs = project_specific_prefs_parse($prefs_xml);
-    project_specific_prefs_edit($prefs, $error);
-}
-
 // returns a set of translated yes/no radio buttons for editing prefs forms
 // Example: prefs_form_radio_buttons("allow_beta_work", $user->allow_beta_work);
 //
@@ -1030,10 +633,22 @@ function prefs_form_radio_buttons($name, $yesno) {
     return $rb;
 }
 
+// TODO: make this a subclass of PREF
+//
+define('VENUE_DESC', tra('Default computer location'));
+define('VENUE_TOOLTIP', tra('New computers will use this location for computing and project preferences.'));
+
+function tooltip_row2($t, $x, $y) {
+    echo "<tr title=\"$t\">
+        <td class=fieldname>$x</td>
+        <td>$y</td>
+        </tr>
+    ";
+}
 function venue_show($user) {
     $venue = $user->venue;
     if ($venue =='') $venue = '---';
-    row2(tra("Default computer location"), $venue);
+    tooltip_row2(VENUE_TOOLTIP, VENUE_DESC, $venue);
 }
 
 function venue_form($user) {
@@ -1042,14 +657,16 @@ function venue_form($user) {
     if ($user->venue == 'home') $h = 'selected';
     if ($user->venue == 'work') $w = 'selected';
     if ($user->venue == 'school') $s = 'selected';
-    row2(tra("Default computer location"),
+    tooltip_row2(
+        VENUE_TOOLTIP,
+        VENUE_DESC,
         "<select name=default_venue>
         <option value=\"\" $n>---
         <option value=home $h>".tra("Home")."
         <option value=work $w>".tra("Work")."
         <option value=school $s>".tra("School")."
-        </select>"
-    );
+        </select>
+    ");
 }
 
 function venue_parse_form(&$user) {
@@ -1065,48 +682,27 @@ function venue_parse_form(&$user) {
 function prefs_global_parse_form(&$prefs) {
     global $cpu_prefs;
     global $disk_prefs;
+    global $mem_prefs;
     global $net_prefs;
 
     $error = false;
     foreach ($cpu_prefs as $p) {
+        if (is_string($p)) continue;
         $p->parse_form($prefs, $error);
     }
     foreach ($disk_prefs as $p) {
         $p->parse_form($prefs, $error);
     }
-    foreach ($net_prefs as $p) {
+    foreach ($mem_prefs as $p) {
         $p->parse_form($prefs, $error);
     }
-    return $error;
-}
-
-function prefs_resource_parse_form(&$prefs) {
-    global $project_pref_descs;
-    $error = false;
-    foreach ($project_pref_descs as $p) {
+    foreach ($net_prefs as $p) {
+        if (is_string($p)) continue;
         $p->parse_form($prefs, $error);
     }
     return $error;
 }
 
-function prefs_privacy_parse_form(&$user) {
-    global $privacy_pref_descs;
-    $error = false;
-    foreach ($privacy_pref_descs as $p) {
-        $p->parse_form($user, $error);
-    }
-    return $error;
-}
-
-// Parse the project specific prefs form.
-// For details see project/project_specific_prefs.inc
-//
-function prefs_project_parse_form(&$prefs) {
-    $error = false;
-    $prefs->project_specific = project_specific_prefs_parse_form($error);
-    return $error;
-}
-
 
 ////////////////////////////////////////////
 //
@@ -1115,6 +711,7 @@ function prefs_project_parse_form(&$prefs) {
 function global_prefs_make_xml($prefs, $primary=true) {
     global $cpu_prefs;
     global $disk_prefs;
+    global $mem_prefs;
     global $net_prefs;
 
     $xml = "";
@@ -1125,12 +722,17 @@ function global_prefs_make_xml($prefs, $primary=true) {
     }
 
     foreach ($cpu_prefs as $p) {
+        if (is_string($p)) continue;
         $xml .= $p->xml_string($prefs);
     }
     foreach ($disk_prefs as $p) {
         $xml .= $p->xml_string($prefs);
     }
+    foreach ($mem_prefs as $p) {
+        $xml .= $p->xml_string($prefs);
+    }
     foreach ($net_prefs as $p) {
+        if (is_string($p)) continue;
         $xml .= $p->xml_string($prefs);
     }
 
@@ -1149,37 +751,6 @@ function global_prefs_make_xml($prefs, $primary=true) {
     return $xml;
 }
 
-// given a prefs structure, return the corresponding XML string
-//
-function project_prefs_make_xml($prefs, $primary=true) {
-    global $project_pref_descs;
-    $xml = "";
-    if ($primary) {
-        $xml = "<project_preferences>\n";
-    }
-    foreach ($project_pref_descs as $p) {
-        $xml .= $p->xml_string($prefs);
-    }
-    if ($prefs->project_specific) {
-        $x = trim($prefs->project_specific);
-        $xml = $xml
-            ."<project_specific>\n$x\n</project_specific>\n";
-    }
-    if (isset($prefs->home)) {
-        $xml = $xml."<venue name=\"home\">\n".project_prefs_make_xml($prefs->home, false)."</venue>\n";
-    }
-    if (isset($prefs->work)) {
-        $xml = $xml."<venue name=\"work\">\n".project_prefs_make_xml($prefs->work, false)."</venue>\n";
-    }
-    if (isset($prefs->school)) {
-        $xml = $xml."<venue name=\"school\">\n".project_prefs_make_xml($prefs->school, false)."</venue>\n";
-    }
-    if ($primary) {
-        $xml = $xml."</project_preferences>\n";
-    }
-    return $xml;
-}
-
 ////////////////////////////////////////////
 //
 // Update user's prefs in database, from a given structure
@@ -1194,16 +765,4 @@ function global_prefs_update(&$user, $prefs) {
     return 0;
 }
 
-function project_prefs_update(&$user, $prefs) {
-    $prefs_xml = BoincDb::escape_string(project_prefs_make_xml($prefs));
-    $send_email = $user->send_email?1:0;
-    $show_hosts = $user->show_hosts?1:0;
-    $retval = $user->update("project_prefs='$prefs_xml', send_email=$send_email, show_hosts=$show_hosts");
-    if (!$retval) {
-        return 1;
-    }
-    $user->project_prefs = $prefs_xml;
-    return 0;
-}
-
 ?>
diff --git a/html/inc/prefs_project.inc b/html/inc/prefs_project.inc
new file mode 100644
index 0000000..0a264d0
--- /dev/null
+++ b/html/inc/prefs_project.inc
@@ -0,0 +1,403 @@
+<?php
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2014 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/>.
+
+// functions for display and editing project preferences
+// Preferences are represented in two ways:
+// - As a PHP structure (usually called $prefs)
+//   The field "project_specific" is plain XML
+// - As XML (usually called $prefs_xml)
+//
+// This XML has the general structure
+//
+// <project_preferences>
+//    <resource_share>4</resource_share>
+//    [ <allow_beta_work>0|1</allow_beta_work> ]
+//    [ <no_cpu>1</no_cpu> ]
+//    [ <no_cuda>1</no_cuda> ]
+//    [ <no_ati>1</no_ati> ]
+//    [ <no_intel_gpu>1</no_intel_gpu> ]
+//    <project-specific>
+//            ... (arbitrary project-specific XML)
+//    </project-specific>
+//    <venue name="home">
+//       ...
+//    </venue>
+// </project_preferences>
+//
+// In addition there are some fields of the user table
+// (send_email and show_hosts) that are treated as project preferences
+
+include_once("../inc/prefs_util.inc");
+include_once("../project/project_specific_prefs.inc");
+
+$app_types = get_app_types();
+
+$project_pref_descs = array(
+    new PREF_NUM(
+        tra("Resource share"),
+        tra("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."),
+        "resource_share",
+        new NUM_SPEC("", 0, 9999999, 100)
+    ),
+);
+
+if (!empty($accelerate_gpu_apps_pref)) {
+    $project_pref_descs[] = new PREF_BOOL(
+        tra("Accelerate GPU tasks by dedicating a CPU to each one?"),
+        "",
+        "accelerate_gpu_apps",
+        false
+    );
+}
+
+if ($app_types->cpu) {
+    $project_pref_descs[] = new PREF_BOOL (
+        tra("Use CPU"),
+        "Request CPU-only tasks from this project.",
+        "no_cpu",
+        false,
+        true
+    );
+}
+if ($app_types->ati) {
+    $project_pref_descs[] = new PREF_BOOL (
+        tra("Use ATI GPU"),
+        "Request ATI GPU tasks from this project.",
+        "no_ati",
+        false,
+        true
+    );
+}
+if ($app_types->cuda) {
+    $project_pref_descs[] = new PREF_BOOL (
+        tra("Use NVIDIA GPU"),
+        "Request NVIDIA GPU tasks from this project.",
+        "no_cuda",
+        false,
+        true
+    );
+}
+if ($app_types->intel_gpu) {
+    $project_pref_descs[] = new PREF_BOOL (
+        tra("Use Intel GPU"),
+        "Request Intel GPU tasks from this project.",
+        "no_intel_gpu",
+        false,
+        true
+    );
+}
+
+if (project_has_beta()) {
+    $project_pref_descs[] = new PREF_BOOL(
+        tra("Run test applications?"),
+        tra("This helps us develop applications, but may cause jobs to fail on your computer"),
+        "allow_beta_work",
+        false
+    );
+}
+if (defined("EMAIL_FROM")) {
+    $x = "<br><p class=\"text-muted\">"
+        .tra("Emails will be sent from %1; make sure your spam filter accepts this address.", EMAIL_FROM)
+        ."</p>";
+} else {
+    $x = "";
+}
+
+$privacy_pref_descs = array (
+    new PREF_BOOL(
+        tra("Is it OK for %1 and your team (if any) to email you?", PROJECT).$x,
+        "",
+        "send_email",
+        true,
+        false
+    ),
+    new PREF_BOOL(
+        tra("Should %1 show your computers on its web site?", PROJECT),
+        "Allows other users to see your computers and tasks. Useful to troubleshoot issues or to compare computers.",
+        "show_hosts",
+        true,
+        false
+    ),
+);
+
+global $text;
+global $parse_result;
+global $top_parse_result;
+global $in_project_specific;
+global $venue_name;
+
+// functions to parse preferences XML into a struct
+//
+function element_start_project($parser, $name, $attrs) {
+    global $top_parse_result;
+    global $parse_result;
+    global $text;
+    global $in_project_specific;
+    global $venue_name;
+
+    switch($name) {
+    case "venue":
+        $venue_name = $attrs["name"];
+        $top_parse_result = $parse_result;
+        $parse_result = default_prefs_project();
+        break;
+    case "project_specific":
+        $in_project_specific = 1;
+        $text = "";
+        break;
+    default:
+        if ($in_project_specific) {
+            $text= $text."<$name>";
+        } else {
+            $text = "";
+        }
+    }
+}
+
+function element_end_project($parser, $name) {
+    global $text;
+    global $parse_result;
+    global $in_project_specific;
+    global $top_parse_result;
+    global $venue_name;
+    global $project_pref_descs;
+
+    foreach($project_pref_descs as $p) {
+        if ($p->xml_parse($parse_result, $name, $text)) {
+            return;
+        }
+    }
+    switch($name) {
+    case "venue":
+        $top_parse_result->$venue_name = $parse_result;
+        $parse_result = $top_parse_result;
+        break;
+    case "project_specific":
+        $parse_result->project_specific = $text;
+        $in_project_specific = false;
+        break;
+    case "project_preferences":
+        break;
+    default:
+        if ($in_project_specific) {
+            $text = $text."</$name>";
+        } else {
+            //echo "Unknown tag: $name\n";
+        }
+    }
+}
+
+function default_prefs_project() {
+    global $project_pref_descs;
+
+    $p = new StdClass;
+    foreach ($project_pref_descs as $pref) {
+        $pref->set_default($p);
+    }
+    $p->project_specific = project_specific_prefs_default();
+    return $p;
+}
+
+// parse prefs from XML to a struct
+//
+function prefs_parse_project($prefs_xml) {
+    global $parse_result;
+    $parse_result = default_prefs_project();
+    $xml_parser = xml_parser_create();
+    xml_parser_set_option($xml_parser, XML_OPTION_CASE_FOLDING, 0);
+    xml_set_element_handler($xml_parser, "element_start_project", "element_end_project");
+    xml_set_character_data_handler($xml_parser, "char_handler");
+    xml_parse($xml_parser, $prefs_xml, 1);
+    return $parse_result;
+}
+
+function prefs_show_project($prefs, $columns=false) {
+    global $project_pref_descs;
+    if ($columns) {
+        foreach ($project_pref_descs as $p) {
+            $p->show_cols($prefs);
+        }
+    } else {
+        foreach ($project_pref_descs as $p) {
+            $p->show($prefs);
+        }
+    }
+}
+
+function prefs_show_privacy($user, $columns) {
+    global $privacy_pref_descs;
+    if ($columns) {
+        foreach ($privacy_pref_descs as $p) {
+            $p->show_cols($user);
+        }
+    } else {
+        foreach ($privacy_pref_descs as $p) {
+            $p->show($user);
+        }
+    }
+}
+
+function prefs_show_project_specific($prefs, $columns=false) {
+    if ($columns) {
+        $project_specific_prefs = project_specific_prefs_parse($prefs->project_specific);
+        $project_specific_prefs->home = isset($prefs->home) ? project_specific_prefs_parse($prefs->home->project_specific) : "";
+        $project_specific_prefs->work = isset($prefs->work) ? project_specific_prefs_parse($prefs->work->project_specific) : "";
+        $project_specific_prefs->school = isset($prefs->school) ? project_specific_prefs_parse($prefs->school->project_specific) : "";
+    } else {
+        $project_specific_prefs = project_specific_prefs_parse($prefs->project_specific);
+    }
+    project_specific_prefs_show($project_specific_prefs, $columns);
+}
+
+function print_prefs_display_project($user, $columns=false) {
+    $project_prefs = prefs_parse_project($user->project_prefs);
+
+    $switch_link = " <font size=\"-1\"><a href=prefs.php?subset=project&cols=". (int)!$columns .">".tra("(Switch View)")."</a></font>";
+    if ($columns) {
+        echo "<h2>".tra("Combined preferences").$switch_link."</h2>";
+        start_table();
+        prefs_show_privacy($user, true);
+        venue_show($user);
+        row_top(tra("Project specific settings"));
+        prefs_show_project($project_prefs, true);
+        prefs_show_project_specific($project_prefs, true);
+        row_links("project", $project_prefs);
+        end_table();
+    } else {
+        if (isset($project_prefs->home) || isset($project_prefs->work) || isset($project_prefs->school)) {
+            echo "<h2>".tra("Primary (default) preferences").$switch_link."</h2>";
+        }
+        start_table();
+        prefs_show_project($project_prefs, false);
+        prefs_show_privacy($user, false);
+        venue_show($user);
+        prefs_show_project_specific($project_prefs, false);
+        $tokens = url_tokens($user->authenticator);
+        row2("", "<a href=prefs_edit.php?subset=project$tokens>".tra("Edit preferences")."</a>");
+        end_table();
+
+        prefs_display_venue($project_prefs, "home", "project");
+        prefs_display_venue($project_prefs, "school", "project");
+        prefs_display_venue($project_prefs, "work", "project");
+    }
+}
+
+////////////////////////////////////////////
+//
+// Functions to display preference subsets as forms
+//
+
+function prefs_form_privacy($user) {
+    global $privacy_pref_descs;
+    foreach ($privacy_pref_descs as $p) {
+        $p->show_form_row($user, false);
+    }
+}
+
+function prefs_form_project($prefs, $error=false) {
+    global $project_pref_descs;
+    foreach ($project_pref_descs as $p) {
+        $p->show_form_row($prefs, $error);
+    }
+}
+
+function prefs_form_project_specific($prefs_xml, $error=false) {
+    $prefs = project_specific_prefs_parse($prefs_xml);
+    project_specific_prefs_edit($prefs, $error);
+}
+
+function prefs_resource_parse_form(&$prefs) {
+    global $project_pref_descs;
+    $error = false;
+    foreach ($project_pref_descs as $p) {
+        $p->parse_form($prefs, $error);
+    }
+    return $error;
+}
+
+function prefs_privacy_parse_form(&$user) {
+    global $privacy_pref_descs;
+    $error = false;
+    foreach ($privacy_pref_descs as $p) {
+        $p->parse_form($user, $error);
+    }
+    return $error;
+}
+
+// Parse the project specific prefs form.
+// For details see project/project_specific_prefs.inc
+//
+function prefs_project_parse_form(&$prefs) {
+    $error = false;
+    $prefs->project_specific = project_specific_prefs_parse_form($error);
+    return $error;
+}
+
+////////////////////////////////////////////
+//
+// convert prefs from structure to XML
+//
+
+// given a prefs structure, return the corresponding XML string
+//
+function project_prefs_make_xml($prefs, $primary=true) {
+    global $project_pref_descs;
+    $xml = "";
+    if ($primary) {
+        $xml = "<project_preferences>\n";
+    }
+    foreach ($project_pref_descs as $p) {
+        $xml .= $p->xml_string($prefs);
+    }
+    if ($prefs->project_specific) {
+        $x = trim($prefs->project_specific);
+        $xml = $xml
+            ."<project_specific>\n$x\n</project_specific>\n";
+    }
+    if (isset($prefs->home)) {
+        $xml = $xml."<venue name=\"home\">\n".project_prefs_make_xml($prefs->home, false)."</venue>\n";
+    }
+    if (isset($prefs->work)) {
+        $xml = $xml."<venue name=\"work\">\n".project_prefs_make_xml($prefs->work, false)."</venue>\n";
+    }
+    if (isset($prefs->school)) {
+        $xml = $xml."<venue name=\"school\">\n".project_prefs_make_xml($prefs->school, false)."</venue>\n";
+    }
+    if ($primary) {
+        $xml = $xml."</project_preferences>\n";
+    }
+    return $xml;
+}
+
+////////////////////////////////////////////
+//
+// Update user's prefs in database, from a given structure
+//
+function project_prefs_update(&$user, $prefs) {
+    $prefs_xml = BoincDb::escape_string(project_prefs_make_xml($prefs));
+    $send_email = $user->send_email?1:0;
+    $show_hosts = $user->show_hosts?1:0;
+    $retval = $user->update("project_prefs='$prefs_xml', send_email=$send_email, show_hosts=$show_hosts");
+    if (!$retval) {
+        return 1;
+    }
+    $user->project_prefs = $prefs_xml;
+    return 0;
+}
+
+?>
diff --git a/html/inc/prefs_util.inc b/html/inc/prefs_util.inc
index 1f954e7..0a1e666 100644
--- a/html/inc/prefs_util.inc
+++ b/html/inc/prefs_util.inc
@@ -17,13 +17,35 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
-// classes for different kinds of preferences.  See prefs.inc
+// classes for different kinds of global preferences.  See prefs.inc
+// PREF_BOOL: boolean
+// PREF_NUM: a number, possibly constrained to a range
+// PREF_NUM2: a pair of numbers (e.g. transfer limit)
+// PREF_HOUR_RANGE: a range of hours
+
+$venues = array("home", "school", "work");
+
+function check_venue($x) {
+    if ($x == "") return;
+    if ($x == "home") return;
+    if ($x == "work") return;
+    if ($x == "school") return;
+    error_page(tra("bad venue: %1", $x));
+}
+
+function check_subset($x) {
+    if ($x == "global") return;
+    if ($x == "project") return;
+    error_page(tra("bad subset: %1", $x));
+}
 
 abstract class PREF {
-    public $desc;
-    public $tag;    // the pref's primary XML tag
-    function __construct($desc, $tag) {
+    public $desc;       // short description
+    public $tooltip;    // longer description, shown as tooltip
+    public $tag;        // the pref's primary XML tag
+    function __construct($desc, $tooltip, $tag) {
         $this->desc = $desc;
+        $this->tooltip = $tooltip;
         $this->tag = $tag;
     }
 
@@ -34,11 +56,20 @@ abstract class PREF {
     abstract function xml_parse(&$prefs, $name, $text);
     abstract function set_default(&$prefs);
 
+    function tooltip_tr() {
+        if ($this->tooltip) {
+            echo "<tr title=\"$this->tooltip\">";
+        } else {
+            echo "<tr>";
+        }
+    }
+
     // multi-column display (read only)
     //
     function show_cols($prefs) {
         global $venues;
-        echo "<tr><td class=fieldname>$this->desc</td>";
+        $this->tooltip_tr();
+        echo "<td class=fieldname>$this->desc</td>";
         $tag = $this->tag;
         if (isset($prefs->$tag)) {
             $this->show_value($prefs);
@@ -58,7 +89,8 @@ abstract class PREF {
     // show read-only row
     //
     function show($prefs) {
-        echo "<tr><td class=fieldname>$this->desc</td>";
+        $this->tooltip_tr();
+        echo "<td class=fieldname>$this->desc</td>";
         $tag = $this->tag;
         if (isset($prefs->$tag)) {
             $this->show_value($prefs);
@@ -73,25 +105,33 @@ abstract class PREF {
     function show_form_row($prefs, $error) {
         $tag = $this->tag;
         $class = isset($error->$tag)?"fieldname_error":"fieldname";
-        echo "<tr><td class=$class>$this->desc</td>";
+        $this->tooltip_tr();
+        echo "<td class=$class>$this->desc</td>";
         $this->show_form($prefs, $error);
         echo "</tr>\n";
     }
 }
 
+function readonly_checkbox($checked) {
+    if ($checked) {
+        return "<input type=checkbox onclick=\"return false\" checked>";
+    } else {
+        return "<input type=checkbox onclick=\"return false\">";
+    }
+}
+
 class PREF_BOOL extends PREF {
     public $default;
     public $invert;     // show to user in opposite sense
-    function __construct($desc, $tag, $default, $invert=false) {
+    function __construct($desc, $tooltip, $tag, $default, $invert=false) {
         $this->default = $default;
         $this->invert = $invert;
-        parent::__construct($desc, $tag);
+        parent::__construct($desc, $tooltip, $tag);
     }
     function show_value($prefs) {
         $tag = $this->tag;
         $v = $this->invert?!$prefs->$tag:$prefs->$tag;
-        $x = $v?tra("yes"):tra("no");
-        echo "<td>$x</td>";
+        echo "<td>".readonly_checkbox($v)."</td>";
     }
     function show_form($prefs, $error) {
         $tag = $this->tag;
@@ -136,9 +176,12 @@ class NUM_SPEC {
     public $min;
     public $max;
     public $default;
+    public $default2;
+        // for optional prefs where the default is zero (ignored)
+        // this is the value if they check the box
     public $scale;
 
-    function __construct($suffix, $min, $max, $default, $scale=1) {
+    function __construct($suffix, $min, $max, $default, $scale=1, $default2=0) {
         if (substr($suffix, 0, 1) == "%") {
             $this->suffix = $suffix;
         } else {
@@ -147,22 +190,30 @@ class NUM_SPEC {
         $this->min = $min;
         $this->max = $max;
         $this->default = $default;
+        $this->default2 = $default2;
         $this->scale = $scale;
     }
     function value_str($v) {
         $v /= $this->scale;
+        if ($v < $this->min || $v > $this->max) {
+            $v = $this->default;
+        }
         if ($v == 0) {
             $v = "--- ";
         }
         $v .= "$this->suffix ";
         return $v;
     }
-    function form_str($tag, $v) {
+    function form_str($tag, $v, $had_error, $disabled=false, $id=null) {
         if (is_numeric($v)) {
             $v /= $this->scale;
-            if ($v == 0) $v = "";
+            if (!$had_error && ($v < $this->min || $v > $this->max)) {
+                $v = $this->default;
+            }
         }
-        return "<input size=5 name=$tag value='$v'> $this->suffix ";
+        if ($disabled) $v = "";
+        $i = $id?"id=$id":"";
+        return "<input type=text size=5 name=$tag value='$v' $disabled $i>$this->suffix ";
     }
     function form_convert($in, &$out, &$error) {
         $error = false;
@@ -177,13 +228,19 @@ class NUM_SPEC {
             $error = true;
         }
     }
+    function get_default() {
+        if ($this->default) return $this->default;
+        return $this->default2;
+    }
 }
 
+// a numeric item
+//
 class PREF_NUM extends PREF {
     public $num_spec;
-    function __construct($desc, $tag, $num_spec) {
+    function __construct($desc, $tooltip, $tag, $num_spec) {
         $this->num_spec = $num_spec;
-        parent::__construct($desc, $tag);
+        parent::__construct($desc, $tooltip, $tag);
     }
     function show_value($prefs) {
         $tag = $this->tag;
@@ -191,20 +248,22 @@ class PREF_NUM extends PREF {
     }
     function show_form($prefs, $error) {
         $tag = $this->tag;
-        $class = isset($error->$tag)?"fieldvalue_error":"fieldvalue";
+        $had_error = isset($error->$tag);
+        $class = $had_error ?"fieldvalue_error":"fieldvalue";
         echo "<td class=$class>"
-            .$this->num_spec->form_str($tag, $prefs->$tag)
+            .$this->num_spec->form_str($tag, $prefs->$tag, $had_error)
             ."</td>
         ";
     }
     function parse_form(&$prefs, &$error) {
         $tag = $this->tag;
-        $this->num_spec->form_convert($_GET[$tag], $prefs->$tag, $e);
+        $this->num_spec->form_convert(get_str($tag, true), $prefs->$tag, $e);
         if ($e) $error->$tag = true;
     }
     function xml_string($prefs) {
         $tag = $this->tag;
         $v = $prefs->$tag;
+        if (!$v) $v = 0;
         return "<$tag>$v</$tag>\n";
     }
     function xml_parse(&$prefs, $name, $text) {
@@ -219,39 +278,149 @@ class PREF_NUM extends PREF {
     }
 }
 
+function checkbox_clicked_js() {
+    echo "
+        <script type=text/javascript>
+        function checkbox_clicked(id, tid, d) {
+            e = document.getElementById(id);
+            t = document.getElementById(tid);
+            if (e.checked) {
+                t.disabled = false;
+                t.value = d;
+            } else {
+                t.disabled = true;
+                t.value = '';
+            }
+        }
+        function checkbox_clicked2(id, tid1, tid2, d1, d2) {
+            e = document.getElementById(id);
+            t1 = document.getElementById(tid1);
+            t2 = document.getElementById(tid2);
+            if (e.checked) {
+                t1.disabled = false;
+                t1.value = d1;
+                t2.disabled = false;
+                t2.value = d2;
+            } else {
+                t1.disabled = true;
+                t1.value = '';
+                t2.disabled = true;
+                t2.value = '';
+            }
+        }
+        </script>
+    ";
+}
+
+// an optional numeric item where 0 means not specified
+//
+class PREF_OPT_NUM extends PREF {
+    public $num_spec;
+    function __construct($desc, $tooltip, $tag, $num_spec) {
+        $this->num_spec = $num_spec;
+        parent::__construct($desc, $tooltip, $tag);
+    }
+    function show_value($prefs) {
+        $tag = $this->tag;
+        $x = $prefs->$tag;
+        echo "<td>";
+        echo $this->num_spec->value_str($x);
+        echo "</td>";
+    }
+    function show_form($prefs, $error) {
+        $tag = $this->tag;
+        $had_error = isset($error->$tag);
+        $class = $had_error ?"fieldvalue_error":"fieldvalue";
+        $checkbox_id = $this->tag."_cb";
+        $text_id = $this->tag;
+        $default = $this->num_spec->get_default();
+        $val = $prefs->$tag;
+        $c = $val?"checked":"";
+        $d = $val?"":"disabled";
+        echo "<td class=$class>"
+            ."<input type=checkbox id=$checkbox_id onClick=\"checkbox_clicked('$checkbox_id', '$text_id', $default)\" $c>"
+            .$this->num_spec->form_str($tag, $prefs->$tag, $had_error, $d, $text_id)
+            ."</td>
+        ";
+    }
+    function parse_form(&$prefs, &$error) {
+        $tag = $this->tag;
+        $this->num_spec->form_convert(get_str($tag, true), $prefs->$tag, $e);
+        if ($e) $error->$tag = true;
+    }
+    function xml_string($prefs) {
+        $tag = $this->tag;
+        $v = $prefs->$tag;
+        if (!$v) $v = 0;
+        return "<$tag>$v</$tag>\n";
+    }
+    function xml_parse(&$prefs, $name, $text) {
+        $tag = $this->tag;
+        if ($name != $tag) return false;
+        $prefs->$tag = $text;
+        return true;
+    }
+    function set_default(&$prefs) {
+        $tag = $this->tag;
+        $prefs->$tag = $this->num_spec->default;
+    }
+}
+
+// optional pair of numbers
+// for "max X MB in Y days"
+//
 class PREF_NUM2 extends PREF {
     public $tag2;
     public $num_spec1, $num_spec2;
-    function __construct($desc, $tag1, $tag2, $num_spec1, $num_spec2) {
+    function __construct($desc, $tooltip, $tag1, $tag2, $num_spec1, $num_spec2) {
         $this->tag2 = $tag2;
         $this->num_spec1 = $num_spec1;
         $this->num_spec2 = $num_spec2;
-        parent::__construct($desc, $tag1);
+        parent::__construct($desc, $tooltip, $tag1);
     }
     function show_value($prefs) {
         $tag = $this->tag;
         $tag2 = $this->tag2;
+        $v1 = $prefs->$tag;
+        $v2 = $prefs->$tag2;
         echo "<td>"
-            .$this->num_spec1->value_str($prefs->$tag)
-            .$this->num_spec2->value_str($prefs->$tag2)
-            ."</td>";
+            .$this->num_spec1->value_str($v1)
+            .$this->num_spec2->value_str($v2)
+            ."</td>
+        ";
     }
     function show_form($prefs, $error) {
         $tag = $this->tag;
         $tag2 = $this->tag2;
-        $class = (isset($error->$tag) || isset($error->$tag2))?"fieldvalue_error":"fieldvalue";
+        $had_error = isset($error->$tag) || isset($error->$tag2);
+        $class = $had_error?"fieldvalue_error":"fieldvalue";
+        $checkbox_id = $this->tag."_cb";
+        $t1_id = $this->tag."_t1";
+        $t2_id = $this->tag."_t2";
+        $v1 = $prefs->$tag;
+        $v2 = $prefs->$tag2;
+        if ($v1 && $v2) {
+            $c = "checked";
+            $d = "";
+        } else {
+            $c = "";
+            $d = "disabled";
+        }
+        $def1 = $this->num_spec1->get_default();
+        $def2 = $this->num_spec2->get_default();
         echo "<td class=$class>"
-            .$this->num_spec1->form_str($tag, $prefs->$tag)
-            .$this->num_spec2->form_str($tag2, $prefs->$tag2)
+            ."<input type=checkbox id=$checkbox_id onClick=\"checkbox_clicked2('$checkbox_id', '$t1_id', '$t2_id', $def1, $def2)\" $c>"
+            .$this->num_spec1->form_str($tag, $prefs->$tag, $had_error, $d, $t1_id)
+            .$this->num_spec2->form_str($tag2, $prefs->$tag2, $had_error, $d, $t2_id)
             ."</td>
         ";
     }
     function parse_form(&$prefs, &$error) {
         $tag = $this->tag;
         $tag2 = $this->tag2;
-        $this->num_spec1->form_convert($_GET[$tag], $prefs->$tag, $e);
+        $this->num_spec1->form_convert(get_str($tag, true), $prefs->$tag, $e);
         if ($e) $error->$tag = true;
-        $this->num_spec2->form_convert($_GET[$tag2], $prefs->$tag2, $e);
+        $this->num_spec2->form_convert(get_str($tag2, true), $prefs->$tag2, $e);
         if ($e) $error->$tag2 = $e;
     }
     function xml_string($prefs) {
@@ -277,9 +446,9 @@ class PREF_NUM2 extends PREF {
     }
 }
 
-function hour_select($x, $name) {
+function hour_select($x, $name, $id, $d) {
     $s = "";
-    $s = $s. "<select name=$name>\n";
+    $s = $s. "<select name=$name id=$id $d>\n";
     for ($i=0; $i<24; $i++) {
         $sel = ($x == $i)?"selected":"";
         $s = $s."<option value=$i $sel> $i:00";
@@ -288,11 +457,13 @@ function hour_select($x, $name) {
     return $s;
 }
 
+// optional hour range
+//
 class PREF_HOUR_RANGE extends PREF {
     public $tag2;
-    function __construct($desc, $tag, $tag2) {
+    function __construct($desc, $tooltip, $tag, $tag2) {
         $this->tag2 = $tag2;
-        parent::__construct($desc, $tag);
+        parent::__construct($desc, $tooltip, $tag);
     }
     function show_value($prefs) {
         $tag = $this->tag;
@@ -309,20 +480,34 @@ class PREF_HOUR_RANGE extends PREF {
     function show_form($prefs, $error) {
         $tag = $this->tag;
         $tag2 = $this->tag2;
+        $h1 = $prefs->$tag;
+        $h2 = $prefs->$tag2;
+        $checkbox_id = $this->tag."_cb";
+        $t1_id = $this->tag."_t1";
+        $t2_id = $this->tag."_t2";
+        if ($h1 == $h2) {
+            $c = "";
+            $d = "disabled";
+        } else {
+            $c = "checked";
+            $d = "";
+        }
         echo "<td class=fieldvalue>"
-            .hour_select($prefs->$tag, $tag)
+            ."<input type=checkbox id=$checkbox_id onClick=\"checkbox_clicked2('$checkbox_id', '$t1_id', '$t2_id', 0, 23)\" $c>"
+
+            .hour_select($prefs->$tag, $tag, $t1_id, $d)
             ." "
             .tra("and")
             ." "
-            .hour_select($prefs->$tag2, $tag2)
+            .hour_select($prefs->$tag2, $tag2, $t2_id, $d)
             ."
         ";
     }
     function parse_form(&$prefs, &$error) {
         $tag = $this->tag;
         $tag2 = $this->tag2;
-        $prefs->$tag = $_GET[$tag];
-        $prefs->$tag2 = $_GET[$tag2];
+        $prefs->$tag = get_str($tag, true);
+        $prefs->$tag2 = get_str($tag2, true);
     }
     function xml_string($prefs) {
         $tag = $this->tag;
@@ -352,4 +537,120 @@ class PREF_HOUR_RANGE extends PREF {
     }
 }
 
+////////////////////////////////////////////
+//
+// display preference subsets as Columns
+//
+function row_top($x, $ncols=6, $class="heading") {
+    echo "<tr><th class=$class width=35%>$x</th>";
+    echo "<th class=$class width=10%><b>".tra("Default")."</b></th>
+        <th class=$class width=10%><b>".tra("Home")."</b></th>
+        <th class=$class width=10%><b>".tra("School")."</b></th>
+        <th class=$class width=10%><b>".tra("Work")."</b></th>
+    ";
+    //echo "<th width=15%><br></th>
+    echo "</tr>\n";
+}
+
+//
+// row_defs - Display a value for all 4 venues in one row
+//
+function row_defs($pre, $item, $post, $type, $prefs, $tooltip=null) {
+    $gen = $prefs->$item;
+    $hom  = (isset($prefs->home) && isset($prefs->home->$item)) ? $prefs->home->$item : "--";
+    $schl = (isset($prefs->school) && isset($prefs->school->$item)) ? $prefs->school->$item : "--";
+    $wrk  = (isset($prefs->work) && isset($prefs->work->$item)) ? $prefs->work->$item : "--";
+
+    if ($tooltip) {
+        echo "<tr title=\"$tooltip\">";
+    } else {
+        echo "<tr>";
+    }
+    echo "<td class=fieldname>$pre</td>";
+    row_field($gen,  $type);
+    row_field($hom,  $type);
+    row_field($schl, $type);
+    row_field($wrk,  $type);
+    echo "<td align=left>$post</td></tr>\n";
+}
+
+//
+// row_field - Display each field value, with selectable display modes
+//
+function row_field($value, $type) {
+    echo "<td class=f_val valign=top>";
+    $type = $value === "--" ? "--" : $type;
+    switch($type) {
+    case "yesno":
+        echo $value ?tra("yes"):tra("no");
+        break;
+    case "noyes":
+        echo $value ?tra("no"):tra("yes");
+        break;
+    case "limit":
+        $x = max_bytes_display_mode($value);
+        $y = "$x " . BYTE_ABBR;
+        echo $x ? "$y" : tra("no limit");
+        break;
+    case "minutes":
+        if ($value) {
+            echo $value;
+        } else {
+            echo '--';
+        }
+        break;
+    default:
+        echo $value;
+        break;
+    }
+    echo "</td>";
+}
+
+//
+// row_links - Display Edit/Add/Remove links for all venues in 1 row
+//
+function row_links($subset, $prefs) {
+    global $g_logged_in_user;
+    $tokens = url_tokens($g_logged_in_user->authenticator);
+    $pre_add  = "<a href=add_venue.php?venue=";
+    $pre_edit  = "<a href=prefs_edit.php?venue=";
+    $pre_remove = "<a href=prefs_remove.php?venue=";
+    $post_add = "&subset=$subset&cols=1$tokens>".tra("Add")."</a>";
+    $post_edit = "&subset=$subset&cols=1$tokens>".tra("Edit")."</a>";
+    $post_remove = "&subset=$subset&cols=1$tokens>".tra("Remove")."</a>";
+    $gen = "<a href=prefs_edit.php?subset=$subset&cols=1$tokens>".tra("Edit")."</a>";
+
+    $hom  = isset($prefs->home) ? $pre_edit."home".$post_edit : $pre_add."home".$post_add;
+    $schl = isset($prefs->school) ? $pre_edit."school".$post_edit : $pre_add."school".$post_add;
+    $wrk  = isset($prefs->work) ? $pre_edit."work".$post_edit : $pre_add."work".$post_add;
+
+    echo "<tr><td class=fieldname> </td>";
+    echo "<td>$gen</td>";
+    echo "<td>$hom</td>";
+    echo "<td>$schl</td>";
+    echo "<td>$wrk</td>";
+    echo "<td><br></td></tr>\n";
+
+    $hom  = isset($prefs->home) ? $pre_remove."home".$post_remove : "<br>";
+    $schl = isset($prefs->school) ? $pre_remove."school".$post_remove : "<br>";
+    $wrk  = isset($prefs->work) ? $pre_remove."work".$post_remove : "<br>";
+
+    echo "<tr><td class=fieldname> </td>";
+    echo "<td> </td>";
+    echo "<td>$hom</td>";
+    echo "<td>$schl</td>";
+    echo "<td>$wrk</td>";
+    echo "<td><br></td></tr>\n";
+}
+
+// see if we have any beta apps or app versions
+//
+function project_has_beta() {
+    $apps = BoincApp::enum("deprecated=0 and beta>0");
+    if (count($apps)) return true;
+    $avs = BoincAppVersion::enum("deprecated=0 and beta>0");
+    if (count($avs)) return true;
+    return false;
+}
+
 ?>
diff --git a/html/inc/recaptchalib.php b/html/inc/recaptchalib.php
index 570cf49..f8efafc 100644
--- a/html/inc/recaptchalib.php
+++ b/html/inc/recaptchalib.php
@@ -1,17 +1,15 @@
 <?php
-/*
+/**
  * This is a PHP library that handles calling reCAPTCHA.
  *    - Documentation and latest version
- *          http://recaptcha.net/plugins/php/
+ *          https://developers.google.com/recaptcha/docs/php
  *    - Get a reCAPTCHA API Key
- *          http://recaptcha.net/api/getkey
+ *          https://www.google.com/recaptcha/admin/create
  *    - Discussion group
  *          http://groups.google.com/group/recaptcha
  *
- * Copyright (c) 2007 reCAPTCHA -- http://recaptcha.net
- * AUTHORS:
- *   Mike Crawford
- *   Ben Maurer
+ * @copyright Copyright (c) 2014, Google Inc.
+ * @link      http://www.google.com/recaptcha
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -33,244 +31,110 @@
  */
 
 /**
- * The reCAPTCHA server URL's
- */
-define("RECAPTCHA_API_SERVER", "http://api.recaptcha.net");
-define("RECAPTCHA_API_SECURE_SERVER", "https://www.google.com/recaptcha/api");
-define("RECAPTCHA_VERIFY_SERVER", "api-verify.recaptcha.net");
-
-/**
- * Encodes the given data into a query string format
- * @param $data - array of string elements to be encoded
- * @return string - encoded request
- */
-function _recaptcha_qsencode ($data) {
-        $req = "";
-        foreach ( $data as $key => $value )
-                $req .= $key . '=' . urlencode( stripslashes($value) ) . '&';
-
-        // Cut the last '&'
-        $req=substr($req,0,strlen($req)-1);
-        return $req;
-}
-
-
-
-/**
- * Submits an HTTP POST to a reCAPTCHA server
- * @param string $host
- * @param string $path
- * @param array $data
- * @param int port
- * @return array response
+ * A ReCaptchaResponse is returned from checkAnswer().
  */
-function _recaptcha_http_post($host, $path, $data, $port = 80) {
-
-        $req = _recaptcha_qsencode ($data);
-
-        $http_request  = "POST $path HTTP/1.0\r\n";
-        $http_request .= "Host: $host\r\n";
-        $http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n";
-        $http_request .= "Content-Length: " . strlen($req) . "\r\n";
-        $http_request .= "User-Agent: reCAPTCHA/PHP\r\n";
-        $http_request .= "\r\n";
-        $http_request .= $req;
-
-        $response = '';
-        if( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) {
-                die ('Could not open socket');
-        }
-
-        fwrite($fs, $http_request);
-
-        while ( !feof($fs) )
-                $response .= fgets($fs, 1160); // One TCP-IP packet
-        fclose($fs);
-        $response = explode("\r\n\r\n", $response, 2);
-
-        return $response;
+class ReCaptchaResponse
+{
+    public $success;
+    public $errorCodes;
 }
 
-
-
-/**
- * Gets the challenge HTML (javascript and non-javascript version).
- * This is called from the browser, and the resulting reCAPTCHA HTML widget
- * is embedded within the HTML form it was called from.
- * @param string $pubkey A public key for reCAPTCHA
- * @param string $error The error given by reCAPTCHA (optional, default is null)
- * @param boolean $use_ssl Should the request be made over ssl? (optional, default is false)
-
- * @return string - The HTML to be embedded in the user's form.
- */
-function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false)
+class ReCaptcha
 {
-	if ($pubkey == null || $pubkey == '') {
-		die ("To use reCAPTCHA you must get an API key from <a href='http://recaptcha.net/api/getkey'>http://recaptcha.net/api/getkey</a>");
-	}
-	
-	if ($use_ssl) {
-                $server = RECAPTCHA_API_SECURE_SERVER;
-        } else {
-                $server = RECAPTCHA_API_SERVER;
+    private static $_signupUrl = "https://www.google.com/recaptcha/admin";
+    private static $_siteVerifyUrl =
+        "https://www.google.com/recaptcha/api/siteverify?";
+    private $_secret;
+    private static $_version = "php_1.0";
+
+    /**
+     * Constructor.
+     *
+     * @param string $secret shared secret between site and ReCAPTCHA server.
+     */
+    function ReCaptcha($secret)
+    {
+        if ($secret == null || $secret == "") {
+            die("To use reCAPTCHA you must get an API key from <a href='"
+                . self::$_signupUrl . "'>" . self::$_signupUrl . "</a>");
         }
-
-        $errorpart = "";
-        if ($error) {
-           $errorpart = "&error=" . $error;
+        $this->_secret=$secret;
+    }
+
+    /**
+     * Encodes the given data into a query string format.
+     *
+     * @param array $data array of string elements to be encoded.
+     *
+     * @return string - encoded request.
+     */
+    private function _encodeQS($data)
+    {
+        $req = "";
+        foreach ($data as $key => $value) {
+            $req .= $key . '=' . urlencode(stripslashes($value)) . '&';
         }
-        return '<script type="text/javascript" src="'. $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
-
-	<noscript>
-  		<iframe src="'. $server . '/noscript?k=' . $pubkey . $errorpart . '" height="300" width="500" frameborder="0"></iframe><br>
-  		<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
-  		<input type="hidden" name="recaptcha_response_field" value="manual_challenge">
-	</noscript>';
-}
-
-
-
-
-/**
- * A ReCaptchaResponse is returned from recaptcha_check_answer()
- */
-class ReCaptchaResponse {
-        var $is_valid;
-        var $error;
-}
 
-
-/**
-  * Calls an HTTP POST function to verify if the user's guess was correct
-  * @param string $privkey
-  * @param string $remoteip
-  * @param string $challenge
-  * @param string $response
-  * @return ReCaptchaResponse
-  */
-function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response)
-{
-	if ($privkey == null || $privkey == '') {
-		die ("To use reCAPTCHA you must get an API key from <a href='http://recaptcha.net/api/getkey'>http://recaptcha.net/api/getkey</a>");
-	}
-
-	if ($remoteip == null || $remoteip == '') {
-		die ("For security reasons, you must pass the remote ip to reCAPTCHA");
-	}
-
-	
-	
-        //discard spam submissions
-        if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0) {
-                $recaptcha_response = new ReCaptchaResponse();
-                $recaptcha_response->is_valid = false;
-                $recaptcha_response->error = 'incorrect-captcha-sol';
-                return $recaptcha_response;
+        // Cut the last '&'
+        $req=substr($req, 0, strlen($req)-1);
+        return $req;
+    }
+
+    /**
+     * Submits an HTTP GET to a reCAPTCHA server.
+     *
+     * @param string $path url path to recaptcha server.
+     * @param array  $data array of parameters to be sent.
+     *
+     * @return array response
+     */
+    private function _submitHTTPGet($path, $data)
+    {
+        $req = $this->_encodeQS($data);
+        $response = file_get_contents($path . $req);
+        return $response;
+    }
+
+    /**
+     * Calls the reCAPTCHA siteverify API to verify whether the user passes
+     * CAPTCHA test.
+     *
+     * @param string $remoteIp   IP address of end user.
+     * @param string $response   response string from recaptcha verification.
+     *
+     * @return ReCaptchaResponse
+     */
+    public function verifyResponse($remoteIp, $response)
+    {
+        // Discard empty solution submissions
+        if ($response == null || strlen($response) == 0) {
+            $recaptchaResponse = new ReCaptchaResponse();
+            $recaptchaResponse->success = false;
+            $recaptchaResponse->errorCodes = 'missing-input';
+            return $recaptchaResponse;
         }
 
-        $response = _recaptcha_http_post (RECAPTCHA_VERIFY_SERVER, "/verify",
-                                          array (
-                                                 'privatekey' => $privkey,
-                                                 'remoteip' => $remoteip,
-                                                 'challenge' => $challenge,
-                                                 'response' => $response
-                                                 )
-                                          );
-
-        $answers = explode ("\n", $response [1]);
-        $recaptcha_response = new ReCaptchaResponse();
-
-        if (trim ($answers [0]) == 'true') {
-                $recaptcha_response->is_valid = true;
-        }
-        else {
-                $recaptcha_response->is_valid = false;
-                $recaptcha_response->error = $answers [1];
+        $getResponse = $this->_submitHttpGet(
+            self::$_siteVerifyUrl,
+            array (
+                'secret' => $this->_secret,
+                'remoteip' => $remoteIp,
+                'v' => self::$_version,
+                'response' => $response
+            )
+        );
+        $answers = json_decode($getResponse, true);
+        $recaptchaResponse = new ReCaptchaResponse();
+
+        if (trim($answers ['success']) == true) {
+            $recaptchaResponse->success = true;
+        } else {
+            $recaptchaResponse->success = false;
+            $recaptchaResponse->errorCodes = $answers["error-codes"];
         }
-        return $recaptcha_response;
-
-}
-
-/**
- * gets a URL where the user can sign up for reCAPTCHA. If your application
- * has a configuration page where you enter a key, you should provide a link
- * using this function.
- * @param string $domain The domain where the page is hosted
- * @param string $appname The name of your application
- */
-function recaptcha_get_signup_url ($domain = null, $appname = null) {
-	return "http://recaptcha.net/api/getkey?" .  _recaptcha_qsencode (array ('domain' => $domain, 'app' => $appname));
-}
 
-function _recaptcha_aes_pad($val) {
-	$block_size = 16;
-	$numpad = $block_size - (strlen ($val) % $block_size);
-	return str_pad($val, strlen ($val) + $numpad, chr($numpad));
+        return $recaptchaResponse;
+    }
 }
 
-/* Mailhide related code */
-
-function _recaptcha_aes_encrypt($val,$ky) {
-	if (! function_exists ("mcrypt_encrypt")) {
-		die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed.");
-	}
-	$mode=MCRYPT_MODE_CBC;   
-	$enc=MCRYPT_RIJNDAEL_128;
-	$val=_recaptcha_aes_pad($val);
-	return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
-}
-
-
-function _recaptcha_mailhide_urlbase64 ($x) {
-	return strtr(base64_encode ($x), '+/', '-_');
-}
-
-/* gets the reCAPTCHA Mailhide url for a given email, public key and private key */
-function recaptcha_mailhide_url($pubkey, $privkey, $email) {
-	if ($pubkey == '' || $pubkey == null || $privkey == "" || $privkey == null) {
-		die ("To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " .
-		     "you can do so at <a href='http://mailhide.recaptcha.net/apikey'>http://mailhide.recaptcha.net/apikey</a>");
-	}
-	
-
-	$ky = pack('H*', $privkey);
-	$cryptmail = _recaptcha_aes_encrypt ($email, $ky);
-	
-	return "http://mailhide.recaptcha.net/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ($cryptmail);
-}
-
-/**
- * gets the parts of the email to expose to the user.
- * eg, given johndoe at example,com return ["john", "example.com"].
- * the email is then displayed as john... at example.com
- */
-function _recaptcha_mailhide_email_parts ($email) {
-	$arr = preg_split("/@/", $email );
-
-	if (strlen ($arr[0]) <= 4) {
-		$arr[0] = substr ($arr[0], 0, 1);
-	} else if (strlen ($arr[0]) <= 6) {
-		$arr[0] = substr ($arr[0], 0, 3);
-	} else {
-		$arr[0] = substr ($arr[0], 0, 4);
-	}
-	return $arr;
-}
-
-/**
- * Gets html to display an email address given a public an private key.
- * to get a key, go to:
- *
- * http://mailhide.recaptcha.net/apikey
- */
-function recaptcha_mailhide_html($pubkey, $privkey, $email) {
-	$emailparts = _recaptcha_mailhide_email_parts ($email);
-	$url = recaptcha_mailhide_url ($pubkey, $privkey, $email);
-	
-	return htmlentities($emailparts[0]) . "<a href='" . htmlentities ($url) .
-		"' onclick=\"window.open('" . htmlentities ($url) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities ($emailparts [1]);
-
-}
-
-
 ?>
diff --git a/html/inc/result.inc b/html/inc/result.inc
index 87e5a44..c3562d9 100644
--- a/html/inc/result.inc
+++ b/html/inc/result.inc
@@ -298,25 +298,29 @@ function file_delete_state_str($s) {
 }
 function wu_error_mask_str($s) {
     $x = "";
-    if ($s & 1) {
+    if ($s & WU_ERROR_COULDNT_SEND_RESULT) {
         $x = $x." ".tra("Couldn't send result");
-        $s -= 1;
+        $s -= WU_ERROR_COULDNT_SEND_RESULT;
     }
-    if ($s & 2) {
+    if ($s & WU_ERROR_TOO_MANY_ERROR_RESULTS) {
         $x = $x." ".tra("Too many errors (may have bug)");
-        $s -= 2;
+        $s -= WU_ERROR_TOO_MANY_ERROR_RESULTS;
     }
-    if ($s & 4) {
+    if ($s & WU_ERROR_TOO_MANY_SUCCESS_RESULTS) {
         $x = $x." ".tra("Too many results (may be nondeterministic)");
-        $s -= 4;
+        $s -= WU_ERROR_TOO_MANY_SUCCESS_RESULTS;
     }
-    if ($s & 8) {
+    if ($s & WU_ERROR_TOO_MANY_TOTAL_RESULTS) {
         $x = $x." ".tra("Too many total results");
-        $s -= 8;
+        $s -= WU_ERROR_TOO_MANY_TOTAL_RESULTS;
     }
-    if ($s & 16) {
+    if ($s & WU_ERROR_CANCELLED) {
         $x = $x." ".tra("WU cancelled");
-        $s -= 16;
+        $s -= WU_ERROR_CANCELLED;
+    }
+    if ($s & WU_ERROR_NO_CANONICAL_RESULT) {
+        $x = $x." ".tra("Canonical result is missing");
+        $s -= WU_ERROR_NO_CANONICAL_RESULT;
     }
     if ($s) {
         $x = $x." ".tra("Unrecognized Error: %1", $s);
@@ -346,18 +350,18 @@ function result_table_start($show_wu_link, $show_host_link, $info) {
             $i2 = clone $info;
             $i2->show_names = 0;
             $url = result_page_url($i2);
-            echo "<th>".tra("Task name")."<br><span class=\"smalltext\">".tra("click for details")."<br><a href=$url>".tra("Show IDs")."</a></span></th>\n";
+            echo "<th>".tra("Task name")."<br><small>".tra("click for details")."<br><a href=$url>".tra("Show IDs")."</a></small></th>\n";
         } else {
             $i2 = clone $info;
             $i2->show_names = 1;
             $url = result_page_url($i2);
-            echo "<th>Task<br><span class=\"smalltext\">".tra("click for details")."<br><a href=$url>".tra("Show names")."</a></span></th>\n";
+            echo "<th>Task<br><small>".tra("click for details")."<br><a href=$url>".tra("Show names")."</a></small></th>\n";
         }
     } else {
-        echo "<th>".tra("Task")."<br><span class=\"smalltext\">".tra("click for details")."</span></th>\n";
+        echo "<th>".tra("Task")."<br><small>".tra("click for details")."</small></th>\n";
     }
     if ($show_wu_link) {
-        echo "<th>".tra("Work unit")."<br><span class=\"smalltext\">".tra("click for details")."</span></th>\n";
+        echo "<th>".tra("Work unit")."<br><small>".tra("click for details")."</small></th>\n";
         if (function_exists('project_result_info_heading')) {
             $x = project_result_info_heading();
             if ($x) {
@@ -371,7 +375,7 @@ function result_table_start($show_wu_link, $show_host_link, $info) {
     echo "
         <th>".tra("Sent")."</th>
         <th>".tra("Time reported<br />or deadline")."
-            <br><span class=\"smalltext\"><a href=\"explain_state.php?field=result_time\">".tra("explain")."</a></span>
+            <br><small><a href=\"explain_state.php?field=result_time\">".tra("explain")."</a></small>
         </th>
         <th>".tra("Status")."</th>
         <th>".tra("Run time<br />(sec)")."</th>
@@ -640,6 +644,7 @@ function show_result($result, $show_outfile_links=false) {
     row2(tra("CPU time"), time_diff($result->cpu_time));
     row2(tra("Validate state"), validate_state_str($result));
     row2(tra("Credit"), number_format($result->granted_credit, 2));
+    row2(tra("Device peak FLOPS"), number_format($result->flops_estimate/1e9, 2)." GFLOPS");
     row2(tra("Application version"), app_version_string($result));
     if ($result->peak_working_set_size) {
         $x = number_format($result->peak_working_set_size/MEGA, 2);
@@ -687,9 +692,14 @@ function result_navigation($info, $where_clause) {
 	}
 	$app_count[0] = 0;
 
-	$results = BoincResult::enum_fields("appid, server_state, outcome, validate_state", $where_clause, null);
+	$results = BoincResult::enum_fields(
+        "appid, server_state, outcome, validate_state",
+        $where_clause, null
+    );
 	foreach ($results as $r) {
-		$app_count[$r->appid]++;
+        if (array_key_exists($r->appid, $app_count)) {
+            $app_count[$r->appid]++;
+        }
 		$app_count[0]++;
         if (!$info->appid || ($r->appid == $info->appid)) {
             $state_count[state_num($r)]++;
@@ -756,7 +766,7 @@ function result_navigation($info, $where_clause) {
         }
     }
 
-    $x .= "<form action=result.php>".tra("Task name:")."<input size=40 name=result_name><input type=submit value='OK'></form>";
+    $x .= "<form action=result.php>".tra("Task name:")."<input size=40 name=result_name><input class=\"btn btn-primary\" type=submit value='OK'></form>";
     $x .= "</center><br>";
 	return $x;
 }
diff --git a/html/inc/sandbox.inc b/html/inc/sandbox.inc
index f02fea8..1729dbf 100644
--- a/html/inc/sandbox.inc
+++ b/html/inc/sandbox.inc
@@ -88,14 +88,17 @@ function sandbox_file_name($user, $md5) {
 
 // return the path of the file in the download directory
 //
+if (!function_exists('sandbox_physical_path')) {
 function sandbox_physical_path($user, $md5) {
     global $fanout;
     $f = sandbox_file_name($user, $md5);
     return dir_hier_path($f, parse_config(get_config(), "<download_dir>"), $fanout);
 }
+}
 
 // return list of files in sandbox
 //
+if (!function_exists('sandbox_file_names')) {
 function sandbox_file_names($user) {
     $d = opendir(sandbox_dir($user));
     $names = array();
@@ -107,9 +110,11 @@ function sandbox_file_names($user) {
     natsort($names);
     return $names;
 }
+}
 
 // return a <select> for files in sandbox
 //
+if (!function_exists('sandbox_file_select')) {
 function sandbox_file_select($user, $select_name, $regexp = null, $allow_none = false) {
     if ($regexp === null) {
         $regexp = $select_name;
@@ -127,6 +132,7 @@ function sandbox_file_select($user, $select_name, $regexp = null, $allow_none =
     $x .= "</select>\n";
     return $x;
 }
+}
 
 //check if a file is still being used by a unfinished batch
 //
diff --git a/html/inc/sanitize_html.inc b/html/inc/sanitize_html.inc
index 6c4d0a9..98ca633 100644
--- a/html/inc/sanitize_html.inc
+++ b/html/inc/sanitize_html.inc
@@ -16,7 +16,7 @@
 // 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/kses.php");
+require_once("../inc/htmLawed.php");
 
 $allowed = array(
     'b' => array(),
diff --git a/html/inc/stats_sites.inc b/html/inc/stats_sites.inc
index 697fd5c..b1ed52b 100644
--- a/html/inc/stats_sites.inc
+++ b/html/inc/stats_sites.inc
@@ -144,11 +144,11 @@ $sig_sites = array(
         "BOINC All Project Stats",
         "(Signature files for both users and teams)"
     ),
-    array(
-        "http://www.unitedboinc.com/news-sig/",
-        "United BOINC",
-        "(Images showing the latest news from your choice of projects)"
-    ),
+//    array(
+//        "http://www.unitedboinc.com/news-sig/",
+//        "United BOINC",
+//        "(Images showing the latest news from your choice of projects)"
+//    ),
 );
 
 // the following sites generate cross-project team stats based on CPID
@@ -162,7 +162,7 @@ $team_name_sites = array(
         "BOINCstats.com",
         "hashlc"
     ),
-    array("http://stats.setibzh.fr/team.php?teamcpid=",
+    array("http://statsbzh.boinc-af.org/team.php?teamcpid=",
         "SETIBZH",
         "hashlc"
     ),
diff --git a/html/inc/submit.inc b/html/inc/submit.inc
index b159109..10b8e45 100644
--- a/html/inc/submit.inc
+++ b/html/inc/submit.inc
@@ -39,6 +39,14 @@ function req_to_xml($req, $op) {
     <app_name>$req->app_name</app_name>
     <batch_name>$req->batch_name</batch_name>
 ";
+    if ((isset($req->result_template_file)) && ($req->result_template_file)) {
+        $x .= "    <result_template_file>$req->result_template_file</result_template_file>
+";
+    }
+    if ((isset($req->workunit_template_file)) && ($req->workunit_template_file)) {
+        $x .= "    <workunit_template_file>$req->workunit_template_file</workunit_template_file>
+";
+    }
     foreach ($req->jobs as $job) {
         $x .= "    <job>
         <rsc_fpops_est>$job->rsc_fpops_est</rsc_fpops_est>
@@ -50,8 +58,8 @@ function req_to_xml($req, $op) {
         } elseif ((isset($job->target_user)) && ($job->target_user)) {
             $x .= "        <target_user>$job->target_user</target_user>
 ";
-        } elseif ((isset($job->target_team)) && ($job->target_team)) {
-            $x .= "        <target_team>$job->target_team</target_team>
+        } elseif ((isset($job->target_host)) && ($job->target_host)) {
+            $x .= "        <target_host>$job->target_host</target_host>
 ";
         }
         foreach ($job->input_files as $file) {
@@ -158,7 +166,7 @@ function boinc_estimate_batch($req) {
     $name = $reply->getName();
     if ($name == 'estimate') {
         return array((string)$reply->seconds, null);
-    } else if ($name = 'error') {
+    } else if ($name == 'error') {
         return array(null, (string)$reply->message);
     } else {
         return array(null, "Bad reply message");
@@ -284,7 +292,7 @@ function boinc_retire_batch($req) {
 }
 
 //// example usage follows
-
+/*
 $req->project = "http://isaac.ssl.berkeley.edu/test/";
 $req->authenticator = "x";
 if (0) {
@@ -344,5 +352,5 @@ if (0) {
         print_r($jobs);
     }
 }
-
+*/
 ?>
diff --git a/html/inc/submit_db.inc b/html/inc/submit_db.inc
index c890a58..11824c3 100644
--- a/html/inc/submit_db.inc
+++ b/html/inc/submit_db.inc
@@ -27,6 +27,7 @@ class BoincBatch {
     }
     static function lookup_name($name) {
         $db = BoincDb::get();
+        $name = BoincDb::escape_string($name);
         return $db->lookup('batch', 'BoincBatch', "name='$name'");
     }
     static function enum($clause) {
diff --git a/html/inc/team.inc b/html/inc/team.inc
index 9ffa2df..394be32 100644
--- a/html/inc/team.inc
+++ b/html/inc/team.inc
@@ -38,7 +38,7 @@ function team_search_form($params) {
     echo '<form name="form" action="team_search.php">';
     start_table();
     row2('<b>'.tra('Search criteria (use one or more)').'</b>', '');
-    row2(tra('Key words').'<br><span class="note">'.tra('Find teams with these words in their names or descriptions').'</span>',
+    row2(tra('Key words').'<br><p class=\"text-muted\">'.tra('Find teams with these words in their names or descriptions').'</p>',
         '<input type="text" name="keywords" value="' . htmlspecialchars($params->keywords) . '">');
     row2_init(tra('Country'), '');
     echo '<select name="country"><option value="" selected>---</option>';
@@ -49,7 +49,7 @@ function team_search_form($params) {
     row2(tra('Type of team'), team_type_select($params->type, true));
     $checked = $params->active?"checked":"";
     row2(tra('Show only active teams'), "<input type=checkbox name=active $checked>");
-    row2("", "<input type=submit name=submit value=\"".tra('Search')."\">");
+    row2("", "<input class=\"btn btn-primary\" type=submit name=submit value=\"".tra('Search')."\">");
     end_table();
     echo '</form>';
 }
@@ -77,6 +77,10 @@ function foundership_transfer_link($user, $team) {
     return '<a href="team_founder_transfer_form.php">'.tra('Deferred').'</a>';
 }
 
+// $team is the team record with a bunch of additional data
+// (see team_display.php)
+// $user is viewer (not necessarily team founder) or null
+//
 function display_team_page($team, $user) {
     global $team_name_sites;
     page_head("$team->name");
@@ -90,7 +94,8 @@ function display_team_page($team, $user) {
     }
     row2("Created", date_str($team->create_time));
     if (defined("SHOW_NONVALIDATED_TEAMS")) {
-        row2("Founder email validated", $user->email_validated?"Yes":"No (team will not be exported)");
+        $founder = $team->founder;
+        row2("Founder email validated", $founder->email_validated?"Yes":"No (team will not be exported)");
     }
     if (strlen($team->url)) {;
         if (strstr($team->url, "http://")) {
@@ -104,7 +109,10 @@ function display_team_page($team, $user) {
     if (!no_computing()) {
         row2(tra('Total credit'), format_credit_large($team->total_credit));
         row2(tra('Recent average credit'), format_credit_large($team->expavg_credit));
-        show_badges(false, $team);
+        if (function_exists('project_team_credit')) {
+            project_team_credit($team);
+        }
+        show_badges_row(false, $team);
 
         $x = "";
         shuffle($team_name_sites);
@@ -138,7 +146,7 @@ function display_team_page($team, $user) {
                 $tokens = url_tokens($user->authenticator);
                 row2("",
                     '<a href="team_join.php?'.$tokens.'&teamid='.$team->id.'">'.tra('Join this team').'</a>
-                    <br><span class="note">'.tra('Note: if \'OK to email\' is set in your project preferences, joining a team gives its founder access to your email address.').'</span>'
+                    <br><p class=\"text-muted\">'.tra('Note: if \'OK to email\' is set in your project preferences, joining a team gives its founder access to your email address.').'</p>'
                 );
             } else {
                 row2(tra("Not accepting new members"), "");
@@ -158,7 +166,9 @@ function display_team_page($team, $user) {
         }
     }
     row1(tra('Members'));
-    row2(tra('Founder'), user_links($team->founder));
+    row2(tra('Founder'),
+        $team->founder?user_links($team->founder, BADGE_HEIGHT_MEDIUM):"---"
+    );
     if (count($team->admins)) {
         $first = true;
         $x = "";
@@ -168,7 +178,7 @@ function display_team_page($team, $user) {
             } else {
                 $x .= " · ";
             }
-            $x .= user_links($a);
+            $x .= user_links($a, BADGE_HEIGHT_MEDIUM);
         }
         row2(tra('Admins'), $x);
     }
@@ -182,7 +192,7 @@ function display_team_page($team, $user) {
             } else {
                 $x .= " · ";
             }
-            $x .= user_links($a);
+            $x .= user_links($a, BADGE_HEIGHT_MEDIUM);
         }
     }
     row2(tra('New members in last day'), $x);
@@ -253,7 +263,7 @@ function display_team_members($team, $offset, $sort_by) {
     foreach ($users as $user) {
         $user_total_credit = format_credit_large($user->total_credit);
         $user_expavg_credit = format_credit($user->expavg_credit);
-        $x = user_links($user);
+        $x = user_links($user, BADGE_HEIGHT_MEDIUM);
         if ($user->id == $team->userid) {
             $x .= ' ['.tra('Founder').']';
         } else if (is_team_admin_aux($user, $admins)) {
@@ -380,12 +390,18 @@ function team_table_start($sort_by, $type_url) {
     ";
 }
 
+function team_links($team) {
+    $b = badges_string(false, $team, BADGE_HEIGHT_MEDIUM);
+    return "<a href=team_display.php?teamid=$team->id>$team->name</a> $b";
+}
+
 function show_team_row($team, $i) {
     $team_expavg_credit = format_credit_large($team->expavg_credit);
     $team_total_credit = format_credit_large($team->total_credit);
-    echo"<tr class=row1>
+    $j = $i % 2;
+    echo"<tr class=row$j>
         <td>$i</td>
-        <td><a href=team_display.php?teamid=$team->id>$team->name</a></td>
+        <td>".team_links($team)."</td>
         <td align=right>".$team->nusers."</td>
         <td align=right>$team_expavg_credit</td>
         <td align=right>$team_total_credit</td>
@@ -423,8 +439,8 @@ function team_edit_form($team, $label, $url) {
     if ($team) {
         echo "<input type=hidden name=teamid value=$team->id>\n";
         if ($team->seti_id) {
-            echo "<p><span class=error>".tra("WARNING: this is a BOINC-wide team. If you make changes here, they will soon be overwritten. Edit the %1BOINC-wide team%2 instead.", "<a href=http://boinc.berkeley.edu/teams/>", "</a>")
-            ."</span><p>";
+            echo "<p class=\"text-danger\">".tra("WARNING: this is a BOINC-wide team. If you make changes here, they will soon be overwritten. Edit the %1BOINC-wide team%2 instead.", "<a href=http://boinc.berkeley.edu/teams/>", "</a>")
+            ."</p>";
         }
     }
     echo '
@@ -434,13 +450,13 @@ function team_edit_form($team, $label, $url) {
     ';
     start_table();
     row2(tra('Team name, text version').'
-        <br><span class="note">'.tra('Don\'t use HTML tags.').'</span>',
+        <br><p class=\"text-muted\">'.tra('Don\'t use HTML tags.').'</p>',
         "<input name=name type=text size=50 value='".($team?$team->name:"")."'>"
     );
     row2(tra('Team name, HTML version').'
-        <br><span class="note">
+        <br><p class=\"text-muted\">
         '.tra('You may use %1limited HTML tags%2.', '<a href="html.php" target="_new">', '</a>').'
-        '.tra('If you don\'t know HTML, leave this box blank.').'</span>',
+        '.tra('If you don\'t know HTML, leave this box blank.').'</p>',
         "<input name=name_html type=text size=50 value=\"".str_replace('"',"'",($team?$team->name_html:""))."\">"
     );
     row2(tra('URL of team web page, if any').':<br><font size=-2>('.tra('without "http://"').')
@@ -448,9 +464,9 @@ function team_edit_form($team, $label, $url) {
         "<input type=text name=url size=60 value='".($team?$team->url:"")."'>"
     );
     row2(tra('Description of team').':
-        <br><span class="note">
+        <br><p class=\"text-muted\">
         '.tra('You may use %1limited HTML tags%2.', '<a href="html.php" target="_new">', '</a>').'
-        </span>',
+        </p>',
         "<textarea name=description cols=60 rows=10>".($team?$team->description:"")."</textarea>"
     );
 
@@ -465,7 +481,7 @@ function team_edit_form($team, $label, $url) {
     $x = ($team && $team->joinable)?"checked":"";
     row2(tra("Accept new members?"), "<input type=checkbox name=joinable $x>");
     row2("",
-        "<input type=submit name=new value='$label'>"
+        "<input class=\"btn btn-primary\" type=submit name=new value='$label'>"
     );
     end_table();
     echo "</form>\n";
diff --git a/html/inc/text_transform.inc b/html/inc/text_transform.inc
index 623a9d9..be15471 100644
--- a/html/inc/text_transform.inc
+++ b/html/inc/text_transform.inc
@@ -68,7 +68,6 @@ function output_transform($text, $options = NULL) {
         $options = new output_options; // Defaults in the class definition
     }
     if ($options->htmlitems) {
-        //$text = htmlentities($text);
         $text = htmlspecialchars($text);
     }
     if (is_array($options->highlight_terms)) {
@@ -101,19 +100,66 @@ function get_output_options($user) {
     return $options;
 }
 
-// Converts bbcode to proper HTML
+// Converts bbcode to HTML
 // If $export is true, don't use BOINC CSS
 
+// handle [pre] and [code] separately because we need to remove <br />s
+//
+function replace_pre_code($text, $export) {
+    if ($export) {
+        $text = preg_replace_callback(
+            "@\[pre\](.*?)\[/pre\]@is",
+            function ($matches) {
+                $x = remove_br(substr($matches[0], 5, -6));
+                $x = htmlspecialchars($x, ENT_COMPAT, "UTF-8", false);
+                $x = str_replace("[", "[", $x);
+                return "<pre>$x</pre>";
+            },
+            $text
+        );
+        return preg_replace_callback(
+            "@\[code\](.*?)\[/code\]@is",
+            function ($matches) {
+                $x = remove_br(substr($matches[0], 6, -7));
+                $x = htmlspecialchars($x, ENT_COMPAT, "UTF-8", false);
+                $x = str_replace("[", "[", $x);
+                return "<code>$x</code>";
+            },
+            $text
+        );
+    } else {
+        $text = preg_replace_callback(
+            "@\[pre\](.*?)\[/pre\]@is",
+            function ($matches) {
+                $x = remove_br(substr($matches[0], 5, -6));
+                $x = htmlspecialchars($x, ENT_COMPAT, "UTF-8", false);
+                $x = str_replace("[", "[", $x);
+                return "<div class=\"pre\">$x</div>";
+            },
+            $text
+        );
+        return preg_replace_callback(
+            "@\[code\](.*?)\[/code\]@is",
+            function ($matches) {
+                $x = remove_br(substr($matches[0], 6, -7));
+                $x = htmlspecialchars($x, ENT_COMPAT, "UTF-8", false);
+                $x = str_replace("[", "[", $x);
+                return "<div class=\"code\">$x</div>";
+            },
+            $text
+        );
+    }
+}
+
 function bb2html($text, $export=false) {
     $urlregex = "(?:\"?)(?:(http\:\/\/)?)([^\[\"<\ ]+)(?:\"?)";
     $httpsregex = "(?:\"?)https\:\/\/([^\[\"<\ ]+)(?:\"?)";
     // List of allowable tags
     $bbtags = array (
-        "@\[pre\](.*?)\[/pre\]@is",
-        "@\[code\](.*?)\[/code\]@is",
         "@\[b\](.*?)\[/b\]@is",
         "@\[i\](.*?)\[/i\]@is",
         "@\[u\](.*?)\[/u\]@is",
+        "@\[s\](.*?)\[/s\]@is",
         "@\[sup\](.*?)\[/sup\]@is",
         "@\[url=$httpsregex\](.*?)\[/url\]@is",
         "@\[url\]$httpsregex\[/url\]@is",
@@ -142,11 +188,10 @@ function bb2html($text, $export=false) {
     // What the above tags are turned in to
     if ($export) {
         $htmltags = array (
-            "<pre>\\1</pre>",
-            "<code>\\1</code>",
             "<b>\\1</b>",
             "<i>\\1</i>",
             "<u>\\1</u>",
+            "<s>\\1</s>",
             "<sup>\\1</sup>",
             "<a href=\"https://\\1\" rel=\"nofollow\">\\2</a>",
             "<a href=\"https://\\1\" rel=\"nofollow\">https://\\1</a>",
@@ -170,11 +215,10 @@ function bb2html($text, $export=false) {
         );
     } else {
         $htmltags = array (
-            "<div class=\"pre\">\\1</div>",
-            "<div class=\"code\">\\1</div>",
             "<b>\\1</b>",
             "<i>\\1</i>",
             "<u>\\1</u>",
+            "<s>\\1</s>",
             "<sup>\\1</sup>",
             "<a href=\"https://\\1\" rel=\"nofollow\">\\2</a>",
             "<a href=\"https://\\1\" rel=\"nofollow\">https://\\1</a>",
@@ -204,7 +248,8 @@ function bb2html($text, $export=false) {
     // $i<1000 to prevent DoS
     while ($text != $lasttext && $i<1000) {
         $lasttext = $text;
-        $text = preg_replace($bbtags,$htmltags,$text);
+        $text = replace_pre_code($text, $export);
+        $text = preg_replace($bbtags, $htmltags, $text);
         $i = $i + 1;
     }
     return $text;
@@ -219,16 +264,24 @@ function remove_br($text){
 }
 
 // Make links open in new windows.
+//
 function externalize_links($text) {
     // TODO:  Convert this to PCRE
-    $i=0;$linkpos=true;
-    while (true){                                //Find a link
-        $linkpos=strpos($text,"<a ",$i);
+    $i=0;
+    $linkpos=true;
+    $out = "";
+    while (true){
+        //Find a link
+        //
+        $linkpos=strpos($text, "<a ", $i);
         if ($linkpos===false) break;
-        $out.= substr($text,$i,$linkpos-$i)."<a target=\"_new\" ";        //Replace with target='_new'
-        $i=$linkpos+3;
+
+        //Replace with target='_new'
+        //
+        $out .= substr($text, $i, $linkpos-$i)."<a target=\"_new\" ";
+        $i = $linkpos+3;
     }
-    $out.=substr($text,$i);
+    $out .= substr($text, $i);
     return $out;
 }
 
diff --git a/html/inc/time.inc b/html/inc/time.inc
index b19c5a2..fa69f77 100644
--- a/html/inc/time.inc
+++ b/html/inc/time.inc
@@ -16,7 +16,8 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
-// express a time difference in readable form
+// express a time difference in readable form, e.g. "7 days ago".
+// If it's more than 30 days, just show the date
 //
 function time_diff_str($t1, $t2) {
     if (!$t1 || !$t2) return "---";
@@ -26,6 +27,9 @@ function time_diff_str($t1, $t2) {
         $post="";
         $diff=-$diff;
     } else {
+        if ($diff > 86400*30) {
+            return date_str($t1);
+        }
         $pre="";
         $post=" ago";
     }
diff --git a/html/inc/translation.inc b/html/inc/translation.inc
index 8e5427f..945adff 100644
--- a/html/inc/translation.inc
+++ b/html/inc/translation.inc
@@ -277,7 +277,7 @@ for ($i=0; $i<sizeof($client_languages); $i++) {
 
     // if main language is english, look no further
     //
-    if ($i == 0 && $language == 'en') {
+    if ($i == 0 && ($language == 'en' || $language2 == 'en')) {
         break;
     }
 
diff --git a/html/inc/uotd.inc b/html/inc/uotd.inc
index 0ab0ec3..93ad004 100644
--- a/html/inc/uotd.inc
+++ b/html/inc/uotd.inc
@@ -20,8 +20,10 @@ require_once('../inc/boinc_db.inc');
 require_once('../inc/email.inc');
 require_once('../inc/profile.inc');
 
-define('UOTD_THRESHOLD', 7);
+if (!defined('UOTD_THRESHOLD')) {
+    define('UOTD_THRESHOLD', 7);
     // email sysadmin if # of UOTD candidates falls below this
+}
 
 function uotd_thumbnail($profile, $user) {
     if ($profile->has_picture) {
@@ -36,7 +38,7 @@ function uotd_thumbnail($profile, $user) {
 function show_uotd($profile) {
     $user = BoincUser::lookup_id($profile->userid);
     echo uotd_thumbnail($profile, $user);
-    echo user_links($user, true)."<br>";
+    echo user_links($user, BADGE_HEIGHT_MEDIUM)."<br>";
     $x = output_transform($profile->response1);
     $x = sanitize_tags($x);
     echo sub_sentence($x, ' ', 150, true);
@@ -76,37 +78,40 @@ function select_uotd() {
     } else {
         $query = default_uotd_candidates_query();
     }
-    $result = mysql_query($query);
+    $result = _mysql_query($query);
 
     // If the number of approved profiles dips below a threshold,
     // email the sys admin every time we pick a new one.
     //
-    if ($result && mysql_num_rows($result) < UOTD_THRESHOLD) {
+    if (defined('UOTD_ADMIN_EMAIL')
+        && $result
+        && _mysql_num_rows($result) < UOTD_THRESHOLD
+    ) {
         $u = new BoincUser;
         $u->email_addr = UOTD_ADMIN_EMAIL;
         $u->name = "UOTD admin";
         send_email($u,
             PROJECT . ": User of the Day pool is running low!",
             "The pool of approved candidates for User of the Day has".
-            " reached your assigned threshold: there are now only " . mysql_num_rows($result) . " approved users.\n\n".
+            " reached your assigned threshold: there are now only " . _mysql_num_rows($result) . " approved users.\n\n".
             "To approve more candidates for User of the Day,".
             " go to the " . PROJECT . " administration page and click \"Screen user profiles\""
         );
     }
 
-    if ($result && mysql_num_rows($result) == 0) {
+    if ($result && _mysql_num_rows($result) == 0) {
         // If all verified profiles have been selected as UOTD,
         // reshow the one that was shown least recently.
         //
-        $result = mysql_query("SELECT * FROM profile,user WHERE profile.userid=user.id AND verification=1 ORDER BY uotd_time ASC LIMIT 1");
+        $result = _mysql_query("SELECT * FROM profile,user WHERE profile.userid=user.id AND verification=1 ORDER BY uotd_time ASC LIMIT 1");
     }
 
-    if (!$result || mysql_num_rows($result) == 0) {
+    if (!$result || _mysql_num_rows($result) == 0) {
         // No valid users of the day - do something.
         echo "No screened users found\n";
         exit();
     }
-    $profile = mysql_fetch_object($result);
+    $profile = _mysql_fetch_object($result);
     $user = BoincUser::lookup_id($profile->userid);
 
     // if profile is "orphaned", delete it and try again
@@ -117,7 +122,7 @@ function select_uotd() {
     }
 
     $sql = "UPDATE profile SET uotd_time = ".time()." WHERE userid=$user->id";
-    mysql_query($sql);
+    _mysql_query($sql);
 
     send_email($user,
         "You're the " . PROJECT . " user of the day!",
@@ -154,11 +159,11 @@ function count_uotd_candidates(){
         $query = default_uotd_candidates_query();
     }
     
-    $result = mysql_query($query);
+    $result = _mysql_query($query);
     if($result) {
-        $n = mysql_num_rows($result);
+        $n = _mysql_num_rows($result);
     }
-    mysql_free_result($result);
+    _mysql_free_result($result);
     
     return $n;
 }
@@ -173,7 +178,7 @@ function generate_uotd_gadget($profile, $user) {
         echo "age: $age";
         if($age <= 86400+3600) { // allow for slop
             $x .= uotd_thumbnail($profile, $user);
-            $x .= user_links($user);
+            $x .= user_links($user, BADGE_HEIGHT_MEDIUM);
             $resp = sanitize_tags(output_transform($profile->response1));
             $x .= "  ". sub_sentence($resp, ' ', 250, true);
         }
diff --git a/html/inc/user.inc b/html/inc/user.inc
index 1d61901..ca5d23f 100644
--- a/html/inc/user.inc
+++ b/html/inc/user.inc
@@ -23,6 +23,7 @@ require_once("../inc/team.inc");
 require_once("../inc/friend.inc");
 require_once("../inc/forum_db.inc");
 require_once("../inc/notify.inc");
+require_once("../inc/ldap.inc");
 
 function parse_project($f) {
     $p = new StdClass;
@@ -122,7 +123,7 @@ function show_other_projects($user, $personal) {
     }
     start_table();
     row_heading_array(array(
-        tra("Project")."<br/><span class=\"note\">".tra("Click for user page")."</span>", tra("Total credit"), tra("Average credit"), tra("Since")
+        tra("Project")."<br/><p class=\"text-muted\">".tra("Click for user page")."</p>", tra("Total credit"), tra("Average credit"), tra("Since")
     ));
     foreach($user->projects as $project) {
         show_project($project);
@@ -137,7 +138,9 @@ function total_posts($user) {
 function show_credit($user) {
     row2(tra("Total credit"), format_credit_large($user->total_credit));
     row2(tra("Recent average credit"), format_credit($user->expavg_credit));
-    project_user_credit($user);
+    if (function_exists("project_user_credit")) {
+        project_user_credit($user);
+    }
 }
 
 require_once("../inc/stats_sites.inc");
@@ -158,7 +161,7 @@ function show_user_stats_private($user) {
         $y = sprintf($site[1], $cpid);
         $x .= "<a href=\"$y\">$name</a><br/>\n";
     }
-    $x .= "<br/><span class=\"smalltext\">".tra("Cross-project ID").": $cpid</span>\n";
+    $x .= "<br/><small>".tra("Cross-project ID").": $cpid</small>\n";
     row2(tra("Cross-project statistics"), $x);
     $x = '<a href="cert1.php">'.tra("Account").'</a>';
     if ($user->teamid) {
@@ -180,7 +183,7 @@ function notify_description($notify) {
     case NOTIFY_SUBSCRIBED_POST:
         return subscribed_post_web_line($notify);
     }
-    return tra("Unknown notification type: %1", $notify->type);
+    return null;
 }
 
 function weak_auth($user) {
@@ -191,13 +194,17 @@ function weak_auth($user) {
 // show static user info (private)
 //
 function show_user_info_private($user) {
-    $email_text = $user->email_addr;
-    if (defined("SHOW_NONVALIDATED_EMAIL_ADDR") && !$user->email_validated) {
-        $email_text .= " (<a href=validate_email_addr.php>must be validated</a>)";
-    }
     row1(tra("Account information"));
     row2(tra("Name"), $user->name);
-    row2(tra("Email address"), $email_text);
+    if (LDAP_HOST && is_ldap_email($user->email_addr)) {
+        row2("LDAP ID", ldap_email_to_uid($user->email_addr));
+    } else {
+        $email_text = $user->email_addr;
+        if (defined("SHOW_NONVALIDATED_EMAIL_ADDR") && !$user->email_validated) {
+            $email_text .= " (<a href=validate_email_addr.php>must be validated</a>)";
+        }
+        row2(tra("Email address"), $email_text);
+    }
     if (strlen($user->url)) {
         $x = "<a href=http://$user->url>http://$user->url</a>";
         row2(tra("URL"), $x);
@@ -206,11 +213,20 @@ function show_user_info_private($user) {
     row2(tra("Postal code"), $user->postal_code);
     row2(tra("%1 member since", PROJECT), date_str($user->create_time));
     $url_tokens = url_tokens($user->authenticator);
-    row2(tra("Change"), "<a href=\"edit_email_form.php\">".tra("email address")."</a>
-        · <a href=\"".secure_url_base()."/edit_passwd_form.php\">".tra("password")."</a>
-        · <a href=\"edit_user_info_form.php?$url_tokens\">".tra("other account info")."</a>"
-    );
-    row2(tra("User ID")."<br/><span class=\"note\">".tra("Used in community functions")."</span>", $user->id);
+    if (LDAP_HOST && is_ldap_email($user->email_addr)) {
+        // LDAP accounts can't change email or password
+        //
+        row2(tra("Change"),
+            "<a href=\"edit_user_info_form.php?$url_tokens\">Account info</a>"
+        );
+    } else {
+        row2(tra("Change"),
+            "<a href=\"edit_email_form.php\">".tra("email address")."</a>
+            · <a href=\"".secure_url_base()."/edit_passwd_form.php\">".tra("password")."</a>
+            · <a href=\"edit_user_info_form.php?$url_tokens\">".tra("other account info")."</a>"
+        );
+    }
+    row2(tra("User ID")."<br/><p class=\"text-muted\">".tra("Used in community functions")."</p>", $user->id);
     if (!no_computing()) {
         row2(
             tra("Account keys"),
@@ -235,10 +251,62 @@ function show_user_info_private($user) {
     }
 }
 
+function friend_links($user) {
+    if (is_banished($user)) {
+        return "";
+    }
+    $x = "<table height=\"100\" width=\"150\" border=\"0\" cellpadding=\"4\"><tr><td class=\"friend\">";
+    if ($user->has_profile) {
+        $profile = BoincProfile::lookup_fields("has_picture", "userid=$user->id");
+        if ($profile && $profile->has_picture) {
+            $img_url = profile_thumb_url($user->id);
+        } else {
+            $img_url = URL_BASE."img/head_20.png";
+        }
+        $title = tra("View the profile of %1", $user->name);
+        $alt = tra("Profile");
+        $x .= ' <a href="'.URL_BASE.'view_profile.php?userid='.$user->id.'"><img title="'.$title.'" src="'.$img_url.'" alt="'.$alt.'"></a><br>';
+    }
+    $x .= " <a href=\"".URL_BASE."show_user.php?userid=".$user->id."\">".$user->name."</a>";
+    if ($user->donated == 1) {
+        require_once("../project/donations.inc");
+        $x .= DONATION_LINK;
+    }
+    $x .= "</td></tr></table>\n";
+    return $x;
+}
+
+// show user name, with links to profile if present.
+// if $badge_height is > 0, show badges
+//
+function user_links($user, $badge_height=0) {
+    BoincForumPrefs::lookup($user);
+    if (is_banished($user)) {
+        return "(banished: ID $user->id)";
+    }
+    $x = "";
+    if ($user->has_profile) {
+        $img_url = URL_BASE."img/head_20.png";
+        $x .= ' <a href="'.URL_BASE.'view_profile.php?userid='.$user->id.'"><img title="View the profile of '.$user->name.'" src="'.$img_url.'" alt="Profile"></a>';
+    }
+    $x .= " <a href=\"".URL_BASE."show_user.php?userid=".$user->id."\">".$user->name."</a>";
+    if ($user->donated == 1) {
+        require_once("../project/donations.inc");
+        $x .= DONATION_LINK;
+    }
+    if ($badge_height) {
+        $x .= badges_string(true, $user, $badge_height);
+    }
+    if (function_exists("project_user_links")){
+        $x .= project_user_links($user);
+    }
+    return $x;
+}
+
 function show_community_private($user) {
     row1(tra("Community"));
 
-    show_badges(true, $user);
+    show_badges_row(true, $user);
     if (!DISABLE_PROFILES) {
         if ($user->has_profile) {
             $x = "<a href=\"view_profile.php?userid=$user->id\">".tra("View")."</a> · <a href=\"delete_profile.php\">".tra("Delete")."</a>";
@@ -260,7 +328,12 @@ function show_community_private($user) {
     if (count($notifies)) {
         $x = "";
         foreach ($notifies as $notify) {
-            $x .= "• ".notify_description($notify)."<br>";
+            $y = notify_description($notify);
+            if ($y) {
+                $x .= "• $y<br>";
+            } else {
+                $notify->delete();
+            }
         }
         $x .= "<a href=\"".notify_rss_url($user)."\"><img vspace=\"4\" border=\"0\" src=\"img/rss_icon.gif\" alt=\"RSS\" /></a>";
         row2(tra("Notifications"), $x);
@@ -268,7 +341,7 @@ function show_community_private($user) {
 
     if (!DISABLE_TEAMS) {
         if ($user->teamid) {
-            $team = lookup_team($user->teamid);
+            $team = BoincTeam::lookup_id($user->teamid);
             $x = "<a href=\"team_display.php?teamid=$team->id\">$team->name</a>
                 · <a href=\"team_quit_form.php\">".tra("Quit team")."</a>";
             if (is_team_admin($user, $team)) {
@@ -278,7 +351,7 @@ function show_community_private($user) {
             // if there's a foundership request, notify the founder
             //
             if ($user->id==$team->userid && $team->ping_user >0) {
-                $x .= "<span style=\"color:red;\">".tra("(foundership change request pending)")."</span>";
+                $x .= "<p class=\"text-danger\">".tra("(foundership change request pending)")."</p>";
             }
             row2(tra("Member of team"), $x);
         } else {
@@ -291,7 +364,7 @@ function show_community_private($user) {
                 $x = "<a href=\"team_display.php?teamid=$team->id\">$team->name</a>";
                 $x .= "| <a href=\"team_manage.php?teamid=".$team->id."\">".tra("Administer")."</a>";
                 if ($team->ping_user > 0) {
-                    $x .= "<span style=\"color:red;\">".tra("(foundership change request pending)")."</span>";
+                    $x .= "<p class=\"text-danger\">".tra("(foundership change request pending)")."</span>";
                 }
                 row2(tra("Founder but not member of"), $x);
             }
@@ -304,6 +377,7 @@ function show_community_private($user) {
     if ($n) {
         foreach($friends as $friend) {
             $fuser = BoincUser::lookup_id($friend->user_dest);
+            if (!$fuser) continue;
             $x .= friend_links($fuser);
         }
         row2(tra("Friends")." ($n)", $x);
@@ -338,8 +412,7 @@ function show_user_summary_public($user) {
     if ($user->donated == 1) { 
         if (file_exists("../project/donations.inc")) {
             require_once("../project/donations.inc");
-            $x .= DONATION_LINK;
-            row2(tra("Donor"), $x);
+            row2(tra("Donor"), DONATION_LINK);
         }
     }
 }
@@ -351,12 +424,13 @@ function get_community_links_object($user){
     $cache_object = new StdClass;
     $cache_object->post_count = total_posts($user);
     $cache_object->user = $user;
-    $cache_object->team = lookup_team($user->teamid);
+    $cache_object->team = BoincTeam::lookup_id($user->teamid);
     $cache_object->friends = array();
 
     $friends = BoincFriend::enum("user_src=$user->id and reciprocated=1");
     foreach($friends as $friend) {
         $fuser = BoincUser::lookup_id($friend->user_dest);
+        if (!$fuser) continue;
         $cache_object->friends[] = $fuser;
     }
     return $cache_object;
@@ -487,6 +561,28 @@ function make_user(
 
     $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')");
 
+    if (!$uid) {
+        return null;
+    }
+    $user = BoincUser::lookup_id($uid);
+    if (defined('RECORD_USER_IP')) {
+        $ip = $_SERVER['REMOTE_ADDR'];
+        $ip = BoincDb::escape_string($ip);
+        $user->update("venue='$ip'");
+    }
+    return $user;
+}
+
+function make_user_ldap($email_addr, $name) {
+    $email_addr = BoincDb::escape_string($email_addr);
+    $name = sanitize_tags($name);
+    $name = BoincDb::escape_string($name);
+    $authenticator = random_string();
+    $cross_project_id = random_string();
+    $passwd_hash = random_string();
+    $now = time();
+    $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', '', '', 0, 0, unix_timestamp(), '', 0, 1, 1, '$cross_project_id', '$passwd_hash')");
+
     if ($uid) {
         return BoincUser::lookup_id($uid);
     } else {
@@ -494,6 +590,29 @@ function make_user(
     }
 }
 
+// delete a user and all associated records except
+// result
+// host
+// batch
+// team
+// user_submit
+// user_submit_app
+// credited_job
+// donation_paypal
+// sent_email
+//
+function delete_user($user) {
+    delete_profile($user);
+    forum_delete_user($user);
+        // deletes post, thread, subscription, forum_preferences, forum_logging
+    BoincPrivateMessage::delete_aux("userid=$user->id or senderid=$user->id");
+    BoincNotify::delete_aux("userid=$user->id");
+    BoincCreditUser::delete_user($user);
+    BoincBadgeUser::delete("user_id=$user->id");
+    BoincFriend::delete_aux("user_src=$user->id or user_dest=$user->id");
+    $user->delete();
+}
+
 $cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
 
 ?>
diff --git a/html/inc/util.inc b/html/inc/util.inc
index 533edcb..6bb901f 100644
--- a/html/inc/util.inc
+++ b/html/inc/util.inc
@@ -16,6 +16,12 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
+// Utility functions for BOINC web pages
+
+error_reporting(E_ALL);
+ini_set('display_errors', true);
+ini_set('display_startup_errors', true);
+
 require_once("../inc/util_basic.inc");
 require_once("../project/project.inc");
 require_once("../inc/countries.inc");
@@ -47,6 +53,21 @@ if (!defined('DISABLE_FORUMS')) {
 if (!defined('DISABLE_TEAMS')) {
     define('DISABLE_TEAMS', false);
 }
+if (!defined('DISABLE_BADGES')) {
+    define('DISABLE_BADGES', false);
+}
+if (!defined('BADGE_HEIGHT_SMALL')) {
+    define('BADGE_HEIGHT_SMALL', 20);
+}
+if (!defined('BADGE_HEIGHT_MEDIUM')) {
+    define('BADGE_HEIGHT_MEDIUM', 24);
+}
+if (!defined('BADGE_HEIGHT_LARGE')) {
+    define('BADGE_HEIGHT_LARGE', 56);
+}
+if (!defined('LDAP_HOST')) {
+    define('LDAP_HOST', null);
+}
 
 $caching = false;
     // if set, we're writing to a file rather than to client
@@ -197,6 +218,10 @@ function page_head(
     if ($stylesheet2) {
         echo "<link rel=stylesheet type=\"text/css\" href=\"$stylesheet2\">\n";
     }
+    if (defined("SHORTCUT_ICON")) {
+        echo '<link rel="icon" type="image/x-icon", href="'.SHORTCUT_ICON.'"/>
+';
+    }
     echo "
         <link rel=alternate type=\"application/rss+xml\" title=\"$rssname\" href=\"$rsslink\">
         </head>
@@ -221,11 +246,6 @@ function page_head(
 }
 }
 
-// the following must be included in header
-// for Recaptcha to work with some IE browsers
-//
-define('IE_COMPAT_MODE', '<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8" >');
-
 function page_tail_aux($show_return, $show_date, $prefix="") {
     project_footer($show_return, $show_date, $prefix);
     echo "</body>
@@ -315,12 +335,14 @@ function pretty_time_str($x) {
     return time_str($x);
 }
 
-function start_table($extra="width=\"100%\"") {
-    echo "<table class=bordered $extra>";
+// TODO: currently only a few calls use the arguments, styling should only happen through CSS clases so $extra should be dropped in the future
+function start_table($extra="width=\"100%\"", $class="table-bordered") {
+    echo "<table class=\"table $class\" $extra>";
 }
 
-function start_table_noborder($width="100%") {
-    echo "<table cellpadding=5 width=\"$width\">";
+// TODO: currently no call uses the arguments, styling should only happen through CSS clases so $extra could be dropped in the future
+function start_table_noborder($extra="width=\"100%\"", $class="noborder") {
+    echo "<table class=\"table $class\" $extra>";
 }
 
 function end_table() {
@@ -358,7 +380,11 @@ function table_row() {
 }
 
 function row1($x, $ncols=2, $class="heading") {
-    echo "<tr><td class=\"$class\" colspan=\"$ncols\">$x</td></tr>\n";
+    if ($class == "heading") {
+        echo "<tr><th colspan=\"$ncols\">$x</th></tr>\n";
+    } else {
+        echo "<tr><td class=\"$class\" colspan=\"$ncols\">$x</td></tr>\n";
+    }
 }
 
 function row2($x, $y, $show_error=false) {
@@ -382,16 +408,6 @@ function row2_plain($x, $y) {
     echo "<tr><td>$x</td><td>$y</td></tr>\n";
 }
 
-function row3($x, $y, $z) {
-    echo "<tr><td width=\"30%\" align=\"right\">$x</td><td>$y</td><td>$z</td></tr>\n";
-}
-
-function row4($xx, $xy, $yx, $yy) {
-    echo "<tr><td width=\"25%\">$xx</td><td width=\"25%\">$xy</td>"
-        . "<td width=\"25%\">$yx</td><td width=\"%25\">$yy</td></tr>
-    ";
-}
-
 function rowify($string) {
     echo "<tr><td>$string</td></tr>";
 }
@@ -511,52 +527,6 @@ function format_credit_large($x) {
     return number_format($x, 0);
 }
 
-function friend_links($user) {
-    if (is_banished($user)) {
-        return "";
-    }
-    $x = "<table height=\"100\" width=\"150\" border=\"0\" cellpadding=\"4\"><tr><td class=\"friend\">";
-    if ($user->has_profile) {
-        $profile = BoincProfile::lookup_fields("has_picture", "userid=$user->id");
-        if ($profile && $profile->has_picture) {
-            $img_url = profile_thumb_url($user->id);
-        } else {
-            $img_url = URL_BASE."img/head_20.png";
-        }
-        $title = tra("View the profile of %1", $user->name);
-        $alt = tra("Profile");
-        $x .= ' <a href="'.URL_BASE.'view_profile.php?userid='.$user->id.'"><img title="'.$title.'" src="'.$img_url.'" alt="'.$alt.'"></a><br>';
-    }
-    $x .= " <a href=\"".URL_BASE."show_user.php?userid=".$user->id."\">".$user->name."</a>";
-    if ($user->donated == 1) {
-        require_once("../project/donations.inc");
-        $x .= DONATION_LINK;
-    }
-    $x .= "</td></tr></table>\n";
-    return $x;
-}
-
-function user_links($user) {
-    BoincForumPrefs::lookup($user);
-    if (is_banished($user)) {
-        return "(banished: ID $user->id)";
-    }
-    $x = "";
-    if ($user->has_profile) {
-        $img_url = URL_BASE."img/head_20.png";
-        $x .= ' <a href="'.URL_BASE.'view_profile.php?userid='.$user->id.'"><img title="View the profile of '.$user->name.'" src="'.$img_url.'" alt="Profile"></a>';
-    }
-    $x .= " <a href=\"".URL_BASE."show_user.php?userid=".$user->id."\">".$user->name."</a>";
-    if ($user->donated == 1) {
-        require_once("../project/donations.inc");
-        $x .= DONATION_LINK;
-    }
-    if (function_exists("project_user_links")){
-        $x .= project_user_links($user);
-    }
-    return $x;
-}
-
 function host_link($hostid) {
     if ($hostid) {
         return "<a href=\"show_host_detail.php?hostid=$hostid\">$hostid</a>";
@@ -579,7 +549,7 @@ function close_output_buffer($filename) {
 }
 
 function html_info() {
-    return "<br><a href=bbcode.php target=new><span class=smalltext>".tra("Use BBCode tags to format your text")."</span></a>\n";
+    return "<br><a href=bbcode.php target=new><small>".tra("Use BBCode tags to format your text")."</small></a>\n";
 }
 
 // strip slashes if magic quotes in effect
@@ -769,11 +739,11 @@ function current_url() {
 // @param desc The title of the destination - typically used as a popup
 // @param class The optional CSS class of the button. Defaults to a standard button
 //
-function show_button($url, $text, $desc=null, $class="button") {
+function show_button($url, $text, $desc=null, $class="btn btn-default") {
     if (!$desc) $desc = $text;
     echo "<a href=\"".$url."\" title=\"$desc\" class=\"".$class."\">".$text."</a>\n";
 }
-function button_text($url, $text, $desc=null, $class="button") {
+function button_text($url, $text, $desc=null, $class="btn btn-default") {
     if (!$desc) $desc = $text;
     return "<a href=\"".$url."\" title=\"$desc\" class=\"".$class."\">".$text."</a>\n";
 }
@@ -785,7 +755,7 @@ function button_text($url, $text, $desc=null, $class="button") {
 // @param desc The title of the destination - typically used as a popup
 // @param class The optional CSS class of the button. Defaults to a standard button
 //
-function show_actionlist_button($url, $text, $desc, $class="button"){
+function show_actionlist_button($url, $text, $desc, $class="btn btn-default"){
     echo "<li>";
     echo show_button($url, $text, $desc, $class);
     echo "</li>";
@@ -939,20 +909,28 @@ function redirect_to_secure_url($url) {
     }
 }
 
-function show_badges($is_user, $item) {
-    if (DISABLE_BADGES) return;
+function badges_string($is_user, $item, $height) {
+    if (DISABLE_BADGES) return null;
     if ($is_user) {
         $bus = BoincBadgeUser::enum("user_id=$item->id");
     } else {
         $bus = BoincBadgeTeam::enum("team_id=$item->id");
     }
-    if (!$bus) return;
+    if (!$bus) return null;
     $x = "";
     foreach ($bus as $bu) {
         $badge = BoincBadge::lookup_id($bu->badge_id);
-        $x .= "<img title=\"$badge->title\" height=48 src=$badge->image_url> ";
+        $x .= "<img title=\"$badge->title\" valign=top height=$height src=$badge->image_url> ";
+    }
+    return $x;
+}
+
+function show_badges_row($is_user, $item) {
+    if (BADGE_HEIGHT_LARGE == 0) return;
+    $x = badges_string($is_user, $item, BADGE_HEIGHT_LARGE);
+    if ($x) {
+        row2("Badges", $x);
     }
-    row2("Badges", $x);
 }
 
 function dtime() {
@@ -964,7 +942,8 @@ function dtime() {
 // Format of user agent string is "BOINC client (windows_x86_64 7.3.17)"
 //
 function boinc_client_version(){
-    $x = $_SERVER[HTTP_USER_AGENT];
+    if (!array_key_exists('HTTP_USER_AGENT', $_SERVER)) return 0;
+    $x = $_SERVER['HTTP_USER_AGENT'];
     $e =  "/BOINC client [^ ]* (\d+).(\d+).(\d+)\)/";
     if (preg_match($e, $x, $matches)) {
         return $matches[1]*10000 + $matches[2]*100 + $matches[3];
@@ -972,6 +951,65 @@ function boinc_client_version(){
     return 0;
 }
 
+// output a script for counting chars left in text field
+//
+function text_counter_script() {
+    echo "<script type=\"text/javascript\">
+        function text_counter(field, countfield, maxlimit) {
+            if (field.value.length > maxlimit) {
+                field.value =field.value.substring(0, maxlimit);
+            } else {
+                countfield.value = maxlimit - field.value.length
+            }
+        }
+        </script>
+    ";
+}
+
+// return HTML for a textarea with chars-remaining counter.
+// Call text_counter_script() before using this.
+//
+function textarea_with_counter($name, $maxlen, $text) {
+    $rem_name = $name."_remaining";
+    return "<textarea name=\"$name\" rows=4 cols=50 id=\"$name\" onkeydown=\"text_counter(this.form.$name, this.form.$rem_name, $maxlen);\"
+        onkeyup=\"text_counter(this.form.$name, this.form.$rem_name, $maxlen);\">".$text."</textarea>
+        <br><input name=\"$rem_name\" type=\"text\" id=\"$rem_name\" value=\"".($maxlen-strlen($text))."\" size=\"3\" maxlength=\"3\" readonly> ".tra("characters remaining")
+    ;
+}
+
+// convert number MMmmrr to string MM.mm.rr
+//
+function version_string_maj_min_rel($v) {
+    $maj = (int)($v/10000);
+    $v -= $maj*10000;
+    $min = (int)($v/100);
+    $v -= $min*100;
+    return sprintf("%d.%d.%d", $maj, $min, $v);
+}
+
+// recaptcha utilities
+
+function recaptcha_get_head_extra() {
+    // are we using recaptcha?
+    $publickey = parse_config(get_config(), "<recaptcha_public_key>");
+    if ($publickey) {
+        // the meta tag must be included
+        // for Recaptcha to work with some IE browsers
+        return '<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8" >
+        <script src="https://www.google.com/recaptcha/api.js" async defer></script>';
+    } else {
+        return null;
+    }
+}
+
+function recaptcha_get_html($publickey) {
+    if ($publickey) {
+        return '<div class="g-recaptcha" data-sitekey="' . $publickey . '"></div>';
+    } else {
+        return '';
+    }
+}
+
 $cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
 
 ?>
diff --git a/html/inc/util_basic.inc b/html/inc/util_basic.inc
index a405e91..1dffd30 100644
--- a/html/inc/util_basic.inc
+++ b/html/inc/util_basic.inc
@@ -21,14 +21,19 @@
 
 $generating_xml = false;
 
-function web_stopped() {
+function project_dir() {
     $d = dirname(__FILE__);
-    return file_exists("$d/../../stop_web");
+    return "$d/../..";
+}
+
+function web_stopped() {
+    $d = project_dir();
+    return file_exists("$d/stop_web");
 }
 
 function sched_stopped() {
-    $d = dirname(__FILE__);
-    return file_exists("$d/../../stop_sched");
+    $d = project_dir();
+    return file_exists("$d/stop_sched");
 }
 
 function show_page($x, $y) {
@@ -68,8 +73,8 @@ $g_config = null;
 function get_config() {
     global $g_config;
     if ($g_config == null) {
-        $d = dirname(__FILE__);
-        $g_config = file_get_contents("$d/../../config.xml");
+        $d = project_dir();
+        $g_config = file_get_contents("$d/config.xml");
     }
     return $g_config;
 }
diff --git a/html/inc/util_ops.inc b/html/inc/util_ops.inc
index adfdaff..4227d61 100644
--- a/html/inc/util_ops.inc
+++ b/html/inc/util_ops.inc
@@ -38,7 +38,10 @@ function admin_page_head($title) {
 }
 
 function admin_page_tail() {
-    echo "</body></html>\n";
+    echo "
+        <hr><center><a href=index.php>Main page</a></center>\n
+        </body></html>
+    ";
 }
 
 // TODO: get rid of all the following
@@ -94,13 +97,10 @@ function db_init_cli() {
     print "Database password (if any): ";
     $pass = rtrim(fgets($in, 80));
 
-    $retval = mysql_pconnect($host, $user, $pass);
+    $retval = _mysql_connect($host, $user, $pass, $db_name);
     if (!$retval) {
         die("Can't connect to DB\n");
     }
-    if (!mysql_select_db($db_name)) {
-        die("Can't select DB\n");
-    }
 }
 
 function print_login_form_ops($next_url='') {
@@ -113,7 +113,7 @@ function print_login_form_ops($next_url='') {
     row2("Email", "<input name=email_addr size=40>");
     row2("Password", "<input type=password name=passwd size=40>");
     row2(tra("Stay logged in on this computer"), '<input type="checkbox" name="stay_logged_in" checked>');
-    row2("", "<input type=submit value=OK>");
+    row2("", "<input class=\"btn btn-primary\" type=submit value=OK>");
     end_table();
 }
 
@@ -355,5 +355,35 @@ if (!isset($skip_auth_ops) && array_key_exists("SERVER_PORT", $_SERVER)) {
     auth_ops();
 }
 
+// TODO: use DB interface layer
+//
+function cancel_wus_where($clause) {
+    $q1 = "CREATE TEMPORARY TABLE tmp SELECT id FROM workunit WHERE $clause;";
+    $q2 = "UPDATE result SET server_state=5, outcome=5 WHERE server_state=2 AND workunitid in (SELECT id FROM tmp);";
+    $q3 = "UPDATE workunit SET error_mask=error_mask|16 WHERE id in (SELECT id FROM tmp);";
+    $q4 = "UPDATE workunit SET transition_time=0 WHERE id in (SELECT id FROM tmp);";
+    $q5 = "DROP TABLE tmp;";
+
+    if (!_mysql_query($q1)) {
+        echo "MySQL command '$q1' failed:<br/>unable to create temporary WU id table.<br>\n";
+        return 1;
+    } else if (!_mysql_query($q2)) {
+        echo "MySQL command '$q2' failed:<br/>unable to cancel unsent results.<br>\n";
+        _mysql_query($q5);
+        return 2;
+    } else if (!_mysql_query($q3)) {
+      echo "MySQL command '$q3' failed:<br/>unable to cancel workunits.<br>\n";
+        _mysql_query($q5);
+        return 3;
+    } else if (!_mysql_query($q4)) {
+        echo "MySQL command '$q4' failed:<br/>unable to trigger transitioner.<br>\n";
+        _mysql_query($q5);
+        return 4;
+    } 
+    _mysql_query($q5);
+    echo "Successfully canceled WUs WHERE '$clause'<br>\n";
+    return 0;
+}
+
 $cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
 ?>
diff --git a/html/ops/badge_admin.php b/html/ops/badge_admin.php
index a66087b..6bdb133 100644
--- a/html/ops/badge_admin.php
+++ b/html/ops/badge_admin.php
@@ -25,13 +25,13 @@ function show_form() {
     table_header(
         "ID",
         "name",
-        "type<br><span class=note>0=user<br>1=team</span>",
         "title",
-        "description",
         "image URL",
-        "level",
-        "tags",
-        "SQL rule",
+        "type<br><p class=\"text-muted\">0=user<br>1=team<br>optional</p>",
+        "description<br><p class=\"text-muted\">optional</p>",
+        "level<br><p class=\"text-muted\">optional</p>",
+        "tags<br><p class=\"text-muted\">optional</p>",
+        "SQL rule<br><p class=\"text-muted\">optional</p>",
         "", ""
     );
 
@@ -44,11 +44,9 @@ function show_form() {
         echo "<input type=hidden name=id value=$badge->id>";
         $nu = BoincBadgeUser::count("badge_id=$badge->id");
         $nt = BoincBadgeTeam::count("badge_id=$badge->id");
-        $x = "<br><span class=note>Assigned to $nu users<br>Assigned to $nt teams</span>";
+        $x = "<br><p class=\"text-muted\">Assigned to $nu users<br>Assigned to $nt teams</p>";
         echo "<td><input name=\"name\" value=\"$badge->name\">$x</td>\n";
-        echo "<td><input name=\"type\" size=4 value=\"$badge->type\"></td>\n";
         echo "<td><input name=\"title\" value=\"$badge->title\"></td>\n";
-        echo "<td><input name=\"description\" value=\"$badge->description\"></td>\n";
         $x = "";
         if ($badge->image_url) {
             if (strstr($badge->image_url, "http") == $badge->image_url) {
@@ -59,25 +57,27 @@ function show_form() {
             $x = " <img align=right height=64 src=\"$y\">";
         }
         echo "<td><input name=\"image_url\" value=\"$badge->image_url\">$x</td>\n";
+        echo "<td><input name=\"type\" size=4 value=\"$badge->type\"></td>\n";
+        echo "<td><input name=\"description\" value=\"$badge->description\"></td>\n";
         echo "<td><input name=\"level\" value=\"$badge->level\"></td>\n";
         echo "<td><input name=\"tags\" value=\"$badge->tags\"></td>\n";
         echo "<td><input name=\"sql_rule\" value=\"$badge->sql_rule\"></td>\n";
-        echo "<td><input type=submit name=\"update\" value=Update>\n";
-        echo "<td><input type=submit name=\"delete\" value=Delete>\n";
+        echo "<td><input class=\"btn btn-default\" type=submit name=\"update\" value=Update>\n";
+        echo "<td><input class=\"btn btn-danger\" type=submit name=\"delete\" value=Delete>\n";
         echo "</form></tr>\n";
     }
     
     echo "<tr><form action=badge_admin.php method=POST>";
     echo "<td><br></td>\n";
     echo "<td><input name=\"name\"></td>\n";
-    echo "<td><input name=\"type\" size=4></td>\n";
     echo "<td><input name=\"title\"></td>\n";
-    echo "<td><input name=\"description\"></td>\n";
     echo "<td><input name=\"image_url\"></td>\n";
+    echo "<td><input name=\"type\" size=4></td>\n";
+    echo "<td><input name=\"description\"></td>\n";
     echo "<td><input name=\"level\"></td>\n";
     echo "<td><input name=\"tags\"></td>\n";
     echo "<td><input name=\"sql_rule\"></td>\n";
-    echo "<td colspan=2><input type=submit name=\"add_badge\" value=\"Create badge\"></td>\n";
+    echo "<td colspan=2><input class=\"btn btn-primary\" type=submit name=\"add_badge\" value=\"Create badge\"></td>\n";
     echo "</form></tr>\n";
 
     end_table();
@@ -138,6 +138,18 @@ if (post_str('add_badge', true)) {
     delete_badge();
 }
 admin_page_head("Manage badges");
+echo "
+    Manage the set of badges issued by your project.
+    <p>
+    Badges are assigned using a PHP script;
+    see 
+    <a href=http://boinc.berkeley.edu/trac/wiki/BadgeDoc>
+    http://boinc.berkeley.edu/trac/wiki/BadgeDoc
+    </a>
+    <p>
+    Fields marked 'optional' are not used by the default script.
+";
+
 show_form();
 admin_page_tail();
 ?>
diff --git a/html/ops/badge_assign.php b/html/ops/badge_assign.php
index 94f2d32..6160d2d 100755
--- a/html/ops/badge_assign.php
+++ b/html/ops/badge_assign.php
@@ -76,7 +76,7 @@ function assign_badges($is_user, $badge_pctiles, $badge_images) {
     $kind = $is_user?"user":"team";
     $badges = get_pct_badges($kind."_pct", $badge_pctiles, $badge_images);
     $pctiles = get_percentiles($is_user, $badge_pctiles);
-    echo "thresholds for $kind badges: $pctiles[0] $pctiles[1] $pctiles[2]\n";
+    //echo "thresholds for $kind badges: $pctiles[0] $pctiles[1] $pctiles[2]\n";
 
     $n = 0;
     $maxid = $is_user?BoincUser::max("id"):BoincTeam::max("id");
@@ -95,7 +95,11 @@ function assign_badges($is_user, $badge_pctiles, $badge_images) {
     }
 }
 
+echo "Starting: ", time_str(time()), "\n";
+
 assign_badges(true, $badge_pctiles, $badge_images);
 assign_badges(false, $badge_pctiles, $badge_images);
 
+echo "Finished: ", time_str(time()), "\n";
+
 ?>
diff --git a/html/ops/badge_assign_custom.php b/html/ops/badge_assign_custom.php
new file mode 100755
index 0000000..8e12a67
--- /dev/null
+++ b/html/ops/badge_assign_custom.php
@@ -0,0 +1,189 @@
+#!/usr/bin/env php
+<?php
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2014 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/>.
+
+// Assign badges based on project total and per subproject credit.
+// This code is mostly generic.
+// You'll need to:
+// - define your subproject in project/project.inc
+// - use the <credit_by_app/> option in config.xml
+// - supply your own project themed badge images
+//  that have to follow a naming scheme (see below)
+// See: http://boinc.berkeley.edu/trac/wiki/PerAppCredit
+
+require_once("../inc/util_ops.inc");
+
+// use $sub_projects defined in project/project.inc
+// (this speeds up the assignment of badges)
+// "total" is a special sub project and should only be defined here
+//
+global $sub_projects;
+$badges_sub_projects = $sub_projects;
+$badges_sub_projects[] = array("name" => "project total", "short_name" => "total");
+
+// thresholds for the various badges
+// currently we use the same threshold for all badges (total and subproject)
+// minimum total credits for each level and corresponding names
+//
+$badge_levels = array(
+    50000000, 100000000, 250000000, 500000000, 1000000000, 10000000000,
+    250000000000, 500000000000
+);
+$badge_level_names = array(
+    "50M", "100M", "250M", "500M", "1B", "10B", "25B", "50B"
+);
+
+// images located in html/user/img/ for each badge level
+// the actual filename must have the subproject short name or "total" as prefix
+// e.g.: A_bronze.png is the first level of subproject A,
+// total_bronze.png is the first level of total credit (across all subprojects)
+//
+$badge_images = array(
+    "_bronze.png", "_silver.png", "_gold.png", "_amethyst.png",
+    "_turquoise.png", "_sapphire.png", "_ruby.png", "_emerald.png"
+);
+
+// consistency checks
+//
+$num_levels = count($badge_levels);
+if ($num_levels <> count($badge_level_names)) {
+    die("number of badge_levels is not equal to number of badge_level_names");
+}
+if ($num_levels <> count($badge_images)) {
+    die("number of badge_levels is not equal to number of badge_images");
+}
+
+// get the record for a badge (either total or subproject)
+// badge_name_prefix should be user or team
+// sub_project is an array with name and short_name as in $sub_projects
+//
+function get_badges(
+    $badge_name_prefix, $badge_level_names, $badge_images, $sub_project
+) {
+    $badges = array();
+    for ($i=0; $i<count($badge_level_names); $i++) {
+        $badges[$i] = get_badge($badge_name_prefix."_".$sub_project["short_name"]."_".$i, "$badge_level_names[$i] in ".$sub_project["name"]." credit", $sub_project["short_name"].$badge_images[$i]);
+    }
+    return $badges;
+}
+
+// decide which project total badge to assign, if any.
+// Unassign other badges.
+//
+function assign_tot_badge($is_user, $item, $levels, $badges) {
+    // count from highest to lowest level, so the user get's assigned the
+    // highest possible level and the lower levels get removed
+    //
+    for ($i=count($levels)-1; $i>=0; $i--) {
+        if ($item->total_credit >= $levels[$i]) {
+            assign_badge($is_user, $item, $badges[$i]);
+            unassign_badges($is_user, $item, $badges, $i);
+            return;
+        }
+    }
+    // no level could be assigned so remove them all
+    //
+    unassign_badges($is_user, $item, $badges, -1);
+}
+
+// decide which subproject badge to assign, if any.
+// Unassign other badges.
+//
+function assign_sub_badge($is_user, $item, $levels, $badges, $where_clause) {
+    if ($is_user) {
+        $sub_total = BoincCreditUser::sum('total', "where userid=".$item->id." and ($where_clause)");
+    } else {
+        $sub_total = BoincCreditTeam::sum('total', "where teamid=".$item->id." and ($where_clause)");
+    }
+    // count from highest to lowest level, so the user get's assigned the
+    // highest possible level and the lower levels get removed
+    //
+    for ($i=count($levels)-1; $i>=0; $i--) {
+        if ($sub_total >= $levels[$i]) {
+            assign_badge($is_user, $item, $badges[$i]);
+            unassign_badges($is_user, $item, $badges, $i);
+            return;
+        }
+    }
+    // no level could be assigned so remove them all
+    //
+    unassign_badges($is_user, $item, $badges, -1);
+}
+
+
+// Scan through all the users/teams, 1000 at a time,
+// and assign/unassign the badges (total and subproject)
+//
+function assign_all_badges(
+    $is_user, $badge_levels, $badge_level_names, $badge_images,
+    $subprojects_list
+) {
+    $kind = $is_user?"user":"team";
+
+    // get badges for all subprojects including total
+    //
+    foreach ($subprojects_list as $sp) {
+        $badges[$sp["short_name"]] = get_badges($kind, $badge_level_names, $badge_images, $sp);
+    }
+
+    $n = 0;
+    $maxid = $is_user?BoincUser::max("id"):BoincTeam::max("id");
+    while ($n <= $maxid) {
+        $m = $n + 1000;
+        if ($is_user) {
+            $items = BoincUser::enum_fields("id, total_credit", "id>=$n and id<$m and total_credit>0");
+        } else {
+            $items = BoincTeam::enum_fields("id, total_credit", "id>=$n and id<$m and total_credit>0");
+        }
+        // for every user/team
+        //
+        foreach ($items as $item) {
+            // for every subproject (incl. total)
+            //
+            foreach ($subprojects_list as $sp) {
+                if ($sp["short_name"] == "total") {
+                    assign_tot_badge($is_user, $item, $badge_levels, $badges["total"]);
+                } else {
+                    // appids come from project/project.inc
+                    $where_clause = "appid in (". implode(',', $sp["appids"]) .")";
+                    assign_sub_badge(
+                        $is_user, $item, $badge_levels, $badges[$sp["short_name"]],
+                        $where_clause
+                    );
+                }
+            }
+        }
+        $n = $m;
+    }
+}
+
+// one pass through DB for users
+//
+assign_all_badges(
+    true, $badge_levels, $badge_level_names, $badge_images,
+    $badges_sub_projects
+);
+
+// one pass through DB for teams
+//
+assign_all_badges(
+    false, $badge_levels, $badge_level_names, $badge_images,
+    $badges_sub_projects
+);
+
+?>
diff --git a/html/ops/bbcode_convert.php b/html/ops/bbcode_convert.php
index 341aff5..5747a95 100644
--- a/html/ops/bbcode_convert.php
+++ b/html/ops/bbcode_convert.php
@@ -29,12 +29,12 @@ set_time_limit(0);
 function fix_post($post) {
     $text = html_to_bbcode($post->content);
     if ($text != $post->content) {
-        $query = "update post set content = '".mysql_escape_string($text)."' where id=".$post->id;
+        $query = "update post set content = '"._mysql_escape_string($text)."' where id=".$post->id;
         //echo "$post->content\n\n";
         //echo "$post->thread $query\n\n";
-        $retval = mysql_query($query);
+        $retval = _mysql_query($query);
         if (!$retval) {
-            echo mysql_error();
+            echo _mysql_error();
             exit();
         }
     }
@@ -42,10 +42,10 @@ function fix_post($post) {
 
 function fix_posts() {
     $start_id = 0; //Set this to something else if you like
-    $posts = mysql_query("select * from post where id>$start_id order by id");
-    echo mysql_error();
+    $posts = _mysql_query("select * from post where id>$start_id order by id");
+    echo _mysql_error();
     $i=0;
-    while ($post = mysql_fetch_object($posts)){
+    while ($post = _mysql_fetch_object($posts)){
         $i++; 
         if ($i%100 == 0) {                      //For every 100 posts
             echo $post->id.". "; flush();   // print out where we are
@@ -60,8 +60,8 @@ function fix_posts() {
 
 // use this to patch problem cases; hand-edit
 function fix_fix() {
-    $posts = mysql_query("select * from post where id=99");
-    $post = mysql_fetch_object($posts);
+    $posts = _mysql_query("select * from post where id=99");
+    $post = _mysql_fetch_object($posts);
     fix_post($post);
 }
 
diff --git a/html/ops/bbcode_convert_response1.php b/html/ops/bbcode_convert_response1.php
index f05c2ce..b1c772a 100644
--- a/html/ops/bbcode_convert_response1.php
+++ b/html/ops/bbcode_convert_response1.php
@@ -27,12 +27,12 @@ set_time_limit(0);
 function fix_profile($profile) {
     $text = html_to_bbcode($profile->response1);
     if ($text != $profile->response1) {
-        $query = "update profile set response1 = '".mysql_escape_string($text)."' where userid=".$profile->userid;
+        $query = "update profile set response1 = '"._mysql_escape_string($text)."' where userid=".$profile->userid;
         //echo "$profile->response1\n\n";
         //echo "$profile->thread $query\n\n";
-        $retval = mysql_query($query);
+        $retval = _mysql_query($query);
         if (!$retval) {
-            echo mysql_error();
+            echo _mysql_error();
             exit();
         }
     }
@@ -40,10 +40,10 @@ function fix_profile($profile) {
 
 function fix_profiles() {
     $start_id = 0; //Set this to something else if you like
-    $profiles = mysql_query("select * from profile where userid>$start_id order by userid");
-    echo mysql_error();
+    $profiles = _mysql_query("select * from profile where userid>$start_id order by userid");
+    echo _mysql_error();
     $i=0;
-    while ($profile = mysql_fetch_object($profiles)){
+    while ($profile = _mysql_fetch_object($profiles)){
         $i++; 
         if ($i%100 == 0) {                      //For every 100 profiles
             echo $profile->userid.". "; flush();   // print out where we are
@@ -58,8 +58,8 @@ function fix_profiles() {
 
 // use this to patch problem cases; hand-edit
 function fix_fix() {
-    $profiles = mysql_query("select * from profile where id=99");
-    $profile = mysql_fetch_object($profiles);
+    $profiles = _mysql_query("select * from profile where id=99");
+    $profile = _mysql_fetch_object($profiles);
     fix_profile($profile);
 }
 
diff --git a/html/ops/bbcode_convert_response2.php b/html/ops/bbcode_convert_response2.php
index 1e8c7ec..567e03f 100644
--- a/html/ops/bbcode_convert_response2.php
+++ b/html/ops/bbcode_convert_response2.php
@@ -27,12 +27,12 @@ set_time_limit(0);
 function fix_profile($profile) {
     $text = html_to_bbcode($profile->response2);
     if ($text != $profile->response2) {
-        $query = "update profile set response2 = '".mysql_escape_string($text)."' where userid=".$profile->userid;
+        $query = "update profile set response2 = '"._mysql_escape_string($text)."' where userid=".$profile->userid;
         //echo "$profile->response2\n\n";
         //echo "$profile->thread $query\n\n";
-        $retval = mysql_query($query);
+        $retval = _mysql_query($query);
         if (!$retval) {
-            echo mysql_error();
+            echo _mysql_error();
             exit();
         }
     }
@@ -40,10 +40,10 @@ function fix_profile($profile) {
 
 function fix_profiles() {
     $start_id = 0; //Set this to something else if you like
-    $profiles = mysql_query("select * from profile where userid>$start_id order by userid");
-    echo mysql_error();
+    $profiles = _mysql_query("select * from profile where userid>$start_id order by userid");
+    echo _mysql_error();
     $i=0;
-    while ($profile = mysql_fetch_object($profiles)){
+    while ($profile = _mysql_fetch_object($profiles)){
         $i++; 
         if ($i%100 == 0) {                      //For every 100 profiles
             echo $profile->userid.". "; flush();   // print out where we are
@@ -58,8 +58,8 @@ function fix_profiles() {
 
 // use this to patch problem cases; hand-edit
 function fix_fix() {
-    $profiles = mysql_query("select * from profile where id=99");
-    $profile = mysql_fetch_object($profiles);
+    $profiles = _mysql_query("select * from profile where id=99");
+    $profile = _mysql_fetch_object($profiles);
     fix_profile($profile);
 }
 
diff --git a/html/ops/bbcode_convert_signature.php b/html/ops/bbcode_convert_signature.php
index 36cf31e..ae8b9c5 100644
--- a/html/ops/bbcode_convert_signature.php
+++ b/html/ops/bbcode_convert_signature.php
@@ -27,12 +27,12 @@ set_time_limit(0);
 function fix_forum_preferences($forum_preferences) {
     $text = html_to_bbcode($forum_preferences->signature);
     if ($text != $forum_preferences->signature) {
-        $query = "update forum_preferences set signature = '".mysql_escape_string($text)."' where userid=".$forum_preferences->userid;
+        $query = "update forum_preferences set signature = '"._mysql_escape_string($text)."' where userid=".$forum_preferences->userid;
         //echo "$forum_preferences->signature\n\n";
         //echo "$forum_preferences->thread $query\n\n";
-        $retval = mysql_query($query);
+        $retval = _mysql_query($query);
         if (!$retval) {
-            echo mysql_error();
+            echo _mysql_error();
             exit();
         }
     }
@@ -40,10 +40,10 @@ function fix_forum_preferences($forum_preferences) {
 
 function fix_forum_preferencess() {
     $start_id = 0; //Set this to something else if you like
-    $forum_preferencess = mysql_query("select * from forum_preferences where userid>$start_id order by userid");
-    echo mysql_error();
+    $forum_preferencess = _mysql_query("select * from forum_preferences where userid>$start_id order by userid");
+    echo _mysql_error();
     $i=0;
-    while ($forum_preferences = mysql_fetch_object($forum_preferencess)){
+    while ($forum_preferences = _mysql_fetch_object($forum_preferencess)){
         $i++; 
         if ($i%100 == 0) {                      //For every 100 forum_preferencess
             echo $forum_preferences->userid.". "; flush();   // print out where we are
@@ -58,8 +58,8 @@ function fix_forum_preferencess() {
 
 // use this to patch problem cases; hand-edit
 function fix_fix() {
-    $forum_preferencess = mysql_query("select * from forum_preferences where id=99");
-    $forum_preferences = mysql_fetch_object($forum_preferencess);
+    $forum_preferencess = _mysql_query("select * from forum_preferences where id=99");
+    $forum_preferences = _mysql_fetch_object($forum_preferencess);
     fix_forum_preferences($forum_preferences);
 }
 
diff --git a/html/ops/block_host.php b/html/ops/block_host.php
index c674db3..11636c1 100644
--- a/html/ops/block_host.php
+++ b/html/ops/block_host.php
@@ -40,7 +40,7 @@ $title = "host ".$hostid." max_results_day set to 1 at ".$timestr;
 admin_page_head($title);
 
 if($hostid > 0) {
-    $result = mysql_query("UPDATE host SET max_results_day=1 WHERE id=".$hostid);
+    $result = _mysql_query("UPDATE host SET max_results_day=1 WHERE id=".$hostid);
 }
 
 echo $title;
diff --git a/html/ops/bolt_admin.php b/html/ops/bolt_admin.php
index a930c26..51d3bb6 100644
--- a/html/ops/bolt_admin.php
+++ b/html/ops/bolt_admin.php
@@ -55,10 +55,10 @@ function add_course_form() {
     ";
     start_table();
     row1("Add course");
-    row2("Course name<span class=note><br>Visible to users</span>", "<input name=course_name>");
-    row2("Internal name<span class=note><br>Not visible to users; used as a directory name, so no spaces or special chars</span>", "<input name=short_name>");
-    row2("Description<span class=note><br>Visible to users</span>", "<textarea name=description cols=60></textarea>");
-    row2("", "<input type=submit name=submit value=\"Add course\">");
+    row2("Course name<br><p class=\"text-muted\">Visible to users</p>", "<input name=course_name>");
+    row2("Internal name<br><p class=\"text-muted\">Not visible to users; used as a directory name, so no spaces or special chars</p>", "<input name=short_name>");
+    row2("Description<br><p class=\"text-muted\">Visible to users</p>", "<textarea name=description cols=60></textarea>");
+    row2("", "<input class=\"btn btn-primary\" type=submit name=submit value=\"Add course\">");
     end_table();
     echo "</form>";
 }
@@ -75,7 +75,7 @@ function user_settings() {
     row2("Show hidden courses?", "<input type=checkbox name=show_all $x>");
     $x = ($flags&BOLT_FLAGS_DEBUG)?"checked":"";
     row2("Show debugging output?", "<input type=checkbox name=debug $x>");
-    row2("", "<input type=submit name=submit value=\"Update settings\">");
+    row2("", "<input class=\"btn btn-primary\" type=submit name=submit value=\"Update settings\">");
     end_table();
     echo "</form>";
 }
diff --git a/html/ops/bolt_compare.php b/html/ops/bolt_compare.php
index 00feb98..431b24f 100644
--- a/html/ops/bolt_compare.php
+++ b/html/ops/bolt_compare.php
@@ -128,7 +128,7 @@ function compare_aux($select_name, $xset_name, $snap) {
     echo "
         </td></tr></table>
         <p>
-        <input type=submit value=OK>
+        <input class=\"btn btn-default\" type=submit value=OK>
         </form>
     ";
     admin_page_tail();
@@ -170,7 +170,7 @@ function show_snap_form($top_unit) {
         <input type=hidden name=xset_name value=\"$xset_name\">
         Create a new snapshot using data from the last
         <input name=dur value=7> days.
-        <input type=submit value=OK>
+        <input class=\"btn btn-default\" type=submit value=OK>
         </form>
     ";
     admin_page_tail();
@@ -207,7 +207,7 @@ function show_choice($top_unit) {
     echo "
         <input type=hidden name=action value=snap_form>
         <p>
-        <input type=submit value=OK>
+        <input class=\"btn btn-default\" type=submit value=OK>
     ";
     admin_page_tail();
 }
diff --git a/html/ops/bolt_map.php b/html/ops/bolt_map.php
index 466d469..23ce5ce 100644
--- a/html/ops/bolt_map.php
+++ b/html/ops/bolt_map.php
@@ -86,7 +86,7 @@ function show_snap_form() {
         <input type=hidden name=course_id value=$course_id>
         Create a new snapshot using data from the last
         <input name=dur value=7> days.
-        <input type=submit value=OK>
+        <input class=\"btn btn-default\" type=submit value=OK>
         </form>
     ";
     admin_page_tail();
@@ -408,7 +408,7 @@ function show_map() {
     echo "
         </td></tr></table>
         <p>
-        <input type=submit value=OK>
+        <input class=\"btn btn-default\" type=submit value=OK>
         </form>
     ";
     admin_page_tail();
diff --git a/html/ops/bossa_admin.php b/html/ops/bossa_admin.php
index ca14f6a..26424f5 100644
--- a/html/ops/bossa_admin.php
+++ b/html/ops/bossa_admin.php
@@ -73,22 +73,22 @@ function add_app_form() {
     start_table();
     row1("Add app");
     row2(
-        "Name<span class=note><br>Visible to users</span>",
+        "Name<br><p class=\"text-muted\">Visible to users</p>",
         "<input name=app_name>"
     );
     row2(
-        "Short name<span class=note><br>Used in file and function names - no spaces or special characters</span>",
+        "Short name<br><p class=\"text-muted\">Used in file and function names - no spaces or special characters</p>",
         "<input name=short_name>"
     );
     row2(
-        "Description<span class=note><br>Visible to users</span>",
+        "Description<br><p class=\"text-muted\">Visible to users</p>",
         "<textarea name=description cols=60></textarea>"
     );
     row2("Average time per job", "<input name=time_estimate> seconds");
     row2("Time limit per job", "<input name=time_limit> seconds");
     row2("Fraction of calibration jobs", "<input name=calibration_frac>");
     row2("Name of Bolt training course", "<input name=training_course>");
-    row2("", "<input type=submit submit value=\"Create app\">");
+    row2("", "<input class=\"btn btn-default\" type=submit submit value=\"Create app\">");
     end_table();
     echo "</form>";
 }
@@ -105,7 +105,7 @@ function user_settings() {
     row2("Show hidden apps?", "<input type=checkbox name=show_all $x>");
     $x = ($flags&BOLT_FLAGS_DEBUG)?"checked":"";
     row2("Show debugging output?", "<input type=checkbox name=debug $x>");
-    row2("", "<input type=submit value=\"Update user\">");
+    row2("", "<input class=\"btn btn-default\" type=submit value=\"Update user\">");
     end_table();
     echo "</form>";
 }
diff --git a/html/ops/cancel_workunits.php b/html/ops/cancel_workunits.php
new file mode 100644
index 0000000..9790b77
--- /dev/null
+++ b/html/ops/cancel_workunits.php
@@ -0,0 +1,166 @@
+<?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/>.
+
+// web interface for canceling WUs according to either
+// - ID range
+// - ID list
+// - SQL where clause
+
+// This page shows the form, and a "confirm" page.
+// The actual cancellation is done cancel_workunits_action.php
+
+// TODO:
+// - use get_int() etc. rather than $_REQUEST
+// - use DB interfaces classes, not mysql_query() etc.
+
+require_once("../inc/util_ops.inc");
+
+admin_page_head("Cancel Jobs");
+
+$limit = 100;
+if (array_key_exists('limit',$_REQUEST)) {
+    $nlimit=$_REQUEST['limit'];
+    if ($nlimit != 0) {
+        $limit = $nlimit;
+    }
+}
+
+$clause = "";
+
+if (array_key_exists('minid',$_REQUEST) && $_REQUEST['minid'] != "" &&
+    array_key_exists('maxid',$_REQUEST) && $_REQUEST['maxid'] != "")
+    $clause = "id >=" . $_REQUEST['minid'] . " AND id <=" . $_REQUEST['maxid'];
+else if (array_key_exists('list',$_REQUEST) && $_REQUEST['list'] != "")
+    $clause = "id IN (" . $_REQUEST['list'] . ")";
+else if (array_key_exists('uclause',$_REQUEST) && $_REQUEST['uclause'] != "")
+    $clause = urldecode($_REQUEST['uclause']);
+else if (array_key_exists('clause',$_REQUEST) && $_REQUEST['clause'] != "")
+    // the following line is BS, but apparently I can't find another way to pass a
+    // double quote (") to the query
+    $clause = str_replace('\"', '"', $_REQUEST['clause']);
+
+if ($clause == "") {
+
+    // copied from old cancel_wu_form.php
+    echo "<p>
+    This form may be used to cancel unnecessary or unwanted jobs.
+    We recommend that you stop the project before doing this.
+    Note that the jobs and their corresponding
+    results (if any) are NOT removed from the database.
+    Instead, they are marked as 'no longer needed'.
+    In most cases you should probably only remove jobs whose results
+    are all unsent,
+    since otherwise a user will not get credit
+    for a result that they might return.
+    </p>
+    <p>
+    Please specify jobs by ID range, ID list or clause to be used in a
+    'SELECT FROM workunit WHERE' query.
+    </p>
+    <p>
+    You will be given a list of jobs matching your specification
+    for confirmation before these are actually canceled.
+    </p>
+";
+
+    $page = $_SERVER["REQUEST_URI"];
+    echo "<form action=\"$page\" method=\"get\" enctype=\"application/x-www-form-urlencoded\">\n";
+    echo "<ul><li>\n";
+    echo ' Range: ID of first WU to cancel ';
+    echo '<input name="minid" type="text" size="10" maxlength="15">';
+    echo ' ID of last WU to cancel ';
+    echo '<input name="maxid" type="text" size="10" maxlength="15">';
+    echo "</li><li>\n";
+    echo ' Comma-separated list of IDs ';
+    echo '<input name="list" type="text" size="100" maxlength="200">';
+    echo "</li><li>\n";
+    echo ' WHERE clause (w/o "WHERE") ';
+    echo '<input name="clause" type="text" size="100" maxlength="200">';
+    echo "</li></ul>\n";
+    echo "<p>\n";
+    echo ' Limit ';
+    echo "<input name=\"limit\" type=\"text\" size=\"3\" maxlength=\"3\" value=\"$limit\">";
+    echo "</p>\n";
+    echo "<p>\n";
+    echo '<input type="submit" value="Cancel jobs">';
+    echo "</p>\n";
+
+} else { // if ($clause)
+
+    db_init(true); // try to get list of WUs from replica
+
+    $query = "SELECT id, name FROM workunit WHERE canonical_resultid = 0 AND error_mask = 0 AND $clause;";
+    $dbresult = _mysql_query($query);
+
+    if (!$dbresult) {
+        echo "Error in query '$query'<br>\n";
+    } else {
+
+        echo "<form action=\"cancel_workunits_action.php\" method=\"post\">\n";
+        echo "<input type=\"hidden\" name=\"back\" value=\"cancelwus\"/>";
+
+        echo "<br><table border=\"1\">\n";
+        echo "<tr><th>WU ID</th><th>WU name</th></tr>\n";
+
+        $rescount = 0;
+        while ($res = _mysql_fetch_object($dbresult)) {
+            if ($rescount < $limit) {
+                $id = $res->id;
+                echo "<tr>\n";
+
+                echo "<td align=\"left\" valign=\"top\">";
+                echo "<input type=\"checkbox\" name=\"WU[]\" value=\"$id\" checked>\n";
+                echo "<a href=db_action.php?table=workunit&detail=high&id=";
+                echo $id;
+                echo ">";
+                echo $id;
+                echo "</a>";
+                echo "</td>\n";
+
+                echo "<td align=\"left\" valign=\"top\">";
+                echo $res->name;
+                echo "</td>\n";
+
+                echo "</tr>\n";
+            }
+            $rescount++;
+        } // while (_mysql_fetch_object())
+
+        _mysql_free_result($dbresult);
+
+        echo "</table>\n<p>";
+        echo $rescount;
+        echo " WUs match the query ($query)\n</p>";
+
+        echo "<p>";
+        echo "<input type=\"hidden\" name=\"cancel\" value=\"1\"/>";
+        echo "<input type=\"hidden\" name=\"limit\" value=\"$limit\"/>";
+        $eclause = urlencode($clause);
+        echo "<input type=\"hidden\" name=\"clause\" value=\"$eclause\"/>";
+        echo "<input type=\"submit\" value=\"Cancel checked WUs\">";
+        echo "</p>\n";
+        echo "</form>\n";
+
+    } // if (!$dbresult)
+
+} // if ($clause)
+
+admin_page_tail();
+
+$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+?>
diff --git a/html/ops/cancel_workunits_action.php b/html/ops/cancel_workunits_action.php
new file mode 100644
index 0000000..c829815
--- /dev/null
+++ b/html/ops/cancel_workunits_action.php
@@ -0,0 +1,70 @@
+<?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/util_ops.inc");
+
+admin_page_head("Cancel Workunits");
+
+// check for WUs to cancel
+//
+$WUs = "";
+if (array_key_exists('cancel', $_REQUEST) && ($_REQUEST['cancel'] == 1)) {
+    if (is_array($_REQUEST['WU'])) {
+        foreach ($_REQUEST['WU'] as $key => $value) {
+            if($WUs != "")
+                $WUs = $WUs . ",";
+            $WUs = $WUs . $value;
+        }
+    }
+}
+
+// cancel WUs (if not in rops)
+//
+if($WUs != "") {
+    echo "<!--- WUs to cancel: $WUs --->\n";
+//    if (!in_rops()) {
+        db_init();
+        cancel_wus_where("id IN (" . $WUs . ")");
+//    }
+}
+
+if (array_key_exists('back',$_REQUEST)) {
+    if ($_REQUEST['back'] == "errorwus") {
+        echo "<p><a href=\"errorwus.php\">Return to All-error Workunits page</a></p>";
+    } else if ($_REQUEST['back'] == "cancelwus") {
+        if (array_key_exists('clause', $_REQUEST)) {
+            $limit = 20;
+            if (array_key_exists('limit', $_REQUEST))
+                $limit=$_REQUEST['limit'];
+            $clause=urlencode($_REQUEST['clause']);
+            echo "<p><a href=\"cancel_workunits.php?limit=$limit&uclause=$clause\">";
+            echo "Cancel next (max $limit) Workunits</a></p>";
+        }
+        echo "<p><a href=\"cancel_workunits.php\">Return to Cancel Workunits page</a></p>";
+    }
+}
+
+echo "<p>";
+echo "Page last updated ";
+echo time_str(time());
+echo "</p>\n";
+
+admin_page_tail();
+
+$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+?>
diff --git a/html/ops/cancel_wu_action.php b/html/ops/cancel_wu_action.php
index e926463..a4783b2 100644
--- a/html/ops/cancel_wu_action.php
+++ b/html/ops/cancel_wu_action.php
@@ -31,7 +31,7 @@ $wuid2 = get_int('wuid2');
 $unsent_only = get_str('unsent_only', true);
 
 if ($wuid1<1 || $wuid2<$wuid1) {
-    error_page(
+    admin_error_page(
         "<h2>Workunit IDs fail to satisfy the conditions:<p> 0 < ID1 <= ID2"
     );
 }
diff --git a/html/ops/cancel_wu_form.php b/html/ops/cancel_wu_form.php
index 72b00ae..6a3785c 100644
--- a/html/ops/cancel_wu_form.php
+++ b/html/ops/cancel_wu_form.php
@@ -42,14 +42,14 @@ row2("Workunit ID of first job to cancel", "<input size=\"32\" name=\"wuid1\"");
 row2("Workunit ID of last job to cancel", "<input size=\"32\" name=\"wuid2\"");
 row2(
     "Cancel only jobs with no instance in progress
-        <br><span class=note>
+        <br><p class=\"text-muted\">
         You can cancel jobs with instances that are in progress,
         but if you do so, users will not get credit for these instances.
-        </span>
+        </p>
     ",
     "<input type=checkbox name=unsent_only>"
 );
-row2("", "<input type=\"submit\" value=\"Cancel jobs\">");
+row2("", "<input class=\"btn btn-default\" type=\"submit\" value=\"Cancel jobs\">");
 end_table();
 echo "
     </form>
diff --git a/html/ops/clean_user_names.php b/html/ops/clean_user_names.php
index 15f9e25..6c3f616 100644
--- a/html/ops/clean_user_names.php
+++ b/html/ops/clean_user_names.php
@@ -39,13 +39,13 @@ email: $user->email_addr
         $x = boinc_real_escape_string($x);
         $x = trim($x);
         $query = "update user set name='$x' where id=$user->id";
-        $retval = mysql_query($query);
+        $retval = _mysql_query($query);
         echo $query;
     }
 }
 
-$result = mysql_query("select id, name, email_addr from user");
-while ($user = mysql_fetch_object($result)) {
+$result = _mysql_query("select id, name, email_addr from user");
+while ($user = _mysql_fetch_object($result)) {
     clean_user($user);
 }
 
diff --git a/html/ops/clear_host.php b/html/ops/clear_host.php
index b1b852e..03efc64 100644
--- a/html/ops/clear_host.php
+++ b/html/ops/clear_host.php
@@ -18,14 +18,14 @@
 
 require_once("../inc/util_ops.inc");
 
-db_init();
-$hostid = $_GET["hostid"];
+$hostid = get_int("hostid");
 
-if (!$hostid) {
-    error_page("no host ID\n");
+$host = BoincHost::lookup_id($hostid);
+if (!$host) {
+    admin_error_page("no such host\n");
 }
 
-mysql_query("update host set rpc_time=0 where id='$hostid'");
+$host->update("rpc_time=0");
 echo "Host RPC time cleared for host ID: $hostid\n";
 
 admin_page_tail();
diff --git a/html/ops/credit_study.php b/html/ops/credit_study.php
index 20441ca..2ee832e 100644
--- a/html/ops/credit_study.php
+++ b/html/ops/credit_study.php
@@ -87,15 +87,15 @@ function get_data() {
     for ($i=0; $i<=10; $i++) {
         $sum[] = 0;
     }
-    $r1 = mysql_query(
+    $r1 = _mysql_query(
         "select id from workunit where canonical_resultid>0 limit $nwus"
     );
     $n = 0;
-    while ($wu = mysql_fetch_object($r1)) {
+    while ($wu = _mysql_fetch_object($r1)) {
         $results = array();
-        $r2 = mysql_query("select * from result where workunitid=$wu->id");
+        $r2 = _mysql_query("select * from result where workunitid=$wu->id");
         $found_zero = false;
-        while ($result = mysql_fetch_object($r2)) {
+        while ($result = _mysql_fetch_object($r2)) {
             if ($result->granted_credit==0) continue;   // skip invalid
             $host = BoincHost::lookup_id($result->hostid);
             $r = new StdClass;
diff --git a/html/ops/credit_test.php b/html/ops/credit_test.php
index 19fcb5f..ce7432e 100644
--- a/html/ops/credit_test.php
+++ b/html/ops/credit_test.php
@@ -4,7 +4,7 @@
 
 require_once("../inc/boinc_db.inc");
 
-$db = BoincDb::get();
+db_init();
 
 $min_claimed_credit = 0;
 $max_claimed_credit = 5000;
@@ -20,9 +20,9 @@ if ($limit) {
     $query .= " limit $limit";
 }
 
-$r = $db->do_query($query);
+$r = _mysql_query($query);
 $f = fopen("credit_test_data", "w");
-while ($x = mysql_fetch_object($r)) {
+while ($x = _mysql_fetch_object($r)) {
     fprintf($f, "$x->id $x->workunitid $x->appid $x->hostid $x->claimed_credit $x->app_version_id $x->elapsed_time $x->flops_estimate $x->cpu_time $x->rsc_fpops_est\n");
 }
 fclose($f);
diff --git a/html/ops/db_action.php b/html/ops/db_action.php
index 7291902..676868a 100644
--- a/html/ops/db_action.php
+++ b/html/ops/db_action.php
@@ -30,7 +30,7 @@ $last_pos = get_int("last_pos", true);
 $table = get_str("table", true);
 $detail = get_str("detail", true);
 $clauses = get_str("clauses", true);
-if (strstr($clauses, ";")) error_page("bad clause");
+if (strstr($clauses, ";")) admin_error_page("bad clause");
 
 $q = new SqlQueryString();
 $q->process_form_items();
@@ -125,8 +125,8 @@ if ($table == "host") {
         if ($clauses) {
             $query .= " WHERE $clauses";
         }
-        $result = mysql_query($query);
-        $disk_info = mysql_fetch_object($result);
+        $result = _mysql_query($query);
+        $disk_info = _mysql_fetch_object($result);
         $dt = $disk_info->tot_sum/(1024*1024*1024);
         $df = $disk_info->free_sum/(1024*1024*1024);
         $mt = $disk_info->tot_mem/(1024*1024);
@@ -155,7 +155,7 @@ if ($table == "host") {
     }
 }
 
-$result = mysql_query($main_query);
+$result = _mysql_query($main_query);
 if ($result) {
     if ($detail == "low") {
         start_table();
@@ -174,7 +174,7 @@ if ($result) {
             break;
         }
     }
-    while ($res = mysql_fetch_object($result)) {
+    while ($res = _mysql_fetch_object($result)) {
         if ($detail == "low") {
             switch ($table) {
             case "result":
@@ -222,7 +222,7 @@ if ($result) {
     if ($detail == "low" || $table == "profile") {
          end_table();
     }
-    mysql_free_result($result);
+    _mysql_free_result($result);
 } else {
     echo "<h2>No results found</h2>";
 }
diff --git a/html/ops/db_cleanse.php b/html/ops/db_cleanse.php
index 0b5b796..a12acea 100644
--- a/html/ops/db_cleanse.php
+++ b/html/ops/db_cleanse.php
@@ -34,8 +34,8 @@ function get_lists() {
     $config = get_config();
     $db_name = parse_config($config, "<db_name>");
     $db_host = parse_config($config, "<db_host>");
-    system("mysql $db_name -h $db_host -e \"select workunitid, id from result \" | tail +2 | sort -n > dbc_res.dat");
-    system("mysql $db_name -h $db_host -e \"select id from workunit\" | tail +2 | sort -n > dbc_wu.dat");
+    system("mysql $db_name -h $db_host -e \"select workunitid, id from result \" | tail -n +2 | sort -n > dbc_res.dat");
+    system("mysql $db_name -h $db_host -e \"select id from workunit\" | tail -n +2 | sort -n > dbc_wu.dat");
 }
 
 // N.B.: on Linux we can use join -v to find results without WU.
@@ -91,12 +91,12 @@ function delete_results() {
             echo "bad line: $x\n";
             continue;
         }
-        $result = lookup_result($resid);
+        $result = BoincResult::lookup_id($resid);
         if (!$result) {
             echo "no result $resultid\n";
             continue;
         }
-        $wu = lookup_wu($result->workunitid);
+        $wu = BoincWorkunit::lookup_id($result->workunitid);
         if ($wu) {
             echo "result has WU: $resid\n";
             continue;
@@ -106,7 +106,7 @@ function delete_results() {
         // uncomment the following to actually delete
 
         die("edit script to enable deletion\n");
-        //mysql_query("delete from result where id=$resid");
+        //_mysql_query("delete from result where id=$resid");
     }
 }
 
diff --git a/html/ops/db_form.php b/html/ops/db_form.php
index 41b6f34..48e1eeb 100644
--- a/html/ops/db_form.php
+++ b/html/ops/db_form.php
@@ -95,7 +95,7 @@ switch($table){
 }
 
 row2("Number of entries to show", "<input name=\"nresults\" value=\"20\">");
-row2("", "<input type=\"submit\" value=\"OK\">\n");
+row2("", "<input class=\"btn btn-default\" type=\"submit\" value=\"OK\">\n");
 end_table();
 echo "</form>\n";
 
diff --git a/html/ops/db_update.php b/html/ops/db_update.php
index 57fa4d8..9a5ef35 100644
--- a/html/ops/db_update.php
+++ b/html/ops/db_update.php
@@ -32,9 +32,9 @@ set_time_limit(0);
 
 function do_query($query) {
     echo "Doing query:\n$query\n";
-    $result = mysql_query($query);
+    $result = _mysql_query($query);
     if (!$result) {
-        echo "Failed:\n".mysql_error()."\n";
+        echo "Failed:\n"._mysql_error()."\n";
     } else {
         echo "Success.\n";
     }
@@ -43,7 +43,7 @@ function do_query($query) {
 function update_4_18_2004() {
     do_query("alter table user add cross_project_id varchar(254) not null");
     $result = do_query("select * from user");
-    while ($user = mysql_fetch_object($result)) {
+    while ($user = _mysql_fetch_object($result)) {
         $x = random_string();
         do_query("update user set cross_project_id='$x' where id=$user->id");
     }
@@ -941,6 +941,40 @@ function update_6_5_2014() {
     );
 }
 
+function update_8_15_2014() {
+    do_query(
+        "create table credit_user (
+            userid                  integer         not null,
+            appid                   integer         not null,
+            njobs                   integer         not null,
+            total                   double          not null,
+            expavg                  double          not null,
+            expavg_time             double          not null,
+            credit_type             integer         not null,
+            primary key (userid, appid, credit_type)
+            ) engine=InnoDB
+        "
+    );
+    do_query(
+        "create table credit_team (
+            teamid                  integer         not null,
+            appid                   integer         not null,
+            njobs                   integer         not null,
+            total                   double          not null,
+            expavg                  double          not null,
+            expavg_time             double          not null,
+            credit_type             integer         not null,
+            primary key (teamid, appid, credit_type)
+            ) engine=InnoDB
+        "
+    );
+}
+ 
+function update_10_8_2014() {
+    do_query("alter table user_submit add primary key(user_id)");
+    do_query("alter table user_submit_app add primary key(user_id, app_id)");
+}
+
 // Updates are done automatically if you use "upgrade".
 //
 // If you need to do updates manually,
@@ -983,6 +1017,8 @@ $db_updates = array (
     array(27008, "update_4_2_2014"),
     array(27009, "update_5_3_2014"),
     array(27010, "update_6_5_2014"),
+    array(27011, "update_8_15_2014"),
+    array(27012, "update_10_8_2014"),
 );
 
 ?>
diff --git a/html/ops/dbinfo.php b/html/ops/dbinfo.php
index 0df1a3f..a336d1e 100644
--- a/html/ops/dbinfo.php
+++ b/html/ops/dbinfo.php
@@ -68,7 +68,7 @@ function size_format($size){
 function get_db_info($db_name) 
 {
 	// Carl grabbed this from the mysql.com boards http://dev.mysql.com/doc/refman/5.0/en/show-table-status.html  
-    $result = mysql_query("SHOW TABLE STATUS FROM $db_name");
+    $result = _mysql_query("SHOW TABLE STATUS FROM $db_name");
 
     // SQL output
     // mysql> show table status from [table_name];
@@ -85,7 +85,7 @@ function get_db_info($db_name)
 
 	$i = 0;
 	$db_rec = array();
-	while($myarr = mysql_fetch_assoc($result)) {
+	while($myarr = _mysql_fetch_assoc($result)) {
 
 		// sum grand totals
 		$total  =  $myarr["Data_length"] + $myarr["Index_length"];
@@ -110,16 +110,16 @@ function show_db_info($db_name, $db_rec)
 
 	echo "<table cols=6>";
 	echo "<tr>";
-	echo "<td class=heading colspan=6> Database $db_name </td>";
+	echo "<th colspan=6> Database $db_name </th>";
 	echo "</tr>";
 
 	echo "<tr>";
-	echo "<td class=heading>Table</td>";
-	echo "<td class=heading>Data Size</td>";
-	echo "<td class=heading>Index Size</td>";
-	echo "<td class=heading>Total Size</td>";
-	echo "<td class=heading>Total Rows</td>";
-	echo "<td class=heading>Avg. Size per Row</td>";
+	echo "<th>Table</th>";
+	echo "<th>Data Size</th>";
+	echo "<th>Index Size</th>";
+	echo "<th>Total Size</th>";
+	echo "<th>Total Rows</th>";
+	echo "<th>Avg. Size per Row</th>";
 	echo "</tr>";
 
 	for ($i = 0; $i < sizeof($db_rec)-1; $i++){ 
@@ -136,12 +136,12 @@ function show_db_info($db_name, $db_rec)
 	// Last record is just a summary
 	$i = sizeof($db_rec)-1;
 	echo "<tr>";
-    echo "<td align=left class=heading>" . $db_rec[$i]->name . "</td>";
-    echo "<td align=left class=heading>" . size_format($db_rec[$i]->data_size)  . "</td>";
-    echo "<td align=left class=heading>" . size_format($db_rec[$i]->index_size) . "</td>";
-    echo "<td align=left class=heading>" . size_format($db_rec[$i]->total_size) . "</td>";
-    echo "<td align=left class=heading>" . number_format($db_rec[$i]->rows)     . "</td>";
-    echo "<td align=left class=heading></td>";
+    echo "<th align=left>" . $db_rec[$i]->name . "</th>";
+    echo "<th align=left>" . size_format($db_rec[$i]->data_size)  . "</th>";
+    echo "<th align=left>" . size_format($db_rec[$i]->index_size) . "</th>";
+    echo "<th align=left>" . size_format($db_rec[$i]->total_size) . "</th>";
+    echo "<th align=left>" . number_format($db_rec[$i]->rows)     . "</th>";
+    echo "<th align=left></th>";
 	echo "</tr>";
 
     echo "</table>";
@@ -190,16 +190,16 @@ function sort_db_info($db_name, $db_rec)
 
 	echo "<table cols=6>";
 	echo "<tr>";
-	echo "<td class=heading colspan=6> Database $db_name </td>";
+	echo "<th colspan=6> Database $db_name </th>";
 	echo "</tr>";
 
 	echo "<tr>";
-	echo "<td class=heading><a href='dbinfo.php?sort=name&r=" . (!$r) . "'>Table </a></td>";
-	echo "<td class=heading><a href='dbinfo.php?sort=data_size&r=" . (!$r) . "'>Data Size</a></td>";
-	echo "<td class=heading><a href='dbinfo.php?sort=index_size&r=" . (!$r) . "'>Index Size</a></td>";
-	echo "<td class=heading><a href='dbinfo.php?sort=total_size&r=" . (!$r) . "'>Total Size</a></td>";
-	echo "<td class=heading><a href='dbinfo.php?sort=rows&r=" . (!$r) . "'>Total Rows</a></td>";
-	echo "<td class=heading><a href='dbinfo.php?sort=size_per_row&r=" . (!$r) . "'>Avg. Size per Row</a></td>";
+	echo "<th><a href='dbinfo.php?sort=name&r=" . (!$r) . "'>Table </a></th>";
+	echo "<th><a href='dbinfo.php?sort=data_size&r=" . (!$r) . "'>Data Size</a></th>";
+	echo "<th><a href='dbinfo.php?sort=index_size&r=" . (!$r) . "'>Index Size</a></th>";
+	echo "<th><a href='dbinfo.php?sort=total_size&r=" . (!$r) . "'>Total Size</a></th>";
+	echo "<th><a href='dbinfo.php?sort=rows&r=" . (!$r) . "'>Total Rows</a></th>";
+	echo "<th><a href='dbinfo.php?sort=size_per_row&r=" . (!$r) . "'>Avg. Size per Row</a></th>";
 	echo "</tr>";
 
 	$i = 0;
@@ -219,12 +219,12 @@ function sort_db_info($db_name, $db_rec)
 	// Last record is just a summary
 	$i = sizeof($db_rec)-1;
 	echo "<tr>";
-    echo "<td align=left class=heading>" . $db_rec[$i]->name . "</td>";
-    echo "<td align=left class=heading>" . size_format($db_rec[$i]->data_size)  . "</td>";
-    echo "<td align=left class=heading>" . size_format($db_rec[$i]->index_size) . "</td>";
-    echo "<td align=left class=heading>" . size_format($db_rec[$i]->total_size) . "</td>";
-    echo "<td align=left class=heading>" . number_format($db_rec[$i]->rows)     . "</td>";
-    echo "<td align=left class=heading></td>";
+    echo "<th align=left>" . $db_rec[$i]->name . "</th>";
+    echo "<th align=left>" . size_format($db_rec[$i]->data_size)  . "</th>";
+    echo "<th align=left>" . size_format($db_rec[$i]->index_size) . "</th>";
+    echo "<th align=left>" . size_format($db_rec[$i]->total_size) . "</th>";
+    echo "<th align=left>" . number_format($db_rec[$i]->rows)     . "</th>";
+    echo "<th align=left></th>";
 	echo "</tr>";
 
     echo "</table>";
diff --git a/html/ops/decay_credit_by_app.php b/html/ops/decay_credit_by_app.php
new file mode 100755
index 0000000..603a949
--- /dev/null
+++ b/html/ops/decay_credit_by_app.php
@@ -0,0 +1,54 @@
+#! /usr/bin/env php
+
+<?php
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2014 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/>.
+
+// script to decay exponential average per-app credit
+
+require_once("../inc/credit.inc");
+require_once("../inc/util.inc");
+
+function decay($is_user) {
+    $now = time();
+    if ($is_user) {
+        $cs = BoincCreditUser::enum("");
+    } else {
+        $cs = BoincCreditTeam::enum("");
+    }
+    foreach ($cs as $c) {
+        update_average(
+            $now, 0, 0, $c->expavg, $c->expavg_time
+        );
+        if ($is_user) {
+            $c->update(
+                "expavg=$c->expavg, expavg_time=$c->expavg_time where userid=$c->userid and appid=$c->appid"
+            );
+        } else {
+            $c->update(
+                "expavg=$c->expavg, expavg_time=$c->expavg_time where teamid=$c->teamid and appid=$c->appid"
+            );
+        }
+    }
+}
+
+echo "Starting: ", time_str(time()), "\n";
+decay(true);
+decay(false);
+echo "Ending: ", time_str(time()), "\n";
+
+?>
diff --git a/html/ops/delete_job_files b/html/ops/delete_job_files
index c0888f8..2006639 100755
--- a/html/ops/delete_job_files
+++ b/html/ops/delete_job_files
@@ -44,7 +44,7 @@ while (1) {
         if (!$result) {
             die("query failed: $query\n");
         }
-        $b = mysql_fetch_object($result);
+        $b = _mysql_fetch_object($result);
         if (!$b) continue;
 
         $fname = job_file_name($file->md5);
diff --git a/html/ops/delete_spammers.php b/html/ops/delete_spammers.php
index e7cdd38..e451df9 100755
--- a/html/ops/delete_spammers.php
+++ b/html/ops/delete_spammers.php
@@ -17,13 +17,11 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
-// script to delete spammer accounts, profiles, and forum posts.
+// script to delete spammer accounts, profiles, forum posts, and/or teams.
 //
 // delete_spammers.php [--days n] [--test] command
 //
 // commands:
-// --list filename
-//   "filename" contains a list of user IDs, one per line.
 //
 // --profiles
 //   delete accounts that
@@ -35,13 +33,40 @@
 //   delete accounts that
 //   - have no hosts
 //   - have message-board posts
+//   - don't belong to a team
+//
+// --list filename
+//   "filename" contains a list of user IDs, one per line.
+//
+// --id_range N M
+//   delete users with ID N to M inclusive
+//
+// --teams
+//   delete teams (and their owners) where the team
+//   - has 0 or 1 members
+//   - has no total credit
+//   - has description containing a link
+//   - is not a BOINC-Wide team
+//   and the owner
+//   - has no posts
+//   - has no hosts
+//
+// --user_url
+//   delete accounts that
+//   - have a nonempty URL
+//   - have no hosts
+//   - have no message-board posts
 //
 // options:
 // --days N
-//    Only delete accounts create in last N days
+//    Only delete accounts created in last N days
 // --test
 //    Show what accounts would be deleted, but don't delete them
 
+error_reporting(E_ALL);
+ini_set('display_errors', true);
+ini_set('display_startup_errors', true);
+
 require_once("../inc/db.inc");
 require_once("../inc/profile.inc");
 require_once("../inc/forum.inc");
@@ -52,16 +77,20 @@ $test = false;
 
 // delete a spammer account, and everything associated with it
 //
-function delete_user($user) {
+function do_delete_user($user) {
     global $test;
-    echo "deleting user $user->id email $user->email_addr name $user->name\n";
+    $age = (time() - $user->create_time) / 86400;
+    echo "deleting user\n";
+    echo "   ID: $user->id\n";
+    echo "   email: $user->email_addr\n";
+    echo "   name: $user->name\n";
+    echo "   URL: $user->url\n";
+    echo "   age:$age days\n";
     if ($test) {
+        echo "   (test mode - nothing deleted)\n";
         return;
     }
-    delete_profile($user);
-    forum_delete_user($user);
-    $q = "delete from user where id=$user->id";
-    mysql_query($q);
+    delete_user($user);
 }
 
 function delete_list($fname) {
@@ -70,9 +99,9 @@ function delete_list($fname) {
     while ($s = fgets($f)) {
         $s = trim($s);
         if (!is_numeric($s)) die("bad ID $s\n");
-        $user = BoincUser::lookup_id($s);
+        $user = BoincUser::lookup_id((int)$s);
         if ($user) {
-            delete_user($user);
+            do_delete_user($user);
         } else {
             echo "no user ID $s\n";
         }
@@ -83,6 +112,7 @@ function has_link($x) {
     if (strstr($x, "[url")) return true;
     if (strstr($x, "http://")) return true;
     if (strstr($x, "https://")) return true;
+    if (strstr($x, "www.")) return true;
     return false;
 }
 
@@ -103,7 +133,7 @@ function delete_forums() {
         }
         $n = BoincHost::count("userid=$p->userid");
         if ($n) continue;
-        delete_user($user);
+        do_delete_user($user);
     }
 }
 
@@ -114,7 +144,7 @@ function delete_profiles() {
         if (has_link($p->response1) || has_link($p->response2)) {
             $user = BoincUser::lookup_id($p->userid);
             if (!$user) {
-                echo "profile has missing user: %p->userid\n";
+                echo "profile has missing user: $p->userid\n";
                 continue;
             }
 
@@ -127,14 +157,29 @@ function delete_profiles() {
             $n = BoincPost::count("user=$p->userid");
             if ($n) continue;
 
-            delete_user($user);
+            do_delete_user($user);
             if ($test) {
-                echo "------------\n$p->userid\n$p->response1\n$p->response2\n";
+                echo "\n$p->userid\n$p->response1\n$p->response2\n";
             }
         }
     }
 }
 
+function delete_user_url() {
+    global $test, $days;
+    $users = BoincUser::enum("url <> ''");
+    foreach ($users as $user) {
+        if ($days) {
+            if ($user->create_time < time() - $days*86400) continue;
+        }
+        $n = BoincHost::count("userid=$user->id");
+        if ($n) continue;
+        $n = BoincPost::count("user=$user->id");
+        if ($n) continue;
+        do_delete_user($user);
+    }
+}
+
 function delete_banished() {
     global $days;
     $fps = BoincForumPrefs::enum("banished_until>0");
@@ -142,10 +187,44 @@ function delete_banished() {
         $user = BoincUser::lookup_id($fp->userid);
         if (!$user) continue;
         if ($user->create_time < time() - $days*86400) continue;
-        delete_user($user);
+        do_delete_user($user);
     }
 }
 
+function delete_teams() {
+    global $days, $test;
+    $query = "nusers < 2 and seti_id=0 and total_credit=0";
+    if ($days) {
+        $x = time() - $days*86400;
+        $query .= " and create_time > $x";
+    }
+    $teams = BoincTeam::enum($query);
+    foreach ($teams as $team) {
+        $n = team_count_members($team->id);
+        if ($n > 1) continue;
+        if (!has_link($team->description)) continue;
+        $user = BoincUser::lookup_id($team->userid);
+        if ($user) {
+            $n = BoincPost::count("user=$user->id");
+            if ($n) continue;
+            $n = BoincHost::count("userid=$user->id");
+            if ($n) continue;
+        }
+        if ($test) {
+            echo "would delete team:\n";
+            echo "   ID: $team->id\n";
+            echo "   name: $team->name\n";
+            echo "   description: $team->description\n";
+        } else {
+            $team->delete();
+            echo "deleted team ID $team->id name $team->name\n";
+            if ($user) do_delete_user($user);
+        }
+    }
+}
+
+echo "Starting: ".strftime('%Y-%m-%d %H:%M %Z')."\n";
+
 for ($i=1; $i<$argc; $i++) {
     if ($argv[$i] == "--test") {
         $test = true;
@@ -163,15 +242,27 @@ for ($i=1; $i<$argc; $i++) {
         if (!is_numeric($id1) || !is_numeric($id2)) {
             die ("bad args\n");
         }
+        if ($id2 < $id1) {
+            die("bad args\n");
+        }
         for ($i=$id1; $i <= $id2; $i++) {
-            echo "deleting $i\n";
-            delete_user($i);
+            $user = BoincUser::lookup_id($i);
+            if ($user) {
+                echo "deleting user $i\n";
+                do_delete_user($user);
+            }
         }
     } else if ($argv[$i] == "--banished") {
         delete_banished();
+    } else if ($argv[$i] == "--teams") {
+        delete_teams();
+    } else if ($argv[$i] == "--user_url") {
+        delete_user_url();
     } else {
-        echo "usage: delete_spammers.php [--list file] [--id_range N M] [--auto]\n";
+        echo "usage: delete_spammers.php [--days N] [--test] [--list filename] [--profiles] [--forums] [--id_range N M] [--teams] [--user_url]\n";
+        exit;
     }
 }
+echo "Finished: ".strftime('%Y-%m-%d %H:%M %Z')."\n";
 
 ?>
diff --git a/html/ops/eah_server_status.php b/html/ops/eah_server_status.php
index 941f592..d213cf2 100644
--- a/html/ops/eah_server_status.php
+++ b/html/ops/eah_server_status.php
@@ -26,23 +26,23 @@ require_once("../project/project.inc");
 
 function numerical_query($query) {
     // execute a database query which returns a single numerical result
-    $result = mysql_query("$query");
-    $x = mysql_fetch_object($result);
+    $result = _mysql_query("$query");
+    $x = _mysql_fetch_object($result);
     return $x->total;
 }
 
 function count_estimate($query) {
     // this use of explain is way off at least for low counts -EAM 28Sep2004
-    //$result = mysql_query("explain $query");
-    $result = mysql_query("$query");
-    $x = mysql_fetch_object($result);
+    //$result = _mysql_query("explain $query");
+    $result = _mysql_query("$query");
+    $x = _mysql_fetch_object($result);
     //    return $x->rows-1;
     return $x->total;
 }
 
 function find_oldest() {
-   $result=mysql_query("select name,create_time from result where server_state=2 order by create_time limit 1");
-   $x = mysql_fetch_object($result);
+   $result=_mysql_query("select name,create_time from result where server_state=2 order by create_time limit 1");
+   $x = _mysql_fetch_object($result);
    return $x->create_time;
 }
 
diff --git a/html/ops/error_summary.php b/html/ops/error_summary.php
new file mode 100644
index 0000000..5aee8d4
--- /dev/null
+++ b/html/ops/error_summary.php
@@ -0,0 +1,63 @@
+<?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/>.
+
+// generate a list of the most common exit codes
+// and links to N examples of each
+
+require_once("../inc/util.inc");
+require_once("../inc/result.inc");
+
+function compare ($x, $y) {
+    return $x->count < $y->count;
+}
+
+$t = time() - 7*86400;
+$results = BoincResult::enum_fields("id, exit_status", "server_state=5 and outcome=3 and exit_status<>0 and received_time>$t", "");
+$error_codes = array();
+foreach ($results as $r) {
+    $e = $r->exit_status;
+    if (array_key_exists($e, $error_codes)) {
+        $x = $error_codes[$e];
+        $x->count++;
+        $x->results[] = $r;
+        $error_codes[$e] = $x;
+    } else {
+        $x = new StdClass;
+        $x->count = 0;
+        $x->results = array($r);
+        $error_codes[$e] = $x;
+    }
+}
+
+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";
+    $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";
+    }
+}
+page_tail();
+
+?>
diff --git a/html/ops/errorwus.php b/html/ops/errorwus.php
index ddd1488..10bdbee 100644
--- a/html/ops/errorwus.php
+++ b/html/ops/errorwus.php
@@ -60,7 +60,7 @@ function print_wu($id,$name,$quorum,$errors) {
   echo "</tr>\n";
 }
 
-$dbresult = mysql_query("
+$dbresult = _mysql_query("
   SELECT workunitid, outcome, workunit.name, min_quorum
   FROM result, workunit
   WHERE workunit.id = workunitid AND server_state = 5
@@ -79,7 +79,7 @@ $errors = 0;
 // The current version scans for client errors only.
 // In case you want to include validate errors, add "|| (outcome = 6)" to "(outcome = 3)"
 
-while ($res = mysql_fetch_object($dbresult)) {
+while ($res = _mysql_fetch_object($dbresult)) {
   $id = $res->workunitid;
   if ($id != $previd) {
     if ($errors > $prevquorum + $notification_level) {
@@ -98,7 +98,7 @@ while ($res = mysql_fetch_object($dbresult)) {
     $errors = 0;
   }
 }
-mysql_free_result($dbresult);
+_mysql_free_result($dbresult);
 if ($errors > $prevquorum) {
   print_wu($id,$prevname,$prevquorum,$errors);
   $rescount++;
diff --git a/html/ops/export_credit_by_app.php b/html/ops/export_credit_by_app.php
new file mode 100755
index 0000000..a5e4be3
--- /dev/null
+++ b/html/ops/export_credit_by_app.php
@@ -0,0 +1,90 @@
+#! /usr/bin/env php
+<?php
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2014 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/>.
+
+// export_credit_by_app.php dir
+// write compressed XML versions of the credit_user and credit_team tables in
+// dir/user_work.gz and dir/team_work.gz
+//
+// This is run by db_dump; you can also run it separately
+
+require_once("../inc/util_ops.inc");
+
+function export_item($item, $is_user, $f) {
+    global $sub_projects;
+
+    fprintf($f, $is_user?"<user>\n":"<team>\n");
+    fprintf($f, "    <id>$item->id</id>\n");
+    $crs = $is_user?
+        BoincCreditUser::enum("userid=$item->id")
+        : BoincCreditTeam::enum("teamid=$item->id")
+    ;
+    foreach ($sub_projects as $sub_project) {
+        $total = 0;
+        $average = 0;
+        $njobs = 0;
+        foreach ($crs as $cr) {
+            if (in_array($cr->appid, $sub_project["appids"])) {
+                $total += $cr->total;
+                $average += $cr->expavg;
+                $njobs += $cr->njobs;
+            }
+        }
+        if ($total) {
+            fprintf($f,
+                "    <subproject name=\"".$sub_project["name"]."\">\n".
+                "        <workunits>$njobs</workunits>\n".
+                "        <credit>$total</credit>\n".
+                "        <expavg_credit>$average</expavg_credit>\n".
+                "    </subproject>\n"
+            );
+        }
+    }
+
+    fprintf($f, $is_user?"</user>\n":"</team>\n");
+}
+
+function export($is_user, $dir) {
+    $n = 0;
+    $filename = $is_user?"$dir/user_work":"$dir/team_work";
+    $f = fopen($filename, "w");
+    if (!$f) die("fopen");
+    $is_user?  fprintf($f, "<users>\n"): fprintf($f, "<teams>\n");
+    $maxid = $is_user?BoincUser::max("id"):BoincTeam::max("id");
+    while ($n <= $maxid) {
+        $m = $n + 1000;
+        if ($is_user) {
+            $items = BoincUser::enum_fields("id", "id>=$n and id<$m and total_credit>0");
+        } else {
+            $items = BoincTeam::enum_fields("id", "id>=$n and id<$m and total_credit>0");
+        }
+        foreach ($items as $item) {
+            export_item($item, $is_user, $f);
+        }
+        $n = $m;
+    }
+    $is_user?  fprintf($f, "</users>\n"): fprintf($f, "</teams>\n");
+    fclose($f);
+    system("gzip -f $filename");
+}
+
+if ($argc != 2) die("usage");
+$dir = $argv[1];
+export(true, $dir);
+export(false, $dir);
+?>
diff --git a/html/ops/failure_result_summary_by_host.php b/html/ops/failure_result_summary_by_host.php
index 15cff96..04cb982 100644
--- a/html/ops/failure_result_summary_by_host.php
+++ b/html/ops/failure_result_summary_by_host.php
@@ -61,7 +61,7 @@ GROUP BY
 order by error_count desc
 ";
 
-$result = mysql_query($main_query);
+$result = _mysql_query($main_query);
 
 start_table();
 table_header(
@@ -69,7 +69,7 @@ table_header(
     "Error count"
 );
 
-while ($res = mysql_fetch_object($result)) {
+while ($res = _mysql_fetch_object($result)) {
     table_row(
         app_version_desc($res->app_version_id),
         "<a href=".URL_BASE."show_host_detail.php?hostid=$res->Host_ID>$res->Host_ID</a>",
@@ -77,7 +77,7 @@ while ($res = mysql_fetch_object($result)) {
         "<a href=db_action.php?table=result&detail=low&hostid=$res->Host_ID&app_version_id=$res->app_version_id&server_state=5&outcome=3>$res->error_count</a>"
     );
 }
-mysql_free_result($result);
+_mysql_free_result($result);
 
 end_table();
 
diff --git a/html/ops/failure_result_summary_by_platform.php b/html/ops/failure_result_summary_by_platform.php
index 64e423a..63f0550 100644
--- a/html/ops/failure_result_summary_by_platform.php
+++ b/html/ops/failure_result_summary_by_platform.php
@@ -57,14 +57,14 @@ order by error_count desc
 ";
 
 $urlquery = $q->urlquery;
-$result = mysql_query($main_query);
+$result = _mysql_query($main_query);
 
 start_table();
 table_header(
     "App version", "Exit Status", "Error Count"
 );
 
-while ($res = mysql_fetch_object($result)) {
+while ($res = _mysql_fetch_object($result)) {
     $exit_status_condition = "exit_status=$res->exit_status";
     table_row(
         app_version_desc($res->app_version_id),
@@ -77,7 +77,7 @@ while ($res = mysql_fetch_object($result)) {
         $res->error_count
     );
 }
-mysql_free_result($result);
+_mysql_free_result($result);
 
 end_table();
 
diff --git a/html/ops/forum_repair.php b/html/ops/forum_repair.php
index 6f63c90..8721314 100644
--- a/html/ops/forum_repair.php
+++ b/html/ops/forum_repair.php
@@ -32,14 +32,14 @@ function update_thread_timestamps() {
     $threads = BoincThread::enum();
     foreach ($threads as $thread) {
         $q = "select max(timestamp) as foo from post where thread=$thread->id";
-        $r2 = mysql_query($q);
-        $m = mysql_fetch_object($r2);
+        $r2 = _mysql_query($q);
+        $m = _mysql_fetch_object($r2);
         echo "id: $thread->id; min: $m->foo\n";
-        mysql_free_result($r2);
+        _mysql_free_result($r2);
         $n = $m->foo;
         if ($n) {
             $q = "update thread set timestamp=$n where id=$thread->id";
-            mysql_query($q);
+            _mysql_query($q);
         }
     }
 }
diff --git a/html/ops/grant_credit.php b/html/ops/grant_credit.php
index e213cc1..5f532e3 100644
--- a/html/ops/grant_credit.php
+++ b/html/ops/grant_credit.php
@@ -40,7 +40,7 @@ function testquery($argstring) {
         echo "WOULD DO: $argstring\n";
     }
     else {
-        mysql_query($argstring);
+        _mysql_query($argstring);
     }
     return;
 }
@@ -48,19 +48,19 @@ function testquery($argstring) {
 function grant_credits_for_wu($wuid) {
     $max_credit=300;
     $ndone = 0;
-    $query_r = mysql_query("select * from result where granted_credit=0 and claimed_credit>0 and workunitid=$wuid");
+    $query_r = _mysql_query("select * from result where granted_credit=0 and claimed_credit>0 and workunitid=$wuid");
  
-    while ($result = mysql_fetch_object($query_r)) {
+    while ($result = _mysql_fetch_object($query_r)) {
         echo "STARTING RESULT $result->id [Credit $result->claimed_credit] ...";
         $ndone++;
 
         $hostid  = $result->hostid;
-        $query_h = mysql_query("select * from host where id=$hostid");
-        $host    = mysql_fetch_object($query_h);
+        $query_h = _mysql_query("select * from host where id=$hostid");
+        $host    = _mysql_fetch_object($query_h);
 
         $userid  = $result->userid;
-        $query_u = mysql_query("select * from user where id=$userid");
-        $user    = mysql_fetch_object($query_u);
+        $query_u = _mysql_query("select * from user where id=$userid");
+        $user    = _mysql_fetch_object($query_u);
 
         $credit = $result->claimed_credit;
         if ($credit>$max_credit) {
@@ -87,30 +87,30 @@ function grant_credits_for_wu($wuid) {
 
         $teamid = $user->teamid;
         if ($teamid) {
-            $query_t = mysql_query("select * from team where id=$teamid");
-            $team    = mysql_fetch_object($query_t);
+            $query_t = _mysql_query("select * from team where id=$teamid");
+            $team    = _mysql_fetch_object($query_t);
             $team->total_credit += $credit;
             update_average(time(0), $result->sent_time, $credit, $team->expavg_credit, $team->expavg_time);
             testquery("update team set total_credit=$team->total_credit, expavg_credit=$team->expavg_credit, expavg_time=$team->expavg_time where id=$teamid");
-            mysql_free_result($query_t);
+            _mysql_free_result($query_t);
         }
-        mysql_free_result($query_h);
-        mysql_free_result($query_u);
+        _mysql_free_result($query_h);
+        _mysql_free_result($query_u);
         echo " DONE\n";
     }
-    mysql_free_result($query_r);
+    _mysql_free_result($query_r);
     return $ndone;
 }
 
 function grant_credits_for_cancelled() {
     $ngranted=0;
-    $query_w  = mysql_query("select * from workunit where error_mask!=0");
-    while (($workunit = mysql_fetch_object($query_w))) {
+    $query_w  = _mysql_query("select * from workunit where error_mask!=0");
+    while (($workunit = _mysql_fetch_object($query_w))) {
         // echo "Starting WU $workunit->id\n";
         $ngranted += grant_credits_for_wu($workunit->id);
         // NEED TO SET assimilate_state=READY for WU!!
     }
-    mysql_free_result($query_w);
+    _mysql_free_result($query_w);
 
     echo "\nGranted credits to $ngranted results\n";
 }
diff --git a/html/ops/hrclass_summary.php b/html/ops/hrclass_summary.php
index 3159714..9183991 100644
--- a/html/ops/hrclass_summary.php
+++ b/html/ops/hrclass_summary.php
@@ -58,14 +58,14 @@ $cpu_string[ 21 ] = "Intel Core2";
 
 $query = "SELECT COUNT(workunit.id) AS count FROM workunit LEFT JOIN result ON workunit.id=result.workunitid WHERE result.server_state=2 AND workunit.hr_class=";
 
-function get_mysql_count( $hr_class ) {
-    $result = mysql_query("select count(id) as count from workunit where hr_class=" . $hr_class);
-    $count = mysql_fetch_object($result);
-    mysql_free_result($result);
+function get_mysql_count($hr_class) {
+    $result = _mysql_query("select count(id) as count from workunit where hr_class=" . $hr_class);
+    $count = _mysql_fetch_object($result);
+    _mysql_free_result($result);
     return $count->count;
 }
 
-function make_reset_url( $hr_class ) {
+function make_reset_url($hr_class) {
     return ("<a href=ops_reset_hrclass.php?hr_class=".$hr_class.">".$hr_class."</a>");
 }
 
@@ -74,22 +74,30 @@ db_init();
 $timestr = time_str(time(0));
 $title = "hr_class summary list at ".$timestr;
 
-admin_page_head( $title );
+admin_page_head($title);
 
 start_table();
 
-row4( "<b>hr_class</b>", "<b>System</b>", "<b>CPU</b>", "<b># unsent results</b>" );
+table_header(
+    "hr_class", "System", "CPU", "# unsent results"
+);
 
 $unsentresults = get_mysql_count( 0 );
-row4( make_reset_url( 0 ), $system_string[ 128 ], $cpu_string[ 0 ], $unsentresults  );
+table_row(
+    make_reset_url(0), $system_string[ 128 ], $cpu_string[ 0 ], $unsentresults  );
 
-for( $system = 2; $system < 6; ++$system ) {
-    for( $cpu = 1; $cpu < 22; ++$cpu ) {
+for ($system = 2; $system < 6; ++$system ) {
+    for ($cpu = 1; $cpu < 22; ++$cpu ) {
         $hr_class=128*$system+$cpu;
 
         $unsentresults = get_mysql_count( $hr_class );
 
-        row4( make_reset_url( $hr_class ), $system_string[ $system * 128 ], $cpu_string[ $cpu ], $unsentresults  );
+        table_row(
+            make_reset_url($hr_class),
+            $system_string[$system * 128],
+            $cpu_string[$cpu],
+            $unsentresults
+        );
     }
 }
 
diff --git a/html/ops/index.php b/html/ops/index.php
index 2dd6aeb..aa9c6e0 100644
--- a/html/ops/index.php
+++ b/html/ops/index.php
@@ -79,6 +79,10 @@ if ($uotd_candidates >= 0) {
 
 echo "</ul>\n";
 
+if (function_exists('admin_index_extra')) {
+    admin_index_extra();
+}
+
 echo "
     <p>
     <table border=\"0\"><tr valign=\"top\">
@@ -104,18 +108,19 @@ echo "
         <li><a href=\"manage_app_versions.php\">Manage application versions</a></li>
         <li> Manage jobs
         <ul>
-            <li><a href=\"cancel_wu_form.php\">Cancel jobs</a></li>
+            <li><a href=\"cancel_wu_form.php\">Cancel jobs by ID</a>
+            <li><a href=\"cancel_workunits.php\">Cancel jobs by SQL clause</a>
             <li><a href=transition_all.php>Transition jobs</a>
-              <br><span class=note>(this can 'unstick' old jobs)</span>
-            <li><a href=\"revalidate.php\">Re-validate jobs</a></li>
-
+              <p class=\"text-muted\">(this can 'unstick' old jobs)</p>
+            <li><a href=\"revalidate.php\">Re-validate jobs</a>
+            <li><a href=assign.php>Assigned jobs</a>
         </ul>
         <li><a href=\"job_times.php\">FLOP count statistics</a>
         <li><a href=\"$stripchart_cgi_url/stripchart.cgi\">Stripcharts</a>
         <li><a href=\"show_log.php\">Show/Grep logs</a>
         <li>
             <form method=\"get\" action=\"clear_host.php\">
-            <input type=\"submit\" value=\"Clear RPC seqno\">
+            <input class=\"btn btn-default\" type=\"submit\" value=\"Clear RPC seqno\">
             host ID: 
             <input type=\"text\" size=\"5\" name=\"hostid\">
             </form>
@@ -131,7 +136,7 @@ echo "
         <li><a href=".URL_BASE."/manage_project.php>User job submission privileges</a></li>
         <li><a href=\"mass_email.php\">Send mass email to a selected set of users</a></li>
         <li><form action=\"manage_user.php\">
-            <input type=\"submit\" value=\"Manage user\">
+            <input class=\"btn btn-default\" type=\"submit\" value=\"Manage user\">
             ID: <input name=\"userid\">
             </form>
         </li>
diff --git a/html/ops/job_times.php b/html/ops/job_times.php
index 083cb42..55fbbfd 100644
--- a/html/ops/job_times.php
+++ b/html/ops/job_times.php
@@ -155,10 +155,10 @@ function analyze($appid, $app_version_id, $nresults) {
     $clause = $app_version_id?" and app_version_id = $app_version_id ":"";
 
     $query = "select id, server_state, outcome, elapsed_time, flops_estimate from result where server_state=5 and appid=$appid and outcome=1 and validate_state=1 $clause order by id desc limit $nresults";
-    $r = mysql_query($query);
+    $r = _mysql_query($query);
 
     $n = 0;
-    while ($result = mysql_fetch_object($r)) {
+    while ($result = _mysql_fetch_object($r)) {
         handle_result($result);
         $n++;
     }
@@ -188,7 +188,7 @@ function show_app_select() {
             $app->user_friendly_name
         ";
     }
-    echo "<br><br><input type=submit value=OK>";
+    echo "<br><br><input class=\"btn btn-default\" type=submit value=OK>";
     admin_page_tail();
 }
 
@@ -200,9 +200,9 @@ function show_form($appid) {
     ";
     start_table();
     row2("App version:", version_select($appid));
-    row2("Resolution:<br><span class=note>(if you see only one bar, use a smaller value)</span>", "<input name=quantum value=1e12>");
+    row2("Resolution:<br><p class=\"text-muted\">(if you see only one bar, use a smaller value)</p>", "<input name=quantum value=1e12>");
     row2("Sample size (# of jobs):", "<input name=nresults value=1000>");
-    row2("", "<input type=submit name=submit value=OK>");
+    row2("", "<input class=\"btn btn-default\" type=submit name=submit value=OK>");
     end_table();
     echo "
         </form>
diff --git a/html/ops/list_new_users.php b/html/ops/list_new_users.php
index d6836d5..1d70d4b 100644
--- a/html/ops/list_new_users.php
+++ b/html/ops/list_new_users.php
@@ -45,12 +45,12 @@ echo "Clicking on a name opens a user management page <i>in another window or ta
 echo "<form name=\"new_user_limit\" action=\"?\" method=\"GET\">\n";
 echo "<label for=\"limit\">Limit displayed users to</label>\n";
 echo "<input type=\"text\" value=\"".$limit."\" name=\"limit\" id=\"limit\" size=\"5\">";
-echo "<input type=\"submit\" value=\"Display\">\n";
+echo "<input class=\"btn btn-default\" type=\"submit\" value=\"Display\">\n";
 echo "</form>\n";
 
 $query="SELECT * FROM user ORDER BY create_time DESC LIMIT $limit";
-$result = mysql_query($query);
-if (mysql_num_rows($result) < 1) {
+$result = _mysql_query($query);
+if (_mysql_num_rows($result) < 1) {
     echo "There are no new users.";
     admin_page_tail();
 }
@@ -58,7 +58,7 @@ if (mysql_num_rows($result) < 1) {
 start_table();
 table_header("ID", "Name", "Email", "Team", "Country", "Joined");
 
-while ($row = mysql_fetch_object($result)) { 
+while ($row = _mysql_fetch_object($result)) { 
     $id = $row->id;
     $name = $row->name;
     $email = $row->email_addr;
@@ -68,7 +68,7 @@ while ($row = mysql_fetch_object($result)) {
     
     $team_name="";
     if($row->teamid > 0){
-        $team = lookup_team($row->teamid);
+        $team = BoincTeam::lookup_id($row->teamid);
         $team_name = $team->name;
     }
     
@@ -89,7 +89,7 @@ while ($row = mysql_fetch_object($result)) {
         }
     }
     if (!empty($roles)) {
-        $roles = "<span class=\"smalltext\">[$roles]</span>";
+        $roles = "<small>[$roles]</small>";
     }
     
     // Banished?
diff --git a/html/ops/login_action.php b/html/ops/login_action.php
index 2aa4e75..9f8aed1 100644
--- a/html/ops/login_action.php
+++ b/html/ops/login_action.php
@@ -31,11 +31,11 @@ $passwd = stripslashes(post_str("passwd", true));
 if ($email_addr && $passwd) {
     $user = BoincUser::lookup_email_addr($email_addr);
     if (!$user) {
-        error_page("No account found with email address $email_addr");
+        admin_error_page("No account found with email address $email_addr");
     }
     $passwd_hash = md5($passwd.$email_addr);
     if ($passwd_hash != $user->passwd_hash) {
-        error_page("Login failed");
+        admin_error_page("Login failed");
     }
     $authenticator = $user->authenticator;
     $next_url = $_POST["next_url"];
diff --git a/html/ops/main.css b/html/ops/main.css
index d2324b5..e5b9700 100644
--- a/html/ops/main.css
+++ b/html/ops/main.css
@@ -8,12 +8,10 @@ Use classes, not IDs.
 
 We use the following classes:
 
-table.bordered
+.table-bordered
     a table with a border around it
 td.bordered
     bordered table cell (admin pages only)
-td.heading
-    table cell acting as heading
 td.fieldname
 td.fieldvalue
     table cells with name/value pairs
@@ -69,12 +67,16 @@ img {
     border: none;
 }
 
-table {
+.table {
     padding: 4px 6px;
     margin: 2px;
 }
 
-table.bordered {
+table.noborder {
+    cellpadding: 5;
+}
+
+.table-bordered, .bordered {
     border-width: 2px;
     border-style: solid;
     -moz-border-radius: 6px;
@@ -90,7 +92,7 @@ th {
 
 td {
     vertical-align: top;
-    padding: 4px;
+    padding: 2px;
 }
 
 td.bordered {
@@ -98,16 +100,23 @@ td.bordered {
     border-style: solid;
 }
 
-td.heading {
+th, td.heading {
     font-weight: bold;
     margin: 4px 0;
     padding: 8px;
 }
 
+th.subheading {
+    text-align: left;
+    font-weight: normal;
+    font-size: small;
+    font-style: italic;
+}
+
 td.fieldname {
     text-align: right;
     padding-right: 10px;
-    font-size: 14px;
+    /* font-size: 14px; */
     margin: 2px 0;
 }
 
@@ -153,9 +162,9 @@ input[type="submit"],
     border-radius: 5px;
 }
 
-    /* IE6 doesn't understand [type=XXXX] so we use class "button" */
+    /* IE6 doesn't understand [type=XXXX] so we use class "btn" */
 
-a.button {
+a.btn {
     line-height: 2.4em;
     padding: 4px 4px;
     margin: 0px 0px;
@@ -173,7 +182,7 @@ a.button {
 input[type="button"]:hover,
 input[type="submit"]:hover,
 input.btn:hover,
-.button:hover ,
+.btn:hover ,
 .forum_toplinks a:hover {
     text-decoration: none;
 }
@@ -267,8 +276,8 @@ td.postfooter {
     border-radius-bottomright: 10px;
 }
 
-td.postheader .button,
-td.postfooter .button {
+td.postheader .btn,
+td.postfooter .btn {
     font-size: 12px;
 }
 
@@ -299,7 +308,7 @@ td.lastpost, td.threadicon {
     font-weight: bold;
 }
 
-.description {
+.text-info, .description {
     font-size: 80%;
     font-weight: normal;
 }
@@ -346,9 +355,8 @@ img.flag {
     margin: 2px 1px;
 }
 
-.authorcol .button {
+.authorcol .btn {
     font-size: 12px;
-    margin: 0 4px;
     line-height: 2.6em;
 }
 
@@ -369,10 +377,11 @@ blockquote.postbody {
     margin: 20px;
 }
 
-span.note {
-    font-weight: normal;
+p.text-muted, span.note {
+    margin-top: 0.1em;
+    margin-bottom: 0.1em;
     font-style: italic;
-    font-size: 0.9em;
+    font-size: 0.8em;
 }
 
 span.news_date {
@@ -391,7 +400,7 @@ span.inboxunread {
 .pre {
     font-family: "Courier New", courier, monospace;
     display: block;
-    white-space: pre;
+#white-space: pre;
     overflow: auto;
 }
 
@@ -402,15 +411,19 @@ span.inboxunread {
     border-left-width: 3px;
     border-left-style: solid;
     padding-left: 1em;
-    white-space: nowrap;
+#white-space: pre;
     overflow: auto;
 }
 
-.smalltext {
+.donationtext {
+    font-size: 0.8em;
+}
+
+small {
     font-size: 0.8em;
 }
 
-.error,
+p.text-danger, .error,
 .notice  {
     font-weight: bold;
     font-size: 1.1em;
@@ -433,3 +446,8 @@ div.pm_preview {
 * html body .code {
     white-space: normal;
 }
+
+// this ignores additional bootstrap classes
+div.input-group, div.btn-group, ul.pager, div.pagination {
+    display: inline;
+}
diff --git a/html/ops/make_emails_lowercase.php b/html/ops/make_emails_lowercase.php
index 5eb5528..c901bb2 100644
--- a/html/ops/make_emails_lowercase.php
+++ b/html/ops/make_emails_lowercase.php
@@ -56,22 +56,12 @@ admin_page_head("Repair emails and CPID=0");
 echo "<br>
     Script for repairing user database if some email addresses in lower case and/or some CPID=0<br>
     <b>Attention this runs an expensive query on the database</b><br><br>\n";
-$query = "select count(*) from user";
-if (!($result = mysql_query($query))) {
-  echo "No rows found in USER database table";
-  exit();
-}
-
-$users_array = mysql_fetch_array($result);
-mysql_free_result($result);
-$number_of_users=$users_array[0];
-echo "Found $number_of_users users<br/>";
 
 $query = "select id, email_addr,cross_project_id  from user";
-$result = mysql_query($query);
+$result = _mysql_query($query);
 
 // loop over all users
-while ($user = mysql_fetch_object($result)) {
+while ($user = _mysql_fetch_object($result)) {
 
   $id=$user->id;
   $email_addr=$user->email_addr;
@@ -96,7 +86,7 @@ while ($user = mysql_fetch_object($result)) {
       $update_needed = TRUE;
     }
     else {
-      mysql_query($update);
+      _mysql_query($update);
       echo "Doing $update<br/>\n";
     }
   }
@@ -106,7 +96,7 @@ if ($confirm != "yes" && $update_needed) {
 } else {
     echo "No updates needed.";
 }
-mysql_free_result($result);
+_mysql_free_result($result);
 
 admin_page_tail();
 $cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
diff --git a/html/ops/make_puser.php b/html/ops/make_puser.php
index 7fabb36..86cb17f 100644
--- a/html/ops/make_puser.php
+++ b/html/ops/make_puser.php
@@ -87,16 +87,16 @@ function make_user($user) {
         $max_bytes_sec_up,
         $max_bytes_sec_down)
     ";
-    $retval = mysql_query($query);
+    $retval = _mysql_query($query);
     if (!$retval) {
-        echo mysql_error();
+        echo _mysql_error();
     }
 }
 
 set_time_limit(0);
 
-$result = mysql_query("select * from user where total_credit > 0");
-while ($user = mysql_fetch_object($result)) {
+$result = _mysql_query("select * from user where total_credit > 0");
+while ($user = _mysql_fetch_object($result)) {
     make_user($user);
 }
 
diff --git a/html/ops/manage_app_versions.php b/html/ops/manage_app_versions.php
index 7d7e103..7419284 100644
--- a/html/ops/manage_app_versions.php
+++ b/html/ops/manage_app_versions.php
@@ -23,7 +23,7 @@ require_once('../inc/util_ops.inc');
 function update() {
     $id = post_int("id");
     $av = BoincAppVersion::lookup_id($id);
-    if (!$av) error_page("no such app version");
+    if (!$av) admin_error_page("no such app version");
 
     $n = post_str("beta", true) ? 1 : 0;
     $av->update("beta=$n");
@@ -37,10 +37,18 @@ function update() {
     $n = post_int("max_core_version");
     $av->update("max_core_version=$n");
 
+    $n = post_str("plan_class");
+    $av->update("plan_class='$n'");
+
     echo "<b>Updated app version $id.  This change will take effect when you restart the project.</b><p>";
 }
 
-function show_form() {
+function show_form($all) {
+    if ($all) {
+        echo "<a href=manage_app_versions.php>Don't show deprecated app versions</a>\n";
+    } else {
+        echo "<a href=manage_app_versions.php?all=1>Show deprecated app versions</a>\n";
+    }
     $_platforms = BoincPlatform::enum("");
     foreach ($_platforms as $platform) {
         $platforms[$platform->id] = $platform;
@@ -53,19 +61,20 @@ function show_form() {
 
     start_table("");
     table_header(
-        "ID #<br><span class=note>click for details</span>",
-      "Application<br><span class=note>click for details</span>",
+        "ID #<br><p class=\"text-muted\">click for details</p>",
+      "Application<br><p class=\"text-muted\">click for details</p>",
       "Version",
       "Platform",
-      "Plan Class",
+      "Plan class",
       "minimum<br>client version",
       "maximum<br>client version",
       "beta?",
       "deprecated?",
       ""
     );
+    $clause = $all?"true":"deprecated = 0";
     $avs = BoincAppVersion::enum(
-        "true order by appid, platformid, plan_class, version_num"
+        "$clause order by appid, platformid, plan_class, version_num"
     );
     $i = 0;
     foreach ($avs as $av) {
@@ -90,7 +99,7 @@ function show_form() {
         $platform = $platforms[$av->platformid];
         echo "  <TD>$f1 $platform->name $f2</TD>\n";
 
-        echo "  <td>$f1 $av->plan_class $f2</td>\n";
+        echo "  <td><input type=text name=plan_class size=12 value='$av->plan_class'></td>\n";
 
         $v = $av->min_core_version;
         echo "  <TD><input type='text' size='4' name=min_core_version value='$v'></TD>\n";
@@ -106,7 +115,7 @@ function show_form() {
         if ($av->deprecated) $v=' CHECKED ';
         echo "  <TD> <input name=deprecated type='checkbox' $v></TD>\n";
 
-        echo "<td><input name=submit type=submit value=Update>";
+        echo "<td><input class=\"btn btn-default\" name=submit type=submit value=Update>";
 
         echo "</tr></form>"; 
     }
@@ -119,6 +128,7 @@ admin_page_head("Manage application versions");
 if (post_str("submit", true)) {
     update();
 }
-show_form();
+$all = get_str("all", true);
+show_form($all);
 admin_page_tail();
 ?>
diff --git a/html/ops/manage_apps.php b/html/ops/manage_apps.php
index 9fe349a..bb59e6d 100644
--- a/html/ops/manage_apps.php
+++ b/html/ops/manage_apps.php
@@ -23,7 +23,7 @@ require_once('../inc/util_ops.inc');
 function do_updates() {
     $id = post_int("id");
     $app = BoincApp::lookup_id($id);
-    if (!$app) error_page("no such app");
+    if (!$app) admin_error_page("no such app");
 
     $n = post_str("deprecated", true)?1:0;
     $app->update("deprecated=$n");
@@ -56,7 +56,7 @@ function add_app() {
     $name = BoincDb::escape_string(post_str('add_name'));
     $user_friendly_name = BoincDb::escape_string(post_str('add_user_friendly_name'));
     if (empty($name) || empty($user_friendly_name) ) {
-        error_page(
+        admin_error_page(
             "To add a new application please supply both a brief name and a longer 'user-friendly' name.</font></p>"
         );
     }
@@ -65,7 +65,7 @@ function add_app() {
         "(name,user_friendly_name,create_time) VALUES ('$name', '$user_friendly_name', $now)"
     );
     if (!$id) {
-        error_page("insert failed");
+        admin_error_page("insert failed");
     }
     echo "Application added.
         <p>
@@ -81,12 +81,12 @@ function show_form() {
     start_table();
     table_header(
         "ID",
-        "Name and description<br><span class=note>Click for details</span>",
+        "Name and description<br><p class=\"text-muted\">Click for details</p>",
         "Created",
-        "weight<br><a href=http://boinc.berkeley.edu/trac/wiki/BackendPrograms#feeder><span class=note>details</span></a>",
+        "weight<br><a href=http://boinc.berkeley.edu/trac/wiki/BackendPrograms#feeder><p class=\"text-muted\">details</p></a>",
         "shmem items",
-        "HR type<br><a href=http://boinc.berkeley.edu/trac/wiki/HomogeneousRedundancy><span class=note>details</span></a>",
-        "homogeneous app version?<br><a href=http://boinc.berkeley.edu/trac/wiki/HomogeneousAppVersion><span class=note>details</span></a>",
+        "HR type<br><a href=http://boinc.berkeley.edu/trac/wiki/HomogeneousRedundancy><p class=\"text-muted\">details</p></a>",
+        "homogeneous app version?<br><a href=http://boinc.berkeley.edu/trac/wiki/HomogeneousAppVersion><p class=\"text-muted\">details</p></a>",
         "deprecated?",
         "Non-CPU-intensive?",
         "Beta?",
@@ -163,7 +163,7 @@ function show_form() {
             <input name='fraction_done_exact' type='checkbox' $v></TD>
         ";
 
-        echo "<td><input type=submit name=submit value=Update>";
+        echo "<td><input class=\"btn btn-default\" type=submit name=submit value=Update>";
         echo "</tr></form>";
     }
 
diff --git a/html/ops/manage_special_users.php b/html/ops/manage_special_users.php
index 914bc35..2852907 100644
--- a/html/ops/manage_special_users.php
+++ b/html/ops/manage_special_users.php
@@ -32,13 +32,13 @@ for ($i=0;$i<=6;$i++) {
 }
 echo "</tr>";
 
-$result = mysql_query(
+$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"
 );
-for ($i=1; $i<=mysql_num_rows($result); $i++){
-	$foo = mysql_fetch_object($result);
+for ($i=1; $i<=_mysql_num_rows($result); $i++){
+	$foo = _mysql_fetch_object($result);
     echo "<form action=\"manage_special_users_action.php\" method=\"POST\">\n";
     echo "<input type=\"hidden\" name=\"userid\" value=\"$foo->userid\"
         <tr><td>$foo->name ($foo->id)</td>
@@ -51,7 +51,7 @@ for ($i=1; $i<=mysql_num_rows($result); $i++){
         }
         echo "></td>\n";
     }
-    echo "<td><input type=\"submit\" value=\"Update\"></form></td>";
+    echo "<td><input class=\"btn btn-default\" type=\"submit\" value=\"Update\"></form></td>";
     echo "</tr>\n";
 }
 
@@ -62,7 +62,7 @@ for ($j=0;$j<=6;$j++) {
     echo "<td><input type=\"checkbox\" name=\"role".$j."\" value=\"1\"";
     echo "></td>\n";
 }
-echo "<td><input type=\"submit\" value=\"Update\"></form></td>";
+echo "<td><input class=\"btn btn-default\" type=\"submit\" value=\"Update\"></form></td>";
 echo "</tr>\n";
 
 end_table();
diff --git a/html/ops/manage_special_users_action.php b/html/ops/manage_special_users_action.php
index 82d1f8b..dd196f3 100644
--- a/html/ops/manage_special_users_action.php
+++ b/html/ops/manage_special_users_action.php
@@ -36,9 +36,9 @@ if ($bitset == "0000000") $bitset = '';
 $userid = post_int("userid");
 
 $query = "UPDATE forum_preferences SET special_user='$bitset' WHERE userid='$userid'";
-mysql_query($query);
+_mysql_query($query);
 
-if (mysql_affected_rows() == 1) {
+if (_mysql_affected_rows() == 1) {
     echo "<center><h2>Success</h2>";
 } else {
     echo "<center><h2>Failure</h2>";
diff --git a/html/ops/manage_user.php b/html/ops/manage_user.php
index f3951c3..8343c6e 100644
--- a/html/ops/manage_user.php
+++ b/html/ops/manage_user.php
@@ -37,45 +37,29 @@ error_reporting(E_ALL);
 ini_set('display_errors', true);
 ini_set('display_startup_errors', true);
 
-// Delete a user (or at least try to)
+// Delete a user if they have no credit, results, or posts
 //
-function delete_user($user){
-    if (!empty($user->teamid)){
-        user_quit_team($user);
-    }
-    if ($user->has_profile){
-        mysql_query("DELETE FROM profile WHERE userid = $user->id");
-        delete_user_pictures($user->id);
-        mysql_query("UPDATE user SET has_profile=0 WHERE id=$user->id");
-    }
-
+function possibly_delete_user($user){
     if ($user->total_credit > 0.0){
-        error_page("Cannot delete user: User has credit.");
-        return false;
+        admin_error_page("Cannot delete user: User has credit.");
     }  
 
     // Don't delete user if they have any outstanding Results
     //
-    $q = "SELECT COUNT(*) AS count FROM result WHERE userid=".$user->id;
-    $result = mysql_query($q);
-    $c = mysql_fetch_object($result);
-    mysql_free_result($result);
-    if ($c->count) {
-        error_page("Cannot delete user: User has $c->count results in the database.");
+    if (BoincResult::count("userid=$user->id")) {
+        admin_error_page("Cannot delete user: User has count results in the database.");
     }
 
     // Don't delete user if they have posted to the forums
     //
-    $q = "SELECT COUNT(*) AS count FROM post WHERE user=".$user->id;
-    $result = mysql_query($q);
-    $c = mysql_fetch_object($result);
-    mysql_free_result($result);
-    if ($c->count) {
-        error_page("Cannot delete user: User has $c->count forum posts.");
+    if (BoincPost::count("user=$user->id")) {
+        admin_error_page("Cannot delete user: User has forum posts.");
     }
 
-    $q = "DELETE FROM user WHERE id=".$user->id;
-    $result = mysql_query($q);
+    if ($user->teamid){
+        user_quit_team($user);
+    }
+    delete_user($user);
 }
 
 // Process special user settings
@@ -93,7 +77,7 @@ function handle_special_user($user) {
         }
     }
     $q = "UPDATE forum_preferences SET special_user=\"$bits\" WHERE userid=$user->id";
-    mysql_query($q);
+    _mysql_query($q);
 }
 
 
@@ -105,14 +89,14 @@ function handle_suspend($user) {
 
     $reason = $_POST['suspend_reason'];
     if ($dt > 0 && empty($reason)) {
-        error_page("You must supply a reason for a suspension.
+        admin_error_page("You must supply a reason for a suspension.
             <p><a href=manage_user.php?userid=$user->id>Try again</a>"
         );
     } else {
         if (is_numeric($dt)) {
             $t = $dt>0 ? time()+$dt : 0;
             $q = "UPDATE forum_preferences SET banished_until=$t WHERE userid=$user->id";
-            mysql_query($q);
+            _mysql_query($q);
 
             // put a timestamp in wiki to trigger re-validation of credentials
 
@@ -174,7 +158,7 @@ function show_manage_user_form($user) {
 
 
     row1("<b>User: </b> $user->name <div align='right'>
-            <input name=\"delete_user\" type=\"submit\" value=\"Delete user\">
+            <input class=\"btn btn-danger\" name=\"delete_user\" type=\"submit\" value=\"Delete user\">
             </div>"
     );
 
@@ -293,17 +277,22 @@ $id = get_int("userid", true);
 if (!$id) {
     $id = post_int("userid", true);
 }
-if (!$id) error_page("No ID given");
+if (!$id) admin_error_page("No ID given");
 $user = BoincUser::lookup_id($id);
-if (!$user) error_page("No such user: $id");
+if (!$user) admin_error_page("No such user: $id");
 
 BoincForumPrefs::lookup($user);
 
 if (isset($_POST['delete_user'])) {
-    delete_user($user);
-    admin_page_head();
-    echo "User $user->name ($user->id) deleted";
+    possibly_delete_user($user);
+    admin_page_head("User deleted");
+    echo "
+        User $user->name ($user->id) deleted.
+        <p>
+        <a href=
+    ";
     admin_page_tail();
+    exit;
 }
 
 if (isset($_POST['special_user'])) {
diff --git a/html/ops/mass_email.php b/html/ops/mass_email.php
index 5d50eed..36921c4 100644
--- a/html/ops/mass_email.php
+++ b/html/ops/mass_email.php
@@ -82,8 +82,8 @@ if ($receiver > 0) {
     // FOR DEBUGGING
     //$query .= " LIMIT 10";
 
-    $result = mysql_query($query);
-    while ($user = mysql_fetch_object($result)) {
+    $result = _mysql_query($query);
+    while ($user = _mysql_fetch_object($result)) {
     	// TODO: might want to also replace TOTAL_CREDIT, RAC, and similar.
         $body_to_send = str_replace("USERNAME", $user->name, $body);
         $body_to_send .= "\n\nTo opt out of future emails from ".PROJECT.", please edit your project preferences at ".URL_BASE."prefs.php?subset=project\n";
@@ -122,7 +122,7 @@ echo "
       <td><textarea name=\"body\" rows=25 cols=50 id=\"body\"></textarea></td>
     </tr>
         ";
-row2("", "<input type=\"submit\" value=\"OK\">\n");
+row2("", "<input class=\"btn btn-default\" type=\"submit\" value=\"OK\">\n");
 
 end_table();
 echo "</form>\n";
diff --git a/html/ops/mass_email_script.php b/html/ops/mass_email_script.php
index 9a3e38b..01c10c8 100755
--- a/html/ops/mass_email_script.php
+++ b/html/ops/mass_email_script.php
@@ -148,11 +148,11 @@ function read_email_files() {
 
 function last_rpc_time($user) {
     $x = 0;
-    $result = mysql_query("select rpc_time from host where userid=$user->id");
-    while ($host = mysql_fetch_object($result)) {
+    $result = _mysql_query("select rpc_time from host where userid=$user->id");
+    while ($host = _mysql_fetch_object($result)) {
         if ($host->rpc_time > $x) $x = $host->rpc_time;
     }
-    mysql_free_result($result);
+    _mysql_free_result($result);
     return $x;
 }
 
@@ -232,30 +232,30 @@ function handle_user($user) {
 }
 
 function do_batch($startid, $n, $log) {
-    $result = mysql_query(
+    $result = _mysql_query(
         "select * from user where id>$startid order by id limit $n"
     );
-    while ($user = mysql_fetch_object($result)) {
+    while ($user = _mysql_fetch_object($result)) {
         handle_user($user);
         $startid = $user->id;
         fputs($log, $user->id . "\n");
         fflush($log);
     }
-    mysql_free_result($result);
+    _mysql_free_result($result);
     return $startid;
 }
 
 function do_one($thisid, $log) {
-    $result = mysql_query(
+    $result = _mysql_query(
         "select * from user where id=$thisid"
     );
-    $user = mysql_fetch_object($result);
+    $user = _mysql_fetch_object($result);
     if ($user) {
         handle_user($user);
         fputs($log, $user->id . "\n");
         fflush($log);
     }
-    mysql_free_result($result);
+    _mysql_free_result($result);
     return $startid;
 }
 
diff --git a/html/ops/news_convert.php b/html/ops/news_convert.php
index 8547fbb..4a16a92 100755
--- a/html/ops/news_convert.php
+++ b/html/ops/news_convert.php
@@ -87,10 +87,10 @@ foreach (array_reverse($project_news) as $item) {
     $when = strtotime($item[0]);
     $title = html_to_bbcode($title);
     $title = str_replace("\n", " ", $title);
-    $title = mysql_real_escape_string($title);
+    $title = _mysql_escape_string($title);
     $content = html_to_bbcode($content);
     $content = str_replace("\n", " ", $content);
-    $content = mysql_real_escape_string($content);
+    $content = _mysql_escape_string($content);
 
     $thread_id  = BoincThread::insert("(forum, owner, title, create_time, timestamp, replies) values ($forum_id, $user->id, '$title', $when, $when, 0)");
     if (!$thread_id) {
diff --git a/html/ops/notify.php b/html/ops/notify.php
index 1ce4260..ec167cc 100755
--- a/html/ops/notify.php
+++ b/html/ops/notify.php
@@ -69,31 +69,36 @@ function send_notify_emails() {
     $message = "";
     $i = 1;
     foreach ($notifies as $notify) {
-        if ($userid && $notify->userid != $userid) {
+        if ($userid && $notify->userid != $userid && strlen($message)) {
             send_notify_email($userid, $message);
             $message = "";
+            $found = false;
             $i = 1;
         }
         $userid = $notify->userid;
-        $message .= "$i) ";
+        $x = null;
         switch ($notify->type) {
         case NOTIFY_FRIEND_REQ:
-            $message .= friend_notify_req_email_line($notify);
+            $x = friend_notify_req_email_line($notify);
             break;
         case NOTIFY_FRIEND_ACCEPT:
-            $message .= friend_notify_accept_email_line($notify);
+            $x = friend_notify_accept_email_line($notify);
             break;
         case NOTIFY_PM:
-            $message .= pm_email_line($notify);
+            $x = pm_email_line($notify);
             break;
         case NOTIFY_SUBSCRIBED_POST:
-            $message .= subscribed_post_email_line($notify);
+            $x = subscribed_post_email_line($notify);
             break;
         }
-        $message .= "\n";
-        $i++;
+        if ($x) {
+            $message .= "$i) $x\n";
+            $i++;
+        } else {
+            $notify->delete();
+        }
     }
-    if ($userid) {
+    if ($userid && strlen($message)) {
         send_notify_email($userid, $message);
     }
 }
diff --git a/html/ops/opsw.php b/html/ops/opsw.php
index 6479726..c81254c 100644
--- a/html/ops/opsw.php
+++ b/html/ops/opsw.php
@@ -19,11 +19,11 @@
 require_once("../inc/util_ops.inc");
 
 function getSingleQuery($query) {
-    $result = mysql_query($query);
+    $result = _mysql_query($query);
     if (!$result) return;
-    $cnt = mysql_fetch_row($result);
+    $cnt = _mysql_fetch_row($result);
     if (!$cnt) return;
-    mysql_free_result($result);
+    _mysql_free_result($result);
     return $cnt[0];
 }
 
diff --git a/html/ops/pass_percentage_by_platform.php b/html/ops/pass_percentage_by_platform.php
index 4dd7678..595f6d9 100644
--- a/html/ops/pass_percentage_by_platform.php
+++ b/html/ops/pass_percentage_by_platform.php
@@ -113,7 +113,7 @@ ORDER BY
        $query_order
 ";
 
-$result = mysql_query($main_query);
+$result = _mysql_query($main_query);
 
 start_table();
 table_header(
@@ -122,7 +122,7 @@ table_header(
     "Failed<br>Uploading", "Failed<br>Uploaded", "Aborted"
 );
 
-while ($res = mysql_fetch_object($result)) {
+while ($res = _mysql_fetch_object($result)) {
     $av = BoincAppVersion::lookup_id($res->app_version_id);
     if ($av) {
         $p = BoincPlatform::lookup_id($av->platformid);
@@ -179,7 +179,7 @@ while ($res = mysql_fetch_object($result)) {
     echo "</tr>\n";
 
 }
-mysql_free_result($result);
+_mysql_free_result($result);
 
 echo "</table>\n";
 
@@ -191,7 +191,7 @@ echo "<input type=\"checkbox\" name=\"allversions\" value=\"1\" $allversions>\n"
 echo "show anonymous platform versions  \n";
 echo "<input type=\"checkbox\" name=\"allplatforms\" value=\"1\" $allplatforms>\n";
 echo "distinguish unknown platforms  \n";
-echo "<input type=\"submit\" value=\"show\">\n";
+echo "<input class=\"btn btn-default\" type=\"submit\" value=\"show\">\n";
 echo "</form>\n";
 
 admin_page_tail();
diff --git a/html/ops/problem_host.php b/html/ops/problem_host.php
index 8e48008..70b812d 100644
--- a/html/ops/problem_host.php
+++ b/html/ops/problem_host.php
@@ -110,7 +110,7 @@ if (!$hostid) {
     echo "<br><form method=\"get\" action=\"problem_host.php\">
     Host ID: 
     <input type=\"text\" size=\"5\" name=\"hostid\">
-    <input type=\"submit\" value=\"Send Email\">
+    <input class=\"btn btn-default\" type=\"submit\" value=\"Send Email\">
     </form>
     ";
 } else {
diff --git a/html/ops/profile_screen_action.php b/html/ops/profile_screen_action.php
index 225f6fc..ce692d2 100644
--- a/html/ops/profile_screen_action.php
+++ b/html/ops/profile_screen_action.php
@@ -31,11 +31,11 @@ for ($i=0; $i<$n; $i++) {
     $userid = $_GET[$x];
     switch ($val) {
     case 1:
-        mysql_query("update profile set verification=1 where userid=$userid");
+        _mysql_query("update profile set verification=1 where userid=$userid");
         echo "<br>$userid is accepted";
         break;
     case -1:
-        mysql_query("update profile set verification=-1 where userid=$userid");
+        _mysql_query("update profile set verification=-1 where userid=$userid");
         echo "<br>$userid is rejected";
         break;
     case 0:
diff --git a/html/ops/profile_screen_form.php b/html/ops/profile_screen_form.php
index b91d1f9..8213d02 100644
--- a/html/ops/profile_screen_form.php
+++ b/html/ops/profile_screen_form.php
@@ -52,37 +52,40 @@ if (function_exists('profile_screen_query')) {
         ." order by recommend desc limit 20"
     ;
 }
-$result = mysql_query($query);
+$result = _mysql_query($query);
 
 $n = 0;
 echo "<form action=profile_screen_action.php>
 ";
-start_table();
 $found = false;
-while ($profile = mysql_fetch_object($result)) {
+while ($profile = _mysql_fetch_object($result)) {
     $found = true;
-    echo "<tr><td valign=top>";
+    start_table();
+    echo "<tr><td valign=top width=20%>";
     buttons($n);
     echo "
+        <br>
         <br>Name: $profile->name
         <br>recommends: $profile->recommend
         <br>rejects: $profile->reject
-        <br>RAC: $profile->expavg_credit
+        <br>RAC: ".format_credit($profile->expavg_credit)."
         <br>
     ";
-    echo "</td><td><table border=2> ";
+    echo "</td><td>";
+    start_table();
     show_profile($profile, $g_logged_in_user, true);
-    echo "</table></td></tr>\n";
+    end_table();
+    echo "</td></tr><tr><td colspan=2></td></tr>\n";
     echo "<input type=\"hidden\" name=\"userid$n\" value=\"$profile->userid\">\n";
     $n++;
+    end_table();
 }
 
-end_table();
 
 if ($found) {
     echo "
         <input type=\"hidden\" name=\"n\" value=\"$n\">
-        <input type=\"submit\" value=\"OK\">
+        <input class=\"btn btn-default\" type=\"submit\" value=\"OK\">
     ";
 } else {
     echo "No more profiles to screen.";
diff --git a/html/ops/purge_profile.php b/html/ops/purge_profile.php
index 107b463..cc7bdff 100644
--- a/html/ops/purge_profile.php
+++ b/html/ops/purge_profile.php
@@ -40,10 +40,10 @@ $ids = array(
 );
 
 function purge_user($id) {
-    mysql_query("delete from user where id=$id");
-    mysql_query("delete from profile where userid=$id");
-    mysql_query("delete from thread where owner=$id");
-    mysql_query("delete from post where user=$id");
+    _mysql_query("delete from user where id=$id");
+    _mysql_query("delete from profile where userid=$id");
+    _mysql_query("delete from thread where owner=$id");
+    _mysql_query("delete from post where user=$id");
 }
 
 function purge_users($ids) {
@@ -57,8 +57,8 @@ function purge_users($ids) {
 function profile_word($word) {
     $q = "select userid from profile where response1 like '%$word%'";
     echo "$q\n";
-    $r = mysql_query($q);
-    while ($x = mysql_fetch_object($r)) {
+    $r = _mysql_query($q);
+    while ($x = _mysql_fetch_object($r)) {
         purge_user($x->userid);
     }
 }
diff --git a/html/ops/remind.php b/html/ops/remind.php
index a6b88d6..493993f 100755
--- a/html/ops/remind.php
+++ b/html/ops/remind.php
@@ -122,11 +122,11 @@ $lapsed_subject = "$dir/reminder_lapsed_subject";
 //
 function last_rpc_time($user) {
     $x = 0;
-    $result = mysql_query("select rpc_time from host where userid=$user->id");
-    while ($host = mysql_fetch_object($result)) {
+    $result = _mysql_query("select rpc_time from host where userid=$user->id");
+    while ($host = _mysql_fetch_object($result)) {
         if ($host->rpc_time > $x) $x = $host->rpc_time;
     }
-    mysql_free_result($result);
+    _mysql_free_result($result);
     return $x;
 }
 
@@ -226,7 +226,7 @@ function mail_type($user, $type) {
         if ($type == 'lapsed') $ntype = 2;
         if ($type == 'failed') $ntype = 3;
         $query = "insert into sent_email values($user->id, $now, $ntype)";
-        mysql_query($query);
+        _mysql_query($query);
     }
     $globals->count--;
     if ($globals->count == 0) { 
@@ -237,14 +237,14 @@ function mail_type($user, $type) {
 
 function last_reminder_time($user) {
     $query = "select * from sent_email where userid=$user->id";
-    $result = mysql_query($query);
+    $result = _mysql_query($query);
     $t = 0;
-    while ($r = mysql_fetch_object($result)) {
+    while ($r = _mysql_fetch_object($result)) {
         if ($r->email_type !=2 && $r->email_type != 3) continue;
         if ($r->time_sent > $t) $t = $r->time_sent;
 
     }
-    mysql_free_result($result);
+    _mysql_free_result($result);
     return $t;
 }
 
@@ -280,13 +280,13 @@ function do_failed() {
     global $globals;
 
     $max_create_time = time() - $globals->start_interval;
-    $result = mysql_query(
+    $result = _mysql_query(
         "select * from user where send_email<>0 and create_time<$max_create_time and total_credit = 0;"
     );
-    while ($user = mysql_fetch_object($result)) {
+    while ($user = _mysql_fetch_object($result)) {
         handle_user($user, 'failed');
     }
-    mysql_free_result($result);
+    _mysql_free_result($result);
 }
 
 function do_lapsed() {
@@ -296,20 +296,20 @@ function do_lapsed() {
     // the following is an efficient way of getting the list of
     // users for which no host has done an RPC recently
     //
-    $result = mysql_query(
+    $result = _mysql_query(
         "select userid from host group by userid having max(rpc_time)<$max_last_rpc_time;"
     );
-    while ($host = mysql_fetch_object($result)) {
-        $uresult = mysql_query("select * from user where id = $host->userid;");
-        $user = mysql_fetch_object($uresult);
-        mysql_free_result($uresult);
+    while ($host = _mysql_fetch_object($result)) {
+        $uresult = _mysql_query("select * from user where id = $host->userid;");
+        $user = _mysql_fetch_object($uresult);
+        _mysql_free_result($uresult);
         if (!$user) {
             echo "Can't find user $host->userid\n";
             continue;
         }
         handle_user($user, 'lapsed');
     }
-    mysql_free_result($result);
+    _mysql_free_result($result);
 }
 
 if (!function_exists('make_php_mailer')) {
diff --git a/html/ops/remote_server_status.php b/html/ops/remote_server_status.php
new file mode 100755
index 0000000..29b4938
--- /dev/null
+++ b/html/ops/remote_server_status.php
@@ -0,0 +1,138 @@
+#!/usr/bin/env php
+<?php
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2014 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/>.
+
+// Find the status of remote server processes
+// and write it to a serialized file.
+// Run this as a periodic task; in general it can't run as a web script
+// since the apache user can't ssh.
+//
+// "remote" means a machine other than the project's web server.
+//
+// In config.xml, hosts are identified by machine name (not domain name).
+//
+// The web server machine name may be specified by <www_host> in config.xml.
+// If this is not specified, it's assumed to be the project's main host
+// as specified by <host> in config.xml
+//
+// the specification of a daemon in config.xml may have a <host> element;
+// if absent, it runs on the main host.
+//
+// the upload and download servers are specified by URL.
+// To decide if these are the same as the web server,
+// we compare the host part of the URLs with the host part of the master URL.
+
+require_once("../inc/util.inc");
+
+// see if a web server is running at the given URL
+//
+function web_server_running($url) {
+    $u = parse_url($url);
+    $url = $u['scheme']."://".$u['host'];
+    $ch = curl_init($url);
+    curl_setopt($ch, CURLOPT_NOBODY, true);
+    curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+    curl_exec($ch);
+    $retcode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+    curl_close($ch);
+    $retcode = (int)($retcode/100);
+    return ($retcode == 2 || $retcode == 4);
+}
+
+// see if the given daemon is running on the host by checking its PID
+//
+function is_daemon_running($host, $d) {
+    if ($d->pid_file) {
+        $path = "../../pid_$host/".(string)$d->pid_file;
+    } else {
+        $cmd = explode(" ", $d->cmd);
+        $prog = $cmd[0];
+        $path = "../../pid_$host/$prog".".pid";
+    }
+    $pid = trim(@file_get_contents($path));
+    if ($pid === false) return false;
+    $cmd = "ssh $host 'ps $pid'";
+    $out = exec($cmd);
+    if (strstr($out, $pid)) return true;
+    return false;
+}
+
+function main() {
+    echo "--- Starting at ".time_str(time())." ---\n";
+    $x = array();
+    $c = simplexml_load_file("../../config.xml");
+    if (!$c) {
+        die("can't parse config file\n");
+    }
+    $config = $c->config;
+    $master_url = (string) $config->master_url;
+    $u = parse_url($master_url);
+    $master_host = $u["host"];
+
+    $url = (string) $config->download_url;
+    $u = parse_url($url);
+    $h = $u["host"];
+    if ($h != $master_host) {
+        $y = new StdClass;
+        $y->cmd = 'Download server';
+        $y->host = $h;
+        $y->status = web_server_running($url)?1:0;
+        $x[] = $y;
+    }
+    $url = (string) $config->upload_url;
+    $u = parse_url($url);
+    $h = $u["host"];
+    if ($h != $master_host) {
+        $y = new StdClass;
+        $y->cmd = 'Upload server';
+        $y->host = $h;
+        $y->status = web_server_running($url)?1:0;
+        $x[] = $y;
+    }
+
+    $main_host = (string)$c->config->host;
+    if ($c->config->www_host) {
+        $web_host = (string) $c->config->www_host;
+    } else {
+        $web_host = $main_host;
+    }
+    $daemons = $c->daemons;
+    foreach ($daemons->daemon as $d) {
+        if ((int)$d->disabled != 0) continue;
+        $host = $d->host?(string)$d->host:$main_host;
+        if ($host != $web_host) {
+            $y = new StdClass;
+            $y->cmd = (string)$d->cmd;
+            $y->host = $host;
+            if (is_daemon_running($host, $d)) {
+                //echo "$host $d->cmd is running\n";
+                $y->status = 1;
+            } else {
+                //echo "$host $d->cmd is not running\n";
+                $y->status = 0;
+            }
+            $x[] = $y;
+        }
+    }
+    $x = serialize($x);
+    file_put_contents("../cache/remote_server_status", $x);
+    echo "--- Finished at ".time_str(time())." ---\n";
+}
+
+main();
+?>
diff --git a/html/ops/repair_21812.php b/html/ops/repair_21812.php
index 523fb7a..501e711 100644
--- a/html/ops/repair_21812.php
+++ b/html/ops/repair_21812.php
@@ -17,9 +17,9 @@ if (!$mjd) {
 
 function do_query($query) {
     echo "Doing query:\n$query\n";
-    $result = mysql_query($query);
+    $result = _mysql_query($query);
     if (!$result) {
-        echo "Failed:\n".mysql_error()."\n";
+        echo "Failed:\n"._mysql_error()."\n";
     } else {
         echo "Success.\n";
     }
diff --git a/html/ops/repair_validator_problem.php b/html/ops/repair_validator_problem.php
index b588af6..3708dd6 100644
--- a/html/ops/repair_validator_problem.php
+++ b/html/ops/repair_validator_problem.php
@@ -37,21 +37,21 @@ it is not accidentally run.
 
 db_init();
 
-$result = mysql_query("select * from workunit where canonical_resultid=0");
-while ($wu = mysql_fetch_object($result)) {
-    $r2 = mysql_query("select count(*) from result where workunitid=$wu->id and outcome=1 limit 1000");
-    $x = mysql_fetch_array($r2);
-    mysql_free_result($r2);
+$result = _mysql_query("select * from workunit where canonical_resultid=0");
+while ($wu = _mysql_fetch_object($result)) {
+    $r2 = _mysql_query("select count(*) from result where workunitid=$wu->id and outcome=1 limit 1000");
+    $x = _mysql_fetch_array($r2);
+    _mysql_free_result($r2);
     $nsuccess = $x[0];
 
-    $r2 = mysql_query("select count(*) from result where workunitid=$wu->id and server_state=2");
-    $x = mysql_fetch_array($r2);
-    mysql_free_result($r2);
+    $r2 = _mysql_query("select count(*) from result where workunitid=$wu->id and server_state=2");
+    $x = _mysql_fetch_array($r2);
+    _mysql_free_result($r2);
     $nunsent = $x[0];
 
     if ($nsuccess>=3 and $nunsent==0) {
         echo "WU $wu->id has $nsuccess success, $nunsent unsent \n";
-        mysql_query("update workunit set need_validate=1 where id=$wu->id");
+        _mysql_query("update workunit set need_validate=1 where id=$wu->id");
     }
 }
 
diff --git a/html/ops/reset_hrclass.php b/html/ops/reset_hrclass.php
index 1843f17..d4aaf14 100644
--- a/html/ops/reset_hrclass.php
+++ b/html/ops/reset_hrclass.php
@@ -41,7 +41,7 @@ $title = "hr_class ".$hr_class." reset at ".$timestr;
 admin_page_head($title);
 
 if ($hr_class != 0) {
-    $result = mysql_query("UPDATE workunit SET hr_class=0 WHERE hr_class=".$hr_class);
+    $result = _mysql_query("UPDATE workunit SET hr_class=0 WHERE hr_class=".$hr_class);
 }
 
 echo $title;
diff --git a/html/ops/revalidate.php b/html/ops/revalidate.php
index 9f607cc..56b2631 100644
--- a/html/ops/revalidate.php
+++ b/html/ops/revalidate.php
@@ -41,7 +41,7 @@ function show_form() {
         <p>
         where <input name=clause size=60>
         <p>
-        <input type=submit value=OK>
+        <input class=\"btn btn-default\" type=submit value=OK>
         </form>
     ";
     admin_page_tail();
diff --git a/html/ops/sample_table_stats.php b/html/ops/sample_table_stats.php
index be80442..0aa42e6 100644
--- a/html/ops/sample_table_stats.php
+++ b/html/ops/sample_table_stats.php
@@ -24,9 +24,9 @@ function showTableStatus($db) {
     start_table();
     row1($db, 15);
     row_array(array("Name", "Engine", "Version", "Row Format", "Rows", "Avg Row Length (KB)", "Data Length (MB)", "Max Data Length (MB)", "Index Length (MB)", "Data free (MB)", "Create Time", "Update Time", "Check Time", "Create Options", "Comment"));
-    mysql_select_db($db);
-    $result = mysql_query("show table status");
-    while($row = mysql_fetch_array($result)) {
+    _mysql_select_db($db);
+    $result = _mysql_query("show table status");
+    while($row = _mysql_fetch_array($result)) {
         $size += ($row["Data_length"] + $row["Index_length"]);
         $engine = $row["Engine"];
         if (!$engine) $engine = $row["Type"];
diff --git a/html/ops/show_log.php b/html/ops/show_log.php
index bc51f0b..d893bf1 100644
--- a/html/ops/show_log.php
+++ b/html/ops/show_log.php
@@ -53,7 +53,7 @@ echo "<form action=\"show_log.php\">";
 echo " Regexp: <input name=\"s\" value=\"$s\">";
 echo " Files: <input name=\"f\" value=\"$f\">";
 echo " Lines: <input name=\"l\" value=\"$l\"> (positive for head, negative for tail)";
-echo " <input type=\"submit\" value=\"Grep\"></form>";
+echo " <input class=\"btn btn-default\" type=\"submit\" value=\"Grep\"></form>";
 
 echo 'Hint: Example greps: "RESULT#106876", "26fe99aa_25636_00119.wu_1", "WU#8152", "too many errors", "2003-07-17", "CRITICAL" <br>';
 
diff --git a/html/ops/size_census.php b/html/ops/size_census.php
index b6c1e16..42f7371 100755
--- a/html/ops/size_census.php
+++ b/html/ops/size_census.php
@@ -45,7 +45,7 @@ function do_app($app) {
         " and host.id = host_app_version.host_id";
     $result = $db->do_query($query);
     $a = array();
-    while ($x = mysql_fetch_object($result)) {
+    while ($x = _mysql_fetch_object($result)) {
         if (is_gpu($x->plan_class)) {
             $av = $x->on_frac;
             if ($x->gpu_active_frac) {
@@ -58,7 +58,7 @@ function do_app($app) {
         }
         $a[] = (1/$x->et_avg) * $av;
     }
-    mysql_free_result($result);
+    _mysql_free_result($result);
     sort($a);
     $n = count($a);
     $f = fopen("../../size_census_".$app->name, "w");
diff --git a/html/ops/team_export.php b/html/ops/team_export.php
index 8b79af2..c0cef05 100755
--- a/html/ops/team_export.php
+++ b/html/ops/team_export.php
@@ -108,6 +108,7 @@ function main() {
     if (!rename("temp.xml", "/home/boincadm/boinc/doc/boinc_teams.xml")) {
         echo "Rename failed\n";
     }
+    echo "------------ Finished at ".time_str(time())."-------\n";
 }
 
 main();
diff --git a/html/ops/team_import.php b/html/ops/team_import.php
index b3e3863..bf3b755 100755
--- a/html/ops/team_import.php
+++ b/html/ops/team_import.php
@@ -34,7 +34,7 @@ if (defined('INVITE_CODES')) {
 
 $config = get_config();
 if (parse_bool($config, "disable_account_creation")) {
-    echo "Account creation is disabled";
+    echo "Account creation is disabled\n";
     exit;
 }
 
@@ -42,14 +42,8 @@ if (parse_bool($config, "disable_account_creation")) {
 
 $dry_run = 0;
 
-function lookup_team_seti_id($id) {
-    $result = mysql_query("select * from team where seti_id=$id");
-    if ($result) {
-        $team = mysql_fetch_object($result);
-        mysql_free_result($result);
-        return $team;
-    }
-    return null;
+function lookup_team_seti_id($seti_id) {
+    return BoincTeam::lookup("seti_id=$seti_id");
 }
 
 function decode($x) {
@@ -119,12 +113,12 @@ function update_team($t, $team, $user) {
     $name_html = BoincDb::escape_string($t->name_html);
     $description = BoincDb::escape_string($t->description);
     $country = BoincDb::escape_string($t->country);
-    $query = "update team set url='$url', type=$t->type, name_html='$name_html', description='$description', country='$country', seti_id=$t->id where id=$team->id";
+    $query = "url='$url', type=$t->type, name_html='$name_html', description='$description', country='$country', seti_id=$t->id";
     if ($dry_run) {
-        echo "   $query\n";
+        echo "   update to team $team->id: $query\n";
         return;
     }
-    $retval = mysql_query($query);
+    $retval = $team->update($query);
     if (!$retval) {
         echo "   update failed: $query\n";
         exit;
@@ -141,7 +135,7 @@ function insert_case($t, $user) {
     }
     if (!$user) {
         echo "   making user $t->user_email\n";
-        $user = make_user(mysql_real_escape_string($t->user_email), mysql_real_escape_string($t->user_name), random_string());
+        $user = make_user($t->user_email, $t->user_name, random_string());
         if (!$user) {
             echo "   Can't make user $t->user_email\n";
             return;
@@ -154,12 +148,12 @@ function insert_case($t, $user) {
     );
     if (!$team) {
         echo "   Can't make team $t->id\n";
-        echo mysql_error();
+        echo BoincDb::error();
         echo "\n";
         exit;
     }
-    mysql_query("update team set seti_id=$t->id where id=$team->id");
-    mysql_query("update user set teamid=$team->id where id=$user->id");
+    $team->update("seti_id=$t->id");
+    $user->update("teamid=$team->id");
 
     send_email($user, "Team created on ".PROJECT,
 "An instance of the BOINC-wide team '$t->name'
@@ -218,8 +212,8 @@ function handle_team($f) {
     }
 
     echo "Processing $t->name $t->user_email\n";
-    $user = lookup_user_email_addr($t->user_email);
-    $team = lookup_team_name($t->name);
+    $user = BoincUser::lookup_email_addr($t->user_email);
+    $team = BoincTeam::lookup_name($t->name);
     if ($team) {
         if (!$user) {
             echo "   team exists but user $t->user_email doesn't\n";
diff --git a/html/ops/update_forum_activities.php b/html/ops/update_forum_activities.php
index b1bde8c..771d24b 100755
--- a/html/ops/update_forum_activities.php
+++ b/html/ops/update_forum_activities.php
@@ -30,12 +30,18 @@ echo date(DATE_RFC822), ": Starting\n";
 $now = time();
 $threads = BoincThread::enum();
 foreach ($threads as $thread) {
+    $is_helpdesk = false;
     $forum = BoincForum::lookup_id($thread->forum);
-    $category = BoincCategory::lookup_id($forum->category);
-    if ($category->is_helpdesk) {
+    if ($forum && $forum->parent_type == 0) {
+        $category = BoincCategory::lookup_id($forum->category);
+        if ($category && $category->is_helpdesk) {
+            $is_helpdesk = true;
+        }
+    }
+    if ($is_helpdesk) {
         $diff = ($now - $thread->create_time)/86400;
         $activity = ($thread->sufferers+1)/$diff;
-        echo "help $diff $activity\n";
+        echo "thread $thread->id helpdesk $diff $activity\n";
     } else {
         $posts = BoincPost::enum("thread=$thread->id");
         $activity = 0;
@@ -45,7 +51,7 @@ foreach ($threads as $thread) {
             $diff /= 7*86400;
             $activity += pow(2, -$diff);
         }
-        echo "forum $activity\n";
+        echo "thread $thread->id forum $activity\n";
     }
     $thread->update("activity=$activity");
     
diff --git a/html/ops/update_profile_pages.php b/html/ops/update_profile_pages.php
index ec546b3..4868035 100755
--- a/html/ops/update_profile_pages.php
+++ b/html/ops/update_profile_pages.php
@@ -51,7 +51,7 @@ $alphabet = array('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P
 //   $descriptor is an optional file descriptor to write the table to.
 
 function show_user_table($members, $offset, $numToDisplay, $cols) {
-    echo "<table class=bordered border=1 cellpadding=5>\n";
+    echo "<table class=\"table table-bordered\">\n";
 
     $rows = ceil($numToDisplay / $cols);
     $count = $offset;
@@ -196,7 +196,7 @@ function build_picture_pages($width, $height) {
             Only user profiles with pictures are listed here.";
 
 
-        echo "<table class=bordered border=1 cellpadding=5>\n";
+        echo "<table class=\"table table-bordered\">\n";
 
         for ($row = 0; $row < $height; $row++) {
             echo "<tr>";
diff --git a/html/ops/upgrade_db.php b/html/ops/upgrade_db.php
index 4aeb866..f0f9d23 100755
--- a/html/ops/upgrade_db.php
+++ b/html/ops/upgrade_db.php
@@ -62,7 +62,7 @@ foreach($updates as $update) {
     list($rev, $func) = $update;
     echo "performing update $func\n";
     call_user_func($func);
-    $e = mysql_error();
+    $e = _mysql_error();
     if ($e) {
         echo "\nWARNING: database upgrade failed.
 MySQL error message: $e
diff --git a/html/ops/user_graph.php b/html/ops/user_graph.php
index 79f7d7b..778d873 100644
--- a/html/ops/user_graph.php
+++ b/html/ops/user_graph.php
@@ -70,12 +70,12 @@ function show_graph() {
     } else {
         $query = 'select $fields from user';
     }
-    $result = mysql_query($query);
+    $result = _mysql_query($query);
     $yarr = array();
     $now = time();
     $maxind = 0;
     $active_thresh = time() - 30*86400;
-    while ($user = mysql_fetch_object($result)) {
+    while ($user = _mysql_fetch_object($result)) {
         $val = $now - $user->max_rpc_time;
         if (!$active) {
             if ($user->max_rpc_time > $active_thresh) continue;
@@ -134,7 +134,7 @@ function show_form() {
         <input type=checkbox name=show_text>
 
         <p>
-        <input type=submit name=submit value=OK>
+        <input class=\"btn btn-default\" type=submit name=submit value=OK>
         </form>
     ";
 }
diff --git a/html/ops/wd_nresults_changing.php b/html/ops/wd_nresults_changing.php
index 8b0ab56..6e87af4 100755
--- a/html/ops/wd_nresults_changing.php
+++ b/html/ops/wd_nresults_changing.php
@@ -51,18 +51,18 @@ function write_count_file($n,$m) {
 }
 
 function get_working_count_from_db() {
-    $result = mysql_query("select count(*) from result where server_state = 4");
+    $result = _mysql_query("select count(*) from result where server_state = 4");
     if (!$result) return false;
-    $count = mysql_fetch_array($result);
-    mysql_free_result($result);
+    $count = _mysql_fetch_array($result);
+    _mysql_free_result($result);
     return $count[0];
 }
 
 function get_count_from_db() {
-    $result = mysql_query("select count(*) from result");
+    $result = _mysql_query("select count(*) from result");
     if (!$result) return false;
-    $count = mysql_fetch_array($result);
-    mysql_free_result($result);
+    $count = _mysql_fetch_array($result);
+    _mysql_free_result($result);
     return $count[0];
 }
 
diff --git a/html/ops/white.css b/html/ops/white.css
index f8fdaa0..869b351 100644
--- a/html/ops/white.css
+++ b/html/ops/white.css
@@ -3,7 +3,7 @@ a, a:link, a:visited, a:active {
 }
 
 body {
-	#background: #fff url("img/gray_gradient.png") repeat-x;
+	//background: #fff url("img/gray_gradient.png") repeat-x;
 	color: black;
 }
 
@@ -21,7 +21,7 @@ hr.news_line {
     border-bottom: 1px solid rgb(200, 200, 200);
 }
 
-table.bordered {
+.table-bordered, .bordered {
 	border-color: #e8e8e8;
     border-width: 2px;
     border-style: solid;
@@ -40,13 +40,16 @@ td.indent {
 	border-color: #fff;
 }
 
-td.heading {
+th, td.heading {
 	background-color: #d8d8d8;
 }
 
+th.subheading {
+	background-color: #eee;
+}
+
 td.fieldname {
 	background-color: #eee;
-	color: #333;
 }
 
 td.fieldname_error,
@@ -89,8 +92,9 @@ tr.message {
 input[type="button"],
 input[type="submit"],
 .btn,
-a.button {
-	background: #EDEDED url(img/white_grad.png) repeat-x scroll left top;
+a.btn {
+#background: #d0f8d0;
+    background: #EDEDED url(img/white_grad.png) repeat-x scroll left top;
 	color: black;
 	border-color: #ccc;
 }
@@ -98,12 +102,20 @@ a.button {
 input[type="button"]:hover,
 input[type="submit"]:hover,
 input.btn:hover,
-.button:hover ,
+.btn:hover ,
 .forum_toplinks a:hover {
 	border: 1px solid #555;
 	color: #0069A1;
 }
 
+a.btn-green {
+	border: 1px solid #555;
+	color: black;
+    background: #a0f0a0;
+    font-size: 1.2em;
+	border-color: #60a060;
+}
+
 input[type="text"], input[type="password"], select, textarea {
 	border-color: #bbb;
 }
@@ -177,7 +189,7 @@ span.highlight {
 	border-left-color: #caa;
 }
 
-.error {
+p.text-danger, .error {
 	color: #f00;
 }
 
diff --git a/html/project.sample/cache_parameters.inc b/html/project.sample/cache_parameters.inc
index 9e4846a..31395b6 100644
--- a/html/project.sample/cache_parameters.inc
+++ b/html/project.sample/cache_parameters.inc
@@ -8,11 +8,11 @@ define('USER_HOST_TTL', 3600);
 define('USER_PROFILE_TTL', 3600);
 define('TOP_PAGES_TTL', 43200);
 define('INDEX_PAGE_TTL', 3600);
+define('STATUS_PAGE_TTL', 3600);
 
-// Define the max allowed cache usage and the min allowed free space
-// Both default to 100M.
+// max allowed cache usage
+//
 define('MAX_CACHE_USAGE', 104857600);
-define('MIN_FREE_SPACE', 104857600);
 
 // Number of page views between cache size checks
 define('CACHE_SIZE_CHECK_FREQ', 1000);
diff --git a/html/project.sample/project.inc b/html/project.sample/project.inc
index badf82f..dd2ad39 100644
--- a/html/project.sample/project.inc
+++ b/html/project.sample/project.inc
@@ -72,7 +72,7 @@ function project_footer($show_return, $show_date, $prefix) {
     echo "<br><br>".tra("Copyright")." © ".gmdate("Y ").COPYRIGHT_HOLDER."</center>\n";
     if ($show_date) {
         $t = time_str(time());
-        echo "<span class=\"note\">".tra("Generated")." $t</span>\n";
+        echo "<p class=\"text-muted\">".tra("Generated")." $t</p>\n";
     }
 }
 
@@ -134,10 +134,78 @@ function project_user_page_private($user){
     // shown in the private account page
 }
 
+if (0) {
+
+// show project-specific credit on user/team pages
+//
+function show_app_credit_user($user, $app_name, $appids) {
+    $t = 0;
+    $a = 0;
+    $n = 0;
+    foreach ($appids as $appid) {
+        $cu = BoincCreditUser::lookup(
+            "userid=$user->id and appid=$appid and credit_type=0"
+        );
+        if ($cu) {
+            $t += $cu->total;
+            $a += $cu->expavg;
+            $n += $cu->njobs;
+        }
+    }
+    row2("$app_name credit",
+        format_credit_large($t)." total, ".
+        format_credit($a)." average".
+        " ($n tasks)"
+    );
+}
+function show_app_credit_team($team, $app_name, $appids) {
+    $t = 0;
+    $a = 0;
+    $n = 0;
+    foreach ($appids as $appid) {
+        $ct = BoincCreditTeam::lookup(
+            "teamid=$team->id and appid=$appid and credit_type=0"
+        );
+        if ($ct) {
+            $t += $ct->total;
+            $a += $ct->expavg;
+            $n += $ct->njobs;
+        }
+    }
+    row2("$app_name credit",
+        format_credit_large($t)." total, ".
+        format_credit($a)." average".
+        " ($n tasks)"
+    );
+}
+
+// a list of "sub-projects", used in the display of per-app credit and badges.
+// A subproject is:
+// - a set of 1 or more apps; an app can belong to at most 1 subproject.
+// - a name, shown on the web site
+// - a short name, used in badge names.  Don't use "total".
+//
+$sub_projects = array(
+    array("name" => "Remote Test", "short_name" => "RT", "appids" => array(16)),
+    array("name" => "Uppercase", "short_name" => "UC", "appids" => array(1, 25)),
+);
+
 function project_user_credit($user){
-    // shown in the the private account page, credit area
+    global $sub_projects;
+    foreach ($sub_projects as $sp) {
+        show_app_credit_user($user, $sp["name"], $sp["appids"]);
+    }
 }
 
+function project_team_credit($team) {
+    global $sub_projects;
+    foreach ($sub_projects as $sp) {
+        show_app_credit_team($team, $sp["name"], $sp["appids"]);
+    }
+}
+
+}   // if(0)
+
 function project_forum_post_rules() {
     // additional forum post rules
     return "";
diff --git a/html/project.sample/project_specific_prefs.inc b/html/project.sample/project_specific_prefs.inc
index 4d35889..59b806d 100644
--- a/html/project.sample/project_specific_prefs.inc
+++ b/html/project.sample/project_specific_prefs.inc
@@ -12,10 +12,16 @@
 
 // Select standard prefs here:
 
-define ('COLOR_PREFS', false);
-define ('GFX_CPU_PREFS', true);
-define ('APP_SELECT_PREFS', true);
-$project_has_beta = false;
+define('COLOR_PREFS', false);
+    // user can select screensaver color scheme
+define('GFX_CPU_PREFS', false);
+    // user can limit % CPU used by screensaver
+    // (lower frame rate if exceeded)
+    // This is probably irrelevant if your screensaver uses OpenGL
+define('APP_SELECT_PREFS', true);
+    // user can choose which apps to run
+define('NON_GRAPHICAL_PREF', false);
+    // user can choose to run faster non-graphical app versions if available
 
 // Project-specific prefs are represented in three ways:
 // - as an XML document (stored in the DB in this form)
@@ -23,7 +29,7 @@ $project_has_beta = false;
 // - as a set of HTTP GET form variables
 
 // This file exports the following functions
-// (called from html/inc/prefs.inc):
+// (called from html/inc/prefs_project.inc):
 //
 // project_specific_prefs_default()
 //      Returns XML for default preferences
@@ -45,9 +51,12 @@ function option($name, $val) {
 }
 
 define('COLOR_DESC', tra('Color scheme for graphics'));
-define("MAX_GFX_CPU_PCT_DESC", tra("Maximum CPU % for graphics%10 ... 100%2", "<br><span class=note>", "</span>"));
+// xgettext:no-php-format
+define("MAX_GFX_CPU_PCT_DESC", tra("Maximum CPU % for graphics%10 ... 100%2", "<br><p class=\"text-muted\">", "</p>"));
 define('APP_SELECT_DESC', tra('Run only the selected applications'));
+define('APP_SELECT_TOOLTIP', tra('Only get tasks for certain applications. Useful to focus on particular applications, or to exclude them.'));
 define('ACCEPT_ANY_DESC', tra('If no work for selected applications is available, accept work from other applications?'));
+define('NON_GRAPHICAL_DESC', tra("Use faster non-graphical applications if available?"));
 
 // stuff related to app filtering.
 // Note: in this implementation, if a user selects all apps,
@@ -64,16 +73,6 @@ if (APP_SELECT_PREFS) {
     $app_array = null;
 }
 
-// see if we have any beta apps
-//
-$apps = BoincApp::enum("deprecated=0");
-foreach($apps as $app) {
-    if ($app->beta) {
-        $project_has_beta = true;
-        break;
-    }
-}
-
 function selected_app_text($prefs) {
     global $app_array;
     if (isset($prefs->app_ids)) {
@@ -133,10 +132,17 @@ function project_specific_prefs_edit($prefs, $error=false) {
             $checked = $present?"checked":"";
             $x .= "<input type=checkbox name=app_id_$app_id $checked> $app_name<br>";
         }
-        row2(APP_SELECT_DESC, $x);
+        tooltip_row2(APP_SELECT_TOOLTIP, APP_SELECT_DESC, $x);
         $checked = $prefs->allow_non_preferred_apps?"checked":"";
         row2(ACCEPT_ANY_DESC, "<input type=checkbox name=allow_non_preferred_apps $checked>");
     }
+    if (NON_GRAPHICAL_PREF) {
+        $checked = $prefs->non_graphical?"checked":"";
+        row2(
+            NON_GRAPHICAL_DESC,
+            "<input type=checkbox name=non_graphical $checked>"
+        );
+    }
 }
 
 function project_specific_prefs_parse_form(&$error) {
@@ -174,6 +180,12 @@ function project_specific_prefs_parse_form(&$error) {
         }
     }
 
+    if (NON_GRAPHICAL_PREF) {
+        if (isset($_GET["non_graphical"])) {
+            $x .= "<non_graphical>1</non_graphical>\n";
+        }
+    }
+
     return $x;
 }
 
@@ -191,9 +203,12 @@ function project_specific_prefs_show($prefs, $columns=false) {
             if ($prefs->home) $prefs->home->app_id_text = selected_app_text($prefs->home);
             if ($prefs->school) $prefs->school->app_id_text = selected_app_text($prefs->school);
             if ($prefs->work) $prefs->work->app_id_text = selected_app_text($prefs->work);
-            row_defs(APP_SELECT_DESC, "app_id_text", "", "", $prefs);
+            row_defs(APP_SELECT_DESC, "app_id_text", "", "", $prefs, APP_SELECT_TOOLTIP);
             row_defs(ACCEPT_ANY_DESC, "allow_non_preferred_apps_text", "", "", $prefs);
         }
+        if (NON_GRAPHICAL_PREF) {
+            row_defs(NON_GRAPHICAL_DESC, "non_graphical", "", "yesno", $prefs);
+        }
     } else {
         if (COLOR_PREFS) {
             row2(COLOR_DESC, $prefs->color_scheme);
@@ -202,9 +217,12 @@ function project_specific_prefs_show($prefs, $columns=false) {
             row2(MAX_GFX_CPU_PCT_DESC, $prefs->max_gfx_cpu_pct);
         }
         if (APP_SELECT_PREFS) {
-            row2(APP_SELECT_DESC, selected_app_text($prefs));
+            tooltip_row2(APP_SELECT_TOOLTIP, APP_SELECT_DESC, selected_app_text($prefs));
             row2(ACCEPT_ANY_DESC, $prefs->allow_non_preferred_apps_text);
         }
+        if (NON_GRAPHICAL_PREF) {
+            row2(NON_GRAPHICAL_DESC, $prefs->non_graphical?tra("yes"):tra("no"));
+        }
     }
 }
 
@@ -227,6 +245,9 @@ function project_specific_prefs_parse($prefs_xml) {
         $prefs->allow_non_preferred_apps = parse_element($prefs_xml, "<allow_non_preferred_apps>");
         $prefs->allow_non_preferred_apps_text = $prefs->allow_non_preferred_apps?"yes":"no";
     }
+    if (NON_GRAPHICAL_PREF) {
+        $prefs->non_graphical = parse_bool($prefs_xml, "non_graphical");
+    }
     return $prefs;
 }
 
diff --git a/html/queue/README b/html/queue/README
index 44d6fe5..2461885 100644
--- a/html/queue/README
+++ b/html/queue/README
@@ -1,3 +1,5 @@
+// THIS SYSTEM IS NOT SUPPORTED BY BOINC.  USE AT YOUR OWN RISK
+//
 // This directory contains a system that allows
 // users to submit jobs to a BOINC project.
 //
diff --git a/html/queue/user/queue_new_job_form_action.php b/html/queue/user/queue_new_job_form_action.php
index de6234d..16be833 100644
--- a/html/queue/user/queue_new_job_form_action.php
+++ b/html/queue/user/queue_new_job_form_action.php
@@ -10,7 +10,7 @@ db_init();
 $timestr           = time_str(time(0));
 
 $jobapplication    = post_int( 'application' ); 
-$jobname           = escapeshellcmd( $_POST[ 'name' ] );
+$jobname           = escapeshellarg( $_POST[ 'name' ] );
 $jobinput          = post_str( 'input' );
 $jobfops           = post_int( 'fops' );
 $jobdisk           = post_int( 'disk' );
diff --git a/html/user/account_finish.php b/html/user/account_finish.php
index 3a0acd3..3033992 100644
--- a/html/user/account_finish.php
+++ b/html/user/account_finish.php
@@ -38,21 +38,21 @@ echo "
 ";
 start_table();
 row2(
-    tra("Name")."<br><span class=\"description\">".tra("Identifies you on our web site. Use your real name or a nickname.")."</span>",
+    tra("Name")."<br><p class=\"text-info\">".tra("Identifies you on our web site. Use your real name or a nickname.")."</p>",
     "<input name=\"name\" size=\"30\" value=\"$user->name\">"
 );
 row2_init(
-    tra("Country")."<br><span class=\"description\">".tra("Select the country you want to represent, if any.")."</span>",
+    tra("Country")."<br><p class=\"text-info\">".tra("Select the country you want to represent, if any.")."</p>",
     "<select name=\"country\">"
 );
 print_country_select();
 echo "</select></td></tr>\n";
 row2(
-    tra("Postal or ZIP Code")."<br><span class=\"description\">".tra("Optional")."</span>",
+    tra("Postal or ZIP Code")."<br><p class=\"text-info\">".tra("Optional")."</span>",
     "<input name=\"postal_code\" size=\"20\">"
 );
 row2("",
-    "<input type=\"submit\" value=\"OK\">"
+    "<input class=\"btn btn-primary\" type=\"submit\" value=\"OK\">"
 );
 end_table();
 echo "
diff --git a/html/user/add_venue.php b/html/user/add_venue.php
index 2783c72..5dec83b 100644
--- a/html/user/add_venue.php
+++ b/html/user/add_venue.php
@@ -18,6 +18,7 @@
 
 require_once("../inc/util.inc");
 require_once("../inc/prefs.inc");
+require_once("../inc/prefs_project.inc");
 
 $user = get_logged_in_user();
 check_tokens($user->authenticator);
diff --git a/html/user/android_tasks.php b/html/user/android_tasks.php
new file mode 100644
index 0000000..6fd1bc2
--- /dev/null
+++ b/html/user/android_tasks.php
@@ -0,0 +1,137 @@
+<?php
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2014 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/>.
+
+// script to show task failure rate broken down by vendor or model
+
+require_once("../inc/boinc_db.inc");
+require_once("../inc/cache.inc");
+require_once("../inc/util.inc");
+
+function compare($x, $y) {
+    $n1 = $x[1] + $x[3];
+    $n2 = $y[1] + $y[3];
+    if ($n1 == $n2) return 0;
+    return ($n1 < $n2)?1:-1;
+}
+
+function get_models() {
+    $db = BoincDb::get();
+    $result = $db->do_query("select result.appid, result.outcome, host.product_name from result join host where host.os_name='Android' and result.hostid=host.id");
+
+    $models = array();
+
+    while ($r = $result->fetch_object()) {
+        // standardize case to combine e.g. Samsung and samsung
+        //
+        $name_uc = strtoupper($r->product_name);
+        if (array_key_exists($name_uc, $models)) {
+            $m = $models[$name_uc];
+            $m[$r->outcome]++;
+            $models[$name_uc] = $m;
+        } else {
+            $m = array(0,0,0,0,0,0,0,0);
+            $m[$r->outcome]++;
+            $models[$name_uc] = $m;
+        }
+    }
+    return $models;
+}
+
+function get_vendors($models) {
+    $vendors = array();
+    foreach ($models as $model=>$m) {
+        $name = explode(" ", $model);
+        $name = $name[0];
+        if (array_key_exists($name, $vendors)) {
+            $v = $vendors[$name];
+            for ($i=0; $i<8; $i++) {
+                $v[$i] += $m[$i];
+            }
+            $vendors[$name] = $v;
+        } else {
+            $vendors[$name] = $m;
+        }
+    }
+    return $vendors;
+}
+
+function show_item($name, $c) {
+    $s = $c[1];
+    $f = $c[3];
+    $n = $s + $f;
+    if ($n == 0) return;
+    $pct = number_format(100*$s/$n, 0)."%";
+    table_row($name, $s, $f, $pct);
+}
+
+function show_vendor($vendor, $models) {
+    page_head("Android task success by $vendor models");
+    start_table();
+    table_header("Model", "Success", "Failure", "Success rate");
+    foreach ($models as $model=>$m) {
+        $v = explode(" ", $model);
+        $v = $v[0];
+        if ($v != $vendor) continue;
+        show_item($model, $m);
+    }
+    end_table();
+    page_tail();
+}
+
+function show_vendors($vendors) {
+    page_head("Android task success by vendor");
+    start_table();
+    table_header(
+        "Vendor<br><p class=\"text-muted\">click for models</p>",
+        "Success", "Failure", "Success rate"
+    );
+    $y = array(0,0,0,0,0,0,0,0);
+    foreach ($vendors as $name=>$x) {
+        if (!$name) {
+            $name = "not reported by client";
+        } else {
+            $name = "<a href=android_tasks.php?vendor=$name>$name</a>";
+        }
+        show_item($name, $x);
+        $y[1] += $x[1];
+        $y[3] += $x[3];
+    }
+    show_item("total", $y);
+    end_table();
+    page_tail();
+}
+
+$models = get_cached_data(86400);
+if ($models) {
+    $models = unserialize($models);
+} else {
+    $models = get_models();
+    set_cached_data(86400, serialize($models));
+}
+
+$vendor = get_str("vendor", true);
+if ($vendor) {
+    uasort($models, 'compare');
+    show_vendor($vendor, $models);
+} else {
+    $vendors = get_vendors($models);
+    uasort($vendors, 'compare');
+    show_vendors($vendors);
+}
+
+?>
diff --git a/html/user/apps.php b/html/user/apps.php
index 02ab0ba..7081ff8 100644
--- a/html/user/apps.php
+++ b/html/user/apps.php
@@ -16,7 +16,6 @@
 // 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/boinc_db.inc");
 require_once("../inc/util.inc");
 
 check_get_args(array("xml"));
@@ -44,9 +43,13 @@ foreach ($apps as $app) {
         echo "    <user_friendly_name>$app->user_friendly_name</user_friendly_name>\n";
         echo "    <name>$app->name</name>\n";
         echo "    <id>$app->id</id>\n";
+        if ($app->beta) {
+            echo "        <beta/>\n";
+        }
     } else {
+        $b = $app->beta?" (beta test)":"";
         echo "
-            <tr><th colspan=4>$app->user_friendly_name</th></tr>
+            <tr><th colspan=4>$app->user_friendly_name$b</th></tr>
             <tr>
                 <th>".tra("Platform")."</th>
                 <th>".tra("Version")."</th>
@@ -67,6 +70,9 @@ foreach ($apps as $app) {
                 echo "        <plan_class>$av->plan_class</plan_class>\n";
                 echo "        <date>$create_time_f</date>\n";
                 echo "        <date_unix>$av->create_time</date_unix>\n";
+                if ($av->beta) {
+                    echo "        <beta/>\n";
+                }
                 echo "    </version>\n";
             } else {
                 $version_num_f = sprintf("%0.2f", $av->version_num/100);
@@ -76,9 +82,10 @@ foreach ($apps as $app) {
                 $gf = $av->expavg_credit/200;
                 $total_gf += $gf;
                 $gf = number_format($gf, 0);
+                $b = $av->beta?" (beta test)":"";
                 echo "<tr>
                     <td>$platform->user_friendly_name</td>
-                    <td>$version_num_f</td>
+                    <td>$version_num_f$b</td>
                     <td>$create_time_f</td>
                     <td align=right>$gf GigaFLOPS</td>
                     </tr>
diff --git a/html/user/bbcode.php b/html/user/bbcode.php
index 1f146da..88534d6 100644
--- a/html/user/bbcode.php
+++ b/html/user/bbcode.php
@@ -32,6 +32,7 @@ row1(tra("Examples"));
 row2_plain("[b]".tra("Bold")."[/b]", "<b>".tra("Bold")."</b>");
 row2_plain("[i]".tra("Italic")."[/i]", "<i>".tra("Italic")."</i>");
 row2_plain("[u]".tra("Underline")."[/u]", "<u>".tra("Underline")."</u>");
+row2_plain("[s]".tra("Strikethrough")."[/s]", "<s>".tra("Strikethrough")."</s>");
 row2_plain("[sup]".tra("Superscript")."[/sup]", "X<sup>".tra("Superscript")."</sup>");
 row2_plain("[size=15]".tra("Big text")."[/size]", "<span style=\"font-size: 15px\">".tra("Big text")."</span>");
 row2_plain("[color=red]".tra("Red text")."[/color]", "<font color=\"red\">".tra("Red text")."</font></li>");
@@ -45,8 +46,6 @@ row2_plain("[trac]#1[/trac] or [trac]ticket:1[/trac]",
     tra("use to link to Trac ticket on BOINC website").": <a href=\"http://boinc.berkeley.edu/trac/ticket/1\">#1</a>");
 row2_plain("[trac]wiki:WebForum[/trac]",
     tra("use to link to Trac Wiki on BOINC website").": <a href=\"http://boinc.berkeley.edu/trac/wiki/WebForum\">WebForum</a>");
-row2_plain("[trac]changeset:12345[/trac]",
-    tra("use to link to SVN changeset on BOINC website").": <a href=\"http://boinc.berkeley.edu/trac/changeset/12345\">[12345]</a>");
 end_table();
 
 echo "<p>
diff --git a/html/user/black.css b/html/user/black.css
index 220d025..797db5c 100644
--- a/html/user/black.css
+++ b/html/user/black.css
@@ -15,7 +15,7 @@ body {
     color: white;
 }
 
-table.bordered {
+.table-bordered {
       border: 1px solid grey;
 }
 
@@ -40,7 +40,7 @@ td.indent {
          border-left: 4px solid black;
 }
 
-td.heading {
+th, td.heading {
            background-color: rgb(90,90,90);
 	       color: white;
 }
diff --git a/html/user/bolt.css b/html/user/bolt.css
index 957945b..a7ec6c5 100644
--- a/html/user/bolt.css
+++ b/html/user/bolt.css
@@ -35,12 +35,12 @@ hr {
     margin: 8px 2px;
 }
 
-table {
+.table {
     padding: 4px;
     margin: 2px;
 }
 
-table.bordered {
+.table-bordered {
     border: 2px solid #e8e8e8;
     -moz-border-radius: 6px;
     -webkit-border-radius: 6px;
@@ -63,7 +63,7 @@ td.bordered {
 
 td.indent { border-left: 4px solid white; }
 
-td.heading {
+th, td.heading {
     font-weight: bold;
     margin: 4px 0px;
     padding: 8px;
@@ -128,7 +128,7 @@ td.friend {
 
 tr.message { background-color: #e0e0e0; }
 
-input[type="text"], select, textarea, .button {
+input[type="text"], select, textarea, .btn {
     border: 1px solid #d8d8d8;
     -moz-border-radius: 5px;
     -webkit-border-radius: 5px;
@@ -147,7 +147,7 @@ input[type="button"], input[type="submit"], input.btn {
 }
 
 /* IE6 doesn't understand [type=XXXX] so we factor this out into its own */
-.button {
+.btn {
     margin: 2px 0px;
     background: #d4d0c8;
     margin-right: 0.6em;
@@ -159,7 +159,7 @@ input[type="button"], input[type="submit"], input.btn {
     line-height: 2em;
 }
 
-.button:hover {
+.btn:hover {
     background: #edece8;
     text-decoration:none;
 }
@@ -284,7 +284,7 @@ td.lastpost {
     font-weight: bold;
 }
 
-.description {
+.text-info, .description {
     font-size: 80%;
     font-weight: normal;
 }
@@ -334,7 +334,7 @@ span.page_title {
     margin: 20px;
 }
 
-span.note {
+p.text-muted, span.note {
     font-weight: normal;
     font-size: 0.9em;
     font-style: italic;
@@ -370,11 +370,11 @@ span.highlight {
     overflow: auto;
 }
 
-.smalltext {
+small {
     font-size: 0.8em;
 }
 
-.error {
+p.text-danger, .error {
     color: #ff0000;
     font-weight: bold;
     font-size: 1.1em;
diff --git a/html/user/bolt.php b/html/user/bolt.php
index 9d5f056..6ccda1c 100644
--- a/html/user/bolt.php
+++ b/html/user/bolt.php
@@ -59,7 +59,7 @@ foreach ($courses as $course) {
         ";
     }
     row2_init("<b>$course->name</b>
-        <br><span class=note>$course->description</span>",
+        <br><p class=\"text-muted\">$course->description</p>",
         $status
     );
     show_refreshes();
diff --git a/html/user/bolt_admin.css b/html/user/bolt_admin.css
index e768fde..295c4ca 100644
--- a/html/user/bolt_admin.css
+++ b/html/user/bolt_admin.css
@@ -2,7 +2,7 @@ table.bolt_bar {
     margin: 0px;
     padding: 0px;
     border: 0px;
-#border-collapse: collapse;
+    //border-collapse: collapse;
     border-spacing: 0px;
 }
 
diff --git a/html/user/bolt_sched.php b/html/user/bolt_sched.php
index 31827ee..93055c3 100644
--- a/html/user/bolt_sched.php
+++ b/html/user/bolt_sched.php
@@ -161,7 +161,7 @@ function show_nav($links, $up_link, $view_id) {
         <input type=hidden name=view_id value=$view_id>
         <textarea name=question cols=60 onfocus=\"this.value=''\">Enter question or comment here</textarea>
         <br>
-        <input type=submit value=Submit>
+        <input class=\"btn btn-default\" type=submit value=Submit>
         </form>
         <p>
         $up_link
diff --git a/html/user/bossa_apps.php b/html/user/bossa_apps.php
index 7259791..e2593ca 100644
--- a/html/user/bossa_apps.php
+++ b/html/user/bossa_apps.php
@@ -43,7 +43,7 @@ function show_app($app) {
     }
     $est = number_format($app->time_estimate/60., 2);
     $limit = number_format($app->time_limit/60., 2);
-    row2("$app->name<br><span class=note>$app->description<br>Time: $est min. average, $limit min limit</span>", $x);
+    row2("$app->name<br><p class=\"text-muted\">$app->description<br>Time: $est min. average, $limit min limit</p>", $x);
 }
 
 function show_apps() {
diff --git a/html/user/brand_stats.php b/html/user/brand_stats.php
new file mode 100644
index 0000000..a73f5fb
--- /dev/null
+++ b/html/user/brand_stats.php
@@ -0,0 +1,69 @@
+<?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/>.
+
+// show statistics by client "brand"
+
+require_once("../inc/util.inc");
+
+function show_form() {
+    page_head("Show statistics by client brand");
+    echo "
+        <form action=brand_stats.php>
+        Select brand:
+        <p>
+        <input type=radio name=brand value=1 checked>HTC Power to Give
+        <p>
+        <input type=submit value=\"Show stats\">
+    ";
+    page_tail();
+}
+
+function show_stats($brand) {
+    switch ($brand) {
+    case 1:
+        $x = "HTC Power to Give";
+        break;
+    default:
+        error_page("invalid brand");
+    }
+    $hosts = BoincHost::enum("os_name='Android' and serialnum like '%$x%'");
+    $n = 0;
+    $t = 0;
+    $a = 0;
+    foreach($hosts as $h) {
+        $t += $h->total_credit;
+        $a += $h->expavg_credit;
+        if ($h->expavg_credit > .1) $n++;
+    }
+    page_head("Stats for $x");
+    start_table();
+    row2("Active devices", $n);
+    row2("Average daily credit", $a);
+    row2("Total credit", $t);
+    end_table();
+    page_tail();
+}
+
+$brand = get_int("brand", true);
+if ($brand) {
+    show_stats($brand);
+} else {
+    show_form();
+}
+
+?>
diff --git a/html/user/cpu_list.php b/html/user/cpu_list.php
index 3a0c229..7bd0427 100644
--- a/html/user/cpu_list.php
+++ b/html/user/cpu_list.php
@@ -22,7 +22,7 @@ require_once("../inc/boinc_db.inc");
 require_once("../inc/util.inc");
 require_once("../inc/cache.inc");
 
-define("MIN_CREDIT", 100);
+define("MIN_CREDIT", 10);
 define("MIN_COUNT", 10);
 
 function compare($a, $b) {
@@ -31,43 +31,41 @@ function compare($a, $b) {
     return 0;
 }
 
-function get_cpu_list() {
-    $models = array();
-    $hosts = BoincHost::enum("expavg_credit >= ".MIN_CREDIT);
-    foreach($hosts as $host) {
-        $x = new StdClass;
-        $x->p_ncpus = $host->p_ncpus;
-        $x->p_fpops = $host->p_fpops;
-        if (!array_key_exists($host->p_model, $models)) {
-            $models[$host->p_model] = array();
-        }
-        $models[$host->p_model][] = $x;
-    }
-
-    // for each model, find the median FLOPS
+function get_data() {
+    $db = BoincDb::get();
 
+    // get CPU model status in a special query;
+    // enumerating hosts was too slow on SETI at home.
+    //
+    // Ideally a model's fpops should be the median over hosts of that model.
+    // But SQL has no median function.
+    // Instead, take the mean of plausible values
+    //
+    $x = $db->enum_fields('host', 'StdClass', 
+        'p_model, count(*) as nhosts, avg(p_ncpus) as ncores, avg(p_fpops) as fpops',
+        'p_fpops>1e6 and p_fpops<1e11 and p_fpops <> 1e9 and expavg_credit>".MIND_CREDIT." group by p_model',
+        null
+    );
     $m2 = array();
-    foreach ($models as $model=>$list) {
-        $n = sizeof($list);
-        if ($n < MIN_COUNT) continue;
-        uasort($list, 'compare');
-        $m = (int)($n/2);
-        $total_cores = 0;
-        foreach ($list as $l) {
-            $total_cores += $l->p_ncpus;
-        }
-        $x = $list[$m]->p_fpops;
+    foreach ($x as $m) {
+        if ($m->nhosts < MIN_COUNT) continue;
         $y = new StdClass;
-        $y->model = $model;
-        $y->p_fpops = $x;
-        $y->mean_ncores = $total_cores/$n;
-        $y->nhosts = $n;
+        $y->model = $m->p_model;
+        $y->p_fpops = $m->fpops;
+        $y->mean_ncores = $m->ncores;
+        $y->nhosts = $m->nhosts;
         $m2[] = $y;
-        //echo "$model: $x GFLOPS ($n samples)\n";
     }
+    return $m2;
+}
 
+function get_cpu_list() {
+    $m2 = get_data();
     uasort($m2, 'compare');
-    return $m2;
+    $x = new StdClass;
+    $x->cpus = $m2;
+    $x->time = time();
+    return $x;
     foreach ($m2 as $x) {
         $g = $x->p_fpops/1e9;
         echo "$x->model: $g gflops $x->mean_ncores cores $x->nhosts hosts \n";
@@ -87,7 +85,7 @@ function show_cpu_list($data) {
     $i = 0;
     $total_nhosts = 0;
     $total_gflops = 0;
-    foreach ($data as $d) {
+    foreach ($data->cpus as $d) {
         row_array(
             array(
                 $d->model, $d->nhosts,
@@ -106,6 +104,7 @@ function show_cpu_list($data) {
         "row$i"
     );
     end_table();
+    echo "Generated ".time_str($data->time);
     page_tail();
 }
 
diff --git a/html/user/create_account.php b/html/user/create_account.php
index cab335f..f0ddab9 100644
--- a/html/user/create_account.php
+++ b/html/user/create_account.php
@@ -80,7 +80,7 @@ if ($user) {
         xml_error(ERR_DB_NOT_UNIQUE);
     }
     
-    if(defined('INVITE_CODES')) {
+    if (defined('INVITE_CODES')) {
         error_log("Account for '$email_addr' created using invitation code '$invite_code'");
     }
 }
diff --git a/html/user/create_account_action.php b/html/user/create_account_action.php
index 86a75f2..88ea6e6 100644
--- a/html/user/create_account_action.php
+++ b/html/user/create_account_action.php
@@ -40,10 +40,9 @@ if (parse_bool($config, "disable_account_creation")
 
 $privatekey = parse_config($config, "<recaptcha_private_key>");
 if ($privatekey) {
-    $resp = recaptcha_check_answer($privatekey, $_SERVER["REMOTE_ADDR"],
-        $_POST["recaptcha_challenge_field"], $_POST["recaptcha_response_field"]
-    );
-    if (!$resp->is_valid) {
+    $recaptcha = new ReCaptcha($privatekey);
+    $resp = $recaptcha->verifyResponse($_SERVER["REMOTE_ADDR"], $_POST["g-recaptcha-response"]);
+    if (!$resp->success) {
         show_error(tra("Your reCAPTCHA response was not correct. Please try again."));
     }
 }
diff --git a/html/user/create_account_form.php b/html/user/create_account_form.php
index c4d0b8c..630f630 100644
--- a/html/user/create_account_form.php
+++ b/html/user/create_account_form.php
@@ -18,6 +18,7 @@
 
 require_once('../inc/boinc_db.inc');
 require_once('../inc/util.inc');
+require_once('../inc/account.inc');
 require_once('../inc/countries.inc');
 require_once('../inc/translation.inc');
 require_once('../inc/recaptchalib.php');
@@ -37,7 +38,7 @@ if (parse_bool($config, "no_web_account_creation")) {
     error_page("This project has disabled Web account creation");
 }
 
-page_head(tra("Create an account"), null, null, null, IE_COMPAT_MODE);
+page_head(tra("Create an account"), null, null, null, recaptcha_get_head_extra());
 
 if (!no_computing()) {
     echo "<p>
@@ -45,84 +46,21 @@ if (!no_computing()) {
     ";
 }
 
-echo "
-    <p>
-    <form action=\"create_account_action.php\" method=\"post\">
-    <input type=hidden name=next_url value=\"$next_url\">
-";
-
 $teamid = get_int("teamid", true);
 if ($teamid) {
     $team = BoincTeam::lookup_id($teamid);
     $user = BoincUser::lookup_id($team->userid);
     if (!$user) {
-        echo "No such user";
+        error_page("Team $team->name has no founder");
+        $teamid = 0;
     } else {
         echo "<b>".tra("This account will belong to the team %1 and will have the project preferences of its founder.", "<a href=\"team_display.php?teamid=$team->id\">$team->name</a>")."</b><p>";
-        echo "
-            <input type=\"hidden\" name=\"teamid\" value=\"$teamid\">
-        ";
     }
 }
-start_table();
-
-// Using invitation codes to restrict access?
-//
-if(defined('INVITE_CODES')) {
-     row2(
-         tra("Invitation Code")."<br><span class=\"description\">".tra("A valid invitation code is required to create an account.")."</span>",
-         "<input type=\"text\" name=\"invite_code\" size=\"30\" >"
-     );
-} 
-
-row2(
-    tra("Name")."<br><span class=\"description\">".tra("Identifies you on our web site. Use your real name or a nickname.")."</span>",
-    "<input type=\"text\" name=\"new_name\" size=\"30\">"
-);
-row2(
-    tra("Email Address")."<br><span class=\"description\">".tra("Must be a valid address of the form 'name at domain'.")."</span>",
-    "<input type=\"text\" name=\"new_email_addr\" size=\"50\">"
-);
-$min_passwd_length = parse_element($config, "<min_passwd_length>");
-if (!$min_passwd_length) {
-    $min_passwd_length = 6;
-}
 
-row2(
-    tra("Password")
-    ."<br><span class=\"description\">".tra("Must be at least %1 characters", $min_passwd_length)."</span>",
-    "<input type=\"password\" name=\"passwd\">"
-);
-row2(tra("Confirm password"), "<input type=\"password\" name=\"passwd2\">");
-row2_init(
-    tra("Country")."<br><span class=\"description\">".tra("Select the country you want to represent, if any.")."</span>",
-    "<select name=\"country\">"
-);
-print_country_select();
-echo "</select></td></tr>\n";
-row2(
-    tra("Postal or ZIP Code")."<br><span class=\"description\">".tra("Optional")."</span>",
-    "<input type=\"text\" name=\"postal_code\" size=\"20\">"
-);
+create_account_form($teamid, $next_url);
 
-// Check if we're reCaptcha to prevent spam accounts
-//
-$publickey = parse_config($config, "<recaptcha_public_key>");
-if ($publickey) {
-    row2(
-        tra("Please enter the words shown in the image"),
-        recaptcha_get_html($publickey, null, true)
-    );
-}
-
-row2("",
-    "<input type=\"submit\" value=\"".tra("Create account")."\">"
-);
-end_table();
-echo "
-    </form>
-";
+page_tail();
 
 $cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
-page_tail();
 ?>
diff --git a/html/user/create_profile.php b/html/user/create_profile.php
index 85a569b..9c5f4c2 100644
--- a/html/user/create_profile.php
+++ b/html/user/create_profile.php
@@ -104,17 +104,12 @@ function show_language_selection($profile) {
 
 function show_submit() {
     row1(tra("Submit profile"));
-    echo "<script>var RecaptchaOptions = { theme : 'white' };</script>";
     $config = get_config();
     $publickey = parse_config($config, "<recaptcha_public_key>");
     if ($publickey) {
-        table_row(
-            tra("Please enter the words shown in the image.")
-            ."<br>\n"
-            .recaptcha_get_html($publickey)
-        );
+        table_row(recaptcha_get_html($publickey));
     }
-    table_row("<p><input type=\"submit\" value=\"".tra("Create/edit profile") ."\" name=\"submit\">");
+    table_row("<p><input class=\"btn btn-primary\" type=\"submit\" value=\"".tra("Create/edit profile") ."\" name=\"submit\">");
 }
 
 // Returns an array containing:
@@ -205,10 +200,9 @@ function process_create_profile($user, $profile) {
 
     $privatekey = parse_config($config, "<recaptcha_private_key>");
     if ($privatekey) {
-        $resp = recaptcha_check_answer($privatekey, $_SERVER["REMOTE_ADDR"],
-            $_POST["recaptcha_challenge_field"], $_POST["recaptcha_response_field"]
-        );
-        if (!$resp->is_valid) {
+        $recaptcha = new ReCaptcha($privatekey);
+        $resp = $recaptcha->verifyResponse($_SERVER["REMOTE_ADDR"], $_POST["g-recaptcha-response"]);
+        if (!$resp->success) {
             $profile->response1 = $response1;
             $profile->response2 = $response2;
             show_profile_form($profile,
@@ -312,13 +306,13 @@ function process_create_profile($user, $profile) {
 
 function show_profile_form($profile, $warning=null) {
     if ($profile) {
-        page_head(tra("Edit your profile"), null, null, null, IE_COMPAT_MODE);
+        page_head(tra("Edit your profile"), null, null, null, recaptcha_get_head_extra());
     } else {
-        page_head(tra("Create a profile"), null, null, null, IE_COMPAT_MODE);
+        page_head(tra("Create a profile"), null, null, null, recaptcha_get_head_extra());
     }
 
     if ($warning) {
-        echo "<span class=error>$warning</span><p>
+        echo "<p class=\"text-danger\">$warning</p>
         ";
     }
 
diff --git a/html/user/donate.php b/html/user/donate.php
index c6e9b63..79446f9 100644
--- a/html/user/donate.php
+++ b/html/user/donate.php
@@ -37,9 +37,9 @@ if ((post_int("anonymous", true) == 1) || ($logged_in_user == null)) {
 $order_time = time();
 
 // Write user id to paypal table, so the return script knows it's expecting this payment
-mysql_query("INSERT INTO donation_paypal SET order_time = '".$order_time."', userid = '$userid', item_number=".$item_id.", order_amount = '".boinc_real_escape_string($amount)."'");
+_mysql_query("INSERT INTO donation_paypal SET order_time = '".$order_time."', userid = '$userid', item_number=".$item_id.", order_amount = '".boinc_real_escape_string($amount)."'");
 
-$payment_id = mysql_insert_id();
+$payment_id = _mysql_insert_id();
 
 $URL = "www.paypal.com/cgi-bin/webscr";
 
diff --git a/html/user/donation_ipn.php b/html/user/donation_ipn.php
index 5f8ef2a..8f27b81 100644
--- a/html/user/donation_ipn.php
+++ b/html/user/donation_ipn.php
@@ -57,14 +57,14 @@ if (!$fp) {
             $item_array = explode("_",$item_number);
             $payment_id = abs($item_array[0]);
             $order_time = abs($item_array[1]);
-            $result = mysql_query("SELECT * FROM donation_paypal WHERE order_time = '$order_time' AND id = '$payment_id' AND processed = '0'");
-            $num_rows = mysql_num_rows($result);
+            $result = _mysql_query("SELECT * FROM donation_paypal WHERE order_time = '$order_time' AND id = '$payment_id' AND processed = '0'");
+            $num_rows = _mysql_num_rows($result);
             if ($num_rows == 1) {
-                $row = mysql_fetch_object($result);
+                $row = _mysql_fetch_object($result);
                 $userid = $row->userid;
-                mysql_query("UPDATE donation_paypal SET processed = '1', payment_time = '".time()."', item_name = '$item_name', payment_status = '$payment_status', payment_amount = '$payment_amount', payment_fee = '$payment_fee', payment_currency = '$payment_currency', txn_id = '$txn_id', receiver_email = '$receiver_email', payer_email = '$payer_email', payer_name = '$payer_name' WHERE id = '$payment_id'");
+                _mysql_query("UPDATE donation_paypal SET processed = '1', payment_time = '".time()."', item_name = '$item_name', payment_status = '$payment_status', payment_amount = '$payment_amount', payment_fee = '$payment_fee', payment_currency = '$payment_currency', txn_id = '$txn_id', receiver_email = '$receiver_email', payer_email = '$payer_email', payer_name = '$payer_name' WHERE id = '$payment_id'");
                 if ($userid > 0) {
-                    mysql_query("UPDATE user SET donated = '1' WHERE id = '$userid'");
+                    _mysql_query("UPDATE user SET donated = '1' WHERE id = '$userid'");
                 }
             }
         }
diff --git a/html/user/donations.php b/html/user/donations.php
index 96a3cea..8496c7c 100644
--- a/html/user/donations.php
+++ b/html/user/donations.php
@@ -38,7 +38,7 @@ if (function_exists("donations_intro")) {
 } else {
     echo "<div>".tra("This project is accepting donations via
 %1.", "<a href=\"http://www.paypal.com/\">PayPal</a>")."</div>
-        <div class=\"smalltext\">
+        <div class=\"donationtext\">
         ".tra("To donate, fill in the amount you want to donate using the field below.
         PayPal is accepting multiple currencies
         (Canadian Dollars, Euros, Pounds Sterling, U.S. Dollars,
@@ -55,7 +55,7 @@ if (function_exists("donations_intro")) {
 
 echo "<script src=\"currency.js\" type=\"text/javascript\"></script>\n";
 
-$query = mysql_query("SELECT * FROM donation_items");
+$query = _mysql_query("SELECT * FROM donation_items");
 
 echo "<form name=\"calcForm\" action=\"donate.php\" method=\"post\">\n";
 start_table();
@@ -63,11 +63,11 @@ start_table();
 // If donation_items table is filled, a list of donation targets is shown
 
 $first_row = true;
-while ($row = mysql_fetch_object($query)) {
-    $col1 = $row->title."<br><span class=\"smalltext\">".$row->description."</span>";
+while ($row = _mysql_fetch_object($query)) {
+    $col1 = $row->title."<br><small>".$row->description."</small>";
     
-    $query_amount = mysql_query("SELECT SUM(payment_amount-payment_fee) AS amount FROM donation_paypal WHERE processed = 1 AND item_number = '".$row->id."'");
-    $acquired = mysql_fetch_object($query_amount)->amount;
+    $query_amount = _mysql_query("SELECT SUM(payment_amount-payment_fee) AS amount FROM donation_paypal WHERE processed = 1 AND item_number = '".$row->id."'");
+    $acquired = _mysql_fetch_object($query_amount)->amount;
     $required = $row->required;
     
     if ($acquired > $required) {
@@ -317,15 +317,15 @@ echo row2(tra("Amount you would like to donate"), $amount);
 echo row2(tra("Estimated value in"), $estimated);
 if ($user_id) {
     $tmp_user_name = $user_id." (".$logged_in_user->name.")";
-    echo row2(tra("Anonymous donation")."<br><span class=\"smalltext\">".tra("Select this if you dont want your name and account number displayed in
-donator lists.<br>If not checked, you will be recorded as user ID %1", $tmp_user_name)."</span>",
+    echo row2(tra("Anonymous donation")."<br><small>".tra("Select this if you dont want your name and account number displayed in
+donator lists.<br>If not checked, you will be recorded as user ID %1", $tmp_user_name)."</small>",
         "<input type=\"checkbox\" name=\"anonymous\" id=\"anonymous\" value=\"1\"><label for=\"anonymous\">".tra("Yes")."</label>");
 } else {
-    echo row2(tra("Anonymous donation")."<br><span class=\"smalltext\">".tra("To assign the donation with your user ID, please log in."),
+    echo row2(tra("Anonymous donation")."<br><small>".tra("To assign the donation with your user ID, please log in.")."</small>",
         "<input type=\"checkbox\" name=\"anonymous\" id=\"anonymous\" value=\"1\" checked=\"checked\" disabled=\"disabled\">
         <label for=\"anonymous\">".tra("Yes")."</label>");
 }
-echo row2("", "<input type=\"submit\" value=\"".tra("Proceed")."\">");
+echo row2("", "<input class=\"btn btn-primary\" type=\"submit\" value=\"".tra("Proceed")."\">");
 echo row1(tra("Donations are accepted through")."<br><img src=\"img/paypal_logo.png\" alt=\"PayPal\">");
 end_table();
 echo "</form>\n";
diff --git a/html/user/download.php b/html/user/download.php
new file mode 100644
index 0000000..0fe3e9a
--- /dev/null
+++ b/html/user/download.php
@@ -0,0 +1,125 @@
+<?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/>.
+
+// 2nd phase of the "join" process.
+// The user has created an account.
+// Now see if they need to download BOINC.
+
+require_once("../inc/util.inc");
+
+// return the URL of a script on the BOINC web site
+// that will send the needed cookies
+// and optionally download the appropriate installer,
+//
+function concierge_url($user, $download) {
+    $master_url = parse_config(get_config(), "<master_url>");
+    $project_name = parse_config(get_config(), "<long_name>");
+    $project_desc = parse_config(get_config(), "<project_desc>");
+    $project_inst = parse_config(get_config(), "<project_inst>");
+    $user = get_logged_in_user(false);
+    $x =  "http://boinc.berkeley.edu/concierge.php";
+    $x .= "?master_url=".urlencode($master_url);
+    $x .= "&project_name=".urlencode($project_name);
+    if ($project_desc) {
+        $x .= "&project_desc=".urlencode($project_desc);
+    }
+    if ($project_inst) {
+        $x .= "&project_inst=".urlencode($project_inst);
+    }
+    if ($user) {
+        $x .= "&auth=".urlencode($user->authenticator);
+        $x .= "&user_name=".urlencode($user->name);
+    }
+    if ($download) {
+        $x .= "&download=1";
+        if (parse_bool(get_config(), "need_vbox")) {
+            $x .= "&need_vbox=1";
+        }
+    }
+    return $x;
+}
+
+function show_download_page() {
+    page_head("Download required software");
+
+    $config = get_config();
+    $need_vbox = parse_bool($config, "need_vbox");
+    $mcv = parse_config($config, "<min_core_client_version>");
+    $dlv = "BOINC";
+    $dl = "BOINC";
+    if ($mcv) {
+        $dlv .= " version " . version_string_maj_min_rel($mcv). " or later";
+    }
+
+    $verb = "this is";
+    if ($need_vbox) {
+        $dl .= " and VirtualBox";
+        $dlv .= " and VirtualBox";
+        $verb = "these are";
+    }
+    echo "To participate in ".PROJECT.", $dlv must be installed.
+        <p>
+        If $verb already installed, <a href=download.php?action=installed>click here</a>.  Otherwise
+        <p>
+    ";
+    show_button("download.php?action=download", "Download $dl");
+
+    echo "<p>
+        When the download is finished,
+        open the downloaded file to install BOINC.
+    ";
+
+    page_tail();
+}
+
+// User says needed software is installed.
+// Send cookies and tell user to run manager
+//
+function show_installed_page($user) {
+    $url = concierge_url($user, false);
+    page_head("Add project");
+    echo "
+        <iframe width=0 height=0 frameborder=0 src=$url></iframe>
+        To start running ".PROJECT." on this computer:
+        <ul>
+        <li> Open the BOINC Manager.
+        <li> Select <b>Add Project</b>.
+        <li> You should see a welcome message; click OK.
+        </ul>
+    ";
+    page_tail();
+}
+
+function download($user) {
+    $url = concierge_url($user, true);
+    Header("Location: $url");
+}
+
+$user = get_logged_in_user();
+$action = get_str("action", true);
+if ($action == "installed") {
+    show_installed_page($user);
+    exit;
+}
+if ($action == "download") {
+    download($user);
+}
+
+show_download_page();
+
+?>
diff --git a/html/user/edit_email_form.php b/html/user/edit_email_form.php
index 6ac70ed..62a7771 100644
--- a/html/user/edit_email_form.php
+++ b/html/user/edit_email_form.php
@@ -35,7 +35,7 @@ echo "<form method=post action=".secure_url_base()."/edit_email_action.php>\n";
 start_table();
 row1(tra("Change the email address of your account"));
 row2(tra("New email address").
-    "<br><span class=note>".tra("Must be a valid address of the form 'name at domain'")."</span>",
+    "<br><p class=\"text-muted\">".tra("Must be a valid address of the form 'name at domain'")."</p>",
     "<input name=email_addr size=50 type=text value='$email_text'>"
 );
 
@@ -45,10 +45,10 @@ row2(tra("New email address").
 
 row2(
     tra("Password").
-    "<br><a href=".secure_url_base()."/edit_passwd_form.php><span class=note>".tra("No password?")."</span></a>",
+    "<br><a href=".secure_url_base()."/edit_passwd_form.php><p class=\"text-muted\">".tra("No password?")."</p></a>",
     "<input type=password name=passwd>"
 );
-row2("", "<input type=submit value='".tra("Change email address")."'>");
+row2("", "<input class=\"btn btn-default\" type=submit value='".tra("Change email address")."'>");
 end_table();
 echo "</form>\n";
 page_tail();
diff --git a/html/user/edit_forum_preferences_action.php b/html/user/edit_forum_preferences_action.php
index 7b5647b..56c6c8b 100644
--- a/html/user/edit_forum_preferences_action.php
+++ b/html/user/edit_forum_preferences_action.php
@@ -35,7 +35,7 @@ if (post_str("action", true)=="reset_confirm"){
         <p>
         <form action=edit_forum_preferences_action.php method=post>
         <input type=hidden name=action value=reset>
-        <input type=submit value=\"".tra("Reset preferences")."\">
+        <input class=\"btn btn-warning\" type=submit value=\"".tra("Reset preferences")."\">
         </form>
     ";
     page_tail();
diff --git a/html/user/edit_forum_preferences_form.php b/html/user/edit_forum_preferences_form.php
index 4936eef..67d9c5e 100644
--- a/html/user/edit_forum_preferences_form.php
+++ b/html/user/edit_forum_preferences_form.php
@@ -30,18 +30,7 @@ BoincForumPrefs::lookup($user);
 
 page_head(tra("Community preferences"));
 
-// output a script for counting chars left in text field
-//
-echo "<script type=\"text/javascript\">
-    function textCounter(field, countfield, maxlimit) {
-        if (field.value.length > maxlimit) {
-            field.value =field.value.substring(0, maxlimit);
-        } else {
-            countfield.value = maxlimit - field.value.length
-        }
-    }
-    </script>
-";
+text_counter_script();
 
 start_table();
 echo "<form method=\"post\" action=\"edit_forum_preferences_action.php\" enctype=\"multipart/form-data\">";
@@ -75,8 +64,8 @@ if (strlen($user->prefs->avatar)){
 }
 row1(tra("Message-board identity"));
 row2(tra("Avatar")."
-    <br><span class=\"note\">".tra("An image representing you on the message boards.")."
-    <br>".tra("Format: JPG or PNG. Size: at most 4 KB, 100x100 pixels")."</span>",
+    <br><p class=\"text-muted\">".tra("An image representing you on the message boards.")."
+    <br>".tra("Format: JPG or PNG. Size: at most 4 KB, 100x100 pixels")."</p>",
     "<input type=\"radio\" id=\"avatar_select_0\" name=\"avatar_select\" value=\"0\" ".$select_0.">
         <label for=\"avatar_select_0\">".tra("Don't use an avatar")."</label><br>
     <input type=\"radio\" id=\"avatar_select_1\" name=\"avatar_select\" value=\"1\" ".$select_1.">
@@ -85,7 +74,7 @@ row2(tra("Avatar")."
         <label for=\"avatar_select_2\">".tra("Use this uploaded avatar:")."</label> <input type=\"file\" name=\"picture\">"
 );
 if (strlen($user->prefs->avatar)){
-    row2(tra("Avatar preview")."<br><span class=\"note\">".tra("This is how your avatar will look")."</span>",
+    row2(tra("Avatar preview")."<br><p class=\"text-muted\">".tra("This is how your avatar will look")."</p>",
     "<img src=\"".$user->prefs->avatar."\" width=\"100\" height=\"100\">");
 }
 
@@ -100,14 +89,12 @@ row2(
     .tra("Check out %1various free services%2
 <br> providing dynamic 'signature images'
 <br> showing your latest credit info, project news, etc.", "<a href=http://boinc.berkeley.edu/links.php#sigs>", "</a>"),
-    "<textarea name=\"signature\" rows=4 cols=50 id=\"signature\" onkeydown=\"textCounter(this.form.signature, this.form.remLen,$maxlen);\"
-    onkeyup=\"textCounter(this.form.signature, this.form.remLen,250);\">".$signature."</textarea>
-    <br><input name=\"remLen\" type=\"text\" id=\"remLen\" value=\"".($maxlen-strlen($signature))."\" size=\"3\" maxlength=\"3\" readonly> ".tra("characters remaining")."
-    <br><input type=\"checkbox\" name=\"signature_by_default\" ".$signature_by_default."> ".tra("Attach signature by default")
+    textarea_with_counter("signature", 250, $signature)
+    ."<br><input type=\"checkbox\" name=\"signature_by_default\" ".$signature_by_default."> ".tra("Attach signature by default")
 );
 if ($user->prefs->signature!=""){
     row2(tra("Signature preview").
-        "<br><span class=note>".tra("This is how your signature will look in the forums")."</span>",
+        "<br><p class=\"text-muted\">".tra("This is how your signature will look in the forums")."</p>",
         output_transform($user->prefs->signature)
     );
 }
@@ -159,24 +146,24 @@ for ($i=0; $i<sizeof($filtered_userlist); $i++){
             echo "Missing user $id";
             continue;
         }
-        $forum_filtered_userlist .= "<input type =\"submit\" name=\"remove".$filtered_user->id."\" value=\"".tra("Remove")."\"> ".$filtered_user->id." - ".user_links($filtered_user)."<br>";
+        $forum_filtered_userlist .= "<input class=\"btn btn-default\" type=\"submit\" name=\"remove".$filtered_user->id."\" value=\"".tra("Remove")."\"> ".$filtered_user->id." - ".user_links($filtered_user)."<br>";
     }
 }
 
 row2(tra("Filtered users").
-    "<br><span class=note>".tra("Ignore message board posts and private messages from these users.")."</span>",
+    "<br><p class=\"text-muted\">".tra("Ignore message board posts and private messages from these users.")."</p>",
     "$forum_filtered_userlist
         <input type=\"text\" name=\"forum_filter_user\" size=12> ".tra("User ID (For instance: 123456789)")."
-        <br><input type=\"submit\" name=\"add_user_to_filter\" value=\"".tra("Add user to filter")."\">
+        <br><input class=\"btn btn-default\" type=\"submit\" name=\"add_user_to_filter\" value=\"".tra("Add user to filter")."\">
     "
 );
 
 row1(tra("Update"));
-row2(tra("Click here to update preferences"), "<input type=submit value=\"".tra("Update")."\">");
+row2(tra("Click here to update preferences"), "<input class=\"btn btn-primary\" type=submit value=\"".tra("Update")."\">");
 echo "</form>\n";
 row1(tra("Reset"));
 row2(tra("Or click here to reset preferences to the defaults"),
-    "<form method=\"post\" action=\"edit_forum_preferences_action.php\"><input type=\"submit\" value=\"".tra("Reset")."\"><input type=\"hidden\" name=\"action\" value=\"reset_confirm\"></form>"
+    "<form method=\"post\" action=\"edit_forum_preferences_action.php\"><input class=\"btn btn-warning\" type=\"submit\" value=\"".tra("Reset")."\"><input type=\"hidden\" name=\"action\" value=\"reset_confirm\"></form>"
 );
 end_table();
 page_tail();
diff --git a/html/user/edit_passwd_action.php b/html/user/edit_passwd_action.php
index 79a24a4..f6ad3fa 100644
--- a/html/user/edit_passwd_action.php
+++ b/html/user/edit_passwd_action.php
@@ -1,7 +1,7 @@
 <?php
 // This file is part of BOINC.
 // http://boinc.berkeley.edu
-// Copyright (C) 2008 University of California
+// Copyright (C) 2014 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
@@ -22,10 +22,9 @@ require_once("../inc/user.inc");
 
 check_get_args(array());
 
-$auth = post_str("auth", true);
+$user = get_logged_in_user();
 $email_addr = strtolower(post_str("email_addr", true));
 
-$old_passwd = post_str("old_passwd", true);
 $passwd = post_str("passwd");
 $passwd2 = post_str("passwd2");
 
@@ -41,33 +40,18 @@ if (!is_ascii($passwd)) {
     error_page(tra("Passwords may only include ASCII characters."));
 }
 
-if (strlen($passwd)<$min_passwd_length) {
+if (strlen($passwd) < $min_passwd_length) {
     error_page(tra("New password is too short: minimum password length is %1 characters.", $min_passwd_length));
 }
-if ($auth) {
-    $user = BoincUser::lookup_auth($auth);
-    if (!$user) {
-        error_page(tra("Invalid account key"));
-    }
-} else {
-    $user = BoincUser::lookup_email_addr($email_addr);
-    if (!$user) {
-        error_page(tra("No account with that email address was found"));
-    }
-    $passwd_hash = md5($old_passwd.$email_addr);
-    if ($user->passwd_hash != $passwd_hash) {
-        error_page(tra("Invalid password"));
-    }
-}
 
-page_head(tra("Change password"));
 $passwd_hash = md5($passwd.$user->email_addr);
 $result = $user->update("passwd_hash='$passwd_hash'");
-if ($result) {
-    echo tra("Your password has been changed.");
-} else {
-    echo tra("We can't update your password due to a database problem. Please try again later.");
+if (!$result) {
+    error_page(tra("We can't update your password due to a database problem. Please try again later."));
 }
 
+page_head(tra("Change password"));
+echo tra("Your password has been changed.");
 page_tail();
+
 ?>
diff --git a/html/user/edit_passwd_form.php b/html/user/edit_passwd_form.php
index bf56e62..795b356 100644
--- a/html/user/edit_passwd_form.php
+++ b/html/user/edit_passwd_form.php
@@ -1,7 +1,7 @@
 <?php
 // This file is part of BOINC.
 // http://boinc.berkeley.edu
-// Copyright (C) 2008 University of California
+// Copyright (C) 2014 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
@@ -20,7 +20,7 @@ require_once("../inc/util.inc");
 
 check_get_args(array());
 
-$user = get_logged_in_user(false);
+$user = get_logged_in_user();
 
 page_head(tra("Change password"));
 
@@ -28,31 +28,10 @@ echo "
     <form method=post action=".secure_url_base()."edit_passwd_action.php>
 ";
 
-
-if ($user) {
-    echo "
-        <input type=hidden name=auth value=$user->authenticator>
-    ";
-    start_table();
-} else {
-    start_table();
-    row1(tra("You can identify yourself using either").
-        "<ul>".
-        "<li>".tra("your email address and old password").
-        "<li>".tra("your account key").
-        "</ul>"
-    );
-    row2(tra("Email address"), "<input name=email_addr size=40>");
-    row2(tra("Current password"), "<input type=password name=old_passwd size=40>");
-    row2(
-        tra("<b>OR</b>: Account key").
-        "<br><font size=-2><a href=get_passwd.php>".tra("Get account key by email")."</a>",
-        "<input name=auth size=40>"
-    );
-}
+start_table();
 row2(tra("New password"), "<input type=password name=passwd size=40>");
 row2(tra("New password, again"), "<input type=password name=passwd2 size=40>");
-row2("", "<input type=submit value='".tra("Change password")."'>");
+row2("", "<input class=\"btn btn-default\" type=submit value='".tra("Change password")."'>");
 end_table();
 echo "</form>\n";
 page_tail();
diff --git a/html/user/edit_user_info_form.php b/html/user/edit_user_info_form.php
index 81aaf89..0ebcda9 100644
--- a/html/user/edit_user_info_form.php
+++ b/html/user/edit_user_info_form.php
@@ -29,10 +29,10 @@ page_head(tra("Edit account information"));
 echo "<form method=post action=edit_user_info_action.php>";
 echo form_tokens($user->authenticator);
 start_table();
-row2(tra("Name %1 real name or nickname%2", "<br><span class=note>", "</span>"),
+row2(tra("Name %1 real name or nickname%2", "<br><p class=\"text-muted\">", "</p>"),
     "<input name=user_name type=text size=30 value='$user->name'>"
 );
-row2(tra("URL %1 of your web page; optional%2", "<br><span class=note>", "</span>"),
+row2(tra("URL %1 of your web page; optional%2", "<br><p class=\"text-muted\">", "</p>"),
     "http://<input name=url type=text size=50 value='$user->url'>"
 );
 row2_init(tra("Country"),
@@ -40,11 +40,11 @@ row2_init(tra("Country"),
 );
 print_country_select($user->country);
 echo "</select></td></tr>\n";
-row2(tra("Postal (ZIP) code %1 Optional%2", "<br><span class=note>", "</span>"),
+row2(tra("Postal (ZIP) code %1 Optional%2", "<br><p class=\"text-muted\">", "</p>"),
     "<input name=postal_code type=text size=20 value='$user->postal_code'>"
 );
 
-row2("", "<input type=submit value='".tra("Update info")."'>");
+row2("", "<input class=\"btn btn-default\" type=submit value='".tra("Update info")."'>");
 end_table();
 echo "</form>\n";
 page_tail();
diff --git a/html/user/ffmail_form.php b/html/user/ffmail_form.php
index 0bf79e8..fc3fd3f 100644
--- a/html/user/ffmail_form.php
+++ b/html/user/ffmail_form.php
@@ -39,13 +39,13 @@ echo "
 ".tra("Fill in this form with the names and email addresses of people you think might be interested in %1. We'll send them an email in your name, and you can add your own message if you like.", PROJECT)."
 <form method=get action=ffmail_action.php>
 <table cellpadding=4>
-<tr><td class=heading>".tra("Your name:")."</td><td class=heading>".tra("Your email address:")."</td></tr>
+<tr><th>".tra("Your name:")."</th><th>".tra("Your email address:")."</th></tr>
 <tr><td><b>$user->name</b></td><td><b>$user->email_addr</b></td></tr>
 
 <input type=hidden name=uname value=\"$user->name\">
 <input type=hidden name=uemail value=\"$user->email_addr\">
 
-<tr><td class=heading>".tra("Friend's name:")."</td><td class=heading>".tra("Friend's email address:")."</td></tr>
+<tr><th>".tra("Friend's name:")."</th><th>".tra("Friend's email address:")."</th></tr>
 ";
 for ($i=0; $i<5; $i++) {
     echo "
@@ -53,10 +53,10 @@ for ($i=0; $i<5; $i++) {
     ";
 }
 echo "
-<tr><td class=heading colspan=2>".tra("Additional message (optional)")."</td></tr>
+<tr><th colspan=2>".tra("Additional message (optional)")."</th></tr>
 <tr><td colspan=2><textarea name=comment rows=8 cols=50></textarea></td></tr>
-<tr><td align=center><input type=submit name=action value=".tra("Preview")."></td>
-    <td align=center><input type=submit name=action value=".tra("Send")."></td>
+<tr><td align=center><input class=\"btn btn-default\" type=submit name=action value=".tra("Preview")."></td>
+    <td align=center><input class=\"btn btn-primary\" type=submit name=action value=".tra("Send")."></td>
 </tr>
 </table>
 </form>
diff --git a/html/user/forum_banishment_vote.php b/html/user/forum_banishment_vote.php
index d28b439..9a0a9e9 100644
--- a/html/user/forum_banishment_vote.php
+++ b/html/user/forum_banishment_vote.php
@@ -51,7 +51,8 @@ if (get_str('action')=="start") {
     if (!$user) {
         error_page(tra("No user with this ID found."));
     }
-    $x = $user->banished_until;
+    BoincForumPrefs::lookup($user);
+    $x = $user->prefs->banished_until;
     if ($x>time()) {
         error_page(tra("User is already banished"));
     }
@@ -73,7 +74,7 @@ row2(tra("Reason")."<br>".tra("Mailed if nonempty"),
 
 row2(
     "",
-    "<input type=\"submit\" name=\"submit\" value=\"".tra("Proceed with vote")."\">"
+    "<input class=\"btn btn-default\" type=\"submit\" name=\"submit\" value=\"".tra("Proceed with vote")."\">"
 );
 } elseif (get_str('action')=="yes") {
     vote_yes($config,$logged_in_user,$user);
diff --git a/html/user/forum_edit.php b/html/user/forum_edit.php
index d16a6fb..79d3282 100644
--- a/html/user/forum_edit.php
+++ b/html/user/forum_edit.php
@@ -142,7 +142,7 @@ if ($post->signature) {
 }
 row2("", "<input id=\"add_signature\" name=\"add_signature\" value=\"1\" ".$enable_signature." type=\"checkbox\">
     <label for=\"add_signature\">".tra("Add my signature to this post")."</label>");
-row2("", "<input type=\"submit\" name=\"preview\" value=\"".tra("Preview")."\"><input type=\"submit\" name=\"submit\" value=\"OK\">"
+row2("", "<input class=\"btn btn-default\" type=\"submit\" name=\"preview\" value=\"".tra("Preview")."\"><input class=\"btn btn-primary\" type=\"submit\" name=\"submit\" value=\"OK\">"
 );
 
 end_table();
diff --git a/html/user/forum_forum.php b/html/user/forum_forum.php
index e6519d6..c7f2a73 100644
--- a/html/user/forum_forum.php
+++ b/html/user/forum_forum.php
@@ -105,7 +105,7 @@ echo "</td>
     <input type=\"hidden\" name=\"id\" value=\"$forum->id\">
 ";
 echo select_from_array("sort", $forum_sort_styles, $sort_style);
-echo "<input type=\"submit\" value=\"Sort\">
+echo "<input class=\"btn btn-default\" type=\"submit\" value=\"Sort\">
     </td>
     </tr>
     </table>
@@ -161,6 +161,7 @@ function show_forum($forum, $start, $sort_style, $user) {
     $n = 0; $i=0;
     foreach ($threads as $thread) {
         $owner = BoincUser::lookup_id($thread->owner);
+        if (!$owner) continue;
         $unread = thread_is_unread($user, $thread);
 
         //if ($thread->status==1){
@@ -216,7 +217,7 @@ function show_forum($forum, $start, $sort_style, $user) {
 
         echo '
             <td class="numbers">'.($thread->replies+1).'</td>
-            <td>'.user_links($owner).'</td>
+            <td>'.user_links($owner, BADGE_HEIGHT_SMALL).'</td>
             <td class="numbers">'.$thread->views.'</td>
             <td class="lastpost">'.time_diff_str($thread->timestamp, time()).'</td>
             </tr>
diff --git a/html/user/forum_help_desk.php b/html/user/forum_help_desk.php
index 4a652b8..504727f 100644
--- a/html/user/forum_help_desk.php
+++ b/html/user/forum_help_desk.php
@@ -65,7 +65,7 @@ foreach ($categories as $category) {
         <tr class=\"row$j\">
         <td>
             <a href=\"forum_forum.php?id=$forum->id\">$forum->title</a>
-            <br><span class=\"smalltext\">", $forum->description, "</span>
+            <br><small>", $forum->description, "</small>
         </td>
         <td class=\"numbers\">", $forum->threads, "</td>
         <td class=\"lastpost\">", time_diff_str($forum->timestamp, time()), "</td>
diff --git a/html/user/forum_index.php b/html/user/forum_index.php
index 3fd0f74..eaae147 100644
--- a/html/user/forum_index.php
+++ b/html/user/forum_index.php
@@ -63,7 +63,7 @@ function show_forum_summary($forum, $i) {
         <tr class=\"row$j\">
         <td>
             <a href=\"forum_forum.php?id=$forum->id\">$t</a>
-            <br><span class=\"smalltext\">$d</span>
+            <br><small>$d</small>
         </td>
         <td class=\"numbers\">$forum->threads</td>
         <td class=\"numbers\">$forum->posts</td>
@@ -76,7 +76,7 @@ page_head(tra("%1 Message boards", PROJECT));
 
 show_forum_header($user);
 
-if (FORUM_QA_MERGED_MODE === true){
+if (defined('FORUM_QA_MERGED_MODE') && FORUM_QA_MERGED_MODE){
     $categories = BoincCategory::enum("true order by orderID");
 } else {
     echo "<p>"
diff --git a/html/user/forum_moderate_post.php b/html/user/forum_moderate_post.php
index ab55c20..7466a89 100644
--- a/html/user/forum_moderate_post.php
+++ b/html/user/forum_moderate_post.php
@@ -16,7 +16,6 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
-
 // The form where a moderator decides what he is going to do to a post.
 // Submits information to forum_moderate_post_action.php for actual action
 // to be done.
@@ -97,7 +96,7 @@ if (get_str('action')=="hide") {
     echo "<input type=hidden name=action value=delete>";
     row2(
         "Are you sure want to delete this post?  This cannot be undone.",
-        "<input type=\"submit\" name=\"submit\" value=\"".tra("OK")."\">"
+        "<input class=\"btn btn-danger\" type=\"submit\" name=\"submit\" value=\"".tra("OK")."\">"
     );
     $get_reason = false;
 } else {
@@ -105,12 +104,12 @@ if (get_str('action')=="hide") {
 }
 
 if ($get_reason) {
-    row2(tra("Optional explanation %1 This is included in email to user.%2", "<br><span class=note>", "</span>"),
+    row2(tra("Optional explanation %1 This is included in email to user.%2", "<br><p class=\"text-muted\">", "</p>"),
         "<textarea name=\"reason\" rows=\"10\" cols=\"80\"></textarea>"
     );
     row2(
         "",
-        "<input type=\"submit\" name=\"submit\" value=\"".tra("OK")."\">"
+        "<input class=\"btn btn-default\" type=\"submit\" name=\"submit\" value=\"".tra("OK")."\">"
     );
 }
 
diff --git a/html/user/forum_moderate_thread.php b/html/user/forum_moderate_thread.php
index 6fac18f..63f0682 100644
--- a/html/user/forum_moderate_thread.php
+++ b/html/user/forum_moderate_thread.php
@@ -88,7 +88,7 @@ case 'delete':
     echo "<input type=hidden name=action value=delete>";
     echo "Are you sure you want to delete this thread and all its posts?
         This action cannot be undone.
-        <input type=submit value=Yes>
+        <input class=\"btn btn-warning\" type=submit value=Yes>
     ";
     $get_reason = false;
     break;
@@ -97,13 +97,13 @@ default:
 }
 
 if ($get_reason) {
-    row2(tra("Reason")."<br><span class=note>".tra("Mailed if nonempty")."</span>",
+    row2(tra("Reason")."<br><p class=\"text-muted\">".tra("Mailed if nonempty")."</p>",
         "<textarea rows=10 cols=80 name=\"reason\"></textarea>"
     );
 
     row2(
         "",
-        "<input type=\"submit\" name=\"submit\" value=\"".tra("OK")."\">"
+        "<input class=\"btn btn-default\" type=\"submit\" name=\"submit\" value=\"".tra("OK")."\">"
     );
 }
 
diff --git a/html/user/forum_post.php b/html/user/forum_post.php
index be7060a..b43f8d1 100644
--- a/html/user/forum_post.php
+++ b/html/user/forum_post.php
@@ -75,7 +75,7 @@ page_head(tra("Create new thread"),'','','', $bbcode_js);
 show_forum_header($logged_in_user);
 
 if ($warning) {
-    echo "<span class=error>$warning</span><p>";
+    echo "<p class=\"text-danger\">$warning</p>";
 }
 
 switch ($forum->parent_type) {
@@ -117,7 +117,7 @@ if ($force_title && $title){
     );
 }
 
-row2(tra("Message").html_info().post_warning().$body_help,
+row2(tra("Message").html_info().post_warning($forum).$body_help,
      $bbcode_html."<textarea name=\"content\" rows=\"12\" cols=\"80\" class=\"message_field\">".htmlspecialchars($content)."</textarea>"
 );
 
@@ -128,10 +128,10 @@ if (!$logged_in_user->prefs->no_signature_by_default) {
 }
 
 if (is_news_forum($forum)) {
-    row2("", "<input name=export type=checkbox>".tra("Show this item as a Notice in the BOINC Manager")."<br><span class=note>".tra("Do so only for items likely to be of interest to all volunteers.")."</span>");
+    row2("", "<input name=export type=checkbox>".tra("Show this item as a Notice in the BOINC Manager")."<br><p class=\"text-muted\">".tra("Do so only for items likely to be of interest to all volunteers.")."</p>");
 }
 row2("", "<input name=\"add_signature\" value=\"add_it\" ".$enable_signature." type=\"checkbox\"> ".tra("Add my signature to this post"));
-row2("", "<input type=\"submit\" name=\"preview\" value=\"".tra("Preview")."\"> <input type=\"submit\" value=\"".tra("OK")."\">");
+row2("", "<input class=\"btn btn-default\" type=\"submit\" name=\"preview\" value=\"".tra("Preview")."\"> <input class=\"btn btn-primary\" type=\"submit\" value=\"".tra("OK")."\">");
 
 
 end_table();
diff --git a/html/user/forum_reply.php b/html/user/forum_reply.php
index fa1d49e..124417b 100644
--- a/html/user/forum_reply.php
+++ b/html/user/forum_reply.php
@@ -93,7 +93,7 @@ page_head(tra("Post to thread"),'','','', $bbcode_js);
 show_forum_header($logged_in_user);
 
 if ($warning) {
-    echo "<span class=error>$warning</span><p>";
+    echo "<p class=\"text-danger\">$warning</p>";
 }
 
 switch ($forum->parent_type) {
@@ -109,6 +109,9 @@ echo "<p>";
 
 if ($preview == tra("Preview")) {
     $options = new output_options;
+    if (is_admin($logged_in_user)) {
+        $options->htmlitems = false;
+    }
     echo "<h2>".tra("Preview")."</h2>\n";
     echo "<div class=\"pm_preview\">"
         .output_transform($content, $options)
@@ -165,8 +168,8 @@ function show_message_row($thread, $parent_post) {
         $enable_signature="";
     }
     $x2 .= "</textarea><p>
-        <input type=\"submit\" name=\"preview\" value=\"".tra("Preview")."\">
-        <input type=\"submit\" value=\"".tra("Post reply")."\">
+        <input class=\"btn btn-default\" type=\"submit\" name=\"preview\" value=\"".tra("Preview")."\">
+        <input class=\"btn btn-primary\" type=\"submit\" value=\"".tra("Post reply")."\">
            
         <input type=\"checkbox\" name=\"add_signature\" id=\"add_signature\" value=\"add_it\" ".$enable_signature.">
         <label for=\"add_signature\">".tra("Add my signature to this reply")."</label>
diff --git a/html/user/forum_report_post.php b/html/user/forum_report_post.php
index 2319bfc..2a7ea39 100644
--- a/html/user/forum_report_post.php
+++ b/html/user/forum_report_post.php
@@ -82,10 +82,10 @@ if ($success_page==1) {
     echo form_tokens($user->authenticator);
     row1(tra("Report post"));
     row2(tra("Why do you find the post offensive: %1Please include enough information so that a person that
-has not yet read the thread will quickly be able to identify the issue.%2", "<span class=\"smalltext\">", "</span>"),
+has not yet read the thread will quickly be able to identify the issue.%2", "<small>", "</small>"),
         "<textarea name=\"reason\" rows=12 cols=54></textarea>"
     );
-    row2("", "<input type=\"submit\" name=\"submit\" value=\"".tra("OK")."\">");
+    row2("", "<input class=\"btn btn-default\" type=\"submit\" name=\"submit\" value=\"".tra("OK")."\">");
     echo "<input type=\"hidden\" name=\"post\" value=\"".$post->id."\">";
     echo "</form>";
     end_table();
diff --git a/html/user/forum_rss.php b/html/user/forum_rss.php
index 57e3c22..c0fff9a 100644
--- a/html/user/forum_rss.php
+++ b/html/user/forum_rss.php
@@ -48,7 +48,7 @@ if (get_int('setup', true)) {
         <p>
         ".tra("Threads only: %1 (Include only the first post of every thread)", "<input type=\"checkbox\" name=\"threads_only\">")."
         <p>
-        <input type=\"submit\" value=\"".tra("OK")."\">
+        <input class=\"btn btn-default\" type=\"submit\" value=\"".tra("OK")."\">
     ";
     page_tail();
     exit;
diff --git a/html/user/forum_search.php b/html/user/forum_search.php
index 28c0cad..3410312 100644
--- a/html/user/forum_search.php
+++ b/html/user/forum_search.php
@@ -32,17 +32,17 @@ start_table();
 echo "<form action=\"forum_search_action.php\" method=\"post\">";
 row1(tra("Search query"));
 row2(tra("Search for keywords:")."<br />
-    <span class=\"smalltext\">".tra("Posts that contain all the specified words will be displayed")."</span>",
+    <small>".tra("Posts that contain all the specified words will be displayed")."</small>",
     "<input type=\"text\" style=\"width: 290px\" name=\"search_keywords\" size=\"30\" /><br />
-    <span class=\"smalltext\">".tra("For example: \"screensaver freeze\"")."</span>");
+    <small>".tra("For example: \"screensaver freeze\"")."</small>");
 row2(tra("Search for author ID:")."<br />
-    <span class=\"smalltext\">".tra("Only posts by this author will be displayed")."</span>",
+    <small>".tra("Only posts by this author will be displayed")."</small>",
     "<input type=\"text\" style=\"width: 150px\" name=\"search_author\" size=\"10\" /><br />
-    <span class=\"smalltext\">".tra("For example: \"43214\"")."</span>");
+    <small>".tra("For example: \"43214\"")."</small>");
 
 row1(tra("Search options"));
 row2(tra("Search limits")."<br />
-    <span class=\"smalltext\">".tra("Search at most this many days back in time")."</span>",
+    <small>".tra("Search at most this many days back in time")."</small>",
     "<select name=\"search_max_time\">
     <option value=\"1\">".tra("1 day")."</option>
     <option value=\"3\">".tra("%1 days", "3")."</option>
@@ -72,7 +72,7 @@ foreach ($categories as $category) {
     }
 }
 row2(tra("Forum")."<br />
-    <span class=\"smalltext\">".tra("Only display posts from this forum")."</span>",
+    <small>".tra("Only display posts from this forum")."</small>",
     '<select name="search_forum">'.$forumlist.'</select');
 
 $sortlist = null;
@@ -87,7 +87,7 @@ row2(tra("Sort by"),
     '<select name="search_sort">'.$sortlist.'</select');
 
 row1(" ");
-row2("","<input type=\"submit\" value=\"".tra("Start the search")."\">");
+row2("","<input class=\"btn btn-default\" type=\"submit\" value=\"".tra("Start the search")."\">");
 echo "</form>";
 end_table();
 
diff --git a/html/user/forum_thread.php b/html/user/forum_thread.php
index 088ec9b..daa04d2 100644
--- a/html/user/forum_thread.php
+++ b/html/user/forum_thread.php
@@ -99,11 +99,7 @@ if ($temp_sort_style) {
     }
 }
 
-if ($logged_in_user && $logged_in_user->prefs->jump_to_unread){
-    page_head($title, 'jumpToUnread();');
-} else {
-    page_head($title);
-}
+page_head($title, 'jumpToUnread();');
 
 $is_subscribed = $logged_in_user && BoincSubscription::lookup($logged_in_user->id, $thread->id);
 
@@ -185,7 +181,7 @@ if ($is_subscribed) {
     );
 }
 
-//If the logged in user is moderator enable some extra features
+// If the logged in user is moderator enable some extra features
 //
 if (is_moderator($logged_in_user, $forum)) {
     if ($thread->hidden){
@@ -268,11 +264,12 @@ if (is_news_forum($forum) && $logged_in_user && ($logged_in_user->id == $thread-
 }
 
 // Display a box that allows the user to select sorting of the posts
+//
 echo "</td><td align=\"right\">
     <input type=\"hidden\" name=\"id\" value=\"", $thread->id, "\">" .
     tra("Sort");
 echo select_from_array("sort", $thread_sort_styles, $sort_style);
-echo "<input type=\"submit\" value=\"".tra('Sort')."\">
+echo "<input class=\"btn btn-default\" type=\"submit\" value=\"".tra('Sort')."\">
     </td></tr></table></form>
 ";
 
diff --git a/html/user/forum_user_posts.php b/html/user/forum_user_posts.php
index eb8e989..a1f7f9b 100644
--- a/html/user/forum_user_posts.php
+++ b/html/user/forum_user_posts.php
@@ -32,6 +32,7 @@ $items_per_page = 20;
 
 $user = BoincUser::lookup_id($userid);
 $logged_in_user = get_logged_in_user(false);
+BoincForumPrefs::lookup($logged_in_user);
 
 // Policy for what to show:
 // Team message board posts:
@@ -54,7 +55,6 @@ if ($logged_in_user) {
     if ($user->id == $logged_in_user->id) {
         $show_all = true;
     } else {
-        BoincForumPrefs::lookup($logged_in_user);
         if ($logged_in_user->prefs->privilege(0)) {
             $show_hidden = true;
         }
diff --git a/html/user/friend.php b/html/user/friend.php
index e5f83ae..5e64086 100644
--- a/html/user/friend.php
+++ b/html/user/friend.php
@@ -23,6 +23,8 @@ require_once("../inc/profile.inc");
 
 check_get_args(array("target_userid", "userid", "action"));
 
+text_counter_script();
+
 // see if there's already a request,
 // and whether the notification record is there
 //
@@ -76,9 +78,9 @@ function handle_add($user) {
         <p>" .
         tra("Add an optional message here:") ."
         <br>
-        <textarea name=message cols=64 rows=4></textarea>
+        ".textarea_with_counter("message", 250, "")."
         <p>
-        <input type=submit value=\"".tra("OK")."\">
+        <input class=\"btn btn-primary\" type=submit value=\"".tra("OK")."\">
         </form>
     ";
     page_tail();
@@ -121,7 +123,7 @@ function handle_add_confirm($user) {
 //
 function handle_query($user) {
     $target_userid = get_int('target_userid', true);
-    if ($target_user && $target_userid != $user->id) {
+    if ($target_userid && $target_userid != $user->id) {
         $target_user = BoincUser::lookup_id($target_userid);
         page_head(tra("Please log in as %1", $target_user->name));
         echo tra("You must log in as %1 to view this friend request",
@@ -137,7 +139,7 @@ function handle_query($user) {
     if (!$friend) error_page("Request not found");
     page_head(tra("Friend request"));
 	echo time_str($friend->create_time)."<p>\n";
-    $x = user_links($srcuser, true);
+    $x = user_links($srcuser, BADGE_HEIGHT_MEDIUM);
     echo tra("%1 has requested friendship with you.", $x);
     if (strlen($friend->message)) {
         echo "<p>".tra("%1 says: %2", $srcuser->name, $friend->message)."</p>";
diff --git a/html/user/get_passwd.php b/html/user/get_passwd.php
index 8ec19ba..651ced6 100644
--- a/html/user/get_passwd.php
+++ b/html/user/get_passwd.php
@@ -22,62 +22,67 @@ require_once("../inc/user.inc");
 
 check_get_args(array());
 
-page_head(tra("Forgot your account info?"));
-
-echo "<h3>"
-    .tra("1) If you know your account's email address, and you can receive email there:")."</h3><p>"
-    .tra("Enter the email address below, and click OK. You will be sent email instructions for resetting your password.");
-
-$master_url = parse_config(get_config(), "<master_url>");
-$x = strstr($master_url, "//");
-$x = substr($x, 2);
-$x = rtrim($x, "/");
-$x = str_replace("/", "_", $x);
-$account_file = "account_$x.xml";
+function show_email_form() {
+    echo "<h3>"
+        .tra("1) If you know your account's email address, and you can receive email there:")."</h3><p>"
+        .tra("Enter the email address below, and click OK. You will be sent email instructions for resetting your password.");
+    start_table();
+    echo "<form method=post action=mail_passwd.php>\n";
+    row2(tra("Email address"),"<input type=\"text\" size=40 name=email_addr>");
+    row2("", "<input class=\"btn btn-default\" type=submit value=\"".tra("OK")."\">");
+    echo "</form>";
+    end_table();
+}
 
-start_table();
-echo "<form method=post action=mail_passwd.php>\n";
-row2(tra("Email address"),"<input type=\"text\" size=40 name=email_addr>");
-row2("", "<input type=submit value=\"".tra("OK")."\">");
-echo "</form>";
-end_table();
+function show_auth_form() {
+    $master_url = parse_config(get_config(), "<master_url>");
+    $x = strstr($master_url, "//");
+    $x = substr($x, 2);
+    $x = rtrim($x, "/");
+    $x = str_replace("/", "_", $x);
+    $account_file = "account_$x.xml";
 
-echo "<p><h3>"
-    .tra("2) If you forgot your account's email address, or you can't receive email there:")."</h3>"
-    .tra("If you have run BOINC under this account, you can still access it. Here's how:")."
+    echo "<p><h3>"
+        .tra("2) If you forgot your account's email address, or you can't receive email there:")."</h3>"
+        .tra("If you have run BOINC under this account, you can still access it. Here's how:")."
 
-<ul>
-<li> ".tra("Go to the BOINC data directory on your computer (its location is written to the Event Log at startup).")."
-<li> ".tra("Find your account file for this project; it will be named <b>%1</b>.", $account_file)."
-<li> ".tra("Open the file in a text editor like Notepad. You'll see something like")."
-<pre>
-<account>
-    <master_url>$master_url</master_url>
-    <authenticator>8b8496fdd26df7dc0423ecd43c09a56b</authenticator>
-    <project_name>".PROJECT."</project_name>
-    ...
-</account>
-</pre>
+    <ul>
+    <li> ".tra("Go to the BOINC data directory on your computer (its location is written to the Event Log at startup).")."
+    <li> ".tra("Find your account file for this project; it will be named <b>%1</b>.", $account_file)."
+    <li> ".tra("Open the file in a text editor like Notepad. You'll see something like")."
+    <pre>
+    <account>
+        <master_url>$master_url</master_url>
+        <authenticator>8b8496fdd26df7dc0423ecd43c09a56b</authenticator>
+        <project_name>".PROJECT."</project_name>
+        ...
+    </account>
+    </pre>
 
-<li> ".tra("Select and Copy the string between %1 and %2 (%3 in the above example).", "<authenticator>", "</authenticator>", "<b>8b8496fdd26df7dc0423ecd43c09a56b</b>")."
+    <li> ".tra("Select and Copy the string between %1 and %2 (%3 in the above example).", "<authenticator>", "</authenticator>", "<b>8b8496fdd26df7dc0423ecd43c09a56b</b>")."
 
-<li> ".tra("Paste the string into the field below, and click OK.")."
-<li> ".tra("You will now be logged in to your account; update the email and password of your account.")."
-</ul>
-";
-start_table();
+    <li> ".tra("Paste the string into the field below, and click OK.")."
+    <li> ".tra("You will now be logged in to your account; update the email and password of your account.")."
+    </ul>
+    ";
+    start_table();
 
-echo "<form action=login_action.php method=post>\n";
-row2(tra("Log in with authenticator"), "<input type=\"text\" name=authenticator size=40>");
-row2(tra("Stay logged in on this computer"),
-    "<input type=checkbox name=send_cookie checked>"
-);
-row2("", "<input type=submit value=\"".tra("OK")."\">");
-echo "</form>";
-
-end_table();
+    echo "<form action=login_action.php method=post>\n";
+    row2(tra("Log in with authenticator"), "<input type=\"text\" name=authenticator size=40>");
+    row2(tra("Stay logged in on this computer"),
+        "<input type=checkbox name=send_cookie checked>"
+    );
+    row2("", "<input class=\"btn btn-default\" type=submit value=\"".tra("OK")."\">");
+    echo "</form>";
 
+    end_table();
+}
 
+page_head(tra("Forgot your account info?"));
+show_email_form();
+if (!no_computing()) {
+    show_auth_form();
+}
 page_tail();
 
 ?>
diff --git a/html/user/gpu_list.php b/html/user/gpu_list.php
index 06f1656..e59461f 100644
--- a/html/user/gpu_list.php
+++ b/html/user/gpu_list.php
@@ -45,7 +45,7 @@ function get_gpu_model($x, $vendor) {
 function add_model($model, $r, $wu, &$models) {
     if (array_key_exists($model, $models)) {
         $models[$model]->count++;
-        $models[$model]->time += $r->elapsed_time;
+        $models[$model]->time += $r->elapsed_time/$wu->rsc_fpops_est;
     } else {
         $x = new StdClass;
         $x->count = 1;
@@ -66,13 +66,25 @@ function get_gpu_list($vendor, $alt_vendor=null) {
         $clause .= " or plan_class like '%$alt_vendor%'";
     }
     $avs = BoincAppVersion::enum($clause);
-    if (count($avs) == 0) return null;
+    if (count($avs) == 0) {
+        $x = new StdClass;
+        $x->total = array();
+        return $x;
+    }
 
     $av_ids = "";
     foreach($avs as $av) {
         $av_ids .= "$av->id, ";
     }
-    $av_ids .= "0";
+    if ($vendor == "cuda") {
+        $av_ids .= "-3";
+    } else if ($vendor == "ati") {
+        $av_ids .= "-4";
+    } else if ($vendor == "intel_gpu") {
+        $av_ids .= "-5";
+    } else {
+        $av_ids .= "0";
+    }
 
     $t = time() - 30*86400;
     //echo "start enum $vendor $av_ids\n";
@@ -124,6 +136,7 @@ function get_gpu_lists() {
     $x->cuda = get_gpu_list("cuda", "nvidia");
     $x->ati = get_gpu_list("ati");
     $x->intel_gpu = get_gpu_list("intel_gpu");
+    $x->time = time();
     return $x;
 }
 
@@ -191,10 +204,11 @@ if ($d) {
 }
 
 page_head(tra("Top GPU models"));
-echo tra("The following lists show the most productive GPU models on different platforms.  Relative speeds are shown in parentheses.");
+echo tra("The following lists show the most productive GPU models on different platforms.  Relative speeds, measured by average elapsed time of tasks, are shown in parentheses.");
 show_vendor("NVIDIA", $data->cuda);
 show_vendor("ATI/AMD", $data->ati);
 show_vendor("Intel", $data->intel_gpu);
+echo "<p>Generated ".time_str($data->time);
 page_tail();
 
 ?>
diff --git a/html/user/host_edit_form.php b/html/user/host_edit_form.php
index fba1a0d..715d9d8 100644
--- a/html/user/host_edit_form.php
+++ b/html/user/host_edit_form.php
@@ -106,7 +106,7 @@ echo "
     <p><a href=javascript:set_all()>Select all</a>
     <p><a href=javascript:clear_all()>Unselect all</a>
     <input type=hidden name=nhosts value=$nhosts>
-    <p><input type=submit value='".tra("Merge hosts")."'>
+    <p><input class=\"btn btn-default\" type=submit value='".tra("Merge hosts")."'>
     </form>
 ";
 
diff --git a/html/user/host_update_credit.php b/html/user/host_update_credit.php
index 4edb2a6..f292fca 100644
--- a/html/user/host_update_credit.php
+++ b/html/user/host_update_credit.php
@@ -30,7 +30,7 @@ $hostid = get_int("hostid");
 
 $host = BoincHost::lookup_id($hostid);
 if (!$host || $host->userid != $user->id) {
-    error_page(We have no record of that computer");
+    error_page("We have no record of that computer");
 }
 
 host_update_credit($hostid);
diff --git a/html/user/lammps.php b/html/user/lammps.php
index 6d2e297..0dc7b85 100644
--- a/html/user/lammps.php
+++ b/html/user/lammps.php
@@ -263,12 +263,12 @@ function show_submit_form($user) {
         <input type=hidden name=action value=prepare>
     ";
     start_table();
-    row2("<strong>structure_file</strong><br><span class=note>structure_file*</span>", sandbox_file_select($user, "structure_file"));
-    row2("<strong>lammps_script</strong><br><span class=note>lammps_script*</span>", sandbox_file_select($user, "lammps_script"));
-    row2("<strong>cmdline_file</strong><br><span class=note>cmdline_file*</span><span class=note> ( List of command lines, one per job )</span>", sandbox_file_select($user, "cmdline_file"));
-    row2("<strong>pot.zip</strong><br><span class=note>*.zip</span><span class-note> ( Zipped Potential files )</span>", sandbox_file_select($user, "zip"));
+    row2("<strong>structure_file</strong><br><p class=\"text-muted\">structure_file*</p>", sandbox_file_select($user, "structure_file"));
+    row2("<strong>lammps_script</strong><br><p class=\"text-muted\">lammps_script*</p>", sandbox_file_select($user, "lammps_script"));
+    row2("<strong>cmdline_file</strong><br><p class=\"text-muted\">cmdline_file* (List of command lines, one per job )</p>", sandbox_file_select($user, "cmdline_file"));
+    row2("<strong>pot.zip</strong><br><p class=\"text-muted\">*.zip ( Zipped Potential files )</span>", sandbox_file_select($user, "zip"));
     row2("<strong>Area</strong>", area_select());
-    row2("", "<input type=submit value=Prepare>");
+    row2("", "<input class=\"btn btn-default\" type=submit value=Prepare>");
     end_table();
     echo "</form>
         <p>
diff --git a/html/user/login_action.php b/html/user/login_action.php
index b1d0709..5798de2 100644
--- a/html/user/login_action.php
+++ b/html/user/login_action.php
@@ -1,7 +1,7 @@
 <?php
 // This file is part of BOINC.
 // http://boinc.berkeley.edu
-// Copyright (C) 2008 University of California
+// Copyright (C) 2014 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
@@ -16,23 +16,24 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
+// validate a user's credentials, and log them in by sending a cookie.
+// This handles several cases:
+//
+// 1) login via web form w/ email addr and password
+// 2) login via web form w/ authenticator
+// 3) login via a URL sent in email (e.g. to reset password)
+
 require_once("../inc/boinc_db.inc");
 require_once("../inc/util.inc");
 require_once("../inc/email.inc");
 require_once("../inc/user.inc");
+require_once("../inc/ldap.inc");
 
 check_get_args(array("id", "t", "h", "key"));
 
-$next_url = post_str("next_url", true);
-$next_url = sanitize_local_url($next_url);
-if (strlen($next_url) == 0) $next_url = "home.php";
-
-// check for email/password case
+// login with email addr / passwd
 //
-$email_addr = strtolower(sanitize_tags(post_str("email_addr", true)));
-$passwd = post_str("passwd", true);
-
-if ($email_addr && $passwd) {
+function login_with_email($email_addr, $passwd, $next_url, $perm) {
     $user = BoincUser::lookup_email_addr($email_addr);
     if (!$user) {
         page_head("No such account");
@@ -43,7 +44,6 @@ if ($email_addr && $passwd) {
         exit;
     }
     if (substr($user->authenticator, 0, 1) == 'x'){
-        //User has been bad so we are going to take away ability to post for awhile.
         error_page("This account has been administratively disabled.");
     }
     $passwd_hash = md5($passwd.$email_addr);
@@ -55,20 +55,12 @@ if ($email_addr && $passwd) {
     }
     $authenticator = $user->authenticator;
     Header("Location: ".URL_BASE."$next_url");
-    $perm = false;
-    if (isset($_POST['stay_logged_in'])) {
-        $perm = $_POST['stay_logged_in'];
-    }
     send_cookie('auth', $authenticator, $perm);
-    exit();
 }
 
-// check for time/id/hash case.
-
-$id = get_int('id', true);
-$t = get_int('t', true);
-$h = get_str('h', true);
-if ($id && $t && $h) {
+// email link case
+//
+function login_via_link($id, $t, $h) {
     $user = BoincUser::lookup_id($id);
     if (!$user) {
         error_page("Invalid user ID.
@@ -93,7 +85,60 @@ if ($id && $t && $h) {
     }
     send_cookie('auth', $user->authenticator, true);
     Header("Location: home.php");
-    exit();
+}
+
+function login_with_auth($authenticator, $next_url, $perm) {
+    $user = BoincUser::lookup_auth($authenticator);
+    if (!$user) {
+        page_head("Login failed");
+        echo "There is no account with that authenticator.
+            Please <a href=get_passwd.php>try again</a>.
+        ";
+        page_tail();
+    } else if (substr($user->authenticator, 0, 1) == 'x'){
+        error_page("This account has been administratively disabled.");
+    } else {
+        Header("Location: $next_url");
+        send_cookie('auth', $authenticator, $perm);
+    }
+}
+
+function login_with_ldap($uid, $passwd, $next_url, $perm) {
+    list ($ldap_user, $error_msg) = ldap_auth($uid, $passwd);
+    if ($error_msg) {
+        error_page($error_msg);
+    }
+    $x = ldap_email_string($uid);
+    $user = BoincUser::lookup_email_addr($x);
+    if (!$user) {
+        // LDAP authentication succeeded but we don't have a user record.
+        // Create one.
+        //
+        $user = make_user_ldap($x, $ldap_user->name);
+    }
+    if (!$user) {
+        error_page("Couldn't create user");
+    }
+    Header("Location: ".URL_BASE."$next_url");
+    send_cookie('auth', $user->authenticator, $perm);
+    return;
+}
+
+$id = get_int('id', true);
+$t = get_int('t', true);
+$h = get_str('h', true);
+if ($id && $t && $h) {
+    login_via_link($id, $t, $h);
+    exit;
+}
+
+$next_url = post_str("next_url", true);
+$next_url = sanitize_local_url($next_url);
+if (strlen($next_url) == 0) $next_url = "home.php";
+
+$perm = false;
+if (isset($_POST['stay_logged_in'])) {
+    $perm = $_POST['stay_logged_in'];
 }
 
 // check for account key case.
@@ -103,24 +148,22 @@ $authenticator = get_str("key", true);
 if (!$authenticator) {
     $authenticator = post_str("authenticator", true);
 }
-if (!$authenticator) {
-    error_page("You must supply an email address and password");
+if ($authenticator) {
+    login_with_auth($authenticator, $next_url, $perm);
+    exit;
 }
 
-if (substr($user->authenticator, 0, 1) == 'x'){
-    //User has been bad so we are going to take away ability to post for awhile.
-    error_page("This account has been administratively disabled.");
-}
-$user = BoincUser::lookup_auth($authenticator);
-if (!$user) {
-    page_head("Login failed");
-    echo "There is no account with that authenticator.
-        Please <a href=get_passwd.php>try again</a>.
-    ";
-    page_tail();
-} else {
-    Header("Location: $next_url");
-    $perm = $_POST['stay_logged_in'];
-    send_cookie('auth', $authenticator, $perm);
+$email_addr = strtolower(sanitize_tags(post_str("email_addr", true)));
+$passwd = post_str("passwd", true);
+if ($email_addr && $passwd) {
+    if (LDAP_HOST && !is_valid_email_addr($email_addr)) {
+        login_with_ldap($email_addr, $passwd, $next_url, $perm);
+    } else {
+        login_with_email($email_addr, $passwd, $next_url, $perm);
+    }
+    exit;
 }
+
+error_page("You must supply an email address and password");
+
 ?>
diff --git a/html/user/login_form.php b/html/user/login_form.php
index 6d8f342..a3771ad 100644
--- a/html/user/login_form.php
+++ b/html/user/login_form.php
@@ -18,15 +18,25 @@
 
 require_once("../inc/db.inc");
 require_once("../inc/util.inc");
+require_once("../inc/account.inc");
 
 check_get_args(array("next_url"));
 
 $next_url = sanitize_local_url(get_str('next_url', true));
+$next_url = urlencode($next_url);
 
-$u = "login_form.php?next_url=".urlencode($next_url);
+$u = "login_form.php?next_url=".$next_url;
 redirect_to_secure_url($u);
 
 $user = get_logged_in_user(false);
+if ($user) {
+    page_head("Already logged in");
+    row2("You are logged in as $user->name",
+        ".  <a href=\"logout.php?".url_tokens($user->authenticator)."\">Log out</a>"
+    );
+    page_tail();
+    exit;
+}
 
 page_head(tra("Log in"));
 
@@ -38,43 +48,16 @@ echo '
 ';
 }
 
-echo "
-    <form name=\"f\" method=\"post\" action=\"".secure_url_base()."/login_action.php\">
-    <input type=\"hidden\" name=\"next_url\" value=\"$next_url\">
-";
-start_table();
-row2(tra("Email address:") . '<br><span class="note"><a href="get_passwd.php">'.tra("forgot email address?")."</a></span>",
-    "<input name=email_addr type=\"text\" size=40 tabindex=1>"
-);
-row2(tra("Password:") . '<br><span class="note"><a href="get_passwd.php">' . tra("forgot password?") . "</a></span>",
-    '<input type="password" name="passwd" size="40" tabindex="2">'
-);
-row2(tra("Stay logged in"),
-    '<input type="checkbox" name="stay_logged_in" checked>'
-);
-$x = urlencode($next_url);
+login_form($next_url);
 
 $config = get_config();
-if (parse_bool($config, "disable_account_creation")
-    || parse_bool($config, "no_web_account_creation")
+if (!parse_bool($config, "disable_account_creation")
+    && !parse_bool($config, "no_web_account_creation")
 ) {
-    $create_acct = "";
-} else {
-    $create_acct = tra("or %1create an account%2.", "<a href=\"create_account_form.php?next_url=$x\">","</a>");
+    echo tra("or %1create an account%2.", "<a href=\"create_account_form.php?next_url=$next_url\">","</a>");
 }
 
-row2("",
-    "<input type=\"submit\" name=\"mode\" value=\"".tra("Log in")."\" tabindex=\"3\"><br><br>". $create_acct
-);
-if ($user) {
-    row1("Log out");
-    row2("You are logged in as $user->name",
-        "<a href=\"logout.php?".url_tokens($user->authenticator)."\">Log out</a>"
-    );
-}
-end_table();
 echo "
-    </form>
     <script type=\"text/javascript\">
         document.f.email_addr.focus();
     </script>
diff --git a/html/user/main.css b/html/user/main.css
index d2324b5..79f43f1 100644
--- a/html/user/main.css
+++ b/html/user/main.css
@@ -8,12 +8,10 @@ Use classes, not IDs.
 
 We use the following classes:
 
-table.bordered
+.table-bordered
     a table with a border around it
 td.bordered
     bordered table cell (admin pages only)
-td.heading
-    table cell acting as heading
 td.fieldname
 td.fieldvalue
     table cells with name/value pairs
@@ -69,12 +67,16 @@ img {
     border: none;
 }
 
-table {
+.table {
     padding: 4px 6px;
     margin: 2px;
 }
 
-table.bordered {
+table.noborder {
+    cellpadding: 5;
+}
+
+.table-bordered, .bordered {
     border-width: 2px;
     border-style: solid;
     -moz-border-radius: 6px;
@@ -90,7 +92,7 @@ th {
 
 td {
     vertical-align: top;
-    padding: 4px;
+    padding: 2px;
 }
 
 td.bordered {
@@ -98,16 +100,23 @@ td.bordered {
     border-style: solid;
 }
 
-td.heading {
+th, td.heading {
     font-weight: bold;
     margin: 4px 0;
     padding: 8px;
 }
 
+th.subheading {
+    text-align: right;
+    font-weight: bold;
+    font-size: small;
+    font-style: italic;
+}
+
 td.fieldname {
     text-align: right;
     padding-right: 10px;
-    font-size: 14px;
+    /* font-size: 14px; */
     margin: 2px 0;
 }
 
@@ -153,9 +162,9 @@ input[type="submit"],
     border-radius: 5px;
 }
 
-    /* IE6 doesn't understand [type=XXXX] so we use class "button" */
+    /* IE6 doesn't understand [type=XXXX] so we use class "btn" */
 
-a.button {
+a.btn {
     line-height: 2.4em;
     padding: 4px 4px;
     margin: 0px 0px;
@@ -173,7 +182,7 @@ a.button {
 input[type="button"]:hover,
 input[type="submit"]:hover,
 input.btn:hover,
-.button:hover ,
+.btn:hover ,
 .forum_toplinks a:hover {
     text-decoration: none;
 }
@@ -267,8 +276,8 @@ td.postfooter {
     border-radius-bottomright: 10px;
 }
 
-td.postheader .button,
-td.postfooter .button {
+td.postheader .btn,
+td.postfooter .btn {
     font-size: 12px;
 }
 
@@ -299,7 +308,7 @@ td.lastpost, td.threadicon {
     font-weight: bold;
 }
 
-.description {
+.text-info, .description {
     font-size: 80%;
     font-weight: normal;
 }
@@ -346,9 +355,8 @@ img.flag {
     margin: 2px 1px;
 }
 
-.authorcol .button {
+.authorcol .btn {
     font-size: 12px;
-    margin: 0 4px;
     line-height: 2.6em;
 }
 
@@ -369,10 +377,11 @@ blockquote.postbody {
     margin: 20px;
 }
 
-span.note {
-    font-weight: normal;
+p.text-muted, span.note {
+    margin-top: 0.1em;
+    margin-bottom: 0.1em;
     font-style: italic;
-    font-size: 0.9em;
+    font-size: 0.8em;
 }
 
 span.news_date {
@@ -402,15 +411,19 @@ span.inboxunread {
     border-left-width: 3px;
     border-left-style: solid;
     padding-left: 1em;
-    white-space: nowrap;
+    white-space: pre;
     overflow: auto;
 }
 
-.smalltext {
+.donationtext {
     font-size: 0.8em;
 }
 
-.error,
+small {
+    font-size: 0.8em;
+}
+
+p.text-danger, .error,
 .notice  {
     font-weight: bold;
     font-size: 1.1em;
@@ -433,3 +446,8 @@ div.pm_preview {
 * html body .code {
     white-space: normal;
 }
+
+// this ignores additional bootstrap classes
+div.input-group, div.btn-group, ul.pager, div.pagination {
+    display: inline;
+}
diff --git a/html/user/manage_app.php b/html/user/manage_app.php
index ffade15..cf0366a 100644
--- a/html/user/manage_app.php
+++ b/html/user/manage_app.php
@@ -64,7 +64,7 @@ function app_version_form($app) {
         <td><br></td>
         <td><br></td>
         <td><br></td>
-        <td><input type=submit value=Update></td>
+        <td><input class=\"btn btn-default\" type=submit value=Update></td>
         </tr>
     ";
     end_table();
@@ -119,7 +119,7 @@ function permissions_form($app) {
         </tr>
         <tr>
         <td><br></td>
-        <td><input type=submit value=OK></td>
+        <td><input class=\"btn btn-default\" type=submit value=OK></td>
         </tr>
     ";
     end_table();
@@ -176,7 +176,7 @@ function batches_form($app) {
         <td><br></td>
         <td><br></td>
         <td><br></td>
-        <td><input type=submit value=OK></td>
+        <td><input class=\"btn btn-default\" type=submit value=OK></td>
         </tr>
     ";
     end_table();
diff --git a/html/user/manage_project.php b/html/user/manage_project.php
index d33f3c9..f598588 100644
--- a/html/user/manage_project.php
+++ b/html/user/manage_project.php
@@ -70,11 +70,11 @@ function handle_list() {
     $us = BoincUserSubmit::enum("");
     start_table();
     table_header(
-        "User<br><span class=note>Click to change permissions or quota</span>",
+        "User<br><p class=\"text-muted\">Click to change permissions or quota</p>",
         "Can submit jobs for",
         "Quota",
-        "Max jobs in progress<br><span class=note>0 means no limit</span>",
-        "Current priority<br><span class=note>Later time = lower priority</span>"
+        "Max jobs in progress<br><p class=\"text-muted\">0 means no limit</p>",
+        "Current priority<br><p class=\"text-muted\">Later time = lower priority</p>"
     );
     foreach ($us as $u) {
         user_row($u);
@@ -127,7 +127,7 @@ function handle_edit_form() {
         Max jobs in progress:
         <input name=max_jobs_in_progress value=$mj>
         <p>
-        <input type=submit value=OK>
+        <input class=\"btn btn-default\" type=submit value=OK>
         </form>
         <p>
         <a href=manage_project.php>Return to project-wide management functions</a>
@@ -171,7 +171,7 @@ function handle_add_form() {
         <input type=hidden name=action value=add_action>
         User ID: <input name=user_id>
         <br>
-        <input type=submit value=OK>
+        <input class=\"btn btn-default\" type=submit value=OK>
         </form>
     ";
     page_tail();
diff --git a/html/user/notices.php b/html/user/notices.php
index 9ba828d..e2539f2 100644
--- a/html/user/notices.php
+++ b/html/user/notices.php
@@ -98,7 +98,7 @@ foreach ($threads as $t) {
 usort($items, 'notice_cmp');
 
 $client_version = boinc_client_version();
-$no_images = ($client_version < 73000);
+$no_images = $client_version && ($client_version < 70300);
 
 notices_rss_start();
 foreach ($items as $item) {
diff --git a/html/user/per_app_list.php b/html/user/per_app_list.php
new file mode 100644
index 0000000..979508a
--- /dev/null
+++ b/html/user/per_app_list.php
@@ -0,0 +1,130 @@
+<?php
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2014 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/>.
+
+// show top users or teams, ordered by per-app credit
+//
+// URL args:
+// is_team: if nonzero, show teams
+// appid: ID of app for sorting; default is first app returned by enum
+// is_total: if nonzero, sort by total credit
+
+require_once("../inc/util.inc");
+require_once("../inc/team.inc");
+
+// return a column title (Average or Total),
+// hyperlinked if this is not the current sort column
+//
+function col_title($is_team, $app, $appid, $is_total, $i) {
+    $x = $i?"Total":"Average";
+    if ($app->id == $appid && ($is_total?$i:!$i)) {
+        return $x;
+    } else {
+        return "<a href=per_app_list.php?appid=$app->id&is_team=$is_team&is_total=$i>$x</a>";
+    }
+}
+
+// print a row of app names,
+// under each of which are columns for Average and Total
+//
+function show_header($is_team, $apps, $appid, $is_total) {
+    echo "<tr><th colspan=2> </th>";
+    foreach ($apps as $app) {
+        echo "<th colspan=2>$app->name</th>\n";
+    }
+    echo "</tr>";
+
+    echo "<tr>";
+    echo "<th>Rank</th><th>Name</th>\n";
+    foreach ($apps as $app) {
+        for ($i=0; $i<2; $i++) {
+            $x = col_title($is_team, $app, $appid, $is_total, $i);
+            echo "<th>$x</th>\n";
+        }
+    }
+    echo "</tr>";
+
+}
+
+// show a user or team, with their credit for each app
+//
+function show_row($item, $apps, $is_team, $i) {
+    $j = $i % 2;
+    if ($is_team) {
+        $team = BoincTeam::lookup_id($item->teamid);
+        if (!$team) return;
+        $x = "<td>".team_links($team)."</td>\n";
+    } else {
+        $user = BoincUser::lookup_id($item->userid);
+        if (!$user) return;
+        $x= "<td>".user_links($user, BADGE_HEIGHT_MEDIUM)."</td>\n";
+    }
+    echo "<tr class=row$j>";
+    echo "<td>$i</td>\n";
+    echo $x;
+
+    foreach ($apps as $app) {
+        if ($app->id == $item->appid) {
+            $c = $item;
+        } else {
+            if ($is_team) {
+                $c = BoincCreditTeam::lookup("teamid=$item->teamid and appid=$app->id");
+            } else {
+                $c = BoincCreditUser::lookup("userid=$item->userid and appid=$app->id");
+            }
+            if (!$c) {
+                $c = new StdClass;
+                $c->expavg = 0;
+                $c->total = 0;
+            }
+        }
+        echo "<td align=right>".format_credit($c->expavg)."</td><td align=right>".format_credit_large($c->total)."</td>\n";
+    }
+    echo "</tr>\n";
+}
+
+function show_list($is_team, $appid, $is_total) {
+    $x = $is_team?"teams":"participants";
+    page_head("Top $x by application");
+    $apps = BoincApp::enum("deprecated=0");
+    if (!$appid) {
+        $appid = $apps[0]->id;
+    }
+    start_table();
+    show_header($is_team, $apps, $appid, $is_total);
+    $x = $is_total?"total":"expavg";
+    if ($is_team) {
+        $items = BoincCreditTeam::enum("appid=$appid order by $x desc");
+    } else {
+        $items = BoincCreditUser::enum("appid=$appid order by $x desc");
+    }
+    $i = 0;
+    foreach ($items as $item) {
+        show_row($item, $apps, $is_team, $i);
+        $i++;
+    }
+    end_table();
+    page_tail();
+}
+
+$is_team = get_int('is_team', true);
+$appid = get_int('appid', true);
+$is_total = get_int('is_total', true);
+
+show_list($is_team, $appid, $is_total);
+
+?>
diff --git a/html/user/pm.php b/html/user/pm.php
index 092c91e..a5ec471 100644
--- a/html/user/pm.php
+++ b/html/user/pm.php
@@ -90,6 +90,11 @@ function do_inbox($logged_in_user) {
         echo "<tr><th>".tra("Subject")."</th><th>".tra("Sender and date")."</th><th>".tra("Message")."</th></tr>\n";
         $i = 0;
         foreach($msgs as $msg) {
+            $sender = BoincUser::lookup_id($msg->senderid);
+            if (!$sender) {
+                $msg->delete();
+                continue;
+            }
             $i++;
             $class = ($i%2)? "row0": "row1";
             echo "<tr class=$class>\n";
@@ -98,7 +103,7 @@ function do_inbox($logged_in_user) {
                 $msg->update("opened=1");
             }
             echo "<td valign=top> $checkbox $msg->subject </td>\n";
-            echo "<td valign=top>".user_links(BoincUser::lookup_id($msg->senderid));
+            echo "<td valign=top>".user_links($sender, BADGE_HEIGHT_SMALL);
             show_block_link($msg->senderid);
             echo "<br>".time_str($msg->date)."</td>\n";
             echo "<td valign=top>".output_transform($msg->content, $options)."<p>";
@@ -114,7 +119,7 @@ function do_inbox($logged_in_user) {
             <a href=\"javascript:set_all(0)\">".tra("Unselect all")."</a>
             </td>
             <td colspan=2>
-            <input type=submit value=\"".tra("Delete selected messages")."\">
+            <input class=\"btn btn-danger\" type=submit value=\"".tra("Delete selected messages")."\">
             </td></tr>
         ";
         end_table();
@@ -137,7 +142,7 @@ function do_read($logged_in_user) {
 
     start_table();
     echo "<tr><th>".tra("Subject")."</th><td>".$message->subject."</td></tr>";
-    echo "<tr><th>".tra("Sender")."</th><td>".user_links($sender);
+    echo "<tr><th>".tra("Sender")."</th><td>".user_links($sender, BADGE_HEIGHT_SMALL);
     show_block_link($message->senderid);
     echo "</td></tr>";
     echo "<tr><th>".tra("Date")."</th><td>".time_str($message->date)."</td></tr>";
@@ -248,7 +253,7 @@ function do_block($logged_in_user) {
     echo form_tokens($logged_in_user->authenticator);
     echo "<input type=\"hidden\" name=\"action\" value=\"confirmedblock\">\n";
     echo "<input type=\"hidden\" name=\"id\" value=\"$id\">\n";
-    echo "<input type=\"submit\" value=\"".tra("Add user to filter")."\">\n";
+    echo "<input class=\"btn btn-default\" type=\"submit\" value=\"".tra("Add user to filter")."\">\n";
     echo "<a href=\"pm.php?action=inbox\">".tra("No, cancel")."</a>\n";
     echo "</form>\n";
 }
@@ -274,7 +279,7 @@ function do_delete_selected($logged_in_user) {
     );
     foreach($msgs as $msg) {
         $x = "pm_select_$msg->id";
-        if ($_POST[$x]) {
+        if (post_str($x, true)) {
             $msg = BoincPrivateMessage::lookup_id($msg->id);
             $msg->delete();
         }
diff --git a/html/user/prefs.php b/html/user/prefs.php
index 64cddca..144b028 100644
--- a/html/user/prefs.php
+++ b/html/user/prefs.php
@@ -18,6 +18,7 @@
 
 require_once("../inc/util.inc");
 require_once("../inc/prefs.inc");
+require_once("../inc/prefs_project.inc");
 
 $user = get_logged_in_user();
 
diff --git a/html/user/prefs_edit.php b/html/user/prefs_edit.php
index 305deaf..7cf3cea 100644
--- a/html/user/prefs_edit.php
+++ b/html/user/prefs_edit.php
@@ -19,6 +19,7 @@
 include_once("../inc/db.inc");
 include_once("../inc/util.inc");
 include_once("../inc/prefs.inc");
+include_once("../inc/prefs_project.inc");
 
 $user = get_logged_in_user();
 
@@ -92,6 +93,7 @@ if ($action) {
     $title = tra("Edit %1 preferences", subset_name($subset));
     if ($venue) $title = tra("%1 for %2", $title, $venue);
     page_head($title);
+    checkbox_clicked_js();
 
     if ($subset == "global") {
         echo PREFS_FORM_DESC1;
diff --git a/html/user/prefs_remove.php b/html/user/prefs_remove.php
index 0e53eb0..fa4109e 100644
--- a/html/user/prefs_remove.php
+++ b/html/user/prefs_remove.php
@@ -18,6 +18,7 @@
 
 include_once("../inc/util.inc");
 include_once("../inc/prefs.inc");
+include_once("../inc/prefs_project.inc");
 
 check_get_args(array("subset", "venue", "confirmed", "cols", "tnow", "ttok"));
 
diff --git a/html/user/profile_menu.php b/html/user/profile_menu.php
index 48c930a..f76ed39 100644
--- a/html/user/profile_menu.php
+++ b/html/user/profile_menu.php
@@ -48,7 +48,7 @@ echo "<tr><td>";
     if ($profile) {
         $user = BoincUser::lookup_id($profile->userid);
         echo uotd_thumbnail($profile, $user);
-        echo user_links($user)."<br>";
+        echo user_links($user, BADGE_HEIGHT_MEDIUM)."<br>";
         $resp = output_transform($profile->response1);
         $resp = sanitize_tags($resp);
         echo sub_sentence($resp, ' ', 150, true);
@@ -75,7 +75,7 @@ row1(tra("Search profile text"));
 rowify("
     <form action=\"profile_search_action.php\" method=\"GET\">
     <input type=\"text\" name=\"search_string\">
-    <input type=\"submit\" value=\"".tra("Search")."\">
+    <input class=\"btn btn-default\" type=\"submit\" value=\"".tra("Search")."\">
     </form>
 ");
 end_table();
diff --git a/html/user/profile_search_action.php b/html/user/profile_search_action.php
index 76c446d..47f449b 100644
--- a/html/user/profile_search_action.php
+++ b/html/user/profile_search_action.php
@@ -25,7 +25,7 @@ check_get_args(array("search_string", "offset"));
 
 function show_profile_link2($profile, $n) {
     $user = BoincUser::lookup_id($profile->userid);
-    echo "<tr><td>".user_links($user)."</td><td>".date_str($user->create_time)."</td><td>$user->country</td><td>".(int)$user->total_credit."</td><td>".(int)$user->expavg_credit."</td></tr>\n";
+    echo "<tr><td>".user_links($user, BADGE_HEIGHT_SMALL)."</td><td>".date_str($user->create_time)."</td><td>$user->country</td><td>".(int)$user->total_credit."</td><td>".(int)$user->expavg_credit."</td></tr>\n";
 }
 
 $search_string = get_str('search_string');
diff --git a/html/user/register.php b/html/user/register.php
new file mode 100644
index 0000000..923c1e8
--- /dev/null
+++ b/html/user/register.php
@@ -0,0 +1,55 @@
+<?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/>.
+
+// Show a registration form allowing user to create account
+// or log in to existing account.
+// When done, take them to a download page.
+//
+// Link to this from a "Join" button on home page
+
+require_once("../inc/util.inc");
+require_once("../inc/account.inc");
+
+function reg_form() {
+    $config = get_config();
+    $disable_acct = parse_bool($config, "disable_account_creation");
+    page_head("Register");
+    start_table();
+    echo "<tr><td>";
+    echo "<h3>Create an account</h3>";
+    create_account_form(0, "download.php");
+    echo "</td><td>";
+    echo "<h3>If you already have an account, log in</h3>";
+    login_form("download.php");
+    echo "</td></tr>";
+    end_table();
+    page_tail();
+}
+
+// if user is logged in, go straight to download page
+//
+$user = get_logged_in_user(false);
+if ($user) {
+    header("Location: download.php");
+    exit;
+}
+
+// otherwise show registration form
+//
+reg_form();
+?>
diff --git a/html/user/rss_main.php b/html/user/rss_main.php
index e86fcf0..f2420b4 100644
--- a/html/user/rss_main.php
+++ b/html/user/rss_main.php
@@ -16,7 +16,7 @@
 // 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("../project/project.inc");
+require_once("../inc/util.inc");
 require_once("../inc/forum_rss.inc");
 require_once("../inc/news.inc");
 
diff --git a/html/user/sample_index.php b/html/user/sample_index.php
index 1823428..7b06552 100644
--- a/html/user/sample_index.php
+++ b/html/user/sample_index.php
@@ -22,7 +22,6 @@
 // my developing your own stylesheet
 // and customizing the header/footer functions in html/project/project.inc
 
-require_once("../inc/db.inc");
 require_once("../inc/util.inc");
 require_once("../inc/news.inc");
 require_once("../inc/cache.inc");
@@ -63,7 +62,7 @@ function show_nav() {
         <li> [Link to page describing your research in detail]
         <li> [Link to page listing project personnel, and an email address]
         </ul>
-        <h2 class=headline>Join ".PROJECT."</h2>
+        <h2 class=headline>Participate</h2>
         <ul>
     ";
     if ($no_computing) {
@@ -78,21 +77,13 @@ function show_nav() {
         echo "
             <li><a href=\"info.php\">".tra("Read our rules and policies")."</a>
         ";
-        if (!$disable_acct) {
-            echo "
-                <li> This project uses BOINC.
-                    If you're already running BOINC, select Add Project.
-                    If not, <a target=\"_new\" href=\"http://boinc.berkeley.edu/download.php\">download BOINC</a>.
-                <li> When prompted, enter <br><b>".$master_url."</b>
-            ";
-            if (!$no_web_account_creation) {
-                echo "
-                    <li> If you're running a command-line version of BOINC,
-                        <a href=\"create_account_form.php\">create an account</a> first.
-                ";
-            }
+        if (0) {
+            echo "<li>";
+            show_button("register.php", "Join", null, "btn btn-green");
         } else {
-            echo "<li> This project is not currently accepting new accounts.";
+            echo "<li> <a href=http://boinc.berkeley.edu/download.php>Download</a> and run BOINC.
+                <li> Choose Add Project
+            ";
         }
         echo "
             <li> If you have any problems,
@@ -161,6 +152,10 @@ echo "<html>
     <link rel=\"alternate\" type=\"application/rss+xml\" title=\"".$rssname."\" href=\"".$rsslink."\">
 ";
 include 'schedulers.txt';
+    if (defined("SHORTCUT_ICON")) {
+        echo '<link rel="icon" type="image/x-icon", href="'.SHORTCUT_ICON.'"/>'
+;
+    }
 echo "
     </head><body>
     <div class=page_title>".PROJECT."</div>
@@ -172,7 +167,7 @@ if (!$stopped) {
 }
 
 echo "
-    <table cellpadding=\"8\" cellspacing=\"4\" class=bordered>
+    <table cellpadding=\"8\" cellspacing=\"4\" class=\"table table-bordered\">
     <tr><td rowspan=\"2\" valign=\"top\" width=\"40%\">
 ";
 
@@ -182,7 +177,6 @@ if ($stopped) {
         Please try again later</b>.
     ";
 } else {
-    db_init();
     show_nav();
 }
 
diff --git a/html/user/sandbox.php b/html/user/sandbox.php
index ab77d98..b648b15 100644
--- a/html/user/sandbox.php
+++ b/html/user/sandbox.php
@@ -48,7 +48,7 @@ function list_files($user, $err_msg) {
         <input type=hidden name=action value=upload_file>
         Upload a file to your sandbox:
         <p><input size=80 type=file name=\"new_file[]\" multiple=\"multiple\">
-        <p> <input type=submit value=Upload>
+        <p> <input class=\"btn btn-default\" type=submit value=Upload>
         </form>
         <hr>
     ";
@@ -66,7 +66,7 @@ function list_files($user, $err_msg) {
     } else {
         sort($files);
         start_table();
-        table_header("Name<br><span class=note>(click to view)</span>", "Modified", "Size (bytes)", "MD5", "Delete","Download");
+        table_header("Name<br><p class=\"text-muted\">(click to view)</p>", "Modified", "Size (bytes)", "MD5", "Delete","Download");
         foreach ($files as $f) {
             $path = "$dir/$f";
             list($error, $size, $md5) = sandbox_parse_link_file($path);
diff --git a/html/user/server_status.php b/html/user/server_status.php
index 762a808..083c940 100644
--- a/html/user/server_status.php
+++ b/html/user/server_status.php
@@ -1,7 +1,7 @@
 <?php
 // This file is part of BOINC.
 // http://boinc.berkeley.edu
-// Copyright (C) 2008 University of California
+// Copyright (C) 2014 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
@@ -16,465 +16,408 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
-// server_status.php
-//   (or server_status.php?xml=1)
-//
-// outputs general information about BOINC server status gathered from
-// config.xml or mysql database queries. If you are running all your
-// services on one machine, and the database isn't so large, this should
-// work right out of the box. Otherwise see configureables below.
-//
-// Daemons in config.xml are checked to see if they are running by ssh'ing
-// into the respective hosts and searching for active pids. Passwordless
-// logins must be in effect if there are multiple hosts involved.
-//
-// The database queries may be very slow. You might consider running these
-// queries elsewhere via cronjob, outputing numbers into a readable file,
-// and then getting the latest values with a `/bin/tail -1 data_file`.
-// See commented example in the code.
-//
-// You can get an xml version of the stats via the web when the url has the
-// optional "?xml=1" tag at the end, i.e
-//   http://yourboincproject.edu/server_status.php?xml=1
-//
-// You should edit the following variables in config.xml to suit your needs:
-//
-// <www_host>    hostname of web server (default: same as <host>)
-// <sched_host>  hostname of scheduling server (default: same as <host>)
-// <uldl_host>   hostname of upload/download server (default: same as <host>)
-// <uldl_pid>    pid file of upload/download server httpd.conf
-//               (default: /etc/httpd/run/httpd.pid)
-// <ssh_exe>     path to ssh (default: /usr/bin/ssh)
-// <ps_exe>      path to ps (which supports "w" flag) (default: /bin/ps)
-
-///////////////////////////////////////////////////////////////////////////////
+// Show server status page.
+// Sources of data:
+// - daemons on this host: use "ps" to see if each is running
+//   (this could be made more efficient using a single "ps",
+//   or it could be cached)
+// - daemons on other hosts: get from a cached file generated periodically
+//   by ops/remote_server_status.php
+//   (we can't do this ourselves because apache can't generally ssh)
+// - apps and job counts: get from a cached file that we generate ourselves
 
+require_once("../inc/cache.inc");
 require_once("../inc/util.inc");
 require_once("../inc/xml.inc");
-require_once("../inc/cache.inc");
-require_once("../inc/translation.inc");
-
-check_get_args(array("xml"));
+require_once("../inc/boinc_db.inc");
 
-$xml = get_int("xml", true);
+if (!defined('STATUS_PAGE_TTL')) {
+    define('STATUS_PAGE_TTL', 3600);
+}
 
-// daemon status outputs: 1 (running) 0 (not running) or -1 (disabled)
+// trim a daemon command for display.
+// For now, remove the cmdline args, but show the app if any
 //
-function daemon_status($host, $pidname, $progname, $disabled) {
-    global $ssh_exe, $ps_exe, $project_host, $project_dir;
-    if ($disabled == 1) return -1;
-    $path = "$project_dir/pid_$host/$pidname";
-    if ($host != $project_host) {
-        $command = "$ssh_exe $host $project_dir/bin/pshelper $path";
-        $foo = exec($command);
-        $running = 1;
-        if ($foo) {
-            if (strstr($foo, "false")) $running = 0;
-        } else $running = 0;
-        return $running;
+function command_display($cmd) {
+    $x = explode(" -", $cmd);
+    $prog = $x[0];
+    $x = strpos($cmd, "-app ");
+    if ($x) {
+        $y = substr($cmd, $x);
+        $y = explode(" ", $y);
+        $app = $y[1];
+        $prog .= " ($app)";
     }
-    $running = 0;
-    if (is_file($path)) {
-        $pid = file_get_contents($path);
-        if ($pid) {
-            $pid = trim($pid);
-            $command = "$ps_exe ww $pid";
-            $foo = exec($command);
-            if ($foo) {
-                if (strstr($foo, (string)$pid)) $running = 1;
-            }
-        }
-    }
-    return $running;
+    return $prog;
 }
 
-function show_status($host, $progname, $running) {
-    global $xml;
-    $xmlstring = "    <daemon>\n      <host>$host</host>\n      <command>$progname</command>\n";
-    $htmlstring = "<tr><td>$progname</td><td>$host</td>";
-    if ($running == 1) {
-        $xmlstring .= "      <status>running</status>\n";
-        $htmlstring .= "<td class=\"running\">".tra("Running")."</td>\n";
-    } elseif ($running == 0) {
-        $xmlstring .= "      <status>not running</status>\n";
-        $htmlstring .= "<td class=\"notrunning\">".tra("Not Running")."</td>\n";
-    } else {
-        $xmlstring .= "      <status>disabled</status>\n";
-        $htmlstring .= "<td class=\"disabled\">".tra("Disabled")."</td>\n";
-    }
-    $xmlstring .= "    </daemon>\n";
-    $htmlstring .= "</tr>\n";
-    if ($xml) {
-        echo $xmlstring;
-    } else {
-        echo $htmlstring;
+$row_parity = 0;
+function daemon_html($d) {
+    global $row_parity;
+    switch ($d->status) {
+    case 0:
+        $s = tra("Not Running");
+        $c = "notrunning";
+        break;
+    case 1:
+        $s = tra("Running");
+        $c = "running";
+        break;
+    default:
+        $s = tra("Disabled");
+        $c = "disabled";
+        break;
     }
-    return 0;
-}
-
-function show_daemon_status($host, $pidname, $progname, $disabled) {
-    $running = daemon_status($host, $pidname, $progname, $disabled);
-    show_status($host, $progname, $running);
+    echo "<tr class=row$row_parity>
+        <td>".command_display($d->cmd)."</td>
+        <td>$d->host</td>
+        <td class=\"$c\"><nobr>$s</nobr></td>
+    <tr>
+";
+    $row_parity = 1-$row_parity;
 }
 
-function show_counts($key, $xmlkey, $value) {
-    global $xml;
-    $formattedvalue = number_format($value);
-    $xmlstring = "    <$xmlkey>$value</$xmlkey>\n";
-    if ($xml) {
-        echo $xmlstring;
-    } else {
-        echo "<tr><td>$key</td><td>$formattedvalue</td></tr>";
+function daemon_xml($d) {
+    switch ($d->status) {
+    case 0: $s = "not running"; break;
+    case 1: $s = "running"; break;
+    default: $s = "disabled";
     }
-    return 0;
+    echo "  <daemon>
+        <host>$d->host</host>
+        <command>".command_display($d->cmd)."</command>
+        <status>$s</status>
+    </daemon>
+";
 }
 
-function get_mysql_count($table, $query) {
-    $count = unserialize(get_cached_data(3600, "get_mysql_count".$table.$query));
-    if ($count == false) {
-        $count = BoincDB::get()->count($table,$query);
-        set_cached_data(3600, serialize($count), "get_mysql_count".$table.$query);
-    }
-    return $count;
+function item_xml($name, $val) {
+    if (!$val) $val = 0;
+    echo "   <$name>$val</$name>\n";
 }
 
-function get_mysql_sum($table, $field) {
-    $value = unserialize(get_cached_data(3600, "get_mysql_sum".$table.$field));
-    if ($value == false) {
-        $value = BoincDB::get()->sum($table, $field);
-        set_cached_data(3600, serialize($value), "get_mysql_sum".$table.$field);
-    }
-    return $value;
+function item_html($name, $val) {
+    $name = tra($name);
+    echo "<tr><td align=right>$name</td><td align=right>$val</td></tr>\n";
 }
 
-function get_cached_apps() {
-    $apps = unserialize(get_cached_data(3600, "get_cached_apps"));
-    if ($apps == false) {
-        $apps = BoincApp::enum("deprecated=0");
-        set_cached_data(3600, serialize($apps), "get_cached_apps");
+function show_status_html($x) {
+    page_head(tra("Project status"));
+    $j = $x->jobs;
+    $daemons = $x->daemons;
+    start_table();
+    echo "<tr><td width=50% valign=top>
+         <h2>".tra("Server status")."</h2>
+    ";
+    start_table();
+    table_header(tra("Program"), tra("Host"), tra("Status"));
+    foreach ($daemons->local_daemons as $d) {
+        daemon_html($d);
     }
-    return $apps;
-}
-
-function get_runtime_info($appid) {
-    $info = unserialize(get_cached_data(3600, "get_runtime_info".$appid));
-    if ($info == false) {
-        $info = BoincDB::get()->lookup_fields("result", "stdClass",
-            "ceil(avg(elapsed_time)/3600*100)/100 as avg,
-            ceil(min(elapsed_time)/3600*100)/100 as min,
-            ceil(max(elapsed_time)/3600*100)/100 as max,
-            count(distinct userid) as users",
-            "appid = $appid 
-            AND validate_state=1 
-            AND received_time > (unix_timestamp()-(3600*24)) 
-            "
-        );
-        if (!$info){
-            // No recent jobs sound
-            $info = new stdClass;
-            $info->avg = $info->min = $info->max = $info->users = 0;
-        }
-        set_cached_data(3600, serialize($info), "get_runtime_info".$appid);
+    foreach ($daemons->remote_daemons as $d) {
+        daemon_html($d);
     }
-    return $info;
-}
-
-$config_xml = get_config();
-$config_vars = parse_element($config_xml,"<config>");
-$project_host = parse_element($config_vars,"<host>");
-$www_host = parse_element($config_vars,"<www_host>");
-if ($www_host == "") {
-    $www_host = $project_host;
-}
-$sched_host = parse_element($config_vars,"<sched_host>");
-if ($sched_host == "") {
-    $sched_host = $project_host;
-}
-$uldl_pid = parse_element($config_vars,"<uldl_pid>");
-if ($uldl_pid == "") {
-    $uldl_pid = "/etc/httpd/run/httpd.pid";
-}
-$uldl_host = parse_element($config_vars,"<uldl_host>");
-if ($uldl_host == "") {
-    $uldl_host = $project_host;
-}
-$project_dir = parse_element($config_vars,"<project_dir>");
-if ($project_dir == "") {
-    $project_dir = "../..";
-}
-$ssh_exe = parse_element($config_vars,"<ssh_exe>");
-if ($ssh_exe == "") {
-    $ssh_exe = "/usr/bin/ssh";
-}
-$ps_exe = parse_element($config_vars,"<ps_exe>");
-if ($ps_exe == "") {
-    $ps_exe = "/bin/ps";
+    foreach ($daemons->disabled_daemons as $d) {
+        daemon_html($d);
+    }
+    end_table();
+    if ($j->db_revision) {
+        echo tra("Database schema version: "), $j->db_revision;
+    }
+    if ($daemons->cached_time) {
+        echo "<br>Remote daemon status as of ", time_str($daemons->cached_time);
+    }
+    if ($daemons->missing_remote_status) {
+        echo "<br>Status of remote daemons is missing\n";
+    }
+    if (function_exists('server_status_project_info')) {
+        echo "<br>";
+        server_status_project_info();
+    }
+    echo "</td><td>\n";
+    echo "<h2>".tra("Computing status")."</h2>\n";
+    start_table();
+    echo "<tr><td>\n";
+    start_table();
+    table_header(tra("Work"), "#");
+    item_html("Tasks ready to send", $j->results_ready_to_send);
+    item_html("Tasks in progress", $j->results_in_progress);
+    item_html("Workunits waiting for validation", $j->wus_need_validate);
+    item_html("Workunits waiting for assimilation", $j->wus_need_assimilate);
+    item_html("Workunits waiting for file deletion", $j->wus_need_file_delete);
+    item_html("Tasks waiting for file deletion", $j->results_need_file_delete);
+    item_html("Transitioner backlog (hours)", number_format($j->transitioner_backlog, 2));
+    end_table();
+    echo "</td><td>\n";
+    start_table();
+    table_header(tra("Users"), "#");
+    item_html("With credit", $j->users_with_credit);
+    item_html("With recent credit", $j->users_with_recent_credit);
+    item_html("Registered in past 24 hours", $j->users_past_24_hours);
+    table_header(tra("Computers"), "#");
+    item_html("With credit", $j->hosts_with_credit);
+    item_html("With recent credit", $j->hosts_with_recent_credit);
+    item_html("Registered in past 24 hours", $j->hosts_past_24_hours);
+    item_html("Current GigaFLOPS", round($j->flops, 2));
+    end_table();
+    end_table();
+    start_table();
+    echo "<tr><th colspan=5>".tra("Tasks by application")."</th></tr>\n";
+    table_header(
+        tra("Application"), tra("Unsent"), tra("In progress"),
+        tra("Runtime of last 100 tasks in hours: average, min, max"),
+        tra("Users in last 24 hours")
+    );
+    $i = 0;
+    foreach ($j->apps as $app) {
+        $avg = round($app->info->avg, 2);
+        $min = round($app->info->min, 2);
+        $max = round($app->info->max, 2);
+        $x = $max?"$avg ($min - $max)":"---";
+        $u = $app->info->users;
+        echo "<tr class=row$i>
+            <td>$app->user_friendly_name</td>
+            <td>$app->unsent</td>
+            <td>$app->in_progress</td>
+            <td>$x</td>
+            <td>$u</td>
+            </tr>
+        ";
+        $i = 1-$i;
+    }
+    end_table();
+    echo "<p>Task data as of ".time_str($j->cached_time);
+    echo "</td></tr>\n";
+    end_table();
+    page_tail();
 }
 
-$version = null;
-if (file_exists("../../local.revision")) {
-    $version = trim(file_get_contents("../../local.revision"));
-}
-$now = time();
+function show_status_xml($x) {
+    xml_header();
+    echo "<server_status>\n<daemon_status>\n";
 
-$xmlstring = "<server_status>
-  <update_time>$now</update_time>
+    $daemons = $x->daemons;
+    foreach ($daemons->local_daemons as $d) {
+        daemon_xml($d);
+    }
+    foreach ($daemons->remote_daemons as $d) {
+        daemon_xml($d);
+    }
+    foreach ($daemons->disabled_daemons as $d) {
+        daemon_xml($d);
+    }
+    echo "</daemon_status>\n<database_file_states>\n";
+    $j = $x->jobs;
+    item_xml("results_ready_to_send", $j->results_ready_to_send);
+    item_xml("results_in_progress", $j->results_in_progress);
+    item_xml("workunits_waiting_for_validation", $j->wus_need_validate);
+    item_xml("workunits_waiting_for_assimilation", $j->wus_need_assimilate);
+    item_xml("workunits_waiting_for_deletion", $j->wus_need_file_delete);
+    item_xml("results_waiting_for_deletion", $j->results_need_file_delete);
+    item_xml("transitioner_backlog_hours", $j->transitioner_backlog);
+    item_xml("users_with_recent_credit", $j->users_with_recent_credit);
+    item_xml("users_with_credit", $j->users_with_credit);
+    item_xml("users_registered_in_past_24_hours", $j->users_past_24_hours);
+    item_xml("hosts_with_recent_credit", $j->hosts_with_recent_credit);
+    item_xml("hosts_with_credit", $j->hosts_with_credit);
+    item_xml("hosts_registered_in_past_24_hours", $j->hosts_past_24_hours);
+    item_xml("current_floating_point_speed", $j->flops);
+    echo "<tasks_by_app>\n";
+    foreach ($j->apps as $app) {
+        echo "<app>\n";
+        item_xml("id", $app->id);
+        item_xml("name", $app->name);
+        item_xml("unsent", $app->unsent);
+        item_xml("in_progress", $app->in_progress);
+        item_xml("avg_runtime", $app->info->avg);
+        item_xml("min_runtime", $app->info->min);
+        item_xml("max_runtime", $app->info->max);
+        item_xml("users", $app->info->users);
+        echo "</app>\n";
+    }
+    echo "</tasks_by_app>
+</database_file_states>
+</server_status>
 ";
-if ($version) {
-    $xmlstring .= "<software_version>$version</software_version>\n";
 }
-$xmlstring .= "  <daemon_status>\n";
-if ($xml) {
-    xml_header();
-    echo $xmlstring;
-} else {
-    page_head(tra("Project status"));
-    if ($version) {
-        echo tra("Server software version: %1", $version) . " / ";
+
+function local_daemon_running($cmd) {
+    $cmd = trim($cmd);
+    $x = explode(" ", $cmd);
+    $prog = $x[0];
+    $out = Array();
+    exec("ps -Fw -C $prog", $out);
+    foreach ($out as $y) {
+        if (strstr($y, $cmd)) return 1;
     }
-    echo time_str(time()), "
-        <table width=100%>
-        <tr>
-        <td width=40% valign=top>
-        <h2>".tra("Server status")."</h2>
-        <table border=0 cellpadding=4>
-        <tr><th>".tra("Program")."</th><th>".tra("Host")."</th><th>".tra("Status")."</th></tr>
-    ";
+    return 0;
 }
-;
-// Are the data-driven web sites running? Check for existence of stop_web.
-// If it is there, set $web_running to -1 for "disabled",
-// otherwise it will be already set to 1 for "enabled."
-// Set $www_host to the name of server hosting WWW site.
-//
-$web_running = !file_exists("../../stop_web");
-if ($web_running == 0) $web_running = -1;
-show_status($www_host, tra("data-driven web pages"), $web_running);
 
-// Check for httpd.pid file of upload/download server.
+// returns a data structure of the form
+// local_daemons: array of
+//   cmd, status
+// remote_daemons: array of
+//   cmd, host, status
+// disabled_daemons: array of
+//   cmd, host
 //
-$uldl_running = file_exists($uldl_pid);
-if ($uldl_running == 0) $uldl_running = -1;
-show_status($uldl_host, tra("upload/download server"), $uldl_running);
-
-$sched_running = !file_exists("../../stop_sched");
-show_status($sched_host, tra("scheduler"), $sched_running);
-
-// parse through config.xml to get all daemons running
-//
-$cursor = 0;
-while ($thisxml = trim(parse_next_element($config_xml,"<daemon>",$cursor))) {
-    $host = parse_element($thisxml,"<host>");
-    if ($host == "") {
-        $host = $project_host;
+function get_daemon_status() {
+    $c = simplexml_load_file("../../config.xml");
+    if (!$c) {
+        die("can't parse config file\n");
     }
-    $cmd = parse_element($thisxml,"<cmd>");
-    list($cmd) = explode(" ", $cmd);
-    $log = parse_element($thisxml,"<output>");
-    if (!$log) {
-        $log = $cmd . ".log";
+    $daemons = $c->daemons;
+    $config = $c->config;
+    $main_host = trim((string)$config->host);
+    $master_url = trim((string)$config->master_url);
+    $u = parse_url($master_url);
+    if (!array_key_exists("host", $u)) {
+        print_r($u);
+        die("can't parse URL $master_url");
     }
-    list($log) = explode(".log", $log);
-    $pid = parse_element($thisxml,"<pid_file>");
-    if (!$pid) {
-        $pid = $cmd . ".pid";
+    $master_host = $u["host"];
+    if ($config->www_host) {
+        $web_host = trim((string) $config->www_host);
+    } else {
+        $web_host = $main_host;
     }
-    $disabled = parse_element($thisxml,"<disabled>");
-
-    // surrogate for command
-    list($c) = explode(".", $log);
-    show_daemon_status($host, $pid, $c, $disabled);
-}
-
-$xmlstring = "  </daemon_status>\n  <database_file_states>\n";
-if ($xml) {
-    echo $xmlstring;
-} else {
-    echo "
-        <tr><td align=right><b>".tra("Running:")."</b></td>
-        <td colspan=2>".tra("Program is operating normally")."</td></tr>
-        <tr><td align=right><b>".tra("Not Running:")."</b></td>
-        <td colspan=2>".tra("Program failed or the project is down")."</td></tr>
-        <tr><td align=right><b>".tra("Disabled:")."</b></td>
-        <td colspan=2>".tra("Program is disabled")."</td></tr>
-        </table>
-        </td>
-        <td valign=top>
-        <h2>".tra("Computing status")."</h2>
-    ";
-}
+    $have_remote = false;
+    $local_daemons = array();
+    $disabled_daemons = array();
 
-$retval = db_init_aux();
-if ($retval) {
-    echo tra("The database server is not accessible");
-} else {
-    if (!$xml) {
-        echo "<table border=0 cellpadding=0 cellspacing=0><tr><td>
-            <table border=0 cellpadding=4>
-            <tr><th>".tra("Work")."</th><th>#</th></tr>
-        ";
+    // the upload and download servers are sort of daemons too
+    //
+    $url = trim((string) $config->download_url);
+    $u = parse_url($url);
+    $h = $u["host"];
+    if ($h == $master_host) {
+        $y = new StdClass;
+        $y->cmd = "Download server";
+        $y->host = $h;
+        $y->status = 1;
+        $local_daemons[] = $y;
+    } else {
+        $have_remote = true;
+    }
+    $url = trim((string) $config->upload_url);
+    $u = parse_url($url);
+    $h = $u["host"];
+    if ($h == $master_host) {
+        $y = new StdClass;
+        $y->cmd = "Upload server";
+        $y->host = $h;
+        $y->status = 1;
+        $local_daemons[] = $y;
+    } else {
+        $have_remote = true;
     }
 
-    // If you are reading these values from a file rather than
-    // making live queries to the database, do something like this:
-    //
-    // $sendfile = "/home/boincadm/server_status_data/count_results_unsent.out";
-    // $n = `/bin/tail -1 $sendfile`;
-    // show_counts("Tasks ready to send","results_ready_to_send",$n);
+    foreach ($daemons->daemon as $d) {
+        if ((int)$d->disabled != 0) {
+            $x = new StdClass;
+            $x->cmd = (string)$d->cmd;
+            $x->host = (string)$d->host;
+            if (!$x->host) $x->host = $main_host;
+            $x->status = -1;
+            $disabled_daemons[] = $x;
+            continue;
+        }
+        $host = $d->host?(string)$d->host:$main_host;
+        if ($host != $web_host) {
+            $have_remote = true;
+            continue;
+        }
+        $x = new StdClass;
+        $x->cmd = (string)$d->cmd;
+        $x->status = local_daemon_running($x->cmd);
+        $x->host = $web_host;
+        $local_daemons[] = $x;
 
-    show_counts(
-        tra("Tasks ready to send"),
-        "results_ready_to_send",
-        get_mysql_count("result", "server_state = 2")
-    );
-    show_counts(
-        tra("Tasks in progress"),
-        "results_in_progress",
-        get_mysql_count("result", "server_state = 4")
-    );
-    show_counts(
-        tra("Workunits waiting for validation"),
-        "workunits_waiting_for_validation",
-        get_mysql_count("workunit", "need_validate=1")
-    );
-    show_counts(
-        tra("Workunits waiting for assimilation"),
-        "workunits_waiting_for_assimilation",
-        get_mysql_count("workunit", "assimilate_state=1")
-    );
-    show_counts(
-        tra("Workunits waiting for file deletion"),
-        "workunits_waiting_for_deletion",
-        get_mysql_count("workunit", "file_delete_state=1")
-    );
-    show_counts(
-        tra("Tasks waiting for file deletion"),
-        "results_waiting_for_deletion",
-        get_mysql_count("result", "file_delete_state=1")
-    );
+    }
 
-    $gap = unserialize(get_cached_data(3600, "transitioner_backlog"));
-    if ($gap === false) {
-        $min = BoincDB::get()->lookup_fields("workunit", "stdClass", "MIN(transition_time) as min", "TRUE");
-        //$gap = BoincDB::get()->min("workunit", "transition_time"); $gap = time()-$gap/3600;
-        $gap = (time() - $min->min)/3600;
-        if (($gap < 0) || ($min->min == 0)) {
-            $gap = 0;
+    $x = new StdClass;
+    $x->local_daemons = $local_daemons;
+    $x->disabled_daemons = $disabled_daemons;
+    $x->missing_remote_status = false;
+    $x->cached_time = 0;
+    $x->remote_daemons = array();
+    if ($have_remote) {
+        $f = @file_get_contents("../cache/remote_server_status");
+        if ($f) {
+            $x->remote_daemons = unserialize($f);
+            $x->cached_time = filemtime("../cache/remote_server_status");
+        } else {
+            $x->missing_remote_status = true;
         }
-        set_cached_data(3600, serialize($gap), "transitioner_backlog");
-    }
-    show_counts(
-        tra("Transitioner backlog (hours)"),
-        "transitioner_backlog_hours",
-        $gap
-    );
-    if (!$xml) {
-        echo "</table></td><td>";
-        echo "<table>";
-        echo "<tr><th>".tra("Users")."</th><th>#</th></tr>";
     }
-    show_counts(
-        tra("with recent credit"),
-        "users_with_recent_credit",
-        get_mysql_count("user", "expavg_credit>1")
-    );
-    show_counts(
-        tra("with credit"),
-        "users_with_credit",
-        get_mysql_count("user", "total_credit>0")
-    );
-    show_counts(
-        tra("registered in past 24 hours"),
-        "users_registered_in_past_24_hours",
-        get_mysql_count("user", "create_time > (unix_timestamp() - (24*3600))")
-    );
-    if (!$xml) {
-        echo "<tr><th>".tra("Computers")."</th><th>#</th></tr>";
+    return $x;
+}
+
+function get_job_status() {
+    $s = unserialize(get_cached_data(STATUS_PAGE_TTL, "job_status"));
+    if ($s) {
+        return $s;
     }
-    show_counts(
-        tra("with recent credit"),
-        "hosts_with_recent_credit",
-        get_mysql_count("host", "expavg_credit>1")
-    );
-    show_counts(
-        tra("with credit"),
-        "hosts_with_credit",
-        get_mysql_count("host", "total_credit>0")
-    );
-    show_counts(
-        tra("registered in past 24 hours"),
-        "hosts_registered_in_past_24_hours",
-        get_mysql_count("host", "create_time > (unix_timestamp() - (24*3600))")
-    );
-    // 200 cobblestones = 1 GigaFLOPS
-    show_counts(
-        tra("current GigaFLOPs"),
-        "current_floating_point_speed",
-        get_mysql_sum("user", "expavg_credit/200")
-    );
-    if (!$xml) {
-        end_table();
-        echo "</td></tr></table>";
 
-        start_table();
-        echo "<tr><th colspan=5>".tra("Tasks by application")."</th></tr>";
-        row_heading_array(
-            array(
-                tra("application"),
-                tra("unsent"),
-                tra("in progress"),
-                tra("avg runtime of last 100 results in h (min-max)"),
-                tra("users in last 24h")
-            )
+    $s = new StdClass;
+    $apps = BoincApp::enum("deprecated=0");
+    foreach ($apps as $app) {
+        $info = BoincDB::get()->lookup_fields("result", "stdClass",
+            "ceil(avg(elapsed_time)/3600*100)/100 as avg,
+            ceil(min(elapsed_time)/3600*100)/100 as min,
+            ceil(max(elapsed_time)/3600*100)/100 as max,
+            count(distinct userid) as users",
+            "appid = $app->id
+            AND validate_state=1
+            AND received_time > (unix_timestamp()-86400)
+            "
         );
+        $app->info = $info;
+        $app->unsent = BoincResult::count("appid=$app->id and server_state=2");
+        $app->in_progress = BoincResult::count("appid=$app->id and server_state=4");
     }
-    $apps = get_cached_apps();
-    if ($xml) {
-        echo "    <tasks_by_app>\n";
-    }
-    foreach($apps as $app) {
-        $info = get_runtime_info($app->id);
-        if ($xml) {
-             echo "      <app>\n";
-             echo "        <id>".$app->id."</id>\n";
-             echo "        <name>".$app->name."</name>\n";
-             echo "        <unsent>".get_mysql_count("result", "server_state = 2 and appid = ".$app->id)."</unsent>\n";
-             echo "        <in_progress>".get_mysql_count("result", "server_state = 4 and appid = ".$app->id)."</in_progress>\n";
-             echo "        <avg_runtime>".round($info->avg, 2)."</avg_runtime>\n";
-             echo "        <min_runtime>".round($info->min, 2)."</min_runtime>\n";
-             echo "        <max_runtime>".round($info->max, 2)."</max_runtime>\n";
-             echo "        <users_24h>".$info->users."</users_24h>\n";
-             echo "      </app>\n";
-        } else {
-            echo "<tr><td>".$app->user_friendly_name."</td>
-                <td>" . number_format(get_mysql_count("result", "server_state = 2 and appid = ".$app->id)) . "</td>
-                <td>" . number_format(get_mysql_count("result", "server_state = 4 and appid = ".$app->id)) . "</td>
-                <td>"
-            ;
-            echo number_format($info->avg,2) . " (" . number_format($info->min,2) . " - " . number_format($info->max,2) . ")";
-            echo "</td>
-                <td>" . number_format($info->users) . "</td>
-                </tr>"
-            ;
-        }
+    $s->apps = $apps;
+    $s->results_ready_to_send = BoincResult::count("server_state=2");
+    $s->results_in_progress = BoincResult::count("server_state=4");
+    $s->results_need_file_delete = BoincResult::count("file_delete_state=1");
+    $s->wus_need_validate = BoincWorkunit::count("need_validate=1");
+    $s->wus_need_assimilate = BoincWorkunit::count("assimilate_state=1");
+    $s->wus_need_file_delete = BoincWorkunit::count("file_delete_state=1");
+    $x = BoincDB::get()->lookup_fields("workunit", "stdClass", "MIN(transition_time) as min", "TRUE");
+    $gap = (time() - $x->min)/3600;
+    if (($gap < 0) || ($x->min == 0)) {
+        $gap = 0;
     }
-    if ($xml) {
-        echo "    </tasks_by_app>\n";
-    } else {
-        end_table();
+    $s->transitioner_backlog = $gap;
+    $s->users_with_recent_credit = BoincUser::count("expavg_credit>1");
+    $s->users_with_credit = BoincUser::count("total_credit>1");
+    $s->users_past_24_hours = BoincUser::count("create_time > (unix_timestamp() - 86400)");
+    $s->hosts_with_recent_credit = BoincHost::count("expavg_credit>1");
+    $s->hosts_with_credit = BoincHost::count("total_credit>1");
+    $s->hosts_past_24_hours = BoincHost::count("create_time > (unix_timestamp() - 86400)");
+    $s->flops = BoincUser::sum("expavg_credit")/200;
+
+    $s->db_revision = null;
+    if (file_exists("../../db_revision")) {
+        $s->db_revision = trim(file_get_contents("../../db_revision"));
     }
+
+    $s->cached_time = time();
+    $e = set_cached_data(STATUS_PAGE_TTL, serialize($s), "job_status");
+    if ($e) echo "set_cached_data(): $e\n";
+    return $s;
 }
 
-$xmlstring = "  </database_file_states>\n</server_status>\n";
-if ($xml) {
-    echo $xmlstring;
-} else {
-    echo "
-        </td>
-        </tr>
-        </table>
-    ";
-    page_tail();
+function main() {
+    $x = new StdClass;
+    $x->daemons = get_daemon_status();
+    $x->jobs = get_job_status();
+    if (get_int('xml', true)) {
+        show_status_xml($x);
+    } else {
+        show_status_html($x);
+    }
 }
 
+main();
 ?>
diff --git a/html/user/show_coproc.php b/html/user/show_coproc.php
index 883c9c3..0179495 100644
--- a/html/user/show_coproc.php
+++ b/html/user/show_coproc.php
@@ -49,7 +49,7 @@ function header_row($mode) {
     echo "<tr><th>";
     switch ($mode) {
     case 'host':
-        echo "Computer ID<br><span class=note>click for details</span>";
+        echo "Computer ID<br><p class=\"text-muted\">click for details</p>";
         break;
     case 'user':
         echo "User";
diff --git a/html/user/show_user.php b/html/user/show_user.php
index d51c6f2..2d18762 100644
--- a/html/user/show_user.php
+++ b/html/user/show_user.php
@@ -96,7 +96,7 @@ if ($format=="xml"){
     show_other_projects($user, false);
     echo "</td><td valign=top>";
     start_table();
-    show_badges(true, $user);
+    show_badges_row(true, $user);
     if (!DISABLE_PROFILES) {
         show_profile_link($user);
     }
diff --git a/html/user/stats.php b/html/user/stats.php
index 5177966..62fbd2f 100644
--- a/html/user/stats.php
+++ b/html/user/stats.php
@@ -22,20 +22,29 @@ page_head(tra('Statistics and leaderboards'));
 
 check_get_args(array());
 
+$credit_by_app = parse_bool(get_config(), "credit_by_app");
+
 start_table();
 echo "
     <tr><td>"
     . tra("Statistics for %1",PROJECT).":
     <ul>
     <li><a href=\"top_users.php\">" . tra("Top participants")."</a>
-    <li><a href=\"top_hosts.php\">" . tra("Top computers")."</a>
 ";
+if ($credit_by_app) {
+    echo "<ul><li><a href=per_app_list.php>Per application</a></ul>\n";
+}
+
 if (!DISABLE_TEAMS) {
     echo "
         <li><a href=\"top_teams.php\">" . tra("Top teams"). "</a>
     ";
+    if ($credit_by_app) {
+        echo "<ul><li><a href=per_app_list.php?is_team=1>Per application</a></ul>\n";
+    }
 }
 echo "
+<li><a href=\"top_hosts.php\">" . tra("Top computers")."</a>
 <li><a href=\"gpu_list.php\">" . tra("GPU models"). "</a>
 <li><a href=\"cpu_list.php\">" . tra("CPU models"). "</a>
 </ul>
diff --git a/html/user/style2.css b/html/user/style2.css
index 78816ff..abacd04 100644
--- a/html/user/style2.css
+++ b/html/user/style2.css
@@ -85,17 +85,11 @@ td.indent {
     border-left: 4px solid white;
 }
 
-td.heading {
+th, td.heading {
     background-color: #D8D8D8;
     font-weight: bold;
 }
 
-td.heading2 {
-    font-weight: bold;
-    background-color: #eeeeee;
-    border: 1px solid grey;
-}
-
 td.fieldname {
     background-color: #eeeeee;
     text-align: right;
@@ -181,7 +175,7 @@ tr.message {
     font-weight: bold;
 }
 
-.description {
+.text-info, .description {
     font-size: 80%;
     font-weight: normal;
 }
@@ -291,7 +285,7 @@ span.page_title {
     margin: 20px;
 }
 
-span.note{
+p.text-muted, span.note{
     font-weight: normal;
     font-size: 0.9em;
 }
@@ -337,11 +331,11 @@ td.uotd {
     border: 1px solid grey;
 }
 
-.smalltext {
+small {
     font-size: 0.8em;
 }
 
-.error {
+p.text-danger, .error {
     color: #ff0000;
     font-weight: bold;
     font-size: 1.1em;
diff --git a/html/user/submit.php b/html/user/submit.php
index 7db0b37..bc962ce 100644
--- a/html/user/submit.php
+++ b/html/user/submit.php
@@ -74,7 +74,7 @@ function show_in_progress($batches, $limit, $user, $app) {
                 "# jobs",
                 "Progress",
                 "Submitted",
-                "Logical end time<br><span class=note>Determines priority</span>"
+                "Logical end time<br><p class=\"text-muted\">Determines priority</p>"
             );
         }
         $pct_done = (int)($batch->fraction_done*100);
@@ -352,9 +352,9 @@ function handle_query_batch($user) {
     echo "<h2>Jobs</h2>\n";
     start_table();
     table_header(
-        "Job ID and name<br><span class=note>click for details or to get output files</span>",
+        "Job ID and name<br><p class=\"text-muted\">click for details or to get output files</p>",
         "status",
-        "Canonical instance<br><span class=note>click to see result page on BOINC server</span>",
+        "Canonical instance<br><p class=\"text-muted\">click to see result page on BOINC server</p>",
         "Download Results"
     );
     foreach($wus as $wu) {
@@ -406,7 +406,7 @@ function handle_query_job($user) {
     $x = "<in>".$wu->xml_doc."</in>";
     $x = simplexml_load_string($x);
     start_table();
-    table_header("Logical name<br><span class=note>(click to view)</span>",
+    table_header("Logical name<br><p class=\"text-muted\">(click to view)</p>",
         "Size (bytes)", "MD5"
     );
     foreach ($x->workunit->file_ref as $fr) {
@@ -428,8 +428,8 @@ function handle_query_job($user) {
     echo "<h2>Instances</h2>\n";
     start_table();
     table_header(
-        "Instance ID<br><span class=note>click for result page</span>",
-        "State", "Output files<br><span class=note>click to view the file</span>"
+        "Instance ID<br><p class=\"text-muted\">click for result page</p>",
+        "State", "Output files<br><p class=\"text-muted\">click to view the file</p>"
     );
     $results = BoincResult::enum("workunitid=$wuid");
     $upload_dir = parse_config(get_config(), "<upload_dir>");
diff --git a/html/user/submit_example.php b/html/user/submit_example.php
index 15d7947..40f51f5 100644
--- a/html/user/submit_example.php
+++ b/html/user/submit_example.php
@@ -216,10 +216,10 @@ function handle_create_form() {
     row2("Parameter high value (0..60)", "<input name=param_hi value=20>");
     row2("Parameter increment (>= 1)", "<input name=param_inc value=1>");
     row2("",
-        "<input type=submit name=get_estimate value=\"Get completion time estimate\">"
+        "<input class=\"btn btn-default\" type=submit name=get_estimate value=\"Get completion time estimate\">"
     );
     row2("",
-        "<input type=submit name=submit value=Submit>"
+        "<input class=\"btn btn-primary\" type=submit name=submit value=Submit>"
     );
     end_table();
     echo "</form>\n";
@@ -339,9 +339,9 @@ function handle_query_batch() {
     echo "<h2>Jobs</h2>\n";
     start_table();
     table_header(
-        "Job ID<br><span class=note>click for details or to get output files</span>",
+        "Job ID<br><p class=\"text-muted\">click for details or to get output files</p>",
         "status",
-        "Canonical instance<br><span class=note>click to see result page on BOINC server</span>"
+        "Canonical instance<br><p class=\"text-muted\">click to see result page on BOINC server</p>"
     );
     foreach($batch->jobs as $job) {
         $id = (int)$job->id;
@@ -383,7 +383,7 @@ function handle_query_job() {
     echo "<h2>Instances</h2>\n";
     start_table();
     table_header(
-        "Instance ID<br><span class=note>click for result page on BOINC server</span>",
+        "Instance ID<br><p class=\"text-muted\">click for result page on BOINC server</p>",
         "State", "Output files"
     );
     foreach($reply->instances as $inst) {
diff --git a/html/user/submit_rpc_handler.php b/html/user/submit_rpc_handler.php
index 042f2ce..302a1d3 100644
--- a/html/user/submit_rpc_handler.php
+++ b/html/user/submit_rpc_handler.php
@@ -77,8 +77,12 @@ function est_elapsed_time($r, $template) {
     return batch_flop_count($r, $template) / project_flops();
 }
 
-function read_input_template($app) {
-    $path = "../../templates/$app->name"."_in";
+function read_input_template($app, $r) {
+    if ((isset($r->batch)) && (isset($r->batch->workunit_template_file)) && ($r->batch->workunit_template_file)) {
+        $path = "../../templates/".$r->batch->workunit_template_file;
+    } else {
+        $path = "../../templates/$app->name"."_in";
+    }
     return simplexml_load_file($path);
 }
 
@@ -97,7 +101,7 @@ function estimate_batch($r) {
     $app = get_app((string)($r->batch->app_name));
     list($user, $user_submit) = authenticate_user($r, $app);
 
-    $template = read_input_template($app);
+    $template = read_input_template($app, $r);
     $e = est_elapsed_time($r, $template);
     echo "<estimate>\n<seconds>$e</seconds>\n</estimate>\n";
 }
@@ -169,7 +173,10 @@ function stage_files(&$jobs, $template) {
     }
 }
 
-function submit_jobs($jobs, $template, $app, $batch_id, $priority) {
+function submit_jobs(
+    $jobs, $template, $app, $batch_id, $priority,
+    $result_template_file = null, $workunit_template_file = null
+) {
     $x = "";
     foreach($jobs as $job) {
         if ($job->name) {
@@ -195,7 +202,14 @@ function submit_jobs($jobs, $template, $app, $batch_id, $priority) {
         $x .= "\n";
     }
 
-    $cmd = "cd ../..; ./bin/create_work --appname $app->name --batch $batch_id --rsc_fpops_est $job->rsc_fpops_est --priority $priority --stdin";
+    $cmd = "cd ../..; ./bin/create_work --appname $app->name --batch $batch_id --rsc_fpops_est $job->rsc_fpops_est --priority $priority";
+    if ($result_template_file) {
+        $cmd .= " --result_template templates/$result_template_file";
+    }
+    if ($workunit_template_file) {
+        $cmd .= " --wu_template templates/$workunit_template_file";
+    }
+    $cmd .= " --stdin";
     $h = popen($cmd, "w");
     if ($h === false) {
         xml_error(-1, "BOINC server: can't run create_work");
@@ -238,7 +252,7 @@ function xml_get_jobs($r) {
 function submit_batch($r) {
     $app = get_app((string)($r->batch->app_name));
     list($user, $user_submit) = authenticate_user($r, $app);
-    $template = read_input_template($app);
+    $template = read_input_template($app, $r);
     $jobs = xml_get_jobs($r);
     validate_batch($jobs, $template);
     stage_files($jobs, $template);
@@ -288,6 +302,7 @@ function submit_batch($r) {
         if (!$ret) xml_error(-1, "BOINC server: batch->update() failed");
     } else {
         $batch_name = (string)($r->batch->batch_name);
+        $batch_name = BoincDb::escape_string($batch_name);
         $batch_id = BoincBatch::insert(
             "(user_id, create_time, njobs, name, app_id, logical_end_time, state) values ($user->id, $now, $njobs, '$batch_name', $app->id, $let, ".BATCH_STATE_INIT.")"
         );
@@ -296,8 +311,23 @@ function submit_batch($r) {
         }
         $batch = BoincBatch::lookup_id($batch_id);
     }
+    
+    if ($r->batch->result_template_file) {
+        $result_template_file = $r->batch->result_template_file;
+    } else {
+        $result_template_file = null;
+    }
+    
+    if ($r->batch->workunit_template_file) {
+        $workunit_template_file = $r->batch->workunit_template_file;
+    } else {
+        $workunit_template_file = null;
+    }
 
-    submit_jobs($jobs, $template, $app, $batch_id, $let);
+    submit_jobs(
+        $jobs, $template, $app, $batch_id, $let,
+        $result_template_file, $workunit_template_file
+    );
 
     // set state to IN_PROGRESS only after creating jobs;
     // otherwise we might flag batch as COMPLETED
@@ -313,6 +343,7 @@ function create_batch($r) {
     list($user, $user_submit) = authenticate_user($r, $app);
     $now = time();
     $batch_name = (string)($r->batch->batch_name);
+    $batch_name = BoincDb::escape_string($batch_name);
     $expire_time = (double)($r->expire_time);
     $batch_id = BoincBatch::insert(
         "(user_id, create_time, name, app_id, state, expire_time) values ($user->id, $now, '$batch_name', $app->id, ".BATCH_STATE_INIT.", $expire_time)"
diff --git a/html/user/team_admins.php b/html/user/team_admins.php
index fbc2d6a..d63c8c6 100644
--- a/html/user/team_admins.php
+++ b/html/user/team_admins.php
@@ -29,7 +29,7 @@ function show_admin($user, $admin) {
     $tokens = url_tokens($user->authenticator);
     $date = date_str($admin->create_time);
     echo "<tr>
-        <td>".user_links($admin_user)."</td>
+        <td>".user_links($admin_user, BADGE_HEIGHT_MEDIUM)."</td>
         <td>$date</td>
         <td>
     ";
@@ -78,7 +78,7 @@ function show_admins($user, $teamid) {
     start_table();
     row1(tra("Add Team Admin"));
     row2(tra("Email address of team member:"), "<input name=email_addr>");
-    row2("", "<input type=submit action value=\"".tra("Add")."\">");
+    row2("", "<input class=\"btn btn-default\" type=submit action value=\"".tra("Add")."\">");
     end_table();
     echo "</form>";
 
diff --git a/html/user/team_change_founder_form.php b/html/user/team_change_founder_form.php
index 2e37433..470799f 100644
--- a/html/user/team_change_founder_form.php
+++ b/html/user/team_change_founder_form.php
@@ -54,7 +54,7 @@ if ($team->ping_user != 0) {
             <form method=\"post\" action=\"team_founder_transfer_action.php\">
             <input type=\"hidden\" name=\"action\" value=\"decline\">
             <input type=\"hidden\" name=\"teamid\" value=\"".$team->id."\">
-            <input type=\"submit\" value=\"".tra("decline request")."\">
+            <input class=\"btn btn-default\" type=\"submit\" value=\"".tra("decline request")."\">
             </form>
             <p>
             ".tra("If you don't decline the request by %1, %2 will have the option of assuming team foundership.<br /><br />
@@ -104,7 +104,7 @@ foreach ($users as $user) {
 if ($navailable_users > 0) {
     echo "<input type=hidden name=navailable_users value=$navailable_users>";
     end_table();
-    echo "<input type=submit value=\"".tra("Change founder")."\">";
+    echo "<input class=\"btn btn-default\" type=submit value=\"".tra("Change founder")."\">";
 } else {
     echo "<tr>
         <td colspan='4'>".tra("There are no users to transfer team to.")."</td>
diff --git a/html/user/team_create_action.php b/html/user/team_create_action.php
index b2e8e5a..266fe8c 100644
--- a/html/user/team_create_action.php
+++ b/html/user/team_create_action.php
@@ -31,7 +31,7 @@ if (strlen($name) == 0) {
     error_page(tra("You must choose a non-blank team name"));
 }
 
-$new_team = lookup_team_name($name);
+$new_team = BoincTeam::lookup_name($name);
 if ($new_team) {
     error_page(tra("A team named %1 already exists - try another name", htmlentities($name)));
 }
diff --git a/html/user/team_delta.php b/html/user/team_delta.php
index 9d28836..551901b 100644
--- a/html/user/team_delta.php
+++ b/html/user/team_delta.php
@@ -43,7 +43,7 @@ function show_delta($delta) {
     } else {
         echo "<tr>
            <td>$when</td>
-           <td>",user_links($user)," (ID $user->id)</td>
+           <td>",user_links($user, BADGE_HEIGHT_MEDIUM)," (ID $user->id)</td>
            <td>$what</td>
            <td>$delta->total_credit</td>
            </tr>
diff --git a/html/user/team_email_list.php b/html/user/team_email_list.php
index ef5be1e..5963cf4 100644
--- a/html/user/team_email_list.php
+++ b/html/user/team_email_list.php
@@ -79,7 +79,7 @@ foreach($users as $user) {
         echo "$user->name $e\n";
     } else {
         $e = $user->send_email?"$user->email_addr":"";
-        table_row(user_links($user), $e, format_credit($user->total_credit), format_credit($user->expavg_credit), $user->country);
+        table_row(user_links($user, BADGE_HEIGHT_MEDIUM), $e, format_credit($user->total_credit), format_credit($user->expavg_credit), $user->country);
     }
 } 
 if (!$plain) {
diff --git a/html/user/team_forum.php b/html/user/team_forum.php
index ccea250..88e97ab 100644
--- a/html/user/team_forum.php
+++ b/html/user/team_forum.php
@@ -79,7 +79,7 @@ function edit_form($user, $team, $forum, $first) {
     row2(tra("Minimum average credit to post"),
         "<input name=post_min_expavg_credit value=$forum->post_min_expavg_credit>"
     );
-    row2("", "<input type=submit value=".tra("Submit").">");
+    row2("", "<input class=\"btn btn-default\" type=submit value=".tra("Submit").">");
     end_table();
     echo "
         </form>
diff --git a/html/user/team_founder_transfer_action.php b/html/user/team_founder_transfer_action.php
index 4f80c86..d8e2017 100644
--- a/html/user/team_founder_transfer_action.php
+++ b/html/user/team_founder_transfer_action.php
@@ -117,7 +117,7 @@ case "finalize_transfer":
     break;
 case "decline":
     $teamid = post_int("teamid");
-    $team = lookup_team($teamid);
+    $team = BoincTeam::lookup_id($teamid);
     require_founder_login($user, $team);
     page_head(tra("Decline founder change request"));
     
diff --git a/html/user/team_founder_transfer_form.php b/html/user/team_founder_transfer_form.php
index 2450625..5e1d40f 100644
--- a/html/user/team_founder_transfer_form.php
+++ b/html/user/team_founder_transfer_form.php
@@ -49,7 +49,7 @@ if ($user->id == $team->ping_user) {
         echo tra("60 days have elapsed since your request, and the founder has not responded. You may now assume foundership by clicking here:")
             ."<form method=\"post\" action=\"team_founder_transfer_action.php\">
             <input type=\"hidden\" name=\"action\" value=\"finalize_transfer\">
-            <input type=\"submit\" value=\"".tra("Assume foundership")."\">
+            <input class=\"btn btn-default\" type=\"submit\" value=\"".tra("Assume foundership")."\">
             </form>
         ";
     } else {
@@ -64,7 +64,7 @@ if ($user->id == $team->ping_user) {
         ."</p>";
 
         echo "<input type=\"hidden\" name=\"action\" value=\"initiate_transfer\">
-            <input type=\"submit\" value=\"".tra("Request foundership")."\">
+            <input class=\"btn btn-default\" type=\"submit\" value=\"".tra("Request foundership")."\">
             </form>
         ";
     } else {
diff --git a/html/user/team_join_form.php b/html/user/team_join_form.php
index 23312ec..749a22b 100644
--- a/html/user/team_join_form.php
+++ b/html/user/team_join_form.php
@@ -26,7 +26,7 @@ check_get_args(array("id"));
 $user = get_logged_in_user();
 $teamid = get_int("id");
 
-$team = lookup_team($teamid);
+$team = BoincTeam::lookup_id($teamid);
 if (!$team->joinable) {
     error_page(tra("The team %1 is not joinable.", $team->name));
 }
@@ -42,7 +42,7 @@ echo " <p><b>".tra("Please note:")."</b>
 echo form_tokens($user->authenticator);
 echo "
     <input type=\"hidden\" name=\"teamid\" value=\"$teamid\">
-    <input type=\"submit\" value=\"".tra("Join team")."\">
+    <input class=\"btn btn-default\" type=\"submit\" value=\"".tra("Join team")."\">
     </form>
 ";
 page_tail();
diff --git a/html/user/team_lookup.php b/html/user/team_lookup.php
index 34abc9e..718894b 100644
--- a/html/user/team_lookup.php
+++ b/html/user/team_lookup.php
@@ -36,7 +36,7 @@ if ($team_id || $team_ids || ($format == 'xml')) {
 }
 
 if ($team_id) {
-    $team = lookup_team($team_id);
+    $team = BoincTeam::lookup_id($team_id);
     if ($team) {
         show_team_xml($team);
     } else {
@@ -51,7 +51,7 @@ if ($team_ids) {
     $total = 0;
     foreach ($team_id_array as $team_id) {
         if (is_numeric($team_id)) { //make sure only numbers get through
-            $team = lookup_team($team_id);
+            $team = BoincTeam::lookup_id($team_id);
             if ($team) {
                 show_team_xml($team);
                 $total++;
diff --git a/html/user/team_manage.php b/html/user/team_manage.php
index c9b3763..fe50bc7 100644
--- a/html/user/team_manage.php
+++ b/html/user/team_manage.php
@@ -29,16 +29,16 @@ function show_admin_page($user, $team) {
     echo "
         <ul>
         <li><a href=team_edit_form.php?teamid=$team->id>".tra("Edit team info")."</a>
-            <br><span class=note>".tra("Change team name, URL, description, type, or country")."</span>
+            <br><p class=\"text-muted\">".tra("Change team name, URL, description, type, or country")."</p>
         <li>
             ".tra("Member list:")."
         <a href=team_email_list.php?teamid=$team->id>".tra("HTML")."</a>
         · <a href=team_email_list.php?teamid=$team->id&plain=1>".tra("text")."</a>
-            <br><span class=note>".tra("View member names and email addresses")."</span>
+            <br><p class=\"text-muted\">".tra("View member names and email addresses")."</p>
         <li>".tra("View change history:")."
             <a href=team_delta.php?teamid=$team->id>".tra("HTML")."</a>
             · <a href=team_delta.php?teamid=$team->id&xml=1>".tra("XML")."</a>
-            <br><span class=note>".tra("See when members joined or quit this team")."</span>
+            <br><p class=\"text-muted\">".tra("See when members joined or quit this team")."</p>
     ";
 
     // founder-only stuff follows
@@ -54,16 +54,16 @@ function show_admin_page($user, $team) {
         }
         echo "
             <li><a href=team_remove_inactive_form.php?teamid=$team->id>".tra("Remove members")."</a>
-                <br><span class=note>".tra("Remove inactive or unwanted members from this team")."</span>
+                <br><p class=\"text-muted\">".tra("Remove inactive or unwanted members from this team")."</p>
             <li><a href=team_change_founder_form.php?teamid=$team->id>".tra("Change founder")."</a>
-                <br><span class=note>".tra("Transfer foundership to another member")."</span>
+                <br><p class=\"text-muted\">".tra("Transfer foundership to another member")."</p>
             <li><a href=team_admins.php?teamid=$team->id>".tra("Add/remove Team Admins")."</a>
-                <br><span class=note>".tra("Give selected team members Team Admin privileges")."</span>
+                <br><p class=\"text-muted\">".tra("Give selected team members Team Admin privileges")."</p>
 
             <li><a href=team_manage.php?teamid=$team->id&action=delete&$tokens>".tra("Remove team")."</a>
-                <br><span class=note>".tra("Allowed only if team has no members")."</a>
+                <br><p class=\"text-muted\">".tra("Allowed only if team has no members")."</p>
             <li><a href=team_forum.php?teamid=$team->id&cmd=manage>".tra("Message board")."</a>
-                <br><span class=note>".tra("Create or manage a team message board")."</span>
+                <br><p class=\"text-muted\">".tra("Create or manage a team message board")."</p>
         ";
     }
     echo "
@@ -73,8 +73,6 @@ function show_admin_page($user, $team) {
             ".tra("To have this team created on all BOINC projects (current and future) you can make it into a %1BOINC-wide team%2.", "<a href=http://boinc.berkeley.edu/teams/>", "</a>")."
         <li>
             ".tra("Team admins are encouraged to join and participate in the Google %1boinc-team-founders%2 group.", "<a href=http://groups.google.com/group/boinc-team-founders>", "</a>")."
-        <li>
-            ".tra("Other resources for BOINC team admins are available from a third-party site, %1www.boincteams.com%2.", "<a href=http://www.boincteams.com>", "</a>")."
     </ul>
     ";
 
diff --git a/html/user/team_quit_action.php b/html/user/team_quit_action.php
index 67a2ea8..be83440 100644
--- a/html/user/team_quit_action.php
+++ b/html/user/team_quit_action.php
@@ -26,7 +26,7 @@ check_get_args(array("tnow", "ttok"));
 $user = get_logged_in_user(true);
 check_tokens($user->authenticator);
 $teamid = post_int("id");
-$team = lookup_team($teamid);
+$team = BoincTeam::lookup_id($teamid);
 if ($user->teamid == $team->id) {
     user_quit_team($user);
     Header("Location: home.php");
diff --git a/html/user/team_quit_form.php b/html/user/team_quit_form.php
index a8cec4a..201d04f 100644
--- a/html/user/team_quit_form.php
+++ b/html/user/team_quit_form.php
@@ -25,7 +25,7 @@ check_get_args(array());
 
 $user = get_logged_in_user(true);
 
-$team = lookup_team($user->teamid);
+$team = BoincTeam::lookup_id($user->teamid);
 if (!$team) {
     error_page(tra("No such team"));
 }
@@ -39,7 +39,7 @@ echo tra("<strong>Please note before quitting a team:</strong>
     ."<form method=\"post\" action=\"team_quit_action.php\">";
 echo form_tokens($user->authenticator);
 echo "<input type=\"hidden\" name=\"id\" value=\"$team->id\">
-    <input type=\"submit\" value=\"".tra("Quit Team")."\">
+    <input class=\"btn btn-default\" type=\"submit\" value=\"".tra("Quit Team")."\">
     </form>
 ";
 page_tail();
diff --git a/html/user/team_remove_inactive_form.php b/html/user/team_remove_inactive_form.php
index a590592..8cd2169 100644
--- a/html/user/team_remove_inactive_form.php
+++ b/html/user/team_remove_inactive_form.php
@@ -55,7 +55,7 @@ foreach($users as $user) {
     echo "
         <tr>
         <td align=center><input type=checkbox name=remove_$ninactive_users value=$user->id>
-        <td>".user_links($user)." ($user->id)</td>
+        <td>".user_links($user, BADGE_HEIGHT_MEDIUM)." ($user->id)</td>
         <td>$user_total_credit</td>
         <td>$user_expavg_credit</td>
         </tr>
@@ -67,7 +67,7 @@ if ($ninactive_users == 0) {
     echo "<p>".tra("No members are eligible for removal.")."</p>";
 } else {
     echo "<input type=hidden name=ninactive_users value=$ninactive_users>";
-    echo "<input type=submit value=\"".tra("Remove users")."\">";
+    echo "<input class=\"btn btn-warning\" type=submit value=\"".tra("Remove users")."\">";
 }
 echo "</form>";
 page_tail();
diff --git a/html/user/team_search.php b/html/user/team_search.php
index 6a2cecf..86097e2 100644
--- a/html/user/team_search.php
+++ b/html/user/team_search.php
@@ -53,14 +53,20 @@ function compare($t1, $t2) {
 // Sort list by decreasing refcnt
 //
 function sort_list(&$list) {
-    foreach ($list as $a=>$b) $b->rnd = rand();
+    foreach ($list as $a=>$b) {
+        $b->rnd = rand();
+    }
     usort($list, 'compare');
 }
 
 function get_teams($clause, $active) {
     $c2 = '';
     if ($active) $c2 = "and expavg_credit>0.1";
-    return BoincTeam::enum("$clause $c2 order by expavg_credit desc limit 20");
+    $x = BoincTeam::enum("$clause $c2 order by expavg_credit desc limit 20");
+    foreach ($x as $t) {
+        $t->refcnt = 0;
+    }
+    return $x;
 }
 
 function show_list($list) {
@@ -93,7 +99,7 @@ function show_list($list) {
             echo "</td>\n";
         }
         echo "
-            <td><span class=note>".sanitize_html($team->description)."</span></td>
+            <td><p class=\"text-muted\">".sanitize_html($team->description)."</p></td>
             <td>".format_credit($team->expavg_credit)."</td>
             <td>$type</td>
             <td>$team->country</td>
diff --git a/html/user/top_users.php b/html/user/top_users.php
index 8a522c8..1383aaa 100644
--- a/html/user/top_users.php
+++ b/html/user/top_users.php
@@ -67,10 +67,11 @@ function user_table_start($sort_by) {
 }
 
 function show_user_row($user, $i) {
+    $j = $i % 2;
     echo "
-        <tr class=row1>
+        <tr class=row$j>
         <td>$i</td>
-        <td>", user_links($user), "</td>
+        <td>", user_links($user, BADGE_HEIGHT_MEDIUM), "</td>
         <td align=right>", format_credit_large($user->expavg_credit), "</td>
         <td align=right>", format_credit_large($user->total_credit), "</td>
         <td>", $user->country, "</td>
@@ -94,7 +95,7 @@ if ($offset % $users_per_page) $offset = 0;
 
 if ($offset < ITEM_LIMIT) {
     $cache_args = "sort_by=$sort_by&offset=$offset";
-    $cacheddata=get_cached_data(TOP_PAGES_TTL,$cache_args);
+    $cacheddata = get_cached_data(TOP_PAGES_TTL,$cache_args);
 
     // Do we have the data in cache?
     //
diff --git a/html/user/user_search.php b/html/user/user_search.php
index b64e8ab..3225ae9 100644
--- a/html/user/user_search.php
+++ b/html/user/user_search.php
@@ -23,7 +23,7 @@ require_once("../inc/user.inc");
 function show_user($user) {
     echo "
         <tr class=row1>
-        <td>", user_links($user), " (ID $user->id)</td>
+        <td>", user_links($user, BADGE_HEIGHT_MEDIUM), " (ID $user->id)</td>
     ";
     if ($user->teamid) {
         $team = BoincTeam::lookup_id($user->teamid);
@@ -67,7 +67,7 @@ function search_form() {
     row2(tra("Decreasing sign-up time"), "<input type=radio name=search_type value=\"date\" checked>");
     row2(tra("Decreasing average credit"), "<input type=radio name=search_type value=\"rac\">");
     row2(tra("Decreasing total credit"), "<input type=radio name=search_type value=\"total\">");
-    row2("", "<input type=submit name=action value=".tra("Search").">");
+    row2("", "<input class=\"btn btn-default\" type=submit name=action value=".tra("Search").">");
     end_table();
     echo "
         <script>document.f.search_string.focus()</script>
@@ -76,22 +76,6 @@ function search_form() {
     page_tail();
 }
 
-function compare_create_time($u1, $u2) {
-    if ($u1->create_time < $u2->create_time) return 1;
-    if ($u1->create_time > $u2->create_time) return -1;
-    return 0;
-}
-function compare_expavg_credit($u1, $u2) {
-    if ($u1->expavg_credit < $u2->expavg_credit) return 1;
-    if ($u1->expavg_credit > $u2->expavg_credit) return -1;
-    return 0;
-}
-function compare_total_credit($u1, $u2) {
-    if ($u1->total_credit < $u2->total_credit) return 1;
-    if ($u1->total_credit > $u2->total_credit) return -1;
-    return 0;
-}
-
 function search_action() {
     $where = "true";
     $search_string = get_str('search_string');
@@ -120,16 +104,17 @@ function search_action() {
     } else if ($t == 'no') {
         $where .= " and has_profile=0";
     }
-    $fields = "id, create_time, name, country, total_credit, expavg_credit, teamid, url, has_profile, donated";
-    $users = BoincUser::enum_fields($fields, $where, "order by id desc limit 100");
+
     $search_type = get_str('search_type', true);
-    if ($search_type == 'date') {
-        usort($users, 'compare_create_time');
-    } else if ($search_type == 'rac') {
-        usort($users, 'compare_expavg_credit');
-    } else {
-        usort($users, 'compare_total_credit');
+    $order_clause = "id desc";
+    if ($search_type == 'rac') {
+        $order_clause ="expavg_credit desc";
+    } else if ($search_type == 'total') {
+        $order_clause ="total_credit desc";
     }
+
+    $fields = "id, create_time, name, country, total_credit, expavg_credit, teamid, url, has_profile, donated";
+    $users = BoincUser::enum_fields($fields, $where, "order by $order_clause limit 100");
     page_head(tra("User search results"));
     $n=0;
     foreach ($users as $user) {
diff --git a/html/user/white.css b/html/user/white.css
index f8fdaa0..869b351 100644
--- a/html/user/white.css
+++ b/html/user/white.css
@@ -3,7 +3,7 @@ a, a:link, a:visited, a:active {
 }
 
 body {
-	#background: #fff url("img/gray_gradient.png") repeat-x;
+	//background: #fff url("img/gray_gradient.png") repeat-x;
 	color: black;
 }
 
@@ -21,7 +21,7 @@ hr.news_line {
     border-bottom: 1px solid rgb(200, 200, 200);
 }
 
-table.bordered {
+.table-bordered, .bordered {
 	border-color: #e8e8e8;
     border-width: 2px;
     border-style: solid;
@@ -40,13 +40,16 @@ td.indent {
 	border-color: #fff;
 }
 
-td.heading {
+th, td.heading {
 	background-color: #d8d8d8;
 }
 
+th.subheading {
+	background-color: #eee;
+}
+
 td.fieldname {
 	background-color: #eee;
-	color: #333;
 }
 
 td.fieldname_error,
@@ -89,8 +92,9 @@ tr.message {
 input[type="button"],
 input[type="submit"],
 .btn,
-a.button {
-	background: #EDEDED url(img/white_grad.png) repeat-x scroll left top;
+a.btn {
+#background: #d0f8d0;
+    background: #EDEDED url(img/white_grad.png) repeat-x scroll left top;
 	color: black;
 	border-color: #ccc;
 }
@@ -98,12 +102,20 @@ a.button {
 input[type="button"]:hover,
 input[type="submit"]:hover,
 input.btn:hover,
-.button:hover ,
+.btn:hover ,
 .forum_toplinks a:hover {
 	border: 1px solid #555;
 	color: #0069A1;
 }
 
+a.btn-green {
+	border: 1px solid #555;
+	color: black;
+    background: #a0f0a0;
+    font-size: 1.2em;
+	border-color: #60a060;
+}
+
 input[type="text"], input[type="password"], select, textarea {
 	border-color: #bbb;
 }
@@ -177,7 +189,7 @@ span.highlight {
 	border-left-color: #caa;
 }
 
-.error {
+p.text-danger, .error {
 	color: #f00;
 }
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index a153948..12f2e22 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -125,7 +125,6 @@ pkginclude_HEADERS = \
     average.h \
     base64.h \
     boinc_fcgi.h \
-    boinc_win.h \
     cal_boinc.h \
     cc_config.h \
     cert_sig.h \
@@ -152,11 +151,9 @@ pkginclude_HEADERS = \
     procinfo.h \
     proxy_info.h \
     stackwalker_imports.h \
-    stackwalker_win.h \
     str_util.h \
     url.h \
     util.h \
-    win_util.h \
     $(mac_headers) \
     $(win_headers)
 endif
@@ -171,19 +168,21 @@ noinst_HEADERS = \
     synch.h \
     unix_util.h
 
-lib_LTLIBRARIES = libboinc.la libboinc_crypt.la
+lib_LTLIBRARIES = libboinc.la
 libboinc_la_SOURCES = $(generic_sources) $(mac_sources) $(win_sources)
 libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
 libboinc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
 libboinc_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -static -version-number $(LIBBOINC_VERSION)
 libboinc_la_LIBADD =
 
+if ENABLE_BOINCCRYPT
+lib_LTLIBRARIES += libboinc_crypt.la
 libboinc_crypt_la_SOURCES = crypt.cpp
 libboinc_crypt_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CFLAGS)
 libboinc_crypt_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CXXFLAGS)
 libboinc_crypt_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -static -version-number $(LIBBOINC_VERSION)
 libboinc_crypt_la_LIBADD =
-
+endif
 
 if ENABLE_FCGI
 lib_LTLIBRARIES += libboinc_fcgi.la
@@ -209,7 +208,10 @@ endif
 
 
 if BUILD_STATIC_LIBS
-all_local = $(LIBBOINC_STATIC) $(LIBBOINC_CRTYPT_STATIC)
+all_local = $(LIBBOINC_STATIC) 
+if ENABLE_BOINCCRYPT
+all_local += $(LIBBOINC_CRYPT_STATIC) 
+endif
 if ENABLE_FCGI
 all_local += $(LIBBOINC_FCGI_STATIC) 
 endif
@@ -249,7 +251,7 @@ msg_test_SOURCES = msg_test.cpp
 msg_test_CXXFLAGS = $(PTHREAD_CFLAGS)
 msg_test_LDADD = $(LIBBOINC)
 crypt_prog_SOURCES = crypt_prog.cpp 
-crypt_prog_CXXFLAGS = $(PTHREAD_CFLAGS)
+crypt_prog_CXXFLAGS = $(PTHREAD_CFLAGS) $(SSL_CXXFLAGS)
 crypt_prog_LDADD = $(LIBBOINC_CRYPT_STATIC) $(LIBBOINC) $(SSL_LIBS) 
 parse_test_SOURCES = parse_test.cpp 
 parse_test_CXXFLAGS = $(PTHREAD_CFLAGS)
diff --git a/lib/app_ipc.cpp b/lib/app_ipc.cpp
index bea2839..4b452db 100644
--- a/lib/app_ipc.cpp
+++ b/lib/app_ipc.cpp
@@ -36,7 +36,7 @@
 
 #include "app_ipc.h"
 
-#if (!defined(HAVE_STRDUP) && defined(HAVE__STRDUP)) || defined(_MSC_VER)
+#if !defined(HAVE_STRDUP) && defined(HAVE__STRDUP)
 #define strdup _strdup
 #endif
 
diff --git a/lib/boinc_win.h b/lib/boinc_win.h
index ed01c17..da9f8e2 100644
--- a/lib/boinc_win.h
+++ b/lib/boinc_win.h
@@ -41,7 +41,6 @@
 #define HAVE_STD_TRANSFORM 1
 #endif 
 
-
 #ifndef HAVE_ALLOCA
 #define HAVE_ALLOCA 1
 #endif 
@@ -66,10 +65,26 @@
 #define HAVE_WINHTTP_H 1
 #define HAVE_WINTERNL_H 1
 #define HAVE_DELAYIMP_H 1
+#define HAVE_INTRIN_H 1
 #define HAVE_FCNTL_H 1
 #define HAVE_CRTDBG_H 1
 #define HAVE_DECL_FPRESET 1
 #define HAVE_DECL__FPRESET 1
+#define HAVE_DECL___CPUID 1
+#define HAVE_MSVCRT 1
+#undef HAVE_STRDUP 
+#define HAVE__STRDUP 1
+#undef NO_PER_THREAD_LOCALE
+#define HAVE_DECL__CONFIGTHREADLOCALE 1
+#define HAVE__CONFIGTHREADLOCALE 1
+#define HAVE_DECL___CPUID 1
+
+#if ( _MSC_FULL_VER >= 160040219 )
+#define HAVE_DECL__XGETBV 1
+#else
+#define HAVE_DECL__XGETBV 0
+#endif
+
 #else
 
 // Under any system that can run configure we need to include config.h first.
@@ -120,6 +135,7 @@
 /* If we're not running under CYGWIN use windows networking */
 #undef USE_WINSOCK
 #define USE_WINSOCK 1
+/* wxWidgets doesn't do winsock 2, so ignore it for now */
 #ifdef HAVE_WINSOCK2_H
 #include <winsock2.h>
 #elif defined(HAVE_WINSOCK_H)
diff --git a/lib/common_defs.h b/lib/common_defs.h
index 695c7c1..92483ae 100644
--- a/lib/common_defs.h
+++ b/lib/common_defs.h
@@ -77,6 +77,20 @@
 #define MODE_QUIT               6
 #define NGRAPHICS_MSGS  7
 
+// process priorities
+//
+#define PROCESS_PRIORITY_UNSPECIFIED    0
+#define PROCESS_PRIORITY_LOWEST     1
+    // win: IDLE; unix: 19
+#define PROCESS_PRIORITY_LOW        2
+    // win: BELOW_NORMAL; unix: 10
+#define PROCESS_PRIORITY_NORMAL     3
+    // win: NORMAL; unix: 0
+#define PROCESS_PRIORITY_HIGH       4
+    // win: ABOVE_NORMAL; unix: -10
+#define PROCESS_PRIORITY_HIGHEST    5
+    // win: HIGH; unix: -16
+
 // priorities for client messages
 //
 #define MSG_INFO            1
@@ -217,6 +231,13 @@ enum BATTERY_STATE {
     // input/output files can be deleted,
     // result and workunit records can be purged.
 
+// credit types
+//
+#define CREDIT_TYPE_FLOPS           0
+#define CREDIT_TYPE_STORAGE         1
+#define CREDIT_TYPE_NETWORK         2
+#define CREDIT_TYPE_PROJECT         3
+
 struct TIME_STATS {
     double now;
         // the client's current time of day
diff --git a/lib/coproc.cpp b/lib/coproc.cpp
index e017aa2..96e1f73 100644
--- a/lib/coproc.cpp
+++ b/lib/coproc.cpp
@@ -132,6 +132,8 @@ void COPROC::write_request(MIOFILE& f) {
     );
 }
 
+#endif
+
 int COPROC::parse(XML_PARSER& xp) {
     char buf[256];
     strcpy(type, "");
@@ -147,6 +149,8 @@ int COPROC::parse(XML_PARSER& xp) {
         }
         if (xp.parse_str("type", type, sizeof(type))) continue;
         if (xp.parse_int("count", count)) continue;
+        if (xp.parse_double("req_secs", req_secs)) continue;
+        if (xp.parse_double("req_instances", req_instances)) continue;
         if (xp.parse_double("peak_flops", peak_flops)) continue;
         if (xp.parse_str("device_nums", buf, sizeof(buf))) {
             int i=0;
@@ -162,8 +166,6 @@ int COPROC::parse(XML_PARSER& xp) {
     return ERR_XML_PARSE;
 }
 
-#endif
-
 void COPROCS::summary_string(char* buf, int len) {
     char buf2[1024];
 
@@ -236,6 +238,15 @@ int COPROCS::parse(XML_PARSER& xp) {
             }
             continue;
         }
+        if (xp.match_tag("coproc")) {
+            COPROC cp;
+            retval = cp.parse(xp);
+            if (!retval) {
+                coprocs[n_rsc++] = cp;
+            } else {
+                fprintf(stderr, "failed to parse <coproc>: %d\n", retval);
+            }
+        }
     }
     return ERR_XML_PARSE;
 }
@@ -912,6 +923,7 @@ const char* proc_type_name_xml(int pt) {
     case PROC_TYPE_NVIDIA_GPU: return "NVIDIA";
     case PROC_TYPE_AMD_GPU: return "ATI";
     case PROC_TYPE_INTEL_GPU: return "intel_gpu";
+    case PROC_TYPE_MINER_ASIC: return "miner_asic";
     }
     return "unknown";
 }
@@ -922,6 +934,7 @@ const char* proc_type_name(int pt) {
     case PROC_TYPE_NVIDIA_GPU: return "NVIDIA GPU";
     case PROC_TYPE_AMD_GPU: return "AMD/ATI GPU";
     case PROC_TYPE_INTEL_GPU: return "Intel GPU";
+    case PROC_TYPE_MINER_ASIC: return "Miner ASIC";
     }
     return "unknown";
 }
@@ -931,5 +944,6 @@ int coproc_type_name_to_num(const char* name) {
     if (!strcmp(name, "NVIDIA")) return PROC_TYPE_NVIDIA_GPU;
     if (!strcmp(name, "ATI")) return PROC_TYPE_AMD_GPU;
     if (!strcmp(name, "intel_gpu")) return PROC_TYPE_INTEL_GPU;
+    if (!strcmp(name, "miner_asic")) return PROC_TYPE_MINER_ASIC;
     return -1;      // Some other type
 }
diff --git a/lib/crypt.cpp b/lib/crypt.cpp
index 208d925..ecac58f 100644
--- a/lib/crypt.cpp
+++ b/lib/crypt.cpp
@@ -217,8 +217,7 @@ int scan_key_hex(FILE* f, KEY* key, int size) {
     key->bits = num_bits;
     len = size - sizeof(key->bits);
     for (i=0; i<len; i++) {
-        fs = fscanf(f, "%2x", &n);
-        if (fs != 1) return ERR_NULL;
+        fscanf(f, "%2x", &n);
         key->data[i] = n;
     }
     fs = fscanf(f, ".");
diff --git a/lib/crypt_prog.cpp b/lib/crypt_prog.cpp
index 3d45361..473308f 100644
--- a/lib/crypt_prog.cpp
+++ b/lib/crypt_prog.cpp
@@ -357,7 +357,7 @@ int main(int argc, char** argv) {
             }
         } else {
             // o2b
-            rsa_key_ = (RSA *)calloc(1, sizeof(RSA));
+            rsa_key_ = RSA_new();
             if (rsa_key_ == NULL) {
                 die("could not allocate memory for RSA structure.\n");
             }
diff --git a/lib/diagnostics.h b/lib/diagnostics.h
index d13bcc2..763cc26 100644
--- a/lib/diagnostics.h
+++ b/lib/diagnostics.h
@@ -252,7 +252,7 @@ extern format_backtrace_line_t format_backtrace_line;
 
 #if defined(__MINGW32__) || defined(__CYGWIN32__)
 #define BOINCASSERT(expr)   assert(expr)
-#define BOINCTRACE(...)     boinc_trace
+#define BOINCTRACE          boinc_trace
 #else  // __MINGW32__
 #define BOINCASSERT(expr)   __noop
 #define BOINCTRACE          __noop
@@ -274,7 +274,11 @@ extern format_backtrace_line_t format_backtrace_line;
 
 #define BOINCASSERT(expr)         
 #ifndef IRIX
-#define BOINCTRACE(...)          
+#if defined(__MINGW32__) || defined(__CYGWIN32__)
+#define BOINCTRACE
+#else
+#define BOINCTRACE(...)
+#endif
 #endif
 
 #endif // _DEBUG
diff --git a/lib/error_numbers.h b/lib/error_numbers.h
index f6e3033..fcc3ec4 100644
--- a/lib/error_numbers.h
+++ b/lib/error_numbers.h
@@ -129,10 +129,11 @@
 #define ERR_NOT_UNIQUE       -160
     // state files had redundant entries
 #define ERR_NOT_FOUND        -161
-    // inconsistent client state
+    // catch-all lookup error
 #define ERR_NO_EXIT_STATUS   -162
     // exit_status not found in scheduler request 
 #define ERR_FILE_MISSING    -163
+#define ERR_KILL            -164
 #define ERR_SEMGET          -165
 #define ERR_SEMCTL          -166
 #define ERR_SEMOP           -167
diff --git a/lib/md5_file.cpp b/lib/md5_file.cpp
index a3f2b05..dfa5d0b 100644
--- a/lib/md5_file.cpp
+++ b/lib/md5_file.cpp
@@ -70,9 +70,11 @@ int md5_file(const char* path, char* output, double& nbytes, bool is_gzip) {
     if (is_gzip) {
         n = (int)fread(buf, 1, 10, f);
         if (n != 10) {
+            fclose(f);
             return ERR_BAD_FORMAT;
         }
         if (buf[0] != 0x1f || buf[1] != 0x8b || buf[2] != 0x08) {
+            fclose(f);
             return ERR_BAD_FORMAT;
         } 
         nbytes = 10;
diff --git a/lib/network.cpp b/lib/network.cpp
index a479270..8fbca82 100644
--- a/lib/network.cpp
+++ b/lib/network.cpp
@@ -307,3 +307,36 @@ void reset_dns() {
     res_init();
 #endif
 }
+
+// Get an unused port number.
+// Used by vboxwrapper.
+// I'm not sure if is_remote is relevant here - a port is a port, right?
+//
+int boinc_get_port(bool is_remote, int& port) {
+    sockaddr_in addr;
+    BOINC_SOCKLEN_T addrsize;
+    int sock;
+    int retval;
+
+    addrsize = sizeof(sockaddr_in);
+
+    memset(&addr, 0, sizeof(sockaddr_in));
+    addr.sin_family = AF_INET;
+    addr.sin_port = htons(0);
+    addr.sin_addr.s_addr = htonl(is_remote?INADDR_ANY:INADDR_LOOPBACK);
+
+    retval = boinc_socket(sock);
+    if (retval) return retval;
+
+    retval = bind(sock, (const sockaddr*)&addr, addrsize);
+    if (retval < 0) {
+        boinc_close_socket(sock);
+        return ERR_BIND;
+    }
+
+    getsockname(sock, (sockaddr*)&addr, &addrsize);
+    port = ntohs(addr.sin_port);
+
+    boinc_close_socket(sock);
+    return 0;
+}
diff --git a/lib/network.h b/lib/network.h
index a35b2a3..b2af6e7 100644
--- a/lib/network.h
+++ b/lib/network.h
@@ -56,6 +56,7 @@ extern void boinc_close_socket(int sock);
 extern int get_socket_error(int fd);
 extern const char* socket_error_str();
 extern void reset_dns();
+extern int boinc_get_port(bool is_remote, int& port);
 
 #if defined(_WIN32) && !defined(__CYGWIN32__)
 typedef int BOINC_SOCKLEN_T;
diff --git a/lib/prefs.cpp b/lib/prefs.cpp
index d83b59b..5d7be08 100644
--- a/lib/prefs.cpp
+++ b/lib/prefs.cpp
@@ -265,8 +265,28 @@ void GLOBAL_PREFS::defaults() {
     // Also, don't memset to 0
 }
 
-// before parsing
-void GLOBAL_PREFS::clear_bools() {
+// values for fields with an enabling checkbox in the GUI.
+// These are the values shown when the checkbox is first checked
+// (in cases where this differs from the default).
+// These should be consistent with html/inc/prefs.inc
+//
+void GLOBAL_PREFS::enabled_defaults() {
+    defaults();
+    disk_max_used_gb = 100;
+    disk_min_free_gb = 1.0;
+    daily_xfer_limit_mb = 10000;
+    daily_xfer_period_days = 30;
+    max_bytes_sec_down = 100*KILO;
+    max_bytes_sec_up = 100*KILO;
+    cpu_times.start_hour = 0;
+    cpu_times.end_hour = 23.983;    // 23:59
+    net_times.start_hour = 0;
+    net_times.end_hour = 23.983;    // 23:59
+}
+
+// call before parsing
+//
+void GLOBAL_PREFS::init_bools() {
     run_on_batteries = false;
     run_if_user_active = false;
     leave_apps_in_memory = false;
@@ -294,7 +314,7 @@ int GLOBAL_PREFS::parse(
     XML_PARSER& xp, const char* host_venue, bool& found_venue, GLOBAL_PREFS_MASK& mask
 ) {
     init();
-    clear_bools();
+    init_bools();
     return parse_override(xp, host_venue, found_venue, mask);
 }
 
@@ -387,7 +407,7 @@ int GLOBAL_PREFS::parse_override(
                 parse_attr(attrs, "name", buf2, sizeof(buf2));
                 if (!strcmp(buf2, host_venue)) {
                     defaults();
-                    clear_bools();
+                    init_bools();
                     mask.clear();
                     in_correct_venue = true;
                     found_venue = true;
diff --git a/lib/prefs.h b/lib/prefs.h
index 4abd0e2..e4afe66 100644
--- a/lib/prefs.h
+++ b/lib/prefs.h
@@ -188,8 +188,9 @@ struct GLOBAL_PREFS {
 
     GLOBAL_PREFS();
     void defaults();
+    void enabled_defaults();
     void init();
-    void clear_bools();
+    void init_bools();
     int parse(XML_PARSER&, const char* venue, bool& found_venue, GLOBAL_PREFS_MASK& mask);
     int parse_day(XML_PARSER&);
     int parse_override(XML_PARSER&, const char* venue, bool& found_venue, GLOBAL_PREFS_MASK& mask);
diff --git a/lib/proc_control.cpp b/lib/proc_control.cpp
index 0eeacb6..c5f1dea 100644
--- a/lib/proc_control.cpp
+++ b/lib/proc_control.cpp
@@ -39,6 +39,7 @@
 #endif
 #endif
 
+#include "common_defs.h"
 #include "procinfo.h"
 #include "str_util.h"
 #include "util.h"
@@ -249,3 +250,27 @@ void suspend_or_resume_process(int pid, bool resume) {
     ::kill(pid, resume?SIGCONT:SIGSTOP);
 #endif
 }
+
+// return OS-specific value associated with priority code
+//
+int process_priority_value(int priority) {
+#ifdef _WIN32
+    switch (priority) {
+    case PROCESS_PRIORITY_LOWEST: return IDLE_PRIORITY_CLASS;
+    case PROCESS_PRIORITY_LOW: return BELOW_NORMAL_PRIORITY_CLASS;
+    case PROCESS_PRIORITY_NORMAL: return NORMAL_PRIORITY_CLASS;
+    case PROCESS_PRIORITY_HIGH: return ABOVE_NORMAL_PRIORITY_CLASS;
+    case PROCESS_PRIORITY_HIGHEST: return HIGH_PRIORITY_CLASS;
+    }
+    return 0;
+#else
+    switch (priority) {
+    case PROCESS_PRIORITY_LOWEST: return 19;
+    case PROCESS_PRIORITY_LOW: return 10;
+    case PROCESS_PRIORITY_NORMAL: return 0;
+    case PROCESS_PRIORITY_HIGH: return -10;
+    case PROCESS_PRIORITY_HIGHEST: return -16;
+    }
+    return 0;
+#endif
+}
diff --git a/lib/proc_control.h b/lib/proc_control.h
index 7dd8430..0b3f547 100644
--- a/lib/proc_control.h
+++ b/lib/proc_control.h
@@ -37,4 +37,6 @@ extern void kill_descendants(int child_pid=0);
 extern void suspend_or_resume_descendants(bool resume);
 extern void suspend_or_resume_process(int pid, bool resume);
 
+extern int process_priority_value(int);
+
 #endif
diff --git a/lib/procinfo.cpp b/lib/procinfo.cpp
index cbee3a1..23aed1c 100644
--- a/lib/procinfo.cpp
+++ b/lib/procinfo.cpp
@@ -74,7 +74,7 @@ void procinfo_app(
     PROCINFO& procinfo, vector<int>* other_pids, PROC_MAP& pm, char* graphics_exec_file
 ) {
     PROC_MAP::iterator i;
-    for (i=pm.begin(); i!=pm.end(); i++) {
+    for (i=pm.begin(); i!=pm.end(); ++i) {
         PROCINFO& p = i->second;
         if (p.id == procinfo.id
             || (other_pids && in_vector(p.id, *other_pids))
@@ -98,7 +98,7 @@ void procinfo_app(
 
 void find_children(PROC_MAP& pm) {
     PROC_MAP::iterator i;
-    for (i=pm.begin(); i!=pm.end(); i++) {
+    for (i=pm.begin(); i!=pm.end(); ++i) {
         int parentid = i->second.parentid;
         PROC_MAP::iterator j = pm.find(parentid);
         if (j == pm.end()) continue;    // should never happen
@@ -111,7 +111,7 @@ void find_children(PROC_MAP& pm) {
 void procinfo_non_boinc(PROCINFO& procinfo, PROC_MAP& pm) {
     procinfo.clear();
     PROC_MAP::iterator i;
-    for (i=pm.begin(); i!=pm.end(); i++) {
+    for (i=pm.begin(); i!=pm.end(); ++i) {
         PROCINFO& p = i->second;
 #ifdef _WIN32
         if (p.id == 0) continue;    // idle process
diff --git a/lib/procinfo_mac.cpp b/lib/procinfo_mac.cpp
index cfe05ec..5c7c9bc 100644
--- a/lib/procinfo_mac.cpp
+++ b/lib/procinfo_mac.cpp
@@ -23,6 +23,7 @@
 #include <ctype.h>
 #include <sys/types.h>
 #include <dirent.h>
+#include <unistd.h>
 
 #if SHOW_TIMING
 #include <Carbon/Carbon.h>
diff --git a/lib/str_util.cpp b/lib/str_util.cpp
index b1aa3b9..e0f78b9 100644
--- a/lib/str_util.cpp
+++ b/lib/str_util.cpp
@@ -26,6 +26,7 @@
 
 #ifndef _WIN32
 #include "config.h"
+#include <sstream>
 #include <string>
 #include <cmath>
 #include <string.h>
@@ -45,6 +46,8 @@
 #include "str_util.h"
 
 using std::string;
+using std::stringstream;
+using std::vector;
 
 // Use this instead of strncpy().
 // Result will always be null-terminated, and it's faster.
@@ -468,6 +471,7 @@ const char* boincerror(int which_error) {
         case ERR_NOT_FOUND: return "not found";
         case ERR_NO_EXIT_STATUS: return "no exit status in scheduler request";
         case ERR_FILE_MISSING: return "file missing";
+        case ERR_KILL: return "kill() or TerminateProcess() failed";
         case ERR_SEMGET: return "semget() failed";
         case ERR_SEMCTL: return "semctl() failed";
         case ERR_SEMOP: return "semop() failed";
@@ -719,3 +723,36 @@ char* lf_terminate(char* p) {
     p[n+1] = 0;
     return p;
 }
+
+void parse_serialnum(char* in, char* boinc, char* vbox, char* coprocs) {
+    strcpy(boinc, "");
+    strcpy(vbox, "");
+    strcpy(coprocs, "");
+    while (*in) {
+        if (*in != '[') break;      // format error
+        char* p = strchr(in, ']');
+        if (!p) break;              // format error
+        p++;
+        char c = *p;
+        *p = 0;
+        if (strstr(in, "BOINC")) {
+            strcpy(boinc, in);
+        } else if (strstr(in, "vbox")) {
+            strcpy(vbox, in);
+        } else {
+            strcat(coprocs, in);
+        }
+        *p = c;
+        in = p;
+    }
+}
+
+vector<string> split(string s, char delim) {
+    vector<string> result;
+    stringstream ss(s);
+    string item;
+    while (getline(ss, item, delim)) {
+        result.push_back(item);
+    }
+    return result;
+}
diff --git a/lib/str_util.h b/lib/str_util.h
index a1adaf9..ea2eec7 100644
--- a/lib/str_util.h
+++ b/lib/str_util.h
@@ -19,6 +19,7 @@
 #define STR_UTIL_H
 
 #include <string>
+#include <vector>
 #include <string.h>
 
 extern void strcpy_overlap(char*, const char*);
@@ -75,6 +76,13 @@ extern int string_substitute(
 //
 extern void mysql_timestamp(double, char*);
 
+// parse host.serialnum into component parts.
+// Given a string of the form
+// [BOINC|7.2.42][CUDA|GeForce GTX 860M|1|2048MB|34052|101][INTEL|Intel(R) HD Graphics 4600|1|1752MB||102][vbox|4.2.16]
+// split it into the BOINC, vbox, and other (coproc) parts
+//
+extern void parse_serialnum(char* in, char* boinc, char* vbox, char* coprocs);
+
 // take a malloced string.
 // if \n is not last char, add it.
 //
@@ -92,4 +100,5 @@ extern const char* batch_state_string(int state);
 
 extern void strip_translation(char* p);
 
+extern std::vector<std::string> split(std::string, char delim);
 #endif
diff --git a/lib/unix_util.cpp b/lib/unix_util.cpp
index 060c015..5b57c4c 100644
--- a/lib/unix_util.cpp
+++ b/lib/unix_util.cpp
@@ -75,7 +75,7 @@ int setenv(const char *name, const char *value, int overwrite) {
         if (strlen(buf)<(strlen(name)+strlen(value)+1)) {
             // no.  See if we originally allocated this string.
             std::vector<char *>::iterator i=envstrings.begin();
-            for (;i!=envstrings.end();i++) {
+            for (;i!=envstrings.end();++i) {
                 if (*i == buf) break;
             }
             if (i!=envstrings.end()) {
diff --git a/lib/util.cpp b/lib/util.cpp
index 66c4f37..6ee94fb 100644
--- a/lib/util.cpp
+++ b/lib/util.cpp
@@ -468,33 +468,27 @@ int kill_program(int pid, int exit_code) {
     int retval;
 
     HANDLE h = OpenProcess(PROCESS_TERMINATE, false, pid);
-    if (h == NULL && GetLastError() == ERROR_ACCESS_DENIED) return EPERM;
-    if (h == NULL && GetLastError() == ERROR_INVALID_PARAMETER) return EINVAL;
-    if (h == NULL && GetLastError() == ERROR_FILE_NOT_FOUND) return ESRCH;
-    if (h == NULL) return EIO;
+    if (h == NULL) return ERR_NOT_FOUND;
     if (TerminateProcess(h, exit_code)) {
         retval = 0;
     } else {
-        retval = 1;
+        retval = ERR_KILL;
     }
     CloseHandle(h);
-
     return retval;
 }
-void kill_program(HANDLE pid) {
-    TerminateProcess(pid, 0);
+
+int kill_program(HANDLE pid) {
+    if (TerminateProcess(pid, 0)) return 0;
+    return ERR_KILL;
 }
+
 #else
-int kill_program(int pid, int exit_code) {
-    int retval;
-    retval = kill(pid, SIGKILL);
-    if (-1 == retval) {
-        retval = errno;
+int kill_program(int pid) {
+    if (kill(pid, SIGKILL)) {
+        return ERR_KILL;
     }
-    return retval;
-}
-void kill_program(int pid) {
-    kill(pid, SIGKILL);
+    return 0;
 }
 #endif
 
diff --git a/lib/util.h b/lib/util.h
index 0db7588..3f30888 100644
--- a/lib/util.h
+++ b/lib/util.h
@@ -90,8 +90,8 @@ extern int run_program(
     HANDLE&             // process handle
 );
 
-extern void kill_program(HANDLE);
-extern int kill_program(int, int);
+extern int kill_program(HANDLE);
+extern int kill_program(int, int exit_code=0);
 extern int get_exit_status(HANDLE);
 extern bool process_exists(HANDLE);
 
@@ -100,8 +100,7 @@ extern bool process_exists(HANDLE);
 extern int run_program(
     const char* dir, const char* file, int argc, char *const argv[], double, int&
 );
-extern void kill_program(int);
-extern int kill_program(int, int);
+extern int kill_program(int);
 extern int get_exit_status(int);
 extern bool process_exists(int);
 #endif
diff --git a/lib/win_util.cpp b/lib/win_util.cpp
index fe4b15f..a14b3b6 100644
--- a/lib/win_util.cpp
+++ b/lib/win_util.cpp
@@ -161,7 +161,7 @@ char* windows_format_error_string(
         // include the hex error code as well
         snprintf(pszBuf, iSize, "%S (0x%x)", lpszTemp, dwError);
         if (lpszTemp) {
-            LocalFree((HLOCAL) lpszTemp);
+            LocalFree((HLOCAL)lpszTemp);
         }
     } else {
         strcpy(pszBuf, "(unknown error)");
diff --git a/locale/ar/BOINC-Client.mo b/locale/ar/BOINC-Client.mo
index a1b57d4..acf9cfe 100644
Binary files a/locale/ar/BOINC-Client.mo and b/locale/ar/BOINC-Client.mo differ
diff --git a/locale/ar/BOINC-Client.po b/locale/ar/BOINC-Client.po
index 1ca52ce..50c8f02 100644
--- a/locale/ar/BOINC-Client.po
+++ b/locale/ar/BOINC-Client.po
@@ -4,20 +4,19 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-06-05 10:24-0700\n"
-"PO-Revision-Date: 2015-02-10 11:55-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.2.1\n"
 
-#: acct_mgr.cpp:448
-#: acct_mgr.cpp:457
+#: acct_mgr.cpp:448 acct_mgr.cpp:457
 msgid "Message from account manager"
 msgstr ""
 
@@ -26,7 +25,9 @@ msgid "Message from server"
 msgstr ""
 
 #: client_state.cpp:246
-msgid "Some tasks need more memory than allowed by your preferences.  Please check the preferences."
+msgid ""
+"Some tasks need more memory than allowed by your preferences.  Please check "
+"the preferences."
 msgstr ""
 
 #: client_state.cpp:501
@@ -39,11 +40,12 @@ msgstr ""
 
 #: cs_scheduler.cpp:575
 #, c-format
-msgid "You used the wrong URL for this project.  When convenient, remove this project, then add %s"
+msgid ""
+"You used the wrong URL for this project.  When convenient, remove this "
+"project, then add %s"
 msgstr ""
 
-#: cs_statefile.cpp:829
-#: ../sched/sched_types.cpp:259
+#: cs_statefile.cpp:829 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
 msgstr ""
 
@@ -59,13 +61,11 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: log_flags.cpp:259
-#: log_flags.cpp:436
+#: log_flags.cpp:259 log_flags.cpp:436
 msgid "Unexpected text in cc_config.xml"
 msgstr ""
 
-#: log_flags.cpp:410
-#: log_flags.cpp:462
+#: log_flags.cpp:410 log_flags.cpp:462
 msgid "Unrecognized tag in cc_config.xml"
 msgstr ""
 
@@ -90,7 +90,9 @@ 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."
+msgid ""
+"The project has changed its security key.  Please remove and add this "
+"project."
 msgstr ""
 
 #: ../sched/handle_request.cpp:943
@@ -102,7 +104,8 @@ 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."
+msgid ""
+"Your BOINC client software is too old.  Please install the current version."
 msgstr ""
 
 #: ../sched/handle_request.cpp:1259
@@ -114,11 +117,14 @@ 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"
+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"
+msgid ""
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to "
+"the current version"
 msgstr ""
 
 #: ../sched/sched_send.cpp:1146
@@ -140,7 +146,8 @@ msgstr ""
 
 #: ../sched/sched_send.cpp:1305
 #, c-format
-msgid "Tasks for %s are available, but your preferences are set to not accept them"
+msgid ""
+"Tasks for %s are available, but your preferences are set to not accept them"
 msgstr ""
 
 #: ../sched/sched_types.cpp:254
@@ -150,4 +157,3 @@ msgstr ""
 #: ../sched/sched_version.cpp:214
 msgid "Your app_info.xml file doesn't have a usable version of"
 msgstr ""
-
diff --git a/locale/ar/BOINC-Manager.mo b/locale/ar/BOINC-Manager.mo
index 1d08354..421e036 100644
Binary files a/locale/ar/BOINC-Manager.mo and b/locale/ar/BOINC-Manager.mo differ
diff --git a/locale/ar/BOINC-Manager.po b/locale/ar/BOINC-Manager.po
index fcfd193..0e51493 100644
--- a/locale/ar/BOINC-Manager.po
+++ b/locale/ar/BOINC-Manager.po
@@ -7,22 +7,23 @@ msgstr ""
 "Project-Id-Version: BOINC Manager 6.x\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-06-18 11:32-0500\n"
-"PO-Revision-Date: 2015-02-10 11:55-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
+"PO-Revision-Date: 2013-06-05 19:42+0200\n"
+"Last-Translator: Anonymous Pootle User\n"
 "Language-Team: BOINC Development Team <boinc_loc at ssl.berkeley.edu>\n"
 "Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 "X-Generator: Pootle 2.1.6\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
 "X-Poedit-SearchPath-0: clientgui\n"
 "X-Poedit-SearchPath-1: clientgui/msw\n"
 "X-Poedit-SearchPath-2: clientgui/gtk\n"
 "X-Poedit-SearchPath-3: clientgui/mac\n"
+"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
 
 #: clientgui/AccountInfoPage.cpp:387
 #, c-format
@@ -72,13 +73,11 @@ msgstr ""
 msgid "Find login information"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:668
+#: clientgui/AccountInfoPage.cpp:436 clientgui/AccountInfoPage.cpp:668
 msgid "&Password:"
 msgstr "&كلمة السر"
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:692
+#: clientgui/AccountInfoPage.cpp:443 clientgui/AccountInfoPage.cpp:692
 msgid "Choose a &password:"
 msgstr "اختر &كلمة سر"
 
@@ -134,33 +133,47 @@ msgid "Use account manager"
 msgstr "مدير الحسابات"
 
 #: clientgui/AccountInfoPage.cpp:587
-msgid "The minimum username length for this project is 1. Please enter a different username."
+msgid ""
+"The minimum username length for this project is 1. Please enter a different "
+"username."
 msgstr ""
 
 #: clientgui/AccountInfoPage.cpp:592
-msgid "The minimum username length for this account manager is 1. Please enter a different username."
+msgid ""
+"The minimum username length for this account manager is 1. Please enter a "
+"different username."
 msgstr ""
 
 #: clientgui/AccountInfoPage.cpp:598
-msgid "The minimum email address length for this project is 1. Please enter a different email address."
+msgid ""
+"The minimum email address length for this project is 1. Please enter a "
+"different email address."
 msgstr ""
 
 #: clientgui/AccountInfoPage.cpp:603
-msgid "The minimum email address length for this account manager is 1. Please enter a different email address."
+msgid ""
+"The minimum email address length for this account manager is 1. Please enter "
+"a different email address."
 msgstr ""
 
 #: clientgui/AccountInfoPage.cpp:616
 #, c-format
-msgid "The minimum password length for this project is %d. Please enter a different password."
+msgid ""
+"The minimum password length for this project is %d. Please enter a different "
+"password."
 msgstr "أدنى طول لكلمة السر لهذا المشروع %d خانات. رجاء أدخل كلمة سر أطول."
 
 #: clientgui/AccountInfoPage.cpp:622
 #, c-format
-msgid "The minimum password length for this account manager is %d. Please enter a different password."
-msgstr "أدنى طول لكلمة السر لمدير الحسابات هذا  %d خانات. رجاء أدخل كلمة سر أطول."
+msgid ""
+"The minimum password length for this account manager is %d. Please enter a "
+"different password."
+msgstr ""
+"أدنى طول لكلمة السر لمدير الحسابات هذا  %d خانات. رجاء أدخل كلمة سر أطول."
 
 #: clientgui/AccountInfoPage.cpp:634
-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:248
@@ -215,8 +228,7 @@ msgstr ""
 msgid "&Close Window"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:329
-#: clientgui/AdvancedFrame.cpp:336
+#: clientgui/AdvancedFrame.cpp:329 clientgui/AdvancedFrame.cpp:336
 #: clientgui/AdvancedFrame.cpp:343
 #, c-format
 msgid "Exit %s"
@@ -568,7 +580,8 @@ msgid ""
 "\n"
 "Do you want to stop using %s?"
 msgstr ""
-"إن توقفت عن استخدام %s فسوف تبقي على مشروعاتك الحالية لكنك ستضطر إلى إدارة مشروعاتك يدويا.\n"
+"إن توقفت عن استخدام %s فسوف تبقي على مشروعاتك الحالية لكنك ستضطر إلى إدارة "
+"مشروعاتك يدويا.\n"
 "\n"
 "أتريد التوقف عن استخدام %s؟"
 
@@ -670,7 +683,8 @@ msgstr "%s - عطل في الاتصال"
 #: clientgui/BOINCBaseFrame.cpp:514
 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 ""
 "ليست لك حاليا الصلاحية لإدارة العميل.\n"
 "اتصل بمدير نظامك ليضيفك إلى محموعة المستخدمين 'boinc_users'"
@@ -714,7 +728,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:638
@@ -733,7 +748,8 @@ msgstr "%s - حالة الاتصال"
 #, 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 ""
 "%s حاليا غير متصل بعميل %s.\n"
@@ -920,14 +936,12 @@ msgstr "زر موقع %s…"
 msgid "Open %s..."
 msgstr "افتح %s…"
 
-#: clientgui/BOINCTaskBar.cpp:525
-#: clientgui/BOINCTaskBar.cpp:621
+#: clientgui/BOINCTaskBar.cpp:525 clientgui/BOINCTaskBar.cpp:621
 #: clientgui/BOINCTaskBar.cpp:629
 msgid "Snooze"
 msgstr "أرجئ"
 
-#: clientgui/BOINCTaskBar.cpp:527
-#: clientgui/BOINCTaskBar.cpp:648
+#: clientgui/BOINCTaskBar.cpp:527 clientgui/BOINCTaskBar.cpp:648
 #: clientgui/BOINCTaskBar.cpp:656
 msgid "Snooze GPU"
 msgstr ""
@@ -1024,10 +1038,8 @@ msgstr ""
 "\n"
 "اضغط 'أنه' للإغلاق."
 
-#: 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 "اضغط 'أنه' للإغلاق."
 
@@ -1106,12 +1118,12 @@ msgstr ""
 
 #: clientgui/DlgAbout.cpp:196
 msgid "Berkeley Open Infrastructure for Network Computing"
-msgstr "بنية بركلي التحتية المفتوحة للحوسبة الشبكية Berkeley Open Infrastructure for Network Computing"
+msgstr ""
+"بنية بركلي التحتية المفتوحة للحوسبة الشبكية Berkeley Open Infrastructure for "
+"Network Computing"
 
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:396
+#: clientgui/DlgAbout.cpp:208 clientgui/DlgExitMessage.cpp:173
+#: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:396
 #: clientgui/DlgSelectComputer.cpp:162
 msgid "&OK"
 msgstr "موا&فق"
@@ -1136,8 +1148,7 @@ msgstr "تُحسست قيمة دخل غير صحيحة"
 msgid "Validation Error"
 msgstr "عطل في التحقق"
 
-#: clientgui/DlgAdvPreferences.cpp:797
-#: clientgui/DlgAdvPreferences.cpp:803
+#: clientgui/DlgAdvPreferences.cpp:797 clientgui/DlgAdvPreferences.cpp:803
 #: clientgui/DlgAdvPreferences.cpp:809
 msgid "Applications to add"
 msgstr ""
@@ -1147,8 +1158,7 @@ msgstr ""
 msgid "'%s' is not an executable application."
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:827
-#: clientgui/DlgAdvPreferences.cpp:874
+#: clientgui/DlgAdvPreferences.cpp:827 clientgui/DlgAdvPreferences.cpp:874
 #: clientgui/DlgAdvPreferences.cpp:898
 msgid "Add Exclusive App"
 msgstr ""
@@ -1251,7 +1261,8 @@ msgid "While computer is on batteries"
 msgstr "عندما يعمل الحاسوب بالبطارية"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:142
-msgid "check this if you want this computer to do work while it runs on batteries"
+msgid ""
+"check this if you want this computer to do work while it runs on batteries"
 msgstr "أشّر هذا إن أردت أن يشتغل الحاسوب أثناء عمله بالبطارية"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:148
@@ -1260,7 +1271,8 @@ msgid "While computer is in use"
 msgstr "عندما يكون الحاسوب مشغولا"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:151
-msgid "check this if you want this computer to do work even when you're using it"
+msgid ""
+"check this if you want this computer to do work even when you're using it"
 msgstr "أشّر هذا إن أردت أن يشتغل الحاسوب حتى أثناء استخدامك له"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:157
@@ -1269,7 +1281,9 @@ msgid "Use GPU while computer is in use"
 msgstr "عندما يكون الحاسوب مشغولا"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:160
-msgid "check this if you want your GPU to do work even when you're using the computer"
+msgid ""
+"check this if you want your GPU to do work even when you're using the "
+"computer"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:172
@@ -1277,8 +1291,10 @@ msgid "Only after computer has been idle for"
 msgstr "فقط عندما يكون الحاسوب ساكنا لمدة"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:182
-msgid "do work only after you haven't used the computer for this number of minutes"
-msgstr "يشتغل فقط بعد أن تمر مدة لا تستخدم أثناءها الحاسوب قدرها هذا العدد من الدقائق"
+msgid ""
+"do work only after you haven't used the computer for this number of minutes"
+msgstr ""
+"يشتغل فقط بعد أن تمر مدة لا تستخدم أثناءها الحاسوب قدرها هذا العدد من الدقائق"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:187
 #: clientgui/DlgAdvPreferencesBase.cpp:336
@@ -1471,7 +1487,9 @@ msgid "Confirm before connecting to internet"
 msgstr "أكد قبل الاتصال بإنترنت"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:479
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
+msgid ""
+"if checked, a confirmation dialog will be displayed before trying to connect "
+"to the Internet"
 msgstr "بتأشير هذا فإن حوار توكيد سيظهر لك قبل محاولة الاتصال بالإنترنت"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:483
@@ -1498,8 +1516,7 @@ msgstr "ساعة بدء استغلال الشبكة"
 msgid "network usage stop hour"
 msgstr "ساعة انتهاء استغلال الشبكة"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:597
-#: clientgui/DlgItemProperties.cpp:226
+#: clientgui/DlgAdvPreferencesBase.cpp:597 clientgui/DlgItemProperties.cpp:226
 msgid "Disk usage"
 msgstr "استغلال القرص"
 
@@ -1570,7 +1587,8 @@ msgid "if checked, suspended work units are left in memory"
 msgstr "بتأشير هذا فإن وحدات الشغل المعلّق تترك في الذاكرة"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:712
-msgid "Suspend processor and network usage when these applications are running:"
+msgid ""
+"Suspend processor and network usage when these applications are running:"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:721
@@ -1611,8 +1629,7 @@ msgstr "الوقت"
 msgid "Message"
 msgstr "الرسالة"
 
-#: clientgui/DlgEventLog.cpp:287
-#: clientgui/DlgEventLog.cpp:351
+#: clientgui/DlgEventLog.cpp:287 clientgui/DlgEventLog.cpp:351
 msgid "&Show only this project"
 msgstr ""
 
@@ -1620,8 +1637,7 @@ msgstr ""
 msgid "Copy &All"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:293
-#: clientgui/DlgEventLog.cpp:297
+#: clientgui/DlgEventLog.cpp:293 clientgui/DlgEventLog.cpp:297
 msgid "Copy all the messages to the clipboard."
 msgstr "ينسخ كل الرسائل إلى لوح القصاصات"
 
@@ -1629,22 +1645,25 @@ msgstr "ينسخ كل الرسائل إلى لوح القصاصات"
 msgid "Copy &Selected"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:305
-#: clientgui/DlgEventLog.cpp:313
-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:305 clientgui/DlgEventLog.cpp:313
+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 ""
 "ينسخ الرسالة المختارة إلى لوح القصاصات.\n"
-"يمكنك اختيار عدة رسائل بالإبقاء على Shift أو Command مضغوطا أثناء النقر بالفأرة."
+"يمكنك اختيار عدة رسائل بالإبقاء على Shift أو Command مضغوطا أثناء النقر "
+"بالفأرة."
 
-#: clientgui/DlgEventLog.cpp:307
-#: clientgui/DlgEventLog.cpp:315
-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:307 clientgui/DlgEventLog.cpp:315
+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 ""
 "ينسخ الرسالة المختارة إلى لوح القصاصات.\n"
-"يمكنك اختيار عدة رسائل بالإبقاء على Shift أو Control مضغوطا أثناء النقر بالفأرة."
+"يمكنك اختيار عدة رسائل بالإبقاء على Shift أو Control مضغوطا أثناء النقر "
+"بالفأرة."
 
-#: clientgui/DlgEventLog.cpp:322
-#: clientgui/DlgItemProperties.cpp:66
+#: clientgui/DlgEventLog.cpp:322 clientgui/DlgItemProperties.cpp:66
 msgid "&Close"
 msgstr ""
 
@@ -1658,14 +1677,12 @@ msgstr ""
 msgid "Show all &messages"
 msgstr "انسخ كل الرسائل"
 
-#: clientgui/DlgEventLog.cpp:346
-#: clientgui/DlgEventLog.cpp:348
+#: clientgui/DlgEventLog.cpp:346 clientgui/DlgEventLog.cpp:348
 #, fuzzy
 msgid "Show messages for all projects"
 msgstr "يعرض مخططا واحدا لكل المشروعات"
 
-#: clientgui/DlgEventLog.cpp:352
-#: clientgui/DlgEventLog.cpp:354
+#: clientgui/DlgEventLog.cpp:352 clientgui/DlgEventLog.cpp:354
 #, fuzzy
 msgid "Show only the messages for the selected project"
 msgstr "يعرض مخططا واحدا للمشروع المختار"
@@ -1698,7 +1715,8 @@ msgid ""
 msgstr ""
 "سيطفئ هذا %s بكل مهامه حتى يعمل إما تطبيق %s أو حافظ شاشة %s مجددا.\n"
 "\n"
-"في معظم الحالات يكون من الأفضل غلق نافذة %s عوضا عن وقف التطبيق؛ حيث سيمكن هذا\n"
+"في معظم الحالات يكون من الأفضل غلق نافذة %s عوضا عن وقف التطبيق؛ حيث سيمكن "
+"هذا\n"
 "%s بتنفيذ مهامه في الأوقات التي ضبطتها في تفضيلاتك."
 
 #: clientgui/DlgExitMessage.cpp:153
@@ -1710,10 +1728,8 @@ msgstr ""
 msgid "Remember this decision and do not show this dialog."
 msgstr ""
 
-#: clientgui/DlgExitMessage.cpp:178
-#: clientgui/DlgGenericMessage.cpp:125
-#: clientgui/DlgOptions.cpp:401
-#: clientgui/DlgSelectComputer.cpp:167
+#: clientgui/DlgExitMessage.cpp:178 clientgui/DlgGenericMessage.cpp:125
+#: clientgui/DlgOptions.cpp:401 clientgui/DlgSelectComputer.cpp:167
 msgid "&Cancel"
 msgstr "ا&لغ"
 
@@ -1721,10 +1737,8 @@ msgstr "ا&لغ"
 msgid "Don't show this dialog again."
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:163
-#: clientgui/DlgItemProperties.cpp:166
-#: clientgui/DlgItemProperties.cpp:169
-#: clientgui/DlgItemProperties.cpp:172
+#: clientgui/DlgItemProperties.cpp:163 clientgui/DlgItemProperties.cpp:166
+#: clientgui/DlgItemProperties.cpp:169 clientgui/DlgItemProperties.cpp:172
 #, fuzzy
 msgid "Don't fetch tasks for "
 msgstr "لن يجلب مهام جديدة"
@@ -1762,8 +1776,7 @@ msgstr ""
 msgid "Properties of project "
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:212
-#: clientgui/DlgOptions.cpp:218
+#: clientgui/DlgItemProperties.cpp:212 clientgui/DlgOptions.cpp:218
 msgid "General"
 msgstr "عام"
 
@@ -1804,14 +1817,10 @@ msgstr ""
 msgid "Non CPU intensive"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:229
-#: clientgui/DlgItemProperties.cpp:231
-#: clientgui/DlgItemProperties.cpp:232
-#: clientgui/DlgItemProperties.cpp:234
-#: clientgui/DlgItemProperties.cpp:237
-#: clientgui/DlgItemProperties.cpp:246
-#: clientgui/DlgItemProperties.cpp:249
-#: clientgui/DlgItemProperties.cpp:252
+#: clientgui/DlgItemProperties.cpp:229 clientgui/DlgItemProperties.cpp:231
+#: clientgui/DlgItemProperties.cpp:232 clientgui/DlgItemProperties.cpp:234
+#: clientgui/DlgItemProperties.cpp:237 clientgui/DlgItemProperties.cpp:246
+#: clientgui/DlgItemProperties.cpp:249 clientgui/DlgItemProperties.cpp:252
 msgid "yes"
 msgstr ""
 
@@ -1819,8 +1828,7 @@ msgstr ""
 msgid "Suspended via GUI"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:231
-#: clientgui/DlgItemProperties.cpp:232
+#: clientgui/DlgItemProperties.cpp:231 clientgui/DlgItemProperties.cpp:232
 msgid "no"
 msgstr ""
 
@@ -1837,8 +1845,7 @@ msgstr "يجري طلبُ المُجَدوِِل"
 msgid "Trickle-up pending"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:240
-#: clientgui/DlgItemProperties.cpp:242
+#: clientgui/DlgItemProperties.cpp:240 clientgui/DlgItemProperties.cpp:242
 #, fuzzy
 msgid "Host location"
 msgstr "إجمالي المضيف"
@@ -1926,13 +1933,11 @@ msgstr ""
 msgid "CPU time at last checkpoint"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:340
-#: clientgui/DlgItemProperties.cpp:355
+#: clientgui/DlgItemProperties.cpp:340 clientgui/DlgItemProperties.cpp:355
 msgid "CPU time"
 msgstr "وقت المعالِج"
 
-#: clientgui/DlgItemProperties.cpp:342
-#: clientgui/DlgItemProperties.cpp:356
+#: clientgui/DlgItemProperties.cpp:342 clientgui/DlgItemProperties.cpp:356
 #, fuzzy
 msgid "Elapsed time"
 msgstr "الوقت المنصرم"
@@ -1965,8 +1970,7 @@ msgstr ""
 msgid "Local: "
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: clientgui/DlgOptions.cpp:129 clientgui/DlgOptions.cpp:135
 msgid "Options"
 msgstr ""
 
@@ -2030,33 +2034,27 @@ msgstr "اتصل عبر خادوم HTTP وسيط"
 msgid "HTTP Proxy Server Configuration"
 msgstr "تضبيطات خادوم HTTP الوسيط"
 
-#: clientgui/DlgOptions.cpp:280
-#: clientgui/DlgOptions.cpp:344
+#: clientgui/DlgOptions.cpp:280 clientgui/DlgOptions.cpp:344
 msgid "Address:"
 msgstr "المسار"
 
-#: clientgui/DlgOptions.cpp:288
-#: clientgui/DlgOptions.cpp:352
+#: clientgui/DlgOptions.cpp:288 clientgui/DlgOptions.cpp:352
 msgid "Port:"
 msgstr "الميناء"
 
-#: clientgui/DlgOptions.cpp:296
-#: clientgui/DlgOptions.cpp:360
+#: clientgui/DlgOptions.cpp:296 clientgui/DlgOptions.cpp:360
 msgid "Don't use proxy for:"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:303
-#: clientgui/DlgOptions.cpp:367
+#: clientgui/DlgOptions.cpp:303 clientgui/DlgOptions.cpp:367
 msgid "Leave these blank if not needed"
 msgstr "اترك هذه خاوية إن لم تكن تحتاجها"
 
-#: clientgui/DlgOptions.cpp:309
-#: clientgui/DlgOptions.cpp:373
+#: clientgui/DlgOptions.cpp:309 clientgui/DlgOptions.cpp:373
 msgid "User Name:"
 msgstr "اسم المستخدم"
 
-#: clientgui/DlgOptions.cpp:317
-#: clientgui/DlgOptions.cpp:381
+#: clientgui/DlgOptions.cpp:317 clientgui/DlgOptions.cpp:381
 #: clientgui/DlgSelectComputer.cpp:151
 msgid "Password:"
 msgstr "كلمة السرّ"
@@ -2111,7 +2109,9 @@ msgstr "%s - اختيار اللغة"
 
 #: clientgui/DlgOptions.cpp:695
 #, fuzzy, 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 "لغة %s المبدئية تغيرت. لكي تسري التغييرات عليك إعادة تشغيل %s"
 
 #: clientgui/DlgSelectComputer.cpp:90
@@ -2130,8 +2130,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 "المنتدى"
 
@@ -2143,15 +2142,12 @@ msgstr "تواصل مع مستخدمي BOINC الآخرين عبر منتدى SE
 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 "طالع بيانات حسابك و مجموع نقاطك"
@@ -2164,18 +2160,15 @@ msgstr "تفضيلاتك"
 msgid "View and modify your SETI at home account profile and preferences"
 msgstr "طالع و راجع ملف حسابك في SETI at Home و تفضيلاتك"
 
-#: 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 "حواسيبك"
 
@@ -2183,13 +2176,11 @@ msgstr "حواسيبك"
 msgid "View a listing of all the computers on which you are running SETI at Home"
 msgstr "طالع قائمة بكل الحواسيب التي تشغل عليها SETI at Home"
 
-#: 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 "طالع معلومات عن فريقك"
 
@@ -2210,7 +2201,8 @@ msgid "Read a detailed description of the Einstein at Home screensaver"
 msgstr "اقرأ وصفا تفصيليا لحافظ شاشة Eisntein at Home"
 
 #: 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 "تواصل مع الإداريين و المستخدمين الآخين عبر منتدى Einstein at Home"
 
 #: clientgui/Localization.cpp:73
@@ -2238,7 +2230,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 "طالع قائمة بكل الحواسيب التي تشغل عليها Einstein at Home"
 
 #: clientgui/Localization.cpp:101
@@ -2246,8 +2239,12 @@ msgid "LIGO project"
 msgstr "مشروع LIGO"
 
 #: clientgui/Localization.cpp:103
-msgid "The home page of the Laser Interferometer Gravitational-wave Observatory (LIGO) project"
-msgstr "مشروع مرصد موجة التثاقل بمقياس تداخل الليزر  Laser Interferometer Gravitational-wave Observatory (LIGO)"
+msgid ""
+"The home page of the Laser Interferometer Gravitational-wave Observatory "
+"(LIGO) project"
+msgstr ""
+"مشروع مرصد موجة التثاقل بمقياس تداخل الليزر  Laser Interferometer "
+"Gravitational-wave Observatory (LIGO)"
 
 #: clientgui/Localization.cpp:105
 msgid "GEO-600 project"
@@ -2257,8 +2254,7 @@ msgstr "مشروع GEO-600"
 msgid "The home page of the GEO-600 project"
 msgstr "موقع مشروع GEO-600"
 
-#: clientgui/Localization.cpp:115
-#: clientgui/Localization.cpp:133
+#: clientgui/Localization.cpp:115 clientgui/Localization.cpp:133
 msgid "Team"
 msgstr "فريق"
 
@@ -2341,7 +2337,9 @@ msgid "Missing application"
 msgstr "التطبيق"
 
 #: clientgui/MainDocument.cpp:1805
-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:2418
@@ -2419,8 +2417,7 @@ msgstr "فشل التنزيل"
 msgid "Downloading"
 msgstr "يجري التنزيل"
 
-#: clientgui/MainDocument.cpp:2468
-#: clientgui/MainDocument.cpp:2538
+#: clientgui/MainDocument.cpp:2468 clientgui/MainDocument.cpp:2538
 #, fuzzy
 msgid " (suspended - "
 msgstr "معلق"
@@ -2468,8 +2465,7 @@ msgstr "(غير كثيف استغلال المعالج)"
 msgid "Waiting to run"
 msgstr "في انتظار التشغيل"
 
-#: clientgui/MainDocument.cpp:2508
-#: clientgui/MainDocument.cpp:2514
+#: clientgui/MainDocument.cpp:2508 clientgui/MainDocument.cpp:2514
 msgid "Ready to start"
 msgstr "جاهزة للبدء"
 
@@ -2602,8 +2598,7 @@ msgstr ""
 msgid "%s; received from %s; on %s"
 msgstr ""
 
-#: clientgui/NoticeListCtrl.cpp:282
-#: clientgui/ProjectListCtrl.cpp:282
+#: clientgui/NoticeListCtrl.cpp:282 clientgui/ProjectListCtrl.cpp:282
 msgid "Click"
 msgstr ""
 
@@ -2611,8 +2606,7 @@ msgstr ""
 msgid "more..."
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:451
-#: clientgui/ProjectInfoPage.cpp:739
+#: clientgui/ProjectInfoPage.cpp:451 clientgui/ProjectInfoPage.cpp:739
 #: clientgui/ProjectInfoPage.cpp:743
 msgid "All"
 msgstr ""
@@ -2661,7 +2655,9 @@ msgid "Project URL:"
 msgstr "م&سار المشروع"
 
 #: clientgui/ProjectInfoPage.cpp:787
-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:811
@@ -2731,9 +2727,11 @@ msgid ""
 msgstr ""
 "فشل BOINC في الاتصال عبر إنترنت. الأسبب الأرجح هي:\n"
 "\n"
-"1) مشكلة في الوصلة. تحقق من وصلة الشبكة أو المودم و اضغط 'السابق' لتحاول مجددا.\n"
+"1) مشكلة في الوصلة. تحقق من وصلة الشبكة أو المودم و اضغط 'السابق' لتحاول "
+"مجددا.\n"
 "2) يعوق جدارُ نارٍ شخصيِ BOINC.\n"
-"اضبط جدار النار ليسمح لاتصالات BOINC عبر ميناء 80 بالمرور ثم اضغط 'السابق' لتحاول مجددا.\n"
+"اضبط جدار النار ليسمح لاتصالات BOINC عبر ميناء 80 بالمرور ثم اضغط 'السابق' "
+"لتحاول مجددا.\n"
 "3) أنت تستخدم خادوما وسيطا.\n"
 "اضغط 'اللاحق' لتضبط إعدادات BOINC المتعلقة بالوسطاء"
 
@@ -2756,9 +2754,11 @@ msgid ""
 msgstr ""
 "فشل BOINC في الاتصال عبر إنترنت. الأسبب الأرجح هي:\n"
 "\n"
-"1) مشكلة في الوصلة. تحقق من وصلة الشبكة أو المودم و اضغط 'السابق' لتحاول مجددا.\n"
+"1) مشكلة في الوصلة. تحقق من وصلة الشبكة أو المودم و اضغط 'السابق' لتحاول "
+"مجددا.\n"
 "2) يعوق جدارُ نارٍ شخصيِ BOINC.\n"
-"اضبط جدار النار ليسمح لاتصالات BOINC عبر ميناء 80 بالمرور ثم اضغط 'السابق' لتحاول مجددا.\n"
+"اضبط جدار النار ليسمح لاتصالات BOINC عبر ميناء 80 بالمرور ثم اضغط 'السابق' "
+"لتحاول مجددا.\n"
 "3) أنت تستخدم خادوما وسيطا.\n"
 "اضغط 'اللاحق' لتضبط إعدادات BOINC المتعلقة بالوسطاء"
 
@@ -2770,8 +2770,7 @@ msgstr "تضبيطات الوسيط"
 msgid "HTTP proxy"
 msgstr "وسيط HTTP"
 
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
+#: clientgui/ProxyPage.cpp:337 clientgui/ProxyPage.cpp:357
 msgid "Server:"
 msgstr "خادوم"
 
@@ -2783,8 +2782,7 @@ msgstr "تحسس أوتوماتيا"
 msgid "SOCKS proxy"
 msgstr "خادوم SOCLS"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:136
-#: clientgui/sg_BoincSimpleGUI.cpp:119
+#: clientgui/sg_BoincSimpleFrame.cpp:136 clientgui/sg_BoincSimpleGUI.cpp:119
 msgid "Advanced View...\tCtrl+Shift+A"
 msgstr ""
 
@@ -2801,8 +2799,7 @@ msgstr "كسوة"
 msgid "Select the appearance of the user interface."
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:193
-#: clientgui/sg_BoincSimpleGUI.cpp:147
+#: clientgui/sg_BoincSimpleFrame.cpp:193 clientgui/sg_BoincSimpleGUI.cpp:147
 #, c-format
 msgid "&%s"
 msgstr "&%s"
@@ -3053,8 +3050,7 @@ msgstr "اشتغل فقط ما بين"
 msgid "Connect to internet only between:"
 msgstr "اتصل بإنترنت فقط ما بين"
 
-#: clientgui/sg_DlgPreferences.cpp:376
-#: clientgui/sg_DlgPreferences.cpp:393
+#: clientgui/sg_DlgPreferences.cpp:376 clientgui/sg_DlgPreferences.cpp:393
 msgid "Use no more than:"
 msgstr "لا تستغل أكثر من"
 
@@ -3074,14 +3070,10 @@ msgstr "أجر الشغل عند العمل بالبطارية؟"
 msgid "Do work after idle for:"
 msgstr "اشتغل بعد السكون لمدة"
 
-#: clientgui/sg_DlgPreferences.cpp:621
-#: clientgui/sg_DlgPreferences.cpp:624
-#: clientgui/sg_DlgPreferences.cpp:683
-#: clientgui/sg_DlgPreferences.cpp:687
-#: clientgui/sg_DlgPreferences.cpp:699
-#: clientgui/sg_DlgPreferences.cpp:703
-#: clientgui/sg_DlgPreferences.cpp:846
-#: clientgui/sg_DlgPreferences.cpp:857
+#: clientgui/sg_DlgPreferences.cpp:621 clientgui/sg_DlgPreferences.cpp:624
+#: clientgui/sg_DlgPreferences.cpp:683 clientgui/sg_DlgPreferences.cpp:687
+#: clientgui/sg_DlgPreferences.cpp:699 clientgui/sg_DlgPreferences.cpp:703
+#: clientgui/sg_DlgPreferences.cpp:846 clientgui/sg_DlgPreferences.cpp:857
 msgid "Anytime"
 msgstr "أي وقت"
 
@@ -3156,8 +3148,12 @@ msgid "Update"
 msgstr "حدِّث"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:62
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
-msgstr "يسلم المهام المنتهية، و يجلب أحدث رصيد نقاط، و أحدث التفضيلات، و ربما مزيدا من المهام."
+msgid ""
+"Report all completed tasks, get latest credit, get latest preferences, and "
+"possibly get more tasks."
+msgstr ""
+"يسلم المهام المنتهية، و يجلب أحدث رصيد نقاط، و أحدث التفضيلات، و ربما مزيدا "
+"من المهام."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:68
 #: clientgui/sg_ProjectCommandPopup.cpp:114
@@ -3178,13 +3174,21 @@ msgid "Reset project"
 msgstr "صفِّر المشروع"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:80
-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 "يحذف كل الملفات و المهام المرتبطة بهذا المشروع و يجلب مهام جديدة. يمكنك تحديث المشروع أولا لتسليم المهام التامة."
+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:86
 #, fuzzy
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
-msgstr "يفصل الحاسوب عن هذا المشروع. ستفقد المهام التي لا تزال قيد التنفيذ (استخدم 'حدِّث' أولا لتسليم المهام التامة)."
+msgid ""
+"Remove this project.  Tasks in progress will be lost (use 'Update' first to "
+"report any completed tasks)."
+msgstr ""
+"يفصل الحاسوب عن هذا المشروع. ستفقد المهام التي لا تزال قيد التنفيذ (استخدم "
+"'حدِّث' أولا لتسليم المهام التامة)."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:91
 #: clientgui/sg_TaskCommandPopup.cpp:78
@@ -3227,8 +3231,7 @@ msgid "Are you sure you want to remove project '%s'?"
 msgstr "أمتأكد أنك تريد تصفير المشروع '%s'؟"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:257
-#: clientgui/sg_StatImageLoader.cpp:138
-#: clientgui/sg_StatImageLoader.cpp:198
+#: clientgui/sg_StatImageLoader.cpp:138 clientgui/sg_StatImageLoader.cpp:198
 msgid "Remove Project"
 msgstr "أزل المشروع"
 
@@ -3245,8 +3248,7 @@ msgstr ""
 msgid "Work done for this project"
 msgstr ""
 
-#: clientgui/sg_ProjectPanel.cpp:77
-#: clientgui/sg_ProjectsComponent.cpp:123
+#: clientgui/sg_ProjectPanel.cpp:77 clientgui/sg_ProjectsComponent.cpp:123
 msgid "Synchronize projects with account manager system"
 msgstr "زامن المشروعات مع نظام إدارة الحسابات"
 
@@ -3304,8 +3306,7 @@ msgstr "المشروعات:"
 msgid "%s. Work done by %s: %0.2f"
 msgstr "%s. أنجز %s شغلا قدره: %0.2f"
 
-#: clientgui/sg_TaskCommandPopup.cpp:60
-#: clientgui/sg_ViewTabPage.cpp:424
+#: clientgui/sg_TaskCommandPopup.cpp:60 clientgui/sg_ViewTabPage.cpp:424
 msgid "Show graphics"
 msgstr "اعرض الرسوميات"
 
@@ -3413,8 +3414,7 @@ msgstr "المدة المتبقية:"
 msgid "Status: %s"
 msgstr ""
 
-#: clientgui/sg_ViewTabPage.cpp:140
-#: clientgui/sg_ViewTabPage.cpp:280
+#: clientgui/sg_ViewTabPage.cpp:140 clientgui/sg_ViewTabPage.cpp:280
 #, c-format
 msgid "%.1lf"
 msgstr "%.1lf"
@@ -3432,8 +3432,7 @@ msgstr "أمتأكد أنك تريد عرض الرسوميات على حاسوب
 msgid "Application: "
 msgstr "التطبيق:"
 
-#: clientgui/sg_ViewTabPage.cpp:449
-#: clientgui/sg_ViewTabPage.cpp:453
+#: clientgui/sg_ViewTabPage.cpp:449 clientgui/sg_ViewTabPage.cpp:453
 msgid "Time Remaining: "
 msgstr "المدة المتبقية:"
 
@@ -3493,8 +3492,7 @@ msgstr "أدخل مفتاح حساب للمواصلة"
 msgid "Invalid Account Key; please enter a valid Account Key"
 msgstr "مفتاح حساب غير صحيح؛ أدخل مفتاح حساب صحيح"
 
-#: clientgui/ValidateAccountKey.cpp:82
-#: clientgui/ValidateEmailAddress.cpp:86
+#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
 msgid "Validation conflict"
 msgstr "تعارض في التحقق"
 
@@ -3520,17 +3518,13 @@ msgstr ""
 "على سبيل المثال:\n"
 "‪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
+#: clientgui/ValidateURL.cpp:83 clientgui/ValidateURL.cpp:87
+#: clientgui/ValidateURL.cpp:91 clientgui/ValidateURL.cpp:103
+#: clientgui/ValidateURL.cpp:107 clientgui/ValidateURL.cpp:110
 msgid "Invalid URL"
 msgstr "مسار غير صحيح"
 
-#: clientgui/ValidateURL.cpp:84
-#: clientgui/ValidateURL.cpp:88
+#: clientgui/ValidateURL.cpp:84 clientgui/ValidateURL.cpp:88
 #: clientgui/ValidateURL.cpp:92
 msgid ""
 "Please specify a valid URL.\n"
@@ -3541,8 +3535,7 @@ msgstr ""
 "على سبيل المثال:\n"
 "‪http://boincproject.example.com‬"
 
-#: clientgui/ValidateURL.cpp:104
-#: clientgui/ValidateURL.cpp:108
+#: clientgui/ValidateURL.cpp:104 clientgui/ValidateURL.cpp:108
 #, c-format
 msgid "'%s' does not contain a valid host name."
 msgstr "'%s' لا يحوي اسما صحيحا لمضيف."
@@ -3552,10 +3545,8 @@ msgstr "'%s' لا يحوي اسما صحيحا لمضيف."
 msgid "'%s' does not contain a valid path."
 msgstr "'%s' لا يحوي مسارا صحيحا."
 
-#: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:169
-#: clientgui/ViewStatistics.cpp:1965
-#: clientgui/ViewTransfers.cpp:159
+#: clientgui/ViewMessages.cpp:84 clientgui/ViewProjects.cpp:169
+#: clientgui/ViewStatistics.cpp:1965 clientgui/ViewTransfers.cpp:159
 #: clientgui/ViewWork.cpp:182
 msgid "Commands"
 msgstr "أوامر"
@@ -3568,13 +3559,11 @@ msgstr "انسخ كل الرسائل"
 msgid "Copy selected messages"
 msgstr "انسخ الرسائل المختارة"
 
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
+#: clientgui/ViewMessages.cpp:106 clientgui/ViewMessages.cpp:502
 msgid "Show only this project"
 msgstr ""
 
-#: clientgui/ViewMessages.cpp:107
-#: clientgui/ViewMessages.cpp:503
+#: clientgui/ViewMessages.cpp:107 clientgui/ViewMessages.cpp:503
 #, fuzzy
 msgid "Show only the messages for the selected project."
 msgstr "يعرض مخططا واحدا للمشروع المختار"
@@ -3606,8 +3595,7 @@ msgstr "انسخ كل الرسائل"
 msgid "Show messages for all projects."
 msgstr "يعرض مخططا واحدا لكل المشروعات"
 
-#: clientgui/ViewProjects.cpp:219
-#: clientgui/ViewStatistics.cpp:442
+#: clientgui/ViewProjects.cpp:219 clientgui/ViewStatistics.cpp:442
 msgid "Account"
 msgstr "حساب"
 
@@ -3619,8 +3607,7 @@ msgstr "شغل تام"
 msgid "Avg. work done"
 msgstr "معدل الشغل التام"
 
-#: clientgui/ViewProjects.cpp:224
-#: clientgui/ViewTransfers.cpp:187
+#: clientgui/ViewProjects.cpp:224 clientgui/ViewTransfers.cpp:187
 #: clientgui/ViewWork.cpp:233
 msgid "Status"
 msgstr "الحالة"
@@ -3658,8 +3645,7 @@ msgstr "يجري تصفير المشروع…"
 msgid "Removing project..."
 msgstr "يجري استئناف المشروع"
 
-#: clientgui/ViewProjects.cpp:542
-#: clientgui/ViewWork.cpp:598
+#: clientgui/ViewProjects.cpp:542 clientgui/ViewWork.cpp:598
 msgid "Launching browser..."
 msgstr "يجري تشغيل المتصفح…"
 
@@ -3843,13 +3829,11 @@ msgstr "المشروع اللا&حق >"
 msgid "Show chart for next project"
 msgstr "يعرض مخطط المشروع اللاحق"
 
-#: clientgui/ViewStatistics.cpp:2013
-#: clientgui/ViewStatistics.cpp:2410
+#: clientgui/ViewStatistics.cpp:2013 clientgui/ViewStatistics.cpp:2410
 msgid "Hide project list"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2014
-#: clientgui/ViewStatistics.cpp:2410
+#: clientgui/ViewStatistics.cpp:2014 clientgui/ViewStatistics.cpp:2410
 msgid "Use entire area for graphs"
 msgstr ""
 
@@ -3895,16 +3879,11 @@ msgstr "يعرض مخططا واحدا لكل المشروعات"
 msgid "Statistics"
 msgstr "إحصائيات"
 
-#: clientgui/ViewStatistics.cpp:2097
-#: clientgui/ViewStatistics.cpp:2118
-#: clientgui/ViewStatistics.cpp:2139
-#: clientgui/ViewStatistics.cpp:2161
-#: clientgui/ViewStatistics.cpp:2182
-#: clientgui/ViewStatistics.cpp:2203
-#: clientgui/ViewStatistics.cpp:2224
-#: clientgui/ViewStatistics.cpp:2245
-#: clientgui/ViewStatistics.cpp:2266
-#: clientgui/ViewStatistics.cpp:2290
+#: clientgui/ViewStatistics.cpp:2097 clientgui/ViewStatistics.cpp:2118
+#: clientgui/ViewStatistics.cpp:2139 clientgui/ViewStatistics.cpp:2161
+#: clientgui/ViewStatistics.cpp:2182 clientgui/ViewStatistics.cpp:2203
+#: clientgui/ViewStatistics.cpp:2224 clientgui/ViewStatistics.cpp:2245
+#: clientgui/ViewStatistics.cpp:2266 clientgui/ViewStatistics.cpp:2290
 msgid "Updating charts..."
 msgstr "يجري تحديث المخططات…"
 
@@ -3936,8 +3915,7 @@ msgstr ""
 msgid "File"
 msgstr "الملف"
 
-#: clientgui/ViewTransfers.cpp:183
-#: clientgui/ViewWork.cpp:232
+#: clientgui/ViewTransfers.cpp:183 clientgui/ViewWork.cpp:232
 msgid "Progress"
 msgstr "التقدم"
 
@@ -4027,13 +4005,11 @@ msgstr ""
 msgid " (project backoff: "
 msgstr ""
 
-#: clientgui/ViewWork.cpp:186
-#: clientgui/ViewWork.cpp:766
+#: clientgui/ViewWork.cpp:186 clientgui/ViewWork.cpp:766
 msgid "Show active tasks"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:187
-#: clientgui/ViewWork.cpp:767
+#: clientgui/ViewWork.cpp:187 clientgui/ViewWork.cpp:767
 msgid "Show only active tasks."
 msgstr ""
 
@@ -4157,14 +4133,18 @@ msgstr ""
 
 #: clientgui/WelcomePage.cpp:325
 msgid ""
-"You have chosen to add a new volunteer computing project or change which projects\n"
+"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"
+"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"
+"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"
@@ -4194,8 +4174,7 @@ msgstr "أتريد حقا الإلغاء؟"
 msgid "Question"
 msgstr "سؤال"
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
+#: clientgui/wizardex.cpp:377 clientgui/wizardex.cpp:553
 msgid "&Next >"
 msgstr "اللا&حق >"
 
@@ -4232,7 +4211,9 @@ msgid "Pie Ctrl"
 msgstr "تحكمات الرسم البياني"
 
 #: clientgui/mac/MacAccessiblity.cpp:257
-msgid "for accessibility support, please select advanced from the view menu or type command shift a"
+msgid ""
+"for accessibility support, please select advanced from the view menu or type "
+"command shift a"
 msgstr ""
 
 #: clientgui/mac/MacAccessiblity.cpp:302
@@ -4280,8 +4261,7 @@ msgstr ""
 msgid "list is empty"
 msgstr ""
 
-#: clientgui/mac/MacAccessiblity.cpp:858
-#: clientgui/mac/MacAccessiblity.cpp:870
+#: clientgui/mac/MacAccessiblity.cpp:858 clientgui/mac/MacAccessiblity.cpp:870
 #, c-format
 msgid "; row %d; "
 msgstr ""
@@ -4369,14 +4349,17 @@ msgstr "حدد ساعات بدء و توقف استغلال الشبكة في ا
 #~ msgstr ""
 #~ "© 2003-2007 جامعة كاليفورنيا في بركلي.\n"
 #~ "جميع الحقوق محفوظة."
+
 #~ msgid "Click 'Retry now' to transfer the file now"
 #~ msgstr "اضغط 'حاول الآن' لتنقل الملف الآن"
+
 #~ msgid ""
 #~ "Click 'Abort transfer' to delete the file from the transfer queue. This "
 #~ "will prevent you from being granted credit for this result."
 #~ msgstr ""
 #~ "اضغط 'أجهض النقل' لتحذف الملف من طابور النقل. سيحول هذا دون منحك نقاطا "
 #~ "لهذه النتيجة ."
+
 #~ msgid "Aborting result..."
 #~ msgstr "يجري إجهاض نتيجة…"
 
@@ -4387,60 +4370,86 @@ msgstr "حدد ساعات بدء و توقف استغلال الشبكة في ا
 #, fuzzy
 #~ msgid "Don't fetch ATI GPU tasks"
 #~ msgstr "لن يجلب مهام جديدة"
+
 #~ msgid "Web sites"
 #~ msgstr "مواقع وب"
+
 #~ msgid "Connect about every"
 #~ msgstr "اتصل تقريبا كل"
+
 #~ msgid ""
 #~ "this computer is connected to the Internet about every X days\n"
 #~ "(0 if it's always connected)"
 #~ msgstr ""
 #~ "يتصل هذا الحاسوب بالإنترنت مرة كل حوالي س يوما\n"
 #~ "(0 إن كان متصلا على الدوام)"
+
 #~ msgid "days (max. 10)"
 #~ msgstr "يوما (10 بحد أقصى)"
+
 #~ msgid "%s - Options"
 #~ msgstr "‮‪%s‬ - &خيارات"
+
 #~ msgid "Retrieving host information; please wait..."
 #~ msgstr "يجري جلب معلومات المضيف؛ انتظر رجاء…"
+
 #~ msgid "%s - Messages"
 #~ msgstr "‮‪%s‬ - الرسائل"
+
 #~ msgid "Skin:"
 #~ msgstr "كسوة"
+
 #~ msgid "Preferences"
 #~ msgstr "تفضيلات"
+
 #~ msgid "I want to customize my preferences for this computer only."
 #~ msgstr "أريد تطويع تفضيلاتي في هذا الحاسوب فقط"
+
 #~ msgid "Customized Preferences"
 #~ msgstr "التفضيلات المطوعة"
+
 #~ msgid "Upload pending"
 #~ msgstr "الرفع مؤجل"
+
 #~ msgid "Download pending"
 #~ msgstr "التنزيل مؤجل"
+
 #~ msgid "Get help with BOINC"
 #~ msgstr "اطلب مساعدة بخصوص BOINC"
+
 #~ msgid "%s - Detach from %s"
 #~ msgstr "‮‪%s‬ - افصل عن %s"
+
 #~ msgid "Failed to attach to project"
 #~ msgstr "فشل الشبك بالمشروع"
+
 #~ msgid "Failed to attach to account manager"
 #~ msgstr "فشل الشبك بمدير المشروع"
+
 #~ msgid "Attached to account manager"
 #~ msgstr "مشبوك بمدير الحسابات"
+
 #~ msgid "You are now successfully attached to the %s system."
 #~ msgstr "أنت الآن مشبوك بنظام %s."
+
 #~ msgid "You are now successfully attached to this account manager."
 #~ msgstr "أنت الآن مشبوك بمدير الحسابات هذا."
+
 #~ msgid "All projects"
 #~ msgstr "كل المشروعات"
+
 #~ msgid "Attach to project"
 #~ msgstr "اشبك بمشروع"
+
 #~ msgid "Attach to account manager"
 #~ msgstr "اشبك بمدير حسابات"
+
 #~ msgid "Attach to a project"
 #~ msgstr "اشبك بمشروع"
+
 #~ msgid "%s needs to connect to the Internet.  Please click to open %s."
 #~ msgstr "%s يحتاج للاتصال بإنترنت. اضغط لتفتح %s"
+
 #~ msgid ""
 #~ "%s is unable to communicate with a project and needs an Internet "
 #~ "connection.\n"
@@ -4449,6 +4458,7 @@ msgstr "حدد ساعات بدء و توقف استغلال الشبكة في ا
 #~ msgstr ""
 #~ "‮%s لا يستطيع الاتصال بمشروع و يحتاج إلى وصلة إنترنت.\n"
 #~ "اتصل بإنترنت ثم أصدر أمر 'أجر الاتصال عبر الشبكة' من قائمة 'متقدمة'"
+
 #~ msgid ""
 #~ "%s couldn't do Internet communication, and no default connection is "
 #~ "selected.\n"
@@ -4457,34 +4467,49 @@ msgstr "حدد ساعات بدء و توقف استغلال الشبكة في ا
 #~ msgstr ""
 #~ "لم يتمكن %s من الاتصال بإنترنت حيث لا توجد وصلة مبدئية معينة.\n"
 #~ "اتصل بإنترنت أو عين وصلة مبدئية من 'متقدم/خيارات/وصلات'."
+
 #~ msgid "Attached to project"
 #~ msgstr "مشبوك بالمشروع"
+
 #~ msgid "You are now successfully attached to this project."
 #~ msgstr "أنت الآن مشبوك بهذا المشروع."
+
 #~ msgid "Attached to %s"
 #~ msgstr "مشبوك مع %s"
+
 #~ msgid "Detach"
 #~ msgstr "افصل"
+
 #~ msgid "Detaching from project..."
 #~ msgstr "يجري الفصل عن المشروع…"
+
 #~ msgid "Are you sure you want to detach from project '%s'?"
 #~ msgstr "أمتأكد أنك تريد الفصل عن مشروع %s؟"
+
 #~ msgid "Detach from Project"
 #~ msgstr "افصل عن المشروع"
+
 #~ msgid " - user active"
 #~ msgstr " - المستخدم نشط"
+
 #~ msgid " - computation suspended"
 #~ msgstr " - المعالجة معلقة"
+
 #~ msgid " - need disk space"
 #~ msgstr " - بحاجة لمزيد من المساحة على القرص"
+
 #~ msgid "Attach to an additional project"
 #~ msgstr "اشبك بمشروع إضافي"
+
 #~ msgid "To completion"
 #~ msgstr "حتى التمام"
+
 #~ msgid "Attach to a project to begin processing work"
 #~ msgstr "يشبك بمشروع لتبدأ معالجة الشغل"
+
 #~ msgid "%s - Can't find web browser"
 #~ msgstr "%s - تعذر إيجاد متصفح وب"
+
 #~ msgid ""
 #~ "%s tried to display the web page\n"
 #~ "\t%s\n"
@@ -4498,52 +4523,75 @@ msgstr "حدد ساعات بدء و توقف استغلال الشبكة في ا
 #~ "لكنه لم يجد متصفح وب.\n"
 #~ "لتصلح هذا، اضبط المتغير البيئي BROWSER ليشير إلى مسار متصفحك،\n"
 #~ "ثم أعد تشغيل %s."
+
 #~ msgid "Retrying communications for project(s)..."
 #~ msgstr "تجري إعادة الاتصال بالمشروع(ات)…"
+
 #~ msgid ""
 #~ "Required wizard file(s) are missing from the target server.\n"
 #~ "(lookup_account.php/create_account.php)\n"
 #~ msgstr "تعذر إيجاد ملفات مطلوبة للمرشد على الخادوم المحدد.\n"
+
 #~ msgid "User information"
 #~ msgstr "معلومات المستخدم"
+
 #~ msgid "Account Manager URL"
 #~ msgstr "مسار مدير الحسابات"
+
 #~ msgid "Enter the URL of the account manager's web site."
 #~ msgstr "أدخل مسار موقع مدير الحسابات"
+
 #~ msgid "Close BOINC Manager Window."
 #~ msgstr "أغلق نافذة مدير BOINC."
+
 #~ msgid "Exit the %s"
 #~ msgstr "اخرج من %s"
+
 #~ msgid "Attach to &project"
 #~ msgstr "اشبك بمش&روع"
+
 #~ msgid "Attaching to project..."
 #~ msgstr "يجري الشبك بالمشروع…"
+
 #~ msgid "Removal from %s completed."
 #~ msgstr "تم الفصل عن %s."
+
 #~ msgid "Removal succeeded!"
 #~ msgstr "نجح الفصل!"
+
 #~ msgid "Write to disk at most every"
 #~ msgstr "اكتب على القرص بحد أقصى كل"
+
 #~ msgid "Click here to go to %s's website."
 #~ msgstr "انقر هنا لتذهب إلى صفحة %s على الوب"
+
 #~ msgid "ID"
 #~ msgstr "المعرِّف"
+
 #~ msgid "Priority"
 #~ msgstr "الأولوية"
+
 #~ msgid "MessagesGrid"
 #~ msgstr "MessagesGrid"
+
 #~ msgid "Copying selected messages to Clipboard..."
 #~ msgstr "يجري نسخ الرسائل المختارة إلى لوح القصاصات…"
+
 #~ msgid "Info"
 #~ msgstr "معلومات"
+
 #~ msgid "Warning"
 #~ msgstr "تنبيه"
+
 #~ msgid "ProjectsGrid"
 #~ msgstr "جدول المشروعات"
+
 #~ msgid "TransfersGrid"
 #~ msgstr "جدول النقل"
+
 #~ msgid "Aborting transfer(s)..."
 #~ msgstr "يجري إجهاض النقل…"
+
 #~ msgid ""
 #~ "Are you sure you want to abort this file(s) transfer ?\n"
 #~ "NOTE: Aborting a transfer will invalidate a task and you\n"
@@ -4551,22 +4599,28 @@ msgstr "حدد ساعات بدء و توقف استغلال الشبكة في ا
 #~ msgstr ""
 #~ "أمتأكد أنك تريد إجهاض نقل هذا الملف '%s'؟\n"
 #~ "ملاحظة: إجهاض النقل سيلغي المهمة و لن تنال نقاطا عنها."
+
 #~ msgid "Abort File Transfer(s)"
 #~ msgstr "أجهض نقل ملف"
+
 #~ msgid "TasksGrid"
 #~ msgstr "جدول المهام"
+
 #~ msgid ""
 #~ "We'll now guide you through the process of attaching\n"
 #~ "to a project."
 #~ msgstr "سنرشدك الآن في سيرورة الشبك بمشروع."
+
 #~ msgid "&Stop using%s"
 #~ msgstr "أو&قف استخدام %s"
+
 #~ msgid ""
 #~ "We'll now remove this computer from %s.  From now on,\n"
 #~ "attach and detach projects directly from this computer.\n"
 #~ msgstr ""
 #~ "سنزيل الآن هذا الحاسوب من %s. من الآن فصاعدا اشبك و افصل المشروعات من هذا "
 #~ "الحاسوب.\n"
+
 #~ msgid ""
 #~ "We'll now guide you through the process of attaching\n"
 #~ "to an account manager.\n"
@@ -4578,30 +4632,42 @@ msgstr "حدد ساعات بدء و توقف استغلال الشبكة في ا
 #~ "\n"
 #~ "إن كنت تنوي الشبك بمشروع واحد فقط فاضغط 'ألغ' ثم اضغط 'اشبك بمشروع' عوضا "
 #~ "عن هذا"
+
 #~ msgid "Debug Flags"
 #~ msgstr "رايات اصطياد البقّات"
+
 #~ msgid "Project Properties Failure"
 #~ msgstr "فشل في خصائص المشروع"
+
 #~ msgid "Project Properties URL Failure"
 #~ msgstr "فشل في مسار خصائص المشروع"
+
 #~ msgid "Account Creation Disabled"
 #~ msgstr "فتح الحسابات معطل"
+
 #~ msgid "Account Already Exists"
 #~ msgstr "الحساب مفتوح بالفعل"
+
 #~ msgid "Project Already Attached"
 #~ msgstr "المشروع مشبوك بالفعل"
+
 #~ msgid "Project Attach Failure"
 #~ msgstr "فشل شَبكُ المشروع"
+
 #~ msgid "Net Detection Failure"
 #~ msgstr "فشل في تحسس الشبكة"
+
 #~ msgid ""
 #~ "You can copy and paste the URL from your browser's\n"
 #~ "address bar."
 #~ msgstr "يمكنك نسخ و لصق المسار من حقل مسار متصفحك."
+
 #~ msgid "You are already attached to this project."
 #~ msgstr "أنت مشبوك بهذا المشروع بالفعل"
+
 #~ msgid "Enter account key"
 #~ msgstr "أدخل مفتاح الحساب"
+
 #~ msgid ""
 #~ "This project uses an \"account key\" to identify you.\n"
 #~ "\n"
@@ -4611,20 +4677,27 @@ msgstr "حدد ساعات بدء و توقف استغلال الشبكة في ا
 #~ "يستخدم هذا المشروع \"مفتاح حساب\" ليعرفك.\n"
 #~ "\n"
 #~ "زر موقع المشروع و افتح حسابا و سيرسل لك مفتاح الحساب بالبريد"
+
 #~ msgid "An account key looks like:"
 #~ msgstr "يبدو مفتاح الحساب مثل:"
+
 #~ msgid "82412313ac88e9a3638f66ea82186948"
 #~ msgstr "82412313ac88e9a3638f66ea82186948"
+
 #~ msgid "Account key:"
 #~ msgstr "مفتاح الحساب"
+
 #~ msgid "&Accessible View"
 #~ msgstr "منظور الإ&عانة"
+
 #~ msgid ""
 #~ "Accessible views are compatible with accessibility aids such as screen "
 #~ "readers."
 #~ msgstr "تتوافق مناظير الإعانة مع أدوات الإعانة مثل قارءات الشاشة."
+
 #~ msgid "&Grid View"
 #~ msgstr "منظور ال&جدول"
+
 #~ msgid ""
 #~ "%s is going to shutdown the core client it is currently connected to.\n"
 #~ "NOTE: Choosing 'OK' will cause the select new computer dialog to appear \n"
@@ -4633,30 +4706,39 @@ msgstr "حدد ساعات بدء و توقف استغلال الشبكة في ا
 #~ "سيطفئ %s العميل النواة المتصل به حاليا.\n"
 #~ "ملحوظة: الموافقة ستظهر نافذة اختيار حاسوب لتتمكن من الاتصال بعميل نواة "
 #~ "مختلف."
+
 #~ msgid "processors"
 #~ msgstr "معالجات"
+
 #~ msgid "Click here to disable displaying this message in the future."
 #~ msgstr "‏أشِّر هذا لتعطل هذه الرسالة في المستقبل."
+
 #~ msgid "Language Selection:"
 #~ msgstr "اختيار اللغة"
+
 #~ msgid "What language should the manager display by default."
 #~ msgstr "أي لغة على المدير أن يستعمل مبدئيا"
+
 #~ msgid "Reminder Frequency:"
 #~ msgstr "دورية التذكير"
+
 #~ msgid ""
 #~ "How often, in minutes, should the manager remind you of possible "
 #~ "connection events."
 #~ msgstr "كل كم دقيقة على المدير أن يذكرك بأحداث الاتصال المتوقعة"
+
 #~ msgid "Project Comm Failure"
 #~ msgstr "فشل في اتصالات المشروع"
+
 #~ msgid "Google Comm Failure"
 #~ msgstr "فشل في اتصالات جوجل"
+
 #~ msgid "Yahoo Comm Failure"
 #~ msgstr "فشل في اتصالات ياهوو"
+
 #~ msgid ""
 #~ "Report completed work, get latest credit, get latest preferences, and "
 #~ "possibly get more work."
 #~ msgstr ""
 #~ "سلم الشغل المنتهي، و اجلب أحدث النقاط، و أحدث التفضيلات و ربما مزيدا من "
 #~ "الشغل."
-
diff --git a/locale/ar/BOINC-Setup.mo b/locale/ar/BOINC-Setup.mo
index 395567d..b5d5b1c 100644
Binary files a/locale/ar/BOINC-Setup.mo and b/locale/ar/BOINC-Setup.mo differ
diff --git a/locale/ar/BOINC-Setup.po b/locale/ar/BOINC-Setup.po
index 16bd1bc..5dad539 100644
--- a/locale/ar/BOINC-Setup.po
+++ b/locale/ar/BOINC-Setup.po
@@ -5,12 +5,12 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-08-06 16:50-0800\n"
-"PO-Revision-Date: 2015-02-10 12:07-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,13 +23,11 @@ msgstr ""
 msgid "Sorry, this version of %s requires system 10.4 or higher."
 msgstr ""
 
-#: mac_installer/PostInstall.cpp:131
-#: mac_installer/PostInstall.cpp:1211
+#: mac_installer/PostInstall.cpp:131 mac_installer/PostInstall.cpp:1211
 msgid "Yes"
 msgstr ""
 
-#: mac_installer/PostInstall.cpp:132
-#: mac_installer/PostInstall.cpp:1212
+#: mac_installer/PostInstall.cpp:132 mac_installer/PostInstall.cpp:1212
 msgid "No"
 msgstr ""
 
@@ -40,9 +38,11 @@ msgstr ""
 #: mac_installer/PostInstall.cpp:1491
 #, c-format
 msgid ""
-"Users who are permitted to administer this computer will automatically be allowed to run and control %s.\n"
+"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?"
+"Do you also want non-administrative users to be able to run and control %s "
+"on this Mac?"
 msgstr ""
 
 #: mac_installer/PostInstall.cpp:1519
@@ -101,7 +101,8 @@ msgstr ""
 #: mac_installer/uninstall.cpp:796
 #, c-format
 msgid ""
-"Enter your administrator password to completely remove %s from you computer.\n"
+"Enter your administrator password to completely remove %s from you "
+"computer.\n"
 "\n"
 msgstr ""
 
@@ -112,4 +113,3 @@ msgstr ""
 #: mac_installer/uninstall.cpp:1544
 msgid "Continue..."
 msgstr ""
-
diff --git a/locale/ar/BOINC-Web.mo b/locale/ar/BOINC-Web.mo
index 571bb5b..fce480f 100644
Binary files a/locale/ar/BOINC-Web.mo and b/locale/ar/BOINC-Web.mo differ
diff --git a/locale/ar/BOINC-Web.po b/locale/ar/BOINC-Web.po
index e29a1c2..d8571c2 100644
--- a/locale/ar/BOINC-Web.po
+++ b/locale/ar/BOINC-Web.po
@@ -7,8 +7,8 @@ msgstr ""
 "Project-Id-Version: BOINC Web 6.x\n"
 "Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at ssl.berkeley.edu>\n"
 "POT-Creation-Date: 2013-08-22 16:22 PDT\n"
-"PO-Revision-Date: 2015-02-10 13:19-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
+"PO-Revision-Date: 2008-05-08 03:00+0200\n"
+"Last-Translator: Ahmad Gharbeia أحمد غربية <gharbeia at gmail.com>\n"
 "Language-Team: \n"
 "Language: ar\n"
 "MIME-Version: 1.0\n"
@@ -16,10 +16,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.2.1\n"
 "X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-SearchPath-0: doc\n"
 "X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
 "X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
 "X-Poedit-KeywordsList: tra\n"
-"X-Poedit-SearchPath-0: doc\n"
 
 #: projects.inc:14
 msgid "Distributed sensing"
@@ -34,7 +34,10 @@ msgid "Seismology"
 msgstr ""
 
 #: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
+msgid ""
+"The Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to Internet-connected computers.  You must buy a "
+"sensor to participate."
 msgstr ""
 
 #: projects.inc:27
@@ -46,23 +49,24 @@ msgid "Environmental research"
 msgstr ""
 
 #: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
+msgid ""
+"This project is creating a free and continuously updated map of radiation "
+"levels by using sensors connected to volunteers' computers.  You must buy a "
+"sensor to participate."
 msgstr ""
 
 #: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
+msgid ""
+"To participate in these projects you must buy a sensor and attach it to your "
+"computer."
 msgstr ""
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
 msgstr ""
 
-#: projects.inc:50
-#: projects.inc:342
-#: projects.inc:386
-#: projects.inc:435
-#: projects.inc:442
-#: projects.inc:489
+#: projects.inc:50 projects.inc:342 projects.inc:386 projects.inc:435
+#: projects.inc:442 projects.inc:489
 msgid "Private"
 msgstr ""
 
@@ -71,7 +75,11 @@ msgid "Artificial intelligence"
 msgstr ""
 
 #: projects.inc:52
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
+msgid ""
+"Parse and convert semantic nets for use in FreeHAL, an artificial "
+"intelligence that uses semantic networks, stemmers, part of speech "
+"databases, and part of speech taggers in order to imitate human behavior in "
+"conversations."
 msgstr ""
 
 #: projects.inc:58
@@ -87,7 +95,12 @@ msgid "Antimalarial drug discovery"
 msgstr ""
 
 #: projects.inc:73
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
+msgid ""
+"The parasite that causes malaria continues to evolve resistance to available "
+"medication. We therefore urgently need to discover new drugs to replace "
+"existing drugs. Importantly, these new drugs need to target NEW proteins in "
+"the parasite. The FightMalaria at Home project is aimed at finding these new "
+"targets."
 msgstr ""
 
 #: projects.inc:79
@@ -99,7 +112,12 @@ msgid "Protein structure prediction"
 msgstr ""
 
 #: projects.inc:81
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
+msgid ""
+"POEM at HOME uses a computational approach to predict the biologically active "
+"structure of proteins, to understand the signal-processing mechanisms when "
+"the proteins interact with one another, to understand diseases related to "
+"protein malfunction or aggregation, and to develop new drugs on the basis of "
+"the three-dimensions structure of biologically important proteins."
 msgstr ""
 
 #: projects.inc:87
@@ -111,7 +129,11 @@ msgid "Study of protein - ligand interactions"
 msgstr ""
 
 #: projects.inc:89
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
+msgid ""
+"Docking at Home has both bioscience and computer science goals. The project "
+"aims to further knowledge of the atomic details of protein-ligand "
+"interactions and, by doing so, will search for insights into the discovery "
+"of novel pharmaceuticals."
 msgstr ""
 
 #: projects.inc:103
@@ -123,7 +145,11 @@ msgid "Molecular simulations of proteins"
 msgstr ""
 
 #: projects.inc:105
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
+msgid ""
+"GPUGrid.net opens novel computational scenarios by the first full-atom "
+"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
+"New biomedical applications suddenly become possible giving a new role to "
+"computational biology for biomedical research."
 msgstr ""
 
 #: projects.inc:111
@@ -135,11 +161,15 @@ msgid "Genetic linkage analysis"
 msgstr ""
 
 #: projects.inc:113
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
+msgid ""
+"Superlink at Technion helps geneticists all over the world find disease-"
+"provoking genes causing some types of diabetes, hypertension (high blood "
+"pressure), cancer, schizophrenia and many others."
 msgstr ""
 
 #: projects.inc:127
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
+msgid ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
 msgstr ""
 
 #: projects.inc:128
@@ -147,7 +177,11 @@ msgid "Life science research"
 msgstr ""
 
 #: projects.inc:129
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
+msgid ""
+"The Lattice Project supplies computing power to scientists at the University "
+"of Maryland studying evolutionary relationships based on DNA sequence data; "
+"bacterial, plasmid, and virus protein sequences; and biological diversity in "
+"nature reserves. "
 msgstr ""
 
 #: projects.inc:135
@@ -159,20 +193,32 @@ msgid "Epidemiology"
 msgstr ""
 
 #: projects.inc:137
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
+msgid ""
+"Simulation models of the transmission dynamics and health effects of malaria "
+"are an important tool for malaria control. They can be used to determine "
+"optimal strategies for delivering mosquito nets, chemotherapy, or new "
+"vaccines which are currently under development and testing.  Such modeling "
+"is extremely computer intensive, requiring simulations of large human "
+"populations with a diverse set of parameters related to biological and "
+"social factors that influence the distribution of the disease. "
 msgstr ""
 
 #: projects.inc:159
 msgid "University of Washington"
 msgstr ""
 
-#: projects.inc:160
-#: projects.inc:168
+#: projects.inc:160 projects.inc:168
 msgid "Biology"
 msgstr ""
 
 #: projects.inc:161
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
+msgid ""
+"Determine the 3-dimensional shapes of proteins in research that may "
+"ultimately lead to finding cures for some major human diseases. By running "
+"Rosetta at home you will help us speed up and extend our research in ways we "
+"couldn't possibly attempt without your help. You will also be helping our "
+"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
+"Cancer, and Alzheimer's"
 msgstr ""
 
 #: projects.inc:167
@@ -180,7 +226,10 @@ msgid "University of Vienna"
 msgstr ""
 
 #: projects.inc:169
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
+msgid ""
+"Calculate similarities between proteins. SIMAP provides a public database of "
+"the resulting data, which plays a key role in many bioinformatics research "
+"projects."
 msgstr ""
 
 #: projects.inc:175
@@ -196,34 +245,54 @@ msgid "Climate study"
 msgstr ""
 
 #: projects.inc:189
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
+msgid ""
+"Investigate the approximations that have to be made in state-of-the-art "
+"climate models. By running the model thousands of times we hope to find out "
+"how the model responds to slight tweaks to these approximations - slight "
+"enough to not make the approximations any less realistic. This will allow us "
+"to improve our understanding of how sensitive our models are to small "
+"changes and also to things like changes in carbon dioxide and the sulphur "
+"cycle. This will allow us to explore how climate may change in the next "
+"century under a wide range of different scenarios."
 msgstr ""
 
 #: projects.inc:196
 msgid "Astronomy, Physics, and Chemistry"
 msgstr ""
 
-#: projects.inc:202
-#: projects.inc:241
-#: projects.inc:249
+#: projects.inc:202 projects.inc:241 projects.inc:249
 msgid "Astronomy"
 msgstr ""
 
 #: projects.inc:203
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
+msgid ""
+"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
+"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
+"Universe. We will measure physical parameters (such as stellar mass surface "
+"density, star formation rate surface density, attenuation, and first-order "
+"star formation history) on a resolved pixel-by-pixel basis using spectral "
+"energy distribution (SED) fitting techniques in a distributed computing mode."
 msgstr ""
 
 #: projects.inc:225
 msgid "University of Texas at Austin"
 msgstr ""
 
-#: projects.inc:226
-#: projects.inc:257
+#: projects.inc:226 projects.inc:257
 msgid "Chemistry"
 msgstr ""
 
 #: projects.inc:227
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
+msgid ""
+"A common problem in theoretical chemistry, condensed matter physics and "
+"materials science is the calculation of the time evolution of an atomic "
+"scale system where, for example, chemical reactions and/or diffusion occur. "
+"Generally the events of interest are quite rare (many orders of magnitude "
+"slower than the vibrational movements of the atoms), and therefore direct "
+"simulations, tracking every movement of the atoms, would take thousands of "
+"years of computer calculations on the fastest present day computer before a "
+"single event of interest can be expected to occur.  Our research group is "
+"interested in calculating the long time dynamics of systems."
 msgstr ""
 
 #: projects.inc:240
@@ -231,7 +300,10 @@ msgid "University of Illinois at Urbana-Champaign"
 msgstr ""
 
 #: projects.inc:242
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
+msgid ""
+"The goal of Cosmology at Home is to search for the model that best describes "
+"our Universe and to find the range of models that agree with the available "
+"astronomical particle physics data."
 msgstr ""
 
 #: projects.inc:248
@@ -239,7 +311,10 @@ msgid "Rensselaer Polytechnic Institute"
 msgstr ""
 
 #: projects.inc:250
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
+msgid ""
+"The goal of Milkyway at Home is to create a highly accurate three dimensional "
+"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
+"Survey."
 msgstr ""
 
 #: projects.inc:256
@@ -247,7 +322,13 @@ msgid "Leiden University, The Netherlands"
 msgstr ""
 
 #: projects.inc:258
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
+msgid ""
+"Surface science calculations using Classical Dynamics.  Leiden Classical "
+"allows volunteers, students and other scientist to submit their personal "
+"calculations to the grid. Each user has his own personal queue for Classical "
+"Dynamics jobs. In this way students have used the grid to simulate liquid "
+"argon, or to test the validity of the ideal gas law by actually doing the "
+"simulations through the grid."
 msgstr ""
 
 #: projects.inc:272
@@ -259,25 +340,36 @@ msgid "Astrophysics"
 msgstr ""
 
 #: projects.inc:274
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
+msgid ""
+"Search for spinning neutron stars (also called pulsars) using data from the "
+"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
+"observatory.  Einstein at Home is a World Year of Physics 2005 project "
+"supported by the American Physical Society (APS) and by a number of "
+"international organizations."
 msgstr ""
 
-#: projects.inc:288
-#: projects.inc:296
+#: projects.inc:288 projects.inc:296
 msgid "CERN (European Organization for Nuclear Research)"
 msgstr ""
 
-#: projects.inc:289
-#: projects.inc:297
+#: projects.inc:289 projects.inc:297
 msgid "Physics"
 msgstr ""
 
 #: projects.inc:290
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
+msgid ""
+"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
+"European Organization for Nuclear Research, the world's largest particle "
+"physics laboratory.  It is the most powerful instrument ever built to "
+"investigate on particles proprieties. LHC at home runs simulations to improve "
+"the design of LHC and its detectors."
 msgstr ""
 
 #: projects.inc:298
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
+msgid ""
+"This project uses CERN-developed virtual machine technology for full-fledged "
+"LHC event physics simulation on volunteer computers.  Requires that you "
+"install VirtualBox on your computer"
 msgstr ""
 
 #: projects.inc:304
@@ -289,7 +381,12 @@ msgid "Astrophysics, astrobiology"
 msgstr ""
 
 #: projects.inc:306
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
+msgid ""
+"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
+"goal is to detect intelligent life outside Earth. One approach, known as "
+"radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
+"signals from space. Such signals are not known to occur naturally, so a "
+"detection would provide evidence of extraterrestrial technology."
 msgstr ""
 
 #: projects.inc:320
@@ -301,7 +398,11 @@ msgid "Chemical engineering and nanotechnology"
 msgstr ""
 
 #: projects.inc:322
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
+msgid ""
+"The study of molecular magnets and controlled nanoscale magnetism.  These "
+"magnetic molecules may be used to develop tiny magnetic switches, with "
+"applications in medicine (such as local tumor chemotherapy) and "
+"biotechnology."
 msgstr ""
 
 #: projects.inc:329
@@ -317,7 +418,10 @@ msgid "Physics, biochemistry, and others"
 msgstr ""
 
 #: projects.inc:336
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
+msgid ""
+"The objective of CAS at home is to encourage and assist scientists in China to "
+"adopt the technologies of volunteer computing and volunteer thinking for "
+"their research."
 msgstr ""
 
 #: projects.inc:343
@@ -325,11 +429,12 @@ msgid "Mathematics, physics, evolution"
 msgstr ""
 
 #: projects.inc:344
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
+msgid ""
+"Yoyo at home is an adapter between BOINC and several existing volunteer "
+"computing projects: ECM, Muon, Evolution at home, and distributed.net"
 msgstr ""
 
-#: projects.inc:349
-#: projects.inc:505
+#: projects.inc:349 projects.inc:505
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 msgstr ""
 
@@ -338,7 +443,11 @@ msgid "European research projects"
 msgstr ""
 
 #: projects.inc:351
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
+msgid ""
+"The EDGeS at Home Beta project integrates volunteer computing into the service "
+"grid network of Europe by allowing service grids to send workunits to be "
+"processed by the volunteers of this project. The scientific projects covered "
+"by the project include math, physics, biology, etc."
 msgstr ""
 
 #: projects.inc:357
@@ -362,7 +471,11 @@ msgid "Medical, environmental and other humanitarian research"
 msgstr ""
 
 #: projects.inc:367
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
+msgid ""
+"To further critical non-profit research on some of humanity's most pressing "
+"problems by creating the world's largest volunteer computing grid.  Research "
+"includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"clean water and many more."
 msgstr ""
 
 #: projects.inc:373
@@ -381,21 +494,18 @@ msgstr ""
 msgid "Simulation of quantum computing; Goldbach's conjecture."
 msgstr ""
 
-#: projects.inc:428
-#: projects.inc:436
+#: projects.inc:428 projects.inc:436
 msgid "Cryptography"
 msgstr ""
 
 #: projects.inc:437
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
+msgid ""
+"Attempt to decode 3 original Enigma messages. The signals were intercepted "
+"in the North Atlantic in 1942 and are believed to be unbroken."
 msgstr ""
 
-#: projects.inc:443
-#: projects.inc:482
-#: projects.inc:490
-#: projects.inc:498
-#: projects.inc:506
-#: projects.inc:546
+#: projects.inc:443 projects.inc:482 projects.inc:490 projects.inc:498
+#: projects.inc:506 projects.inc:546
 msgid "Mathematics"
 msgstr ""
 
@@ -412,11 +522,19 @@ msgid "Factorization of large integers"
 msgstr ""
 
 #: projects.inc:451
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
+msgid ""
+"NFS at Home is a research project that uses Internet-connected computers to do "
+"the lattice sieving step in the Number Field Sieve factorization of large "
+"integers. As a young school student, you gained your first experience at "
+"breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
+"NFS at Home is a continuation of that experience, only with integers that are "
+"hundreds of digits long."
 msgstr ""
 
 #: projects.inc:457
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
+msgid ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
 msgstr ""
 
 #: projects.inc:458
@@ -424,7 +542,11 @@ msgid "Software testing"
 msgstr ""
 
 #: projects.inc:459
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
+msgid ""
+"The aim of this project is to provide a powerful distributed computing "
+"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
+"well as others Lithuanian academic institutions.  Current applications "
+"involve the study of Monte-Carlo based software testing."
 msgstr ""
 
 #: projects.inc:481
@@ -432,11 +554,20 @@ msgid "Mathematical Institute of Leiden University / Kennislink"
 msgstr ""
 
 #: projects.inc:483
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
+msgid ""
+"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
+"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
+"product of the distinct prime factors of n. The ABC conjecture says that "
+"there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for "
+"any real h > 1. The ABC conjecture is currently one of the greatest open "
+"problems in mathematics. If it is proven to be true, a lot of other open "
+"problems can be answered directly from it."
 msgstr ""
 
 #: projects.inc:491
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
+msgid ""
+"Primegrid has multiple projects searching for different forms of very large "
+"prime numbers, including searching for the largest known prime number."
 msgstr ""
 
 #: projects.inc:497
@@ -444,11 +575,15 @@ msgid "Hochschule RheinMain University of Applied Sciences"
 msgstr ""
 
 #: projects.inc:499
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
+msgid ""
+"Search for counterexamples to two conjectures related to the identification "
+"of prime numbers"
 msgstr ""
 
 #: projects.inc:507
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
+msgid ""
+"Find all the generalized binary number systems (in which bases are matrices "
+"and digits are vectors) up to dimension 11."
 msgstr ""
 
 #: docutil.php:21
@@ -474,11 +609,17 @@ msgid "%s for %s (%s MB)"
 msgstr ""
 
 #: download.php:87
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others. <p> After installing BOINC on your computer, you can connect it to as many of these projects as you like."
+msgid ""
+"BOINC is a program that lets you donate your idle computer time to science "
+"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, and many others. <p> After installing BOINC on your "
+"computer, you can connect it to as many of these projects as you like."
 msgstr ""
 
 #: download.php:89
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
+msgid ""
+"You may run this software on a computer only if you own the computer or have "
+"the permission of its owner."
 msgstr ""
 
 #: download.php:131
@@ -489,8 +630,7 @@ msgstr ""
 msgid "Release notes"
 msgstr ""
 
-#: download.php:133
-#: index.php:85
+#: download.php:133 index.php:85
 msgid "Help"
 msgstr ""
 
@@ -512,20 +652,34 @@ msgstr ""
 
 #: help.php:12
 #, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
+msgid ""
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who "
+"can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"through the process of installing and using BOINC; %s troubleshoot any "
+"problems you might have."
 msgstr ""
 
 #: help.php:21
 #, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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."
+msgid ""
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. "
+"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 ""
 
 #: help.php:28
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
+msgid ""
+"The best way to get help is by voice, for which you need either built-in "
+"microphone and speakers or an external headset for your computer.  You can "
+"also use Skype's text-based chat system or regular email (if you don't have "
+"Skype) to communicate with Help Volunteers."
 msgstr ""
 
 #: help.php:31
-msgid "Volunteers speaking several languages are available. Please select a language:"
+msgid ""
+"Volunteers speaking several languages are available. Please select a "
+"language:"
 msgstr ""
 
 #: help.php:47
@@ -534,16 +688,22 @@ msgstr ""
 
 #: help.php:50
 #, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
+msgid ""
+"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+"Volunteer%s.  It's a great way to help the cause of scientific research and "
+"volunteer computing - and it's fun!"
 msgstr ""
 
 #: help.php:56
 #, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
+msgid ""
+"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
 msgstr ""
 
 #: help_funcs.php:107
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
+msgid ""
+"BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
+"or the University of California."
 msgstr ""
 
 #: help_funcs.php:110
@@ -594,9 +754,7 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: index.php:86
-#: index.php:123
-#: index.php:174
+#: index.php:86 index.php:123 index.php:174
 msgid "Documentation"
 msgstr ""
 
@@ -610,12 +768,19 @@ msgstr ""
 
 #: index.php:94
 #, php-format
-msgid " Use the idle time on your computer (Windows, Mac, or Linux) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:  %sChoose%s projects  %sDownload%s and run BOINC software  %sEnter%s an email address and password. "
+msgid ""
+" Use the idle time on your computer (Windows, Mac, or Linux) to cure "
+"diseases, study global warming, discover pulsars, and do many other types of "
+"scientific research.  It's safe, secure, and easy:  %sChoose%s projects  "
+"%sDownload%s and run BOINC software  %sEnter%s an email address and "
+"password. "
 msgstr ""
 
 #: index.php:105
 #, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
+msgid ""
+"Or, if you run several projects, try an %saccount manager%s such as "
+"%sGridRepublic%s or %sBAM!%s. "
 msgstr ""
 
 #: index.php:121
@@ -627,11 +792,15 @@ msgid "Software updates"
 msgstr ""
 
 #: index.php:131
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving "
+"you the computing power of thousands of CPUs."
 msgstr ""
 
 #: index.php:135
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
 msgstr ""
 
 #: index.php:140
@@ -708,7 +877,8 @@ msgstr ""
 
 #: index.php:265
 #, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
+msgid ""
+"Open-source software for %svolunteer computing%s and %sgrid computing%s."
 msgstr ""
 
 #: index.php:278
@@ -724,3 +894,423 @@ msgstr ""
 msgid "News is available as an %sRSS feed%s"
 msgstr ""
 
+# The charset used for the text in this file (please try to use UTF-8 if possible)
+#~ msgid "CHARSET"
+#~ msgstr "UTF-8"
+
+# #######################################
+# download.php 2006/08/03 by je2bwm
+# #######################################
+# msgstr "Download BOINC"
+#~ msgid "DL_DOWNLOAD"
+#~ msgstr "نزِّل BOINC"
+
+# msgstr "%s for %s (%s MB)"
+#~ msgid "DL_VERSION_LNAME_SIZE"
+#~ msgstr "%s لمنصة %s <span dir=\"rtl\">(%s م بايت)</span>"
+
+# msgstr " BOINC is a program that lets you donate        your idle computer time to science projects like        SETI at home, Climateprediction.net, Rosetta at home,        World Community Grid, and many others.        <p>        After installing BOINC on your computer,        you can connect it to as many of these projects as you like.        <p>"
+#~ msgid "DL_WHATS_BOINC"
+#~ msgstr ""
+#~ "<p>BOINC برمجية تمكنك من التبرع بقوة حاسوبك غير المستغلة لمشروعات علمية "
+#~ "مثل <span xml:lang=\"en\" dir=\"ltr\">SETI at home</span> و <span xml:"
+#~ "lang=\"en\" dir=\"ltr\">Climateprediction.net</span> و Rosetta at home "
+#~ "و <span xml:lang=\"en\" dir=\"ltr\">World Community Grid</span> "
+#~ "و غيرها.</p><p>بعد تثبيت BOINC على حاسوبك يمكنك الشبك بأي عدد تريد "
+#~ "من تلك المشروعات.</p>"
+
+# msgstr "System requirements"
+#~ msgid "DL_SYSTEMREQ"
+#~ msgstr "متطلبات النظام"
+
+# msgstr "Release notes"
+#~ msgid "DL_RELNOTES"
+#~ msgstr "ملاحظات الإصدارة"
+
+# msgstr "Troubleshooting"
+#~ msgid "DL_TROUBLE"
+#~ msgstr "علاج المشكلات"
+
+# msgstr "Other systems"
+#~ msgid "DL_OTHERSYS"
+#~ msgstr "نظم أخرى"
+
+# msgstr "All versions"
+#~ msgid "DL_ALLVERSIONS"
+#~ msgstr "كل الإصدارات"
+
+# msgstr "If your computer is not of one of the above types, you can"
+#~ msgid "DL_IF_OTHERTYPES"
+#~ msgstr "إن لم يكن حاسوبك من أي من الأنواع أعلاه فيمكنك"
+
+# msgstr "%s make your own client software %s or"
+#~ msgid "DL_MAKEYOUROWN"
+#~ msgstr "%s عمل البرمجية العميلة الخاصة بك %s أو"
+
+# msgstr "%s download executables from a third-party site %s (available for Solaris/Opteron, Linux/Opteron, Linux/PPC, HP-UX, and FreeBSD, and others)."
+#~ msgid "DL_DL_FROM3RDP"
+#~ msgstr ""
+#~ "%s تنزيل التنفيذيات من موقع آخر %s (متاح لكل من <span title=\"Solaris/"
+#~ "Opteron\">سولاريس/أبتيرون</span، و <span title=\"Linux/Opteron"
+#~ "\">لينكس/أبتيرون</span>، و <span title=\"Linux/PPCs\">لينكس/"
+#~ "PPC<span>، و <span xml:lang=\"en\" dir=\"ltr\">HP-UX</span>، و "
+#~ "<span xml:lang=\"en\" dir=\"ltr\">FreeBSD</span> و غيرها."
+
+# msgstr "BOINC: compute for science"
+#~ msgid "DL_DOWNLOAD_TITLE"
+#~ msgstr "BOINC: حوسبة لأجل العلم"
+
+# #############################################
+# system_requirements.php by je2bwm 2006/08/07
+# #############################################
+# msgstr "System requirements"
+#~ msgid "SRQ_PAGE_TITLE"
+#~ msgstr "متطلبات النظام"
+
+# msgstr "Your computer must satisfy the following requirements to run BOINC. BOINC-based projects may have additional requirements."
+#~ msgid "SRQ_INTRO"
+#~ msgstr ""
+#~ "ينبغي أن تتوافر في حاسوبك المتطلبات التالية لكي يتمكن من تشغيل BOINC. كما "
+#~ "قد يكون لكل مشروع من مشروعات BOINC متطلبات إضافية."
+
+# msgstr "Windows"
+#~ msgid "SRQ_MSWIN"
+#~ msgstr "ويندوز"
+
+# msgstr "Operating systems"
+#~ msgid "SRQ_OS"
+#~ msgstr "نظم التشغيل"
+
+# msgstr "Windows 98 or later"
+#~ msgid "SRQ_MSWIN_REQ_OS"
+#~ msgstr "ويندوز 98 أو ما بعده"
+
+# msgstr "Minimum hardware"
+#~ msgid "SRQ_MIN_HARDWARE"
+#~ msgstr "الحد الأدنى من العتاد"
+
+# msgstr "Pentium 233 MHz (Recommended: Pentium 500 MHz or greater)"
+#~ msgid "SRQ_MSWIN_REQ_CPU"
+#~ msgstr "بنتيوم 233 م هرتز (يفضل: بنتيوم 500 م هرتز أو أكثر)"
+
+# msgstr "64 MB RAM (Recommended: 128 MB RAM or greater)"
+#~ msgid "SRQ_MSWIN_REQ_RAM"
+#~ msgstr "64 م بايت رام (بفضل: 128 م بايت رام أو أكثر)"
+
+# msgstr "20 MB disk space"
+#~ msgid "SRQ_MSWIN_REQ_DISK"
+#~ msgstr "20 م بايت على القرص"
+
+# msgstr "Macintosh"
+#~ msgid "SRQ_APPLMAC"
+#~ msgstr "ماكنتوش"
+
+# msgstr "Mac OS X 10.3 and later"
+#~ msgid "SRQ_APPLMAC_REQ_OS"
+#~ msgstr "ماك أوإس X <span dir=\"rtl\">10.3</span> أو ما بعده"
+
+# msgstr "Macintosh computer with an Intel x86or PowerPC G3, G4, or G5 processor"
+#~ msgid "SRQ_APPLMAC_REQ_CPU"
+#~ msgstr ""
+#~ "حواسيب ماكنتوش ذات معالجات إنتل x86 أو PowerPC <span dir=\"rtl\">G3</"
+#~ "span> أو G4 أو G5"
+
+# msgstr "128 MB RAM (Recommended: 256 MB RAM or greater)"
+#~ msgid "SRQ_APPLMAC_REQ_RAM"
+#~ msgstr "128 م بايت رام (يفضل: 256 م بايت رام أو أكثر)"
+
+# msgstr "200 MB disk space"
+#~ msgid "SRQ_APPLMAC_REQ_DISK"
+#~ msgstr "200 م بايت على القرص"
+
+# msgstr "Linux"
+#~ msgid "SRQ_LINUX"
+#~ msgstr "لينكس"
+
+# msgstr "Linux kernel 2.2.14 or higher"
+#~ msgid "SRQ_LINUX_REQ_KERNEL"
+#~ msgstr "نواة لينكس 2.2.14 أو ما بعدها"
+
+# msgstr "glibc 2.3.2 or higher"
+#~ msgid "SRQ_LINUX_REQ_GLIBC"
+#~ msgstr "glibc <span dir=\"rtl\">2.3.2</span> أو ما بعدها"
+
+# msgstr "XFree86-3.3.6 or higher"
+#~ msgid "SRQ_LINUX_REQ_XFREE86"
+#~ msgstr "<span dir=\"ltr\">XFree86-3.3.6</span> أو ما بعدها"
+
+# msgstr "gtk+2.0 or higher"
+#~ msgid "SRQ_LINUX_REQ_GTKPLUS"
+#~ msgstr "gtk+ <span dir=\"rtl\">2.0</span> أو ما بعدها"
+
+# msgstr "Pentium 500 MHz or greater"
+#~ msgid "SRQ_LINUX_REQ_CPU"
+#~ msgstr "بنتيوم 500 م هرتز أو أكثر"
+
+# msgstr "64 MB RAM"
+#~ msgid "SRQ_LINUX_REQ_RAM"
+#~ msgstr "64 م بايت رام"
+
+# msgstr "50 MB disk space"
+#~ msgid "SRQ_LINUX_REQ_DISK"
+#~ msgstr "50 م بايت على القرص"
+
+# #############################################
+# release_notes.php
+# #############################################
+# msgstr "Release notes"
+#~ msgid "RLN_PAGE_TITLE"
+#~ msgstr "ملاحظات الإصدارة"
+
+# msgstr "What's new in %s"
+#~ msgid "RLN_WHATS_NEW"
+#~ msgstr "ما الجديد في %s"
+
+# msgstr "Installing"
+#~ msgid "RLN_INSTALLING"
+#~ msgstr "التثبيت"
+
+# msgstr "Uninstalling"
+#~ msgid "RLN_UNINSTALLING"
+#~ msgstr "الإزالة"
+
+# msgstr "Known issues"
+#~ msgid "RLN_KNOWN_ISSUES"
+#~ msgstr "مشكلات معروفة"
+
+# msgstr "(Windows) In rare cases, installation may fail because of an existing installation of BOINC.  If this happens: %s Quit BOINC if it's running, and uninstall BOINC using %s Start/Control Panel/Add and remove programs%s. Install the new version again. %s If that fails, reinstall the version of BOINC you were previously running (old versions can be found %shere%s). Uninstall it as above, then install the new version. %s If that fails, download the %sWindows Install Clean Up%s utili [...]
+#~ msgid "RLN_WIN_INSTALL_PROBLEMS"
+#~ msgstr ""
+#~ "(ويندوز) في حالات نادرة قد يفشل التثبيت بسبب وجود تثبيتة قائمة من BOINC. "
+#~ "إن حدث هذا:%s أغلق BOINC إن كان عاملا و أزل BOINC مستخدما  <kdb>ابدأ/"
+#~ "لوحة التحكم/ركب و أزل البرمجيات</kbd>. ثبت اللإصدارة الجديدة مجددا. "
+#~ "%s إن فشل هذا الإجراء فأعد تثبيت إصدارة BOINC السابقة التي كنت تشغلها "
+#~ "(الإصدارات القديمة %sمتاحة للتنزيل%s)، ثم أزلها كما هو مشروح أعلاه "
+#~ "و أعد تثبيت الجديدة.%s فإن فشل هذا نزَّل %sأداة تنظيف تثبيتات ويندوز%s "
+#~ "من ميكروسوفت و شغلها. تظهر الإصدارة القديمة من BOINC إما باسم <span "
+#~ "dir\"ltr\">BOINC.msi</span> أو كأيقونة معطوبة بالامتداد <span dir="
+#~ "\"ltr\">.msi</span> (ستكون أعلى القائمة). انقر عليها لتخترها ثم أصدر أمر "
+#~ "الإزالة. بعد تمام الإزالة أعد تشغيل حاسوبك، ثم ثبت الإصدارة الجديدة. "
+#~ "(تحذير: لا تعبث بملفات <span dir=\"ltr\">.msi</span> الأخرى و إلا قد "
+#~ "لا تتمكن من إدارة تثبيتاتك الأخرى). %s"
+
+# msgstr "Troubleshooting BOINC"
+#~ msgid "RLN_TROUBLESHOOT"
+#~ msgstr "علاج مشكلات BOINC"
+
+# msgstr "Support for 'Account managers' - web sites that let you browse BOINC projects, attach/detach, change resource share and settings, all with point-and-click simplicity. Account managers are also great if you have several computers - you just have to make changes once."
+#~ msgid "RLN_NEWF_5_4_AM"
+#~ msgstr ""
+#~ "الدعم الفني لمديري الحسابات - هي مواقع تمكنك من تصفح مشروعات BOINC و "
+#~ "الشبك إليها و الفصل عنها و تغيير تضبيطات المشاركة في الموارد عن "
+#~ "طريق استمارات بسيطة. مديرو الحسابات مفيدون للغاية إن كنت تشغل BOINC "
+#~ "على حواسيب عديدة حيث يمكنك باستخدامها إحداث التغييرات في موضع واحد."
+
+# msgstr "General preferences can be overridden by a local file; details are %s here %s."
+#~ msgid "RLN_NEWF_5_4_PREF_OVERRIDE"
+#~ msgstr ""
+#~ "التضبيطات العامة تتسلط عليها التضبيطات في ملف محلي؛ %sتفاصيل ذلك مشروحة "
+#~ "في صفحة أخرى%s."
+
+# msgstr "BOINC now alerts you whenever it needs you to create a network connection."
+#~ msgid "RLN_NEWF_5_4_ALERTS_CONNECT"
+#~ msgstr "ينبهك BOINC الآن عند حاجته إلى عمل اتصال عبر الشبكة."
+
+# msgstr "The BOINC Manager offers two different interfaces:  'Simple' (small, graphical, skinnable)  and 'Advanced' (maximum information).  The Simple GUI allows local editing of preferences.  You can switch back and forth between Simple and Advanced. "
+#~ msgid "RLN_5_8_SIMPLE_GUI"
+#~ msgstr ""
+#~ "توجد لمدير BOINC و اجهتان مختلفتان: 'بسيطة' (صغيرة، رسومية، قابلة "
+#~ "للتكسية) و 'متقدمة' (معلومات أكثر). تتيح الواجهة البسيطة تحرير "
+#~ "التضبيطات المحلية. يمكنك التحويل ما بين الواجهتين، البسيطة و "
+#~ "المتقدمة."
+
+# msgstr " CPU throttling: you can reduce CPU heat by limiting  the fraction of time that BOINC computes. "
+#~ msgid "RLN_5_8_THROTTLE"
+#~ msgstr ""
+#~ "كبح المعالج: يمكنك تقليل تسخين المعالج عن طريق تقليل حصة الوقت التي "
+#~ "يستغلها BOINC في الحسبانات."
+
+# msgstr " Improved scheduling policies avoid missing job deadlines  even on a slow computer with lots of projects. "
+#~ msgid "RLN_5_8_SCHED"
+#~ msgstr ""
+#~ "سياسات جدولة محسنة تتلافى التأخر عن مواعيد تسليم المهمات حتى على الحواسيب "
+#~ "البطيئة العاملة على مشروعات عديدة."
+
+# msgstr " You can limit the amount of memory used by BOINC;  this lets you compute all the time without losing performance. "
+#~ msgid "RLN_5_8_MEM"
+#~ msgstr ""
+#~ "يمكنك تحديد قدر الذاكرة الذي يستغله BOINC؛ يجعلك هذا تشغل المهمات دون أن "
+#~ "تبطأ حاسوبك."
+
+# msgstr " Mac OS X version runs applications in an unpriviledged account,  increasing security. "
+#~ msgid "RLN_5_8_SANDBOX"
+#~ msgstr ""
+#~ "إصدارة ماك أوإس X تشغل التطبيقات في حساب غير متميز، مما يزيد الأمان."
+
+# msgstr " Snooze button (in the system tray icon) lets you  stop computing for one hour. "
+#~ msgid "RLN_5_8_SNOOZE"
+#~ msgstr "زر للإرجاء (في أيقونة صينية النظام) يجعلك توقف الحسبانات لساعة."
+
+# msgstr "We recommend that all BOINC users upgrade to %s."
+#~ msgid "RLN_RECOMMEND_LATEST_VERSION"
+#~ msgstr "نحثُّ كل متخدمي BOINC على الترقية إلى %s."
+
+# msgstr "A detailed revision history is %shere%s."
+#~ msgid "RLN_LINK2_VERSION_HISTORY"
+#~ msgstr "%sالتأريخ التفصيلي للإصدارات%s."
+
+# msgstr "Windows"
+#~ msgid "RLN_MSWIN"
+#~ msgstr "ويندوز"
+
+# msgstr "Macintosh"
+#~ msgid "RLN_APPLMAC"
+#~ msgstr "ماكنتوش"
+
+# msgstr "Linux"
+#~ msgid "RLN_LINUX"
+#~ msgstr "لينكس"
+
+# msgstr "BOINC can be installed in any of several modes:"
+#~ msgid "RLN_MSWIN_INSTALL_MODES"
+#~ msgstr "يمكن تثبيت BOINC في أي من الأطوار التالية:"
+
+# msgstr "Single-user installation"
+#~ msgid "RLN_SINGLE_USER_INSTALL"
+#~ msgstr "تثبيته مستخدم واحد"
+
+# msgstr "This is the recommended mode. BOINC will run while you (the installing user) are logged in. BOINC is listed in the Start menu of you,but not other users. The 'Show graphics' command in the BOINC managerworks only for you. The BOINC screensaver shows applicationgraphics only for you (other users can run the screensaver but will see  textual information only)."
+#~ msgid "RLN_MSWIN_INSTALL_SINGLE_USER_DESC"
+#~ msgstr ""
+#~ "هذا هو الطور الموصى به؛ فيه يعمل BOINC طالما أنك (المستخدم المثبِّت) "
+#~ "والج إلى النظام. سيدرج BOINC في قائمة <kbd>ابدأ</kbd> لك أنت وحدك و "
+#~ "ليس لمستخدمي الحاسوب الآخرين، كما سيعمل أمر <kbd>أظهر الرسوميات</kbd> في "
+#~ "مدير BOINC لك وحدك، كما لن يُظهر حافظ الشاشة الرسوميات لغيرك (سيتمكن "
+#~ "المستخدمون الآخرون من تشغيل حافظ الشاشة لكنهم لن يروا سوى معلومات نصية "
+#~ "و حسب)."
+
+# msgstr "Shared installation"
+#~ msgid "RLN_SHARED_INSTALL"
+#~ msgstr "التثبيت المشترك"
+
+# msgstr "BOINC runs whenever any user is logged in. BOINC is listed in the Start menu of all users. While BOINC is running, it runs as a particular user (either the first user to log in, or the first to run BOINC). The 'Show graphics' command in the BOINC manager works only for this user. The BOINC screensaver shows application graphics only for this user (other users can run the screensaver but will see  textual information only)."
+#~ msgid "RLN_MSWIN_INSTALL_SHARED_DESC"
+#~ msgstr ""
+#~ "يعمل BOINC في أي وقت يكون فيه مستخدم ما والجًا إلى النظام؛ سيظهر BOINC في "
+#~ "قائمة <kbd>ابدأ</kbd> لكل المستخدمين، و حينما يكون BOINC عاملا فإنه "
+#~ "يعمل في سياق مستخدم ما (إما أول من يلج إلى النظام، أو أول من يشغله "
+#~ "يدويا، حسب التضبيطات)، و لا يعمل أمر <kbd>أظهر الرسوميات</kbd> إلا "
+#~ "لهذا المستخدم، كما لا يُظهر حافظ الشاشة الرسوميات إلا لذات المستخدم (سيكون "
+#~ "بوسع الآخرين رؤية المعلومات النصية و حسب)."
+
+# msgstr "Service installation"
+#~ msgid "RLN_WIN_SERVICE_INSTALL"
+#~ msgstr "التثبيتة كخدمة"
+
+# msgstr "BOINC runs all the time (even when no one is logged in). BOINC is listed in the Start menu of the installing user, but not other users.  The 'Show graphics' command in the BOINC manager will not work for any user. The BOINC screensaver will only show textual information."
+#~ msgid "RLN_MSWIN_INSTALL_WINSERVICE_DESC"
+#~ msgstr ""
+#~ "يعمل BOINC طوال الوقت (حتى عندما لا يكون أحد والجا)، و يظهر BOINC في "
+#~ "قائمة <kbd>ابدأ</kbd> للمستخدم الذي ثبته فقط و ليس للآخرين، كما لن "
+#~ "يعمل أمر <kbd>أظهر الرسوميات</kbd> لأي مستخدم، و لن يظهر حافظ الشاشة "
+#~ "سوى المعلومات النصية و حسب للجميع."
+
+# msgstr "BOINC for Linux is distributed as a self-extracting archive. This type of installation requires that you be familiar with the UNIX command-line interface."
+#~ msgid "RLN_LINUX_INSTALL_SEA_DESC"
+#~ msgstr ""
+#~ "BOINC للينكس يوزع كأرشيف ذاتي الفك. هذا النمط من التثبيت يتطلب أن تكون "
+#~ "عالما بواجهة سطر أوامر يونكس."
+
+# msgstr "The download files have names like <code>%s</code>."
+#~ msgid "RLN_LINUX_DL_FILENAME"
+#~ msgstr "لملفات التنزيل أسماء مثل <code>%s</code>."
+
+# msgstr "After downloading the file, type<pre>%s</pre>"
+#~ msgid "RLN_LINUX_RUN_SEA"
+#~ msgstr "بعد تنزيل الملف، أدخل <pre>%s</pre>"
+
+# msgstr "This will create a directory BOINC/ with the following files:"
+#~ msgid "RLN_LINUX_RESULTOF_SEA"
+#~ msgstr "سينشأ هذا الدليل BOINC و فيه الملفات التالية:"
+
+# msgstr "The BOINC core client"
+#~ msgid "RLN_BOINC_CORE_CL"
+#~ msgstr "عميل نواة BOINC"
+
+# msgstr "The BOINC manager"
+#~ msgid "RLN_BOINC_MANAGER"
+#~ msgstr "مدير BOINC"
+
+# msgstr "A script that cd's into the BOINC directory and runs the core client."
+#~ msgid "RLN_SCRIPT_RUN_CLIENT_DESC"
+#~ msgstr ""
+#~ "سكريبت يغير الدليل العامل إلى الذي ثبت فيه BOINC و يشغل العميل النواة"
+
+# msgstr "A script that cd's into the BOINC directory and runs the manager."
+#~ msgid "RLN_SCRIPT_RUN_MANAGER_DESC"
+#~ msgstr ""
+#~ "سكريبت يغير الدليل العامل إلى الذي ثبت فيه BOINC و يشغل المدير."
+
+# msgstr "You may want to%s automatically start the core client %sat boot time."
+#~ msgid "RLN_LINUX_AUTOSTART"
+#~ msgstr "قد ترغب في أن %sيبدأ العميل النواة ذاتيا عند بدء التشغيل%s."
+
+# msgstr "Select Start/Control Panel/Add or Remove Programs. Select BOINC, then click Remove. This removes the BOINC software only. To completely remove BOINC, delete the BOINC data directory (usually C:/Program Files/BOINC). "
+#~ msgid "RLN_MSWIN_UNINSTALL_DESC"
+#~ msgstr ""
+#~ "اضغط <kdb>ابدأ/لوحة التحكم/ركب و أزل البرمجيات</kbd>، ثم اختر BOINC "
+#~ "ثم أزله. سيزيل هذا برمجية BOINC فقط لكنه سيترك دليل البيانات و سيكون "
+#~ "عليك حذفه يدويا إن كنت لن تشغل BOINC مجددا في المستقبل <span dir=\"rtl\">"
+#~ "(عادة يكون في <span dir=\"ltr\">C:/Program Files/BOINC</span>)</span>."
+
+# msgstr "If you use a proxy server, please hold off upgrading for now. We have a fix in the works for proxies that use NTLM authentication."
+#~ msgid "RLN_ISSUE_PROXY_NTLMAUTH"
+#~ msgstr ""
+#~ "إن كنت تستخدم خادوما وسيطا فأجل الترقية لبرهة، فنحن نعمل على تصليحة تتعلق "
+#~ "بالخواديم التي تستخدم تصريح NTLM."
+
+# msgstr "(Windows) If BOINC applications are repeatedly crashing on your computer, it's possibly that you need to %supgrade to the latest version (9.0c or later) of DirectX %s."
+#~ msgid "RLN_ISSUE_MSWIN_LATEST_DIRECTX"
+#~ msgstr ""
+#~ "(ويندوز) إذا تعددت انهيارات  تطبيقات BOINC على حاسوبك، فقد تكون بحاجة "
+#~ "لترقية DiretX إلى الإصدارة 9.0C أو ما بعدها."
+
+# msgstr "(Windows) If BOINC runs at the same time as Windows XP 3-D screensavers, the system becomes sluggish and unresponsive."
+#~ msgid "RLN_ISSUE_MSWIN_SCREENSAVER_XP3D"
+#~ msgstr ""
+#~ "(ويندوز) إذا اشتغل BOINC في ذات الوقت مع حافظات شاشة ويندوز XP ثلاثية "
+#~ "الأبعاد قفقد يصبح النظام بطيئا و غير مستجيب."
+
+# msgstr "(Windows) Applications that were built before October 2004 do not display screensaver graphics with the Service or Shared install type, or the Single-user install type with the password protect screensaver option on NT based machines."
+#~ msgid "RLN_ISSUE_MSWIN_NO_SCREENSAVER"
+#~ msgstr ""
+#~ "(ويندوز) التطبيقات التي بنيت قبل أكتوبر 2004 لا تعرض رسوميات حافظ الشاشة "
+#~ "في طور التثبيت كخدمة أو التثبيت المشترك و لا في طور التثبيت "
+#~ "لمستخدم واحد في حالة وجود كلمة مرور على حافظ الشاشة و ذلك في النظم "
+#~ "المبنية على NT."
+
+# msgstr "If you have problems with BOINC, here are some steps you can take:"
+#~ msgid "RLN_TROUBLESHOOT_INTRO"
+#~ msgstr "إن كانت لديك مشكلات مع BOINC فهذه بعض الخطوات التي يمكنك اتباعها:"
+
+# msgstr "If you have a problem with a particular project, go to the 'Questions and Answers' area of the project's web site. You may find the solution to your problem. If not, post it there, and you'll get help from other users. If the problem persists, use the BOINC Manager to 'reset' that project. This will erase any jobs in progress and start from scratch. "
+#~ msgid "RLN_TROUBLESHOOT_PRJ_SPECIFIC"
+#~ msgstr ""
+#~ "إن كانت لديك مشكلة مع مشروع معين زُر قسم الأسئلة و الأجوبة في موقع "
+#~ "المشروع فقد تجد حلا لمشكلتك. فإن لم تجد أرسل مشكلتك هناك و سيساعدك "
+#~ "المستخدمون الآخرون. إذا ما ظلت المشكلة قائمة استخدم مدير BOINC لتصفير "
+#~ "المشروع، فسيمحي هذا كل المهمات قيد التنفيذ و يبدأ من جديد."
+
+# msgstr "If you have problems with BOINC itself, get help from the %s BOINC message boards %s."
+#~ msgid "RLN_TROUBLESHOOT_BOINC_ITSELF"
+#~ msgstr ""
+#~ "إن كانت لديك مشكلات مع BOINC ذاته فابحث عن مساعدة في %sمنتدى BOINC%s"
+
+# msgstr " Use the idle time on your computer  (Windows, Mac, or Linux)  to cure diseases, study global warming,  discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:  %sChoose%s projects  %sDownload%s and run BOINC software  %sEnter%s the project URLs, your email address, and password. "
+#~ msgid "HOME_HELP"
+#~ msgstr ""
+#~ "استخدم قوة حاسوبك غير المستغلة (ويندوز، ماك، أو لينكس) للبحث عن "
+#~ "علاجات للأمراض، و دراسة التغير المناخي، و  اكتشاف النجوم "
+#~ "النابضات، و مجالات أخرى من البحث العلمي النافع، بكل يسر و أمان: "
+#~ "%sاختر%s المشروعات التي تود المساهمة فيها ثم %sنزِّل%s و شغل برمجية "
+#~ "BOINC ثم %sأدخل%s مسار المشروع و عنوان بريدك و كلمة مرورك."
diff --git a/locale/be/BOINC-Client.mo b/locale/be/BOINC-Client.mo
index aec1a73..c69f55e 100644
Binary files a/locale/be/BOINC-Client.mo and b/locale/be/BOINC-Client.mo differ
diff --git a/locale/be/BOINC-Client.po b/locale/be/BOINC-Client.po
index 7b21031..31c77fd 100644
--- a/locale/be/BOINC-Client.po
+++ b/locale/be/BOINC-Client.po
@@ -4,20 +4,19 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-06-05 10:24-0700\n"
-"PO-Revision-Date: 2015-02-10 13:20-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.2.1\n"
 
-#: acct_mgr.cpp:448
-#: acct_mgr.cpp:457
+#: acct_mgr.cpp:448 acct_mgr.cpp:457
 msgid "Message from account manager"
 msgstr ""
 
@@ -26,7 +25,9 @@ msgid "Message from server"
 msgstr ""
 
 #: client_state.cpp:246
-msgid "Some tasks need more memory than allowed by your preferences.  Please check the preferences."
+msgid ""
+"Some tasks need more memory than allowed by your preferences.  Please check "
+"the preferences."
 msgstr ""
 
 #: client_state.cpp:501
@@ -39,11 +40,12 @@ msgstr ""
 
 #: cs_scheduler.cpp:575
 #, c-format
-msgid "You used the wrong URL for this project.  When convenient, remove this project, then add %s"
+msgid ""
+"You used the wrong URL for this project.  When convenient, remove this "
+"project, then add %s"
 msgstr ""
 
-#: cs_statefile.cpp:829
-#: ../sched/sched_types.cpp:259
+#: cs_statefile.cpp:829 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
 msgstr ""
 
@@ -59,13 +61,11 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: log_flags.cpp:259
-#: log_flags.cpp:436
+#: log_flags.cpp:259 log_flags.cpp:436
 msgid "Unexpected text in cc_config.xml"
 msgstr ""
 
-#: log_flags.cpp:410
-#: log_flags.cpp:462
+#: log_flags.cpp:410 log_flags.cpp:462
 msgid "Unrecognized tag in cc_config.xml"
 msgstr ""
 
@@ -90,7 +90,9 @@ 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."
+msgid ""
+"The project has changed its security key.  Please remove and add this "
+"project."
 msgstr ""
 
 #: ../sched/handle_request.cpp:943
@@ -102,7 +104,8 @@ 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."
+msgid ""
+"Your BOINC client software is too old.  Please install the current version."
 msgstr ""
 
 #: ../sched/handle_request.cpp:1259
@@ -114,11 +117,14 @@ 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"
+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"
+msgid ""
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to "
+"the current version"
 msgstr ""
 
 #: ../sched/sched_send.cpp:1146
@@ -140,7 +146,8 @@ msgstr ""
 
 #: ../sched/sched_send.cpp:1305
 #, c-format
-msgid "Tasks for %s are available, but your preferences are set to not accept them"
+msgid ""
+"Tasks for %s are available, but your preferences are set to not accept them"
 msgstr ""
 
 #: ../sched/sched_types.cpp:254
@@ -150,4 +157,3 @@ msgstr ""
 #: ../sched/sched_version.cpp:214
 msgid "Your app_info.xml file doesn't have a usable version of"
 msgstr ""
-
diff --git a/locale/be/BOINC-Manager.mo b/locale/be/BOINC-Manager.mo
index 1209bd2..739c760 100644
Binary files a/locale/be/BOINC-Manager.mo and b/locale/be/BOINC-Manager.mo differ
diff --git a/locale/be/BOINC-Manager.po b/locale/be/BOINC-Manager.po
index de7a500..d4436a3 100644
--- a/locale/be/BOINC-Manager.po
+++ b/locale/be/BOINC-Manager.po
@@ -7,22 +7,23 @@ msgstr ""
 "Project-Id-Version: BOINC Manager 6.x\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-06-18 11:32-0500\n"
-"PO-Revision-Date: 2015-02-10 13:20-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
+"PO-Revision-Date: 2013-06-05 19:42+0200\n"
+"Last-Translator: Anonymous Pootle User\n"
 "Language-Team: <Drive DRKA<drka2003 at mail.ru>> <drka2003 at mail.ru>\n"
 "Language: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Pootle 2.1.6\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
 "X-Poedit-SearchPath-0: clientgui\n"
 "X-Poedit-SearchPath-1: clientgui/msw\n"
 "X-Poedit-SearchPath-2: clientgui/gtk\n"
 "X-Poedit-SearchPath-3: clientgui/mac\n"
+"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
 
 #: clientgui/AccountInfoPage.cpp:387
 #, c-format
@@ -74,13 +75,11 @@ msgstr ""
 msgid "Find login information"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:668
+#: clientgui/AccountInfoPage.cpp:436 clientgui/AccountInfoPage.cpp:668
 msgid "&Password:"
 msgstr "Пароль:"
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:692
+#: clientgui/AccountInfoPage.cpp:443 clientgui/AccountInfoPage.cpp:692
 msgid "Choose a &password:"
 msgstr "Увядзіце пароль:"
 
@@ -137,36 +136,54 @@ msgid "Use account manager"
 msgstr "Мэнэджэр праектаў"
 
 #: clientgui/AccountInfoPage.cpp:587
-msgid "The minimum username length for this project is 1. Please enter a different username."
+msgid ""
+"The minimum username length for this project is 1. Please enter a different "
+"username."
 msgstr ""
 
 #: clientgui/AccountInfoPage.cpp:592
-msgid "The minimum username length for this account manager is 1. Please enter a different username."
+msgid ""
+"The minimum username length for this account manager is 1. Please enter a "
+"different username."
 msgstr ""
 
 #: clientgui/AccountInfoPage.cpp:598
-msgid "The minimum email address length for this project is 1. Please enter a different email address."
+msgid ""
+"The minimum email address length for this project is 1. Please enter a "
+"different email address."
 msgstr ""
 
 #: clientgui/AccountInfoPage.cpp:603
-msgid "The minimum email address length for this account manager is 1. Please enter a different email address."
+msgid ""
+"The minimum email address length for this account manager is 1. Please enter "
+"a different email address."
 msgstr ""
 
 # не адпаведнасць колькасці радкоў у перакладзе
 #: clientgui/AccountInfoPage.cpp:616
 #, c-format
-msgid "The minimum password length for this project is %d. Please enter a different password."
-msgstr "Мінімальная даўжыня пароля для дадзенага праекту %d знакаў. Зменіце пароль у адпаведнасць з дадзеным крытэрам."
+msgid ""
+"The minimum password length for this project is %d. Please enter a different "
+"password."
+msgstr ""
+"Мінімальная даўжыня пароля для дадзенага праекту %d знакаў. Зменіце пароль у "
+"адпаведнасць з дадзеным крытэрам."
 
 # не адпаведнасць колькасці радкоў у перакладзе
 #: clientgui/AccountInfoPage.cpp:622
 #, c-format
-msgid "The minimum password length for this account manager is %d. Please enter a different password."
-msgstr "Мінімальная даўжыня пароля для дадзенага мэнэджэра праектаў %d знакаў. Зменіце пароль у адпаведнасць з дадзеным крытэрам."
+msgid ""
+"The minimum password length for this account manager is %d. Please enter a "
+"different password."
+msgstr ""
+"Мінімальная даўжыня пароля для дадзенага мэнэджэра праектаў %d знакаў. "
+"Зменіце пароль у адпаведнасць з дадзеным крытэрам."
 
 #: clientgui/AccountInfoPage.cpp:634
-msgid "The password and confirmation password do not match. Please type them again."
-msgstr "\"Пароль\" і \"Пацверджанне пароля\" не супадаюць. Паўторыце ўвод пароля."
+msgid ""
+"The password and confirmation password do not match. Please type them again."
+msgstr ""
+"\"Пароль\" і \"Пацверджанне пароля\" не супадаюць. Паўторыце ўвод пароля."
 
 #: clientgui/AccountManagerInfoPage.cpp:248
 msgid "Choose an account manager"
@@ -223,8 +240,7 @@ msgstr ""
 msgid "&Close Window"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:329
-#: clientgui/AdvancedFrame.cpp:336
+#: clientgui/AdvancedFrame.cpp:329 clientgui/AdvancedFrame.cpp:336
 #: clientgui/AdvancedFrame.cpp:343
 #, c-format
 msgid "Exit %s"
@@ -407,7 +423,9 @@ msgstr "Падлучаны да інтэрнэту"
 
 #: clientgui/AdvancedFrame.cpp:531
 msgid "Allow network activity regardless of preferences"
-msgstr "Дазваляецца абмен дадзенымі праз інтэрнэт у любы момант часу, незалежна ад наладаў."
+msgstr ""
+"Дазваляецца абмен дадзенымі праз інтэрнэт у любы момант часу, незалежна ад "
+"наладаў."
 
 #: clientgui/AdvancedFrame.cpp:535
 #, fuzzy
@@ -426,7 +444,8 @@ msgstr "Працаваць аўтаномна"
 
 #: clientgui/AdvancedFrame.cpp:541
 msgid "Stop BOINC network activity"
-msgstr "Забараняецца абмен дадзенымі праз інтэрнэт паміж BOINC і серверамі праектаў"
+msgstr ""
+"Забараняецца абмен дадзенымі праз інтэрнэт паміж BOINC і серверамі праектаў"
 
 #: clientgui/AdvancedFrame.cpp:551
 #, c-format
@@ -482,7 +501,8 @@ msgstr "Перазагрузіць лакальны файл агульных н
 
 #: clientgui/AdvancedFrame.cpp:582
 msgid "Read preferences from global_prefs_override.xml."
-msgstr "Перазагрузіць лакальны файл агульных наладаў global_prefs_override.xml."
+msgstr ""
+"Перазагрузіць лакальны файл агульных наладаў global_prefs_override.xml."
 
 #: clientgui/AdvancedFrame.cpp:587
 #, c-format
@@ -688,7 +708,8 @@ msgstr "%s - памылка злучэння"
 #: clientgui/BOINCBaseFrame.cpp:514
 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:523
@@ -728,7 +749,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:638
@@ -747,11 +769,13 @@ msgstr "%s - стан падлучэння"
 #, 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 ""
 "%s не падлучаны да кліента %s.\n"
-"Для падлучэння да кліента %s скарыстайцеся меню 'Дадаткова\\Змяніць кампутар'.\n"
+"Для падлучэння да кліента %s скарыстайцеся меню 'Дадаткова\\Змяніць "
+"кампутар'.\n"
 "Для лакальнага кампутара выкарыстайце 'localhost' у якасці імя кампутара."
 
 #: clientgui/BOINCBaseView.cpp:774
@@ -934,14 +958,12 @@ msgid "Open %s..."
 msgstr "Адкрыць %s..."
 
 # Час сноў
-#: clientgui/BOINCTaskBar.cpp:525
-#: clientgui/BOINCTaskBar.cpp:621
+#: clientgui/BOINCTaskBar.cpp:525 clientgui/BOINCTaskBar.cpp:621
 #: clientgui/BOINCTaskBar.cpp:629
 msgid "Snooze"
 msgstr "Паўза"
 
-#: clientgui/BOINCTaskBar.cpp:527
-#: clientgui/BOINCTaskBar.cpp:648
+#: clientgui/BOINCTaskBar.cpp:527 clientgui/BOINCTaskBar.cpp:648
 #: clientgui/BOINCTaskBar.cpp:656
 msgid "Snooze GPU"
 msgstr ""
@@ -1049,10 +1071,8 @@ msgstr ""
 "\n"
 "Для завяршэння націсніце кнопку \"Гатова\"."
 
-#: 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 "Націсніце кнопку \"Гатова\" для выхаду з майстра."
 
@@ -1143,10 +1163,8 @@ msgstr ""
 "BOINC - Berkeley Open Infrastructure for Network Computing\n"
 "Адчыненая Інфраструктура для Размеркаваных Вылічэнняў універсітэта Берклі"
 
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:396
+#: clientgui/DlgAbout.cpp:208 clientgui/DlgExitMessage.cpp:173
+#: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:396
 #: clientgui/DlgSelectComputer.cpp:162
 msgid "&OK"
 msgstr "OK"
@@ -1171,8 +1189,7 @@ msgstr ""
 msgid "Validation Error"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:797
-#: clientgui/DlgAdvPreferences.cpp:803
+#: clientgui/DlgAdvPreferences.cpp:797 clientgui/DlgAdvPreferences.cpp:803
 #: clientgui/DlgAdvPreferences.cpp:809
 msgid "Applications to add"
 msgstr ""
@@ -1182,8 +1199,7 @@ msgstr ""
 msgid "'%s' is not an executable application."
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:827
-#: clientgui/DlgAdvPreferences.cpp:874
+#: clientgui/DlgAdvPreferences.cpp:827 clientgui/DlgAdvPreferences.cpp:874
 #: clientgui/DlgAdvPreferences.cpp:898
 msgid "Add Exclusive App"
 msgstr ""
@@ -1283,7 +1299,8 @@ msgid "While computer is on batteries"
 msgstr " - сілкаванне ад акумулятараў"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:142
-msgid "check this if you want this computer to do work while it runs on batteries"
+msgid ""
+"check this if you want this computer to do work while it runs on batteries"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:148
@@ -1292,7 +1309,8 @@ msgid "While computer is in use"
 msgstr " - сілкаванне ад акумулятараў"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:151
-msgid "check this if you want this computer to do work even when you're using it"
+msgid ""
+"check this if you want this computer to do work even when you're using it"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:157
@@ -1300,7 +1318,9 @@ msgid "Use GPU while computer is in use"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:160
-msgid "check this if you want your GPU to do work even when you're using the computer"
+msgid ""
+"check this if you want your GPU to do work even when you're using the "
+"computer"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:172
@@ -1308,7 +1328,8 @@ msgid "Only after computer has been idle for"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:182
-msgid "do work only after you haven't used the computer for this number of minutes"
+msgid ""
+"do work only after you haven't used the computer for this number of minutes"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:187
@@ -1498,7 +1519,9 @@ msgid "Confirm before connecting to internet"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:479
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
+msgid ""
+"if checked, a confirmation dialog will be displayed before trying to connect "
+"to the Internet"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:483
@@ -1523,8 +1546,7 @@ msgstr ""
 msgid "network usage stop hour"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:597
-#: clientgui/DlgItemProperties.cpp:226
+#: clientgui/DlgAdvPreferencesBase.cpp:597 clientgui/DlgItemProperties.cpp:226
 msgid "Disk usage"
 msgstr ""
 
@@ -1593,7 +1615,8 @@ msgid "if checked, suspended work units are left in memory"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:712
-msgid "Suspend processor and network usage when these applications are running:"
+msgid ""
+"Suspend processor and network usage when these applications are running:"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:721
@@ -1634,8 +1657,7 @@ msgstr "Час"
 msgid "Message"
 msgstr "Паведамленне"
 
-#: clientgui/DlgEventLog.cpp:287
-#: clientgui/DlgEventLog.cpp:351
+#: clientgui/DlgEventLog.cpp:287 clientgui/DlgEventLog.cpp:351
 msgid "&Show only this project"
 msgstr ""
 
@@ -1643,8 +1665,7 @@ msgstr ""
 msgid "Copy &All"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:293
-#: clientgui/DlgEventLog.cpp:297
+#: clientgui/DlgEventLog.cpp:293 clientgui/DlgEventLog.cpp:297
 msgid "Copy all the messages to the clipboard."
 msgstr "Капіяваць усе паведамленні ў буфер абмену"
 
@@ -1652,18 +1673,23 @@ msgstr "Капіяваць усе паведамленні ў буфер абм
 msgid "Copy &Selected"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:305
-#: clientgui/DlgEventLog.cpp:313
-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 "Капіяваць вылучаныя паведамленні ў буфер абмену. Можна выкарыстаць SHIFT і CTRL для вылучэння некалькіх паведамленняў."
+#: clientgui/DlgEventLog.cpp:305 clientgui/DlgEventLog.cpp:313
+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 ""
+"Капіяваць вылучаныя паведамленні ў буфер абмену. Можна выкарыстаць SHIFT і "
+"CTRL для вылучэння некалькіх паведамленняў."
 
-#: clientgui/DlgEventLog.cpp:307
-#: clientgui/DlgEventLog.cpp:315
-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 "Капіяваць вылучаныя паведамленні ў буфер абмену. Можна выкарыстаць SHIFT і CTRL для вылучэння некалькіх паведамленняў."
+#: clientgui/DlgEventLog.cpp:307 clientgui/DlgEventLog.cpp:315
+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 ""
+"Капіяваць вылучаныя паведамленні ў буфер абмену. Можна выкарыстаць SHIFT і "
+"CTRL для вылучэння некалькіх паведамленняў."
 
-#: clientgui/DlgEventLog.cpp:322
-#: clientgui/DlgItemProperties.cpp:66
+#: clientgui/DlgEventLog.cpp:322 clientgui/DlgItemProperties.cpp:66
 msgid "&Close"
 msgstr ""
 
@@ -1677,14 +1703,12 @@ msgstr ""
 msgid "Show all &messages"
 msgstr "Капіяваць усё"
 
-#: clientgui/DlgEventLog.cpp:346
-#: clientgui/DlgEventLog.cpp:348
+#: clientgui/DlgEventLog.cpp:346 clientgui/DlgEventLog.cpp:348
 #, fuzzy
 msgid "Show messages for all projects"
 msgstr "Паказаць усе праекты на адным графіцы"
 
-#: clientgui/DlgEventLog.cpp:352
-#: clientgui/DlgEventLog.cpp:354
+#: clientgui/DlgEventLog.cpp:352 clientgui/DlgEventLog.cpp:354
 #, fuzzy
 msgid "Show only the messages for the selected project"
 msgstr "Паказаць адзін вылучаны праект"
@@ -1732,10 +1756,8 @@ msgstr ""
 msgid "Remember this decision and do not show this dialog."
 msgstr ""
 
-#: clientgui/DlgExitMessage.cpp:178
-#: clientgui/DlgGenericMessage.cpp:125
-#: clientgui/DlgOptions.cpp:401
-#: clientgui/DlgSelectComputer.cpp:167
+#: clientgui/DlgExitMessage.cpp:178 clientgui/DlgGenericMessage.cpp:125
+#: clientgui/DlgOptions.cpp:401 clientgui/DlgSelectComputer.cpp:167
 msgid "&Cancel"
 msgstr "Адмена"
 
@@ -1744,10 +1766,8 @@ msgid "Don't show this dialog again."
 msgstr ""
 
 # ???
-#: clientgui/DlgItemProperties.cpp:163
-#: clientgui/DlgItemProperties.cpp:166
-#: clientgui/DlgItemProperties.cpp:169
-#: clientgui/DlgItemProperties.cpp:172
+#: clientgui/DlgItemProperties.cpp:163 clientgui/DlgItemProperties.cpp:166
+#: clientgui/DlgItemProperties.cpp:169 clientgui/DlgItemProperties.cpp:172
 #, fuzzy
 msgid "Don't fetch tasks for "
 msgstr "Не запытваць новыя заданні"
@@ -1785,8 +1805,7 @@ msgstr ""
 msgid "Properties of project "
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:212
-#: clientgui/DlgOptions.cpp:218
+#: clientgui/DlgItemProperties.cpp:212 clientgui/DlgOptions.cpp:218
 msgid "General"
 msgstr "Агульныя"
 
@@ -1827,14 +1846,10 @@ msgstr ""
 msgid "Non CPU intensive"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:229
-#: clientgui/DlgItemProperties.cpp:231
-#: clientgui/DlgItemProperties.cpp:232
-#: clientgui/DlgItemProperties.cpp:234
-#: clientgui/DlgItemProperties.cpp:237
-#: clientgui/DlgItemProperties.cpp:246
-#: clientgui/DlgItemProperties.cpp:249
-#: clientgui/DlgItemProperties.cpp:252
+#: clientgui/DlgItemProperties.cpp:229 clientgui/DlgItemProperties.cpp:231
+#: clientgui/DlgItemProperties.cpp:232 clientgui/DlgItemProperties.cpp:234
+#: clientgui/DlgItemProperties.cpp:237 clientgui/DlgItemProperties.cpp:246
+#: clientgui/DlgItemProperties.cpp:249 clientgui/DlgItemProperties.cpp:252
 msgid "yes"
 msgstr ""
 
@@ -1842,8 +1857,7 @@ msgstr ""
 msgid "Suspended via GUI"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:231
-#: clientgui/DlgItemProperties.cpp:232
+#: clientgui/DlgItemProperties.cpp:231 clientgui/DlgItemProperties.cpp:232
 msgid "no"
 msgstr ""
 
@@ -1860,8 +1874,7 @@ msgid "Trickle-up pending"
 msgstr ""
 
 # Агульная колькасць ачкоў набраных на дадзеным хасце
-#: clientgui/DlgItemProperties.cpp:240
-#: clientgui/DlgItemProperties.cpp:242
+#: clientgui/DlgItemProperties.cpp:240 clientgui/DlgItemProperties.cpp:242
 #, fuzzy
 msgid "Host location"
 msgstr "Агульная колькасць ачкоў для хаста"
@@ -1949,13 +1962,11 @@ msgstr ""
 msgid "CPU time at last checkpoint"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:340
-#: clientgui/DlgItemProperties.cpp:355
+#: clientgui/DlgItemProperties.cpp:340 clientgui/DlgItemProperties.cpp:355
 msgid "CPU time"
 msgstr "Час ЦП"
 
-#: clientgui/DlgItemProperties.cpp:342
-#: clientgui/DlgItemProperties.cpp:356
+#: clientgui/DlgItemProperties.cpp:342 clientgui/DlgItemProperties.cpp:356
 #, fuzzy
 msgid "Elapsed time"
 msgstr "Час перадачы"
@@ -1988,8 +1999,7 @@ msgstr ""
 msgid "Local: "
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: clientgui/DlgOptions.cpp:129 clientgui/DlgOptions.cpp:135
 msgid "Options"
 msgstr ""
 
@@ -2053,33 +2063,27 @@ msgstr "Злучацца праз HTTP проксі сервер"
 msgid "HTTP Proxy Server Configuration"
 msgstr "Параметры  HTTP проксі сервера"
 
-#: clientgui/DlgOptions.cpp:280
-#: clientgui/DlgOptions.cpp:344
+#: clientgui/DlgOptions.cpp:280 clientgui/DlgOptions.cpp:344
 msgid "Address:"
 msgstr "Адрас:"
 
-#: clientgui/DlgOptions.cpp:288
-#: clientgui/DlgOptions.cpp:352
+#: clientgui/DlgOptions.cpp:288 clientgui/DlgOptions.cpp:352
 msgid "Port:"
 msgstr "Порт:"
 
-#: clientgui/DlgOptions.cpp:296
-#: clientgui/DlgOptions.cpp:360
+#: clientgui/DlgOptions.cpp:296 clientgui/DlgOptions.cpp:360
 msgid "Don't use proxy for:"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:303
-#: clientgui/DlgOptions.cpp:367
+#: clientgui/DlgOptions.cpp:303 clientgui/DlgOptions.cpp:367
 msgid "Leave these blank if not needed"
 msgstr "Пакінуць палі пустымі ,калі не выкарыстоўваюцца"
 
-#: clientgui/DlgOptions.cpp:309
-#: clientgui/DlgOptions.cpp:373
+#: clientgui/DlgOptions.cpp:309 clientgui/DlgOptions.cpp:373
 msgid "User Name:"
 msgstr "Імя карыстача:"
 
-#: clientgui/DlgOptions.cpp:317
-#: clientgui/DlgOptions.cpp:381
+#: clientgui/DlgOptions.cpp:317 clientgui/DlgOptions.cpp:381
 #: clientgui/DlgSelectComputer.cpp:151
 msgid "Password:"
 msgstr "Пароль:"
@@ -2133,7 +2137,9 @@ msgstr "%s - змена мовы"
 
 #: clientgui/DlgOptions.cpp:695
 #, fuzzy, 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 ""
 "Мова інтэрфейсу праграмы %s быў зменены,\n"
 "для ўступа ў сілу зменаў патрабуецца перазапусціць праграму %s."
@@ -2154,8 +2160,7 @@ msgstr ""
 msgid "Host name:"
 msgstr "Імя кампутара ў сеткі або IP:"
 
-#: clientgui/Localization.cpp:31
-#: clientgui/Localization.cpp:69
+#: clientgui/Localization.cpp:31 clientgui/Localization.cpp:69
 msgid "Message boards"
 msgstr "Дошка паведамленняў"
 
@@ -2168,15 +2173,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 "Прагляд інфармацыі аб вашым уліковым запісе і набраных ачках"
@@ -2188,35 +2190,33 @@ msgstr "Вашы налады"
 # seti
 #: clientgui/Localization.cpp:45
 msgid "View and modify your SETI at home account profile and preferences"
-msgstr "Прагляд і змена наладаў вашага  запісу і вашага профіля ў праекце SETI at home"
+msgstr ""
+"Прагляд і змена наладаў вашага  запісу і вашага профіля ў праекце SETI at home"
 
-#: 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 "Вашы кампутары"
 
 # seti
 #: clientgui/Localization.cpp:53
 msgid "View a listing of all the computers on which you are running SETI at Home"
-msgstr "Прагляд інфармацыі аб вашых кампутарах, якія ўдзельнічаюць у апрацоўцы заданняў праекту SETI at Home"
+msgstr ""
+"Прагляд інфармацыі аб вашых кампутарах, якія ўдзельнічаюць у апрацоўцы "
+"заданняў праекту SETI at Home"
 
-#: 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 "Прагляд інфармацыі аб камандзе, да якой вы далучыліся"
 
@@ -2240,8 +2240,11 @@ msgstr "Падрабязнае апісанне экраннае застаўк
 
 # einstein
 #: clientgui/Localization.cpp:71
-msgid "Correspond with admins and other users on the Einstein at Home message boards"
-msgstr "Форум для зносінаў з распрацоўнікамі і іншымі ўдзельнікамі праекту Einstein at Home"
+msgid ""
+"Correspond with admins and other users on the Einstein at Home message boards"
+msgstr ""
+"Форум для зносінаў з распрацоўнікамі і іншымі ўдзельнікамі праекту "
+"Einstein at Home"
 
 # einstein
 #: clientgui/Localization.cpp:73
@@ -2261,12 +2264,16 @@ msgstr "Праблемы і памылкі"
 # einstein
 #: clientgui/Localization.cpp:79
 msgid "A link to the Einstein at Home problems and bug reports message board"
-msgstr "Форум для абмеркавання праблемаў і памылкаў у працы праграмаў праекту Einstein at Home"
+msgstr ""
+"Форум для абмеркавання праблемаў і памылкаў у працы праграмаў праекту "
+"Einstein at Home"
 
 # einstein
 #: clientgui/Localization.cpp:83
 msgid "View and modify your Einstein at Home account profile and preferences"
-msgstr "Прагляд і змена наладаў вашага  запісу і вашага профіля ў праекце Einstein at Home"
+msgstr ""
+"Прагляд і змена наладаў вашага  запісу і вашага профіля ў праекце "
+"Einstein at Home"
 
 #: clientgui/Localization.cpp:85
 msgid "Account summary"
@@ -2274,8 +2281,11 @@ msgstr "Уліковы запіс (інфа.)"
 
 # einstein
 #: clientgui/Localization.cpp:95
-msgid "View a listing of all the computers on which you are running Einstein at Home"
-msgstr "Прагляд інфармацыі аб вашых кампутарах, якія ўдзельнічаюць у апрацоўцы заданняў праекту Einstein at Home"
+msgid ""
+"View a listing of all the computers on which you are running Einstein at Home"
+msgstr ""
+"Прагляд інфармацыі аб вашых кампутарах, якія ўдзельнічаюць у апрацоўцы "
+"заданняў праекту Einstein at Home"
 
 # einstein
 #: clientgui/Localization.cpp:101
@@ -2284,8 +2294,12 @@ msgstr "LIGO"
 
 # einstein ?
 #: clientgui/Localization.cpp:103
-msgid "The home page of the Laser Interferometer Gravitational-wave Observatory (LIGO) project"
-msgstr "Хатняя старонка праекту LIGO (лазерны інтэрферометр абсерваторыі гравітацыйных хваляў)"
+msgid ""
+"The home page of the Laser Interferometer Gravitational-wave Observatory "
+"(LIGO) project"
+msgstr ""
+"Хатняя старонка праекту LIGO (лазерны інтэрферометр абсерваторыі "
+"гравітацыйных хваляў)"
 
 # einstein
 #: clientgui/Localization.cpp:105
@@ -2297,8 +2311,7 @@ msgstr "GEO-600"
 msgid "The home page of the GEO-600 project"
 msgstr "Хатняя старонка праекту GEO-600"
 
-#: clientgui/Localization.cpp:115
-#: clientgui/Localization.cpp:133
+#: clientgui/Localization.cpp:115 clientgui/Localization.cpp:133
 msgid "Team"
 msgstr "Каманда"
 
@@ -2331,7 +2344,9 @@ msgstr "Прагляд інфармацыі аб камандзе, да якой
 # WCG
 #: clientgui/Localization.cpp:141
 msgid "Search for help in our help system"
-msgstr "Сістэма дапамогі па працы праграмаў і ўдзеле ў размеркаваных вылічэннях на базе WCG."
+msgstr ""
+"Сістэма дапамогі па працы праграмаў і ўдзеле ў размеркаваных вылічэннях на "
+"базе WCG."
 
 # WCG
 #: clientgui/Localization.cpp:143
@@ -2391,7 +2406,9 @@ msgid "Missing application"
 msgstr "Прыкладанне"
 
 #: clientgui/MainDocument.cpp:1805
-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:2418
@@ -2469,8 +2486,7 @@ msgstr "Памылка загрузкі данных"
 msgid "Downloading"
 msgstr "Загрузка данных"
 
-#: clientgui/MainDocument.cpp:2468
-#: clientgui/MainDocument.cpp:2538
+#: clientgui/MainDocument.cpp:2468 clientgui/MainDocument.cpp:2538
 #, fuzzy
 msgid " (suspended - "
 msgstr "Прыпыненая"
@@ -2519,8 +2535,7 @@ msgstr ""
 msgid "Waiting to run"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2508
-#: clientgui/MainDocument.cpp:2514
+#: clientgui/MainDocument.cpp:2508 clientgui/MainDocument.cpp:2514
 msgid "Ready to start"
 msgstr ""
 
@@ -2664,8 +2679,7 @@ msgstr ""
 msgid "%s; received from %s; on %s"
 msgstr ""
 
-#: clientgui/NoticeListCtrl.cpp:282
-#: clientgui/ProjectListCtrl.cpp:282
+#: clientgui/NoticeListCtrl.cpp:282 clientgui/ProjectListCtrl.cpp:282
 msgid "Click"
 msgstr ""
 
@@ -2673,8 +2687,7 @@ msgstr ""
 msgid "more..."
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:451
-#: clientgui/ProjectInfoPage.cpp:739
+#: clientgui/ProjectInfoPage.cpp:451 clientgui/ProjectInfoPage.cpp:739
 #: clientgui/ProjectInfoPage.cpp:743
 msgid "All"
 msgstr ""
@@ -2723,7 +2736,9 @@ msgid "Project URL:"
 msgstr "Адрас (URL):"
 
 #: clientgui/ProjectInfoPage.cpp:787
-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:811
@@ -2852,8 +2867,7 @@ msgstr "Параметры проксі сервера"
 msgid "HTTP proxy"
 msgstr "HTTP проксі"
 
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
+#: clientgui/ProxyPage.cpp:337 clientgui/ProxyPage.cpp:357
 msgid "Server:"
 msgstr "Сервер:"
 
@@ -2865,8 +2879,7 @@ msgstr "Аўтавызначэнне"
 msgid "SOCKS proxy"
 msgstr "SOCKS проксі"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:136
-#: clientgui/sg_BoincSimpleGUI.cpp:119
+#: clientgui/sg_BoincSimpleFrame.cpp:136 clientgui/sg_BoincSimpleGUI.cpp:119
 msgid "Advanced View...\tCtrl+Shift+A"
 msgstr ""
 
@@ -2883,8 +2896,7 @@ msgstr "Вокладка"
 msgid "Select the appearance of the user interface."
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:193
-#: clientgui/sg_BoincSimpleGUI.cpp:147
+#: clientgui/sg_BoincSimpleFrame.cpp:193 clientgui/sg_BoincSimpleGUI.cpp:147
 #, c-format
 msgid "&%s"
 msgstr "&%s"
@@ -3140,8 +3152,7 @@ msgstr "Апрацоўваць толькі з"
 msgid "Connect to internet only between:"
 msgstr "Доступ у інтэрнэт толькі з"
 
-#: clientgui/sg_DlgPreferences.cpp:376
-#: clientgui/sg_DlgPreferences.cpp:393
+#: clientgui/sg_DlgPreferences.cpp:376 clientgui/sg_DlgPreferences.cpp:393
 msgid "Use no more than:"
 msgstr "Выкарыстаць не больш:"
 
@@ -3163,14 +3174,10 @@ msgid "Do work after idle for:"
 msgstr "Запуск апрацоўкі пры прастою:"
 
 # ?
-#: clientgui/sg_DlgPreferences.cpp:621
-#: clientgui/sg_DlgPreferences.cpp:624
-#: clientgui/sg_DlgPreferences.cpp:683
-#: clientgui/sg_DlgPreferences.cpp:687
-#: clientgui/sg_DlgPreferences.cpp:699
-#: clientgui/sg_DlgPreferences.cpp:703
-#: clientgui/sg_DlgPreferences.cpp:846
-#: clientgui/sg_DlgPreferences.cpp:857
+#: clientgui/sg_DlgPreferences.cpp:621 clientgui/sg_DlgPreferences.cpp:624
+#: clientgui/sg_DlgPreferences.cpp:683 clientgui/sg_DlgPreferences.cpp:687
+#: clientgui/sg_DlgPreferences.cpp:699 clientgui/sg_DlgPreferences.cpp:703
+#: clientgui/sg_DlgPreferences.cpp:846 clientgui/sg_DlgPreferences.cpp:857
 msgid "Anytime"
 msgstr "заўсёды"
 
@@ -3243,8 +3250,13 @@ msgid "Update"
 msgstr "Абнавіць"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:62
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
-msgstr "Атрымаць інфармацыю з сервера праекту: аб пацверджанні перадачы завершаных заданняў, аб колькасці набраных ачкоў, аб наладах  запісу і (магчыма) запампоўцы новых заданняў."
+msgid ""
+"Report all completed tasks, get latest credit, get latest preferences, and "
+"possibly get more tasks."
+msgstr ""
+"Атрымаць інфармацыю з сервера праекту: аб пацверджанні перадачы завершаных "
+"заданняў, аб колькасці набраных ачкоў, аб наладах  запісу і (магчыма) "
+"запампоўцы новых заданняў."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:68
 #: clientgui/sg_ProjectCommandPopup.cpp:114
@@ -3267,17 +3279,24 @@ msgid "Reset project"
 msgstr "Перазапусціць праект"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:80
-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."
+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:86
 #, fuzzy
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
+msgid ""
+"Remove this project.  Tasks in progress will be lost (use 'Update' first to "
+"report any completed tasks)."
 msgstr ""
-"Адлучыць дадзены кампутар ад вылучанага праекту. Апрацоўваемыя ў дадзены момант задання будуць страчаныя.\n"
-"УВАГА: не забудзьце перад дадзенаю аперацыяю адправіць усе завершаныя заданні для дадзенага праекту :-)"
+"Адлучыць дадзены кампутар ад вылучанага праекту. Апрацоўваемыя ў дадзены "
+"момант задання будуць страчаныя.\n"
+"УВАГА: не забудзьце перад дадзенаю аперацыяю адправіць усе завершаныя "
+"заданні для дадзенага праекту :-)"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:91
 #: clientgui/sg_TaskCommandPopup.cpp:78
@@ -3321,8 +3340,7 @@ msgid "Are you sure you want to remove project '%s'?"
 msgstr "Вы сапраўды жадаеце перазапусціць праект \"%s\"?"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:257
-#: clientgui/sg_StatImageLoader.cpp:138
-#: clientgui/sg_StatImageLoader.cpp:198
+#: clientgui/sg_StatImageLoader.cpp:138 clientgui/sg_StatImageLoader.cpp:198
 msgid "Remove Project"
 msgstr ""
 
@@ -3339,8 +3357,7 @@ msgstr ""
 msgid "Work done for this project"
 msgstr ""
 
-#: clientgui/sg_ProjectPanel.cpp:77
-#: clientgui/sg_ProjectsComponent.cpp:123
+#: clientgui/sg_ProjectPanel.cpp:77 clientgui/sg_ProjectsComponent.cpp:123
 msgid "Synchronize projects with account manager system"
 msgstr ""
 
@@ -3401,8 +3418,7 @@ msgstr "Праекты"
 msgid "%s. Work done by %s: %0.2f"
 msgstr "%s. Удзельнікам %s зароблена: %0.2f ачкоў."
 
-#: clientgui/sg_TaskCommandPopup.cpp:60
-#: clientgui/sg_ViewTabPage.cpp:424
+#: clientgui/sg_TaskCommandPopup.cpp:60 clientgui/sg_ViewTabPage.cpp:424
 msgid "Show graphics"
 msgstr "Паказаць графіку"
 
@@ -3510,8 +3526,7 @@ msgstr "Працуе"
 msgid "Status: %s"
 msgstr ""
 
-#: clientgui/sg_ViewTabPage.cpp:140
-#: clientgui/sg_ViewTabPage.cpp:280
+#: clientgui/sg_ViewTabPage.cpp:140 clientgui/sg_ViewTabPage.cpp:280
 #, c-format
 msgid "%.1lf"
 msgstr "%.1lf"
@@ -3523,15 +3538,16 @@ msgstr "%d гадзінаў %d хвілінаў %d секундаў"
 
 #: clientgui/sg_ViewTabPage.cpp:423
 msgid "Are you sure you want to display graphics on a remote machine?"
-msgstr "Вы ўпэўненыя, што жадаеце паказаць графічнае акно для прыкладання на выдаленым кампутары?"
+msgstr ""
+"Вы ўпэўненыя, што жадаеце паказаць графічнае акно для прыкладання на "
+"выдаленым кампутары?"
 
 #: clientgui/sg_ViewTabPage.cpp:446
 #, fuzzy
 msgid "Application: "
 msgstr "Прыкладанне"
 
-#: clientgui/sg_ViewTabPage.cpp:449
-#: clientgui/sg_ViewTabPage.cpp:453
+#: clientgui/sg_ViewTabPage.cpp:449 clientgui/sg_ViewTabPage.cpp:453
 msgid "Time Remaining: "
 msgstr ""
 
@@ -3593,8 +3609,7 @@ msgstr "Увядзіце код доступу для працягу."
 msgid "Invalid Account Key; please enter a valid Account Key"
 msgstr "Уведзены не правільны код доступу, паўторыце ўвод кода доступу"
 
-#: clientgui/ValidateAccountKey.cpp:82
-#: clientgui/ValidateEmailAddress.cpp:86
+#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
 msgid "Validation conflict"
 msgstr "Праверка правільнасці ўводу данных"
 
@@ -3625,17 +3640,13 @@ msgstr ""
 "Прыклад:\n"
 "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
+#: 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:84 clientgui/ValidateURL.cpp:88
 #: clientgui/ValidateURL.cpp:92
 msgid ""
 "Please specify a valid URL.\n"
@@ -3647,8 +3658,7 @@ msgstr ""
 "http://boincproject.example.com"
 
 # ?
-#: clientgui/ValidateURL.cpp:104
-#: clientgui/ValidateURL.cpp:108
+#: clientgui/ValidateURL.cpp:104 clientgui/ValidateURL.cpp:108
 #, c-format
 msgid "'%s' does not contain a valid host name."
 msgstr "Кампутар (хост) з імем: \"%s\" не знойдзены."
@@ -3659,10 +3669,8 @@ msgstr "Кампутар (хост) з імем: \"%s\" не знойдзены.
 msgid "'%s' does not contain a valid path."
 msgstr "Паказаны шлях: \"%s\" не існуе."
 
-#: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:169
-#: clientgui/ViewStatistics.cpp:1965
-#: clientgui/ViewTransfers.cpp:159
+#: clientgui/ViewMessages.cpp:84 clientgui/ViewProjects.cpp:169
+#: clientgui/ViewStatistics.cpp:1965 clientgui/ViewTransfers.cpp:159
 #: clientgui/ViewWork.cpp:182
 msgid "Commands"
 msgstr "Дзеянні"
@@ -3675,13 +3683,11 @@ msgstr "Капіяваць усё"
 msgid "Copy selected messages"
 msgstr "Капіяваць вылучанае"
 
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
+#: clientgui/ViewMessages.cpp:106 clientgui/ViewMessages.cpp:502
 msgid "Show only this project"
 msgstr ""
 
-#: clientgui/ViewMessages.cpp:107
-#: clientgui/ViewMessages.cpp:503
+#: clientgui/ViewMessages.cpp:107 clientgui/ViewMessages.cpp:503
 #, fuzzy
 msgid "Show only the messages for the selected project."
 msgstr "Паказаць адзін вылучаны праект"
@@ -3713,8 +3719,7 @@ msgstr "Капіяваць усё"
 msgid "Show messages for all projects."
 msgstr "Паказаць усе праекты на адным графіцы"
 
-#: clientgui/ViewProjects.cpp:219
-#: clientgui/ViewStatistics.cpp:442
+#: clientgui/ViewProjects.cpp:219 clientgui/ViewStatistics.cpp:442
 msgid "Account"
 msgstr "Уліковы запіс"
 
@@ -3728,8 +3733,7 @@ msgstr "Заробленыя ачкі"
 msgid "Avg. work done"
 msgstr "У сярэднім за дзень"
 
-#: clientgui/ViewProjects.cpp:224
-#: clientgui/ViewTransfers.cpp:187
+#: clientgui/ViewProjects.cpp:224 clientgui/ViewTransfers.cpp:187
 #: clientgui/ViewWork.cpp:233
 msgid "Status"
 msgstr "Стан"
@@ -3767,8 +3771,7 @@ msgstr "Праект перазапускаецца..."
 msgid "Removing project..."
 msgstr "Праект запускаецца..."
 
-#: clientgui/ViewProjects.cpp:542
-#: clientgui/ViewWork.cpp:598
+#: clientgui/ViewProjects.cpp:542 clientgui/ViewWork.cpp:598
 msgid "Launching browser..."
 msgstr "Загружаецца браўзэр..."
 
@@ -3940,7 +3943,8 @@ msgstr "У сярэднім для хаста"
 
 #: clientgui/ViewStatistics.cpp:1991
 msgid "Show average credit for host"
-msgstr "Паказаць сярэднюю колькасць ачкоў якія набіраюцца дадзеным хастом за дзень"
+msgstr ""
+"Паказаць сярэднюю колькасць ачкоў якія набіраюцца дадзеным хастом за дзень"
 
 #: clientgui/ViewStatistics.cpp:2000
 msgid "< &Previous project"
@@ -3958,13 +3962,11 @@ msgstr "Наступны >"
 msgid "Show chart for next project"
 msgstr "Паказаць наступны праект (уніз)"
 
-#: clientgui/ViewStatistics.cpp:2013
-#: clientgui/ViewStatistics.cpp:2410
+#: clientgui/ViewStatistics.cpp:2013 clientgui/ViewStatistics.cpp:2410
 msgid "Hide project list"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2014
-#: clientgui/ViewStatistics.cpp:2410
+#: clientgui/ViewStatistics.cpp:2014 clientgui/ViewStatistics.cpp:2410
 msgid "Use entire area for graphs"
 msgstr ""
 
@@ -4010,16 +4012,11 @@ msgstr "Паказаць усе праекты на адным графіцы"
 msgid "Statistics"
 msgstr "Статыстыка"
 
-#: clientgui/ViewStatistics.cpp:2097
-#: clientgui/ViewStatistics.cpp:2118
-#: clientgui/ViewStatistics.cpp:2139
-#: clientgui/ViewStatistics.cpp:2161
-#: clientgui/ViewStatistics.cpp:2182
-#: clientgui/ViewStatistics.cpp:2203
-#: clientgui/ViewStatistics.cpp:2224
-#: clientgui/ViewStatistics.cpp:2245
-#: clientgui/ViewStatistics.cpp:2266
-#: clientgui/ViewStatistics.cpp:2290
+#: clientgui/ViewStatistics.cpp:2097 clientgui/ViewStatistics.cpp:2118
+#: clientgui/ViewStatistics.cpp:2139 clientgui/ViewStatistics.cpp:2161
+#: clientgui/ViewStatistics.cpp:2182 clientgui/ViewStatistics.cpp:2203
+#: clientgui/ViewStatistics.cpp:2224 clientgui/ViewStatistics.cpp:2245
+#: clientgui/ViewStatistics.cpp:2266 clientgui/ViewStatistics.cpp:2290
 msgid "Updating charts..."
 msgstr "Абнаўляецца графік..."
 
@@ -4051,8 +4048,7 @@ msgstr ""
 msgid "File"
 msgstr "Файл"
 
-#: clientgui/ViewTransfers.cpp:183
-#: clientgui/ViewWork.cpp:232
+#: clientgui/ViewTransfers.cpp:183 clientgui/ViewWork.cpp:232
 msgid "Progress"
 msgstr "Прагрэс"
 
@@ -4093,7 +4089,8 @@ msgstr "Паўторная спроба перадачы данных..."
 
 #: clientgui/ViewTransfers.cpp:329
 msgid "Aborting transfer..."
-msgstr "Перапыненне перадачы данных з наступным выдаленнем перадаванага файла..."
+msgstr ""
+"Перапыненне перадачы данных з наступным выдаленнем перадаванага файла..."
 
 #: clientgui/ViewTransfers.cpp:342
 #, c-format
@@ -4143,13 +4140,11 @@ msgstr ""
 msgid " (project backoff: "
 msgstr ""
 
-#: clientgui/ViewWork.cpp:186
-#: clientgui/ViewWork.cpp:766
+#: clientgui/ViewWork.cpp:186 clientgui/ViewWork.cpp:766
 msgid "Show active tasks"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:187
-#: clientgui/ViewWork.cpp:767
+#: clientgui/ViewWork.cpp:187 clientgui/ViewWork.cpp:767
 msgid "Show only active tasks."
 msgstr ""
 
@@ -4169,7 +4164,9 @@ msgstr "Прыпыніць апрацоўку вылучанага заданн
 
 #: clientgui/ViewWork.cpp:215
 msgid "Abandon work on the result. You will get no credit for it."
-msgstr "Перапыніць апрацоўку вылучанага задання (выдаліць заданне). Ачкі за перарваныя заданні не налічаюцца."
+msgstr ""
+"Перапыніць апрацоўку вылучанага задання (выдаліць заданне). Ачкі за "
+"перарваныя заданні не налічаюцца."
 
 #: clientgui/ViewWork.cpp:234
 msgid "Elapsed"
@@ -4229,7 +4226,8 @@ msgstr ""
 #: clientgui/ViewWork.cpp:498
 #, fuzzy
 msgid "Aborting task..."
-msgstr "Перапыненне перадачы данных з наступным выдаленнем перадаванага файла..."
+msgstr ""
+"Перапыненне перадачы данных з наступным выдаленнем перадаванага файла..."
 
 #: clientgui/ViewWork.cpp:760
 msgid "Show all tasks"
@@ -4269,14 +4267,18 @@ msgstr ""
 
 #: clientgui/WelcomePage.cpp:325
 msgid ""
-"You have chosen to add a new volunteer computing project or change which projects\n"
+"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"
+"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"
+"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"
@@ -4306,8 +4308,7 @@ msgstr "Перапыніць працэс падлучэння ?"
 msgid "Question"
 msgstr "Пытанне"
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
+#: clientgui/wizardex.cpp:377 clientgui/wizardex.cpp:553
 msgid "&Next >"
 msgstr "Далей >"
 
@@ -4344,7 +4345,9 @@ msgid "Pie Ctrl"
 msgstr ""
 
 #: clientgui/mac/MacAccessiblity.cpp:257
-msgid "for accessibility support, please select advanced from the view menu or type command shift a"
+msgid ""
+"for accessibility support, please select advanced from the view menu or type "
+"command shift a"
 msgstr ""
 
 #: clientgui/mac/MacAccessiblity.cpp:302
@@ -4392,8 +4395,7 @@ msgstr ""
 msgid "list is empty"
 msgstr ""
 
-#: clientgui/mac/MacAccessiblity.cpp:858
-#: clientgui/mac/MacAccessiblity.cpp:870
+#: clientgui/mac/MacAccessiblity.cpp:858 clientgui/mac/MacAccessiblity.cpp:870
 #, c-format
 msgid "; row %d; "
 msgstr ""
@@ -4483,14 +4485,17 @@ msgstr ""
 #~ msgstr ""
 #~ "(C) 2003-2006 Каліфарнійскі ўніверсітэт, Берклі \n"
 #~ "Усё правы абароненыя."
+
 #~ msgid "Click 'Retry now' to transfer the file now"
 #~ msgstr "Запусціць паўторную перадачу данных"
+
 #~ msgid ""
 #~ "Click 'Abort transfer' to delete the file from the transfer queue. This "
 #~ "will prevent you from being granted credit for this result."
 #~ msgstr ""
 #~ "Выдаліць вылучаны перадаваны файл данных. УВАГА ачкі за выдалены файл "
 #~ "могуць быць страчаныя."
+
 #~ msgid "Aborting result..."
 #~ msgstr "Перарываецца апрацоўка вылучанага задання..."
 
@@ -4503,16 +4508,528 @@ msgstr ""
 #, fuzzy
 #~ msgid "Don't fetch ATI GPU tasks"
 #~ msgstr "Не запытваць новыя заданні"
+
 #~ msgid "Web sites"
 #~ msgstr "Спасылкі"
+
 #~ msgid "Retrieving host information; please wait..."
 #~ msgstr "Абнаўляецца інфармацыя аб хасце; калі ласка пачакайце..."
+
 #~ msgid "Skin:"
 #~ msgstr "Вокладка:"
+
 #~ msgid "Preferences"
 #~ msgstr "Агульныя налады"
+
 #~ msgid "I want to customize my preferences for this computer only."
 #~ msgstr "Змяніць параметры толькі для дадзенага кампутара."
+
 #~ msgid "Customized Preferences"
 #~ msgstr "Змяняныя параметры"
 
+# не вельмі
+#~ msgid "Upload pending"
+#~ msgstr "Чаканне адпраўкі данных"
+
+# не вельмі
+#~ msgid "Download pending"
+#~ msgstr "Чаканне загрузкі данных"
+
+#~ msgid "Get help with BOINC"
+#~ msgstr "Дапамога па працы з праграмаю BOINC"
+
+#~ msgid "Failed to attach to project"
+#~ msgstr "Не атрымалася дадаць праект"
+
+#~ msgid "Failed to attach to account manager"
+#~ msgstr ""
+#~ "Не атрымалася злучыцца\n"
+#~ "з мэнэджэрам праектаў"
+
+# ?
+#~ msgid "Attached to account manager"
+#~ msgstr "Злучэнне з мэнэджэрам праектаў усталявана"
+
+# ??
+#~ msgid "You are now successfully attached to the %s system."
+#~ msgstr "Падлучэнне да %s прайшло паспяхова."
+
+# ?
+#~ msgid "You are now successfully attached to this account manager."
+#~ msgstr ""
+#~ "Злучэнне з паказаным мэнэджэрам праектаў\n"
+#~ "паспяхова ўсталявана."
+
+#~ msgid "All projects"
+#~ msgstr "Усе праекты"
+
+#~ msgid "Attach to project"
+#~ msgstr "Падлучэнне да праекту"
+
+#~ msgid "Attach to account manager"
+#~ msgstr "Злучэнне з мэнэджэрам праектаў"
+
+# дубль (перакладу)
+#~ msgid "Attach to a project"
+#~ msgstr "Падлучыцца да яшчэ адному праекту размеркаваных вылічэнняў"
+
+#~ msgid "%s needs to connect to the Internet.  Please click to open %s."
+#~ msgstr "%s неабходна падлучыцца да інтэрнэту. Пстрыкніце каб адкрыць %s"
+
+#~ msgid ""
+#~ "%s couldn't do Internet communication, and no default connection is "
+#~ "selected.\n"
+#~ "Please connect to the Internet, or select a default connection\n"
+#~ "using Advanced/Options/Connections."
+#~ msgstr ""
+#~ "%s не змог звязацца з праектам і не знайшоў падлучэнні па змаўчанні.\n"
+#~ "Падлучыцеся да інтэрнэту або задайце падлучэнне па змаўчанні\n"
+#~ "у меню Дадаткова/Налады/Параметры падлучэння"
+
+#~ msgid "Attached to project"
+#~ msgstr "Праект дададзены"
+
+#~ msgid "You are now successfully attached to this project."
+#~ msgstr "Падлучэнне да праекту прайшло паспяхова."
+
+# ???
+#~ msgid "Attached to %s"
+#~ msgstr "Праект %s дадан"
+
+#~ msgid "Detach"
+#~ msgstr "Выдаліць праект"
+
+#~ msgid "Detaching from project..."
+#~ msgstr "Адлучэнне ад праекту..."
+
+#~ msgid "Are you sure you want to detach from project '%s'?"
+#~ msgstr "Вы сапраўды жадаеце адлучыцца ад праекту \"%s\"?"
+
+#~ msgid "Detach from Project"
+#~ msgstr "Адлучэнне ад праекту"
+
+#~ msgid " - user active"
+#~ msgstr " - карыстач працуе"
+
+#~ msgid " - need disk space"
+#~ msgstr " - бракуе месцы на дыску"
+
+#~ msgid "Attach to an additional project"
+#~ msgstr "Падлучыцца да яшчэ адному праекту размеркаваных вылічэнняў"
+
+#~ msgid "To completion"
+#~ msgstr "Засталося"
+
+#~ msgid "Attach to a project to begin processing work"
+#~ msgstr "Падлучыцца да яшчэ адному праекту размеркаваных вылічэнняў"
+
+#~ msgid "%s - Can't find web browser"
+#~ msgstr "%s - не знойдзены вэб-браўзэр"
+
+# ?
+# пошукі браўзэра працягваюцца...
+# Або ў Вас няма Internet Explorera
+#~ msgid ""
+#~ "%s tried to display the web page\n"
+#~ "\t%s\n"
+#~ "but couldn't find a web browser.\n"
+#~ "To fix this, set the environment variable\n"
+#~ "BROWSER to the path of your web browser,\n"
+#~ "then restart the %s."
+#~ msgstr ""
+#~ "%s паспрабаваў адкрыць старонку:\n"
+#~ "\t%s\n"
+#~ "але не змог знайсці браўзэр.\n"
+#~ "Наладзьце хоць бы адзін з браўзэраў\n"
+#~ "як браўзэр па змаўчанні\n"
+#~ "і перазапусціце %s."
+
+#~ msgid "Retrying communications for project(s)..."
+#~ msgstr "Паўторны абмен дадзенымі для ўсіх падлучаных праектаў..."
+
+# штучны інтэлект нейкі
+#~ msgid ""
+#~ "Required wizard file(s) are missing from the target server.\n"
+#~ "(lookup_account.php/create_account.php)\n"
+#~ msgstr ""
+#~ "На серверы адсутнічае запытаны майстрам файл.\n"
+#~ "(lookup_account.php/create_account.php)\n"
+
+#~ msgid "User information"
+#~ msgstr "Інфармацыя аб удзельніку"
+
+#~ msgid "Account Manager URL"
+#~ msgstr "Адрас мэнэджэра праектаў"
+
+#~ msgid "Enter the URL of the account manager's web site."
+#~ msgstr "Увядзіце адрас вылучанага мэнэджэра праектаў"
+
+#~ msgid "Close BOINC Manager Window."
+#~ msgstr "Зачыніць акно BOINC мэнэджэра."
+
+# ???
+# На жаль усё лепкае калісці заканчваецца :-)
+#~ msgid "Exit the %s"
+#~ msgstr "Завяршыць працу праграмы %s"
+
+#~ msgid "Attach to &project"
+#~ msgstr "Дадаць праект"
+
+#~ msgid "Attaching to project..."
+#~ msgstr "Падлучэнне да праекту..."
+
+# ёсць некаторыя сумненні ў правільнасці перакладу :)
+#~ msgid "Removal from %s completed."
+#~ msgstr "Выдаленне %s завершанае."
+
+# Goblin forever
+#~ msgid "Removal succeeded!"
+#~ msgstr "Ура, усё выдалена!"
+
+#~ msgid "TransfersGrid"
+#~ msgstr "Перадача"
+
+#~ msgid "TasksGrid"
+#~ msgstr "Заданні"
+
+#~ msgid ""
+#~ "We'll now guide you through the process of attaching\n"
+#~ "to a project."
+#~ msgstr ""
+#~ "Дадзены майстар дапаможа вам падлучыцца\n"
+#~ " да праекту размеркаваных вылічэнняў."
+
+#~ msgid ""
+#~ "We'll now guide you through the process of attaching\n"
+#~ "to an account manager.\n"
+#~ "\n"
+#~ "If you want to attach to a single project, click Cancel,\n"
+#~ "then select the 'Attach to project' menu item instead."
+#~ msgstr ""
+#~ "Дадзены майстар дапаможа вам падлучыцца\n"
+#~ "да мэнэджэра праектаў.\n"
+#~ "Калі вы жадаеце падлучыцца да праекту,\n"
+#~ "націсніце \"Адмена\" і вылучыце ў меню\n"
+#~ "\"Сэрвіс/Дадаць праект\"."
+
+#~ msgid ""
+#~ "You can copy and paste the URL from your browser's\n"
+#~ "address bar."
+#~ msgstr ""
+#~ "Можна скапіяваць дадзены адрас\n"
+#~ "з  радка браўзэра."
+
+#~ msgid "You are already attached to this project."
+#~ msgstr "Запушчаны BOINC кліент ужо падлучаны да дадзенага праекту"
+
+#~ msgid "Enter account key"
+#~ msgstr "Увядзіце код доступу"
+
+#~ msgid ""
+#~ "This project uses an \"account key\" to identify you.\n"
+#~ "\n"
+#~ "Go to the project's web site to create an account. Your account\n"
+#~ "key will be emailed to you."
+#~ msgstr ""
+#~ "Дадзены праект выкарыстае код доступу для ідэнтыфікацыі\n"
+#~ "удзельнікаў. Наведаеце хатнюю старонку праекту для\n"
+#~ "стварэнні  запісу ўдзельніка.\n"
+#~ "Пасля гэтага вам дашлюць код доступу па электроннай пошце."
+
+#~ msgid "An account key looks like:"
+#~ msgstr "Прыклад кода доступу:"
+
+#~ msgid "82412313ac88e9a3638f66ea82186948"
+#~ msgstr "82412313ac88e9a3638f66ea82186948"
+
+#~ msgid "Account key:"
+#~ msgstr "Код доступу:"
+
+#~ msgid ""
+#~ "Report completed work, get latest credit, get latest preferences, and "
+#~ "possibly get more work."
+#~ msgstr ""
+#~ "Пацверджанне завершаных заданняў і запыт новых, атрыманне інфармацыі аб "
+#~ "наладах і колькасці ачкоў."
+
+#~ msgid "&Defect from %s"
+#~ msgstr "Адлучыцца ад %s"
+
+#~ msgid "BOINC Manager - Detach from %s"
+#~ msgstr "BOINC мэнэджэр - адлучэнне ад %s"
+
+# Апрацоўка прыпынена...
+#~ msgid "%s is currently suspended...\n"
+#~ msgstr "%s - паўза ...\n"
+
+#~ msgid "%s networking is currently suspended...\n"
+#~ msgstr "Аўтаномная праца %s ...\n"
+
+#~ msgid "%s is currently reconnecting to a %s client...\n"
+#~ msgstr "%s спрабуе паўторна падлучыцца да %s кліенту...\n"
+
+#~ msgid ""
+#~ "A software platform for distributed computing using volunteered computer "
+#~ "resources"
+#~ msgstr ""
+#~ "Праграмная платформа для арганізацыі размеркаваных вылічэнняў\n"
+#~ " з выкарыстаннем кампутараў добраахвотнікаў"
+
+#~ msgid "Click here to disable displaying this message in the future."
+#~ msgstr "Больш не паказваць дадзенае паведамленне."
+
+#~ msgid "Language Selection:"
+#~ msgstr "Мова (language):"
+
+#~ msgid "What language should the manager display by default."
+#~ msgstr "Выбар мовы інтэрфейсу праграмы BOINC мэнэджэр."
+
+#~ msgid "Reminder Frequency:"
+#~ msgstr "Інтэрвал паміж паўторамі:"
+
+#~ msgid ""
+#~ "How often, in minutes, should the manager remind you of possible "
+#~ "connection events."
+#~ msgstr ""
+#~ "Інтэрвал, у хвілінах, паміж напамінкамі аб неабходнасці злучэння з "
+#~ "інтэрнэтам."
+
+#~ msgid "Project URL"
+#~ msgstr "Адрас праекту"
+
+#~ msgid "Enter the URL of the project's web site."
+#~ msgstr "Увядзіце адрас сайта вылучанага праекту."
+
+#~ msgid "For a list of BOINC-based projects go to:"
+#~ msgstr ""
+#~ "Для прагляду спісу даступных\n"
+#~ "BOINC праектаў наведаеце старонку:"
+
+#~ msgid "BOINC Manager - Messages"
+#~ msgstr "BOINC мэнэджэр - паведамленні"
+
+# ?
+#~ msgid "BOINC Manager - Preferences"
+#~ msgstr "BOINC мэнэджэр - персанальныя налады"
+
+# эээээээээ, пэўна ўсёткі працэсар перагружаны або абмежаванне загрузкі працэсара
+#~ msgid " - CPU throttled"
+#~ msgstr " - абмежаванне загрузкі працэсара"
+
+#~ msgid "Waiting"
+#~ msgstr "Чаканне"
+
+#~ msgid "Ready to run"
+#~ msgstr "Гатова да запуску"
+
+#~ msgid "Activities suspended by user"
+#~ msgstr "Прыпынена карыстачом"
+
+# ууууууууу якія канцэпты пайшлі, у амерыканцы даюць - пераход на ручное кіраванне ўжо прыдумалі.
+# думка - рухавік Прагрэсу
+#~ msgid ""
+#~ "We'll now remove this computer from %s.  You will\n"
+#~ "be responsible for managing the BOINC client software from\n"
+#~ "now on."
+#~ msgstr ""
+#~ "Кампутар адключаны ад %s. Зараз толькі вы\n"
+#~ "самі адказваеце за кіраванне BOINC кліентам\n"
+#~ " "
+
+#~ msgid "About BOINC Manager"
+#~ msgstr "Аб праграме BOINC мэнэджэр..."
+
+#~ msgid "BOINC Manager - Options"
+#~ msgstr "BOINC мэнэджэр - налады праграмы"
+
+#~ msgid "BOINC Manager - Select Computer"
+#~ msgstr "BOINC мэнэджэр - падлучэнне да кампутара"
+
+# my Spinhenge at home
+#~ msgid "Correspond with other users on the Spinhenge at home message boards"
+#~ msgstr "Форум для зносінаў з іншымі ўдзельнікамі праекту Spinhenge at home"
+
+# my Spinhenge at home
+#~ msgid "View and modify your Spinhenge at home account profile and preferences"
+#~ msgstr ""
+#~ "Прагляд і змена наладаў вашага  запісу і вашага профіля ў праекце "
+#~ "Spinhenge at home"
+
+# my Spinhenge at home
+#~ msgid ""
+#~ "View a listing of all the computers on which you are running "
+#~ "Spinhenge at Home"
+#~ msgstr ""
+#~ "Прагляд інфармацыі аб вашых кампутарах, якія ўдзельнічаюць у апрацоўцы "
+#~ "заданняў праекту Spinhenge at Home"
+
+# my Spinhenge at home
+#~ msgid "View information about your team:"
+#~ msgstr "Прагляд інфармацыі аб камандзе, да якой вы далучыліся: "
+
+# my Spinhenge at home
+#~ msgid "Spinhenge status"
+#~ msgstr "Стан сервераў"
+
+# my Spinhenge at home
+#~ msgid "Current status of the Spinhenge at home server"
+#~ msgstr "Інфармацыя аб бягучым стане сервераў праекту Spinhenge at home"
+
+# my SIMAP
+#~ msgid "Homepage of SIMAP"
+#~ msgstr "Хатняя старонка праекту SIMAP"
+
+# my Predictor at home
+#~ msgid "Info about Russia"
+#~ msgstr "Інфармацыя аб камандзе Russia"
+
+# my Predictor at home
+#~ msgid "Info about www.elite-games.ru"
+#~ msgstr "Інфармацыя аб камандзе www.elite-games.ru"
+
+# my Seti at home
+#~ msgid "View information about your team: Russia"
+#~ msgstr "Прагляд інфармацыі аб камандзе, да якой вы далучыліся: Russia"
+
+# my Seti at home
+#~ msgid "View information about your team: www.elite-games.ru"
+#~ msgstr ""
+#~ "Прагляд інфармацыі аб камандзе, да якой вы далучыліся: www.elite-games.ru"
+
+# my Primegrid
+#~ msgid "View detailed statistics"
+#~ msgstr "Прагляд падрабязнае статыстыкі па праектах."
+
+# my Primegrid
+#~ msgid "-- Support the project --"
+#~ msgstr "-- Падтрымка праекту --"
+
+# my Primegrid
+#~ msgid "Read about donations and support the project"
+#~ msgstr "Інфармацыя аб матэрыяльнай падтрымцы і далейшым развіцці праекту"
+
+# my Einstein
+#~ msgid "Your messages"
+#~ msgstr "Вашы паведамленні"
+
+# my Einstein
+#~ msgid ""
+#~ "Links to messages that you have posted on the Einstein at Home message "
+#~ "boards."
+#~ msgstr "Вашы паведамленні на форуме Einstein at Home."
+
+# my  SIMAP
+#~ msgid "Homepage of SIMAP at home"
+#~ msgstr "Хатняя старонка праекту SIMAP at home"
+
+# my Rosetta
+#~ msgid ""
+#~ "View a listing of all the computers on which you are running Rosetta at home"
+#~ msgstr ""
+#~ "Прагляд інфармацыі аб вашых кампутарах, якія ўдзельнічаюць у апрацоўцы "
+#~ "заданняў праекту Rosetta at home"
+
+# my Rosetta
+#~ msgid "View and modify your Rosetta at home account profile and preferences"
+#~ msgstr ""
+#~ "Прагляд і змена наладаў вашага  запісу і вашага профіля ў праекце "
+#~ "Rosetta at home"
+
+# my Rosetta
+#~ msgid "Correspond with other users on the Rosetta at home message boards"
+#~ msgstr "Форум для зносінаў з іншымі ўдзельнікамі праекту Rosetta at home"
+
+# my Leiden Classical
+#~ msgid "Get help about Leiden Classical"
+#~ msgstr "Дапамога па праекце Leiden Classical"
+
+# my QMC at HOME
+#~ msgid "Get help about QMC at HOME"
+#~ msgstr "Дапамога па праекце QMC at HOME"
+
+# my QMC at HOME
+#~ msgid "More"
+#~ msgstr "Пазнаць больш"
+
+# my QMC at HOME
+#~ msgid "More on QMC at HOME"
+#~ msgstr "Атрымаць больш інфармацыі аб праекце QMC at HOME"
+
+# my QMC at HOME
+#~ msgid "More on QMC at HOME workunits"
+#~ msgstr "Атрымаць больш інфармацыі аб праекце QMC at HOME"
+
+# my RALPH at home
+#~ msgid "Correspond with other users on the RALPH at home message boards"
+#~ msgstr "Форум для зносінаў з іншымі ўдзельнікамі праекту RALPH at home"
+
+# my RALPH at home
+#~ msgid "View and modify your RALPH at home account profile and preferences"
+#~ msgstr ""
+#~ "Прагляд і змена наладаў вашага  запісу і вашага профіля ў праекце "
+#~ "RALPH at home"
+
+# my RALPH at home
+#~ msgid ""
+#~ "View a listing of all the computers on which you are running RALPH at home"
+#~ msgstr ""
+#~ "Прагляд інфармацыі аб вашых кампутарах, якія ўдзельнічаюць у апрацоўцы "
+#~ "заданняў праекту RALPH at home"
+
+# my SETI at Home
+#~ msgid "Donate"
+#~ msgstr "Падтрымаць праект"
+
+# my SETI at Home
+#~ msgid "Donate to SETI at home"
+#~ msgstr "Падтрымаць праект SETI at home матэрыяльна :)"
+
+# my XtremLab
+#~ msgid "View your account informations"
+#~ msgstr "Прагляд інфармацыі аб вашым уліковым запісе"
+
+# my XtremLab
+#~ msgid "Introduction"
+#~ msgstr "Апісанне праекту"
+
+# my XtremLab
+#~ msgid "An Introduction to XtremLab"
+#~ msgstr "Знаёмства з праектам XtremLab"
+
+# my CPDN
+#~ msgid "Help Desk"
+#~ msgstr "Дапамога"
+
+# my CPDN
+#~ msgid "Get help from project staff and users with the experiment"
+#~ msgstr ""
+#~ "Тут можна атрымаць дапамогу па праекце і эксперыментам ад арганізатараў і "
+#~ "ўдзельнікаў."
+
+# my CPDN
+#~ msgid "User Forum"
+#~ msgstr "Форум удзельнікаў"
+
+# my CPDN
+#~ msgid "Speak to other users about this experiment"
+#~ msgstr "Форум для зносінаў з іншымі ўдзельнікамі праекту"
+
+# my Chess960 at home
+#~ msgid "Get help and chat with other users"
+#~ msgstr "Форум для зносінаў з іншымі ўдзельнікамі праекту"
+
+# my Riesel Sieve Project
+#~ msgid "Your Account"
+#~ msgstr "Ваш уліковы запіс"
+
+# my Riesel Sieve Project
+#~ msgid "View and edit project settings"
+#~ msgstr "Прагляд і змена наладаў вашага  праекту"
+
+# my Riesel Sieve Project
+#~ msgid "Top Participant Stats"
+#~ msgstr "Лепшыя ўдзельнікі"
+
+# my Riesel Sieve Project
+#~ msgid "Stats showing scores by user"
+#~ msgstr "Статыстыка ўдзельнікаў праекту"
diff --git a/locale/be/BOINC-Setup.mo b/locale/be/BOINC-Setup.mo
index bb32741..6cf6d4d 100644
Binary files a/locale/be/BOINC-Setup.mo and b/locale/be/BOINC-Setup.mo differ
diff --git a/locale/be/BOINC-Setup.po b/locale/be/BOINC-Setup.po
index edf04af..1d05e1f 100644
--- a/locale/be/BOINC-Setup.po
+++ b/locale/be/BOINC-Setup.po
@@ -5,12 +5,12 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-08-06 16:50-0800\n"
-"PO-Revision-Date: 2015-02-10 13:21-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,13 +23,11 @@ msgstr ""
 msgid "Sorry, this version of %s requires system 10.4 or higher."
 msgstr ""
 
-#: mac_installer/PostInstall.cpp:131
-#: mac_installer/PostInstall.cpp:1211
+#: mac_installer/PostInstall.cpp:131 mac_installer/PostInstall.cpp:1211
 msgid "Yes"
 msgstr ""
 
-#: mac_installer/PostInstall.cpp:132
-#: mac_installer/PostInstall.cpp:1212
+#: mac_installer/PostInstall.cpp:132 mac_installer/PostInstall.cpp:1212
 msgid "No"
 msgstr ""
 
@@ -40,9 +38,11 @@ msgstr ""
 #: mac_installer/PostInstall.cpp:1491
 #, c-format
 msgid ""
-"Users who are permitted to administer this computer will automatically be allowed to run and control %s.\n"
+"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?"
+"Do you also want non-administrative users to be able to run and control %s "
+"on this Mac?"
 msgstr ""
 
 #: mac_installer/PostInstall.cpp:1519
@@ -101,7 +101,8 @@ msgstr ""
 #: mac_installer/uninstall.cpp:796
 #, c-format
 msgid ""
-"Enter your administrator password to completely remove %s from you computer.\n"
+"Enter your administrator password to completely remove %s from you "
+"computer.\n"
 "\n"
 msgstr ""
 
@@ -112,4 +113,3 @@ msgstr ""
 #: mac_installer/uninstall.cpp:1544
 msgid "Continue..."
 msgstr ""
-
diff --git a/locale/be/BOINC-Web.mo b/locale/be/BOINC-Web.mo
index f1752e8..8701709 100644
Binary files a/locale/be/BOINC-Web.mo and b/locale/be/BOINC-Web.mo differ
diff --git a/locale/be/BOINC-Web.po b/locale/be/BOINC-Web.po
index 3c4ccb9..dad2a23 100644
--- a/locale/be/BOINC-Web.po
+++ b/locale/be/BOINC-Web.po
@@ -7,8 +7,8 @@ msgstr ""
 "Project-Id-Version: BOINC Web 6.x\n"
 "Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at ssl.berkeley.edu>\n"
 "POT-Creation-Date: 2013-08-22 16:22 PDT\n"
-"PO-Revision-Date: 2015-02-10 13:21-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
+"PO-Revision-Date: 2007-02-15 19:18+0200\n"
+"Last-Translator: Drive DRKA <drka2003 at mail.ru>\n"
 "Language-Team: Drive DRKA RTL <drkacorp at gmail.com>\n"
 "Language: be\n"
 "MIME-Version: 1.0\n"
@@ -16,10 +16,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.2.1\n"
 "X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-SearchPath-0: doc\n"
 "X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
 "X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
 "X-Poedit-KeywordsList: tra\n"
-"X-Poedit-SearchPath-0: doc\n"
 
 #: projects.inc:14
 msgid "Distributed sensing"
@@ -34,7 +34,10 @@ msgid "Seismology"
 msgstr ""
 
 #: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
+msgid ""
+"The Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to Internet-connected computers.  You must buy a "
+"sensor to participate."
 msgstr ""
 
 #: projects.inc:27
@@ -46,23 +49,24 @@ msgid "Environmental research"
 msgstr ""
 
 #: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
+msgid ""
+"This project is creating a free and continuously updated map of radiation "
+"levels by using sensors connected to volunteers' computers.  You must buy a "
+"sensor to participate."
 msgstr ""
 
 #: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
+msgid ""
+"To participate in these projects you must buy a sensor and attach it to your "
+"computer."
 msgstr ""
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
 msgstr ""
 
-#: projects.inc:50
-#: projects.inc:342
-#: projects.inc:386
-#: projects.inc:435
-#: projects.inc:442
-#: projects.inc:489
+#: projects.inc:50 projects.inc:342 projects.inc:386 projects.inc:435
+#: projects.inc:442 projects.inc:489
 msgid "Private"
 msgstr ""
 
@@ -71,7 +75,11 @@ msgid "Artificial intelligence"
 msgstr ""
 
 #: projects.inc:52
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
+msgid ""
+"Parse and convert semantic nets for use in FreeHAL, an artificial "
+"intelligence that uses semantic networks, stemmers, part of speech "
+"databases, and part of speech taggers in order to imitate human behavior in "
+"conversations."
 msgstr ""
 
 #: projects.inc:58
@@ -87,7 +95,12 @@ msgid "Antimalarial drug discovery"
 msgstr ""
 
 #: projects.inc:73
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
+msgid ""
+"The parasite that causes malaria continues to evolve resistance to available "
+"medication. We therefore urgently need to discover new drugs to replace "
+"existing drugs. Importantly, these new drugs need to target NEW proteins in "
+"the parasite. The FightMalaria at Home project is aimed at finding these new "
+"targets."
 msgstr ""
 
 #: projects.inc:79
@@ -99,7 +112,12 @@ msgid "Protein structure prediction"
 msgstr ""
 
 #: projects.inc:81
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
+msgid ""
+"POEM at HOME uses a computational approach to predict the biologically active "
+"structure of proteins, to understand the signal-processing mechanisms when "
+"the proteins interact with one another, to understand diseases related to "
+"protein malfunction or aggregation, and to develop new drugs on the basis of "
+"the three-dimensions structure of biologically important proteins."
 msgstr ""
 
 #: projects.inc:87
@@ -111,7 +129,11 @@ msgid "Study of protein - ligand interactions"
 msgstr ""
 
 #: projects.inc:89
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
+msgid ""
+"Docking at Home has both bioscience and computer science goals. The project "
+"aims to further knowledge of the atomic details of protein-ligand "
+"interactions and, by doing so, will search for insights into the discovery "
+"of novel pharmaceuticals."
 msgstr ""
 
 #: projects.inc:103
@@ -123,7 +145,11 @@ msgid "Molecular simulations of proteins"
 msgstr ""
 
 #: projects.inc:105
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
+msgid ""
+"GPUGrid.net opens novel computational scenarios by the first full-atom "
+"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
+"New biomedical applications suddenly become possible giving a new role to "
+"computational biology for biomedical research."
 msgstr ""
 
 #: projects.inc:111
@@ -135,11 +161,15 @@ msgid "Genetic linkage analysis"
 msgstr ""
 
 #: projects.inc:113
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
+msgid ""
+"Superlink at Technion helps geneticists all over the world find disease-"
+"provoking genes causing some types of diabetes, hypertension (high blood "
+"pressure), cancer, schizophrenia and many others."
 msgstr ""
 
 #: projects.inc:127
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
+msgid ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
 msgstr ""
 
 #: projects.inc:128
@@ -147,7 +177,11 @@ msgid "Life science research"
 msgstr ""
 
 #: projects.inc:129
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
+msgid ""
+"The Lattice Project supplies computing power to scientists at the University "
+"of Maryland studying evolutionary relationships based on DNA sequence data; "
+"bacterial, plasmid, and virus protein sequences; and biological diversity in "
+"nature reserves. "
 msgstr ""
 
 #: projects.inc:135
@@ -159,20 +193,32 @@ msgid "Epidemiology"
 msgstr ""
 
 #: projects.inc:137
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
+msgid ""
+"Simulation models of the transmission dynamics and health effects of malaria "
+"are an important tool for malaria control. They can be used to determine "
+"optimal strategies for delivering mosquito nets, chemotherapy, or new "
+"vaccines which are currently under development and testing.  Such modeling "
+"is extremely computer intensive, requiring simulations of large human "
+"populations with a diverse set of parameters related to biological and "
+"social factors that influence the distribution of the disease. "
 msgstr ""
 
 #: projects.inc:159
 msgid "University of Washington"
 msgstr ""
 
-#: projects.inc:160
-#: projects.inc:168
+#: projects.inc:160 projects.inc:168
 msgid "Biology"
 msgstr ""
 
 #: projects.inc:161
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
+msgid ""
+"Determine the 3-dimensional shapes of proteins in research that may "
+"ultimately lead to finding cures for some major human diseases. By running "
+"Rosetta at home you will help us speed up and extend our research in ways we "
+"couldn't possibly attempt without your help. You will also be helping our "
+"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
+"Cancer, and Alzheimer's"
 msgstr ""
 
 #: projects.inc:167
@@ -180,7 +226,10 @@ msgid "University of Vienna"
 msgstr ""
 
 #: projects.inc:169
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
+msgid ""
+"Calculate similarities between proteins. SIMAP provides a public database of "
+"the resulting data, which plays a key role in many bioinformatics research "
+"projects."
 msgstr ""
 
 #: projects.inc:175
@@ -196,34 +245,54 @@ msgid "Climate study"
 msgstr ""
 
 #: projects.inc:189
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
+msgid ""
+"Investigate the approximations that have to be made in state-of-the-art "
+"climate models. By running the model thousands of times we hope to find out "
+"how the model responds to slight tweaks to these approximations - slight "
+"enough to not make the approximations any less realistic. This will allow us "
+"to improve our understanding of how sensitive our models are to small "
+"changes and also to things like changes in carbon dioxide and the sulphur "
+"cycle. This will allow us to explore how climate may change in the next "
+"century under a wide range of different scenarios."
 msgstr ""
 
 #: projects.inc:196
 msgid "Astronomy, Physics, and Chemistry"
 msgstr ""
 
-#: projects.inc:202
-#: projects.inc:241
-#: projects.inc:249
+#: projects.inc:202 projects.inc:241 projects.inc:249
 msgid "Astronomy"
 msgstr ""
 
 #: projects.inc:203
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
+msgid ""
+"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
+"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
+"Universe. We will measure physical parameters (such as stellar mass surface "
+"density, star formation rate surface density, attenuation, and first-order "
+"star formation history) on a resolved pixel-by-pixel basis using spectral "
+"energy distribution (SED) fitting techniques in a distributed computing mode."
 msgstr ""
 
 #: projects.inc:225
 msgid "University of Texas at Austin"
 msgstr ""
 
-#: projects.inc:226
-#: projects.inc:257
+#: projects.inc:226 projects.inc:257
 msgid "Chemistry"
 msgstr ""
 
 #: projects.inc:227
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
+msgid ""
+"A common problem in theoretical chemistry, condensed matter physics and "
+"materials science is the calculation of the time evolution of an atomic "
+"scale system where, for example, chemical reactions and/or diffusion occur. "
+"Generally the events of interest are quite rare (many orders of magnitude "
+"slower than the vibrational movements of the atoms), and therefore direct "
+"simulations, tracking every movement of the atoms, would take thousands of "
+"years of computer calculations on the fastest present day computer before a "
+"single event of interest can be expected to occur.  Our research group is "
+"interested in calculating the long time dynamics of systems."
 msgstr ""
 
 #: projects.inc:240
@@ -231,7 +300,10 @@ msgid "University of Illinois at Urbana-Champaign"
 msgstr ""
 
 #: projects.inc:242
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
+msgid ""
+"The goal of Cosmology at Home is to search for the model that best describes "
+"our Universe and to find the range of models that agree with the available "
+"astronomical particle physics data."
 msgstr ""
 
 #: projects.inc:248
@@ -239,7 +311,10 @@ msgid "Rensselaer Polytechnic Institute"
 msgstr ""
 
 #: projects.inc:250
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
+msgid ""
+"The goal of Milkyway at Home is to create a highly accurate three dimensional "
+"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
+"Survey."
 msgstr ""
 
 #: projects.inc:256
@@ -247,7 +322,13 @@ msgid "Leiden University, The Netherlands"
 msgstr ""
 
 #: projects.inc:258
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
+msgid ""
+"Surface science calculations using Classical Dynamics.  Leiden Classical "
+"allows volunteers, students and other scientist to submit their personal "
+"calculations to the grid. Each user has his own personal queue for Classical "
+"Dynamics jobs. In this way students have used the grid to simulate liquid "
+"argon, or to test the validity of the ideal gas law by actually doing the "
+"simulations through the grid."
 msgstr ""
 
 #: projects.inc:272
@@ -259,25 +340,36 @@ msgid "Astrophysics"
 msgstr ""
 
 #: projects.inc:274
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
+msgid ""
+"Search for spinning neutron stars (also called pulsars) using data from the "
+"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
+"observatory.  Einstein at Home is a World Year of Physics 2005 project "
+"supported by the American Physical Society (APS) and by a number of "
+"international organizations."
 msgstr ""
 
-#: projects.inc:288
-#: projects.inc:296
+#: projects.inc:288 projects.inc:296
 msgid "CERN (European Organization for Nuclear Research)"
 msgstr ""
 
-#: projects.inc:289
-#: projects.inc:297
+#: projects.inc:289 projects.inc:297
 msgid "Physics"
 msgstr ""
 
 #: projects.inc:290
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
+msgid ""
+"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
+"European Organization for Nuclear Research, the world's largest particle "
+"physics laboratory.  It is the most powerful instrument ever built to "
+"investigate on particles proprieties. LHC at home runs simulations to improve "
+"the design of LHC and its detectors."
 msgstr ""
 
 #: projects.inc:298
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
+msgid ""
+"This project uses CERN-developed virtual machine technology for full-fledged "
+"LHC event physics simulation on volunteer computers.  Requires that you "
+"install VirtualBox on your computer"
 msgstr ""
 
 #: projects.inc:304
@@ -289,7 +381,12 @@ msgid "Astrophysics, astrobiology"
 msgstr ""
 
 #: projects.inc:306
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
+msgid ""
+"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
+"goal is to detect intelligent life outside Earth. One approach, known as "
+"radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
+"signals from space. Such signals are not known to occur naturally, so a "
+"detection would provide evidence of extraterrestrial technology."
 msgstr ""
 
 #: projects.inc:320
@@ -301,7 +398,11 @@ msgid "Chemical engineering and nanotechnology"
 msgstr ""
 
 #: projects.inc:322
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
+msgid ""
+"The study of molecular magnets and controlled nanoscale magnetism.  These "
+"magnetic molecules may be used to develop tiny magnetic switches, with "
+"applications in medicine (such as local tumor chemotherapy) and "
+"biotechnology."
 msgstr ""
 
 #: projects.inc:329
@@ -317,7 +418,10 @@ msgid "Physics, biochemistry, and others"
 msgstr ""
 
 #: projects.inc:336
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
+msgid ""
+"The objective of CAS at home is to encourage and assist scientists in China to "
+"adopt the technologies of volunteer computing and volunteer thinking for "
+"their research."
 msgstr ""
 
 #: projects.inc:343
@@ -325,11 +429,12 @@ msgid "Mathematics, physics, evolution"
 msgstr ""
 
 #: projects.inc:344
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
+msgid ""
+"Yoyo at home is an adapter between BOINC and several existing volunteer "
+"computing projects: ECM, Muon, Evolution at home, and distributed.net"
 msgstr ""
 
-#: projects.inc:349
-#: projects.inc:505
+#: projects.inc:349 projects.inc:505
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 msgstr ""
 
@@ -338,7 +443,11 @@ msgid "European research projects"
 msgstr ""
 
 #: projects.inc:351
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
+msgid ""
+"The EDGeS at Home Beta project integrates volunteer computing into the service "
+"grid network of Europe by allowing service grids to send workunits to be "
+"processed by the volunteers of this project. The scientific projects covered "
+"by the project include math, physics, biology, etc."
 msgstr ""
 
 #: projects.inc:357
@@ -362,7 +471,11 @@ msgid "Medical, environmental and other humanitarian research"
 msgstr ""
 
 #: projects.inc:367
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
+msgid ""
+"To further critical non-profit research on some of humanity's most pressing "
+"problems by creating the world's largest volunteer computing grid.  Research "
+"includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"clean water and many more."
 msgstr ""
 
 #: projects.inc:373
@@ -381,21 +494,18 @@ msgstr ""
 msgid "Simulation of quantum computing; Goldbach's conjecture."
 msgstr ""
 
-#: projects.inc:428
-#: projects.inc:436
+#: projects.inc:428 projects.inc:436
 msgid "Cryptography"
 msgstr ""
 
 #: projects.inc:437
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
+msgid ""
+"Attempt to decode 3 original Enigma messages. The signals were intercepted "
+"in the North Atlantic in 1942 and are believed to be unbroken."
 msgstr ""
 
-#: projects.inc:443
-#: projects.inc:482
-#: projects.inc:490
-#: projects.inc:498
-#: projects.inc:506
-#: projects.inc:546
+#: projects.inc:443 projects.inc:482 projects.inc:490 projects.inc:498
+#: projects.inc:506 projects.inc:546
 msgid "Mathematics"
 msgstr ""
 
@@ -412,11 +522,19 @@ msgid "Factorization of large integers"
 msgstr ""
 
 #: projects.inc:451
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
+msgid ""
+"NFS at Home is a research project that uses Internet-connected computers to do "
+"the lattice sieving step in the Number Field Sieve factorization of large "
+"integers. As a young school student, you gained your first experience at "
+"breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
+"NFS at Home is a continuation of that experience, only with integers that are "
+"hundreds of digits long."
 msgstr ""
 
 #: projects.inc:457
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
+msgid ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
 msgstr ""
 
 #: projects.inc:458
@@ -424,7 +542,11 @@ msgid "Software testing"
 msgstr ""
 
 #: projects.inc:459
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
+msgid ""
+"The aim of this project is to provide a powerful distributed computing "
+"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
+"well as others Lithuanian academic institutions.  Current applications "
+"involve the study of Monte-Carlo based software testing."
 msgstr ""
 
 #: projects.inc:481
@@ -432,11 +554,20 @@ msgid "Mathematical Institute of Leiden University / Kennislink"
 msgstr ""
 
 #: projects.inc:483
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
+msgid ""
+"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
+"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
+"product of the distinct prime factors of n. The ABC conjecture says that "
+"there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for "
+"any real h > 1. The ABC conjecture is currently one of the greatest open "
+"problems in mathematics. If it is proven to be true, a lot of other open "
+"problems can be answered directly from it."
 msgstr ""
 
 #: projects.inc:491
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
+msgid ""
+"Primegrid has multiple projects searching for different forms of very large "
+"prime numbers, including searching for the largest known prime number."
 msgstr ""
 
 #: projects.inc:497
@@ -444,11 +575,15 @@ msgid "Hochschule RheinMain University of Applied Sciences"
 msgstr ""
 
 #: projects.inc:499
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
+msgid ""
+"Search for counterexamples to two conjectures related to the identification "
+"of prime numbers"
 msgstr ""
 
 #: projects.inc:507
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
+msgid ""
+"Find all the generalized binary number systems (in which bases are matrices "
+"and digits are vectors) up to dimension 11."
 msgstr ""
 
 #: docutil.php:21
@@ -474,11 +609,17 @@ msgid "%s for %s (%s MB)"
 msgstr ""
 
 #: download.php:87
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others. <p> After installing BOINC on your computer, you can connect it to as many of these projects as you like."
+msgid ""
+"BOINC is a program that lets you donate your idle computer time to science "
+"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, and many others. <p> After installing BOINC on your "
+"computer, you can connect it to as many of these projects as you like."
 msgstr ""
 
 #: download.php:89
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
+msgid ""
+"You may run this software on a computer only if you own the computer or have "
+"the permission of its owner."
 msgstr ""
 
 #: download.php:131
@@ -489,8 +630,7 @@ msgstr ""
 msgid "Release notes"
 msgstr ""
 
-#: download.php:133
-#: index.php:85
+#: download.php:133 index.php:85
 msgid "Help"
 msgstr ""
 
@@ -512,20 +652,34 @@ msgstr ""
 
 #: help.php:12
 #, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
+msgid ""
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who "
+"can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"through the process of installing and using BOINC; %s troubleshoot any "
+"problems you might have."
 msgstr ""
 
 #: help.php:21
 #, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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."
+msgid ""
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. "
+"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 ""
 
 #: help.php:28
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
+msgid ""
+"The best way to get help is by voice, for which you need either built-in "
+"microphone and speakers or an external headset for your computer.  You can "
+"also use Skype's text-based chat system or regular email (if you don't have "
+"Skype) to communicate with Help Volunteers."
 msgstr ""
 
 #: help.php:31
-msgid "Volunteers speaking several languages are available. Please select a language:"
+msgid ""
+"Volunteers speaking several languages are available. Please select a "
+"language:"
 msgstr ""
 
 #: help.php:47
@@ -534,16 +688,22 @@ msgstr ""
 
 #: help.php:50
 #, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
+msgid ""
+"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+"Volunteer%s.  It's a great way to help the cause of scientific research and "
+"volunteer computing - and it's fun!"
 msgstr ""
 
 #: help.php:56
 #, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
+msgid ""
+"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
 msgstr ""
 
 #: help_funcs.php:107
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
+msgid ""
+"BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
+"or the University of California."
 msgstr ""
 
 #: help_funcs.php:110
@@ -594,9 +754,7 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: index.php:86
-#: index.php:123
-#: index.php:174
+#: index.php:86 index.php:123 index.php:174
 msgid "Documentation"
 msgstr ""
 
@@ -610,12 +768,19 @@ msgstr ""
 
 #: index.php:94
 #, php-format
-msgid " Use the idle time on your computer (Windows, Mac, or Linux) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:  %sChoose%s projects  %sDownload%s and run BOINC software  %sEnter%s an email address and password. "
+msgid ""
+" Use the idle time on your computer (Windows, Mac, or Linux) to cure "
+"diseases, study global warming, discover pulsars, and do many other types of "
+"scientific research.  It's safe, secure, and easy:  %sChoose%s projects  "
+"%sDownload%s and run BOINC software  %sEnter%s an email address and "
+"password. "
 msgstr ""
 
 #: index.php:105
 #, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
+msgid ""
+"Or, if you run several projects, try an %saccount manager%s such as "
+"%sGridRepublic%s or %sBAM!%s. "
 msgstr ""
 
 #: index.php:121
@@ -627,11 +792,15 @@ msgid "Software updates"
 msgstr ""
 
 #: index.php:131
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving "
+"you the computing power of thousands of CPUs."
 msgstr ""
 
 #: index.php:135
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
 msgstr ""
 
 #: index.php:140
@@ -708,7 +877,8 @@ msgstr ""
 
 #: index.php:265
 #, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
+msgid ""
+"Open-source software for %svolunteer computing%s and %sgrid computing%s."
 msgstr ""
 
 #: index.php:278
@@ -724,3 +894,488 @@ msgstr ""
 msgid "News is available as an %sRSS feed%s"
 msgstr ""
 
+# The charset used for the text in this file (please try to use UTF-8 if possible)
+#~ msgid "CHARSET"
+#~ msgstr "UTF-8"
+
+#~ msgid "HOME_BOINC"
+#~ msgstr "Berkeley Open Infrastructure for Network Computing"
+
+#~ msgid "HOME_BOINC_DESC"
+#~ msgstr ""
+#~ "Open-source software for %svolunteer computing%s and %sgrid computing%s"
+
+# ######################################
+# download.php 2006/08/03 by je2bwm
+# ######################################
+# Download BOINC
+#~ msgid "DL_DOWNLOAD"
+#~ msgstr "Загрузіць BOINC"
+
+# %s for %s (%s MB)
+#~ msgid "DL_VERSION_LNAME_SIZE"
+#~ msgstr "%s для %s (%s Мбайт)"
+
+#  BOINC is a program that lets you donate        your idle computer time to science projects like        SETI at home, Climateprediction.net, Rosetta at home,        World Community Grid, and many others.        <p>        After installing BOINC on your computer,        you can connect it to as many of these projects as you like.        <p>
+#~ msgid "DL_WHATS_BOINC"
+#~ msgstr ""
+#~ "BOINC - гэта праграма, якая прадстаўляе нявыкарыстаны час вашага "
+#~ "кампутара для навуковых праектаў, такіх як: SETI at home, Climateprediction."
+#~ "net, Rosetta at home, World Community Grid і іншых. <p> Пасля ўсталёўкі "
+#~ "BOINC на ваш кампутар, вы зможаце вылучыць і ўдзельнічаць адначасова ў "
+#~ "некалькіх праектах, якіх - вырашайце самі. <p>"
+
+# System requirements
+#~ msgid "DL_SYSTEMREQ"
+#~ msgstr "Сістэмныя патрабаванні"
+
+# Release notes
+# ???
+#~ msgid "DL_RELNOTES"
+#~ msgstr "Апісанне апошняй версіі"
+
+# Troubleshooting
+#~ msgid "DL_TROUBLE"
+#~ msgstr "Вядомыя праблемы"
+
+# Other systems
+#~ msgid "DL_OTHERSYS"
+#~ msgstr "Іншыя аперацыйныя сістэмы"
+
+# All versions
+#~ msgid "DL_ALLVERSIONS"
+#~ msgstr "Усе версіі"
+
+# If your computer is not of one of the above types, you can
+#~ msgid "DL_IF_OTHERTYPES"
+#~ msgstr ""
+#~ "Калі вашаму кампутару не падыходзіць ні адзін з варыянтаў, вы можаце"
+
+# %s make your own client software %s or
+# ???
+#~ msgid "DL_MAKEYOUROWN"
+#~ msgstr "%s стварыць праграму кліента на базе зыходных тэкстаў %s або"
+
+# %s download executables from a third-party site %s (available for Solaris/Opteron, Linux/Opteron, Linux/PPC, HP-UX, and FreeBSD, and others).
+#~ msgid "DL_DL_FROM3RDP"
+#~ msgstr ""
+#~ "%s загрузіць гатовыя ўсталявальныя файлы з неафіцыйных сайтаў %s "
+#~ "(даступныя версіі для Solaris/Opteron, Linux/Opteron, Linux/PPC, HP-UX, "
+#~ "FreeBSD, а таксама іншых платформаў)."
+
+# BOINC: compute for science
+#~ msgid "DL_DOWNLOAD_TITLE"
+#~ msgstr "BOINC: вылічэнні для навукі"
+
+# ############################################
+# system_requirements.php by je2bwm 2006/08/07
+# ############################################
+# System requirements
+#~ msgid "SRQ_PAGE_TITLE"
+#~ msgstr "Сістэмныя патрабаванні"
+
+# Your computer must satisfy the following requirements to run BOINC. BOINC-based projects may have additional requirements.
+#~ msgid "SRQ_INTRO"
+#~ msgstr ""
+#~ "Для нармалёвае працы BOINC ваш кампутар павінен задавальняць выкладзеным "
+#~ "ніжэй патрабаванням. Праекты выкарыстоўвалыя платформу BOINC могуць "
+#~ "прад'яўляць свае дадатковыя патрабаванні да кампутара."
+
+# Windows
+#~ msgid "SRQ_MSWIN"
+#~ msgstr "Windows"
+
+# Operating systems
+#~ msgid "SRQ_OS"
+#~ msgstr "Версіі аперацыйнае сістэмы"
+
+# Windows 98 or later
+#~ msgid "SRQ_MSWIN_REQ_OS"
+#~ msgstr "Windows 98 або пазнейшая"
+
+# Minimum hardware
+#~ msgid "SRQ_MIN_HARDWARE"
+#~ msgstr "Мінімальныя патрабаванні да кампутара"
+
+# Pentium 233 MHz (Recommended: Pentium 500 MHz or greater)
+#~ msgid "SRQ_MSWIN_REQ_CPU"
+#~ msgstr ""
+#~ "Працэсар: Pentium 233 Мгц (Рэкамендуецца: Pentium 500 Мгц або хутчэй)"
+
+# 64 MB RAM (Recommended: 128 MB RAM or greater)
+#~ msgid "SRQ_MSWIN_REQ_RAM"
+#~ msgstr "Памяць: 64 Мбайт АЗП (Рэкамендуецца: 128 Мбайт або больш)"
+
+# 20 MB disk space
+#~ msgid "SRQ_MSWIN_REQ_DISK"
+#~ msgstr "20 Мбайт вольнага месца на цвёрдым дыску"
+
+# Macintosh
+#~ msgid "SRQ_APPLMAC"
+#~ msgstr "Macintosh"
+
+# Mac OS X 10.3 and later
+#~ msgid "SRQ_APPLMAC_REQ_OS"
+#~ msgstr "Mac OS X 10.3 або пазнейшая"
+
+# Macintosh computer with an Intel x86or PowerPC G3, G4, or G5 processor
+#~ msgid "SRQ_APPLMAC_REQ_CPU"
+#~ msgstr "Кампутар Macintosh з працэсарам Intel x86 або PowerPC G3, G4, G5"
+
+# 128 MB RAM (Recommended: 256 MB RAM or greater)
+#~ msgid "SRQ_APPLMAC_REQ_RAM"
+#~ msgstr "Памяць: 128 Мбайт АЗП (Рэкамендуецца: 256 Мбайт або больш)"
+
+# 200 MB disk space
+#~ msgid "SRQ_APPLMAC_REQ_DISK"
+#~ msgstr "200 Мбайт вольнага месца на цвёрдым дыску"
+
+# Linux
+#~ msgid "SRQ_LINUX"
+#~ msgstr "Linux"
+
+# Linux kernel 2.2.14 or higher
+#~ msgid "SRQ_LINUX_REQ_KERNEL"
+#~ msgstr "ядро Linux 2.2.14 або навей"
+
+# glibc 2.3.2 or higher
+#~ msgid "SRQ_LINUX_REQ_GLIBC"
+#~ msgstr "glibc 2.3.2 або навей"
+
+# XFree86-3.3.6 or higher
+#~ msgid "SRQ_LINUX_REQ_XFREE86"
+#~ msgstr "XFree86-3.3.6 або навей"
+
+# gtk+2.0 or higher
+#~ msgid "SRQ_LINUX_REQ_GTKPLUS"
+#~ msgstr "gtk+2.0 або навей"
+
+# Pentium 500 MHz or greater
+#~ msgid "SRQ_LINUX_REQ_CPU"
+#~ msgstr "Pentium 500 Мгц або хутчэй"
+
+# 64 MB RAM
+#~ msgid "SRQ_LINUX_REQ_RAM"
+#~ msgstr "Памяць: 64 Мбайт АЗП"
+
+# 50 MB disk space
+#~ msgid "SRQ_LINUX_REQ_DISK"
+#~ msgstr "50 Мбайт вольнага месца на цвёрдым дыску"
+
+# ############################################
+# release notes by je2bwm 2006/08/09
+# ############################################
+# Release notes
+#~ msgid "RLN_PAGE_TITLE"
+#~ msgstr "Апісанне апошняй версіі"
+
+# What's new in %s
+#~ msgid "RLN_WHATS_NEW"
+#~ msgstr "Што новага ў версіі %s"
+
+# Installing
+#~ msgid "RLN_INSTALLING"
+#~ msgstr "Усталёўка праграмы"
+
+# Uninstalling
+#~ msgid "RLN_UNINSTALLING"
+#~ msgstr "Выдаленне праграмы"
+
+# Known issues
+#~ msgid "RLN_KNOWN_ISSUES"
+#~ msgstr "Магчымыя праблемы"
+
+# (Windows) In rare cases, installation may fail because "
+#     "of an existing installation of BOINC.  If this happens: "
+#     "%s Quit BOINC if it's running, and uninstall BOINC "
+#     "using %s Start/Control Panel/Add and remove programs%s. "
+#     "Install the new version again. "
+#     "%s If that fails, reinstall the version of BOINC you "
+#     "were previously running "
+#     "(old versions can be found %shere%s). "
+#     "Uninstall it as above, then install the new version. "
+#     "%s If that fails, download the %sWindows Install Clean Up%s "
+#     "utility from Microsoft and run it. "
+#     "The old BOINC version shows up as either BOINC.msi or as "
+#     "a corrupt icon .msi (it'll be the top option). "
+#     "Click on it to select, then click Remove and Exit. "
+#     "Reboot your computer. "
+#     "Install the new version. "
+#     "(Warning: leave all other .msi files as they are, "
+#      "otherwise you will have problems uninstalling other programs). "
+#     "%s
+#~ msgid "RLN_WIN_INSTALL_PROBLEMS"
+#~ msgstr ""
+#~ "(Windows) BOINC можа не ўсталявацца, калі не выдаленая папярэдняя версія "
+#~ "праграмы. У такім разе варта выканаць наступныя дзеянні: %s Завяршыць "
+#~ "працу BOINC і выдаліць праз %s 'Пуск/Налада/Панэль кіравання/Усталёўка і "
+#~ "выдаленне праграмаў' %s. Паспрабаваць усталяваць новую версію BOINC. %s У "
+#~ "выпадку няўдачы, усталяваць папярэднюю версію BOINC (усе версіі BOINC "
+#~ "можна знайсці %sздесь%s). Затым выдаліць яе і паспрабаваць усталяваць "
+#~ "новую версію BOINC. %s Калі і гэта не дапаможа, то можна скарыстацца "
+#~ "праграмаю %sWindows Install Clean Up%s. Старыя версіі BOINC "
+#~ "адлюстроўваюцца ў ёй як 'BOINC.msi' або 'corrupt icon .msi'.Вылучыце "
+#~ "дадзены пункт і націсніце 'Remove'. Перазагрузіце кампутар і паспрабуйце "
+#~ "ўсталяваць новую версію BOINC.(УВАГА: пры выкарыстанні праграмы Windows "
+#~ "Install Clean Up не спрабуйце выдаляць іншыя .msi файлы, гэта не "
+#~ "дапаможа). %s"
+
+# Troubleshooting BOINC
+#~ msgid "RLN_TROUBLESHOOT"
+#~ msgstr "Вядомыя праблемы пры працы BOINC"
+
+# Support for 'Account managers' - web sites that let you browse BOINC projects, attach/detach, change resource share and settings, all with point-and-click simplicity. Account managers are also great if you have several computers - you just have to make changes once.
+#~ msgid "RLN_NEWF_5_4_AM"
+#~ msgstr ""
+#~ "Дададзеная падтрымка 'Мэнэджэраў праектаў' - гэта сайты аб'яднаўчыя "
+#~ "інфармацыю па праектах выкарыстоўвалым платформу BOINC,  якія дазваляюць "
+#~ "выбіраць праекты, падлучацца або адлучацца ад праектаў, змяняць агульныя "
+#~ "налады адразу для ўсіх праектаў, і што маюць пры гэтым простай і "
+#~ "зразумелы інтэрфейс. Дадзеныя сайты зручныя калі вы запукаете BOINC на "
+#~ "некалькіх кампутарах, у гэтым выпадку вам будзе неабходна падлучацца "
+#~ "толькі да 'Мэнэджэру праектаў', а не да ўсяго n-му колькасці праектаў у "
+#~ "якіх вы захочаце ўдзельнічаць. "
+
+# General preferences can be overridden by a local file; details are %s here %s.
+# ???
+#~ msgid "RLN_NEWF_5_4_PREF_OVERRIDE"
+#~ msgstr ""
+#~ "Агульныя налады могуць быць замененыя наладамі з лакальна захоўваемага "
+#~ "файла; падрабязнасці можна пазнаць %s тут %s"
+
+# BOINC now alerts you whenever it needs you to create a network connection.
+#~ msgid "RLN_NEWF_5_4_ALERTS_CONNECT"
+#~ msgstr ""
+#~ "BOINC мэнэджэр выдае дыялогавае акно з напамінкам штораз, калі BOINC "
+#~ "кліенту патрабуецца ўсталяваць злучэнне з інтэрнэтам."
+
+# The BOINC Manager offers two different interfaces:  'Simple' (small, graphical, skinnable)  and 'Advanced' (maximum information).  The Simple GUI allows local editing of preferences.  You can switch back and forth between Simple and Advanced.
+#~ msgid "RLN_5_8_SIMPLE_GUI"
+#~ msgstr ""
+#~ "У BOINC мэнэджэру з'явілася два варыянту знешняга выгляду - "
+#~ "'Скарочаны' (менш інфармацыі, прыгажэй, прасцей) і 'Поўны' (уся магчымая "
+#~ "інфармацыя аб працы BOINC). У 'Скарочаным' выглядзе даступна рэдагаванне "
+#~ "'персанальных' (лакальных) наладаў BOINC кліента. У любы момант можна "
+#~ "змяніць знешні выгляд праграмы з 'Скарочанага' на 'Поўны' і наадварот."
+
+#  CPU throttling: you can reduce CPU heat by limiting  the fraction of time that BOINC computes.
+#~ msgid "RLN_5_8_THROTTLE"
+#~ msgstr ""
+#~ " Рэгуляваная загрузка ЦП: для таго каб пазбегнуць перагрэва зараз можна "
+#~ "задаць абмежаванне адсотка загрузкі ЦП."
+
+#  Improved scheduling policies avoid missing job deadlines  even on a slow computer with lots of projects.
+#~ msgid "RLN_5_8_SCHED"
+#~ msgstr ""
+#~ " Палепшаны механізм выдачы заданняў для павольных кампутараў з вялікай "
+#~ "колькасцю праектаў."
+
+# You can limit the amount of memory used by BOINC; this lets you compute all the time without losing performance.
+#~ msgid "RLN_5_8_MEM"
+#~ msgstr ""
+#~ "Дададзена абмежаванне на занятую прыкладаннямі BOINC памяць пры "
+#~ "апрацоўцы; гэта павінна дапамагчы пазбегнуць падзенні прадукцыйнасці "
+#~ "кампутара (для простых карыстачоў) падчас апрацоўкі заданняў."
+
+#  Mac OS X version runs applications in an unpriviledged account,  increasing security.
+#~ msgid "RLN_5_8_SANDBOX"
+#~ msgstr ""
+#~ " Для Mac OS X падвышаная бяспека за рахунак запуску прыкладанняў BOINC з "
+#~ "правамі 'простага' карыстача, а не адміністратара."
+
+#  Snooze button (in the system tray icon) lets you  stop computing for one hour.
+#~ msgid "RLN_5_8_SNOOZE"
+#~ msgstr ""
+#~ " Выбар пункта меню 'Паўза' (меню BOINC у трэі) прыпыняе апрацоўку на адну "
+#~ "гадзіну."
+
+# We recommend that all BOINC users upgrade to %s.
+#~ msgid "RLN_RECOMMEND_LATEST_VERSION"
+#~ msgstr "Настойліва рэкамендуецца абнавіць BOINC да версіі %s"
+
+# A detailed revision history is %s here %s.
+#~ msgid "RLN_LINK2_VERSION_HISTORY"
+#~ msgstr "Падрабязней аб новаўвядзеннях у розных версіях %s тут %s"
+
+# Windows
+#~ msgid "RLN_MSWIN"
+#~ msgstr "Windows"
+
+# Macintosh
+#~ msgid "RLN_APPLMAC"
+#~ msgstr "Macintosh"
+
+# Linux
+#~ msgid "RLN_LINUX"
+#~ msgstr "Linux"
+
+# BOINC can be installed in any of several modes:
+#~ msgid "RLN_MSWIN_INSTALL_MODES"
+#~ msgstr "Існуе некалькі варыянтаў усталёўкі BOINC:"
+
+# Single-user installation
+#~ msgid "RLN_SINGLE_USER_INSTALL"
+#~ msgstr "Індывідуальная ўсталёўка"
+
+# This is the recommended mode. BOINC will run while you (the installing user) are logged in. BOINC is listed in the Start menu of you,but not other users. The 'Show graphics' command in the BOINC managerworks only for you. The BOINC screensaver shows applicationgraphics only for you (other users can run the screensaver but will see  textual information only).
+#~ msgid "RLN_MSWIN_INSTALL_SINGLE_USER_DESC"
+#~ msgstr ""
+#~ "Рэкамендуемы варыянт усталёўкі. BOINC кліент будзе працаваць толькі калі "
+#~ "вы (карыстач, які ўсталёўвае BOINC) зайдзеце на ваш кампутар. BOINC будзе "
+#~ "паказвацца толькі ў вашым меню праграмаў 'Пуск'. Кнопка 'Паказаць "
+#~ "графіку' у BOINC мэнэджэру будзе працаваць толькі ў вас. Экранная "
+#~ "застаўка BOINC будзе паказваць графіку прыкладанняў толькі ў вас (іншыя "
+#~ "карыстачы кампутара таксама змогуць вылучыць экранную застаўку BOINC, але "
+#~ "яны будуць бачыць толькі тэкст)."
+
+# Shared installation
+#~ msgid "RLN_SHARED_INSTALL"
+#~ msgstr "Усталёўка для ўсіх карыстачоў"
+
+# BOINC runs whenever any user is logged in. BOINC is listed in the Start menu of all users. While BOINC is running, it runs as a particular user (either the first user to log in, or the first to run BOINC). The 'Show graphics' command in the BOINC manager works only for this user. The BOINC screensaver shows application graphics only for this user (other users can run the screensaver but will see  textual information only).
+#~ msgid "RLN_MSWIN_INSTALL_SHARED_DESC"
+#~ msgstr ""
+#~ "BOINC кліент будзе запускацца пры ўваходзе любога карыстача кампутара. "
+#~ "BOINC будзе паказвацца ў меню праграмаў 'Пуск' у ўсіх карыстачоў "
+#~ "кампутара. BOINC будзе запускацца ад імя першага які ўвайшоў на кампутар "
+#~ "карыстача (пасля выхаду дадзенага карыстача адлік першага карыстача "
+#~ "пачынаецца зноўку). Кнопка 'Паказаць графіку' у BOINC мэнэджэру будзе "
+#~ "працаваць толькі ў дадзенага першага карыстача. Экранная застаўка BOINC "
+#~ "будзе паказваць графіку прыкладанняў толькі ў дадзенага першага карыстача "
+#~ "(іншыя карыстачы кампутара таксама змогуць вылучыць экранную застаўку "
+#~ "BOINC, але яны будуць бачыць толькі тэкст)."
+
+# Shared installation
+#~ msgid "RLN_WIN_SERVICE_INSTALL"
+#~ msgstr "Усталёўка ў якасці службы"
+
+# BOINC runs all the time (even when no one is logged in). BOINC is listed in the Start menu of the installing user, but not other users.  The 'Show graphics' command in the BOINC manager will not work for any user. The BOINC screensaver will only show textual information.
+#~ msgid "RLN_MSWIN_INSTALL_WINSERVICE_DESC"
+#~ msgstr ""
+#~ "BOINC кліент працуе заўсёды (нават калі на кампутары не ўвайшоў ні адзін "
+#~ "з карыстачоў). BOINC будзе паказвацца толькі ў меню праграмаў 'Пуск' "
+#~ "карыстача, які ўсталяваў BOINC. Кнопка 'Паказаць графіку' у BOINC "
+#~ "мэнэджэру не будзе працаваць ні ў каго. Экранная застаўка BOINC будзе "
+#~ "паказваць толькі тэкст)."
+
+# BOINC for Linux is distributed as a self-extracting archive. This type of installation requires that you be familiar with the UNIX command-line interface.
+#~ msgid "RLN_LINUX_INSTALL_SEA_DESC"
+#~ msgstr ""
+#~ "Усталявальны файл BOINC для Linux уяўляе з сябе самоизвлекающийся архіў. "
+#~ "Працэс усталёўкі разлічаны на тое, што вы знаёмыя з інтэрфейсам  радка "
+#~ "UNIX."
+
+# The download files have names like<code> %s </code>.
+#~ msgid "RLN_LINUX_DL_FILENAME"
+#~ msgstr "Загрузіце файл з назовам, падобным на: <code> %s </code>."
+
+# After downloading the file, type<pre>%s</pre>
+#~ msgid "RLN_LINUX_RUN_SEA"
+#~ msgstr "Пасля загрузкі файла выканаеце каманду <pre>%s</pre>"
+
+# This will create a directory BOINC/ with the following files:
+#~ msgid "RLN_LINUX_RESULTOF_SEA"
+#~ msgstr "Будуць створаныя тэчкі са наступнымі файламі:"
+
+# The BOINC core client
+#~ msgid "RLN_BOINC_CORE_CL"
+#~ msgstr "Кліент BOINC"
+
+# The BOINC manager
+#~ msgid "RLN_BOINC_MANAGER"
+#~ msgstr "BOINC мэнэджэр"
+
+# A script that cd's into the BOINC directory and runs the core client.
+#~ msgid "RLN_SCRIPT_RUN_CLIENT_DESC"
+#~ msgstr ""
+#~ "Камандны файл, які змяняе бягучую тэчку на тэчку з BOINC камандаю cd і "
+#~ "затым што запускае кліент BOINC."
+
+# A script that cd's into the BOINC directory and runs the manager.
+#~ msgid "RLN_SCRIPT_RUN_MANAGER_DESC"
+#~ msgstr ""
+#~ "Камандны файл, які змяняе бягучую тэчку на тэчку з BOINC камандаю cd і "
+#~ "затым што запускае BOINC мэнэджэр."
+
+# You may want to%s automatically start the core client %sat boot time.
+#~ msgid "RLN_LINUX_AUTOSTART"
+#~ msgstr ""
+#~ "Вы можаце наладзіць %s аўтаматычны запуск кліента BOINC %s пры старце "
+#~ "сістэмы."
+
+# Select Start/Control Panel/Add or Remove Programs. "
+#     "Select BOINC, then click Remove. "
+#     "This removes the BOINC software only. "
+#     "To completely remove BOINC, delete the BOINC data directory "
+#     "(usually C:/Program Files/BOINC).
+#~ msgid "RLN_MSWIN_UNINSTALL_DESC"
+#~ msgstr ""
+#~ "У меню 'Пуск / Налада / Панэль кіравання / Усталёўка і выдаленне "
+#~ "праграмаў' вылучыць 'BOINC' і націснуць 'Выдаліць'. Будуць выдаленыя "
+#~ "толькі асноўныя файлы BOINC. Для поўнага выдалення неабходна пасля гэтага "
+#~ "выдаліць пакінутую тэчку BOINC (звычайна гэта C:/Program Files/BOINC)."
+
+# If you use a proxy server, please hold off upgrading for now. We have a fix in the works for proxies that use NTLM authentication.
+#~ msgid "RLN_ISSUE_PROXY_NTLMAUTH"
+#~ msgstr ""
+#~ "Калі вы выкарыстаеце проксі сервер, абновіце BOINC да апошняй версіі. "
+#~ "Нядаўна былі ўхіленыя памылкі пры працы з проксі выкарыстоўвалымі NTLM "
+#~ "аўтарызацыю."
+
+# (Windows) If BOINC applications are repeatedly crashing on your computer, "
+#     "it's possibly that you need to "
+#     "%supgrade to the latest version (9.0c or later) of DirectX %s.
+#~ msgid "RLN_ISSUE_MSWIN_LATEST_DIRECTX"
+#~ msgstr ""
+#~ "(Windows) Калі праца BOINC часта перарываецца памылкаю, магчыма вам "
+#~ "неабходна %s абнавіць DirectX да апошняй версіі (9.0c або навей) %s."
+
+# (Windows) If BOINC runs at the same time as Windows XP 3-D screensavers, the system becomes sluggish and unresponsive.
+#~ msgid "RLN_ISSUE_MSWIN_SCREENSAVER_XP3D"
+#~ msgstr ""
+#~ "(Windows) Калі BOINC запушчаны як экранная застаўка Windows XP 3-D, "
+#~ "рэакцыя аперацыйнае сістэмы на дзеянні карыстача моцна запавольваецца "
+#~ "(сістэма завісае)."
+
+# (Windows) Applications that were built before October 2004 do not display screensaver graphics with the Service or Shared install type, or the Single-user install type with the password protect screensaver option on NT based machines.
+#~ msgid "RLN_ISSUE_MSWIN_NO_SCREENSAVER"
+#~ msgstr ""
+#~ "(Windows) Прыкладанні, створаныя да кастрычніка 2004 года не паказваюць "
+#~ "графіку ў рэжыме экраннае застаўкі BOINC ні пры 'усталёўцы BOINC у якасці "
+#~ "службы', ні пры ўсталёўцы для ўсіх карыстачоў', таксама не "
+#~ "адлюстроўваецца графіка пры 'індывідуальнай усталёўцы' і выкарыстанні "
+#~ "абароны паролем выхаду з экраннае застаўкі на аперацыйных сістэмах "
+#~ "пабудаваных на базе NT."
+
+# If you have problems with BOINC, here are some steps you can take:
+#~ msgid "RLN_TROUBLESHOOT_INTRO"
+#~ msgstr ""
+#~ "Пры з'яўленні праблемаў з працаю BOINC, вы можаце паступіць наступным "
+#~ "чынам:"
+
+# If you have a problem with a particular project, "
+#     "go to the 'Questions and Answers' area of the project's web site. "
+#     "You may find the solution to your problem. "
+#     "If not, post it there, and you'll get help from other users. "
+#     "If the problem persists, "
+#     "use the BOINC Manager to 'reset' that project. "
+#     "This will erase any jobs in progress and start from scratch.
+#~ msgid "RLN_TROUBLESHOOT_PRJ_SPECIFIC"
+#~ msgstr ""
+#~ "Калі праблемы звязаныя з пэўным праектам, зайдзіце на старонку 'Пытанні і "
+#~ "адказы' (Questions and Answers) на сайце праекту і пашукайце адказ на "
+#~ "ваша пытанне, або задайце пытанне самі. Калі не атрымоўваецца вырашыць "
+#~ "праблемы звязаныя з пэўным праектам, выкарыстайце кнопку 'Перазапусціць "
+#~ "праект' у BOINC мэнэджэру для перазапуску праекту на вашым кампутары. Усе "
+#~ "файлы і налады звязаныя з дадзеным праектам будуць знішчаныя і загружаныя "
+#~ "зноўку."
+
+# If you have problems with BOINC itself, get help from the %s BOINC message boards %s.
+#~ msgid "RLN_TROUBLESHOOT_BOINC_ITSELF"
+#~ msgstr ""
+#~ "Калі праблема складаецца ў працы самога праграмнага забеспячэння BOINC, "
+#~ "паспрабуйце атрымаць дапамогу на %sфоруме BOINC%s"
+
+# Running BOINC
+#~ msgid "HOME_MORE_INFO"
+#~ msgstr "Падрабязней аб BOINC"
diff --git a/locale/bg/BOINC-Client.mo b/locale/bg/BOINC-Client.mo
index 01c99bf..979f3a8 100644
Binary files a/locale/bg/BOINC-Client.mo and b/locale/bg/BOINC-Client.mo differ
diff --git a/locale/bg/BOINC-Client.po b/locale/bg/BOINC-Client.po
old mode 100755
new mode 100644
index b8751ee..8b1115e
--- a/locale/bg/BOINC-Client.po
+++ b/locale/bg/BOINC-Client.po
@@ -1,24 +1,23 @@
 # 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: BOINC 7.4\n"
+"Project-Id-Version: boinc\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-10-15 22:25-0700\n"
-"PO-Revision-Date: 2015-02-10 13:25-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: bg\n"
+"PO-Revision-Date: 2015-02-08 18:19+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\n"
+"Language-Team: Bulgarian (http://www.transifex.com/projects/p/boinc/language/bg/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-POOTLE-MTIME: 1378304289.0\n"
+"Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: acct_mgr.cpp:450
-#: acct_mgr.cpp:459
+#: acct_mgr.cpp:450 acct_mgr.cpp:459
 msgid "Message from account manager"
 msgstr "Съобщение от акаунт мениджър"
 
@@ -27,7 +26,9 @@ msgid "Message from server"
 msgstr "Съобщение от сървър"
 
 #: client_state.cpp:258
-msgid "Some tasks need more memory than allowed by your preferences.  Please check the preferences."
+msgid ""
+"Some tasks need more memory than allowed by your preferences.  Please check "
+"the preferences."
 msgstr "Някои задачи се нуждаят от повече памет отколкото е позволена във вашите предпочитания.  Моля проверете предпочитанията си."
 
 #: client_state.cpp:520
@@ -40,11 +41,12 @@ msgstr "Променливата на средата HTTP_PROXY трябва д
 
 #: cs_scheduler.cpp:613
 #, c-format
-msgid "You used the wrong URL for this project.  When convenient, remove this project, then add %s"
+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
+#: cs_statefile.cpp:828 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
 msgstr "Синтактична грешка в app_info.xml"
 
@@ -56,18 +58,15 @@ msgstr "Файлът посочен в app_info.xml не съществува: "
 msgid "A new version of BOINC is available."
 msgstr "Налична е нова версия на BOINC."
 
-#: current_version.cpp:94
-#: current_version.cpp:102
+#: current_version.cpp:94 current_version.cpp:102
 msgid "Download"
 msgstr "Изтегляне"
 
-#: log_flags.cpp:269
-#: log_flags.cpp:449
+#: 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
+#: log_flags.cpp:423 log_flags.cpp:475
 msgid "Unrecognized tag in cc_config.xml"
 msgstr "Неразпознат таг в cc_config.xml"
 
@@ -92,7 +91,9 @@ 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."
+msgid ""
+"The project has changed its security key.  Please remove and add this "
+"project."
 msgstr "Проектът е сменил своя ключ за сигурност.  Моля премахнете и добавете този проект."
 
 #: ../sched/handle_request.cpp:943
@@ -104,7 +105,8 @@ msgid "This project doesn't support CPU type"
 msgstr "Този проект не поддържа CPU тип"
 
 #: ../sched/handle_request.cpp:993
-msgid "Your BOINC client software is too old.  Please install the current version."
+msgid ""
+"Your BOINC client software is too old.  Please install the current version."
 msgstr "Вашият BOINC клиент е твърде стар.  Моля, инсталирайте текущата версия."
 
 #: ../sched/handle_request.cpp:1259
@@ -112,18 +114,21 @@ 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"
+msgid ""
+"Upgrade to the latest driver to process tasks using your computer's GPU"
 msgstr "Обновете до последната версия на драйвера за да изпълнявате задачи с помощта на GPU-то на компютъра Ви"
 
 #: ../sched/sched_send.cpp:1099
-msgid "Upgrade to the latest driver to use all of this project's GPU applications"
+msgid ""
+"Upgrade to the latest driver to use all of this project's GPU applications"
 msgstr "Обновете до последната версия на драйвера за да използвате всички GPU приложения на този проект"
 
 #: ../sched/sched_send.cpp:1118
-msgid "A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to the current version"
+msgid ""
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to"
+" the current version"
 msgstr "Нужна е по-нова версия на BOINC за да използвате вашето NVIDIA GPU; моля обновете до текущата версия"
 
-# 94%
 #: ../sched/sched_send.cpp:1146
 #, c-format
 msgid "An %s GPU is required to run tasks for this project"
@@ -143,7 +148,8 @@ msgstr "Необходима е по-нова версия на BOINC; моля,
 
 #: ../sched/sched_send.cpp:1305
 #, c-format
-msgid "Tasks for %s are available, but your preferences are set to not accept them"
+msgid ""
+"Tasks for %s are available, but your preferences are set to not accept them"
 msgstr "Налични за задачи за %s, но вашите предпочитания са зададени да не ги приемате"
 
 #: ../sched/sched_types.cpp:254
@@ -153,30 +159,3 @@ 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 няма използваема версия на"
-
-#~ msgid "Download it."
-#~ msgstr "Изтеглете я."
-#~ msgid "An NVIDIA or ATI GPU is required to run tasks for this project"
-#~ msgstr "Необходим е NVIDIA или ATI GPU за стартиране на задачи на този проект"
-#~ msgid "An NVIDIA GPU is required to run tasks for this project"
-#~ msgstr "Необходим е NVIDIA GPU за стартиране на задачи на този проект"
-#~ msgid "An ATI GPU is required to run tasks for this project"
-#~ msgstr "Необходим е ATI GPU за стартиране на задачи на този проект"
-#~ msgid ""
-#~ "Tasks for NVIDIA GPU are available, but your preferences are set to not "
-#~ "accept them"
-#~ msgstr ""
-#~ "Налични са задачи за NVIDIA GPU, но вашите предпочитания са зададени да не "
-#~ "ги получавате"
-#~ msgid ""
-#~ "Tasks for ATI GPU are available, but your preferences are set to not accept "
-#~ "them"
-#~ msgstr ""
-#~ "Достъпни са задачи за ATI GPU, но вашите предпочитания са зададени да не ги "
-#~ "получавате"
-#~ msgid ""
-#~ "Tasks for CPU are available, but your preferences are set to not accept them"
-#~ msgstr ""
-#~ "Достъпни са задачи за CPU, но вашите предпочитания са зададени да не ги "
-#~ "получавате"
-
diff --git a/locale/bg/BOINC-Manager.mo b/locale/bg/BOINC-Manager.mo
index 57b6294..70f94c8 100644
Binary files a/locale/bg/BOINC-Manager.mo and b/locale/bg/BOINC-Manager.mo differ
diff --git a/locale/bg/BOINC-Manager.po b/locale/bg/BOINC-Manager.po
index 2dedf80..6ef45e9 100755
--- a/locale/bg/BOINC-Manager.po
+++ b/locale/bg/BOINC-Manager.po
@@ -6,9 +6,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: BOINC Manager 6.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-15 14:15-0500\n"
-"PO-Revision-Date: 2015-02-10 13:25-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
+"POT-Creation-Date: 2014-02-02 00:00-0800\n"
+"PO-Revision-Date: 2013-09-10 11:32+0000\n"
+"Last-Translator: Dimitar <mexicoman at abv.bg>\n"
 "Language-Team: AMD Powered @ Home Team <timeros at gmail.com>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
@@ -16,22 +16,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.5.0\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc_7.4\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1378812727.0\n"
 "X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-SearchPath-0: clientgui\n"
 "X-Poedit-SearchPath-1: clientgui/msw\n"
 "X-Poedit-SearchPath-2: clientgui/gtk\n"
 "X-Poedit-SearchPath-3: clientgui/mac\n"
+"X-Poedit-SearchPath-0: clientgui\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\n"
+"X-POOTLE-MTIME: 1378812727.0\n"
 
 # 100%
-#: clientgui/AccountInfoPage.cpp:387
+#: AccountInfoPage.cpp:387
 #, c-format
+#, c-format, c-format
 msgid "Identify your account at %s"
 msgstr "Идентифицирайте Вашия акаунт в %s"
 
-#: clientgui/AccountInfoPage.cpp:393
+#: AccountInfoPage.cpp:393
 msgid ""
 "Please enter your account information\n"
 "(to create an account, visit the project's web site)"
@@ -39,7 +40,7 @@ msgstr ""
 "Моля въведете информацията за своя акаунт\n"
 "(за да създадете акаунт, посетете интернет страницата на проекта)"
 
-#: clientgui/AccountInfoPage.cpp:397
+#: AccountInfoPage.cpp:397
 msgid ""
 "This project is not currently accepting new accounts.\n"
 "You can add it only if you already have an account."
@@ -47,19 +48,19 @@ msgstr ""
 "Този проект в момента не приема нови акаунти.\n"
 "Можете да го добавите само ако вече имате регистриран акаунт."
 
-#: clientgui/AccountInfoPage.cpp:401
+#: AccountInfoPage.cpp:401
 msgid "Are you already running this project?"
 msgstr "Вече участвате ли в този проект?"
 
-#: clientgui/AccountInfoPage.cpp:405
+#: AccountInfoPage.cpp:405
 msgid "&No, new user"
 msgstr "&Не, нов потребител"
 
-#: clientgui/AccountInfoPage.cpp:408
+#: AccountInfoPage.cpp:408
 msgid "&Yes, existing user"
 msgstr "&Да, съществуващ потребител"
 
-#: clientgui/AccountInfoPage.cpp:413
+#: AccountInfoPage.cpp:413
 msgid ""
 "We were not able to set up your account information\n"
 "automatically.\n"
@@ -75,51 +76,45 @@ msgstr ""
 "по-долу за да разберете какво да попълните в полетата\n"
 "за имейл адрес и парола."
 
-#: clientgui/AccountInfoPage.cpp:416
+#: AccountInfoPage.cpp:416
 msgid "Find login information"
 msgstr "Намери информация за вход"
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:649
+#: AccountInfoPage.cpp:436 AccountInfoPage.cpp:641
 msgid "&Password:"
 msgstr "&Парола:"
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:673
+#: AccountInfoPage.cpp:443 AccountInfoPage.cpp:665
 msgid "Choose a &password:"
 msgstr "Изберете &парола:"
 
-#: clientgui/AccountInfoPage.cpp:446
+#: AccountInfoPage.cpp:446
 msgid "C&onfirm password:"
 msgstr "П&отвърдете парола:"
 
-#: clientgui/AccountInfoPage.cpp:453
+#: AccountInfoPage.cpp:453
 #, c-format
 msgid "Are you already running %s?"
 msgstr "Вече участвате ли в %s?"
 
-#: clientgui/AccountInfoPage.cpp:482
+#: AccountInfoPage.cpp:482
 msgid "&Username:"
 msgstr "&Потребителско име:"
 
-#: clientgui/AccountInfoPage.cpp:511
-msgid "&Email address or LDAP ID:"
-msgstr ""
-
-#: clientgui/AccountInfoPage.cpp:515
+#: AccountInfoPage.cpp:508
 msgid "&Email address:"
 msgstr "&Имейл адрес:"
 
-#: clientgui/AccountInfoPage.cpp:523
+#: AccountInfoPage.cpp:515
 #, c-format
 msgid "minimum length %d"
 msgstr "минимална дължина %d"
 
-#: clientgui/AccountInfoPage.cpp:530
+#: AccountInfoPage.cpp:522
 msgid "Forgot your password?"
 msgstr "Забравили сте паролата си?"
 
-#: clientgui/AccountInfoPage.cpp:537
+#: AccountInfoPage.cpp:529
 msgid ""
 "If you have not yet registered with this account manager,\n"
 "please do so before proceeding.  Click on the link below\n"
@@ -129,44 +124,46 @@ msgstr ""
 "моля направете го преди да продължите.  Натиснете на връзката\n"
 "по-долу за да се регистрирате или за да получите отново забравена парола."
 
-#: clientgui/AccountInfoPage.cpp:540
+#: AccountInfoPage.cpp:532
 msgid "Account manager web site"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:582
+#: AccountInfoPage.cpp:574 WelcomePage.cpp:348
 msgid "Add project"
 msgstr "Добави проект"
 
-#: clientgui/AccountInfoPage.cpp:584
+#: AccountInfoPage.cpp:576
 msgid "Update account manager"
 msgstr "Обнови акаунт мениджъра"
 
-#: clientgui/AccountInfoPage.cpp:586
+#: AccountInfoPage.cpp:578 WelcomePage.cpp:307 WelcomePage.cpp:321
 msgid "Use account manager"
 msgstr "Използвай акаунт мениджър"
 
-#: clientgui/AccountInfoPage.cpp:593
+#: AccountInfoPage.cpp:585
 msgid "Please enter a user name."
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:595
+#: AccountInfoPage.cpp:587
 msgid "Please enter an email address."
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:605
+#: AccountInfoPage.cpp:597
 #, c-format
 msgid "Please enter a password of at least %d characters."
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:615
-msgid "The password and confirmation password do not match. Please type them again."
-msgstr "Паролата и паролата за потвърждение не са еднакви. Моля напишете ги отново."
+#: AccountInfoPage.cpp:607
+msgid ""
+"The password and confirmation password do not match. Please type them again."
+msgstr ""
+"Паролата и паролата за потвърждение не са еднакви. Моля напишете ги отново."
 
-#: clientgui/AccountManagerInfoPage.cpp:272
+#: AccountManagerInfoPage.cpp:272
 msgid "Choose an account manager"
 msgstr "Изберете акаунт мениджър"
 
-#: clientgui/AccountManagerInfoPage.cpp:275
+#: AccountManagerInfoPage.cpp:275
 msgid ""
 "To choose an account manager, click its name or \n"
 "type its URL below."
@@ -174,395 +171,382 @@ msgstr ""
 "За да изберете акаунт мениджър натиснете на неговото име или \n"
 "напишете неговия URL отдолу."
 
-#: clientgui/AccountManagerInfoPage.cpp:279
+#: AccountManagerInfoPage.cpp:279
 msgid "Account manager details:"
 msgstr ""
 
-#: clientgui/AccountManagerInfoPage.cpp:283
+#: AccountManagerInfoPage.cpp:283
 msgid "Account manager &URL:"
 msgstr ""
 
-#: clientgui/AccountManagerInfoPage.cpp:287
+#: AccountManagerInfoPage.cpp:287
 msgid "Open web page"
 msgstr ""
 
-#: clientgui/AccountManagerInfoPage.cpp:290
+#: AccountManagerInfoPage.cpp:290
 msgid "Visit this account manager's web site"
 msgstr ""
 
-#: clientgui/AccountManagerProcessingPage.cpp:186
-#: clientgui/AccountManagerPropertiesPage.cpp:192
+#: AccountManagerProcessingPage.cpp:187 AccountManagerPropertiesPage.cpp:193
 #, c-format
 msgid "Communicating with %s."
 msgstr "Комуникация с %s."
 
-#: clientgui/AccountManagerProcessingPage.cpp:193
-#: clientgui/AccountManagerPropertiesPage.cpp:199
+#: AccountManagerProcessingPage.cpp:194 AccountManagerPropertiesPage.cpp:200
 msgid "Communicating with server."
 msgstr "Комуникация със сървър."
 
-#: clientgui/AccountManagerProcessingPage.cpp:198
-#: clientgui/AccountManagerPropertiesPage.cpp:204
+#: AccountManagerProcessingPage.cpp:199 AccountManagerPropertiesPage.cpp:205
 msgid "Please wait..."
 msgstr "Моля изчакайте..."
 
-#: clientgui/AccountManagerProcessingPage.cpp:325
+#: AccountManagerProcessingPage.cpp:326
 msgid "An internal server error has occurred.\n"
 msgstr "Възникна вътрешна грешка на сървъра.\n"
 
-#: clientgui/AdvancedFrame.cpp:96
+#: AdvancedFrame.cpp:95
 msgid "Connected"
 msgstr "Свързан"
 
-#: clientgui/AdvancedFrame.cpp:104
+#: AdvancedFrame.cpp:103
 msgid "Disconnected"
 msgstr "Прекъснат"
 
-#: clientgui/AdvancedFrame.cpp:318
+#: AdvancedFrame.cpp:322 sg_BoincSimpleFrame.cpp:119
 #, c-format
 msgid "Close the %s window"
 msgstr "Затворете прозореца на %s"
 
-#: clientgui/AdvancedFrame.cpp:321
+#: AdvancedFrame.cpp:325 sg_BoincSimpleFrame.cpp:122
 msgid "&Close Window"
 msgstr "&Затворете Прозореца"
 
-#: clientgui/AdvancedFrame.cpp:332
-#: clientgui/AdvancedFrame.cpp:339
-#: clientgui/AdvancedFrame.cpp:346
+#: AdvancedFrame.cpp:336 AdvancedFrame.cpp:343 AdvancedFrame.cpp:350
 #, c-format
 msgid "Exit %s"
 msgstr "Изход от %s"
 
-#: clientgui/AdvancedFrame.cpp:359
-msgid "Preferences..."
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:368
+#: AdvancedFrame.cpp:371
 msgid "&Notices\tCtrl+Shift+N"
 msgstr "&Известия\tCtrl+Shift+N"
 
-#: clientgui/AdvancedFrame.cpp:369
+#: AdvancedFrame.cpp:372
 msgid "Display notices"
 msgstr "Покажи известия"
 
-#: clientgui/AdvancedFrame.cpp:374
+#: AdvancedFrame.cpp:377
 msgid "&Projects\tCtrl+Shift+P"
 msgstr "&Проекти\tCtrl+Shift+P"
 
-#: clientgui/AdvancedFrame.cpp:375
+#: AdvancedFrame.cpp:378
 msgid "Display projects"
 msgstr "Покажи проекти"
 
-#: clientgui/AdvancedFrame.cpp:380
+#: AdvancedFrame.cpp:383
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr "&Задачи\tCtrl+Shift+T"
 
-#: clientgui/AdvancedFrame.cpp:381
+#: AdvancedFrame.cpp:384
 msgid "Display tasks"
 msgstr "Покажи задачи"
 
-#: clientgui/AdvancedFrame.cpp:386
+#: AdvancedFrame.cpp:389
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr "Транс&фери\tCtrl+Shift+X"
 
-#: clientgui/AdvancedFrame.cpp:387
+#: AdvancedFrame.cpp:390
 msgid "Display transfers"
 msgstr "Покажи трансфери"
 
-#: clientgui/AdvancedFrame.cpp:392
+#: AdvancedFrame.cpp:395
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "&Статистика\tCtrl+Shift+S"
 
-#: clientgui/AdvancedFrame.cpp:393
+#: AdvancedFrame.cpp:396
 msgid "Display statistics"
 msgstr "Покажи статистика"
 
-#: clientgui/AdvancedFrame.cpp:398
+#: AdvancedFrame.cpp:401
 msgid "&Disk usage\tCtrl+Shift+D"
 msgstr "&Употреба на диска\tCtrl+Shift+D"
 
-#: clientgui/AdvancedFrame.cpp:399
+#: AdvancedFrame.cpp:402
 msgid "Display disk usage"
 msgstr "Покажи употреба на диска"
 
-#: clientgui/AdvancedFrame.cpp:406
+#: AdvancedFrame.cpp:409
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr "Прост &Изглед...\tCtrl+Shift+V"
 
-#: clientgui/AdvancedFrame.cpp:407
+#: AdvancedFrame.cpp:410
 msgid "Display the simple graphical interface."
 msgstr "Покажи простия графически интерфейс."
 
-#: clientgui/AdvancedFrame.cpp:421
+#: AdvancedFrame.cpp:424
 msgid "&Add project or account manager..."
 msgstr "&Добави проект или акаунт мениджър..."
 
-#: clientgui/AdvancedFrame.cpp:422
+#: AdvancedFrame.cpp:425 sg_ProjectPanel.cpp:76
 msgid "Volunteer for any or all of 30+ projects in many areas of science"
-msgstr "Стани доброволец за някои или за всички 30+ проекта в много области на науката"
+msgstr ""
+"Стани доброволец за някои или за всички 30+ проекта в много области на "
+"науката"
 
-#: clientgui/AdvancedFrame.cpp:426
+#: AdvancedFrame.cpp:429
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "&Синхронизирай с %s"
 
-#: clientgui/AdvancedFrame.cpp:430
+#: AdvancedFrame.cpp:433
 #, c-format
 msgid "Get current settings from %s"
 msgstr "Вземи текущи настройки от %s"
 
-#: clientgui/AdvancedFrame.cpp:440
+#: AdvancedFrame.cpp:443
 msgid "&Add project..."
 msgstr "&Добави проект..."
 
-#: clientgui/AdvancedFrame.cpp:441
+#: AdvancedFrame.cpp:444
 msgid "Add a project"
 msgstr "Добави проект"
 
-#: clientgui/AdvancedFrame.cpp:444
+#: AdvancedFrame.cpp:447
 #, c-format
 msgid "S&top using %s..."
 msgstr "С&при да използваш %s..."
 
-#: clientgui/AdvancedFrame.cpp:450
+#: AdvancedFrame.cpp:453
 msgid "Remove this computer from account manager control."
 msgstr "Премахни този компютър от контрола на акаунт мениджъра."
 
-#: clientgui/AdvancedFrame.cpp:455
+#: AdvancedFrame.cpp:458 sg_BoincSimpleFrame.cpp:178
 msgid "&Options..."
 msgstr "&Опции..."
 
-#: clientgui/AdvancedFrame.cpp:456
+#: AdvancedFrame.cpp:459 sg_BoincSimpleFrame.cpp:179
 msgid "Configure display options and proxy settings"
 msgstr "Конфигурирай опциите на дисплея и настройките на проксито"
 
-#: clientgui/AdvancedFrame.cpp:460
+#: AdvancedFrame.cpp:463 sg_BoincSimpleFrame.cpp:172
 msgid "Computing &preferences..."
 msgstr "Изчислителни &предпочитания..."
 
-#: clientgui/AdvancedFrame.cpp:461
+#: AdvancedFrame.cpp:464 sg_BoincSimpleFrame.cpp:173
 msgid "Configure computing preferences"
 msgstr "Настройте изчислителните предпочитания"
 
-#: clientgui/AdvancedFrame.cpp:469
+#: AdvancedFrame.cpp:472
 msgid "&Run always"
 msgstr "&Работи винаги"
 
-#: clientgui/AdvancedFrame.cpp:470
+#: AdvancedFrame.cpp:473
 msgid "Allow work regardless of preferences"
 msgstr "Позволи работа независимо от предпочитанията"
 
-#: clientgui/AdvancedFrame.cpp:474
+#: AdvancedFrame.cpp:477
 msgid "Run based on &preferences"
 msgstr "Работи на база на &предпочитанията"
 
-#: clientgui/AdvancedFrame.cpp:475
+#: AdvancedFrame.cpp:478
 msgid "Allow work according to preferences"
 msgstr "Позволи работа според предпочитанията"
 
-#: clientgui/AdvancedFrame.cpp:479
+#: AdvancedFrame.cpp:482
 msgid "&Suspend"
 msgstr "&Временно прекрати"
 
-#: clientgui/AdvancedFrame.cpp:480
+#: AdvancedFrame.cpp:483
 msgid "Stop work regardless of preferences"
 msgstr "Спри работа независимо от предпочитанията"
 
-#: clientgui/AdvancedFrame.cpp:505
+#: AdvancedFrame.cpp:508
 msgid "Use GPU always"
 msgstr "Използвай GPU винаги"
 
-#: clientgui/AdvancedFrame.cpp:506
+#: AdvancedFrame.cpp:509
 msgid "Allow GPU work regardless of preferences"
 msgstr "Позволи GPU работа независимо от предпочитанията"
 
-#: clientgui/AdvancedFrame.cpp:510
+#: AdvancedFrame.cpp:513
 msgid "Use GPU based on preferences"
 msgstr "Използвай GPU на база на предпочитанията"
 
-#: clientgui/AdvancedFrame.cpp:511
+#: AdvancedFrame.cpp:514
 msgid "Allow GPU work according to preferences"
 msgstr "Позволи GPU работа според предпочитанията"
 
-#: clientgui/AdvancedFrame.cpp:515
+#: AdvancedFrame.cpp:518
 msgid "Suspend GPU"
 msgstr "Временно прекрати GPU"
 
-#: clientgui/AdvancedFrame.cpp:516
+#: AdvancedFrame.cpp:519
 msgid "Stop GPU work regardless of preferences"
 msgstr "Спри GPU работа независимо от предпочитанията"
 
-#: clientgui/AdvancedFrame.cpp:540
+#: AdvancedFrame.cpp:543
 msgid "Network activity always available"
 msgstr "Мрежовата дейност е винаги възможна"
 
-#: clientgui/AdvancedFrame.cpp:541
+#: AdvancedFrame.cpp:544
 msgid "Allow network activity regardless of preferences"
 msgstr "Позволи връзка по мрежата независимо от предпочитанията"
 
-#: clientgui/AdvancedFrame.cpp:545
+#: AdvancedFrame.cpp:548
 msgid "Network activity based on preferences"
 msgstr "Мрежова дейност на база на предпочитанията"
 
-#: clientgui/AdvancedFrame.cpp:546
+#: AdvancedFrame.cpp:549
 msgid "Allow network activity according to preferences"
 msgstr "Позволи мрежова дейност според предпочитанията"
 
-#: clientgui/AdvancedFrame.cpp:550
+#: AdvancedFrame.cpp:553
 msgid "Network activity suspended"
 msgstr "Мрежовата дейност е временно прекратена"
 
-#: clientgui/AdvancedFrame.cpp:551
+#: AdvancedFrame.cpp:554
 msgid "Stop BOINC network activity"
 msgstr "Спри мрежовата дейност на BOINC"
 
-#: clientgui/AdvancedFrame.cpp:561
+#: AdvancedFrame.cpp:564
 #, c-format
 msgid "Connect to another computer running %s"
 msgstr "Свържи се с друг компютър, който има стартиран %s"
 
-#: clientgui/AdvancedFrame.cpp:566
+#: AdvancedFrame.cpp:569
 msgid "Select computer..."
 msgstr "Избери компютър..."
 
-#: clientgui/AdvancedFrame.cpp:571
+#: AdvancedFrame.cpp:574
 msgid "Shut down connected client..."
 msgstr "Изключи свързания клиент..."
 
-#: clientgui/AdvancedFrame.cpp:572
+#: AdvancedFrame.cpp:575
 msgid "Shut down the currently connected client"
 msgstr "Изключи свързаният в момента клиент"
 
-#: clientgui/AdvancedFrame.cpp:576
+#: AdvancedFrame.cpp:579
 msgid "Run CPU &benchmarks"
 msgstr "Стартирай референтните CPU &показатели"
 
-#: clientgui/AdvancedFrame.cpp:577
+#: AdvancedFrame.cpp:580
 msgid "Runs BOINC CPU benchmarks"
 msgstr "Стартира BOINC референтни CPU показатели"
 
-#: clientgui/AdvancedFrame.cpp:581
+#: AdvancedFrame.cpp:584
 msgid "Do network communication"
 msgstr "Извърши комуникация по мрежата"
 
-#: clientgui/AdvancedFrame.cpp:582
+#: AdvancedFrame.cpp:585
 msgid "Do all pending network communication"
 msgstr "Извърши всички изчакващи връзки по мрежата"
 
 # 94%
-#: clientgui/AdvancedFrame.cpp:586
+#: AdvancedFrame.cpp:589
 msgid "Read config files"
 msgstr "Прочети конфигуриращите файлове"
 
-#: clientgui/AdvancedFrame.cpp:587
+#: AdvancedFrame.cpp:590
 msgid "Read configuration info from cc_config.xml and any app_config.xml files"
-msgstr "Прочети конфигуриращата информация от файловете cc_config.xml и app_config.xml"
+msgstr ""
+"Прочети конфигуриращата информация от файловете cc_config.xml и "
+"app_config.xml"
 
-#: clientgui/AdvancedFrame.cpp:591
+#: AdvancedFrame.cpp:594
 msgid "Read local prefs file"
 msgstr "Прочети файла с локални предпочитания"
 
-#: clientgui/AdvancedFrame.cpp:592
+#: AdvancedFrame.cpp:595
 msgid "Read preferences from global_prefs_override.xml."
 msgstr "Прочети предпочитанията от global_prefs_override.xml."
 
-#: clientgui/AdvancedFrame.cpp:597
+#: AdvancedFrame.cpp:600
 #, c-format
 msgid "Launch another instance of %s..."
 msgstr "Стартирай още един брой от %s..."
 
-#: clientgui/AdvancedFrame.cpp:601
+#: AdvancedFrame.cpp:604
 #, c-format
 msgid "Launch another %s"
 msgstr "Стартирай още един %s"
 
-#: clientgui/AdvancedFrame.cpp:611
+#: AdvancedFrame.cpp:614
 msgid "Event Log...\tCtrl+Shift+E"
 msgstr "Регистър на събитията...\tCtrl+Shift+E"
 
-#: clientgui/AdvancedFrame.cpp:612
+#: AdvancedFrame.cpp:615
 msgid "Display diagnostic messages."
 msgstr "Покажи диагностични съобщения."
 
-#: clientgui/AdvancedFrame.cpp:616
-msgid "Event Log Diagnostic Flags...\tCtrl+Shift+F"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:617
-msgid "Enable or disable various diagnostic messages"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:626
+#: AdvancedFrame.cpp:625 sg_BoincSimpleFrame.cpp:188
 #, c-format
 msgid "%s &help"
 msgstr "%s &помощ"
 
-#: clientgui/AdvancedFrame.cpp:632
+#: AdvancedFrame.cpp:631 sg_BoincSimpleFrame.cpp:194
 #, c-format
 msgid "Show information about %s"
 msgstr "Покажи информация за %s"
 
-#: clientgui/AdvancedFrame.cpp:644
+#: AdvancedFrame.cpp:643
 #, c-format
 msgid "&%s help"
 msgstr "&%s помощ"
 
-#: clientgui/AdvancedFrame.cpp:650
+#: AdvancedFrame.cpp:649 sg_BoincSimpleFrame.cpp:212
 #, c-format
 msgid "Show information about the %s"
 msgstr "Покажи информация за %s"
 
-#: clientgui/AdvancedFrame.cpp:662
+#: AdvancedFrame.cpp:661 sg_BoincSimpleFrame.cpp:224
 #, c-format
 msgid "%s &web site"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:668
+#: AdvancedFrame.cpp:667 sg_BoincSimpleFrame.cpp:230
 #, c-format
 msgid "Show information about BOINC and %s"
 msgstr "Покажи информация за BOINC и %s"
 
-#: clientgui/AdvancedFrame.cpp:680
-#: clientgui/BOINCTaskBar.cpp:544
+#: AdvancedFrame.cpp:679 BOINCTaskBar.cpp:530 sg_BoincSimpleFrame.cpp:242
 #, c-format
 msgid "&About %s..."
 msgstr "&Относно %s..."
 
-#: clientgui/AdvancedFrame.cpp:686
+#: AdvancedFrame.cpp:685 sg_BoincSimpleFrame.cpp:248
 msgid "Licensing and copyright information."
 msgstr "Информация за лицензи и авторски права."
 
-#: clientgui/AdvancedFrame.cpp:693
+#: AdvancedFrame.cpp:692 sg_BoincSimpleFrame.cpp:255
 msgid "&File"
 msgstr "&Файл"
 
-#: clientgui/AdvancedFrame.cpp:697
+#: AdvancedFrame.cpp:696 sg_BoincSimpleFrame.cpp:259
 msgid "&View"
 msgstr "&Изглед"
 
-#: clientgui/AdvancedFrame.cpp:701
+#: AdvancedFrame.cpp:700 sg_BoincSimpleFrame.cpp:263
 msgid "&Tools"
 msgstr "И&нструменти"
 
-#: clientgui/AdvancedFrame.cpp:705
+#: AdvancedFrame.cpp:704
 msgid "&Activity"
 msgstr "&Дейност"
 
-#: clientgui/AdvancedFrame.cpp:709
+#: AdvancedFrame.cpp:708
 msgid "A&dvanced"
 msgstr "За &напреднали"
 
-#: clientgui/AdvancedFrame.cpp:713
+#: AdvancedFrame.cpp:712 DlgEventLog.cpp:332 sg_BoincSimpleFrame.cpp:267
+#: wizardex.cpp:374 wizardex.cpp:381
 msgid "&Help"
 msgstr "&Помощ"
 
-#: clientgui/AdvancedFrame.cpp:1185
+#: AdvancedFrame.cpp:1199
 #, c-format
 msgid "%s - Stop using %s"
 msgstr "%s - Спри да използваш %s"
 
-#: clientgui/AdvancedFrame.cpp:1190
+#: AdvancedFrame.cpp:1204
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -577,12 +561,12 @@ msgstr ""
 "\n"
 "Искате ли да спрете да използвате %s?"
 
-#: clientgui/AdvancedFrame.cpp:1397
+#: AdvancedFrame.cpp:1401
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s - Изключи текущия клиент..."
 
-#: clientgui/AdvancedFrame.cpp:1406
+#: AdvancedFrame.cpp:1410
 #, c-format
 msgid ""
 "%s will shut down the current client\n"
@@ -591,36 +575,36 @@ msgstr ""
 "%s ще изключи текущия клиент\n"
 "и ще Ви предложи да се свържете към друг хост."
 
-#: clientgui/AdvancedFrame.cpp:1806
+#: AdvancedFrame.cpp:1745 DlgAbout.cpp:119
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: clientgui/AdvancedFrame.cpp:1815
+#: AdvancedFrame.cpp:1754
 #, c-format
 msgid "%s has successfully added %s"
 msgstr "%s успешно добави %s"
 
-#: clientgui/AdvancedFrame.cpp:1953
+#: AdvancedFrame.cpp:1893
 #, c-format
 msgid "%s - (%s)"
 msgstr "%s - (%s)"
 
-#: clientgui/AdvancedFrame.cpp:1957
+#: AdvancedFrame.cpp:1897
 #, c-format
 msgid "Connecting to %s"
 msgstr "Свързване към %s"
 
-#: clientgui/AdvancedFrame.cpp:1960
+#: AdvancedFrame.cpp:1900
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "Свързан към %s (%s)"
 
-#: clientgui/AlreadyExistsPage.cpp:184
+#: AlreadyExistsPage.cpp:184
 msgid "Username already in use"
 msgstr "Потребителското име е вече заето"
 
-#: clientgui/AlreadyExistsPage.cpp:187
+#: AlreadyExistsPage.cpp:187
 msgid ""
 "An account with that username already exists and has a\n"
 "different password than the one you entered.\n"
@@ -632,11 +616,11 @@ msgstr ""
 "\n"
 "Моля посетете уеб сайта на проекта и следвайте инструкциите там."
 
-#: clientgui/AlreadyExistsPage.cpp:191
+#: AlreadyExistsPage.cpp:191
 msgid "Email address already in use"
 msgstr "Имейл адреса вече е използван"
 
-#: clientgui/AlreadyExistsPage.cpp:194
+#: AlreadyExistsPage.cpp:194
 msgid ""
 "An account with that email address already exists and has a\n"
 "different password than the one you entered.\n"
@@ -648,43 +632,45 @@ msgstr ""
 "\n"
 "Моля посетете уеб сайта на проекта и следвайте инструкциите там."
 
-#: clientgui/AsyncRPC.cpp:1031
+#: AsyncRPC.cpp:1031
 msgid "Communicating with BOINC client.  Please wait ..."
 msgstr "Комуникация с BOINC клиент.  Моля изчакайте ..."
 
-#: clientgui/AsyncRPC.cpp:1034
+#: AsyncRPC.cpp:1034
 #, c-format
 msgid "&Quit %s"
 msgstr "&Напусни %s"
 
-#: clientgui/AsyncRPC.cpp:1036
+#: AsyncRPC.cpp:1036
 #, c-format
 msgid "E&xit %s"
 msgstr "И&зход от %s"
 
-#: clientgui/AsyncRPC.cpp:1040
+#: AsyncRPC.cpp:1040
 #, c-format
 msgid "%s - Communication"
 msgstr "%s - Предаване на информация"
 
-#: clientgui/AsyncRPC.cpp:1056
+#: AsyncRPC.cpp:1056 DlgAdvPreferencesBase.cpp:107 sg_DlgPreferences.cpp:433
 msgid "Cancel"
 msgstr "Отказ"
 
-#: clientgui/BOINCBaseFrame.cpp:504
+#: BOINCBaseFrame.cpp:505
 #, c-format
 msgid "%s - Connection Error"
 msgstr "%s - Грешка при Връзката"
 
-#: clientgui/BOINCBaseFrame.cpp:513
+#: BOINCBaseFrame.cpp:514
 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 ""
 "В момента не сте оторизиран да управлявате клиента.\n"
-"Моля свържете се с вашия администратор за да Ви добави към локалната 'boinc_клиенти' група."
+"Моля свържете се с вашия администратор за да Ви добави към локалната "
+"'boinc_клиенти' група."
 
-#: clientgui/BOINCBaseFrame.cpp:522
+#: BOINCBaseFrame.cpp:523
 msgid ""
 "Authorization failed connecting to running client.\n"
 "Make sure you start this program in the same directory as the client."
@@ -692,20 +678,20 @@ msgstr ""
 "Оторизацията не успя да се свърже с работещ клиент.\n"
 "Проверете дали стартирате програмата в същата папка в която е клиента."
 
-#: clientgui/BOINCBaseFrame.cpp:524
+#: BOINCBaseFrame.cpp:525
 msgid "Authorization failed connecting to running client."
 msgstr "Оторизацията не успя да се свърже с работещ клиент."
 
-#: clientgui/BOINCBaseFrame.cpp:532
+#: BOINCBaseFrame.cpp:533
 msgid "The password you have provided is incorrect, please try again."
 msgstr "Паролата която въведохте е грешна, моля опитайте отново."
 
-#: clientgui/BOINCBaseFrame.cpp:576
+#: BOINCBaseFrame.cpp:577
 #, c-format
 msgid "%s - Connection Failed"
 msgstr "%s - Неуспешно Свързване"
 
-#: clientgui/BOINCBaseFrame.cpp:585
+#: BOINCBaseFrame.cpp:586
 #, c-format
 msgid ""
 "%s is not able to connect to a %s client.\n"
@@ -714,21 +700,23 @@ msgstr ""
 "%s не успява да се свърже с %s клиент.\n"
 "Искате ли да опитате да се свържете отново?"
 
-#: clientgui/BOINCBaseFrame.cpp:621
+#: BOINCBaseFrame.cpp:622
 #, c-format
 msgid "%s - Daemon Start Failed"
 msgstr "%s - Демон Неуспешно Стартиране"
 
-#: clientgui/BOINCBaseFrame.cpp:631
+#: BOINCBaseFrame.cpp:632
 #, 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 ""
 "%s не успява да стартира %s клиент.\n"
-"Моля стартирайте приложението Control Panel->Administrative Tools->Services и от там стартирайте BOINC сервиза."
+"Моля стартирайте приложението Control Panel->Administrative Tools->Services "
+"и от там стартирайте BOINC сервиза."
 
-#: clientgui/BOINCBaseFrame.cpp:637
+#: BOINCBaseFrame.cpp:638
 #, c-format
 msgid ""
 "%s is not able to start a %s client.\n"
@@ -737,32 +725,35 @@ msgstr ""
 "%s не успява да стартира %s клиент.\n"
 "Моля стартирайте демона и опитайте отново."
 
-#: clientgui/BOINCBaseFrame.cpp:688
+#: BOINCBaseFrame.cpp:689
 #, c-format
 msgid "%s - Connection Status"
 msgstr "%s - Статус на Връзката"
 
-#: clientgui/BOINCBaseFrame.cpp:699
+#: BOINCBaseFrame.cpp:700
 #, 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 ""
 "%s в момента не е свързан към %s клиент.\n"
-"Моля използвайте 'За напреднали\\Избери Компютър...' меню опцията, за да се свържете към %s client.\n"
-"За да се свържете към локалния Ви компютър моля използвайте 'localhost' за име на хоста."
+"Моля използвайте 'За напреднали\\Избери Компютър...' меню опцията, за да се "
+"свържете към %s client.\n"
+"За да се свържете към локалния Ви компютър моля използвайте 'localhost' за "
+"име на хоста."
 
-#: clientgui/BOINCBaseView.cpp:752
+#: BOINCBaseView.cpp:779
 msgid "Project web pages"
 msgstr "Уеб страници на проекта"
 
-#: clientgui/BOINCClientManager.cpp:573
+#: BOINCClientManager.cpp:575
 #, c-format
 msgid "%s - Unexpected Exit"
 msgstr "%s - Неочакван Изход"
 
-#: clientgui/BOINCClientManager.cpp:583
+#: BOINCClientManager.cpp:585
 #, c-format
 msgid ""
 "The %s client has exited unexpectedly 3 times within the last %d minutes.\n"
@@ -771,12 +762,12 @@ msgstr ""
 "Клиента %s се изключи неочаквано 3 пъти за последните %d минути.\n"
 "Искате ли да го рестартирате отново?"
 
-#: clientgui/BOINCDialupManager.cpp:61
+#: BOINCDialupManager.cpp:61
 #, c-format
 msgid "%s - Network Status"
 msgstr "%s - Статус на Връзката"
 
-#: clientgui/BOINCDialupManager.cpp:241
+#: BOINCDialupManager.cpp:241
 #, c-format
 msgid ""
 "%s needs to connect to the Internet.\n"
@@ -785,22 +776,22 @@ msgstr ""
 "%s трябва да се свърже с Интернет.\n"
 "Може ли да го направи сега?"
 
-#: clientgui/BOINCDialupManager.cpp:254
+#: BOINCDialupManager.cpp:254
 #, c-format
 msgid "%s is connecting to the Internet."
 msgstr "%s се свързва към Интернет."
 
-#: clientgui/BOINCDialupManager.cpp:303
+#: BOINCDialupManager.cpp:303
 #, c-format
 msgid "%s has successfully connected to the Internet."
 msgstr "%s успя да се свърже към Интернет."
 
-#: clientgui/BOINCDialupManager.cpp:331
+#: BOINCDialupManager.cpp:331
 #, c-format
 msgid "%s failed to connect to the Internet."
 msgstr "%s не успя да се свърже към Интернет."
 
-#: clientgui/BOINCDialupManager.cpp:372
+#: BOINCDialupManager.cpp:372
 #, c-format
 msgid ""
 "%s has detected it is now connected to the Internet.\n"
@@ -809,17 +800,17 @@ msgstr ""
 "%s установи, че сега е свързан към Интернет.\n"
 "Обновяване на всички проекти и възстановяване на всички трансфери."
 
-#: clientgui/BOINCDialupManager.cpp:417
+#: BOINCDialupManager.cpp:417
 #, c-format
 msgid "%s has successfully disconnected from the Internet."
 msgstr "%s успя да прекъсне връзката с Интернет."
 
-#: clientgui/BOINCDialupManager.cpp:433
+#: BOINCDialupManager.cpp:433
 #, c-format
 msgid "%s failed to disconnected from the Internet."
 msgstr "%s не успя да прекъсне връзката с Интернет."
 
-#: clientgui/BOINCGUIApp.cpp:595
+#: BOINCGUIApp.cpp:339
 #, c-format
 msgid ""
 "You currently are not authorized to manage the client.\n"
@@ -840,24 +831,26 @@ msgstr ""
 "- свържете се с вашия администратор за да Ви добави към\n"
 "'boinc_master' потребителска група."
 
-#: clientgui/BOINCGUIApp.cpp:601
+#: BOINCGUIApp.cpp:345
 #, c-format
 msgid ""
 "%s ownership or permissions are not set properly; please reinstall %s.\n"
 "(Error code %d"
 msgstr ""
-"%s собственост или разрешения не са настроени правилно; моля преинсталирайте %s.\n"
+"%s собственост или разрешения не са настроени правилно; моля преинсталирайте "
+"%s.\n"
 "(Код за грешка %d"
 
-#: clientgui/BOINCGUIApp.cpp:607
+#: BOINCGUIApp.cpp:351
 msgid " at "
 msgstr " @ "
 
-#: clientgui/BOINCGUIApp.cpp:610
+#: BOINCGUIApp.cpp:354 MainDocument.cpp:2484 MainDocument.cpp:2534
+#: MainDocument.cpp:2554 ViewTransfers.cpp:803
 msgid ")"
 msgstr ")"
 
-#: clientgui/BOINCGUIApp.cpp:640
+#: BOINCGUIApp.cpp:384
 msgid ""
 "A reboot is required in order for BOINC to run properly.\n"
 "Please reboot your computer and try again."
@@ -865,188 +858,186 @@ msgstr ""
 "За да работи правилно BOINC се нуждае от рестартиране.\n"
 "Моля рестартирайте Вашия компютър и опитайте отново."
 
-#: clientgui/BOINCGUIApp.cpp:641
+#: BOINCGUIApp.cpp:385 DlgAbout.cpp:153
 msgid "BOINC Manager"
 msgstr "BOINC Мениджър"
 
-#: clientgui/BOINCGUIApp.cpp:902
+#: BOINCGUIApp.cpp:572
 msgid "BOINC Manager was started by the operating system automatically"
 msgstr "BOINC Мениджър бе стартиран от операционната система автоматично"
 
-#: clientgui/BOINCGUIApp.cpp:904
+#: BOINCGUIApp.cpp:574
 msgid "Startup BOINC so only the system tray icon is visible"
 msgstr "Стартирай BOINC така че само иконата в системната лента да е видима"
 
-#: clientgui/BOINCGUIApp.cpp:906
+#: BOINCGUIApp.cpp:576
 msgid "Directory containing the BOINC Client executable"
 msgstr "Папка съдържаща изпълнимия BOINC Клиент файл"
 
-#: clientgui/BOINCGUIApp.cpp:907
+#: BOINCGUIApp.cpp:577
 msgid "BOINC data directory"
 msgstr "Папка с BOINC данни"
 
-#: clientgui/BOINCGUIApp.cpp:909
+#: BOINCGUIApp.cpp:579
 msgid "Host name or IP address"
 msgstr "Име на хоста или IP адрес"
 
-#: clientgui/BOINCGUIApp.cpp:910
+#: BOINCGUIApp.cpp:580
 msgid "GUI RPC port number"
 msgstr "GUI RPC номер на порт"
 
-#: clientgui/BOINCGUIApp.cpp:911
+#: BOINCGUIApp.cpp:581
 msgid "Password"
 msgstr "Парола"
 
-#: clientgui/BOINCGUIApp.cpp:912
+#: BOINCGUIApp.cpp:582
 msgid "Startup BOINC with these optional arguments"
 msgstr "Стартирай BOINC с тези аргументи по избор"
 
-#: clientgui/BOINCGUIApp.cpp:913
+#: BOINCGUIApp.cpp:583
 msgid "disable BOINC security users and permissions"
 msgstr "изключи BOINC защитени потребители и разрешения"
 
-#: clientgui/BOINCGUIApp.cpp:914
+#: BOINCGUIApp.cpp:584
 msgid "set skin debugging mode to enable skin manager error messages"
-msgstr "задайте режим на отстраняване на грешки за да позволите съобщения за грешки от мениджърa"
+msgstr ""
+"задайте режим на отстраняване на грешки за да позволите съобщения за грешки "
+"от мениджърa"
 
-#: clientgui/BOINCGUIApp.cpp:915
+#: BOINCGUIApp.cpp:585
 msgid "multiple instances of BOINC Manager allowed"
 msgstr "позволени множество прозорци на BOINC Мениджъра"
 
-#: clientgui/BOINCGUIApp.cpp:917
+#: BOINCGUIApp.cpp:587
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr "Не се използва: заобиколно решение за бъг в XCode 4.2"
 
-#: clientgui/BOINCGUIApp.cpp:1164
+#: BOINCGUIApp.cpp:814
 msgid "(Automatic Detection)"
 msgstr "(Автоматично Разпознаване)"
 
-#: clientgui/BOINCGUIApp.cpp:1165
+#: BOINCGUIApp.cpp:815
 msgid "(Unknown)"
 msgstr "(Непознат)"
 
-#: clientgui/BOINCGUIApp.cpp:1166
+#: BOINCGUIApp.cpp:816
 msgid "(User Defined)"
 msgstr "(Дефиниран от Потребителя)"
 
-#: clientgui/BOINCTaskBar.cpp:522
+#: BOINCTaskBar.cpp:508
 #, c-format
 msgid "Open %s Web..."
 msgstr "Отвори %s Интернет страница..."
 
-#: clientgui/BOINCTaskBar.cpp:529
+#: BOINCTaskBar.cpp:515
 #, c-format
 msgid "Open %s..."
 msgstr "Отвори %s..."
 
-#: clientgui/BOINCTaskBar.cpp:536
-#: clientgui/BOINCTaskBar.cpp:633
-#: clientgui/BOINCTaskBar.cpp:641
+#: BOINCTaskBar.cpp:522 BOINCTaskBar.cpp:619 BOINCTaskBar.cpp:627
 msgid "Snooze"
 msgstr "Почивка"
 
-#: clientgui/BOINCTaskBar.cpp:538
-#: clientgui/BOINCTaskBar.cpp:660
-#: clientgui/BOINCTaskBar.cpp:668
+#: BOINCTaskBar.cpp:524 BOINCTaskBar.cpp:646 BOINCTaskBar.cpp:654
 msgid "Snooze GPU"
 msgstr "Почивка за GPU"
 
-#: clientgui/BOINCTaskBar.cpp:556
+#: BOINCTaskBar.cpp:542
 msgid "E&xit"
 msgstr "И&зход"
 
-#: clientgui/BOINCTaskBar.cpp:626
+#: BOINCTaskBar.cpp:612 ViewProjects.cpp:718 ViewWork.cpp:795
+#: sg_BoincSimpleFrame.cpp:758 sg_ProjectCommandPopup.cpp:110
+#: sg_TaskCommandPopup.cpp:102
 msgid "Resume"
 msgstr "Възобнови работа"
 
-#: clientgui/BOINCTaskBar.cpp:653
+#: BOINCTaskBar.cpp:639
 msgid "Resume GPU"
 msgstr "Възобнови GPU работа"
 
-#: clientgui/BOINCTaskBar.cpp:727
+#: BOINCTaskBar.cpp:713
 msgid "Computing is enabled"
 msgstr "Изчисленията са позволени"
 
-#: clientgui/BOINCTaskBar.cpp:731
+#: BOINCTaskBar.cpp:717
 msgid "Computing is suspended - "
 msgstr "Изчисленията за временно прекратени - "
 
-#: clientgui/BOINCTaskBar.cpp:741
+#: BOINCTaskBar.cpp:727
 msgid "GPU computing is enabled"
 msgstr "GPU изчисленията са позволени"
 
-#: clientgui/BOINCTaskBar.cpp:744
+#: BOINCTaskBar.cpp:730
 msgid "GPU computing is suspended - "
 msgstr "GPU изчисленията са временно прекратени - "
 
-#: clientgui/BOINCTaskBar.cpp:753
+#: BOINCTaskBar.cpp:739
 msgid "Network is enabled"
 msgstr "Мрежата е активирана"
 
-#: clientgui/BOINCTaskBar.cpp:756
+#: BOINCTaskBar.cpp:742
 msgid "Network is suspended - "
 msgstr "Мрежата е временно деактивирана - "
 
-#: clientgui/BOINCTaskBar.cpp:764
+#: BOINCTaskBar.cpp:750
 msgid "Reconnecting to client."
 msgstr "Повторно свързване с клиента."
 
-#: clientgui/BOINCTaskBar.cpp:766
+#: BOINCTaskBar.cpp:752
 msgid "Not connected to a client."
 msgstr "Не сте свързан с клиент."
 
-#: clientgui/BOINCTaskBar.cpp:819
+#: BOINCTaskBar.cpp:805
 #, c-format
 msgid "%s Notices"
 msgstr "%s Известия"
 
-#: clientgui/BOINCTaskBar.cpp:825
+#: BOINCTaskBar.cpp:811
 msgid "There are new notices - click to view."
 msgstr "Има нови известия - натиснете за преглед."
 
-#: clientgui/CompletionErrorPage.cpp:199
+#: CompletionErrorPage.cpp:199
 msgid "Failed to add project"
 msgstr "Неуспех при добавяне на проект"
 
-#: clientgui/CompletionErrorPage.cpp:204
+#: CompletionErrorPage.cpp:204
 msgid "Failed to update account manager"
 msgstr "Неуспех при обновяване на акаунт мениджъра"
 
-#: clientgui/CompletionErrorPage.cpp:208
+#: CompletionErrorPage.cpp:208
 msgid "Failed to remove account manager"
 msgstr "Неуспех при премахване на акаунт мениджъра"
 
-#: clientgui/CompletionErrorPage.cpp:212
+#: CompletionErrorPage.cpp:212
 msgid "Failed to add account manager"
 msgstr "Неуспех при добавяне на акаунт мениджъра"
 
-#: clientgui/CompletionErrorPage.cpp:221
+#: CompletionErrorPage.cpp:221
 msgid ""
 "Please try again later.\n"
 "\n"
 "Click Finish to close."
 msgstr ""
 
-#: clientgui/CompletionErrorPage.cpp:225
-#: clientgui/CompletionPage.cpp:222
-#: clientgui/CompletionPage.cpp:242
-#: clientgui/CompletionPage.cpp:273
+#: CompletionErrorPage.cpp:225 CompletionPage.cpp:222 CompletionPage.cpp:242
+#: CompletionPage.cpp:273
 msgid "Click Finish to close."
 msgstr "Натиснете Приключи за да затворите."
 
-#: clientgui/CompletionErrorPage.cpp:234
+#: CompletionErrorPage.cpp:234
 msgid "Messages from server:"
 msgstr "Съобщения от сървъра:"
 
-#: clientgui/CompletionPage.cpp:207
+#: CompletionPage.cpp:207
 msgid "Project added"
 msgstr "Проектът е добавен"
 
-#: clientgui/CompletionPage.cpp:213
+#: CompletionPage.cpp:213
 msgid "This project has been successfully added."
 msgstr "Този проект бе успешно добавен."
 
-#: clientgui/CompletionPage.cpp:218
+#: 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."
@@ -1054,124 +1045,122 @@ msgstr ""
 "Когато натиснете Приключи, уеб браузърът Ви ще отиде на страница\n"
 "където можете да настроите свето акаунт име и предпочитания."
 
-#: clientgui/CompletionPage.cpp:232
+#: CompletionPage.cpp:232
 #, c-format
 msgid "Update from %s completed."
 msgstr "Обновяването от %s приключи."
 
-#: clientgui/CompletionPage.cpp:236
+#: CompletionPage.cpp:236
 msgid "Update completed."
 msgstr "Обновяването приключи."
 
-#: clientgui/CompletionPage.cpp:247
+#: CompletionPage.cpp:247
 msgid "Now using account manager"
 msgstr "Сега използвате акаунт мениджър"
 
-#: clientgui/CompletionPage.cpp:252
+#: CompletionPage.cpp:252
 #, c-format
 msgid "Welcome to %s!"
 msgstr "Добре дошли в %s!"
 
-#: clientgui/CompletionPage.cpp:263
+#: CompletionPage.cpp:263
 #, c-format
 msgid "You are now using %s to manage accounts."
 msgstr "Сега използвате %s за да управлявате акаунти."
 
-#: clientgui/CompletionPage.cpp:267
+#: CompletionPage.cpp:267
 msgid "You are now using this account manager."
 msgstr "Сега използвате този акаунт мениджър."
 
-#: clientgui/DlgAbout.cpp:113
+#: DlgAbout.cpp:113 mac/Mac_GUI.cpp:96
 #, c-format
 msgid "About %s"
 msgstr "Относно %s"
 
-#: clientgui/DlgAbout.cpp:172
+#: DlgAbout.cpp:172
 msgid "Version:"
 msgstr "Версия:"
 
-#: clientgui/DlgAbout.cpp:180
+#: DlgAbout.cpp:180
 msgid "wxWidgets Version:"
 msgstr "wxWidgets Версия:"
 
-#: clientgui/DlgAbout.cpp:188
+#: DlgAbout.cpp:188
 msgid "Copyright:"
 msgstr "Авторски права:"
 
-#: clientgui/DlgAbout.cpp:192
+# 98%
+#: DlgAbout.cpp:192
 msgid ""
-"(C) 2003-2014 University of California, Berkeley.\n"
+"(C) 2003-2013 University of California, Berkeley.\n"
 "All Rights Reserved."
 msgstr ""
+"(C) 2003-2013 Калифорнийски Университет, Бъркли.\n"
+"Всички Права Запазени."
 
-#: clientgui/DlgAbout.cpp:196
+#: DlgAbout.cpp:196
 msgid "Berkeley Open Infrastructure for Network Computing"
 msgstr "Отворена Инфраструктура на Бъркли за Изчисления в Мрежа"
 
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:399
-#: clientgui/DlgSelectComputer.cpp:163
+#: DlgAbout.cpp:208 DlgExitMessage.cpp:173 DlgGenericMessage.cpp:120
+#: DlgOptions.cpp:396 DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "&OK"
 
-#: clientgui/DlgAdvPreferences.cpp:602
+#: DlgAdvPreferences.cpp:544
 msgid "invalid number"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:603
+#: DlgAdvPreferences.cpp:545
 msgid "invalid time, format is HH:MM"
 msgstr "невалиден час, формата е ЧЧ:ММ"
 
-#: clientgui/DlgAdvPreferences.cpp:604
+#: DlgAdvPreferences.cpp:546
 msgid "invalid time interval, format is HH:MM-HH:MM"
 msgstr "невалиден часови интервал, формата е ЧЧ:ММ-ЧЧ:ММ"
 
-#: clientgui/DlgAdvPreferences.cpp:817
+#: DlgAdvPreferences.cpp:751
 msgid "invalid input value detected"
 msgstr "засечена невалидна въведена стойност"
 
-#: clientgui/DlgAdvPreferences.cpp:819
+#: DlgAdvPreferences.cpp:753
 msgid "Validation Error"
 msgstr "Грешка при Проверка"
 
-#: clientgui/DlgAdvPreferences.cpp:969
-#: clientgui/DlgAdvPreferences.cpp:975
-#: clientgui/DlgAdvPreferences.cpp:981
+#: DlgAdvPreferences.cpp:885 DlgAdvPreferences.cpp:891
+#: DlgAdvPreferences.cpp:897
 msgid "Applications to add"
 msgstr "Приложения за добавяне"
 
-#: clientgui/DlgAdvPreferences.cpp:998
+#: DlgAdvPreferences.cpp:914
 #, c-format
 msgid "'%s' is not an executable application."
 msgstr "'%s' не е изпълнимо приложение."
 
-#: clientgui/DlgAdvPreferences.cpp:999
-#: clientgui/DlgAdvPreferences.cpp:1046
-#: clientgui/DlgAdvPreferences.cpp:1070
+#: DlgAdvPreferences.cpp:915 DlgAdvPreferences.cpp:962
+#: DlgAdvPreferences.cpp:986
 msgid "Add Exclusive App"
 msgstr "Добави Ексклузивно Приложение"
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Name of application to add?"
 msgstr "Име на приложение за добавяне?"
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Add exclusive app"
 msgstr "Добави ексклузивно приложение"
 
-#: clientgui/DlgAdvPreferences.cpp:1045
+#: DlgAdvPreferences.cpp:961
 #, c-format
 msgid "Application names must end with '%s'"
 msgstr "Имената на приложенията трябва да завършват с '%s'"
 
-#: clientgui/DlgAdvPreferences.cpp:1069
+#: DlgAdvPreferences.cpp:985
 #, c-format
 msgid "'%s' is already in the list."
 msgstr "'%s' е вече в списъка."
 
-#: clientgui/DlgAdvPreferences.cpp:1161
+#: DlgAdvPreferences.cpp:1077
 msgid ""
 "Do you really want to clear all local preferences?\n"
 "(This will not affect exclusive applications.)"
@@ -1179,16 +1168,16 @@ msgstr ""
 "Наистина ли искате да изтриете всички локални предпочитания?\n"
 "(Това няма да засегне ексклузивните приложения.)"
 
-#: clientgui/DlgAdvPreferences.cpp:1162
+#: DlgAdvPreferences.cpp:1078 sg_DlgPreferences.cpp:1030
 msgid "Confirmation"
 msgstr "Потвърждение"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:49
+#: DlgAdvPreferencesBase.cpp:46 sg_DlgPreferences.cpp:946
 #, c-format
-msgid "%s - Computing preferences"
-msgstr ""
+msgid "%s - Preferences"
+msgstr "%s - Предпочитания"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:66
+#: DlgAdvPreferencesBase.cpp:62
 msgid ""
 "This dialog controls preferences for this computer only.\n"
 "Click OK to set preferences.\n"
@@ -1196,495 +1185,482 @@ msgid ""
 msgstr ""
 "Този прозорец контролира предпочитания само за този компютър.\n"
 "Натиснете OK за да настроите предпочитания.\n"
-"Натиснете Изчисти за да възстановите уеб-базираните настройки (с изключение на ексклузивните приложения)."
+"Натиснете Изчисти за да възстановите уеб-базираните настройки (с изключение "
+"на ексклузивните приложения)."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:69
+#: DlgAdvPreferencesBase.cpp:65 sg_DlgPreferences.cpp:428
 msgid "Clear"
 msgstr "Изчисти"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:70
+#: DlgAdvPreferencesBase.cpp:66
 msgid "clear all local preferences and close the dialog"
 msgstr "изчиства всички локални предпочитания и затваря диалога"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:85
+#: DlgAdvPreferencesBase.cpp:81
 msgid "processor usage"
 msgstr "използване на процесора"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:88
+#: DlgAdvPreferencesBase.cpp:84
 msgid "network usage"
 msgstr "използване на мрежата"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:91
+#: DlgAdvPreferencesBase.cpp:87
 msgid "disk and memory usage"
 msgstr "използване на диска и паметта"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:94
+#: DlgAdvPreferencesBase.cpp:90
 msgid "exclusive applications"
 msgstr "ексклузивни приложения"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:107
-#: clientgui/DlgDiagnosticLogFlags.cpp:104
+#: DlgAdvPreferencesBase.cpp:102 sg_DlgPreferences.cpp:424
 msgid "OK"
 msgstr "OK"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:108
+#: DlgAdvPreferencesBase.cpp:103
 msgid "save all values and close the dialog"
 msgstr "запазва всички стойности и затваря диалога"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:114
+#: DlgAdvPreferencesBase.cpp:108
 msgid "close the dialog without saving"
 msgstr "затваря диалоговия прозорец без да запази"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:118
-#: clientgui/Localization.cpp:35
-#: clientgui/Localization.cpp:121
-#: clientgui/Localization.cpp:139
+#: DlgAdvPreferencesBase.cpp:112 Localization.cpp:35 Localization.cpp:121
+#: Localization.cpp:139 sg_BoincSimpleFrame.cpp:794 sg_DlgPreferences.cpp:439
 msgid "Help"
 msgstr "Помощ"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
+#: DlgAdvPreferencesBase.cpp:113
 msgid "shows the preferences web page"
 msgstr "показва предпочитанията от интернет страницата"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:141
+#: DlgAdvPreferencesBase.cpp:135
 msgid "Computing allowed"
 msgstr "Изчисленията са разрешени"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
+#: DlgAdvPreferencesBase.cpp:139
 msgid "While computer is on batteries"
 msgstr "Докато компютъра работи на батерии"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:149
-msgid "check this if you want this computer to do work while it runs on batteries"
-msgstr "отметнете това ако искате този компютър да изчислява докато работи на батерии"
+#: DlgAdvPreferencesBase.cpp:142
+msgid ""
+"check this if you want this computer to do work while it runs on batteries"
+msgstr ""
+"отметнете това ако искате този компютър да изчислява докато работи на "
+"батерии"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:155
+#: DlgAdvPreferencesBase.cpp:148
 msgid "While computer is in use"
 msgstr "Докато компютъра се използва"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:158
-msgid "check this if you want this computer to do work even when you're using it"
-msgstr "отметнете това ако искате този компютър да изчислява докато го използвате"
+#: DlgAdvPreferencesBase.cpp:151
+msgid ""
+"check this if you want this computer to do work even when you're using it"
+msgstr ""
+"отметнете това ако искате този компютър да изчислява докато го използвате"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:164
+#: DlgAdvPreferencesBase.cpp:157
 msgid "Use GPU while computer is in use"
 msgstr "Използвай GPU докато компютъра се използва"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:167
-msgid "check this if you want your GPU to do work even when you're using the computer"
-msgstr "отметнете това ако искате вашето GPU да изчислява дори когато използвате компютъра"
+#: DlgAdvPreferencesBase.cpp:160
+msgid ""
+"check this if you want your GPU to do work even when you're using the "
+"computer"
+msgstr ""
+"отметнете това ако искате вашето GPU да изчислява дори когато използвате "
+"компютъра"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:179
+#: DlgAdvPreferencesBase.cpp:172
 msgid "Only after computer has been idle for"
 msgstr "Само след като компютъра е бил неактивен за"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:188
-msgid "do work only after you haven't used the computer for this number of minutes"
-msgstr "изчислявай само след като не сте използвали компютъра от толкова на брой минути"
+#: DlgAdvPreferencesBase.cpp:182
+msgid ""
+"do work only after you haven't used the computer for this number of minutes"
+msgstr ""
+"изчислявай само след като не сте използвали компютъра от толкова на брой "
+"минути"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:193
-#: clientgui/DlgAdvPreferencesBase.cpp:342
+#: DlgAdvPreferencesBase.cpp:187 DlgAdvPreferencesBase.cpp:336
+#: sg_DlgPreferences.cpp:417
 msgid "minutes"
 msgstr "минути"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:212
+#: DlgAdvPreferencesBase.cpp:206
 msgid "While processor usage is less than"
 msgstr "Докато използвате процесора по-малко от"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:221
+#: DlgAdvPreferencesBase.cpp:216
 msgid "suspend work if processor usage exceeds this level"
 msgstr "временно прекратява работа ако използвате процесора над това ниво"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:226
+#: DlgAdvPreferencesBase.cpp:221
 msgid "percent (0 means no restriction)"
 msgstr "процента (0 означава, че няма ограничение)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:240
-#: clientgui/DlgAdvPreferencesBase.cpp:506
+#: DlgAdvPreferencesBase.cpp:235 DlgAdvPreferencesBase.cpp:496
 msgid "Every day between hours of"
 msgstr "Всеки ден в часовия диапазон от"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: DlgAdvPreferencesBase.cpp:239
 msgid "start work at this time"
 msgstr "започни работа в този час"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:248
-#: clientgui/DlgAdvPreferencesBase.cpp:514
+#: DlgAdvPreferencesBase.cpp:243 DlgAdvPreferencesBase.cpp:504
+#: sg_DlgPreferences.cpp:326 sg_DlgPreferences.cpp:348
 msgid "and"
 msgstr "и"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:252
+#: DlgAdvPreferencesBase.cpp:247
 msgid "stop work at this time"
 msgstr "спри работа в този час"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
-#: clientgui/DlgAdvPreferencesBase.cpp:522
+#: DlgAdvPreferencesBase.cpp:251 DlgAdvPreferencesBase.cpp:512
 msgid "(no restriction if equal)"
 msgstr "(няма ограничение ако са равни)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:261
-#: clientgui/DlgAdvPreferencesBase.cpp:527
+#: DlgAdvPreferencesBase.cpp:256 DlgAdvPreferencesBase.cpp:517
 msgid "Day-of-week override:"
 msgstr "Ден от седмицата за незачитане:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:266
-#: clientgui/DlgAdvPreferencesBase.cpp:532
+#: DlgAdvPreferencesBase.cpp:261 DlgAdvPreferencesBase.cpp:522
 msgid "check box to specify hours for this day of week"
 msgstr "поставете отметка за да уточните часове за този ден от седмицата"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:272
-#: clientgui/DlgAdvPreferencesBase.cpp:538
+#: DlgAdvPreferencesBase.cpp:267 DlgAdvPreferencesBase.cpp:528
 msgid "Monday"
 msgstr "Понеделник"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:279
-#: clientgui/DlgAdvPreferencesBase.cpp:545
+#: DlgAdvPreferencesBase.cpp:274 DlgAdvPreferencesBase.cpp:535
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:286
-#: clientgui/DlgAdvPreferencesBase.cpp:552
+#: DlgAdvPreferencesBase.cpp:281 DlgAdvPreferencesBase.cpp:542
 msgid "Wednesday"
 msgstr "Сряда"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:293
-#: clientgui/DlgAdvPreferencesBase.cpp:559
+#: DlgAdvPreferencesBase.cpp:288 DlgAdvPreferencesBase.cpp:549
 msgid "Thursday"
 msgstr "Четвъртък"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:300
-#: clientgui/DlgAdvPreferencesBase.cpp:566
+#: DlgAdvPreferencesBase.cpp:295 DlgAdvPreferencesBase.cpp:556
 msgid "Friday"
 msgstr "Петък"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:307
-#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: DlgAdvPreferencesBase.cpp:302 DlgAdvPreferencesBase.cpp:563
 msgid "Saturday"
 msgstr "Събота"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:580
+#: DlgAdvPreferencesBase.cpp:309 DlgAdvPreferencesBase.cpp:570
 msgid "Sunday"
 msgstr "Неделя"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:328
+#: DlgAdvPreferencesBase.cpp:323
 msgid "Other options"
 msgstr "Други опции"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:336
+#: DlgAdvPreferencesBase.cpp:330
 msgid "Switch between applications every"
 msgstr "Превключване между приложенията на всеки"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:345
+#: DlgAdvPreferencesBase.cpp:339
 msgid "On multiprocessor systems, use at most"
 msgstr "При мултипроцесорни системи, използвай максимум"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
+#: DlgAdvPreferencesBase.cpp:346
 #, no-c-format
-msgid "% of the processors (0 means no restriction)"
+msgid "% of the processors (0 means ignore this setting)"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:355
-#: clientgui/DlgAdvPreferencesBase.cpp:618
-#: clientgui/DlgAdvPreferencesBase.cpp:640
-#: clientgui/DlgAdvPreferencesBase.cpp:661
-#: clientgui/DlgAdvPreferencesBase.cpp:683
-#: clientgui/DlgAdvPreferencesBase.cpp:694
+#: DlgAdvPreferencesBase.cpp:349 DlgAdvPreferencesBase.cpp:605
+#: DlgAdvPreferencesBase.cpp:627 DlgAdvPreferencesBase.cpp:648
+#: DlgAdvPreferencesBase.cpp:669 DlgAdvPreferencesBase.cpp:679
 msgid "Use at most"
 msgstr "Използвай максимум"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:362
+#: DlgAdvPreferencesBase.cpp:356
 #, no-c-format
-msgid "% of CPU time (0 means no restriction)"
-msgstr ""
+msgid "% CPU time"
+msgstr "% CPU време"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:386
+#: DlgAdvPreferencesBase.cpp:378
 msgid "General options"
 msgstr "Основни опции"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:395
+#: DlgAdvPreferencesBase.cpp:386
 msgid "Maximum download rate"
 msgstr "Максимална скорост на даунлоуд"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:401
-#: clientgui/DlgAdvPreferencesBase.cpp:410
-msgid "KBytes/second (0 means no restriction)"
-msgstr ""
+#: DlgAdvPreferencesBase.cpp:392 DlgAdvPreferencesBase.cpp:401
+msgid "KBytes/sec."
+msgstr "Кбайта/сек."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:404
+#: DlgAdvPreferencesBase.cpp:395
 msgid "Maximum upload rate"
 msgstr "Максимална скорост на ъплоуд"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:417
+#: DlgAdvPreferencesBase.cpp:406
+msgid "Transfer at most"
+msgstr "Прехвърляй максимум"
+
+#: DlgAdvPreferencesBase.cpp:412
+msgid "Mbytes"
+msgstr "Мбайта"
+
+#: DlgAdvPreferencesBase.cpp:415
+msgid "every"
+msgstr "всеки"
+
+#: DlgAdvPreferencesBase.cpp:421 DlgAdvPreferencesBase.cpp:444
+#: DlgAdvPreferencesBase.cpp:463
+msgid "days"
+msgstr "дни"
+
+#: DlgAdvPreferencesBase.cpp:429
 msgid "Minimum work buffer"
 msgstr "Минимален буфер за работа"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:425
+#: DlgAdvPreferencesBase.cpp:438
 msgid "Try to maintain enough tasks to keep busy for this many days"
 msgstr "Опитай да поддържаш достатъчно задачи за да си зает за този брой дни"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:431
-#: clientgui/DlgAdvPreferencesBase.cpp:449
-msgid "days (maximum value: 10)"
-msgstr ""
-
-#: clientgui/DlgAdvPreferencesBase.cpp:437
+#: DlgAdvPreferencesBase.cpp:450
 msgid "Max additional work buffer"
 msgstr "Максимален допълнителен буфер за работа"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:445
+#: DlgAdvPreferencesBase.cpp:459
 msgid "In addition, maintain enough tasks for up to this many days"
 msgstr "Допълнително, поддържай достатъчно задачи за максимум този брой дни"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:454
-msgid "Transfer at most"
-msgstr "Прехвърляй максимум"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:462
-msgid "MBytes every"
-msgstr ""
-
-#: clientgui/DlgAdvPreferencesBase.cpp:468
-msgid "days (0 means no restriction)"
-msgstr ""
-
-#: clientgui/DlgAdvPreferencesBase.cpp:476
+#: DlgAdvPreferencesBase.cpp:466
 msgid "Skip image file verification"
 msgstr "Пропусни проверка с файл с изображение"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:478
+#: DlgAdvPreferencesBase.cpp:468
 msgid "check this if your Internet provider modifies image files"
-msgstr "отметнете това ако вашия Интернет доставчик променя файлове с изображение"
+msgstr ""
+"отметнете това ако вашия Интернет доставчик променя файлове с изображение"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:484
+#: DlgAdvPreferencesBase.cpp:476
 msgid "Connect options"
 msgstr "Опции при свързване"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:487
+#: DlgAdvPreferencesBase.cpp:478
 msgid "Confirm before connecting to internet"
 msgstr "Потвърди преди свързване с интернет"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
-msgstr "ако е отметнато, ще се появи прозорец за потвърждение преди да се опита да се свърже с Интернет"
+#: DlgAdvPreferencesBase.cpp:480
+msgid ""
+"if checked, a confirmation dialog will be displayed before trying to connect "
+"to the Internet"
+msgstr ""
+"ако е отметнато, ще се появи прозорец за потвърждение преди да се опита да "
+"се свърже с Интернет"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:493
+#: DlgAdvPreferencesBase.cpp:484
 msgid "Disconnect when done"
 msgstr "Прекъсни връзката когато си готов"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:495
+#: DlgAdvPreferencesBase.cpp:486
 msgid ""
 "if checked, BOINC hangs up when network usage is done\n"
 "(only relevant for dialup-connection)"
 msgstr ""
-"ако е отметнато, BOINC ще прекъсне връзката когато приключи да използва мрежата\n"
+"ако е отметнато, BOINC ще прекъсне връзката когато приключи да използва "
+"мрежата\n"
 "(приложимо само при свързване през телефонна линия)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:501
+#: DlgAdvPreferencesBase.cpp:492
 msgid "Network usage allowed"
 msgstr "Позволено е използване на мрежата"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:510
+#: DlgAdvPreferencesBase.cpp:500
 msgid "network usage start hour"
 msgstr "начален час за използване на мрежата"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:518
+#: DlgAdvPreferencesBase.cpp:508
 msgid "network usage stop hour"
 msgstr "краен час за използване на мрежата"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:610
-#: clientgui/DlgItemProperties.cpp:257
+#: DlgAdvPreferencesBase.cpp:598 DlgItemProperties.cpp:231
 msgid "Disk usage"
 msgstr "Употреба на диска"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:622
+#: DlgAdvPreferencesBase.cpp:609
 msgid "the maximum disk space used by BOINC (in Gigabytes)"
-msgstr "максимумът използвано пространство на твърдия диск от BOINC (в Гигабайти)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:626
-msgid "Gigabytes disk space (0 means no restriction)"
 msgstr ""
+"максимумът използвано пространство на твърдия диск от BOINC (в Гигабайти)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:629
+#: DlgAdvPreferencesBase.cpp:613
+msgid "Gigabytes disk space"
+msgstr "Гигабайти дисково пространство"
+
+#: DlgAdvPreferencesBase.cpp:616
 msgid "Leave at least"
 msgstr "Остави поне"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:633
+#: DlgAdvPreferencesBase.cpp:620
 msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
-msgstr "BOINC оставя поне това количество дисково пространство свободно (в Гигабайти)"
+msgstr ""
+"BOINC оставя поне това количество дисково пространство свободно (в "
+"Гигабайти)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:637
+#: DlgAdvPreferencesBase.cpp:624
 msgid "Gigabytes disk space free"
 msgstr "Гигабайти свободно дисково пространство"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
+#: DlgAdvPreferencesBase.cpp:631
 msgid "BOINC uses at most this percentage of total disk space"
 msgstr "BOINC използва максимум този процент от общото дисково пространство"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:649
+#: DlgAdvPreferencesBase.cpp:636
 #, no-c-format
 msgid "% of total disk space"
 msgstr "% от общото дисково пространство"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:652
+#: DlgAdvPreferencesBase.cpp:639
 msgid "Tasks checkpoint to disk at most every"
 msgstr "Задачите се запазват на диска на всеки максимум"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
+#: DlgAdvPreferencesBase.cpp:645
 msgid "seconds"
 msgstr "секунди"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:668
+#: DlgAdvPreferencesBase.cpp:655
 #, no-c-format
 msgid "% of page file (swap space)"
 msgstr "% от виртуална памет (суап пространство)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:675
+#: DlgAdvPreferencesBase.cpp:662
 msgid "Memory usage"
 msgstr "Употреба на паметта"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
+#: DlgAdvPreferencesBase.cpp:676
 #, no-c-format
 msgid "% when computer is in use"
 msgstr "% когато компютъра се използва"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:701
+#: DlgAdvPreferencesBase.cpp:686
 #, no-c-format
 msgid "% when computer is idle"
 msgstr "% когато компютъра не се използва"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:706
+#: DlgAdvPreferencesBase.cpp:691
 msgid "Leave applications in memory while suspended"
 msgstr "Остави приложенията в паметта докато са временно прекратени"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:708
+#: DlgAdvPreferencesBase.cpp:693
 msgid "if checked, suspended work units are left in memory"
 msgstr "ако е отметнато, временно прекратените задачи остават в паметта"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:728
-msgid "Suspend processor and network usage when these applications are running:"
-msgstr "Временно прекрати употребата на процесора и мрежата когато следните приложения работят:"
+#: DlgAdvPreferencesBase.cpp:713
+msgid ""
+"Suspend processor and network usage when these applications are running:"
+msgstr ""
+"Временно прекрати употребата на процесора и мрежата когато следните "
+"приложения работят:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:738
+#: DlgAdvPreferencesBase.cpp:722
 msgid "Add..."
 msgstr "Добави..."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:739
+#: DlgAdvPreferencesBase.cpp:723
 msgid "Add an application to this list"
 msgstr "Добавете приложение към този списък"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:744
+#: DlgAdvPreferencesBase.cpp:728 ViewProjects.cpp:202
+#: sg_ProjectCommandPopup.cpp:85
 msgid "Remove"
 msgstr "Премахни"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:745
+#: DlgAdvPreferencesBase.cpp:729
 msgid "Remove an application from this list"
 msgstr "Премахнете приложение от този списък"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:754
+#: DlgAdvPreferencesBase.cpp:738
 msgid "For advanced options, refer to "
 msgstr "За допълнителни опции се обърнете към "
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:65
-#, c-format
-msgid "%s Diagnostic Log Flags"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:83
-msgid "These flags enable various types of diagnostic messages in the Event Log."
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:105
-msgid "Save all values and close the dialog"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:108
-msgid "Defaults"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:109
-msgid "Restore default settings"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:113
-msgid "Close the dialog without saving"
-msgstr ""
-
-#: clientgui/DlgEventLog.cpp:226
+#: DlgEventLog.cpp:219
 #, c-format
 msgid "%s - Event Log"
 msgstr "%s - Регистър на Събитията"
 
-#: clientgui/DlgEventLog.cpp:236
+#: DlgEventLog.cpp:232 ViewMessages.cpp:117 ViewProjects.cpp:219
+#: ViewStatistics.cpp:435 ViewStatistics.cpp:2009 ViewTransfers.cpp:182
+#: ViewWork.cpp:232
 msgid "Project"
 msgstr "Проект"
 
-#: clientgui/DlgEventLog.cpp:237
+#: DlgEventLog.cpp:233 ViewMessages.cpp:118
 msgid "Time"
 msgstr "Време"
 
-#: clientgui/DlgEventLog.cpp:238
+#: DlgEventLog.cpp:234 ViewMessages.cpp:119
 msgid "Message"
 msgstr "Съобщение"
 
-#: clientgui/DlgEventLog.cpp:300
-#: clientgui/DlgEventLog.cpp:364
+#: DlgEventLog.cpp:290 DlgEventLog.cpp:354
 msgid "&Show only this project"
 msgstr "&Покажи само този проект"
 
-#: clientgui/DlgEventLog.cpp:304
+#: DlgEventLog.cpp:294
 msgid "Copy &All"
 msgstr "Копирай &Всичко"
 
-#: clientgui/DlgEventLog.cpp:306
-#: clientgui/DlgEventLog.cpp:310
+#: DlgEventLog.cpp:296 DlgEventLog.cpp:300 ViewMessages.cpp:89
 msgid "Copy all the messages to the clipboard."
 msgstr "Копира всички съобщения в клип-борда."
 
-#: clientgui/DlgEventLog.cpp:315
+#: DlgEventLog.cpp:305
 msgid "Copy &Selected"
 msgstr "Копирай &Избраното"
 
-#: clientgui/DlgEventLog.cpp:318
-#: clientgui/DlgEventLog.cpp:326
-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 "Копира избраните съобщения в клип-борда. Може да изберете няколко съобщения като задържите клавиша Shift или командния клавиш, докато кликвате на съобщенията."
+#: DlgEventLog.cpp:308 DlgEventLog.cpp:316 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 ""
+"Копира избраните съобщения в клип-борда. Може да изберете няколко съобщения "
+"като задържите клавиша Shift или командния клавиш, докато кликвате на "
+"съобщенията."
 
-#: clientgui/DlgEventLog.cpp:320
-#: clientgui/DlgEventLog.cpp:328
-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 "Копира избраните съобщения в клип-борда. Можете да изберете няколко съобщения като задържите клавиша Shift или Ctrl, докато кликвате на съобщенията."
+#: DlgEventLog.cpp:310 DlgEventLog.cpp:318 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 ""
+"Копира избраните съобщения в клип-борда. Можете да изберете няколко "
+"съобщения като задържите клавиша Shift или Ctrl, докато кликвате на "
+"съобщенията."
 
-#: clientgui/DlgEventLog.cpp:335
-#: clientgui/DlgItemProperties.cpp:67
+#: DlgEventLog.cpp:325 DlgItemProperties.cpp:67
 msgid "&Close"
 msgstr "&Затвори"
 
-#: clientgui/DlgEventLog.cpp:344
+#: DlgEventLog.cpp:334 sg_BoincSimpleFrame.cpp:798 sg_DlgPreferences.cpp:442
 #, c-format
 msgid "Get help with %s"
 msgstr "Вземи помощ с %s"
 
-#: clientgui/DlgEventLog.cpp:358
+#: DlgEventLog.cpp:348
 msgid "Show all &messages"
 msgstr "Покажи всички &съобщения"
 
-#: clientgui/DlgEventLog.cpp:359
-#: clientgui/DlgEventLog.cpp:361
+#: DlgEventLog.cpp:349 DlgEventLog.cpp:351
 msgid "Show messages for all projects"
 msgstr "Показва съобщения за всички проекти"
 
-#: clientgui/DlgEventLog.cpp:365
-#: clientgui/DlgEventLog.cpp:367
+#: DlgEventLog.cpp:355 DlgEventLog.cpp:357
 msgid "Show only the messages for the selected project"
 msgstr "Покажи само съобщенията за избрания проект"
 
-#: clientgui/DlgExitMessage.cpp:82
+#: DlgExitMessage.cpp:82
 #, c-format
 msgid "%s - Exit Confirmation"
 msgstr "%s - Потвърждение за Изход"
 
-#: clientgui/DlgExitMessage.cpp:130
+#: DlgExitMessage.cpp:130
 #, c-format
 msgid ""
 "You have requested to exit the %s,\n"
@@ -1701,7 +1677,7 @@ msgstr ""
 "Ако също така искате да изключите и задачите,\n"
 "изберете измежду следните възможности:"
 
-#: clientgui/DlgExitMessage.cpp:135
+#: DlgExitMessage.cpp:135
 #, c-format
 msgid ""
 "This will shut down %s and its tasks until either the\n"
@@ -1718,417 +1694,394 @@ msgstr ""
 "отколкото да излезете от приложението; това ще позволи на %s да стартира\n"
 "задачите според часовите диапазони избрани във вашите предпочитания."
 
-#: clientgui/DlgExitMessage.cpp:153
+#: DlgExitMessage.cpp:153
 #, c-format
 msgid "Stop running tasks when exiting the %s"
 msgstr "Спри работещите задачи при излизане от %s"
 
-#: clientgui/DlgExitMessage.cpp:165
+#: DlgExitMessage.cpp:165
 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
+#: DlgExitMessage.cpp:178 DlgGenericMessage.cpp:125 DlgOptions.cpp:401
+#: DlgSelectComputer.cpp:168 wizardex.cpp:378
 msgid "&Cancel"
 msgstr "&Откажи"
 
-#: clientgui/DlgGenericMessage.cpp:112
+#: DlgGenericMessage.cpp:112
 msgid "Don't show this dialog again."
 msgstr "Не показвай този диалог повече."
 
-#: clientgui/DlgItemProperties.cpp:194
-#: clientgui/DlgItemProperties.cpp:197
-#: clientgui/DlgItemProperties.cpp:200
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:168 DlgItemProperties.cpp:171
+#: DlgItemProperties.cpp:174 DlgItemProperties.cpp:177
 msgid "Don't fetch tasks for "
 msgstr "Не взимай задачи за "
 
-#: clientgui/DlgItemProperties.cpp:194
+#: DlgItemProperties.cpp:168
 msgid "Project preference"
 msgstr "Предпочитание на проекта"
 
-#: clientgui/DlgItemProperties.cpp:197
+#: DlgItemProperties.cpp:171
 msgid "Account manager preference"
 msgstr "Предпочитание на акаунт мениджъра"
 
-#: clientgui/DlgItemProperties.cpp:200
+#: DlgItemProperties.cpp:174
 msgid "Project has no apps for "
 msgstr "Проекта няма приложения за "
 
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:177
 msgid "Client configuration excludes "
 msgstr "Конфигурацията на клиента изключва "
 
-#: clientgui/DlgItemProperties.cpp:207
+#: DlgItemProperties.cpp:181
 msgid " work fetch deferred for"
 msgstr " вземането на работа е отсрочено за"
 
-#: clientgui/DlgItemProperties.cpp:208
+#: DlgItemProperties.cpp:182
 msgid " work fetch deferral interval"
 msgstr " вземането на работа е отсрочено за интервала"
 
-#: clientgui/DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:213
 msgid "Properties of project "
 msgstr "Свойства на проект "
 
-#: clientgui/DlgItemProperties.cpp:243
-#: clientgui/DlgOptions.cpp:221
+#: DlgItemProperties.cpp:217 DlgOptions.cpp:218
 msgid "General"
 msgstr "Основни"
 
-#: clientgui/DlgItemProperties.cpp:244
+#: DlgItemProperties.cpp:218
 msgid "Master URL"
 msgstr "Главен URL"
 
-#: clientgui/DlgItemProperties.cpp:245
+#: DlgItemProperties.cpp:219
 msgid "User name"
 msgstr "Потребителско име"
 
-#: clientgui/DlgItemProperties.cpp:246
+#: DlgItemProperties.cpp:220
 msgid "Team name"
 msgstr "Име на отбор"
 
-#: clientgui/DlgItemProperties.cpp:247
+#: DlgItemProperties.cpp:221 ViewProjects.cpp:224
 msgid "Resource share"
 msgstr "Подялба на ресурс"
 
-#: clientgui/DlgItemProperties.cpp:249
+#: DlgItemProperties.cpp:223
 msgid "Scheduler RPC deferred for"
 msgstr "Scheduler RPC е отсрочен за"
 
-#: clientgui/DlgItemProperties.cpp:252
+#: DlgItemProperties.cpp:226
 msgid "File downloads deferred for"
 msgstr "Сваляне на файловете е отсрочено за"
 
-#: clientgui/DlgItemProperties.cpp:255
+#: DlgItemProperties.cpp:229
 msgid "File uploads deferred for"
 msgstr "Качване на файловете е отсрочено за"
 
-#: clientgui/DlgItemProperties.cpp:258
+#: DlgItemProperties.cpp:232
 msgid "Computer ID"
 msgstr "Идентификатор на компютъра"
 
-#: clientgui/DlgItemProperties.cpp:260
+#: DlgItemProperties.cpp:234
 msgid "Non CPU intensive"
 msgstr "Не натоварващи CPU"
 
-#: 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
+#: DlgItemProperties.cpp:234 DlgItemProperties.cpp:236
+#: DlgItemProperties.cpp:237 DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:242 DlgItemProperties.cpp:251
+#: DlgItemProperties.cpp:254 DlgItemProperties.cpp:257
 msgid "yes"
 msgstr "да"
 
-#: clientgui/DlgItemProperties.cpp:262
+#: DlgItemProperties.cpp:236
 msgid "Suspended via GUI"
 msgstr "Временно прекратен чрез GUI"
 
-#: clientgui/DlgItemProperties.cpp:262
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:236 DlgItemProperties.cpp:237
 msgid "no"
 msgstr "не"
 
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:237
 msgid "Don't request more work"
 msgstr "Не искай повече работа"
 
-#: clientgui/DlgItemProperties.cpp:265
+#: DlgItemProperties.cpp:239
 msgid "Scheduler call in progress"
 msgstr "В ход е повикване на Планировчика"
 
-#: clientgui/DlgItemProperties.cpp:268
+#: DlgItemProperties.cpp:242
 msgid "Trickle-up pending"
 msgstr "В ход е съобщения към сървъра"
 
-#: clientgui/DlgItemProperties.cpp:271
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:245 DlgItemProperties.cpp:247
 msgid "Host location"
 msgstr "Местоположение на хоста"
 
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:247
 msgid "default"
 msgstr "по подразбиране"
 
-#: clientgui/DlgItemProperties.cpp:277
+#: DlgItemProperties.cpp:251
 msgid "Added via account manager"
 msgstr "Добавен чрез акаунт мениджър"
 
-#: clientgui/DlgItemProperties.cpp:280
+#: DlgItemProperties.cpp:254
 msgid "Remove when tasks done"
 msgstr "Премахни когато задачите приключат"
 
-#: clientgui/DlgItemProperties.cpp:283
+#: DlgItemProperties.cpp:257
 msgid "Ended"
 msgstr "Приключен"
 
-#: clientgui/DlgItemProperties.cpp:285
-msgid "Tasks completed"
-msgstr ""
-
-#: clientgui/DlgItemProperties.cpp:286
-msgid "Tasks failed"
-msgstr ""
-
-#: clientgui/DlgItemProperties.cpp:288
+#: DlgItemProperties.cpp:259
 msgid "Credit"
 msgstr "Кредит"
 
-#: clientgui/DlgItemProperties.cpp:289
+#: DlgItemProperties.cpp:260
 msgid "User"
 msgstr "Потребител"
 
-#: clientgui/DlgItemProperties.cpp:296
+#: DlgItemProperties.cpp:267
 msgid "Host"
 msgstr "Хост"
 
-#: clientgui/DlgItemProperties.cpp:305
+#: DlgItemProperties.cpp:276
 msgid "Scheduling"
 msgstr "Планиране"
 
-#: clientgui/DlgItemProperties.cpp:306
+#: DlgItemProperties.cpp:277
 msgid "Scheduling priority"
 msgstr "Приоритет при планиране"
 
-#: clientgui/DlgItemProperties.cpp:307
+#: DlgItemProperties.cpp:278
 msgid "CPU"
 msgstr "CPU"
 
-#: clientgui/DlgItemProperties.cpp:331
+#: DlgItemProperties.cpp:302
 msgid "Duration correction factor"
 msgstr "Коригиращ коефициент за продължителност"
 
-#: clientgui/DlgItemProperties.cpp:345
+#: DlgItemProperties.cpp:316
 msgid "Properties of task "
 msgstr "Свойства на задача "
 
-#: clientgui/DlgItemProperties.cpp:357
+#: DlgItemProperties.cpp:328 ViewWork.cpp:238
 msgid "Application"
 msgstr "Приложение"
 
-#: clientgui/DlgItemProperties.cpp:358
+#: DlgItemProperties.cpp:329 ViewWork.cpp:239
 msgid "Name"
 msgstr "Име"
 
-#: clientgui/DlgItemProperties.cpp:359
+#: DlgItemProperties.cpp:330
 msgid "State"
 msgstr "Състояние"
 
-#: clientgui/DlgItemProperties.cpp:362
+#: DlgItemProperties.cpp:333
 msgid "Received"
 msgstr "Получени"
 
-#: clientgui/DlgItemProperties.cpp:365
+#: DlgItemProperties.cpp:336
 msgid "Report deadline"
 msgstr "Срок за докладване"
 
-#: clientgui/DlgItemProperties.cpp:367
+#: DlgItemProperties.cpp:338
 msgid "Resources"
 msgstr "Ресурси"
 
-#: clientgui/DlgItemProperties.cpp:370
+#: DlgItemProperties.cpp:341
 msgid "Estimated computation size"
 msgstr "Очакван изчислителен размер"
 
-#: clientgui/DlgItemProperties.cpp:373
+#: DlgItemProperties.cpp:344
 msgid "CPU time at last checkpoint"
 msgstr "CPU време при последната проверка"
 
-#: clientgui/DlgItemProperties.cpp:374
-#: clientgui/DlgItemProperties.cpp:389
+#: DlgItemProperties.cpp:345 DlgItemProperties.cpp:360
 msgid "CPU time"
 msgstr "CPU време"
 
-#: clientgui/DlgItemProperties.cpp:376
-#: clientgui/DlgItemProperties.cpp:390
+#: DlgItemProperties.cpp:347 DlgItemProperties.cpp:361
 msgid "Elapsed time"
 msgstr "Изминало време"
 
-#: clientgui/DlgItemProperties.cpp:378
+#: DlgItemProperties.cpp:349
 msgid "Estimated time remaining"
 msgstr "Очаквано оставащо време"
 
-#: clientgui/DlgItemProperties.cpp:379
+#: DlgItemProperties.cpp:350
 msgid "Fraction done"
 msgstr "Готова част"
 
-#: clientgui/DlgItemProperties.cpp:380
+#: DlgItemProperties.cpp:351
 msgid "Virtual memory size"
 msgstr "Размер на виртуалната памет"
 
-#: clientgui/DlgItemProperties.cpp:381
+#: DlgItemProperties.cpp:352
 msgid "Working set size"
 msgstr "Размер на работния комплект"
 
-#: clientgui/DlgItemProperties.cpp:383
+#: DlgItemProperties.cpp:354
 msgid "Directory"
 msgstr "Папка"
 
-#: clientgui/DlgItemProperties.cpp:386
+#: DlgItemProperties.cpp:357
 msgid "Process ID"
 msgstr "Идентификатор на процес"
 
-#: clientgui/DlgItemProperties.cpp:456
+#: DlgItemProperties.cpp:427 ViewWork.cpp:1032 sg_TaskPanel.cpp:823
 msgid "Local: "
 msgstr "Локален: "
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: DlgOptions.cpp:129 DlgOptions.cpp:135
 msgid "Options"
 msgstr "Опции"
 
-#: clientgui/DlgOptions.cpp:178
+#: DlgOptions.cpp:175
 msgid "Language:"
 msgstr "Език:"
 
-#: clientgui/DlgOptions.cpp:185
+#: DlgOptions.cpp:182
 msgid "What language should BOINC use?"
 msgstr "Кой език да използва BOINC?"
 
-#: clientgui/DlgOptions.cpp:189
+#: DlgOptions.cpp:186
 msgid "Notice reminder interval:"
 msgstr "Интервал за напомнящи известия:"
 
-#: clientgui/DlgOptions.cpp:196
+#: DlgOptions.cpp:193
 msgid "How often should BOINC remind you of new notices?"
 msgstr "Колко често следва BOINC да Ви напомня за нови известия?"
 
-#: clientgui/DlgOptions.cpp:201
+#: DlgOptions.cpp:198
 msgid "Run Manager at login?"
 msgstr "Стартирай Мениджъра при влизане?"
 
-#: clientgui/DlgOptions.cpp:207
+#: DlgOptions.cpp:204
 msgid "Run the BOINC Manager when you log on."
 msgstr "Стартирай BOINC Мениджъра при включване."
 
-#: clientgui/DlgOptions.cpp:212
+#: DlgOptions.cpp:209
 msgid "Enable Manager exit dialog?"
 msgstr "Активиране на диалог при излизане от Мениджъра?"
 
-#: clientgui/DlgOptions.cpp:218
+#: DlgOptions.cpp:215
 msgid "Display the exit dialog when shutting down the Manager."
 msgstr "Покажи диалоговия прозорец за изход когато Мениждъра се изключва."
 
-#: clientgui/DlgOptions.cpp:229
+#: DlgOptions.cpp:226
 msgid "Dial-up and Virtual Private Network settings"
 msgstr "Dial-up и Virtual Private Network настройки"
 
-#: clientgui/DlgOptions.cpp:243
+#: DlgOptions.cpp:240
 msgid "&Set Default"
 msgstr "&Задай стойности по подразбиране"
 
-#: clientgui/DlgOptions.cpp:248
+#: DlgOptions.cpp:245
 msgid "&Clear Default"
 msgstr "&Изчисти стойности по подразбиране"
 
-#: clientgui/DlgOptions.cpp:255
+#: DlgOptions.cpp:252
 msgid "Default Connection:"
 msgstr "Връзка по подразбиране:"
 
-#: clientgui/DlgOptions.cpp:262
+#: DlgOptions.cpp:259
 msgid "Connections"
 msgstr "Връзки"
 
-#: clientgui/DlgOptions.cpp:271
+#: DlgOptions.cpp:268
 msgid "Connect via HTTP proxy server"
 msgstr "Свържи се чрез HTTP прокси сървър"
 
-#: clientgui/DlgOptions.cpp:275
+#: DlgOptions.cpp:272
 msgid "HTTP Proxy Server Configuration"
 msgstr "Настройки на HTTP Прокси Сървър"
 
-#: clientgui/DlgOptions.cpp:283
-#: clientgui/DlgOptions.cpp:347
+#: DlgOptions.cpp:280 DlgOptions.cpp:344
 msgid "Address:"
 msgstr "Адрес:"
 
-#: clientgui/DlgOptions.cpp:291
-#: clientgui/DlgOptions.cpp:355
+#: DlgOptions.cpp:288 DlgOptions.cpp:352 ProxyPage.cpp:340 ProxyPage.cpp:360
 msgid "Port:"
 msgstr "Порт:"
 
-#: clientgui/DlgOptions.cpp:299
-#: clientgui/DlgOptions.cpp:363
+#: DlgOptions.cpp:296 DlgOptions.cpp:360
 msgid "Don't use proxy for:"
 msgstr "Не използвай прокси за:"
 
-#: clientgui/DlgOptions.cpp:306
-#: clientgui/DlgOptions.cpp:370
+#: DlgOptions.cpp:303 DlgOptions.cpp:367
 msgid "Leave these blank if not needed"
 msgstr "Остави тези полета празни ако не са нужни"
 
-#: clientgui/DlgOptions.cpp:312
-#: clientgui/DlgOptions.cpp:376
+#: DlgOptions.cpp:309 DlgOptions.cpp:373 ProxyPage.cpp:343 ProxyPage.cpp:363
 msgid "User Name:"
 msgstr "Потребителско Име:"
 
-#: clientgui/DlgOptions.cpp:320
-#: clientgui/DlgOptions.cpp:384
-#: clientgui/DlgSelectComputer.cpp:152
+#: DlgOptions.cpp:317 DlgOptions.cpp:381 DlgSelectComputer.cpp:152
+#: ProxyPage.cpp:346 ProxyPage.cpp:366
 msgid "Password:"
 msgstr "Парола:"
 
-#: clientgui/DlgOptions.cpp:327
+#: DlgOptions.cpp:324
 msgid "HTTP Proxy"
 msgstr "HTTP Прокси"
 
-#: clientgui/DlgOptions.cpp:335
+#: DlgOptions.cpp:332
 msgid "Connect via SOCKS proxy server"
 msgstr "Свържи се чрез SOCKS прокси сървър"
 
-#: clientgui/DlgOptions.cpp:339
+#: DlgOptions.cpp:336
 msgid "SOCKS Proxy Server Configuration"
 msgstr "Настройки на SOCKS Прокси Сървър"
 
-#: clientgui/DlgOptions.cpp:391
+#: DlgOptions.cpp:388
 msgid "SOCKS Proxy"
 msgstr "SOCKS Прокси"
 
-#: clientgui/DlgOptions.cpp:589
+#: DlgOptions.cpp:586
 msgid "always"
 msgstr "винаги"
 
-#: clientgui/DlgOptions.cpp:590
+#: DlgOptions.cpp:587
 msgid "1 hour"
 msgstr "1 час"
 
-#: clientgui/DlgOptions.cpp:591
+#: DlgOptions.cpp:588
 msgid "6 hours"
 msgstr "6 часа"
 
-#: clientgui/DlgOptions.cpp:592
+#: DlgOptions.cpp:589
 msgid "1 day"
 msgstr "1 ден"
 
-#: clientgui/DlgOptions.cpp:593
+#: DlgOptions.cpp:590
 msgid "1 week"
 msgstr "1 седмица"
 
-#: clientgui/DlgOptions.cpp:594
+#: DlgOptions.cpp:591
 msgid "never"
 msgstr "никога"
 
-#: clientgui/DlgOptions.cpp:691
+#: DlgOptions.cpp:688
 #, c-format
 msgid "%s - Language Selection"
 msgstr "%s - Избор на Език"
 
-#: clientgui/DlgOptions.cpp:698
+#: DlgOptions.cpp:695
 #, c-format
-msgid "The %s's language has been changed.  In order for this change to take effect, you must restart the %s."
-msgstr "Езикът на %s беше променен.  За да влезе в сила тази промяна, трябва да рестартирате %s."
+#, c-format, c-format
+msgid ""
+"The %s's language has been changed.  In order for this change to take "
+"effect, you must restart the %s."
+msgstr ""
+"Езикът на %s беше променен.  За да влезе в сила тази промяна, трябва да "
+"рестартирате %s."
 
-#: clientgui/DlgSelectComputer.cpp:91
+#: DlgSelectComputer.cpp:91
 #, c-format
 msgid "%s - Select Computer"
 msgstr "%s - Избери Компютър"
 
-#: clientgui/DlgSelectComputer.cpp:125
+#: DlgSelectComputer.cpp:125
 #, c-format
 msgid ""
 "Another instance of %s is already running \n"
@@ -2137,415 +2090,420 @@ msgstr ""
 "Още един %s е вече стартиран на този \n"
 "компютър.  Моля изберете клиент който да наблюдавате."
 
-#: clientgui/DlgSelectComputer.cpp:143
+#: DlgSelectComputer.cpp:143
 msgid "Host name:"
 msgstr "Име на хоста:"
 
-#: clientgui/Localization.cpp:31
-#: clientgui/Localization.cpp:69
+#: Localization.cpp:31 Localization.cpp:69
 msgid "Message boards"
 msgstr "Форуми"
 
-#: clientgui/Localization.cpp:33
+#: Localization.cpp:33
 msgid "Correspond with other users on the SETI at home message boards"
 msgstr "Общувайте с други потребители във форумите на SETI at home"
 
-#: clientgui/Localization.cpp:37
+#: Localization.cpp:37
 msgid "Ask questions and report problems"
 msgstr "Задавайте въпроси и докладвайте проблеми"
 
-#: clientgui/Localization.cpp:39
-#: clientgui/Localization.cpp:81
-#: clientgui/Localization.cpp:111
-#: clientgui/Localization.cpp:129
+#: Localization.cpp:39 Localization.cpp:81 Localization.cpp:111
+#: Localization.cpp:129
 msgid "Your account"
 msgstr "Вашият акаунт"
 
-#: clientgui/Localization.cpp:41
-#: clientgui/Localization.cpp:87
-#: clientgui/Localization.cpp:113
+#: Localization.cpp:41 Localization.cpp:87 Localization.cpp:113
 msgid "View your account information and credit totals"
 msgstr "Вижте информацията за вашия акаунт и общите суми кредит"
 
-#: clientgui/Localization.cpp:43
+#: Localization.cpp:43
 msgid "Your preferences"
 msgstr "Вашите предпочитания"
 
-#: clientgui/Localization.cpp:45
+#: Localization.cpp:45
 msgid "View and modify your SETI at home account profile and preferences"
 msgstr "Вижте и променете своя профил на акаунта и предпочитания в SETI at home"
 
-#: clientgui/Localization.cpp:47
-#: clientgui/Localization.cpp:89
+#: Localization.cpp:47 Localization.cpp:89
 msgid "Your results"
 msgstr "Вашите резултати"
 
-#: clientgui/Localization.cpp:49
-#: clientgui/Localization.cpp:91
+#: Localization.cpp:49 Localization.cpp:91
 msgid "View your last week (or more) of computational results and work"
-msgstr "Вижте изчислените от Вас резултати и работа за последната седмица (или повече)"
+msgstr ""
+"Вижте изчислените от Вас резултати и работа за последната седмица (или "
+"повече)"
 
-#: clientgui/Localization.cpp:51
-#: clientgui/Localization.cpp:93
+#: Localization.cpp:51 Localization.cpp:93
 msgid "Your computers"
 msgstr "Вашите компютри"
 
-#: clientgui/Localization.cpp:53
+#: Localization.cpp:53
 msgid "View a listing of all the computers on which you are running SETI at Home"
 msgstr "Вижте списък на всички ваши компютри, които работят по SETI at Home"
 
-#: clientgui/Localization.cpp:55
-#: clientgui/Localization.cpp:97
+#: Localization.cpp:55 Localization.cpp:97
 msgid "Your team"
 msgstr "Вашият отбор"
 
-#: clientgui/Localization.cpp:57
-#: clientgui/Localization.cpp:99
+#: Localization.cpp:57 Localization.cpp:99
 msgid "View information about your team"
 msgstr "Вижте информация за вашия отбор"
 
-#: clientgui/Localization.cpp:61
+#: Localization.cpp:61
 msgid "Common questions"
 msgstr "Често задавани въпроси"
 
-#: clientgui/Localization.cpp:63
+#: Localization.cpp:63
 msgid "Read the Einstein at Home Frequently Asked Question list"
 msgstr "Прочетете списъка с Често Задавани Въпроси за Einstein at Home"
 
-#: clientgui/Localization.cpp:65
+#: Localization.cpp:65
 msgid "Screensaver info"
 msgstr "Информация за скрийн-сейвъра"
 
-#: clientgui/Localization.cpp:67
+#: Localization.cpp:67
 msgid "Read a detailed description of the Einstein at Home screensaver"
 msgstr "Прочетете подробно описание за скрийн-сейвъра на Einstein at Home"
 
-#: clientgui/Localization.cpp:71
-msgid "Correspond with admins and other users on the Einstein at Home message boards"
+#: Localization.cpp:71
+msgid ""
+"Correspond with admins and other users on the Einstein at Home message boards"
 msgstr "Общувайте с админи и други потребители във форума на Einstein at Home"
 
-#: clientgui/Localization.cpp:73
+#: Localization.cpp:73
 msgid "Einstein status"
 msgstr "Einstein статус"
 
-#: clientgui/Localization.cpp:75
+#: Localization.cpp:75
 msgid "Current status of the Einstein at Home server"
 msgstr "Текущ статус на Einstein at Home сървъра"
 
-#: clientgui/Localization.cpp:77
+#: Localization.cpp:77
 msgid "Report problems"
 msgstr "Докладвайте проблеми"
 
-#: clientgui/Localization.cpp:79
+#: Localization.cpp:79
 msgid "A link to the Einstein at Home problems and bug reports message board"
 msgstr "Линк към форума на Einstein at Home за проблеми и бъгове"
 
-#: clientgui/Localization.cpp:83
+#: Localization.cpp:83
 msgid "View and modify your Einstein at Home account profile and preferences"
-msgstr "Вижте и променете профила и предпочитанията на своя Einstein at Home акаунт"
+msgstr ""
+"Вижте и променете профила и предпочитанията на своя Einstein at Home акаунт"
 
-#: clientgui/Localization.cpp:85
+#: Localization.cpp:85
 msgid "Account summary"
 msgstr "Обобщена информация за акаунта"
 
-#: clientgui/Localization.cpp:95
-msgid "View a listing of all the computers on which you are running Einstein at Home"
+#: Localization.cpp:95
+msgid ""
+"View a listing of all the computers on which you are running Einstein at Home"
 msgstr "Вижте списък с всички ваши компютри, които работят по Einstein at Home"
 
-#: clientgui/Localization.cpp:101
+#: Localization.cpp:101
 msgid "LIGO project"
 msgstr "Проект LIGO"
 
-#: clientgui/Localization.cpp:103
-msgid "The home page of the Laser Interferometer Gravitational-wave Observatory (LIGO) project"
-msgstr "Начална страница на проекта Laser Interferometer Gravitational-wave Observatory (LIGO)"
+#: Localization.cpp:103
+msgid ""
+"The home page of the Laser Interferometer Gravitational-wave Observatory "
+"(LIGO) project"
+msgstr ""
+"Начална страница на проекта Laser Interferometer Gravitational-wave "
+"Observatory (LIGO)"
 
-#: clientgui/Localization.cpp:105
+#: Localization.cpp:105
 msgid "GEO-600 project"
 msgstr "Проект GEO-600"
 
-#: clientgui/Localization.cpp:107
+#: Localization.cpp:107
 msgid "The home page of the GEO-600 project"
 msgstr "Начална страница на проекта GEO-600"
 
-#: clientgui/Localization.cpp:115
-#: clientgui/Localization.cpp:133
+#: Localization.cpp:115 Localization.cpp:133 ViewProjects.cpp:221
+#: ViewStatistics.cpp:465
 msgid "Team"
 msgstr "Отбор"
 
-#: clientgui/Localization.cpp:117
+#: Localization.cpp:117
 msgid "Info about your Team"
 msgstr "Информация за вашия Отбор"
 
-#: clientgui/Localization.cpp:123
+#: Localization.cpp:123
 msgid "Get help for climateprediction.net"
 msgstr "Получете помощ за climateprediction.net"
 
-#: clientgui/Localization.cpp:125
+#: Localization.cpp:125
 msgid "News"
 msgstr "Новини"
 
-#: clientgui/Localization.cpp:127
+#: Localization.cpp:127
 msgid "climateprediction.net News"
 msgstr "Новини от climateprediction.net"
 
-#: clientgui/Localization.cpp:131
+#: Localization.cpp:131
 msgid "View your account information, credits, and trickles"
 msgstr "Вижте информацията за своя акаунт, кредити и съобщения"
 
-#: clientgui/Localization.cpp:135
+#: Localization.cpp:135
 msgid "Info about your team"
 msgstr "Информация за вашия отбор"
 
-#: clientgui/Localization.cpp:141
+#: Localization.cpp:141
 msgid "Search for help in our help system"
 msgstr "Потърсете помощ в нашата система за помощ"
 
-#: clientgui/Localization.cpp:143
+#: Localization.cpp:143
 msgid "Global Statistics"
 msgstr "Глобална Статистика"
 
-#: clientgui/Localization.cpp:145
+#: Localization.cpp:145
 msgid "Summary statistics for World Community Grid"
 msgstr "Обобщена статистика за World Community Grid"
 
-#: clientgui/Localization.cpp:147
+#: Localization.cpp:147
 msgid "My Grid"
 msgstr "Моята Мрежа"
 
-#: clientgui/Localization.cpp:149
+#: Localization.cpp:149
 msgid "Your statistics and settings"
 msgstr "Вашата статистика и настройки"
 
-#: clientgui/Localization.cpp:151
+#: Localization.cpp:151
 msgid "Device Profiles"
 msgstr "Профили на Устройства"
 
-#: clientgui/Localization.cpp:153
+#: Localization.cpp:153
 msgid "Update your device settings"
 msgstr "Обновете настройките на устройството си"
 
-#: clientgui/Localization.cpp:155
+#: Localization.cpp:155
 msgid "Research"
 msgstr "Проучване"
 
-#: clientgui/Localization.cpp:157
+#: Localization.cpp:157
 msgid "Learn about the projects hosted at World Community Grid"
 msgstr "Научи за проектите включени в World Community Grid"
 
-#: clientgui/MainDocument.cpp:583
+#: MainDocument.cpp:583
 msgid "Starting client"
 msgstr "Стартиране на клиент"
 
-#: clientgui/MainDocument.cpp:591
+#: MainDocument.cpp:591
 msgid "Connecting to client"
 msgstr "Свързване към клиент"
 
-#: clientgui/MainDocument.cpp:1205
+#: MainDocument.cpp:1195
 msgid "Retrieving system state; please wait..."
 msgstr "Получаване на информация за състоянието на системата; моля изчакайте..."
 
-#: clientgui/MainDocument.cpp:1826
+#: MainDocument.cpp:1816
 msgid "Missing application"
 msgstr "Липсващо приложение"
 
-#: clientgui/MainDocument.cpp:1827
-msgid "Please download and install the CoRD application from http://cord.sourceforge.net"
-msgstr "Моля изтеглете и инсталирайте приложението CoRD от http://cord.sourceforge.net"
+#: MainDocument.cpp:1817
+msgid ""
+"Please download and install the CoRD application from http://cord."
+"sourceforge.net"
+msgstr ""
+"Моля изтеглете и инсталирайте приложението CoRD от "
+"http://cord.sourceforge.net"
 
-#: clientgui/MainDocument.cpp:2442
+#: MainDocument.cpp:2432
 msgid "on batteries"
 msgstr "на батерии"
 
-#: clientgui/MainDocument.cpp:2443
+#: MainDocument.cpp:2433
 msgid "computer is in use"
 msgstr "компютъра се използва"
 
-#: clientgui/MainDocument.cpp:2444
+#: MainDocument.cpp:2434
 msgid "user request"
 msgstr "заявка от потребителя"
 
-#: clientgui/MainDocument.cpp:2445
+#: MainDocument.cpp:2435
 msgid "time of day"
 msgstr "ограничителни часове"
 
-#: clientgui/MainDocument.cpp:2446
+#: MainDocument.cpp:2436
 msgid "CPU benchmarks in progress"
 msgstr "CPU изчисляване на референтни показатели е в прогрес"
 
-#: clientgui/MainDocument.cpp:2447
+#: MainDocument.cpp:2437
 msgid "need disk space - check preferences"
 msgstr "нуждае се от дисково пространство - проверете предпочитанията"
 
-#: clientgui/MainDocument.cpp:2448
+#: MainDocument.cpp:2438
 msgid "computer is not in use"
 msgstr "компютъра не се използва"
 
-#: clientgui/MainDocument.cpp:2449
+#: MainDocument.cpp:2439
 msgid "starting up"
 msgstr "стартиране"
 
-#: clientgui/MainDocument.cpp:2450
+#: MainDocument.cpp:2440
 msgid "an exclusive app is running"
 msgstr "стартирано е ексклузивно приложение"
 
-#: clientgui/MainDocument.cpp:2451
+#: MainDocument.cpp:2441
 msgid "CPU is busy"
 msgstr "CPU е зает"
 
-#: clientgui/MainDocument.cpp:2452
+#: MainDocument.cpp:2442
 msgid "network bandwidth limit exceeded"
 msgstr "лимита за мрежов трафик е надхвърлен"
 
-#: clientgui/MainDocument.cpp:2453
+#: MainDocument.cpp:2443
 msgid "requested by operating system"
 msgstr "поискано от операционната система"
 
-#: clientgui/MainDocument.cpp:2455
+#: MainDocument.cpp:2445
 msgid "unknown reason"
 msgstr "неизвестна причина"
 
-#: clientgui/MainDocument.cpp:2477
+#: MainDocument.cpp:2467
 msgid "GPU missing, "
 msgstr "GPU липсва, "
 
-#: clientgui/MainDocument.cpp:2484
+#: MainDocument.cpp:2474
 msgid "New"
 msgstr "Нов"
 
-#: clientgui/MainDocument.cpp:2488
+#: MainDocument.cpp:2478
 msgid "Download failed"
 msgstr "Свалянето е неуспешно"
 
-#: clientgui/MainDocument.cpp:2490
+#: MainDocument.cpp:2480
 msgid "Downloading"
 msgstr "Сваляне"
 
-#: clientgui/MainDocument.cpp:2492
-#: clientgui/MainDocument.cpp:2557
+#: MainDocument.cpp:2482 MainDocument.cpp:2552
 msgid " (suspended - "
 msgstr " (временно прекратен - "
 
-#: clientgui/MainDocument.cpp:2500
+#: MainDocument.cpp:2490
 msgid "Project suspended by user"
 msgstr "Проектът е временно прекратен от потребителя"
 
-#: clientgui/MainDocument.cpp:2502
+#: MainDocument.cpp:2492
 msgid "Task suspended by user"
 msgstr "Задачата е временно прекратена от потребителя"
 
-#: clientgui/MainDocument.cpp:2504
+#: MainDocument.cpp:2494
 msgid "Suspended - "
 msgstr "Временно прекратен - "
 
 # 75%
-#: clientgui/MainDocument.cpp:2510
+#: MainDocument.cpp:2500
 msgid "GPU suspended - "
 msgstr "GPU временно прекратено - "
 
-#: clientgui/MainDocument.cpp:2517
+#: MainDocument.cpp:2507
 msgid "Waiting for memory"
 msgstr "Изчакване на паметта"
 
-#: clientgui/MainDocument.cpp:2519
+#: MainDocument.cpp:2509
 msgid "Waiting for shared memory"
 msgstr "Изчакване на споделената памет"
 
-#: clientgui/MainDocument.cpp:2521
+#: MainDocument.cpp:2512
+msgid "Running, high priority"
+msgstr "Работи, висок приоритет"
+
+#: MainDocument.cpp:2514
 msgid "Running"
 msgstr "Работи"
 
-#: clientgui/MainDocument.cpp:2523
+#: MainDocument.cpp:2517
 msgid " (non-CPU-intensive)"
 msgstr " (не-CPU-интензивен)"
 
-#: clientgui/MainDocument.cpp:2526
+#: MainDocument.cpp:2520
 msgid "Waiting to run"
 msgstr "Изчаква да работи"
 
-#: clientgui/MainDocument.cpp:2528
-#: clientgui/MainDocument.cpp:2534
+#: MainDocument.cpp:2522 MainDocument.cpp:2528
 msgid "Ready to start"
 msgstr "Готова да започне"
 
-#: clientgui/MainDocument.cpp:2538
-msgid "Postponed: "
-msgstr ""
+#: MainDocument.cpp:2532
+msgid " (Scheduler wait: "
+msgstr " (Изчакване от Планировчика: "
 
-#: clientgui/MainDocument.cpp:2541
-msgid "Postponed"
-msgstr ""
+#: MainDocument.cpp:2536
+msgid " (Scheduler wait)"
+msgstr " (Изчакване от Планировчика)"
 
-#: clientgui/MainDocument.cpp:2545
-msgid "Waiting for network access"
-msgstr ""
+#: MainDocument.cpp:2540
+msgid " (Waiting for network access)"
+msgstr " (Изчакване за достъп до мрежата)"
 
-#: clientgui/MainDocument.cpp:2549
+#: MainDocument.cpp:2544
 msgid "Computation error"
 msgstr "Изчислителна грешка"
 
-#: clientgui/MainDocument.cpp:2553
+#: MainDocument.cpp:2548
 msgid "Upload failed"
 msgstr "Изпращането неуспешно"
 
-#: clientgui/MainDocument.cpp:2555
+#: MainDocument.cpp:2550
 msgid "Uploading"
 msgstr "Изпращане"
 
-#: clientgui/MainDocument.cpp:2566
+#: MainDocument.cpp:2561
 msgid "Aborted by user"
 msgstr "Прекратена от потребителя"
 
-#: clientgui/MainDocument.cpp:2569
+#: MainDocument.cpp:2564
 msgid "Aborted by project"
 msgstr "Прекратена от проекта"
 
-#: clientgui/MainDocument.cpp:2572
+#: MainDocument.cpp:2567
 msgid "Aborted: not started by deadline"
 msgstr "Прекратена: не е стартирана преди крайния срок"
 
-#: clientgui/MainDocument.cpp:2575
+#: MainDocument.cpp:2570
 msgid "Aborted: disk limit exceeded"
 msgstr "Прекратена: надхвърлен лимит на диска"
 
-#: clientgui/MainDocument.cpp:2578
+#: MainDocument.cpp:2573
 msgid "Aborted: run time limit exceeded"
 msgstr "Прекратена: надхвърлен работен лимит от време"
 
-#: clientgui/MainDocument.cpp:2581
+#: MainDocument.cpp:2576
 msgid "Aborted: memory limit exceeded"
 msgstr "Прекратена: надхвърлен лимит памет"
 
-#: clientgui/MainDocument.cpp:2584
+#: MainDocument.cpp:2579
 msgid "Aborted"
 msgstr "Прекратена"
 
-#: clientgui/MainDocument.cpp:2589
+#: MainDocument.cpp:2584
 msgid "Acknowledged"
 msgstr "Придобита"
 
-#: clientgui/MainDocument.cpp:2591
+#: MainDocument.cpp:2586
 msgid "Ready to report"
 msgstr "Готова за докладване"
 
-#: clientgui/MainDocument.cpp:2593
+#: MainDocument.cpp:2588
 #, c-format
 msgid "Error: invalid state '%d'"
 msgstr "Грешка: невалидно състояние '%d'"
 
-#: clientgui/NoInternetConnectionPage.cpp:179
+#: NoInternetConnectionPage.cpp:179
 msgid "No Internet connection"
 msgstr "Няма връзка с Интернет"
 
-#: clientgui/NoInternetConnectionPage.cpp:182
+#: NoInternetConnectionPage.cpp:182
 msgid "Please connect to the Internet and try again."
 msgstr "Моля свържете се с Интернет и опитайте отново."
 
-#: clientgui/NotDetectedPage.cpp:181
+#: NotDetectedPage.cpp:181
 msgid "Project not found"
 msgstr "Проекта не е намерен"
 
-#: clientgui/NotDetectedPage.cpp:184
+#: NotDetectedPage.cpp:184
 msgid ""
 "The URL you supplied is not that of a BOINC-based project.\n"
 "\n"
@@ -2555,11 +2513,11 @@ msgstr ""
 "\n"
 "Моля проверете URL-то и опитайте отново."
 
-#: clientgui/NotDetectedPage.cpp:188
+#: NotDetectedPage.cpp:188
 msgid "Account manager not found"
 msgstr "Акаунт мениджър не е намерен"
 
-#: clientgui/NotDetectedPage.cpp:191
+#: NotDetectedPage.cpp:191
 msgid ""
 "The URL you supplied is not that of a BOINC-based account\n"
 "manager.\n"
@@ -2571,90 +2529,93 @@ msgstr ""
 "\n"
 "Моля проверете URL-то и опитайте отново."
 
-#: clientgui/NotFoundPage.cpp:181
+#: NotFoundPage.cpp:181
 msgid "Login Failed."
 msgstr "Входа е Неуспешен."
 
-#: clientgui/NotFoundPage.cpp:185
+#: NotFoundPage.cpp:185
 msgid "Check the username and password, and try again."
 msgstr "Проверете потребителското име и парола и опитайте отново."
 
-#: clientgui/NotFoundPage.cpp:189
+#: NotFoundPage.cpp:189
 msgid "Check the email address and password, and try again."
 msgstr "Проверете имейл адреса и паролата, и опитайте отново."
 
-#: clientgui/NoticeListCtrl.cpp:229
+#: NoticeListCtrl.cpp:222
 msgid "more..."
 msgstr "още..."
 
-#: clientgui/ProjectInfoPage.cpp:221
+#: ProjectInfoPage.cpp:477 ProjectInfoPage.cpp:778 ProjectInfoPage.cpp:782
+msgid "All"
+msgstr "Всички"
+
+#: ProjectInfoPage.cpp:615
 msgid "Choose a project"
 msgstr "Изберете проект"
 
-#: clientgui/ProjectInfoPage.cpp:228
+#: ProjectInfoPage.cpp:619
 msgid "To choose a project, click its name or type its URL below."
-msgstr "За да изберете проект, натиснете на неговото име или напишете URL-то му отдолу."
+msgstr ""
+"За да изберете проект, натиснете на неговото име или напишете URL-то му "
+"отдолу."
 
-#: clientgui/ProjectInfoPage.cpp:246
+#: ProjectInfoPage.cpp:623
 msgid "Categories:"
 msgstr "Категории:"
 
-#: clientgui/ProjectInfoPage.cpp:267
+#: ProjectInfoPage.cpp:627 sg_ProjectPanel.cpp:89
 msgid "Projects:"
 msgstr "Проекти:"
 
-#: clientgui/ProjectInfoPage.cpp:279
+#: ProjectInfoPage.cpp:631
 msgid "Project details"
 msgstr "Подробности за проекта"
 
-#: clientgui/ProjectInfoPage.cpp:291
+#: ProjectInfoPage.cpp:635
 msgid "Research area:"
 msgstr "Сфера на проучване:"
 
-#: clientgui/ProjectInfoPage.cpp:302
+#: ProjectInfoPage.cpp:639
 msgid "Organization:"
 msgstr "Организация:"
 
-#: clientgui/ProjectInfoPage.cpp:313
+#: ProjectInfoPage.cpp:643
 msgid "Web site:"
 msgstr "Интернет страница:"
 
-#: clientgui/ProjectInfoPage.cpp:325
+#: ProjectInfoPage.cpp:647
 msgid "Supported systems:"
 msgstr "Поддържани системи:"
 
-#: clientgui/ProjectInfoPage.cpp:363
+#: ProjectInfoPage.cpp:651
 msgid "Project URL:"
 msgstr "URL на Проекта:"
 
-#: clientgui/ProjectInfoPage.cpp:499
-#: clientgui/ProjectInfoPage.cpp:754
-#: clientgui/ProjectInfoPage.cpp:758
-msgid "All"
-msgstr "Всички"
-
-#: clientgui/ProjectInfoPage.cpp:802
-msgid "This project may not have work for your type of computer.  Do you want to add it anyway?"
-msgstr "Този проект може да няма работа за вашия тип компютър.  Искате ли да го добавите все пак?"
+#: ProjectInfoPage.cpp:826
+msgid ""
+"This project may not have work for your type of computer.  Do you want to "
+"add it anyway?"
+msgstr ""
+"Този проект може да няма работа за вашия тип компютър.  Искате ли да го "
+"добавите все пак?"
 
-#: clientgui/ProjectInfoPage.cpp:826
+#: ProjectInfoPage.cpp:850
 msgid "You already added this project. Please choose a different project."
 msgstr "Вече сте добавили този проект. Моля изберете различен проект."
 
-#: clientgui/ProjectProcessingPage.cpp:321
+#: ProjectProcessingPage.cpp:321
 msgid "Communicating with project."
 msgstr "Комуникация с проект."
 
-#: clientgui/ProjectProcessingPage.cpp:510
+#: ProjectProcessingPage.cpp:509
 msgid "Required files not found on the server."
 msgstr "Необходимите файлове не са намерени на сървъра."
 
-#: clientgui/ProjectProcessingPage.cpp:513
-#: clientgui/ProjectProcessingPage.cpp:586
+#: ProjectProcessingPage.cpp:512 ProjectProcessingPage.cpp:574
 msgid "An internal server error has occurred."
 msgstr "Възникна вътрешна грешка на сървъра."
 
-#: clientgui/ProjectPropertiesPage.cpp:334
+#: ProjectPropertiesPage.cpp:334
 msgid ""
 "Communicating with project\n"
 "Please wait..."
@@ -2662,48 +2623,11 @@ msgstr ""
 "Комуникация с проекта\n"
 "Моля изчакайте..."
 
-#: clientgui/ProjectWelcomePage.cpp:251
-#, c-format
-msgid "Welcome to %s."
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:254
-msgid "You have volunteered to compute for this project:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:255
-msgid "Name:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:258
-msgid "Home:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:262
-msgid "Description:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:265
-msgid "URL:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:268
-msgid "User:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:273
-msgid "WARNING: This project is not registered with BOINC.  Make sure you trust it before continuing."
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:277
-msgid "To continue, click Next."
-msgstr "За да продължите, натиснете Напред."
-
-#: clientgui/ProxyInfoPage.cpp:195
+#: ProxyInfoPage.cpp:195
 msgid "Network communication failure"
 msgstr "Неуспешно свързване"
 
-#: clientgui/ProxyInfoPage.cpp:199
+#: ProxyInfoPage.cpp:199
 msgid ""
 "The World Community Grid - BOINC software failed to communicate\n"
 "over the Internet. The most likely reasons are:\n"
@@ -2733,7 +2657,7 @@ msgstr ""
 "3) Вие използвате прокси сървър.\n"
 "Натиснете Напред за да зададете настройките на проксито на BOINC програмата."
 
-#: clientgui/ProxyInfoPage.cpp:203
+#: ProxyInfoPage.cpp:203
 msgid ""
 "BOINC failed to communicate on the Internet.\n"
 "The most likely reasons are:\n"
@@ -2763,1370 +2687,1332 @@ msgstr ""
 "3) Вие използвате прокси сървър.\n"
 "Натиснете Напред за да зададете настройките на проксито на BOINC програмата."
 
-#: clientgui/ProxyPage.cpp:331
+#: ProxyPage.cpp:331
 msgid "Proxy configuration"
 msgstr "Прокси настройки"
 
-#: clientgui/ProxyPage.cpp:334
+#: ProxyPage.cpp:334
 msgid "HTTP proxy"
 msgstr "HTTP прокси"
 
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
+#: ProxyPage.cpp:337 ProxyPage.cpp:357
 msgid "Server:"
 msgstr "Сървър:"
 
-#: clientgui/ProxyPage.cpp:350
+#: ProxyPage.cpp:350
 msgid "Autodetect"
 msgstr "Автоматично засичане"
 
-#: clientgui/ProxyPage.cpp:354
+#: ProxyPage.cpp:354
 msgid "SOCKS proxy"
 msgstr "SOCKS прокси"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:167
-msgid "Advanced View...\tCtrl+Shift+A"
-msgstr "Разширен Изглед...\t Ctrl+Shift+A"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:168
-msgid "Display the advanced graphical interface."
-msgstr "Показване на разширения графичен интерфейс."
-
-#: clientgui/sg_BoincSimpleFrame.cpp:175
-msgid "Skin"
-msgstr "Скин"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:177
-msgid "Select the appearance of the user interface."
-msgstr "Изберете изгледа на потребителския интерфейс."
+#: TermsOfUsePage.cpp:218
+msgid "Terms of Use"
+msgstr "Условия за Ползване"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:224
-#, c-format
-msgid "&%s"
-msgstr "&%s"
+#: TermsOfUsePage.cpp:222
+msgid "Please read the following terms of use:"
+msgstr "Моля прочетете следните условия за ползване:"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:405
-msgid "Default"
-msgstr "По подразбиране"
+#: TermsOfUsePage.cpp:231
+msgid "I agree to the terms of use."
+msgstr "Съгласен съм с условията на ползване."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:848
-msgid "Suspend"
-msgstr "Временно прекратяване"
+#: TermsOfUsePage.cpp:237
+msgid "I do not agree to the terms of use."
+msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:850
-msgid "Suspend Computing"
-msgstr "Временно прекратете Изчисленията"
+#: UnavailablePage.cpp:183
+msgid "Project temporarily unavailable"
+msgstr "Проекта е временно недостъпен"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:851
-msgid "Resume Computing"
-msgstr "Подновете Изчисленията"
+#: UnavailablePage.cpp:186
+msgid ""
+"The project is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr ""
+"Проекта е временно недостъпен.\n"
+"\n"
+"Моля опитайте отново по-късно."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:867
-msgid "Notices"
-msgstr "Известия"
+#: UnavailablePage.cpp:190
+msgid "Account manager temporarily unavailable"
+msgstr "Акаунт мениджъра е временно недостъпен"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:868
-msgid "Open a window to view notices from projects or BOINC"
-msgstr "Отворете прозорец за да прегледате известията от проектите или от BOINC"
+#: UnavailablePage.cpp:193
+msgid ""
+"The account manager is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr ""
+"Акаунт мениджъра е временно недостъпен.\n"
+"\n"
+"Моля опитайте отново по-късно."
 
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
-msgstr "Търсене на известия; моля изчакайте..."
+#: ValidateAccountKey.cpp:68
+msgid "Please specify an account key to continue."
+msgstr "Моля посочете ключ на акаунта, за да продължите."
 
-#: clientgui/sg_DlgMessages.cpp:132
-msgid "There are no notices at this time."
-msgstr "Няма известия в този момент."
+#: ValidateAccountKey.cpp:71
+msgid "Invalid Account Key; please enter a valid Account Key"
+msgstr "Невалиден Ключ на Акаунта; моля въведете валиден Ключ на Акаунта"
 
-#: clientgui/sg_DlgMessages.cpp:146
-msgid "Close"
-msgstr "Затвори"
+#: ValidateAccountKey.cpp:82 ValidateEmailAddress.cpp:86
+msgid "Validation conflict"
+msgstr "Конфликт при потвърждаване"
 
-#: clientgui/sg_DlgMessages.cpp:394
-#, c-format
-msgid "%s - Notices"
-msgstr "%s - Известия"
+#: ValidateEmailAddress.cpp:72
+msgid "Please specify an email address"
+msgstr "Моля посочете имейл адрес"
 
-#: clientgui/sg_DlgPreferences.cpp:270
-msgid "This dialog controls preferences for this computer only."
-msgstr "Този диалог контролира предпочитанията само за този компютър."
+#: ValidateEmailAddress.cpp:75
+msgid "Invalid email address; please enter a valid email address"
+msgstr "Невалиден имейл адрес; моля въведете валиден имейл адрес"
 
-#: clientgui/sg_DlgPreferences.cpp:275
-msgid "Click OK to set preferences."
-msgstr "Натиснете ОК за да зададете предпочитания."
+#: ValidateURL.cpp:69
+msgid "Missing URL"
+msgstr "Липсващ URL"
 
-#: clientgui/sg_DlgPreferences.cpp:280
-msgid "Click Clear to restore web-based settings for all preferences listed below."
+#: ValidateURL.cpp:70
+msgid ""
+"Please specify a URL.\n"
+"For example:\n"
+"http://www.example.com/"
 msgstr ""
+"Моля посочете URL.\n"
+"Например:\n"
+"http://www.example.com/"
 
-#: clientgui/sg_DlgPreferences.cpp:287
-msgid "For additional settings, select Computing Preferences in the Advanced View."
+#: ValidateURL.cpp:83 ValidateURL.cpp:87 ValidateURL.cpp:91
+#: ValidateURL.cpp:103 ValidateURL.cpp:107 ValidateURL.cpp:110
+msgid "Invalid URL"
+msgstr "Невалиден URL"
+
+#: ValidateURL.cpp:84 ValidateURL.cpp:88 ValidateURL.cpp:92
+msgid ""
+"Please specify a valid URL.\n"
+"For example:\n"
+"http://boincproject.example.com"
 msgstr ""
+"Моля въведете валиден URL.\n"
+"Например:\n"
+"http://boincproject.example.com"
 
-#: clientgui/sg_DlgPreferences.cpp:315
-msgid "Do work only between:"
-msgstr "Извършвай работа само между:"
+#: ValidateURL.cpp:104 ValidateURL.cpp:108
+#, c-format
+msgid "'%s' does not contain a valid host name."
+msgstr "'%s' не съдържа валидно име на хост."
 
-#: clientgui/sg_DlgPreferences.cpp:337
-msgid "Connect to internet only between:"
-msgstr "Свързвай се с интернет само между:"
+#: ValidateURL.cpp:111
+#, c-format
+msgid "'%s' does not contain a valid path."
+msgstr "'%s' не съдържа валидна пътека."
 
-#: clientgui/sg_DlgPreferences.cpp:359
-#: clientgui/sg_DlgPreferences.cpp:376
-msgid "Use no more than:"
-msgstr "Не използвай повече от:"
+#: ViewMessages.cpp:84 ViewProjects.cpp:170 ViewStatistics.cpp:1978
+#: ViewTransfers.cpp:160 ViewWork.cpp:183
+msgid "Commands"
+msgstr "Команди"
 
-#: clientgui/sg_DlgPreferences.cpp:372
-msgid "of disk space"
-msgstr "дисково пространство"
+#: ViewMessages.cpp:88
+msgid "Copy all messages"
+msgstr "Копирай всички съобщения"
 
-#: clientgui/sg_DlgPreferences.cpp:389
-msgid "of the processor"
-msgstr "от процесора"
+#: ViewMessages.cpp:95
+msgid "Copy selected messages"
+msgstr "Копирай избраните съобщения"
 
-#: clientgui/sg_DlgPreferences.cpp:393
-msgid "Do work while on battery?"
-msgstr "Да извършва ли работа докато е на батерии?"
+#: ViewMessages.cpp:106 ViewMessages.cpp:502
+msgid "Show only this project"
+msgstr "Покажи само този проект"
 
-#: clientgui/sg_DlgPreferences.cpp:406
-msgid "Do work after idle for:"
-msgstr "Извършвай работа след като си бил неактивен за:"
+#: ViewMessages.cpp:107 ViewMessages.cpp:503
+msgid "Show only the messages for the selected project."
+msgstr "Покажи само съобщенията от избрания проект."
 
-#: clientgui/sg_DlgPreferences.cpp:431
-msgid "Clear all local preferences listed above and close the dialog"
-msgstr ""
+#: ViewMessages.cpp:164
+msgid "Messages"
+msgstr "Съобщения"
 
-#: clientgui/sg_DlgPreferences.cpp:609
-#: clientgui/sg_DlgPreferences.cpp:612
-#: clientgui/sg_DlgPreferences.cpp:688
-#: clientgui/sg_DlgPreferences.cpp:692
-#: clientgui/sg_DlgPreferences.cpp:704
-#: clientgui/sg_DlgPreferences.cpp:708
-#: clientgui/sg_DlgPreferences.cpp:851
-#: clientgui/sg_DlgPreferences.cpp:862
-msgid "Anytime"
-msgstr "По всяко време"
+#: ViewMessages.cpp:187
+msgid "Copying all messages to the clipboard..."
+msgstr "Копиране на всички съобщения в клип-борда..."
 
-#: clientgui/sg_DlgPreferences.cpp:645
-msgid "100 MB"
-msgstr "100 MB"
+#: ViewMessages.cpp:223
+msgid "Copying selected messages to the clipboard..."
+msgstr "Копиране на избраните съобщения в клип-борда..."
 
-#: clientgui/sg_DlgPreferences.cpp:646
-msgid "200 MB"
-msgstr "200 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:647
-msgid "500 MB"
-msgstr "500 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:648
-msgid "1 GB"
-msgstr "1 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:649
-msgid "2 GB"
-msgstr "2 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:650
-msgid "5 GB"
-msgstr "5 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:651
-msgid "10 GB"
-msgstr "10 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:652
-msgid "20 GB"
-msgstr "20 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:653
-msgid "50 GB"
-msgstr "50 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:654
-msgid "100 GB"
-msgstr "100 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:724
-#, c-format
-msgid "%d MB"
-msgstr "%d MB"
-
-#: clientgui/sg_DlgPreferences.cpp:726
-#, c-format
-msgid "%4.2f GB"
-msgstr "%4.2f GB"
+#: ViewMessages.cpp:286
+msgid "Filtering messages..."
+msgstr "Филтриране на съобщения..."
 
-#: clientgui/sg_DlgPreferences.cpp:767
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
+#: ViewMessages.cpp:494
+msgid "Show all messages"
+msgstr "Покажи всички съобщения"
 
-#: clientgui/sg_DlgPreferences.cpp:803
-msgid "0 (Run Always)"
-msgstr "0 (Работи Винаги)"
+#: ViewMessages.cpp:495
+msgid "Show messages for all projects."
+msgstr "Показва съобщенията за всички проекти."
 
-#: clientgui/sg_DlgPreferences.cpp:806
-#, c-format
-msgid "%d"
-msgstr "%d"
+#: ViewNotices.cpp:58 sg_DlgMessages.cpp:124
+msgid "Fetching notices; please wait..."
+msgstr "Търсене на известия; моля изчакайте..."
 
-#: clientgui/sg_DlgPreferences.cpp:953
-#, c-format
-msgid "%s - Computing Preferences"
-msgstr ""
+#: ViewNotices.cpp:65 sg_DlgMessages.cpp:132
+msgid "There are no notices at this time."
+msgstr "Няма известия в този момент."
 
-#: clientgui/sg_DlgPreferences.cpp:1033
-msgid "Do you really want to clear all local preferences?\n"
-msgstr "Наистина ли искате да изчистите всички локални предпочитания?\n"
+#: ViewNotices.cpp:99 sg_BoincSimpleFrame.cpp:776
+msgid "Notices"
+msgstr "Известия"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:66
-#: clientgui/ViewProjects.cpp:179
+#: ViewProjects.cpp:174 sg_ProjectCommandPopup.cpp:61
 msgid "Update"
 msgstr "Обнови проекта"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:67
-#: clientgui/ViewProjects.cpp:180
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
-msgstr "Докладва всички приключили задачи, получава най-новия кредит, получава най-новите предпочитания и е възможно да вземе още задачи."
+#: ViewProjects.cpp:175 sg_ProjectCommandPopup.cpp:62
+msgid ""
+"Report all completed tasks, get latest credit, get latest preferences, and "
+"possibly get more tasks."
+msgstr ""
+"Докладва всички приключили задачи, получава най-новия кредит, получава "
+"най-новите предпочитания и е възможно да вземе още задачи."
+
+#: 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
+msgid "Suspend"
+msgstr "Временно прекратяване"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:73
-#: clientgui/sg_ProjectCommandPopup.cpp:129
-#: clientgui/ViewProjects.cpp:187
-#: clientgui/ViewProjects.cpp:727
+#: ViewProjects.cpp:182 ViewProjects.cpp:722 sg_ProjectCommandPopup.cpp:68
+#: sg_ProjectCommandPopup.cpp:114
 msgid "Suspend tasks for this project."
 msgstr "Временно прекратява задачите по този проект."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:78
-#: clientgui/sg_ProjectCommandPopup.cpp:136
-#: clientgui/ViewProjects.cpp:193
-#: clientgui/ViewProjects.cpp:746
+#: ViewProjects.cpp:188 ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:73
+#: sg_ProjectCommandPopup.cpp:121
 msgid "No new tasks"
 msgstr "Без нови задачи"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:79
-#: clientgui/ViewProjects.cpp:194
+#: ViewProjects.cpp:189 sg_ProjectCommandPopup.cpp:74
 msgid "Don't get new tasks for this project."
 msgstr "Не взимай нови задачи за този проект."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:200
+#: ViewProjects.cpp:195 sg_ProjectCommandPopup.cpp:79
 msgid "Reset project"
 msgstr "Нулирай проекта"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:85
-#: clientgui/ViewProjects.cpp:201
-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 "Изтрива всички файлове и задачи асоциирани с този проект, и взима нови задачи.  Можете първо да обновите проекта, за да докладвате завършените задачи."
+#: ViewProjects.cpp:196 sg_ProjectCommandPopup.cpp:80
+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:208
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
-msgstr "Премахва този проект.  Задачите по които се работи ще бъдат изгубени (използвайте първо 'Обнови' за да докладвате завършените задачи)."
+#: ViewProjects.cpp:203 sg_ProjectCommandPopup.cpp:86
+msgid ""
+"Remove this project.  Tasks in progress will be lost (use 'Update' first to "
+"report any completed tasks)."
+msgstr ""
+"Премахва този проект.  Задачите по които се работи ще бъдат изгубени "
+"(използвайте първо 'Обнови' за да докладвате завършените задачи)."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:96
-#: clientgui/sg_TaskCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:214
+#: ViewProjects.cpp:209 ViewWork.cpp:222 sg_ProjectCommandPopup.cpp:91
+#: sg_TaskCommandPopup.cpp:78
 msgid "Properties"
 msgstr "Свойства"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:97
-#: clientgui/ViewProjects.cpp:215
+#: ViewProjects.cpp:210 sg_ProjectCommandPopup.cpp:92
 msgid "Show project details."
 msgstr "Покажи детайли на проекта."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:126
-#: clientgui/ViewProjects.cpp:723
-msgid "Resume tasks for this project."
-msgstr "Поднови задачите по този проект."
+#: ViewProjects.cpp:220 ViewStatistics.cpp:450
+msgid "Account"
+msgstr "Акаунт"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:133
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow new tasks"
-msgstr "Позволи нови задачи"
+#: ViewProjects.cpp:222
+msgid "Work done"
+msgstr "Извършена работа"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:134
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow fetching new tasks for this project."
-msgstr "Позволява взимането на нови задачи за този проект."
+#: ViewProjects.cpp:223
+msgid "Avg. work done"
+msgstr "Средно извършена работа"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:137
-#: clientgui/ViewProjects.cpp:746
-msgid "Don't fetch new tasks for this project."
-msgstr "Не взимай нови задачи за този проект."
+#: ViewProjects.cpp:225 ViewTransfers.cpp:188 ViewWork.cpp:234
+msgid "Status"
+msgstr "Статус"
+
+#: ViewProjects.cpp:250
+msgid "Projects"
+msgstr "Проекти"
+
+#: ViewProjects.cpp:302
+msgid "Updating project..."
+msgstr "Обновяване на проект..."
+
+#: ViewProjects.cpp:344
+msgid "Resuming project..."
+msgstr "Подновяване на проект..."
+
+#: ViewProjects.cpp:348
+msgid "Suspending project..."
+msgstr "Временно прекратяване на проект..."
+
+#: ViewProjects.cpp:385
+msgid "Telling project to allow additional task downloads..."
+msgstr "Казва на проекта да позволи взимането на допълнителни задачи..."
+
+#: ViewProjects.cpp:389
+msgid "Telling project to not fetch any additional tasks..."
+msgstr "Казва на проекта да не взима допълнителни задачи..."
+
+#: ViewProjects.cpp:425
+msgid "Resetting project..."
+msgstr "Нулиране на проект..."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:229
-#: clientgui/ViewProjects.cpp:443
+#: ViewProjects.cpp:438 sg_ProjectCommandPopup.cpp:214
 #, c-format
 msgid "Are you sure you want to reset project '%s'?"
 msgstr "Сигурни ли сте, че искате да нулирате проекта '%s'?"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:235
-#: clientgui/ViewProjects.cpp:449
+#: ViewProjects.cpp:444 sg_ProjectCommandPopup.cpp:220
 msgid "Reset Project"
 msgstr "Нулирай Проекта"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:266
-#: clientgui/ViewProjects.cpp:501
+#: ViewProjects.cpp:483
+msgid "Removing project..."
+msgstr "Премахване на проект..."
+
+#: ViewProjects.cpp:496 sg_ProjectCommandPopup.cpp:251
 #, c-format
+#, c-format, c-format
 msgid "Are you sure you want to remove project '%s'?"
 msgstr "Сигурни ли сте, че искате да премахнете проект '%s'?"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:272
-#: clientgui/ViewProjects.cpp:507
+#: ViewProjects.cpp:502 sg_ProjectCommandPopup.cpp:257
 msgid "Remove Project"
 msgstr "Премахни Проекта"
 
-#: clientgui/sg_ProjectPanel.cpp:72
-msgid "Add Project"
-msgstr "Добави Проект"
+#: ViewProjects.cpp:543 ViewWork.cpp:599
+msgid "Launching browser..."
+msgstr "Стартиране на браузър..."
 
-#: clientgui/sg_ProjectPanel.cpp:73
-msgid "Synchronize"
-msgstr "Синхронизирай"
+#: ViewProjects.cpp:718 sg_ProjectCommandPopup.cpp:111
+msgid "Resume tasks for this project."
+msgstr "Поднови задачите по този проект."
 
-#: clientgui/sg_ProjectPanel.cpp:74
-msgid "Work done for this project"
-msgstr "Работа приключена за този проект"
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:118
+msgid "Allow new tasks"
+msgstr "Позволи нови задачи"
 
-#: clientgui/sg_ProjectPanel.cpp:77
-msgid "Synchronize projects with account manager system"
-msgstr "Синхронизирайте проекти със системата на акаунт мениджър"
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:119
+msgid "Allow fetching new tasks for this project."
+msgstr "Позволява взимането на нови задачи за този проект."
 
-#: clientgui/sg_ProjectPanel.cpp:124
-msgid "Select a project to access with the controls below"
-msgstr "Изберете проект до който да имате достъп със контролерите по-долу"
+#: ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:122
+msgid "Don't fetch new tasks for this project."
+msgstr "Не взимай нови задачи за този проект."
 
-# 88%
-#: clientgui/sg_ProjectPanel.cpp:145
-msgid "Project Web Pages"
-msgstr "Интернет Страници на Проекта"
+#: ViewProjects.cpp:1058
+msgid "Requested by user"
+msgstr "По желание на потребителя"
 
-#: clientgui/sg_ProjectPanel.cpp:149
-msgid "Project Commands"
-msgstr "Команди на Проекта"
+#: ViewProjects.cpp:1059
+msgid "To fetch work"
+msgstr "За да изтегли работа"
 
-#: clientgui/sg_ProjectPanel.cpp:276
-#, c-format
-msgid "Pop up a menu of web sites for project %s"
-msgstr ""
+#: ViewProjects.cpp:1060
+msgid "To report completed tasks"
+msgstr "За да докладва приключени задачи"
 
-#: clientgui/sg_ProjectPanel.cpp:278
-#, c-format
-msgid "Pop up a menu of commands to apply to project %s"
-msgstr "Появява се меню с команди, които да прилагате за проект %s"
+#: ViewProjects.cpp:1061
+msgid "To send trickle-up message"
+msgstr "За да изпрати изходящо съобщение"
 
-#: clientgui/sg_TaskCommandPopup.cpp:66
-msgid "Show graphics"
-msgstr "Покажи графики"
+#: ViewProjects.cpp:1062
+msgid "Requested by account manager"
+msgstr "По желание на акаунт мениджъра"
 
-#: clientgui/sg_TaskCommandPopup.cpp:67
-msgid "Show application graphics in a window."
-msgstr "Покажи графиката от приложението в прозорец."
+#: ViewProjects.cpp:1063
+msgid "Project initialization"
+msgstr "Инициализация на проекта"
 
-#: clientgui/sg_TaskCommandPopup.cpp:73
-msgid "Suspend this task."
-msgstr "Временно прекрати тази задача."
+#: ViewProjects.cpp:1064
+msgid "Requested by project"
+msgstr "По желание на проекта"
 
-#: clientgui/sg_TaskCommandPopup.cpp:78
-msgid "Abort"
-msgstr "Прекрати"
+#: ViewProjects.cpp:1065
+msgid "Unknown reason"
+msgstr "Неизвестна причина"
 
-#: clientgui/sg_TaskCommandPopup.cpp:79
-msgid "Abandon this task. You will get no credit for it."
-msgstr "Изоставя тази задача. Вие няма да получите кредит за нея."
+#: ViewProjects.cpp:1079
+msgid "Suspended by user"
+msgstr "Временно прекратено от потребителя"
 
-#: clientgui/sg_TaskCommandPopup.cpp:85
-msgid "Show task details."
-msgstr "Покажи подробности по задачата."
+#: ViewProjects.cpp:1082
+msgid "Won't get new tasks"
+msgstr "Няма да взима нови задачи"
 
-#: clientgui/sg_TaskCommandPopup.cpp:119
-msgid "Resume work for this task."
-msgstr "Поднови работа по тази задача."
+#: ViewProjects.cpp:1085
+msgid "Project ended - OK to remove"
+msgstr "Проектът е приключен - ОК да бъде премахнат"
 
-#: clientgui/sg_TaskCommandPopup.cpp:123
-msgid "Suspend work for this task."
-msgstr "Временно прекрати работа по тази задача."
+#: ViewProjects.cpp:1088
+msgid "Will remove when tasks done"
+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)"
+#: ViewProjects.cpp:1091
+msgid "Scheduler request pending"
+msgstr "Очаква се заявка от Планировчика"
 
-#: clientgui/sg_TaskCommandPopup.cpp:272
-msgid "Abort task"
-msgstr "Прекрати задача"
+#: ViewProjects.cpp:1097
+msgid "Scheduler request in progress"
+msgstr "Тече заявка от Планировчика"
 
-#: clientgui/sg_TaskPanel.cpp:468
-msgid "You don't have any projects.  Please Add a Project."
-msgstr "Нямате добавени проекти.  Моля Добавете Проект."
+#: ViewProjects.cpp:1100
+msgid "Trickle up message pending"
+msgstr "Очаква се изходящо съобщение"
 
-#: clientgui/sg_TaskPanel.cpp:469
-msgid "Not available"
-msgstr "Няма на разположение"
+#: ViewProjects.cpp:1106
+msgid "Communication deferred "
+msgstr "Връзката е отложена "
 
-#: clientgui/sg_TaskPanel.cpp:480
-msgid "Tasks:"
-msgstr "Задачи:"
+#: ViewResources.cpp:62
+msgid "Total disk usage"
+msgstr "Общо използвано дисково пространство"
 
-#: clientgui/sg_TaskPanel.cpp:486
-msgid "Select a task to access"
-msgstr "Изберете задача, до която да получите достъп"
+#: ViewResources.cpp:83
+msgid "Disk usage by BOINC projects"
+msgstr "Използвано дисково пространство от BOINC проекти"
 
-#: clientgui/sg_TaskPanel.cpp:497
-msgid "From:"
-msgstr "От:"
+#: ViewResources.cpp:116
+msgid "Disk"
+msgstr "Дисково пространство"
 
-#: clientgui/sg_TaskPanel.cpp:551
-msgid "This task's progress"
-msgstr "Прогреса на тази задача"
+#: ViewResources.cpp:249
+msgid "no projects: 0 bytes used"
+msgstr "няма проекти: 0 байта заети"
 
-#: clientgui/sg_TaskPanel.cpp:569
-msgid "Task Commands"
-msgstr "Команди за Задача"
+#: ViewResources.cpp:286
+msgid "used by BOINC: "
+msgstr "използвано от BOINC: "
 
-#: clientgui/sg_TaskPanel.cpp:570
-msgid "Pop up a menu of commands to apply to this task"
-msgstr "Появява се меню с команди, които да прилагате върху тази задача"
+#: ViewResources.cpp:296
+msgid "free, available to BOINC: "
+msgstr "свободно, достъпно за BOINC: "
 
-#: clientgui/sg_TaskPanel.cpp:705
-#, c-format
-msgid "Application: %s"
-msgstr "Приложение: %s"
+#: ViewResources.cpp:306
+msgid "free, not available to BOINC: "
+msgstr "свободно, недостъпно за BOINC: "
 
-#: clientgui/sg_TaskPanel.cpp:728
-#, c-format
-msgid "%.3f%%"
-msgstr "%.3f%%"
+#: ViewResources.cpp:316
+msgid "free: "
+msgstr "свободно: "
 
-#: clientgui/sg_TaskPanel.cpp:736
-msgid "Application: Not available"
-msgstr "Приложение: Няма на разположение"
+#: ViewResources.cpp:326
+msgid "used by other programs: "
+msgstr "използвано от други програми: "
 
-#: clientgui/sg_TaskPanel.cpp:836
-msgid "Not Available"
-msgstr "Няма на Разположение"
+#: ViewStatistics.cpp:1205
+msgid "User Total"
+msgstr "Общ кредит на потребителя"
 
-#: clientgui/sg_TaskPanel.cpp:851
-#, c-format
-msgid "Elapsed: %s"
-msgstr "Изминало време: %s"
+#: ViewStatistics.cpp:1206
+msgid "User Average"
+msgstr "Среден кредит на потребителя"
 
-#: clientgui/sg_TaskPanel.cpp:865
-#, c-format
-msgid "Remaining (estimated): %s"
-msgstr "Оставащо време (пресметнато): %s"
+#: ViewStatistics.cpp:1207
+msgid "Host Total"
+msgstr "Общ кредит на хоста"
 
-#: clientgui/sg_TaskPanel.cpp:880
-#, c-format
-msgid "Status: %s"
-msgstr "Статус: %s"
+#: ViewStatistics.cpp:1208
+msgid "Host Average"
+msgstr "Среден кредит на хоста"
 
-#: clientgui/sg_TaskPanel.cpp:1227
-msgid "Retrieving current status."
-msgstr "Изтегляне на текущия статус."
+#: ViewStatistics.cpp:1355
+#, c-format
+msgid "Last update: %.0f days ago"
+msgstr "Последно обновяване: преди %.0f дни"
 
-#: clientgui/sg_TaskPanel.cpp:1233
-msgid "Downloading work from the server."
-msgstr "Изтегляне на работа от сървъра."
+#: ViewStatistics.cpp:1982
+msgid "Show user total"
+msgstr "Покажи общия кредит на потребителя"
 
-#: clientgui/sg_TaskPanel.cpp:1238
-msgid "Processing Suspended:  Running On Batteries."
-msgstr "Процесите са Временно Прекратени:  Работи се На Батерии."
+#: ViewStatistics.cpp:1983
+msgid "Show total credit for user"
+msgstr "Покажи общия кредит на потребителя"
 
-#: clientgui/sg_TaskPanel.cpp:1240
-msgid "Processing Suspended:  User Active."
-msgstr "Процесите са Временно Прекратени:  Потребителя е Активен."
+#: ViewStatistics.cpp:1989
+msgid "Show user average"
+msgstr "Покажи среден кредит на потребителя"
 
-#: clientgui/sg_TaskPanel.cpp:1242
-msgid "Processing Suspended:  User paused processing."
-msgstr "Процесите са Временно Прекратени:  Потребителят спря на пауза процесите."
+#: ViewStatistics.cpp:1990
+msgid "Show average credit for user"
+msgstr "Покажи среден кредит на потребителя"
 
-#: clientgui/sg_TaskPanel.cpp:1244
-msgid "Processing Suspended:  Time of Day."
-msgstr "Процесите са Временно Прекратени:  Ограничителни Часове."
+#: ViewStatistics.cpp:1996
+msgid "Show host total"
+msgstr "Покажи общ кредит на хоста"
 
-#: clientgui/sg_TaskPanel.cpp:1246
-msgid "Processing Suspended:  Benchmarks Running."
-msgstr "Процесите са Временно Прекратени:  Изчисляват се Референтните Показатели."
+#: ViewStatistics.cpp:1997
+msgid "Show total credit for host"
+msgstr "Покажи общия кредит на хоста"
 
-#: clientgui/sg_TaskPanel.cpp:1248
-msgid "Processing Suspended."
-msgstr "Процесите са Временно Прекратени."
+#: ViewStatistics.cpp:2003
+msgid "Show host average"
+msgstr "Покажи среден кредит на хоста"
 
-#: clientgui/sg_TaskPanel.cpp:1252
-msgid "Waiting to contact project servers."
-msgstr "Изчаква за свързване със сървърите на проекта."
+#: ViewStatistics.cpp:2004
+msgid "Show average credit for host"
+msgstr "Покажи среден кредит на хоста"
 
-#: clientgui/sg_TaskPanel.cpp:1256
-#: clientgui/sg_TaskPanel.cpp:1265
-msgid "Retrieving current status"
-msgstr "Извличане на текущ статус"
+#: ViewStatistics.cpp:2013
+msgid "< &Previous project"
+msgstr "< &Предходен проект"
 
-#: clientgui/sg_TaskPanel.cpp:1260
-msgid "No work available to process"
-msgstr "Няма налична работа за обработване"
+#: ViewStatistics.cpp:2014
+msgid "Show chart for previous project"
+msgstr "Покажи диаграма за предходния проект"
 
-#: clientgui/sg_TaskPanel.cpp:1262
-msgid "Unable to connect to the core client"
-msgstr "Не може да се свърже с централния клиент"
+#: ViewStatistics.cpp:2019
+msgid "&Next project >"
+msgstr "&Следващ проект >"
 
-#: clientgui/TermsOfUsePage.cpp:218
-msgid "Terms of Use"
-msgstr "Условия за Ползване"
+#: ViewStatistics.cpp:2020
+msgid "Show chart for next project"
+msgstr "Покажи диаграма за следващия проект"
 
-#: clientgui/TermsOfUsePage.cpp:222
-msgid "Please read the following terms of use:"
-msgstr "Моля прочетете следните условия за ползване:"
+#: ViewStatistics.cpp:2026 ViewStatistics.cpp:2416
+msgid "Hide project list"
+msgstr "Скрий списъка с проекти"
 
-#: clientgui/TermsOfUsePage.cpp:231
-msgid "I agree to the terms of use."
-msgstr "Съгласен съм с условията на ползване."
+#: ViewStatistics.cpp:2027 ViewStatistics.cpp:2416
+msgid "Use entire area for graphs"
+msgstr "Използвай цялата област за графики"
 
-#: clientgui/TermsOfUsePage.cpp:237
-msgid "I do not agree to the terms of use."
-msgstr ""
+#: ViewStatistics.cpp:2032
+msgid "Mode view"
+msgstr "Режим изглед"
 
-#: clientgui/UnavailablePage.cpp:183
-msgid "Project temporarily unavailable"
-msgstr "Проекта е временно недостъпен"
+#: ViewStatistics.cpp:2036
+msgid "One project"
+msgstr "Един проект"
 
-#: clientgui/UnavailablePage.cpp:186
-msgid ""
-"The project is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-"Проекта е временно недостъпен.\n"
-"\n"
-"Моля опитайте отново по-късно."
+#: ViewStatistics.cpp:2037
+msgid "Show one chart with selected project"
+msgstr "Покажи една диаграма с избрания проект"
 
-#: clientgui/UnavailablePage.cpp:190
-msgid "Account manager temporarily unavailable"
-msgstr "Акаунт мениджъра е временно недостъпен"
+#: ViewStatistics.cpp:2043
+msgid "All projects (separate)"
+msgstr "Всички проекти (по отделно)"
 
-#: clientgui/UnavailablePage.cpp:193
-msgid ""
-"The account manager is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-"Акаунт мениджъра е временно недостъпен.\n"
-"\n"
-"Моля опитайте отново по-късно."
+#: ViewStatistics.cpp:2044
+msgid "Show all projects, one chart per project"
+msgstr "Покажи всички проекти, с по една диаграма за всеки проект"
 
-#: clientgui/ValidateAccountKey.cpp:68
-msgid "Please specify an account key to continue."
-msgstr "Моля посочете ключ на акаунта, за да продължите."
+#: ViewStatistics.cpp:2050
+msgid "All projects (together)"
+msgstr "Всички проекти (заедно)"
 
-#: clientgui/ValidateAccountKey.cpp:71
-msgid "Invalid Account Key; please enter a valid Account Key"
-msgstr "Невалиден Ключ на Акаунта; моля въведете валиден Ключ на Акаунта"
+#: ViewStatistics.cpp:2051
+msgid "Show one chart with all projects"
+msgstr "Покажи една диаграма с всички проекти"
 
-#: clientgui/ValidateAccountKey.cpp:82
-#: clientgui/ValidateEmailAddress.cpp:86
-msgid "Validation conflict"
-msgstr "Конфликт при потвърждаване"
+#: ViewStatistics.cpp:2057
+msgid "All projects (sum)"
+msgstr "Всички проекти (сума)"
 
-#: clientgui/ValidateEmailAddress.cpp:72
-msgid "Please specify an email address"
-msgstr "Моля посочете имейл адрес"
+#: ViewStatistics.cpp:2058
+msgid "Show one chart with sum of projects"
+msgstr "Покажи една диаграма със сумата от проектите"
 
-#: clientgui/ValidateEmailAddress.cpp:75
-msgid "Invalid email address; please enter a valid email address"
-msgstr "Невалиден имейл адрес; моля въведете валиден имейл адрес"
+#: ViewStatistics.cpp:2079
+msgid "Statistics"
+msgstr "Статистики"
 
-#: clientgui/ValidateURL.cpp:69
-msgid "Missing URL"
-msgstr "Липсващ URL"
+#: 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
+msgid "Updating charts..."
+msgstr "Обновяване на диаграмите..."
 
-#: clientgui/ValidateURL.cpp:70
-msgid ""
-"Please specify a URL.\n"
-"For example:\n"
-"http://www.example.com/"
-msgstr ""
-"Моля посочете URL.\n"
-"Например:\n"
-"http://www.example.com/"
+#: ViewStatistics.cpp:2420
+msgid "Show project list"
+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"
+#: ViewStatistics.cpp:2420
+msgid "Uses smaller area for graphs"
+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"
-"http://boincproject.example.com"
+#: ViewTransfers.cpp:164
+msgid "Retry Now"
+msgstr "Опитай отново сега"
 
-#: clientgui/ValidateURL.cpp:104
-#: clientgui/ValidateURL.cpp:108
-#, c-format
-msgid "'%s' does not contain a valid host name."
-msgstr "'%s' не съдържа валидно име на хост."
+#: ViewTransfers.cpp:165
+msgid "Retry the file transfer now"
+msgstr "Опитай отново файлов трансфер сега"
 
-#: clientgui/ValidateURL.cpp:111
-#, c-format
-msgid "'%s' does not contain a valid path."
-msgstr "'%s' не съдържа валидна пътека."
+#: ViewTransfers.cpp:171
+msgid "Abort Transfer"
+msgstr "Прекрати Трансфер"
 
-#: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:175
-msgid "Commands"
-msgstr "Команди"
+#: ViewTransfers.cpp:172
+msgid "Abort this file transfer.  You won't get credit for the task."
+msgstr ""
+"Прекрати този файлов трансфер.  Вие няма да получите кредит за задачата."
 
-#: clientgui/ViewMessages.cpp:88
-msgid "Copy all messages"
-msgstr "Копирай всички съобщения"
+#: ViewTransfers.cpp:183
+msgid "File"
+msgstr "Файл"
 
-#: clientgui/ViewMessages.cpp:95
-msgid "Copy selected messages"
-msgstr "Копирай избраните съобщения"
+#: ViewTransfers.cpp:184 ViewWork.cpp:233
+msgid "Progress"
+msgstr "Прогрес"
 
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
-msgid "Show only this project"
-msgstr "Покажи само този проект"
+#: ViewTransfers.cpp:185
+msgid "Size"
+msgstr "Размер"
 
-#: clientgui/ViewMessages.cpp:107
-#: clientgui/ViewMessages.cpp:503
-msgid "Show only the messages for the selected project."
-msgstr "Покажи само съобщенията от избрания проект."
+#: ViewTransfers.cpp:186
+msgid "Elapsed Time"
+msgstr "Изминало време"
 
-#: clientgui/ViewMessages.cpp:164
-msgid "Messages"
-msgstr "Съобщения"
+#: ViewTransfers.cpp:187
+msgid "Speed"
+msgstr "Скорост"
 
-#: clientgui/ViewMessages.cpp:187
-msgid "Copying all messages to the clipboard..."
-msgstr "Копиране на всички съобщения в клип-борда..."
+#: ViewTransfers.cpp:213
+msgid "Transfers"
+msgstr "Трансфери"
 
-#: clientgui/ViewMessages.cpp:223
-msgid "Copying selected messages to the clipboard..."
-msgstr "Копиране на избраните съобщения в клип-борда..."
+#: ViewTransfers.cpp:280
+msgid "Network activity is suspended - "
+msgstr "Мрежовата активност е временно прекратена - "
 
-#: clientgui/ViewMessages.cpp:286
-msgid "Filtering messages..."
-msgstr "Филтриране на съобщения..."
+#: ViewTransfers.cpp:282
+msgid ""
+".\n"
+"You can enable it using the Activity menu."
+msgstr ""
+".\n"
+"Можете да я активирате с помощта на менюто Дейности."
 
-#: clientgui/ViewMessages.cpp:494
-msgid "Show all messages"
-msgstr "Покажи всички съобщения"
+#: ViewTransfers.cpp:285
+msgid "BOINC"
+msgstr "BOINC"
 
-#: clientgui/ViewMessages.cpp:495
-msgid "Show messages for all projects."
-msgstr "Показва съобщенията за всички проекти."
+#: ViewTransfers.cpp:292
+msgid "Retrying transfer now..."
+msgstr "Повторен опит за трансфер сега..."
 
-#: clientgui/ViewProjects.cpp:225
-msgid "Account"
-msgstr "Акаунт"
+#: ViewTransfers.cpp:330
+msgid "Aborting transfer..."
+msgstr "Прекъсване на трансфера..."
 
-#: clientgui/ViewProjects.cpp:227
-msgid "Work done"
-msgstr "Извършена работа"
+#: ViewTransfers.cpp:343
+#, 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/ViewProjects.cpp:228
-msgid "Avg. work done"
-msgstr "Средно извършена работа"
+#: ViewTransfers.cpp:349
+msgid "Abort File Transfer"
+msgstr "Прекъсни Трансфер на Файла"
 
-#: clientgui/ViewProjects.cpp:230
-msgid "Status"
-msgstr "Статус"
+#: ViewTransfers.cpp:780
+msgid "Upload"
+msgstr "Качване"
 
-#: clientgui/ViewProjects.cpp:255
-msgid "Projects"
-msgstr "Проекти"
+#: ViewTransfers.cpp:780
+msgid "Download"
+msgstr "Сваляне"
 
-#: clientgui/ViewProjects.cpp:307
-msgid "Updating project..."
-msgstr "Обновяване на проект..."
+#: ViewTransfers.cpp:784
+msgid "retry in "
+msgstr "нов опит след "
 
-#: clientgui/ViewProjects.cpp:349
-msgid "Resuming project..."
-msgstr "Подновяване на проект..."
+#: ViewTransfers.cpp:786
+msgid "failed"
+msgstr "неуспешен"
 
-#: clientgui/ViewProjects.cpp:353
-msgid "Suspending project..."
-msgstr "Временно прекратяване на проект..."
+#: ViewTransfers.cpp:789
+msgid "suspended"
+msgstr "временно прекъснат"
 
-#: clientgui/ViewProjects.cpp:390
-msgid "Telling project to allow additional task downloads..."
-msgstr "Казва на проекта да позволи взимането на допълнителни задачи..."
+#: ViewTransfers.cpp:794
+msgid "active"
+msgstr "активен"
 
-#: clientgui/ViewProjects.cpp:394
-msgid "Telling project to not fetch any additional tasks..."
-msgstr "Казва на проекта да не взима допълнителни задачи..."
+#: ViewTransfers.cpp:796
+msgid "pending"
+msgstr "в очакване"
 
-#: clientgui/ViewProjects.cpp:430
-msgid "Resetting project..."
-msgstr "Нулиране на проект..."
+#: ViewTransfers.cpp:803
+msgid " (project backoff: "
+msgstr " (отстъп на проекта: "
 
-#: clientgui/ViewProjects.cpp:488
-msgid "Removing project..."
-msgstr "Премахване на проект..."
+#: ViewWork.cpp:187 ViewWork.cpp:777
+msgid "Show active tasks"
+msgstr "Покажи активните задачи"
 
-#: clientgui/ViewProjects.cpp:548
-msgid "Launching browser..."
-msgstr "Стартиране на браузър..."
+#: ViewWork.cpp:188 ViewWork.cpp:778
+msgid "Show only active tasks."
+msgstr "Покажи само активните задачи."
 
-#: clientgui/ViewProjects.cpp:1063
-msgid "Requested by user"
-msgstr "По желание на потребителя"
+#: ViewWork.cpp:194 sg_TaskCommandPopup.cpp:60
+msgid "Show graphics"
+msgstr "Покажи графики"
 
-#: clientgui/ViewProjects.cpp:1064
-msgid "To fetch work"
-msgstr "За да изтегли работа"
+#: ViewWork.cpp:195 sg_TaskCommandPopup.cpp:61
+msgid "Show application graphics in a window."
+msgstr "Покажи графиката от приложението в прозорец."
 
-#: clientgui/ViewProjects.cpp:1065
-msgid "To report completed tasks"
-msgstr "За да докладва приключени задачи"
+#: ViewWork.cpp:201
+msgid "Show VM Console"
+msgstr "Покажи VM Конзола"
 
-#: clientgui/ViewProjects.cpp:1066
-msgid "To send trickle-up message"
-msgstr "За да изпрати изходящо съобщение"
+#: ViewWork.cpp:202
+msgid "Show VM Console in a window."
+msgstr "Показва VM Конзола в прозорец."
 
-#: clientgui/ViewProjects.cpp:1067
-msgid "Requested by account manager"
-msgstr "По желание на акаунт мениджъра"
+#: ViewWork.cpp:209
+msgid "Suspend work for this result."
+msgstr "Временно прекрати работа по този резултат."
 
-#: clientgui/ViewProjects.cpp:1068
-msgid "Project initialization"
-msgstr "Инициализация на проекта"
+#: ViewWork.cpp:215 sg_TaskCommandPopup.cpp:72
+msgid "Abort"
+msgstr "Прекрати"
 
-#: clientgui/ViewProjects.cpp:1069
-msgid "Requested by project"
-msgstr "По желание на проекта"
+#: ViewWork.cpp:216
+msgid "Abandon work on the result. You will get no credit for it."
+msgstr "Отказвате се от работа по резултата. Няма да получите кредит за него."
 
-#: clientgui/ViewProjects.cpp:1070
-msgid "Unknown reason"
-msgstr "Неизвестна причина"
+#: ViewWork.cpp:223 sg_TaskCommandPopup.cpp:79
+msgid "Show task details."
+msgstr "Покажи подробности по задачата."
 
-#: clientgui/ViewProjects.cpp:1084
-msgid "Suspended by user"
-msgstr "Временно прекратено от потребителя"
+#: ViewWork.cpp:235
+msgid "Elapsed"
+msgstr "Изминало"
 
-#: clientgui/ViewProjects.cpp:1087
-msgid "Won't get new tasks"
-msgstr "Няма да взима нови задачи"
+#: ViewWork.cpp:236
+msgid "Remaining (estimated)"
+msgstr "Оставащо (предполагаема стойност)"
 
-#: clientgui/ViewProjects.cpp:1090
-msgid "Project ended - OK to remove"
-msgstr "Проектът е приключен - ОК да бъде премахнат"
+#: ViewWork.cpp:237
+msgid "Deadline"
+msgstr "Краен срок"
 
-#: clientgui/ViewProjects.cpp:1093
-msgid "Will remove when tasks done"
-msgstr "Ще премахне когато задачите са готови"
+#: ViewWork.cpp:264
+msgid "Tasks"
+msgstr "Задачи"
 
-#: clientgui/ViewProjects.cpp:1096
-msgid "Scheduler request pending"
-msgstr "Очаква се заявка от Планировчика"
+#: ViewWork.cpp:357
+msgid "Resuming task..."
+msgstr "Подновяване на задача..."
 
-#: clientgui/ViewProjects.cpp:1102
-msgid "Scheduler request in progress"
-msgstr "Тече заявка от Планировчика"
+#: ViewWork.cpp:360
+msgid "Suspending task..."
+msgstr "Временно прекратяване на задача..."
 
-#: clientgui/ViewProjects.cpp:1105
-msgid "Trickle up message pending"
-msgstr "Очаква се изходящо съобщение"
+#: ViewWork.cpp:389
+msgid "Showing graphics for task..."
+msgstr "Показване на графики за задача..."
 
-#: clientgui/ViewProjects.cpp:1111
-msgid "Communication deferred "
-msgstr "Връзката е отложена "
+#: ViewWork.cpp:426
+msgid "Showing VM console for task..."
+msgstr "Показване на VM конзола за задача..."
 
-#: clientgui/ViewResources.cpp:62
-msgid "Total disk usage"
-msgstr "Общо използвано дисково пространство"
+#: ViewWork.cpp:479
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %s, Status: %s)"
+msgstr ""
+"Сигурни ли сте, че искате да прекъснете тази задача '%s'?\n"
+"(Прогрес: %s, Статус: %s)"
 
-#: clientgui/ViewResources.cpp:83
-msgid "Disk usage by BOINC projects"
-msgstr "Използвано дисково пространство от BOINC проекти"
+#: ViewWork.cpp:485
+#, c-format
+msgid "Are you sure you want to abort these %d tasks?"
+msgstr "Сигурни ли сте, че искате да прекъснете тези %d задачи?"
 
-#: clientgui/ViewResources.cpp:116
-msgid "Disk"
-msgstr "Дисково пространство"
+#: ViewWork.cpp:490 sg_TaskCommandPopup.cpp:256
+msgid "Abort task"
+msgstr "Прекрати задача"
 
-#: clientgui/ViewResources.cpp:225
-msgid "no projects: 0 bytes used"
-msgstr "няма проекти: 0 байта заети"
+# 75%
+#: ViewWork.cpp:499
+msgid "Aborting task..."
+msgstr "Прекратяване на задача..."
 
-#: clientgui/ViewResources.cpp:262
-msgid "used by BOINC: "
-msgstr "използвано от BOINC: "
+#: ViewWork.cpp:771
+msgid "Show all tasks"
+msgstr "Покажи всички задачи"
 
-#: clientgui/ViewResources.cpp:272
-msgid "free, available to BOINC: "
-msgstr "свободно, достъпно за BOINC: "
+#: ViewWork.cpp:772
+msgid "Show all tasks."
+msgstr "Покажи всички задачи."
 
-#: clientgui/ViewResources.cpp:282
-msgid "free, not available to BOINC: "
-msgstr "свободно, недостъпно за BOINC: "
+#: ViewWork.cpp:796 sg_TaskCommandPopup.cpp:103
+msgid "Resume work for this task."
+msgstr "Поднови работа по тази задача."
 
-#: clientgui/ViewResources.cpp:292
-msgid "free: "
-msgstr "свободно: "
+#: ViewWork.cpp:802 sg_TaskCommandPopup.cpp:107
+msgid "Suspend work for this task."
+msgstr "Временно прекрати работа по тази задача."
 
-#: clientgui/ViewResources.cpp:302
-msgid "used by other programs: "
-msgstr "използвано от други програми: "
+#: WelcomePage.cpp:284
+msgid "Add project or account manager"
+msgstr "Добавете проект или акаунт мениджър"
 
-#: clientgui/ViewStatistics.cpp:1181
-msgid "User Total"
-msgstr "Общ кредит на потребителя"
+#: WelcomePage.cpp:288
+msgid "Add project or use BOINC Account Manager"
+msgstr "Добавете проект или използвайте BOINC Акаунт Мениджър"
 
-#: clientgui/ViewStatistics.cpp:1182
-msgid "User Average"
-msgstr "Среден кредит на потребителя"
+#: 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/ViewStatistics.cpp:1183
-msgid "Host Total"
-msgstr "Общ кредит на хоста"
+#: 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/ViewStatistics.cpp:1184
-msgid "Host Average"
-msgstr "Среден кредит на хоста"
+#: 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/ViewStatistics.cpp:1331
-#, c-format
-msgid "Last update: %.0f days ago"
-msgstr "Последно обновяване: преди %.0f дни"
+#: WelcomePage.cpp:339
+msgid "Use a BOINC Account Manager"
+msgstr "Използвай BOINC Акаунт Мениджър"
 
-#: clientgui/ViewStatistics.cpp:1956
-msgid "Show user total"
-msgstr "Покажи общия кредит на потребителя"
+#: WelcomePage.cpp:352
+msgid "To continue, click Next."
+msgstr "За да продължите, натиснете Напред."
 
-#: clientgui/ViewStatistics.cpp:1957
-msgid "Show total credit for user"
-msgstr "Покажи общия кредит на потребителя"
+#: WelcomePage.cpp:358
+msgid "Add or change your World Community Grid projects"
+msgstr "Добавяйте или променяйте вашите World Community Grid проекти"
 
-#: clientgui/ViewStatistics.cpp:1963
-msgid "Show user average"
-msgstr "Покажи среден кредит на потребителя"
+#: WelcomePage.cpp:361
+msgid "Add projects run by other researchers or organizations"
+msgstr "Добави проекти управлявани от други изследователи или организации"
 
-#: clientgui/ViewStatistics.cpp:1964
-msgid "Show average credit for user"
-msgstr "Покажи среден кредит на потребителя"
+#: WizardAttach.cpp:634
+msgid "Do you really want to cancel?"
+msgstr "Сигурни ли сте че искате да се откажете?"
 
-#: clientgui/ViewStatistics.cpp:1970
-msgid "Show host total"
-msgstr "Покажи общ кредит на хоста"
+#: WizardAttach.cpp:635
+msgid "Question"
+msgstr "Въпрос"
 
-#: clientgui/ViewStatistics.cpp:1971
-msgid "Show total credit for host"
-msgstr "Покажи общия кредит на хоста"
+#: sg_BoincSimpleFrame.cpp:149
+msgid "Advanced View...\tCtrl+Shift+A"
+msgstr "Разширен Изглед...\t Ctrl+Shift+A"
 
-#: clientgui/ViewStatistics.cpp:1977
-msgid "Show host average"
-msgstr "Покажи среден кредит на хоста"
+#: sg_BoincSimpleFrame.cpp:150
+msgid "Display the advanced graphical interface."
+msgstr "Показване на разширения графичен интерфейс."
 
-#: clientgui/ViewStatistics.cpp:1978
-msgid "Show average credit for host"
-msgstr "Покажи среден кредит на хоста"
+#: sg_BoincSimpleFrame.cpp:157
+msgid "Skin"
+msgstr "Скин"
 
-#: clientgui/ViewStatistics.cpp:1987
-msgid "< &Previous project"
-msgstr "< &Предходен проект"
+#: sg_BoincSimpleFrame.cpp:159
+msgid "Select the appearance of the user interface."
+msgstr "Изберете изгледа на потребителския интерфейс."
 
-#: clientgui/ViewStatistics.cpp:1988
-msgid "Show chart for previous project"
-msgstr "Покажи диаграма за предходния проект"
+#: sg_BoincSimpleFrame.cpp:206
+#, c-format
+msgid "&%s"
+msgstr "&%s"
 
-#: clientgui/ViewStatistics.cpp:1993
-msgid "&Next project >"
-msgstr "&Следващ проект >"
+#: sg_BoincSimpleFrame.cpp:390
+msgid "Default"
+msgstr "По подразбиране"
 
-#: clientgui/ViewStatistics.cpp:1994
-msgid "Show chart for next project"
-msgstr "Покажи диаграма за следващия проект"
+#: sg_BoincSimpleFrame.cpp:759
+msgid "Suspend Computing"
+msgstr "Временно прекратете Изчисленията"
 
-#: clientgui/ViewStatistics.cpp:2000
-#: clientgui/ViewStatistics.cpp:2390
-msgid "Hide project list"
-msgstr "Скрий списъка с проекти"
+#: sg_BoincSimpleFrame.cpp:760
+msgid "Resume Computing"
+msgstr "Подновете Изчисленията"
 
-#: clientgui/ViewStatistics.cpp:2001
-#: clientgui/ViewStatistics.cpp:2390
-msgid "Use entire area for graphs"
-msgstr "Използвай цялата област за графики"
+#: sg_BoincSimpleFrame.cpp:777
+msgid "Open a window to view notices from projects or BOINC"
+msgstr "Отворете прозорец за да прегледате известията от проектите или от BOINC"
 
-#: clientgui/ViewStatistics.cpp:2006
-msgid "Mode view"
-msgstr "Режим изглед"
+#: sg_DlgMessages.cpp:146
+msgid "Close"
+msgstr "Затвори"
 
-#: clientgui/ViewStatistics.cpp:2010
-msgid "One project"
-msgstr "Един проект"
+#: sg_DlgMessages.cpp:389
+#, c-format
+msgid "%s - Notices"
+msgstr "%s - Известия"
 
-#: clientgui/ViewStatistics.cpp:2011
-msgid "Show one chart with selected project"
-msgstr "Покажи една диаграма с избрания проект"
+#: sg_DlgPreferences.cpp:268
+msgid "This dialog controls preferences for this computer only."
+msgstr "Този диалог контролира предпочитанията само за този компютър."
 
-#: clientgui/ViewStatistics.cpp:2017
-msgid "All projects (separate)"
-msgstr "Всички проекти (по отделно)"
+#: sg_DlgPreferences.cpp:273
+msgid "Click OK to set preferences."
+msgstr "Натиснете ОК за да зададете предпочитания."
 
-#: clientgui/ViewStatistics.cpp:2018
-msgid "Show all projects, one chart per project"
-msgstr "Покажи всички проекти, с по една диаграма за всеки проект"
+#: sg_DlgPreferences.cpp:278
+msgid ""
+"Click Clear to restore web-based settings for all preferences listed below."
+msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2024
-msgid "All projects (together)"
-msgstr "Всички проекти (заедно)"
+#: sg_DlgPreferences.cpp:285
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
+msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2025
-msgid "Show one chart with all projects"
-msgstr "Покажи една диаграма с всички проекти"
+#: sg_DlgPreferences.cpp:313
+msgid "Do work only between:"
+msgstr "Извършвай работа само между:"
 
-#: clientgui/ViewStatistics.cpp:2031
-msgid "All projects (sum)"
-msgstr "Всички проекти (сума)"
+#: sg_DlgPreferences.cpp:335
+msgid "Connect to internet only between:"
+msgstr "Свързвай се с интернет само между:"
 
-#: clientgui/ViewStatistics.cpp:2032
-msgid "Show one chart with sum of projects"
-msgstr "Покажи една диаграма със сумата от проектите"
+#: sg_DlgPreferences.cpp:357 sg_DlgPreferences.cpp:374
+msgid "Use no more than:"
+msgstr "Не използвай повече от:"
 
-#: clientgui/ViewStatistics.cpp:2053
-msgid "Statistics"
-msgstr "Статистики"
+#: sg_DlgPreferences.cpp:370
+msgid "of disk space"
+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 "Обновяване на диаграмите..."
+#: sg_DlgPreferences.cpp:387
+msgid "of the processor"
+msgstr "от процесора"
 
-#: clientgui/ViewStatistics.cpp:2394
-msgid "Show project list"
-msgstr "Покажи списъка с проекти"
+#: sg_DlgPreferences.cpp:391
+msgid "Do work while on battery?"
+msgstr "Да извършва ли работа докато е на батерии?"
 
-#: clientgui/ViewStatistics.cpp:2394
-msgid "Uses smaller area for graphs"
-msgstr "Използва по-малка област за графики"
+#: sg_DlgPreferences.cpp:404
+msgid "Do work after idle for:"
+msgstr "Извършвай работа след като си бил неактивен за:"
 
-#: clientgui/ViewTransfers.cpp:169
-msgid "Retry Now"
-msgstr "Опитай отново сега"
+#: sg_DlgPreferences.cpp:429
+msgid "Clear all local preferences listed above and close the dialog"
+msgstr ""
 
-#: clientgui/ViewTransfers.cpp:170
-msgid "Retry the file transfer now"
-msgstr "Опитай отново файлов трансфер сега"
+#: 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 "По всяко време"
 
-#: clientgui/ViewTransfers.cpp:176
-msgid "Abort Transfer"
-msgstr "Прекрати Трансфер"
+#: sg_DlgPreferences.cpp:638
+msgid "100 MB"
+msgstr "100 MB"
 
-#: clientgui/ViewTransfers.cpp:177
-msgid "Abort this file transfer.  You won't get credit for the task."
-msgstr "Прекрати този файлов трансфер.  Вие няма да получите кредит за задачата."
+#: sg_DlgPreferences.cpp:639
+msgid "200 MB"
+msgstr "200 MB"
 
-#: clientgui/ViewTransfers.cpp:188
-msgid "File"
-msgstr "Файл"
+#: sg_DlgPreferences.cpp:640
+msgid "500 MB"
+msgstr "500 MB"
 
-#: clientgui/ViewTransfers.cpp:189
-#: clientgui/ViewWork.cpp:238
-msgid "Progress"
-msgstr "Прогрес"
+#: sg_DlgPreferences.cpp:641
+msgid "1 GB"
+msgstr "1 GB"
 
-#: clientgui/ViewTransfers.cpp:190
-msgid "Size"
-msgstr "Размер"
+#: sg_DlgPreferences.cpp:642
+msgid "2 GB"
+msgstr "2 GB"
 
-#: clientgui/ViewTransfers.cpp:191
-msgid "Elapsed Time"
-msgstr "Изминало време"
+#: sg_DlgPreferences.cpp:643
+msgid "5 GB"
+msgstr "5 GB"
 
-#: clientgui/ViewTransfers.cpp:192
-msgid "Speed"
-msgstr "Скорост"
+#: sg_DlgPreferences.cpp:644
+msgid "10 GB"
+msgstr "10 GB"
 
-#: clientgui/ViewTransfers.cpp:218
-msgid "Transfers"
-msgstr "Трансфери"
+#: sg_DlgPreferences.cpp:645
+msgid "20 GB"
+msgstr "20 GB"
 
-#: clientgui/ViewTransfers.cpp:285
-msgid "Network activity is suspended - "
-msgstr "Мрежовата активност е временно прекратена - "
+#: sg_DlgPreferences.cpp:646
+msgid "50 GB"
+msgstr "50 GB"
 
-#: clientgui/ViewTransfers.cpp:287
-msgid ""
-".\n"
-"You can enable it using the Activity menu."
-msgstr ""
-".\n"
-"Можете да я активирате с помощта на менюто Дейности."
+#: sg_DlgPreferences.cpp:647
+msgid "100 GB"
+msgstr "100 GB"
 
-#: clientgui/ViewTransfers.cpp:290
-msgid "BOINC"
-msgstr "BOINC"
+#: sg_DlgPreferences.cpp:717
+#, c-format
+msgid "%d MB"
+msgstr "%d MB"
 
-#: clientgui/ViewTransfers.cpp:297
-msgid "Retrying transfer now..."
-msgstr "Повторен опит за трансфер сега..."
+#: sg_DlgPreferences.cpp:719
+#, c-format
+msgid "%4.2f GB"
+msgstr "%4.2f GB"
 
-#: clientgui/ViewTransfers.cpp:335
-msgid "Aborting transfer..."
-msgstr "Прекъсване на трансфера..."
+#: sg_DlgPreferences.cpp:760
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
+
+#: sg_DlgPreferences.cpp:796
+msgid "0 (Run Always)"
+msgstr "0 (Работи Винаги)"
 
-#: clientgui/ViewTransfers.cpp:348
+#: sg_DlgPreferences.cpp:799
 #, 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"
-"невалидна задачата и Вие няма да получите кредит за нея."
+msgid "%d"
+msgstr "%d"
 
-#: clientgui/ViewTransfers.cpp:354
-msgid "Abort File Transfer"
-msgstr "Прекъсни Трансфер на Файла"
+#: sg_DlgPreferences.cpp:1029
+msgid "Do you really want to clear all local preferences?\n"
+msgstr "Наистина ли искате да изчистите всички локални предпочитания?\n"
 
-#: clientgui/ViewTransfers.cpp:785
-msgid "Upload"
-msgstr "Качване"
+#: sg_ProjectPanel.cpp:72
+msgid "Add Project"
+msgstr "Добави Проект"
 
-#: clientgui/ViewTransfers.cpp:785
-msgid "Download"
-msgstr "Сваляне"
+#: sg_ProjectPanel.cpp:73
+msgid "Synchronize"
+msgstr "Синхронизирай"
 
-#: clientgui/ViewTransfers.cpp:789
-msgid "retry in "
-msgstr "нов опит след "
+#: sg_ProjectPanel.cpp:74
+msgid "Work done for this project"
+msgstr "Работа приключена за този проект"
 
-#: clientgui/ViewTransfers.cpp:791
-msgid "failed"
-msgstr "неуспешен"
+#: sg_ProjectPanel.cpp:77
+msgid "Synchronize projects with account manager system"
+msgstr "Синхронизирайте проекти със системата на акаунт мениджър"
 
-#: clientgui/ViewTransfers.cpp:794
-msgid "suspended"
-msgstr "временно прекъснат"
+#: sg_ProjectPanel.cpp:124
+msgid "Select a project to access with the controls below"
+msgstr "Изберете проект до който да имате достъп със контролерите по-долу"
 
-#: clientgui/ViewTransfers.cpp:799
-msgid "active"
-msgstr "активен"
+# 88%
+#: sg_ProjectPanel.cpp:145
+msgid "Project Web Pages"
+msgstr "Интернет Страници на Проекта"
 
-#: clientgui/ViewTransfers.cpp:801
-msgid "pending"
-msgstr "в очакване"
+#: sg_ProjectPanel.cpp:149
+msgid "Project Commands"
+msgstr "Команди на Проекта"
 
-#: clientgui/ViewTransfers.cpp:808
-msgid " (project backoff: "
-msgstr " (отстъп на проекта: "
+#: sg_ProjectPanel.cpp:267
+#, c-format
+msgid "Pop up a menu of web sites for project %s"
+msgstr ""
 
-#: clientgui/ViewWork.cpp:192
-#: clientgui/ViewWork.cpp:782
-msgid "Show active tasks"
-msgstr "Покажи активните задачи"
+#: sg_ProjectPanel.cpp:269
+#, c-format
+msgid "Pop up a menu of commands to apply to project %s"
+msgstr "Появява се меню с команди, които да прилагате за проект %s"
 
-#: clientgui/ViewWork.cpp:193
-#: clientgui/ViewWork.cpp:783
-msgid "Show only active tasks."
-msgstr "Покажи само активните задачи."
+#: sg_TaskCommandPopup.cpp:67
+msgid "Suspend this task."
+msgstr "Временно прекрати тази задача."
 
-#: clientgui/ViewWork.cpp:206
-msgid "Show VM Console"
-msgstr "Покажи VM Конзола"
+#: sg_TaskCommandPopup.cpp:73
+msgid "Abandon this task. You will get no credit for it."
+msgstr "Изоставя тази задача. Вие няма да получите кредит за нея."
 
-#: clientgui/ViewWork.cpp:207
-msgid "Show VM Console in a window."
-msgstr "Показва VM Конзола в прозорец."
+#: sg_TaskCommandPopup.cpp:251
+#, c-format
+#, c-format, 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:214
-msgid "Suspend work for this result."
-msgstr "Временно прекрати работа по този резултат."
+#: sg_TaskPanel.cpp:464
+msgid "You don't have any projects.  Please Add a Project."
+msgstr "Нямате добавени проекти.  Моля Добавете Проект."
 
-#: clientgui/ViewWork.cpp:221
-msgid "Abandon work on the result. You will get no credit for it."
-msgstr "Отказвате се от работа по резултата. Няма да получите кредит за него."
+#: sg_TaskPanel.cpp:465
+msgid "Not available"
+msgstr "Няма на разположение"
 
-#: clientgui/ViewWork.cpp:240
-msgid "Elapsed"
-msgstr "Изминало"
+#: sg_TaskPanel.cpp:476
+msgid "Tasks:"
+msgstr "Задачи:"
 
-#: clientgui/ViewWork.cpp:241
-msgid "Remaining (estimated)"
-msgstr "Оставащо (предполагаема стойност)"
+#: sg_TaskPanel.cpp:482
+msgid "Select a task to access"
+msgstr "Изберете задача, до която да получите достъп"
 
-#: clientgui/ViewWork.cpp:242
-msgid "Deadline"
-msgstr "Краен срок"
+#: sg_TaskPanel.cpp:493
+msgid "From:"
+msgstr "От:"
 
-#: clientgui/ViewWork.cpp:269
-msgid "Tasks"
-msgstr "Задачи"
+#: sg_TaskPanel.cpp:547
+msgid "This task's progress"
+msgstr "Прогреса на тази задача"
 
-#: clientgui/ViewWork.cpp:362
-msgid "Resuming task..."
-msgstr "Подновяване на задача..."
+#: sg_TaskPanel.cpp:565
+msgid "Task Commands"
+msgstr "Команди за Задача"
 
-#: clientgui/ViewWork.cpp:365
-msgid "Suspending task..."
-msgstr "Временно прекратяване на задача..."
+#: sg_TaskPanel.cpp:566
+msgid "Pop up a menu of commands to apply to this task"
+msgstr "Появява се меню с команди, които да прилагате върху тази задача"
 
-#: clientgui/ViewWork.cpp:394
-msgid "Showing graphics for task..."
-msgstr "Показване на графики за задача..."
+#: sg_TaskPanel.cpp:701
+#, c-format
+#, c-format, c-format
+msgid "Application: %s"
+msgstr "Приложение: %s"
 
-#: clientgui/ViewWork.cpp:431
-msgid "Showing VM console for task..."
-msgstr "Показване на VM конзола за задача..."
+#: sg_TaskPanel.cpp:724
+#, c-format
+msgid "%.3f%%"
+msgstr "%.3f%%"
+
+#: sg_TaskPanel.cpp:732
+msgid "Application: Not available"
+msgstr "Приложение: Няма на разположение"
 
-#: clientgui/ViewWork.cpp:484
+#: sg_TaskPanel.cpp:832
+msgid "Not Available"
+msgstr "Няма на Разположение"
+
+#: sg_TaskPanel.cpp:847
 #, 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:490
+#: sg_TaskPanel.cpp:861
 #, c-format
-msgid "Are you sure you want to abort these %d tasks?"
-msgstr "Сигурни ли сте, че искате да прекъснете тези %d задачи?"
+msgid "Remaining (estimated): %s"
+msgstr "Оставащо време (пресметнато): %s"
 
-# 75%
-#: clientgui/ViewWork.cpp:504
-msgid "Aborting task..."
-msgstr "Прекратяване на задача..."
+#: sg_TaskPanel.cpp:876
+#, c-format
+msgid "Status: %s"
+msgstr "Статус: %s"
 
-#: clientgui/ViewWork.cpp:776
-msgid "Show all tasks"
-msgstr "Покажи всички задачи"
+#: sg_TaskPanel.cpp:1223
+msgid "Retrieving current status."
+msgstr "Изтегляне на текущия статус."
 
-#: clientgui/ViewWork.cpp:777
-msgid "Show all tasks."
-msgstr "Покажи всички задачи."
+#: sg_TaskPanel.cpp:1229
+msgid "Downloading work from the server."
+msgstr "Изтегляне на работа от сървъра."
 
-#: clientgui/WelcomePage.cpp:284
-msgid "Add project or account manager"
-msgstr "Добавете проект или акаунт мениджър"
+#: sg_TaskPanel.cpp:1234
+msgid "Processing Suspended:  Running On Batteries."
+msgstr "Процесите са Временно Прекратени:  Работи се На Батерии."
 
-#: clientgui/WelcomePage.cpp:288
-msgid "Add project or use BOINC Account Manager"
-msgstr "Добавете проект или използвайте BOINC Акаунт Мениджър"
+#: sg_TaskPanel.cpp:1236
+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."
+#: sg_TaskPanel.cpp:1238
+msgid "Processing Suspended:  User paused processing."
 msgstr ""
-"По възможност, добавайте проекти с помощта на\n"
-"%s интернет страницата.\n"
-"\n"
-"Проекти добавени чрез този съветник няма да бъдат\n"
-"показани или управлявани чрез %s."
+"Процесите са Временно Прекратени:  Потребителят спря на пауза процесите."
 
-#: clientgui/WelcomePage.cpp:313
-msgid ""
-"There are over 30 BOINC-based projects\n"
-"doing research in many areas of science,\n"
-"and you can volunteer for as many of them as you like.\n"
-"You can add a project directly,\n"
-"or use an 'Account Manager' web site to select projects."
-msgstr ""
-"Има над 30 BOINC-базирани проекти извършващи\n"
-"проучвания в много области на науката и Вие можете\n"
-"да се включите доброволно в толкова от тях колкото пожелаете.\n"
-"Можете да добавите проект директно,\n"
-"или да използвате Интернет страница на 'Акаунт Мениджър' за да изберете проекти."
+#: sg_TaskPanel.cpp:1240
+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"
+#: sg_TaskPanel.cpp:1242
+msgid "Processing Suspended:  Benchmarks Running."
 msgstr ""
-"Вие сте избрали да добавите нов доброволен изчислителен проект или да промените\n"
-"към кои проекти допринасяте.\n"
-"\n"
-"Някои от тези проекти са стартирани и управлявани от World Community Grid, докато други\n"
-"са стартирани и управлявани от други изследователи или организации. Софтуерът BOINC\n"
-"може да разпредели вашата свободна изчислителна мощ за всякаква комбинация от проекти.\n"
-"\n"
-"Като алтернатива, ако сте се регистрирали с BOINC Акаунт Мениджър, можете да използвате\n"
-"него за да изберете кои проекти да подкрепите.\n"
-"\n"
-"Моля изберете кой тип промяна искате да направите:\n"
+"Процесите са Временно Прекратени:  Изчисляват се Референтните Показатели."
 
-#: clientgui/WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
-msgstr "Използвай BOINC Акаунт Мениджър"
+#: sg_TaskPanel.cpp:1244
+msgid "Processing Suspended."
+msgstr "Процесите са Временно Прекратени."
 
-#: clientgui/WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
-msgstr "Добавяйте или променяйте вашите World Community Grid проекти"
+#: sg_TaskPanel.cpp:1248
+msgid "Waiting to contact project servers."
+msgstr "Изчаква за свързване със сървърите на проекта."
 
-#: clientgui/WelcomePage.cpp:361
-msgid "Add projects run by other researchers or organizations"
-msgstr "Добави проекти управлявани от други изследователи или организации"
+#: sg_TaskPanel.cpp:1252 sg_TaskPanel.cpp:1261
+msgid "Retrieving current status"
+msgstr "Извличане на текущ статус"
 
-#: clientgui/WizardAttach.cpp:673
-msgid "Do you really want to cancel?"
-msgstr "Сигурни ли сте че искате да се откажете?"
+#: sg_TaskPanel.cpp:1256
+msgid "No work available to process"
+msgstr "Няма налична работа за обработване"
 
-#: clientgui/WizardAttach.cpp:674
-msgid "Question"
-msgstr "Въпрос"
+#: sg_TaskPanel.cpp:1258
+msgid "Unable to connect to the core client"
+msgstr "Не може да се свърже с централния клиент"
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
+#: wizardex.cpp:377 wizardex.cpp:553
 msgid "&Next >"
 msgstr "На&пред >"
 
-#: clientgui/wizardex.cpp:383
+#: wizardex.cpp:383
 msgid "< &Back"
 msgstr "< На&зад"
 
-#: clientgui/wizardex.cpp:553
+#: wizardex.cpp:553
 msgid "&Finish"
 msgstr "&Приключи"
 
-#: clientgui/common/wxPieCtrl.cpp:64
-msgid "Pie Ctrl"
-msgstr "Контрол на Диаграмата"
+#: mac/Mac_GUI.cpp:110
+msgid "Preferences…"
+msgstr "Предпочитания…"
 
-#: clientgui/mac/Mac_GUI.cpp:35
+#: mac/Mac_GUI.cpp:122
 msgid "Services"
 msgstr "Услуги"
 
-#: clientgui/mac/Mac_GUI.cpp:36
+#: mac/Mac_GUI.cpp:144
 #, c-format
 msgid "Hide %s"
 msgstr "Скрий %s"
 
-#: clientgui/mac/Mac_GUI.cpp:37
+#: mac/Mac_GUI.cpp:158
 msgid "Hide Others"
 msgstr "Скрий Други"
 
-#: clientgui/mac/Mac_GUI.cpp:38
+#: mac/Mac_GUI.cpp:172
 msgid "Show All"
 msgstr "Покажи Всички"
 
-#: clientgui/mac/Mac_GUI.cpp:39
+#: mac/Mac_GUI.cpp:186
 #, c-format
 msgid "Quit %s"
 msgstr "Напусни %s"
 
-#: clientgui/DlgAdvPreferences.h:30
-msgid "specify work start and stop hours in format HH:MM-HH:MM"
-msgstr "посочете часове за започване и спиране на работа във формат ЧЧ:ММ-ЧЧ:ММ"
-
-#: clientgui/DlgAdvPreferences.h:31
-msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
-msgstr "посочете часове за започване и спиране на използване на мрежата във формат ЧЧ:ММ-ЧЧ:ММ"
-
-# 98%
-#~ msgid ""
-#~ "(C) 2003-2013 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2013 Калифорнийски Университет, Бъркли.\n"
-#~ "Всички Права Запазени."
-#, c-format
-#~ msgid "%s - Preferences"
-#~ msgstr "%s - Предпочитания"
-
-#, no-c-format
-#~ msgid "% CPU time"
-#~ msgstr "% CPU време"
-#~ msgid "KBytes/sec."
-#~ msgstr "Кбайта/сек."
-#~ msgid "Mbytes"
-#~ msgstr "Мбайта"
-#~ msgid "every"
-#~ msgstr "всеки"
-#~ msgid "days"
-#~ msgstr "дни"
-#~ msgid "Gigabytes disk space"
-#~ msgstr "Гигабайти дисково пространство"
-#~ msgid "Running, high priority"
-#~ msgstr "Работи, висок приоритет"
-#~ msgid " (Scheduler wait: "
-#~ msgstr " (Изчакване от Планировчика: "
-#~ msgid " (Scheduler wait)"
-#~ msgstr " (Изчакване от Планировчика)"
-#~ msgid " (Waiting for network access)"
-#~ msgstr " (Изчакване за достъп до мрежата)"
-#~ msgid "Preferences…"
-#~ msgstr "Предпочитания…"
 #~ msgid "I do not agree with the terms of use."
 #~ msgstr "Не съм съгласен с условията на ползване."
+
 #~ msgid "Click Clear to restore web-based settings."
 #~ msgstr "Натиснете Изчисти за да възстановите уеб-базираните настройки."
+
 #~ msgid "For additional settings, select Computing Preferences in "
 #~ msgstr "За допълнителни настройки, изберете Изчислителни Предпочитания в "
+
 #~ msgid "the Advanced View."
 #~ msgstr "Разширеният Изглед."
+
 #~ msgid "Workunit name"
 #~ msgstr "Име на работна единица"
+
 #~ msgid "invalid float"
 #~ msgstr "невалидно число"
+
 #~ msgid "Display the advanced (accessible) graphical interface."
 #~ msgstr "Покажи разширения (достъпен) графичен интерфейс."
+
 #~ msgid "Paused: Other work running"
 #~ msgstr "На Пауза: В ход е друга работа"
+
 #~ msgid "Paused: User initiated.  Click 'Resume' to continue"
 #~ msgstr ""
 #~ "На Пауза: Активирана от потребителя.  Натиснете 'Подновяване' за да "
 #~ "продължите"
+
 #~ msgid "Paused: User active"
 #~ msgstr "На Пауза: Потребителя е активен"
+
 #~ msgid "Paused: Computer on battery"
 #~ msgstr "На Пауза: Компютъра работи на батерии"
+
 #~ msgid "Paused: Time of Day"
 #~ msgstr "На Пауза: Ограничителни Часове"
+
 #~ msgid "Paused: Benchmarks running"
 #~ msgstr "На Пауза: Изчисляват се Референтните Показатели"
+
 #~ msgid "Paused"
 #~ msgstr "На пауза"
+
 #~ msgid "Paused: Application start delayed"
 #~ msgstr "На Пауза: Отложен старт на приложението"
+
 #~ msgid "Click to show project graphics"
 #~ msgstr "Натиснете за да покаже графики на проекта"
+
 #~ msgid "Open a window to view messages"
 #~ msgstr "Отвори прозорец за преглед на съобщения"
+
 #~ msgid "Stop all activity"
 #~ msgstr "Спри всички дейности"
+
 #~ msgid "Resume activity"
 #~ msgstr "Поднови всички дейности"
+
 #~ msgid "Open a window to set your preferences"
 #~ msgstr "Отвори прозорец за да зададете вашите предпочитания"
+
 #~ msgid "Switch to the BOINC advanced view"
 #~ msgstr "Превключи към разширения изглед на BOINC"
 
@@ -4134,6 +4020,7 @@ msgstr "посочете часове за започване и спиране
 # 100%
 #~ msgid "My Projects:"
 #~ msgstr "Моите Проекти:"
+
 #, c-format
 #~ msgid "%s. Work done by %s: %0.2f"
 #~ msgstr "%s. Извършена работа от %s: %0.2f"
@@ -4145,22 +4032,29 @@ msgstr "посочете часове за започване и спиране
 #, c-format
 #~ msgid "%d hr %d min %d sec"
 #~ msgstr "%d ч %d мин %d сек"
+
 #~ msgid "Are you sure you want to display graphics on a remote machine?"
 #~ msgstr "Сигурни ли сте, че искате да покажете графики на отдалечена машина?"
+
 #~ msgid "Application: "
 #~ msgstr "Приложение: "
+
 #~ msgid "Time Remaining: "
 #~ msgstr "Оставащо Време: "
+
 #~ msgid "Elapsed Time: "
 #~ msgstr "Изминало Време: "
+
 #~ msgid "Account manager website"
 #~ msgstr "Интернет страница на акаунт мениджъра"
+
 #~ msgid "Account Manager &URL:"
 #~ msgstr "Акаунт Мениджър &URL:"
 
 #, c-format
 #~ msgid "%s &website"
 #~ msgstr "%s &интернет страница"
+
 #~ msgid "Notice List"
 #~ msgstr "Известие Списък"
 
@@ -4171,72 +4065,101 @@ msgstr "посочете часове за започване и спиране
 #, c-format
 #~ msgid "%s; received from %s; on %s"
 #~ msgstr "%s; получено от %s; на %s"
+
 #~ msgid "Click"
 #~ msgstr "Натиснете"
+
 #~ msgid "Project List"
 #~ msgstr "Списък Проекти"
+
 #~ msgid "Nvidia GPU Supported"
 #~ msgstr "Поддържа Nvidia GPU"
+
 #~ msgid "ATI GPU Supported"
 #~ msgstr "Поддържа ATI GPU"
+
 #~ msgid "Project Website"
 #~ msgstr "Интернет страница на Проекта"
+
 #~ msgid "One or more items failed to load from the Internet."
 #~ msgstr "Един или повече елементи не успяха да се заредят от Интернет."
 
 # 88%
 #~ msgid "Retry now"
 #~ msgstr "Опитай отново сега"
+
 #~ msgid "10%"
 #~ msgstr "10%"
+
 #~ msgid "20%"
 #~ msgstr "20%"
+
 #~ msgid "30%"
 #~ msgstr "30%"
+
 #~ msgid "40%"
 #~ msgstr "40%"
+
 #~ msgid "50%"
 #~ msgstr "50%"
+
 #~ msgid "60%"
 #~ msgstr "60%"
+
 #~ msgid "70%"
 #~ msgstr "70%"
+
 #~ msgid "80%"
 #~ msgstr "80%"
+
 #~ msgid "90%"
 #~ msgstr "90%"
+
 #~ msgid "100%"
 #~ msgstr "100%"
+
 #~ msgid "1"
 #~ msgstr "1"
+
 #~ msgid "3"
 #~ msgstr "3"
+
 #~ msgid "5"
 #~ msgstr "5"
+
 #~ msgid "10"
 #~ msgstr "10"
+
 #~ msgid "15"
 #~ msgstr "15"
+
 #~ msgid "30"
 #~ msgstr "30"
+
 #~ msgid "60"
 #~ msgstr "60"
+
 #, c-format
 #~ msgid "Pop up a menu of websites for project %s"
 #~ msgstr "Появява се меню с интернет страници за проекта %s"
+
 #~ msgid ""
 #~ "for accessibility support, please select advanced from the view menu or type "
 #~ "command shift a"
 #~ msgstr ""
 #~ "за поддръжка при достъпност, моля изберете за напреднали от менюто изглед "
 #~ "или напишете команда shift A"
+
 #~ msgid "This panel contains graphs showing user totals for projects"
 #~ msgstr ""
 #~ "Този панел съдържа диаграми показващи общия кредит на потребителя по проекти"
+
 #~ msgid "list headers"
 #~ msgstr "списък заглавия"
+
 #~ msgid "list of events"
 #~ msgstr "списък на събития"
+
 #~ msgid "list of events is empty"
 #~ msgstr "списък на събития е празен"
 
@@ -4259,6 +4182,7 @@ msgstr "посочете часове за започване и спиране
 #, c-format
 #~ msgid "; column %d of %d; "
 #~ msgstr "; колона %d от %d; "
+
 #~ msgid "list is empty"
 #~ msgstr "списъка е празен"
 
@@ -4277,8 +4201,10 @@ msgstr "посочете часове за започване и спиране
 #, c-format
 #~ msgid "; row %d of %d; "
 #~ msgstr "; ред %d от %d; "
+
 #~ msgid "blank"
 #~ msgstr "празен"
+
 #~ msgid "list of projects or account managers"
 #~ msgstr "списък от проекти или акаунт мениджъри"
 
@@ -4289,18 +4215,22 @@ msgstr "посочете часове за започване и спиране
 #, c-format
 #~ msgid "row %d of %d; "
 #~ msgstr "ред %d от %d; "
+
 #~ msgid "The minimum username length for this project is 1. Please enter a different username."
 #~ msgstr ""
 #~ "Минималната дължина на потребителско име за този проект е 1. Моля въведете "
 #~ "различно потребителско име."
+
 #~ msgid "The minimum username length for this account manager is 1. Please enter a different username."
 #~ msgstr ""
 #~ "Минималната дължина на потребителско име за този акаунт мениджър е 1. Моля "
 #~ "въведете различно потребителско име."
+
 #~ msgid "The minimum email address length for this project is 1. Please enter a different email address."
 #~ msgstr ""
 #~ "Минималната дължина на имейл адрес за този проект е 1. Моля въведете "
 #~ "различен имейл адрес."
+
 #~ msgid "The minimum email address length for this account manager is 1. Please enter a different email address."
 #~ msgstr ""
 #~ "Минималната дължина на имейл адрес за този акаунт мениджър е 1. Моля "
@@ -4317,6 +4247,7 @@ msgstr "посочете часове за започване и спиране
 #~ msgstr ""
 #~ "Минималната дължина на паролата за този акаунт мениджър е %d. Моля въведете "
 #~ "друга парола."
+
 #~ msgid ""
 #~ "An error has occurred;\n"
 #~ "check the Event Log for details.\n"
@@ -4347,36 +4278,59 @@ msgstr "посочете часове за започване и спиране
 #, c-format
 #~ msgid "OnDropTarget: index by HitTest = %i"
 #~ msgstr "OnDropTarget: index by HitTest = %i"
+
+#~ msgid "Pie Ctrl"
+#~ msgstr "Контрол на Диаграмата"
+
+#~ msgid "specify work start and stop hours in format HH:MM-HH:MM"
+#~ msgstr "посочете часове за започване и спиране на работа във формат ЧЧ:ММ-ЧЧ:ММ"
+
+#~ msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
+#~ msgstr ""
+#~ "посочете часове за започване и спиране на използване на мрежата във формат "
+#~ "ЧЧ:ММ-ЧЧ:ММ"
+
 #~ msgid "Identify your account "
 #~ msgstr "Идентифицирайте Вашия акаунт "
+
 #~ msgid "Read config file"
 #~ msgstr "Прочети конфигуриращия файл"
+
 #~ msgid "Read configuration info from cc_config.xml"
 #~ msgstr "Прочети конфигуриращата информация от cc_config.xml"
+
 #~ msgid ""
 #~ "(C) 2003-2011 University of California, Berkeley.\n"
 #~ "All Rights Reserved."
 #~ msgstr ""
 #~ "(C) 2003-2011 Калифорнийски Университет, Бъркли.\n"
 #~ "Всички Права Запазени."
+
 #~ msgid "NVIDIA GPU"
 #~ msgstr "NVIDIA GPU"
+
 #~ msgid "ATI GPU"
 #~ msgstr "ATI GPU"
+
 #~ msgid "Multicore CPU Supported"
 #~ msgstr "Поддържа Многоядрен CPU"
+
 #~ msgid "%s: %.0f"
 #~ msgstr "%s: %.0f"
+
 #~ msgid "Click 'Retry now' to transfer the file now"
 #~ msgstr "Натиснете \"Опитай отново сега\", за да трансферирате файла сега. "
+
 #~ msgid ""
 #~ "Click 'Abort transfer' to delete the file from the transfer queue. This "
 #~ "will prevent you from being granted credit for this result."
 #~ msgstr ""
 #~ "Натиснете \"Преустанови трансфера\", за да изтриете файла от списъка за "
 #~ "сваляне. По този начин няма да получите кредити за този резултат."
+
 #~ msgid "Aborting result..."
 #~ msgstr "Преустановяване на резултата..."
+
 #~ msgid ""
 #~ "You have chosen to add a new BOINC project.  Adding a new\n"
 #~ "project means that you will be connecting your computer to a new "
@@ -4408,6 +4362,7 @@ msgstr "посочете часове за започване и спиране
 #~ "За да смените кои точно изследователски приложения се изпращат към Вас "
 #~ "от\n"
 #~ "World Community Grid тогава моля натиснете на следния бутон:"
+
 #~ msgid "Change Research Applications at World Community Grid"
 #~ msgstr "Сменете Изследователските Приложения от World Community Grid"
 
@@ -4418,50 +4373,73 @@ msgstr "посочете часове за започване и спиране
 #, fuzzy
 #~ msgid "Don't fetch ATI GPU tasks"
 #~ msgstr "Няма да взима нови задачи"
+
 #~ msgid "Web sites"
 #~ msgstr "Web сайтове"
+
 #~ msgid "Retrieving host information; please wait..."
 #~ msgstr "Обработвам информацията за хоста; моля изчакайте..."
+
 #~ msgid "Upload pending"
 #~ msgstr "Очаква качване"
+
 #~ msgid "Download pending"
 #~ msgstr "Очаква сваляне"
+
 #~ msgid "Failed to attach to project"
 #~ msgstr "Неуспешно влизане в проекта"
+
 #~ msgid "Failed to attach to account manager"
 #~ msgstr "Неуспех при прикрепянето към акаунт менажера. "
+
 #~ msgid "Attached to account manager"
 #~ msgstr "Прокрепен към акаунт менажер"
+
 #~ msgid "You are now successfully attached to this account manager."
 #~ msgstr "Успешно успяхте да се прикрепите към този акаунт менажер. "
+
 #~ msgid "All projects"
 #~ msgstr "Всички проекти"
+
 #~ msgid "Attach to project"
 #~ msgstr "Влез в проект"
+
 #~ msgid "Attach to account manager"
 #~ msgstr "Прикрепи Акаунт Менажера"
+
 #~ msgid "Attach to a project"
 #~ msgstr "Влез в проект"
+
 #~ msgid "Attached to project"
 #~ msgstr "Влязъл в проекта"
+
 #~ msgid "You are now successfully attached to this project."
 #~ msgstr "Успешно успя да се прикрепиш към този проект. "
+
 #~ msgid "Attached to %s"
 #~ msgstr "Прикрепен към %s"
+
 #~ msgid "Detach"
 #~ msgstr "Излез от проекта"
+
 #~ msgid "Detaching from project..."
 #~ msgstr "Излизане от проекта..."
+
 #~ msgid "Are you sure you want to detach from project '%s'?"
 #~ msgstr "Сигурни ли сте, че искате да излезете от проекта '%s'?"
+
 #~ msgid "Detach from Project"
 #~ msgstr "Излез от проекта"
+
 #~ msgid "To completion"
 #~ msgstr "Остават"
+
 #~ msgid "Attach to a project to begin processing work"
 #~ msgstr "Влез в проект, за да започнеш да обработваш работа"
+
 #~ msgid "%s - Can't find web browser"
 #~ msgstr "%s - Не може да се намери браузър"
+
 #~ msgid ""
 #~ "%s tried to display the web page\n"
 #~ "\t%s\n"
@@ -4476,62 +4454,85 @@ msgstr "посочете часове за започване и спиране
 #~ "За да се оправи, настрой environment променливата\n"
 #~ "BROWSER да е пътят до твоя любим уеб браузър,\n"
 #~ "след това рестартирай %s."
+
 #~ msgid "Retrying communications for project(s)..."
 #~ msgstr "Опитвам отново комуникацията с проектите..."
+
 #~ msgid ""
 #~ "Required wizard file(s) are missing from the target server.\n"
 #~ "(lookup_account.php/create_account.php)\n"
 #~ msgstr ""
 #~ "Нужните файл(ове) за магьосника липсват от избрания сървър. \n"
 #~ "(lookup_account.php/create_account.php)\n"
+
 #~ msgid "User information"
 #~ msgstr "Информация за потребителя"
+
 #~ msgid "Account Manager URL"
 #~ msgstr "URL на акаунт менажера:"
+
 #~ msgid "Enter the URL of the account manager's web site."
 #~ msgstr "Въведете URL-то на уеб сайта на акаунт менажера"
+
 #~ msgid "Exit the %s"
 #~ msgstr "Излиза от %s. "
+
 #~ msgid "Attach to &project"
 #~ msgstr "Влез в проект"
+
 #~ msgid "Attaching to project..."
 #~ msgstr "Влизане в проект..."
+
 #~ msgid "Removal from %s completed."
 #~ msgstr "Премахването от %s е завършено. "
+
 #~ msgid "Removal succeeded!"
 #~ msgstr "Премахването узпешно!"
+
 #~ msgid "Debug Flags"
 #~ msgstr "Debug Flags"
+
 #~ msgid "Project Properties Failure"
 #~ msgstr "Грешка при Настройките на Проекта"
+
 #~ msgid "Project Properties URL Failure"
 #~ msgstr "Грешка на URL-то за Настройки на Проекта"
+
 #~ msgid "Account Creation Disabled"
 #~ msgstr "Създаването на акаунти временно преустановено"
+
 #~ msgid "Account Already Exists"
 #~ msgstr "Акаунта вече съществува"
+
 #~ msgid "Project Already Attached"
 #~ msgstr "Проекта вече е добавен. "
+
 #~ msgid "Project Attach Failure"
 #~ msgstr "Грешка при добавянето на проекта"
+
 #~ msgid "Net Detection Failure"
 #~ msgstr "Грешка при установяването на връзка към Интернет"
+
 #~ msgid "You are already attached to this project."
 #~ msgstr "Ти вече си прикрепен към този проект. "
+
 #~ msgid ""
 #~ "Enter the username and password you used on\n"
 #~ "the web site."
 #~ msgstr ""
 #~ "Въведи потребителското име и паролата, които\n"
 #~ "си използвал на уеб сайта. "
+
 #~ msgid ""
 #~ "Enter the email address and password you used on\n"
 #~ "the web site."
 #~ msgstr ""
 #~ "Въведи email адреса и паролата, които си използвал\n"
 #~ "на уеб сайта. "
+
 #~ msgid "Enter account key"
 #~ msgstr "Въведете ключ на акаунта"
+
 #~ msgid ""
 #~ "This project uses an \"account key\" to identify you.\n"
 #~ "\n"
@@ -4542,18 +4543,23 @@ msgstr "посочете часове за започване и спиране
 #~ "\n"
 #~ "Отиди на уеб сайта на проекта, за да си създадеш акаунт. Твоят\n"
 #~ "ключ на акунта ще ти бъде пратен по email. "
+
 #~ msgid "An account key looks like:"
 #~ msgstr "Един ключ на акаунта изглежда така:"
+
 #~ msgid "82412313ac88e9a3638f66ea82186948"
 #~ msgstr "82412313ac88e9a3638f66ea82186948"
+
 #~ msgid "Account key:"
 #~ msgstr "Ключ на акаунта:"
+
 #~ msgid ""
 #~ "%s needs a connection to the Internet to perform some maintenance, open "
 #~ "the %s to connect up and perform the needed work."
 #~ msgstr ""
 #~ "%s се нуждае от връзка към Интернет за подръжка, отвори %s, за да се "
 #~ "свържеш и да свършиш неопходимата работа."
+
 #~ msgid ""
 #~ "%s is unable to communicate with a project and no default connection is "
 #~ "specified.\n"
@@ -4566,6 +4572,7 @@ msgstr "посочете часове за започване и спиране
 #~ "Моля свържи се към Интернет или задай връзка по подразбиране от таба "
 #~ "връзки\n"
 #~ "в прозореца с опциите от advanced менюто. "
+
 #~ msgid ""
 #~ "Please provide the email address and password you used to register\n"
 #~ "at GridRepublic. (if you have not yet created an account at\n"
@@ -4574,8 +4581,10 @@ msgstr "посочете часове за започване и спиране
 #~ "Моля въведи email адреса и паролата, които използва при регистрацията\n"
 #~ "в GridRepublic. (ако все още не си си създал акаунт в\n"
 #~ "GridRepublic, моля направи го на http://www.gridrepublic.org)"
+
 #~ msgid "Start Project"
 #~ msgstr "Стартирай проекта"
+
 #~ msgid ""
 #~ "Please enter an email address and password. You will need your email\n"
 #~ "address if you want to change your account options or use our message\n"
@@ -4591,18 +4600,21 @@ msgstr "посочете часове за започване и спиране
 #~ "От време на време ще ти пращаме email-и. Можеш да спреш това по всяко "
 #~ "време\n"
 #~ "Ние няма да даваме твоя email на трети лица. "
+
 #~ msgid ""
 #~ "Congratulations, you have now successfully started your Climate\n"
 #~ "Change Experiment."
 #~ msgstr ""
 #~ "Поздравления, ти успешно успя да стартираш твоя Climate\n"
 #~ "Change Experiment."
+
 #~ msgid ""
 #~ "Click finish to exit. You will be taken to a web page which tells\n"
 #~ "you more about your model."
 #~ msgstr ""
 #~ "Натисни Край за да излезеш. Ще бъдеш отведен на уеб страница,\n"
 #~ "която ти дава повече информация за твоя модел. "
+
 #~ msgid ""
 #~ "This will shut down your experiment until it restarts automatically\n"
 #~ "following your user preferences. Close window to close the manager\n"
@@ -4611,45 +4623,59 @@ msgstr "посочете часове за започване и спиране
 #~ "Това ще прекрати твоя експеримент, докато не се рестартира\n"
 #~ "на база на твоите предпочитания. Затвори прозореца за да затвориш\n"
 #~ "менажера без да спираш задачите."
+
 #~ msgid "%s is currently suspended...\n"
 #~ msgstr "%s е временно прекратен...\n"
+
 #~ msgid "%s networking is currently suspended...\n"
 #~ msgstr "Интернет дейностите на %s са временно прекратени...\n"
+
 #~ msgid "%s is currently reconnecting to a %s client...\n"
 #~ msgstr "%s в момента се свързва отново към %s клиент...\n"
+
 #~ msgid ""
 #~ "A software platform for distributed computing using volunteered computer "
 #~ "resources"
 #~ msgstr ""
 #~ "Софтурна платформа за разпределено изчисление,  използвайки компютърните "
 #~ "ресурси на доброволци. "
+
 #~ msgid "Username:"
 #~ msgstr "Потребит. име:"
+
 #~ msgid "Click here to disable displaying this message in the future."
 #~ msgstr ""
 #~ "Натисни тук, за да изключиш показването на това съобщени за в бъдеще. "
+
 #~ msgid "Language Selection:"
 #~ msgstr "Избор на език:"
+
 #~ msgid "What language should the manager display by default."
 #~ msgstr "Какъв език трябва да използва менажера по подразбиране?"
+
 #~ msgid "Reminder Frequency:"
 #~ msgstr "Честота на напомнянията:"
+
 #~ msgid ""
 #~ "How often, in minutes, should the manager remind you of possible "
 #~ "connection events."
 #~ msgstr ""
 #~ "Колко често, в минути, менажера трябва да ви напомня за възможни дейности "
 #~ "изискващи връзка към Интернет?"
+
 #~ msgid ""
 #~ "Report completed work, get latest credit, get latest preferences, and "
 #~ "possibly get more work."
 #~ msgstr ""
 #~ "Докладва всичката свършена работа, взима последните кредити, взима "
 #~ "последните предпочитрания, и по възмойност сваля нова работа. "
+
 #~ msgid "&Defect from %s"
 #~ msgstr "&Излез от %s"
+
 #~ msgid "&%s\tF1"
 #~ msgstr "&%s\tF1"
+
 #~ msgid ""
 #~ "This will shut down your tasks until it restarts automatically\n"
 #~ "following your user preferences. Close window to close the manager\n"
@@ -4658,32 +4684,46 @@ msgstr "посочете часове за започване и спиране
 #~ "Това ще прекрати всички задачи, докато не се рестартират\n"
 #~ "на база на твоите предпочитания. Затвори прозореца за да затвориш\n"
 #~ "менажера без да спираш задачите."
+
 #~ msgid "Close Confirmation"
 #~ msgstr "Затвори потвърждението"
+
 #~ msgid "BOINC Manager - Detach from %s"
 #~ msgstr "BOINC Manager - Излез от %s"
+
 #~ msgid "Account not found"
 #~ msgstr "Акаунта не е намерен"
+
 #~ msgid "Project URL"
 #~ msgstr "URL на Проекта:"
+
 #~ msgid "Enter the URL of the project's web site."
 #~ msgstr "Напишете URL-то на уеб сайта на проекта. "
+
 #~ msgid "For a list of BOINC-based projects go to:"
 #~ msgstr "За списък на BOINC-базирани проекти отидете на:"
+
 #~ msgid "Click Next to configure BOINC's proxy settings."
 #~ msgstr "Натизнете Напред, за да конфигурирате прокси настройките на BOINC. "
+
 #~ msgid "Disk Space"
 #~ msgstr "Дисково пространство"
+
 #~ msgid "Hide graphics"
 #~ msgstr "Скрий графики"
+
 #~ msgid "Hide application graphics window."
 #~ msgstr "Скрива прозореца с графиките на приложението. "
+
 #~ msgid "Preempted"
 #~ msgstr "Изчисленията отложени"
+
 #~ msgid "Ready to run"
 #~ msgstr "Готово за работа"
+
 #~ msgid "Activities suspended by user"
 #~ msgstr "Дейностите временно прекратени от потребителя"
+
 #~ msgid ""
 #~ "We'll now remove this computer from %s.  You will\n"
 #~ "be responsible for managing the BOINC client software from\n"
@@ -4692,24 +4732,31 @@ msgstr "посочете часове за започване и спиране
 #~ "Сега ще премахнем този компютър от %s. Ти ще си\n"
 #~ "отговорен от сега нататък за менажирането на \n"
 #~ "BOINC клиентския софтуер. "
+
 #~ msgid ""
 #~ "We'll now guide you through the process of adding an account\n"
 #~ "manager."
 #~ msgstr ""
 #~ "Сега ще те преведем през процесът на добавяне на акаунт\n"
 #~ "менажер. "
+
 #~ msgid "Project Comm Failure"
 #~ msgstr "Грешка при свързването с Проекта"
+
 #~ msgid "Google Comm Failure"
 #~ msgstr "Грешка при свързването с Google "
+
 #~ msgid "Yahoo Comm Failure"
 #~ msgstr "Грешка при свързването с Yahoo "
+
 #~ msgid "About BOINC Manager"
 #~ msgstr "&Относно BOINC Manager-а..."
+
 #~ msgid "BOINC Manager - Dialup Logon"
 #~ msgstr "BOINC Manager - Dialup връзка"
+
 #~ msgid "BOINC Manager - Options"
 #~ msgstr "BOINC Manager - Опции"
+
 #~ msgid "BOINC Manager - Select Computer"
 #~ msgstr "BOINC Manager - Избери Компютър"
-
diff --git a/locale/bg/BOINC-Setup.mo b/locale/bg/BOINC-Setup.mo
index 98fe8bc..40938aa 100644
Binary files a/locale/bg/BOINC-Setup.mo and b/locale/bg/BOINC-Setup.mo differ
diff --git a/locale/bg/BOINC-Setup.po b/locale/bg/BOINC-Setup.po
index 480f331..d075c5a 100755
--- a/locale/bg/BOINC-Setup.po
+++ b/locale/bg/BOINC-Setup.po
@@ -4,37 +4,34 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-01-26 00:00-0800\n"
-"PO-Revision-Date: 2015-02-10 13:26-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: 2013-09-11 15:08+0000\n"
+"Last-Translator: Dimitar <mexicoman at abv.bg>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.5.5\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: 1378912083.0\n"
 "X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: mac_installer\n"
 
 #: Installer.cpp:124
 #, c-format
 msgid "Sorry, this version of %s requires system 10.5 or higher."
 msgstr ""
 
-#: PostInstall.cpp:130
-#: PostInstall.cpp:1136
-#: uninstall.cpp:1618
+#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
 msgid "Yes"
 msgstr "Да"
 
-#: PostInstall.cpp:131
-#: PostInstall.cpp:1137
-#: uninstall.cpp:1619
+#: PostInstall.cpp:131 PostInstall.cpp:1137 uninstall.cpp:1619
 msgid "No"
 msgstr "Не"
 
@@ -45,18 +42,24 @@ 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"
+"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?"
+"Do you also want non-administrative users to be able to run and control %s "
+"on this Mac?"
 msgstr ""
-"На потребители, които имат разрешение да администрират този компютър, автоматично ще им бъде позволено да стартират и да управляват %s.\n"
+"На потребители, които имат разрешение да администрират този компютър, "
+"автоматично ще им бъде позволено да стартират и да управляват %s.\n"
 "\n"
-"Искате ли също потребители без администраторски права да могат да стартират и управляват %s на този Mac?"
+"Искате ли също потребители без администраторски права да могат да стартират "
+"и управляват %s на този Mac?"
 
 #: 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 потребители на този Mac?"
+msgstr ""
+"Искате ли да зададете %s като скрийн-сейвър за всички %s потребители на този "
+"Mac?"
 
 #: uninstall.cpp:82
 msgid "OK"
@@ -83,7 +86,8 @@ msgid ""
 msgstr ""
 "Сигурни ли сте, че напълно искате да премахнете %s от вашия компютър?\n"
 "\n"
-"Това ще премахне изпълнимите файлове, но няма да закача файловете с данни на %s."
+"Това ще премахне изпълнимите файлове, но няма да закача файловете с данни на "
+"%s."
 
 #: uninstall.cpp:163
 #, c-format
@@ -118,7 +122,8 @@ msgid ""
 msgstr ""
 "Премахването завърши.\n"
 "\n"
-" Може да поискате да премахнете следните оставащи елементи с помощта на Търсачката: \n"
+" Може да поискате да премахнете следните оставащи елементи с помощта на "
+"Търсачката: \n"
 "папката \"%s\"\n"
 "\n"
 "за всеки потребител, файла\n"
@@ -127,10 +132,12 @@ msgstr ""
 #: uninstall.cpp:840
 #, c-format
 msgid ""
-"Enter your administrator password to completely remove %s from you computer.\n"
+"Enter your administrator password to completely remove %s from you "
+"computer.\n"
 "\n"
 msgstr ""
-"Въведете своята администраторска парола за да премахнете напълно %s от вашия компютър.\n"
+"Въведете своята администраторска парола за да премахнете напълно %s от вашия "
+"компютър.\n"
 "\n"
 
 #: uninstall.cpp:1616
@@ -144,4 +151,3 @@ msgstr "Продължение..."
 #, c-format
 #~ msgid "Sorry, this version of %s requires system 10.4 or higher."
 #~ msgstr "За съжаление, тази версия на %s изисква система 10.4 или по-висока."
-
diff --git a/locale/bg/BOINC-Web.mo b/locale/bg/BOINC-Web.mo
index e3e04eb..bf1b99f 100644
Binary files a/locale/bg/BOINC-Web.mo and b/locale/bg/BOINC-Web.mo differ
diff --git a/locale/bg/BOINC-Web.po b/locale/bg/BOINC-Web.po
index e57c1ea..473abb7 100755
--- a/locale/bg/BOINC-Web.po
+++ b/locale/bg/BOINC-Web.po
@@ -7,8 +7,8 @@ msgstr ""
 "Project-Id-Version: BOINC Web 6.x\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:37-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
+"PO-Revision-Date: 2013-09-12 11:36+0000\n"
+"Last-Translator: Dimitar <mexicoman at abv.bg>\n"
 "Language-Team: BOINC Development Team <boinc_loc at ssl.berkeley.edu>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,10 @@ msgstr ""
 "X-Generator: Pootle 2.5.0\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
+"X-Poedit-SearchPath-0: doc\n"
 "X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
 "X-POOTLE-MTIME: 1378985776.0\n"
 "X-Poedit-KeywordsList: tra\n"
-"X-Poedit-SearchPath-0: doc\n"
 
 #: docutil.php:21
 msgid "Search"
@@ -37,7 +37,9 @@ msgid "This page is %stranslatable%s."
 msgstr "Тази страница %sможе да се преведе%s."
 
 #: download.php:39
-msgid "We recommend that you also install VirtualBox, so your computer can work on science projects that require it."
+msgid ""
+"We recommend that you also install VirtualBox, so your computer can work on "
+"science projects that require it."
 msgstr ""
 
 #: download.php:41
@@ -48,14 +50,12 @@ msgstr ""
 msgid "Download BOINC + VirtualBox"
 msgstr ""
 
-#: download.php:54
-#: download.php:69
+#: download.php:54 download.php:69
 #, php-format
 msgid "for %s"
 msgstr ""
 
-#: download.php:57
-#: download.php:72
+#: download.php:57 download.php:72
 #, php-format
 msgid "BOINC version %s"
 msgstr ""
@@ -70,19 +70,30 @@ msgid "Download BOINC"
 msgstr "Изтеглете BOINC"
 
 #: download.php:123
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others."
+msgid ""
+"BOINC is a program that lets you donate your idle computer time to science "
+"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, and many others."
 msgstr ""
 
 #: download.php:125
-msgid "After installing BOINC on your computer, you can connect it to as many of these projects as you like."
+msgid ""
+"After installing BOINC on your computer, you can connect it to as many of "
+"these projects as you like."
 msgstr ""
 
 #: download.php:127
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
-msgstr "Можете да стартирате този софтуер на компютър само ако притежавате компютъра или имате разрешението на собственика му."
+msgid ""
+"You may run this software on a computer only if you own the computer or have "
+"the permission of its owner."
+msgstr ""
+"Можете да стартирате този софтуер на компютър само ако притежавате компютъра "
+"или имате разрешението на собственика му."
 
 #: download.php:132
-msgid "We recommend that you download BOINC from the Google Play Store or Amazon Appstore, not from here."
+msgid ""
+"We recommend that you download BOINC from the Google Play Store or Amazon "
+"Appstore, not from here."
 msgstr ""
 
 #: download.php:167
@@ -93,8 +104,7 @@ msgstr "Системни изисквания"
 msgid "Release notes"
 msgstr "Бележки по изданието"
 
-#: download.php:169
-#: index.php:86
+#: download.php:169 index.php:86
 msgid "Help"
 msgstr "Помощ"
 
@@ -116,20 +126,48 @@ msgstr "BOINC: изчислявайте за науката"
 
 #: help.php:12
 #, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
-msgstr "BOINC Онлайн Помощ Ви позволява да разговаряте едно-към-едно с опитни BOINC потребители, които могат: %s да отговарят на въпроси относно BOINC и доброволното изчисляване; %s да Ви преведат през процеса на инсталиране и използване на BOINC; %s да отстраняват всякакви проблеми които може да имате."
+msgid ""
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who "
+"can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"through the process of installing and using BOINC; %s troubleshoot any "
+"problems you might have."
+msgstr ""
+"BOINC Онлайн Помощ Ви позволява да разговаряте едно-към-едно с опитни BOINC "
+"потребители, които могат: %s да отговарят на въпроси относно BOINC и "
+"доброволното изчисляване; %s да Ви преведат през процеса на инсталиране и "
+"използване на BOINC; %s да отстраняват всякакви проблеми които може да "
+"имате."
 
 #: help.php:21
 #, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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 Онлайн Помощ е базиран на %sSkype%s, Интернет-базирана телефонна система. Skype е безплатен (едновременно софтуера и обажданията).  Ако все още нямате Skype, моля %sизтеглете го и инсталирайте сега%s.  Когато сте готови се върнете на тази страница."
+msgid ""
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. "
+"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 Онлайн Помощ е базиран на %sSkype%s, Интернет-базирана телефонна "
+"система. Skype е безплатен (едновременно софтуера и обажданията).  Ако все "
+"още нямате Skype, моля %sизтеглете го и инсталирайте сега%s.  Когато сте "
+"готови се върнете на тази страница."
 
 #: help.php:28
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
-msgstr "Най-добрия начин да получите помощ е чрез говор, за което се нуждаете или от вграден микрофон и колонки, или от външни слушалки за вашия компютър.  Също можете да използвате текстово-базирана Skype чат система или обикновена електронна поща (ако нямате Skype) за да комуникирате с Доброволците за Помощ."
+msgid ""
+"The best way to get help is by voice, for which you need either built-in "
+"microphone and speakers or an external headset for your computer.  You can "
+"also use Skype's text-based chat system or regular email (if you don't have "
+"Skype) to communicate with Help Volunteers."
+msgstr ""
+"Най-добрия начин да получите помощ е чрез говор, за което се нуждаете или от "
+"вграден микрофон и колонки, или от външни слушалки за вашия компютър.  Също "
+"можете да използвате текстово-базирана Skype чат система или обикновена "
+"електронна поща (ако нямате Skype) за да комуникирате с Доброволците за "
+"Помощ."
 
 #: help.php:31
-msgid "Volunteers speaking several languages are available. Please select a language:"
+msgid ""
+"Volunteers speaking several languages are available. Please select a "
+"language:"
 msgstr "Доброволци говорещи няколко езика са налични. Моля изберете език:"
 
 #: help.php:47
@@ -138,21 +176,36 @@ msgstr "Станете Доброволец за Помощ"
 
 #: help.php:50
 #, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
-msgstr "Ако сте опитен BOINC потребител, ние Ви насърчаваме да %sстанете Доброволец за Помощ%s.  Това е страхотен начин да помогнете на каузата за научни изследвания и споделени изчисления - а също така е и забавно!"
+msgid ""
+"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+"Volunteer%s.  It's a great way to help the cause of scientific research and "
+"volunteer computing - and it's fun!"
+msgstr ""
+"Ако сте опитен BOINC потребител, ние Ви насърчаваме да %sстанете Доброволец "
+"за Помощ%s.  Това е страхотен начин да помогнете на каузата за научни "
+"изследвания и споделени изчисления - а също така е и забавно!"
 
 #: help.php:56
 #, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
-msgstr "Ако вече сте Доброволец за Помощ: за да редактирате своите настройки, %sнатиснете тук%s."
+msgid ""
+"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
+msgstr ""
+"Ако вече сте Доброволец за Помощ: за да редактирате своите настройки, %"
+"sнатиснете тук%s."
 
 #: help_funcs.php:107
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
-msgstr "BOINC помощниците са неплатени доброволци.  Техните съвети не минават през одобрение от BOINC или от Калифорнийския Университет."
+msgid ""
+"BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
+"or the University of California."
+msgstr ""
+"BOINC помощниците са неплатени доброволци.  Техните съвети не минават през "
+"одобрение от BOINC или от Калифорнийския Университет."
 
 #: help_funcs.php:110
 msgid "%1Never%2 give email address or password information to BOINC helpers."
-msgstr "%1Никога%2 не давайте информация за своя имейл адрес или парола на BOINC помощниците."
+msgstr ""
+"%1Никога%2 не давайте информация за своя имейл адрес или парола на BOINC "
+"помощниците."
 
 #: index.php:24
 msgid "Computing power"
@@ -199,9 +252,7 @@ msgstr "Доброволец"
 msgid "Download"
 msgstr "Изтегляне"
 
-#: index.php:87
-#: index.php:120
-#: index.php:171
+#: index.php:87 index.php:120 index.php:171
 msgid "Documentation"
 msgstr "Документация"
 
@@ -214,7 +265,10 @@ msgid "Links"
 msgstr "Връзки"
 
 #: index.php:94
-msgid "Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:"
+msgid ""
+"Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure "
+"diseases, study global warming, discover pulsars, and do many other types of "
+"scientific research.  It's safe, secure, and easy:"
 msgstr ""
 
 #: index.php:96
@@ -231,8 +285,12 @@ msgstr ""
 
 #: index.php:102
 #, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
-msgstr "Или, ако работите по няколко проекта, опитайте %sакаунт мениджър%s като например %sGridRepublic%s или %sBAM!%s. "
+msgid ""
+"Or, if you run several projects, try an %saccount manager%s such as %"
+"sGridRepublic%s or %sBAM!%s. "
+msgstr ""
+"Или, ако работите по няколко проекта, опитайте %sакаунт мениджър%s като "
+"например %sGridRepublic%s или %sBAM!%s. "
 
 #: index.php:118
 msgid "Compute with BOINC"
@@ -243,12 +301,20 @@ msgid "Software updates"
 msgstr "Обновяване на софтуера"
 
 #: index.php:128
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
-msgstr "%1За Учени%2: използвайте BOINC за да създадете %3проект за доброволно изчисляване%4 който може да Ви даде изчислителната мощ на хиляди CPU-та."
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving "
+"you the computing power of thousands of CPUs."
+msgstr ""
+"%1За Учени%2: използвайте BOINC за да създадете %3проект за доброволно "
+"изчисляване%4 който може да Ви даде изчислителната мощ на хиляди CPU-та."
 
 #: index.php:132
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
-msgstr "%1За Университети%2: използвайте BOINC за да създадете %3Виртуален Училищен Супер-изчислителен Център%4."
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
+msgstr ""
+"%1За Университети%2: използвайте BOINC за да създадете %3Виртуален Училищен "
+"Супер-изчислителен Център%4."
 
 #: index.php:137
 msgid "%1Companies%2: use BOINC for %3desktop Grid computing%4."
@@ -320,8 +386,11 @@ msgstr "API-та за add-on софтуер"
 
 #: index.php:217
 #, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
-msgstr "Софтуер с отворен код за %sдоброволно изчисляване%s и %sизчисляване в мрежа%s."
+msgid ""
+"Open-source software for %svolunteer computing%s and %sgrid computing%s."
+msgstr ""
+"Софтуер с отворен код за %sдоброволно изчисляване%s и %sизчисляване в мрежа%"
+"s."
 
 #: index.php:230
 msgid "BOINC is based at The University of California, Berkeley"
@@ -341,8 +410,14 @@ msgid "Seismology"
 msgstr "Сеизмология"
 
 #: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
-msgstr "Мрежата за Хващане на Земетресения разработва най-голямата сеизмична мрежа с помощта на сензори прикрепени към Интернет-свързани компютри.  Трябва да си купите сензор за да участвате."
+msgid ""
+"The Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to Internet-connected computers.  You must buy a "
+"sensor to participate."
+msgstr ""
+"Мрежата за Хващане на Земетресения разработва най-голямата сеизмична мрежа с "
+"помощта на сензори прикрепени към Интернет-свързани компютри.  Трябва да си "
+"купите сензор за да участвате."
 
 #: projects.inc:27
 msgid "BOINC Poland Foundation"
@@ -353,23 +428,29 @@ msgid "Environmental research"
 msgstr "Проучване за околната среда"
 
 #: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
-msgstr "Този проект създава свободна и периодично обновяваща се карта на радиационните нива, като използва сензори свързани с компютри на доброволци.  Трябва да си купите сензор за да участвате."
+msgid ""
+"This project is creating a free and continuously updated map of radiation "
+"levels by using sensors connected to volunteers' computers.  You must buy a "
+"sensor to participate."
+msgstr ""
+"Този проект създава свободна и периодично обновяваща се карта на "
+"радиационните нива, като използва сензори свързани с компютри на доброволци. "
+" Трябва да си купите сензор за да участвате."
 
 #: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
-msgstr "За да участвате в тези проекти трябва да си купите сензор и да го прикрепите към вашия компютър."
+msgid ""
+"To participate in these projects you must buy a sensor and attach it to your "
+"computer."
+msgstr ""
+"За да участвате в тези проекти трябва да си купите сензор и да го прикрепите "
+"към вашия компютър."
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
 msgstr "Когнитивна наука и изкуствен интелект"
 
-#: projects.inc:60
-#: projects.inc:364
-#: projects.inc:408
-#: projects.inc:457
-#: projects.inc:464
-#: projects.inc:511
+#: projects.inc:60 projects.inc:364 projects.inc:408 projects.inc:457
+#: projects.inc:464 projects.inc:511
 msgid "Private"
 msgstr "Частен"
 
@@ -378,8 +459,16 @@ msgid "Artificial intelligence"
 msgstr "Изкуствен интелект"
 
 #: projects.inc:62
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
-msgstr "Правете синтактичен анализ и преобразувайте семантични мрежи за използване във FreeHAL, изкуствен интелект който използва семантични мрежи, производни думи, бази от данни с думи като части на речта и програми за морфологичен анализ с цел да се имитира човешко държание в разговори."
+msgid ""
+"Parse and convert semantic nets for use in FreeHAL, an artificial "
+"intelligence that uses semantic networks, stemmers, part of speech "
+"databases, and part of speech taggers in order to imitate human behavior in "
+"conversations."
+msgstr ""
+"Правете синтактичен анализ и преобразувайте семантични мрежи за използване "
+"във FreeHAL, изкуствен интелект който използва семантични мрежи, производни "
+"думи, бази от данни с думи като части на речта и програми за морфологичен "
+"анализ с цел да се имитира човешко държание в разговори."
 
 #: projects.inc:69
 msgid "Biology and Medicine"
@@ -394,8 +483,19 @@ msgid "Antimalarial drug discovery"
 msgstr "Търсене на лекарство против малария"
 
 #: projects.inc:84
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
-msgstr "Паразитът, който причинява малария, продължава да увеличава своята устойчивост към наличните лекарства. За това ние спешно се нуждаем да открием нови лекарства, които да заместят съществуващите такива. Най-важното е, че тези нови лекарства трябва да бъдат насочени към НОВИ протеини в паразита. Проектът FightMalaria at Home се цели в откриването на тези нови мишени."
+msgid ""
+"The parasite that causes malaria continues to evolve resistance to available "
+"medication. We therefore urgently need to discover new drugs to replace "
+"existing drugs. Importantly, these new drugs need to target NEW proteins in "
+"the parasite. The FightMalaria at Home project is aimed at finding these new "
+"targets."
+msgstr ""
+"Паразитът, който причинява малария, продължава да увеличава своята "
+"устойчивост към наличните лекарства. За това ние спешно се нуждаем да "
+"открием нови лекарства, които да заместят съществуващите такива. Най-важното "
+"е, че тези нови лекарства трябва да бъдат насочени към НОВИ протеини в "
+"паразита. Проектът FightMalaria at Home се цели в откриването на тези нови "
+"мишени."
 
 #: projects.inc:90
 msgid "University of Karlsruhe (Germany)"
@@ -406,8 +506,18 @@ msgid "Protein structure prediction"
 msgstr "Предсказване структурата на протеини"
 
 #: projects.inc:92
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
-msgstr "POEM at HOME използва изчислителен подход за да предскаже биологически активните структури от белтъци, за да разбере механизмите когато белтъците взаимодействат един с друг, за да разбере болести свързани с неправилното функциониране или агрегацията на белтъците и да разработи нови лекарства на база на три-измерни структури от биологически ценни белтъци."
+msgid ""
+"POEM at HOME uses a computational approach to predict the biologically active "
+"structure of proteins, to understand the signal-processing mechanisms when "
+"the proteins interact with one another, to understand diseases related to "
+"protein malfunction or aggregation, and to develop new drugs on the basis of "
+"the three-dimensions structure of biologically important proteins."
+msgstr ""
+"POEM at HOME използва изчислителен подход за да предскаже биологически "
+"активните структури от белтъци, за да разбере механизмите когато белтъците "
+"взаимодействат един с друг, за да разбере болести свързани с неправилното "
+"функциониране или агрегацията на белтъците и да разработи нови лекарства на "
+"база на три-измерни структури от биологически ценни белтъци."
 
 #: projects.inc:98
 msgid "University of Delaware"
@@ -418,7 +528,11 @@ msgid "Study of protein - ligand interactions"
 msgstr ""
 
 #: projects.inc:100
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
+msgid ""
+"Docking at Home has both bioscience and computer science goals. The project "
+"aims to further knowledge of the atomic details of protein-ligand "
+"interactions and, by doing so, will search for insights into the discovery "
+"of novel pharmaceuticals."
 msgstr ""
 
 #: projects.inc:114
@@ -430,8 +544,17 @@ msgid "Molecular simulations of proteins"
 msgstr "Молекулярни симулации на протеини"
 
 #: projects.inc:116
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
-msgstr "GPUGrid.net представя новoвъведени изчислителни сценарии с помощта на първия изцяло атомен молекулярен динамически код (CellMD) специално оптимизиран да работи на NVIDIA GPU устройства. Нови био-медицински приложения изведнъж станаха възможни, даващи нова роля на изчислителната биология за био-медицински проучвания."
+msgid ""
+"GPUGrid.net opens novel computational scenarios by the first full-atom "
+"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
+"New biomedical applications suddenly become possible giving a new role to "
+"computational biology for biomedical research."
+msgstr ""
+"GPUGrid.net представя новoвъведени изчислителни сценарии с помощта на първия "
+"изцяло атомен молекулярен динамически код (CellMD) специално оптимизиран да "
+"работи на NVIDIA GPU устройства. Нови био-медицински приложения изведнъж "
+"станаха възможни, даващи нова роля на изчислителната биология за "
+"био-медицински проучвания."
 
 #: projects.inc:122
 msgid "Technion, Israel"
@@ -442,11 +565,18 @@ msgid "Genetic linkage analysis"
 msgstr "Анализ на генетичните връзки"
 
 #: projects.inc:124
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
-msgstr "Superlink at Technion помага на генетиците по целия свят да открият предразполагащи към болести гени, които причиняват някои типове диабети, хипертония (високо кръвно налягане), рак, шизофрения и много други."
+msgid ""
+"Superlink at Technion helps geneticists all over the world find disease-"
+"provoking genes causing some types of diabetes, hypertension (high blood "
+"pressure), cancer, schizophrenia and many others."
+msgstr ""
+"Superlink at Technion помага на генетиците по целия свят да открият "
+"предразполагащи към болести гени, които причиняват някои типове диабети, "
+"хипертония (високо кръвно налягане), рак, шизофрения и много други."
 
 #: projects.inc:138
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
+msgid ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
 msgstr "Университет Мериленд Център за Биоинформатика и Изчислителна Биология"
 
 #: projects.inc:139
@@ -454,8 +584,16 @@ msgid "Life science research"
 msgstr "Проучване на науките за живота"
 
 #: projects.inc:140
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
-msgstr "The Lattice Project предоставя изчислителна мощ на учени в Университета Мериленд изучаващи еволюционни взаимоотношения базирани на данни от ДНК последователности; бактериални, плазмидни и вирусови протеинови последователности; и биологическото разнообразие в природните резерви. "
+msgid ""
+"The Lattice Project supplies computing power to scientists at the University "
+"of Maryland studying evolutionary relationships based on DNA sequence data; "
+"bacterial, plasmid, and virus protein sequences; and biological diversity in "
+"nature reserves. "
+msgstr ""
+"The Lattice Project предоставя изчислителна мощ на учени в Университета "
+"Мериленд изучаващи еволюционни взаимоотношения базирани на данни от ДНК "
+"последователности; бактериални, плазмидни и вирусови протеинови "
+"последователности; и биологическото разнообразие в природните резерви. "
 
 #: projects.inc:146
 msgid "The Swiss Tropical Institute"
@@ -466,29 +604,61 @@ msgid "Epidemiology"
 msgstr "Епидемиология"
 
 #: projects.inc:148
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
-msgstr "Моделите за симулация на динамиката на предаване и здравните ефекти на маларията са важен инструмент при контрола на маларията. Те могат да бъдат използвани за определяне на оптималните стратегии за мрежи от доставящи комари, химиотерапия, или нови ваксини в момент на разработване и изпитание.  Подобно моделиране е изключително трудоемко за изчисление с компютър, и изисква симулации с големи човешки популации с разнообразни комбинации от параметри свързани с биологически и социал [...]
+msgid ""
+"Simulation models of the transmission dynamics and health effects of malaria "
+"are an important tool for malaria control. They can be used to determine "
+"optimal strategies for delivering mosquito nets, chemotherapy, or new "
+"vaccines which are currently under development and testing.  Such modeling "
+"is extremely computer intensive, requiring simulations of large human "
+"populations with a diverse set of parameters related to biological and "
+"social factors that influence the distribution of the disease. "
+msgstr ""
+"Моделите за симулация на динамиката на предаване и здравните ефекти на "
+"маларията са важен инструмент при контрола на маларията. Те могат да бъдат "
+"използвани за определяне на оптималните стратегии за мрежи от доставящи "
+"комари, химиотерапия, или нови ваксини в момент на разработване и изпитание. "
+" Подобно моделиране е изключително трудоемко за изчисление с компютър, и "
+"изисква симулации с големи човешки популации с разнообразни комбинации от "
+"параметри свързани с биологически и социални фактори които влияят на "
+"разпространението на болестта. "
 
 #: projects.inc:170
 msgid "University of Washington"
 msgstr "Университет Вашингтон"
 
-#: projects.inc:171
-#: projects.inc:179
+#: projects.inc:171 projects.inc:179
 msgid "Biology"
 msgstr "Биология"
 
 #: projects.inc:172
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
-msgstr "Определете 3-измерните форми на протеини в проучване което може в крайна сметка да доведе до откриване на лекарства за някои главни човешки болести. Като работите с Rosetta at home ще ни помогнете да ускорим и разширим нашето проучване по начин по който не бихме могли без вашата помощ. Вие също ще помагате на нашите опити за създаване на нови протеини за борба срещу болести като СПИН, Малария, Рак и Болестта на Алцхаймер"
+msgid ""
+"Determine the 3-dimensional shapes of proteins in research that may "
+"ultimately lead to finding cures for some major human diseases. By running "
+"Rosetta at home you will help us speed up and extend our research in ways we "
+"couldn't possibly attempt without your help. You will also be helping our "
+"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
+"Cancer, and Alzheimer's"
+msgstr ""
+"Определете 3-измерните форми на протеини в проучване което може в крайна "
+"сметка да доведе до откриване на лекарства за някои главни човешки болести. "
+"Като работите с Rosetta at home ще ни помогнете да ускорим и разширим нашето "
+"проучване по начин по който не бихме могли без вашата помощ. Вие също ще "
+"помагате на нашите опити за създаване на нови протеини за борба срещу "
+"болести като СПИН, Малария, Рак и Болестта на Алцхаймер"
 
 #: projects.inc:178
 msgid "University of Vienna"
 msgstr "Университет Виена"
 
 #: projects.inc:180
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
-msgstr "Изчислявайте подобности между протеини. SIMAP осигурява публична база данни от произлезлите данни, която играе ключова роля в много проекти за проучване в биоинформатиката."
+msgid ""
+"Calculate similarities between proteins. SIMAP provides a public database of "
+"the resulting data, which plays a key role in many bioinformatics research "
+"projects."
+msgstr ""
+"Изчислявайте подобности между протеини. SIMAP осигурява публична база данни "
+"от произлезлите данни, която играе ключова роля в много проекти за проучване "
+"в биоинформатиката."
 
 #: projects.inc:186
 msgid "Earth Sciences"
@@ -503,8 +673,25 @@ msgid "Climate study"
 msgstr "Изучаване на климата"
 
 #: projects.inc:200
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
-msgstr "Проучвайте приближенията които трябва да се направят в най-развитите климатични модели в наши дни. Като изчисляваме модела хиляди пъти ние се надяваме да открием как той реагира на най-фините настройки на тези приближения - достатъчно фини за да не правят приближенията по-малко реалистични. Това ще ни позволи да подобрим нашето разбиране за това колко чувствителни са нашите модели на малки промени и също на промени във въглеродния диоксид и серния цикъл. Това ще ни позволи да про [...]
+msgid ""
+"Investigate the approximations that have to be made in state-of-the-art "
+"climate models. By running the model thousands of times we hope to find out "
+"how the model responds to slight tweaks to these approximations - slight "
+"enough to not make the approximations any less realistic. This will allow us "
+"to improve our understanding of how sensitive our models are to small "
+"changes and also to things like changes in carbon dioxide and the sulphur "
+"cycle. This will allow us to explore how climate may change in the next "
+"century under a wide range of different scenarios."
+msgstr ""
+"Проучвайте приближенията които трябва да се направят в най-развитите "
+"климатични модели в наши дни. Като изчисляваме модела хиляди пъти ние се "
+"надяваме да открием как той реагира на най-фините настройки на тези "
+"приближения - достатъчно фини за да не правят приближенията по-малко "
+"реалистични. Това ще ни позволи да подобрим нашето разбиране за това колко "
+"чувствителни са нашите модели на малки промени и също на промени във "
+"въглеродния диоксид и серния цикъл. Това ще ни позволи да проучим как "
+"климата може да се промени през следващото столетие при голям обхват от "
+"сценарии."
 
 #: projects.inc:207
 msgid "Physical Science"
@@ -515,31 +702,63 @@ msgid "Mechanical engineering"
 msgstr ""
 
 #: projects.inc:214
-msgid "Currently we are calculating the optimum design of a structure call the 52 bar truss"
+msgid ""
+"Currently we are calculating the optimum design of a structure call the 52 "
+"bar truss"
 msgstr ""
 
-#: projects.inc:224
-#: projects.inc:263
-#: projects.inc:271
+#: projects.inc:224 projects.inc:263 projects.inc:271
 msgid "Astronomy"
 msgstr "Астрономия"
 
 #: projects.inc:225
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
-msgstr "Ние ще комбинираме спектралното покритие от GALEX, Pan-STARRS1 и WISE за да генерираме много-честотен UV-оптически-NIR галактически атлас на близко разположената до нас Вселена. Ще измерваме физически параметри (като например плътността на повърхността на звздната маса, плътността на повърхността на темпото на образуване на звезди, разреждането и историята на образуването на първородните звезди) на базата на непоколебима пиксел по пиксел основа като използваме напасващи техники з [...]
+msgid ""
+"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
+"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
+"Universe. We will measure physical parameters (such as stellar mass surface "
+"density, star formation rate surface density, attenuation, and first-order "
+"star formation history) on a resolved pixel-by-pixel basis using spectral "
+"energy distribution (SED) fitting techniques in a distributed computing mode."
+msgstr ""
+"Ние ще комбинираме спектралното покритие от GALEX, Pan-STARRS1 и WISE за да "
+"генерираме много-честотен UV-оптически-NIR галактически атлас на близко "
+"разположената до нас Вселена. Ще измерваме физически параметри (като "
+"например плътността на повърхността на звздната маса, плътността на "
+"повърхността на темпото на образуване на звезди, разреждането и историята на "
+"образуването на първородните звезди) на базата на непоколебима пиксел по "
+"пиксел основа като използваме напасващи техники за спектрално енергийно "
+"разпределение (SED) в режим на разпределени компютърни изчисления."
 
 #: projects.inc:247
 msgid "University of Texas at Austin"
 msgstr "Университет Тексас в Остин"
 
-#: projects.inc:248
-#: projects.inc:279
+#: projects.inc:248 projects.inc:279
 msgid "Chemistry"
 msgstr "Химия"
 
 #: projects.inc:249
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
-msgstr "Често срещан проблем в теоретичната химия, физиката на кондензирана материя и материалознанието е определянето на еволюцията на система с атомен размер във времето където, например, протичат химически реакции и/или дифузия. Общо казано събитията от които се интересуваме са доста редки (на степен много пъти по-малка от вибрационните движения на атомите) и затова директни симулации, проследяващи всяко движение на атомите, биха отнели хиляди години компютърни изчисления на най-бързи [...]
+msgid ""
+"A common problem in theoretical chemistry, condensed matter physics and "
+"materials science is the calculation of the time evolution of an atomic "
+"scale system where, for example, chemical reactions and/or diffusion occur. "
+"Generally the events of interest are quite rare (many orders of magnitude "
+"slower than the vibrational movements of the atoms), and therefore direct "
+"simulations, tracking every movement of the atoms, would take thousands of "
+"years of computer calculations on the fastest present day computer before a "
+"single event of interest can be expected to occur.  Our research group is "
+"interested in calculating the long time dynamics of systems."
+msgstr ""
+"Често срещан проблем в теоретичната химия, физиката на кондензирана материя "
+"и материалознанието е определянето на еволюцията на система с атомен размер "
+"във времето където, например, протичат химически реакции и/или дифузия. Общо "
+"казано събитията от които се интересуваме са доста редки (на степен много "
+"пъти по-малка от вибрационните движения на атомите) и затова директни "
+"симулации, проследяващи всяко движение на атомите, биха отнели хиляди години "
+"компютърни изчисления на най-бързия компютър в наши дни преди да се появи "
+"единично събитие представляващо интерес за нас.  Нашата проучвателна група "
+"се интересува от изчисляване на динамиката на системите в много дълъг "
+"период."
 
 # 95%
 #: projects.inc:262
@@ -547,24 +766,48 @@ msgid "University of Illinois at Urbana-Champaign"
 msgstr "Университет Илинойс в Урбана-Шампейн"
 
 #: projects.inc:264
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
-msgstr "Целта на Cosmology at Home е да търси за модел който най-добре описва нашата Вселена и да намери обхват от модели които съвпадат с наличните данни за физиката на астрономическите елементарни частици."
+msgid ""
+"The goal of Cosmology at Home is to search for the model that best describes "
+"our Universe and to find the range of models that agree with the available "
+"astronomical particle physics data."
+msgstr ""
+"Целта на Cosmology at Home е да търси за модел който най-добре описва нашата "
+"Вселена и да намери обхват от модели които съвпадат с наличните данни за "
+"физиката на астрономическите елементарни частици."
 
 #: projects.inc:270
 msgid "Rensselaer Polytechnic Institute"
 msgstr "Политехнически Институт Ренселеър"
 
 #: projects.inc:272
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
-msgstr "Целта на Milkyway at Home е да създаде изключително точен три измерен модел на галактиката Млечен Път използвайки данни събрани от Слоун Цифрово Наблюдение на Небето."
+msgid ""
+"The goal of Milkyway at Home is to create a highly accurate three dimensional "
+"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
+"Survey."
+msgstr ""
+"Целта на Milkyway at Home е да създаде изключително точен три измерен модел на "
+"галактиката Млечен Път използвайки данни събрани от Слоун Цифрово Наблюдение "
+"на Небето."
 
 #: projects.inc:278
 msgid "Leiden University, The Netherlands"
 msgstr "Университет Лейден, Холандия"
 
 #: projects.inc:280
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
-msgstr "Класически изчисления на повърхнини използващи Класическа Динамика.  Leiden Classical позволява на доброволци, студенти и други учени да предоставят своите собствени изчисления на мрежата. Всеки потребител има своя собствена опашка от задачи от Класическата Динамика. По този начин студенти са използвали мрежата за да симулират течен аргон, или да тестват валидността на закона за идеален газ като реално правят симулациите през мрежата."
+msgid ""
+"Surface science calculations using Classical Dynamics.  Leiden Classical "
+"allows volunteers, students and other scientist to submit their personal "
+"calculations to the grid. Each user has his own personal queue for Classical "
+"Dynamics jobs. In this way students have used the grid to simulate liquid "
+"argon, or to test the validity of the ideal gas law by actually doing the "
+"simulations through the grid."
+msgstr ""
+"Класически изчисления на повърхнини използващи Класическа Динамика.  Leiden "
+"Classical позволява на доброволци, студенти и други учени да предоставят "
+"своите собствени изчисления на мрежата. Всеки потребител има своя собствена "
+"опашка от задачи от Класическата Динамика. По този начин студенти са "
+"използвали мрежата за да симулират течен аргон, или да тестват валидността "
+"на закона за идеален газ като реално правят симулациите през мрежата."
 
 #: projects.inc:294
 msgid "Univ. of Wisconsin - Milwaukee, Max Planck Institute"
@@ -575,26 +818,52 @@ msgid "Astrophysics"
 msgstr "Астрофизика"
 
 #: projects.inc:296
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
-msgstr "Претърсвайте за въртящи се неутронни звезди (също наричани пулсари) като използвате данни от гравитационните детектори за вълни LIGO и GEO и от радио обсерваторията в Аресибо.  Einstein at Home е проект в чест на Световната Година за Физика 2005г. и е поддържан от Американското Физическо Общество (APS) и определен брой международни организации."
+msgid ""
+"Search for spinning neutron stars (also called pulsars) using data from the "
+"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
+"observatory.  Einstein at Home is a World Year of Physics 2005 project "
+"supported by the American Physical Society (APS) and by a number of "
+"international organizations."
+msgstr ""
+"Претърсвайте за въртящи се неутронни звезди (също наричани пулсари) като "
+"използвате данни от гравитационните детектори за вълни LIGO и GEO и от радио "
+"обсерваторията в Аресибо.  Einstein at Home е проект в чест на Световната "
+"Година за Физика 2005г. и е поддържан от Американското Физическо Общество "
+"(APS) и определен брой международни организации."
 
-#: projects.inc:310
-#: projects.inc:318
+#: projects.inc:310 projects.inc:318
 msgid "CERN (European Organization for Nuclear Research)"
 msgstr "CERN - ЦЕРН (Европейска Организация за Ядрени Изследвания)"
 
-#: projects.inc:311
-#: projects.inc:319
+#: projects.inc:311 projects.inc:319
 msgid "Physics"
 msgstr "Физика"
 
 #: projects.inc:312
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
-msgstr "Големият Адронен Колайдер (LHC) е ускорител на частици в CERN - ЦЕРН, Европейската Организация за Ядрени Изследвания, и е най-голямата лаборатория за изследване на физиката на елементарните частици.  Той е най-мощният инструмент някога строен за изследване на свойствата на елементарните частици. LHC at home прави симулации за да подобри дизайна на LHC и неговите детектори."
+msgid ""
+"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
+"European Organization for Nuclear Research, the world's largest particle "
+"physics laboratory.  It is the most powerful instrument ever built to "
+"investigate on particles proprieties. LHC at home runs simulations to improve "
+"the design of LHC and its detectors."
+msgstr ""
+"Големият Адронен Колайдер (LHC) е ускорител на частици в CERN - ЦЕРН, "
+"Европейската Организация за Ядрени Изследвания, и е най-голямата лаборатория "
+"за изследване на физиката на елементарните частици.  Той е най-мощният "
+"инструмент някога строен за изследване на свойствата на елементарните "
+"частици. LHC at home прави симулации за да подобри дизайна на LHC и неговите "
+"детектори."
 
 #: projects.inc:320
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
-msgstr "Този проект използва разработена от CERN технология на виртуална машина за напълно развита в Големия Адронен Колайдер LHC симулация на физически събития за изчисляване на компютри на доброволци.  Изисква инсталация на ВиртуалнаКутия на вашия компютър"
+msgid ""
+"This project uses CERN-developed virtual machine technology for full-fledged "
+"LHC event physics simulation on volunteer computers.  Requires that you "
+"install VirtualBox on your computer"
+msgstr ""
+"Този проект използва разработена от CERN технология на виртуална машина за "
+"напълно развита в Големия Адронен Колайдер LHC симулация на физически "
+"събития за изчисляване на компютри на доброволци.  Изисква инсталация на "
+"ВиртуалнаКутия на вашия компютър"
 
 #: projects.inc:326
 msgid "University of California, Berkeley"
@@ -605,8 +874,19 @@ msgid "Astrophysics, astrobiology"
 msgstr "Астрофизика, астробиология"
 
 #: projects.inc:328
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
-msgstr "SETI (Търсене на Извънземен Интелект) представлява научна област, чиято цел е да открие интелигентен извънземен живот. Един подход, известен като радио SETI, използва радио телескопи, които да слушат за ниско-честотни радио сигнали от космоса. Подобни сигнали не е известно да се появяват по естествен начин, за това тяхното засичане би доказало наличието на извънземна технология."
+msgid ""
+"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
+"goal is to detect intelligent life outside Earth. One approach, known as "
+"radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
+"signals from space. Such signals are not known to occur naturally, so a "
+"detection would provide evidence of extraterrestrial technology."
+msgstr ""
+"SETI (Търсене на Извънземен Интелект) представлява научна област, чиято цел "
+"е да открие интелигентен извънземен живот. Един подход, известен като радио "
+"SETI, използва радио телескопи, които да слушат за ниско-честотни радио "
+"сигнали от космоса. Подобни сигнали не е известно да се появяват по "
+"естествен начин, за това тяхното засичане би доказало наличието на "
+"извънземна технология."
 
 #: projects.inc:342
 msgid "Bielefeld University of Applied Sciences"
@@ -617,8 +897,16 @@ msgid "Chemical engineering and nanotechnology"
 msgstr "Химично инженерство и нанотехнологии"
 
 #: projects.inc:344
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
-msgstr "Изучаване на молекулярни магнити и контролиран нано-мащабен магнетизъм.  Тези магнетични молекули могат да бъдат използвани за разработване на магнетични превключватели, с приложения в медицината (като например за локална химиотерапия на тумори) и био-технологиите."
+msgid ""
+"The study of molecular magnets and controlled nanoscale magnetism.  These "
+"magnetic molecules may be used to develop tiny magnetic switches, with "
+"applications in medicine (such as local tumor chemotherapy) and "
+"biotechnology."
+msgstr ""
+"Изучаване на молекулярни магнити и контролиран нано-мащабен магнетизъм.  "
+"Тези магнетични молекули могат да бъдат използвани за разработване на "
+"магнетични превключватели, с приложения в медицината (като например за "
+"локална химиотерапия на тумори) и био-технологиите."
 
 #: projects.inc:351
 msgid "Multiple applications"
@@ -633,19 +921,28 @@ msgid "Physics, biochemistry, and others"
 msgstr "Физика, биохимия и други"
 
 #: projects.inc:358
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
-msgstr "Целта на CAS at home е да окуражи и подпомогне учени в Китай да приспособят технологиите на споделеното изчисляване и споделеното мислене за своите проучвания."
+msgid ""
+"The objective of CAS at home is to encourage and assist scientists in China to "
+"adopt the technologies of volunteer computing and volunteer thinking for "
+"their research."
+msgstr ""
+"Целта на CAS at home е да окуражи и подпомогне учени в Китай да приспособят "
+"технологиите на споделеното изчисляване и споделеното мислене за своите "
+"проучвания."
 
 #: projects.inc:365
 msgid "Mathematics, physics, evolution"
 msgstr "Математика, физика, еволюция"
 
 #: projects.inc:366
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
-msgstr "Yoyo at home е посредник между BOINC и няколко съществуващи проекта за споделени изчисления: ECM, Muon, Evolution at home и distributed.net"
+msgid ""
+"Yoyo at home is an adapter between BOINC and several existing volunteer "
+"computing projects: ECM, Muon, Evolution at home, and distributed.net"
+msgstr ""
+"Yoyo at home е посредник между BOINC и няколко съществуващи проекта за "
+"споделени изчисления: ECM, Muon, Evolution at home и distributed.net"
 
-#: projects.inc:371
-#: projects.inc:527
+#: projects.inc:371 projects.inc:527
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 msgstr "MTA-SZTAKI Лаборатория за Паралелни и Разпределени Системи (Унгария)"
 
@@ -654,8 +951,16 @@ msgid "European research projects"
 msgstr "Европейски изследователски проекти"
 
 #: projects.inc:373
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
-msgstr "Проектът EDGeS at Home Beta интегрира споделено изчисляване в сервизната решетка на Европа като позволява на сервизни мрежи да изпращат задачи за обработване от доброволци участващи в този проект. Научните проекти включени в този проект включват математика, физика, биология и др."
+msgid ""
+"The EDGeS at Home Beta project integrates volunteer computing into the service "
+"grid network of Europe by allowing service grids to send workunits to be "
+"processed by the volunteers of this project. The scientific projects covered "
+"by the project include math, physics, biology, etc."
+msgstr ""
+"Проектът EDGeS at Home Beta интегрира споделено изчисляване в сервизната "
+"решетка на Европа като позволява на сервизни мрежи да изпращат задачи за "
+"обработване от доброволци участващи в този проект. Научните проекти включени "
+"в този проект включват математика, физика, биология и др."
 
 #: projects.inc:379
 msgid "Spanish universities and research centers"
@@ -678,8 +983,17 @@ msgid "Medical, environmental and other humanitarian research"
 msgstr "Медицинско, насочено към околната среда и друго хуманитарно изследване"
 
 #: projects.inc:389
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
-msgstr "За последващо критично проучване с нестопанска цел на някои от най-належащите човешки проблеми, като се създаде най-голямата в света мрежа за споделени изчисления.  Проучването включва ХИВ-СПИН, рак, тропически и други пренебрегвани болести, слънчевата енергия, питейната вода и много други."
+msgid ""
+"To further critical non-profit research on some of humanity's most pressing "
+"problems by creating the world's largest volunteer computing grid.  Research "
+"includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"clean water and many more."
+msgstr ""
+"За последващо критично проучване с нестопанска цел на някои от "
+"най-належащите човешки проблеми, като се създаде най-голямата в света мрежа "
+"за споделени изчисления.  Проучването включва ХИВ-СПИН, рак, тропически и "
+"други пренебрегвани болести, слънчевата енергия, питейната вода и много "
+"други."
 
 #: projects.inc:395
 msgid "Mathematics, computing, and games"
@@ -697,21 +1011,21 @@ msgstr "Математика, Физика, Изкуствен Интелект"
 msgid "Simulation of quantum computing; Goldbach's conjecture."
 msgstr "Симулация на квантови изчисления; Предположение на Goldbach."
 
-#: projects.inc:450
-#: projects.inc:458
+#: projects.inc:450 projects.inc:458
 msgid "Cryptography"
 msgstr "Криптография"
 
 #: projects.inc:459
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
-msgstr "Опит да се дешифрират 3 оригинални Енигма съобщения. Сигналите са били засечени в Северния Атлантик през 1942г. и се смята, че не могат да бъдат разбити."
-
-#: projects.inc:465
-#: projects.inc:504
-#: projects.inc:512
-#: projects.inc:520
-#: projects.inc:528
-#: projects.inc:568
+msgid ""
+"Attempt to decode 3 original Enigma messages. The signals were intercepted "
+"in the North Atlantic in 1942 and are believed to be unbroken."
+msgstr ""
+"Опит да се дешифрират 3 оригинални Енигма съобщения. Сигналите са били "
+"засечени в Северния Атлантик през 1942г. и се смята, че не могат да бъдат "
+"разбити."
+
+#: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
+#: projects.inc:528 projects.inc:568
 msgid "Mathematics"
 msgstr "Математика"
 
@@ -728,44 +1042,95 @@ msgid "Factorization of large integers"
 msgstr "Разлагане на големи цели числа"
 
 #: projects.inc:473
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
-msgstr "NFS at Home е изследователски проект който използва Интернет-свързани компютри за да правят пресяващи стъпки от алгоритъм за разлагане на големи цели числа чрез метод на Пресяване на Числово Поле. Като млад ученик в училище Вие сте получили своя пръв опит в разлагането на цяло число на прости множители като например 15 = 3 * 5 или 35 = 5 * 7. NFS at Home е продължение на този опит, обаче с цели числа които са със стотици цифри дължина."
+msgid ""
+"NFS at Home is a research project that uses Internet-connected computers to do "
+"the lattice sieving step in the Number Field Sieve factorization of large "
+"integers. As a young school student, you gained your first experience at "
+"breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
+"NFS at Home is a continuation of that experience, only with integers that are "
+"hundreds of digits long."
+msgstr ""
+"NFS at Home е изследователски проект който използва Интернет-свързани компютри "
+"за да правят пресяващи стъпки от алгоритъм за разлагане на големи цели числа "
+"чрез метод на Пресяване на Числово Поле. Като млад ученик в училище Вие сте "
+"получили своя пръв опит в разлагането на цяло число на прости множители "
+"като например 15 = 3 * 5 или 35 = 5 * 7. NFS at Home е продължение на този "
+"опит, обаче с цели числа които са със стотици цифри дължина."
 
 #: projects.inc:479
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
-msgstr "Технически Университет Вилнюс Гедиминас и Университет по Технология Каунас (Литва)"
+msgid ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
+msgstr ""
+"Технически Университет Вилнюс Гедиминас и Университет по Технология Каунас "
+"(Литва)"
 
 #: projects.inc:480
 msgid "Software testing"
 msgstr "Тестване на софтуер"
 
 #: projects.inc:481
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
-msgstr "Целта на този проект е да предостави мощна платформа за споделени изчисления на учените от Техническия Университет Вилнюс Гедиминас (VGTU) а също така и на други Литовски академични институции.  Текущите приложения включват изучаване и тестване на софтуер базиран на метода на Монте Карло."
+msgid ""
+"The aim of this project is to provide a powerful distributed computing "
+"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
+"well as others Lithuanian academic institutions.  Current applications "
+"involve the study of Monte-Carlo based software testing."
+msgstr ""
+"Целта на този проект е да предостави мощна платформа за споделени изчисления "
+"на учените от Техническия Университет Вилнюс Гедиминас (VGTU) а също така и "
+"на други Литовски академични институции.  Текущите приложения включват "
+"изучаване и тестване на софтуер базиран на метода на Монте Карло."
 
 #: projects.inc:503
 msgid "Mathematical Institute of Leiden University / Kennislink"
 msgstr "Математически Институт в Университет Лейден / Кенислинк"
 
 #: projects.inc:505
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
-msgstr "Търсене на 'abc-тройки': положителни цели числа a,b,c такива че a+b=c, a < b < c, a,b,c нямат общи делители и c > rad(abc), където rad(n) е произведението от различните прости множители на n. Предположението за ABC твърди, че съществуват краен брой a,b,c такива, че log(c)/log(rad(abc)) > h за всяко реално h > 1. Предположението за ABC в момента е един от най-големите проблеми в математиката. Ако се докаже, че е вярно, много други отворени проблеми могат да бъдат решени дире [...]
+msgid ""
+"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
+"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
+"product of the distinct prime factors of n. The ABC conjecture says that "
+"there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for "
+"any real h > 1. The ABC conjecture is currently one of the greatest open "
+"problems in mathematics. If it is proven to be true, a lot of other open "
+"problems can be answered directly from it."
+msgstr ""
+"Търсене на 'abc-тройки': положителни цели числа a,b,c такива че a+b=c, a "
+"< b < c, a,b,c нямат общи делители и c > rad(abc), където rad(n) е "
+"произведението от различните прости множители на n. Предположението за ABC "
+"твърди, че съществуват краен брой a,b,c такива, че log(c)/log(rad(abc)) > h "
+"за всяко реално h > 1. Предположението за ABC в момента е един от "
+"най-големите проблеми в математиката. Ако се докаже, че е вярно, много други "
+"отворени проблеми могат да бъдат решени директно от него."
 
 #: projects.inc:513
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
-msgstr "Primegrid управлява множество проекти, които търсят много големи прости числа под различни форми, включително и търсенето на най-голямото известно просто число."
+msgid ""
+"Primegrid has multiple projects searching for different forms of very large "
+"prime numbers, including searching for the largest known prime number."
+msgstr ""
+"Primegrid управлява множество проекти, които търсят много големи прости "
+"числа под различни форми, включително и търсенето на най-голямото известно "
+"просто число."
 
 #: projects.inc:519
 msgid "Hochschule RheinMain University of Applied Sciences"
 msgstr "Колеж РейнМейн Университет по Приложни Науки"
 
 #: projects.inc:521
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
-msgstr "Търсене на опровержения за две предположения свързани с идентифицирането на прости числа"
+msgid ""
+"Search for counterexamples to two conjectures related to the identification "
+"of prime numbers"
+msgstr ""
+"Търсене на опровержения за две предположения свързани с идентифицирането на "
+"прости числа"
 
 #: projects.inc:529
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
-msgstr "Намиране на всички обобщени двойни бройни системи (в които за основа са матрици, а за цифри са вектори) до размерност 11."
+msgid ""
+"Find all the generalized binary number systems (in which bases are matrices "
+"and digits are vectors) up to dimension 11."
+msgstr ""
+"Намиране на всички обобщени двойни бройни системи (в които за основа са "
+"матрици, а за цифри са вектори) до размерност 11."
 
 #: ../html/inc/news.inc:40
 msgid "Comment"
@@ -779,9 +1144,11 @@ msgstr "Новини са налични и под формата на %sRSS fee
 # 75%
 #~ msgid "Astronomy, Physics, and Chemistry"
 #~ msgstr "Астрономия, Физика и Химия"
+
 #, php-format
 #~ msgid "%s for %s (%s MB)"
 #~ msgstr "%s за %s (%s MB)"
+
 #~ msgid ""
 #~ "BOINC is a program that lets you donate your idle computer time to science "
 #~ "projects like SETI at home, Climateprediction.net, Rosetta at home, World "
@@ -793,6 +1160,7 @@ msgstr "Новини са налични и под формата на %sRSS fee
 #~ "Rosetta at home, World Community Grid и много други. <p> След като инсталирате "
 #~ "BOINC на вашия компютър можете да се свържете към толкова от тези проекти, "
 #~ "към колкото желаете."
+
 #~ msgid "Browser default"
 #~ msgstr "Браузър по подразбиране"
 
@@ -809,11 +1177,14 @@ msgstr "Новини са налични и под формата на %sRSS fee
 #~ "пулсари и да извършвате много други видове научни изследвания.  Безопасно "
 #~ "е, сигурно и лесно:  %sИзберете%s проекти  %sИзтеглете%s и стартирайте BOINC "
 #~ "софтуера  %sВъведете%s своя имейл адрес и парола. "
+
 #~ msgid "IBM Corporate Community Relations"
 #~ msgstr "IBM Corporate Community Relations"
+
 #~ msgid "Humanitarian research on disease, natural disasters and hunger."
 #~ msgstr ""
 #~ "Хуманитарни изследвания върху заразни болести, природни бедствия и глад."
+
 #~ msgid ""
 #~ "To further critical non-profit research on some of humanity's most "
 #~ "pressing problems by creating the world's largest volunteer computing "
@@ -824,6 +1195,7 @@ msgstr "Новини са налични и под формата на %sRSS fee
 #~ "належащите човешки проблеми като се създаде най-голямата световна мрежа "
 #~ "за споделени изчисления.  Изследването включва СПИН, рак, мускулна "
 #~ "дистрофия, тропическа треска и много други."
+
 #~ msgid ""
 #~ "Primegrid is generating a public sequential prime number database, and is "
 #~ "searching for large twin primes of the form k*2<sup>n</sup>+1 and "
@@ -832,65 +1204,93 @@ msgstr "Новини са налични и под формата на %sRSS fee
 #~ "Primegrid генерира като резултат публична база от данни от прости числа и "
 #~ "търси големи прости числа близнаци записани във формата k*2<sup>n</sup>+1 "
 #~ "и k*2<sup>n</sup>-1"
+
 #~ msgid "FreeHAL"
 #~ msgstr "FreeHAL"
+
 #~ msgid "private"
 #~ msgstr "частен"
+
 #~ msgid "POEM at HOME"
 #~ msgstr "POEM at HOME"
+
 #~ msgid "Docking at Home"
 #~ msgstr "Docking at Home"
+
 #~ msgid "GPUGrid.net"
 #~ msgstr "GPUGrid.net"
+
 #~ msgid "Superlink at Technion"
 #~ msgstr "Superlink at Technion"
+
 #~ msgid "The Lattice Project"
 #~ msgstr "The Lattice Project"
+
 #~ msgid "Malariacontrol.net"
 #~ msgstr "Malariacontrol.net"
+
 #~ msgid "Rosetta at home"
 #~ msgstr "Rosetta at home"
+
 #~ msgid "SIMAP"
 #~ msgstr "SIMAP"
+
 #~ msgid "Virtual Prairie"
 #~ msgstr "Виртуална Прерия"
+
 #~ msgid "University of Houston"
 #~ msgstr "Университет Хюстън"
+
 #~ msgid "Study of botanical ecosystems"
 #~ msgstr "Изучаване на ботанически екосистеми"
+
 #~ msgid ""
 #~ "Provide ecological guidelines on the design of prairies with the best "
 #~ "potential for water purification."
 #~ msgstr ""
 #~ "Предоставя екологични насоки върху дизайна на прериите заедно с най-добър "
 #~ "потенциал за пречистване на водата."
+
 #~ msgid "Climateprediction.net"
 #~ msgstr "Climateprediction.net"
+
 #~ msgid "Astronomy/Physics/Chemistry"
 #~ msgstr "Астрономия/Физика/Химия"
+
 #~ msgid "eOn"
 #~ msgstr "eOn"
+
 #~ msgid "Orbit at home"
 #~ msgstr "Orbit at home"
+
 #~ msgid "Planetary Science Institute"
 #~ msgstr "Институт за Планетарни Науки"
+
 #~ msgid "Monitor and study the hazard posed by near-Earth asteroids"
 #~ msgstr ""
 #~ "Наблюдаване и изучаване на риска породен от близки до Земята астероиди"
+
 #~ msgid "Cosmology at Home"
 #~ msgstr "Cosmology at Home"
+
 #~ msgid "University of Illinois at Urbana-Chamapign"
 #~ msgstr "Университет Илинойс в Урбана-Шампейн"
+
 #~ msgid "Milkyway at home"
 #~ msgstr "Milkyway at home"
+
 #~ msgid "Leiden Classical"
 #~ msgstr "Leiden Classical"
+
 #~ msgid "uFluids at home"
 #~ msgstr "uFluids at home"
+
 #~ msgid "Purdue University"
 #~ msgstr "Университет Пърдю"
+
 #~ msgid "Physics/Aeronautics"
 #~ msgstr "Физика/Аеронавтика"
+
 #~ msgid ""
 #~ "The uFluids project simulates two-phase fluid behavior in microgravity "
 #~ "and microfluidics problems. Our goal is to design better satellite "
@@ -902,47 +1302,67 @@ msgstr "Новини са налични и под формата на %sRSS fee
 #~ "устройства за управление на сателитното ракетно гориво и да управляваме "
 #~ "двуфазен поток в устройства с микро-канали и MEMS - Микро Електрически "
 #~ "Механични Системи."
+
 #~ msgid "Einstein at home"
 #~ msgstr "Einstein at home"
+
 #~ msgid "LHC at home"
 #~ msgstr "LHC at home"
+
 #~ msgid "SETI at home"
 #~ msgstr "SETI at home"
+
 #~ msgid "Quantum Monte Carlo at Home"
 #~ msgstr "Quantum Monte Carlo at Home"
+
 #~ msgid "University of Muenster (Germany)"
 #~ msgstr "Университет Мюнстер (Германия)"
+
 #~ msgid ""
 #~ "Study the structure and reactivity of molecules using Quantum Chemistry."
 #~ msgstr ""
 #~ "Изучаване структурата и реактивността на молекулите с помощта на "
 #~ "Квантовата Химия."
+
 #~ msgid "Spinhenge at home"
 #~ msgstr "Spinhenge at home"
+
 #~ msgid "CAS at home"
 #~ msgstr "CAS at home"
+
 #~ msgid "Yoyo at home"
 #~ msgstr "Yoyo at home"
+
 #~ msgid "EDGeS at Home"
 #~ msgstr "EDGeS at Home"
+
 #~ msgid "Ibercivis"
 #~ msgstr "Ibercivis"
+
 #~ msgid "World Community Grid"
 #~ msgstr "World Community Grid"
+
 #~ msgid "Enigma at Home"
 #~ msgstr "Enigma at Home"
+
 #~ msgid "Collatz Conjecture"
 #~ msgstr "Collatz Conjecture"
+
 #~ msgid "NFS at home"
 #~ msgstr "NFS at home"
+
 #~ msgid "VTU at home"
 #~ msgstr "VTU at home"
+
 #~ msgid "AQUA at home"
 #~ msgstr "AQUA at home"
+
 #~ msgid "D-Wave Systems, Inc."
 #~ msgstr "D-Wave Systems, Inc."
+
 #~ msgid "Quantum computing"
 #~ msgstr "Квантови изчисления"
+
 #~ msgid ""
 #~ "D-Wave's AQUA (Adiabatic QUantum Algorithms) is a research project whose "
 #~ "goal is to predict the performance of superconducting adiabatic quantum "
@@ -958,20 +1378,28 @@ msgstr "Новини са налични и под формата на %sRSS fee
 #~ "материалознанието до машинното обучение. AQUA at home използва Интернет-"
 #~ "свързани компютри да помогнат да се създадат и анализират квантови "
 #~ "изчислителни алгоритми, с помощта на Квантови Монте Карло техники."
+
 #~ msgid "ABC at home"
 #~ msgstr "ABC at home"
+
 #~ msgid "PrimeGrid"
 #~ msgstr "PrimeGrid"
+
 #~ msgid "primaboinca"
 #~ msgstr "primaboinca"
+
 #~ msgid "SZTAKI Desktop Grid"
 #~ msgstr "SZTAKI Desktop Grid"
+
 #~ msgid "Chess960 at home"
 #~ msgstr "Chess960 at home"
+
 #~ msgid "Chess-960.org"
 #~ msgstr "Chess-960.org"
+
 #~ msgid "Game-playing"
 #~ msgstr "Игра на дъска"
+
 #~ msgid ""
 #~ "This project studies Chess 960, a variant of orthodox chess. In classical "
 #~ "chess the starting position of the game never changes.  In Chess 960, "
@@ -982,14 +1410,17 @@ msgstr "Новини са налични и под формата на %sRSS fee
 #~ "шах стартовата позиция на играта никога не се променя.  В Chess 960 точно "
 #~ "преди старта на всяка игра, първоначалната конфигурация на фигурите се "
 #~ "определя на случаен принцип."
+
 #~ msgid "The current release is known to work with these Linux versions:"
 #~ msgstr "Текущата версия е известно, че работи със следните Линукс версии:"
+
 #~ msgid ""
 #~ "For other Linux versions, check if a BOINC package is offered by your "
 #~ "Linux distribution."
 #~ msgstr ""
 #~ "За други Линукс версии, проверете дали има създаден BOINC пакет за вашата "
 #~ "конкретна Линукс версия."
+
 #~ msgid ""
 #~ "Alternatively, download the %1BOINC client for older Linux versions%2. "
 #~ "This doesn't have a graphical interface, but it should work on all Linux "
@@ -998,6 +1429,7 @@ msgstr "Новини са налични и под формата на %sRSS fee
 #~ "Като алтернатива, изтеглете %1BOINC клиент за по-стари Линукс версии%2. "
 #~ "Това няма графичен интерфейс, но би трябвало да работи на всички Линукс "
 #~ "системи, както на x86 така и на x64."
+
 #~ msgid ""
 #~ "Note: if your computer is equipped with an Graphics Processing Unit "
 #~ "(GPU), you may be able to %suse it to compute faster%s"
@@ -1005,6 +1437,694 @@ msgstr "Новини са налични и под формата на %sRSS fee
 #~ "Бележка: ако вашия компютър е екипиран с Графическо Изчисляващо "
 #~ "Устройство (GPU), може и да бъдете в състояние да го %sизползвате да "
 #~ "изчислява по-бързо%s"
+
 #~ msgid "TeraFLOPS."
 #~ msgstr "TeraFLOPS."
 
+# The charset used for the text in this file (please try to use UTF-8 if possible)
+#~ msgid "CHARSET"
+#~ msgstr "UTF-8"
+
+#~ msgid "POLL_INTRO"
+#~ msgstr ""
+#~ "Several volunteer computing projects, including Climateprediction.net, "
+#~ "Einstein at home, and SETI at home, use software called BOINC. If you "
+#~ "participate in projects like this, we request that you answer the "
+#~ "following questions. This will help BOINC-based projects increase "
+#~ "participation and achieve greater scientific results. <p> Please answer "
+#~ "as many questions as you want, then go to the bottom and click OK. If you "
+#~ "previously completed the survey but your answers have changed, please "
+#~ "complete it again - your new answers will replace the old ones. <p> The "
+#~ "current results of the survey are <a href=poll_results.php>here</a>. "
+
+#~ msgid "POLL_RUN"
+#~ msgstr "Do you run BOINC?"
+
+#~ msgid "POLL_PARTICIPATION"
+#~ msgstr "Your participation"
+
+#~ msgid "POLL_COMPUTERS"
+#~ msgstr "Your computers"
+
+#~ msgid "POLL_YOU"
+#~ msgstr "You"
+
+#~ msgid "POLL_NATIONALITY"
+#~ msgstr "Nationality"
+
+#~ msgid "POLL_COMMENTS"
+#~ msgstr "Comments"
+
+#~ msgid "POLL_COMMENTS_QUESTION"
+#~ msgstr ""
+#~ "Please suggest ways that BOINC, and the projects that use it, could be "
+#~ "improved:"
+
+#~ msgid "POLL_OTHER"
+#~ msgstr "Other:"
+
+#~ msgid "POLL_CHECK_ALL"
+#~ msgstr "[check all that apply]"
+
+#~ msgid "POLL_DONE"
+#~ msgstr "When done click:"
+
+#~ msgid "POLL_CURRENT"
+#~ msgstr "Yes - I have been running BOINC on my computer for..."
+
+#~ msgid "POLL_TWEEK"
+#~ msgstr "less than a week"
+
+#~ msgid "POLL_TMONTH"
+#~ msgstr "less than a month"
+
+#~ msgid "POLL_TYEAR"
+#~ msgstr "less than a year"
+
+#~ msgid "POLL_TMOREYEAR"
+#~ msgstr "more than a year"
+
+#~ msgid "POLL_LAPSED"
+#~ msgstr "No - I was running BOINC, but stopped because..."
+
+#~ msgid "POLL_LINTEREST"
+#~ msgstr "I lost interest"
+
+#~ msgid "POLL_LCOMPLICATED"
+#~ msgstr "it was too complicated"
+
+#~ msgid "POLL_LSTOPPED"
+#~ msgstr "I stopped it and forgot to start again"
+
+#~ msgid "POLL_LPROBLEMS"
+#~ msgstr "it caused problems on my computer"
+
+#~ msgid "POLL_LPOWER"
+#~ msgstr "it used too much electricity"
+
+#~ msgid "POLL_LNONBOINC"
+#~ msgstr "I switched to a non-BOINC computing project"
+
+#~ msgid "POLL_FAILED"
+#~ msgstr "No - I tried running BOINC, but..."
+
+#~ msgid "POLL_FINSTALL"
+#~ msgstr "the software didn't install correctly"
+
+#~ msgid "POLL_FFIGURE"
+#~ msgstr "I couldn't figure out how to use the software"
+
+#~ msgid "POLL_FNETWORK"
+#~ msgstr "I had network communication problems"
+
+#~ msgid "POLL_FATTACH"
+#~ msgstr "I couldn't attach to a project"
+
+#~ msgid "POLL_FWORK"
+#~ msgstr "I attached to a project, but never got any work"
+
+#~ msgid "POLL_NEVER"
+#~ msgstr "No - I never tried running BOINC, because..."
+
+#~ msgid "POLL_NSECURITY"
+#~ msgstr "I was concerned about security"
+
+#~ msgid "POLL_NPROJECT"
+#~ msgstr "I wasn't interested in any of the projects"
+
+#~ msgid "POLL_NPERMISSION"
+#~ msgstr "I don't have permission to run it on my computer"
+
+#~ msgid "POLL_NVERSION"
+#~ msgstr "No version was available for my computer"
+
+#~ msgid "POLL_KIND"
+#~ msgstr "What kind of computers do you have running BOINC?"
+
+#~ msgid "POLL_WHERE"
+#~ msgstr "Where are they?"
+
+#~ msgid "POLL_WORK"
+#~ msgstr "Work"
+
+#~ msgid "POLL_SCHOOL"
+#~ msgstr "School"
+
+#~ msgid "POLL_HOW_MANY"
+#~ msgstr "How many computers?"
+
+#~ msgid "POLL_TURNED_ON"
+#~ msgstr "On average, how many hours per day are they powered on?"
+
+#~ msgid "POLL_AGE"
+#~ msgstr "Age"
+
+#~ msgid "POLL_SEX"
+#~ msgstr "Sex"
+
+#~ msgid "POLL_MALE"
+#~ msgstr "Male"
+
+#~ msgid "POLL_FEMALE"
+#~ msgstr "Female"
+
+#~ msgid "POLL_EXPERTISE"
+#~ msgstr "Your level of computer expertise"
+
+#~ msgid "POLL_LEVB"
+#~ msgstr "Beginner"
+
+#~ msgid "POLL_LEVI"
+#~ msgstr "Intermediate"
+
+#~ msgid "POLL_LEVA"
+#~ msgstr "Advanced"
+
+#~ msgid "POLL_LEARN_WHERE"
+#~ msgstr "Where did you learn about BOINC projects?"
+
+#~ msgid "POLL_WTV"
+#~ msgstr "TV/radio/newspaper"
+
+#~ msgid "POLL_WPERS"
+#~ msgstr "From friends, relatives, or coworkers"
+
+#~ msgid "POLL_WTEAM"
+#~ msgstr "Team message boards or web sites"
+
+#~ msgid "POLL_WBOINC"
+#~ msgstr "The BOINC web site"
+
+#~ msgid "POLL_WWEB"
+#~ msgstr "Other web sites"
+
+#~ msgid "POLL_FACTOR"
+#~ msgstr ""
+#~ "Which are the most important factors when you decide whether to "
+#~ "participate in a BOINC project?"
+
+#~ msgid "POLL_GRAPHICS"
+#~ msgstr "Nice-looking screensaver graphics"
+
+#~ msgid "POLL_CREDIT_FAIR"
+#~ msgstr "Fair and quick granting of credit for work done"
+
+#~ msgid "POLL_CREDIT_MORE"
+#~ msgstr "Getting more credit from this project than from others"
+
+#~ msgid "POLL_MB_FRIENDLY"
+#~ msgstr "Helpful and friendly message boards"
+
+#~ msgid "POLL_MB_STAFF"
+#~ msgstr "Participation by project staff on the message boards"
+
+#~ msgid "POLL_WEB_SITE"
+#~ msgstr "Informative project web site"
+
+#~ msgid "POLL_SCIENCE_IMPORTANT"
+#~ msgstr "The science is important and beneficial"
+
+#~ msgid "POLL_SCIENCE_PUBLIC"
+#~ msgstr "Non-profit, and results are public"
+
+#~ msgid "POLL_RECOGNIZE"
+#~ msgstr "Personal recognition if my computer finds something"
+
+#~ msgid "POLL_PUBLISH"
+#~ msgstr "Publication by the project in scientific journals"
+
+#~ msgid "POLL_EMAIL"
+#~ msgstr "Periodic email newsletters from the project"
+
+#~ msgid "POLL_NPROJECTS"
+#~ msgstr "How many BOINC projects do you participate in?"
+
+#~ msgid "POLL_SSAVER"
+#~ msgstr "Do you run BOINC as a screensaver?"
+
+#~ msgid "POLL_YES"
+#~ msgstr "Yes"
+
+#~ msgid "POLL_NO"
+#~ msgstr "No"
+
+#~ msgid "POLL_MBOARDS"
+#~ msgstr "Your usage of project messages boards:"
+
+#~ msgid "POLL_MBR"
+#~ msgstr "to read information"
+
+#~ msgid "POLL_MBRW"
+#~ msgstr "to read and post information"
+
+#~ msgid "POLL_NONE"
+#~ msgstr "None"
+
+#~ msgid "POLL_HELP"
+#~ msgstr ""
+#~ "Where do you get information to help resolve problems with BOINC and/or "
+#~ "BOINC projects?"
+
+#~ msgid "POLL_HELP_PMB"
+#~ msgstr "The project message boards"
+
+#~ msgid "POLL_HELP_BMB"
+#~ msgstr "The BOINC message boards"
+
+#~ msgid "POLL_HELP_BDOC"
+#~ msgstr "The BOINC web site"
+
+#~ msgid "POLL_HELP_BMLIST"
+#~ msgstr "BOINC mailing lists"
+
+#~ msgid "POLL_HELP_WIKI"
+#~ msgstr "The Unofficial BOINC Wiki"
+
+#~ msgid "POLL_HELP_TEAM"
+#~ msgstr "Team web sites"
+
+#~ msgid "POLL_HELP_GOOGLE"
+#~ msgstr "Google or other search engines"
+
+#~ msgid "POLL_ERROR_TITLE"
+#~ msgstr "Error - results not recorded"
+
+#~ msgid "POLL_ERROR_TEXT"
+#~ msgstr ""
+#~ "An internal error has prevented us from recording your survey response.  "
+#~ "Please try again later."
+
+#~ msgid "POLL_RECORDED"
+#~ msgstr "Survey response recorded"
+
+#~ msgid "POLL_THANKS"
+#~ msgstr "Thank you for completing the BOINC user survey."
+
+#~ msgid "POLL_RESULTS_TITLE"
+#~ msgstr "Survey results"
+
+#~ msgid "POLL_RESULTS_TEXT"
+#~ msgstr ""
+#~ "These are the current results of the <a href=poll.php>BOINC user survey</"
+#~ "a>.  This page is updated every hour."
+
+# #############################################
+# help.php
+# #############################################
+#~ msgid "HELP_TITLE"
+#~ msgstr "Getting help with BOINC"
+
+#~ msgid "HELP_HEADING1"
+#~ msgstr "Online Help"
+
+#~ msgid "HELP_P1_1"
+#~ msgstr ""
+#~ "BOINC Online Help lets you talk one-on-one with experienced BOINC users, "
+#~ "who can: %s answer questions about BOINC and volunteer computing; %s walk "
+#~ "you through the process of installing and using BOINC; %s troubleshoot "
+#~ "any problems you might have. "
+
+#~ msgid "HELP_P1_2"
+#~ msgstr ""
+#~ "BOINC Online Help is based on %sSkype%s, an Internet-based telephone "
+#~ "system. 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. "
+
+#~ msgid "HELP_P1_3"
+#~ msgstr ""
+#~ "The best way to get help is by voice, for which you need either built-in "
+#~ "microphone and speakers or an external headset for your computer. You can "
+#~ "also use Skype's text-based chat system or regular email (if you don't "
+#~ "have Skype) to communicate with Help Volunteers."
+
+#~ msgid "HELP_P1_4"
+#~ msgstr ""
+#~ "Volunteers speaking several languages are available. Please select a "
+#~ "language: "
+
+#~ msgid "HELP_HEADING2"
+#~ msgstr "BOINC help on the web"
+
+#~ msgid "HELP_P2_ITEM1"
+#~ msgstr "BOINC user's manual"
+
+#~ msgid "HELP_P2_ITEM2"
+#~ msgstr "Troubleshooting BOINC "
+
+#~ msgid "HELP_P2_ITEM3"
+#~ msgstr "BOINC-related web sites "
+
+#~ msgid "HELP_P2_ITEM4"
+#~ msgstr "The BOINC message boards "
+
+#~ msgid "HELP_P2_ITEM5"
+#~ msgstr "The message boards on any BOINC-based project "
+
+#~ msgid "HELP_HEADING3"
+#~ msgstr "Be a Help Volunteer"
+
+#~ msgid "HELP_P3_1"
+#~ msgstr ""
+#~ "If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+#~ "Volunteer%s. It's a great way to help the cause of scientific research "
+#~ "and volunteer computing - and it's fun!  "
+
+#~ msgid "HELP_P3_2"
+#~ msgstr ""
+#~ "If you're already a Help Volunteer: to edit your settings, %sclick here"
+#~ "%s. "
+
+# #############################################
+# index.php
+# #############################################
+#~ msgid "HOME_HEADING1"
+#~ msgstr "Volunteer"
+
+#~ msgid "HOME_P1"
+#~ msgstr ""
+#~ " Use the idle time on your computer  (Windows, Mac, or Linux)  to cure "
+#~ "diseases, study global warming,  discover pulsars, and do many other "
+#~ "types of scientific research.  It's safe, secure, and easy:  %sChoose%s "
+#~ "projects  %sDownload%s and run BOINC software  %sEnter%s an email address "
+#~ "and password. "
+
+#~ msgid "HOME_P2"
+#~ msgstr ""
+#~ "Or, if you run several projects, try an %saccount manager%s such as "
+#~ "%sGridRepublic%s or %sBAM!%s. "
+
+#~ msgid "HOME_P3"
+#~ msgstr ""
+#~ "If you have any questions, or need help getting started, you can %stalk "
+#~ "to a Volunteer Helper%s. "
+
+#~ msgid "HOME_DOWNLOAD"
+#~ msgstr "Download"
+
+#~ msgid "HOME_WEB_SITES"
+#~ msgstr "Web"
+
+#~ msgid "HOME_ADD_ONS"
+#~ msgstr "Add-ons"
+
+#~ msgid "HOME_SURVEY"
+#~ msgstr "Survey"
+
+#~ msgid "HOME_BOINC"
+#~ msgstr "Berkeley Open Infrastructure for Network Computing"
+
+#~ msgid "HOME_BOINC_DESC"
+#~ msgstr ""
+#~ "Open-source software for %svolunteer computing%s and %sgrid computing%s"
+
+# download.php 2006/08/03 by je2bwm
+# #######################################
+#~ msgid "DL_DOWNLOAD"
+#~ msgstr "Изтеглете BOINC"
+
+#~ msgid "DL_VERSION_LNAME_SIZE"
+#~ msgstr "%s за %s (%s MB)"
+
+#~ msgid "DL_WHATS_BOINC"
+#~ msgstr ""
+#~ " BOINC е програма, която Ви позволява да дарите        времето, през "
+#~ "което Вашият компюър не се използва, на научни проекти като        "
+#~ "SETI at home, Climateprediction.net, Rosetta at home,        World Community "
+#~ "Grid, и много други.        <p>        След инсталирането на BOINC на "
+#~ "Вашият компютър,        можете да участвате в толкова проекти, колкото "
+#~ "пожелаете.        <p>"
+
+#~ msgid "DL_SYSTEMREQ"
+#~ msgstr "Системни изисквания"
+
+#~ msgid "DL_RELNOTES"
+#~ msgstr "Информация за версията"
+
+#~ msgid "DL_OTHERSYS"
+#~ msgstr "Други системи"
+
+#~ msgid "DL_ALLVERSIONS"
+#~ msgstr "Всички версии"
+
+#~ msgid "DL_IF_OTHERTYPES"
+#~ msgstr "Ако компютърът Ви не е от един от горните типове, можете"
+
+#~ msgid "DL_MAKEYOUROWN"
+#~ msgstr "%s да си направите собствена версия на програмата %s или"
+
+#~ msgid "DL_DL_FROM3RDP"
+#~ msgstr ""
+#~ "%s да си изтеглите програмата от други сайтове %s (версия за Solaris/"
+#~ "Opteron, Linux/Opteron, Linux/PPC, HP-UX, и FreeBSD, и други)."
+
+#~ msgid "DL_DOWNLOAD_TITLE"
+#~ msgstr "BOINC: изчисление в името на науката"
+
+# #############################################
+# system_requirements.php by je2bwm 2006/08/07
+# #############################################
+#~ msgid "SRQ_PAGE_TITLE"
+#~ msgstr "Системни изисквания"
+
+#~ msgid "SRQ_INTRO"
+#~ msgstr ""
+#~ "Компютърът Ви трябва да покрива следните изисквания за да работи с BOINC. "
+#~ "BOINC-базираните проекти могат да имат допълнителни изисквания."
+
+#~ msgid "SRQ_MSWIN"
+#~ msgstr "Windows"
+
+#~ msgid "SRQ_OS"
+#~ msgstr "Операционна система"
+
+#~ msgid "SRQ_MSWIN_REQ_OS"
+#~ msgstr "Windows 98 или по-нов"
+
+#~ msgid "SRQ_MIN_HARDWARE"
+#~ msgstr "Минимален хардуер"
+
+#~ msgid "SRQ_MSWIN_REQ_CPU"
+#~ msgstr "Pentium 233 MHz (Препоръчително: Pentium 500 MHz или повече)"
+
+#~ msgid "SRQ_MSWIN_REQ_RAM"
+#~ msgstr "64 MB RAM (Препоръчително: 128 MB RAM или повече)"
+
+#~ msgid "SRQ_MSWIN_REQ_DISK"
+#~ msgstr "20 MB свободно дисково пространство"
+
+#~ msgid "SRQ_APPLMAC"
+#~ msgstr "Macintosh"
+
+#~ msgid "SRQ_APPLMAC_REQ_OS"
+#~ msgstr "Mac OS X 10.3 или по-нов"
+
+#~ msgid "SRQ_APPLMAC_REQ_CPU"
+#~ msgstr "Macintosh компютър с Intel x86or PowerPC G3, G4, или G5 процесор"
+
+#~ msgid "SRQ_APPLMAC_REQ_RAM"
+#~ msgstr "128 MB RAM (Препоръчително: 256 MB RAM или повече)"
+
+#~ msgid "SRQ_APPLMAC_REQ_DISK"
+#~ msgstr "200 MB свободно дисково прострамство"
+
+#~ msgid "SRQ_LINUX"
+#~ msgstr "Linux"
+
+#~ msgid "SRQ_LINUX_REQ_KERNEL"
+#~ msgstr "Linux kernel 2.2.14 или по-нов"
+
+#~ msgid "SRQ_LINUX_REQ_GLIBC"
+#~ msgstr "glibc 2.3.2 или по-нов"
+
+#~ msgid "SRQ_LINUX_REQ_XFREE86"
+#~ msgstr "XFree86-3.3.6 или по-нов"
+
+#~ msgid "SRQ_LINUX_REQ_GTKPLUS"
+#~ msgstr "gtk+2.0 или по-нов"
+
+#~ msgid "SRQ_LINUX_REQ_CPU"
+#~ msgstr "Pentium 500 MHz или повече"
+
+#~ msgid "SRQ_LINUX_REQ_RAM"
+#~ msgstr "64 MB RAM"
+
+#~ msgid "SRQ_LINUX_REQ_DISK"
+#~ msgstr "50 MB свободно дисково пространство"
+
+# #############################################
+# release notes by je2bwm 2006/08/09
+# #############################################
+#~ msgid "RLN_PAGE_TITLE"
+#~ msgstr "Информация за версията"
+
+#~ msgid "RLN_WHATS_NEW"
+#~ msgstr "Кое е новото в %s"
+
+#~ msgid "RLN_INSTALLING"
+#~ msgstr "Инсталиране"
+
+#~ msgid "RLN_UNINSTALLING"
+#~ msgstr "Деинсталиране"
+
+#~ msgid "RLN_KNOWN_ISSUES"
+#~ msgstr "Версиите до сега"
+
+#~ msgid "RLN_TROUBLESHOOT"
+#~ msgstr "Отстраняване на проблеми"
+
+#~ msgid "RLN_NEWF_5_4_AM"
+#~ msgstr ""
+#~ "Поддръжка на 'Мениджъри на акаунтите' - уеб-сайтове, които Ви позволяват "
+#~ "да разглеждате BOINC проектите, да се присъединявате или отписвате в/от "
+#~ "тях, променяте поделянето на ресурсите и настройките, и всичко това става "
+#~ "за секунди бързо и лесно. Мениджърите на акаунтите вършат прекрасна "
+#~ "работа и ако имате няколко компютъра - трябва да направите настройките "
+#~ "само веднъж."
+
+#~ msgid "RLN_NEWF_5_4_PREF_OVERRIDE"
+#~ msgstr ""
+#~ "Общите предпочитания (настройки) могат да бъдат отменени от такива от "
+#~ "локален файл; подробностите за това са  %s тук %s."
+
+#~ msgid "RLN_NEWF_5_4_ALERTS_CONNECT"
+#~ msgstr ""
+#~ "BOINC вече може да Ви предупреждава когато има нужда да създадете мрежова "
+#~ "връзка."
+
+#~ msgid "RLN_RECOMMEND_LATEST_VERSION"
+#~ msgstr "Препоръчваме на всички BOINC потребители да използват %s."
+
+#~ msgid "RLN_LINK2_VERSION_HISTORY"
+#~ msgstr "Подробен списък на версиите има %s тук %s."
+
+#~ msgid "RLN_MSWIN"
+#~ msgstr "Windows"
+
+#~ msgid "RLN_APPLMAC"
+#~ msgstr "Macintosh"
+
+#~ msgid "RLN_LINUX"
+#~ msgstr "Linux"
+
+#~ msgid "RLN_MSWIN_INSTALL_MODES"
+#~ msgstr "BOINC може да бъде инсталиран в някои от следните режими:"
+
+#~ msgid "RLN_SINGLE_USER_INSTALL"
+#~ msgstr "Инсталация за определен потребител"
+
+#~ msgid "RLN_MSWIN_INSTALL_SINGLE_USER_DESC"
+#~ msgstr ""
+#~ "Това е препоръчителния режим. BOINC работи докато Вие (инсталиращият "
+#~ "потребител) сте логнати в системата. BOINC се показва във Вашето Start "
+#~ "меню, но не и в менюто на останалите потребители на компютъра. Командата "
+#~ "'Show graphics' на BOINC работи само за Вас. BOINC скриин-сеивъра показва "
+#~ "графиките от програмата само за Вас (останалите потребители могат да "
+#~ "стартират скриин-сеивъра, но ще виждат  само текстова информация)."
+
+#~ msgid "RLN_SHARED_INSTALL"
+#~ msgstr "Споделена инсталация"
+
+#~ msgid "RLN_MSWIN_INSTALL_SHARED_DESC"
+#~ msgstr ""
+#~ "BOINC работи докато които и да е потребител е логнат в системата. BOINC "
+#~ "се показва в Start менюто на всички потребители. Докато BOINC работи, "
+#~ "това е за определен потребител (или първият логнат, или първия, стартирал "
+#~ "BOINC). Командата 'Show graphics' на BOINC работи само за този "
+#~ "потребител.  BOINC скриин-сеивъра показва графиките от програмата само за "
+#~ "този потребител (останалите потребители могат да стартират скриин-"
+#~ "сеивъра, но ще виждат само текстова информация)."
+
+#~ msgid "RLN_WIN_SERVICE_INSTALL"
+#~ msgstr "Инсталиране като услуга"
+
+#~ msgid "RLN_MSWIN_INSTALL_WINSERVICE_DESC"
+#~ msgstr ""
+#~ "BOINC работи през цялото време (дори никой да не е логнат). BOINC се "
+#~ "показва в Start менюто на инсталиралия програмата потребител, но не и на "
+#~ "останалите потребители.  Командата 'Show graphics' на BOINC мениджъра "
+#~ "няма да работи за никои потребител. BOINC скриин-сеивъра ще показва само "
+#~ "текстова информация."
+
+#~ msgid "RLN_LINUX_INSTALL_SEA_DESC"
+#~ msgstr ""
+#~ "Версията на BOINC за Linux се разпространява като саморазархивиращ се "
+#~ "архив. Този тип инсталация изисква да сте добре запознати с конзолните "
+#~ "команди на UNIX."
+
+#~ msgid "RLN_LINUX_DL_FILENAME"
+#~ msgstr "Файловете за сваляне имат имена, подобни на <code>%s</code>."
+
+#~ msgid "RLN_LINUX_RUN_SEA"
+#~ msgstr "След изтеглянето на файла, напишете <pre>%s</pre>"
+
+#~ msgid "RLN_LINUX_RESULTOF_SEA"
+#~ msgstr "Това ще създаде директория BOINC/ със следните файлове:"
+
+#~ msgid "RLN_BOINC_CORE_CL"
+#~ msgstr "Ядрото на BOINC клиента"
+
+#~ msgid "RLN_BOINC_MANAGER"
+#~ msgstr "BOINC мениджъра"
+
+#~ msgid "RLN_SCRIPT_RUN_CLIENT_DESC"
+#~ msgstr "Скрипт, който стартира BOINC клиента."
+
+#~ msgid "RLN_SCRIPT_RUN_MANAGER_DESC"
+#~ msgstr "Скрипт, който стартира BOINC мениджъра."
+
+#~ msgid "RLN_LINUX_AUTOSTART"
+#~ msgstr ""
+#~ "Може да искате да%s стартирате BOINC клиента автоматично %sпри зареждане "
+#~ "на операционната система."
+
+#~ msgid "RLN_MSWIN_UNINSTALL_DESC"
+#~ msgstr ""
+#~ "От меню Start, изберете Programs / BOINC / Uninstall. Или от меню Start, "
+#~ "изберете Settings / Add or remove programs."
+
+#~ msgid "RLN_ISSUE_PROXY_NTLMAUTH"
+#~ msgstr ""
+#~ "Ако използвате прокси сървър, при ъпдейт моля имайте в предвид, че в "
+#~ "момента разработваме подобрение за прокси сървъри, които използват NTLM "
+#~ "удостоверяване."
+
+#~ msgid "RLN_ISSUE_MSWIN_LATEST_DIRECTX"
+#~ msgstr ""
+#~ "Ако BOINC приложенията постоянно забиват на Вашия компютър, вероятно "
+#~ "имате нужда да инсталирате %sпоследната версия на DirectX %s."
+
+#~ msgid "RLN_ISSUE_MSWIN_SCREENSAVER_XP3D"
+#~ msgstr ""
+#~ "Ако BOINC работи едновременно със 3-D скриин-сеивърите на Windows XP, "
+#~ "компютърът ви може да стане по-бавен, тромав и неотзивчив."
+
+#~ msgid "RLN_ISSUE_MSWIN_NO_SCREENSAVER"
+#~ msgstr ""
+#~ "Програмите, създадени преди Октомври 2004 не показват графики на скриин-"
+#~ "сеивъра при инсталиране като услуга или споделена инсталация, или "
+#~ "инсталация за един потребител, ако е зададена парола на скриин-сеивъра "
+#~ "при NT-базирани машини."
+
+#~ msgid "RLN_TROUBLESHOOT_INTRO"
+#~ msgstr ""
+#~ "Ако имате проблеми с BOINC, ето няколко неща, които можете да "
+#~ "предприемете:"
+
+#~ msgid "RLN_TROUBLESHOOT_PRJ_SPECIFIC"
+#~ msgstr ""
+#~ "Ако проблема е с точно определен проект, отидете на раздела 'Въпроси и "
+#~ "Отговори' на уеб-саита на проекта. Там може да намерите решение на "
+#~ "проблема си. Ако не намерите, опиешете проблема си там, и ще получите "
+#~ "помощ от останалите потребители."
+
+#~ msgid "RLN_TROUBLESHOOT_PROBLEM_PERSIST"
+#~ msgstr ""
+#~ "Ако проблема с определения проект продължава да съществува, използвайте "
+#~ "BOINC мениджъра за да 'рестартирате' проекта. Това изтрива всичката "
+#~ "текуща работа и започва от начало."
+
+#~ msgid "RLN_TROUBLESHOOT_BOINC_ITSELF"
+#~ msgstr ""
+#~ "Ако имате проблеми със самият BOINC, можете да получите помощ от %s "
+#~ "форумите на BOINC %s."
diff --git a/locale/ca/BOINC-Client.mo b/locale/ca/BOINC-Client.mo
index df0ec01..d524c24 100644
Binary files a/locale/ca/BOINC-Client.mo and b/locale/ca/BOINC-Client.mo differ
diff --git a/locale/ca/BOINC-Client.po b/locale/ca/BOINC-Client.po
old mode 100755
new mode 100644
index 9503e3e..305b254
--- a/locale/ca/BOINC-Client.po
+++ b/locale/ca/BOINC-Client.po
@@ -1,21 +1,21 @@
 # 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: 2013-10-15 22:25-0700\n"
-"PO-Revision-Date: 2013-08-08 23:19+0200\n"
-"Last-Translator: Xavier <xavi.mormur at gmail.com>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: ca\n"
+"PO-Revision-Date: 2015-02-08 18:27+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\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"
-"X-Generator: Pootle 2.1.6\n"
 
 #: acct_mgr.cpp:450 acct_mgr.cpp:459
 msgid "Message from account manager"
@@ -29,15 +29,11 @@ msgstr "Missatge del servidor"
 msgid ""
 "Some tasks need more memory than allowed by your preferences.  Please check "
 "the preferences."
-msgstr ""
-"Algunes tasques necessiten més memòria de la permesa a les seves "
-"preferències.  Si us plau, reviseu les preferències."
+msgstr "Algunes tasques necessiten més memòria de la permesa a les seves preferències.  Si us plau, reviseu les preferències."
 
 #: client_state.cpp:520
 msgid "Couldn't write state file; check directory permissions"
-msgstr ""
-"No s'ha pogut escriure el fitxer d'estat, comproveu els permisos del "
-"directori"
+msgstr "No s'ha pogut escriure el fitxer d'estat, comproveu els permisos del directori"
 
 #: cs_cmdline.cpp:303
 msgid "The HTTP_PROXY environment variable must specify an HTTP proxy"
@@ -48,9 +44,7 @@ msgstr "La variable d'entorn HTTP_PROXY ha d'especificar un proxy HTTP"
 msgid ""
 "You used the wrong URL for this project.  When convenient, remove this "
 "project, then add %s"
-msgstr ""
-"Heu utilitzat una URL equivocada per a aquest projecte.  Quan sigui "
-"possible, elimineu aquest projecte, a continuació afegiu %s"
+msgstr "Heu utilitzat una URL equivocada per a aquest projecte.  Quan sigui possible, elimineu aquest projecte, a continuació afegiu %s"
 
 #: cs_statefile.cpp:828 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
@@ -90,23 +84,17 @@ msgstr "Falta l'etiqueta final a cc_config.xml"
 
 #: ../sched/handle_request.cpp:307
 msgid "Invalid or missing account key.  To fix, remove and add this project."
-msgstr ""
-"Clau de compte no vàlida o no trobada.  Per solucionar-ho, deixi i torni a "
-"unir-se a aquest projecte."
+msgstr "Clau de compte no vàlida o no trobada.  Per solucionar-ho, deixi i torni a unir-se a aquest projecte."
 
 #: ../sched/handle_request.cpp:849
 msgid "Invalid code signing key.  To fix, remove and add this project."
-msgstr ""
-"Clau de compte no vàlida.  Per solucionar-ho, deixi i torni a unir-se a "
-"aquest projecte."
+msgstr "Clau de compte no vàlida.  Per solucionar-ho, deixi i torni a unir-se a aquest projecte."
 
 #: ../sched/handle_request.cpp:859
 msgid ""
 "The project has changed its security key.  Please remove and add this "
 "project."
-msgstr ""
-"El projecte ha canviat la seva clau de seguretat.  Elimineu i torneu a "
-"afegir aquest projecte."
+msgstr "El projecte ha canviat la seva clau de seguretat.  Elimineu i torneu a afegir aquest projecte."
 
 #: ../sched/handle_request.cpp:943
 msgid "This project doesn't support operating system"
@@ -126,30 +114,23 @@ msgid "This project doesn't support computers of type"
 msgstr "Aquest projecte no és compatible amb ordinadors del tipus"
 
 #: ../sched/sched_send.cpp:1092
-msgid "Upgrade to the latest driver to process tasks using your computer's GPU"
-msgstr ""
-"Actualitzeu a la darrera versió del controlador per processar tasques usant "
-"la GPU del vostre equip"
+msgid ""
+"Upgrade to the latest driver to process tasks using your computer's GPU"
+msgstr "Actualitzeu a la darrera versió del controlador per processar tasques usant la GPU del vostre equip"
 
 #: ../sched/sched_send.cpp:1099
 msgid ""
 "Upgrade to the latest driver to use all of this project's GPU applications"
-msgstr ""
-"Actualitzeu a la darrera versió del controlador per usar totes les "
-"aplicacions GPU d'aquest projecte"
+msgstr "Actualitzeu a la darrera versió del controlador per usar totes les aplicacions GPU d'aquest projecte"
 
 #: ../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 ""
-"Una versió més nova de BOINC és necessaria per a usar la GPU NVIDIA, si us "
-"plau actualitzi a la versió actual"
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to"
+" the current version"
+msgstr "Una versió més nova de BOINC és necessaria per a usar la GPU NVIDIA, si us plau actualitzi a la versió actual"
 
-# 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 "Es necessita una GPU %s per a executar tasques d'aquest projecte"
 
@@ -163,17 +144,13 @@ msgstr "El seu equip no és compatible amb aquest projecte"
 
 #: ../sched/sched_send.cpp:1294
 msgid "Newer BOINC version required; please install current version"
-msgstr ""
-"Es requereix una versió més actualitzada de BOINC; si us plau, instal·la "
-"versió actual"
+msgstr "Es requereix una versió més actualitzada de BOINC; si us plau, instal·la versió actual"
 
 #: ../sched/sched_send.cpp:1305
 #, c-format
 msgid ""
 "Tasks for %s are available, but your preferences are set to not accept them"
-msgstr ""
-"Hi ha feina per a %s, però les teves preferències estan configurades per no "
-"acceptar-ne"
+msgstr "Hi ha feina per a %s, però les teves preferències estan configurades per no acceptar-ne"
 
 #: ../sched/sched_types.cpp:254
 msgid "Unknown app name in app_info.xml"
@@ -182,71 +159,3 @@ msgstr "Nom d'aplicació desconeguda a app_info.xml"
 #: ../sched/sched_version.cpp:214
 msgid "Your app_info.xml file doesn't have a usable version of"
 msgstr "El seu arxiu app_info.xml encara no té una versió usable del"
-
-#~ msgid "Download it."
-#~ msgstr "Descarregar-la."
-
-#~ msgid "An NVIDIA or ATI GPU is required to run tasks for this project"
-#~ msgstr ""
-#~ "Una GPU NVIDIA o ATI és necessaria per a executar tasques d'aquest projecte"
-
-#~ msgid "An NVIDIA GPU is required to run tasks for this project"
-#~ msgstr "Una GPU NVIDIA és necessaria per a executar tasques d'aquest projecte"
-
-#~ msgid "An ATI GPU is required to run tasks for this project"
-#~ msgstr "Una GPU ATI és necessaria per executar tasques d'aquest projecte"
-
-#~ msgid ""
-#~ "Tasks for NVIDIA GPU are available, but your preferences are set to not "
-#~ "accept them"
-#~ msgstr ""
-#~ "Hi ha disponibles tasques per a la GPU NVIDIA, però les seves preferències "
-#~ "estan configurades per a no acceptar-les"
-
-#~ msgid ""
-#~ "Tasks for ATI GPU are available, but your preferences are set to not accept "
-#~ "them"
-#~ msgstr ""
-#~ "Hi ha disponibles tasques per a la GPU ATI, però les seves preferències "
-#~ "estan configurades per a no acceptar-les"
-
-#~ msgid ""
-#~ "Tasks for CPU are available, but your preferences are set to not accept them"
-#~ msgstr ""
-#~ "Hi ha disponibles tasques per a la CPU, però les seves preferències estan "
-#~ "configurades per a no acceptar-les"
-
-#~ msgid "error"
-#~ msgstr "errada"
-
-#~ msgid "Can't resolve hostname in remote_hosts.cfg"
-#~ msgstr "No es troba el nom del host a remote_hosts.cfg"
-
-#~ msgid "is not available for"
-#~ msgstr "no està disponible per"
-
-#~ msgid "Notice from BOINC"
-#~ msgstr "Avís de BOINC"
-
-#~ msgid "Message from"
-#~ msgstr "Missatge de"
-
-#~ msgid ""
-#~ "You may have an outdated code signing key.  Try attaching and reattaching "
-#~ "this project."
-#~ msgstr ""
-#~ "Poder vostè té una clau de signatura obsoleta.  Provi a unir-se i tornar "
-#~ "a instal·lar aquest projecte."
-
-#~ msgid "XML syntax error in"
-#~ msgstr "Error de sintaxi XML a"
-
-#~ msgid "Unparsed tag in"
-#~ msgstr "Etiqueta sense analitzar en"
-
-#~ msgid ""
-#~ "Your preference for network connection interval is too high for this "
-#~ "project"
-#~ msgstr ""
-#~ "La seva preferència per l'interval de connexió a la xarxa és massa alt "
-#~ "per a aquest projecte"
diff --git a/locale/ca/BOINC-Manager.mo b/locale/ca/BOINC-Manager.mo
index b7910ac..0dd9de9 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 698ad6b..53dbadf 100644
--- a/locale/ca/BOINC-Manager.po
+++ b/locale/ca/BOINC-Manager.po
@@ -1,65 +1,53 @@
 # 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:
+# amontero <amontero at tinet.org>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC Manager 6.x\n"
+"Project-Id-Version: boinc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-15 14:15-0500\n"
-"PO-Revision-Date: 2014-12-18 08:47+0000\n"
-"Last-Translator: Xavier <xavi.mormur at gmail.com>\n"
-"Language-Team: BOINC Development Team <boinc_loc at ssl.berkeley.edu>\n"
-"Language: ca\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"
+"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"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc_7.4\n"
-"X-Poedit-SearchPath-0: clientgui\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1418892440.0\n"
-"X-Poedit-SearchPath-1: clientgui/msw\n"
-"X-Poedit-SearchPath-2: clientgui/gtk\n"
-"X-Poedit-SearchPath-3: clientgui/mac\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-
-# 81%
-#: clientgui/AccountInfoPage.cpp:387
+
+#: AccountInfoPage.cpp:387
 #, c-format
 msgid "Identify your account at %s"
 msgstr "Identifiqui el seu compte a %s"
 
-#: clientgui/AccountInfoPage.cpp:393
+#: AccountInfoPage.cpp:393
 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)"
+msgstr "Si us plau, entri la informació del seu compte\n(per crear un compte, visiti la pàgina web del projecte)"
 
-#: clientgui/AccountInfoPage.cpp:397
+#: AccountInfoPage.cpp:397
 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 aquest moments no accepta nous comptes.\n"
-"El pot afegir només si ja disposa d'un compte."
+msgstr "Aquest projecte en aquests moments no accepta nous comptes.\nEl pot afegir només si ja disposa d'un compte."
 
-#: clientgui/AccountInfoPage.cpp:401
+#: AccountInfoPage.cpp:401
 msgid "Are you already running this project?"
 msgstr "Està executant ja aquest projecte?"
 
-#: clientgui/AccountInfoPage.cpp:405
+#: AccountInfoPage.cpp:405
 msgid "&No, new user"
 msgstr "&No, usuari nou"
 
-#: clientgui/AccountInfoPage.cpp:408
+#: AccountInfoPage.cpp:408
 msgid "&Yes, existing user"
-msgstr "&Si, usuari ja existent"
+msgstr "&Sí, usuari ja existent"
 
-#: clientgui/AccountInfoPage.cpp:413
+#: AccountInfoPage.cpp:413
 msgid ""
 "We were not able to set up your account information\n"
 "automatically.\n"
@@ -67,507 +55,469 @@ msgid ""
 "Please click on the 'Find login information' link\n"
 "below to find out what to put in the email address and\n"
 "password fields."
-msgstr ""
-"No podem actualitzar automàticament la informació\n"
-"del seu compte.\n"
-"\n"
-"Si us plau premi l'accés 'Obtenir informació d'inici de sessió'\n"
-"per saber el que ha de posar en els camps adreça de correu i\n"
-"contrasenya."
+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."
 
-#: clientgui/AccountInfoPage.cpp:416
+#: AccountInfoPage.cpp:416
 msgid "Find login information"
 msgstr "Obtenir informació d'inici de sessió"
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:649
+#: AccountInfoPage.cpp:436 AccountInfoPage.cpp:641
 msgid "&Password:"
 msgstr "&Contrasenya:"
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:673
+#: AccountInfoPage.cpp:443 AccountInfoPage.cpp:665
 msgid "Choose a &password:"
 msgstr "Escolleixi una &contrasenya:"
 
-#: clientgui/AccountInfoPage.cpp:446
+#: AccountInfoPage.cpp:446
 msgid "C&onfirm password:"
 msgstr "C&onfirmi la contrasenya:"
 
-#: clientgui/AccountInfoPage.cpp:453
+#: AccountInfoPage.cpp:453
 #, c-format
 msgid "Are you already running %s?"
 msgstr "Ja està executant %s?"
 
-#: clientgui/AccountInfoPage.cpp:482
+#: AccountInfoPage.cpp:482
 msgid "&Username:"
 msgstr "Nom de l'&usuari:"
 
-#: clientgui/AccountInfoPage.cpp:511
-msgid "&Email address or LDAP ID:"
-msgstr "Adreça d'&Email o LDAP ID:"
-
-#: clientgui/AccountInfoPage.cpp:515
+#: AccountInfoPage.cpp:508
 msgid "&Email address:"
 msgstr "&Adreça de correu:"
 
-#: clientgui/AccountInfoPage.cpp:523
+#: AccountInfoPage.cpp:515
 #, c-format
 msgid "minimum length %d"
 msgstr "longitud mínima %d"
 
-#: clientgui/AccountInfoPage.cpp:530
+#: AccountInfoPage.cpp:522
 msgid "Forgot your password?"
 msgstr "Ha oblidat la contrasenya?"
 
-#: clientgui/AccountInfoPage.cpp:537
+#: AccountInfoPage.cpp:529
 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,\n"
-"si us plau faci-ho abans de continuar.  Premi el següent accés per\n"
-"registrar-se o recuperar la contrasenya que ha oblidat."
+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."
 
-#: clientgui/AccountInfoPage.cpp:540
+#: AccountInfoPage.cpp:532
 msgid "Account manager web site"
 msgstr "Pàgina web de l'administrador de comptes"
 
-#: clientgui/AccountInfoPage.cpp:582
+#: AccountInfoPage.cpp:574 WelcomePage.cpp:348
 msgid "Add project"
 msgstr "Afegir un projecte"
 
-#: clientgui/AccountInfoPage.cpp:584
+#: AccountInfoPage.cpp:576
 msgid "Update account manager"
 msgstr "Actualitzar el administrador de comptes"
 
-#: clientgui/AccountInfoPage.cpp:586
+#: AccountInfoPage.cpp:578 WelcomePage.cpp:307 WelcomePage.cpp:321
 msgid "Use account manager"
 msgstr "Utilitzar l'administrador de comptes"
 
-#: clientgui/AccountInfoPage.cpp:593
+#: AccountInfoPage.cpp:585
 msgid "Please enter a user name."
 msgstr "Si us plau introdueix un nom."
 
-#: clientgui/AccountInfoPage.cpp:595
+#: AccountInfoPage.cpp:587
 msgid "Please enter an email address."
 msgstr "Si us plau entra un compte de correu."
 
-#: clientgui/AccountInfoPage.cpp:605
+#: AccountInfoPage.cpp:597
 #, c-format
 msgid "Please enter a password of at least %d characters."
-msgstr "Si us plau introdueix una contrasenya d'almenys %d caràcters."
+msgstr "Si us plau, introdueix una contrasenya d'almenys %d caràcters."
 
-#: clientgui/AccountInfoPage.cpp:615
-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."
+#: AccountInfoPage.cpp:607
+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."
 
-#: clientgui/AccountManagerInfoPage.cpp:272
+#: AccountManagerInfoPage.cpp:272
 msgid "Choose an account manager"
 msgstr "Esculli un administrador de comptes"
 
-#: clientgui/AccountManagerInfoPage.cpp:275
+#: AccountManagerInfoPage.cpp:275
 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 \n"
-"introdueixi la seva URL a continuació."
+msgstr "Per escollir un administrador de comptes, premi el seu nom o \nintrodueixi la seva URL a continuació."
 
-#: clientgui/AccountManagerInfoPage.cpp:279
+#: AccountManagerInfoPage.cpp:279
 msgid "Account manager details:"
 msgstr "Informació de l'administrador de comptes"
 
-#: clientgui/AccountManagerInfoPage.cpp:283
+#: AccountManagerInfoPage.cpp:283
 msgid "Account manager &URL:"
 msgstr "&URL del Administrador de Comptes:"
 
-#: clientgui/AccountManagerInfoPage.cpp:287
+#: AccountManagerInfoPage.cpp:287
 msgid "Open web page"
 msgstr "Pàgina web oberta"
 
-#: clientgui/AccountManagerInfoPage.cpp:290
+#: AccountManagerInfoPage.cpp:290
 msgid "Visit this account manager's web site"
 msgstr "Visita la pàgina web d'aquest administrador de comptes"
 
-#: clientgui/AccountManagerProcessingPage.cpp:186
-#: clientgui/AccountManagerPropertiesPage.cpp:192
+#: AccountManagerProcessingPage.cpp:187 AccountManagerPropertiesPage.cpp:193
 #, c-format
 msgid "Communicating with %s."
 msgstr "Establint comunicació amb %s."
 
-#: clientgui/AccountManagerProcessingPage.cpp:193
-#: clientgui/AccountManagerPropertiesPage.cpp:199
+#: AccountManagerProcessingPage.cpp:194 AccountManagerPropertiesPage.cpp:200
 msgid "Communicating with server."
 msgstr "Establint comunicació amb el servidor."
 
-#: clientgui/AccountManagerProcessingPage.cpp:198
-#: clientgui/AccountManagerPropertiesPage.cpp:204
+#: AccountManagerProcessingPage.cpp:199 AccountManagerPropertiesPage.cpp:205
 msgid "Please wait..."
 msgstr "Si us plau, esperi..."
 
-#: clientgui/AccountManagerProcessingPage.cpp:325
+#: AccountManagerProcessingPage.cpp:326
 msgid "An internal server error has occurred.\n"
 msgstr "Ha ocorregut un error intern del servidor.\n"
 
-#: clientgui/AdvancedFrame.cpp:96
+#: AdvancedFrame.cpp:95
 msgid "Connected"
 msgstr "Connectat"
 
-#: clientgui/AdvancedFrame.cpp:104
+#: AdvancedFrame.cpp:103
 msgid "Disconnected"
 msgstr "Desconnectat"
 
-#: clientgui/AdvancedFrame.cpp:318
+#: AdvancedFrame.cpp:322 sg_BoincSimpleFrame.cpp:119
 #, c-format
 msgid "Close the %s window"
 msgstr "Tancar la finestra %s"
 
-#: clientgui/AdvancedFrame.cpp:321
+#: AdvancedFrame.cpp:325 sg_BoincSimpleFrame.cpp:122
 msgid "&Close Window"
 msgstr "Tan&car la Finestra"
 
-#: clientgui/AdvancedFrame.cpp:332
-#: clientgui/AdvancedFrame.cpp:339
-#: clientgui/AdvancedFrame.cpp:346
+#: AdvancedFrame.cpp:336 AdvancedFrame.cpp:343 AdvancedFrame.cpp:350
 #, c-format
 msgid "Exit %s"
 msgstr "Tancar %s"
 
-#: clientgui/AdvancedFrame.cpp:359
-msgid "Preferences..."
-msgstr "Preferències..."
-
-#: clientgui/AdvancedFrame.cpp:368
+#: AdvancedFrame.cpp:371
 msgid "&Notices\tCtrl+Shift+N"
 msgstr "&Notícies\tCtrl+Shift+N"
 
-#: clientgui/AdvancedFrame.cpp:369
+#: AdvancedFrame.cpp:372
 msgid "Display notices"
 msgstr "Mostra anuncis"
 
-#: clientgui/AdvancedFrame.cpp:374
+#: AdvancedFrame.cpp:377
 msgid "&Projects\tCtrl+Shift+P"
 msgstr "&Projectes\tCtrl+Shift+P"
 
-#: clientgui/AdvancedFrame.cpp:375
+#: AdvancedFrame.cpp:378
 msgid "Display projects"
 msgstr "Mostrar els projectes"
 
-#: clientgui/AdvancedFrame.cpp:380
+#: AdvancedFrame.cpp:383
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr "&Tasques\tCtrl+Shift+T"
 
-#: clientgui/AdvancedFrame.cpp:381
+#: AdvancedFrame.cpp:384
 msgid "Display tasks"
 msgstr "Mostrar les tasques"
 
-#: clientgui/AdvancedFrame.cpp:386
+#: AdvancedFrame.cpp:389
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr "&Lliuraments\tCtrl+Shift+X"
 
-#: clientgui/AdvancedFrame.cpp:387
+#: AdvancedFrame.cpp:390
 msgid "Display transfers"
 msgstr "Mostrar els lliuraments"
 
-#: clientgui/AdvancedFrame.cpp:392
+#: AdvancedFrame.cpp:395
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "&Estadístiques\tCtrl+Shift+S"
 
-#: clientgui/AdvancedFrame.cpp:393
+#: AdvancedFrame.cpp:396
 msgid "Display statistics"
 msgstr "Mostrar les estadístiques"
 
-#: clientgui/AdvancedFrame.cpp:398
+#: AdvancedFrame.cpp:401
 msgid "&Disk usage\tCtrl+Shift+D"
 msgstr "Utilització de &Disc\t Ctrl+Shift+D"
 
-#: clientgui/AdvancedFrame.cpp:399
+#: AdvancedFrame.cpp:402
 msgid "Display disk usage"
 msgstr "Mostrar la utilització de disc"
 
-#: clientgui/AdvancedFrame.cpp:406
+#: AdvancedFrame.cpp:409
 msgid "Simple &View...\tCtrl+Shift+V"
-msgstr "&Vista Senzilla...\t Ctrl+Shift+V"
+msgstr "&Vista senzilla...\t Ctrl+Shift+V"
 
-#: clientgui/AdvancedFrame.cpp:407
+#: AdvancedFrame.cpp:410
 msgid "Display the simple graphical interface."
 msgstr "Mostrar la interfície gràfica senzilla."
 
-#: clientgui/AdvancedFrame.cpp:421
+#: AdvancedFrame.cpp:424
 msgid "&Add project or account manager..."
 msgstr "&Afegir un projecte o un administrador de comptes..."
 
-#: clientgui/AdvancedFrame.cpp:422
+#: 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"
+msgstr "Voluntariat per a tots o algun dels més de 30 projectes en moltes àrees de la ciència"
 
-#: clientgui/AdvancedFrame.cpp:426
+#: AdvancedFrame.cpp:429
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "&Sincronitzar amb %s"
 
-#: clientgui/AdvancedFrame.cpp:430
+#: AdvancedFrame.cpp:433
 #, c-format
 msgid "Get current settings from %s"
 msgstr "Obtenir la configuració actual des de %s"
 
-#: clientgui/AdvancedFrame.cpp:440
+#: AdvancedFrame.cpp:443
 msgid "&Add project..."
 msgstr "&Afegir el projecte..."
 
-#: clientgui/AdvancedFrame.cpp:441
+#: AdvancedFrame.cpp:444
 msgid "Add a project"
 msgstr "Afegir un projecte"
 
-#: clientgui/AdvancedFrame.cpp:444
+#: AdvancedFrame.cpp:447
 #, c-format
 msgid "S&top using %s..."
 msgstr "A&turar la utilització de %s..."
 
-#: clientgui/AdvancedFrame.cpp:450
+#: AdvancedFrame.cpp:453
 msgid "Remove this computer from account manager control."
 msgstr "Eliminar aquest ordinador del administrador de comptes."
 
-#: clientgui/AdvancedFrame.cpp:455
+#: AdvancedFrame.cpp:458 sg_BoincSimpleFrame.cpp:178
 msgid "&Options..."
 msgstr "&Opcions..."
 
-#: clientgui/AdvancedFrame.cpp:456
+#: 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:460
+#: AdvancedFrame.cpp:463 sg_BoincSimpleFrame.cpp:172
 msgid "Computing &preferences..."
 msgstr "&Preferències de computació..."
 
-#: clientgui/AdvancedFrame.cpp:461
+#: AdvancedFrame.cpp:464 sg_BoincSimpleFrame.cpp:173
 msgid "Configure computing preferences"
 msgstr "Configurar les preferències de computació"
 
-#: clientgui/AdvancedFrame.cpp:469
+#: AdvancedFrame.cpp:472
 msgid "&Run always"
 msgstr "Executar &sempre"
 
-#: clientgui/AdvancedFrame.cpp:470
+#: AdvancedFrame.cpp:473
 msgid "Allow work regardless of preferences"
 msgstr "Permetre treballs tot i les preferències"
 
-#: clientgui/AdvancedFrame.cpp:474
+#: AdvancedFrame.cpp:477
 msgid "Run based on &preferences"
 msgstr "Executar segons les &preferències"
 
-#: clientgui/AdvancedFrame.cpp:475
+#: AdvancedFrame.cpp:478
 msgid "Allow work according to preferences"
 msgstr "Permetre treballs d'acord a les preferències"
 
-#: clientgui/AdvancedFrame.cpp:479
+#: AdvancedFrame.cpp:482
 msgid "&Suspend"
 msgstr "&Suspendre"
 
-#: clientgui/AdvancedFrame.cpp:480
+#: AdvancedFrame.cpp:483
 msgid "Stop work regardless of preferences"
 msgstr "Aturar les tasques tot i les preferències"
 
-#: clientgui/AdvancedFrame.cpp:505
+#: AdvancedFrame.cpp:508
 msgid "Use GPU always"
 msgstr "Utilitzeu sempre la GPU"
 
-#: clientgui/AdvancedFrame.cpp:506
+#: AdvancedFrame.cpp:509
 msgid "Allow GPU work regardless of preferences"
 msgstr "Permetre treballar la GPU tot i les preferències"
 
-#: clientgui/AdvancedFrame.cpp:510
+#: AdvancedFrame.cpp:513
 msgid "Use GPU based on preferences"
 msgstr "Utilitzar la GPU basant-se en les preferències"
 
-#: clientgui/AdvancedFrame.cpp:511
+#: AdvancedFrame.cpp:514
 msgid "Allow GPU work according to preferences"
 msgstr "Permetre treballar la GPU d'acord a les preferències"
 
-#: clientgui/AdvancedFrame.cpp:515
+#: AdvancedFrame.cpp:518
 msgid "Suspend GPU"
 msgstr "Suspendre la GPU"
 
-#: clientgui/AdvancedFrame.cpp:516
+#: AdvancedFrame.cpp:519
 msgid "Stop GPU work regardless of preferences"
 msgstr "Aturar les tasques de la GPU tot i les preferències"
 
-#: clientgui/AdvancedFrame.cpp:540
+#: AdvancedFrame.cpp:543
 msgid "Network activity always available"
 msgstr "Accés a la xarxa sempre disponible"
 
-#: clientgui/AdvancedFrame.cpp:541
+#: AdvancedFrame.cpp:544
 msgid "Allow network activity regardless of preferences"
 msgstr "Permetre l'accés al xarxa tot i les preferències"
 
-#: clientgui/AdvancedFrame.cpp:545
+#: AdvancedFrame.cpp:548
 msgid "Network activity based on preferences"
 msgstr "Accés a la xarxa basat en les preferències"
 
-#: clientgui/AdvancedFrame.cpp:546
+#: AdvancedFrame.cpp:549
 msgid "Allow network activity according to preferences"
 msgstr "Permetre l'accés a la xarxa d'acord a les preferències"
 
-#: clientgui/AdvancedFrame.cpp:550
+#: AdvancedFrame.cpp:553
 msgid "Network activity suspended"
 msgstr "Suspès l'accés a la xarxa"
 
-#: clientgui/AdvancedFrame.cpp:551
+#: AdvancedFrame.cpp:554
 msgid "Stop BOINC network activity"
 msgstr "Aturar l'accés de BOINC a la xarxa"
 
-#: clientgui/AdvancedFrame.cpp:561
+#: AdvancedFrame.cpp:564
 #, c-format
 msgid "Connect to another computer running %s"
 msgstr "Connectar a un altre ordinador executant %s"
 
-#: clientgui/AdvancedFrame.cpp:566
+#: AdvancedFrame.cpp:569
 msgid "Select computer..."
 msgstr "Seleccioni un ordinador..."
 
-#: clientgui/AdvancedFrame.cpp:571
+#: AdvancedFrame.cpp:574
 msgid "Shut down connected client..."
 msgstr "Aturar el client connectat..."
 
-#: clientgui/AdvancedFrame.cpp:572
+#: AdvancedFrame.cpp:575
 msgid "Shut down the currently connected client"
 msgstr "Aturar el client actualment connectat"
 
-#: clientgui/AdvancedFrame.cpp:576
+#: AdvancedFrame.cpp:579
 msgid "Run CPU &benchmarks"
 msgstr "Executar les proves de la CPU"
 
-#: clientgui/AdvancedFrame.cpp:577
+#: AdvancedFrame.cpp:580
 msgid "Runs BOINC CPU benchmarks"
 msgstr "Executa les proves de la CPU de BOINC"
 
-#: clientgui/AdvancedFrame.cpp:581
+#: AdvancedFrame.cpp:584
 msgid "Do network communication"
 msgstr "Establir comunicació per xarxa"
 
-#: clientgui/AdvancedFrame.cpp:582
+#: AdvancedFrame.cpp:585
 msgid "Do all pending network communication"
 msgstr "Executar les comunicacions pendents per xarxa"
 
-# 94%
-#: clientgui/AdvancedFrame.cpp:586
+#: AdvancedFrame.cpp:589
 msgid "Read config files"
 msgstr "Llegiu els fitxers de configuració"
 
-#: clientgui/AdvancedFrame.cpp:587
-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:590
+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"
 
-#: clientgui/AdvancedFrame.cpp:591
+#: AdvancedFrame.cpp:594
 msgid "Read local prefs file"
 msgstr "Llegir el fitxer de preferències locals"
 
-#: clientgui/AdvancedFrame.cpp:592
+#: AdvancedFrame.cpp:595
 msgid "Read preferences from global_prefs_override.xml."
 msgstr "Llegir les preferències des de global_prefs_override.xml."
 
-#: clientgui/AdvancedFrame.cpp:597
+#: AdvancedFrame.cpp:600
 #, c-format
 msgid "Launch another instance of %s..."
 msgstr "Inicieu una altra instància de %s..."
 
-#: clientgui/AdvancedFrame.cpp:601
+#: AdvancedFrame.cpp:604
 #, c-format
 msgid "Launch another %s"
 msgstr "Iniciar un altre %s"
 
-#: clientgui/AdvancedFrame.cpp:611
+#: AdvancedFrame.cpp:614
 msgid "Event Log...\tCtrl+Shift+E"
 msgstr "Registre d'Esdeveniments...\t Ctrl+Shift+E"
 
-#: clientgui/AdvancedFrame.cpp:612
+#: AdvancedFrame.cpp:615
 msgid "Display diagnostic messages."
 msgstr "Mostrar els missatges de diagnòstic."
 
-#: clientgui/AdvancedFrame.cpp:616
-msgid "Event Log Diagnostic Flags...\tCtrl+Shift+F"
-msgstr "Registre d'Esdeveniments Flags de Diagnosi...\tCtrl+Shiht+F"
-
-#: clientgui/AdvancedFrame.cpp:617
-msgid "Enable or disable various diagnostic messages"
-msgstr "Activar o desactivar diversos missatges de diagnòstic"
-
-#: clientgui/AdvancedFrame.cpp:626
+#: AdvancedFrame.cpp:625 sg_BoincSimpleFrame.cpp:188
 #, c-format
 msgid "%s &help"
 msgstr "&ajuda de %s"
 
-#: clientgui/AdvancedFrame.cpp:632
+#: AdvancedFrame.cpp:631 sg_BoincSimpleFrame.cpp:194
 #, c-format
 msgid "Show information about %s"
 msgstr "Mostrar la informació de %s"
 
-#: clientgui/AdvancedFrame.cpp:644
+#: AdvancedFrame.cpp:643
 #, c-format
 msgid "&%s help"
 msgstr "ajuda de &%s"
 
-#: clientgui/AdvancedFrame.cpp:650
+#: AdvancedFrame.cpp:649 sg_BoincSimpleFrame.cpp:212
 #, c-format
 msgid "Show information about the %s"
 msgstr "Mostrar la informació de %s"
 
-#: clientgui/AdvancedFrame.cpp:662
+#: AdvancedFrame.cpp:661 sg_BoincSimpleFrame.cpp:224
 #, c-format
 msgid "%s &web site"
 msgstr "pàgina &web de %s"
 
-#: clientgui/AdvancedFrame.cpp:668
+#: AdvancedFrame.cpp:667 sg_BoincSimpleFrame.cpp:230
 #, c-format
 msgid "Show information about BOINC and %s"
 msgstr "Mostrar la informació de BOINC i %s"
 
-#: clientgui/AdvancedFrame.cpp:680
-#: clientgui/BOINCTaskBar.cpp:544
+#: AdvancedFrame.cpp:679 BOINCTaskBar.cpp:530 sg_BoincSimpleFrame.cpp:242
 #, c-format
 msgid "&About %s..."
 msgstr "&A propòsit de %s..."
 
-#: clientgui/AdvancedFrame.cpp:686
+#: AdvancedFrame.cpp:685 sg_BoincSimpleFrame.cpp:248
 msgid "Licensing and copyright information."
 msgstr "Informació de la llicència i copyright."
 
-#: clientgui/AdvancedFrame.cpp:693
+#: AdvancedFrame.cpp:692 sg_BoincSimpleFrame.cpp:255
 msgid "&File"
 msgstr "&Fitxer"
 
-#: clientgui/AdvancedFrame.cpp:697
+#: AdvancedFrame.cpp:696 sg_BoincSimpleFrame.cpp:259
 msgid "&View"
 msgstr "&Veure"
 
-#: clientgui/AdvancedFrame.cpp:701
+#: AdvancedFrame.cpp:700 sg_BoincSimpleFrame.cpp:263
 msgid "&Tools"
 msgstr "&Utilitats"
 
-#: clientgui/AdvancedFrame.cpp:705
+#: AdvancedFrame.cpp:704
 msgid "&Activity"
 msgstr "&Activitat"
 
-#: clientgui/AdvancedFrame.cpp:709
+#: AdvancedFrame.cpp:708
 msgid "A&dvanced"
 msgstr "&Avançat"
 
-#: clientgui/AdvancedFrame.cpp:713
+#: AdvancedFrame.cpp:712 DlgEventLog.cpp:332 sg_BoincSimpleFrame.cpp:267
+#: wizardex.cpp:374 wizardex.cpp:381
 msgid "&Help"
 msgstr "&Ajuda"
 
-#: clientgui/AdvancedFrame.cpp:1185
+#: AdvancedFrame.cpp:1199
 #, c-format
 msgid "%s - Stop using %s"
 msgstr "%s - Deixi d'utilitzar %s"
 
-#: clientgui/AdvancedFrame.cpp:1190
+#: AdvancedFrame.cpp:1204
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -575,263 +525,222 @@ msgid ""
 "but you'll have to manage projects manually.\n"
 "\n"
 "Do you want to stop using %s?"
-msgstr ""
-"Si deixeu d'utilitzar %s,\n"
-"els vostres projectes continuaran,\n"
-"però els haureu de administrar manualment.\n"
-"\n"
-"Desitja finalitzar la utilització de %s?"
+msgstr "Si deixeu d'utilitzar %s,\nels vostres projectes continuaran,\nperò els haureu de administrar manualment.\n\nDesitja finalitzar la utilització de %s?"
 
-#: clientgui/AdvancedFrame.cpp:1397
+#: AdvancedFrame.cpp:1401
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s - Aturar el client actual..."
 
-#: clientgui/AdvancedFrame.cpp:1406
+#: AdvancedFrame.cpp:1410
 #, 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\n"
-"i demanarà per connectar-vos a un altre servidor."
+msgstr "%s aturarà el client connectat actiu\ni demanarà per connectar-vos a un altre servidor."
 
-#: clientgui/AdvancedFrame.cpp:1806
+#: AdvancedFrame.cpp:1745 DlgAbout.cpp:119
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: clientgui/AdvancedFrame.cpp:1815
+#: AdvancedFrame.cpp:1754
 #, c-format
 msgid "%s has successfully added %s"
 msgstr "%s ha adjuntat satisfactòriament %s"
 
-#: clientgui/AdvancedFrame.cpp:1953
+#: AdvancedFrame.cpp:1893
 #, c-format
 msgid "%s - (%s)"
 msgstr "%s - (%s)"
 
-#: clientgui/AdvancedFrame.cpp:1957
+#: AdvancedFrame.cpp:1897
 #, c-format
 msgid "Connecting to %s"
 msgstr "Connectant a %s"
 
-#: clientgui/AdvancedFrame.cpp:1960
+#: AdvancedFrame.cpp:1900
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "Connectat a %s (%s)"
 
-#: clientgui/AlreadyExistsPage.cpp:184
+#: AlreadyExistsPage.cpp:184
 msgid "Username already in use"
 msgstr "Aquest nom d'usuari ja està en ús"
 
-#: clientgui/AlreadyExistsPage.cpp:187
+#: AlreadyExistsPage.cpp:187
 msgid ""
 "An account with that username already exists and has a\n"
 "different password than the one you entered.\n"
 "\n"
 "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\n"
-"contrasenya diferent a la que ha introduït.\n"
-"\n"
-"Si us plau, visiti la pàgina web del projecte i segueixi les instruccions."
+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."
 
-#: clientgui/AlreadyExistsPage.cpp:191
+#: AlreadyExistsPage.cpp:191
 msgid "Email address already in use"
 msgstr "L'adreça de correu ja està en ús"
 
-#: clientgui/AlreadyExistsPage.cpp:194
+#: AlreadyExistsPage.cpp:194
 msgid ""
 "An account with that email address already exists and has a\n"
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"Ja existeix un compte amb aquest correu i te una\n"
-"contrasenya diferent a la que ha introduït.\n"
-"\n"
-"Si us plau, visiti la pàgina web del projecte i segueixi les instruccions."
+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."
 
-#: clientgui/AsyncRPC.cpp:1031
+#: AsyncRPC.cpp:1031
 msgid "Communicating with BOINC client.  Please wait ..."
 msgstr "Establint comunicació amb el client BOINC.  Esperi si us plau ..."
 
-#: clientgui/AsyncRPC.cpp:1034
+#: AsyncRPC.cpp:1034
 #, c-format
 msgid "&Quit %s"
 msgstr "&Sortir de %s"
 
-#: clientgui/AsyncRPC.cpp:1036
+#: AsyncRPC.cpp:1036
 #, c-format
 msgid "E&xit %s"
 msgstr "&Tancar %s"
 
-#: clientgui/AsyncRPC.cpp:1040
+#: AsyncRPC.cpp:1040
 #, c-format
 msgid "%s - Communication"
 msgstr "%s - Comunicació"
 
-#: clientgui/AsyncRPC.cpp:1056
+#: AsyncRPC.cpp:1056 DlgAdvPreferencesBase.cpp:107 sg_DlgPreferences.cpp:433
 msgid "Cancel"
 msgstr "Cancel·lar"
 
-#: clientgui/BOINCBaseFrame.cpp:504
+#: BOINCBaseFrame.cpp:505
 #, c-format
 msgid "%s - Connection Error"
 msgstr "%s - Error de connexió"
 
-#: clientgui/BOINCBaseFrame.cpp:513
+#: BOINCBaseFrame.cpp:514
 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.\n"
-"Si us plau posi's en contacte amb l'administrador per afegir-lo al grup "
-"local 'boinc_users'."
+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'."
 
-#: clientgui/BOINCBaseFrame.cpp:522
+#: BOINCBaseFrame.cpp:523
 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ó.\n"
-"Asseguri's d'iniciar aquest programa en el mateix directori que el client en "
-"execució."
+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ó."
 
-#: clientgui/BOINCBaseFrame.cpp:524
+#: BOINCBaseFrame.cpp:525
 msgid "Authorization failed connecting to running client."
 msgstr "L'autorització ha fallat connectant amb el client en execució."
 
-#: clientgui/BOINCBaseFrame.cpp:532
+#: BOINCBaseFrame.cpp:533
 msgid "The password you have provided is incorrect, please try again."
-msgstr ""
-"La contrasenya proporcionada és incorrecte, si us plau intenti-ho de nou."
+msgstr "La contrasenya proporcionada és incorrecte, si us plau intenti-ho de nou."
 
-#: clientgui/BOINCBaseFrame.cpp:576
+#: BOINCBaseFrame.cpp:577
 #, c-format
 msgid "%s - Connection Failed"
 msgstr "%s - Ha fallat la connexió"
 
-#: clientgui/BOINCBaseFrame.cpp:585
+#: BOINCBaseFrame.cpp:586
 #, 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.\n"
-"Desitja intentar connectar de nou?"
+msgstr "%s no pot connectar amb el client %s.\nDesitja intentar connectar de nou?"
 
-#: clientgui/BOINCBaseFrame.cpp:621
+#: BOINCBaseFrame.cpp:622
 #, c-format
 msgid "%s - Daemon Start Failed"
 msgstr "%s - Ha fallat l'inici del servei"
 
-#: clientgui/BOINCBaseFrame.cpp:631
+#: BOINCBaseFrame.cpp:632
 #, 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.\n"
-"Si us plau inicii el Panell de Control->Eines Administratives->Serveis i "
-"inicieu el servei BOINC."
+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."
 
-#: clientgui/BOINCBaseFrame.cpp:637
+#: BOINCBaseFrame.cpp:638
 #, 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.\n"
-"Si us plau inicii el servei i provi-ho de nou."
+msgstr "%s no capaç d'iniciar el client %s.\nSi us plau inicii el servei i provi-ho de nou."
 
-#: clientgui/BOINCBaseFrame.cpp:688
+#: BOINCBaseFrame.cpp:689
 #, c-format
 msgid "%s - Connection Status"
 msgstr "%s - Estat de la connexió"
 
-#: clientgui/BOINCBaseFrame.cpp:699
+#: BOINCBaseFrame.cpp:700
 #, 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"
 "To connect up to your local computer please use 'localhost' as the host name."
-msgstr ""
-"%s no està connectat a un client %s.\n"
-"Si us plau utilitzi la opció de menú 'Avançat\\Seleccioni un ordinador...' "
-"per connectar-lo amb el client %s.\n"
-"Per connectar amb el propi ordinador si us plau utilitzi 'localhost' com a "
-"nom d'ordinador."
+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."
 
-#: clientgui/BOINCBaseView.cpp:752
+#: BOINCBaseView.cpp:779
 msgid "Project web pages"
 msgstr "Pàgines web del projecte"
 
-#: clientgui/BOINCClientManager.cpp:573
+#: BOINCClientManager.cpp:575
 #, c-format
 msgid "%s - Unexpected Exit"
 msgstr "%s - Sortida inesperada"
 
-#: clientgui/BOINCClientManager.cpp:583
+#: BOINCClientManager.cpp:585
 #, 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.\n"
-"Desitja iniciar-lo un cop més?"
+msgstr "El client %s ha finalitzat 3 vegades de forma inesparda en els darrers %d minuts.\nDesitja iniciar-lo un cop més?"
 
-#: clientgui/BOINCDialupManager.cpp:61
+#: BOINCDialupManager.cpp:61
 #, c-format
 msgid "%s - Network Status"
 msgstr "%s - Estat de la xarxa"
 
-#: clientgui/BOINCDialupManager.cpp:241
+#: 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.\n"
-"Pot fer-ho ara?"
+msgstr "%s necessita connectar a Internet.\nPot fer-ho ara?"
 
-#: clientgui/BOINCDialupManager.cpp:254
+#: BOINCDialupManager.cpp:254
 #, c-format
 msgid "%s is connecting to the Internet."
 msgstr "%s està connectant a Internet."
 
-#: clientgui/BOINCDialupManager.cpp:303
+#: BOINCDialupManager.cpp:303
 #, c-format
 msgid "%s has successfully connected to the Internet."
 msgstr "%s a connectat a Internet."
 
-#: clientgui/BOINCDialupManager.cpp:331
+#: BOINCDialupManager.cpp:331
 #, c-format
 msgid "%s failed to connect to the Internet."
 msgstr "%s no ha pogut connectar a Internet."
 
-#: clientgui/BOINCDialupManager.cpp:372
+#: 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.\n"
-"Actualitzant tots els projectes i intentant de nou totes les transferències."
+msgstr "%s ha detectat que està connectat a Internet.\nActualitzant tots els projectes i intentant de nou totes les transferències."
 
-#: clientgui/BOINCDialupManager.cpp:417
+#: BOINCDialupManager.cpp:417
 #, c-format
 msgid "%s has successfully disconnected from the Internet."
 msgstr "%s s'ha desconnectat d'Internet."
 
-#: clientgui/BOINCDialupManager.cpp:433
+#: BOINCDialupManager.cpp:433
 #, c-format
 msgid "%s failed to disconnected from the Internet."
 msgstr "%s no ha pogut desconnectar-se d'Internet."
 
-#: clientgui/BOINCGUIApp.cpp:595
+#: BOINCGUIApp.cpp:339
 #, c-format
 msgid ""
 "You currently are not authorized to manage the client.\n"
@@ -842,896 +751,798 @@ msgid ""
 " or\n"
 "  - contact your administrator to add you to the 'boinc_master'\n"
 "     user group."
-msgstr ""
-"En aquests moment no te autorització per gestionar el client.\n"
-"\n"
-"Per 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'."
-
-#: clientgui/BOINCGUIApp.cpp:601
+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
 #, 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"
+msgstr "Les propietats o permisos de %s no estan definides correctament; si us plau reinstal·li %s.\n(Codi d'error %d"
 
-#: clientgui/BOINCGUIApp.cpp:607
+#: BOINCGUIApp.cpp:351
 msgid " at "
 msgstr " a "
 
-#: clientgui/BOINCGUIApp.cpp:610
+#: BOINCGUIApp.cpp:354 MainDocument.cpp:2484 MainDocument.cpp:2534
+#: MainDocument.cpp:2554 ViewTransfers.cpp:803
 msgid ")"
 msgstr ")"
 
-#: clientgui/BOINCGUIApp.cpp:640
+#: BOINCGUIApp.cpp:384
 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.\n"
-"Si us plau reiniciï l'ordinador i provi-ho de nou."
+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."
 
-#: clientgui/BOINCGUIApp.cpp:641
+#: BOINCGUIApp.cpp:385 DlgAbout.cpp:153
 msgid "BOINC Manager"
 msgstr "Administrador BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:902
+#: BOINCGUIApp.cpp:572
 msgid "BOINC Manager was started by the operating system automatically"
 msgstr "El sistema ha iniciat automàticament l'Administrador BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:904
+#: BOINCGUIApp.cpp:574
 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"
+msgstr "Iniciar BOINC de manera que només la icona de la barra de tasques sigui visible"
 
-#: clientgui/BOINCGUIApp.cpp:906
+#: BOINCGUIApp.cpp:576
 msgid "Directory containing the BOINC Client executable"
 msgstr "Directori que conté l'executable del Client BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:907
+#: BOINCGUIApp.cpp:577
 msgid "BOINC data directory"
 msgstr "Directori de les dades de BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:909
+#: BOINCGUIApp.cpp:579
 msgid "Host name or IP address"
 msgstr "Nom de host o adreça IP"
 
-#: clientgui/BOINCGUIApp.cpp:910
+#: BOINCGUIApp.cpp:580
 msgid "GUI RPC port number"
 msgstr "GUI RPC nombre de port"
 
-#: clientgui/BOINCGUIApp.cpp:911
+#: BOINCGUIApp.cpp:581
 msgid "Password"
 msgstr "Contrasenya"
 
-#: clientgui/BOINCGUIApp.cpp:912
+#: BOINCGUIApp.cpp:582
 msgid "Startup BOINC with these optional arguments"
 msgstr "Iniciar BOINC amb aquests arguments opcionals"
 
-#: clientgui/BOINCGUIApp.cpp:913
+#: BOINCGUIApp.cpp:583
 msgid "disable BOINC security users and permissions"
 msgstr "desactivar la seguretat d'usuaris i permisos BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:914
+#: BOINCGUIApp.cpp:584
 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"
+msgstr "seleccioni el mode de depuració per activar els missatges d'error de l'administrador"
 
-#: clientgui/BOINCGUIApp.cpp:915
+#: BOINCGUIApp.cpp:585
 msgid "multiple instances of BOINC Manager allowed"
 msgstr "estan permeses diverses instàncies de BOINC Manager"
 
-#: clientgui/BOINCGUIApp.cpp:917
+#: BOINCGUIApp.cpp:587
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr "No s'utilitza: solució per l'informe d'error al XCode 4.2"
 
-#: clientgui/BOINCGUIApp.cpp:1164
+#: BOINCGUIApp.cpp:814
 msgid "(Automatic Detection)"
 msgstr "(Detecció Automàtica)"
 
-#: clientgui/BOINCGUIApp.cpp:1165
+#: BOINCGUIApp.cpp:815
 msgid "(Unknown)"
 msgstr "(Desconegut)"
 
-#: clientgui/BOINCGUIApp.cpp:1166
+#: BOINCGUIApp.cpp:816
 msgid "(User Defined)"
 msgstr "(Definit per l'Usuari)"
 
-#: clientgui/BOINCTaskBar.cpp:522
+#: BOINCTaskBar.cpp:508
 #, c-format
 msgid "Open %s Web..."
 msgstr "Obrir la pàgina web %s..."
 
-#: clientgui/BOINCTaskBar.cpp:529
+#: BOINCTaskBar.cpp:515
 #, c-format
 msgid "Open %s..."
 msgstr "Obrir %s..."
 
-#: clientgui/BOINCTaskBar.cpp:536
-#: clientgui/BOINCTaskBar.cpp:633
-#: clientgui/BOINCTaskBar.cpp:641
+#: BOINCTaskBar.cpp:522 BOINCTaskBar.cpp:619 BOINCTaskBar.cpp:627
 msgid "Snooze"
 msgstr "Becaina"
 
-#: clientgui/BOINCTaskBar.cpp:538
-#: clientgui/BOINCTaskBar.cpp:660
-#: clientgui/BOINCTaskBar.cpp:668
+#: BOINCTaskBar.cpp:524 BOINCTaskBar.cpp:646 BOINCTaskBar.cpp:654
 msgid "Snooze GPU"
 msgstr "Becaina de la GPU"
 
-#: clientgui/BOINCTaskBar.cpp:556
+#: BOINCTaskBar.cpp:542
 msgid "E&xit"
 msgstr "&Sortir"
 
-#: clientgui/BOINCTaskBar.cpp:626
+#: BOINCTaskBar.cpp:612 ViewProjects.cpp:718 ViewWork.cpp:795
+#: sg_BoincSimpleFrame.cpp:758 sg_ProjectCommandPopup.cpp:110
+#: sg_TaskCommandPopup.cpp:102
 msgid "Resume"
 msgstr "Continuar"
 
-#: clientgui/BOINCTaskBar.cpp:653
+#: BOINCTaskBar.cpp:639
 msgid "Resume GPU"
 msgstr "Continuar GPU"
 
-#: clientgui/BOINCTaskBar.cpp:727
+#: BOINCTaskBar.cpp:713
 msgid "Computing is enabled"
 msgstr "La computació està habilitada"
 
-#: clientgui/BOINCTaskBar.cpp:731
+#: BOINCTaskBar.cpp:717
 msgid "Computing is suspended - "
 msgstr "La computació està suspesa - "
 
-#: clientgui/BOINCTaskBar.cpp:741
+#: BOINCTaskBar.cpp:727
 msgid "GPU computing is enabled"
 msgstr "La computació de la GPU està disponible"
 
-#: clientgui/BOINCTaskBar.cpp:744
+#: BOINCTaskBar.cpp:730
 msgid "GPU computing is suspended - "
 msgstr "La computació de la GPU està suspesa - "
 
-#: clientgui/BOINCTaskBar.cpp:753
+#: BOINCTaskBar.cpp:739
 msgid "Network is enabled"
 msgstr "La xarxa està activada"
 
-#: clientgui/BOINCTaskBar.cpp:756
+#: BOINCTaskBar.cpp:742
 msgid "Network is suspended - "
 msgstr "La xarxa està suspesa - "
 
-#: clientgui/BOINCTaskBar.cpp:764
+#: BOINCTaskBar.cpp:750
 msgid "Reconnecting to client."
 msgstr "Tornant a connectar amb el client."
 
-#: clientgui/BOINCTaskBar.cpp:766
+#: BOINCTaskBar.cpp:752
 msgid "Not connected to a client."
 msgstr "No connectat a cap client."
 
-#: clientgui/BOINCTaskBar.cpp:819
+#: BOINCTaskBar.cpp:805
 #, c-format
 msgid "%s Notices"
 msgstr "%s Notícies"
 
-#: clientgui/BOINCTaskBar.cpp:825
+#: BOINCTaskBar.cpp:811
 msgid "There are new notices - click to view."
 msgstr "Hi ha noves comunicacions - feu clic per veure-les."
 
-#: clientgui/CompletionErrorPage.cpp:199
+#: CompletionErrorPage.cpp:199
 msgid "Failed to add project"
 msgstr "No s'ha pogut afegir el projecte"
 
-#: clientgui/CompletionErrorPage.cpp:204
+#: CompletionErrorPage.cpp:204
 msgid "Failed to update account manager"
 msgstr "Ha fallat l'actualització de l'administrador de comptes"
 
-#: clientgui/CompletionErrorPage.cpp:208
+#: CompletionErrorPage.cpp:208
 msgid "Failed to remove account manager"
 msgstr "Ha fallat l'eliminació de l'administrador de comptes"
 
-#: clientgui/CompletionErrorPage.cpp:212
+#: CompletionErrorPage.cpp:212
 msgid "Failed to add account manager"
 msgstr "Ha fallat afegir l'administrador de comptes"
 
-#: clientgui/CompletionErrorPage.cpp:221
+#: CompletionErrorPage.cpp:221
 msgid ""
 "Please try again later.\n"
 "\n"
 "Click Finish to close."
-msgstr ""
-"Si us plau prova-ho més tard.\n"
-"\n"
-"Prem per tancar."
+msgstr "Si us plau prova-ho més tard.\n\nPrem per tancar."
 
-#: clientgui/CompletionErrorPage.cpp:225
-#: clientgui/CompletionPage.cpp:222
-#: clientgui/CompletionPage.cpp:242
-#: clientgui/CompletionPage.cpp:273
+#: CompletionErrorPage.cpp:225 CompletionPage.cpp:222 CompletionPage.cpp:242
+#: CompletionPage.cpp:273
 msgid "Click Finish to close."
 msgstr "Premi Finalitzar per tancar."
 
-#: clientgui/CompletionErrorPage.cpp:234
+#: CompletionErrorPage.cpp:234
 msgid "Messages from server:"
 msgstr "Missatges del servidor:"
 
-#: clientgui/CompletionPage.cpp:207
+#: CompletionPage.cpp:207
 msgid "Project added"
 msgstr "Projecte afegit"
 
-#: clientgui/CompletionPage.cpp:213
+#: CompletionPage.cpp:213
 msgid "This project has been successfully added."
 msgstr "Aquest projecte ha estat afegit amb èxit."
 
-#: clientgui/CompletionPage.cpp:218
+#: 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\n"
-"podrà establir el seu nom de compte i les preferències."
+msgstr "Quan premi Finalitzar, el seu navegador obrirà la pàgina on\npodrà establir el seu nom de compte i les preferències."
 
-#: clientgui/CompletionPage.cpp:232
+#: CompletionPage.cpp:232
 #, c-format
 msgid "Update from %s completed."
 msgstr "Actualització des de %s finalitzada."
 
-#: clientgui/CompletionPage.cpp:236
+#: CompletionPage.cpp:236
 msgid "Update completed."
 msgstr "Actualització finalitzada."
 
-#: clientgui/CompletionPage.cpp:247
+#: CompletionPage.cpp:247
 msgid "Now using account manager"
 msgstr "Ara està utilitzant el gestor de comptes"
 
-#: clientgui/CompletionPage.cpp:252
+#: CompletionPage.cpp:252
 #, c-format
 msgid "Welcome to %s!"
 msgstr "Benvingut a %s!"
 
-#: clientgui/CompletionPage.cpp:263
+#: CompletionPage.cpp:263
 #, c-format
 msgid "You are now using %s to manage accounts."
 msgstr "Està fent servir %s per administrar els comptes."
 
-#: clientgui/CompletionPage.cpp:267
+#: CompletionPage.cpp:267
 msgid "You are now using this account manager."
 msgstr "Ara està fent servir aquest administrador de comptes."
 
-#: clientgui/DlgAbout.cpp:113
+#: DlgAbout.cpp:113 mac/Mac_GUI.cpp:96
 #, c-format
 msgid "About %s"
 msgstr "Sobre %s"
 
-#: clientgui/DlgAbout.cpp:172
+#: DlgAbout.cpp:172
 msgid "Version:"
 msgstr "Versió:"
 
-#: clientgui/DlgAbout.cpp:180
+#: DlgAbout.cpp:180
 msgid "wxWidgets Version:"
 msgstr "Versió wxWidgets:"
 
-#: clientgui/DlgAbout.cpp:188
+#: DlgAbout.cpp:188
 msgid "Copyright:"
 msgstr "Copyright:"
 
-# 98%
-#: clientgui/DlgAbout.cpp:192
+#: DlgAbout.cpp:192
 msgid ""
-"(C) 2003-2014 University of California, Berkeley.\n"
+"(C) 2003-2013 University of California, Berkeley.\n"
 "All Rights Reserved."
-msgstr ""
-"(C) 2003-2013 Universitat de Califòrnia, Berkeley.\n"
-"Tots els Drets Reservats."
+msgstr "(C) 2003-2013 Universitat de Califòrnia, Berkeley.\nTots els Drets Reservats."
 
-#: clientgui/DlgAbout.cpp:196
+#: DlgAbout.cpp:196
 msgid "Berkeley Open Infrastructure for Network Computing"
 msgstr "Infraestructura Oberta de Berkeley per la Computació en xarxa"
 
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:399
-#: clientgui/DlgSelectComputer.cpp:163
+#: DlgAbout.cpp:208 DlgExitMessage.cpp:173 DlgGenericMessage.cpp:120
+#: DlgOptions.cpp:396 DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "&OK"
 
-#: clientgui/DlgAdvPreferences.cpp:602
+#: DlgAdvPreferences.cpp:544
 msgid "invalid number"
 msgstr "número incorrecte"
 
-#: clientgui/DlgAdvPreferences.cpp:603
+#: DlgAdvPreferences.cpp:545
 msgid "invalid time, format is HH:MM"
 msgstr "hora incorrecte, el format es HH:MM"
 
-#: clientgui/DlgAdvPreferences.cpp:604
+#: 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:817
+#: DlgAdvPreferences.cpp:751
 msgid "invalid input value detected"
 msgstr "detectat valor d'entrada incorrecte"
 
-#: clientgui/DlgAdvPreferences.cpp:819
+#: DlgAdvPreferences.cpp:753
 msgid "Validation Error"
 msgstr "Error de validació"
 
-#: clientgui/DlgAdvPreferences.cpp:969
-#: clientgui/DlgAdvPreferences.cpp:975
-#: clientgui/DlgAdvPreferences.cpp:981
+#: DlgAdvPreferences.cpp:885 DlgAdvPreferences.cpp:891
+#: DlgAdvPreferences.cpp:897
 msgid "Applications to add"
 msgstr "Aplicacions per afegir"
 
-#: clientgui/DlgAdvPreferences.cpp:998
+#: DlgAdvPreferences.cpp:914
 #, c-format
 msgid "'%s' is not an executable application."
 msgstr "'%s' no és una aplicació executable."
 
-#: clientgui/DlgAdvPreferences.cpp:999
-#: clientgui/DlgAdvPreferences.cpp:1046
-#: clientgui/DlgAdvPreferences.cpp:1070
+#: DlgAdvPreferences.cpp:915 DlgAdvPreferences.cpp:962
+#: DlgAdvPreferences.cpp:986
 msgid "Add Exclusive App"
 msgstr "Afegeix l'aplicació exclusiva"
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Name of application to add?"
 msgstr "Nom de l'aplicació per afegir?"
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Add exclusive app"
 msgstr "Afegir aplicació exclusiva"
 
-#: clientgui/DlgAdvPreferences.cpp:1045
+#: 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:1069
+#: DlgAdvPreferences.cpp:985
 #, c-format
 msgid "'%s' is already in the list."
 msgstr "'%s' ja està a la llista."
 
-#: clientgui/DlgAdvPreferences.cpp:1161
+#: DlgAdvPreferences.cpp:1077
 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.)"
+msgstr "Do you really want to clear all local preferences?\n(Això no afectarà a les aplicacions exclusives.)"
 
-#: clientgui/DlgAdvPreferences.cpp:1162
+#: DlgAdvPreferences.cpp:1078 sg_DlgPreferences.cpp:1030
 msgid "Confirmation"
 msgstr "Confirmació"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:49
+#: DlgAdvPreferencesBase.cpp:46 sg_DlgPreferences.cpp:946
 #, c-format
-msgid "%s - Computing preferences"
-msgstr "%s - Preferències de computació"
+msgid "%s - Preferences"
+msgstr "%s - Preferències"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:66
+#: DlgAdvPreferencesBase.cpp:62
 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.\n"
-"Premi OK per confirmar les preferències.\n"
-"Premi Netejar per restaurar les preferències basades en la web (excepte les "
-"aplicacions exclusives)."
+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)."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:69
+#: DlgAdvPreferencesBase.cpp:65 sg_DlgPreferences.cpp:428
 msgid "Clear"
 msgstr "Netejar"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:70
+#: DlgAdvPreferencesBase.cpp:66
 msgid "clear all local preferences and close the dialog"
 msgstr "netejar totes les preferències locals i tancar la finestra"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:85
+#: DlgAdvPreferencesBase.cpp:81
 msgid "processor usage"
 msgstr "utilització de processador"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:88
+#: DlgAdvPreferencesBase.cpp:84
 msgid "network usage"
 msgstr "utilització de la xarxa"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:91
+#: DlgAdvPreferencesBase.cpp:87
 msgid "disk and memory usage"
 msgstr "utilització de disc i memòria"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:94
+#: DlgAdvPreferencesBase.cpp:90
 msgid "exclusive applications"
 msgstr "aplicacions exclusives"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:107
-#: clientgui/DlgDiagnosticLogFlags.cpp:104
+#: DlgAdvPreferencesBase.cpp:102 sg_DlgPreferences.cpp:424
 msgid "OK"
 msgstr "OK"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:108
+#: DlgAdvPreferencesBase.cpp:103
 msgid "save all values and close the dialog"
 msgstr "guardar tots els valors i tancar la finestra"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:114
+#: DlgAdvPreferencesBase.cpp:108
 msgid "close the dialog without saving"
 msgstr "tancar la finestra sense guardar"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:118
-#: clientgui/Localization.cpp:35
-#: clientgui/Localization.cpp:121
-#: clientgui/Localization.cpp:139
+#: DlgAdvPreferencesBase.cpp:112 Localization.cpp:35 Localization.cpp:121
+#: Localization.cpp:139 sg_BoincSimpleFrame.cpp:794 sg_DlgPreferences.cpp:439
 msgid "Help"
 msgstr "Ajuda"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
+#: DlgAdvPreferencesBase.cpp:113
 msgid "shows the preferences web page"
 msgstr "mostra la pàgina web de les preferències"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:141
+#: DlgAdvPreferencesBase.cpp:135
 msgid "Computing allowed"
 msgstr "Computació disponible"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
+#: DlgAdvPreferencesBase.cpp:139
 msgid "While computer is on batteries"
 msgstr "Mentre l'ordinador utilitza les bateries"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:149
-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"
+#: DlgAdvPreferencesBase.cpp:142
+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"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:155
+#: DlgAdvPreferencesBase.cpp:148
 msgid "While computer is in use"
 msgstr "Mentre l'ordinador està en us"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:158
-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"
+#: DlgAdvPreferencesBase.cpp:151
+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"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:164
+#: DlgAdvPreferencesBase.cpp:157
 msgid "Use GPU while computer is in use"
 msgstr "Utilitzar la GPU mentre l'ordinador està en us"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:167
-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"
+#: DlgAdvPreferencesBase.cpp:160
+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"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:179
+#: 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:188
-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"
+#: DlgAdvPreferencesBase.cpp:182
+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"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:193
-#: clientgui/DlgAdvPreferencesBase.cpp:342
+#: DlgAdvPreferencesBase.cpp:187 DlgAdvPreferencesBase.cpp:336
+#: sg_DlgPreferences.cpp:417
 msgid "minutes"
 msgstr "minuts"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:212
+#: DlgAdvPreferencesBase.cpp:206
 msgid "While processor usage is less than"
 msgstr "Mentre la utilització del processador és inferior a"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:221
+#: 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:226
+#: DlgAdvPreferencesBase.cpp:221
 msgid "percent (0 means no restriction)"
 msgstr "perntatge (0 significa sense restriccions)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:240
-#: clientgui/DlgAdvPreferencesBase.cpp:506
+#: DlgAdvPreferencesBase.cpp:235 DlgAdvPreferencesBase.cpp:496
 msgid "Every day between hours of"
 msgstr "Cada dia entre les hores"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: DlgAdvPreferencesBase.cpp:239
 msgid "start work at this time"
 msgstr "començar a fer feina a aquesta hora"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:248
-#: clientgui/DlgAdvPreferencesBase.cpp:514
+#: DlgAdvPreferencesBase.cpp:243 DlgAdvPreferencesBase.cpp:504
+#: sg_DlgPreferences.cpp:326 sg_DlgPreferences.cpp:348
 msgid "and"
 msgstr "i"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:252
+#: DlgAdvPreferencesBase.cpp:247
 msgid "stop work at this time"
 msgstr "aturar de fer feina a aquesta hora"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
-#: clientgui/DlgAdvPreferencesBase.cpp:522
+#: DlgAdvPreferencesBase.cpp:251 DlgAdvPreferencesBase.cpp:512
 msgid "(no restriction if equal)"
 msgstr "(cap restricció si és igual)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:261
-#: clientgui/DlgAdvPreferencesBase.cpp:527
+#: 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à:"
+msgstr "Horari preferit dels dies de la setmana. Aquesta selecció és la que s'aplicarà:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:266
-#: clientgui/DlgAdvPreferencesBase.cpp:532
+#: 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"
+msgstr "marcar la casella per especificar les hores per aquest dia de la setmana"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:272
-#: clientgui/DlgAdvPreferencesBase.cpp:538
+#: DlgAdvPreferencesBase.cpp:267 DlgAdvPreferencesBase.cpp:528
 msgid "Monday"
 msgstr "Dilluns"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:279
-#: clientgui/DlgAdvPreferencesBase.cpp:545
+#: DlgAdvPreferencesBase.cpp:274 DlgAdvPreferencesBase.cpp:535
 msgid "Tuesday"
 msgstr "Dimarts"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:286
-#: clientgui/DlgAdvPreferencesBase.cpp:552
+#: DlgAdvPreferencesBase.cpp:281 DlgAdvPreferencesBase.cpp:542
 msgid "Wednesday"
 msgstr "Dimecres"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:293
-#: clientgui/DlgAdvPreferencesBase.cpp:559
+#: DlgAdvPreferencesBase.cpp:288 DlgAdvPreferencesBase.cpp:549
 msgid "Thursday"
 msgstr "Dijous"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:300
-#: clientgui/DlgAdvPreferencesBase.cpp:566
+#: DlgAdvPreferencesBase.cpp:295 DlgAdvPreferencesBase.cpp:556
 msgid "Friday"
 msgstr "Divendres"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:307
-#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: DlgAdvPreferencesBase.cpp:302 DlgAdvPreferencesBase.cpp:563
 msgid "Saturday"
 msgstr "Dissabte"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:580
+#: DlgAdvPreferencesBase.cpp:309 DlgAdvPreferencesBase.cpp:570
 msgid "Sunday"
 msgstr "Diumenge"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:328
+#: DlgAdvPreferencesBase.cpp:323
 msgid "Other options"
 msgstr "Altres opcions"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:336
+#: DlgAdvPreferencesBase.cpp:330
 msgid "Switch between applications every"
 msgstr "Canviar entre aplicacions cada"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:345
+#: DlgAdvPreferencesBase.cpp:339
 msgid "On multiprocessor systems, use at most"
 msgstr "En equips multi-processador, utilitzar com a màxim"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
+#: DlgAdvPreferencesBase.cpp:346
 #, no-c-format
-msgid "% of the processors (0 means no restriction)"
-msgstr "% dels processadors (0 significa sense restriccions)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:355
-#: clientgui/DlgAdvPreferencesBase.cpp:618
-#: clientgui/DlgAdvPreferencesBase.cpp:640
-#: clientgui/DlgAdvPreferencesBase.cpp:661
-#: clientgui/DlgAdvPreferencesBase.cpp:683
-#: clientgui/DlgAdvPreferencesBase.cpp:694
+msgid "% of the processors (0 means ignore this setting)"
+msgstr "% dels processadors (0 significa ignorar aquesta opció)"
+
+#: 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:362
+#: DlgAdvPreferencesBase.cpp:356
 #, no-c-format
-msgid "% of CPU time (0 means no restriction)"
-msgstr "% de temps de CPU (0 significa sense restriccions)"
+msgid "% CPU time"
+msgstr "% temps de CPU"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:386
+#: DlgAdvPreferencesBase.cpp:378
 msgid "General options"
 msgstr "Opcions generals"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:395
+#: DlgAdvPreferencesBase.cpp:386
 msgid "Maximum download rate"
 msgstr "Màxima taxa de descàrrega"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:401
-#: clientgui/DlgAdvPreferencesBase.cpp:410
-msgid "KBytes/second (0 means no restriction)"
-msgstr "KBytes/segon (0 significa sense restriccions)"
+#: DlgAdvPreferencesBase.cpp:392 DlgAdvPreferencesBase.cpp:401
+msgid "KBytes/sec."
+msgstr "KBytes/seg."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:404
+#: DlgAdvPreferencesBase.cpp:395
 msgid "Maximum upload rate"
 msgstr "Màxima taxa de càrrega"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:417
+#: DlgAdvPreferencesBase.cpp:406
+msgid "Transfer at most"
+msgstr "Transferir com a molt"
+
+#: DlgAdvPreferencesBase.cpp:412
+msgid "Mbytes"
+msgstr "Mbytes"
+
+#: DlgAdvPreferencesBase.cpp:415
+msgid "every"
+msgstr "cada"
+
+#: DlgAdvPreferencesBase.cpp:421 DlgAdvPreferencesBase.cpp:444
+#: DlgAdvPreferencesBase.cpp:463
+msgid "days"
+msgstr "dies"
+
+#: DlgAdvPreferencesBase.cpp:429
 msgid "Minimum work buffer"
 msgstr "Buffer mínim de treball"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:425
+#: 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:431
-#: clientgui/DlgAdvPreferencesBase.cpp:449
-msgid "days (maximum value: 10)"
-msgstr "dies (valor màxim: 10)"
+msgstr "Intenti mantenir suficients tasques per mantenir-lo ocupat durant molts dies"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:437
+#: DlgAdvPreferencesBase.cpp:450
 msgid "Max additional work buffer"
 msgstr "Màxim buffer addicional de treball"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:445
+#: 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:454
-msgid "Transfer at most"
-msgstr "Transferir com a molt"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:462
-msgid "MBytes every"
-msgstr "cada MBytes"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:468
-msgid "days (0 means no restriction)"
-msgstr "dies (0 significa sense restriccions)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:476
+#: DlgAdvPreferencesBase.cpp:466
 msgid "Skip image file verification"
 msgstr "Ometre la verificació del fitxer"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:478
+#: 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:484
+#: DlgAdvPreferencesBase.cpp:476
 msgid "Connect options"
 msgstr "Opcions de connexió"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:487
+#: DlgAdvPreferencesBase.cpp:478
 msgid "Confirm before connecting to internet"
 msgstr "Confirmar abans de connectar a internet"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
-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"
+#: 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:493
+#: DlgAdvPreferencesBase.cpp:484
 msgid "Disconnect when done"
 msgstr "Desconnectar en finalitzar"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:495
+#: 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)"
+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:501
+#: DlgAdvPreferencesBase.cpp:492
 msgid "Network usage allowed"
 msgstr "Es permet la utilització de la xarxa"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:510
+#: DlgAdvPreferencesBase.cpp:500
 msgid "network usage start hour"
 msgstr "hora d'inici d'utilització de la xarxa"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:518
+#: DlgAdvPreferencesBase.cpp:508
 msgid "network usage stop hour"
 msgstr "hora de fi d'utilització de la xarxa"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:610
-#: clientgui/DlgItemProperties.cpp:257
+#: DlgAdvPreferencesBase.cpp:598 DlgItemProperties.cpp:231
 msgid "Disk usage"
 msgstr "Utilització de disc"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:622
+#: 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:626
-msgid "Gigabytes disk space (0 means no restriction)"
-msgstr "Espai en disc en Gigabytes (0 significa sense restriccions)"
+#: DlgAdvPreferencesBase.cpp:613
+msgid "Gigabytes disk space"
+msgstr "Gigabytes de espai en disc"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:629
+#: DlgAdvPreferencesBase.cpp:616
 msgid "Leave at least"
 msgstr "Deixar al menys"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:633
+#: 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:637
+#: DlgAdvPreferencesBase.cpp:624
 msgid "Gigabytes disk space free"
 msgstr "Gigabytes d'espai en disc lliure"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
+#: 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:649
+#: DlgAdvPreferencesBase.cpp:636
 #, no-c-format
 msgid "% of total disk space"
 msgstr "% del total d'espai en disc"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:652
+#: DlgAdvPreferencesBase.cpp:639
 msgid "Tasks checkpoint to disk at most every"
 msgstr "Actualitzar els punts de control de les tasques cada"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
+#: DlgAdvPreferencesBase.cpp:645
 msgid "seconds"
 msgstr "segons"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:668
+#: DlgAdvPreferencesBase.cpp:655
 #, no-c-format
 msgid "% of page file (swap space)"
 msgstr "% del fitxer d'intercanvi (espai d'intercanvi)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:675
+#: DlgAdvPreferencesBase.cpp:662
 msgid "Memory usage"
 msgstr "Utilització de memòria"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
+#: DlgAdvPreferencesBase.cpp:676
 #, no-c-format
 msgid "% when computer is in use"
 msgstr "% quan l'ordinador està en ús"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:701
+#: DlgAdvPreferencesBase.cpp:686
 #, no-c-format
 msgid "% when computer is idle"
 msgstr "% quan l'ordinador està en repòs"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:706
+#: DlgAdvPreferencesBase.cpp:691
 msgid "Leave applications in memory while suspended"
 msgstr "Deixar les aplicacions en memòria mentre estan en suspens"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:708
+#: 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:728
-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:"
+#: DlgAdvPreferencesBase.cpp:713
+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/DlgAdvPreferencesBase.cpp:738
+#: DlgAdvPreferencesBase.cpp:722
 msgid "Add..."
 msgstr "Afegir..."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:739
+#: DlgAdvPreferencesBase.cpp:723
 msgid "Add an application to this list"
 msgstr "Afegir una aplicació a la llista"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:744
+#: DlgAdvPreferencesBase.cpp:728 ViewProjects.cpp:202
+#: sg_ProjectCommandPopup.cpp:85
 msgid "Remove"
 msgstr "Eliminar"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:745
+#: DlgAdvPreferencesBase.cpp:729
 msgid "Remove an application from this list"
 msgstr "Eliminar una aplicació d'aquesta llista"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:754
+#: DlgAdvPreferencesBase.cpp:738
 msgid "For advanced options, refer to "
 msgstr "Per a les opcions avançades, vegeu "
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:65
-#, c-format
-msgid "%s Diagnostic Log Flags"
-msgstr "%s Registre dels Flags de Diagnòstic"
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:83
-msgid "These flags enable various types of diagnostic messages in the Event Log."
-msgstr ""
-"Aquest flags activen diversos tipus de missatges de diagnòstic en el "
-"Registre d'Esdeveniments. "
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:105
-msgid "Save all values and close the dialog"
-msgstr "Guardar tots els valors i tancar la finestra"
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:108
-msgid "Defaults"
-msgstr "Valors per defecte"
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:109
-msgid "Restore default settings"
-msgstr "Restaurar valors per defecte"
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:113
-msgid "Close the dialog without saving"
-msgstr "Tancar la finestra sense guardar"
-
-#: clientgui/DlgEventLog.cpp:226
+#: DlgEventLog.cpp:219
 #, c-format
 msgid "%s - Event Log"
 msgstr "%s - Registre d'esdeveniments"
 
-#: clientgui/DlgEventLog.cpp:236
+#: DlgEventLog.cpp:232 ViewMessages.cpp:117 ViewProjects.cpp:219
+#: ViewStatistics.cpp:435 ViewStatistics.cpp:2009 ViewTransfers.cpp:182
+#: ViewWork.cpp:232
 msgid "Project"
 msgstr "Projecte"
 
-#: clientgui/DlgEventLog.cpp:237
+#: DlgEventLog.cpp:233 ViewMessages.cpp:118
 msgid "Time"
 msgstr "Hora"
 
-#: clientgui/DlgEventLog.cpp:238
+#: DlgEventLog.cpp:234 ViewMessages.cpp:119
 msgid "Message"
 msgstr "Missatge"
 
-#: clientgui/DlgEventLog.cpp:300
-#: clientgui/DlgEventLog.cpp:364
+#: DlgEventLog.cpp:290 DlgEventLog.cpp:354
 msgid "&Show only this project"
 msgstr "&Mostrar només aquest projecte"
 
-#: clientgui/DlgEventLog.cpp:304
+#: DlgEventLog.cpp:294
 msgid "Copy &All"
 msgstr "&Copiar-ho Tot"
 
-#: clientgui/DlgEventLog.cpp:306
-#: clientgui/DlgEventLog.cpp:310
+#: DlgEventLog.cpp:296 DlgEventLog.cpp:300 ViewMessages.cpp:89
 msgid "Copy all the messages to the clipboard."
 msgstr "Copiar tots els missatges al porta papers."
 
-#: clientgui/DlgEventLog.cpp:315
+#: DlgEventLog.cpp:305
 msgid "Copy &Selected"
 msgstr "Copiar els &seleccionats"
 
-#: clientgui/DlgEventLog.cpp:318
-#: clientgui/DlgEventLog.cpp:326
-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:308 DlgEventLog.cpp:316 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."
 
-#: clientgui/DlgEventLog.cpp:320
-#: clientgui/DlgEventLog.cpp:328
-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:310 DlgEventLog.cpp:318 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."
 
-#: clientgui/DlgEventLog.cpp:335
-#: clientgui/DlgItemProperties.cpp:67
+#: DlgEventLog.cpp:325 DlgItemProperties.cpp:67
 msgid "&Close"
 msgstr "&Tancar"
 
-#: clientgui/DlgEventLog.cpp:344
+#: DlgEventLog.cpp:334 sg_BoincSimpleFrame.cpp:798 sg_DlgPreferences.cpp:442
 #, c-format
 msgid "Get help with %s"
 msgstr "Obtenir ajuda amb %s"
 
-#: clientgui/DlgEventLog.cpp:358
+#: DlgEventLog.cpp:348
 msgid "Show all &messages"
 msgstr "Mostrar &tots els missatges"
 
-#: clientgui/DlgEventLog.cpp:359
-#: clientgui/DlgEventLog.cpp:361
+#: DlgEventLog.cpp:349 DlgEventLog.cpp:351
 msgid "Show messages for all projects"
 msgstr "Mostrar els missatges de tots els projectes"
 
-#: clientgui/DlgEventLog.cpp:365
-#: clientgui/DlgEventLog.cpp:367
+#: DlgEventLog.cpp:355 DlgEventLog.cpp:357
 msgid "Show only the messages for the selected project"
 msgstr "Mostrar només el missatges del projecte seleccionat"
 
-#: clientgui/DlgExitMessage.cpp:82
+#: DlgExitMessage.cpp:82
 #, c-format
 msgid "%s - Exit Confirmation"
 msgstr "%s - Confirmació de Sortida"
 
-#: clientgui/DlgExitMessage.cpp:130
+#: DlgExitMessage.cpp:130
 #, c-format
 msgid ""
 "You have requested to exit the %s,\n"
@@ -1740,15 +1551,9 @@ msgid ""
 "\n"
 "If you also want to stop running the tasks,\n"
 "choose from the following options:"
-msgstr ""
-"Ha sol·licitat sortir de %s\n"
-"que li permet veure i administrar\n"
-"les tasques en execució en el seu ordinador.\n"
-"\n"
-"Si també desitja aturar l'execució de les tasques,\n"
-"triar entre les següents opcions:"
+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:"
 
-#: clientgui/DlgExitMessage.cpp:135
+#: DlgExitMessage.cpp:135
 #, c-format
 msgid ""
 "This will shut down %s and its tasks until either the\n"
@@ -1757,1023 +1562,916 @@ msgid ""
 "In most cases, it is better just to close the %s window\n"
 "rather than to exit the application; that will allow %s to run its\n"
 "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"
-"\n"
-"La majoria de vegades, es millor tancar la finestra de %s en lloc\n"
-"de finalitzar l'aplicació; això permetrà %s executar les seves tasques\n"
-"en els períodes de temps que ha seleccionat en les seves preferències."
+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."
 
-#: clientgui/DlgExitMessage.cpp:153
+#: DlgExitMessage.cpp:153
 #, c-format
 msgid "Stop running tasks when exiting the %s"
 msgstr "Aturar l'execució de tasques en sortir de %s"
 
-#: clientgui/DlgExitMessage.cpp:165
+#: DlgExitMessage.cpp:165
 msgid "Remember this decision and do not show this dialog."
 msgstr "Recordar aquesta opció i no mostrar aquesta finestra."
 
-#: clientgui/DlgExitMessage.cpp:178
-#: clientgui/DlgGenericMessage.cpp:125
-#: clientgui/DlgOptions.cpp:404
-#: clientgui/DlgSelectComputer.cpp:168
+#: DlgExitMessage.cpp:178 DlgGenericMessage.cpp:125 DlgOptions.cpp:401
+#: DlgSelectComputer.cpp:168 wizardex.cpp:378
 msgid "&Cancel"
 msgstr "&Cancel·lar"
 
-#: clientgui/DlgGenericMessage.cpp:112
+#: DlgGenericMessage.cpp:112
 msgid "Don't show this dialog again."
 msgstr "No tornar a mostrar aquesta finestra."
 
-#: clientgui/DlgItemProperties.cpp:194
-#: clientgui/DlgItemProperties.cpp:197
-#: clientgui/DlgItemProperties.cpp:200
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:168 DlgItemProperties.cpp:171
+#: DlgItemProperties.cpp:174 DlgItemProperties.cpp:177
 msgid "Don't fetch tasks for "
 msgstr "No obtenir tasques per "
 
-#: clientgui/DlgItemProperties.cpp:194
+#: DlgItemProperties.cpp:168
 msgid "Project preference"
 msgstr "Projecte preferent"
 
-#: clientgui/DlgItemProperties.cpp:197
+#: DlgItemProperties.cpp:171
 msgid "Account manager preference"
 msgstr "Preferències de l'administrador de comptes"
 
-#: clientgui/DlgItemProperties.cpp:200
+#: DlgItemProperties.cpp:174
 msgid "Project has no apps for "
 msgstr "El projecte no té aplicacions per "
 
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:177
 msgid "Client configuration excludes "
 msgstr "La configuració del client exclou "
 
-#: clientgui/DlgItemProperties.cpp:207
+#: DlgItemProperties.cpp:181
 msgid " work fetch deferred for"
 msgstr " feina ajornada durant"
 
-#: clientgui/DlgItemProperties.cpp:208
+#: DlgItemProperties.cpp:182
 msgid " work fetch deferral interval"
 msgstr " interval d'ajornament de la feina"
 
-#: clientgui/DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:213
 msgid "Properties of project "
 msgstr "Propietats del projecte "
 
-#: clientgui/DlgItemProperties.cpp:243
-#: clientgui/DlgOptions.cpp:221
+#: DlgItemProperties.cpp:217 DlgOptions.cpp:218
 msgid "General"
 msgstr "General"
 
-#: clientgui/DlgItemProperties.cpp:244
+#: DlgItemProperties.cpp:218
 msgid "Master URL"
 msgstr "URL principal"
 
-#: clientgui/DlgItemProperties.cpp:245
+#: DlgItemProperties.cpp:219
 msgid "User name"
 msgstr "Nom del usuari"
 
-#: clientgui/DlgItemProperties.cpp:246
+#: DlgItemProperties.cpp:220
 msgid "Team name"
 msgstr "Nom de l'equip"
 
-#: clientgui/DlgItemProperties.cpp:247
+#: DlgItemProperties.cpp:221 ViewProjects.cpp:224
 msgid "Resource share"
 msgstr "Compartició de recursos"
 
-#: clientgui/DlgItemProperties.cpp:249
+#: DlgItemProperties.cpp:223
 msgid "Scheduler RPC deferred for"
 msgstr "La programació RPC s'ha ajornat durant"
 
-#: clientgui/DlgItemProperties.cpp:252
+#: DlgItemProperties.cpp:226
 msgid "File downloads deferred for"
 msgstr "Descàrrega de fitxers posposada durant"
 
-#: clientgui/DlgItemProperties.cpp:255
+#: DlgItemProperties.cpp:229
 msgid "File uploads deferred for"
 msgstr "Lliurament de fitxers posposada durant"
 
-#: clientgui/DlgItemProperties.cpp:258
+#: DlgItemProperties.cpp:232
 msgid "Computer ID"
 msgstr "ID de l'ordinador"
 
-#: clientgui/DlgItemProperties.cpp:260
+#: DlgItemProperties.cpp:234
 msgid "Non CPU intensive"
 msgstr "Us no intensiu de la CPU"
 
-#: 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
+#: DlgItemProperties.cpp:234 DlgItemProperties.cpp:236
+#: DlgItemProperties.cpp:237 DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:242 DlgItemProperties.cpp:251
+#: DlgItemProperties.cpp:254 DlgItemProperties.cpp:257
 msgid "yes"
 msgstr "si"
 
-#: clientgui/DlgItemProperties.cpp:262
+#: DlgItemProperties.cpp:236
 msgid "Suspended via GUI"
 msgstr "Aturat via GUI"
 
-#: clientgui/DlgItemProperties.cpp:262
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:236 DlgItemProperties.cpp:237
 msgid "no"
 msgstr "no"
 
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:237
 msgid "Don't request more work"
 msgstr "No demanar més feina"
 
-#: clientgui/DlgItemProperties.cpp:265
+#: DlgItemProperties.cpp:239
 msgid "Scheduler call in progress"
 msgstr "Petició programada en execució"
 
-#: clientgui/DlgItemProperties.cpp:268
+#: DlgItemProperties.cpp:242
 msgid "Trickle-up pending"
 msgstr "Informació pendent"
 
-#: clientgui/DlgItemProperties.cpp:271
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:245 DlgItemProperties.cpp:247
 msgid "Host location"
 msgstr "Ubicació dl'ordinador central"
 
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:247
 msgid "default"
 msgstr "per defecte"
 
-#: clientgui/DlgItemProperties.cpp:277
+#: DlgItemProperties.cpp:251
 msgid "Added via account manager"
 msgstr "Afegit via l'administrador de comptes"
 
-#: clientgui/DlgItemProperties.cpp:280
+#: DlgItemProperties.cpp:254
 msgid "Remove when tasks done"
 msgstr "Eliminar quan les tasques hagin finalitzat"
 
-#: clientgui/DlgItemProperties.cpp:283
+#: DlgItemProperties.cpp:257
 msgid "Ended"
 msgstr "Finalitzat"
 
-#: clientgui/DlgItemProperties.cpp:285
-msgid "Tasks completed"
-msgstr "Tasques completades"
-
-#: clientgui/DlgItemProperties.cpp:286
-msgid "Tasks failed"
-msgstr "Tasques fallides"
-
-#: clientgui/DlgItemProperties.cpp:288
+#: DlgItemProperties.cpp:259
 msgid "Credit"
 msgstr "Crèdit"
 
-#: clientgui/DlgItemProperties.cpp:289
+#: DlgItemProperties.cpp:260
 msgid "User"
 msgstr "Usuari"
 
-#: clientgui/DlgItemProperties.cpp:296
+#: DlgItemProperties.cpp:267
 msgid "Host"
 msgstr "Ordinador central"
 
-#: clientgui/DlgItemProperties.cpp:305
+#: DlgItemProperties.cpp:276
 msgid "Scheduling"
 msgstr "Planificant"
 
-#: clientgui/DlgItemProperties.cpp:306
+#: DlgItemProperties.cpp:277
 msgid "Scheduling priority"
 msgstr "Planificació prioritària"
 
-#: clientgui/DlgItemProperties.cpp:307
+#: DlgItemProperties.cpp:278
 msgid "CPU"
 msgstr "CPU"
 
-#: clientgui/DlgItemProperties.cpp:331
+#: DlgItemProperties.cpp:302
 msgid "Duration correction factor"
 msgstr "Durada del factor de correcció"
 
-#: clientgui/DlgItemProperties.cpp:345
+#: DlgItemProperties.cpp:316
 msgid "Properties of task "
 msgstr "Propietats de la tasca "
 
-#: clientgui/DlgItemProperties.cpp:357
+#: DlgItemProperties.cpp:328 ViewWork.cpp:238
 msgid "Application"
 msgstr "Aplicació"
 
-#: clientgui/DlgItemProperties.cpp:358
+#: DlgItemProperties.cpp:329 ViewWork.cpp:239
 msgid "Name"
 msgstr "Nom"
 
-#: clientgui/DlgItemProperties.cpp:359
+#: DlgItemProperties.cpp:330
 msgid "State"
 msgstr "Estat"
 
-#: clientgui/DlgItemProperties.cpp:362
+#: DlgItemProperties.cpp:333
 msgid "Received"
 msgstr "Rebut"
 
-#: clientgui/DlgItemProperties.cpp:365
+#: DlgItemProperties.cpp:336
 msgid "Report deadline"
 msgstr "Data límit per informar"
 
-#: clientgui/DlgItemProperties.cpp:367
+#: DlgItemProperties.cpp:338
 msgid "Resources"
 msgstr "Recursos"
 
-#: clientgui/DlgItemProperties.cpp:370
+#: DlgItemProperties.cpp:341
 msgid "Estimated computation size"
 msgstr "Càlcul estimat de computació"
 
-#: clientgui/DlgItemProperties.cpp:373
+#: DlgItemProperties.cpp:344
 msgid "CPU time at last checkpoint"
 msgstr "Temps de CPU en el darrer punt de control"
 
-#: clientgui/DlgItemProperties.cpp:374
-#: clientgui/DlgItemProperties.cpp:389
+#: DlgItemProperties.cpp:345 DlgItemProperties.cpp:360
 msgid "CPU time"
 msgstr "Temps de CPU"
 
-#: clientgui/DlgItemProperties.cpp:376
-#: clientgui/DlgItemProperties.cpp:390
+#: DlgItemProperties.cpp:347 DlgItemProperties.cpp:361
 msgid "Elapsed time"
 msgstr "Temps transcorregut"
 
-#: clientgui/DlgItemProperties.cpp:378
+#: DlgItemProperties.cpp:349
 msgid "Estimated time remaining"
 msgstr "Temps estimat que resta"
 
-#: clientgui/DlgItemProperties.cpp:379
+#: DlgItemProperties.cpp:350
 msgid "Fraction done"
 msgstr "Fracció realitzada"
 
-#: clientgui/DlgItemProperties.cpp:380
+#: DlgItemProperties.cpp:351
 msgid "Virtual memory size"
 msgstr "Grandària de la memòria virtual"
 
-#: clientgui/DlgItemProperties.cpp:381
+#: DlgItemProperties.cpp:352
 msgid "Working set size"
 msgstr "Grandària del bloc de treball"
 
-#: clientgui/DlgItemProperties.cpp:383
+#: DlgItemProperties.cpp:354
 msgid "Directory"
 msgstr "Directori"
 
-#: clientgui/DlgItemProperties.cpp:386
+#: DlgItemProperties.cpp:357
 msgid "Process ID"
 msgstr "ID del procés"
 
-#: clientgui/DlgItemProperties.cpp:456
+#: DlgItemProperties.cpp:427 ViewWork.cpp:1032 sg_TaskPanel.cpp:823
 msgid "Local: "
 msgstr "Local: "
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: DlgOptions.cpp:129 DlgOptions.cpp:135
 msgid "Options"
 msgstr "Opcions"
 
-#: clientgui/DlgOptions.cpp:178
+#: DlgOptions.cpp:175
 msgid "Language:"
 msgstr "Idioma:"
 
-#: clientgui/DlgOptions.cpp:185
+#: DlgOptions.cpp:182
 msgid "What language should BOINC use?"
 msgstr "Quin idioma ha d'utilitzar BOINC?"
 
-#: clientgui/DlgOptions.cpp:189
+#: DlgOptions.cpp:186
 msgid "Notice reminder interval:"
 msgstr "Interval recordatori de notificacions:"
 
-#: clientgui/DlgOptions.cpp:196
+#: DlgOptions.cpp:193
 msgid "How often should BOINC remind you of new notices?"
 msgstr "Quants cops ha de recordar-li BOINC les notícies noves?"
 
-#: clientgui/DlgOptions.cpp:201
+#: DlgOptions.cpp:198
 msgid "Run Manager at login?"
 msgstr "Executar l'administrador en iniciar?"
 
-#: clientgui/DlgOptions.cpp:207
+#: DlgOptions.cpp:204
 msgid "Run the BOINC Manager when you log on."
 msgstr "Executar l'administrador BOINC quan s'identifiqui en el sistema."
 
-#: clientgui/DlgOptions.cpp:212
+#: DlgOptions.cpp:209
 msgid "Enable Manager exit dialog?"
 msgstr "Activar el diàleg de sortida de l'administrador?"
 
-#: clientgui/DlgOptions.cpp:218
+#: DlgOptions.cpp:215
 msgid "Display the exit dialog when shutting down the Manager."
 msgstr "Mostrar el diàleg de sortida en finalitzar l'administrador."
 
-#: clientgui/DlgOptions.cpp:229
+#: DlgOptions.cpp:226
 msgid "Dial-up and Virtual Private Network settings"
 msgstr "Paràmetres de trucada i Xarxa Privada Virtual"
 
-#: clientgui/DlgOptions.cpp:243
+#: DlgOptions.cpp:240
 msgid "&Set Default"
 msgstr "&Aplicar valors per defecte"
 
-#: clientgui/DlgOptions.cpp:248
+#: DlgOptions.cpp:245
 msgid "&Clear Default"
 msgstr "&Netejar valors per defecte"
 
-#: clientgui/DlgOptions.cpp:255
+#: DlgOptions.cpp:252
 msgid "Default Connection:"
 msgstr "Connexió per defecte:"
 
-#: clientgui/DlgOptions.cpp:262
+#: DlgOptions.cpp:259
 msgid "Connections"
 msgstr "Connexions"
 
-#: clientgui/DlgOptions.cpp:271
+#: DlgOptions.cpp:268
 msgid "Connect via HTTP proxy server"
 msgstr "Connectar utilitzant un servidor proxy HTTP"
 
-#: clientgui/DlgOptions.cpp:275
+#: DlgOptions.cpp:272
 msgid "HTTP Proxy Server Configuration"
 msgstr "Configuració del Servidor Proxy HTTP"
 
-#: clientgui/DlgOptions.cpp:283
-#: clientgui/DlgOptions.cpp:347
+#: DlgOptions.cpp:280 DlgOptions.cpp:344
 msgid "Address:"
 msgstr "Adreça:"
 
-#: clientgui/DlgOptions.cpp:291
-#: clientgui/DlgOptions.cpp:355
+#: DlgOptions.cpp:288 DlgOptions.cpp:352 ProxyPage.cpp:340 ProxyPage.cpp:360
 msgid "Port:"
 msgstr "Port:"
 
-#: clientgui/DlgOptions.cpp:299
-#: clientgui/DlgOptions.cpp:363
+#: DlgOptions.cpp:296 DlgOptions.cpp:360
 msgid "Don't use proxy for:"
 msgstr "No utilitzar un proxy per:"
 
-#: clientgui/DlgOptions.cpp:306
-#: clientgui/DlgOptions.cpp:370
+#: DlgOptions.cpp:303 DlgOptions.cpp:367
 msgid "Leave these blank if not needed"
 msgstr "Deixar en blanc si no es necessita"
 
-#: clientgui/DlgOptions.cpp:312
-#: clientgui/DlgOptions.cpp:376
+#: DlgOptions.cpp:309 DlgOptions.cpp:373 ProxyPage.cpp:343 ProxyPage.cpp:363
 msgid "User Name:"
 msgstr "Nom d'usuari:"
 
-#: clientgui/DlgOptions.cpp:320
-#: clientgui/DlgOptions.cpp:384
-#: clientgui/DlgSelectComputer.cpp:152
+#: DlgOptions.cpp:317 DlgOptions.cpp:381 DlgSelectComputer.cpp:152
+#: ProxyPage.cpp:346 ProxyPage.cpp:366
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: clientgui/DlgOptions.cpp:327
+#: DlgOptions.cpp:324
 msgid "HTTP Proxy"
 msgstr "Proxy HTTP"
 
-#: clientgui/DlgOptions.cpp:335
+#: DlgOptions.cpp:332
 msgid "Connect via SOCKS proxy server"
 msgstr "Connectar utilitzant un servidor proxy SOCKS"
 
-#: clientgui/DlgOptions.cpp:339
+#: DlgOptions.cpp:336
 msgid "SOCKS Proxy Server Configuration"
 msgstr "Configuració del Servidor Proxy SOCKS"
 
-#: clientgui/DlgOptions.cpp:391
+#: DlgOptions.cpp:388
 msgid "SOCKS Proxy"
 msgstr "Proxy SOCKS"
 
-#: clientgui/DlgOptions.cpp:589
+#: DlgOptions.cpp:586
 msgid "always"
 msgstr "sempre"
 
-#: clientgui/DlgOptions.cpp:590
+#: DlgOptions.cpp:587
 msgid "1 hour"
 msgstr "1 hora"
 
-#: clientgui/DlgOptions.cpp:591
+#: DlgOptions.cpp:588
 msgid "6 hours"
 msgstr "6 hores"
 
-#: clientgui/DlgOptions.cpp:592
+#: DlgOptions.cpp:589
 msgid "1 day"
 msgstr "1 dia"
 
-#: clientgui/DlgOptions.cpp:593
+#: DlgOptions.cpp:590
 msgid "1 week"
 msgstr "1 setmana"
 
-#: clientgui/DlgOptions.cpp:594
+#: DlgOptions.cpp:591
 msgid "never"
 msgstr "mai"
 
-#: clientgui/DlgOptions.cpp:691
+#: DlgOptions.cpp:688
 #, c-format
 msgid "%s - Language Selection"
 msgstr "%s - Selecció d'idioma"
 
-#: clientgui/DlgOptions.cpp:698
+#: DlgOptions.cpp:695
 #, c-format
-#, c-format, 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."
+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."
 
-#: clientgui/DlgSelectComputer.cpp:91
+#: DlgSelectComputer.cpp:91
 #, c-format
 msgid "%s - Select Computer"
 msgstr "%s - Seleccionar un Ordinador"
 
-#: clientgui/DlgSelectComputer.cpp:125
+#: 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 \n"
-"en aquest equip.  Si us plau, seleccioneu un client per controlar-la."
+msgstr "Una altra instància de %s ja s'està executant \nen aquest equip.  Si us plau, seleccioneu un client per controlar-la."
 
-#: clientgui/DlgSelectComputer.cpp:143
+#: DlgSelectComputer.cpp:143
 msgid "Host name:"
 msgstr "Nom ordinador:"
 
-#: clientgui/Localization.cpp:31
-#: clientgui/Localization.cpp:69
+#: Localization.cpp:31 Localization.cpp:69
 msgid "Message boards"
 msgstr "Taulers de missatges"
 
-#: clientgui/Localization.cpp:33
+#: 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"
+msgstr "Correspondència amb altres usuaris en els taulers de missatges de SETI at home"
 
-#: clientgui/Localization.cpp:37
+#: Localization.cpp:37
 msgid "Ask questions and report problems"
 msgstr "Feu preguntes i informeu dels problemes"
 
-#: clientgui/Localization.cpp:39
-#: clientgui/Localization.cpp:81
-#: clientgui/Localization.cpp:111
-#: clientgui/Localization.cpp:129
+#: Localization.cpp:39 Localization.cpp:81 Localization.cpp:111
+#: Localization.cpp:129
 msgid "Your account"
 msgstr "El vostre compte"
 
-#: clientgui/Localization.cpp:41
-#: clientgui/Localization.cpp:87
-#: clientgui/Localization.cpp:113
+#: Localization.cpp:41 Localization.cpp:87 Localization.cpp:113
 msgid "View your account information and credit totals"
 msgstr "Veure la informació del seu compte i crèdits totals"
 
-#: clientgui/Localization.cpp:43
+#: Localization.cpp:43
 msgid "Your preferences"
 msgstr "Les seves preferències"
 
-#: clientgui/Localization.cpp:45
+#: 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"
 
-#: clientgui/Localization.cpp:47
-#: clientgui/Localization.cpp:89
+#: Localization.cpp:47 Localization.cpp:89
 msgid "Your results"
 msgstr "Els seus resultats"
 
-#: clientgui/Localization.cpp:49
-#: clientgui/Localization.cpp:91
+#: Localization.cpp:49 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ó"
+msgstr "Veure la seva darrera setmana (o més) de resultats i treballs de computació"
 
-#: clientgui/Localization.cpp:51
-#: clientgui/Localization.cpp:93
+#: Localization.cpp:51 Localization.cpp:93
 msgid "Your computers"
 msgstr "Els seus ordinadors"
 
-#: clientgui/Localization.cpp:53
+#: 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"
+msgstr "Veure la llista de tots els ordinadors en els que vostè està executant SETI at Home"
 
-#: clientgui/Localization.cpp:55
-#: clientgui/Localization.cpp:97
+#: Localization.cpp:55 Localization.cpp:97
 msgid "Your team"
 msgstr "El seu equip"
 
-#: clientgui/Localization.cpp:57
-#: clientgui/Localization.cpp:99
+#: Localization.cpp:57 Localization.cpp:99
 msgid "View information about your team"
 msgstr "Veure la informació sobre el seu equip"
 
-#: clientgui/Localization.cpp:61
+#: Localization.cpp:61
 msgid "Common questions"
 msgstr "Preguntes freqüents"
 
-#: clientgui/Localization.cpp:63
+#: 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"
 
-#: clientgui/Localization.cpp:65
+#: Localization.cpp:65
 msgid "Screensaver info"
 msgstr "Informació del salva pantalles"
 
-#: clientgui/Localization.cpp:67
+#: 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"
 
-#: 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: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"
 
-#: clientgui/Localization.cpp:73
+#: Localization.cpp:73
 msgid "Einstein status"
 msgstr "Estat de Einstein"
 
-#: clientgui/Localization.cpp:75
+#: Localization.cpp:75
 msgid "Current status of the Einstein at Home server"
 msgstr "Estat actual del servidor de Einstein at Home"
 
-#: clientgui/Localization.cpp:77
+#: Localization.cpp:77
 msgid "Report problems"
 msgstr "Informar de problemes"
 
-#: clientgui/Localization.cpp:79
+#: 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"
 
-#: clientgui/Localization.cpp:83
+#: 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"
+msgstr "Veure i modificar el perfil i preferències del seu compte a Einstein at Home"
 
-#: clientgui/Localization.cpp:85
+#: Localization.cpp:85
 msgid "Account summary"
 msgstr "Resum del compte"
 
-#: 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: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"
 
-#: clientgui/Localization.cpp:101
+#: Localization.cpp:101
 msgid "LIGO project"
 msgstr "Projecte LIGO"
 
-#: 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: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)"
 
-#: clientgui/Localization.cpp:105
+#: Localization.cpp:105
 msgid "GEO-600 project"
 msgstr "Projecte GEO-600"
 
-#: clientgui/Localization.cpp:107
+#: Localization.cpp:107
 msgid "The home page of the GEO-600 project"
 msgstr "Pàgina del projecte GEO-600"
 
-#: clientgui/Localization.cpp:115
-#: clientgui/Localization.cpp:133
+#: Localization.cpp:115 Localization.cpp:133 ViewProjects.cpp:221
+#: ViewStatistics.cpp:465
 msgid "Team"
 msgstr "Equip"
 
-#: clientgui/Localization.cpp:117
+#: Localization.cpp:117
 msgid "Info about your Team"
 msgstr "Informació respecte de l'equip"
 
-#: clientgui/Localization.cpp:123
+#: Localization.cpp:123
 msgid "Get help for climateprediction.net"
 msgstr "Obtingui ajuda per a climateprediction.net"
 
-#: clientgui/Localization.cpp:125
+#: Localization.cpp:125
 msgid "News"
 msgstr "Novetats"
 
-#: clientgui/Localization.cpp:127
+#: Localization.cpp:127
 msgid "climateprediction.net News"
 msgstr "Novetats de climateprediction.net"
 
-#: clientgui/Localization.cpp:131
+#: Localization.cpp:131
 msgid "View your account information, credits, and trickles"
 msgstr "Veure la informació del seu compte, crèdits i preguntes"
 
-#: clientgui/Localization.cpp:135
+#: Localization.cpp:135
 msgid "Info about your team"
 msgstr "Informació respecte al seu equip"
 
-#: clientgui/Localization.cpp:141
+#: Localization.cpp:141
 msgid "Search for help in our help system"
 msgstr "Cercar ajuda en el nostre sistema d'ajuda"
 
-#: clientgui/Localization.cpp:143
+#: Localization.cpp:143
 msgid "Global Statistics"
 msgstr "Estadístiques Globals"
 
-#: clientgui/Localization.cpp:145
+#: Localization.cpp:145
 msgid "Summary statistics for World Community Grid"
 msgstr "Resum estadístiques de World Community Grid"
 
-#: clientgui/Localization.cpp:147
+#: Localization.cpp:147
 msgid "My Grid"
 msgstr "La meva graella"
 
-#: clientgui/Localization.cpp:149
+#: Localization.cpp:149
 msgid "Your statistics and settings"
 msgstr "Les seves estadístiques i paràmetres"
 
-#: clientgui/Localization.cpp:151
+#: Localization.cpp:151
 msgid "Device Profiles"
 msgstr "Perfils de Dispositius"
 
-#: clientgui/Localization.cpp:153
+#: Localization.cpp:153
 msgid "Update your device settings"
 msgstr "Actualitzar els paràmetres dels seus dispositius"
 
-#: clientgui/Localization.cpp:155
+#: Localization.cpp:155
 msgid "Research"
 msgstr "Recerca"
 
-#: clientgui/Localization.cpp:157
+#: Localization.cpp:157
 msgid "Learn about the projects hosted at World Community Grid"
 msgstr "Aprendre respecte del projectes controlats per la World Community Grid"
 
-#: clientgui/MainDocument.cpp:583
+#: MainDocument.cpp:583
 msgid "Starting client"
 msgstr "Iniciant client"
 
-#: clientgui/MainDocument.cpp:591
+#: MainDocument.cpp:591
 msgid "Connecting to client"
 msgstr "Connectant amb el client"
 
-#: clientgui/MainDocument.cpp:1205
+#: MainDocument.cpp:1195
 msgid "Retrieving system state; please wait..."
 msgstr "Recuperant l'estat del sistema; esperi si us plau..."
 
-#: clientgui/MainDocument.cpp:1826
+#: MainDocument.cpp:1816
 msgid "Missing application"
 msgstr "Manca l'aplicació"
 
-#: 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 "
+#: MainDocument.cpp:1817
+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"
 
-#: clientgui/MainDocument.cpp:2442
+#: MainDocument.cpp:2432
 msgid "on batteries"
 msgstr "en bateries"
 
-#: clientgui/MainDocument.cpp:2443
+#: MainDocument.cpp:2433
 msgid "computer is in use"
 msgstr "l'ordinador està en us"
 
-#: clientgui/MainDocument.cpp:2444
+#: MainDocument.cpp:2434
 msgid "user request"
 msgstr "sol.licitud de l'usuari"
 
-#: clientgui/MainDocument.cpp:2445
+#: MainDocument.cpp:2435
 msgid "time of day"
 msgstr "hora del dia"
 
-#: clientgui/MainDocument.cpp:2446
+#: MainDocument.cpp:2436
 msgid "CPU benchmarks in progress"
 msgstr "Test de la CPU en progrés"
 
-#: clientgui/MainDocument.cpp:2447
+#: MainDocument.cpp:2437
 msgid "need disk space - check preferences"
 msgstr "necessitat d'espai en disc - comprovar les preferències"
 
-#: clientgui/MainDocument.cpp:2448
+#: MainDocument.cpp:2438
 msgid "computer is not in use"
 msgstr "l'ordinador no està en us"
 
-#: clientgui/MainDocument.cpp:2449
+#: MainDocument.cpp:2439
 msgid "starting up"
 msgstr "iniciant"
 
-#: clientgui/MainDocument.cpp:2450
+#: MainDocument.cpp:2440
 msgid "an exclusive app is running"
 msgstr "s'està executant una aplicació amb exclusivitat"
 
-#: clientgui/MainDocument.cpp:2451
+#: MainDocument.cpp:2441
 msgid "CPU is busy"
 msgstr "La CPU està ocupada"
 
-#: clientgui/MainDocument.cpp:2452
+#: MainDocument.cpp:2442
 msgid "network bandwidth limit exceeded"
 msgstr "s'ha superat el límit d'ample de banda"
 
-#: clientgui/MainDocument.cpp:2453
+#: MainDocument.cpp:2443
 msgid "requested by operating system"
 msgstr "sol·licitat pel sistema operatiu"
 
-#: clientgui/MainDocument.cpp:2455
+#: MainDocument.cpp:2445
 msgid "unknown reason"
 msgstr "raó desconeguda"
 
-#: clientgui/MainDocument.cpp:2477
+#: MainDocument.cpp:2467
 msgid "GPU missing, "
 msgstr "GPU inexistent, "
 
-#: clientgui/MainDocument.cpp:2484
+#: MainDocument.cpp:2474
 msgid "New"
 msgstr "Nou"
 
-#: clientgui/MainDocument.cpp:2488
+#: MainDocument.cpp:2478
 msgid "Download failed"
 msgstr "La descàrrega ha fallat"
 
-#: clientgui/MainDocument.cpp:2490
+#: MainDocument.cpp:2480
 msgid "Downloading"
 msgstr "Descarregant"
 
-#: clientgui/MainDocument.cpp:2492
-#: clientgui/MainDocument.cpp:2557
+#: MainDocument.cpp:2482 MainDocument.cpp:2552
 msgid " (suspended - "
 msgstr " (suspès - "
 
-#: clientgui/MainDocument.cpp:2500
+#: MainDocument.cpp:2490
 msgid "Project suspended by user"
 msgstr "Projecte suspès per l'usuari"
 
-#: clientgui/MainDocument.cpp:2502
+#: MainDocument.cpp:2492
 msgid "Task suspended by user"
 msgstr "Tasca suspesa per l'usuari"
 
-#: clientgui/MainDocument.cpp:2504
+#: MainDocument.cpp:2494
 msgid "Suspended - "
 msgstr "Suspès - "
 
-# 75%
-#: clientgui/MainDocument.cpp:2510
+#: MainDocument.cpp:2500
 msgid "GPU suspended - "
 msgstr "GPU suspesa - "
 
-#: clientgui/MainDocument.cpp:2517
+#: MainDocument.cpp:2507
 msgid "Waiting for memory"
 msgstr "Esperant memòria"
 
-#: clientgui/MainDocument.cpp:2519
+#: MainDocument.cpp:2509
 msgid "Waiting for shared memory"
 msgstr "Esperant memòria compartida"
 
-#: clientgui/MainDocument.cpp:2521
+#: MainDocument.cpp:2512
+msgid "Running, high priority"
+msgstr "Executant, alta prioritat"
+
+#: MainDocument.cpp:2514
 msgid "Running"
 msgstr "Executant"
 
-#: clientgui/MainDocument.cpp:2523
+#: MainDocument.cpp:2517
 msgid " (non-CPU-intensive)"
 msgstr " (no-CPU-intensiva)"
 
-#: clientgui/MainDocument.cpp:2526
+#: MainDocument.cpp:2520
 msgid "Waiting to run"
 msgstr "Esperant per executar"
 
-#: clientgui/MainDocument.cpp:2528
-#: clientgui/MainDocument.cpp:2534
+#: MainDocument.cpp:2522 MainDocument.cpp:2528
 msgid "Ready to start"
 msgstr "A punt per començar"
 
-#: clientgui/MainDocument.cpp:2538
-msgid "Postponed: "
-msgstr "Ajornat: "
+#: MainDocument.cpp:2532
+msgid " (Scheduler wait: "
+msgstr " (Espera del programador: "
 
-#: clientgui/MainDocument.cpp:2541
-msgid "Postponed"
-msgstr "Ajornat"
+#: MainDocument.cpp:2536
+msgid " (Scheduler wait)"
+msgstr " (Espera del programador)"
 
-#: clientgui/MainDocument.cpp:2545
-msgid "Waiting for network access"
-msgstr "Esperant accés a la xarxa"
+#: MainDocument.cpp:2540
+msgid " (Waiting for network access)"
+msgstr " (Esperant accés a la xarxa)"
 
-#: clientgui/MainDocument.cpp:2549
+#: MainDocument.cpp:2544
 msgid "Computation error"
 msgstr "Error de computació"
 
-#: clientgui/MainDocument.cpp:2553
+#: MainDocument.cpp:2548
 msgid "Upload failed"
 msgstr "La càrrega ha fallat"
 
-#: clientgui/MainDocument.cpp:2555
+#: MainDocument.cpp:2550
 msgid "Uploading"
 msgstr "Carregant"
 
-#: clientgui/MainDocument.cpp:2566
+#: MainDocument.cpp:2561
 msgid "Aborted by user"
 msgstr "Avortat per l'usuari"
 
-#: clientgui/MainDocument.cpp:2569
+#: MainDocument.cpp:2564
 msgid "Aborted by project"
 msgstr "Avortat per el projecte"
 
-#: clientgui/MainDocument.cpp:2572
+#: MainDocument.cpp:2567
 msgid "Aborted: not started by deadline"
 msgstr "Avortat: no s'ha iniciat per haver superat el de temps de finalització"
 
-#: clientgui/MainDocument.cpp:2575
+#: MainDocument.cpp:2570
 msgid "Aborted: disk limit exceeded"
 msgstr "Avortat: s'ha superat el límit d'espai en disc"
 
-#: clientgui/MainDocument.cpp:2578
+#: MainDocument.cpp:2573
 msgid "Aborted: run time limit exceeded"
 msgstr "Avortat: s'ha superat el temps límit d'execució"
 
-#: clientgui/MainDocument.cpp:2581
+#: MainDocument.cpp:2576
 msgid "Aborted: memory limit exceeded"
 msgstr "Avortat: s'ha superat el límit de memòria"
 
-#: clientgui/MainDocument.cpp:2584
+#: MainDocument.cpp:2579
 msgid "Aborted"
 msgstr "Avortat"
 
-#: clientgui/MainDocument.cpp:2589
+#: MainDocument.cpp:2584
 msgid "Acknowledged"
 msgstr "Reconegut"
 
-#: clientgui/MainDocument.cpp:2591
+#: MainDocument.cpp:2586
 msgid "Ready to report"
 msgstr "A punt per informar"
 
-#: clientgui/MainDocument.cpp:2593
+#: MainDocument.cpp:2588
 #, c-format
 msgid "Error: invalid state '%d'"
 msgstr "Error: estat incorrecte '%d'"
 
-#: clientgui/NoInternetConnectionPage.cpp:179
+#: NoInternetConnectionPage.cpp:179
 msgid "No Internet connection"
 msgstr "No hi ha connexió a Internet"
 
-#: clientgui/NoInternetConnectionPage.cpp:182
+#: 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."
 
-#: clientgui/NotDetectedPage.cpp:181
+#: NotDetectedPage.cpp:181
 msgid "Project not found"
 msgstr "Projecte no trobat"
 
-#: clientgui/NotDetectedPage.cpp:184
+#: 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"
-"\n"
-"Si us plau verifiqui la URL i provi-ho de nou."
+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."
 
-#: clientgui/NotDetectedPage.cpp:188
+#: NotDetectedPage.cpp:188
 msgid "Account manager not found"
 msgstr "Administrador de comptes no trobat"
 
-#: clientgui/NotDetectedPage.cpp:191
+#: NotDetectedPage.cpp:191
 msgid ""
 "The URL you supplied is not that of a BOINC-based account\n"
 "manager.\n"
 "\n"
 "Please check the URL and try again."
-msgstr ""
-"La URL que ha subministrat no es correspon amb un compte basat en un\n"
-"administrador BOINC.\n"
-"\n"
-"Si us plau verifiqui la URL i provi-ho de nou."
+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."
 
-#: clientgui/NotFoundPage.cpp:181
+#: NotFoundPage.cpp:181
 msgid "Login Failed."
 msgstr "Ha Fallat la Identificació."
 
-#: clientgui/NotFoundPage.cpp:185
+#: 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."
 
-#: clientgui/NotFoundPage.cpp:189
+#: 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."
+msgstr "Verifiqui l'adreça de correu electrònic i contrasenya, i provi-ho de nou."
 
-#: clientgui/NoticeListCtrl.cpp:229
+#: NoticeListCtrl.cpp:222
 msgid "more..."
 msgstr "més..."
 
-#: clientgui/ProjectInfoPage.cpp:221
+#: ProjectInfoPage.cpp:477 ProjectInfoPage.cpp:778 ProjectInfoPage.cpp:782
+msgid "All"
+msgstr "Tot"
+
+#: ProjectInfoPage.cpp:615
 msgid "Choose a project"
 msgstr "Esculli un projecte"
 
-#: clientgui/ProjectInfoPage.cpp:228
+#: ProjectInfoPage.cpp:619
 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ó."
+msgstr "Per escollir un projecte, premi el seu nom o introdueixi la seva URL a continuació."
 
-#: clientgui/ProjectInfoPage.cpp:246
+#: ProjectInfoPage.cpp:623
 msgid "Categories:"
 msgstr "Catagories:"
 
-#: clientgui/ProjectInfoPage.cpp:267
+#: ProjectInfoPage.cpp:627 sg_ProjectPanel.cpp:89
 msgid "Projects:"
 msgstr "Projectes:"
 
-#: clientgui/ProjectInfoPage.cpp:279
+#: ProjectInfoPage.cpp:631
 msgid "Project details"
 msgstr "Detalls del projecte"
 
-#: clientgui/ProjectInfoPage.cpp:291
+#: ProjectInfoPage.cpp:635
 msgid "Research area:"
 msgstr "Àrea de recerca:"
 
-#: clientgui/ProjectInfoPage.cpp:302
+#: ProjectInfoPage.cpp:639
 msgid "Organization:"
 msgstr "Organització:"
 
-#: clientgui/ProjectInfoPage.cpp:313
+#: ProjectInfoPage.cpp:643
 msgid "Web site:"
 msgstr "Pàgina web:"
 
-#: clientgui/ProjectInfoPage.cpp:325
+#: ProjectInfoPage.cpp:647
 msgid "Supported systems:"
 msgstr "Sistemes compatibles:"
 
-#: clientgui/ProjectInfoPage.cpp:363
+#: ProjectInfoPage.cpp:651
 msgid "Project URL:"
 msgstr "&URL del projecte:"
 
-#: clientgui/ProjectInfoPage.cpp:499
-#: clientgui/ProjectInfoPage.cpp:754
-#: clientgui/ProjectInfoPage.cpp:758
-msgid "All"
-msgstr "Tot"
-
-#: clientgui/ProjectInfoPage.cpp:802
-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:826
+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?"
 
-#: clientgui/ProjectInfoPage.cpp:826
+#: ProjectInfoPage.cpp:850
 msgid "You already added this project. Please choose a different project."
 msgstr "Ja va afegir aquest projecte. Si us plau esculli un projecte diferent."
 
-#: clientgui/ProjectProcessingPage.cpp:321
+#: ProjectProcessingPage.cpp:321
 msgid "Communicating with project."
 msgstr "Establint comunicació amb el servidor."
 
-#: clientgui/ProjectProcessingPage.cpp:510
+#: ProjectProcessingPage.cpp:509
 msgid "Required files not found on the server."
 msgstr "Els fitxers sol·licitats no s'han trobat en el servidor."
 
-#: clientgui/ProjectProcessingPage.cpp:513
-#: clientgui/ProjectProcessingPage.cpp:586
+#: ProjectProcessingPage.cpp:512 ProjectProcessingPage.cpp:574
 msgid "An internal server error has occurred."
 msgstr "Ha ocorregut un error intern del servidor."
 
-#: clientgui/ProjectPropertiesPage.cpp:334
+#: ProjectPropertiesPage.cpp:334
 msgid ""
 "Communicating with project\n"
 "Please wait..."
-msgstr ""
-"Comunicant amb el projecte\n"
-"Si us plau, esperi..."
-
-#: 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 "Vostè s'ha 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.  Assegureu-vos de "
-"confiar-hi abans de continuar."
-
-#: clientgui/ProjectWelcomePage.cpp:277
-msgid "To continue, click Next."
-msgstr "Per continuar, prémer Següent."
+msgstr "Comunicant amb el projecte\nSi us plau, esperi..."
 
-#: clientgui/ProxyInfoPage.cpp:195
+#: ProxyInfoPage.cpp:195
 msgid "Network communication failure"
 msgstr "Fallo en la comunicació per xarxa"
 
-#: clientgui/ProxyInfoPage.cpp:199
+#: ProxyInfoPage.cpp:199
 msgid ""
 "The World Community Grid - BOINC software failed to communicate\n"
 "over the Internet. The most likely reasons are:\n"
@@ -2788,23 +2486,9 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"The World Community Grid - BOINC no ha pogut establir comunicació\n"
-"per Internet. Les raons més probables son:\n"
-"\n"
-"1) Problema de connectivitat.  Verifiqueu la vostra xarxa o la connexió per "
-"mòdem\n"
-"i després premeu Enrere per intentar-ho de nou.\n"
-"\n"
-"2) El programa tallafocs està bloquejant el programa The World Community\n"
-"Grid - BOINC.  Configureu el programa tallafocs per permetre\n"
-"que BOINC i BOINC-Manager comuniquin per el port 80 i el port 443,\n"
-"després premeu Enrere per intentar-ho de nou.\n"
-"\n"
-"3) Esteu fent servir un servidor proxy.\n"
-"Premeu Següent per configurar els paràmetres proxy de BOINC."
+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 [...]
 
-#: clientgui/ProxyInfoPage.cpp:203
+#: ProxyInfoPage.cpp:203
 msgid ""
 "BOINC failed to communicate on the Internet.\n"
 "The most likely reasons are:\n"
@@ -2819,2206 +2503,1201 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"BOINC no ha pogut comunicar per Internet.\n"
-"Les raons més probables son:\n"
-"\n"
-"1) Problema de connectivitat.  Verifiqueu la vostra xarxa\n"
-"o la connexió per mòdem i premeu Enrere per intentar-ho de nou.\n"
-"\n"
-"2) El programa tallafocs està bloquejant BOINC.\n"
-"Configureu el programa tallafocs per permetre que BOINC i\n"
-"l'Administrador BOINC comuniquin per el port 80,\n"
-"després premeu Enrere per intentar-ho de nou.\n"
-"\n"
-"3) Esteu fent servir un servidor proxy.\n"
-"Premeu Següent per configurar els paràmetres proxy de BOINC."
+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 [...]
 
-#: clientgui/ProxyPage.cpp:331
+#: ProxyPage.cpp:331
 msgid "Proxy configuration"
 msgstr "Configuració del proxy"
 
-#: clientgui/ProxyPage.cpp:334
+#: ProxyPage.cpp:334
 msgid "HTTP proxy"
 msgstr "Proxy HTTP"
 
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
+#: ProxyPage.cpp:337 ProxyPage.cpp:357
 msgid "Server:"
 msgstr "Servidor:"
 
-#: clientgui/ProxyPage.cpp:350
+#: ProxyPage.cpp:350
 msgid "Autodetect"
 msgstr "Auto detectar"
 
-#: clientgui/ProxyPage.cpp:354
+#: ProxyPage.cpp:354
 msgid "SOCKS proxy"
 msgstr "SOCKS proxy"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:167
-msgid "Advanced View...\tCtrl+Shift+A"
-msgstr "Vista Avançada...\tCTRL+SHIFT+A"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:168
-msgid "Display the advanced graphical interface."
-msgstr "Mostrar la interfície gràfica avançada."
+#: TermsOfUsePage.cpp:218
+msgid "Terms of Use"
+msgstr "Condicions d'ús"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:175
-msgid "Skin"
-msgstr "Aspecte"
+#: TermsOfUsePage.cpp:222
+msgid "Please read the following terms of use:"
+msgstr "Si us plau, llegeixi les següents condicions d'ús:"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:177
-msgid "Select the appearance of the user interface."
-msgstr "Seleccionar l'aparença de la interfície d'usuari."
+#: TermsOfUsePage.cpp:231
+msgid "I agree to the terms of use."
+msgstr "Accepto les condicions d'ús."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:224
-#, c-format
-msgid "&%s"
-msgstr "&%s"
+#: TermsOfUsePage.cpp:237
+msgid "I do not agree to the terms of use."
+msgstr "No accepto les condicions d'ús."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:405
-msgid "Default"
-msgstr "Per defecte"
+#: UnavailablePage.cpp:183
+msgid "Project temporarily unavailable"
+msgstr "Projecte temporalment no disponible"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:848
-msgid "Suspend"
-msgstr "Suspendre"
+#: 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."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:850
-msgid "Suspend Computing"
-msgstr "Suspendre la computació"
+#: UnavailablePage.cpp:190
+msgid "Account manager temporarily unavailable"
+msgstr "Administrador de comptes temporalment no disponible"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:851
-msgid "Resume Computing"
-msgstr "Restaurar la computació"
+#: 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."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:867
-msgid "Notices"
-msgstr "Notícies"
+#: ValidateAccountKey.cpp:68
+msgid "Please specify an account key to continue."
+msgstr "Si us plau entri una clau de compte per continuar."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:868
-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"
+#: 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"
 
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
-msgstr "Obtenint noticies, si us plau esperi..."
+#: ValidateAccountKey.cpp:82 ValidateEmailAddress.cpp:86
+msgid "Validation conflict"
+msgstr "Verificació fallida"
 
-#: clientgui/sg_DlgMessages.cpp:132
-msgid "There are no notices at this time."
-msgstr "No hi han notícies en aquest moment."
+#: ValidateEmailAddress.cpp:72
+msgid "Please specify an email address"
+msgstr "Si us plau entri el seu compte de correu"
 
-#: clientgui/sg_DlgMessages.cpp:146
-msgid "Close"
-msgstr "Tancar"
+#: 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"
 
-#: clientgui/sg_DlgMessages.cpp:394
-#, c-format
-msgid "%s - Notices"
-msgstr "%s - Notícies"
+#: ValidateURL.cpp:69
+msgid "Missing URL"
+msgstr "Falta la URL"
 
-#: clientgui/sg_DlgPreferences.cpp:270
-msgid "This dialog controls preferences for this computer only."
-msgstr "Aquest quadre de diàleg controla les preferències només d'aquest equip."
+#: 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/"
 
-#: clientgui/sg_DlgPreferences.cpp:275
-msgid "Click OK to set preferences."
-msgstr "Prem OK per confirmar preferències."
+#: ValidateURL.cpp:83 ValidateURL.cpp:87 ValidateURL.cpp:91
+#: ValidateURL.cpp:103 ValidateURL.cpp:107 ValidateURL.cpp:110
+msgid "Invalid URL"
+msgstr "URL incorrecte"
 
-#: clientgui/sg_DlgPreferences.cpp:280
-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ó."
+#: ValidateURL.cpp:84 ValidateURL.cpp:88 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"
 
-#: clientgui/sg_DlgPreferences.cpp:287
-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."
+#: ValidateURL.cpp:104 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."
 
-#: clientgui/sg_DlgPreferences.cpp:315
-msgid "Do work only between:"
-msgstr "Fer feina només entre:"
+#: ValidateURL.cpp:111
+#, c-format
+msgid "'%s' does not contain a valid path."
+msgstr "'%s' no conté una ruta vàlida."
 
-#: clientgui/sg_DlgPreferences.cpp:337
-msgid "Connect to internet only between:"
-msgstr "Connectar a internet només entre:"
+#: ViewMessages.cpp:84 ViewProjects.cpp:170 ViewStatistics.cpp:1978
+#: ViewTransfers.cpp:160 ViewWork.cpp:183
+msgid "Commands"
+msgstr "Ordres"
 
-#: clientgui/sg_DlgPreferences.cpp:359
-#: clientgui/sg_DlgPreferences.cpp:376
-msgid "Use no more than:"
-msgstr "No utilitzar més de:"
+#: ViewMessages.cpp:88
+msgid "Copy all messages"
+msgstr "Copiar tots els missatges"
 
-#: clientgui/sg_DlgPreferences.cpp:372
-msgid "of disk space"
-msgstr "de l'espai en disc"
+#: ViewMessages.cpp:95
+msgid "Copy selected messages"
+msgstr "Copiar els missatges seleccionats"
 
-#: clientgui/sg_DlgPreferences.cpp:389
-msgid "of the processor"
-msgstr "del processador"
+#: ViewMessages.cpp:106 ViewMessages.cpp:502
+msgid "Show only this project"
+msgstr "Mostrar només aquest projecte"
 
-#: clientgui/sg_DlgPreferences.cpp:393
-msgid "Do work while on battery?"
-msgstr "Fer feina mentre funcioni en bateries?"
+#: ViewMessages.cpp:107 ViewMessages.cpp:503
+msgid "Show only the messages for the selected project."
+msgstr "Mostrar només el missatges del projecte seleccionat."
 
-#: clientgui/sg_DlgPreferences.cpp:406
-msgid "Do work after idle for:"
-msgstr "Fer feina després d'estar inactiu durant:"
-
-#: clientgui/sg_DlgPreferences.cpp:431
-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"
-
-#: clientgui/sg_DlgPreferences.cpp:609
-#: clientgui/sg_DlgPreferences.cpp:612
-#: clientgui/sg_DlgPreferences.cpp:688
-#: clientgui/sg_DlgPreferences.cpp:692
-#: clientgui/sg_DlgPreferences.cpp:704
-#: clientgui/sg_DlgPreferences.cpp:708
-#: clientgui/sg_DlgPreferences.cpp:851
-#: clientgui/sg_DlgPreferences.cpp:862
-msgid "Anytime"
-msgstr "En qualsevol moment"
-
-#: clientgui/sg_DlgPreferences.cpp:645
-msgid "100 MB"
-msgstr "100 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:646
-msgid "200 MB"
-msgstr "200 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:647
-msgid "500 MB"
-msgstr "500 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:648
-msgid "1 GB"
-msgstr "1 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:649
-msgid "2 GB"
-msgstr "2 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:650
-msgid "5 GB"
-msgstr "5 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:651
-msgid "10 GB"
-msgstr "10 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:652
-msgid "20 GB"
-msgstr "20 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:653
-msgid "50 GB"
-msgstr "50 GB"
+#: ViewMessages.cpp:164
+msgid "Messages"
+msgstr "Missatges"
 
-#: clientgui/sg_DlgPreferences.cpp:654
-msgid "100 GB"
-msgstr "100 GB"
+#: ViewMessages.cpp:187
+msgid "Copying all messages to the clipboard..."
+msgstr "Copiar tots els missatges al porta papers..."
 
-#: clientgui/sg_DlgPreferences.cpp:724
-#, c-format
-msgid "%d MB"
-msgstr "%d MB"
+#: ViewMessages.cpp:223
+msgid "Copying selected messages to the clipboard..."
+msgstr "Copiant els missatges seleccionats al porta papers..."
 
-#: clientgui/sg_DlgPreferences.cpp:726
-#, c-format
-msgid "%4.2f GB"
-msgstr "%4.2f GB"
+#: ViewMessages.cpp:286
+msgid "Filtering messages..."
+msgstr "Filtrant missatges..."
 
-#: clientgui/sg_DlgPreferences.cpp:767
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
+#: ViewMessages.cpp:494
+msgid "Show all messages"
+msgstr "Mostrar tots els missatges"
 
-#: clientgui/sg_DlgPreferences.cpp:803
-msgid "0 (Run Always)"
-msgstr "0 (Executar Sempre)"
+#: ViewMessages.cpp:495
+msgid "Show messages for all projects."
+msgstr "Mostrar els missatges de tots els projectes."
 
-#: clientgui/sg_DlgPreferences.cpp:806
-#, c-format
-msgid "%d"
-msgstr "%d"
+#: ViewNotices.cpp:58 sg_DlgMessages.cpp:124
+msgid "Fetching notices; please wait..."
+msgstr "Obtenint noticies, si us plau esperi..."
 
-#: clientgui/sg_DlgPreferences.cpp:953
-#, c-format
-msgid "%s - Computing Preferences"
-msgstr "%s - Preferències de Càlcul"
+#: ViewNotices.cpp:65 sg_DlgMessages.cpp:132
+msgid "There are no notices at this time."
+msgstr "No hi han notícies en aquest moment."
 
-#: clientgui/sg_DlgPreferences.cpp:1033
-msgid "Do you really want to clear all local preferences?\n"
-msgstr "Està segur d'eliminar totes les preferències locals?\n"
+#: ViewNotices.cpp:99 sg_BoincSimpleFrame.cpp:776
+msgid "Notices"
+msgstr "Notícies"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:66
-#: clientgui/ViewProjects.cpp:179
+#: ViewProjects.cpp:174 sg_ProjectCommandPopup.cpp:61
 msgid "Update"
 msgstr "Actualitzar"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:67
-#: clientgui/ViewProjects.cpp:180
-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:175 sg_ProjectCommandPopup.cpp:62
+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
+msgid "Suspend"
+msgstr "Suspendre"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:73
-#: clientgui/sg_ProjectCommandPopup.cpp:129
-#: clientgui/ViewProjects.cpp:187
-#: clientgui/ViewProjects.cpp:727
+#: ViewProjects.cpp:182 ViewProjects.cpp:722 sg_ProjectCommandPopup.cpp:68
+#: sg_ProjectCommandPopup.cpp:114
 msgid "Suspend tasks for this project."
 msgstr "Suspendre les tasques d'aquest projecte."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:78
-#: clientgui/sg_ProjectCommandPopup.cpp:136
-#: clientgui/ViewProjects.cpp:193
-#: clientgui/ViewProjects.cpp:746
+#: ViewProjects.cpp:188 ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:73
+#: sg_ProjectCommandPopup.cpp:121
 msgid "No new tasks"
 msgstr "No descarregar tasques noves"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:79
-#: clientgui/ViewProjects.cpp:194
+#: ViewProjects.cpp:189 sg_ProjectCommandPopup.cpp:74
 msgid "Don't get new tasks for this project."
 msgstr "No obtenir noves tasques per aquest projecte."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:200
+#: ViewProjects.cpp:195 sg_ProjectCommandPopup.cpp:79
 msgid "Reset project"
 msgstr "Reiniciar el projecte"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:85
-#: clientgui/ViewProjects.cpp:201
-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:196 sg_ProjectCommandPopup.cpp:80
+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."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:91
-#: clientgui/ViewProjects.cpp:208
-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:203 sg_ProjectCommandPopup.cpp:86
+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)."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:96
-#: clientgui/sg_TaskCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:214
+#: ViewProjects.cpp:209 ViewWork.cpp:222 sg_ProjectCommandPopup.cpp:91
+#: sg_TaskCommandPopup.cpp:78
 msgid "Properties"
 msgstr "Propietats"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:97
-#: clientgui/ViewProjects.cpp:215
+#: ViewProjects.cpp:210 sg_ProjectCommandPopup.cpp:92
 msgid "Show project details."
 msgstr "Mostrar els detalls del projecte."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:126
-#: clientgui/ViewProjects.cpp:723
-msgid "Resume tasks for this project."
-msgstr "Continuar les tasques d'aquest projecte."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:133
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow new tasks"
-msgstr "Permetre noves tasques"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:134
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow fetching new tasks for this project."
-msgstr "Permetre l'obtenció de noves tasques per aquest projecte."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:137
-#: clientgui/ViewProjects.cpp:746
-msgid "Don't fetch new tasks for this project."
-msgstr "No obtenir noves tasques per aquest projecte."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:229
-#: clientgui/ViewProjects.cpp:443
-#, c-format
-msgid "Are you sure you want to reset project '%s'?"
-msgstr "Està segur que vol reiniciar el projecte '%s'?"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:235
-#: clientgui/ViewProjects.cpp:449
-msgid "Reset Project"
-msgstr "Reiniciar el Projecte"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:266
-#: clientgui/ViewProjects.cpp:501
-#, c-format
-msgid "Are you sure you want to remove project '%s'?"
-msgstr "Està segur que vol eliminar el projecte '%s'?"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:272
-#: clientgui/ViewProjects.cpp:507
-msgid "Remove Project"
-msgstr "Eliminar el Projecte"
-
-#: clientgui/sg_ProjectPanel.cpp:72
-msgid "Add Project"
-msgstr "Afegeix un projecte"
-
-#: clientgui/sg_ProjectPanel.cpp:73
-msgid "Synchronize"
-msgstr "Sincronitzar"
-
-#: clientgui/sg_ProjectPanel.cpp:74
-msgid "Work done for this project"
-msgstr "Treball realitzat per aquest projecte"
-
-#: clientgui/sg_ProjectPanel.cpp:77
-msgid "Synchronize projects with account manager system"
-msgstr "Sincronitzar els projectes amb el sistema de l'administrador de comptes"
-
-#: 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"
-
-#: clientgui/sg_ProjectPanel.cpp:145
-msgid "Project Web Pages"
-msgstr "Pàgines Web del Projecte"
-
-#: clientgui/sg_ProjectPanel.cpp:149
-msgid "Project Commands"
-msgstr "Comandaments del Projecte"
-
-#: 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"
-
-#: 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"
-
-#: clientgui/sg_TaskCommandPopup.cpp:66
-msgid "Show graphics"
-msgstr "Mostrar els gràfics"
-
-#: clientgui/sg_TaskCommandPopup.cpp:67
-msgid "Show application graphics in a window."
-msgstr "Mostrar els gràfics de l'aplicació en una finestra."
-
-#: clientgui/sg_TaskCommandPopup.cpp:73
-msgid "Suspend this task."
-msgstr "Suspendre aquesta tasca."
-
-#: clientgui/sg_TaskCommandPopup.cpp:78
-msgid "Abort"
-msgstr "Avortar"
-
-#: 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."
-
-#: clientgui/sg_TaskCommandPopup.cpp:85
-msgid "Show task details."
-msgstr "Mostrar els detalls de la tasca."
-
-#: clientgui/sg_TaskCommandPopup.cpp:119
-msgid "Resume work for this task."
-msgstr "Continuar la feina per aquesta tasca."
-
-#: clientgui/sg_TaskCommandPopup.cpp:123
-msgid "Suspend work for this task."
-msgstr "Aturar el treball d'aquesta tasca."
-
-#: 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)"
-
-#: clientgui/sg_TaskCommandPopup.cpp:272
-msgid "Abort task"
-msgstr "Avortar la tasca"
-
-#: 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."
-
-#: clientgui/sg_TaskPanel.cpp:469
-msgid "Not available"
-msgstr "No disponible"
-
-#: clientgui/sg_TaskPanel.cpp:480
-msgid "Tasks:"
-msgstr "Tasques:"
-
-#: clientgui/sg_TaskPanel.cpp:486
-msgid "Select a task to access"
-msgstr "Seleccioneu una tasca per accedir-hi"
-
-#: clientgui/sg_TaskPanel.cpp:497
-msgid "From:"
-msgstr "De:"
-
-#: clientgui/sg_TaskPanel.cpp:551
-msgid "This task's progress"
-msgstr "Progrés d'aquesta tasca"
-
-#: clientgui/sg_TaskPanel.cpp:569
-msgid "Task Commands"
-msgstr "Ordres de la tasca"
-
-#: 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"
-
-#: clientgui/sg_TaskPanel.cpp:705
-#, c-format
-msgid "Application: %s"
-msgstr "Aplicació: %s"
-
-#: clientgui/sg_TaskPanel.cpp:728
-#, c-format
-msgid "%.3f%%"
-msgstr "%.3f%%"
-
-#: clientgui/sg_TaskPanel.cpp:736
-msgid "Application: Not available"
-msgstr "Aplicació: No disponible"
-
-#: clientgui/sg_TaskPanel.cpp:836
-msgid "Not Available"
-msgstr "No Disponible"
-
-#: clientgui/sg_TaskPanel.cpp:851
-#, c-format
-msgid "Elapsed: %s"
-msgstr "Transcorregut: %s"
-
-#: clientgui/sg_TaskPanel.cpp:865
-#, c-format
-msgid "Remaining (estimated): %s"
-msgstr "Pendent (estimat): %s"
-
-#: clientgui/sg_TaskPanel.cpp:880
-#, c-format
-msgid "Status: %s"
-msgstr "Estat: %s"
-
-#: clientgui/sg_TaskPanel.cpp:1227
-msgid "Retrieving current status."
-msgstr "Recuperant estat actual."
-
-#: clientgui/sg_TaskPanel.cpp:1233
-msgid "Downloading work from the server."
-msgstr "Descarregant feina des del servidor."
-
-#: clientgui/sg_TaskPanel.cpp:1238
-msgid "Processing Suspended:  Running On Batteries."
-msgstr "Procés en suspens:  Execució En Bateries."
-
-#: clientgui/sg_TaskPanel.cpp:1240
-msgid "Processing Suspended:  User Active."
-msgstr "Procés en suspens:  Usuari Actiu."
-
-#: clientgui/sg_TaskPanel.cpp:1242
-msgid "Processing Suspended:  User paused processing."
-msgstr "Procés en suspens:  L'usuari ha aturat l'execució."
-
-#: clientgui/sg_TaskPanel.cpp:1244
-msgid "Processing Suspended:  Time of Day."
-msgstr "Procés en suspens:  Canviar Hora."
-
-#: clientgui/sg_TaskPanel.cpp:1246
-msgid "Processing Suspended:  Benchmarks Running."
-msgstr "Procés en suspens:  Executant Test de Rendiment."
-
-#: clientgui/sg_TaskPanel.cpp:1248
-msgid "Processing Suspended."
-msgstr "Procés en suspens."
-
-#: clientgui/sg_TaskPanel.cpp:1252
-msgid "Waiting to contact project servers."
-msgstr "Esperant contactar amb els servidors del projecte."
-
-#: clientgui/sg_TaskPanel.cpp:1256
-#: clientgui/sg_TaskPanel.cpp:1265
-msgid "Retrieving current status"
-msgstr "Recuperant l'estat actual"
-
-#: clientgui/sg_TaskPanel.cpp:1260
-msgid "No work available to process"
-msgstr "No hi ha feina disponible a processar"
-
-#: clientgui/sg_TaskPanel.cpp:1262
-msgid "Unable to connect to the core client"
-msgstr "Impossible connectar amb el client"
-
-#: clientgui/TermsOfUsePage.cpp:218
-msgid "Terms of Use"
-msgstr "Condicions d'ús"
-
-#: clientgui/TermsOfUsePage.cpp:222
-msgid "Please read the following terms of use:"
-msgstr "Si us plau, llegeixi les següents condicions d'ús:"
-
-#: clientgui/TermsOfUsePage.cpp:231
-msgid "I agree to the terms of use."
-msgstr "Accepto les condicions d'ús."
-
-#: clientgui/TermsOfUsePage.cpp:237
-msgid "I do not agree to the terms of use."
-msgstr "No accepto les condicions d'ús."
-
-#: clientgui/UnavailablePage.cpp:183
-msgid "Project temporarily unavailable"
-msgstr "Projecte temporalment no disponible"
-
-#: clientgui/UnavailablePage.cpp:186
-msgid ""
-"The project is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-"El Projecte no està disponible temporalment.\n"
-"\n"
-"Si us plau, provi-ho mes tard."
-
-#: clientgui/UnavailablePage.cpp:190
-msgid "Account manager temporarily unavailable"
-msgstr "Administrador de comptes temporalment no disponible"
-
-#: 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"
-"\n"
-"Si us plau, provi-ho mes tard."
-
-#: clientgui/ValidateAccountKey.cpp:68
-msgid "Please specify an account key to continue."
-msgstr "Si us plau entri una clau de compte per continuar."
-
-#: 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"
-
-#: clientgui/ValidateAccountKey.cpp:82
-#: clientgui/ValidateEmailAddress.cpp:86
-msgid "Validation conflict"
-msgstr "Verificació fallida"
-
-#: clientgui/ValidateEmailAddress.cpp:72
-msgid "Please specify an email address"
-msgstr "Si us plau entri el seu compte de correu"
-
-#: 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"
-
-#: clientgui/ValidateURL.cpp:69
-msgid "Missing URL"
-msgstr "Falta la URL"
-
-#: clientgui/ValidateURL.cpp:70
-msgid ""
-"Please specify a URL.\n"
-"For example:\n"
-"http://www.example.com/"
-msgstr ""
-"Si us plau especifiqui la URL.\n"
-"Per exemple:\n"
-"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 incorrecte"
-
-#: 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.\n"
-"Per exemple:\n"
-"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' no conté un nom vàlid de d'ordinador."
-
-#: clientgui/ValidateURL.cpp:111
-#, c-format
-msgid "'%s' does not contain a valid path."
-msgstr "'%s' no conté una ruta vàlida."
-
-#: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:175
-msgid "Commands"
-msgstr "Ordres"
-
-#: clientgui/ViewMessages.cpp:88
-msgid "Copy all messages"
-msgstr "Copiar tots els missatges"
-
-#: clientgui/ViewMessages.cpp:95
-msgid "Copy selected messages"
-msgstr "Copiar els missatges seleccionats"
-
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
-msgid "Show only this project"
-msgstr "Mostrar només aquest projecte"
-
-#: 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."
-
-#: clientgui/ViewMessages.cpp:164
-msgid "Messages"
-msgstr "Missatges"
-
-#: clientgui/ViewMessages.cpp:187
-msgid "Copying all messages to the clipboard..."
-msgstr "Copiar tots els missatges al porta papers..."
-
-#: clientgui/ViewMessages.cpp:223
-msgid "Copying selected messages to the clipboard..."
-msgstr "Copiant els missatges seleccionats al porta papers..."
-
-#: clientgui/ViewMessages.cpp:286
-msgid "Filtering messages..."
-msgstr "Filtrant missatges..."
-
-#: clientgui/ViewMessages.cpp:494
-msgid "Show all messages"
-msgstr "Mostrar tots els missatges"
-
-#: clientgui/ViewMessages.cpp:495
-msgid "Show messages for all projects."
-msgstr "Mostrar els missatges de tots els projectes."
-
-#: clientgui/ViewProjects.cpp:225
+#: ViewProjects.cpp:220 ViewStatistics.cpp:450
 msgid "Account"
 msgstr "Compte"
 
-#: clientgui/ViewProjects.cpp:227
+#: ViewProjects.cpp:222
 msgid "Work done"
 msgstr "Feina finalitzada"
 
-#: clientgui/ViewProjects.cpp:228
+#: ViewProjects.cpp:223
 msgid "Avg. work done"
 msgstr "Mitjana de la feina realitzada"
 
-#: clientgui/ViewProjects.cpp:230
+#: ViewProjects.cpp:225 ViewTransfers.cpp:188 ViewWork.cpp:234
 msgid "Status"
 msgstr "Estat"
 
-#: clientgui/ViewProjects.cpp:255
+#: ViewProjects.cpp:250
 msgid "Projects"
 msgstr "Projectes"
 
-#: clientgui/ViewProjects.cpp:307
+#: ViewProjects.cpp:302
 msgid "Updating project..."
 msgstr "Actualitzant el projecte..."
 
-#: clientgui/ViewProjects.cpp:349
+#: ViewProjects.cpp:344
 msgid "Resuming project..."
 msgstr "Continuant el projecte..."
 
-#: clientgui/ViewProjects.cpp:353
+#: ViewProjects.cpp:348
 msgid "Suspending project..."
 msgstr "Suspenent el projecte..."
 
-#: clientgui/ViewProjects.cpp:390
+#: ViewProjects.cpp:385
 msgid "Telling project to allow additional task downloads..."
 msgstr "Informant al projecte que es poden descarregar noves tasques..."
 
-#: clientgui/ViewProjects.cpp:394
+#: ViewProjects.cpp:389
 msgid "Telling project to not fetch any additional tasks..."
 msgstr "Informant al projecte de no es volen descarregar noves tasques..."
 
-#: clientgui/ViewProjects.cpp:430
+#: ViewProjects.cpp:425
 msgid "Resetting project..."
 msgstr "Reiniciant el projecte..."
 
-#: clientgui/ViewProjects.cpp:488
+#: ViewProjects.cpp:438 sg_ProjectCommandPopup.cpp:214
+#, 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
+msgid "Reset Project"
+msgstr "Reiniciar el Projecte"
+
+#: ViewProjects.cpp:483
 msgid "Removing project..."
 msgstr "Eliminant el projecte..."
 
-#: clientgui/ViewProjects.cpp:548
-msgid "Launching browser..."
-msgstr "Activant el navegador..."
+#: ViewProjects.cpp:496 sg_ProjectCommandPopup.cpp:251
+#, 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
+msgid "Remove Project"
+msgstr "Eliminar el Projecte"
+
+#: ViewProjects.cpp:543 ViewWork.cpp:599
+msgid "Launching browser..."
+msgstr "Activant el navegador..."
+
+#: ViewProjects.cpp:718 sg_ProjectCommandPopup.cpp:111
+msgid "Resume tasks for this project."
+msgstr "Continuar les tasques d'aquest projecte."
+
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:118
+msgid "Allow new tasks"
+msgstr "Permetre noves tasques"
+
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:119
+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
+msgid "Don't fetch new tasks for this project."
+msgstr "No obtenir noves tasques per aquest projecte."
 
-#: clientgui/ViewProjects.cpp:1063
+#: ViewProjects.cpp:1058
 msgid "Requested by user"
 msgstr "Sol.licitat per l'usuari"
 
-#: clientgui/ViewProjects.cpp:1064
+#: ViewProjects.cpp:1059
 msgid "To fetch work"
 msgstr "Per obtenir feina"
 
-#: clientgui/ViewProjects.cpp:1065
+#: ViewProjects.cpp:1060
 msgid "To report completed tasks"
 msgstr "Per informar sobre les tasques completades"
 
-#: clientgui/ViewProjects.cpp:1066
+#: ViewProjects.cpp:1061
 msgid "To send trickle-up message"
 msgstr "Per enviar un missatge"
 
-#: clientgui/ViewProjects.cpp:1067
+#: ViewProjects.cpp:1062
 msgid "Requested by account manager"
 msgstr "Sol·licitat per l'administrador de comptes"
 
-#: clientgui/ViewProjects.cpp:1068
+#: ViewProjects.cpp:1063
 msgid "Project initialization"
 msgstr "Inicialització del projecte"
 
-#: clientgui/ViewProjects.cpp:1069
+#: ViewProjects.cpp:1064
 msgid "Requested by project"
 msgstr "Sol·licitat per el projecte"
 
-#: clientgui/ViewProjects.cpp:1070
+#: ViewProjects.cpp:1065
 msgid "Unknown reason"
 msgstr "Raó desconeguda"
 
-#: clientgui/ViewProjects.cpp:1084
+#: ViewProjects.cpp:1079
 msgid "Suspended by user"
 msgstr "Suspès per l'usuari"
 
-#: clientgui/ViewProjects.cpp:1087
+#: ViewProjects.cpp:1082
 msgid "Won't get new tasks"
 msgstr "No es desitgen noves tasques"
 
-#: clientgui/ViewProjects.cpp:1090
+#: ViewProjects.cpp:1085
 msgid "Project ended - OK to remove"
 msgstr "Projecte finalitzat - OK per eliminar-lo"
 
-#: clientgui/ViewProjects.cpp:1093
+#: ViewProjects.cpp:1088
 msgid "Will remove when tasks done"
 msgstr "S'eliminarà quan les tasques hagin finalitzat"
 
-#: clientgui/ViewProjects.cpp:1096
+#: ViewProjects.cpp:1091
 msgid "Scheduler request pending"
 msgstr "Petició programada en espera"
 
-#: clientgui/ViewProjects.cpp:1102
+#: ViewProjects.cpp:1097
 msgid "Scheduler request in progress"
 msgstr "Petició programada en execució"
 
-#: clientgui/ViewProjects.cpp:1105
+#: ViewProjects.cpp:1100
 msgid "Trickle up message pending"
 msgstr "Degoteig de dades pendent"
 
-#: clientgui/ViewProjects.cpp:1111
+#: ViewProjects.cpp:1106
 msgid "Communication deferred "
 msgstr "Comunicació posposada "
 
-#: clientgui/ViewResources.cpp:62
+#: ViewResources.cpp:62
 msgid "Total disk usage"
 msgstr "Espai usat del total del disc"
 
-#: clientgui/ViewResources.cpp:83
+#: ViewResources.cpp:83
 msgid "Disk usage by BOINC projects"
 msgstr "Espai del disc usat per els projectes BOINC"
 
-#: clientgui/ViewResources.cpp:116
+#: ViewResources.cpp:116
 msgid "Disk"
 msgstr "Disc"
 
-#: clientgui/ViewResources.cpp:225
+#: ViewResources.cpp:249
 msgid "no projects: 0 bytes used"
 msgstr "cap projecte: 0 bytes utilitzats"
 
-#: clientgui/ViewResources.cpp:262
+#: ViewResources.cpp:286
 msgid "used by BOINC: "
 msgstr "utilitzat per BOINC: "
 
-#: clientgui/ViewResources.cpp:272
+#: ViewResources.cpp:296
 msgid "free, available to BOINC: "
 msgstr "lliure, disponible per BOINC: "
 
-#: clientgui/ViewResources.cpp:282
+#: ViewResources.cpp:306
 msgid "free, not available to BOINC: "
 msgstr "lliure, no disponible per BOINC: "
 
-#: clientgui/ViewResources.cpp:292
+#: ViewResources.cpp:316
 msgid "free: "
 msgstr "lliure: "
 
-#: clientgui/ViewResources.cpp:302
+#: ViewResources.cpp:326
 msgid "used by other programs: "
 msgstr "utilitzat per altres programes: "
 
-#: clientgui/ViewStatistics.cpp:1181
+#: ViewStatistics.cpp:1205
 msgid "User Total"
 msgstr "Total de l'Usuari"
 
-#: clientgui/ViewStatistics.cpp:1182
+#: ViewStatistics.cpp:1206
 msgid "User Average"
 msgstr "Mitjana de l'Usuari"
 
-#: clientgui/ViewStatistics.cpp:1183
+#: ViewStatistics.cpp:1207
 msgid "Host Total"
 msgstr "Total de l'Ordinador"
 
-#: clientgui/ViewStatistics.cpp:1184
+#: ViewStatistics.cpp:1208
 msgid "Host Average"
 msgstr "Mitjana de l'Ordinador"
 
-#: clientgui/ViewStatistics.cpp:1331
+#: ViewStatistics.cpp:1355
 #, c-format
 msgid "Last update: %.0f days ago"
 msgstr "Darrera actualització: fa %.0f dies"
 
-#: clientgui/ViewStatistics.cpp:1956
+#: ViewStatistics.cpp:1982
 msgid "Show user total"
 msgstr "Mostrar el total de l'usuari"
 
-#: clientgui/ViewStatistics.cpp:1957
+#: ViewStatistics.cpp:1983
 msgid "Show total credit for user"
 msgstr "Mostrar els crèdits totals de l'usuari"
 
-#: clientgui/ViewStatistics.cpp:1963
+#: ViewStatistics.cpp:1989
 msgid "Show user average"
 msgstr "Mostrar la mitjana de l'usuari"
 
-#: clientgui/ViewStatistics.cpp:1964
+#: ViewStatistics.cpp:1990
 msgid "Show average credit for user"
 msgstr "Mostrar el crèdit mitjà de l'usuari"
 
-#: clientgui/ViewStatistics.cpp:1970
+#: ViewStatistics.cpp:1996
 msgid "Show host total"
 msgstr "Mostrar el total de l'ordinador"
 
-#: clientgui/ViewStatistics.cpp:1971
+#: ViewStatistics.cpp:1997
 msgid "Show total credit for host"
 msgstr "Mostrar el crèdit total de l'ordinador"
 
-#: clientgui/ViewStatistics.cpp:1977
+#: ViewStatistics.cpp:2003
 msgid "Show host average"
 msgstr "Mostrar la mitjana de l'ordinador"
 
-#: clientgui/ViewStatistics.cpp:1978
+#: ViewStatistics.cpp:2004
 msgid "Show average credit for host"
 msgstr "Mostrar el crèdit mitjà de l'ordinador"
 
-#: clientgui/ViewStatistics.cpp:1987
+#: ViewStatistics.cpp:2013
 msgid "< &Previous project"
 msgstr "< Projecte &anterior"
 
-#: clientgui/ViewStatistics.cpp:1988
+#: ViewStatistics.cpp:2014
 msgid "Show chart for previous project"
 msgstr "Mostrar gràfica del projecte anterior"
 
-#: clientgui/ViewStatistics.cpp:1993
+#: ViewStatistics.cpp:2019
 msgid "&Next project >"
 msgstr "Projecte &següent >"
 
-#: clientgui/ViewStatistics.cpp:1994
+#: ViewStatistics.cpp:2020
 msgid "Show chart for next project"
 msgstr "Mostrar la gràfica del projecte següent"
 
-#: clientgui/ViewStatistics.cpp:2000
-#: clientgui/ViewStatistics.cpp:2390
+#: ViewStatistics.cpp:2026 ViewStatistics.cpp:2416
 msgid "Hide project list"
 msgstr "Amaga la llista de projectes"
 
-#: clientgui/ViewStatistics.cpp:2001
-#: clientgui/ViewStatistics.cpp:2390
+#: ViewStatistics.cpp:2027 ViewStatistics.cpp:2416
 msgid "Use entire area for graphs"
 msgstr "Utilitzeu tota l'espai per els gràfics"
 
-#: clientgui/ViewStatistics.cpp:2006
+#: ViewStatistics.cpp:2032
 msgid "Mode view"
 msgstr "Mode visual"
 
-#: clientgui/ViewStatistics.cpp:2010
+#: ViewStatistics.cpp:2036
 msgid "One project"
 msgstr "Un projecte"
 
-#: clientgui/ViewStatistics.cpp:2011
+#: ViewStatistics.cpp:2037
 msgid "Show one chart with selected project"
 msgstr "Mostrar la gràfica del projecte seleccionat"
 
-#: clientgui/ViewStatistics.cpp:2017
+#: ViewStatistics.cpp:2043
 msgid "All projects (separate)"
 msgstr "Tots els projectes (per separat)"
 
-#: clientgui/ViewStatistics.cpp:2018
+#: ViewStatistics.cpp:2044
 msgid "Show all projects, one chart per project"
 msgstr "Mostrar tots els projectes, una gràfica per projecte"
 
-#: clientgui/ViewStatistics.cpp:2024
+#: ViewStatistics.cpp:2050
 msgid "All projects (together)"
 msgstr "Tots els projectes (junts)"
 
-#: clientgui/ViewStatistics.cpp:2025
+#: ViewStatistics.cpp:2051
 msgid "Show one chart with all projects"
 msgstr "Mostrar una gràfica amb tots els projectes"
 
-#: clientgui/ViewStatistics.cpp:2031
+#: ViewStatistics.cpp:2057
 msgid "All projects (sum)"
 msgstr "Tots els projectes (suma)"
 
-#: clientgui/ViewStatistics.cpp:2032
+#: ViewStatistics.cpp:2058
 msgid "Show one chart with sum of projects"
 msgstr "Mostrar una gràfica amb tots els projectes sumats"
 
-#: clientgui/ViewStatistics.cpp:2053
+#: ViewStatistics.cpp:2079
 msgid "Statistics"
 msgstr "Estadístiques"
 
-#: 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
+#: 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
 msgid "Updating charts..."
 msgstr "Actualitzant les gràfiques..."
 
-#: clientgui/ViewStatistics.cpp:2394
+#: ViewStatistics.cpp:2420
 msgid "Show project list"
 msgstr "Mostrar la llista de projectes"
 
-#: clientgui/ViewStatistics.cpp:2394
+#: ViewStatistics.cpp:2420
 msgid "Uses smaller area for graphs"
 msgstr "Utilitza un àrea més petita per als gràfics"
 
-#: clientgui/ViewTransfers.cpp:169
+#: ViewTransfers.cpp:164
 msgid "Retry Now"
 msgstr "Re-intentar ara"
 
-#: clientgui/ViewTransfers.cpp:170
+#: ViewTransfers.cpp:165
 msgid "Retry the file transfer now"
 msgstr "Re intentar ara la transferència d'arxius"
 
-#: clientgui/ViewTransfers.cpp:176
+#: ViewTransfers.cpp:171
 msgid "Abort Transfer"
 msgstr "Avortar el lliurament"
 
-#: clientgui/ViewTransfers.cpp:177
+#: ViewTransfers.cpp:172
 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."
 
-#: clientgui/ViewTransfers.cpp:188
+#: ViewTransfers.cpp:183
 msgid "File"
 msgstr "Fitxer"
 
-#: clientgui/ViewTransfers.cpp:189
-#: clientgui/ViewWork.cpp:238
+#: ViewTransfers.cpp:184 ViewWork.cpp:233
 msgid "Progress"
 msgstr "Progrés"
 
-#: clientgui/ViewTransfers.cpp:190
+#: ViewTransfers.cpp:185
 msgid "Size"
 msgstr "Mida"
 
-#: clientgui/ViewTransfers.cpp:191
+#: ViewTransfers.cpp:186
 msgid "Elapsed Time"
 msgstr "Temps transcorregut"
 
-#: clientgui/ViewTransfers.cpp:192
+#: ViewTransfers.cpp:187
 msgid "Speed"
 msgstr "Velocitat"
 
-#: clientgui/ViewTransfers.cpp:218
+#: ViewTransfers.cpp:213
 msgid "Transfers"
 msgstr "Lliuraments"
 
-#: clientgui/ViewTransfers.cpp:285
+#: ViewTransfers.cpp:280
 msgid "Network activity is suspended - "
 msgstr "Activitat de xarxa suspesa - "
 
-#: clientgui/ViewTransfers.cpp:287
+#: ViewTransfers.cpp:282
 msgid ""
 ".\n"
 "You can enable it using the Activity menu."
-msgstr ""
-".\n"
-"Pot activar-la utilitzant el menú Activitat."
+msgstr ".\nPot activar-la utilitzant el menú Activitat."
 
-#: clientgui/ViewTransfers.cpp:290
+#: ViewTransfers.cpp:285
 msgid "BOINC"
 msgstr "BOINC"
 
-#: clientgui/ViewTransfers.cpp:297
+#: ViewTransfers.cpp:292
 msgid "Retrying transfer now..."
 msgstr "Re-intentar el lliurament ara..."
 
-#: clientgui/ViewTransfers.cpp:335
+#: ViewTransfers.cpp:330
 msgid "Aborting transfer..."
 msgstr "Avortant la transferència..."
 
-#: clientgui/ViewTransfers.cpp:348
+#: ViewTransfers.cpp:343
 #, 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 ""
-"Està segur que vol avortar el lliurament del fitxer '%s'?\n"
-"NOTA: Cancel·lant el lliurament invalidarà la tasca i\n"
-"no rebrà crèdit per ella."
+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."
 
-#: clientgui/ViewTransfers.cpp:354
+#: ViewTransfers.cpp:349
 msgid "Abort File Transfer"
 msgstr "Avortar el Lliurament del Fitxer"
 
-#: clientgui/ViewTransfers.cpp:785
+#: ViewTransfers.cpp:780
 msgid "Upload"
 msgstr "Pujar"
 
-#: clientgui/ViewTransfers.cpp:785
+#: ViewTransfers.cpp:780
 msgid "Download"
 msgstr "Descarregar"
 
-#: clientgui/ViewTransfers.cpp:789
+#: ViewTransfers.cpp:784
 msgid "retry in "
 msgstr "re-intentar en "
 
-#: clientgui/ViewTransfers.cpp:791
+#: ViewTransfers.cpp:786
 msgid "failed"
 msgstr "ha fallat"
 
-#: clientgui/ViewTransfers.cpp:794
+#: ViewTransfers.cpp:789
 msgid "suspended"
 msgstr "suspès"
 
-#: clientgui/ViewTransfers.cpp:799
+#: ViewTransfers.cpp:794
 msgid "active"
 msgstr "actiu"
 
-#: clientgui/ViewTransfers.cpp:801
+#: ViewTransfers.cpp:796
 msgid "pending"
 msgstr "pendent"
 
-#: clientgui/ViewTransfers.cpp:808
+#: ViewTransfers.cpp:803
 msgid " (project backoff: "
 msgstr " (backoff del projecte: "
 
-#: clientgui/ViewWork.cpp:192
-#: clientgui/ViewWork.cpp:782
+#: ViewWork.cpp:187 ViewWork.cpp:777
 msgid "Show active tasks"
 msgstr "Mostrar les tasques actives"
 
-#: clientgui/ViewWork.cpp:193
-#: clientgui/ViewWork.cpp:783
+#: ViewWork.cpp:188 ViewWork.cpp:778
 msgid "Show only active tasks."
 msgstr "Mostrar només les tasques actives."
 
-#: clientgui/ViewWork.cpp:206
+#: ViewWork.cpp:194 sg_TaskCommandPopup.cpp:60
+msgid "Show graphics"
+msgstr "Mostrar els gràfics"
+
+#: ViewWork.cpp:195 sg_TaskCommandPopup.cpp:61
+msgid "Show application graphics in a window."
+msgstr "Mostrar els gràfics de l'aplicació en una finestra."
+
+#: ViewWork.cpp:201
 msgid "Show VM Console"
 msgstr "Mostrar la consola de la VM"
 
-#: clientgui/ViewWork.cpp:207
+#: ViewWork.cpp:202
 msgid "Show VM Console in a window."
 msgstr "Mostra la consola de la VM en una finestra."
 
-#: clientgui/ViewWork.cpp:214
+#: ViewWork.cpp:209
 msgid "Suspend work for this result."
 msgstr "Suspendre la feina per aquest resultat."
 
-#: clientgui/ViewWork.cpp:221
+#: ViewWork.cpp:215 sg_TaskCommandPopup.cpp:72
+msgid "Abort"
+msgstr "Avortar"
+
+#: ViewWork.cpp:216
 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."
 
-#: clientgui/ViewWork.cpp:240
+#: ViewWork.cpp:223 sg_TaskCommandPopup.cpp:79
+msgid "Show task details."
+msgstr "Mostrar els detalls de la tasca."
+
+#: ViewWork.cpp:235
 msgid "Elapsed"
 msgstr "Transcorregut"
 
-#: clientgui/ViewWork.cpp:241
+#: ViewWork.cpp:236
 msgid "Remaining (estimated)"
 msgstr "Pendent (estimat)"
 
-#: clientgui/ViewWork.cpp:242
+#: ViewWork.cpp:237
 msgid "Deadline"
 msgstr "Temps límit"
 
-#: clientgui/ViewWork.cpp:269
+#: ViewWork.cpp:264
 msgid "Tasks"
 msgstr "Tasques"
 
-#: clientgui/ViewWork.cpp:362
+#: ViewWork.cpp:357
 msgid "Resuming task..."
 msgstr "Continuar la tasca..."
 
-#: clientgui/ViewWork.cpp:365
-msgid "Suspending task..."
-msgstr "Suspendre la tasca..."
-
-#: clientgui/ViewWork.cpp:394
-msgid "Showing graphics for task..."
-msgstr "Mostrant els gràfics de la tasca..."
-
-#: clientgui/ViewWork.cpp:431
-msgid "Showing VM console for task..."
-msgstr "Mostrant consola de la VM per a la tasca..."
-
-#: clientgui/ViewWork.cpp:484
-#, 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)"
-
-#: clientgui/ViewWork.cpp:490
-#, c-format
-msgid "Are you sure you want to abort these %d tasks?"
-msgstr "Està segur que vol avortar aquestes %d tasques?"
-
-# 75%
-#: clientgui/ViewWork.cpp:504
-msgid "Aborting task..."
-msgstr "Avortant la tasca..."
-
-#: clientgui/ViewWork.cpp:776
-msgid "Show all tasks"
-msgstr "Mostrar totes les tasques"
-
-#: clientgui/ViewWork.cpp:777
-msgid "Show all tasks."
-msgstr "Mostrar totes les tasques."
-
-#: clientgui/WelcomePage.cpp:284
-msgid "Add project or account manager"
-msgstr "Afegir un projecte o administrador de comptes"
-
-#: clientgui/WelcomePage.cpp:288
-msgid "Add project or use BOINC Account Manager"
-msgstr "Afegir un projecte o utilitzar l'Administrador de Comptes de BOINC"
-
-#: 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 ""
-"Si és possible, afegeixi projectes en la\n"
-"pàgina web %s.\n"
-"\n"
-"Els projectes afegits amb aquest assessor no seran\n"
-"mostrats o administrats amb %s."
-
-#: clientgui/WelcomePage.cpp:313
-msgid ""
-"There are over 30 BOINC-based projects\n"
-"doing research in many areas of science,\n"
-"and you can volunteer for as many of them as you like.\n"
-"You can add a project directly,\n"
-"or use an 'Account Manager' web site to select projects."
-msgstr ""
-"Hi ha més de 30 projectes basats en BOINC\n"
-"fent recerca en moltes àrees de la ciència,\n"
-"i pot ser voluntari per a tants d'ells com vulgui.\n"
-"Pot unir-se directament a un projecte,\n"
-"o utilitzar un 'Administrador de comptes' per seleccionar els projectes."
-
-#: 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 ""
-"Has escollit afegir un nou projecte de computació voluntària o canviar els "
-"projectes\n"
-"en els que contribueixes.\n"
-"\n"
-"Alguns d'aquests projectes són administrats i manejats per World Community "
-"Grid, mentre que d'altres\n"
-"són executats i administrats per altres investigadors o organitzacions. El "
-"programari BOINC\n"
-"pot repartir la potència de processament entre qualsevol combinació de "
-"projectes.\n"
-"\n"
-"Alternativament, si s'ha registrat a un administrador de comptes de BOINC, "
-"pot utilitzar-lo\n"
-"per a triar quins projectes donar suport.\n"
-"\n"
-"Si us plau, esculli quin tipus de canvi que vol fer:\n"
-
-#: clientgui/WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
-msgstr "Utilitzar un administrador de comptes de BOINC"
-
-#: clientgui/WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
-msgstr "Afegir o canviar els teus projectes de World Community Grid"
-
-#: clientgui/WelcomePage.cpp:361
-msgid "Add projects run by other researchers or organizations"
-msgstr "Afegir projectes dirigits per altres investigadors o organitzacions"
-
-#: clientgui/WizardAttach.cpp:673
-msgid "Do you really want to cancel?"
-msgstr "Realment vol cancel·lar?"
-
-#: clientgui/WizardAttach.cpp:674
-msgid "Question"
-msgstr "Pregunta"
-
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
-msgid "&Next >"
-msgstr "&Següent >"
-
-#: clientgui/wizardex.cpp:383
-msgid "< &Back"
-msgstr "< &Enrere"
-
-#: clientgui/wizardex.cpp:553
-msgid "&Finish"
-msgstr "&Finalitzar"
-
-#: clientgui/common/wxPieCtrl.cpp:64
-msgid "Pie Ctrl"
-msgstr "Ctrl de Pastis"
-
-#: clientgui/mac/Mac_GUI.cpp:35
-msgid "Services"
-msgstr "Serveis"
-
-#: clientgui/mac/Mac_GUI.cpp:36
-#, c-format
-msgid "Hide %s"
-msgstr "Amaga %s"
-
-#: clientgui/mac/Mac_GUI.cpp:37
-msgid "Hide Others"
-msgstr "Amaga Altres"
-
-#: clientgui/mac/Mac_GUI.cpp:38
-msgid "Show All"
-msgstr "Mostra Tot"
-
-#: clientgui/mac/Mac_GUI.cpp:39
-#, c-format
-msgid "Quit %s"
-msgstr "Sortir de %s"
-
-#: clientgui/DlgAdvPreferences.h:30
-msgid "specify work start and stop hours in format HH:MM-HH:MM"
-msgstr "especifiqui les hores de inici i fi de treball en el format HH:MM-HH:MM"
-
-#: clientgui/DlgAdvPreferences.h:31
-msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
-msgstr ""
-"especifiqui les hores de inici i fi d'ús de la xarxa en el format HH:MM-"
-"HH:MM"
-
-# 98%
-#~ msgid ""
-#~ "(C) 2003-2013 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2013 Universitat de Califòrnia, Berkeley.\n"
-#~ "Tots els Drets Reservats."
-
-#, c-format
-#~ msgid "%s - Preferences"
-#~ msgstr "%s - Preferències"
-
-#, no-c-format
-#~ msgid "% of the processors (0 means ignore this setting)"
-#~ msgstr "% dels processadors (0 significa ignorar aquesta opció)"
-
-#, no-c-format
-#~ msgid "% CPU time"
-#~ msgstr "% temps de CPU"
-
-#~ msgid "KBytes/sec."
-#~ msgstr "KBytes/seg."
-
-#~ msgid "Mbytes"
-#~ msgstr "Mbytes"
-
-#~ msgid "every"
-#~ msgstr "cada"
-
-#~ msgid "days"
-#~ msgstr "dies"
-
-#~ msgid "Gigabytes disk space"
-#~ msgstr "Gigabytes de espai en disc"
-
-#~ msgid "Running, high priority"
-#~ msgstr "Executant, alta prioritat"
-
-#~ msgid " (Scheduler wait: "
-#~ msgstr " (Espera del programador: "
-
-#~ msgid " (Scheduler wait)"
-#~ msgstr " (Espera del programador)"
-
-#~ msgid " (Waiting for network access)"
-#~ msgstr " (Esperant accés a la xarxa)"
-
-#~ msgid "Preferences…"
-#~ msgstr "Preferències…"
-
-#~ msgid "I do not agree with the terms of use."
-#~ msgstr "No accepto les condicions d'ús."
-
-#~ msgid "Click Clear to restore web-based settings."
-#~ msgstr "Prem Netejar per restaurar la configuració basada en web."
-
-#~ msgid "For additional settings, select Computing Preferences in "
-#~ msgstr "Per altres paràmetres, selecciona Preferències de Computació a "
-
-#~ msgid "the Advanced View."
-#~ msgstr "Vista Avançada."
-
-#~ msgid "Workunit name"
-#~ msgstr "Nom de la feina"
-
-#~ msgid "invalid float"
-#~ msgstr "número decimal incorrecte"
-
-#~ msgid "Display the advanced (accessible) graphical interface."
-#~ msgstr "Mostrar la interfície gràfica avançada (accessible)."
-
-#~ msgid "Paused: Other work running"
-#~ msgstr "En pausa: Hi ha altres tasques en execució"
-
-#~ msgid "Paused: User initiated.  Click 'Resume' to continue"
-#~ msgstr "En pausa: Usuari iniciat.  Premi 'Continuar' per a continuar"
-
-#~ msgid "Paused: User active"
-#~ msgstr "En pausa: Usuari actiu"
-
-#~ msgid "Paused: Computer on battery"
-#~ msgstr "En pausa: Ordinador funcionant amb bateries"
-
-#~ msgid "Paused: Time of Day"
-#~ msgstr "En pausa: Canviar Hora"
-
-#~ msgid "Paused: Benchmarks running"
-#~ msgstr "En pausa: Executant test rendiment"
-
-#~ msgid "Paused"
-#~ msgstr "En pausa"
-
-#~ msgid "Paused: Application start delayed"
-#~ msgstr "Aturat: Inici de l'aplicació ajornada"
-
-#~ msgid "Click to show project graphics"
-#~ msgstr "Prémer per mostrar els gràfics del projecte"
-
-#~ msgid "Open a window to view messages"
-#~ msgstr "Obrir la finestra per veure els missatges"
-
-#~ msgid "Stop all activity"
-#~ msgstr "Aturar tota activitat"
-
-#~ msgid "Resume activity"
-#~ msgstr "Continuar activitat"
-
-#~ msgid "Open a window to set your preferences"
-#~ msgstr "Obrir la per actualitzar les preferències"
-
-#~ msgid "Switch to the BOINC advanced view"
-#~ msgstr "Canviar a la vista avançada de BOINC"
-
-#~ msgid "My Projects:"
-#~ msgstr "Els meus projectes:"
-
-#, c-format
-#~ msgid "%s. Work done by %s: %0.2f"
-#~ msgstr "%s. Feina realitzada per %s: %0.2f"
-
-#, c-format
-#~ msgid "%.1lf"
-#~ msgstr "%.1lf"
-
-#, c-format
-#~ msgid "%d hr %d min %d sec"
-#~ msgstr "%d hr %d min %d seg"
-
-#~ msgid "Are you sure you want to display graphics on a remote machine?"
-#~ msgstr "Està segur que desitja mostrar els gràfics en un ordinador remot?"
-
-#~ msgid "Application: "
-#~ msgstr "Aplicació: "
-
-#~ msgid "Time Remaining: "
-#~ msgstr "Temps per Finalitzar: "
-
-#~ msgid "Elapsed Time: "
-#~ msgstr "Temps Transcorregut: "
-
-#~ msgid "Account manager website"
-#~ msgstr "Pàgina web de l'administrador de comptes"
-
-#~ msgid "Account Manager &URL:"
-#~ msgstr "&URL del Administrador de Comptes:"
-
-#, c-format
-#~ msgid "%s &website"
-#~ msgstr "pàgina &web de %s"
-
-#~ msgid "Notice List"
-#~ msgstr "Llista de notícies"
-
-#, c-format
-#~ msgid "%s; received on %s"
-#~ msgstr "%s; rebut el %s"
-
-#, c-format
-#~ msgid "%s; received from %s; on %s"
-#~ msgstr "%s; rebut de %s; el %s"
-
-#~ msgid "Click"
-#~ msgstr "Clic"
-
-#~ msgid "Project List"
-#~ msgstr "Llista de projectes"
-
-#~ msgid "Nvidia GPU Supported"
-#~ msgstr "Nvidia GPU Suportada"
-
-#~ msgid "ATI GPU Supported"
-#~ msgstr "ATI GPU Suportada"
-
-#~ msgid "Project Website"
-#~ msgstr "Lloc Web del Projecte"
-
-#~ msgid "One or more items failed to load from the Internet."
-#~ msgstr "Ha fallat la càrrega d'un o més elements des d'Internet."
-
-# 88%
-#~ msgid "Retry now"
-#~ msgstr "Re intentar ara"
-
-#~ msgid "10%"
-#~ msgstr "10%"
-
-#~ msgid "20%"
-#~ msgstr "20%"
-
-#~ msgid "30%"
-#~ msgstr "30%"
-
-#~ msgid "40%"
-#~ msgstr "40%"
-
-#~ msgid "50%"
-#~ msgstr "50%"
-
-#~ msgid "60%"
-#~ msgstr "60%"
-
-#~ msgid "70%"
-#~ msgstr "70%"
-
-#~ msgid "80%"
-#~ msgstr "80%"
-
-#~ msgid "90%"
-#~ msgstr "90%"
-
-#~ msgid "100%"
-#~ msgstr "100%"
-
-#~ msgid "1"
-#~ msgstr "1"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "5"
-#~ msgstr "5"
-
-#~ msgid "10"
-#~ msgstr "10"
-
-#~ msgid "15"
-#~ msgstr "15"
-
-#~ msgid "30"
-#~ msgstr "30"
-
-#~ msgid "60"
-#~ msgstr "60"
-
-#, c-format
-#~ msgid "Pop up a menu of websites for project %s"
-#~ msgstr "Obre un menú dels llocs web del projecte %s"
-
-#~ msgid ""
-#~ "for accessibility support, please select advanced from the view menu or type "
-#~ "command shift a"
-#~ msgstr ""
-#~ "per donar suport a l'accessibilitat, si us plau, seleccioneu Opcions "
-#~ "avançades al menú Veure o premeu shift-a"
-
-#~ msgid "This panel contains graphs showing user totals for projects"
-#~ msgstr ""
-#~ "Aquest panell conté gràfics que mostren els totals dels projectes de "
-#~ "l'usuari"
-
-#~ msgid "list headers"
-#~ msgstr "llista de capçaleres"
-
-#~ msgid "list of events"
-#~ msgstr "llista d'events"
-
-#~ msgid "list of events is empty"
-#~ msgstr "la llista d'events està buida"
-
-#, c-format
-#~ msgid "list of %s"
-#~ msgstr "llista de %s"
-
-#, c-format
-#~ msgid "list of %s is empty"
-#~ msgstr "la llista de %s està buida"
-
-#, c-format
-#~ msgid "; current sort column %d of %d; descending order; "
-#~ msgstr "; columna de classificació actual %d de %d; ordre descendent; "
-
-#, c-format
-#~ msgid "; current sort column %d of %d; ascending order; "
-#~ msgstr "; columna de classificació actual %d de %d; ordre ascendent; "
-
-#, c-format
-#~ msgid "; column %d of %d; "
-#~ msgstr "; columna %d de %d; "
-
-#~ msgid "list is empty"
-#~ msgstr "la llista està buida"
-
-#, c-format
-#~ msgid "; row %d; "
-#~ msgstr "; fila %d; "
-
-#, c-format
-#~ msgid "; selected row %d of %d; "
-#~ msgstr "; fila %d seleccionada de %d; "
-
-#, c-format
-#~ msgid "; selected row %d ; "
-#~ msgstr "; fila %d seleccionada ; "
-
-#, c-format
-#~ msgid "; row %d of %d; "
-#~ msgstr "; fila %d de %d;"
-
-#~ msgid "blank"
-#~ msgstr "blanc"
-
-#~ msgid "list of projects or account managers"
-#~ msgstr "llista de projectes o administradors de comptes"
-
-#, c-format
-#~ msgid "selected row %d of %d; "
-#~ msgstr "fila %d seleccionada de %d; "
-
-#, c-format
-#~ msgid "row %d of %d; "
-#~ msgstr "fila %d de %d; "
-
-#~ msgid "The minimum username length for this project is 1. Please enter a different username."
-#~ msgstr ""
-#~ "Per aquest projecte la longitud mínima del nom d'usuari és d'1. Si us plau, "
-#~ "introduïu un nom d'usuari diferent."
-
-#~ msgid "The minimum username length for this account manager is 1. Please enter a different username."
-#~ msgstr ""
-#~ "La longitud mínima per aquest nom d'usuari administrador de comptes és 1. Si "
-#~ "us plau, introduïu un nom d'usuari diferent."
-
-#~ msgid "The minimum email address length for this project is 1. Please enter a different email address."
-#~ msgstr ""
-#~ "La longitud de l'adreça de correu electrònic mínima per aquest projecte és "
-#~ "d'1. Introduïu una adreça de correu electrònic diferent."
-
-#~ msgid "The minimum email address length for this account manager is 1. Please enter a different email address."
-#~ msgstr ""
-#~ "La longitud de l'adreça de correu electrònic mínima per aquest gestor de "
-#~ "comptes es d'1. Introduïu una adreça de correu electrònic diferent."
-
-#, c-format
-#~ msgid "The minimum password length for this project is %d. Please enter a different password."
-#~ msgstr ""
-#~ "La longitud mínima de la contrasenya per aquest projecte es %d. Si us plau, "
-#~ "entri una contrasenya diferent."
-
-#, c-format
-#~ msgid "The minimum password length for this account manager is %d. Please enter a different password."
-#~ msgstr ""
-#~ "La longitud mínima per aquest administrador de comptes es %d. Si us plau, "
-#~ "entri una contrasenya diferent."
-
-#~ msgid ""
-#~ "An error has occurred;\n"
-#~ "check the Event Log for details.\n"
-#~ "\n"
-#~ "Click Finish to close."
-#~ msgstr ""
-#~ "Ha ocorregut un error;\n"
-#~ "consulti el Registre d'Events per els detalls.\n"
-#~ "\n"
-#~ "Premi Finalitzar per tancar."
-
-#, no-c-format
-#~ msgid "% of the processors"
-#~ msgstr "% dels processadors"
+#: ViewWork.cpp:360
+msgid "Suspending task..."
+msgstr "Suspendre la tasca..."
 
-#, c-format
-#~ msgid "New page inserted. Index = %i"
-#~ msgstr "Inserida una nova pàgina. Índex = %i"
+#: ViewWork.cpp:389
+msgid "Showing graphics for task..."
+msgstr "Mostrant els gràfics de la tasca..."
 
-#, c-format
-#~ msgid "New page appended. Index = %i"
-#~ msgstr "Afegida una nova pàgina. Índex = %i"
+#: ViewWork.cpp:426
+msgid "Showing VM console for task..."
+msgstr "Mostrant consola de la VM per a la tasca..."
 
+#: ViewWork.cpp:479
 #, c-format
-#~ msgid "Old Page Index = %i"
-#~ msgstr "Índex de la pàgina antiga = %i"
+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
 #, c-format
-#~ msgid "OnDropTarget: index by HitTest = %i"
-#~ msgstr "OnDropTarget: índex per HitTest = %i"
-
-#~ msgid "Identify your account "
-#~ msgstr "Identifiqui el seu compte "
-
-#~ msgid "Read config file"
-#~ msgstr "Llegir el fitxer de configuració"
-
-#~ msgid "Read configuration info from cc_config.xml"
-#~ msgstr "Llegir la informació de configuració des de cc_config.xml"
-
-#~ msgid ""
-#~ "(C) 2003-2011 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2011 Universitat de Califòrnia, Berkeley.\n"
-#~ "Tots els Drets Reservats."
-
-#~ msgid "NVIDIA GPU"
-#~ msgstr "NVIDIA GPU"
-
-#~ msgid "ATI GPU"
-#~ msgstr "ATI GPU"
-
-#~ msgid "Multicore CPU Supported"
-#~ msgstr "Multicore CPU Suportada"
-
-#~ msgid "%s: %.0f"
-#~ msgstr "%s: %.0f"
-
-#~ msgid "Click 'Retry now' to transfer the file now"
-#~ msgstr "Prémer 'Actualitzar ara' per lliurar el fitxer ara"
-
-#~ msgid ""
-#~ "Click 'Abort transfer' to delete the file from the transfer queue. This "
-#~ "will prevent you from being granted credit for this result."
-#~ msgstr ""
-#~ "Prémer 'Avortar el lliurament' per eliminar el fitxer de la cua de "
-#~ "lliurament. Això evitarà que obtingueu crèdits per aquest resultat."
-
-#~ msgid "Aborting result..."
-#~ msgstr "Avortant el resultat..."
-
-#~ msgid ""
-#~ "You have chosen to add a new BOINC project.  Adding a new\n"
-#~ "project means that you will be connecting your computer to a new "
-#~ "organization.\n"
-#~ "If this is what you wanted to do, please click on\n"
-#~ "the 'Next' button below.\n"
-#~ "\n"
-#~ "Some projects like World Community Grid run multiple research "
-#~ "applications.\n"
-#~ "If you want to change which research applications are sent to your "
-#~ "computer\n"
-#~ "to run, visit the project's website and modify your\n"
-#~ "preferences there.\n"
-#~ "\n"
-#~ "To change which research applications are sent to you from\n"
-#~ "World Community Grid then please click on the following button:"
-#~ msgstr ""
-#~ "Ha seleccionat afegir un nou projecte BOINC.  Afegir un nou\n"
-#~ "projecte significa que connectarà el seu ordinador a una nova "
-#~ "organització.\n"
-#~ "Si es això el que desitja, si us plau premi\n"
-#~ "el botó 'Següent' abaix.\n"
-#~ "\n"
-#~ "Alguns projectes com World Community Grid executen diverses aplicacions.\n"
-#~ "Si desitja escollir les aplicacions que li son lliurades per executar-"
-#~ "les\n"
-#~ "en el seu ordinador, visiti el lloc web del projecte i modifiqui les "
-#~ "seves\n"
-#~ " preferències.\n"
-#~ "\n"
-#~ "Per canviar les aplicacions de recerca que li son lliurades des de\n"
-#~ "World Community Grid premi en el següent botó:"
-
-#~ msgid "Change Research Applications at World Community Grid"
-#~ msgstr "Canviar les Aplicacions de Reserca a la World Community Grid"
-
-#~ msgid "Don't fetch NVIDIA GPU tasks"
-#~ msgstr "No es desitgen noves tasques per la GPU NVIDIA"
-
-#~ msgid "NVIDIA GPU work fetch deferred for"
-#~ msgstr "Feina a la GPU NVIDIA ajornada durant"
-
-#~ msgid "NVIDIA GPU work fetch deferral interval"
-#~ msgstr "Interval d'ajornament de la feina a la GPU NVIDIA"
-
-#~ msgid "Don't fetch ATI GPU tasks"
-#~ msgstr "No es desitgen noves tasques per la GPU ATI"
-
-#~ msgid "ATI GPU work fetch deferred for"
-#~ msgstr "Feina a la GPU ATI ajornada durant"
-
-#~ msgid "ATI GPU work fetch deferral interval"
-#~ msgstr "Interval d'ajornament de la feina a la GPU ATI"
-
-#~ msgid "Remaining"
-#~ msgstr "Resta"
-
-#~ msgid "Web sites"
-#~ msgstr "Pàgines web"
-
-#~ msgid "Connect about every"
-#~ msgstr "Connectar aproximadament cada"
-
-#~ msgid ""
-#~ "this computer is connected to the Internet about every X days\n"
-#~ "(0 if it's always connected)"
-#~ msgstr ""
-#~ "aquest ordinador està connectat a Internet aproximadament ca X dies\n"
-#~ "(0 si està permanentment connectat)"
-
-#~ msgid "days (max. 10)"
-#~ msgstr "dies (màx. 10)"
-
-#~ msgid "%d.%d%%"
-#~ msgstr "%d.%d%%"
-
-#~ msgid "Display and network &options..."
-#~ msgstr "&Opcions de visualització i xarxa..."
-
-#~ msgid ""
-#~ "You have requested to exit the %s,\n"
-#~ "which allows you to view and manage\n"
-#~ "the science applications running on your computer.\n"
-#~ "\n"
-#~ "If you also want to stop running the science applications when you\n"
-#~ "exit the Manager, then choose from the following options:"
-#~ msgstr ""
-#~ "Ha sol·licitat sortir de %s,\n"
-#~ "que li permet veure i administrar\n"
-#~ "les aplicacions científiques que s'executen en el seu ordinador.\n"
-#~ "\n"
-#~ "Si també vol finalitzar l'execució de les aplicacions científiques que "
-#~ "s'executen\n"
-#~ "quan surti de l'Administrador, esculli una de les següent opcions:"
-
-#~ msgid "Stop running science applications when exiting the Manager"
-#~ msgstr ""
-#~ "Finalitzar l'execució de les aplicacions científiques en sortir de "
-#~ "l'administrador"
-
-#~ msgid "CPU work fetch priority"
-#~ msgstr "Prioritat del treball de la CPU"
+msgid "Are you sure you want to abort these %d tasks?"
+msgstr "Està segur que vol avortar aquestes %d tasques?"
 
-#~ msgid "NVIDIA GPU scheduling priority"
-#~ msgstr "Planificació de la prioritat de la GPU NVIDIA"
+#: ViewWork.cpp:490 sg_TaskCommandPopup.cpp:256
+msgid "Abort task"
+msgstr "Avortar la tasca"
 
-#~ msgid "NVIDIA GPU work fetch priority"
-#~ msgstr "Prioritat de la feina a la GPU NVIDIA"
+#: ViewWork.cpp:499
+msgid "Aborting task..."
+msgstr "Avortant la tasca..."
 
-#~ msgid "ATI GPU scheduling priority"
-#~ msgstr "Planificació de la prioritat de la GPU ATI"
+#: ViewWork.cpp:771
+msgid "Show all tasks"
+msgstr "Mostrar totes les tasques"
 
-#~ msgid "ATI GPU work fetch priority"
-#~ msgstr "Prioritat de la feina a la GPU ATI"
+#: ViewWork.cpp:772
+msgid "Show all tasks."
+msgstr "Mostrar totes les tasques."
 
-#~ msgid "Estimated app speed"
-#~ msgstr "Velocitat estimada de l'aplicació"
+#: ViewWork.cpp:796 sg_TaskCommandPopup.cpp:103
+msgid "Resume work for this task."
+msgstr "Continuar la feina per aquesta tasca."
 
-#~ msgid "Estimated task size"
-#~ msgstr "Mida estimada de la tasca"
+#: ViewWork.cpp:802 sg_TaskCommandPopup.cpp:107
+msgid "Suspend work for this task."
+msgstr "Aturar el treball d'aquesta tasca."
 
-#~ msgid "Max RAM usage"
-#~ msgstr "Ús màxim de RAM"
+#: WelcomePage.cpp:284
+msgid "Add project or account manager"
+msgstr "Afegir un projecte o administrador de comptes"
 
-#~ msgid "%s - Options"
-#~ msgstr "%s - Opcions"
+#: WelcomePage.cpp:288
+msgid "Add project or use BOINC Account Manager"
+msgstr "Afegir un projecte o utilitzar l'Administrador de Comptes de BOINC"
 
-#~ msgid "Retrieving host information; please wait..."
-#~ msgstr "Recuperant informació de l'ordinador; esperi si is plau..."
+#: 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."
 
-#~ msgid " (waiting for GPU memory)"
-#~ msgstr " (esperant memòria per a la GPU)"
+#: 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."
 
-#~ msgid "Manager Settings..."
-#~ msgstr "Gestor de la Configuració..."
+#: 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- [...]
 
-#~ msgid "Pause"
-#~ msgstr "Pausa"
+#: WelcomePage.cpp:339
+msgid "Use a BOINC Account Manager"
+msgstr "Utilitzar un administrador de comptes de BOINC"
 
-#~ msgid "%s - Messages"
-#~ msgstr "%s - Missatges"
+#: WelcomePage.cpp:352
+msgid "To continue, click Next."
+msgstr "Per continuar, prémer Següent."
 
-#~ msgid "Skin:"
-#~ msgstr "Aspecte:"
+#: WelcomePage.cpp:358
+msgid "Add or change your World Community Grid projects"
+msgstr "Afegir o canviar els teus projectes de World Community Grid"
 
-#~ msgid "Preferences"
-#~ msgstr "Preferències"
+#: WelcomePage.cpp:361
+msgid "Add projects run by other researchers or organizations"
+msgstr "Afegir projectes dirigits per altres investigadors o organitzacions"
 
-#~ msgid "I want to customize my preferences for this computer only."
-#~ msgstr ""
-#~ "Desitjo personalitzar les meves preferències només per aquest ordinador."
+#: WizardAttach.cpp:634
+msgid "Do you really want to cancel?"
+msgstr "Realment vol cancel·lar?"
 
-#~ msgid "Customized Preferences"
-#~ msgstr "Preferències Personalitzades"
+#: WizardAttach.cpp:635
+msgid "Question"
+msgstr "Pregunta"
 
-#~ msgid "My total work done this Project"
-#~ msgstr "El meu treball total realitzat aquest projecte"
+#: sg_BoincSimpleFrame.cpp:149
+msgid "Advanced View...\tCtrl+Shift+A"
+msgstr "Vista Avançada...\tCTRL+SHIFT+A"
 
-#~ msgid "My Tasks:"
-#~ msgstr "Les meves Tasques:"
+#: sg_BoincSimpleFrame.cpp:150
+msgid "Display the advanced graphical interface."
+msgstr "Mostrar la interfície gràfica avançada."
 
-#~ msgid "From Project:"
-#~ msgstr "Del Projecte:"
+#: sg_BoincSimpleFrame.cpp:157
+msgid "Skin"
+msgstr "Aspecte"
 
-#~ msgid "Elapsed Time: %s"
-#~ msgstr "Temps Transcorregut: %s"
+#: sg_BoincSimpleFrame.cpp:159
+msgid "Select the appearance of the user interface."
+msgstr "Seleccionar l'aparença de la interfície d'usuari."
 
-#~ msgid "Time Remaining: %s"
-#~ msgstr "Temps per Finalitzar: %s"
+#: sg_BoincSimpleFrame.cpp:206
+#, c-format
+msgid "&%s"
+msgstr "&%s"
 
-#~ msgid "Upload suspended - "
-#~ msgstr "Càrrega pendent - "
+#: sg_BoincSimpleFrame.cpp:390
+msgid "Default"
+msgstr "Per defecte"
 
-#~ msgid "Download suspended - "
-#~ msgstr "Descàrrega pendent - "
+#: sg_BoincSimpleFrame.cpp:759
+msgid "Suspend Computing"
+msgstr "Suspendre la computació"
 
-#~ msgid "Upload pending"
-#~ msgstr "Càrrega pendent"
+#: sg_BoincSimpleFrame.cpp:760
+msgid "Resume Computing"
+msgstr "Restaurar la computació"
 
-#~ msgid "Download pending"
-#~ msgstr "Descàrrega pendent"
+#: sg_BoincSimpleFrame.cpp:777
+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"
 
-#~ msgid "New Simple View..."
-#~ msgstr "Nova vista senzilla..."
+#: sg_DlgMessages.cpp:146
+msgid "Close"
+msgstr "Tancar"
 
-#~ msgid "Display the new simple graphical interface."
-#~ msgstr "Mostrar la nova interfície gràfica senzilla."
+#: sg_DlgMessages.cpp:389
+#, c-format
+msgid "%s - Notices"
+msgstr "%s - Notícies"
 
-#~ msgid "Old Simple View..."
-#~ msgstr "Vista senzilla anterior..."
+#: 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."
 
-#~ msgid "Display the old simple graphical interface."
-#~ msgstr "Mostrar la interfície gràfica senzilla anterior."
+#: sg_DlgPreferences.cpp:273
+msgid "Click OK to set preferences."
+msgstr "Prem OK per confirmar preferències."
 
-#~ msgid "Get help with BOINC"
-#~ msgstr "Obtenir ajuda amb BOINC"
+#: 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ó."
 
-#~ msgid "Event Log..."
-#~ msgstr "Registre d'esdeveniments..."
+#: sg_DlgPreferences.cpp:285
+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."
 
-#~ msgid "error"
-#~ msgstr "error"
+#: sg_DlgPreferences.cpp:313
+msgid "Do work only between:"
+msgstr "Fer feina només entre:"
 
-#~ msgid "A new version of BOINC is available."
-#~ msgstr "Una nova versió de BOINC està disponible."
+#: sg_DlgPreferences.cpp:335
+msgid "Connect to internet only between:"
+msgstr "Connectar a internet només entre:"
 
-#~ msgid "Download it."
-#~ msgstr "Descarregar-la."
+#: sg_DlgPreferences.cpp:357 sg_DlgPreferences.cpp:374
+msgid "Use no more than:"
+msgstr "No utilitzar més de:"
 
-#~ msgid "Couldn't write state file; check directory permissions"
-#~ msgstr ""
-#~ "No s'ha pogut guardar el fitxer d'estat, comproveu els permisos del "
-#~ "directori"
+#: sg_DlgPreferences.cpp:370
+msgid "of disk space"
+msgstr "de l'espai en disc"
 
-#~ msgid "The HTTP_PROXY environment variable must specify an HTTP proxy"
-#~ msgstr "La variable d'entorn HTTP_PROXY ha d'especificar un proxy HTTP"
+#: sg_DlgPreferences.cpp:387
+msgid "of the processor"
+msgstr "del processador"
 
-#~ msgid "Attaching to project or account manager..."
-#~ msgstr "Adjuntant-se al projecte o administrador de comptes..."
+#: sg_DlgPreferences.cpp:391
+msgid "Do work while on battery?"
+msgstr "Fer feina mentre funcioni en bateries?"
 
-#~ msgid "%s - Detach from %s"
-#~ msgstr "%s - Separar-se de %s"
+#: sg_DlgPreferences.cpp:404
+msgid "Do work after idle for:"
+msgstr "Fer feina després d'estar inactiu durant:"
 
-#~ msgid "Retrying communications."
-#~ msgstr "Intentant de nou les comunicacions."
+#: 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"
 
-#~ msgid "Failed to attach to project"
-#~ msgstr "Ha fallat l'intent d'unió al projecte"
+#: 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"
 
-#~ msgid "Failed to attach to account manager"
-#~ msgstr "Ha fallat l'intent d'unió a l'administrador de comptes"
+#: sg_DlgPreferences.cpp:638
+msgid "100 MB"
+msgstr "100 MB"
 
-#~ msgid "Attached to account manager"
-#~ msgstr "Adjuntat a l'administrador de comptes"
+#: sg_DlgPreferences.cpp:639
+msgid "200 MB"
+msgstr "200 MB"
 
-#~ msgid "You are now successfully attached to the %s system."
-#~ msgstr "Ara està correctament adjuntat al sistema %s."
+#: sg_DlgPreferences.cpp:640
+msgid "500 MB"
+msgstr "500 MB"
 
-#~ msgid "You are now successfully attached to this account manager."
-#~ msgstr "Ara està correctament adjuntat a aquest administrador de comptes."
+#: sg_DlgPreferences.cpp:641
+msgid "1 GB"
+msgstr "1 GB"
 
-#~ msgid "News Feeds"
-#~ msgstr "Receptor de noticies"
+#: sg_DlgPreferences.cpp:642
+msgid "2 GB"
+msgstr "2 GB"
 
-#~ msgid "Display the latest news about BOINC"
-#~ msgstr "Mostrar les darreres noticies sobre BOINC"
+#: sg_DlgPreferences.cpp:643
+msgid "5 GB"
+msgstr "5 GB"
 
-#~ msgid "not attached to any BOINC project: 0 bytes"
-#~ msgstr "no adjuntat a cap projecte BOINC: 0 bytes"
+#: sg_DlgPreferences.cpp:644
+msgid "10 GB"
+msgstr "10 GB"
 
-#~ msgid "All projects"
-#~ msgstr "Tots els projectes"
+#: sg_DlgPreferences.cpp:645
+msgid "20 GB"
+msgstr "20 GB"
 
-#~ msgid "Attach to project"
-#~ msgstr "Adjuntar-se al projecte"
+#: sg_DlgPreferences.cpp:646
+msgid "50 GB"
+msgstr "50 GB"
 
-#~ msgid "Attach to account manager"
-#~ msgstr "Adjuntar-se a un administrador de comptes"
+#: sg_DlgPreferences.cpp:647
+msgid "100 GB"
+msgstr "100 GB"
 
-#~ msgid "Attach to a project"
-#~ msgstr "Adjuntar-se a un projecte"
+#: sg_DlgPreferences.cpp:717
+#, c-format
+msgid "%d MB"
+msgstr "%d MB"
 
-#~ msgid "%s needs to connect to the Internet.  Please click to open %s."
-#~ msgstr ""
-#~ "%s necessita connectar-se per Internet.  Si us plau faci clic per obrir "
-#~ "%s."
+#: sg_DlgPreferences.cpp:719
+#, c-format
+msgid "%4.2f GB"
+msgstr "%4.2f GB"
 
-#~ msgid ""
-#~ "%s is unable to communicate with a project and needs an Internet "
-#~ "connection.\n"
-#~ "Please connect to the Internet, then select the 'Do network "
-#~ "communications' item from the Advanced menu."
-#~ msgstr ""
-#~ "%s no pot comunicar amb el projecte i necessita connexió a internet.\n"
-#~ "Si us plau connecti a internet, després seleccioni 'Executar "
-#~ "comunicacions de xarxa' en el menú Avançat."
+#: sg_DlgPreferences.cpp:760
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
 
-#~ msgid ""
-#~ "%s couldn't do Internet communication, and no default connection is "
-#~ "selected.\n"
-#~ "Please connect to the Internet, or select a default connection\n"
-#~ "using Advanced/Options/Connections."
-#~ msgstr ""
-#~ "%s no pot connectar a Internet, i no hi ha una connexió per defecte "
-#~ "seleccionada.\n"
-#~ "Si us plau connecti a Internet, o seleccioni una connexió per defecte\n"
-#~ "utilitzant Avançat/Opcions/Connexions."
+#: sg_DlgPreferences.cpp:796
+msgid "0 (Run Always)"
+msgstr "0 (Executar Sempre)"
 
-#~ msgid "One or more notices are now available for viewing."
-#~ msgstr "Un o més anuncis estan disponibles per a la seva visualització."
+#: sg_DlgPreferences.cpp:799
+#, c-format
+msgid "%d"
+msgstr "%d"
 
-#~ msgid "Attached to project"
-#~ msgstr "Adjuntat al projecte"
+#: 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"
 
-#~ msgid "You are now successfully attached to this project."
-#~ msgstr "S'ha adjuntat correctament al projecte."
+#: sg_ProjectPanel.cpp:72
+msgid "Add Project"
+msgstr "Afegeix un projecte"
 
-#~ msgid "Attached to %s"
-#~ msgstr "Adjuntat a %s"
+#: sg_ProjectPanel.cpp:73
+msgid "Synchronize"
+msgstr "Sincronitzar"
 
-#~ msgid "Detach when done"
-#~ msgstr "Separar-se en finalitzar"
+#: sg_ProjectPanel.cpp:74
+msgid "Work done for this project"
+msgstr "Treball realitzat per aquest projecte"
 
-#~ msgid "Retrieving notices..."
-#~ msgstr "Recuperació dels notícies..."
+#: sg_ProjectPanel.cpp:77
+msgid "Synchronize projects with account manager system"
+msgstr "Sincronitzar els projectes amb el sistema de l'administrador de comptes"
 
-#~ msgid "Detach"
-#~ msgstr "Separar-se"
+#: 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"
 
-#~ msgid "Detaching from project..."
-#~ msgstr "Separant-se del projecte..."
+#: sg_ProjectPanel.cpp:145
+msgid "Project Web Pages"
+msgstr "Pàgines Web del Projecte"
 
-#~ msgid "Are you sure you want to detach from project '%s'?"
-#~ msgstr "Està segur que desitja separar-se del projecte '%s'?"
+#: sg_ProjectPanel.cpp:149
+msgid "Project Commands"
+msgstr "Comandaments del Projecte"
 
-#~ msgid "Detach from Project"
-#~ msgstr "Separar-se del Projecte"
+#: sg_ProjectPanel.cpp:267
+#, c-format
+msgid "Pop up a menu of web sites for project %s"
+msgstr "Obre un menú dels llocs web del projecte %s"
 
-#~ msgid "Message from project server:"
-#~ msgstr "Missatge del servidor:"
+#: sg_ProjectPanel.cpp:269
+#, 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"
 
-#~ msgid "XML syntax error in"
-#~ msgstr "Error de sintaxi XML"
+#: sg_TaskCommandPopup.cpp:67
+msgid "Suspend this task."
+msgstr "Suspendre aquesta tasca."
 
-#~ msgid "Can't resolve hostname in"
-#~ msgstr "No es pot resoldre nom de host a"
+#: sg_TaskCommandPopup.cpp:73
+msgid "Abandon this task. You will get no credit for it."
+msgstr "Abandona aquesta tasca. No rebràs cap crèdit per ella."
 
-#~ msgid "Unrecognized tag in"
-#~ msgstr "Etiqueta no reconeguda a"
+#: sg_TaskCommandPopup.cpp:251
+#, 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)"
 
-#~ msgid "Missing start tag in"
-#~ msgstr "Falta el codi d'inici a"
+#: sg_TaskPanel.cpp:464
+msgid "You don't have any projects.  Please Add a Project."
+msgstr "No te cap projecte. Si us plau, afegeixi un  projecte."
 
-#~ msgid "Unparsed tag in"
-#~ msgstr "Etiqueta sense analitzar a"
+#: sg_TaskPanel.cpp:465
+msgid "Not available"
+msgstr "No disponible"
 
-#~ msgid "Missing end tag in"
-#~ msgstr "Falta el codi final a"
+#: sg_TaskPanel.cpp:476
+msgid "Tasks:"
+msgstr "Tasques:"
 
-#~ msgid ""
-#~ "BOINC can't access Internet - check network connection or proxy "
-#~ "configuration."
-#~ msgstr ""
-#~ "BOINC no te accés a Internet - comprovar la connexió de xarxa o "
-#~ "configuració de proxy."
+#: sg_TaskPanel.cpp:482
+msgid "Select a task to access"
+msgstr "Seleccioneu una tasca per accedir-hi"
 
-#~ msgid "Attach this computer to a project or account manager"
-#~ msgstr "Adjunti aquest ordinador al projecte o administrador de comptes"
+#: sg_TaskPanel.cpp:493
+msgid "From:"
+msgstr "De:"
 
-#~ msgid "Client is processing results."
-#~ msgstr "El client està processant els resultats."
+#: sg_TaskPanel.cpp:547
+msgid "This task's progress"
+msgstr "Progrés d'aquesta tasca"
 
-#~ msgid " - user active"
-#~ msgstr " - usuari actiu"
+#: sg_TaskPanel.cpp:565
+msgid "Task Commands"
+msgstr "Ordres de la tasca"
 
-#~ msgid " - computation suspended"
-#~ msgstr " - computació suspesa"
+#: sg_TaskPanel.cpp:566
+msgid "Pop up a menu of commands to apply to this task"
+msgstr "Obre un menú d'ordres per aplicar a aquesta tasca"
 
-#~ msgid " - need disk space"
-#~ msgstr " - necessita espai en disc"
+#: sg_TaskPanel.cpp:701
+#, c-format
+msgid "Application: %s"
+msgstr "Aplicació: %s"
 
-#~ msgid "Attach to an additional project"
-#~ msgstr "Adjuntar-se a un projecte addicional"
+#: sg_TaskPanel.cpp:724
+#, c-format
+msgid "%.3f%%"
+msgstr "%.3f%%"
 
-#~ msgid "To completion"
-#~ msgstr "Per finalitzar"
+#: sg_TaskPanel.cpp:732
+msgid "Application: Not available"
+msgstr "Aplicació: No disponible"
 
-#~ msgid ""
-#~ "We'll guide you through the process of attaching\n"
-#~ "to a project or account manager."
-#~ msgstr ""
-#~ "Nosaltres el guiarem en el procés de adjuntar-se\n"
-#~ "a un projecte o un administrador de comptes."
+#: sg_TaskPanel.cpp:832
+msgid "Not Available"
+msgstr "No Disponible"
 
-#~ msgid "events"
-#~ msgstr "esdeveniments"
+#: sg_TaskPanel.cpp:847
+#, c-format
+msgid "Elapsed: %s"
+msgstr "Transcorregut: %s"
 
-#~ msgid " is empty"
-#~ msgstr " és buida"
+#: sg_TaskPanel.cpp:861
+#, c-format
+msgid "Remaining (estimated): %s"
+msgstr "Pendent (estimat): %s"
 
-#~ msgid "%d of %d; "
-#~ msgstr "%d de %d; "
+#: sg_TaskPanel.cpp:876
+#, c-format
+msgid "Status: %s"
+msgstr "Estat: %s"
 
-#~ msgid "current sort column "
-#~ msgstr "columna actual d'ordenació "
+#: sg_TaskPanel.cpp:1223
+msgid "Retrieving current status."
+msgstr "Recuperant estat actual."
 
-#~ msgid " descending order "
-#~ msgstr " ordre descendent "
+#: sg_TaskPanel.cpp:1229
+msgid "Downloading work from the server."
+msgstr "Descarregant feina des del servidor."
 
-#~ msgid " ascending order "
-#~ msgstr " ordre ascendent "
+#: sg_TaskPanel.cpp:1234
+msgid "Processing Suspended:  Running On Batteries."
+msgstr "Procés en suspens:  Execució En Bateries."
 
-#~ msgid "column "
-#~ msgstr "columna "
+#: sg_TaskPanel.cpp:1236
+msgid "Processing Suspended:  User Active."
+msgstr "Procés en suspens:  Usuari Actiu."
 
-#~ msgid "of %d; "
-#~ msgstr "de %d; "
+#: sg_TaskPanel.cpp:1238
+msgid "Processing Suspended:  User paused processing."
+msgstr "Procés en suspens:  L'usuari ha aturat l'execució."
 
-#~ msgid "Attach to a project or account manager to begin processing work"
-#~ msgstr ""
-#~ "Adjuntar-se al projecte o administrador de comptes per començar a "
-#~ "processar feina"
+#: sg_TaskPanel.cpp:1240
+msgid "Processing Suspended:  Time of Day."
+msgstr "Procés en suspens:  Canviar Hora."
 
-#~ msgid "Attach to a project to begin processing work"
-#~ msgstr "Adjuntar-se a un projecte per iniciar el procés de treball"
+#: sg_TaskPanel.cpp:1242
+msgid "Processing Suspended:  Benchmarks Running."
+msgstr "Procés en suspens:  Executant Test de Rendiment."
 
-#~ msgid "Use GPU never"
-#~ msgstr "No utilitzar mai la GPU"
+#: sg_TaskPanel.cpp:1244
+msgid "Processing Suspended."
+msgstr "Procés en suspens."
 
-#~ msgid "BOINC Notification"
-#~ msgstr "Notificació BOINC"
+#: sg_TaskPanel.cpp:1248
+msgid "Waiting to contact project servers."
+msgstr "Esperant contactar amb els servidors del projecte."
 
-#~ msgid ""
-#~ "TEST: Fluffy at Home just found out that the Fluffy project has been "
-#~ "published in Nature"
-#~ msgstr ""
-#~ "TEST: Fluffy at Home acaba d'notificar que el projecte Fluffy ha estat "
-#~ "publicat a la revista Nature"
+#: sg_TaskPanel.cpp:1252 sg_TaskPanel.cpp:1261
+msgid "Retrieving current status"
+msgstr "Recuperant l'estat actual"
 
-#~ msgid "%s: %.2f%% completed."
-#~ msgstr "%s: %.2f%% finalitzada."
+#: sg_TaskPanel.cpp:1256
+msgid "No work available to process"
+msgstr "No hi ha feina disponible a processar"
 
-#~ msgid "%d tasks running."
-#~ msgstr "%d feina(es) executant-se."
+#: sg_TaskPanel.cpp:1258
+msgid "Unable to connect to the core client"
+msgstr "Impossible connectar amb el client"
 
-#~ msgid "&Close Window\tCtrl+W"
-#~ msgstr "&Tancar la Finestra\tCTRL+W"
+#: wizardex.cpp:377 wizardex.cpp:553
+msgid "&Next >"
+msgstr "&Següent >"
 
-#~ msgid "&Messages\tCtrl+Shift+M"
-#~ msgstr "&Missatges\tCtrl+Shift+M"
+#: wizardex.cpp:383
+msgid "< &Back"
+msgstr "< &Enrere"
 
-#~ msgid "Display messages"
-#~ msgstr "Mostrar els missatges"
+#: wizardex.cpp:553
+msgid "&Finish"
+msgstr "&Finalitzar"
 
-#~ msgid "Display news"
-#~ msgstr "Mostrar les notícies"
+#: mac/Mac_GUI.cpp:110
+msgid "Preferences…"
+msgstr "Preferències…"
 
-#~ msgid "%s - Can't find web browser"
-#~ msgstr "%s - No es pot trobar el navegador web"
+#: mac/Mac_GUI.cpp:122
+msgid "Services"
+msgstr "Serveis"
 
-#~ msgid ""
-#~ "%s tried to display the web page\n"
-#~ "\t%s\n"
-#~ "but couldn't find a web browser.\n"
-#~ "To fix this, set the environment variable\n"
-#~ "BROWSER to the path of your web browser,\n"
-#~ "then restart the %s."
-#~ msgstr ""
-#~ "%s ha provat de mostrar la pàgina web\n"
-#~ "\t%s\n"
-#~ "però no ha trobat el navegador web.\n"
-#~ "Per arreglar-ho, declareu la variable d'entorn\n"
-#~ "BROWSER amb el directori del vostre navegador,\n"
-#~ "desprès reiniciar %s."
+#: mac/Mac_GUI.cpp:144
+#, c-format
+msgid "Hide %s"
+msgstr "Amaga %s"
 
-#~ msgid "Starting client services; please wait..."
-#~ msgstr "Iniciant els serveis del client; si us plau esperi..."
+#: mac/Mac_GUI.cpp:158
+msgid "Hide Others"
+msgstr "Amaga Altres"
 
-#~ msgid "BOINC Website"
-#~ msgstr "Pàgina web de BOINC"
+#: mac/Mac_GUI.cpp:172
+msgid "Show All"
+msgstr "Mostra Tot"
 
-#~ msgid "Display the latest news about BOINC from the BOINC website"
-#~ msgstr ""
-#~ "Mostrar les darreres noticies sobre BOINC des de la pàgina web de BOINC"
+#: mac/Mac_GUI.cpp:186
+#, c-format
+msgid "Quit %s"
+msgstr "Sortir de %s"
diff --git a/locale/ca/BOINC-Project-Generic.po b/locale/ca/BOINC-Project-Generic.po
index 2a71238..cbc50fa 100644
--- a/locale/ca/BOINC-Project-Generic.po
+++ b/locale/ca/BOINC-Project-Generic.po
@@ -1,26 +1,27 @@
 # BOINC web translation
 # Copyright (C) 2008 University of California
+# 
 # This file is distributed under the same license as BOINC.
+# 
 # FileID  : $Id$
+# 
+# Translators:
+# Andry Blyshchak <youandrytube at gmail.com>, 2015
+# Xavier Mor-Mur <xavi.mormur at gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: \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: 2014-12-18 08:46+0000\n"
-"Last-Translator: Xavier <xavi.mormur at gmail.com>\n"
-"Language-Team: BOINC Development Team <boinc_loc at ssl.berkeley.edu>\n"
-"Language: ca\n"
+"POT-Creation-Date: 2015-03-04 08:56 PST\n"
+"PO-Revision-Date: 2015-03-24 17:51+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"
-"X-Generator: Pootle 2.5.0\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-SearchPath-0: html\\user\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
-"X-POOTLE-MTIME: 1418892377.0\n"
 
 msgid "LANG_NAME_NATIVE"
 msgstr "Català"
@@ -28,6 +29,96 @@ msgstr "Català"
 msgid "LANG_NAME_INTERNATIONAL"
 msgstr "Catalan"
 
+#: ../inc/account.inc:38
+msgid "Invitation Code"
+msgstr "Codi d'alta"
+
+#: ../inc/account.inc:38
+msgid "A valid invitation code is required to create an account."
+msgstr "Es requereix un codi d'invitació vàlid per a crear 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 "Us identifica a la pàgina web. Utilitzeu el vostre nom real o un àlies."
+
+#: ../inc/account.inc:48
+msgid "Email Address"
+msgstr "Adreça de correu electrònic"
+
+#: ../inc/account.inc:48
+msgid "Must be a valid address of the form 'name at domain'."
+msgstr "Ha de ser una adreça de correu vàlida del tipus 'nom at domini'."
+
+#: ../inc/account.inc:57 ../user/edit_email_form.php:47
+msgid "Password"
+msgstr "Contrasenya"
+
+#: ../inc/account.inc:58
+msgid "Must be at least %1 characters"
+msgstr "Ha de tenir al menys %1 caràcters"
+
+#: ../inc/account.inc:61
+msgid "Confirm password"
+msgstr "Introduïu de nou la contrasenya"
+
+#: ../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 "Seleccioneu el país que voleu representar, si ho desitgeu."
+
+#: ../inc/account.inc:70 ../user/account_finish.php:51
+msgid "Postal or ZIP Code"
+msgstr "Codi postal o ZIP"
+
+#: ../inc/account.inc:70 ../user/account_finish.php:51
+msgid "Optional"
+msgstr "Opcional"
+
+#: ../inc/account.inc:86
+msgid "Create account"
+msgstr "Crear un compte"
+
+#: ../inc/account.inc:101
+msgid "Email address:"
+msgstr "Adreça de correu:"
+
+#: ../inc/account.inc:103
+msgid "forgot email address?"
+msgstr "a oblidat l'adreça de correu electrònic?"
+
+#: ../inc/account.inc:106
+msgid "Password:"
+msgstr "Contrasenya:"
+
+#: ../inc/account.inc:106
+msgid "forgot password?"
+msgstr "ha oblidat la contrasenya?"
+
+#: ../inc/account.inc:109
+msgid "Stay logged in"
+msgstr "Segueixi connectat"
+
+#: ../inc/account.inc:114 ../inc/util.inc:238 ../user/login_form.php:41
+msgid "Log in"
+msgstr "Registrar-se"
+
 #: ../inc/bbcode_html.inc:11
 msgid "Bold text: [b]text[/b]  (alt+b)"
 msgstr "Text en negreta: [b]text[/b]  (alt+b)"
@@ -41,329 +132,327 @@ msgid "Underline text: [u]text[/u]  (alt+u)"
 msgstr "Subratllar el text: [u]text[/u]  (alt+u)"
 
 #: ../inc/bbcode_html.inc:20
+msgid "Strikethrough text: [s]text[/s]  (alt+k)"
+msgstr "Text tatxat: [s]text[/s] (alt+k)"
+
+#: ../inc/bbcode_html.inc:23
 msgid "Quote text: [quote]text[/quote]  (alt+q)"
 msgstr "Cita el text: [quote]text[/quote]  (alt+q)"
 
-#: ../inc/bbcode_html.inc:23
+#: ../inc/bbcode_html.inc:26
 msgid "Code display: [code]code[/code]  (alt+c)"
 msgstr "Mostrar el codi: [code]code[/code]  (alt+c)"
 
-#: ../inc/bbcode_html.inc:26
+#: ../inc/bbcode_html.inc:29
 msgid "List: [list]text[/list] (alt+l)"
 msgstr "Llista: [list]text[/list] (alt+l)"
 
-#: ../inc/bbcode_html.inc:29
+#: ../inc/bbcode_html.inc:32
 msgid "Ordered list: [list=]text[/list]  (alt+o)"
 msgstr "Llista ordenada: [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 "Insereix una imatge: [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 ""
-"Inserta URL: [url]http://url[/url] o [url=http://url]URL text[/url]  (alt+w)"
+msgstr "Inserta URL: [url]http://url[/url] o [url=http://url]URL text[/url]  (alt+w)"
 
-#: ../inc/bbcode_html.inc:42
+#: ../inc/bbcode_html.inc:45
 msgid "Font color"
 msgstr "Color de la font"
 
-#: ../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 de la font: [color=red]text[/color]  Tip: you can also use "
-"color=#FF0000"
+msgstr "Color de la font: [color=red]text[/color]  Tip: you can also use 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 "Defecte"
 
-#: ../inc/bbcode_html.inc:45
+#: ../inc/bbcode_html.inc:48
 msgid "Dark Red"
 msgstr "Vermell fosc"
 
-#: ../inc/bbcode_html.inc:46
+#: ../inc/bbcode_html.inc:49
 msgid "Red"
 msgstr "Vermell"
 
-#: ../inc/bbcode_html.inc:47
+#: ../inc/bbcode_html.inc:50
 msgid "Orange"
 msgstr "Taronja"
 
-#: ../inc/bbcode_html.inc:48
+#: ../inc/bbcode_html.inc:51
 msgid "Brown"
 msgstr "Marró"
 
-#: ../inc/bbcode_html.inc:49
+#: ../inc/bbcode_html.inc:52
 msgid "Yellow"
 msgstr "Groc"
 
-#: ../inc/bbcode_html.inc:50
+#: ../inc/bbcode_html.inc:53
 msgid "Green"
 msgstr "Verd"
 
-#: ../inc/bbcode_html.inc:51
+#: ../inc/bbcode_html.inc:54
 msgid "Olive"
 msgstr "Oliva"
 
-#: ../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 "Blau"
 
-#: ../inc/bbcode_html.inc:54
+#: ../inc/bbcode_html.inc:57
 msgid "Dark Blue"
 msgstr "Blau fosc"
 
-#: ../inc/bbcode_html.inc:55
+#: ../inc/bbcode_html.inc:58
 msgid "Indigo"
 msgstr "Indi"
 
-#: ../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 "Mida de la lletra"
 
-#: ../inc/bbcode_html.inc:58
+#: ../inc/bbcode_html.inc:61
 msgid "Font size: [size=x-small]small text[/size]"
 msgstr "Mida de la lletra: [size=x-small]small text[/size]"
 
-#: ../inc/bbcode_html.inc:60
+#: ../inc/bbcode_html.inc:63
 msgid "Small"
 msgstr "Petita"
 
-#: ../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 "Gran"
 
-#: ../inc/bbcode_html.inc:65
+#: ../inc/bbcode_html.inc:68
 msgid "Close all open bbCode tags"
 msgstr "Tancar totes les etiquetes bbCode obertes"
 
-#: ../inc/bbcode_html.inc:65
+#: ../inc/bbcode_html.inc:68
 msgid "Close Tags"
 msgstr "Tancar les etiquetes"
 
-#: ../inc/forum.inc:37
+#: ../inc/forum.inc:38
 msgid "Oldest first"
 msgstr "El més antic primer"
 
-#: ../inc/forum.inc:38 ../inc/forum.inc:44
+#: ../inc/forum.inc:39 ../inc/forum.inc:45
 msgid "Newest first"
 msgstr "El més recent primer"
 
-#: ../inc/forum.inc:39
+#: ../inc/forum.inc:40
 msgid "Highest rated posts first"
 msgstr "El de més alta puntuació primer"
 
-#: ../inc/forum.inc:41
+#: ../inc/forum.inc:42
 msgid "Newest post first"
 msgstr "El més recent primer"
 
-#: ../inc/forum.inc:42
+#: ../inc/forum.inc:43
 msgid "Most views first"
 msgstr "Els més vistos primer"
 
-#: ../inc/forum.inc:43
+#: ../inc/forum.inc:44
 msgid "Most posts first"
 msgstr "Els de més missatges primer"
 
-#: ../inc/forum.inc:125
+#: ../inc/forum.inc:126
 msgid "Search for words in forum messages"
 msgstr "Cercar paraules en els fòrums de missatges"
 
-#: ../inc/forum.inc:125
+#: ../inc/forum.inc:126
 msgid "Search forums"
 msgstr "Cercar en els fòrums"
 
-#: ../inc/forum.inc:126
+#: ../inc/forum.inc:127
 msgid "Advanced search"
 msgstr "Recerca 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 "Missatges privats"
 
-#: ../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 "Preguntes i respostes"
 
-#: ../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 "Panells de missatges"
 
-#: ../inc/forum.inc:187 ../inc/forum.inc:195
+#: ../inc/forum.inc:188 ../inc/forum.inc:196
 msgid "%1 message board"
 msgstr "tauler de missatges %1"
 
-#: ../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 "Següent"
 
-#: ../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 "Missatge"
 
-#: ../inc/forum.inc:580
+#: ../inc/forum.inc:583
 msgid "Send message"
 msgstr "Enviar missatge"
 
-#: ../inc/forum.inc:580
+#: ../inc/forum.inc:583
 msgid "Send %1 a private message"
 msgstr "Enviar %1 un missatge privat"
 
-#: ../inc/forum.inc:581
+#: ../inc/forum.inc:584
 msgid "Joined: %1"
 msgstr "Unit: %1"
 
-#: ../inc/forum.inc:590
+#: ../inc/forum.inc:593
 msgid "Posts: %1"
 msgstr "Missatges: %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 "Encara no ha llegit aquest missatge"
 
-#: ../inc/forum.inc:620
+#: ../inc/forum.inc:624
 msgid "Unread"
 msgstr "No llegit"
 
-#: ../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 "Missatge %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 "ocult"
 
-#: ../inc/forum.inc:625
+#: ../inc/forum.inc:629
 msgid "Posted: %1"
 msgstr "Publicat: %1"
 
-#: ../inc/forum.inc:628
+#: ../inc/forum.inc:632
 msgid " - in response to "
 msgstr " -en 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 "Edita aquest missatge"
 
-#: ../inc/forum.inc:637
+#: ../inc/forum.inc:641
 msgid "Last modified: %1"
 msgstr "Últim modificat: %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 ""
-"Aquest missatge no es mostra perquè el remitent es troba a la seva llista "
-"'ignorar'.  Feu clic a %1aqui%2 per veure aquest missatge"
+"This post is not shown because the sender is on your 'ignore' list.  Click "
+"%1here%2 to view this post"
+msgstr "Aquest missatge no es mostra perquè el remitent es troba a la seva llista 'ignorar'.  Feu clic a %1aqui%2 per veure aquest missatge"
 
-#: ../inc/forum.inc:668 ../inc/forum.inc:679
+#: ../inc/forum.inc:672 ../inc/forum.inc:683
 msgid "Report this post as offensive"
 msgstr "Avisa d'aquest missatge com ofensiu"
 
-#: ../inc/forum.inc:668 ../inc/forum.inc:679
+#: ../inc/forum.inc:672 ../inc/forum.inc:683
 msgid "Report as offensive"
 msgstr "Informa com ofensiu"
 
-#: ../inc/forum.inc:672
+#: ../inc/forum.inc:676
 msgid "Rating: %1"
 msgstr "Qualificació: %1"
 
-#: ../inc/forum.inc:672
+#: ../inc/forum.inc:676
 msgid "rate: "
 msgstr "qualifica: "
 
-# 83%
-#: ../inc/forum.inc:675
+#: ../inc/forum.inc:679
 msgid "Click if you like this message"
 msgstr "Fes clic aquí si t'agrada aquest missatge"
 
-#: ../inc/forum.inc:675
+#: ../inc/forum.inc:679
 msgid "Rate +"
 msgstr "Qualifica +"
 
-#: ../inc/forum.inc:677
+#: ../inc/forum.inc:681
 msgid "Click if you don't like this message"
 msgstr "Fes clic aquí si no t'agrada aquest missatge"
 
-#: ../inc/forum.inc:677
+#: ../inc/forum.inc:681
 msgid "Rate -"
 msgstr "Qualifica -"
 
-#: ../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 "Contestar"
 
-#: ../inc/forum.inc:685
+#: ../inc/forum.inc:689
 msgid "Post a reply to this message"
 msgstr "Respon aquest missatge"
 
-#: ../inc/forum.inc:687
+#: ../inc/forum.inc:691
 msgid "Quote"
 msgstr "Remarca"
 
-#: ../inc/forum.inc:687
+#: ../inc/forum.inc:691
 msgid "Post a reply by quoting this message"
 msgstr "Respon remarcant aquest missatge"
 
-#: ../inc/forum.inc:708
+#: ../inc/forum.inc:712
 msgid "Hidden by a moderator"
 msgstr "Ocult per un moderador"
 
-#: ../inc/forum.inc:729
+#: ../inc/forum.inc:733
 msgid "Posted %1 by %2"
 msgstr "Missatges %1 de %2"
 
-#: ../inc/forum.inc:747
+#: ../inc/forum.inc:751
 msgid "You may not post or rate messages until %1"
 msgstr "No podeu enviar o valorar missatges fins %1"
 
-#: ../inc/forum.inc:758
+#: ../inc/forum.inc:762
 msgid ""
 "\n"
 "        <ul>\n"
@@ -379,370 +468,352 @@ msgid ""
 "        <li> No abusive comments involving race, religion,\n"
 "            nationality, gender, class or sexuality.\n"
 "        "
-msgstr ""
-"\n"
-"        <ul>\n"
-"        <li> Els missatges han de ser \"adequat per a nens\": no poden tenir\n"
-"            contingut que sigui obscè, d'odi inte-recial,\n"
-"            sexualment explícit o suggerent.\n"
-"        <li> No hi haurà anuncis comercials.\n"
-"        <li> No hi haurà enllaços a llocs web relacionats amb contingut "
-"sexual,\n"
-"            jocs d'atzar, o la intolerància dels altres.\n"
-"        <li> No hi haurà missatges destinats a molestar o antagonitzar a "
-"altres persones,\n"
-"            o per segrestar un fil.\n"
-"        <li> No hi haurà missatges que siguin deliberadament hostils o "
-"insultants.\n"
-"        <li> Cap comentari abusives en relació amb la raça, la religió,\n"
-"            nacionalitat, gènere, classe o sexualitat.\n"
-"        "
+msgstr "\n        <ul>\n        <li> Els missatges han de ser \"adequat per a nens\": no poden tenir\n            contingut que sigui obscè, d'odi inte-recial,\n            sexualment explícit o suggerent.\n        <li> No hi haurà anuncis comercials.\n        <li> No hi haurà enllaços a llocs web relacionats amb contingut sexual,\n            jocs d'atzar, o la intolerància dels altres.\n        <li> No hi haurà missatges destinats a molestar o antagonitzar a altres persones,\n          [...]
 
-#: ../inc/forum.inc:780
+#: ../inc/forum.inc:784
 msgid "Rules:"
 msgstr "Regles:"
 
-#: ../inc/forum.inc:781
+#: ../inc/forum.inc:785
 msgid "More info"
 msgstr "Més informació"
 
-#: ../inc/forum.inc:1055 ../user/forum_thread.php:189
+#: ../inc/forum.inc:1082 ../user/forum_thread.php:190
 msgid "Unhide"
 msgstr "Fer visible"
 
-#: ../inc/forum.inc:1055
+#: ../inc/forum.inc:1082
 msgid "Unhide this post"
 msgstr "Fer visible aquest missatge"
 
-#: ../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 aquest missatge"
 
-#: ../inc/forum.inc:1062 ../user/forum_thread.php:228
+#: ../inc/forum.inc:1089 ../user/forum_thread.php:229
 msgid "Move"
 msgstr "Moure"
 
-#: ../inc/forum.inc:1062
+#: ../inc/forum.inc:1089
 msgid "Move post to a different thread"
 msgstr "Moure el missatge a un altre fil"
 
-#: ../inc/forum.inc:1067
+#: ../inc/forum.inc:1094
 msgid "Banish author"
 msgstr "Expulsar l'autor"
 
-#: ../inc/forum.inc:1074
+#: ../inc/forum.inc:1101
 msgid "Vote to banish author"
 msgstr "Voti per expulsar l'autor"
 
-#: ../inc/forum.inc:1078
+#: ../inc/forum.inc:1105
 msgid "Vote not to banish author"
 msgstr "Voti per no expulsar l'autor"
 
-#: ../inc/forum.inc:1083
+#: ../inc/forum.inc:1110
 msgid "Start vote to banish author"
 msgstr "Iniciar votació per expulsar l'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 "Esborrar"
+
+#: ../inc/forum.inc:1115
+msgid "Delete this post"
+msgstr "Esborrar aquesta entrada"
+
+#: ../inc/forum.inc:1153
 msgid "Only team members can post to the team message board"
-msgstr ""
-"Només els membres de l'equip poden publicar al tauler d'anuncis de l'equip"
+msgstr "Només els membres de l'equip poden publicar al tauler d'anuncis de l'equip"
 
-#: ../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 ""
-"Per poder crear un nou fil a %1 heu de tenir un mínim nombre de crèdits. "
-"Això es per prevenir i protegir d'un del sistema."
+msgstr "Per poder crear un nou fil a %1 heu de tenir un mínim nombre de crèdits. Això es per prevenir i protegir d'un del 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 ""
-"No pot crear cap més fil en aquest moment. Si us plau esperi una estona "
-"abans de provar-ho de nou. Aquest espera es necessària per protegir d'un "
-"abús del sistema."
+msgstr "No pot crear cap més fil en aquest moment. Si us plau esperi una estona abans de provar-ho de nou. Aquest espera es necessària per protegir d'un abús del 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 ""
-"Aquest fil està bloquejat. Només els moderadors del fòrum i els "
-"administradors poden publicar-hi."
+msgstr "Aquest fil està bloquejat. Només els moderadors del fòrum i els administradors poden publicar-hi."
 
-#: ../inc/forum.inc:1145
+#: ../inc/forum.inc:1182
 msgid "Can't post to a hidden thread."
 msgstr "No es pot publicar en un fil ocult."
 
-#: ../inc/forum.inc:1173
+#: ../inc/forum.inc:1216
 msgid "Thread"
 msgstr "Fil"
 
-#: ../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 "Correu"
 
-#: ../inc/forum.inc:1176 ../user/forum_forum.php:138
+#: ../inc/forum.inc:1219 ../user/forum_forum.php:141
 msgid "Views"
 msgstr "Opinions"
 
-#: ../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 "Últim correu"
 
-#: ../inc/forum.inc:1235
+#: ../inc/forum.inc:1278
 msgid "New posts in the thread %1"
 msgstr "Nous missatges en el fil %1"
 
-#: ../inc/forum.inc:1240
+#: ../inc/forum.inc:1283
 msgid "New posts in subscribed thread"
 msgstr "Nous missatges en el fil subscrit"
 
-#: ../inc/forum.inc:1241
+#: ../inc/forum.inc:1284
 msgid "There are new posts in the thread '%1'"
 msgstr "Hi ha nous missatges en el fil '%1'"
 
-#: ../inc/forum.inc:1251
+#: ../inc/forum.inc:1294
 msgid "Mark all threads as read"
 msgstr "Marcar tots el fils com a llegits"
 
-#: ../inc/forum.inc:1252
+#: ../inc/forum.inc:1295
 msgid "Mark all threads in all message boards as read."
 msgstr "Marcar com a llegits tots els fils a tots els taulers de missatges."
 
-#: ../inc/host.inc:24
+#: ../inc/host.inc:25
 msgid "No host"
 msgstr "No hi ha servidor"
 
-#: ../inc/host.inc:26
+#: ../inc/host.inc:27
 msgid "Unavailable"
 msgstr "No disponible"
 
-#: ../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 "Inici"
 
-#: ../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 "Treball"
 
-#: ../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òbil"
-
-#: ../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 "Actualitzar"
 
-#: ../inc/host.inc:85
+#: ../inc/host.inc:84
 msgid "Computer information"
 msgstr "Informació de l'ordinador"
 
-#: ../inc/host.inc:89 ../inc/host.inc:94
+#: ../inc/host.inc:88 ../inc/host.inc:93
 msgid "IP address"
 msgstr "Adreça IP"
 
-#: ../inc/host.inc:89
+#: ../inc/host.inc:88
 msgid "(same the last %1 times)"
 msgstr "(el mateix els últims %1 cops)"
 
-#: ../inc/host.inc:91
+#: ../inc/host.inc:90
 msgid "External IP address"
 msgstr "Adreça IP externa"
 
-#: ../inc/host.inc:94
+#: ../inc/host.inc:93
 msgid "Show IP address"
 msgstr "Mostra l'adreça IP"
 
-#: ../inc/host.inc:96
+#: ../inc/host.inc:95
 msgid "Domain name"
 msgstr "Nom de domini"
 
-#: ../inc/host.inc:98
+#: ../inc/host.inc:97
 msgid "Product name"
 msgstr "Nom del producte"
 
-#: ../inc/host.inc:102
+#: ../inc/host.inc:101
 msgid "Local Standard Time"
 msgstr "Temps Local Estàndard"
 
-#: ../inc/host.inc:102
+#: ../inc/host.inc:101
 msgid "UTC %1 hours"
 msgstr "UTC %1 hores"
 
-#: ../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 "Propietari"
 
-#: ../inc/host.inc:108 ../inc/host.inc:355
+#: ../inc/host.inc:107 ../inc/host.inc:360
 msgid "Anonymous"
 msgstr "Anònim"
 
-#: ../inc/host.inc:112 ../inc/result.inc:630
+#: ../inc/host.inc:111 ../inc/result.inc:634 ../user/apps.php:56
 msgid "Created"
 msgstr "Creat"
 
-#: ../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 mitjà"
 
-#: ../inc/host.inc:116
+#: ../inc/host.inc:115
 msgid "Cross project credit"
 msgstr "Crèdit multi-projecte"
 
-#: ../inc/host.inc:118
+#: ../inc/host.inc:117
 msgid "CPU type"
 msgstr "Tipus de CPU"
 
-#: ../inc/host.inc:119
+#: ../inc/host.inc:118
 msgid "Number of processors"
 msgstr "Número de processadors"
 
-#: ../inc/host.inc:121
+#: ../inc/host.inc:120
 msgid "Coprocessors"
 msgstr "Coprocessadors"
 
-#: ../inc/host.inc:123 ../inc/host.inc:687
+#: ../inc/host.inc:122 ../inc/host.inc:692
 msgid "Operating System"
 msgstr "Sistema Operatiu"
 
-#: ../inc/host.inc:126 ../inc/host.inc:235
+#: ../inc/host.inc:125 ../inc/host.inc:235
 msgid "BOINC version"
 msgstr "Versió de 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 "Memòria cau"
 
-#: ../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 "Espai d'intercanvi"
 
-#: ../inc/host.inc:143
+#: ../inc/host.inc:142
 msgid "Total disk space"
 msgstr "Espai total en disc"
 
-#: ../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 "Espai lliure al disc"
 
-#: ../inc/host.inc:150
+#: ../inc/host.inc:149
 msgid "Measured floating point speed"
 msgstr "Velocitat mesurada amb punt flotant"
 
-#: ../inc/host.inc:150 ../inc/host.inc:153
+#: ../inc/host.inc:149 ../inc/host.inc:152
 msgid "%1 million ops/sec"
 msgstr "%1 milions ops/seg"
 
-#: ../inc/host.inc:153
+#: ../inc/host.inc:152
 msgid "Measured integer speed"
 msgstr "Velocitat mesurada amb enters"
 
-#: ../inc/host.inc:157 ../inc/host.inc:159
+#: ../inc/host.inc:156 ../inc/host.inc:158
 msgid "Average upload rate"
 msgstr "Velocitat mitja de càrrega"
 
-#: ../inc/host.inc:157 ../inc/host.inc:164
+#: ../inc/host.inc:156 ../inc/host.inc:163
 msgid "%1 KB/sec"
 msgstr "%1 KB/sec"
 
-#: ../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 "Desconegut"
 
-#: ../inc/host.inc:164 ../inc/host.inc:166
+#: ../inc/host.inc:163 ../inc/host.inc:165
 msgid "Average download rate"
 msgstr "Velocitat mitja de descàrrega"
 
-#: ../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 resposta mitjà"
 
-#: ../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 dies"
 
-#: ../inc/host.inc:170
+#: ../inc/host.inc:169
 msgid "Application details"
 msgstr "Característiques de l'aplicacion"
 
-#: ../inc/host.inc:171
+#: ../inc/host.inc:170
 msgid "Show"
 msgstr "Mostra"
 
-#: ../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 "Feines"
 
-#: ../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 vegades que el client s'ha posat en contacte amb el servidor"
 
-#: ../inc/host.inc:186
+#: ../inc/host.inc:185
 msgid "Last time contacted server"
 msgstr "Últim vegada en contactar amb el servidor"
 
-#: ../inc/host.inc:187
-#, php-format
-msgid "% of time BOINC is running"
-msgstr "% de temps que BOINC s'està executant"
+#: ../inc/host.inc:186
+msgid "Fraction of time BOINC is running"
+msgstr "Una fracció del temps que BOINC s'està executant"
 
-#: ../inc/host.inc:189
-#, php-format
-msgid "While BOINC running, % of time host has an Internet connection"
-msgstr "Mentre s'executa BOINC, % de temps connexió a Internet"
+#: ../inc/host.inc:188
+msgid ""
+"While BOINC is running, fraction of time computer has an Internet connection"
+msgstr "Mentre BOINC s'està executant, una fracció d'el temps s'utilitza en una connexió a Internet"
+
+#: ../inc/host.inc:190
+msgid "While BOINC is running, fraction of time computing is allowed"
+msgstr "Mentre BOINC s'està executant, una fracció de temps es dedica al càlcul"
 
 #: ../inc/host.inc:191
-#, php-format
-msgid "While BOINC running, % of time work is allowed"
-msgstr "Mentre s'executa BOINC, % de temps de treball permès"
+msgid "While is BOINC running, fraction of time GPU computing is allowed"
+msgstr "Mentre BOINC s'està executant, una fracció de temps es dedica al càlcul amb la GPU"
 
 #: ../inc/host.inc:193
 msgid "Average CPU efficiency"
@@ -752,7 +823,7 @@ msgstr "Mitjana d'eficiència de la CPU"
 msgid "Task duration correction factor"
 msgstr "Durada de la tasca del factor de correcció"
 
-#: ../inc/host.inc:198 ../inc/host.inc:674
+#: ../inc/host.inc:198 ../inc/host.inc:679
 msgid "Location"
 msgstr "Ubicació"
 
@@ -768,7 +839,7 @@ msgstr "Combinar registres duplicats d'aquest equip"
 msgid "Merge"
 msgstr "Combinar"
 
-#: ../inc/host.inc:207 ../inc/host.inc:689
+#: ../inc/host.inc:207 ../inc/host.inc:694
 msgid "Last contact"
 msgstr "Últim contacte"
 
@@ -776,30 +847,30 @@ msgstr "Últim contacte"
 msgid "Computer info"
 msgstr "Informació de l'ordinador"
 
-#: ../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 "Categoria"
 
-#: ../inc/host.inc:225 ../inc/host.inc:679
+#: ../inc/host.inc:225 ../inc/host.inc:684
 msgid "Avg. credit"
 msgstr "Crèdit promig"
 
-#: ../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 mitjà més recent"
 
-#: ../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"
 
@@ -807,91 +878,83 @@ msgstr "GPU"
 msgid "Operating system"
 msgstr "Sistema operatiu"
 
-#: ../inc/host.inc:315
+#: ../inc/host.inc:320
 msgid "(%1 processors)"
 msgstr "(%1 processadors)"
 
-#: ../inc/host.inc:335
+#: ../inc/host.inc:340
 msgid "Details"
 msgstr "Detalls"
 
-#: ../inc/host.inc:340
+#: ../inc/host.inc:345
 msgid "Cross-project stats:"
 msgstr "Estadístiques multi-projecte:"
 
-#: ../inc/host.inc:515
+#: ../inc/host.inc:520
 msgid "Host %1 has overlapping lifetime:"
 msgstr "El host %1 supera el temps màxim:"
 
-#: ../inc/host.inc:522
+#: ../inc/host.inc:527
 msgid "Host %1 has an incompatible OS:"
 msgstr "El host %1 té un SO incompatible:"
 
-#: ../inc/host.inc:528
+#: ../inc/host.inc:533
 msgid "Host %1 has an incompatible CPU:"
 msgstr "El host %1 té una CPU incompatible:"
 
-#: ../inc/host.inc:595
+#: ../inc/host.inc:600
 msgid "same host"
 msgstr "mateix host"
 
-#: ../inc/host.inc:598
+#: ../inc/host.inc:603
 msgid "Can't merge host %1 into %2 - they're incompatible"
 msgstr "No es pot combinar el host %1 a %2 - són incompatibles"
 
-#: ../inc/host.inc:601
+#: ../inc/host.inc:606
 msgid "Merging host %1 into host %2"
 msgstr "Combinant el host %1 en el host %2"
 
-#: ../inc/host.inc:618
+#: ../inc/host.inc:623
 msgid "Couldn't update credit of new computer"
 msgstr "No es pot actualitzar el crèdit del nou ordinador"
 
-#: ../inc/host.inc:622
+#: ../inc/host.inc:627
 msgid "Couldn't update results"
 msgstr "No es poden actualitzar el resultats"
 
-#: ../inc/host.inc:627
+#: ../inc/host.inc:632
 msgid "Couldn't retire old computer"
 msgstr "No es pot treure l'ordinador vell"
 
-#: ../inc/host.inc:629
+#: ../inc/host.inc:634
 msgid "Retired old computer %1"
 msgstr "Tret l'ordinador vell %1"
 
-#: ../inc/host.inc:652 ../inc/host.inc:655
+#: ../inc/host.inc:657 ../inc/host.inc:660
 msgid "Show:"
 msgstr "Mostra:"
 
-#: ../inc/host.inc:652 ../inc/host.inc:655
+#: ../inc/host.inc:657 ../inc/host.inc:660
 msgid "All computers"
 msgstr "Tots els ordinadors"
 
-#: ../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 "Només els ordinadors actius els darrers 30 dies"
 
-#: ../inc/host.inc:666 ../inc/result.inc:637
+#: ../inc/host.inc:671 ../inc/result.inc:642
 msgid "Computer ID"
 msgstr "ID de l'ordinador"
 
-#: ../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 "versió<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 "Combinar ordinadors per el nom"
 
-#: ../inc/language_names.inc:61
+#: ../inc/language_names.inc:62
 msgid "Browser default"
 msgstr "Navegador defecte"
 
@@ -904,29 +967,29 @@ msgstr "Comentari"
 msgid "News is available as an %sRSS feed%s"
 msgstr "Les notícies estan disponibles en format %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 "Bústia d'entrada"
 
-#: ../inc/pm.inc:26 ../inc/pm.inc:178
+#: ../inc/pm.inc:26 ../inc/pm.inc:180
 msgid "Write"
 msgstr "Escriure"
 
-#: ../inc/pm.inc:33 ../inc/user.inc:378
+#: ../inc/pm.inc:33 ../inc/user.inc:458
 msgid "Send private message"
 msgstr "Enviar un missatge privat"
 
 #: ../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 "Vista prèvia"
 
-#: ../inc/pm.inc:48 ../user/pm.php:131
+#: ../inc/pm.inc:48 ../user/pm.php:136
 msgid "no such message"
 msgstr "no existeix aquest missatge"
 
@@ -938,7 +1001,7 @@ msgstr "Per"
 msgid "User IDs or unique usernames, separated with commas"
 msgstr "Identificadors ID o noms d'usuaris únics, separats per comes"
 
-#: ../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 "Assumpte"
 
@@ -946,416 +1009,499 @@ msgstr "Assumpte"
 msgid "Send message"
 msgstr "Enviar missatge"
 
-#: ../inc/pm.inc:121
+#: ../inc/pm.inc:122
 msgid "sent you a private message; subject:"
 msgstr "ha enviat un missatge privat, assumpte:"
 
-#: ../inc/pm.inc:127
+#: ../inc/pm.inc:129
 msgid "Private message%1 from %2, subject:"
 msgstr "Missatge privat%1 de %2, assumpte:"
 
-#: ../inc/pm.inc:135
+#: ../inc/pm.inc:137
 msgid "Couldn't create message"
 msgstr "No s'ha pogut crear el missatge"
 
-#: ../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 ""
-"Vostè no te permès lliurar missatges tan sovint. Si us plau esperi una "
-"estona abans de lliurar nous missatges."
+msgstr "Vostè no te permès lliurar missatges tan sovint. Si us plau esperi una estona abans de lliurar nous missatges."
 
-#: ../inc/pm.inc:176 ../user/forum_forum.php:186
+#: ../inc/pm.inc:178 ../user/forum_forum.php:190
 msgid "unread"
 msgstr "no llegit"
 
-#: ../inc/pm.inc:186
+#: ../inc/pm.inc:188
 msgid "For email notification, %1edit community prefs%2"
-msgstr ""
-"Per obtenir notificació per correu electrònic,%1editi les preferències de la "
-"comunitat%2"
+msgstr "Per obtenir notificació per correu electrònic,%1editi les preferències de la comunitat%2"
 
-#: ../inc/pm.inc:198
+#: ../inc/pm.inc:204
 msgid "Private message"
 msgstr "Missatge privat"
 
-#: ../inc/prefs.inc:77
+#: ../inc/prefs.inc:45 ../inc/prefs.inc:187
+msgid "Usage limits"
+msgstr "Límits d'utilització"
+
+#: ../inc/prefs.inc:47 ../inc/prefs.inc:55
+msgid "Use at most"
+msgstr "Utilitzar com a màxim"
+
+#: ../inc/prefs.inc:49
+#, no-php-format
 msgid ""
-"Suspend work while computer is on battery power? %1 Matters only for "
-"portable computers %2"
-msgstr ""
-"Suspendre el treball mentre l'ordinador utilitza la bateria? %1 Únicament "
-"per als ordinadors portàtils %2"
+"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."
 
-#: ../inc/prefs.inc:85
-msgid "Suspend work while computer is in use?"
-msgstr "Suspendre el treball mentre l'ordinador està en ús?"
+#: ../inc/prefs.inc:52
+#, no-php-format
+msgid "% of the CPUs"
+msgstr "% de les 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 ""
-"Suspendre el treball de la GPU mentre l'ordinador està en ús? %1 Imposat per "
-"la versió 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 "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."
+
+#: ../inc/prefs.inc:60
+#, no-php-format
+msgid "% of CPU time"
+msgstr "% de temps de CPU"
+
+#: ../inc/prefs.inc:62 ../inc/prefs.inc:208
+msgid "When to suspend"
+msgstr "Quan suspendre"
+
+#: ../inc/prefs.inc:64
+msgid "Suspend when computer is on battery"
+msgstr "Suspendre quan l'equip està connectat a la bateria"
 
-#: ../inc/prefs.inc:99
-msgid "'In use' means mouse/keyboard activity in last"
+#: ../inc/prefs.inc:65
+msgid ""
+"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."
+
+#: ../inc/prefs.inc:70
+msgid "Suspend when computer is in use"
+msgstr "Suspendre quan l'ordinador estigui en us"
+
+#: ../inc/prefs.inc:71
+msgid ""
+"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."
+
+#: ../inc/prefs.inc:76
+msgid "Suspend GPU computing when computer is in use"
+msgstr "Suspèn la computació amb la GPU mentre l'ordinador està en ús"
+
+#: ../inc/prefs.inc:77
+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."
+
+#: ../inc/prefs.inc:82
+msgid "'In use' means mouse/keyboard input in last"
 msgstr "'En ús' significa activitat del ratolí/teclat"
 
-#: ../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 "Això determina quan l'ordinador es considera \"en ús\"."
+
+#: ../inc/prefs.inc:85 ../inc/prefs.inc:92 ../inc/prefs.inc:122
 msgid "minutes"
 msgstr "minuts"
 
-#: ../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 el treball si no hi ha activitat del ratolí/teclat en l'últim %1 "
-"Necessari per entrar en mode de baix consum en alguns ordinadors %2"
+#: ../inc/prefs.inc:89
+msgid "Suspend when no mouse/keyboard input in last"
+msgstr "Suspendre quan no hi ha activitat del ratolí/teclat"
 
-#: ../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 el treball si l'ús de CPU per programari no-BOINC és superior a %1 "
-"0 significa sense restricció<br>Imposat per la versió 6.10.30+ %2"
+#: ../inc/prefs.inc:90
+msgid "This allows some computers to enter low-power mode when not in use."
+msgstr "Això permet que alguns ordinadors accedeixin a l'estat de baix consum quan no estiguin en ús."
 
-#: ../inc/prefs.inc:122
-msgid "Do work only between the hours of %1 No restriction if equal %2"
-msgstr "Només treballar entre les hores de %1 Sense restricció si es igual a %2"
+#: ../inc/prefs.inc:95
+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"
 
-#: ../inc/prefs.inc:130
-msgid ""
-"Leave tasks in memory while suspended? %1 Suspended tasks will consume swap "
-"space if 'yes' %2"
-msgstr ""
-"Deixar les tasques en la memòria mentre està suspès? %1 Les tasques suspeses "
-"consumeixen espai d'intercanvi en cas 'afirmatiu' %2"
+#: ../inc/prefs.inc:96
+msgid "Suspend computing when your computer is busy running other programs."
+msgstr "Suspendre la computació quan l'equip està ocupat executant altres programes."
 
-#: ../inc/prefs.inc:139
-msgid "Switch between tasks every %1 Recommended: 60 minutes %2"
-msgstr "Canviar de tasca cada %1 Recomanat: 60 minuts %2"
+#: ../inc/prefs.inc:101
+msgid "Compute only between"
+msgstr "Calcular només entre"
 
-#: ../inc/prefs.inc:147
-msgid "On multiprocessors, use at most"
-msgstr "Amb multiprocessadors, utilitzar com a màxim"
+#: ../inc/prefs.inc:102
+msgid "Compute only during a particular period each day."
+msgstr "Calcular només durant un període determinat cada dia."
 
-#: ../inc/prefs.inc:149
-msgid "processors"
-msgstr "processadors"
+#: ../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 "Un altre"
 
-#: ../inc/prefs.inc:153
-msgid "On multiprocessors, use at most %1 Enforced by version 6.1+ %2"
-msgstr ""
-"Amb multiprocessadors, utilitzar com a màxim %1 Imposat per la versió 6.1+ %"
-"2"
+#: ../inc/prefs.inc:107
+msgid "Store at least"
+msgstr "Emmagatzemar almenys"
 
-#: ../inc/prefs.inc:158
-#, php-format
-msgid "% of the processors"
-msgstr "% dels processadors"
+#: ../inc/prefs.inc:108
+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."
 
-#: ../inc/prefs.inc:162
-msgid "Use at most %1 Can be used to reduce CPU heat %2"
-msgstr ""
-"Utilitzar com a màxim %1 Pot ser utilitzat per reduir la escalfor de la CPU "
-"%2"
+#: ../inc/prefs.inc:110 ../inc/prefs.inc:116
+msgid "days of work"
+msgstr "dies de treball"
 
-#: ../inc/prefs.inc:167
-#, php-format
-msgid "% of CPU time"
-msgstr "% de temps de CPU"
+#: ../inc/prefs.inc:113
+msgid "Store up to an additional"
+msgstr "Emmagatzema fins a un màxim de"
 
-#: ../inc/prefs.inc:175 ../inc/prefs.inc:189
-msgid "Disk: use at most"
-msgstr "Disc: utilitzar com a màxim"
+#: ../inc/prefs.inc:114
+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."
 
-#: ../inc/prefs.inc:177 ../inc/prefs.inc:186
-msgid "GB"
-msgstr "GB"
+#: ../inc/prefs.inc:119
+msgid "Switch between tasks about every"
+msgstr "Canviar entre tasques sobre cada"
 
-#: ../inc/prefs.inc:180
-msgid "Disk: leave free at least %1 Values smaller than %2 are ignored %3"
-msgstr "Disc: deixar lliure al menys %1 Els valors inferiors a %2 s'ignoren %3"
+#: ../inc/prefs.inc:120
+msgid "If you run several projects, BOINC may switch between them this often."
+msgstr "Si executeu diversos projectes, BOINC pot canviar entre ells sovint."
 
-#: ../inc/prefs.inc:191 ../inc/prefs.inc:201 ../inc/prefs.inc:206
-#: ../inc/prefs.inc:211
-#, php-format
-msgid "% of total"
-msgstr "% del total"
+#: ../inc/prefs.inc:125
+msgid "Request tasks to checkpoint at most every"
+msgstr "Sol·licitar tasques al control almenys cada"
 
-#: ../inc/prefs.inc:194
-msgid "Tasks checkpoint to disk at most every"
-msgstr "Guardar els punts de control de les tasques a disc almenys cada"
+#: ../inc/prefs.inc:126
+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."
 
-#: ../inc/prefs.inc:196
+#: ../inc/prefs.inc:128
 msgid "seconds"
 msgstr "segons"
 
-#: ../inc/prefs.inc:199
-msgid "Swap space: use at most"
-msgstr "Espai d'intercanvi: utilitzar com a màxim"
+#: ../inc/prefs.inc:136 ../inc/prefs.inc:148
+msgid "Use no more than"
+msgstr "No utilitzar més de"
 
-#: ../inc/prefs.inc:204
-msgid "Memory: when computer is in use, use at most"
-msgstr "Memòria: quan l'ordinador està en ús, utilitzar com a màxim"
+#: ../inc/prefs.inc:137
+msgid "Limit the total amount of disk space used by BOINC."
+msgstr "Limitar l'espai total en disc utilitzat per BOINC."
 
-#: ../inc/prefs.inc:209
-msgid "Memory: when computer is not in use, use at most"
-msgstr "Memòria: quan l'ordinador no està en ús, utilitzar com a màxim"
+#: ../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 ""
-"Mantenir suficients tasques per mantenir-se ocupat durant almenys%1(màxim 10 "
-"dies).%2"
+#: ../inc/prefs.inc:142
+msgid "Leave at least"
+msgstr "Deixar al menys"
 
-#: ../inc/prefs.inc:223 ../inc/prefs.inc:228 ../inc/prefs.inc:270
-#: ../inc/util.inc:274
-msgid "days"
-msgstr "dies"
+#: ../inc/prefs.inc:143
+msgid ""
+"Limit disk usage to leave this much free space on the volume where BOINC "
+"stores data."
+msgstr "Limitar l'ús d'espai en disc per deixar-hi el màxim espai lliure on BOINC emmagatzema dades."
 
-#: ../inc/prefs.inc:226
-msgid "... and up to an additional"
-msgstr "... i fins a un màxim de"
+#: ../inc/prefs.inc:145
+msgid "GB free"
+msgstr "Gb lliures"
 
-#: ../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 abans de connectar-se a Internet? %1 Tan sols si teniu un mòdem, "
-"ISDN o una connexió VPN %2"
+"Limit the percentage of disk space used by BOINC on the volume where it "
+"stores data."
+msgstr "limitar el percentatge d'espai en disc utilitzat per BOINC en el volum en el qual emmagatzema dades."
 
-#: ../inc/prefs.inc:241
-msgid ""
-"Disconnect when done? %1 Matters only if you have a modem, ISDN or VPN "
-"connection %2"
-msgstr ""
-"Desconnectar quan es finalitza? %1 Tan sols si teniu un mòdem, ISDN o una "
-"connexió VPN %2"
+#: ../inc/prefs.inc:152
+#, no-php-format
+msgid "% of total"
+msgstr "% del total"
 
-#: ../inc/prefs.inc:249
-msgid "Maximum download rate:"
-msgstr "Taxa màxima de descàrrega:"
+#: ../inc/prefs.inc:158
+msgid "When computer is in use, use at most"
+msgstr "Quan l'ordinador està en ús, utilitzar com a màxim"
 
-#: ../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 "Limiti la memòria utilitzada per BOINC quan s'està utilitzant l'ordinador."
 
-#: ../inc/prefs.inc:254
-msgid "Maximum upload rate:"
-msgstr "Taxa màxima de càrrega:"
+#: ../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 "Utilitzar la xarxa només entre les hores de"
+#: ../inc/prefs.inc:165
+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"
 
-#: ../inc/prefs.inc:263
-msgid "Transfer at most %1 Enforced by version 6.10.46+ %2"
-msgstr "Tranferir com a màxim %1 Imposat per la versió 6.10.46+ %2"
+#: ../inc/prefs.inc:166
+msgid "Limit the memory used by BOINC when you're not using the computer."
+msgstr "Limiti la memòria utilitzada per BOINC quan no s'estigui utilitzant l'equip."
 
-#: ../inc/prefs.inc:269
-msgid "Mbytes every"
-msgstr "Mbytes lliures"
+#: ../inc/prefs.inc:172
+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"
 
-#: ../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 ""
-"Evitar la verificació de l'arxiu imatge? %1 Seleccioneu aquesta opció NOMÉS "
-"si el vostre proveïdor d'Internet modifica els arxius imatge (per exemple "
-"UMTS ho fa). %2 Ometre la comprovació redueix la seguretat 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 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."
 
-#: ../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 ""
-"Compartició de recursos %1 Determina la proporció dels recursos de "
-"l'ordinador assignats a aquest projecte. Exemple: si vostè participa a dos "
-"projectes BOINC, amb quotes de recursos de 100 i 200, el primer rebrà 1/3 "
-"dels seus recursos i el segon obtindrà 2/3. %2"
+#: ../inc/prefs.inc:178
+msgid "Page/swap file: use at most"
+msgstr "Espai d'intercanvi: utilitzar com a màxim"
 
-#: ../inc/prefs.inc:298
-msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
-msgstr "Accelerar les tasques de la GPU dedicant una CPU a cada un?"
+#: ../inc/prefs.inc:179
+msgid "Limit the swap space (page file) used by BOINC."
+msgstr "Limitar l'espai de intercanvi (fitxer d'intercanvi) utilitzat per BOINC."
 
-#: ../inc/prefs.inc:308
-msgid "Use CPU %1 Enforced by version 6.10+ %2"
-msgstr "Usar la CPU %1 Imposat per la versió 6.10+ %2"
+#: ../inc/prefs.inc:189
+msgid "Limit download rate to"
+msgstr "Limita la taxa de baixada a"
 
-#: ../inc/prefs.inc:320
-msgid "Use ATI GPU %1 Enforced by version 6.10+ %2"
-msgstr "Usar la GPU ATI %1 Imposat per la versió 6.10+ %2"
+#: ../inc/prefs.inc:190
+msgid "Limit the download rate of file transfers."
+msgstr "Limitar la taxa de baixada en la transferència de fitxers."
 
-#: ../inc/prefs.inc:332
-msgid "Use NVIDIA GPU %1 Enforced by version 6.10+ %2"
-msgstr "Usar la GPU NVIDIA %1 Imposat per la versió 6.10+ %2"
+#: ../inc/prefs.inc:192 ../inc/prefs.inc:198
+msgid "KB/second"
+msgstr "Kb/segon"
 
-#: ../inc/prefs.inc:344
-msgid "Use Intel GPU %1 Enforced by version 7.2+ %2"
-msgstr "Usar la GPU Intel %1 Imposat per la versió 7.2+ %2"
+#: ../inc/prefs.inc:195
+msgid "Limit upload rate to"
+msgstr "Taxa límit de pujada 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 les aplicacions de prova? %1 Això ens ajuda a desenvolupar "
-"aplicacions, però pot causar errors en els treballs en el seu ordinador %2"
+#: ../inc/prefs.inc:196
+msgid "Limit the upload rate of file transfers."
+msgstr "Limitar la taxa de pujada en la transferència de fitxers."
 
-#: ../inc/prefs.inc:367
-msgid ""
-"Emails will be sent from %1; make sure your spam filter accepts this address."
-msgstr ""
-"Missatges de correu electrònic seràn enviats des de %1; assegureu-vos que el "
-"seu filtre anti-spam accepta aquesta direcció."
+#: ../inc/prefs.inc:201
+msgid "Limit usage to"
+msgstr "Limita l'us fins"
 
-#: ../inc/prefs.inc:374
-msgid "Is it OK for %1 and your team (if any) to email you?"
-msgstr "Es OK per %1 i el seu equip (si n'hi ha) enviar-li per correu?"
+#: ../inc/prefs.inc:202
+msgid "Example: BOINC should transfer at most 2000 MB of data every 30 days."
+msgstr "Exemple: BOINC ha de transferir com a molt 2000 MB de dades cada 30 dies."
 
-#: ../inc/prefs.inc:380
-msgid "Should %1 show your computers on its web site?"
-msgstr "Pot %1 mostrar els seus equips en el seu lloc web?"
+#: ../inc/prefs.inc:205
+msgid "MB every"
+msgstr "MB cada"
 
-#: ../inc/prefs.inc:387
-msgid "Disk and memory usage"
-msgstr "Ús de disc i memòria"
+#: ../inc/prefs.inc:206 ../inc/util.inc:303
+msgid "days"
+msgstr "dies"
 
-#: ../inc/prefs.inc:388
-msgid "Processor usage"
-msgstr "Ús del processador"
+#: ../inc/prefs.inc:210
+msgid "Transfer files only between"
+msgstr "Transferir fitxers només entre"
 
-#: ../inc/prefs.inc:389
-msgid "Network usage"
-msgstr "Ús de la xarxa"
+#: ../inc/prefs.inc:211
+msgid "Transfer files only during a particular period each day."
+msgstr "Transferir fitxers només durant un període de temps cada dia."
 
-#: ../inc/prefs.inc:392
-msgid ""
-"These preferences apply to all the BOINC projects in which you participate."
-msgstr ""
-"Aquestes preferències s'apliquen a tots els projectes BOINC en què vostè "
-"participa."
+#: ../inc/prefs.inc:216
+msgid "Skip data verification for image files"
+msgstr "Ometre la verificació de la data del fitxers imatge"
 
-#: ../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 ""
-"%1No es poden actualitzar les preferències.%2 Els valors marcats en vermell "
-"a continuació son fora de rang o no numèrics."
+"Check this only if your Internet provider modifies image files. Skipping "
+"verification reduces the security of BOINC."
+msgstr "Marcar només si el teu proveïdor d'Internet modifica els fitxer imatge. Ometre la verificació redueix la seguretat de BOINC."
 
-#: ../inc/prefs.inc:445
-msgid "bad venue: %1"
-msgstr "lloc erroni: %1"
+#: ../inc/prefs.inc:222
+msgid "Confirm before connecting to Internet"
+msgstr "Confirmar abans de connectar-se a Internet"
 
-#: ../inc/prefs.inc:451
-msgid "bad subset: %1"
-msgstr "subconjunt erroni: %1"
+#: ../inc/prefs.inc:223 ../inc/prefs.inc:229
+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."
 
-#: ../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 "si"
+#: ../inc/prefs.inc:228
+msgid "Disconnect when done"
+msgstr "Desconnectar en finalitzar"
 
-#: ../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 "no"
+#: ../inc/prefs.inc:235 ../inc/prefs.inc:472 ../user/explain_state.php:94
+msgid "Computing"
+msgstr "Computant"
 
-#: ../inc/prefs.inc:679 ../user/forum_search.php:53
-msgid "no limit"
-msgstr "sense límit"
+#: ../inc/prefs.inc:236
+msgid "Disk"
+msgstr "Disc"
 
-#: ../inc/prefs.inc:704 ../user/team_admins.php:79
-msgid "Add"
-msgstr "Afegir"
+#: ../inc/prefs.inc:238
+msgid "Network"
+msgstr "Xarxa"
 
-#: ../inc/prefs.inc:706 ../inc/prefs.inc:834
-#: ../user/edit_forum_preferences_form.php:160 ../user/team_admins.php:34
-msgid "Remove"
-msgstr "Eliminar"
+#: ../inc/prefs.inc:241
+msgid ""
+"These preferences apply to all the BOINC projects in which you participate."
+msgstr "Aquestes preferències s'apliquen a tots els projectes BOINC en què vostè participa."
 
-#: ../inc/prefs.inc:812 ../user/explain_state.php:94
-msgid "Computing"
-msgstr "Computant"
+#: ../inc/prefs.inc:244
+msgid ""
+"%1Unable to update preferences.%2 The values marked in red below were out of"
+" range or not numeric."
+msgstr "%1No es poden actualitzar les preferències.%2 Els valors marcats en vermell a continuació son fora de rang o no numèrics."
 
-#: ../inc/prefs.inc:823
+#: ../inc/prefs.inc:483
 msgid "Separate preferences for %1"
 msgstr "Separa les preferències per %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 les preferències"
 
-#: ../inc/prefs.inc:839
+#: ../inc/prefs.inc:494 ../user/edit_forum_preferences_form.php:149
+#: ../user/team_admins.php:36
+msgid "Remove"
+msgstr "Eliminar"
+
+#: ../inc/prefs.inc:499
 msgid "Add separate preferences for %1"
 msgstr "Afegir preferències independents per %1"
 
-#: ../inc/prefs.inc:847 ../inc/prefs.inc:895
-msgid "(Switch View)"
-msgstr "(Canvar vista)"
+#: ../inc/prefs.inc:506
+msgid "These settings apply to all computers using this account except"
+msgstr "Aquesta configuració s'aplica a tots els ordinadors que utilitzen aquest compte excepte"
 
-#: ../inc/prefs.inc:849 ../inc/prefs.inc:898
+#: ../inc/prefs.inc:508
+msgid ""
+"computers where you have set preferences locally using the BOINC Manager"
+msgstr "ordinadors en els que has configurat preferències locals utilitzant l'Administrador BOINC"
+
+#: ../inc/prefs.inc:510
+msgid "Android devices"
+msgstr "Dispositius Android"
+
+#: ../inc/prefs.inc:513
+msgid "(Switch view)"
+msgstr "(Canviar vista)"
+
+#: ../inc/prefs.inc:515 ../inc/prefs_project.inc:272
 msgid "Combined preferences"
 msgstr "Preferències combinades"
 
-#: ../inc/prefs.inc:854
-msgid "Project specific settings"
-msgstr "Configuració específica del projecte"
+#: ../inc/prefs.inc:522 ../inc/prefs_project.inc:283
+msgid "Primary (default) preferences"
+msgstr "Preferències principals (per defecte)"
+
+#: ../inc/prefs.inc:537
+msgid "Preferences last modified:"
+msgstr "Preferències modificades per última vegada:"
+
+#: ../inc/prefs.inc:553
+msgid "Add preferences"
+msgstr "Afegir preferències"
+
+#: ../inc/prefs.inc:557
+msgid "Update preferences"
+msgstr "Actualitzar les preferències"
+
+#: ../inc/prefs.inc:628 ../project.sample/project_specific_prefs.inc:84
+#: ../project.sample/project_specific_prefs.inc:224
+msgid "yes"
+msgstr "si"
+
+#: ../inc/prefs.inc:630 ../project.sample/project_specific_prefs.inc:86
+#: ../project.sample/project_specific_prefs.inc:224
+msgid "no"
+msgstr "no"
+
+#: ../inc/prefs.inc:638
+msgid "Default computer location"
+msgstr "Ubicació defecte de l'equip"
+
+#: ../inc/prefs.inc:639
+msgid ""
+"New computers will use this location for computing and project preferences."
+msgstr "Els nous ordinadors utilitzaran aquesta ubicació per a les preferències de computació i dels projectes."
+
+#: ../inc/prefs_project.inc:52
+msgid "Resource share"
+msgstr "Compartició de recursos"
+
+#: ../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 la proporció dels recursos de l'ordinador assignats a aquest projecte. Per exemple: si participes a dos projectes BOINC, amb quotes de recursos de 100 i 200, el primer rebrà 1/3 dels seus recursos i el segon n'obtindrà 2/3."
+
+#: ../inc/prefs_project.inc:61
+msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
+msgstr "Accelerar les tasques de la GPU dedicant una CPU a cada un?"
+
+#: ../inc/prefs_project.inc:70
+msgid "Use CPU"
+msgstr "Utilitza CPU"
+
+#: ../inc/prefs_project.inc:79
+msgid "Use ATI GPU"
+msgstr "Utilitza ATI GPU"
+
+#: ../inc/prefs_project.inc:88
+msgid "Use NVIDIA GPU"
+msgstr "Utilitza NVIDIA GPU"
 
-#: ../inc/prefs.inc:862 ../inc/prefs.inc:907
-msgid "Primary (default) preferences"
-msgstr "Preferències principals (per defecte)"
+#: ../inc/prefs_project.inc:97
+msgid "Use Intel GPU"
+msgstr "Utilitza Intel GPU"
 
-#: ../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 "Edita les preferències de %1"
+#: ../inc/prefs_project.inc:107
+msgid "Run test applications?"
+msgstr "Executar el test d'aplicacions?"
 
-#: ../inc/prefs.inc:885
-msgid "These apply to all BOINC projects in which you participate."
-msgstr "Això s'aplica a tots els projectes BOINC en els que participes."
+#: ../inc/prefs_project.inc:108
+msgid ""
+"This helps us develop applications, but may cause jobs to fail on your "
+"computer"
+msgstr "Això ens ajuda a desenvolupar aplicacions, però pot provocar que les tasques fallin en el teu ordinador"
 
-#: ../inc/prefs.inc:887
+#: ../inc/prefs_project.inc:115
 msgid ""
-"On computers participating in multiple projects, the most recently modified "
-"preferences will be used."
-msgstr ""
-"En els ordinador que participen en múltiples projectes, s'utilitzaran les "
-"preferències modificades més recentment."
+"Emails will be sent from %1; make sure your spam filter accepts this "
+"address."
+msgstr "Missatges de correu electrònic seràn enviats des de %1; assegureu-vos que el seu filtre anti-spam accepta aquesta direcció."
 
-#: ../inc/prefs.inc:889
-msgid "These preferences do not apply to Android devices."
-msgstr "Aquestes preferències no s'apliquen a dispositius Android."
+#: ../inc/prefs_project.inc:123
+msgid "Is it OK for %1 and your team (if any) to email you?"
+msgstr "Es OK per %1 i el seu equip (si n'hi ha) enviar-li per correu?"
 
-#: ../inc/prefs.inc:892
-msgid "Preferences last modified:"
-msgstr "Preferències modificades per última vegada:"
+#: ../inc/prefs_project.inc:130
+msgid "Should %1 show your computers on its web site?"
+msgstr "Pot %1 mostrar els seus equips en el seu lloc web?"
 
-#: ../inc/prefs.inc:944
-msgid "Add preferences"
-msgstr "Afegir preferències"
+#: ../inc/prefs_project.inc:270
+msgid "(Switch View)"
+msgstr "(Canvar vista)"
 
-#: ../inc/prefs.inc:948
-msgid "Update preferences"
-msgstr "Actualitzar les preferències"
+#: ../inc/prefs_project.inc:276
+msgid "Project specific settings"
+msgstr "Configuració específica del projecte"
 
-#: ../inc/prefs.inc:1036 ../inc/prefs.inc:1045
-msgid "Default computer location"
-msgstr "Ubicació defecte de l'equip"
+#: ../inc/prefs_util.inc:33
+msgid "bad venue: %1"
+msgstr "lloc erroni: %1"
 
-#: ../inc/prefs_util.inc:305 ../inc/prefs_util.inc:315
+#: ../inc/prefs_util.inc:39
+msgid "bad subset: %1"
+msgstr "subconjunt erroni: %1"
+
+#: ../inc/prefs_util.inc:476 ../inc/prefs_util.inc:500
 msgid "and"
 msgstr "i"
 
@@ -1363,19 +1509,15 @@ msgstr "i"
 msgid ""
 "Your profile will be made visible to other people as soon as it has been "
 "approved by the project. This may take up to a few days."
-msgstr ""
-"El seu perfil serà visible per als altres, tan aviat com sigui aprovat pel "
-"projecte. Això pot tardar alguns dies."
+msgstr "El seu perfil serà visible per als altres, tan aviat com sigui aprovat pel projecte. Això pot tardar alguns dies."
 
 #: ../inc/profile.inc:92
 msgid ""
 "Your profile has been marked as unacceptable. It is not visible to other "
 "people. Please change it."
-msgstr ""
-"El seu perfil ha estat marcat com a inacceptable. No és visible als altres. "
-"Si us plau, canviï'l."
+msgstr "El seu perfil ha estat marcat com a inacceptable. No és visible als altres. Si us plau, canviï'l."
 
-#: ../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 "Error de base de dades"
 
@@ -1383,10 +1525,7 @@ msgstr "Error de base de dades"
 msgid ""
 "To prevent spam, profiles of users with an average credit of less than %1 "
 "are displayed only to logged-in users. We apologize for this inconvenience."
-msgstr ""
-"Per evitar el correu brossa, els perfils d'usuaris amb un crèdit mitjà de "
-"menys de %1 només es mostren als usuaris registrats. Demanem disculpes per "
-"aquest inconvenient."
+msgstr "Per evitar el correu brossa, els perfils d'usuaris amb un crèdit mitjà de menys de %1 només es mostren als usuaris registrats. Demanem disculpes per aquest inconvenient."
 
 #: ../inc/profile.inc:197
 msgid "User is banished"
@@ -1396,7 +1535,7 @@ msgstr "Usuari expulsat"
 msgid "No profile exists for that user ID."
 msgstr "No hi ha cap perfil per aquest ID d'usuari."
 
-#: ../inc/profile.inc:219 ../user/create_profile.php:313
+#: ../inc/profile.inc:219 ../user/create_profile.php:309
 msgid "Edit your profile"
 msgstr "Editi el seu perfil"
 
@@ -1444,11 +1583,12 @@ msgstr "No en la DB"
 msgid "pending"
 msgstr "pendent"
 
-#: ../inc/result.inc:114 ../user/forum_search.php:60
+#: ../inc/result.inc:114 ../user/forum_search.php:62
 msgid "All"
 msgstr "Tot"
 
 #: ../inc/result.inc:115 ../inc/result.inc:176 ../inc/result.inc:223
+#: ../user/server_status.php:163
 msgid "In progress"
 msgstr "En progrés"
 
@@ -1477,6 +1617,7 @@ msgid "Inactive"
 msgstr "Inactiu"
 
 #: ../inc/result.inc:175 ../inc/result.inc:222 ../user/explain_state.php:37
+#: ../user/server_status.php:163
 msgid "Unsent"
 msgstr "No enviats"
 
@@ -1641,127 +1782,135 @@ msgid "WU cancelled"
 msgstr "WU cancel·lada"
 
 #: ../inc/result.inc:322
+msgid "Canonical result is missing"
+msgstr "Falta el resultat canònic"
+
+#: ../inc/result.inc:326
 msgid "Unrecognized Error: %1"
 msgstr "Error no reconegut: %1"
 
-#: ../inc/result.inc:349
+#: ../inc/result.inc:353
 msgid "Task name"
 msgstr "Nom de la tasca"
 
-#: ../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 "feu clic per més detalls"
 
-#: ../inc/result.inc:349
+#: ../inc/result.inc:353
 msgid "Show IDs"
 msgstr "Mostra ID's"
 
-#: ../inc/result.inc:354
+#: ../inc/result.inc:358
 msgid "Show names"
 msgstr "Mostra els noms"
 
-#: ../inc/result.inc:357
+#: ../inc/result.inc:361
 msgid "Task"
 msgstr "Feina"
 
-#: ../inc/result.inc:360
+#: ../inc/result.inc:364
 msgid "Work unit"
 msgstr "Unitat de treball"
 
-#: ../inc/result.inc:369
+#: ../inc/result.inc:373
 msgid "Computer"
 msgstr "Ordinador"
 
-#: ../inc/result.inc:372 ../inc/result.inc:631
+#: ../inc/result.inc:376 ../inc/result.inc:635
 msgid "Sent"
 msgstr "Lliurat"
 
-#: ../inc/result.inc:373
+#: ../inc/result.inc:377
 msgid "Time reported<br />or deadline"
 msgstr "Temps informat<br />o termini"
 
-#: ../inc/result.inc:374
+#: ../inc/result.inc:378
 msgid "explain"
 msgstr "explicar"
 
-#: ../inc/result.inc:376 ../user/server_status.php:241
+#: ../inc/result.inc:380 ../user/server_status.php:113
 msgid "Status"
 msgstr "Estatus"
 
-#: ../inc/result.inc:377
+#: ../inc/result.inc:381
 msgid "Run time<br />(sec)"
 msgstr "Temps d'execució<br />(seg)"
 
-#: ../inc/result.inc:378
+#: ../inc/result.inc:382
 msgid "CPU time<br />(sec)"
 msgstr "Temps de CPU<br />(seg)"
 
-#: ../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 "Aplicació"
 
-#: ../inc/result.inc:629
+#: ../inc/result.inc:633
 msgid "Workunit"
 msgstr "Workunit"
 
-#: ../inc/result.inc:632
+#: ../inc/result.inc:636
+msgid "Report deadline"
+msgstr "Informe termini"
+
+#: ../inc/result.inc:637
 msgid "Received"
 msgstr "Rebut"
 
-#: ../inc/result.inc:633
+#: ../inc/result.inc:638
 msgid "Server state"
 msgstr "Estat del servidor"
 
-#: ../inc/result.inc:634
+#: ../inc/result.inc:639
 msgid "Outcome"
 msgstr "Final"
 
-#: ../inc/result.inc:635
+#: ../inc/result.inc:640
 msgid "Client state"
 msgstr "Estat del client"
 
-#: ../inc/result.inc:636
+#: ../inc/result.inc:641
 msgid "Exit status"
 msgstr "L'estat de sortida"
 
-#: ../inc/result.inc:638
-msgid "Report deadline"
-msgstr "Informe termini"
-
-#: ../inc/result.inc:639
+#: ../inc/result.inc:643
 msgid "Run time"
 msgstr "Temps d'execució"
 
-#: ../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 "Validar l'estat"
 
-#: ../inc/result.inc:643
+#: ../inc/result.inc:647
+msgid "Device peak FLOPS"
+msgstr "Pic de FLOPS del dispositiu"
+
+#: ../inc/result.inc:648
 msgid "Application version"
 msgstr "Versió de l'aplicació"
 
-#: ../inc/result.inc:656
+#: ../inc/result.inc:673
 msgid "Output files"
 msgstr "Arxius de sortida"
 
-#: ../inc/result.inc:659
+#: ../inc/result.inc:676
 msgid "Stderr output"
 msgstr "Sortida stderr"
 
-#: ../inc/result.inc:706
+#: ../inc/result.inc:728
 msgid "State"
 msgstr "Estat"
 
-#: ../inc/result.inc:747
+#: ../inc/result.inc:769
 msgid "Task name:"
 msgstr "Nom de la tasca:"
 
@@ -1777,17 +1926,7 @@ msgstr "Paraules clau"
 msgid "Find teams with these words in their names or descriptions"
 msgstr "Trobar equips amb aquestes paraules en els seus noms o descripcions"
 
-#: ../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 "Tipus d'equip"
 
@@ -1795,7 +1934,7 @@ msgstr "Tipus d'equip"
 msgid "Show only active teams"
 msgstr "Mostrar només equips actius"
 
-#: ../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 "Cerca"
 
@@ -1815,8 +1954,8 @@ msgstr "Sol·licitat per vostè"
 msgid "founder response deadline is %1"
 msgstr "el temps de resposta del fundador es %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 "Cap"
 
@@ -1826,505 +1965,483 @@ msgstr "Iniciï la petició"
 
 #: ../inc/team.inc:77
 msgid "Deferred"
-msgstr "Ajornat"
+msgstr "Posposat"
 
 #: ../inc/team.inc:87
 msgid "Team info"
 msgstr "Informació de l'equip"
 
-#: ../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 "Descripció"
 
-#: ../inc/team.inc:97
+#: ../inc/team.inc:101
 msgid "Web site"
 msgstr "Pàgina web"
 
-#: ../inc/team.inc:120
+#: ../inc/team.inc:127
 msgid "Cross-project stats"
 msgstr "Estadístiques multi-projecte"
 
-#: ../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 "Tipus"
 
-#: ../inc/team.inc:127 ../user/team_manage.php:63
+#: ../inc/team.inc:134 ../user/team_manage.php:65
 msgid "Message board"
 msgstr "Panell de missatges"
 
-#: ../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 "Fils"
 
-#: ../inc/team.inc:136
+#: ../inc/team.inc:143
 msgid "Join this team"
 msgstr "Ajuntar-se a aquest equip"
 
-#: ../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: si activa 'PERMETRE email' a les preferències del projecte, en "
-"ajuntant-se a un equip permet als seus fundadors accedir a la vostra adreça "
-"de correu"
+msgstr "Nota: si activa 'PERMETRE email' a les preferències del projecte, en ajuntant-se a un equip permet als seus fundadors accedir a la vostra adreça de correu"
 
-#: ../inc/team.inc:140
+#: ../inc/team.inc:147
 msgid "Not accepting new members"
 msgstr "No s'accepten nous membres"
 
-#: ../inc/team.inc:147
+#: ../inc/team.inc:154
 msgid "Foundership change requested"
 msgstr "Canvi sol·licitat per el fundador"
 
-#: ../inc/team.inc:148
+#: ../inc/team.inc:155
 msgid "Respond by %1"
 msgstr "Resposta per %1"
 
-#: ../inc/team.inc:152
+#: ../inc/team.inc:159
 msgid "Team foundership change"
 msgstr "Canvi de l'equip fundador"
 
-#: ../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 "Fundador"
 
-#: ../inc/team.inc:169
+#: ../inc/team.inc:178
 msgid "Admins"
 msgstr "Administradors"
 
-#: ../inc/team.inc:184
+#: ../inc/team.inc:193
 msgid "New members in last day"
 msgstr "Nous membres en el darrer dia"
 
-#: ../inc/team.inc:185
+#: ../inc/team.inc:194
 msgid "Total members"
 msgstr "Total de membres"
 
-#: ../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 "mirar"
 
-#: ../inc/team.inc:186
+#: ../inc/team.inc:195
 msgid "Active members"
 msgstr "Membres actius"
 
-#: ../inc/team.inc:187
+#: ../inc/team.inc:196
 msgid "Members with credit"
 msgstr "Membres amb crèdits"
 
-#: ../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 "Anteriors %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 "Següent %1"
 
-#: ../inc/team.inc:289
+#: ../inc/team.inc:298
 msgid "No such team."
 msgstr "Equip inexistent."
 
-#: ../inc/team.inc:302
+#: ../inc/team.inc:311
 msgid "This operation requires foundership."
 msgstr "Aquesta operació requereix ser fundador."
 
-#: ../inc/team.inc:326
+#: ../inc/team.inc:335
 msgid "This operation requires team admin privileges"
 msgstr "Aquesta operació requereix privilegis d'administrador d'equip"
 
-#: ../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 ""
-"ADVERTÈNCIA: Aquest és un equip de BOINC general. Si vostè fa canvis aquí, "
-"aviat seran sobreescrits. Modificar %1l'equip BOINC general%2."
+"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 "ADVERTÈNCIA: Aquest és un equip de BOINC general. Si vostè fa canvis aquí, aviat seran sobreescrits. Modificar %1l'equip BOINC general%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 ""
-"%1Nota de privacitat%2: si vostè crea un equip, les preferències del seu "
-"projecte (compartició de recursos, preferències gràfiques) seran visibles "
-"per a tothom."
+msgstr "%1Nota de privacitat%2: si vostè crea un equip, les preferències del seu projecte (compartició de recursos, preferències gràfiques) seran visibles per a tothom."
 
-#: ../inc/team.inc:432
+#: ../inc/team.inc:447
 msgid "Team name, text version"
 msgstr "Nom de l'equip, versió text"
 
-#: ../inc/team.inc:433
+#: ../inc/team.inc:448
 msgid "Don't use HTML tags."
 msgstr "No utilitzi etiquetes HTML."
 
-#: ../inc/team.inc:436
+#: ../inc/team.inc:451
 msgid "Team name, HTML version"
 msgstr "Nom de l'equip, versió 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 "Pot utilitzar %1algunes etiquetes HTML%2."
 
-#: ../inc/team.inc:439
+#: ../inc/team.inc:454
 msgid "If you don't know HTML, leave this box blank."
 msgstr "Si desconeix HTML, no seleccioni aquesta opció."
 
-#: ../inc/team.inc:442
+#: ../inc/team.inc:457
 msgid "URL of team web page, if any"
 msgstr "URL de la pàgina web de l'equip, si en té"
 
-#: ../inc/team.inc:442
+#: ../inc/team.inc:457
 msgid "without \"http://\""
 msgstr "sense \"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 "Aquesta URL enllaçarà amb la pàgina de l'equip des d'aquest lloc."
 
-#: ../inc/team.inc:446
+#: ../inc/team.inc:461
 msgid "Description of team"
 msgstr "Descripció de l'equip"
 
-#: ../inc/team.inc:462
+#: ../inc/team.inc:477
 msgid "Accept new members?"
 msgstr "Acceptar nous membres?"
 
-#: ../inc/uotd.inc:28
+#: ../inc/uotd.inc:30
 msgid "User profile"
 msgstr "Perfil d'usuari"
 
-#: ../inc/user.inc:119
+#: ../inc/user.inc:120
 msgid "Projects in which you are participating"
 msgstr "Projectes en els quals esteu participant"
 
-#: ../inc/user.inc:121
+#: ../inc/user.inc:122
 msgid "Projects in which %1 is participating"
 msgstr "Projectes en els quals %1 està participant"
 
-#: ../inc/user.inc:125
+#: ../inc/user.inc:126
 msgid "Project"
 msgstr "Projecte"
 
-#: ../inc/user.inc:125
+#: ../inc/user.inc:126
 msgid "Click for user page"
 msgstr "Prémer per accedir a la pàgina de l'usuari"
 
-#: ../inc/user.inc:125
+#: ../inc/user.inc:126
 msgid "Since"
 msgstr "Des de"
 
-#: ../inc/user.inc:148
+#: ../inc/user.inc:151
 msgid "Computing and credit"
 msgstr "Computació i crèdits"
 
-#: ../inc/user.inc:151
+#: ../inc/user.inc:154
 msgid "Computers on this account"
 msgstr "Ordinadors d'aquest 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 "Mirar"
 
-#: ../inc/user.inc:161
+#: ../inc/user.inc:164
 msgid "Cross-project ID"
 msgstr "ID multi-projecte"
 
-#: ../inc/user.inc:162
+#: ../inc/user.inc:165
 msgid "Cross-project statistics"
 msgstr "Estadístiques multi-projecte"
 
-#: ../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 "Grup"
 
-#: ../inc/user.inc:167
+#: ../inc/user.inc:170
 msgid "Cross-project"
 msgstr "Multi-projecte"
 
-#: ../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 "Estadístiques en el seu mòbil"
 
-#: ../inc/user.inc:183
-msgid "Unknown notification type: %1"
-msgstr "Tipus de notificació desconeguda: %1"
-
-#: ../inc/user.inc:198
+#: ../inc/user.inc:197
 msgid "Account information"
 msgstr "Informació del 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 "Adreça de correu"
 
-#: ../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 "Codi postal"
 
-#: ../inc/user.inc:207 ../inc/user.inc:316
+#: ../inc/user.inc:214 ../inc/user.inc:394
 msgid "%1 member since"
 msgstr "%1 membre des de"
 
-#: ../inc/user.inc:209
+#: ../inc/user.inc:219 ../inc/user.inc:223
 msgid "Change"
 msgstr "Canviar"
 
-#: ../inc/user.inc:209
+#: ../inc/user.inc:224
 msgid "email address"
 msgstr "adreça de correu electrònic"
 
-#: ../inc/user.inc:210
+#: ../inc/user.inc:225
 msgid "password"
 msgstr "contrasenya"
 
-#: ../inc/user.inc:211
+#: ../inc/user.inc:226
 msgid "other account info"
 msgstr "altre informació del compte"
 
-#: ../inc/user.inc:213 ../inc/user.inc:315
+#: ../inc/user.inc:229 ../inc/user.inc:393
 msgid "User ID"
 msgstr "ID d'usuari"
 
-#: ../inc/user.inc:213
+#: ../inc/user.inc:229
 msgid "Used in community functions"
 msgstr "Utilitzat en funcions comunitàries"
 
-# 91%
-#: ../inc/user.inc:216 ../user/weak_auth.php:25
+#: ../inc/user.inc:232 ../user/weak_auth.php:25
 msgid "Account keys"
 msgstr "Claus del compte"
 
-#: ../inc/user.inc:221
+#: ../inc/user.inc:237
 msgid "Preferences"
 msgstr "Preferències"
 
-#: ../inc/user.inc:224
+#: ../inc/user.inc:240
 msgid "When and how BOINC uses your computer"
 msgstr "Quan i com BOINC utilitza el seu ordinador"
 
-#: ../inc/user.inc:225
+#: ../inc/user.inc:241
 msgid "Computing preferences"
 msgstr "Preferències de computació"
 
-#: ../inc/user.inc:228
+#: ../inc/user.inc:244
 msgid "Message boards and private messages"
 msgstr "Panell de missatges i missatges privats"
 
-#: ../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ències de la comunitat"
 
-#: ../inc/user.inc:232
+#: ../inc/user.inc:248
 msgid "Preferences for this project"
 msgstr "Preferències per a aquest projecte"
 
-#: ../inc/user.inc:233 ../user/prefs.php:29
+#: ../inc/user.inc:249 ../user/prefs.php:30
 msgid "%1 preferences"
 msgstr "preferències 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 "Veure el 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 "Comunitat"
 
-#: ../inc/user.inc:243 ../user/pm.php:107 ../user/pm.php:147
-msgid "Delete"
-msgstr "Esborrar"
-
-#: ../inc/user.inc:245
+#: ../inc/user.inc:314
 msgid "Create"
 msgstr "Crear"
 
-#: ../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 correus"
 
-#: ../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 "Notificacions"
 
-#: ../inc/user.inc:269
+#: ../inc/user.inc:346
 msgid "Quit team"
 msgstr "Deixar el grup"
 
-#: ../inc/user.inc:271 ../inc/user.inc:288
+#: ../inc/user.inc:348 ../inc/user.inc:365
 msgid "Administer"
 msgstr "Administrador"
 
-#: ../inc/user.inc:277 ../inc/user.inc:290
+#: ../inc/user.inc:354 ../inc/user.inc:367
 msgid "(foundership change request pending)"
 msgstr "(petició de canvi del fundador pendent)"
 
-#: ../inc/user.inc:279
+#: ../inc/user.inc:356
 msgid "Member of team"
 msgstr "Membre de l'equip"
 
-#: ../inc/user.inc:281
+#: ../inc/user.inc:358
 msgid "find a team"
 msgstr "trobar un grup"
 
-#: ../inc/user.inc:292
+#: ../inc/user.inc:369
 msgid "Founder but not member of"
 msgstr "Fundador però no membre de"
 
-#: ../inc/user.inc:298
+#: ../inc/user.inc:375
 msgid "Find friends"
 msgstr "Trobar amics"
 
-#: ../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 "Amics"
 
-#: ../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 "Ordinadors"
 
-#: ../inc/user.inc:338
+#: ../inc/user.inc:415
 msgid "Donor"
 msgstr "Donant"
 
-#: ../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 "Aquesta persona és un amic"
 
-#: ../inc/user.inc:382 ../user/friend.php:238
+#: ../inc/user.inc:462 ../user/friend.php:240
 msgid "Cancel friendship"
 msgstr "Finalitzar amistat"
 
-#: ../inc/user.inc:385 ../user/friend.php:37
+#: ../inc/user.inc:465 ../user/friend.php:39
 msgid "Request pending"
 msgstr "Petició pendent"
 
-#: ../inc/user.inc:387
+#: ../inc/user.inc:467
 msgid "Add as friend"
 msgstr "Afegir com amic"
 
-#: ../inc/user.inc:446
+#: ../inc/user.inc:526
 msgid "user name cannot have leading or trailing white space"
 msgstr "el nom d'usuari no pot tenir espais en blanc al principi o al final"
 
-#: ../inc/user.inc:450
+#: ../inc/user.inc:530
 msgid "user name must be nonempty"
 msgstr "no es pot deixar en blanc el nom d'usuari"
 
-#: ../inc/user.inc:454
+#: ../inc/user.inc:534
 msgid "user name may not contain HTML tags"
 msgstr "el nom d'usuari no pot contenir etiquetes HTML"
 
-#: ../inc/util.inc:131
+#: ../inc/util.inc:161
 msgid "log out"
 msgstr "finalitzar la sessió"
 
-#: ../inc/util.inc:133
+#: ../inc/util.inc:163
 msgid "log in"
 msgstr "Registrar-se"
 
-#: ../inc/util.inc:204 ../user/login_form.php:30 ../user/login_form.php:66
-msgid "Log in"
-msgstr "Registrar-se"
-
-#: ../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 "Crear un compte"
 
-#: ../inc/util.inc:206
+#: ../inc/util.inc:240
 msgid "Server status page"
 msgstr "Pàgina de l'estat del servidor"
 
-#: ../inc/util.inc:248
+#: ../inc/util.inc:277
 msgid ""
 "A database error occurred while handling your request; please try again "
 "later."
-msgstr ""
-"S'ha produit un error a la base de dades processant la seva sol.licitud; si "
-"us plau, torni provar-ho més tard."
+msgstr "S'ha produit un error a la base de dades processant la seva sol.licitud; si us plau, torni provar-ho més tard."
 
-#: ../inc/util.inc:257
+#: ../inc/util.inc:286
 msgid "Unable to handle request"
 msgstr "No es pot gestionar la sol licitud"
 
-#: ../inc/util.inc:277
+#: ../inc/util.inc:306
 msgid "hours"
 msgstr "hores"
 
-#: ../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
-msgid "Link has timed out. Please click Back, refresh the page, and try again."
-msgstr ""
-"S'ha esgotat el temps per activar l'acces. Si us plau, feu clic a Enrere, "
-"carregui de nou la pàgina i torni a intentar-ho."
-
-#: ../inc/util.inc:513
-msgid "View the profile of %1"
-msgstr "Veure el perfil de %1"
+#: ../inc/util.inc:473
+msgid ""
+"Link has timed out. Please click Back, refresh the page, and try again."
+msgstr "S'ha esgotat el temps per activar l'acces. Si us plau, feu clic a Enrere, carregui de nou la pàgina i torni a intentar-ho."
 
-#: ../inc/util.inc:569
+#: ../inc/util.inc:552
 msgid "Use BBCode tags to format your text"
 msgstr "Utilitzar les marques BBCode per formatar el text"
 
-#: ../inc/util.inc:796
+#: ../inc/util.inc:779
 msgid "Project down for maintenance"
 msgstr "Projecte aturat per manteniment"
 
-#: ../inc/util.inc:799
+#: ../inc/util.inc:782
 msgid "%1 is temporarily shut down for maintenance.  Please try again later."
-msgstr ""
-"%1 està temporalment aturat per manteniment.  Si us plau, provi-ho més tard."
+msgstr "%1 està temporalment aturat per manteniment.  Si us plau, provi-ho més tard."
 
-#: ../inc/util.inc:817
+#: ../inc/util.inc:800
 msgid "Unable to connect to database - please try again later"
 msgstr "No es pot connectar a la base de dades - si us plau, provi-ho més tard"
 
-#: ../inc/util.inc:821
+#: ../inc/util.inc:804
 msgid "Unable to select database - please try again later"
 msgstr "No es pot seleccionar la base de dades - si us plau, provi-ho més tard"
 
-#: ../inc/util_ops.inc:109 ../user/get_passwd.php:72
+#: ../inc/util.inc:976
+msgid "characters remaining"
+msgstr "caràcters restants"
+
+#: ../inc/util_ops.inc:115 ../user/get_passwd.php:72
 msgid "Stay logged in on this computer"
 msgstr "Mantenir-me en aquest ordinador"
 
@@ -2332,22 +2449,6 @@ msgstr "Mantenir-me en aquest ordinador"
 msgid "Finish account setup"
 msgstr "Finalitzar la configuració del 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 "Us identifica a la pàgina web. Utilitzeu el vostre nom real o un àlies."
-
-#: ../user/account_finish.php:45 ../user/create_account_form.php:98
-msgid "Select the country you want to represent, if any."
-msgstr "Seleccioneu el país que voleu representar, si ho desitgeu."
-
-#: ../user/account_finish.php:51 ../user/create_account_form.php:104
-msgid "Postal or ZIP Code"
-msgstr "Codi postal o ZIP"
-
-#: ../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 "Ha de proporcionar un nom per al seu compte"
@@ -2356,38 +2457,38 @@ msgstr "Ha de proporcionar un nom per al seu compte"
 msgid "HTML tags not allowed in name"
 msgstr "No estan permeses les etiquetes HTML en el 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 "Edita les preferències de %1"
+
+#: ../user/add_venue.php:82
 msgid "Add %1 preferences for %2"
 msgstr "Afegir %1 les preferències per a %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 "Aplicacions"
 
-#: ../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 actualment té les següents aplicacions. Quan participeu a %1, feina per "
-"una o més d'aquestes aplicacions és assignada al vostre ordinador. La versió "
-"actual de l’aplicació és descarregada al vostre ordinador. Això succeeix de "
-"manera automàtica; no necessita fer res."
+msgstr "%1 actualment té les següents aplicacions. Quan participes a %1, feina per una o més d'aquestes aplicacions és assignada al teu ordinador. La versió actual de l’aplicació és descarrega al teu ordinador. Això succeeix de manera automàtica; no necessites fer res."
 
-#: ../user/apps.php:50
+#: ../user/apps.php:54
 msgid "Platform"
 msgstr "Plataforma"
 
-#: ../user/apps.php:51
+#: ../user/apps.php:55
 msgid "Version"
 msgstr "Versió"
 
-#: ../user/apps.php:52
-msgid "Installation time"
-msgstr "Temps d'instal·lació"
+#: ../user/apps.php:57
+msgid "Average computing"
+msgstr "Computació mitjana"
 
 #: ../user/bbcode.php:23
 msgid "BBCode tags"
@@ -2399,12 +2500,7 @@ msgid ""
 "It's similar to HTML, but simpler. The tags start with a [ (where you would\n"
 "have used %1 in HTML) and end with ] (where you would have used %2 in\n"
 "HTML)."
-msgstr ""
-"Les etiquetes BBCode li permeten donar format al text en el seu perfil i en "
-"els missatges.\n"
-"És similar a l'HTML, però més simple. Les etiquetes comencen amb un [ (on\n"
-"utilitzaveu %1 en HTML) i acaba amb ] (on uutilitzaveu %2 en\n"
-"HTML)."
+msgstr "Les etiquetes BBCode li permeten donar format al text en el seu perfil i en els missatges.\nÉs similar a l'HTML, però més simple. Les etiquetes comencen amb un [ (on\nutilitzaveu %1 en HTML) i acaba amb ] (on uutilitzaveu %2 en\nHTML)."
 
 #: ../user/bbcode.php:31
 msgid "Examples"
@@ -2423,154 +2519,78 @@ msgid "Underline"
 msgstr "Subratllar"
 
 #: ../user/bbcode.php:35
+msgid "Strikethrough"
+msgstr "Ratllat"
+
+#: ../user/bbcode.php:36
 msgid "Superscript"
 msgstr "Super-índex"
 
-#: ../user/bbcode.php:36
+#: ../user/bbcode.php:37
 msgid "Big text"
 msgstr "Text gran"
 
-#: ../user/bbcode.php:37
+#: ../user/bbcode.php:38
 msgid "Red text"
 msgstr "Text en vermell"
 
-#: ../user/bbcode.php:38
+#: ../user/bbcode.php:39
 msgid "link to website"
 msgstr "enllaç al lloc web"
 
-#: ../user/bbcode.php:39
+#: ../user/bbcode.php:40
 msgid "Quoted text"
 msgstr "Text remarcat"
 
-#: ../user/bbcode.php:39
+#: ../user/bbcode.php:40
 msgid "use for quoted blocks of text"
 msgstr "utilitzar per remarcar blocs de text"
 
-#: ../user/bbcode.php:40
+#: ../user/bbcode.php:41
 msgid "use to display an image"
 msgstr "utilitzar per a mostrar una imatge"
 
-#: ../user/bbcode.php:41
+#: ../user/bbcode.php:42
 msgid "Code snippet here"
 msgstr "Fragment de codi aquí"
 
-#: ../user/bbcode.php:41
+#: ../user/bbcode.php:42
 msgid "use to display some code"
 msgstr "utilitzar per mostrar un codi"
 
-#: ../user/bbcode.php:42
+#: ../user/bbcode.php:43
 msgid "Pre-formatted text"
 msgstr "Text amb format"
 
-#: ../user/bbcode.php:42
+#: ../user/bbcode.php:43
 msgid "use to display pre-formatted (usually monospaced) text"
 msgstr "utilitzar per mostrar text pre-formatat (en general sol espai)"
 
-#: ../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 "utilitzar per enllaçar al Trac de revisions al lloc web de BOINC"
 
-#: ../user/bbcode.php:47
+#: ../user/bbcode.php:48
 msgid "use to link to Trac Wiki on BOINC website"
 msgstr "utilitzar per enllaçar a Trac Wiki en la pàgina web de BOINC"
 
-#: ../user/bbcode.php:49
-msgid "use to link to SVN changeset on BOINC website"
-msgstr "utilitzar per enllaçar a SVN de canvis en el lloc web de 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 no tanca una etiqueta o no s'especifica un paràmetre correctament,\n"
-"es mostrarà l'etiqueta en lloc del text amb format."
-
-#: ../user/bs_sample_index.php:44
-msgid "Participants"
-msgstr "Participants"
-
-#: ../user/bs_sample_index.php:46
-msgid "Do work"
-msgstr "Fer feina"
-
-#: ../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 "El seu compte"
-
-#: ../user/bs_sample_index.php:47 ../user/bs_sample_index.php:50
-msgid "view stats, modify preferences"
-msgstr "veure estats, modificar preferències"
-
-#: ../user/bs_sample_index.php:48 ../user/bs_sample_index.php:53
-#: ../user/team.php:25
-msgid "Teams"
-msgstr "Equips"
-
-#: ../user/bs_sample_index.php:48 ../user/bs_sample_index.php:53
-msgid "create or join a team"
-msgstr "crear o unir-se a equip"
-
-#: ../user/bs_sample_index.php:51 ../user/sample_index.php:191
-msgid "User of the day"
-msgstr "Usuari del dia"
-
-#: ../user/bs_sample_index.php:52 ../user/server_status.php:239
-msgid "Server status"
-msgstr "Estat del servidor"
-
-#: ../user/bs_sample_index.php:60 ../user/profile_menu.php:32
-#: ../user/sample_index.php:127
-msgid "Profiles"
-msgstr "Perfils"
-
-#: ../user/bs_sample_index.php:61
-msgid "User search"
-msgstr "Cerca un usuari"
-
-#: ../user/bs_sample_index.php:64
-msgid "Statistics"
-msgstr "Estadística"
-
-#: ../user/bs_sample_index.php:65 ../user/stats.php:30
-#: ../user/top_users.php:116
-msgid "Top participants"
-msgstr "Participants principals"
-
-#: ../user/bs_sample_index.php:66 ../user/stats.php:31
-msgid "Top computers"
-msgstr "Ordinadors principals"
-
-#: ../user/bs_sample_index.php:67 ../user/stats.php:32 ../user/team.php:46
-msgid "Top teams"
-msgstr "Grups principals"
-
-#: ../user/bs_sample_index.php:68 ../user/gpu_list.php:182
-#: ../user/stats.php:33
-msgid "Top GPU models"
-msgstr "Els millors models de GPU"
-
-#: ../user/bs_sample_index.php:70
-msgid "Languages"
-msgstr "Idiomes"
-
-#: ../user/bs_sample_index.php:149 ../user/info.php:24
-#: ../user/sample_index.php:79
-msgid "Read our rules and policies"
-msgstr "Llegiu les regles i normes nostres"
+msgstr "Si no tanca una etiqueta o no s'especifica un paràmetre correctament,\nes mostrarà l'etiqueta en lloc del text amb format."
 
 #: ../user/create_account_action.php:26
 msgid "Can't create account"
@@ -2580,218 +2600,156 @@ msgstr "No es pot crear el compte"
 msgid "Click your browser's <b>Back</b> button to try again."
 msgstr "Feu clic a <b>Enrere</b> del navegador per intentar-ho de nou."
 
-#: ../user/create_account_action.php:47
+#: ../user/create_account_action.php:46
 msgid "Your reCAPTCHA response was not correct. Please try again."
 msgstr "La seva resposta reCAPTCHA no es correcte. Si us plau, provi-ho de nou."
 
-#: ../user/create_account_action.php:70
+#: ../user/create_account_action.php:69
 msgid "You must supply an invitation code to create an account."
 msgstr "Heu d'introduir un codi d'alta per la creació d'un compte."
 
-#: ../user/create_account_action.php:73
+#: ../user/create_account_action.php:72
 msgid "The invitation code you gave is not valid."
 msgstr "El codi d'alta que heu introduït no és vàlid."
 
-#: ../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 ""
-"Adreça de correu incorrecta: ha d'entrar una adreça de correu vàlida del "
-"tipus nom at domini"
+"Invalid email address: you must enter a valid address of the form "
+"name at domain"
+msgstr "Adreça de correu incorrecta: ha d'entrar una adreça de correu vàlida del tipus nom at domini"
 
-#: ../user/create_account_action.php:88
+#: ../user/create_account_action.php:87
 msgid "There's already an account with that email address."
 msgstr "Ja existeix un compte amb aquesta adreça de correu electrònic."
 
-#: ../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 contrasenyes noves son diferents"
 
-#: ../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 contrasenyes només poden contenir caràcters 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 ""
-"La nova contrasenya és massa curta: la longitud mínima de la contrasenya és "
-"de %1 caràcters."
+msgstr "La nova contrasenya és massa curta: la longitud mínima de la contrasenya és de %1 caràcters."
 
-#: ../user/create_account_action.php:127
+#: ../user/create_account_action.php:126
 msgid "Couldn't create account"
 msgstr "No es pot crear el 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 ""
-"NOTA: Si utilitzeu l'Administrador de BOINC, no utilitzeu aquest formulari. "
-"Executa BOINC, selecciona Afegir un projecte i escriviu una adreça de correu "
-"electrònic i contrasenya."
+msgstr "NOTA: Si utilitzeu l'Administrador de BOINC, no utilitzeu aquest formulari. Executa BOINC, selecciona Afegir un projecte i escriviu una adreça de correu electrònic i contrasenya."
 
-#: ../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 ""
-"Aquest compte formarà part del grup %1 i tindrà les preferències del creador "
-"del projecte."
-
-#: ../user/create_account_form.php:73
-msgid "Invitation Code"
-msgstr "Codi d'alta"
-
-#: ../user/create_account_form.php:73
-msgid "A valid invitation code is required to create an account."
-msgstr "Es requereix un codi d'invitació vàlid per a crear un compte."
-
-#: ../user/create_account_form.php:83
-msgid "Email Address"
-msgstr "Adreça de correu electrònic"
-
-#: ../user/create_account_form.php:83
-msgid "Must be a valid address of the form 'name at domain'."
-msgstr "Ha de ser una adreça de correu vàlida del tipus 'nom at domini'."
-
-#: ../user/create_account_form.php:92 ../user/edit_email_form.php:47
-msgid "Password"
-msgstr "Contrasenya"
-
-#: ../user/create_account_form.php:93
-msgid "Must be at least %1 characters"
-msgstr "Ha de tenir al menys %1 caràcters"
-
-#: ../user/create_account_form.php:96
-msgid "Confirm password"
-msgstr "Introduïu de nou la contrasenya"
-
-#: ../user/create_account_form.php:113
-msgid "Please enter the words shown in the image"
-msgstr "Si us plau, introduïu les paraules que es mostren a la imatge."
-
-#: ../user/create_account_form.php:119
-msgid "Create account"
-msgstr "Crear un compte"
+msgstr "Aquest compte formarà part del grup %1 i tindrà les preferències del creador del projecte."
 
-#: ../user/create_profile.php:50
+#: ../user/create_profile.php:52
 msgid "Picture"
 msgstr "Imatge"
 
-#: ../user/create_profile.php:64
+#: ../user/create_profile.php:66
 msgid "%1 Your profile picture is shown to the left."
 msgstr "%1 La imatge del seu perfil es mostrarà a l'esquerra."
 
-#: ../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 ""
-"Per canviar-ho, premi el botó \"Navegar\" i seleccioni un arxiu JPEG o PNG (%1 "
-"o menys)."
+"To replace it, click the \"Browse\" button and select a JPEG or PNG file (%1"
+" or less)."
+msgstr "Per canviar-ho, premi el botó \"Navegar\" i seleccioni un arxiu JPEG o PNG (%1 o menys)."
 
-#: ../user/create_profile.php:69
+#: ../user/create_profile.php:71
 msgid "To remove it from your profile, check this box:"
 msgstr "Per eliminar-lo del seu perfil, seleccioni aquesta casella:"
 
-#: ../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 ""
-"Si desitja incloure una imatge en el seu perfil, premi el botó \"Navegar\" i "
-"seleccioni un fitxer JPEG o PNG. Si us plau seleccioni imatges de %1 o "
-"menys."
+msgstr "Si desitja incloure una imatge en el seu perfil, premi el botó \"Navegar\" i seleccioni un fitxer JPEG o PNG. Si us plau seleccioni imatges de %1 o menys."
 
-#: ../user/create_profile.php:89
+#: ../user/create_profile.php:91
 msgid "Language"
 msgstr "Idioma"
 
-#: ../user/create_profile.php:92
+#: ../user/create_profile.php:94
 msgid "Select the language in which your profile is written:"
 msgstr "Seleccioni l'idioma en el que està escrit el seu perfil:"
 
-#: ../user/create_profile.php:104
+#: ../user/create_profile.php:106
 msgid "Submit profile"
 msgstr "Lliurar el perfil"
 
-#: ../user/create_profile.php:110
-msgid "Please enter the words shown in the image."
-msgstr "Si us plau, introduïu les paraules que es mostren a la imatge."
-
-#: ../user/create_profile.php:115
+#: ../user/create_profile.php:112
 msgid "Create/edit profile"
 msgstr "Crear/editar el perfil"
 
-#: ../user/create_profile.php:137
+#: ../user/create_profile.php:134
 msgid "The format of your uploaded image is not supported."
 msgstr "El format d'imatge que ha lliurat no està suportat."
 
-#: ../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 ""
-"El seu %1perfil%2 li permet compartir les seves opinions i coneixements amb "
-"%3 comunitat."
+msgstr "El seu %1perfil%2 li permet compartir les seves opinions i coneixements amb %3 comunitat."
 
-#: ../user/create_profile.php:213
+#: ../user/create_profile.php:209
 msgid "Your ReCaptcha response was not correct.  Please try again."
-msgstr ""
-"La seva resposta ReCaptcha no es correcte.  Si us plau, provi-ho de nou."
+msgstr "La seva resposta ReCaptcha no es correcte.  Si us plau, provi-ho de nou."
 
-#: ../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 ""
-"La seva primera resposta ha estat marcada com spam per el sistema anti-spam "
-"Akimest.  Si us plau modifiqui el text i provi-ho de nou."
+msgstr "La seva primera resposta ha estat marcada com spam per el sistema anti-spam Akimest.  Si us plau modifiqui el text i provi-ho de nou."
 
-#: ../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 ""
-"La seva segona resposta ha estat marcada com spam per el sistema anti-spam "
-"Akismet.  Si us plau modifiqui el seu text i provi-ho de nou."
+msgstr "La seva segona resposta ha estat marcada com spam per el sistema anti-spam Akismet.  Si us plau modifiqui el seu text i provi-ho de nou."
 
-#: ../user/create_profile.php:246
+#: ../user/create_profile.php:242
 msgid "Your profile submission was empty."
 msgstr "El perfil que ha lliurat està buit."
 
-#: ../user/create_profile.php:285
+#: ../user/create_profile.php:281
 msgid "Could not update the profile: database error"
 msgstr "No es pot actualitzar el perfil: error de la base de dades"
 
-#: ../user/create_profile.php:297
+#: ../user/create_profile.php:293
 msgid "Could not create the profile: database error"
 msgstr "No es pot crear el perfil: error de la base de dades"
 
-#: ../user/create_profile.php:302
+#: ../user/create_profile.php:298
 msgid "Profile saved"
 msgstr "S'ha guardat el perfil"
 
-#: ../user/create_profile.php:304
+#: ../user/create_profile.php:300
 msgid ""
 "Congratulations! Your profile was successfully entered into our database."
 msgstr "Felicitats! El seu perfil ha estat incorporat a la base de dades."
 
-#: ../user/create_profile.php:306
+#: ../user/create_profile.php:302
 msgid "%1View your profile%2"
 msgstr "%1Veure el seu perfil%2"
 
-#: ../user/create_profile.php:315
+#: ../user/create_profile.php:311
 msgid "Create a profile"
 msgstr "Crear un 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."
-msgstr ""
-"Per prevenir l'spam, necessita un crèdit promitg de %1 o mes gran per crear "
-"o editar un perfil.  Disculpin aquestes molèsties."
+"To prevent spam, an average credit of %1 or greater is required to create or"
+" edit a profile.  We apologize for this inconvenience."
+msgstr "Per prevenir l'spam, necessita un crèdit promitg de %1 o mes gran per crear o editar un perfil.  Disculpin aquestes molèsties."
 
 #: ../user/delete_account.php:57
 msgid "Couldn't delete account"
@@ -2816,28 +2774,21 @@ msgid ""
 "including your profile and message-board posts.\n"
 "No jobs will be issued to any computers attached\n"
 "to this account."
-msgstr ""
-"Eliminant el seu compte s'eliminarà tota la seva\n"
-"informació personal dels nostres servidors,\n"
-"incloent el seu perfil i els seus missages en el fòrum.\n"
-"No es lliuraran treballs als equips connectats\n"
-"a aquest compte."
+msgstr "Eliminant el seu compte s'eliminarà tota la seva\ninformació personal dels nostres servidors,\nincloent el seu perfil i els seus missages en el fòrum.\nNo es lliuraran treballs als equips connectats\na aquest compte."
 
 #: ../user/delete_account.php:73
 msgid ""
 "This cannot be undone.\n"
 "Once your account has been deleted, you cannot get it back."
-msgstr ""
-"Això no es pot desfer.\n"
-"Un cop el compte ha estat eliminat, no podreu retrocedir."
+msgstr "Això no es pot desfer.\nUn cop el compte ha estat eliminat, no podreu retrocedir."
 
 #: ../user/delete_account.php:76
 msgid "Are you sure you want to delete your account?"
 msgstr "Estàs segur que vols eliminar el teu 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 "Si"
@@ -2846,8 +2797,8 @@ msgstr "Si"
 msgid "Delete this account"
 msgstr "Eliminar aquest 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 "No"
@@ -2856,49 +2807,44 @@ msgstr "No"
 msgid "Do not delete this account"
 msgstr "No eliminar aquest compte"
 
-#: ../user/delete_profile.php:30
+#: ../user/delete_profile.php:32
 msgid "couldn't delete profile - please try again later"
 msgstr "no es pot eliminar el perfil - si us plau provi-ho més tard"
 
-#: ../user/delete_profile.php:33
+#: ../user/delete_profile.php:35
 msgid "Delete Confirmation"
 msgstr "Confirma la Eliminació"
 
-#: ../user/delete_profile.php:35
+#: ../user/delete_profile.php:37
 msgid "Your profile has been deleted."
 msgstr "El teu perfil ha estat eliminat."
 
-#: ../user/delete_profile.php:40
+#: ../user/delete_profile.php:42
 msgid "Profile delete confirmation"
 msgstr "Confirmar l'eliminació del perfil"
 
-#: ../user/delete_profile.php:43
+#: ../user/delete_profile.php:45
 msgid "Are you sure?"
 msgstr "Està segur?"
 
-#: ../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 ""
-"En perfil eliminat ho es per sempres i no es pot recuperar --\n"
-"vostè haurà de començar de zero\n"
-"si vol un altre perfil en el futur."
+msgstr "En perfil eliminat ho es per sempres i no es pot recuperar --\nvostè haurà de començar de zero\nsi vol un altre perfil en el futur."
 
-#: ../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 esteu segur, premeu 'Si'\n"
-"per eliminar el vostre perfil de la nostra base de dades."
+msgstr "Si esteu segur, premeu 'Si'\nper eliminar el vostre perfil de la nostra base de dades."
 
-#: ../user/delete_profile.php:52
+#: ../user/delete_profile.php:54
 msgid "Delete my profile"
 msgstr "Eliminar el meu perfil"
 
-#: ../user/delete_profile.php:53
+#: ../user/delete_profile.php:55
 msgid "Do not delete my profile"
 msgstr "No eliminar el meu perfil"
 
@@ -2916,10 +2862,9 @@ msgstr "La seva donació ha estat competada."
 
 #: ../user/donated.php:30
 msgid ""
-"Your donation will be added to the progress bar after confirmation by PayPal."
-msgstr ""
-"La seva donació s'afegirà a la barra de progrés després de la confirmació a "
-"través de PayPal."
+"Your donation will be added to the progress bar after confirmation by "
+"PayPal."
+msgstr "La seva donació s'afegirà a la barra de progrés després de la confirmació a través de PayPal."
 
 #: ../user/donated.php:32
 msgid "You have canceled your donation."
@@ -2937,9 +2882,7 @@ msgstr "%1 donacions"
 msgid ""
 "This project is accepting donations via\n"
 "%1."
-msgstr ""
-"Aquest projecte està acceptant donacions a través de\n"
-"%1."
+msgstr "Aquest projecte està acceptant donacions a través de\n%1."
 
 #: ../user/donations.php:42
 msgid ""
@@ -2954,20 +2897,7 @@ msgid ""
 "        to see the donation amount equivalent in different currencies\n"
 "        (please note that the rates are only estimates\n"
 "         and the actual amount may differ)."
-msgstr ""
-"Per fer una donació, escriviu la quantitat que desitja donar utilitzant el "
-"camp de sota.\n"
-"        PayPal accepta múltiples monedes\n"
-"        (Dòlars canadencs, Euros, Lliures Esterlines, Dòlars dels EUA,\n"
-"         Iens, Dòlars Australians, Dòlars Neozelandesos,\n"
-"        Francs suïssos, Dòlars de Hong Kong, Dòlars de Singapur, Corones "
-"Sueques,\n"
-"        Corones Daneses, Zloty Polonès, Corones Norugues,\n"
-"        Florí Hongarès, Corona Txeca).\n"
-"        Podeu utilitzar el convertidor de moneda inclos\n"
-"        per veure la quantitat equivalent de donació en diferents monedes\n"
-"        (tingueu en compte que les taxes són només estimacions\n"
-"         i la quantitat real pot ser diferent)."
+msgstr "Per fer una donació, escriviu la quantitat que desitja donar utilitzant el camp de sota.\n        PayPal accepta múltiples monedes\n        (Dòlars canadencs, Euros, Lliures Esterlines, Dòlars dels EUA,\n         Iens, Dòlars Australians, Dòlars Neozelandesos,\n        Francs suïssos, Dòlars de Hong Kong, Dòlars de Singapur, Corones Sueques,\n        Corones Daneses, Zloty Polonès, Corones Norugues,\n        Florí Hongarès, Corona Txeca).\n        Podeu utilitzar el convertidor d [...]
 
 #: ../user/donations.php:316
 msgid "Amount you would like to donate"
@@ -2985,16 +2915,11 @@ msgstr "Donació anònima"
 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 ""
-"Seleccioneu aquesta opció si no voleu que el vostre nom i número de compte "
-"apareixi a les\n"
-"llistes de donacions.<br>Si no està activada, apareixerà registrat com "
-"l'usuari de ID %1"
+msgstr "Seleccioneu aquesta opció si no voleu que el vostre nom i número de compte apareixi a les\nllistes de donacions.<br>Si no està activada, apareixerà registrat com l'usuari de ID %1"
 
 #: ../user/donations.php:324
 msgid "To assign the donation with your user ID, please log in."
-msgstr ""
-"Per assignar la donació amb el seu ID d'usuari, si us plau registreu-vos."
+msgstr "Per assignar la donació amb el seu ID d'usuari, si us plau registreu-vos."
 
 #: ../user/donations.php:328
 msgid "Proceed"
@@ -3015,21 +2940,14 @@ msgstr "Pot descarregar aplicatius de diverses categories."
 #: ../user/download_network.php:31
 msgid ""
 "These applications are not endorsed by %1 and you use them at your own risk."
-msgstr ""
-"Aquestes aplicacions no estan aprovades per %1 i les ha d'utilitzar sota la "
-"seva responsabilitat."
+msgstr "Aquestes aplicacions no estan aprovades per %1 i les ha d'utilitzar sota la seva responsabilitat."
 
 #: ../user/download_network.php:33
 msgid ""
 "We do not provide instructions for installing these applications.\n"
-"However, the author may have provided some help on installing or "
-"uninstalling the application. \n"
+"However, the author may have provided some help on installing or uninstalling the application. \n"
 "If this is not enough you should contact the author."
-msgstr ""
-"No proporcionem instruccions per la instal·lació d'aquestes aplicacions.\n"
-"De totes maneres, es probable que l'autor hagi proporcionat algun tipus "
-"d'ajuda per la instal·lació o des-instal·lació de l'aplicació. \n"
-"Si no estès disponible contacti l'autor."
+msgstr "No proporcionem instruccions per la instal·lació d'aquestes aplicacions.\nDe totes maneres, es probable que l'autor hagi proporcionat algun tipus d'ajuda per la instal·lació o des-instal·lació de l'aplicació. \nSi no estès disponible contacti l'autor."
 
 #: ../user/download_network.php:36
 msgid "Instructions for installing and running BOINC are %1here%2."
@@ -3071,9 +2989,7 @@ msgstr "Si us plau %1valideu aquesta adreça de correu electrònic%2."
 msgid ""
 "We can't update your email address due to a database problem.  Please try "
 "again later."
-msgstr ""
-"No podem actualitzar la vostra adreça de correu electrònic a causa d'un "
-"problema de base de dades.  Si us plau provi-ho més tard."
+msgstr "No podem actualitzar la vostra adreça de correu electrònic a causa d'un problema de base de dades.  Si us plau provi-ho més tard."
 
 #: ../user/edit_email_form.php:27 ../user/edit_email_form.php:51
 msgid "Change email address"
@@ -3103,260 +3019,207 @@ msgstr "Confirmi que vol restaurar"
 msgid ""
 "This action will erase any changes you have made in your community "
 "preferences. To cancel, click your browser's Back button."
-msgstr ""
-"Aquesta acció esborrarà tots els canvis realitzats en les preferències de la "
-"seva comunitat. Per cancel lar, feu clic al botó Enrere del navegador."
+msgstr "Aquesta acció esborrarà tots els canvis realitzats en les preferències de la seva comunitat. Per cancel lar, feu clic al botó Enrere del navegador."
 
 #: ../user/edit_forum_preferences_action.php:38
 msgid "Reset preferences"
 msgstr "Restablir les preferències"
 
-#: ../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 ""
-"Error: No es el tipus correcte d'arxiu, només PNG i JPEG són compatibles."
+msgstr "Error: No es el tipus correcte d'arxiu, només PNG i JPEG són compatibles."
 
-#: ../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 ""
-"La seva signatura era massa llarga, si us plau redueixi-la a un màxim de 250 "
-"caràcters."
+msgstr "La seva signatura era massa llarga, si us plau redueixi-la a un màxim de 250 caràcters."
 
-#: ../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 "No existeix l'usuari: %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 ""
-"Com prefereixes que t'avisem dels nous missatges privats, sol·licituds "
-"d'amistat, missatges en les discussions subscrites, i altres esdeveniments?"
+msgstr "Com prefereixes que t'avisem dels nous missatges privats, sol·licituds d'amistat, missatges en les discussions subscrites, i altres esdeveniments?"
 
-#: ../user/edit_forum_preferences_form.php:57
+#: ../user/edit_forum_preferences_form.php:46
 msgid "On my Account page (no email)"
 msgstr "A la pàgina del meu compte (no email)"
 
-#: ../user/edit_forum_preferences_form.php:58
+#: ../user/edit_forum_preferences_form.php:47
 msgid "Immediately, by email"
 msgstr "Immediatament, per correu electrònic"
 
-#: ../user/edit_forum_preferences_form.php:59
+#: ../user/edit_forum_preferences_form.php:48
 msgid "In a single daily email"
 msgstr "En un únic correu electrònic diàri"
 
-#: ../user/edit_forum_preferences_form.php:75
+#: ../user/edit_forum_preferences_form.php:65
 msgid "Message-board identity"
 msgstr "Identitat del plafó de missatges"
 
-#: ../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 "Una imatge que el representi en els fòrums."
 
-#: ../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 o PNG. Mida: màxim de 4 KB, 100x100 píxels"
 
-#: ../user/edit_forum_preferences_form.php:80
+#: ../user/edit_forum_preferences_form.php:70
 msgid "Don't use an avatar"
 msgstr "No usar un 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 "Utilitzar un Avatar Reconegut Globalment proporcionat per %1"
 
-#: ../user/edit_forum_preferences_form.php:84
+#: ../user/edit_forum_preferences_form.php:74
 msgid "Use this uploaded avatar:"
 msgstr "Utilitzar aquest avatar enviat:"
 
-#: ../user/edit_forum_preferences_form.php:87
+#: ../user/edit_forum_preferences_form.php:77
 msgid "Avatar preview"
 msgstr "Vista prèvia del avatar"
 
-#: ../user/edit_forum_preferences_form.php:87
+#: ../user/edit_forum_preferences_form.php:77
 msgid "This is how your avatar will look"
 msgstr "Així és com es veurà el teu avatar"
 
-#: ../user/edit_forum_preferences_form.php:96
+#: ../user/edit_forum_preferences_form.php:86
 msgid "Signature for message board posts"
 msgstr "Signatura per els missatges en el plafons d'anuncis"
 
-#: ../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 ""
-"Fes una ullada a %1diversos serveis gratuïts%2\n"
-"<br> proporcionan 'imatges de la signatura' dinàmicament\n"
-"<br> mostrant la seva informació de crèdit més recent, notícies de "
-"projectes, etc."
+msgstr "Fes una ullada a %1diversos serveis gratuïts%2\n<br> proporcionan 'imatges de la signatura' dinàmicament\n<br> mostrant la seva informació de crèdit més recent, notícies de projectes, etc."
 
-#: ../user/edit_forum_preferences_form.php:104
-msgid "characters remaining"
-msgstr "caràcters restants"
-
-#: ../user/edit_forum_preferences_form.php:105
+#: ../user/edit_forum_preferences_form.php:93
 msgid "Attach signature by default"
 msgstr "Adjuntar signatura per defecte"
 
-#: ../user/edit_forum_preferences_form.php:108
+#: ../user/edit_forum_preferences_form.php:96
 msgid "Signature preview"
 msgstr "Vista prèvia de la signatura"
 
-#: ../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 "Aquesta és la forma en què la seva signatura es veurà en els fòrums"
 
-#: ../user/edit_forum_preferences_form.php:127
+#: ../user/edit_forum_preferences_form.php:115
 msgid "Message display"
 msgstr "Panell del missatge"
 
-#: ../user/edit_forum_preferences_form.php:129
+#: ../user/edit_forum_preferences_form.php:117
 msgid "What to display"
 msgstr "El que vol mostrar"
 
-#: ../user/edit_forum_preferences_form.php:130
+#: ../user/edit_forum_preferences_form.php:118
 msgid "Hide avatar images"
 msgstr "Amaga les imatges dels avatars"
 
-#: ../user/edit_forum_preferences_form.php:131
+#: ../user/edit_forum_preferences_form.php:119
 msgid "Hide signatures"
 msgstr "Amaga les signatures"
 
-#: ../user/edit_forum_preferences_form.php:132
+#: ../user/edit_forum_preferences_form.php:120
 msgid "Show images as links"
 msgstr "Mostra les imatges com enllaços"
 
-#: ../user/edit_forum_preferences_form.php:133
+#: ../user/edit_forum_preferences_form.php:121
 msgid "Open links in new window/tab"
 msgstr "Obrir els enllaços en una nova finestra/pestanya"
 
-#: ../user/edit_forum_preferences_form.php:134
+#: ../user/edit_forum_preferences_form.php:122
 msgid "Highlight special users"
 msgstr "Ressaltar usuaris especials"
 
-#: ../user/edit_forum_preferences_form.php:135
+#: ../user/edit_forum_preferences_form.php:123
 msgid "Display this many messages per page"
 msgstr "Veure aquesta quantitat de missatges per pàgina"
 
-#: ../user/edit_forum_preferences_form.php:139
+#: ../user/edit_forum_preferences_form.php:127
 msgid "How to sort"
 msgstr "Com ordenar"
 
-#: ../user/edit_forum_preferences_form.php:140
+#: ../user/edit_forum_preferences_form.php:128
 msgid "Threads:"
 msgstr "Fils:"
 
-#: ../user/edit_forum_preferences_form.php:140
+#: ../user/edit_forum_preferences_form.php:128
 msgid "Posts:"
 msgstr "Missatges:"
 
-#: ../user/edit_forum_preferences_form.php:141
+#: ../user/edit_forum_preferences_form.php:129
 msgid "Jump to first new post in thread automatically"
 msgstr "Anar al primer missatge nou en el fil de forma automàtica"
 
-#: ../user/edit_forum_preferences_form.php:142
+#: ../user/edit_forum_preferences_form.php:130
 msgid "Don't move sticky posts to top"
 msgstr "No moure els missatges fixats amunt"
 
-#: ../user/edit_forum_preferences_form.php:148
+#: ../user/edit_forum_preferences_form.php:137
 msgid "Message filtering"
 msgstr "Filtratge de missatges"
 
-#: ../user/edit_forum_preferences_form.php:164
+#: ../user/edit_forum_preferences_form.php:153
 msgid "Filtered users"
 msgstr "Usuaris filtrats"
 
-#: ../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 "No feu cas dels missatges i dels missatges privats d'aquests usuaris."
 
-#: ../user/edit_forum_preferences_form.php:167
+#: ../user/edit_forum_preferences_form.php:156
 msgid "User ID (For instance: 123456789)"
 msgstr "ID d'usuari (per 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 "Afegir l'usuari al filtre"
 
-#: ../user/edit_forum_preferences_form.php:173
+#: ../user/edit_forum_preferences_form.php:162
 msgid "Click here to update preferences"
 msgstr "Premeu aqui per actualitzar les preferències"
 
-#: ../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 "Reinicialitza"
 
-#: ../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 "O feu clic aquí per restablir les preferències als valors per defecte"
 
 #: ../user/edit_passwd_action.php:50
-msgid "Invalid account key"
-msgstr "Clau de compte incorrecte"
-
-#: ../user/edit_passwd_action.php:55
-msgid "No account with that email address was found"
-msgstr "No s'ha trobat cap compta amb aquesta direcció de correu electrònic"
-
-#: ../user/edit_passwd_action.php:59
-msgid "Invalid password"
-msgstr "Contrasenya incorrecte"
+msgid ""
+"We can't update your password due to a database problem. Please try again "
+"later."
+msgstr "No podem actualitzar la contrasenya a causa d'un problema de base de dades. Si us plau provi-ho més tard."
 
-#: ../user/edit_passwd_action.php:63 ../user/edit_passwd_form.php:25
-#: ../user/edit_passwd_form.php:55
+#: ../user/edit_passwd_action.php:53 ../user/edit_passwd_form.php:25
+#: ../user/edit_passwd_form.php:34
 msgid "Change password"
 msgstr "Canviï la contrasenya"
 
-#: ../user/edit_passwd_action.php:67
+#: ../user/edit_passwd_action.php:54
 msgid "Your password has been changed."
 msgstr "La seva contrasenya ha estat canviada."
 
-#: ../user/edit_passwd_action.php:69
-msgid ""
-"We can't update your password due to a database problem. Please try again "
-"later."
-msgstr ""
-"No podem actualitzar la contrasenya a causa d'un problema de base de dades. "
-"Si us plau provi-ho més tard."
-
-#: ../user/edit_passwd_form.php:39
-msgid "You can identify yourself using either"
-msgstr "Vostè pot identificar-se utilitzant"
-
-#: ../user/edit_passwd_form.php:41
-msgid "your email address and old password"
-msgstr "la seva adreça de correu electrònic i la contrasenya antiga"
-
-#: ../user/edit_passwd_form.php:42
-msgid "your account key"
-msgstr "clau del seu compte"
-
-#: ../user/edit_passwd_form.php:46
-msgid "Current password"
-msgstr "Contrasenya actual"
-
-#: ../user/edit_passwd_form.php:48
-msgid "<b>OR</b>: Account key"
-msgstr "<b>O</b>: Clau del compte"
-
-#: ../user/edit_passwd_form.php:49
-msgid "Get account key by email"
-msgstr "Obtenir la clau de compte per correu electrònic"
-
-#: ../user/edit_passwd_form.php:53
+#: ../user/edit_passwd_form.php:32
 msgid "New password"
 msgstr "Nova contrasenya"
 
-#: ../user/edit_passwd_form.php:54
+#: ../user/edit_passwd_form.php:33
 msgid "New password, again"
 msgstr "Nova contrasenya, una vegada més"
 
@@ -3401,18 +3264,13 @@ msgid ""
 "A tasks's <b>server state</b> indicates whether the task has been sent to a "
 "computer, and if so whether the computer has finished it. Possible values "
 "are:"
-msgstr ""
-"A les tasques <b>estat del servidor</b> indica si la tasca ha estat enviada "
-"a un ordinador, i si és així si l'equip l'ha acabat. Els valors possibles "
-"són:"
+msgstr "A les tasques <b>estat del servidor</b> indica si la tasca ha estat enviada a un ordinador, i si és així si l'equip l'ha acabat. Els valors possibles són:"
 
 #: ../user/explain_state.php:35
 msgid ""
 "The task is not ready to send (for example, because its input files are "
 "unavailable)"
-msgstr ""
-"La tasca no està llesta per a enviar (per exemple, per que els seus arxius "
-"d'entrada no estan disponibles)"
+msgstr "La tasca no està llesta per a enviar (per exemple, per que els seus arxius d'entrada no estan disponibles)"
 
 #: ../user/explain_state.php:38
 msgid "The task is ready to send, but hasn't been sent yet."
@@ -3430,9 +3288,7 @@ msgstr "La tasca ha estat enviada, esperant que es s'acabi."
 msgid ""
 "The task has been sent to a computer and either it has timed out or the "
 "computer has reported its completion."
-msgstr ""
-"La tasca ha estat enviada a un ordinador i o bé s'ha esgotat el temps o bé "
-"l'equip ha informat de la seva terminació."
+msgstr "La tasca ha estat enviada a un ordinador i o bé s'ha esgotat el temps o bé l'equip ha informat de la seva terminació."
 
 #: ../user/explain_state.php:49
 msgid "Outcomes"
@@ -3442,17 +3298,13 @@ msgstr "Resultats"
 msgid ""
 "A tasks's <b>outcome</b> is defined if its server state is <b>over</b>. "
 "Possible values are:"
-msgstr ""
-"El <b>resultat</b> de una tasca es defineix si l'estat de servidor és "
-"<b>acabat</b>. Els valors possibles són:"
+msgstr "El <b>resultat</b> de una tasca es defineix si l'estat de servidor és <b>acabat</b>. Els valors possibles són:"
 
 #: ../user/explain_state.php:57
 msgid ""
 "The task was sent to a computer, but the computer has not yet completed the "
 "work and reported the outcome."
-msgstr ""
-"La tasca va ser enviada a un ordinador, però l'equip encara no ha completat "
-"el treball i informat dels resultats."
+msgstr "La tasca va ser enviada a un ordinador, però l'equip encara no ha completat el treball i informat dels resultats."
 
 #: ../user/explain_state.php:60
 msgid "A computer completed and reported the task successfully."
@@ -3462,9 +3314,7 @@ msgstr "Un equip ha finalitzat i reportartat la tasca amb èxit."
 msgid ""
 "The server wasn't able to send the task to a computer (perhaps because its "
 "resource requirements were too large)"
-msgstr ""
-"El servidor no ha pogut enviar la tasca a un equip (potser perquè les seves "
-"necessitats de recursos són massa grans)"
+msgstr "El servidor no ha pogut enviar la tasca a un equip (potser perquè les seves necessitats de recursos són massa grans)"
 
 #: ../user/explain_state.php:65
 msgid "Client error"
@@ -3478,25 +3328,19 @@ msgstr "La tasca s'ha enviat a un ordinador i s'ha produït un error."
 msgid ""
 "The task was sent to a computer and no reply was received within the time "
 "limit."
-msgstr ""
-"La tasca va ser enviada a un ordinador i no s'ha rebut resposta dins del "
-"termini."
+msgstr "La tasca va ser enviada a un ordinador i no s'ha rebut resposta dins del termini."
 
 #: ../user/explain_state.php:72
 msgid ""
-"The task wasn't sent to a computer because enough other tasks were completed "
-"for this workunit."
-msgstr ""
-"La tasca no s'ha enviat a un equip, ja n'hi ha prou d'altres tasques "
-"acabades per aquest workunit."
+"The task wasn't sent to a computer because enough other tasks were completed"
+" for this workunit."
+msgstr "La tasca no s'ha enviat a un equip, ja n'hi ha prou d'altres tasques acabades per aquest workunit."
 
 #: ../user/explain_state.php:75
 msgid ""
 "The task was reported but could not be validated, typically because the "
 "output files were lost on the server."
-msgstr ""
-"Es va reportar el resultat de la tasca però no s'ha pogut validar, en "
-"general a causa de que els arxius de sortida en el servidor s'han perdut."
+msgstr "Es va reportar el resultat de la tasca però no s'ha pogut validar, en general a causa de que els arxius de sortida en el servidor s'han perdut."
 
 #: ../user/explain_state.php:80
 msgid "Client states"
@@ -3504,11 +3348,9 @@ msgstr "Estats del client"
 
 #: ../user/explain_state.php:81
 msgid ""
-"A result's <b>client state</b> indicates the stage of processing at which an "
-"error occurred."
-msgstr ""
-"Un resultat de <b>estat del client</b> indica el grau de procés en què va "
-"produir."
+"A result's <b>client state</b> indicates the stage of processing at which an"
+" error occurred."
+msgstr "Un resultat de <b>estat del client</b> indica el grau de procés en què va produir."
 
 #: ../user/explain_state.php:86
 msgid "The computer has not yet completed the task."
@@ -3538,9 +3380,7 @@ msgstr "Temps reportat i temps límit"
 msgid ""
 "A task's <b>Time reported or deadline</b> field depends on whether the task "
 "has been reported yet:"
-msgstr ""
-"El camp d'una tasca <b>Temps reportat i limit</b> depend de si ja s'ha "
-"reportat la tasca:"
+msgstr "El camp d'una tasca <b>Temps reportat i limit</b> depend de si ja s'ha reportat la tasca:"
 
 #: ../user/explain_state.php:110
 msgid "Already reported"
@@ -3584,41 +3424,35 @@ msgstr "Enviar un correu electrònic"
 
 #: ../user/ffmail_action.php:59
 msgid "Use your browser's back button to return to message form"
-msgstr ""
-"Utilitzeu el botó del navegador cap enrere per tornar al formulari de "
-"missatges"
+msgstr "Utilitzeu el botó del navegador cap enrere per tornar al formulari de missatges"
 
 #: ../user/ffmail_action.php:63
 msgid "Sending emails"
 msgstr "Enviant correus electrònics"
 
-#: ../user/ffmail_action.php:84
+#: ../user/ffmail_action.php:82
 msgid "email sent successfully to %1"
 msgstr "correu electrònic enviat amb èxit a %1"
 
-#: ../user/ffmail_action.php:86
+#: ../user/ffmail_action.php:84
 msgid "failed to send email to %1: %2"
 msgstr "no s'ha pogut enviar el correu electrònic a %1: %2"
 
-#: ../user/ffmail_action.php:92
+#: ../user/ffmail_action.php:90
 msgid "Thanks for telling your friends about %1"
 msgstr "Gràcies per informar als seus amics sobre %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."
-msgstr ""
-"Ha oblidat d'entrar els noms del seus amics i/o adreces de correu "
-"electrònic; Si us plau %1torneu al formulari%2 i entrreu-los."
+"You forgot to enter your friends' names and/or email addresses; Please "
+"%1return to the form%2 and enter them."
+msgstr "Ha oblidat d'entrar els noms del seus amics i/o adreces de correu electrònic; Si us plau %1torneu al formulari%2 i entrreu-los."
 
 #: ../user/ffmail_form.php:30
 msgid ""
 "This project hasn't created an email message - please notify its "
 "administrators"
-msgstr ""
-"Aquest projecte no ha creat un missatge de correu electrònic - si us plau "
-"notifica-ho als seus administradors"
+msgstr "Aquest projecte no ha creat un missatge de correu electrònic - si us plau notifica-ho als seus administradors"
 
 #: ../user/ffmail_form.php:33
 msgid "Tell your friends about %1"
@@ -3626,19 +3460,14 @@ msgstr "Informa als teus amics sobre %1"
 
 #: ../user/ffmail_form.php:37
 msgid "Help us by telling your friends, family and coworkers about %1"
-msgstr ""
-"Ajuda'ns a infornar als teus amics, familiars i companys de treball sobre%1"
+msgstr "Ajuda'ns a infornar als teus amics, familiars i companys de treball sobre%1"
 
 #: ../user/ffmail_form.php:39
 msgid ""
 "Fill in this form with the names and email addresses of people you think "
 "might be interested in %1. We'll send them an email in your name, and you "
 "can add your own message if you like."
-msgstr ""
-"Ompli el següent formulari amb els noms i adreces de correu electrònic de "
-"persones que puguin estar interessades en %1. I els enviarem un correu "
-"electrònic en nom seu, i vostè pot afegir el seu propi missatge si ho "
-"desitja."
+msgstr "Ompli el següent formulari amb els noms i adreces de correu electrònic de persones que puguin estar interessades en %1. I els enviarem un correu electrònic en nom seu, i vostè pot afegir el seu propi missatge si ho desitja."
 
 #: ../user/ffmail_form.php:42
 msgid "Your name:"
@@ -3664,84 +3493,73 @@ msgstr "Missatge addicional (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 "No està autoritzat per expulsar usuaris."
 
-#: ../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 "Voti expulsió"
 
-#: ../user/forum_banishment_vote.php:50
+#: ../user/forum_banishment_vote.php:52
 msgid "No user with this ID found."
 msgstr "No s'ha trobat cap usuari amb aquest 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 "L'usuari ja està expulsat"
 
-#: ../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 ""
-"Està segur que vol expulsar %1?<br/>Això evitarà que %1 posi missatges "
-"durant al període de temps especificat.<br/>S'ha de fer només si %1 mostrat "
-"un comportament controvertit."
+msgstr "Està segur que vol expulsar %1?<br/>Això evitarà que %1 posi missatges durant al període de temps especificat.<br/>S'ha de fer només si %1 mostrat un comportament controvertit."
 
-#: ../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 ""
-"Seleccioneu una raó de la llista, opcionalment escrigui una descripció més "
-"detallada de per què l'usuari ha de ser expulsat."
+"Select the reason category, optionally write a longer description of why the"
+" user should be banished."
+msgstr "Seleccioneu una raó de la llista, opcionalment escrigui una descripció més detallada de per què l'usuari ha de ser expulsat."
 
-#: ../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 "Obscè"
 
-#: ../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 "Correus amb ira/odi"
 
-#: ../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 "Sol.licitud d'usuari"
 
-#: ../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 "Un altre"
-
-#: ../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 "Raó"
 
-#: ../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 "Enviat per correu si no està buit"
 
-#: ../user/forum_banishment_vote.php:74
+#: ../user/forum_banishment_vote.php:77
 msgid "Proceed with vote"
 msgstr "Procedir amb la votació"
 
-#: ../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 "Heu d'especificar una acció..."
 
@@ -3749,15 +3567,13 @@ msgstr "Heu d'especificar una acció..."
 msgid ""
 "You can no longer edit this post.<br/>Posts can only be edited at most %1 "
 "minutes after they have been created."
-msgstr ""
-"Ja no es pot editar aquest missatge.<br/>Missatges només es poden editar en "
-"durant els %1 minuts posteriors a la seva creació."
+msgstr "Ja no es pot editar aquest missatge.<br/>Missatges només es poden editar en durant els %1 minuts posteriors a la seva creació."
 
 #: ../user/forum_edit.php:47
 msgid "You are not authorized to edit this post."
 msgstr "No tens permís per editar aquest missatge."
 
-#: ../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"
 
@@ -3766,921 +3582,863 @@ msgid "Edit your message"
 msgstr "Edita el teu missatge"
 
 #: ../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ítol"
 
-#: ../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 "Afegir la meva firma a aquest correu"
 
-#: ../user/forum_forum.php:41
+#: ../user/forum_forum.php:46
 msgid "Not visible to you"
 msgstr "No és visible per a tu"
 
-#: ../user/forum_forum.php:80
+#: ../user/forum_forum.php:83
 msgid "Team message board for %1"
 msgstr "Equip del plafó de missatges de %1"
 
-#: ../user/forum_forum.php:96
+#: ../user/forum_forum.php:99
 msgid "New thread"
 msgstr "Nou fil"
 
-#: ../user/forum_forum.php:96
+#: ../user/forum_forum.php:99
 msgid "Add a new thread to this forum"
 msgstr "Afegir un nou fil a aquest fòrum"
 
-#: ../user/forum_forum.php:116
+#: ../user/forum_forum.php:119
 msgid "This message board is available as an %1RSS feed%2"
 msgstr "Aquest plafó de missatges està disponible en format %1RSS%2"
 
-#: ../user/forum_forum.php:174
+#: ../user/forum_forum.php:178
 msgid "This thread is hidden"
 msgstr "Aquest fil es ocult"
 
-#: ../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 "Aquest fil està fixat i tancat, i no l'has llegit encara"
 
-#: ../user/forum_forum.php:178
+#: ../user/forum_forum.php:182
 msgid "sticky/locked/unread"
 msgstr "fixat/tancat/no llegit"
 
-#: ../user/forum_forum.php:180
+#: ../user/forum_forum.php:184
 msgid "This thread is sticky and you haven't read it yet"
 msgstr "Aquest fil està fixat i no l'has llegit encara"
 
-#: ../user/forum_forum.php:180
+#: ../user/forum_forum.php:184
 msgid "sticky/unread"
 msgstr "fixat/no llegit"
 
-#: ../user/forum_forum.php:184
+#: ../user/forum_forum.php:188
 msgid "You haven't read this thread yet, and it's locked"
 msgstr "Encara no has llegit aquest fil i està tancat"
 
-#: ../user/forum_forum.php:184
+#: ../user/forum_forum.php:188
 msgid "unread/locked"
 msgstr "no llegit/tancat"
 
-#: ../user/forum_forum.php:186
+#: ../user/forum_forum.php:190
 msgid "You haven't read this thread yet"
 msgstr "Encara no has llegit aquest fil"
 
-#: ../user/forum_forum.php:192
+#: ../user/forum_forum.php:196
 msgid "This thread is sticky and locked"
 msgstr "Aquest fil està fixat i tancat"
 
-#: ../user/forum_forum.php:192
+#: ../user/forum_forum.php:196
 msgid "sticky/locked"
 msgstr "fixat/tancat"
 
-#: ../user/forum_forum.php:194
+#: ../user/forum_forum.php:198
 msgid "This thread is sticky"
 msgstr "Aquest fil està fixat"
 
-#: ../user/forum_forum.php:194
+#: ../user/forum_forum.php:198
 msgid "sticky"
 msgstr "fixar"
 
-#: ../user/forum_forum.php:198
+#: ../user/forum_forum.php:202
 msgid "This thread is locked"
 msgstr "Aquest fil està tancat"
 
-#: ../user/forum_forum.php:198
+#: ../user/forum_forum.php:202
 msgid "locked"
 msgstr "tancat"
 
-#: ../user/forum_forum.php:200
+#: ../user/forum_forum.php:204
 msgid "You read this thread"
 msgstr "Has llegit aquest fil"
 
-#: ../user/forum_forum.php:200
+#: ../user/forum_forum.php:204
 msgid "read"
 msgstr "llegeix"
 
-#: ../user/forum_help_desk.php:27
+#: ../user/forum_help_desk.php:29
 msgid "Questions and answers"
 msgstr "Preguntes i respostes"
 
-#: ../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 ""
-"Parla en viu a través de Skype amb un voluntari, en qualsevol de diversos "
-"idiomes. Vés a%1BOINC Ajuda en Línia%2."
+"Talk live via Skype with a volunteer, in any of several languages. Go to "
+"%1BOINC Online Help%2."
+msgstr "Parla en viu a través de Skype amb un voluntari, en qualsevol de diversos idiomes. Vés a%1BOINC Ajuda en Línia%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 "Tema"
 
-#: ../user/forum_help_desk.php:45
+#: ../user/forum_help_desk.php:47
 msgid "Questions"
 msgstr "Preguntes"
 
-#: ../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 "Debat entre els membres de %1"
 
-#: ../user/forum_index.php:69
+#: ../user/forum_index.php:74
 msgid "%1 Message boards"
 msgstr "Panell de missatges de %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 ""
-"Si té alguna pregunta o problema, si us plau utilitzi la secció de %"
-"1Preguntes i Respostes%2 dels plafons de missatges."
+msgstr "Si té alguna pregunta o problema, si us plau utilitzi la secció de %1Preguntes i Respostes%2 dels plafons de missatges."
 
-#: ../user/forum_index.php:123
+#: ../user/forum_index.php:128
 msgid "Subscribed threads"
 msgstr "Fils subscrits"
 
-#: ../user/forum_moderate_post.php:43
+#: ../user/forum_moderate_post.php:45
 msgid "Moderate post"
 msgstr "Moderar missatges"
 
-#: ../user/forum_moderate_post.php:52
+#: ../user/forum_moderate_post.php:55
 msgid "Hide post"
 msgstr "Ocultar el missatge"
 
-#: ../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 "Correu brosa comercial"
 
-#: ../user/forum_moderate_post.php:58
+#: ../user/forum_moderate_post.php:61
 msgid "Doublepost"
 msgstr "Missatge doble"
 
-#: ../user/forum_moderate_post.php:63
+#: ../user/forum_moderate_post.php:66
 msgid "Move post"
 msgstr "Moure el missatge"
 
-#: ../user/forum_moderate_post.php:65
+#: ../user/forum_moderate_post.php:68
 msgid "Destination thread ID:"
 msgstr "ID destí del fil:"
 
-#: ../user/forum_moderate_post.php:78
+#: ../user/forum_moderate_post.php:81
 msgid "Banish user"
 msgstr "Expulsar l'usuari"
 
-#: ../user/forum_moderate_post.php:80
+#: ../user/forum_moderate_post.php:83
 msgid "Ban duration"
 msgstr "Durada de l'expulsió"
 
-#: ../user/forum_moderate_post.php:81
+#: ../user/forum_moderate_post.php:84
 msgid "4 hours"
 msgstr "4 hores"
 
-#: ../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 setmana"
 
-#: ../user/forum_moderate_post.php:84
+#: ../user/forum_moderate_post.php:87
 msgid "2 weeks"
 msgstr "2 setmanes"
 
-#: ../user/forum_moderate_post.php:85
+#: ../user/forum_moderate_post.php:88
 msgid "1 month"
 msgstr "1 mes"
 
-#: ../user/forum_moderate_post.php:86
+#: ../user/forum_moderate_post.php:89
 msgid "Forever"
 msgstr "Per sempre"
 
-#: ../user/forum_moderate_post.php:96
-msgid "Optional explanation %1 This is included in email to user.%2"
-msgstr ""
-"Explicació opcional %1 Aquesta s'inclou en el correu electrònic a l'usuari.%"
-"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 "CORRECTE"
 
-#: ../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 "Explicació opcional %1 Aquesta s'inclou en el correu electrònic a l'usuari.%2"
+
+#: ../user/forum_moderate_post_action.php:60
 msgid "You are not authorized to moderate this post."
 msgstr "No estas autoritzat a moderar aquest missatge."
 
-#: ../user/forum_moderate_post_action.php:85
+#: ../user/forum_moderate_post_action.php:105
 msgid "Can't move to different category type"
 msgstr "No es pot moure a un tipus diferent de categoria"
 
-#: ../user/forum_moderate_post_action.php:89
+#: ../user/forum_moderate_post_action.php:109
 msgid "Can't move to different category"
 msgstr "No es pot moure a una categoria diferent"
 
-#: ../user/forum_moderate_post_action.php:110
+#: ../user/forum_moderate_post_action.php:130
 msgid "Not authorized to banish users"
 msgstr "No tens permís per expulsar usuaris"
 
-#: ../user/forum_moderate_post_action.php:126
+#: ../user/forum_moderate_post_action.php:146
 msgid "Banishment"
 msgstr "Expulsió"
 
-#: ../user/forum_moderate_post_action.php:128
+#: ../user/forum_moderate_post_action.php:148
 msgid "User %1 has been banished."
 msgstr "L'usuari %1 ha estat expulsat."
 
-#: ../user/forum_moderate_post_action.php:131
+#: ../user/forum_moderate_post_action.php:151
 msgid "Action failed: possible database problem"
 msgstr "L'acció a fallat: possible problema de la base de dades"
 
-#: ../user/forum_moderate_thread.php:33
+#: ../user/forum_moderate_thread.php:38
 msgid "not authorized"
 msgstr "no autoritzat"
 
-#: ../user/forum_moderate_thread.php:36
+#: ../user/forum_moderate_thread.php:41
 msgid "Moderate thread '%1'"
 msgstr "Moderar el fil '%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 ""
-"Selecciona la categoria de raó, o escriu una descripció més detallada de per "
-"què ocultes o tanques el fil, i després prem OK."
+msgstr "Selecciona la categoria de raó, o escriu una descripció més detallada de per què ocultes o tanques el fil, i després prem 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 "Fòrum destí"
 
-#: ../user/forum_moderate_thread.php:77
+#: ../user/forum_moderate_thread.php:83
 msgid "New title:"
 msgstr "Nou títol:"
 
-#: ../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 ""
-"Només els administradors del projecte poden crear un fil aquí. No obstant "
-"això, ppots respondre a les discussions existents."
+msgstr "Només els administradors del projecte poden crear un fil aquí. No obstant això, ppots respondre a les discussions existents."
 
-#: ../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 ""
-"El teu missatge ha estat marcat com correu brossa per Akismet el sistema "
-"anti-correu brossa. Si us plau, modifica el text i torna a intentar-ho."
+msgstr "El teu missatge ha estat marcat com correu brossa per Akismet el sistema anti-correu brossa. Si us plau, modifica el text i torna a intentar-ho."
 
-#: ../user/forum_post.php:70
+#: ../user/forum_post.php:74
 msgid "Create new thread"
 msgstr "Crear un nou fil"
 
-#: ../user/forum_post.php:100
+#: ../user/forum_post.php:104
 msgid "Create a new thread"
 msgstr "Crear un nou fil"
 
-#: ../user/forum_post.php:105
+#: ../user/forum_post.php:109
 msgid "Remember to add a title"
 msgstr "Recordi que ha de afegir un títol"
 
-#: ../user/forum_post.php:127
+#: ../user/forum_post.php:131
 msgid "Show this item as a Notice in the BOINC Manager"
 msgstr "Mostra aquest article com una Notícia a l'Administrador de 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 ""
-"Fer-ho només per als articles que puguin ser d'interès per a tots els "
-"voluntaris."
+msgstr "Fer-ho només per als articles que puguin ser d'interès per a tots els voluntaris."
 
-#: ../user/forum_rate.php:26
+#: ../user/forum_rate.php:28
 msgid "Rating offline"
 msgstr "Classificació fora de línia"
 
-#: ../user/forum_rate.php:27
+#: ../user/forum_rate.php:29
 msgid "This function is turned off by the project"
 msgstr "Aquesta opció està desactivada per el projecte"
 
-#: ../user/forum_rate.php:58
+#: ../user/forum_rate.php:60
 msgid "You need more average or total credit to rate a post."
 msgstr "Necessita més crèdit mitja o crèdit total per classificar una noticia."
 
-#: ../user/forum_rate.php:62
+#: ../user/forum_rate.php:64
 msgid "You have already rated this post."
 msgstr "Vostè ja és valorat aquestmissatge."
 
-#: ../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 "Tornar al fil"
 
-#: ../user/forum_rate.php:72
+#: ../user/forum_rate.php:74
 msgid "Input Recorded"
 msgstr "Entrada registrada"
 
-#: ../user/forum_rate.php:73
+#: ../user/forum_rate.php:75
 msgid "Your input has been recorded. Thanks for your help."
 msgstr "La seva entrada ha estat registrada. Gràcies per la seva ajuda."
 
-#: ../user/forum_rate.php:75
+#: ../user/forum_rate.php:77
 msgid "Vote Registered"
 msgstr "Vot Registrat"
 
-#: ../user/forum_rate.php:76
+#: ../user/forum_rate.php:78
 msgid "Your rating has been recorded. Thanks for your input."
 msgstr "La seva valoració ha estat enregistrada. Mercés per el seu interes."
 
-#: ../user/forum_rate.php:80
+#: ../user/forum_rate.php:82
 msgid "Vote Submission Problem"
 msgstr "Problemes en el Enviament del Vot"
 
-#: ../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 ""
-"El seu missatge ha estat marcat com a correu brossa pel Akismet sistema "
-"anti-spam. Si us plau, modifiqui el text i torni a intentar-ho."
+msgstr "El seu missatge ha estat marcat com a correu brossa pel Akismet sistema anti-spam. Si us plau, modifiqui el text i torni a intentar-ho."
 
-#: ../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 "Publiqui-ho al fil"
 
-#: ../user/forum_reply.php:137
+#: ../user/forum_reply.php:143
 msgid "Message:"
 msgstr "Missatge:"
 
-#: ../user/forum_reply.php:140
+#: ../user/forum_reply.php:146
 msgid "reply to %1Message ID%2:"
 msgstr "respongui a %1ID Missatge%2:"
 
-#: ../user/forum_reply.php:166
+#: ../user/forum_reply.php:172
 msgid "Post reply"
 msgstr "Respongui amb un missatge"
 
-#: ../user/forum_reply.php:169
+#: ../user/forum_reply.php:175
 msgid "Add my signature to this reply"
 msgstr "Afegir la meva firma a aquesta 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 ""
-"Vostè necessita més crèdit de mitjana o total per per inserir un missatge."
+msgstr "Vostè necessita més crèdit de mitjana o total per per inserir un missatge."
 
-#: ../user/forum_report_post.php:65
+#: ../user/forum_report_post.php:68
 msgid "Report Registered"
 msgstr "Informe Registrat"
 
-# 92%
-#: ../user/forum_report_post.php:66
+#: ../user/forum_report_post.php:69
 msgid "Your report has been recorded. Thanks for your input."
 msgstr "El seu informe ha estat enregistrat. Mercès per la seva aportació."
 
-#: ../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 moderador ara revisarà el seu informe i decidirà què fer - això pot "
-"trigar una mica, així que si us plau sigui pacient"
+msgstr "Un moderador ara revisarà el seu informe i decidirà què fer - això pot trigar una mica, així que si us plau sigui pacient"
 
-#: ../user/forum_report_post.php:71
+#: ../user/forum_report_post.php:74
 msgid "Report a forum post"
 msgstr "Informar d'un missatge en el 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 "
+"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 ""
-"Abans d'informar d'aquest missatge, pot utilitzar sistema +/- de "
-"classificació. Si un nombre important d'usuaris valora negativament un "
-"missatge, pot ser ocultat temporalment.<br />Vostè pot trobar el sistema de "
-"valoració en la part inferior del missatge."
+msgstr "Abans d'informar d'aquest missatge, pot utilitzar sistema +/- de classificació. Si un nombre important d'usuaris valora negativament un missatge, pot ser ocultat temporalment.<br />Vostè pot trobar el sistema de valoració en la part inferior del missatge."
 
-#: ../user/forum_report_post.php:80
+#: ../user/forum_report_post.php:83
 msgid "Report post"
 msgstr "Informar d'un missatge"
 
-#: ../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"
+"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 ""
-"Per què trobeu ofensiu el missatge: %1Si us plau, inclogui informació "
-"suficient per que qui\n"
-"no l'ha llegit pugui identificar ràpidament el problema.%2"
+msgstr "Per què trobeu ofensiu el missatge: %1Si us plau, inclogui informació suficient per que qui\nno l'ha llegit pugui identificar ràpidament el problema.%2"
 
-#: ../user/forum_report_post.php:90
+#: ../user/forum_report_post.php:93
 msgid "Report not registered"
 msgstr "Informe no registrat"
 
-#: ../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 ""
-"El seu informe no es pot registrar. Si us plau, espereu una mica i torneu a "
-"intentar-ho."
+msgstr "El seu informe no es pot registrar. Si us plau, espereu una mica i torneu a intentar-ho."
 
-#: ../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 això no és un error temporal, si us plau informeu-ne als desenvolupadors "
-"del projecte."
+"If this is not a temporary error, please report it to the project "
+"developers."
+msgstr "Si això no és un error temporal, si us plau informeu-ne als desenvolupadors del projecte."
 
-#: ../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 "Aquest plafó de notícies està disponible en format RSS."
 
-#: ../user/forum_rss.php:43
+#: ../user/forum_rss.php:41
 msgid "Options:"
 msgstr "Opcions:"
 
-#: ../user/forum_rss.php:47
+#: ../user/forum_rss.php:45
 msgid "Include only posts by user ID %1 (default: all users)."
-msgstr ""
-"Incloure només els missatges de l'usuari amb ID %1 (per defecte: tots els "
-"usuaris)."
+msgstr "Incloure només els missatges de l'usuari amb ID %1 (per defecte: tots els usuaris)."
 
-#: ../user/forum_rss.php:49
+#: ../user/forum_rss.php:47
 msgid "Include only posts from the last %1 days (default: 30)."
 msgstr "Incloure només els missatges dels darrers %1 dies (per defecte: 30)."
 
-#: ../user/forum_rss.php:51
-msgid "Truncate posts: %1 (Include only first 265 characters of each post)"
-msgstr ""
-"Retellar els missatges: %1 (incloure només els primers 265 caracters de cada "
-"missatge)"
-
-#: ../user/forum_rss.php:53
+#: ../user/forum_rss.php:49
 msgid "Threads only: %1 (Include only the first post of every thread)"
 msgstr "Només fils: %1 (incloure només el primer missatge de cada fil)"
 
-#: ../user/forum_search.php:27
+#: ../user/forum_search.php:29
 msgid "Forum search"
 msgstr "Recerca al fòrum"
 
-#: ../user/forum_search.php:31
+#: ../user/forum_search.php:33
 msgid "Search query"
 msgstr "Executar la cerca"
 
-#: ../user/forum_search.php:32
+#: ../user/forum_search.php:34
 msgid "Search for keywords:"
 msgstr "Cerca de paraules clau:"
 
-#: ../user/forum_search.php:33
+#: ../user/forum_search.php:35
 msgid "Posts that contain all the specified words will be displayed"
 msgstr "Es mostraran els missatges que continguin totes les paraules"
 
-#: ../user/forum_search.php:35
+#: ../user/forum_search.php:37
 msgid "For example: \"screensaver freeze\""
 msgstr "Per exemple: \"congelació de pantalla\""
 
-#: ../user/forum_search.php:36
+#: ../user/forum_search.php:38
 msgid "Search for author ID:"
 msgstr "Cercar per l'ID de l'autor:"
 
-#: ../user/forum_search.php:37
+#: ../user/forum_search.php:39
 msgid "Only posts by this author will be displayed"
 msgstr "Només es mostraran els missatges d'aquest autor"
 
-#: ../user/forum_search.php:39
+#: ../user/forum_search.php:41
 msgid "For example: \"43214\""
 msgstr "Per exemple: \"43214\""
 
-#: ../user/forum_search.php:41
+#: ../user/forum_search.php:43
 msgid "Search options"
 msgstr "Opcions de cerca"
 
-#: ../user/forum_search.php:42
+#: ../user/forum_search.php:44
 msgid "Search limits"
 msgstr "Límits de la cerca"
 
-#: ../user/forum_search.php:43
+#: ../user/forum_search.php:45
 msgid "Search at most this many days back in time"
 msgstr "Cercar com a molt aquest temps enrera"
 
-#: ../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 mesos"
 
-#: ../user/forum_search.php:52
+#: ../user/forum_search.php:54
 msgid "1 year"
 msgstr "1 any"
 
-#: ../user/forum_search.php:73
+#: ../user/forum_search.php:55
+msgid "no limit"
+msgstr "sense límit"
+
+#: ../user/forum_search.php:75
 msgid "Only display posts from this forum"
 msgstr "Només mostrar els missatges d'aquest forum"
 
-#: ../user/forum_search.php:84
+#: ../user/forum_search.php:86
 msgid "Sort by"
 msgstr "Ordenar per"
 
-#: ../user/forum_search.php:88
+#: ../user/forum_search.php:90
 msgid "Start the search"
 msgstr "Iniciar la cerca"
 
-#: ../user/forum_search_action.php:141
+#: ../user/forum_search_action.php:143
 msgid "Forum search results"
 msgstr "Resultats de la recerca al fòrum"
 
-#: ../user/forum_search_action.php:174
+#: ../user/forum_search_action.php:176
 msgid "Thread titles matching your query:"
 msgstr "Fils que concorden amb la seva cerca:"
 
-#: ../user/forum_search_action.php:194
+#: ../user/forum_search_action.php:196
 msgid "Messages matching your query:"
 msgstr "Missatges que concorden amb la seva cerca:"
 
-#: ../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 ""
-"Ho sentim, no hem trobat res que coincideixi amb la seva de cerca. Pot "
-"tractar d'ampliar la cerca utilitzant menys paraules (o paraules menys "
-"específiques)."
+msgstr "Ho sentim, no hem trobat res que coincideixi amb la seva de cerca. Pot tractar d'ampliar la cerca utilitzant menys paraules (o paraules menys específiques)."
 
-#: ../user/forum_search_action.php:219
+#: ../user/forum_search_action.php:221
 msgid "You can also %1try the same search on Google.%2"
 msgstr "També pot %1intentar la mateixa cerca a Google.%2"
 
-#: ../user/forum_search_action.php:224
+#: ../user/forum_search_action.php:226
 msgid "Perform another search"
 msgstr "Fer un altre cerca"
 
-#: ../user/forum_subscribe.php:46
+#: ../user/forum_subscribe.php:48
 msgid "Subscription successful"
 msgstr "Subscripció satisfactoria"
 
-#: ../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 ""
-"Ara està subscrit a %1. Vostè serà notificat cada vegada que hi ha un nou "
-"missatge."
+msgstr "Ara està subscrit a %1. Vostè serà notificat cada vegada que hi ha un nou missatge."
 
-#: ../user/forum_subscribe.php:51
+#: ../user/forum_subscribe.php:53
 msgid "Subscription failed"
 msgstr "A fallat la subscripció"
 
-#: ../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 ""
-"En aquest moments no el podem subscriure a %1. Torni a provar-ho més tard.."
+msgstr "En aquest moments no el podem subscriure a %1. Torni a provar-ho més tard.."
 
-#: ../user/forum_subscribe.php:61
+#: ../user/forum_subscribe.php:63
 msgid "Unsubscription successful"
 msgstr "Cancel·lació de la suscripció satisfactoria"
 
-#: ../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."
+"You are no longer subscribed to %1. You will no longer receive notifications"
+" for this thread."
 msgstr "Ja no està subscrit a %1. Ja no rebrà més notificacions d'aquest fil."
 
-#: ../user/forum_subscribe.php:66
+#: ../user/forum_subscribe.php:68
 msgid "Unsubscription failed"
 msgstr "Ha fallat la cancel·lació de la suscripció"
 
-#: ../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 ""
-"En aquests moments no podem cancel·lar la seva suscripció a %1. Si us plau "
-"provi-ho mes tard.."
+msgstr "En aquests moments no podem cancel·lar la seva suscripció a %1. Si us plau provi-ho mes tard.."
 
-#: ../user/forum_subscribe.php:74
+#: ../user/forum_subscribe.php:76
 msgid "Unknown subscription action"
 msgstr "Acció de suscripció desconeguda"
 
-#: ../user/forum_thread.php:61
+#: ../user/forum_thread.php:66
 msgid "This forum is not visible to you."
 msgstr "Aquest fòrum no està disponible per a vostè."
 
-#: ../user/forum_thread.php:69
+#: ../user/forum_thread.php:74
 msgid "This thread has been hidden by moderators."
 msgstr "Aquest fil ha estat ocultat per els moderadors."
 
-#: ../user/forum_thread.php:128
+#: ../user/forum_thread.php:129
 msgid "My question was answered"
 msgstr "La meva pregunta ja va ser contestada"
 
-#: ../user/forum_thread.php:129
+#: ../user/forum_thread.php:130
 msgid "Click here if your question has been adequately answered"
 msgstr "Feu clic aquí si la seva pregunta ha estat resposta adequadament"
 
-#: ../user/forum_thread.php:137
+#: ../user/forum_thread.php:138
 msgid "I've also got this question"
 msgstr "Jo també m'he fet aquesta pregunta"
 
-#: ../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 "Afegir un nou missatge a aquest fil"
 
-#: ../user/forum_thread.php:171
+#: ../user/forum_thread.php:172
 msgid "Unsubscribe"
 msgstr "Finalitzar subscripció"
 
-#: ../user/forum_thread.php:172
+#: ../user/forum_thread.php:173
 msgid "You are subscribed to this thread.  Click here to unsubscribe."
 msgstr "Vostè està subscrit a aquest fil.  Premi aquí per finalitzar-la."
 
-#: ../user/forum_thread.php:178
+#: ../user/forum_thread.php:179
 msgid "Subscribe"
 msgstr "Subscriure"
 
-#: ../user/forum_thread.php:179
+#: ../user/forum_thread.php:180
 msgid "Click to get email when there are new posts in this thread"
 msgstr "Premi per obtenir un correu quan hi hagin nous missatges en aquest fil"
 
-#: ../user/forum_thread.php:190
+#: ../user/forum_thread.php:191
 msgid "Unhide this thread"
 msgstr "Fer visible aquest fil"
 
-#: ../user/forum_thread.php:196
+#: ../user/forum_thread.php:197
 msgid "Hide this thread"
 msgstr "Ocultar aquest fil"
 
-#: ../user/forum_thread.php:202
+#: ../user/forum_thread.php:203
 msgid "Make unsticky"
 msgstr "Des enganxar-se"
 
-#: ../user/forum_thread.php:203
+#: ../user/forum_thread.php:204
 msgid "Make this thread not sticky"
 msgstr "No permetre enganxar-se a aquest fil"
 
-#: ../user/forum_thread.php:208
+#: ../user/forum_thread.php:209
 msgid "Make sticky"
 msgstr "Enganxar-se"
 
-#: ../user/forum_thread.php:209
-msgid "Make this thread sticky"
-msgstr "Permetre enganxar-se a aquest fil"
+#: ../user/forum_thread.php:210
+msgid "Make this thread always appear at top of forum"
+msgstr "Fer que aquest fil aparegui a l'inici de fòrum"
 
-#: ../user/forum_thread.php:215
+#: ../user/forum_thread.php:216
 msgid "Unlock"
 msgstr "Des bloquejar"
 
-#: ../user/forum_thread.php:216
-msgid "Unlock this thread"
-msgstr "Des bloquejar aquest fil"
+#: ../user/forum_thread.php:217
+msgid "Allow new posts in this thread"
+msgstr "Permetre nous missatges en aquest tema"
 
-#: ../user/forum_thread.php:221
+#: ../user/forum_thread.php:222
 msgid "Lock"
 msgstr "Bloquejar"
 
-#: ../user/forum_thread.php:222
-msgid "Lock this thread"
-msgstr "Bloquejar aquest fil"
+#: ../user/forum_thread.php:223
+msgid "Don't allow new posts in this thread"
+msgstr "No permetre nous missatges en aquest tema"
 
-#: ../user/forum_thread.php:229
+#: ../user/forum_thread.php:230
 msgid "Move this thread to a different forum"
 msgstr "Moure aquest fil a un altre fil"
 
-#: ../user/forum_thread.php:234
+#: ../user/forum_thread.php:235
 msgid "Edit title"
 msgstr "Editar el títol"
 
-#: ../user/forum_thread.php:235
+#: ../user/forum_thread.php:236
 msgid "Edit thread title"
 msgstr "Editar el títol del fil"
 
-#: ../user/forum_thread.php:245
+#: ../user/forum_thread.php:244
+msgid "Delete thread permanently"
+msgstr "Esborra tema permanent"
+
+#: ../user/forum_thread.php:254
 msgid "Export as Notice"
 msgstr "Exportar com a Avís"
 
-#: ../user/forum_thread.php:251
+#: ../user/forum_thread.php:260
 msgid "Don't export"
 msgstr "No exportar"
 
-#: ../user/forum_thread.php:252
+#: ../user/forum_thread.php:261
 msgid "Don't export this news item as a Notice"
 msgstr "No exportar aquesta noticia com Avís"
 
-#: ../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 "S'ha actualitzat l'estat del fil"
 
-#: ../user/forum_thread_status.php:50
+#: ../user/forum_thread_status.php:55
 msgid "The status has been updated."
 msgstr "S'ha actualitzat l'estat."
 
-#: ../user/forum_user_posts.php:73
+#: ../user/forum_user_posts.php:75
 msgid "Posts by %1"
 msgstr "Missatges de %1"
 
-#: ../user/friend.php:33
+#: ../user/friend.php:35
 msgid "Already friends"
 msgstr "Ja sou amics"
 
-#: ../user/friend.php:39
+#: ../user/friend.php:41
 msgid "You requested friendship with %1 on %2."
 msgstr "Heu sol·licitat l'amistat de %1 a %2."
 
-#: ../user/friend.php:41
+#: ../user/friend.php:43
 msgid "This request is still pending confirmation."
 msgstr "Aquesta petició està pendent de confirmació."
 
-#: ../user/friend.php:52
+#: ../user/friend.php:54
 msgid "%1 is not accepting friendship requests from you"
 msgstr "%1 no accepta les peticions d'amistat de vostè"
 
-#: ../user/friend.php:61
+#: ../user/friend.php:63
 msgid "You can't be friends with yourself"
 msgstr "Vostè no pot ser amic de vostè mateix"
 
-#: ../user/friend.php:69
+#: ../user/friend.php:71
 msgid "Add friend"
 msgstr "Afegir un amic"
 
-#: ../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 ""
-"Vostè ha demanat que afegir %1 com amic. Li notificarem a %1 i li demanarem "
-"confirmi que són amics."
+"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 "Vostè ha demanat que afegir %1 com amic. Li notificarem a %1 i li demanarem confirmi que són amics."
 
-#: ../user/friend.php:77
+#: ../user/friend.php:79
 msgid "Add an optional message here:"
 msgstr "Afegir aquí un missatge opcional:"
 
-#: ../user/friend.php:115
+#: ../user/friend.php:117
 msgid "Friend request sent"
 msgstr "Petició d'amic lliurada"
 
-#: ../user/friend.php:116
+#: ../user/friend.php:118
 msgid "We have notified %1 of your request."
 msgstr "Hem notificat a %1 la seva petició."
 
-#: ../user/friend.php:126
+#: ../user/friend.php:128
 msgid "Please log in as %1"
 msgstr "Si us plau registris com %1"
 
-#: ../user/friend.php:127
+#: ../user/friend.php:129
 msgid "You must log in as %1 to view this friend request"
 msgstr "Ha de registrar-se com %1 per veure aquesta sol.licitud d'amic"
 
-#: ../user/friend.php:138
+#: ../user/friend.php:140
 msgid "Friend request"
 msgstr "Petició d'amic"
 
-#: ../user/friend.php:141
+#: ../user/friend.php:143
 msgid "%1 has requested friendship with you."
 msgstr "%1 ha sol·licitat l'amistat amb vosté."
 
-#: ../user/friend.php:143
+#: ../user/friend.php:145
 msgid "%1 says: %2"
 msgstr "%1 diu: %2"
 
-#: ../user/friend.php:146
+#: ../user/friend.php:148
 msgid "Accept friendship"
 msgstr "Acceptar l'amistat"
 
-#: ../user/friend.php:146
+#: ../user/friend.php:148
 msgid "Click accept if %1 is in fact a friend"
 msgstr "Prémer acceptar si %1 efectivament un amic"
 
-#: ../user/friend.php:147
+#: ../user/friend.php:149
 msgid "Decline"
 msgstr "Rebutjar"
 
-#: ../user/friend.php:147
+#: ../user/friend.php:149
 msgid "Click decline if %1 is not a friend"
 msgstr "Prémer rebutjar si %1 no es un amic"
 
-#: ../user/friend.php:186
+#: ../user/friend.php:188
 msgid "Friendship confirmed"
 msgstr "Amistat confirmada"
 
-#: ../user/friend.php:187
+#: ../user/friend.php:189
 msgid "Your friendship with %1 has been confirmed."
 msgstr "La seva amistat amb %1 ha estat confirmada."
 
-#: ../user/friend.php:205
+#: ../user/friend.php:207
 msgid "Friendship declined"
 msgstr "Amistat rebutjada"
 
-#: ../user/friend.php:206
+#: ../user/friend.php:208
 msgid "You have declined friendship with %1"
 msgstr "Ha rebutjat l'amistat amb %1"
 
-#: ../user/friend.php:221
+#: ../user/friend.php:223
 msgid "Notification not found"
 msgstr "Notificació no trobada"
 
-#: ../user/friend.php:223
+#: ../user/friend.php:225
 msgid "Friend confirmed"
 msgstr "Amic confirmat"
 
-#: ../user/friend.php:224
+#: ../user/friend.php:226
 msgid "You are now friends with %1."
 msgstr "Ara es amic de %1."
 
-#: ../user/friend.php:232
+#: ../user/friend.php:234
 msgid "Cancel friendship?"
 msgstr "Finalitzar l'amistat?"
 
-#: ../user/friend.php:234
+#: ../user/friend.php:236
 msgid "Are you sure you want to cancel your friendship with %1?"
 msgstr "Està segur de que vol finalitzar l'amistat amb %1?"
 
-#: ../user/friend.php:239
+#: ../user/friend.php:241
 msgid "Stay friends"
 msgstr "Seguir sent amics"
 
-#: ../user/friend.php:249
+#: ../user/friend.php:251
 msgid "Friendship cancelled"
 msgstr "Amistat cancel·lada"
 
-#: ../user/friend.php:250
+#: ../user/friend.php:252
 msgid "Your friendship with %1 has been cancelled."
 msgstr "La seva amistat amb %1 ha estat cancel·lada."
 
-#: ../user/get_passwd.php:25
-msgid "Forgot your account info?"
-msgstr "Ha oblidat la informació del seu 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 coneix l'adreça de correu electrònic del seu compte, i hi pot rebre "
-"correu electrònic:"
+"1) If you know your account's email address, and you can receive email "
+"there:"
+msgstr "1) Si coneix l'adreça de correu electrònic del seu compte, i hi pot rebre correu electrònic:"
 
-#: ../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."
-msgstr ""
-"Introduïu l'adreça de correu electrònic, i premeu OK. Se li enviaràn per "
-"correu electrònic les instruccions per restablir la seva contrasenya."
+msgstr "Introduïu l'adreça de correu electrònic, i premeu OK. Se li enviaràn per correu electrònic les instruccions per restablir la seva contrasenya."
 
 #: ../user/get_passwd.php:46
 msgid ""
 "2) If you forgot your account's email address, or you can't receive email "
 "there:"
-msgstr ""
-"2) Si ha oblidat el compte de seva l'adreça de correu electrònic, o no hi "
-"pot rebre correu electrònic:"
+msgstr "2) Si ha oblidat el compte de seva l'adreça de correu electrònic, o no hi pot rebre correu electrònic:"
 
 #: ../user/get_passwd.php:47
 msgid ""
 "If you have run BOINC under this account, you can still access it. Here's "
 "how:"
-msgstr ""
-"Si heu executat BOINC amb aquest compte, pot accedir-hi. Així és com ho ha "
-"de fer:"
+msgstr "Si heu executat BOINC amb aquest compte, pot accedir-hi. Així és com ho ha de fer:"
 
 #: ../user/get_passwd.php:50
 msgid ""
 "Go to the BOINC data directory on your computer (its location is written to "
 "the Event Log at startup)."
-msgstr ""
-"Ves a la carpeta de dades de BOINC del teu ordinador (la localització es "
-"troba a l'inici del registre de'esdeveniments)"
+msgstr "Ves a la carpeta de dades de BOINC del teu ordinador (la localització es troba a l'inici del registre de'esdeveniments)"
 
 #: ../user/get_passwd.php:51
 msgid "Find your account file for this project; it will be named <b>%1</b>."
-msgstr ""
-"Cerqui l'arxiu del seu compte per a aquest projecte, que s'anomena <b>%"
-"1</b>."
+msgstr "Cerqui l'arxiu del seu compte per a aquest projecte, que s'anomena <b>%1</b>."
 
 #: ../user/get_passwd.php:52
 msgid "Open the file in a text editor like Notepad. You'll see something like"
-msgstr ""
-"Obri l'arxiu en un editor de text com el Bloc de notes. Veurà alguna cosa "
-"com"
+msgstr "Obri l'arxiu en un editor de text com el Bloc de notes. Veurà alguna cosa com"
 
 #: ../user/get_passwd.php:62
-msgid "Select and Copy the string between %1 and %2 (%3 in the above example)."
-msgstr ""
-"Seleccioni i copií la cadena d'entre %1 i %2 (%3 en l'exemple anterior)."
+msgid ""
+"Select and Copy the string between %1 and %2 (%3 in the above example)."
+msgstr "Seleccioni i copií la cadena d'entre %1 i %2 (%3 en l'exemple anterior)."
 
 #: ../user/get_passwd.php:64
 msgid "Paste the string into the field below, and click OK."
@@ -4690,25 +4448,30 @@ msgstr "Enganxi la cadena en el camp de sota i premi CORRECTE."
 msgid ""
 "You will now be logged in to your account; update the email and password of "
 "your account."
-msgstr ""
-"Ara podrà accedir al seu compte, actualitzi el correu electrònic i la "
-"contrasenya del seu compte."
+msgstr "Ara podrà accedir al seu compte, actualitzi el correu electrònic i la contrasenya del seu compte."
 
 #: ../user/get_passwd.php:71
 msgid "Log in with authenticator"
 msgstr "Registrar-se amb autenticador"
 
-#: ../user/gpu_list.php:126 ../user/gpu_list.php:152
+#: ../user/get_passwd.php:81
+msgid "Forgot your account info?"
+msgstr "Ha oblidat la informació del seu compte?"
+
+#: ../user/gpu_list.php:150 ../user/gpu_list.php:176
 msgid "No GPU tasks reported"
 msgstr "No s'ha informat cap tasca GPU"
 
-#: ../user/gpu_list.php:183
+#: ../user/gpu_list.php:206
+msgid "Top GPU models"
+msgstr "Els millors models de 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 ""
-"Les llistes següents mostren els models de GPU més productius en diferents "
-"plataformes.  Les velocitats relatives es mostren entre parèntesis."
+"platforms.  Relative speeds, measured by average elapsed time of tasks, are "
+"shown in parentheses."
+msgstr "Les llistes següents mostren els models de GPU més productius a diferents plataformes.  Les velocitats relatives, mesurades per la mitjana dels temps de les tasques, es mostren entre parèntesis."
 
 #: ../user/home.php:42
 msgid "Welcome to %1"
@@ -4716,14 +4479,16 @@ msgstr "Benvingut a %1"
 
 #: ../user/home.php:43
 msgid "View and edit your account preferences using the links below."
-msgstr ""
-"Revisi i editi les preferències del seu compte utilitzant els vincles "
-"següents."
+msgstr "Revisi i editi les preferències del seu compte utilitzant els vincles següents."
 
 #: ../user/home.php:46
 msgid "If you have not already done so, %1download BOINC client software%2."
 msgstr "Si encara no ho ha fet, %1descarregui el programari client de BOINC %2."
 
+#: ../user/home.php:49 ../project.sample/project.inc:70
+msgid "Your account"
+msgstr "El seu compte"
+
 #: ../user/host_app_versions.php:37
 msgid "Anonymous platform, missing app"
 msgstr "Plataforma anònima, falta l'aplicació"
@@ -4777,10 +4542,7 @@ msgid ""
 "You can not delete our record of this computer because our database still "
 "contains work for it. You must wait a few days until the work for this "
 "computer has been deleted from the project database."
-msgstr ""
-"No pot eliminar l'historial d'aquest equip, ja que la nostra base de dades "
-"conté encara treballs per ell. Ha d'esperar uns dies fins que la feina "
-"d'aquest equip hagi estat esborrada de la base de dades del projecte."
+msgstr "No pot eliminar l'historial d'aquest equip, ja que la nostra base de dades conté encara treballs per ell. Ha d'esperar uns dies fins que la feina d'aquest equip hagi estat esborrada de la base de dades del projecte."
 
 #: ../user/host_delete.php:40
 msgid "Delete record of computer"
@@ -4804,11 +4566,9 @@ msgstr "Combinar ordinadors"
 
 #: ../user/host_edit_form.php:38
 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 ""
-"De vegades BOINC assigna per error diferents identitats al mateix equip. Pot "
-"corregir això combinant les identitats antigues amb la més recent."
+"Sometimes BOINC assigns separate identities to the same computer by mistake."
+" You can correct this by merging old identities with the newest one."
+msgstr "De vegades BOINC assigna per error diferents identitats al mateix equip. Pot corregir això combinant les identitats antigues amb la més recent."
 
 #: ../user/host_edit_form.php:56
 msgid "No hosts are eligible for merging with this one."
@@ -4821,9 +4581,7 @@ msgstr "Mostrar els detalls"
 #: ../user/host_edit_form.php:66
 msgid ""
 "Check the computers that are the same as %1 (created %2, computer ID %3):"
-msgstr ""
-"Comprovar els equips que són els mateixos que el %1 (creat %2, ID ordinador "
-"%3):"
+msgstr "Comprovar els equips que són els mateixos que el %1 (creat %2, ID ordinador %3):"
 
 #: ../user/host_edit_form.php:70 ../user/workunit.php:39
 msgid "name"
@@ -4845,10 +4603,14 @@ msgstr "no hi ha nom de l'ordinador central"
 msgid "Merge hosts"
 msgstr "Combinar ordinadors"
 
-#: ../user/host_update_credit.php:28
+#: ../user/host_update_credit.php:27
 msgid "Updating computer credit"
 msgstr "Actualitzant el crèdit de l'ordinador"
 
+#: ../user/host_update_credit.php:37
+msgid "Host credit updated"
+msgstr "S'ha actualitzat el crèdit en el servidor"
+
 #: ../user/host_venue_action.php:41
 msgid "Host venue updated"
 msgstr "Posició del ervidor actualitzada"
@@ -4865,9 +4627,7 @@ msgstr "La posició d'aquest servidor s'ha establert a %1."
 msgid ""
 "This change will take effect the next time the host communicates with this "
 "project."
-msgstr ""
-"Aquest canvi tindrà efecte la pròxima vegada que el servidor es comuniqui "
-"amb aquest projecte."
+msgstr "Aquest canvi tindrà efecte la pròxima vegada que el servidor es comuniqui amb aquest projecte."
 
 #: ../user/host_venue_action.php:50
 msgid "Return to host page"
@@ -4884,9 +4644,7 @@ msgstr "Ordinadors ocults"
 #: ../user/hosts_user.php:56
 msgid ""
 "This user has chosen not to show information about his or her computers."
-msgstr ""
-"Aquest usuari ha optat per no mostrar informació sobre ell o els seus "
-"equips."
+msgstr "Aquest usuari ha optat per no mostrar informació sobre ell o els seus equips."
 
 #: ../user/hosts_user.php:64
 msgid "Your computers"
@@ -4926,16 +4684,18 @@ msgstr "preformatejat"
 
 #: ../user/html.php:33
 msgid ""
-"image; height cannot exceed 450 pixels. Please do not link to images without "
-"permission of the web site where the image is hosted."
-msgstr ""
-"imatge; l'alçada no pot superar els 450 píxels. Si us plau, no enllaceu amb "
-"les imatges sense el permís del lloc web on es troba la imatge."
+"image; height cannot exceed 450 pixels. Please do not link to images without"
+" permission of the web site where the image is hosted."
+msgstr "imatge; l'alçada no pot superar els 450 píxels. Si us plau, no enllaceu amb les imatges sense el permís del lloc web on es troba la imatge."
 
 #: ../user/html.php:35
 msgid "You can also use ampersand notation for special characters."
 msgstr "També pot utilitzar la notació amb ampersand per caràcters especials."
 
+#: ../user/info.php:24 ../user/sample_index.php:78
+msgid "Read our rules and policies"
+msgstr "Llegiu les regles i normes nostres"
+
 #: ../user/info.php:35
 msgid "Run %1 only on authorized computers"
 msgstr "Executeu %1 només en ordinadors autoritzats"
@@ -4945,10 +4705,7 @@ msgid ""
 "Run %1 only on computers that you own, or for which you have obtained the "
 "owner's permission. Some companies and schools have policies that prohibit "
 "using their computers for projects such as %1."
-msgstr ""
-"Executi %1 només en els ordinadors propis, o per els que ha obtingut "
-"autorització del propietari. Algunes companyies i escoles tenen normes que "
-"prohibeixen la utilització dels seus ordinadors per projectes com %1."
+msgstr "Executi %1 només en els ordinadors propis, o per els que ha obtingut autorització del propietari. Algunes companyies i escoles tenen normes que prohibeixen la utilització dels seus ordinadors per projectes com %1."
 
 #: ../user/info.php:38
 msgid "How %1 will use your computer"
@@ -4959,19 +4716,13 @@ msgid ""
 "When you run %1 on your computer, it will use part of the computer's CPU "
 "power, disk space, and network bandwidth. You can control how much of your "
 "resources are used by %1, and when it uses them."
-msgstr ""
-"Quan executeu %1 en el vostre ordinador, utilitzarà part de la potència de "
-"la CPU, espai en disc, i ample de banda de la xarxa. Podeu controlar la "
-"quantitat de recursos utilitzats per %1, i quan els utilitza."
+msgstr "Quan executeu %1 en el vostre ordinador, utilitzarà part de la potència de la CPU, espai en disc, i ample de banda de la xarxa. Podeu controlar la quantitat de recursos utilitzats per %1, i quan els utilitza."
 
 #: ../user/info.php:40
 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 ""
-"El treball realitzat per el vostre ordinador contribueix a assolir les fites "
-"de %1, tal i com és descrit a la seva pàgina web. L’aplicació pot canviar "
-"en el temps."
+msgstr "El treball realitzat per el vostre ordinador contribueix a assolir les fites de %1, tal i com és descrit a la seva pàgina web. L’aplicació pot canviar en el temps."
 
 #: ../user/info.php:42
 msgid "Privacy policy"
@@ -4979,15 +4730,11 @@ msgstr "Normes de privadesa"
 
 #: ../user/info.php:43
 msgid ""
-"Your account on %1 is identified by a name that you choose. This name may be "
-"shown on the %1 web site, along with a summary of the work your computer has "
-"done for %1. If you want to be anonymous, choose a name that doesn't reveal "
-"your identity."
-msgstr ""
-"El vostre compte a %1 s'identifica per el nom que escolliu. Aquest nom es "
-"pot mostrar a la pàgina web de %1, amb un resum de la feina que vostre "
-"ordinador ha realitzat per a %1. Si voleu romandre anònim, escolliu un nom "
-"que no reveli la vostre identitat."
+"Your account on %1 is identified by a name that you choose. This name may be"
+" shown on the %1 web site, along with a summary of the work your computer "
+"has done for %1. If you want to be anonymous, choose a name that doesn't "
+"reveal your identity."
+msgstr "El vostre compte a %1 s'identifica per el nom que escolliu. Aquest nom es pot mostrar a la pàgina web de %1, amb un resum de la feina que vostre ordinador ha realitzat per a %1. Si voleu romandre anònim, escolliu un nom que no reveli la vostre identitat."
 
 #: ../user/info.php:44
 msgid ""
@@ -4996,24 +4743,14 @@ 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 ""
-"Si participeu a %1, informació respecte el vostre ordinador (com el tipus de "
-"processador, quantitat de memòria, etc.) serà registrada per %1 i "
-"utilitzada per decidir el tipus de feina a assignar al vostre ordinador. "
-"Aquesta informació també es mostrarà a les pàgines web de %1. No es mostrarà "
-"res que pugui revelar la localització del vostre ordinador (per exemple el "
-"seu nom de domini o adreça de xarxa)."
+msgstr "Si participeu a %1, informació respecte el vostre ordinador (com el tipus de processador, quantitat de memòria, etc.) serà registrada per %1 i utilitzada per decidir el tipus de feina a assignar al vostre ordinador. Aquesta informació també es mostrarà a les pàgines web de %1. No es mostrarà res que pugui revelar la localització del vostre ordinador (per exemple el seu nom de domini o adreça de xarxa)."
 
 #: ../user/info.php:45
 msgid ""
-"To participate in %1, you must give an address where you receive email. This "
-"address will not be shown on the %1 web site or shared with organizations. %"
-"1 may send you periodic newsletters; however, you can opt out at any time."
-msgstr ""
-"Per participar a %1, heu de subministrar una adreça on rebre correu "
-"electrònic. Aquesta adreça de correu no es mostrarà a la pàgina web de %1 o "
-"d'organitzacions associades. %1 podrà enviar-vos noticies periòdicament; en "
-"qualsevol cas, podeu optar per cancel·lar-ho."
+"To participate in %1, you must give an address where you receive email. This"
+" address will not be shown on the %1 web site or shared with organizations. "
+"%1 may send you periodic newsletters; however, you can opt out at any time."
+msgstr "Per participar a %1, heu de subministrar una adreça on rebre correu electrònic. Aquesta adreça de correu no es mostrarà a la pàgina web de %1 o d'organitzacions associades. %1 podrà enviar-vos noticies periòdicament; en qualsevol cas, podeu optar per cancel·lar-ho."
 
 #: ../user/info.php:46
 msgid ""
@@ -5022,24 +4759,15 @@ 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 ""
-"El missatges privats a la web %1 només son visibles per qui els envia i el "
-"receptor.  %1 no comprova ni restringeix el continguts del missatges "
-"privats.  Si rep un missatge privat no desitjat d'un altre usuari %1, pot "
-"afegir-lo en el seu %2filtre de missatges%3.  Això evitarà que vegi cap "
-"missatge públic o privat d'aquest usuari."
+msgstr "El missatges privats a la web %1 només son visibles per qui els envia i el receptor.  %1 no comprova ni restringeix el continguts del missatges privats.  Si rep un missatge privat no desitjat d'un altre usuari %1, pot afegir-lo en el seu %2filtre de missatges%3.  Això evitarà que vegi cap missatge públic o privat d'aquest usuari."
 
 #: ../user/info.php:47
 msgid ""
 "If you use our web site forums you must follow the %2posting guidelines%3.  "
 "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 ""
-"Si utilitza els fòrums de la nostra web ha de seguir les %2normes%3.  Els "
-"missatges que enviï missatges als fòrums de %1 seran visibles per tothom, "
-"inclosos els que no son membres.  Lliurant els missatges al fòrum, esteu "
-"autoritzant de forma incondicional a tothom a veure'ls i copiar-los."
+"members.  By posting to the forums, you are granting irrevocable license for"
+" anyone to view and copy your posts."
+msgstr "Si utilitza els fòrums de la nostra web ha de seguir les %2normes%3.  Els missatges que enviï missatges als fòrums de %1 seran visibles per tothom, inclosos els que no son membres.  Lliurant els missatges al fòrum, esteu autoritzant de forma incondicional a tothom a veure'ls i copiar-los."
 
 #: ../user/info.php:48
 msgid "Is it safe to run %1?"
@@ -5049,35 +4777,23 @@ msgstr "Es segura l'execució de %1?"
 msgid ""
 "Any time you download a program through the Internet you are taking a "
 "chance: the program might have dangerous errors, or the download server "
-"might have been hacked. %1 has made efforts to minimize these risks. We have "
-"tested our applications carefully. Our servers are behind a firewall and 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 ""
-"Sempre que descarregueu un programa d'Internet pot passar que: el programa "
-"tingui errors perillosos, o que el servidor de descàrrega hagi estat "
-"manipulat. %1 ha treballat per minimitzar aquests riscos. Hem verificat amb "
-"cura les nostres aplicacions. Els nostres servidors estan protegits per "
-"tallafocs que estan configurats per alta seguretat. Per assegurar la "
-"integritat de la descàrrega dels programes, tots els programes disposen "
-"d'una signatura digital en un ordinador que no està connectat a Internet."
+"might have been hacked. %1 has made efforts to minimize these risks. We have"
+" tested our applications carefully. Our servers are behind a firewall and "
+"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 "Sempre que descarregueu un programa d'Internet pot passar que: el programa tingui errors perillosos, o que el servidor de descàrrega hagi estat manipulat. %1 ha treballat per minimitzar aquests riscos. Hem verificat amb cura les nostres aplicacions. Els nostres servidors estan protegits per tallafocs que estan configurats per alta seguretat. Per assegurar la integritat de la descàrrega dels programes, tots els programes disposen d'una signatura digital en un ordinador que no està [...]
 
 #: ../user/info.php:50
 msgid ""
 "The applications run by %1 may cause some computers to overheat. If this "
 "happens, stop running %1 or use a %2utility program%3 that limits CPU usage."
-msgstr ""
-"Les aplicacions executades per %1 poden causar l’escalfament d'alguns "
-"ordinadors. Si passa això, atureu l'execució de %1 o utilitzeu un %2programa"
-"%3 que limiti la utilització de la CPU."
+msgstr "Les aplicacions executades per %1 poden causar l’escalfament d'alguns ordinadors. Si passa això, atureu l'execució de %1 o utilitzeu un %2programa%3 que limiti la utilització de la CPU."
 
 #: ../user/info.php:51
 msgid ""
 "%1 was developed by %2. BOINC was developed at the University of California."
-msgstr ""
-"%1 ha estat desenvolupada per %2. BOINC ha estat desenvolupada a la "
-"Universitat de Califòrnia."
+msgstr "%1 ha estat desenvolupada per %2. BOINC ha estat desenvolupada a la Universitat de Califòrnia."
 
 #: ../user/info.php:53
 msgid "Liability"
@@ -5086,11 +4802,9 @@ msgstr "Responsabilitats"
 #: ../user/info.php:54
 msgid ""
 "%1 and %2 assume no liability for damage to your computer, loss of data, or "
-"any other event or condition that may occur as a result of participating in %"
-"1."
-msgstr ""
-"%1 i %2 no assumeixen responsabilitats per danys al vostre ordinador, pèrdua "
-"de informació, o qualsevol altre incidència deguda a la participació a %1."
+"any other event or condition that may occur as a result of participating in "
+"%1."
+msgstr "%1 i %2 no assumeixen responsabilitats per danys al vostre ordinador, pèrdua de informació, o qualsevol altre incidència deguda a la participació a %1."
 
 #: ../user/info.php:56
 msgid "Other BOINC projects"
@@ -5098,24 +4812,17 @@ msgstr "Altres projectes BOINC"
 
 #: ../user/info.php:57
 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 "
+"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 ""
-"Altres projectes utilitzen la mateixa plataforma, BOINC, com %1. Podeu "
-"considerar la participació a un o mes d'aquests projectes. Fent això, el "
-"vostre ordinador executarà feina útil encara que %1 no tingui feina "
-"disponible."
+msgstr "Altres projectes utilitzen la mateixa plataforma, BOINC, com %1. Podeu considerar la participació a un o mes d'aquests projectes. Fent això, el vostre ordinador executarà feina útil encara que %1 no tingui feina disponible."
 
 #: ../user/info.php:58
 msgid ""
 "These other projects are not associated with %1, and we cannot vouch for "
 "their security practices or the nature of their research. Join them at your "
 "own risk."
-msgstr ""
-"Aquests altres projectes no estan associats amb %1, i no podem garantir la "
-"seva seguretat o la naturalesa de la seva recerca. Uniu-vos-hi sota la "
-"vostra responsabilitat."
+msgstr "Aquests altres projectes no estan associats amb %1, i no podem garantir la seva seguretat o la naturalesa de la seva recerca. Uniu-vos-hi sota la vostra responsabilitat."
 
 #: ../user/language_select.php:47
 msgid "Language selection"
@@ -5125,18 +4832,13 @@ msgstr "Selecció d'idioma"
 msgid ""
 "This web site is available in several languages. The currently selected "
 "language is %1."
-msgstr ""
-"Aquest lloc web està disponible en diversos idiomes. L'idioma seleccionat "
-"actualment és: %1."
+msgstr "Aquest lloc web està disponible en diversos idiomes. L'idioma seleccionat actualment és: %1."
 
 #: ../user/language_select.php:78
 msgid ""
 "Normally the choice of language is determined by your browser's language "
 "setting, which is: %1.  You can change this setting using:"
-msgstr ""
-"Normalment, l'elecció de la llengua està determinada per la configuració "
-"d'idioma del seu navegador, que és: %1.  Podeu canviar aquesta configuració "
-"utilitzant:"
+msgstr "Normalment, l'elecció de la llengua està determinada per la configuració d'idioma del seu navegador, que és: %1.  Podeu canviar aquesta configuració utilitzant:"
 
 #: ../user/language_select.php:83
 msgid "Firefox: Tools/Options/General"
@@ -5151,10 +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 ""
-"O pot seleccionar un idioma fent clic en un dels enllaços.  Això enviarà al "
-"seu navegador una galeta, assegureu-vos que el vostre navegador accepti "
-"galetes del nostre domini."
+msgstr "O pot seleccionar un idioma fent clic en un dels enllaços.  Això enviarà al seu navegador una galeta, assegureu-vos que el vostre navegador accepti galetes del nostre domini."
 
 #: ../user/language_select.php:95
 msgid "Language name (click to select)"
@@ -5166,33 +4865,11 @@ msgstr "Utilitzar la configuració d'idioma del navegador"
 
 #: ../user/language_select.php:113
 msgid ""
-"Translations are done by volunteers.  If your native language is not here, %"
-"1you can provide a translation%2."
-msgstr ""
-"Les traduccions són realitzades per voluntaris.  Si la seva llengua materna "
-"no és aquí, %1vosté pot proporcionar una traducció%2."
-
-#: ../user/login_form.php:45
-msgid "Email address:"
-msgstr "Adreça de correu:"
-
-#: ../user/login_form.php:45
-msgid "forgot email address?"
-msgstr "a oblidat l'adreça de correu electrònic?"
-
-#: ../user/login_form.php:48
-msgid "Password:"
-msgstr "Contrasenya:"
-
-#: ../user/login_form.php:48
-msgid "forgot password?"
-msgstr "ha oblidat la contrasenya?"
-
-#: ../user/login_form.php:51
-msgid "Stay logged in"
-msgstr "Segueixi connectat"
+"Translations are done by volunteers.  If your native language is not here, "
+"%1you can provide a translation%2."
+msgstr "Les traduccions són realitzades per voluntaris.  Si la seva llengua materna no és aquí, %1vosté pot proporcionar una traducció%2."
 
-#: ../user/login_form.php:62
+#: ../user/login_form.php:57
 msgid "or %1create an account%2."
 msgstr "o %1crei un compte%2."
 
@@ -5216,14 +4893,7 @@ msgid ""
 "        having that name with the newest computer having that name.\n"
 "        Incompatible computers will not be merged.\n"
 "        <p>"
-msgstr ""
-"Aquesta operació combina els equips en base al seu nom de domini.\n"
-"        <p>\n"
-"        Per a cada nom de domini, es combinaran tots els ordinadors més "
-"antics\n"
-"        amb aquest nom amb el nou equip que tingui aquest nom.\n"
-"        Els ordinadors no compatibles no es poden combinar.\n"
-"        <p>"
+msgstr "Aquesta operació combina els equips en base al seu nom de domini.\n        <p>\n        Per a cada nom de domini, es combinaran tots els ordinadors més antics\n        amb aquest nom amb el nou equip que tingui aquest nom.\n        Els ordinadors no compatibles no es poden combinar.\n        <p>"
 
 #: ../user/merge_by_name.php:82
 msgid "Go ahead and do this"
@@ -5239,11 +4909,7 @@ msgid ""
 "To maximize discussion and flow of information,\n"
 "our message boards are moderated.\n"
 "Message board postings are subject to the following posting rules:\n"
-msgstr ""
-"\n"
-"Per augmentar al màxim la discussió i el flux d'informació,\n"
-"els taulers de missatges són moderats.\n"
-"Els missatges publicats estan subjectes a les següents normes:\n"
+msgstr "\nPer augmentar al màxim la discussió i el flux d'informació,\nels taulers de missatges són moderats.\nEls missatges publicats estan subjectes a les següents normes:\n"
 
 #: ../user/moderation.php:30
 msgid ""
@@ -5252,8 +4918,7 @@ msgid ""
 "Moderators may delete posts that violate any of these rules.\n"
 "The authors of deleted posts will be notified via email.\n"
 "Gross offenders may have their ability to post messages temporarily revoked\n"
-"(though to prevent abuse only project administrators have the ability to do "
-"so).\n"
+"(though to prevent abuse only project administrators have the ability to do so).\n"
 "Additional kinds of bad behavior (\"bugging\" posts to trap the\n"
 "IP addresses of other participants, excessive thread creation to spam\n"
 "the forums, etc.), while not listed in the formal rules, may still\n"
@@ -5282,48 +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>\n"
-"Els moderadors poden esborrar missatges que violin qualsevol d'aquestes "
-"regles.\n"
-"Els autors dels missatges esborrats seran notificats via correu electrònic.\n"
-"Delinqüents poden tenir la capacitat de poder publicar missatges tot hi "
-"estar revocat temporalment\n"
-"(encara que per evitar l'abús només els administradors tenen la capacitat de "
-"fer-ho).\n"
-"Accessos de mala conducta (\"analitzar\" missatges per atrapar a la\n"
-"adreces IP dels altres participants, creació excessiu de missatges per "
-"omplir d'spam\n"
-"els fòrums, etc), mentre que no figuren en les regles formals, pot\n"
-"donar lloc a sancions similars.\n"
-"<p>\n"
-"Si vostè creu que un missatge viola alguna de les regles de compatibilitat,\n"
-"feu clic a la X vermella al pal i omplir el formulari ;\n"
-"els moderadors seran notificats de la seva queixa.\n"
-"Empreu aquest botó només per violacions clares - no\n"
-"disputes personals.\n"
-"<p>\n"
-"Tractem de ser el més just com ens sigui possible, quan a la moderació,\n"
-"però en una gran comunitat d'usuaris, amb molts punts de vista diferents,\n"
-"sempre hi haurà algunes persones que no estaran d'acord\n"
-"amb les nostres decisions de moderació.\n"
-"Si bé lamentem que això passi,\n"
-"tingui en compte que no podem satisfer a tot el poble tot el temps\n"
-"i s'han de prendre decisions basades en els nostres recursos i\n"
-"el que és millor per al fòrum en general.\n"
-"Si us plau, no parlar de la nostra política de moderació en els fòrums. "
-"Nosaltres no som\n"
-"un projecte d'enginyeria social, ni estem en el negoci de crear\n"
-"un sistema perfectament just. Així que aquestes discussions tendeixen a ser "
-"contraproduents\n"
-"i potencialment incendiària. Si vostè té un reclam legítim,\n"
-"enviar un correu electrònic a l'adreça d'abaix.\n"
-"<p>\n"
-"Aquesta política de moderació és fixat per %1 del projecte.\n"
-"Si teniu algun comentari sobre la política, envieu un correu electrònic a %"
-"2.\n"
-"\n"
+msgstr "\n<p>\nEls moderadors poden esborrar missatges que violin qualsevol d'aquestes regles.\nEls autors dels missatges esborrats seran notificats via correu electrònic.\nDelinqüents poden tenir la capacitat de poder publicar missatges tot hi estar revocat temporalment\n(encara que per evitar l'abús només els administradors tenen la capacitat de fer-ho).\nAccessos de mala conducta (\"analitzar\" missatges per atrapar a la\nadreces IP dels altres participants, creació excessiu de missat [...]
 
 #: ../user/pending.php:66
 msgid "Pending credit"
@@ -5369,267 +4993,248 @@ msgstr "No teniu missatges privats."
 msgid "Sender and date"
 msgstr "Envio i data"
 
-#: ../user/pm.php:106
+#: ../user/pm.php:111
 msgid "Reply to this message"
 msgstr "Respondre a aquest missatge"
 
-#: ../user/pm.php:107
+#: ../user/pm.php:112
 msgid "Delete this message"
 msgstr "Esborrar aquest missatge"
 
-#: ../user/pm.php:112
+#: ../user/pm.php:117
 msgid "Select all"
 msgstr "Selecciona-ho tot"
 
-#: ../user/pm.php:114
+#: ../user/pm.php:119
 msgid "Unselect all"
 msgstr "Deseleccionar tots"
 
-#: ../user/pm.php:117
+#: ../user/pm.php:122
 msgid "Delete selected messages"
 msgstr "Esborrar el missatges seleccionats"
 
-#: ../user/pm.php:140
+#: ../user/pm.php:145
 msgid "Sender"
 msgstr "Enviar"
 
-#: ../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 "Necessita omplir tots els camps per enviar un missatge privat"
 
-#: ../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 ""
-"El teu missatge ha estat marcat com correu brossa\n"
-"                per Akismet el sistema anti-correu brossa.\n"
-"                Si us plau, modifica el text i torna a intentar-ho."
+msgstr "El teu missatge ha estat marcat com correu brossa\n                per Akismet el sistema anti-correu brossa.\n                Si us plau, modifica el text i torna a intentar-ho."
 
-#: ../user/pm.php:205
+#: ../user/pm.php:210
 msgid "Could not find user with id %1"
 msgstr "No es pot trobar l'usuari amb l'identificador %1"
 
-#: ../user/pm.php:210
+#: ../user/pm.php:215
 msgid "Could not find user with username %1"
 msgstr "No es pot trobar l'usuari de nom %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 no es un nom d'usuari únic; teniu que utilitzar l'identificador ID"
 
-#: ../user/pm.php:217
+#: ../user/pm.php:222
 msgid "User %1 (ID: %2) is not accepting private messages from you."
 msgstr "L'usuari %1 (ID: %2) no accepta missatges privats de vostè."
 
-#: ../user/pm.php:240 ../user/view_profile.php:26
+#: ../user/pm.php:245 ../user/view_profile.php:28
 msgid "No such user"
 msgstr "No existeix l'usuari"
 
-#: ../user/pm.php:242
+#: ../user/pm.php:247
 msgid "Really block %1?"
 msgstr "Segur de bloquejar %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 ""
-"Està segur que vol bloquejar que l'usuari %1 li enviï missatges privats?"
+msgstr "Està segur que vol bloquejar que l'usuari %1 li enviï missatges privats?"
 
-#: ../user/pm.php:244
+#: ../user/pm.php:249
 msgid "Please note that you can only block a limited amount of users."
-msgstr ""
-"Si us plau, tingui en compte que només pot bloquejar un nombre limitat "
-"d'usuaris."
+msgstr "Si us plau, tingui en compte que només pot bloquejar un nombre limitat d'usuaris."
 
-#: ../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 cop bloquejat un usuari el podeu desbloquejar utilitzant la pàgina de "
-"preferències del fòrum."
+msgstr "Un cop bloquejat un usuari el podeu desbloquejar utilitzant la pàgina de preferències del fòrum."
 
-#: ../user/pm.php:252
+#: ../user/pm.php:257
 msgid "No, cancel"
 msgstr "No, cancel·lar"
 
-#: ../user/pm.php:260 ../user/team_admins.php:98
+#: ../user/pm.php:265 ../user/team_admins.php:100
 msgid "no such user"
 msgstr "aquest usuari no existeix"
 
-#: ../user/pm.php:263
+#: ../user/pm.php:268
 msgid "User %1 blocked"
 msgstr "L'usuari %1 està bloquejat"
 
-#: ../user/pm.php:265
+#: ../user/pm.php:270
 msgid "User %1 has been blocked from sending you private messages."
 msgstr "L'usuari %1 té bloquejat el lliurament de missatges privats a vostè."
 
-#: ../user/pm.php:266
+#: ../user/pm.php:271
 msgid "To unblock, visit %1message board preferences%2"
 msgstr "Per desbloquejar, visiti les %1preferències del panell de missatges%2"
 
-#: ../user/pm.php:302
+#: ../user/pm.php:307
 msgid "Unknown action"
 msgstr "Acció desconeguda"
 
-#: ../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 ""
-"Les seves preferències han estat actualitzades, i\n"
-"          entraràn en efecte quan l'ordinador es comuniqui amb %1\n"
-"          o utilitzi el comando %2Actualitzar%3 de l'Administrador BOINC."
+msgstr "Les seves preferències han estat actualitzades, i\n          entraràn en efecte quan l'ordinador es comuniqui amb %1\n          o utilitzi el comando %2Actualitzar%3 de l'Administrador 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 ""
-"Les teves preferències s'ha restablert als valors predeterminats, i\n"
-"          es faran efectius quan l'equip es comuniqui amb %1\n"
-"          o executis el comando %2 Actualitzar%3 des de l'Administrador de "
-"BOINC."
+msgstr "Les teves preferències s'ha restablert als valors predeterminats, i\n          es faran efectius quan l'equip es comuniqui amb %1\n          o executis el comando %2 Actualitzar%3 des de l'Administrador de 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 de %2"
 
-#: ../user/prefs_edit.php:110
+#: ../user/prefs_edit.php:112
 msgid "Back to preferences"
 msgstr "Tornar a les preferències"
 
-#: ../user/prefs_remove.php:45
+#: ../user/prefs_remove.php:46
 msgid "Confirm delete preferences"
 msgstr "Confirmeu l'eliminació de les preferències"
 
-#: ../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 "Estàs segur que voleu suprimir les preferències independents %1 de %2?"
 
-#: ../user/prefs_remove.php:52
+#: ../user/prefs_remove.php:53
 msgid "Remove preferences"
 msgstr "Eliminar preferències"
 
-#: ../user/prefs_remove.php:54
+#: ../user/prefs_remove.php:55
 msgid "Cancel"
 msgstr "Cancel·lar"
 
-#: ../user/profile_menu.php:35
+#: ../user/profile_menu.php:34 ../user/sample_index.php:119
+msgid "Profiles"
+msgstr "Perfils"
+
+#: ../user/profile_menu.php:37
 msgid ""
 "%1Profiles%2 let individuals share backgrounds and opinions with the %3 "
 "community."
-msgstr ""
-"els %1Perfils%2 permet als usuaris compartir experiències i opinions amb la "
-"comunitat %3."
+msgstr "els %1Perfils%2 permet als usuaris compartir experiències i opinions amb la comunitat %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 ""
-"Explori la diversitat de voluntaris com vostè, i contribueixi amb les seves "
-"opinions per que en gaudeixin altres."
+msgstr "Explori la diversitat de voluntaris com vostè, i contribueixi amb les seves opinions per que en gaudeixin altres."
 
-#: ../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 no ho ha fet encara, pot %1crear el seu propi perfil%2 per que les altres "
-"el puguin veure!"
+msgstr "Si no ho ha fet encara, pot %1crear el seu propi perfil%2 per que les altres el puguin veure!"
 
-#: ../user/profile_menu.php:42
+#: ../user/profile_menu.php:44
 msgid "User of the Day"
 msgstr "Usuari del Dia"
 
-#: ../user/profile_menu.php:57
+#: ../user/profile_menu.php:59
 msgid "User Profile Explorer"
 msgstr "Explorador de Perfils d'Usuari"
 
-#: ../user/profile_menu.php:60
+#: ../user/profile_menu.php:62
 msgid "View the %1User Picture Gallery%2."
 msgstr "Veure la %1Galeria d'Imatges de l'Usuari%2."
 
-#: ../user/profile_menu.php:61
+#: ../user/profile_menu.php:63
 msgid "Browse profiles %1by country%2."
 msgstr "Veure els perfils %1per 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 ""
-"Veure els perfils %1a l'atzar%2, %3a l'atzar amb imatges%2, or %4a l'atzar "
-"sense imatges%2."
+msgstr "Veure els perfils %1a l'atzar%2, %3a l'atzar amb imatges%2, or %4a l'atzar sense imatges%2."
 
-#: ../user/profile_menu.php:66
+#: ../user/profile_menu.php:68
 msgid "Alphabetical profile listings:"
 msgstr "Llistat alfabètic de perfils:"
 
-#: ../user/profile_menu.php:72
+#: ../user/profile_menu.php:74
 msgid "Search profile text"
 msgstr "Cerca un text en el perfil"
 
-#: ../user/profile_menu.php:98
+#: ../user/profile_menu.php:100
 msgid "No profiles"
 msgstr "No hi ha perfils"
 
-#: ../user/profile_menu.php:99
+#: ../user/profile_menu.php:101
 msgid "No profiles matched your query."
 msgstr "No hi ha perfils que coincideixin amb la seva cerca."
 
-#: ../user/profile_rate.php:29
+#: ../user/profile_rate.php:31
 msgid "Invalid vote type:"
 msgstr "Tipus de vot incorrecte:"
 
-#: ../user/profile_rate.php:34
+#: ../user/profile_rate.php:36
 msgid "Vote Recorded"
 msgstr "Vot registrat"
 
-#: ../user/profile_rate.php:38
+#: ../user/profile_rate.php:40
 msgid "Thank you"
 msgstr "Mercès"
 
-#: ../user/profile_rate.php:41
+#: ../user/profile_rate.php:43
 msgid "Your recommendation has been recorded."
 msgstr "La seva recomanació ha estat enregistrada."
 
-#: ../user/profile_rate.php:43
+#: ../user/profile_rate.php:45
 msgid "Your vote to reject this profile has been recorded."
 msgstr "El vot per rebutjar aquest perfil ha estat enregistrat."
 
-#: ../user/profile_rate.php:46
+#: ../user/profile_rate.php:48
 msgid "Return to profile."
 msgstr "Torna al perfil."
 
-#: ../user/profile_search_action.php:36
+#: ../user/profile_search_action.php:38
 msgid "Profiles containing '%1'"
 msgstr "Perfils que continguin '%1'"
 
-#: ../user/profile_search_action.php:40
+#: ../user/profile_search_action.php:42
 msgid "User name"
 msgstr "Nom d'usuari"
 
-#: ../user/profile_search_action.php:41
+#: ../user/profile_search_action.php:43
 msgid "Joined project"
 msgstr "Projecte adjuntat"
 
-#: ../user/profile_search_action.php:44
+#: ../user/profile_search_action.php:46
 msgid "Recent credit"
 msgstr "Crèdit recent"
 
-#: ../user/profile_search_action.php:54
+#: ../user/profile_search_action.php:56
 msgid "No profiles found containing '%1'"
 msgstr "No s'han trobat perfils que continguin '%1'"
 
@@ -5657,149 +5262,61 @@ msgstr "Falta L'ID de l'usuari o del servidor"
 msgid "No tasks to display"
 msgstr "No hi ha tasques per mostrar"
 
-#: ../user/server_status.php:97
-msgid "Running"
-msgstr "Executant"
+#: ../user/sample_index.php:195
+msgid "User of the day"
+msgstr "Usuari del dia"
 
-#: ../user/server_status.php:100
+#: ../user/server_status.php:59
 msgid "Not Running"
 msgstr "Aturat"
 
-#: ../user/server_status.php:103
+#: ../user/server_status.php:63
+msgid "Running"
+msgstr "Executant"
+
+#: ../user/server_status.php:67
 msgid "Disabled"
 msgstr "Desactivat"
 
-#: ../user/server_status.php:231
+#: ../user/server_status.php:105
 msgid "Project status"
 msgstr "Estat del projecte"
 
-#: ../user/server_status.php:233
-msgid "Server software version: %1"
-msgstr "Versió del programari servidor: %1"
+#: ../user/server_status.php:110
+msgid "Server status"
+msgstr "Estat del 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 "Ordinador central"
 
-#: ../user/server_status.php:252
-msgid "data-driven web pages"
-msgstr "pàgines web amb dades auto-actualizables"
-
-#: ../user/server_status.php:258
-msgid "upload/download server"
-msgstr "carregar/baixar del servidor"
-
-#: ../user/server_status.php:261
-msgid "scheduler"
-msgstr "planificador"
-
-#: ../user/server_status.php:294
-msgid "Running:"
-msgstr "Executant:"
-
-#: ../user/server_status.php:295
-msgid "Program is operating normally"
-msgstr "El programa està funcionant amb normalitat"
+#: ../user/server_status.php:125
+msgid "Database schema version: "
+msgstr "Versió de l'esquema de la base de dades:"
 
-#: ../user/server_status.php:296
-msgid "Not Running:"
-msgstr "No s'està executant:"
-
-#: ../user/server_status.php:297
-msgid "Program failed or the project is down"
-msgstr "El programa a fallat o el projecte està aturat"
-
-#: ../user/server_status.php:298
-msgid "Disabled:"
-msgstr "Desactivat:"
-
-#: ../user/server_status.php:299
-msgid "Program is disabled"
-msgstr "El programa està desactivat"
-
-#: ../user/server_status.php:303
+#: ../user/server_status.php:134
 msgid "Computing status"
 msgstr "Estat del comput"
 
-#: ../user/server_status.php:309
-msgid "The database server is not accessible"
-msgstr "El servidor de base de dades no és accessible"
-
-#: ../user/server_status.php:326
-msgid "Tasks ready to send"
-msgstr "Tasques a punt per enviar"
-
-#: ../user/server_status.php:331 ../user/workunit.php:55
-msgid "Tasks in progress"
-msgstr "Tasques en curs"
-
-#: ../user/server_status.php:336
-msgid "Workunits waiting for validation"
-msgstr "Workunits esperant la validació"
-
-#: ../user/server_status.php:341
-msgid "Workunits waiting for assimilation"
-msgstr "Workunits esperant l'assimilació"
-
-#: ../user/server_status.php:346
-msgid "Workunits waiting for file deletion"
-msgstr "Workunits esperant l'eliminació d'arxius"
-
-#: ../user/server_status.php:351
-msgid "Tasks waiting for file deletion"
-msgstr "Tasques esperan l'eliminació d'arxius"
-
-#: ../user/server_status.php:367
-msgid "Transitioner backlog (hours)"
-msgstr "Retard en les transicións (hores)"
-
-#: ../user/server_status.php:374
+#: ../user/server_status.php:149
 msgid "Users"
 msgstr "Usuaris"
 
-#: ../user/server_status.php:377 ../user/server_status.php:395
-msgid "with recent credit"
-msgstr "amb crèdit recent"
-
-#: ../user/server_status.php:382 ../user/server_status.php:400
-msgid "with credit"
-msgstr "amb crèdit"
-
-#: ../user/server_status.php:387 ../user/server_status.php:405
-msgid "registered in past 24 hours"
-msgstr "registrats en les últimes 24 hores"
-
-#: ../user/server_status.php:411
-msgid "current GigaFLOPs"
-msgstr "GigaFLOPs actuals"
-
-#: ../user/server_status.php:420
+#: ../user/server_status.php:161
 msgid "Tasks by application"
 msgstr "Tasques per aplicació"
 
-#: ../user/server_status.php:423 ../user/workunit.php:40
-msgid "application"
-msgstr "aplicació"
-
-#: ../user/server_status.php:424
-msgid "unsent"
-msgstr "no enviat"
-
-#: ../user/server_status.php:425
-msgid "in progress"
-msgstr "en progrés"
+#: ../user/server_status.php:164
+msgid "Runtime of last 100 tasks in hours: average, min, max"
+msgstr "Mitjana de temps d'execució dels últims 100 resultats en hores: mitjana, mín, màx"
 
-#: ../user/server_status.php:426
-msgid "avg runtime of last 100 results in h (min-max)"
-msgstr "mitjana de temps d'execució dels últims 100 resultats en h (mín-màx)"
-
-#: ../user/server_status.php:427
-msgid "users in last 24h"
-msgstr "usuaris en les últimes 24 hores"
+#: ../user/server_status.php:165
+msgid "Users in last 24 hours"
+msgstr "Usuaris en les últimes 24 hores"
 
 #: ../user/show_host_detail.php:40
 msgid "Computer %1"
@@ -5809,753 +5326,700 @@ msgstr "Ordinador %1"
 msgid "Statistics and leaderboards"
 msgstr "Estadístiques i funcionament dels plafons"
 
-#: ../user/stats.php:28
+#: ../user/stats.php:30
 msgid "Statistics for %1"
 msgstr "Estadístiques de %1"
 
-#: ../user/stats.php:37
+#: ../user/stats.php:32 ../user/top_users.php:117
+msgid "Top participants"
+msgstr "Participants principals"
+
+#: ../user/stats.php:40 ../user/team.php:48
+msgid "Top teams"
+msgstr "Grups principals"
+
+#: ../user/stats.php:47
+msgid "Top computers"
+msgstr "Ordinadors principals"
+
+#: ../user/stats.php:48
+msgid "GPU models"
+msgstr "Models GPU"
+
+#: ../user/stats.php:49
+msgid "CPU models"
+msgstr "models CPU"
+
+#: ../user/stats.php:53
 msgid ""
-"More detailed statistics for %1 and other BOINC-based projects are available "
-"at several web sites:"
-msgstr ""
-"Estadístiques mes detallades de %1 i altres projectes BOINC disponibles a "
-"diverses pàgines web:"
+"More detailed statistics for %1 and other BOINC-based projects are available"
+" at several web sites:"
+msgstr "Estadístiques mes detallades de %1 i altres projectes BOINC disponibles a diverses pàgines web:"
 
-#: ../user/stats.php:40
+#: ../user/stats.php:56
 msgid ""
-"You can also get your current statistics in the form of a \"signature image"
-"\":"
+"You can also get your current statistics in the form of a \"signature "
+"image\":"
 msgstr "També pot obtenir les seves estadístiques en forma de \"imatge\":"
 
-#: ../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 ""
-"També pot obtenir les seves estadístiques individuals com a suma de tots els "
-"projectes BOINC a partir de diverses pàgines web; vegi la seva %1pàgina "
-"principal%2."
+msgstr "També pot obtenir les seves estadístiques individuals com a suma de tots els projectes BOINC a partir de diverses pàgines web; vegi la seva %1pàgina principal%2."
 
 #: ../user/team.php:27
+msgid "Teams"
+msgstr "Equips"
+
+#: ../user/team.php:29
 msgid "%1 participants may form %2teams%3."
 msgstr "%1 participants poden formar %2equips%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 ""
-"Només podeu pertànyer a un equip. Us podeu adjuntar o separar en qualsevol "
-"moment."
+msgstr "Només podeu pertànyer a un equip. Us podeu adjuntar o separar en qualsevol moment."
 
-#: ../user/team.php:31
+#: ../user/team.php:33
 msgid "Each team has a %1founder%2 who may:"
 msgstr "Cada equip te un %1fondador%2 que pot:"
 
-#: ../user/team.php:33
+#: ../user/team.php:35
 msgid "access team members' email addresses"
 msgstr "accés a les adreces de correu electrònic dels membres de l'equip"
 
-#: ../user/team.php:34
+#: ../user/team.php:36
 msgid "edit the team's name and description"
 msgstr "editar el nom i descripció de l'equip"
 
-#: ../user/team.php:35
+#: ../user/team.php:37
 msgid "add or remove team admins"
 msgstr "afegir o treure administradors d'equip"
 
-#: ../user/team.php:36
+#: ../user/team.php:38
 msgid "remove members from the team"
 msgstr "eliminar membres de l'equip"
 
-#: ../user/team.php:37
+#: ../user/team.php:39
 msgid "disband a team if it has no members"
 msgstr "dissoldre un equip si no te membres"
 
-#: ../user/team.php:40
+#: ../user/team.php:42
 msgid "To join a team, visit its team page and click %1Join this team%2."
-msgstr ""
-"Per adjuntar-vos a u equip, visiteu la seva pàgina i premeu %1Adjuntar-se a "
-"aquest equip%2."
+msgstr "Per adjuntar-vos a u equip, visiteu la seva pàgina i premeu %1Adjuntar-se a aquest equip%2."
 
-#: ../user/team.php:41 ../user/team_search.php:180
+#: ../user/team.php:43 ../user/team_search.php:201
 msgid "Find a team"
 msgstr "Trobar un grup"
 
-#: ../user/team.php:48
+#: ../user/team.php:50
 msgid "All teams"
 msgstr "Tots els equips"
 
-#: ../user/team.php:52
+#: ../user/team.php:54
 msgid "%1 teams"
 msgstr "%1 equips"
 
-#: ../user/team.php:58
+#: ../user/team.php:60
 msgid "Create a new team"
 msgstr "Crear un nou equip"
 
-#: ../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 no troba un equip que sigui adequat per a vostè, pot %1crear un equip%2."
+msgstr "Si no troba un equip que sigui adequat per a vostè, pot %1crear un equip%2."
 
-#: ../user/team_admins.php:34
+#: ../user/team_admins.php:36
 msgid "Remove Team Admin status from this member"
 msgstr "Treure l'estatus d'Administrador de l'Equip a aquest membre"
 
-#: ../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 "Afegir o treure Administradors d'Equip"
 
-#: ../user/team_admins.php:41
+#: ../user/team_admins.php:43
 msgid "You can select team members as 'Team Admins'. Team Admins can:"
-msgstr ""
-"Vostè pot seleccionar els membres de l'equip com a 'Equip d'Administradors'. "
-"L'Equip d'Administradors pot:"
+msgstr "Vostè pot seleccionar els membres de l'equip com a 'Equip d'Administradors'. L'Equip d'Administradors pot:"
 
-#: ../user/team_admins.php:43
+#: ../user/team_admins.php:45
 msgid "Edit team information (name, URL, description, country)"
 msgstr "Editar la informació de l'equip (nom, URL, descripció, país)"
 
-#: ../user/team_admins.php:44
+#: ../user/team_admins.php:46
 msgid "View the team's join/quit history"
 msgstr "Veure l'historial unir-se/separar-se de l'equip"
 
-#: ../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 el fòrum d'equip, si és el cas (els administradors reben "
-"notificacions per de correu electrònic de la moderació i marca en vermell X "
-"informes)"
+"Moderate the team forum, if any (admins get email notification of moderation"
+" events and red X reports)"
+msgstr "Moderar el fòrum d'equip, si és el cas (els administradors reben notificacions per de correu electrònic de la moderació i marca en vermell X informes)"
 
-#: ../user/team_admins.php:47
+#: ../user/team_admins.php:49
 msgid "Team Admins cannot:"
 msgstr "Els Administradors de l'equip no poden:"
 
-#: ../user/team_admins.php:49
+#: ../user/team_admins.php:51
 msgid "Change the team founder"
 msgstr "Canviar el fundador de l'equip"
 
-#: ../user/team_admins.php:50 ../user/team_manage.php:54
+#: ../user/team_admins.php:52 ../user/team_manage.php:56
 msgid "Remove members"
 msgstr "Eliminar 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 un administrador de l'equip deixa l'equip, deixerà de ser un "
-"administrador de l'equip."
+msgstr "Si un administrador de l'equip deixa l'equip, deixerà de ser un administrador de l'equip."
 
-#: ../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 ""
-"Us recomanem que seleccioneu només les persones conegudes i de confieu molt "
-"bé com Administradors de l'Equip."
+msgstr "Us recomanem que seleccioneu només les persones conegudes i de confieu molt bé com Administradors de l'Equip."
 
-#: ../user/team_admins.php:59
+#: ../user/team_admins.php:61
 msgid "There are currently no Team Admins"
 msgstr "Actualment no hi ha cap Administrador d'Equip"
 
-#: ../user/team_admins.php:61
+#: ../user/team_admins.php:63
 msgid "Current Team Admins"
 msgstr "Administradors d'Equip actuals"
 
-#: ../user/team_admins.php:62
+#: ../user/team_admins.php:64
 msgid "Became Team Admin on"
 msgstr "Fer-se Administrador d'Equip de"
 
-#: ../user/team_admins.php:77
+#: ../user/team_admins.php:79
 msgid "Add Team Admin"
 msgstr "Afegir un Administrador d'Equip"
 
-#: ../user/team_admins.php:78
+#: ../user/team_admins.php:80
 msgid "Email address of team member:"
 msgstr "Adreça de correu electrònic dels membres de l'equip:"
 
-#: ../user/team_admins.php:90
+#: ../user/team_admins.php:81
+msgid "Add"
+msgstr "Afegir"
+
+#: ../user/team_admins.php:92
 msgid "failed to remove admin"
 msgstr "no s'ha pogut eliminar l'administrador"
 
-#: ../user/team_admins.php:99
+#: ../user/team_admins.php:101
 msgid "User is not member of team"
 msgstr "L'usuari no és membre de l'equip"
 
-#: ../user/team_admins.php:101
+#: ../user/team_admins.php:103
 msgid "%1 is already an admin of %2"
 msgstr "%1 ja és un administrador de %2"
 
-#: ../user/team_admins.php:105
+#: ../user/team_admins.php:107
 msgid "Couldn't add admin"
 msgstr "No s'ha pogut afegir l'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 "Aquest equip no existeix"
 
-#: ../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 "aquest equip no existeix"
 
-#: ../user/team_change_founder_action.php:38
+#: ../user/team_change_founder_action.php:40
 msgid "User is not a member of %1"
 msgstr "L'usuari no és membre de %1"
 
-#: ../user/team_change_founder_action.php:41
+#: ../user/team_change_founder_action.php:43
 msgid "Changing founder of %1"
 msgstr "Canviant el 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 és ara el fundador de %2"
 
-#: ../user/team_change_founder_form.php:37
+#: ../user/team_change_founder_form.php:39
 msgid "Change founder of %1"
 msgstr "Canviar el 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 ""
-"El membre de l'equip %1, va fer una petició al fundador d'aquest equip el %"
-"2, però ha deixat l'equip. per tant es cancel.la la petició."
+msgstr "El membre de l'equip %1, va fer una petició al fundador d'aquest equip el %2, però ha deixat l'equip. per tant es cancel.la la petició."
 
-#: ../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 ""
-"El membre de l'equip %1 ha contactat el fundador d'aquest equip. Això pot "
-"ser degut a que va deixar l'equip o no han tingut contacte amb l'equip "
-"durant molt de temps."
+msgstr "El membre de l'equip %1 ha contactat el fundador d'aquest equip. Això pot ser degut a que va deixar l'equip o no han tingut contacte amb l'equip durant molt de temps."
 
-#: ../user/team_change_founder_form.php:55
+#: ../user/team_change_founder_form.php:57
 msgid "decline request"
 msgstr "rebutjar la petició"
 
-#: ../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 no rebutja la petició de %1, %2 tindrà l'opció d'assumir la fundació de "
-"l'equip.<br /><br />\n"
-"                  Per acceptar la petició, assignar el fundador a %3 a "
-"través del formulari de sota."
+"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 no rebutja la petició de %1, %2 tindrà l'opció d'assumir la fundació de l'equip.<br /><br />\n                  Per acceptar la petició, assignar el fundador a %3 a través del formulari de sota."
 
-#: ../user/team_change_founder_form.php:66
+#: ../user/team_change_founder_form.php:68
 msgid "No transfer request is pending."
 msgstr "Cap sol·licitud de transferència està pendent."
 
-#: ../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 ""
-"Per assignar fundador d'aquest equip a un altre membre, marqui la casella al "
-"costat del nom d'usuari i a continuació faci clic a <strong>Canviar "
-"fundador</strong>."
+msgstr "Per assignar fundador d'aquest equip a un altre membre, marqui la casella al costat del nom d'usuari i a continuació faci clic a <strong>Canviar fundador</strong>."
 
-#: ../user/team_change_founder_form.php:76
+#: ../user/team_change_founder_form.php:78
 msgid "New founder?"
 msgstr "Nou 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 "Canviar el 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 "No hi ha usuaris als que transferir l'equip."
 
-#: ../user/team_create_action.php:29
+#: ../user/team_create_action.php:31
 msgid "You must choose a non-blank team name"
 msgstr "Ha d'escollir un nom d'equip que no sigui en blanc"
 
-#: ../user/team_create_action.php:34
+#: ../user/team_create_action.php:36
 msgid "A team named %1 already exists - try another name"
 msgstr "Ja existeix un equip de nom %1 - provi un altre nom"
 
-#: ../user/team_create_action.php:54
+#: ../user/team_create_action.php:56
 msgid "Could not create team - please try later."
 msgstr "No es pot crear l'equip - si us plau provi-ho més 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 "Crear un equip"
 
-#: ../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 ""
-"Vostè pertany a %1. Vostè ha de %2separar-se d'aquest equip%3 abans de "
-"crear-ne un de nou."
+msgstr "Vostè pertany a %1. Vostè ha de %2separar-se d'aquest equip%3 abans de crear-ne un de nou."
 
-#: ../user/team_delta.php:65
+#: ../user/team_delta.php:66
 msgid "Not founder or admin"
 msgstr "No hi ha fundador o administrador"
 
-#: ../user/team_delta.php:72
+#: ../user/team_delta.php:73
 msgid "Team history for %1"
 msgstr "Història de l'equip per %1"
 
-#: ../user/team_delta.php:75
+#: ../user/team_delta.php:76
 msgid "When"
 msgstr "Quan"
 
-#: ../user/team_delta.php:76
+#: ../user/team_delta.php:77
 msgid "User"
 msgstr "Usuari"
 
-#: ../user/team_delta.php:77
+#: ../user/team_delta.php:78
 msgid "Action"
 msgstr "Acció"
 
-#: ../user/team_delta.php:78
+#: ../user/team_delta.php:79
 msgid "Total credit at time of action"
 msgstr "Crèdit total en el moment de l'acció"
 
-#: ../user/team_edit_action.php:53
+#: ../user/team_edit_action.php:55
 msgid "bad country"
 msgstr "pais erroni"
 
-#: ../user/team_edit_action.php:59
+#: ../user/team_edit_action.php:61
 msgid "The name '%1' is being used by another team."
 msgstr "El nom de '%1' està sent utilitzat per un altre equip."
 
-#: ../user/team_edit_action.php:62
+#: ../user/team_edit_action.php:64
 msgid "Must specify team name"
 msgstr "Heu d'especificar el nom de l'equip"
 
-#: ../user/team_edit_action.php:90
+#: ../user/team_edit_action.php:92
 msgid "Could not update team - please try again later."
 msgstr "No es pot actualitzar l'equip - si us plau provi-ho més tard."
 
-#: ../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 "Actualitzar la informació de l'equip"
 
-#: ../user/team_email_list.php:61
+#: ../user/team_email_list.php:70
 msgid "%1 Email List"
 msgstr "%1 Llista de correu electrònic"
 
-#: ../user/team_email_list.php:63
+#: ../user/team_email_list.php:72
 msgid "Member list of %1"
 msgstr "Llista de membres de %1"
 
-#: ../user/team_email_list.php:78
+#: ../user/team_email_list.php:87
 msgid "Show as plain text"
 msgstr "Mostra com text pla"
 
-#: ../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 "Crear un Tauler de Missatges"
 
-#: ../user/team_forum.php:29
+#: ../user/team_forum.php:31
 msgid "You may create a message board for use by %1."
 msgstr "Vostè pot crear un tauler de missatges per a l'ús de %1."
 
-#: ../user/team_forum.php:31
+#: ../user/team_forum.php:33
 msgid "Only team members will be able to post."
 msgstr "Només els membres de l'equip podràn publicar-hi."
 
-#: ../user/team_forum.php:32
+#: ../user/team_forum.php:34
 msgid "At your option, only members will be able to read."
 msgstr "En la seva opció, només els membres ho podran llegir."
 
-#: ../user/team_forum.php:33
+#: ../user/team_forum.php:35
 msgid "You and your Team Admins will have moderator privileges."
 msgstr "Vostè i el seus Administradors d'Equip tindran privilegis de moderador."
 
-#: ../user/team_forum.php:40
+#: ../user/team_forum.php:42
 msgid "Create a message board for %1"
 msgstr "Crea un tauler de missatges per %1"
 
-#: ../user/team_forum.php:48
+#: ../user/team_forum.php:50
 msgid "Team already has a message board"
 msgstr "L'equip ja té un tauler de missatges"
 
-#: ../user/team_forum.php:59
+#: ../user/team_forum.php:61
 msgid "Team Message Board"
 msgstr "Tauler de Missatges de l'Equip"
 
-#: ../user/team_forum.php:71
+#: ../user/team_forum.php:73
 msgid "Minimum time between posts (seconds)"
 msgstr "Temps mínim entre peticions (segons)"
 
-#: ../user/team_forum.php:74
+#: ../user/team_forum.php:76
 msgid "Minimum total credit to post"
 msgstr "Crèdit total mínim per a enviar"
 
-#: ../user/team_forum.php:77
+#: ../user/team_forum.php:79
 msgid "Minimum average credit to post"
 msgstr "Crèdit mitja mínim per enviar"
 
-#: ../user/team_forum.php:80
+#: ../user/team_forum.php:82
 msgid "Submit"
 msgstr "Enviar"
 
-#: ../user/team_forum.php:89
+#: ../user/team_forum.php:91
 msgid "Remove your team's message board."
 msgstr "Eliminar el tauler d'missatges del seu equip."
 
-#: ../user/team_forum.php:97
+#: ../user/team_forum.php:99
 msgid "Really remove message board?"
 msgstr "Realment vol eliminar el tauler d'missatges?"
 
-#: ../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 ""
-"Esteu segur que voleu eliminar tauler d'missatges del seu equip? Tots els "
-"fils i missatges s'eliminaràn definitivament. (Vostè podrà, però, crear més "
-"endavant un nou tauler d'missatges)."
+msgstr "Esteu segur que voleu eliminar tauler d'missatges del seu equip? Tots els fils i missatges s'eliminaràn definitivament. (Vostè podrà, però, crear més endavant un nou tauler d'missatges)."
 
-#: ../user/team_forum.php:100
+#: ../user/team_forum.php:102
 msgid "Yes - remove message board"
 msgstr "Si - eliminar el tauler de missatges"
 
-#: ../user/team_forum.php:121
+#: ../user/team_forum.php:123
 msgid "Message board removed"
 msgstr "Tauler de missatges eliminat"
 
-#: ../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 ""
-"El tauler d'missatges del seu equip s'ha eliminat. Vostè ara pot %1crear-ne "
-"un de nou%2."
+"Your team's message board has been removed. You may now %1create a new "
+"one%2."
+msgstr "El tauler d'missatges del seu equip s'ha eliminat. Vostè ara pot %1crear-ne un de nou%2."
 
-#: ../user/team_forum.php:143
+#: ../user/team_forum.php:145
 msgid "Team Message Board Updated"
 msgstr "Taule de Missatges de l'Equip actualitzat"
 
-#: ../user/team_forum.php:144
+#: ../user/team_forum.php:146
 msgid "Update successful"
 msgstr "Actualització satisfactoria"
 
-#: ../user/team_forum.php:147
+#: ../user/team_forum.php:149
 msgid "Update failed"
 msgstr "Error en l'actualització"
 
-#: ../user/team_forum.php:154
+#: ../user/team_forum.php:156
 msgid "Team has no forum"
 msgstr "L'equip no té cap 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 "Vostè ha de ser un membre d'un equip per accedir a aquesta pàgina."
 
-#: ../user/team_founder_transfer_action.php:90
+#: ../user/team_founder_transfer_action.php:92
 msgid "Requesting foundership of %1"
 msgstr "Sol.licitud al fundador 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 ""
-"El fundador actual ha estat notificat de la seva petició per correu "
-"electrònic i missatge privat.<br /><br />\n"
-"                       Si el fundador no respon dins de 60 dies vostèpodrà "
-"convertir-se en el fundador."
+"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 "El fundador actual ha estat notificat de la seva petició per correu electrònic i missatge privat.<br /><br />\n                       Si el fundador no respon dins de 60 dies vostèpodrà convertir-se en el 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 "La petició al fundador no es pot fer en aquest moments"
 
-#: ../user/team_founder_transfer_action.php:109
+#: ../user/team_founder_transfer_action.php:111
 msgid "Assumed foundership of %1"
 msgstr "Assumit com fundador 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 ""
-"Felicitacions, vostè és ara el fundador de l'equip %1. Vagi a %2Pàgina del "
-"seu compte%3 per a trobar les opcions d'administració de l'equip."
+msgstr "Felicitacions, vostè és ara el fundador de l'equip %1. Vagi a %2Pàgina del seu compte%3 per a trobar les opcions d'administració de l'equip."
 
-#: ../user/team_founder_transfer_action.php:120
+#: ../user/team_founder_transfer_action.php:122
 msgid "Decline founder change request"
 msgstr "Rebutjar la petició de canvi 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 "La petició de fundador de %1 ha estat rebutjada."
 
-#: ../user/team_founder_transfer_action.php:130
+#: ../user/team_founder_transfer_action.php:132
 msgid "There were no foundership requests."
 msgstr "No hi han peticions de fundador."
 
-#: ../user/team_founder_transfer_action.php:134
+#: ../user/team_founder_transfer_action.php:136
 msgid "undefined action %1"
 msgstr "acció %1 desconeguda"
 
-#: ../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 "Tornar a la pàgina de l'equip"
 
-#: ../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 "Vostè necessita ser un membre d'un equip per accedir a aquesta pàgina."
 
-#: ../user/team_founder_transfer_form.php:31
+#: ../user/team_founder_transfer_form.php:33
 msgid "Request foundership of %1"
 msgstr "Petició de fundador 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 "Ara es fundador de l'equip %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 "La seva petició de fundador de %1 a %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 ""
-"han transcorregut 60 dies des de la seva petició, i el fundador no ha "
-"respost. Ara pot convertir-se en fundador fent clic aquí:"
+msgstr "han transcorregut 60 dies des de la seva petició, i el fundador no ha respost. Ara pot convertir-se en fundador fent clic aquí:"
 
-#: ../user/team_founder_transfer_form.php:50
+#: ../user/team_founder_transfer_form.php:52
 msgid "Assume foundership"
 msgstr "Convertir-se en fundador"
 
-#: ../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 ""
-"El fundador va ser notificat de la seva petició. Si ell/ella no respon per %"
-"1 se li donarà l'opció de convertir-se en el fundador."
+msgstr "El fundador va ser notificat de la seva petició. Si ell/ella no respon per %1 se li donarà l'opció de convertir-se en el 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"
+"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 el fundador de l'equip no està actiu i vol assumir el paper de fundador, "
-"feu clic al botó de sota.  Al fundador actual se li enviarà un correu "
-"electrònicdetallant la seva petició, i podrà transferir-li la fundació a "
-"vostè oper rebutjar la seva petició. Si el fundador no respon en 60 dies, "
-"vostèpodrà convertir-se en el fundador.<br /><br />\n"
-"                       Esta segur que vol realitzar petició al fundador?"
-
-#: ../user/team_founder_transfer_form.php:65
+msgstr "Si el fundador de l'equip no està actiu i vol assumir el paper de fundador, feu clic al botó de sota.  Al fundador actual se li enviarà un correu electrònicdetallant la seva petició, i podrà transferir-li la fundació a vostè oper rebutjar la seva petició. Si el fundador no respon en 60 dies, vostèpodrà convertir-se en el fundador.<br /><br />\n                       Esta segur que vol realitzar petició al fundador?"
+
+#: ../user/team_founder_transfer_form.php:67
 msgid "Request foundership"
 msgstr "Petició al fundador"
 
-#: ../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 "La petició de canvi de fundador ja ha estat feta per %1 a %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 ""
-"Una petició de canvi de fundador s0ha fet en els últims 90 dies, per tant no "
-"es permetent noves peticions. Torneu-ho a provar més tard."
+msgstr "Una petició de canvi de fundador s0ha fet en els últims 90 dies, per tant no es permetent noves peticions. Torneu-ho a provar més tard."
 
-#: ../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 "No està permés unir-se al l'equip %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 "Ja es 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 "Vostè ja és 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 "No es pot unir a l'equip - si us plau provi-ho més tard."
 
-#: ../user/team_join_action.php:40
+#: ../user/team_join_action.php:42
 msgid "Joined %1"
 msgstr "Antiguitat %1"
 
-#: ../user/team_join_action.php:41
+#: ../user/team_join_action.php:43
 msgid "You have joined %1."
 msgstr "S'ha unit a %1."
 
-#: ../user/team_join_form.php:32
+#: ../user/team_join_form.php:34
 msgid "Join %1"
 msgstr "Uneix-te a %1"
 
-#: ../user/team_join_form.php:33
+#: ../user/team_join_form.php:35
 msgid "Please note:"
 msgstr "Tingueu en compte:"
 
-#: ../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 ""
-"Unir-se a un equip li dóna accés al seu fundador a la seva adreça de correu "
-"electrònic."
+msgstr "Unir-se a un equip li dóna accés al seu fundador a la seva adreça de correu electrònic."
 
-#: ../user/team_join_form.php:36
+#: ../user/team_join_form.php:38
 msgid "Joining a team does not affect your account's credit."
 msgstr "Unir-se a un equip no afecta el crèdit del compte."
 
-#: ../user/team_join_form.php:43
+#: ../user/team_join_form.php:45
 msgid "Join team"
 msgstr "Unir-se a l'equip"
 
-#: ../user/team_lookup.php:84
+#: ../user/team_lookup.php:86
 msgid "Search Results"
 msgstr "Resultats de la cerca"
 
-#: ../user/team_lookup.php:86
+#: ../user/team_lookup.php:88
 msgid "Search results for '%1'"
 msgstr "Resultats de la cerca per '%1'"
 
-#: ../user/team_lookup.php:88
+#: ../user/team_lookup.php:90
 msgid "You may view these teams' members, statistics, and information."
-msgstr ""
-"Vostè pot veure els membres d'aquests equips, les estadístiques i la "
-"informació."
+msgstr "Vostè pot veure els membres d'aquests equips, les estadístiques i la informació."
 
-#: ../user/team_lookup.php:98
+#: ../user/team_lookup.php:100
 msgid "More than 100 teams match your search. The first 100 are shown."
 msgstr "Hi han més de 100 equips en la cerca. Es mostren els 100 primers."
 
-#: ../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 ""
-"Fi dels resultats. %1 Si no pot trobar l'equip que està buscant, vostè "
-"mateix pot %2crear un equip%3."
+"End of results. %1 If you cannot find the team you are looking for, you may "
+"%2create a team%3 yourself."
+msgstr "Fi dels resultats. %1 Si no pot trobar l'equip que està buscant, vostè mateix pot %2crear un equip%3."
 
-#: ../user/team_manage.php:26
+#: ../user/team_manage.php:28
 msgid "Team administration for %1"
 msgstr "Equip d'administració de %1"
 
-#: ../user/team_manage.php:29
+#: ../user/team_manage.php:31
 msgid "Edit team info"
 msgstr "Edita la informació de l'equip"
 
-#: ../user/team_manage.php:30
+#: ../user/team_manage.php:32
 msgid "Change team name, URL, description, type, or country"
 msgstr "Canviar el nom de l'equip, URL, descripció, tipus, o país"
 
-#: ../user/team_manage.php:32
+#: ../user/team_manage.php:34
 msgid "Member list:"
 msgstr "Llista de 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 "text"
 
-#: ../user/team_manage.php:35
+#: ../user/team_manage.php:37
 msgid "View member names and email addresses"
 msgstr "Veure els noms dels membres i adreces de correu electrònic"
 
-#: ../user/team_manage.php:36
+#: ../user/team_manage.php:38
 msgid "View change history:"
 msgstr "Veure l'historial de canvis:"
 
-#: ../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 "Veure quan s'uneixen membres o abandonan aquest equip"
 
-#: ../user/team_manage.php:50
+#: ../user/team_manage.php:52
 msgid "Respond to foundership request."
 msgstr "Respondre a la sol·licitud del fundador."
 
-#: ../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 no respon per %1, %2 pot assumir la fundació d'aquest equip."
 
-#: ../user/team_manage.php:55
+#: ../user/team_manage.php:57
 msgid "Remove inactive or unwanted members from this team"
 msgstr "Eliminar membres inactius o no desitjats d'aquest equip"
 
-#: ../user/team_manage.php:57
+#: ../user/team_manage.php:59
 msgid "Transfer foundership to another member"
 msgstr "Tansferir la fundació a un altre membre"
 
-#: ../user/team_manage.php:58
+#: ../user/team_manage.php:60
 msgid "Add/remove Team Admins"
 msgstr "Afegir/Eliminar Administradors de l'Equip"
 
-#: ../user/team_manage.php:59
+#: ../user/team_manage.php:61
 msgid "Give selected team members Team Admin privileges"
 msgstr "Donar als membres seleccionats privilegis d'Administrador de l'Equip"
 
-#: ../user/team_manage.php:61
+#: ../user/team_manage.php:63
 msgid "Remove team"
 msgstr "Eliminar equip"
 
-#: ../user/team_manage.php:62
+#: ../user/team_manage.php:64
 msgid "Allowed only if team has no members"
 msgstr "Només es permet si l'equip no té membres"
 
-#: ../user/team_manage.php:64
+#: ../user/team_manage.php:66
 msgid "Create or manage a team message board"
 msgstr "Crear o gestionar un taulell de missatges de l'equip"
 
-#: ../user/team_manage.php:71
-msgid ""
-"To have this team created on all BOINC projects (current and future) you can "
-"make it into a %1BOINC-wide team%2."
-msgstr ""
-"Per que aquest equip es crei a tots els projectes BOINC (actuals i futurs) "
-"pot convertir-lo en un %1equip Boinc-gloval%2."
-
 #: ../user/team_manage.php:73
 msgid ""
-"Team admins are encouraged to join and participate in the Google %1boinc-"
-"team-founders%2 group."
-msgstr ""
-"Animem als administradors d'equip a unir-se i participar en el grup Google "
-"de %1fundadors-d'equips-boinc%2."
+"To have this team created on all BOINC projects (current and future) you can"
+" make it into a %1BOINC-wide team%2."
+msgstr "Per que aquest equip es crei a tots els projectes BOINC (actuals i futurs) pot convertir-lo en un %1equip Boinc-gloval%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 ""
-"Altres recursos per a administradors d'equip BOINC estan disponibles en un "
-"lloc de tercers, %1www.boincteams.com%2."
+"Team admins are encouraged to join and participate in the Google %1boinc-"
+"team-founders%2 group."
+msgstr "Animem als administradors d'equip a unir-se i participar en el grup Google de %1fundadors-d'equips-boinc%2."
 
 #: ../user/team_manage.php:91
 msgid "Can't delete non-empty team"
@@ -6565,133 +6029,114 @@ msgstr "No es pot eliminar equip que no estigui buit"
 msgid "Team %1 deleted"
 msgstr "Equip %1 eliminat"
 
-#: ../user/team_members.php:36
+#: ../user/team_members.php:38
 msgid "Limit exceeded:  Can only display the first 1000 members."
 msgstr "Límit superat:  Només es poden mostrar els primers 1000 membres."
 
-#: ../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 "No es pot deixar d'equip"
 
-#: ../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 "Equip no existeix, o que no pertanyen a ella."
 
-#: ../user/team_quit_form.php:31
+#: ../user/team_quit_form.php:33
 msgid "Quit %1"
 msgstr "Sortir de %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"
-"         <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>Tingueu en compte abans de sortir d'un equip:</strong>\n"
-"         <ul>\n"
-"         <li>Si surt d'un equip, pot tornar-hi més tard, o unir-se a "
-"qualsevol altre equip que desitji\n"
-"         <li>Deixar un equip no afecta de cap manera en el seu crèdit "
-"estadístic personal.\n"
+"         <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>Tingueu en compte abans de sortir d'un equip:</strong>\n         <ul>\n         <li>Si surt d'un equip, pot tornar-hi més tard, o unir-se a qualsevol altre equip que desitji\n         <li>Deixar un equip no afecta de cap manera en el seu crèdit estadístic personal.\n         </ul>"
 
-#: ../user/team_quit_form.php:40
+#: ../user/team_quit_form.php:42
 msgid "Quit Team"
 msgstr "Deixar l'equip"
 
-#: ../user/team_remove_inactive_action.php:31
+#: ../user/team_remove_inactive_action.php:33
 msgid "Removing users from %1"
 msgstr "Eliminació dels usuaris 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 no és membre de %2"
 
-#: ../user/team_remove_inactive_action.php:42
+#: ../user/team_remove_inactive_action.php:44
 msgid "%1 has been removed"
 msgstr "%1 ha estat eliminat"
 
-#: ../user/team_remove_inactive_form.php:32
+#: ../user/team_remove_inactive_form.php:34
 msgid "Remove members from %1"
 msgstr "Eliminar membres de %1"
 
-#: ../user/team_remove_inactive_form.php:39
+#: ../user/team_remove_inactive_form.php:41
 msgid "Remove?"
 msgstr "Eliminar?"
 
-#: ../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 "Els que no son membres són seleccionats per a ser eliminats."
 
-#: ../user/team_remove_inactive_form.php:68
+#: ../user/team_remove_inactive_form.php:70
 msgid "Remove users"
 msgstr "Eliminar usuaris"
 
-#: ../user/team_search.php:68
+#: ../user/team_search.php:76
 msgid "Team name"
 msgstr "Nom de l'equip"
 
-#: ../user/team_search.php:92
+#: ../user/team_search.php:113
 msgid "Team search results"
 msgstr "Resultats de la recerca de l'equip"
 
-#: ../user/team_search.php:94
+#: ../user/team_search.php:115
 msgid "No teams were found matching your criteria. Try another search."
-msgstr ""
-"No s'han trobat equips amb la seu criteri de selecció. Provi una altra "
-"cerca."
+msgstr "No s'han trobat equips amb la seu criteri de selecció. Provi una altra cerca."
 
-#: ../user/team_search.php:96
+#: ../user/team_search.php:117
 msgid "Or you can %1create a new team%2."
 msgstr "O vostè pot %1crear un nou equip%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 ""
-"Els següents equips verifiquen un o més criteris de cerca.\n"
-"            Per a unir-se a un equip, feu clic en al seu nom per anar a la "
-"pàgina de l'equip,\n"
-"               després premi %1Unir-se a aquest equip%2."
+msgstr "Els següents equips verifiquen un o més criteris de cerca.\n            Per a unir-se a un equip, feu clic en al seu nom per anar a la pàgina de l'equip,\n               després premi %1Unir-se a aquest equip%2."
 
-#: ../user/team_search.php:107
+#: ../user/team_search.php:128
 msgid "Change your search"
 msgstr "Canviï la seva cerca"
 
-#: ../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 ""
-"Vostè pot associar-se amb altres persones amb interessos similars, o del "
-"mateix país, empresa o escola."
+msgstr "Vostè pot associar-se amb altres persones amb interessos similars, o del mateix país, empresa o 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 ""
-"Utilitzi aquest formulari per buscar els equips que siguin més adequats per "
-"a vostè."
+msgstr "Utilitzi aquest formulari per buscar els equips que siguin més adequats per a vostè."
 
-#: ../user/team_search.php:188
+#: ../user/team_search.php:209
 msgid "%1I'm not interested%2 in joining a team right now."
 msgstr "%1No estic interessat%2 en unir-me a un equip en aquest moment."
 
-#: ../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 "Límit superat - Ho sento, només els primers %1 elements"
 
@@ -6699,11 +6144,11 @@ msgstr "Límit superat - Ho sento, només els primers %1 elements"
 msgid "Top hosts"
 msgstr "Servidors principals"
 
-#: ../user/top_teams.php:105
+#: ../user/top_teams.php:107
 msgid "Top %1 teams"
 msgstr "Els %1 equips principals"
 
-#: ../user/top_teams.php:108
+#: ../user/top_teams.php:110
 msgid "There are no %1 teams"
 msgstr "No hi ha equips d'%1"
 
@@ -6711,11 +6156,11 @@ msgstr "No hi ha equips d'%1"
 msgid "Participant since"
 msgstr "Participant des de"
 
-#: ../user/uotd.php:29
+#: ../user/uotd.php:31
 msgid "No user of the day has been chosen."
 msgstr "No ha estat elegit cap usuari del dia."
 
-#: ../user/uotd.php:33
+#: ../user/uotd.php:35
 msgid "User of the Day for %1: %2"
 msgstr "Usuari del Dia de %1: %2"
 
@@ -6759,19 +6204,19 @@ msgstr "Disminuint el crèdit mitjana"
 msgid "Decreasing total credit"
 msgstr "Disminuint el crèdit total"
 
-#: ../user/user_search.php:100
+#: ../user/user_search.php:84
 msgid "search string must be at least 3 characters"
 msgstr "la paraula a cercar ha de ser de com a mínim 3 caràcters"
 
-#: ../user/user_search.php:133
+#: ../user/user_search.php:118
 msgid "User search results"
 msgstr "Resultats de la recerca de l'usuari"
 
-#: ../user/user_search.php:140
+#: ../user/user_search.php:125
 msgid "Joined"
 msgstr "Adjuntat"
 
-#: ../user/user_search.php:148
+#: ../user/user_search.php:133
 msgid "No users match your search criteria."
 msgstr "No hi ha usuaris que coincideixin amb els seus criteris de recerca."
 
@@ -6807,9 +6252,7 @@ msgstr "Validar adreça de correu electrònic BOINC"
 msgid ""
 "Please visit the following link to validate the email address of your %1 "
 "account:"
-msgstr ""
-"Si us plau, visiti el següent enllaç per a validar l'adreça de correu "
-"electrònic del seu %1 compte:"
+msgstr "Si us plau, visiti el següent enllaç per a validar l'adreça de correu electrònic del seu %1 compte:"
 
 #: ../user/validate_email_addr.php:34
 msgid "Validate email sent"
@@ -6819,9 +6262,7 @@ msgstr "S'ha enviat la validació del seu correu electrònic"
 msgid ""
 "An email has been sent to %1. Visit the link it contains to validate your "
 "email address."
-msgstr ""
-"Un correu electrònic li ha estat enviat a %1. Visiti l'enllaç que conté per "
-"a validar la sevaadreça de correu electrònic."
+msgstr "Un correu electrònic li ha estat enviat a %1. Visiti l'enllaç que conté per a validar la sevaadreça de correu electrònic."
 
 #: ../user/validate_email_addr.php:44
 msgid "No such user."
@@ -6833,8 +6274,7 @@ msgstr "Error en la URL - no es pot validar l'adreça de correu electrònic"
 
 #: ../user/validate_email_addr.php:54
 msgid "Database update failed - please try again later."
-msgstr ""
-"Error en l'actualització de base de dades - si us plau a provi-ho més tard."
+msgstr "Error en l'actualització de base de dades - si us plau a provi-ho més tard."
 
 #: ../user/validate_email_addr.php:57
 msgid "Validate email address"
@@ -6844,29 +6284,24 @@ msgstr "Validar adreça de correu electrònic"
 msgid "The email address of your account has been validated."
 msgstr "L'adreça de correu electrònic del vostre compte ha estat validada."
 
-#: ../user/view_profile.php:36
+#: ../user/view_profile.php:38
 msgid "This user has no profile"
 msgstr "Aquest usuari no te perfil"
 
-#: ../user/view_profile.php:54
+#: ../user/view_profile.php:56
 msgid "Profile: %1"
 msgstr "Perdil: %1"
 
-#: ../user/view_profile.php:63
+#: ../user/view_profile.php:65
 msgid "Account data"
 msgstr "Dades del compte"
 
 #: ../user/weak_auth.php:52
 msgid ""
-"You can access your account either by using your email address and "
-"password,\n"
+"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 ""
-"Vostè pot accedir al seu compte, ja sigui per l'ús del seu correu electrònic "
-"i contrasenya,\n"
-"    o mitjançant l'ús de la 'clau de compte' assignada.\n"
-"    La seva clau de compte és:"
+msgstr "Vostè pot accedir al seu compte, ja sigui per l'ús del seu correu electrònic i contrasenya,\n    o mitjançant l'ús de la 'clau de compte' assignada.\n    La seva clau de compte és:"
 
 #: ../user/weak_auth.php:57
 msgid "This key can be used to:"
@@ -6882,12 +6317,7 @@ msgid ""
 "       To do so, install BOINC,\n"
 "       create a file named %1 in the BOINC\n"
 "       data directory, and set its contents to:"
-msgstr ""
-"per connectar un ordinador al seu compte sense necessitat d'utilitzar "
-"l'Administrador de BOINC.\n"
-"       Per a això, instal·lar BOINC,\n"
-"       crear un arxiu anomenat %1 al BOINC\n"
-"       directori de dades, i establir el seu contingut a:"
+msgstr "per connectar un ordinador al seu compte sense necessitat d'utilitzar l'Administrador de BOINC.\n       Per a això, instal·lar BOINC,\n       crear un arxiu anomenat %1 al BOINC\n       directori de dades, i establir el seu contingut a:"
 
 #: ../user/weak_auth.php:73
 msgid "Weak account key"
@@ -6896,28 +6326,17 @@ msgstr "Clau de compte feble"
 #: ../user/weak_auth.php:74
 msgid ""
 "Your 'weak account key' can be used to attach computers to your account\n"
-"    as described above, but cannot be used to log in to your account or "
-"change it in any way.\n"
+"    as described above, but cannot be used to log in to your account or change it in any way.\n"
 "    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 ""
-"La teva 'clau de compte feble' es pot utilitzar per connectar ordinadors al "
-"teu compte\n"
-"    com es descriu més amunt, però no es pot utilitzar per iniciar sessió al "
-"teu compte o canviar-lo de cap manera.\n"
-"    Si vols connectar ordinadors no són de confiança o insegurs al teu "
-"compte,\n"
-"    fes-ho amb la teva clau de compte feble.\n"
-"    La teva clau de compte feble és:"
+msgstr "La teva 'clau de compte feble' es pot utilitzar per connectar ordinadors al teu compte\n    com es descriu més amunt, però no es pot utilitzar per iniciar sessió al teu compte o canviar-lo de cap manera.\n    Si vols connectar ordinadors no són de confiança o insegurs al teu compte,\n    fes-ho amb la teva clau de compte feble.\n    La teva clau de compte feble és:"
 
 #: ../user/weak_auth.php:81
 msgid ""
 "If you change your password, your weak account key changes, and your "
 "previous weak account key becomes invalid."
-msgstr ""
-"Si canvies la contrasenya, la teva clau de compte febles canvia, i "
-"l'anterior deixarà de ser vàlida."
+msgstr "Si canvies la contrasenya, la teva clau de compte febles canvia, i l'anterior deixarà de ser vàlida."
 
 #: ../user/workunit.php:32
 msgid "can't find workunit"
@@ -6927,6 +6346,10 @@ msgstr "no pot trobar workunit"
 msgid "Workunit %1"
 msgstr "Workunit %1"
 
+#: ../user/workunit.php:40
+msgid "application"
+msgstr "aplicació"
+
 #: ../user/workunit.php:43
 msgid "canonical result"
 msgstr "resultat canònic"
@@ -6936,6 +6359,10 @@ msgid "granted credit"
 msgstr "crèdit atorgat"
 
 #: ../user/workunit.php:55
+msgid "Tasks in progress"
+msgstr "Tasques en curs"
+
+#: ../user/workunit.php:55
 msgid "suppressed pending completion"
 msgstr "suprimit a l'espera de la conclusió"
 
@@ -6963,366 +6390,70 @@ msgstr "validació"
 msgid "Pending"
 msgstr "Pendent"
 
-#: ../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 "Copyright"
 
-#: ../project.sample/project.inc:48
+#: ../project.sample/project.inc:75
 msgid "Generated"
 msgstr "Generat"
 
-#: ../project.sample/project.inc:79
+#: ../project.sample/project.inc:106
 msgid "Your personal background."
 msgstr "Els seus antecedents personals."
 
-#: ../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 ""
-"Expliqui'ns sobre vostè. Vostè podria dir-nos d'on es, la teva edat, "
-"ocupació, passatemps, o qualsevol altra cosa"
+msgstr "Expliqui'ns sobre vostè. Vostè podria dir-nos d'on es, la teva edat, ocupació, passatemps, o qualsevol altra cosa"
 
-#: ../project.sample/project.inc:87
+#: ../project.sample/project.inc:114
 msgid "Your opinions about %1"
 msgstr "Les seves opinions sobre %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 ""
-"Digui'ns la seva opinió sobre %1<ol>\n"
-"    <li>Per què executa %1?\n"
-"    <li>Quins són els seus punts de vista sobre el projecte?\n"
-"    <li>Algun suggeriment?\n"
-"    </ol>"
+msgstr "Digui'ns la seva opinió sobre %1<ol>\n    <li>Per què executa %1?\n    <li>Quins són els seus punts de vista sobre el projecte?\n    <li>Algun suggeriment?\n    </ol>"
 
-#: ../project.sample/project_specific_prefs.inc:47
+#: ../project.sample/project_specific_prefs.inc:53
 msgid "Color scheme for graphics"
 msgstr "Combinació de colors per als gràfics"
 
-#: ../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 "Màxim % de la CPU per als gràfics%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 només les aplicacions seleccionades"
 
-#: ../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 "Només aconseguir tasques per a certes aplicacions. Útil per centrar-se en aplicacions particulars, o per excloure-les."
+
+#: ../project.sample/project_specific_prefs.inc:58
 msgid ""
 "If no work for selected applications is available, accept work from other "
 "applications?"
-msgstr ""
-"Si no hi ha treball disponible per a les aplicacions seleccionades, acceptar "
-"feina d'altres aplicacions?"
+msgstr "Si no hi ha treball disponible per a les aplicacions seleccionades, acceptar feina d'altres aplicacions?"
+
+#: ../project.sample/project_specific_prefs.inc:59
+msgid "Use faster non-graphical applications if available?"
+msgstr "Utilitza aplicacions no gràfiques si estàn disponibles?"
 
-#: ../project.sample/project_specific_prefs.inc:91
+#: ../project.sample/project_specific_prefs.inc:90
 msgid "(all applications)"
 msgstr "(totes les aplicacions)"
-
-#~ msgid "Error:"
-#~ msgstr "Error:"
-
-#~ msgid "Account creation is disabled"
-#~ msgstr "La creació de comptes està desactivada"
-
-#~ msgid ""
-#~ "Sorry, this project has disabled the creation of new accounts.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Ho sentim, aquest projecte ha desactivat la creació de nous comptes.\n"
-#~ "Si us plau provar-ho més tard."
-
-#~ msgid "Account creation is currently disabled. Please try again later."
-#~ msgstr "La creació de comptes està desactivada. Si us plau provi-ho mes tard."
-
-#~ msgid "nvidia GPU"
-#~ msgstr "GPU nvidia"
-
-#~ msgid ""
-#~ "This project hasn\\'t created an email message - please notify its "
-#~ "administrators"
-#~ msgstr ""
-#~ "Aquest projecte no ha creat un missatge de correu electrònic - si us plau "
-#~ "notifiqui-ho als seus administradors"
-
-#~ msgid "Use Intel GPU %1 Enforced by version 7.0+ %2"
-#~ msgstr "Usar la GPU Intel %1 Imposat per la versió 7.0+ %2"
-
-#~ msgid ""
-#~ "These apply to all BOINC projects in which you participate.<br>\n"
-#~ "             On computers participating in multiple projects, the most "
-#~ "recently modified preferences will be used."
-#~ msgstr ""
-#~ "Aixó s'aplica a tots els projectes BOINC en què vostè participa.<br>\n"
-#~ "             En els ordinadors connectats a múltiples projectes, "
-#~ "s'utilitzaràn les preferències modificades més recentment."
-
-#~ msgid "Export this news item as a Notice"
-#~ msgstr "Exportar aquesta noticia com a Avís"
-
-#~ msgid ""
-#~ "Go to the BOINC data directory on your computer (on Windows this is usually "
-#~ "<b>C:\\Documents and Settings\\All Users\\Application Data\\BOINC</b> or "
-#~ "<b>C:\\Program Files\\BOINC</b>."
-#~ msgstr ""
-#~ "Aneu al directori de dades de BOINC en el vostre sistema (a Windows en "
-#~ "general és <b>C:\\Documents and Settings\\All Users\\Application Data\\BOINC</b> "
-#~ "o <b>C:\\Program Files\\BOINC</b>."
-
-#~ msgid "No such task"
-#~ msgstr "No és una tasca"
-
-#~ msgid ""
-#~ "Computer is connected to the Internet about every %1 Leave blank or 0 if "
-#~ "always connected. %2 BOINC will try to maintain at least this much work (max "
-#~ "10 days). %3"
-#~ msgstr ""
-#~ "L'ordinador està connectat a Internet cada %1 Deixar en blanc o 0 si està "
-#~ "sempre connectat. %2 BOINC tractarà de fer el màxim de feina (màx 10 dies). "
-#~ "%3"
-
-#~ msgid "Maintain enough work for an additional"
-#~ msgstr "Mantenir prou feina per un període addicional"
-
-#~ msgid "Update failed: "
-#~ msgstr "Error en l'actualització: "
-
-#~ msgid "Provides %1limited access%2 to your account"
-#~ msgstr "Proporciona un %1accés limitat%2 al vostre compte"
-
-#~ msgid ""
-#~ "Don't use this form. Just run BOINC, select Add Project, and enter an email "
-#~ "address and password."
-#~ msgstr ""
-#~ "No utilitzi aquest formulari. Simplement executeu BOINC, seleccioneu Afegeix "
-#~ "projecte i introduïu una adreça de correu electrònic i contrasenya."
-
-#~ msgid "Do not reorder sticky posts"
-#~ msgstr "No ordenar els missatges enganxats"
-
-#~ msgid "If a thread contains more than this number of posts"
-#~ msgstr "Si el fil conté més d'aquest nombre de missatges"
-
-#~ msgid "only display the first one and this many of the last ones"
-#~ msgstr "només mostren el primer i llavors molts dels últims"
-
-#~ msgid "Your report has been recorded. Thanks you for your input."
-#~ msgstr "El seu informe ha estat enregistrat. Mercés per la seva aportació."
-
-#~ msgid "Search type"
-#~ msgstr "Tipus de cerca"
-
-#~ msgid "User names starting with"
-#~ msgstr "Noms d'usuari que comencen per"
-
-#~ msgid ""
-#~ "Your 'weak account key' lets you link a computer to your account without "
-#~ "giving it the ability to log in to your account or to change it in any way."
-#~ msgstr ""
-#~ "El seu 'clau feble de compte' li permet vincular un ordinador al teu compte "
-#~ "sense donar-li la possibilitat d'accedir al seu compte o per canviar-lo de "
-#~ "cap manera."
-
-#~ msgid ""
-#~ "This mechanism works only with projects that have upgraded their server "
-#~ "software 7 Dec 2007 or later."
-#~ msgstr ""
-#~ "Això només funciona amb projectes que tenen el seu programari servidor "
-#~ "actualitzat a la versió del 7 de Dec 2007 o posterior."
-
-#~ msgid "Your weak account key for this project is:"
-#~ msgstr "La clau de compte feble per aquest projecte és:"
-
-#~ msgid ""
-#~ "To use your weak account key on a given host, find or create the 'account "
-#~ "file' for this project. This file has a name of the form "
-#~ "<b>account_PROJECT_URL.xml</b>. The account file for %1 is <b>%2</b>."
-#~ msgstr ""
-#~ "Per utilitzar la clau de compte feble en un ordinador, trobeu o creeu 'el "
-#~ "fitxer del compte' per aquest projecte. El nom d'aquest fitxer és de la "
-#~ "forma <b>compte_URL_DEL_PROJECTE.xml</b>. El fitxer del compte per %1 és <b>"
-#~ "%2</b>."
-
-#~ msgid "Create this file if needed. Set its contents to:"
-#~ msgstr "Crear aquest fitxer si és necessari. Configureu el seu contingut com:"
-
-#~ msgid ""
-#~ "Your weak account key is a function of your password. If you change your "
-#~ "password, your weak account key changes, and your previous weak account key "
-#~ "becomes invalid."
-#~ msgstr ""
-#~ "La seva clau de compte feble és una funció de la seva contrasenya. Si canvia "
-#~ "la contrasenya, la clau de compte feble canvia, i la clau de compte feble "
-#~ "anterior deixa de ser vàlida."
-
-#~ msgid "Account key"
-#~ msgstr "Clau del compte"
-
-#~ msgid "Provides full access to your account"
-#~ msgstr "Proporciona accés total al vostre compte"
-
-#~ msgid "Export"
-#~ msgstr "Exportar"
-
-#~ msgid "- private message"
-#~ msgstr "- missatge privat"
-
-#~ msgid "Private message from"
-#~ msgstr "Missatge privat de"
-
-#~ msgid "Email address verification pending"
-#~ msgstr "Està pendent la verificació de l'adreça de correu electrònic"
-
-#~ msgid "Logged in as %1."
-#~ msgstr "Connectat com %1."
-
-#~ msgid "Log in as someone else."
-#~ msgstr "Connecteu-vos com algú més."
-
-#~ msgid "No thread with id %1. Please check the link and try again."
-#~ msgstr ""
-#~ "No hi ha cap fil amb id %1. Si us plau comprovi l'accés i provi-ho de nou."
-
-#~ msgid "Request not found"
-#~ msgstr "Petició no trobada"
-
-#~ msgid "%1 has added you as a friend."
-#~ msgstr "%1 l'ha afegit com amic."
-
-#~ msgid "Account data for %1"
-#~ msgstr "Dades del compte %1"
-
-#~ msgid "couldn't create message board"
-#~ msgstr "no s'ha pogut crear el tauler de missatges"
-
-#~ msgid "message board not found"
-#~ msgstr "no s'ha tobat el tauler de missatges"
-
-#~ msgid "no such forum"
-#~ msgstr "no existeix aquest fòrum"
-
-#~ msgid "unknown command %1"
-#~ msgstr "ordre %1 desconeguda"
-
-#~ msgid "ERROR: %1 does not exist!  Cannot create combo box.<br>"
-#~ msgstr "ERROR: %1 no existeix1  No es pot crear el quadre combinat.<br>"
-
-#~ msgid ""
-#~ "To protect the project's webpages from spam, we kindly ask you to type in "
-#~ "the two words shown in the image:<br>\n"
-#~ msgstr ""
-#~ "Per protegir les pàgines del projectes de l'spam, li demanem que "
-#~ "introdueixi les dues paraules que es mostren en la imatge:<br>\n"
-
-#~ msgid "BOINC client version"
-#~ msgstr "Versió de client BOINC"
-
-#~ msgid "Client detached"
-#~ msgstr "Client independent"
-
-#~ msgid "Maximum daily WU quota per CPU"
-#~ msgstr "WU quota màxima diària per CPU"
-
-#~ msgid "%1/day"
-#~ msgstr "%1/dia"
-
-#~ msgid "Anonymous platform - CPU"
-#~ msgstr "Plataforma anònima - CPU"
-
-#~ msgid "Anonymous platform - NVIDIA GPU"
-#~ msgstr "Plataforma anònima - GPU NVIDIA"
-
-#~ msgid "Anonymous platform - ATI GPU"
-#~ msgstr "Plataforma anònima - GPU ATI"
-
-#~ msgid "Task ID"
-#~ msgstr "Identificador de tasca"
-
-#~ msgid "Granted credit"
-#~ msgstr "Crèdit concedit"
-
-#~ msgid "Click to"
-#~ msgstr "Fes clic aquí per"
-
-#~ msgid "(no restriction if equal)"
-#~ msgstr "(sense restricció en cas d'igualtat)"
-
-#~ msgid "percent of CPU time"
-#~ msgstr "per cent del temps de CPU"
-
-#~ msgid "Leave at least"
-#~ msgstr "Deixa com a mínim"
-
-#~ msgid "% of page file (swap space)"
-#~ msgstr "% de l'arxiu de paginació (swap)"
-
-#~ msgid "Use ATI GPU if present %1(enforced by 6.10+ clients)%2"
-#~ msgstr "Usar la GPU ATI si està present %1(imposada pels clients 6.10+)%2"
-
-#~ msgid "KB/s"
-#~ msgstr "KB/s"
-
-#~ msgid "GB disk space"
-#~ msgstr "GB d'espai en disc"
-
-#~ msgid "GB disk space free"
-#~ msgstr "GB d'espai lliure"
-
-#~ msgid "(no restriction)"
-#~ msgstr "(sense restricció)"
-
-#~ msgid "%1 GB disk space"
-#~ msgstr "%1 GB d'espai en disc"
-
-#~ msgid "%1 GB disk space free"
-#~ msgstr "%1 GB d'espai lliure"
-
-#~ msgid ""
-#~ "Resource share %1If you participate in multiple BOINC projects, this is "
-#~ "the proportion of your resources used by %2%3"
-#~ msgstr ""
-#~ "Compartir recursos %1Si vostè participa en diversos projectes BOINC, "
-#~ "aquesta és la proporció dels recursos utilitzats per %2%3"
-
-#~ msgid "Gbytes"
-#~ msgstr "Gbytes"
-
-#~ msgid "Resource share"
-#~ msgstr "Compartir recursos"
-
-#~ msgid "stderr out"
-#~ msgstr "sortida stderr"
-
-#~ msgid "<p>"
-#~ msgstr "<p>"
-
-#~ msgid "preferences"
-#~ msgstr "preferències"
-
-#~ msgid "Last %1"
-#~ msgstr "Últim %1"
-
-#~ msgid "CHARSET"
-#~ msgstr "UTF-8"
-
-#~ msgid "Language symbol"
-#~ msgstr "Símbol de l'idioma"
-
-#~ msgid "Resource share and graphics"
-#~ msgstr "Compartició de recursos i gràfics"
-
-#~ msgid "fll"
-#~ msgstr "f11"
-
-#~ msgid "Tasks for computer %1"
-#~ msgstr "Feines de l'ordinador %1"
diff --git a/locale/ca/BOINC-Setup.mo b/locale/ca/BOINC-Setup.mo
index ba86fb5..52695dd 100644
Binary files a/locale/ca/BOINC-Setup.mo and b/locale/ca/BOINC-Setup.mo differ
diff --git a/locale/ca/BOINC-Setup.po b/locale/ca/BOINC-Setup.po
old mode 100755
new mode 100644
index 525cd9e..8305b7a
--- a/locale/ca/BOINC-Setup.po
+++ b/locale/ca/BOINC-Setup.po
@@ -1,26 +1,21 @@
 # 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-03 21:34+0000\n"
-"Last-Translator: Xavier <xavi.mormur at gmail.com>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: ca\n"
+"PO-Revision-Date: 2015-02-08 18:28+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\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"
-"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: 1391463278.0\n"
-"X-Poedit-KeywordsList: _\n"
 
 #: Installer.cpp:124
 #, c-format
@@ -37,30 +32,20 @@ msgstr "No"
 
 #: PostInstall.cpp:133
 msgid "Should BOINC run even when no user is logged in?"
-msgstr ""
-"BOINC s'ha de seguir executant fins i tot quan cap usuari ha iniciat sessió?"
+msgstr "BOINC s'ha de seguir executant fins i tot quan cap usuari ha iniciat sessió?"
 
 #: 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 ""
-"Els usuaris que tenen permís per administrar aquest equip automàticament "
-"podran executar i controlar %s.\n"
+"Users who are permitted to administer this computer will automatically be allowed to run and control %s.\n"
 "\n"
-"Vols que també els usuaris no administratius puguin executar i controlar %s "
-"en aquesta Mac?"
+"Do you also want non-administrative users to be able to run and control %s on this Mac?"
+msgstr "Els usuaris que tenen permís per administrar aquest equip automàticament podran executar i controlar %s.\n\nVols que també els usuaris no administratius puguin executar i controlar %s en aquesta Mac?"
 
 #: PostInstall.cpp:1444
 #, c-format
 msgid "Do you want to set %s as the screensaver for all %s users on this Mac?"
-msgstr ""
-"Vols configurar %s com el protector de pantalla per a tots els %s usuaris de "
-"en aquesta Mac?"
+msgstr "Vols configurar %s com el protector de pantalla per a tots els %s usuaris de en aquesta Mac?"
 
 #: uninstall.cpp:82
 msgid "OK"
@@ -74,9 +59,7 @@ msgstr "Error de permisos després del re inici"
 msgid ""
 "Removal may take several minutes.\n"
 "Please be patient."
-msgstr ""
-"La eliminació pot trigar uns minuts.\n"
-"Si us plau, sigues pacient."
+msgstr "La eliminació pot trigar uns minuts.\nSi us plau, sigues pacient."
 
 #: uninstall.cpp:156
 #, c-format
@@ -84,10 +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 ""
-"Estas segur que vols suprimir completament %s del teu ordinador?\n"
-"\n"
-"Això eliminarà els executables, però no tocarà els arxius de dades %s."
+msgstr "Estas segur que vols suprimir completament %s del teu ordinador?\n\nAixò eliminarà els executables, però no tocarà els arxius de dades %s."
 
 #: uninstall.cpp:163
 #, c-format
@@ -107,9 +87,7 @@ msgstr "nom  de l'usuari"
 msgid ""
 "Do you also want to remove VirtualBox from your computer?\n"
 "(VirtualBox was installed along with BOINC.)"
-msgstr ""
-"També vols eliminar VirtualBox de l'ordinador?\n"
-"(VirtualBox es va instal·lar juntament amb BOINC.)"
+msgstr "També vols eliminar VirtualBox de l'ordinador?\n(VirtualBox es va instal·lar juntament amb BOINC.)"
 
 #: uninstall.cpp:312
 #, c-format
@@ -121,25 +99,14 @@ msgid ""
 "\n"
 "for each user, the file\n"
 "\"%s\"."
-msgstr ""
-"Eliminació finalitzada.\n"
-"\n"
-" Poder també vol eliminar els següents elements utilitzant el cercador: \n"
-"en el directori \"%s\"\n"
-"\n"
-"per a cada usuari, el fitxer\n"
-"\"%s\"."
+msgstr "Eliminació finalitzada.\n\n Poder també vol eliminar els següents elements utilitzant el cercador: \nen el directori \"%s\"\n\nper a cada usuari, el fitxer\n\"%s\"."
 
 #: uninstall.cpp:840
 #, c-format
 msgid ""
-"Enter your administrator password to completely remove %s from you "
-"computer.\n"
-"\n"
-msgstr ""
-"Introdueix la teva contrasenya d'administrador per eliminar completament %s "
-"de l'ordinador.\n"
+"Enter your administrator password to completely remove %s from you computer.\n"
 "\n"
+msgstr "Introdueix la teva contrasenya d'administrador per eliminar completament %s de l'ordinador.\n\n"
 
 #: uninstall.cpp:1616
 msgid "Cancel"
@@ -148,24 +115,3 @@ msgstr "Cancel·lar"
 #: uninstall.cpp:1617
 msgid "Continue..."
 msgstr "Continuar..."
-
-#, c-format
-#~ msgid "Sorry, this version of %s requires system 10.4 or higher."
-#~ msgstr "Ho sentim, aquesta versió de %s requereix el sistema 10.4 o superior."
-
-#~ msgid ""
-#~ "Removal completed.\n"
-#~ "\n"
-#~ " You may want to remove the following remaining items using the Finder: \n"
-#~ "\"/Library/Application Support/BOINC Data\" directory\n"
-#~ "\n"
-#~ "for each user, the file\n"
-#~ "\"/Users/[username]/Library/Preferences/BOINC Manager Preferences\"."
-#~ msgstr ""
-#~ "L'eliminació s'ha completat.\n"
-#~ "\n"
-#~ " Poder vols suprimir els elements restants fent servir l'Explorador:\n"
-#~ "directori \"/Library/Application Support/BOINC data\"\n"
-#~ "\n"
-#~ "per a cada usuari, l'arxiu\n"
-#~ "\"/Users/[nom d'usuari]/Library/Preferences/BOINC Manager Preferences\"."
diff --git a/locale/ca/BOINC-Web.mo b/locale/ca/BOINC-Web.mo
index 5ded33e..6079076 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
old mode 100755
new mode 100644
index 931285a..b9e1d3a
--- a/locale/ca/BOINC-Web.po
+++ b/locale/ca/BOINC-Web.po
@@ -1,27 +1,25 @@
 # BOINC web translation
 # Copyright (C) 2008-2009 University of California
+# 
 # This file is distributed under the same license as BOINC.
+# 
 # FileID  : $Id$
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: \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: 2014-06-01 19:20+0000\n"
-"Last-Translator: Xavier <xavi.mormur at gmail.com>\n"
-"Language-Team: BOINC Development Team <boinc_loc at ssl.berkeley.edu>\n"
-"Language: ca\n"
+"PO-Revision-Date: 2015-02-08 18:28+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\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"
-"X-Generator: Pootle 2.5.0\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-SearchPath-0: doc\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
-"X-POOTLE-MTIME: 1401650445.0\n"
-"X-Poedit-KeywordsList: tra\n"
 
 #: docutil.php:21
 msgid "Search"
@@ -40,9 +38,7 @@ msgstr "Aquesta pàgina és %straduïble%s."
 msgid ""
 "We recommend that you also install VirtualBox, so your computer can work on "
 "science projects that require it."
-msgstr ""
-"Et recomanem d'instal·lar també VirtualBox, de manera que l'equip pot "
-"treballar en projectes de ciència que ho requereixin."
+msgstr "Et recomanem d'instal·lar també VirtualBox, de manera que l'equip pot treballar en projectes de ciència que ho requereixin."
 
 #: download.php:41
 msgid "Learn more about VirtualBox."
@@ -67,13 +63,6 @@ msgstr "versió BOINC %s"
 msgid "VirtualBox version %s"
 msgstr "versió VirtualBox %s"
 
-# ######################################
-# download.php
-# download.php 2006/08/03 by je2bwm
-# ######################################<br />
-# <br />
-# download.php<br />
-# #######################################<br />
 #: download.php:67
 msgid "Download BOINC"
 msgstr "Descarregar BOINC"
@@ -83,34 +72,25 @@ msgid ""
 "BOINC is a program that lets you donate your idle computer time to science "
 "projects like SETI at home, Climateprediction.net, Rosetta at home, World "
 "Community Grid, and many others."
-msgstr ""
-"BOINC és un programa que et permet donar el temps d'inactivitat de "
-"l'ordinador per a projectes científics com SETI at home, Climateprediction.net, "
-"Rosetta at home, World Community Grid, i molts d'altres."
+msgstr "BOINC és un programa que et permet donar el temps d'inactivitat de l'ordinador per a projectes científics com SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, i molts d'altres."
 
 #: download.php:125
 msgid ""
 "After installing BOINC on your computer, you can connect it to as many of "
 "these projects as you like."
-msgstr ""
-"Després d'instal·lar BOINC a l'ordinador, pots connectar-lo a tants "
-"projectes com vulguis."
+msgstr "Després d'instal·lar BOINC a l'ordinador, pots connectar-lo a tants projectes com vulguis."
 
 #: download.php:127
 msgid ""
-"You may run this software on a computer only if you own the computer or have "
-"the permission of its owner."
-msgstr ""
-"Podeu executar aquest programari en un equip només si vostè és propietari de "
-"l'ordinador o té permís del seu propietari."
+"You may run this software on a computer only if you own the computer or have"
+" the permission of its owner."
+msgstr "Podeu executar aquest programari en un equip només si vostè és propietari de l'ordinador o té permís del seu propietari."
 
 #: download.php:132
 msgid ""
 "We recommend that you download BOINC from the Google Play Store or Amazon "
 "Appstore, not from here."
-msgstr ""
-"Et recomanem que descarreguis BOINC des de Google Play Store o Amazon "
-"Appstore, no des de aquí."
+msgstr "Et recomanem que descarreguis BOINC des de Google Play Store o Amazon Appstore, no des de aquí."
 
 #: download.php:167
 msgid "System requirements"
@@ -143,28 +123,20 @@ msgstr "BOINC: computació per a la ciència"
 #: help.php:12
 #, php-format
 msgid ""
-"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who "
-"can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who"
+" can: %s answer questions about BOINC and volunteer computing; %s walk you "
 "through the process of installing and using BOINC; %s troubleshoot any "
 "problems you might have."
-msgstr ""
-"L'Ajuda en línia de BOINC li permet converses directes amb usuaris experts, "
-"que poden: %s respondre preguntes respecte BOINC i la computació assistida; "
-"%s proporcionar informació respecte el procés d'instal·lació i utilització "
-"de BOINC; %s resolució de qualsevol problema que pugui tenir."
+msgstr "L'Ajuda en línia de BOINC li permet converses directes amb usuaris experts, que poden: %s respondre preguntes respecte BOINC i la computació assistida; %s proporcionar informació respecte el procés d'instal·lació i utilització de BOINC; %s resolució de qualsevol problema que pugui tenir."
 
 #: help.php:21
 #, php-format
 msgid ""
-"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. "
-"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 ""
-"La Ajuda en línia BOINC està basada en %sSkype%s, un sistema telefónic basat "
-"en Internet. Skype is lliure (ambdós programari i trucades). Si no té "
-"instal·lat Skype, si us plau %sel descarregui i instal·li ara%s.  Quan hagi "
-"finalitzat, torni a aquesta pàgina."
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system."
+" 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 "La Ajuda en línia BOINC està basada en %sSkype%s, un sistema telefónic basat en Internet. Skype is lliure (ambdós programari i trucades). Si no té instal·lat Skype, si us plau %sel descarregui i instal·li ara%s.  Quan hagi finalitzat, torni a aquesta pàgina."
 
 #: help.php:28
 msgid ""
@@ -172,19 +144,13 @@ msgid ""
 "microphone and speakers or an external headset for your computer.  You can "
 "also use Skype's text-based chat system or regular email (if you don't have "
 "Skype) to communicate with Help Volunteers."
-msgstr ""
-"La millor manera d'obtenir ajuda es de paraula, per el necessita tenir "
-"instal·lat microfon i altaveus interns o externs en el seu ordinador.  També "
-"pot utilitzar el sistema chat de text de Skype o el correus electonics ( si "
-"no disposa de Skype) per comunicar amb els voluntaris d'Ajuda."
+msgstr "La millor manera d'obtenir ajuda es de paraula, per el necessita tenir instal·lat microfon i altaveus interns o externs en el seu ordinador.  També pot utilitzar el sistema chat de text de Skype o el correus electonics ( si no disposa de Skype) per comunicar amb els voluntaris d'Ajuda."
 
 #: help.php:31
 msgid ""
 "Volunteers speaking several languages are available. Please select a "
 "language:"
-msgstr ""
-"Estan disponibles Voluntaris que parlen diverses llengues. Si us plau "
-"seleccioni un idoma:"
+msgstr "Estan disponibles Voluntaris que parlen diverses llengues. Si us plau seleccioni un idoma:"
 
 #: help.php:47
 msgid "Be a Help Volunteer"
@@ -196,10 +162,7 @@ msgid ""
 "If you're an experienced BOINC user, we encourage you to %sbecome a Help "
 "Volunteer%s.  It's a great way to help the cause of scientific research and "
 "volunteer computing - and it's fun!"
-msgstr ""
-"Si es un usuari avançat de BOINC, l'animem %sa fer-se Voluntari%s.  Es una "
-"manera d'ajudar a la recerca científica i la computació distribuïda - i es "
-"divertit!"
+msgstr "Si es un usuari avançat de BOINC, l'animem %sa fer-se Voluntari%s.  Es una manera d'ajudar a la recerca científica i la computació distribuïda - i es divertit!"
 
 #: help.php:56
 #, php-format
@@ -211,15 +174,11 @@ msgstr "Si ja és un Voluntari: per editar la seva configuració, %spremi aquí%
 msgid ""
 "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
 "or the University of California."
-msgstr ""
-"Els voluntaris BOINC són ajudants no remunerats.  El seu consell no està "
-"avalat per BOINC o la Universitat de Califòrnia."
+msgstr "Els voluntaris BOINC són ajudants no remunerats.  El seu consell no està avalat per BOINC o la Universitat de Califòrnia."
 
 #: help_funcs.php:110
 msgid "%1Never%2 give email address or password information to BOINC helpers."
-msgstr ""
-"%1Mai%2 suministreu l'adreça de correu electrònic o la contrasenya als "
-"voluntaris de BOINC."
+msgstr "%1Mai%2 suministreu l'adreça de correu electrònic o la contrasenya als voluntaris de BOINC."
 
 #: index.php:24
 msgid "Computing power"
@@ -249,7 +208,6 @@ msgstr "ordinadors.\n"
 msgid "24-hour average:"
 msgstr "promitg 24 hores:"
 
-# 80%
 #: index.php:56
 msgid "PetaFLOPS."
 msgstr "PetaFLOPS."
@@ -262,13 +220,6 @@ msgstr "Notícies"
 msgid "Volunteer"
 msgstr "Voluntari"
 
-# #######################################
-# download.php
-# download.php 2006/08/03 by je2bwm
-# ######################################<br />
-# <br />
-# download.php<br />
-# #######################################<br />
 #: index.php:85
 msgid "Download"
 msgstr "Descarregar"
@@ -287,14 +238,10 @@ msgstr "Enllaços"
 
 #: index.php:94
 msgid ""
-"Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure "
-"diseases, study global warming, discover pulsars, and do many other types of "
-"scientific research.  It's safe, secure, and easy:"
-msgstr ""
-"Utilitza el temps d'inactivitat de l'ordinador (Windows, Mac, Linux o "
-"Android) per curar malalties, estudiar l'escalfament global, descobrir "
-"púlsars, i molts altres tipus de recerca científica.  És segur, garantit i "
-"fàcil:"
+"Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure"
+" diseases, study global warming, discover pulsars, and do many other types "
+"of scientific research.  It's safe, secure, and easy:"
+msgstr "Utilitza el temps d'inactivitat de l'ordinador (Windows, Mac, Linux o Android) per curar malalties, estudiar l'escalfament global, descobrir púlsars, i molts altres tipus de recerca científica.  És segur, garantit i fàcil:"
 
 #: index.php:96
 msgid "Choose projects"
@@ -311,11 +258,9 @@ msgstr "Entra un correu electrònic i una contrasenya."
 #: index.php:102
 #, php-format
 msgid ""
-"Or, if you run several projects, try an %saccount manager%s such as %"
-"sGridRepublic%s or %sBAM!%s. "
-msgstr ""
-"O, si executa mes d'un projecte, provi un %sgestor de comptes%s tal com %"
-"sGridRepublic%s o %sBAM!%s. "
+"Or, if you run several projects, try an %saccount manager%s such as "
+"%sGridRepublic%s or %sBAM!%s. "
+msgstr "O, si executa mes d'un projecte, provi un %sgestor de comptes%s tal com %sGridRepublic%s o %sBAM!%s. "
 
 #: index.php:118
 msgid "Compute with BOINC"
@@ -327,25 +272,19 @@ msgstr "Actualitzacions del proramari"
 
 #: index.php:128
 msgid ""
-"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving "
-"you the computing power of thousands of CPUs."
-msgstr ""
-"%1Els científics%2: utilitzan BOINC per crear un %3projectes de computació "
-"voluntària%4 proporcionant-li la potència de càlcul de milers de CPU."
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving"
+" you the computing power of thousands of CPUs."
+msgstr "%1Els científics%2: utilitzan BOINC per crear un %3projectes de computació voluntària%4 proporcionant-li la potència de càlcul de milers de CPU."
 
 #: index.php:132
 msgid ""
 "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
 "Center%4."
-msgstr ""
-"%1Les Universitats%2: utilitzan BOINC per crear un %3Centre de "
-"Supercomputació Virtual%4."
+msgstr "%1Les Universitats%2: utilitzan BOINC per crear un %3Centre de Supercomputació Virtual%4."
 
 #: index.php:137
 msgid "%1Companies%2: use BOINC for %3desktop Grid computing%4."
-msgstr ""
-"%1Les empreses%2: utilitzan BOINC per una %3Graella de computació d'oficina%"
-"4."
+msgstr "%1Les empreses%2: utilitzan BOINC per una %3Graella de computació d'oficina%4."
 
 #: index.php:149
 msgid "The BOINC project"
@@ -415,9 +354,7 @@ msgstr "API's per a complements de programari"
 #, php-format
 msgid ""
 "Open-source software for %svolunteer computing%s and %sgrid computing%s."
-msgstr ""
-"Programari lliure per la %scomputació distribuïda%s i la %scomputació en "
-"xarxa%s."
+msgstr "Programari lliure per la %scomputació distribuïda%s i la %scomputació en xarxa%s."
 
 #: index.php:230
 msgid "BOINC is based at The University of California, Berkeley"
@@ -427,7 +364,6 @@ msgstr "BOINC és troba a la Universitat de Califòrnia, Berkeley"
 msgid "Distributed sensing"
 msgstr "Detecció distribuïda"
 
-# 78%
 #: projects.inc:19
 msgid "Stanford University"
 msgstr "Universitat d'Stanford"
@@ -441,10 +377,7 @@ msgid ""
 "The Quake-Catcher Network is developing the world's largest seismic network "
 "using sensors attached to Internet-connected computers.  You must buy a "
 "sensor to participate."
-msgstr ""
-"Quake-Catcher Network està desenvolupant la xarxa de sísmica més gran del "
-"món a través de sensors connectats a ordinadors connectats a Internet.  Has "
-"ha de comprar un sensor per participar-hi."
+msgstr "Quake-Catcher Network està desenvolupant la xarxa de sísmica més gran del món a través de sensors connectats a ordinadors connectats a Internet.  Has ha de comprar un sensor per participar-hi."
 
 #: projects.inc:27
 msgid "BOINC Poland Foundation"
@@ -459,18 +392,13 @@ msgid ""
 "This project is creating a free and continuously updated map of radiation "
 "levels by using sensors connected to volunteers' computers.  You must buy a "
 "sensor to participate."
-msgstr ""
-"Aquest projecte crea un mapa lliure i en constant actualització dels nivells "
-"de radiació mitjançant l'ús de sensors connectats als ordinadors dels "
-"voluntaris.  Has ha de comprar un sensor per participar-hi."
+msgstr "Aquest projecte crea un mapa lliure i en constant actualització dels nivells de radiació mitjançant l'ús de sensors connectats als ordinadors dels voluntaris.  Has ha de comprar un sensor per participar-hi."
 
 #: projects.inc:33
 msgid ""
-"To participate in these projects you must buy a sensor and attach it to your "
-"computer."
-msgstr ""
-"Per participar en aquests projectes has de comprar un sensor i connectar-lo "
-"al teu ordinador."
+"To participate in these projects you must buy a sensor and attach it to your"
+" computer."
+msgstr "Per participar en aquests projectes has de comprar un sensor i connectar-lo al teu ordinador."
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
@@ -491,11 +419,7 @@ msgid ""
 "intelligence that uses semantic networks, stemmers, part of speech "
 "databases, and part of speech taggers in order to imitate human behavior in "
 "conversations."
-msgstr ""
-"Analitzar i convertir les xarxes semàntiques per a l'ús en FreeHAL, una "
-"intel ligència artificial que utilitza xarxes semàntiques, lematitzadors, "
-"part de bases de dades de parla, i part de referències en la parla per tal "
-"d'imitar el comportament humà en les converses."
+msgstr "Analitzar i convertir les xarxes semàntiques per a l'ús en FreeHAL, una intel ligència artificial que utilitza xarxes semàntiques, lematitzadors, part de bases de dades de parla, i part de referències en la parla per tal d'imitar el comportament humà en les converses."
 
 #: projects.inc:69
 msgid "Biology and Medicine"
@@ -511,17 +435,12 @@ msgstr "Descobriment de fàrmacs contra la malària"
 
 #: projects.inc:84
 msgid ""
-"The parasite that causes malaria continues to evolve resistance to available "
-"medication. We therefore urgently need to discover new drugs to replace "
+"The parasite that causes malaria continues to evolve resistance to available"
+" medication. We therefore urgently need to discover new drugs to replace "
 "existing drugs. Importantly, these new drugs need to target NEW proteins in "
 "the parasite. The FightMalaria at Home project is aimed at finding these new "
 "targets."
-msgstr ""
-"El paràsit que causa la malària segueix fent-se resistent als medicaments "
-"disponibles. Per tant, necessitem urgentment descobrir nous medicaments per "
-"reemplaçar els ja existents. És important destacar que aquests nous "
-"medicaments han d'apuntar a NOVES proteïnes en el paràsit. El projecte "
-"FightMalaria at Home està dirigit a la recerca d'aquests nous objectius."
+msgstr "El paràsit que causa la malària segueix fent-se resistent als medicaments disponibles. Per tant, necessitem urgentment descobrir nous medicaments per reemplaçar els ja existents. És important destacar que aquests nous medicaments han d'apuntar a NOVES proteïnes en el paràsit. El projecte FightMalaria at Home està dirigit a la recerca d'aquests nous objectius."
 
 #: projects.inc:90
 msgid "University of Karlsruhe (Germany)"
@@ -536,15 +455,9 @@ msgid ""
 "POEM at HOME uses a computational approach to predict the biologically active "
 "structure of proteins, to understand the signal-processing mechanisms when "
 "the proteins interact with one another, to understand diseases related to "
-"protein malfunction or aggregation, and to develop new drugs on the basis of "
-"the three-dimensions structure of biologically important proteins."
-msgstr ""
-"POEM at HOME utilitza un enfocament computacional per predir l'estructura de "
-"les proteïnes biològicament actives, per comprendre els mecanismes de "
-"processament de senyals, quan les proteïnes interactuen entre si, per "
-"entendre les malalties relacionades amb un mal funcionament de la proteïna o "
-"l'agregació, i desenvolupar nous fàrmacs sobre la base de l'estructura "
-"tridimensional de les proteïnes biològicament importants."
+"protein malfunction or aggregation, and to develop new drugs on the basis of"
+" the three-dimensions structure of biologically important proteins."
+msgstr "POEM at HOME utilitza un enfocament computacional per predir l'estructura de les proteïnes biològicament actives, per comprendre els mecanismes de processament de senyals, quan les proteïnes interactuen entre si, per entendre les malalties relacionades amb un mal funcionament de la proteïna o l'agregació, i desenvolupar nous fàrmacs sobre la base de l'estructura tridimensional de les proteïnes biològicament importants."
 
 #: projects.inc:98
 msgid "University of Delaware"
@@ -560,11 +473,7 @@ msgid ""
 "aims to further knowledge of the atomic details of protein-ligand "
 "interactions and, by doing so, will search for insights into the discovery "
 "of novel pharmaceuticals."
-msgstr ""
-"Docking at Home té els objectius de la biociència i de la informàtica. El "
-"projecte té com a objectiu aprofundir en el coneixement dels detalls atòmics "
-"de les interaccions dels lligams de les proteïnes i, en fer-ho, cercarà per "
-"a descubrir nous productes farmacèutics."
+msgstr "Docking at Home té els objectius de la biociència i de la informàtica. El projecte té com a objectiu aprofundir en el coneixement dels detalls atòmics de les interaccions dels lligams de les proteïnes i, en fer-ho, cercarà per a descubrir nous productes farmacèutics."
 
 #: projects.inc:114
 msgid "Barcelona Biomedical Research Park (PRBB)"
@@ -580,11 +489,7 @@ msgid ""
 "molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
 "New biomedical applications suddenly become possible giving a new role to "
 "computational biology for biomedical research."
-msgstr ""
-"GPUGrid.net obre nous escenaris de càlcul pel primer codi de dinàmica "
-"molecular a nivell d'àtom (CellMD) especialment optimitzat per funcionar en "
-"les GPU de NVIDIA. Les noves aplicacions biomèdiques podran donar un nou "
-"paper a la biologia computacional per a la recerca biomèdica."
+msgstr "GPUGrid.net obre nous escenaris de càlcul pel primer codi de dinàmica molecular a nivell d'àtom (CellMD) especialment optimitzat per funcionar en les GPU de NVIDIA. Les noves aplicacions biomèdiques podran donar un nou paper a la biologia computacional per a la recerca biomèdica."
 
 #: projects.inc:122
 msgid "Technion, Israel"
@@ -599,16 +504,12 @@ msgid ""
 "Superlink at Technion helps geneticists all over the world find disease-"
 "provoking genes causing some types of diabetes, hypertension (high blood "
 "pressure), cancer, schizophrenia and many others."
-msgstr ""
-"Superlink at Technion ajuda als genetistes de tot el món a trobar els gens que "
-"causen alguns tipus de diabetis, hipertensió (pressió arterial alta), el "
-"càncer, l'esquizofrènia i molts altres."
+msgstr "Superlink at Technion ajuda als genetistes de tot el món a trobar els gens que causen alguns tipus de diabetis, hipertensió (pressió arterial alta), el càncer, l'esquizofrènia i molts altres."
 
 #: projects.inc:138
 msgid ""
 "University of Maryland Center for Bioinformatics and Computational Biology"
-msgstr ""
-"Universitat de Maryland Center de Bioinformàtica i Biologia Computacional"
+msgstr "Universitat de Maryland Center de Bioinformàtica i Biologia Computacional"
 
 #: projects.inc:139
 msgid "Life science research"
@@ -616,15 +517,11 @@ msgstr "Recerca en ciència de la vida"
 
 #: projects.inc:140
 msgid ""
-"The Lattice Project supplies computing power to scientists at the University "
-"of Maryland studying evolutionary relationships based on DNA sequence data; "
-"bacterial, plasmid, and virus protein sequences; and biological diversity in "
-"nature reserves. "
-msgstr ""
-"The Lattice Project subministra potència de càlcul als científics de la "
-"Universitat de Maryland que estudien les relacions evolutives sobre la base "
-"de dades de seqüències d'ADN, les seqüències de proteïnes bacterianes, "
-"plasmidis i virus, i la diversitat biològica en les reserves naturals. "
+"The Lattice Project supplies computing power to scientists at the University"
+" of Maryland studying evolutionary relationships based on DNA sequence data;"
+" bacterial, plasmid, and virus protein sequences; and biological diversity "
+"in nature reserves. "
+msgstr "The Lattice Project subministra potència de càlcul als científics de la Universitat de Maryland que estudien les relacions evolutives sobre la base de dades de seqüències d'ADN, les seqüències de proteïnes bacterianes, plasmidis i virus, i la diversitat biològica en les reserves naturals. "
 
 #: projects.inc:146
 msgid "The Swiss Tropical Institute"
@@ -636,22 +533,14 @@ msgstr "Epidemiologia"
 
 #: projects.inc:148
 msgid ""
-"Simulation models of the transmission dynamics and health effects of malaria "
-"are an important tool for malaria control. They can be used to determine "
+"Simulation models of the transmission dynamics and health effects of malaria"
+" are an important tool for malaria control. They can be used to determine "
 "optimal strategies for delivering mosquito nets, chemotherapy, or new "
 "vaccines which are currently under development and testing.  Such modeling "
 "is extremely computer intensive, requiring simulations of large human "
 "populations with a diverse set of parameters related to biological and "
 "social factors that influence the distribution of the disease. "
-msgstr ""
-"Els models de simulació de la dinàmica de transmissió i efectes en la salut "
-"de la malària són una eina important per al control de la malària. Poden ser "
-"utilitzats per determinar les estratègies òptimes per al lliurament de "
-"mosquiteres, la quimioteràpia, o noves vacunes que estan actualment en fase "
-"de desenvolupament i proves.  Aquest model fa un ús molt intensiu de "
-"l'equip, simulacions que requereixen de grans poblacions humanes amb una "
-"gran diversitat de paràmetres relacionats amb factors biològics i socials "
-"que influeixen en la distribució de la malaltia. "
+msgstr "Els models de simulació de la dinàmica de transmissió i efectes en la salut de la malària són una eina important per al control de la malària. Poden ser utilitzats per determinar les estratègies òptimes per al lliurament de mosquiteres, la quimioteràpia, o noves vacunes que estan actualment en fase de desenvolupament i proves.  Aquest model fa un ús molt intensiu de l'equip, simulacions que requereixen de grans poblacions humanes amb una gran diversitat de paràmetres relacionats  [...]
 
 #: projects.inc:170
 msgid "University of Washington"
@@ -669,14 +558,7 @@ msgid ""
 "couldn't possibly attempt without your help. You will also be helping our "
 "efforts at designing new proteins to fight diseases such as HIV, Malaria, "
 "Cancer, and Alzheimer's"
-msgstr ""
-"Determinar les formes de 3 dimensions de les proteïnes en la investigació "
-"que en última instància pot conduir a trobar la cura d'algunes malalties "
-"humanes importants. Mitjançant l'execució de Rosetta at home ens ajudarà a "
-"accelerar i estendre la nostra investigació en formes que no podrien tractar "
-"sense la seva ajuda. També estarà ajudant als nostres esforços en el "
-"disseny de noves proteïnes per lluitar contra malalties com el VIH, la "
-"malària, el càncer i l'Alzheimer"
+msgstr "Determinar les formes de 3 dimensions de les proteïnes en la investigació que en última instància pot conduir a trobar la cura d'algunes malalties humanes importants. Mitjançant l'execució de Rosetta at home ens ajudarà a accelerar i estendre la nostra investigació en formes que no podrien tractar sense la seva ajuda. També estarà ajudant als nostres esforços en el disseny de noves proteïnes per lluitar contra malalties com el VIH, la malària, el càncer i l'Alzheimer"
 
 #: projects.inc:178
 msgid "University of Vienna"
@@ -684,13 +566,10 @@ msgstr "Universitat de Viena"
 
 #: projects.inc:180
 msgid ""
-"Calculate similarities between proteins. SIMAP provides a public database of "
-"the resulting data, which plays a key role in many bioinformatics research "
+"Calculate similarities between proteins. SIMAP provides a public database of"
+" the resulting data, which plays a key role in many bioinformatics research "
 "projects."
-msgstr ""
-"Calcular les semblances entre les proteïnes. SIMAP proporciona una base de "
-"dades pública de les dades resultants, que exerceix un paper clau en molts "
-"projectes de recerca en bioinformàtica."
+msgstr "Calcular les semblances entre les proteïnes. SIMAP proporciona una base de dades pública de les dades resultants, que exerceix un paper clau en molts projectes de recerca en bioinformàtica."
 
 #: projects.inc:186
 msgid "Earth Sciences"
@@ -709,21 +588,12 @@ msgid ""
 "Investigate the approximations that have to be made in state-of-the-art "
 "climate models. By running the model thousands of times we hope to find out "
 "how the model responds to slight tweaks to these approximations - slight "
-"enough to not make the approximations any less realistic. This will allow us "
-"to improve our understanding of how sensitive our models are to small "
+"enough to not make the approximations any less realistic. This will allow us"
+" to improve our understanding of how sensitive our models are to small "
 "changes and also to things like changes in carbon dioxide and the sulphur "
 "cycle. This will allow us to explore how climate may change in the next "
 "century under a wide range of different scenarios."
-msgstr ""
-"Investigar les aproximacions que han de ser realitzats en l'estat dels "
-"models climàtics d'última generació. A l'executar el model milers de vegades "
-"esperem a veure com respon el model als lleus ajustos a aquestes "
-"aproximacions - prou lleugeres com per no fer les aproximacions menys "
-"realistes. Això ens permetrà millorar la nostra comprensió de la "
-"sensibilitat dels nostres models als petits canvis i també per a coses com "
-"canvis en el diòxid de carboni i el cicle del sofre. Això ens permetrà "
-"estudiar com pot canviar el clima en el pròxim segle amb una àmplia gamma "
-"d'escenaris diferents."
+msgstr "Investigar les aproximacions que han de ser realitzats en l'estat dels models climàtics d'última generació. A l'executar el model milers de vegades esperem a veure com respon el model als lleus ajustos a aquestes aproximacions - prou lleugeres com per no fer les aproximacions menys realistes. Això ens permetrà millorar la nostra comprensió de la sensibilitat dels nostres models als petits canvis i també per a coses com canvis en el diòxid de carboni i el cicle del sofre. Això ens [...]
 
 #: projects.inc:207
 msgid "Physical Science"
@@ -737,9 +607,7 @@ msgstr "Enginyeria mecànica"
 msgid ""
 "Currently we are calculating the optimum design of a structure call the 52 "
 "bar truss"
-msgstr ""
-"Actualment estem calculant el disseny òptim d'una estructura anomenada "
-"armadura de 52 barres"
+msgstr "Actualment estem calculant el disseny òptim d'una estructura anomenada armadura de 52 barres"
 
 #: projects.inc:224 projects.inc:263 projects.inc:271
 msgid "Astronomy"
@@ -752,16 +620,9 @@ msgid ""
 "Universe. We will measure physical parameters (such as stellar mass surface "
 "density, star formation rate surface density, attenuation, and first-order "
 "star formation history) on a resolved pixel-by-pixel basis using spectral "
-"energy distribution (SED) fitting techniques in a distributed computing mode."
-msgstr ""
-"Combinarem la cobertura espectral de GALEX, Pan-STARRS1 i WISE per generar "
-"un atles multi-longitud d'ona UV-òptic-NIR de les galàxies a l'univers "
-"proper. Mesurarem els paràmetres físics (com la densitat de massa "
-"superficial estel.lar, taxa de densitat superficial en la formació "
-"estel.lar, atenuació, i història dels estadis inicials de la formació "
-"estel.lar) resolt sobre una base píxel-a-píxel mitjançant tècniques d'ajust "
-"d'una distribució espectral d'energia (SED) en un entorn de computació "
-"distribuïda."
+"energy distribution (SED) fitting techniques in a distributed computing "
+"mode."
+msgstr "Combinarem la cobertura espectral de GALEX, Pan-STARRS1 i WISE per generar un atles multi-longitud d'ona UV-òptic-NIR de les galàxies a l'univers proper. Mesurarem els paràmetres físics (com la densitat de massa superficial estel.lar, taxa de densitat superficial en la formació estel.lar, atenuació, i història dels estadis inicials de la formació estel.lar) resolt sobre una base píxel-a-píxel mitjançant tècniques d'ajust d'una distribució espectral d'energia (SED) en un entorn de [...]
 
 #: projects.inc:247
 msgid "University of Texas at Austin"
@@ -782,19 +643,8 @@ msgid ""
 "years of computer calculations on the fastest present day computer before a "
 "single event of interest can be expected to occur.  Our research group is "
 "interested in calculating the long time dynamics of systems."
-msgstr ""
-"Un problema comú en la química teòrica, la física de matèria condensada i "
-"ciència dels materials és el càlcul de l'evolució temporal d'un sistema a "
-"escala atòmica, on, per exemple, succeeixen reaccions químiques i/o difusió. "
-"En general, els esdeveniments d'interès són molt rars (molts ordres de "
-"magnitud més lents que els moviments de vibració dels àtoms), i per tant "
-"simulacions directes, amb el seguiment de cada moviment dels àtoms, prendria "
-"milers d'anys de càlculs a l'ordinador més ràpid avui en dia abans de  que "
-"un sol esdeveniment d'interès desitjat es produeixi. El nostre grup de "
-"recerca està interessat en el càlcul de la dinàmica dels sistemes en "
-"períodes llargs de temps."
-
-# 95%
+msgstr "Un problema comú en la química teòrica, la física de matèria condensada i ciència dels materials és el càlcul de l'evolució temporal d'un sistema a escala atòmica, on, per exemple, succeeixen reaccions químiques i/o difusió. En general, els esdeveniments d'interès són molt rars (molts ordres de magnitud més lents que els moviments de vibració dels àtoms), i per tant simulacions directes, amb el seguiment de cada moviment dels àtoms, prendria milers d'anys de càlculs a l'ordinador [...]
+
 #: projects.inc:262
 msgid "University of Illinois at Urbana-Champaign"
 msgstr "Universitat d'Illinois at Urbana-Champaign"
@@ -804,10 +654,7 @@ msgid ""
 "The goal of Cosmology at Home is to search for the model that best describes "
 "our Universe and to find the range of models that agree with the available "
 "astronomical particle physics data."
-msgstr ""
-"La meta de Cosmology at Home és buscar el model que millor descriu el nostre "
-"univers i trobar la els models que concorden amb les dades disponibles de "
-"física de partícules astronòmica."
+msgstr "La meta de Cosmology at Home és buscar el model que millor descriu el nostre univers i trobar la els models que concorden amb les dades disponibles de física de partícules astronòmica."
 
 #: projects.inc:270
 msgid "Rensselaer Polytechnic Institute"
@@ -818,10 +665,7 @@ msgid ""
 "The goal of Milkyway at Home is to create a highly accurate three dimensional "
 "model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
 "Survey."
-msgstr ""
-"L'objectiu de Milkyway at Home és crear un model de gran precisió "
-"tridimensional de la Via Làctia utilitzant dades recollides pel Sloan "
-"Digital Sky Survey."
+msgstr "L'objectiu de Milkyway at Home és crear un model de gran precisió tridimensional de la Via Làctia utilitzant dades recollides pel Sloan Digital Sky Survey."
 
 #: projects.inc:278
 msgid "Leiden University, The Netherlands"
@@ -831,17 +675,11 @@ msgstr "Universitat de Leiden, Països Baixos"
 msgid ""
 "Surface science calculations using Classical Dynamics.  Leiden Classical "
 "allows volunteers, students and other scientist to submit their personal "
-"calculations to the grid. Each user has his own personal queue for Classical "
-"Dynamics jobs. In this way students have used the grid to simulate liquid "
+"calculations to the grid. Each user has his own personal queue for Classical"
+" Dynamics jobs. In this way students have used the grid to simulate liquid "
 "argon, or to test the validity of the ideal gas law by actually doing the "
 "simulations through the grid."
-msgstr ""
-"Càlculs de ciència de superfície utilitzant la Dinàmica Clàssica.  Leiden "
-"Classical permet als voluntaris, estudiants i altres científics presentin "
-"els seus càlculs personals a la xarxa. Cada usuari té la seva pròpia cua "
-"personal per els treballs de Dinàmica Clàssica. D'aquesta manera els "
-"estudiants han utilitzat la xarxa per simular argó líquid, o per provar la "
-"validesa de la llei del gas ideal fent les simulacions a través de la xarxa."
+msgstr "Càlculs de ciència de superfície utilitzant la Dinàmica Clàssica.  Leiden Classical permet als voluntaris, estudiants i altres científics presentin els seus càlculs personals a la xarxa. Cada usuari té la seva pròpia cua personal per els treballs de Dinàmica Clàssica. D'aquesta manera els estudiants han utilitzat la xarxa per simular argó líquid, o per provar la validesa de la llei del gas ideal fent les simulacions a través de la xarxa."
 
 #: projects.inc:294
 msgid "Univ. of Wisconsin - Milwaukee, Max Planck Institute"
@@ -858,12 +696,7 @@ msgid ""
 "observatory.  Einstein at Home is a World Year of Physics 2005 project "
 "supported by the American Physical Society (APS) and by a number of "
 "international organizations."
-msgstr ""
-"Cerca d'estrelles de neutrons en rotació (també anomenades púlsars) usant "
-"dades dels detectors d'ones gravitacionals LIGO i GEO, i des del radio "
-"observatori d'Arecibo.  Einstein at Home és un projecte de l'Any Mundial de la "
-"Física 2005 recolzat per l'American Physical Society (APS) i per una sèrie "
-"d'organitzacions internacionals."
+msgstr "Cerca d'estrelles de neutrons en rotació (també anomenades púlsars) usant dades dels detectors d'ones gravitacionals LIGO i GEO, i des del radio observatori d'Arecibo.  Einstein at Home és un projecte de l'Any Mundial de la Física 2005 recolzat per l'American Physical Society (APS) i per una sèrie d'organitzacions internacionals."
 
 #: projects.inc:310 projects.inc:318
 msgid "CERN (European Organization for Nuclear Research)"
@@ -880,22 +713,14 @@ msgid ""
 "physics laboratory.  It is the most powerful instrument ever built to "
 "investigate on particles proprieties. LHC at home runs simulations to improve "
 "the design of LHC and its detectors."
-msgstr ""
-"El Gran Col·lisionador d'Hadrons (LHC) és un accelerador de partícules al "
-"CERN, l'Organització Europea de Recerca Nuclear, el major laboratori de "
-"física de partícules.  És l'instrument més poderós mai construït per "
-"investigar les propietats de les partícules. LHC at home executa simulacions "
-"per millorar el disseny de l'LHC i els seus detectors."
+msgstr "El Gran Col·lisionador d'Hadrons (LHC) és un accelerador de partícules al CERN, l'Organització Europea de Recerca Nuclear, el major laboratori de física de partícules.  És l'instrument més poderós mai construït per investigar les propietats de les partícules. LHC at home executa simulacions per millorar el disseny de l'LHC i els seus detectors."
 
 #: projects.inc:320
 msgid ""
-"This project uses CERN-developed virtual machine technology for full-fledged "
-"LHC event physics simulation on volunteer computers.  Requires that you "
+"This project uses CERN-developed virtual machine technology for full-fledged"
+" LHC event physics simulation on volunteer computers.  Requires that you "
 "install VirtualBox on your computer"
-msgstr ""
-"Aquest projecte utilitza la màquina virtual desenvolupada al CERN per la "
-"simulació física de l'LHC en els equips de voluntaris.  Requereix la "
-"instal·lació de VirtualBox en el teu ordinador"
+msgstr "Aquest projecte utilitza la màquina virtual desenvolupada al CERN per la simulació física de l'LHC en els equips de voluntaris.  Requereix la instal·lació de VirtualBox en el teu ordinador"
 
 #: projects.inc:326
 msgid "University of California, Berkeley"
@@ -912,13 +737,7 @@ msgid ""
 "radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
 "signals from space. Such signals are not known to occur naturally, so a "
 "detection would provide evidence of extraterrestrial technology."
-msgstr ""
-"SETI (Search for Extraterrestrial Intelligence) és una àrea científica que "
-"el seu objectiu és detectar vida intel·ligent fora de la Terra. Un "
-"enfocament, conegut com ràdio SETI, usa radiotelescopis per escoltar senyals "
-"de ràdio de banda estreta des de l'espai. Aquestes senyals se sap que "
-"succeeixen de forma natural, pel que la seva detecció pot proporcionar "
-"evidències de la tecnologia extraterrestre."
+msgstr "SETI (Search for Extraterrestrial Intelligence) és una àrea científica que el seu objectiu és detectar vida intel·ligent fora de la Terra. Un enfocament, conegut com ràdio SETI, usa radiotelescopis per escoltar senyals de ràdio de banda estreta des de l'espai. Aquestes senyals se sap que succeeixen de forma natural, pel que la seva detecció pot proporcionar evidències de la tecnologia extraterrestre."
 
 #: projects.inc:342
 msgid "Bielefeld University of Applied Sciences"
@@ -934,11 +753,7 @@ msgid ""
 "magnetic molecules may be used to develop tiny magnetic switches, with "
 "applications in medicine (such as local tumor chemotherapy) and "
 "biotechnology."
-msgstr ""
-"L'estudi dels imants moleculars i el control del magnetisme a nanoescala. "
-"Aquestes molècules magnètiques poden ser utilitzades per a desenvolupar "
-"petits interruptors magnètics, amb aplicacions en medicina com la "
-"quimioteràpia localitzada de tumor) i la biotecnologia."
+msgstr "L'estudi dels imants moleculars i el control del magnetisme a nanoescala. Aquestes molècules magnètiques poden ser utilitzades per a desenvolupar petits interruptors magnètics, amb aplicacions en medicina com la quimioteràpia localitzada de tumor) i la biotecnologia."
 
 #: projects.inc:351
 msgid "Multiple applications"
@@ -957,10 +772,7 @@ msgid ""
 "The objective of CAS at home is to encourage and assist scientists in China to "
 "adopt the technologies of volunteer computing and volunteer thinking for "
 "their research."
-msgstr ""
-"L'objectiu del CAS at home és fomentar i ajudar els científics a la Xina per "
-"adoptar les tecnologies de la informàtica de voluntaris i voluntàris que "
-"pensin en la seva investigació."
+msgstr "L'objectiu del CAS at home és fomentar i ajudar els científics a la Xina per adoptar les tecnologies de la informàtica de voluntaris i voluntàris que pensin en la seva investigació."
 
 #: projects.inc:365
 msgid "Mathematics, physics, evolution"
@@ -970,9 +782,7 @@ msgstr "Matemàtiques, física, evolució"
 msgid ""
 "Yoyo at home is an adapter between BOINC and several existing volunteer "
 "computing projects: ECM, Muon, Evolution at home, and distributed.net"
-msgstr ""
-"Yoyo at home és un adaptador entre BOINC i diversos projectes en curs de "
-"computació voluntària: ECM, Muon, Evolution at home, i distributed.net"
+msgstr "Yoyo at home és un adaptador entre BOINC i diversos projectes en curs de computació voluntària: ECM, Muon, Evolution at home, i distributed.net"
 
 #: projects.inc:371 projects.inc:527
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
@@ -986,13 +796,9 @@ msgstr "Projectes de recerca europeus"
 msgid ""
 "The EDGeS at Home Beta project integrates volunteer computing into the service "
 "grid network of Europe by allowing service grids to send workunits to be "
-"processed by the volunteers of this project. The scientific projects covered "
-"by the project include math, physics, biology, etc."
-msgstr ""
-"El projecte EDGeS at Home Beta integra computació voluntària en la xarxa de "
-"serveis d'Europa, en permetre les xarxes de serveis enviar workunits per a "
-"ser processades pels voluntaris d'aquest projecte. Els projectes de caràcter "
-"científic coberts pel projecte inclouen matemàtiques, física, biologia, etc"
+"processed by the volunteers of this project. The scientific projects covered"
+" by the project include math, physics, biology, etc."
+msgstr "El projecte EDGeS at Home Beta integra computació voluntària en la xarxa de serveis d'Europa, en permetre les xarxes de serveis enviar workunits per a ser processades pels voluntaris d'aquest projecte. Els projectes de caràcter científic coberts pel projecte inclouen matemàtiques, física, biologia, etc"
 
 #: projects.inc:379
 msgid "Spanish universities and research centers"
@@ -1017,15 +823,10 @@ msgstr "Recerca mèdica, ambiental i d'altres tipus de recerca humanitària"
 #: projects.inc:389
 msgid ""
 "To further critical non-profit research on some of humanity's most pressing "
-"problems by creating the world's largest volunteer computing grid.  Research "
-"includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"problems by creating the world's largest volunteer computing grid.  Research"
+" includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
 "clean water and many more."
-msgstr ""
-"Per a la investigació sense fins de lucre aprofundir més sobre alguns dels "
-"problemes més urgents de la humanitat mitjançant la creació de la xarxa de "
-"computació de voluntaris més gran del món. La investigació inclou el VIH-"
-"SIDA, el càncer, les malalties tropicals i oblidades, l'energia solar, "
-"l'aigua potable i moltes més."
+msgstr "Per a la investigació sense fins de lucre aprofundir més sobre alguns dels problemes més urgents de la humanitat mitjançant la creació de la xarxa de computació de voluntaris més gran del món. La investigació inclou el VIH-SIDA, el càncer, les malalties tropicals i oblidades, l'energia solar, l'aigua potable i moltes més."
 
 #: projects.inc:395
 msgid "Mathematics, computing, and games"
@@ -1051,10 +852,7 @@ msgstr "Criptografia"
 msgid ""
 "Attempt to decode 3 original Enigma messages. The signals were intercepted "
 "in the North Atlantic in 1942 and are believed to be unbroken."
-msgstr ""
-"Intent de desxifrar 3 missatges origunals Enigma. Els senyals van ser "
-"interceptats a l'Atlàntic Nord el 1942 i es creu que no han estat "
-"desxifrats."
+msgstr "Intent de desxifrar 3 missatges origunals Enigma. Els senyals van ser interceptats a l'Atlàntic Nord el 1942 i es creu que no han estat desxifrats."
 
 #: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
 #: projects.inc:528 projects.inc:568
@@ -1063,9 +861,7 @@ msgstr "Matemàtiques"
 
 #: projects.inc:466
 msgid "Study the Collatz Conjecture, an unsolved conjecture in mathematics"
-msgstr ""
-"Estudiar la Conjectura Collatz, una conjectura sense resoldre en "
-"matemàtiques"
+msgstr "Estudiar la Conjectura Collatz, una conjectura sense resoldre en matemàtiques"
 
 #: projects.inc:471
 msgid "California State University Fullerton"
@@ -1083,22 +879,13 @@ msgid ""
 "breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
 "NFS at Home is a continuation of that experience, only with integers that are "
 "hundreds of digits long."
-msgstr ""
-"NFS at Home és un projecte de recerca que utilitza ordinadors connectats a "
-"Internet per crear xarxa de filtratge en el Camp de Números Sieve per a la "
-"factorització dels nombres enters grans. Com un jove estudiant, que va "
-"guanyar la seva primera experiència en descomposat un nombre enter en "
-"factors primers, com 15 = 3 * 5 o 35 = 5 * 7. NFS at Home és una continuació "
-"d'aquesta experiència, només amb nombres enters que tenen centenars de "
-"dígits."
+msgstr "NFS at Home és un projecte de recerca que utilitza ordinadors connectats a Internet per crear xarxa de filtratge en el Camp de Números Sieve per a la factorització dels nombres enters grans. Com un jove estudiant, que va guanyar la seva primera experiència en descomposat un nombre enter en factors primers, com 15 = 3 * 5 o 35 = 5 * 7. NFS at Home és una continuació d'aquesta experiència, només amb nombres enters que tenen centenars de dígits."
 
 #: projects.inc:479
 msgid ""
 "Vilnius Gediminas Technical University and Kaunas University of Technology "
 "(Lithuania)"
-msgstr ""
-"Universitat Tecnica Vilnius Gediminas i Universitat Tecnològica de Kaunas "
-"(Lituània)"
+msgstr "Universitat Tecnica Vilnius Gediminas i Universitat Tecnològica de Kaunas (Lituània)"
 
 #: projects.inc:480
 msgid "Software testing"
@@ -1110,12 +897,7 @@ msgid ""
 "platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
 "well as others Lithuanian academic institutions.  Current applications "
 "involve the study of Monte-Carlo based software testing."
-msgstr ""
-"L'objectiu d'aquest projecte és proporcionar una potent plataforma de "
-"computació distribuïda per als científics a Vilnius Gediminas Technical "
-"University (VGTU), així com altres institucions acadèmiques de Lituània.  "
-"Les aplicacions actuals impliquen l'estudi de les proves de Monte-Carlo "
-"basats en programari de testatge."
+msgstr "L'objectiu d'aquest projecte és proporcionar una potent plataforma de computació distribuïda per als científics a Vilnius Gediminas Technical University (VGTU), així com altres institucions acadèmiques de Lituània.  Les aplicacions actuals impliquen l'estudi de les proves de Monte-Carlo basats en programari de testatge."
 
 #: projects.inc:503
 msgid "Mathematical Institute of Leiden University / Kennislink"
@@ -1130,23 +912,13 @@ msgid ""
 "any real h > 1. The ABC conjecture is currently one of the greatest open "
 "problems in mathematics. If it is proven to be true, a lot of other open "
 "problems can be answered directly from it."
-msgstr ""
-"Cerca per 'abc-triples': nombres enters positius a, b, c tals que a+b = c, "
-"on < b < c, a, b, c no tenen divisors comuns i c > rad(abc), en la que "
-"rad(n) és el producte dels diferents factors primers de n. La conjectura "
-"ABC diu que només hi ha un nombre finit de a, b, c tal que "
-"log(c)/log(rad(abc)) > h per a qualsevol h real > 1. La conjectura ABC és "
-"actualment un dels majors problemes oberts en matemàtiques. Si es demostra "
-"que és veritat, un munt d'altres problemes oberts poden ser respostes "
-"directament d'ella."
+msgstr "Cerca per 'abc-triples': nombres enters positius a, b, c tals que a+b = c, on < b < c, a, b, c no tenen divisors comuns i c > rad(abc), en la que rad(n) és el producte dels diferents factors primers de n. La conjectura ABC diu que només hi ha un nombre finit de a, b, c tal que log(c)/log(rad(abc)) > h per a qualsevol h real > 1. La conjectura ABC és actualment un dels majors problemes oberts en matemàtiques. Si es demostra que és veritat, un munt d'altres problemes oberts p [...]
 
 #: projects.inc:513
 msgid ""
 "Primegrid has multiple projects searching for different forms of very large "
 "prime numbers, including searching for the largest known prime number."
-msgstr ""
-"PrimeGrid té diversos projectes que busquen nombres primers molt grans de "
-"diferents formes, incloent la recerca del nombre primer més gran conegut."
+msgstr "PrimeGrid té diversos projectes que busquen nombres primers molt grans de diferents formes, incloent la recerca del nombre primer més gran conegut."
 
 #: projects.inc:519
 msgid "Hochschule RheinMain University of Applied Sciences"
@@ -1156,17 +928,13 @@ msgstr "Universitat de Ciències Aplicades Hochschule RheinMain"
 msgid ""
 "Search for counterexamples to two conjectures related to the identification "
 "of prime numbers"
-msgstr ""
-"Cerca de contraexemples a dues conjectures relacionades amb la identificació "
-"dels nombres primers"
+msgstr "Cerca de contraexemples a dues conjectures relacionades amb la identificació dels nombres primers"
 
 #: projects.inc:529
 msgid ""
 "Find all the generalized binary number systems (in which bases are matrices "
 "and digits are vectors) up to dimension 11."
-msgstr ""
-"Trobar tots els sistemes generalitzats de números binaris (en el qual les "
-"bases són les matrius i els dígits són vectors) fins la dimensió 11."
+msgstr "Trobar tots els sistemes generalitzats de números binaris (en el qual les bases són les matrius i els dígits són vectors) fins la dimensió 11."
 
 #: ../html/inc/news.inc:40
 msgid "Comment"
@@ -1174,620 +942,5 @@ msgstr "Comentari"
 
 #: ../html/inc/news.inc:111
 #, php-format
-#, php-format, php-format
 msgid "News is available as an %sRSS feed%s"
 msgstr "Les notícies estan disponiles en format %sRSS%s"
-
-# 75%
-#~ msgid "Astronomy, Physics, and Chemistry"
-#~ msgstr "Astronomia, Física i Química"
-
-#~ msgid "Download BOINC + Virtualbox"
-#~ msgstr "Baixa BOINC + Virtualbox"
-
-#, php-format
-#~ msgid "%s for %s (%s MB)"
-#~ msgstr "%s per %s (%s MB)"
-
-#~ msgid ""
-#~ "BOINC is a program that lets you donate your idle computer time to science "
-#~ "projects like SETI at home, Climateprediction.net, Rosetta at home, World "
-#~ "Community Grid, and many others. <p> After installing BOINC on your "
-#~ "computer, you can connect it to as many of these projects as you like."
-#~ msgstr ""
-#~ "BOINC és un programa que li permet donar el temps d'inactivitat del seu "
-#~ "ordinador a projectes científics com SETI at home, Climateprediction.net, "
-#~ "Rosetta at home, World Community Grid, i molts d'altres. <p> Després "
-#~ "d'instal·lar BOINC, pot connectar-lo a tots aquells projectes que desitgi."
-
-#~ msgid "Browser default"
-#~ msgstr "Navegador per defecte"
-
-#, php-format
-#~ msgid ""
-#~ " Use the idle time on your computer (Windows, Mac, or Linux) to cure "
-#~ "diseases, study global warming, discover pulsars, and do many other types of "
-#~ "scientific research.  It's safe, secure, and easy:  %sChoose%s projects  "
-#~ "%sDownload%s and run BOINC software  %sEnter%s an email address and "
-#~ "password. "
-#~ msgstr ""
-#~ " Utilitzar el temps d'inactivitat del seu ordinador  (Windows, Mac, o Linux) "
-#~ " per curar malalties, estudiar el calentament global,  descobrir pulsars, i "
-#~ "realitzar molts altres tipus de recerca científica.  Es segur i fàcil:  %"
-#~ "sEsculli%s els projectes  %sDescarregui%s i executi el programari BOINC  %"
-#~ "sEntri%s una adreça de correu electrònic i contrasenya. "
-
-#~ msgid "IBM Corporate Community Relations"
-#~ msgstr "Relacions d'IBM amb la Comunitat Empresarial"
-
-#~ msgid "Humanitarian research on disease, natural disasters and hunger."
-#~ msgstr ""
-#~ "Investigació jumanitària de la malaltia, els desastres naturals i la fam."
-
-#~ msgid ""
-#~ "To further critical non-profit research on some of humanity's most "
-#~ "pressing problems by creating the world's largest volunteer computing "
-#~ "grid.  Research includes HIV/AIDS, cancer, muscular dystrophy, dengue "
-#~ "fever, and many more."
-#~ msgstr ""
-#~ "Per a la investigació sense ànim de lucre més crítica sobre alguns dels "
-#~ "problemes més urgents de la humanitat mitjançant la creació de la major "
-#~ "xarxa de computació voluntària. La recerca inclou el VIH/SIDA, càncer, "
-#~ "distròfia muscular, la febre del dengue, i molts més."
-
-#~ msgid ""
-#~ "Primegrid is generating a public sequential prime number database, and is "
-#~ "searching for large twin primes of the form k*2<sup>n</sup>+1 and "
-#~ "k*2<sup>n</sup>-1"
-#~ msgstr ""
-#~ "PrimeGrid està generant una base de dades pública seqüencial de nombres "
-#~ "primers, i està cercant grans nombres primers bessons de la manera "
-#~ "k*2<sup>n</sup>+1 i k*2<sup>n</sup>-1"
-
-#~ msgid "FreeHAL"
-#~ msgstr "FreeHAL"
-
-#~ msgid "private"
-#~ msgstr "privat"
-
-#~ msgid "POEM at HOME"
-#~ msgstr "POEM at HOME"
-
-#~ msgid "Docking at Home"
-#~ msgstr "Docking at Home"
-
-#~ msgid "GPUGrid.net"
-#~ msgstr "GPUGrid.net"
-
-#~ msgid "Superlink at Technion"
-#~ msgstr "Superlink at Technion"
-
-#~ msgid "The Lattice Project"
-#~ msgstr "El projecte Lattice"
-
-#~ msgid "Malariacontrol.net"
-#~ msgstr "Malariacontrol.net"
-
-#~ msgid "Rosetta at home"
-#~ msgstr "Rosetta at home"
-
-#~ msgid "SIMAP"
-#~ msgstr "SIMAP"
-
-#~ msgid "Virtual Prairie"
-#~ msgstr "Praderia virtual"
-
-#~ msgid "University of Houston"
-#~ msgstr "Universitat de Houston"
-
-#~ msgid "Study of botanical ecosystems"
-#~ msgstr "Estudi dels ecosistemes botànics"
-
-#~ msgid ""
-#~ "Provide ecological guidelines on the design of prairies with the best "
-#~ "potential for water purification."
-#~ msgstr ""
-#~ "Proporcionar directrius sobre el disseny ecològic de les praderies amb el "
-#~ "millor potencial per a la purificació de l'aigua."
-
-#~ msgid "Climateprediction.net"
-#~ msgstr "Climateprediction.net"
-
-#~ msgid "Astronomy/Physics/Chemistry"
-#~ msgstr "Astronomia/Física/Química"
-
-#~ msgid "eOn"
-#~ msgstr "eOn"
-
-#~ msgid "Orbit at home"
-#~ msgstr "Orbit at home"
-
-#~ msgid "Planetary Science Institute"
-#~ msgstr "Institut de Ciència Planetària"
-
-#~ msgid "Monitor and study the hazard posed by near-Earth asteroids"
-#~ msgstr ""
-#~ "Seguiment i estudi dels perills que plantegen els asteroides propers a la "
-#~ "Terra"
-
-#~ msgid "Cosmology at Home"
-#~ msgstr "Cosmology at Home"
-
-#~ msgid "University of Illinois at Urbana-Chamapign"
-#~ msgstr "Universitat d'Illinois a Urbana-Chamapign"
-
-#~ msgid "Milkyway at home"
-#~ msgstr "Milkyway at home"
-
-#~ msgid "Leiden Classical"
-#~ msgstr "Leiden Clàssic"
-
-#~ msgid "uFluids at home"
-#~ msgstr "uFluids at home"
-
-#~ msgid "Purdue University"
-#~ msgstr "Universitat de Purdue"
-
-#~ msgid "Physics/Aeronautics"
-#~ msgstr "Física/Aeronàutica"
-
-#~ msgid ""
-#~ "The uFluids project simulates two-phase fluid behavior in microgravity "
-#~ "and microfluidics problems. Our goal is to design better satellite "
-#~ "propellant management devices and address two-phase flow in microchannel "
-#~ "and MEMS devices."
-#~ msgstr ""
-#~ "El projecte uFluids simula el comportament de fluids de dues fases en "
-#~ "microgravetat i problemes de microfluids. El nostre objectiu és millorar "
-#~ "el disseny de dispositius de gestió de carburant per satèl·lit i la "
-#~ "direcció del flux de dues fases en els dispositius de microcanal i MEMS."
-
-#~ msgid "Einstein at home"
-#~ msgstr "Einstein at home"
-
-#~ msgid "LHC at home"
-#~ msgstr "LHC at home"
-
-#~ msgid "SETI at home"
-#~ msgstr "SETI at home"
-
-#~ msgid "Quantum Monte Carlo at Home"
-#~ msgstr "Quantum Monte Carlo at Home"
-
-#~ msgid "University of Muenster (Germany)"
-#~ msgstr "Universitat de Münster (Alemanya)"
-
-#~ msgid ""
-#~ "Study the structure and reactivity of molecules using Quantum Chemistry."
-#~ msgstr ""
-#~ "Estudi de l'estructura i reactivitat de molècules utilitzant Química "
-#~ "Quàntica."
-
-#~ msgid "Spinhenge at home"
-#~ msgstr "Spinhenge at home"
-
-#~ msgid "CAS at home"
-#~ msgstr "CAS at home"
-
-#~ msgid "Yoyo at home"
-#~ msgstr "Yoyo at home"
-
-#~ msgid "EDGeS at Home"
-#~ msgstr "EDGeS at Home"
-
-#~ msgid "Ibercivis"
-#~ msgstr "Ibercivis"
-
-#~ msgid "World Community Grid"
-#~ msgstr "World Community Grid"
-
-#~ msgid "Enigma at Home"
-#~ msgstr "Enigma at Home"
-
-#~ msgid "Collatz Conjecture"
-#~ msgstr "Conjectura de Collatz"
-
-#~ msgid "NFS at home"
-#~ msgstr "NFS at home"
-
-#~ msgid "VTU at home"
-#~ msgstr "VTU at home"
-
-#~ msgid "AQUA at home"
-#~ msgstr "AQUA at home"
-
-#~ msgid "D-Wave Systems, Inc."
-#~ msgstr "D-Wave Systems, Inc."
-
-#~ msgid "Quantum computing"
-#~ msgstr "Computació quàntica"
-
-#~ msgid ""
-#~ "D-Wave's AQUA (Adiabatic QUantum Algorithms) is a research project whose "
-#~ "goal is to predict the performance of superconducting adiabatic quantum "
-#~ "computers on a variety of hard problems arising in fields ranging from "
-#~ "materials science to machine learning. AQUA at home uses Internet-connected "
-#~ "computers to help design and analyze quantum computing algorithms, using "
-#~ "Quantum Monte Carlo techniques."
-#~ msgstr ""
-#~ "D-Wave AQUA (adiabàtic algorismes quàntics) és un projecte de recerca amb "
-#~ "l'objectiu de predir el rendiment dels equips superconductors quàntica "
-#~ "adiabàtica en la resolució d'una varietat de problemes difícils que "
-#~ "sorgeixen en camps que van des de la ciència dels materials al "
-#~ "d'aprenentatge automàtic. AQUA at home utilitza ordinadors connectats a "
-#~ "Internet per ajudar a dissenyar i analitzar algorismes de computació "
-#~ "quàntica, utilitzant tècniques de Montecarlo quàntica."
-
-#~ msgid "ABC at home"
-#~ msgstr "ABC at home"
-
-#~ msgid "PrimeGrid"
-#~ msgstr "PrimeGrid"
-
-#~ msgid "primaboinca"
-#~ msgstr "primaboinca"
-
-#~ msgid "SZTAKI Desktop Grid"
-#~ msgstr "SZTAKI Desktop Grid"
-
-#~ msgid "Chess960 at home"
-#~ msgstr "Chess960 at home"
-
-#~ msgid "Chess-960.org"
-#~ msgstr "Chess-960.org"
-
-#~ msgid "Game-playing"
-#~ msgstr "Execució de jocs"
-
-#~ msgid ""
-#~ "This project studies Chess 960, a variant of orthodox chess. In classical "
-#~ "chess the starting position of the game never changes.  In Chess 960, "
-#~ "just before the start of every game, the initial configuration of the "
-#~ "chess pieces is determined randomly."
-#~ msgstr ""
-#~ "Aquest projecte estudia Chess 960, una variant dels escacs ortodox.  En "
-#~ "els escacs clàssic la posició inicial del joc no canvia mai. En el Chess "
-#~ "960, just abans de l'inici de cada joc, la configuració inicial de les "
-#~ "peces d'escacs es determina l'atzar."
-
-#~ msgid "The current release is known to work with these Linux versions:"
-#~ msgstr ""
-#~ "La versió actual està preparada per treballar amb aquestes versions de "
-#~ "Linux:"
-
-#~ msgid ""
-#~ "For other Linux versions, check if a BOINC package is offered by your "
-#~ "Linux distribution."
-#~ msgstr ""
-#~ "Per a altres versions de Linux, comprovar si la seva distribució de Linux "
-#~ "li ofereix un paquet de BOINC."
-
-#~ msgid ""
-#~ "Alternatively, download the %1BOINC client for older Linux versions%2. "
-#~ "This doesn't have a graphical interface, but it should work on all Linux "
-#~ "systems, both x86 and x64."
-#~ msgstr ""
-#~ "Alternativament, descarregui el client %1BOINC per a versions anteriors "
-#~ "de Linux%2. Això no té una interfície gràfica, però que hauria de "
-#~ "funcionar en tots els sistemes Linux, x86 i x64."
-
-#~ msgid ""
-#~ "Note: if your computer is equipped with an Graphics Processing Unit "
-#~ "(GPU), you may be able to %suse it to compute faster%s"
-#~ msgstr ""
-#~ "Nota: si el vostre ordinador està equipat amb una unitat de processament "
-#~ "gràfic NVIDIA (GPU), pot %sutilitzar-la per una computació més ràpida%s"
-
-#~ msgid "TeraFLOPS."
-#~ msgstr "TeraFLOPS."
-
-#~ msgid "Conferences"
-#~ msgstr "Conferències"
-
-#~ msgid "[check all that apply]"
-#~ msgstr "[seleccioni totes les que correspongui]"
-
-#~ msgid "Other:"
-#~ msgstr "Altres:"
-
-#~ msgid "Yes - I have been running BOINC on my computer for..."
-#~ msgstr "Si - he utilitzat BOINC en el meu ordinador durant..."
-
-#~ msgid "less than a week"
-#~ msgstr "menys d'una setmana"
-
-#~ msgid "less than a month"
-#~ msgstr "menys d'un mes"
-
-#~ msgid "less than a year"
-#~ msgstr "menys d'un any"
-
-#~ msgid "more than a year"
-#~ msgstr "més d'un any"
-
-#~ msgid "No - I used to run BOINC, but..."
-#~ msgstr "No - utilitzava BOINC, peró..."
-
-#~ msgid "I lost interest"
-#~ msgstr "he perdut l'interés"
-
-#~ msgid "it was too complicated"
-#~ msgstr "era massa complicat"
-
-#~ msgid "I stopped it and forgot to start again"
-#~ msgstr "el vaig aturar i oblidar d'iniciar-lo de nou"
-
-#~ msgid "it caused problems on my computer"
-#~ msgstr "provocava problemes en el meu ordinador"
-
-#~ msgid "it used too much electricity"
-#~ msgstr "utilitzava massa electricitat"
-
-#~ msgid "I switched to a non-BOINC computing project"
-#~ msgstr "vaig canviar a projecte no basat en BOINC"
-
-#~ msgid "No - I tried running BOINC, but..."
-#~ msgstr "No - vaig provar d'executar BOINC, peró..."
-
-#~ msgid "the software didn't install correctly"
-#~ msgstr "el programa no s'instal·lava correctament"
-
-#~ msgid "I couldn't figure out how to use the software"
-#~ msgstr "no vaig esbrinar com utilitzar el programa"
-
-#~ msgid "I had network communication problems"
-#~ msgstr "vaig tenir problemes a laconnexió de xarxa"
-
-#~ msgid "I couldn't attach to a project"
-#~ msgstr "no vaig poder adjuntar-me a un projecte"
-
-#~ msgid "I attached to a project, but never got any work"
-#~ msgstr "em vaig adjuntar a un projecte, peró mai vaig obtenir cap feina"
-
-#~ msgid "No - I never tried running BOINC, because..."
-#~ msgstr "No - mai vaig provar d'executar BOINC, perquè..."
-
-#~ msgid "I was concerned about security"
-#~ msgstr "estava preocopat en la seguretat"
-
-#~ msgid "I wasn't interested in any of the projects"
-#~ msgstr "no em va interessar cap dels projectess"
-
-#~ msgid "I don't have permission to run it on my computer"
-#~ msgstr "no tenia permis per executar-lo a cap dels meus ordinadors"
-
-#~ msgid "No version was available for my computer"
-#~ msgstr "no hi havia una versió per el meu ordinador"
-
-#~ msgid "What kind of computers do you have running BOINC?"
-#~ msgstr "En quin tipus d'ordinador està executant BOINC?"
-
-#~ msgid "Where are they?"
-#~ msgstr "A on els té?"
-
-#~ msgid "Work"
-#~ msgstr "A la feina"
-
-#~ msgid "School"
-#~ msgstr "A l'escola"
-
-#~ msgid "How many computers?"
-#~ msgstr "Quants ordinadors té?"
-
-#~ msgid "On average, how many hours per day are they powered on?"
-#~ msgstr "En promitg, quantes hores al dia estan en marxa?"
-
-#~ msgid "Age"
-#~ msgstr "Edat"
-
-#~ msgid "Sex"
-#~ msgstr "Sexe"
-
-#~ msgid "Male"
-#~ msgstr "Masculí"
-
-#~ msgid "Female"
-#~ msgstr "Femení"
-
-#~ msgid "Your level of computer expertise"
-#~ msgstr "El seu nivell d'experiència en ordinadors"
-
-#~ msgid "Beginner"
-#~ msgstr "Principiant"
-
-#~ msgid "Intermediate"
-#~ msgstr "Intermedi"
-
-#~ msgid "Advanced"
-#~ msgstr "Avançat"
-
-#~ msgid "Where did you learn about BOINC projects?"
-#~ msgstr "On va tenir coneixença sobre els projectes BOINC?"
-
-#~ msgid "TV/radio/newspaper"
-#~ msgstr "TV/ràdio/diaris"
-
-#~ msgid "From friends, relatives, or coworkers"
-#~ msgstr "Per amics, parents, companys de feina"
-
-#~ msgid "Team message boards or web sites"
-#~ msgstr "Panells de missatges o llocs web"
-
-#~ msgid "The BOINC web site"
-#~ msgstr "Pàgina web de BOINC"
-
-#~ msgid "Other web sites"
-#~ msgstr "Altres pàgines web"
-
-#~ msgid ""
-#~ "Which are the most important factors when you decide whether to "
-#~ "participate in a BOINC project?"
-#~ msgstr ""
-#~ "Quins son els factors més importants que fa decidir si participar en un "
-#~ "projecte BOINC?"
-
-#~ msgid "Nice-looking screensaver graphics"
-#~ msgstr "Els atractius grafics dels protectors de pantalla"
-
-#~ msgid "Fair and quick granting of credit for work done"
-#~ msgstr "Adequada i ràpida concessió de credits per la feina feta"
-
-#~ msgid "Getting more credit from this project than from others"
-#~ msgstr "L'obtenció de mes crèdit d'aquest projecte que d'altres"
-
-#~ msgid "Helpful and friendly message boards"
-#~ msgstr "Plafons de missatges utils i amigables"
-
-#~ msgid "Participation by project staff on the message boards"
-#~ msgstr ""
-#~ "La participació dels administradors del projecte en els plafons de "
-#~ "misatges"
-
-#~ msgid "Informative project web site"
-#~ msgstr "La pàgina web del projecte es informativa"
-
-#~ msgid "The science is important and beneficial"
-#~ msgstr "La ciència és important i beneficiosa"
-
-#~ msgid "Non-profit, and results are public"
-#~ msgstr "Sense ànim de lucre, i els resultats son publics"
-
-#~ msgid "Personal recognition if my computer finds something"
-#~ msgstr "Reconeixement personal si el meu ordinador troba alguna cosa"
-
-#~ msgid "Publication by the project in scientific journals"
-#~ msgstr "Publicions del projecte a revistes científiques"
-
-#~ msgid "Periodic email newsletters from the project"
-#~ msgstr "Lliurament de novetats per correu electònic des del projecte"
-
-#~ msgid "How many BOINC projects do you participate in?"
-#~ msgstr "A quans projectes està participan?"
-
-#~ msgid "Do you run BOINC as a screensaver?"
-#~ msgstr "Executa BOINC en modus protector de pantalla?"
-
-#~ msgid "Yes"
-#~ msgstr "Sí"
-
-#~ msgid "No"
-#~ msgstr "No"
-
-#~ msgid "Your usage of project messages boards:"
-#~ msgstr "La seva participació als plfons de noricies:"
-
-#~ msgid "to read information"
-#~ msgstr "per llegir informació"
-
-#~ msgid "to read and post information"
-#~ msgstr "per llegir i deixar-hi informació"
-
-#~ msgid "None"
-#~ msgstr "Cap"
-
-#~ msgid ""
-#~ "Where do you get information to help resolve problems with BOINC and/or "
-#~ "BOINC projects?"
-#~ msgstr ""
-#~ "D'on obté ajuda per resoldre els problemes amb BOINC i/o els projectes "
-#~ "BOINC"
-
-#~ msgid "The project message boards"
-#~ msgstr "Plafons de notícies del projecte"
-
-#~ msgid "The BOINC message boards"
-#~ msgstr "Plafons de notícies de BOINC"
-
-#~ msgid "BOINC mailing lists"
-#~ msgstr "Llistes de correu de BOINC"
-
-#~ msgid "The Unofficial BOINC Wiki"
-#~ msgstr "Wiki no oficial de BOINC"
-
-#~ msgid "Team web sites"
-#~ msgstr "Pàgines web dels equips"
-
-#~ msgid "Google or other search engines"
-#~ msgstr "Google o altres cercadors"
-
-#~ msgid "... more"
-#~ msgstr "... més"
-
-#~ msgid "BOINC user survey"
-#~ msgstr "Enquesta per usuaris BOINC"
-
-#~ msgid ""
-#~ "Several volunteer computing projects, including Climateprediction.net, "
-#~ "Einstein at home, and SETI at home, use software called BOINC.  If you "
-#~ "participate in projects like this, we request that you answer the "
-#~ "following questions.  This will help BOINC-based projects increase "
-#~ "participation and achieve greater scientific results. <p> Please answer "
-#~ "as many questions as you want, then go to the bottom and click OK. If you "
-#~ "previously completed the survey but your answers have changed, please "
-#~ "complete it again - your new answers will replace the old ones. <p> The "
-#~ "current results of the survey are <a href=poll_results.php>here</a>. "
-#~ msgstr ""
-#~ "Diversos projectes voluntaris de computació, incloent-hi "
-#~ "Climateprediction.net, Einstein at home, i SETI at home, utilitzen el "
-#~ "programari anomenat BOINC. Si participa en un projecte d'aquest tipus, li "
-#~ "demanem que respongui les següents preguntes. Aixó ajudarà els projectes "
-#~ "basats en BOINC a augmentar la participació i assolir més grans fites "
-#~ "científiques. <p> Si us plau respongui tantes preguntes com pugui, "
-#~ "després vagi al final i premi Ok. Si ja havia respost amb anterioritat "
-#~ "l'enquesta però vol canviar les seves respostes, si us plau el respongui "
-#~ "tot de nou - les noves respostes sustituiran les velles. <p> Els "
-#~ "resultats actuals de l'enquesta son a <a href=poll_results.php>here</a>. "
-
-#~ msgid "Do you run BOINC?"
-#~ msgstr "Executa BOINC?"
-
-#~ msgid "Your participation"
-#~ msgstr "La seva participació"
-
-#~ msgid "Your computers"
-#~ msgstr "Els seus ordinadors"
-
-#~ msgid "You"
-#~ msgstr "Vosté"
-
-#~ msgid "Nationality"
-#~ msgstr "Nacionalitat"
-
-#~ msgid "Comments"
-#~ msgstr "Comentaris"
-
-#~ msgid ""
-#~ "Please suggest ways that BOINC, and the projects that use it, could be "
-#~ "improved:"
-#~ msgstr ""
-#~ "Si us plau suggereixi maneres en que BOINC, i els projectes que utilitza, "
-#~ "poden ser millorats:"
-
-#~ msgid "When done click:"
-#~ msgstr "En acabar premi:"
-
-#~ msgid "Error - results not recorded"
-#~ msgstr "Error - els resultats no s'han guardat"
-
-#~ msgid ""
-#~ "An internal error has prevented us from recording your survey response.  "
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Un error intern ha evitat enregistrar de les seves respostes a "
-#~ "l'enquesta. Si us plau provi-ho de nou més tard."
-
-#~ msgid "Survey response recorded"
-#~ msgstr "Enquesta enregistrada"
-
-#~ msgid "Thank you for completing the BOINC user survey."
-#~ msgstr "Gràcies per respondre a l'enquesta a usuaris BOINC."
-
-#~ msgid "Survey results"
-#~ msgstr "Resultats de l'enquesta"
-
-#~ msgid ""
-#~ "These are the current results of the <a href=poll.php>BOINC user survey</"
-#~ "a>.  This page is updated every hour."
-#~ msgstr ""
-#~ "Aquest son els resultats actuals de <a href=poll.php>BOINC user survey</"
-#~ "a>. Aquesta pàgina s'actualitza cada hora."
diff --git a/locale/cs/BOINC-Client.mo b/locale/cs/BOINC-Client.mo
index 1b9901f..97cf231 100644
Binary files a/locale/cs/BOINC-Client.mo and b/locale/cs/BOINC-Client.mo differ
diff --git a/locale/cs/BOINC-Client.po b/locale/cs/BOINC-Client.po
old mode 100755
new mode 100644
index 83c87c6..595b6d2
--- a/locale/cs/BOINC-Client.po
+++ b/locale/cs/BOINC-Client.po
@@ -1,24 +1,24 @@
 # 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:
+# Petr Nekvinda <petr.nekvinda at gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-10-15 22:25-0700\n"
-"PO-Revision-Date: 2015-02-10 14:43-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: cs\n"
+"PO-Revision-Date: 2015-02-28 16:59+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-POOTLE-MTIME: 1377896370.0\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: acct_mgr.cpp:450
-#: acct_mgr.cpp:459
+#: acct_mgr.cpp:450 acct_mgr.cpp:459
 msgid "Message from account manager"
 msgstr "Zpráva od správce účtu"
 
@@ -27,7 +27,9 @@ msgid "Message from server"
 msgstr "Zpráva ze serveru"
 
 #: client_state.cpp:258
-msgid "Some tasks need more memory than allowed by your preferences.  Please check the preferences."
+msgid ""
+"Some tasks need more memory than allowed by your preferences.  Please check "
+"the preferences."
 msgstr "Některé úlohy vyžadují více operační paměti, než máte povoleno v předvolbách. Zkontrolujte prosím vaše předvolby."
 
 #: client_state.cpp:520
@@ -40,11 +42,12 @@ msgstr "Proměnná prostředí HTTP_PROXY musí obsahovat HTTP proxy adresu."
 
 #: cs_scheduler.cpp:613
 #, c-format
-msgid "You used the wrong URL for this project.  When convenient, remove this project, then add %s"
+msgid ""
+"You used the wrong URL for this project.  When convenient, remove this "
+"project, then add %s"
 msgstr "Použili jste neplatnou URL adresu pro tento projekt. Až to bude vhodné, odeberte tento projekt a poté přidejte %s"
 
-#: cs_statefile.cpp:828
-#: ../sched/sched_types.cpp:259
+#: cs_statefile.cpp:828 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
 msgstr "Chyba syntaxe v app_info.xml"
 
@@ -56,18 +59,15 @@ msgstr "Soubor odkazovaný v 'app_info.xml' neexistuje:"
 msgid "A new version of BOINC is available."
 msgstr "Je dostupná nová verze BOINC."
 
-#: current_version.cpp:94
-#: current_version.cpp:102
+#: current_version.cpp:94 current_version.cpp:102
 msgid "Download"
 msgstr "Stáhnout"
 
-#: log_flags.cpp:269
-#: log_flags.cpp:449
+#: log_flags.cpp:269 log_flags.cpp:449
 msgid "Unexpected text in cc_config.xml"
 msgstr "Nečekaný text v cc_config.xml"
 
-#: log_flags.cpp:423
-#: log_flags.cpp:475
+#: log_flags.cpp:423 log_flags.cpp:475
 msgid "Unrecognized tag in cc_config.xml"
 msgstr "Nečekaný tag v cc_config.xml"
 
@@ -92,7 +92,9 @@ msgid "Invalid code signing key.  To fix, remove and add this project."
 msgstr "Neplatný podepisovací klíč. Pro opravu prosím odeberte a znova přidejte tento projekt."
 
 #: ../sched/handle_request.cpp:859
-msgid "The project has changed its security key.  Please remove and add this project."
+msgid ""
+"The project has changed its security key.  Please remove and add this "
+"project."
 msgstr "Projekt změnil svůj bezpečnostní klíč. Pro opravu prosím odeberte a znova přidejte tento projekt."
 
 #: ../sched/handle_request.cpp:943
@@ -101,10 +103,11 @@ msgstr "Tento projekt nepodporuje Váš operační systém"
 
 #: ../sched/handle_request.cpp:969
 msgid "This project doesn't support CPU type"
-msgstr "Tento projekt nepodporuje CPU výpočty"
+msgstr "Vaše CPU není projektem podporováno"
 
 #: ../sched/handle_request.cpp:993
-msgid "Your BOINC client software is too old.  Please install the current version."
+msgid ""
+"Your BOINC client software is too old.  Please install the current version."
 msgstr "Váš program BOINC je příliš starý. Nainstalujte si prosím aktuální verzi."
 
 #: ../sched/handle_request.cpp:1259
@@ -112,18 +115,21 @@ msgid "This project doesn't support computers of type"
 msgstr "Tento projekt nepodporuje počítače typu"
 
 #: ../sched/sched_send.cpp:1092
-msgid "Upgrade to the latest driver to process tasks using your computer's GPU"
+msgid ""
+"Upgrade to the latest driver to process tasks using your computer's GPU"
 msgstr "Pro zpracování úkolů pomoci GPU si prosím nainstalujte nejnovější ovladače."
 
 #: ../sched/sched_send.cpp:1099
-msgid "Upgrade to the latest driver to use all of this project's GPU applications"
+msgid ""
+"Upgrade to the latest driver to use all of this project's GPU applications"
 msgstr "Pro využití všech GPU aplikací tohoto projektu si prosím nainstalujte nejnovější ovladače."
 
 #: ../sched/sched_send.cpp:1118
-msgid "A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to the current version"
+msgid ""
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to"
+" the current version"
 msgstr "Pro využití vaší nVidia GPU je zapotřebí stáhnout si aktuální verzi programu BOINC."
 
-# 94%
 #: ../sched/sched_send.cpp:1146
 #, c-format
 msgid "An %s GPU is required to run tasks for this project"
@@ -143,7 +149,8 @@ msgstr "Nainstalujte si prosím novou verzi BOINC, která je vyžadována."
 
 #: ../sched/sched_send.cpp:1305
 #, c-format
-msgid "Tasks for %s are available, but your preferences are set to not accept them"
+msgid ""
+"Tasks for %s are available, but your preferences are set to not accept them"
 msgstr "Jsou dostupné úkoly pro %s, ale podle vašich předvoleb nebudou přijímány."
 
 #: ../sched/sched_types.cpp:254
@@ -153,35 +160,3 @@ msgstr "Neznámé jméno aplikace v app_info.xml"
 #: ../sched/sched_version.cpp:214
 msgid "Your app_info.xml file doesn't have a usable version of"
 msgstr "Váš soubor app_info.xml neobsahuje použitelnou verzi"
-
-#~ msgid "Download it."
-#~ msgstr "Stáhnout."
-#~ msgid "An NVIDIA or ATI GPU is required to run tasks for this project"
-#~ msgstr "Pro počítání úkolů u tohoto projektu je zapotřebí nVidia nebo AMD GPU"
-#~ msgid "An NVIDIA GPU is required to run tasks for this project"
-#~ msgstr "Pro počítání úkolů u tohoto projektu je zapotřebí nVidia GPU"
-#~ msgid "An ATI GPU is required to run tasks for this project"
-#~ msgstr "Pro počítání úkolů u tohoto projektu je zapotřebí AMD GPU"
-#~ msgid "Tasks for NVIDIA GPU are available, but your preferences are set to not accept them"
-#~ msgstr "Jsou dostupné úkoly pro nVidia GPU, ale vaše nastavení je nedovoluje přijímat"
-#~ msgid "Tasks for ATI GPU are available, but your preferences are set to not accept them"
-#~ msgstr "Jsou dostupné úkoly pro AMD GPU, ale vaše nastavení je nedovoluje přijímat."
-#~ msgid "Tasks for CPU are available, but your preferences are set to not accept them"
-#~ msgstr "Jsou dostupné úkoly pro CPU, ale vaše nastavení je nedovoluje přijímat"
-#~ msgid "error"
-#~ msgstr "chyba"
-#~ msgid "Can't resolve hostname in remote_hosts.cfg"
-#~ msgstr "Nelze rozeznat adresu hostitele v remote_hosts.cfg"
-#~ msgid "is not available for"
-#~ msgstr "není dostupná pro"
-#~ msgid "Notice from BOINC"
-#~ msgstr "Zpráva od systému BOINC"
-#~ msgid "Message from"
-#~ msgstr "Zpráva od"
-#~ msgid ""
-#~ "You may have an outdated code signing key.  Try attaching and reattaching "
-#~ "this project."
-#~ msgstr ""
-#~ "Možná máte zastaralý podepisovací klíč. Zkuste se odpojit a znova "
-#~ "připojit k tomuto projektu."
-
diff --git a/locale/cs/BOINC-Manager.mo b/locale/cs/BOINC-Manager.mo
index f7e20e7..586385d 100644
Binary files a/locale/cs/BOINC-Manager.mo and b/locale/cs/BOINC-Manager.mo differ
diff --git a/locale/cs/BOINC-Manager.po b/locale/cs/BOINC-Manager.po
index 99567ed..046b90b 100644
--- a/locale/cs/BOINC-Manager.po
+++ b/locale/cs/BOINC-Manager.po
@@ -1,64 +1,54 @@
 # 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:
+# Pavel <xxxq at seznam.cz>, 2015
+# Petr Nekvinda <petr.nekvinda at gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.x\n"
+"Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-15 14:15-0500\n"
-"PO-Revision-Date: 2015-02-10 14:45-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Development Team <boinc_loc at ssl.berkeley.edu>\n"
-"Language: cs\n"
+"POT-Creation-Date: 2014-02-02 00:00-0800\n"
+"PO-Revision-Date: 2015-02-28 20:13+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc_7.4\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1420888916.0\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-SearchPath-0: clientgui\n"
-"X-Poedit-SearchPath-1: clientgui/msw\n"
-"X-Poedit-SearchPath-2: clientgui/gtk\n"
-"X-Poedit-SearchPath-3: clientgui/mac\n"
-
-# 81%
-#: clientgui/AccountInfoPage.cpp:387
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: AccountInfoPage.cpp:387
 #, c-format
 msgid "Identify your account at %s"
 msgstr "Zadejte údaje k vašemu účtu u %s"
 
-#: clientgui/AccountInfoPage.cpp:393
+#: AccountInfoPage.cpp:393
 msgid ""
 "Please enter your account information\n"
 "(to create an account, visit the project's web site)"
-msgstr ""
-"Zadejte prosím údaje k vašemu účtu\n"
-"(účet si vytvoříte na webových stránkách projektu)"
+msgstr "Zadejte prosím údaje k vašemu účtu\n(účet si vytvoříte na webových stránkách projektu)"
 
-#: clientgui/AccountInfoPage.cpp:397
+#: AccountInfoPage.cpp:397
 msgid ""
 "This project is not currently accepting new accounts.\n"
 "You can add it only if you already have an account."
-msgstr ""
-"Tento projekt momentálně neumožňuje vytváření nových účtů.\n"
-"Můžete jej přidat pouze, pokud již máte existující účet."
+msgstr "Tento projekt momentálně neumožňuje vytváření nových účtů.\nMůžete jej přidat pouze, pokud již máte existující účet."
 
-#: clientgui/AccountInfoPage.cpp:401
+#: AccountInfoPage.cpp:401
 msgid "Are you already running this project?"
 msgstr "Máte již vytvořený účet u tohoto projektu?"
 
-#: clientgui/AccountInfoPage.cpp:405
+#: AccountInfoPage.cpp:405
 msgid "&No, new user"
 msgstr "&Ne, jsem nový uživatel"
 
-#: clientgui/AccountInfoPage.cpp:408
+#: AccountInfoPage.cpp:408
 msgid "&Yes, existing user"
-msgstr "Ano, již mám účet"
+msgstr "&Ano, již mám účet"
 
-#: clientgui/AccountInfoPage.cpp:413
+#: AccountInfoPage.cpp:413
 msgid ""
 "We were not able to set up your account information\n"
 "automatically.\n"
@@ -66,506 +56,469 @@ msgid ""
 "Please click on the 'Find login information' link\n"
 "below to find out what to put in the email address and\n"
 "password fields."
-msgstr ""
-"Nepodařilo se automaticky nastavit informace\n"
-"o vašem účtu.\n"
-"\n"
-"Pro nápovědu co zadat do kolonek Emailová adresa a Heslo\n"
-"klikněte dole na odkaz 'Získat přihlašovací informace'."
+msgstr "Nepodařilo se automaticky nastavit informace\no vašem účtu.\n\nPro nápovědu co zadat do kolonek Emailová adresa a Heslo\nklikněte dole na odkaz 'Získat přihlašovací informace'."
 
-#: clientgui/AccountInfoPage.cpp:416
+#: AccountInfoPage.cpp:416
 msgid "Find login information"
 msgstr "Získat přihlašovací informace"
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:649
+#: AccountInfoPage.cpp:436 AccountInfoPage.cpp:641
 msgid "&Password:"
-msgstr "Heslo:"
+msgstr "&Heslo:"
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:673
+#: AccountInfoPage.cpp:443 AccountInfoPage.cpp:665
 msgid "Choose a &password:"
-msgstr "Zvolte si heslo:"
+msgstr "Zvolte si &heslo:"
 
-#: clientgui/AccountInfoPage.cpp:446
+#: AccountInfoPage.cpp:446
 msgid "C&onfirm password:"
 msgstr "P&otvrďte heslo:"
 
-#: clientgui/AccountInfoPage.cpp:453
+#: AccountInfoPage.cpp:453
 #, c-format
 msgid "Are you already running %s?"
 msgstr "Používáte již %s?"
 
-#: clientgui/AccountInfoPage.cpp:482
+#: AccountInfoPage.cpp:482
 msgid "&Username:"
 msgstr "&Uživatelské jméno:"
 
-#: clientgui/AccountInfoPage.cpp:511
-msgid "&Email address or LDAP ID:"
-msgstr ""
-
-#: clientgui/AccountInfoPage.cpp:515
+#: AccountInfoPage.cpp:508
 msgid "&Email address:"
 msgstr "&Emailová adresa:"
 
-#: clientgui/AccountInfoPage.cpp:523
+#: AccountInfoPage.cpp:515
 #, c-format
 msgid "minimum length %d"
 msgstr "minimální délka je %d znaků"
 
-#: clientgui/AccountInfoPage.cpp:530
+#: AccountInfoPage.cpp:522
 msgid "Forgot your password?"
 msgstr "Zapomněli jste heslo?"
 
-#: clientgui/AccountInfoPage.cpp:537
+#: AccountInfoPage.cpp:529
 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 ""
-"Pokus ještě nejste registrováni u tohoto Správce účtu,\n"
-"učiňte tak, než budete pokračovat. Pro registraci nebo\n"
-"získání zapomenutého hesla klikněte na odkaz dole."
+msgstr "Pokus ještě nejste registrováni u tohoto Správce účtu,\nučiňte tak, než budete pokračovat. Pro registraci nebo\nzískání zapomenutého hesla klikněte na odkaz dole."
 
-#: clientgui/AccountInfoPage.cpp:540
-#, fuzzy
+#: AccountInfoPage.cpp:532
 msgid "Account manager web site"
-msgstr "Webové stránky Správce účtu"
+msgstr "Webová stránka Správce účtu"
 
-#: clientgui/AccountInfoPage.cpp:582
+#: AccountInfoPage.cpp:574 WelcomePage.cpp:348
 msgid "Add project"
 msgstr "Přidat projekt"
 
-#: clientgui/AccountInfoPage.cpp:584
+#: AccountInfoPage.cpp:576
 msgid "Update account manager"
 msgstr "Aktualizovat Správce účtu"
 
-#: clientgui/AccountInfoPage.cpp:586
+#: AccountInfoPage.cpp:578 WelcomePage.cpp:307 WelcomePage.cpp:321
 msgid "Use account manager"
 msgstr "Použít Správce účtu"
 
-#: clientgui/AccountInfoPage.cpp:593
+#: AccountInfoPage.cpp:585
 msgid "Please enter a user name."
-msgstr ""
+msgstr "Zadejte prosím Vaše uživatelské jméno."
 
-#: clientgui/AccountInfoPage.cpp:595
-#, fuzzy
+#: AccountInfoPage.cpp:587
 msgid "Please enter an email address."
-msgstr "Zadejte prosím emailovou adresu"
+msgstr "Zadejte prosím Vaši emailovou adresu."
 
-#: clientgui/AccountInfoPage.cpp:605
+#: AccountInfoPage.cpp:597
 #, c-format
 msgid "Please enter a password of at least %d characters."
-msgstr ""
+msgstr "Zadejte prosím heslo o délce alespoň %d znaků."
 
-#: clientgui/AccountInfoPage.cpp:615
-msgid "The password and confirmation password do not match. Please type them again."
+#: AccountInfoPage.cpp:607
+msgid ""
+"The password and confirmation password do not match. Please type them again."
 msgstr "Zadaná hesla se neshodují. Prosím napište je znovu."
 
-#: clientgui/AccountManagerInfoPage.cpp:272
+#: AccountManagerInfoPage.cpp:272
 msgid "Choose an account manager"
 msgstr "Zvolte Správce účtu"
 
-#: clientgui/AccountManagerInfoPage.cpp:275
+#: AccountManagerInfoPage.cpp:275
 msgid ""
 "To choose an account manager, click its name or \n"
 "type its URL below."
-msgstr ""
-"Zvolte Správce účtu kliknutím na jeho jméno \n"
-"nebo napište do kolonky dole jeho URL adresu."
+msgstr "Zvolte Správce účtu kliknutím na jeho jméno \nnebo napište do kolonky dole jeho URL adresu."
 
-#: clientgui/AccountManagerInfoPage.cpp:279
-#, fuzzy
+#: AccountManagerInfoPage.cpp:279
 msgid "Account manager details:"
-msgstr "Webové stránky Správce účtu"
+msgstr "Detaily Správce účtu:"
 
-#: clientgui/AccountManagerInfoPage.cpp:283
-#, fuzzy
+#: AccountManagerInfoPage.cpp:283
 msgid "Account manager &URL:"
-msgstr "&URL adresa Správce účtu:"
+msgstr "&URL Správce účtu:"
 
-#: clientgui/AccountManagerInfoPage.cpp:287
+#: AccountManagerInfoPage.cpp:287
 msgid "Open web page"
-msgstr ""
+msgstr "Otevřít webovou stránku."
 
-#: clientgui/AccountManagerInfoPage.cpp:290
+#: AccountManagerInfoPage.cpp:290
 msgid "Visit this account manager's web site"
-msgstr ""
+msgstr "Navštívit webovou stránku Správce účtu."
 
-#: clientgui/AccountManagerProcessingPage.cpp:186
-#: clientgui/AccountManagerPropertiesPage.cpp:192
+#: AccountManagerProcessingPage.cpp:187 AccountManagerPropertiesPage.cpp:193
 #, c-format
 msgid "Communicating with %s."
 msgstr "Komunikuji s %s."
 
-#: clientgui/AccountManagerProcessingPage.cpp:193
-#: clientgui/AccountManagerPropertiesPage.cpp:199
+#: AccountManagerProcessingPage.cpp:194 AccountManagerPropertiesPage.cpp:200
 msgid "Communicating with server."
 msgstr "Komunikuji se serverem."
 
-#: clientgui/AccountManagerProcessingPage.cpp:198
-#: clientgui/AccountManagerPropertiesPage.cpp:204
+#: AccountManagerProcessingPage.cpp:199 AccountManagerPropertiesPage.cpp:205
 msgid "Please wait..."
 msgstr "Čekejte prosím..."
 
-#: clientgui/AccountManagerProcessingPage.cpp:325
+#: AccountManagerProcessingPage.cpp:326
 msgid "An internal server error has occurred.\n"
 msgstr "Na serveru se vyskytla vnitřní chyba. \n"
 
-#: clientgui/AdvancedFrame.cpp:96
+#: AdvancedFrame.cpp:95
 msgid "Connected"
 msgstr "Připojen"
 
-#: clientgui/AdvancedFrame.cpp:104
+#: AdvancedFrame.cpp:103
 msgid "Disconnected"
 msgstr "Odpojen"
 
-#: clientgui/AdvancedFrame.cpp:318
+#: AdvancedFrame.cpp:322 sg_BoincSimpleFrame.cpp:119
 #, c-format
 msgid "Close the %s window"
 msgstr "Zavřít %s okno"
 
-#: clientgui/AdvancedFrame.cpp:321
+#: AdvancedFrame.cpp:325 sg_BoincSimpleFrame.cpp:122
 msgid "&Close Window"
-msgstr "Zavřít okno"
+msgstr "&Zavřít okno"
 
-#: clientgui/AdvancedFrame.cpp:332
-#: clientgui/AdvancedFrame.cpp:339
-#: clientgui/AdvancedFrame.cpp:346
+#: AdvancedFrame.cpp:336 AdvancedFrame.cpp:343 AdvancedFrame.cpp:350
 #, c-format
 msgid "Exit %s"
 msgstr "Ukončit %s"
 
-#: clientgui/AdvancedFrame.cpp:359
-#, fuzzy
-msgid "Preferences..."
-msgstr "Předvolby"
-
-#: clientgui/AdvancedFrame.cpp:368
+#: AdvancedFrame.cpp:371
 msgid "&Notices\tCtrl+Shift+N"
-msgstr "Zprávy\tCtrl+Shift+N"
+msgstr "&Zprávy\tCtrl+Shift+N"
 
-#: clientgui/AdvancedFrame.cpp:369
+#: AdvancedFrame.cpp:372
 msgid "Display notices"
 msgstr "Zobrazit zprávy"
 
-#: clientgui/AdvancedFrame.cpp:374
+#: AdvancedFrame.cpp:377
 msgid "&Projects\tCtrl+Shift+P"
 msgstr "&Projekty\tCtrl+Shift+P"
 
-#: clientgui/AdvancedFrame.cpp:375
+#: AdvancedFrame.cpp:378
 msgid "Display projects"
 msgstr "Zobrazit projekty"
 
-#: clientgui/AdvancedFrame.cpp:380
+#: AdvancedFrame.cpp:383
 msgid "&Tasks\tCtrl+Shift+T"
-msgstr "Úkoly\tCtrl+Shift+T"
+msgstr "&Úkoly\tCtrl+Shift+T"
 
-#: clientgui/AdvancedFrame.cpp:381
+#: AdvancedFrame.cpp:384
 msgid "Display tasks"
 msgstr "Zobrazit úkoly"
 
-#: clientgui/AdvancedFrame.cpp:386
+#: AdvancedFrame.cpp:389
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr "Přenos\tCtrl+Shift+X"
 
-#: clientgui/AdvancedFrame.cpp:387
+#: AdvancedFrame.cpp:390
 msgid "Display transfers"
 msgstr "Zobrazit přenosy"
 
-#: clientgui/AdvancedFrame.cpp:392
+#: AdvancedFrame.cpp:395
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "&Statistiky\tCtrl+Shift+S"
 
-#: clientgui/AdvancedFrame.cpp:393
+#: AdvancedFrame.cpp:396
 msgid "Display statistics"
 msgstr "Zobrazit statistiky"
 
-#: clientgui/AdvancedFrame.cpp:398
+#: AdvancedFrame.cpp:401
 msgid "&Disk usage\tCtrl+Shift+D"
 msgstr "Využití &disku\tCtrl+Shift+D"
 
-#: clientgui/AdvancedFrame.cpp:399
+#: AdvancedFrame.cpp:402
 msgid "Display disk usage"
 msgstr "Zobrazit využití disku"
 
-#: clientgui/AdvancedFrame.cpp:406
+#: AdvancedFrame.cpp:409
 msgid "Simple &View...\tCtrl+Shift+V"
-msgstr "Jednoduché zobrazení...\tCtrl+Shift+V"
+msgstr "Jednoduché &zobrazení...\tCtrl+Shift+V"
 
-#: clientgui/AdvancedFrame.cpp:407
+#: AdvancedFrame.cpp:410
 msgid "Display the simple graphical interface."
 msgstr "Přepnout do Jednoduchého zobrazení"
 
-#: clientgui/AdvancedFrame.cpp:421
+#: AdvancedFrame.cpp:424
 msgid "&Add project or account manager..."
-msgstr "Přid&at projekt nebo nastavit Správce účtu..."
+msgstr "&Přidat projekt nebo nastavit Správce účtu..."
 
-#: clientgui/AdvancedFrame.cpp:422
+#: AdvancedFrame.cpp:425 sg_ProjectPanel.cpp:76
 msgid "Volunteer for any or all of 30+ projects in many areas of science"
 msgstr "Staňte se dobrovolníkem v kterémkoliv z více než 30 projektů v mnoha vědeckých oblastech"
 
-#: clientgui/AdvancedFrame.cpp:426
+#: AdvancedFrame.cpp:429
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "&Synchronizovat s %s"
 
-#: clientgui/AdvancedFrame.cpp:430
+#: AdvancedFrame.cpp:433
 #, c-format
 msgid "Get current settings from %s"
 msgstr "Použít aktuální nastavení z %s"
 
-#: clientgui/AdvancedFrame.cpp:440
+#: AdvancedFrame.cpp:443
 msgid "&Add project..."
-msgstr "Přid&at projekt..."
+msgstr "&Přidat projekt..."
 
-#: clientgui/AdvancedFrame.cpp:441
+#: AdvancedFrame.cpp:444
 msgid "Add a project"
 msgstr "Přid&at projekt"
 
-#: clientgui/AdvancedFrame.cpp:444
+#: AdvancedFrame.cpp:447
 #, c-format
 msgid "S&top using %s..."
 msgstr "Ukončit %s..."
 
-#: clientgui/AdvancedFrame.cpp:450
+#: AdvancedFrame.cpp:453
 msgid "Remove this computer from account manager control."
 msgstr "Odebrat počítač ze správy Správce účtu."
 
-#: clientgui/AdvancedFrame.cpp:455
+#: AdvancedFrame.cpp:458 sg_BoincSimpleFrame.cpp:178
 msgid "&Options..."
-msgstr "M&ožnosti..."
+msgstr "&Možnosti..."
 
-#: clientgui/AdvancedFrame.cpp:456
+#: AdvancedFrame.cpp:459 sg_BoincSimpleFrame.cpp:179
 msgid "Configure display options and proxy settings"
 msgstr "Nastavit vzhled a způsob připojení k Internetu (proxy server)"
 
-#: clientgui/AdvancedFrame.cpp:460
+#: AdvancedFrame.cpp:463 sg_BoincSimpleFrame.cpp:172
 msgid "Computing &preferences..."
 msgstr "Výpočetní &předvolby..."
 
-#: clientgui/AdvancedFrame.cpp:461
+#: AdvancedFrame.cpp:464 sg_BoincSimpleFrame.cpp:173
 msgid "Configure computing preferences"
 msgstr "Nastavit výpočetní předvolby"
 
-#: clientgui/AdvancedFrame.cpp:469
+#: AdvancedFrame.cpp:472
 msgid "&Run always"
-msgstr "Počítat stále"
+msgstr "&Počítat stále"
 
-#: clientgui/AdvancedFrame.cpp:470
+#: AdvancedFrame.cpp:473
 msgid "Allow work regardless of preferences"
 msgstr "Povolit práci bez ohledu na předvolby"
 
-#: clientgui/AdvancedFrame.cpp:474
+#: AdvancedFrame.cpp:477
 msgid "Run based on &preferences"
 msgstr "Počítat podle &předvoleb"
 
-#: clientgui/AdvancedFrame.cpp:475
+#: AdvancedFrame.cpp:478
 msgid "Allow work according to preferences"
 msgstr "Povolit práci podle předvoleb"
 
-#: clientgui/AdvancedFrame.cpp:479
+#: AdvancedFrame.cpp:482
 msgid "&Suspend"
-msgstr "Poza&stavit"
+msgstr "&Pozastavit"
 
-#: clientgui/AdvancedFrame.cpp:480
+#: AdvancedFrame.cpp:483
 msgid "Stop work regardless of preferences"
 msgstr "Pozastavit práci bez ohledu na předvolby"
 
-#: clientgui/AdvancedFrame.cpp:505
+#: AdvancedFrame.cpp:508
 msgid "Use GPU always"
 msgstr "Vždy používat GPU"
 
-#: clientgui/AdvancedFrame.cpp:506
+#: AdvancedFrame.cpp:509
 msgid "Allow GPU work regardless of preferences"
 msgstr "Povolit práci na GPU bez ohledu na předvolby"
 
-#: clientgui/AdvancedFrame.cpp:510
+#: AdvancedFrame.cpp:513
 msgid "Use GPU based on preferences"
 msgstr "Používat GPU podle předvoleb"
 
-#: clientgui/AdvancedFrame.cpp:511
+#: AdvancedFrame.cpp:514
 msgid "Allow GPU work according to preferences"
 msgstr "Povolit práci na GPU podle předvoleb"
 
-#: clientgui/AdvancedFrame.cpp:515
+#: AdvancedFrame.cpp:518
 msgid "Suspend GPU"
 msgstr "Pozastavit GPU"
 
-#: clientgui/AdvancedFrame.cpp:516
+#: AdvancedFrame.cpp:519
 msgid "Stop GPU work regardless of preferences"
 msgstr "Pozastavit práci na GPU bez ohledu na předvolby"
 
-#: clientgui/AdvancedFrame.cpp:540
+#: AdvancedFrame.cpp:543
 msgid "Network activity always available"
 msgstr "Trvale povolit přístup k Internetu"
 
-#: clientgui/AdvancedFrame.cpp:541
+#: AdvancedFrame.cpp:544
 msgid "Allow network activity regardless of preferences"
 msgstr "Povolit přístup k Internetu bez ohledu na předvolby"
 
-#: clientgui/AdvancedFrame.cpp:545
+#: AdvancedFrame.cpp:548
 msgid "Network activity based on preferences"
 msgstr "Připojovat k Internetu podle předvoleb"
 
-#: clientgui/AdvancedFrame.cpp:546
+#: AdvancedFrame.cpp:549
 msgid "Allow network activity according to preferences"
 msgstr "Využívat připojení k Internetu podle předvoleb"
 
-#: clientgui/AdvancedFrame.cpp:550
+#: AdvancedFrame.cpp:553
 msgid "Network activity suspended"
 msgstr "Zakázat přístup k Internetu"
 
-#: clientgui/AdvancedFrame.cpp:551
+#: AdvancedFrame.cpp:554
 msgid "Stop BOINC network activity"
 msgstr "Zakázat Správci BOINC přistupovat k Internetu"
 
-#: clientgui/AdvancedFrame.cpp:561
+#: AdvancedFrame.cpp:564
 #, c-format
 msgid "Connect to another computer running %s"
 msgstr "Připojit se k jinému počítači se spuštěným klientem %s"
 
-#: clientgui/AdvancedFrame.cpp:566
+#: AdvancedFrame.cpp:569
 msgid "Select computer..."
 msgstr "Zvolit počítač..."
 
-#: clientgui/AdvancedFrame.cpp:571
+#: AdvancedFrame.cpp:574
 msgid "Shut down connected client..."
-msgstr "Vypnout připojeného klien&ta..."
+msgstr "Vypnout připojeného klienta..."
 
-#: clientgui/AdvancedFrame.cpp:572
+#: AdvancedFrame.cpp:575
 msgid "Shut down the currently connected client"
 msgstr "Vypnout aktuálně připojeného klienta"
 
-#: clientgui/AdvancedFrame.cpp:576
+#: AdvancedFrame.cpp:579
 msgid "Run CPU &benchmarks"
-msgstr "Spustit testy procesoru"
+msgstr "Spustit &testy procesoru"
 
-#: clientgui/AdvancedFrame.cpp:577
+#: AdvancedFrame.cpp:580
 msgid "Runs BOINC CPU benchmarks"
 msgstr "Spustit BOINC testy procesoru"
 
-#: clientgui/AdvancedFrame.cpp:581
+#: AdvancedFrame.cpp:584
 msgid "Do network communication"
 msgstr "Obnovit všechny přenosy"
 
-#: clientgui/AdvancedFrame.cpp:582
+#: AdvancedFrame.cpp:585
 msgid "Do all pending network communication"
 msgstr "Obnovit veškerou čekající síťovou komunikaci"
 
-# 94%
-#: clientgui/AdvancedFrame.cpp:586
+#: AdvancedFrame.cpp:589
 msgid "Read config files"
 msgstr "Načíst konfigurační soubory"
 
-#: clientgui/AdvancedFrame.cpp:587
-msgid "Read configuration info from cc_config.xml and any app_config.xml files"
+#: AdvancedFrame.cpp:590
+msgid ""
+"Read configuration info from cc_config.xml and any app_config.xml files"
 msgstr "Načíst konfiguraci ze souborů cc_config.xml a app_config.xml."
 
-#: clientgui/AdvancedFrame.cpp:591
+#: AdvancedFrame.cpp:594
 msgid "Read local prefs file"
 msgstr "Načíst předvolby z lokálního souboru"
 
-#: clientgui/AdvancedFrame.cpp:592
+#: AdvancedFrame.cpp:595
 msgid "Read preferences from global_prefs_override.xml."
 msgstr "Načíst předvolby z 'global_prefs_override.xml'"
 
-#: clientgui/AdvancedFrame.cpp:597
+#: AdvancedFrame.cpp:600
 #, c-format
 msgid "Launch another instance of %s..."
 msgstr "Spustit další instanci %s..."
 
-#: clientgui/AdvancedFrame.cpp:601
+#: AdvancedFrame.cpp:604
 #, c-format
 msgid "Launch another %s"
 msgstr "Spustit další %s"
 
-#: clientgui/AdvancedFrame.cpp:611
+#: AdvancedFrame.cpp:614
 msgid "Event Log...\tCtrl+Shift+E"
 msgstr "Záznam událostí...\tCtrl+Shift+E"
 
-#: clientgui/AdvancedFrame.cpp:612
+#: AdvancedFrame.cpp:615
 msgid "Display diagnostic messages."
 msgstr "Zobrazit diagnostické zprávy."
 
-#: clientgui/AdvancedFrame.cpp:616
-msgid "Event Log Diagnostic Flags...\tCtrl+Shift+F"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:617
-msgid "Enable or disable various diagnostic messages"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:626
+#: AdvancedFrame.cpp:625 sg_BoincSimpleFrame.cpp:188
 #, c-format
 msgid "%s &help"
 msgstr "Nápověda k platformě %s"
 
-#: clientgui/AdvancedFrame.cpp:632
+#: AdvancedFrame.cpp:631 sg_BoincSimpleFrame.cpp:194
 #, c-format
 msgid "Show information about %s"
 msgstr "Zobrazit webovou stránku s nápovědou k platformě %s"
 
-#: clientgui/AdvancedFrame.cpp:644
+#: AdvancedFrame.cpp:643
 #, c-format
 msgid "&%s help"
 msgstr "Nápověda k programu %s"
 
-#: clientgui/AdvancedFrame.cpp:650
+#: AdvancedFrame.cpp:649 sg_BoincSimpleFrame.cpp:212
 #, c-format
 msgid "Show information about the %s"
 msgstr "Zobrazit webovou stránku s nápovědou k programu %s"
 
-#: clientgui/AdvancedFrame.cpp:662
+#: AdvancedFrame.cpp:661 sg_BoincSimpleFrame.cpp:224
 #, c-format
 msgid "%s &web site"
 msgstr "&Webové stránky %s"
 
-#: clientgui/AdvancedFrame.cpp:668
+#: AdvancedFrame.cpp:667 sg_BoincSimpleFrame.cpp:230
 #, c-format
 msgid "Show information about BOINC and %s"
 msgstr "Zobrazit webovou stránku s informacemi o projektu BOINC a o programu %s"
 
-#: clientgui/AdvancedFrame.cpp:680
-#: clientgui/BOINCTaskBar.cpp:544
+#: AdvancedFrame.cpp:679 BOINCTaskBar.cpp:530 sg_BoincSimpleFrame.cpp:242
 #, c-format
 msgid "&About %s..."
-msgstr "Inform&ace o %s..."
+msgstr "&Informace o %s..."
 
-#: clientgui/AdvancedFrame.cpp:686
+#: AdvancedFrame.cpp:685 sg_BoincSimpleFrame.cpp:248
 msgid "Licensing and copyright information."
 msgstr "Zobrazit informace o aktuální verzi BOINC (licence a autorská práva)."
 
-#: clientgui/AdvancedFrame.cpp:693
+#: AdvancedFrame.cpp:692 sg_BoincSimpleFrame.cpp:255
 msgid "&File"
-msgstr "Soubor"
+msgstr "&Soubor"
 
-#: clientgui/AdvancedFrame.cpp:697
+#: AdvancedFrame.cpp:696 sg_BoincSimpleFrame.cpp:259
 msgid "&View"
-msgstr "Zobrazení"
+msgstr "&Zobrazení"
 
-#: clientgui/AdvancedFrame.cpp:701
+#: AdvancedFrame.cpp:700 sg_BoincSimpleFrame.cpp:263
 msgid "&Tools"
-msgstr "Nás&troje"
+msgstr "&Nástroje"
 
-#: clientgui/AdvancedFrame.cpp:705
+#: AdvancedFrame.cpp:704
 msgid "&Activity"
 msgstr "&Aktivity"
 
-#: clientgui/AdvancedFrame.cpp:709
+#: AdvancedFrame.cpp:708
 msgid "A&dvanced"
-msgstr "Pokročilé"
+msgstr "&Pokročilé"
 
-#: clientgui/AdvancedFrame.cpp:713
+#: AdvancedFrame.cpp:712 DlgEventLog.cpp:332 sg_BoincSimpleFrame.cpp:267
+#: wizardex.cpp:374 wizardex.cpp:381
 msgid "&Help"
-msgstr "Nápověda"
+msgstr "&Nápověda"
 
-#: clientgui/AdvancedFrame.cpp:1185
+#: AdvancedFrame.cpp:1199
 #, c-format
 msgid "%s - Stop using %s"
 msgstr "%s - Přestat používat %s"
 
-#: clientgui/AdvancedFrame.cpp:1190
+#: AdvancedFrame.cpp:1204
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -573,257 +526,222 @@ msgid ""
 "but you'll have to manage projects manually.\n"
 "\n"
 "Do you want to stop using %s?"
-msgstr ""
-"Pokud přestanete používat %s,\n"
-"všechny stávající projekty budou zachovány,\n"
-"ale budete je muset spravovat manuálně.\n"
-"\n"
-"Chcete přestanete používat %s?"
+msgstr "Pokud přestanete používat %s,\nvšechny stávající projekty budou zachovány,\nale budete je muset spravovat manuálně.\n\nChcete přestat používat %s?"
 
-#: clientgui/AdvancedFrame.cpp:1397
+#: AdvancedFrame.cpp:1401
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s - Vypnout aktuálního klienta..."
 
-#: clientgui/AdvancedFrame.cpp:1406
+#: AdvancedFrame.cpp:1410
 #, c-format
 msgid ""
 "%s will shut down the current client\n"
 "and prompt you for another host to connect to."
-msgstr ""
-"%s vypne aktuálně připojeného klienta\n"
-"a vyzve vás k připojení k jinému počítači."
+msgstr "%s vypne aktuálně připojeného klienta\na vyzve vás k připojení k jinému počítači."
 
-#: clientgui/AdvancedFrame.cpp:1806
+#: AdvancedFrame.cpp:1745 DlgAbout.cpp:119
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: clientgui/AdvancedFrame.cpp:1815
+#: AdvancedFrame.cpp:1754
 #, c-format
 msgid "%s has successfully added %s"
 msgstr "%s úspěšně přidal %s"
 
-#: clientgui/AdvancedFrame.cpp:1953
+#: AdvancedFrame.cpp:1893
 #, c-format
 msgid "%s - (%s)"
 msgstr "%s - (%s)"
 
-#: clientgui/AdvancedFrame.cpp:1957
+#: AdvancedFrame.cpp:1897
 #, c-format
 msgid "Connecting to %s"
 msgstr "Připojuji se k %s"
 
-#: clientgui/AdvancedFrame.cpp:1960
+#: AdvancedFrame.cpp:1900
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "Připojeno k %s (%s)"
 
-#: clientgui/AlreadyExistsPage.cpp:184
+#: AlreadyExistsPage.cpp:184
 msgid "Username already in use"
 msgstr "Toto uživatelské jméno je již použito"
 
-#: clientgui/AlreadyExistsPage.cpp:187
+#: AlreadyExistsPage.cpp:187
 msgid ""
 "An account with that username already exists and has a\n"
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"Účet s tímto uživatelským jménem již existuje a má jiné\n"
-"heslo než to, které bylo zadáno.\n"
-"\n"
-"Navštivte prosím stránky projektu a tam pokračujte podle instrukcí."
+msgstr "Účet s tímto uživatelským jménem již existuje a má jiné\nheslo než to, které bylo zadáno.\n\nNavštivte prosím stránky projektu a tam pokračujte podle instrukcí."
 
-#: clientgui/AlreadyExistsPage.cpp:191
+#: AlreadyExistsPage.cpp:191
 msgid "Email address already in use"
 msgstr "Tato emailová adresa je již použita"
 
-#: clientgui/AlreadyExistsPage.cpp:194
+#: AlreadyExistsPage.cpp:194
 msgid ""
 "An account with that email address already exists and has a\n"
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"Účet (account) s touto emailovou adresou již existuje a má jiné\n"
-"heslo než to, které bylo zadáno.\n"
-"\n"
-"Navštivte prosím stránky projektu a tam pokračujte podle instrukcí."
+msgstr "Účet (account) s touto emailovou adresou již existuje a má jiné\nheslo než to, které bylo zadáno.\n\nNavštivte prosím stránky projektu a tam pokračujte podle instrukcí."
 
-#: clientgui/AsyncRPC.cpp:1031
+#: AsyncRPC.cpp:1031
 msgid "Communicating with BOINC client.  Please wait ..."
 msgstr "Komunikuji s BOINC klientem.  Prosím čekejte ..."
 
-#: clientgui/AsyncRPC.cpp:1034
+#: AsyncRPC.cpp:1034
 #, c-format
 msgid "&Quit %s"
-msgstr "Opustit %s"
+msgstr "&Opustit %s"
 
-#: clientgui/AsyncRPC.cpp:1036
+#: AsyncRPC.cpp:1036
 #, c-format
 msgid "E&xit %s"
 msgstr "Ukončit %s"
 
-#: clientgui/AsyncRPC.cpp:1040
+#: AsyncRPC.cpp:1040
 #, c-format
 msgid "%s - Communication"
 msgstr "%s - Komunikace"
 
-#: clientgui/AsyncRPC.cpp:1056
+#: AsyncRPC.cpp:1056 DlgAdvPreferencesBase.cpp:107 sg_DlgPreferences.cpp:433
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: clientgui/BOINCBaseFrame.cpp:504
+#: BOINCBaseFrame.cpp:505
 #, c-format
 msgid "%s - Connection Error"
 msgstr "%s - Chyba připojení"
 
-#: clientgui/BOINCBaseFrame.cpp:513
+#: BOINCBaseFrame.cpp:514
 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 ""
-"Momentálně nejste oprávněn spravovat tohoto klienta.\n"
-"Kontaktujte prosím vašeho administrátora, aby vás přidal do lokální uživatelské skupiny 'boinc_users'."
+msgstr "Momentálně nejste oprávněn spravovat tohoto klienta.\nKontaktujte prosím vašeho administrátora, aby vás přidal do lokální uživatelské skupiny 'boinc_users'."
 
-#: clientgui/BOINCBaseFrame.cpp:522
+#: BOINCBaseFrame.cpp:523
 msgid ""
 "Authorization failed connecting to running client.\n"
 "Make sure you start this program in the same directory as the client."
-msgstr ""
-"Chyba autorizace při připojení k běžícímu klientu.\n"
-"Ujistěte se, že jste tento program spustili ze stejné složky jako klienta."
+msgstr "Chyba autorizace při připojení k běžícímu klientu.\nUjistěte se, že jste tento program spustili ze stejné složky jako klienta."
 
-#: clientgui/BOINCBaseFrame.cpp:524
+#: BOINCBaseFrame.cpp:525
 msgid "Authorization failed connecting to running client."
 msgstr "Selhala autorizace při připojení k běžícímu klientovi."
 
-#: clientgui/BOINCBaseFrame.cpp:532
+#: BOINCBaseFrame.cpp:533
 msgid "The password you have provided is incorrect, please try again."
 msgstr "Zadané heslo je chybné. Zkuste to prosím znova."
 
-#: clientgui/BOINCBaseFrame.cpp:576
+#: BOINCBaseFrame.cpp:577
 #, c-format
 msgid "%s - Connection Failed"
 msgstr "%s - Připojení selhalo"
 
-#: clientgui/BOINCBaseFrame.cpp:585
+#: BOINCBaseFrame.cpp:586
 #, c-format
 msgid ""
 "%s is not able to connect to a %s client.\n"
 "Would you like to try to connect again?"
-msgstr ""
-"%s nemůže navázat spojení s klientem %s.\n"
-"Chcete pokus opakovat?"
+msgstr "%s nemůže navázat spojení s klientem %s.\nChcete pokus opakovat?"
 
-#: clientgui/BOINCBaseFrame.cpp:621
+#: BOINCBaseFrame.cpp:622
 #, c-format
 msgid "%s - Daemon Start Failed"
 msgstr "%s - Start daemona selhal"
 
-#: clientgui/BOINCBaseFrame.cpp:631
+#: BOINCBaseFrame.cpp:632
 #, 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 není schopen spustit klienta %s.\n"
-"Spusťte prosím 'Ovládací panely -> Nástroje pro správu -> Služby' a spusťte službu BOINC."
+msgstr "%s není schopen spustit klienta %s.\nSpusťte prosím 'Ovládací panely -> Nástroje pro správu -> Služby' a spusťte službu BOINC."
 
-#: clientgui/BOINCBaseFrame.cpp:637
+#: BOINCBaseFrame.cpp:638
 #, c-format
 msgid ""
 "%s is not able to start a %s client.\n"
 "Please start the daemon and try again."
-msgstr ""
-"%s není schopen spustit klienta %s.\n"
-"Spusťe prosím daemona a zkuste to znova."
+msgstr "%s není schopen spustit klienta %s.\nSpusťe prosím daemona a zkuste to znova."
 
-#: clientgui/BOINCBaseFrame.cpp:688
+#: BOINCBaseFrame.cpp:689
 #, c-format
 msgid "%s - Connection Status"
 msgstr "%s - Stav připojení"
 
-#: clientgui/BOINCBaseFrame.cpp:699
+#: BOINCBaseFrame.cpp:700
 #, 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"
 "To connect up to your local computer please use 'localhost' as the host name."
-msgstr ""
-"%s není momentálně připojen ke klientu %s.\n"
-"Pro připojení ke klientu %s použijte volbu 'Nastavení -> Volba počítače...'.\n"
-"Chcete-li se připojit ke klientu běžícímu na vašem počítači, \n"
-"do kolonky 'Jméno počítače' zadejte 'localhost'."
+msgstr "%s není momentálně připojen ke klientu %s.\nPro připojení ke klientu %s použijte volbu 'Nastavení -> Volba počítače...'.\nChcete-li se připojit ke klientu běžícímu na vašem počítači, \ndo kolonky 'Jméno počítače' zadejte 'localhost'."
 
-#: clientgui/BOINCBaseView.cpp:752
+#: BOINCBaseView.cpp:779
 msgid "Project web pages"
 msgstr "Webové stránky projektu"
 
-#: clientgui/BOINCClientManager.cpp:573
+#: BOINCClientManager.cpp:575
 #, c-format
 msgid "%s - Unexpected Exit"
 msgstr "%s - Nečekané ukončení"
 
-#: clientgui/BOINCClientManager.cpp:583
+#: BOINCClientManager.cpp:585
 #, 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 ""
-"Klient %s 3x nečekaně ukončil práci během posledních %d minut.\n"
-"Přejete si ho restartovat?"
+msgstr "Klient %s 3x nečekaně ukončil práci během posledních %d minut.\nPřejete si ho restartovat?"
 
-#: clientgui/BOINCDialupManager.cpp:61
+#: BOINCDialupManager.cpp:61
 #, c-format
 msgid "%s - Network Status"
 msgstr "%s - Stav sítě"
 
-#: clientgui/BOINCDialupManager.cpp:241
+#: BOINCDialupManager.cpp:241
 #, c-format
 msgid ""
 "%s needs to connect to the Internet.\n"
 "May it do so now?"
-msgstr ""
-"%s vyžaduje připojení k Internetu.\n"
-"Připojit nyní?"
+msgstr "%s vyžaduje připojení k Internetu.\nPřipojit nyní?"
 
-#: clientgui/BOINCDialupManager.cpp:254
+#: BOINCDialupManager.cpp:254
 #, c-format
 msgid "%s is connecting to the Internet."
 msgstr "%s se připojuje k Internetu."
 
-#: clientgui/BOINCDialupManager.cpp:303
+#: BOINCDialupManager.cpp:303
 #, c-format
 msgid "%s has successfully connected to the Internet."
 msgstr "%s se úspěšně připojil k Internetu."
 
-#: clientgui/BOINCDialupManager.cpp:331
+#: BOINCDialupManager.cpp:331
 #, c-format
 msgid "%s failed to connect to the Internet."
 msgstr "%s se nezvládl připojit k Internetu."
 
-#: clientgui/BOINCDialupManager.cpp:372
+#: 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 detekoval připojení k Internetu.\n"
-"Bude znovu zahájen přenos a aktualizovány všechny projekty."
+msgstr "%s detekoval připojení k Internetu.\nBude znovu zahájen přenos a aktualizovány všechny projekty."
 
-#: clientgui/BOINCDialupManager.cpp:417
+#: BOINCDialupManager.cpp:417
 #, c-format
 msgid "%s has successfully disconnected from the Internet."
 msgstr "%s se úspěšně odpojil od Internetu."
 
-#: clientgui/BOINCDialupManager.cpp:433
+#: BOINCDialupManager.cpp:433
 #, c-format
 msgid "%s failed to disconnected from the Internet."
 msgstr "%s se nezvládl odpojit od Internetu."
 
-#: clientgui/BOINCGUIApp.cpp:595
+#: BOINCGUIApp.cpp:339
 #, c-format
 msgid ""
 "You currently are not authorized to manage the client.\n"
@@ -834,872 +752,798 @@ msgid ""
 " or\n"
 "  - contact your administrator to add you to the 'boinc_master'\n"
 "     user group."
-msgstr ""
-"Momentálně nemáte práva na správu klienta.\n"
-"\n"
-"Abyste mohl používat %s jako aktuální uživatel:\n"
-"- přeinstalujte %s s volbou \"Ano\" u otázky na\n"
-"ne-administrátorské účty\n"
-"nebo\n"
-"- kontaktujte vašeho administrátora, aby vás přidal\n"
-"do uživatelské skupiny 'boinc_master'."
-
-#: clientgui/BOINCGUIApp.cpp:601
+msgstr "Momentálně nemáte práva na správu klienta.\n\nAbyste mohl používat %s jako aktuální uživatel:\n- přeinstalujte %s s volbou \"Ano\" u otázky na\nne-administrátorské účty\nnebo\n- kontaktujte vašeho administrátora, aby vás přidal\ndo uživatelské skupiny 'boinc_master'."
+
+#: BOINCGUIApp.cpp:345
 #, c-format
 msgid ""
 "%s ownership or permissions are not set properly; please reinstall %s.\n"
 "(Error code %d"
-msgstr ""
-"Práva či vlastnictví souborů %s nejsou nastavena správně, přeinstalujte prosím %s.\n"
-"(Chybový kód %d"
+msgstr "Práva či vlastnictví souborů %s nejsou nastavena správně, přeinstalujte prosím %s.\n(Chybový kód %d"
 
-#: clientgui/BOINCGUIApp.cpp:607
+#: BOINCGUIApp.cpp:351
 msgid " at "
 msgstr " v "
 
-#: clientgui/BOINCGUIApp.cpp:610
+#: BOINCGUIApp.cpp:354 MainDocument.cpp:2484 MainDocument.cpp:2534
+#: MainDocument.cpp:2554 ViewTransfers.cpp:803
 msgid ")"
 msgstr ")"
 
-#: clientgui/BOINCGUIApp.cpp:640
+#: BOINCGUIApp.cpp:384
 msgid ""
 "A reboot is required in order for BOINC to run properly.\n"
 "Please reboot your computer and try again."
-msgstr ""
-"Pro správné fungování BOINC je vyžadován restart.\n"
-"Prosím restartujte počítač a zkuste to znova."
+msgstr "Pro správné fungování BOINC je vyžadován restart.\nProsím restartujte počítač a zkuste to znova."
 
-#: clientgui/BOINCGUIApp.cpp:641
+#: BOINCGUIApp.cpp:385 DlgAbout.cpp:153
 msgid "BOINC Manager"
-msgstr "Správce BOINC"
+msgstr "BOINC manažer"
 
-#: clientgui/BOINCGUIApp.cpp:902
+#: BOINCGUIApp.cpp:572
 msgid "BOINC Manager was started by the operating system automatically"
-msgstr "Správce BOINC byl automaticky spuštěn operačním systémem"
+msgstr "BOINC manažer byl automaticky spuštěn operačním systémem"
 
-#: clientgui/BOINCGUIApp.cpp:904
+#: BOINCGUIApp.cpp:574
 msgid "Startup BOINC so only the system tray icon is visible"
 msgstr "Spustit BOINC pouze s ikonou v systémové liště"
 
-#: clientgui/BOINCGUIApp.cpp:906
+#: BOINCGUIApp.cpp:576
 msgid "Directory containing the BOINC Client executable"
 msgstr "Složka obsahující spustitelného BOINC klienta"
 
-#: clientgui/BOINCGUIApp.cpp:907
+#: BOINCGUIApp.cpp:577
 msgid "BOINC data directory"
 msgstr "Složka pro BOINC data"
 
-#: clientgui/BOINCGUIApp.cpp:909
+#: BOINCGUIApp.cpp:579
 msgid "Host name or IP address"
 msgstr "Jméno počítače nebo IP adresa"
 
-#: clientgui/BOINCGUIApp.cpp:910
+#: BOINCGUIApp.cpp:580
 msgid "GUI RPC port number"
 msgstr "Číslo portu pro GUI RPC"
 
-#: clientgui/BOINCGUIApp.cpp:911
+#: BOINCGUIApp.cpp:581
 msgid "Password"
 msgstr "Heslo"
 
-#: clientgui/BOINCGUIApp.cpp:912
+#: BOINCGUIApp.cpp:582
 msgid "Startup BOINC with these optional arguments"
 msgstr "Spouštět BOINC s těmito volitelnými parametry"
 
-#: clientgui/BOINCGUIApp.cpp:913
+#: BOINCGUIApp.cpp:583
 msgid "disable BOINC security users and permissions"
 msgstr "zrušit bezpečnostní uživatele a práva BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:914
+#: BOINCGUIApp.cpp:584
 msgid "set skin debugging mode to enable skin manager error messages"
 msgstr "Nastavit ladící režim správce vzhledů pro zobrazení chybových zpráv správce vzhledů"
 
-#: clientgui/BOINCGUIApp.cpp:915
+#: BOINCGUIApp.cpp:585
 msgid "multiple instances of BOINC Manager allowed"
-msgstr "povoleno více instancí Správce BOINC"
+msgstr "povoleno více instancí BOINC Manažera"
 
-#: clientgui/BOINCGUIApp.cpp:917
+#: BOINCGUIApp.cpp:587
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr "Nepoužito: oprava pro chybu v XCode 4.2"
 
-#: clientgui/BOINCGUIApp.cpp:1164
+#: BOINCGUIApp.cpp:814
 msgid "(Automatic Detection)"
 msgstr "(Zjištěno automaticky)"
 
-#: clientgui/BOINCGUIApp.cpp:1165
+#: BOINCGUIApp.cpp:815
 msgid "(Unknown)"
 msgstr "(Neznámé)"
 
-#: clientgui/BOINCGUIApp.cpp:1166
+#: BOINCGUIApp.cpp:816
 msgid "(User Defined)"
 msgstr "(Definováno uživatelem)"
 
-#: clientgui/BOINCTaskBar.cpp:522
+#: BOINCTaskBar.cpp:508
 #, c-format
 msgid "Open %s Web..."
 msgstr "Otevřít webové stránky %s..."
 
-#: clientgui/BOINCTaskBar.cpp:529
+#: BOINCTaskBar.cpp:515
 #, c-format
 msgid "Open %s..."
 msgstr "Otevřít %s..."
 
-#: clientgui/BOINCTaskBar.cpp:536
-#: clientgui/BOINCTaskBar.cpp:633
-#: clientgui/BOINCTaskBar.cpp:641
+#: BOINCTaskBar.cpp:522 BOINCTaskBar.cpp:619 BOINCTaskBar.cpp:627
 msgid "Snooze"
 msgstr "Uspat"
 
-#: clientgui/BOINCTaskBar.cpp:538
-#: clientgui/BOINCTaskBar.cpp:660
-#: clientgui/BOINCTaskBar.cpp:668
+#: BOINCTaskBar.cpp:524 BOINCTaskBar.cpp:646 BOINCTaskBar.cpp:654
 msgid "Snooze GPU"
 msgstr "Uspat GPU"
 
-#: clientgui/BOINCTaskBar.cpp:556
+#: BOINCTaskBar.cpp:542
 msgid "E&xit"
 msgstr "Ukončit"
 
-#: clientgui/BOINCTaskBar.cpp:626
+#: BOINCTaskBar.cpp:612 ViewProjects.cpp:718 ViewWork.cpp:795
+#: sg_BoincSimpleFrame.cpp:758 sg_ProjectCommandPopup.cpp:110
+#: sg_TaskCommandPopup.cpp:102
 msgid "Resume"
 msgstr "Obnovit"
 
-#: clientgui/BOINCTaskBar.cpp:653
+#: BOINCTaskBar.cpp:639
 msgid "Resume GPU"
 msgstr "Obnovit GPU"
 
-#: clientgui/BOINCTaskBar.cpp:727
+#: BOINCTaskBar.cpp:713
 msgid "Computing is enabled"
 msgstr "Počítání je povoleno"
 
-#: clientgui/BOINCTaskBar.cpp:731
+#: BOINCTaskBar.cpp:717
 msgid "Computing is suspended - "
 msgstr "Počítání je pozastaveno - "
 
-#: clientgui/BOINCTaskBar.cpp:741
+#: BOINCTaskBar.cpp:727
 msgid "GPU computing is enabled"
 msgstr "GPU počítání je povoleno"
 
-#: clientgui/BOINCTaskBar.cpp:744
+#: BOINCTaskBar.cpp:730
 msgid "GPU computing is suspended - "
 msgstr "GPU počítání je pozastaveno - "
 
-#: clientgui/BOINCTaskBar.cpp:753
+#: BOINCTaskBar.cpp:739
 msgid "Network is enabled"
 msgstr "Přístup k Internetu je povolen"
 
-#: clientgui/BOINCTaskBar.cpp:756
+#: BOINCTaskBar.cpp:742
 msgid "Network is suspended - "
 msgstr "Přístup k Internetu je pozastaven - "
 
-#: clientgui/BOINCTaskBar.cpp:764
+#: BOINCTaskBar.cpp:750
 msgid "Reconnecting to client."
 msgstr "Obnovuji spojení s klientem."
 
-#: clientgui/BOINCTaskBar.cpp:766
+#: BOINCTaskBar.cpp:752
 msgid "Not connected to a client."
 msgstr "Nepřipojeno ke klientu."
 
-#: clientgui/BOINCTaskBar.cpp:819
+#: BOINCTaskBar.cpp:805
 #, c-format
 msgid "%s Notices"
 msgstr "%s Zprávy"
 
-#: clientgui/BOINCTaskBar.cpp:825
+#: BOINCTaskBar.cpp:811
 msgid "There are new notices - click to view."
 msgstr "Jsou dostupné nové zprávy - klikněte pro zobrazení."
 
-#: clientgui/CompletionErrorPage.cpp:199
+#: CompletionErrorPage.cpp:199
 msgid "Failed to add project"
 msgstr "Selhalo přidání projektu"
 
-#: clientgui/CompletionErrorPage.cpp:204
+#: CompletionErrorPage.cpp:204
 msgid "Failed to update account manager"
 msgstr "Selhala aktualizace Správce účtu"
 
-#: clientgui/CompletionErrorPage.cpp:208
+#: CompletionErrorPage.cpp:208
 msgid "Failed to remove account manager"
 msgstr "Selhalo odebrání Správce účtu"
 
-#: clientgui/CompletionErrorPage.cpp:212
+#: CompletionErrorPage.cpp:212
 msgid "Failed to add account manager"
 msgstr "Selhalo přidání Správce účtu"
 
-#: clientgui/CompletionErrorPage.cpp:221
+#: CompletionErrorPage.cpp:221
 msgid ""
 "Please try again later.\n"
 "\n"
 "Click Finish to close."
-msgstr ""
+msgstr "Opakujte akci později\n\nKlepněte na tlačítko Zavřít."
 
-#: clientgui/CompletionErrorPage.cpp:225
-#: clientgui/CompletionPage.cpp:222
-#: clientgui/CompletionPage.cpp:242
-#: clientgui/CompletionPage.cpp:273
+#: CompletionErrorPage.cpp:225 CompletionPage.cpp:222 CompletionPage.cpp:242
+#: CompletionPage.cpp:273
 msgid "Click Finish to close."
 msgstr "Okno zavřete kliknutím na Dokončit."
 
-#: clientgui/CompletionErrorPage.cpp:234
+#: CompletionErrorPage.cpp:234
 msgid "Messages from server:"
 msgstr "Zprávy ze serveru:"
 
-#: clientgui/CompletionPage.cpp:207
+#: CompletionPage.cpp:207
 msgid "Project added"
 msgstr "Projekt přidán"
 
-#: clientgui/CompletionPage.cpp:213
+#: CompletionPage.cpp:213
 msgid "This project has been successfully added."
 msgstr "Přidání projektu proběhlo úspěšně."
 
-#: clientgui/CompletionPage.cpp:218
+#: 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 ""
-"Po kliknutí na Dokončit bude ve vašem internetovém prohlížeči otevřena stránka,\n"
-"ve které si budete moci nastavit jméno účtu a další předvolby."
+msgstr "Po kliknutí na Dokončit bude ve vašem internetovém prohlížeči otevřena stránka,\nve které si budete moci nastavit jméno účtu a další předvolby."
 
-#: clientgui/CompletionPage.cpp:232
+#: CompletionPage.cpp:232
 #, c-format
 msgid "Update from %s completed."
 msgstr "Aktualizace z %s dokončena."
 
-#: clientgui/CompletionPage.cpp:236
+#: CompletionPage.cpp:236
 msgid "Update completed."
 msgstr "Aktualizace dokončena."
 
-#: clientgui/CompletionPage.cpp:247
+#: CompletionPage.cpp:247
 msgid "Now using account manager"
 msgstr "Nyní je používán Správce účtu"
 
-#: clientgui/CompletionPage.cpp:252
+#: CompletionPage.cpp:252
 #, c-format
 msgid "Welcome to %s!"
 msgstr "Vítejte v %s!"
 
-#: clientgui/CompletionPage.cpp:263
+#: CompletionPage.cpp:263
 #, c-format
 msgid "You are now using %s to manage accounts."
 msgstr "Nyní používáte %s pro správu účtů."
 
-#: clientgui/CompletionPage.cpp:267
+#: CompletionPage.cpp:267
 msgid "You are now using this account manager."
 msgstr "Nyní používáte tohoto Správce účtu."
 
-#: clientgui/DlgAbout.cpp:113
+#: DlgAbout.cpp:113 mac/Mac_GUI.cpp:96
 #, c-format
 msgid "About %s"
 msgstr "O aplikaci %s"
 
-#: clientgui/DlgAbout.cpp:172
+#: DlgAbout.cpp:172
 msgid "Version:"
 msgstr "Verze:"
 
-#: clientgui/DlgAbout.cpp:180
+#: DlgAbout.cpp:180
 msgid "wxWidgets Version:"
 msgstr "Verze wxWidgets:"
 
-#: clientgui/DlgAbout.cpp:188
+#: DlgAbout.cpp:188
 msgid "Copyright:"
 msgstr "Copyright:"
 
-# 98%
-#: clientgui/DlgAbout.cpp:192
-#, fuzzy
+#: DlgAbout.cpp:192
 msgid ""
-"(C) 2003-2014 University of California, Berkeley.\n"
+"(C) 2003-2013 University of California, Berkeley.\n"
 "All Rights Reserved."
-msgstr ""
-"(C) 2003-2013 Kalifornská Univerzita, Berkeley.\n"
-"Všechna práva vyhrazena.\n"
-"Překlad do češtiny: Spok a Necroman"
+msgstr "(C) 2003-2013 Kalifornská Univerzita, Berkeley.\nVšechna práva vyhrazena.\nPřeklad do češtiny: Spok a Necroman"
 
-#: clientgui/DlgAbout.cpp:196
+#: DlgAbout.cpp:196
 msgid "Berkeley Open Infrastructure for Network Computing"
-msgstr ""
-"Berkeley Open Infrastructure for Network Computing \n"
-"(Berkeleyská Otevřená Infrastruktura pro Síťové Výpočty)"
-
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:399
-#: clientgui/DlgSelectComputer.cpp:163
+msgstr "Berkeley Open Infrastructure for Network Computing \n(Berkeleyská Otevřená Infrastruktura pro Síťové Výpočty)"
+
+#: DlgAbout.cpp:208 DlgExitMessage.cpp:173 DlgGenericMessage.cpp:120
+#: DlgOptions.cpp:396 DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "&OK"
 
-#: clientgui/DlgAdvPreferences.cpp:602
+#: DlgAdvPreferences.cpp:544
 msgid "invalid number"
-msgstr ""
+msgstr "Neplatné číslo"
 
-#: clientgui/DlgAdvPreferences.cpp:603
+#: DlgAdvPreferences.cpp:545
 msgid "invalid time, format is HH:MM"
 msgstr "neplatný čas, formát je HH:MM"
 
-#: clientgui/DlgAdvPreferences.cpp:604
+#: DlgAdvPreferences.cpp:546
 msgid "invalid time interval, format is HH:MM-HH:MM"
 msgstr "neplatný časový interval, formát je HH:MM-HH:MM"
 
-#: clientgui/DlgAdvPreferences.cpp:817
+#: DlgAdvPreferences.cpp:751
 msgid "invalid input value detected"
 msgstr "zadaná neplatná vstupní hodnota"
 
-#: clientgui/DlgAdvPreferences.cpp:819
+#: DlgAdvPreferences.cpp:753
 msgid "Validation Error"
 msgstr "Chyba při validaci"
 
-#: clientgui/DlgAdvPreferences.cpp:969
-#: clientgui/DlgAdvPreferences.cpp:975
-#: clientgui/DlgAdvPreferences.cpp:981
+#: DlgAdvPreferences.cpp:885 DlgAdvPreferences.cpp:891
+#: DlgAdvPreferences.cpp:897
 msgid "Applications to add"
 msgstr "Aplikace, které lze přidat"
 
-#: clientgui/DlgAdvPreferences.cpp:998
+#: DlgAdvPreferences.cpp:914
 #, c-format
 msgid "'%s' is not an executable application."
 msgstr "'%s' není exkluzivní aplikace."
 
-#: clientgui/DlgAdvPreferences.cpp:999
-#: clientgui/DlgAdvPreferences.cpp:1046
-#: clientgui/DlgAdvPreferences.cpp:1070
+#: DlgAdvPreferences.cpp:915 DlgAdvPreferences.cpp:962
+#: DlgAdvPreferences.cpp:986
 msgid "Add Exclusive App"
 msgstr "Přidat exkluzivní aplikaci"
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Name of application to add?"
 msgstr "Jména aplikací pro přidání?"
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Add exclusive app"
 msgstr "Přidat exkluzivní aplikaci"
 
-#: clientgui/DlgAdvPreferences.cpp:1045
+#: DlgAdvPreferences.cpp:961
 #, c-format
 msgid "Application names must end with '%s'"
 msgstr "Jména aplikací musí končit na '%s'"
 
-#: clientgui/DlgAdvPreferences.cpp:1069
+#: DlgAdvPreferences.cpp:985
 #, c-format
 msgid "'%s' is already in the list."
 msgstr "'%s' již je v seznamu."
 
-#: clientgui/DlgAdvPreferences.cpp:1161
+#: DlgAdvPreferences.cpp:1077
 msgid ""
 "Do you really want to clear all local preferences?\n"
 "(This will not affect exclusive applications.)"
-msgstr ""
-"Opravdu chcete vymazat všechny lokální předvolby?\n"
-"(netýká se exkluzivních aplikací)"
+msgstr "Opravdu chcete vymazat všechny lokální předvolby?\n(netýká se exkluzivních aplikací)"
 
-#: clientgui/DlgAdvPreferences.cpp:1162
+#: DlgAdvPreferences.cpp:1078 sg_DlgPreferences.cpp:1030
 msgid "Confirmation"
 msgstr "Potvrzení"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:49
+#: DlgAdvPreferencesBase.cpp:46 sg_DlgPreferences.cpp:946
 #, c-format
-msgid "%s - Computing preferences"
-msgstr ""
+msgid "%s - Preferences"
+msgstr "%s - Předvolby"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:66
+#: DlgAdvPreferencesBase.cpp:62
 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 ""
-"Tato nabídka nastavuje předvolby pouze pro tento počítač.\n"
-"Klikněte OK pro uložení předvoleb.\n"
-"Klikněte Vymazat pro obnovení předvoleb z webu (netýká se exkluzivních aplikací)."
+msgstr "Tato nabídka nastavuje předvolby pouze pro tento počítač.\nKlikněte OK pro uložení předvoleb.\nKlikněte Vymazat pro obnovení předvoleb z webu (netýká se exkluzivních aplikací)."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:69
+#: DlgAdvPreferencesBase.cpp:65 sg_DlgPreferences.cpp:428
 msgid "Clear"
 msgstr "Vymazat"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:70
+#: DlgAdvPreferencesBase.cpp:66
 msgid "clear all local preferences and close the dialog"
 msgstr "Smazat všechny místní předvolby a zavřít nabídku"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:85
+#: DlgAdvPreferencesBase.cpp:81
 msgid "processor usage"
 msgstr "Využití procesoru"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:88
+#: DlgAdvPreferencesBase.cpp:84
 msgid "network usage"
 msgstr "Využití Internetu"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:91
+#: DlgAdvPreferencesBase.cpp:87
 msgid "disk and memory usage"
 msgstr "Využití disku a paměti"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:94
+#: DlgAdvPreferencesBase.cpp:90
 msgid "exclusive applications"
 msgstr "Exkluzivní aplikace"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:107
-#: clientgui/DlgDiagnosticLogFlags.cpp:104
+#: DlgAdvPreferencesBase.cpp:102 sg_DlgPreferences.cpp:424
 msgid "OK"
 msgstr "OK"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:108
+#: DlgAdvPreferencesBase.cpp:103
 msgid "save all values and close the dialog"
 msgstr "uložit všechny hodnoty a zavřít nabídku"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:114
+#: DlgAdvPreferencesBase.cpp:108
 msgid "close the dialog without saving"
 msgstr "zavřít nabídku bez uložení nových hodnot"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:118
-#: clientgui/Localization.cpp:35
-#: clientgui/Localization.cpp:121
-#: clientgui/Localization.cpp:139
+#: DlgAdvPreferencesBase.cpp:112 Localization.cpp:35 Localization.cpp:121
+#: Localization.cpp:139 sg_BoincSimpleFrame.cpp:794 sg_DlgPreferences.cpp:439
 msgid "Help"
 msgstr "Nápověda"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
+#: DlgAdvPreferencesBase.cpp:113
 msgid "shows the preferences web page"
 msgstr "zobrazí webovou stránku s předvolbami"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:141
+#: DlgAdvPreferencesBase.cpp:135
 msgid "Computing allowed"
 msgstr "Počítání povoleno"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
+#: DlgAdvPreferencesBase.cpp:139
 msgid "While computer is on batteries"
 msgstr "Při provozu počítače na baterie"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:149
-msgid "check this if you want this computer to do work while it runs on batteries"
+#: DlgAdvPreferencesBase.cpp:142
+msgid ""
+"check this if you want this computer to do work while it runs on batteries"
 msgstr "Zaškrtněte, pokud si přejete, aby výpočty na tomto počítači probíhaly i při provozu na baterie"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:155
+#: DlgAdvPreferencesBase.cpp:148
 msgid "While computer is in use"
 msgstr "Je-li počítač používán"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:158
-msgid "check this if you want this computer to do work even when you're using it"
+#: DlgAdvPreferencesBase.cpp:151
+msgid ""
+"check this if you want this computer to do work even when you're using it"
 msgstr "zaškrtněte, pokud si přejete, aby výpočty na tomto počítači probíhaly, i když jej právě používáte"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:164
+#: DlgAdvPreferencesBase.cpp:157
 msgid "Use GPU while computer is in use"
 msgstr "Používat GPU pro výpočty, i když je počítač právě používán"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:167
-msgid "check this if you want your GPU to do work even when you're using the computer"
+#: DlgAdvPreferencesBase.cpp:160
+msgid ""
+"check this if you want your GPU to do work even when you're using the "
+"computer"
 msgstr "zaškrtněte, pokud si přejete, aby výpočty na GPU probíhaly, i když je počítač právě používán"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:179
+#: DlgAdvPreferencesBase.cpp:172
 msgid "Only after computer has been idle for"
 msgstr "Pouze pokud je počítač nečinný po dobu"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:188
-msgid "do work only after you haven't used the computer for this number of minutes"
+#: DlgAdvPreferencesBase.cpp:182
+msgid ""
+"do work only after you haven't used the computer for this number of minutes"
 msgstr "výpočty budou zahájeny až poté, co počítač nebyl používán po stanovenou dobu (minuty)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:193
-#: clientgui/DlgAdvPreferencesBase.cpp:342
+#: DlgAdvPreferencesBase.cpp:187 DlgAdvPreferencesBase.cpp:336
+#: sg_DlgPreferences.cpp:417
 msgid "minutes"
 msgstr "minut"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:212
+#: DlgAdvPreferencesBase.cpp:206
 msgid "While processor usage is less than"
 msgstr "Při vytížení procesoru nižším než"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:221
+#: DlgAdvPreferencesBase.cpp:216
 msgid "suspend work if processor usage exceeds this level"
 msgstr "pozastavit práci, pokud vytížení procesoru překročí tuto úroveň"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:226
+#: DlgAdvPreferencesBase.cpp:221
 msgid "percent (0 means no restriction)"
 msgstr "procent (0 znamená bez omezení)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:240
-#: clientgui/DlgAdvPreferencesBase.cpp:506
+#: DlgAdvPreferencesBase.cpp:235 DlgAdvPreferencesBase.cpp:496
 msgid "Every day between hours of"
 msgstr "Každý den v těchto hodinách"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: DlgAdvPreferencesBase.cpp:239
 msgid "start work at this time"
 msgstr "Začít práci v tuto dobu"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:248
-#: clientgui/DlgAdvPreferencesBase.cpp:514
+#: DlgAdvPreferencesBase.cpp:243 DlgAdvPreferencesBase.cpp:504
+#: sg_DlgPreferences.cpp:326 sg_DlgPreferences.cpp:348
 msgid "and"
 msgstr "a"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:252
+#: DlgAdvPreferencesBase.cpp:247
 msgid "stop work at this time"
 msgstr "Ukončit práci v tuto dobu"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
-#: clientgui/DlgAdvPreferencesBase.cpp:522
+#: DlgAdvPreferencesBase.cpp:251 DlgAdvPreferencesBase.cpp:512
 msgid "(no restriction if equal)"
 msgstr "(bez omezení, pokud jsou časy shodné)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:261
-#: clientgui/DlgAdvPreferencesBase.cpp:527
+#: DlgAdvPreferencesBase.cpp:256 DlgAdvPreferencesBase.cpp:517
 msgid "Day-of-week override:"
 msgstr "Nastavení pro dny v týdnu:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:266
-#: clientgui/DlgAdvPreferencesBase.cpp:532
+#: DlgAdvPreferencesBase.cpp:261 DlgAdvPreferencesBase.cpp:522
 msgid "check box to specify hours for this day of week"
 msgstr "Po zaškrtnutí budete moci nastavit hodiny individuálně pro daný den v týdnu"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:272
-#: clientgui/DlgAdvPreferencesBase.cpp:538
+#: DlgAdvPreferencesBase.cpp:267 DlgAdvPreferencesBase.cpp:528
 msgid "Monday"
 msgstr "Pondělí"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:279
-#: clientgui/DlgAdvPreferencesBase.cpp:545
+#: DlgAdvPreferencesBase.cpp:274 DlgAdvPreferencesBase.cpp:535
 msgid "Tuesday"
 msgstr "Úterý"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:286
-#: clientgui/DlgAdvPreferencesBase.cpp:552
+#: DlgAdvPreferencesBase.cpp:281 DlgAdvPreferencesBase.cpp:542
 msgid "Wednesday"
 msgstr "Středa"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:293
-#: clientgui/DlgAdvPreferencesBase.cpp:559
+#: DlgAdvPreferencesBase.cpp:288 DlgAdvPreferencesBase.cpp:549
 msgid "Thursday"
 msgstr "Čtvrtek"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:300
-#: clientgui/DlgAdvPreferencesBase.cpp:566
+#: DlgAdvPreferencesBase.cpp:295 DlgAdvPreferencesBase.cpp:556
 msgid "Friday"
 msgstr "Pátek"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:307
-#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: DlgAdvPreferencesBase.cpp:302 DlgAdvPreferencesBase.cpp:563
 msgid "Saturday"
 msgstr "Sobota"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:580
+#: DlgAdvPreferencesBase.cpp:309 DlgAdvPreferencesBase.cpp:570
 msgid "Sunday"
 msgstr "Neděle"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:328
+#: DlgAdvPreferencesBase.cpp:323
 msgid "Other options"
 msgstr "Ostatní nastavení"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:336
+#: DlgAdvPreferencesBase.cpp:330
 msgid "Switch between applications every"
 msgstr "Přepínat mezi aplikacemi každých"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:345
+#: DlgAdvPreferencesBase.cpp:339
 msgid "On multiprocessor systems, use at most"
 msgstr "Na víceprocesorových systémech použít nejvýše"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
+#: DlgAdvPreferencesBase.cpp:346
 #, no-c-format
-msgid "% of the processors (0 means no restriction)"
-msgstr ""
+msgid "% of the processors (0 means ignore this setting)"
+msgstr "% procesoru (0 znamená bez omezení)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:355
-#: clientgui/DlgAdvPreferencesBase.cpp:618
-#: clientgui/DlgAdvPreferencesBase.cpp:640
-#: clientgui/DlgAdvPreferencesBase.cpp:661
-#: clientgui/DlgAdvPreferencesBase.cpp:683
-#: clientgui/DlgAdvPreferencesBase.cpp:694
+#: DlgAdvPreferencesBase.cpp:349 DlgAdvPreferencesBase.cpp:605
+#: DlgAdvPreferencesBase.cpp:627 DlgAdvPreferencesBase.cpp:648
+#: DlgAdvPreferencesBase.cpp:669 DlgAdvPreferencesBase.cpp:679
 msgid "Use at most"
 msgstr "Použít nejvýše"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:362
+#: DlgAdvPreferencesBase.cpp:356
 #, no-c-format
-msgid "% of CPU time (0 means no restriction)"
-msgstr ""
+msgid "% CPU time"
+msgstr "% procesorového času"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:386
+#: DlgAdvPreferencesBase.cpp:378
 msgid "General options"
 msgstr "Obecné nastavení"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:395
+#: DlgAdvPreferencesBase.cpp:386
 msgid "Maximum download rate"
 msgstr "Max. rychlost stahování"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:401
-#: clientgui/DlgAdvPreferencesBase.cpp:410
-msgid "KBytes/second (0 means no restriction)"
-msgstr ""
+#: DlgAdvPreferencesBase.cpp:392 DlgAdvPreferencesBase.cpp:401
+msgid "KBytes/sec."
+msgstr "KB/s"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:404
+#: DlgAdvPreferencesBase.cpp:395
 msgid "Maximum upload rate"
 msgstr "Max. rychlost odesílání"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:417
+#: DlgAdvPreferencesBase.cpp:406
+msgid "Transfer at most"
+msgstr "Přenést nejvýše"
+
+#: DlgAdvPreferencesBase.cpp:412
+msgid "Mbytes"
+msgstr "MB"
+
+#: DlgAdvPreferencesBase.cpp:415
+msgid "every"
+msgstr "každých"
+
+#: DlgAdvPreferencesBase.cpp:421 DlgAdvPreferencesBase.cpp:444
+#: DlgAdvPreferencesBase.cpp:463
+msgid "days"
+msgstr "dní"
+
+#: DlgAdvPreferencesBase.cpp:429
 msgid "Minimum work buffer"
 msgstr "Minimální zásoba práce"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:425
+#: DlgAdvPreferencesBase.cpp:438
 msgid "Try to maintain enough tasks to keep busy for this many days"
 msgstr "Pokusit se udržet dostatečnou zásobu práce aspoň na tolik dní"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:431
-#: clientgui/DlgAdvPreferencesBase.cpp:449
-msgid "days (maximum value: 10)"
-msgstr ""
-
-#: clientgui/DlgAdvPreferencesBase.cpp:437
+#: DlgAdvPreferencesBase.cpp:450
 msgid "Max additional work buffer"
 msgstr "Maximální dodatečná zásoba práce"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:445
+#: DlgAdvPreferencesBase.cpp:459
 msgid "In addition, maintain enough tasks for up to this many days"
 msgstr "Udržet navíc zásobu práce aspoň na tolik dní"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:454
-msgid "Transfer at most"
-msgstr "Přenést nejvýše"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:462
-msgid "MBytes every"
-msgstr ""
-
-#: clientgui/DlgAdvPreferencesBase.cpp:468
-#, fuzzy
-msgid "days (0 means no restriction)"
-msgstr "procent (0 znamená bez omezení)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:476
+#: DlgAdvPreferencesBase.cpp:466
 msgid "Skip image file verification"
 msgstr "Přeskočit ověřování souborů s obrázky"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:478
+#: DlgAdvPreferencesBase.cpp:468
 msgid "check this if your Internet provider modifies image files"
 msgstr "zaškrtněte, pokud váš poskytovatel připojení k Internetu modifikuje soubory s obrázky"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:484
+#: DlgAdvPreferencesBase.cpp:476
 msgid "Connect options"
 msgstr "Nastavení připojení"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:487
+#: DlgAdvPreferencesBase.cpp:478
 msgid "Confirm before connecting to internet"
 msgstr "Zobrazit dotaz před připojením k Internetu"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
+#: DlgAdvPreferencesBase.cpp:480
+msgid ""
+"if checked, a confirmation dialog will be displayed before trying to connect"
+" to the Internet"
 msgstr "Je-li zaškrtnuto, bude před každým pokusem o připojení k Internetu zobrazeno okno vyžadující potvrzení"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:493
+#: DlgAdvPreferencesBase.cpp:484
 msgid "Disconnect when done"
 msgstr "Odpojit po ukončení komunikace"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:495
+#: DlgAdvPreferencesBase.cpp:486
 msgid ""
 "if checked, BOINC hangs up when network usage is done\n"
 "(only relevant for dialup-connection)"
-msgstr ""
-"Je-li zaškrtnuto, BOINC ukončí připojení k Internetu po dokončení veškerých přenosů\n"
-"(má význam jen pro vytáčená/dial-up připojení)"
+msgstr "Je-li zaškrtnuto, BOINC ukončí připojení k Internetu po dokončení veškerých přenosů\n(má význam jen pro vytáčená/dial-up připojení)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:501
+#: DlgAdvPreferencesBase.cpp:492
 msgid "Network usage allowed"
 msgstr "Povolené využití přístupu k Internetu"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:510
+#: DlgAdvPreferencesBase.cpp:500
 msgid "network usage start hour"
 msgstr "Povolit přístup v tuto dobu"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:518
+#: DlgAdvPreferencesBase.cpp:508
 msgid "network usage stop hour"
 msgstr "Ukončit přístup v tuto dobu"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:610
-#: clientgui/DlgItemProperties.cpp:257
+#: DlgAdvPreferencesBase.cpp:598 DlgItemProperties.cpp:231
 msgid "Disk usage"
 msgstr "Využití disku"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:622
+#: DlgAdvPreferencesBase.cpp:609
 msgid "the maximum disk space used by BOINC (in Gigabytes)"
 msgstr "Povolené místo na disku pro BOINC (v GB)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:626
-msgid "Gigabytes disk space (0 means no restriction)"
-msgstr ""
+#: DlgAdvPreferencesBase.cpp:613
+msgid "Gigabytes disk space"
+msgstr "GB na disku"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:629
+#: DlgAdvPreferencesBase.cpp:616
 msgid "Leave at least"
 msgstr "Ponechat aspoň"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:633
+#: DlgAdvPreferencesBase.cpp:620
 msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
 msgstr "BOINC ponechá nejméně tolik GB na disku volných"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:637
+#: DlgAdvPreferencesBase.cpp:624
 msgid "Gigabytes disk space free"
 msgstr "GB na disku volných"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
+#: DlgAdvPreferencesBase.cpp:631
 msgid "BOINC uses at most this percentage of total disk space"
 msgstr "BOINC využije nejvýše tolik procent z celkové kapacity disku"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:649
+#: DlgAdvPreferencesBase.cpp:636
 #, no-c-format
 msgid "% of total disk space"
 msgstr "% celkového místa na disku"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:652
+#: DlgAdvPreferencesBase.cpp:639
 msgid "Tasks checkpoint to disk at most every"
 msgstr "Ukládat kontrolní bod na disk nejvýše každých"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
+#: DlgAdvPreferencesBase.cpp:645
 msgid "seconds"
 msgstr "vteřin"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:668
+#: DlgAdvPreferencesBase.cpp:655
 #, no-c-format
 msgid "% of page file (swap space)"
 msgstr "% stránkovacího souboru"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:675
+#: DlgAdvPreferencesBase.cpp:662
 msgid "Memory usage"
 msgstr "Využití paměti"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
+#: DlgAdvPreferencesBase.cpp:676
 #, no-c-format
 msgid "% when computer is in use"
 msgstr "% je-li počítač používán"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:701
+#: DlgAdvPreferencesBase.cpp:686
 #, no-c-format
 msgid "% when computer is idle"
 msgstr "% není-li počítač používán"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:706
+#: DlgAdvPreferencesBase.cpp:691
 msgid "Leave applications in memory while suspended"
 msgstr "Při pozastavení výpočtů ponechat aplikaci v paměti"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:708
+#: DlgAdvPreferencesBase.cpp:693
 msgid "if checked, suspended work units are left in memory"
 msgstr "Je-li zaškrtnuto, budou pozastavené úkoly, které byly zpracovávány, ponechány v paměti"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:728
-msgid "Suspend processor and network usage when these applications are running:"
+#: DlgAdvPreferencesBase.cpp:713
+msgid ""
+"Suspend processor and network usage when these applications are running:"
 msgstr "Přerušit výpočty a přistup na Internet, pokud běží tyto aplikace:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:738
+#: DlgAdvPreferencesBase.cpp:722
 msgid "Add..."
 msgstr "Přidat..."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:739
+#: DlgAdvPreferencesBase.cpp:723
 msgid "Add an application to this list"
 msgstr "Přidat aplikaci do tohoto seznamu"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:744
+#: DlgAdvPreferencesBase.cpp:728 ViewProjects.cpp:202
+#: sg_ProjectCommandPopup.cpp:85
 msgid "Remove"
 msgstr "Odebrat"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:745
+#: DlgAdvPreferencesBase.cpp:729
 msgid "Remove an application from this list"
 msgstr "Odebrat aplikci z tohoto seznamu"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:754
+#: DlgAdvPreferencesBase.cpp:738
 msgid "For advanced options, refer to "
 msgstr "Pro pokročilé možnosti přejděte na"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:65
-#, c-format
-msgid "%s Diagnostic Log Flags"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:83
-msgid "These flags enable various types of diagnostic messages in the Event Log."
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:105
-#, fuzzy
-msgid "Save all values and close the dialog"
-msgstr "uložit všechny hodnoty a zavřít nabídku"
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:108
-#, fuzzy
-msgid "Defaults"
-msgstr "Výchozí"
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:109
-msgid "Restore default settings"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:113
-#, fuzzy
-msgid "Close the dialog without saving"
-msgstr "zavřít nabídku bez uložení nových hodnot"
-
-#: clientgui/DlgEventLog.cpp:226
+#: DlgEventLog.cpp:219
 #, c-format
 msgid "%s - Event Log"
 msgstr "%s - Záznam událostí"
 
-#: clientgui/DlgEventLog.cpp:236
+#: DlgEventLog.cpp:232 ViewMessages.cpp:117 ViewProjects.cpp:219
+#: ViewStatistics.cpp:435 ViewStatistics.cpp:2009 ViewTransfers.cpp:182
+#: ViewWork.cpp:232
 msgid "Project"
 msgstr "Projekt"
 
-#: clientgui/DlgEventLog.cpp:237
+#: DlgEventLog.cpp:233 ViewMessages.cpp:118
 msgid "Time"
 msgstr "Čas"
 
-#: clientgui/DlgEventLog.cpp:238
+#: DlgEventLog.cpp:234 ViewMessages.cpp:119
 msgid "Message"
 msgstr "Zpráva"
 
-#: clientgui/DlgEventLog.cpp:300
-#: clientgui/DlgEventLog.cpp:364
+#: DlgEventLog.cpp:290 DlgEventLog.cpp:354
 msgid "&Show only this project"
 msgstr "Zobrazit jen tento projekt"
 
-#: clientgui/DlgEventLog.cpp:304
+#: DlgEventLog.cpp:294
 msgid "Copy &All"
 msgstr "Kopírov&at vše"
 
-#: clientgui/DlgEventLog.cpp:306
-#: clientgui/DlgEventLog.cpp:310
+#: DlgEventLog.cpp:296 DlgEventLog.cpp:300 ViewMessages.cpp:89
 msgid "Copy all the messages to the clipboard."
 msgstr "Zkopíruje všechny zprávy do schránky."
 
-#: clientgui/DlgEventLog.cpp:315
+#: DlgEventLog.cpp:305
 msgid "Copy &Selected"
 msgstr "Kopírovat vybrané"
 
-#: clientgui/DlgEventLog.cpp:318
-#: clientgui/DlgEventLog.cpp:326
-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."
+#: DlgEventLog.cpp:308 DlgEventLog.cpp:316 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 "Zkopíruje označené zprávy do schránky. Označit více zpráv je možno klikáním na zprávy se současně stisknutou klávesou Shift nebo Command."
 
-#: clientgui/DlgEventLog.cpp:320
-#: clientgui/DlgEventLog.cpp:328
-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."
+#: DlgEventLog.cpp:310 DlgEventLog.cpp:318 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 "Zkopíruje označené zprávy do schránky. Označit více zpráv je možno klikáním na zprávy se současně stisknutou klávesou Shift nebo Ctrl."
 
-#: clientgui/DlgEventLog.cpp:335
-#: clientgui/DlgItemProperties.cpp:67
+#: DlgEventLog.cpp:325 DlgItemProperties.cpp:67
 msgid "&Close"
 msgstr "Zavřít"
 
-#: clientgui/DlgEventLog.cpp:344
+#: DlgEventLog.cpp:334 sg_BoincSimpleFrame.cpp:798 sg_DlgPreferences.cpp:442
 #, c-format
 msgid "Get help with %s"
 msgstr "Zobrazit nápovědu pro %s"
 
-#: clientgui/DlgEventLog.cpp:358
+#: DlgEventLog.cpp:348
 msgid "Show all &messages"
 msgstr "Zobrazit všechny zprávy"
 
-#: clientgui/DlgEventLog.cpp:359
-#: clientgui/DlgEventLog.cpp:361
+#: DlgEventLog.cpp:349 DlgEventLog.cpp:351
 msgid "Show messages for all projects"
 msgstr "Zobrazit zprávy všech projektů."
 
-#: clientgui/DlgEventLog.cpp:365
-#: clientgui/DlgEventLog.cpp:367
+#: DlgEventLog.cpp:355 DlgEventLog.cpp:357
 msgid "Show only the messages for the selected project"
 msgstr "Zobrazit pouze zprávy vybraného projektu"
 
-#: clientgui/DlgExitMessage.cpp:82
+#: DlgExitMessage.cpp:82
 #, c-format
 msgid "%s - Exit Confirmation"
 msgstr "%s - Potvrdit ukončení"
 
-#: clientgui/DlgExitMessage.cpp:130
+#: DlgExitMessage.cpp:130
 #, c-format
 msgid ""
 "You have requested to exit the %s,\n"
@@ -1708,15 +1552,9 @@ msgid ""
 "\n"
 "If you also want to stop running the tasks,\n"
 "choose from the following options:"
-msgstr ""
-"Přejete si ukončit %s,\n"
-"který vám umožnuje zobrazit si a spravovat\n"
-"výpočty, které právě pobíhají na vašem počítači.\n"
-"\n"
-"Pokud si přejete ukončit i probíhající výpočty,\n"
-"vyberte z následujících možností:"
+msgstr "Přejete si ukončit %s,\nkterý vám umožnuje zobrazit si a spravovat\nvýpočty, které právě pobíhají na vašem počítači.\n\nPokud si přejete ukončit i probíhající výpočty,\nvyberte z následujících možností:"
 
-#: clientgui/DlgExitMessage.cpp:135
+#: DlgExitMessage.cpp:135
 #, c-format
 msgid ""
 "This will shut down %s and its tasks until either the\n"
@@ -1725,1004 +1563,916 @@ msgid ""
 "In most cases, it is better just to close the %s window\n"
 "rather than to exit the application; that will allow %s to run its\n"
 "tasks at the times you selected in your preferences."
-msgstr ""
-"Tímto ukončíte %s a přerušíte všechny výpočty až do doby, \n"
-"než opět spustíte aplikaci %s nebo kdy bude spuštěn spořič obrazovky %s.\n"
-"\n"
-"Ve většině případů je lepší pouze zavřít okno %s\n"
-"než zavírat celou aplikaci. Tím umožníte %s pokračovat\n"
-"ve výpočtech v době, kterou jste si zvolili v předvolbách."
+msgstr "Tímto ukončíte %s a přerušíte všechny výpočty až do doby, \nnež opět spustíte aplikaci %s nebo kdy bude spuštěn spořič obrazovky %s.\n\nVe většině případů je lepší pouze zavřít okno %s\nnež zavírat celou aplikaci. Tím umožníte %s pokračovat\nve výpočtech v době, kterou jste si zvolili v předvolbách."
 
-#: clientgui/DlgExitMessage.cpp:153
+#: DlgExitMessage.cpp:153
 #, c-format
 msgid "Stop running tasks when exiting the %s"
 msgstr "Ukončit běžící výpočy při ukončení %s"
 
-#: clientgui/DlgExitMessage.cpp:165
+#: DlgExitMessage.cpp:165
 msgid "Remember this decision and do not show this dialog."
 msgstr "Zapamatovat si toto rozhodnutí a tuto nabídku již nezobrazovat."
 
-#: clientgui/DlgExitMessage.cpp:178
-#: clientgui/DlgGenericMessage.cpp:125
-#: clientgui/DlgOptions.cpp:404
-#: clientgui/DlgSelectComputer.cpp:168
+#: DlgExitMessage.cpp:178 DlgGenericMessage.cpp:125 DlgOptions.cpp:401
+#: DlgSelectComputer.cpp:168 wizardex.cpp:378
 msgid "&Cancel"
 msgstr "Zrušit"
 
-#: clientgui/DlgGenericMessage.cpp:112
+#: DlgGenericMessage.cpp:112
 msgid "Don't show this dialog again."
 msgstr "Toto okno již nezobrazovat."
 
-#: clientgui/DlgItemProperties.cpp:194
-#: clientgui/DlgItemProperties.cpp:197
-#: clientgui/DlgItemProperties.cpp:200
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:168 DlgItemProperties.cpp:171
+#: DlgItemProperties.cpp:174 DlgItemProperties.cpp:177
 msgid "Don't fetch tasks for "
 msgstr "Nepřijímat úkoly pro "
 
-#: clientgui/DlgItemProperties.cpp:194
+#: DlgItemProperties.cpp:168
 msgid "Project preference"
 msgstr "Předvolby projektu"
 
-#: clientgui/DlgItemProperties.cpp:197
+#: DlgItemProperties.cpp:171
 msgid "Account manager preference"
 msgstr "Předvolby správce účtu"
 
-#: clientgui/DlgItemProperties.cpp:200
+#: DlgItemProperties.cpp:174
 msgid "Project has no apps for "
 msgstr "Projekt nemá žádné aplikace pro "
 
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:177
 msgid "Client configuration excludes "
 msgstr "Konfigurace klienta nezahrnuje "
 
-#: clientgui/DlgItemProperties.cpp:207
+#: DlgItemProperties.cpp:181
 msgid " work fetch deferred for"
 msgstr " vyzvedávání práce odloženo pro"
 
-#: clientgui/DlgItemProperties.cpp:208
+#: DlgItemProperties.cpp:182
 msgid " work fetch deferral interval"
 msgstr " interval odkládání vyzvedávání práce pro"
 
-#: clientgui/DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:213
 msgid "Properties of project "
 msgstr "Vlastnosti projektu "
 
-#: clientgui/DlgItemProperties.cpp:243
-#: clientgui/DlgOptions.cpp:221
+#: DlgItemProperties.cpp:217 DlgOptions.cpp:218
 msgid "General"
 msgstr "Obecné"
 
-#: clientgui/DlgItemProperties.cpp:244
+#: DlgItemProperties.cpp:218
 msgid "Master URL"
 msgstr "Hlavní URL adresa"
 
-#: clientgui/DlgItemProperties.cpp:245
+#: DlgItemProperties.cpp:219
 msgid "User name"
 msgstr "Uživatelské jméno"
 
-#: clientgui/DlgItemProperties.cpp:246
+#: DlgItemProperties.cpp:220
 msgid "Team name"
 msgstr "Název týmu"
 
-#: clientgui/DlgItemProperties.cpp:247
+#: DlgItemProperties.cpp:221 ViewProjects.cpp:224
 msgid "Resource share"
 msgstr "Rozdělení práce"
 
-#: clientgui/DlgItemProperties.cpp:249
+#: DlgItemProperties.cpp:223
 msgid "Scheduler RPC deferred for"
 msgstr "RPC plánovače odloženo o"
 
-#: clientgui/DlgItemProperties.cpp:252
+#: DlgItemProperties.cpp:226
 msgid "File downloads deferred for"
 msgstr "Stahování souborů odloženo o"
 
-#: clientgui/DlgItemProperties.cpp:255
+#: DlgItemProperties.cpp:229
 msgid "File uploads deferred for"
 msgstr "Odesílání souborů odloženo o"
 
-#: clientgui/DlgItemProperties.cpp:258
+#: DlgItemProperties.cpp:232
 msgid "Computer ID"
 msgstr "ID počítače"
 
-#: clientgui/DlgItemProperties.cpp:260
+#: DlgItemProperties.cpp:234
 msgid "Non CPU intensive"
 msgstr "Nenáročné na procesor"
 
-#: 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
+#: DlgItemProperties.cpp:234 DlgItemProperties.cpp:236
+#: DlgItemProperties.cpp:237 DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:242 DlgItemProperties.cpp:251
+#: DlgItemProperties.cpp:254 DlgItemProperties.cpp:257
 msgid "yes"
 msgstr "ano"
 
-#: clientgui/DlgItemProperties.cpp:262
+#: DlgItemProperties.cpp:236
 msgid "Suspended via GUI"
 msgstr "Pozastaveno přes GUI"
 
-#: clientgui/DlgItemProperties.cpp:262
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:236 DlgItemProperties.cpp:237
 msgid "no"
 msgstr "ne"
 
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:237
 msgid "Don't request more work"
 msgstr "Nepřijímat další práci"
 
-#: clientgui/DlgItemProperties.cpp:265
+#: DlgItemProperties.cpp:239
 msgid "Scheduler call in progress"
 msgstr "Zpracovávám požadavek plánovače"
 
-#: clientgui/DlgItemProperties.cpp:268
+#: DlgItemProperties.cpp:242
 msgid "Trickle-up pending"
 msgstr "Vyčkávající zpráva o průběhu"
 
-#: clientgui/DlgItemProperties.cpp:271
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:245 DlgItemProperties.cpp:247
 msgid "Host location"
 msgstr "Umístění počítače"
 
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:247
 msgid "default"
 msgstr "výchozí"
 
-#: clientgui/DlgItemProperties.cpp:277
+#: DlgItemProperties.cpp:251
 msgid "Added via account manager"
 msgstr "Připojeno přes Správce účtu"
 
-#: clientgui/DlgItemProperties.cpp:280
+#: DlgItemProperties.cpp:254
 msgid "Remove when tasks done"
 msgstr "Odebrat po dokončení úkolů"
 
-#: clientgui/DlgItemProperties.cpp:283
+#: DlgItemProperties.cpp:257
 msgid "Ended"
 msgstr "Ukončeno"
 
-#: clientgui/DlgItemProperties.cpp:285
-msgid "Tasks completed"
-msgstr ""
-
-#: clientgui/DlgItemProperties.cpp:286
-msgid "Tasks failed"
-msgstr ""
-
-#: clientgui/DlgItemProperties.cpp:288
+#: DlgItemProperties.cpp:259
 msgid "Credit"
 msgstr "Kredit"
 
-#: clientgui/DlgItemProperties.cpp:289
+#: DlgItemProperties.cpp:260
 msgid "User"
 msgstr "Uživatel"
 
-#: clientgui/DlgItemProperties.cpp:296
+#: DlgItemProperties.cpp:267
 msgid "Host"
 msgstr "Počítač"
 
-#: clientgui/DlgItemProperties.cpp:305
+#: DlgItemProperties.cpp:276
 msgid "Scheduling"
 msgstr "Plánování"
 
-#: clientgui/DlgItemProperties.cpp:306
+#: DlgItemProperties.cpp:277
 msgid "Scheduling priority"
 msgstr "Priorita plánovávní"
 
-#: clientgui/DlgItemProperties.cpp:307
+#: DlgItemProperties.cpp:278
 msgid "CPU"
 msgstr "CPU"
 
-#: clientgui/DlgItemProperties.cpp:331
+#: DlgItemProperties.cpp:302
 msgid "Duration correction factor"
 msgstr "Korekční faktor pro dobu trvání "
 
-#: clientgui/DlgItemProperties.cpp:345
+#: DlgItemProperties.cpp:316
 msgid "Properties of task "
 msgstr "Vlastnosti úkolu "
 
-#: clientgui/DlgItemProperties.cpp:357
+#: DlgItemProperties.cpp:328 ViewWork.cpp:238
 msgid "Application"
 msgstr "Aplikace"
 
-#: clientgui/DlgItemProperties.cpp:358
+#: DlgItemProperties.cpp:329 ViewWork.cpp:239
 msgid "Name"
 msgstr "Jméno"
 
-#: clientgui/DlgItemProperties.cpp:359
+#: DlgItemProperties.cpp:330
 msgid "State"
 msgstr "Stav"
 
-#: clientgui/DlgItemProperties.cpp:362
+#: DlgItemProperties.cpp:333
 msgid "Received"
 msgstr "Přijato"
 
-#: clientgui/DlgItemProperties.cpp:365
+#: DlgItemProperties.cpp:336
 msgid "Report deadline"
 msgstr "Odevzdat do "
 
-#: clientgui/DlgItemProperties.cpp:367
+#: DlgItemProperties.cpp:338
 msgid "Resources"
 msgstr "Prostředky"
 
-#: clientgui/DlgItemProperties.cpp:370
+#: DlgItemProperties.cpp:341
 msgid "Estimated computation size"
 msgstr "Odhadovaná doba výpočtu"
 
-#: clientgui/DlgItemProperties.cpp:373
+#: DlgItemProperties.cpp:344
 msgid "CPU time at last checkpoint"
 msgstr "Procesorový čas při posledním uložení "
 
-#: clientgui/DlgItemProperties.cpp:374
-#: clientgui/DlgItemProperties.cpp:389
+#: DlgItemProperties.cpp:345 DlgItemProperties.cpp:360
 msgid "CPU time"
 msgstr "Procesorový čas"
 
-#: clientgui/DlgItemProperties.cpp:376
-#: clientgui/DlgItemProperties.cpp:390
+#: DlgItemProperties.cpp:347 DlgItemProperties.cpp:361
 msgid "Elapsed time"
 msgstr "Čas"
 
-#: clientgui/DlgItemProperties.cpp:378
+#: DlgItemProperties.cpp:349
 msgid "Estimated time remaining"
 msgstr "Odhadovaný zbývající čas "
 
-#: clientgui/DlgItemProperties.cpp:379
+#: DlgItemProperties.cpp:350
 msgid "Fraction done"
 msgstr "Hotová část"
 
-#: clientgui/DlgItemProperties.cpp:380
+#: DlgItemProperties.cpp:351
 msgid "Virtual memory size"
 msgstr "Velikost virtuální paměti"
 
-#: clientgui/DlgItemProperties.cpp:381
+#: DlgItemProperties.cpp:352
 msgid "Working set size"
 msgstr "Velikost pracovní sady"
 
-#: clientgui/DlgItemProperties.cpp:383
+#: DlgItemProperties.cpp:354
 msgid "Directory"
 msgstr "Adresář"
 
-#: clientgui/DlgItemProperties.cpp:386
+#: DlgItemProperties.cpp:357
 msgid "Process ID"
 msgstr "ID procesu"
 
-#: clientgui/DlgItemProperties.cpp:456
+#: DlgItemProperties.cpp:427 ViewWork.cpp:1032 sg_TaskPanel.cpp:823
 msgid "Local: "
 msgstr "Místní:"
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: DlgOptions.cpp:129 DlgOptions.cpp:135
 msgid "Options"
 msgstr "Možnosti"
 
-#: clientgui/DlgOptions.cpp:178
+#: DlgOptions.cpp:175
 msgid "Language:"
 msgstr "Jazyk: "
 
-#: clientgui/DlgOptions.cpp:185
+#: DlgOptions.cpp:182
 msgid "What language should BOINC use?"
 msgstr "Jaký jazyk používat pro zobrazení Správce BOINC?"
 
-#: clientgui/DlgOptions.cpp:189
+#: DlgOptions.cpp:186
 msgid "Notice reminder interval:"
 msgstr "Interval připomínání nových zpráv:"
 
-#: clientgui/DlgOptions.cpp:196
+#: DlgOptions.cpp:193
 msgid "How often should BOINC remind you of new notices?"
 msgstr "Jak často má BOINC upozorňovat na nové zprávy?"
 
-#: clientgui/DlgOptions.cpp:201
+#: DlgOptions.cpp:198
 msgid "Run Manager at login?"
 msgstr "Spustit Správce po přihlášení?"
 
-#: clientgui/DlgOptions.cpp:207
+#: DlgOptions.cpp:204
 msgid "Run the BOINC Manager when you log on."
 msgstr "Spustit Správce BOINC hned po přihlášení."
 
-#: clientgui/DlgOptions.cpp:212
+#: DlgOptions.cpp:209
 msgid "Enable Manager exit dialog?"
 msgstr "Zobrazovat dotaz při vypínání Správce?"
 
-#: clientgui/DlgOptions.cpp:218
+#: DlgOptions.cpp:215
 msgid "Display the exit dialog when shutting down the Manager."
 msgstr "Zobrazovat dotaz s informacemi při ukončování Správce."
 
-#: clientgui/DlgOptions.cpp:229
+#: DlgOptions.cpp:226
 msgid "Dial-up and Virtual Private Network settings"
 msgstr "Nastavení vytáčeného/dial-up připojení a Virtual Private Network"
 
-#: clientgui/DlgOptions.cpp:243
+#: DlgOptions.cpp:240
 msgid "&Set Default"
 msgstr "Na&stavit výchozí"
 
-#: clientgui/DlgOptions.cpp:248
+#: DlgOptions.cpp:245
 msgid "&Clear Default"
 msgstr "Zrušit vý&chozí"
 
-#: clientgui/DlgOptions.cpp:255
+#: DlgOptions.cpp:252
 msgid "Default Connection:"
 msgstr "Výchozí připojení:"
 
-#: clientgui/DlgOptions.cpp:262
+#: DlgOptions.cpp:259
 msgid "Connections"
 msgstr "Připojení"
 
-#: clientgui/DlgOptions.cpp:271
+#: DlgOptions.cpp:268
 msgid "Connect via HTTP proxy server"
 msgstr "Připojit přes HTTP proxy server"
 
-#: clientgui/DlgOptions.cpp:275
+#: DlgOptions.cpp:272
 msgid "HTTP Proxy Server Configuration"
 msgstr "Nastavení HTTP proxy serveru"
 
-#: clientgui/DlgOptions.cpp:283
-#: clientgui/DlgOptions.cpp:347
+#: DlgOptions.cpp:280 DlgOptions.cpp:344
 msgid "Address:"
 msgstr "Adresa:"
 
-#: clientgui/DlgOptions.cpp:291
-#: clientgui/DlgOptions.cpp:355
+#: DlgOptions.cpp:288 DlgOptions.cpp:352 ProxyPage.cpp:340 ProxyPage.cpp:360
 msgid "Port:"
 msgstr "Port:"
 
-#: clientgui/DlgOptions.cpp:299
-#: clientgui/DlgOptions.cpp:363
+#: DlgOptions.cpp:296 DlgOptions.cpp:360
 msgid "Don't use proxy for:"
 msgstr "Nepoužívat proxy pro:"
 
-#: clientgui/DlgOptions.cpp:306
-#: clientgui/DlgOptions.cpp:370
+#: DlgOptions.cpp:303 DlgOptions.cpp:367
 msgid "Leave these blank if not needed"
 msgstr "Ponechte prázdné, pokud není vyžadováno"
 
-#: clientgui/DlgOptions.cpp:312
-#: clientgui/DlgOptions.cpp:376
+#: DlgOptions.cpp:309 DlgOptions.cpp:373 ProxyPage.cpp:343 ProxyPage.cpp:363
 msgid "User Name:"
 msgstr "Uživatelské jméno:"
 
-#: clientgui/DlgOptions.cpp:320
-#: clientgui/DlgOptions.cpp:384
-#: clientgui/DlgSelectComputer.cpp:152
+#: DlgOptions.cpp:317 DlgOptions.cpp:381 DlgSelectComputer.cpp:152
+#: ProxyPage.cpp:346 ProxyPage.cpp:366
 msgid "Password:"
 msgstr "Heslo:"
 
-#: clientgui/DlgOptions.cpp:327
+#: DlgOptions.cpp:324
 msgid "HTTP Proxy"
 msgstr "HTTP proxy server"
 
-#: clientgui/DlgOptions.cpp:335
+#: DlgOptions.cpp:332
 msgid "Connect via SOCKS proxy server"
 msgstr "Připojit přes SOCKS proxy server"
 
-#: clientgui/DlgOptions.cpp:339
+#: DlgOptions.cpp:336
 msgid "SOCKS Proxy Server Configuration"
 msgstr "Nastavení SOCKS proxy serveru"
 
-#: clientgui/DlgOptions.cpp:391
+#: DlgOptions.cpp:388
 msgid "SOCKS Proxy"
 msgstr "SOCKS proxy server"
 
-#: clientgui/DlgOptions.cpp:589
+#: DlgOptions.cpp:586
 msgid "always"
 msgstr "vždy"
 
-#: clientgui/DlgOptions.cpp:590
+#: DlgOptions.cpp:587
 msgid "1 hour"
 msgstr "1 hodina"
 
-#: clientgui/DlgOptions.cpp:591
+#: DlgOptions.cpp:588
 msgid "6 hours"
 msgstr "6 hodin"
 
-#: clientgui/DlgOptions.cpp:592
+#: DlgOptions.cpp:589
 msgid "1 day"
 msgstr "1 den"
 
-#: clientgui/DlgOptions.cpp:593
+#: DlgOptions.cpp:590
 msgid "1 week"
 msgstr "1 týden"
 
-#: clientgui/DlgOptions.cpp:594
+#: DlgOptions.cpp:591
 msgid "never"
 msgstr "nikdy"
 
-#: clientgui/DlgOptions.cpp:691
+#: DlgOptions.cpp:688
 #, c-format
 msgid "%s - Language Selection"
 msgstr "%s - Volba jazyka"
 
-#: clientgui/DlgOptions.cpp:698
+#: DlgOptions.cpp:695
 #, 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 "Jazyk %s byl změněn. Aby se změna projevila, je nutné restartovat %s."
 
-#: clientgui/DlgSelectComputer.cpp:91
+#: DlgSelectComputer.cpp:91
 #, c-format
 msgid "%s - Select Computer"
 msgstr "%s - Zvolit počítač "
 
-#: clientgui/DlgSelectComputer.cpp:125
+#: DlgSelectComputer.cpp:125
 #, c-format
 msgid ""
 "Another instance of %s is already running \n"
 "on this computer.  Please select a client to monitor."
-msgstr ""
-"Na tomto počítači již běží jiná instance %s.\n"
-"Vyberte prosím klienta pro monitorování."
+msgstr "Na tomto počítači již běží jiná instance %s.\nVyberte prosím klienta pro monitorování."
 
-#: clientgui/DlgSelectComputer.cpp:143
+#: DlgSelectComputer.cpp:143
 msgid "Host name:"
 msgstr "Jméno počítače:"
 
-#: clientgui/Localization.cpp:31
-#: clientgui/Localization.cpp:69
+#: Localization.cpp:31 Localization.cpp:69
 msgid "Message boards"
 msgstr "Diskuzní fóra"
 
-#: clientgui/Localization.cpp:33
+#: Localization.cpp:33
 msgid "Correspond with other users on the SETI at home message boards"
 msgstr "Diskutovat s ostatními uživateli na diskuzním fóru SETI at home"
 
-#: clientgui/Localization.cpp:37
+#: Localization.cpp:37
 msgid "Ask questions and report problems"
 msgstr "Položit otázku nebo ohlásit problém"
 
-#: clientgui/Localization.cpp:39
-#: clientgui/Localization.cpp:81
-#: clientgui/Localization.cpp:111
-#: clientgui/Localization.cpp:129
+#: Localization.cpp:39 Localization.cpp:81 Localization.cpp:111
+#: Localization.cpp:129
 msgid "Your account"
 msgstr "Váš účet "
 
-#: clientgui/Localization.cpp:41
-#: clientgui/Localization.cpp:87
-#: clientgui/Localization.cpp:113
+#: Localization.cpp:41 Localization.cpp:87 Localization.cpp:113
 msgid "View your account information and credit totals"
 msgstr "Zobrazit informaci o vašem účtu a kreditech"
 
-#: clientgui/Localization.cpp:43
+#: Localization.cpp:43
 msgid "Your preferences"
 msgstr "Vaše předvolby"
 
-#: clientgui/Localization.cpp:45
+#: Localization.cpp:45
 msgid "View and modify your SETI at home account profile and preferences"
 msgstr "Zobrazit či změnit nastavení profilu či předvoleb u vašeho SETI at home účtu"
 
-#: clientgui/Localization.cpp:47
-#: clientgui/Localization.cpp:89
+#: Localization.cpp:47 Localization.cpp:89
 msgid "Your results"
 msgstr "Vaše výsledky"
 
-#: clientgui/Localization.cpp:49
-#: clientgui/Localization.cpp:91
+#: Localization.cpp:49 Localization.cpp:91
 msgid "View your last week (or more) of computational results and work"
 msgstr "Zobrazit výsledky vaší práce za poslední týden, či déle"
 
-#: clientgui/Localization.cpp:51
-#: clientgui/Localization.cpp:93
+#: Localization.cpp:51 Localization.cpp:93
 msgid "Your computers"
 msgstr "Vaše počítače"
 
-#: clientgui/Localization.cpp:53
+#: Localization.cpp:53
 msgid "View a listing of all the computers on which you are running SETI at Home"
 msgstr "Zobrazit seznam všech počítačů, na kterých provozujete SETI at home"
 
-#: clientgui/Localization.cpp:55
-#: clientgui/Localization.cpp:97
+#: Localization.cpp:55 Localization.cpp:97
 msgid "Your team"
 msgstr "Váš tým"
 
-#: clientgui/Localization.cpp:57
-#: clientgui/Localization.cpp:99
+#: Localization.cpp:57 Localization.cpp:99
 msgid "View information about your team"
 msgstr "Zobrazit informace o vašem týmu"
 
-#: clientgui/Localization.cpp:61
+#: Localization.cpp:61
 msgid "Common questions"
 msgstr "Obvyklé dotazy"
 
-#: clientgui/Localization.cpp:63
+#: Localization.cpp:63
 msgid "Read the Einstein at Home Frequently Asked Question list"
 msgstr "Přečtěte si Často kladené dotazy projektu Einstein at Home"
 
-#: clientgui/Localization.cpp:65
+#: Localization.cpp:65
 msgid "Screensaver info"
 msgstr "Informace o spořiči obrazovky"
 
-#: clientgui/Localization.cpp:67
+#: Localization.cpp:67
 msgid "Read a detailed description of the Einstein at Home screensaver"
 msgstr "Přečtěte si podrobný popis spořiče obrazovky Einstein at Home"
 
-#: clientgui/Localization.cpp:71
-msgid "Correspond with admins and other users on the Einstein at Home message boards"
+#: Localization.cpp:71
+msgid ""
+"Correspond with admins and other users on the Einstein at Home message boards"
 msgstr "Diskutovat se správci a ostatními uživateli na diskuzních fórech Einstein at Home"
 
-#: clientgui/Localization.cpp:73
+#: Localization.cpp:73
 msgid "Einstein status"
 msgstr "Stav projektu Einstein"
 
-#: clientgui/Localization.cpp:75
+#: Localization.cpp:75
 msgid "Current status of the Einstein at Home server"
 msgstr "Současný stav serveru Einstein at Home"
 
-#: clientgui/Localization.cpp:77
+#: Localization.cpp:77
 msgid "Report problems"
 msgstr "Nahlásit problémy"
 
-#: clientgui/Localization.cpp:79
+#: Localization.cpp:79
 msgid "A link to the Einstein at Home problems and bug reports message board"
 msgstr "Odkaz na stránky pro nahlašování problémů a chyb Einstein at Home"
 
-#: clientgui/Localization.cpp:83
+#: Localization.cpp:83
 msgid "View and modify your Einstein at Home account profile and preferences"
 msgstr "Zobrazit či změnit nastavení profilu či předvoleb u vašeho Einstein at Home účtu"
 
-#: clientgui/Localization.cpp:85
+#: Localization.cpp:85
 msgid "Account summary"
 msgstr "Přehled účtu "
 
-#: clientgui/Localization.cpp:95
-msgid "View a listing of all the computers on which you are running Einstein at Home"
+#: Localization.cpp:95
+msgid ""
+"View a listing of all the computers on which you are running Einstein at Home"
 msgstr "Zobrazit seznam všech počítačů, na kterých provozujete Einstein at home"
 
-#: clientgui/Localization.cpp:101
+#: Localization.cpp:101
 msgid "LIGO project"
 msgstr "Projekt LIGO"
 
-#: clientgui/Localization.cpp:103
-msgid "The home page of the Laser Interferometer Gravitational-wave Observatory (LIGO) project"
+#: Localization.cpp:103
+msgid ""
+"The home page of the Laser Interferometer Gravitational-wave Observatory "
+"(LIGO) project"
 msgstr "Domovská stránka projektu LIGO (Laser Interferometer Gravitational-wave Observatory)"
 
-#: clientgui/Localization.cpp:105
+#: Localization.cpp:105
 msgid "GEO-600 project"
 msgstr "Projekt GEO-600"
 
-#: clientgui/Localization.cpp:107
+#: Localization.cpp:107
 msgid "The home page of the GEO-600 project"
 msgstr "Domovská stránka projektu GEO-600"
 
-#: clientgui/Localization.cpp:115
-#: clientgui/Localization.cpp:133
+#: Localization.cpp:115 Localization.cpp:133 ViewProjects.cpp:221
+#: ViewStatistics.cpp:465
 msgid "Team"
 msgstr "Tým"
 
-#: clientgui/Localization.cpp:117
+#: Localization.cpp:117
 msgid "Info about your Team"
 msgstr "Informace o vašem týmu"
 
-#: clientgui/Localization.cpp:123
+#: Localization.cpp:123
 msgid "Get help for climateprediction.net"
 msgstr "Zobrazit nápovědu projektu climateprediction.net"
 
-#: clientgui/Localization.cpp:125
+#: Localization.cpp:125
 msgid "News"
 msgstr "Novinky"
 
-#: clientgui/Localization.cpp:127
+#: Localization.cpp:127
 msgid "climateprediction.net News"
 msgstr "Novinky projektu climateprediction.net"
 
-#: clientgui/Localization.cpp:131
+#: Localization.cpp:131
 msgid "View your account information, credits, and trickles"
 msgstr "Zobrazit informace o vašem účtu, kreditech a průběhu"
 
-#: clientgui/Localization.cpp:135
+#: Localization.cpp:135
 msgid "Info about your team"
 msgstr "Informace o vašem týmu"
 
-#: clientgui/Localization.cpp:141
+#: Localization.cpp:141
 msgid "Search for help in our help system"
 msgstr "Vyhledat radu v naší Nápovědě"
 
-#: clientgui/Localization.cpp:143
+#: Localization.cpp:143
 msgid "Global Statistics"
 msgstr "Globální statistiky"
 
-#: clientgui/Localization.cpp:145
+#: Localization.cpp:145
 msgid "Summary statistics for World Community Grid"
 msgstr "Celková statistika World Community Grid"
 
-#: clientgui/Localization.cpp:147
+#: Localization.cpp:147
 msgid "My Grid"
 msgstr "Můj Grid"
 
-#: clientgui/Localization.cpp:149
+#: Localization.cpp:149
 msgid "Your statistics and settings"
 msgstr "Vaše statistiky a nastavení"
 
-#: clientgui/Localization.cpp:151
+#: Localization.cpp:151
 msgid "Device Profiles"
 msgstr "Profily počítačů"
 
-#: clientgui/Localization.cpp:153
+#: Localization.cpp:153
 msgid "Update your device settings"
 msgstr "Aktualizovat nastavení vašich počítačů"
 
-#: clientgui/Localization.cpp:155
+#: Localization.cpp:155
 msgid "Research"
 msgstr "Výzkum"
 
-#: clientgui/Localization.cpp:157
+#: Localization.cpp:157
 msgid "Learn about the projects hosted at World Community Grid"
 msgstr "Dozvědět se víc o projektech umístěných na World Community Grid"
 
-#: clientgui/MainDocument.cpp:583
+#: MainDocument.cpp:583
 msgid "Starting client"
 msgstr "Startuji klienta"
 
-#: clientgui/MainDocument.cpp:591
+#: MainDocument.cpp:591
 msgid "Connecting to client"
 msgstr "Připojuji se ke klientovi"
 
-#: clientgui/MainDocument.cpp:1205
+#: MainDocument.cpp:1195
 msgid "Retrieving system state; please wait..."
 msgstr "Zjišťuji stav systému, prosím čekejte..."
 
-#: clientgui/MainDocument.cpp:1826
+#: MainDocument.cpp:1816
 msgid "Missing application"
 msgstr "Chybějící aplikace"
 
-#: clientgui/MainDocument.cpp:1827
-msgid "Please download and install the CoRD application from http://cord.sourceforge.net"
+#: MainDocument.cpp:1817
+msgid ""
+"Please download and install the CoRD application from "
+"http://cord.sourceforge.net"
 msgstr "Stáhněte si prosím a naistalujte aplikaci CoRD z adresy http://cord.sourceforge.net"
 
-#: clientgui/MainDocument.cpp:2442
+#: MainDocument.cpp:2432
 msgid "on batteries"
 msgstr "na bateriích"
 
-#: clientgui/MainDocument.cpp:2443
+#: MainDocument.cpp:2433
 msgid "computer is in use"
 msgstr "počítač je používán"
 
-#: clientgui/MainDocument.cpp:2444
+#: MainDocument.cpp:2434
 msgid "user request"
 msgstr "požadavek uživatele"
 
-#: clientgui/MainDocument.cpp:2445
+#: MainDocument.cpp:2435
 msgid "time of day"
 msgstr "čas"
 
-#: clientgui/MainDocument.cpp:2446
+#: MainDocument.cpp:2436
 msgid "CPU benchmarks in progress"
 msgstr "probíhají testy procesoru"
 
-#: clientgui/MainDocument.cpp:2447
+#: MainDocument.cpp:2437
 msgid "need disk space - check preferences"
 msgstr "nedostatek místa na disku - zkontrolujte prosím předvolby"
 
-#: clientgui/MainDocument.cpp:2448
+#: MainDocument.cpp:2438
 msgid "computer is not in use"
 msgstr "počítač není používán"
 
-#: clientgui/MainDocument.cpp:2449
+#: MainDocument.cpp:2439
 msgid "starting up"
 msgstr "startuji"
 
-#: clientgui/MainDocument.cpp:2450
+#: MainDocument.cpp:2440
 msgid "an exclusive app is running"
 msgstr "běží důležitější aplikace"
 
-#: clientgui/MainDocument.cpp:2451
+#: MainDocument.cpp:2441
 msgid "CPU is busy"
 msgstr "procesor je vytížen"
 
-#: clientgui/MainDocument.cpp:2452
+#: MainDocument.cpp:2442
 msgid "network bandwidth limit exceeded"
 msgstr "překročen limit přenosu dat po síti"
 
-#: clientgui/MainDocument.cpp:2453
+#: MainDocument.cpp:2443
 msgid "requested by operating system"
 msgstr "vyžádáno operačním systémem"
 
-#: clientgui/MainDocument.cpp:2455
+#: MainDocument.cpp:2445
 msgid "unknown reason"
 msgstr "neznámý důvod"
 
-#: clientgui/MainDocument.cpp:2477
+#: MainDocument.cpp:2467
 msgid "GPU missing, "
 msgstr "GPU nenalezena, "
 
-#: clientgui/MainDocument.cpp:2484
+#: MainDocument.cpp:2474
 msgid "New"
 msgstr "Nový"
 
-#: clientgui/MainDocument.cpp:2488
+#: MainDocument.cpp:2478
 msgid "Download failed"
 msgstr "Chyba při stahování"
 
-#: clientgui/MainDocument.cpp:2490
+#: MainDocument.cpp:2480
 msgid "Downloading"
 msgstr "Stahuji"
 
-#: clientgui/MainDocument.cpp:2492
-#: clientgui/MainDocument.cpp:2557
+#: MainDocument.cpp:2482 MainDocument.cpp:2552
 msgid " (suspended - "
 msgstr " (pozastaveno - "
 
-#: clientgui/MainDocument.cpp:2500
+#: MainDocument.cpp:2490
 msgid "Project suspended by user"
 msgstr "Projekt pozastaven uživatelem"
 
-#: clientgui/MainDocument.cpp:2502
+#: MainDocument.cpp:2492
 msgid "Task suspended by user"
 msgstr "Úkol pozastaven uživatelem"
 
-#: clientgui/MainDocument.cpp:2504
+#: MainDocument.cpp:2494
 msgid "Suspended - "
 msgstr "Pozastaveno - "
 
-# 75%
-#: clientgui/MainDocument.cpp:2510
+#: MainDocument.cpp:2500
 msgid "GPU suspended - "
 msgstr "GPU pozastaveno - "
 
-#: clientgui/MainDocument.cpp:2517
+#: MainDocument.cpp:2507
 msgid "Waiting for memory"
 msgstr "Čekám na uvolnění paměti"
 
-#: clientgui/MainDocument.cpp:2519
+#: MainDocument.cpp:2509
 msgid "Waiting for shared memory"
 msgstr "Čekám na uvolnění sdílené paměti"
 
-#: clientgui/MainDocument.cpp:2521
+#: MainDocument.cpp:2512
+msgid "Running, high priority"
+msgstr "Počítám s vysokou prioritou"
+
+#: MainDocument.cpp:2514
 msgid "Running"
 msgstr "Počítám"
 
-#: clientgui/MainDocument.cpp:2523
+#: MainDocument.cpp:2517
 msgid " (non-CPU-intensive)"
 msgstr " (nenáročný na procesor)"
 
-#: clientgui/MainDocument.cpp:2526
+#: MainDocument.cpp:2520
 msgid "Waiting to run"
 msgstr "Čekám na zpracování"
 
-#: clientgui/MainDocument.cpp:2528
-#: clientgui/MainDocument.cpp:2534
+#: MainDocument.cpp:2522 MainDocument.cpp:2528
 msgid "Ready to start"
 msgstr "Připraven"
 
-#: clientgui/MainDocument.cpp:2538
-msgid "Postponed: "
-msgstr ""
+#: MainDocument.cpp:2532
+msgid " (Scheduler wait: "
+msgstr " (Vyčkávání plánovače: "
 
-#: clientgui/MainDocument.cpp:2541
-msgid "Postponed"
-msgstr ""
+#: MainDocument.cpp:2536
+msgid " (Scheduler wait)"
+msgstr "(vyčkávání plánovače)"
 
-#: clientgui/MainDocument.cpp:2545
-#, fuzzy
-msgid "Waiting for network access"
+#: MainDocument.cpp:2540
+msgid " (Waiting for network access)"
 msgstr "(Čekám na připojení k Internetu)"
 
-#: clientgui/MainDocument.cpp:2549
+#: MainDocument.cpp:2544
 msgid "Computation error"
 msgstr "Chyba při výpočtu"
 
-#: clientgui/MainDocument.cpp:2553
+#: MainDocument.cpp:2548
 msgid "Upload failed"
 msgstr "Chyba při odesílání"
 
-#: clientgui/MainDocument.cpp:2555
+#: MainDocument.cpp:2550
 msgid "Uploading"
 msgstr "Odesílám"
 
-#: clientgui/MainDocument.cpp:2566
+#: MainDocument.cpp:2561
 msgid "Aborted by user"
 msgstr "Zrušeno uživatelem"
 
-#: clientgui/MainDocument.cpp:2569
+#: MainDocument.cpp:2564
 msgid "Aborted by project"
 msgstr "Zrušeno projektem"
 
-#: clientgui/MainDocument.cpp:2572
+#: MainDocument.cpp:2567
 msgid "Aborted: not started by deadline"
 msgstr "Zrušeno: vypršela lhůta před započetím"
 
-#: clientgui/MainDocument.cpp:2575
+#: MainDocument.cpp:2570
 msgid "Aborted: disk limit exceeded"
 msgstr "Zrušeno: překročeno povolené místo na disku"
 
-#: clientgui/MainDocument.cpp:2578
+#: MainDocument.cpp:2573
 msgid "Aborted: run time limit exceeded"
 msgstr "Zrušeno: překročena maximální délka výpočtu"
 
-#: clientgui/MainDocument.cpp:2581
+#: MainDocument.cpp:2576
 msgid "Aborted: memory limit exceeded"
 msgstr "Zrušeno: překročen povolený limit paměti"
 
-#: clientgui/MainDocument.cpp:2584
+#: MainDocument.cpp:2579
 msgid "Aborted"
 msgstr "Zrušeno"
 
-#: clientgui/MainDocument.cpp:2589
+#: MainDocument.cpp:2584
 msgid "Acknowledged"
 msgstr "Potvrzeno"
 
-#: clientgui/MainDocument.cpp:2591
+#: MainDocument.cpp:2586
 msgid "Ready to report"
 msgstr "Odeslán. Připraven k ohlášení"
 
-#: clientgui/MainDocument.cpp:2593
+#: MainDocument.cpp:2588
 #, c-format
 msgid "Error: invalid state '%d'"
 msgstr "Chyba: Neplatný stav '%d'"
 
-#: clientgui/NoInternetConnectionPage.cpp:179
+#: NoInternetConnectionPage.cpp:179
 msgid "No Internet connection"
 msgstr "Není připojení k Internetu"
 
-#: clientgui/NoInternetConnectionPage.cpp:182
+#: NoInternetConnectionPage.cpp:182
 msgid "Please connect to the Internet and try again."
 msgstr "Prosím obnovte připojení k Internetu a zkuste znova."
 
-#: clientgui/NotDetectedPage.cpp:181
+#: NotDetectedPage.cpp:181
 msgid "Project not found"
 msgstr "Projekt nenalezen"
 
-#: clientgui/NotDetectedPage.cpp:184
+#: 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 ""
-"URL adresa, která byla zadána, nepatří BOINC projektu.\n"
-"\n"
-"Zkontrolujte prosím zadávanou adresu a zkuste znova."
+msgstr "URL adresa, která byla zadána, nepatří BOINC projektu.\n\nZkontrolujte prosím zadávanou adresu a zkuste znova."
 
-#: clientgui/NotDetectedPage.cpp:188
+#: NotDetectedPage.cpp:188
 msgid "Account manager not found"
 msgstr "Správce účtu nenalezen"
 
-#: clientgui/NotDetectedPage.cpp:191
+#: NotDetectedPage.cpp:191
 msgid ""
 "The URL you supplied is not that of a BOINC-based account\n"
 "manager.\n"
 "\n"
 "Please check the URL and try again."
-msgstr ""
-"URL adresa, která byla zadána, nepatří Správci účtu pro BOINC.\n"
-"\n"
-"Zkontrolujte prosím zadávanou adresu a zkuste znova."
+msgstr "URL adresa, která byla zadána, nepatří Správci účtu pro BOINC.\n\nZkontrolujte prosím zadávanou adresu a zkuste znova."
 
-#: clientgui/NotFoundPage.cpp:181
+#: NotFoundPage.cpp:181
 msgid "Login Failed."
 msgstr "Přihlášení selhalo."
 
-#: clientgui/NotFoundPage.cpp:185
+#: NotFoundPage.cpp:185
 msgid "Check the username and password, and try again."
 msgstr "Zkontrolujte uživatelské jméno a heslo a zkuste to znova."
 
-#: clientgui/NotFoundPage.cpp:189
+#: NotFoundPage.cpp:189
 msgid "Check the email address and password, and try again."
 msgstr "Zkontrolujte zadanou emailovou adresu a heslo a zkuste to znova."
 
-#: clientgui/NoticeListCtrl.cpp:229
+#: NoticeListCtrl.cpp:222
 msgid "more..."
 msgstr "více..."
 
-#: clientgui/ProjectInfoPage.cpp:221
+#: ProjectInfoPage.cpp:477 ProjectInfoPage.cpp:778 ProjectInfoPage.cpp:782
+msgid "All"
+msgstr "Vše"
+
+#: ProjectInfoPage.cpp:615
 msgid "Choose a project"
 msgstr "Výběr projektu"
 
-#: clientgui/ProjectInfoPage.cpp:228
+#: ProjectInfoPage.cpp:619
 msgid "To choose a project, click its name or type its URL below."
-msgstr ""
-"Vyberte si projekt kliknutím na jeho jméno\n"
-"nebo napište jeho URL adresu do textového pole níže."
+msgstr "Vyberte si projekt kliknutím na jeho jméno\nnebo napište jeho URL adresu do textového pole níže."
 
-#: clientgui/ProjectInfoPage.cpp:246
+#: ProjectInfoPage.cpp:623
 msgid "Categories:"
 msgstr "Kategorie:"
 
-#: clientgui/ProjectInfoPage.cpp:267
+#: ProjectInfoPage.cpp:627 sg_ProjectPanel.cpp:89
 msgid "Projects:"
 msgstr "Projekty:"
 
-#: clientgui/ProjectInfoPage.cpp:279
+#: ProjectInfoPage.cpp:631
 msgid "Project details"
 msgstr "Detaily projektu"
 
-#: clientgui/ProjectInfoPage.cpp:291
+#: ProjectInfoPage.cpp:635
 msgid "Research area:"
 msgstr "Oblast výzkumu:"
 
-#: clientgui/ProjectInfoPage.cpp:302
+#: ProjectInfoPage.cpp:639
 msgid "Organization:"
 msgstr "Organizace:"
 
-#: clientgui/ProjectInfoPage.cpp:313
+#: ProjectInfoPage.cpp:643
 msgid "Web site:"
 msgstr "Webové stránky:"
 
-#: clientgui/ProjectInfoPage.cpp:325
+#: ProjectInfoPage.cpp:647
 msgid "Supported systems:"
 msgstr "Podporované systémy:"
 
-#: clientgui/ProjectInfoPage.cpp:363
+#: ProjectInfoPage.cpp:651
 msgid "Project URL:"
 msgstr "URL adresa projektu:"
 
-#: clientgui/ProjectInfoPage.cpp:499
-#: clientgui/ProjectInfoPage.cpp:754
-#: clientgui/ProjectInfoPage.cpp:758
-msgid "All"
-msgstr "Vše"
-
-#: clientgui/ProjectInfoPage.cpp:802
-msgid "This project may not have work for your type of computer.  Do you want to add it anyway?"
+#: ProjectInfoPage.cpp:826
+msgid ""
+"This project may not have work for your type of computer.  Do you want to "
+"add it anyway?"
 msgstr "Tento projekt nemusí mít práci pro váš typ počítače. Chcete ho i tak přidat?"
 
-#: clientgui/ProjectInfoPage.cpp:826
+#: ProjectInfoPage.cpp:850
 msgid "You already added this project. Please choose a different project."
 msgstr "Tento projekt již máte přidaný. Zvolte prosím jiný projekt."
 
-#: clientgui/ProjectProcessingPage.cpp:321
+#: ProjectProcessingPage.cpp:321
 msgid "Communicating with project."
 msgstr "Komunikuji se projektem."
 
-#: clientgui/ProjectProcessingPage.cpp:510
+#: ProjectProcessingPage.cpp:509
 msgid "Required files not found on the server."
 msgstr "Potřebné soubory nenalezeny na serveru."
 
-#: clientgui/ProjectProcessingPage.cpp:513
-#: clientgui/ProjectProcessingPage.cpp:586
+#: ProjectProcessingPage.cpp:512 ProjectProcessingPage.cpp:574
 msgid "An internal server error has occurred."
 msgstr "Na serveru se vyskytla vnitřní chyba."
 
-#: clientgui/ProjectPropertiesPage.cpp:334
+#: ProjectPropertiesPage.cpp:334
 msgid ""
 "Communicating with project\n"
 "Please wait..."
-msgstr ""
-"Komunikuji s projektem.\n"
-"Čekejte prosím..."
-
-#: clientgui/ProjectWelcomePage.cpp:251
-#, fuzzy, c-format
-msgid "Welcome to %s."
-msgstr "Vítejte v %s!"
-
-#: clientgui/ProjectWelcomePage.cpp:254
-msgid "You have volunteered to compute for this project:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:255
-#, fuzzy
-msgid "Name:"
-msgstr "Jméno"
-
-#: clientgui/ProjectWelcomePage.cpp:258
-msgid "Home:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:262
-msgid "Description:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:265
-msgid "URL:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:268
-#, fuzzy
-msgid "User:"
-msgstr "Uživatel"
-
-#: clientgui/ProjectWelcomePage.cpp:273
-msgid "WARNING: This project is not registered with BOINC.  Make sure you trust it before continuing."
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:277
-msgid "To continue, click Next."
-msgstr "Pokračujte kliknutím na tlačítko Další."
+msgstr "Komunikuji s projektem.\nČekejte prosím..."
 
-#: clientgui/ProxyInfoPage.cpp:195
+#: ProxyInfoPage.cpp:195
 msgid "Network communication failure"
 msgstr "Selhala síťová komunikace"
 
-#: clientgui/ProxyInfoPage.cpp:199
+#: ProxyInfoPage.cpp:199
 msgid ""
 "The World Community Grid - BOINC software failed to communicate\n"
 "over the Internet. The most likely reasons are:\n"
@@ -2737,22 +2487,9 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"The World Community Grid - BOINC se nedokázal připojit k Internetu.\n"
-"Nejčastější příčinou bývá:\n"
-"\n"
-"1) Problém s připojením.\n"
-"Zkontrolujte prosím vaše telefonické nebo síťové připojení k Internetu.\n"
-"Poté klikněte na tlačítko Zpět a zopakujte předchozí krok.\n"
-"\n"
-"2) Nainstalovaný firewall blokuje World Community Grid - BOINC.\n"
-"Nastavte prosím firewall tak, aby umožnil programům 'BOINC' a 'Správce BOINC' komunikovat na portu 80 a 443.\n"
-"Poté klikněte na tlačítko Zpět a zopakujte předchozí krok.\n"
-"\n"
-"3) Jste připojeni k Internetu přes proxy server.\n"
-"Klikněte na Dále pro konfiguraci připojení BOINC přes proxy server."
+msgstr "The World Community Grid - BOINC se nedokázal připojit k Internetu.\nNejčastější příčinou bývá:\n\n1) Problém s připojením.\nZkontrolujte prosím vaše telefonické nebo síťové připojení k Internetu.\nPoté klikněte na tlačítko Zpět a zopakujte předchozí krok.\n\n2) Nainstalovaný firewall blokuje World Community Grid - BOINC.\nNastavte prosím firewall tak, aby umožnil programům 'BOINC' a 'Správce BOINC' komunikovat na portu 80 a 443.\nPoté klikněte na tlačítko Zpět a zopakujte předch [...]
 
-#: clientgui/ProxyInfoPage.cpp:203
+#: ProxyInfoPage.cpp:203
 msgid ""
 "BOINC failed to communicate on the Internet.\n"
 "The most likely reasons are:\n"
@@ -2767,1780 +2504,1201 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"BOINC se nedokázal připojit k Internetu.\n"
-"Nejčastější příčiny bývají:\n"
-"\n"
-"1) Problém s připojením.\n"
-"Zkontrolujte prosím vaše telefonické nebo síťové připojení k Internetu.\n"
-"Poté klikněte na tlačítko Zpět a zopakujte předchozí krok.\n"
-"\n"
-"2) Nainstalovaný firewall blokuje BOINC.\n"
-"Nastavte prosím firewall tak, aby umožnil programům 'BOINC' a 'Správce BOINC' komunikovat na portu 80.\n"
-"Poté klikněte na tlačítko Zpět a zopakujte předchozí krok.\n"
-"\n"
-"3) Jste připojeni k Internetu přes proxy server.\n"
-"Klikněte na Dále pro konfiguraci připojení BOINC přes proxy server."
+msgstr "BOINC se nedokázal připojit k Internetu.\nNejčastější příčiny bývají:\n\n1) Problém s připojením.\nZkontrolujte prosím vaše telefonické nebo síťové připojení k Internetu.\nPoté klikněte na tlačítko Zpět a zopakujte předchozí krok.\n\n2) Nainstalovaný firewall blokuje BOINC.\nNastavte prosím firewall tak, aby umožnil programům 'BOINC' a 'Správce BOINC' komunikovat na portu 80.\nPoté klikněte na tlačítko Zpět a zopakujte předchozí krok.\n\n3) Jste připojeni k Internetu přes proxy s [...]
 
-#: clientgui/ProxyPage.cpp:331
+#: ProxyPage.cpp:331
 msgid "Proxy configuration"
 msgstr "Nastavení proxy serveru"
 
-#: clientgui/ProxyPage.cpp:334
+#: ProxyPage.cpp:334
 msgid "HTTP proxy"
 msgstr "HTTP proxy server"
 
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
+#: ProxyPage.cpp:337 ProxyPage.cpp:357
 msgid "Server:"
 msgstr "Server:"
 
-#: clientgui/ProxyPage.cpp:350
+#: ProxyPage.cpp:350
 msgid "Autodetect"
 msgstr "Autodekce"
 
-#: clientgui/ProxyPage.cpp:354
+#: ProxyPage.cpp:354
 msgid "SOCKS proxy"
 msgstr "SOCKS proxy server"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:167
-msgid "Advanced View...\tCtrl+Shift+A"
-msgstr "Pokročilé zobrazení...\tCtrl+Shift+A"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:168
-msgid "Display the advanced graphical interface."
-msgstr "Zobrazit rozšířené grafické rozhraní."
+#: TermsOfUsePage.cpp:218
+msgid "Terms of Use"
+msgstr "Podmínky použití"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:175
-msgid "Skin"
-msgstr "Vzhled"
+#: TermsOfUsePage.cpp:222
+msgid "Please read the following terms of use:"
+msgstr "Přečtěte si prosím následující podmínky použití:"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:177
-msgid "Select the appearance of the user interface."
-msgstr "Vyberte si vzhled aplikace."
+#: TermsOfUsePage.cpp:231
+msgid "I agree to the terms of use."
+msgstr "Souhlasím s podmínkami použití."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:224
-#, c-format
-msgid "&%s"
-msgstr "&%s"
+#: TermsOfUsePage.cpp:237
+msgid "I do not agree to the terms of use."
+msgstr "Nesouhlasím s podmínkami použití."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:405
-msgid "Default"
-msgstr "Výchozí"
+#: UnavailablePage.cpp:183
+msgid "Project temporarily unavailable"
+msgstr "Projekt je dočasně nedostupný"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:848
-msgid "Suspend"
-msgstr "Pozastavit"
+#: UnavailablePage.cpp:186
+msgid ""
+"The project is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "Projekt je dočasně nedostupný.\n\nZkuste to prosím později. "
 
-#: clientgui/sg_BoincSimpleFrame.cpp:850
-msgid "Suspend Computing"
-msgstr "Pozastavit výpočty"
+#: UnavailablePage.cpp:190
+msgid "Account manager temporarily unavailable"
+msgstr "Správce účtu je dočasně nedostupný"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:851
-msgid "Resume Computing"
-msgstr "Pokračovat ve výpočtech"
+#: UnavailablePage.cpp:193
+msgid ""
+"The account manager is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "Správce účtu je dočasně nedostupný.\n\nZkuste to prosím později. "
 
-#: clientgui/sg_BoincSimpleFrame.cpp:867
-msgid "Notices"
-msgstr "Zprávy"
+#: ValidateAccountKey.cpp:68
+msgid "Please specify an account key to continue."
+msgstr "Zadej prosím klíč k účtu pro pokračování."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:868
-msgid "Open a window to view notices from projects or BOINC"
-msgstr "Otevřít okno s informačními zprávami projektů nebo BOINC"
+#: ValidateAccountKey.cpp:71
+msgid "Invalid Account Key; please enter a valid Account Key"
+msgstr "Neplatný klíč k účtu - vložte prosím platný klíč"
 
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
-msgstr "Načítám zprávy, prosím čekejte..."
+#: ValidateAccountKey.cpp:82 ValidateEmailAddress.cpp:86
+msgid "Validation conflict"
+msgstr "Chyba při validaci"
 
-#: clientgui/sg_DlgMessages.cpp:132
-msgid "There are no notices at this time."
-msgstr "Nejsou dostupné žádné zprávy."
+#: ValidateEmailAddress.cpp:72
+msgid "Please specify an email address"
+msgstr "Zadejte prosím emailovou adresu"
 
-#: clientgui/sg_DlgMessages.cpp:146
-msgid "Close"
-msgstr "Zavřít"
+#: ValidateEmailAddress.cpp:75
+msgid "Invalid email address; please enter a valid email address"
+msgstr "Neplatná emailová adresa - vložte prosím platnou adresu"
 
-#: clientgui/sg_DlgMessages.cpp:394
-#, c-format
-msgid "%s - Notices"
-msgstr "%s - Zprávy"
+#: ValidateURL.cpp:69
+msgid "Missing URL"
+msgstr "Chybí URL adresa"
 
-#: clientgui/sg_DlgPreferences.cpp:270
-msgid "This dialog controls preferences for this computer only."
-msgstr "Toto okno nastavuje předvolby jen pro tento počítač."
+#: ValidateURL.cpp:70
+msgid ""
+"Please specify a URL.\n"
+"For example:\n"
+"http://www.example.com/"
+msgstr "Zadejte prosím URL adresu.\nNapříklad:\nhttp://www.example.com/"
 
-#: clientgui/sg_DlgPreferences.cpp:275
-msgid "Click OK to set preferences."
-msgstr "Klikněte na OK pro uložení předvoleb."
+#: ValidateURL.cpp:83 ValidateURL.cpp:87 ValidateURL.cpp:91
+#: ValidateURL.cpp:103 ValidateURL.cpp:107 ValidateURL.cpp:110
+msgid "Invalid URL"
+msgstr "Neplatná URL adresa"
 
-#: clientgui/sg_DlgPreferences.cpp:280
-msgid "Click Clear to restore web-based settings for all preferences listed below."
-msgstr ""
+#: ValidateURL.cpp:84 ValidateURL.cpp:88 ValidateURL.cpp:92
+msgid ""
+"Please specify a valid URL.\n"
+"For example:\n"
+"http://boincproject.example.com"
+msgstr "Zadejte prosím platnou URL adresu.\nNapříklad:\nhttp://boincproject.example.com"
 
-#: clientgui/sg_DlgPreferences.cpp:287
-#, fuzzy
-msgid "For additional settings, select Computing Preferences in the Advanced View."
-msgstr "Pro pokročilé nastavení klikněte na Výpočetní předvolby v"
+#: ValidateURL.cpp:104 ValidateURL.cpp:108
+#, c-format
+msgid "'%s' does not contain a valid host name."
+msgstr "'%s' neobsahuje platné jméno počítače."
 
-#: clientgui/sg_DlgPreferences.cpp:315
-msgid "Do work only between:"
-msgstr "Počítej pouze mezi: "
+#: ValidateURL.cpp:111
+#, c-format
+msgid "'%s' does not contain a valid path."
+msgstr "'%s' neobsahuje platnou cestu."
 
-#: clientgui/sg_DlgPreferences.cpp:337
-msgid "Connect to internet only between:"
-msgstr "Připojuj se k Internetu pouze mezi: "
+#: ViewMessages.cpp:84 ViewProjects.cpp:170 ViewStatistics.cpp:1978
+#: ViewTransfers.cpp:160 ViewWork.cpp:183
+msgid "Commands"
+msgstr "Příkazy"
 
-#: clientgui/sg_DlgPreferences.cpp:359
-#: clientgui/sg_DlgPreferences.cpp:376
-msgid "Use no more than:"
-msgstr "Použij nejvýše "
+#: ViewMessages.cpp:88
+msgid "Copy all messages"
+msgstr "Zkopírovat všechny zprávy"
 
-#: clientgui/sg_DlgPreferences.cpp:372
-msgid "of disk space"
-msgstr "místa na disku"
+#: ViewMessages.cpp:95
+msgid "Copy selected messages"
+msgstr "Zkopírovat označené zprávy"
 
-#: clientgui/sg_DlgPreferences.cpp:389
-msgid "of the processor"
-msgstr "výkonu procesoru"
-
-#: clientgui/sg_DlgPreferences.cpp:393
-msgid "Do work while on battery?"
-msgstr "Počítat při běhu na baterie?"
-
-#: clientgui/sg_DlgPreferences.cpp:406
-msgid "Do work after idle for:"
-msgstr "Počítat po nečinnosti: "
-
-#: clientgui/sg_DlgPreferences.cpp:431
-#, fuzzy
-msgid "Clear all local preferences listed above and close the dialog"
-msgstr "Smazat všechny místní předvolby a zavřít nabídku"
-
-#: clientgui/sg_DlgPreferences.cpp:609
-#: clientgui/sg_DlgPreferences.cpp:612
-#: clientgui/sg_DlgPreferences.cpp:688
-#: clientgui/sg_DlgPreferences.cpp:692
-#: clientgui/sg_DlgPreferences.cpp:704
-#: clientgui/sg_DlgPreferences.cpp:708
-#: clientgui/sg_DlgPreferences.cpp:851
-#: clientgui/sg_DlgPreferences.cpp:862
-msgid "Anytime"
-msgstr "Kdykoliv"
-
-#: clientgui/sg_DlgPreferences.cpp:645
-msgid "100 MB"
-msgstr "100 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:646
-msgid "200 MB"
-msgstr "200 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:647
-msgid "500 MB"
-msgstr "500 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:648
-msgid "1 GB"
-msgstr "1 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:649
-msgid "2 GB"
-msgstr "2 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:650
-msgid "5 GB"
-msgstr "5 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:651
-msgid "10 GB"
-msgstr "10 GB"
+#: ViewMessages.cpp:106 ViewMessages.cpp:502
+msgid "Show only this project"
+msgstr "Zobrazit jen tento projekt"
 
-#: clientgui/sg_DlgPreferences.cpp:652
-msgid "20 GB"
-msgstr "20 GB"
+#: ViewMessages.cpp:107 ViewMessages.cpp:503
+msgid "Show only the messages for the selected project."
+msgstr "Zobrazit pouze zprávy vybraného projektu."
 
-#: clientgui/sg_DlgPreferences.cpp:653
-msgid "50 GB"
-msgstr "50 GB"
+#: ViewMessages.cpp:164
+msgid "Messages"
+msgstr "Zprávy"
 
-#: clientgui/sg_DlgPreferences.cpp:654
-msgid "100 GB"
-msgstr "100 GB"
+#: ViewMessages.cpp:187
+msgid "Copying all messages to the clipboard..."
+msgstr "Kopíruji všechny zprávy do schránky..."
 
-#: clientgui/sg_DlgPreferences.cpp:724
-#, c-format
-msgid "%d MB"
-msgstr "%d MB"
+#: ViewMessages.cpp:223
+msgid "Copying selected messages to the clipboard..."
+msgstr "Kopíruji označené zprávy do schránky..."
 
-#: clientgui/sg_DlgPreferences.cpp:726
-#, c-format
-msgid "%4.2f GB"
-msgstr "%4.2f GB"
+#: ViewMessages.cpp:286
+msgid "Filtering messages..."
+msgstr "Filtruji zprávy..."
 
-#: clientgui/sg_DlgPreferences.cpp:767
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
+#: ViewMessages.cpp:494
+msgid "Show all messages"
+msgstr "Zobrazit všechny zprávy"
 
-#: clientgui/sg_DlgPreferences.cpp:803
-msgid "0 (Run Always)"
-msgstr "0 (Počítat trvale)"
+#: ViewMessages.cpp:495
+msgid "Show messages for all projects."
+msgstr "Zobrazit zprávy všech projektů."
 
-#: clientgui/sg_DlgPreferences.cpp:806
-#, c-format
-msgid "%d"
-msgstr "%d"
+#: ViewNotices.cpp:58 sg_DlgMessages.cpp:124
+msgid "Fetching notices; please wait..."
+msgstr "Načítám zprávy, prosím čekejte..."
 
-#: clientgui/sg_DlgPreferences.cpp:953
-#, c-format
-msgid "%s - Computing Preferences"
-msgstr ""
+#: ViewNotices.cpp:65 sg_DlgMessages.cpp:132
+msgid "There are no notices at this time."
+msgstr "Nejsou dostupné žádné zprávy."
 
-#: clientgui/sg_DlgPreferences.cpp:1033
-msgid "Do you really want to clear all local preferences?\n"
-msgstr "Opravdu chcete vymazat všechny lokální předvolby?\n"
+#: ViewNotices.cpp:99 sg_BoincSimpleFrame.cpp:776
+msgid "Notices"
+msgstr "Zprávy"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:66
-#: clientgui/ViewProjects.cpp:179
+#: ViewProjects.cpp:174 sg_ProjectCommandPopup.cpp:61
 msgid "Update"
 msgstr "Aktualizovat"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:67
-#: clientgui/ViewProjects.cpp:180
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
+#: ViewProjects.cpp:175 sg_ProjectCommandPopup.cpp:62
+msgid ""
+"Report all completed tasks, get latest credit, get latest preferences, and "
+"possibly get more tasks."
 msgstr "Nahlásit veškerou dokončenou práci, získat aktuální údaj o kreditu a nastavení a je-li možno, přijmout další práci."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:73
-#: clientgui/sg_ProjectCommandPopup.cpp:129
-#: clientgui/ViewProjects.cpp:187
-#: clientgui/ViewProjects.cpp:727
+#: 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
+msgid "Suspend"
+msgstr "Pozastavit"
+
+#: ViewProjects.cpp:182 ViewProjects.cpp:722 sg_ProjectCommandPopup.cpp:68
+#: sg_ProjectCommandPopup.cpp:114
 msgid "Suspend tasks for this project."
 msgstr "Pozastavit práci tohoto projektu."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:78
-#: clientgui/sg_ProjectCommandPopup.cpp:136
-#: clientgui/ViewProjects.cpp:193
-#: clientgui/ViewProjects.cpp:746
+#: ViewProjects.cpp:188 ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:73
+#: sg_ProjectCommandPopup.cpp:121
 msgid "No new tasks"
 msgstr "Nepřijímat další práci"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:79
-#: clientgui/ViewProjects.cpp:194
+#: ViewProjects.cpp:189 sg_ProjectCommandPopup.cpp:74
 msgid "Don't get new tasks for this project."
 msgstr "Zakázat projektu přijímat další práci."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:200
+#: ViewProjects.cpp:195 sg_ProjectCommandPopup.cpp:79
 msgid "Reset project"
 msgstr "Restartovat projekt"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:85
-#: clientgui/ViewProjects.cpp:201
-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."
+#: ViewProjects.cpp:196 sg_ProjectCommandPopup.cpp:80
+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 "Smazat všechny soubory a úkoly související s tímto projektem a stáhnout nové. Před restartováním doporučujeme projekt aktualizovat, čímž odešlete a ohlásíte všechny dokončené úkoly."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:91
-#: clientgui/ViewProjects.cpp:208
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
+#: ViewProjects.cpp:203 sg_ProjectCommandPopup.cpp:86
+msgid ""
+"Remove this project.  Tasks in progress will be lost (use 'Update' first to "
+"report any completed tasks)."
 msgstr "Odebrat tento projekt. Započatá práce bude ztracena. Před odebráním doporučujeme projekt aktualizovat, čímž odešlete a ohlásíte všechny dokončené úkoly. "
 
-#: clientgui/sg_ProjectCommandPopup.cpp:96
-#: clientgui/sg_TaskCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:214
+#: ViewProjects.cpp:209 ViewWork.cpp:222 sg_ProjectCommandPopup.cpp:91
+#: sg_TaskCommandPopup.cpp:78
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:97
-#: clientgui/ViewProjects.cpp:215
+#: ViewProjects.cpp:210 sg_ProjectCommandPopup.cpp:92
 msgid "Show project details."
 msgstr "Zobrazit detaily projektu."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:126
-#: clientgui/ViewProjects.cpp:723
-msgid "Resume tasks for this project."
-msgstr "Obnovit práci pro tento projekt."
+#: ViewProjects.cpp:220 ViewStatistics.cpp:450
+msgid "Account"
+msgstr "Účet"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:133
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow new tasks"
-msgstr "Povolit další práci"
+#: ViewProjects.cpp:222
+msgid "Work done"
+msgstr "Kredit"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:134
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow fetching new tasks for this project."
-msgstr "Povolit tomuto projektu přijímat další práci."
+#: ViewProjects.cpp:223
+msgid "Avg. work done"
+msgstr "Průměrný kredit"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:137
-#: clientgui/ViewProjects.cpp:746
-msgid "Don't fetch new tasks for this project."
-msgstr "Zakázat tomuto projektu přijímat další práci."
+#: ViewProjects.cpp:225 ViewTransfers.cpp:188 ViewWork.cpp:234
+msgid "Status"
+msgstr "Stav"
+
+#: ViewProjects.cpp:250
+msgid "Projects"
+msgstr "Projekty"
+
+#: ViewProjects.cpp:302
+msgid "Updating project..."
+msgstr "Aktualizuji projekt..."
+
+#: ViewProjects.cpp:344
+msgid "Resuming project..."
+msgstr "Obnovuji projekt..."
+
+#: ViewProjects.cpp:348
+msgid "Suspending project..."
+msgstr "Pozastavuji projekt..."
+
+#: ViewProjects.cpp:385
+msgid "Telling project to allow additional task downloads..."
+msgstr "Povoluji projektu přijímat další práci..."
+
+#: ViewProjects.cpp:389
+msgid "Telling project to not fetch any additional tasks..."
+msgstr "Zakazuji projektu přijímat další práci..."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:229
-#: clientgui/ViewProjects.cpp:443
+#: ViewProjects.cpp:425
+msgid "Resetting project..."
+msgstr "Restartuji projekt..."
+
+#: ViewProjects.cpp:438 sg_ProjectCommandPopup.cpp:214
 #, c-format
 msgid "Are you sure you want to reset project '%s'?"
 msgstr "Opravdu chcete restartovat projekt '%s'?"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:235
-#: clientgui/ViewProjects.cpp:449
+#: ViewProjects.cpp:444 sg_ProjectCommandPopup.cpp:220
 msgid "Reset Project"
 msgstr "Restartovat projekt"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:266
-#: clientgui/ViewProjects.cpp:501
+#: ViewProjects.cpp:483
+msgid "Removing project..."
+msgstr "Odebírám projekt..."
+
+#: ViewProjects.cpp:496 sg_ProjectCommandPopup.cpp:251
 #, c-format
 msgid "Are you sure you want to remove project '%s'?"
 msgstr "Opravdu chcete odebrat projekt '%s'?"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:272
-#: clientgui/ViewProjects.cpp:507
+#: ViewProjects.cpp:502 sg_ProjectCommandPopup.cpp:257
 msgid "Remove Project"
 msgstr "Odebrat projekt"
 
-#: clientgui/sg_ProjectPanel.cpp:72
-msgid "Add Project"
-msgstr "Přidat projekt"
-
-#: clientgui/sg_ProjectPanel.cpp:73
-msgid "Synchronize"
-msgstr "Synchronizovat"
+#: ViewProjects.cpp:543 ViewWork.cpp:599
+msgid "Launching browser..."
+msgstr "Spouštím internetový prohlížeč..."
 
-#: clientgui/sg_ProjectPanel.cpp:74
-msgid "Work done for this project"
-msgstr "Práce hotova pro tento projekt"
+#: ViewProjects.cpp:718 sg_ProjectCommandPopup.cpp:111
+msgid "Resume tasks for this project."
+msgstr "Obnovit práci pro tento projekt."
 
-#: clientgui/sg_ProjectPanel.cpp:77
-msgid "Synchronize projects with account manager system"
-msgstr "Synchronizovat projekty se systémem Správce účtu"
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:118
+msgid "Allow new tasks"
+msgstr "Povolit další práci"
 
-#: clientgui/sg_ProjectPanel.cpp:124
-msgid "Select a project to access with the controls below"
-msgstr "Zvolte projekt, který chcete ovládat prvky dole"
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:119
+msgid "Allow fetching new tasks for this project."
+msgstr "Povolit tomuto projektu přijímat další práci."
 
-#: clientgui/sg_ProjectPanel.cpp:145
-msgid "Project Web Pages"
-msgstr "Webové stránky projektu"
+#: ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:122
+msgid "Don't fetch new tasks for this project."
+msgstr "Zakázat tomuto projektu přijímat další práci."
 
-#: clientgui/sg_ProjectPanel.cpp:149
-msgid "Project Commands"
-msgstr "Příkazy projektu"
+#: ViewProjects.cpp:1058
+msgid "Requested by user"
+msgstr "Vyžádáno uživatelem"
 
-#: clientgui/sg_ProjectPanel.cpp:276
-#, c-format
-msgid "Pop up a menu of web sites for project %s"
-msgstr "Otevřít menu s webovými stránkami projektu %s"
+#: ViewProjects.cpp:1059
+msgid "To fetch work"
+msgstr "Získat novou práci"
 
-#: clientgui/sg_ProjectPanel.cpp:278
-#, c-format
-msgid "Pop up a menu of commands to apply to project %s"
-msgstr "Otevřít menu s příkazy pro projekt %s"
+#: ViewProjects.cpp:1060
+msgid "To report completed tasks"
+msgstr "Nahlásit dokončené úkoly"
 
-#: clientgui/sg_TaskCommandPopup.cpp:66
-msgid "Show graphics"
-msgstr "Zobrazit grafiku"
+#: ViewProjects.cpp:1061
+msgid "To send trickle-up message"
+msgstr "Odeslat zprávu o průběhu"
 
-#: clientgui/sg_TaskCommandPopup.cpp:67
-msgid "Show application graphics in a window."
-msgstr "Zobrazit grafické okno aplikace."
+#: ViewProjects.cpp:1062
+msgid "Requested by account manager"
+msgstr "Vyžádáno správcem účtu"
 
-#: clientgui/sg_TaskCommandPopup.cpp:73
-msgid "Suspend this task."
-msgstr "Pozastavit tento úkol."
+#: ViewProjects.cpp:1063
+msgid "Project initialization"
+msgstr "Prvotní nastavení projektu"
 
-#: clientgui/sg_TaskCommandPopup.cpp:78
-msgid "Abort"
-msgstr "Zrušit"
+#: ViewProjects.cpp:1064
+msgid "Requested by project"
+msgstr "Vyžádáno projektem"
 
-#: clientgui/sg_TaskCommandPopup.cpp:79
-msgid "Abandon this task. You will get no credit for it."
-msgstr "Zrušit tento úkol. Neobdržíte za něj žádný kredit."
+#: ViewProjects.cpp:1065
+msgid "Unknown reason"
+msgstr "Neznámý důvod"
 
-#: clientgui/sg_TaskCommandPopup.cpp:85
-msgid "Show task details."
-msgstr "Zobrazit detaily úkolu."
+#: ViewProjects.cpp:1079
+msgid "Suspended by user"
+msgstr "Pozastaveno uživatelem"
 
-#: clientgui/sg_TaskCommandPopup.cpp:119
-msgid "Resume work for this task."
-msgstr "Obnovit práci na tomto úkolu."
+#: ViewProjects.cpp:1082
+msgid "Won't get new tasks"
+msgstr "Neobdrží další práci"
 
-#: clientgui/sg_TaskCommandPopup.cpp:123
-msgid "Suspend work for this task."
-msgstr "Pozastavit práci na tomto úkolu."
+#: ViewProjects.cpp:1085
+msgid "Project ended - OK to remove"
+msgstr "Projekt ukončen - nyní je možné projekt opustit"
 
-#: clientgui/sg_TaskCommandPopup.cpp:267
-#, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %.1lf%%, Status: %s)"
-msgstr ""
-"Opravdu chcete zrušit tento úkol '%s'?\n"
-"(Průběh: %.1lf%%, Stav: %s)"
+#: ViewProjects.cpp:1088
+msgid "Will remove when tasks done"
+msgstr "Bude odebrán po dokončení úkolů"
 
-#: clientgui/sg_TaskCommandPopup.cpp:272
-msgid "Abort task"
-msgstr "Zrušit úkol"
+#: ViewProjects.cpp:1091
+msgid "Scheduler request pending"
+msgstr "Nevyřízený požadavek plánovače"
 
-#: clientgui/sg_TaskPanel.cpp:468
-msgid "You don't have any projects.  Please Add a Project."
-msgstr "Nemáte žádný projekt. Přidejte si prosím nějaký projekt."
+#: ViewProjects.cpp:1097
+msgid "Scheduler request in progress"
+msgstr "Zpracovávám požadavek plánovače"
 
-#: clientgui/sg_TaskPanel.cpp:469
-msgid "Not available"
-msgstr "Nedostupné"
+#: ViewProjects.cpp:1100
+msgid "Trickle up message pending"
+msgstr "Nevyřízené odeslání zprávy o průběhu"
 
-#: clientgui/sg_TaskPanel.cpp:480
-msgid "Tasks:"
-msgstr "Úkoly:"
+#: ViewProjects.cpp:1106
+msgid "Communication deferred "
+msgstr "Přenos odložen "
 
-#: clientgui/sg_TaskPanel.cpp:486
-msgid "Select a task to access"
-msgstr "Zvolit úkol"
+#: ViewResources.cpp:62
+msgid "Total disk usage"
+msgstr "Obsazené místo na disku"
 
-#: clientgui/sg_TaskPanel.cpp:497
-msgid "From:"
-msgstr "Od:"
+#: ViewResources.cpp:83
+msgid "Disk usage by BOINC projects"
+msgstr "Využití disku projekty BOINC"
 
-#: clientgui/sg_TaskPanel.cpp:551
-msgid "This task's progress"
-msgstr "Průběh tohoto úkolu"
+#: ViewResources.cpp:116
+msgid "Disk"
+msgstr "Disk"
 
-#: clientgui/sg_TaskPanel.cpp:569
-msgid "Task Commands"
-msgstr "Příkazy úkolu"
+#: ViewResources.cpp:249
+msgid "no projects: 0 bytes used"
+msgstr "žádné projekty: 0 bajtů použito"
 
-#: clientgui/sg_TaskPanel.cpp:570
-msgid "Pop up a menu of commands to apply to this task"
-msgstr "Otevřít menu s příkazy pro tento úkol"
+#: ViewResources.cpp:286
+msgid "used by BOINC: "
+msgstr "prostor využitý BOINC: "
 
-#: clientgui/sg_TaskPanel.cpp:705
-#, c-format
-msgid "Application: %s"
-msgstr "Aplikace: %s"
+#: ViewResources.cpp:296
+msgid "free, available to BOINC: "
+msgstr "volné, dostupné pro BOINC: "
 
-#: clientgui/sg_TaskPanel.cpp:728
-#, c-format
-msgid "%.3f%%"
-msgstr "%.3f%%"
+#: ViewResources.cpp:306
+msgid "free, not available to BOINC: "
+msgstr "volné, nedostupné pro BOINC: "
 
-#: clientgui/sg_TaskPanel.cpp:736
-msgid "Application: Not available"
-msgstr "Aplikace: Nedostupná"
+#: ViewResources.cpp:316
+msgid "free: "
+msgstr "volné místo: "
 
-#: clientgui/sg_TaskPanel.cpp:836
-msgid "Not Available"
-msgstr "Nedostupný"
+#: ViewResources.cpp:326
+msgid "used by other programs: "
+msgstr "využité ostatními programy: "
 
-#: 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 "Zbývá (odhad): %s"
-
-#: clientgui/sg_TaskPanel.cpp:880
-#, c-format
-msgid "Status: %s"
-msgstr "Stav: %s"
-
-#: clientgui/sg_TaskPanel.cpp:1227
-msgid "Retrieving current status."
-msgstr "Zjišťuji aktuální stav."
-
-#: clientgui/sg_TaskPanel.cpp:1233
-msgid "Downloading work from the server."
-msgstr "Stahuji práci ze serveru."
-
-#: clientgui/sg_TaskPanel.cpp:1238
-msgid "Processing Suspended:  Running On Batteries."
-msgstr "Výpočty pozastaveny:  Provoz na baterie."
-
-#: clientgui/sg_TaskPanel.cpp:1240
-msgid "Processing Suspended:  User Active."
-msgstr "Výpočty pozastaveny:  Uživatel je aktivní."
-
-#: clientgui/sg_TaskPanel.cpp:1242
-msgid "Processing Suspended:  User paused processing."
-msgstr "Výpočty pozastaveny:  Pozastaveno uživatelem."
-
-#: clientgui/sg_TaskPanel.cpp:1244
-msgid "Processing Suspended:  Time of Day."
-msgstr "Výpočty pozastaveny:  Denní doba."
-
-#: clientgui/sg_TaskPanel.cpp:1246
-msgid "Processing Suspended:  Benchmarks Running."
-msgstr "Výpočty pozastaveny:  Probíhají testy procesoru."
-
-#: clientgui/sg_TaskPanel.cpp:1248
-msgid "Processing Suspended."
-msgstr "Výpočty pozastaveny."
-
-#: clientgui/sg_TaskPanel.cpp:1252
-msgid "Waiting to contact project servers."
-msgstr "Čekám na kontakt se servery projektu."
-
-#: clientgui/sg_TaskPanel.cpp:1256
-#: clientgui/sg_TaskPanel.cpp:1265
-msgid "Retrieving current status"
-msgstr "Zjišťuji aktuální stav"
-
-#: clientgui/sg_TaskPanel.cpp:1260
-msgid "No work available to process"
-msgstr "Není k dispozici žádná práce"
-
-#: clientgui/sg_TaskPanel.cpp:1262
-msgid "Unable to connect to the core client"
-msgstr "Selhalo spojení s klientem"
-
-#: clientgui/TermsOfUsePage.cpp:218
-msgid "Terms of Use"
-msgstr "Podmínky použití"
-
-#: clientgui/TermsOfUsePage.cpp:222
-msgid "Please read the following terms of use:"
-msgstr "Přečtěte si prosím následující podmínky použití:"
-
-#: clientgui/TermsOfUsePage.cpp:231
-msgid "I agree to the terms of use."
-msgstr "Souhlasím s podmínkami použití."
-
-#: clientgui/TermsOfUsePage.cpp:237
-#, fuzzy
-msgid "I do not agree to the terms of use."
-msgstr "Nesouhlasím s podmínkami použití."
-
-#: clientgui/UnavailablePage.cpp:183
-msgid "Project temporarily unavailable"
-msgstr "Projekt je dočasně nedostupný"
-
-#: clientgui/UnavailablePage.cpp:186
-msgid ""
-"The project is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-"Projekt je dočasně nedostupný.\n"
-"\n"
-"Zkuste to prosím později. "
-
-#: clientgui/UnavailablePage.cpp:190
-msgid "Account manager temporarily unavailable"
-msgstr "Správce účtu je dočasně nedostupný"
-
-#: clientgui/UnavailablePage.cpp:193
-msgid ""
-"The account manager is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-"Správce účtu je dočasně nedostupný.\n"
-"\n"
-"Zkuste to prosím později. "
-
-#: clientgui/ValidateAccountKey.cpp:68
-msgid "Please specify an account key to continue."
-msgstr "Zadej prosím klíč k účtu pro pokračování."
-
-#: clientgui/ValidateAccountKey.cpp:71
-msgid "Invalid Account Key; please enter a valid Account Key"
-msgstr "Neplatný klíč k účtu - vložte prosím platný klíč"
-
-#: clientgui/ValidateAccountKey.cpp:82
-#: clientgui/ValidateEmailAddress.cpp:86
-msgid "Validation conflict"
-msgstr "Chyba při validaci"
-
-#: clientgui/ValidateEmailAddress.cpp:72
-msgid "Please specify an email address"
-msgstr "Zadejte prosím emailovou adresu"
-
-#: clientgui/ValidateEmailAddress.cpp:75
-msgid "Invalid email address; please enter a valid email address"
-msgstr "Neplatná emailová adresa - vložte prosím platnou adresu"
-
-#: clientgui/ValidateURL.cpp:69
-msgid "Missing URL"
-msgstr "Chybí URL adresa"
-
-#: clientgui/ValidateURL.cpp:70
-msgid ""
-"Please specify a URL.\n"
-"For example:\n"
-"http://www.example.com/"
-msgstr ""
-"Zadejte prosím URL adresu.\n"
-"Například:\n"
-"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 "Neplatná URL adresa"
-
-#: 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 ""
-"Zadejte prosím platnou URL adresu.\n"
-"Například:\n"
-"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' neobsahuje platné jméno počítače."
-
-#: clientgui/ValidateURL.cpp:111
-#, c-format
-msgid "'%s' does not contain a valid path."
-msgstr "'%s' neobsahuje platnou cestu."
-
-#: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:175
-msgid "Commands"
-msgstr "Příkazy"
-
-#: clientgui/ViewMessages.cpp:88
-msgid "Copy all messages"
-msgstr "Zkopírovat všechny zprávy"
-
-#: clientgui/ViewMessages.cpp:95
-msgid "Copy selected messages"
-msgstr "Zkopírovat označené zprávy"
-
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
-msgid "Show only this project"
-msgstr "Zobrazit jen tento projekt"
-
-#: clientgui/ViewMessages.cpp:107
-#: clientgui/ViewMessages.cpp:503
-msgid "Show only the messages for the selected project."
-msgstr "Zobrazit pouze zprávy vybraného projektu."
-
-#: clientgui/ViewMessages.cpp:164
-msgid "Messages"
-msgstr "Zprávy"
-
-#: clientgui/ViewMessages.cpp:187
-msgid "Copying all messages to the clipboard..."
-msgstr "Kopíruji všechny zprávy do schránky..."
-
-#: clientgui/ViewMessages.cpp:223
-msgid "Copying selected messages to the clipboard..."
-msgstr "Kopíruji označené zprávy do schránky..."
-
-#: clientgui/ViewMessages.cpp:286
-msgid "Filtering messages..."
-msgstr "Filtruji zprávy..."
-
-#: clientgui/ViewMessages.cpp:494
-msgid "Show all messages"
-msgstr "Zobrazit všechny zprávy"
-
-#: clientgui/ViewMessages.cpp:495
-msgid "Show messages for all projects."
-msgstr "Zobrazit zprávy všech projektů."
-
-#: clientgui/ViewProjects.cpp:225
-msgid "Account"
-msgstr "Účet"
-
-#: clientgui/ViewProjects.cpp:227
-msgid "Work done"
-msgstr "Kredit"
-
-#: clientgui/ViewProjects.cpp:228
-msgid "Avg. work done"
-msgstr "Průměrný kredit"
-
-#: clientgui/ViewProjects.cpp:230
-msgid "Status"
-msgstr "Stav"
-
-#: clientgui/ViewProjects.cpp:255
-msgid "Projects"
-msgstr "Projekty"
-
-#: clientgui/ViewProjects.cpp:307
-msgid "Updating project..."
-msgstr "Aktualizuji projekt..."
-
-#: clientgui/ViewProjects.cpp:349
-msgid "Resuming project..."
-msgstr "Obnovuji projekt..."
-
-#: clientgui/ViewProjects.cpp:353
-msgid "Suspending project..."
-msgstr "Pozastavuji projekt..."
-
-#: clientgui/ViewProjects.cpp:390
-msgid "Telling project to allow additional task downloads..."
-msgstr "Povoluji projektu přijímat další práci..."
-
-#: clientgui/ViewProjects.cpp:394
-msgid "Telling project to not fetch any additional tasks..."
-msgstr "Zakazuji projektu přijímat další práci..."
-
-#: clientgui/ViewProjects.cpp:430
-msgid "Resetting project..."
-msgstr "Restartuji projekt..."
-
-#: clientgui/ViewProjects.cpp:488
-msgid "Removing project..."
-msgstr "Odebírám projekt..."
-
-#: clientgui/ViewProjects.cpp:548
-msgid "Launching browser..."
-msgstr "Spouštím internetový prohlížeč..."
-
-#: clientgui/ViewProjects.cpp:1063
-msgid "Requested by user"
-msgstr "Vyžádáno uživatelem"
-
-#: clientgui/ViewProjects.cpp:1064
-msgid "To fetch work"
-msgstr "Získat novou práci"
-
-#: clientgui/ViewProjects.cpp:1065
-msgid "To report completed tasks"
-msgstr "Nahlásit dokončené úkoly"
-
-#: clientgui/ViewProjects.cpp:1066
-msgid "To send trickle-up message"
-msgstr "Odeslat zprávu o průběhu"
-
-#: clientgui/ViewProjects.cpp:1067
-msgid "Requested by account manager"
-msgstr "Vyžádáno správcem účtu"
-
-#: clientgui/ViewProjects.cpp:1068
-msgid "Project initialization"
-msgstr "Prvotní nastavení projektu"
-
-#: clientgui/ViewProjects.cpp:1069
-msgid "Requested by project"
-msgstr "Vyžádáno projektem"
-
-#: clientgui/ViewProjects.cpp:1070
-msgid "Unknown reason"
-msgstr "Neznámý důvod"
-
-#: clientgui/ViewProjects.cpp:1084
-msgid "Suspended by user"
-msgstr "Pozastaveno uživatelem"
-
-#: clientgui/ViewProjects.cpp:1087
-msgid "Won't get new tasks"
-msgstr "Neobdrží další práci"
-
-#: clientgui/ViewProjects.cpp:1090
-msgid "Project ended - OK to remove"
-msgstr "Projekt ukončen - nyní je možné projekt opustit"
-
-#: clientgui/ViewProjects.cpp:1093
-msgid "Will remove when tasks done"
-msgstr "Bude odebrán po dokončení úkolů"
-
-#: clientgui/ViewProjects.cpp:1096
-msgid "Scheduler request pending"
-msgstr "Nevyřízený požadavek plánovače"
-
-#: clientgui/ViewProjects.cpp:1102
-msgid "Scheduler request in progress"
-msgstr "Zpracovávám požadavek plánovače"
-
-#: clientgui/ViewProjects.cpp:1105
-msgid "Trickle up message pending"
-msgstr "Nevyřízené odeslání zprávy o průběhu"
-
-#: clientgui/ViewProjects.cpp:1111
-msgid "Communication deferred "
-msgstr "Přenos odložen "
-
-#: clientgui/ViewResources.cpp:62
-msgid "Total disk usage"
-msgstr "Obsazené místo na disku"
-
-#: clientgui/ViewResources.cpp:83
-msgid "Disk usage by BOINC projects"
-msgstr "Využití disku projekty BOINC"
-
-#: clientgui/ViewResources.cpp:116
-msgid "Disk"
-msgstr "Disk"
-
-#: clientgui/ViewResources.cpp:225
-msgid "no projects: 0 bytes used"
-msgstr "žádné projekty: 0 bajtů použito"
-
-#: clientgui/ViewResources.cpp:262
-msgid "used by BOINC: "
-msgstr "prostor využitý BOINC: "
-
-#: clientgui/ViewResources.cpp:272
-msgid "free, available to BOINC: "
-msgstr "volné, dostupné pro BOINC: "
-
-#: clientgui/ViewResources.cpp:282
-msgid "free, not available to BOINC: "
-msgstr "volné, nedostupné pro BOINC: "
-
-#: clientgui/ViewResources.cpp:292
-msgid "free: "
-msgstr "volné místo: "
-
-#: clientgui/ViewResources.cpp:302
-msgid "used by other programs: "
-msgstr "využité ostatními programy: "
-
-#: clientgui/ViewStatistics.cpp:1181
+#: ViewStatistics.cpp:1205
 msgid "User Total"
 msgstr "Celkový kredit uživatele"
 
-#: clientgui/ViewStatistics.cpp:1182
+#: ViewStatistics.cpp:1206
 msgid "User Average"
 msgstr "Průměrný kredit uživatele"
 
-#: clientgui/ViewStatistics.cpp:1183
+#: ViewStatistics.cpp:1207
 msgid "Host Total"
 msgstr "Celkový kredit počítače"
 
-#: clientgui/ViewStatistics.cpp:1184
+#: ViewStatistics.cpp:1208
 msgid "Host Average"
 msgstr "Průměrný kredit počítače"
 
-#: clientgui/ViewStatistics.cpp:1331
+#: ViewStatistics.cpp:1355
 #, c-format
 msgid "Last update: %.0f days ago"
 msgstr "Poslední akualizace - před %.0f dny"
 
-#: clientgui/ViewStatistics.cpp:1956
+#: ViewStatistics.cpp:1982
 msgid "Show user total"
 msgstr "Celkový kredit uživatele"
 
-#: clientgui/ViewStatistics.cpp:1957
+#: ViewStatistics.cpp:1983
 msgid "Show total credit for user"
 msgstr "Zobrazit celkový kredit uživatele"
 
-#: clientgui/ViewStatistics.cpp:1963
+#: ViewStatistics.cpp:1989
 msgid "Show user average"
 msgstr "Průměrný kredit uživatele"
 
-#: clientgui/ViewStatistics.cpp:1964
+#: ViewStatistics.cpp:1990
 msgid "Show average credit for user"
 msgstr "Zobrazit průměrný kredit uživatele"
 
-#: clientgui/ViewStatistics.cpp:1970
+#: ViewStatistics.cpp:1996
 msgid "Show host total"
 msgstr "Celkový kredit počítače"
 
-#: clientgui/ViewStatistics.cpp:1971
+#: ViewStatistics.cpp:1997
 msgid "Show total credit for host"
 msgstr "Zobrazit celkový kredit počítače"
 
-#: clientgui/ViewStatistics.cpp:1977
+#: ViewStatistics.cpp:2003
 msgid "Show host average"
 msgstr "Průměrný kredit počítače"
 
-#: clientgui/ViewStatistics.cpp:1978
+#: ViewStatistics.cpp:2004
 msgid "Show average credit for host"
 msgstr "Zobrazit průměrný kredit počítače"
 
-#: clientgui/ViewStatistics.cpp:1987
+#: ViewStatistics.cpp:2013
 msgid "< &Previous project"
 msgstr "< &Předchozí projekt"
 
-#: clientgui/ViewStatistics.cpp:1988
+#: ViewStatistics.cpp:2014
 msgid "Show chart for previous project"
 msgstr "Zobrazit graf předchozího projektu"
 
-#: clientgui/ViewStatistics.cpp:1993
+#: ViewStatistics.cpp:2019
 msgid "&Next project >"
 msgstr "Další projekt >"
 
-#: clientgui/ViewStatistics.cpp:1994
+#: ViewStatistics.cpp:2020
 msgid "Show chart for next project"
 msgstr "Zobrazit graf následujícího projektu"
 
-#: clientgui/ViewStatistics.cpp:2000
-#: clientgui/ViewStatistics.cpp:2390
+#: ViewStatistics.cpp:2026 ViewStatistics.cpp:2416
 msgid "Hide project list"
 msgstr "Schovat seznam projektů"
 
-#: clientgui/ViewStatistics.cpp:2001
-#: clientgui/ViewStatistics.cpp:2390
+#: ViewStatistics.cpp:2027 ViewStatistics.cpp:2416
 msgid "Use entire area for graphs"
 msgstr "Použít celou oblast pro grafy"
 
-#: clientgui/ViewStatistics.cpp:2006
+#: ViewStatistics.cpp:2032
 msgid "Mode view"
 msgstr "Zobrazení"
 
-#: clientgui/ViewStatistics.cpp:2010
+#: ViewStatistics.cpp:2036
 msgid "One project"
 msgstr "Jeden projekt"
 
-#: clientgui/ViewStatistics.cpp:2011
+#: ViewStatistics.cpp:2037
 msgid "Show one chart with selected project"
 msgstr "Zobrazit jeden graf se zvoleným projektem"
 
-#: clientgui/ViewStatistics.cpp:2017
+#: ViewStatistics.cpp:2043
 msgid "All projects (separate)"
 msgstr "Všechny projekty (zvlášť)"
 
-#: clientgui/ViewStatistics.cpp:2018
+#: ViewStatistics.cpp:2044
 msgid "Show all projects, one chart per project"
 msgstr "Zobrazit všechny projekty, každý ve svém grafu"
 
-#: clientgui/ViewStatistics.cpp:2024
+#: ViewStatistics.cpp:2050
 msgid "All projects (together)"
 msgstr "Všechny projekty (dohromady)"
 
-#: clientgui/ViewStatistics.cpp:2025
+#: ViewStatistics.cpp:2051
 msgid "Show one chart with all projects"
 msgstr "Zobrazit jeden graf se všemi projekty"
 
-#: clientgui/ViewStatistics.cpp:2031
+#: ViewStatistics.cpp:2057
 msgid "All projects (sum)"
 msgstr "Všechny projekty (součet)"
 
-#: clientgui/ViewStatistics.cpp:2032
+#: ViewStatistics.cpp:2058
 msgid "Show one chart with sum of projects"
 msgstr "Zobrazit jeden graf se součtem všech projektů"
 
-#: clientgui/ViewStatistics.cpp:2053
+#: ViewStatistics.cpp:2079
 msgid "Statistics"
 msgstr "Statistiky"
 
-#: 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
+#: 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
 msgid "Updating charts..."
 msgstr "Aktualizuji grafy..."
 
-#: clientgui/ViewStatistics.cpp:2394
+#: ViewStatistics.cpp:2420
 msgid "Show project list"
 msgstr "Zobrazit seznam projektů"
 
-#: clientgui/ViewStatistics.cpp:2394
+#: ViewStatistics.cpp:2420
 msgid "Uses smaller area for graphs"
 msgstr "Používá menší oblast pro grafy"
 
-#: clientgui/ViewTransfers.cpp:169
+#: ViewTransfers.cpp:164
 msgid "Retry Now"
 msgstr "Obnovit přenos"
 
-#: clientgui/ViewTransfers.cpp:170
+#: ViewTransfers.cpp:165
 msgid "Retry the file transfer now"
 msgstr "Obnovit přenost souborů"
 
-#: clientgui/ViewTransfers.cpp:176
+#: ViewTransfers.cpp:171
 msgid "Abort Transfer"
 msgstr "Zrušit přenos"
 
-#: clientgui/ViewTransfers.cpp:177
+#: ViewTransfers.cpp:172
 msgid "Abort this file transfer.  You won't get credit for the task."
 msgstr "Zrušit přenos souborů. Neobdržíte žádný kredit za tento úkol."
 
-#: clientgui/ViewTransfers.cpp:188
+#: ViewTransfers.cpp:183
 msgid "File"
 msgstr "Soubor"
 
-#: clientgui/ViewTransfers.cpp:189
-#: clientgui/ViewWork.cpp:238
+#: ViewTransfers.cpp:184 ViewWork.cpp:233
 msgid "Progress"
 msgstr "Průběh"
 
-#: clientgui/ViewTransfers.cpp:190
+#: ViewTransfers.cpp:185
 msgid "Size"
 msgstr "Velikost"
 
-#: clientgui/ViewTransfers.cpp:191
+#: ViewTransfers.cpp:186
 msgid "Elapsed Time"
 msgstr "Čas"
 
-#: clientgui/ViewTransfers.cpp:192
+#: ViewTransfers.cpp:187
 msgid "Speed"
 msgstr "Rychlost"
 
-#: clientgui/ViewTransfers.cpp:218
+#: ViewTransfers.cpp:213
 msgid "Transfers"
 msgstr "Přenos"
 
-#: clientgui/ViewTransfers.cpp:285
+#: ViewTransfers.cpp:280
 msgid "Network activity is suspended - "
 msgstr "Přístup k síti je pozastaven - "
 
-#: clientgui/ViewTransfers.cpp:287
+#: ViewTransfers.cpp:282
 msgid ""
 ".\n"
 "You can enable it using the Activity menu."
-msgstr ""
-".\n"
-"Můžete ho obnovit v menu Aktivity."
+msgstr ".\nMůžete ho obnovit v menu Aktivity."
 
-#: clientgui/ViewTransfers.cpp:290
+#: ViewTransfers.cpp:285
 msgid "BOINC"
 msgstr "BOINC"
 
-#: clientgui/ViewTransfers.cpp:297
+#: ViewTransfers.cpp:292
 msgid "Retrying transfer now..."
 msgstr "Pokouším se obnovit přenos..."
 
-#: clientgui/ViewTransfers.cpp:335
+#: ViewTransfers.cpp:330
 msgid "Aborting transfer..."
 msgstr "Ruším přenos..."
 
-#: clientgui/ViewTransfers.cpp:348
+#: ViewTransfers.cpp:343
 #, 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 ""
-"Skutečně chcete zrušit přenos tohoto souboru '%s'?\n"
-"Pozn: Zrušením přenosu souboru zrušíte daný úkol\n"
-"a neobdržíte za něj kredit."
+msgstr "Skutečně chcete zrušit přenos tohoto souboru '%s'?\nPozn: Zrušením přenosu souboru zrušíte daný úkol\na neobdržíte za něj kredit."
 
-#: clientgui/ViewTransfers.cpp:354
+#: ViewTransfers.cpp:349
 msgid "Abort File Transfer"
 msgstr "Zrušit přenos souboru"
 
-#: clientgui/ViewTransfers.cpp:785
+#: ViewTransfers.cpp:780
 msgid "Upload"
 msgstr "Odesílání"
 
-#: clientgui/ViewTransfers.cpp:785
+#: ViewTransfers.cpp:780
 msgid "Download"
 msgstr "Stáhování"
 
-#: clientgui/ViewTransfers.cpp:789
+#: ViewTransfers.cpp:784
 msgid "retry in "
 msgstr "zkusit znova za "
 
-#: clientgui/ViewTransfers.cpp:791
+#: ViewTransfers.cpp:786
 msgid "failed"
 msgstr "selhalo"
 
-#: clientgui/ViewTransfers.cpp:794
+#: ViewTransfers.cpp:789
 msgid "suspended"
 msgstr "pozastaveno"
 
-#: clientgui/ViewTransfers.cpp:799
+#: ViewTransfers.cpp:794
 msgid "active"
 msgstr "probíhá"
 
-#: clientgui/ViewTransfers.cpp:801
+#: ViewTransfers.cpp:796
 msgid "pending"
 msgstr "vyčkává"
 
-#: clientgui/ViewTransfers.cpp:808
+#: ViewTransfers.cpp:803
 msgid " (project backoff: "
 msgstr " (odložení projektu: "
 
-#: clientgui/ViewWork.cpp:192
-#: clientgui/ViewWork.cpp:782
+#: ViewWork.cpp:187 ViewWork.cpp:777
 msgid "Show active tasks"
 msgstr "Zobrazit aktivní úkoly "
 
-#: clientgui/ViewWork.cpp:193
-#: clientgui/ViewWork.cpp:783
+#: ViewWork.cpp:188 ViewWork.cpp:778
 msgid "Show only active tasks."
 msgstr "Zobrazit pouze aktivní úkoly."
 
-#: clientgui/ViewWork.cpp:206
-msgid "Show VM Console"
-msgstr "Zobrazit VM konzoli"
+#: ViewWork.cpp:194 sg_TaskCommandPopup.cpp:60
+msgid "Show graphics"
+msgstr "Zobrazit grafiku"
+
+#: ViewWork.cpp:195 sg_TaskCommandPopup.cpp:61
+msgid "Show application graphics in a window."
+msgstr "Zobrazit grafické okno aplikace."
+
+#: ViewWork.cpp:201
+msgid "Show VM Console"
+msgstr "Zobrazit VM konzoli"
+
+#: ViewWork.cpp:202
+msgid "Show VM Console in a window."
+msgstr "Zobrazit VM konzoli v okně."
+
+#: ViewWork.cpp:209
+msgid "Suspend work for this result."
+msgstr "Pozastavit práci na tomto úkolu."
+
+#: ViewWork.cpp:215 sg_TaskCommandPopup.cpp:72
+msgid "Abort"
+msgstr "Zrušit"
+
+#: ViewWork.cpp:216
+msgid "Abandon work on the result. You will get no credit for it."
+msgstr "Ukončit práci na tomto úkolu. Za úkol nebude přidělen žádný kredit."
+
+#: ViewWork.cpp:223 sg_TaskCommandPopup.cpp:79
+msgid "Show task details."
+msgstr "Zobrazit detaily úkolu."
+
+#: ViewWork.cpp:235
+msgid "Elapsed"
+msgstr "Čas"
+
+#: ViewWork.cpp:236
+msgid "Remaining (estimated)"
+msgstr "Zbývá (odhad)"
+
+#: ViewWork.cpp:237
+msgid "Deadline"
+msgstr "Odevzdat do"
+
+#: ViewWork.cpp:264
+msgid "Tasks"
+msgstr "Úkoly"
+
+#: ViewWork.cpp:357
+msgid "Resuming task..."
+msgstr "Obnovuji úkol..."
+
+#: ViewWork.cpp:360
+msgid "Suspending task..."
+msgstr "Pozastavuji úkol..."
+
+#: ViewWork.cpp:389
+msgid "Showing graphics for task..."
+msgstr "Zobrazuji grafické okno pro úkol..."
+
+#: ViewWork.cpp:426
+msgid "Showing VM console for task..."
+msgstr "Zobrazuji VM konzoli pro úkol..."
+
+#: ViewWork.cpp:479
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %s, Status: %s)"
+msgstr "Opravdu chcete zrušit tento úkol '%s'?\n(Průběh: %s, Stav: %s)"
+
+#: ViewWork.cpp:485
+#, c-format
+msgid "Are you sure you want to abort these %d tasks?"
+msgstr "Opravdu chcete zrušit těchto %d úkolů?"
+
+#: ViewWork.cpp:490 sg_TaskCommandPopup.cpp:256
+msgid "Abort task"
+msgstr "Zrušit úkol"
+
+#: ViewWork.cpp:499
+msgid "Aborting task..."
+msgstr "Ruším úkol..."
+
+#: ViewWork.cpp:771
+msgid "Show all tasks"
+msgstr "Zobrazit všechny úkoly "
+
+#: ViewWork.cpp:772
+msgid "Show all tasks."
+msgstr "Zobrazit všechny úkoly."
+
+#: ViewWork.cpp:796 sg_TaskCommandPopup.cpp:103
+msgid "Resume work for this task."
+msgstr "Obnovit práci na tomto úkolu."
+
+#: ViewWork.cpp:802 sg_TaskCommandPopup.cpp:107
+msgid "Suspend work for this task."
+msgstr "Pozastavit práci na tomto úkolu."
+
+#: WelcomePage.cpp:284
+msgid "Add project or account manager"
+msgstr "Přidat projekt nebo nastavit Správce účtu"
+
+#: WelcomePage.cpp:288
+msgid "Add project or use BOINC Account Manager"
+msgstr "Přidat projekt nebo použít BOINC správce účtů"
+
+#: 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 "Pokud je to možné, přidejte projekty\nna webové stránce %s.\n\nProjekty přidané tímto průvodcem nebudou\nna seznamu %s a nepůjdou zde spravovat."
+
+#: 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 "Je dostupno více než 30 BOINC projektů\nprovádějících výzkum v mnoha vědeckých oblastech.\nMůžete se připojit k libovolného množství projektů.\nProjekt lze přidat buď přímo, nebo s využitím\nněkterého Správce účtu, u kterého si na webu vyberete projekty."
+
+#: 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 "Chcete přidat nový projekt pro dobrovolné výpočty, nebo upravit projekty,\nna kterých se již podílíte.\n\nNěkteré z těchto projektů jsou spravované organizací World Community Grid,\nzatímco další jsou provozované jinými výzkumníky a organizacemi.\nAplikace BOINC vám umožní přerozdělit výpočetní sílu mezi vámi zvolenou\nlibovolnou kombinaci projektů.\n\nNebo pokud jste registrovaní u BOINC správce účtu, je možný spravovat\nváš výběr projektů přes něj.\n\nVyberte si prosím typ změn [...]
+
+#: WelcomePage.cpp:339
+msgid "Use a BOINC Account Manager"
+msgstr "Použít BOINC správce účtu"
+
+#: WelcomePage.cpp:352
+msgid "To continue, click Next."
+msgstr "Pokračujte kliknutím na tlačítko Další."
+
+#: WelcomePage.cpp:358
+msgid "Add or change your World Community Grid projects"
+msgstr "Přidat nebo změnit projekty pro World Community Grid"
+
+#: WelcomePage.cpp:361
+msgid "Add projects run by other researchers or organizations"
+msgstr "Přidat projekty spravované jinými výzkumníky nebo organizacemi"
+
+#: WizardAttach.cpp:634
+msgid "Do you really want to cancel?"
+msgstr "Opravdu chcete operaci zrušit?"
+
+#: WizardAttach.cpp:635
+msgid "Question"
+msgstr "Dotaz"
+
+#: sg_BoincSimpleFrame.cpp:149
+msgid "Advanced View...\tCtrl+Shift+A"
+msgstr "Pokročilé zobrazení...\tCtrl+Shift+A"
+
+#: sg_BoincSimpleFrame.cpp:150
+msgid "Display the advanced graphical interface."
+msgstr "Zobrazit rozšířené grafické rozhraní."
+
+#: sg_BoincSimpleFrame.cpp:157
+msgid "Skin"
+msgstr "Vzhled"
+
+#: sg_BoincSimpleFrame.cpp:159
+msgid "Select the appearance of the user interface."
+msgstr "Vyberte si vzhled aplikace."
+
+#: sg_BoincSimpleFrame.cpp:206
+#, c-format
+msgid "&%s"
+msgstr "&%s"
+
+#: sg_BoincSimpleFrame.cpp:390
+msgid "Default"
+msgstr "Výchozí"
+
+#: sg_BoincSimpleFrame.cpp:759
+msgid "Suspend Computing"
+msgstr "Pozastavit výpočty"
+
+#: sg_BoincSimpleFrame.cpp:760
+msgid "Resume Computing"
+msgstr "Pokračovat ve výpočtech"
+
+#: sg_BoincSimpleFrame.cpp:777
+msgid "Open a window to view notices from projects or BOINC"
+msgstr "Otevřít okno s informačními zprávami projektů nebo BOINC"
+
+#: sg_DlgMessages.cpp:146
+msgid "Close"
+msgstr "Zavřít"
+
+#: sg_DlgMessages.cpp:389
+#, c-format
+msgid "%s - Notices"
+msgstr "%s - Zprávy"
+
+#: sg_DlgPreferences.cpp:268
+msgid "This dialog controls preferences for this computer only."
+msgstr "Toto okno nastavuje předvolby jen pro tento počítač."
+
+#: sg_DlgPreferences.cpp:273
+msgid "Click OK to set preferences."
+msgstr "Klikněte na OK pro uložení předvoleb."
+
+#: sg_DlgPreferences.cpp:278
+msgid ""
+"Click Clear to restore web-based settings for all preferences listed below."
+msgstr "Všechna nastavení vrátíte na výchozí hodnoty kliknutím na tlačítko Vymazat."
+
+#: sg_DlgPreferences.cpp:285
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
+msgstr "Podrobnější nastavení najdete ve Výpočetních předvolbách v Pokročilém zobrazení."
+
+#: sg_DlgPreferences.cpp:313
+msgid "Do work only between:"
+msgstr "Počítej pouze mezi: "
+
+#: sg_DlgPreferences.cpp:335
+msgid "Connect to internet only between:"
+msgstr "Připojuj se k Internetu pouze mezi: "
+
+#: sg_DlgPreferences.cpp:357 sg_DlgPreferences.cpp:374
+msgid "Use no more than:"
+msgstr "Použij nejvýše "
+
+#: sg_DlgPreferences.cpp:370
+msgid "of disk space"
+msgstr "místa na disku"
+
+#: sg_DlgPreferences.cpp:387
+msgid "of the processor"
+msgstr "výkonu procesoru"
+
+#: sg_DlgPreferences.cpp:391
+msgid "Do work while on battery?"
+msgstr "Počítat při běhu na baterie?"
+
+#: sg_DlgPreferences.cpp:404
+msgid "Do work after idle for:"
+msgstr "Počítat po nečinnosti: "
+
+#: sg_DlgPreferences.cpp:429
+msgid "Clear all local preferences listed above and close the dialog"
+msgstr "Smazat všechna místní nastavení výše a zavřít dialog."
+
+#: 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 "Kdykoliv"
+
+#: sg_DlgPreferences.cpp:638
+msgid "100 MB"
+msgstr "100 MB"
 
-#: clientgui/ViewWork.cpp:207
-msgid "Show VM Console in a window."
-msgstr "Zobrazit VM konzoli v okně."
+#: sg_DlgPreferences.cpp:639
+msgid "200 MB"
+msgstr "200 MB"
 
-#: clientgui/ViewWork.cpp:214
-msgid "Suspend work for this result."
-msgstr "Pozastavit práci na tomto úkolu."
+#: sg_DlgPreferences.cpp:640
+msgid "500 MB"
+msgstr "500 MB"
 
-#: clientgui/ViewWork.cpp:221
-msgid "Abandon work on the result. You will get no credit for it."
-msgstr "Ukončit práci na tomto úkolu. Za úkol nebude přidělen žádný kredit."
+#: sg_DlgPreferences.cpp:641
+msgid "1 GB"
+msgstr "1 GB"
 
-#: clientgui/ViewWork.cpp:240
-msgid "Elapsed"
-msgstr "Čas"
+#: sg_DlgPreferences.cpp:642
+msgid "2 GB"
+msgstr "2 GB"
 
-#: clientgui/ViewWork.cpp:241
-msgid "Remaining (estimated)"
-msgstr "Zbývá (odhad)"
+#: sg_DlgPreferences.cpp:643
+msgid "5 GB"
+msgstr "5 GB"
 
-#: clientgui/ViewWork.cpp:242
-msgid "Deadline"
-msgstr "Odevzdat do"
+#: sg_DlgPreferences.cpp:644
+msgid "10 GB"
+msgstr "10 GB"
 
-#: clientgui/ViewWork.cpp:269
-msgid "Tasks"
-msgstr "Úkoly"
+#: sg_DlgPreferences.cpp:645
+msgid "20 GB"
+msgstr "20 GB"
 
-#: clientgui/ViewWork.cpp:362
-msgid "Resuming task..."
-msgstr "Obnovuji úkol..."
+#: sg_DlgPreferences.cpp:646
+msgid "50 GB"
+msgstr "50 GB"
 
-#: clientgui/ViewWork.cpp:365
-msgid "Suspending task..."
-msgstr "Pozastavuji úkol..."
+#: sg_DlgPreferences.cpp:647
+msgid "100 GB"
+msgstr "100 GB"
 
-#: clientgui/ViewWork.cpp:394
-msgid "Showing graphics for task..."
-msgstr "Zobrazuji grafické okno pro úkol..."
+#: sg_DlgPreferences.cpp:717
+#, c-format
+msgid "%d MB"
+msgstr "%d MB"
 
-#: clientgui/ViewWork.cpp:431
-msgid "Showing VM console for task..."
-msgstr "Zobrazuji VM konzoli pro úkol..."
+#: sg_DlgPreferences.cpp:719
+#, c-format
+msgid "%4.2f GB"
+msgstr "%4.2f GB"
 
-#: clientgui/ViewWork.cpp:484
+#: sg_DlgPreferences.cpp:760
 #, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %s, Status: %s)"
-msgstr ""
-"Opravdu chcete zrušit tento úkol '%s'?\n"
-"(Průběh: %s, Stav: %s)"
+msgid "%d%%"
+msgstr "%d%%"
+
+#: sg_DlgPreferences.cpp:796
+msgid "0 (Run Always)"
+msgstr "0 (Počítat trvale)"
 
-#: clientgui/ViewWork.cpp:490
+#: sg_DlgPreferences.cpp:799
 #, c-format
-msgid "Are you sure you want to abort these %d tasks?"
-msgstr "Opravdu chcete zrušit těchto %d úkolů?"
+msgid "%d"
+msgstr "%d"
 
-# 75%
-#: clientgui/ViewWork.cpp:504
-msgid "Aborting task..."
-msgstr "Ruším úkol..."
+#: sg_DlgPreferences.cpp:1029
+msgid "Do you really want to clear all local preferences?\n"
+msgstr "Opravdu chcete vymazat všechny místní předvolby?\n"
 
-#: clientgui/ViewWork.cpp:776
-msgid "Show all tasks"
-msgstr "Zobrazit všechny úkoly "
+#: sg_ProjectPanel.cpp:72
+msgid "Add Project"
+msgstr "Přidat projekt"
 
-#: clientgui/ViewWork.cpp:777
-msgid "Show all tasks."
-msgstr "Zobrazit všechny úkoly."
+#: sg_ProjectPanel.cpp:73
+msgid "Synchronize"
+msgstr "Synchronizovat"
 
-#: clientgui/WelcomePage.cpp:284
-msgid "Add project or account manager"
-msgstr "Přidat projekt nebo nastavit Správce účtu"
+#: sg_ProjectPanel.cpp:74
+msgid "Work done for this project"
+msgstr "Práce hotova pro tento projekt"
 
-#: clientgui/WelcomePage.cpp:288
-msgid "Add project or use BOINC Account Manager"
-msgstr "Přidat projekt nebo použít BOINC správce účtů"
+#: sg_ProjectPanel.cpp:77
+msgid "Synchronize projects with account manager system"
+msgstr "Synchronizovat projekty se systémem Správce účtu"
 
-#: 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 ""
-"Pokud je to možné, přidejte projekty\n"
-"na webové stránce %s.\n"
-"\n"
-"Projekty přidané tímto průvodcem nebudou\n"
-"na seznamu %s a nepůjdou zde spravovat."
+#: sg_ProjectPanel.cpp:124
+msgid "Select a project to access with the controls below"
+msgstr "Zvolte projekt, který chcete ovládat prvky dole"
 
-#: 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 ""
-"Je dostupno více než 30 BOINC projektů\n"
-"provádějících výzkum v mnoha vědeckých oblastech.\n"
-"Můžete se připojit k libovolného množství projektů.\n"
-"Projekt lze přidat buď přímo, nebo s využitím\n"
-"některého Správce účtu, u kterého si na webu vyberete projekty."
+#: sg_ProjectPanel.cpp:145
+msgid "Project Web Pages"
+msgstr "Webové stránky projektu"
 
-#: 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 ""
-"Chcete přidat nový projekt pro dobrovolné výpočty, nebo upravit projekty,\n"
-"na kterých se již podílíte.\n"
-"\n"
-"Některé z těchto projektů jsou spravované organizací World Community Grid,\n"
-"zatímco další jsou provozované jinými výzkumníky a organizacemi.\n"
-"Aplikace BOINC vám umožní přerozdělit výpočetní sílu mezi vámi zvolenou\n"
-"libovolnou kombinaci projektů.\n"
-"\n"
-"Nebo pokud jste registrovaní u BOINC správce účtu, je možný spravovat\n"
-"váš výběr projektů přes něj.\n"
-"\n"
-"Vyberte si prosím typ změny, kterou chcete provést.\n"
+#: sg_ProjectPanel.cpp:149
+msgid "Project Commands"
+msgstr "Příkazy projektu"
 
-#: clientgui/WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
-msgstr "Použít BOINC správce účtu"
+#: sg_ProjectPanel.cpp:267
+#, c-format
+msgid "Pop up a menu of web sites for project %s"
+msgstr "Otevřít menu s webovými stránkami projektu %s"
 
-#: clientgui/WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
-msgstr "Přidat nebo změnit projekty pro World Community Grid"
+#: sg_ProjectPanel.cpp:269
+#, c-format
+msgid "Pop up a menu of commands to apply to project %s"
+msgstr "Otevřít menu s příkazy pro projekt %s"
 
-#: clientgui/WelcomePage.cpp:361
-msgid "Add projects run by other researchers or organizations"
-msgstr "Přidat projekty spravované jinými výzkumníky nebo organizacemi"
+#: sg_TaskCommandPopup.cpp:67
+msgid "Suspend this task."
+msgstr "Pozastavit tento úkol."
 
-#: clientgui/WizardAttach.cpp:673
-msgid "Do you really want to cancel?"
-msgstr "Opravdu chcete operaci zrušit?"
+#: sg_TaskCommandPopup.cpp:73
+msgid "Abandon this task. You will get no credit for it."
+msgstr "Zrušit tento úkol. Neobdržíte za něj žádný kredit."
 
-#: clientgui/WizardAttach.cpp:674
-msgid "Question"
-msgstr "Dotaz"
+#: sg_TaskCommandPopup.cpp:251
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %.1lf%%, Status: %s)"
+msgstr "Opravdu chcete zrušit tento úkol '%s'?\n(Průběh: %.1lf%%, Stav: %s)"
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
-msgid "&Next >"
-msgstr "Další >"
+#: sg_TaskPanel.cpp:464
+msgid "You don't have any projects.  Please Add a Project."
+msgstr "Nemáte žádný projekt. Přidejte si prosím nějaký projekt."
 
-#: clientgui/wizardex.cpp:383
-msgid "< &Back"
-msgstr "< Zpět"
+#: sg_TaskPanel.cpp:465
+msgid "Not available"
+msgstr "Nedostupné"
 
-#: clientgui/wizardex.cpp:553
-msgid "&Finish"
-msgstr "Dokončit"
+#: sg_TaskPanel.cpp:476
+msgid "Tasks:"
+msgstr "Úkoly:"
 
-#: clientgui/common/wxPieCtrl.cpp:64
-msgid "Pie Ctrl"
-msgstr "Pie Ctrl"
+#: sg_TaskPanel.cpp:482
+msgid "Select a task to access"
+msgstr "Zvolit úkol"
 
-#: clientgui/mac/Mac_GUI.cpp:35
-msgid "Services"
-msgstr "Služby"
+#: sg_TaskPanel.cpp:493
+msgid "From:"
+msgstr "Od:"
 
-#: clientgui/mac/Mac_GUI.cpp:36
-#, c-format
-msgid "Hide %s"
-msgstr "Skrýt %s"
+#: sg_TaskPanel.cpp:547
+msgid "This task's progress"
+msgstr "Průběh tohoto úkolu"
 
-#: clientgui/mac/Mac_GUI.cpp:37
-msgid "Hide Others"
-msgstr "Skrýt ostatní"
+#: sg_TaskPanel.cpp:565
+msgid "Task Commands"
+msgstr "Příkazy úkolu"
 
-#: clientgui/mac/Mac_GUI.cpp:38
-msgid "Show All"
-msgstr "Zobrazit vše"
+#: sg_TaskPanel.cpp:566
+msgid "Pop up a menu of commands to apply to this task"
+msgstr "Otevřít menu s příkazy pro tento úkol"
 
-#: clientgui/mac/Mac_GUI.cpp:39
+#: sg_TaskPanel.cpp:701
 #, c-format
-msgid "Quit %s"
-msgstr "Opustit %s"
+msgid "Application: %s"
+msgstr "Aplikace: %s"
 
-#: clientgui/DlgAdvPreferences.h:30
-msgid "specify work start and stop hours in format HH:MM-HH:MM"
-msgstr "určete časové rozmezí, kdy bude povoleno provádět výpočty - ve formátu HH:MM-HH:MM"
-
-#: clientgui/DlgAdvPreferences.h:31
-msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
-msgstr "určete časové rozmezí, kdy bude povolen přístup k Internetu - ve formátu HH:MM-HH:MM"
-
-# 98%
-#~ msgid ""
-#~ "(C) 2003-2013 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2013 Kalifornská Univerzita, Berkeley.\n"
-#~ "Všechna práva vyhrazena.\n"
-#~ "Překlad do češtiny: Spok a Necroman"
+#: sg_TaskPanel.cpp:724
 #, c-format
-#~ msgid "%s - Preferences"
-#~ msgstr "%s - Předvolby"
+msgid "%.3f%%"
+msgstr "%.3f%%"
 
-#, no-c-format
-#~ msgid "% CPU time"
-#~ msgstr "% procesorového času"
-#~ msgid "KBytes/sec."
-#~ msgstr "KB/s"
-#~ msgid "Mbytes"
-#~ msgstr "MB"
-#~ msgid "every"
-#~ msgstr "každých"
-#~ msgid "days"
-#~ msgstr "dní"
-#~ msgid "Gigabytes disk space"
-#~ msgstr "GB na disku"
-#~ msgid "Running, high priority"
-#~ msgstr "Počítám s vysokou prioritou"
-#~ msgid " (Scheduler wait: "
-#~ msgstr " (Vyčkávání plánovače: "
-#~ msgid " (Scheduler wait)"
-#~ msgstr "(vyčkávání plánovače)"
-#~ msgid " (Waiting for network access)"
-#~ msgstr "(Čekám na připojení k Internetu)"
-#~ msgid "Preferences…"
-#~ msgstr "Předvolby…"
-#~ msgid "I do not agree with the terms of use."
-#~ msgstr "Nesouhlasím s podmínkami použití."
-#~ msgid "Click Clear to restore web-based settings."
-#~ msgstr "Klikněte na Smazat pro obnovení nastavení z webu."
-#~ msgid "For additional settings, select Computing Preferences in "
-#~ msgstr "Pro pokročilé nastavení klikněte na Výpočetní předvolby v"
-#~ msgid "the Advanced View."
-#~ msgstr "rozšířeném zobrazení."
-#~ msgid "Workunit name"
-#~ msgstr "Jméno pracovní jednotky"
-#~ msgid "invalid float"
-#~ msgstr "neplatné číslo"
-#~ msgid "Display the advanced (accessible) graphical interface."
-#~ msgstr "Zobrazit rozšířené grafické rozhraní."
-#~ msgid "Paused: Other work running"
-#~ msgstr "Pozastaveno: Probíhá výpočet jiného úkolu "
-#~ msgid "Paused: User initiated.  Click 'Resume' to continue"
-#~ msgstr ""
-#~ "Pozastaveno: Vyžádáno uživatelem. Klikněte na Obnovit pro obnovení výpočtu"
-#~ msgid "Paused: User active"
-#~ msgstr "Pozastaveno: Uživatel je aktivní"
-#~ msgid "Paused: Computer on battery"
-#~ msgstr "Pozastaveno: Provoz na baterie"
-#~ msgid "Paused: Time of Day"
-#~ msgstr "Pozastaveno: Denní doba"
-#~ msgid "Paused: Benchmarks running"
-#~ msgstr "Pozastaveno: Probíhají testy procesoru"
-#~ msgid "Paused"
-#~ msgstr "Pozastaveno"
-#~ msgid "Paused: Application start delayed"
-#~ msgstr "Pozastaveno: Odložený start aplikace"
-#~ msgid "Click to show project graphics"
-#~ msgstr "Kliknutím zobrazíte grafické okno projektu"
-#~ msgid "Open a window to view messages"
-#~ msgstr "Otevřít okno s informačními zprávami"
-#~ msgid "Stop all activity"
-#~ msgstr "Pozastavit veškerou aktivitu"
-#~ msgid "Resume activity"
-#~ msgstr "Obnovit veškerou aktivitu"
-#~ msgid "Open a window to set your preferences"
-#~ msgstr "Otevřít okno pro nastavení předvoleb"
-#~ msgid "Switch to the BOINC advanced view"
-#~ msgstr "Přepnout Správce BOINC do rozšířeného zobrazení"
-#~ msgid "My Projects:"
-#~ msgstr "Projekty:"
+#: sg_TaskPanel.cpp:732
+msgid "Application: Not available"
+msgstr "Aplikace: Nedostupná"
 
-#, c-format
-#~ msgid "%s. Work done by %s: %0.2f"
-#~ msgstr "%s. Kredit uživatele %s: %0.2f"
+#: sg_TaskPanel.cpp:832
+msgid "Not Available"
+msgstr "Nedostupný"
 
+#: sg_TaskPanel.cpp:847
 #, c-format
-#~ msgid "%.1lf"
-#~ msgstr "%.1lf"
+msgid "Elapsed: %s"
+msgstr "Uplynulo: %s"
 
+#: sg_TaskPanel.cpp:861
 #, c-format
-#~ msgid "%d hr %d min %d sec"
-#~ msgstr "%d h %d m %d s"
-#~ msgid "Are you sure you want to display graphics on a remote machine?"
-#~ msgstr "Opravdu chcete zobrazit grafické okno na vzdáleném počítači?"
-#~ msgid "Application: "
-#~ msgstr "Aplikace: "
-#~ msgid "Time Remaining: "
-#~ msgstr "Zbývající čas: "
-#~ msgid "Elapsed Time: "
-#~ msgstr "Čas: "
-#~ msgid "Account manager website"
-#~ msgstr "Webové stránky Správce účtu"
-#~ msgid "Account Manager &URL:"
-#~ msgstr "&URL adresa Správce účtu:"
+msgid "Remaining (estimated): %s"
+msgstr "Zbývá (odhad): %s"
 
+#: sg_TaskPanel.cpp:876
 #, c-format
-#~ msgid "%s &website"
-#~ msgstr "&Webové stránky %s"
-#~ msgid "Notice List"
-#~ msgstr "Seznam zpráv"
+msgid "Status: %s"
+msgstr "Stav: %s"
 
-#, c-format
-#~ msgid "%s; received on %s"
-#~ msgstr "%s; doručena v %s"
+#: sg_TaskPanel.cpp:1223
+msgid "Retrieving current status."
+msgstr "Zjišťuji aktuální stav."
 
-#, c-format
-#~ msgid "%s; received from %s; on %s"
-#~ msgstr "%s; doručena od %s; v %s"
-#~ msgid "Click"
-#~ msgstr "Klik"
-#~ msgid "Project List"
-#~ msgstr "Seznam projektů"
-#~ msgid "Nvidia GPU Supported"
-#~ msgstr "Podporuje nVidia GPU"
-#~ msgid "ATI GPU Supported"
-#~ msgstr "Podporuje AMD GPU"
-#~ msgid "Project Website"
-#~ msgstr "Stránky projektu"
-#~ msgid "One or more items failed to load from the Internet."
-#~ msgstr "Některé položky z Internetu se nepodařilo načíst."
-
-# 88%
-#~ msgid "Retry now"
-#~ msgstr "Obnovit přenos"
-#~ msgid "10%"
-#~ msgstr "10%"
-#~ msgid "20%"
-#~ msgstr "20%"
-#~ msgid "30%"
-#~ msgstr "30%"
-#~ msgid "40%"
-#~ msgstr "40%"
-#~ msgid "50%"
-#~ msgstr "50%"
-#~ msgid "60%"
-#~ msgstr "60%"
-#~ msgid "70%"
-#~ msgstr "70%"
-#~ msgid "80%"
-#~ msgstr "80%"
-#~ msgid "90%"
-#~ msgstr "90%"
-#~ msgid "100%"
-#~ msgstr "100%"
-#~ msgid "1"
-#~ msgstr "1"
-#~ msgid "3"
-#~ msgstr "3"
-#~ msgid "5"
-#~ msgstr "5"
-#~ msgid "10"
-#~ msgstr "10"
-#~ msgid "15"
-#~ msgstr "15"
-#~ msgid "30"
-#~ msgstr "30"
-#~ msgid "60"
-#~ msgstr "60"
-#, c-format
-#~ msgid "Pop up a menu of websites for project %s"
-#~ msgstr "Otevřít menu s webovými stránkami projektu %s"
-#~ msgid ""
-#~ "for accessibility support, please select advanced from the view menu or type "
-#~ "command shift a"
-#~ msgstr ""
-#~ "pro usnadnění přístupu vyberte režim rozšířeného zobrazení v menu, nebo "
-#~ "použijte zkratku Command + Shift + A"
-#~ msgid "This panel contains graphs showing user totals for projects"
-#~ msgstr "Tento panel obsahuje grafy ukazující výsledky uživatele v projektech"
-#~ msgid "list headers"
-#~ msgstr "hlavičky seznamu"
-#~ msgid "list of events"
-#~ msgstr "seznam událostí"
-#~ msgid "list of events is empty"
-#~ msgstr "seznam událostí je prázdný"
+#: sg_TaskPanel.cpp:1229
+msgid "Downloading work from the server."
+msgstr "Stahuji práci ze serveru."
 
-#, c-format
-#~ msgid "list of %s"
-#~ msgstr "seznam %s"
+#: sg_TaskPanel.cpp:1234
+msgid "Processing Suspended:  Running On Batteries."
+msgstr "Výpočty pozastaveny:  Provoz na baterie."
 
-#, c-format
-#~ msgid "list of %s is empty"
-#~ msgstr "seznam %s je prázdný"
+#: sg_TaskPanel.cpp:1236
+msgid "Processing Suspended:  User Active."
+msgstr "Výpočty pozastaveny:  Uživatel je aktivní."
 
-#, c-format
-#~ msgid "; current sort column %d of %d; descending order; "
-#~ msgstr "; tříděno podle sloupce %d z %d; sestupné pořadí; "
+#: sg_TaskPanel.cpp:1238
+msgid "Processing Suspended:  User paused processing."
+msgstr "Výpočty pozastaveny:  Pozastaveno uživatelem."
 
-#, c-format
-#~ msgid "; current sort column %d of %d; ascending order; "
-#~ msgstr "; tříděno podle sloupce %d z %d; vzestupné pořadí; "
+#: sg_TaskPanel.cpp:1240
+msgid "Processing Suspended:  Time of Day."
+msgstr "Výpočty pozastaveny:  Denní doba."
 
-#, c-format
-#~ msgid "; column %d of %d; "
-#~ msgstr "; sloupec %d z %d; "
-#~ msgid "list is empty"
-#~ msgstr "seznam je prázdný"
+#: sg_TaskPanel.cpp:1242
+msgid "Processing Suspended:  Benchmarks Running."
+msgstr "Výpočty pozastaveny:  Probíhají testy procesoru."
 
-#, c-format
-#~ msgid "; row %d; "
-#~ msgstr "; řádka %d; "
+#: sg_TaskPanel.cpp:1244
+msgid "Processing Suspended."
+msgstr "Výpočty pozastaveny."
 
-#, c-format
-#~ msgid "; selected row %d of %d; "
-#~ msgstr "; vybraná řádka %d z %d; "
+#: sg_TaskPanel.cpp:1248
+msgid "Waiting to contact project servers."
+msgstr "Čekám na kontakt se servery projektu."
 
-#, c-format
-#~ msgid "; selected row %d ; "
-#~ msgstr "; vybraná řádka %d ; "
+#: sg_TaskPanel.cpp:1252 sg_TaskPanel.cpp:1261
+msgid "Retrieving current status"
+msgstr "Zjišťuji aktuální stav"
 
-#, c-format
-#~ msgid "; row %d of %d; "
-#~ msgstr "; řádka %d z %d; "
-#~ msgid "blank"
-#~ msgstr "prázdné"
-#~ msgid "list of projects or account managers"
-#~ msgstr "seznam projektů nebo Správců účtu"
+#: sg_TaskPanel.cpp:1256
+msgid "No work available to process"
+msgstr "Není k dispozici žádná práce"
 
-#, c-format
-#~ msgid "selected row %d of %d; "
-#~ msgstr "vybraná řádka %d z %d; "
+#: sg_TaskPanel.cpp:1258
+msgid "Unable to connect to the core client"
+msgstr "Selhalo spojení s klientem"
 
-#, c-format
-#~ msgid "row %d of %d; "
-#~ msgstr "řádka %d z %d; "
-#~ msgid "The minimum username length for this project is 1. Please enter a different username."
-#~ msgstr ""
-#~ "Minimální délka uživatelského jména u tohoto projektu je 1. Zadejte prosím "
-#~ "jiné uživatelské jméno."
-#~ msgid "The minimum username length for this account manager is 1. Please enter a different username."
-#~ msgstr ""
-#~ "Minimální délka uživatelského jména u tohoto správce účtů je 1. Zadejte "
-#~ "prosím jiné uživatelské jméno."
-#~ msgid "The minimum email address length for this project is 1. Please enter a different email address."
-#~ msgstr ""
-#~ "Minimální délka emailové adresy u tohoto projektu je 1. Zadejte prosím jinou "
-#~ "emailovou adresu."
-#~ msgid "The minimum email address length for this account manager is 1. Please enter a different email address."
-#~ msgstr ""
-#~ "Minimální délka emailové adresy u tohoto správce účtů je 1. Zadejte prosím "
-#~ "jinou emailovou adresu."
+#: wizardex.cpp:377 wizardex.cpp:553
+msgid "&Next >"
+msgstr "Další >"
 
-#, c-format
-#~ msgid "The minimum password length for this project is %d. Please enter a different password."
-#~ msgstr ""
-#~ "Minimální délka hesla pro tento projekt je %d znaků. Zadejte prosím jiné "
-#~ "heslo."
+#: wizardex.cpp:383
+msgid "< &Back"
+msgstr "< Zpět"
 
-#, c-format
-#~ msgid "The minimum password length for this account manager is %d. Please enter a different password."
-#~ msgstr ""
-#~ "Minimální délka hesla pro tohoto Správce účtu je %d znaků. Zadejte prosím "
-#~ "jiné heslo."
-#~ msgid ""
-#~ "An error has occurred;\n"
-#~ "check the Event Log for details.\n"
-#~ "\n"
-#~ "Click Finish to close."
-#~ msgstr ""
-#~ "Došlo k chybě.\n"
-#~ "Podrobnosti naleznete v okně Záznamu událostí.\n"
-#~ "\n"
-#~ "Okno zavřete kliknutím na Dokončit."
+#: wizardex.cpp:553
+msgid "&Finish"
+msgstr "Dokončit"
 
-#, no-c-format
-#~ msgid "% of the processors"
-#~ msgstr "% všech procesorů"
+#: mac/Mac_GUI.cpp:110
+msgid "Preferences…"
+msgstr "Předvolby…"
 
-#, c-format
-#~ msgid "New page inserted. Index = %i"
-#~ msgstr "Vložena nová stránka. Index = %i"
+#: mac/Mac_GUI.cpp:122
+msgid "Services"
+msgstr "Služby"
 
+#: mac/Mac_GUI.cpp:144
 #, c-format
-#~ msgid "New page appended. Index = %i"
-#~ msgstr "Připojena nová stránka. Index = %i"
+msgid "Hide %s"
+msgstr "Skrýt %s"
 
-#, c-format
-#~ msgid "Old Page Index = %i"
-#~ msgstr "Index původní stránky = %i"
+#: mac/Mac_GUI.cpp:158
+msgid "Hide Others"
+msgstr "Skrýt ostatní"
 
-#, c-format
-#~ msgid "OnDropTarget: index by HitTest = %i"
-#~ msgstr "OnDropTarget: index by HitTest = %i"
-#~ msgid "Identify your account "
-#~ msgstr "Zadejte údaje k vašemu účtu "
-#~ msgid "Read config file"
-#~ msgstr "Načíst konfigurační soubor"
-#~ msgid "Read configuration info from cc_config.xml"
-#~ msgstr "Načíst konfigurační informace z 'cc-config.xml'"
-#~ msgid ""
-#~ "(C) 2003-2011 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2011 Kalifornská Univerzita, Berkeley.\n"
-#~ "Všechna práva vyhrazena.\n"
-#~ "Překlad do češtiny: Spok a Necroman"
-#~ msgid "NVIDIA GPU"
-#~ msgstr "nVidia GPU"
-#~ msgid "ATI GPU"
-#~ msgstr "AMD GPU"
-#~ msgid "Multicore CPU Supported"
-#~ msgstr "Podporuje vícejádrové procesory"
-#~ msgid "%s: %.0f"
-#~ msgstr "%s: %.0f"
-#~ msgid "Click 'Retry now' to transfer the file now"
-#~ msgstr "Klikněte na 'Obnovit přenos' pro odeslání souboru"
-#~ msgid ""
-#~ "Click 'Abort transfer' to delete the file from the transfer queue. This "
-#~ "will prevent you from being granted credit for this result."
-#~ msgstr ""
-#~ "Klikněte na 'Zrušit přenos' pro odstranění souboru z fronty. Za "
-#~ "odstraněný výsledek nebude přidělen žádný kredit."
-#~ msgid "Aborting result..."
-#~ msgstr "Ruším úkoly..."
-#~ msgid ""
-#~ "You have chosen to add a new BOINC project.  Adding a new\n"
-#~ "project means that you will be connecting your computer to a new "
-#~ "organization.\n"
-#~ "If this is what you wanted to do, please click on\n"
-#~ "the 'Next' button below.\n"
-#~ "\n"
-#~ "Some projects like World Community Grid run multiple research "
-#~ "applications.\n"
-#~ "If you want to change which research applications are sent to your "
-#~ "computer\n"
-#~ "to run, visit the project's website and modify your\n"
-#~ "preferences there.\n"
-#~ "\n"
-#~ "To change which research applications are sent to you from\n"
-#~ "World Community Grid then please click on the following button:"
-#~ msgstr ""
-#~ "Zvolili jste si přidání nového BOINC projektu. Přidání nového projektu "
-#~ "znamená, \n"
-#~ "že se váš počítač bude připojovat k nové internetové stránce a k nové "
-#~ "organizaci.\n"
-#~ "Pokud to bylo vaším úmyslem, pokračujte prosím klinutím na tlačítko Další "
-#~ "níže.\n"
-#~ "\n"
-#~ "Některé projekty, jako například World Community Grid, používají více "
-#~ "různých výzkumných aplikací.\n"
-#~ "Pokud byste chtěli změnit to, které výzkumné aplikace mají být posílány "
-#~ "na váš počítač, \n"
-#~ "měli byste navštívit internetové stránky projektu a tam změnit vaše "
-#~ "předvolby.\n"
-#~ "\n"
-#~ "Pokud chcete změnit, které výzkumné aplikace vám budou posílány z World "
-#~ "Community Grid,\n"
-#~ "klikněte prosím na následující tlačítko:"
-#~ msgid "Change Research Applications at World Community Grid"
-#~ msgstr "Změnit výzkumné aplikace ve World Community Grid"
-#~ msgid "Don't fetch NVIDIA GPU tasks"
-#~ msgstr "Nepřijímat úkoly pro nVidia GPU"
-#~ msgid "NVIDIA GPU work fetch deferred for"
-#~ msgstr "Vyzvedávání práce pro GPU nVidia odloženo o "
-#~ msgid "NVIDIA GPU work fetch deferral interval"
-#~ msgstr "Interval odkládání vyzvedávání práce pro GPU nVidia"
-#~ msgid "Don't fetch ATI GPU tasks"
-#~ msgstr "Nepřijímat úkoly pro AMD GPU"
-#~ msgid "ATI GPU work fetch deferred for"
-#~ msgstr "Vyzvedávání práce AMD GPU odloženo o "
-#~ msgid "ATI GPU work fetch deferral interval"
-#~ msgstr "Interval odkládání vyzvedávání práce AMD GPU "
-#~ msgid "Remaining"
-#~ msgstr "Zbývá"
-#~ msgid "Web sites"
-#~ msgstr "Webové stránky"
-#~ msgid "Connect about every"
-#~ msgstr "Připojit se přibližně každých"
-#~ msgid ""
-#~ "this computer is connected to the Internet about every X days\n"
-#~ "(0 if it's always connected)"
-#~ msgstr ""
-#~ "Tento počítač bývá připojen k Internetu přibližně jednou za X dní\n"
-#~ "(Pokud je připojen trvale, zadejte 0)"
-#~ msgid "days (max. 10)"
-#~ msgstr "dní (max. 10)"
-#~ msgid "%d.%d%%"
-#~ msgstr "%d.%d%%"
-#~ msgid "Display and network &options..."
-#~ msgstr "M&ožnosti obrazovky a připojení k síti..."
-#~ msgid ""
-#~ "You have requested to exit the %s,\n"
-#~ "which allows you to view and manage\n"
-#~ "the science applications running on your computer.\n"
-#~ "\n"
-#~ "If you also want to stop running the science applications when you\n"
-#~ "exit the Manager, then choose from the following options:"
-#~ msgstr ""
-#~ "Rozhodli jste se ukončit %s,\n"
-#~ "který vám umožňuje zobrazovat a spravovat\n"
-#~ "vědecké aplikace běžící na vašem počítači.\n"
-#~ "\n"
-#~ "Pokud chcete při ukončení Správce BOINC ukončit též\n"
-#~ "všechny běžící vědecké aplikace, zvolte z následujících možností:"
-#~ msgid "Stop running science applications when exiting the Manager"
-#~ msgstr "Přerušit výpočet vědeckých aplikací při ukončení Správce"
-#~ msgid "CPU work fetch priority"
-#~ msgstr "Priorita vyzvedávání práce procesoru"
-#~ msgid "NVIDIA GPU scheduling priority"
-#~ msgstr "Priorita plánovávní pro nVidia GPU"
-#~ msgid "NVIDIA GPU work fetch priority"
-#~ msgstr "Priorita vyzvedávání práce pro GPU nVidia"
-#~ msgid "ATI GPU scheduling priority"
-#~ msgstr "Priorita plánovávní pro AMD GPU"
-#~ msgid "ATI GPU work fetch priority"
-#~ msgstr "Priorita vyzvedávání práce AMD GPU"
-#~ msgid "Estimated app speed"
-#~ msgstr "Odhadovaná rychlost aplikace"
-#~ msgid "Estimated task size"
-#~ msgstr "Odhadovaná velikost úkolu"
-#~ msgid "Max RAM usage"
-#~ msgstr "Maximální využití RAM"
-#~ msgid "%s - Options"
-#~ msgstr "%s - Možnosti"
-#~ msgid "Retrieving host information; please wait..."
-#~ msgstr "Zjišťuji stav počítače, prosím čekejte... "
-#~ msgid " (waiting for GPU memory)"
-#~ msgstr " (čekám na uvolnění GPU paměti)"
-#~ msgid "Manager Settings..."
-#~ msgstr "Nastavení Správce..."
-#~ msgid "Pause"
-#~ msgstr "Pozastavit"
-#~ msgid "%s - Messages"
-#~ msgstr "%s - Zprávy"
-#~ msgid "Skin:"
-#~ msgstr "Vzhled:"
-#~ msgid "Preferences"
-#~ msgstr "Předvolby"
-#~ msgid "I want to customize my preferences for this computer only."
-#~ msgstr "Chci změnit předvolby pouze pro tento počítač."
-#~ msgid "Customized Preferences"
-#~ msgstr "Vlastní předvolby"
-#~ msgid "My total work done this Project"
-#~ msgstr "Celková práce vykonaná pro tento projekt"
-#~ msgid "My Tasks:"
-#~ msgstr "Mé úkoly: "
-#~ msgid "From Project:"
-#~ msgstr "Od projektu: "
-#~ msgid "Elapsed Time: %s"
-#~ msgstr "Čas: %s"
-#~ msgid "Time Remaining: %s"
-#~ msgstr "Zbývající čas: %s"
-#~ msgid "Upload suspended - "
-#~ msgstr "Odesílání přerušeno - "
-#~ msgid "Download suspended - "
-#~ msgstr "Stahování přerušeno - "
-#~ msgid "Upload pending"
-#~ msgstr "Nevyřízené odeslání"
-#~ msgid "Download pending"
-#~ msgstr "Nevyřízené stahování"
-#~ msgid "New Simple View..."
-#~ msgstr "Nové Jednoduché zobrazení..."
-#~ msgid "Display the new simple graphical interface."
-#~ msgstr "Zobrazit nové Jednoduché grafické rozhraní."
-#~ msgid "Old Simple View..."
-#~ msgstr "Staré Jednoduché zobrazení..."
-#~ msgid "Display the old simple graphical interface."
-#~ msgstr "Zobrazit staré Jednoduché grafické rozhraní."
-#~ msgid "Get help with BOINC"
-#~ msgstr "Zobrazit nápovědu pro BOINC"
+#: mac/Mac_GUI.cpp:172
+msgid "Show All"
+msgstr "Zobrazit vše"
 
+#: mac/Mac_GUI.cpp:186
+#, c-format
+msgid "Quit %s"
+msgstr "Opustit %s"
diff --git a/locale/cs/BOINC-Project-Generic.po b/locale/cs/BOINC-Project-Generic.po
old mode 100755
new mode 100644
index 501e83e..3492cb9
--- a/locale/cs/BOINC-Project-Generic.po
+++ b/locale/cs/BOINC-Project-Generic.po
@@ -1,26 +1,28 @@
 # BOINC web translation
 # Copyright (C) 2008 University of California
+# 
 # This file is distributed under the same license as BOINC.
+# 
 # FileID  : $Id$
+# 
+# Translators:
+# Pavel <xxxq at seznam.cz>, 2015
+# Petr Nekvinda <petr.nekvinda at gmail.com>, 2015
+# Petr Nekvinda <petr.nekvinda at gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\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: 2013-08-30 20:59+0000\n"
-"Last-Translator: Lycan <santdel at gmail.com>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: cs\n"
+"POT-Creation-Date: 2015-03-04 08:56 PST\n"
+"PO-Revision-Date: 2015-03-13 13:41+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Pootle 2.5.0\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-SearchPath-0: html\\user\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
-"X-POOTLE-MTIME: 1377896370.0\n"
 
 msgid "LANG_NAME_NATIVE"
 msgstr "Čeština"
@@ -28,6 +30,96 @@ msgstr "Čeština"
 msgid "LANG_NAME_INTERNATIONAL"
 msgstr "Czech"
 
+#: ../inc/account.inc:38
+msgid "Invitation Code"
+msgstr "Pozvánkový kód"
+
+#: ../inc/account.inc:38
+msgid "A valid invitation code is required to create an account."
+msgstr "Pro vytvoření účtu je zapotřebí platný povánkový kód."
+
+#: ../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 "Jméno"
+
+#: ../inc/account.inc:44 ../user/account_finish.php:41
+msgid "Identifies you on our web site. Use your real name or a nickname."
+msgstr "Vaše identifikace na stránkách. Použijte skutečné jméno, nebo přezdívku."
+
+#: ../inc/account.inc:48
+msgid "Email Address"
+msgstr "Emailová adresa"
+
+#: ../inc/account.inc:48
+msgid "Must be a valid address of the form 'name at domain'."
+msgstr "Adresa musí být platného tvaru 'jmeno at domena'."
+
+#: ../inc/account.inc:57 ../user/edit_email_form.php:47
+msgid "Password"
+msgstr "Heslo"
+
+#: ../inc/account.inc:58
+msgid "Must be at least %1 characters"
+msgstr "Musí mít délku aspoň %1 znaků"
+
+#: ../inc/account.inc:61
+msgid "Confirm password"
+msgstr "Potvrďte heslo"
+
+#: ../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 "Země"
+
+#: ../inc/account.inc:63 ../user/account_finish.php:45
+msgid "Select the country you want to represent, if any."
+msgstr "Vyberte si zemi, kterou chcete reprezentovat."
+
+#: ../inc/account.inc:70 ../user/account_finish.php:51
+msgid "Postal or ZIP Code"
+msgstr "PSČ nebo ZIP kód"
+
+#: ../inc/account.inc:70 ../user/account_finish.php:51
+msgid "Optional"
+msgstr "Volitelné"
+
+#: ../inc/account.inc:86
+msgid "Create account"
+msgstr "Vytvořit účet"
+
+#: ../inc/account.inc:101
+msgid "Email address:"
+msgstr "Emailová adresa:"
+
+#: ../inc/account.inc:103
+msgid "forgot email address?"
+msgstr "zapomenutá emailová adresa?"
+
+#: ../inc/account.inc:106
+msgid "Password:"
+msgstr "Heslo:"
+
+#: ../inc/account.inc:106
+msgid "forgot password?"
+msgstr "zapomenuté heslo?"
+
+#: ../inc/account.inc:109
+msgid "Stay logged in"
+msgstr "Zústat přihlášen"
+
+#: ../inc/account.inc:114 ../inc/util.inc:238 ../user/login_form.php:41
+msgid "Log in"
+msgstr "Přihlásit se"
+
 #: ../inc/bbcode_html.inc:11
 msgid "Bold text: [b]text[/b]  (alt+b)"
 msgstr "Tučný text: [b]text[/b]  (alt+b)"
@@ -41,329 +133,327 @@ msgid "Underline text: [u]text[/u]  (alt+u)"
 msgstr "Podtržený text: [u]text[/u]  (alt+u)"
 
 #: ../inc/bbcode_html.inc:20
+msgid "Strikethrough text: [s]text[/s]  (alt+k)"
+msgstr "Přeškrtnutý text: [s]text[/s] (alt+k)"
+
+#: ../inc/bbcode_html.inc:23
 msgid "Quote text: [quote]text[/quote]  (alt+q)"
 msgstr "Citovat text: [quote]text[/quote]  (alt+q)"
 
-#: ../inc/bbcode_html.inc:23
+#: ../inc/bbcode_html.inc:26
 msgid "Code display: [code]code[/code]  (alt+c)"
 msgstr "Zobrazit kód: [code]code[/code]  (alt+c)"
 
-#: ../inc/bbcode_html.inc:26
+#: ../inc/bbcode_html.inc:29
 msgid "List: [list]text[/list] (alt+l)"
 msgstr "Seznam: [list]text[/list] (alt+l)"
 
-#: ../inc/bbcode_html.inc:29
+#: ../inc/bbcode_html.inc:32
 msgid "Ordered list: [list=]text[/list]  (alt+o)"
 msgstr "Číslovaný seznam: [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 "Vložit obrázek: [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 ""
-"Vložit odkaz: [url]http://url[/url] nebo [url=http://url]text odkazu[/url]  "
-"(alt+w)"
+msgstr "Vložit odkaz: [url]http://url[/url] nebo [url=http://url]text odkazu[/url]  (alt+w)"
 
-#: ../inc/bbcode_html.inc:42
+#: ../inc/bbcode_html.inc:45
 msgid "Font color"
 msgstr "Barva fontu"
 
-#: ../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 ""
-"Barva fontu: [color=red]text[/color]  Lze použít anglické názvy barev, nebo "
-"přímo kód=#FF0000"
+msgstr "Barva fontu: [color=red]text[/color]  Lze použít anglické názvy barev, nebo přímo kód=#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 "Výchozí"
 
-#: ../inc/bbcode_html.inc:45
+#: ../inc/bbcode_html.inc:48
 msgid "Dark Red"
 msgstr "Tmavě červená"
 
-#: ../inc/bbcode_html.inc:46
+#: ../inc/bbcode_html.inc:49
 msgid "Red"
 msgstr "Červená"
 
-#: ../inc/bbcode_html.inc:47
+#: ../inc/bbcode_html.inc:50
 msgid "Orange"
 msgstr "Oranžová"
 
-#: ../inc/bbcode_html.inc:48
+#: ../inc/bbcode_html.inc:51
 msgid "Brown"
 msgstr "Hnědá"
 
-#: ../inc/bbcode_html.inc:49
+#: ../inc/bbcode_html.inc:52
 msgid "Yellow"
 msgstr "Žlutá"
 
-#: ../inc/bbcode_html.inc:50
+#: ../inc/bbcode_html.inc:53
 msgid "Green"
 msgstr "Zelená"
 
-#: ../inc/bbcode_html.inc:51
+#: ../inc/bbcode_html.inc:54
 msgid "Olive"
 msgstr "Olivově zelená"
 
-#: ../inc/bbcode_html.inc:52
+#: ../inc/bbcode_html.inc:55
 msgid "Cyan"
 msgstr "Azurová"
 
-#: ../inc/bbcode_html.inc:53
+#: ../inc/bbcode_html.inc:56
 msgid "Blue"
 msgstr "Modrá"
 
-#: ../inc/bbcode_html.inc:54
+#: ../inc/bbcode_html.inc:57
 msgid "Dark Blue"
 msgstr "Tmavě modrá"
 
-#: ../inc/bbcode_html.inc:55
+#: ../inc/bbcode_html.inc:58
 msgid "Indigo"
 msgstr "Indigově modrá"
 
-#: ../inc/bbcode_html.inc:56
+#: ../inc/bbcode_html.inc:59
 msgid "Violet"
 msgstr "Fialová"
 
-#: ../inc/bbcode_html.inc:57
+#: ../inc/bbcode_html.inc:60
 msgid "Font size"
 msgstr "Velikost fontu"
 
-#: ../inc/bbcode_html.inc:58
+#: ../inc/bbcode_html.inc:61
 msgid "Font size: [size=x-small]small text[/size]"
 msgstr "Velikost fontu: [size=x-small]malý text[/size]"
 
-#: ../inc/bbcode_html.inc:60
+#: ../inc/bbcode_html.inc:63
 msgid "Small"
 msgstr "Malý"
 
-#: ../inc/bbcode_html.inc:61
+#: ../inc/bbcode_html.inc:64
 msgid "Normal"
 msgstr "Normální"
 
-#: ../inc/bbcode_html.inc:62
+#: ../inc/bbcode_html.inc:65
 msgid "Large"
 msgstr "Velký"
 
-#: ../inc/bbcode_html.inc:65
+#: ../inc/bbcode_html.inc:68
 msgid "Close all open bbCode tags"
 msgstr "Uzavřít všechny otevřené bbCode tagy"
 
-#: ../inc/bbcode_html.inc:65
+#: ../inc/bbcode_html.inc:68
 msgid "Close Tags"
 msgstr "Uzavřít tagy"
 
-#: ../inc/forum.inc:37
+#: ../inc/forum.inc:38
 msgid "Oldest first"
 msgstr "Od nejstarších"
 
-#: ../inc/forum.inc:38 ../inc/forum.inc:44
+#: ../inc/forum.inc:39 ../inc/forum.inc:45
 msgid "Newest first"
 msgstr "Od nejnovějších"
 
-#: ../inc/forum.inc:39
+#: ../inc/forum.inc:40
 msgid "Highest rated posts first"
 msgstr "Od nejlépe hodnocených příspěvků"
 
-#: ../inc/forum.inc:41
+#: ../inc/forum.inc:42
 msgid "Newest post first"
 msgstr "Od nejnovějších příspěvků"
 
-#: ../inc/forum.inc:42
+#: ../inc/forum.inc:43
 msgid "Most views first"
 msgstr "Od nejvíce zobrazení"
 
-#: ../inc/forum.inc:43
+#: ../inc/forum.inc:44
 msgid "Most posts first"
 msgstr "Od nejvíce příspěvků"
 
-#: ../inc/forum.inc:125
+#: ../inc/forum.inc:126
 msgid "Search for words in forum messages"
 msgstr "Vyhledat slova v diskuzích"
 
-#: ../inc/forum.inc:125
+#: ../inc/forum.inc:126
 msgid "Search forums"
 msgstr "Hledat v diskuzních fórech"
 
-#: ../inc/forum.inc:126
+#: ../inc/forum.inc:127
 msgid "Advanced search"
 msgstr "Pokročilé hledání"
 
-#: ../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 "Soukromé zprávy"
 
-#: ../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 "Otázky a odpovědi"
 
-#: ../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 "Diskuzní fóra"
 
-#: ../inc/forum.inc:187 ../inc/forum.inc:195
+#: ../inc/forum.inc:188 ../inc/forum.inc:196
 msgid "%1 message board"
 msgstr "Diskuzní fórum %1"
 
-#: ../inc/forum.inc:245 ../inc/result.inc:695
+#: ../inc/forum.inc:246 ../inc/result.inc:717
 msgid "Previous"
 msgstr "Předchozí"
 
-#: ../inc/forum.inc:283 ../inc/result.inc:704
+#: ../inc/forum.inc:284 ../inc/result.inc:726
 msgid "Next"
 msgstr "Další"
 
-#: ../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 "Zpráva"
 
-#: ../inc/forum.inc:580
+#: ../inc/forum.inc:583
 msgid "Send message"
 msgstr "Poslat zprávu"
 
-#: ../inc/forum.inc:580
+#: ../inc/forum.inc:583
 msgid "Send %1 a private message"
 msgstr "Poslat %1 soukromou zprávu"
 
-#: ../inc/forum.inc:581
+#: ../inc/forum.inc:584
 msgid "Joined: %1"
 msgstr "Připojen: %1"
 
-#: ../inc/forum.inc:590
+#: ../inc/forum.inc:593
 msgid "Posts: %1"
 msgstr "Příspěvků: %1"
 
-#: ../inc/forum.inc:596
+#: ../inc/forum.inc:599
 msgid "Credit: %1"
 msgstr "Kredit: %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 "Tuto zprávu jste dosud nečetli"
 
-#: ../inc/forum.inc:620
+#: ../inc/forum.inc:624
 msgid "Unread"
 msgstr "Nepřečtené"
 
-#: ../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 "Zpráva %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 "skryté"
 
-#: ../inc/forum.inc:625
+#: ../inc/forum.inc:629
 msgid "Posted: %1"
 msgstr "Odesláno: %1"
 
-#: ../inc/forum.inc:628
+#: ../inc/forum.inc:632
 msgid " - in response to "
 msgstr " - jako odpověď na "
 
-#: ../inc/forum.inc:631 ../inc/prefs.inc:705 ../inc/prefs.inc:707
+#: ../inc/forum.inc:635
 msgid "Edit"
 msgstr "Upravit"
 
-#: ../inc/forum.inc:631
+#: ../inc/forum.inc:635
 msgid "Edit this message"
 msgstr "Upravit tuto zprávu"
 
-#: ../inc/forum.inc:637
+#: ../inc/forum.inc:641
 msgid "Last modified: %1"
 msgstr "Naposledy upraveno: %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 ""
-"Příspěvek není zobrazen, protože jeho odesílatel je na vašem seznamu "
-"'ignorovaých uživatelů'. %1Klikněte zde%2 pro zobrazení tohoto příspěvku."
+"This post is not shown because the sender is on your 'ignore' list.  Click "
+"%1here%2 to view this post"
+msgstr "Příspěvek není zobrazen, protože jeho odesílatel je na vašem seznamu 'ignorovaých uživatelů'. %1Klikněte zde%2 pro zobrazení tohoto příspěvku."
 
-#: ../inc/forum.inc:668 ../inc/forum.inc:679
+#: ../inc/forum.inc:672 ../inc/forum.inc:683
 msgid "Report this post as offensive"
 msgstr "Nahlásit tento příspěvek jako urážlivý"
 
-#: ../inc/forum.inc:668 ../inc/forum.inc:679
+#: ../inc/forum.inc:672 ../inc/forum.inc:683
 msgid "Report as offensive"
 msgstr "Nahlásit jako urážlivý"
 
-#: ../inc/forum.inc:672
+#: ../inc/forum.inc:676
 msgid "Rating: %1"
 msgstr "Hodnocení: %1"
 
-#: ../inc/forum.inc:672
+#: ../inc/forum.inc:676
 msgid "rate: "
 msgstr "hodnotit:"
 
-#: ../inc/forum.inc:675
+#: ../inc/forum.inc:679
 msgid "Click if you like this message"
 msgstr "Klikněte, pokud se vám líbí tento příspěvek"
 
-#: ../inc/forum.inc:675
+#: ../inc/forum.inc:679
 msgid "Rate +"
 msgstr "Hodnotit +"
 
-#: ../inc/forum.inc:677
+#: ../inc/forum.inc:681
 msgid "Click if you don't like this message"
 msgstr "Klikněte pokud se vám nelíbí tato zpráva"
 
-#: ../inc/forum.inc:677
+#: ../inc/forum.inc:681
 msgid "Rate -"
 msgstr "Hodnotit -"
 
-#: ../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 "Odpovědět"
 
-#: ../inc/forum.inc:685
+#: ../inc/forum.inc:689
 msgid "Post a reply to this message"
 msgstr "Klikněte pro napsání odpovědi na tento příspěvek"
 
-#: ../inc/forum.inc:687
+#: ../inc/forum.inc:691
 msgid "Quote"
 msgstr "Citovat"
 
-#: ../inc/forum.inc:687
+#: ../inc/forum.inc:691
 msgid "Post a reply by quoting this message"
 msgstr "Klikněte pro citování tohoto příspěvku"
 
-#: ../inc/forum.inc:708
+#: ../inc/forum.inc:712
 msgid "Hidden by a moderator"
 msgstr "Schováno moderátorem"
 
-#: ../inc/forum.inc:729
+#: ../inc/forum.inc:733
 msgid "Posted %1 by %2"
 msgstr "Odesláno %1 od %2"
 
-#: ../inc/forum.inc:747
+#: ../inc/forum.inc:751
 msgid "You may not post or rate messages until %1"
 msgstr "Nemáte povoleno přispívat nebo hlasovat až do %1"
 
-#: ../inc/forum.inc:758
+#: ../inc/forum.inc:762
 msgid ""
 "\n"
 "        <ul>\n"
@@ -379,364 +469,352 @@ msgid ""
 "        <li> No abusive comments involving race, religion,\n"
 "            nationality, gender, class or sexuality.\n"
 "        "
-msgstr ""
-"\n"
-"        <ul>\n"
-"        <li> Příspěvky musí být 'vhodné pro děti': nesmí obsahovat\n"
-"obsah, který je obscénní, nenávistný či\n"
-"se sesxuálně motivovaným obsahem.\n"
-"        <li> Žádné komerční nabídky.\n"
-"        <li> Žádné odkazy na stránky propagující sexuální obsah,\n"
-"hazard či nenávist k druhým.\n"
-"        <li> Žádné příspěvky c cílem urážet či znepřátelovat druhé,\n"
-"            či snažící se o zrušení smyslu diskuze.\n"
-"        <li> Žádné příspěvky, které jsou cíleně urážlivé či nenávistné.\n"
-"        <li> Žádné příspěvky urážející rasu, víru, národnost,\n"
-"pohlaví či sexuální orientaci.\n"
-"        "
+msgstr "\n        <ul>\n        <li> Příspěvky musí být 'vhodné pro děti': nesmí obsahovat\nobsah, který je obscénní, nenávistný či\nse sesxuálně motivovaným obsahem.\n        <li> Žádné komerční nabídky.\n        <li> Žádné odkazy na stránky propagující sexuální obsah,\nhazard či nenávist k druhým.\n        <li> Žádné příspěvky c cílem urážet či znepřátelovat druhé,\n            či snažící se o zrušení smyslu diskuze.\n        <li> Žádné příspěvky, které jsou cíleně urážlivé či nenávist [...]
 
-#: ../inc/forum.inc:780
+#: ../inc/forum.inc:784
 msgid "Rules:"
 msgstr "Pravidla:"
 
-#: ../inc/forum.inc:781
+#: ../inc/forum.inc:785
 msgid "More info"
 msgstr "Více informací"
 
-#: ../inc/forum.inc:1055 ../user/forum_thread.php:189
+#: ../inc/forum.inc:1082 ../user/forum_thread.php:190
 msgid "Unhide"
 msgstr "Odkrýt"
 
-#: ../inc/forum.inc:1055
+#: ../inc/forum.inc:1082
 msgid "Unhide this post"
 msgstr "Odkrýt tento příspěvek"
 
-#: ../inc/forum.inc:1057 ../user/forum_thread.php:195
+#: ../inc/forum.inc:1084 ../user/forum_thread.php:196
 msgid "Hide"
 msgstr "Skrýt"
 
-#: ../inc/forum.inc:1057
+#: ../inc/forum.inc:1084
 msgid "Hide this post"
 msgstr "Skrýt tento příspěvek"
 
-#: ../inc/forum.inc:1062 ../user/forum_thread.php:228
+#: ../inc/forum.inc:1089 ../user/forum_thread.php:229
 msgid "Move"
 msgstr "Přesunout"
 
-#: ../inc/forum.inc:1062
+#: ../inc/forum.inc:1089
 msgid "Move post to a different thread"
 msgstr "Přesunout příspěvek do jiného vlákna"
 
-#: ../inc/forum.inc:1067
+#: ../inc/forum.inc:1094
 msgid "Banish author"
 msgstr "Vykázat autora"
 
-#: ../inc/forum.inc:1074
+#: ../inc/forum.inc:1101
 msgid "Vote to banish author"
 msgstr "Hlasovat pro vykázání autora"
 
-#: ../inc/forum.inc:1078
+#: ../inc/forum.inc:1105
 msgid "Vote not to banish author"
 msgstr "Hlasovat pro nevykázání autora"
 
-#: ../inc/forum.inc:1083
+#: ../inc/forum.inc:1110
 msgid "Start vote to banish author"
 msgstr "Začít hlasovat pro vykázání uživatele"
 
-#: ../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 "Smazat"
+
+#: ../inc/forum.inc:1115
+msgid "Delete this post"
+msgstr "Vymazat tento příspěvek"
+
+#: ../inc/forum.inc:1153
 msgid "Only team members can post to the team message board"
 msgstr "Jen členové týmu mohou přispívat do týmového fóra"
 
-#: ../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 ""
-"Pro vytvoření nového vlákna v %1 musíte mít určité množství kreditu. Toto "
-"omezení slouží jako ochrana proti zneužití systému."
+msgstr "Pro vytvoření nového vlákna v %1 musíte mít určité množství kreditu. Toto omezení slouží jako ochrana proti zneužití systému."
 
-#: ../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 ""
-"Nové vlákno nemůžete vytvořit hned teď. Počkejte prosím chvíli a zkuste to "
-"znova. Tato prodleva byla zavedena proti zneužití systému."
+msgstr "Nové vlákno nemůžete vytvořit hned teď. Počkejte prosím chvíli a zkuste to znova. Tato prodleva byla zavedena proti zneužití systému."
 
-#: ../inc/forum.inc:1140
+#: ../inc/forum.inc:1177
 msgid ""
 "This thread is locked. Only forum moderators and administrators are allowed "
 "to post there."
-msgstr ""
-"Toto vlákno je zamčené, přispívat zde mohou jen moderátoři a administrátoři."
+msgstr "Toto vlákno je zamčené, přispívat zde mohou jen moderátoři a administrátoři."
 
-#: ../inc/forum.inc:1145
+#: ../inc/forum.inc:1182
 msgid "Can't post to a hidden thread."
 msgstr "Nelze posílat příspěvky do schovaného vlákna."
 
-#: ../inc/forum.inc:1173
+#: ../inc/forum.inc:1216
 msgid "Thread"
 msgstr "Vlákno"
 
-#: ../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 "Příspěvky"
 
-#: ../inc/forum.inc:1176 ../user/forum_forum.php:138
+#: ../inc/forum.inc:1219 ../user/forum_forum.php:141
 msgid "Views"
 msgstr "Zobrazení"
 
-#: ../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 "Poslední příspěvek"
 
-#: ../inc/forum.inc:1235
+#: ../inc/forum.inc:1278
 msgid "New posts in the thread %1"
 msgstr "Nové příspěvky ve vláknu %1"
 
-#: ../inc/forum.inc:1240
+#: ../inc/forum.inc:1283
 msgid "New posts in subscribed thread"
 msgstr "Nové příspěvky ve sledovaném vláknu"
 
-#: ../inc/forum.inc:1241
+#: ../inc/forum.inc:1284
 msgid "There are new posts in the thread '%1'"
 msgstr "Ve vláknu jsou nové příspěvky '%1'"
 
-#: ../inc/forum.inc:1251
+#: ../inc/forum.inc:1294
 msgid "Mark all threads as read"
 msgstr "Označit všechna vlákna jako přečtená"
 
-#: ../inc/forum.inc:1252
+#: ../inc/forum.inc:1295
 msgid "Mark all threads in all message boards as read."
 msgstr "Označit všechna vlákna na všech diskuzních fórech jako přečtená."
 
-#: ../inc/host.inc:24
+#: ../inc/host.inc:25
 msgid "No host"
 msgstr "Žádný počítač"
 
-#: ../inc/host.inc:26
+#: ../inc/host.inc:27
 msgid "Unavailable"
 msgstr "Nedostupné"
 
-#: ../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 "Doma"
 
-#: ../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 "V práci"
 
-#: ../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 "Ve škole"
 
-#: ../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 "Aktualizovat"
 
-#: ../inc/host.inc:85
+#: ../inc/host.inc:84
 msgid "Computer information"
 msgstr "Informace o počítači"
 
-#: ../inc/host.inc:89 ../inc/host.inc:94
+#: ../inc/host.inc:88 ../inc/host.inc:93
 msgid "IP address"
 msgstr "IP adresa"
 
-#: ../inc/host.inc:89
+#: ../inc/host.inc:88
 msgid "(same the last %1 times)"
 msgstr "(stejná u posledních %1 připojení)"
 
-#: ../inc/host.inc:91
+#: ../inc/host.inc:90
 msgid "External IP address"
 msgstr "Veřejná IP adresa"
 
-#: ../inc/host.inc:94
+#: ../inc/host.inc:93
 msgid "Show IP address"
 msgstr "Zobrazit IP adresu"
 
-#: ../inc/host.inc:96
+#: ../inc/host.inc:95
 msgid "Domain name"
 msgstr "Název domény"
 
-#: ../inc/host.inc:98
+#: ../inc/host.inc:97
 msgid "Product name"
-msgstr ""
+msgstr "Název produktu"
 
-#: ../inc/host.inc:102
+#: ../inc/host.inc:101
 msgid "Local Standard Time"
 msgstr "Místní čas"
 
-#: ../inc/host.inc:102
+#: ../inc/host.inc:101
 msgid "UTC %1 hours"
 msgstr "UTC %1 hodin"
 
-#: ../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 "Vlastník"
 
-#: ../inc/host.inc:108 ../inc/host.inc:355
+#: ../inc/host.inc:107 ../inc/host.inc:360
 msgid "Anonymous"
 msgstr "Anonymní"
 
-#: ../inc/host.inc:112 ../inc/result.inc:630
+#: ../inc/host.inc:111 ../inc/result.inc:634 ../user/apps.php:56
 msgid "Created"
 msgstr "Vytvořen"
 
-#: ../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 "Celkový kredit"
 
-#: ../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 "Průměrný kredit"
 
-#: ../inc/host.inc:116
+#: ../inc/host.inc:115
 msgid "Cross project credit"
 msgstr "Meziprojektový kredit"
 
-#: ../inc/host.inc:118
+#: ../inc/host.inc:117
 msgid "CPU type"
 msgstr "Typ procesoru"
 
-#: ../inc/host.inc:119
+#: ../inc/host.inc:118
 msgid "Number of processors"
 msgstr "Počet procesorů"
 
-#: ../inc/host.inc:121
+#: ../inc/host.inc:120
 msgid "Coprocessors"
 msgstr "Koprocesory"
 
-#: ../inc/host.inc:123 ../inc/host.inc:687
+#: ../inc/host.inc:122 ../inc/host.inc:692
 msgid "Operating System"
 msgstr "Operační systém"
 
-#: ../inc/host.inc:126 ../inc/host.inc:235
+#: ../inc/host.inc:125 ../inc/host.inc:235
 msgid "BOINC version"
 msgstr "Verze BOINC"
 
-#: ../inc/host.inc:130
+#: ../inc/host.inc:129 ../inc/prefs.inc:237
 msgid "Memory"
 msgstr "Paměť"
 
-#: ../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 "Odkládací prostor"
 
-#: ../inc/host.inc:143
+#: ../inc/host.inc:142
 msgid "Total disk space"
 msgstr "Celkové místo na disku"
 
-#: ../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 "Volné místo na disku"
 
-#: ../inc/host.inc:150
+#: ../inc/host.inc:149
 msgid "Measured floating point speed"
 msgstr "Naměřená rychlost operací v plovoucí řádové čárce"
 
-#: ../inc/host.inc:150 ../inc/host.inc:153
+#: ../inc/host.inc:149 ../inc/host.inc:152
 msgid "%1 million ops/sec"
 msgstr "%1 milionů op/sek"
 
-#: ../inc/host.inc:153
+#: ../inc/host.inc:152
 msgid "Measured integer speed"
 msgstr "Naměřená rychlost celočíselných operací"
 
-#: ../inc/host.inc:157 ../inc/host.inc:159
+#: ../inc/host.inc:156 ../inc/host.inc:158
 msgid "Average upload rate"
 msgstr "Prům. rychlost odesílání"
 
-#: ../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 "Neznámé"
 
-#: ../inc/host.inc:164 ../inc/host.inc:166
+#: ../inc/host.inc:163 ../inc/host.inc:165
 msgid "Average download rate"
 msgstr "Prům. rychlost stahování"
 
-#: ../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 "Průměrný doba pro vrácení zpracované jednotky"
 
-#: ../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 dní"
 
-#: ../inc/host.inc:170
+#: ../inc/host.inc:169
 msgid "Application details"
 msgstr "Detaily aplikace"
 
-#: ../inc/host.inc:171
+#: ../inc/host.inc:170
 msgid "Show"
 msgstr "Zobrazit"
 
-#: ../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 "Úkoly"
 
-#: ../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 "Kolikrát klient kontaktoval server"
 
-#: ../inc/host.inc:186
+#: ../inc/host.inc:185
 msgid "Last time contacted server"
 msgstr "Naposledy kontaktován server"
 
-#: ../inc/host.inc:187
-#, php-format
-msgid "% of time BOINC is running"
-msgstr "% času kdy je BOINC aktivní"
+#: ../inc/host.inc:186
+msgid "Fraction of time BOINC is running"
+msgstr "Podíl času běžícího BOINC"
 
-#: ../inc/host.inc:189
-#, php-format
-msgid "While BOINC running, % of time host has an Internet connection"
-msgstr "% času kdy je dostupné připojení k Internetu z doby, kdy BOINC počítá"
+#: ../inc/host.inc:188
+msgid ""
+"While BOINC is running, fraction of time computer has an Internet connection"
+msgstr "Je-li spuštěn BOINC, zlomek času je počítač připojen k Internetu"
+
+#: ../inc/host.inc:190
+msgid "While BOINC is running, fraction of time computing is allowed"
+msgstr "Je-li spuštěn BOINC, na zlomek času je počítání povoleno"
 
 #: ../inc/host.inc:191
-#, php-format
-msgid "While BOINC running, % of time work is allowed"
-msgstr "% času kdy je povolená práce z doby, kdy BOINC počítá"
+msgid "While is BOINC running, fraction of time GPU computing is allowed"
+msgstr "Je-li spuštěn BOINC, na zlomek času je GPU počítání povoleno"
 
 #: ../inc/host.inc:193
 msgid "Average CPU efficiency"
@@ -746,7 +824,7 @@ msgstr "Průměrná efektivita procesor"
 msgid "Task duration correction factor"
 msgstr "Korekční faktor pro dobu trvání"
 
-#: ../inc/host.inc:198 ../inc/host.inc:674
+#: ../inc/host.inc:198 ../inc/host.inc:679
 msgid "Location"
 msgstr "Umístění"
 
@@ -762,7 +840,7 @@ msgstr "Spojit duplicitní záznamy tohoto počítače"
 msgid "Merge"
 msgstr "Spojit"
 
-#: ../inc/host.inc:207 ../inc/host.inc:689
+#: ../inc/host.inc:207 ../inc/host.inc:694
 msgid "Last contact"
 msgstr "Poslední kontakt"
 
@@ -770,30 +848,30 @@ msgstr "Poslední kontakt"
 msgid "Computer info"
 msgstr "Informace o počítači"
 
-#: ../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 "Pozice"
 
-#: ../inc/host.inc:225 ../inc/host.inc:679
+#: ../inc/host.inc:225 ../inc/host.inc:684
 msgid "Avg. credit"
 msgstr "Průměrný kredit"
 
-#: ../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 "Průměrný kredit uživatele"
 
-#: ../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 "Procesor"
 
-#: ../inc/host.inc:237 ../inc/host.inc:685
+#: ../inc/host.inc:237 ../inc/host.inc:690
 msgid "GPU"
 msgstr "GPU"
 
@@ -801,93 +879,85 @@ msgstr "GPU"
 msgid "Operating system"
 msgstr "Operační systém"
 
-#: ../inc/host.inc:315
+#: ../inc/host.inc:320
 msgid "(%1 processors)"
 msgstr "(%1 procesorů)"
 
-#: ../inc/host.inc:335
+#: ../inc/host.inc:340
 msgid "Details"
 msgstr "Detaily"
 
-#: ../inc/host.inc:340
+#: ../inc/host.inc:345
 msgid "Cross-project stats:"
 msgstr "Statistiky napříč projekty:"
 
-#: ../inc/host.inc:515
+#: ../inc/host.inc:520
 msgid "Host %1 has overlapping lifetime:"
 msgstr "Počítač %1 má překrývající se životnost:"
 
-#: ../inc/host.inc:522
+#: ../inc/host.inc:527
 msgid "Host %1 has an incompatible OS:"
 msgstr "Počítač %1 má nekompatibilní op. systém:"
 
-#: ../inc/host.inc:528
+#: ../inc/host.inc:533
 msgid "Host %1 has an incompatible CPU:"
 msgstr "Počítač  %1 má nekompatibilní procesor:"
 
-#: ../inc/host.inc:595
+#: ../inc/host.inc:600
 msgid "same host"
 msgstr "stejný počítač"
 
-#: ../inc/host.inc:598
+#: ../inc/host.inc:603
 msgid "Can't merge host %1 into %2 - they're incompatible"
 msgstr "Nelze spojit počítač %1 s %2 - nejsou vzájemně kompatibilní"
 
-#: ../inc/host.inc:601
+#: ../inc/host.inc:606
 msgid "Merging host %1 into host %2"
 msgstr "Spojuji počítač %1 s počítačem %2"
 
-#: ../inc/host.inc:618
+#: ../inc/host.inc:623
 msgid "Couldn't update credit of new computer"
 msgstr "Nelze aktualizovat kredit nového počítače"
 
-#: ../inc/host.inc:622
+#: ../inc/host.inc:627
 msgid "Couldn't update results"
 msgstr "Nelze aktualizovat výsledky"
 
-#: ../inc/host.inc:627
+#: ../inc/host.inc:632
 msgid "Couldn't retire old computer"
 msgstr "Nelze vyřadit starý počítač"
 
-#: ../inc/host.inc:629
+#: ../inc/host.inc:634
 msgid "Retired old computer %1"
 msgstr "Vyřazený starý počítač %1"
 
-#: ../inc/host.inc:652 ../inc/host.inc:655
+#: ../inc/host.inc:657 ../inc/host.inc:660
 msgid "Show:"
 msgstr "Zobrazit:"
 
-#: ../inc/host.inc:652 ../inc/host.inc:655
+#: ../inc/host.inc:657 ../inc/host.inc:660
 msgid "All computers"
 msgstr "Všechny počítače"
 
-#: ../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 "Jen počítače aktivní za posledních 30 dnů"
 
-#: ../inc/host.inc:666 ../inc/result.inc:637
+#: ../inc/host.inc:671 ../inc/result.inc:642
 msgid "Computer ID"
 msgstr "ID počítače"
 
-#: ../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 "Jméno"
-
-#: ../inc/host.inc:682
+#: ../inc/host.inc:687
 msgid "BOINC<br>version"
 msgstr "BOINC<br/>verze"
 
-#: ../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 "Spojit počítače podle jména"
 
-#: ../inc/language_names.inc:61
+#: ../inc/language_names.inc:62
 msgid "Browser default"
-msgstr ""
+msgstr "Výchozí prohlížeč"
 
 #: ../inc/news.inc:40
 msgid "Comment"
@@ -898,29 +968,29 @@ msgstr "Komentář"
 msgid "News is available as an %sRSS feed%s"
 msgstr "Novinky jsou dostupné jako %sRSS zprávy%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 "Schránka"
 
-#: ../inc/pm.inc:26 ../inc/pm.inc:178
+#: ../inc/pm.inc:26 ../inc/pm.inc:180
 msgid "Write"
 msgstr "Psát zprávu"
 
-#: ../inc/pm.inc:33 ../inc/user.inc:378
+#: ../inc/pm.inc:33 ../inc/user.inc:458
 msgid "Send private message"
 msgstr "Poslat soukromou zprávu"
 
 #: ../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 "Náhled"
 
-#: ../inc/pm.inc:48 ../user/pm.php:131
+#: ../inc/pm.inc:48 ../user/pm.php:136
 msgid "no such message"
 msgstr "nenalezena žádná zpráva"
 
@@ -932,7 +1002,7 @@ msgstr "Komu"
 msgid "User IDs or unique usernames, separated with commas"
 msgstr "Uživatelská ID nebo unikátní uživatelská jména, oddělená čárkami"
 
-#: ../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 "Předmět"
 
@@ -940,410 +1010,499 @@ msgstr "Předmět"
 msgid "Send message"
 msgstr "Odeslat zprávu"
 
-#: ../inc/pm.inc:121
+#: ../inc/pm.inc:122
 msgid "sent you a private message; subject:"
 msgstr "vám poslal soukromou zprávu. Předmět:"
 
-#: ../inc/pm.inc:127
+#: ../inc/pm.inc:129
 msgid "Private message%1 from %2, subject:"
 msgstr "Soukromá zpráva%1 od %2, předmět:"
 
-#: ../inc/pm.inc:135
+#: ../inc/pm.inc:137
 msgid "Couldn't create message"
 msgstr "Zprávu nelze vytvořit"
 
-#: ../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 ""
-"Není možné posílat tolik soukromých zpráv během tak krátké chvíle. Počkejte "
-"prosím před posláním další zprávy."
+msgstr "Není možné posílat tolik soukromých zpráv během tak krátké chvíle. Počkejte prosím před posláním další zprávy."
 
-#: ../inc/pm.inc:176 ../user/forum_forum.php:186
+#: ../inc/pm.inc:178 ../user/forum_forum.php:190
 msgid "unread"
 msgstr "nepřečtené"
 
-#: ../inc/pm.inc:186
+#: ../inc/pm.inc:188
 msgid "For email notification, %1edit community prefs%2"
 msgstr "Pro zasílání novinek emailem %1upravit komunitní předvolby%2"
 
-#: ../inc/pm.inc:198
+#: ../inc/pm.inc:204
 msgid "Private message"
 msgstr "Soukromá zpráva"
 
-#: ../inc/prefs.inc:77
+#: ../inc/prefs.inc:45 ../inc/prefs.inc:187
+msgid "Usage limits"
+msgstr "Limity využití"
+
+#: ../inc/prefs.inc:47 ../inc/prefs.inc:55
+msgid "Use at most"
+msgstr "Použít nejvýše"
+
+#: ../inc/prefs.inc:49
+#, no-php-format
 msgid ""
-"Suspend work while computer is on battery power? %1 Matters only for "
-"portable computers %2"
-msgstr ""
-"Přerušit práci když běží počítač na baterii? %1 Má smysl jen u přenosných "
-"počítačů %2"
+"Keep some CPUs free for other applications. Example: 75% means use 6 cores "
+"on an 8-core CPU."
+msgstr "Zachovejte některé procesory volné pro jiné aplikace. Příklad: 75% znamená využívat 6 jader na 8-jádrovém procesoru."
 
-#: ../inc/prefs.inc:85
-msgid "Suspend work while computer is in use?"
-msgstr "Přerušit práci, je-li počítač právě používán?"
+#: ../inc/prefs.inc:52
+#, no-php-format
+msgid "% of the CPUs"
+msgstr "% procesorů"
 
-#: ../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 ""
-"Přerušit práci na GPU když je počítač používán? %1 Podporováno od verze "
-"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 "Pozastavení/obnovení počítání každých několik sekund na snížení teploty a energetického využití procesoru. Příklad: 75% znamená počítat 3 sekundy, čekat 1 sekundu a opakovat."
 
-#: ../inc/prefs.inc:99
-msgid "'In use' means mouse/keyboard activity in last"
-msgstr "'Používán' znamená aktivita myši či klávesnice během posledních"
+#: ../inc/prefs.inc:60
+#, no-php-format
+msgid "% of CPU time"
+msgstr "% procesorového času"
 
-#: ../inc/prefs.inc:101 ../inc/prefs.inc:110 ../inc/prefs.inc:144
-msgid "minutes"
-msgstr "minut"
+#: ../inc/prefs.inc:62 ../inc/prefs.inc:208
+msgid "When to suspend"
+msgstr "Kdy pozastavit"
 
-#: ../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 ""
-"Přerušit práci při nulové aktivitě myši či klávesnice během posledních %1 "
-"Vyžadováno pro přechod do režimu spánku u některých počítačů %2"
+#: ../inc/prefs.inc:64
+msgid "Suspend when computer is on battery"
+msgstr "Pozastavit, když počítač běží z baterie"
 
-#: ../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 ""
-"Přerušit práci při zatížení procesoru neBOINC procesy nad %1 0 znamená bez "
-"omezení<br/>Podporováno od verze 6.10.30+ %2"
+"Check this to suspend computing on portables when running on battery power."
+msgstr "Zaškrtněte pro pozastavení počítání na přenosných zařízeních, když jsou napájeny z baterie."
 
-#: ../inc/prefs.inc:122
-msgid "Do work only between the hours of %1 No restriction if equal %2"
-msgstr ""
-"Pracovat pouze mezi hodinami %1 Bez omezení, pokud se hodnoty rovnají %2"
+#: ../inc/prefs.inc:70
+msgid "Suspend when computer is in use"
+msgstr "Pozastavit, když je počítač používán"
 
-#: ../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 ""
-"Ponechat v paměti uspané úkoly? %1 Uspané úkoly budou zabírat místo ve "
-"vyrovnávací paměti pokud 'ano' %2"
+"Check this to suspend computing and file transfers when you're using the "
+"computer."
+msgstr "Zaškrtněte pro pozastavení počítání a přenosu souborů, když je počítač používán."
 
-#: ../inc/prefs.inc:139
-msgid "Switch between tasks every %1 Recommended: 60 minutes %2"
-msgstr "Přepínat mezi aplikacemi každých %1 Doporučeno: 60 minut %2"
+#: ../inc/prefs.inc:76
+msgid "Suspend GPU computing when computer is in use"
+msgstr "Pozastavit GPU výpočty, kdy je počítač používán"
 
-#: ../inc/prefs.inc:147
-msgid "On multiprocessors, use at most"
-msgstr "Na víceprocesorových systémech použít nejvýše"
+#: ../inc/prefs.inc:77
+msgid "Check this to suspend GPU computing when you're using the computer."
+msgstr "Zaškrtněte pro pozastavení GPU výpočtů během používání počítače."
 
-#: ../inc/prefs.inc:149
-msgid "processors"
-msgstr "procesorů"
+#: ../inc/prefs.inc:82
+msgid "'In use' means mouse/keyboard input in last"
+msgstr "\"V provozu\" znamená impuls z myši/klávesnice během"
 
-#: ../inc/prefs.inc:153
-msgid "On multiprocessors, use at most %1 Enforced by version 6.1+ %2"
-msgstr ""
-"Na víceprocesorových systémech použít nejvýše %1 Podporováno od verze 6.1+ %"
-"2"
+#: ../inc/prefs.inc:83
+msgid "This determines when the computer is considered 'in use'."
+msgstr "Určuje, kdy je počítač považován za \"v provozu\"."
 
-#: ../inc/prefs.inc:158
-#, php-format
-msgid "% of the processors"
-msgstr "% procesorů"
+#: ../inc/prefs.inc:85 ../inc/prefs.inc:92 ../inc/prefs.inc:122
+msgid "minutes"
+msgstr "minut"
 
-#: ../inc/prefs.inc:162
-msgid "Use at most %1 Can be used to reduce CPU heat %2"
-msgstr "Využívat nejvýše %1 Lze použít pro snížení tepla procesoru %2"
+#: ../inc/prefs.inc:89
+msgid "Suspend when no mouse/keyboard input in last"
+msgstr "Pozastavit, pokud myš/klávesnice nebyla aktivní během"
 
-#: ../inc/prefs.inc:167
-#, php-format
-msgid "% of CPU time"
-msgstr "% procesorového času"
+#: ../inc/prefs.inc:90
+msgid "This allows some computers to enter low-power mode when not in use."
+msgstr "Toto umožňuje některým počítačům vstoupit do režimu nízké spotřeby, když není používán."
 
-#: ../inc/prefs.inc:175 ../inc/prefs.inc:189
-msgid "Disk: use at most"
-msgstr "Disk: použít nejvýše"
+#: ../inc/prefs.inc:95
+msgid "Suspend when non-BOINC CPU usage is above"
+msgstr "Pozastavit, pokud využití procesoru aplikacemi mimo BOINC je nad"
 
-#: ../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 "Pozastavit výpočty když je váš počítač zaneprázdněn jinými spuštěnými programy."
 
-#: ../inc/prefs.inc:180
-msgid "Disk: leave free at least %1 Values smaller than %2 are ignored %3"
-msgstr "Disk: ponechat volných aspoň %1 Hodnoty menší než %2 jsou ignorované %3"
+#: ../inc/prefs.inc:101
+msgid "Compute only between"
+msgstr "Počítat pouze mezi"
 
-#: ../inc/prefs.inc:191 ../inc/prefs.inc:201 ../inc/prefs.inc:206
-#: ../inc/prefs.inc:211
-#, php-format
-msgid "% of total"
-msgstr "% celkového místa"
+#: ../inc/prefs.inc:102
+msgid "Compute only during a particular period each day."
+msgstr "Počítat pouze během určitého času každý den."
 
-#: ../inc/prefs.inc:194
-msgid "Tasks checkpoint to disk at most every"
-msgstr "Ukládat kontrolní bod na disk nejvýše každých"
+#: ../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 "Ostatní"
 
-#: ../inc/prefs.inc:196
-msgid "seconds"
-msgstr "vteřin"
+#: ../inc/prefs.inc:107
+msgid "Store at least"
+msgstr "Ukládat aspoň"
 
-#: ../inc/prefs.inc:199
-msgid "Swap space: use at most"
-msgstr "Odkládací paměť: využívat nejvýše"
+#: ../inc/prefs.inc:108
+msgid "Store at least enough tasks to keep the computer busy for this long."
+msgstr "Zásoba aspoň na tolik úkolů aby počítač běžel takovou dobu."
 
-#: ../inc/prefs.inc:204
-msgid "Memory: when computer is in use, use at most"
-msgstr "Paměť: je-li počítač používán, použít nejvýše"
+#: ../inc/prefs.inc:110 ../inc/prefs.inc:116
+msgid "days of work"
+msgstr "dnů práce"
 
-#: ../inc/prefs.inc:209
-msgid "Memory: when computer is not in use, use at most"
-msgstr "Paměť: není-li počítač používán, použít nejvýše"
+#: ../inc/prefs.inc:113
+msgid "Store up to an additional"
+msgstr "Zásobovat až do další"
 
-#: ../inc/prefs.inc:218
-msgid "Maintain enough tasks to keep busy for at least%1(max 10 days).%2"
-msgstr "Zajistit dostatek práce aspoň na %1(max 10 dní).%2"
+#: ../inc/prefs.inc:114
+msgid ""
+"Store additional tasks above the minimum level.  Determines how much work is"
+" requested when contacting a project."
+msgstr "Uložit další úkoly nad minimální úroveň. Určuje, kolik práce je požadováno při kontaktování projektu."
 
-#: ../inc/prefs.inc:223 ../inc/prefs.inc:228 ../inc/prefs.inc:270
-#: ../inc/util.inc:274
-msgid "days"
-msgstr "dní"
+#: ../inc/prefs.inc:119
+msgid "Switch between tasks about every"
+msgstr "Přepínat mezi úkoly každých"
 
-#: ../inc/prefs.inc:226
-msgid "... and up to an additional"
-msgstr "... a až na dalších"
+#: ../inc/prefs.inc:120
+msgid "If you run several projects, BOINC may switch between them this often."
+msgstr "Pokud počítáte několik projektů, BOINC mezi nimi může přepínat s těmito intervaly."
 
-#: ../inc/prefs.inc:232
-msgid ""
-"Confirm before connecting to Internet? %1 Matters only if you have a modem, "
-"ISDN or VPN connection %2"
-msgstr ""
-"Zobrazit dotaz před připojením k Internetu? %1 Má smysl jen u připojení přes "
-"modem, ISDN či VPN %2"
+#: ../inc/prefs.inc:125
+msgid "Request tasks to checkpoint at most every"
+msgstr "Požádat úkoly o kontrolní bod nanejvýš každých"
 
-#: ../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 ""
-"Odpojit po ukončení komunikace? %1 Má smysl jen při u připojení přes modem, "
-"ISDN či VPN %2"
-
-#: ../inc/prefs.inc:249
-msgid "Maximum download rate:"
-msgstr "Max. rychlost stahování:"
+"This controls how often tasks save their state to disk, so that they can be "
+"restarted later."
+msgstr "Tato možnost určuje, jak často úkoly ukládají svůj stav na disk, takže mohou být restartovány později."
 
-#: ../inc/prefs.inc:251 ../inc/prefs.inc:256
-msgid "Kbytes/sec"
-msgstr "KB/s"
+#: ../inc/prefs.inc:128
+msgid "seconds"
+msgstr "vteřin"
 
-#: ../inc/prefs.inc:254
-msgid "Maximum upload rate:"
-msgstr "Max. rychlost odesílání:"
+#: ../inc/prefs.inc:136 ../inc/prefs.inc:148
+msgid "Use no more than"
+msgstr "Nepoužívat více než"
 
-#: ../inc/prefs.inc:259
-msgid "Use network only between the hours of"
-msgstr "Povolit přístup k Internetu pouze v těchto hodinách"
+#: ../inc/prefs.inc:137
+msgid "Limit the total amount of disk space used by BOINC."
+msgstr "Omezit celkovou hodnotu místa na disku, kterou BOINC používá."
 
-#: ../inc/prefs.inc:263
-msgid "Transfer at most %1 Enforced by version 6.10.46+ %2"
-msgstr "Přenést nejvýše %1 Podporováno od verze 6.10.46+ %2"
+#: ../inc/prefs.inc:139
+msgid "GB"
+msgstr "GB"
 
-#: ../inc/prefs.inc:269
-msgid "Mbytes every"
-msgstr "MB každých"
+#: ../inc/prefs.inc:142
+msgid "Leave at least"
+msgstr "Ponechat aspoň"
 
-#: ../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 ""
-"Přeskočit kontrolou obrázků? %1 Zaškrtněte POUZE pokud váš poskytovatel "
-"upravuje soubory s obrázky (dělá to např. UMTS). %2 Vynechání kontroly "
-"snižuje bezpečnost BOINCu. %3"
+"Limit disk usage to leave this much free space on the volume where BOINC "
+"stores data."
+msgstr "Omezení využití místa na disku. Ponechání takového volného místa na svazku, kde BOINC ukládá data."
 
-#: ../inc/prefs.inc:287
+#: ../inc/prefs.inc:145
+msgid "GB free"
+msgstr "GB volného místa"
+
+#: ../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 ""
-"Podíl prostředků %1 Určuje podíl přostředků Vašeho počítače pro tento "
-"projekt. Příklad: pokud se podílíte ve dvou BOINC projektech s podílem 100 a "
-"200, první bude mít k dispozici 1/3 a druhý 2/3 prostředků počítače. %2"
+"Limit the percentage of disk space used by BOINC on the volume where it "
+"stores data."
+msgstr "Omezte procento využití disku používaného programem BOINC na svazku, kde ukládá data."
 
-#: ../inc/prefs.inc:298
-msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
-msgstr ""
-"Urychlit výpočty pomocí GPU přiřazením jednoho procesoru ke každému úkolu?"
+#: ../inc/prefs.inc:152
+#, no-php-format
+msgid "% of total"
+msgstr "% celkového místa"
 
-#: ../inc/prefs.inc:308
-msgid "Use CPU %1 Enforced by version 6.10+ %2"
-msgstr "Používat procesor %1 Podporováno od verze 6.10+ %2"
+#: ../inc/prefs.inc:158
+msgid "When computer is in use, use at most"
+msgstr "V případě, že je počítač používán, využít maximálně"
 
-#: ../inc/prefs.inc:320
-msgid "Use ATI GPU %1 Enforced by version 6.10+ %2"
-msgstr "Používat AMD GPU %1 Podporováno od verze 6.10+ %2"
+#: ../inc/prefs.inc:159
+msgid "Limit the memory used by BOINC when you're using the computer."
+msgstr "Omezte paměť, kterou může BOINC použít, když používáte počítač."
 
-#: ../inc/prefs.inc:332
-msgid "Use NVIDIA GPU %1 Enforced by version 6.10+ %2"
-msgstr "Používat nVidia GPU %1 Podporováno od verze 6.10+ %2"
+#: ../inc/prefs.inc:162 ../inc/prefs.inc:169 ../inc/prefs.inc:182
+#, no-php-format
+msgid "%"
+msgstr "%"
 
-#: ../inc/prefs.inc:344
-#, fuzzy
-msgid "Use Intel GPU %1 Enforced by version 7.2+ %2"
-msgstr "Používat AMD GPU %1 Podporováno od verze 6.10+ %2"
+#: ../inc/prefs.inc:165
+msgid "When computer is not in use, use at most"
+msgstr "Když počítač není používán, využít maximálně"
 
-#: ../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 ""
-"Povolit běh testovacích aplikací? %1 Povolením pomůžete vyvíjet a lépe "
-"testovat aplikace, ale také to může způsobovat občasné selhání výpočtu na "
-"vašem počítači %2"
+#: ../inc/prefs.inc:166
+msgid "Limit the memory used by BOINC when you're not using the computer."
+msgstr "Omezte paměť, kterou může BOINC použít, když nevyužíváte počítač."
+
+#: ../inc/prefs.inc:172
+msgid "Leave non-GPU tasks in memory while suspended"
+msgstr "Ponechat úkoly nepoužívající GPU v paměti, když jsou výpočty pozastaveny"
 
-#: ../inc/prefs.inc:367
+#: ../inc/prefs.inc:173
 msgid ""
-"Emails will be sent from %1; make sure your spam filter accepts this address."
-msgstr ""
-"Emaily budou zasílané z adresy %1, ujistěte se, že Vám tuto adresu "
-"nezachytává spam filtr."
+"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 "Je-li políčko zaškrtnuto, pozastavené úlohy zůstanou v paměti a pokračování nebude znamenat žádnou ztrátu spočítané práce. Pokud políčko není zaškrtnuto, pozastavené úlohy jsou odstraněny z paměti a budou pokračovat od posledního kontrolního bodu."
 
-#: ../inc/prefs.inc:374
-msgid "Is it OK for %1 and your team (if any) to email you?"
-msgstr "Může Vám %1 či Váš tým zasílat občasné emaily?"
+#: ../inc/prefs.inc:178
+msgid "Page/swap file: use at most"
+msgstr "Stránkovací/odkládací soubor: použít maximálně"
 
-#: ../inc/prefs.inc:380
-msgid "Should %1 show your computers on its web site?"
-msgstr "Má %1 zobrazovat vaše počítače na svých stránkách?"
+#: ../inc/prefs.inc:179
+msgid "Limit the swap space (page file) used by BOINC."
+msgstr "Omezte odkládací prostor (stránkovací soubor) použitý pro BOINC."
 
-#: ../inc/prefs.inc:387
-msgid "Disk and memory usage"
-msgstr "Využití disku a paměti"
+#: ../inc/prefs.inc:189
+msgid "Limit download rate to"
+msgstr "Omezit rychlost stahování na"
 
-#: ../inc/prefs.inc:388
-msgid "Processor usage"
-msgstr "Využití procesoru"
+#: ../inc/prefs.inc:190
+msgid "Limit the download rate of file transfers."
+msgstr "Omezte rychlost stahování souborů."
 
-#: ../inc/prefs.inc:389
-msgid "Network usage"
-msgstr "Využití Internetu"
+#: ../inc/prefs.inc:192 ../inc/prefs.inc:198
+msgid "KB/second"
+msgstr "KB za sekundu"
 
-#: ../inc/prefs.inc:392
-msgid ""
-"These preferences apply to all the BOINC projects in which you participate."
-msgstr ""
-"Tyto předvolby se vztahují na všechny BOINC projekty ve kterých se podílíte."
+#: ../inc/prefs.inc:195
+msgid "Limit upload rate to"
+msgstr "Omezit rychlost uploadu na"
 
-#: ../inc/prefs.inc:395
-msgid ""
-"%1Unable to update preferences.%2 The values marked in red below were out of "
-"range or not numeric."
-msgstr ""
-"%1Nelze upravit předvolby.%2 Hodnoty označené červeně jsou mimo platný "
-"rozsah a nebo nejsou číselné."
+#: ../inc/prefs.inc:196
+msgid "Limit the upload rate of file transfers."
+msgstr "Omezte rychlost odesílání souborů."
 
-#: ../inc/prefs.inc:445
-msgid "bad venue: %1"
-msgstr "špatné místo: %1"
+#: ../inc/prefs.inc:201
+msgid "Limit usage to"
+msgstr "Omezit využití na"
 
-#: ../inc/prefs.inc:451
-msgid "bad subset: %1"
-msgstr "špatný rozsah: %1"
+#: ../inc/prefs.inc:202
+msgid "Example: BOINC should transfer at most 2000 MB of data every 30 days."
+msgstr "Příklad: BOINC může přenést maximálně 2000 MB dat každých 30 dní."
 
-#: ../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 "ano"
+#: ../inc/prefs.inc:205
+msgid "MB every"
+msgstr "MB každých"
 
-#: ../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 "ne"
+#: ../inc/prefs.inc:206 ../inc/util.inc:303
+msgid "days"
+msgstr "dní"
 
-#: ../inc/prefs.inc:679 ../user/forum_search.php:53
-msgid "no limit"
-msgstr "bez omezení"
+#: ../inc/prefs.inc:210
+msgid "Transfer files only between"
+msgstr "Přenášet soubory pouze mezi"
 
-#: ../inc/prefs.inc:704 ../user/team_admins.php:79
-msgid "Add"
-msgstr "Přidat"
+#: ../inc/prefs.inc:211
+msgid "Transfer files only during a particular period each day."
+msgstr "Přenos souborů pouze během určitého časového období každý den."
 
-#: ../inc/prefs.inc:706 ../inc/prefs.inc:834
-#: ../user/edit_forum_preferences_form.php:160 ../user/team_admins.php:34
-msgid "Remove"
-msgstr "Odebrat"
+#: ../inc/prefs.inc:216
+msgid "Skip data verification for image files"
+msgstr "Přeskočit ověřování dat pro obrazové soubory"
+
+#: ../inc/prefs.inc:217
+msgid ""
+"Check this only if your Internet provider modifies image files. Skipping "
+"verification reduces the security of BOINC."
+msgstr "Zaškrtněte pouze v případě, že váš poskytovatel Internetu upravuje soubory obrázků. Přeskočení ověřování snižuje bezpečnost BOINC."
 
-#: ../inc/prefs.inc:812 ../user/explain_state.php:94
+#: ../inc/prefs.inc:222
+msgid "Confirm before connecting to Internet"
+msgstr "Potvrdit před připojením k Internetu"
+
+#: ../inc/prefs.inc:223 ../inc/prefs.inc:229
+msgid "Useful only if you have a modem, ISDN or VPN connection."
+msgstr "Užitečné pouze v případě že máte modem, ISDN nebo VPN připojení."
+
+#: ../inc/prefs.inc:228
+msgid "Disconnect when done"
+msgstr "Odpojit po ukončení komunikace"
+
+#: ../inc/prefs.inc:235 ../inc/prefs.inc:472 ../user/explain_state.php:94
 msgid "Computing"
 msgstr "Počítání"
 
-#: ../inc/prefs.inc:823
+#: ../inc/prefs.inc:236
+msgid "Disk"
+msgstr "Disk"
+
+#: ../inc/prefs.inc:238
+msgid "Network"
+msgstr "Síť"
+
+#: ../inc/prefs.inc:241
+msgid ""
+"These preferences apply to all the BOINC projects in which you participate."
+msgstr "Tyto předvolby se vztahují na všechny BOINC projekty ve kterých se podílíte."
+
+#: ../inc/prefs.inc:244
+msgid ""
+"%1Unable to update preferences.%2 The values marked in red below were out of"
+" range or not numeric."
+msgstr "%1Nelze upravit předvolby.%2 Hodnoty označené červeně jsou mimo platný rozsah a nebo nejsou číselné."
+
+#: ../inc/prefs.inc:483
 msgid "Separate preferences for %1"
 msgstr "Vlastní předvolby pro %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 "Upravit předvolby"
 
-#: ../inc/prefs.inc:839
+#: ../inc/prefs.inc:494 ../user/edit_forum_preferences_form.php:149
+#: ../user/team_admins.php:36
+msgid "Remove"
+msgstr "Odebrat"
+
+#: ../inc/prefs.inc:499
 msgid "Add separate preferences for %1"
 msgstr "Přidat oddělené předvolby pro %1"
 
-#: ../inc/prefs.inc:847 ../inc/prefs.inc:895
-msgid "(Switch View)"
-msgstr "(Přepnout vzhled)"
+#: ../inc/prefs.inc:506
+msgid "These settings apply to all computers using this account except"
+msgstr "Toto nastavení platí pro všechny počítače používající tento účet s výjimkou"
+
+#: ../inc/prefs.inc:508
+msgid ""
+"computers where you have set preferences locally using the BOINC Manager"
+msgstr "počítače, kde jste nastavili předvolby lokálně pomocí správce BOINC"
 
-#: ../inc/prefs.inc:849 ../inc/prefs.inc:898
+#: ../inc/prefs.inc:510
+msgid "Android devices"
+msgstr "Zařízení se systémem Android"
+
+#: ../inc/prefs.inc:513
+msgid "(Switch view)"
+msgstr "(Přepnout zobrazení)"
+
+#: ../inc/prefs.inc:515 ../inc/prefs_project.inc:272
 msgid "Combined preferences"
 msgstr "Společné předvolby"
 
-#: ../inc/prefs.inc:854
-msgid "Project specific settings"
-msgstr "Specifické nastavení projektu"
+#: ../inc/prefs.inc:522 ../inc/prefs_project.inc:283
+msgid "Primary (default) preferences"
+msgstr "Primární (výchozí) předvolby"
+
+#: ../inc/prefs.inc:537
+msgid "Preferences last modified:"
+msgstr "Předvolby naposledy upraveny:"
+
+#: ../inc/prefs.inc:553
+msgid "Add preferences"
+msgstr "Přidat předvolby"
+
+#: ../inc/prefs.inc:557
+msgid "Update preferences"
+msgstr "Aktualizovat předvolby"
+
+#: ../inc/prefs.inc:628 ../project.sample/project_specific_prefs.inc:84
+#: ../project.sample/project_specific_prefs.inc:224
+msgid "yes"
+msgstr "ano"
+
+#: ../inc/prefs.inc:630 ../project.sample/project_specific_prefs.inc:86
+#: ../project.sample/project_specific_prefs.inc:224
+msgid "no"
+msgstr "ne"
+
+#: ../inc/prefs.inc:638
+msgid "Default computer location"
+msgstr "Výchozí umístění počítače"
+
+#: ../inc/prefs.inc:639
+msgid ""
+"New computers will use this location for computing and project preferences."
+msgstr "Nové počítače použijí toto umístění pro výpočty a předvolby projektu."
+
+#: ../inc/prefs_project.inc:52
+msgid "Resource share"
+msgstr "Rozdělení práce"
+
+#: ../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 "Určuje podíl zdrojů vašeho počítače přidělených na tento projekt. Například pokud se účastníte dvou BOINC projektů s podíly zdrojů 100 a 200, první dostane 1/3 a druhý 2/3."
+
+#: ../inc/prefs_project.inc:61
+msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
+msgstr "Urychlit výpočty pomocí GPU přiřazením jednoho procesoru ke každému úkolu?"
+
+#: ../inc/prefs_project.inc:70
+msgid "Use CPU"
+msgstr "Použít procesor"
+
+#: ../inc/prefs_project.inc:79
+msgid "Use ATI GPU"
+msgstr "Použít ATI GPU"
+
+#: ../inc/prefs_project.inc:88
+msgid "Use NVIDIA GPU"
+msgstr "Použít NVIDIA GPU"
 
-#: ../inc/prefs.inc:862 ../inc/prefs.inc:907
-msgid "Primary (default) preferences"
-msgstr "Primární (výchozí) předvolby"
+#: ../inc/prefs_project.inc:97
+msgid "Use Intel GPU"
+msgstr "Použít Intel GPU"
 
-#: ../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 "Upravit %1 předvolby"
+#: ../inc/prefs_project.inc:107
+msgid "Run test applications?"
+msgstr "Povolit testovací aplikace?"
 
-#: ../inc/prefs.inc:885
-msgid "These apply to all BOINC projects in which you participate."
-msgstr ""
+#: ../inc/prefs_project.inc:108
+msgid ""
+"This helps us develop applications, but may cause jobs to fail on your "
+"computer"
+msgstr "Toto nám pomáhá vyvíjet aplikace, ale může způsobit pády úloh během výpočtu"
 
-#: ../inc/prefs.inc:887
+#: ../inc/prefs_project.inc:115
 msgid ""
-"On computers participating in multiple projects, the most recently modified "
-"preferences will be used."
-msgstr ""
+"Emails will be sent from %1; make sure your spam filter accepts this "
+"address."
+msgstr "Emaily budou zasílané z adresy %1, ujistěte se, že Vám tuto adresu nezachytává spam filtr."
 
-#: ../inc/prefs.inc:889
-msgid "These preferences do not apply to Android devices."
-msgstr ""
+#: ../inc/prefs_project.inc:123
+msgid "Is it OK for %1 and your team (if any) to email you?"
+msgstr "Může Vám %1 či Váš tým zasílat občasné emaily?"
 
-#: ../inc/prefs.inc:892
-msgid "Preferences last modified:"
-msgstr "Předvolby naposledy upraveny:"
+#: ../inc/prefs_project.inc:130
+msgid "Should %1 show your computers on its web site?"
+msgstr "Má %1 zobrazovat vaše počítače na svých stránkách?"
 
-#: ../inc/prefs.inc:944
-msgid "Add preferences"
-msgstr "Přidat předvolby"
+#: ../inc/prefs_project.inc:270
+msgid "(Switch View)"
+msgstr "(Přepnout vzhled)"
 
-#: ../inc/prefs.inc:948
-msgid "Update preferences"
-msgstr "Aktualizovat předvolby"
+#: ../inc/prefs_project.inc:276
+msgid "Project specific settings"
+msgstr "Specifické nastavení projektu"
 
-#: ../inc/prefs.inc:1036 ../inc/prefs.inc:1045
-msgid "Default computer location"
-msgstr "Výchozí umístění počítače"
+#: ../inc/prefs_util.inc:33
+msgid "bad venue: %1"
+msgstr "špatné místo: %1"
 
-#: ../inc/prefs_util.inc:305 ../inc/prefs_util.inc:315
+#: ../inc/prefs_util.inc:39
+msgid "bad subset: %1"
+msgstr "špatný rozsah: %1"
+
+#: ../inc/prefs_util.inc:476 ../inc/prefs_util.inc:500
 msgid "and"
 msgstr "a"
 
@@ -1351,19 +1510,15 @@ msgstr "a"
 msgid ""
 "Your profile will be made visible to other people as soon as it has been "
 "approved by the project. This may take up to a few days."
-msgstr ""
-"Váš profil bude viditelný pro ostatní po schválení projektem, to může trvat "
-"pár dní."
+msgstr "Váš profil bude viditelný pro ostatní po schválení projektem, to může trvat pár dní."
 
 #: ../inc/profile.inc:92
 msgid ""
 "Your profile has been marked as unacceptable. It is not visible to other "
 "people. Please change it."
-msgstr ""
-"Váš profil byl označen jako závadný - momentálně není viditelný pro ostatní "
-"uživatele. Prosím upravte si jej."
+msgstr "Váš profil byl označen jako závadný - momentálně není viditelný pro ostatní uživatele. Prosím upravte si jej."
 
-#: ../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 "Chyba databáze"
 
@@ -1371,10 +1526,7 @@ msgstr "Chyba databáze"
 msgid ""
 "To prevent spam, profiles of users with an average credit of less than %1 "
 "are displayed only to logged-in users. We apologize for this inconvenience."
-msgstr ""
-"Abychom předcházeli spamu, jsou profily uživatelů s průměrným kreditem "
-"menším než %1 viditelné jen přihlášenými uživateli. Omlouváme se za tuto "
-"nepřijemnost."
+msgstr "Abychom předcházeli spamu, jsou profily uživatelů s průměrným kreditem menším než %1 viditelné jen přihlášenými uživateli. Omlouváme se za tuto nepřijemnost."
 
 #: ../inc/profile.inc:197
 msgid "User is banished"
@@ -1384,7 +1536,7 @@ msgstr "Uživatel je vykázán"
 msgid "No profile exists for that user ID."
 msgstr "Pro dané ID neexistuje žádný uživatelský profil."
 
-#: ../inc/profile.inc:219 ../user/create_profile.php:313
+#: ../inc/profile.inc:219 ../user/create_profile.php:309
 msgid "Edit your profile"
 msgstr "Upravit váš profil"
 
@@ -1422,7 +1574,7 @@ msgstr "AMD GPU"
 
 #: ../inc/result.inc:57 ../user/host_app_versions.php:28
 msgid "Intel GPU"
-msgstr ""
+msgstr "Intel GPU"
 
 #: ../inc/result.inc:65
 msgid "Not in DB"
@@ -1432,11 +1584,12 @@ msgstr "Není v DB"
 msgid "pending"
 msgstr "nevyřízené"
 
-#: ../inc/result.inc:114 ../user/forum_search.php:60
+#: ../inc/result.inc:114 ../user/forum_search.php:62
 msgid "All"
 msgstr "Všechny"
 
 #: ../inc/result.inc:115 ../inc/result.inc:176 ../inc/result.inc:223
+#: ../user/server_status.php:163
 msgid "In progress"
 msgstr "Zpracováváno"
 
@@ -1465,6 +1618,7 @@ msgid "Inactive"
 msgstr "Neaktivní"
 
 #: ../inc/result.inc:175 ../inc/result.inc:222 ../user/explain_state.php:37
+#: ../user/server_status.php:163
 msgid "Unsent"
 msgstr "Neodeslané"
 
@@ -1629,130 +1783,137 @@ msgid "WU cancelled"
 msgstr "Pracovní jednotka zrušena"
 
 #: ../inc/result.inc:322
+msgid "Canonical result is missing"
+msgstr "Chybí kanonický výsledek"
+
+#: ../inc/result.inc:326
 msgid "Unrecognized Error: %1"
 msgstr "Neznámá chyba: %1"
 
-#: ../inc/result.inc:349
+#: ../inc/result.inc:353
 msgid "Task name"
 msgstr "Název úkolu"
 
-#: ../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 "klikněte pro detaily"
 
-#: ../inc/result.inc:349
+#: ../inc/result.inc:353
 msgid "Show IDs"
 msgstr "Zobrazit ID"
 
-#: ../inc/result.inc:354
+#: ../inc/result.inc:358
 msgid "Show names"
 msgstr "Zobrazit názvy"
 
-#: ../inc/result.inc:357
+#: ../inc/result.inc:361
 msgid "Task"
 msgstr "Úkol"
 
-#: ../inc/result.inc:360
+#: ../inc/result.inc:364
 msgid "Work unit"
 msgstr "Pracovní jednotka"
 
-#: ../inc/result.inc:369
+#: ../inc/result.inc:373
 msgid "Computer"
 msgstr "Počítač"
 
-#: ../inc/result.inc:372 ../inc/result.inc:631
+#: ../inc/result.inc:376 ../inc/result.inc:635
 msgid "Sent"
 msgstr "Odesláno"
 
-#: ../inc/result.inc:373
+#: ../inc/result.inc:377
 msgid "Time reported<br />or deadline"
 msgstr "Čas nahlášení<br/>nebo lhůta pro dokončení"
 
-#: ../inc/result.inc:374
+#: ../inc/result.inc:378
 msgid "explain"
 msgstr "vysvětlení"
 
-#: ../inc/result.inc:376 ../user/server_status.php:241
+#: ../inc/result.inc:380 ../user/server_status.php:113
 msgid "Status"
 msgstr "Stav"
 
-#: ../inc/result.inc:377
+#: ../inc/result.inc:381
 msgid "Run time<br />(sec)"
 msgstr "Čas běhu<br/>(sek)"
 
-#: ../inc/result.inc:378
+#: ../inc/result.inc:382
 msgid "CPU time<br />(sec)"
 msgstr "Procesorový čas<br/>(sek)"
 
-#: ../inc/result.inc:379 ../inc/result.inc:642
+#: ../inc/result.inc:383 ../inc/result.inc:646
 msgid "Credit"
 msgstr "Kredit"
 
-#: ../inc/result.inc:380 ../inc/result.inc:724
+#: ../inc/result.inc:384 ../inc/result.inc:746 ../user/server_status.php:163
 msgid "Application"
 msgstr "Aplikace"
 
-#: ../inc/result.inc:629
+#: ../inc/result.inc:633
 msgid "Workunit"
 msgstr "Pracovní jednotka"
 
-#: ../inc/result.inc:632
+#: ../inc/result.inc:636
+msgid "Report deadline"
+msgstr "Lhůta pro odevzdání"
+
+#: ../inc/result.inc:637
 msgid "Received"
 msgstr "Přijato"
 
-#: ../inc/result.inc:633
+#: ../inc/result.inc:638
 msgid "Server state"
 msgstr "Stav serveru"
 
-#: ../inc/result.inc:634
+#: ../inc/result.inc:639
 msgid "Outcome"
 msgstr "Výsledek"
 
-#: ../inc/result.inc:635
+#: ../inc/result.inc:640
 msgid "Client state"
 msgstr "Stav klienta"
 
-#: ../inc/result.inc:636
+#: ../inc/result.inc:641
 msgid "Exit status"
 msgstr "Stav ukončení"
 
-#: ../inc/result.inc:638
-msgid "Report deadline"
-msgstr "Lhůta pro odevzdání"
-
-#: ../inc/result.inc:639
+#: ../inc/result.inc:643
 msgid "Run time"
 msgstr "Čas běhu"
 
-#: ../inc/result.inc:640
+#: ../inc/result.inc:644
 msgid "CPU time"
 msgstr "Procesorový čas"
 
-#: ../inc/result.inc:641
+#: ../inc/result.inc:645
 msgid "Validate state"
 msgstr "Stav validace"
 
-#: ../inc/result.inc:643
+#: ../inc/result.inc:647
+msgid "Device peak FLOPS"
+msgstr "Maximální FLOPS zařízení"
+
+#: ../inc/result.inc:648
 msgid "Application version"
 msgstr "Verze aplikace"
 
-#: ../inc/result.inc:656
+#: ../inc/result.inc:673
 msgid "Output files"
 msgstr "Výstupní soubory"
 
-#: ../inc/result.inc:659
+#: ../inc/result.inc:676
 msgid "Stderr output"
 msgstr "Výstup stderr"
 
-#: ../inc/result.inc:706
+#: ../inc/result.inc:728
 msgid "State"
 msgstr "Stav"
 
-#: ../inc/result.inc:747
-#, fuzzy
+#: ../inc/result.inc:769
 msgid "Task name:"
-msgstr "Název úkolu"
+msgstr "Název úkolu:"
 
 #: ../inc/team.inc:40
 msgid "Search criteria (use one or more)"
@@ -1766,17 +1927,7 @@ msgstr "Klíčová slova"
 msgid "Find teams with these words in their names or descriptions"
 msgstr "Hledat týmy s těmito slovy v názvu nebo popisu"
 
-#: ../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 "Země"
-
-#: ../inc/team.inc:49 ../inc/team.inc:453
+#: ../inc/team.inc:49 ../inc/team.inc:468
 msgid "Type of team"
 msgstr "Typ týmu"
 
@@ -1784,7 +1935,7 @@ msgstr "Typ týmu"
 msgid "Show only active teams"
 msgstr "Zobrazit pouze aktivní týmy"
 
-#: ../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 "Hledat"
 
@@ -1804,8 +1955,8 @@ msgstr "Požadováno vámi"
 msgid "founder response deadline is %1"
 msgstr "lhůta na odpověď vlastníka je %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 "Žádná"
 
@@ -1821,497 +1972,477 @@ msgstr "Odložené"
 msgid "Team info"
 msgstr "Informace o týmu"
 
-#: ../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 "Popis"
 
-#: ../inc/team.inc:97
+#: ../inc/team.inc:101
 msgid "Web site"
 msgstr "Webové stránky"
 
-#: ../inc/team.inc:120
+#: ../inc/team.inc:127
 msgid "Cross-project stats"
 msgstr "Meziprojektové statistiky"
 
-#: ../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 "Diskuzní 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 "Vlákna"
 
-#: ../inc/team.inc:136
+#: ../inc/team.inc:143
 msgid "Join this team"
 msgstr "Připojit se k tomuto týmu"
 
-#: ../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 ""
-"Poznámka: pokud máte v předvolbách projektu 'OK u emailu', připojením k týmu "
-"poskytnete jeho vlastníkovi přístup k vaší emailové adrese."
+msgstr "Poznámka: pokud máte v předvolbách projektu 'OK u emailu', připojením k týmu poskytnete jeho vlastníkovi přístup k vaší emailové adrese."
 
-#: ../inc/team.inc:140
+#: ../inc/team.inc:147
 msgid "Not accepting new members"
 msgstr "Nepřijímá nové členy"
 
-#: ../inc/team.inc:147
+#: ../inc/team.inc:154
 msgid "Foundership change requested"
 msgstr "Požádáno o změnu vlastnictví"
 
-#: ../inc/team.inc:148
+#: ../inc/team.inc:155
 msgid "Respond by %1"
 msgstr "Odpověď od %1"
 
-#: ../inc/team.inc:152
+#: ../inc/team.inc:159
 msgid "Team foundership change"
 msgstr "Změna vlastníka týmu"
 
-#: ../inc/team.inc:156 ../inc/team.inc:359
+#: ../inc/team.inc:163 ../inc/team.inc:368
 msgid "Members"
 msgstr "Členové"
 
-#: ../inc/team.inc:157 ../inc/team.inc:254
+#: ../inc/team.inc:164 ../inc/team.inc:263
 msgid "Founder"
 msgstr "Vlastník"
 
-#: ../inc/team.inc:169
+#: ../inc/team.inc:178
 msgid "Admins"
 msgstr "Administrátoři"
 
-#: ../inc/team.inc:184
+#: ../inc/team.inc:193
 msgid "New members in last day"
 msgstr "Noví členové za poslední den"
 
-#: ../inc/team.inc:185
+#: ../inc/team.inc:194
 msgid "Total members"
 msgstr "Celkem členů"
 
-#: ../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 "zobrazit"
 
-#: ../inc/team.inc:186
+#: ../inc/team.inc:195
 msgid "Active members"
 msgstr "Aktivní členové"
 
-#: ../inc/team.inc:187
+#: ../inc/team.inc:196
 msgid "Members with credit"
 msgstr "Členové s kreditem"
 
-#: ../inc/team.inc:256
+#: ../inc/team.inc:265
 msgid "Admin"
 msgstr "Administrátor"
 
-#: ../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 "Předchozí %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 "Další %1"
 
-#: ../inc/team.inc:289
+#: ../inc/team.inc:298
 msgid "No such team."
 msgstr "Takový tým neexistije."
 
-#: ../inc/team.inc:302
+#: ../inc/team.inc:311
 msgid "This operation requires foundership."
 msgstr "Tuto operaci může provádět jen vlastník."
 
-#: ../inc/team.inc:326
+#: ../inc/team.inc:335
 msgid "This operation requires team admin privileges"
 msgstr "Tuto operaci může provést jen administrátor týmu"
 
-#: ../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 ""
-"VAROVÁNÍ: toto je globální BOINC tým. Změny zanesené zde budou brzy "
-"přepsány. Upravte namísto toho přímo %1globální BOINC tým%2."
+"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 "VAROVÁNÍ: toto je globální BOINC tým. Změny zanesené zde budou brzy přepsány. Upravte namísto toho přímo %1globální BOINC tým%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 ""
-"%1Poznámka k soukromí%2: pokud založíte tým, vaše projektové předvolby "
-"(podíl prostředků, nastavení grafiky) budou veřejně viditelné."
+msgstr "%1Poznámka k soukromí%2: pokud založíte tým, vaše projektové předvolby (podíl prostředků, nastavení grafiky) budou veřejně viditelné."
 
-#: ../inc/team.inc:432
+#: ../inc/team.inc:447
 msgid "Team name, text version"
 msgstr "Název týmu, textová verze"
 
-#: ../inc/team.inc:433
+#: ../inc/team.inc:448
 msgid "Don't use HTML tags."
 msgstr "Nepoužívejte HTML tagy."
 
-#: ../inc/team.inc:436
+#: ../inc/team.inc:451
 msgid "Team name, HTML version"
 msgstr "Název týmu, HTML verze"
 
-#: ../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 "Můžete použít %1tyto HTML tagy%2."
 
-#: ../inc/team.inc:439
+#: ../inc/team.inc:454
 msgid "If you don't know HTML, leave this box blank."
 msgstr "Pokud neznáte HTML, nevyplňujte tento box."
 
-#: ../inc/team.inc:442
+#: ../inc/team.inc:457
 msgid "URL of team web page, if any"
 msgstr "Webová stránka týmu, pokud je"
 
-#: ../inc/team.inc:442
+#: ../inc/team.inc:457
 msgid "without \"http://\""
 msgstr "bez \"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 ""
-"Tato adresa bude použita jako odkaz z hlavní týmové stránky na tomto webu."
+msgstr "Tato adresa bude použita jako odkaz z hlavní týmové stránky na tomto webu."
 
-#: ../inc/team.inc:446
+#: ../inc/team.inc:461
 msgid "Description of team"
 msgstr "Popis týmu"
 
-#: ../inc/team.inc:462
+#: ../inc/team.inc:477
 msgid "Accept new members?"
 msgstr "Povolit nové členy?"
 
-#: ../inc/uotd.inc:28
+#: ../inc/uotd.inc:30
 msgid "User profile"
 msgstr "Profil uživatele"
 
-#: ../inc/user.inc:119
+#: ../inc/user.inc:120
 msgid "Projects in which you are participating"
 msgstr "Projekty, v nichž se účastníte"
 
-#: ../inc/user.inc:121
+#: ../inc/user.inc:122
 msgid "Projects in which %1 is participating"
 msgstr "Projeckty, ve kterých je %1 připojen"
 
-#: ../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 "Klikněte pro zobrazení stránky uživatele"
 
-#: ../inc/user.inc:125
+#: ../inc/user.inc:126
 msgid "Since"
 msgstr "Od"
 
-#: ../inc/user.inc:148
+#: ../inc/user.inc:151
 msgid "Computing and credit"
 msgstr "Počítání a kredit"
 
-#: ../inc/user.inc:151
+#: ../inc/user.inc:154
 msgid "Computers on this account"
 msgstr "Počítače na tomto účtu"
 
-#: ../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 "Zobrazit"
 
-#: ../inc/user.inc:161
+#: ../inc/user.inc:164
 msgid "Cross-project ID"
 msgstr "Meziprojektové ID"
 
-#: ../inc/user.inc:162
+#: ../inc/user.inc:165
 msgid "Cross-project statistics"
 msgstr "Meziprojektové statistiky"
 
-#: ../inc/user.inc:163
+#: ../inc/user.inc:166
 msgid "Account"
 msgstr "Účet"
 
-#: ../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 "Tým"
 
-#: ../inc/user.inc:167
+#: ../inc/user.inc:170
 msgid "Cross-project"
 msgstr "Meziprojektové"
 
-#: ../inc/user.inc:168 ../user/bs_sample_index.php:54
+#: ../inc/user.inc:171
 msgid "Certificate"
 msgstr "Certifikát"
 
-#: ../inc/user.inc:169
+#: ../inc/user.inc:172
 msgid "Stats on your cell phone"
 msgstr "Statistiky ve vašem mobilu"
 
-#: ../inc/user.inc:183
-msgid "Unknown notification type: %1"
-msgstr "Neznámý typ zprávy: %1"
-
-#: ../inc/user.inc:198
+#: ../inc/user.inc:197
 msgid "Account information"
 msgstr "Informace o účtu"
 
-#: ../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 "Emailová adresa"
 
-#: ../inc/user.inc:203 ../inc/user.inc:322
+#: ../inc/user.inc:210 ../inc/user.inc:400
 msgid "URL"
 msgstr "URL adresa"
 
-#: ../inc/user.inc:206
+#: ../inc/user.inc:213
 msgid "Postal code"
 msgstr "Směrovací číslo"
 
-#: ../inc/user.inc:207 ../inc/user.inc:316
+#: ../inc/user.inc:214 ../inc/user.inc:394
 msgid "%1 member since"
 msgstr "Členem %1 od"
 
-#: ../inc/user.inc:209
+#: ../inc/user.inc:219 ../inc/user.inc:223
 msgid "Change"
 msgstr "Změnit"
 
-#: ../inc/user.inc:209
+#: ../inc/user.inc:224
 msgid "email address"
 msgstr "emailová adresa"
 
-#: ../inc/user.inc:210
+#: ../inc/user.inc:225
 msgid "password"
 msgstr "heslo"
 
-#: ../inc/user.inc:211
+#: ../inc/user.inc:226
 msgid "other account info"
 msgstr "další informace o účtu"
 
-#: ../inc/user.inc:213 ../inc/user.inc:315
+#: ../inc/user.inc:229 ../inc/user.inc:393
 msgid "User ID"
 msgstr "Uživatelské ID"
 
-#: ../inc/user.inc:213
+#: ../inc/user.inc:229
 msgid "Used in community functions"
 msgstr "Použito u komunitních funkcí"
 
-# 91%
-#: ../inc/user.inc:216 ../user/weak_auth.php:25
+#: ../inc/user.inc:232 ../user/weak_auth.php:25
 msgid "Account keys"
 msgstr "Klíče k účtu"
 
-#: ../inc/user.inc:221
+#: ../inc/user.inc:237
 msgid "Preferences"
 msgstr "Předvolby"
 
-#: ../inc/user.inc:224
+#: ../inc/user.inc:240
 msgid "When and how BOINC uses your computer"
 msgstr "Kdy a jak má BOINC používat váš počítač"
 
-#: ../inc/user.inc:225
+#: ../inc/user.inc:241
 msgid "Computing preferences"
 msgstr "Předvolby výpočtů"
 
-#: ../inc/user.inc:228
+#: ../inc/user.inc:244
 msgid "Message boards and private messages"
 msgstr "Diskuzní fóra a soukromé zprávy"
 
-#: ../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 "Předvolby komunity"
 
-#: ../inc/user.inc:232
+#: ../inc/user.inc:248
 msgid "Preferences for this project"
 msgstr "Předvolby pro tento projekt"
 
-#: ../inc/user.inc:233 ../user/prefs.php:29
+#: ../inc/user.inc:249 ../user/prefs.php:30
 msgid "%1 preferences"
 msgstr "%1 předvolby"
 
-#: ../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 "Zobrazit profil %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 "Komunita"
 
-#: ../inc/user.inc:243 ../user/pm.php:107 ../user/pm.php:147
-msgid "Delete"
-msgstr "Smazat"
-
-#: ../inc/user.inc:245
+#: ../inc/user.inc:314
 msgid "Create"
 msgstr "Vytvořit"
 
-#: ../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 příspěvků"
 
-#: ../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 "Oznámení"
 
-#: ../inc/user.inc:269
+#: ../inc/user.inc:346
 msgid "Quit team"
 msgstr "Opustit tým"
 
-#: ../inc/user.inc:271 ../inc/user.inc:288
+#: ../inc/user.inc:348 ../inc/user.inc:365
 msgid "Administer"
 msgstr "Spravovat"
 
-#: ../inc/user.inc:277 ../inc/user.inc:290
+#: ../inc/user.inc:354 ../inc/user.inc:367
 msgid "(foundership change request pending)"
 msgstr "(nevyřízený požadavek na změnu vlastnictví)"
 
-#: ../inc/user.inc:279
+#: ../inc/user.inc:356
 msgid "Member of team"
 msgstr "Člen týmu"
 
-#: ../inc/user.inc:281
+#: ../inc/user.inc:358
 msgid "find a team"
 msgstr "najít tým"
 
-#: ../inc/user.inc:292
+#: ../inc/user.inc:369
 msgid "Founder but not member of"
 msgstr "Vlastník, ale ne člen týmu"
 
-#: ../inc/user.inc:298
+#: ../inc/user.inc:375
 msgid "Find friends"
 msgstr "Najít přátele"
 
-#: ../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 "Přátelé"
 
-#: ../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 "Počítače"
 
-#: ../inc/user.inc:338
+#: ../inc/user.inc:415
 msgid "Donor"
 msgstr "Dárce"
 
-#: ../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 "Tento člověk je váš přítel"
 
-#: ../inc/user.inc:382 ../user/friend.php:238
+#: ../inc/user.inc:462 ../user/friend.php:240
 msgid "Cancel friendship"
 msgstr "Zrušit přátelství"
 
-#: ../inc/user.inc:385 ../user/friend.php:37
+#: ../inc/user.inc:465 ../user/friend.php:39
 msgid "Request pending"
 msgstr "Nevyřízený požadavek"
 
-#: ../inc/user.inc:387
+#: ../inc/user.inc:467
 msgid "Add as friend"
 msgstr "Přidat mezi přátele"
 
-#: ../inc/user.inc:446
+#: ../inc/user.inc:526
 msgid "user name cannot have leading or trailing white space"
 msgstr "uživatelské jméno nemůže začínat nebo končit mezerou"
 
-#: ../inc/user.inc:450
+#: ../inc/user.inc:530
 msgid "user name must be nonempty"
 msgstr "uživatelské jméno nemůže být prázdné"
 
-#: ../inc/user.inc:454
+#: ../inc/user.inc:534
 msgid "user name may not contain HTML tags"
 msgstr "uživatelské jméno nemůže obsahovat HTML tagy"
 
-#: ../inc/util.inc:131
+#: ../inc/util.inc:161
 msgid "log out"
 msgstr "odhlásit"
 
-#: ../inc/util.inc:133
+#: ../inc/util.inc:163
 msgid "log in"
 msgstr "přihlásit se"
 
-#: ../inc/util.inc:204 ../user/login_form.php:30 ../user/login_form.php:66
-msgid "Log in"
-msgstr "Přihlásit se"
-
-#: ../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 "Vytvořit účet"
 
-#: ../inc/util.inc:206
+#: ../inc/util.inc:240
 msgid "Server status page"
 msgstr "Stránka se stavem serveru"
 
-#: ../inc/util.inc:248
+#: ../inc/util.inc:277
 msgid ""
 "A database error occurred while handling your request; please try again "
 "later."
-msgstr ""
-"Při zpracování vašeho pořadavku nastala chyba databáze, zkuste to prosím "
-"později."
+msgstr "Při zpracování vašeho pořadavku nastala chyba databáze, zkuste to prosím později."
 
-#: ../inc/util.inc:257
+#: ../inc/util.inc:286
 msgid "Unable to handle request"
 msgstr "Nelze vyhodnotit požadavek"
 
-#: ../inc/util.inc:277
+#: ../inc/util.inc:306
 msgid "hours"
 msgstr "hod"
 
-#: ../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
-msgid "Link has timed out. Please click Back, refresh the page, and try again."
-msgstr ""
-"Platnost odkazu vypršela. Klikněte prosím na Zpět, načtěte znova stránku a "
-"zkuste to znova."
-
-#: ../inc/util.inc:513
-msgid "View the profile of %1"
-msgstr "Zobrazit profil %1"
+#: ../inc/util.inc:473
+msgid ""
+"Link has timed out. Please click Back, refresh the page, and try again."
+msgstr "Platnost odkazu vypršela. Klikněte prosím na Zpět, načtěte znova stránku a zkuste to znova."
 
-#: ../inc/util.inc:569
+#: ../inc/util.inc:552
 msgid "Use BBCode tags to format your text"
 msgstr "Používejte BBCode tagy pro formátování vašeho textu"
 
-#: ../inc/util.inc:796
+#: ../inc/util.inc:779
 msgid "Project down for maintenance"
 msgstr "Projekt odstavený z důvodu údržby"
 
-#: ../inc/util.inc:799
+#: ../inc/util.inc:782
 msgid "%1 is temporarily shut down for maintenance.  Please try again later."
 msgstr "%1 je dočasně nedostupný kvůli údržbě. Zkuste to prosím později."
 
-#: ../inc/util.inc:817
+#: ../inc/util.inc:800
 msgid "Unable to connect to database - please try again later"
 msgstr "Nelze se připojit k databázi - zkuste to prosím později."
 
-#: ../inc/util.inc:821
+#: ../inc/util.inc:804
 msgid "Unable to select database - please try again later"
 msgstr "Nelze vybrat databázi - zkuste to prosím později."
 
-#: ../inc/util_ops.inc:109 ../user/get_passwd.php:72
+#: ../inc/util.inc:976
+msgid "characters remaining"
+msgstr "zbývá znaků"
+
+#: ../inc/util_ops.inc:115 ../user/get_passwd.php:72
 msgid "Stay logged in on this computer"
 msgstr "Zapamatovat si přihlášení na tomto počítači"
 
@@ -2319,23 +2450,6 @@ msgstr "Zapamatovat si přihlášení na tomto počítači"
 msgid "Finish account setup"
 msgstr "Dokončit nastavení účtu"
 
-#: ../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 ""
-"Vaše identifikace na stránkách. Použijte skutečné jméno, nebo přezdívku."
-
-#: ../user/account_finish.php:45 ../user/create_account_form.php:98
-msgid "Select the country you want to represent, if any."
-msgstr "Vyberte si zemi, kterou chcete reprezentovat."
-
-#: ../user/account_finish.php:51 ../user/create_account_form.php:104
-msgid "Postal or ZIP Code"
-msgstr "PSČ nebo ZIP kód"
-
-#: ../user/account_finish.php:51 ../user/create_account_form.php:104
-msgid "Optional"
-msgstr "Volitelné"
-
 #: ../user/account_finish_action.php:27
 msgid "You must supply a name for your account"
 msgstr "Je třeba zadat jméno k vašemu účtu"
@@ -2344,38 +2458,38 @@ msgstr "Je třeba zadat jméno k vašemu účtu"
 msgid "HTML tags not allowed in name"
 msgstr "Ve jméně nejsou povoleny HTML tagy"
 
-#: ../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 "Upravit %1 předvolby"
+
+#: ../user/add_venue.php:82
 msgid "Add %1 preferences for %2"
 msgstr "Přidat %1 předvolby pro %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 "Aplikace"
 
-#: ../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 nyní používá tyto aplikační programy. Pokud jste zapojen v %1, bude "
-"vašemu počítači přidělena práce pro jeden nebo více z těchto aplikačních "
-"programů. Aktuální verze aplikačního programu se vždy automaticky stáhne do "
-"vašeho počítače - není třeba pro to nic dělat."
+msgstr "%1 má v současnosti následující aplikace. Pokud se účastníte v %1, úkoly pro jednu nebo více z těchto aplikací budou přiřazeny k vašemu počítači. Aktuální verze aplikace se stáhne do vašeho počítače. To se děje automaticky, není nutné nic dělat."
 
-#: ../user/apps.php:50
+#: ../user/apps.php:54
 msgid "Platform"
 msgstr "Platforma"
 
-#: ../user/apps.php:51
+#: ../user/apps.php:55
 msgid "Version"
 msgstr "Verze"
 
-#: ../user/apps.php:52
-msgid "Installation time"
-msgstr "Čas instalace"
+#: ../user/apps.php:57
+msgid "Average computing"
+msgstr "Průměrný výpočet"
 
 #: ../user/bbcode.php:23
 msgid "BBCode tags"
@@ -2387,10 +2501,7 @@ msgid ""
 "It's similar to HTML, but simpler. The tags start with a [ (where you would\n"
 "have used %1 in HTML) and end with ] (where you would have used %2 in\n"
 "HTML)."
-msgstr ""
-"BBCode značky vám umožňují formátovat text ve vašem profilu a v příspěvcích\n"
-"ve fóru. Jsou podobné značkám HTML, začínají [ (kde byste použili %1 v HTML)\n"
-"a končí ] (kde byste použili %2 v HTML)."
+msgstr "BBCode značky vám umožňují formátovat text ve vašem profilu a v příspěvcích\nve fóru. Jsou podobné značkám HTML, začínají [ (kde byste použili %1 v HTML)\na končí ] (kde byste použili %2 v HTML)."
 
 #: ../user/bbcode.php:31
 msgid "Examples"
@@ -2409,155 +2520,78 @@ msgid "Underline"
 msgstr "Podtržení"
 
 #: ../user/bbcode.php:35
+msgid "Strikethrough"
+msgstr "Přeškrtnuté"
+
+#: ../user/bbcode.php:36
 msgid "Superscript"
 msgstr "Horní index"
 
-#: ../user/bbcode.php:36
+#: ../user/bbcode.php:37
 msgid "Big text"
 msgstr "Velké písmo"
 
-#: ../user/bbcode.php:37
+#: ../user/bbcode.php:38
 msgid "Red text"
 msgstr "Červený text"
 
-#: ../user/bbcode.php:38
+#: ../user/bbcode.php:39
 msgid "link to website"
 msgstr "odkaz na webové stránky"
 
-#: ../user/bbcode.php:39
+#: ../user/bbcode.php:40
 msgid "Quoted text"
 msgstr "Citovaný text"
 
-#: ../user/bbcode.php:39
+#: ../user/bbcode.php:40
 msgid "use for quoted blocks of text"
 msgstr "použijte pro citovaný text"
 
-#: ../user/bbcode.php:40
+#: ../user/bbcode.php:41
 msgid "use to display an image"
 msgstr "použijte pro zobrazení obrázku"
 
-#: ../user/bbcode.php:41
+#: ../user/bbcode.php:42
 msgid "Code snippet here"
 msgstr "Ukázky kódu zde"
 
-#: ../user/bbcode.php:41
+#: ../user/bbcode.php:42
 msgid "use to display some code"
 msgstr "použijte pro zobrazení kódu"
 
-#: ../user/bbcode.php:42
+#: ../user/bbcode.php:43
 msgid "Pre-formatted text"
 msgstr "Předformátovaný text"
 
-#: ../user/bbcode.php:42
+#: ../user/bbcode.php:43
 msgid "use to display pre-formatted (usually monospaced) text"
 msgstr "použijte pro zobrazení předformátovaného, typicky u monospace písma"
 
-#: ../user/bbcode.php:43
+#: ../user/bbcode.php:44
 msgid "Item 1"
 msgstr "Věc 1"
 
-#: ../user/bbcode.php:43
+#: ../user/bbcode.php:44
 msgid "Item2"
 msgstr "Věc2"
 
-#: ../user/bbcode.php:43
+#: ../user/bbcode.php:44
 msgid "Item 2"
 msgstr "Věc 2"
 
-#: ../user/bbcode.php:45
+#: ../user/bbcode.php:46
 msgid "use to link to Trac ticket on BOINC website"
 msgstr "použij k propojení s Trac tiketem na stránkách BOINC."
 
-#: ../user/bbcode.php:47
+#: ../user/bbcode.php:48
 msgid "use to link to Trac Wiki on BOINC website"
 msgstr "použij k propojení s Trac Wiki na stránkách BOINC."
 
-#: ../user/bbcode.php:49
-msgid "use to link to SVN changeset on BOINC website"
-msgstr "použij k propojení s SVN na stránkách 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 ""
-"Pokud neuzavřete tag nebo nespecifikujete parametr správně, \n"
-"bude zobrazen samotný tag, místo formátovaného textu."
-
-#: ../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 "Váš účet"
-
-#: ../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 "Týmy"
-
-#: ../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 "Uživatel dne"
-
-#: ../user/bs_sample_index.php:52 ../user/server_status.php:239
-msgid "Server status"
-msgstr "Stav serveru"
-
-#: ../user/bs_sample_index.php:60 ../user/profile_menu.php:32
-#: ../user/sample_index.php:127
-msgid "Profiles"
-msgstr "Profily"
-
-#: ../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 "Nejlepší účastníci"
-
-#: ../user/bs_sample_index.php:66 ../user/stats.php:31
-msgid "Top computers"
-msgstr "Nejlepší počítače"
-
-#: ../user/bs_sample_index.php:67 ../user/stats.php:32 ../user/team.php:46
-msgid "Top teams"
-msgstr "Nejlepší týmy"
-
-#: ../user/bs_sample_index.php:68 ../user/gpu_list.php:182
-#: ../user/stats.php:33
-msgid "Top GPU models"
-msgstr "Nejlepší modely GPU"
-
-#: ../user/bs_sample_index.php:70
-#, fuzzy
-msgid "Languages"
-msgstr "Jazyk"
-
-#: ../user/bs_sample_index.php:149 ../user/info.php:24
-#: ../user/sample_index.php:79
-msgid "Read our rules and policies"
-msgstr "Přečtěte si naše pravidla a zásady"
+msgstr "Pokud neuzavřete tag nebo nespecifikujete parametr správně, \nbude zobrazen samotný tag, místo formátovaného textu."
 
 #: ../user/create_account_action.php:26
 msgid "Can't create account"
@@ -2567,211 +2601,156 @@ msgstr "Nelze vytvořit účet"
 msgid "Click your browser's <b>Back</b> button to try again."
 msgstr "Zkuste znovu kliknutím na tlačítko <b>Zpět</b> ve vašem prohlížeči."
 
-#: ../user/create_account_action.php:47
+#: ../user/create_account_action.php:46
 msgid "Your reCAPTCHA response was not correct. Please try again."
 msgstr "Vaše 'reCAPTCHA' odpověď nebyla správná. Zkuste prosím znovu."
 
-#: ../user/create_account_action.php:70
+#: ../user/create_account_action.php:69
 msgid "You must supply an invitation code to create an account."
 msgstr "Pro vytvoření účtu je třeba vložit pozvánkový kód."
 
-#: ../user/create_account_action.php:73
+#: ../user/create_account_action.php:72
 msgid "The invitation code you gave is not valid."
 msgstr "Vámi vložený pozvánkový kód je neplatný."
 
-#: ../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 ""
-"Neplatná emailová adresa: Musíte zadat platnou adresu ve formátu "
-"jméno at doména"
+"Invalid email address: you must enter a valid address of the form "
+"name at domain"
+msgstr "Neplatná emailová adresa: Musíte zadat platnou adresu ve formátu jméno at doména"
 
-#: ../user/create_account_action.php:88
+#: ../user/create_account_action.php:87
 msgid "There's already an account with that email address."
 msgstr "Účet s touto emailovou adresou již existuje."
 
-#: ../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 "Nová hesla nejsou stejná"
 
-#: ../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 "Hesla smí obsahovat pouze ASCII znaky."
 
-#: ../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 "Nové heslo je příliš krátké: minimální délka hesla je %1 znaků."
 
-#: ../user/create_account_action.php:127
+#: ../user/create_account_action.php:126
 msgid "Couldn't create account"
 msgstr "Nelze vytvořit účet"
 
-#: ../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 ""
-"Poznámka: Pokud používáte BOINC Manager, tak namísto tohoto formuláře jen "
-"pusťte BOINC, zvolte Přidat projekt a zadejte emailovou adresu a heslo."
+msgstr "Poznámka: Pokud používáte BOINC Manager, tak namísto tohoto formuláře jen pusťte BOINC, zvolte Přidat projekt a zadejte emailovou adresu a heslo."
 
-#: ../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 ""
-"Tento účet bude náležet týmu %1 a bude mít předvolby projektu po jeho "
-"vlastníkovi."
-
-#: ../user/create_account_form.php:73
-msgid "Invitation Code"
-msgstr "Pozvánkový kód"
-
-#: ../user/create_account_form.php:73
-msgid "A valid invitation code is required to create an account."
-msgstr "Pro vytvoření účtu je zapotřebí platný povánkový kód."
-
-#: ../user/create_account_form.php:83
-msgid "Email Address"
-msgstr "Emailová adresa"
-
-#: ../user/create_account_form.php:83
-msgid "Must be a valid address of the form 'name at domain'."
-msgstr "Adresa musí být platného tvaru 'jmeno at domena'."
-
-#: ../user/create_account_form.php:92 ../user/edit_email_form.php:47
-msgid "Password"
-msgstr "Heslo"
-
-#: ../user/create_account_form.php:93
-msgid "Must be at least %1 characters"
-msgstr "Musí mít délku aspoň %1 znaků"
-
-#: ../user/create_account_form.php:96
-msgid "Confirm password"
-msgstr "Potvrďte heslo"
-
-#: ../user/create_account_form.php:113
-msgid "Please enter the words shown in the image"
-msgstr "Zadejte prosím slova zobrazená na obrázku"
+msgstr "Tento účet bude náležet týmu %1 a bude mít předvolby projektu po jeho vlastníkovi."
 
-#: ../user/create_account_form.php:119
-msgid "Create account"
-msgstr "Vytvořit účet"
-
-#: ../user/create_profile.php:50
+#: ../user/create_profile.php:52
 msgid "Picture"
 msgstr "Obrázek"
 
-#: ../user/create_profile.php:64
+#: ../user/create_profile.php:66
 msgid "%1 Your profile picture is shown to the left."
 msgstr "%1 Váš obrázek bude zobrazen vlevo."
 
-#: ../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 ""
-"Pro změnu klikněte na tlačítko \"Hledat\" a vyberte soubor typu JPEG nebo PNG "
-"(do %1)."
+"To replace it, click the \"Browse\" button and select a JPEG or PNG file (%1"
+" or less)."
+msgstr "Pro změnu klikněte na tlačítko \"Hledat\" a vyberte soubor typu JPEG nebo PNG (do %1)."
 
-#: ../user/create_profile.php:69
+#: ../user/create_profile.php:71
 msgid "To remove it from your profile, check this box:"
 msgstr "Pro odebrání obrázku z Vašeho profilu zaškrtněte toto pole:"
 
-#: ../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 ""
-"Pokud si přejete mít u svého profilu obrázek, klikněte na \"Hledat\" a zvolte "
-"soubor typu JPEG nebo PNG. Obrázek může být velký maximálně %1."
+msgstr "Pokud si přejete mít u svého profilu obrázek, klikněte na \"Hledat\" a zvolte soubor typu JPEG nebo PNG. Obrázek může být velký maximálně %1."
 
-#: ../user/create_profile.php:89
+#: ../user/create_profile.php:91
 msgid "Language"
 msgstr "Jazyk"
 
-#: ../user/create_profile.php:92
+#: ../user/create_profile.php:94
 msgid "Select the language in which your profile is written:"
 msgstr "Zvolte jazyk, ve kterém je napsán Váš profil:"
 
-#: ../user/create_profile.php:104
+#: ../user/create_profile.php:106
 msgid "Submit profile"
 msgstr "Uložit profil"
 
-#: ../user/create_profile.php:110
-msgid "Please enter the words shown in the image."
-msgstr "Zadejte prosím slova zobrazená na obrázku."
-
-#: ../user/create_profile.php:115
+#: ../user/create_profile.php:112
 msgid "Create/edit profile"
 msgstr "Vytvořit/upravit profil"
 
-#: ../user/create_profile.php:137
+#: ../user/create_profile.php:134
 msgid "The format of your uploaded image is not supported."
 msgstr "Formát vámi zvoleného obrázku není podporován."
 
-#: ../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 "Váš %1profil%2 vám umožňuje sdílet své názory a zázemí s %3 komunitou."
 
-#: ../user/create_profile.php:213
+#: ../user/create_profile.php:209
 msgid "Your ReCaptcha response was not correct.  Please try again."
 msgstr "Vaše 'reCAPTCHA' odpověď nebyla správná. Zkuste prosím znovu."
 
-#: ../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 ""
-"Váš první příspěvek byl ohodnocen anti-spamovým systémem Akismet jako spam. "
-"Upravte ho prosím a zkuste jej vložit znova."
+msgstr "Váš první příspěvek byl ohodnocen anti-spamovým systémem Akismet jako spam. Upravte ho prosím a zkuste jej vložit znova."
 
-#: ../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 ""
-"Váš druhý příspěvek byl ohodnocen anti-spamovým systémem Akismet jako spam. "
-"Upravte ho prosím a zkuste jej vložit znova."
+msgstr "Váš druhý příspěvek byl ohodnocen anti-spamovým systémem Akismet jako spam. Upravte ho prosím a zkuste jej vložit znova."
 
-#: ../user/create_profile.php:246
+#: ../user/create_profile.php:242
 msgid "Your profile submission was empty."
 msgstr "Váš profil k uložení je prázdný."
 
-#: ../user/create_profile.php:285
+#: ../user/create_profile.php:281
 msgid "Could not update the profile: database error"
 msgstr "Není možné upravit profil: chyba databáze"
 
-#: ../user/create_profile.php:297
+#: ../user/create_profile.php:293
 msgid "Could not create the profile: database error"
 msgstr "Není možné vytvořit profil: chyba databáze"
 
-#: ../user/create_profile.php:302
+#: ../user/create_profile.php:298
 msgid "Profile saved"
 msgstr "Profil uložen"
 
-#: ../user/create_profile.php:304
+#: ../user/create_profile.php:300
 msgid ""
 "Congratulations! Your profile was successfully entered into our database."
 msgstr "Blahopřejeme! Váš profil byl úspěšně uložen v naší databázi."
 
-#: ../user/create_profile.php:306
+#: ../user/create_profile.php:302
 msgid "%1View your profile%2"
 msgstr "%1Zobrazit profil%2"
 
-#: ../user/create_profile.php:315
+#: ../user/create_profile.php:311
 msgid "Create a profile"
 msgstr "Založit si 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."
-msgstr ""
-"Jako ochrana proti spamu je vyžadován kredit aspoň %1 pro založení či úpravu "
-"profilu. Omlouváme se za tuto nepříjemnost."
+"To prevent spam, an average credit of %1 or greater is required to create or"
+" edit a profile.  We apologize for this inconvenience."
+msgstr "Jako ochrana proti spamu je vyžadován kredit aspoň %1 pro založení či úpravu profilu. Omlouváme se za tuto nepříjemnost."
 
 #: ../user/delete_account.php:57
 msgid "Couldn't delete account"
@@ -2796,28 +2775,21 @@ msgid ""
 "including your profile and message-board posts.\n"
 "No jobs will be issued to any computers attached\n"
 "to this account."
-msgstr ""
-"Při smazání vašeho účtu dojde k odstranění  \n"
-"všech vašich osobních údajů z našich serverů, \n"
-"včetně vašeho profilu a příspěvků na nástence. \n"
-"Na žádný počítač připojený přes tento účet \n"
-"nebude zasílána žádná další práce."
+msgstr "Při smazání vašeho účtu dojde k odstranění  \nvšech vašich osobních údajů z našich serverů, \nvčetně vašeho profilu a příspěvků na nástence. \nNa žádný počítač připojený přes tento účet \nnebude zasílána žádná další práce."
 
 #: ../user/delete_account.php:73
 msgid ""
 "This cannot be undone.\n"
 "Once your account has been deleted, you cannot get it back."
-msgstr ""
-"Tuto operaci nelze vrátit zpět. \n"
-"jakmile bude váš účet smazán, nepůjde žádným způsobem obnovit."
+msgstr "Tuto operaci nelze vrátit zpět. \njakmile bude váš účet smazán, nepůjde žádným způsobem obnovit."
 
 #: ../user/delete_account.php:76
 msgid "Are you sure you want to delete your account?"
 msgstr "Opravdu si přejete smazat váš účet?"
 
-#: ../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 "Ano"
@@ -2826,8 +2798,8 @@ msgstr "Ano"
 msgid "Delete this account"
 msgstr "Smazat tento účet"
 
-#: ../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 "Ne"
@@ -2836,49 +2808,44 @@ msgstr "Ne"
 msgid "Do not delete this account"
 msgstr "Zachovat tento účet"
 
-#: ../user/delete_profile.php:30
+#: ../user/delete_profile.php:32
 msgid "couldn't delete profile - please try again later"
 msgstr "nelze se smazat profil - zkuste to prosím později"
 
-#: ../user/delete_profile.php:33
+#: ../user/delete_profile.php:35
 msgid "Delete Confirmation"
 msgstr "Potvrďte smazání"
 
-#: ../user/delete_profile.php:35
+#: ../user/delete_profile.php:37
 msgid "Your profile has been deleted."
 msgstr "Váš profil byl smazán"
 
-#: ../user/delete_profile.php:40
+#: ../user/delete_profile.php:42
 msgid "Profile delete confirmation"
 msgstr "Potvrzení smazání profilu"
 
-#: ../user/delete_profile.php:43
+#: ../user/delete_profile.php:45
 msgid "Are you sure?"
 msgstr "Jste si jisti?"
 
-#: ../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 ""
-"Smazané profily zmizí navždy a nelze je obnovit --\n"
-"pokud budete chtít v budoucnu začít znova,\n"
-"budete si muset vytvořit nový profil."
+msgstr "Smazané profily zmizí navždy a nelze je obnovit --\npokud budete chtít v budoucnu začít znova,\nbudete si muset vytvořit nový profil."
 
-#: ../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 ""
-"Pokud jste si jisti, kliknutím na 'Ano' ('Yes')\n"
-"odstraníte váš profil z naší databáze."
+msgstr "Pokud jste si jisti, kliknutím na 'Ano' ('Yes')\nodstraníte váš profil z naší databáze."
 
-#: ../user/delete_profile.php:52
+#: ../user/delete_profile.php:54
 msgid "Delete my profile"
 msgstr "Smažte můj profil"
 
-#: ../user/delete_profile.php:53
+#: ../user/delete_profile.php:55
 msgid "Do not delete my profile"
 msgstr "Zachovejte můj profil"
 
@@ -2896,7 +2863,8 @@ msgstr "Vaše darování bylo dokončeno."
 
 #: ../user/donated.php:30
 msgid ""
-"Your donation will be added to the progress bar after confirmation by PayPal."
+"Your donation will be added to the progress bar after confirmation by "
+"PayPal."
 msgstr "Váš dar bude zobrazen po potvrzení systémem PayPal."
 
 #: ../user/donated.php:32
@@ -2915,9 +2883,7 @@ msgstr "%1 darů"
 msgid ""
 "This project is accepting donations via\n"
 "%1."
-msgstr ""
-"Tento projekt přijímá dary pomocí\n"
-"%1."
+msgstr "Tento projekt přijímá dary pomocí\n%1."
 
 #: ../user/donations.php:42
 msgid ""
@@ -2932,17 +2898,7 @@ msgid ""
 "        to see the donation amount equivalent in different currencies\n"
 "        (please note that the rates are only estimates\n"
 "         and the actual amount may differ)."
-msgstr ""
-"Vyplňte částku, kterou chcete darovat, do kolonky níže.\n"
-"        PayPal příjímá čáskty v různých měnách:\n"
-"        Kanadský Dolar, Euro, Britská Libra, US Dolar,\n"
-"        Jen, Australský Dolar, Novozélandský Dolar,\n"
-"        Švýcarský Frank, Hongkongský Dolar, Singapurský Dolar,\n"
-"        Švédská Koruna, Dánská Koruna, Polský Zlotý,\n"
-"        Norská Koruna, Maďarský Forint, Česká Koruna.\n"
-"        Převaděč měny vám ukáže ekvivalent darované částky v různých měnách\n"
-"        Poznámka: měnové kurzy jsou pouze orientační, skutečná částka se "
-"může lišit."
+msgstr "Vyplňte částku, kterou chcete darovat, do kolonky níže.\n        PayPal příjímá čáskty v různých měnách:\n        Kanadský Dolar, Euro, Britská Libra, US Dolar,\n        Jen, Australský Dolar, Novozélandský Dolar,\n        Švýcarský Frank, Hongkongský Dolar, Singapurský Dolar,\n        Švédská Koruna, Dánská Koruna, Polský Zlotý,\n        Norská Koruna, Maďarský Forint, Česká Koruna.\n        Převaděč měny vám ukáže ekvivalent darované částky v různých měnách\n        Poznámka: m [...]
 
 #: ../user/donations.php:316
 msgid "Amount you would like to donate"
@@ -2960,17 +2916,11 @@ msgstr "Anonymní dar"
 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 ""
-"Zvolte tuto možnost, pokud si přejete, aby bylo vaše jméno a číslo účtu "
-"zobrazeno\n"
-"v seznamu dárců.<br>Pokud tuto možnost nezvolíte, budete zaznamenán jako "
-"uživatel č. %1"
+msgstr "Zvolte tuto možnost, pokud si přejete, aby bylo vaše jméno a číslo účtu zobrazeno\nv seznamu dárců.<br>Pokud tuto možnost nezvolíte, budete zaznamenán jako uživatel č. %1"
 
 #: ../user/donations.php:324
 msgid "To assign the donation with your user ID, please log in."
-msgstr ""
-"Přihlašte se prosím, aby bylo možno přiřadit váš dar k vašemu uživatelskému "
-"jménu."
+msgstr "Přihlašte se prosím, aby bylo možno přiřadit váš dar k vašemu uživatelskému jménu."
 
 #: ../user/donations.php:328
 msgid "Proceed"
@@ -2996,13 +2946,9 @@ msgstr "Za tyto aplikace %1 nijak neručí, použití je na vaše riziko."
 #: ../user/download_network.php:33
 msgid ""
 "We do not provide instructions for installing these applications.\n"
-"However, the author may have provided some help on installing or "
-"uninstalling the application. \n"
+"However, the author may have provided some help on installing or uninstalling the application. \n"
 "If this is not enough you should contact the author."
-msgstr ""
-"Neposkytujeme informace k instalaci těchto aplikací, nicméně autor aplikace "
-"obvykle poskytuje základní informace pro instalaci a odinstalování své "
-"aplikace. Pro získání více informací, zkuste kontaktovat autora."
+msgstr "Neposkytujeme informace k instalaci těchto aplikací, nicméně autor aplikace obvykle poskytuje základní informace pro instalaci a odinstalování své aplikace. Pro získání více informací, zkuste kontaktovat autora."
 
 #: ../user/download_network.php:36
 msgid "Instructions for installing and running BOINC are %1here%2."
@@ -3044,9 +2990,7 @@ msgstr "Prosím %1ověřte tuto emailovou adresu%2."
 msgid ""
 "We can't update your email address due to a database problem.  Please try "
 "again later."
-msgstr ""
-"Nelze upravit emailovou adresu, chyba přístupu k databázi. Zkuste to prosím "
-"později."
+msgstr "Nelze upravit emailovou adresu, chyba přístupu k databázi. Zkuste to prosím později."
 
 #: ../user/edit_email_form.php:27 ../user/edit_email_form.php:51
 msgid "Change email address"
@@ -3076,257 +3020,207 @@ msgstr "Potvrďte reset"
 msgid ""
 "This action will erase any changes you have made in your community "
 "preferences. To cancel, click your browser's Back button."
-msgstr ""
-"Touto akcí smažete všechny změny, které jste provedli v nastavení vaší "
-"komunity. Akci zrušíte kliknutím na tlačítko 'Zpět' ve vašem prohlížeči."
+msgstr "Touto akcí smažete všechny změny, které jste provedli v nastavení vaší komunity. Akci zrušíte kliknutím na tlačítko 'Zpět' ve vašem prohlížeči."
 
 #: ../user/edit_forum_preferences_action.php:38
 msgid "Reset preferences"
 msgstr "Resetovat předvolby"
 
-#: ../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 "Chyba: Nesprávný typ souboru. Jsou podporovány pouze typy PNG a 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 "Váš podpis je příliš dlouhý. Maximální přípustná délka je 250 znaků."
 
-#: ../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 "Uživatel nenalezen: %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 ""
-"Jak vám máme oznamovat nové osobní zprávy, požadavky od přátel, příspěvky v "
-"odebíraných diskuzích a ostatní události?"
+msgstr "Jak vám máme oznamovat nové osobní zprávy, požadavky od přátel, příspěvky v odebíraných diskuzích a ostatní události?"
 
-#: ../user/edit_forum_preferences_form.php:57
+#: ../user/edit_forum_preferences_form.php:46
 msgid "On my Account page (no email)"
 msgstr "Na mé stránce s účtem (bez emalu)"
 
-#: ../user/edit_forum_preferences_form.php:58
+#: ../user/edit_forum_preferences_form.php:47
 msgid "Immediately, by email"
 msgstr "Okamžitě, pomocí emailu"
 
-#: ../user/edit_forum_preferences_form.php:59
+#: ../user/edit_forum_preferences_form.php:48
 msgid "In a single daily email"
 msgstr "Jednou denně v souhrnném emailu"
 
-#: ../user/edit_forum_preferences_form.php:75
+#: ../user/edit_forum_preferences_form.php:65
 msgid "Message-board identity"
 msgstr "Vaše identita na diskuzním fóru"
 
-#: ../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 "Obrázek, který je zobrazen u vašich příspěvků na nástěnkách."
 
-#: ../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 "Formát: JPG nebo PNG. Velikost: nejvýše 4 KB, 100x100 bodů."
 
-#: ../user/edit_forum_preferences_form.php:80
+#: ../user/edit_forum_preferences_form.php:70
 msgid "Don't use an avatar"
 msgstr "Nezobrazovat 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 "Použít 'Globally Recognized Avatar' poskytnutý od %1"
 
-#: ../user/edit_forum_preferences_form.php:84
+#: ../user/edit_forum_preferences_form.php:74
 msgid "Use this uploaded avatar:"
 msgstr "Toto je přijatý avatar:"
 
-#: ../user/edit_forum_preferences_form.php:87
+#: ../user/edit_forum_preferences_form.php:77
 msgid "Avatar preview"
 msgstr "Náhled avataru"
 
-#: ../user/edit_forum_preferences_form.php:87
+#: ../user/edit_forum_preferences_form.php:77
 msgid "This is how your avatar will look"
 msgstr "Takto bude váš avatar vypadat"
 
-#: ../user/edit_forum_preferences_form.php:96
+#: ../user/edit_forum_preferences_form.php:86
 msgid "Signature for message board posts"
 msgstr "Podpis pro příspěvky na fóru"
 
-#: ../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 ""
-"Podívejte se na %1zajímavé doplňky zdarma%2\n"
-"<br> nabízející dynamické 'obrázky do podpisu'\n"
-"<br> zobrazující váš aktuální kredit, projektové novinky, atd."
-
-#: ../user/edit_forum_preferences_form.php:104
-msgid "characters remaining"
-msgstr "zbývá znaků"
+msgstr "Podívejte se na %1zajímavé doplňky zdarma%2\n<br> nabízející dynamické 'obrázky do podpisu'\n<br> zobrazující váš aktuální kredit, projektové novinky, atd."
 
-#: ../user/edit_forum_preferences_form.php:105
+#: ../user/edit_forum_preferences_form.php:93
 msgid "Attach signature by default"
 msgstr "Automaticky připojit podpis"
 
-#: ../user/edit_forum_preferences_form.php:108
+#: ../user/edit_forum_preferences_form.php:96
 msgid "Signature preview"
 msgstr "Náhled podpisu"
 
-#: ../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 "Takto bude váš podpis vypadat v diskuzích"
 
-#: ../user/edit_forum_preferences_form.php:127
+#: ../user/edit_forum_preferences_form.php:115
 msgid "Message display"
 msgstr "Zobrazení zprávy"
 
-#: ../user/edit_forum_preferences_form.php:129
+#: ../user/edit_forum_preferences_form.php:117
 msgid "What to display"
 msgstr "Co zobrazovat"
 
-#: ../user/edit_forum_preferences_form.php:130
+#: ../user/edit_forum_preferences_form.php:118
 msgid "Hide avatar images"
 msgstr "Skrýt avatar"
 
-#: ../user/edit_forum_preferences_form.php:131
+#: ../user/edit_forum_preferences_form.php:119
 msgid "Hide signatures"
 msgstr "Skrýt podpisy"
 
-#: ../user/edit_forum_preferences_form.php:132
+#: ../user/edit_forum_preferences_form.php:120
 msgid "Show images as links"
 msgstr "Zobrazovat obrázky jako odkazy"
 
-#: ../user/edit_forum_preferences_form.php:133
+#: ../user/edit_forum_preferences_form.php:121
 msgid "Open links in new window/tab"
 msgstr "Otevírat odkazy v novém okně/panelu"
 
-#: ../user/edit_forum_preferences_form.php:134
+#: ../user/edit_forum_preferences_form.php:122
 msgid "Highlight special users"
 msgstr "Zvýraznit speciální uživatele"
 
-#: ../user/edit_forum_preferences_form.php:135
+#: ../user/edit_forum_preferences_form.php:123
 msgid "Display this many messages per page"
 msgstr "Zobrazit tolik zpráv na stránce"
 
-#: ../user/edit_forum_preferences_form.php:139
+#: ../user/edit_forum_preferences_form.php:127
 msgid "How to sort"
 msgstr "Jak řadit"
 
-#: ../user/edit_forum_preferences_form.php:140
+#: ../user/edit_forum_preferences_form.php:128
 msgid "Threads:"
 msgstr "Vlákna:"
 
-#: ../user/edit_forum_preferences_form.php:140
+#: ../user/edit_forum_preferences_form.php:128
 msgid "Posts:"
 msgstr "Příspěvky:"
 
-#: ../user/edit_forum_preferences_form.php:141
+#: ../user/edit_forum_preferences_form.php:129
 msgid "Jump to first new post in thread automatically"
 msgstr "Automaticky přeskoč na první příspěvek v diskuzi"
 
-#: ../user/edit_forum_preferences_form.php:142
+#: ../user/edit_forum_preferences_form.php:130
 msgid "Don't move sticky posts to top"
 msgstr "Nepřesouvat přišpendlené příspěvky na počátek"
 
-#: ../user/edit_forum_preferences_form.php:148
+#: ../user/edit_forum_preferences_form.php:137
 msgid "Message filtering"
 msgstr "Filtrování zpráv"
 
-#: ../user/edit_forum_preferences_form.php:164
+#: ../user/edit_forum_preferences_form.php:153
 msgid "Filtered users"
 msgstr "Fitrovaní uživatelé"
 
-#: ../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 ""
-"Ignorovat zprávy na diskuzním fóru a soukromé zprávy od těchto uživatelů."
+msgstr "Ignorovat zprávy na diskuzním fóru a soukromé zprávy od těchto uživatelů."
 
-#: ../user/edit_forum_preferences_form.php:167
+#: ../user/edit_forum_preferences_form.php:156
 msgid "User ID (For instance: 123456789)"
 msgstr "ID uživatele (Například: 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 "Přidat uživatele do filtru"
 
-#: ../user/edit_forum_preferences_form.php:173
+#: ../user/edit_forum_preferences_form.php:162
 msgid "Click here to update preferences"
 msgstr "Klikněte pro nastavení předvoleb"
 
-#: ../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 "Resetovat"
 
-#: ../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 "Nebo vrať předvolby do základního nastavení kliknutím sem"
 
 #: ../user/edit_passwd_action.php:50
-msgid "Invalid account key"
-msgstr "Neplatný klíč k účtu"
-
-#: ../user/edit_passwd_action.php:55
-msgid "No account with that email address was found"
-msgstr "Nebyl nalezen žádný účet s touto emailovou adresou"
-
-#: ../user/edit_passwd_action.php:59
-msgid "Invalid password"
-msgstr "Neplatné heslo"
+msgid ""
+"We can't update your password due to a database problem. Please try again "
+"later."
+msgstr "Nelze změnit vaše heslo z důvodu problémů s připojením k databázi - zkuste to prosím později."
 
-#: ../user/edit_passwd_action.php:63 ../user/edit_passwd_form.php:25
-#: ../user/edit_passwd_form.php:55
+#: ../user/edit_passwd_action.php:53 ../user/edit_passwd_form.php:25
+#: ../user/edit_passwd_form.php:34
 msgid "Change password"
 msgstr "Změnit heslo"
 
-#: ../user/edit_passwd_action.php:67
+#: ../user/edit_passwd_action.php:54
 msgid "Your password has been changed."
 msgstr "Vaše heslo bylo změněno."
 
-#: ../user/edit_passwd_action.php:69
-msgid ""
-"We can't update your password due to a database problem. Please try again "
-"later."
-msgstr ""
-"Nelze změnit vaše heslo z důvodu problémů s připojením k databázi - zkuste "
-"to prosím později."
-
-#: ../user/edit_passwd_form.php:39
-msgid "You can identify yourself using either"
-msgstr "Můžete se identifikovat buď"
-
-#: ../user/edit_passwd_form.php:41
-msgid "your email address and old password"
-msgstr "vaše emailová adresa a staré heslo"
-
-#: ../user/edit_passwd_form.php:42
-msgid "your account key"
-msgstr "váš klíč k účtu"
-
-#: ../user/edit_passwd_form.php:46
-msgid "Current password"
-msgstr "Současné heslo"
-
-#: ../user/edit_passwd_form.php:48
-msgid "<b>OR</b>: Account key"
-msgstr "<b>NEBO</b>: Klíč k účtu"
-
-#: ../user/edit_passwd_form.php:49
-msgid "Get account key by email"
-msgstr "Získat klíč k účtu zadáním emailu"
-
-#: ../user/edit_passwd_form.php:53
+#: ../user/edit_passwd_form.php:32
 msgid "New password"
 msgstr "Nové heslo"
 
-#: ../user/edit_passwd_form.php:54
+#: ../user/edit_passwd_form.php:33
 msgid "New password, again"
 msgstr "Nové heslo, pro kontrolu"
 
@@ -3371,17 +3265,13 @@ msgid ""
 "A tasks's <b>server state</b> indicates whether the task has been sent to a "
 "computer, and if so whether the computer has finished it. Possible values "
 "are:"
-msgstr ""
-"<b>Stav serveru</b> u úkolu ukazuje, zda byl již úkol odeslán uživateli, a "
-"pokud ano, tak zda ho počítač uživatele dokončil. Možné hodnoty jsou:"
+msgstr "<b>Stav serveru</b> u úkolu ukazuje, zda byl již úkol odeslán uživateli, a pokud ano, tak zda ho počítač uživatele dokončil. Možné hodnoty jsou:"
 
 #: ../user/explain_state.php:35
 msgid ""
 "The task is not ready to send (for example, because its input files are "
 "unavailable)"
-msgstr ""
-"Úkol dosud není připraven k odeslání (například protože zdrojové soubory "
-"nejsou dostupné)"
+msgstr "Úkol dosud není připraven k odeslání (například protože zdrojové soubory nejsou dostupné)"
 
 #: ../user/explain_state.php:38
 msgid "The task is ready to send, but hasn't been sent yet."
@@ -3399,9 +3289,7 @@ msgstr "Úkol byl zaslán, čeká se na dokončení."
 msgid ""
 "The task has been sent to a computer and either it has timed out or the "
 "computer has reported its completion."
-msgstr ""
-"Úkol byl odeslán uživateli a buď mu vypršela lhůta, nebo byl zpracován a "
-"nahlášen."
+msgstr "Úkol byl odeslán uživateli a buď mu vypršela lhůta, nebo byl zpracován a nahlášen."
 
 #: ../user/explain_state.php:49
 msgid "Outcomes"
@@ -3411,17 +3299,13 @@ msgstr "Výsledky"
 msgid ""
 "A tasks's <b>outcome</b> is defined if its server state is <b>over</b>. "
 "Possible values are:"
-msgstr ""
-"<b>Výsledek</b> u úkolu popisuje stav úkolu na serveru po jeho "
-"<b>dokončení</b>. Možné hodnoty jsou:"
+msgstr "<b>Výsledek</b> u úkolu popisuje stav úkolu na serveru po jeho <b>dokončení</b>. Možné hodnoty jsou:"
 
 #: ../user/explain_state.php:57
 msgid ""
 "The task was sent to a computer, but the computer has not yet completed the "
 "work and reported the outcome."
-msgstr ""
-"Úkol byl odeslán uživateli, ale uživatelův počítač tento úkol dosud "
-"nedokončil a nenahlásil výsledek."
+msgstr "Úkol byl odeslán uživateli, ale uživatelův počítač tento úkol dosud nedokončil a nenahlásil výsledek."
 
 #: ../user/explain_state.php:60
 msgid "A computer completed and reported the task successfully."
@@ -3431,9 +3315,7 @@ msgstr "Tento úkol byl počítačem uživatele úspěšně dokončen a odeslán
 msgid ""
 "The server wasn't able to send the task to a computer (perhaps because its "
 "resource requirements were too large)"
-msgstr ""
-"Server nebyl schopen odeslat tento úkol uživateli (pravděpodobně z důvodu "
-"nedostatku systémových prostředků)"
+msgstr "Server nebyl schopen odeslat tento úkol uživateli (pravděpodobně z důvodu nedostatku systémových prostředků)"
 
 #: ../user/explain_state.php:65
 msgid "Client error"
@@ -3447,25 +3329,19 @@ msgstr "Tento úkol byl odeslán uživateli a vyskytla se u něj chyba."
 msgid ""
 "The task was sent to a computer and no reply was received within the time "
 "limit."
-msgstr ""
-"Tento úkol byl odeslán uživateli a během lhůty pro vrácení nebyla doručena "
-"žádná odpověď."
+msgstr "Tento úkol byl odeslán uživateli a během lhůty pro vrácení nebyla doručena žádná odpověď."
 
 #: ../user/explain_state.php:72
 msgid ""
-"The task wasn't sent to a computer because enough other tasks were completed "
-"for this workunit."
-msgstr ""
-"Úkol nebyl odeslán uživateli, protože pro danou pracovní jednotku bylo již "
-"dokončeno dostatečné množství dílčích úkolů."
+"The task wasn't sent to a computer because enough other tasks were completed"
+" for this workunit."
+msgstr "Úkol nebyl odeslán uživateli, protože pro danou pracovní jednotku bylo již dokončeno dostatečné množství dílčích úkolů."
 
 #: ../user/explain_state.php:75
 msgid ""
 "The task was reported but could not be validated, typically because the "
 "output files were lost on the server."
-msgstr ""
-"Úkol byl dokončen, ale nemohl být na serveru ověřen, pravděpodobně kvůli "
-"tomu, že výsledné soubory se na serveru ztratily."
+msgstr "Úkol byl dokončen, ale nemohl být na serveru ověřen, pravděpodobně kvůli tomu, že výsledné soubory se na serveru ztratily."
 
 #: ../user/explain_state.php:80
 msgid "Client states"
@@ -3473,11 +3349,9 @@ msgstr "Stav klienta"
 
 #: ../user/explain_state.php:81
 msgid ""
-"A result's <b>client state</b> indicates the stage of processing at which an "
-"error occurred."
-msgstr ""
-"<b>Stav u klienta<b/> u výsledku popisuje fázi zpracování, během které "
-"nastala chyba."
+"A result's <b>client state</b> indicates the stage of processing at which an"
+" error occurred."
+msgstr "<b>Stav u klienta<b/> u výsledku popisuje fázi zpracování, během které nastala chyba."
 
 #: ../user/explain_state.php:86
 msgid "The computer has not yet completed the task."
@@ -3507,9 +3381,7 @@ msgstr "Čas nahlášení nebo lhůta pro dokončení"
 msgid ""
 "A task's <b>Time reported or deadline</b> field depends on whether the task "
 "has been reported yet:"
-msgstr ""
-"<b>Čas nahlášení nebo ukončení</b> u úkolu popisuje, zda byl již výsledek "
-"úkolu odeslán nebo ne:"
+msgstr "<b>Čas nahlášení nebo ukončení</b> u úkolu popisuje, zda byl již výsledek úkolu odeslán nebo ne:"
 
 #: ../user/explain_state.php:110
 msgid "Already reported"
@@ -3559,31 +3431,29 @@ msgstr "Použijte tlačítko Zpět ve vašem prohlížeči na návrat ke zpráv
 msgid "Sending emails"
 msgstr "Odesílání emailů"
 
-#: ../user/ffmail_action.php:84
+#: ../user/ffmail_action.php:82
 msgid "email sent successfully to %1"
 msgstr "email odeslán úspěšně %1"
 
-#: ../user/ffmail_action.php:86
+#: ../user/ffmail_action.php:84
 msgid "failed to send email to %1: %2"
 msgstr "email se nepodařilo odeslat %1: %2"
 
-#: ../user/ffmail_action.php:92
+#: ../user/ffmail_action.php:90
 msgid "Thanks for telling your friends about %1"
 msgstr "Děkujeme, že jste řekli svým přátelům o %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."
-msgstr ""
-"Zapomněli jste zadat jména nebo emailové adresy vašich přátel. %1Vraťte se "
-"prosím do formuláře%2 a zadejte je."
+"You forgot to enter your friends' names and/or email addresses; Please "
+"%1return to the form%2 and enter them."
+msgstr "Zapomněli jste zadat jména nebo emailové adresy vašich přátel. %1Vraťte se prosím do formuláře%2 a zadejte je."
 
 #: ../user/ffmail_form.php:30
 msgid ""
 "This project hasn't created an email message - please notify its "
 "administrators"
-msgstr ""
+msgstr "Tento projekt nevytvořil e-mail - prosím upozorněte jeho správce"
 
 #: ../user/ffmail_form.php:33
 msgid "Tell your friends about %1"
@@ -3591,18 +3461,14 @@ msgstr "Řekněte vašim přátelům o %1"
 
 #: ../user/ffmail_form.php:37
 msgid "Help us by telling your friends, family and coworkers about %1"
-msgstr ""
-"Pomožte nám tím, že řeknete svým přátelům, rodině či spolupracovníkům o %1"
+msgstr "Pomožte nám tím, že řeknete svým přátelům, rodině či spolupracovníkům o %1"
 
 #: ../user/ffmail_form.php:39
 msgid ""
 "Fill in this form with the names and email addresses of people you think "
 "might be interested in %1. We'll send them an email in your name, and you "
 "can add your own message if you like."
-msgstr ""
-"Vyplňte do tohoto formuláře jména a emailová adresy lidí, o kterých se "
-"domníváte, že by měli zájem o %1. Pošleme jim vašim jménem email, ke kterému "
-"můžete připojit i vlastní zprávu."
+msgstr "Vyplňte do tohoto formuláře jména a emailová adresy lidí, o kterých se domníváte, že by měli zájem o %1. Pošleme jim vašim jménem email, ke kterému můžete připojit i vlastní zprávu."
 
 #: ../user/ffmail_form.php:42
 msgid "Your name:"
@@ -3628,83 +3494,73 @@ msgstr "Doprovodná zpráva (volitelné)"
 msgid "Send"
 msgstr "Poslat"
 
-#: ../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 "Nemáte oprávnění vykazovat uživatele."
 
-#: ../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 "Hlasování o vykázání"
 
-#: ../user/forum_banishment_vote.php:50
+#: ../user/forum_banishment_vote.php:52
 msgid "No user with this ID found."
 msgstr "Nenalezen žádný uživatel s tímto 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 "Uživatel již byl vykázán"
 
-#: ../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 ""
-"Jste si jisti, že chcete vykázat %1?<br/>%1 nebude moci přispívat po určenou "
-"dobu.<br/>%1 by měl být vykázán jen tehdy, pokud se delší dobu opakovaně "
-"choval jako trol."
+msgstr "Jste si jisti, že chcete vykázat %1?<br/>%1 nebude moci přispívat po určenou dobu.<br/>%1 by měl být vykázán jen tehdy, pokud se delší dobu opakovaně choval jako trol."
 
-#: ../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 ""
-"Zvolte důvod a volitelně doplňte popis, proč by měl být uživatel vykázán."
+"Select the reason category, optionally write a longer description of why the"
+" user should be banished."
+msgstr "Zvolte důvod a volitelně doplňte popis, proč by měl být uživatel vykázán."
 
-#: ../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 "Nesluš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 "Útočný / Nenávistný email"
 
-#: ../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 "Požadavek uživatele"
 
-#: ../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 "Ostatní"
-
-#: ../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 "Důvod"
 
-#: ../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 "Poslán neprázdný"
 
-#: ../user/forum_banishment_vote.php:74
+#: ../user/forum_banishment_vote.php:77
 msgid "Proceed with vote"
 msgstr "Pokračovat s hlasováním"
 
-#: ../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 "Je třeba vybrat akci..."
 
@@ -3712,15 +3568,13 @@ msgstr "Je třeba vybrat akci..."
 msgid ""
 "You can no longer edit this post.<br/>Posts can only be edited at most %1 "
 "minutes after they have been created."
-msgstr ""
-"Tento příspěvek již nemůžete upravovat.<br/>Příspěvky mohou být upravované "
-"nejdéle %1 minut po vytvoření."
+msgstr "Tento příspěvek již nemůžete upravovat.<br/>Příspěvky mohou být upravované nejdéle %1 minut po vytvoření."
 
 #: ../user/forum_edit.php:47
 msgid "You are not authorized to edit this post."
 msgstr "Nejste oprávněn upravovat tento příspěvek."
 
-#: ../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"
 
@@ -3729,895 +3583,850 @@ msgid "Edit your message"
 msgstr "Upravit vaší zprávu"
 
 #: ../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 "Název"
 
-#: ../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 "Přidat můj podpis k tomuto příspěvku"
 
-#: ../user/forum_forum.php:41
+#: ../user/forum_forum.php:46
 msgid "Not visible to you"
 msgstr "Není pro vás viditelné"
 
-#: ../user/forum_forum.php:80
+#: ../user/forum_forum.php:83
 msgid "Team message board for %1"
 msgstr "Týmové diskuzní fórum pro %1"
 
-#: ../user/forum_forum.php:96
+#: ../user/forum_forum.php:99
 msgid "New thread"
 msgstr "Nové vlákno"
 
-#: ../user/forum_forum.php:96
+#: ../user/forum_forum.php:99
 msgid "Add a new thread to this forum"
 msgstr "Přidat nové vlákno do tohoto fóra"
 
-#: ../user/forum_forum.php:116
+#: ../user/forum_forum.php:119
 msgid "This message board is available as an %1RSS feed%2"
 msgstr "Příspěvky tohoto fóra jsou dosupné jako %1RSS zprávy%2"
 
-#: ../user/forum_forum.php:174
+#: ../user/forum_forum.php:178
 msgid "This thread is hidden"
 msgstr "Toto vlákno je schované"
 
-#: ../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 "Toto vlákno je trvale viditelné a zamčené, dosud jste ho nečetli"
 
-#: ../user/forum_forum.php:178
+#: ../user/forum_forum.php:182
 msgid "sticky/locked/unread"
 msgstr "trvale viditelné/zamčené/nepřečtené"
 
-#: ../user/forum_forum.php:180
+#: ../user/forum_forum.php:184
 msgid "This thread is sticky and you haven't read it yet"
 msgstr "Toto vlákno je trvale viditelné a dosud jste ho nečetli"
 
-#: ../user/forum_forum.php:180
+#: ../user/forum_forum.php:184
 msgid "sticky/unread"
 msgstr "trvale viditelné/nepřečtené"
 
-#: ../user/forum_forum.php:184
+#: ../user/forum_forum.php:188
 msgid "You haven't read this thread yet, and it's locked"
 msgstr "Toto vlákno, které je nyní zamčené, jste dosud nečetli"
 
-#: ../user/forum_forum.php:184
+#: ../user/forum_forum.php:188
 msgid "unread/locked"
 msgstr "nepřečtené/zamčené"
 
-#: ../user/forum_forum.php:186
+#: ../user/forum_forum.php:190
 msgid "You haven't read this thread yet"
 msgstr "Toto vlákno jste dosud nečetli"
 
-#: ../user/forum_forum.php:192
+#: ../user/forum_forum.php:196
 msgid "This thread is sticky and locked"
 msgstr "Toto vlákno je trvale viditelné a zamčené"
 
-#: ../user/forum_forum.php:192
+#: ../user/forum_forum.php:196
 msgid "sticky/locked"
 msgstr "trvale viditelné/zamčené"
 
-#: ../user/forum_forum.php:194
+#: ../user/forum_forum.php:198
 msgid "This thread is sticky"
 msgstr "Toto vlákno je trvale viditelné"
 
-#: ../user/forum_forum.php:194
+#: ../user/forum_forum.php:198
 msgid "sticky"
 msgstr "trvale viditelné"
 
-#: ../user/forum_forum.php:198
+#: ../user/forum_forum.php:202
 msgid "This thread is locked"
 msgstr "Toto vlákno je zamčené"
 
-#: ../user/forum_forum.php:198
+#: ../user/forum_forum.php:202
 msgid "locked"
 msgstr "zamčené"
 
-#: ../user/forum_forum.php:200
+#: ../user/forum_forum.php:204
 msgid "You read this thread"
 msgstr "Čtete toto vlákno"
 
-#: ../user/forum_forum.php:200
+#: ../user/forum_forum.php:204
 msgid "read"
 msgstr "přečtené"
 
-#: ../user/forum_help_desk.php:27
+#: ../user/forum_help_desk.php:29
 msgid "Questions and answers"
 msgstr "Otázky a odpovědi"
 
-#: ../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 ""
-"Promluvte si pomocí programu Skype s dobrovolníky mluvícími mnoha jazyky. "
-"Jděte na %1BOINC Online nápověda%2."
+"Talk live via Skype with a volunteer, in any of several languages. Go to "
+"%1BOINC Online Help%2."
+msgstr "Promluvte si pomocí programu Skype s dobrovolníky mluvícími mnoha jazyky. Jděte na %1BOINC Online nápověda%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éma"
 
-#: ../user/forum_help_desk.php:45
+#: ../user/forum_help_desk.php:47
 msgid "Questions"
 msgstr "Otázky"
 
-#: ../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 "Diskuze členů %1"
 
-#: ../user/forum_index.php:69
+#: ../user/forum_index.php:74
 msgid "%1 Message boards"
 msgstr "%1 Diskuzní fóra"
 
-#: ../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 ""
-"Pokud máte nějaké dotazy či problémy, podívejte se prosím na sekci %1Otázky "
-"a odpovědi%2 na diskuzním fóru."
+msgstr "Pokud máte nějaké dotazy či problémy, podívejte se prosím na sekci %1Otázky a odpovědi%2 na diskuzním fóru."
 
-#: ../user/forum_index.php:123
+#: ../user/forum_index.php:128
 msgid "Subscribed threads"
 msgstr "Sledovaná vlákna"
 
-#: ../user/forum_moderate_post.php:43
+#: ../user/forum_moderate_post.php:45
 msgid "Moderate post"
 msgstr "Moderovat příspěvek"
 
-#: ../user/forum_moderate_post.php:52
+#: ../user/forum_moderate_post.php:55
 msgid "Hide post"
 msgstr "Skrýt příspěvek"
 
-#: ../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 "Komerční spam"
 
-#: ../user/forum_moderate_post.php:58
+#: ../user/forum_moderate_post.php:61
 msgid "Doublepost"
 msgstr "Dvojité odeslání"
 
-#: ../user/forum_moderate_post.php:63
+#: ../user/forum_moderate_post.php:66
 msgid "Move post"
 msgstr "Přesunout příspěvek"
 
-#: ../user/forum_moderate_post.php:65
+#: ../user/forum_moderate_post.php:68
 msgid "Destination thread ID:"
 msgstr "Cílové ID vlákna:"
 
-#: ../user/forum_moderate_post.php:78
+#: ../user/forum_moderate_post.php:81
 msgid "Banish user"
 msgstr "Vykázat uživatele"
 
-#: ../user/forum_moderate_post.php:80
+#: ../user/forum_moderate_post.php:83
 msgid "Ban duration"
 msgstr "Doba vykázání"
 
-#: ../user/forum_moderate_post.php:81
+#: ../user/forum_moderate_post.php:84
 msgid "4 hours"
 msgstr "4 hodiny"
 
-#: ../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 den"
 
-#: ../user/forum_moderate_post.php:83
+#: ../user/forum_moderate_post.php:86
 msgid "1 week"
 msgstr "1 týden"
 
-#: ../user/forum_moderate_post.php:84
+#: ../user/forum_moderate_post.php:87
 msgid "2 weeks"
 msgstr "2 týdny"
 
-#: ../user/forum_moderate_post.php:85
+#: ../user/forum_moderate_post.php:88
 msgid "1 month"
 msgstr "1 měsíc"
 
-#: ../user/forum_moderate_post.php:86
+#: ../user/forum_moderate_post.php:89
 msgid "Forever"
 msgstr "Navždy"
 
-#: ../user/forum_moderate_post.php:96
-msgid "Optional explanation %1 This is included in email to user.%2"
-msgstr "Volitelné vysvětlení %1 Toto bude součástí emailu uživateli.%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 "Volitelné vysvětlení %1 Toto bude součástí emailu uživateli.%2"
+
+#: ../user/forum_moderate_post_action.php:60
 msgid "You are not authorized to moderate this post."
 msgstr "Nejste oprávněn moderovat tento příspěvek."
 
-#: ../user/forum_moderate_post_action.php:85
+#: ../user/forum_moderate_post_action.php:105
 msgid "Can't move to different category type"
 msgstr "Nelze přesunout do jiného typu kategorie"
 
-#: ../user/forum_moderate_post_action.php:89
+#: ../user/forum_moderate_post_action.php:109
 msgid "Can't move to different category"
 msgstr "Nelze přesunout do jiné kategorie"
 
-#: ../user/forum_moderate_post_action.php:110
+#: ../user/forum_moderate_post_action.php:130
 msgid "Not authorized to banish users"
 msgstr "Nemáte oprávnění vykazovat uživatele"
 
-#: ../user/forum_moderate_post_action.php:126
+#: ../user/forum_moderate_post_action.php:146
 msgid "Banishment"
 msgstr "Vykázání"
 
-#: ../user/forum_moderate_post_action.php:128
+#: ../user/forum_moderate_post_action.php:148
 msgid "User %1 has been banished."
 msgstr "Uživatel %1 byl vykázán."
 
-#: ../user/forum_moderate_post_action.php:131
+#: ../user/forum_moderate_post_action.php:151
 msgid "Action failed: possible database problem"
 msgstr "Akce selhala: Pravděpodobně problém s databází"
 
-#: ../user/forum_moderate_thread.php:33
+#: ../user/forum_moderate_thread.php:38
 msgid "not authorized"
 msgstr "nemáte oprávnění"
 
-#: ../user/forum_moderate_thread.php:36
+#: ../user/forum_moderate_thread.php:41
 msgid "Moderate thread '%1'"
 msgstr "Moderovat vlákno '%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 ""
-"Zvolte důvod, nebo jej napište ručně, proč schováváte nebo zamykáte toto "
-"vlákno, potom klikněte na OK."
+msgstr "Zvolte důvod, nebo jej napište ručně, proč schováváte nebo zamykáte toto vlákno, potom klikněte na OK."
 
-#: ../user/forum_moderate_thread.php:72
+#: ../user/forum_moderate_thread.php:78
 msgid "Current forum"
 msgstr "Aktuální forum"
 
-#: ../user/forum_moderate_thread.php:73
+#: ../user/forum_moderate_thread.php:79
 msgid "Destination forum"
 msgstr "Cílové forum"
 
-#: ../user/forum_moderate_thread.php:77
+#: ../user/forum_moderate_thread.php:83
 msgid "New title:"
 msgstr "Nový nadpis:"
 
-#: ../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 ""
-"Zde mohou zakládat vlákna jen administrátoři projektu. Můžete ale přispívat "
-"do existujících vláken."
+msgstr "Zde mohou zakládat vlákna jen administrátoři projektu. Můžete ale přispívat do existujících vláken."
 
-#: ../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 ""
-"Vaše zpráva byla ohodnocena anti-spamovým systémem Akismet jako spam. "
-"Upravte jí prosím a zkuste jí vložit znova."
+msgstr "Vaše zpráva byla ohodnocena anti-spamovým systémem Akismet jako spam. Upravte jí prosím a zkuste jí vložit znova."
 
-#: ../user/forum_post.php:70
+#: ../user/forum_post.php:74
 msgid "Create new thread"
 msgstr "Vytvořit nové vlákno"
 
-#: ../user/forum_post.php:100
+#: ../user/forum_post.php:104
 msgid "Create a new thread"
 msgstr "Vytvořit nové vlákno"
 
-#: ../user/forum_post.php:105
+#: ../user/forum_post.php:109
 msgid "Remember to add a title"
 msgstr "Nezapomeňte přidat nadpis"
 
-#: ../user/forum_post.php:127
+#: ../user/forum_post.php:131
 msgid "Show this item as a Notice in the BOINC Manager"
 msgstr "Zobraz tuto položku jako Zprávu v BOINC Manažeru"
 
-#: ../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 ""
-"Udělejte tak pouze pro položky, které mohou zajímat všechny dobrovolníky."
+msgstr "Udělejte tak pouze pro položky, které mohou zajímat všechny dobrovolníky."
 
-#: ../user/forum_rate.php:26
+#: ../user/forum_rate.php:28
 msgid "Rating offline"
 msgstr "Hodnocení offline"
 
-#: ../user/forum_rate.php:27
+#: ../user/forum_rate.php:29
 msgid "This function is turned off by the project"
 msgstr "Tato vlastnost je vypnutá projektem"
 
-#: ../user/forum_rate.php:58
+#: ../user/forum_rate.php:60
 msgid "You need more average or total credit to rate a post."
-msgstr ""
-"Potřebujete více průměrného nebo celkového kreditu pro ohodnocení příspěvku."
+msgstr "Potřebujete více průměrného nebo celkového kreditu pro ohodnocení příspěvku."
 
-#: ../user/forum_rate.php:62
+#: ../user/forum_rate.php:64
 msgid "You have already rated this post."
 msgstr "Tento příspěvek již byl ohodnocen."
 
-#: ../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 "Vrátit se do vlákna"
 
-#: ../user/forum_rate.php:72
+#: ../user/forum_rate.php:74
 msgid "Input Recorded"
 msgstr "Příspěvek zaznamenán"
 
-#: ../user/forum_rate.php:73
+#: ../user/forum_rate.php:75
 msgid "Your input has been recorded. Thanks for your help."
 msgstr "Váš příspěvek byl zaznamenán. Děkujeme za vaší pomoc."
 
-#: ../user/forum_rate.php:75
+#: ../user/forum_rate.php:77
 msgid "Vote Registered"
 msgstr "Hlas uložen"
 
-#: ../user/forum_rate.php:76
+#: ../user/forum_rate.php:78
 msgid "Your rating has been recorded. Thanks for your input."
 msgstr "Váš hlas byl uložen. Děkujeme za vaší pomoc."
 
-#: ../user/forum_rate.php:80
+#: ../user/forum_rate.php:82
 msgid "Vote Submission Problem"
 msgstr "Problém s odesíláním hlasu"
 
-#: ../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 ""
-"Váš příspěvek byl ohodnocen anti-spamovým systémem Akismet jako spam. "
-"Upravte ho prosím a zkuste jej vložit znova."
+msgstr "Váš příspěvek byl ohodnocen anti-spamovým systémem Akismet jako spam. Upravte ho prosím a zkuste jej vložit znova."
 
-#: ../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 "Přidat příspěvek"
 
-#: ../user/forum_reply.php:137
+#: ../user/forum_reply.php:143
 msgid "Message:"
 msgstr "Zpráva:"
 
-#: ../user/forum_reply.php:140
+#: ../user/forum_reply.php:146
 msgid "reply to %1Message ID%2:"
 msgstr "odpovědět na %1ID zprávy%2:"
 
-#: ../user/forum_reply.php:166
+#: ../user/forum_reply.php:172
 msgid "Post reply"
 msgstr "Odpovědět"
 
-#: ../user/forum_reply.php:169
+#: ../user/forum_reply.php:175
 msgid "Add my signature to this reply"
 msgstr "Přidat můj podpis k této odpovědi"
 
-#: ../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 ""
-"Potřebujete více průměrného nebo celkového kreditu pro nahlášení příspěvku."
+msgstr "Potřebujete více průměrného nebo celkového kreditu pro nahlášení příspěvku."
 
-#: ../user/forum_report_post.php:65
+#: ../user/forum_report_post.php:68
 msgid "Report Registered"
 msgstr "Nahlášení provedeno"
 
-# 92%
-#: ../user/forum_report_post.php:66
+#: ../user/forum_report_post.php:69
 msgid "Your report has been recorded. Thanks for your input."
 msgstr "Vaše nahlášení bylo uloženo. Děkujeme za vaší pomoc."
 
-#: ../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 ""
-"Moderátor nyní zkontroluje vaše nahlášení a rozhodne, co se stane dále - to "
-"může nějakou dobu trvat, prosíme o ztrpení"
+msgstr "Moderátor nyní zkontroluje vaše nahlášení a rozhodne, co se stane dále - to může nějakou dobu trvat, prosíme o ztrpení"
 
-#: ../user/forum_report_post.php:71
+#: ../user/forum_report_post.php:74
 msgid "Report a forum post"
 msgstr "Nahlásit příspěvek"
 
-#: ../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 "
+"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 ""
-"Před nahlášením tohoto příspěvku zvažte použití hodnocení pomocí +/-. Pokud "
-"dostatečný počet uživatelů udělí negativní  hodnocení, příspěvek bude "
-"schován.<br/>Hodnocení +/- najdete ve spodku příspěvku."
+msgstr "Před nahlášením tohoto příspěvku zvažte použití hodnocení pomocí +/-. Pokud dostatečný počet uživatelů udělí negativní  hodnocení, příspěvek bude schován.<br/>Hodnocení +/- najdete ve spodku příspěvku."
 
-#: ../user/forum_report_post.php:80
+#: ../user/forum_report_post.php:83
 msgid "Report post"
 msgstr "Nahlásit příspěvek"
 
-#: ../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"
+"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 ""
-"Čím vás tento příspěvek uráží: %1Vyplňte prosím dostatek údajů, aby člověk,\n"
-"který příspěvek dosud nečetl, snadno našel daný problém.%2"
+msgstr "Čím vás tento příspěvek uráží: %1Vyplňte prosím dostatek údajů, aby člověk,\nkterý příspěvek dosud nečetl, snadno našel daný problém.%2"
 
-#: ../user/forum_report_post.php:90
+#: ../user/forum_report_post.php:93
 msgid "Report not registered"
 msgstr "Nahlásit nepřihlášený"
 
-#: ../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 "Váš záznam nemohl být uložen. Počkejte prosím chvíli a zkuste to znova."
 
-#: ../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."
+"If this is not a temporary error, please report it to the project "
+"developers."
 msgstr "Pokud toto není vyjímečná chyba, kontaktujte prosím správce projektu."
 
-#: ../user/forum_rss.php:41
+#: ../user/forum_rss.php:38
 msgid "%1 RSS feed"
 msgstr "%1 RSS zprávy"
 
-#: ../user/forum_rss.php:42
+#: ../user/forum_rss.php:39
 msgid "This message board is available as an RSS feed."
 msgstr "Příspěvky tohoto fóra jsou dosupné jako RSS zprávy."
 
-#: ../user/forum_rss.php:43
+#: ../user/forum_rss.php:41
 msgid "Options:"
 msgstr "Možnosti:"
 
-#: ../user/forum_rss.php:47
+#: ../user/forum_rss.php:45
 msgid "Include only posts by user ID %1 (default: all users)."
-msgstr ""
-"Zahrnout pouze příspěvky od uživatele s ID %1 (výchozí: od všech uživatelů)"
+msgstr "Zahrnout pouze příspěvky od uživatele s ID %1 (výchozí: od všech uživatelů)"
 
-#: ../user/forum_rss.php:49
+#: ../user/forum_rss.php:47
 msgid "Include only posts from the last %1 days (default: 30)."
 msgstr "Zahrnout pouze příspěvky za posledních %1 dní (výchozí: za 30 dní)."
 
-#: ../user/forum_rss.php:51
-msgid "Truncate posts: %1 (Include only first 265 characters of each post)"
-msgstr ""
-"Zkrátit příspěvky: %1 (Zahrnout pouze prvních 265 znaků z každého příspěvku)"
-
-#: ../user/forum_rss.php:53
+#: ../user/forum_rss.php:49
 msgid "Threads only: %1 (Include only the first post of every thread)"
 msgstr "Pouze vlákna: %1 (Zahrnout pouze první příspěvek v každém vláknu)"
 
-#: ../user/forum_search.php:27
+#: ../user/forum_search.php:29
 msgid "Forum search"
 msgstr "Hledat na fóru"
 
-#: ../user/forum_search.php:31
+#: ../user/forum_search.php:33
 msgid "Search query"
 msgstr "Vyhledávaný dotaz"
 
-#: ../user/forum_search.php:32
+#: ../user/forum_search.php:34
 msgid "Search for keywords:"
 msgstr "Hledat klíčová slova:"
 
-#: ../user/forum_search.php:33
+#: ../user/forum_search.php:35
 msgid "Posts that contain all the specified words will be displayed"
 msgstr "Budou zobrazeny příspěvky, které obsahují všechna zadaná slova"
 
-#: ../user/forum_search.php:35
+#: ../user/forum_search.php:37
 msgid "For example: \"screensaver freeze\""
 msgstr "Například: \"spořič obrazovky zatuhává\""
 
-#: ../user/forum_search.php:36
+#: ../user/forum_search.php:38
 msgid "Search for author ID:"
 msgstr "Hledat ID autora:"
 
-#: ../user/forum_search.php:37
+#: ../user/forum_search.php:39
 msgid "Only posts by this author will be displayed"
 msgstr "Budou zobrazeny pouze příspěvky od tohoto autora"
 
-#: ../user/forum_search.php:39
+#: ../user/forum_search.php:41
 msgid "For example: \"43214\""
 msgstr "Například: \"43214\""
 
-#: ../user/forum_search.php:41
+#: ../user/forum_search.php:43
 msgid "Search options"
 msgstr "Možnosti vyhledávání"
 
-#: ../user/forum_search.php:42
+#: ../user/forum_search.php:44
 msgid "Search limits"
 msgstr "Limity vyhledávání"
 
-#: ../user/forum_search.php:43
+#: ../user/forum_search.php:45
 msgid "Search at most this many days back in time"
 msgstr "Hledat pouze tolik dní nazpět"
 
-#: ../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 měsíců"
 
-#: ../user/forum_search.php:52
+#: ../user/forum_search.php:54
 msgid "1 year"
 msgstr "1 rok"
 
-#: ../user/forum_search.php:73
+#: ../user/forum_search.php:55
+msgid "no limit"
+msgstr "bez omezení"
+
+#: ../user/forum_search.php:75
 msgid "Only display posts from this forum"
 msgstr "Zobrazit pouze příspěvky z této diskuze"
 
-#: ../user/forum_search.php:84
+#: ../user/forum_search.php:86
 msgid "Sort by"
 msgstr "Třídit podle"
 
-#: ../user/forum_search.php:88
+#: ../user/forum_search.php:90
 msgid "Start the search"
 msgstr "Spustit hledání"
 
-#: ../user/forum_search_action.php:141
+#: ../user/forum_search_action.php:143
 msgid "Forum search results"
 msgstr "Výsledky hledání na fóru"
 
-#: ../user/forum_search_action.php:174
+#: ../user/forum_search_action.php:176
 msgid "Thread titles matching your query:"
 msgstr "Vlákna odpovídající vašemu dotazu."
 
-#: ../user/forum_search_action.php:194
+#: ../user/forum_search_action.php:196
 msgid "Messages matching your query:"
 msgstr "Zprávy odpovídající vašemu dotazu."
 
-#: ../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 ""
-"Bohužel, nebylo nalezeno nic, co by odpovídalo vašemu dotazu. Zkuste "
-"rozšířit výsledky vyhledávání použitím méně slov (nebo více specifických "
-"slov)."
+msgstr "Bohužel, nebylo nalezeno nic, co by odpovídalo vašemu dotazu. Zkuste rozšířit výsledky vyhledávání použitím méně slov (nebo více specifických slov)."
 
-#: ../user/forum_search_action.php:219
+#: ../user/forum_search_action.php:221
 msgid "You can also %1try the same search on Google.%2"
 msgstr "Můžete také zkusit %1vyhledat stejný dotaz pomocí Google.%2"
 
-#: ../user/forum_search_action.php:224
+#: ../user/forum_search_action.php:226
 msgid "Perform another search"
 msgstr "Zkusit jiné vyhledávání"
 
-#: ../user/forum_subscribe.php:46
+#: ../user/forum_subscribe.php:48
 msgid "Subscription successful"
 msgstr "Nastavení odebírání příspěvků bylo úspěšné"
 
-#: ../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 ""
-"Jste nyní přihlášen k %1, budete nyní upozorněn kdykoliv zde přibyde nový "
-"příspěvek."
+msgstr "Jste nyní přihlášen k %1, budete nyní upozorněn kdykoliv zde přibyde nový příspěvek."
 
-#: ../user/forum_subscribe.php:51
+#: ../user/forum_subscribe.php:53
 msgid "Subscription failed"
 msgstr "Nastavení odebírání příspěvků selhalo"
 
-#: ../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 ""
-"Momentálně není možné nastavit vám odebírání příspěvků z %1. Zkuste to "
-"prosím později."
+msgstr "Momentálně není možné nastavit vám odebírání příspěvků z %1. Zkuste to prosím později."
 
-#: ../user/forum_subscribe.php:61
+#: ../user/forum_subscribe.php:63
 msgid "Unsubscription successful"
 msgstr "Zrušení odebírání příspěvků bylo úspěšné"
 
-#: ../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 ""
-"Již nejste přihlášen k %1, nebudete dále dostávat upozornění o tomto vláknu."
+"You are no longer subscribed to %1. You will no longer receive notifications"
+" for this thread."
+msgstr "Již nejste přihlášen k %1, nebudete dále dostávat upozornění o tomto vláknu."
 
-#: ../user/forum_subscribe.php:66
+#: ../user/forum_subscribe.php:68
 msgid "Unsubscription failed"
 msgstr "Zrušení odebírání příspěvků selhalo"
 
-#: ../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 ""
-"Momentálně není možné zrušit vám odebírání příspěvků z %1. Zkuste to prosím "
-"později."
+msgstr "Momentálně není možné zrušit vám odebírání příspěvků z %1. Zkuste to prosím později."
 
-#: ../user/forum_subscribe.php:74
+#: ../user/forum_subscribe.php:76
 msgid "Unknown subscription action"
 msgstr "Neznámá akce pro odebírání příspěvků"
 
-#: ../user/forum_thread.php:61
+#: ../user/forum_thread.php:66
 msgid "This forum is not visible to you."
 msgstr "Toto fórum pro vás není přístupné."
 
-#: ../user/forum_thread.php:69
+#: ../user/forum_thread.php:74
 msgid "This thread has been hidden by moderators."
 msgstr "Toto vlákno bylo schováno správcem."
 
-#: ../user/forum_thread.php:128
+#: ../user/forum_thread.php:129
 msgid "My question was answered"
 msgstr "Má otázka byla zodpovězena."
 
-#: ../user/forum_thread.php:129
+#: ../user/forum_thread.php:130
 msgid "Click here if your question has been adequately answered"
 msgstr "Pokud byla vaše otázka dostatečně zodpovězena, klikněte prosím sem."
 
-#: ../user/forum_thread.php:137
+#: ../user/forum_thread.php:138
 msgid "I've also got this question"
 msgstr "Také mám tuto otázku"
 
-#: ../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 "Přidat zprávu do tohoto vlákna"
 
-#: ../user/forum_thread.php:171
+#: ../user/forum_thread.php:172
 msgid "Unsubscribe"
 msgstr "Zrušit odebírání příspěvků"
 
-#: ../user/forum_thread.php:172
+#: ../user/forum_thread.php:173
 msgid "You are subscribed to this thread.  Click here to unsubscribe."
-msgstr ""
-"Odebíráte příspěvky z tohoto vlákna. Klikněte sem pro zrušení odebírání."
+msgstr "Odebíráte příspěvky z tohoto vlákna. Klikněte sem pro zrušení odebírání."
 
-#: ../user/forum_thread.php:178
+#: ../user/forum_thread.php:179
 msgid "Subscribe"
 msgstr "Odebírat příspěvky"
 
-#: ../user/forum_thread.php:179
+#: ../user/forum_thread.php:180
 msgid "Click to get email when there are new posts in this thread"
 msgstr "Klikněte pro zasílání emailu při každém novém příspěvku v tomto vlákně."
 
-#: ../user/forum_thread.php:190
+#: ../user/forum_thread.php:191
 msgid "Unhide this thread"
 msgstr "Odkrýt toto vlákno"
 
-#: ../user/forum_thread.php:196
+#: ../user/forum_thread.php:197
 msgid "Hide this thread"
 msgstr "Skrýt toto vlákno"
 
-#: ../user/forum_thread.php:202
+#: ../user/forum_thread.php:203
 msgid "Make unsticky"
 msgstr "Zrušit trvalou viditelnost"
 
-#: ../user/forum_thread.php:203
+#: ../user/forum_thread.php:204
 msgid "Make this thread not sticky"
 msgstr "Zrušit trvalou viditelnost tohoto vlákna"
 
-#: ../user/forum_thread.php:208
+#: ../user/forum_thread.php:209
 msgid "Make sticky"
 msgstr "Nastavit trvalou viditelnost"
 
-#: ../user/forum_thread.php:209
-msgid "Make this thread sticky"
-msgstr "Nastavit trvalou viditelnost tohoto vlákna"
+#: ../user/forum_thread.php:210
+msgid "Make this thread always appear at top of forum"
+msgstr "Udělat toto vlákno vždy se zobrazujícím v horní části fóra"
 
-#: ../user/forum_thread.php:215
+#: ../user/forum_thread.php:216
 msgid "Unlock"
 msgstr "Odemknout"
 
-#: ../user/forum_thread.php:216
-msgid "Unlock this thread"
-msgstr "Odemknout toto vlákno"
+#: ../user/forum_thread.php:217
+msgid "Allow new posts in this thread"
+msgstr "Povolit nové příspěvky v tomto vlákně"
 
-#: ../user/forum_thread.php:221
+#: ../user/forum_thread.php:222
 msgid "Lock"
 msgstr "Zamknout"
 
-#: ../user/forum_thread.php:222
-msgid "Lock this thread"
-msgstr "Zamknout toto vlákno"
+#: ../user/forum_thread.php:223
+msgid "Don't allow new posts in this thread"
+msgstr "Nepovolovat nové příspěvky v tomto vlákně"
 
-#: ../user/forum_thread.php:229
+#: ../user/forum_thread.php:230
 msgid "Move this thread to a different forum"
 msgstr "Přesunout toto vlákno do jiného fóra"
 
-#: ../user/forum_thread.php:234
+#: ../user/forum_thread.php:235
 msgid "Edit title"
 msgstr "Upravit nadpis"
 
-#: ../user/forum_thread.php:235
+#: ../user/forum_thread.php:236
 msgid "Edit thread title"
 msgstr "Upravit nadpis vlákna"
 
-#: ../user/forum_thread.php:245
+#: ../user/forum_thread.php:244
+msgid "Delete thread permanently"
+msgstr "Natrvalo odstranit vlákno"
+
+#: ../user/forum_thread.php:254
 msgid "Export as Notice"
 msgstr "Exportovat jako Zprávu"
 
-#: ../user/forum_thread.php:251
+#: ../user/forum_thread.php:260
 msgid "Don't export"
 msgstr "Neexportovat"
 
-#: ../user/forum_thread.php:252
+#: ../user/forum_thread.php:261
 msgid "Don't export this news item as a Notice"
 msgstr "Neexportovat tuto novinku jako Zprávu"
 
-#: ../user/forum_thread.php:260 ../user/forum_thread.php:262
+#: ../user/forum_thread.php:270 ../user/forum_thread.php:272
 msgid "Sort"
 msgstr "Setřídit"
 
-#: ../user/forum_thread_status.php:49
+#: ../user/forum_thread_status.php:54
 msgid "Thread status updated"
 msgstr "Stav vlákna byl aktualizován"
 
-#: ../user/forum_thread_status.php:50
+#: ../user/forum_thread_status.php:55
 msgid "The status has been updated."
 msgstr "Status byl aktualizován."
 
-#: ../user/forum_user_posts.php:73
+#: ../user/forum_user_posts.php:75
 msgid "Posts by %1"
 msgstr "Příspěvky od %1"
 
-#: ../user/friend.php:33
+#: ../user/friend.php:35
 msgid "Already friends"
 msgstr "Současní přátelé"
 
-#: ../user/friend.php:39
+#: ../user/friend.php:41
 msgid "You requested friendship with %1 on %2."
 msgstr "Požádali jste o přátelství s %1 v %2."
 
-#: ../user/friend.php:41
+#: ../user/friend.php:43
 msgid "This request is still pending confirmation."
 msgstr "Žádost stále očekává potvrzení."
 
-#: ../user/friend.php:52
+#: ../user/friend.php:54
 msgid "%1 is not accepting friendship requests from you"
 msgstr "%1 nepřijímá vaše žádosti o přátelství"
 
-#: ../user/friend.php:61
+#: ../user/friend.php:63
 msgid "You can't be friends with yourself"
 msgstr "Nemůžete mít jako přítele sami sebe"
 
-#: ../user/friend.php:69
+#: ../user/friend.php:71
 msgid "Add friend"
 msgstr "Přidat jako přítele"
 
-#: ../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 ""
-"Požádali jste o přidání %1 jako svého přítele. %1 nyní dostane zprávu s vaší "
-"žádostí pro potvrzení přátelství."
+"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 "Požádali jste o přidání %1 jako svého přítele. %1 nyní dostane zprávu s vaší žádostí pro potvrzení přátelství."
 
-#: ../user/friend.php:77
+#: ../user/friend.php:79
 msgid "Add an optional message here:"
 msgstr "Přidat doprovodnou zprávu:"
 
-#: ../user/friend.php:115
+#: ../user/friend.php:117
 msgid "Friend request sent"
 msgstr "Žádost o přátelství zaslána"
 
-#: ../user/friend.php:116
+#: ../user/friend.php:118
 msgid "We have notified %1 of your request."
 msgstr "%1 dostal vaší žádost."
 
-#: ../user/friend.php:126
+#: ../user/friend.php:128
 msgid "Please log in as %1"
 msgstr "Přihlašte se prosím jako %1"
 
-#: ../user/friend.php:127
+#: ../user/friend.php:129
 msgid "You must log in as %1 to view this friend request"
 msgstr "Musíte se přihlásit jako %1 pro zobrazení této žádosti o přátelství"
 
-#: ../user/friend.php:138
+#: ../user/friend.php:140
 msgid "Friend request"
 msgstr "Žádost o přátelství"
 
-#: ../user/friend.php:141
+#: ../user/friend.php:143
 msgid "%1 has requested friendship with you."
 msgstr "%1 vás požádal o přátelství."
 
-#: ../user/friend.php:143
+#: ../user/friend.php:145
 msgid "%1 says: %2"
 msgstr "%1 říká: %2"
 
-#: ../user/friend.php:146
+#: ../user/friend.php:148
 msgid "Accept friendship"
 msgstr "Přijmout přátelství"
 
-#: ../user/friend.php:146
+#: ../user/friend.php:148
 msgid "Click accept if %1 is in fact a friend"
 msgstr "Klikněte na přijmout, pokud je %1 vaším přítelem"
 
-#: ../user/friend.php:147
+#: ../user/friend.php:149
 msgid "Decline"
 msgstr "Odmítnout"
 
-#: ../user/friend.php:147
+#: ../user/friend.php:149
 msgid "Click decline if %1 is not a friend"
 msgstr "Klikněte na odmítnout, pokud %1 není vaším přítelem"
 
-#: ../user/friend.php:186
+#: ../user/friend.php:188
 msgid "Friendship confirmed"
 msgstr "Přátelství potvrzeno"
 
-#: ../user/friend.php:187
+#: ../user/friend.php:189
 msgid "Your friendship with %1 has been confirmed."
 msgstr "Vaše přátelství s %1 bylo potvrzeno."
 
-#: ../user/friend.php:205
+#: ../user/friend.php:207
 msgid "Friendship declined"
 msgstr "Přátelství zamítnuto"
 
-#: ../user/friend.php:206
+#: ../user/friend.php:208
 msgid "You have declined friendship with %1"
 msgstr "Odmítli jste přítelství s %1"
 
-#: ../user/friend.php:221
+#: ../user/friend.php:223
 msgid "Notification not found"
 msgstr "Oznámení nenalezeno"
 
-#: ../user/friend.php:223
+#: ../user/friend.php:225
 msgid "Friend confirmed"
 msgstr "Přítel potvrzen"
 
-#: ../user/friend.php:224
+#: ../user/friend.php:226
 msgid "You are now friends with %1."
 msgstr "%1 je nyní vaším přítelem."
 
-#: ../user/friend.php:232
+#: ../user/friend.php:234
 msgid "Cancel friendship?"
 msgstr "Zrušit přátelství?"
 
-#: ../user/friend.php:234
+#: ../user/friend.php:236
 msgid "Are you sure you want to cancel your friendship with %1?"
 msgstr "Jste si jistí, že chcete zrušit vaše přátelství s %1?"
 
-#: ../user/friend.php:239
+#: ../user/friend.php:241
 msgid "Stay friends"
 msgstr "Zůstat přáteli"
 
-#: ../user/friend.php:249
+#: ../user/friend.php:251
 msgid "Friendship cancelled"
 msgstr "Přátelství zrušeno"
 
-#: ../user/friend.php:250
+#: ../user/friend.php:252
 msgid "Your friendship with %1 has been cancelled."
 msgstr "Vaše přátelství s %1 bylo zrušeno."
 
-#: ../user/get_passwd.php:25
-msgid "Forgot your account info?"
-msgstr "Zapomenout informace o vašem účtu?"
-
-#: ../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) Pokud víte emailovou adresu od vašeho a můžete na této adrese přijímat "
-"emaily:"
+"1) If you know your account's email address, and you can receive email "
+"there:"
+msgstr "1) Pokud víte emailovou adresu od vašeho a můžete na této adrese přijímat emaily:"
 
-#: ../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."
-msgstr ""
-"Zadejte tuto emailovou adresu níže a klikněte na OK. Budou vám zaslány "
-"informace k resetování vašeho hesla."
+msgstr "Zadejte tuto emailovou adresu níže a klikněte na OK. Budou vám zaslány informace k resetování vašeho hesla."
 
 #: ../user/get_passwd.php:46
 msgid ""
 "2) If you forgot your account's email address, or you can't receive email "
 "there:"
-msgstr ""
-"2) Pokud jste zapomněli emailovou adresu od vašeho účtu, nebo u ní již nelze "
-"přijímat emaily:"
+msgstr "2) Pokud jste zapomněli emailovou adresu od vašeho účtu, nebo u ní již nelze přijímat emaily:"
 
 #: ../user/get_passwd.php:47
 msgid ""
 "If you have run BOINC under this account, you can still access it. Here's "
 "how:"
-msgstr ""
-"Pokud jste používali BOINC s tímto účtem, stále k němu můžete získat "
-"přístup. Postupujte takto:"
+msgstr "Pokud jste používali BOINC s tímto účtem, stále k němu můžete získat přístup. Postupujte takto:"
 
 #: ../user/get_passwd.php:50
 msgid ""
 "Go to the BOINC data directory on your computer (its location is written to "
 "the Event Log at startup)."
-msgstr ""
+msgstr "Jděte do datového adresáře BOINC na vašem počítači (jeho umístění je zapsáno v protokolu událostí při spuštění)."
 
 #: ../user/get_passwd.php:51
 msgid "Find your account file for this project; it will be named <b>%1</b>."
@@ -4625,15 +4434,12 @@ msgstr "Najděte soubor k účtu od tohoto projektu; bude pojmenován <b>%1</b>.
 
 #: ../user/get_passwd.php:52
 msgid "Open the file in a text editor like Notepad. You'll see something like"
-msgstr ""
-"Otevřete soubor v textovém editoru, např. Poznámkovém bloku. Uvidíte něco "
-"jako"
+msgstr "Otevřete soubor v textovém editoru, např. Poznámkovém bloku. Uvidíte něco jako"
 
 #: ../user/get_passwd.php:62
-msgid "Select and Copy the string between %1 and %2 (%3 in the above example)."
-msgstr ""
-"Vyberte a zkopírujte do stránky řetězec mezi %1 a %2 (%3 v uvedeném "
-"příkladu)."
+msgid ""
+"Select and Copy the string between %1 and %2 (%3 in the above example)."
+msgstr "Vyberte a zkopírujte do stránky řetězec mezi %1 a %2 (%3 v uvedeném příkladu)."
 
 #: ../user/get_passwd.php:64
 msgid "Paste the string into the field below, and click OK."
@@ -4643,25 +4449,30 @@ msgstr "Zkopírujte řetězec do pole níže a klikněte na OK."
 msgid ""
 "You will now be logged in to your account; update the email and password of "
 "your account."
-msgstr ""
-"Nyní budete přihlášen do vašeho účtu, aktualizujte si email a heslo k vašemu "
-"účtu."
+msgstr "Nyní budete přihlášen do vašeho účtu, aktualizujte si email a heslo k vašemu účtu."
 
 #: ../user/get_passwd.php:71
 msgid "Log in with authenticator"
 msgstr "Příhlásit se pomocí autentikátoru"
 
-#: ../user/gpu_list.php:126 ../user/gpu_list.php:152
+#: ../user/get_passwd.php:81
+msgid "Forgot your account info?"
+msgstr "Zapomenout informace o vašem účtu?"
+
+#: ../user/gpu_list.php:150 ../user/gpu_list.php:176
 msgid "No GPU tasks reported"
 msgstr "Žádné úkoly pro GPU nebyly nahlášeny"
 
-#: ../user/gpu_list.php:183
+#: ../user/gpu_list.php:206
+msgid "Top GPU models"
+msgstr "Nejlepší modely 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 ""
-"Následující seznam obsahuje nejproduktivnější modely GPU na různých "
-"platformách. Relativní výkon je uveden v závorkách."
+"platforms.  Relative speeds, measured by average elapsed time of tasks, are "
+"shown in parentheses."
+msgstr "Následující seznam ukazuje nejproduktivnější modely GPU na různých platformách. Relativní rychlost, měřená podle průměrných časů odevzdání úkolů je uvedena v závorkách."
 
 #: ../user/home.php:42
 msgid "Welcome to %1"
@@ -4669,14 +4480,16 @@ msgstr "Vítejte v %1"
 
 #: ../user/home.php:43
 msgid "View and edit your account preferences using the links below."
-msgstr ""
-"Pro zobrazení a nastavení vlastností vašeho účtu použijte následující "
-"odkazy."
+msgstr "Pro zobrazení a nastavení vlastností vašeho účtu použijte následující odkazy."
 
 #: ../user/home.php:46
 msgid "If you have not already done so, %1download BOINC client software%2."
 msgstr "Pokud jste tak ještě neučinili, %1stáhněte si BOINC aplikaci%2."
 
+#: ../user/home.php:49 ../project.sample/project.inc:70
+msgid "Your account"
+msgstr "Váš účet"
+
 #: ../user/host_app_versions.php:37
 msgid "Anonymous platform, missing app"
 msgstr "Anonymní platforma, neznámá aplikace"
@@ -4730,10 +4543,7 @@ msgid ""
 "You can not delete our record of this computer because our database still "
 "contains work for it. You must wait a few days until the work for this "
 "computer has been deleted from the project database."
-msgstr ""
-"Nelze smazat záznam tohoto počítače, protože naše databáze u něho stále "
-"eviduje práci. Musíte počkat pár dnů, než bude práce u tohoto počítače "
-"smazána z databáze."
+msgstr "Nelze smazat záznam tohoto počítače, protože naše databáze u něho stále eviduje práci. Musíte počkat pár dnů, než bude práce u tohoto počítače smazána z databáze."
 
 #: ../user/host_delete.php:40
 msgid "Delete record of computer"
@@ -4757,11 +4567,9 @@ msgstr "Spojit počítače"
 
 #: ../user/host_edit_form.php:38
 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 občas omylem přiřadí stejnému počítači více identit. Toto lze napravit "
-"propojením starších identit s tou nejnovější."
+"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 občas omylem přiřadí stejnému počítači více identit. Toto lze napravit propojením starších identit s tou nejnovější."
 
 #: ../user/host_edit_form.php:56
 msgid "No hosts are eligible for merging with this one."
@@ -4774,9 +4582,7 @@ msgstr "Zobrazit detaily"
 #: ../user/host_edit_form.php:66
 msgid ""
 "Check the computers that are the same as %1 (created %2, computer ID %3):"
-msgstr ""
-"Zkontrolovat počítače, které jsou stejné jako %1 (vytvořen %2, ID počítače %"
-"3):"
+msgstr "Zkontrolovat počítače, které jsou stejné jako %1 (vytvořen %2, ID počítače %3):"
 
 #: ../user/host_edit_form.php:70 ../user/workunit.php:39
 msgid "name"
@@ -4798,10 +4604,14 @@ msgstr "žádná adresa"
 msgid "Merge hosts"
 msgstr "Spojt počítače"
 
-#: ../user/host_update_credit.php:28
+#: ../user/host_update_credit.php:27
 msgid "Updating computer credit"
 msgstr "Aktualizuji kredit počítače"
 
+#: ../user/host_update_credit.php:37
+msgid "Host credit updated"
+msgstr "Kredit počítače aktualizován"
+
 #: ../user/host_venue_action.php:41
 msgid "Host venue updated"
 msgstr "Umístění počítače aktualizováno"
@@ -4875,16 +4685,18 @@ msgstr "předformátováno"
 
 #: ../user/html.php:33
 msgid ""
-"image; height cannot exceed 450 pixels. Please do not link to images without "
-"permission of the web site where the image is hosted."
-msgstr ""
-"obrázek; výška nesmí překročit 450 pixelů. Prosím neodkazujte na obrázky bez "
-"souhlasu webových stránek, kde je tento obrázek uložen."
+"image; height cannot exceed 450 pixels. Please do not link to images without"
+" permission of the web site where the image is hosted."
+msgstr "obrázek; výška nesmí překročit 450 pixelů. Prosím neodkazujte na obrázky bez souhlasu webových stránek, kde je tento obrázek uložen."
 
 #: ../user/html.php:35
 msgid "You can also use ampersand notation for special characters."
 msgstr "Můžete použít i ampersandovou notaci pro speciální symboly."
 
+#: ../user/info.php:24 ../user/sample_index.php:78
+msgid "Read our rules and policies"
+msgstr "Přečtěte si naše pravidla a zásady"
+
 #: ../user/info.php:35
 msgid "Run %1 only on authorized computers"
 msgstr "Používejte %1 jen na počítačích, kde to máte povoleno"
@@ -4894,10 +4706,7 @@ msgid ""
 "Run %1 only on computers that you own, or for which you have obtained the "
 "owner's permission. Some companies and schools have policies that prohibit "
 "using their computers for projects such as %1."
-msgstr ""
-"Používejte %1 pouze na počítačích které vlastníte, nebo na kterých vám to "
-"jejich vlastník povolil. Některé školy nebo firmy se řídí předpisy, které "
-"zakazují používat jejich počítače pro projekty jako je %1."
+msgstr "Používejte %1 pouze na počítačích které vlastníte, nebo na kterých vám to jejich vlastník povolil. Některé školy nebo firmy se řídí předpisy, které zakazují používat jejich počítače pro projekty jako je %1."
 
 #: ../user/info.php:38
 msgid "How %1 will use your computer"
@@ -4908,19 +4717,13 @@ msgid ""
 "When you run %1 on your computer, it will use part of the computer's CPU "
 "power, disk space, and network bandwidth. You can control how much of your "
 "resources are used by %1, and when it uses them."
-msgstr ""
-"Při běhu bude %1 využívat část výpočetního výkonu, místa na disku a "
-"přenosové kapacity připojení vašeho počítače. Můžete ovlivnit, kolik "
-"prostředků bude %1 využívat a také kdy je bude využívat."
+msgstr "Při běhu bude %1 využívat část výpočetního výkonu, místa na disku a přenosové kapacity připojení vašeho počítače. Můžete ovlivnit, kolik prostředků bude %1 využívat a také kdy je bude využívat."
 
 #: ../user/info.php:40
 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 ""
-"Práce vykonaná vaším počítačem přispěje k dosažení cílů %1, které jsou "
-"popsané na webových stránkách projektu. Cíle projektu se mohou čas od času "
-"měnit."
+msgstr "Práce vykonaná vaším počítačem přispěje k dosažení cílů %1, které jsou popsané na webových stránkách projektu. Cíle projektu se mohou čas od času měnit."
 
 #: ../user/info.php:42
 msgid "Privacy policy"
@@ -4928,15 +4731,11 @@ msgstr "Ochrana soukromí"
 
 #: ../user/info.php:43
 msgid ""
-"Your account on %1 is identified by a name that you choose. This name may be "
-"shown on the %1 web site, along with a summary of the work your computer has "
-"done for %1. If you want to be anonymous, choose a name that doesn't reveal "
-"your identity."
-msgstr ""
-"Váš účet na %1 je identifikován podle jména, které si sami zvolíte. Toto "
-"jméno může být zobrazeno na stránkách %1 spolu s údaji o tom, kolik práce "
-"již váš počítač v %1 vykonal. Pokud si přejete zůstat v anonymitě, zvolte si "
-"takové jméno, které skryje vaší pravou identitu."
+"Your account on %1 is identified by a name that you choose. This name may be"
+" shown on the %1 web site, along with a summary of the work your computer "
+"has done for %1. If you want to be anonymous, choose a name that doesn't "
+"reveal your identity."
+msgstr "Váš účet na %1 je identifikován podle jména, které si sami zvolíte. Toto jméno může být zobrazeno na stránkách %1 spolu s údaji o tom, kolik práce již váš počítač v %1 vykonal. Pokud si přejete zůstat v anonymitě, zvolte si takové jméno, které skryje vaší pravou identitu."
 
 #: ../user/info.php:44
 msgid ""
@@ -4945,23 +4744,14 @@ 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 ""
-"Pokud jste zapojen v %1, informace o vašem počítači (typ procesoru, velikost "
-"paměti atd.) bude zaznamenána v databázi %1 a použita pro určení, jaký typ "
-"práce bude vašemu počítači přidělen. Tyto informace budou také viditelné na "
-"stránkách %1. Nebude zobrazeno nic, co by odhalovalo umístění vašeho "
-"počítače, jako např. jméno domény či IP adresa."
+msgstr "Pokud jste zapojen v %1, informace o vašem počítači (typ procesoru, velikost paměti atd.) bude zaznamenána v databázi %1 a použita pro určení, jaký typ práce bude vašemu počítači přidělen. Tyto informace budou také viditelné na stránkách %1. Nebude zobrazeno nic, co by odhalovalo umístění vašeho počítače, jako např. jméno domény či IP adresa."
 
 #: ../user/info.php:45
 msgid ""
-"To participate in %1, you must give an address where you receive email. This "
-"address will not be shown on the %1 web site or shared with organizations. %"
-"1 may send you periodic newsletters; however, you can opt out at any time."
-msgstr ""
-"Abyste se mohli zapojit do %1, musíte zadat vaší emailovou adresu, kterou "
-"používáte. Tato adresa nebude zobrazena na stránkách %1 ani sdělována jiným "
-"organizacím. %1 vám bude zasílat emailové novinky, které ovšem můžete "
-"kdykoliv zrušit."
+"To participate in %1, you must give an address where you receive email. This"
+" address will not be shown on the %1 web site or shared with organizations. "
+"%1 may send you periodic newsletters; however, you can opt out at any time."
+msgstr "Abyste se mohli zapojit do %1, musíte zadat vaší emailovou adresu, kterou používáte. Tato adresa nebude zobrazena na stránkách %1 ani sdělována jiným organizacím. %1 vám bude zasílat emailové novinky, které ovšem můžete kdykoliv zrušit."
 
 #: ../user/info.php:46
 msgid ""
@@ -4970,24 +4760,15 @@ 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 ""
-"Soukromé zprávy poslané na webu %1 jsou viditelné jen odesílateli a "
-"příjemci. %1 nezkoumá ani nehodnotí obsah soukromých zpráv. Pokud dostáváte "
-"nevyžádané soukromé zprávy od jiného uživatele %1, je možné tohoto uživatele "
-"zablokovat pomocí %2filtru zpráv%3. Tím zabráníte doručování veřejných i "
-"soukromých zpráv od tohoto uživatele."
+msgstr "Soukromé zprávy poslané na webu %1 jsou viditelné jen odesílateli a příjemci. %1 nezkoumá ani nehodnotí obsah soukromých zpráv. Pokud dostáváte nevyžádané soukromé zprávy od jiného uživatele %1, je možné tohoto uživatele zablokovat pomocí %2filtru zpráv%3. Tím zabráníte doručování veřejných i soukromých zpráv od tohoto uživatele."
 
 #: ../user/info.php:47
 msgid ""
 "If you use our web site forums you must follow the %2posting guidelines%3.  "
 "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 ""
-"Pokud navštěvujete diskuzní fórum na našem webu, je třeba dodržovat %"
-"2pravidla psaní příspěvků%3. Příspěvky vložené do fóra jsou viditelné všem "
-"uživatelům, včetně ne-členům. Přispíváním do fóra také dáváte všem "
-"nezrušitelné právo na čtení a kopírování vašich příspěvků."
+"members.  By posting to the forums, you are granting irrevocable license for"
+" anyone to view and copy your posts."
+msgstr "Pokud navštěvujete diskuzní fórum na našem webu, je třeba dodržovat %2pravidla psaní příspěvků%3. Příspěvky vložené do fóra jsou viditelné všem uživatelům, včetně ne-členům. Přispíváním do fóra také dáváte všem nezrušitelné právo na čtení a kopírování vašich příspěvků."
 
 #: ../user/info.php:48
 msgid "Is it safe to run %1?"
@@ -4997,34 +4778,23 @@ msgstr "Je bezpečné být zapojen v %1?"
 msgid ""
 "Any time you download a program through the Internet you are taking a "
 "chance: the program might have dangerous errors, or the download server "
-"might have been hacked. %1 has made efforts to minimize these risks. We have "
-"tested our applications carefully. Our servers are behind a firewall and 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 ""
-"Kdykoliv si stahujete programy z Internetu, vystavujete se riziku, že "
-"program obsahuje nebezpečné chyby, nebo že server, ze kterého stahujete, byl "
-"napaden útočníkem. %1 vynakládá veškeré úsilí k minimalizaci těchto rizik. "
-"Naše servery jsou umístěny za firewallem a nastaveny na vysokou úroveň "
-"zabezpečení. Pro zajištění integrity byly všechny naše programy důkladně "
-"testovány a také digitálně podepsány na zabezpečeném počítači, který není "
-"připojen k Internetu."
+"might have been hacked. %1 has made efforts to minimize these risks. We have"
+" tested our applications carefully. Our servers are behind a firewall and "
+"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 "Kdykoliv si stahujete programy z Internetu, vystavujete se riziku, že program obsahuje nebezpečné chyby, nebo že server, ze kterého stahujete, byl napaden útočníkem. %1 vynakládá veškeré úsilí k minimalizaci těchto rizik. Naše servery jsou umístěny za firewallem a nastaveny na vysokou úroveň zabezpečení. Pro zajištění integrity byly všechny naše programy důkladně testovány a také digitálně podepsány na zabezpečeném počítači, který není připojen k Internetu."
 
 #: ../user/info.php:50
 msgid ""
 "The applications run by %1 may cause some computers to overheat. If this "
 "happens, stop running %1 or use a %2utility program%3 that limits CPU usage."
-msgstr ""
-"Při běhu aplikačních programů %1 může docházet u některých počítačů k "
-"přehřívání. Pokud se tak stane, zastavte %1 nebo používejte %2pomocné "
-"programy%3 které sníží zatížení procesoru."
+msgstr "Při běhu aplikačních programů %1 může docházet u některých počítačů k přehřívání. Pokud se tak stane, zastavte %1 nebo používejte %2pomocné programy%3 které sníží zatížení procesoru."
 
 #: ../user/info.php:51
 msgid ""
 "%1 was developed by %2. BOINC was developed at the University of California."
-msgstr ""
-"%1 byl vyvinut v %2. BOINC byl vyvinut na Kalifornské universitě v Berkeley."
+msgstr "%1 byl vyvinut v %2. BOINC byl vyvinut na Kalifornské universitě v Berkeley."
 
 #: ../user/info.php:53
 msgid "Liability"
@@ -5033,11 +4803,9 @@ msgstr "Zodpovědnost"
 #: ../user/info.php:54
 msgid ""
 "%1 and %2 assume no liability for damage to your computer, loss of data, or "
-"any other event or condition that may occur as a result of participating in %"
-"1."
-msgstr ""
-"%1 a %2 nenese žádnou zodpovědnost za ztrátu dat nebo jakoukoliv jinou "
-"příhodu nebo stav, který může vzniknout jako následek používání %1."
+"any other event or condition that may occur as a result of participating in "
+"%1."
+msgstr "%1 a %2 nenese žádnou zodpovědnost za ztrátu dat nebo jakoukoliv jinou příhodu nebo stav, který může vzniknout jako následek používání %1."
 
 #: ../user/info.php:56
 msgid "Other BOINC projects"
@@ -5045,23 +4813,17 @@ msgstr "Jiné BOINC projekty"
 
 #: ../user/info.php:57
 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 "
+"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 ""
-"Prostředí BOINC využívají i další projekty, podobně jako %1. Můžete zvážit "
-"vaše přispění i do těchto projektů a pokud tak učiníte, váš počítač bude "
-"pracovat užitečně i v době, kdy %1 nebude mít nic na práci."
+msgstr "Prostředí BOINC využívají i další projekty, podobně jako %1. Můžete zvážit vaše přispění i do těchto projektů a pokud tak učiníte, váš počítač bude pracovat užitečně i v době, kdy %1 nebude mít nic na práci."
 
 #: ../user/info.php:58
 msgid ""
 "These other projects are not associated with %1, and we cannot vouch for "
 "their security practices or the nature of their research. Join them at your "
 "own risk."
-msgstr ""
-"Tyto další projekty nejsou nijak sdružené s %1 a tudíž se vám nemůžeme nijak "
-"zaručit za jejich bezpečnost či předmět výzkumu. Připojte se k nim dle "
-"vašeho uvážení."
+msgstr "Tyto další projekty nejsou nijak sdružené s %1 a tudíž se vám nemůžeme nijak zaručit za jejich bezpečnost či předmět výzkumu. Připojte se k nim dle vašeho uvážení."
 
 #: ../user/language_select.php:47
 msgid "Language selection"
@@ -5071,17 +4833,13 @@ msgstr "Výběr jazyka"
 msgid ""
 "This web site is available in several languages. The currently selected "
 "language is %1."
-msgstr ""
-"Tato webová stránka je dostupná ve více jazycích. Aktuálně vybraný jazyk je "
-"%1."
+msgstr "Tato webová stránka je dostupná ve více jazycích. Aktuálně vybraný jazyk je %1."
 
 #: ../user/language_select.php:78
 msgid ""
 "Normally the choice of language is determined by your browser's language "
 "setting, which is: %1.  You can change this setting using:"
-msgstr ""
-"Podle nastavení vašeho prohlížeče byl pro tyto stránky vybrán jazyk: %1. "
-"Toto nastavení lze změnit zde:"
+msgstr "Podle nastavení vašeho prohlížeče byl pro tyto stránky vybrán jazyk: %1. Toto nastavení lze změnit zde:"
 
 #: ../user/language_select.php:83
 msgid "Firefox: Tools/Options/General"
@@ -5096,10 +4854,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 ""
-"Nebo si můžete vybrat jazyk kliknutím na jeden z těchto odkazů - tím si váš "
-"prohlížeč uloží cookie s nastavením. Ujistěte se prosím, že váš prohlížeč "
-"podporuje cookies."
+msgstr "Nebo si můžete vybrat jazyk kliknutím na jeden z těchto odkazů - tím si váš prohlížeč uloží cookie s nastavením. Ujistěte se prosím, že váš prohlížeč podporuje cookies."
 
 #: ../user/language_select.php:95
 msgid "Language name (click to select)"
@@ -5111,33 +4866,11 @@ msgstr "Použít jazyk podle nastavení prohlížeče"
 
 #: ../user/language_select.php:113
 msgid ""
-"Translations are done by volunteers.  If your native language is not here, %"
-"1you can provide a translation%2."
-msgstr ""
-"Překlady jsou tvořeny dobrovolníky. Pokud tu váš rodný jazyk dosud není, %"
-"1můžete pomoci s překladem%2."
+"Translations are done by volunteers.  If your native language is not here, "
+"%1you can provide a translation%2."
+msgstr "Překlady jsou tvořeny dobrovolníky. Pokud tu váš rodný jazyk dosud není, %1můžete pomoci s překladem%2."
 
-#: ../user/login_form.php:45
-msgid "Email address:"
-msgstr "Emailová adresa:"
-
-#: ../user/login_form.php:45
-msgid "forgot email address?"
-msgstr "zapomenutá emailová adresa?"
-
-#: ../user/login_form.php:48
-msgid "Password:"
-msgstr "Heslo:"
-
-#: ../user/login_form.php:48
-msgid "forgot password?"
-msgstr "zapomenuté heslo?"
-
-#: ../user/login_form.php:51
-msgid "Stay logged in"
-msgstr "Zústat přihlášen"
-
-#: ../user/login_form.php:62
+#: ../user/login_form.php:57
 msgid "or %1create an account%2."
 msgstr "nebo si %1vytvořit účet%2."
 
@@ -5161,13 +4894,7 @@ msgid ""
 "        having that name with the newest computer having that name.\n"
 "        Incompatible computers will not be merged.\n"
 "        <p>"
-msgstr ""
-"Tato operace sloučí počítače podle jejich doménového jména.\n"
-"<p>\n"
-"U všech nalezených doménových jmen sloučí všechny staší\n"
-"počítače s tímto jménem s nejnovějším počítačem s tímto jménem.\n"
-"Nekompatibilní záznamy nebudou sloučeny.\n"
-"<p>"
+msgstr "Tato operace sloučí počítače podle jejich doménového jména.\n<p>\nU všech nalezených doménových jmen sloučí všechny staší\npočítače s tímto jménem s nejnovějším počítačem s tímto jménem.\nNekompatibilní záznamy nebudou sloučeny.\n<p>"
 
 #: ../user/merge_by_name.php:82
 msgid "Go ahead and do this"
@@ -5183,11 +4910,7 @@ msgid ""
 "To maximize discussion and flow of information,\n"
 "our message boards are moderated.\n"
 "Message board postings are subject to the following posting rules:\n"
-msgstr ""
-"\n"
-"Pro maximální přínos informací v této diskuzi,\n"
-"jsou diskuzní fóra moderována.\n"
-"Přispívání na diskuzní fóra se řídí těmito pravidly:\n"
+msgstr "\nPro maximální přínos informací v této diskuzi,\njsou diskuzní fóra moderována.\nPřispívání na diskuzní fóra se řídí těmito pravidly:\n"
 
 #: ../user/moderation.php:30
 msgid ""
@@ -5196,8 +4919,7 @@ msgid ""
 "Moderators may delete posts that violate any of these rules.\n"
 "The authors of deleted posts will be notified via email.\n"
 "Gross offenders may have their ability to post messages temporarily revoked\n"
-"(though to prevent abuse only project administrators have the ability to do "
-"so).\n"
+"(though to prevent abuse only project administrators have the ability to do so).\n"
 "Additional kinds of bad behavior (\"bugging\" posts to trap the\n"
 "IP addresses of other participants, excessive thread creation to spam\n"
 "the forums, etc.), while not listed in the formal rules, may still\n"
@@ -5226,41 +4948,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>\n"
-"Moderátoři mohou mazat příspěvky porušující tato pravidla.\n"
-"Autoři takových příspěvků budou upozorněni emailem.\n"
-"Hrubě porušujícím uživatelům může být dočasně zakázáno přispívat\n"
-"(toto mohou provádět kvůli možnému zneužití jen projektoví administrátoři).\n"
-"Jiné obtěžující chování, jako např. nástrahy v příspěvcích pro zjištění IP "
-"adresy\n"
-"jiných uživatelů, masivní zakládání vláken či příspěvků, a pod. taktéž\n"
-"nebude tolerováno a může vést k podobnému postihu.\n"
-"<p>\n"
-"Pokud si myslíte, že některý příspěvek porušuje tato pravidla,\n"
-"klikněte na čerevené X u příspěvku a vyplňte formulář;\n"
-"moderátoři budou upozorněni na vaši stížnost.\n"
-"Toto tlačítko používejte jen u jasných porušení pravidel,\n"
-"ne u neshod s diskutujícím.\n"
-"<p>\n"
-"Při moderování diskuzí se vždy snažíme být co nejvíce fér\n"
-"ale u takto obrovské komunity uživatelů se vžy najdou takoví,\n"
-"kteří budou mít na věc jiný názor či nebudou souhlasit se\n"
-"způsobem moderování.\n"
-"Ač nás takové situace mrzí, berte prosím na vědomí, že se nikdy\n"
-"nemůžeme zavděčit všem a je třeba vždy dělat rozhodutí,\n"
-"která jsou správná pro většinu a rozvoj fóra.\n"
-"Neřešte prosím v diskuzích naše rozhodnutí při moderování.\n"
-"Nejsme projekt zkoumající sociální inženýrství či snažící se vytvořit\n"
-"dokonale férový systém. Podobné diskuze většinou k ničemu nevedou\n"
-"a často jen rozdmýchávají problémy.\n"
-"Pokud máte legitimní připomínku, zašlete prosím email\n"
-"na níže uvedenou adresu.\n"
-"<p>\n"
-"Tato pravidla moderování byla schválena projektem %1.\n"
-"Pokud máte připomínky k těmto pravidlům, pošlete nám email %2.\n"
-"\n"
+msgstr "\n<p>\nModerátoři mohou mazat příspěvky porušující tato pravidla.\nAutoři takových příspěvků budou upozorněni emailem.\nHrubě porušujícím uživatelům může být dočasně zakázáno přispívat\n(toto mohou provádět kvůli možnému zneužití jen projektoví administrátoři).\nJiné obtěžující chování, jako např. nástrahy v příspěvcích pro zjištění IP adresy\njiných uživatelů, masivní zakládání vláken či příspěvků, a pod. taktéž\nnebude tolerováno a může vést k podobnému postihu.\n<p>\nPokud si  [...]
 
 #: ../user/pending.php:66
 msgid "Pending credit"
@@ -5306,266 +4994,248 @@ msgstr "Nemáte žádné soukromé zprávy."
 msgid "Sender and date"
 msgstr "Odesílatel a datum"
 
-#: ../user/pm.php:106
+#: ../user/pm.php:111
 msgid "Reply to this message"
 msgstr "Odpovědět na tuto zprávu"
 
-#: ../user/pm.php:107
+#: ../user/pm.php:112
 msgid "Delete this message"
 msgstr "Smazat tuto zprávu"
 
-#: ../user/pm.php:112
+#: ../user/pm.php:117
 msgid "Select all"
 msgstr "Vybrat vše"
 
-#: ../user/pm.php:114
+#: ../user/pm.php:119
 msgid "Unselect all"
 msgstr "Odznačit vše"
 
-#: ../user/pm.php:117
+#: ../user/pm.php:122
 msgid "Delete selected messages"
 msgstr "Smazat vybrané zprávy"
 
-#: ../user/pm.php:140
+#: ../user/pm.php:145
 msgid "Sender"
 msgstr "Odesílatel"
 
-#: ../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 "Je třeba vyplnit všechna pole pro poslání soukromé zprávy"
 
-#: ../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 ""
-"Vaše zpráva byla ohodnocena jako spam\n"
-"anti-spamovým systémem Akismet.\n"
-"Upravte jí prosím a zkuste jí vložit znova."
+msgstr "Vaše zpráva byla ohodnocena jako spam\nanti-spamovým systémem Akismet.\nUpravte jí prosím a zkuste jí vložit znova."
 
-#: ../user/pm.php:205
+#: ../user/pm.php:210
 msgid "Could not find user with id %1"
 msgstr "Uživatel s ID %1 nenalezen"
 
-#: ../user/pm.php:210
+#: ../user/pm.php:215
 msgid "Could not find user with username %1"
 msgstr "Uživatel se jménem %1 nenalezen"
 
-#: ../user/pm.php:212
+#: ../user/pm.php:217
 msgid "%1 is not a unique username; you will have to use user ID"
 msgstr "%1 není unikátní uživatelské jméno; budete muset použít uživatelské ID"
 
-#: ../user/pm.php:217
+#: ../user/pm.php:222
 msgid "User %1 (ID: %2) is not accepting private messages from you."
 msgstr "Uživatel %1 (ID: %2) od vás nepřijímá soukromé zprávy."
 
-#: ../user/pm.php:240 ../user/view_profile.php:26
+#: ../user/pm.php:245 ../user/view_profile.php:28
 msgid "No such user"
 msgstr "Uživatel nenalezen"
 
-#: ../user/pm.php:242
+#: ../user/pm.php:247
 msgid "Really block %1?"
 msgstr "Opravdu zablokovat %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 ""
-"Jste si opravdu jisti, že chcete zablokovat uživatele %1, aby vám nemohl "
-"posílat soukromé zprávy?"
+msgstr "Jste si opravdu jisti, že chcete zablokovat uživatele %1, aby vám nemohl posílat soukromé zprávy?"
 
-#: ../user/pm.php:244
+#: ../user/pm.php:249
 msgid "Please note that you can only block a limited amount of users."
-msgstr ""
-"Vemte prosím na vědomí, že můžete zablokovat jen určitý počet uživatelů."
+msgstr "Vemte prosím na vědomí, že můžete zablokovat jen určitý počet uživatelů."
 
-#: ../user/pm.php:245
+#: ../user/pm.php:250
 msgid ""
 "Once the user has been blocked you can unblock it using forum preferences "
 "page."
-msgstr ""
-"Uživatele, kterého jste zablokovali, můžete znova odblokovat ve vašem "
-"nastavení diskuzního fóra."
+msgstr "Uživatele, kterého jste zablokovali, můžete znova odblokovat ve vašem nastavení diskuzního fóra."
 
-#: ../user/pm.php:252
+#: ../user/pm.php:257
 msgid "No, cancel"
 msgstr "Ne, nemazat"
 
-#: ../user/pm.php:260 ../user/team_admins.php:98
+#: ../user/pm.php:265 ../user/team_admins.php:100
 msgid "no such user"
 msgstr "uživatel nenalezen"
 
-#: ../user/pm.php:263
+#: ../user/pm.php:268
 msgid "User %1 blocked"
 msgstr "Uživatel %1 zablokován"
 
-#: ../user/pm.php:265
+#: ../user/pm.php:270
 msgid "User %1 has been blocked from sending you private messages."
 msgstr "Uživatel %1 byl zablokován, nemůže vám posílat soukromé zprávy."
 
-#: ../user/pm.php:266
+#: ../user/pm.php:271
 msgid "To unblock, visit %1message board preferences%2"
 msgstr "Pro odblokování navštivte %1předvolby diskuzního fóra%2"
 
-#: ../user/pm.php:302
+#: ../user/pm.php:307
 msgid "Unknown action"
 msgstr "Neznámá akce"
 
-#: ../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 ""
-"Vaše předvolby byly upraveny, změny se projeví\n"
-"až po komunikaci vašeho počítače s %1\n"
-"nebo při vykonání požadavku %2Aktualizovat%3 ze Správce BOINC."
+msgstr "Vaše předvolby byly upraveny, změny se projeví\naž po komunikaci vašeho počítače s %1\nnebo při vykonání požadavku %2Aktualizovat%3 ze Správce 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 ""
-"Vaše předvolby byly vráceny na výchozí hodnoty,\n"
-"změny se projeví až po komunikaci vašeho počítače s %1\n"
-"nebo při vykonání požadavku %2Aktualizovat%3 ze Správce BOINC."
+msgstr "Vaše předvolby byly vráceny na výchozí hodnoty,\nzměny se projeví až po komunikaci vašeho počítače s %1\nnebo při vykonání požadavku %2Aktualizovat%3 ze Správce 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 pro %2"
 
-#: ../user/prefs_edit.php:110
+#: ../user/prefs_edit.php:112
 msgid "Back to preferences"
 msgstr "Zpět do předvoleb"
 
-#: ../user/prefs_remove.php:45
+#: ../user/prefs_remove.php:46
 msgid "Confirm delete preferences"
 msgstr "Potvrdit smazání předvoleb"
 
-#: ../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 "Jste si jisti, že chcete smazat vaše separátní %1 předvolby pro %2?"
 
-#: ../user/prefs_remove.php:52
+#: ../user/prefs_remove.php:53
 msgid "Remove preferences"
 msgstr "Smazat předvolby"
 
-#: ../user/prefs_remove.php:54
+#: ../user/prefs_remove.php:55
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: ../user/profile_menu.php:35
+#: ../user/profile_menu.php:34 ../user/sample_index.php:119
+msgid "Profiles"
+msgstr "Profily"
+
+#: ../user/profile_menu.php:37
 msgid ""
 "%1Profiles%2 let individuals share backgrounds and opinions with the %3 "
 "community."
-msgstr ""
-"%1Profily%2 umožňují uživatelům sdílet svá osobní zázemí a názory s "
-"komunitou %3."
+msgstr "%1Profily%2 umožňují uživatelům sdílet svá osobní zázemí a názory s komunitou %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 ""
-"Prozkoumejte, jak různorodý svět je mezi Vámi dobrovolníky, a přispějte i "
-"vaším vlastním pohledem pro ostatní k nahlédnutí."
+msgstr "Prozkoumejte, jak různorodý svět je mezi Vámi dobrovolníky, a přispějte i vaším vlastním pohledem pro ostatní k nahlédnutí."
 
-#: ../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 ""
-"Pokud se tak ještě nestalo, můžete si %1vytvořit svůj vlastní uživatelský "
-"profil%2, který ukážete ostatním!"
+msgstr "Pokud se tak ještě nestalo, můžete si %1vytvořit svůj vlastní uživatelský profil%2, který ukážete ostatním!"
 
-#: ../user/profile_menu.php:42
+#: ../user/profile_menu.php:44
 msgid "User of the Day"
 msgstr "Uživatel dne"
 
-#: ../user/profile_menu.php:57
+#: ../user/profile_menu.php:59
 msgid "User Profile Explorer"
 msgstr "Prohlížení uživatelských profilů"
 
-#: ../user/profile_menu.php:60
+#: ../user/profile_menu.php:62
 msgid "View the %1User Picture Gallery%2."
 msgstr "Prohlédněte si %1Galerii uživatelských obrázků%2."
 
-#: ../user/profile_menu.php:61
+#: ../user/profile_menu.php:63
 msgid "Browse profiles %1by country%2."
 msgstr "Procházet profily %1podle země%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 ""
-"Procházet profily %1náhodně%2, %3náhodně s obrázky%2, nebo %4náhodně bez "
-"obrázků%2."
+msgstr "Procházet profily %1náhodně%2, %3náhodně s obrázky%2, nebo %4náhodně bez obrázků%2."
 
-#: ../user/profile_menu.php:66
+#: ../user/profile_menu.php:68
 msgid "Alphabetical profile listings:"
 msgstr "Abecední výčet profilů:"
 
-#: ../user/profile_menu.php:72
+#: ../user/profile_menu.php:74
 msgid "Search profile text"
 msgstr "Hledat v textech profilů"
 
-#: ../user/profile_menu.php:98
+#: ../user/profile_menu.php:100
 msgid "No profiles"
 msgstr "Žádné profily"
 
-#: ../user/profile_menu.php:99
+#: ../user/profile_menu.php:101
 msgid "No profiles matched your query."
 msgstr "Nenalezen žádný profil odpovídající vašemu dotazu."
 
-#: ../user/profile_rate.php:29
+#: ../user/profile_rate.php:31
 msgid "Invalid vote type:"
 msgstr "Neplatný typ hlasu:"
 
-#: ../user/profile_rate.php:34
+#: ../user/profile_rate.php:36
 msgid "Vote Recorded"
 msgstr "Hlas uložen"
 
-#: ../user/profile_rate.php:38
+#: ../user/profile_rate.php:40
 msgid "Thank you"
 msgstr "Děkujeme"
 
-#: ../user/profile_rate.php:41
+#: ../user/profile_rate.php:43
 msgid "Your recommendation has been recorded."
 msgstr "Vaše doporučení bylo uloženo."
 
-#: ../user/profile_rate.php:43
+#: ../user/profile_rate.php:45
 msgid "Your vote to reject this profile has been recorded."
 msgstr "Váš hlas pro zamítnutí tohoto profilu byl uložen."
 
-#: ../user/profile_rate.php:46
+#: ../user/profile_rate.php:48
 msgid "Return to profile."
 msgstr "Vrátit se do profilu."
 
-#: ../user/profile_search_action.php:36
+#: ../user/profile_search_action.php:38
 msgid "Profiles containing '%1'"
 msgstr "Profily obsahující '%1'"
 
-#: ../user/profile_search_action.php:40
+#: ../user/profile_search_action.php:42
 msgid "User name"
 msgstr "Jméno uživatele"
 
-#: ../user/profile_search_action.php:41
+#: ../user/profile_search_action.php:43
 msgid "Joined project"
 msgstr "Připojil se k projektu"
 
-#: ../user/profile_search_action.php:44
+#: ../user/profile_search_action.php:46
 msgid "Recent credit"
 msgstr "Nedávný kredit"
 
-#: ../user/profile_search_action.php:54
+#: ../user/profile_search_action.php:56
 msgid "No profiles found containing '%1'"
 msgstr "Nenalezen žádný profil obsahující '%1'"
 
@@ -5593,149 +5263,61 @@ msgstr "Chybí uživatelské ID nebo ID počítače"
 msgid "No tasks to display"
 msgstr "Žádné zobrazitelné úkoly"
 
-#: ../user/server_status.php:97
-msgid "Running"
-msgstr "Počítám"
+#: ../user/sample_index.php:195
+msgid "User of the day"
+msgstr "Uživatel dne"
 
-#: ../user/server_status.php:100
+#: ../user/server_status.php:59
 msgid "Not Running"
 msgstr "Zastavený"
 
-#: ../user/server_status.php:103
+#: ../user/server_status.php:63
+msgid "Running"
+msgstr "Počítám"
+
+#: ../user/server_status.php:67
 msgid "Disabled"
 msgstr "Vypnutý"
 
-#: ../user/server_status.php:231
+#: ../user/server_status.php:105
 msgid "Project status"
 msgstr "Stav projektu"
 
-#: ../user/server_status.php:233
-msgid "Server software version: %1"
-msgstr "Verze software na serveru: %1"
+#: ../user/server_status.php:110
+msgid "Server status"
+msgstr "Stav serveru"
 
-#: ../user/server_status.php:241
+#: ../user/server_status.php:113
 msgid "Program"
 msgstr "Program"
 
-#: ../user/server_status.php:241
+#: ../user/server_status.php:113
 msgid "Host"
 msgstr "Počítač"
 
-#: ../user/server_status.php:252
-msgid "data-driven web pages"
-msgstr "webové stránky s daty"
+#: ../user/server_status.php:125
+msgid "Database schema version: "
+msgstr "Verze schématu databáze: "
 
-#: ../user/server_status.php:258
-msgid "upload/download server"
-msgstr "server pro posílání/nahrávání dat"
-
-#: ../user/server_status.php:261
-msgid "scheduler"
-msgstr "plánovač"
-
-#: ../user/server_status.php:294
-msgid "Running:"
-msgstr "Spuštěný:"
-
-#: ../user/server_status.php:295
-msgid "Program is operating normally"
-msgstr "Program běží normálně"
-
-#: ../user/server_status.php:296
-msgid "Not Running:"
-msgstr "Zastavený:"
-
-#: ../user/server_status.php:297
-msgid "Program failed or the project is down"
-msgstr "Program selhal, nebo je projekt odstavený"
-
-#: ../user/server_status.php:298
-msgid "Disabled:"
-msgstr "Vypnutý:"
-
-#: ../user/server_status.php:299
-msgid "Program is disabled"
-msgstr "Program je vypnutý"
-
-#: ../user/server_status.php:303
+#: ../user/server_status.php:134
 msgid "Computing status"
 msgstr "Stav výpočtů"
 
-#: ../user/server_status.php:309
-msgid "The database server is not accessible"
-msgstr "Databázový server není dostupný"
-
-#: ../user/server_status.php:326
-msgid "Tasks ready to send"
-msgstr "Úkoly připravené k zaslání"
-
-#: ../user/server_status.php:331 ../user/workunit.php:55
-msgid "Tasks in progress"
-msgstr "Probíhající úkoly"
-
-#: ../user/server_status.php:336
-msgid "Workunits waiting for validation"
-msgstr "Pracovní jednotky čekající na validaci"
-
-#: ../user/server_status.php:341
-msgid "Workunits waiting for assimilation"
-msgstr "Pracovní jednotky čekající na začlenění"
-
-#: ../user/server_status.php:346
-msgid "Workunits waiting for file deletion"
-msgstr "Pracovní jednotky čekající na smazání"
-
-#: ../user/server_status.php:351
-msgid "Tasks waiting for file deletion"
-msgstr "Úkoly čekající na smazání"
-
-#: ../user/server_status.php:367
-msgid "Transitioner backlog (hours)"
-msgstr "Zpoždění přechodového serveru (hod)"
-
-#: ../user/server_status.php:374
+#: ../user/server_status.php:149
 msgid "Users"
 msgstr "Uživatelé"
 
-#: ../user/server_status.php:377 ../user/server_status.php:395
-msgid "with recent credit"
-msgstr "s nedávným kreditem"
-
-#: ../user/server_status.php:382 ../user/server_status.php:400
-msgid "with credit"
-msgstr "s kreditem"
-
-#: ../user/server_status.php:387 ../user/server_status.php:405
-msgid "registered in past 24 hours"
-msgstr "registrovaní během posledních 24 hod"
-
-#: ../user/server_status.php:411
-msgid "current GigaFLOPs"
-msgstr "aktuální výkon GigaFLOPů"
-
-#: ../user/server_status.php:420
+#: ../user/server_status.php:161
 msgid "Tasks by application"
 msgstr "Úkoly podle aplikace"
 
-#: ../user/server_status.php:423 ../user/workunit.php:40
-msgid "application"
-msgstr "aplikační program"
-
-#: ../user/server_status.php:424
-msgid "unsent"
-msgstr "neodesláno"
-
-#: ../user/server_status.php:425
-msgid "in progress"
-msgstr "probíhá"
+#: ../user/server_status.php:164
+msgid "Runtime of last 100 tasks in hours: average, min, max"
+msgstr "Trvání výpočtu posledních 100 úkolů v hodinách: průměr, min, max"
 
-#: ../user/server_status.php:426
-msgid "avg runtime of last 100 results in h (min-max)"
-msgstr "průměrná doba běhu posledních 100 výsledků v h (min-max)"
-
-#: ../user/server_status.php:427
-msgid "users in last 24h"
-msgstr "uživatelé během posledních 24 hodin"
+#: ../user/server_status.php:165
+msgid "Users in last 24 hours"
+msgstr "Uživatelů během posledních 24 hodin"
 
 #: ../user/show_host_detail.php:40
 msgid "Computer %1"
@@ -5745,737 +5327,700 @@ msgstr "Počítač %1"
 msgid "Statistics and leaderboards"
 msgstr "Statistiky a žebříčky"
 
-#: ../user/stats.php:28
+#: ../user/stats.php:30
 msgid "Statistics for %1"
 msgstr "Statistiky %1"
 
-#: ../user/stats.php:37
+#: ../user/stats.php:32 ../user/top_users.php:117
+msgid "Top participants"
+msgstr "Nejlepší účastníci"
+
+#: ../user/stats.php:40 ../user/team.php:48
+msgid "Top teams"
+msgstr "Nejlepší týmy"
+
+#: ../user/stats.php:47
+msgid "Top computers"
+msgstr "Nejlepší počítače"
+
+#: ../user/stats.php:48
+msgid "GPU models"
+msgstr "GPU modely"
+
+#: ../user/stats.php:49
+msgid "CPU models"
+msgstr "CPU modely"
+
+#: ../user/stats.php:53
 msgid ""
-"More detailed statistics for %1 and other BOINC-based projects are available "
-"at several web sites:"
-msgstr ""
-"Na mnoha webových stránkách jsou dostupné detailní statistiky o %1 a jiných "
-"BOINC projektech:"
+"More detailed statistics for %1 and other BOINC-based projects are available"
+" at several web sites:"
+msgstr "Na mnoha webových stránkách jsou dostupné detailní statistiky o %1 a jiných BOINC projektech:"
 
-#: ../user/stats.php:40
+#: ../user/stats.php:56
 msgid ""
-"You can also get your current statistics in the form of a \"signature image"
-"\":"
+"You can also get your current statistics in the form of a \"signature "
+"image\":"
 msgstr "Je též možné získat vaše statistiky ve formě \"obrázku do podpisu\":"
 
-#: ../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 ""
-"Též je možné získat individuální statistiky ze všech BOINC projektů, kde "
-"jste zapojeni - na vaší %1domovské stránce%2."
+msgstr "Též je možné získat individuální statistiky ze všech BOINC projektů, kde jste zapojeni - na vaší %1domovské stránce%2."
 
 #: ../user/team.php:27
+msgid "Teams"
+msgstr "Týmy"
+
+#: ../user/team.php:29
 msgid "%1 participants may form %2teams%3."
 msgstr "%1 účastníci mohou vytvořit %2týmy%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 ""
-"Je možné být členem jen jednoho týmu v jeden okamžik. Tým můžete kdykoliv "
-"opustit a přidat se do jiného."
+msgstr "Je možné být členem jen jednoho týmu v jeden okamžik. Tým můžete kdykoliv opustit a přidat se do jiného."
 
-#: ../user/team.php:31
+#: ../user/team.php:33
 msgid "Each team has a %1founder%2 who may:"
 msgstr "Každý tým má %1vlastníka%2, který může:"
 
-#: ../user/team.php:33
+#: ../user/team.php:35
 msgid "access team members' email addresses"
 msgstr "přistupovat k emailovým adresám členů týmu"
 
-#: ../user/team.php:34
+#: ../user/team.php:36
 msgid "edit the team's name and description"
 msgstr "upravovat jméno a popis týmu"
 
-#: ../user/team.php:35
+#: ../user/team.php:37
 msgid "add or remove team admins"
 msgstr "přidat nebo odebrat Správce týmu"
 
-#: ../user/team.php:36
+#: ../user/team.php:38
 msgid "remove members from the team"
 msgstr "vyloučit členy z týmu"
 
-#: ../user/team.php:37
+#: ../user/team.php:39
 msgid "disband a team if it has no members"
 msgstr "rozpustit tým, pokud nebude mít žádné členy"
 
-#: ../user/team.php:40
+#: ../user/team.php:42
 msgid "To join a team, visit its team page and click %1Join this team%2."
-msgstr ""
-"Pro připojení do týmu navštivte týmovou stránku a tam klikněte na %1Připojit "
-"se do týmu%2."
+msgstr "Pro připojení do týmu navštivte týmovou stránku a tam klikněte na %1Připojit se do týmu%2."
 
-#: ../user/team.php:41 ../user/team_search.php:180
+#: ../user/team.php:43 ../user/team_search.php:201
 msgid "Find a team"
 msgstr "Najít tým"
 
-#: ../user/team.php:48
+#: ../user/team.php:50
 msgid "All teams"
 msgstr "Všechny týmy"
 
-#: ../user/team.php:52
+#: ../user/team.php:54
 msgid "%1 teams"
 msgstr "%1 týmy"
 
-#: ../user/team.php:58
+#: ../user/team.php:60
 msgid "Create a new team"
 msgstr "Vytvořit nový tým"
 
-#: ../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 "Pokud vám nevyhovuje žádný tým, můžete si %1vytvořit vlastní%2."
 
-#: ../user/team_admins.php:34
+#: ../user/team_admins.php:36
 msgid "Remove Team Admin status from this member"
 msgstr "Odebrat tomuto členu práva Správce týmu"
 
-#: ../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 "Přidat nebo odebrat Správce týmu"
 
-#: ../user/team_admins.php:41
+#: ../user/team_admins.php:43
 msgid "You can select team members as 'Team Admins'. Team Admins can:"
 msgstr "Můžete určit některé členy jako Správce týmu. Správci týmu mohou:"
 
-#: ../user/team_admins.php:43
+#: ../user/team_admins.php:45
 msgid "Edit team information (name, URL, description, country)"
 msgstr "Upravovat informace o týmu (jméno, URL, popis)"
 
-#: ../user/team_admins.php:44
+#: ../user/team_admins.php:46
 msgid "View the team's join/quit history"
 msgstr "Sledovat historii příchodů a odchodů v týmu"
 
-#: ../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 ""
-"Moderovat týmové fórum, pokud nějaké je (správci dostávají upozornění "
-"emailem o významných událostech na fóru a označení závadných příspěvků)"
+"Moderate the team forum, if any (admins get email notification of moderation"
+" events and red X reports)"
+msgstr "Moderovat týmové fórum, pokud nějaké je (správci dostávají upozornění emailem o významných událostech na fóru a označení závadných příspěvků)"
 
-#: ../user/team_admins.php:47
+#: ../user/team_admins.php:49
 msgid "Team Admins cannot:"
 msgstr "Správcí týmu nemohou:"
 
-#: ../user/team_admins.php:49
+#: ../user/team_admins.php:51
 msgid "Change the team founder"
 msgstr "Změnit vlastníka týmu"
 
-#: ../user/team_admins.php:50 ../user/team_manage.php:54
+#: ../user/team_admins.php:52 ../user/team_manage.php:56
 msgid "Remove members"
 msgstr "Odebrat členy"
 
-#: ../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 "Pokud Správce týmu opustí tým, ztratí též svojí pozici Správce týmu"
 
-#: ../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 ""
-"Doporučujeme vybrat jako Správce týmu pouze důvěryhodné členy, které dobře "
-"znáte."
+msgstr "Doporučujeme vybrat jako Správce týmu pouze důvěryhodné členy, které dobře znáte."
 
-#: ../user/team_admins.php:59
+#: ../user/team_admins.php:61
 msgid "There are currently no Team Admins"
 msgstr "Momentálně není žádný Správce týmu."
 
-#: ../user/team_admins.php:61
+#: ../user/team_admins.php:63
 msgid "Current Team Admins"
 msgstr "Současní Správci týmu"
 
-#: ../user/team_admins.php:62
+#: ../user/team_admins.php:64
 msgid "Became Team Admin on"
 msgstr "Stát se Správcem týmu v"
 
-#: ../user/team_admins.php:77
+#: ../user/team_admins.php:79
 msgid "Add Team Admin"
 msgstr "Přidat Správce týmu"
 
-#: ../user/team_admins.php:78
+#: ../user/team_admins.php:80
 msgid "Email address of team member:"
 msgstr "Emailová adresa člena týmu:"
 
-#: ../user/team_admins.php:90
+#: ../user/team_admins.php:81
+msgid "Add"
+msgstr "Přidat"
+
+#: ../user/team_admins.php:92
 msgid "failed to remove admin"
 msgstr "nepodařilo se odebrat správce"
 
-#: ../user/team_admins.php:99
+#: ../user/team_admins.php:101
 msgid "User is not member of team"
 msgstr "Uživatel není členem týmu"
 
-#: ../user/team_admins.php:101
+#: ../user/team_admins.php:103
 msgid "%1 is already an admin of %2"
 msgstr "%1 je již správcem %2"
 
-#: ../user/team_admins.php:105
+#: ../user/team_admins.php:107
 msgid "Couldn't add admin"
 msgstr "Nelze přidat správce"
 
-#: ../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 "Tým nenalezen"
 
-#: ../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 "tým nenalezen"
 
-#: ../user/team_change_founder_action.php:38
+#: ../user/team_change_founder_action.php:40
 msgid "User is not a member of %1"
 msgstr "Uživatel není členem %1"
 
-#: ../user/team_change_founder_action.php:41
+#: ../user/team_change_founder_action.php:43
 msgid "Changing founder of %1"
 msgstr "Měním vlastníka %1"
 
-#: ../user/team_change_founder_action.php:43
+#: ../user/team_change_founder_action.php:45
 msgid "%1 is now founder of %2"
 msgstr "%1 je nyní vlastníkem %2"
 
-#: ../user/team_change_founder_form.php:37
+#: ../user/team_change_founder_form.php:39
 msgid "Change founder of %1"
 msgstr "Změnit vlastníka %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 ""
-"Člen týmu %1 požádal o změnu vlastnictví tohoto týmu v %2, ale poté opustil "
-"tým, jeho požadavek byl zrušen."
+msgstr "Člen týmu %1 požádal o změnu vlastnictví tohoto týmu v %2, ale poté opustil tým, jeho požadavek byl zrušen."
 
-#: ../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 ""
-"Člen týmu %1 požádal o vlastnictví tohoto týmu. Důvodem může být to, že jste "
-"opustil, nebo již delší dobu nekontaktoval tým."
+msgstr "Člen týmu %1 požádal o vlastnictví tohoto týmu. Důvodem může být to, že jste opustil, nebo již delší dobu nekontaktoval tým."
 
-#: ../user/team_change_founder_form.php:55
+#: ../user/team_change_founder_form.php:57
 msgid "decline request"
 msgstr "zamítnout žádost"
 
-#: ../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 ""
-"Pokud nezamítnete žádost na změnu vlastnictví od %1, %2 dostane možnost "
-"převzít vlastnictví.<br/><br/>\n"
-"Pro přijetí nabídky převedení vlastnictví na %3 použijte následující "
-"formulář."
+"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 "Pokud nezamítnete žádost na změnu vlastnictví od %1, %2 dostane možnost převzít vlastnictví.<br/><br/>\nPro přijetí nabídky převedení vlastnictví na %3 použijte následující formulář."
 
-#: ../user/team_change_founder_form.php:66
+#: ../user/team_change_founder_form.php:68
 msgid "No transfer request is pending."
 msgstr "Žádný nevyřízený požadavek na změnu vlastnictví."
 
-#: ../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 ""
-"Pro převedení vlastnictví tohoto týmu na jiného člena, zaškrtněte políčko "
-"vedle jména člena a klikněte na <strong>Změnit vlastníka</strong>."
+msgstr "Pro převedení vlastnictví tohoto týmu na jiného člena, zaškrtněte políčko vedle jména člena a klikněte na <strong>Změnit vlastníka</strong>."
 
-#: ../user/team_change_founder_form.php:76
+#: ../user/team_change_founder_form.php:78
 msgid "New founder?"
 msgstr "Nový vlastník?"
 
-#: ../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 "Změnit vlastníka"
 
-#: ../user/team_change_founder_form.php:108
+#: ../user/team_change_founder_form.php:110
 msgid "There are no users to transfer team to."
-msgstr ""
+msgstr "Žádní uživatelé k přenesení do týmu."
 
-#: ../user/team_create_action.php:29
+#: ../user/team_create_action.php:31
 msgid "You must choose a non-blank team name"
 msgstr "Je třeba zvolit neprázdné jméno týmu."
 
-#: ../user/team_create_action.php:34
+#: ../user/team_create_action.php:36
 msgid "A team named %1 already exists - try another name"
 msgstr "Tým pojmenovaný %1 již existuje - zvolte si prosím jiné jméno."
 
-#: ../user/team_create_action.php:54
+#: ../user/team_create_action.php:56
 msgid "Could not create team - please try later."
 msgstr "Není možné vytvořit tým - zkuste to prosím později."
 
-#: ../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 "Vytvořit tým"
 
-#: ../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 ""
-"Nyní jste v %1. Musíte nejdříve %2opustit tento tým%3 před vytvářením "
-"nového."
+msgstr "Nyní jste v %1. Musíte nejdříve %2opustit tento tým%3 před vytvářením nového."
 
-#: ../user/team_delta.php:65
+#: ../user/team_delta.php:66
 msgid "Not founder or admin"
 msgstr "Není vlastník ani správce"
 
-#: ../user/team_delta.php:72
+#: ../user/team_delta.php:73
 msgid "Team history for %1"
 msgstr "Historie týmu pro %1"
 
-#: ../user/team_delta.php:75
+#: ../user/team_delta.php:76
 msgid "When"
 msgstr "Kdy"
 
-#: ../user/team_delta.php:76
+#: ../user/team_delta.php:77
 msgid "User"
 msgstr "Uživatel"
 
-#: ../user/team_delta.php:77
+#: ../user/team_delta.php:78
 msgid "Action"
 msgstr "Akce"
 
-#: ../user/team_delta.php:78
+#: ../user/team_delta.php:79
 msgid "Total credit at time of action"
 msgstr "Celkový kredit v době akce"
 
-#: ../user/team_edit_action.php:53
+#: ../user/team_edit_action.php:55
 msgid "bad country"
 msgstr "neplatná země"
 
-#: ../user/team_edit_action.php:59
+#: ../user/team_edit_action.php:61
 msgid "The name '%1' is being used by another team."
 msgstr "Jméno \"%1\" již používá jiný tým."
 
-#: ../user/team_edit_action.php:62
+#: ../user/team_edit_action.php:64
 msgid "Must specify team name"
 msgstr "Je třeba zadat jméno týmu"
 
-#: ../user/team_edit_action.php:90
+#: ../user/team_edit_action.php:92
 msgid "Could not update team - please try again later."
 msgstr "Není možné upravit tým - zkuste to prosím později."
 
-#: ../user/team_edit_form.php:33
+#: ../user/team_edit_form.php:35
 msgid "Edit %1"
 msgstr "Upravit %1"
 
-#: ../user/team_edit_form.php:34
+#: ../user/team_edit_form.php:36
 msgid "Update team info"
 msgstr "Aktualizovat popis týmu"
 
-#: ../user/team_email_list.php:61
+#: ../user/team_email_list.php:70
 msgid "%1 Email List"
 msgstr "%1 seznam emailů"
 
-#: ../user/team_email_list.php:63
+#: ../user/team_email_list.php:72
 msgid "Member list of %1"
 msgstr "Seznam členů %1"
 
-#: ../user/team_email_list.php:78
+#: ../user/team_email_list.php:87
 msgid "Show as plain text"
 msgstr "Zobrazit jako čistý text"
 
-#: ../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 "Vytvořit Diskuzní fórum"
 
-#: ../user/team_forum.php:29
+#: ../user/team_forum.php:31
 msgid "You may create a message board for use by %1."
 msgstr "Je možné pro potřebu %1 vytvořit diskuzní fórum."
 
-#: ../user/team_forum.php:31
+#: ../user/team_forum.php:33
 msgid "Only team members will be able to post."
 msgstr "Přispívat budou moci pouze členové týmu."
 
-#: ../user/team_forum.php:32
+#: ../user/team_forum.php:34
 msgid "At your option, only members will be able to read."
 msgstr "Lze nastavit, aby toto fórum mohli číst jen členové týmu."
 
-#: ../user/team_forum.php:33
+#: ../user/team_forum.php:35
 msgid "You and your Team Admins will have moderator privileges."
 msgstr "Práva moderovat fórum budete mít vy a správci týmu."
 
-#: ../user/team_forum.php:40
+#: ../user/team_forum.php:42
 msgid "Create a message board for %1"
 msgstr "Vytvořit diskuzní fórum pro %1."
 
-#: ../user/team_forum.php:48
+#: ../user/team_forum.php:50
 msgid "Team already has a message board"
 msgstr "Tým již má vlastní diskuzní fórum."
 
-#: ../user/team_forum.php:59
+#: ../user/team_forum.php:61
 msgid "Team Message Board"
 msgstr "Týmové diskuzní fórum"
 
-#: ../user/team_forum.php:71
+#: ../user/team_forum.php:73
 msgid "Minimum time between posts (seconds)"
 msgstr "Minimální čas mezi příspěvky (sek)"
 
-#: ../user/team_forum.php:74
+#: ../user/team_forum.php:76
 msgid "Minimum total credit to post"
 msgstr "Minimální celkový kredit potřebný pro přispívání"
 
-#: ../user/team_forum.php:77
+#: ../user/team_forum.php:79
 msgid "Minimum average credit to post"
 msgstr "Minimální nedávný kredit potřebný pro přispívání"
 
-#: ../user/team_forum.php:80
+#: ../user/team_forum.php:82
 msgid "Submit"
 msgstr "Odeslat"
 
-#: ../user/team_forum.php:89
+#: ../user/team_forum.php:91
 msgid "Remove your team's message board."
 msgstr "Zrušit týmové diskuzní fórum."
 
-#: ../user/team_forum.php:97
+#: ../user/team_forum.php:99
 msgid "Really remove message board?"
 msgstr "Opravdu zrušit diskuzní 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 ""
-"Jste si jisti, že chcete zrušit vaše týmové diskuzní fórum? Všechna vlákna a "
-"příspěvky budou smazána. (Je ale možné založit si později nové fórum)."
+msgstr "Jste si jisti, že chcete zrušit vaše týmové diskuzní fórum? Všechna vlákna a příspěvky budou smazána. (Je ale možné založit si později nové fórum)."
 
-#: ../user/team_forum.php:100
+#: ../user/team_forum.php:102
 msgid "Yes - remove message board"
 msgstr "Ano - zrušit diskuzní fórum"
 
-#: ../user/team_forum.php:121
+#: ../user/team_forum.php:123
 msgid "Message board removed"
 msgstr "Diskuzní fórum zrušeno"
 
-#: ../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 ""
-"Vaše týmové diskuzní fórum bylo zrušeno. Nyní si můžete %1vytvořit nové%2."
+"Your team's message board has been removed. You may now %1create a new "
+"one%2."
+msgstr "Vaše týmové diskuzní fórum bylo zrušeno. Nyní si můžete %1vytvořit nové%2."
 
-#: ../user/team_forum.php:143
+#: ../user/team_forum.php:145
 msgid "Team Message Board Updated"
 msgstr "Týmové diskuzní fórum aktualizováno"
 
-#: ../user/team_forum.php:144
+#: ../user/team_forum.php:146
 msgid "Update successful"
 msgstr "Aktualizace byla úspěšná"
 
-#: ../user/team_forum.php:147
+#: ../user/team_forum.php:149
 msgid "Update failed"
 msgstr "Aktualizace selhala"
 
-#: ../user/team_forum.php:154
+#: ../user/team_forum.php:156
 msgid "Team has no forum"
 msgstr "Tým nemá vlastní 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 "Musíte být členem tohoto týmu pro přístup k této stránce."
 
-#: ../user/team_founder_transfer_action.php:90
+#: ../user/team_founder_transfer_action.php:92
 msgid "Requesting foundership of %1"
 msgstr "Požadavek na vlastnictví %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 ""
-"Aktuální vlastník byl upozorněn na váš požadavek emailem a soukromou "
-"zprávou.<br/><br/>\n"
-"Pokud vlastník neodpoví do 60 dnů, bude vám umožněno stát se vlastníkem."
+"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 "Aktuální vlastník byl upozorněn na váš požadavek emailem a soukromou zprávou.<br/><br/>\nPokud vlastník neodpoví do 60 dnů, bude vám umožněno stát se vlastníkem."
 
-#: ../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 "Žádost o vlastnictví není momentálně povolena"
 
-#: ../user/team_founder_transfer_action.php:109
+#: ../user/team_founder_transfer_action.php:111
 msgid "Assumed foundership of %1"
 msgstr "Převzato vlastnictví %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 ""
-"Gratulujeme, nyní jste vlastníkem týmu %1. Na stránce %2Vašeho účtu%3 nyní "
-"naleznete volby pro administraci týmu."
+msgstr "Gratulujeme, nyní jste vlastníkem týmu %1. Na stránce %2Vašeho účtu%3 nyní naleznete volby pro administraci týmu."
 
-#: ../user/team_founder_transfer_action.php:120
+#: ../user/team_founder_transfer_action.php:122
 msgid "Decline founder change request"
 msgstr "Odmítnout žádost na změnu vlastnictví"
 
-#: ../user/team_founder_transfer_action.php:127
+#: ../user/team_founder_transfer_action.php:129
 msgid "The foundership request from %1 has been declined."
 msgstr "Žádost o vlastnictví z %1 byla zamítnuta."
 
-#: ../user/team_founder_transfer_action.php:130
+#: ../user/team_founder_transfer_action.php:132
 msgid "There were no foundership requests."
 msgstr "Nebyly žádné žádosti o změnu vlastnictví."
 
-#: ../user/team_founder_transfer_action.php:134
+#: ../user/team_founder_transfer_action.php:136
 msgid "undefined action %1"
 msgstr "neznámá akce %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 "Návrat na týmovou stránku"
 
-#: ../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 "Je třeba být členem tohoto týmu pro přístup k této stránce."
 
-#: ../user/team_founder_transfer_form.php:31
+#: ../user/team_founder_transfer_form.php:33
 msgid "Request foundership of %1"
 msgstr "Zažádat o vlastnictví %1"
 
-#: ../user/team_founder_transfer_form.php:38
+#: ../user/team_founder_transfer_form.php:40
 msgid "You are now founder of team %1."
 msgstr "Nyní jste vlastníkem týmu %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 "Požádal jste o vlastnictví týmu %1 v %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 ""
-"Uplynulo 60 dní od vaší žádosti a vlastník nijak neodpověděl. Můžete nyní "
-"převzít vlastnictví týmu kliknutím zde:"
+msgstr "Uplynulo 60 dní od vaší žádosti a vlastník nijak neodpověděl. Můžete nyní převzít vlastnictví týmu kliknutím zde:"
 
-#: ../user/team_founder_transfer_form.php:50
+#: ../user/team_founder_transfer_form.php:52
 msgid "Assume foundership"
 msgstr "Převzít vlastnictví"
 
-#: ../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 ""
-"Vlastník obdržel vaší žádost. Pokud neodpoví do %1 bude vám dána možnost "
-"převzít vlastnictví."
+msgstr "Vlastník obdržel vaší žádost. Pokud neodpoví do %1 bude vám dána možnost převzít vlastnictví."
 
-#: ../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"
+"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 ""
-"Pokud vlastník týmu není aktivní a máte zájem převzít vlastnictví týmu "
-"klikněte na následující tlačítko. Aktuálnímu vlastníkovi bude odeslán email "
-"s detaily vaší žádosti - bude mu umožněno předat vám vlastnictví či vaší "
-"žádost odmítnout. Pokud vlastník neodpoví do 60 dnů, bude vám umožněno "
-"převzít vlastnictví.<br/><br/>Chcete požádat o převzetí vlastnictví?"
+msgstr "Pokud vlastník týmu není aktivní a máte zájem převzít vlastnictví týmu klikněte na následující tlačítko. Aktuálnímu vlastníkovi bude odeslán email s detaily vaší žádosti - bude mu umožněno předat vám vlastnictví či vaší žádost odmítnout. Pokud vlastník neodpoví do 60 dnů, bude vám umožněno převzít vlastnictví.<br/><br/>Chcete požádat o převzetí vlastnictví?"
 
-#: ../user/team_founder_transfer_form.php:65
+#: ../user/team_founder_transfer_form.php:67
 msgid "Request foundership"
 msgstr "Zažádat o vlastnictví"
 
-#: ../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 "Žádost o vlastnictví byla odeslána uživatelem %1 v %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 ""
-"Během posledních 90 dnů byla již odeslána žádost o vlastnictví, nové žádosti "
-"nejsou momentálně povolené. Zkuste to prosím později."
+msgstr "Během posledních 90 dnů byla již odeslána žádost o vlastnictví, nové žádosti nejsou momentálně povolené. Zkuste to prosím později."
 
-#: ../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 "Nelze se připojit k týmu %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 "Již členem"
 
-#: ../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 "Již jste členem týmu %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 "Nelze se připojit k týmu - zkuste to prosím později."
 
-#: ../user/team_join_action.php:40
+#: ../user/team_join_action.php:42
 msgid "Joined %1"
 msgstr "Připojili jste se k %1"
 
-#: ../user/team_join_action.php:41
+#: ../user/team_join_action.php:43
 msgid "You have joined %1."
 msgstr "Připojili jste se k %1."
 
-#: ../user/team_join_form.php:32
+#: ../user/team_join_form.php:34
 msgid "Join %1"
 msgstr "Připojit se k %1"
 
-#: ../user/team_join_form.php:33
+#: ../user/team_join_form.php:35
 msgid "Please note:"
 msgstr "Upozornění:"
 
-#: ../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 "Připojením k týmu dáte jeho vlastníkovi přístup k vaší emailové adrese."
 
-#: ../user/team_join_form.php:36
+#: ../user/team_join_form.php:38
 msgid "Joining a team does not affect your account's credit."
 msgstr "Připojení k týmu nijak neovlivní váš kredit."
 
-#: ../user/team_join_form.php:43
+#: ../user/team_join_form.php:45
 msgid "Join team"
 msgstr "Připojit se k týmu"
 
-#: ../user/team_lookup.php:84
+#: ../user/team_lookup.php:86
 msgid "Search Results"
 msgstr "Výsledky hledání"
 
-#: ../user/team_lookup.php:86
+#: ../user/team_lookup.php:88
 msgid "Search results for '%1'"
 msgstr "Výsledky hledání pro '%1'"
 
-#: ../user/team_lookup.php:88
+#: ../user/team_lookup.php:90
 msgid "You may view these teams' members, statistics, and information."
 msgstr "Je možné si zobrazit členy tohoto týmu, statistiky a další informace."
 
-#: ../user/team_lookup.php:98
+#: ../user/team_lookup.php:100
 msgid "More than 100 teams match your search. The first 100 are shown."
-msgstr ""
-"Pro váš dotaz bylo nalezeno více než 100 výsledků, zobrazeno je prvních 100."
+msgstr "Pro váš dotaz bylo nalezeno více než 100 výsledků, zobrazeno je prvních 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 ""
-"Konec výsledků. %1 Pokud vám nevyhovuje žádný tým, můžete si %2vytvořit "
-"vlastní%3."
+"End of results. %1 If you cannot find the team you are looking for, you may "
+"%2create a team%3 yourself."
+msgstr "Konec výsledků. %1 Pokud vám nevyhovuje žádný tým, můžete si %2vytvořit vlastní%3."
 
-#: ../user/team_manage.php:26
+#: ../user/team_manage.php:28
 msgid "Team administration for %1"
 msgstr "Administrace týmu pro %1"
 
-#: ../user/team_manage.php:29
+#: ../user/team_manage.php:31
 msgid "Edit team info"
 msgstr "Upravit údaje o týmu"
 
-#: ../user/team_manage.php:30
+#: ../user/team_manage.php:32
 msgid "Change team name, URL, description, type, or country"
 msgstr "Změnit jméno týmu, URL adresu, popis, typ či zemi"
 
-#: ../user/team_manage.php:32
+#: ../user/team_manage.php:34
 msgid "Member list:"
 msgstr "Seznam členů:"
 
-#: ../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 "Zobrazit jména členů a jejich emailové adresy"
 
-#: ../user/team_manage.php:36
+#: ../user/team_manage.php:38
 msgid "View change history:"
 msgstr "Zobrazit historii změn:"
 
-#: ../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 "Zobrazit, kdy se k týmu přidávali či tým opouštěli členové"
 
-#: ../user/team_manage.php:50
+#: ../user/team_manage.php:52
 msgid "Respond to foundership request."
 msgstr "Odpovědět na žádost o předání vlastnictví."
 
-#: ../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 "Pokud neodpovíte do %1, %2 bude moci převzít vlastnictví tohoto týmu."
 
-#: ../user/team_manage.php:55
+#: ../user/team_manage.php:57
 msgid "Remove inactive or unwanted members from this team"
 msgstr "Odebrat neaktivní či nežádoucí členy týmu."
 
-#: ../user/team_manage.php:57
+#: ../user/team_manage.php:59
 msgid "Transfer foundership to another member"
 msgstr "Převést vlastnictví na jiného člena"
 
-#: ../user/team_manage.php:58
+#: ../user/team_manage.php:60
 msgid "Add/remove Team Admins"
 msgstr "Přidat/odebrat Správce týmu"
 
-#: ../user/team_manage.php:59
+#: ../user/team_manage.php:61
 msgid "Give selected team members Team Admin privileges"
 msgstr "Nastavit vybraným členům týmu práva Správce týmu"
 
-#: ../user/team_manage.php:61
+#: ../user/team_manage.php:63
 msgid "Remove team"
 msgstr "Zrušit tým"
 
-#: ../user/team_manage.php:62
+#: ../user/team_manage.php:64
 msgid "Allowed only if team has no members"
 msgstr "Povoleno jen když tým nemá žádné členy"
 
-#: ../user/team_manage.php:64
+#: ../user/team_manage.php:66
 msgid "Create or manage a team message board"
 msgstr "Vytvořit či spravovat týmové diskuzní fórum"
 
-#: ../user/team_manage.php:71
-msgid ""
-"To have this team created on all BOINC projects (current and future) you can "
-"make it into a %1BOINC-wide team%2."
-msgstr ""
-"Pro vytvoření týmu ve všech BOINC projektech, aktuálních i budoucích, lze "
-"založit %1Globální BOINC tým%2."
-
 #: ../user/team_manage.php:73
 msgid ""
-"Team admins are encouraged to join and participate in the Google %1boinc-"
-"team-founders%2 group."
-msgstr ""
-"Správcům týmů je doporučováno zapojit se do Google skupiny %1boinc-team-"
-"founders%2."
+"To have this team created on all BOINC projects (current and future) you can"
+" make it into a %1BOINC-wide team%2."
+msgstr "Pro vytvoření týmu ve všech BOINC projektech, aktuálních i budoucích, lze založit %1Globální BOINC tým%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 ""
-"Na této stránce jsou dostupné další nástroje pro správce BOINC týmů: %"
-"1www.boincteams.com%2."
+"Team admins are encouraged to join and participate in the Google %1boinc-"
+"team-founders%2 group."
+msgstr "Správcům týmů je doporučováno zapojit se do Google skupiny %1boinc-team-founders%2."
 
 #: ../user/team_manage.php:91
 msgid "Can't delete non-empty team"
@@ -6485,129 +6030,114 @@ msgstr "Nelze smazat neprázdný tým"
 msgid "Team %1 deleted"
 msgstr "Tým %1 smazán"
 
-#: ../user/team_members.php:36
+#: ../user/team_members.php:38
 msgid "Limit exceeded:  Can only display the first 1000 members."
 msgstr "Překročen limit: Lze zobrazit jen prvních 1000 členů."
 
-#: ../user/team_members.php:49
+#: ../user/team_members.php:51
 msgid "Members of %1"
 msgstr "Členové %1"
 
-#: ../user/team_quit_action.php:32
+#: ../user/team_quit_action.php:34
 msgid "Unable to quit team"
 msgstr "Nelze opustit tým"
 
-#: ../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 "Tým neexistuje, nebo nejste jeho členem."
 
-#: ../user/team_quit_form.php:31
+#: ../user/team_quit_form.php:33
 msgid "Quit %1"
 msgstr "Opustit %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"
-"         <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>Upozornění před opuštěním týmu:</strong>\n"
-"         <ul>\n"
-"         <li>Pokud opustíte tým, můžete se do něj později vrátit, nebo se "
-"připojit do kteréhokoliv jiného týmu.</li>\n"
-"         <li>Opuštění týmu nemá žádný vliv na vaše statistiky či "
-"kredit.</li>\n"
+"         <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>Upozornění před opuštěním týmu:</strong>\n         <ul>\n         <li>Pokud opustíte tým, můžete se do něj později vrátit, nebo se připojit do kteréhokoliv jiného týmu.</li>\n         <li>Opuštění týmu nemá žádný vliv na vaše statistiky či kredit.</li>\n         </ul>"
 
-#: ../user/team_quit_form.php:40
+#: ../user/team_quit_form.php:42
 msgid "Quit Team"
 msgstr "Opustit tým"
 
-#: ../user/team_remove_inactive_action.php:31
+#: ../user/team_remove_inactive_action.php:33
 msgid "Removing users from %1"
 msgstr "Odebrání členů z %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 není členem %2"
 
-#: ../user/team_remove_inactive_action.php:42
+#: ../user/team_remove_inactive_action.php:44
 msgid "%1 has been removed"
 msgstr "%1 byl odebrán"
 
-#: ../user/team_remove_inactive_form.php:32
+#: ../user/team_remove_inactive_form.php:34
 msgid "Remove members from %1"
 msgstr "Odebrat členy z %1"
 
-#: ../user/team_remove_inactive_form.php:39
+#: ../user/team_remove_inactive_form.php:41
 msgid "Remove?"
 msgstr "Odebrat?"
 
-#: ../user/team_remove_inactive_form.php:40
+#: ../user/team_remove_inactive_form.php:42
 msgid "Name (ID)"
 msgstr "Jméno (ID)"
 
-#: ../user/team_remove_inactive_form.php:65
+#: ../user/team_remove_inactive_form.php:67
 msgid "No members are eligible for removal."
 msgstr "Není vhodný žádný člen pro odebrání."
 
-#: ../user/team_remove_inactive_form.php:68
+#: ../user/team_remove_inactive_form.php:70
 msgid "Remove users"
 msgstr "Odebrat uživatele"
 
-#: ../user/team_search.php:68
+#: ../user/team_search.php:76
 msgid "Team name"
 msgstr "Jméno týmu"
 
-#: ../user/team_search.php:92
+#: ../user/team_search.php:113
 msgid "Team search results"
 msgstr "Výsledky hledání týmů"
 
-#: ../user/team_search.php:94
+#: ../user/team_search.php:115
 msgid "No teams were found matching your criteria. Try another search."
 msgstr "Nenalezen žádný tým podle vašeho dotazu. Zkuste prosím jiný dotaz."
 
-#: ../user/team_search.php:96
+#: ../user/team_search.php:117
 msgid "Or you can %1create a new team%2."
 msgstr "Nebo si můžete %založit nový tým%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ásledující týmy odpovídají jednomu či více z vašich zadaných požadavků.\n"
-"Pro přidání klikněte na jméno týmu - tím se dostanete na stránku tohoto "
-"týmu,\n"
-"zde klikněte na %1Přidat se do týmu%2."
+msgstr "Následující týmy odpovídají jednomu či více z vašich zadaných požadavků.\nPro přidání klikněte na jméno týmu - tím se dostanete na stránku tohoto týmu,\nzde klikněte na %1Přidat se do týmu%2."
 
-#: ../user/team_search.php:107
+#: ../user/team_search.php:128
 msgid "Change your search"
 msgstr "Změnit hledané údaje"
 
-#: ../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 ""
-"Můžete se přidat do týmu k lidem, kteří mají podobné zájmy, jsou ze stejné "
-"země, společnosti či školy."
+msgstr "Můžete se přidat do týmu k lidem, kteří mají podobné zájmy, jsou ze stejné země, společnosti či školy."
 
-#: ../user/team_search.php:183
+#: ../user/team_search.php:204
 msgid "Use this form to find teams that might be right for you."
 msgstr "K nalezení týmů, které by vás mohly zajímat, použijte tento formulář."
 
-#: ../user/team_search.php:188
+#: ../user/team_search.php:209
 msgid "%1I'm not interested%2 in joining a team right now."
 msgstr "%1Nemám zájem%2 připojovat se momentálně k týmu."
 
-#: ../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 "Překročen limit - zobrazeno jen prvních %1 položek"
 
@@ -6615,11 +6145,11 @@ msgstr "Překročen limit - zobrazeno jen prvních %1 položek"
 msgid "Top hosts"
 msgstr "Nejlepší počítače"
 
-#: ../user/top_teams.php:105
+#: ../user/top_teams.php:107
 msgid "Top %1 teams"
 msgstr "Nejlepší %1 týmy"
 
-#: ../user/top_teams.php:108
+#: ../user/top_teams.php:110
 msgid "There are no %1 teams"
 msgstr "Nenalezeny žádné %1 týmy"
 
@@ -6627,11 +6157,11 @@ msgstr "Nenalezeny žádné %1 týmy"
 msgid "Participant since"
 msgstr "Účastníkem od"
 
-#: ../user/uotd.php:29
+#: ../user/uotd.php:31
 msgid "No user of the day has been chosen."
 msgstr "Nebyl zvolen žádný Uživatel dne."
 
-#: ../user/uotd.php:33
+#: ../user/uotd.php:35
 msgid "User of the Day for %1: %2"
 msgstr "Uživatel dne pro %1: %2"
 
@@ -6675,19 +6205,19 @@ msgstr "Sestupně podle průměrného kreditu"
 msgid "Decreasing total credit"
 msgstr "Sestupně podle celkového kreditu"
 
-#: ../user/user_search.php:100
+#: ../user/user_search.php:84
 msgid "search string must be at least 3 characters"
 msgstr "hledaný řetězec musí být aspoň 3 znaky dlouhý"
 
-#: ../user/user_search.php:133
+#: ../user/user_search.php:118
 msgid "User search results"
 msgstr "Výsledky hledání uživatelů"
 
-#: ../user/user_search.php:140
+#: ../user/user_search.php:125
 msgid "Joined"
 msgstr "Připojen"
 
-#: ../user/user_search.php:148
+#: ../user/user_search.php:133
 msgid "No users match your search criteria."
 msgstr "Žádný uživatel neodpovídá vašim kriteriím."
 
@@ -6723,8 +6253,7 @@ msgstr "Ověřit BOINC emailovou adresu"
 msgid ""
 "Please visit the following link to validate the email address of your %1 "
 "account:"
-msgstr ""
-"Klikněte prosím na tento odkaz pro ověření emailové adresy vašeho účtu %1:"
+msgstr "Klikněte prosím na tento odkaz pro ověření emailové adresy vašeho účtu %1:"
 
 #: ../user/validate_email_addr.php:34
 msgid "Validate email sent"
@@ -6734,9 +6263,7 @@ msgstr "Email pro ověření byl odeslán"
 msgid ""
 "An email has been sent to %1. Visit the link it contains to validate your "
 "email address."
-msgstr ""
-"Byl odeslán email na %1. Klikněte prosím na odkaz, který tento email "
-"obsahuje, pro ověření dané emailové adresy."
+msgstr "Byl odeslán email na %1. Klikněte prosím na odkaz, který tento email obsahuje, pro ověření dané emailové adresy."
 
 #: ../user/validate_email_addr.php:44
 msgid "No such user."
@@ -6758,28 +6285,24 @@ msgstr "Ověřit emailovou adresu"
 msgid "The email address of your account has been validated."
 msgstr "Emailová adresa vašeho účtu byla ověřena."
 
-#: ../user/view_profile.php:36
+#: ../user/view_profile.php:38
 msgid "This user has no profile"
 msgstr "Tento uživatel nemá žádný 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 "Data účtu"
 
 #: ../user/weak_auth.php:52
 msgid ""
-"You can access your account either by using your email address and "
-"password,\n"
+"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 ""
-"K účtu můžete přistupovat buď pomocí vaší emailové adresy a hesla,\n"
-"nebo pomocí přiděleného \"klíče k účtu\".\n"
-"Váš klíč k účtu je:"
+msgstr "K účtu můžete přistupovat buď pomocí vaší emailové adresy a hesla,\nnebo pomocí přiděleného \"klíče k účtu\".\nVáš klíč k účtu je:"
 
 #: ../user/weak_auth.php:57
 msgid "This key can be used to:"
@@ -6795,11 +6318,7 @@ msgid ""
 "       To do so, install BOINC,\n"
 "       create a file named %1 in the BOINC\n"
 "       data directory, and set its contents to:"
-msgstr ""
-"pro přídání počítače k vašemu účtu bez Správce BOINC.\n"
-"K tomu je třeba nainstalovat BOINC,\n"
-"vytvořit soubor s názvem %1 ve složce, kde má BOINC data,\n"
-"a obsah tohoto souboru nastavit na:"
+msgstr "pro přídání počítače k vašemu účtu bez Správce BOINC.\nK tomu je třeba nainstalovat BOINC,\nvytvořit soubor s názvem %1 ve složce, kde má BOINC data,\na obsah tohoto souboru nastavit na:"
 
 #: ../user/weak_auth.php:73
 msgid "Weak account key"
@@ -6808,26 +6327,17 @@ msgstr "Slabý klíč k účtu"
 #: ../user/weak_auth.php:74
 msgid ""
 "Your 'weak account key' can be used to attach computers to your account\n"
-"    as described above, but cannot be used to log in to your account or "
-"change it in any way.\n"
+"    as described above, but cannot be used to log in to your account or change it in any way.\n"
 "    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 ""
-"Váš slabý klíč k účtu může být použit pro připojení počítačů k účtu\n"
-"tak, jak je popsáno výše, ale nemůže být nijak použit pro přihlášení k "
-"vašemu účtu či změně údajů.\n"
-"Pokud chcete připojit k vašemu účtu nezabezpečené počítače,\n"
-"použijte k tomu váš slabý klíč k účtu.\n"
-"Váš slabý klíč k účtu je:"
+msgstr "Váš slabý klíč k účtu může být použit pro připojení počítačů k účtu\ntak, jak je popsáno výše, ale nemůže být nijak použit pro přihlášení k vašemu účtu či změně údajů.\nPokud chcete připojit k vašemu účtu nezabezpečené počítače,\npoužijte k tomu váš slabý klíč k účtu.\nVáš slabý klíč k účtu je:"
 
 #: ../user/weak_auth.php:81
 msgid ""
 "If you change your password, your weak account key changes, and your "
 "previous weak account key becomes invalid."
-msgstr ""
-"Při změně hesla dojde též ke změně vašeho slabého klíče k účtu a váš "
-"předchozí slabý klíč se tak stane neplatným."
+msgstr "Při změně hesla dojde též ke změně vašeho slabého klíče k účtu a váš předchozí slabý klíč se tak stane neplatným."
 
 #: ../user/workunit.php:32
 msgid "can't find workunit"
@@ -6837,6 +6347,10 @@ msgstr "nelze najít pracovní jednotku"
 msgid "Workunit %1"
 msgstr "Pracovní jednotka %1"
 
+#: ../user/workunit.php:40
+msgid "application"
+msgstr "aplikační program"
+
 #: ../user/workunit.php:43
 msgid "canonical result"
 msgstr "částečný výsledek"
@@ -6846,6 +6360,10 @@ msgid "granted credit"
 msgstr "přidělený kredit"
 
 #: ../user/workunit.php:55
+msgid "Tasks in progress"
+msgstr "Probíhající úkoly"
+
+#: ../user/workunit.php:55
 msgid "suppressed pending completion"
 msgstr "potlačeno očekávané dokončení"
 
@@ -6873,268 +6391,70 @@ msgstr "validace"
 msgid "Pending"
 msgstr "Nevyřízené"
 
-#: ../project.sample/project.inc:43
+#: ../project.sample/project.inc:70
 msgid "Main page"
 msgstr "Hlavní stránka"
 
-#: ../project.sample/project.inc:45
+#: ../project.sample/project.inc:72
 msgid "Copyright"
 msgstr "Autorská práva"
 
-#: ../project.sample/project.inc:48
+#: ../project.sample/project.inc:75
 msgid "Generated"
 msgstr "Vytvořeno"
 
-#: ../project.sample/project.inc:79
+#: ../project.sample/project.inc:106
 msgid "Your personal background."
 msgstr "Vaše osobní zázemí."
 
-#: ../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 ""
-"Řekněte nám něco o sobě. Můžete například uvést odkud jste, jaký je váš věk, "
-"povolání, koníčky či cokoliv dalšího o vás."
+msgstr "Řekněte nám něco o sobě. Můžete například uvést odkud jste, jaký je váš věk, povolání, koníčky či cokoliv dalšího o vás."
 
-#: ../project.sample/project.inc:87
+#: ../project.sample/project.inc:114
 msgid "Your opinions about %1"
 msgstr "Vaše názory na %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 ""
-"Řekněte nám, co si myslíte o %1<ol>\n"
-"    <li>Proč jste se zapojil do %1?</li>\n"
-"    <li>Jaké jsou vaše očekávání od projektu?</li>\n"
-"    <li>Nějaké připomínky?</li>\n"
-"    </ol>"
+msgstr "Řekněte nám, co si myslíte o %1<ol>\n    <li>Proč jste se zapojil do %1?</li>\n    <li>Jaké jsou vaše očekávání od projektu?</li>\n    <li>Nějaké připomínky?</li>\n    </ol>"
 
-#: ../project.sample/project_specific_prefs.inc:47
+#: ../project.sample/project_specific_prefs.inc:53
 msgid "Color scheme for graphics"
 msgstr "Barevné schéma pro grafiku"
 
-#: ../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 "Maximum CPU % pro grafiku %10 ... 100%2"
 
-#: ../project.sample/project_specific_prefs.inc:49
+#: ../project.sample/project_specific_prefs.inc:56
 msgid "Run only the selected applications"
 msgstr "Povolit jen vybrané aplikace"
 
-#: ../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 "Dostávat úkoly jen pro určité aplikace. Užitečné při zaměření se na konkrétní aplikace, nebo pro jejich vyloučení."
+
+#: ../project.sample/project_specific_prefs.inc:58
 msgid ""
 "If no work for selected applications is available, accept work from other "
 "applications?"
-msgstr ""
-"Pokud není dostupná žádná práce pro vámi vybrané aplikace, přijímat práci i "
-"od jiných aplikací?"
+msgstr "Pokud není dostupná žádná práce pro vámi vybrané aplikace, přijímat práci i od jiných aplikací?"
 
-#: ../project.sample/project_specific_prefs.inc:91
+#: ../project.sample/project_specific_prefs.inc:59
+msgid "Use faster non-graphical applications if available?"
+msgstr "Jsou-li k dispozici rychlejší aplikace bez grafického prostředí, mají se použít?"
+
+#: ../project.sample/project_specific_prefs.inc:90
 msgid "(all applications)"
 msgstr "(všechny aplikace)"
-
-#~ msgid "Error:"
-#~ msgstr "Chyba:"
-
-#~ msgid "Account creation is disabled"
-#~ msgstr "Vytváření účtů je zakázáno"
-
-#~ msgid ""
-#~ "Sorry, this project has disabled the creation of new accounts.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Omlouváme se, projekt má zakázáno vytváření nových účtů. \n"
-#~ "Zkuste to prosím později."
-
-#~ msgid "Account creation is currently disabled. Please try again later."
-#~ msgstr "Momentálně je zakázáno vytváření nových účtů. Zkuste to prosím později."
-
-#~ msgid "nvidia GPU"
-#~ msgstr "nvidia GPU"
-
-#~ msgid ""
-#~ "This project hasn\\'t created an email message - please notify its "
-#~ "administrators"
-#~ msgstr ""
-#~ "Tento projekt nemá nastavenou svojí emailovou adresu - kontaktujte prosím "
-#~ "administrátory."
-
-#~ msgid ""
-#~ "These apply to all BOINC projects in which you participate.<br>\n"
-#~ "             On computers participating in multiple projects, the most "
-#~ "recently modified preferences will be used."
-#~ msgstr ""
-#~ "Tyto se vztahují na všechny BOINC projekty, ve kterých se účastníte.<br/>\n"
-#~ "U počítačů připojených do více projektů budou použity nejaktuálnější "
-#~ "předvolby."
-
-#~ msgid "Export this news item as a Notice"
-#~ msgstr "Exportovat tuto novinku jako Zprávu"
-
-#~ msgid ""
-#~ "Go to the BOINC data directory on your computer (on Windows this is usually "
-#~ "<b>C:\\Documents and Settings\\All Users\\Application Data\\BOINC</b> or "
-#~ "<b>C:\\Program Files\\BOINC</b>."
-#~ msgstr ""
-#~ "Jděte do složky ve vašem počítači, kam BOINC ukládá svá data (u Windows to "
-#~ "je obvykle <b>C:\\Documents and Settings\\All Users\\Application Data\\BOINC</b> "
-#~ "nebo <b>C:\\Program Files\\BOINC</b>."
-
-#~ msgid "No such task"
-#~ msgstr "Úkol nenalezen"
-
-#~ msgid "Computer is connected to the Internet about every %1 Leave blank or 0 if always connected. %2 BOINC will try to maintain at least this much work (max 10 days). %3"
-#~ msgstr "Počítač bývá připojen k Internetu jednou za %1 Pokud je připojen trvale, ponechte prázdné či zadejte 0. %2 BOINC se pokusí obstarávat dostatek práce alespoň na tolik dnů (max.10): %3"
-
-#~ msgid "Maintain enough work for an additional"
-#~ msgstr "Zajistit dostatek práce na další"
-
-#~ msgid "Update failed: "
-#~ msgstr "Aktualizace selhala: "
-
-#~ msgid "Provides %1limited access%2 to your account"
-#~ msgstr "Poskytuje %1omezený přístup%2 k vašemu účtu"
-
-#~ msgid "Don't use this form. Just run BOINC, select Add Project, and enter an email address and password."
-#~ msgstr "Nepoužívejte tento formulář. Jednoduše spusťte BOINC, zvolte Přidat projekt a zadejte emailovou adresu a heslo."
-
-#~ msgid "Do not reorder sticky posts"
-#~ msgstr "Nepřerovnávat trvale viditelné příspěvky"
-
-#~ msgid "If a thread contains more than this number of posts"
-#~ msgstr "Pokud má diskuze více než"
-
-#~ msgid "only display the first one and this many of the last ones"
-#~ msgstr "příspěvků, zobraz pouze první a pak tolik nejnovějších"
-
-#~ msgid "Your report has been recorded. Thanks you for your input."
-#~ msgstr "Vaše nahlášení bylo uloženo. Děkujeme za vaší pomoc."
-
-#~ msgid "Search type"
-#~ msgstr "Typ hledání"
-
-#~ msgid "User names starting with"
-#~ msgstr "Uživatelská jména začínající na"
-
-#~ msgid "Your 'weak account key' lets you link a computer to your account without giving it the ability to log in to your account or to change it in any way."
-#~ msgstr "Váš 'slabý klíč k ůčtu' umožňuje přidávat počítače s omezenými právy k vašemu účtu - bez možnosti přístupu na účet či ke změně nastavení."
-
-#~ msgid "This mechanism works only with projects that have upgraded their server software 7 Dec 2007 or later."
-#~ msgstr "Tento mechanismus funguje pouze tehdy, pokud byl software na serveru projektu aktualizován po 7. prosinci 2007."
-
-#~ msgid "Your weak account key for this project is:"
-#~ msgstr "Váš slabý klíč k účtu pro tento projekt je:"
-
-#~ msgid "To use your weak account key on a given host, find or create the 'account file' for this project. This file has a name of the form <b>account_PROJECT_URL.xml</b>. The account file for %1 is <b>%2</b>."
-#~ msgstr "K použití slabého klíče na daném stroji najděte nebo vytvořte 'soubor k účtu' k danému projektu. Tento soubor má jméno ve tvaru <b>account_ADRESA_PROJEKTU.xml</b>. Soubor s účtem pro %1 je <b>%2</b>."
-
-#~ msgid "Create this file if needed. Set its contents to:"
-#~ msgstr "Vytvořte tento soubor, pokud je to třeba. Nastavte jeho obsah na:"
-
-#~ msgid "Your weak account key is a function of your password. If you change your password, your weak account key changes, and your previous weak account key becomes invalid."
-#~ msgstr "Váš slabý klíč k účtu je provázán s vaším heslem. Pokud změníte vaše heslo, váš slabý klíč se také změní a váš předchozí slabý klíč se tímto zneplatní."
-
-#~ msgid "Account key"
-#~ msgstr "Klíč k účtu"
-
-#~ msgid "Provides full access to your account"
-#~ msgstr "Poskytuje plný přístup k vašemu účtu"
-
-#~ msgid "Export"
-#~ msgstr "Exportovat"
-
-#~ msgid "Email address verification pending"
-#~ msgstr "Nevyřízené ověření emailové adresy"
-
-#~ msgid "Logged in as %1."
-#~ msgstr "Přihlášen jako %1."
-
-#~ msgid "Log in as someone else."
-#~ msgstr "Přihlásit jako někdo jiný."
-
-#~ msgid "No thread with id %1. Please check the link and try again."
-#~ msgstr ""
-#~ "Nenelezeno vlákno s id %1. Zkontrolujte si prosím odkaz a zkuste to znova."
-
-#~ msgid "Request not found"
-#~ msgstr "Žádost nenalezena"
-
-#~ msgid "%1 has added you as a friend."
-#~ msgstr "%1 si vás přidal jako svého přítele."
-
-#~ msgid "Account data for %1"
-#~ msgstr "Data o účtu %1"
-
-#~ msgid "couldn't create message board"
-#~ msgstr "nelze vytvořit diskuzní fórum."
-
-#~ msgid "message board not found"
-#~ msgstr "diskuzní fórum nenalezeno"
-
-#~ msgid "no such forum"
-#~ msgstr "fórum nenalezeno"
-
-#~ msgid "unknown command %1"
-#~ msgstr "neznámý příkaz %1"
-
-#~ msgid "ERROR: %1 does not exist!  Cannot create combo box.<br>"
-#~ msgstr "CHYBA: %1 neexistuje! Nelze vytvořit nabídku s volbami.<br/>"
-
-#~ msgid ""
-#~ "To protect the project's webpages from spam, we kindly ask you to type in "
-#~ "the two words shown in the image:<br>\n"
-#~ msgstr ""
-#~ "Pro ochranu projektových stránek před spamem je vyžadováno zadání dvou "
-#~ "slov které prosím opište z tohoto obrázku:<br/>\n"
-
-#~ msgid "Last %1"
-#~ msgstr "Posledních %1"
-
-#~ msgid "CHARSET"
-#~ msgstr "UTF-8"
-
-#~ msgid "Resource share and graphics"
-#~ msgstr "Využití prostředků a grafika"
-
-#~ msgid "fll"
-#~ msgstr "fll"
-
-#~ msgid "Tasks for computer %1"
-#~ msgstr "Úkoly pro počítač %1"
-
-#~ msgid "Provides"
-#~ msgstr "Poskytuje"
-
-#~ msgid "limited access"
-#~ msgstr "omezený přístup"
-
-#~ msgid "to your account"
-#~ msgstr "k Vašemu účtu"
-
-#~ msgid "Current version"
-#~ msgstr "Aktuální verze"
-
-#~ msgid "Mark as unread"
-#~ msgstr "Označit jako nepřečtené"
-
-#~ msgid "With selected"
-#~ msgstr "Vybrané zprávy"
-
-#~ msgid ""
-#~ "Are you sure you want to delete the message with subject "%1" "
-#~ "(sent by %2 on %3)?"
-#~ msgstr ""
-#~ "Opravdu chcete smazat zprávu s předmětem "%1" (poslanou "
-#~ "uživatelem %2 v %3)?"
-
-#~ msgid "Yes, delete"
-#~ msgstr "Ano, smazat"
-
-#~ msgid "No such message."
-#~ msgstr "Nenalezena žádná zpráva."
diff --git a/locale/cs/BOINC-Setup.mo b/locale/cs/BOINC-Setup.mo
index 41fa189..689ceb7 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
old mode 100755
new mode 100644
index 3694590..119d905
--- a/locale/cs/BOINC-Setup.po
+++ b/locale/cs/BOINC-Setup.po
@@ -1,40 +1,33 @@
 # 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:
+# Pavel <xxxq at seznam.cz>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\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-10 14:46-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: cs\n"
+"PO-Revision-Date: 2015-02-28 17:26+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-Basepath: /Volumes/Cheer/BOINC_GIT/boinc_trunk\n"
-"X-POOTLE-MTIME: 1377896370.0\n"
-"X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: mac_installer\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: Installer.cpp:124
 #, c-format
 msgid "Sorry, this version of %s requires system 10.5 or higher."
-msgstr "Promiňte, tato verze %s vyžaduje systém verze 10.4 a novější."
+msgstr "Je nám líto, ale tato verze %s vyžaduje systém verze 10.5 nebo novější."
 
-#: PostInstall.cpp:130
-#: PostInstall.cpp:1136
-#: uninstall.cpp:1618
+#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
 msgid "Yes"
 msgstr "Ano"
 
-#: PostInstall.cpp:131
-#: PostInstall.cpp:1137
-#: uninstall.cpp:1619
+#: PostInstall.cpp:131 PostInstall.cpp:1137 uninstall.cpp:1619
 msgid "No"
 msgstr "Ne"
 
@@ -48,10 +41,7 @@ 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 ""
-"Uživatelé s administrátorskými právy na tomto počítači budou mít automaticky právo spouštět a kontrolovat %s.\n"
-"\n"
-"Přejete si, aby mohli i ne-administrátoři spouštět a kontrolovat %s na tomto Macu?"
+msgstr "Uživatelé s administrátorskými právy na tomto počítači budou mít automaticky právo spouštět a kontrolovat %s.\n\nPřejete si, aby mohli i ne-administrátoři spouštět a kontrolovat %s na tomto Macu?"
 
 #: PostInstall.cpp:1444
 #, c-format
@@ -70,9 +60,7 @@ msgstr "Chyba v přístupových právech po novém spuštění"
 msgid ""
 "Removal may take several minutes.\n"
 "Please be patient."
-msgstr ""
-"Odebírání může trvat několik minut.\n"
-"Strpení prosím."
+msgstr "Odebírání může trvat několik minut.\nStrpení prosím."
 
 #: uninstall.cpp:156
 #, c-format
@@ -80,10 +68,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 ""
-"Jste si jistí, že chcete zcela odebrat %s z tohoto počítače?\n"
-"\n"
-"Tímto se odstraní aplikace, ale zachovají se %s uživatelské soubory."
+msgstr "Jste si jistí, že chcete zcela odebrat %s z tohoto počítače?\n\nTímto se odstraní aplikace, ale zachovají se %s uživatelské soubory."
 
 #: uninstall.cpp:163
 #, c-format
@@ -103,7 +88,7 @@ msgstr "jméno uživatele"
 msgid ""
 "Do you also want to remove VirtualBox from your computer?\n"
 "(VirtualBox was installed along with BOINC.)"
-msgstr ""
+msgstr "Chcete odinstalovat i VirtualBox? \n(VirtualBox byl nainstalován spolu s programem BOINC)"
 
 #: uninstall.cpp:312
 #, c-format
@@ -115,23 +100,14 @@ msgid ""
 "\n"
 "for each user, the file\n"
 "\"%s\"."
-msgstr ""
-"Odebrání dokončeno.\n"
-"\n"
-"Volitelně můžete ještě odebrat tyto zbývající položky pomocí Finderu:\n"
-"složka \"%s\"\n"
-"\n"
-"pro každého uživatele, soubor\n"
-"\"%s\"."
+msgstr "Odebrání dokončeno.\n\nVolitelně můžete ještě odebrat tyto zbývající položky pomocí Finderu:\nsložka \"%s\"\n\npro každého uživatele, soubor\n\"%s\"."
 
 #: uninstall.cpp:840
 #, c-format
 msgid ""
 "Enter your administrator password to completely remove %s from you computer.\n"
 "\n"
-msgstr ""
-"Zadejte vaše administrátorské heslo pro úplné odebrání %s z vašeho počítače.\n"
-"\n"
+msgstr "Zadejte vaše administrátorské heslo pro úplné odebrání %s z vašeho počítače.\n\n"
 
 #: uninstall.cpp:1616
 msgid "Cancel"
@@ -140,8 +116,3 @@ msgstr "Zrušit"
 #: uninstall.cpp:1617
 msgid "Continue..."
 msgstr "Pokračovat..."
-
-#, c-format
-#~ msgid "Sorry, this version of %s requires system 10.4 or higher."
-#~ msgstr "Promiňte, tato verze %s vyžaduje systém verze 10.4 a novější."
-
diff --git a/locale/cs/BOINC-Web.mo b/locale/cs/BOINC-Web.mo
index 67ded83..5d83462 100644
Binary files a/locale/cs/BOINC-Web.mo and b/locale/cs/BOINC-Web.mo differ
diff --git a/locale/cs/BOINC-Web.po b/locale/cs/BOINC-Web.po
old mode 100755
new mode 100644
index bccb730..75d9010
--- a/locale/cs/BOINC-Web.po
+++ b/locale/cs/BOINC-Web.po
@@ -1,22 +1,27 @@
 # BOINC web translation
 # Copyright (C) 2008-2009 University of California
+# 
 # This file is distributed under the same license as BOINC.
+# 
 # FileID  : $Id$
+# 
+# Translators:
+# Pavel <xxxq at seznam.cz>, 2015
+# petnek <petr.nekvinda at gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: \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:46-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: \n"
-"Language: cs\n"
+"PO-Revision-Date: 2015-02-25 15:40+0000\n"
+"Last-Translator: petnek <petr.nekvinda at gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/boinc/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.1.6\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
 
 #: docutil.php:21
 msgid "Search"
@@ -32,56 +37,62 @@ msgid "This page is %stranslatable%s."
 msgstr "Tato stránka je %spřeložitelná%s."
 
 #: download.php:39
-msgid "We recommend that you also install VirtualBox, so your computer can work on science projects that require it."
-msgstr ""
+msgid ""
+"We recommend that you also install VirtualBox, so your computer can work on "
+"science projects that require it."
+msgstr "Doporučujeme nainstalovat současně i VirtualBox, aby mohl Váš počítač pracovat na projektech, které jej vyžadují."
 
 #: download.php:41
 msgid "Learn more about VirtualBox."
-msgstr ""
+msgstr "Chci se dozvědět více o VirtualBoxu."
 
 #: download.php:51
 msgid "Download BOINC + VirtualBox"
-msgstr ""
+msgstr "Stáhnout BOINC + VirtualBox"
 
-#: download.php:54
-#: download.php:69
+#: download.php:54 download.php:69
 #, php-format
 msgid "for %s"
-msgstr ""
+msgstr "pro %s"
 
-#: download.php:57
-#: download.php:72
+#: download.php:57 download.php:72
 #, php-format
 msgid "BOINC version %s"
-msgstr ""
+msgstr "BOINC verze %s"
 
 #: download.php:59
 #, php-format
 msgid "VirtualBox version %s"
-msgstr ""
+msgstr "VirtualBox verze %s"
 
-# #######################################
-# download.php 2006/08/03 by je2bwm
-# ######################################
 #: download.php:67
 msgid "Download BOINC"
 msgstr "Stáhnout BOINC"
 
 #: download.php:123
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others."
-msgstr ""
+msgid ""
+"BOINC is a program that lets you donate your idle computer time to science "
+"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, and many others."
+msgstr "BOINC je program, který Vám umožní věnovat volný výpočetní čas Vašeho počítače vědeckým projektům jako SETI at home, Climateprediction.net, Rosetta at home, World Community Grid a mnoha dalším."
 
 #: download.php:125
-msgid "After installing BOINC on your computer, you can connect it to as many of these projects as you like."
-msgstr ""
+msgid ""
+"After installing BOINC on your computer, you can connect it to as many of "
+"these projects as you like."
+msgstr "Po instalaci BOINCu do Vašeho počítače se můžete zapojit do tolika projektů, kolik budete chtít."
 
 #: download.php:127
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
+msgid ""
+"You may run this software on a computer only if you own the computer or have"
+" the permission of its owner."
 msgstr "Používejte prosím tento software pouze na počítačích, jejichž jste vlastníkem, nebo máte-li svolení jejich majitele."
 
 #: download.php:132
-msgid "We recommend that you download BOINC from the Google Play Store or Amazon Appstore, not from here."
-msgstr ""
+msgid ""
+"We recommend that you download BOINC from the Google Play Store or Amazon "
+"Appstore, not from here."
+msgstr "Doporučujeme Vám stáhnout BOINC z Google Play Store nebo Amazon Appstore, ne odsud."
 
 #: download.php:167
 msgid "System requirements"
@@ -91,8 +102,7 @@ msgstr "Systémové požadavky"
 msgid "Release notes"
 msgstr "Poznámky k vydání"
 
-#: download.php:169
-#: index.php:86
+#: download.php:169 index.php:86
 msgid "Help"
 msgstr "Nápověda"
 
@@ -114,20 +124,34 @@ msgstr "BOINC: počítejte pro vědu"
 
 #: help.php:12
 #, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
+msgid ""
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who"
+" can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"through the process of installing and using BOINC; %s troubleshoot any "
+"problems you might have."
 msgstr "BOINC online pomoc vám umoňuje hovořit se zkušenými uživateli systému BOINC, kteří vám mohou: %s odpovědět otázky o BOINC dobrovolnickém počítání %s provést vás procesem instalace a nastavení programu BOINC %s vyřešit problémy, na které můžete narazit."
 
 #: help.php:21
 #, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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."
+msgid ""
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system."
+" 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 pomoc je založena na programu %sSkype%s pro telefonování přes internet. Skype je zdarma (program i telefonování). Pokud Skype dosud nemáte, %sstáhněte si jej zde%s a potom se vraťte na tuto stránku."
 
 #: help.php:28
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
+msgid ""
+"The best way to get help is by voice, for which you need either built-in "
+"microphone and speakers or an external headset for your computer.  You can "
+"also use Skype's text-based chat system or regular email (if you don't have "
+"Skype) to communicate with Help Volunteers."
 msgstr "Nejlepší způsob, jak získat pomoc, je pomocí hlasové komunikace, pro kterou budete potřebovat buď vestavěný mikrofon a sluchátka, nebo přenosný headset pro váš počítač. Pro komunikaci s dobrovolnými pomocníky lze též použít textovového rozhovoru přes Skype, nebo klasický email (pokud nepoužíváte Skype)."
 
 #: help.php:31
-msgid "Volunteers speaking several languages are available. Please select a language:"
+msgid ""
+"Volunteers speaking several languages are available. Please select a "
+"language:"
 msgstr "Jsou dostupní dobrovolní pomocníci mluvící mnoha jazyky. Vyberte si prosím váš jazyk:"
 
 #: help.php:47
@@ -136,16 +160,22 @@ msgstr "Staňte se dobrovolným pomocníkem"
 
 #: help.php:50
 #, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
+msgid ""
+"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+"Volunteer%s.  It's a great way to help the cause of scientific research and "
+"volunteer computing - and it's fun!"
 msgstr "Pokud jste zkušeným uživatelem programu BOINC, byly bychom rádi, pokud byste se %sstal dobrovolným pomocníkem%s. Je to skvělý způsob, jak pomoci vědeckému výzkumu a dobrovolnickému počítání - a je to také zábava!"
 
 #: help.php:56
 #, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
+msgid ""
+"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
 msgstr "Pokud jste již dobrovolným pomocníkem: k úpravě svého nastavení %sklikněte zde%s."
 
 #: help_funcs.php:107
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
+msgid ""
+"BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
+"or the University of California."
 msgstr "BOINC pomocníci jsou neplacení dobrovolníci, jejichž činnost není zastřešována Kalifornskou univerzitou v Berkeley."
 
 #: help_funcs.php:110
@@ -180,7 +210,6 @@ msgstr "počítačů.\n"
 msgid "24-hour average:"
 msgstr "24 hodinový průměr:"
 
-# 80%
 #: index.php:56
 msgid "PetaFLOPS."
 msgstr "PetaFLOPů."
@@ -197,9 +226,7 @@ msgstr "Staňte se dobrovolníkem"
 msgid "Download"
 msgstr "Ke stažení"
 
-#: index.php:87
-#: index.php:120
-#: index.php:171
+#: index.php:87 index.php:120 index.php:171
 msgid "Documentation"
 msgstr "Dokumentace"
 
@@ -212,24 +239,29 @@ msgid "Links"
 msgstr "Odkazy"
 
 #: index.php:94
-msgid "Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:"
-msgstr ""
+msgid ""
+"Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure"
+" diseases, study global warming, discover pulsars, and do many other types "
+"of scientific research.  It's safe, secure, and easy:"
+msgstr "Využijte volný čas Vašeho počítače (Windows, Mac, Linux nebo Android) k léčbě nemocí, studiu globálního oteplování, objevování pulsarů a mnoha dalším typům vědeckého výzkumu. Je to bezpečné a snadné:"
 
 #: index.php:96
 msgid "Choose projects"
-msgstr ""
+msgstr "Vyberte si projekty"
 
 #: index.php:97
 msgid "Download BOINC software"
-msgstr ""
+msgstr "Stáhněte si BOINC"
 
 #: index.php:98
 msgid "Enter an email address and password."
-msgstr ""
+msgstr "Zadejte emailovou adresu a heslo."
 
 #: index.php:102
 #, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
+msgid ""
+"Or, if you run several projects, try an %saccount manager%s such as "
+"%sGridRepublic%s or %sBAM!%s. "
 msgstr "Případně, pokud jste zapojeni do více projektů současně, vyzkoušejte některého ze %ssprávce účtů%s, jako jsou %sGridRepublic%s nebo %sBAM!%s."
 
 #: index.php:118
@@ -241,11 +273,15 @@ msgid "Software updates"
 msgstr "Aktualizace softwaru"
 
 #: index.php:128
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving"
+" you the computing power of thousands of CPUs."
 msgstr "%1Vědci%2: využijte BOINC k vytvoření %3dobrovolnického výpočetního projektu%4, který vám umožní využít výpočetní sílu tísíce procesorů."
 
 #: index.php:132
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
 msgstr "%1Univerzity%2: využijte BOINC k vytvoření %3virtuálního univerzitního superpočítače%4."
 
 #: index.php:137
@@ -318,7 +354,8 @@ msgstr "API pro doplňkový software"
 
 #: index.php:217
 #, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
+msgid ""
+"Open-source software for %svolunteer computing%s and %sgrid computing%s."
 msgstr "Open-source software pro %sdobrovolnické počítání%s a %sgrid computing%s."
 
 #: index.php:230
@@ -329,7 +366,6 @@ msgstr "BOINC má sídlo v The University of California, Berkeley"
 msgid "Distributed sensing"
 msgstr "Distribuovaný průzkum"
 
-# 78%
 #: projects.inc:19
 msgid "Stanford University"
 msgstr "Stanfordská univerzita"
@@ -339,7 +375,10 @@ msgid "Seismology"
 msgstr "Seismologie"
 
 #: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
+msgid ""
+"The Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to Internet-connected computers.  You must buy a "
+"sensor to participate."
 msgstr "\"The Quake-Catcher Network\" vyvíjí světově nejrozsáhlejší seismickou síť za pomocí senzorů připojených k počítačům na Internetu. Pro připojení do tohoto projektu je třeba vlastnit senzor."
 
 #: projects.inc:27
@@ -351,23 +390,24 @@ msgid "Environmental research"
 msgstr "Výzkum životního prostředí"
 
 #: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
+msgid ""
+"This project is creating a free and continuously updated map of radiation "
+"levels by using sensors connected to volunteers' computers.  You must buy a "
+"sensor to participate."
 msgstr "Tento projekt vytváří volně přístupnou a pravidelně aktualizovanou mapu radiace pomocí sensorů připojených k počítačům na Internetu. Pro připojení k projektu je nutné vlastnit senzor."
 
 #: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
+msgid ""
+"To participate in these projects you must buy a sensor and attach it to your"
+" computer."
 msgstr "Pro připojení k těmto projektům je třeba vlastnit senzor a mít ho připojený k počítači."
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
 msgstr "Kognitivní vědy a umělá inteligence"
 
-#: projects.inc:60
-#: projects.inc:364
-#: projects.inc:408
-#: projects.inc:457
-#: projects.inc:464
-#: projects.inc:511
+#: projects.inc:60 projects.inc:364 projects.inc:408 projects.inc:457
+#: projects.inc:464 projects.inc:511
 msgid "Private"
 msgstr "Soukromý"
 
@@ -376,7 +416,11 @@ msgid "Artificial intelligence"
 msgstr "Umělá inteligence"
 
 #: projects.inc:62
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
+msgid ""
+"Parse and convert semantic nets for use in FreeHAL, an artificial "
+"intelligence that uses semantic networks, stemmers, part of speech "
+"databases, and part of speech taggers in order to imitate human behavior in "
+"conversations."
 msgstr "Parsování a konverze sémantických sítí pro využití ve FreeHAL, umělé inteligenci využívající sémantické sítě, čističe, části hlasových databází a hlasových označovačů s cílem napodobit lidské chování při konverzaci."
 
 #: projects.inc:69
@@ -392,7 +436,12 @@ msgid "Antimalarial drug discovery"
 msgstr "Výzkum léků proti malárii"
 
 #: projects.inc:84
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
+msgid ""
+"The parasite that causes malaria continues to evolve resistance to available"
+" medication. We therefore urgently need to discover new drugs to replace "
+"existing drugs. Importantly, these new drugs need to target NEW proteins in "
+"the parasite. The FightMalaria at Home project is aimed at finding these new "
+"targets."
 msgstr "Paraziti, kteří způsobují malárii, se stávají stále odolnějsí proti dostupným lékům. Je proto třeba stále hledat nové léky, kterými bude možné nahradit ty stávající. Je také důležité, aby tyto nové léky byly zaměřeny zejména na nové proteiny v těle parazita. Projekt FightMalaria at Home si dává za cíl najít tyto nové léky proti malárii."
 
 #: projects.inc:90
@@ -404,7 +453,12 @@ msgid "Protein structure prediction"
 msgstr "Predikce struktury proteinů"
 
 #: projects.inc:92
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
+msgid ""
+"POEM at HOME uses a computational approach to predict the biologically active "
+"structure of proteins, to understand the signal-processing mechanisms when "
+"the proteins interact with one another, to understand diseases related to "
+"protein malfunction or aggregation, and to develop new drugs on the basis of"
+" the three-dimensions structure of biologically important proteins."
 msgstr "POEM at HOME využívá výpočetní přístup k předvídání biologicky aktivních proteinových struktur, k porozumnění mechanizmů zpracovávajících signály při vzájemné inerakci mezi proteiny, k porozumnění chorob vztahujících se k poruchám proteinů, nebo jejich agregaci a k vývoji nových léků na bázi třírozměrných struktur biologicky významných proteinů."
 
 #: projects.inc:98
@@ -416,7 +470,11 @@ msgid "Study of protein - ligand interactions"
 msgstr "Studie proteinů - interakce ligandů"
 
 #: projects.inc:100
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
+msgid ""
+"Docking at Home has both bioscience and computer science goals. The project "
+"aims to further knowledge of the atomic details of protein-ligand "
+"interactions and, by doing so, will search for insights into the discovery "
+"of novel pharmaceuticals."
 msgstr "Docking at Home si klade cíle v oblasti jak biotechnologie, tak i informatiky. Cílem projektu je lepší porozumnění, jak fungují vztahy atomů u proteinových ligandů, čímž může tento projekt pomoci k objevení nových druhů léků."
 
 #: projects.inc:114
@@ -428,7 +486,11 @@ msgid "Molecular simulations of proteins"
 msgstr "Molekulární simulace proteinů"
 
 #: projects.inc:116
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
+msgid ""
+"GPUGrid.net opens novel computational scenarios by the first full-atom "
+"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
+"New biomedical applications suddenly become possible giving a new role to "
+"computational biology for biomedical research."
 msgstr "GPUGrid.net otevírá nové výpočetní možnosti díky prvnímu kódu pro simulaci molekulární dynamiky na úrovni atomů (CellMD), speciálně optimalizovanému pro provoz na NVIDIA GPU. Tímto se otevírají nové možnosti v oblasti biomedicíny a výpočetní biologie pro výzkum biomedicíny."
 
 #: projects.inc:122
@@ -440,11 +502,15 @@ msgid "Genetic linkage analysis"
 msgstr "Analýza genetických vazeb"
 
 #: projects.inc:124
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
+msgid ""
+"Superlink at Technion helps geneticists all over the world find disease-"
+"provoking genes causing some types of diabetes, hypertension (high blood "
+"pressure), cancer, schizophrenia and many others."
 msgstr "Superlink at Technion pomáhá genetikům na celém světě nalézt geny vyvolávající cukrovku, vysoký krevní tlak, rakovinu, schizofrenii a mnoho dalších."
 
 #: projects.inc:138
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
+msgid ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
 msgstr "Univerzita v Marylandu, centrum bioinformatiky a výpočetní biologie"
 
 #: projects.inc:139
@@ -452,7 +518,11 @@ msgid "Life science research"
 msgstr "Výzkum životních věd"
 
 #: projects.inc:140
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
+msgid ""
+"The Lattice Project supplies computing power to scientists at the University"
+" of Maryland studying evolutionary relationships based on DNA sequence data;"
+" bacterial, plasmid, and virus protein sequences; and biological diversity "
+"in nature reserves. "
 msgstr "\"The Lattice Project\" poskytuje výpočetní výkon vědcům na Univerzitě v Marylandu, kteří studují evoluční vztahy pomocí sekvencování dat DNA u bakterií, plasmidů a virů, a biologickou rozmanitost v národních rezervacích."
 
 #: projects.inc:146
@@ -464,20 +534,32 @@ msgid "Epidemiology"
 msgstr "Epidemiologie"
 
 #: projects.inc:148
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
+msgid ""
+"Simulation models of the transmission dynamics and health effects of malaria"
+" are an important tool for malaria control. They can be used to determine "
+"optimal strategies for delivering mosquito nets, chemotherapy, or new "
+"vaccines which are currently under development and testing.  Such modeling "
+"is extremely computer intensive, requiring simulations of large human "
+"populations with a diverse set of parameters related to biological and "
+"social factors that influence the distribution of the disease. "
 msgstr "Simulační modely přenosové dynamiky a zdravotních následků malárie jsou důležitým nástrojem pro výzkum a kontrolu šíření této nemoci. Mohou být použity pro stanovení optimálních strategií pro poskytování sítí proti komárům, chemoterapie, nebo nových očkovacích látek, které jsou v současné době ve fázi vývoje a testování. Takové modelování je extrémně náročné na výpočetní výkon - simulace velkých lidských populací s rozmanitým souborem parametrů, které souvisí s biologickými a soc [...]
 
 #: projects.inc:170
 msgid "University of Washington"
 msgstr "Washingtonská univerzita"
 
-#: projects.inc:171
-#: projects.inc:179
+#: projects.inc:171 projects.inc:179
 msgid "Biology"
 msgstr "Biologie"
 
 #: projects.inc:172
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
+msgid ""
+"Determine the 3-dimensional shapes of proteins in research that may "
+"ultimately lead to finding cures for some major human diseases. By running "
+"Rosetta at home you will help us speed up and extend our research in ways we "
+"couldn't possibly attempt without your help. You will also be helping our "
+"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
+"Cancer, and Alzheimer's"
 msgstr "Zjišťujte trojrozměrné tvary proteinů, jejichž výzkum může v důsledku vést až k nalezení léku na některé ze závažných lidských nemocí. Zapojením se v projektu Rosetta at home pomůžete urychlit a prohloubit náš výzkum způsobem, který bychom si bez vaší pomoci nemohli dovolit. Pomůžete nám také v našem úsilí navrhnout nové proteiny pro boj s nemocemi jako HIV, malarie, rakovina nebo Alzheimerova choroba."
 
 #: projects.inc:178
@@ -485,7 +567,10 @@ msgid "University of Vienna"
 msgstr "Vídeňská univerzita"
 
 #: projects.inc:180
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
+msgid ""
+"Calculate similarities between proteins. SIMAP provides a public database of"
+" the resulting data, which plays a key role in many bioinformatics research "
+"projects."
 msgstr "Počítá podobností mezi protejny. SIMAP poskytuje veřejnou databázi výsledných dat, které hrají klíčovou roli v mnoha bioinformatikckých výzkumných projektech."
 
 #: projects.inc:186
@@ -501,51 +586,76 @@ msgid "Climate study"
 msgstr "Studie klimatu"
 
 #: projects.inc:200
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
+msgid ""
+"Investigate the approximations that have to be made in state-of-the-art "
+"climate models. By running the model thousands of times we hope to find out "
+"how the model responds to slight tweaks to these approximations - slight "
+"enough to not make the approximations any less realistic. This will allow us"
+" to improve our understanding of how sensitive our models are to small "
+"changes and also to things like changes in carbon dioxide and the sulphur "
+"cycle. This will allow us to explore how climate may change in the next "
+"century under a wide range of different scenarios."
 msgstr "Zkoumejte aproximace u nejmodernějších klimatických modelů. Spuštěním modelu řádově tisíckrát se zjišťuje, jak model reaguje na drobné změny těchto aproximací - změny natolik malé, že nenaruší věrohodnost těchto aproximací. Toto nám umožní zlepšit naše chápání toho, jak citlivé jsou naše modely vůči k malým změnám a také k vlivům jako změny v podílu oxidu uhličitého a siřičitého cyklu, a také jak se klima může změnit v příštím století v širokém spektru různých scénářů."
 
 #: projects.inc:207
 msgid "Physical Science"
-msgstr ""
+msgstr "Fyzikální vědy"
 
 #: projects.inc:213
 msgid "Mechanical engineering"
-msgstr ""
+msgstr "Strojní inženýrství"
 
 #: projects.inc:214
-msgid "Currently we are calculating the optimum design of a structure call the 52 bar truss"
-msgstr ""
+msgid ""
+"Currently we are calculating the optimum design of a structure call the 52 "
+"bar truss"
+msgstr "V současné době počítáme optimální design struktury s 52 pruty"
 
-#: projects.inc:224
-#: projects.inc:263
-#: projects.inc:271
+#: projects.inc:224 projects.inc:263 projects.inc:271
 msgid "Astronomy"
 msgstr "Astronomie"
 
 #: projects.inc:225
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
+msgid ""
+"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
+"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
+"Universe. We will measure physical parameters (such as stellar mass surface "
+"density, star formation rate surface density, attenuation, and first-order "
+"star formation history) on a resolved pixel-by-pixel basis using spectral "
+"energy distribution (SED) fitting techniques in a distributed computing "
+"mode."
 msgstr "V tomto projektu kombinujeme spektrální pokrytí z GALEX, Pan-STARRS1 a WISE pro vytvoření atlasu galaxie blízkého vesmíru ve více vlnových délkách - UV-optical-NIR. Měříme pomocí fyzikálních parametrů (jako je povrchová hustota hvězdné masy, povrchová hustota rychlosti formování hvězd, útlum a historie prvního řádu formování hvězd) na podkladech v řádu pixelů pomocí technik \"speciální distribuce energie - SED\" a pomocí distribuovaných výpočtů."
 
 #: projects.inc:247
 msgid "University of Texas at Austin"
 msgstr "Texaská univerzita v Austinu"
 
-#: projects.inc:248
-#: projects.inc:279
+#: projects.inc:248 projects.inc:279
 msgid "Chemistry"
 msgstr "Chemie"
 
 #: projects.inc:249
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
+msgid ""
+"A common problem in theoretical chemistry, condensed matter physics and "
+"materials science is the calculation of the time evolution of an atomic "
+"scale system where, for example, chemical reactions and/or diffusion occur. "
+"Generally the events of interest are quite rare (many orders of magnitude "
+"slower than the vibrational movements of the atoms), and therefore direct "
+"simulations, tracking every movement of the atoms, would take thousands of "
+"years of computer calculations on the fastest present day computer before a "
+"single event of interest can be expected to occur.  Our research group is "
+"interested in calculating the long time dynamics of systems."
 msgstr "Častým problémem v teoretické chemii, fyzice kondenzovaných látek a vědy o materiálech, je výpočet časového vývoje systému na atomové úrovni, kde se odehrává například chemická reakce nebo difúze látky. Události, které nás v těchto měřítkách zajímají, jsou celkem vzácné (řádově pomalejší, než třeba vibrační pohyb atomů), a proto přímé simulace sledující pohyb každého z atomů by trvaly tisíce let i na nejrychlejších počítačích, než by nastala jediná z očekávaných událostí, které n [...]
 
-# 95%
 #: projects.inc:262
 msgid "University of Illinois at Urbana-Champaign"
 msgstr "Illinoiská univerzita v Urbana-Champaign"
 
 #: projects.inc:264
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
+msgid ""
+"The goal of Cosmology at Home is to search for the model that best describes "
+"our Universe and to find the range of models that agree with the available "
+"astronomical particle physics data."
 msgstr "Cílem Cosmology at Home jer hledání modelu, který nejlépe popisuje Vesmír, a hledání modelů, které odpovídají dostupným astroniomicým částicovým fyzikálním datům."
 
 #: projects.inc:270
@@ -553,7 +663,10 @@ msgid "Rensselaer Polytechnic Institute"
 msgstr "Polytechnický institut Rensselaer"
 
 #: projects.inc:272
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
+msgid ""
+"The goal of Milkyway at Home is to create a highly accurate three dimensional "
+"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
+"Survey."
 msgstr "Cílem projektu Milkyway at Home je vytvoření vysoce podrobného třídimenzionálního modelu Mléčné dráhy pomocí dat získanch projektem Sloan Digital Sky Survey."
 
 #: projects.inc:278
@@ -561,7 +674,13 @@ msgid "Leiden University, The Netherlands"
 msgstr "Univerzita Leiden, Nizozemí"
 
 #: projects.inc:280
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
+msgid ""
+"Surface science calculations using Classical Dynamics.  Leiden Classical "
+"allows volunteers, students and other scientist to submit their personal "
+"calculations to the grid. Each user has his own personal queue for Classical"
+" Dynamics jobs. In this way students have used the grid to simulate liquid "
+"argon, or to test the validity of the ideal gas law by actually doing the "
+"simulations through the grid."
 msgstr "Výpočty v povrchové vědě prováděné pomocí klasické dynamiky. Leiden Classical umožňuje dobrovolníkům, studentům a  vědcům zadávat své osobní výpočty, které jsou počítány pomocí gridu. Každý uživatel má svojí osobní frontu pro úlohy klasické dynamiky. Tímto způsobem již studenti využily grid pro simulaci kapalného argonu, nebo k testování platnosti zákonu o ideálním plynu pomocí simulací na gridu."
 
 #: projects.inc:294
@@ -573,25 +692,36 @@ msgid "Astrophysics"
 msgstr "Astrofyzika"
 
 #: projects.inc:296
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
+msgid ""
+"Search for spinning neutron stars (also called pulsars) using data from the "
+"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
+"observatory.  Einstein at Home is a World Year of Physics 2005 project "
+"supported by the American Physical Society (APS) and by a number of "
+"international organizations."
 msgstr "Hledání rotujících neutronových hvězd (taktéž známých pod názvem pulsar) za pomoci dat získaných z detektorů gravitačních vln LIGO a GEO a z observatoře Arecibo. Einstein at Home je projektem Světového roku fyziky 2005, který podporuje Americká fyzikální společnost (APS) a řada mezinárodních organizací."
 
-#: projects.inc:310
-#: projects.inc:318
+#: projects.inc:310 projects.inc:318
 msgid "CERN (European Organization for Nuclear Research)"
 msgstr "CERN (Evropská organizace pro jaderný výzkum)"
 
-#: projects.inc:311
-#: projects.inc:319
+#: projects.inc:311 projects.inc:319
 msgid "Physics"
 msgstr "Fyzika"
 
 #: projects.inc:312
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
+msgid ""
+"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
+"European Organization for Nuclear Research, the world's largest particle "
+"physics laboratory.  It is the most powerful instrument ever built to "
+"investigate on particles proprieties. LHC at home runs simulations to improve "
+"the design of LHC and its detectors."
 msgstr "Velký hadronový urychlovač (The Large Hadron Collider - LHC) je urychlovač částic v CERNu, Evropské organizaci pro jaderný výzkum, světově největší laboratoři částicové fyziky. Je to světově nejvýkonnější postavený nástroj pro zkoumání vlastností částic. LHC at home provádí simulace pro zlepšení návrhu LHC a jeho detektorů."
 
 #: projects.inc:320
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
+msgid ""
+"This project uses CERN-developed virtual machine technology for full-fledged"
+" LHC event physics simulation on volunteer computers.  Requires that you "
+"install VirtualBox on your computer"
 msgstr "Tento projekt využívá virtuálních strojů vyvinutých v CERNu pro plnohodnotné simulace událostí v LHC na počítačích dobrovolníků. Tento projekt vyžaduje instalaci VirtualBoxu na vašem počítači."
 
 #: projects.inc:326
@@ -603,7 +733,12 @@ msgid "Astrophysics, astrobiology"
 msgstr "Astrofyzika, astrobiologie"
 
 #: projects.inc:328
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
+msgid ""
+"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
+"goal is to detect intelligent life outside Earth. One approach, known as "
+"radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
+"signals from space. Such signals are not known to occur naturally, so a "
+"detection would provide evidence of extraterrestrial technology."
 msgstr "SETI (Search for Extraterrestrial Intelligence - Hledání Mimozemské Inteligence) je vědecká oblast, jejímž cílem je hledání inteligentního života mimo Zemi. Jeden ze způsobů, známý jako radio SETI, používá radioteleskopy k zachytávání radiových signálů s úzkou šířkou pásma z vesmíru. Je známo, že tyto signály nevznikají přírodní cestou, jejich zachycení by tedy dokazovalo existenci mimozemské technologie."
 
 #: projects.inc:342
@@ -615,7 +750,11 @@ msgid "Chemical engineering and nanotechnology"
 msgstr "Chemické inženýrství a nanotechnologie"
 
 #: projects.inc:344
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
+msgid ""
+"The study of molecular magnets and controlled nanoscale magnetism.  These "
+"magnetic molecules may be used to develop tiny magnetic switches, with "
+"applications in medicine (such as local tumor chemotherapy) and "
+"biotechnology."
 msgstr "Studie molekulárních magnetů a kontrolovaného magnetismu v měřítku nanometrů. Molekulární magnety by mohly být využity pro vývoj miniaturních magnetických spínačů, které by šlo použít v medicíně, např. pro lokální chemoterapii nádorů, či v oblasti biotechnologie."
 
 #: projects.inc:351
@@ -631,7 +770,10 @@ msgid "Physics, biochemistry, and others"
 msgstr "Fyzika, biochemie a jiné"
 
 #: projects.inc:358
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
+msgid ""
+"The objective of CAS at home is to encourage and assist scientists in China to "
+"adopt the technologies of volunteer computing and volunteer thinking for "
+"their research."
 msgstr "Cílem projektu CAS at home je podpora a pomoc vědcům v Číně při adopci technologií pro dobrovolné výpočty a skupinové přemýšlení u jejich výzkumu."
 
 #: projects.inc:365
@@ -639,11 +781,12 @@ msgid "Mathematics, physics, evolution"
 msgstr "Matematika, fyzika, evoluce"
 
 #: projects.inc:366
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
+msgid ""
+"Yoyo at home is an adapter between BOINC and several existing volunteer "
+"computing projects: ECM, Muon, Evolution at home, and distributed.net"
 msgstr "Yoyo at home je prostředníkem mezi platformou BOINC a dalšími dobrovolnými výpočetními projekty: ECM, Muon, Evolution at home a distributed.net"
 
-#: projects.inc:371
-#: projects.inc:527
+#: projects.inc:371 projects.inc:527
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 msgstr "MTA-SZTAKI - laboratoř paralelních a distribuovaných výpočtů, Maďarsko"
 
@@ -652,7 +795,11 @@ msgid "European research projects"
 msgstr "Výzkumné projekty z Evropy"
 
 #: projects.inc:373
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
+msgid ""
+"The EDGeS at Home Beta project integrates volunteer computing into the service "
+"grid network of Europe by allowing service grids to send workunits to be "
+"processed by the volunteers of this project. The scientific projects covered"
+" by the project include math, physics, biology, etc."
 msgstr "Projekt EDGeS at Home Beta spojuje jednotlivé dobrovolníky poskytující výkon pro výpočty do ucelené evropské sítě, čímž umožňuje zasílání úloh ke zpracování dobrovolníky tohoto projektu. Zahrnuté vědecké projekty se zabývají problémy v matematice, fyzice, biologii a dalších odvětvích."
 
 #: projects.inc:379
@@ -676,7 +823,11 @@ msgid "Medical, environmental and other humanitarian research"
 msgstr "Medicína, životní prostředí a jiný humanitární výzkum"
 
 #: projects.inc:389
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
+msgid ""
+"To further critical non-profit research on some of humanity's most pressing "
+"problems by creating the world's largest volunteer computing grid.  Research"
+" includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"clean water and many more."
 msgstr "Neziskový výzkum v mnoha kritických oblastech lidských problémů pomocí světově největší dobrovolnické výpočetní sítě. Výzkum zahrnuje HIV-AIDS, rakovinu. tropické a zanedbané nemoci, solární energii, čistou voda a mnohé další."
 
 #: projects.inc:395
@@ -695,21 +846,18 @@ msgstr "Matematika, fyzika a umělá inteligence"
 msgid "Simulation of quantum computing; Goldbach's conjecture."
 msgstr "Simulace kvantových výpočtů, Goldbachovy hypotézy."
 
-#: projects.inc:450
-#: projects.inc:458
+#: projects.inc:450 projects.inc:458
 msgid "Cryptography"
 msgstr "Kryptografie"
 
 #: projects.inc:459
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
+msgid ""
+"Attempt to decode 3 original Enigma messages. The signals were intercepted "
+"in the North Atlantic in 1942 and are believed to be unbroken."
 msgstr "Pokus o dešifrování tří originálních zpráv Enigma. Signály byly zachyceny v severním Atlantiku v roce 1942 a jsou považovány za nerozluštěné."
 
-#: projects.inc:465
-#: projects.inc:504
-#: projects.inc:512
-#: projects.inc:520
-#: projects.inc:528
-#: projects.inc:568
+#: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
+#: projects.inc:528 projects.inc:568
 msgid "Mathematics"
 msgstr "Matematika"
 
@@ -726,11 +874,19 @@ msgid "Factorization of large integers"
 msgstr "Faktorizace velkých čísel"
 
 #: projects.inc:473
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
+msgid ""
+"NFS at Home is a research project that uses Internet-connected computers to do "
+"the lattice sieving step in the Number Field Sieve factorization of large "
+"integers. As a young school student, you gained your first experience at "
+"breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
+"NFS at Home is a continuation of that experience, only with integers that are "
+"hundreds of digits long."
 msgstr "NFS at Home je výzkumný projekt, který využívá počítačů připojených k internetu k vykonání prosévací fáze při tzv. metodě prosévání sloužící k faktorizaci velkých čísel. Již jako malí studenti jste získali první zkušenosti s rozkladem celých čísel na prvočísla ve škole, kdy např. 15 = 3 * 5 nebo 35 = 5 * 7. Projekt NFS at Home je pokračováním této zkušnosti; akorát s tím rozdílem, že pracuje s čísly, které mají i stovky číslic."
 
 #: projects.inc:479
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
+msgid ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
 msgstr "Vilnius Gediminas Technical University a University of Technology v Kaunasu (Litva)"
 
 #: projects.inc:480
@@ -738,7 +894,11 @@ msgid "Software testing"
 msgstr "Testování softwaru"
 
 #: projects.inc:481
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
+msgid ""
+"The aim of this project is to provide a powerful distributed computing "
+"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
+"well as others Lithuanian academic institutions.  Current applications "
+"involve the study of Monte-Carlo based software testing."
 msgstr "Cílem tohoto projektu je poskytnout výkonnou výpočetní platformu pro vědce z Vilnius Gediminas Technical University (VGTU) a další litevské akademické instituce. Aktuálně se tato platforma používa pro testování aplikací na principu Monte-Carlo."
 
 #: projects.inc:503
@@ -746,11 +906,20 @@ msgid "Mathematical Institute of Leiden University / Kennislink"
 msgstr "Matematický institut univerzity Leiden / Kennislink"
 
 #: projects.inc:505
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
+msgid ""
+"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
+"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
+"product of the distinct prime factors of n. The ABC conjecture says that "
+"there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for "
+"any real h > 1. The ABC conjecture is currently one of the greatest open "
+"problems in mathematics. If it is proven to be true, a lot of other open "
+"problems can be answered directly from it."
 msgstr "Hledání \"abc-trojic\": kladných celých čísel a,b​​,c takových, že a+b=c, a<b<c, a,b​​,c nemají společného dělitele a c>rad(abc), kde rad(n) je produkt různých prvočíselných dělitelů n. Domněnka ABC tvrdí, že existuje jen konečně mnoho a,b,c tak, že log(c)/log(rad(abc))> h pro jakékoliv reálné h>1. Domněnka ABC je v současné době jedním z největších otevřených problémů v matematice. Prokáže-li se, že je pravdivá, bude díky ní možné snadno zodpovědět mnoho dalších otevřených problému."
 
 #: projects.inc:513
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
+msgid ""
+"Primegrid has multiple projects searching for different forms of very large "
+"prime numbers, including searching for the largest known prime number."
 msgstr "Primegrid zkoumá v několika projektech různé fruhy velmi velkých prvočísel, včetně hledání nových největších známých prvočísel."
 
 #: projects.inc:519
@@ -758,11 +927,15 @@ msgid "Hochschule RheinMain University of Applied Sciences"
 msgstr "Univerzita aplikovaných věd RheinMein"
 
 #: projects.inc:521
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
+msgid ""
+"Search for counterexamples to two conjectures related to the identification "
+"of prime numbers"
 msgstr "Hledání protipříkladů ke dvěma domněnkám souvisejícími s hledáním prvočísel"
 
 #: projects.inc:529
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
+msgid ""
+"Find all the generalized binary number systems (in which bases are matrices "
+"and digits are vectors) up to dimension 11."
 msgstr "Nalezení všech zobecněných binárních číselných systémů (kde jsou kořeny maticemi a čísla vektory) až do dimenze 11."
 
 #: ../html/inc/news.inc:40
@@ -773,449 +946,3 @@ msgstr "Komentáře"
 #, php-format
 msgid "News is available as an %sRSS feed%s"
 msgstr "Novinky jsou dostupné jako %szprávy RSS%s"
-
-# 75%
-#~ msgid "Astronomy, Physics, and Chemistry"
-#~ msgstr "Astronomie, Fyzika a Chemie"
-#, php-format
-#~ msgid "%s for %s (%s MB)"
-#~ msgstr "%s pro %s (%s MB)"
-#~ msgid ""
-#~ "BOINC is a program that lets you donate your idle computer time to science "
-#~ "projects like SETI at home, Climateprediction.net, Rosetta at home, World "
-#~ "Community Grid, and many others. <p> After installing BOINC on your "
-#~ "computer, you can connect it to as many of these projects as you like."
-#~ msgstr ""
-#~ "<p>BOINC je program, který vám umožňuje darovat volný výpočetní výkon vašeho "
-#~ "počítače pro účely vědeckých projektů jako SETI at home, "
-#~ "Climateprediction.net, Rosetta at home, World Community Grid a mnohých "
-#~ "dalších.</p><p>Po nainstalování programu BOINC je možné zapojit váš počítač "
-#~ "do libovolného množství z nabízených projektů.</p>"
-#~ msgid "Browser default"
-#~ msgstr "Dle výchozího nastavení prohlížeče"
-
-#, php-format
-#~ msgid ""
-#~ " Use the idle time on your computer (Windows, Mac, or Linux) to cure "
-#~ "diseases, study global warming, discover pulsars, and do many other types of "
-#~ "scientific research.  It's safe, secure, and easy:  %sChoose%s projects  "
-#~ "%sDownload%s and run BOINC software  %sEnter%s an email address and "
-#~ "password. "
-#~ msgstr ""
-#~ "Využívejte volný čas vašeho počítače (Windows, Mac, Linux) k hledání léků "
-#~ "proti nemocem, studování globálního oteplování, k objevení pulsarů nebo k "
-#~ "mnohému dalšímu vědeckému výzkumu. Je to bezpečné a jednoduché: %sVyberte si"
-#~ "%s projekty %sStáhněte si%s a nainstalujte program BOINC %sVložte%s vaší "
-#~ "emailovou adresu a heslo k projektu."
-#~ msgid "IBM Corporate Community Relations"
-#~ msgstr "IBM Corporate Community Relations"
-#~ msgid "Humanitarian research on disease, natural disasters and hunger."
-#~ msgstr "Humanitární výzkum zkoumající nemoci, přírodní pohromy a hladomor."
-#~ msgid ""
-#~ "To further critical non-profit research on some of humanity's most "
-#~ "pressing problems by creating the world's largest volunteer computing "
-#~ "grid.  Research includes HIV/AIDS, cancer, muscular dystrophy, dengue "
-#~ "fever, and many more."
-#~ msgstr ""
-#~ "Tento neziskový projekt se snaží pomocí světově největšího výpočetního "
-#~ "gridu nalézt řešení světově nejtížívějších problémů, jako je hledání léků "
-#~ "na léčbu HIV/AIDS, rakoviny, svalové distrofie, horečky dengue a mnohého "
-#~ "dalšího."
-#~ msgid ""
-#~ "Primegrid is generating a public sequential prime number database, and is "
-#~ "searching for large twin primes of the form k*2<sup>n</sup>+1 and "
-#~ "k*2<sup>n</sup>-1"
-#~ msgstr ""
-#~ "Primegrid vytváří veřejnou databázi prvočísel, jak jdou za sebou, a také "
-#~ "hledá velká párová prvočísla, která odpovídají vzorci k*2<sup>n</sup>+1 a "
-#~ "k*2<sup>n</sup>-1"
-#~ msgid "FreeHAL"
-#~ msgstr "FreeHAL"
-#~ msgid "private"
-#~ msgstr "soukromý"
-#~ msgid "POEM at HOME"
-#~ msgstr "POEM at HOME"
-#~ msgid "Docking at Home"
-#~ msgstr "Docking at Home"
-#~ msgid "GPUGrid.net"
-#~ msgstr "GPUGrid.net"
-#~ msgid "Superlink at Technion"
-#~ msgstr "Superlink at Technion"
-#~ msgid "The Lattice Project"
-#~ msgstr "The Lattice Project"
-#~ msgid "Malariacontrol.net"
-#~ msgstr "Malariacontrol.net"
-#~ msgid "Rosetta at home"
-#~ msgstr "Rosetta at home"
-#~ msgid "SIMAP"
-#~ msgstr "SIMAP"
-#~ msgid "Virtual Prairie"
-#~ msgstr "Virtuální prérie"
-#~ msgid "University of Houston"
-#~ msgstr "Univerzita v Houstonu"
-#~ msgid "Study of botanical ecosystems"
-#~ msgstr "Studie botanických ekosystémů"
-#~ msgid ""
-#~ "Provide ecological guidelines on the design of prairies with the best "
-#~ "potential for water purification."
-#~ msgstr ""
-#~ "Poskytování ekologicko-metodických rad při navrhování prérií s co možná "
-#~ "nejlepším potenciálem pro čištění vody."
-#~ msgid "Climateprediction.net"
-#~ msgstr "Climateprediction.net"
-#~ msgid "Astronomy/Physics/Chemistry"
-#~ msgstr "Astronomie/Fyzika/Chemie"
-#~ msgid "eOn"
-#~ msgstr "eOn"
-#~ msgid "Orbit at home"
-#~ msgstr "Orbit at home"
-#~ msgid "Planetary Science Institute"
-#~ msgstr "Institut planetárních věd"
-#~ msgid "Monitor and study the hazard posed by near-Earth asteroids"
-#~ msgstr ""
-#~ "Studium a sledování rizik, které pro Zemi představují blízké asteroidy"
-#~ msgid "Cosmology at Home"
-#~ msgstr "Cosmology at Home"
-#~ msgid "University of Illinois at Urbana-Chamapign"
-#~ msgstr "Illinoiská univerzita v Urbana-Chamapign"
-#~ msgid "Milkyway at home"
-#~ msgstr "Milkyway at home"
-#~ msgid "Leiden Classical"
-#~ msgstr "Leiden Classical"
-#~ msgid "uFluids at home"
-#~ msgstr "uFluids at home"
-#~ msgid "Purdue University"
-#~ msgstr "Univerzita Purdue"
-#~ msgid "Physics/Aeronautics"
-#~ msgstr "Fyzika/Letectví"
-#~ msgid ""
-#~ "The uFluids project simulates two-phase fluid behavior in microgravity "
-#~ "and microfluidics problems. Our goal is to design better satellite "
-#~ "propellant management devices and address two-phase flow in microchannel "
-#~ "and MEMS devices."
-#~ msgstr ""
-#~ "Projekt uFluids simuluje dvoufázové chování kapalin v prostředí "
-#~ "mikrogravitace a problémy mikroproudění kapalin. Naším cílem je navrhnout "
-#~ "lepší systém pro rozvod paliva u satelitů a vyřešit dvoufázový tok v "
-#~ "mikrokanálech a systémech MEMS."
-#~ msgid "Einstein at home"
-#~ msgstr "Einstein at home"
-#~ msgid "LHC at home"
-#~ msgstr "LHC at home"
-#~ msgid "SETI at home"
-#~ msgstr "SETI at home"
-#~ msgid "Quantum Monte Carlo at Home"
-#~ msgstr "Quantum Monte Carlo at Home"
-#~ msgid "University of Muenster (Germany)"
-#~ msgstr "Univerzita v Muensteru, Německo"
-#~ msgid ""
-#~ "Study the structure and reactivity of molecules using Quantum Chemistry."
-#~ msgstr "Studium struktury a reaktivity molekul pomocí kvantové chemie."
-#~ msgid "Spinhenge at home"
-#~ msgstr "Spinhenge at home"
-#~ msgid "CAS at home"
-#~ msgstr "CAS at home"
-#~ msgid "Yoyo at home"
-#~ msgstr "Yoyo at home"
-#~ msgid "EDGeS at Home"
-#~ msgstr "EDGeS at Home"
-#~ msgid "Ibercivis"
-#~ msgstr "Ibercivis"
-#~ msgid "World Community Grid"
-#~ msgstr "World Community Grid"
-#~ msgid "Enigma at Home"
-#~ msgstr "Enigma at Home"
-#~ msgid "Collatz Conjecture"
-#~ msgstr "Collatz Conjecture"
-#~ msgid "NFS at home"
-#~ msgstr "NFS at home"
-#~ msgid "VTU at home"
-#~ msgstr "VTU at home"
-#~ msgid "AQUA at home"
-#~ msgstr "AQUA at home"
-#~ msgid "D-Wave Systems, Inc."
-#~ msgstr "D-Wave Systems, Inc."
-#~ msgid "Quantum computing"
-#~ msgstr "Kvantové výpočty"
-#~ msgid ""
-#~ "D-Wave's AQUA (Adiabatic QUantum Algorithms) is a research project whose "
-#~ "goal is to predict the performance of superconducting adiabatic quantum "
-#~ "computers on a variety of hard problems arising in fields ranging from "
-#~ "materials science to machine learning. AQUA at home uses Internet-connected "
-#~ "computers to help design and analyze quantum computing algorithms, using "
-#~ "Quantum Monte Carlo techniques."
-#~ msgstr ""
-#~ "D-Wave AQUA (Adiabatické QUantové Algoritmy) je výzkumný projekt, jehož "
-#~ "cílem je odhadnout výkonnost supravodivých adiabatických kvantových "
-#~ "počítačů na různě těžkých problémech vzniklých v oblastech od vědy o "
-#~ "materiálech po strojové učení. AQUA at home využívá počítačů připojených k "
-#~ "Internetu pro návrh a analýzu kvantových výpočetních algoritmů pomocí "
-#~ "techniky Monte Carlo."
-#~ msgid "ABC at home"
-#~ msgstr "ABC at home"
-#~ msgid "PrimeGrid"
-#~ msgstr "PrimeGrid"
-#~ msgid "primaboinca"
-#~ msgstr "primaboinca"
-#~ msgid "SZTAKI Desktop Grid"
-#~ msgstr "SZTAKI Desktop Grid"
-#~ msgid "Chess960 at home"
-#~ msgstr "Chess960 at home"
-#~ msgid "Chess-960.org"
-#~ msgstr "Chess-960.org"
-#~ msgid "Game-playing"
-#~ msgstr "Hraní her"
-#~ msgid ""
-#~ "This project studies Chess 960, a variant of orthodox chess. In classical "
-#~ "chess the starting position of the game never changes.  In Chess 960, "
-#~ "just before the start of every game, the initial configuration of the "
-#~ "chess pieces is determined randomly."
-#~ msgstr ""
-#~ "Tento projekt studuje hru Šachy 960, variantu klasické hry Šachy. V "
-#~ "klasické hře Šachy je pozice všech figurek na startu stejná, ale u hry "
-#~ "Šachy 960 se před startem každé hry určí pozice každé figurky náhodně."
-#~ msgid "The current release is known to work with these Linux versions:"
-#~ msgstr "Aktuální verze by měla fungovat na těchto verzích Linuxu:"
-#~ msgid ""
-#~ "For other Linux versions, check if a BOINC package is offered by your "
-#~ "Linux distribution."
-#~ msgstr ""
-#~ "U jiných linuxových verzí si prosím zkontrolujte, zda je aplikace BOINC "
-#~ "nabízena vaší linuxovou distribucí."
-#~ msgid ""
-#~ "Alternatively, download the %1BOINC client for older Linux versions%2. "
-#~ "This doesn't have a graphical interface, but it should work on all Linux "
-#~ "systems, both x86 and x64."
-#~ msgstr ""
-#~ "Jinou možností je stažení %1BOINC klienta pro starší verze Linuxu%2. Tato "
-#~ "verze nemá grafické rozhraní, ale měla by fungovat na všech linuxových "
-#~ "systémech, x86 i x64."
-#~ msgid ""
-#~ "Note: if your computer is equipped with an Graphics Processing Unit "
-#~ "(GPU), you may be able to %suse it to compute faster%s"
-#~ msgstr ""
-#~ "Poznámka: BOINC umí využít pro %srychlejší průběh výpočtů%s i novější "
-#~ "grafické karty (GPU), pokud je takovou kartou váš počítač vybaven."
-#~ msgid "TeraFLOPS."
-#~ msgstr "TeraFLOPů."
-#~ msgid "Conferences"
-#~ msgstr "Konference"
-#~ msgid "[check all that apply]"
-#~ msgstr "[zaškrtněte všechny pravdivé]"
-#~ msgid "Other:"
-#~ msgstr "Ostatní:"
-#~ msgid "Yes - I have been running BOINC on my computer for..."
-#~ msgstr "Ano - na mém počítači běží BOINC již..."
-#~ msgid "less than a week"
-#~ msgstr "méně než týden"
-#~ msgid "less than a month"
-#~ msgstr "méně než měsíc"
-#~ msgid "less than a year"
-#~ msgstr "méně než rok"
-#~ msgid "more than a year"
-#~ msgstr "déle než rok"
-#~ msgid "No - I used to run BOINC, but..."
-#~ msgstr "Ne - na mém počítači běžel BOINC, ale..."
-#~ msgid "I lost interest"
-#~ msgstr "ztratil jsem zájem"
-#~ msgid "it was too complicated"
-#~ msgstr "bylo to příliš složité"
-#~ msgid "I stopped it and forgot to start again"
-#~ msgstr "zastavil jsem ho a zapomněl jsem jej znovu spustit"
-#~ msgid "it caused problems on my computer"
-#~ msgstr "způsoboval problémy mému počítači"
-#~ msgid "it used too much electricity"
-#~ msgstr "spotřebovával příliš mnoho elektřiny"
-#~ msgid "I switched to a non-BOINC computing project"
-#~ msgstr "přihlásil jsem se k jinému (ne-BOINC) výpočtovému projektu"
-#~ msgid "No - I tried running BOINC, but..."
-#~ msgstr "Ne, zkoušel jsem používat BOINC, ale..."
-#~ msgid "the software didn't install correctly"
-#~ msgstr "program se nenainstaloval správně"
-#~ msgid "I couldn't figure out how to use the software"
-#~ msgstr "nepřišel jsem na to, jak jej používat"
-#~ msgid "I had network communication problems"
-#~ msgstr "narazil jsem na potíže při komunikaci po síti"
-#~ msgid "I couldn't attach to a project"
-#~ msgstr "nemohl jsem se připojit k projektu"
-#~ msgid "I attached to a project, but never got any work"
-#~ msgstr "připojil jsem se k projektu, ale nikdy jsem neobdržel práci"
-#~ msgid "No - I never tried running BOINC, because..."
-#~ msgstr "Ne, nikdy jsem nezkoušel používat BOINC, protože..."
-#~ msgid "I was concerned about security"
-#~ msgstr "měl jsem pochyby o jeho bezpečnosti"
-#~ msgid "I wasn't interested in any of the projects"
-#~ msgstr "žádný projekt mě nezaujal"
-#~ msgid "I don't have permission to run it on my computer"
-#~ msgstr "nemohl jsem ho používat na mém počítači"
-#~ msgid "No version was available for my computer"
-#~ msgstr "pro můj počítač nebyla žádná příslušná verze"
-#~ msgid "What kind of computers do you have running BOINC?"
-#~ msgstr "Na jakých typech počítačů používáte BOINC?"
-#~ msgid "Where are they?"
-#~ msgstr "Kde se nacházejí?"
-#~ msgid "Work"
-#~ msgstr "V práci"
-#~ msgid "School"
-#~ msgstr "Ve škole"
-#~ msgid "How many computers?"
-#~ msgstr "Kolik počítačů?"
-#~ msgid "On average, how many hours per day are they powered on?"
-#~ msgstr "Jak dlouho jsou průměrně denně zapnuté?"
-#~ msgid "Age"
-#~ msgstr "Věk"
-#~ msgid "Sex"
-#~ msgstr "Pohlaví"
-#~ msgid "Male"
-#~ msgstr "Muž"
-#~ msgid "Female"
-#~ msgstr "Žena"
-#~ msgid "Your level of computer expertise"
-#~ msgstr "Vaše úroveň počítačových znalostí"
-#~ msgid "Beginner"
-#~ msgstr "Začátečník"
-#~ msgid "Intermediate"
-#~ msgstr "Pokročilý"
-#~ msgid "Advanced"
-#~ msgstr "Expert"
-#~ msgid "Where did you learn about BOINC projects?"
-#~ msgstr "Kde jste se dozvěděl o BOINC projektech?"
-#~ msgid "TV/radio/newspaper"
-#~ msgstr "TV/radio/noviny"
-#~ msgid "From friends, relatives, or coworkers"
-#~ msgstr "Od přátel, příbuzných, spolupracovníků"
-#~ msgid "Team message boards or web sites"
-#~ msgstr "Ze stránek týmu, či jejich diskuzního fóra"
-#~ msgid "The BOINC web site"
-#~ msgstr "Ze stránek BOINC"
-#~ msgid "Other web sites"
-#~ msgstr "Z jiných webových stránek"
-#~ msgid ""
-#~ "Which are the most important factors when you decide whether to "
-#~ "participate in a BOINC project?"
-#~ msgstr ""
-#~ "Jaké jsou pro Vás nejdůležitější faktory, když se rozhodujete, do jakého "
-#~ "BOINC projektu se zapojíte?"
-#~ msgid "Nice-looking screensaver graphics"
-#~ msgstr "Hezky vypadající šetřič obrazovky"
-#~ msgid "Fair and quick granting of credit for work done"
-#~ msgstr "Poctivé a rychlé přidělování kreditu za odvedenou práci"
-#~ msgid "Getting more credit from this project than from others"
-#~ msgstr "Získávání více kreditu v tomto projektu, než u ostatních projektů"
-#~ msgid "Helpful and friendly message boards"
-#~ msgstr "Přátelské a užitečné diskuzní fórum"
-#~ msgid "Participation by project staff on the message boards"
-#~ msgstr "To, že se také autoři projektu zapojují v diskuzním fóru"
-#~ msgid "Informative project web site"
-#~ msgstr "Informativní stránky projektu"
-#~ msgid "The science is important and beneficial"
-#~ msgstr "Výzkum je důležitý a může pomoci"
-#~ msgid "Non-profit, and results are public"
-#~ msgstr "Nevýdělečnost, výsledky jsou veřejné"
-#~ msgid "Personal recognition if my computer finds something"
-#~ msgstr "Osobní uznání, pokud můj počítač něco najde"
-#~ msgid "Publication by the project in scientific journals"
-#~ msgstr "Publikace projektu ve vědeckých sbornících"
-#~ msgid "Periodic email newsletters from the project"
-#~ msgstr "Občasné mailové novinky zasílané projektem"
-#~ msgid "How many BOINC projects do you participate in?"
-#~ msgstr "V kolika BOINC projektech se účastníte?"
-#~ msgid "Do you run BOINC as a screensaver?"
-#~ msgstr "Používáte BOINC jako šetřič obrazovky?"
-#~ msgid "Yes"
-#~ msgstr "Ano"
-#~ msgid "No"
-#~ msgstr "Ne"
-#~ msgid "Your usage of project messages boards:"
-#~ msgstr "Vaše využití diskuzního fóra:"
-#~ msgid "to read information"
-#~ msgstr "jen čtu informace"
-#~ msgid "to read and post information"
-#~ msgstr "čtu a přispívám informacemi"
-#~ msgid "None"
-#~ msgstr "žádné"
-#~ msgid ""
-#~ "Where do you get information to help resolve problems with BOINC and/or "
-#~ "BOINC projects?"
-#~ msgstr ""
-#~ "Kde získáváte informace o tom, jak řešit problémy s BOINC či BOINC "
-#~ "projekty?"
-#~ msgid "The project message boards"
-#~ msgstr "Na diskuzním fóru projektu"
-#~ msgid "The BOINC message boards"
-#~ msgstr "Na diskuzním fóru BOINC"
-#~ msgid "BOINC mailing lists"
-#~ msgstr "Na BOINC mailové konferenci"
-#~ msgid "The Unofficial BOINC Wiki"
-#~ msgstr "Na neoficiální BOINC wiki"
-#~ msgid "Team web sites"
-#~ msgstr "Na týmových stránkách"
-#~ msgid "Google or other search engines"
-#~ msgstr "Na Google nebo jiných vyhledávačích"
-#~ msgid "... more"
-#~ msgstr "... více"
-#~ msgid "BOINC user survey"
-#~ msgstr "BOINC dotazník"
-#~ msgid ""
-#~ "Several volunteer computing projects, including Climateprediction.net, "
-#~ "Einstein at home, and SETI at home, use software called BOINC.  If you "
-#~ "participate in projects like this, we request that you answer the "
-#~ "following questions.  This will help BOINC-based projects increase "
-#~ "participation and achieve greater scientific results. <p> Please answer "
-#~ "as many questions as you want, then go to the bottom and click OK. If you "
-#~ "previously completed the survey but your answers have changed, please "
-#~ "complete it again - your new answers will replace the old ones. <p> The "
-#~ "current results of the survey are <a href=poll_results.php>here</a>. "
-#~ msgstr ""
-#~ "Mnoho dobrovolných výpočetních projektů, např. Climateprediction.net, "
-#~ "Einstein at home a SETI at home, používá program nazývaný BOINC. Pokud se "
-#~ "podílíte na některém z takovýchto projektů, rádi bychom Vás požádali o "
-#~ "vyplnění následujícího dotazníku. Zodpovězení následujících otázek nám "
-#~ "pomůže zlepšit jednotlivé projekty, získat více účastníku a také "
-#~ "dosáhnout lepších vědeckých výsledků.</p><p>Odpovězte prosím na tolik "
-#~ "otázek, kolik chcete, poté jděte na konec stránky a klikněte na OK. Pokud "
-#~ "jste již dotazník dříve vyplnili, ale vaše odpovědi se změnily, prosím, "
-#~ "vyplňte jej znova - vaše staré odpovědi budou nahrazeny novými.</"
-#~ "p><p>Současné výsledky BOINC dotazníku jsou k <a href=poll_results."
-#~ "php>vidění zde</a>.</p>"
-#~ msgid "Do you run BOINC?"
-#~ msgstr "Používáte BOINC?"
-#~ msgid "Your participation"
-#~ msgstr "Vaše účast"
-#~ msgid "Your computers"
-#~ msgstr "Vaše počítače"
-#~ msgid "You"
-#~ msgstr "O Vás"
-#~ msgid "Nationality"
-#~ msgstr "Národnost"
-#~ msgid "Comments"
-#~ msgstr "Komentáře"
-#~ msgid ""
-#~ "Please suggest ways that BOINC, and the projects that use it, could be "
-#~ "improved:"
-#~ msgstr ""
-#~ "Zkuste prosím navrhnout, jakými způsoby by se daly vylepšit jednotlivé "
-#~ "projekty, nebo samotný BOINC (v angličtině):"
-#~ msgid "When done click:"
-#~ msgstr "Na konci klikněte:"
-#~ msgid "Error - results not recorded"
-#~ msgstr "Chyba - výsledek se neuložil"
-#~ msgid ""
-#~ "An internal error has prevented us from recording your survey response.  "
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Vnitřní chyba bohužel znemožnila uložení vašeho BOINC dotazníku, zkuste "
-#~ "to prosím později."
-#~ msgid "Survey response recorded"
-#~ msgstr "Váš BOINC dotazník byl uložen"
-#~ msgid "Thank you for completing the BOINC user survey."
-#~ msgstr "Děkujeme Vám za vyplnění Vašeho BOINC dotazníku."
-#~ msgid "Survey results"
-#~ msgstr "Výsledky BOINC dotazníku"
-#~ msgid ""
-#~ "These are the current results of the <a href=poll.php>BOINC user survey</"
-#~ "a>.  This page is updated every hour."
-#~ msgstr ""
-#~ "Zde jsou současné výsledky <a href=poll.php>BOINC dotazníku</a>, tato "
-#~ "stránka se aktualizuje každou hodinu."
-
diff --git a/locale/da/BOINC-Client.mo b/locale/da/BOINC-Client.mo
index a2328d0..07f67e0 100644
Binary files a/locale/da/BOINC-Client.mo and b/locale/da/BOINC-Client.mo differ
diff --git a/locale/da/BOINC-Client.po b/locale/da/BOINC-Client.po
old mode 100755
new mode 100644
index 9fd5e16..6e68972
--- a/locale/da/BOINC-Client.po
+++ b/locale/da/BOINC-Client.po
@@ -1,24 +1,23 @@
 # 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: BOINC 7.4\n"
+"Project-Id-Version: boinc\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-10-15 22:25-0700\n"
-"PO-Revision-Date: 2015-02-10 14:48-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: da\n"
+"PO-Revision-Date: 2015-02-08 17:43+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/boinc/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-POOTLE-MTIME: 1381523631.0\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: acct_mgr.cpp:450
-#: acct_mgr.cpp:459
+#: acct_mgr.cpp:450 acct_mgr.cpp:459
 msgid "Message from account manager"
 msgstr "Besked fra kontohåndtering"
 
@@ -27,7 +26,9 @@ msgid "Message from server"
 msgstr "Besked fra server"
 
 #: client_state.cpp:258
-msgid "Some tasks need more memory than allowed by your preferences.  Please check the preferences."
+msgid ""
+"Some tasks need more memory than allowed by your preferences.  Please check "
+"the preferences."
 msgstr "Nogle opgaver behøver mere hukommelse, end dine indstillinger tillader. Tjek venligst dine indstillinger."
 
 #: client_state.cpp:520
@@ -40,11 +41,12 @@ msgstr "Miljøvariablen HTTP_PROXY skal specificere en HTTP-proxy"
 
 #: cs_scheduler.cpp:613
 #, c-format
-msgid "You used the wrong URL for this project.  When convenient, remove this project, then add %s"
+msgid ""
+"You used the wrong URL for this project.  When convenient, remove this "
+"project, then add %s"
 msgstr "Du brugte en forkert URL til dette projekt. Når det er belejligt, fjern dette projekt og tilføj %s"
 
-#: cs_statefile.cpp:828
-#: ../sched/sched_types.cpp:259
+#: cs_statefile.cpp:828 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
 msgstr "Syntaksfejl i app_info.xml"
 
@@ -56,18 +58,15 @@ msgstr "Filen, der refereres til i app_info.xml, eksisterer ikke: "
 msgid "A new version of BOINC is available."
 msgstr "En ny version af BOINC er tilgængelig."
 
-#: current_version.cpp:94
-#: current_version.cpp:102
+#: current_version.cpp:94 current_version.cpp:102
 msgid "Download"
 msgstr "Download"
 
-#: log_flags.cpp:269
-#: log_flags.cpp:449
+#: log_flags.cpp:269 log_flags.cpp:449
 msgid "Unexpected text in cc_config.xml"
 msgstr "Uventet tekst i cc_config.xml"
 
-#: log_flags.cpp:423
-#: log_flags.cpp:475
+#: log_flags.cpp:423 log_flags.cpp:475
 msgid "Unrecognized tag in cc_config.xml"
 msgstr "Ukendt mærke i cc_config.xml"
 
@@ -92,7 +91,9 @@ msgid "Invalid code signing key.  To fix, remove and add this project."
 msgstr "Ugyldig underskriftsnøgle for kode. For at rette fejlen, fjern og tilføj dette projekt."
 
 #: ../sched/handle_request.cpp:859
-msgid "The project has changed its security key.  Please remove and add this project."
+msgid ""
+"The project has changed its security key.  Please remove and add this "
+"project."
 msgstr "Projektet har ændret sin sikkerhedsnøgle. Fjern og tilføj venligst dette projekt."
 
 #: ../sched/handle_request.cpp:943
@@ -104,7 +105,8 @@ msgid "This project doesn't support CPU type"
 msgstr "Dette projekt understøtter ikke CPU-typen"
 
 #: ../sched/handle_request.cpp:993
-msgid "Your BOINC client software is too old.  Please install the current version."
+msgid ""
+"Your BOINC client software is too old.  Please install the current version."
 msgstr "Din BOINC-klientsoftware er for gammel. Installér venligst den aktuelle version."
 
 #: ../sched/handle_request.cpp:1259
@@ -112,15 +114,19 @@ msgid "This project doesn't support computers of type"
 msgstr "Dette projekt understøtter ikke computere af typen"
 
 #: ../sched/sched_send.cpp:1092
-msgid "Upgrade to the latest driver to process tasks using your computer's GPU"
+msgid ""
+"Upgrade to the latest driver to process tasks using your computer's GPU"
 msgstr "Opgradér til den seneste driver for at behandle opgaver ved hjælp af din computers GPU"
 
 #: ../sched/sched_send.cpp:1099
-msgid "Upgrade to the latest driver to use all of this project's GPU applications"
+msgid ""
+"Upgrade to the latest driver to use all of this project's GPU applications"
 msgstr "Opgrader til den seneste driver for at benytte alle dettes projekts GPU-applikationer"
 
 #: ../sched/sched_send.cpp:1118
-msgid "A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to the current version"
+msgid ""
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to"
+" the current version"
 msgstr "En nyere version af BOINC er krævet for at kunne benytte din NVIDIA GPU; opgradér venligst til den aktuelle version"
 
 #: ../sched/sched_send.cpp:1146
@@ -142,7 +148,8 @@ msgstr "Nyere BOINC-version påkrævet; installér venligst den aktuelle version
 
 #: ../sched/sched_send.cpp:1305
 #, c-format
-msgid "Tasks for %s are available, but your preferences are set to not accept them"
+msgid ""
+"Tasks for %s are available, but your preferences are set to not accept them"
 msgstr "Opgaver for %s er tilgængelige, men dine indstillinger er sat til ikke at acceptere dem"
 
 #: ../sched/sched_types.cpp:254
@@ -152,4 +159,3 @@ msgstr "Ukendt app-navn i app_info.xml"
 #: ../sched/sched_version.cpp:214
 msgid "Your app_info.xml file doesn't have a usable version of"
 msgstr "Din app_info.xml-fil har ikke en brugbar version af"
-
diff --git a/locale/da/BOINC-Manager.mo b/locale/da/BOINC-Manager.mo
index 8688dc8..739d4d1 100644
Binary files a/locale/da/BOINC-Manager.mo and b/locale/da/BOINC-Manager.mo differ
diff --git a/locale/da/BOINC-Manager.po b/locale/da/BOINC-Manager.po
old mode 100755
new mode 100644
index a75f108..1c2befc
--- a/locale/da/BOINC-Manager.po
+++ b/locale/da/BOINC-Manager.po
@@ -1,63 +1,52 @@
 # 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: BOINC 7.x\n"
+"Project-Id-Version: boinc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-15 14:15-0500\n"
-"PO-Revision-Date: 2015-02-10 14:48-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: da\n"
+"POT-Creation-Date: 2014-02-02 00:00-0800\n"
+"PO-Revision-Date: 2015-02-23 23:14+0000\n"
+"Last-Translator: Rom Walton\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/boinc/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc_7.4\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1409392636.0\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-SearchPath-0: clientgui\n"
-"X-Poedit-SearchPath-1: clientgui/msw\n"
-"X-Poedit-SearchPath-2: clientgui/gtk\n"
-"X-Poedit-SearchPath-3: clientgui/mac\n"
-
-#: clientgui/AccountInfoPage.cpp:387
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: AccountInfoPage.cpp:387
 #, c-format
 msgid "Identify your account at %s"
 msgstr "Identificér din konto hos %s"
 
-#: clientgui/AccountInfoPage.cpp:393
+#: AccountInfoPage.cpp:393
 msgid ""
 "Please enter your account information\n"
 "(to create an account, visit the project's web site)"
-msgstr ""
-"Indtast venligst din kontoinformation\n"
-"(for at oprette en konto kan du besøge projektets hjemmeside)"
+msgstr "Indtast venligst din kontoinformation\n(for at oprette en konto kan du besøge projektets hjemmeside)"
 
-#: clientgui/AccountInfoPage.cpp:397
+#: AccountInfoPage.cpp:397
 msgid ""
 "This project is not currently accepting new accounts.\n"
 "You can add it only if you already have an account."
-msgstr ""
-"Dette projekt accepterer i øjeblikket ikke nye brugerkonti.\n"
-"Du kan kun tilføje projektet, hvis du allerede har en konto."
+msgstr "Dette projekt accepterer i øjeblikket ikke nye brugerkonti.\nDu kan kun tilføje projektet, hvis du allerede har en konto."
 
-#: clientgui/AccountInfoPage.cpp:401
+#: AccountInfoPage.cpp:401
 msgid "Are you already running this project?"
 msgstr "Kører du allerede dette projekt?"
 
-#: clientgui/AccountInfoPage.cpp:405
+#: AccountInfoPage.cpp:405
 msgid "&No, new user"
 msgstr "&Nej, ny bruger"
 
-#: clientgui/AccountInfoPage.cpp:408
+#: AccountInfoPage.cpp:408
 msgid "&Yes, existing user"
 msgstr "&Ja, eksisterende bruger"
 
-#: clientgui/AccountInfoPage.cpp:413
+#: AccountInfoPage.cpp:413
 msgid ""
 "We were not able to set up your account information\n"
 "automatically.\n"
@@ -65,502 +54,469 @@ msgid ""
 "Please click on the 'Find login information' link\n"
 "below to find out what to put in the email address and\n"
 "password fields."
-msgstr ""
-"Vi kunne ikke opsætte din kontoinformation\n"
-"automatisk.\n"
-"\n"
-"Klik venligst på linket \"Find loginoplysninger\"\n"
-"herunder for at finde ud af, hvad du skal skrive i emailadresse- og\n"
-"kodeord-felterne."
+msgstr "Vi kunne ikke opsætte din kontoinformation\nautomatisk.\n\nKlik venligst på linket \"Find loginoplysninger\"\nherunder for at finde ud af, hvad du skal skrive i emailadresse- og\nkodeord-felterne."
 
-#: clientgui/AccountInfoPage.cpp:416
+#: AccountInfoPage.cpp:416
 msgid "Find login information"
 msgstr "Find loginoplysninger"
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:649
+#: AccountInfoPage.cpp:436 AccountInfoPage.cpp:641
 msgid "&Password:"
 msgstr "&Kodeord:"
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:673
+#: AccountInfoPage.cpp:443 AccountInfoPage.cpp:665
 msgid "Choose a &password:"
 msgstr "Vælg et &kodeord:"
 
-#: clientgui/AccountInfoPage.cpp:446
+#: AccountInfoPage.cpp:446
 msgid "C&onfirm password:"
 msgstr "&Bekræft kodeord:"
 
-#: clientgui/AccountInfoPage.cpp:453
+#: AccountInfoPage.cpp:453
 #, c-format
 msgid "Are you already running %s?"
 msgstr "Kører du allerede %s?"
 
-#: clientgui/AccountInfoPage.cpp:482
+#: AccountInfoPage.cpp:482
 msgid "&Username:"
 msgstr "&Brugernavn:"
 
-#: clientgui/AccountInfoPage.cpp:511
-msgid "&Email address or LDAP ID:"
-msgstr ""
-
-#: clientgui/AccountInfoPage.cpp:515
+#: AccountInfoPage.cpp:508
 msgid "&Email address:"
 msgstr "&Emailadresse:"
 
-#: clientgui/AccountInfoPage.cpp:523
+#: AccountInfoPage.cpp:515
 #, c-format
 msgid "minimum length %d"
 msgstr "Minimal længde %d"
 
-#: clientgui/AccountInfoPage.cpp:530
+#: AccountInfoPage.cpp:522
 msgid "Forgot your password?"
 msgstr "Har du glemt din adgangskode?"
 
-#: clientgui/AccountInfoPage.cpp:537
+#: AccountInfoPage.cpp:529
 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 ""
-"Hvis du ikke har registreret denne kontohåndtering,\n"
-"bedes du gøre det, før du fortsætter. Klik på nedenstående link\n"
-"for at registrere eller for at hente en glemt adgangskode."
+msgstr "Hvis du ikke har registreret denne kontohåndtering,\nbedes du gøre det, før du fortsætter. Klik på nedenstående link\nfor at registrere eller for at hente en glemt adgangskode."
 
-#: clientgui/AccountInfoPage.cpp:540
+#: AccountInfoPage.cpp:532
 msgid "Account manager web site"
 msgstr "Hjemmeside for kontohåndtering"
 
-#: clientgui/AccountInfoPage.cpp:582
+#: AccountInfoPage.cpp:574 WelcomePage.cpp:348
 msgid "Add project"
 msgstr "Tilføj projekt"
 
-#: clientgui/AccountInfoPage.cpp:584
+#: AccountInfoPage.cpp:576
 msgid "Update account manager"
 msgstr "Opdatér kontohåndtering"
 
-#: clientgui/AccountInfoPage.cpp:586
+#: AccountInfoPage.cpp:578 WelcomePage.cpp:307 WelcomePage.cpp:321
 msgid "Use account manager"
 msgstr "Brug kontohåndtering"
 
-#: clientgui/AccountInfoPage.cpp:593
+#: AccountInfoPage.cpp:585
 msgid "Please enter a user name."
 msgstr "Angiv venligst et brugernavn."
 
-#: clientgui/AccountInfoPage.cpp:595
+#: AccountInfoPage.cpp:587
 msgid "Please enter an email address."
 msgstr "Angiv venligst en emailadresse."
 
-#: clientgui/AccountInfoPage.cpp:605
+#: AccountInfoPage.cpp:597
 #, c-format
 msgid "Please enter a password of at least %d characters."
 msgstr "Angiv venligst et kodeord på mindst %d tegn."
 
-#: clientgui/AccountInfoPage.cpp:615
-msgid "The password and confirmation password do not match. Please type them again."
+#: AccountInfoPage.cpp:607
+msgid ""
+"The password and confirmation password do not match. Please type them again."
 msgstr "Kodeordet og bekræftelsen af kodeordet stemmer ikke overens. Indtast dem venligst igen."
 
-#: clientgui/AccountManagerInfoPage.cpp:272
+#: AccountManagerInfoPage.cpp:272
 msgid "Choose an account manager"
 msgstr "Vælg en kontohåndtering"
 
-#: clientgui/AccountManagerInfoPage.cpp:275
+#: AccountManagerInfoPage.cpp:275
 msgid ""
 "To choose an account manager, click its name or \n"
 "type its URL below."
-msgstr ""
-"For at vælge en kontohåndtering skal du klikke på navnet eller \n"
-"skrive dens URL herunder."
+msgstr "For at vælge en kontohåndtering skal du klikke på navnet eller \nskrive dens URL herunder."
 
-#: clientgui/AccountManagerInfoPage.cpp:279
+#: AccountManagerInfoPage.cpp:279
 msgid "Account manager details:"
 msgstr "Detaljer for kontohåndtering:"
 
-#: clientgui/AccountManagerInfoPage.cpp:283
+#: AccountManagerInfoPage.cpp:283
 msgid "Account manager &URL:"
 msgstr "&URL for kontohåndtering:"
 
-#: clientgui/AccountManagerInfoPage.cpp:287
+#: AccountManagerInfoPage.cpp:287
 msgid "Open web page"
 msgstr "Åbn hjemmeside"
 
-#: clientgui/AccountManagerInfoPage.cpp:290
+#: AccountManagerInfoPage.cpp:290
 msgid "Visit this account manager's web site"
 msgstr "Besøg hjemmesiden for denne kontohåndtering"
 
-#: clientgui/AccountManagerProcessingPage.cpp:186
-#: clientgui/AccountManagerPropertiesPage.cpp:192
+#: AccountManagerProcessingPage.cpp:187 AccountManagerPropertiesPage.cpp:193
 #, c-format
 msgid "Communicating with %s."
 msgstr "Kommunikerer med %s."
 
-#: clientgui/AccountManagerProcessingPage.cpp:193
-#: clientgui/AccountManagerPropertiesPage.cpp:199
+#: AccountManagerProcessingPage.cpp:194 AccountManagerPropertiesPage.cpp:200
 msgid "Communicating with server."
 msgstr "Kommunikerer med server."
 
-#: clientgui/AccountManagerProcessingPage.cpp:198
-#: clientgui/AccountManagerPropertiesPage.cpp:204
+#: AccountManagerProcessingPage.cpp:199 AccountManagerPropertiesPage.cpp:205
 msgid "Please wait..."
 msgstr "Vent venligst …"
 
-#: clientgui/AccountManagerProcessingPage.cpp:325
+#: AccountManagerProcessingPage.cpp:326
 msgid "An internal server error has occurred.\n"
 msgstr "Der er opstået en intern serverfejl.\n"
 
-#: clientgui/AdvancedFrame.cpp:96
+#: AdvancedFrame.cpp:95
 msgid "Connected"
 msgstr "Forbundet"
 
-#: clientgui/AdvancedFrame.cpp:104
+#: AdvancedFrame.cpp:103
 msgid "Disconnected"
 msgstr "Afbrudt"
 
-#: clientgui/AdvancedFrame.cpp:318
+#: AdvancedFrame.cpp:322 sg_BoincSimpleFrame.cpp:119
 #, c-format
 msgid "Close the %s window"
 msgstr "Luk %s-vinduet"
 
-#: clientgui/AdvancedFrame.cpp:321
+#: AdvancedFrame.cpp:325 sg_BoincSimpleFrame.cpp:122
 msgid "&Close Window"
 msgstr "&Luk vindue"
 
-#: clientgui/AdvancedFrame.cpp:332
-#: clientgui/AdvancedFrame.cpp:339
-#: clientgui/AdvancedFrame.cpp:346
+#: AdvancedFrame.cpp:336 AdvancedFrame.cpp:343 AdvancedFrame.cpp:350
 #, c-format
 msgid "Exit %s"
 msgstr "Afslut %s"
 
-#: clientgui/AdvancedFrame.cpp:359
-msgid "Preferences..."
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:368
+#: AdvancedFrame.cpp:371
 msgid "&Notices\tCtrl+Shift+N"
 msgstr "&Meddelelser\tCtrl+Shift+N"
 
-#: clientgui/AdvancedFrame.cpp:369
+#: AdvancedFrame.cpp:372
 msgid "Display notices"
 msgstr "Vis meddelelser"
 
-#: clientgui/AdvancedFrame.cpp:374
+#: AdvancedFrame.cpp:377
 msgid "&Projects\tCtrl+Shift+P"
 msgstr "&Projekter\tCtrl+Shift+P"
 
-#: clientgui/AdvancedFrame.cpp:375
+#: AdvancedFrame.cpp:378
 msgid "Display projects"
 msgstr "Vis projekter"
 
-#: clientgui/AdvancedFrame.cpp:380
+#: AdvancedFrame.cpp:383
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr "&Opgaver\tCtrl+Shift+T"
 
-#: clientgui/AdvancedFrame.cpp:381
+#: AdvancedFrame.cpp:384
 msgid "Display tasks"
 msgstr "Vis opgaver"
 
-#: clientgui/AdvancedFrame.cpp:386
+#: AdvancedFrame.cpp:389
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr "Over&førsler\tCtrl+Shift+X"
 
-#: clientgui/AdvancedFrame.cpp:387
+#: AdvancedFrame.cpp:390
 msgid "Display transfers"
 msgstr "Vis overførsler"
 
-#: clientgui/AdvancedFrame.cpp:392
+#: AdvancedFrame.cpp:395
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "&Statistik\tCtrl+Shift+S"
 
-#: clientgui/AdvancedFrame.cpp:393
+#: AdvancedFrame.cpp:396
 msgid "Display statistics"
 msgstr "Vis statistik"
 
-#: clientgui/AdvancedFrame.cpp:398
+#: AdvancedFrame.cpp:401
 msgid "&Disk usage\tCtrl+Shift+D"
 msgstr "&Diskforbrug\tCtrl+Shift+D"
 
-#: clientgui/AdvancedFrame.cpp:399
+#: AdvancedFrame.cpp:402
 msgid "Display disk usage"
 msgstr "Vis diskforbrug"
 
-#: clientgui/AdvancedFrame.cpp:406
+#: AdvancedFrame.cpp:409
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr "Simpel &visning …\tCtrl+Shift+V"
 
-#: clientgui/AdvancedFrame.cpp:407
+#: AdvancedFrame.cpp:410
 msgid "Display the simple graphical interface."
 msgstr "Vis den simple grafiske grænseflade."
 
-#: clientgui/AdvancedFrame.cpp:421
+#: AdvancedFrame.cpp:424
 msgid "&Add project or account manager..."
 msgstr "&Tilføj projekt eller kontohåndtering …"
 
-#: clientgui/AdvancedFrame.cpp:422
+#: AdvancedFrame.cpp:425 sg_ProjectPanel.cpp:76
 msgid "Volunteer for any or all of 30+ projects in many areas of science"
 msgstr "Meld dig som frivillig til en eller flere af de mere end 30 projekter indenfor videnskabens mange områder"
 
-#: clientgui/AdvancedFrame.cpp:426
+#: AdvancedFrame.cpp:429
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "&Synkronisér med %s"
 
-#: clientgui/AdvancedFrame.cpp:430
+#: AdvancedFrame.cpp:433
 #, c-format
 msgid "Get current settings from %s"
 msgstr "Hent nuværende opsætning fra %s"
 
-#: clientgui/AdvancedFrame.cpp:440
+#: AdvancedFrame.cpp:443
 msgid "&Add project..."
 msgstr "Tilføj &projekt …"
 
-#: clientgui/AdvancedFrame.cpp:441
+#: AdvancedFrame.cpp:444
 msgid "Add a project"
 msgstr "Tilføj et projekt"
 
-#: clientgui/AdvancedFrame.cpp:444
+#: AdvancedFrame.cpp:447
 #, c-format
 msgid "S&top using %s..."
 msgstr "S&top med at bruge %s …"
 
-#: clientgui/AdvancedFrame.cpp:450
+#: AdvancedFrame.cpp:453
 msgid "Remove this computer from account manager control."
 msgstr "Fjern denne computer fra kontohåndtering."
 
-#: clientgui/AdvancedFrame.cpp:455
+#: AdvancedFrame.cpp:458 sg_BoincSimpleFrame.cpp:178
 msgid "&Options..."
 msgstr "&Indstillinger …"
 
-#: clientgui/AdvancedFrame.cpp:456
+#: AdvancedFrame.cpp:459 sg_BoincSimpleFrame.cpp:179
 msgid "Configure display options and proxy settings"
 msgstr "Konfigurér visningsvalgmuligheder og proxy-opsætning"
 
-#: clientgui/AdvancedFrame.cpp:460
+#: AdvancedFrame.cpp:463 sg_BoincSimpleFrame.cpp:172
 msgid "Computing &preferences..."
 msgstr "&Beregningsindstillinger …"
 
-#: clientgui/AdvancedFrame.cpp:461
+#: AdvancedFrame.cpp:464 sg_BoincSimpleFrame.cpp:173
 msgid "Configure computing preferences"
 msgstr "Konfigurér indstillinger for beregning"
 
-#: clientgui/AdvancedFrame.cpp:469
+#: AdvancedFrame.cpp:472
 msgid "&Run always"
 msgstr "Kør &altid"
 
-#: clientgui/AdvancedFrame.cpp:470
+#: AdvancedFrame.cpp:473
 msgid "Allow work regardless of preferences"
 msgstr "Tillad arbejde uanset indstillinger"
 
-#: clientgui/AdvancedFrame.cpp:474
+#: AdvancedFrame.cpp:477
 msgid "Run based on &preferences"
 msgstr "Kør efter &indstillinger"
 
-#: clientgui/AdvancedFrame.cpp:475
+#: AdvancedFrame.cpp:478
 msgid "Allow work according to preferences"
 msgstr "Tillad arbejde i henhold til indstillinger"
 
-#: clientgui/AdvancedFrame.cpp:479
+#: AdvancedFrame.cpp:482
 msgid "&Suspend"
 msgstr "&Suspendér"
 
-#: clientgui/AdvancedFrame.cpp:480
+#: AdvancedFrame.cpp:483
 msgid "Stop work regardless of preferences"
 msgstr "Suspendér arbejde uanset indstillinger"
 
-#: clientgui/AdvancedFrame.cpp:505
+#: AdvancedFrame.cpp:508
 msgid "Use GPU always"
 msgstr "Brug altid GPU"
 
-#: clientgui/AdvancedFrame.cpp:506
+#: AdvancedFrame.cpp:509
 msgid "Allow GPU work regardless of preferences"
 msgstr "Tillad GPU-arbejde uanset indstillinger"
 
-#: clientgui/AdvancedFrame.cpp:510
+#: AdvancedFrame.cpp:513
 msgid "Use GPU based on preferences"
 msgstr "Brug GPU efter indstillinger"
 
-#: clientgui/AdvancedFrame.cpp:511
+#: AdvancedFrame.cpp:514
 msgid "Allow GPU work according to preferences"
 msgstr "Tillad GPU-arbejde i henhold til indstillinger"
 
-#: clientgui/AdvancedFrame.cpp:515
+#: AdvancedFrame.cpp:518
 msgid "Suspend GPU"
 msgstr "Suspendér GPU"
 
-#: clientgui/AdvancedFrame.cpp:516
+#: AdvancedFrame.cpp:519
 msgid "Stop GPU work regardless of preferences"
 msgstr "Stop GPU-arbejde uanset indstillinger"
 
-#: clientgui/AdvancedFrame.cpp:540
+#: AdvancedFrame.cpp:543
 msgid "Network activity always available"
 msgstr "Netværksaktivitet altid tilgængelig"
 
-#: clientgui/AdvancedFrame.cpp:541
+#: AdvancedFrame.cpp:544
 msgid "Allow network activity regardless of preferences"
 msgstr "Tillad netværksaktivitet uanset indstillinger"
 
-#: clientgui/AdvancedFrame.cpp:545
+#: AdvancedFrame.cpp:548
 msgid "Network activity based on preferences"
 msgstr "Netværksaktivitet efter indstillinger"
 
-#: clientgui/AdvancedFrame.cpp:546
+#: AdvancedFrame.cpp:549
 msgid "Allow network activity according to preferences"
 msgstr "Tillad netværksaktivitet efter indstillinger"
 
-#: clientgui/AdvancedFrame.cpp:550
+#: AdvancedFrame.cpp:553
 msgid "Network activity suspended"
 msgstr "Netværksaktivitet suspenderet"
 
-#: clientgui/AdvancedFrame.cpp:551
+#: AdvancedFrame.cpp:554
 msgid "Stop BOINC network activity"
 msgstr "Stop BOINC netværksaktivitet"
 
-#: clientgui/AdvancedFrame.cpp:561
+#: AdvancedFrame.cpp:564
 #, c-format
 msgid "Connect to another computer running %s"
 msgstr "Forbind til en anden computer, der kører %s"
 
-#: clientgui/AdvancedFrame.cpp:566
+#: AdvancedFrame.cpp:569
 msgid "Select computer..."
 msgstr "Vælg computer …"
 
-#: clientgui/AdvancedFrame.cpp:571
+#: AdvancedFrame.cpp:574
 msgid "Shut down connected client..."
 msgstr "Stop den forbundne klient …"
 
-#: clientgui/AdvancedFrame.cpp:572
+#: AdvancedFrame.cpp:575
 msgid "Shut down the currently connected client"
 msgstr "Stop den nuværende forbundne klient"
 
-#: clientgui/AdvancedFrame.cpp:576
+#: AdvancedFrame.cpp:579
 msgid "Run CPU &benchmarks"
 msgstr "Kør CPU-&ydelsesmåling"
 
-#: clientgui/AdvancedFrame.cpp:577
+#: AdvancedFrame.cpp:580
 msgid "Runs BOINC CPU benchmarks"
 msgstr "Kører BOINC CPU-ydelsesmåling"
 
-#: clientgui/AdvancedFrame.cpp:581
+#: AdvancedFrame.cpp:584
 msgid "Do network communication"
 msgstr "Udfør netværkskommunikation"
 
-#: clientgui/AdvancedFrame.cpp:582
+#: AdvancedFrame.cpp:585
 msgid "Do all pending network communication"
 msgstr "Udfør al afventende netværkskommunikation"
 
-# 94%
-#: clientgui/AdvancedFrame.cpp:586
+#: AdvancedFrame.cpp:589
 msgid "Read config files"
 msgstr "Læs konfigurationsfiler"
 
-#: clientgui/AdvancedFrame.cpp:587
-msgid "Read configuration info from cc_config.xml and any app_config.xml files"
+#: AdvancedFrame.cpp:590
+msgid ""
+"Read configuration info from cc_config.xml and any app_config.xml files"
 msgstr "Læs konfigurationsinfo fra cc_config.xml og eventuelle app_config.xml filer"
 
-#: clientgui/AdvancedFrame.cpp:591
+#: AdvancedFrame.cpp:594
 msgid "Read local prefs file"
 msgstr "Læs lokal indstillingsfil"
 
-#: clientgui/AdvancedFrame.cpp:592
+#: AdvancedFrame.cpp:595
 msgid "Read preferences from global_prefs_override.xml."
 msgstr "Læs indstillinger fra global_prefs_override.xml."
 
-#: clientgui/AdvancedFrame.cpp:597
+#: AdvancedFrame.cpp:600
 #, c-format
 msgid "Launch another instance of %s..."
 msgstr "Kør endnu en instans af %s …"
 
-#: clientgui/AdvancedFrame.cpp:601
+#: AdvancedFrame.cpp:604
 #, c-format
 msgid "Launch another %s"
 msgstr "Kør endnu en %s"
 
-#: clientgui/AdvancedFrame.cpp:611
+#: AdvancedFrame.cpp:614
 msgid "Event Log...\tCtrl+Shift+E"
 msgstr "Hændelseslog …\tCtrl+Shift+E"
 
-#: clientgui/AdvancedFrame.cpp:612
+#: AdvancedFrame.cpp:615
 msgid "Display diagnostic messages."
 msgstr "Vis diagnosticeringsbeskeder."
 
-#: clientgui/AdvancedFrame.cpp:616
-msgid "Event Log Diagnostic Flags...\tCtrl+Shift+F"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:617
-msgid "Enable or disable various diagnostic messages"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:626
+#: AdvancedFrame.cpp:625 sg_BoincSimpleFrame.cpp:188
 #, c-format
 msgid "%s &help"
 msgstr "%s &hjælp"
 
-#: clientgui/AdvancedFrame.cpp:632
+#: AdvancedFrame.cpp:631 sg_BoincSimpleFrame.cpp:194
 #, c-format
 msgid "Show information about %s"
 msgstr "Vis information om %s"
 
-#: clientgui/AdvancedFrame.cpp:644
+#: AdvancedFrame.cpp:643
 #, c-format
 msgid "&%s help"
 msgstr "&%s hjælp"
 
-#: clientgui/AdvancedFrame.cpp:650
+#: AdvancedFrame.cpp:649 sg_BoincSimpleFrame.cpp:212
 #, c-format
 msgid "Show information about the %s"
 msgstr "Vis information om %s"
 
-#: clientgui/AdvancedFrame.cpp:662
+#: AdvancedFrame.cpp:661 sg_BoincSimpleFrame.cpp:224
 #, c-format
 msgid "%s &web site"
 msgstr "%s hjemmeside"
 
-#: clientgui/AdvancedFrame.cpp:668
+#: AdvancedFrame.cpp:667 sg_BoincSimpleFrame.cpp:230
 #, c-format
 msgid "Show information about BOINC and %s"
 msgstr "Vis information om BOINC og %s"
 
-#: clientgui/AdvancedFrame.cpp:680
-#: clientgui/BOINCTaskBar.cpp:544
+#: AdvancedFrame.cpp:679 BOINCTaskBar.cpp:530 sg_BoincSimpleFrame.cpp:242
 #, c-format
 msgid "&About %s..."
 msgstr "&Om %s …"
 
-#: clientgui/AdvancedFrame.cpp:686
+#: AdvancedFrame.cpp:685 sg_BoincSimpleFrame.cpp:248
 msgid "Licensing and copyright information."
 msgstr "Licens- og copyrightinformation."
 
-#: clientgui/AdvancedFrame.cpp:693
+#: AdvancedFrame.cpp:692 sg_BoincSimpleFrame.cpp:255
 msgid "&File"
 msgstr "&Filer"
 
-#: clientgui/AdvancedFrame.cpp:697
+#: AdvancedFrame.cpp:696 sg_BoincSimpleFrame.cpp:259
 msgid "&View"
 msgstr "&Vis"
 
-#: clientgui/AdvancedFrame.cpp:701
+#: AdvancedFrame.cpp:700 sg_BoincSimpleFrame.cpp:263
 msgid "&Tools"
 msgstr "&Værktøjer"
 
-#: clientgui/AdvancedFrame.cpp:705
+#: AdvancedFrame.cpp:704
 msgid "&Activity"
 msgstr "&Aktivitet"
 
-#: clientgui/AdvancedFrame.cpp:709
+#: AdvancedFrame.cpp:708
 msgid "A&dvanced"
 msgstr "Avan&ceret"
 
-#: clientgui/AdvancedFrame.cpp:713
+#: AdvancedFrame.cpp:712 DlgEventLog.cpp:332 sg_BoincSimpleFrame.cpp:267
+#: wizardex.cpp:374 wizardex.cpp:381
 msgid "&Help"
 msgstr "&Hjælp"
 
-#: clientgui/AdvancedFrame.cpp:1185
+#: AdvancedFrame.cpp:1199
 #, c-format
 msgid "%s - Stop using %s"
 msgstr "%s – Stop med at bruge %s"
 
-#: clientgui/AdvancedFrame.cpp:1190
+#: AdvancedFrame.cpp:1204
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -568,256 +524,222 @@ msgid ""
 "but you'll have to manage projects manually.\n"
 "\n"
 "Do you want to stop using %s?"
-msgstr ""
-"Hvis du stopper med at bruge %s,\n"
-"vil du beholde alle dine nuværende projekter,\n"
-"men du skal styre dem manuelt.\n"
-"\n"
-"Vil du stoppe med at bruge %s?"
+msgstr "Hvis du stopper med at bruge %s,\nvil du beholde alle dine nuværende projekter,\nmen du skal styre dem manuelt.\n\nVil du stoppe med at bruge %s?"
 
-#: clientgui/AdvancedFrame.cpp:1397
+#: AdvancedFrame.cpp:1401
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s – Luk den nuværende klient ned …"
 
-#: clientgui/AdvancedFrame.cpp:1406
+#: AdvancedFrame.cpp:1410
 #, c-format
 msgid ""
 "%s will shut down the current client\n"
 "and prompt you for another host to connect to."
-msgstr ""
-"%s vil lukke den nuværende klient ned\n"
-"og vil derefter spørge efter en ny vært at forbinde til."
+msgstr "%s vil lukke den nuværende klient ned\nog vil derefter spørge efter en ny vært at forbinde til."
 
-#: clientgui/AdvancedFrame.cpp:1806
+#: AdvancedFrame.cpp:1745 DlgAbout.cpp:119
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: clientgui/AdvancedFrame.cpp:1815
+#: AdvancedFrame.cpp:1754
 #, c-format
 msgid "%s has successfully added %s"
 msgstr "%s har tilføjet %s med succes"
 
-#: clientgui/AdvancedFrame.cpp:1953
+#: AdvancedFrame.cpp:1893
 #, c-format
 msgid "%s - (%s)"
 msgstr "%s – (%s)"
 
-#: clientgui/AdvancedFrame.cpp:1957
+#: AdvancedFrame.cpp:1897
 #, c-format
 msgid "Connecting to %s"
 msgstr "Forbinder til %s"
 
-#: clientgui/AdvancedFrame.cpp:1960
+#: AdvancedFrame.cpp:1900
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "Forbundet til %s (%s)"
 
-#: clientgui/AlreadyExistsPage.cpp:184
+#: AlreadyExistsPage.cpp:184
 msgid "Username already in use"
 msgstr "Brugernavnet er allerede i brug"
 
-#: clientgui/AlreadyExistsPage.cpp:187
+#: AlreadyExistsPage.cpp:187
 msgid ""
 "An account with that username already exists and has a\n"
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"En konto med dette brugernavn eksisterer allerede og har\n"
-"et andet kodeord end det, du indtastede.\n"
-"\n"
-"Besøg venligst projektets hjemmeside og følg instruktionerne der."
+msgstr "En konto med dette brugernavn eksisterer allerede og har\net andet kodeord end det, du indtastede.\n\nBesøg venligst projektets hjemmeside og følg instruktionerne der."
 
-#: clientgui/AlreadyExistsPage.cpp:191
+#: AlreadyExistsPage.cpp:191
 msgid "Email address already in use"
 msgstr "Emailadressen er allerede i brug"
 
-#: clientgui/AlreadyExistsPage.cpp:194
+#: AlreadyExistsPage.cpp:194
 msgid ""
 "An account with that email address already exists and has a\n"
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"En konto med denne emailadresse eksisterer allerede og har\n"
-"et andet kodeord end det, du indtastede.\n"
-"\n"
-"Besøg venligst projektets hjemmeside og følg instruktionerne der."
+msgstr "En konto med denne emailadresse eksisterer allerede og har\net andet kodeord end det, du indtastede.\n\nBesøg venligst projektets hjemmeside og følg instruktionerne der."
 
-#: clientgui/AsyncRPC.cpp:1031
+#: AsyncRPC.cpp:1031
 msgid "Communicating with BOINC client.  Please wait ..."
 msgstr "Kommunikerer med BOINC-klienten. Vent venligst …"
 
-#: clientgui/AsyncRPC.cpp:1034
+#: AsyncRPC.cpp:1034
 #, c-format
 msgid "&Quit %s"
 msgstr "&Afslut %s"
 
-#: clientgui/AsyncRPC.cpp:1036
+#: AsyncRPC.cpp:1036
 #, c-format
 msgid "E&xit %s"
 msgstr "&Afslut %s"
 
-#: clientgui/AsyncRPC.cpp:1040
+#: AsyncRPC.cpp:1040
 #, c-format
 msgid "%s - Communication"
 msgstr "%s – Kommunikation"
 
-#: clientgui/AsyncRPC.cpp:1056
+#: AsyncRPC.cpp:1056 DlgAdvPreferencesBase.cpp:107 sg_DlgPreferences.cpp:433
 msgid "Cancel"
 msgstr "&Annullér"
 
-#: clientgui/BOINCBaseFrame.cpp:504
+#: BOINCBaseFrame.cpp:505
 #, c-format
 msgid "%s - Connection Error"
 msgstr "%s – Forbindelsesfejl"
 
-#: clientgui/BOINCBaseFrame.cpp:513
+#: BOINCBaseFrame.cpp:514
 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 ""
-"Du er i øjeblikket ikke autoriseret til at styre klienten.\n"
-"Kontakt venligst din administrator for at tilføje dig til den lokale \"boinc_users\" brugergruppe."
+msgstr "Du er i øjeblikket ikke autoriseret til at styre klienten.\nKontakt venligst din administrator for at tilføje dig til den lokale \"boinc_users\" brugergruppe."
 
-#: clientgui/BOINCBaseFrame.cpp:522
+#: BOINCBaseFrame.cpp:523
 msgid ""
 "Authorization failed connecting to running client.\n"
 "Make sure you start this program in the same directory as the client."
-msgstr ""
-"Autorisering mislykkedes under forbindelse til den kørende klient.\n"
-"Vær sikker på at starte dette program i den samme mappe som klienten."
+msgstr "Autorisering mislykkedes under forbindelse til den kørende klient.\nVær sikker på at starte dette program i den samme mappe som klienten."
 
-#: clientgui/BOINCBaseFrame.cpp:524
+#: BOINCBaseFrame.cpp:525
 msgid "Authorization failed connecting to running client."
 msgstr "Autorisering mislykkedes under forbindelse til den kørende klient."
 
-#: clientgui/BOINCBaseFrame.cpp:532
+#: BOINCBaseFrame.cpp:533
 msgid "The password you have provided is incorrect, please try again."
 msgstr "Det angivne kodeord er ikke korrekt. Prøv venligst igen."
 
-#: clientgui/BOINCBaseFrame.cpp:576
+#: BOINCBaseFrame.cpp:577
 #, c-format
 msgid "%s - Connection Failed"
 msgstr "%s – Forbindelsen mislykkedes"
 
-#: clientgui/BOINCBaseFrame.cpp:585
+#: BOINCBaseFrame.cpp:586
 #, c-format
 msgid ""
 "%s is not able to connect to a %s client.\n"
 "Would you like to try to connect again?"
-msgstr ""
-"%s kan ikke forbinde til en %s-klient.\n"
-"Vil du prøve at forbinde igen?"
+msgstr "%s kan ikke forbinde til en %s-klient.\nVil du prøve at forbinde igen?"
 
-#: clientgui/BOINCBaseFrame.cpp:621
+#: BOINCBaseFrame.cpp:622
 #, c-format
 msgid "%s - Daemon Start Failed"
 msgstr "%s – Start af dæmon mislykkedes"
 
-#: clientgui/BOINCBaseFrame.cpp:631
+#: BOINCBaseFrame.cpp:632
 #, 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 er ikke i stand til at starte en %s-klient.\n"
-"Kør venligst appleten Kontrolpanel -> Administrative værktøjer -> Tjenester og start BOINC-tjenesten."
+msgstr "%s er ikke i stand til at starte en %s-klient.\nKør venligst appleten Kontrolpanel -> Administrative værktøjer -> Tjenester og start BOINC-tjenesten."
 
-#: clientgui/BOINCBaseFrame.cpp:637
+#: BOINCBaseFrame.cpp:638
 #, c-format
 msgid ""
 "%s is not able to start a %s client.\n"
 "Please start the daemon and try again."
-msgstr ""
-"%s er ikke i stand til at starte en %s-klient.\n"
-"Start venligst dæmonen og prøv igen."
+msgstr "%s er ikke i stand til at starte en %s-klient.\nStart venligst dæmonen og prøv igen."
 
-#: clientgui/BOINCBaseFrame.cpp:688
+#: BOINCBaseFrame.cpp:689
 #, c-format
 msgid "%s - Connection Status"
 msgstr "%s – Forbindelsesstatus"
 
-#: clientgui/BOINCBaseFrame.cpp:699
+#: BOINCBaseFrame.cpp:700
 #, 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"
 "To connect up to your local computer please use 'localhost' as the host name."
-msgstr ""
-"%s er ikke forbundet til en %s-klient lige nu.\n"
-"Brug \"Avanceret\\Vælg computer …\"-menupunktet for at forbinde til en %s-klient.\n"
-"For at forbinde til din lokale computer, brug \"localhost\" som værtsnavn."
+msgstr "%s er ikke forbundet til en %s-klient lige nu.\nBrug \"Avanceret\\Vælg computer …\"-menupunktet for at forbinde til en %s-klient.\nFor at forbinde til din lokale computer, brug \"localhost\" som værtsnavn."
 
-#: clientgui/BOINCBaseView.cpp:752
+#: BOINCBaseView.cpp:779
 msgid "Project web pages"
 msgstr "Projekt-hjemmesider"
 
-#: clientgui/BOINCClientManager.cpp:573
+#: BOINCClientManager.cpp:575
 #, c-format
 msgid "%s - Unexpected Exit"
 msgstr "%s – Uventet afslutning"
 
-#: clientgui/BOINCClientManager.cpp:583
+#: BOINCClientManager.cpp:585
 #, 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 ""
-"%s-klienten har afsluttet uventet 3 gange inden for de sidste %d minutter.\n"
-"Vil du prøve at genstarte den igen?"
+msgstr "%s-klienten har afsluttet uventet 3 gange inden for de sidste %d minutter.\nVil du prøve at genstarte den igen?"
 
-#: clientgui/BOINCDialupManager.cpp:61
+#: BOINCDialupManager.cpp:61
 #, c-format
 msgid "%s - Network Status"
 msgstr "%s – Netværksstatus"
 
-#: clientgui/BOINCDialupManager.cpp:241
+#: BOINCDialupManager.cpp:241
 #, c-format
 msgid ""
 "%s needs to connect to the Internet.\n"
 "May it do so now?"
-msgstr ""
-"%s har behov for at forbinde til Internet.\n"
-"Må den gøre det nu?"
+msgstr "%s har behov for at forbinde til Internet.\nMå den gøre det nu?"
 
-#: clientgui/BOINCDialupManager.cpp:254
+#: BOINCDialupManager.cpp:254
 #, c-format
 msgid "%s is connecting to the Internet."
 msgstr "%s forbinder til Internet."
 
-#: clientgui/BOINCDialupManager.cpp:303
+#: BOINCDialupManager.cpp:303
 #, c-format
 msgid "%s has successfully connected to the Internet."
 msgstr "%s har fået forbindelse til Internet."
 
-#: clientgui/BOINCDialupManager.cpp:331
+#: BOINCDialupManager.cpp:331
 #, c-format
 msgid "%s failed to connect to the Internet."
 msgstr "%s kunne ikke forbinde til Internet."
 
-#: clientgui/BOINCDialupManager.cpp:372
+#: 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 har registreret, at den nu er forbundet til Internet.\n"
-"Opdaterer alle projekter og prøver at starte alle overførsler igen."
+msgstr "%s har registreret, at den nu er forbundet til Internet.\nOpdaterer alle projekter og prøver at starte alle overførsler igen."
 
-#: clientgui/BOINCDialupManager.cpp:417
+#: BOINCDialupManager.cpp:417
 #, c-format
 msgid "%s has successfully disconnected from the Internet."
 msgstr "%s har afbrudt forbindelsen til Internet."
 
-#: clientgui/BOINCDialupManager.cpp:433
+#: BOINCDialupManager.cpp:433
 #, c-format
 msgid "%s failed to disconnected from the Internet."
 msgstr "%s kunne ikke afbryde fra Internet."
 
-#: clientgui/BOINCGUIApp.cpp:595
+#: BOINCGUIApp.cpp:339
 #, c-format
 msgid ""
 "You currently are not authorized to manage the client.\n"
@@ -828,864 +750,798 @@ msgid ""
 " or\n"
 "  - contact your administrator to add you to the 'boinc_master'\n"
 "     user group."
-msgstr ""
-"Du er i øjeblikket ikke autoriseret til at styre klienten.\n"
-"\n"
-"For at køre %s som denne bruger:\n"
-"  - geninstallér %s og svar \"Ja\" til spørgsmålet om\n"
-"    ikke-administrative brugere\n"
-" eller\n"
-"  - kontakt din administrator for at tilføje dig til brugergruppen\n"
-"    \"boinc_master\"."
-
-#: clientgui/BOINCGUIApp.cpp:601
+msgstr "Du er i øjeblikket ikke autoriseret til at styre klienten.\n\nFor at køre %s som denne bruger:\n  - geninstallér %s og svar \"Ja\" til spørgsmålet om\n    ikke-administrative brugere\n eller\n  - kontakt din administrator for at tilføje dig til brugergruppen\n    \"boinc_master\"."
+
+#: BOINCGUIApp.cpp:345
 #, c-format
 msgid ""
 "%s ownership or permissions are not set properly; please reinstall %s.\n"
 "(Error code %d"
-msgstr ""
-"Ejerskab eller tilladelser for %s er ikke indstillet korrekt; geninstallér venligst %s.\n"
-"(Fejlkode %d"
+msgstr "Ejerskab eller tilladelser for %s er ikke indstillet korrekt; geninstallér venligst %s.\n(Fejlkode %d"
 
-#: clientgui/BOINCGUIApp.cpp:607
+#: BOINCGUIApp.cpp:351
 msgid " at "
 msgstr " – "
 
-#: clientgui/BOINCGUIApp.cpp:610
+#: BOINCGUIApp.cpp:354 MainDocument.cpp:2484 MainDocument.cpp:2534
+#: MainDocument.cpp:2554 ViewTransfers.cpp:803
 msgid ")"
 msgstr ")"
 
-#: clientgui/BOINCGUIApp.cpp:640
+#: BOINCGUIApp.cpp:384
 msgid ""
 "A reboot is required in order for BOINC to run properly.\n"
 "Please reboot your computer and try again."
-msgstr ""
-"En genstart er nødvendig for, at BOINC kan køre ordentligt.\n"
-"Genstart venligst din computer og prøv igen."
+msgstr "En genstart er nødvendig for, at BOINC kan køre ordentligt.\nGenstart venligst din computer og prøv igen."
 
-#: clientgui/BOINCGUIApp.cpp:641
+#: BOINCGUIApp.cpp:385 DlgAbout.cpp:153
 msgid "BOINC Manager"
 msgstr "BOINC-håndtering"
 
-#: clientgui/BOINCGUIApp.cpp:902
+#: BOINCGUIApp.cpp:572
 msgid "BOINC Manager was started by the operating system automatically"
 msgstr "BOINC-håndtering blev startet automatisk af operativsystemet"
 
-#: clientgui/BOINCGUIApp.cpp:904
+#: BOINCGUIApp.cpp:574
 msgid "Startup BOINC so only the system tray icon is visible"
 msgstr "Start BOINC så kun ikonet i statusfeltet er synligt"
 
-#: clientgui/BOINCGUIApp.cpp:906
+#: BOINCGUIApp.cpp:576
 msgid "Directory containing the BOINC Client executable"
 msgstr "Mappe, der indeholder den eksekvérbare fil for BOINC-klienten"
 
-#: clientgui/BOINCGUIApp.cpp:907
+#: BOINCGUIApp.cpp:577
 msgid "BOINC data directory"
 msgstr "BOINC-datamappe"
 
-#: clientgui/BOINCGUIApp.cpp:909
+#: BOINCGUIApp.cpp:579
 msgid "Host name or IP address"
 msgstr "Værtsnavn eller IP-adresse"
 
-#: clientgui/BOINCGUIApp.cpp:910
+#: BOINCGUIApp.cpp:580
 msgid "GUI RPC port number"
 msgstr "GUI RPC portnummer"
 
-#: clientgui/BOINCGUIApp.cpp:911
+#: BOINCGUIApp.cpp:581
 msgid "Password"
 msgstr "Kodeord"
 
-#: clientgui/BOINCGUIApp.cpp:912
+#: BOINCGUIApp.cpp:582
 msgid "Startup BOINC with these optional arguments"
 msgstr "Start BOINC med disse valgfrie argumenter"
 
-#: clientgui/BOINCGUIApp.cpp:913
+#: BOINCGUIApp.cpp:583
 msgid "disable BOINC security users and permissions"
 msgstr "deaktivér BOINCs sikkerhedsbrugere og -tilladelser"
 
-#: clientgui/BOINCGUIApp.cpp:914
+#: BOINCGUIApp.cpp:584
 msgid "set skin debugging mode to enable skin manager error messages"
 msgstr "sæt tema-fejlfindingstilstand for at slå fejlbeskeder til for skinhåndtering"
 
-#: clientgui/BOINCGUIApp.cpp:915
+#: BOINCGUIApp.cpp:585
 msgid "multiple instances of BOINC Manager allowed"
 msgstr "adskillige instanser af BOINC-håndtering tillades"
 
-#: clientgui/BOINCGUIApp.cpp:917
+#: BOINCGUIApp.cpp:587
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr "Bruges ikke: workaround for fejl i XCode 4.2"
 
-#: clientgui/BOINCGUIApp.cpp:1164
+#: BOINCGUIApp.cpp:814
 msgid "(Automatic Detection)"
 msgstr "(Automatisk registrering)"
 
-#: clientgui/BOINCGUIApp.cpp:1165
+#: BOINCGUIApp.cpp:815
 msgid "(Unknown)"
 msgstr "(Ukendt)"
 
-#: clientgui/BOINCGUIApp.cpp:1166
+#: BOINCGUIApp.cpp:816
 msgid "(User Defined)"
 msgstr "(Brugerdefineret)"
 
-#: clientgui/BOINCTaskBar.cpp:522
+#: BOINCTaskBar.cpp:508
 #, c-format
 msgid "Open %s Web..."
 msgstr "Åbn %s web …"
 
-#: clientgui/BOINCTaskBar.cpp:529
+#: BOINCTaskBar.cpp:515
 #, c-format
 msgid "Open %s..."
 msgstr "Åbn %s …"
 
-#: clientgui/BOINCTaskBar.cpp:536
-#: clientgui/BOINCTaskBar.cpp:633
-#: clientgui/BOINCTaskBar.cpp:641
+#: BOINCTaskBar.cpp:522 BOINCTaskBar.cpp:619 BOINCTaskBar.cpp:627
 msgid "Snooze"
 msgstr "Pause"
 
-#: clientgui/BOINCTaskBar.cpp:538
-#: clientgui/BOINCTaskBar.cpp:660
-#: clientgui/BOINCTaskBar.cpp:668
+#: BOINCTaskBar.cpp:524 BOINCTaskBar.cpp:646 BOINCTaskBar.cpp:654
 msgid "Snooze GPU"
 msgstr "GPU-pause"
 
-#: clientgui/BOINCTaskBar.cpp:556
+#: BOINCTaskBar.cpp:542
 msgid "E&xit"
 msgstr "&Afslut"
 
-#: clientgui/BOINCTaskBar.cpp:626
+#: BOINCTaskBar.cpp:612 ViewProjects.cpp:718 ViewWork.cpp:795
+#: sg_BoincSimpleFrame.cpp:758 sg_ProjectCommandPopup.cpp:110
+#: sg_TaskCommandPopup.cpp:102
 msgid "Resume"
 msgstr "Genoptag"
 
-#: clientgui/BOINCTaskBar.cpp:653
+#: BOINCTaskBar.cpp:639
 msgid "Resume GPU"
 msgstr "Genoptag GPU"
 
-#: clientgui/BOINCTaskBar.cpp:727
+#: BOINCTaskBar.cpp:713
 msgid "Computing is enabled"
 msgstr "Beregning er slået til"
 
-#: clientgui/BOINCTaskBar.cpp:731
+#: BOINCTaskBar.cpp:717
 msgid "Computing is suspended - "
 msgstr "Beregning er suspenderet – "
 
-#: clientgui/BOINCTaskBar.cpp:741
+#: BOINCTaskBar.cpp:727
 msgid "GPU computing is enabled"
 msgstr "GPU-beregning er slået til"
 
-#: clientgui/BOINCTaskBar.cpp:744
+#: BOINCTaskBar.cpp:730
 msgid "GPU computing is suspended - "
 msgstr "GPU-beregning er suspenderet – "
 
-#: clientgui/BOINCTaskBar.cpp:753
+#: BOINCTaskBar.cpp:739
 msgid "Network is enabled"
 msgstr "Netværksadgang er slået til"
 
-#: clientgui/BOINCTaskBar.cpp:756
+#: BOINCTaskBar.cpp:742
 msgid "Network is suspended - "
 msgstr "Netværksadgang er suspenderet – "
 
-#: clientgui/BOINCTaskBar.cpp:764
+#: BOINCTaskBar.cpp:750
 msgid "Reconnecting to client."
 msgstr "Genforbinder til klienten."
 
-#: clientgui/BOINCTaskBar.cpp:766
+#: BOINCTaskBar.cpp:752
 msgid "Not connected to a client."
 msgstr "Ikke forbundet til en klient."
 
-#: clientgui/BOINCTaskBar.cpp:819
+#: BOINCTaskBar.cpp:805
 #, c-format
 msgid "%s Notices"
 msgstr "%s-meddelelser"
 
-#: clientgui/BOINCTaskBar.cpp:825
+#: BOINCTaskBar.cpp:811
 msgid "There are new notices - click to view."
 msgstr "Der er nye meddelelser – klik for at se."
 
-#: clientgui/CompletionErrorPage.cpp:199
+#: CompletionErrorPage.cpp:199
 msgid "Failed to add project"
 msgstr "Tilføjelse af projekt mislykkedes"
 
-#: clientgui/CompletionErrorPage.cpp:204
+#: CompletionErrorPage.cpp:204
 msgid "Failed to update account manager"
 msgstr "Opdatering af kontohåndtering mislykkedes"
 
-#: clientgui/CompletionErrorPage.cpp:208
+#: CompletionErrorPage.cpp:208
 msgid "Failed to remove account manager"
 msgstr "Fjernelse af kontohåndtering mislykkedes"
 
-#: clientgui/CompletionErrorPage.cpp:212
+#: CompletionErrorPage.cpp:212
 msgid "Failed to add account manager"
 msgstr "Tilføjelse af kontohåndtering mislykkedes"
 
-#: clientgui/CompletionErrorPage.cpp:221
+#: CompletionErrorPage.cpp:221
 msgid ""
 "Please try again later.\n"
 "\n"
 "Click Finish to close."
-msgstr ""
-"Prøv venligst igen senere.\n"
-"\n"
-"Klik Færdig for at lukke."
+msgstr "Prøv venligst igen senere.\n\nKlik Færdig for at lukke."
 
-#: clientgui/CompletionErrorPage.cpp:225
-#: clientgui/CompletionPage.cpp:222
-#: clientgui/CompletionPage.cpp:242
-#: clientgui/CompletionPage.cpp:273
+#: CompletionErrorPage.cpp:225 CompletionPage.cpp:222 CompletionPage.cpp:242
+#: CompletionPage.cpp:273
 msgid "Click Finish to close."
 msgstr "Klik på Afslut for at lukke."
 
-#: clientgui/CompletionErrorPage.cpp:234
+#: CompletionErrorPage.cpp:234
 msgid "Messages from server:"
 msgstr "Beskeder fra server:"
 
-#: clientgui/CompletionPage.cpp:207
+#: CompletionPage.cpp:207
 msgid "Project added"
 msgstr "Projekt tilføjet"
 
-#: clientgui/CompletionPage.cpp:213
+#: CompletionPage.cpp:213
 msgid "This project has been successfully added."
 msgstr "Dette projekt er tilføjet med succes."
 
-#: clientgui/CompletionPage.cpp:218
+#: 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 ""
-"Når du klikker Afslut, vil din browser gå til en side, hvor du kan\n"
-"indstille din brugernavn og dine indstillinger."
+msgstr "Når du klikker Afslut, vil din browser gå til en side, hvor du kan\nindstille din brugernavn og dine indstillinger."
 
-#: clientgui/CompletionPage.cpp:232
+#: CompletionPage.cpp:232
 #, c-format
 msgid "Update from %s completed."
 msgstr "Opdatering fra %s fuldført."
 
-#: clientgui/CompletionPage.cpp:236
+#: CompletionPage.cpp:236
 msgid "Update completed."
 msgstr "Opdatering fuldført."
 
-#: clientgui/CompletionPage.cpp:247
+#: CompletionPage.cpp:247
 msgid "Now using account manager"
 msgstr "Bruger nu kontohåndtering"
 
-#: clientgui/CompletionPage.cpp:252
+#: CompletionPage.cpp:252
 #, c-format
 msgid "Welcome to %s!"
 msgstr "Velkommen til %s!"
 
-#: clientgui/CompletionPage.cpp:263
+#: CompletionPage.cpp:263
 #, c-format
 msgid "You are now using %s to manage accounts."
 msgstr "Du bruger nu %s til at håndtere konti."
 
-#: clientgui/CompletionPage.cpp:267
+#: CompletionPage.cpp:267
 msgid "You are now using this account manager."
 msgstr "Du bruger nu denne kontohåndtering."
 
-#: clientgui/DlgAbout.cpp:113
+#: DlgAbout.cpp:113 mac/Mac_GUI.cpp:96
 #, c-format
 msgid "About %s"
 msgstr "Om %s"
 
-#: clientgui/DlgAbout.cpp:172
+#: DlgAbout.cpp:172
 msgid "Version:"
 msgstr "Version:"
 
-#: clientgui/DlgAbout.cpp:180
+#: DlgAbout.cpp:180
 msgid "wxWidgets Version:"
 msgstr "wxWidgets-version:"
 
-#: clientgui/DlgAbout.cpp:188
+#: DlgAbout.cpp:188
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: clientgui/DlgAbout.cpp:192
+#: DlgAbout.cpp:192
 msgid ""
-"(C) 2003-2014 University of California, Berkeley.\n"
+"(C) 2003-2013 University of California, Berkeley.\n"
 "All Rights Reserved."
-msgstr ""
+msgstr "(C) 2003-2013 University of California, Berkeley.\nAlle rettigheder forbeholdes."
 
-#: clientgui/DlgAbout.cpp:196
+#: DlgAbout.cpp:196
 msgid "Berkeley Open Infrastructure for Network Computing"
 msgstr "Berkeley Open Infrastructure for Network Computing"
 
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:399
-#: clientgui/DlgSelectComputer.cpp:163
+#: DlgAbout.cpp:208 DlgExitMessage.cpp:173 DlgGenericMessage.cpp:120
+#: DlgOptions.cpp:396 DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "&O.k."
 
-#: clientgui/DlgAdvPreferences.cpp:602
+#: DlgAdvPreferences.cpp:544
 msgid "invalid number"
 msgstr "ugyldigt tal"
 
-#: clientgui/DlgAdvPreferences.cpp:603
+#: DlgAdvPreferences.cpp:545
 msgid "invalid time, format is HH:MM"
 msgstr "ugyldig tid, formatet er TT:MM"
 
-#: clientgui/DlgAdvPreferences.cpp:604
+#: DlgAdvPreferences.cpp:546
 msgid "invalid time interval, format is HH:MM-HH:MM"
 msgstr "ugyldigt tidsinterval, formatet er TT:MM-TT:MM"
 
-#: clientgui/DlgAdvPreferences.cpp:817
+#: DlgAdvPreferences.cpp:751
 msgid "invalid input value detected"
 msgstr "ugyldig input-værdi registreret"
 
-#: clientgui/DlgAdvPreferences.cpp:819
+#: DlgAdvPreferences.cpp:753
 msgid "Validation Error"
 msgstr "Valideringsfejl"
 
-#: clientgui/DlgAdvPreferences.cpp:969
-#: clientgui/DlgAdvPreferences.cpp:975
-#: clientgui/DlgAdvPreferences.cpp:981
+#: DlgAdvPreferences.cpp:885 DlgAdvPreferences.cpp:891
+#: DlgAdvPreferences.cpp:897
 msgid "Applications to add"
 msgstr "Applikationer, der skal tilføjes"
 
-#: clientgui/DlgAdvPreferences.cpp:998
+#: DlgAdvPreferences.cpp:914
 #, c-format
 msgid "'%s' is not an executable application."
 msgstr "\"%s\" er ikke en eksekverbar applikation."
 
-#: clientgui/DlgAdvPreferences.cpp:999
-#: clientgui/DlgAdvPreferences.cpp:1046
-#: clientgui/DlgAdvPreferences.cpp:1070
+#: DlgAdvPreferences.cpp:915 DlgAdvPreferences.cpp:962
+#: DlgAdvPreferences.cpp:986
 msgid "Add Exclusive App"
 msgstr "Tilføj eksklusiv app"
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Name of application to add?"
 msgstr "Navn på applikation, der skal tilføjes?"
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Add exclusive app"
 msgstr "Tilføj eksklusiv app"
 
-#: clientgui/DlgAdvPreferences.cpp:1045
+#: DlgAdvPreferences.cpp:961
 #, c-format
 msgid "Application names must end with '%s'"
 msgstr "Applikationsnavne skal ende med \"%s\""
 
-#: clientgui/DlgAdvPreferences.cpp:1069
+#: DlgAdvPreferences.cpp:985
 #, c-format
 msgid "'%s' is already in the list."
 msgstr "\"%s\" er allerede på listen"
 
-#: clientgui/DlgAdvPreferences.cpp:1161
+#: DlgAdvPreferences.cpp:1077
 msgid ""
 "Do you really want to clear all local preferences?\n"
 "(This will not affect exclusive applications.)"
-msgstr ""
-"Vil du virkelig nulstille alle lokale indstillinger?\n"
-"(Dette vil ikke have effekt på eksklusive applikationer.)"
+msgstr "Vil du virkelig nulstille alle lokale indstillinger?\n(Dette vil ikke have effekt på eksklusive applikationer.)"
 
-#: clientgui/DlgAdvPreferences.cpp:1162
+#: DlgAdvPreferences.cpp:1078 sg_DlgPreferences.cpp:1030
 msgid "Confirmation"
 msgstr "Bekræftelse"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:49
+#: DlgAdvPreferencesBase.cpp:46 sg_DlgPreferences.cpp:946
 #, c-format
-msgid "%s - Computing preferences"
-msgstr ""
+msgid "%s - Preferences"
+msgstr "%s – Indstillinger"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:66
+#: DlgAdvPreferencesBase.cpp:62
 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 ""
-"Denne dialogboks styrer indstillinger der udelukkende gælder denne computer.\n"
-"Klik O.k. for at sætte indstillingerne.\n"
-"Klik på Nulstil for at genskabe den webbaserede opsætning (undtaget for eksklusive apps)."
+msgstr "Denne dialogboks styrer indstillinger der udelukkende gælder denne computer.\nKlik O.k. for at sætte indstillingerne.\nKlik på Nulstil for at genskabe den webbaserede opsætning (undtaget for eksklusive apps)."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:69
+#: DlgAdvPreferencesBase.cpp:65 sg_DlgPreferences.cpp:428
 msgid "Clear"
 msgstr "Nulstil"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:70
+#: DlgAdvPreferencesBase.cpp:66
 msgid "clear all local preferences and close the dialog"
 msgstr "nulstil alle lokale indstillinger og luk denne dialogboks"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:85
+#: DlgAdvPreferencesBase.cpp:81
 msgid "processor usage"
 msgstr "processorforbrug"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:88
+#: DlgAdvPreferencesBase.cpp:84
 msgid "network usage"
 msgstr "netværksforbrug"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:91
+#: DlgAdvPreferencesBase.cpp:87
 msgid "disk and memory usage"
 msgstr "disk- og hukommelsesforbrug"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:94
+#: DlgAdvPreferencesBase.cpp:90
 msgid "exclusive applications"
 msgstr "eksklusive applikationer"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:107
-#: clientgui/DlgDiagnosticLogFlags.cpp:104
+#: DlgAdvPreferencesBase.cpp:102 sg_DlgPreferences.cpp:424
 msgid "OK"
 msgstr "O.k."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:108
+#: DlgAdvPreferencesBase.cpp:103
 msgid "save all values and close the dialog"
 msgstr "gem alle værdier og luk dialogboksen"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:114
+#: DlgAdvPreferencesBase.cpp:108
 msgid "close the dialog without saving"
 msgstr "luk dialogboksen uden at gemme"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:118
-#: clientgui/Localization.cpp:35
-#: clientgui/Localization.cpp:121
-#: clientgui/Localization.cpp:139
+#: DlgAdvPreferencesBase.cpp:112 Localization.cpp:35 Localization.cpp:121
+#: Localization.cpp:139 sg_BoincSimpleFrame.cpp:794 sg_DlgPreferences.cpp:439
 msgid "Help"
 msgstr "Hjælp"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
+#: DlgAdvPreferencesBase.cpp:113
 msgid "shows the preferences web page"
 msgstr "viser indstillingswebsiden"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:141
+#: DlgAdvPreferencesBase.cpp:135
 msgid "Computing allowed"
 msgstr "Beregninger tilladt"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
+#: DlgAdvPreferencesBase.cpp:139
 msgid "While computer is on batteries"
 msgstr "Mens computeren kører på batterier"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:149
-msgid "check this if you want this computer to do work while it runs on batteries"
+#: DlgAdvPreferencesBase.cpp:142
+msgid ""
+"check this if you want this computer to do work while it runs on batteries"
 msgstr "vælg dette hvis du ønsker, at computeren skal arbejde, mens den kører på batterier"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:155
+#: DlgAdvPreferencesBase.cpp:148
 msgid "While computer is in use"
 msgstr "Mens computeren er i brug"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:158
-msgid "check this if you want this computer to do work even when you're using it"
+#: DlgAdvPreferencesBase.cpp:151
+msgid ""
+"check this if you want this computer to do work even when you're using it"
 msgstr "vælg dette hvis du ønsker, at computeren skal arbejde, selv om du bruger den"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:164
+#: DlgAdvPreferencesBase.cpp:157
 msgid "Use GPU while computer is in use"
 msgstr "Brug GPU mens computeren er i brug"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:167
-msgid "check this if you want your GPU to do work even when you're using the computer"
+#: DlgAdvPreferencesBase.cpp:160
+msgid ""
+"check this if you want your GPU to do work even when you're using the "
+"computer"
 msgstr "vælg dette hvis du ønsker, at din GPU skal arbejde, selv om du bruger computeren"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:179
+#: DlgAdvPreferencesBase.cpp:172
 msgid "Only after computer has been idle for"
 msgstr "Kun efter at computeren ikke har været i brug i"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:188
-msgid "do work only after you haven't used the computer for this number of minutes"
+#: DlgAdvPreferencesBase.cpp:182
+msgid ""
+"do work only after you haven't used the computer for this number of minutes"
 msgstr "udfør kun arbejde efter at computeren ikke har været i brug i dette antal minutter"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:193
-#: clientgui/DlgAdvPreferencesBase.cpp:342
+#: DlgAdvPreferencesBase.cpp:187 DlgAdvPreferencesBase.cpp:336
+#: sg_DlgPreferences.cpp:417
 msgid "minutes"
 msgstr "minutter"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:212
+#: DlgAdvPreferencesBase.cpp:206
 msgid "While processor usage is less than"
 msgstr "Mens processorforbrug er mindre end"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:221
+#: DlgAdvPreferencesBase.cpp:216
 msgid "suspend work if processor usage exceeds this level"
 msgstr "suspendér arbejde hvis processorforbrug overstiger dette niveau"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:226
+#: DlgAdvPreferencesBase.cpp:221
 msgid "percent (0 means no restriction)"
 msgstr "procent (0 betyder ingen begrænsning)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:240
-#: clientgui/DlgAdvPreferencesBase.cpp:506
+#: DlgAdvPreferencesBase.cpp:235 DlgAdvPreferencesBase.cpp:496
 msgid "Every day between hours of"
 msgstr "Hver dag imellem"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: DlgAdvPreferencesBase.cpp:239
 msgid "start work at this time"
 msgstr "start arbejde på dette tidspunkt"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:248
-#: clientgui/DlgAdvPreferencesBase.cpp:514
+#: DlgAdvPreferencesBase.cpp:243 DlgAdvPreferencesBase.cpp:504
+#: sg_DlgPreferences.cpp:326 sg_DlgPreferences.cpp:348
 msgid "and"
 msgstr "og"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:252
+#: DlgAdvPreferencesBase.cpp:247
 msgid "stop work at this time"
 msgstr "stop arbejde på dette tidspunkt"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
-#: clientgui/DlgAdvPreferencesBase.cpp:522
+#: DlgAdvPreferencesBase.cpp:251 DlgAdvPreferencesBase.cpp:512
 msgid "(no restriction if equal)"
 msgstr "(ingen begrænsning hvis de er ens)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:261
-#: clientgui/DlgAdvPreferencesBase.cpp:527
+#: DlgAdvPreferencesBase.cpp:256 DlgAdvPreferencesBase.cpp:517
 msgid "Day-of-week override:"
 msgstr "Undtagelser for ugedage:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:266
-#: clientgui/DlgAdvPreferencesBase.cpp:532
+#: DlgAdvPreferencesBase.cpp:261 DlgAdvPreferencesBase.cpp:522
 msgid "check box to specify hours for this day of week"
 msgstr "marker feltet for at specificere timetal for denne ugedag"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:272
-#: clientgui/DlgAdvPreferencesBase.cpp:538
+#: DlgAdvPreferencesBase.cpp:267 DlgAdvPreferencesBase.cpp:528
 msgid "Monday"
 msgstr "Mandag"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:279
-#: clientgui/DlgAdvPreferencesBase.cpp:545
+#: DlgAdvPreferencesBase.cpp:274 DlgAdvPreferencesBase.cpp:535
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:286
-#: clientgui/DlgAdvPreferencesBase.cpp:552
+#: DlgAdvPreferencesBase.cpp:281 DlgAdvPreferencesBase.cpp:542
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:293
-#: clientgui/DlgAdvPreferencesBase.cpp:559
+#: DlgAdvPreferencesBase.cpp:288 DlgAdvPreferencesBase.cpp:549
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:300
-#: clientgui/DlgAdvPreferencesBase.cpp:566
+#: DlgAdvPreferencesBase.cpp:295 DlgAdvPreferencesBase.cpp:556
 msgid "Friday"
 msgstr "Fredag"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:307
-#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: DlgAdvPreferencesBase.cpp:302 DlgAdvPreferencesBase.cpp:563
 msgid "Saturday"
 msgstr "Lørdag"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:580
+#: DlgAdvPreferencesBase.cpp:309 DlgAdvPreferencesBase.cpp:570
 msgid "Sunday"
 msgstr "Søndag"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:328
+#: DlgAdvPreferencesBase.cpp:323
 msgid "Other options"
 msgstr "Andre valgmuligheder"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:336
+#: DlgAdvPreferencesBase.cpp:330
 msgid "Switch between applications every"
 msgstr "Skift imellem projekter hver"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:345
+#: DlgAdvPreferencesBase.cpp:339
 msgid "On multiprocessor systems, use at most"
 msgstr "På multiprocessor-systemer, brug højst"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
+#: DlgAdvPreferencesBase.cpp:346
 #, no-c-format
-msgid "% of the processors (0 means no restriction)"
-msgstr ""
+msgid "% of the processors (0 means ignore this setting)"
+msgstr "% af processorerne (0 betyder ignorér denne indstilling)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:355
-#: clientgui/DlgAdvPreferencesBase.cpp:618
-#: clientgui/DlgAdvPreferencesBase.cpp:640
-#: clientgui/DlgAdvPreferencesBase.cpp:661
-#: clientgui/DlgAdvPreferencesBase.cpp:683
-#: clientgui/DlgAdvPreferencesBase.cpp:694
+#: DlgAdvPreferencesBase.cpp:349 DlgAdvPreferencesBase.cpp:605
+#: DlgAdvPreferencesBase.cpp:627 DlgAdvPreferencesBase.cpp:648
+#: DlgAdvPreferencesBase.cpp:669 DlgAdvPreferencesBase.cpp:679
 msgid "Use at most"
 msgstr "Brug højst"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:362
+#: DlgAdvPreferencesBase.cpp:356
 #, no-c-format
-msgid "% of CPU time (0 means no restriction)"
-msgstr ""
+msgid "% CPU time"
+msgstr "% CPU-tid"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:386
+#: DlgAdvPreferencesBase.cpp:378
 msgid "General options"
 msgstr "Generelle valgmuligheder"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:395
+#: DlgAdvPreferencesBase.cpp:386
 msgid "Maximum download rate"
 msgstr "Maksimal downloadhastighed"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:401
-#: clientgui/DlgAdvPreferencesBase.cpp:410
-msgid "KBytes/second (0 means no restriction)"
-msgstr ""
+#: DlgAdvPreferencesBase.cpp:392 DlgAdvPreferencesBase.cpp:401
+msgid "KBytes/sec."
+msgstr "KBytes/sek"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:404
+#: DlgAdvPreferencesBase.cpp:395
 msgid "Maximum upload rate"
 msgstr "Maksimal uploadhastighed"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:417
+#: DlgAdvPreferencesBase.cpp:406
+msgid "Transfer at most"
+msgstr "Overfør højst"
+
+#: DlgAdvPreferencesBase.cpp:412
+msgid "Mbytes"
+msgstr "Mbytes"
+
+#: DlgAdvPreferencesBase.cpp:415
+msgid "every"
+msgstr "for hver"
+
+#: DlgAdvPreferencesBase.cpp:421 DlgAdvPreferencesBase.cpp:444
+#: DlgAdvPreferencesBase.cpp:463
+msgid "days"
+msgstr "dage"
+
+#: DlgAdvPreferencesBase.cpp:429
 msgid "Minimum work buffer"
 msgstr "Minimum arbejdsbuffer"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:425
+#: DlgAdvPreferencesBase.cpp:438
 msgid "Try to maintain enough tasks to keep busy for this many days"
 msgstr "Prøv at opretholde nok opgaver til at holde computeren optaget i så mange dage"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:431
-#: clientgui/DlgAdvPreferencesBase.cpp:449
-msgid "days (maximum value: 10)"
-msgstr ""
-
-#: clientgui/DlgAdvPreferencesBase.cpp:437
+#: DlgAdvPreferencesBase.cpp:450
 msgid "Max additional work buffer"
 msgstr "Maks. ekstra arbejdsbuffer"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:445
+#: DlgAdvPreferencesBase.cpp:459
 msgid "In addition, maintain enough tasks for up to this many days"
 msgstr "Der ud over, oprethold nok opgaver til op til så mange dage"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:454
-msgid "Transfer at most"
-msgstr "Overfør højst"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:462
-msgid "MBytes every"
-msgstr ""
-
-#: clientgui/DlgAdvPreferencesBase.cpp:468
-msgid "days (0 means no restriction)"
-msgstr ""
-
-#: clientgui/DlgAdvPreferencesBase.cpp:476
+#: DlgAdvPreferencesBase.cpp:466
 msgid "Skip image file verification"
 msgstr "Spring billedfilsverifikation over"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:478
+#: DlgAdvPreferencesBase.cpp:468
 msgid "check this if your Internet provider modifies image files"
 msgstr "marker dette, hvis din internetudbyder ændrer på billedfiler"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:484
+#: DlgAdvPreferencesBase.cpp:476
 msgid "Connect options"
 msgstr "Forbindelsesindstillinger"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:487
+#: DlgAdvPreferencesBase.cpp:478
 msgid "Confirm before connecting to internet"
 msgstr "Bekræft før der tilsluttes Internet"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
+#: DlgAdvPreferencesBase.cpp:480
+msgid ""
+"if checked, a confirmation dialog will be displayed before trying to connect"
+" to the Internet"
 msgstr "markeres dette vil en dialogboks vises før forsøg på at forbinde til Internet"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:493
+#: DlgAdvPreferencesBase.cpp:484
 msgid "Disconnect when done"
 msgstr "Kobl af Internet når færdig"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:495
+#: DlgAdvPreferencesBase.cpp:486
 msgid ""
 "if checked, BOINC hangs up when network usage is done\n"
 "(only relevant for dialup-connection)"
-msgstr ""
-"markeres dette vil BOINC lægge på, når netværksbrug er færdig\n"
-"(kun relevant for opkaldsforbindelser)"
+msgstr "markeres dette vil BOINC lægge på, når netværksbrug er færdig\n(kun relevant for opkaldsforbindelser)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:501
+#: DlgAdvPreferencesBase.cpp:492
 msgid "Network usage allowed"
 msgstr "Netværksforbrug tilladt"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:510
+#: DlgAdvPreferencesBase.cpp:500
 msgid "network usage start hour"
 msgstr "netværksforbrug starttime"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:518
+#: DlgAdvPreferencesBase.cpp:508
 msgid "network usage stop hour"
 msgstr "netværksforbrug sluttime"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:610
-#: clientgui/DlgItemProperties.cpp:257
+#: DlgAdvPreferencesBase.cpp:598 DlgItemProperties.cpp:231
 msgid "Disk usage"
 msgstr "Diskforbrug"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:622
+#: DlgAdvPreferencesBase.cpp:609
 msgid "the maximum disk space used by BOINC (in Gigabytes)"
 msgstr "maksimal mængde diskplads brugt af BOINC (i gigabytes)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:626
-msgid "Gigabytes disk space (0 means no restriction)"
-msgstr ""
+#: DlgAdvPreferencesBase.cpp:613
+msgid "Gigabytes disk space"
+msgstr "Gigabytes diskplads"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:629
+#: DlgAdvPreferencesBase.cpp:616
 msgid "Leave at least"
 msgstr "Frihold mindst"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:633
+#: DlgAdvPreferencesBase.cpp:620
 msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
 msgstr "BOINC efterlader mindst denne mængde diskplads fri (i gigabytes)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:637
+#: DlgAdvPreferencesBase.cpp:624
 msgid "Gigabytes disk space free"
 msgstr "Gigabytes diskplads fri"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
+#: DlgAdvPreferencesBase.cpp:631
 msgid "BOINC uses at most this percentage of total disk space"
 msgstr "BOINC bruger højst denne procentdel af den samlede diskplads"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:649
+#: DlgAdvPreferencesBase.cpp:636
 #, no-c-format
 msgid "% of total disk space"
 msgstr "% af samlet diskplads"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:652
+#: DlgAdvPreferencesBase.cpp:639
 msgid "Tasks checkpoint to disk at most every"
 msgstr "Opgaver tilgår checkpoints på disk højst hver"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
+#: DlgAdvPreferencesBase.cpp:645
 msgid "seconds"
 msgstr "sekunder"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:668
+#: DlgAdvPreferencesBase.cpp:655
 #, no-c-format
 msgid "% of page file (swap space)"
 msgstr "% af sidefil (swapplads)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:675
+#: DlgAdvPreferencesBase.cpp:662
 msgid "Memory usage"
 msgstr "Hukommelsesforbrug"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
+#: DlgAdvPreferencesBase.cpp:676
 #, no-c-format
 msgid "% when computer is in use"
 msgstr "% når computeren er i brug"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:701
+#: DlgAdvPreferencesBase.cpp:686
 #, no-c-format
 msgid "% when computer is idle"
 msgstr "% når computeren ikke er i brug"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:706
+#: DlgAdvPreferencesBase.cpp:691
 msgid "Leave applications in memory while suspended"
 msgstr "Efterlad applikationer i hukommelsen under suspendering"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:708
+#: DlgAdvPreferencesBase.cpp:693
 msgid "if checked, suspended work units are left in memory"
 msgstr "markeres dette vil suspenderede arbejdsenheder blive gemt i hukommelsen"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:728
-msgid "Suspend processor and network usage when these applications are running:"
+#: DlgAdvPreferencesBase.cpp:713
+msgid ""
+"Suspend processor and network usage when these applications are running:"
 msgstr "Suspendér processor- og netværksforbrug, når disse applikationer kører:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:738
+#: DlgAdvPreferencesBase.cpp:722
 msgid "Add..."
 msgstr "Tilføj …"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:739
+#: DlgAdvPreferencesBase.cpp:723
 msgid "Add an application to this list"
 msgstr "Tilføj en applikation til denne liste"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:744
+#: DlgAdvPreferencesBase.cpp:728 ViewProjects.cpp:202
+#: sg_ProjectCommandPopup.cpp:85
 msgid "Remove"
 msgstr "Fjern"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:745
+#: DlgAdvPreferencesBase.cpp:729
 msgid "Remove an application from this list"
 msgstr "Fjern en applikation fra denne liste"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:754
+#: DlgAdvPreferencesBase.cpp:738
 msgid "For advanced options, refer to "
 msgstr "For avancerede valgmuligheder, se"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:65
-#, c-format
-msgid "%s Diagnostic Log Flags"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:83
-msgid "These flags enable various types of diagnostic messages in the Event Log."
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:105
-msgid "Save all values and close the dialog"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:108
-msgid "Defaults"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:109
-msgid "Restore default settings"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:113
-msgid "Close the dialog without saving"
-msgstr ""
-
-#: clientgui/DlgEventLog.cpp:226
+#: DlgEventLog.cpp:219
 #, c-format
 msgid "%s - Event Log"
 msgstr "%s – Begivenhedslog"
 
-#: clientgui/DlgEventLog.cpp:236
+#: DlgEventLog.cpp:232 ViewMessages.cpp:117 ViewProjects.cpp:219
+#: ViewStatistics.cpp:435 ViewStatistics.cpp:2009 ViewTransfers.cpp:182
+#: ViewWork.cpp:232
 msgid "Project"
 msgstr "Projekt"
 
-#: clientgui/DlgEventLog.cpp:237
+#: DlgEventLog.cpp:233 ViewMessages.cpp:118
 msgid "Time"
 msgstr "Tid"
 
-#: clientgui/DlgEventLog.cpp:238
+#: DlgEventLog.cpp:234 ViewMessages.cpp:119
 msgid "Message"
 msgstr "Besked"
 
-#: clientgui/DlgEventLog.cpp:300
-#: clientgui/DlgEventLog.cpp:364
+#: DlgEventLog.cpp:290 DlgEventLog.cpp:354
 msgid "&Show only this project"
 msgstr "Vis kun dette &projekt"
 
-#: clientgui/DlgEventLog.cpp:304
+#: DlgEventLog.cpp:294
 msgid "Copy &All"
 msgstr "Kopiér &alle"
 
-#: clientgui/DlgEventLog.cpp:306
-#: clientgui/DlgEventLog.cpp:310
+#: DlgEventLog.cpp:296 DlgEventLog.cpp:300 ViewMessages.cpp:89
 msgid "Copy all the messages to the clipboard."
 msgstr "Kopiér alle beskederne til udklipsholderen."
 
-#: clientgui/DlgEventLog.cpp:315
+#: DlgEventLog.cpp:305
 msgid "Copy &Selected"
 msgstr "Kopiér &valgte"
 
-#: clientgui/DlgEventLog.cpp:318
-#: clientgui/DlgEventLog.cpp:326
-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."
+#: DlgEventLog.cpp:308 DlgEventLog.cpp:316 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 "Kopiér de valgte beskeder til udklipsholderen. Du kan vælge flere beskeder ved at holde shift- eller command-tasten nede, mens du vælger."
 
-#: clientgui/DlgEventLog.cpp:320
-#: clientgui/DlgEventLog.cpp:328
-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."
+#: DlgEventLog.cpp:310 DlgEventLog.cpp:318 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 "Kopiér de valgte beskeder til udklipsholderen. Du kan vælge flere beskeder ved at holde shift- eller control-tasten nede, mens du vælger."
 
-#: clientgui/DlgEventLog.cpp:335
-#: clientgui/DlgItemProperties.cpp:67
+#: DlgEventLog.cpp:325 DlgItemProperties.cpp:67
 msgid "&Close"
 msgstr "&Luk"
 
-#: clientgui/DlgEventLog.cpp:344
+#: DlgEventLog.cpp:334 sg_BoincSimpleFrame.cpp:798 sg_DlgPreferences.cpp:442
 #, c-format
 msgid "Get help with %s"
 msgstr "Få hjælp til %s"
 
-#: clientgui/DlgEventLog.cpp:358
+#: DlgEventLog.cpp:348
 msgid "Show all &messages"
 msgstr "Vis alle &beskeder"
 
-#: clientgui/DlgEventLog.cpp:359
-#: clientgui/DlgEventLog.cpp:361
+#: DlgEventLog.cpp:349 DlgEventLog.cpp:351
 msgid "Show messages for all projects"
 msgstr "Vis beskeder fra alle projekter."
 
-#: clientgui/DlgEventLog.cpp:365
-#: clientgui/DlgEventLog.cpp:367
+#: DlgEventLog.cpp:355 DlgEventLog.cpp:357
 msgid "Show only the messages for the selected project"
 msgstr "Vis kun beskeder for det valgte projekt"
 
-#: clientgui/DlgExitMessage.cpp:82
+#: DlgExitMessage.cpp:82
 #, c-format
 msgid "%s - Exit Confirmation"
 msgstr "%s – Afslutningsbekræftelse"
 
-#: clientgui/DlgExitMessage.cpp:130
+#: DlgExitMessage.cpp:130
 #, c-format
 msgid ""
 "You have requested to exit the %s,\n"
@@ -1694,15 +1550,9 @@ msgid ""
 "\n"
 "If you also want to stop running the tasks,\n"
 "choose from the following options:"
-msgstr ""
-"Du har forespurgt afslutning af %s,\n"
-"som tillader dig at se og håndtere\n"
-"opgaverne, der kører på din computer.\n"
-"\n"
-"Hvis du også vil stoppe med at køre opgaverne\n"
-"kan du vælge fra de følgende muligheder:"
+msgstr "Du har forespurgt afslutning af %s,\nsom tillader dig at se og håndtere\nopgaverne, der kører på din computer.\n\nHvis du også vil stoppe med at køre opgaverne\nkan du vælge fra de følgende muligheder:"
 
-#: clientgui/DlgExitMessage.cpp:135
+#: DlgExitMessage.cpp:135
 #, c-format
 msgid ""
 "This will shut down %s and its tasks until either the\n"
@@ -1711,1000 +1561,916 @@ msgid ""
 "In most cases, it is better just to close the %s window\n"
 "rather than to exit the application; that will allow %s to run its\n"
 "tasks at the times you selected in your preferences."
-msgstr ""
-"Dette vil lukke %s og dens opgaver ned, indtil enten\n"
-"%s eller %s-pauseskærmen køres igen.\n"
-"\n"
-"I de fleste tilfælde er det bedre kun at lukke %s-vinduet\n"
-"til forskel fra at afslutte applikationen. Det vil tillade %s at køre\n"
-"dens opgaver på de tidspunkter, du har valgt i dine indstillinger."
+msgstr "Dette vil lukke %s og dens opgaver ned, indtil enten\n%s eller %s-pauseskærmen køres igen.\n\nI de fleste tilfælde er det bedre kun at lukke %s-vinduet\ntil forskel fra at afslutte applikationen. Det vil tillade %s at køre\ndens opgaver på de tidspunkter, du har valgt i dine indstillinger."
 
-#: clientgui/DlgExitMessage.cpp:153
+#: DlgExitMessage.cpp:153
 #, c-format
 msgid "Stop running tasks when exiting the %s"
 msgstr "Stop med at køre opgaver, når %s afsluttes"
 
-#: clientgui/DlgExitMessage.cpp:165
+#: DlgExitMessage.cpp:165
 msgid "Remember this decision and do not show this dialog."
 msgstr "Husk dette valg og vis ikke denne dialogboks fremover."
 
-#: clientgui/DlgExitMessage.cpp:178
-#: clientgui/DlgGenericMessage.cpp:125
-#: clientgui/DlgOptions.cpp:404
-#: clientgui/DlgSelectComputer.cpp:168
+#: DlgExitMessage.cpp:178 DlgGenericMessage.cpp:125 DlgOptions.cpp:401
+#: DlgSelectComputer.cpp:168 wizardex.cpp:378
 msgid "&Cancel"
 msgstr "&Annullér"
 
-#: clientgui/DlgGenericMessage.cpp:112
+#: DlgGenericMessage.cpp:112
 msgid "Don't show this dialog again."
 msgstr "Vis ikke denne dialogboks igen."
 
-#: clientgui/DlgItemProperties.cpp:194
-#: clientgui/DlgItemProperties.cpp:197
-#: clientgui/DlgItemProperties.cpp:200
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:168 DlgItemProperties.cpp:171
+#: DlgItemProperties.cpp:174 DlgItemProperties.cpp:177
 msgid "Don't fetch tasks for "
 msgstr "Hent ikke opgaver for"
 
-#: clientgui/DlgItemProperties.cpp:194
+#: DlgItemProperties.cpp:168
 msgid "Project preference"
 msgstr "Projektindstilling"
 
-#: clientgui/DlgItemProperties.cpp:197
+#: DlgItemProperties.cpp:171
 msgid "Account manager preference"
 msgstr "Kontohåndteringsindstilling"
 
-#: clientgui/DlgItemProperties.cpp:200
+#: DlgItemProperties.cpp:174
 msgid "Project has no apps for "
 msgstr "Projekt har ingen apps for"
 
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:177
 msgid "Client configuration excludes "
 msgstr "Klientkonfiguration ekskluderer"
 
-#: clientgui/DlgItemProperties.cpp:207
+#: DlgItemProperties.cpp:181
 msgid " work fetch deferred for"
 msgstr " hentning af arbejde udsat med"
 
-#: clientgui/DlgItemProperties.cpp:208
+#: DlgItemProperties.cpp:182
 msgid " work fetch deferral interval"
 msgstr " udsættelsesinterval for hentning af arbejde"
 
-#: clientgui/DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:213
 msgid "Properties of project "
 msgstr "Egenskaber for projekt"
 
-#: clientgui/DlgItemProperties.cpp:243
-#: clientgui/DlgOptions.cpp:221
+#: DlgItemProperties.cpp:217 DlgOptions.cpp:218
 msgid "General"
 msgstr "Generelt"
 
-#: clientgui/DlgItemProperties.cpp:244
+#: DlgItemProperties.cpp:218
 msgid "Master URL"
 msgstr "Hoved-URL"
 
-#: clientgui/DlgItemProperties.cpp:245
+#: DlgItemProperties.cpp:219
 msgid "User name"
 msgstr "Brugernavn"
 
-#: clientgui/DlgItemProperties.cpp:246
+#: DlgItemProperties.cpp:220
 msgid "Team name"
 msgstr "Holdnavn"
 
-#: clientgui/DlgItemProperties.cpp:247
+#: DlgItemProperties.cpp:221 ViewProjects.cpp:224
 msgid "Resource share"
 msgstr "Resourcefordeling"
 
-#: clientgui/DlgItemProperties.cpp:249
+#: DlgItemProperties.cpp:223
 msgid "Scheduler RPC deferred for"
 msgstr "Planlægger-RPC udsat med"
 
-#: clientgui/DlgItemProperties.cpp:252
+#: DlgItemProperties.cpp:226
 msgid "File downloads deferred for"
 msgstr "Fildownload udsat med"
 
-#: clientgui/DlgItemProperties.cpp:255
+#: DlgItemProperties.cpp:229
 msgid "File uploads deferred for"
 msgstr "Filupload udsat med"
 
-#: clientgui/DlgItemProperties.cpp:258
+#: DlgItemProperties.cpp:232
 msgid "Computer ID"
 msgstr "Computer-ID"
 
-#: clientgui/DlgItemProperties.cpp:260
+#: DlgItemProperties.cpp:234
 msgid "Non CPU intensive"
 msgstr "Ikke CPU-intensiv"
 
-#: 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
+#: DlgItemProperties.cpp:234 DlgItemProperties.cpp:236
+#: DlgItemProperties.cpp:237 DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:242 DlgItemProperties.cpp:251
+#: DlgItemProperties.cpp:254 DlgItemProperties.cpp:257
 msgid "yes"
 msgstr "ja"
 
-#: clientgui/DlgItemProperties.cpp:262
+#: DlgItemProperties.cpp:236
 msgid "Suspended via GUI"
 msgstr "Suspenderet via GUI"
 
-#: clientgui/DlgItemProperties.cpp:262
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:236 DlgItemProperties.cpp:237
 msgid "no"
 msgstr "nej"
 
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:237
 msgid "Don't request more work"
 msgstr "Forespørg ikke mere arbejde"
 
-#: clientgui/DlgItemProperties.cpp:265
+#: DlgItemProperties.cpp:239
 msgid "Scheduler call in progress"
 msgstr "Planlæggeropslag igang"
 
-#: clientgui/DlgItemProperties.cpp:268
+#: DlgItemProperties.cpp:242
 msgid "Trickle-up pending"
 msgstr "Sivebesked til server afventer"
 
-#: clientgui/DlgItemProperties.cpp:271
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:245 DlgItemProperties.cpp:247
 msgid "Host location"
 msgstr "Værtssted"
 
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:247
 msgid "default"
 msgstr "standard"
 
-#: clientgui/DlgItemProperties.cpp:277
+#: DlgItemProperties.cpp:251
 msgid "Added via account manager"
 msgstr "Tilføjet via kontohåndtering"
 
-#: clientgui/DlgItemProperties.cpp:280
+#: DlgItemProperties.cpp:254
 msgid "Remove when tasks done"
 msgstr "Fjern når opgaver er færdige"
 
-#: clientgui/DlgItemProperties.cpp:283
+#: DlgItemProperties.cpp:257
 msgid "Ended"
 msgstr "Afsluttet"
 
-#: clientgui/DlgItemProperties.cpp:285
-msgid "Tasks completed"
-msgstr ""
-
-#: clientgui/DlgItemProperties.cpp:286
-msgid "Tasks failed"
-msgstr ""
-
-#: clientgui/DlgItemProperties.cpp:288
+#: DlgItemProperties.cpp:259
 msgid "Credit"
 msgstr "Points"
 
-#: clientgui/DlgItemProperties.cpp:289
+#: DlgItemProperties.cpp:260
 msgid "User"
 msgstr "Bruger"
 
-#: clientgui/DlgItemProperties.cpp:296
+#: DlgItemProperties.cpp:267
 msgid "Host"
 msgstr "Vært"
 
-#: clientgui/DlgItemProperties.cpp:305
+#: DlgItemProperties.cpp:276
 msgid "Scheduling"
 msgstr "Planlægning"
 
-#: clientgui/DlgItemProperties.cpp:306
+#: DlgItemProperties.cpp:277
 msgid "Scheduling priority"
 msgstr "Planlægningsprioritet"
 
-#: clientgui/DlgItemProperties.cpp:307
+#: DlgItemProperties.cpp:278
 msgid "CPU"
 msgstr "CPU"
 
-#: clientgui/DlgItemProperties.cpp:331
+#: DlgItemProperties.cpp:302
 msgid "Duration correction factor"
 msgstr "Korrektionsfaktor for varighed"
 
-#: clientgui/DlgItemProperties.cpp:345
+#: DlgItemProperties.cpp:316
 msgid "Properties of task "
 msgstr "Egenskaber for opgave"
 
-#: clientgui/DlgItemProperties.cpp:357
+#: DlgItemProperties.cpp:328 ViewWork.cpp:238
 msgid "Application"
 msgstr "Applikation"
 
-#: clientgui/DlgItemProperties.cpp:358
+#: DlgItemProperties.cpp:329 ViewWork.cpp:239
 msgid "Name"
 msgstr "Navn"
 
-#: clientgui/DlgItemProperties.cpp:359
+#: DlgItemProperties.cpp:330
 msgid "State"
 msgstr "Tilstand"
 
-#: clientgui/DlgItemProperties.cpp:362
+#: DlgItemProperties.cpp:333
 msgid "Received"
 msgstr "Modtaget"
 
-#: clientgui/DlgItemProperties.cpp:365
+#: DlgItemProperties.cpp:336
 msgid "Report deadline"
 msgstr "Rapporterings-frist"
 
-#: clientgui/DlgItemProperties.cpp:367
+#: DlgItemProperties.cpp:338
 msgid "Resources"
 msgstr "Ressourcer"
 
-#: clientgui/DlgItemProperties.cpp:370
+#: DlgItemProperties.cpp:341
 msgid "Estimated computation size"
 msgstr "Estimeret beregningsstørrelse"
 
-#: clientgui/DlgItemProperties.cpp:373
+#: DlgItemProperties.cpp:344
 msgid "CPU time at last checkpoint"
 msgstr "CPU-tid ved sidste checkpoint"
 
-#: clientgui/DlgItemProperties.cpp:374
-#: clientgui/DlgItemProperties.cpp:389
+#: DlgItemProperties.cpp:345 DlgItemProperties.cpp:360
 msgid "CPU time"
 msgstr "CPU-tid"
 
-#: clientgui/DlgItemProperties.cpp:376
-#: clientgui/DlgItemProperties.cpp:390
+#: DlgItemProperties.cpp:347 DlgItemProperties.cpp:361
 msgid "Elapsed time"
 msgstr "Forløben tid"
 
-#: clientgui/DlgItemProperties.cpp:378
+#: DlgItemProperties.cpp:349
 msgid "Estimated time remaining"
 msgstr "Estimeret resterende tid"
 
-#: clientgui/DlgItemProperties.cpp:379
+#: DlgItemProperties.cpp:350
 msgid "Fraction done"
 msgstr "Procentdel færdig"
 
-#: clientgui/DlgItemProperties.cpp:380
+#: DlgItemProperties.cpp:351
 msgid "Virtual memory size"
 msgstr "Størrelse på virtuel hukommelse"
 
-#: clientgui/DlgItemProperties.cpp:381
+#: DlgItemProperties.cpp:352
 msgid "Working set size"
 msgstr "Størrelse på arbejdssæt"
 
-#: clientgui/DlgItemProperties.cpp:383
+#: DlgItemProperties.cpp:354
 msgid "Directory"
 msgstr "Mappe"
 
-#: clientgui/DlgItemProperties.cpp:386
+#: DlgItemProperties.cpp:357
 msgid "Process ID"
 msgstr "Proces-ID"
 
-#: clientgui/DlgItemProperties.cpp:456
+#: DlgItemProperties.cpp:427 ViewWork.cpp:1032 sg_TaskPanel.cpp:823
 msgid "Local: "
 msgstr "Lokal:"
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: DlgOptions.cpp:129 DlgOptions.cpp:135
 msgid "Options"
 msgstr "Indstillinger"
 
-#: clientgui/DlgOptions.cpp:178
+#: DlgOptions.cpp:175
 msgid "Language:"
 msgstr "Sprog:"
 
-#: clientgui/DlgOptions.cpp:185
+#: DlgOptions.cpp:182
 msgid "What language should BOINC use?"
 msgstr "Hvilket sprog skal BOINC benytte?"
 
-#: clientgui/DlgOptions.cpp:189
+#: DlgOptions.cpp:186
 msgid "Notice reminder interval:"
 msgstr "Interval for påmindelse om meddelelser:"
 
-#: clientgui/DlgOptions.cpp:196
+#: DlgOptions.cpp:193
 msgid "How often should BOINC remind you of new notices?"
 msgstr "Hvor ofte skal BOINC påminde dig om nye meddelelser?"
 
-#: clientgui/DlgOptions.cpp:201
+#: DlgOptions.cpp:198
 msgid "Run Manager at login?"
 msgstr "Kør manageren ved login?"
 
-#: clientgui/DlgOptions.cpp:207
+#: DlgOptions.cpp:204
 msgid "Run the BOINC Manager when you log on."
 msgstr "Kør BOINC-manageren, når du logger ind."
 
-#: clientgui/DlgOptions.cpp:212
+#: DlgOptions.cpp:209
 msgid "Enable Manager exit dialog?"
 msgstr "Vis dialogboks under afslutning?"
 
-#: clientgui/DlgOptions.cpp:218
+#: DlgOptions.cpp:215
 msgid "Display the exit dialog when shutting down the Manager."
 msgstr "Vis afslutningsdialogboksen når manageren lukkes."
 
-#: clientgui/DlgOptions.cpp:229
+#: DlgOptions.cpp:226
 msgid "Dial-up and Virtual Private Network settings"
 msgstr "Opsætning for opkald og virtuelle private netværk"
 
-#: clientgui/DlgOptions.cpp:243
+#: DlgOptions.cpp:240
 msgid "&Set Default"
 msgstr "&Sæt standard"
 
-#: clientgui/DlgOptions.cpp:248
+#: DlgOptions.cpp:245
 msgid "&Clear Default"
 msgstr "&Nulstil standard"
 
-#: clientgui/DlgOptions.cpp:255
+#: DlgOptions.cpp:252
 msgid "Default Connection:"
 msgstr "Standardforbindelse:"
 
-#: clientgui/DlgOptions.cpp:262
+#: DlgOptions.cpp:259
 msgid "Connections"
 msgstr "Forbindelser"
 
-#: clientgui/DlgOptions.cpp:271
+#: DlgOptions.cpp:268
 msgid "Connect via HTTP proxy server"
 msgstr "Forbind via HTTP proxy server"
 
-#: clientgui/DlgOptions.cpp:275
+#: DlgOptions.cpp:272
 msgid "HTTP Proxy Server Configuration"
 msgstr "Konfiguration af HTTP Proxy Server"
 
-#: clientgui/DlgOptions.cpp:283
-#: clientgui/DlgOptions.cpp:347
+#: DlgOptions.cpp:280 DlgOptions.cpp:344
 msgid "Address:"
 msgstr "Adresse:"
 
-#: clientgui/DlgOptions.cpp:291
-#: clientgui/DlgOptions.cpp:355
+#: DlgOptions.cpp:288 DlgOptions.cpp:352 ProxyPage.cpp:340 ProxyPage.cpp:360
 msgid "Port:"
 msgstr "Port:"
 
-#: clientgui/DlgOptions.cpp:299
-#: clientgui/DlgOptions.cpp:363
+#: DlgOptions.cpp:296 DlgOptions.cpp:360
 msgid "Don't use proxy for:"
 msgstr "Brug ikke proxy til:"
 
-#: clientgui/DlgOptions.cpp:306
-#: clientgui/DlgOptions.cpp:370
+#: DlgOptions.cpp:303 DlgOptions.cpp:367
 msgid "Leave these blank if not needed"
 msgstr "Lad disse være tomme hvis der ikke er brug for dem"
 
-#: clientgui/DlgOptions.cpp:312
-#: clientgui/DlgOptions.cpp:376
+#: DlgOptions.cpp:309 DlgOptions.cpp:373 ProxyPage.cpp:343 ProxyPage.cpp:363
 msgid "User Name:"
 msgstr "Brugernavn:"
 
-#: clientgui/DlgOptions.cpp:320
-#: clientgui/DlgOptions.cpp:384
-#: clientgui/DlgSelectComputer.cpp:152
+#: DlgOptions.cpp:317 DlgOptions.cpp:381 DlgSelectComputer.cpp:152
+#: ProxyPage.cpp:346 ProxyPage.cpp:366
 msgid "Password:"
 msgstr "Kodeord:"
 
-#: clientgui/DlgOptions.cpp:327
+#: DlgOptions.cpp:324
 msgid "HTTP Proxy"
 msgstr "HTTP Proxy"
 
-#: clientgui/DlgOptions.cpp:335
+#: DlgOptions.cpp:332
 msgid "Connect via SOCKS proxy server"
 msgstr "Forbind via SOCKS proxy server"
 
-#: clientgui/DlgOptions.cpp:339
+#: DlgOptions.cpp:336
 msgid "SOCKS Proxy Server Configuration"
 msgstr "Konfiguration af SOCKS Proxy Server"
 
-#: clientgui/DlgOptions.cpp:391
+#: DlgOptions.cpp:388
 msgid "SOCKS Proxy"
 msgstr "SOCKS Proxy"
 
-#: clientgui/DlgOptions.cpp:589
+#: DlgOptions.cpp:586
 msgid "always"
 msgstr "altid"
 
-#: clientgui/DlgOptions.cpp:590
+#: DlgOptions.cpp:587
 msgid "1 hour"
 msgstr "1 time"
 
-#: clientgui/DlgOptions.cpp:591
+#: DlgOptions.cpp:588
 msgid "6 hours"
 msgstr "6 timer"
 
-#: clientgui/DlgOptions.cpp:592
+#: DlgOptions.cpp:589
 msgid "1 day"
 msgstr "1 dag"
 
-#: clientgui/DlgOptions.cpp:593
+#: DlgOptions.cpp:590
 msgid "1 week"
 msgstr "1 uge"
 
-#: clientgui/DlgOptions.cpp:594
+#: DlgOptions.cpp:591
 msgid "never"
 msgstr "aldrig"
 
-#: clientgui/DlgOptions.cpp:691
+#: DlgOptions.cpp:688
 #, c-format
 msgid "%s - Language Selection"
 msgstr "%s – Sprogvalg"
 
-#: clientgui/DlgOptions.cpp:698
+#: DlgOptions.cpp:695
 #, 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 "%s's sprog er ændret. For at dette kan træde i kraft, skal du genstarte %s."
 
-#: clientgui/DlgSelectComputer.cpp:91
+#: DlgSelectComputer.cpp:91
 #, c-format
 msgid "%s - Select Computer"
 msgstr "%s – Vælg computer"
 
-#: clientgui/DlgSelectComputer.cpp:125
+#: DlgSelectComputer.cpp:125
 #, c-format
 msgid ""
 "Another instance of %s is already running \n"
 "on this computer.  Please select a client to monitor."
-msgstr ""
-"En anden instans af %s kører allerede \n"
-"på denne computer. Vælg venligst en klient at overvåge."
+msgstr "En anden instans af %s kører allerede \npå denne computer. Vælg venligst en klient at overvåge."
 
-#: clientgui/DlgSelectComputer.cpp:143
+#: DlgSelectComputer.cpp:143
 msgid "Host name:"
 msgstr "Værtsnavn:"
 
-#: clientgui/Localization.cpp:31
-#: clientgui/Localization.cpp:69
+#: Localization.cpp:31 Localization.cpp:69
 msgid "Message boards"
 msgstr "Forum"
 
-#: clientgui/Localization.cpp:33
+#: Localization.cpp:33
 msgid "Correspond with other users on the SETI at home message boards"
 msgstr "Konversér med andre brugere på SETI at home's forum"
 
-#: clientgui/Localization.cpp:37
+#: Localization.cpp:37
 msgid "Ask questions and report problems"
 msgstr "Stil spørgsmål og rapportér problemer"
 
-#: clientgui/Localization.cpp:39
-#: clientgui/Localization.cpp:81
-#: clientgui/Localization.cpp:111
-#: clientgui/Localization.cpp:129
+#: Localization.cpp:39 Localization.cpp:81 Localization.cpp:111
+#: Localization.cpp:129
 msgid "Your account"
 msgstr "Din konto"
 
-#: clientgui/Localization.cpp:41
-#: clientgui/Localization.cpp:87
-#: clientgui/Localization.cpp:113
+#: Localization.cpp:41 Localization.cpp:87 Localization.cpp:113
 msgid "View your account information and credit totals"
 msgstr "Se dine kontoinformationer og pointtotaler"
 
-#: clientgui/Localization.cpp:43
+#: Localization.cpp:43
 msgid "Your preferences"
 msgstr "Dine indstillinger"
 
-#: clientgui/Localization.cpp:45
+#: Localization.cpp:45
 msgid "View and modify your SETI at home account profile and preferences"
 msgstr "Se og ændr din SETI at home-profil og -indstillinger"
 
-#: clientgui/Localization.cpp:47
-#: clientgui/Localization.cpp:89
+#: Localization.cpp:47 Localization.cpp:89
 msgid "Your results"
 msgstr "Dine resultater"
 
-#: clientgui/Localization.cpp:49
-#: clientgui/Localization.cpp:91
+#: Localization.cpp:49 Localization.cpp:91
 msgid "View your last week (or more) of computational results and work"
 msgstr "Se beregningsarbejde fra og -resultater for den seneste uge (eller mere)"
 
-#: clientgui/Localization.cpp:51
-#: clientgui/Localization.cpp:93
+#: Localization.cpp:51 Localization.cpp:93
 msgid "Your computers"
 msgstr "Dine computere"
 
-#: clientgui/Localization.cpp:53
+#: Localization.cpp:53
 msgid "View a listing of all the computers on which you are running SETI at Home"
 msgstr "Se en liste af alle de computere, hvor du kører SETI at home"
 
-#: clientgui/Localization.cpp:55
-#: clientgui/Localization.cpp:97
+#: Localization.cpp:55 Localization.cpp:97
 msgid "Your team"
 msgstr "Dit hold"
 
-#: clientgui/Localization.cpp:57
-#: clientgui/Localization.cpp:99
+#: Localization.cpp:57 Localization.cpp:99
 msgid "View information about your team"
 msgstr "Se information om dit hold"
 
-#: clientgui/Localization.cpp:61
+#: Localization.cpp:61
 msgid "Common questions"
 msgstr "Almindelige spørgsmål"
 
-#: clientgui/Localization.cpp:63
+#: Localization.cpp:63
 msgid "Read the Einstein at Home Frequently Asked Question list"
 msgstr "Læs Einstein at Home's liste over ofte stillede spørgsmål (FAQ)"
 
-#: clientgui/Localization.cpp:65
+#: Localization.cpp:65
 msgid "Screensaver info"
 msgstr "Info for pauseskærm"
 
-#: clientgui/Localization.cpp:67
+#: Localization.cpp:67
 msgid "Read a detailed description of the Einstein at Home screensaver"
 msgstr "Læs en detaljeret beskrivelse af Einstein at Home's pauseskærm"
 
-#: clientgui/Localization.cpp:71
-msgid "Correspond with admins and other users on the Einstein at Home message boards"
+#: Localization.cpp:71
+msgid ""
+"Correspond with admins and other users on the Einstein at Home message boards"
 msgstr "Konversér med administratorer og andre brugere på Einstein at Home's forum"
 
-#: clientgui/Localization.cpp:73
+#: Localization.cpp:73
 msgid "Einstein status"
 msgstr "Einstein-status"
 
-#: clientgui/Localization.cpp:75
+#: Localization.cpp:75
 msgid "Current status of the Einstein at Home server"
 msgstr "Nuværende status for Einstein at Home-serveren"
 
-#: clientgui/Localization.cpp:77
+#: Localization.cpp:77
 msgid "Report problems"
 msgstr "Rapportér problemer"
 
-#: clientgui/Localization.cpp:79
+#: Localization.cpp:79
 msgid "A link to the Einstein at Home problems and bug reports message board"
 msgstr "Et link til Einstein at Home's forum med problemer og fejlrapporter"
 
-#: clientgui/Localization.cpp:83
+#: Localization.cpp:83
 msgid "View and modify your Einstein at Home account profile and preferences"
 msgstr "Se og ændr din Einstein at home-profil og -indstillinger"
 
-#: clientgui/Localization.cpp:85
+#: Localization.cpp:85
 msgid "Account summary"
 msgstr "Kontooversigt"
 
-#: clientgui/Localization.cpp:95
-msgid "View a listing of all the computers on which you are running Einstein at Home"
+#: Localization.cpp:95
+msgid ""
+"View a listing of all the computers on which you are running Einstein at Home"
 msgstr "Se en liste af alle de computere, hvor du kører Einstein at home"
 
-#: clientgui/Localization.cpp:101
+#: Localization.cpp:101
 msgid "LIGO project"
 msgstr "LIGO-projekt"
 
-#: clientgui/Localization.cpp:103
-msgid "The home page of the Laser Interferometer Gravitational-wave Observatory (LIGO) project"
+#: Localization.cpp:103
+msgid ""
+"The home page of the Laser Interferometer Gravitational-wave Observatory "
+"(LIGO) project"
 msgstr "Hjemmesiden for projektet Laser Interferometer Gravitational-wave Observatory (LIGO)"
 
-#: clientgui/Localization.cpp:105
+#: Localization.cpp:105
 msgid "GEO-600 project"
 msgstr "GEO-600-projekt"
 
-#: clientgui/Localization.cpp:107
+#: Localization.cpp:107
 msgid "The home page of the GEO-600 project"
 msgstr "Hjemmesiden for GEO-600-projektet"
 
-#: clientgui/Localization.cpp:115
-#: clientgui/Localization.cpp:133
+#: Localization.cpp:115 Localization.cpp:133 ViewProjects.cpp:221
+#: ViewStatistics.cpp:465
 msgid "Team"
 msgstr "Hold"
 
-#: clientgui/Localization.cpp:117
+#: Localization.cpp:117
 msgid "Info about your Team"
 msgstr "Info om dit hold"
 
-#: clientgui/Localization.cpp:123
+#: Localization.cpp:123
 msgid "Get help for climateprediction.net"
 msgstr "Få hjælp til climateprediction.net"
 
-#: clientgui/Localization.cpp:125
+#: Localization.cpp:125
 msgid "News"
 msgstr "Nyheder"
 
-#: clientgui/Localization.cpp:127
+#: Localization.cpp:127
 msgid "climateprediction.net News"
 msgstr "climateprediction.net-nyheder"
 
-#: clientgui/Localization.cpp:131
+#: Localization.cpp:131
 msgid "View your account information, credits, and trickles"
 msgstr "Se dine kontoinformationer, points og sivebeskeder"
 
-#: clientgui/Localization.cpp:135
+#: Localization.cpp:135
 msgid "Info about your team"
 msgstr "Info om dit hold"
 
-#: clientgui/Localization.cpp:141
+#: Localization.cpp:141
 msgid "Search for help in our help system"
 msgstr "Søg efter hjælp i vores hjælpesystem"
 
-#: clientgui/Localization.cpp:143
+#: Localization.cpp:143
 msgid "Global Statistics"
 msgstr "Samlede statistikker"
 
-#: clientgui/Localization.cpp:145
+#: Localization.cpp:145
 msgid "Summary statistics for World Community Grid"
 msgstr "Samlede statistikker for World Community Grid"
 
-#: clientgui/Localization.cpp:147
+#: Localization.cpp:147
 msgid "My Grid"
 msgstr "Mit grid"
 
-#: clientgui/Localization.cpp:149
+#: Localization.cpp:149
 msgid "Your statistics and settings"
 msgstr "Dine statistikker og opsætning"
 
-#: clientgui/Localization.cpp:151
+#: Localization.cpp:151
 msgid "Device Profiles"
 msgstr "Enhedsprofiler"
 
-#: clientgui/Localization.cpp:153
+#: Localization.cpp:153
 msgid "Update your device settings"
 msgstr "Opdatér din enhedsopsætning"
 
-#: clientgui/Localization.cpp:155
+#: Localization.cpp:155
 msgid "Research"
 msgstr "Forskning"
 
-#: clientgui/Localization.cpp:157
+#: Localization.cpp:157
 msgid "Learn about the projects hosted at World Community Grid"
 msgstr "Lær om projekter hos World Community Grid"
 
-#: clientgui/MainDocument.cpp:583
+#: MainDocument.cpp:583
 msgid "Starting client"
 msgstr "Starter klient"
 
-#: clientgui/MainDocument.cpp:591
+#: MainDocument.cpp:591
 msgid "Connecting to client"
 msgstr "Forbinder til klient"
 
-#: clientgui/MainDocument.cpp:1205
+#: MainDocument.cpp:1195
 msgid "Retrieving system state; please wait..."
 msgstr "Henter systemtilstand; vent venligst …"
 
-#: clientgui/MainDocument.cpp:1826
+#: MainDocument.cpp:1816
 msgid "Missing application"
 msgstr "Manglende applikation"
 
-#: clientgui/MainDocument.cpp:1827
-msgid "Please download and install the CoRD application from http://cord.sourceforge.net"
+#: MainDocument.cpp:1817
+msgid ""
+"Please download and install the CoRD application from "
+"http://cord.sourceforge.net"
 msgstr "Download og installér venligst CoRD-applikationen fra http://cord.sourceforge.net"
 
-#: clientgui/MainDocument.cpp:2442
+#: MainDocument.cpp:2432
 msgid "on batteries"
 msgstr "på batterier"
 
-#: clientgui/MainDocument.cpp:2443
+#: MainDocument.cpp:2433
 msgid "computer is in use"
 msgstr "computeren er i brug"
 
-#: clientgui/MainDocument.cpp:2444
+#: MainDocument.cpp:2434
 msgid "user request"
 msgstr "brugerforespørgsel"
 
-#: clientgui/MainDocument.cpp:2445
+#: MainDocument.cpp:2435
 msgid "time of day"
 msgstr "tidspunkt på dagen"
 
-#: clientgui/MainDocument.cpp:2446
+#: MainDocument.cpp:2436
 msgid "CPU benchmarks in progress"
 msgstr "kører CPU-ydelsesmåling"
 
-#: clientgui/MainDocument.cpp:2447
+#: MainDocument.cpp:2437
 msgid "need disk space - check preferences"
 msgstr "behøver diskplads – check indstillinger"
 
-#: clientgui/MainDocument.cpp:2448
+#: MainDocument.cpp:2438
 msgid "computer is not in use"
 msgstr "computeren er ikke i brug"
 
-#: clientgui/MainDocument.cpp:2449
+#: MainDocument.cpp:2439
 msgid "starting up"
 msgstr "starter op"
 
-#: clientgui/MainDocument.cpp:2450
+#: MainDocument.cpp:2440
 msgid "an exclusive app is running"
 msgstr "en eksklusiv applikation kører"
 
-#: clientgui/MainDocument.cpp:2451
+#: MainDocument.cpp:2441
 msgid "CPU is busy"
 msgstr "CPU er optaget"
 
-#: clientgui/MainDocument.cpp:2452
+#: MainDocument.cpp:2442
 msgid "network bandwidth limit exceeded"
 msgstr "begrænsning for netværksbåndbredde nået"
 
-#: clientgui/MainDocument.cpp:2453
+#: MainDocument.cpp:2443
 msgid "requested by operating system"
 msgstr "forespurgt af operativsystem"
 
-#: clientgui/MainDocument.cpp:2455
+#: MainDocument.cpp:2445
 msgid "unknown reason"
 msgstr "ukendt begrundelse"
 
-#: clientgui/MainDocument.cpp:2477
+#: MainDocument.cpp:2467
 msgid "GPU missing, "
 msgstr "GPU mangler,"
 
-#: clientgui/MainDocument.cpp:2484
+#: MainDocument.cpp:2474
 msgid "New"
 msgstr "Ny"
 
-#: clientgui/MainDocument.cpp:2488
+#: MainDocument.cpp:2478
 msgid "Download failed"
 msgstr "Download mislykkedes"
 
-#: clientgui/MainDocument.cpp:2490
+#: MainDocument.cpp:2480
 msgid "Downloading"
 msgstr "Downloader"
 
-#: clientgui/MainDocument.cpp:2492
-#: clientgui/MainDocument.cpp:2557
+#: MainDocument.cpp:2482 MainDocument.cpp:2552
 msgid " (suspended - "
 msgstr "(suspenderet – "
 
-#: clientgui/MainDocument.cpp:2500
+#: MainDocument.cpp:2490
 msgid "Project suspended by user"
 msgstr "Projekt suspenderet af bruger"
 
-#: clientgui/MainDocument.cpp:2502
+#: MainDocument.cpp:2492
 msgid "Task suspended by user"
 msgstr "Opgave suspenderet af bruger"
 
-#: clientgui/MainDocument.cpp:2504
+#: MainDocument.cpp:2494
 msgid "Suspended - "
 msgstr "Suspenderet – "
 
-# 75%
-#: clientgui/MainDocument.cpp:2510
+#: MainDocument.cpp:2500
 msgid "GPU suspended - "
 msgstr "GPU suspenderet – "
 
-#: clientgui/MainDocument.cpp:2517
+#: MainDocument.cpp:2507
 msgid "Waiting for memory"
 msgstr "Venter på hukommelse"
 
-#: clientgui/MainDocument.cpp:2519
+#: MainDocument.cpp:2509
 msgid "Waiting for shared memory"
 msgstr "Venter på delt hukommelse"
 
-#: clientgui/MainDocument.cpp:2521
+#: MainDocument.cpp:2512
+msgid "Running, high priority"
+msgstr "Kører, høj prioritet"
+
+#: MainDocument.cpp:2514
 msgid "Running"
 msgstr "Kører"
 
-#: clientgui/MainDocument.cpp:2523
+#: MainDocument.cpp:2517
 msgid " (non-CPU-intensive)"
 msgstr " (ikke CPU-intensiv)"
 
-#: clientgui/MainDocument.cpp:2526
+#: MainDocument.cpp:2520
 msgid "Waiting to run"
 msgstr "Venter på at køre"
 
-#: clientgui/MainDocument.cpp:2528
-#: clientgui/MainDocument.cpp:2534
+#: MainDocument.cpp:2522 MainDocument.cpp:2528
 msgid "Ready to start"
 msgstr "Klar til at starte"
 
-#: clientgui/MainDocument.cpp:2538
-msgid "Postponed: "
-msgstr ""
+#: MainDocument.cpp:2532
+msgid " (Scheduler wait: "
+msgstr " (Planlægger venter: "
 
-#: clientgui/MainDocument.cpp:2541
-msgid "Postponed"
-msgstr ""
+#: MainDocument.cpp:2536
+msgid " (Scheduler wait)"
+msgstr " (Planlægger venter)"
 
-#: clientgui/MainDocument.cpp:2545
-msgid "Waiting for network access"
-msgstr ""
+#: MainDocument.cpp:2540
+msgid " (Waiting for network access)"
+msgstr " (Venter på netværksadgang)"
 
-#: clientgui/MainDocument.cpp:2549
+#: MainDocument.cpp:2544
 msgid "Computation error"
 msgstr "Beregningsfejl"
 
-#: clientgui/MainDocument.cpp:2553
+#: MainDocument.cpp:2548
 msgid "Upload failed"
 msgstr "Upload mislykkedes"
 
-#: clientgui/MainDocument.cpp:2555
+#: MainDocument.cpp:2550
 msgid "Uploading"
 msgstr "Uploader"
 
-#: clientgui/MainDocument.cpp:2566
+#: MainDocument.cpp:2561
 msgid "Aborted by user"
 msgstr "Afbrudt af bruger"
 
-#: clientgui/MainDocument.cpp:2569
+#: MainDocument.cpp:2564
 msgid "Aborted by project"
 msgstr "Afbrudt af projekt"
 
-#: clientgui/MainDocument.cpp:2572
+#: MainDocument.cpp:2567
 msgid "Aborted: not started by deadline"
 msgstr "Afbrudt: ikke startet før frist"
 
-#: clientgui/MainDocument.cpp:2575
+#: MainDocument.cpp:2570
 msgid "Aborted: disk limit exceeded"
 msgstr "Afbrudt: diskbegrænsning overtrådt"
 
-#: clientgui/MainDocument.cpp:2578
+#: MainDocument.cpp:2573
 msgid "Aborted: run time limit exceeded"
 msgstr "Afbrudt: Køretidsbegrænsning overtrådt"
 
-#: clientgui/MainDocument.cpp:2581
+#: MainDocument.cpp:2576
 msgid "Aborted: memory limit exceeded"
 msgstr "Afbrudt: hukommelsesbegrænsning overtrådt"
 
-#: clientgui/MainDocument.cpp:2584
+#: MainDocument.cpp:2579
 msgid "Aborted"
 msgstr "Afbrudt"
 
-#: clientgui/MainDocument.cpp:2589
+#: MainDocument.cpp:2584
 msgid "Acknowledged"
 msgstr "Anerkendt"
 
-#: clientgui/MainDocument.cpp:2591
+#: MainDocument.cpp:2586
 msgid "Ready to report"
 msgstr "Klar til rapportering"
 
-#: clientgui/MainDocument.cpp:2593
+#: MainDocument.cpp:2588
 #, c-format
 msgid "Error: invalid state '%d'"
 msgstr "Fejl: Ugydig tilstand \"%d\""
 
-#: clientgui/NoInternetConnectionPage.cpp:179
+#: NoInternetConnectionPage.cpp:179
 msgid "No Internet connection"
 msgstr "Ingen Internetforbindelse"
 
-#: clientgui/NoInternetConnectionPage.cpp:182
+#: NoInternetConnectionPage.cpp:182
 msgid "Please connect to the Internet and try again."
 msgstr "Forbind venligst til Internet og prøv igen."
 
-#: clientgui/NotDetectedPage.cpp:181
+#: NotDetectedPage.cpp:181
 msgid "Project not found"
 msgstr "Projekt ikke fundet"
 
-#: clientgui/NotDetectedPage.cpp:184
+#: 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 ""
-"URL'en, du indtastede, tilhører ikke et BOINC-baseret projekt.\n"
-"\n"
-"Check venligst URL'en og prøv igen."
+msgstr "URL'en, du indtastede, tilhører ikke et BOINC-baseret projekt.\n\nCheck venligst URL'en og prøv igen."
 
-#: clientgui/NotDetectedPage.cpp:188
+#: NotDetectedPage.cpp:188
 msgid "Account manager not found"
 msgstr "Kontohåndtering blev ikke fundet"
 
-#: clientgui/NotDetectedPage.cpp:191
+#: NotDetectedPage.cpp:191
 msgid ""
 "The URL you supplied is not that of a BOINC-based account\n"
 "manager.\n"
 "\n"
 "Please check the URL and try again."
-msgstr ""
-"URL'en, du indtastede, tilhører ikke en BOINC-baseret\n"
-"kontohåndtering.\n"
-"\n"
-"Check venligst URL'en og prøv igen."
+msgstr "URL'en, du indtastede, tilhører ikke en BOINC-baseret\nkontohåndtering.\n\nCheck venligst URL'en og prøv igen."
 
-#: clientgui/NotFoundPage.cpp:181
+#: NotFoundPage.cpp:181
 msgid "Login Failed."
 msgstr "Login mislykkedes."
 
-#: clientgui/NotFoundPage.cpp:185
+#: NotFoundPage.cpp:185
 msgid "Check the username and password, and try again."
 msgstr "Check dit brugernavn og kodeord, og prøv igen."
 
-#: clientgui/NotFoundPage.cpp:189
+#: NotFoundPage.cpp:189
 msgid "Check the email address and password, and try again."
 msgstr "Check emailadresse og kodeord, og prøv igen."
 
-#: clientgui/NoticeListCtrl.cpp:229
+#: NoticeListCtrl.cpp:222
 msgid "more..."
 msgstr "mere …"
 
-#: clientgui/ProjectInfoPage.cpp:221
+#: ProjectInfoPage.cpp:477 ProjectInfoPage.cpp:778 ProjectInfoPage.cpp:782
+msgid "All"
+msgstr "Alle"
+
+#: ProjectInfoPage.cpp:615
 msgid "Choose a project"
 msgstr "Vælg et projekt"
 
-#: clientgui/ProjectInfoPage.cpp:228
+#: ProjectInfoPage.cpp:619
 msgid "To choose a project, click its name or type its URL below."
 msgstr "For at vælge et projekt skal du klikke på dets navn eller skrive dets URL herunder."
 
-#: clientgui/ProjectInfoPage.cpp:246
+#: ProjectInfoPage.cpp:623
 msgid "Categories:"
 msgstr "Kategorier:"
 
-#: clientgui/ProjectInfoPage.cpp:267
+#: ProjectInfoPage.cpp:627 sg_ProjectPanel.cpp:89
 msgid "Projects:"
 msgstr "Projekter:"
 
-#: clientgui/ProjectInfoPage.cpp:279
+#: ProjectInfoPage.cpp:631
 msgid "Project details"
 msgstr "Projektdetaljer"
 
-#: clientgui/ProjectInfoPage.cpp:291
+#: ProjectInfoPage.cpp:635
 msgid "Research area:"
 msgstr "Forskningsområde:"
 
-#: clientgui/ProjectInfoPage.cpp:302
+#: ProjectInfoPage.cpp:639
 msgid "Organization:"
 msgstr "Organisation:"
 
-#: clientgui/ProjectInfoPage.cpp:313
+#: ProjectInfoPage.cpp:643
 msgid "Web site:"
 msgstr "Hjemmeside:"
 
-#: clientgui/ProjectInfoPage.cpp:325
+#: ProjectInfoPage.cpp:647
 msgid "Supported systems:"
 msgstr "Understøttede systemer:"
 
-#: clientgui/ProjectInfoPage.cpp:363
+#: ProjectInfoPage.cpp:651
 msgid "Project URL:"
 msgstr "Projekt URL:"
 
-#: clientgui/ProjectInfoPage.cpp:499
-#: clientgui/ProjectInfoPage.cpp:754
-#: clientgui/ProjectInfoPage.cpp:758
-msgid "All"
-msgstr "Alle"
-
-#: clientgui/ProjectInfoPage.cpp:802
-msgid "This project may not have work for your type of computer.  Do you want to add it anyway?"
+#: ProjectInfoPage.cpp:826
+msgid ""
+"This project may not have work for your type of computer.  Do you want to "
+"add it anyway?"
 msgstr "Dette projekt har måske ikke arbejde til din type computer. Vil du tilføje det alligevel?"
 
-#: clientgui/ProjectInfoPage.cpp:826
+#: ProjectInfoPage.cpp:850
 msgid "You already added this project. Please choose a different project."
 msgstr "Du har allerede tilføjet dette projekt. Vælg venligst et andet projekt."
 
-#: clientgui/ProjectProcessingPage.cpp:321
+#: ProjectProcessingPage.cpp:321
 msgid "Communicating with project."
 msgstr "Kommunikerer med projekt."
 
-#: clientgui/ProjectProcessingPage.cpp:510
+#: ProjectProcessingPage.cpp:509
 msgid "Required files not found on the server."
 msgstr "Nødvendige filer blev ikke fundet på serveren."
 
-#: clientgui/ProjectProcessingPage.cpp:513
-#: clientgui/ProjectProcessingPage.cpp:586
+#: ProjectProcessingPage.cpp:512 ProjectProcessingPage.cpp:574
 msgid "An internal server error has occurred."
 msgstr "Der er opstået en intern serverfejl."
 
-#: clientgui/ProjectPropertiesPage.cpp:334
+#: ProjectPropertiesPage.cpp:334
 msgid ""
 "Communicating with project\n"
 "Please wait..."
-msgstr ""
-"Kommunikerer med projekt\n"
-"Vent venligst …"
-
-#: clientgui/ProjectWelcomePage.cpp:251
-#, c-format
-msgid "Welcome to %s."
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:254
-msgid "You have volunteered to compute for this project:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:255
-msgid "Name:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:258
-msgid "Home:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:262
-msgid "Description:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:265
-msgid "URL:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:268
-msgid "User:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:273
-msgid "WARNING: This project is not registered with BOINC.  Make sure you trust it before continuing."
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:277
-msgid "To continue, click Next."
-msgstr "Klik Næste for at fortsætte."
+msgstr "Kommunikerer med projekt\nVent venligst …"
 
-#: clientgui/ProxyInfoPage.cpp:195
+#: ProxyInfoPage.cpp:195
 msgid "Network communication failure"
 msgstr "Netværkskommunikationsfejl"
 
-#: clientgui/ProxyInfoPage.cpp:199
+#: ProxyInfoPage.cpp:199
 msgid ""
 "The World Community Grid - BOINC software failed to communicate\n"
 "over the Internet. The most likely reasons are:\n"
@@ -2719,22 +2485,9 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"World Community Grid – BOINC software kunne ikke kommunikere\n"
-"via Internet. De mest almindelige grunde er:\n"
-"\n"
-"1) Forbindelsesproblem. Check dit netværk eller\n"
-"modemforbindelse og klik på Tilbage for at prøve igen.\n"
-"\n"
-"2) Din personlige firewall blokerer World Community\n"
-"Grid – BOINC software. Konfigurér din personlige firewall til at\n"
-"lade BOINC og BOINC-manageren kommunikere på port 80 og port 443.\n"
-"Derefter, klik på Tilbage for at prøve igen.\n"
-"\n"
-"3) Du bruger en proxy-server.\n"
-"Klik Næste for at konfigurere BOINC's proxy-opsætning."
+msgstr "World Community Grid – BOINC software kunne ikke kommunikere\nvia Internet. De mest almindelige grunde er:\n\n1) Forbindelsesproblem. Check dit netværk eller\nmodemforbindelse og klik på Tilbage for at prøve igen.\n\n2) Din personlige firewall blokerer World Community\nGrid – BOINC software. Konfigurér din personlige firewall til at\nlade BOINC og BOINC-manageren kommunikere på port 80 og port 443.\nDerefter, klik på Tilbage for at prøve igen.\n\n3) Du bruger en proxy-server.\nKl [...]
 
-#: clientgui/ProxyInfoPage.cpp:203
+#: ProxyInfoPage.cpp:203
 msgid ""
 "BOINC failed to communicate on the Internet.\n"
 "The most likely reasons are:\n"
@@ -2749,2083 +2502,1201 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"BOINC kunne ikke kommunikere via Internet.\n"
-"De mest almindelige grunde er:\n"
-"\n"
-"1) Forbindelsesproblem. Check dit netværk eller\n"
-"modemforbindelse og klik på Tilbage for at prøve igen.\n"
-"\n"
-"2) Din personlige firewall blokerer BOINC.\n"
-"Konfigurér din personlige firewall til at lade BOINC og\n"
-"BOINC-manageren kommunikere på port 80.\n"
-"Derefter, klik på Tilbage for at prøve igen.\n"
-"\n"
-"3) Du bruger en proxy-server.\n"
-"Klik Næste for at konfigurere BOINC's proxy-opsætning."
+msgstr "BOINC kunne ikke kommunikere via Internet.\nDe mest almindelige grunde er:\n\n1) Forbindelsesproblem. Check dit netværk eller\nmodemforbindelse og klik på Tilbage for at prøve igen.\n\n2) Din personlige firewall blokerer BOINC.\nKonfigurér din personlige firewall til at lade BOINC og\nBOINC-manageren kommunikere på port 80.\nDerefter, klik på Tilbage for at prøve igen.\n\n3) Du bruger en proxy-server.\nKlik Næste for at konfigurere BOINC's proxy-opsætning."
 
-#: clientgui/ProxyPage.cpp:331
+#: ProxyPage.cpp:331
 msgid "Proxy configuration"
 msgstr "Proxy-konfiguration"
 
-#: clientgui/ProxyPage.cpp:334
+#: ProxyPage.cpp:334
 msgid "HTTP proxy"
 msgstr "HTTP-proxy"
 
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
+#: ProxyPage.cpp:337 ProxyPage.cpp:357
 msgid "Server:"
 msgstr "Server:"
 
-#: clientgui/ProxyPage.cpp:350
+#: ProxyPage.cpp:350
 msgid "Autodetect"
 msgstr "Autoregistrering"
 
-#: clientgui/ProxyPage.cpp:354
+#: ProxyPage.cpp:354
 msgid "SOCKS proxy"
 msgstr "SOCKS-proxy"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:167
-msgid "Advanced View...\tCtrl+Shift+A"
-msgstr "Avanceret visning …\tCtrl+Shift+A"
+#: TermsOfUsePage.cpp:218
+msgid "Terms of Use"
+msgstr "Brugsvilkår"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:168
-msgid "Display the advanced graphical interface."
-msgstr "Vis den avancerede grafiske grænseflade."
+#: TermsOfUsePage.cpp:222
+msgid "Please read the following terms of use:"
+msgstr "Læs venligst følgende brugsvilkår:"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:175
-msgid "Skin"
-msgstr "Tema"
+#: TermsOfUsePage.cpp:231
+msgid "I agree to the terms of use."
+msgstr "Jeg er enig i brugsvilkårene."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:177
-msgid "Select the appearance of the user interface."
-msgstr "Vælg udseende for brugergrænseflade."
+#: TermsOfUsePage.cpp:237
+msgid "I do not agree to the terms of use."
+msgstr "Jeg er ikke enig i brugsvilkårene."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:224
-#, c-format
-msgid "&%s"
-msgstr "&%s"
+#: UnavailablePage.cpp:183
+msgid "Project temporarily unavailable"
+msgstr "Projektet er midlertidigt utilgængeligt"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:405
-msgid "Default"
-msgstr "Standard"
+#: UnavailablePage.cpp:186
+msgid ""
+"The project is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "Projektet er midlertidigt utilgængeligt.\n\nPrøv venligst igen senere."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:848
-msgid "Suspend"
-msgstr "Suspendér"
+#: UnavailablePage.cpp:190
+msgid "Account manager temporarily unavailable"
+msgstr "Kontohåndteringen er midlertidigt utilgængelig"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:850
-msgid "Suspend Computing"
-msgstr "Suspendér beregning"
+#: UnavailablePage.cpp:193
+msgid ""
+"The account manager is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "Kontohåndteringen er midlertidigt utilgængelig.\n\nPrøv venligst igen senere."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:851
-msgid "Resume Computing"
-msgstr "Genoptag beregning"
+#: ValidateAccountKey.cpp:68
+msgid "Please specify an account key to continue."
+msgstr "Angiv venligst en kontonøgle for at fortsætte."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:867
-msgid "Notices"
-msgstr "Meddelelser"
+#: ValidateAccountKey.cpp:71
+msgid "Invalid Account Key; please enter a valid Account Key"
+msgstr "Ugyldig kontonøgle; Indtast venligst en gyldig kontonøgle"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:868
-msgid "Open a window to view notices from projects or BOINC"
-msgstr "Åbn en vindue, for at se meddelelser fra projekter eller BOINC"
+#: ValidateAccountKey.cpp:82 ValidateEmailAddress.cpp:86
+msgid "Validation conflict"
+msgstr "Valideringskonflikt"
 
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
-msgstr "Henter meddelelser; vent venligst …"
+#: ValidateEmailAddress.cpp:72
+msgid "Please specify an email address"
+msgstr "Angiv venligst en emailadresse"
 
-#: clientgui/sg_DlgMessages.cpp:132
-msgid "There are no notices at this time."
-msgstr "Der er ingen meddelelser på nuværende tidspunkt."
+#: ValidateEmailAddress.cpp:75
+msgid "Invalid email address; please enter a valid email address"
+msgstr "Ugyldig emailadresse; Indtast venligst en gyldig emailadresse"
 
-#: clientgui/sg_DlgMessages.cpp:146
-msgid "Close"
-msgstr "Luk"
+#: ValidateURL.cpp:69
+msgid "Missing URL"
+msgstr "Manglende URL"
 
-#: clientgui/sg_DlgMessages.cpp:394
-#, c-format
-msgid "%s - Notices"
-msgstr "%s – Meddelelser"
+#: ValidateURL.cpp:70
+msgid ""
+"Please specify a URL.\n"
+"For example:\n"
+"http://www.example.com/"
+msgstr "Angiv venligst en URL.\nFor eksempel:\nhttp://www.eksempel.com/"
 
-#: clientgui/sg_DlgPreferences.cpp:270
-msgid "This dialog controls preferences for this computer only."
-msgstr "Denne dislogboks styrer kun indstillinger for denne computer."
+#: ValidateURL.cpp:83 ValidateURL.cpp:87 ValidateURL.cpp:91
+#: ValidateURL.cpp:103 ValidateURL.cpp:107 ValidateURL.cpp:110
+msgid "Invalid URL"
+msgstr "Ugyldig URL"
 
-#: clientgui/sg_DlgPreferences.cpp:275
-msgid "Click OK to set preferences."
-msgstr "Klik O.k. for at sætte indstillinger."
+#: ValidateURL.cpp:84 ValidateURL.cpp:88 ValidateURL.cpp:92
+msgid ""
+"Please specify a valid URL.\n"
+"For example:\n"
+"http://boincproject.example.com"
+msgstr "Angiv venligst en gyldig URL.\nFor eksempel:\nhttp://boincprojekt.eksempel.com"
 
-#: clientgui/sg_DlgPreferences.cpp:280
-msgid "Click Clear to restore web-based settings for all preferences listed below."
-msgstr "Klik Nulstil for at genskabe den webbaserede opsætning for alle indstillinger herunder."
+#: ValidateURL.cpp:104 ValidateURL.cpp:108
+#, c-format
+msgid "'%s' does not contain a valid host name."
+msgstr "\"%s\" indeholder ikke et gyldigt værtsnavn."
 
-#: clientgui/sg_DlgPreferences.cpp:287
-msgid "For additional settings, select Computing Preferences in the Advanced View."
-msgstr "For yderligere opsætning, vælg Beregningsindstillinger under Avanceret visning."
+#: ValidateURL.cpp:111
+#, c-format
+msgid "'%s' does not contain a valid path."
+msgstr "\"%s\" indeholder ikke en gyldig sti."
 
-#: clientgui/sg_DlgPreferences.cpp:315
-msgid "Do work only between:"
-msgstr "Arbejd kun imellem:"
+#: ViewMessages.cpp:84 ViewProjects.cpp:170 ViewStatistics.cpp:1978
+#: ViewTransfers.cpp:160 ViewWork.cpp:183
+msgid "Commands"
+msgstr "Kommandoer"
 
-#: clientgui/sg_DlgPreferences.cpp:337
-msgid "Connect to internet only between:"
-msgstr "Forbind kun til Internet imellem:"
+#: ViewMessages.cpp:88
+msgid "Copy all messages"
+msgstr "Kopiér alle beskeder"
 
-#: clientgui/sg_DlgPreferences.cpp:359
-#: clientgui/sg_DlgPreferences.cpp:376
-msgid "Use no more than:"
-msgstr "Brug ikke mere end:"
+#: ViewMessages.cpp:95
+msgid "Copy selected messages"
+msgstr "Kopier valgte beskeder"
 
-#: clientgui/sg_DlgPreferences.cpp:372
-msgid "of disk space"
-msgstr "af diskpladsen"
+#: ViewMessages.cpp:106 ViewMessages.cpp:502
+msgid "Show only this project"
+msgstr "Vis kun dette projekt"
 
-#: clientgui/sg_DlgPreferences.cpp:389
-msgid "of the processor"
-msgstr "af processoren"
+#: ViewMessages.cpp:107 ViewMessages.cpp:503
+msgid "Show only the messages for the selected project."
+msgstr "Vis kun beskeder for det valgte projekt."
 
-#: clientgui/sg_DlgPreferences.cpp:393
-msgid "Do work while on battery?"
-msgstr "Udfør arbejde på batterier?"
+#: ViewMessages.cpp:164
+msgid "Messages"
+msgstr "Beskeder"
 
-#: clientgui/sg_DlgPreferences.cpp:406
-msgid "Do work after idle for:"
-msgstr "Udfør arbejde efter computeren har været ubrugt i:"
-
-#: clientgui/sg_DlgPreferences.cpp:431
-msgid "Clear all local preferences listed above and close the dialog"
-msgstr "Nulstil alle lokale indstillinger herover og luk dialogboksen"
-
-#: clientgui/sg_DlgPreferences.cpp:609
-#: clientgui/sg_DlgPreferences.cpp:612
-#: clientgui/sg_DlgPreferences.cpp:688
-#: clientgui/sg_DlgPreferences.cpp:692
-#: clientgui/sg_DlgPreferences.cpp:704
-#: clientgui/sg_DlgPreferences.cpp:708
-#: clientgui/sg_DlgPreferences.cpp:851
-#: clientgui/sg_DlgPreferences.cpp:862
-msgid "Anytime"
-msgstr "Til hver en tid"
-
-#: clientgui/sg_DlgPreferences.cpp:645
-msgid "100 MB"
-msgstr "100 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:646
-msgid "200 MB"
-msgstr "200 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:647
-msgid "500 MB"
-msgstr "500 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:648
-msgid "1 GB"
-msgstr "1 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:649
-msgid "2 GB"
-msgstr "2 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:650
-msgid "5 GB"
-msgstr "5 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:651
-msgid "10 GB"
-msgstr "10 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:652
-msgid "20 GB"
-msgstr "20 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:653
-msgid "50 GB"
-msgstr "50 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:654
-msgid "100 GB"
-msgstr "100 GB"
+#: ViewMessages.cpp:187
+msgid "Copying all messages to the clipboard..."
+msgstr "Kopierer alle beskeder til udklipsholderen …"
 
-#: clientgui/sg_DlgPreferences.cpp:724
-#, c-format
-msgid "%d MB"
-msgstr "%d MB"
+#: ViewMessages.cpp:223
+msgid "Copying selected messages to the clipboard..."
+msgstr "Kopierer de valgte beskeder til udklipsholderen …"
 
-#: clientgui/sg_DlgPreferences.cpp:726
-#, c-format
-msgid "%4.2f GB"
-msgstr "%4.2f GB"
+#: ViewMessages.cpp:286
+msgid "Filtering messages..."
+msgstr "Filtrerer beskeder …"
 
-#: clientgui/sg_DlgPreferences.cpp:767
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
+#: ViewMessages.cpp:494
+msgid "Show all messages"
+msgstr "Vis alle beskeder"
 
-#: clientgui/sg_DlgPreferences.cpp:803
-msgid "0 (Run Always)"
-msgstr "0 (Kør altid)"
+#: ViewMessages.cpp:495
+msgid "Show messages for all projects."
+msgstr "Vis beskeder fra alle projekter."
 
-#: clientgui/sg_DlgPreferences.cpp:806
-#, c-format
-msgid "%d"
-msgstr "%d"
+#: ViewNotices.cpp:58 sg_DlgMessages.cpp:124
+msgid "Fetching notices; please wait..."
+msgstr "Henter meddelelser; vent venligst …"
 
-#: clientgui/sg_DlgPreferences.cpp:953
-#, c-format
-msgid "%s - Computing Preferences"
-msgstr ""
+#: ViewNotices.cpp:65 sg_DlgMessages.cpp:132
+msgid "There are no notices at this time."
+msgstr "Der er ingen meddelelser på nuværende tidspunkt."
 
-#: clientgui/sg_DlgPreferences.cpp:1033
-msgid "Do you really want to clear all local preferences?\n"
-msgstr "Er du sikker på, at du vil nulstille alle lokale indstillinger?\n"
+#: ViewNotices.cpp:99 sg_BoincSimpleFrame.cpp:776
+msgid "Notices"
+msgstr "Meddelelser"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:66
-#: clientgui/ViewProjects.cpp:179
+#: ViewProjects.cpp:174 sg_ProjectCommandPopup.cpp:61
 msgid "Update"
 msgstr "Opdatér"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:67
-#: clientgui/ViewProjects.cpp:180
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
+#: ViewProjects.cpp:175 sg_ProjectCommandPopup.cpp:62
+msgid ""
+"Report all completed tasks, get latest credit, get latest preferences, and "
+"possibly get more tasks."
 msgstr "Rapportér alle færdige opgaver, hent seneste points, indstillinger, og hvis muligt, flere opgaver."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:73
-#: clientgui/sg_ProjectCommandPopup.cpp:129
-#: clientgui/ViewProjects.cpp:187
-#: clientgui/ViewProjects.cpp:727
+#: 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
+msgid "Suspend"
+msgstr "Suspendér"
+
+#: ViewProjects.cpp:182 ViewProjects.cpp:722 sg_ProjectCommandPopup.cpp:68
+#: sg_ProjectCommandPopup.cpp:114
 msgid "Suspend tasks for this project."
 msgstr "Suspendér opgaver for dette projekt."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:78
-#: clientgui/sg_ProjectCommandPopup.cpp:136
-#: clientgui/ViewProjects.cpp:193
-#: clientgui/ViewProjects.cpp:746
+#: ViewProjects.cpp:188 ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:73
+#: sg_ProjectCommandPopup.cpp:121
 msgid "No new tasks"
 msgstr "Ingen nye opgaver"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:79
-#: clientgui/ViewProjects.cpp:194
+#: ViewProjects.cpp:189 sg_ProjectCommandPopup.cpp:74
 msgid "Don't get new tasks for this project."
 msgstr "Hent ikke nye opgaver for dette projekt."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:200
+#: ViewProjects.cpp:195 sg_ProjectCommandPopup.cpp:79
 msgid "Reset project"
 msgstr "Nulstil projekt"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:85
-#: clientgui/ViewProjects.cpp:201
-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."
+#: ViewProjects.cpp:196 sg_ProjectCommandPopup.cpp:80
+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 "Sletter alle filer og opgaver tilhørende dette projekt og henter nye opgaver. Du kan opdatere projektet først for at rapportere eventuelle færdige opgaver."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:91
-#: clientgui/ViewProjects.cpp:208
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
+#: ViewProjects.cpp:203 sg_ProjectCommandPopup.cpp:86
+msgid ""
+"Remove this project.  Tasks in progress will be lost (use 'Update' first to "
+"report any completed tasks)."
 msgstr "Fjerner dette projekt. Igangværende opgaver vil blive tabt (brug \"Opdatér\" først for at rapportere eventuelle færdige opgaver)."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:96
-#: clientgui/sg_TaskCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:214
+#: ViewProjects.cpp:209 ViewWork.cpp:222 sg_ProjectCommandPopup.cpp:91
+#: sg_TaskCommandPopup.cpp:78
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:97
-#: clientgui/ViewProjects.cpp:215
+#: ViewProjects.cpp:210 sg_ProjectCommandPopup.cpp:92
 msgid "Show project details."
 msgstr "Vis projektdetajler."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:126
-#: clientgui/ViewProjects.cpp:723
-msgid "Resume tasks for this project."
-msgstr "Genoptag opgaver for dette projekt."
+#: ViewProjects.cpp:220 ViewStatistics.cpp:450
+msgid "Account"
+msgstr "Konto"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:133
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow new tasks"
-msgstr "Tillad nye opgaver"
+#: ViewProjects.cpp:222
+msgid "Work done"
+msgstr "Udført arbejde"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:134
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow fetching new tasks for this project."
-msgstr "Tillad hentning af nye opgaver for dette projekt."
+#: ViewProjects.cpp:223
+msgid "Avg. work done"
+msgstr "Gennemsnitligt udført arbejde"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:137
-#: clientgui/ViewProjects.cpp:746
-msgid "Don't fetch new tasks for this project."
-msgstr "Hent ikke nye opgaver for dette projekt."
+#: ViewProjects.cpp:225 ViewTransfers.cpp:188 ViewWork.cpp:234
+msgid "Status"
+msgstr "Status"
+
+#: ViewProjects.cpp:250
+msgid "Projects"
+msgstr "Projekter"
+
+#: ViewProjects.cpp:302
+msgid "Updating project..."
+msgstr "Opdaterer projekt …"
+
+#: ViewProjects.cpp:344
+msgid "Resuming project..."
+msgstr "Genoptager projekt …"
+
+#: ViewProjects.cpp:348
+msgid "Suspending project..."
+msgstr "Suspenderer projekt …"
+
+#: ViewProjects.cpp:385
+msgid "Telling project to allow additional task downloads..."
+msgstr "Tillader projektet at sende flere opgaver …"
+
+#: ViewProjects.cpp:389
+msgid "Telling project to not fetch any additional tasks..."
+msgstr "Beder projektet om ikke at sende flere opgaver …"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:229
-#: clientgui/ViewProjects.cpp:443
+#: ViewProjects.cpp:425
+msgid "Resetting project..."
+msgstr "Nulstiller projekt …"
+
+#: ViewProjects.cpp:438 sg_ProjectCommandPopup.cpp:214
 #, c-format
 msgid "Are you sure you want to reset project '%s'?"
 msgstr "Er du sikker på, at du vil nulstille projektet \"%s\"?"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:235
-#: clientgui/ViewProjects.cpp:449
+#: ViewProjects.cpp:444 sg_ProjectCommandPopup.cpp:220
 msgid "Reset Project"
 msgstr "Nulstil projekt"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:266
-#: clientgui/ViewProjects.cpp:501
+#: ViewProjects.cpp:483
+msgid "Removing project..."
+msgstr "Fjerner projekt …"
+
+#: ViewProjects.cpp:496 sg_ProjectCommandPopup.cpp:251
 #, c-format
 msgid "Are you sure you want to remove project '%s'?"
 msgstr "Er du sikker på, at du vil fjerne projektet \"%s\"?"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:272
-#: clientgui/ViewProjects.cpp:507
+#: ViewProjects.cpp:502 sg_ProjectCommandPopup.cpp:257
 msgid "Remove Project"
 msgstr "Fjern projekt"
 
-#: clientgui/sg_ProjectPanel.cpp:72
-msgid "Add Project"
-msgstr "Tilføj projekt"
+#: ViewProjects.cpp:543 ViewWork.cpp:599
+msgid "Launching browser..."
+msgstr "Starter browser …"
 
-#: clientgui/sg_ProjectPanel.cpp:73
-msgid "Synchronize"
-msgstr "Synkronisér"
+#: ViewProjects.cpp:718 sg_ProjectCommandPopup.cpp:111
+msgid "Resume tasks for this project."
+msgstr "Genoptag opgaver for dette projekt."
 
-#: clientgui/sg_ProjectPanel.cpp:74
-msgid "Work done for this project"
-msgstr "Udført arbejde for dette projekt"
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:118
+msgid "Allow new tasks"
+msgstr "Tillad nye opgaver"
 
-#: clientgui/sg_ProjectPanel.cpp:77
-msgid "Synchronize projects with account manager system"
-msgstr "Synkronisér projekter med kontohåndteringssystem"
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:119
+msgid "Allow fetching new tasks for this project."
+msgstr "Tillad hentning af nye opgaver for dette projekt."
 
-#: clientgui/sg_ProjectPanel.cpp:124
-msgid "Select a project to access with the controls below"
-msgstr "Vælg et projekt, der skal tilgås med knapperne herunder"
+#: ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:122
+msgid "Don't fetch new tasks for this project."
+msgstr "Hent ikke nye opgaver for dette projekt."
 
-# 88%
-#: clientgui/sg_ProjectPanel.cpp:145
-msgid "Project Web Pages"
-msgstr "Projektwebsider"
+#: ViewProjects.cpp:1058
+msgid "Requested by user"
+msgstr "Forespurgt af bruger"
 
-#: clientgui/sg_ProjectPanel.cpp:149
-msgid "Project Commands"
-msgstr "Projektkommandoer"
+#: ViewProjects.cpp:1059
+msgid "To fetch work"
+msgstr "For at hende arbejde"
 
-#: clientgui/sg_ProjectPanel.cpp:276
-#, c-format
-msgid "Pop up a menu of web sites for project %s"
-msgstr "Vis en pop op-menu med hjemmesider for projektet %s"
+#: ViewProjects.cpp:1060
+msgid "To report completed tasks"
+msgstr "For at rapportere færdiggjorte opgaver"
 
-#: clientgui/sg_ProjectPanel.cpp:278
-#, c-format
-msgid "Pop up a menu of commands to apply to project %s"
-msgstr "Vis en menu med kommandoer for projektet %s"
+#: ViewProjects.cpp:1061
+msgid "To send trickle-up message"
+msgstr "For at sende sivebesked til server"
 
-#: clientgui/sg_TaskCommandPopup.cpp:66
-msgid "Show graphics"
-msgstr "Vis grafik"
+#: ViewProjects.cpp:1062
+msgid "Requested by account manager"
+msgstr "Forespurgt af kontohåndtering"
 
-#: clientgui/sg_TaskCommandPopup.cpp:67
-msgid "Show application graphics in a window."
-msgstr "Viser applikationsgrafik i et vindue."
+#: ViewProjects.cpp:1063
+msgid "Project initialization"
+msgstr "Projektinitialisering"
 
-#: clientgui/sg_TaskCommandPopup.cpp:73
-msgid "Suspend this task."
-msgstr "Suspendér denne opgave."
+#: ViewProjects.cpp:1064
+msgid "Requested by project"
+msgstr "Forespurgt af projekt"
 
-#: clientgui/sg_TaskCommandPopup.cpp:78
-msgid "Abort"
-msgstr "Afbryd"
+#: ViewProjects.cpp:1065
+msgid "Unknown reason"
+msgstr "Ukendt begrundelse"
 
-#: clientgui/sg_TaskCommandPopup.cpp:79
-msgid "Abandon this task. You will get no credit for it."
-msgstr "Opgiv denne opgave. Du vil ikke modtage points for den."
+#: ViewProjects.cpp:1079
+msgid "Suspended by user"
+msgstr "Suspenderet af bruger"
 
-#: clientgui/sg_TaskCommandPopup.cpp:85
-msgid "Show task details."
-msgstr "Vis detaljer for opgave."
+#: ViewProjects.cpp:1082
+msgid "Won't get new tasks"
+msgstr "Henter ikke nye opgaver"
 
-#: clientgui/sg_TaskCommandPopup.cpp:119
-msgid "Resume work for this task."
-msgstr "Genoptag arbejde for denne opgave."
+#: ViewProjects.cpp:1085
+msgid "Project ended - OK to remove"
+msgstr "Projektet er slut – det er OK af fjerne"
 
-#: clientgui/sg_TaskCommandPopup.cpp:123
-msgid "Suspend work for this task."
-msgstr "Suspendér arbejde for denne opgave."
+#: ViewProjects.cpp:1088
+msgid "Will remove when tasks done"
+msgstr "Fjernes når opgaver er færdige"
 
-#: clientgui/sg_TaskCommandPopup.cpp:267
-#, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %.1lf%%, Status: %s)"
-msgstr ""
-"Er du sikker på, at du vil afbryde denne opgave \"%s\"?\n"
-"(Udført: %.1lf%%, Status: %s)"
+#: ViewProjects.cpp:1091
+msgid "Scheduler request pending"
+msgstr "Planlægger-forespørgsel afventer"
 
-#: clientgui/sg_TaskCommandPopup.cpp:272
-msgid "Abort task"
-msgstr "Afbryd opgave"
+#: ViewProjects.cpp:1097
+msgid "Scheduler request in progress"
+msgstr "Planlægger-forespørgsel igang"
 
-#: clientgui/sg_TaskPanel.cpp:468
-msgid "You don't have any projects.  Please Add a Project."
-msgstr "Du har ingen projekter. Tilføj venligst et projekt."
+#: ViewProjects.cpp:1100
+msgid "Trickle up message pending"
+msgstr "Sivebesked til server afventer"
 
-#: clientgui/sg_TaskPanel.cpp:469
-msgid "Not available"
-msgstr "Ikke tilgængelig"
+#: ViewProjects.cpp:1106
+msgid "Communication deferred "
+msgstr "Kommunikation udsat "
 
-#: clientgui/sg_TaskPanel.cpp:480
-msgid "Tasks:"
-msgstr "Opgaver:"
+#: ViewResources.cpp:62
+msgid "Total disk usage"
+msgstr "Total diskforbrug"
 
-#: clientgui/sg_TaskPanel.cpp:486
-msgid "Select a task to access"
-msgstr "Vælg en opgave at tilgå"
+#: ViewResources.cpp:83
+msgid "Disk usage by BOINC projects"
+msgstr "Diskforbrug af BOINC-projekter"
 
-#: clientgui/sg_TaskPanel.cpp:497
-msgid "From:"
-msgstr "Fra:"
+#: ViewResources.cpp:116
+msgid "Disk"
+msgstr "Disk"
 
-#: clientgui/sg_TaskPanel.cpp:551
-msgid "This task's progress"
-msgstr "Denne opgaves fremgang"
+#: ViewResources.cpp:249
+msgid "no projects: 0 bytes used"
+msgstr "ingen projekter: 0 bytes brugt"
 
-#: clientgui/sg_TaskPanel.cpp:569
-msgid "Task Commands"
-msgstr "Opgavekommandoer"
+#: ViewResources.cpp:286
+msgid "used by BOINC: "
+msgstr "brugt af BOINC: "
 
-#: clientgui/sg_TaskPanel.cpp:570
-msgid "Pop up a menu of commands to apply to this task"
-msgstr "Vis en menu med kommandoer for denne opgave"
+#: ViewResources.cpp:296
+msgid "free, available to BOINC: "
+msgstr "fri, tilgængeligt for BOINC: "
 
-#: clientgui/sg_TaskPanel.cpp:705
-#, c-format
-msgid "Application: %s"
-msgstr "Applikation: %s"
+#: ViewResources.cpp:306
+msgid "free, not available to BOINC: "
+msgstr "fri, ikke tilgængeligt for BOINC: "
 
-#: clientgui/sg_TaskPanel.cpp:728
-#, c-format
-msgid "%.3f%%"
-msgstr "%.3f%%"
+#: ViewResources.cpp:316
+msgid "free: "
+msgstr "fri: "
 
-#: clientgui/sg_TaskPanel.cpp:736
-msgid "Application: Not available"
-msgstr "Applikation: ikke tilgængelig"
+#: ViewResources.cpp:326
+msgid "used by other programs: "
+msgstr "brugt af andre programmer: "
 
-#: clientgui/sg_TaskPanel.cpp:836
-msgid "Not Available"
-msgstr "Ikke tilgængelig"
+#: ViewStatistics.cpp:1205
+msgid "User Total"
+msgstr "Bruger-total"
 
-#: clientgui/sg_TaskPanel.cpp:851
-#, c-format
-msgid "Elapsed: %s"
-msgstr "Forløbet: %s"
+#: ViewStatistics.cpp:1206
+msgid "User Average"
+msgstr "Brugergennemsnit"
 
-# 84%
-#: clientgui/sg_TaskPanel.cpp:865
-#, c-format
-msgid "Remaining (estimated): %s"
-msgstr "Resterende (estimeret): %s"
-
-#: clientgui/sg_TaskPanel.cpp:880
-#, c-format
-msgid "Status: %s"
-msgstr "Status: %s"
-
-#: clientgui/sg_TaskPanel.cpp:1227
-msgid "Retrieving current status."
-msgstr "Henter nuværende status."
-
-#: clientgui/sg_TaskPanel.cpp:1233
-msgid "Downloading work from the server."
-msgstr "Henter arbejde fra serveren."
-
-#: clientgui/sg_TaskPanel.cpp:1238
-msgid "Processing Suspended:  Running On Batteries."
-msgstr "Beregning suspenderet: Kører på batterier."
-
-#: clientgui/sg_TaskPanel.cpp:1240
-msgid "Processing Suspended:  User Active."
-msgstr "Beregning suspenderet: Bruger er aktiv."
-
-#: clientgui/sg_TaskPanel.cpp:1242
-msgid "Processing Suspended:  User paused processing."
-msgstr "Beregning suspenderet: Bruger satte beregning på pause."
-
-#: clientgui/sg_TaskPanel.cpp:1244
-msgid "Processing Suspended:  Time of Day."
-msgstr "Beregning suspenderet: Tidspunkt på dagen."
-
-#: clientgui/sg_TaskPanel.cpp:1246
-msgid "Processing Suspended:  Benchmarks Running."
-msgstr "Beregning suspenderet: Ydelsesmåling kører."
-
-#: clientgui/sg_TaskPanel.cpp:1248
-msgid "Processing Suspended."
-msgstr "Beregning suspenderet."
-
-#: clientgui/sg_TaskPanel.cpp:1252
-msgid "Waiting to contact project servers."
-msgstr "Venter på at kontakte projektservere."
-
-#: clientgui/sg_TaskPanel.cpp:1256
-#: clientgui/sg_TaskPanel.cpp:1265
-msgid "Retrieving current status"
-msgstr "Henter nuværende status"
-
-#: clientgui/sg_TaskPanel.cpp:1260
-msgid "No work available to process"
-msgstr "Intet arbejde tilgængeligt"
-
-#: clientgui/sg_TaskPanel.cpp:1262
-msgid "Unable to connect to the core client"
-msgstr "Kan ikke forbinde til kerneklienten"
-
-#: clientgui/TermsOfUsePage.cpp:218
-msgid "Terms of Use"
-msgstr "Brugsvilkår"
-
-#: clientgui/TermsOfUsePage.cpp:222
-msgid "Please read the following terms of use:"
-msgstr "Læs venligst følgende brugsvilkår:"
-
-#: clientgui/TermsOfUsePage.cpp:231
-msgid "I agree to the terms of use."
-msgstr "Jeg er enig i brugsvilkårene."
-
-#: clientgui/TermsOfUsePage.cpp:237
-msgid "I do not agree to the terms of use."
-msgstr "Jeg er ikke enig i brugsvilkårene."
-
-#: clientgui/UnavailablePage.cpp:183
-msgid "Project temporarily unavailable"
-msgstr "Projektet er midlertidigt utilgængeligt"
-
-#: clientgui/UnavailablePage.cpp:186
-msgid ""
-"The project is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-"Projektet er midlertidigt utilgængeligt.\n"
-"\n"
-"Prøv venligst igen senere."
-
-#: clientgui/UnavailablePage.cpp:190
-msgid "Account manager temporarily unavailable"
-msgstr "Kontohåndteringen er midlertidigt utilgængelig"
-
-#: clientgui/UnavailablePage.cpp:193
-msgid ""
-"The account manager is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-"Kontohåndteringen er midlertidigt utilgængelig.\n"
-"\n"
-"Prøv venligst igen senere."
-
-#: clientgui/ValidateAccountKey.cpp:68
-msgid "Please specify an account key to continue."
-msgstr "Angiv venligst en kontonøgle for at fortsætte."
-
-#: clientgui/ValidateAccountKey.cpp:71
-msgid "Invalid Account Key; please enter a valid Account Key"
-msgstr "Ugyldig kontonøgle; Indtast venligst en gyldig kontonøgle"
-
-#: clientgui/ValidateAccountKey.cpp:82
-#: clientgui/ValidateEmailAddress.cpp:86
-msgid "Validation conflict"
-msgstr "Valideringskonflikt"
-
-#: clientgui/ValidateEmailAddress.cpp:72
-msgid "Please specify an email address"
-msgstr "Angiv venligst en emailadresse"
-
-#: clientgui/ValidateEmailAddress.cpp:75
-msgid "Invalid email address; please enter a valid email address"
-msgstr "Ugyldig emailadresse; Indtast venligst en gyldig emailadresse"
-
-#: clientgui/ValidateURL.cpp:69
-msgid "Missing URL"
-msgstr "Manglende URL"
-
-#: clientgui/ValidateURL.cpp:70
-msgid ""
-"Please specify a URL.\n"
-"For example:\n"
-"http://www.example.com/"
-msgstr ""
-"Angiv venligst en URL.\n"
-"For eksempel:\n"
-"http://www.eksempel.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 "Ugyldig 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 ""
-"Angiv venligst en gyldig URL.\n"
-"For eksempel:\n"
-"http://boincprojekt.eksempel.com"
-
-#: clientgui/ValidateURL.cpp:104
-#: clientgui/ValidateURL.cpp:108
-#, c-format
-msgid "'%s' does not contain a valid host name."
-msgstr "\"%s\" indeholder ikke et gyldigt værtsnavn."
-
-#: clientgui/ValidateURL.cpp:111
-#, c-format
-msgid "'%s' does not contain a valid path."
-msgstr "\"%s\" indeholder ikke en gyldig sti."
-
-#: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:175
-msgid "Commands"
-msgstr "Kommandoer"
-
-#: clientgui/ViewMessages.cpp:88
-msgid "Copy all messages"
-msgstr "Kopiér alle beskeder"
-
-#: clientgui/ViewMessages.cpp:95
-msgid "Copy selected messages"
-msgstr "Kopier valgte beskeder"
-
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
-msgid "Show only this project"
-msgstr "Vis kun dette projekt"
-
-#: clientgui/ViewMessages.cpp:107
-#: clientgui/ViewMessages.cpp:503
-msgid "Show only the messages for the selected project."
-msgstr "Vis kun beskeder for det valgte projekt."
-
-#: clientgui/ViewMessages.cpp:164
-msgid "Messages"
-msgstr "Beskeder"
-
-#: clientgui/ViewMessages.cpp:187
-msgid "Copying all messages to the clipboard..."
-msgstr "Kopierer alle beskeder til udklipsholderen …"
-
-#: clientgui/ViewMessages.cpp:223
-msgid "Copying selected messages to the clipboard..."
-msgstr "Kopierer de valgte beskeder til udklipsholderen …"
-
-#: clientgui/ViewMessages.cpp:286
-msgid "Filtering messages..."
-msgstr "Filtrerer beskeder …"
-
-#: clientgui/ViewMessages.cpp:494
-msgid "Show all messages"
-msgstr "Vis alle beskeder"
-
-#: clientgui/ViewMessages.cpp:495
-msgid "Show messages for all projects."
-msgstr "Vis beskeder fra alle projekter."
-
-#: clientgui/ViewProjects.cpp:225
-msgid "Account"
-msgstr "Konto"
-
-#: clientgui/ViewProjects.cpp:227
-msgid "Work done"
-msgstr "Udført arbejde"
-
-#: clientgui/ViewProjects.cpp:228
-msgid "Avg. work done"
-msgstr "Gennemsnitligt udført arbejde"
-
-#: clientgui/ViewProjects.cpp:230
-msgid "Status"
-msgstr "Status"
-
-#: clientgui/ViewProjects.cpp:255
-msgid "Projects"
-msgstr "Projekter"
-
-#: clientgui/ViewProjects.cpp:307
-msgid "Updating project..."
-msgstr "Opdaterer projekt …"
-
-#: clientgui/ViewProjects.cpp:349
-msgid "Resuming project..."
-msgstr "Genoptager projekt …"
-
-#: clientgui/ViewProjects.cpp:353
-msgid "Suspending project..."
-msgstr "Suspenderer projekt …"
-
-#: clientgui/ViewProjects.cpp:390
-msgid "Telling project to allow additional task downloads..."
-msgstr "Tillader projektet at sende flere opgaver …"
-
-#: clientgui/ViewProjects.cpp:394
-msgid "Telling project to not fetch any additional tasks..."
-msgstr "Beder projektet om ikke at sende flere opgaver …"
-
-#: clientgui/ViewProjects.cpp:430
-msgid "Resetting project..."
-msgstr "Nulstiller projekt …"
-
-#: clientgui/ViewProjects.cpp:488
-msgid "Removing project..."
-msgstr "Fjerner projekt …"
-
-#: clientgui/ViewProjects.cpp:548
-msgid "Launching browser..."
-msgstr "Starter browser …"
-
-#: clientgui/ViewProjects.cpp:1063
-msgid "Requested by user"
-msgstr "Forespurgt af bruger"
-
-#: clientgui/ViewProjects.cpp:1064
-msgid "To fetch work"
-msgstr "For at hende arbejde"
-
-#: clientgui/ViewProjects.cpp:1065
-msgid "To report completed tasks"
-msgstr "For at rapportere færdiggjorte opgaver"
-
-#: clientgui/ViewProjects.cpp:1066
-msgid "To send trickle-up message"
-msgstr "For at sende sivebesked til server"
-
-#: clientgui/ViewProjects.cpp:1067
-msgid "Requested by account manager"
-msgstr "Forespurgt af kontohåndtering"
-
-#: clientgui/ViewProjects.cpp:1068
-msgid "Project initialization"
-msgstr "Projektinitialisering"
-
-#: clientgui/ViewProjects.cpp:1069
-msgid "Requested by project"
-msgstr "Forespurgt af projekt"
-
-#: clientgui/ViewProjects.cpp:1070
-msgid "Unknown reason"
-msgstr "Ukendt begrundelse"
-
-#: clientgui/ViewProjects.cpp:1084
-msgid "Suspended by user"
-msgstr "Suspenderet af bruger"
-
-#: clientgui/ViewProjects.cpp:1087
-msgid "Won't get new tasks"
-msgstr "Henter ikke nye opgaver"
-
-#: clientgui/ViewProjects.cpp:1090
-msgid "Project ended - OK to remove"
-msgstr "Projektet er slut – det er OK af fjerne"
-
-#: clientgui/ViewProjects.cpp:1093
-msgid "Will remove when tasks done"
-msgstr "Fjernes når opgaver er færdige"
-
-#: clientgui/ViewProjects.cpp:1096
-msgid "Scheduler request pending"
-msgstr "Planlægger-forespørgsel afventer"
-
-#: clientgui/ViewProjects.cpp:1102
-msgid "Scheduler request in progress"
-msgstr "Planlægger-forespørgsel igang"
-
-#: clientgui/ViewProjects.cpp:1105
-msgid "Trickle up message pending"
-msgstr "Sivebesked til server afventer"
-
-#: clientgui/ViewProjects.cpp:1111
-msgid "Communication deferred "
-msgstr "Kommunikation udsat "
-
-#: clientgui/ViewResources.cpp:62
-msgid "Total disk usage"
-msgstr "Total diskforbrug"
-
-#: clientgui/ViewResources.cpp:83
-msgid "Disk usage by BOINC projects"
-msgstr "Diskforbrug af BOINC-projekter"
-
-#: clientgui/ViewResources.cpp:116
-msgid "Disk"
-msgstr "Disk"
-
-#: clientgui/ViewResources.cpp:225
-msgid "no projects: 0 bytes used"
-msgstr "ingen projekter: 0 bytes brugt"
-
-#: clientgui/ViewResources.cpp:262
-msgid "used by BOINC: "
-msgstr "brugt af BOINC: "
-
-#: clientgui/ViewResources.cpp:272
-msgid "free, available to BOINC: "
-msgstr "fri, tilgængeligt for BOINC: "
-
-#: clientgui/ViewResources.cpp:282
-msgid "free, not available to BOINC: "
-msgstr "fri, ikke tilgængeligt for BOINC: "
-
-#: clientgui/ViewResources.cpp:292
-msgid "free: "
-msgstr "fri: "
-
-#: clientgui/ViewResources.cpp:302
-msgid "used by other programs: "
-msgstr "brugt af andre programmer: "
-
-#: clientgui/ViewStatistics.cpp:1181
-msgid "User Total"
-msgstr "Bruger-total"
-
-#: clientgui/ViewStatistics.cpp:1182
-msgid "User Average"
-msgstr "Brugergennemsnit"
-
-#: clientgui/ViewStatistics.cpp:1183
+#: ViewStatistics.cpp:1207
 msgid "Host Total"
 msgstr "Vært-total"
 
-#: clientgui/ViewStatistics.cpp:1184
+#: ViewStatistics.cpp:1208
 msgid "Host Average"
 msgstr "Værtsgennemsnit"
 
-#: clientgui/ViewStatistics.cpp:1331
+#: ViewStatistics.cpp:1355
 #, c-format
 msgid "Last update: %.0f days ago"
 msgstr "Seneste opdatering: %.0f dage siden"
 
-#: clientgui/ViewStatistics.cpp:1956
+#: ViewStatistics.cpp:1982
 msgid "Show user total"
 msgstr "Vis bruger-total"
 
-#: clientgui/ViewStatistics.cpp:1957
+#: ViewStatistics.cpp:1983
 msgid "Show total credit for user"
 msgstr "Vis total antal points for bruger"
 
-#: clientgui/ViewStatistics.cpp:1963
+#: ViewStatistics.cpp:1989
 msgid "Show user average"
 msgstr "Vis brugergennemsnit"
 
-#: clientgui/ViewStatistics.cpp:1964
+#: ViewStatistics.cpp:1990
 msgid "Show average credit for user"
 msgstr "Vis løbende gennemsnitspoint for bruger"
 
-#: clientgui/ViewStatistics.cpp:1970
+#: ViewStatistics.cpp:1996
 msgid "Show host total"
 msgstr "Vis vært-total"
 
-#: clientgui/ViewStatistics.cpp:1971
+#: ViewStatistics.cpp:1997
 msgid "Show total credit for host"
 msgstr "Vis total antal points for vært"
 
-#: clientgui/ViewStatistics.cpp:1977
+#: ViewStatistics.cpp:2003
 msgid "Show host average"
 msgstr "Vis værtsgennemsnit"
 
-#: clientgui/ViewStatistics.cpp:1978
+#: ViewStatistics.cpp:2004
 msgid "Show average credit for host"
 msgstr "Vis løbende gennemsnitspoint for vært"
 
-#: clientgui/ViewStatistics.cpp:1987
+#: ViewStatistics.cpp:2013
 msgid "< &Previous project"
 msgstr "< &Forrige projekt"
 
-#: clientgui/ViewStatistics.cpp:1988
+#: ViewStatistics.cpp:2014
 msgid "Show chart for previous project"
 msgstr "Vis graf for det forrige projekt"
 
-#: clientgui/ViewStatistics.cpp:1993
+#: ViewStatistics.cpp:2019
 msgid "&Next project >"
 msgstr "&Næste projekt >"
 
-#: clientgui/ViewStatistics.cpp:1994
+#: ViewStatistics.cpp:2020
 msgid "Show chart for next project"
 msgstr "Vis graf for det næste projekt"
 
-#: clientgui/ViewStatistics.cpp:2000
-#: clientgui/ViewStatistics.cpp:2390
+#: ViewStatistics.cpp:2026 ViewStatistics.cpp:2416
 msgid "Hide project list"
 msgstr "Gem projektliste"
 
-#: clientgui/ViewStatistics.cpp:2001
-#: clientgui/ViewStatistics.cpp:2390
+#: ViewStatistics.cpp:2027 ViewStatistics.cpp:2416
 msgid "Use entire area for graphs"
 msgstr "Brug hele området til grafer"
 
-#: clientgui/ViewStatistics.cpp:2006
+#: ViewStatistics.cpp:2032
 msgid "Mode view"
 msgstr "Tilstandsvisning"
 
-#: clientgui/ViewStatistics.cpp:2010
+#: ViewStatistics.cpp:2036
 msgid "One project"
 msgstr "Et projekt"
 
-#: clientgui/ViewStatistics.cpp:2011
+#: ViewStatistics.cpp:2037
 msgid "Show one chart with selected project"
 msgstr "Vis en graf over valgt projekt"
 
-#: clientgui/ViewStatistics.cpp:2017
+#: ViewStatistics.cpp:2043
 msgid "All projects (separate)"
 msgstr "Alle projekter (separat)"
 
-#: clientgui/ViewStatistics.cpp:2018
+#: ViewStatistics.cpp:2044
 msgid "Show all projects, one chart per project"
 msgstr "Vis alle projekter, en graf for hvert"
 
-#: clientgui/ViewStatistics.cpp:2024
+#: ViewStatistics.cpp:2050
 msgid "All projects (together)"
 msgstr "Alle projekter (sammen)"
 
-#: clientgui/ViewStatistics.cpp:2025
+#: ViewStatistics.cpp:2051
 msgid "Show one chart with all projects"
 msgstr "Vis en graf med alle projekter"
 
-#: clientgui/ViewStatistics.cpp:2031
+#: ViewStatistics.cpp:2057
 msgid "All projects (sum)"
 msgstr "Alle projekter (sum)"
 
-#: clientgui/ViewStatistics.cpp:2032
+#: ViewStatistics.cpp:2058
 msgid "Show one chart with sum of projects"
 msgstr "Vis en graf med sum for alle projekter"
 
-#: clientgui/ViewStatistics.cpp:2053
+#: ViewStatistics.cpp:2079
 msgid "Statistics"
 msgstr "Statistik"
 
-#: 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
+#: 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
 msgid "Updating charts..."
 msgstr "Opdaterer grafer …"
 
-#: clientgui/ViewStatistics.cpp:2394
+#: ViewStatistics.cpp:2420
 msgid "Show project list"
 msgstr "Vis projektliste"
 
-#: clientgui/ViewStatistics.cpp:2394
+#: ViewStatistics.cpp:2420
 msgid "Uses smaller area for graphs"
 msgstr "Bruger mindre område for grafer"
 
-#: clientgui/ViewTransfers.cpp:169
+#: ViewTransfers.cpp:164
 msgid "Retry Now"
 msgstr "Prøv igen nu"
 
-#: clientgui/ViewTransfers.cpp:170
+#: ViewTransfers.cpp:165
 msgid "Retry the file transfer now"
 msgstr "Prøv filoverførslen nu"
 
-#: clientgui/ViewTransfers.cpp:176
+#: ViewTransfers.cpp:171
 msgid "Abort Transfer"
 msgstr "Afbryd overførsel"
 
-#: clientgui/ViewTransfers.cpp:177
+#: ViewTransfers.cpp:172
 msgid "Abort this file transfer.  You won't get credit for the task."
 msgstr "Afbryd denne filoverførsel. Du får ikke points for opgaven."
 
-#: clientgui/ViewTransfers.cpp:188
+#: ViewTransfers.cpp:183
 msgid "File"
 msgstr "Fil"
 
-#: clientgui/ViewTransfers.cpp:189
-#: clientgui/ViewWork.cpp:238
+#: ViewTransfers.cpp:184 ViewWork.cpp:233
 msgid "Progress"
 msgstr "Udført"
 
-#: clientgui/ViewTransfers.cpp:190
+#: ViewTransfers.cpp:185
 msgid "Size"
 msgstr "Størrelse"
 
-#: clientgui/ViewTransfers.cpp:191
+#: ViewTransfers.cpp:186
 msgid "Elapsed Time"
 msgstr "Forløben tid"
 
-#: clientgui/ViewTransfers.cpp:192
+#: ViewTransfers.cpp:187
 msgid "Speed"
 msgstr "Hastighed"
 
-#: clientgui/ViewTransfers.cpp:218
+#: ViewTransfers.cpp:213
 msgid "Transfers"
 msgstr "Overførsler"
 
-#: clientgui/ViewTransfers.cpp:285
+#: ViewTransfers.cpp:280
 msgid "Network activity is suspended - "
 msgstr "Netværksaktivitet er suspenderet – "
 
-#: clientgui/ViewTransfers.cpp:287
+#: ViewTransfers.cpp:282
 msgid ""
 ".\n"
 "You can enable it using the Activity menu."
-msgstr ""
-".\n"
-"Du kan slå det til vha. menuen Aktivitet."
+msgstr ".\nDu kan slå det til vha. menuen Aktivitet."
 
-#: clientgui/ViewTransfers.cpp:290
+#: ViewTransfers.cpp:285
 msgid "BOINC"
 msgstr "BOINC"
 
-#: clientgui/ViewTransfers.cpp:297
+#: ViewTransfers.cpp:292
 msgid "Retrying transfer now..."
 msgstr "Prøver overførsel igen nu …"
 
-#: clientgui/ViewTransfers.cpp:335
+#: ViewTransfers.cpp:330
 msgid "Aborting transfer..."
 msgstr "Afbryder overførsel …"
 
-#: clientgui/ViewTransfers.cpp:348
+#: ViewTransfers.cpp:343
 #, 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 ""
-"Er du sikker på du vil afbryde denne filoverførsel \"%s\"?\n"
-"BEMÆRK: Hvis du afbryder en overførsel, vil opgaven\n"
-"invalideres, og du vil ikke få points for den."
+msgstr "Er du sikker på du vil afbryde denne filoverførsel \"%s\"?\nBEMÆRK: Hvis du afbryder en overførsel, vil opgaven\ninvalideres, og du vil ikke få points for den."
 
-#: clientgui/ViewTransfers.cpp:354
+#: ViewTransfers.cpp:349
 msgid "Abort File Transfer"
 msgstr "Afbryd filoverførsel"
 
-#: clientgui/ViewTransfers.cpp:785
+#: ViewTransfers.cpp:780
 msgid "Upload"
 msgstr "Upload"
 
-#: clientgui/ViewTransfers.cpp:785
+#: ViewTransfers.cpp:780
 msgid "Download"
 msgstr "Download"
 
-#: clientgui/ViewTransfers.cpp:789
+#: ViewTransfers.cpp:784
 msgid "retry in "
 msgstr "prøv igen om "
 
-#: clientgui/ViewTransfers.cpp:791
+#: ViewTransfers.cpp:786
 msgid "failed"
 msgstr "mislykkedes"
 
-#: clientgui/ViewTransfers.cpp:794
+#: ViewTransfers.cpp:789
 msgid "suspended"
 msgstr "suspenderet"
 
-#: clientgui/ViewTransfers.cpp:799
+#: ViewTransfers.cpp:794
 msgid "active"
 msgstr "aktiv"
 
-#: clientgui/ViewTransfers.cpp:801
+#: ViewTransfers.cpp:796
 msgid "pending"
 msgstr "afventer"
 
-#: clientgui/ViewTransfers.cpp:808
+#: ViewTransfers.cpp:803
 msgid " (project backoff: "
 msgstr " (projekt backoff:"
 
-#: clientgui/ViewWork.cpp:192
-#: clientgui/ViewWork.cpp:782
+#: ViewWork.cpp:187 ViewWork.cpp:777
 msgid "Show active tasks"
 msgstr "Vis aktive opgaver"
 
-#: clientgui/ViewWork.cpp:193
-#: clientgui/ViewWork.cpp:783
+#: ViewWork.cpp:188 ViewWork.cpp:778
 msgid "Show only active tasks."
 msgstr "Vis kun aktive opgaver."
 
-#: clientgui/ViewWork.cpp:206
-msgid "Show VM Console"
-msgstr "Vis VM-konsol"
+#: ViewWork.cpp:194 sg_TaskCommandPopup.cpp:60
+msgid "Show graphics"
+msgstr "Vis grafik"
+
+#: ViewWork.cpp:195 sg_TaskCommandPopup.cpp:61
+msgid "Show application graphics in a window."
+msgstr "Viser applikationsgrafik i et vindue."
+
+#: ViewWork.cpp:201
+msgid "Show VM Console"
+msgstr "Vis VM-konsol"
+
+#: ViewWork.cpp:202
+msgid "Show VM Console in a window."
+msgstr "Vis VM-konsol i et vindue."
+
+#: ViewWork.cpp:209
+msgid "Suspend work for this result."
+msgstr "Suspender arbejde for dette resultat."
+
+#: ViewWork.cpp:215 sg_TaskCommandPopup.cpp:72
+msgid "Abort"
+msgstr "Afbryd"
+
+#: ViewWork.cpp:216
+msgid "Abandon work on the result. You will get no credit for it."
+msgstr "Opgiv arbejde på resultatet. Du vil ikke få points for det."
+
+#: ViewWork.cpp:223 sg_TaskCommandPopup.cpp:79
+msgid "Show task details."
+msgstr "Vis detaljer for opgave."
+
+#: ViewWork.cpp:235
+msgid "Elapsed"
+msgstr "Forløben"
+
+#: ViewWork.cpp:236
+msgid "Remaining (estimated)"
+msgstr "Resterende (estimeret)"
+
+#: ViewWork.cpp:237
+msgid "Deadline"
+msgstr "Frist"
+
+#: ViewWork.cpp:264
+msgid "Tasks"
+msgstr "Opgaver"
+
+#: ViewWork.cpp:357
+msgid "Resuming task..."
+msgstr "Genoptager opgave …"
+
+#: ViewWork.cpp:360
+msgid "Suspending task..."
+msgstr "Suspenderer opgave …"
+
+#: ViewWork.cpp:389
+msgid "Showing graphics for task..."
+msgstr "Viser grafik for opgave …"
+
+#: ViewWork.cpp:426
+msgid "Showing VM console for task..."
+msgstr "Viser VM-konsol for opgave …"
+
+#: ViewWork.cpp:479
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %s, Status: %s)"
+msgstr "Er du sikker på, at du vil afbryde denne opgave \"%s\"?\n(Udført: %s, Status: %s)"
+
+#: ViewWork.cpp:485
+#, c-format
+msgid "Are you sure you want to abort these %d tasks?"
+msgstr "Er du sikker på, at du vil afbryde disse %d opgaver?"
+
+#: ViewWork.cpp:490 sg_TaskCommandPopup.cpp:256
+msgid "Abort task"
+msgstr "Afbryd opgave"
+
+#: ViewWork.cpp:499
+msgid "Aborting task..."
+msgstr "Afbryder opgave …"
+
+#: ViewWork.cpp:771
+msgid "Show all tasks"
+msgstr "Vis alle opgaver"
+
+#: ViewWork.cpp:772
+msgid "Show all tasks."
+msgstr "Vis alle opgaver."
+
+#: ViewWork.cpp:796 sg_TaskCommandPopup.cpp:103
+msgid "Resume work for this task."
+msgstr "Genoptag arbejde for denne opgave."
+
+#: ViewWork.cpp:802 sg_TaskCommandPopup.cpp:107
+msgid "Suspend work for this task."
+msgstr "Suspendér arbejde for denne opgave."
+
+#: WelcomePage.cpp:284
+msgid "Add project or account manager"
+msgstr "Tilføj projekt eller kontohåndtering"
+
+#: WelcomePage.cpp:288
+msgid "Add project or use BOINC Account Manager"
+msgstr "Tilføj projekt eller brug BOINC-kontohåndtering"
+
+#: 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 "Hvis det er muligt, bør du tilføje projekter fra\n%s-hjemmesiden.\n\nProjekter tilføjet via denne guide vil ikke optræde\npå eller kunne styres fra %s."
+
+#: 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 "Der er mere end 30 BOINC-baserede projekter,\nsom udfører forskning inden for mange områder af videnskaben,\nog du kan melde dig frivilligt for så mange, du ønsker.\nDu kan tilføje et projekt direkte, eller bruge\nen kontohåndteringswebside for at vælge projekter."
+
+#: 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 "Du har valgt at tilføje et nyt frivilligt beregningsprojekt eller ændre hvilke projekter,\ndu bidrager til.\n\nNogle af disse projekter køres og håndteres af World Community Grid, mens andre\nkøres og håndteres af andre forskere og organisationer. BOINC-softwaren\nkan fordele din overskydende processorkraft mellem enhver kombination af projekter.\n\nAlternativt, hvis du har registreret dig hos en BOINC-kontohåndtering, kan du bruge\ndenne til at vælge, hvilke projekter du vil stø [...]
+
+#: WelcomePage.cpp:339
+msgid "Use a BOINC Account Manager"
+msgstr "Brug en BOINC-kontohåndtering"
+
+#: WelcomePage.cpp:352
+msgid "To continue, click Next."
+msgstr "Klik Næste for at fortsætte."
+
+#: WelcomePage.cpp:358
+msgid "Add or change your World Community Grid projects"
+msgstr "Tilføj eller ændr dine World Community Grid-projekter"
+
+#: WelcomePage.cpp:361
+msgid "Add projects run by other researchers or organizations"
+msgstr "Tilføj projekter, der køres af andre forskere og organisationer"
+
+#: WizardAttach.cpp:634
+msgid "Do you really want to cancel?"
+msgstr "Er du sikker på, at du vil annullere?"
+
+#: WizardAttach.cpp:635
+msgid "Question"
+msgstr "Spørgsmål"
+
+#: sg_BoincSimpleFrame.cpp:149
+msgid "Advanced View...\tCtrl+Shift+A"
+msgstr "Avanceret visning …\tCtrl+Shift+A"
+
+#: sg_BoincSimpleFrame.cpp:150
+msgid "Display the advanced graphical interface."
+msgstr "Vis den avancerede grafiske grænseflade."
+
+#: sg_BoincSimpleFrame.cpp:157
+msgid "Skin"
+msgstr "Tema"
+
+#: sg_BoincSimpleFrame.cpp:159
+msgid "Select the appearance of the user interface."
+msgstr "Vælg udseende for brugergrænseflade."
+
+#: sg_BoincSimpleFrame.cpp:206
+#, c-format
+msgid "&%s"
+msgstr "&%s"
+
+#: sg_BoincSimpleFrame.cpp:390
+msgid "Default"
+msgstr "Standard"
+
+#: sg_BoincSimpleFrame.cpp:759
+msgid "Suspend Computing"
+msgstr "Suspendér beregning"
+
+#: sg_BoincSimpleFrame.cpp:760
+msgid "Resume Computing"
+msgstr "Genoptag beregning"
+
+#: sg_BoincSimpleFrame.cpp:777
+msgid "Open a window to view notices from projects or BOINC"
+msgstr "Åbn en vindue, for at se meddelelser fra projekter eller BOINC"
+
+#: sg_DlgMessages.cpp:146
+msgid "Close"
+msgstr "Luk"
+
+#: sg_DlgMessages.cpp:389
+#, c-format
+msgid "%s - Notices"
+msgstr "%s – Meddelelser"
+
+#: sg_DlgPreferences.cpp:268
+msgid "This dialog controls preferences for this computer only."
+msgstr "Denne dislogboks styrer kun indstillinger for denne computer."
+
+#: sg_DlgPreferences.cpp:273
+msgid "Click OK to set preferences."
+msgstr "Klik O.k. for at sætte indstillinger."
+
+#: sg_DlgPreferences.cpp:278
+msgid ""
+"Click Clear to restore web-based settings for all preferences listed below."
+msgstr "Klik Nulstil for at genskabe den webbaserede opsætning for alle indstillinger herunder."
+
+#: sg_DlgPreferences.cpp:285
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
+msgstr "For yderligere opsætning, vælg Beregningsindstillinger under Avanceret visning."
+
+#: sg_DlgPreferences.cpp:313
+msgid "Do work only between:"
+msgstr "Arbejd kun imellem:"
+
+#: sg_DlgPreferences.cpp:335
+msgid "Connect to internet only between:"
+msgstr "Forbind kun til Internet imellem:"
+
+#: sg_DlgPreferences.cpp:357 sg_DlgPreferences.cpp:374
+msgid "Use no more than:"
+msgstr "Brug ikke mere end:"
+
+#: sg_DlgPreferences.cpp:370
+msgid "of disk space"
+msgstr "af diskpladsen"
+
+#: sg_DlgPreferences.cpp:387
+msgid "of the processor"
+msgstr "af processoren"
+
+#: sg_DlgPreferences.cpp:391
+msgid "Do work while on battery?"
+msgstr "Udfør arbejde på batterier?"
+
+#: sg_DlgPreferences.cpp:404
+msgid "Do work after idle for:"
+msgstr "Udfør arbejde efter computeren har været ubrugt i:"
+
+#: sg_DlgPreferences.cpp:429
+msgid "Clear all local preferences listed above and close the dialog"
+msgstr "Nulstil alle lokale indstillinger herover og luk dialogboksen"
+
+#: 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 "Til hver en tid"
+
+#: sg_DlgPreferences.cpp:638
+msgid "100 MB"
+msgstr "100 MB"
 
-#: clientgui/ViewWork.cpp:207
-msgid "Show VM Console in a window."
-msgstr "Vis VM-konsol i et vindue."
+#: sg_DlgPreferences.cpp:639
+msgid "200 MB"
+msgstr "200 MB"
 
-#: clientgui/ViewWork.cpp:214
-msgid "Suspend work for this result."
-msgstr "Suspender arbejde for dette resultat."
+#: sg_DlgPreferences.cpp:640
+msgid "500 MB"
+msgstr "500 MB"
 
-#: clientgui/ViewWork.cpp:221
-msgid "Abandon work on the result. You will get no credit for it."
-msgstr "Opgiv arbejde på resultatet. Du vil ikke få points for det."
+#: sg_DlgPreferences.cpp:641
+msgid "1 GB"
+msgstr "1 GB"
 
-#: clientgui/ViewWork.cpp:240
-msgid "Elapsed"
-msgstr "Forløben"
+#: sg_DlgPreferences.cpp:642
+msgid "2 GB"
+msgstr "2 GB"
 
-#: clientgui/ViewWork.cpp:241
-msgid "Remaining (estimated)"
-msgstr "Resterende (estimeret)"
+#: sg_DlgPreferences.cpp:643
+msgid "5 GB"
+msgstr "5 GB"
 
-#: clientgui/ViewWork.cpp:242
-msgid "Deadline"
-msgstr "Frist"
+#: sg_DlgPreferences.cpp:644
+msgid "10 GB"
+msgstr "10 GB"
 
-#: clientgui/ViewWork.cpp:269
-msgid "Tasks"
-msgstr "Opgaver"
+#: sg_DlgPreferences.cpp:645
+msgid "20 GB"
+msgstr "20 GB"
 
-#: clientgui/ViewWork.cpp:362
-msgid "Resuming task..."
-msgstr "Genoptager opgave …"
+#: sg_DlgPreferences.cpp:646
+msgid "50 GB"
+msgstr "50 GB"
 
-#: clientgui/ViewWork.cpp:365
-msgid "Suspending task..."
-msgstr "Suspenderer opgave …"
+#: sg_DlgPreferences.cpp:647
+msgid "100 GB"
+msgstr "100 GB"
 
-#: clientgui/ViewWork.cpp:394
-msgid "Showing graphics for task..."
-msgstr "Viser grafik for opgave …"
+#: sg_DlgPreferences.cpp:717
+#, c-format
+msgid "%d MB"
+msgstr "%d MB"
 
-#: clientgui/ViewWork.cpp:431
-msgid "Showing VM console for task..."
-msgstr "Viser VM-konsol for opgave …"
+#: sg_DlgPreferences.cpp:719
+#, c-format
+msgid "%4.2f GB"
+msgstr "%4.2f GB"
 
-#: clientgui/ViewWork.cpp:484
+#: sg_DlgPreferences.cpp:760
 #, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %s, Status: %s)"
-msgstr ""
-"Er du sikker på, at du vil afbryde denne opgave \"%s\"?\n"
-"(Udført: %s, Status: %s)"
+msgid "%d%%"
+msgstr "%d%%"
+
+#: sg_DlgPreferences.cpp:796
+msgid "0 (Run Always)"
+msgstr "0 (Kør altid)"
 
-#: clientgui/ViewWork.cpp:490
+#: sg_DlgPreferences.cpp:799
 #, c-format
-msgid "Are you sure you want to abort these %d tasks?"
-msgstr "Er du sikker på, at du vil afbryde disse %d opgaver?"
+msgid "%d"
+msgstr "%d"
 
-# 75%
-#: clientgui/ViewWork.cpp:504
-msgid "Aborting task..."
-msgstr "Afbryder opgave …"
+#: sg_DlgPreferences.cpp:1029
+msgid "Do you really want to clear all local preferences?\n"
+msgstr "Er du sikker på, at du vil nulstille alle lokale indstillinger?\n"
 
-#: clientgui/ViewWork.cpp:776
-msgid "Show all tasks"
-msgstr "Vis alle opgaver"
+#: sg_ProjectPanel.cpp:72
+msgid "Add Project"
+msgstr "Tilføj projekt"
 
-#: clientgui/ViewWork.cpp:777
-msgid "Show all tasks."
-msgstr "Vis alle opgaver."
+#: sg_ProjectPanel.cpp:73
+msgid "Synchronize"
+msgstr "Synkronisér"
 
-#: clientgui/WelcomePage.cpp:284
-msgid "Add project or account manager"
-msgstr "Tilføj projekt eller kontohåndtering"
+#: sg_ProjectPanel.cpp:74
+msgid "Work done for this project"
+msgstr "Udført arbejde for dette projekt"
 
-#: clientgui/WelcomePage.cpp:288
-msgid "Add project or use BOINC Account Manager"
-msgstr "Tilføj projekt eller brug BOINC-kontohåndtering"
+#: sg_ProjectPanel.cpp:77
+msgid "Synchronize projects with account manager system"
+msgstr "Synkronisér projekter med kontohåndteringssystem"
 
-#: 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 ""
-"Hvis det er muligt, bør du tilføje projekter fra\n"
-"%s-hjemmesiden.\n"
-"\n"
-"Projekter tilføjet via denne guide vil ikke optræde\n"
-"på eller kunne styres fra %s."
+#: sg_ProjectPanel.cpp:124
+msgid "Select a project to access with the controls below"
+msgstr "Vælg et projekt, der skal tilgås med knapperne herunder"
 
-#: 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 ""
-"Der er mere end 30 BOINC-baserede projekter,\n"
-"som udfører forskning inden for mange områder af videnskaben,\n"
-"og du kan melde dig frivilligt for så mange, du ønsker.\n"
-"Du kan tilføje et projekt direkte, eller bruge\n"
-"en kontohåndteringswebside for at vælge projekter."
+#: sg_ProjectPanel.cpp:145
+msgid "Project Web Pages"
+msgstr "Projektwebsider"
 
-#: 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 ""
-"Du har valgt at tilføje et nyt frivilligt beregningsprojekt eller ændre hvilke projekter,\n"
-"du bidrager til.\n"
-"\n"
-"Nogle af disse projekter køres og håndteres af World Community Grid, mens andre\n"
-"køres og håndteres af andre forskere og organisationer. BOINC-softwaren\n"
-"kan fordele din overskydende processorkraft mellem enhver kombination af projekter.\n"
-"\n"
-"Alternativt, hvis du har registreret dig hos en BOINC-kontohåndtering, kan du bruge\n"
-"denne til at vælge, hvilke projekter du vil støtte.\n"
-"\n"
-"Overvej venligst, hvilken type ændring du gerne vil lave:\n"
+#: sg_ProjectPanel.cpp:149
+msgid "Project Commands"
+msgstr "Projektkommandoer"
 
-#: clientgui/WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
-msgstr "Brug en BOINC-kontohåndtering"
+#: sg_ProjectPanel.cpp:267
+#, c-format
+msgid "Pop up a menu of web sites for project %s"
+msgstr "Vis en pop op-menu med hjemmesider for projektet %s"
 
-#: clientgui/WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
-msgstr "Tilføj eller ændr dine World Community Grid-projekter"
+#: sg_ProjectPanel.cpp:269
+#, c-format
+msgid "Pop up a menu of commands to apply to project %s"
+msgstr "Vis en menu med kommandoer for projektet %s"
 
-#: clientgui/WelcomePage.cpp:361
-msgid "Add projects run by other researchers or organizations"
-msgstr "Tilføj projekter, der køres af andre forskere og organisationer"
+#: sg_TaskCommandPopup.cpp:67
+msgid "Suspend this task."
+msgstr "Suspendér denne opgave."
 
-#: clientgui/WizardAttach.cpp:673
-msgid "Do you really want to cancel?"
-msgstr "Er du sikker på, at du vil annullere?"
+#: sg_TaskCommandPopup.cpp:73
+msgid "Abandon this task. You will get no credit for it."
+msgstr "Opgiv denne opgave. Du vil ikke modtage points for den."
 
-#: clientgui/WizardAttach.cpp:674
-msgid "Question"
-msgstr "Spørgsmål"
+#: sg_TaskCommandPopup.cpp:251
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %.1lf%%, Status: %s)"
+msgstr "Er du sikker på, at du vil afbryde denne opgave \"%s\"?\n(Udført: %.1lf%%, Status: %s)"
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
-msgid "&Next >"
-msgstr "&Næste >"
+#: sg_TaskPanel.cpp:464
+msgid "You don't have any projects.  Please Add a Project."
+msgstr "Du har ingen projekter. Tilføj venligst et projekt."
 
-#: clientgui/wizardex.cpp:383
-msgid "< &Back"
-msgstr "< &Tilbage"
+#: sg_TaskPanel.cpp:465
+msgid "Not available"
+msgstr "Ikke tilgængelig"
 
-#: clientgui/wizardex.cpp:553
-msgid "&Finish"
-msgstr "&Afslut"
+#: sg_TaskPanel.cpp:476
+msgid "Tasks:"
+msgstr "Opgaver:"
 
-#: clientgui/common/wxPieCtrl.cpp:64
-msgid "Pie Ctrl"
-msgstr "Pie Ctrl"
+#: sg_TaskPanel.cpp:482
+msgid "Select a task to access"
+msgstr "Vælg en opgave at tilgå"
 
-#: clientgui/mac/Mac_GUI.cpp:35
-msgid "Services"
-msgstr "Servicer"
+#: sg_TaskPanel.cpp:493
+msgid "From:"
+msgstr "Fra:"
 
-#: clientgui/mac/Mac_GUI.cpp:36
-#, c-format
-msgid "Hide %s"
-msgstr "Gem %s"
+#: sg_TaskPanel.cpp:547
+msgid "This task's progress"
+msgstr "Denne opgaves fremgang"
 
-#: clientgui/mac/Mac_GUI.cpp:37
-msgid "Hide Others"
-msgstr "Gem andre"
+#: sg_TaskPanel.cpp:565
+msgid "Task Commands"
+msgstr "Opgavekommandoer"
 
-#: clientgui/mac/Mac_GUI.cpp:38
-msgid "Show All"
-msgstr "Vis alle"
+#: sg_TaskPanel.cpp:566
+msgid "Pop up a menu of commands to apply to this task"
+msgstr "Vis en menu med kommandoer for denne opgave"
 
-#: clientgui/mac/Mac_GUI.cpp:39
+#: sg_TaskPanel.cpp:701
 #, c-format
-msgid "Quit %s"
-msgstr "Afslut %s"
+msgid "Application: %s"
+msgstr "Applikation: %s"
 
-#: clientgui/DlgAdvPreferences.h:30
-msgid "specify work start and stop hours in format HH:MM-HH:MM"
-msgstr "angiv timetal for start og stop af arbejde i formatet TT:MM-TT:MM"
-
-#: clientgui/DlgAdvPreferences.h:31
-msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
-msgstr "angiv timetal for start og stop af netværksbrug i formatet TT:MM-TT:MM"
-
-# 98%
-#~ msgid ""
-#~ "(C) 2003-2013 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2013 University of California, Berkeley.\n"
-#~ "Alle rettigheder forbeholdes."
+#: sg_TaskPanel.cpp:724
 #, c-format
-#~ msgid "%s - Preferences"
-#~ msgstr "%s – Indstillinger"
+msgid "%.3f%%"
+msgstr "%.3f%%"
 
-#, no-c-format
-#~ msgid "% of the processors (0 means ignore this setting)"
-#~ msgstr "% af processorerne (0 betyder ignorér denne indstilling)"
+#: sg_TaskPanel.cpp:732
+msgid "Application: Not available"
+msgstr "Applikation: ikke tilgængelig"
 
-#, no-c-format
-#~ msgid "% CPU time"
-#~ msgstr "% CPU-tid"
-#~ msgid "KBytes/sec."
-#~ msgstr "KBytes/sek"
-#~ msgid "Mbytes"
-#~ msgstr "Mbytes"
-#~ msgid "every"
-#~ msgstr "for hver"
-#~ msgid "days"
-#~ msgstr "dage"
-#~ msgid "Gigabytes disk space"
-#~ msgstr "Gigabytes diskplads"
-#~ msgid "Running, high priority"
-#~ msgstr "Kører, høj prioritet"
-#~ msgid " (Scheduler wait: "
-#~ msgstr " (Planlægger venter: "
-#~ msgid " (Scheduler wait)"
-#~ msgstr " (Planlægger venter)"
-#~ msgid " (Waiting for network access)"
-#~ msgstr " (Venter på netværksadgang)"
-#~ msgid "Preferences…"
-#~ msgstr "Indstillinger …"
-#~ msgid "Account manager website"
-#~ msgstr "Hjemmeside for kontohåndtering"
-#~ msgid "Account Manager &URL:"
-#~ msgstr "&URL for kontohåndtering:"
+#: sg_TaskPanel.cpp:832
+msgid "Not Available"
+msgstr "Ikke tilgængelig"
 
+#: sg_TaskPanel.cpp:847
 #, c-format
-#~ msgid "%s &website"
-#~ msgstr "%s-&hjemmeside"
-#~ msgid "invalid float"
-#~ msgstr "ugyldig float-værdi"
-#~ msgid "Workunit name"
-#~ msgstr "Navn på arbejdsenhed"
-#~ msgid "Notice List"
-#~ msgstr "Meddelelsesliste"
+msgid "Elapsed: %s"
+msgstr "Forløbet: %s"
 
+#: sg_TaskPanel.cpp:861
 #, c-format
-#~ msgid "%s; received on %s"
-#~ msgstr "%s; modtaget %s"
+msgid "Remaining (estimated): %s"
+msgstr "Resterende (estimeret): %s"
 
+#: sg_TaskPanel.cpp:876
 #, c-format
-#~ msgid "%s; received from %s; on %s"
-#~ msgstr "%s; modtaget af %s; %s"
-#~ msgid "Click"
-#~ msgstr "Klik"
-#~ msgid "Project List"
-#~ msgstr "Projektliste"
-#~ msgid "Nvidia GPU Supported"
-#~ msgstr "Nvidia-GPU understøttet"
-#~ msgid "ATI GPU Supported"
-#~ msgstr "ATI-GPU understøttet"
-#~ msgid "Project Website"
-#~ msgstr "Projekthjemmeside"
-#~ msgid "I do not agree with the terms of use."
-#~ msgstr "Jeg er ikke enig i brugsvilkårene."
-#~ msgid "One or more items failed to load from the Internet."
-#~ msgstr "Hentning af et eller flere elementer fra Internet mislykkedes."
-
-# 88%
-#~ msgid "Retry now"
-#~ msgstr "Prøv igen nu"
-#~ msgid "Display the advanced (accessible) graphical interface."
-#~ msgstr "Vis den avancerede (tilgængelige) grafiske grænseflade."
-#~ msgid "10%"
-#~ msgstr "10%"
-#~ msgid "20%"
-#~ msgstr "20%"
-#~ msgid "30%"
-#~ msgstr "30%"
-#~ msgid "40%"
-#~ msgstr "40%"
-#~ msgid "50%"
-#~ msgstr "50%"
-#~ msgid "60%"
-#~ msgstr "60%"
-#~ msgid "70%"
-#~ msgstr "70%"
-#~ msgid "80%"
-#~ msgstr "80%"
-#~ msgid "90%"
-#~ msgstr "90%"
-#~ msgid "100%"
-#~ msgstr "100%"
-#~ msgid "1"
-#~ msgstr "1"
-#~ msgid "3"
-#~ msgstr "3"
-#~ msgid "5"
-#~ msgstr "5"
-#~ msgid "10"
-#~ msgstr "10"
-#~ msgid "15"
-#~ msgstr "15"
-#~ msgid "30"
-#~ msgstr "30"
-#~ msgid "60"
-#~ msgstr "60"
-#~ msgid "Click Clear to restore web-based settings."
-#~ msgstr "Klik Nulstil for at genoprette webbaserede indstillinger."
-#~ msgid "For additional settings, select Computing Preferences in "
-#~ msgstr "For yderligere indstillinger, vælg Beregningsindstillinger i "
-#~ msgid "the Advanced View."
-#~ msgstr "den avancerede visning."
-#~ msgid "Paused: Other work running"
-#~ msgstr "Pause: Andet arbejde udføres"
-#~ msgid "Paused: User initiated.  Click 'Resume' to continue"
-#~ msgstr "Pause: Brugerforespørgsel. Klik 'Genoptag' for at fortsætte"
-#~ msgid "Paused: User active"
-#~ msgstr "Pause: Brugeren er aktiv"
-#~ msgid "Paused: Computer on battery"
-#~ msgstr "Pause: Computeren er på batterier"
-#~ msgid "Paused: Time of Day"
-#~ msgstr "Pause: Tidspunkt på dagen"
-#~ msgid "Paused: Benchmarks running"
-#~ msgstr "Pause: Ydelsesmåling kører"
-#~ msgid "Paused"
-#~ msgstr "Pause"
-#~ msgid "Paused: Application start delayed"
-#~ msgstr "Pause: Applikationsstart udskudt"
-#~ msgid "Click to show project graphics"
-#~ msgstr "Klik for at vise projekt-grafik"
-#, c-format
-#~ msgid "Pop up a menu of websites for project %s"
-#~ msgstr "Vis en menu med hjemmesider for projektet %s"
-#~ msgid "Open a window to view messages"
-#~ msgstr "Vis et vindue med beskeder"
-#~ msgid "Stop all activity"
-#~ msgstr "Stop al aktivitet"
-#~ msgid "Resume activity"
-#~ msgstr "Genoptag aktivitet"
-#~ msgid "Open a window to set your preferences"
-#~ msgstr "Vis et vindue med dine indstillinger"
-#~ msgid "Switch to the BOINC advanced view"
-#~ msgstr "Skift til BOINC's avancerede visning"
-#~ msgid "My Projects:"
-#~ msgstr "Mine projekter:"
+msgid "Status: %s"
+msgstr "Status: %s"
 
-#, c-format
-#~ msgid "%s. Work done by %s: %0.2f"
-#~ msgstr "%s. Arbejde udført af %s: %0.2f"
+#: sg_TaskPanel.cpp:1223
+msgid "Retrieving current status."
+msgstr "Henter nuværende status."
 
-#, c-format
-#~ msgid "%.1lf"
-#~ msgstr "%.1lf"
+#: sg_TaskPanel.cpp:1229
+msgid "Downloading work from the server."
+msgstr "Henter arbejde fra serveren."
 
-#, c-format
-#~ msgid "%d hr %d min %d sec"
-#~ msgstr "%d t %d min %d sek"
-#~ msgid "Are you sure you want to display graphics on a remote machine?"
-#~ msgstr "Er du sikker på, at du ønsker at vise grafik på en anden maskine?"
-#~ msgid "Application: "
-#~ msgstr "Applikation: "
-#~ msgid "Time Remaining: "
-#~ msgstr "Resterende tid: "
-#~ msgid "Elapsed Time: "
-#~ msgstr "Forløben tid: "
-#~ msgid ""
-#~ "for accessibility support, please select advanced from the view menu or type "
-#~ "command shift a"
-#~ msgstr ""
-#~ "for understøttelse af tilgængelighed, vælg venligst avanceret fra Vis-menuen "
-#~ "eller tast command shift a"
-#~ msgid "This panel contains graphs showing user totals for projects"
-#~ msgstr "Dette panel indeholder grafer, der viser brugertotaler for projekter"
-#~ msgid "list headers"
-#~ msgstr "liste over headers"
-#~ msgid "list of events"
-#~ msgstr "liste over begivenheder"
-#~ msgid "list of events is empty"
-#~ msgstr "liste over begivenheder er tom"
+#: sg_TaskPanel.cpp:1234
+msgid "Processing Suspended:  Running On Batteries."
+msgstr "Beregning suspenderet: Kører på batterier."
 
-#, c-format
-#~ msgid "list of %s"
-#~ msgstr "liste over %s"
+#: sg_TaskPanel.cpp:1236
+msgid "Processing Suspended:  User Active."
+msgstr "Beregning suspenderet: Bruger er aktiv."
 
-#, c-format
-#~ msgid "list of %s is empty"
-#~ msgstr "liste over %s er tom"
+#: sg_TaskPanel.cpp:1238
+msgid "Processing Suspended:  User paused processing."
+msgstr "Beregning suspenderet: Bruger satte beregning på pause."
 
-#, c-format
-#~ msgid "; current sort column %d of %d; descending order; "
-#~ msgstr "; nuværende sorteringskolonne %d af %d; aftagende rækkefølge; "
+#: sg_TaskPanel.cpp:1240
+msgid "Processing Suspended:  Time of Day."
+msgstr "Beregning suspenderet: Tidspunkt på dagen."
 
-#, c-format
-#~ msgid "; current sort column %d of %d; ascending order; "
-#~ msgstr "; nuværende sorteringskolonne %d af %d; tiltagende rækkefølge; "
+#: sg_TaskPanel.cpp:1242
+msgid "Processing Suspended:  Benchmarks Running."
+msgstr "Beregning suspenderet: Ydelsesmåling kører."
 
-#, c-format
-#~ msgid "; column %d of %d; "
-#~ msgstr "; kolonne %d af %d; "
-#~ msgid "list is empty"
-#~ msgstr "liste er tom"
+#: sg_TaskPanel.cpp:1244
+msgid "Processing Suspended."
+msgstr "Beregning suspenderet."
 
-#, c-format
-#~ msgid "; row %d; "
-#~ msgstr "; række %d; "
+#: sg_TaskPanel.cpp:1248
+msgid "Waiting to contact project servers."
+msgstr "Venter på at kontakte projektservere."
 
-#, c-format
-#~ msgid "; selected row %d of %d; "
-#~ msgstr "; valgt række %d af %d; "
+#: sg_TaskPanel.cpp:1252 sg_TaskPanel.cpp:1261
+msgid "Retrieving current status"
+msgstr "Henter nuværende status"
 
-#, c-format
-#~ msgid "; selected row %d ; "
-#~ msgstr "; valgt række %d ; "
+#: sg_TaskPanel.cpp:1256
+msgid "No work available to process"
+msgstr "Intet arbejde tilgængeligt"
 
-#, c-format
-#~ msgid "; row %d of %d; "
-#~ msgstr "; række %d af %d; "
-#~ msgid "blank"
-#~ msgstr "blank"
-#~ msgid "list of projects or account managers"
-#~ msgstr "liste over projekter eller kontohåndteringer"
+#: sg_TaskPanel.cpp:1258
+msgid "Unable to connect to the core client"
+msgstr "Kan ikke forbinde til kerneklienten"
 
-#, c-format
-#~ msgid "selected row %d of %d; "
-#~ msgstr "valgt række %d af %d; "
+#: wizardex.cpp:377 wizardex.cpp:553
+msgid "&Next >"
+msgstr "&Næste >"
 
-#, c-format
-#~ msgid "row %d of %d; "
-#~ msgstr "række %d af %d; "
-#~ msgid "The minimum username length for this project is 1. Please enter a different username."
-#~ msgstr ""
-#~ "Den minimale brugernavn-længde for dette projekt er 1. Indtast venligst et "
-#~ "andet brugernavn."
-#~ msgid "The minimum username length for this account manager is 1. Please enter a different username."
-#~ msgstr ""
-#~ "Den minimale brugernavn-længde for denne kontohåndtering er 1. Indtast "
-#~ "venligst et andet brugernavn."
-#~ msgid "The minimum email address length for this project is 1. Please enter a different email address."
-#~ msgstr ""
-#~ "Den minimale emailadresse-længde for dette projekt er 1. Indtast venligst en "
-#~ "anden emailadresse."
-#~ msgid "The minimum email address length for this account manager is 1. Please enter a different email address."
-#~ msgstr ""
-#~ "Den minimale emailadresse-længde for denne kontohåndtering er 1. Indtast "
-#~ "venligst en anden emailadresse."
+#: wizardex.cpp:383
+msgid "< &Back"
+msgstr "< &Tilbage"
 
-#, c-format
-#~ msgid "The minimum password length for this project is %d. Please enter a different password."
-#~ msgstr ""
-#~ "Den minimale kodeord-længde for dette projekt er %d. Indtast venligst et "
-#~ "andet kodeord."
+#: wizardex.cpp:553
+msgid "&Finish"
+msgstr "&Afslut"
 
-#, c-format
-#~ msgid "The minimum password length for this account manager is %d. Please enter a different password."
-#~ msgstr ""
-#~ "Den minimale kodeord-længde for denne kontohåndtering er %d. Vælg venligst "
-#~ "et andet kodeord."
-#~ msgid ""
-#~ "An error has occurred;\n"
-#~ "check the Event Log for details.\n"
-#~ "\n"
-#~ "Click Finish to close."
-#~ msgstr ""
-#~ "Der er opstået en fejl;\n"
-#~ "check begivenhedsloggen for detaljer.\n"
-#~ "\n"
-#~ "Klik på Afslut for at lukke."
+#: mac/Mac_GUI.cpp:110
+msgid "Preferences…"
+msgstr "Indstillinger …"
 
-#, no-c-format
-#~ msgid "% of the processors"
-#~ msgstr "% af processorerne"
+#: mac/Mac_GUI.cpp:122
+msgid "Services"
+msgstr "Servicer"
 
+#: mac/Mac_GUI.cpp:144
 #, c-format
-#~ msgid "New page inserted. Index = %i"
-#~ msgstr "Ny side indsat. Indeks = %i"
+msgid "Hide %s"
+msgstr "Gem %s"
 
-#, c-format
-#~ msgid "New page appended. Index = %i"
-#~ msgstr "Ny side tilføjet. Indeks = %i"
+#: mac/Mac_GUI.cpp:158
+msgid "Hide Others"
+msgstr "Gem andre"
 
-#, c-format
-#~ msgid "Old Page Index = %i"
-#~ msgstr "Gammelt sideindeks = %i"
+#: mac/Mac_GUI.cpp:172
+msgid "Show All"
+msgstr "Vis alle"
 
+#: mac/Mac_GUI.cpp:186
 #, c-format
-#~ msgid "OnDropTarget: index by HitTest = %i"
-#~ msgstr "OnDropTarget: indeks af HitTest = %i"
-#~ msgid "Read config file"
-#~ msgstr "Læs konfigurationsfilen"
-
-#, fuzzy
-#~ msgid "Read configuration info from cc_config.xml"
-#~ msgstr "Læs konfigurationsinformation fra cc_config.xml"
-
-#, fuzzy
-#~ msgid ""
-#~ "(C) 2003-2011 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2008 University of California, Berkeley.\n"
-#~ "Alle rettigheder forbeholdes."
-#~ msgid "Click 'Retry now' to transfer the file now"
-#~ msgstr "Klik 'Prøv igen nu' for at overføre filen nu"
-#~ msgid ""
-#~ "Click 'Abort transfer' to delete the file from the transfer queue. This "
-#~ "will prevent you from being granted credit for this result."
-#~ msgstr ""
-#~ "Klik 'Afbryd overførsel' for at slette filen fra overførselskøen. Dette "
-#~ "vil forhindre dig i at få points for dette resultat."
-#~ msgid "Aborting result..."
-#~ msgstr "Afbryder resultat..."
-
-#, fuzzy
-#~ msgid "Don't fetch NVIDIA GPU tasks"
-#~ msgstr "Henter ikke nye opgaver"
-
-#, fuzzy
-#~ msgid "Don't fetch ATI GPU tasks"
-#~ msgstr "Henter ikke nye opgaver"
-#~ msgid "Web sites"
-#~ msgstr "Websites"
-#~ msgid "Connect about every"
-#~ msgstr "Tilslut omkring hver"
-#~ msgid "days (max. 10)"
-#~ msgstr "dage (max. 10)"
-#~ msgid "Stop running science applications when exiting the Manager"
-#~ msgstr "Hold op med at køre jobs når manageren afsluttes"
-#~ msgid "%s - Options"
-#~ msgstr "%s - Indstillinger"
-#~ msgid "Retrieving host information; please wait..."
-#~ msgstr "Henter værtsinformation, vent venligst..."
-#~ msgid "%s - Messages"
-#~ msgstr "%s - Beskeder"
-#~ msgid "Preferences"
-#~ msgstr "Indstillinger"
-#~ msgid "Upload pending"
-#~ msgstr "Upload venter"
-#~ msgid "Download pending"
-#~ msgstr "Download venter"
-#~ msgid "Get help with BOINC"
-#~ msgstr "Få hjælp til BOINC"
-#~ msgid "%s - Detach from %s"
-#~ msgstr "%s - Afmeld %s"
-#~ msgid "Failed to attach to project"
-#~ msgstr "Kunne ikke tilmelde projekt"
-#~ msgid "Failed to attach to account manager"
-#~ msgstr "Kunne ikke forbinde til konto-manageren"
-#~ msgid "Attached to account manager"
-#~ msgstr "Forbundet til konto-manager"
-#~ msgid "You are now successfully attached to the %s system."
-#~ msgstr "Du er nu tilmeldt %s system."
-#~ msgid "You are now successfully attached to this account manager."
-#~ msgstr "Du er nu tilmeldt til denne konto-manager."
-#~ msgid "not attached to any BOINC project: 0 bytes"
-#~ msgstr "ikke tilmeldt til noget BOINC-projekt: 0 bytes"
-#~ msgid "All projects"
-#~ msgstr "Alle projekter"
-#~ msgid "Attach to project"
-#~ msgstr "Tilmeld projekt"
-#~ msgid "Attach to account manager"
-#~ msgstr "Tilmeld konto-manager"
-#~ msgid "Attach to a project"
-#~ msgstr "Tilmeld et projekt"
-#~ msgid "%s needs to connect to the Internet.  Please click to open %s."
-#~ msgstr "%s har behov for at forbinde til internettet. Klik for at åbne %s."
-#~ msgid ""
-#~ "%s is unable to communicate with a project and needs an Internet "
-#~ "connection.\n"
-#~ "Please connect to the Internet, then select the 'Do network "
-#~ "communications' item from the Advanced menu."
-#~ msgstr ""
-#~ "%s kan ikke kommunikere med et projekt og har brug for en "
-#~ "internetforbindelse.\n"
-#~ "Forbind til internettet, og vælg 'Prøv kommunikation igen'  under "
-#~ "menupunktet Avanceret."
-#~ msgid ""
-#~ "%s couldn't do Internet communication, and no default connection is "
-#~ "selected.\n"
-#~ "Please connect to the Internet, or select a default connection\n"
-#~ "using Advanced/Options/Connections."
-#~ msgstr ""
-#~ "%s kan ikke kommunikere over internettet,\n"
-#~ "og der er ikke specificeret en standardforbindelse.\n"
-#~ "Forbind til internettet eller vælg en standardforbindelse\n"
-#~ "via menupunktet 'Avanceret/Indstillinger/Forbindelser'."
-#~ msgid "Attached to project"
-#~ msgstr "Projektet er tilmeldt"
-#~ msgid "You are now successfully attached to this project."
-#~ msgstr "Du er nu tilmeldt dette projekt."
-#~ msgid "Attached to %s"
-#~ msgstr "Tilmeldt til %s"
-#~ msgid "Detach when done"
-#~ msgstr "Frameld efter endt arbejde"
-#~ msgid "Detach"
-#~ msgstr "Afmeld"
-#~ msgid "Detaching from project..."
-#~ msgstr "Afmelder projekt..."
-#~ msgid "Are you sure you want to detach from project '%s'?"
-#~ msgstr "Er du sikker på, at du vil afmelde projektet '%s'?"
-#~ msgid "Detach from Project"
-#~ msgstr "Afmeld Projekt"
-#~ msgid " - user active"
-#~ msgstr " - bruger er aktiv"
-#~ msgid " - need disk space"
-#~ msgstr " - mangler diskplads"
-#~ msgid "Attach to an additional project"
-#~ msgstr "Tilmeld endnu et projekt"
-#~ msgid "To completion"
-#~ msgstr "Resterende tid"
-#~ msgid "Attach to a project to begin processing work"
-#~ msgstr "Tilmeld et projekt for at begynde at arbejde"
-#~ msgid "%s: %.2f%% completed."
-#~ msgstr "%s: %.2f%% udført."
-#~ msgid "%d tasks running."
-#~ msgstr "%d jobs kører"
-#~ msgid "%s - Can't find web browser"
-#~ msgstr "%s - Kan ikke finde webbrowser"
-#~ msgid ""
-#~ "%s tried to display the web page\n"
-#~ "\t%s\n"
-#~ "but couldn't find a web browser.\n"
-#~ "To fix this, set the environment variable\n"
-#~ "BROWSER to the path of your web browser,\n"
-#~ "then restart the %s."
-#~ msgstr ""
-#~ "%s prøvede at vise websiden\n"
-#~ "\t%s\n"
-#~ "men kunne ikke finde en webbrowser.\n"
-#~ "For at ordne dette kan du sætte environment-variablen\n"
-#~ "BROWSER til stien af din webbrowser \n"
-#~ "og genstarte %s."
-#~ msgid "Starting client services; please wait..."
-#~ msgstr "Starter klient services; vent venligst..."
-#~ msgid "Retrying communications for project(s)..."
-#~ msgstr "Prøver kommunikation med projekt(er) igen..."
-#~ msgid ""
-#~ "Required wizard file(s) are missing from the target server.\n"
-#~ "(lookup_account.php/create_account.php)\n"
-#~ msgstr ""
-#~ "Påkrævede wizard fil(er) mangler på serveren.\n"
-#~ "(lookup_account.php/create_account.php)\n"
-#~ msgid "User information"
-#~ msgstr "Brugerinformation"
-#~ msgid "Account Manager URL"
-#~ msgstr "Konto-manager URL"
-#~ msgid "Enter the URL of the account manager's web site."
-#~ msgstr "Indtast URL'en på konto-managerens website."
-#~ msgid "Close BOINC Manager Window."
-#~ msgstr "Luk BOINC Manager vinduet"
-#~ msgid "Exit the %s"
-#~ msgstr "Luk  %s"
-#~ msgid ""
-#~ "Advanced views allow you to sort various columns and displays graphical "
-#~ "progress bars."
-#~ msgstr ""
-#~ "Avanceret visning giver dig mulighed for at sortere tabeller og se "
-#~ "grafisk status."
-#~ msgid "Attach to &project"
-#~ msgstr "Tilmeld &projekt"
-#~ msgid "Attaching to project..."
-#~ msgstr "Tilmelder projekt..."
-#~ msgid "Removal from %s completed."
-#~ msgstr "Fjernet fra %s."
-#~ msgid "Removal succeeded!"
-#~ msgstr "Det lykkedes at blive fjernet!"
-#~ msgid "Write to disk at most every"
-#~ msgstr "Skriv til disk højst hver"
-#~ msgid "Click here to go to %s's website."
-#~ msgstr "Klik her for at gå til %s's website."
-#~ msgid "ID"
-#~ msgstr "ID"
-#~ msgid "Priority"
-#~ msgstr "Prioritet"
-#~ msgid "Copying selected messages to Clipboard..."
-#~ msgstr "Kopierer valgte beskeder til udklipsholderen..."
-#~ msgid "Info"
-#~ msgstr "Info"
-#~ msgid "Warning"
-#~ msgstr "Advarsel"
-#~ msgid "Aborting transfer(s)..."
-#~ msgstr "Afbryder overførsler..."
-#~ msgid ""
-#~ "Are you sure you want to abort this file(s) transfer ?\n"
-#~ "NOTE: Aborting a transfer will invalidate a task and you\n"
-#~ "will not receive credit for it."
-#~ msgstr ""
-#~ "Er du sikker på at du vil afbryde denne filoverførsel?\n"
-#~ "NOTE: Afbrydelse af en overførsel vil gøre opgaven ugyldig\n"
-#~ "og du vil ikke få points for den."
-#~ msgid "Abort File Transfer(s)"
-#~ msgstr "Afbryd filoverførsel"
-#~ msgid ""
-#~ "We'll now remove this computer from %s.  From now on,\n"
-#~ "attach and detach projects directly from this computer.\n"
-#~ msgstr ""
-#~ "Computeren fjernes nu fra %s. I fremtiden skal\n"
-#~ "projekter nu tilmeldes og frameldes direkte på denne computer\n"
-#~ msgid ""
-#~ "We'll now guide you through the process of attaching\n"
-#~ "to an account manager.\n"
-#~ "\n"
-#~ "If you want to attach to a single project, click Cancel,\n"
-#~ "then select the 'Attach to project' menu item instead."
-#~ msgstr ""
-#~ "Vi vil nu guide dig igennem tilmeldingen til en\n"
-#~ "konto-manager.\n"
-#~ "\n"
-#~ "Hvis du blot ville tilmelde dig til et enkelt projekt kan du klikke "
-#~ "Afbryd,\n"
-#~ "og så vælge 'Tilmeld projekt' istedet."
-#~ msgid "Debug Flags"
-#~ msgstr "Fejlrettelses flag"
-#~ msgid "Project Properties Failure"
-#~ msgstr "Fejl i projekt-egenskaber"
-#~ msgid "Project Communication Failure"
-#~ msgstr "Fejl under kommunikation med projekt"
-#~ msgid "Project Properties URL Failure"
-#~ msgstr "Fejl i URL for projekt-egenskaber"
-#~ msgid "Account Creation Disabled"
-#~ msgstr "Konto-oprettelse er lukket"
-#~ msgid "Account Already Exists"
-#~ msgstr "Konto findes allerede."
-#~ msgid "Project Already Attached"
-#~ msgstr "Projektet er allerede tilmeldt"
-#~ msgid "Project Attach Failure"
-#~ msgstr "Fejl i projekttilmelding"
-#~ msgid "Net Detection Failure"
-#~ msgstr "Net detektionsfejl"
-#~ msgid ""
-#~ "You can copy and paste the URL from your browser's\n"
-#~ "address bar."
-#~ msgstr "Du kan kopiere og indsætte URL'en fra din browser's adresselinie"
-#~ msgid "For a list of account managers go to:"
-#~ msgstr "For at se en liste af BOINC-baserede konto-managere, gå til:"
-#~ msgid "&Advanced View"
-#~ msgstr "Avanceret visning"
-#~ msgid "You are already attached to this project."
-#~ msgstr "Du er allerede tilmeldt dette projekt."
-#~ msgid "Static text"
-#~ msgstr "Statisk tekst"
-#~ msgid "Test"
-#~ msgstr "Test"
-#~ msgid ""
-#~ "Enter the username and password you used on\n"
-#~ "the web site."
-#~ msgstr ""
-#~ "Indtast det brugernavn og kodeord som\n"
-#~ "du brugte på hjemmesiden."
-#~ msgid ""
-#~ "Enter the email address and password you used on\n"
-#~ "the web site."
-#~ msgstr ""
-#~ "Indtast emailadressen og det kodeord\n"
-#~ "som du brugte på hjemmesiden."
-#~ msgid ""
-#~ "The minimum password length for this project is %d. Please choose a "
-#~ "different password."
-#~ msgstr ""
-#~ "Den minimale længde på kodeordet til dette projekt er %d. Vælg venligst "
-#~ "et andet kodeord."
-#~ msgid ""
-#~ "The minimum password length for this account manager is %d. Please choose "
-#~ "a different password."
-#~ msgstr ""
-#~ "Den minimale længde på kodeordet til denne konto-manager er %d. Vælg "
-#~ "venligst et andet kodeord."
-#~ msgid "Enter account key"
-#~ msgstr "Indtast kontonøgle"
-#~ msgid ""
-#~ "This project uses an \"account key\" to identify you.\n"
-#~ "\n"
-#~ "Go to the project's web site to create an account. Your account\n"
-#~ "key will be emailed to you."
-#~ msgstr ""
-#~ "Dette projekt bruger en \"kontonøgle\" til at identificere dig.\n"
-#~ "\n"
-#~ "Gå til projektets hjemmeside for at lave en konto. Din kontonøgle\n"
-#~ "vil blive sendt til din email."
-#~ msgid "An account key looks like:"
-#~ msgstr "En kontonøgle ser sådan ud:"
-#~ msgid "82412313ac88e9a3638f66ea82186948"
-#~ msgstr "82412313ac88e9a3638f66ea82186948"
-#~ msgid "Account key:"
-#~ msgstr "Kontonøgle:"
-#~ msgid "You can copy and paste the URL from your browser's address bar."
-#~ msgstr "Du kan kopiere og indsætte URL'en fra din browser's adresselinie."
-#~ msgid "For a list of BOINC-based account managers go to:"
-#~ msgstr "Se en liste af BOINC-baserede konto-managere ved at gå til:"
-#~ msgid ""
-#~ "%s is unable to communicate with a project and needs an Internet "
-#~ "connection.\n"
-#~ "Please connect to the Internet, then select the 'retry communications' "
-#~ "item off the advanced menu."
-#~ msgstr ""
-#~ "%s kan ikke kommunikere med et projekt og har brug for en "
-#~ "internetforbindelse.\n"
-#~ "Forbind til internettet og vælg 'Prøv kommunikation igen' i menuen "
-#~ "'Avanceret'."
-#~ msgid ""
-#~ "Please provide the email address and password you used to register\n"
-#~ "at GridRepublic. (if you have not yet created an account at\n"
-#~ "GridRepublic, please do so at http://www.gridrepublic.org)"
-#~ msgstr ""
-#~ "Angiv venligst den emailadresse og det kodeord som du brugte til at "
-#~ "registrere\n"
-#~ "ved GridRepublic. (Hvis du endnu ikke har oprettet en konto hos "
-#~ "GridRepublic\n"
-#~ "så gør det venligst på http://www.gridrepublic.org)"
-#~ msgid "Start Project"
-#~ msgstr "Start projekt"
-#~ msgid ""
-#~ "Please enter an email address and password. You will need your email\n"
-#~ "address if you want to change your account options or use our message\n"
-#~ "boards.\n"
-#~ "\n"
-#~ "We will send you occasional emails. You can stop these at any time.\n"
-#~ "We will not pass your email address on to others."
-#~ msgstr ""
-#~ "Angiv venligst en emailadresse og et kodeord. Du har brug for din "
-#~ "emailadresse,\n"
-#~ "hvis du vil ændre dine kontoindstillinger eller bruge vores forum.\n"
-#~ "\n"
-#~ "Vi vil sende dig enkelte emails. Du kan framelde disse til enhver tid.\n"
-#~ "Vi giver ikke din emailadresse videre til andre."
-#~ msgid ""
-#~ "Congratulations, you have now successfully started your Climate\n"
-#~ "Change Experiment."
-#~ msgstr "Tillykke, du har nu startet dit Climate Change Experiment."
-#~ msgid ""
-#~ "Click finish to exit. You will be taken to a web page which tells\n"
-#~ "you more about your model."
-#~ msgstr ""
-#~ "Klik luk for at afslutte. Du vil blive taget til en web side\n"
-#~ "der fortæller dig mere om din model."
-#~ msgid ""
-#~ "This will shut down your experiment until it restarts automatically\n"
-#~ "following your user preferences. Close window to close the manager\n"
-#~ "without stopping the experiment."
-#~ msgstr ""
-#~ "Dette vil stoppe dit eksperiment, indtil det automatisk genstarter\n"
-#~ "i henhold til dine indstillinger. Luk vinduet for at lukke manageren\n"
-#~ "uden at stoppe eksperimentet."
-#~ msgid "%s is currently suspended...\n"
-#~ msgstr "%s er suspenderet for nuværende....\n"
-#~ msgid "%s networking is currently suspended...\n"
-#~ msgstr "%s netværksadgang er suspenderet for nuværende....\n"
-#~ msgid "%s is currently reconnecting to a %s client...\n"
-#~ msgstr "%s er ved at forbinde til en %s klient igen...\n"
-#~ msgid "%s is not currently connected to a %s client...\n"
-#~ msgstr "%s er ikke forbundet til en %s klient lige nu...\n"
-#~ msgid ""
-#~ "You are now successfully attached to the %s system.\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Du er nu tilmeldt %s system.\n"
-#~ "%s"
-#~ msgid ""
-#~ "(C) 2003-2006 University of California at Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2006 University of California at Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgid ""
-#~ "A software platform for distributed computing using volunteered computer "
-#~ "resources"
-#~ msgstr ""
-#~ "En software-platform til distribuerede computerudregninger ved hjælp af "
-#~ "frivilligt donerede computerresourcer"
-#~ msgid "Username:"
-#~ msgstr "Brugernavn:"
-#~ msgid "Click here to disable displaying this message in the future."
-#~ msgstr "Klik her for at undgå denne besked fremover."
-#~ msgid "Language Selection:"
-#~ msgstr "Sprogvalg:"
-#~ msgid "What language should the manager display by default."
-#~ msgstr "Hvilket sprog skal manageren benytte som standard?"
-#~ msgid "Reminder Frequency:"
-#~ msgstr "Påmindelseshyppighed:"
-#~ msgid ""
-#~ "How often, in minutes, should the manager remind you of possible "
-#~ "connection events."
-#~ msgstr ""
-#~ "Hvor ofte, i minutter, skal manageren minde dig om mulige "
-#~ "forbindelsesforsøg."
-#~ msgid ""
-#~ "Report completed work, get latest credit, get latest preferences, and "
-#~ "possibly get more work."
-#~ msgstr ""
-#~ "Rapporter færdigt arbejde, hent pointstatistik, hent indstillinger og "
-#~ "hent muligvis mere arbejde."
-#~ msgid "&Defect from %s"
-#~ msgstr "&Afbryd fra %s"
-#~ msgid "&%s\tF1"
-#~ msgstr "&%s\tF1"
-#~ msgid ""
-#~ "This will shut down your tasks until it restarts automatically\n"
-#~ "following your user preferences. Close window to close the manager\n"
-#~ "without stopping the tasks."
-#~ msgstr ""
-#~ "Dette vil stoppe dine opgaver, indtil de automatisk genstarter\n"
-#~ "i henhold til dine indstillinger. Luk vinduet for at lukke manageren\n"
-#~ "uden at stoppe opgaverne."
-#~ msgid "Close Confirmation"
-#~ msgstr "Bekræft Lukning"
-#~ msgid "BOINC Manager - Detach from %s"
-#~ msgstr "BOINC Manager - Afmeld %s"
-#~ msgid "Connected to %s"
-#~ msgstr "Forbundet til %s"
-#~ msgid ""
-#~ "%s is not currently connected to a %s client.\n"
-#~ "Please use the 'File\\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 er ikke forbundet til en %s klient lige nu.\n"
-#~ "Brug 'Avanceret\\Vælg computer...'-menupunktet for at forbinde til en %s "
-#~ "klient.\n"
-#~ "For at forbinde til din lokale computer kan 'localhost' bruges som "
-#~ "værtsnavn."
-#~ msgid "Project URL"
-#~ msgstr "Projekt URL"
-#~ msgid "Enter the URL of the project's web site."
-#~ msgstr "Indtast URL'en på projektets web side."
-#~ msgid "For a list of BOINC-based projects go to:"
-#~ msgstr "For en liste over BOINC-baserede projekter, gå til:"
-#~ msgid "Click Next to configure BOINC's proxy settings."
-#~ msgstr "Klik Næste for at konfigurere BOINC's proxy indstillinger."
-#~ msgid "Disk Space"
-#~ msgstr "Diskplads"
-#~ msgid "Activities suspended"
-#~ msgstr "Aktiviteter suspenderet"
-#~ msgid "Preempted"
-#~ msgstr "Pause"
-#~ msgid "Ready to run"
-#~ msgstr "Klar til kørsel"
-#~ msgid "Activities suspended by user"
-#~ msgstr "Aktiviteter suspenderet af bruger"
-#~ msgid "We'll now guide you through the process of attaching to a project."
-#~ msgstr "Vi vil nu guide dig igennem tilmeldelsen til et projekt."
-#~ msgid ""
-#~ "We'll now remove this computer from %s.  You will\n"
-#~ "be responsible for managing the BOINC client software from\n"
-#~ "now on."
-#~ msgstr ""
-#~ "Vi fjerner nu denne computer fra %s. Du er ansvarlig\n"
-#~ "for at styre BOINC-programmet fra nu af."
-#~ msgid ""
-#~ "We'll now guide you through the process of adding an account\n"
-#~ "manager."
-#~ msgstr ""
-#~ "Vi vil nu guide dig gennem processen med at\n"
-#~ "tilmelde en konto-manager."
-#~ msgid "Project Comm Failure"
-#~ msgstr "Projekt Comm fejl"
-#~ msgid "Google Comm Failure"
-#~ msgstr "Google Comm fejl"
-#~ msgid "Yahoo Comm Failure"
-#~ msgstr "Yahoo Comm fejl"
-#~ msgid "About BOINC Manager"
-#~ msgstr "Om BOINC Manager"
-#~ msgid "BOINC Manager - Dialup Logon"
-#~ msgstr "BOINC Manager - Dialup Logon"
-#~ msgid "BOINC Manager - Options"
-#~ msgstr "BOINC Manager - Indstillinger"
-#~ msgid "BOINC Manager - Select Computer"
-#~ msgstr "BOINC Manager - Vælg computer"
-
+msgid "Quit %s"
+msgstr "Afslut %s"
diff --git a/locale/da/BOINC-Setup.mo b/locale/da/BOINC-Setup.mo
index 9874415..54bae27 100644
Binary files a/locale/da/BOINC-Setup.mo and b/locale/da/BOINC-Setup.mo differ
diff --git a/locale/da/BOINC-Setup.po b/locale/da/BOINC-Setup.po
old mode 100755
new mode 100644
index b2021b6..0b4d749
--- a/locale/da/BOINC-Setup.po
+++ b/locale/da/BOINC-Setup.po
@@ -1,40 +1,32 @@
 # 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: BOINC 7.4\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-10 14:49-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: da\n"
+"PO-Revision-Date: 2015-02-08 17:43+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/boinc/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-Basepath: /Volumes/Cheer/BOINC_GIT/boinc_trunk\n"
-"X-POOTLE-MTIME: 1409324665.0\n"
-"X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: mac_installer\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: Installer.cpp:124
 #, c-format
 msgid "Sorry, this version of %s requires system 10.5 or higher."
 msgstr "Desværre, denne version af %s kræver system 10.5 eller nyere."
 
-#: PostInstall.cpp:130
-#: PostInstall.cpp:1136
-#: uninstall.cpp:1618
+#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
 msgid "Yes"
 msgstr "Ja"
 
-#: PostInstall.cpp:131
-#: PostInstall.cpp:1137
-#: uninstall.cpp:1619
+#: PostInstall.cpp:131 PostInstall.cpp:1137 uninstall.cpp:1619
 msgid "No"
 msgstr "Nej"
 
@@ -48,10 +40,7 @@ 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 ""
-"Brugere, som har tilladelse til at administrere denne computer, vil automatisk tillades at køre og styre %s.\n"
-"\n"
-"Vil du også tillade ikke-administrative brugere at køre og styre %s på denne Mac?"
+msgstr "Brugere, som har tilladelse til at administrere denne computer, vil automatisk tillades at køre og styre %s.\n\nVil du også tillade ikke-administrative brugere at køre og styre %s på denne Mac?"
 
 #: PostInstall.cpp:1444
 #, c-format
@@ -70,9 +59,7 @@ msgstr "Fejl ved rettigheder efter genstart"
 msgid ""
 "Removal may take several minutes.\n"
 "Please be patient."
-msgstr ""
-"Fjernelse kan tage adskillige minutter.\n"
-"Vær venligst tålmodig."
+msgstr "Fjernelse kan tage adskillige minutter.\nVær venligst tålmodig."
 
 #: uninstall.cpp:156
 #, c-format
@@ -80,10 +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 ""
-"Er du sikker på, at du vil fjerne %s fuldstændig fra din computer?\n"
-"\n"
-"Dette vil fjerne de programfilerne men vil ikke røre ved %s datafiler."
+msgstr "Er du sikker på, at du vil fjerne %s fuldstændig fra din computer?\n\nDette vil fjerne de programfilerne men vil ikke røre ved %s datafiler."
 
 #: uninstall.cpp:163
 #, c-format
@@ -103,9 +87,7 @@ msgstr "navn på bruger"
 msgid ""
 "Do you also want to remove VirtualBox from your computer?\n"
 "(VirtualBox was installed along with BOINC.)"
-msgstr ""
-"Vil du også fjerne VirtualBox fra din computer?\n"
-"(VirtualBox blev installeret sammen med BOINC.)"
+msgstr "Vil du også fjerne VirtualBox fra din computer?\n(VirtualBox blev installeret sammen med BOINC.)"
 
 #: uninstall.cpp:312
 #, c-format
@@ -117,23 +99,14 @@ msgid ""
 "\n"
 "for each user, the file\n"
 "\"%s\"."
-msgstr ""
-"Fjernelse fuldført.\n"
-"\n"
-" Du kan evt. fjerne de følgende tilbageblivende elementer vha. Finderen: \n"
-"mappen \"%s\"\n"
-"\n"
-"for hver bruger, filen\n"
-"\"%s\"."
+msgstr "Fjernelse fuldført.\n\n Du kan evt. fjerne de følgende tilbageblivende elementer vha. Finderen: \nmappen \"%s\"\n\nfor hver bruger, filen\n\"%s\"."
 
 #: uninstall.cpp:840
 #, c-format
 msgid ""
 "Enter your administrator password to completely remove %s from you computer.\n"
 "\n"
-msgstr ""
-"Indtast dit administrator-kodeord for fuldstændigt at fjerne %s fra din computer.\n"
-"\n"
+msgstr "Indtast dit administrator-kodeord for fuldstændigt at fjerne %s fra din computer.\n\n"
 
 #: uninstall.cpp:1616
 msgid "Cancel"
@@ -142,8 +115,3 @@ msgstr "Annuller"
 #: uninstall.cpp:1617
 msgid "Continue..."
 msgstr "Fortsæt …"
-
-#, c-format
-#~ msgid "Sorry, this version of %s requires system 10.4 or higher."
-#~ msgstr "Beklager, denne version af %s kræver system 10.4 eller højere."
-
diff --git a/locale/da/BOINC-Web.mo b/locale/da/BOINC-Web.mo
index bf0f918..1a50d3d 100644
Binary files a/locale/da/BOINC-Web.mo and b/locale/da/BOINC-Web.mo differ
diff --git a/locale/da/BOINC-Web.po b/locale/da/BOINC-Web.po
index 02a555c..6e746a5 100755
--- a/locale/da/BOINC-Web.po
+++ b/locale/da/BOINC-Web.po
@@ -7,20 +7,21 @@ msgstr ""
 "Project-Id-Version: BOINC Web 6.x\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:49-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: 2014-08-29 14:53+0000\n"
+"Last-Translator: Anonymous Pootle User\n"
+"Language-Team: BOINC Development Team <boinc_loc at ssl.berkeley.edu>\n"
 "Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.5.0\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
+"X-Poedit-SearchPath-0: doc\n"
 "X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
 "X-POOTLE-MTIME: 1409324007.0\n"
 "X-Poedit-KeywordsList: tra\n"
-"X-Poedit-SearchPath-0: doc\n"
 
 #: docutil.php:21
 msgid "Search"
@@ -36,7 +37,9 @@ msgid "This page is %stranslatable%s."
 msgstr "Denne side kan %soversættes%s."
 
 #: download.php:39
-msgid "We recommend that you also install VirtualBox, so your computer can work on science projects that require it."
+msgid ""
+"We recommend that you also install VirtualBox, so your computer can work on "
+"science projects that require it."
 msgstr ""
 
 #: download.php:41
@@ -48,14 +51,12 @@ msgstr ""
 msgid "Download BOINC + VirtualBox"
 msgstr "Download BOINC + Virtualbox"
 
-#: download.php:54
-#: download.php:69
+#: download.php:54 download.php:69
 #, php-format
 msgid "for %s"
 msgstr ""
 
-#: download.php:57
-#: download.php:72
+#: download.php:57 download.php:72
 #, php-format
 msgid "BOINC version %s"
 msgstr ""
@@ -70,19 +71,30 @@ msgid "Download BOINC"
 msgstr "Download BOINC"
 
 #: download.php:123
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others."
+msgid ""
+"BOINC is a program that lets you donate your idle computer time to science "
+"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, and many others."
 msgstr ""
 
 #: download.php:125
-msgid "After installing BOINC on your computer, you can connect it to as many of these projects as you like."
+msgid ""
+"After installing BOINC on your computer, you can connect it to as many of "
+"these projects as you like."
 msgstr ""
 
 #: download.php:127
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
-msgstr "Du må kun køre denne software på en computer, hvis du ejer computeren eller har ejerens tilladelse til det."
+msgid ""
+"You may run this software on a computer only if you own the computer or have "
+"the permission of its owner."
+msgstr ""
+"Du må kun køre denne software på en computer, hvis du ejer computeren eller "
+"har ejerens tilladelse til det."
 
 #: download.php:132
-msgid "We recommend that you download BOINC from the Google Play Store or Amazon Appstore, not from here."
+msgid ""
+"We recommend that you download BOINC from the Google Play Store or Amazon "
+"Appstore, not from here."
 msgstr ""
 
 #: download.php:167
@@ -93,8 +105,7 @@ msgstr "Systemkrav"
 msgid "Release notes"
 msgstr "Udgivelsesnoter"
 
-#: download.php:169
-#: index.php:86
+#: download.php:169 index.php:86
 msgid "Help"
 msgstr "Hjælp"
 
@@ -116,21 +127,50 @@ msgstr "BOINC: beregn for videnskaben"
 
 #: help.php:12
 #, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
-msgstr "BOINC onlinehjælp lader dig tale person-til-person med øvede BOINC-brugere, som kan: %s svare på spørgsmål om BOINC og frivillig beregning; %s lede dig gennem processen at installere og bruge BOINC; %s hjælpe med at løse ethvert problem, du måtte komme ud for."
+msgid ""
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who "
+"can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"through the process of installing and using BOINC; %s troubleshoot any "
+"problems you might have."
+msgstr ""
+"BOINC onlinehjælp lader dig tale person-til-person med øvede BOINC-brugere, "
+"som kan: %s svare på spørgsmål om BOINC og frivillig beregning; %s lede dig "
+"gennem processen at installere og bruge BOINC; %s hjælpe med at løse ethvert "
+"problem, du måtte komme ud for."
 
 #: help.php:21
 #, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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 onlinehjælp er baseret på %sSkype%s, et Internetbaseret telefonsystem. Skype er gratis (både softwaren og opkaldene). Hvis du ikke allerede har Skype, kan du %sdownloade og installere det nu%s. Når du er færdig, kan du vende tilbage til denne side."
+msgid ""
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. "
+"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 onlinehjælp er baseret på %sSkype%s, et Internetbaseret telefonsystem. "
+"Skype er gratis (både softwaren og opkaldene). Hvis du ikke allerede har "
+"Skype, kan du %sdownloade og installere det nu%s. Når du er færdig, kan du "
+"vende tilbage til denne side."
 
 #: help.php:28
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
-msgstr "Den bedste måde at få hjælp er med lydopkald, til hvilket du har brug for enten indbygget mikrofon og højttalere eller et eksternt hovedtelefonsæt til din computer. Du kan også bruge Skype's tekstbaserede chat-system eller almindelig email (hvis du ikke har Skype) til kommunikation med frivillige hjælpere."
+msgid ""
+"The best way to get help is by voice, for which you need either built-in "
+"microphone and speakers or an external headset for your computer.  You can "
+"also use Skype's text-based chat system or regular email (if you don't have "
+"Skype) to communicate with Help Volunteers."
+msgstr ""
+"Den bedste måde at få hjælp er med lydopkald, til hvilket du har brug for "
+"enten indbygget mikrofon og højttalere eller et eksternt hovedtelefonsæt til "
+"din computer. Du kan også bruge Skype's tekstbaserede chat-system eller "
+"almindelig email (hvis du ikke har Skype) til kommunikation med frivillige "
+"hjælpere."
 
 #: help.php:31
-msgid "Volunteers speaking several languages are available. Please select a language:"
-msgstr "Frivillige, der taler adskilligfe sprog, er tilgængelige. Vælg venligst et sprog:"
+msgid ""
+"Volunteers speaking several languages are available. Please select a "
+"language:"
+msgstr ""
+"Frivillige, der taler adskilligfe sprog, er tilgængelige. Vælg venligst et "
+"sprog:"
 
 #: help.php:47
 msgid "Be a Help Volunteer"
@@ -138,21 +178,36 @@ msgstr "Bliv frivillig hjælper"
 
 #: help.php:50
 #, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
-msgstr "Hvis du er en øvet BOINC-bruger, opfordrer vi dig til at %sblive en frivillig hjælper%s. Det er en god måde at hjælpe videnskabelig forskning og frivillig beregning - og det er sjovt!"
+msgid ""
+"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+"Volunteer%s.  It's a great way to help the cause of scientific research and "
+"volunteer computing - and it's fun!"
+msgstr ""
+"Hvis du er en øvet BOINC-bruger, opfordrer vi dig til at %sblive en "
+"frivillig hjælper%s. Det er en god måde at hjælpe videnskabelig forskning og "
+"frivillig beregning - og det er sjovt!"
 
 #: help.php:56
 #, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
-msgstr "Hvis du allerede er frivillig hjælper: %sklik her%s for at redigere dine indstillinger."
+msgid ""
+"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
+msgstr ""
+"Hvis du allerede er frivillig hjælper: %sklik her%s for at redigere dine "
+"indstillinger."
 
 #: help_funcs.php:107
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
-msgstr "BOINC-hjælpere er ubetalte frivillige. Deres råd er ikke godkendt af BOINC eller University of California."
+msgid ""
+"BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
+"or the University of California."
+msgstr ""
+"BOINC-hjælpere er ubetalte frivillige. Deres råd er ikke godkendt af BOINC "
+"eller University of California."
 
 #: help_funcs.php:110
 msgid "%1Never%2 give email address or password information to BOINC helpers."
-msgstr "Giv %1aldrig%2 information om emailadresse eller password til BOINC-hjælpere."
+msgstr ""
+"Giv %1aldrig%2 information om emailadresse eller password til BOINC-"
+"hjælpere."
 
 #: index.php:24
 msgid "Computing power"
@@ -198,9 +253,7 @@ msgstr "Deltag som frivillig"
 msgid "Download"
 msgstr "Download"
 
-#: index.php:87
-#: index.php:120
-#: index.php:171
+#: index.php:87 index.php:120 index.php:171
 msgid "Documentation"
 msgstr "Dokumentation"
 
@@ -213,8 +266,14 @@ msgid "Links"
 msgstr "Links"
 
 #: index.php:94
-msgid "Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:"
-msgstr "Brug den ledige tid på din computer (Windows, Mac, Linux eller Android) til at helbrede sygdomme, studere global opvarmning, opdage pulsarer og foretage mange andre typer videnskabelig forskning. Det er sikkert og nemt:"
+msgid ""
+"Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure "
+"diseases, study global warming, discover pulsars, and do many other types of "
+"scientific research.  It's safe, secure, and easy:"
+msgstr ""
+"Brug den ledige tid på din computer (Windows, Mac, Linux eller Android) til "
+"at helbrede sygdomme, studere global opvarmning, opdage pulsarer og foretage "
+"mange andre typer videnskabelig forskning. Det er sikkert og nemt:"
 
 #: index.php:96
 msgid "Choose projects"
@@ -230,8 +289,12 @@ msgstr "Angiv en emailadresse og kodeord."
 
 #: index.php:102
 #, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
-msgstr "Eller, hvis du vil køre flere projekter, prøv en %skontohåndtering%s, så som %sGridRepublic%s eller %sBAM!%s. "
+msgid ""
+"Or, if you run several projects, try an %saccount manager%s such as %"
+"sGridRepublic%s or %sBAM!%s. "
+msgstr ""
+"Eller, hvis du vil køre flere projekter, prøv en %skontohåndtering%s, så som "
+"%sGridRepublic%s eller %sBAM!%s. "
 
 #: index.php:118
 msgid "Compute with BOINC"
@@ -242,12 +305,20 @@ msgid "Software updates"
 msgstr "Software-opdateringer"
 
 #: index.php:128
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
-msgstr "%1Forskere%2: brug BOINC til at oprette et %3frivilligt beregningsprojekt%4, der giver dig computerkraften fra tusinder af CPU'er."
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving "
+"you the computing power of thousands of CPUs."
+msgstr ""
+"%1Forskere%2: brug BOINC til at oprette et %3frivilligt beregningsprojekt%4, "
+"der giver dig computerkraften fra tusinder af CPU'er."
 
 #: index.php:132
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
-msgstr "%1Universiteter%2: brug BOINC til at oprette et %3virtuelt supercomputer-center på campus%4."
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
+msgstr ""
+"%1Universiteter%2: brug BOINC til at oprette et %3virtuelt supercomputer-"
+"center på campus%4."
 
 #: index.php:137
 msgid "%1Companies%2: use BOINC for %3desktop Grid computing%4."
@@ -319,8 +390,11 @@ msgstr "API'er for tilføjelsessoftware"
 
 #: index.php:217
 #, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
-msgstr "Software med åben kildekode til %sfrivillig beregning%s og %sgrid-beregning%s."
+msgid ""
+"Open-source software for %svolunteer computing%s and %sgrid computing%s."
+msgstr ""
+"Software med åben kildekode til %sfrivillig beregning%s og %sgrid-beregning%"
+"s."
 
 #: index.php:230
 msgid "BOINC is based at The University of California, Berkeley"
@@ -339,8 +413,14 @@ msgid "Seismology"
 msgstr "Seismologi"
 
 #: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
-msgstr "The Quake-Catcher Network udvikler verdens største seismiske netværk ved brug af sensorer, der er sat til Internet-tilsluttede computere. Du skal købe en sensor for at deltage."
+msgid ""
+"The Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to Internet-connected computers.  You must buy a "
+"sensor to participate."
+msgstr ""
+"The Quake-Catcher Network udvikler verdens største seismiske netværk ved "
+"brug af sensorer, der er sat til Internet-tilsluttede computere. Du skal "
+"købe en sensor for at deltage."
 
 #: projects.inc:27
 msgid "BOINC Poland Foundation"
@@ -351,23 +431,29 @@ msgid "Environmental research"
 msgstr "Miljøforskning"
 
 #: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
-msgstr "Dette projekt opretter et frit og løbende opdateret kort over strålingsniveauer ved hjælp af sensorer tilsluttet frivilliges computere. Du skal købe en sensor for at deltage."
+msgid ""
+"This project is creating a free and continuously updated map of radiation "
+"levels by using sensors connected to volunteers' computers.  You must buy a "
+"sensor to participate."
+msgstr ""
+"Dette projekt opretter et frit og løbende opdateret kort over "
+"strålingsniveauer ved hjælp af sensorer tilsluttet frivilliges computere. Du "
+"skal købe en sensor for at deltage."
 
 #: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
-msgstr "For at deltage i dette projekt skal du købe en sensor og slutte den til din computer."
+msgid ""
+"To participate in these projects you must buy a sensor and attach it to your "
+"computer."
+msgstr ""
+"For at deltage i dette projekt skal du købe en sensor og slutte den til din "
+"computer."
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
 msgstr "Kognitiv videnskab og kunstig Intelligens"
 
-#: projects.inc:60
-#: projects.inc:364
-#: projects.inc:408
-#: projects.inc:457
-#: projects.inc:464
-#: projects.inc:511
+#: projects.inc:60 projects.inc:364 projects.inc:408 projects.inc:457
+#: projects.inc:464 projects.inc:511
 msgid "Private"
 msgstr "Privat"
 
@@ -376,8 +462,15 @@ msgid "Artificial intelligence"
 msgstr "Kunstig Intelligens"
 
 #: projects.inc:62
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
-msgstr "Analysere og konvertere semantiske net for brug i FreeHAL, en kunstig intelligens, der bruger semantiske netværk, stemmers, dele af taledatabaser og dele af taletaggers for at imitere menneskelig opførsel i konversationer."
+msgid ""
+"Parse and convert semantic nets for use in FreeHAL, an artificial "
+"intelligence that uses semantic networks, stemmers, part of speech "
+"databases, and part of speech taggers in order to imitate human behavior in "
+"conversations."
+msgstr ""
+"Analysere og konvertere semantiske net for brug i FreeHAL, en kunstig "
+"intelligens, der bruger semantiske netværk, stemmers, dele af taledatabaser "
+"og dele af taletaggers for at imitere menneskelig opførsel i konversationer."
 
 #: projects.inc:69
 msgid "Biology and Medicine"
@@ -392,8 +485,18 @@ msgid "Antimalarial drug discovery"
 msgstr "Antimateriel medicinopdagelse"
 
 #: projects.inc:84
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
-msgstr "Parasitten, som er årsag til malaria, fortsætter med at udvikle resistens mod tilgængelig medicin. Derfor haster det med at opdage ny medicin til at erstatte eksisterende medicin. En vigtig forudsætning er, at den nye medicin er målrettet mod NYE proteiner i parasitten. FightMalaria at Home-projektet er rettet mod at finde disse nye mål."
+msgid ""
+"The parasite that causes malaria continues to evolve resistance to available "
+"medication. We therefore urgently need to discover new drugs to replace "
+"existing drugs. Importantly, these new drugs need to target NEW proteins in "
+"the parasite. The FightMalaria at Home project is aimed at finding these new "
+"targets."
+msgstr ""
+"Parasitten, som er årsag til malaria, fortsætter med at udvikle resistens "
+"mod tilgængelig medicin. Derfor haster det med at opdage ny medicin til at "
+"erstatte eksisterende medicin. En vigtig forudsætning er, at den nye medicin "
+"er målrettet mod NYE proteiner i parasitten. FightMalaria at Home-projektet er "
+"rettet mod at finde disse nye mål."
 
 #: projects.inc:90
 msgid "University of Karlsruhe (Germany)"
@@ -404,8 +507,18 @@ msgid "Protein structure prediction"
 msgstr "Forudsigelse af proteinstruktur"
 
 #: projects.inc:92
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
-msgstr "POEM at home bruger en beregningsmæssig tilgang for at forudsige proteiners biologisk aktive struktur, for at forstå mekanismerne for signalbehandling når proteiner interagerer med hinanden, for at forstå sygdomme relateret proteinfejl og aggregering, og for at udvikle nye medikamenter baseret på biologisk vigtige proteiners basale tredimentionelle struktur."
+msgid ""
+"POEM at HOME uses a computational approach to predict the biologically active "
+"structure of proteins, to understand the signal-processing mechanisms when "
+"the proteins interact with one another, to understand diseases related to "
+"protein malfunction or aggregation, and to develop new drugs on the basis of "
+"the three-dimensions structure of biologically important proteins."
+msgstr ""
+"POEM at home bruger en beregningsmæssig tilgang for at forudsige proteiners "
+"biologisk aktive struktur, for at forstå mekanismerne for signalbehandling "
+"når proteiner interagerer med hinanden, for at forstå sygdomme relateret "
+"proteinfejl og aggregering, og for at udvikle nye medikamenter baseret på "
+"biologisk vigtige proteiners basale tredimentionelle struktur."
 
 #: projects.inc:98
 msgid "University of Delaware"
@@ -416,7 +529,11 @@ msgid "Study of protein - ligand interactions"
 msgstr ""
 
 #: projects.inc:100
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
+msgid ""
+"Docking at Home has both bioscience and computer science goals. The project "
+"aims to further knowledge of the atomic details of protein-ligand "
+"interactions and, by doing so, will search for insights into the discovery "
+"of novel pharmaceuticals."
 msgstr ""
 
 #: projects.inc:114
@@ -428,7 +545,11 @@ msgid "Molecular simulations of proteins"
 msgstr "Molekylære simuleringer af proteiner"
 
 #: projects.inc:116
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
+msgid ""
+"GPUGrid.net opens novel computational scenarios by the first full-atom "
+"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
+"New biomedical applications suddenly become possible giving a new role to "
+"computational biology for biomedical research."
 msgstr ""
 
 #: projects.inc:122
@@ -440,11 +561,15 @@ msgid "Genetic linkage analysis"
 msgstr ""
 
 #: projects.inc:124
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
+msgid ""
+"Superlink at Technion helps geneticists all over the world find disease-"
+"provoking genes causing some types of diabetes, hypertension (high blood "
+"pressure), cancer, schizophrenia and many others."
 msgstr ""
 
 #: projects.inc:138
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
+msgid ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
 msgstr ""
 
 #: projects.inc:139
@@ -452,7 +577,11 @@ msgid "Life science research"
 msgstr ""
 
 #: projects.inc:140
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
+msgid ""
+"The Lattice Project supplies computing power to scientists at the University "
+"of Maryland studying evolutionary relationships based on DNA sequence data; "
+"bacterial, plasmid, and virus protein sequences; and biological diversity in "
+"nature reserves. "
 msgstr ""
 
 #: projects.inc:146
@@ -464,20 +593,32 @@ msgid "Epidemiology"
 msgstr ""
 
 #: projects.inc:148
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
+msgid ""
+"Simulation models of the transmission dynamics and health effects of malaria "
+"are an important tool for malaria control. They can be used to determine "
+"optimal strategies for delivering mosquito nets, chemotherapy, or new "
+"vaccines which are currently under development and testing.  Such modeling "
+"is extremely computer intensive, requiring simulations of large human "
+"populations with a diverse set of parameters related to biological and "
+"social factors that influence the distribution of the disease. "
 msgstr ""
 
 #: projects.inc:170
 msgid "University of Washington"
 msgstr "Washington Universitet"
 
-#: projects.inc:171
-#: projects.inc:179
+#: projects.inc:171 projects.inc:179
 msgid "Biology"
 msgstr "Biologi"
 
 #: projects.inc:172
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
+msgid ""
+"Determine the 3-dimensional shapes of proteins in research that may "
+"ultimately lead to finding cures for some major human diseases. By running "
+"Rosetta at home you will help us speed up and extend our research in ways we "
+"couldn't possibly attempt without your help. You will also be helping our "
+"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
+"Cancer, and Alzheimer's"
 msgstr ""
 
 #: projects.inc:178
@@ -485,7 +626,10 @@ msgid "University of Vienna"
 msgstr "Wien Universitet"
 
 #: projects.inc:180
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
+msgid ""
+"Calculate similarities between proteins. SIMAP provides a public database of "
+"the resulting data, which plays a key role in many bioinformatics research "
+"projects."
 msgstr ""
 
 #: projects.inc:186
@@ -501,7 +645,15 @@ msgid "Climate study"
 msgstr "Klimastudier"
 
 #: projects.inc:200
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
+msgid ""
+"Investigate the approximations that have to be made in state-of-the-art "
+"climate models. By running the model thousands of times we hope to find out "
+"how the model responds to slight tweaks to these approximations - slight "
+"enough to not make the approximations any less realistic. This will allow us "
+"to improve our understanding of how sensitive our models are to small "
+"changes and also to things like changes in carbon dioxide and the sulphur "
+"cycle. This will allow us to explore how climate may change in the next "
+"century under a wide range of different scenarios."
 msgstr ""
 
 #: projects.inc:207
@@ -513,30 +665,44 @@ msgid "Mechanical engineering"
 msgstr ""
 
 #: projects.inc:214
-msgid "Currently we are calculating the optimum design of a structure call the 52 bar truss"
+msgid ""
+"Currently we are calculating the optimum design of a structure call the 52 "
+"bar truss"
 msgstr ""
 
-#: projects.inc:224
-#: projects.inc:263
-#: projects.inc:271
+#: projects.inc:224 projects.inc:263 projects.inc:271
 msgid "Astronomy"
 msgstr "Astronomi"
 
 #: projects.inc:225
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
+msgid ""
+"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
+"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
+"Universe. We will measure physical parameters (such as stellar mass surface "
+"density, star formation rate surface density, attenuation, and first-order "
+"star formation history) on a resolved pixel-by-pixel basis using spectral "
+"energy distribution (SED) fitting techniques in a distributed computing mode."
 msgstr ""
 
 #: projects.inc:247
 msgid "University of Texas at Austin"
 msgstr ""
 
-#: projects.inc:248
-#: projects.inc:279
+#: projects.inc:248 projects.inc:279
 msgid "Chemistry"
 msgstr "Kemi"
 
 #: projects.inc:249
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
+msgid ""
+"A common problem in theoretical chemistry, condensed matter physics and "
+"materials science is the calculation of the time evolution of an atomic "
+"scale system where, for example, chemical reactions and/or diffusion occur. "
+"Generally the events of interest are quite rare (many orders of magnitude "
+"slower than the vibrational movements of the atoms), and therefore direct "
+"simulations, tracking every movement of the atoms, would take thousands of "
+"years of computer calculations on the fastest present day computer before a "
+"single event of interest can be expected to occur.  Our research group is "
+"interested in calculating the long time dynamics of systems."
 msgstr ""
 
 #: projects.inc:262
@@ -544,23 +710,41 @@ msgid "University of Illinois at Urbana-Champaign"
 msgstr ""
 
 #: projects.inc:264
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
-msgstr "Målet for Cosmology at Home er at søge efter den model, der bedst beskriver vores univers, og at finde den mængde modeller, som passer sammen med den eksisterende atronomiske data for partikelfysik."
+msgid ""
+"The goal of Cosmology at Home is to search for the model that best describes "
+"our Universe and to find the range of models that agree with the available "
+"astronomical particle physics data."
+msgstr ""
+"Målet for Cosmology at Home er at søge efter den model, der bedst beskriver "
+"vores univers, og at finde den mængde modeller, som passer sammen med den "
+"eksisterende atronomiske data for partikelfysik."
 
 #: projects.inc:270
 msgid "Rensselaer Polytechnic Institute"
 msgstr "Rensselaer polyteknisk institut"
 
 #: projects.inc:272
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
-msgstr "Målet for Milkyway at Home er at skabe en yderst præcis tredimentionel model af vores galakse, Mælkevejen, ved hjælp af data, der er samlet af the Sloan Digital Sky Survey."
+msgid ""
+"The goal of Milkyway at Home is to create a highly accurate three dimensional "
+"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
+"Survey."
+msgstr ""
+"Målet for Milkyway at Home er at skabe en yderst præcis tredimentionel model af "
+"vores galakse, Mælkevejen, ved hjælp af data, der er samlet af the Sloan "
+"Digital Sky Survey."
 
 #: projects.inc:278
 msgid "Leiden University, The Netherlands"
 msgstr "Leiden Universitet, Holland"
 
 #: projects.inc:280
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
+msgid ""
+"Surface science calculations using Classical Dynamics.  Leiden Classical "
+"allows volunteers, students and other scientist to submit their personal "
+"calculations to the grid. Each user has his own personal queue for Classical "
+"Dynamics jobs. In this way students have used the grid to simulate liquid "
+"argon, or to test the validity of the ideal gas law by actually doing the "
+"simulations through the grid."
 msgstr ""
 
 #: projects.inc:294
@@ -572,26 +756,50 @@ msgid "Astrophysics"
 msgstr "Astrofysik"
 
 #: projects.inc:296
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
-msgstr "Søgning efter roterende neutronstjerner (også kendt som pulsarer) ved hjælp af data fra gravitationsbølgedetektorerne LIGO og GEO og fra radioobservatoriet Arecibo. Einstein at Home er et projekt fra World Year of Physics 2005, støttet af the American Physical Society (APS) og af et antal internationelle organisationer."
+msgid ""
+"Search for spinning neutron stars (also called pulsars) using data from the "
+"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
+"observatory.  Einstein at Home is a World Year of Physics 2005 project "
+"supported by the American Physical Society (APS) and by a number of "
+"international organizations."
+msgstr ""
+"Søgning efter roterende neutronstjerner (også kendt som pulsarer) ved hjælp "
+"af data fra gravitationsbølgedetektorerne LIGO og GEO og fra "
+"radioobservatoriet Arecibo. Einstein at Home er et projekt fra World Year of "
+"Physics 2005, støttet af the American Physical Society (APS) og af et antal "
+"internationelle organisationer."
 
-#: projects.inc:310
-#: projects.inc:318
+#: projects.inc:310 projects.inc:318
 msgid "CERN (European Organization for Nuclear Research)"
 msgstr "CERN (den europæiske organisation for kerneforskning)"
 
-#: projects.inc:311
-#: projects.inc:319
+#: projects.inc:311 projects.inc:319
 msgid "Physics"
 msgstr "Fysik"
 
 #: projects.inc:312
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
-msgstr "The Large Hadron Collider (LHC) er en partikelaccelerator hos CERN, den europæiske organisation for kerneforskning, verdens største laboratorium for partikelfysik. Det er det kraftigste instrument, der nogensinde er bygget for at udforske partiklernes egenskaber. LHC at home kører simuleringer for at forbedre LHC's design og dens detektorer."
+msgid ""
+"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
+"European Organization for Nuclear Research, the world's largest particle "
+"physics laboratory.  It is the most powerful instrument ever built to "
+"investigate on particles proprieties. LHC at home runs simulations to improve "
+"the design of LHC and its detectors."
+msgstr ""
+"The Large Hadron Collider (LHC) er en partikelaccelerator hos CERN, den "
+"europæiske organisation for kerneforskning, verdens største laboratorium for "
+"partikelfysik. Det er det kraftigste instrument, der nogensinde er bygget "
+"for at udforske partiklernes egenskaber. LHC at home kører simuleringer for at "
+"forbedre LHC's design og dens detektorer."
 
 #: projects.inc:320
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
-msgstr "Dette projekt bruger virtuel maskinteknologi udviklet af CERN for fuldgyldig simulering af fysikken bag LHC-begivenheder på frivillige computere. Kræver at du installerer VirtualBox på din computer"
+msgid ""
+"This project uses CERN-developed virtual machine technology for full-fledged "
+"LHC event physics simulation on volunteer computers.  Requires that you "
+"install VirtualBox on your computer"
+msgstr ""
+"Dette projekt bruger virtuel maskinteknologi udviklet af CERN for fuldgyldig "
+"simulering af fysikken bag LHC-begivenheder på frivillige computere. Kræver "
+"at du installerer VirtualBox på din computer"
 
 #: projects.inc:326
 msgid "University of California, Berkeley"
@@ -602,8 +810,19 @@ msgid "Astrophysics, astrobiology"
 msgstr "Astrofysik, astrobiologi"
 
 #: projects.inc:328
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
-msgstr "SETI (søgning efter udenjordisk intelligens) er et videnskabeligt område, hvis mål er at opdage intelligent liv uden for Jorden. Én tilgang, kendt som radio-SETI, bruger radioteleskoper for at lytte efter radiosignaler med smal båndbredde fra rummet. Sådanne signaler forekommer, så vidt vides, ikke naturligt, så sådan en opdagelse ville give bevis for udenjordisk teknologi."
+msgid ""
+"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
+"goal is to detect intelligent life outside Earth. One approach, known as "
+"radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
+"signals from space. Such signals are not known to occur naturally, so a "
+"detection would provide evidence of extraterrestrial technology."
+msgstr ""
+"SETI (søgning efter udenjordisk intelligens) er et videnskabeligt område, "
+"hvis mål er at opdage intelligent liv uden for Jorden. Én tilgang, kendt som "
+"radio-SETI, bruger radioteleskoper for at lytte efter radiosignaler med "
+"smal båndbredde fra rummet. Sådanne signaler forekommer, så vidt vides, ikke "
+"naturligt, så sådan en opdagelse ville give bevis for udenjordisk "
+"teknologi."
 
 #: projects.inc:342
 msgid "Bielefeld University of Applied Sciences"
@@ -614,8 +833,16 @@ msgid "Chemical engineering and nanotechnology"
 msgstr ""
 
 #: projects.inc:344
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
-msgstr "Studiet af molekylære magneter og kontrolleret magnetisme på nanoskala. Disse magnetiske molekyler vil måske kunne anvendes til fremstillingen af bittesmå magnetiske kontakter til brug indenfor medicin (fx lokal tumorkemoterapi) og bioteknologi."
+msgid ""
+"The study of molecular magnets and controlled nanoscale magnetism.  These "
+"magnetic molecules may be used to develop tiny magnetic switches, with "
+"applications in medicine (such as local tumor chemotherapy) and "
+"biotechnology."
+msgstr ""
+"Studiet af molekylære magneter og kontrolleret magnetisme på nanoskala. "
+"Disse magnetiske molekyler vil måske kunne anvendes til fremstillingen af "
+"bittesmå magnetiske kontakter til brug indenfor medicin (fx lokal "
+"tumorkemoterapi) og bioteknologi."
 
 #: projects.inc:351
 msgid "Multiple applications"
@@ -630,28 +857,42 @@ msgid "Physics, biochemistry, and others"
 msgstr "Fysik, biokemi og andre"
 
 #: projects.inc:358
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
-msgstr "Formålet med CAS at home er at opmuntre og assistere videnskabsfolk i Kina til at adoptere teknologierne for frivillig beregning og den frivillige tankegang for deres forskning."
+msgid ""
+"The objective of CAS at home is to encourage and assist scientists in China to "
+"adopt the technologies of volunteer computing and volunteer thinking for "
+"their research."
+msgstr ""
+"Formålet med CAS at home er at opmuntre og assistere videnskabsfolk i Kina til "
+"at adoptere teknologierne for frivillig beregning og den frivillige "
+"tankegang for deres forskning."
 
 #: projects.inc:365
 msgid "Mathematics, physics, evolution"
 msgstr "Matematik, fysik, evolution"
 
 #: projects.inc:366
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
-msgstr "Yoyo at home er et mellemled mellem BOINC og adskillige eksisterende frivillige beregningsprojekter: ECM, Muon, Evolution at home og distributed.net"
+msgid ""
+"Yoyo at home is an adapter between BOINC and several existing volunteer "
+"computing projects: ECM, Muon, Evolution at home, and distributed.net"
+msgstr ""
+"Yoyo at home er et mellemled mellem BOINC og adskillige eksisterende frivillige "
+"beregningsprojekter: ECM, Muon, Evolution at home og distributed.net"
 
-#: projects.inc:371
-#: projects.inc:527
+#: projects.inc:371 projects.inc:527
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
-msgstr "MTA-SZTAKI laboratorium for parallelle og distribuerede systemer (Ungarn)"
+msgstr ""
+"MTA-SZTAKI laboratorium for parallelle og distribuerede systemer (Ungarn)"
 
 #: projects.inc:372
 msgid "European research projects"
 msgstr "Europæiske forskningsprojekter"
 
 #: projects.inc:373
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
+msgid ""
+"The EDGeS at Home Beta project integrates volunteer computing into the service "
+"grid network of Europe by allowing service grids to send workunits to be "
+"processed by the volunteers of this project. The scientific projects covered "
+"by the project include math, physics, biology, etc."
 msgstr ""
 
 #: projects.inc:379
@@ -675,7 +916,11 @@ msgid "Medical, environmental and other humanitarian research"
 msgstr "Medicinsk, miljømæssig og anden humanitær forskning"
 
 #: projects.inc:389
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
+msgid ""
+"To further critical non-profit research on some of humanity's most pressing "
+"problems by creating the world's largest volunteer computing grid.  Research "
+"includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"clean water and many more."
 msgstr ""
 
 #: projects.inc:395
@@ -694,21 +939,20 @@ msgstr "Matematik, fysik, kunstig intelligens"
 msgid "Simulation of quantum computing; Goldbach's conjecture."
 msgstr "Simulering af kvanteberegning; Goldbachs formodning."
 
-#: projects.inc:450
-#: projects.inc:458
+#: projects.inc:450 projects.inc:458
 msgid "Cryptography"
 msgstr "Kryptografi"
 
 #: projects.inc:459
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
-msgstr "Forsøg på at afkode 3 originale Enigma-beskeder. Signalerne blev opfanget i det nordlige Atlanterhav i 1942, og menes aldrig at være blevet afkodet."
-
-#: projects.inc:465
-#: projects.inc:504
-#: projects.inc:512
-#: projects.inc:520
-#: projects.inc:528
-#: projects.inc:568
+msgid ""
+"Attempt to decode 3 original Enigma messages. The signals were intercepted "
+"in the North Atlantic in 1942 and are believed to be unbroken."
+msgstr ""
+"Forsøg på at afkode 3 originale Enigma-beskeder. Signalerne blev opfanget i "
+"det nordlige Atlanterhav i 1942, og menes aldrig at være blevet afkodet."
+
+#: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
+#: projects.inc:528 projects.inc:568
 msgid "Mathematics"
 msgstr "Matematik"
 
@@ -725,11 +969,19 @@ msgid "Factorization of large integers"
 msgstr "Faktorisering af store heltal"
 
 #: projects.inc:473
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
+msgid ""
+"NFS at Home is a research project that uses Internet-connected computers to do "
+"the lattice sieving step in the Number Field Sieve factorization of large "
+"integers. As a young school student, you gained your first experience at "
+"breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
+"NFS at Home is a continuation of that experience, only with integers that are "
+"hundreds of digits long."
 msgstr ""
 
 #: projects.inc:479
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
+msgid ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
 msgstr ""
 
 #: projects.inc:480
@@ -737,7 +989,11 @@ msgid "Software testing"
 msgstr "Software-test"
 
 #: projects.inc:481
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
+msgid ""
+"The aim of this project is to provide a powerful distributed computing "
+"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
+"well as others Lithuanian academic institutions.  Current applications "
+"involve the study of Monte-Carlo based software testing."
 msgstr ""
 
 #: projects.inc:503
@@ -745,23 +1001,40 @@ msgid "Mathematical Institute of Leiden University / Kennislink"
 msgstr "Matematisk Institut ved Leiden Universitet / Kennislink"
 
 #: projects.inc:505
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
+msgid ""
+"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
+"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
+"product of the distinct prime factors of n. The ABC conjecture says that "
+"there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for "
+"any real h > 1. The ABC conjecture is currently one of the greatest open "
+"problems in mathematics. If it is proven to be true, a lot of other open "
+"problems can be answered directly from it."
 msgstr ""
 
 #: projects.inc:513
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
-msgstr "Primegrid har flere projekter, der søger efter forskellige former for meget store primtal, der iblandt søgning efter det størts kendte primtal."
+msgid ""
+"Primegrid has multiple projects searching for different forms of very large "
+"prime numbers, including searching for the largest known prime number."
+msgstr ""
+"Primegrid har flere projekter, der søger efter forskellige former for meget "
+"store primtal, der iblandt søgning efter det størts kendte primtal."
 
 #: projects.inc:519
 msgid "Hochschule RheinMain University of Applied Sciences"
 msgstr ""
 
 #: projects.inc:521
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
-msgstr "Søgning efter modeksempler til to formodninger, relateret til identificeringen af primtal"
+msgid ""
+"Search for counterexamples to two conjectures related to the identification "
+"of prime numbers"
+msgstr ""
+"Søgning efter modeksempler til to formodninger, relateret til "
+"identificeringen af primtal"
 
 #: projects.inc:529
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
+msgid ""
+"Find all the generalized binary number systems (in which bases are matrices "
+"and digits are vectors) up to dimension 11."
 msgstr ""
 
 #: ../html/inc/news.inc:40
@@ -779,6 +1052,7 @@ msgstr "Nyheder er tilgængelige som en %sRSS-strøm%s"
 #, php-format
 #~ msgid "%s for %s (%s MB)"
 #~ msgstr "%s til %s (%s MB)"
+
 #~ msgid ""
 #~ "BOINC is a program that lets you donate your idle computer time to science "
 #~ "projects like SETI at home, Climateprediction.net, Rosetta at home, World "
@@ -790,8 +1064,10 @@ msgstr "Nyheder er tilgængelige som en %sRSS-strøm%s"
 #~ "Rosetta at home, Rosld Community Grid og mange andre. <p> Efter at have "
 #~ "installeret BOINC på din computer, kan du forbinde den til så mange af disse "
 #~ "projekter, du har lyst til."
+
 #~ msgid "Astronomy, Physics, and Chemistry"
 #~ msgstr "Astronomi, fysik og kemi"
+
 #~ msgid "Browser default"
 #~ msgstr "Browser-standard"
 
@@ -812,3 +1088,413 @@ msgstr "Nyheder er tilgængelige som en %sRSS-strøm%s"
 #~ msgid "POEM at HOME"
 #~ msgstr "Home"
 
+# The charset used for the text in this file (please try to use UTF-8 if possible)
+#~ msgid "CHARSET"
+#~ msgstr "UTF-8"
+
+# #######################################
+# poll-related stuff
+# #######################################
+#~ msgid "POLL_TITLE"
+#~ msgstr "BOINC user survey"
+
+#~ msgid "POLL_INTRO"
+#~ msgstr ""
+#~ "Several volunteer computing projects, including Climateprediction.net, "
+#~ "Einstein at home, and SETI at home, use software called BOINC. If you "
+#~ "participate in projects like this, we request that you answer the "
+#~ "following questions. This will help BOINC-based projects increase "
+#~ "participation and achieve greater scientific results. <p> Please answer "
+#~ "as many questions as you want, then go to the bottom and click OK. If you "
+#~ "previously completed the survey but your answers have changed, please "
+#~ "complete it again - your new answers will replace the old ones. <p> The "
+#~ "current results of the survey are <a href=poll_results.php>here</a>. "
+
+#~ msgid "POLL_RUN"
+#~ msgstr "Do you run BOINC?"
+
+#~ msgid "POLL_PARTICIPATION"
+#~ msgstr "Your participation"
+
+#~ msgid "POLL_COMPUTERS"
+#~ msgstr "Your computers"
+
+#~ msgid "POLL_YOU"
+#~ msgstr "You"
+
+#~ msgid "POLL_NATIONALITY"
+#~ msgstr "Nationality"
+
+#~ msgid "POLL_COMMENTS"
+#~ msgstr "Comments"
+
+#~ msgid "POLL_COMMENTS_QUESTION"
+#~ msgstr ""
+#~ "Please suggest ways that BOINC, and the projects that use it, could be "
+#~ "improved:"
+
+#~ msgid "POLL_OTHER"
+#~ msgstr "Other:"
+
+#~ msgid "POLL_CHECK_ALL"
+#~ msgstr "[check all that apply]"
+
+#~ msgid "POLL_DONE"
+#~ msgstr "When done click:"
+
+#~ msgid "POLL_CURRENT"
+#~ msgstr "Yes - I have been running BOINC on my computer for..."
+
+#~ msgid "POLL_TWEEK"
+#~ msgstr "less than a week"
+
+#~ msgid "POLL_TMONTH"
+#~ msgstr "less than a month"
+
+#~ msgid "POLL_TYEAR"
+#~ msgstr "less than a year"
+
+#~ msgid "POLL_TMOREYEAR"
+#~ msgstr "more than a year"
+
+#~ msgid "POLL_LAPSED"
+#~ msgstr "No - I was running BOINC, but stopped because..."
+
+#~ msgid "POLL_LINTEREST"
+#~ msgstr "I lost interest"
+
+#~ msgid "POLL_LCOMPLICATED"
+#~ msgstr "it was too complicated"
+
+#~ msgid "POLL_LSTOPPED"
+#~ msgstr "I stopped it and forgot to start again"
+
+#~ msgid "POLL_LPROBLEMS"
+#~ msgstr "it caused problems on my computer"
+
+#~ msgid "POLL_LPOWER"
+#~ msgstr "it used too much electricity"
+
+#~ msgid "POLL_LNONBOINC"
+#~ msgstr "I switched to a non-BOINC computing project"
+
+#~ msgid "POLL_FAILED"
+#~ msgstr "No - I tried running BOINC, but..."
+
+#~ msgid "POLL_FINSTALL"
+#~ msgstr "the software didn't install correctly"
+
+#~ msgid "POLL_FFIGURE"
+#~ msgstr "I couldn't figure out how to use the software"
+
+#~ msgid "POLL_FNETWORK"
+#~ msgstr "I had network communication problems"
+
+#~ msgid "POLL_FATTACH"
+#~ msgstr "I couldn't attach to a project"
+
+#~ msgid "POLL_FWORK"
+#~ msgstr "I attached to a project, but never got any work"
+
+#~ msgid "POLL_NEVER"
+#~ msgstr "No - I never tried running BOINC, because..."
+
+#~ msgid "POLL_NSECURITY"
+#~ msgstr "I was concerned about security"
+
+#~ msgid "POLL_NPROJECT"
+#~ msgstr "I wasn't interested in any of the projects"
+
+#~ msgid "POLL_NPERMISSION"
+#~ msgstr "I don't have permission to run it on my computer"
+
+#~ msgid "POLL_NVERSION"
+#~ msgstr "No version was available for my computer"
+
+#~ msgid "POLL_KIND"
+#~ msgstr "What kind of computers do you have running BOINC?"
+
+#~ msgid "POLL_WHERE"
+#~ msgstr "Where are they?"
+
+#~ msgid "POLL_WORK"
+#~ msgstr "Work"
+
+#~ msgid "POLL_SCHOOL"
+#~ msgstr "School"
+
+#~ msgid "POLL_HOW_MANY"
+#~ msgstr "How many computers?"
+
+#~ msgid "POLL_TURNED_ON"
+#~ msgstr "On average, how many hours per day are they powered on?"
+
+#~ msgid "POLL_AGE"
+#~ msgstr "Age"
+
+#~ msgid "POLL_SEX"
+#~ msgstr "Sex"
+
+#~ msgid "POLL_MALE"
+#~ msgstr "Male"
+
+#~ msgid "POLL_FEMALE"
+#~ msgstr "Female"
+
+#~ msgid "POLL_EXPERTISE"
+#~ msgstr "Your level of computer expertise"
+
+#~ msgid "POLL_LEVB"
+#~ msgstr "Beginner"
+
+#~ msgid "POLL_LEVI"
+#~ msgstr "Intermediate"
+
+#~ msgid "POLL_LEVA"
+#~ msgstr "Advanced"
+
+#~ msgid "POLL_LEARN_WHERE"
+#~ msgstr "Where did you learn about BOINC projects?"
+
+#~ msgid "POLL_WTV"
+#~ msgstr "TV/radio/newspaper"
+
+#~ msgid "POLL_WPERS"
+#~ msgstr "From friends, relatives, or coworkers"
+
+#~ msgid "POLL_WTEAM"
+#~ msgstr "Team message boards or web sites"
+
+#~ msgid "POLL_WBOINC"
+#~ msgstr "The BOINC web site"
+
+#~ msgid "POLL_WWEB"
+#~ msgstr "Other web sites"
+
+#~ msgid "POLL_FACTOR"
+#~ msgstr ""
+#~ "Which are the most important factors when you decide whether to "
+#~ "participate in a BOINC project?"
+
+#~ msgid "POLL_GRAPHICS"
+#~ msgstr "Nice-looking screensaver graphics"
+
+#~ msgid "POLL_CREDIT_FAIR"
+#~ msgstr "Fair and quick granting of credit for work done"
+
+#~ msgid "POLL_CREDIT_MORE"
+#~ msgstr "Getting more credit from this project than from others"
+
+#~ msgid "POLL_MB_FRIENDLY"
+#~ msgstr "Helpful and friendly message boards"
+
+#~ msgid "POLL_MB_STAFF"
+#~ msgstr "Participation by project staff on the message boards"
+
+#~ msgid "POLL_WEB_SITE"
+#~ msgstr "Informative project web site"
+
+#~ msgid "POLL_SCIENCE_IMPORTANT"
+#~ msgstr "The science is important and beneficial"
+
+#~ msgid "POLL_SCIENCE_PUBLIC"
+#~ msgstr "Non-profit, and results are public"
+
+#~ msgid "POLL_RECOGNIZE"
+#~ msgstr "Personal recognition if my computer finds something"
+
+#~ msgid "POLL_PUBLISH"
+#~ msgstr "Publication by the project in scientific journals"
+
+#~ msgid "POLL_EMAIL"
+#~ msgstr "Periodic email newsletters from the project"
+
+#~ msgid "POLL_NPROJECTS"
+#~ msgstr "How many BOINC projects do you participate in?"
+
+#~ msgid "POLL_SSAVER"
+#~ msgstr "Do you run BOINC as a screensaver?"
+
+#~ msgid "POLL_YES"
+#~ msgstr "Yes"
+
+#~ msgid "POLL_NO"
+#~ msgstr "No"
+
+#~ msgid "POLL_MBOARDS"
+#~ msgstr "Your usage of project messages boards:"
+
+#~ msgid "POLL_MBR"
+#~ msgstr "to read information"
+
+#~ msgid "POLL_MBRW"
+#~ msgstr "to read and post information"
+
+#~ msgid "POLL_NONE"
+#~ msgstr "None"
+
+#~ msgid "POLL_HELP"
+#~ msgstr ""
+#~ "Where do you get information to help resolve problems with BOINC and/or "
+#~ "BOINC projects?"
+
+#~ msgid "POLL_HELP_PMB"
+#~ msgstr "The project message boards"
+
+#~ msgid "POLL_HELP_BMB"
+#~ msgstr "The BOINC message boards"
+
+#~ msgid "POLL_HELP_BDOC"
+#~ msgstr "The BOINC web site"
+
+#~ msgid "POLL_HELP_BMLIST"
+#~ msgstr "BOINC mailing lists"
+
+#~ msgid "POLL_HELP_WIKI"
+#~ msgstr "The Unofficial BOINC Wiki"
+
+#~ msgid "POLL_HELP_TEAM"
+#~ msgstr "Team web sites"
+
+#~ msgid "POLL_HELP_GOOGLE"
+#~ msgstr "Google or other search engines"
+
+#~ msgid "POLL_ERROR_TITLE"
+#~ msgstr "Error - results not recorded"
+
+#~ msgid "POLL_ERROR_TEXT"
+#~ msgstr ""
+#~ "An internal error has prevented us from recording your survey response.  "
+#~ "Please try again later."
+
+#~ msgid "POLL_RECORDED"
+#~ msgstr "Survey response recorded"
+
+#~ msgid "POLL_THANKS"
+#~ msgstr "Thank you for completing the BOINC user survey."
+
+#~ msgid "POLL_RESULTS_TITLE"
+#~ msgstr "Survey results"
+
+#~ msgid "POLL_RESULTS_TEXT"
+#~ msgstr ""
+#~ "These are the current results of the <a href=poll.php>BOINC user survey</"
+#~ "a>.  This page is updated every hour."
+
+#~ msgid "DL_MIRRORS"
+#~ msgstr ""
+#~ "Note: files are downloaded from mirror servers at boinc.berkeley.edu, "
+#~ "morel.mit.edu, einstein.aei.mpg.de, einstein.astro.gla.ac.uk, einstein."
+#~ "ligo.caltech.edu, and einstein.aset.psu.edu (thanks to these "
+#~ "institutions). The server is chosen randomly - if a download fails, "
+#~ "reload this page and try again. "
+
+# #############################################
+# help.php
+# #############################################
+#~ msgid "HELP_TITLE"
+#~ msgstr "Getting help with BOINC"
+
+#~ msgid "HELP_HEADING1"
+#~ msgstr "Online Help"
+
+#~ msgid "HELP_P1_1"
+#~ msgstr ""
+#~ "BOINC Online Help lets you talk one-on-one with experienced BOINC users, "
+#~ "who can: %s answer questions about BOINC and volunteer computing; %s walk "
+#~ "you through the process of installing and using BOINC; %s troubleshoot "
+#~ "any problems you might have. "
+
+#~ msgid "HELP_P1_2"
+#~ msgstr ""
+#~ "BOINC Online Help is based on %sSkype%s, an Internet-based telephone "
+#~ "system. 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. "
+
+#~ msgid "HELP_P1_3"
+#~ msgstr ""
+#~ "The best way to get help is by voice, for which you need either built-in "
+#~ "microphone and speakers or an external headset for your computer. You can "
+#~ "also use Skype's text-based chat system or regular email (if you don't "
+#~ "have Skype) to communicate with Help Volunteers."
+
+#~ msgid "HELP_P1_4"
+#~ msgstr ""
+#~ "Volunteers speaking several languages are available. Please select a "
+#~ "language: "
+
+#~ msgid "HELP_HEADING2"
+#~ msgstr "BOINC help on the web"
+
+#~ msgid "HELP_P2_ITEM1"
+#~ msgstr "BOINC user's manual"
+
+#~ msgid "HELP_P2_ITEM2"
+#~ msgstr "Troubleshooting BOINC "
+
+#~ msgid "HELP_P2_ITEM3"
+#~ msgstr "BOINC-related web sites "
+
+#~ msgid "HELP_P2_ITEM4"
+#~ msgstr "The BOINC message boards "
+
+#~ msgid "HELP_P2_ITEM5"
+#~ msgstr "The message boards on any BOINC-based project "
+
+#~ msgid "HELP_HEADING3"
+#~ msgstr "Be a Help Volunteer"
+
+#~ msgid "HELP_P3_1"
+#~ msgstr ""
+#~ "If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+#~ "Volunteer%s. It's a great way to help the cause of scientific research "
+#~ "and volunteer computing - and it's fun!  "
+
+#~ msgid "HELP_P3_2"
+#~ msgstr ""
+#~ "If you're already a Help Volunteer: to edit your settings, %sclick here"
+#~ "%s. "
+
+# #############################################
+# index.php
+# #############################################
+#~ msgid "HOME_HEADING1"
+#~ msgstr "Volunteer"
+
+#~ msgid "HOME_P1"
+#~ msgstr ""
+#~ " Use the idle time on your computer  (Windows, Mac, or Linux)  to cure "
+#~ "diseases, study global warming,  discover pulsars, and do many other "
+#~ "types of scientific research.  It's safe, secure, and easy:  %sChoose%s "
+#~ "projects  %sDownload%s and run BOINC software  %sEnter%s an email address "
+#~ "and password. "
+
+#~ msgid "HOME_P2"
+#~ msgstr ""
+#~ "Or, if you run several projects, try an %saccount manager%s such as "
+#~ "%sGridRepublic%s or %sBAM!%s. "
+
+#~ msgid "HOME_P3"
+#~ msgstr ""
+#~ "If you have any questions, or need help getting started, you can %stalk "
+#~ "to a Volunteer Helper%s. "
+
+#~ msgid "HOME_DOWNLOAD"
+#~ msgstr "Download"
+
+#~ msgid "HOME_WEB_SITES"
+#~ msgstr "Web"
+
+#~ msgid "HOME_ADD_ONS"
+#~ msgstr "Add-ons"
+
+#~ msgid "HOME_SURVEY"
+#~ msgstr "Survey"
+
+#~ msgid "HOME_BOINC"
+#~ msgstr "Berkeley Open Infrastructure for Network Computing"
+
+#~ msgid "HOME_BOINC_DESC"
+#~ msgstr ""
+#~ "Open-source software for %svolunteer computing%s and %sgrid computing%s"
diff --git a/locale/de/BOINC-Client.mo b/locale/de/BOINC-Client.mo
index 04fb118..99a7968 100644
Binary files a/locale/de/BOINC-Client.mo and b/locale/de/BOINC-Client.mo differ
diff --git a/locale/de/BOINC-Client.po b/locale/de/BOINC-Client.po
old mode 100755
new mode 100644
index 6ebe143..f8a8c2d
--- a/locale/de/BOINC-Client.po
+++ b/locale/de/BOINC-Client.po
@@ -1,23 +1,23 @@
 # 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: BOINC 7.4\n"
+"Project-Id-Version: boinc\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-10-15 22:25-0700\n"
-"PO-Revision-Date: 2015-02-10 14:51-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: de\n"
+"PO-Revision-Date: 2015-02-08 16:01+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/boinc/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.1.6\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: acct_mgr.cpp:450
-#: acct_mgr.cpp:459
+#: acct_mgr.cpp:450 acct_mgr.cpp:459
 msgid "Message from account manager"
 msgstr "Nachricht vom Kontomanager"
 
@@ -26,7 +26,9 @@ msgid "Message from server"
 msgstr "Nachricht vom Server"
 
 #: client_state.cpp:258
-msgid "Some tasks need more memory than allowed by your preferences.  Please check the preferences."
+msgid ""
+"Some tasks need more memory than allowed by your preferences.  Please check "
+"the preferences."
 msgstr "Einige Aufgaben benötigen mehr Arbeitsspeicher als von ihren Einstellungen erlaubt wird. Bitte die Einstellungen überprüfen."
 
 #: client_state.cpp:520
@@ -39,11 +41,12 @@ msgstr "Die HTTP_PROXY Umgebungsvariable muss einen HTTP-Proxy angeben"
 
 #: cs_scheduler.cpp:613
 #, c-format
-msgid "You used the wrong URL for this project.  When convenient, remove this project, then add %s"
+msgid ""
+"You used the wrong URL for this project.  When convenient, remove this "
+"project, then add %s"
 msgstr "Du hast die falsche URL für dieses Projekt genutzt. Wenn möglich bitte dieses Projekt entfernen und %s neu hinzufügen."
 
-#: cs_statefile.cpp:828
-#: ../sched/sched_types.cpp:259
+#: cs_statefile.cpp:828 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
 msgstr "Syntaxfehler in app_info.xml"
 
@@ -55,18 +58,15 @@ msgstr "Datei auf die aus app_info.xml verwiesen wurde, existiert nicht: "
 msgid "A new version of BOINC is available."
 msgstr "Eine neue Version von BOINC ist verfügbar."
 
-#: current_version.cpp:94
-#: current_version.cpp:102
+#: current_version.cpp:94 current_version.cpp:102
 msgid "Download"
 msgstr "Herunterladen"
 
-#: log_flags.cpp:269
-#: log_flags.cpp:449
+#: log_flags.cpp:269 log_flags.cpp:449
 msgid "Unexpected text in cc_config.xml"
 msgstr "Unerwarteter Text in cc_config.xml"
 
-#: log_flags.cpp:423
-#: log_flags.cpp:475
+#: log_flags.cpp:423 log_flags.cpp:475
 msgid "Unrecognized tag in cc_config.xml"
 msgstr "Nicht erkanntes Tag in cc_config.xml"
 
@@ -91,21 +91,22 @@ msgid "Invalid code signing key.  To fix, remove and add this project."
 msgstr "Ungültiger Signaturschlüssel. Projekt entfernen und neu hinzufügen zum beheben."
 
 #: ../sched/handle_request.cpp:859
-msgid "The project has changed its security key.  Please remove and add this project."
+msgid ""
+"The project has changed its security key.  Please remove and add this "
+"project."
 msgstr "Dieses Projekt hat einen neuen Sicherheitsschlüssel. Entfernen und fügen sie das Projekt neu hinzu."
 
-# Im Quellcode folgt nach diesem Text die Angabe des erkannten Betriebssystems!
 #: ../sched/handle_request.cpp:943
 msgid "This project doesn't support operating system"
 msgstr "Dieses Projekt unterstützt nicht das Betriebssystem"
 
-# Im Quellcode folgt nach diesem Satz die Angabe des erkannten Prozessortyps!
 #: ../sched/handle_request.cpp:969
 msgid "This project doesn't support CPU type"
 msgstr "Dieses Projekt unterstützt nicht den Prozessortyp"
 
 #: ../sched/handle_request.cpp:993
-msgid "Your BOINC client software is too old.  Please install the current version."
+msgid ""
+"Your BOINC client software is too old.  Please install the current version."
 msgstr "Die BOINC Installation ist zu alt. Bitte die aktuelle Version installieren."
 
 #: ../sched/handle_request.cpp:1259
@@ -113,18 +114,21 @@ msgid "This project doesn't support computers of type"
 msgstr "Dieses Projekt unterstützt keine Computer vom Typ"
 
 #: ../sched/sched_send.cpp:1092
-msgid "Upgrade to the latest driver to process tasks using your computer's GPU"
+msgid ""
+"Upgrade to the latest driver to process tasks using your computer's GPU"
 msgstr "Auf die neuesten Treiber aktualisieren, um die GPU dieses Computers nutzen zu können."
 
 #: ../sched/sched_send.cpp:1099
-msgid "Upgrade to the latest driver to use all of this project's GPU applications"
+msgid ""
+"Upgrade to the latest driver to use all of this project's GPU applications"
 msgstr "Auf die neuesten Treiber aktualisieren, um alle GPU-Anwendungen dieses Projekts nutzen zu können."
 
 #: ../sched/sched_send.cpp:1118
-msgid "A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to the current version"
+msgid ""
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to"
+" the current version"
 msgstr "Eine neuere Version von BOINC ist erforderlich um die NVIDIA GPU zu verwenden. Bitte auf die aktuellste Version aktualisieren."
 
-# 94%
 #: ../sched/sched_send.cpp:1146
 #, c-format
 msgid "An %s GPU is required to run tasks for this project"
@@ -144,7 +148,8 @@ msgstr "Neuere BOINC Version wird benötigt. Bitte die aktuelle Version installi
 
 #: ../sched/sched_send.cpp:1305
 #, c-format
-msgid "Tasks for %s are available, but your preferences are set to not accept them"
+msgid ""
+"Tasks for %s are available, but your preferences are set to not accept them"
 msgstr "Aufgaben für %s sind verfügbar, aber die aktuellen Einstellungen verbieten diese"
 
 #: ../sched/sched_types.cpp:254
@@ -154,50 +159,3 @@ msgstr "Unbekannter Anwendungsname in app_info.xml"
 #: ../sched/sched_version.cpp:214
 msgid "Your app_info.xml file doesn't have a usable version of"
 msgstr "Ihre app_info.xml Datei enthält keine nutzbare Version von"
-
-#~ msgid "Download it."
-#~ msgstr "Bitte herunterladen."
-#~ msgid "An NVIDIA or ATI GPU is required to run tasks for this project"
-#~ msgstr "Für dieses Projekt wird eine NVIDIA oder ATI GPU benötigt"
-#~ msgid "An NVIDIA GPU is required to run tasks for this project"
-#~ msgstr "Für dieses Projekt wird eine NVIDIA GPU benötigt"
-#~ msgid "An ATI GPU is required to run tasks for this project"
-#~ msgstr "Für dieses Projekt wird eine ATI GPU benötigt"
-#~ msgid ""
-#~ "Tasks for NVIDIA GPU are available, but your preferences are set to not "
-#~ "accept them"
-#~ msgstr ""
-#~ "Aufgaben für NVIDIA GPUs sind verfügbar, aber Ihre Einstellungen verbieten "
-#~ "diese."
-#~ msgid ""
-#~ "Tasks for ATI GPU are available, but your preferences are set to not accept "
-#~ "them"
-#~ msgstr ""
-#~ "Aufgaben für ATI GPUs sind verfügbar, aber Ihre Einstellungen verbieten "
-#~ "diese."
-#~ msgid ""
-#~ "Tasks for CPU are available, but your preferences are set to not accept them"
-#~ msgstr ""
-#~ "Aufgaben für die CPU sind verfügbar, aber Ihre Einstellungen verbieten "
-#~ "diese."
-#~ msgid "error"
-#~ msgstr "Fehler"
-#~ msgid "Can't resolve hostname in remote_hosts.cfg"
-#~ msgstr "Rechnername in remote_hosts.cfg konnte nicht aufgelöst werden."
-#~ msgid "is not available for"
-#~ msgstr "ist nicht verfügbar für"
-#~ msgid "Notice from BOINC"
-#~ msgstr "Nachrichten von BOINC"
-#~ msgid "Message from"
-#~ msgstr "Nachricht von"
-#~ msgid ""
-#~ "You may have an outdated code signing key.  Try attaching and reattaching "
-#~ "this project."
-#~ msgstr ""
-#~ "Veralteter Signierschlüssel möglich.  Projekt abmelden und neu anmelden "
-#~ "könnte helfen."
-#~ msgid "XML syntax error in"
-#~ msgstr "XML Syntax-Fehler in"
-#~ msgid "Unparsed tag in"
-#~ msgstr "Übersprungenes Tag in"
-
diff --git a/locale/de/BOINC-Manager.mo b/locale/de/BOINC-Manager.mo
index 7b05857..5f166b0 100644
Binary files a/locale/de/BOINC-Manager.mo and b/locale/de/BOINC-Manager.mo differ
diff --git a/locale/de/BOINC-Manager.po b/locale/de/BOINC-Manager.po
index 72e5897..a7ae7b7 100644
--- a/locale/de/BOINC-Manager.po
+++ b/locale/de/BOINC-Manager.po
@@ -1,64 +1,53 @@
 # 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:
+# Christian Beer <christian.beer at posteo.de>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: boinc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-15 14:15-0500\n"
-"PO-Revision-Date: 2015-02-10 14:53-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC.DE Team <webmaster at boinc.de>\n"
-"Language: de\n"
+"POT-Creation-Date: 2014-02-02 00:00-0800\n"
+"PO-Revision-Date: 2015-02-13 15:58+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc_7.4\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1418893064.0\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-SearchPath-0: clientgui\n"
-"X-Poedit-SearchPath-1: clientgui/msw\n"
-"X-Poedit-SearchPath-2: clientgui/gtk\n"
-"X-Poedit-SearchPath-3: clientgui/mac\n"
-
-#: clientgui/AccountInfoPage.cpp:387
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: AccountInfoPage.cpp:387
 #, c-format
 msgid "Identify your account at %s"
 msgstr "Identifizieren Sie Ihr Benutzerkonto bei %s"
 
-#: clientgui/AccountInfoPage.cpp:393
+#: AccountInfoPage.cpp:393
 msgid ""
 "Please enter your account information\n"
 "(to create an account, visit the project's web site)"
-msgstr ""
-"Bitte geben Sie Ihre Kontoinformationen ein.\n"
-"(Zum Erstellen eines Benutzerkontos, Projektseite besuchen)"
+msgstr "Bitte geben Sie Ihre Kontoinformationen ein.\n(Zum Erstellen eines Benutzerkontos, Projektseite besuchen)"
 
-#: clientgui/AccountInfoPage.cpp:397
+#: AccountInfoPage.cpp:397
 msgid ""
 "This project is not currently accepting new accounts.\n"
 "You can add it only if you already have an account."
-msgstr ""
-"Dieses Projekt kann zur Zeit keine weiteren Benutzerkonten aufnehmen.\n"
-"Sie können es nur hinzufügen, wenn Sie bereits über ein\n"
-"Teilnehmerkonto verfügen."
+msgstr "Dieses Projekt kann zur Zeit keine weiteren Benutzerkonten aufnehmen.\nSie können es nur hinzufügen, wenn Sie bereits über ein\nTeilnehmerkonto verfügen."
 
-#: clientgui/AccountInfoPage.cpp:401
+#: AccountInfoPage.cpp:401
 msgid "Are you already running this project?"
 msgstr "Nehmen Sie bereits an diesem Projekt teil?"
 
-#: clientgui/AccountInfoPage.cpp:405
+#: AccountInfoPage.cpp:405
 msgid "&No, new user"
 msgstr "&Nein, neuer Benutzer"
 
-#: clientgui/AccountInfoPage.cpp:408
+#: AccountInfoPage.cpp:408
 msgid "&Yes, existing user"
 msgstr "&Ja, existierender Benutzer"
 
-#: clientgui/AccountInfoPage.cpp:413
+#: AccountInfoPage.cpp:413
 msgid ""
 "We were not able to set up your account information\n"
 "automatically.\n"
@@ -66,504 +55,469 @@ msgid ""
 "Please click on the 'Find login information' link\n"
 "below to find out what to put in the email address and\n"
 "password fields."
-msgstr ""
-"Die Kontoinformationen konnten nicht automatisch\n"
-"ermittelt werden. \n"
-"\n"
-"Bitte benutzen Sie den Link \"Kontoinformationen suchen\", \n"
-"um die richtigen Eingaben für die E-Mail-Adresse und \n"
-"das Passwort zu finden."
+msgstr "Die Kontoinformationen konnten nicht automatisch\nermittelt werden. \n\nBitte benutzen Sie den Link \"Kontoinformationen suchen\", \num die richtigen Eingaben für die E-Mail-Adresse und \ndas Passwort zu finden."
 
-#: clientgui/AccountInfoPage.cpp:416
+#: AccountInfoPage.cpp:416
 msgid "Find login information"
 msgstr "Kontoinformationen suchen"
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:649
+#: AccountInfoPage.cpp:436 AccountInfoPage.cpp:641
 msgid "&Password:"
 msgstr "&Passwort:"
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:673
+#: AccountInfoPage.cpp:443 AccountInfoPage.cpp:665
 msgid "Choose a &password:"
 msgstr "&Passwort wählen:"
 
-#: clientgui/AccountInfoPage.cpp:446
+#: AccountInfoPage.cpp:446
 msgid "C&onfirm password:"
 msgstr "Passwort &bestätigen:"
 
-#: clientgui/AccountInfoPage.cpp:453
+#: AccountInfoPage.cpp:453
 #, c-format
 msgid "Are you already running %s?"
 msgstr "Läuft %s bereits?"
 
-#: clientgui/AccountInfoPage.cpp:482
+#: AccountInfoPage.cpp:482
 msgid "&Username:"
-msgstr "Benutzername:"
+msgstr "&Benutzername:"
 
-#: clientgui/AccountInfoPage.cpp:511
-msgid "&Email address or LDAP ID:"
-msgstr "E-Mail-Adresse oder LDAP ID:"
-
-#: clientgui/AccountInfoPage.cpp:515
+#: AccountInfoPage.cpp:508
 msgid "&Email address:"
 msgstr "E-Mail-Adresse:"
 
-#: clientgui/AccountInfoPage.cpp:523
+#: AccountInfoPage.cpp:515
 #, c-format
 msgid "minimum length %d"
 msgstr "minimale Länge %d"
 
-#: clientgui/AccountInfoPage.cpp:530
+#: AccountInfoPage.cpp:522
 msgid "Forgot your password?"
 msgstr "Haben Sie ihr Passwort vergessen?"
 
-#: clientgui/AccountInfoPage.cpp:537
+#: AccountInfoPage.cpp:529
 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 ""
-"Bevor Sie fortfahren, müssen Sie bereits ein Konto\n"
-"bei dieser Kontoverwaltung besitzen. Klicken Sie auf\n"
-"den folgenden Link, um sich zu registrieren oder ein\n"
-"neues Passwort anzufordern."
+msgstr "Bevor Sie fortfahren, müssen Sie bereits ein Konto\nbei dieser Kontoverwaltung besitzen. Klicken Sie auf\nden folgenden Link, um sich zu registrieren oder ein\nneues Passwort anzufordern."
 
-#: clientgui/AccountInfoPage.cpp:540
+#: AccountInfoPage.cpp:532
 msgid "Account manager web site"
 msgstr "Webseite der Kontoverwaltung"
 
-#: clientgui/AccountInfoPage.cpp:582
+#: AccountInfoPage.cpp:574 WelcomePage.cpp:348
 msgid "Add project"
 msgstr "Projekt hinzufügen"
 
-#: clientgui/AccountInfoPage.cpp:584
+#: AccountInfoPage.cpp:576
 msgid "Update account manager"
 msgstr "Kontoverwaltung aktualisieren"
 
-#: clientgui/AccountInfoPage.cpp:586
+#: AccountInfoPage.cpp:578 WelcomePage.cpp:307 WelcomePage.cpp:321
 msgid "Use account manager"
 msgstr "Kontoverwaltung benutzen"
 
-#: clientgui/AccountInfoPage.cpp:593
+#: AccountInfoPage.cpp:585
 msgid "Please enter a user name."
 msgstr "Geben Sie bitte einen Benutzernamen ein."
 
-#: clientgui/AccountInfoPage.cpp:595
+#: AccountInfoPage.cpp:587
 msgid "Please enter an email address."
 msgstr "Geben Sie bitte eine E-Mail-Adresse ein."
 
-#: clientgui/AccountInfoPage.cpp:605
+#: AccountInfoPage.cpp:597
 #, c-format
 msgid "Please enter a password of at least %d characters."
 msgstr "Geben Sie bitte ein Passwort mit mindestens %d Zeichen ein."
 
-#: clientgui/AccountInfoPage.cpp:615
-msgid "The password and confirmation password do not match. Please type them again."
+#: AccountInfoPage.cpp:607
+msgid ""
+"The password and confirmation password do not match. Please type them again."
 msgstr "Das Passwort und die Bestätigung weichen voneinander ab. Bitte wiederholen sie die Eingabe."
 
-#: clientgui/AccountManagerInfoPage.cpp:272
+#: AccountManagerInfoPage.cpp:272
 msgid "Choose an account manager"
 msgstr "Wählen Sie eine Kontoverwaltung"
 
-#: clientgui/AccountManagerInfoPage.cpp:275
+#: AccountManagerInfoPage.cpp:275
 msgid ""
 "To choose an account manager, click its name or \n"
 "type its URL below."
-msgstr ""
-"Um eine Kontoverwaltung zu wählen, klicken Sie auf den Namen\n"
-"oder geben Sie die Kontoverwaltungsadresse ein."
+msgstr "Um eine Kontoverwaltung zu wählen, klicken Sie auf den Namen\noder geben Sie die Kontoverwaltungsadresse ein."
 
-#: clientgui/AccountManagerInfoPage.cpp:279
+#: AccountManagerInfoPage.cpp:279
 msgid "Account manager details:"
 msgstr "Details der Kontoverwaltung:"
 
-#: clientgui/AccountManagerInfoPage.cpp:283
+#: AccountManagerInfoPage.cpp:283
 msgid "Account manager &URL:"
 msgstr "Kontoverwaltung &URL:"
 
-#: clientgui/AccountManagerInfoPage.cpp:287
+#: AccountManagerInfoPage.cpp:287
 msgid "Open web page"
 msgstr "Webseite öffnen"
 
-#: clientgui/AccountManagerInfoPage.cpp:290
+#: AccountManagerInfoPage.cpp:290
 msgid "Visit this account manager's web site"
 msgstr "Die Webseite dieser Kontoverwaltung besuchen"
 
-#: clientgui/AccountManagerProcessingPage.cpp:186
-#: clientgui/AccountManagerPropertiesPage.cpp:192
+#: AccountManagerProcessingPage.cpp:187 AccountManagerPropertiesPage.cpp:193
 #, c-format
 msgid "Communicating with %s."
 msgstr "Kommunikation mit %s."
 
-#: clientgui/AccountManagerProcessingPage.cpp:193
-#: clientgui/AccountManagerPropertiesPage.cpp:199
+#: AccountManagerProcessingPage.cpp:194 AccountManagerPropertiesPage.cpp:200
 msgid "Communicating with server."
 msgstr "Kommunikation mit dem Server."
 
-#: clientgui/AccountManagerProcessingPage.cpp:198
-#: clientgui/AccountManagerPropertiesPage.cpp:204
+#: AccountManagerProcessingPage.cpp:199 AccountManagerPropertiesPage.cpp:205
 msgid "Please wait..."
 msgstr "Bitte warten..."
 
-#: clientgui/AccountManagerProcessingPage.cpp:325
+#: AccountManagerProcessingPage.cpp:326
 msgid "An internal server error has occurred.\n"
 msgstr "Ein interner Server-Fehler ist aufgetreten.\n"
 
-#: clientgui/AdvancedFrame.cpp:96
+#: AdvancedFrame.cpp:95
 msgid "Connected"
 msgstr "Verbunden"
 
-#: clientgui/AdvancedFrame.cpp:104
+#: AdvancedFrame.cpp:103
 msgid "Disconnected"
 msgstr "Verbindung getrennt"
 
-#: clientgui/AdvancedFrame.cpp:318
+#: AdvancedFrame.cpp:322 sg_BoincSimpleFrame.cpp:119
 #, c-format
 msgid "Close the %s window"
 msgstr "Das %s Fenster schließen."
 
-#: clientgui/AdvancedFrame.cpp:321
+#: AdvancedFrame.cpp:325 sg_BoincSimpleFrame.cpp:122
 msgid "&Close Window"
 msgstr "Fenster &Schließen"
 
-#: clientgui/AdvancedFrame.cpp:332
-#: clientgui/AdvancedFrame.cpp:339
-#: clientgui/AdvancedFrame.cpp:346
+#: AdvancedFrame.cpp:336 AdvancedFrame.cpp:343 AdvancedFrame.cpp:350
 #, c-format
 msgid "Exit %s"
 msgstr "Beende %s"
 
-#: clientgui/AdvancedFrame.cpp:359
-msgid "Preferences..."
-msgstr "Einstellungen..."
-
-#: clientgui/AdvancedFrame.cpp:368
+#: AdvancedFrame.cpp:371
 msgid "&Notices\tCtrl+Shift+N"
 msgstr "&Nachrichten\tCtrl+Shift+N"
 
-#: clientgui/AdvancedFrame.cpp:369
+#: AdvancedFrame.cpp:372
 msgid "Display notices"
 msgstr "Nachrichten anzeigen"
 
-#: clientgui/AdvancedFrame.cpp:374
+#: AdvancedFrame.cpp:377
 msgid "&Projects\tCtrl+Shift+P"
 msgstr "&Projekte\tCtrl+Shift+P"
 
-#: clientgui/AdvancedFrame.cpp:375
+#: AdvancedFrame.cpp:378
 msgid "Display projects"
 msgstr "Projekte anzeigen"
 
-#: clientgui/AdvancedFrame.cpp:380
+#: AdvancedFrame.cpp:383
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr "&Aufgaben\tCtrl+Shift+A"
 
-#: clientgui/AdvancedFrame.cpp:381
+#: AdvancedFrame.cpp:384
 msgid "Display tasks"
 msgstr "Aufgaben anzeigen"
 
-#: clientgui/AdvancedFrame.cpp:386
+#: AdvancedFrame.cpp:389
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr "Ü&bertragungen\tCtrl+Shift+B"
 
-#: clientgui/AdvancedFrame.cpp:387
+#: AdvancedFrame.cpp:390
 msgid "Display transfers"
 msgstr "Übertragungen anzeigen"
 
-#: clientgui/AdvancedFrame.cpp:392
+#: AdvancedFrame.cpp:395
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "&Statistiken\tCtrl+Shift+S"
 
-#: clientgui/AdvancedFrame.cpp:393
+#: AdvancedFrame.cpp:396
 msgid "Display statistics"
 msgstr "Statistiken anzeigen"
 
-#: clientgui/AdvancedFrame.cpp:398
+#: AdvancedFrame.cpp:401
 msgid "&Disk usage\tCtrl+Shift+D"
 msgstr "&Festplatte\tCtrl+Shift+F"
 
-#: clientgui/AdvancedFrame.cpp:399
+#: AdvancedFrame.cpp:402
 msgid "Display disk usage"
 msgstr "Festplattennutzung anzeigen"
 
-#: clientgui/AdvancedFrame.cpp:406
+#: AdvancedFrame.cpp:409
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr "&Einfache Ansicht...\tCtrl+Shift+E"
 
-#: clientgui/AdvancedFrame.cpp:407
+#: AdvancedFrame.cpp:410
 msgid "Display the simple graphical interface."
 msgstr "Schaltet auf die vereinfachte BOINC-Grafikoberfläche um."
 
-#: clientgui/AdvancedFrame.cpp:421
+#: AdvancedFrame.cpp:424
 msgid "&Add project or account manager..."
 msgstr "Ein &Projekt oder eine Kontoverwaltung hinzufügen..."
 
-#: clientgui/AdvancedFrame.cpp:422
+#: AdvancedFrame.cpp:425 sg_ProjectPanel.cpp:76
 msgid "Volunteer for any or all of 30+ projects in many areas of science"
 msgstr "Nimm an einigen oder allen der über 30 Projekte aus verschiedenen Bereichen teil."
 
-#: clientgui/AdvancedFrame.cpp:426
+#: AdvancedFrame.cpp:429
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "&Synchronisiere mit %s"
 
-#: clientgui/AdvancedFrame.cpp:430
+#: AdvancedFrame.cpp:433
 #, c-format
 msgid "Get current settings from %s"
 msgstr "Hole die aktuellen Einstellungen von %s"
 
-#: clientgui/AdvancedFrame.cpp:440
+#: AdvancedFrame.cpp:443
 msgid "&Add project..."
 msgstr "Projekt &hinzufügen..."
 
-#: clientgui/AdvancedFrame.cpp:441
+#: AdvancedFrame.cpp:444
 msgid "Add a project"
 msgstr "Ein Projekt hinzufügen"
 
-#: clientgui/AdvancedFrame.cpp:444
+#: AdvancedFrame.cpp:447
 #, c-format
 msgid "S&top using %s..."
 msgstr "&Stoppe die Nutzung von %s ..."
 
-#: clientgui/AdvancedFrame.cpp:450
+#: AdvancedFrame.cpp:453
 msgid "Remove this computer from account manager control."
 msgstr "Trennt diesen Client von der Kontoverwaltung."
 
-#: clientgui/AdvancedFrame.cpp:455
+#: AdvancedFrame.cpp:458 sg_BoincSimpleFrame.cpp:178
 msgid "&Options..."
 msgstr "&Optionen..."
 
-#: clientgui/AdvancedFrame.cpp:456
+#: AdvancedFrame.cpp:459 sg_BoincSimpleFrame.cpp:179
 msgid "Configure display options and proxy settings"
 msgstr "Das Aussehen des BOINC Managers und die Proxy Einstellungen konfigurieren."
 
-#: clientgui/AdvancedFrame.cpp:460
+#: AdvancedFrame.cpp:463 sg_BoincSimpleFrame.cpp:172
 msgid "Computing &preferences..."
 msgstr "&Einstellungen..."
 
-#: clientgui/AdvancedFrame.cpp:461
+#: AdvancedFrame.cpp:464 sg_BoincSimpleFrame.cpp:173
 msgid "Configure computing preferences"
 msgstr "Die lokalen Einstellungen konfigurieren."
 
-#: clientgui/AdvancedFrame.cpp:469
+#: AdvancedFrame.cpp:472
 msgid "&Run always"
 msgstr "&Immer ausführen"
 
-#: clientgui/AdvancedFrame.cpp:470
+#: AdvancedFrame.cpp:473
 msgid "Allow work regardless of preferences"
 msgstr "BOINC arbeitet permanent. Andere Einstellungen, ausgenommen zum Netzwerkzugriff, werden übersteuert."
 
-#: clientgui/AdvancedFrame.cpp:474
+#: AdvancedFrame.cpp:477
 msgid "Run based on &preferences"
 msgstr "Ausführen nach &Voreinstellung"
 
-#: clientgui/AdvancedFrame.cpp:475
+#: AdvancedFrame.cpp:478
 msgid "Allow work according to preferences"
 msgstr "BOINC arbeitet entsprechend der Einstellungen."
 
-#: clientgui/AdvancedFrame.cpp:479
+#: AdvancedFrame.cpp:482
 msgid "&Suspend"
 msgstr "&Anhalten"
 
-#: clientgui/AdvancedFrame.cpp:480
+#: AdvancedFrame.cpp:483
 msgid "Stop work regardless of preferences"
 msgstr "BOINC unterbricht alle Arbeiten. Andere Einstellungen werden übersteuert."
 
-#: clientgui/AdvancedFrame.cpp:505
+#: AdvancedFrame.cpp:508
 msgid "Use GPU always"
 msgstr "GPU immer nutzen"
 
-#: clientgui/AdvancedFrame.cpp:506
+#: AdvancedFrame.cpp:509
 msgid "Allow GPU work regardless of preferences"
 msgstr "Erlaubt GPU-Arbeit ungeachtet der Voreinstellungen"
 
-#: clientgui/AdvancedFrame.cpp:510
+#: AdvancedFrame.cpp:513
 msgid "Use GPU based on preferences"
 msgstr "GPU-Nutzung nach &Voreinstellung"
 
-#: clientgui/AdvancedFrame.cpp:511
+#: AdvancedFrame.cpp:514
 msgid "Allow GPU work according to preferences"
 msgstr "BOINC nutzt die GPU entsprechend der Einstellungen."
 
-#: clientgui/AdvancedFrame.cpp:515
+#: AdvancedFrame.cpp:518
 msgid "Suspend GPU"
 msgstr "GPU anhalten"
 
-#: clientgui/AdvancedFrame.cpp:516
+#: AdvancedFrame.cpp:519
 msgid "Stop GPU work regardless of preferences"
 msgstr "Stoppt GPU-Arbeit ungeachtet der Voreinstellungen."
 
-#: clientgui/AdvancedFrame.cpp:540
+#: AdvancedFrame.cpp:543
 msgid "Network activity always available"
 msgstr "Netzwerkzugriff immer &erlaubt"
 
-#: clientgui/AdvancedFrame.cpp:541
+#: AdvancedFrame.cpp:544
 msgid "Allow network activity regardless of preferences"
 msgstr "Erlaubt BOINC immer auf das Internet zuzugreifen."
 
-#: clientgui/AdvancedFrame.cpp:545
+#: AdvancedFrame.cpp:548
 msgid "Network activity based on preferences"
 msgstr "Netzwerkaktivität nach V&oreinstellung"
 
-#: clientgui/AdvancedFrame.cpp:546
+#: AdvancedFrame.cpp:549
 msgid "Allow network activity according to preferences"
 msgstr "Erlaubt BOINC den Internetzugriff entsprechend den Einstellungen."
 
-#: clientgui/AdvancedFrame.cpp:550
+#: AdvancedFrame.cpp:553
 msgid "Network activity suspended"
 msgstr "Netzwerkzugriff a&bgeschaltet"
 
-#: clientgui/AdvancedFrame.cpp:551
+#: AdvancedFrame.cpp:554
 msgid "Stop BOINC network activity"
 msgstr "Verhindert dass BOINC auf das Internet zugreift."
 
-#: clientgui/AdvancedFrame.cpp:561
+#: AdvancedFrame.cpp:564
 #, c-format
 msgid "Connect to another computer running %s"
 msgstr "Verbindet mit einem anderen Computer auf dem %s läuft."
 
-#: clientgui/AdvancedFrame.cpp:566
+#: AdvancedFrame.cpp:569
 msgid "Select computer..."
 msgstr "&Computer auswählen..."
 
-#: clientgui/AdvancedFrame.cpp:571
+#: AdvancedFrame.cpp:574
 msgid "Shut down connected client..."
 msgstr "Beenden des aktuell verbundenen Client..."
 
-#: clientgui/AdvancedFrame.cpp:572
+#: AdvancedFrame.cpp:575
 msgid "Shut down the currently connected client"
 msgstr "Beendet den aktuell verbundenen Client."
 
-#: clientgui/AdvancedFrame.cpp:576
+#: AdvancedFrame.cpp:579
 msgid "Run CPU &benchmarks"
 msgstr "Bench&marks ausführen"
 
-#: clientgui/AdvancedFrame.cpp:577
+#: AdvancedFrame.cpp:580
 msgid "Runs BOINC CPU benchmarks"
 msgstr "Startet die BOINC CPU Benchmarks."
 
-#: clientgui/AdvancedFrame.cpp:581
+#: AdvancedFrame.cpp:584
 msgid "Do network communication"
 msgstr "Netzwerk-&Kommunikation ausführen"
 
-#: clientgui/AdvancedFrame.cpp:582
+#: AdvancedFrame.cpp:585
 msgid "Do all pending network communication"
 msgstr "Ausstehende Netzwerk-Kommunikation ausführen."
 
-# 94%
-#: clientgui/AdvancedFrame.cpp:586
+#: AdvancedFrame.cpp:589
 msgid "Read config files"
 msgstr "Konfigurationsdateien einlesen"
 
-#: clientgui/AdvancedFrame.cpp:587
-msgid "Read configuration info from cc_config.xml and any app_config.xml files"
+#: AdvancedFrame.cpp:590
+msgid ""
+"Read configuration info from cc_config.xml and any app_config.xml files"
 msgstr "Die Einstellungen der cc_config.xml Datei und etwaiger app_config.xml Dateien einlesen."
 
-#: clientgui/AdvancedFrame.cpp:591
+#: AdvancedFrame.cpp:594
 msgid "Read local prefs file"
 msgstr "Lokale Einstellungsdatei lesen"
 
-#: clientgui/AdvancedFrame.cpp:592
+#: AdvancedFrame.cpp:595
 msgid "Read preferences from global_prefs_override.xml."
 msgstr "Einstellungen aus global_prefs_override.xml lesen."
 
-#: clientgui/AdvancedFrame.cpp:597
+#: AdvancedFrame.cpp:600
 #, c-format
 msgid "Launch another instance of %s..."
 msgstr "Eine neue Instanz von %s starten..."
 
-#: clientgui/AdvancedFrame.cpp:601
+#: AdvancedFrame.cpp:604
 #, c-format
 msgid "Launch another %s"
 msgstr "Weiteren %s starten"
 
-# Das Eventlog in 6.12 ist das Meldungstab aus 6.10 hier sollte der Name konsistent bleiben.
-#: clientgui/AdvancedFrame.cpp:611
+#: AdvancedFrame.cpp:614
 msgid "Event Log...\tCtrl+Shift+E"
 msgstr "Meldungen... \t Ctrl+Shift+M"
 
-#: clientgui/AdvancedFrame.cpp:612
+#: AdvancedFrame.cpp:615
 msgid "Display diagnostic messages."
 msgstr "Zeige Diagnosenachrichten."
 
-#: clientgui/AdvancedFrame.cpp:616
-msgid "Event Log Diagnostic Flags...\tCtrl+Shift+F"
-msgstr "Meldungen Diagnose-Einstellungen...\tCtrl+Shift+F"
-
-#: clientgui/AdvancedFrame.cpp:617
-msgid "Enable or disable various diagnostic messages"
-msgstr "Aktivieren oder deaktivieren verschiedener Diagnosenachrichten"
-
-#: clientgui/AdvancedFrame.cpp:626
+#: AdvancedFrame.cpp:625 sg_BoincSimpleFrame.cpp:188
 #, c-format
 msgid "%s &help"
 msgstr "%s &Hilfe"
 
-#: clientgui/AdvancedFrame.cpp:632
+#: AdvancedFrame.cpp:631 sg_BoincSimpleFrame.cpp:194
 #, c-format
 msgid "Show information about %s"
 msgstr "Zeige Informationen über %s"
 
-#: clientgui/AdvancedFrame.cpp:644
+#: AdvancedFrame.cpp:643
 #, c-format
 msgid "&%s help"
 msgstr "&%s Hilfe"
 
-#: clientgui/AdvancedFrame.cpp:650
+#: AdvancedFrame.cpp:649 sg_BoincSimpleFrame.cpp:212
 #, c-format
 msgid "Show information about the %s"
 msgstr "Zeige Informationen über %s"
 
-#: clientgui/AdvancedFrame.cpp:662
+#: AdvancedFrame.cpp:661 sg_BoincSimpleFrame.cpp:224
 #, c-format
 msgid "%s &web site"
 msgstr "%s &Webseite"
 
-#: clientgui/AdvancedFrame.cpp:668
+#: AdvancedFrame.cpp:667 sg_BoincSimpleFrame.cpp:230
 #, c-format
 msgid "Show information about BOINC and %s"
 msgstr "Zeige Informationen über BOINC und %s"
 
-#: clientgui/AdvancedFrame.cpp:680
-#: clientgui/BOINCTaskBar.cpp:544
+#: AdvancedFrame.cpp:679 BOINCTaskBar.cpp:530 sg_BoincSimpleFrame.cpp:242
 #, c-format
 msgid "&About %s..."
 msgstr "&Über %s..."
 
-#: clientgui/AdvancedFrame.cpp:686
+#: AdvancedFrame.cpp:685 sg_BoincSimpleFrame.cpp:248
 msgid "Licensing and copyright information."
 msgstr "Lizenz- und Urheberrechts-Informationen."
 
-#: clientgui/AdvancedFrame.cpp:693
+#: AdvancedFrame.cpp:692 sg_BoincSimpleFrame.cpp:255
 msgid "&File"
 msgstr "&Datei"
 
-#: clientgui/AdvancedFrame.cpp:697
+#: AdvancedFrame.cpp:696 sg_BoincSimpleFrame.cpp:259
 msgid "&View"
 msgstr "&Ansicht"
 
-#: clientgui/AdvancedFrame.cpp:701
+#: AdvancedFrame.cpp:700 sg_BoincSimpleFrame.cpp:263
 msgid "&Tools"
 msgstr "Ass&istenten"
 
-#: clientgui/AdvancedFrame.cpp:705
+#: AdvancedFrame.cpp:704
 msgid "&Activity"
 msgstr "&Steuerung"
 
-#: clientgui/AdvancedFrame.cpp:709
+#: AdvancedFrame.cpp:708
 msgid "A&dvanced"
 msgstr "&Extras"
 
-#: clientgui/AdvancedFrame.cpp:713
+#: AdvancedFrame.cpp:712 DlgEventLog.cpp:332 sg_BoincSimpleFrame.cpp:267
+#: wizardex.cpp:374 wizardex.cpp:381
 msgid "&Help"
 msgstr "&Hilfe"
 
-#: clientgui/AdvancedFrame.cpp:1185
+#: AdvancedFrame.cpp:1199
 #, c-format
 msgid "%s - Stop using %s"
 msgstr "%s - Nutzung von %s beenden"
 
-#: clientgui/AdvancedFrame.cpp:1190
+#: AdvancedFrame.cpp:1204
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -571,257 +525,222 @@ msgid ""
 "but you'll have to manage projects manually.\n"
 "\n"
 "Do you want to stop using %s?"
-msgstr ""
-"Wenn Sie sich von %s abmelden\n"
-"bleiben alle Ihre aktuellen Projekte erhalten,\n"
-"müssen sie aber manuell verwalten.\n"
-"\n"
-"Wollen Sie mit der Abmeldung von %s fortfahren?"
+msgstr "Wenn Sie sich von %s abmelden\nbleiben alle Ihre aktuellen Projekte erhalten,\nmüssen sie aber manuell verwalten.\n\nWollen Sie mit der Abmeldung von %s fortfahren?"
 
-#: clientgui/AdvancedFrame.cpp:1397
+#: AdvancedFrame.cpp:1401
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s - Beende den aktuellen Client..."
 
-#: clientgui/AdvancedFrame.cpp:1406
+#: AdvancedFrame.cpp:1410
 #, c-format
 msgid ""
 "%s will shut down the current client\n"
 "and prompt you for another host to connect to."
-msgstr ""
-"%s - beendet den aktuell verbundenen Client,\n"
-"und fragt nach einem anderen Rechner zum Verbinden."
+msgstr "%s - beendet den aktuell verbundenen Client,\nund fragt nach einem anderen Rechner zum Verbinden."
 
-#: clientgui/AdvancedFrame.cpp:1806
+#: AdvancedFrame.cpp:1745 DlgAbout.cpp:119
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: clientgui/AdvancedFrame.cpp:1815
+#: AdvancedFrame.cpp:1754
 #, c-format
 msgid "%s has successfully added %s"
 msgstr "%s hat erfolgreich %s hinzugefügt."
 
-#: clientgui/AdvancedFrame.cpp:1953
+#: AdvancedFrame.cpp:1893
 #, c-format
 msgid "%s - (%s)"
 msgstr "%s - (%s)"
 
-#: clientgui/AdvancedFrame.cpp:1957
+#: AdvancedFrame.cpp:1897
 #, c-format
 msgid "Connecting to %s"
 msgstr "Verbinden mit %s"
 
-#: clientgui/AdvancedFrame.cpp:1960
+#: AdvancedFrame.cpp:1900
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "Verbunden mit %s (%s)"
 
-#: clientgui/AlreadyExistsPage.cpp:184
+#: AlreadyExistsPage.cpp:184
 msgid "Username already in use"
 msgstr "Der Benutzername wird bereits verwendet!"
 
-#: clientgui/AlreadyExistsPage.cpp:187
+#: AlreadyExistsPage.cpp:187
 msgid ""
 "An account with that username already exists and has a\n"
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"Ein Konto mit diesem Benutzernamen existiert bereits und verwendet \n"
-"ein anderes Passwort als Sie eingegeben haben. \n"
-"\n"
-"Bitte besuchen Sie die Projektwebseite und folgen Sie dort den Anweisungen."
+msgstr "Ein Konto mit diesem Benutzernamen existiert bereits und verwendet \nein anderes Passwort als Sie eingegeben haben. \n\nBitte besuchen Sie die Projektwebseite und folgen Sie dort den Anweisungen."
 
-#: clientgui/AlreadyExistsPage.cpp:191
+#: AlreadyExistsPage.cpp:191
 msgid "Email address already in use"
 msgstr "Diese E-Mail-Adresse wird bereits benutzt!"
 
-#: clientgui/AlreadyExistsPage.cpp:194
+#: AlreadyExistsPage.cpp:194
 msgid ""
 "An account with that email address already exists and has a\n"
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"Ein Konto mit dieser E-Mail-Adresse existiert bereits und verwendet\n"
-"ein anderes Passwort als Sie eingegeben haben.\n"
-"\n"
-"Bitte besuchen Sie die Projektwebseite und folgen Sie dort den Anweisungen."
+msgstr "Ein Konto mit dieser E-Mail-Adresse existiert bereits und verwendet\nein anderes Passwort als Sie eingegeben haben.\n\nBitte besuchen Sie die Projektwebseite und folgen Sie dort den Anweisungen."
 
-#: clientgui/AsyncRPC.cpp:1031
+#: AsyncRPC.cpp:1031
 msgid "Communicating with BOINC client.  Please wait ..."
 msgstr "Kommuniziere mit dem BOINC Client. Bitte warten ..."
 
-#: clientgui/AsyncRPC.cpp:1034
+#: AsyncRPC.cpp:1034
 #, c-format
 msgid "&Quit %s"
 msgstr "&Schließe %s"
 
-#: clientgui/AsyncRPC.cpp:1036
+#: AsyncRPC.cpp:1036
 #, c-format
 msgid "E&xit %s"
 msgstr "B&eende %s"
 
-#: clientgui/AsyncRPC.cpp:1040
+#: AsyncRPC.cpp:1040
 #, c-format
 msgid "%s - Communication"
 msgstr "%s - Kommunikation"
 
-#: clientgui/AsyncRPC.cpp:1056
+#: AsyncRPC.cpp:1056 DlgAdvPreferencesBase.cpp:107 sg_DlgPreferences.cpp:433
 msgid "Cancel"
 msgstr "&Abbrechen"
 
-#: clientgui/BOINCBaseFrame.cpp:504
+#: BOINCBaseFrame.cpp:505
 #, c-format
 msgid "%s - Connection Error"
 msgstr "%s - Verbindungsfehler"
 
-#: clientgui/BOINCBaseFrame.cpp:513
+#: BOINCBaseFrame.cpp:514
 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 ""
-"Sie sind nicht autorisiert den Client zu verwalten.\n"
-"Bitte fragen Sie Ihren Administrator, ob er sie zu der lokalen Nutzergruppe 'boinc_users' hinzufügen kann."
+msgstr "Sie sind nicht autorisiert den Client zu verwalten.\nBitte fragen Sie Ihren Administrator, ob er sie zu der lokalen Nutzergruppe 'boinc_users' hinzufügen kann."
 
-#: clientgui/BOINCBaseFrame.cpp:522
+#: BOINCBaseFrame.cpp:523
 msgid ""
 "Authorization failed connecting to running client.\n"
 "Make sure you start this program in the same directory as the client."
-msgstr ""
-"Autorisation fehlgeschlagen beim Versuch mit dem laufenden Client zu verbinden.\n"
-"Überprüfen Sie, ob das Programm im selben Verzeichnis wie der Client gestartet wurde."
+msgstr "Autorisation fehlgeschlagen beim Versuch mit dem laufenden Client zu verbinden.\nÜberprüfen Sie, ob das Programm im selben Verzeichnis wie der Client gestartet wurde."
 
-#: clientgui/BOINCBaseFrame.cpp:524
+#: BOINCBaseFrame.cpp:525
 msgid "Authorization failed connecting to running client."
 msgstr "Autorisation fehlgeschlagen beim Versuch mit dem laufenden Client zu verbinden."
 
-#: clientgui/BOINCBaseFrame.cpp:532
+#: BOINCBaseFrame.cpp:533
 msgid "The password you have provided is incorrect, please try again."
 msgstr "Das eingegebene Passwort ist falsch. Bitte erneut versuchen."
 
-#: clientgui/BOINCBaseFrame.cpp:576
+#: BOINCBaseFrame.cpp:577
 #, c-format
 msgid "%s - Connection Failed"
 msgstr "%s - Verbindung fehlgeschlagen"
 
-#: clientgui/BOINCBaseFrame.cpp:585
+#: BOINCBaseFrame.cpp:586
 #, c-format
 msgid ""
 "%s is not able to connect to a %s client.\n"
 "Would you like to try to connect again?"
-msgstr ""
-"%s kann sich nicht mit einem %s Client verbinden.\n"
-"Wollen Sie es erneut versuchen?"
+msgstr "%s kann sich nicht mit einem %s Client verbinden.\nWollen Sie es erneut versuchen?"
 
-#: clientgui/BOINCBaseFrame.cpp:621
+#: BOINCBaseFrame.cpp:622
 #, c-format
 msgid "%s - Daemon Start Failed"
 msgstr "Start des %s - Dienstes fehlgeschlagen."
 
-#: clientgui/BOINCBaseFrame.cpp:631
+#: BOINCBaseFrame.cpp:632
 #, 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 ist nicht in der Lage einen %s Client zu starten.\n"
-"Bitte öffnen Sie die Systemsteuerung->Verwaltung->Dienste und starten Sie den BOINC Dienst."
+msgstr "%s ist nicht in der Lage einen %s Client zu starten.\nBitte öffnen Sie die Systemsteuerung->Verwaltung->Dienste und starten Sie den BOINC Dienst."
 
-#: clientgui/BOINCBaseFrame.cpp:637
+#: BOINCBaseFrame.cpp:638
 #, c-format
 msgid ""
 "%s is not able to start a %s client.\n"
 "Please start the daemon and try again."
-msgstr ""
-"%s ist nicht in der Lage einen %s Client zu starten.\n"
-"Bitte starten Sie den Dienst und versuchen Sie es erneut."
+msgstr "%s ist nicht in der Lage einen %s Client zu starten.\nBitte starten Sie den Dienst und versuchen Sie es erneut."
 
-#: clientgui/BOINCBaseFrame.cpp:688
+#: BOINCBaseFrame.cpp:689
 #, c-format
 msgid "%s - Connection Status"
 msgstr "%s - Verbindungsstatus"
 
-#: clientgui/BOINCBaseFrame.cpp:699
+#: BOINCBaseFrame.cpp:700
 #, 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"
 "To connect up to your local computer please use 'localhost' as the host name."
-msgstr ""
-"%s ist augenblicklich nicht mit mit dem %s Client verbunden.\n"
-"Bitte benutzen Sie die 'Datei\\Computer auswählen ...'Menüoption um die Verbindung mit einem %s Client neu aufzubauen.\n"
-"Wenn Sie keinen anderen Computer fern-steuern wollen, dann lassen Sie die Felder 'Computername und Passwort leer, oder benutzen Sie 'localhost' als Computername."
+msgstr "%s ist augenblicklich nicht mit mit dem %s Client verbunden.\nBitte benutzen Sie die 'Datei\\Computer auswählen ...'Menüoption um die Verbindung mit einem %s Client neu aufzubauen.\nWenn Sie keinen anderen Computer fern-steuern wollen, dann lassen Sie die Felder 'Computername und Passwort leer, oder benutzen Sie 'localhost' als Computername."
 
-# 88%
-#: clientgui/BOINCBaseView.cpp:752
+#: BOINCBaseView.cpp:779
 msgid "Project web pages"
 msgstr "Projekt-Webseite"
 
-#: clientgui/BOINCClientManager.cpp:573
+#: BOINCClientManager.cpp:575
 #, c-format
 msgid "%s - Unexpected Exit"
 msgstr "%s - Unerwartetes Ende"
 
-#: clientgui/BOINCClientManager.cpp:583
+#: BOINCClientManager.cpp:585
 #, 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 ""
-"Der %s Client wurde 3 mal in innerhalb der letzten %d Minuten unerwartet beendet.\n"
-"Soll er erneut gestartet werden?"
+msgstr "Der %s Client wurde 3 mal in innerhalb der letzten %d Minuten unerwartet beendet.\nSoll er erneut gestartet werden?"
 
-#: clientgui/BOINCDialupManager.cpp:61
+#: BOINCDialupManager.cpp:61
 #, c-format
 msgid "%s - Network Status"
 msgstr "%s - Netzwerkstatus"
 
-#: clientgui/BOINCDialupManager.cpp:241
+#: BOINCDialupManager.cpp:241
 #, c-format
 msgid ""
 "%s needs to connect to the Internet.\n"
 "May it do so now?"
-msgstr ""
-"%s benötigt eine Verbindung zum Netzwerk.\n"
-"Darf es sich jetzt einwählen?"
+msgstr "%s benötigt eine Verbindung zum Netzwerk.\nDarf es sich jetzt einwählen?"
 
-#: clientgui/BOINCDialupManager.cpp:254
+#: BOINCDialupManager.cpp:254
 #, c-format
 msgid "%s is connecting to the Internet."
 msgstr "%s verbindet sich mit dem Internet."
 
-#: clientgui/BOINCDialupManager.cpp:303
+#: BOINCDialupManager.cpp:303
 #, c-format
 msgid "%s has successfully connected to the Internet."
 msgstr "%s konnte sich erfolgreich mit dem Internet verbinden."
 
-#: clientgui/BOINCDialupManager.cpp:331
+#: BOINCDialupManager.cpp:331
 #, c-format
 msgid "%s failed to connect to the Internet."
 msgstr "%s konnte sich nicht mit dem Internet verbinden."
 
-#: clientgui/BOINCDialupManager.cpp:372
+#: 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 ist jetzt mit dem Internet verbunden.\n"
-"Alle Projekte werden aktualisiert und alle Übertragungen fortgesetzt."
+msgstr "%s ist jetzt mit dem Internet verbunden.\nAlle Projekte werden aktualisiert und alle Übertragungen fortgesetzt."
 
-#: clientgui/BOINCDialupManager.cpp:417
+#: BOINCDialupManager.cpp:417
 #, c-format
 msgid "%s has successfully disconnected from the Internet."
 msgstr "%s hat die Internetverbindung erfolgreich beendet."
 
-#: clientgui/BOINCDialupManager.cpp:433
+#: BOINCDialupManager.cpp:433
 #, c-format
 msgid "%s failed to disconnected from the Internet."
 msgstr "%s konnte die Internetverbindung nicht beenden."
 
-#: clientgui/BOINCGUIApp.cpp:595
+#: BOINCGUIApp.cpp:339
 #, c-format
 msgid ""
 "You currently are not authorized to manage the client.\n"
@@ -832,874 +751,798 @@ msgid ""
 " or\n"
 "  - contact your administrator to add you to the 'boinc_master'\n"
 "     user group."
-msgstr ""
-"Sie sind momentan nicht befugt diesen Client zu verwalten.\n"
-"\n"
-"Um %s mit dem aktuellen Nutzer auszuführen müssen Sie:\n"
-"  - %s neu installieren und die Frage bezüglich\n"
-"     \"non-administrative users\" mit \"Ja\" beantworten\n"
-" oder\n"
-"  - Ihren Administrator kontaktieren damit Sie in die\n"
-"    Benutzergruppe 'boinc_master'  aufgenommen werden."
+msgstr "Sie sind momentan nicht befugt diesen Client zu verwalten.\n\nUm %s mit dem aktuellen Nutzer auszuführen müssen Sie:\n  - %s neu installieren und die Frage bezüglich\n     \"non-administrative users\" mit \"Ja\" beantworten\n oder\n  - Ihren Administrator kontaktieren damit Sie in die\n    Benutzergruppe 'boinc_master'  aufgenommen werden."
 
-#: clientgui/BOINCGUIApp.cpp:601
+#: BOINCGUIApp.cpp:345
 #, c-format
 msgid ""
 "%s ownership or permissions are not set properly; please reinstall %s.\n"
 "(Error code %d"
-msgstr ""
-"Der Besitzstatus oder die Berechtigungen von %s sind nicht korrekt. Bitte installieren Sie %s neu.\n"
-"(Fehlercode %d"
+msgstr "Der Besitzstatus oder die Berechtigungen von %s sind nicht korrekt. Bitte installieren Sie %s neu.\n(Fehlercode %d"
 
-#: clientgui/BOINCGUIApp.cpp:607
+#: BOINCGUIApp.cpp:351
 msgid " at "
 msgstr " bei "
 
-#: clientgui/BOINCGUIApp.cpp:610
+#: BOINCGUIApp.cpp:354 MainDocument.cpp:2484 MainDocument.cpp:2534
+#: MainDocument.cpp:2554 ViewTransfers.cpp:803
 msgid ")"
 msgstr ")"
 
-#: clientgui/BOINCGUIApp.cpp:640
+#: BOINCGUIApp.cpp:384
 msgid ""
 "A reboot is required in order for BOINC to run properly.\n"
 "Please reboot your computer and try again."
-msgstr ""
-"Ein Neustart ist erforderlich damit BOINC einwandfrei\n"
-"funktioniert. Bitte starten sie den Computer neu und\n"
-"versuchen es erneut."
+msgstr "Ein Neustart ist erforderlich damit BOINC einwandfrei\nfunktioniert. Bitte starten sie den Computer neu und\nversuchen es erneut."
 
-#: clientgui/BOINCGUIApp.cpp:641
+#: BOINCGUIApp.cpp:385 DlgAbout.cpp:153
 msgid "BOINC Manager"
 msgstr "BOINC-Manager"
 
-#: clientgui/BOINCGUIApp.cpp:902
+#: BOINCGUIApp.cpp:572
 msgid "BOINC Manager was started by the operating system automatically"
 msgstr "Der BOINC-Manager wurde automatisch vom Betriebssystem gestartet."
 
-#: clientgui/BOINCGUIApp.cpp:904
+#: BOINCGUIApp.cpp:574
 msgid "Startup BOINC so only the system tray icon is visible"
 msgstr "Starte BOINC so, dass nur das Symbol im Infobereich der Taskleiste sichtbar ist."
 
-#: clientgui/BOINCGUIApp.cpp:906
+#: BOINCGUIApp.cpp:576
 msgid "Directory containing the BOINC Client executable"
 msgstr "Verzeichnis der BOINC-Client Programmdateien"
 
-#: clientgui/BOINCGUIApp.cpp:907
+#: BOINCGUIApp.cpp:577
 msgid "BOINC data directory"
 msgstr "Datenverzeichnis des BOINC-Client"
 
-#: clientgui/BOINCGUIApp.cpp:909
+#: BOINCGUIApp.cpp:579
 msgid "Host name or IP address"
 msgstr "Rechnername oder IP-Adresse"
 
-#: clientgui/BOINCGUIApp.cpp:910
+#: BOINCGUIApp.cpp:580
 msgid "GUI RPC port number"
 msgstr "GUI RPC Portnummer"
 
-#: clientgui/BOINCGUIApp.cpp:911
+#: BOINCGUIApp.cpp:581
 msgid "Password"
 msgstr "Passwort"
 
-#: clientgui/BOINCGUIApp.cpp:912
+#: BOINCGUIApp.cpp:582
 msgid "Startup BOINC with these optional arguments"
 msgstr "Starte BOINC mit diesen optionalen Argumenten"
 
-#: clientgui/BOINCGUIApp.cpp:913
+#: BOINCGUIApp.cpp:583
 msgid "disable BOINC security users and permissions"
 msgstr "BOINC Sicherheit Benutzer und Rechte abschalten"
 
-#: clientgui/BOINCGUIApp.cpp:914
+#: BOINCGUIApp.cpp:584
 msgid "set skin debugging mode to enable skin manager error messages"
 msgstr "Skin-Debugmodus einschalten um Skin-Manager Fehlermeldungen zu sehen"
 
-#: clientgui/BOINCGUIApp.cpp:915
+#: BOINCGUIApp.cpp:585
 msgid "multiple instances of BOINC Manager allowed"
 msgstr "mehrere Instanzen des BOINC Managers erlauben"
 
-#: clientgui/BOINCGUIApp.cpp:917
+#: BOINCGUIApp.cpp:587
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr "Nicht verwendet: Workaround für den Fehler in XCode 4.2"
 
-#: clientgui/BOINCGUIApp.cpp:1164
+#: BOINCGUIApp.cpp:814
 msgid "(Automatic Detection)"
 msgstr "(Automatische Erkennung)"
 
-#: clientgui/BOINCGUIApp.cpp:1165
+#: BOINCGUIApp.cpp:815
 msgid "(Unknown)"
 msgstr "(Unbekannt)"
 
-#: clientgui/BOINCGUIApp.cpp:1166
+#: BOINCGUIApp.cpp:816
 msgid "(User Defined)"
 msgstr "(Benutzerauswahl)"
 
-#: clientgui/BOINCTaskBar.cpp:522
+#: BOINCTaskBar.cpp:508
 #, c-format
 msgid "Open %s Web..."
 msgstr "Öffne %s Web..."
 
-#: clientgui/BOINCTaskBar.cpp:529
+#: BOINCTaskBar.cpp:515
 #, c-format
 msgid "Open %s..."
 msgstr "Öffne %s..."
 
-#: clientgui/BOINCTaskBar.cpp:536
-#: clientgui/BOINCTaskBar.cpp:633
-#: clientgui/BOINCTaskBar.cpp:641
+#: BOINCTaskBar.cpp:522 BOINCTaskBar.cpp:619 BOINCTaskBar.cpp:627
 msgid "Snooze"
 msgstr "BOINC anhalten"
 
-#: clientgui/BOINCTaskBar.cpp:538
-#: clientgui/BOINCTaskBar.cpp:660
-#: clientgui/BOINCTaskBar.cpp:668
+#: BOINCTaskBar.cpp:524 BOINCTaskBar.cpp:646 BOINCTaskBar.cpp:654
 msgid "Snooze GPU"
 msgstr "GPU pausieren"
 
-#: clientgui/BOINCTaskBar.cpp:556
+#: BOINCTaskBar.cpp:542
 msgid "E&xit"
 msgstr "&Beenden"
 
-#: clientgui/BOINCTaskBar.cpp:626
+#: BOINCTaskBar.cpp:612 ViewProjects.cpp:718 ViewWork.cpp:795
+#: sg_BoincSimpleFrame.cpp:758 sg_ProjectCommandPopup.cpp:110
+#: sg_TaskCommandPopup.cpp:102
 msgid "Resume"
 msgstr "Fortsetzen"
 
-#: clientgui/BOINCTaskBar.cpp:653
+#: BOINCTaskBar.cpp:639
 msgid "Resume GPU"
 msgstr "GPU fortsetzen"
 
-#: clientgui/BOINCTaskBar.cpp:727
+#: BOINCTaskBar.cpp:713
 msgid "Computing is enabled"
 msgstr "Rechnen ist erlaubt"
 
-#: clientgui/BOINCTaskBar.cpp:731
+#: BOINCTaskBar.cpp:717
 msgid "Computing is suspended - "
 msgstr "Berechnung wurde angehalten - "
 
-#: clientgui/BOINCTaskBar.cpp:741
+#: BOINCTaskBar.cpp:727
 msgid "GPU computing is enabled"
 msgstr "Rechnen mit GPU ist erlaubt"
 
-#: clientgui/BOINCTaskBar.cpp:744
+#: BOINCTaskBar.cpp:730
 msgid "GPU computing is suspended - "
 msgstr "GPU Berechnung wurde angehalten - "
 
-#: clientgui/BOINCTaskBar.cpp:753
+#: BOINCTaskBar.cpp:739
 msgid "Network is enabled"
 msgstr "Nutzung des Netzwerks erlaubt"
 
-#: clientgui/BOINCTaskBar.cpp:756
+#: BOINCTaskBar.cpp:742
 msgid "Network is suspended - "
 msgstr "Netzwerkzugriff ist abgeschaltet - "
 
-#: clientgui/BOINCTaskBar.cpp:764
+#: BOINCTaskBar.cpp:750
 msgid "Reconnecting to client."
 msgstr "Wiederherstellen der Verbindung zu einem Client."
 
-#: clientgui/BOINCTaskBar.cpp:766
+#: BOINCTaskBar.cpp:752
 msgid "Not connected to a client."
 msgstr "Nicht mit einem Client verbunden."
 
-#: clientgui/BOINCTaskBar.cpp:819
+#: BOINCTaskBar.cpp:805
 #, c-format
 msgid "%s Notices"
 msgstr "%s Nachrichten"
 
-#: clientgui/BOINCTaskBar.cpp:825
+#: BOINCTaskBar.cpp:811
 msgid "There are new notices - click to view."
 msgstr "Es gibt neue Nachrichten - klicken zum anzeigen."
 
-#: clientgui/CompletionErrorPage.cpp:199
+#: CompletionErrorPage.cpp:199
 msgid "Failed to add project"
 msgstr "Hinzufügen des Projekts fehlgeschlagen"
 
-#: clientgui/CompletionErrorPage.cpp:204
+#: CompletionErrorPage.cpp:204
 msgid "Failed to update account manager"
 msgstr "Aktualisieren der Kontoverwaltung fehlgeschlagen!"
 
-#: clientgui/CompletionErrorPage.cpp:208
+#: CompletionErrorPage.cpp:208
 msgid "Failed to remove account manager"
 msgstr "Entfernen der Kontoverwaltung fehlgeschlagen!"
 
-#: clientgui/CompletionErrorPage.cpp:212
+#: CompletionErrorPage.cpp:212
 msgid "Failed to add account manager"
 msgstr "Anmelden an der Kontoverwaltung fehlgeschlagen."
 
-#: clientgui/CompletionErrorPage.cpp:221
+#: CompletionErrorPage.cpp:221
 msgid ""
 "Please try again later.\n"
 "\n"
 "Click Finish to close."
-msgstr ""
-"Bitte versuchen Sie es später noch einmal.\n"
-"\n"
-"Klick auf Beenden zum Schließen."
+msgstr "Bitte versuchen Sie es später noch einmal.\n\nKlick auf Beenden zum Schließen."
 
-#: clientgui/CompletionErrorPage.cpp:225
-#: clientgui/CompletionPage.cpp:222
-#: clientgui/CompletionPage.cpp:242
-#: clientgui/CompletionPage.cpp:273
+#: CompletionErrorPage.cpp:225 CompletionPage.cpp:222 CompletionPage.cpp:242
+#: CompletionPage.cpp:273
 msgid "Click Finish to close."
 msgstr "Klicke [Beenden] zum Schließen."
 
-#: clientgui/CompletionErrorPage.cpp:234
+#: CompletionErrorPage.cpp:234
 msgid "Messages from server:"
 msgstr "Nachricht vom Server:"
 
-#: clientgui/CompletionPage.cpp:207
+#: CompletionPage.cpp:207
 msgid "Project added"
 msgstr "Projekt hinzugefügt"
 
-#: clientgui/CompletionPage.cpp:213
+#: CompletionPage.cpp:213
 msgid "This project has been successfully added."
 msgstr "Das Projekt wurde erfolgreich hinzugefügt."
 
-#: clientgui/CompletionPage.cpp:218
+#: 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 ""
-"Wenn Sie auf [Beenden] klicken wird Ihr Webbrowser zu\n"
-"einer Webseite geführt, wo sie Kontoname und Einstellungen anpassen können."
+msgstr "Wenn Sie auf [Beenden] klicken wird Ihr Webbrowser zu\neiner Webseite geführt, wo sie Kontoname und Einstellungen anpassen können."
 
-#: clientgui/CompletionPage.cpp:232
+#: CompletionPage.cpp:232
 #, c-format
 msgid "Update from %s completed."
 msgstr "Aktualisierung von %s abgeschlossen."
 
-#: clientgui/CompletionPage.cpp:236
+#: CompletionPage.cpp:236
 msgid "Update completed."
 msgstr "Aktualisierung abgeschlossen."
 
-#: clientgui/CompletionPage.cpp:247
+#: CompletionPage.cpp:247
 msgid "Now using account manager"
 msgstr "Kontoverwaltung wird jetzt genutzt."
 
-#: clientgui/CompletionPage.cpp:252
+#: CompletionPage.cpp:252
 #, c-format
 msgid "Welcome to %s!"
 msgstr "Willkommen bei %s!"
 
-#: clientgui/CompletionPage.cpp:263
+#: CompletionPage.cpp:263
 #, c-format
 msgid "You are now using %s to manage accounts."
 msgstr "Sie benutzen jetzt %s als Kontoverwaltung."
 
-#: clientgui/CompletionPage.cpp:267
+#: CompletionPage.cpp:267
 msgid "You are now using this account manager."
 msgstr "Sie benutzen jetzt diese Kontoverwaltung."
 
-#: clientgui/DlgAbout.cpp:113
+#: DlgAbout.cpp:113 mac/Mac_GUI.cpp:96
 #, c-format
 msgid "About %s"
 msgstr "Über %s"
 
-#: clientgui/DlgAbout.cpp:172
+#: DlgAbout.cpp:172
 msgid "Version:"
 msgstr "Version:"
 
-#: clientgui/DlgAbout.cpp:180
+#: DlgAbout.cpp:180
 msgid "wxWidgets Version:"
 msgstr "wxWidgets Version:"
 
-#: clientgui/DlgAbout.cpp:188
+#: DlgAbout.cpp:188
 msgid "Copyright:"
 msgstr "Copyright:"
 
-# 98%
-#: clientgui/DlgAbout.cpp:192
+#: DlgAbout.cpp:192
 msgid ""
-"(C) 2003-2014 University of California, Berkeley.\n"
+"(C) 2003-2013 University of California, Berkeley.\n"
 "All Rights Reserved."
-msgstr ""
-"(C) 2003-2014 University of California, Berkeley.\n"
-"Alle Rechte vorbehalten."
+msgstr "(C) 2003-2013 University of California, Berkeley.\nAlle Rechte vorbehalten."
 
-#: clientgui/DlgAbout.cpp:196
+#: DlgAbout.cpp:196
 msgid "Berkeley Open Infrastructure for Network Computing"
 msgstr "Berkeley Open Infrastructure for Network Computing"
 
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:399
-#: clientgui/DlgSelectComputer.cpp:163
+#: DlgAbout.cpp:208 DlgExitMessage.cpp:173 DlgGenericMessage.cpp:120
+#: DlgOptions.cpp:396 DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "&OK"
 
-#: clientgui/DlgAdvPreferences.cpp:602
+#: DlgAdvPreferences.cpp:544
 msgid "invalid number"
 msgstr "ungültige Zahl"
 
-#: clientgui/DlgAdvPreferences.cpp:603
+#: DlgAdvPreferences.cpp:545
 msgid "invalid time, format is HH:MM"
 msgstr "Ungültige Zeitangabe, Format ist HH:MM"
 
-#: clientgui/DlgAdvPreferences.cpp:604
+#: DlgAdvPreferences.cpp:546
 msgid "invalid time interval, format is HH:MM-HH:MM"
 msgstr "Ungültige Zeitangabe, Format ist HH:MM-HH:MM"
 
-#: clientgui/DlgAdvPreferences.cpp:817
+#: DlgAdvPreferences.cpp:751
 msgid "invalid input value detected"
 msgstr "Ungültiger Eingabewert entdeckt"
 
-#: clientgui/DlgAdvPreferences.cpp:819
+#: DlgAdvPreferences.cpp:753
 msgid "Validation Error"
 msgstr "Gültigkeitsproblem"
 
-#: clientgui/DlgAdvPreferences.cpp:969
-#: clientgui/DlgAdvPreferences.cpp:975
-#: clientgui/DlgAdvPreferences.cpp:981
+#: DlgAdvPreferences.cpp:885 DlgAdvPreferences.cpp:891
+#: DlgAdvPreferences.cpp:897
 msgid "Applications to add"
 msgstr "Anwendungen hinzufügen"
 
-#: clientgui/DlgAdvPreferences.cpp:998
+#: DlgAdvPreferences.cpp:914
 #, c-format
 msgid "'%s' is not an executable application."
 msgstr "'%s' ist keine ausführbare Anwendung."
 
-#: clientgui/DlgAdvPreferences.cpp:999
-#: clientgui/DlgAdvPreferences.cpp:1046
-#: clientgui/DlgAdvPreferences.cpp:1070
+#: DlgAdvPreferences.cpp:915 DlgAdvPreferences.cpp:962
+#: DlgAdvPreferences.cpp:986
 msgid "Add Exclusive App"
 msgstr "Exklusive Anwendung hinzufügen"
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Name of application to add?"
 msgstr "Name der Anwendung die hinzugefügt werden soll?"
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Add exclusive app"
 msgstr "Exklusive Anwendung hinzufügen"
 
-#: clientgui/DlgAdvPreferences.cpp:1045
+#: DlgAdvPreferences.cpp:961
 #, c-format
 msgid "Application names must end with '%s'"
 msgstr "Der Name der Anwendung muss mit '%s' enden"
 
-#: clientgui/DlgAdvPreferences.cpp:1069
+#: DlgAdvPreferences.cpp:985
 #, c-format
 msgid "'%s' is already in the list."
 msgstr "'%s' ist bereits in der Liste."
 
-#: clientgui/DlgAdvPreferences.cpp:1161
+#: DlgAdvPreferences.cpp:1077
 msgid ""
 "Do you really want to clear all local preferences?\n"
 "(This will not affect exclusive applications.)"
-msgstr ""
-"Wollen Sie wirklich alle lokalen Einstellungen löschen?\n"
-"(Exklusive Anwendungen bleiben erhalten.)"
+msgstr "Wollen Sie wirklich alle lokalen Einstellungen löschen?\n(Exklusive Anwendungen bleiben erhalten.)"
 
-#: clientgui/DlgAdvPreferences.cpp:1162
+#: DlgAdvPreferences.cpp:1078 sg_DlgPreferences.cpp:1030
 msgid "Confirmation"
 msgstr "Bestätigung"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:49
+#: DlgAdvPreferencesBase.cpp:46 sg_DlgPreferences.cpp:946
 #, c-format
-msgid "%s - Computing preferences"
-msgstr "%s - Recheneinstellungen"
+msgid "%s - Preferences"
+msgstr "%s - Einstellungen"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:66
+#: DlgAdvPreferencesBase.cpp:62
 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 ""
-"Dieser Dialog legt die Einstellungen nur für diesen Rechner fest.\n"
-"Klicken Sie auf OK zum Übernehmen der Einstellungen.\n"
-"Klicken Sie auf Löschen zum Wiederherstellen der webbasierten\n"
-"Einstellungen (ausgenommen der exklusiven Anwendungen)."
+msgstr "Dieser Dialog legt die Einstellungen nur für diesen Rechner fest.\nKlicken Sie auf OK zum Übernehmen der Einstellungen.\nKlicken Sie auf Löschen zum Wiederherstellen der webbasierten\nEinstellungen (ausgenommen der exklusiven Anwendungen)."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:69
+#: DlgAdvPreferencesBase.cpp:65 sg_DlgPreferences.cpp:428
 msgid "Clear"
 msgstr "Löschen"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:70
+#: DlgAdvPreferencesBase.cpp:66
 msgid "clear all local preferences and close the dialog"
 msgstr "alle lokalen Einstellungen löschen und den Dialog schließen"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:85
+#: DlgAdvPreferencesBase.cpp:81
 msgid "processor usage"
 msgstr "Nutzung des Prozessors"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:88
+#: DlgAdvPreferencesBase.cpp:84
 msgid "network usage"
 msgstr "Nutzung des Netzwerks"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:91
+#: DlgAdvPreferencesBase.cpp:87
 msgid "disk and memory usage"
 msgstr "Nutzung von Festplatte und Speicher"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:94
+#: DlgAdvPreferencesBase.cpp:90
 msgid "exclusive applications"
 msgstr "Exklusive Anwendungn"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:107
-#: clientgui/DlgDiagnosticLogFlags.cpp:104
+#: DlgAdvPreferencesBase.cpp:102 sg_DlgPreferences.cpp:424
 msgid "OK"
 msgstr "OK"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:108
+#: DlgAdvPreferencesBase.cpp:103
 msgid "save all values and close the dialog"
 msgstr "speichert alle Änderungen und schließt den Dialog"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:114
+#: DlgAdvPreferencesBase.cpp:108
 msgid "close the dialog without saving"
 msgstr "schließt den Dialog ohne die Änderungen zu speichern"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:118
-#: clientgui/Localization.cpp:35
-#: clientgui/Localization.cpp:121
-#: clientgui/Localization.cpp:139
+#: DlgAdvPreferencesBase.cpp:112 Localization.cpp:35 Localization.cpp:121
+#: Localization.cpp:139 sg_BoincSimpleFrame.cpp:794 sg_DlgPreferences.cpp:439
 msgid "Help"
 msgstr "Hilfe"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
+#: DlgAdvPreferencesBase.cpp:113
 msgid "shows the preferences web page"
 msgstr "zeigt die Einstellungen-Webseite"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:141
+#: DlgAdvPreferencesBase.cpp:135
 msgid "Computing allowed"
 msgstr "Rechnen erlaubt"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
+#: DlgAdvPreferencesBase.cpp:139
 msgid "While computer is on batteries"
 msgstr " Wenn der Computer im Batteriebetrieb ist"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:149
-msgid "check this if you want this computer to do work while it runs on batteries"
+#: DlgAdvPreferencesBase.cpp:142
+msgid ""
+"check this if you want this computer to do work while it runs on batteries"
 msgstr "aktiviere diese Option, wenn der Computer im Batteriebetrieb rechnen soll"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:155
+#: DlgAdvPreferencesBase.cpp:148
 msgid "While computer is in use"
 msgstr " Wenn der Computer benutzt wird"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:158
-msgid "check this if you want this computer to do work even when you're using it"
+#: DlgAdvPreferencesBase.cpp:151
+msgid ""
+"check this if you want this computer to do work even when you're using it"
 msgstr "aktiviere diese Option, wenn der Computer rechnen soll, selbst wenn er benutzt wird"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:164
+#: DlgAdvPreferencesBase.cpp:157
 msgid "Use GPU while computer is in use"
 msgstr "Nutze die GPU wenn der Computer benutzt wird"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:167
-msgid "check this if you want your GPU to do work even when you're using the computer"
+#: DlgAdvPreferencesBase.cpp:160
+msgid ""
+"check this if you want your GPU to do work even when you're using the "
+"computer"
 msgstr "aktiviere diese Option, wenn die Grafikkarte rechnen soll, selbst wenn der Computer benutzt wird"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:179
+#: DlgAdvPreferencesBase.cpp:172
 msgid "Only after computer has been idle for"
 msgstr "Nur wenn der Computer nicht beschäftigt war seit"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:188
-msgid "do work only after you haven't used the computer for this number of minutes"
+#: DlgAdvPreferencesBase.cpp:182
+msgid ""
+"do work only after you haven't used the computer for this number of minutes"
 msgstr "rechnet nur, wenn der Computer seit dieser Anzahl von Minuten nicht in Benutzung war"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:193
-#: clientgui/DlgAdvPreferencesBase.cpp:342
+#: DlgAdvPreferencesBase.cpp:187 DlgAdvPreferencesBase.cpp:336
+#: sg_DlgPreferences.cpp:417
 msgid "minutes"
 msgstr "Minuten"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:212
+#: DlgAdvPreferencesBase.cpp:206
 msgid "While processor usage is less than"
 msgstr "Wenn CPU-Auslastung geringer als"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:221
+#: DlgAdvPreferencesBase.cpp:216
 msgid "suspend work if processor usage exceeds this level"
 msgstr "Unterbricht die Arbeit wenn die CPU-Auslastung diesen Wert überschreitet"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:226
+#: DlgAdvPreferencesBase.cpp:221
 msgid "percent (0 means no restriction)"
 msgstr "% (0 = keine Einschränkung)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:240
-#: clientgui/DlgAdvPreferencesBase.cpp:506
+#: DlgAdvPreferencesBase.cpp:235 DlgAdvPreferencesBase.cpp:496
 msgid "Every day between hours of"
 msgstr "Jeden Tag in der Zeit zwischen"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: DlgAdvPreferencesBase.cpp:239
 msgid "start work at this time"
 msgstr "beginne Arbeit zu dieser Zeit"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:248
-#: clientgui/DlgAdvPreferencesBase.cpp:514
+#: DlgAdvPreferencesBase.cpp:243 DlgAdvPreferencesBase.cpp:504
+#: sg_DlgPreferences.cpp:326 sg_DlgPreferences.cpp:348
 msgid "and"
 msgstr "und"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:252
+#: DlgAdvPreferencesBase.cpp:247
 msgid "stop work at this time"
 msgstr "beende Arbeit zu dieser Zeit"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
-#: clientgui/DlgAdvPreferencesBase.cpp:522
+#: DlgAdvPreferencesBase.cpp:251 DlgAdvPreferencesBase.cpp:512
 msgid "(no restriction if equal)"
 msgstr "(keine Einschränkungen, wenn gleich)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:261
-#: clientgui/DlgAdvPreferencesBase.cpp:527
+#: DlgAdvPreferencesBase.cpp:256 DlgAdvPreferencesBase.cpp:517
 msgid "Day-of-week override:"
 msgstr "Ausnahmen für Wochentage:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:266
-#: clientgui/DlgAdvPreferencesBase.cpp:532
+#: DlgAdvPreferencesBase.cpp:261 DlgAdvPreferencesBase.cpp:522
 msgid "check box to specify hours for this day of week"
 msgstr "markiere Kontrollkästchen, um die Stunden für diesen Wochentag festzulegen"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:272
-#: clientgui/DlgAdvPreferencesBase.cpp:538
+#: DlgAdvPreferencesBase.cpp:267 DlgAdvPreferencesBase.cpp:528
 msgid "Monday"
 msgstr "Montag"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:279
-#: clientgui/DlgAdvPreferencesBase.cpp:545
+#: DlgAdvPreferencesBase.cpp:274 DlgAdvPreferencesBase.cpp:535
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:286
-#: clientgui/DlgAdvPreferencesBase.cpp:552
+#: DlgAdvPreferencesBase.cpp:281 DlgAdvPreferencesBase.cpp:542
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:293
-#: clientgui/DlgAdvPreferencesBase.cpp:559
+#: DlgAdvPreferencesBase.cpp:288 DlgAdvPreferencesBase.cpp:549
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:300
-#: clientgui/DlgAdvPreferencesBase.cpp:566
+#: DlgAdvPreferencesBase.cpp:295 DlgAdvPreferencesBase.cpp:556
 msgid "Friday"
 msgstr "Freitag"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:307
-#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: DlgAdvPreferencesBase.cpp:302 DlgAdvPreferencesBase.cpp:563
 msgid "Saturday"
 msgstr "Samstag"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:580
+#: DlgAdvPreferencesBase.cpp:309 DlgAdvPreferencesBase.cpp:570
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:328
+#: DlgAdvPreferencesBase.cpp:323
 msgid "Other options"
 msgstr "Andere Optionen"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:336
+#: DlgAdvPreferencesBase.cpp:330
 msgid "Switch between applications every"
 msgstr "Wechsel zwischen den Anwendungen alle"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:345
+#: DlgAdvPreferencesBase.cpp:339
 msgid "On multiprocessor systems, use at most"
 msgstr "Nutze auf Multiprozessorsystemen höchstens"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
+#: DlgAdvPreferencesBase.cpp:346
 #, no-c-format
-msgid "% of the processors (0 means no restriction)"
+msgid "% of the processors (0 means ignore this setting)"
 msgstr "% der Prozessoren (0 für keine Einschränkung)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:355
-#: clientgui/DlgAdvPreferencesBase.cpp:618
-#: clientgui/DlgAdvPreferencesBase.cpp:640
-#: clientgui/DlgAdvPreferencesBase.cpp:661
-#: clientgui/DlgAdvPreferencesBase.cpp:683
-#: clientgui/DlgAdvPreferencesBase.cpp:694
+#: DlgAdvPreferencesBase.cpp:349 DlgAdvPreferencesBase.cpp:605
+#: DlgAdvPreferencesBase.cpp:627 DlgAdvPreferencesBase.cpp:648
+#: DlgAdvPreferencesBase.cpp:669 DlgAdvPreferencesBase.cpp:679
 msgid "Use at most"
 msgstr "Nutze höchstens"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:362
+#: DlgAdvPreferencesBase.cpp:356
 #, no-c-format
-msgid "% of CPU time (0 means no restriction)"
-msgstr "% der CPU-Zeit (0 für keine Einschränkungen)"
+msgid "% CPU time"
+msgstr "% Prozessor-Zeit"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:386
+#: DlgAdvPreferencesBase.cpp:378
 msgid "General options"
 msgstr "Allgemeine Einstellungen"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:395
+#: DlgAdvPreferencesBase.cpp:386
 msgid "Maximum download rate"
 msgstr "Maximale Download-Rate"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:401
-#: clientgui/DlgAdvPreferencesBase.cpp:410
-msgid "KBytes/second (0 means no restriction)"
-msgstr "KBytes/Sekunde (0 für keine Einschränkungen)"
+#: DlgAdvPreferencesBase.cpp:392 DlgAdvPreferencesBase.cpp:401
+msgid "KBytes/sec."
+msgstr "KByte/Sek."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:404
+#: DlgAdvPreferencesBase.cpp:395
 msgid "Maximum upload rate"
 msgstr "Maximale Upload-Rate"
 
-# Vielleicht könnte man hier auch irgendwie Zwischenspeicher einbauen? Das ist aber auch nicht der eigentliche Sinn.
-#: clientgui/DlgAdvPreferencesBase.cpp:417
+#: DlgAdvPreferencesBase.cpp:406
+msgid "Transfer at most"
+msgstr "Übertrage höchstens"
+
+#: DlgAdvPreferencesBase.cpp:412
+msgid "Mbytes"
+msgstr "MB"
+
+#: DlgAdvPreferencesBase.cpp:415
+msgid "every"
+msgstr "pro"
+
+#: DlgAdvPreferencesBase.cpp:421 DlgAdvPreferencesBase.cpp:444
+#: DlgAdvPreferencesBase.cpp:463
+msgid "days"
+msgstr "Tage"
+
+#: DlgAdvPreferencesBase.cpp:429
 msgid "Minimum work buffer"
 msgstr "Mindest Arbeitspuffer"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:425
+#: DlgAdvPreferencesBase.cpp:438
 msgid "Try to maintain enough tasks to keep busy for this many days"
 msgstr "Versuche genug Arbeitspakete zu erhalten um für diese Anzahl Tage beschäftigt zu sein."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:431
-#: clientgui/DlgAdvPreferencesBase.cpp:449
-msgid "days (maximum value: 10)"
-msgstr "Tage (Maximalwert: 10)"
-
-# 80%
-#: clientgui/DlgAdvPreferencesBase.cpp:437
+#: DlgAdvPreferencesBase.cpp:450
 msgid "Max additional work buffer"
 msgstr "Max. zusätzlicher Arbeitspuffer"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:445
+#: DlgAdvPreferencesBase.cpp:459
 msgid "In addition, maintain enough tasks for up to this many days"
 msgstr "Versuche zusätzlich genug Arbeitspakete für diese Anzahl Tage zu erhalten."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:454
-msgid "Transfer at most"
-msgstr "Übertrage höchstens"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:462
-msgid "MBytes every"
-msgstr "MBytes je"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:468
-msgid "days (0 means no restriction)"
-msgstr "Tage (0 für keine Einschränkung)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:476
+#: DlgAdvPreferencesBase.cpp:466
 msgid "Skip image file verification"
 msgstr "Bild-Dateien nicht überprüfen"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:478
+#: DlgAdvPreferencesBase.cpp:468
 msgid "check this if your Internet provider modifies image files"
 msgstr "aktiviere diese Option, wenn die Image-Dateien durch den Internetprovider verändert werden"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:484
+#: DlgAdvPreferencesBase.cpp:476
 msgid "Connect options"
 msgstr "Verbindungseinstellungen"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:487
+#: DlgAdvPreferencesBase.cpp:478
 msgid "Confirm before connecting to internet"
 msgstr "Bestätigen, bevor mit dem Internet verbunden wird."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
+#: DlgAdvPreferencesBase.cpp:480
+msgid ""
+"if checked, a confirmation dialog will be displayed before trying to connect"
+" to the Internet"
 msgstr "wenn aktiviert, wird ein Abfragedialog eingeblendet, bevor eine Internetverbindung versucht wird"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:493
+#: DlgAdvPreferencesBase.cpp:484
 msgid "Disconnect when done"
 msgstr "Verbindung trennen, wenn fertig"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:495
+#: DlgAdvPreferencesBase.cpp:486
 msgid ""
 "if checked, BOINC hangs up when network usage is done\n"
 "(only relevant for dialup-connection)"
-msgstr ""
-"wenn aktiviert, trennt BOINC die Netzwerkverbindung, wenn sie nicht mehr benötigt wird\n"
-"(nur von Bedeutung bei Nutzung von Einwählverbindungen)"
+msgstr "wenn aktiviert, trennt BOINC die Netzwerkverbindung, wenn sie nicht mehr benötigt wird\n(nur von Bedeutung bei Nutzung von Einwählverbindungen)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:501
+#: DlgAdvPreferencesBase.cpp:492
 msgid "Network usage allowed"
 msgstr "Nutzung des Netzwerks erlaubt"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:510
+#: DlgAdvPreferencesBase.cpp:500
 msgid "network usage start hour"
 msgstr "Anfang der Netzwerknutzung"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:518
+#: DlgAdvPreferencesBase.cpp:508
 msgid "network usage stop hour"
 msgstr "Ende der Netzwerknutzung"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:610
-#: clientgui/DlgItemProperties.cpp:257
+#: DlgAdvPreferencesBase.cpp:598 DlgItemProperties.cpp:231
 msgid "Disk usage"
 msgstr "Nutzung der Festplatte"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:622
+#: DlgAdvPreferencesBase.cpp:609
 msgid "the maximum disk space used by BOINC (in Gigabytes)"
 msgstr "der maximal von BOINC benutzte Festplattenplatz (in GByte)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:626
-msgid "Gigabytes disk space (0 means no restriction)"
-msgstr "Gigabyte Festplattenplatz (0 für keine Einschränkung)"
+#: DlgAdvPreferencesBase.cpp:613
+msgid "Gigabytes disk space"
+msgstr "GByte Festplattenplatz"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:629
+#: DlgAdvPreferencesBase.cpp:616
 msgid "Leave at least"
 msgstr "Lasse mindestens"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:633
+#: DlgAdvPreferencesBase.cpp:620
 msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
 msgstr "BOINC läßt dieses Minimum an Festplattenplatz frei (in GByte)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:637
+#: DlgAdvPreferencesBase.cpp:624
 msgid "Gigabytes disk space free"
 msgstr "GByte Festplattenplatz frei"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
+#: DlgAdvPreferencesBase.cpp:631
 msgid "BOINC uses at most this percentage of total disk space"
 msgstr "BOINC nutzt höchstens diesen Anteil in % vom gesamten Festplattenplatz"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:649
+#: DlgAdvPreferencesBase.cpp:636
 #, no-c-format
 msgid "% of total disk space"
 msgstr "% des gesamten Festplattenplatzes"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:652
+#: DlgAdvPreferencesBase.cpp:639
 msgid "Tasks checkpoint to disk at most every"
 msgstr "Schreibe auf Festplatte höchstens alle"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
+#: DlgAdvPreferencesBase.cpp:645
 msgid "seconds"
 msgstr "Sekunden"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:668
+#: DlgAdvPreferencesBase.cpp:655
 #, no-c-format
 msgid "% of page file (swap space)"
 msgstr "% der Auslagerungsdatei (des Swap-Speichers)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:675
+#: DlgAdvPreferencesBase.cpp:662
 msgid "Memory usage"
 msgstr "Nutzung des Speichers"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
+#: DlgAdvPreferencesBase.cpp:676
 #, no-c-format
 msgid "% when computer is in use"
 msgstr "%, wenn der Rechner benutzt wird"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:701
+#: DlgAdvPreferencesBase.cpp:686
 #, no-c-format
 msgid "% when computer is idle"
 msgstr "%, wenn der Rechner nicht beschäftigt ist"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:706
+#: DlgAdvPreferencesBase.cpp:691
 msgid "Leave applications in memory while suspended"
 msgstr "Lasse Anwendung im Speicher, wenn sie pausiert"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:708
+#: DlgAdvPreferencesBase.cpp:693
 msgid "if checked, suspended work units are left in memory"
 msgstr "wenn aktiviert, verbleiben unterbrochene Arbeitseinheiten im Speicher"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:728
-msgid "Suspend processor and network usage when these applications are running:"
+#: DlgAdvPreferencesBase.cpp:713
+msgid ""
+"Suspend processor and network usage when these applications are running:"
 msgstr "Die Nutzung von Prozessor und Netzwerk anhalten, wenn diese Anwendungen aktiv sind:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:738
+#: DlgAdvPreferencesBase.cpp:722
 msgid "Add..."
 msgstr "Hinzufügen..."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:739
+#: DlgAdvPreferencesBase.cpp:723
 msgid "Add an application to this list"
 msgstr "Füge eine Anwendung zur dieser Liste hinzu"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:744
+#: DlgAdvPreferencesBase.cpp:728 ViewProjects.cpp:202
+#: sg_ProjectCommandPopup.cpp:85
 msgid "Remove"
 msgstr "Entfernen"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:745
+#: DlgAdvPreferencesBase.cpp:729
 msgid "Remove an application from this list"
 msgstr "Entferne eine Anwendung aus dieser Liste"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:754
+#: DlgAdvPreferencesBase.cpp:738
 msgid "For advanced options, refer to "
 msgstr "Für weitere Einstellungen, bitte hier schauen "
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:65
-#, c-format
-msgid "%s Diagnostic Log Flags"
-msgstr "%s Diagnose Einstellungen"
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:83
-msgid "These flags enable various types of diagnostic messages in the Event Log."
-msgstr "Diese Schalter aktivieren verschiedene Arten von Diagnosemeldungen im Meldungsfenster."
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:105
-msgid "Save all values and close the dialog"
-msgstr "Speichert alle Änderungen und schließt den Dialog"
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:108
-msgid "Defaults"
-msgstr "Vorgaben"
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:109
-msgid "Restore default settings"
-msgstr "Vorgaben wiederherstellen"
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:113
-msgid "Close the dialog without saving"
-msgstr "schließt den Dialog ohne die Änderungen zu speichern"
-
-#: clientgui/DlgEventLog.cpp:226
+#: DlgEventLog.cpp:219
 #, c-format
 msgid "%s - Event Log"
 msgstr "%s - Ereignisanzeige"
 
-#: clientgui/DlgEventLog.cpp:236
+#: DlgEventLog.cpp:232 ViewMessages.cpp:117 ViewProjects.cpp:219
+#: ViewStatistics.cpp:435 ViewStatistics.cpp:2009 ViewTransfers.cpp:182
+#: ViewWork.cpp:232
 msgid "Project"
 msgstr "Projekt"
 
-#: clientgui/DlgEventLog.cpp:237
+#: DlgEventLog.cpp:233 ViewMessages.cpp:118
 msgid "Time"
 msgstr "Zeit"
 
-#: clientgui/DlgEventLog.cpp:238
+#: DlgEventLog.cpp:234 ViewMessages.cpp:119
 msgid "Message"
 msgstr "Meldung"
 
-#: clientgui/DlgEventLog.cpp:300
-#: clientgui/DlgEventLog.cpp:364
+#: DlgEventLog.cpp:290 DlgEventLog.cpp:354
 msgid "&Show only this project"
 msgstr "Zeige nur dieses &Projekt"
 
-#: clientgui/DlgEventLog.cpp:304
+#: DlgEventLog.cpp:294
 msgid "Copy &All"
 msgstr "&Alles kopieren"
 
-#: clientgui/DlgEventLog.cpp:306
-#: clientgui/DlgEventLog.cpp:310
+#: DlgEventLog.cpp:296 DlgEventLog.cpp:300 ViewMessages.cpp:89
 msgid "Copy all the messages to the clipboard."
 msgstr "Kopiert alle Meldungen in die Zwischenablage."
 
-#: clientgui/DlgEventLog.cpp:315
+#: DlgEventLog.cpp:305
 msgid "Copy &Selected"
 msgstr "au&sgewählte Meldungen kopieren"
 
-#: clientgui/DlgEventLog.cpp:318
-#: clientgui/DlgEventLog.cpp:326
-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."
+#: DlgEventLog.cpp:308 DlgEventLog.cpp:316 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 "Kopiert alle ausgewählten (markierten) Meldungen in die Zwischenablage. Durch Drücken und Halten der Umschalt- oder Strg-Taste können Sie mehrere Meldungen gleichzeitig markieren."
 
-#: clientgui/DlgEventLog.cpp:320
-#: clientgui/DlgEventLog.cpp:328
-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 ""
-"Kopiert alle ausgewählten (markierten) Meldungen in die Zwischenablage.\n"
-"Durch Drücken und Halten der Umschalt- oder Strg-Taste können Sie \n"
-"mehrere Meldungen gleichzeitig markieren."
+#: DlgEventLog.cpp:310 DlgEventLog.cpp:318 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 "Kopiert alle ausgewählten (markierten) Meldungen in die Zwischenablage.\nDurch Drücken und Halten der Umschalt- oder Strg-Taste können Sie \nmehrere Meldungen gleichzeitig markieren."
 
-#: clientgui/DlgEventLog.cpp:335
-#: clientgui/DlgItemProperties.cpp:67
+#: DlgEventLog.cpp:325 DlgItemProperties.cpp:67
 msgid "&Close"
 msgstr "Schli&eßen"
 
-#: clientgui/DlgEventLog.cpp:344
+#: DlgEventLog.cpp:334 sg_BoincSimpleFrame.cpp:798 sg_DlgPreferences.cpp:442
 #, c-format
 msgid "Get help with %s"
 msgstr "Hilfe für %s bekommen"
 
-#: clientgui/DlgEventLog.cpp:358
+#: DlgEventLog.cpp:348
 msgid "Show all &messages"
 msgstr "Zeige alle &Meldungen"
 
-#: clientgui/DlgEventLog.cpp:359
-#: clientgui/DlgEventLog.cpp:361
+#: DlgEventLog.cpp:349 DlgEventLog.cpp:351
 msgid "Show messages for all projects"
 msgstr "Zeige Meldungen für alle Projekte."
 
-#: clientgui/DlgEventLog.cpp:365
-#: clientgui/DlgEventLog.cpp:367
+#: DlgEventLog.cpp:355 DlgEventLog.cpp:357
 msgid "Show only the messages for the selected project"
 msgstr "Zeigt nur die Meldungen für das gewählte Projekt."
 
-#: clientgui/DlgExitMessage.cpp:82
+#: DlgExitMessage.cpp:82
 #, c-format
 msgid "%s - Exit Confirmation"
 msgstr "%s - Bestätigung schließen"
 
-#: clientgui/DlgExitMessage.cpp:130
+#: DlgExitMessage.cpp:130
 #, c-format
 msgid ""
 "You have requested to exit the %s,\n"
@@ -1708,15 +1551,9 @@ msgid ""
 "\n"
 "If you also want to stop running the tasks,\n"
 "choose from the following options:"
-msgstr ""
-"Sie sind gerade dabei den %s zu beenden.\n"
-"Dieser erlaubt ihnen das ansehen und\n"
-"verwalten der Aufgaben für diesen Computer.\n"
-"\n"
-"Wenn Sie die aufgaben ebenfalls anhalten möchten,\n"
-"wählen Sie bitte aus den folgenden Optionen."
+msgstr "Sie sind gerade dabei den %s zu beenden.\nDieser erlaubt ihnen das ansehen und\nverwalten der Aufgaben für diesen Computer.\n\nWenn Sie die aufgaben ebenfalls anhalten möchten,\nwählen Sie bitte aus den folgenden Optionen."
 
-#: clientgui/DlgExitMessage.cpp:135
+#: DlgExitMessage.cpp:135
 #, c-format
 msgid ""
 "This will shut down %s and its tasks until either the\n"
@@ -1725,1005 +1562,916 @@ msgid ""
 "In most cases, it is better just to close the %s window\n"
 "rather than to exit the application; that will allow %s to run its\n"
 "tasks at the times you selected in your preferences."
-msgstr ""
-"Dies wird %s und seine Aufgaben außer Betrieb nehmen, bis entweder\n"
-"die %s-Anwendung oder der %s-Bildschirmschoner wieder laufen.\n"
-"\n"
-"In den meisten Fällen ist es besser nur das %s-Fenster zu\n"
-"schließen und nicht die Anwendung zu verlassen. Das erlaubt %s\n"
-"seine Aufgaben zu den Zeiten auszuführen die Sie in den Einstellungen\n"
-"vorgegeben haben."
+msgstr "Dies wird %s und seine Aufgaben außer Betrieb nehmen, bis entweder\ndie %s-Anwendung oder der %s-Bildschirmschoner wieder laufen.\n\nIn den meisten Fällen ist es besser nur das %s-Fenster zu\nschließen und nicht die Anwendung zu verlassen. Das erlaubt %s\nseine Aufgaben zu den Zeiten auszuführen die Sie in den Einstellungen\nvorgegeben haben."
 
-#: clientgui/DlgExitMessage.cpp:153
+#: DlgExitMessage.cpp:153
 #, c-format
 msgid "Stop running tasks when exiting the %s"
 msgstr "Aufgaben ebenfalls beenden wenn der %s geschloßen wird"
 
-#: clientgui/DlgExitMessage.cpp:165
+#: DlgExitMessage.cpp:165
 msgid "Remember this decision and do not show this dialog."
 msgstr "Diese Einstellung merken und den Dialog nicht wieder anzeigen."
 
-#: clientgui/DlgExitMessage.cpp:178
-#: clientgui/DlgGenericMessage.cpp:125
-#: clientgui/DlgOptions.cpp:404
-#: clientgui/DlgSelectComputer.cpp:168
+#: DlgExitMessage.cpp:178 DlgGenericMessage.cpp:125 DlgOptions.cpp:401
+#: DlgSelectComputer.cpp:168 wizardex.cpp:378
 msgid "&Cancel"
 msgstr "&Abbrechen"
 
-#: clientgui/DlgGenericMessage.cpp:112
+#: DlgGenericMessage.cpp:112
 msgid "Don't show this dialog again."
 msgstr "Diesen Dialog nicht wieder anzeigen."
 
-#: clientgui/DlgItemProperties.cpp:194
-#: clientgui/DlgItemProperties.cpp:197
-#: clientgui/DlgItemProperties.cpp:200
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:168 DlgItemProperties.cpp:171
+#: DlgItemProperties.cpp:174 DlgItemProperties.cpp:177
 msgid "Don't fetch tasks for "
 msgstr "Keine Aufgaben mehr für "
 
-#: clientgui/DlgItemProperties.cpp:194
+#: DlgItemProperties.cpp:168
 msgid "Project preference"
 msgstr "Projekteinstellungen"
 
-#: clientgui/DlgItemProperties.cpp:197
+#: DlgItemProperties.cpp:171
 msgid "Account manager preference"
 msgstr "Kontomanager-Einstellungen"
 
-#: clientgui/DlgItemProperties.cpp:200
+#: DlgItemProperties.cpp:174
 msgid "Project has no apps for "
 msgstr "Projekt hat keine Anwendungen für "
 
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:177
 msgid "Client configuration excludes "
 msgstr "Die Konfiguration des Clients schließt aus, dass"
 
-#: clientgui/DlgItemProperties.cpp:207
+#: DlgItemProperties.cpp:181
 msgid " work fetch deferred for"
 msgstr " CPU Arbeitsabruf verzögert für"
 
-#: clientgui/DlgItemProperties.cpp:208
+#: DlgItemProperties.cpp:182
 msgid " work fetch deferral interval"
 msgstr " Verzögerungsintervall für CPU Arbeitsabruf"
 
-#: clientgui/DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:213
 msgid "Properties of project "
 msgstr "Projekteigenschaften "
 
-#: clientgui/DlgItemProperties.cpp:243
-#: clientgui/DlgOptions.cpp:221
+#: DlgItemProperties.cpp:217 DlgOptions.cpp:218
 msgid "General"
 msgstr "Allgemein"
 
-#: clientgui/DlgItemProperties.cpp:244
+#: DlgItemProperties.cpp:218
 msgid "Master URL"
 msgstr "Master URL"
 
-#: clientgui/DlgItemProperties.cpp:245
+#: DlgItemProperties.cpp:219
 msgid "User name"
 msgstr "Benutzername"
 
-#: clientgui/DlgItemProperties.cpp:246
+#: DlgItemProperties.cpp:220
 msgid "Team name"
 msgstr "Teamname"
 
-#: clientgui/DlgItemProperties.cpp:247
+#: DlgItemProperties.cpp:221 ViewProjects.cpp:224
 msgid "Resource share"
 msgstr "Ressourcenaufteilung"
 
-#: clientgui/DlgItemProperties.cpp:249
+#: DlgItemProperties.cpp:223
 msgid "Scheduler RPC deferred for"
 msgstr "Scheduleranfrage verzögert für"
 
-#: clientgui/DlgItemProperties.cpp:252
+#: DlgItemProperties.cpp:226
 msgid "File downloads deferred for"
 msgstr "Dateidownloads verzögert für"
 
-#: clientgui/DlgItemProperties.cpp:255
+#: DlgItemProperties.cpp:229
 msgid "File uploads deferred for"
 msgstr "Dateiuploads verzögert für"
 
-#: clientgui/DlgItemProperties.cpp:258
+#: DlgItemProperties.cpp:232
 msgid "Computer ID"
 msgstr "Computer ID"
 
-#: clientgui/DlgItemProperties.cpp:260
+#: DlgItemProperties.cpp:234
 msgid "Non CPU intensive"
 msgstr "Nicht CPU intensiv"
 
-#: 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
+#: DlgItemProperties.cpp:234 DlgItemProperties.cpp:236
+#: DlgItemProperties.cpp:237 DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:242 DlgItemProperties.cpp:251
+#: DlgItemProperties.cpp:254 DlgItemProperties.cpp:257
 msgid "yes"
 msgstr "Ja"
 
-#: clientgui/DlgItemProperties.cpp:262
+#: DlgItemProperties.cpp:236
 msgid "Suspended via GUI"
 msgstr "Über das Menü angehalten"
 
-#: clientgui/DlgItemProperties.cpp:262
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:236 DlgItemProperties.cpp:237
 msgid "no"
 msgstr "Nein"
 
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:237
 msgid "Don't request more work"
 msgstr "Keine weiteren Aufgaben anfordern"
 
-#: clientgui/DlgItemProperties.cpp:265
+#: DlgItemProperties.cpp:239
 msgid "Scheduler call in progress"
 msgstr "Laufende Scheduleranfrage"
 
-#: clientgui/DlgItemProperties.cpp:268
+#: DlgItemProperties.cpp:242
 msgid "Trickle-up pending"
 msgstr "Trickle-Up Meldung ausstehend"
 
-#: clientgui/DlgItemProperties.cpp:271
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:245 DlgItemProperties.cpp:247
 msgid "Host location"
 msgstr "Rechnerstandort"
 
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:247
 msgid "default"
 msgstr "Standard"
 
-#: clientgui/DlgItemProperties.cpp:277
+#: DlgItemProperties.cpp:251
 msgid "Added via account manager"
 msgstr "Von der Kontoverwaltung hinzugefügt"
 
-#: clientgui/DlgItemProperties.cpp:280
+#: DlgItemProperties.cpp:254
 msgid "Remove when tasks done"
 msgstr "Abmelden wenn alle Arbeit erledigt ist"
 
-#: clientgui/DlgItemProperties.cpp:283
+#: DlgItemProperties.cpp:257
 msgid "Ended"
 msgstr "Beendet"
 
-#: clientgui/DlgItemProperties.cpp:285
-msgid "Tasks completed"
-msgstr "Aufgaben erledigt"
-
-#: clientgui/DlgItemProperties.cpp:286
-msgid "Tasks failed"
-msgstr "Aufgaben fehlgeschlagen"
-
-#: clientgui/DlgItemProperties.cpp:288
+#: DlgItemProperties.cpp:259
 msgid "Credit"
 msgstr "Punkte"
 
-#: clientgui/DlgItemProperties.cpp:289
+#: DlgItemProperties.cpp:260
 msgid "User"
 msgstr "Benutzer"
 
-#: clientgui/DlgItemProperties.cpp:296
+#: DlgItemProperties.cpp:267
 msgid "Host"
 msgstr "Rechner"
 
-#: clientgui/DlgItemProperties.cpp:305
+#: DlgItemProperties.cpp:276
 msgid "Scheduling"
 msgstr "Planung"
 
-#: clientgui/DlgItemProperties.cpp:306
+#: DlgItemProperties.cpp:277
 msgid "Scheduling priority"
 msgstr "Planungspriorität"
 
-#: clientgui/DlgItemProperties.cpp:307
+#: DlgItemProperties.cpp:278
 msgid "CPU"
 msgstr "Prozessor"
 
-#: clientgui/DlgItemProperties.cpp:331
+#: DlgItemProperties.cpp:302
 msgid "Duration correction factor"
 msgstr "Duration correction factor"
 
-#: clientgui/DlgItemProperties.cpp:345
+#: DlgItemProperties.cpp:316
 msgid "Properties of task "
 msgstr "Eigenschaften der Aufgabe "
 
-#: clientgui/DlgItemProperties.cpp:357
+#: DlgItemProperties.cpp:328 ViewWork.cpp:238
 msgid "Application"
 msgstr "Anwendung"
 
-#: clientgui/DlgItemProperties.cpp:358
+#: DlgItemProperties.cpp:329 ViewWork.cpp:239
 msgid "Name"
 msgstr "Name"
 
-#: clientgui/DlgItemProperties.cpp:359
+#: DlgItemProperties.cpp:330
 msgid "State"
 msgstr "Status"
 
-#: clientgui/DlgItemProperties.cpp:362
+#: DlgItemProperties.cpp:333
 msgid "Received"
 msgstr "erhalten"
 
-#: clientgui/DlgItemProperties.cpp:365
+#: DlgItemProperties.cpp:336
 msgid "Report deadline"
 msgstr "Ablaufdatum"
 
-#: clientgui/DlgItemProperties.cpp:367
+#: DlgItemProperties.cpp:338
 msgid "Resources"
 msgstr "Ressourcen"
 
-#: clientgui/DlgItemProperties.cpp:370
+#: DlgItemProperties.cpp:341
 msgid "Estimated computation size"
 msgstr "Geschätzter Berechnungsaufwand"
 
-#: clientgui/DlgItemProperties.cpp:373
+#: DlgItemProperties.cpp:344
 msgid "CPU time at last checkpoint"
 msgstr "Prozessor-Zeit beim letzten Checkpoint"
 
-#: clientgui/DlgItemProperties.cpp:374
-#: clientgui/DlgItemProperties.cpp:389
+#: DlgItemProperties.cpp:345 DlgItemProperties.cpp:360
 msgid "CPU time"
 msgstr "Prozessorzeit"
 
-#: clientgui/DlgItemProperties.cpp:376
-#: clientgui/DlgItemProperties.cpp:390
+#: DlgItemProperties.cpp:347 DlgItemProperties.cpp:361
 msgid "Elapsed time"
 msgstr "bisherige Laufzeit"
 
-#: clientgui/DlgItemProperties.cpp:378
+#: DlgItemProperties.cpp:349
 msgid "Estimated time remaining"
 msgstr "Geschätzte verbleibende Zeit"
 
-#: clientgui/DlgItemProperties.cpp:379
+#: DlgItemProperties.cpp:350
 msgid "Fraction done"
 msgstr "Fortschritt"
 
-#: clientgui/DlgItemProperties.cpp:380
+#: DlgItemProperties.cpp:351
 msgid "Virtual memory size"
 msgstr "benötigter Arbeitsspeicher"
 
-#: clientgui/DlgItemProperties.cpp:381
+#: DlgItemProperties.cpp:352
 msgid "Working set size"
 msgstr "Größe des Arbeitspakets"
 
-#: clientgui/DlgItemProperties.cpp:383
+#: DlgItemProperties.cpp:354
 msgid "Directory"
 msgstr "Verzeichnis"
 
-#: clientgui/DlgItemProperties.cpp:386
+#: DlgItemProperties.cpp:357
 msgid "Process ID"
 msgstr "Prozess-Nr."
 
-#: clientgui/DlgItemProperties.cpp:456
+#: DlgItemProperties.cpp:427 ViewWork.cpp:1032 sg_TaskPanel.cpp:823
 msgid "Local: "
 msgstr "Lokal: "
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: DlgOptions.cpp:129 DlgOptions.cpp:135
 msgid "Options"
 msgstr "Optionen"
 
-#: clientgui/DlgOptions.cpp:178
+#: DlgOptions.cpp:175
 msgid "Language:"
 msgstr "Sprache:"
 
-#: clientgui/DlgOptions.cpp:185
+#: DlgOptions.cpp:182
 msgid "What language should BOINC use?"
 msgstr "Welche Sprache soll der BOINC Manager verwenden?"
 
-#: clientgui/DlgOptions.cpp:189
+#: DlgOptions.cpp:186
 msgid "Notice reminder interval:"
 msgstr "An Nachrichten erinnern alle:"
 
-#: clientgui/DlgOptions.cpp:196
+#: DlgOptions.cpp:193
 msgid "How often should BOINC remind you of new notices?"
 msgstr "Wie oft soll der BOINC Manager Sie erinnern wenn neue Nachrichten verfügbar sind?"
 
-#: clientgui/DlgOptions.cpp:201
+#: DlgOptions.cpp:198
 msgid "Run Manager at login?"
 msgstr "Manager bei der Anmeldung starten?"
 
-#: clientgui/DlgOptions.cpp:207
+#: DlgOptions.cpp:204
 msgid "Run the BOINC Manager when you log on."
 msgstr "Startet den BOINC-Manager wenn Sie sich anmelden."
 
-#: clientgui/DlgOptions.cpp:212
+#: DlgOptions.cpp:209
 msgid "Enable Manager exit dialog?"
 msgstr "Ende-Dialog anzeigen?"
 
-#: clientgui/DlgOptions.cpp:218
+#: DlgOptions.cpp:215
 msgid "Display the exit dialog when shutting down the Manager."
 msgstr "Zeigt den Ende-Dialog beim Verlassen des BOINC-Managers an."
 
-#: clientgui/DlgOptions.cpp:229
+#: DlgOptions.cpp:226
 msgid "Dial-up and Virtual Private Network settings"
 msgstr "&Wähl- und Virtual Private Network Einstellungen"
 
-#: clientgui/DlgOptions.cpp:243
+#: DlgOptions.cpp:240
 msgid "&Set Default"
 msgstr "Standard &festlegen"
 
-#: clientgui/DlgOptions.cpp:248
+#: DlgOptions.cpp:245
 msgid "&Clear Default"
 msgstr "Standard &löschen"
 
-#: clientgui/DlgOptions.cpp:255
+#: DlgOptions.cpp:252
 msgid "Default Connection:"
 msgstr "Standardverbindung:"
 
-#: clientgui/DlgOptions.cpp:262
+#: DlgOptions.cpp:259
 msgid "Connections"
 msgstr "Verbindungen"
 
-#: clientgui/DlgOptions.cpp:271
+#: DlgOptions.cpp:268
 msgid "Connect via HTTP proxy server"
 msgstr "Über HTTP Proxyserver verbinden"
 
-#: clientgui/DlgOptions.cpp:275
+#: DlgOptions.cpp:272
 msgid "HTTP Proxy Server Configuration"
 msgstr "HTTP Proxyserver Konfiguration"
 
-#: clientgui/DlgOptions.cpp:283
-#: clientgui/DlgOptions.cpp:347
+#: DlgOptions.cpp:280 DlgOptions.cpp:344
 msgid "Address:"
 msgstr "Adresse:"
 
-#: clientgui/DlgOptions.cpp:291
-#: clientgui/DlgOptions.cpp:355
+#: DlgOptions.cpp:288 DlgOptions.cpp:352 ProxyPage.cpp:340 ProxyPage.cpp:360
 msgid "Port:"
 msgstr "Port:"
 
-#: clientgui/DlgOptions.cpp:299
-#: clientgui/DlgOptions.cpp:363
+#: DlgOptions.cpp:296 DlgOptions.cpp:360
 msgid "Don't use proxy for:"
 msgstr "Keinen Proxyserver benutzen für:"
 
-#: clientgui/DlgOptions.cpp:306
-#: clientgui/DlgOptions.cpp:370
+#: DlgOptions.cpp:303 DlgOptions.cpp:367
 msgid "Leave these blank if not needed"
 msgstr "Bitte leer lassen, falls nicht benötigt."
 
-#: clientgui/DlgOptions.cpp:312
-#: clientgui/DlgOptions.cpp:376
+#: DlgOptions.cpp:309 DlgOptions.cpp:373 ProxyPage.cpp:343 ProxyPage.cpp:363
 msgid "User Name:"
 msgstr "Benutzername:"
 
-#: clientgui/DlgOptions.cpp:320
-#: clientgui/DlgOptions.cpp:384
-#: clientgui/DlgSelectComputer.cpp:152
+#: DlgOptions.cpp:317 DlgOptions.cpp:381 DlgSelectComputer.cpp:152
+#: ProxyPage.cpp:346 ProxyPage.cpp:366
 msgid "Password:"
 msgstr "Passwort:"
 
-#: clientgui/DlgOptions.cpp:327
+#: DlgOptions.cpp:324
 msgid "HTTP Proxy"
 msgstr "HTTP Proxyserver"
 
-#: clientgui/DlgOptions.cpp:335
+#: DlgOptions.cpp:332
 msgid "Connect via SOCKS proxy server"
 msgstr "Über SOCKS Proxyserver verbinden"
 
-#: clientgui/DlgOptions.cpp:339
+#: DlgOptions.cpp:336
 msgid "SOCKS Proxy Server Configuration"
 msgstr "SOCKS Proxyserver Konfiguration"
 
-#: clientgui/DlgOptions.cpp:391
+#: DlgOptions.cpp:388
 msgid "SOCKS Proxy"
 msgstr "SOCKS Proxyserver"
 
-#: clientgui/DlgOptions.cpp:589
+#: DlgOptions.cpp:586
 msgid "always"
 msgstr "ständig"
 
-#: clientgui/DlgOptions.cpp:590
+#: DlgOptions.cpp:587
 msgid "1 hour"
 msgstr "1 Stunde"
 
-#: clientgui/DlgOptions.cpp:591
+#: DlgOptions.cpp:588
 msgid "6 hours"
 msgstr "6 Stunden"
 
-#: clientgui/DlgOptions.cpp:592
+#: DlgOptions.cpp:589
 msgid "1 day"
 msgstr "1 Tag"
 
-#: clientgui/DlgOptions.cpp:593
+#: DlgOptions.cpp:590
 msgid "1 week"
 msgstr "1 Woche"
 
-#: clientgui/DlgOptions.cpp:594
+#: DlgOptions.cpp:591
 msgid "never"
 msgstr "niemals"
 
-#: clientgui/DlgOptions.cpp:691
+#: DlgOptions.cpp:688
 #, c-format
 msgid "%s - Language Selection"
 msgstr "Sprachauswahl: %s"
 
-#: clientgui/DlgOptions.cpp:698
+#: DlgOptions.cpp:695
 #, 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 "Die %s Sprache wurde gewechselt. Bitte starten Sie %s erneut um die Änderung anzuwenden."
 
-#: clientgui/DlgSelectComputer.cpp:91
+#: DlgSelectComputer.cpp:91
 #, c-format
 msgid "%s - Select Computer"
 msgstr "%s - wähle Rechner"
 
-#: clientgui/DlgSelectComputer.cpp:125
+#: DlgSelectComputer.cpp:125
 #, c-format
 msgid ""
 "Another instance of %s is already running \n"
 "on this computer.  Please select a client to monitor."
-msgstr ""
-"Eine weitere Instanz von %s ist bereits auf diesem\n"
-"Computer gestartet.\n"
-"Bitte einen Client zum überwachen auswählen."
+msgstr "Eine weitere Instanz von %s ist bereits auf diesem\nComputer gestartet.\nBitte einen Client zum überwachen auswählen."
 
-#: clientgui/DlgSelectComputer.cpp:143
+#: DlgSelectComputer.cpp:143
 msgid "Host name:"
 msgstr "Rechnername:"
 
-#: clientgui/Localization.cpp:31
-#: clientgui/Localization.cpp:69
+#: Localization.cpp:31 Localization.cpp:69
 msgid "Message boards"
 msgstr "Foren"
 
-#: clientgui/Localization.cpp:33
+#: Localization.cpp:33
 msgid "Correspond with other users on the SETI at home message boards"
 msgstr "Unterhalten Sie sich mit anderen Benutzern in den SETI at home-Foren"
 
-#: clientgui/Localization.cpp:37
+#: Localization.cpp:37
 msgid "Ask questions and report problems"
 msgstr "Stellen Sie Fragen und berichten Sie über Probleme"
 
-#: clientgui/Localization.cpp:39
-#: clientgui/Localization.cpp:81
-#: clientgui/Localization.cpp:111
-#: clientgui/Localization.cpp:129
+#: Localization.cpp:39 Localization.cpp:81 Localization.cpp:111
+#: Localization.cpp:129
 msgid "Your account"
 msgstr "Ihr Benutzerkonto"
 
-#: clientgui/Localization.cpp:41
-#: clientgui/Localization.cpp:87
-#: clientgui/Localization.cpp:113
+#: Localization.cpp:41 Localization.cpp:87 Localization.cpp:113
 msgid "View your account information and credit totals"
 msgstr "Anzeigen von Kontoinformationen und Punktestand"
 
-#: clientgui/Localization.cpp:43
+#: Localization.cpp:43
 msgid "Your preferences"
 msgstr "Ihre Einstellungen"
 
-#: clientgui/Localization.cpp:45
+#: Localization.cpp:45
 msgid "View and modify your SETI at home account profile and preferences"
 msgstr "Anzeigen und Ändern des SETI at home-Benutzerprofils und der -Einstellungen"
 
-#: clientgui/Localization.cpp:47
-#: clientgui/Localization.cpp:89
+#: Localization.cpp:47 Localization.cpp:89
 msgid "Your results"
 msgstr "Ihre Resultate"
 
-#: clientgui/Localization.cpp:49
-#: clientgui/Localization.cpp:91
+#: Localization.cpp:49 Localization.cpp:91
 msgid "View your last week (or more) of computational results and work"
 msgstr "Anzeige der Ergebnisse und Berechnungen der letzten Woche (oder länger)."
 
-#: clientgui/Localization.cpp:51
-#: clientgui/Localization.cpp:93
+#: Localization.cpp:51 Localization.cpp:93
 msgid "Your computers"
 msgstr "Ihre Computer"
 
-#: clientgui/Localization.cpp:53
+#: Localization.cpp:53
 msgid "View a listing of all the computers on which you are running SETI at Home"
 msgstr "Rufen Sie eine Liste aller Computer ab auf denen Sie SETI at home ablaufen lassen."
 
-#: clientgui/Localization.cpp:55
-#: clientgui/Localization.cpp:97
+#: Localization.cpp:55 Localization.cpp:97
 msgid "Your team"
 msgstr "Ihr Team"
 
-#: clientgui/Localization.cpp:57
-#: clientgui/Localization.cpp:99
+#: Localization.cpp:57 Localization.cpp:99
 msgid "View information about your team"
 msgstr "Sehen sie Informationen über Ihr Team"
 
-#: clientgui/Localization.cpp:61
+#: Localization.cpp:61
 msgid "Common questions"
 msgstr "Allgemeine Fragen"
 
-#: clientgui/Localization.cpp:63
+#: Localization.cpp:63
 msgid "Read the Einstein at Home Frequently Asked Question list"
 msgstr "Die Einstein at home \"Häufig gestellte Fragen\" Liste."
 
-#: clientgui/Localization.cpp:65
+#: Localization.cpp:65
 msgid "Screensaver info"
 msgstr "Bildschirmschoner Info"
 
-#: clientgui/Localization.cpp:67
+#: Localization.cpp:67
 msgid "Read a detailed description of the Einstein at Home screensaver"
 msgstr "Lesen Sie eine detailliere Beschreibung des Einstein at home Bildschirmschoners."
 
-#: clientgui/Localization.cpp:71
-msgid "Correspond with admins and other users on the Einstein at Home message boards"
+#: Localization.cpp:71
+msgid ""
+"Correspond with admins and other users on the Einstein at Home message boards"
 msgstr "Unterhalten Sie sich mit Administratoren und anderen Benutzern in den Einstein at home Foren"
 
-#: clientgui/Localization.cpp:73
+#: Localization.cpp:73
 msgid "Einstein status"
 msgstr "Einstein Status"
 
-#: clientgui/Localization.cpp:75
+#: Localization.cpp:75
 msgid "Current status of the Einstein at Home server"
 msgstr "Aktueller Status der Einstein at home Server"
 
-#: clientgui/Localization.cpp:77
+#: Localization.cpp:77
 msgid "Report problems"
 msgstr "Probleme berichten"
 
-#: clientgui/Localization.cpp:79
+#: Localization.cpp:79
 msgid "A link to the Einstein at Home problems and bug reports message board"
 msgstr "Ein Link zu den Einstein at home \"Probleme und Fehlerberichte\" Foren"
 
-#: clientgui/Localization.cpp:83
+#: Localization.cpp:83
 msgid "View and modify your Einstein at Home account profile and preferences"
 msgstr "Anzeigen und Ändern des Einstein at home Benutzerprofils und der Einstellungen"
 
-#: clientgui/Localization.cpp:85
+#: Localization.cpp:85
 msgid "Account summary"
 msgstr "Kontoübersicht"
 
-#: clientgui/Localization.cpp:95
-msgid "View a listing of all the computers on which you are running Einstein at Home"
+#: Localization.cpp:95
+msgid ""
+"View a listing of all the computers on which you are running Einstein at Home"
 msgstr "Rufen Sie eine Liste aller Computer ab auf denen Sie Einstein at home ablaufen lassen."
 
-#: clientgui/Localization.cpp:101
+#: Localization.cpp:101
 msgid "LIGO project"
 msgstr "LIGO Projekt"
 
-#: clientgui/Localization.cpp:103
-msgid "The home page of the Laser Interferometer Gravitational-wave Observatory (LIGO) project"
+#: Localization.cpp:103
+msgid ""
+"The home page of the Laser Interferometer Gravitational-wave Observatory "
+"(LIGO) project"
 msgstr "Die Homepage des \"Laser Interferometer Gravitationswellen Observatorium\" (LIGO) Projektes"
 
-#: clientgui/Localization.cpp:105
+#: Localization.cpp:105
 msgid "GEO-600 project"
 msgstr "GEO-600 Projekt"
 
-#: clientgui/Localization.cpp:107
+#: Localization.cpp:107
 msgid "The home page of the GEO-600 project"
 msgstr "Die Homepage des GEO-600 Projektes"
 
-#: clientgui/Localization.cpp:115
-#: clientgui/Localization.cpp:133
+#: Localization.cpp:115 Localization.cpp:133 ViewProjects.cpp:221
+#: ViewStatistics.cpp:465
 msgid "Team"
 msgstr "Team"
 
-#: clientgui/Localization.cpp:117
+#: Localization.cpp:117
 msgid "Info about your Team"
 msgstr "Sehen sie Informationen über Ihr Team"
 
-#: clientgui/Localization.cpp:123
+#: Localization.cpp:123
 msgid "Get help for climateprediction.net"
 msgstr "Hilfe für climateprediction.net"
 
-#: clientgui/Localization.cpp:125
+#: Localization.cpp:125
 msgid "News"
 msgstr "Neuigkeiten"
 
-#: clientgui/Localization.cpp:127
+#: Localization.cpp:127
 msgid "climateprediction.net News"
 msgstr "Neues von climateprediction.net"
 
-#: clientgui/Localization.cpp:131
+#: Localization.cpp:131
 msgid "View your account information, credits, and trickles"
 msgstr "Anzeigen von Kontoinformationen und Punktestand"
 
-#: clientgui/Localization.cpp:135
+#: Localization.cpp:135
 msgid "Info about your team"
 msgstr "Sehen sie Informationen über Ihr Team"
 
-#: clientgui/Localization.cpp:141
+#: Localization.cpp:141
 msgid "Search for help in our help system"
 msgstr "Suchen Sie nach Hilfe in unserem Hilfesystem"
 
-#: clientgui/Localization.cpp:143
+#: Localization.cpp:143
 msgid "Global Statistics"
 msgstr "Globale Statistiken"
 
-#: clientgui/Localization.cpp:145
+#: Localization.cpp:145
 msgid "Summary statistics for World Community Grid"
 msgstr "Projektstatistiken für World Community Grid"
 
-#: clientgui/Localization.cpp:147
+#: Localization.cpp:147
 msgid "My Grid"
 msgstr "Mein Grid"
 
-#: clientgui/Localization.cpp:149
+#: Localization.cpp:149
 msgid "Your statistics and settings"
 msgstr "Ihre Statistiken und Einstellungen"
 
-#: clientgui/Localization.cpp:151
+#: Localization.cpp:151
 msgid "Device Profiles"
 msgstr "Geräteprofile"
 
-#: clientgui/Localization.cpp:153
+#: Localization.cpp:153
 msgid "Update your device settings"
 msgstr "Aktualisieren Sie Ihre Geräteeinstellungen"
 
-#: clientgui/Localization.cpp:155
+#: Localization.cpp:155
 msgid "Research"
 msgstr "Forschung"
 
-#: clientgui/Localization.cpp:157
+#: Localization.cpp:157
 msgid "Learn about the projects hosted at World Community Grid"
 msgstr "Erfahren Sie mehr über die auf World Community Grid gehosteten Projekte"
 
-#: clientgui/MainDocument.cpp:583
+#: MainDocument.cpp:583
 msgid "Starting client"
 msgstr "Starte Client"
 
-#: clientgui/MainDocument.cpp:591
+#: MainDocument.cpp:591
 msgid "Connecting to client"
 msgstr "Verbindung zum Client wird hergestellt."
 
-#: clientgui/MainDocument.cpp:1205
+#: MainDocument.cpp:1195
 msgid "Retrieving system state; please wait..."
 msgstr "Ermittlung des BOINC-Systemstatus. Bitte etwas Geduld..."
 
-#: clientgui/MainDocument.cpp:1826
+#: MainDocument.cpp:1816
 msgid "Missing application"
 msgstr "fehlende Anwendung"
 
-#: clientgui/MainDocument.cpp:1827
-msgid "Please download and install the CoRD application from http://cord.sourceforge.net"
+#: MainDocument.cpp:1817
+msgid ""
+"Please download and install the CoRD application from "
+"http://cord.sourceforge.net"
 msgstr "Bitte installieren Sie die CoRD Anwendung von http://cord.sourceforge.net"
 
-#: clientgui/MainDocument.cpp:2442
+#: MainDocument.cpp:2432
 msgid "on batteries"
 msgstr "Batteriebetrieb"
 
-#: clientgui/MainDocument.cpp:2443
+#: MainDocument.cpp:2433
 msgid "computer is in use"
 msgstr "Computer wird benutzt"
 
-#: clientgui/MainDocument.cpp:2444
+#: MainDocument.cpp:2434
 msgid "user request"
 msgstr "Benutzergefordert"
 
-#: clientgui/MainDocument.cpp:2445
+#: MainDocument.cpp:2435
 msgid "time of day"
 msgstr "Tageszeit"
 
-#: clientgui/MainDocument.cpp:2446
+#: MainDocument.cpp:2436
 msgid "CPU benchmarks in progress"
 msgstr "CPU Benchmarks laufen"
 
-#: clientgui/MainDocument.cpp:2447
+#: MainDocument.cpp:2437
 msgid "need disk space - check preferences"
 msgstr "Festplattenplatz benötigt - Einstellungen überprüfen"
 
-#: clientgui/MainDocument.cpp:2448
+#: MainDocument.cpp:2438
 msgid "computer is not in use"
 msgstr "Computer wird nicht benutzt"
 
-#: clientgui/MainDocument.cpp:2449
+#: MainDocument.cpp:2439
 msgid "starting up"
 msgstr "starte"
 
-#: clientgui/MainDocument.cpp:2450
+#: MainDocument.cpp:2440
 msgid "an exclusive app is running"
 msgstr "eine Anwendung läuft exklusiv"
 
-#: clientgui/MainDocument.cpp:2451
+#: MainDocument.cpp:2441
 msgid "CPU is busy"
 msgstr "CPU ist beschäftigt"
 
-# Gemeint ist eigentlich keine Geschwindigkeit sondern eine Trafficbegrenzung.
-#: clientgui/MainDocument.cpp:2452
+#: MainDocument.cpp:2442
 msgid "network bandwidth limit exceeded"
 msgstr "Maximales Datenübertragungsvolumen überschritten"
 
-#: clientgui/MainDocument.cpp:2453
+#: MainDocument.cpp:2443
 msgid "requested by operating system"
 msgstr "vom Betriebssystem angefordert"
 
-#: clientgui/MainDocument.cpp:2455
+#: MainDocument.cpp:2445
 msgid "unknown reason"
 msgstr "Ursache unbekannt"
 
-#: clientgui/MainDocument.cpp:2477
+#: MainDocument.cpp:2467
 msgid "GPU missing, "
 msgstr "GPU nicht gefunden, "
 
-#: clientgui/MainDocument.cpp:2484
+#: MainDocument.cpp:2474
 msgid "New"
 msgstr "Neu"
 
-#: clientgui/MainDocument.cpp:2488
+#: MainDocument.cpp:2478
 msgid "Download failed"
 msgstr "Herunterladen fehlgeschlagen"
 
-#: clientgui/MainDocument.cpp:2490
+#: MainDocument.cpp:2480
 msgid "Downloading"
 msgstr "Am herunterladen"
 
-#: clientgui/MainDocument.cpp:2492
-#: clientgui/MainDocument.cpp:2557
+#: MainDocument.cpp:2482 MainDocument.cpp:2552
 msgid " (suspended - "
 msgstr " (angehalten - "
 
-#: clientgui/MainDocument.cpp:2500
+#: MainDocument.cpp:2490
 msgid "Project suspended by user"
 msgstr "Projekt angehalten durch Benutzer"
 
-#: clientgui/MainDocument.cpp:2502
+#: MainDocument.cpp:2492
 msgid "Task suspended by user"
 msgstr "Angehalten durch Benutzer"
 
-#: clientgui/MainDocument.cpp:2504
+#: MainDocument.cpp:2494
 msgid "Suspended - "
 msgstr "Angehalten- "
 
-# 75%
-#: clientgui/MainDocument.cpp:2510
+#: MainDocument.cpp:2500
 msgid "GPU suspended - "
 msgstr "GPU angehalten - "
 
-#: clientgui/MainDocument.cpp:2517
+#: MainDocument.cpp:2507
 msgid "Waiting for memory"
 msgstr "Warten auf Speicher"
 
-#: clientgui/MainDocument.cpp:2519
+#: MainDocument.cpp:2509
 msgid "Waiting for shared memory"
 msgstr "Warten auf geteilten Speicher"
 
-#: clientgui/MainDocument.cpp:2521
+#: MainDocument.cpp:2512
+msgid "Running, high priority"
+msgstr "Aktiv, hohe Priorität"
+
+#: MainDocument.cpp:2514
 msgid "Running"
 msgstr "Aktiv"
 
-#: clientgui/MainDocument.cpp:2523
+#: MainDocument.cpp:2517
 msgid " (non-CPU-intensive)"
 msgstr " (nicht CPU-intensiv)"
 
-#: clientgui/MainDocument.cpp:2526
+#: MainDocument.cpp:2520
 msgid "Waiting to run"
 msgstr "Verdrängt"
 
-#: clientgui/MainDocument.cpp:2528
-#: clientgui/MainDocument.cpp:2534
+#: MainDocument.cpp:2522 MainDocument.cpp:2528
 msgid "Ready to start"
 msgstr "Zur Ausführung bereit"
 
-#: clientgui/MainDocument.cpp:2538
-msgid "Postponed: "
-msgstr "Zurückgestellt: "
+#: MainDocument.cpp:2532
+msgid " (Scheduler wait: "
+msgstr " (Planungspause: "
 
-#: clientgui/MainDocument.cpp:2541
-msgid "Postponed"
-msgstr ""
+#: MainDocument.cpp:2536
+msgid " (Scheduler wait)"
+msgstr " (Planungspause)"
 
-#: clientgui/MainDocument.cpp:2545
-#, fuzzy
-msgid "Waiting for network access"
-msgstr "Warte auf Netzwerkzugriff"
+#: MainDocument.cpp:2540
+msgid " (Waiting for network access)"
+msgstr " (Warte auf Netzwerkzugriff)"
 
-#: clientgui/MainDocument.cpp:2549
+#: MainDocument.cpp:2544
 msgid "Computation error"
 msgstr "Berechnungsfehler"
 
-#: clientgui/MainDocument.cpp:2553
+#: MainDocument.cpp:2548
 msgid "Upload failed"
 msgstr "Hochladen fehlgeschlagen"
 
-#: clientgui/MainDocument.cpp:2555
+#: MainDocument.cpp:2550
 msgid "Uploading"
 msgstr "Lädt hoch"
 
-#: clientgui/MainDocument.cpp:2566
+#: MainDocument.cpp:2561
 msgid "Aborted by user"
 msgstr "Abgebrochen durch Benutzer"
 
-#: clientgui/MainDocument.cpp:2569
+#: MainDocument.cpp:2564
 msgid "Aborted by project"
 msgstr "Abgebrochen durch das Projekt"
 
-#: clientgui/MainDocument.cpp:2572
+#: MainDocument.cpp:2567
 msgid "Aborted: not started by deadline"
 msgstr "Abgebrochen: kein Start vor Stichtag möglich."
 
-#: clientgui/MainDocument.cpp:2575
+#: MainDocument.cpp:2570
 msgid "Aborted: disk limit exceeded"
 msgstr "Abgebrochen: Festplattenlimit überschritten"
 
-#: clientgui/MainDocument.cpp:2578
+#: MainDocument.cpp:2573
 msgid "Aborted: run time limit exceeded"
 msgstr "Abgebrochen: Laufzeitlimit überschritten"
 
-#: clientgui/MainDocument.cpp:2581
+#: MainDocument.cpp:2576
 msgid "Aborted: memory limit exceeded"
 msgstr "Abgebrochen: Arbeitsspeicherlimit überschritten"
 
-#: clientgui/MainDocument.cpp:2584
+#: MainDocument.cpp:2579
 msgid "Aborted"
 msgstr "Abgebrochen"
 
-#: clientgui/MainDocument.cpp:2589
+#: MainDocument.cpp:2584
 msgid "Acknowledged"
 msgstr "Bestätigt"
 
-#: clientgui/MainDocument.cpp:2591
+#: MainDocument.cpp:2586
 msgid "Ready to report"
 msgstr "Hochgeladen, meldebereit"
 
-#: clientgui/MainDocument.cpp:2593
+#: MainDocument.cpp:2588
 #, c-format
 msgid "Error: invalid state '%d'"
 msgstr "Fehler: Ungültiger Status '%d'"
 
-#: clientgui/NoInternetConnectionPage.cpp:179
+#: NoInternetConnectionPage.cpp:179
 msgid "No Internet connection"
 msgstr "Keine Internetverbindung!"
 
-#: clientgui/NoInternetConnectionPage.cpp:182
+#: NoInternetConnectionPage.cpp:182
 msgid "Please connect to the Internet and try again."
 msgstr "Bitte starten sie Ihre Internetverbindung und versuchen es erneut!"
 
-#: clientgui/NotDetectedPage.cpp:181
+#: NotDetectedPage.cpp:181
 msgid "Project not found"
 msgstr "Projekt nicht gefunden!"
 
-#: clientgui/NotDetectedPage.cpp:184
+#: 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 ""
-"Die angegebene URL ist nicht die eines BOINC-basierten Projektes!\n"
-"\n"
-"Bitte prüfen Sie die URL und versuchen Sie es erneut."
+msgstr "Die angegebene URL ist nicht die eines BOINC-basierten Projektes!\n\nBitte prüfen Sie die URL und versuchen Sie es erneut."
 
-#: clientgui/NotDetectedPage.cpp:188
+#: NotDetectedPage.cpp:188
 msgid "Account manager not found"
 msgstr "Kontoverwaltung nicht gefunden!"
 
-#: clientgui/NotDetectedPage.cpp:191
+#: NotDetectedPage.cpp:191
 msgid ""
 "The URL you supplied is not that of a BOINC-based account\n"
 "manager.\n"
 "\n"
 "Please check the URL and try again."
-msgstr ""
-"Die angegebene URL ist nicht die einer BOINC-basierten Kontoverwaltung!\n"
-"\n"
-"Bitte prüfen Sie die URL und versuchen Sie es erneut."
+msgstr "Die angegebene URL ist nicht die einer BOINC-basierten Kontoverwaltung!\n\nBitte prüfen Sie die URL und versuchen Sie es erneut."
 
-#: clientgui/NotFoundPage.cpp:181
+#: NotFoundPage.cpp:181
 msgid "Login Failed."
 msgstr "Anmeldung fehlgeschlagen."
 
-#: clientgui/NotFoundPage.cpp:185
+#: NotFoundPage.cpp:185
 msgid "Check the username and password, and try again."
 msgstr "Überprüfen Sie Benutzername und Passwort und versuchen Sie es dann erneut."
 
-#: clientgui/NotFoundPage.cpp:189
+#: NotFoundPage.cpp:189
 msgid "Check the email address and password, and try again."
 msgstr "Bitte überprüfen Sie die E-Mail-Adresse und das Passwort und versuchen es dann erneut."
 
-#: clientgui/NoticeListCtrl.cpp:229
+#: NoticeListCtrl.cpp:222
 msgid "more..."
 msgstr "weiterlesen..."
 
-#: clientgui/ProjectInfoPage.cpp:221
+#: ProjectInfoPage.cpp:477 ProjectInfoPage.cpp:778 ProjectInfoPage.cpp:782
+msgid "All"
+msgstr "Alle"
+
+#: ProjectInfoPage.cpp:615
 msgid "Choose a project"
 msgstr "Wähle ein Projekt"
 
-#: clientgui/ProjectInfoPage.cpp:228
+#: ProjectInfoPage.cpp:619
 msgid "To choose a project, click its name or type its URL below."
 msgstr "Um ein Projekt zu wählen, klicke auf dessen Namen oder gib die Projektadresse ein."
 
-#: clientgui/ProjectInfoPage.cpp:246
+#: ProjectInfoPage.cpp:623
 msgid "Categories:"
 msgstr "Kategorien:"
 
-#: clientgui/ProjectInfoPage.cpp:267
+#: ProjectInfoPage.cpp:627 sg_ProjectPanel.cpp:89
 msgid "Projects:"
 msgstr "Projekte:"
 
-#: clientgui/ProjectInfoPage.cpp:279
+#: ProjectInfoPage.cpp:631
 msgid "Project details"
 msgstr "Projektdetails"
 
-#: clientgui/ProjectInfoPage.cpp:291
+#: ProjectInfoPage.cpp:635
 msgid "Research area:"
 msgstr "Forschungsgebiet:"
 
-#: clientgui/ProjectInfoPage.cpp:302
+#: ProjectInfoPage.cpp:639
 msgid "Organization:"
 msgstr "Organisation:"
 
-#: clientgui/ProjectInfoPage.cpp:313
+#: ProjectInfoPage.cpp:643
 msgid "Web site:"
 msgstr "Webseite:"
 
-#: clientgui/ProjectInfoPage.cpp:325
+#: ProjectInfoPage.cpp:647
 msgid "Supported systems:"
 msgstr "Unterstützte Systeme:"
 
-#: clientgui/ProjectInfoPage.cpp:363
+#: ProjectInfoPage.cpp:651
 msgid "Project URL:"
 msgstr "Projektadresse:"
 
-#: clientgui/ProjectInfoPage.cpp:499
-#: clientgui/ProjectInfoPage.cpp:754
-#: clientgui/ProjectInfoPage.cpp:758
-msgid "All"
-msgstr "Alle"
-
-#: clientgui/ProjectInfoPage.cpp:802
-msgid "This project may not have work for your type of computer.  Do you want to add it anyway?"
+#: ProjectInfoPage.cpp:826
+msgid ""
+"This project may not have work for your type of computer.  Do you want to "
+"add it anyway?"
 msgstr "Dieses Projekt scheint keine Aufgaben für Ihren Computertyp zu haben. Wirklich fortsetzen?"
 
-#: clientgui/ProjectInfoPage.cpp:826
+#: ProjectInfoPage.cpp:850
 msgid "You already added this project. Please choose a different project."
 msgstr "Projekt schon vorhanden. Bitte wählen Sie ein anderes Projekt."
 
-#: clientgui/ProjectProcessingPage.cpp:321
+#: ProjectProcessingPage.cpp:321
 msgid "Communicating with project."
 msgstr "Kommunikation mit dem Server."
 
-#: clientgui/ProjectProcessingPage.cpp:510
+#: ProjectProcessingPage.cpp:509
 msgid "Required files not found on the server."
 msgstr "Benötigte Dateien wurden auf Server nicht gefunden."
 
-#: clientgui/ProjectProcessingPage.cpp:513
-#: clientgui/ProjectProcessingPage.cpp:586
+#: ProjectProcessingPage.cpp:512 ProjectProcessingPage.cpp:574
 msgid "An internal server error has occurred."
 msgstr "Ein interner Server-Fehler ist aufgetreten."
 
-#: clientgui/ProjectPropertiesPage.cpp:334
+#: ProjectPropertiesPage.cpp:334
 msgid ""
 "Communicating with project\n"
 "Please wait..."
-msgstr ""
-"Kommunikation mit dem Projekt\n"
-"Bitte warten..."
-
-#: clientgui/ProjectWelcomePage.cpp:251
-#, c-format
-msgid "Welcome to %s."
-msgstr "Willkommen bei %s."
-
-#: clientgui/ProjectWelcomePage.cpp:254
-msgid "You have volunteered to compute for this project:"
-msgstr "Du möchtest gern deine Rechenleistung für dieses Projekt zur Verfügung stellen:"
-
-#: clientgui/ProjectWelcomePage.cpp:255
-msgid "Name:"
-msgstr "Name:"
-
-#: clientgui/ProjectWelcomePage.cpp:258
-#, fuzzy
-msgid "Home:"
-msgstr "Betreiber:"
-
-#: clientgui/ProjectWelcomePage.cpp:262
-msgid "Description:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:265
-msgid "URL:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:268
-#, fuzzy
-msgid "User:"
-msgstr "Benutzer"
-
-#: clientgui/ProjectWelcomePage.cpp:273
-msgid "WARNING: This project is not registered with BOINC.  Make sure you trust it before continuing."
-msgstr "ACHTUNG: Dieses Projekt ist BOINC nicht bekannt. Bitte überprüfe ob du dem Betreiber vertraust, bevor du fortfährst."
-
-#: clientgui/ProjectWelcomePage.cpp:277
-msgid "To continue, click Next."
-msgstr "Um fortzufahren auf [Weiter >] klicken."
+msgstr "Kommunikation mit dem Projekt\nBitte warten..."
 
-#: clientgui/ProxyInfoPage.cpp:195
+#: ProxyInfoPage.cpp:195
 msgid "Network communication failure"
 msgstr "Netzwerkfehler"
 
-#: clientgui/ProxyInfoPage.cpp:199
+#: ProxyInfoPage.cpp:199
 msgid ""
 "The World Community Grid - BOINC software failed to communicate\n"
 "over the Internet. The most likely reasons are:\n"
@@ -2738,23 +2486,9 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"Die World Community Grid - BOINC Software konnte keine Verbindung über das Internet herstellen.\n"
-"Die wahrscheinlichsten Gründe sind:\n"
-"\n"
-"1) Verbindungsprobleme. Bitte prüfen Sie ihre Netzwerk- oder\n"
-"Modemverbindung und klicken Sie den \"Zurück\"-Knopf um die\n"
-"vorherige Operation zu wiederholen.\n"
-"2) Eine Personal-Firewall Software blockiert BOINC. Um\n"
-"dies zu beheben muss BOINC die Kommunikation über\n"
-"Port 80 und Port 443 erlaubt werden. Klicken Sie anschließend auf\n"
-"[Zurück] um es erneut zu versuchen.\n"
-"\n"
-"3) Sie benutzen einen Proxyserver.\n"
-"Klicken Sie auf [Weiter] um die BOINC Proxyeinstellungen\n"
-"zu konfigurieren."
+msgstr "Die World Community Grid - BOINC Software konnte keine Verbindung über das Internet herstellen.\nDie wahrscheinlichsten Gründe sind:\n\n1) Verbindungsprobleme. Bitte prüfen Sie ihre Netzwerk- oder\nModemverbindung und klicken Sie den \"Zurück\"-Knopf um die\nvorherige Operation zu wiederholen.\n2) Eine Personal-Firewall Software blockiert BOINC. Um\ndies zu beheben muss BOINC die Kommunikation über\nPort 80 und Port 443 erlaubt werden. Klicken Sie anschließend auf\n[Zurück] um es [...]
 
-#: clientgui/ProxyInfoPage.cpp:203
+#: ProxyInfoPage.cpp:203
 msgid ""
 "BOINC failed to communicate on the Internet.\n"
 "The most likely reasons are:\n"
@@ -2769,1306 +2503,1201 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"BOINC konnte keine Verbindung über das Internet herstellen.\n"
-"Die wahrscheinlichsten Gründe sind:\n"
-"\n"
-"1) Verbindungsprobleme. Bitte prüfen Sie ihre Netzwerk- oder\n"
-"Modemverbindung und klicken Sie den \"Zurück\"-Knopf um die\n"
-"vorherige Operation zu wiederholen.\n"
-"2) Eine Personal-Firewall Software blockiert BOINC. Um\n"
-"dies zu beheben muss BOINC die Kommunikation über\n"
-"Port 80 erlaubt werden. Klicken Sie anschließend auf\n"
-"[Zurück] um es erneut zu versuchen.\n"
-"\n"
-"3) Sie benutzen einen Proxyserver.\n"
-"Klicken Sie auf [Weiter] um die BOINC Proxyeinstellungen\n"
-"zu konfigurieren."
+msgstr "BOINC konnte keine Verbindung über das Internet herstellen.\nDie wahrscheinlichsten Gründe sind:\n\n1) Verbindungsprobleme. Bitte prüfen Sie ihre Netzwerk- oder\nModemverbindung und klicken Sie den \"Zurück\"-Knopf um die\nvorherige Operation zu wiederholen.\n2) Eine Personal-Firewall Software blockiert BOINC. Um\ndies zu beheben muss BOINC die Kommunikation über\nPort 80 erlaubt werden. Klicken Sie anschließend auf\n[Zurück] um es erneut zu versuchen.\n\n3) Sie benutzen einen Pr [...]
 
-#: clientgui/ProxyPage.cpp:331
+#: ProxyPage.cpp:331
 msgid "Proxy configuration"
 msgstr "Proxykonfiguration"
 
-#: clientgui/ProxyPage.cpp:334
+#: ProxyPage.cpp:334
 msgid "HTTP proxy"
 msgstr "HTTP Proxy"
 
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
+#: ProxyPage.cpp:337 ProxyPage.cpp:357
 msgid "Server:"
 msgstr "Server:"
 
-#: clientgui/ProxyPage.cpp:350
+#: ProxyPage.cpp:350
 msgid "Autodetect"
 msgstr "Automatische Erkennung"
 
-#: clientgui/ProxyPage.cpp:354
+#: ProxyPage.cpp:354
 msgid "SOCKS proxy"
 msgstr "SOCKS Proxy"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:167
-msgid "Advanced View...\tCtrl+Shift+A"
-msgstr "Erweiterte &Ansicht...\tCtrl+Shift+A"
+#: TermsOfUsePage.cpp:218
+msgid "Terms of Use"
+msgstr "Nutzungsbedingungen"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:168
-msgid "Display the advanced graphical interface."
-msgstr "Die fortgeschrittene Grafikoberfläche anzeigen."
+#: TermsOfUsePage.cpp:222
+msgid "Please read the following terms of use:"
+msgstr "Bitte lesen Sie die folgenden Nutzungsbedingungen:"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:175
-msgid "Skin"
-msgstr "Skin"
+#: TermsOfUsePage.cpp:231
+msgid "I agree to the terms of use."
+msgstr "Ich stimme den Nutzungsbedingungen zu."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:177
-msgid "Select the appearance of the user interface."
-msgstr "Wählen Sie das Aussehen der Benutzeroberfläche."
+#: TermsOfUsePage.cpp:237
+msgid "I do not agree to the terms of use."
+msgstr "Ich stimme den Nutzungsbedingungen nicht zu."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:224
-#, c-format
-msgid "&%s"
-msgstr "&%s"
+#: UnavailablePage.cpp:183
+msgid "Project temporarily unavailable"
+msgstr "Projekt ist vorübergehend nicht erreichbar"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:405
-msgid "Default"
-msgstr "Standard"
+#: UnavailablePage.cpp:186
+msgid ""
+"The project is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "Das Projekt ist vorübergehend nicht zu erreichen.\n\nBitte versuchen Sie es später nochmal."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:848
-msgid "Suspend"
-msgstr "Anhalten"
+#: UnavailablePage.cpp:190
+msgid "Account manager temporarily unavailable"
+msgstr "Die Kontoverwaltung ist vorübergehend nicht zu erreichen."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:850
-msgid "Suspend Computing"
-msgstr "Berechnungen anhalten"
+#: UnavailablePage.cpp:193
+msgid ""
+"The account manager is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "Die Kontoverwaltung ist vorübergehend nicht zu erreichen.\n\nBitte versuchen Sie es später nochmal."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:851
-msgid "Resume Computing"
-msgstr "Berechnung fortsetzen"
+#: ValidateAccountKey.cpp:68
+msgid "Please specify an account key to continue."
+msgstr "Bitte geben Sie einen Kontoschlüssel ein um fortzufahren."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:867
-msgid "Notices"
-msgstr "Nachrichten"
+#: ValidateAccountKey.cpp:71
+msgid "Invalid Account Key; please enter a valid Account Key"
+msgstr "Unzulässiger oder fehlender Kontoschlüssel (Account Key); bitte geben Sie einen gültigen Schlüssel ein."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:868
-msgid "Open a window to view notices from projects or BOINC"
-msgstr "Öffne ein Fenster um Projekt oder BOINC Nachrichten anzuzeigen"
+#: ValidateAccountKey.cpp:82 ValidateEmailAddress.cpp:86
+msgid "Validation conflict"
+msgstr "Überprüfungskonflikt"
 
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
-msgstr "Nachrichten werden abgerufen. Bitte warten..."
+#: ValidateEmailAddress.cpp:72
+msgid "Please specify an email address"
+msgstr "Bitte geben Sie eine E-Mail-Adresse ein."
 
-#: clientgui/sg_DlgMessages.cpp:132
-msgid "There are no notices at this time."
-msgstr "Es sind zur Zeit keine Nachrichten verfügbar."
+#: ValidateEmailAddress.cpp:75
+msgid "Invalid email address; please enter a valid email address"
+msgstr "Unzulässige E-Mail-Adresse; bitte geben Sie eine gültige E-Mail-Adresse ein."
 
-#: clientgui/sg_DlgMessages.cpp:146
-msgid "Close"
-msgstr "Schließen"
+#: ValidateURL.cpp:69
+msgid "Missing URL"
+msgstr "Fehlende URL"
 
-#: clientgui/sg_DlgMessages.cpp:394
-#, c-format
-msgid "%s - Notices"
-msgstr "%s - Nachrichten"
+#: ValidateURL.cpp:70
+msgid ""
+"Please specify a URL.\n"
+"For example:\n"
+"http://www.example.com/"
+msgstr "Bitte geben sie eine URL ein.\nZum Beispiel:\nhttp://example.com"
 
-#: clientgui/sg_DlgPreferences.cpp:270
-msgid "This dialog controls preferences for this computer only."
-msgstr "Dieser Dialog verwaltet die Einstellungen nur für diesen Computer."
+#: ValidateURL.cpp:83 ValidateURL.cpp:87 ValidateURL.cpp:91
+#: ValidateURL.cpp:103 ValidateURL.cpp:107 ValidateURL.cpp:110
+msgid "Invalid URL"
+msgstr "Falsche URL"
 
-#: clientgui/sg_DlgPreferences.cpp:275
-msgid "Click OK to set preferences."
-msgstr "Mit OK die Einstellungen bestätigen."
+#: ValidateURL.cpp:84 ValidateURL.cpp:88 ValidateURL.cpp:92
+msgid ""
+"Please specify a valid URL.\n"
+"For example:\n"
+"http://boincproject.example.com"
+msgstr "Bitte geben Sie eine gültige Internetadresse ein.\nZum Beispiel:\nhttp://boincproject.example.com"
 
-#: clientgui/sg_DlgPreferences.cpp:280
-msgid "Click Clear to restore web-based settings for all preferences listed below."
-msgstr "Klicken Sie auf \"Löschen\", um alle unten aufgeführten Web-Einstellungen auf die Standards zurückzustellen."
+#: ValidateURL.cpp:104 ValidateURL.cpp:108
+#, c-format
+msgid "'%s' does not contain a valid host name."
+msgstr "'%s' Enthält keinen zulässigen Rechnernamen."
 
-#: clientgui/sg_DlgPreferences.cpp:287
-msgid "For additional settings, select Computing Preferences in the Advanced View."
-msgstr "Weitere Einstellungen stehen unter 'Assistenten' -> 'Einstellungen...' in der Erweiterten Ansicht."
+#: ValidateURL.cpp:111
+#, c-format
+msgid "'%s' does not contain a valid path."
+msgstr "'%s' enhält keine zulässige Pfadangabe."
 
-#: clientgui/sg_DlgPreferences.cpp:315
-msgid "Do work only between:"
-msgstr "Arbeite nur zwischen:"
+#: ViewMessages.cpp:84 ViewProjects.cpp:170 ViewStatistics.cpp:1978
+#: ViewTransfers.cpp:160 ViewWork.cpp:183
+msgid "Commands"
+msgstr "Befehle"
 
-#: clientgui/sg_DlgPreferences.cpp:337
-msgid "Connect to internet only between:"
-msgstr "Verbinde mit dem Internet nur zwischen:"
+#: ViewMessages.cpp:88
+msgid "Copy all messages"
+msgstr "Alles kopieren"
 
-#: clientgui/sg_DlgPreferences.cpp:359
-#: clientgui/sg_DlgPreferences.cpp:376
-msgid "Use no more than:"
-msgstr "Nutze nicht mehr als:"
+#: ViewMessages.cpp:95
+msgid "Copy selected messages"
+msgstr "Auswahl kopieren"
 
-#: clientgui/sg_DlgPreferences.cpp:372
-msgid "of disk space"
-msgstr "Festplattenplatz"
+#: ViewMessages.cpp:106 ViewMessages.cpp:502
+msgid "Show only this project"
+msgstr "Zeige nur dieses Projekt"
 
-#: clientgui/sg_DlgPreferences.cpp:389
-msgid "of the processor"
-msgstr "Prozessorleistung"
+#: ViewMessages.cpp:107 ViewMessages.cpp:503
+msgid "Show only the messages for the selected project."
+msgstr "Zeigt nur die Meldungen für dieses Projekt."
 
-#: clientgui/sg_DlgPreferences.cpp:393
-msgid "Do work while on battery?"
-msgstr "Arbeiten im Batteriebetrieb?"
+#: ViewMessages.cpp:164
+msgid "Messages"
+msgstr "Meldungen"
 
-#: clientgui/sg_DlgPreferences.cpp:406
-msgid "Do work after idle for:"
-msgstr "Arbeiten beginnen nach Leerlauf von:"
+#: ViewMessages.cpp:187
+msgid "Copying all messages to the clipboard..."
+msgstr "Kopiert alle Meldungen in die Zwischenablage..."
 
-#: clientgui/sg_DlgPreferences.cpp:431
-msgid "Clear all local preferences listed above and close the dialog"
-msgstr "Alle lokalen Einstellungen löschen und den Dialog schließen."
+#: ViewMessages.cpp:223
+msgid "Copying selected messages to the clipboard..."
+msgstr "Kopiere ausgewählte Meldungen in die Zwischenablage..."
 
-#: clientgui/sg_DlgPreferences.cpp:609
-#: clientgui/sg_DlgPreferences.cpp:612
-#: clientgui/sg_DlgPreferences.cpp:688
-#: clientgui/sg_DlgPreferences.cpp:692
-#: clientgui/sg_DlgPreferences.cpp:704
-#: clientgui/sg_DlgPreferences.cpp:708
-#: clientgui/sg_DlgPreferences.cpp:851
-#: clientgui/sg_DlgPreferences.cpp:862
-msgid "Anytime"
-msgstr "Jederzeit"
+#: ViewMessages.cpp:286
+msgid "Filtering messages..."
+msgstr "Filtere Meldungen..."
 
-#: clientgui/sg_DlgPreferences.cpp:645
-msgid "100 MB"
-msgstr "100 MB"
+#: ViewMessages.cpp:494
+msgid "Show all messages"
+msgstr "Zeige alle Meldungen"
 
-#: clientgui/sg_DlgPreferences.cpp:646
-msgid "200 MB"
-msgstr "200 MB"
+#: ViewMessages.cpp:495
+msgid "Show messages for all projects."
+msgstr "Zeige Meldungen für alle Projekte."
 
-#: clientgui/sg_DlgPreferences.cpp:647
-msgid "500 MB"
-msgstr "500 MB"
+#: ViewNotices.cpp:58 sg_DlgMessages.cpp:124
+msgid "Fetching notices; please wait..."
+msgstr "Nachrichten werden abgerufen. Bitte warten..."
 
-#: clientgui/sg_DlgPreferences.cpp:648
-msgid "1 GB"
-msgstr "1 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:649
-msgid "2 GB"
-msgstr "2 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:650
-msgid "5 GB"
-msgstr "5 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:651
-msgid "10 GB"
-msgstr "10 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:652
-msgid "20 GB"
-msgstr "20 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:653
-msgid "50 GB"
-msgstr "50 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:654
-msgid "100 GB"
-msgstr "100 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:724
-#, c-format
-msgid "%d MB"
-msgstr "%d MB"
-
-#: clientgui/sg_DlgPreferences.cpp:726
-#, c-format
-msgid "%4.2f GB"
-msgstr "%4.2f GB"
-
-#: clientgui/sg_DlgPreferences.cpp:767
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: clientgui/sg_DlgPreferences.cpp:803
-msgid "0 (Run Always)"
-msgstr "0 (Immer ausführen)"
-
-#: clientgui/sg_DlgPreferences.cpp:806
-#, c-format
-msgid "%d"
-msgstr "%d"
-
-#: clientgui/sg_DlgPreferences.cpp:953
-#, fuzzy, c-format
-msgid "%s - Computing Preferences"
-msgstr "%s - Recheneinstellungen"
+#: ViewNotices.cpp:65 sg_DlgMessages.cpp:132
+msgid "There are no notices at this time."
+msgstr "Es sind zur Zeit keine Nachrichten verfügbar."
 
-#: clientgui/sg_DlgPreferences.cpp:1033
-msgid "Do you really want to clear all local preferences?\n"
-msgstr "Wollen Sie wirklich alle lokalen Einstellungen löschen?\n"
+#: ViewNotices.cpp:99 sg_BoincSimpleFrame.cpp:776
+msgid "Notices"
+msgstr "Nachrichten"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:66
-#: clientgui/ViewProjects.cpp:179
+#: ViewProjects.cpp:174 sg_ProjectCommandPopup.cpp:61
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:67
-#: clientgui/ViewProjects.cpp:180
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
+#: ViewProjects.cpp:175 sg_ProjectCommandPopup.cpp:62
+msgid ""
+"Report all completed tasks, get latest credit, get latest preferences, and "
+"possibly get more tasks."
 msgstr "Berichtet über alle fertig gestellten Aufgaben des ausgewählten (markierten) Projekts, holt die letzten Statistiken und Einstellungen und erhält eventuell mehr Aufgaben."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:73
-#: clientgui/sg_ProjectCommandPopup.cpp:129
-#: clientgui/ViewProjects.cpp:187
-#: clientgui/ViewProjects.cpp:727
+#: 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
+msgid "Suspend"
+msgstr "Anhalten"
+
+#: ViewProjects.cpp:182 ViewProjects.cpp:722 sg_ProjectCommandPopup.cpp:68
+#: sg_ProjectCommandPopup.cpp:114
 msgid "Suspend tasks for this project."
 msgstr "Unterbricht zeitweilig die Arbeit an dem ausgewählten (markierten) Projekt."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:78
-#: clientgui/sg_ProjectCommandPopup.cpp:136
-#: clientgui/ViewProjects.cpp:193
-#: clientgui/ViewProjects.cpp:746
+#: ViewProjects.cpp:188 ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:73
+#: sg_ProjectCommandPopup.cpp:121
 msgid "No new tasks"
 msgstr "Keine neuen Aufgaben"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:79
-#: clientgui/ViewProjects.cpp:194
+#: ViewProjects.cpp:189 sg_ProjectCommandPopup.cpp:74
 msgid "Don't get new tasks for this project."
 msgstr "Fordert keine neuen Aufgaben für das ausgewählte (markierte) Projekt mehr an."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:200
+#: ViewProjects.cpp:195 sg_ProjectCommandPopup.cpp:79
 msgid "Reset project"
 msgstr "Zurücksetzen"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:85
-#: clientgui/ViewProjects.cpp:201
-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."
+#: ViewProjects.cpp:196 sg_ProjectCommandPopup.cpp:80
+msgid ""
+"Delete all files and tasks associated with this project, and get new tasks."
+"  You can update the project first to report any completed tasks."
 msgstr "Entfernt alle Arbeitspakete und Anwendungen des ausgewählten (markierten) Projekts von diesem Computer. Sie sollten das Projekt vorher aktualisieren um alle erledigten Aufgaben dem Server zu melden."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:91
-#: clientgui/ViewProjects.cpp:208
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
+#: ViewProjects.cpp:203 sg_ProjectCommandPopup.cpp:86
+msgid ""
+"Remove this project.  Tasks in progress will be lost (use 'Update' first to "
+"report any completed tasks)."
 msgstr "Entfernt dieses Projekt von diesem Computer. Sie sollten vorher das Projekt aktualisieren um alle erledigten Aufgaben dem Server zu melden."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:96
-#: clientgui/sg_TaskCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:214
+#: ViewProjects.cpp:209 ViewWork.cpp:222 sg_ProjectCommandPopup.cpp:91
+#: sg_TaskCommandPopup.cpp:78
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:97
-#: clientgui/ViewProjects.cpp:215
+#: ViewProjects.cpp:210 sg_ProjectCommandPopup.cpp:92
 msgid "Show project details."
 msgstr "Zeige Projekt-Details."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:126
-#: clientgui/ViewProjects.cpp:723
-msgid "Resume tasks for this project."
-msgstr "Setzt die unterbrochene Arbeit an dem ausgewählten (markierten) Projekt fort."
+#: ViewProjects.cpp:220 ViewStatistics.cpp:450
+msgid "Account"
+msgstr "Konto"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:133
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow new tasks"
-msgstr "Neue Aufgaben zulassen"
+#: ViewProjects.cpp:222
+msgid "Work done"
+msgstr "Arbeit erledigt"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:134
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow fetching new tasks for this project."
-msgstr "Erlaubt das Anfordern von neuen Aufgaben für das ausgewählte (markierte) Projekt."
+#: ViewProjects.cpp:223
+msgid "Avg. work done"
+msgstr "Durchschn. geleistete Arbeit"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:137
-#: clientgui/ViewProjects.cpp:746
-msgid "Don't fetch new tasks for this project."
-msgstr "Fordert keine neuen Aufgaben für das ausgewählte (markierte) Projekt mehr an."
+#: ViewProjects.cpp:225 ViewTransfers.cpp:188 ViewWork.cpp:234
+msgid "Status"
+msgstr "Status"
+
+#: ViewProjects.cpp:250
+msgid "Projects"
+msgstr "Projekte"
+
+#: ViewProjects.cpp:302
+msgid "Updating project..."
+msgstr "Projekt wird aktualisiert..."
+
+#: ViewProjects.cpp:344
+msgid "Resuming project..."
+msgstr "Projekt wird fortgesetzt..."
+
+#: ViewProjects.cpp:348
+msgid "Suspending project..."
+msgstr "Projekt wird angehalten..."
+
+#: ViewProjects.cpp:385
+msgid "Telling project to allow additional task downloads..."
+msgstr "Erlaubt dem Projekt neue Aufgaben anzufordern..."
+
+#: ViewProjects.cpp:389
+msgid "Telling project to not fetch any additional tasks..."
+msgstr "Verbietet dem Projekt neue Aufgaben anzufordern..."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:229
-#: clientgui/ViewProjects.cpp:443
+#: ViewProjects.cpp:425
+msgid "Resetting project..."
+msgstr "Projekt wird zurückgesetzt..."
+
+#: ViewProjects.cpp:438 sg_ProjectCommandPopup.cpp:214
 #, c-format
 msgid "Are you sure you want to reset project '%s'?"
 msgstr "Wollen Sie das Projekt '%s' wirklich zurücksetzen?"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:235
-#: clientgui/ViewProjects.cpp:449
+#: ViewProjects.cpp:444 sg_ProjectCommandPopup.cpp:220
 msgid "Reset Project"
 msgstr "Projekt zurücksetzen"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:266
-#: clientgui/ViewProjects.cpp:501
+#: ViewProjects.cpp:483
+msgid "Removing project..."
+msgstr "Projekt wird entfernt..."
+
+#: ViewProjects.cpp:496 sg_ProjectCommandPopup.cpp:251
 #, c-format
 msgid "Are you sure you want to remove project '%s'?"
 msgstr "Wollen Sie das Projekt '%s' wirklich entfernen?"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:272
-#: clientgui/ViewProjects.cpp:507
+#: ViewProjects.cpp:502 sg_ProjectCommandPopup.cpp:257
 msgid "Remove Project"
 msgstr "Projekt entfernen"
 
-#: clientgui/sg_ProjectPanel.cpp:72
-msgid "Add Project"
-msgstr "Projekt hinzufügen"
+#: ViewProjects.cpp:543 ViewWork.cpp:599
+msgid "Launching browser..."
+msgstr "Webbrowser wird gestartet..."
 
-#: clientgui/sg_ProjectPanel.cpp:73
-msgid "Synchronize"
-msgstr "Synchronisieren"
+#: ViewProjects.cpp:718 sg_ProjectCommandPopup.cpp:111
+msgid "Resume tasks for this project."
+msgstr "Setzt die unterbrochene Arbeit an dem ausgewählten (markierten) Projekt fort."
 
-#: clientgui/sg_ProjectPanel.cpp:74
-msgid "Work done for this project"
-msgstr "erledigte Arbeit für dieses Projekt"
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:118
+msgid "Allow new tasks"
+msgstr "Neue Aufgaben zulassen"
 
-#: clientgui/sg_ProjectPanel.cpp:77
-msgid "Synchronize projects with account manager system"
-msgstr "Synchronisiere Projekt mit der Kontoverwaltung"
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:119
+msgid "Allow fetching new tasks for this project."
+msgstr "Erlaubt das Anfordern von neuen Aufgaben für das ausgewählte (markierte) Projekt."
 
-#: clientgui/sg_ProjectPanel.cpp:124
-msgid "Select a project to access with the controls below"
-msgstr "Wähle ein Projekt für den Zugriff mit den unteren Bedienelementen aus"
+#: ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:122
+msgid "Don't fetch new tasks for this project."
+msgstr "Fordert keine neuen Aufgaben für das ausgewählte (markierte) Projekt mehr an."
 
-#: clientgui/sg_ProjectPanel.cpp:145
-msgid "Project Web Pages"
-msgstr "Projekt -Webseite"
+#: ViewProjects.cpp:1058
+msgid "Requested by user"
+msgstr "Vom Benutzer angefragt"
 
-#: clientgui/sg_ProjectPanel.cpp:149
-msgid "Project Commands"
-msgstr "Projekt-Befehle"
+#: ViewProjects.cpp:1059
+msgid "To fetch work"
+msgstr "Um Arbeit zu holen"
 
-#: clientgui/sg_ProjectPanel.cpp:276
-#, c-format
-msgid "Pop up a menu of web sites for project %s"
-msgstr "Öffne Menü für die Webseiten von %s"
+#: ViewProjects.cpp:1060
+msgid "To report completed tasks"
+msgstr "Um fertige Aufgaben zu melden"
 
-#: clientgui/sg_ProjectPanel.cpp:278
-#, c-format
-msgid "Pop up a menu of commands to apply to project %s"
-msgstr "Blende ein Menü mit Befehlen für Projekt %s ein"
+#: ViewProjects.cpp:1061
+msgid "To send trickle-up message"
+msgstr "Um eine Zwischenmeldung zu senden"
 
-#: clientgui/sg_TaskCommandPopup.cpp:66
-msgid "Show graphics"
-msgstr "Grafik anzeigen"
+#: ViewProjects.cpp:1062
+msgid "Requested by account manager"
+msgstr "Von der Kontenverwaltung angefordert"
 
-#: clientgui/sg_TaskCommandPopup.cpp:67
-msgid "Show application graphics in a window."
-msgstr "Zeigt die Anwendungsgrafik der ausgewählten (markierten), aktiven Berechnung in einem Fenster."
+#: ViewProjects.cpp:1063
+msgid "Project initialization"
+msgstr "Projektinitialisierung"
 
-#: clientgui/sg_TaskCommandPopup.cpp:73
-msgid "Suspend this task."
-msgstr "Diese Aufgabe anhalten."
+#: ViewProjects.cpp:1064
+msgid "Requested by project"
+msgstr "Vom Projekt angefordert"
 
-#: clientgui/sg_TaskCommandPopup.cpp:78
-msgid "Abort"
-msgstr "Abbrechen"
+#: ViewProjects.cpp:1065
+msgid "Unknown reason"
+msgstr "Unbekannte Ursache"
 
-#: clientgui/sg_TaskCommandPopup.cpp:79
-msgid "Abandon this task. You will get no credit for it."
-msgstr "Diese Aufgabe abbrechen. Es werden keine Punkte angerechnet."
+#: ViewProjects.cpp:1079
+msgid "Suspended by user"
+msgstr "Angehalten durch Benutzer"
 
-#: clientgui/sg_TaskCommandPopup.cpp:85
-msgid "Show task details."
-msgstr "Zeige Aufgabendetails."
+#: ViewProjects.cpp:1082
+msgid "Won't get new tasks"
+msgstr "Erhält keine neue Aufgaben"
 
-#: clientgui/sg_TaskCommandPopup.cpp:119
-msgid "Resume work for this task."
-msgstr "Berechnung für diese Aufgabe wiederaufnehmen."
+#: ViewProjects.cpp:1085
+msgid "Project ended - OK to remove"
+msgstr "Projekt beendet - Bereit zum entfernen"
 
-#: clientgui/sg_TaskCommandPopup.cpp:123
-msgid "Suspend work for this task."
-msgstr "Unterbricht die Arbeit an der ausgewählten (markierte) Aufgabe."
+#: ViewProjects.cpp:1088
+msgid "Will remove when tasks done"
+msgstr "Entfernen, sobald Aufgaben erledigt sind"
 
-#: clientgui/sg_TaskCommandPopup.cpp:267
-#, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %.1lf%%, Status: %s)"
-msgstr ""
-"Sind Sie sicher dass Sie die Aufgabe abbrechen wollen '%s'?\n"
-"(Fortscshritt: %.1lf%%, Status: %s)"
+#: ViewProjects.cpp:1091
+msgid "Scheduler request pending"
+msgstr "Wartende Scheduleranfrage"
 
-#: clientgui/sg_TaskCommandPopup.cpp:272
-msgid "Abort task"
-msgstr "Aufgabe abbrechen"
+#: ViewProjects.cpp:1097
+msgid "Scheduler request in progress"
+msgstr "Laufende Scheduleranfrage"
 
-#: clientgui/sg_TaskPanel.cpp:468
-msgid "You don't have any projects.  Please Add a Project."
-msgstr "Sie haben kein Projekt eingetragen. Bitte fügen Sie ein Projekt hinzu."
+#: ViewProjects.cpp:1100
+msgid "Trickle up message pending"
+msgstr "Zwischenmeldung ausstehend"
 
-#: clientgui/sg_TaskPanel.cpp:469
-msgid "Not available"
-msgstr "Nicht Verfügbar"
+#: ViewProjects.cpp:1106
+msgid "Communication deferred "
+msgstr "Kommunikation verzögert um "
 
-#: clientgui/sg_TaskPanel.cpp:480
-msgid "Tasks:"
-msgstr "Aufgaben:"
+#: ViewResources.cpp:62
+msgid "Total disk usage"
+msgstr "Festplattennutzung gesamt"
 
-#: clientgui/sg_TaskPanel.cpp:486
-msgid "Select a task to access"
-msgstr "Wähle eine Aufgabe"
+#: ViewResources.cpp:83
+msgid "Disk usage by BOINC projects"
+msgstr "Festplattennutzung durch BOINC-Projekte"
 
-#: clientgui/sg_TaskPanel.cpp:497
-msgid "From:"
-msgstr "Von:"
+#: ViewResources.cpp:116
+msgid "Disk"
+msgstr "Festplatte"
 
-#: clientgui/sg_TaskPanel.cpp:551
-msgid "This task's progress"
-msgstr "Fortschritt dieser Aufgabe"
+#: ViewResources.cpp:249
+msgid "no projects: 0 bytes used"
+msgstr "keine Projekte: 0 Bytes benutzt"
 
-#: clientgui/sg_TaskPanel.cpp:569
-msgid "Task Commands"
-msgstr "Aufgabenbefehle"
+#: ViewResources.cpp:286
+msgid "used by BOINC: "
+msgstr "Von BOINC belegt: "
 
-#: clientgui/sg_TaskPanel.cpp:570
-msgid "Pop up a menu of commands to apply to this task"
-msgstr "Blende ein Menü ein für anwendbare Befehle für diese Aufgabe"
+#: ViewResources.cpp:296
+msgid "free, available to BOINC: "
+msgstr "Frei, für BOINC verfügbar: "
 
-#: clientgui/sg_TaskPanel.cpp:705
-#, c-format
-msgid "Application: %s"
-msgstr "Anwendung: %s"
+#: ViewResources.cpp:306
+msgid "free, not available to BOINC: "
+msgstr "Frei, nicht für BOINC verfügbar: "
 
-#: clientgui/sg_TaskPanel.cpp:728
-#, c-format
-msgid "%.3f%%"
-msgstr "%.3f%%"
+#: ViewResources.cpp:316
+msgid "free: "
+msgstr "Frei: "
 
-#: clientgui/sg_TaskPanel.cpp:736
-msgid "Application: Not available"
-msgstr "Anwendung: Nicht Verfügbar"
+#: ViewResources.cpp:326
+msgid "used by other programs: "
+msgstr "Anderweitig belegt: "
 
-#: clientgui/sg_TaskPanel.cpp:836
-msgid "Not Available"
-msgstr "Nicht Verfügbar"
+#: ViewStatistics.cpp:1205
+msgid "User Total"
+msgstr "Benutzer Gesamt"
 
-#: clientgui/sg_TaskPanel.cpp:851
-#, c-format
-msgid "Elapsed: %s"
-msgstr "Vergangen: %s"
+#: ViewStatistics.cpp:1206
+msgid "User Average"
+msgstr "Benutzer Durchschnitt"
 
-#: clientgui/sg_TaskPanel.cpp:865
-#, c-format
-msgid "Remaining (estimated): %s"
-msgstr "Verbleibend (geschätzt): %s"
+#: ViewStatistics.cpp:1207
+msgid "Host Total"
+msgstr "Rechner Gesamt"
+
+#: ViewStatistics.cpp:1208
+msgid "Host Average"
+msgstr "Rechner Durchschnitt"
 
-#: clientgui/sg_TaskPanel.cpp:880
+#: ViewStatistics.cpp:1355
 #, c-format
-msgid "Status: %s"
-msgstr "Status: %s"
+msgid "Last update: %.0f days ago"
+msgstr "Letztes Update: Vor %.0f Tagen."
 
-#: clientgui/sg_TaskPanel.cpp:1227
-msgid "Retrieving current status."
-msgstr "Aktueller Status wird ermittelt."
+#: ViewStatistics.cpp:1982
+msgid "Show user total"
+msgstr "Benutzer Gesamt"
 
-#: clientgui/sg_TaskPanel.cpp:1233
-msgid "Downloading work from the server."
-msgstr "Lade neue Aufgaben vom Server."
+#: ViewStatistics.cpp:1983
+msgid "Show total credit for user"
+msgstr "Gesamtpunktzahl des Benutzers anzeigen"
 
-#: clientgui/sg_TaskPanel.cpp:1238
-msgid "Processing Suspended:  Running On Batteries."
-msgstr "Berechnungen angehalten: Batteriebetrieb."
+#: ViewStatistics.cpp:1989
+msgid "Show user average"
+msgstr "Benutzer Durchschnitt"
 
-#: clientgui/sg_TaskPanel.cpp:1240
-msgid "Processing Suspended:  User Active."
-msgstr "Berechnungen angehalten: Benutzer ist aktiv."
+#: ViewStatistics.cpp:1990
+msgid "Show average credit for user"
+msgstr "Durchschnittliche Punktzahl des Benutzers anzeigen"
 
-#: clientgui/sg_TaskPanel.cpp:1242
-msgid "Processing Suspended:  User paused processing."
-msgstr "Berechnungen angehalten: Angehalten durch Benutzer."
+#: ViewStatistics.cpp:1996
+msgid "Show host total"
+msgstr "Rechner Gesamt"
 
-#: clientgui/sg_TaskPanel.cpp:1244
-msgid "Processing Suspended:  Time of Day."
-msgstr "Berechnungen angehalten: Zeitbegrenzung."
+#: ViewStatistics.cpp:1997
+msgid "Show total credit for host"
+msgstr "Gesamtpunktzahl für den Computer anzeigen"
 
-#: clientgui/sg_TaskPanel.cpp:1246
-msgid "Processing Suspended:  Benchmarks Running."
-msgstr "Berechnungen angehalten: Benchmarks laufen."
+#: ViewStatistics.cpp:2003
+msgid "Show host average"
+msgstr "Rechner Durchschnitt"
 
-#: clientgui/sg_TaskPanel.cpp:1248
-msgid "Processing Suspended."
-msgstr "Berechnungen angehalten."
+#: ViewStatistics.cpp:2004
+msgid "Show average credit for host"
+msgstr "Durchschnittliche Punktzahl für den Computer anzeigen"
 
-#: clientgui/sg_TaskPanel.cpp:1252
-msgid "Waiting to contact project servers."
-msgstr "Warte auf Kontakt zum Projektserver."
+#: ViewStatistics.cpp:2013
+msgid "< &Previous project"
+msgstr "< &Vorheriges Projekt"
 
-#: clientgui/sg_TaskPanel.cpp:1256
-#: clientgui/sg_TaskPanel.cpp:1265
-msgid "Retrieving current status"
-msgstr "Ermittle den aktuellen Status."
+#: ViewStatistics.cpp:2014
+msgid "Show chart for previous project"
+msgstr "Zeige Grafik für das vorherige Projekt"
 
-#: clientgui/sg_TaskPanel.cpp:1260
-msgid "No work available to process"
-msgstr "Keine Aufgaben zu bearbeiten."
+#: ViewStatistics.cpp:2019
+msgid "&Next project >"
+msgstr "&Nächstes Projekt >"
 
-#: clientgui/sg_TaskPanel.cpp:1262
-msgid "Unable to connect to the core client"
-msgstr "Verbindung mit dem Basisclient nicht möglich."
+#: ViewStatistics.cpp:2020
+msgid "Show chart for next project"
+msgstr "Grafik für das nächste Projekt anzeigen"
 
-#: clientgui/TermsOfUsePage.cpp:218
-msgid "Terms of Use"
-msgstr "Nutzungsbedingungen"
+#: ViewStatistics.cpp:2026 ViewStatistics.cpp:2416
+msgid "Hide project list"
+msgstr "Projektliste ausblenden"
 
-#: clientgui/TermsOfUsePage.cpp:222
-msgid "Please read the following terms of use:"
-msgstr "Bitte lesen Sie die folgenden Nutzungsbedingungen:"
+#: ViewStatistics.cpp:2027 ViewStatistics.cpp:2416
+msgid "Use entire area for graphs"
+msgstr "Den ganzen Bereich für Grafiken nutzen"
 
-#: clientgui/TermsOfUsePage.cpp:231
-msgid "I agree to the terms of use."
-msgstr "Ich stimme den Nutzungsbedingungen zu."
+#: ViewStatistics.cpp:2032
+msgid "Mode view"
+msgstr "Ansicht"
 
-#: clientgui/TermsOfUsePage.cpp:237
-msgid "I do not agree to the terms of use."
-msgstr "Ich stimme den Nutzungsbedingungen nicht zu."
+#: ViewStatistics.cpp:2036
+msgid "One project"
+msgstr "Ein Projekt"
 
-#: clientgui/UnavailablePage.cpp:183
-msgid "Project temporarily unavailable"
-msgstr "Projekt ist vorübergehend nicht erreichbar"
+#: ViewStatistics.cpp:2037
+msgid "Show one chart with selected project"
+msgstr "Eine Grafik mit dem ausgewählten Projekt anzeigen"
 
-#: clientgui/UnavailablePage.cpp:186
-msgid ""
-"The project is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-"Das Projekt ist vorübergehend nicht zu erreichen.\n"
-"\n"
-"Bitte versuchen Sie es später nochmal."
+#: ViewStatistics.cpp:2043
+msgid "All projects (separate)"
+msgstr "Alle Projekte (separat)"
 
-#: clientgui/UnavailablePage.cpp:190
-msgid "Account manager temporarily unavailable"
-msgstr "Die Kontoverwaltung ist vorübergehend nicht zu erreichen."
+#: ViewStatistics.cpp:2044
+msgid "Show all projects, one chart per project"
+msgstr "Alle Projekte anzeigen, eine Grafik je Projekt"
 
-#: clientgui/UnavailablePage.cpp:193
-msgid ""
-"The account manager is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-"Die Kontoverwaltung ist vorübergehend nicht zu erreichen.\n"
-"\n"
-"Bitte versuchen Sie es später nochmal."
+#: ViewStatistics.cpp:2050
+msgid "All projects (together)"
+msgstr "Alle Projekte (zusammen)"
 
-#: clientgui/ValidateAccountKey.cpp:68
-msgid "Please specify an account key to continue."
-msgstr "Bitte geben Sie einen Kontoschlüssel ein um fortzufahren."
+#: ViewStatistics.cpp:2051
+msgid "Show one chart with all projects"
+msgstr "Eine Grafik mit allen Projekten anzeigen"
 
-#: clientgui/ValidateAccountKey.cpp:71
-msgid "Invalid Account Key; please enter a valid Account Key"
-msgstr "Unzulässiger oder fehlender Kontoschlüssel (Account Key); bitte geben Sie einen gültigen Schlüssel ein."
+#: ViewStatistics.cpp:2057
+msgid "All projects (sum)"
+msgstr "Alle Projekte (Summe)"
 
-#: clientgui/ValidateAccountKey.cpp:82
-#: clientgui/ValidateEmailAddress.cpp:86
-msgid "Validation conflict"
-msgstr "Überprüfungskonflikt"
+#: ViewStatistics.cpp:2058
+msgid "Show one chart with sum of projects"
+msgstr "Eine Grafik mit allen Projekten (summiert) anzeigen"
 
-#: clientgui/ValidateEmailAddress.cpp:72
-msgid "Please specify an email address"
-msgstr "Bitte geben Sie eine E-Mail-Adresse ein."
+#: ViewStatistics.cpp:2079
+msgid "Statistics"
+msgstr "Statistiken"
 
-#: clientgui/ValidateEmailAddress.cpp:75
-msgid "Invalid email address; please enter a valid email address"
-msgstr "Unzulässige E-Mail-Adresse; bitte geben Sie eine gültige E-Mail-Adresse ein."
+#: 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
+msgid "Updating charts..."
+msgstr "Grafiken werden aktualisiert..."
 
-#: clientgui/ValidateURL.cpp:69
-msgid "Missing URL"
-msgstr "Fehlende URL"
+#: ViewStatistics.cpp:2420
+msgid "Show project list"
+msgstr "Projektliste anzeigen"
 
-#: clientgui/ValidateURL.cpp:70
-msgid ""
-"Please specify a URL.\n"
-"For example:\n"
-"http://www.example.com/"
-msgstr ""
-"Bitte geben sie eine URL ein.\n"
-"Zum Beispiel:\n"
-"http://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 "Falsche URL"
+#: ViewStatistics.cpp:2420
+msgid "Uses smaller area for graphs"
+msgstr "Kleineren Bereich für Grafiken nutzen"
 
-#: 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 ""
-"Bitte geben Sie eine gültige Internetadresse ein.\n"
-"Zum Beispiel:\n"
-"http://boincproject.example.com"
+#: ViewTransfers.cpp:164
+msgid "Retry Now"
+msgstr "Jetzt nochmal versuchen"
 
-#: clientgui/ValidateURL.cpp:104
-#: clientgui/ValidateURL.cpp:108
-#, c-format
-msgid "'%s' does not contain a valid host name."
-msgstr "'%s' Enthält keinen zulässigen Rechnernamen."
+#: ViewTransfers.cpp:165
+msgid "Retry the file transfer now"
+msgstr "Den Dateitransfer jetzt erneut versuchen."
 
-#: clientgui/ValidateURL.cpp:111
-#, c-format
-msgid "'%s' does not contain a valid path."
-msgstr "'%s' enhält keine zulässige Pfadangabe."
+#: ViewTransfers.cpp:171
+msgid "Abort Transfer"
+msgstr "Abbrechen"
 
-#: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:175
-msgid "Commands"
-msgstr "Befehle"
+#: ViewTransfers.cpp:172
+msgid "Abort this file transfer.  You won't get credit for the task."
+msgstr "Diese Dateiübertragung abbrechen. Es werden keine Punkte für diese Aufgabe angerechnet."
 
-#: clientgui/ViewMessages.cpp:88
-msgid "Copy all messages"
-msgstr "Alles kopieren"
+#: ViewTransfers.cpp:183
+msgid "File"
+msgstr "Datei"
 
-#: clientgui/ViewMessages.cpp:95
-msgid "Copy selected messages"
-msgstr "Auswahl kopieren"
+#: ViewTransfers.cpp:184 ViewWork.cpp:233
+msgid "Progress"
+msgstr "Fortschritt"
 
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
-msgid "Show only this project"
-msgstr "Zeige nur dieses Projekt"
+#: ViewTransfers.cpp:185
+msgid "Size"
+msgstr "Größe"
 
-#: clientgui/ViewMessages.cpp:107
-#: clientgui/ViewMessages.cpp:503
-msgid "Show only the messages for the selected project."
-msgstr "Zeigt nur die Meldungen für dieses Projekt."
+#: ViewTransfers.cpp:186
+msgid "Elapsed Time"
+msgstr "Vergangene Zeit"
 
-#: clientgui/ViewMessages.cpp:164
-msgid "Messages"
-msgstr "Meldungen"
+#: ViewTransfers.cpp:187
+msgid "Speed"
+msgstr "Geschwindigkeit"
 
-#: clientgui/ViewMessages.cpp:187
-msgid "Copying all messages to the clipboard..."
-msgstr "Kopiert alle Meldungen in die Zwischenablage..."
+#: ViewTransfers.cpp:213
+msgid "Transfers"
+msgstr "Übertragung"
 
-#: clientgui/ViewMessages.cpp:223
-msgid "Copying selected messages to the clipboard..."
-msgstr "Kopiere ausgewählte Meldungen in die Zwischenablage..."
+#: ViewTransfers.cpp:280
+msgid "Network activity is suspended - "
+msgstr "Netzwerkzugriff ist abgeschaltet - "
 
-#: clientgui/ViewMessages.cpp:286
-msgid "Filtering messages..."
-msgstr "Filtere Meldungen..."
+#: ViewTransfers.cpp:282
+msgid ""
+".\n"
+"You can enable it using the Activity menu."
+msgstr ".\nKann über das Menü Steuerung aktiviert werden."
 
-#: clientgui/ViewMessages.cpp:494
-msgid "Show all messages"
-msgstr "Zeige alle Meldungen"
+#: ViewTransfers.cpp:285
+msgid "BOINC"
+msgstr "BOINC"
 
-#: clientgui/ViewMessages.cpp:495
-msgid "Show messages for all projects."
-msgstr "Zeige Meldungen für alle Projekte."
+#: ViewTransfers.cpp:292
+msgid "Retrying transfer now..."
+msgstr "Übertragung wird jetzt wiederholt..."
 
-#: clientgui/ViewProjects.cpp:225
-msgid "Account"
-msgstr "Konto"
+#: ViewTransfers.cpp:330
+msgid "Aborting transfer..."
+msgstr "Übertragung wird abgebrochen..."
 
-#: clientgui/ViewProjects.cpp:227
-msgid "Work done"
-msgstr "Arbeit erledigt"
+#: ViewTransfers.cpp:343
+#, 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 "Sind Sie sicher dass Sie die Dateiübertragung \"%s\" abbrechen wollen?\nAchtung: Das Abbrechen der Übertragung macht diese ungültig\nund Sie werden keine Punkte dafür bekommen."
 
-#: clientgui/ViewProjects.cpp:228
-msgid "Avg. work done"
-msgstr "Durchschn. geleistete Arbeit"
+#: ViewTransfers.cpp:349
+msgid "Abort File Transfer"
+msgstr "Dateiübertragug abbrechen"
 
-#: clientgui/ViewProjects.cpp:230
-msgid "Status"
-msgstr "Status"
+#: ViewTransfers.cpp:780
+msgid "Upload"
+msgstr "Hochladen"
 
-#: clientgui/ViewProjects.cpp:255
-msgid "Projects"
-msgstr "Projekte"
+#: ViewTransfers.cpp:780
+msgid "Download"
+msgstr "Herunterladen"
 
-#: clientgui/ViewProjects.cpp:307
-msgid "Updating project..."
-msgstr "Projekt wird aktualisiert..."
+#: ViewTransfers.cpp:784
+msgid "retry in "
+msgstr "Wiederhole in "
 
-#: clientgui/ViewProjects.cpp:349
-msgid "Resuming project..."
-msgstr "Projekt wird fortgesetzt..."
+#: ViewTransfers.cpp:786
+msgid "failed"
+msgstr "fehlgeschlagen"
 
-#: clientgui/ViewProjects.cpp:353
-msgid "Suspending project..."
-msgstr "Projekt wird angehalten..."
+#: ViewTransfers.cpp:789
+msgid "suspended"
+msgstr "angehalten"
 
-#: clientgui/ViewProjects.cpp:390
-msgid "Telling project to allow additional task downloads..."
-msgstr "Erlaubt dem Projekt neue Aufgaben anzufordern..."
+#: ViewTransfers.cpp:794
+msgid "active"
+msgstr "aktiv"
 
-#: clientgui/ViewProjects.cpp:394
-msgid "Telling project to not fetch any additional tasks..."
-msgstr "Verbietet dem Projekt neue Aufgaben anzufordern..."
+#: ViewTransfers.cpp:796
+msgid "pending"
+msgstr "ausstehend"
 
-#: clientgui/ViewProjects.cpp:430
-msgid "Resetting project..."
-msgstr "Projekt wird zurückgesetzt..."
+#: ViewTransfers.cpp:803
+msgid " (project backoff: "
+msgstr " (Projektverzögerung: "
 
-#: clientgui/ViewProjects.cpp:488
-msgid "Removing project..."
-msgstr "Projekt wird entfernt..."
+#: ViewWork.cpp:187 ViewWork.cpp:777
+msgid "Show active tasks"
+msgstr "Zeige aktive Aufgaben"
 
-#: clientgui/ViewProjects.cpp:548
-msgid "Launching browser..."
-msgstr "Webbrowser wird gestartet..."
+#: ViewWork.cpp:188 ViewWork.cpp:778
+msgid "Show only active tasks."
+msgstr "Zeigt nur aktive Aufgaben an."
 
-#: clientgui/ViewProjects.cpp:1063
-msgid "Requested by user"
-msgstr "Vom Benutzer angefragt"
+#: ViewWork.cpp:194 sg_TaskCommandPopup.cpp:60
+msgid "Show graphics"
+msgstr "Grafik anzeigen"
 
-#: clientgui/ViewProjects.cpp:1064
-msgid "To fetch work"
-msgstr "Um Arbeit zu holen"
+#: ViewWork.cpp:195 sg_TaskCommandPopup.cpp:61
+msgid "Show application graphics in a window."
+msgstr "Zeigt die Anwendungsgrafik der ausgewählten (markierten), aktiven Berechnung in einem Fenster."
 
-#: clientgui/ViewProjects.cpp:1065
-msgid "To report completed tasks"
-msgstr "Um fertige Aufgaben zu melden"
+#: ViewWork.cpp:201
+msgid "Show VM Console"
+msgstr "Zeige die VM Konsole"
 
-#: clientgui/ViewProjects.cpp:1066
-msgid "To send trickle-up message"
-msgstr "Um eine Zwischenmeldung zu senden"
+#: ViewWork.cpp:202
+msgid "Show VM Console in a window."
+msgstr "Zeigt die VM Konsole in einem eigenen Fenster"
 
-#: clientgui/ViewProjects.cpp:1067
-msgid "Requested by account manager"
-msgstr "Von der Kontenverwaltung angefordert"
+#: ViewWork.cpp:209
+msgid "Suspend work for this result."
+msgstr "Unterbricht die Arbeit an der ausgewählten (markierten) Berechnung."
 
-#: clientgui/ViewProjects.cpp:1068
-msgid "Project initialization"
-msgstr "Projektinitialisierung"
+#: ViewWork.cpp:215 sg_TaskCommandPopup.cpp:72
+msgid "Abort"
+msgstr "Abbrechen"
 
-#: clientgui/ViewProjects.cpp:1069
-msgid "Requested by project"
-msgstr "Vom Projekt angefordert"
+#: ViewWork.cpp:216
+msgid "Abandon work on the result. You will get no credit for it."
+msgstr "Bricht die Arbeit an der ausgewählten (markierten) Berechnung dauerhaft ab. Diese zählt dann auch nicht mehr für die Statistik. Das kann nicht rückgängig gemacht werden."
 
-#: clientgui/ViewProjects.cpp:1070
-msgid "Unknown reason"
-msgstr "Unbekannte Ursache"
+#: ViewWork.cpp:223 sg_TaskCommandPopup.cpp:79
+msgid "Show task details."
+msgstr "Zeige Aufgabendetails."
 
-#: clientgui/ViewProjects.cpp:1084
-msgid "Suspended by user"
-msgstr "Angehalten durch Benutzer"
+#: ViewWork.cpp:235
+msgid "Elapsed"
+msgstr "Vergangen"
 
-#: clientgui/ViewProjects.cpp:1087
-msgid "Won't get new tasks"
-msgstr "Erhält keine neue Aufgaben"
+#: ViewWork.cpp:236
+msgid "Remaining (estimated)"
+msgstr "Verbleibend (geschätzt)"
 
-#: clientgui/ViewProjects.cpp:1090
-msgid "Project ended - OK to remove"
-msgstr "Projekt beendet - Bereit zum entfernen"
+#: ViewWork.cpp:237
+msgid "Deadline"
+msgstr "Ablaufdatum"
 
-#: clientgui/ViewProjects.cpp:1093
-msgid "Will remove when tasks done"
-msgstr "Entfernen, sobald Aufgaben erledigt sind"
+#: ViewWork.cpp:264
+msgid "Tasks"
+msgstr "Aufgaben"
 
-#: clientgui/ViewProjects.cpp:1096
-msgid "Scheduler request pending"
-msgstr "Wartende Scheduleranfrage"
+#: ViewWork.cpp:357
+msgid "Resuming task..."
+msgstr "Aufgabe wird fortgesetzt..."
 
-#: clientgui/ViewProjects.cpp:1102
-msgid "Scheduler request in progress"
-msgstr "Laufende Scheduleranfrage"
+#: ViewWork.cpp:360
+msgid "Suspending task..."
+msgstr "Aufgabe wird angehalten..."
 
-#: clientgui/ViewProjects.cpp:1105
-msgid "Trickle up message pending"
-msgstr "Zwischenmeldung ausstehend"
+#: ViewWork.cpp:389
+msgid "Showing graphics for task..."
+msgstr "Zeigt die Grafik für Aufgabe..."
 
-#: clientgui/ViewProjects.cpp:1111
-msgid "Communication deferred "
-msgstr "Kommunikation verzögert um "
+#: ViewWork.cpp:426
+msgid "Showing VM console for task..."
+msgstr "Zeige die VM Konsole einer Aufgabe..."
 
-#: clientgui/ViewResources.cpp:62
-msgid "Total disk usage"
-msgstr "Festplattennutzung gesamt"
+#: ViewWork.cpp:479
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %s, Status: %s)"
+msgstr "Wollen Sie die Aufgabe '%s' wirklich abbrechen?\n(Fortschritt: %s, Status: %s)"
 
-#: clientgui/ViewResources.cpp:83
-msgid "Disk usage by BOINC projects"
-msgstr "Festplattennutzung durch BOINC-Projekte"
+#: ViewWork.cpp:485
+#, c-format
+msgid "Are you sure you want to abort these %d tasks?"
+msgstr "Wollen Sie diese %d Aufgaben wirklich abbrechen?"
 
-#: clientgui/ViewResources.cpp:116
-msgid "Disk"
-msgstr "Festplatte"
+#: ViewWork.cpp:490 sg_TaskCommandPopup.cpp:256
+msgid "Abort task"
+msgstr "Aufgabe abbrechen"
 
-#: clientgui/ViewResources.cpp:225
-msgid "no projects: 0 bytes used"
-msgstr "keine Projekte: 0 Bytes benutzt"
+#: ViewWork.cpp:499
+msgid "Aborting task..."
+msgstr "Aufgabe wird abgebrochen..."
 
-#: clientgui/ViewResources.cpp:262
-msgid "used by BOINC: "
-msgstr "Von BOINC belegt: "
+#: ViewWork.cpp:771
+msgid "Show all tasks"
+msgstr "Zeige alle Aufgaben"
 
-#: clientgui/ViewResources.cpp:272
-msgid "free, available to BOINC: "
-msgstr "Frei, für BOINC verfügbar: "
+#: ViewWork.cpp:772
+msgid "Show all tasks."
+msgstr "Zeige alle Aufgaben."
 
-#: clientgui/ViewResources.cpp:282
-msgid "free, not available to BOINC: "
-msgstr "Frei, nicht für BOINC verfügbar: "
+#: ViewWork.cpp:796 sg_TaskCommandPopup.cpp:103
+msgid "Resume work for this task."
+msgstr "Berechnung für diese Aufgabe wiederaufnehmen."
 
-#: clientgui/ViewResources.cpp:292
-msgid "free: "
-msgstr "Frei: "
+#: ViewWork.cpp:802 sg_TaskCommandPopup.cpp:107
+msgid "Suspend work for this task."
+msgstr "Unterbricht die Arbeit an der ausgewählten (markierte) Aufgabe."
 
-#: clientgui/ViewResources.cpp:302
-msgid "used by other programs: "
-msgstr "Anderweitig belegt: "
+#: WelcomePage.cpp:284
+msgid "Add project or account manager"
+msgstr "Ein Projekt oder Kontomanager hinzufügen."
 
-#: clientgui/ViewStatistics.cpp:1181
-msgid "User Total"
-msgstr "Benutzer Gesamt"
+#: WelcomePage.cpp:288
+msgid "Add project or use BOINC Account Manager"
+msgstr "Projekt hinzufügen oder BOINC Kontomanager benutzen"
 
-#: clientgui/ViewStatistics.cpp:1182
-msgid "User Average"
-msgstr "Benutzer Durchschnitt"
+#: 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 "Wenn möglich, fügen Sie Projekte auf der\n %s-Webseite hinzu.\n\nProjekte, die mit diesem Assistenten hinzugefügt werden, werden nicht\ngelistet von oder verwaltet mittels %s."
 
-#: clientgui/ViewStatistics.cpp:1183
-msgid "Host Total"
-msgstr "Rechner Gesamt"
+#: 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 "Es gibt über 30 BOINC-Projekte,\nin verschiedenen wissenschaftlichen\nRichtungen, wo nach belieben teilgenommen werden kann.\nMan kann sich direkt bei einem Projekt anmelden\noder eine 'Kontoverwaltung' benutzen um Projekte auszuwählen."
 
-#: clientgui/ViewStatistics.cpp:1184
-msgid "Host Average"
-msgstr "Rechner Durchschnitt"
+#: 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 "Sie haben sich dazu entschieden, ein neues Projekt für verteiltes Rechnen hinzuzufügen, oder die Einstellungen, zu welchen Projekten\nsie beitragen, zu verändern.\n\nEinige dieser Projekte werden vom World Community Grid betrieben und verwaltet, andere\nvon anderen Forschern oder Organisationen. Die BOINC-Software\nkann Ihre ungenutze Rechenleistung beliebig zwischen verschiedenen Projekten aufteilen.\n\nFalls Sie sich bei einer BOINC-Accountverwaltung registriert haben, können S [...]
 
-#: clientgui/ViewStatistics.cpp:1331
-#, c-format
-msgid "Last update: %.0f days ago"
-msgstr "Letztes Update: Vor %.0f Tagen."
+#: WelcomePage.cpp:339
+msgid "Use a BOINC Account Manager"
+msgstr "Einen BOINC Kontomanager benutzen"
 
-#: clientgui/ViewStatistics.cpp:1956
-msgid "Show user total"
-msgstr "Benutzer Gesamt"
+#: WelcomePage.cpp:352
+msgid "To continue, click Next."
+msgstr "Um fortzufahren auf [Weiter >] klicken."
 
-#: clientgui/ViewStatistics.cpp:1957
-msgid "Show total credit for user"
-msgstr "Gesamtpunktzahl des Benutzers anzeigen"
+#: WelcomePage.cpp:358
+msgid "Add or change your World Community Grid projects"
+msgstr "Hinzufügen oder ändern Ihrer World Community Grid Projekte"
 
-#: clientgui/ViewStatistics.cpp:1963
-msgid "Show user average"
-msgstr "Benutzer Durchschnitt"
+#: WelcomePage.cpp:361
+msgid "Add projects run by other researchers or organizations"
+msgstr "Projekte hinzufügen welche von anderen Wissenschaftlern oder Organisationen betrieben werden"
 
-#: clientgui/ViewStatistics.cpp:1964
-msgid "Show average credit for user"
-msgstr "Durchschnittliche Punktzahl des Benutzers anzeigen"
+#: WizardAttach.cpp:634
+msgid "Do you really want to cancel?"
+msgstr "Wollen Sie wirklich abbrechen?"
 
-#: clientgui/ViewStatistics.cpp:1970
-msgid "Show host total"
-msgstr "Rechner Gesamt"
+#: WizardAttach.cpp:635
+msgid "Question"
+msgstr "Frage"
 
-#: clientgui/ViewStatistics.cpp:1971
-msgid "Show total credit for host"
-msgstr "Gesamtpunktzahl für den Computer anzeigen"
+#: sg_BoincSimpleFrame.cpp:149
+msgid "Advanced View...\tCtrl+Shift+A"
+msgstr "Erweiterte &Ansicht...\tCtrl+Shift+A"
 
-#: clientgui/ViewStatistics.cpp:1977
-msgid "Show host average"
-msgstr "Rechner Durchschnitt"
+#: sg_BoincSimpleFrame.cpp:150
+msgid "Display the advanced graphical interface."
+msgstr "Die fortgeschrittene Grafikoberfläche anzeigen."
 
-#: clientgui/ViewStatistics.cpp:1978
-msgid "Show average credit for host"
-msgstr "Durchschnittliche Punktzahl für den Computer anzeigen"
+#: sg_BoincSimpleFrame.cpp:157
+msgid "Skin"
+msgstr "Skin"
 
-#: clientgui/ViewStatistics.cpp:1987
-msgid "< &Previous project"
-msgstr "< &Vorheriges Projekt"
+#: sg_BoincSimpleFrame.cpp:159
+msgid "Select the appearance of the user interface."
+msgstr "Wählen Sie das Aussehen der Benutzeroberfläche."
 
-#: clientgui/ViewStatistics.cpp:1988
-msgid "Show chart for previous project"
-msgstr "Zeige Grafik für das vorherige Projekt"
+#: sg_BoincSimpleFrame.cpp:206
+#, c-format
+msgid "&%s"
+msgstr "&%s"
 
-#: clientgui/ViewStatistics.cpp:1993
-msgid "&Next project >"
-msgstr "&Nächstes Projekt >"
+#: sg_BoincSimpleFrame.cpp:390
+msgid "Default"
+msgstr "Standard"
 
-#: clientgui/ViewStatistics.cpp:1994
-msgid "Show chart for next project"
-msgstr "Grafik für das nächste Projekt anzeigen"
+#: sg_BoincSimpleFrame.cpp:759
+msgid "Suspend Computing"
+msgstr "Berechnungen anhalten"
 
-#: clientgui/ViewStatistics.cpp:2000
-#: clientgui/ViewStatistics.cpp:2390
-msgid "Hide project list"
-msgstr "Projektliste ausblenden"
+#: sg_BoincSimpleFrame.cpp:760
+msgid "Resume Computing"
+msgstr "Berechnung fortsetzen"
 
-#: clientgui/ViewStatistics.cpp:2001
-#: clientgui/ViewStatistics.cpp:2390
-msgid "Use entire area for graphs"
-msgstr "Den ganzen Bereich für Grafiken nutzen"
+#: sg_BoincSimpleFrame.cpp:777
+msgid "Open a window to view notices from projects or BOINC"
+msgstr "Öffne ein Fenster um Projekt oder BOINC Nachrichten anzuzeigen"
 
-#: clientgui/ViewStatistics.cpp:2006
-msgid "Mode view"
-msgstr "Ansicht"
+#: sg_DlgMessages.cpp:146
+msgid "Close"
+msgstr "Schließen"
 
-#: clientgui/ViewStatistics.cpp:2010
-msgid "One project"
-msgstr "Ein Projekt"
+#: sg_DlgMessages.cpp:389
+#, c-format
+msgid "%s - Notices"
+msgstr "%s - Nachrichten"
 
-#: clientgui/ViewStatistics.cpp:2011
-msgid "Show one chart with selected project"
-msgstr "Eine Grafik mit dem ausgewählten Projekt anzeigen"
+#: sg_DlgPreferences.cpp:268
+msgid "This dialog controls preferences for this computer only."
+msgstr "Dieser Dialog verwaltet die Einstellungen nur für diesen Computer."
 
-#: clientgui/ViewStatistics.cpp:2017
-msgid "All projects (separate)"
-msgstr "Alle Projekte (separat)"
+#: sg_DlgPreferences.cpp:273
+msgid "Click OK to set preferences."
+msgstr "Mit OK die Einstellungen bestätigen."
 
-#: clientgui/ViewStatistics.cpp:2018
-msgid "Show all projects, one chart per project"
-msgstr "Alle Projekte anzeigen, eine Grafik je Projekt"
+#: sg_DlgPreferences.cpp:278
+msgid ""
+"Click Clear to restore web-based settings for all preferences listed below."
+msgstr "Klicken Sie auf \"Löschen\", um alle unten aufgeführten Web-Einstellungen auf die Standards zurückzustellen."
 
-#: clientgui/ViewStatistics.cpp:2024
-msgid "All projects (together)"
-msgstr "Alle Projekte (zusammen)"
+#: sg_DlgPreferences.cpp:285
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
+msgstr "Weitere Einstellungen stehen unter 'Assistenten' -> 'Einstellungen...' in der Erweiterten Ansicht."
 
-#: clientgui/ViewStatistics.cpp:2025
-msgid "Show one chart with all projects"
-msgstr "Eine Grafik mit allen Projekten anzeigen"
+#: sg_DlgPreferences.cpp:313
+msgid "Do work only between:"
+msgstr "Arbeite nur zwischen:"
 
-#: clientgui/ViewStatistics.cpp:2031
-msgid "All projects (sum)"
-msgstr "Alle Projekte (Summe)"
+#: sg_DlgPreferences.cpp:335
+msgid "Connect to internet only between:"
+msgstr "Verbinde mit dem Internet nur zwischen:"
 
-#: clientgui/ViewStatistics.cpp:2032
-msgid "Show one chart with sum of projects"
-msgstr "Eine Grafik mit allen Projekten (summiert) anzeigen"
+#: sg_DlgPreferences.cpp:357 sg_DlgPreferences.cpp:374
+msgid "Use no more than:"
+msgstr "Nutze nicht mehr als:"
 
-#: clientgui/ViewStatistics.cpp:2053
-msgid "Statistics"
-msgstr "Statistiken"
+#: sg_DlgPreferences.cpp:370
+msgid "of disk space"
+msgstr "Festplattenplatz"
 
-#: 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 "Grafiken werden aktualisiert..."
+#: sg_DlgPreferences.cpp:387
+msgid "of the processor"
+msgstr "Prozessorleistung"
 
-#: clientgui/ViewStatistics.cpp:2394
-msgid "Show project list"
-msgstr "Projektliste anzeigen"
+#: sg_DlgPreferences.cpp:391
+msgid "Do work while on battery?"
+msgstr "Arbeiten im Batteriebetrieb?"
 
-#: clientgui/ViewStatistics.cpp:2394
-msgid "Uses smaller area for graphs"
-msgstr "Kleineren Bereich für Grafiken nutzen"
+#: sg_DlgPreferences.cpp:404
+msgid "Do work after idle for:"
+msgstr "Arbeiten beginnen nach Leerlauf von:"
 
-#: clientgui/ViewTransfers.cpp:169
-msgid "Retry Now"
-msgstr "Jetzt nochmal versuchen"
+#: sg_DlgPreferences.cpp:429
+msgid "Clear all local preferences listed above and close the dialog"
+msgstr "Alle lokalen Einstellungen löschen und den Dialog schließen."
 
-#: clientgui/ViewTransfers.cpp:170
-msgid "Retry the file transfer now"
-msgstr "Den Dateitransfer jetzt erneut versuchen."
+#: 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 "Jederzeit"
 
-#: clientgui/ViewTransfers.cpp:176
-msgid "Abort Transfer"
-msgstr "Abbrechen"
+#: sg_DlgPreferences.cpp:638
+msgid "100 MB"
+msgstr "100 MB"
 
-#: clientgui/ViewTransfers.cpp:177
-msgid "Abort this file transfer.  You won't get credit for the task."
-msgstr "Diese Dateiübertragung abbrechen. Es werden keine Punkte für diese Aufgabe angerechnet."
+#: sg_DlgPreferences.cpp:639
+msgid "200 MB"
+msgstr "200 MB"
+
+#: sg_DlgPreferences.cpp:640
+msgid "500 MB"
+msgstr "500 MB"
 
-#: clientgui/ViewTransfers.cpp:188
-msgid "File"
-msgstr "Datei"
+#: sg_DlgPreferences.cpp:641
+msgid "1 GB"
+msgstr "1 GB"
 
-#: clientgui/ViewTransfers.cpp:189
-#: clientgui/ViewWork.cpp:238
-msgid "Progress"
-msgstr "Fortschritt"
+#: sg_DlgPreferences.cpp:642
+msgid "2 GB"
+msgstr "2 GB"
 
-#: clientgui/ViewTransfers.cpp:190
-msgid "Size"
-msgstr "Größe"
+#: sg_DlgPreferences.cpp:643
+msgid "5 GB"
+msgstr "5 GB"
 
-#: clientgui/ViewTransfers.cpp:191
-msgid "Elapsed Time"
-msgstr "Vergangene Zeit"
+#: sg_DlgPreferences.cpp:644
+msgid "10 GB"
+msgstr "10 GB"
 
-#: clientgui/ViewTransfers.cpp:192
-msgid "Speed"
-msgstr "Geschwindigkeit"
+#: sg_DlgPreferences.cpp:645
+msgid "20 GB"
+msgstr "20 GB"
 
-#: clientgui/ViewTransfers.cpp:218
-msgid "Transfers"
-msgstr "Übertragung"
+#: sg_DlgPreferences.cpp:646
+msgid "50 GB"
+msgstr "50 GB"
 
-#: clientgui/ViewTransfers.cpp:285
-msgid "Network activity is suspended - "
-msgstr "Netzwerkzugriff ist abgeschaltet - "
+#: sg_DlgPreferences.cpp:647
+msgid "100 GB"
+msgstr "100 GB"
 
-#: clientgui/ViewTransfers.cpp:287
-msgid ""
-".\n"
-"You can enable it using the Activity menu."
-msgstr ""
-".\n"
-"Kann über das Menü Steuerung aktiviert werden."
+#: sg_DlgPreferences.cpp:717
+#, c-format
+msgid "%d MB"
+msgstr "%d MB"
 
-#: clientgui/ViewTransfers.cpp:290
-msgid "BOINC"
-msgstr "BOINC"
+#: sg_DlgPreferences.cpp:719
+#, c-format
+msgid "%4.2f GB"
+msgstr "%4.2f GB"
 
-#: clientgui/ViewTransfers.cpp:297
-msgid "Retrying transfer now..."
-msgstr "Übertragung wird jetzt wiederholt..."
+#: sg_DlgPreferences.cpp:760
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
 
-#: clientgui/ViewTransfers.cpp:335
-msgid "Aborting transfer..."
-msgstr "Übertragung wird abgebrochen..."
+#: sg_DlgPreferences.cpp:796
+msgid "0 (Run Always)"
+msgstr "0 (Immer ausführen)"
 
-#: clientgui/ViewTransfers.cpp:348
+#: sg_DlgPreferences.cpp:799
 #, 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 ""
-"Sind Sie sicher dass Sie die Dateiübertragung \"%s\" abbrechen wollen?\n"
-"Achtung: Das Abbrechen der Übertragung macht diese ungültig\n"
-"und Sie werden keine Punkte dafür bekommen."
+msgid "%d"
+msgstr "%d"
 
-#: clientgui/ViewTransfers.cpp:354
-msgid "Abort File Transfer"
-msgstr "Dateiübertragug abbrechen"
+#: sg_DlgPreferences.cpp:1029
+msgid "Do you really want to clear all local preferences?\n"
+msgstr "Wollen Sie wirklich alle lokalen Einstellungen löschen?\n"
 
-#: clientgui/ViewTransfers.cpp:785
-msgid "Upload"
-msgstr "Hochladen"
+#: sg_ProjectPanel.cpp:72
+msgid "Add Project"
+msgstr "Projekt hinzufügen"
 
-#: clientgui/ViewTransfers.cpp:785
-msgid "Download"
-msgstr "Herunterladen"
+#: sg_ProjectPanel.cpp:73
+msgid "Synchronize"
+msgstr "Synchronisieren"
 
-#: clientgui/ViewTransfers.cpp:789
-msgid "retry in "
-msgstr "Wiederhole in "
+#: sg_ProjectPanel.cpp:74
+msgid "Work done for this project"
+msgstr "erledigte Arbeit für dieses Projekt"
 
-#: clientgui/ViewTransfers.cpp:791
-msgid "failed"
-msgstr "fehlgeschlagen"
+#: sg_ProjectPanel.cpp:77
+msgid "Synchronize projects with account manager system"
+msgstr "Synchronisiere Projekt mit der Kontoverwaltung"
 
-#: clientgui/ViewTransfers.cpp:794
-msgid "suspended"
-msgstr "angehalten"
+#: sg_ProjectPanel.cpp:124
+msgid "Select a project to access with the controls below"
+msgstr "Wähle ein Projekt für den Zugriff mit den unteren Bedienelementen aus"
 
-#: clientgui/ViewTransfers.cpp:799
-msgid "active"
-msgstr "aktiv"
+#: sg_ProjectPanel.cpp:145
+msgid "Project Web Pages"
+msgstr "Projekt -Webseite"
 
-#: clientgui/ViewTransfers.cpp:801
-msgid "pending"
-msgstr "ausstehend"
+#: sg_ProjectPanel.cpp:149
+msgid "Project Commands"
+msgstr "Projekt-Befehle"
 
-#: clientgui/ViewTransfers.cpp:808
-msgid " (project backoff: "
-msgstr " (Projektverzögerung: "
+#: sg_ProjectPanel.cpp:267
+#, c-format
+msgid "Pop up a menu of web sites for project %s"
+msgstr "Öffne Menü für die Webseiten von %s"
 
-#: clientgui/ViewWork.cpp:192
-#: clientgui/ViewWork.cpp:782
-msgid "Show active tasks"
-msgstr "Zeige aktive Aufgaben"
+#: sg_ProjectPanel.cpp:269
+#, c-format
+msgid "Pop up a menu of commands to apply to project %s"
+msgstr "Blende ein Menü mit Befehlen für Projekt %s ein"
 
-#: clientgui/ViewWork.cpp:193
-#: clientgui/ViewWork.cpp:783
-msgid "Show only active tasks."
-msgstr "Zeigt nur aktive Aufgaben an."
+#: sg_TaskCommandPopup.cpp:67
+msgid "Suspend this task."
+msgstr "Diese Aufgabe anhalten."
 
-#: clientgui/ViewWork.cpp:206
-msgid "Show VM Console"
-msgstr "Zeige die VM Konsole"
+#: sg_TaskCommandPopup.cpp:73
+msgid "Abandon this task. You will get no credit for it."
+msgstr "Diese Aufgabe abbrechen. Es werden keine Punkte angerechnet."
 
-#: clientgui/ViewWork.cpp:207
-msgid "Show VM Console in a window."
-msgstr "Zeigt die VM Konsole in einem eigenen Fenster"
+#: sg_TaskCommandPopup.cpp:251
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %.1lf%%, Status: %s)"
+msgstr "Sind Sie sicher dass Sie die Aufgabe abbrechen wollen '%s'?\n(Fortscshritt: %.1lf%%, Status: %s)"
 
-#: clientgui/ViewWork.cpp:214
-msgid "Suspend work for this result."
-msgstr "Unterbricht die Arbeit an der ausgewählten (markierten) Berechnung."
+#: sg_TaskPanel.cpp:464
+msgid "You don't have any projects.  Please Add a Project."
+msgstr "Sie haben kein Projekt eingetragen. Bitte fügen Sie ein Projekt hinzu."
 
-#: clientgui/ViewWork.cpp:221
-msgid "Abandon work on the result. You will get no credit for it."
-msgstr "Bricht die Arbeit an der ausgewählten (markierten) Berechnung dauerhaft ab. Diese zählt dann auch nicht mehr für die Statistik. Das kann nicht rückgängig gemacht werden."
+#: sg_TaskPanel.cpp:465
+msgid "Not available"
+msgstr "Nicht Verfügbar"
 
-#: clientgui/ViewWork.cpp:240
-msgid "Elapsed"
-msgstr "Vergangen"
+#: sg_TaskPanel.cpp:476
+msgid "Tasks:"
+msgstr "Aufgaben:"
 
-#: clientgui/ViewWork.cpp:241
-msgid "Remaining (estimated)"
-msgstr "Verbleibend (geschätzt)"
+#: sg_TaskPanel.cpp:482
+msgid "Select a task to access"
+msgstr "Wähle eine Aufgabe"
 
-#: clientgui/ViewWork.cpp:242
-msgid "Deadline"
-msgstr "Ablaufdatum"
+#: sg_TaskPanel.cpp:493
+msgid "From:"
+msgstr "Von:"
 
-#: clientgui/ViewWork.cpp:269
-msgid "Tasks"
-msgstr "Aufgaben"
+#: sg_TaskPanel.cpp:547
+msgid "This task's progress"
+msgstr "Fortschritt dieser Aufgabe"
 
-#: clientgui/ViewWork.cpp:362
-msgid "Resuming task..."
-msgstr "Aufgabe wird fortgesetzt..."
+#: sg_TaskPanel.cpp:565
+msgid "Task Commands"
+msgstr "Aufgabenbefehle"
 
-#: clientgui/ViewWork.cpp:365
-msgid "Suspending task..."
-msgstr "Aufgabe wird angehalten..."
+#: sg_TaskPanel.cpp:566
+msgid "Pop up a menu of commands to apply to this task"
+msgstr "Blende ein Menü ein für anwendbare Befehle für diese Aufgabe"
 
-#: clientgui/ViewWork.cpp:394
-msgid "Showing graphics for task..."
-msgstr "Zeigt die Grafik für Aufgabe..."
+#: sg_TaskPanel.cpp:701
+#, c-format
+msgid "Application: %s"
+msgstr "Anwendung: %s"
 
-#: clientgui/ViewWork.cpp:431
-msgid "Showing VM console for task..."
-msgstr "Zeige die VM Konsole einer Aufgabe..."
+#: sg_TaskPanel.cpp:724
+#, c-format
+msgid "%.3f%%"
+msgstr "%.3f%%"
+
+#: sg_TaskPanel.cpp:732
+msgid "Application: Not available"
+msgstr "Anwendung: Nicht Verfügbar"
 
-#: clientgui/ViewWork.cpp:484
+#: sg_TaskPanel.cpp:832
+msgid "Not Available"
+msgstr "Nicht Verfügbar"
+
+#: sg_TaskPanel.cpp:847
 #, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %s, Status: %s)"
-msgstr ""
-"Wollen Sie die Aufgabe '%s' wirklich abbrechen?\n"
-"(Fortschritt: %s, Status: %s)"
+msgid "Elapsed: %s"
+msgstr "Vergangen: %s"
 
-#: clientgui/ViewWork.cpp:490
+#: sg_TaskPanel.cpp:861
 #, c-format
-msgid "Are you sure you want to abort these %d tasks?"
-msgstr "Wollen Sie diese %d Aufgaben wirklich abbrechen?"
+msgid "Remaining (estimated): %s"
+msgstr "Verbleibend (geschätzt): %s"
 
-# 75%
-#: clientgui/ViewWork.cpp:504
-msgid "Aborting task..."
-msgstr "Aufgabe wird abgebrochen..."
+#: sg_TaskPanel.cpp:876
+#, c-format
+msgid "Status: %s"
+msgstr "Status: %s"
 
-#: clientgui/ViewWork.cpp:776
-msgid "Show all tasks"
-msgstr "Zeige alle Aufgaben"
+#: sg_TaskPanel.cpp:1223
+msgid "Retrieving current status."
+msgstr "Aktueller Status wird ermittelt."
 
-#: clientgui/ViewWork.cpp:777
-msgid "Show all tasks."
-msgstr "Zeige alle Aufgaben."
+#: sg_TaskPanel.cpp:1229
+msgid "Downloading work from the server."
+msgstr "Lade neue Aufgaben vom Server."
 
-#: clientgui/WelcomePage.cpp:284
-msgid "Add project or account manager"
-msgstr "Ein Projekt oder Kontomanager hinzufügen."
+#: sg_TaskPanel.cpp:1234
+msgid "Processing Suspended:  Running On Batteries."
+msgstr "Berechnungen angehalten: Batteriebetrieb."
 
-#: clientgui/WelcomePage.cpp:288
-msgid "Add project or use BOINC Account Manager"
-msgstr "Projekt hinzufügen oder BOINC Kontomanager benutzen"
+#: sg_TaskPanel.cpp:1236
+msgid "Processing Suspended:  User Active."
+msgstr "Berechnungen angehalten: Benutzer ist aktiv."
 
-#: 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 ""
-"Wenn möglich, fügen Sie Projekte auf der\n"
-" %s-Webseite hinzu.\n"
-"\n"
-"Projekte, die mit diesem Assistenten hinzugefügt werden, werden nicht\n"
-"gelistet von oder verwaltet mittels %s."
+#: sg_TaskPanel.cpp:1238
+msgid "Processing Suspended:  User paused processing."
+msgstr "Berechnungen angehalten: Angehalten durch Benutzer."
 
-#: 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 ""
-"Es gibt über 30 BOINC-Projekte,\n"
-"in verschiedenen wissenschaftlichen\n"
-"Richtungen, wo nach belieben teilgenommen werden kann.\n"
-"Man kann sich direkt bei einem Projekt anmelden\n"
-"oder eine 'Kontoverwaltung' benutzen um Projekte auszuwählen."
+#: sg_TaskPanel.cpp:1240
+msgid "Processing Suspended:  Time of Day."
+msgstr "Berechnungen angehalten: Zeitbegrenzung."
 
-#: 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 ""
-"Sie haben sich dazu entschieden, ein neues Projekt für verteiltes Rechnen hinzuzufügen, oder die Einstellungen, zu welchen Projekten\n"
-"sie beitragen, zu verändern.\n"
-"\n"
-"Einige dieser Projekte werden vom World Community Grid betrieben und verwaltet, andere\n"
-"von anderen Forschern oder Organisationen. Die BOINC-Software\n"
-"kann Ihre ungenutze Rechenleistung beliebig zwischen verschiedenen Projekten aufteilen.\n"
-"\n"
-"Falls Sie sich bei einer BOINC-Accountverwaltung registriert haben, können Sie hier außerdem\n"
-"entscheiden, welche Projekte Sie unterstützen möchten.\n"
-"\n"
-"Bitte wählen Sie die Änderungen, die Sie vornehmen möchten:\n"
+#: sg_TaskPanel.cpp:1242
+msgid "Processing Suspended:  Benchmarks Running."
+msgstr "Berechnungen angehalten: Benchmarks laufen."
 
-#: clientgui/WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
-msgstr "Einen BOINC Kontomanager benutzen"
+#: sg_TaskPanel.cpp:1244
+msgid "Processing Suspended."
+msgstr "Berechnungen angehalten."
 
-#: clientgui/WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
-msgstr "Hinzufügen oder ändern Ihrer World Community Grid Projekte"
+#: sg_TaskPanel.cpp:1248
+msgid "Waiting to contact project servers."
+msgstr "Warte auf Kontakt zum Projektserver."
 
-#: clientgui/WelcomePage.cpp:361
-msgid "Add projects run by other researchers or organizations"
-msgstr "Projekte hinzufügen welche von anderen Wissenschaftlern oder Organisationen betrieben werden"
+#: sg_TaskPanel.cpp:1252 sg_TaskPanel.cpp:1261
+msgid "Retrieving current status"
+msgstr "Ermittle den aktuellen Status."
 
-#: clientgui/WizardAttach.cpp:673
-msgid "Do you really want to cancel?"
-msgstr "Wollen Sie wirklich abbrechen?"
+#: sg_TaskPanel.cpp:1256
+msgid "No work available to process"
+msgstr "Keine Aufgaben zu bearbeiten."
 
-#: clientgui/WizardAttach.cpp:674
-msgid "Question"
-msgstr "Frage"
+#: sg_TaskPanel.cpp:1258
+msgid "Unable to connect to the core client"
+msgstr "Verbindung mit dem Basisclient nicht möglich."
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
+#: wizardex.cpp:377 wizardex.cpp:553
 msgid "&Next >"
 msgstr "&Weiter >"
 
-#: clientgui/wizardex.cpp:383
+#: wizardex.cpp:383
 msgid "< &Back"
 msgstr "< &Zurück"
 
-#: clientgui/wizardex.cpp:553
+#: wizardex.cpp:553
 msgid "&Finish"
 msgstr "&Beenden"
 
-#: clientgui/common/wxPieCtrl.cpp:64
-msgid "Pie Ctrl"
-msgstr "Diagrammsteuerung"
+#: mac/Mac_GUI.cpp:110
+msgid "Preferences…"
+msgstr "Einstellungen..."
 
-#: clientgui/mac/Mac_GUI.cpp:35
+#: mac/Mac_GUI.cpp:122
 msgid "Services"
 msgstr "Dienste"
 
-#: clientgui/mac/Mac_GUI.cpp:36
+#: mac/Mac_GUI.cpp:144
 #, c-format
 msgid "Hide %s"
 msgstr "%s ausblenden"
 
-#: clientgui/mac/Mac_GUI.cpp:37
+#: mac/Mac_GUI.cpp:158
 msgid "Hide Others"
 msgstr "Andere ausblenden"
 
-#: clientgui/mac/Mac_GUI.cpp:38
+#: mac/Mac_GUI.cpp:172
 msgid "Show All"
 msgstr "Alle einblenden"
 
-#: clientgui/mac/Mac_GUI.cpp:39
+#: mac/Mac_GUI.cpp:186
 #, c-format
 msgid "Quit %s"
 msgstr "Beende %s"
-
-#: clientgui/DlgAdvPreferences.h:30
-msgid "specify work start and stop hours in format HH:MM-HH:MM"
-msgstr "gebe Anfangs- und Endzeit für das Rechnen im Format HH:MM-HH:MM ein"
-
-#: clientgui/DlgAdvPreferences.h:31
-msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
-msgstr "gebe Anfangs- und Endzeit der Netzwerknutzung im Format HH:MM-HH:MM ein"
-
diff --git a/locale/de/BOINC-Project-Generic.po b/locale/de/BOINC-Project-Generic.po
old mode 100755
new mode 100644
index 9aa7cc8..7be83c6
--- a/locale/de/BOINC-Project-Generic.po
+++ b/locale/de/BOINC-Project-Generic.po
@@ -1,32 +1,29 @@
 # BOINC web translation
 # Copyright (C) 2008 University of California
+# 
 # This file is distributed under the same license as BOINC.
+# 
 # FileID  : $Id$
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC Project (Generic) 6.x\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: 2014-01-11 09:02+0000\n"
-"Last-Translator: Christian <djangofett at gmx.net>\n"
-"Language-Team: BOINC Development Team <boinc_loc at ssl.berkeley.edu>\n"
-"Language: de\n"
+"PO-Revision-Date: 2015-02-13 16:13+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.5.0\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-SearchPath-0: html\\user\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
-"X-POOTLE-MTIME: 1389430955.0\n"
 
-# The name of this language in this language
 msgid "LANG_NAME_NATIVE"
 msgstr "Deutsch"
 
-# The name of this language in an international language (English)
 msgid "LANG_NAME_INTERNATIONAL"
 msgstr "German"
 
@@ -65,9 +62,7 @@ msgstr "Ein Bild einfügen: [img]http://bild_url[/img]  (alt+p)"
 #: ../inc/bbcode_html.inc:35
 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)"
+msgstr "Einen Link einfügen: [url]http://linkadresse[/url] oder [url=http://linkadresse]linktext[/url]  (alt+w)"
 
 #: ../inc/bbcode_html.inc:42
 msgid "Font color"
@@ -76,9 +71,7 @@ msgstr "Schriftfarbe"
 #: ../inc/bbcode_html.inc:43
 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"
+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
 msgid "Default"
@@ -196,15 +189,11 @@ msgstr "Suche im Forum"
 msgid "Advanced search"
 msgstr "Erweiterte Suche"
 
-# ########################################
-# Private messages
 #: ../inc/forum.inc:132 ../inc/user.inc:253 ../user/pm.php:69
 #: ../user/pm.php:133
 msgid "Private messages"
 msgstr "Private Nachrichten"
 
-# ########################################
-# Links from the main page
 #: ../inc/forum.inc:151 ../user/bs_sample_index.php:63
 #: ../user/forum_forum.php:71 ../user/sample_index.php:130
 msgid "Questions and Answers"
@@ -217,8 +206,6 @@ msgstr "Fragen und Antworten"
 msgid "Message boards"
 msgstr "Diskussionsforen"
 
-# ########################################<br />
-# Forum sample index page
 #: ../inc/forum.inc:187 ../inc/forum.inc:195
 msgid "%1 message board"
 msgstr "%1 Diskussionsforen"
@@ -255,8 +242,6 @@ msgstr "Private Nachricht an %1 senden"
 msgid "Joined: %1"
 msgstr "Beigetreten: %1"
 
-# ########################################
-# Forum
 #: ../inc/forum.inc:590
 msgid "Posts: %1"
 msgstr "Beiträge: %1"
@@ -285,8 +270,6 @@ msgstr "Nachricht %1"
 msgid "hidden"
 msgstr "verborgen"
 
-# ########################################
-# Forum
 #: ../inc/forum.inc:625
 msgid "Posted: %1"
 msgstr "Geschrieben: %1"
@@ -309,11 +292,9 @@ msgstr "Zuletzt geändert: %1"
 
 #: ../inc/forum.inc:640
 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."
+"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
 msgid "Report this post as offensive"
@@ -367,8 +348,6 @@ msgstr "Beim antworten diesen Beitrag zitieren"
 msgid "Hidden by a moderator"
 msgstr "Von einem Moderator versteckt"
 
-# ########################################
-# Forum
 #: ../inc/forum.inc:729
 msgid "Posted %1 by %2"
 msgstr "Geschrieben am %1 von %2"
@@ -393,22 +372,7 @@ msgid ""
 "        <li> No abusive comments involving race, religion,\n"
 "            nationality, gender, class or sexuality.\n"
 "        "
-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"
-"        <li> Keine Beiträge die mit Absicht feindselig oder beleidigend "
-"sind.\n"
-"        <li> Keine beleidigenden Kommentare zu Alter, Ethnie, Religion,\n"
-"            Nationalität, Geschlecht, Schicht oder Sexualität.\n"
-"        "
+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
 msgid "Rules:"
@@ -466,27 +430,20 @@ msgstr "Nur Teammitglieder können Beiträge im Teamforum erstellen."
 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."
+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
 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."
+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
 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."
+msgstr "Dieses Thema ist geschlossen. Nur Moderatoren oder Administratoren dürfen hier Beiträge erstellen."
 
 #: ../inc/forum.inc:1145
 msgid "Can't post to a hidden thread."
@@ -496,8 +453,6 @@ msgstr "In einem versteckten Thema kann kein Beitrag erstellt werden."
 msgid "Thread"
 msgstr "Themen"
 
-# ########################################
-# Forum
 #: ../inc/forum.inc:1174 ../inc/team.inc:128 ../user/forum_forum.php:136
 #: ../user/forum_index.php:94
 msgid "Posts"
@@ -722,8 +677,6 @@ msgstr "mittlere Taskdauer"
 msgid "%1 days"
 msgstr "%1 Tage"
 
-# ########################################<br />
-# Apps page (apps.php)
 #: ../inc/host.inc:170
 msgid "Application details"
 msgstr "Anwendungsdetails"
@@ -745,17 +698,14 @@ msgid "Last time contacted server"
 msgstr "letztmaliger Kontakt mit Server"
 
 #: ../inc/host.inc:187
-#, php-format
 msgid "% of time BOINC is running"
 msgstr "% der Gesamtlaufzeit von BOINC"
 
 #: ../inc/host.inc:189
-#, php-format
 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:191
-#, php-format
 msgid "While BOINC running, % of time work is allowed"
 msgstr "Während BOINC läuft, sind in % der Zeit Berechnungen erlaubt"
 
@@ -852,9 +802,7 @@ msgstr "gleicher Computer"
 
 #: ../inc/host.inc:598
 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."
+msgstr "Der PC %1 kann nicht mit %2 zusammen geführt werden. Die Computer sind inkompatibel."
 
 #: ../inc/host.inc:601
 msgid "Merging host %1 into host %2"
@@ -979,9 +927,7 @@ msgstr "Nachricht konnte nicht erstellt werden."
 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."
+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
 msgid "unread"
@@ -991,8 +937,6 @@ msgstr "ungelesen"
 msgid "For email notification, %1edit community prefs%2"
 msgstr "E-Mail Benachrichtigungen in den %1Communityeinstellungen%2 einrichten."
 
-# ########################################
-# Private messages
 #: ../inc/pm.inc:198
 msgid "Private message"
 msgstr "Private Nachricht"
@@ -1001,9 +945,7 @@ msgstr "Private Nachricht"
 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"
+msgstr "Ausführung anhalten bei Batteriebetrieb? %1 (gilt nur für tragbare Computer) %2"
 
 #: ../inc/prefs.inc:85
 msgid "Suspend work while computer is in use?"
@@ -1012,9 +954,7 @@ msgstr "Ausführung anhalten wenn der Computer benutzt wird?"
 #: ../inc/prefs.inc:91
 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"
+msgstr "Ausführung auf Grafikkarte anhalten wenn der Computer benutzt wird? %1 Unterstützt ab Version 6.6.21 %2"
 
 #: ../inc/prefs.inc:99
 msgid "'In use' means mouse/keyboard activity in last"
@@ -1028,31 +968,23 @@ msgstr "Minuten"
 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"
+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: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 ""
-"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"
+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"
 
 #: ../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"
+msgstr "Erlaube Arbeit nur in der Zeit zwischen %1 Keine Einschränkung wenn gleich %2"
 
 #: ../inc/prefs.inc:130
 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"
+msgstr "Angehaltene Arbeitspakete im Speicher belassen? %1 wenn 'Ja', wird Speicher in der Auslagerungsdatei belegt %2"
 
 #: ../inc/prefs.inc:139
 msgid "Switch between tasks every %1 Recommended: 60 minutes %2"
@@ -1068,21 +1000,17 @@ msgstr "Prozessoren"
 
 #: ../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"
+msgstr "Bei mehreren Prozessoren, nutze höchstens %1 Unterstützt ab Version 6.1 %2"
 
 #: ../inc/prefs.inc:158
-#, php-format
 msgid "% of the processors"
 msgstr "% der Prozessoren"
 
 #: ../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"
+msgstr "Nutze höchstens %1 Kann benutzt werden um CPU Überhitzung zu vermeiden %2"
 
 #: ../inc/prefs.inc:167
-#, php-format
 msgid "% of CPU time"
 msgstr "% der Prozessorzeit"
 
@@ -1096,13 +1024,10 @@ msgstr "GB"
 
 #: ../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"
+msgstr "Festplatte: mindestens frei zulassen %1 Werte kleiner als %2 werden ignoriert %3"
 
 #: ../inc/prefs.inc:191 ../inc/prefs.inc:201 ../inc/prefs.inc:206
 #: ../inc/prefs.inc:211
-#, php-format
 msgid "% of total"
 msgstr "% von Gesamt"
 
@@ -1143,23 +1068,18 @@ msgstr "... und zusätzlich für weitere"
 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"
+msgstr "Bestätigen vor Verbindungsaufbau zum Internet? %1 Nur für Modem, ISDN oder VPN Verbindungen nötig. %2"
 
 #: ../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"
+msgstr "Trennen wenn Aufgabe/n erledigt? %1 Nur für Modem, ISDN oder VPN Verbindungen nötig.%2"
 
 #: ../inc/prefs.inc:249
 msgid "Maximum download rate:"
 msgstr "Maximale Downloadrate:"
 
-# kB/s ist die offizielle Schreibweise, korrekt wäre auch KiB/s siehe entsprechende Wikipediaartikel zu SI-Einheiten und Byte
 #: ../inc/prefs.inc:251 ../inc/prefs.inc:256
 msgid "Kbytes/sec"
 msgstr "kB/s"
@@ -1183,24 +1103,17 @@ msgstr "MB pro"
 #: ../inc/prefs.inc:274
 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"
+"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"
 
 #: ../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 "
+"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"
+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:298
 msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
@@ -1226,22 +1139,17 @@ msgstr "Benutze Intel GPU %1 Unterstützt ab Version 7.2 %2"
 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"
+msgstr "Testanwendungen erlauben? %1 Dies hilft uns, Anwendungen zu verbessern, kann aber zu Fehlern/Abstürzen des Computers führen %2"
 
 #: ../inc/prefs.inc:367
 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."
+"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.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?"
+msgstr "Ist es OK für %1 und Dein Team (wenn beigetreten) Dich per E-Mail zu kontaktieren?"
 
 #: ../inc/prefs.inc:380
 msgid "Should %1 show your computers on its web site?"
@@ -1262,17 +1170,13 @@ msgstr "Netzwerknutzung"
 #: ../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."
+msgstr "Diese Einstellung werden für alle BOINC-Projekte an denen Du teilnimmst verwendet."
 
 #: ../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!"
+"%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:445
 msgid "bad venue: %1"
@@ -1351,9 +1255,7 @@ msgstr "Diese gelten für alle BOINC Projekte an denen Sie teilnehmen."
 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."
+msgstr "Nimmt ein Rechner an mehreren Projekten teil, werden die neuesten Einstellungen verwendet."
 
 #: ../inc/prefs.inc:889
 msgid "These preferences do not apply to Android devices."
@@ -1383,17 +1285,13 @@ msgstr "und"
 msgid ""
 "Your profile will be made visible to other people as soon as it has been "
 "approved by the project. This may take up to a few days."
-msgstr ""
-"Dein Profil wird den anderen Benutzern veröffentlicht sobald es vom Projekt "
-"geprüft wurde. Dies dauert eventuell ein paar Tage."
+msgstr "Dein Profil wird den anderen Benutzern veröffentlicht sobald es vom Projekt geprüft wurde. Dies dauert eventuell ein paar Tage."
 
 #: ../inc/profile.inc:92
 msgid ""
 "Your profile has been marked as unacceptable. It is not visible to other "
 "people. Please change it."
-msgstr ""
-"Dein Profil wurde als unakzeptable markiert. Es ist für niemanden einsehbar. "
-"Bitte verändere es."
+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
 msgid "Database error"
@@ -1403,10 +1301,7 @@ msgstr "Datenbankfehler"
 msgid ""
 "To prevent spam, profiles of users with an average credit of less than %1 "
 "are displayed only to logged-in users. We apologize for this inconvenience."
-msgstr ""
-"Um Spam zu vermeiden, werden Profile von Benutzern mit einem "
-"Punktedurchschnitt von unter %1 nur eingeloggten Benutzern angezeigt. Wir "
-"bitten, diese Unannehmlichkeit zu entschuldigen."
+msgstr "Um Spam zu vermeiden, werden Profile von Benutzern mit einem Punktedurchschnitt von unter %1 nur eingeloggten Benutzern angezeigt. Wir bitten, diese Unannehmlichkeit zu entschuldigen."
 
 #: ../inc/profile.inc:197
 msgid "User is banished"
@@ -1721,8 +1616,6 @@ msgstr "CPU Zeit<br />(sek)"
 msgid "Credit"
 msgstr "Punkte"
 
-# ########################################<br />
-# Apps page (apps.php)
 #: ../inc/result.inc:380 ../inc/result.inc:724
 msgid "Application"
 msgstr "Anwendung"
@@ -1886,9 +1779,7 @@ msgstr "Diesem Team beitreten"
 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."
+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
 msgid "Not accepting new members"
@@ -1968,21 +1859,15 @@ msgstr "Diese Aktion benötigt die Team-Admin Berechtigung."
 
 #: ../inc/team.inc:422
 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."
+"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."
 
 #: ../inc/team.inc:428
 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."
+msgstr "%1Datenschutzhinweis%2: Wenn Sie ein Team erstellen, werden Ihre Projekteinstellungen (Ressourcenverteilung, Grafikeinstellungen) für jeden sichtbar."
 
 #: ../inc/team.inc:432
 msgid "Team name, text version"
@@ -2140,7 +2025,6 @@ msgstr "Benutzer ID"
 msgid "Used in community functions"
 msgstr "für Community Funktionen"
 
-# 91%
 #: ../inc/user.inc:216 ../user/weak_auth.php:25
 msgid "Account keys"
 msgstr "Kontoschlüssel"
@@ -2283,8 +2167,6 @@ msgstr "Anmelden"
 msgid "Log in"
 msgstr "Anmelden"
 
-# ########################################
-# Create account form (create_account_form.php)
 #: ../inc/util.inc:205 ../user/create_account_form.php:40
 msgid "Create an account"
 msgstr "Konto erstellen"
@@ -2297,9 +2179,7 @@ msgstr "Serverstatus"
 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."
+msgstr "Ein Datenbankfehler ist bei Ihrer Anfrage aufgetreten. Bitte versuchen Sie es später noch einmal."
 
 #: ../inc/util.inc:257
 msgid "Unable to handle request"
@@ -2318,11 +2198,9 @@ msgid "sec"
 msgstr "sek."
 
 #: ../inc/util.inc:444
-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."
+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"
@@ -2338,21 +2216,15 @@ msgstr "Projekt wegen Wartungsarbeiten angehalten"
 
 #: ../inc/util.inc:799
 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."
+msgstr "%1 ist momentan wegen Wartungsarbeiten nicht verfügbar. Bitte versuchen Sie es später noch einmal."
 
 #: ../inc/util.inc:817
 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."
+msgstr "Es ist momentan nicht möglich die Datenbank zu erreichen - Bitte versuchen Sie es später noch einmal."
 
 #: ../inc/util.inc:821
 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"
+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
 msgid "Stay logged in on this computer"
@@ -2364,9 +2236,7 @@ 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."
+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."
@@ -2376,8 +2246,6 @@ msgstr "Wählen Sie, falls gewünscht, das Land, das Sie vertreten möchten."
 msgid "Postal or ZIP Code"
 msgstr "Postleitzahl"
 
-# ########################################
-# General stuff (create_account_form.php and others)
 #: ../user/account_finish.php:51 ../user/create_account_form.php:104
 msgid "Optional"
 msgstr "Freiwillig"
@@ -2394,8 +2262,6 @@ msgstr "HTML-Tags im Namen sind nicht erlaubt"
 msgid "Add %1 preferences for %2"
 msgstr "%1 Einstellungen für %2 hinzufügen"
 
-# ########################################
-# Apps page (apps.php)
 #: ../user/apps.php:32 ../user/bs_sample_index.php:55
 #: ../user/sample_index.php:120
 msgid "Applications"
@@ -2407,11 +2273,7 @@ msgid ""
 "work 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, wird Ihrem Computer Arbeit für eine oder mehrere dieser Anwendungen zugewiesen. Die aktuelle Version der jeweiligen Anwendung wird automatisch auf Ihren Computer heruntergeladen."
 
 #: ../user/apps.php:50
 msgid "Platform"
@@ -2435,13 +2297,7 @@ msgid ""
 "It's similar to HTML, but simpler. The tags start with a [ (where you would\n"
 "have used %1 in HTML) and end with ] (where you would have used %2 in\n"
 "HTML)."
-msgstr ""
-"Mit BBCode tags können Sie Text in Ihrem Profil und im Nachrichtenforum "
-"formatieren.\n"
-"Das ist vergleichbar mit HTML, aber einfacher. Die tags starten mit einem [ "
-"(wo sie mit\n"
-"HTML %1 verwendet hätten) und enden mit ] (wo sie mit HTML %2 verwendet "
-"hätten)."
+msgstr "Mit BBCode tags können Sie Text in Ihrem Profil und im Nachrichtenforum formatieren.\nDas ist vergleichbar mit HTML, aber einfacher. Die tags starten mit einem [ (wo sie mit\nHTML %1 verwendet hätten) und enden mit ] (wo sie mit HTML %2 verwendet hätten)."
 
 #: ../user/bbcode.php:31
 msgid "Examples"
@@ -2501,9 +2357,7 @@ msgstr "vorformatierter Text"
 
 #: ../user/bbcode.php:42
 msgid "use to display pre-formatted (usually monospaced) text"
-msgstr ""
-"Benutzen um vorformatierten Text (gewöhnlich in monospace Schrift) "
-"anzuzeigen"
+msgstr "Benutzen um vorformatierten Text (gewöhnlich in monospace Schrift) anzuzeigen"
 
 #: ../user/bbcode.php:43
 msgid "Item 1"
@@ -2533,10 +2387,7 @@ msgstr "benutzen um auf ein SVN-Changeset auf der BOINC Webseite zu verlinken"
 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,\n"
-"dann werden die Tags anstatt des formatierten Textes angezeigt."
+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"
@@ -2546,8 +2397,6 @@ msgstr "Teilnehmer"
 msgid "Do work"
 msgstr "Etwas tun"
 
-# ########################################
-# "Your account" page (home.php)
 #: ../user/bs_sample_index.php:47 ../user/bs_sample_index.php:50
 #: ../user/home.php:49 ../project.sample/project.inc:43
 msgid "Your account"
@@ -2587,8 +2436,6 @@ msgstr "Benutzersuche"
 msgid "Statistics"
 msgstr "Statistiken"
 
-# ########################################
-# Various top table pages (top users, computers, teams)
 #: ../user/bs_sample_index.php:65 ../user/stats.php:30
 #: ../user/top_users.php:116
 msgid "Top participants"
@@ -2611,8 +2458,6 @@ msgstr "Beste Grafikkarten"
 msgid "Languages"
 msgstr "Sprachen"
 
-# ########################################
-# Rules and Policies page (info.php)
 #: ../user/bs_sample_index.php:149 ../user/info.php:24
 #: ../user/sample_index.php:79
 msgid "Read our rules and policies"
@@ -2624,15 +2469,11 @@ msgstr "Konto kann nicht erstellt werden"
 
 #: ../user/create_account_action.php:29
 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."
+msgstr "Klicken Sie den <b>Zurück</b>-Knopf ihres Browser und versuchen Sie es erneut."
 
 #: ../user/create_account_action.php:47
 msgid "Your reCAPTCHA response was not correct. Please try again."
-msgstr ""
-"Ihre Antwort im reCAPTCHA war nicht korrekt. Bitte versuchen Sie es noch "
-"einmal."
+msgstr "Ihre Antwort im reCAPTCHA war nicht korrekt. Bitte versuchen Sie es noch einmal."
 
 #: ../user/create_account_action.php:70
 msgid "You must supply an invitation code to create an account."
@@ -2644,10 +2485,9 @@ msgstr "Dieser Einladungscode ist leider ungültig."
 
 #: ../user/create_account_action.php:84
 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."
+"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
 msgid "There's already an account with that email address."
@@ -2673,18 +2513,13 @@ msgstr "Das Konto konnte nicht erstellt werden."
 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."
+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
 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."
+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"
@@ -2692,8 +2527,7 @@ 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."
+msgstr "Zum Erstellen eines Kontos ist ein gültiger Einladungscode erforderlich."
 
 #: ../user/create_account_form.php:83
 msgid "Email Address"
@@ -2733,11 +2567,9 @@ msgstr "%1 Ihr Profilbild wird links angezeigt."
 
 #: ../user/create_profile.php:66
 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."
+"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
 msgid "To remove it from your profile, check this box:"
@@ -2747,9 +2579,7 @@ msgstr "Um das Bild aus Ihrem Profil zu entfernen, das Kästchen auswählen:"
 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)"
+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
 msgid "Language"
@@ -2779,30 +2609,23 @@ msgstr "Das Format Ihres hochgeladenen Bildes wird nicht unterstützt."
 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 Gemeinschaft mitteilen."
 
 #: ../user/create_profile.php:213
 msgid "Your ReCaptcha response was not correct.  Please try again."
-msgstr ""
-"Die reCaptcha Auswertung war nicht korrekt. Bitte versuchen Sie es erneut."
+msgstr "Die reCaptcha Auswertung war nicht korrekt. Bitte versuchen Sie es erneut."
 
 #: ../user/create_profile.php:222
 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."
+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
 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."
+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
 msgid "Your profile submission was empty."
@@ -2835,12 +2658,9 @@ msgstr "Profil erstellen"
 
 #: ../user/create_profile.php:343
 msgid ""
-"To prevent spam, an average credit of %1 or greater is required to create or "
-"edit a profile.  We apologize for this inconvenience."
-msgstr ""
-"Zum Schutz vor unerwünschter Werbung ist ein Punktedurchschnitt von min. %1 "
-"erforderlich um ein Profil zu erstellen. Wir entschuldigen uns für diese "
-"Unannehmlichkeit."
+"To prevent spam, an average credit of %1 or greater is required to create or"
+" edit a profile.  We apologize for this inconvenience."
+msgstr "Zum Schutz vor unerwünschter Werbung ist ein Punktedurchschnitt von min. %1 erforderlich um ein Profil zu erstellen. Wir entschuldigen uns für diese Unannehmlichkeit."
 
 #: ../user/delete_account.php:57
 msgid "Couldn't delete account"
@@ -2865,20 +2685,13 @@ msgid ""
 "including your profile and message-board posts.\n"
 "No jobs will be issued to any computers attached\n"
 "to this account."
-msgstr ""
-"Bei der Löschung Ihres Kontos werden alle Ihre\n"
-"persönlichen Informationen von unseren Servern gelöscht,\n"
-"inklusive des Profils und Nachrichten im Forum.\n"
-"Keine Arbeit wird mehr an Computer verteilt die\n"
-"zu diesem Konto gehören."
+msgstr "Bei der Löschung Ihres Kontos werden alle Ihre\npersönlichen Informationen von unseren Servern gelöscht,\ninklusive des Profils und Nachrichten im Forum.\nKeine Arbeit wird mehr an Computer verteilt die\nzu diesem Konto gehören."
 
 #: ../user/delete_account.php:73
 msgid ""
 "This cannot be undone.\n"
 "Once your account has been deleted, you cannot get it back."
-msgstr ""
-"Dies kann nicht rückgängig gemacht werden.\n"
-"Sobald das Konto gelöscht wurde, können Sie es nicht mehr zurückbekommen."
+msgstr "Dies kann nicht rückgängig gemacht werden.\nSobald das Konto gelöscht wurde, können Sie es nicht mehr zurückbekommen."
 
 #: ../user/delete_account.php:76
 msgid "Are you sure you want to delete your account?"
@@ -2930,19 +2743,13 @@ 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.\n"
-"Sie müssen alle Daten neu eingeben,\n"
-"wenn Sie ein neues Profil möchten."
+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
 msgid ""
 "If you're sure, click 'Yes'\n"
 "to remove your profile from our database."
-msgstr ""
-"Wenn Sie absolut sicher sind Ihr Profil aus\n"
-"der Datenbank zu entfernen, dann klicken Sie 'Ja'."
+msgstr "Wenn Sie absolut sicher sind Ihr Profil aus\nder Datenbank zu entfernen, dann klicken Sie 'Ja'."
 
 #: ../user/delete_profile.php:52
 msgid "Delete my profile"
@@ -2966,10 +2773,9 @@ msgstr "Ihr Spendenvorgang wurde abgeschlossen."
 
 #: ../user/donated.php:30
 msgid ""
-"Your donation will be added to the progress bar after confirmation by PayPal."
-msgstr ""
-"Ihre Spende wird dem Fortschrittsbalken nach der Bestätigung durch PayPal "
-"hinzugefügt."
+"Your donation will be added to the progress bar after confirmation by "
+"PayPal."
+msgstr "Ihre Spende wird dem Fortschrittsbalken nach der Bestätigung durch PayPal hinzugefügt."
 
 #: ../user/donated.php:32
 msgid "You have canceled your donation."
@@ -2987,9 +2793,7 @@ msgstr "%1 Spenden"
 msgid ""
 "This project is accepting donations via\n"
 "%1."
-msgstr ""
-"Dieses Projekt akzeptiert Spenden mittels\n"
-"%1"
+msgstr "Dieses Projekt akzeptiert Spenden mittels\n%1"
 
 #: ../user/donations.php:42
 msgid ""
@@ -3004,20 +2808,7 @@ msgid ""
 "        to see the donation amount equivalent in different currencies\n"
 "        (please note that the rates are only estimates\n"
 "         and the actual amount may differ)."
-msgstr ""
-"Um zu spenden, einfach den Betrag den Sie spenden wollen in das folgende "
-"Feld eintragen.\n"
-"PayPal akzeptiert verschiedene Währungen\n"
-"(Kanadische Dollars, Euros, Pfund Sterling, U.S. Dollars.\n"
-"Yen, Australische Dollars, Neuseeland Dollars,\n"
-"Schweizer Franken, Hong Kong Dollars, Singapur Dollars, Schwedische Kronen,\n"
-"Dänische Kronen, Polnische Zloty, Norwegische Kronen,\n"
-"Ungarische Forint, Tschechische Kronen)\n"
-"Sie können den vorhandenen Währungskonverter benutzen\n"
-"um den eingegebenen Betrag in anderen Währungen angezeigt zu bekommen.\n"
-"(Bitte beachten Sie, dass es sich bei dem Wert der Währung nur um "
-"Schätzungen handelt\n"
-"und der tatsächliche Betrag sich unterscheidet)."
+msgstr "Um zu spenden, einfach den Betrag den Sie spenden wollen in das folgende Feld eintragen.\nPayPal akzeptiert verschiedene Währungen\n(Kanadische Dollars, Euros, Pfund Sterling, U.S. Dollars.\nYen, Australische Dollars, Neuseeland Dollars,\nSchweizer Franken, Hong Kong Dollars, Singapur Dollars, Schwedische Kronen,\nDänische Kronen, Polnische Zloty, Norwegische Kronen,\nUngarische Forint, Tschechische Kronen)\nSie können den vorhandenen Währungskonverter benutzen\num den eingegeben [...]
 
 #: ../user/donations.php:316
 msgid "Amount you would like to donate"
@@ -3035,10 +2826,7 @@ msgstr "Anonyme Spende"
 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 ""
-"Hier auswählen wenn Ihr Name und Projektkonto<b>nicht</b>\n"
-"in der Liste der Spender angezeigt werden soll.<br> Falls nicht ausgewählt, "
-"dann werden sie aufgenommen als Benutzer ID %1"
+msgstr "Hier auswählen wenn Ihr Name und Projektkonto<b>nicht</b>\nin der Liste der Spender angezeigt werden soll.<br> Falls nicht ausgewählt, dann werden sie aufgenommen als Benutzer ID %1"
 
 #: ../user/donations.php:324
 msgid "To assign the donation with your user ID, please log in."
@@ -3063,28 +2851,18 @@ msgstr "Sie können Anwendungen aus verschiedenen Kategorien herunterladen."
 #: ../user/download_network.php:31
 msgid ""
 "These applications are not endorsed by %1 and you use them at your own risk."
-msgstr ""
-"Diese Anwendungen sind nicht von %1 unterstützt und die Benutzung erfolgt "
-"auf eigene Gefahr."
+msgstr "Diese Anwendungen sind nicht von %1 unterstützt und die Benutzung erfolgt auf eigene Gefahr."
 
 #: ../user/download_network.php:33
 msgid ""
 "We do not provide instructions for installing these applications.\n"
-"However, the author may have provided some help on installing or "
-"uninstalling the application. \n"
+"However, the author may have provided some help on installing or uninstalling the application. \n"
 "If this is not enough you should contact the author."
-msgstr ""
-"Wir stellen keine Anleitungen zur Installation der Anwendungen bereit.\n"
-"Möglicherweise hat der Autor einiges an Hilfe über Installation oder "
-"Deinstallation der Anwendung bereitgestellt.\n"
-"Falls das nicht ausreicht sollten Sie den Autor/Herausgeber direkt "
-"kontaktieren."
+msgstr "Wir stellen keine Anleitungen zur Installation der Anwendungen bereit.\nMöglicherweise hat der Autor einiges an Hilfe über Installation oder Deinstallation der Anwendung bereitgestellt.\nFalls das nicht ausreicht sollten Sie den Autor/Herausgeber direkt kontaktieren."
 
 #: ../user/download_network.php:36
 msgid "Instructions for installing and running BOINC are %1here%2."
-msgstr ""
-"Anweisungen und Hilfe zur %1Installation und Nutzung von BOINC%2 sind "
-"ebenfalls erhältlich."
+msgstr "Anweisungen und Hilfe zur %1Installation und Nutzung von BOINC%2 sind ebenfalls erhältlich."
 
 #: ../user/download_network.php:38
 msgid "This list is managed centrally at %1the BOINC website%2."
@@ -3100,9 +2878,7 @@ msgstr "Die neue E-Mail-Adresse '%1', ist ungültig."
 
 #: ../user/edit_email_action.php:38
 msgid "New email address is same as existing address. Nothing is changed."
-msgstr ""
-"Die neue E-Mail-Adresse ist die gleiche wie die im Moment genutzte. Nichts "
-"wurde verändert."
+msgstr "Die neue E-Mail-Adresse ist die gleiche wie die im Moment genutzte. Nichts wurde verändert."
 
 #: ../user/edit_email_action.php:42
 msgid "There's already an account with that email address"
@@ -3124,9 +2900,7 @@ msgstr "Bitte %1bestätigen Sie diese E-Mail-Adresse%2."
 msgid ""
 "We can't update your email address due to a database problem.  Please try "
 "again later."
-msgstr ""
-"Wir konnten Ihre E-Mail-Adresse,wegen einem Problem mit der Datenbank, nicht "
-"aktualisieren. Bitte versuchen Sie es später noch einmal."
+msgstr "Wir konnten Ihre E-Mail-Adresse,wegen einem Problem mit der Datenbank, nicht aktualisieren. Bitte versuchen Sie es später noch einmal."
 
 #: ../user/edit_email_form.php:27 ../user/edit_email_form.php:51
 msgid "Change email address"
@@ -3156,10 +2930,7 @@ msgstr "Zurücksetzen bestätigen"
 msgid ""
 "This action will erase any changes you have made in your community "
 "preferences. To cancel, click your browser's Back button."
-msgstr ""
-"Diese Aktion wird alle Änderungen die Sie in Ihren Community-Einstellungen "
-"gemacht haben löschen. Zum Abbrechen, den 'Zurück'-Schalter Ihres Browsers "
-"klicken."
+msgstr "Diese Aktion wird alle Änderungen die Sie in Ihren Community-Einstellungen gemacht haben löschen. Zum Abbrechen, den 'Zurück'-Schalter Ihres Browsers klicken."
 
 #: ../user/edit_forum_preferences_action.php:38
 msgid "Reset preferences"
@@ -3167,9 +2938,7 @@ msgstr "Einstellungen zurücksetzen"
 
 #: ../user/edit_forum_preferences_action.php:88
 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."
+msgstr "Fehler: Nicht der richtige Dateityp, nur Formate PNG und JPEG sind unterstützt."
 
 #: ../user/edit_forum_preferences_action.php:114
 msgid "Your signature was too long, please keep it less than 250 characters."
@@ -3184,9 +2953,7 @@ msgstr "Kein solcher Benutzer: %1"
 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?"
+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
 msgid "On my Account page (no email)"
@@ -3245,10 +3012,7 @@ 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."
+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"
@@ -3306,8 +3070,6 @@ msgstr "sortieren nach"
 msgid "Threads:"
 msgstr "Themen:"
 
-# ########################################
-# Forum
 #: ../user/edit_forum_preferences_form.php:140
 msgid "Posts:"
 msgstr "Beiträge:"
@@ -3330,9 +3092,7 @@ msgstr "Gefilterte Benutzer"
 
 #: ../user/edit_forum_preferences_form.php:165
 msgid "Ignore message board posts and private messages from these users."
-msgstr ""
-"Ignoriere Beiträge in Diskussionsforen und Private Nachrichten von diesen "
-"Benutzern."
+msgstr "Ignoriere Beiträge in Diskussionsforen und Private Nachrichten von diesen Benutzern."
 
 #: ../user/edit_forum_preferences_form.php:167
 msgid "User ID (For instance: 123456789)"
@@ -3380,9 +3140,7 @@ msgstr "Ihr Passwort wurde geändert"
 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."
+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"
@@ -3457,18 +3215,13 @@ msgid ""
 "A tasks's <b>server state</b> indicates whether the task has been sent to a "
 "computer, and if so whether the computer has finished it. Possible values "
 "are:"
-msgstr ""
-"Der <b>Serverzustand</b> einer Aufgabe zeigt an ob die Aufgabe zu einem "
-"Computer verschickt wurde, und wenn das so ist ob der Computer sie beendet "
-"hat. Mögliche Werte sind:"
+msgstr "Der <b>Serverzustand</b> einer Aufgabe zeigt an ob die Aufgabe zu einem Computer verschickt wurde, und wenn das so ist ob der Computer sie beendet hat. Mögliche Werte sind:"
 
 #: ../user/explain_state.php:35
 msgid ""
 "The task is not ready to send (for example, because its input files are "
 "unavailable)"
-msgstr ""
-"Die Aufgabe ist nicht fertig zum versenden (zum Beispiel, weil ihre "
-"Eingabedateien nicht verfügbar sind)"
+msgstr "Die Aufgabe ist nicht fertig zum versenden (zum Beispiel, weil ihre Eingabedateien nicht verfügbar sind)"
 
 #: ../user/explain_state.php:38
 msgid "The task is ready to send, but hasn't been sent yet."
@@ -3486,9 +3239,7 @@ msgstr "Die Aufgabe wurde verschickt; warte auf Fertigstellung."
 msgid ""
 "The task has been sent to a computer and either it has timed out or the "
 "computer has reported its completion."
-msgstr ""
-"Die Aufgabe wurde an einen Computer verschickt und entweder ist die "
-"Abgabefrist abgelaufen oder der Computer hat sie als fertig gemeldet."
+msgstr "Die Aufgabe wurde an einen Computer verschickt und entweder ist die Abgabefrist abgelaufen oder der Computer hat sie als fertig gemeldet."
 
 #: ../user/explain_state.php:49
 msgid "Outcomes"
@@ -3498,17 +3249,13 @@ msgstr "Resultate"
 msgid ""
 "A tasks's <b>outcome</b> is defined if its server state is <b>over</b>. "
 "Possible values are:"
-msgstr ""
-"Das <b>Resultat</b> einer Aufgabe ist definiert wenn ihr Serverzustand "
-"<b>beendet</b> ist. Mögliche Werte sind:"
+msgstr "Das <b>Resultat</b> einer Aufgabe ist definiert wenn ihr Serverzustand <b>beendet</b> ist. Mögliche Werte sind:"
 
 #: ../user/explain_state.php:57
 msgid ""
 "The task was sent to a computer, but the computer has not yet completed the "
 "work and reported the outcome."
-msgstr ""
-"Die Aufgabe wurde zu einem Computer geschickt, aber der Computer hat die "
-"Arbeit noch nicht beendet und die Ergebnisse gemeldet."
+msgstr "Die Aufgabe wurde zu einem Computer geschickt, aber der Computer hat die Arbeit noch nicht beendet und die Ergebnisse gemeldet."
 
 #: ../user/explain_state.php:60
 msgid "A computer completed and reported the task successfully."
@@ -3518,9 +3265,7 @@ msgstr "Ein Computer beendete und meldete die Aufgabe erfolgreich zurück."
 msgid ""
 "The server wasn't able to send the task to a computer (perhaps because its "
 "resource requirements were too large)"
-msgstr ""
-"Der Server war nicht in der Lage die Aufgabe zu einem Computer zu schicken "
-"(evtl. weil ihre Systemanforderungen zu groß waren)"
+msgstr "Der Server war nicht in der Lage die Aufgabe zu einem Computer zu schicken (evtl. weil ihre Systemanforderungen zu groß waren)"
 
 #: ../user/explain_state.php:65
 msgid "Client error"
@@ -3528,33 +3273,25 @@ msgstr "Clientfehler"
 
 #: ../user/explain_state.php:66
 msgid "The task was sent to a computer and an error occurred."
-msgstr ""
-"Die Aufgabe wurde zu einem Computer geschickt und ein Fehler ist "
-"aufgetreten."
+msgstr "Die Aufgabe wurde zu einem Computer geschickt und ein Fehler ist aufgetreten."
 
 #: ../user/explain_state.php:69
 msgid ""
 "The task was sent to a computer and no reply was received within the time "
 "limit."
-msgstr ""
-"Die Aufgabe wurde zu einem Computer geschickt und keine Antwort wurde "
-"innerhalb der Zeitbegrenzung empfangen."
+msgstr "Die Aufgabe wurde zu einem Computer geschickt und keine Antwort wurde innerhalb der Zeitbegrenzung empfangen."
 
 #: ../user/explain_state.php:72
 msgid ""
-"The task wasn't sent to a computer because enough other tasks were completed "
-"for this workunit."
-msgstr ""
-"Die Aufgabe wurde nicht an einen Computer geschickt weil bereits genug "
-"andere Aufgaben für dieses Arbeitspaket fertig sind."
+"The task wasn't sent to a computer because enough other tasks were completed"
+" for this workunit."
+msgstr "Die Aufgabe wurde nicht an einen Computer geschickt weil bereits genug andere Aufgaben für dieses Arbeitspaket fertig sind."
 
 #: ../user/explain_state.php:75
 msgid ""
 "The task was reported but could not be validated, typically because the "
 "output files were lost on the server."
-msgstr ""
-"Die Aufgabe wurde gemeldet aber konnte nicht validiert werden, typisch wenn "
-"die Ausgabedateien auf dem Server weg sind."
+msgstr "Die Aufgabe wurde gemeldet aber konnte nicht validiert werden, typisch wenn die Ausgabedateien auf dem Server weg sind."
 
 #: ../user/explain_state.php:80
 msgid "Client states"
@@ -3562,11 +3299,9 @@ msgstr "Clientzustand"
 
 #: ../user/explain_state.php:81
 msgid ""
-"A result's <b>client state</b> indicates the stage of processing at which an "
-"error occurred."
-msgstr ""
-"Der <b>Clientzustand</b> eines Ergebnisses zeigt die Phase der Verarbeitung "
-"an, in der ein Fehler aufgetreten ist."
+"A result's <b>client state</b> indicates the stage of processing at which an"
+" error occurred."
+msgstr "Der <b>Clientzustand</b> eines Ergebnisses zeigt die Phase der Verarbeitung an, in der ein Fehler aufgetreten ist."
 
 #: ../user/explain_state.php:86
 msgid "The computer has not yet completed the task."
@@ -3578,9 +3313,7 @@ msgstr "Der Computer hat die Aufgabe erfolgreich fertiggestellt."
 
 #: ../user/explain_state.php:92
 msgid "The computer couldn't download the application or input files."
-msgstr ""
-"Der Computer konnte die Anwendung oder die Eingabedateien nicht "
-"herunterladen."
+msgstr "Der Computer konnte die Anwendung oder die Eingabedateien nicht herunterladen."
 
 #: ../user/explain_state.php:95
 msgid "An error occurred during computation."
@@ -3598,9 +3331,7 @@ msgstr "Zeitpunkt der Einreichung und Abgabefrist"
 msgid ""
 "A task's <b>Time reported or deadline</b> field depends on whether the task "
 "has been reported yet:"
-msgstr ""
-"Die Spalte <b>Zeitpunkt der Einreichung und Abgabefrist</b> hängt davon ab, "
-"ob die Aufgabe schon gemeldet wurde:"
+msgstr "Die Spalte <b>Zeitpunkt der Einreichung und Abgabefrist</b> hängt davon ab, ob die Aufgabe schon gemeldet wurde:"
 
 #: ../user/explain_state.php:110
 msgid "Already reported"
@@ -3644,9 +3375,7 @@ msgstr "E-Mail senden"
 
 #: ../user/ffmail_action.php:59
 msgid "Use your browser's back button to return to message form"
-msgstr ""
-"Benutzen Sie den Zurückschalter Ihres Browsers um auf das "
-"Nachrichtenformular zurück zu kehren"
+msgstr "Benutzen Sie den Zurückschalter Ihres Browsers um auf das Nachrichtenformular zurück zu kehren"
 
 #: ../user/ffmail_action.php:63
 msgid "Sending emails"
@@ -3666,20 +3395,15 @@ msgstr "Danke dass Sie ihren Freunden über %1 berichtet haben"
 
 #: ../user/ffmail_action.php:94
 msgid ""
-"You forgot to enter your friends' names and/or email addresses; Please %"
-"1return to the form%2 and enter them."
-msgstr ""
-"Sie haben die Namen und/oder E-Mail-Adressen ihrer Freunde vergessen "
-"einzutragen; Bitte %1gehen Sie zu dem Formular zurück%2 und geben Sie sie "
-"ein."
+"You forgot to enter your friends' names and/or email addresses; Please "
+"%1return to the form%2 and enter them."
+msgstr "Sie haben die Namen und/oder E-Mail-Adressen ihrer Freunde vergessen einzutragen; Bitte %1gehen Sie zu dem Formular zurück%2 und geben Sie sie ein."
 
 #: ../user/ffmail_form.php:30
 msgid ""
 "This project hasn't created an email message - please notify its "
 "administrators"
-msgstr ""
-"Das Projekt konnte keine E-Mail versenden - bitte informieren Sie die "
-"Administratoren"
+msgstr "Das Projekt konnte keine E-Mail versenden - bitte informieren Sie die Administratoren"
 
 #: ../user/ffmail_form.php:33
 msgid "Tell your friends about %1"
@@ -3687,19 +3411,14 @@ msgstr "Erzählen Sie ihren Freunden von %1"
 
 #: ../user/ffmail_form.php:37
 msgid "Help us by telling your friends, family and coworkers about %1"
-msgstr ""
-"Helfen Sie uns indem Sie Freunden, Familie und Mitarbeitern von %1 erzählen"
+msgstr "Helfen Sie uns indem Sie Freunden, Familie und Mitarbeitern von %1 erzählen"
 
 #: ../user/ffmail_form.php:39
 msgid ""
 "Fill in this form with the names and email addresses of people you think "
 "might be interested in %1. We'll send them an email in your name, and you "
 "can add your own message if you like."
-msgstr ""
-"Füllen Sie dieses Formular mit Namen und E-Mail-Adressen von Leuten aus von "
-"denen Sie denken sie währen an %1 interessiert. Wir werden ihnen in Ihrem "
-"Namen eine E-Mail schicken und Sie können wenn Sie mögen ihre eigene "
-"Nachricht hinzufügen ."
+msgstr "Füllen Sie dieses Formular mit Namen und E-Mail-Adressen von Leuten aus von denen Sie denken sie währen an %1 interessiert. Wir werden ihnen in Ihrem Namen eine E-Mail schicken und Sie können wenn Sie mögen ihre eigene Nachricht hinzufügen ."
 
 #: ../user/ffmail_form.php:42
 msgid "Your name:"
@@ -3747,18 +3466,13 @@ 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."
+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
 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."
+"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
 msgid "Category"
@@ -3810,9 +3524,7 @@ msgstr "Sie müssen eine Aktion bestimmen...."
 msgid ""
 "You can no longer edit this post.<br/>Posts can only be edited at most %1 "
 "minutes after they have been created."
-msgstr ""
-"Sie können diesen Beitrag nicht länger bearbeiten.<br/>Beiträge können nur "
-"bis zu %1 Minuten nachdem sie erstellt wurden bearbeitet werden."
+msgstr "Sie können diesen Beitrag nicht länger bearbeiten.<br/>Beiträge können nur bis zu %1 Minuten nachdem sie erstellt wurden bearbeitet werden."
 
 #: ../user/forum_edit.php:47
 msgid "You are not authorized to edit this post."
@@ -3856,16 +3568,13 @@ msgstr "Ein neues Thema in diesem Forum erstellen"
 msgid "This message board is available as an %1RSS feed%2"
 msgstr "Dieses Diskussionsforum ist auch als %1RSS feed%2 verfügbar"
 
-# ########################################<br />
-# Forum thread
 #: ../user/forum_forum.php:174
 msgid "This thread is hidden"
 msgstr "Dieses Thema ist versteckt"
 
 #: ../user/forum_forum.php:178
 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"
+msgstr "Dieses Thema ist angepinnt und gesperrt und Sie haben es noch nicht gelesen"
 
 #: ../user/forum_forum.php:178
 msgid "sticky/locked/unread"
@@ -3923,19 +3632,15 @@ msgstr "Sie haben dieses Thema gelesen"
 msgid "read"
 msgstr "gelesen"
 
-# ########################################
-# Links from the main page
 #: ../user/forum_help_desk.php:27
 msgid "Questions and answers"
 msgstr "Fragen und Antworten"
 
 #: ../user/forum_help_desk.php:30
 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."
+"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
 msgid "Topic"
@@ -3949,8 +3654,6 @@ msgstr "Fragen"
 msgid "Discussion among members of %1"
 msgstr "Diskussionen der Mitglieder von %1"
 
-# ########################################
-# Forum sample index page
 #: ../user/forum_index.php:69
 msgid "%1 Message boards"
 msgstr "%1 Diskussionsforen"
@@ -3959,9 +3662,7 @@ msgstr "%1 Diskussionsforen"
 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."
+msgstr "Wenn Sie eine Frage oder ein Problem haben, benutzen Sie bitte die %1Fragen & Antworten%2 Rubrik der Diskussionsforen."
 
 #: ../user/forum_index.php:123
 msgid "Subscribed threads"
@@ -4025,8 +3726,7 @@ 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"
+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
@@ -4075,10 +3775,7 @@ msgstr "Moderiere Thema '%1'"
 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."
+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
 msgid "Current forum"
@@ -4096,18 +3793,13 @@ msgstr "Neuer Titel:"
 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."
+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
 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."
+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
 msgid "Create new thread"
@@ -4127,9 +3819,7 @@ msgstr "Dieses Element als eine Nachricht im BOINC Manager anzeigen"
 
 #: ../user/forum_post.php:127
 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."
+msgstr "Machen Sie das nur für Elemente die von Interesse für die Benutzer sein könnten."
 
 #: ../user/forum_rate.php:26
 msgid "Rating offline"
@@ -4141,9 +3831,7 @@ msgstr "Diese Funktion ist zur Zeit vom Projekt abgeschaltet."
 
 #: ../user/forum_rate.php:58
 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."
+msgstr "Sie brauchen eine höhere durchschnittliche Punktzahl oder Gesamtpunktzahl um einen Beitrag zu bewerten."
 
 #: ../user/forum_rate.php:62
 msgid "You have already rated this post."
@@ -4180,10 +3868,7 @@ msgstr "Problem bei der Abstimmung (Übermittlungsfehler)"
 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."
+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
@@ -4208,15 +3893,12 @@ msgstr "Füge dieser Antwort meine Signatur hinzu"
 
 #: ../user/forum_report_post.php:45
 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."
+msgstr "Sie brauchen eine höhere durchschnittliche Punktzahl oder Gesamtpunktzahl um einen Beitrag zu melden."
 
 #: ../user/forum_report_post.php:65
 msgid "Report Registered"
 msgstr "Bericht registriert"
 
-# 92%
 #: ../user/forum_report_post.php:66
 msgid "Your report has been recorded. Thanks for your input."
 msgstr "Ihre Meldung wurde gespeichert. Danke für ihren Beitrag."
@@ -4225,9 +3907,7 @@ msgstr "Ihre Meldung wurde gespeichert. Danke für ihren Beitrag."
 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"
+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
 msgid "Report a forum post"
@@ -4235,14 +3915,10 @@ msgstr "Forenbeitrag melden"
 
 #: ../user/forum_report_post.php:73
 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 "
+"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."
+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
 msgid "Report post"
@@ -4250,13 +3926,9 @@ msgstr "Beitrag melden"
 
 #: ../user/forum_report_post.php:81
 msgid ""
-"Why do you find the post offensive: %1Please include enough information so "
-"that a person that\n"
+"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\n"
-"die das Thema noch nicht gelesen hat schnell das Problem erkennen kann.%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
 msgid "Report not registered"
@@ -4264,16 +3936,13 @@ msgstr "Meldung nicht registriert"
 
 #: ../user/forum_report_post.php:91
 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."
+msgstr "Ihre Meldung konnte nicht aufgezeichnet werden. Bitte warten Sie eine Weile und versuchen Sie es erneut."
 
 #: ../user/forum_report_post.php:92
 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."
+"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
 msgid "%1 RSS feed"
@@ -4283,8 +3952,6 @@ msgstr "%1 RSS feed"
 msgid "This message board is available as an RSS feed."
 msgstr "Dieses Diskussionsforum ist auch als RSS-Feed verfügbar."
 
-# ########################################
-# General stuff (create_account_form.php and others)
 #: ../user/forum_rss.php:43
 msgid "Options:"
 msgstr "Optionen:"
@@ -4299,16 +3966,12 @@ 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)"
+msgstr "Beiträge kürzen: %1 (Beinhaltet nur die ersten 265 Zeichen von jedem Beitrag)"
 
 #: ../user/forum_rss.php:53
 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)"
 
-# ########################################
-# Forum search features
 #: ../user/forum_search.php:27
 msgid "Forum search"
 msgstr "Forum durchsuchen"
@@ -4389,10 +4052,7 @@ msgstr "Nachrichten die Ihrer Anfrage entsprechen:"
 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)."
+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
 msgid "You can also %1try the same search on Google.%2"
@@ -4410,9 +4070,7 @@ msgstr "Abonnement erfolgreich"
 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."
+msgstr "Sie sind nun Abonnent von %1. Sie werden benachrichtigt sobald ein neuer Beitrag existiert."
 
 #: ../user/forum_subscribe.php:51
 msgid "Subscription failed"
@@ -4421,9 +4079,7 @@ msgstr "Abonnement fehlgeschlagen"
 #: ../user/forum_subscribe.php:52
 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."
+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
 msgid "Unsubscription successful"
@@ -4431,11 +4087,9 @@ msgstr "Abmeldung vom Abonnement erfolgreich"
 
 #: ../user/forum_subscribe.php:64
 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."
+"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
 msgid "Unsubscription failed"
@@ -4444,9 +4098,7 @@ msgstr "Abmeldung (Abonnement) fehlgeschlagen"
 #: ../user/forum_subscribe.php:67
 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."
+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
 msgid "Unknown subscription action"
@@ -4456,8 +4108,6 @@ msgstr "Unbekannte Abonnement Aktion"
 msgid "This forum is not visible to you."
 msgstr "Dieses Forum ist für Sie nicht sichtbar."
 
-# ########################################<br />
-# Forum thread
 #: ../user/forum_thread.php:69
 msgid "This thread has been hidden by moderators."
 msgstr "Dieses Thema wurde von Moderatoren versteckt."
@@ -4492,9 +4142,7 @@ msgstr "Abonnieren"
 
 #: ../user/forum_thread.php:179
 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."
+msgstr "Anklicken um benachrichtigt zu werden, wenn neue Beiträge geschrieben wurden."
 
 #: ../user/forum_thread.php:190
 msgid "Unhide this thread"
@@ -4572,8 +4220,6 @@ msgstr "Themenstatus aktualisiert"
 msgid "The status has been updated."
 msgstr "Der Status wurde aktualisiert."
 
-# ########################################
-# Forum
 #: ../user/forum_user_posts.php:73
 msgid "Posts by %1"
 msgstr "Beiträge von %1"
@@ -4604,11 +4250,9 @@ msgstr "als Freund hinzufügen"
 
 #: ../user/friend.php:74
 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."
+"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
 msgid "Add an optional message here:"
@@ -4712,71 +4356,56 @@ msgstr "Kontoinformationen vergessen?"
 
 #: ../user/get_passwd.php:28
 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:"
+"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
 msgid ""
 "Enter the email address below, and click OK. You will be sent email "
 "instructions for resetting your password."
-msgstr ""
-"Bitte die E-Mail-Adresse eingeben und bestätigen. Eine E-Mail mit "
-"Anweisungen zum zurücksetzen Ihres Passwortes wird in kürze verschickt."
+msgstr "Bitte die E-Mail-Adresse eingeben und bestätigen. Eine E-Mail mit Anweisungen zum zurücksetzen Ihres Passwortes wird in kürze verschickt."
 
 #: ../user/get_passwd.php:46
 msgid ""
 "2) If you forgot your account's email address, or you can't receive email "
 "there:"
-msgstr ""
-"2) Wenn Sie die E-Mail-Adresse Ihres Kontos vergessen haben oder die E-Mails "
-"nicht mehr abrufen können:"
+msgstr "2) Wenn Sie die E-Mail-Adresse Ihres Kontos vergessen haben oder die E-Mails nicht mehr abrufen können:"
 
 #: ../user/get_passwd.php:47
 msgid ""
 "If you have run BOINC under this account, you can still access it. Here's "
 "how:"
-msgstr ""
-"Wenn Sie BOINC mit diesem Konto eingesetzt haben gibt es einen weiteren Weg "
-"sich anzumelden:"
+msgstr "Wenn Sie BOINC mit diesem Konto eingesetzt haben gibt es einen weiteren Weg sich anzumelden:"
 
 #: ../user/get_passwd.php:50
 msgid ""
 "Go to the BOINC data directory on your computer (its location is written to "
 "the Event Log at startup)."
-msgstr ""
-"Navigieren Sie in das BOINC Datenverzeichnis auf Ihrem Computer (das "
-"Verzeichnis findet sich im Meldungsfenster nach dem Start)."
+msgstr "Navigieren Sie in das BOINC Datenverzeichnis auf Ihrem Computer (das Verzeichnis findet sich im Meldungsfenster nach dem Start)."
 
 #: ../user/get_passwd.php:51
 msgid "Find your account file for this project; it will be named <b>%1</b>."
-msgstr ""
-"Finden Sie Ihre Kontodatei des Projektes, der Dateiname lautet: <b>%1</b>."
+msgstr "Finden Sie Ihre Kontodatei des Projektes, der Dateiname lautet: <b>%1</b>."
 
 #: ../user/get_passwd.php:52
 msgid "Open the file in a text editor like Notepad. You'll see something like"
-msgstr ""
-"Öffnen Sie die Datei mit einem Texteditor (z.B. Editor oder WordPad). Sie "
-"sehen ungefähr folgendes:"
+msgstr "Öffnen Sie die Datei mit einem Texteditor (z.B. Editor oder WordPad). Sie sehen ungefähr folgendes:"
 
 #: ../user/get_passwd.php:62
-msgid "Select and Copy the string between %1 and %2 (%3 in the above example)."
-msgstr ""
-"Kopieren Sie die Zeichenfolge zwischen %1 und %2 (%3 im obigen Beispiel)."
+msgid ""
+"Select and Copy the string between %1 and %2 (%3 in the above example)."
+msgstr "Kopieren Sie die Zeichenfolge zwischen %1 und %2 (%3 im obigen Beispiel)."
 
 #: ../user/get_passwd.php:64
 msgid "Paste the string into the field below, and click OK."
-msgstr ""
-"Fügen Sie die Zeichenfolge in das untere Feld ein und bestätigen mit OK."
+msgstr "Fügen Sie die Zeichenfolge in das untere Feld ein und bestätigen mit OK."
 
 #: ../user/get_passwd.php:65
 msgid ""
 "You will now be logged in to your account; update the email and password of "
 "your account."
-msgstr ""
-"Sie werden jetzt mit Ihrem Konto angemeldet, bitte aktualisieren Sie als "
-"erstes Ihre E-Mail-Adresse und Ihr Passwort."
+msgstr "Sie werden jetzt mit Ihrem Konto angemeldet, bitte aktualisieren Sie als erstes Ihre E-Mail-Adresse und Ihr Passwort."
 
 #: ../user/get_passwd.php:71
 msgid "Log in with authenticator"
@@ -4790,9 +4419,7 @@ msgstr "Es sind noch keine GPU Aufgaben zurückgemeldet."
 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."
+msgstr "Die produktivsten Grafikkarten für die verschiedenen Plattformen zeigt diese Liste. Die relative Geschwindigkeit ist in Klammern angegeben."
 
 #: ../user/home.php:42
 msgid "Welcome to %1"
@@ -4800,15 +4427,11 @@ msgstr "Willkommen bei %1"
 
 #: ../user/home.php:43
 msgid "View and edit your account preferences using the links below."
-msgstr ""
-"Die Kontoeinstellungen können Sie mit den folgenden Links anzeigen und "
-"bearbeiten."
+msgstr "Die Kontoeinstellungen können Sie mit den folgenden Links anzeigen und bearbeiten."
 
 #: ../user/home.php:46
 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."
+msgstr "Laden Sie die %1BOINC-Clientsoftware%2 herunter, wenn Sie das nicht bereits getan haben."
 
 #: ../user/host_app_versions.php:37
 msgid "Anonymous platform, missing app"
@@ -4850,8 +4473,6 @@ msgstr "Aufeinander-folgende, gültige Aufgaben"
 msgid "Average processing rate"
 msgstr "mittlere Berechnungsgeschwindigkeit"
 
-# ########################################<br />
-# Apps page (apps.php)
 #: ../user/host_app_versions.php:72
 msgid "Application details for host %1"
 msgstr "Anwendungsdetails für Rechner %1"
@@ -4865,10 +4486,7 @@ msgid ""
 "You can not delete our record of this computer because our database still "
 "contains work for it. You must wait a few days until the work for this "
 "computer has been deleted from the project database."
-msgstr ""
-"Sie können den Eintrag für diesen Computer nicht löschen, da  für ihn noch "
-"Arbeitspakete in der Datenbank existieren. Bitte warten Sie einige Tage bis "
-"die Einträge vom Projekt gelöscht werden."
+msgstr "Sie können den Eintrag für diesen Computer nicht löschen, da  für ihn noch Arbeitspakete in der Datenbank existieren. Bitte warten Sie einige Tage bis die Einträge vom Projekt gelöscht werden."
 
 #: ../user/host_delete.php:40
 msgid "Delete record of computer"
@@ -4892,12 +4510,9 @@ msgstr "Computer zusammenführen"
 
 #: ../user/host_edit_form.php:38
 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 ""
-"Es kann vorkommen das BOINC mehrere Einträge für einen Computer anlegt. Sie "
-"können dies korrigieren indem Sie ältere Einträge mit dem aktuellsten "
-"zusammenführen."
+"Sometimes BOINC assigns separate identities to the same computer by mistake."
+" You can correct this by merging old identities with the newest one."
+msgstr "Es kann vorkommen das BOINC mehrere Einträge für einen Computer anlegt. Sie können dies korrigieren indem Sie ältere Einträge mit dem aktuellsten zusammenführen."
 
 #: ../user/host_edit_form.php:56
 msgid "No hosts are eligible for merging with this one."
@@ -4910,9 +4525,7 @@ msgstr "Details anzeigen"
 #: ../user/host_edit_form.php:66
 msgid ""
 "Check the computers that are the same as %1 (created %2, computer ID %3):"
-msgstr ""
-"Überprüfen der Computer die mit %1 übereinstimmen (erstellt %2, Computer ID "
-"%3):"
+msgstr "Überprüfen der Computer die mit %1 übereinstimmen (erstellt %2, Computer ID %3):"
 
 #: ../user/host_edit_form.php:70 ../user/workunit.php:39
 msgid "name"
@@ -4954,9 +4567,7 @@ msgstr "Der Ort dieses Computer wurde auf %1 gesetzt."
 msgid ""
 "This change will take effect the next time the host communicates with this "
 "project."
-msgstr ""
-"Diese Änderung wird erst bei der nächsten Kommunikation des Computers mit "
-"dem Projekt wirksam."
+msgstr "Diese Änderung wird erst bei der nächsten Kommunikation des Computers mit dem Projekt wirksam."
 
 #: ../user/host_venue_action.php:50
 msgid "Return to host page"
@@ -5013,17 +4624,13 @@ msgstr "vorformatiert"
 
 #: ../user/html.php:33
 msgid ""
-"image; height cannot exceed 450 pixels. Please do not link to images without "
-"permission of the web site where the image is hosted."
-msgstr ""
-"Bild, max. Höhe: 450 pixel. Bitte nicht auf Bilder, ohne das Einverständnis "
-"des Urhebers, verlinken."
+"image; height cannot exceed 450 pixels. Please do not link to images without"
+" permission of the web site where the image is hosted."
+msgstr "Bild, max. Höhe: 450 pixel. Bitte nicht auf Bilder, ohne das Einverständnis des Urhebers, verlinken."
 
 #: ../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:35
 msgid "Run %1 only on authorized computers"
@@ -5034,11 +4641,7 @@ msgid ""
 "Run %1 only on computers that you own, or for which you have obtained the "
 "owner's permission. Some companies and schools have policies that prohibit "
 "using their computers for projects such as %1."
-msgstr ""
-"Installieren Sie %1 ausschliesslich auf Computern, die Sie besitzen, oder "
-"von denen Ihnen die Zugriffserlaubnis des Besitzers vorliegt. Die Regeln "
-"mancher Firmen und Schulen verbieten die Nutzung ihrer Computer für Projekte "
-"wie %1."
+msgstr "Installieren Sie %1 ausschliesslich auf Computern, die Sie besitzen, oder von denen Ihnen die Zugriffserlaubnis des Besitzers vorliegt. Die Regeln mancher Firmen und Schulen verbieten die Nutzung ihrer Computer für Projekte wie %1."
 
 #: ../user/info.php:38
 msgid "How %1 will use your computer"
@@ -5049,20 +4652,13 @@ msgid ""
 "When you run %1 on your computer, it will use part of the computer's CPU "
 "power, disk space, and network bandwidth. You can control how much of your "
 "resources are used by %1, and when it uses them."
-msgstr ""
-"Wenn Sie %1 auf Ihrem Computer arbeiten lassen, beansprucht es einen Teil "
-"der Rechenleistung, des Festplattenplatzes und der Netzwerkbandbreite. Sie "
-"können selbst bestimmen, wann und in welchem Umfang Ressourcen von %1 "
-"benutzt werden dürfen."
+msgstr "Wenn Sie %1 auf Ihrem Computer arbeiten lassen, beansprucht es einen Teil der Rechenleistung, des Festplattenplatzes und der Netzwerkbandbreite. Sie können selbst bestimmen, wann und in welchem Umfang Ressourcen von %1 benutzt werden dürfen."
 
 #: ../user/info.php:40
 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 von Zeit zu Zeit ändern."
 
 #: ../user/info.php:42
 msgid "Privacy policy"
@@ -5070,16 +4666,11 @@ msgstr "Datenschutz"
 
 #: ../user/info.php:43
 msgid ""
-"Your account on %1 is identified by a name that you choose. This name may be "
-"shown on the %1 web site, along with a summary of the work your computer has "
-"done for %1. If you want to be anonymous, choose a name that doesn't reveal "
-"your identity."
-msgstr ""
-"Ihr Konto bei %1 wird mit einem Namen ihrer Wahl identifiziert. Dieser Name "
-"wird auf der %1-Webseite angezeigt, zusammen mit einer Übersicht der Arbeit, "
-"die Ihr Computer für %1 geleistet hat. Wählen Sie einen Namen, der keine "
-"Rückschlüsse auf Ihre wahre Identität zulässt, wenn Sie anonym bleiben "
-"möchten."
+"Your account on %1 is identified by a name that you choose. This name may be"
+" shown on the %1 web site, along with a summary of the work your computer "
+"has done for %1. If you want to be anonymous, choose a name that doesn't "
+"reveal your identity."
+msgstr "Ihr Konto bei %1 wird mit einem Namen ihrer Wahl identifiziert. Dieser Name wird auf der %1-Webseite angezeigt, zusammen mit einer Übersicht der Arbeit, die Ihr Computer für %1 geleistet hat. Wählen Sie einen Namen, der keine Rückschlüsse auf Ihre wahre Identität zulässt, wenn Sie anonym bleiben möchten."
 
 #: ../user/info.php:44
 msgid ""
@@ -5088,26 +4679,14 @@ 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 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."
 
 #: ../user/info.php:45
 msgid ""
-"To participate in %1, you must give an address where you receive email. This "
-"address will not be shown on the %1 web site or shared with organizations. %"
-"1 may send you periodic newsletters; however, you can opt out at any time."
-msgstr ""
-"Um an %1 teilnehmen zu können, müssen Sie eine E-Mail-Adresse angeben, mit "
-"der Sie E-Mails empfangen können. Diese ist nicht auf der %1-Webseite "
-"einsehbar und wird auch nicht an Dritte weitergegeben. %1 wird Ihnen "
-"möglicherweise in regelmäßigen Abständen Newsletter senden; darauf können "
-"Sie aber jederzeit verzichten."
+"To participate in %1, you must give an address where you receive email. This"
+" address will not be shown on the %1 web site or shared with organizations. "
+"%1 may send you periodic newsletters; however, you can opt out at any time."
+msgstr "Um an %1 teilnehmen zu können, müssen Sie eine E-Mail-Adresse angeben, mit der Sie E-Mails empfangen können. Diese ist nicht auf der %1-Webseite einsehbar und wird auch nicht an Dritte weitergegeben. %1 wird Ihnen möglicherweise in regelmäßigen Abständen Newsletter senden; darauf können Sie aber jederzeit verzichten."
 
 #: ../user/info.php:46
 msgid ""
@@ -5116,25 +4695,15 @@ 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 Benutzer erhalten, können Sie diesen zu Ihrem %2Filter hinzufügen%3.  Damit sehen Sie keine öffentlichen und privaten Nachrichten dieses Benutzers mehr."
 
 #: ../user/info.php:47
 msgid ""
 "If you use our web site forums you must follow the %2posting guidelines%3.  "
 "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."
+"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."
 
 #: ../user/info.php:48
 msgid "Is it safe to run %1?"
@@ -5144,38 +4713,23 @@ msgstr "Sicherheit"
 msgid ""
 "Any time you download a program through the Internet you are taking a "
 "chance: the program might have dangerous errors, or the download server "
-"might have been hacked. %1 has made efforts to minimize these risks. We have "
-"tested our applications carefully. Our servers are behind a firewall and 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 manipuliert worden sind, werden alle "
-"ausführbaren Dateien vom einem sicheren, nicht mit dem Internet verbundenen "
-"Computer digital signiert."
+"might have been hacked. %1 has made efforts to minimize these risks. We have"
+" tested our applications carefully. Our servers are behind a firewall and "
+"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 [...]
 
 #: ../user/info.php:50
 msgid ""
 "The applications run by %1 may cause some computers to overheat. If this "
 "happens, stop running %1 or use a %2utility program%3 that limits CPU usage."
-msgstr ""
-"Die Anwendungen von %1 können auf manchen Computern zu Überhitzung führen. "
-"Wenn dies passiert, sollten Sie aufhören, mit dem betreffenden Computer für "
-"%1 zu arbeiten oder ein %2Hilfprogramm%3 einsetzen, das die Prozessornutzung "
-"beschränkt."
+msgstr "Die Anwendungen von %1 können auf manchen Computern zu Überhitzung führen. Wenn dies passiert, sollten Sie aufhören, mit dem betreffenden Computer für %1 zu arbeiten oder ein %2Hilfprogramm%3 einsetzen, das die Prozessornutzung beschränkt."
 
 #: ../user/info.php:51
 msgid ""
 "%1 was developed by %2. BOINC was developed at the University of California."
-msgstr ""
-"%1 wurde von %2 entwickelt. BOINC wurde an der Universität von Kalifornien "
-"entwickelt."
+msgstr "%1 wurde von %2 entwickelt. BOINC wurde an der Universität von Kalifornien entwickelt."
 
 #: ../user/info.php:53
 msgid "Liability"
@@ -5184,12 +4738,9 @@ msgstr "Haftungsausschluss"
 #: ../user/info.php:54
 msgid ""
 "%1 and %2 assume no liability for damage to your computer, loss of data, or "
-"any other event or condition that may occur as a result of participating in %"
-"1."
-msgstr ""
-"%1 und %2 haften weder für Beschädigungen Ihres Computers, Datenverlust, "
-"noch irgend ein anderes Ereignis, das möglicherweise aus der Teilnahme an %1 "
-"resultieren könnte."
+"any other event or condition that may occur as a result of participating in "
+"%1."
+msgstr "%1 und %2 haften weder für Beschädigungen Ihres Computers, Datenverlust, noch irgend ein anderes Ereignis, das möglicherweise aus der Teilnahme an %1 resultieren könnte."
 
 #: ../user/info.php:56
 msgid "Other BOINC projects"
@@ -5197,25 +4748,17 @@ msgstr "Andere BOINC-Projekte"
 
 #: ../user/info.php:57
 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 "
+"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 Arbeit verfügbar ist."
 
 #: ../user/info.php:58
 msgid ""
 "These other projects are not associated with %1, and we cannot vouch for "
 "their security practices or the nature of their research. Join them at your "
 "own risk."
-msgstr ""
-"Es besteht keinerlei Verbindung zwischen diesen anderen Projekten und %1 und "
-"wir können uns nicht für deren Sicherheitspraktiken und die Natur derer "
-"Nachforschungen verbürgen. Nehmen Sie an diesen Projekten auf eigene "
-"Verantwortung teil."
+msgstr "Es besteht keinerlei Verbindung zwischen diesen anderen Projekten und %1 und wir können uns nicht für deren Sicherheitspraktiken und die Natur derer Nachforschungen verbürgen. Nehmen Sie an diesen Projekten auf eigene Verantwortung teil."
 
 #: ../user/language_select.php:47
 msgid "Language selection"
@@ -5225,17 +4768,13 @@ msgstr "Sprachauswahl"
 msgid ""
 "This web site is available in several languages. The currently selected "
 "language is %1."
-msgstr ""
-"Diese Internetseite ist in mehreren Sprachen verfügbar. Die aktuelle "
-"Einstellung ist: %1 (%2)"
+msgstr "Diese Internetseite ist in mehreren Sprachen verfügbar. Die aktuelle Einstellung ist: %1 (%2)"
 
 #: ../user/language_select.php:78
 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 sind: %1. Sie können die Einstellungen wie folgt ändern:"
 
 #: ../user/language_select.php:83
 msgid "Firefox: Tools/Options/General"
@@ -5250,10 +4789,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 das Ihr Browser Cookies von unserer Domain gestattet."
 
 #: ../user/language_select.php:95
 msgid "Language name (click to select)"
@@ -5265,11 +4801,9 @@ msgstr "Browsereinstellungen verwenden"
 
 #: ../user/language_select.php:113
 msgid ""
-"Translations are done by volunteers.  If your native language is not here, %"
-"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."
+"Translations are done by volunteers.  If your native language is not here, "
+"%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:"
@@ -5315,13 +4849,7 @@ msgid ""
 "        having that name with the newest computer having that name.\n"
 "        Incompatible computers will not be merged.\n"
 "        <p>"
-msgstr ""
-"Diese Aktion führt Computer anhand des Rechnernamens zusammen.\n"
-"        <p>\n"
-"        Alle Computer mit dem gleichen Rechnernamen,\n"
-"        werden in dem neuesten Computer zusammengeführt.\n"
-"        Inkompatible Computer werden nicht zusammengeführt.\n"
-"        <p>"
+msgstr "Diese Aktion führt Computer anhand des Rechnernamens zusammen.\n        <p>\n        Alle Computer mit dem gleichen Rechnernamen,\n        werden in dem neuesten Computer zusammengeführt.\n        Inkompatible Computer werden nicht zusammengeführt.\n        <p>"
 
 #: ../user/merge_by_name.php:82
 msgid "Go ahead and do this"
@@ -5337,10 +4865,7 @@ msgid ""
 "To maximize discussion and flow of information,\n"
 "our message boards are moderated.\n"
 "Message board postings are subject to the following posting rules:\n"
-msgstr ""
-"Um eine angenehme Diskussion und den bestmöglichen Informationsfluss zu "
-"gewährleisten wird dieses Forum moderiert. Forenbeiträge müssen den "
-"folgenden Regeln entsprechen:"
+msgstr "\nUm eine angenehme Diskussion und den bestmöglichen Informationsfluss zu gewährleisten wird dieses Forum moderiert. Forenbeiträge müssen den folgenden Regeln entsprechen:\n"
 
 #: ../user/moderation.php:30
 msgid ""
@@ -5349,8 +4874,7 @@ msgid ""
 "Moderators may delete posts that violate any of these rules.\n"
 "The authors of deleted posts will be notified via email.\n"
 "Gross offenders may have their ability to post messages temporarily revoked\n"
-"(though to prevent abuse only project administrators have the ability to do "
-"so).\n"
+"(though to prevent abuse only project administrators have the ability to do so).\n"
 "Additional kinds of bad behavior (\"bugging\" posts to trap the\n"
 "IP addresses of other participants, excessive thread creation to spam\n"
 "the forums, etc.), while not listed in the formal rules, may still\n"
@@ -5379,48 +4903,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>\n"
-"Moderatoren können Beiträge löschen die gegen einer dieser Regeln verstoßen.\n"
-"Die Autoren der gelöschten Beiträge werden per email benachrichtigt.\n"
-"Bei 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).\n"
-"Weitere Arten von schlechtem Verhalten sind (\"Phishing\" das ausspähen von\n"
-"IP-Adressen und anderer Daten der Benutzer, übermäßige Erstellung von "
-"Beiträgen und Themen\n"
-"um das Forum zu zuspämmen, etc.), auch ähnliche Verstöße die nicht in den "
-"offiziellen Regeln aufgeführt sind\n"
-"können zu Strafen führen.\n"
-"<p>\n"
-"Wenn Sie denken das ein Beitrag gegen geltende Regeln verstößt,\n"
-"dann klicken Sie auf das rote x im Beitrag, und füllen Sie das Formular aus;\n"
-"Ihre Beschwerde wird den Moderatoren mitgeteilt.\n"
-"Bitte benutzen Sie den Button nur für klare Regelverstöße - nicht\n"
-"für persönliche Streitigkeiten.\n"
-"<p>\n"
-"Wir werden versuchen so gerecht wie möglich zu sein beim Moderieren,\n"
-"aber in einer großen Gemeinschaft von Nutzern, mit vielen unterschiedlichen "
-"Standpunkten,\n"
-"wird es immer einige Leute geben die nicht mit unseren\n"
-"Entscheidungen zufrieden sind.\n"
-"Wir bedauern wenn das passiert,\n"
-"Bitte sehen Sie ein das wir es nicht allen recht machen können,\n"
-"und wir unsere Entscheidungen auf der Grundlage der uns zur Verfügung "
-"stehenden Mittel und\n"
-"das was am besten für die Allgemeinheit im Forum ist treffen.\n"
-"Bitte Diskutieren Sie unsere Forumspolitik nicht im Forum! Wir sind kein\n"
-"Gesellschafts Wissentschaftsprojekt noch ist es unsere Pflicht\n"
-"ein perfektes faires System zu erschaffen. Da solche Diskussionen und "
-"eventuelle aufkommende beleidigende Äußerungen\n"
-"tendenziell kontra produktiv sind. Wenn Sie ein berechtigtes Anliegen haben,\n"
-"dann senden Sie uns eine email an die unten angegebene Adresse.\n"
-"<p>\n"
-"Diese Forum Moderations Regeln gelten für das %1 Project.\n"
-"Wenn Sie Fragen oder Kommentare zu diesem Bestimmungen haben, 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 [...]
 
 #: ../user/pending.php:66
 msgid "Pending credit"
@@ -5496,17 +4979,14 @@ msgstr "Datum"
 
 #: ../user/pm.php:185
 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"
+msgstr "Sie müssen alle Eingabefelder ausfüllen, um eine private Nachricht zu senden"
 
 #: ../user/pm.php:188
 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."
+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
 msgid "Could not find user with id %1"
@@ -5518,14 +4998,11 @@ msgstr "Benutzer mit dem Benutzernamen %1 konnte nicht gefunden werden"
 
 #: ../user/pm.php:212
 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"
+msgstr "%1 ist kein einmaliger Benutzername; Sie müssen die Benutzer-ID verwenden"
 
 #: ../user/pm.php:217
 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."
+msgstr "Der Benutzer %1 (ID: %2) möchten keine privaten Nachrichten von Ihnen erhalten."
 
 #: ../user/pm.php:240 ../user/view_profile.php:26
 msgid "No such user"
@@ -5539,23 +5016,17 @@ msgstr "%1 wirklich blockieren?"
 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?"
+msgstr "Möchten Sie wirklich keine privaten Nachrichten mehr vom Benutzer %1 erhalten?"
 
 #: ../user/pm.php:244
 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."
+msgstr "Bitte beachten Sie, dass Sie nur eine begrenzte Anzahl Benutzer blockieren können."
 
 #: ../user/pm.php:245
 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."
+msgstr "Sobald Sie den Benutzer blockiert haben, können Sie die Blockierung in den Foren-Einstellungen wieder aufheben."
 
 #: ../user/pm.php:252
 msgid "No, cancel"
@@ -5575,9 +5046,7 @@ msgstr "Benutzer %1 kann Ihnen keine weiteren privaten Nachrichten senden."
 
 #: ../user/pm.php:266
 msgid "To unblock, visit %1message board preferences%2"
-msgstr ""
-"Die Blockierung können Sie in den %1Einstellungen für das Diskussionsforum %"
-"2 aufheben."
+msgstr "Die Blockierung können Sie in den %1Einstellungen für das Diskussionsforum %2 aufheben."
 
 #: ../user/pm.php:302
 msgid "Unknown action"
@@ -5588,21 +5057,14 @@ 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\n"
-"werden aktiviert wenn der Computer mit %1 kommuniziert\n"
-"oder der %2Aktualisieren%3 Knopf im Manager geklickt wurde."
+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
 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\n"
-"werden aktiviert wenn der Computer mit %1 kommuniziert\n"
-"oder der %2Aktualisieren%3 Knopf im Manager geklickt wurde."
+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
 msgid "%1 for %2"
@@ -5632,25 +5094,19 @@ msgstr "Abbrechen"
 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 Benutzern die Möglichkeit Ihre Ansichten und Meinungen zur %3 Community auszudrücken."
 
 #: ../user/profile_menu.php:36
 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 Benutzer und stellen Sie Ihre eigenen Ansichten dar."
 
 #: ../user/profile_menu.php:37
 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!"
+msgstr "Falls nicht schon vorhanden, sollten Sie Ihr %1eigenes Benutzerprofil anlegen%2 und den anderen Benutzern zeigen!"
 
 #: ../user/profile_menu.php:42
 msgid "User of the Day"
@@ -5672,9 +5128,7 @@ msgstr "Durchsuchen der Profile %1nach Ländern%2."
 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."
+msgstr "Durchsuchen der Profile %1per Zufall%2, %3per Zufall mit Bildern%2 oder %4per Zufall ohne Bilder%2."
 
 #: ../user/profile_menu.php:66
 msgid "Alphabetical profile listings:"
@@ -5884,8 +5338,6 @@ msgstr "aktuelle GigaFLOPs"
 msgid "Tasks by application"
 msgstr "Aufgaben pro Anwendung"
 
-# ########################################
-# Apps page (apps.php)
 #: ../user/server_status.php:423 ../user/workunit.php:40
 msgid "application"
 msgstr "Anwendung"
@@ -5920,27 +5372,21 @@ msgstr "Statistiken von %1"
 
 #: ../user/stats.php:37
 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:"
+"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
 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:"
+"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
 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."
+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 "%1 participants may form %2teams%3."
@@ -5949,9 +5395,7 @@ msgstr "%1 Benutzer können %2Teams%3 bilden."
 #: ../user/team.php:29
 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."
+msgstr "Sie können nur einem Team gleichzeitig angehören. Sie können allerdings das Team jederzeit wechseln."
 
 #: ../user/team.php:31
 msgid "Each team has a %1founder%2 who may:"
@@ -5979,9 +5423,7 @@ msgstr "ein Team auflösen kann, wenn es keine Mitglieder mehr hat."
 
 #: ../user/team.php:40
 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."
+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
 msgid "Find a team"
@@ -6002,9 +5444,7 @@ msgstr "Neues Team erstellen"
 #: ../user/team.php:59
 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."
+msgstr "Wenn Sie kein passendes Team finden können dann sollten Sie ein %1neues Team erstellen%2."
 
 #: ../user/team_admins.php:34
 msgid "Remove Team Admin status from this member"
@@ -6028,11 +5468,9 @@ msgstr "die Beitritts-/Austrittshistorie ansehen"
 
 #: ../user/team_admins.php:45
 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)"
+"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
 msgid "Team Admins cannot:"
@@ -6048,17 +5486,13 @@ msgstr "Mitglieder entfernen"
 
 #: ../user/team_admins.php:53
 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."
+msgstr "Wenn ein Administrator das Team verlässt ist er nicht mehr länger Team-Administrator."
 
 #: ../user/team_admins.php:54
 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 dievertrauenswürdig sind."
 
 #: ../user/team_admins.php:59
 msgid "There are currently no Team Admins"
@@ -6128,17 +5562,13 @@ msgstr "Gründer von %1 ändern"
 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."
+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
 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."
+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
 msgid "decline request"
@@ -6146,14 +5576,9 @@ msgstr "Anforderung ablehnen"
 
 #: ../user/team_change_founder_form.php:58
 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 />\n"
-"Um die Anfrage von %3 zu akzeptieren, benutze das untere Formular"
+"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"
 
 #: ../user/team_change_founder_form.php:66
 msgid "No transfer request is pending."
@@ -6163,10 +5588,7 @@ msgstr "Keine laufende Übernahmeanfrage."
 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."
+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
 msgid "New founder?"
@@ -6190,8 +5612,7 @@ msgstr "Das Team %1 besteht bereits, bitte wählen Sie einen anderen Namen."
 
 #: ../user/team_create_action.php:54
 msgid "Could not create team - please try later."
-msgstr ""
-"Das Team konnte nicht erstellt werden, bitte später noch einmal probieren."
+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
 msgid "Create a team"
@@ -6200,9 +5621,7 @@ msgstr "Ein Team erstellen"
 #: ../user/team_create_form.php:30
 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."
+msgstr "Du bist Mitglied von %1. Du musst aus dem %2Team austreten%3 um ein neues zu erstellen."
 
 #: ../user/team_delta.php:65
 msgid "Not founder or admin"
@@ -6242,9 +5661,7 @@ msgstr "Ein Teamname muss angegeben werden."
 
 #: ../user/team_edit_action.php:90
 msgid "Could not update team - please try again later."
-msgstr ""
-"Das Team konnte nicht aktualisiert werden, bitte später noch einmal "
-"probieren."
+msgstr "Das Team konnte nicht aktualisiert werden, bitte später noch einmal probieren."
 
 #: ../user/team_edit_form.php:33
 msgid "Edit %1"
@@ -6262,7 +5679,6 @@ msgstr "E-Mailverzeichnis von %1"
 msgid "Member list of %1"
 msgstr "Mitgliederverzeichnis von %1"
 
-# oder als Klartext anzeigen? Gemeint ist eine Anzeige ohne HTML-Elemente
 #: ../user/team_email_list.php:78
 msgid "Show as plain text"
 msgstr "Als reinen Text anzeigen"
@@ -6328,10 +5744,7 @@ 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."
+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
 msgid "Yes - remove message board"
@@ -6343,10 +5756,9 @@ msgstr "Diskussionsforum entfernt"
 
 #: ../user/team_forum.php:124
 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."
+"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
 msgid "Team Message Board Updated"
@@ -6374,15 +5786,9 @@ msgstr "Gründerstatus für %1 anfordern"
 
 #: ../user/team_founder_transfer_action.php:98
 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 />\n"
-"Wenn der Gründer nicht innerhalb von 60 Tagen reagiert wird der Wechsel "
-"möglich sein."
+"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
@@ -6397,9 +5803,7 @@ msgstr "Gründerstatus von %1 übernommen"
 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."
+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
 msgid "Decline founder change request"
@@ -6442,9 +5846,7 @@ msgstr "Du hast den Gründerstatus von %1 am %2 angefragt."
 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:"
+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
 msgid "Assume foundership"
@@ -6454,25 +5856,13 @@ msgstr "Gründerstatus anfordern"
 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."
+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
 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"
+"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 />\n"
-"Sicher das die Übernahme des Gründerstatus eingeleitet werden soll?"
+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
 msgid "Request foundership"
@@ -6486,9 +5876,7 @@ msgstr "Der Gründerstatus wurde bereits von %1 am %2 beantragt."
 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."
+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
@@ -6505,9 +5893,7 @@ msgstr "Du bist bereits Mitglied im Team %1."
 
 #: ../user/team_join.php:42 ../user/team_join_action.php:43
 msgid "Couldn't join team - please try again later."
-msgstr ""
-"Dem Team konnte nicht beigetreten werden, bitte später noch einmal "
-"probieren."
+msgstr "Dem Team konnte nicht beigetreten werden, bitte später noch einmal probieren."
 
 #: ../user/team_join_action.php:40
 msgid "Joined %1"
@@ -6551,17 +5937,13 @@ msgstr "Die Mitglieder, Statistiken und Informationen zu diesem Team anschauen."
 
 #: ../user/team_lookup.php:98
 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."
+msgstr "Mehr als 100 Teams entsprachen der Suche. Nur die ersten 100 werden angezeigt."
 
 #: ../user/team_lookup.php:104
 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."
+"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
 msgid "Team administration for %1"
@@ -6573,9 +5955,7 @@ msgstr "Teaminformationen bearbeiten"
 
 #: ../user/team_manage.php:30
 msgid "Change team name, URL, description, type, or country"
-msgstr ""
-"Den Namen des Teams, die URL, die Beschreibung, den Typ oder das Land "
-"ändern."
+msgstr "Den Namen des Teams, die URL, die Beschreibung, den Typ oder das Land ändern."
 
 #: ../user/team_manage.php:32
 msgid "Member list:"
@@ -6603,9 +5983,7 @@ msgstr "XML"
 
 #: ../user/team_manage.php:39
 msgid "See when members joined or quit this team"
-msgstr ""
-"Zeigt welche Mitglieder wann dem Team beigetreten sind oder dieses verlassen "
-"haben."
+msgstr "Zeigt welche Mitglieder wann dem Team beigetreten sind oder dieses verlassen haben."
 
 #: ../user/team_manage.php:50
 msgid "Respond to foundership request."
@@ -6613,9 +5991,7 @@ msgstr "Auf eine Anfrage zum Gründerwechsel antworten."
 
 #: ../user/team_manage.php:50
 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."
+msgstr "Wenn nicht bis zum %1 geantwortet wurde, kann %2 den Gründerstatus dieses Teams bekommen."
 
 #: ../user/team_manage.php:55
 msgid "Remove inactive or unwanted members from this team"
@@ -6647,27 +6023,21 @@ msgstr "Ein Diskussionsforum für das Team erstellen oder verwalten."
 
 #: ../user/team_manage.php:71
 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."
+"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
 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."
+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."
+"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"
@@ -6679,8 +6049,7 @@ msgstr "Team %1 gelöscht"
 
 #: ../user/team_members.php:36
 msgid "Limit exceeded:  Can only display the first 1000 members."
-msgstr ""
-"Limit überschritten: Nur die ersten 1000 Mitglieder können angezeigt werden."
+msgstr "Limit überschritten: Nur die ersten 1000 Mitglieder können angezeigt werden."
 
 #: ../user/team_members.php:49
 msgid "Members of %1"
@@ -6702,19 +6071,10 @@ msgstr "Verlasse %1"
 msgid ""
 "<strong>Please note before quitting a team:</strong>\n"
 "         <ul>\n"
-"         <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"
+"         <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>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>"
+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
 msgid "Quit Team"
@@ -6773,10 +6133,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 ""
-"Ein oder Mehrere Suchkriterien passen zu den folgenden Teams.\n"
-"Um einem Team beizutreten, bitte erst auf den Namen und\n"
-"dann %1diesem Team beitreten%2 klicken."
+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
 msgid "Change your search"
@@ -6786,15 +6143,11 @@ msgstr "Suche ändern"
 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."
+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
 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."
+msgstr "Benutze dieses Formular um Teams zu finden, die vielleicht die richtigen für dich sind."
 
 #: ../user/team_search.php:188
 msgid "%1I'm not interested%2 in joining a team right now."
@@ -6917,9 +6270,7 @@ msgstr "Bestätige die BOINC E-Mail Adresse"
 msgid ""
 "Please visit the following link to validate the email address of your %1 "
 "account:"
-msgstr ""
-"Bitte besuchen Sie den folgenden Link um ihre E-Mail Adresse für Ihren %1 "
-"Account zu bestätigen:"
+msgstr "Bitte besuchen Sie den folgenden Link um ihre E-Mail Adresse für Ihren %1 Account zu bestätigen:"
 
 #: ../user/validate_email_addr.php:34
 msgid "Validate email sent"
@@ -6929,9 +6280,7 @@ msgstr "E-Mail zur Validierung gesendet"
 msgid ""
 "An email has been sent to %1. Visit the link it contains to validate your "
 "email address."
-msgstr ""
-"Es wurde eine E-Mail an die Adresse %1 gesendet. Bitte den enthaltenen Link "
-"aufrufen um die E-Mail Adresse zu validieren."
+msgstr "Es wurde eine E-Mail an die Adresse %1 gesendet. Bitte den enthaltenen Link aufrufen um die E-Mail Adresse zu validieren."
 
 #: ../user/validate_email_addr.php:44
 msgid "No such user."
@@ -6943,8 +6292,7 @@ msgstr "Fehler in der URL - E-Mail Adresse konnte nicht bestätigt werden."
 
 #: ../user/validate_email_addr.php:54
 msgid "Database update failed - please try again later."
-msgstr ""
-"Aktualisierung der Datenbank fehlgeschlagen - Bitte später erneut probieren."
+msgstr "Aktualisierung der Datenbank fehlgeschlagen - Bitte später erneut probieren."
 
 #: ../user/validate_email_addr.php:57
 msgid "Validate email address"
@@ -6968,14 +6316,10 @@ msgstr "Kontoinformationen"
 
 #: ../user/weak_auth.php:52
 msgid ""
-"You can access your account either by using your email address and "
-"password,\n"
+"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 ""
-"Der Zugriff auf das Benutzerkonto kann per E-Mail-Adresse und Passwort,\n"
-"oder per 'Kontoschlüssel' erfolgen.\n"
-"Ihr Kontoschlüssel ist:"
+msgstr "Der Zugriff auf das Benutzerkonto kann per E-Mail-Adresse und Passwort,\noder per 'Kontoschlüssel' erfolgen.\nIhr Kontoschlüssel ist:"
 
 #: ../user/weak_auth.php:57
 msgid "This key can be used to:"
@@ -6991,10 +6335,7 @@ msgid ""
 "       To do so, install BOINC,\n"
 "       create a file named %1 in the BOINC\n"
 "       data directory, and set its contents to:"
-msgstr ""
-"Um einen Computer zu Ihrem Konto hinzuzufügen, ohne den BOINC-Manager zu "
-"verwenden, installieren Sie BOINC und erstellen eine Datei mit dem Namen '%"
-"1' im BOINC Datenverzeichnis und dem folgenden Inhalt:"
+msgstr "Um einen Computer zu Ihrem Konto hinzuzufügen, ohne den BOINC-Manager zu verwenden, installieren Sie BOINC und erstellen eine Datei mit dem Namen '%1' im BOINC Datenverzeichnis und dem folgenden Inhalt:"
 
 #: ../user/weak_auth.php:73
 msgid "Weak account key"
@@ -7003,28 +6344,17 @@ msgstr "schwacher Kontoschlüssel"
 #: ../user/weak_auth.php:74
 msgid ""
 "Your 'weak account key' can be used to attach computers to your account\n"
-"    as described above, but cannot be used to log in to your account or "
-"change it in any way.\n"
+"    as described above, but cannot be used to log in to your account or change it in any way.\n"
 "    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 ""
-"                  Der 'schwache Kontoschlüssel' kann wie oben beschrieben "
-"zum hinzufügen von Computern\n"
-"zu Ihrem Konto genutzt werden, jedoch können damit keine Änderungen am "
-"Benutzerkonto selbst vorgenommen werden.\n"
-"Wenn Sie also unsichere oder nicht vertrauenswürdige Computer zu Ihrem Konto "
-"hinzufügen wollen,\n"
-"benutzen Sie bitte den schwachen Kontoschlüssel.\n"
-"Dieser lautet:                "
+msgstr "                  Der 'schwache Kontoschlüssel' kann wie oben beschrieben zum hinzufügen von Computern\nzu Ihrem Konto genutzt werden, jedoch können damit keine Änderungen am Benutzerkonto selbst vorgenommen werden.\nWenn Sie also unsichere oder nicht vertrauenswürdige Computer zu Ihrem Konto hinzufügen wollen,\nbenutzen Sie bitte den schwachen Kontoschlüssel.\nDieser lautet:                "
 
 #: ../user/weak_auth.php:81
 msgid ""
 "If you change your password, your weak account key changes, and your "
 "previous weak account key becomes invalid."
-msgstr ""
-"Wenn Sie Ihr Passwort ändern, ändert sich auch der schwache Kontoschlüssel "
-"und der vorherige wird ungültig."
+msgstr "Wenn Sie Ihr Passwort ändern, ändert sich auch der schwache Kontoschlüssel und der vorherige wird ungültig."
 
 #: ../user/workunit.php:32
 msgid "can't find workunit"
@@ -7050,7 +6380,6 @@ msgstr "unterdrückt bis zum Abschluss"
 msgid "minimum quorum"
 msgstr "Mindestanzahl"
 
-# Das ist ein eher technischer Begriff der die Anzahl der zu Beginn erzeugten Kopien des Jobs ausdrückt.
 #: ../user/workunit.php:59
 msgid "initial replication"
 msgstr "Anfängliche Kopien"
@@ -7091,10 +6420,7 @@ msgstr "Informationen zu ihrer Person."
 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."
+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
 msgid "Your opinions about %1"
@@ -7107,12 +6433,7 @@ msgid ""
 "    <li>What are your views about the project?\n"
 "    <li>Any suggestions?\n"
 "    </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>"
+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
 msgid "Color scheme for graphics"
@@ -7130,326 +6451,8 @@ msgstr "Startet nur die ausgewählte Anwendung/en"
 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?"
+msgstr "Wenn keine Aufgaben für die ausgewählten Anwendungen vorhanden sind, Aufgaben von anderen Anwendungen akzeptieren?"
 
 #: ../project.sample/project_specific_prefs.inc:91
 msgid "(all applications)"
 msgstr "(alle Anwendungen)"
-
-#~ msgid "Error:"
-#~ msgstr "Fehler:"
-
-#~ msgid "Account creation is disabled"
-#~ msgstr "Erstellung eines neuen Konto ist deaktiviert"
-
-#~ msgid ""
-#~ "Sorry, this project has disabled the creation of new accounts.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Entschuldigung, das Projekt hat die Erstellung neuer Konten deaktiviert.\n"
-#~ "Bitte versuchen Sie es später wieder."
-
-#~ msgid "Account creation is currently disabled. Please try again later."
-#~ msgstr ""
-#~ "Die Kontoerstellung ist zurzeit deaktiviert. Bitte versuchen Sie es später "
-#~ "noch einmal."
-
-#~ msgid "nvidia GPU"
-#~ msgstr "nvidia Grafikkarte"
-
-#~ msgid ""
-#~ "This project hasn\\'t created an email message - please notify its "
-#~ "administrators"
-#~ msgstr ""
-#~ "Das Projekt hat keine E-Mail-Nachricht erstellt - Bitte benachrichtigen Sie "
-#~ "deren Administratoren"
-
-#~ msgid "Use Intel GPU %1 Enforced by version 7.0+ %2"
-#~ msgstr "Benutze Intel GPU %1 Unterstützt ab Version 7.0 %2"
-
-#~ msgid ""
-#~ "These apply to all BOINC projects in which you participate.<br>\n"
-#~ "             On computers participating in multiple projects, the most "
-#~ "recently modified preferences will be used."
-#~ msgstr ""
-#~ "Diese Einstellungen gelten für alle BOINC-Projekte an denen du "
-#~ "teilnimmst.<br>\n"
-#~ "Auf Computern mit mehreren Projekten werden die aktuellsten Einstellungen "
-#~ "verwendet."
-
-#~ msgid "Export this news item as a Notice"
-#~ msgstr "Diesen Beitrag als Client-Nachricht exportieren"
-
-#~ msgid ""
-#~ "Go to the BOINC data directory on your computer (on Windows this is usually "
-#~ "<b>C:\\Documents and Settings\\All Users\\Application Data\\BOINC</b> or "
-#~ "<b>C:\\Program Files\\BOINC</b>."
-#~ msgstr ""
-#~ "Wechseln Sie in das BOINC Datenverzeichnis auf Ihrem Computer (unter Windows "
-#~ "normalerweise: <b>C:\\Dokumente und einstellungen\\All "
-#~ "Users\\Anwendungsdaten\\BOINC</b> oder <b>C:\\Programme\\BOINC</b>)."
-
-#~ msgid "No such task"
-#~ msgstr "Keine Aufgabe gefunden"
-
-#~ msgid ""
-#~ "Computer is connected to the Internet about every %1 Leave blank or 0 if "
-#~ "always connected. %2 BOINC will try to maintain at least this much work (max "
-#~ "10 days). %3"
-#~ msgstr ""
-#~ "Computer ist mit dem Internet circa alle X verbunden. %1 Frei lassen oder 0 "
-#~ "eintragen bei dauerhafter Internetverbindung. %2 BOINC versucht genug Arbeit "
-#~ "für diese Zeitdauer zu bekommen. (Max. 10 Tage) %3"
-
-#~ msgid "Maintain enough work for an additional"
-#~ msgstr "Fordere genug Arbeit für weitere"
-
-#~ msgid "Update failed: "
-#~ msgstr "Aktualisierung fehlgeschlagen: "
-
-#~ msgid "Provides %1limited access%2 to your account"
-#~ msgstr "Ermöglicht %1eingeschränkten Zugriff%2 auf Ihr Konto"
-
-#~ msgid ""
-#~ "Don't use this form. Just run BOINC, select Add Project, and enter an email "
-#~ "address and password."
-#~ msgstr ""
-#~ "Dieses Formular nicht verwenden. Einfach BOINC starten, im BOINC-Manager "
-#~ "\"Projekt hinzufügen\" auswählen und Ihre E-Mail-Adresse und Passwort "
-#~ "eingeben."
-
-#~ msgid "Do not reorder sticky posts"
-#~ msgstr "Fixierte Beiträge nicht umsortieren"
-
-#~ msgid "If a thread contains more than this number of posts"
-#~ msgstr "Wenn ein Thema mehr als diese Anzahl an Beiträgen enthält"
-
-#~ msgid "only display the first one and this many of the last ones"
-#~ msgstr "Nur den Ersten und nur so viele von den letzten anzeigen"
-
-#~ msgid "Your report has been recorded. Thanks you for your input."
-#~ msgstr "Ihre Meldung wurde gespeichert. Danke für ihre Eingabe."
-
-#~ msgid "Search type"
-#~ msgstr "Suchkriterien"
-
-#~ msgid "User names starting with"
-#~ msgstr "Benutzernamen beginnend mit"
-
-#~ msgid ""
-#~ "Your 'weak account key' lets you link a computer to your account without "
-#~ "giving it the ability to log in to your account or to change it in any way."
-#~ msgstr ""
-#~ "Mit Ihrem 'schwachen Kontoschlüssel' können Sie Computer zu Ihrem Konto bei "
-#~ "diesem Projekt hinzufügen, allerdings sind damit keine Änderungen des Kontos "
-#~ "möglich."
-
-#~ msgid ""
-#~ "This mechanism works only with projects that have upgraded their server "
-#~ "software 7 Dec 2007 or later."
-#~ msgstr ""
-#~ "Diese Funktion existiert nur bei Projekten die Ihre Software nach dem 7. "
-#~ "Dezember 2007 aktualisiert haben."
-
-#~ msgid "Your weak account key for this project is:"
-#~ msgstr "Ihr schwacher Kontoschlüssel für dieses Projekt:"
-
-#~ msgid ""
-#~ "To use your weak account key on a given host, find or create the 'account "
-#~ "file' for this project. This file has a name of the form "
-#~ "<b>account_PROJECT_URL.xml</b>. The account file for %1 is <b>%2</b>."
-#~ msgstr ""
-#~ "Um den schwachen Kontoschlüssel auf einem Computer zu verwenden, finden oder "
-#~ "erstellen Sie die 'Kontodatei' für dieses Projekt. Der Dateiname ist in "
-#~ "etwa <strong>account_PROJEKT_URL.xml</strong>. Die Kontodatei für %1 ist "
-#~ "<strong>%2</strong>"
-
-#~ msgid "Create this file if needed. Set its contents to:"
-#~ msgstr "Erstellen Sie, falls nötig, die Datei mit diesem Inhalt:"
-
-#~ msgid ""
-#~ "Your weak account key is a function of your password. If you change your "
-#~ "password, your weak account key changes, and your previous weak account key "
-#~ "becomes invalid."
-#~ msgstr ""
-#~ "Der schwache Kontoschlüssel ist abhängig von Ihrem Passwort. Wenn Sie das "
-#~ "Passwort ändern, ändert sich auch der schwache Kontoschlüssel und der "
-#~ "vorherige wird ungültig."
-
-#~ msgid "Account key"
-#~ msgstr "Kontoschlüssel"
-
-#~ msgid "Provides full access to your account"
-#~ msgstr "Ermöglicht vollen Zugriff auf Ihr Konto"
-
-#~ msgid "Export"
-#~ msgstr "Exportieren"
-
-#~ msgid "- private message"
-#~ msgstr "- private Nachricht"
-
-# ########################################
-# Private messages
-#~ msgid "Private message from"
-#~ msgstr "Private Nachrichten von"
-
-#~ msgid "Email address verification pending"
-#~ msgstr "Überprüfung der E-Mail Adresse ausstehend"
-
-#~ msgid "Logged in as %1."
-#~ msgstr "Angemeldet als %1."
-
-#~ msgid "Log in as someone else."
-#~ msgstr "Als jemand anderes anmelden."
-
-#~ msgid "No thread with id %1. Please check the link and try again."
-#~ msgstr ""
-#~ "Kein Thema mit der ID %1 gefunden. Bitte überprüfen Sie den Link und "
-#~ "versuchen Sie es erneut."
-
-#~ msgid "Request not found"
-#~ msgstr "Anfrage nicht gefunden"
-
-#~ msgid "%1 has added you as a friend."
-#~ msgstr "%1 hat Sie als Freund hinzugefügt."
-
-#~ msgid "Account data for %1"
-#~ msgstr "Kontodaten von %1"
-
-#~ msgid "couldn't create message board"
-#~ msgstr "Das Diskussionsforum konnte nicht erstellt werden."
-
-#~ msgid "message board not found"
-#~ msgstr "Diskussionsforum nicht gefunden"
-
-#~ msgid "no such forum"
-#~ msgstr "Forum nicht gefunden"
-
-#~ msgid "unknown command %1"
-#~ msgstr "unbekannter Befehl %1"
-
-#~ msgid "ERROR: %1 does not exist!  Cannot create combo box.<br>"
-#~ msgstr "FEHLER: %1 existiert nicht! Kombobox konnte nicht erstellt werden."
-
-#~ msgid ""
-#~ "To protect the project's webpages from spam, we kindly ask you to type in "
-#~ "the two words shown in the image:<br>\n"
-#~ msgstr ""
-#~ "Zum Schutz vor unerwünschter Werbung tragen Sie hier bitte die zwei "
-#~ "Wörter aus dem obigen Bild ein:<br>\n"
-
-#~ msgid "BOINC client version"
-#~ msgstr "BOINC-Client Version"
-
-#~ msgid "Client detached"
-#~ msgstr "Client abgemeldet"
-
-#~ msgid "Maximum daily WU quota per CPU"
-#~ msgstr "maximale Anzahl Arbeitspakete pro CPU pro Tag"
-
-#~ msgid "%1/day"
-#~ msgstr "%1/Tag"
-
-#~ msgid "Anonymous platform - CPU"
-#~ msgstr "Anonyme Plattform - CPU"
-
-#~ msgid "Anonymous platform - NVIDIA GPU"
-#~ msgstr "Anonyme Plattform - NVIDIA GPU"
-
-#~ msgid "Anonymous platform - ATI GPU"
-#~ msgstr "Anonyme Plattform - ATI GPU"
-
-#~ msgid "Task ID"
-#~ msgstr "Paket ID"
-
-#~ msgid "Granted credit"
-#~ msgstr "bewilligte Punkte"
-
-#~ msgid "(no restriction if equal)"
-#~ msgstr "(keine Einschränkung wenn gleich)"
-
-#~ msgid "(no restriction)"
-#~ msgstr "(keine Einschränkung)"
-
-#~ msgid "Last %1"
-#~ msgstr "Vorherige %1"
-
-# The charset used for the text in this file (please try to use UTF-8 if possible)
-#~ msgid "CHARSET"
-#~ msgstr "UTF-8"
-
-#~ msgid "Resource share and graphics"
-#~ msgstr "Ressourcenaufteilung und Grafik"
-
-#~ msgid "Tasks for computer %1"
-#~ msgstr "Aufgaben für Computer %1"
-
-#~ msgid "Provides"
-#~ msgstr "Ermöglicht"
-
-#~ msgid "limited access"
-#~ msgstr "eingeschränkten Zugriff"
-
-#~ msgid "to your account"
-#~ msgstr "auf Ihr Konto"
-
-#~ msgid "Current version"
-#~ msgstr "Aktuelle Version"
-
-#~ msgid "Mark as unread"
-#~ msgstr "Als ungelesen markieren"
-
-#~ msgid ""
-#~ "Are you sure you want to delete the message with subject "%1" "
-#~ "(sent by %2 on %3)?"
-#~ msgstr ""
-#~ "Möchten Sie die Nachricht mit dem Betreff "%1" wirklich löschen "
-#~ "(gesendet von %2 am %3)?"
-
-#~ msgid "Yes, delete"
-#~ msgstr "Ja, löschen"
-
-#~ msgid "No such message."
-#~ msgstr "Keine entsprechende Nachricht gefunden."
-
-#~ msgid "Posts containing '%1'"
-#~ msgstr "Diskussionsbeiträge, die '%1' enthalten"
-
-#~ msgid "No titles containing '%1' could be found."
-#~ msgstr "Es wurden keine Überschriften gefunden, die '%1' enthalten."
-
-#~ msgid "No posts containing '%1' could be found."
-#~ msgstr "Es wurden keine Diskussionsbeiträge gefunden, die '%1' enthalten."
-
-#~ msgid "Create new"
-#~ msgstr "Neue Nachricht"
-
-#~ msgid "management functions"
-#~ msgstr "Verwaltungsfunktionen"
-
-#~ msgid "General preferences"
-#~ msgstr "Allgemeine Einstellungen"
-
-#~ msgid "View or edit"
-#~ msgstr "Anzeigen oder bearbeiten"
-
-#~ msgid "control resource share and customize graphics"
-#~ msgstr "Ressourcenverteilung regeln und Bildschirmschoner anpassen"
-
-#~ msgid "Message board preferences"
-#~ msgstr "Einstellungen für das Diskussionsforum"
-
-#~ msgid "configure features and appearance of message boards"
-#~ msgstr "Funktionen und Gestaltung der Diskussionsforen einrichten"
-
-#~ msgid "Work done"
-#~ msgstr "Geleistete Arbeit"
-
-#~ msgid "Account number"
-#~ msgstr "Kontonummer"
-
-# The charset used for the text in this file (please try to use UTF-8 if possible)
-#~ msgid "Used in URLs"
-#~ msgstr "Wird in URLs verwendet"
diff --git a/locale/de/BOINC-Setup.mo b/locale/de/BOINC-Setup.mo
index 10f5763..d9ec1e1 100644
Binary files a/locale/de/BOINC-Setup.mo and b/locale/de/BOINC-Setup.mo differ
diff --git a/locale/de/BOINC-Setup.po b/locale/de/BOINC-Setup.po
old mode 100755
new mode 100644
index 4074183..03aee7a
--- a/locale/de/BOINC-Setup.po
+++ b/locale/de/BOINC-Setup.po
@@ -1,40 +1,32 @@
 # 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: BOINC 7.4\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-10 14:54-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: de\n"
+"PO-Revision-Date: 2015-02-08 16:02+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/boinc/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-Basepath: /Volumes/Cheer/BOINC_GIT/boinc_trunk\n"
-"X-POOTLE-MTIME: 1391369982.0\n"
-"X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: mac_installer\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: Installer.cpp:124
 #, c-format
 msgid "Sorry, this version of %s requires system 10.5 or higher."
 msgstr "Entschuldigung, diese Version von %s benötigt die Systemversion 10.5 oder höher."
 
-#: PostInstall.cpp:130
-#: PostInstall.cpp:1136
-#: uninstall.cpp:1618
+#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
 msgid "Yes"
 msgstr "Ja"
 
-#: PostInstall.cpp:131
-#: PostInstall.cpp:1137
-#: uninstall.cpp:1619
+#: PostInstall.cpp:131 PostInstall.cpp:1137 uninstall.cpp:1619
 msgid "No"
 msgstr "Nein"
 
@@ -48,10 +40,7 @@ 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 ""
-"Administrative Benutzer dieses Computers werden automatisch bemächtigt %s zu starten und zu kontrollieren.\n"
-"\n"
-"Möchten Sie es auch nicht-administrativen Benutzern gestatten %s auf diesem Computer zu starten und zu kontrollieren?"
+msgstr "Administrative Benutzer dieses Computers werden automatisch bemächtigt %s zu starten und zu kontrollieren.\n\nMöchten Sie es auch nicht-administrativen Benutzern gestatten %s auf diesem Computer zu starten und zu kontrollieren?"
 
 #: PostInstall.cpp:1444
 #, c-format
@@ -70,9 +59,7 @@ msgstr "Berechtigungsfehler nach Neustart"
 msgid ""
 "Removal may take several minutes.\n"
 "Please be patient."
-msgstr ""
-"Das Entfernen dauert eventuell ein paar Minuten.\n"
-"Bitte warten Sie."
+msgstr "Das Entfernen dauert eventuell ein paar Minuten.\nBitte warten Sie."
 
 #: uninstall.cpp:156
 #, c-format
@@ -80,10 +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 ""
-"Sind Sie sicher das Sie %s von Ihrem Computer entfernen sollen?\n"
-"\n"
-"Diese Aktion wird alle ausführbaren Dateien aber keine Datendateien von %s entfernen."
+msgstr "Sind Sie sicher das Sie %s von Ihrem Computer entfernen sollen?\n\nDiese Aktion wird alle ausführbaren Dateien aber keine Datendateien von %s entfernen."
 
 #: uninstall.cpp:163
 #, c-format
@@ -103,9 +87,7 @@ msgstr "Benutzername"
 msgid ""
 "Do you also want to remove VirtualBox from your computer?\n"
 "(VirtualBox was installed along with BOINC.)"
-msgstr ""
-"Möchten Sie VirtualBox ebenfalls von Ihrem Computer entfernen?\n"
-"(VirtualBox wurde mit BOINC installiert)"
+msgstr "Möchten Sie VirtualBox ebenfalls von Ihrem Computer entfernen?\n(VirtualBox wurde mit BOINC installiert)"
 
 #: uninstall.cpp:312
 #, c-format
@@ -117,23 +99,14 @@ msgid ""
 "\n"
 "for each user, the file\n"
 "\"%s\"."
-msgstr ""
-"Entfernung beendet.\n"
-"\n"
-"Die folgenden Ordner sollten mit dem Finder gelöscht werden: \n"
-"das Verzeichnis \"%s\"\n"
-"\n"
-"und für jeden Benutzer die Datei\n"
-"\"%s\"."
+msgstr "Entfernung beendet.\n\nDie folgenden Ordner sollten mit dem Finder gelöscht werden: \ndas Verzeichnis \"%s\"\n\nund für jeden Benutzer die Datei\n\"%s\"."
 
 #: uninstall.cpp:840
 #, c-format
 msgid ""
 "Enter your administrator password to completely remove %s from you computer.\n"
 "\n"
-msgstr ""
-"Geben sie Ihr Administratorpasswort ein, um %s komplett von diesem Computer zu entfernen.\n"
-"\n"
+msgstr "Geben sie Ihr Administratorpasswort ein, um %s komplett von diesem Computer zu entfernen.\n\n"
 
 #: uninstall.cpp:1616
 msgid "Cancel"
@@ -142,29 +115,3 @@ msgstr "Abbrechen"
 #: uninstall.cpp:1617
 msgid "Continue..."
 msgstr "Weiter..."
-
-#, c-format
-#~ msgid "Sorry, this version of %s requires system 10.4 or higher."
-#~ msgstr ""
-#~ "Entschuldigung, diese Version von %s benötigt die Systemversion 10.4 oder "
-#~ "höher."
-
-# Die Übersetzung der Dateipfade fehlt (ich habe keinen Mac).
-#, fuzzy
-#~ msgid ""
-#~ "Removal completed.\n"
-#~ "\n"
-#~ " You may want to remove the following remaining items using the Finder: \n"
-#~ "\"/Library/Application Support/BOINC Data\" directory\n"
-#~ "\n"
-#~ "for each user, the file\n"
-#~ "\"/Users/[username]/Library/Preferences/BOINC Manager Preferences\"."
-#~ msgstr ""
-#~ "Entfernen abgeschlossen.\n"
-#~ "\n"
-#~ "Sie können jetzt die verbleibenden Dateien mit dem Finder löschen:\n"
-#~ "das \"/Library/Application Support/BOINC Data\" Verzeichnis\n"
-#~ "\n"
-#~ "für jeden Benutzer, die Datei\n"
-#~ "\"/Users/[Benutzername]/Library/Preferences/BOINC Manager Preferences\"."
-
diff --git a/locale/de/BOINC-Web.mo b/locale/de/BOINC-Web.mo
index 5b30735..17fd873 100644
Binary files a/locale/de/BOINC-Web.mo and b/locale/de/BOINC-Web.mo differ
diff --git a/locale/de/BOINC-Web.po b/locale/de/BOINC-Web.po
old mode 100755
new mode 100644
index 787a761..46bd85b
--- a/locale/de/BOINC-Web.po
+++ b/locale/de/BOINC-Web.po
@@ -1,19 +1,25 @@
-# The charset used for the text in this file (please try to use UTF-8 if possible)
+# BOINC web translation
+# Copyright (C) 2008-2009 University of California
+# 
+# This file is distributed under the same license as BOINC.
+# 
+# FileID  : $Id$
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\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:55-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: de\n"
+"PO-Revision-Date: 2015-02-13 16:05+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1396793112.0\n"
 
 #: docutil.php:21
 msgid "Search"
@@ -29,7 +35,9 @@ msgid "This page is %stranslatable%s."
 msgstr "Diese Seite ist %sübersetzbar%s."
 
 #: download.php:39
-msgid "We recommend that you also install VirtualBox, so your computer can work on science projects that require it."
+msgid ""
+"We recommend that you also install VirtualBox, so your computer can work on "
+"science projects that require it."
 msgstr "Wir empfehlen die Installation von VirtualBox. Damit kann Ihr Rechner auch an Projekten teilnehmen die dies erfordern."
 
 #: download.php:41
@@ -40,14 +48,12 @@ msgstr "Mehr über VirtualBox erfahren."
 msgid "Download BOINC + VirtualBox"
 msgstr "BOINC und VirtualBox herunterladen"
 
-#: download.php:54
-#: download.php:69
+#: download.php:54 download.php:69
 #, php-format
 msgid "for %s"
 msgstr "für %s"
 
-#: download.php:57
-#: download.php:72
+#: download.php:57 download.php:72
 #, php-format
 msgid "BOINC version %s"
 msgstr "BOINC Version %s"
@@ -57,27 +63,33 @@ msgstr "BOINC Version %s"
 msgid "VirtualBox version %s"
 msgstr "VirtualBox Version %s"
 
-# #######################################<br />
-# download.php<br />
-# #######################################
 #: download.php:67
 msgid "Download BOINC"
 msgstr "BOINC herunterladen"
 
 #: download.php:123
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others."
+msgid ""
+"BOINC is a program that lets you donate your idle computer time to science "
+"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, and many others."
 msgstr "BOINC ist ein Programm womit die ungenutzte Rechenleistung Ihres Computers, für wissenschaftliche Projekte wie SETI at home, Climateprediction.net, Rosetta at home, World Community Grid oder viele andere eingesetzt werden kann."
 
 #: download.php:125
-msgid "After installing BOINC on your computer, you can connect it to as many of these projects as you like."
+msgid ""
+"After installing BOINC on your computer, you can connect it to as many of "
+"these projects as you like."
 msgstr "Nachdem Sie BOINC auf Ihrem Computer installiert haben, können Sie so viele Projekte hinzufügen wie Sie wünschen."
 
 #: download.php:127
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
+msgid ""
+"You may run this software on a computer only if you own the computer or have"
+" the permission of its owner."
 msgstr "Sie dürfen die Software nur auf einem Computer benutzen wenn Sie der Eigentümer sind oder das Einverständnis des Besitzers haben."
 
 #: download.php:132
-msgid "We recommend that you download BOINC from the Google Play Store or Amazon Appstore, not from here."
+msgid ""
+"We recommend that you download BOINC from the Google Play Store or Amazon "
+"Appstore, not from here."
 msgstr "Wir empfehlen, BOINC über den Google Play Store oder Amazon Appstore zu installieren und nicht von hier."
 
 #: download.php:167
@@ -88,8 +100,7 @@ msgstr "Systemanforderungen"
 msgid "Release notes"
 msgstr "Versionshinweise"
 
-#: download.php:169
-#: index.php:86
+#: download.php:169 index.php:86
 msgid "Help"
 msgstr "Hilfe"
 
@@ -111,20 +122,34 @@ msgstr "BOINC: Rechenkraft für die Wissenschaft"
 
 #: help.php:12
 #, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
+msgid ""
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who"
+" can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"through the process of installing and using BOINC; %s troubleshoot any "
+"problems you might have."
 msgstr "Die BOINC Online-Hilfe ermöglicht die schnelle Hilfe von erfahrenen BOINC Benutzern, welche: %s Fragen zu BOINC und verteiltem Rechnen beantworten, %s bei der Installation und Benutzung von BOINC unterstützen, %s eventuelle Probleme untersuchen und Hilfestellungen geben."
 
 #: help.php:21
 #, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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."
+msgid ""
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system."
+" 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 "Die BOINC Online-Hilfe nutzt %sSkype%s, ein Internet-basierter Telefoniedienst. Skype ist kostenlos (die Software und die Anrufe). Wenn Sie nicht bereits Skype installiert haben, dann laden Sie es bitte herunter (%sSkype herunterladen%s) und kommen dann wieder zu dieser Seite zurück."
 
 #: help.php:28
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
+msgid ""
+"The best way to get help is by voice, for which you need either built-in "
+"microphone and speakers or an external headset for your computer.  You can "
+"also use Skype's text-based chat system or regular email (if you don't have "
+"Skype) to communicate with Help Volunteers."
 msgstr "Der beste Weg um Hilfe zu erhalten ist über Sprache, für welche sie entweder ein eingebautes Mikrofon und Lautsprecher oder ein externes Headset benötigen. Sie können ebenfalls das von Skype genutzte Text-basierende Chat-System oder eine einfache E-Mail (falls sie kein Skype besitzen) nutzen um anderen zu helfen."
 
 #: help.php:31
-msgid "Volunteers speaking several languages are available. Please select a language:"
+msgid ""
+"Volunteers speaking several languages are available. Please select a "
+"language:"
 msgstr "Freiwillige in verschiedenen Sprachen stehen zur Verfügung. Bitte wählen sie eine Sprache:"
 
 #: help.php:47
@@ -133,16 +158,22 @@ msgstr "Seien sie ein freiwilliger Helfer"
 
 #: help.php:50
 #, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
+msgid ""
+"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+"Volunteer%s.  It's a great way to help the cause of scientific research and "
+"volunteer computing - and it's fun!"
 msgstr "Wenn sie ein erfahrener BOINC Nutzer sind, bitten wir sie ein %sfreiwilliger Helfer zu werden%s. Es ist eine tolle Möglichkeit der wissenschaftlichen Forschung und dem verteilten Rechnen zu helfen - und es macht Spaß!"
 
 #: help.php:56
 #, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
+msgid ""
+"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
 msgstr "Wenn sie bereits ein freiwilliger Helfer sind, können Sie hier Ihre %sEinstellungen ändern%s."
 
 #: help_funcs.php:107
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
+msgid ""
+"BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
+"or the University of California."
 msgstr "Die Helfer von BOINC sind unbezahlte Freiwillige. Ihre Hinweise stellen keine Äußerungen von BOINC oder der Universität von Kalifornien dar."
 
 #: help_funcs.php:110
@@ -177,7 +208,6 @@ msgstr "Computer.\n"
 msgid "24-hour average:"
 msgstr "24-Stunden-Durchschnitt:"
 
-# 80%
 #: index.php:56
 msgid "PetaFLOPS."
 msgstr "PetaFLOPS."
@@ -194,9 +224,7 @@ msgstr "Helfer"
 msgid "Download"
 msgstr "Herunterladen"
 
-#: index.php:87
-#: index.php:120
-#: index.php:171
+#: index.php:87 index.php:120 index.php:171
 msgid "Documentation"
 msgstr "Dokumentation"
 
@@ -209,7 +237,10 @@ msgid "Links"
 msgstr "Verweise"
 
 #: index.php:94
-msgid "Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:"
+msgid ""
+"Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure"
+" diseases, study global warming, discover pulsars, and do many other types "
+"of scientific research.  It's safe, secure, and easy:"
 msgstr "Nutzen Sie die Leerlaufzeit Ihres Rechners (Windows, Mac, Linux oder Android) um Krankheiten zu heilen, die globale Klimaerwärmung zu studieren, Pulsare zu entdecken oder viele andere Arten von wissenschaftlicher Forschung zu unterstützen. Es ist ungefährlich, verlässlich und einfach:"
 
 #: index.php:96
@@ -226,7 +257,9 @@ msgstr "Geben Sie eine E-Mail Adresse und Passwort ein."
 
 #: index.php:102
 #, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
+msgid ""
+"Or, if you run several projects, try an %saccount manager%s such as "
+"%sGridRepublic%s or %sBAM!%s. "
 msgstr "Oder, wenn sie an verschiedenen Projekte teilnehmen, probieren sie einen %sKontomanager%s wie z.B. %sGridrepublic%s oder %sBAM!%s."
 
 #: index.php:118
@@ -238,11 +271,15 @@ msgid "Software updates"
 msgstr "Programmaktualisierungen"
 
 #: index.php:128
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving"
+" you the computing power of thousands of CPUs."
 msgstr "%1Wissenschaftler%2: benutzen Sie BOINC um ein %3Projekt für Verteiltes Rechnen%4 zu erstellen und somit die Leistung von tausenden von Prozessoren zu nutzen."
 
 #: index.php:132
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
 msgstr "%1Universitäten%2: benutzen Sie BOINC um einen virtuellen campusweiten Supercomputer zu erstellen."
 
 #: index.php:137
@@ -313,10 +350,10 @@ msgstr "Software entwickeln"
 msgid "APIs for add-on software"
 msgstr "APIs für Erweiterungs-Software"
 
-# Gesucht: kurze und einfache Übersetzungen um den Unterschied zwischen volunteer und grid darzustellen.
 #: index.php:217
 #, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
+msgid ""
+"Open-source software for %svolunteer computing%s and %sgrid computing%s."
 msgstr "Open-Source Software für %sVolunteer Computing%s und %sGrid Computing%s."
 
 #: index.php:230
@@ -327,7 +364,6 @@ msgstr "BOINC wird an der Universität von Kalifornien in Berkeley entwickelt."
 msgid "Distributed sensing"
 msgstr "Dezentrale Erfassung"
 
-# 78%
 #: projects.inc:19
 msgid "Stanford University"
 msgstr "Universität Stanford"
@@ -337,7 +373,10 @@ msgid "Seismology"
 msgstr "Erdbebenkunde"
 
 #: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
+msgid ""
+"The Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to Internet-connected computers.  You must buy a "
+"sensor to participate."
 msgstr "Das Quake-Catcher Netzwerk entwickelt das weltweit größte seismische Netzwerk mittels Sensoren an über das Internet verbundenen Rechnern. Sie müssen eventuell einen Sensor kaufen um teilnehmen zu können."
 
 #: projects.inc:27
@@ -349,23 +388,24 @@ msgid "Environmental research"
 msgstr "Umweltforschung"
 
 #: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
+msgid ""
+"This project is creating a free and continuously updated map of radiation "
+"levels by using sensors connected to volunteers' computers.  You must buy a "
+"sensor to participate."
 msgstr "Dieses Projekt erstellt eine freie und aktuelle Strahlungskarte für Radioaktive Strahlung mittels an Computern angebrachten Sensoren. Sie müssen einen Sensor kaufen um teilnehmen zu können."
 
 #: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
+msgid ""
+"To participate in these projects you must buy a sensor and attach it to your"
+" computer."
 msgstr "Um bei diesem Projekt teilzunehmen müssen Sie einen Sensor kaufen und an Ihren Computer anschließen."
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
 msgstr "kognitive Wissenschaft und künstliche Intelligenz"
 
-#: projects.inc:60
-#: projects.inc:364
-#: projects.inc:408
-#: projects.inc:457
-#: projects.inc:464
-#: projects.inc:511
+#: projects.inc:60 projects.inc:364 projects.inc:408 projects.inc:457
+#: projects.inc:464 projects.inc:511
 msgid "Private"
 msgstr "Privat"
 
@@ -374,7 +414,11 @@ msgid "Artificial intelligence"
 msgstr "Künstliche Intelligenz"
 
 #: projects.inc:62
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
+msgid ""
+"Parse and convert semantic nets for use in FreeHAL, an artificial "
+"intelligence that uses semantic networks, stemmers, part of speech "
+"databases, and part of speech taggers in order to imitate human behavior in "
+"conversations."
 msgstr "Analysiere und konvertiere semantische Netze für die Nutzung mit FreeHAL, einer Künstlichen Intelligenz, die semantische Netzwerke, Stemming-Verfahren, Wortklassen-Datenbanken und Wortklassen-Tagging verwendet, um menschliches Konversationsverhaltenzu  emulieren."
 
 #: projects.inc:69
@@ -390,7 +434,12 @@ msgid "Antimalarial drug discovery"
 msgstr "Antimalaria Medikamentenentwicklung"
 
 #: projects.inc:84
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
+msgid ""
+"The parasite that causes malaria continues to evolve resistance to available"
+" medication. We therefore urgently need to discover new drugs to replace "
+"existing drugs. Importantly, these new drugs need to target NEW proteins in "
+"the parasite. The FightMalaria at Home project is aimed at finding these new "
+"targets."
 msgstr "Der für Malaria verantwortliche Parasit entwickelt zunehmend eine Resistenz gegen bekannte Medikamente. Daher müssen dringend neue Medikamente entwickelt werden. Vor allem müssen weitere Proteine des Parasiten als Angriffspunkte identifiziert werden. Ziel des FightMalaria at Home Projekts ist es, diese neuen Angriffspunkte zu identifizieren."
 
 #: projects.inc:90
@@ -402,7 +451,12 @@ msgid "Protein structure prediction"
 msgstr "Vorhersage von Proteinstrukturen"
 
 #: projects.inc:92
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
+msgid ""
+"POEM at HOME uses a computational approach to predict the biologically active "
+"structure of proteins, to understand the signal-processing mechanisms when "
+"the proteins interact with one another, to understand diseases related to "
+"protein malfunction or aggregation, and to develop new drugs on the basis of"
+" the three-dimensions structure of biologically important proteins."
 msgstr "POEM at HOME verwendet einen computergestützten Ansatz zur Vorhersage der biologisch aktiven Struktur von Proteinen, zur Erweiterung des Verständnisses der Signalverarbeitungsmechanismen bei der Interaktion mehrerer Proteine, von Krankheiten mit Proteindysfunktion oder -Agglomeration sowie um neue Medikamente auf Basis der dreidimensionalen Struktur biologisch bedeutsamer Proteinen zu entwickeln."
 
 #: projects.inc:98
@@ -414,7 +468,11 @@ msgid "Study of protein - ligand interactions"
 msgstr "Untersuchen der Protein-Ligand-Interaktionen"
 
 #: projects.inc:100
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
+msgid ""
+"Docking at Home has both bioscience and computer science goals. The project "
+"aims to further knowledge of the atomic details of protein-ligand "
+"interactions and, by doing so, will search for insights into the discovery "
+"of novel pharmaceuticals."
 msgstr "Docking at Home verfolgt biowissenschatliche und informatikrelevante Ziele. Das Projekt zielt auf die Erweiterung des Wissen über die atomaren Einzelheiten von Protein-Ligand-Interaktionen und strebt in diesem Zuge Einblicke an, die der Entwicklung neuer Arzneimittel dienen können."
 
 #: projects.inc:114
@@ -426,7 +484,11 @@ msgid "Molecular simulations of proteins"
 msgstr "Molekularsimulationen von Proteinen"
 
 #: projects.inc:116
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
+msgid ""
+"GPUGrid.net opens novel computational scenarios by the first full-atom "
+"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
+"New biomedical applications suddenly become possible giving a new role to "
+"computational biology for biomedical research."
 msgstr "GPUGrid.net eröffnet neue rechnergestützte Szenarios mit der ersten Anwendung für Molekulardynamik auf Atomebene (CellMD), optimiert für NVIDIA GPUs. Dadurch sind neue biomedizinische Anwendungen möglich, die eine neu Rolle in der  Bioinformatik und der biomedizinischen Forschung spielen werden."
 
 #: projects.inc:122
@@ -438,11 +500,15 @@ msgid "Genetic linkage analysis"
 msgstr "Genetische Bindungsanalyse"
 
 #: projects.inc:124
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
+msgid ""
+"Superlink at Technion helps geneticists all over the world find disease-"
+"provoking genes causing some types of diabetes, hypertension (high blood "
+"pressure), cancer, schizophrenia and many others."
 msgstr "Superlink at Technion hilft Genetikern auf der ganzen Welt Krankheits-provozierende Gene zu finden, die manche Arten von Diabetes, hohen Blutdruck, Krebs, Schizophrenie und viele andere Krankheiten, auslösen."
 
 #: projects.inc:138
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
+msgid ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
 msgstr "University of Maryland, Zentrum für Bioinformatik und Rechenbetonte Biologie"
 
 #: projects.inc:139
@@ -450,7 +516,11 @@ msgid "Life science research"
 msgstr "Biowissenschaftliche Forschung"
 
 #: projects.inc:140
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
+msgid ""
+"The Lattice Project supplies computing power to scientists at the University"
+" of Maryland studying evolutionary relationships based on DNA sequence data;"
+" bacterial, plasmid, and virus protein sequences; and biological diversity "
+"in nature reserves. "
 msgstr "DasLattice Projekt liefert Rechenkraft an Wissenschaftler der University of Maryland, die evolutionäre Beziehungen basierend auf DNA Sequenzdaten, Bakterien-, Plasmid-, und Viren Protein Sequenzen und Biologische Vielfalt in Naturschutzgebieten, studieren."
 
 #: projects.inc:146
@@ -462,20 +532,32 @@ msgid "Epidemiology"
 msgstr "Epidemiologie"
 
 #: projects.inc:148
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
+msgid ""
+"Simulation models of the transmission dynamics and health effects of malaria"
+" are an important tool for malaria control. They can be used to determine "
+"optimal strategies for delivering mosquito nets, chemotherapy, or new "
+"vaccines which are currently under development and testing.  Such modeling "
+"is extremely computer intensive, requiring simulations of large human "
+"populations with a diverse set of parameters related to biological and "
+"social factors that influence the distribution of the disease. "
 msgstr "Simulationsmodelle der Transmissionsdynamik und gesundheitlichen Auswirkungen von Malaria sind ein wichtiges Werkzeug für die Kontrolle von Malaria. Diese können verwendet werden um optimale Strategien auszuarbeiten um Moskitonetze zu liefern, Chemotherapie oder neue Impfstoffe hervorbringen welche im Moment noch in Entwicklung sind und getestet werden. Solche Modellierungen sind extrem rechenintensiv, benötigen Simulationen von größeren Bevölkerungsmengen mit diversen Sets von P [...]
 
 #: projects.inc:170
 msgid "University of Washington"
 msgstr "Universität von Washington"
 
-#: projects.inc:171
-#: projects.inc:179
+#: projects.inc:171 projects.inc:179
 msgid "Biology"
 msgstr "Biologie"
 
 #: projects.inc:172
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
+msgid ""
+"Determine the 3-dimensional shapes of proteins in research that may "
+"ultimately lead to finding cures for some major human diseases. By running "
+"Rosetta at home you will help us speed up and extend our research in ways we "
+"couldn't possibly attempt without your help. You will also be helping our "
+"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
+"Cancer, and Alzheimer's"
 msgstr "Bestimmen Sie die 3-dimensionalen Formen von Proteinen in der Forschung, die letztlich zur Erforschung von Heilverfahren für einige wichtige Krankheiten des Menschen führen können. Durch die Ausführung von Rosetta at home werden Sie uns helfen das ganze zu beschleunigen und unsere Forschung zu erweitern, wie wir es ohne Ihre Mithilfe nicht erst versuchen könnten. Sie werden auch helfen, unsere Anstrengungen bei der Entwicklung neuer Proteine​​, um Krankheiten wie HIV, Malaria, Krebs [...]
 
 #: projects.inc:178
@@ -483,7 +565,10 @@ msgid "University of Vienna"
 msgstr "Universität Wien"
 
 #: projects.inc:180
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
+msgid ""
+"Calculate similarities between proteins. SIMAP provides a public database of"
+" the resulting data, which plays a key role in many bioinformatics research "
+"projects."
 msgstr "Berechne Ahnlichkeiten zwischen Proteinen. SIMAP stellt eine öffentliche Datenbank der Ergebnisdaten, welche eine wichtige Rolle in vielen Forschungsprojekten der Bioinformatik spielen, zur Verfügung."
 
 #: projects.inc:186
@@ -499,7 +584,15 @@ msgid "Climate study"
 msgstr "Klimastudien"
 
 #: projects.inc:200
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
+msgid ""
+"Investigate the approximations that have to be made in state-of-the-art "
+"climate models. By running the model thousands of times we hope to find out "
+"how the model responds to slight tweaks to these approximations - slight "
+"enough to not make the approximations any less realistic. This will allow us"
+" to improve our understanding of how sensitive our models are to small "
+"changes and also to things like changes in carbon dioxide and the sulphur "
+"cycle. This will allow us to explore how climate may change in the next "
+"century under a wide range of different scenarios."
 msgstr "Berechne die Näherungen die für die modernen Klima Modelle gemacht werden müssen. Vom tausendfachen Durchrechnen erhoffen wir uns herauszufinden, wie das Modell aus minimale Änderungen dieser Näherungen reagiert - so minimal, dass die Näherungen nicht unrealistisch werden. Das wird uns ermöglichen unser Verständnis über die Sensibilität unsere Modelle auf kleine Veränderungen und auch Dinge wie Veränderungen im CO2- und Schwefel-Kreislauf zu vergrößern. Dies wird uns erlauben zu  [...]
 
 #: projects.inc:207
@@ -511,39 +604,56 @@ msgid "Mechanical engineering"
 msgstr "Maschinenbau"
 
 #: projects.inc:214
-msgid "Currently we are calculating the optimum design of a structure call the 52 bar truss"
+msgid ""
+"Currently we are calculating the optimum design of a structure call the 52 "
+"bar truss"
 msgstr "Im Moment berrechnen wir das optimale Design der 52 bar Bindung."
 
-#: projects.inc:224
-#: projects.inc:263
-#: projects.inc:271
+#: projects.inc:224 projects.inc:263 projects.inc:271
 msgid "Astronomy"
 msgstr "Astronomie"
 
 #: projects.inc:225
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
+msgid ""
+"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
+"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
+"Universe. We will measure physical parameters (such as stellar mass surface "
+"density, star formation rate surface density, attenuation, and first-order "
+"star formation history) on a resolved pixel-by-pixel basis using spectral "
+"energy distribution (SED) fitting techniques in a distributed computing "
+"mode."
 msgstr "Wir werden die spektrale Abdeckung von GALEX, Pan-STARRS1, und WISE  benutzen um eine Multi-Wellenlängen-UV-optischen-NIR Galaxy Atlas für das nahe gelegene Universum zu generieren. Wir werden physikalische Parameter (wie Sternmasse Flächendichte, Sternbildungsrate Flächendichte und die Sternenordnung) auf einem aufgelösten Pixel-für-Pixel-Basis, mit spektralen Energieverteilung (SED) über einen verteilten Computer Basierendes Netzwerk messen."
 
 #: projects.inc:247
 msgid "University of Texas at Austin"
 msgstr "Universität von Texas in Austin"
 
-#: projects.inc:248
-#: projects.inc:279
+#: projects.inc:248 projects.inc:279
 msgid "Chemistry"
 msgstr "Chemie"
 
 #: projects.inc:249
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
+msgid ""
+"A common problem in theoretical chemistry, condensed matter physics and "
+"materials science is the calculation of the time evolution of an atomic "
+"scale system where, for example, chemical reactions and/or diffusion occur. "
+"Generally the events of interest are quite rare (many orders of magnitude "
+"slower than the vibrational movements of the atoms), and therefore direct "
+"simulations, tracking every movement of the atoms, would take thousands of "
+"years of computer calculations on the fastest present day computer before a "
+"single event of interest can be expected to occur.  Our research group is "
+"interested in calculating the long time dynamics of systems."
 msgstr "Ein bekanntes Problem der theoretischen Chemie, der Physik dichter Materie und der Materialwissenschaft ist die Berechnung der Zeitentwicklung eines Systems auf atomarer Ebene, bei dem beispielsweise chemische Reaktionen und/oder Diffusionen auftreten. Im Allgemeinen sind die interessanten Ereignisse äußerst selten (um mehrere Größenordnungen langsamer als die Schwingungsbewegungen der Atome). Dafür bräuchten tatsächliche Simulationen, die jede Bewegung der Atome aufzeichnen, tau [...]
 
-# 95%
 #: projects.inc:262
 msgid "University of Illinois at Urbana-Champaign"
 msgstr "Universität von Illinois in Urbana (bei Champaign)"
 
 #: projects.inc:264
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
+msgid ""
+"The goal of Cosmology at Home is to search for the model that best describes "
+"our Universe and to find the range of models that agree with the available "
+"astronomical particle physics data."
 msgstr "Das Ziel von Cosmology at Home ist es ein Modell zu suchen, welches unser Universum am besten beschreibt und eine Auswahl von Modellen zu finden, welche mit den verfügbaren astronomischen partikelphysischen Daten übereinstimmt."
 
 #: projects.inc:270
@@ -551,7 +661,10 @@ msgid "Rensselaer Polytechnic Institute"
 msgstr "politechnisches Institut von Rensselaer"
 
 #: projects.inc:272
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
+msgid ""
+"The goal of Milkyway at Home is to create a highly accurate three dimensional "
+"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
+"Survey."
 msgstr "Das Ziel von Milkyway at Home ist es ein sehr genaues dreidimensionales Modell der Milchstraße mit Hilfe von Daten, die man vom Sloan Digital Sky Survey erhalten hat, herzustellen."
 
 #: projects.inc:278
@@ -559,7 +672,13 @@ msgid "Leiden University, The Netherlands"
 msgstr "Leiden Universität, Niederlande"
 
 #: projects.inc:280
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
+msgid ""
+"Surface science calculations using Classical Dynamics.  Leiden Classical "
+"allows volunteers, students and other scientist to submit their personal "
+"calculations to the grid. Each user has his own personal queue for Classical"
+" Dynamics jobs. In this way students have used the grid to simulate liquid "
+"argon, or to test the validity of the ideal gas law by actually doing the "
+"simulations through the grid."
 msgstr "Berechnungen der Oberflächenforschung mit der klassichen Dynamik. Leiden Classical erlaubt es Freiwilligen, Studenten und anderen Wissenschaftlern ihre eigenen Berechnungen in das Rechennetz einzuspeisen. Jeder Anwender hat seine eigene Schlange von Arbeiten für das Projekt. Auf diese Weise haben Studenten das Rechennetz genutzt um flüssiges Argon zu simulieren oder das Gesetz des idealen Gases durch Simulationen mit Hilfe des Rechennetzes zu beweisen."
 
 #: projects.inc:294
@@ -571,25 +690,36 @@ msgid "Astrophysics"
 msgstr "Astrophysik"
 
 #: projects.inc:296
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
+msgid ""
+"Search for spinning neutron stars (also called pulsars) using data from the "
+"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
+"observatory.  Einstein at Home is a World Year of Physics 2005 project "
+"supported by the American Physical Society (APS) and by a number of "
+"international organizations."
 msgstr "Suche nach rotierenden Neutronensternen (auch Pulsare genannt) unter Verwendung von Daten der LIGO und GEO Gravitationswellen-Detektoren sowie dem Arecibo Radioteleskop. Einstein at Home ist ein \"World Year of Physics 2005\" Projekt, welches von der American Physical Society (APS) und von verschiedenen internationalen Organisationen unterstützt wird."
 
-#: projects.inc:310
-#: projects.inc:318
+#: projects.inc:310 projects.inc:318
 msgid "CERN (European Organization for Nuclear Research)"
 msgstr "CERN (Europäische Organisation für Nuklearforschung)"
 
-#: projects.inc:311
-#: projects.inc:319
+#: projects.inc:311 projects.inc:319
 msgid "Physics"
 msgstr "Physik"
 
 #: projects.inc:312
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
+msgid ""
+"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
+"European Organization for Nuclear Research, the world's largest particle "
+"physics laboratory.  It is the most powerful instrument ever built to "
+"investigate on particles proprieties. LHC at home runs simulations to improve "
+"the design of LHC and its detectors."
 msgstr "Der Large Hadron Collider (LHC) ist ein Teilchenbeschleuniger beim CERN, der europäischen Organisation für Nuklearforschung, das weltgrößte Partikelphysiklabor. Es ist das leistungsstärkste bis jetzt gebaute Gerät, um das Partikelverhalten zu untersuchen. LHC at home führt Simulationen aus, um die Bauform des LHC und seine Detektoren zu verbessern."
 
 #: projects.inc:320
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
+msgid ""
+"This project uses CERN-developed virtual machine technology for full-fledged"
+" LHC event physics simulation on volunteer computers.  Requires that you "
+"install VirtualBox on your computer"
 msgstr "Dieses Projekt nutzt eine vom CERN entwickelte Virtuelle-Maschinen Technologie zur Simulation von LHC Ereignissen auf den Computern von freiwilligen Unterstützern. Sie müssen VirtualBox auf Ihrem Computer installiert haben um teilzunehmen."
 
 #: projects.inc:326
@@ -601,7 +731,12 @@ msgid "Astrophysics, astrobiology"
 msgstr "Astrophysik, Astrobiologie"
 
 #: projects.inc:328
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
+msgid ""
+"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
+"goal is to detect intelligent life outside Earth. One approach, known as "
+"radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
+"signals from space. Such signals are not known to occur naturally, so a "
+"detection would provide evidence of extraterrestrial technology."
 msgstr "SETI (Search for Extraterrestrial Intelligence) ist ein Bereich der Wissenschaft mit dem Ziel Leben ausserhalb der Erde zu finden. Eine Methode, bekannt als Radio-SETI, benutzt Radio Teleskope, um Signale von geringer Bandbreite aus dem Weltall aufzuspüren. Es sind keine natürlichen Quellen für solche Strahlung bekannt, daher wäre sie der Beweis für außerirdische Technologie."
 
 #: projects.inc:342
@@ -613,7 +748,11 @@ msgid "Chemical engineering and nanotechnology"
 msgstr "Chemietechnik und Nanotechnologie"
 
 #: projects.inc:344
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
+msgid ""
+"The study of molecular magnets and controlled nanoscale magnetism.  These "
+"magnetic molecules may be used to develop tiny magnetic switches, with "
+"applications in medicine (such as local tumor chemotherapy) and "
+"biotechnology."
 msgstr "Die Forschung für Molekular-Magneten und Magnetismus auf Nano-Ebene. Diese Magnetischen Moleküle könnten benutzt werden um winzige Magnet-Schalter zu entwickeln, die Anwendung in der Medizin( z.B. in der lokalen Therapierung von Tumoren durch Chemotherapie) und Biotechnologie."
 
 #: projects.inc:351
@@ -629,7 +768,10 @@ msgid "Physics, biochemistry, and others"
 msgstr "Physik, Biochemie und weitere"
 
 #: projects.inc:358
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
+msgid ""
+"The objective of CAS at home is to encourage and assist scientists in China to "
+"adopt the technologies of volunteer computing and volunteer thinking for "
+"their research."
 msgstr "Das Ziel von CAS at home ist die Förderung und Unterstützung der Wissenschaftler in China sich die Technologie der freiwilligen Mithilfe und Datenverarbeitung für Ihre Forschung anzueignen."
 
 #: projects.inc:365
@@ -637,11 +779,12 @@ msgid "Mathematics, physics, evolution"
 msgstr "Mathematik, Physik, Evolution"
 
 #: projects.inc:366
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
+msgid ""
+"Yoyo at home is an adapter between BOINC and several existing volunteer "
+"computing projects: ECM, Muon, Evolution at home, and distributed.net"
 msgstr "Yoyo at home ist ein Adapter zwischen BOINC und einigen existierenden verteiltes Rechnen Projekten: ECM, Muon, Evolution at home und distributed.net."
 
-#: projects.inc:371
-#: projects.inc:527
+#: projects.inc:371 projects.inc:527
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 msgstr "MTA-SZTAKI - Labor für Parallele und Verteilte Systeme (Ungarn)"
 
@@ -650,7 +793,11 @@ msgid "European research projects"
 msgstr "Europäische Forschungsprojekte"
 
 #: projects.inc:373
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
+msgid ""
+"The EDGeS at Home Beta project integrates volunteer computing into the service "
+"grid network of Europe by allowing service grids to send workunits to be "
+"processed by the volunteers of this project. The scientific projects covered"
+" by the project include math, physics, biology, etc."
 msgstr "Das EDGeS at home Beta Projekt integriert freiwillige Berechnungen in das Service-Grid-Netzwerk Europas, indem es Service-Grids ermöglicht wird Arbeitseinheiten von Freiwilligen ausführen zu lassen. Die wissenschaftlichen Projekte, die von dem Projekt abgedeckt werden beinhalten Mathematik, Physik, Biologie, u.a.."
 
 #: projects.inc:379
@@ -674,7 +821,11 @@ msgid "Medical, environmental and other humanitarian research"
 msgstr "Medizin, Ökologie und andere Philanthropische Forschungen"
 
 #: projects.inc:389
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
+msgid ""
+"To further critical non-profit research on some of humanity's most pressing "
+"problems by creating the world's largest volunteer computing grid.  Research"
+" includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"clean water and many more."
 msgstr "Erstellt das weltweit größte Netzwerk des Verteilten Rechnens um entscheidende gemeinnützige Forschung in den dringendsten Problemen der Menschheit zu fördern.  Dies betrifft unter anderem HIV-Aids, Krebs, tropische und vernachlässigte Krankheiten, Solarenergie, sauberes Wasser und vieles mehr."
 
 #: projects.inc:395
@@ -693,21 +844,18 @@ msgstr "Mathematik, Physik, künstliche Intelligenz"
 msgid "Simulation of quantum computing; Goldbach's conjecture."
 msgstr "Simulation von Quanteneffekten, Goldbach's Vermutung"
 
-#: projects.inc:450
-#: projects.inc:458
+#: projects.inc:450 projects.inc:458
 msgid "Cryptography"
 msgstr "Kryptographie"
 
 #: projects.inc:459
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
+msgid ""
+"Attempt to decode 3 original Enigma messages. The signals were intercepted "
+"in the North Atlantic in 1942 and are believed to be unbroken."
 msgstr "Der Versuch drei original Enigma Nachrichten zu entschlüsseln. Die Signale wurden 1942 im Nordatlantik abgefangen und es wird angenommen, dass sie noch nicht geknackt wurden."
 
-#: projects.inc:465
-#: projects.inc:504
-#: projects.inc:512
-#: projects.inc:520
-#: projects.inc:528
-#: projects.inc:568
+#: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
+#: projects.inc:528 projects.inc:568
 msgid "Mathematics"
 msgstr "Mathematik"
 
@@ -724,11 +872,19 @@ msgid "Factorization of large integers"
 msgstr "Faktorisierung großer natürlicher Zahlen"
 
 #: projects.inc:473
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
+msgid ""
+"NFS at Home is a research project that uses Internet-connected computers to do "
+"the lattice sieving step in the Number Field Sieve factorization of large "
+"integers. As a young school student, you gained your first experience at "
+"breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
+"NFS at Home is a continuation of that experience, only with integers that are "
+"hundreds of digits long."
 msgstr "NFS at Home ist ein Forschungsprojekt welches die mit dem Internet verbundenen Computer dazu benutzt eine schrittweise Primfaktorzerlegung einer großen ganzen Zahl durchzuführen. Als junger Schüler hast du deine ersten Erfahrung damit gemacht ganze Zahlen in Primzahlfaktoren zu zerlegen, wie 15= 3+5 oder 35= 5*7. NFS at Home setzt diese Erfahrung fort, lediglich mit ganzen Zahlen welche hunderte von Stellen lang sind."
 
 #: projects.inc:479
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
+msgid ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
 msgstr "Technische Gediminas-Universität Vilnius und der Technischen Universität Kaunas in Litauen"
 
 #: projects.inc:480
@@ -736,7 +892,11 @@ msgid "Software testing"
 msgstr "Software tests"
 
 #: projects.inc:481
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
+msgid ""
+"The aim of this project is to provide a powerful distributed computing "
+"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
+"well as others Lithuanian academic institutions.  Current applications "
+"involve the study of Monte-Carlo based software testing."
 msgstr "Das Ziel dieses Projekts ist die Bereitstellung einer leistungstarken Verteiltes-Rechnen-Plattform für Wissenschaftler der Technischen Gediminas-Universität in Vilnius und für andere akademische Institute Litauens. Derzeitige Anwendungen beinhalten die Erforschung von Monte-Carlo-basierten Softwaretests. "
 
 #: projects.inc:503
@@ -744,11 +904,20 @@ msgid "Mathematical Institute of Leiden University / Kennislink"
 msgstr "Mathematisches Institut der Universität Leiden / Kennislink"
 
 #: projects.inc:505
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
+msgid ""
+"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
+"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
+"product of the distinct prime factors of n. The ABC conjecture says that "
+"there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for "
+"any real h > 1. The ABC conjecture is currently one of the greatest open "
+"problems in mathematics. If it is proven to be true, a lot of other open "
+"problems can be answered directly from it."
 msgstr "Suche nach \"ABC-Tripeln\": Positive Zahlen a,b,c; zum Beispiel a+b=c, a < b < c, a,b,c haben keinen gemeinsamen Divisor und c sei größer als als rad(abc), wobei rad(n) das Produkt verschiedener Primzahlfaktoren von n ist. Die ABC-VErmutung sagt aus, dass es nur eine begrenzte Anzahl von a,b,c gibt, die log(c)/log(rad(abc))>h für alle reellen h>1 erfüllen. Die ABC-Vermutung ist zur Zeit eines der größten bekannten Probleme der Mathematik. Sollte sie bewiesen werden, können  [...]
 
 #: projects.inc:513
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
+msgid ""
+"Primegrid has multiple projects searching for different forms of very large "
+"prime numbers, including searching for the largest known prime number."
 msgstr "Primegrid bietet mehrere Projekte für die unterschiedlichen Formen von sehr großen Primzahlen, inklusive der Suche nach der größten bekannten Primzahl."
 
 #: projects.inc:519
@@ -756,11 +925,15 @@ msgid "Hochschule RheinMain University of Applied Sciences"
 msgstr "Hochschule RheinMain Universität der Angewandten Wissenschaften"
 
 #: projects.inc:521
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
+msgid ""
+"Search for counterexamples to two conjectures related to the identification "
+"of prime numbers"
 msgstr "Suche nach Gegenbeispielen für zwei Vermutungen die sich auf die Identifizierung von Primzahlen beziehen"
 
 #: projects.inc:529
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
+msgid ""
+"Find all the generalized binary number systems (in which bases are matrices "
+"and digits are vectors) up to dimension 11."
 msgstr "Finde alle verallgemeinerten binären Zahlensysteme (in denen Basen Matrizen und Zeichen Vektoren sind) bis zur Dimension 11."
 
 #: ../html/inc/news.inc:40
@@ -771,170 +944,3 @@ msgstr "Kommentieren"
 #, php-format
 msgid "News is available as an %sRSS feed%s"
 msgstr "Nachrichten auch als %sRSS feed%s erhältlich"
-
-# 75%
-#~ msgid "Astronomy, Physics, and Chemistry"
-#~ msgstr "Astronomie, Physik und Chemie"
-#~ msgid "Download BOINC + Virtualbox"
-#~ msgstr "BOINC und VirtualBox herunterladen"
-#, php-format
-#~ msgid "%s for %s (%s MB)"
-#~ msgstr "%s für %s (%s MB)"
-#~ msgid ""
-#~ "BOINC is a program that lets you donate your idle computer time to science "
-#~ "projects like SETI at home, Climateprediction.net, Rosetta at home, World "
-#~ "Community Grid, and many others. <p> After installing BOINC on your "
-#~ "computer, you can connect it to as many of these projects as you like."
-#~ msgstr ""
-#~ "BOINC ist ein Programm das Ihnen ermöglicht Computerzeit für "
-#~ "wissenschaftliche Projekte - wie SETI at home, Climateprediction.net, "
-#~ "Rosetta at home, World Community Grid und viele andere - zur Verfügung zu "
-#~ "stellen. <p> Nach der Installation von BOINC auf Ihrem Computer, können Sie "
-#~ "diesen mit so vielen Projekten verbinden wie sie wollen."
-#~ msgid "Browser default"
-#~ msgstr "Browserstandard"
-
-#, php-format
-#~ msgid ""
-#~ " Use the idle time on your computer (Windows, Mac, or Linux) to cure "
-#~ "diseases, study global warming, discover pulsars, and do many other types of "
-#~ "scientific research.  It's safe, secure, and easy:  %sChoose%s projects  "
-#~ "%sDownload%s and run BOINC software  %sEnter%s an email address and "
-#~ "password. "
-#~ msgstr ""
-#~ "Nutzen sie die Leerlaufzeit ihres Computers (Windows, Mac oder Linux) um "
-#~ "Krankheiten zu heilen, globale Erwärmung zu untersuchen, Pulsare zu "
-#~ "erforschen und vielen andere Arten der wissenschaftlichen Forschung "
-#~ "nachzugehen. Es ist gefahrlos, sicher und einfach: %sProjekt wählen%s %"
-#~ "sBOINC Software herunterladen%s und ausführen. %sEintragen von%s E-Mail-"
-#~ "Adresse und Passwort."
-
-# Was ist mit "IBM Öffentlichkeitsarbeit"?
-#, fuzzy
-#~ msgid "IBM Corporate Community Relations"
-#~ msgstr "IBM Öffentlichkeitsarbeit"
-#~ msgid "Humanitarian research on disease, natural disasters and hunger."
-#~ msgstr ""
-#~ "Humanitäre Forschung im Bereich von Krankheiten, Naturkatastrophen und "
-#~ "Hungersnöten."
-#~ msgid ""
-#~ "To further critical non-profit research on some of humanity's most "
-#~ "pressing problems by creating the world's largest volunteer computing "
-#~ "grid.  Research includes HIV/AIDS, cancer, muscular dystrophy, dengue "
-#~ "fever, and many more."
-#~ msgstr ""
-#~ "Für weitere wichtige Non-Profit-Forschung an den die Menschheit am "
-#~ "meisten bedrückenden Problemen, indem man das weltweit größte Netz "
-#~ "freiwillige Rechner erstellt. Die Forschung beinhaltet HIV/AIDS, Krebs, "
-#~ "Muskeldystrophie, Dengue Fieber und viele weitere Krankheiten und andere "
-#~ "Probleme."
-#~ msgid ""
-#~ "Primegrid is generating a public sequential prime number database, and is "
-#~ "searching for large twin primes of the form k*2<sup>n</sup>+1 and "
-#~ "k*2<sup>n</sup>-1"
-#~ msgstr ""
-#~ "Primegrid erstellt eine öffentlich sequentielle Primzahl-Datenbank, und "
-#~ "sucht nach großen Primzahlzwillingen der Form k*2<sup>n</sup>+1 and "
-#~ "k*2<sup>n</sup>-1"
-#~ msgid "FreeHAL"
-#~ msgstr "FreeHAL"
-#~ msgid "private"
-#~ msgstr "privat"
-#~ msgid "POEM at HOME"
-#~ msgstr "POEM at HOME"
-#~ msgid "Docking at Home"
-#~ msgstr "Docking at Home"
-#~ msgid "GPUGrid.net"
-#~ msgstr "GPUGrid.net"
-#~ msgid "Superlink at Technion"
-#~ msgstr "Superlink at Technion"
-#~ msgid "The Lattice Project"
-#~ msgstr "Das Lattice Projekt"
-#~ msgid "Malariacontrol.net"
-#~ msgstr "Malariacontrol.net"
-#~ msgid "Rosetta at home"
-#~ msgstr "Rosetta at home"
-#~ msgid "SIMAP"
-#~ msgstr "SIMAP"
-#~ msgid "Virtual Prairie"
-#~ msgstr "Virtuelle Prärie"
-#~ msgid "University of Houston"
-#~ msgstr "Universität von Houston"
-#~ msgid "Study of botanical ecosystems"
-#~ msgstr "Studium der botanischen Ökosysteme"
-#~ msgid ""
-#~ "Provide ecological guidelines on the design of prairies with the best "
-#~ "potential for water purification."
-#~ msgstr ""
-#~ "Stelle ökologische Richtlinen für die Gestaltung von Prärien, mit dem "
-#~ "höchsten Potential für Wasserreinigung, zur Verfügung."
-#~ msgid "Climateprediction.net"
-#~ msgstr "Climateprediction.net"
-#~ msgid "Astronomy/Physics/Chemistry"
-#~ msgstr "Astronomie/Physik/Chemie"
-#~ msgid "eOn"
-#~ msgstr "eOn"
-#~ msgid "Orbit at home"
-#~ msgstr "Orbit at home"
-#~ msgid "Planetary Science Institute"
-#~ msgstr ""
-#~ "Planetary Science Institute (Institut für planetarische Wissenschaft)"
-#~ msgid "Monitor and study the hazard posed by near-Earth asteroids"
-#~ msgstr ""
-#~ "Überwachung und Untersuchung der Gefährdung durch erdnahe Asteroiden"
-#~ msgid "Cosmology at Home"
-#~ msgstr "Cosmology at Home"
-#~ msgid "University of Illinois at Urbana-Chamapign"
-#~ msgstr "Universität von Illinois in Urbana (bei Champaign)"
-#~ msgid "Milkyway at home"
-#~ msgstr "Milkyway at home"
-#~ msgid "Leiden Classical"
-#~ msgstr "Leiden Classical"
-#~ msgid "uFluids at home"
-#~ msgstr "uFluids at home"
-#~ msgid "Purdue University"
-#~ msgstr "Universität Purdue"
-#~ msgid "Physics/Aeronautics"
-#~ msgstr "Physik/Luft- und Raumfahrt"
-#~ msgid ""
-#~ "The uFluids project simulates two-phase fluid behavior in microgravity "
-#~ "and microfluidics problems. Our goal is to design better satellite "
-#~ "propellant management devices and address two-phase flow in microchannel "
-#~ "and MEMS devices."
-#~ msgstr ""
-#~ "Das µFluids-Projekt simuliert das Verhalten von Zwei-Phasen-Fluiden "
-#~ "unter Mikrogravitation und Mikrofluid-Probleme. Unser Ziel ist eine "
-#~ "Verbesserung von Geräten zur Steuerung von Satellitenantrieben und die "
-#~ "Zwei-Phasen-Strömung in Mikrokanälen und MEMS-Geräten anzugehen."
-#~ msgid "Einstein at home"
-#~ msgstr "Einstein at home"
-#~ msgid "LHC at home"
-#~ msgstr "LHC at home"
-#~ msgid "SETI at home"
-#~ msgstr "SETI at home"
-#~ msgid "Quantum Monte Carlo at Home"
-#~ msgstr "Quantum Monte Carlo at Home"
-#~ msgid "University of Muenster (Germany)"
-#~ msgstr "Universität Münster (Deutschland)"
-#~ msgid ""
-#~ "Study the structure and reactivity of molecules using Quantum Chemistry."
-#~ msgstr ""
-#~ "Untersucht die Struktur und die Reaktionsfähigkeit von Molekülen mittels "
-#~ "Quantenchemie."
-#~ msgid "Spinhenge at home"
-#~ msgstr "Spinhenge at home"
-#~ msgid "CAS at home"
-#~ msgstr "CAS at home"
-#~ msgid "Yoyo at home"
-#~ msgstr "Yoyo at home"
-#~ msgid "EDGeS at Home"
-#~ msgstr "EDGeS at Home"
-#~ msgid "Ibercivis"
-#~ msgstr "Ibercivis"
-#~ msgid "World Community Grid"
-#~ msgstr "World Community Grid"
-#~ msgid "Enigma at Home"
-#~ msgstr "Enigma at Home"
-#~ msgid "Collatz Conjecture"
-#~ msgstr "Collatz Conjecture"
-
diff --git a/locale/el/BOINC-Client.mo b/locale/el/BOINC-Client.mo
index 18403bd..11e53de 100644
Binary files a/locale/el/BOINC-Client.mo and b/locale/el/BOINC-Client.mo differ
diff --git a/locale/el/BOINC-Client.po b/locale/el/BOINC-Client.po
index 60b8b76..b8dfba4 100755
--- a/locale/el/BOINC-Client.po
+++ b/locale/el/BOINC-Client.po
@@ -4,20 +4,20 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-10-15 22:25-0700\n"
-"PO-Revision-Date: 2015-02-10 15: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"
+"PO-Revision-Date: 2010-11-26 20:50+0200\n"
+"Last-Translator: chris g <chr1407 at hotmail.com>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.1.6\n"
 
-#: acct_mgr.cpp:450
-#: acct_mgr.cpp:459
+#: acct_mgr.cpp:450 acct_mgr.cpp:459
 #, fuzzy
 msgid "Message from account manager"
 msgstr "Μήνυμα απο το διακομιστή του έργου:"
@@ -28,12 +28,16 @@ msgid "Message from server"
 msgstr "Μήνυμα απο το διακομιστή του έργου:"
 
 #: client_state.cpp:258
-msgid "Some tasks need more memory than allowed by your preferences.  Please check the preferences."
+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 "Δεν μπρόρεσε να γίνει εγγραφή του αρχείου κατάστασης, παρακαλώ ελέγξτε τα δικαιώματα καταλόγου"
+msgstr ""
+"Δεν μπρόρεσε να γίνει εγγραφή του αρχείου κατάστασης, παρακαλώ ελέγξτε τα "
+"δικαιώματα καταλόγου"
 
 #: cs_cmdline.cpp:303
 msgid "The HTTP_PROXY environment variable must specify an HTTP proxy"
@@ -41,11 +45,14 @@ msgstr "Η HTTP_PROXY μεταβλητή πρέπει να προσδιορίσ
 
 #: cs_scheduler.cpp:613
 #, c-format
-msgid "You used the wrong URL for this project.  When convenient, remove this project, then add %s"
-msgstr "Χρησιμοποιήσατε λανθασμένη ηλεκτρονική διεύθυνση. Όταν θα ευκαιρίσετε, αφαιρέστε αυτό το έργο και μετά προσθέστε %s"
+msgid ""
+"You used the wrong URL for this project.  When convenient, remove this "
+"project, then add %s"
+msgstr ""
+"Χρησιμοποιήσατε λανθασμένη ηλεκτρονική διεύθυνση. Όταν θα ευκαιρίσετε, "
+"αφαιρέστε αυτό το έργο και μετά προσθέστε %s"
 
-#: cs_statefile.cpp:828
-#: ../sched/sched_types.cpp:259
+#: cs_statefile.cpp:828 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
 msgstr "Συντακτικό σφάλμα στο app_info.xml"
 
@@ -57,18 +64,15 @@ msgstr "Το αρχείο που αναφέρεται στο app_info.xml δεν
 msgid "A new version of BOINC is available."
 msgstr "Μια νέα έκδοση του BOINC είναι διαθέσιμη."
 
-#: current_version.cpp:94
-#: current_version.cpp:102
+#: current_version.cpp:94 current_version.cpp:102
 msgid "Download"
 msgstr ""
 
-#: log_flags.cpp:269
-#: log_flags.cpp:449
+#: 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
+#: log_flags.cpp:423 log_flags.cpp:475
 msgid "Unrecognized tag in cc_config.xml"
 msgstr "Άγνωστη ετικέτα στο cc_config.xml"
 
@@ -87,15 +91,23 @@ msgstr "Η ετικέτα τέλους απουσιάζει στο cc_config.xml
 
 #: ../sched/handle_request.cpp:307
 msgid "Invalid or missing account key.  To fix, remove and add this project."
-msgstr "Ο κωδικός λογαριασμού είναι λασθασμένος ή απουσιάζει. Για διόρθωση, αποσυνδεθείτε και επανασυνδεθείτε σε αυτό το έργο."
+msgstr ""
+"Ο κωδικός λογαριασμού είναι λασθασμένος ή απουσιάζει. Για διόρθωση, "
+"αποσυνδεθείτε και επανασυνδεθείτε σε αυτό το έργο."
 
 #: ../sched/handle_request.cpp:849
 msgid "Invalid code signing key.  To fix, remove and add this project."
-msgstr "Λανθασμένος κωδικός σύνδεσης. Για διόρθωση, αποσυνδεθείτε και επανασυνδεθείτε σε αυτό το έργο"
+msgstr ""
+"Λανθασμένος κωδικός σύνδεσης. Για διόρθωση, αποσυνδεθείτε και "
+"επανασυνδεθείτε σε αυτό το έργο"
 
 #: ../sched/handle_request.cpp:859
-msgid "The project has changed its security key.  Please remove and add this project."
-msgstr "Το έργο άλλαξε το κλειδί ασφαλείας. Παρακαλώ αφαιρέστε και προσθέστε ξανά αυτό το έργο."
+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"
@@ -103,11 +115,15 @@ msgstr "Αυτό το έργο δεν υποστηρίζει το λειτουρ
 
 #: ../sched/handle_request.cpp:969
 msgid "This project doesn't support CPU type"
-msgstr "Αυτό το έργο δεν υποστηρίζει τον τύπο της κεντρικής μονάδας επεξεργασίας"
+msgstr ""
+"Αυτό το έργο δεν υποστηρίζει τον τύπο της κεντρικής μονάδας επεξεργασίας"
 
 #: ../sched/handle_request.cpp:993
-msgid "Your BOINC client software is too old.  Please install the current version."
-msgstr "Η έκδοση του BOINC σας είναι πολύ παλιά. Παρακαλώ εγκαταστείστε την τελευταία έκδοση."
+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"
@@ -115,25 +131,40 @@ msgstr "Αυτό το έργο δεν υποστηρίζει υπολογιστ
 
 #: ../sched/sched_send.cpp:1092
 msgid "Upgrade to the latest driver to process tasks using your computer's GPU"
-msgstr "Αναβαθμίστε με τους τελευταίους οδηγούς προγράμματος για να εκτελείτε εργασίες χρησιμοποιώντας τη μονάδα επεξεργασίας γραφικών του υπολογιστή σας"
+msgstr ""
+"Αναβαθμίστε με τους τελευταίους οδηγούς προγράμματος για να εκτελείτε "
+"εργασίες χρησιμοποιώντας τη μονάδα επεξεργασίας γραφικών του υπολογιστή σας"
 
 #: ../sched/sched_send.cpp:1099
-msgid "Upgrade to the latest driver to use all of this project's GPU applications"
-msgstr "Αναβαθμίστε με τους τελευταίους οδηγούς προγράμματος για να χρησιμοποιείτε όλες τις εφαρμογές αυτού του έργου"
+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 "Μια νέα έκδοση του BOINC χρειάζεται για να χρησιμοποιείσετε την μονάδα επεξεργασίας γραφικών της NVIDIA, παρακαλώ αναβαθμίστε στην τελευταία έκδοση"
+msgid ""
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to "
+"the current version"
+msgstr ""
+"Μια νέα έκδοση του BOINC χρειάζεται για να χρησιμοποιείσετε την μονάδα "
+"επεξεργασίας γραφικών της NVIDIA, παρακαλώ αναβαθμίστε στην τελευταία έκδοση"
 
+# 94%
 #: ../sched/sched_send.cpp:1146
 #, c-format
+#, c-format, fuzzy
 msgid "An %s GPU is required to run tasks for this project"
 msgstr ""
+"Μια μονάδα επεξεργασίας γραφικών ATI χρειάζεται για να εκτελέσετε εργασίες "
+"για αυτό το έργο"
 
 #: ../sched/sched_send.cpp:1262
 #, fuzzy
 msgid "No tasks are available for the applications you have selected."
-msgstr "Καμία εργασία δεν είναι διαθέσιμη για τις εφαρμογές που έχετε επιλέξει. Παρακαλώ ελέγξτε τις προτιμήσεις του έργου στην ιστοσελίδα του."
+msgstr ""
+"Καμία εργασία δεν είναι διαθέσιμη για τις εφαρμογές που έχετε επιλέξει. "
+"Παρακαλώ ελέγξτε τις προτιμήσεις του έργου στην ιστοσελίδα του."
 
 #: ../sched/sched_send.cpp:1288
 msgid "Your computer type is not supported by this project"
@@ -141,11 +172,14 @@ msgstr "Ο τύπος του υπολογιστή σας δεν υποστηρί
 
 #: ../sched/sched_send.cpp:1294
 msgid "Newer BOINC version required; please install current version"
-msgstr "Απαιτείται νεότερη έκδοση του BOINC, παρακαλώ εγκαταστείστε την τελευταία έκδοση"
+msgstr ""
+"Απαιτείται νεότερη έκδοση του BOINC, παρακαλώ εγκαταστείστε την τελευταία "
+"έκδοση"
 
 #: ../sched/sched_send.cpp:1305
 #, c-format
-msgid "Tasks for %s are available, but your preferences are set to not accept them"
+msgid ""
+"Tasks for %s are available, but your preferences are set to not accept them"
 msgstr ""
 
 #: ../sched/sched_types.cpp:254
@@ -158,37 +192,45 @@ msgstr "Το app_info.xml σας δεν έχει μια χρησιμοποιήσ
 
 #~ msgid "Download it."
 #~ msgstr "Κατεβάστε τη."
+
 #~ msgid "An NVIDIA or ATI GPU is required to run tasks for this project"
 #~ msgstr ""
 #~ "Μια μονάδα επεξεργασίας γραφικών NVIDIA ή ATI χρειάζεται για να εκτελέσετε "
 #~ "εργασίες για αυτό το έργο"
+
 #~ msgid "An NVIDIA GPU is required to run tasks for this project"
 #~ msgstr ""
 #~ "Μια μονάδα επεξεργασίας γραφικών NVIDIA χρειάζεται για να εκτελέσετε "
 #~ "εργασίες για αυτό το έργο"
+
 #~ msgid "An ATI GPU is required to run tasks for this project"
 #~ msgstr ""
 #~ "Μια μονάδα επεξεργασίας γραφικών ATI χρειάζεται για να εκτελέσετε εργασίες "
 #~ "για αυτό το έργο"
+
 #~ msgid ""
 #~ "Tasks for NVIDIA GPU are available, but your preferences are set to not "
 #~ "accept them"
 #~ msgstr ""
 #~ "Εργασίες για την μονάδα επεξεργασίας γραφικών NVIDIA είναι διαθέσιμες, αλλά "
 #~ "ρυθμίσεις σας δεν επιτρέπουν την αποδοχή τους"
+
 #~ msgid ""
 #~ "Tasks for ATI GPU are available, but your preferences are set to not accept "
 #~ "them"
 #~ msgstr ""
 #~ "Εργασίες για την μονάδα επεξεργασίας γραφικών ATI είναι διαθέσιμες, αλλά "
 #~ "ρυθμίσεις σας δεν επιτρέπουν την αποδοχή τους"
+
 #~ msgid ""
 #~ "Tasks for CPU are available, but your preferences are set to not accept them"
 #~ msgstr ""
 #~ "Εργασίες για την κεντρικη μονάδα επεξεργασίας είναι διαθέσιμες, αλλά "
 #~ "ρυθμίσεις σας δεν επιτρέπουν την αποδοχή τους"
+
 #~ msgid "error"
 #~ msgstr "σφάλμα"
+
 #~ msgid "Can't resolve hostname in remote_hosts.cfg"
 #~ msgstr ""
 #~ "Δε μπορεί να γίνει επίλυση του κεντρικού ονόματος στο remote_hosts.cfg"
@@ -196,14 +238,16 @@ msgstr "Το app_info.xml σας δεν έχει μια χρησιμοποιήσ
 #, fuzzy
 #~ msgid "is not available for"
 #~ msgstr "δεν είναι διαθέσιμο για τον τύπο του υπολιγιστή σας"
+
 #~ msgid "Notice from BOINC"
 #~ msgstr "Σημείωση απο το BOINC"
+
 #~ msgid "Message from"
 #~ msgstr "Μήνυμα απο"
+
 #~ msgid ""
 #~ "You may have an outdated code signing key.  Try attaching and reattaching "
 #~ "this project."
 #~ msgstr ""
 #~ "Έχετε έναν απαρχαιωμένο κωδικό πρόσβασης. Παρακαλώ αποσυνδεθείτε και "
 #~ "επανασυνδεθείτε στο έργο."
-
diff --git a/locale/el/BOINC-Manager.mo b/locale/el/BOINC-Manager.mo
index 70e0297..65a62bc 100644
Binary files a/locale/el/BOINC-Manager.mo and b/locale/el/BOINC-Manager.mo differ
diff --git a/locale/el/BOINC-Manager.po b/locale/el/BOINC-Manager.po
index 65ff141..aa24eba 100755
--- a/locale/el/BOINC-Manager.po
+++ b/locale/el/BOINC-Manager.po
@@ -4,39 +4,43 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: BOINC Manager 4.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-15 14:15-0500\n"
-"PO-Revision-Date: 2015-02-10 15:20-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"POT-Creation-Date: 2014-02-02 00:00-0800\n"
+"PO-Revision-Date: 2013-10-21 15:23+0000\n"
+"Last-Translator: chris g <chr1407 at hotmail.com>\n"
+"Language-Team: BOINC Development Team <rwalton at ssl.berkeley.edu>\n"
 "Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.5.0\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc_7.4\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1382369003.0\n"
 "X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-SearchPath-0: clientgui\n"
 "X-Poedit-SearchPath-1: clientgui/msw\n"
 "X-Poedit-SearchPath-2: clientgui/gtk\n"
 "X-Poedit-SearchPath-3: clientgui/mac\n"
+"X-Poedit-SearchPath-0: clientgui\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\n"
+"X-POOTLE-MTIME: 1382369003.0\n"
 
 # 81%
-#: clientgui/AccountInfoPage.cpp:387
+#: AccountInfoPage.cpp:387
 #, c-format
+#, c-format, c-format
 msgid "Identify your account at %s"
 msgstr "Αναγνωρίστε τον λογαριασμό σας στο %s"
 
-#: clientgui/AccountInfoPage.cpp:393
+#: AccountInfoPage.cpp:393
 msgid ""
 "Please enter your account information\n"
 "(to create an account, visit the project's web site)"
-msgstr "Παρακαλώ εισάγετε τις πληροφορίες του λογαριασμού σας(για να δημιουργήσετε έναν λογαριασμό, επισκεφτείτε την ιστοσελίδα του έργου)"
+msgstr ""
+"Παρακαλώ εισάγετε τις πληροφορίες του λογαριασμού σας(για να δημιουργήσετε "
+"έναν λογαριασμό, επισκεφτείτε την ιστοσελίδα του έργου)"
 
-#: clientgui/AccountInfoPage.cpp:397
+#: AccountInfoPage.cpp:397
 msgid ""
 "This project is not currently accepting new accounts.\n"
 "You can add it only if you already have an account."
@@ -44,19 +48,19 @@ msgstr ""
 "Αυτό το πρόγραμμα δεν δέχεται νέους λογαριασμούς αυτή τη στιγμή.\n"
 "Μπορείτε να το προσθέσετε μόνο εάν έχετε ήδη έναν λογαριασμό."
 
-#: clientgui/AccountInfoPage.cpp:401
+#: AccountInfoPage.cpp:401
 msgid "Are you already running this project?"
 msgstr "Εκτελείτε ήδη αυτό το έργο;"
 
-#: clientgui/AccountInfoPage.cpp:405
+#: AccountInfoPage.cpp:405
 msgid "&No, new user"
 msgstr "&Όχι, νέος χρήστης"
 
-#: clientgui/AccountInfoPage.cpp:408
+#: AccountInfoPage.cpp:408
 msgid "&Yes, existing user"
 msgstr "&Ναι, υπάρχων χρήστης"
 
-#: clientgui/AccountInfoPage.cpp:413
+#: AccountInfoPage.cpp:413
 #, fuzzy
 msgid ""
 "We were not able to set up your account information\n"
@@ -66,57 +70,53 @@ msgid ""
 "below to find out what to put in the email address and\n"
 "password fields."
 msgstr ""
-"Δεν είμασταν σε θέση να προετοιμάσουμε τις πληροφορίες του λογαριασμού σας αυτόματα.\n"
+"Δεν είμασταν σε θέση να προετοιμάσουμε τις πληροφορίες του λογαριασμού σας "
+"αυτόματα.\n"
 "\n"
 "Παρακαλούμε πατήστε τον σύνδεσμο \"Εύρεση πληροφοριών σύνδεσης\"\n"
-"παρακάτω για να δείτε πώς να συμπληρώσετε τα πεδία της διεύθυνσης ηλεκτρονικού ταχυδρομείου (e-mail) και\n"
+"παρακάτω για να δείτε πώς να συμπληρώσετε τα πεδία της διεύθυνσης "
+"ηλεκτρονικού ταχυδρομείου (e-mail) και\n"
 "του κωδικού."
 
-#: clientgui/AccountInfoPage.cpp:416
+#: AccountInfoPage.cpp:416
 msgid "Find login information"
 msgstr "Εύρεση πληροφοριών σύνδεσης"
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:649
+#: AccountInfoPage.cpp:436 AccountInfoPage.cpp:641
 msgid "&Password:"
 msgstr "&Κωδικός:"
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:673
+#: AccountInfoPage.cpp:443 AccountInfoPage.cpp:665
 msgid "Choose a &password:"
 msgstr "Επιλέξτε έναν &κωδικό:"
 
-#: clientgui/AccountInfoPage.cpp:446
+#: AccountInfoPage.cpp:446
 msgid "C&onfirm password:"
 msgstr "Ε&πιβεβαίωση Κωδικού:"
 
-#: clientgui/AccountInfoPage.cpp:453
+#: AccountInfoPage.cpp:453
 #, c-format
 msgid "Are you already running %s?"
-msgstr "Εκτελείτε ήδη %s;"
+msgstr "Εκτελείτε ήδη %;"
 
-#: clientgui/AccountInfoPage.cpp:482
+#: AccountInfoPage.cpp:482
 msgid "&Username:"
 msgstr "&Όνομα χρήστη:"
 
-#: clientgui/AccountInfoPage.cpp:511
-msgid "&Email address or LDAP ID:"
-msgstr ""
-
-#: clientgui/AccountInfoPage.cpp:515
+#: AccountInfoPage.cpp:508
 msgid "&Email address:"
 msgstr "&Διεύθυνση ηλεκτρονικού ταχυδρομείου (Email):"
 
-#: clientgui/AccountInfoPage.cpp:523
+#: AccountInfoPage.cpp:515
 #, c-format
 msgid "minimum length %d"
-msgstr "ελάχιστο μήκος %d"
+msgstr "ελάχιστο μήκος %"
 
-#: clientgui/AccountInfoPage.cpp:530
+#: AccountInfoPage.cpp:522
 msgid "Forgot your password?"
 msgstr "Ξεχάσατε τον κωδικό σας;"
 
-#: clientgui/AccountInfoPage.cpp:537
+#: AccountInfoPage.cpp:529
 msgid ""
 "If you have not yet registered with this account manager,\n"
 "please do so before proceeding.  Click on the link below\n"
@@ -126,46 +126,49 @@ msgstr ""
 "παρακαλούμε κάντε το προτού προσωρήσετε. Πατήστε στον παρακάτω σύνδεσμο\n"
 "για να εγγραφείτε ή για να ανακτήσετε έναν ξεχασμένο κωδικό."
 
-#: clientgui/AccountInfoPage.cpp:540
+#: AccountInfoPage.cpp:532
 msgid "Account manager web site"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:582
+#: AccountInfoPage.cpp:574 WelcomePage.cpp:348
 msgid "Add project"
 msgstr "Προσθήκη έργου"
 
-#: clientgui/AccountInfoPage.cpp:584
+#: AccountInfoPage.cpp:576
 msgid "Update account manager"
 msgstr "Ενημέρωση του προγράμματος διαχείρισης λογαριασμού"
 
-#: clientgui/AccountInfoPage.cpp:586
+#: AccountInfoPage.cpp:578 WelcomePage.cpp:307 WelcomePage.cpp:321
 #, fuzzy
 msgid "Use account manager"
 msgstr "Χρήση διαχειριστή λογαριασμού"
 
-#: clientgui/AccountInfoPage.cpp:593
+#: AccountInfoPage.cpp:585
 msgid "Please enter a user name."
 msgstr "Παρακαλώ εισάγετε ένα όνομα χρήστη."
 
-#: clientgui/AccountInfoPage.cpp:595
+#: AccountInfoPage.cpp:587
 #, fuzzy
 msgid "Please enter an email address."
 msgstr "Παρακαλώ προσδιορίστε μια διεύθυνση ηλεκτρονικού ταχυδρομίου (email)."
 
-#: clientgui/AccountInfoPage.cpp:605
+#: AccountInfoPage.cpp:597
 #, c-format
 msgid "Please enter a password of at least %d characters."
 msgstr "Παρακαλώ εισάγετε έναν κωδικό με τουλάχιστον %d χαρακτήρες."
 
-#: clientgui/AccountInfoPage.cpp:615
-msgid "The password and confirmation password do not match. Please type them again."
-msgstr "Ο κωδικός και ο κωδικός επιβεβαίωσης δεν ταιριάζουν. Παρακαλούμε επαναπληκτρολογήστε τους."
+#: AccountInfoPage.cpp:607
+msgid ""
+"The password and confirmation password do not match. Please type them again."
+msgstr ""
+"Ο κωδικός και ο κωδικός επιβεβαίωσης δεν ταιριάζουν. Παρακαλούμε "
+"επαναπληκτρολογήστε τους."
 
-#: clientgui/AccountManagerInfoPage.cpp:272
+#: AccountManagerInfoPage.cpp:272
 msgid "Choose an account manager"
 msgstr "Επιλέξτε ένα πρόγραμμα διαχείρισης λογαριασμού"
 
-#: clientgui/AccountManagerInfoPage.cpp:275
+#: AccountManagerInfoPage.cpp:275
 msgid ""
 "To choose an account manager, click its name or \n"
 "type its URL below."
@@ -173,396 +176,388 @@ msgstr ""
 "Για να επιλέξετε έναν διαχειριστή λογαριασμών, πατήστε το όνομά του ή \n"
 "πληκτρολογήστε την ηλεκτρονική του διεύθυνση παρακάτω."
 
-#: clientgui/AccountManagerInfoPage.cpp:279
+#: AccountManagerInfoPage.cpp:279
 msgid "Account manager details:"
 msgstr ""
 
-#: clientgui/AccountManagerInfoPage.cpp:283
+#: AccountManagerInfoPage.cpp:283
 msgid "Account manager &URL:"
 msgstr ""
 
-#: clientgui/AccountManagerInfoPage.cpp:287
+#: AccountManagerInfoPage.cpp:287
 msgid "Open web page"
 msgstr ""
 
-#: clientgui/AccountManagerInfoPage.cpp:290
+#: AccountManagerInfoPage.cpp:290
 msgid "Visit this account manager's web site"
 msgstr ""
 
-#: clientgui/AccountManagerProcessingPage.cpp:186
-#: clientgui/AccountManagerPropertiesPage.cpp:192
+#: AccountManagerProcessingPage.cpp:187 AccountManagerPropertiesPage.cpp:193
 #, c-format
 msgid "Communicating with %s."
 msgstr "Επικοινωνία με %s."
 
-#: clientgui/AccountManagerProcessingPage.cpp:193
-#: clientgui/AccountManagerPropertiesPage.cpp:199
+#: AccountManagerProcessingPage.cpp:194 AccountManagerPropertiesPage.cpp:200
 msgid "Communicating with server."
 msgstr "Γίνεται επικοινωνία με τον διακομιστή(server)."
 
-#: clientgui/AccountManagerProcessingPage.cpp:198
-#: clientgui/AccountManagerPropertiesPage.cpp:204
+#: AccountManagerProcessingPage.cpp:199 AccountManagerPropertiesPage.cpp:205
 msgid "Please wait..."
 msgstr "Παρακαλώ περιμένετε..."
 
-#: clientgui/AccountManagerProcessingPage.cpp:325
+#: AccountManagerProcessingPage.cpp:326
 msgid "An internal server error has occurred.\n"
 msgstr "Συνέβει ένα εσωτερικό σφάλμα στον διακομιστή.\n"
 
-#: clientgui/AdvancedFrame.cpp:96
+#: AdvancedFrame.cpp:95
 msgid "Connected"
 msgstr "Συνδεδεμένος"
 
-#: clientgui/AdvancedFrame.cpp:104
+#: AdvancedFrame.cpp:103
 msgid "Disconnected"
 msgstr "Αποσυνδεδεμένος"
 
-#: clientgui/AdvancedFrame.cpp:318
+#: AdvancedFrame.cpp:322 sg_BoincSimpleFrame.cpp:119
 #, c-format
 msgid "Close the %s window"
 msgstr "Κλείσιμο του παραθύρου %s"
 
-#: clientgui/AdvancedFrame.cpp:321
+#: AdvancedFrame.cpp:325 sg_BoincSimpleFrame.cpp:122
 msgid "&Close Window"
 msgstr "&Κλείσιμο Παράθυρου"
 
-#: clientgui/AdvancedFrame.cpp:332
-#: clientgui/AdvancedFrame.cpp:339
-#: clientgui/AdvancedFrame.cpp:346
+#: AdvancedFrame.cpp:336 AdvancedFrame.cpp:343 AdvancedFrame.cpp:350
 #, c-format
 msgid "Exit %s"
 msgstr "Έξοδος %s"
 
-#: clientgui/AdvancedFrame.cpp:359
-msgid "Preferences..."
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:368
+#: AdvancedFrame.cpp:371
 msgid "&Notices\tCtrl+Shift+N"
 msgstr "&Ανακοινώσεις\tCtrl+Shift+N"
 
-#: clientgui/AdvancedFrame.cpp:369
+#: AdvancedFrame.cpp:372
 msgid "Display notices"
 msgstr "Εμφάνιση ανακοινώσεων"
 
-#: clientgui/AdvancedFrame.cpp:374
+#: AdvancedFrame.cpp:377
 msgid "&Projects\tCtrl+Shift+P"
 msgstr "&Προγράμματα\tCtrl+Shift+Π"
 
-#: clientgui/AdvancedFrame.cpp:375
+#: AdvancedFrame.cpp:378
 msgid "Display projects"
 msgstr "Εμφάνιση έργων"
 
-#: clientgui/AdvancedFrame.cpp:380
+#: AdvancedFrame.cpp:383
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr "&Εργασίες\tCtrl+Shift+T"
 
-#: clientgui/AdvancedFrame.cpp:381
+#: AdvancedFrame.cpp:384
 msgid "Display tasks"
 msgstr "Εμφάνιση εργασιών"
 
-#: clientgui/AdvancedFrame.cpp:386
+#: AdvancedFrame.cpp:389
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr "Μετα&φορές\tCtrl+Shift+X"
 
-#: clientgui/AdvancedFrame.cpp:387
+#: AdvancedFrame.cpp:390
 msgid "Display transfers"
 msgstr "Εμφάνιση μεταφορών"
 
-#: clientgui/AdvancedFrame.cpp:392
+#: AdvancedFrame.cpp:395
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "&Στατιστικά\tCtrl+Shift+Σ"
 
-#: clientgui/AdvancedFrame.cpp:393
+#: AdvancedFrame.cpp:396
 msgid "Display statistics"
 msgstr "Εμφάνιση στατιστικών"
 
-#: clientgui/AdvancedFrame.cpp:398
+#: AdvancedFrame.cpp:401
 msgid "&Disk usage\tCtrl+Shift+D"
 msgstr "Χρήση &δίσκου\tCtrl+Shift+Δ"
 
-#: clientgui/AdvancedFrame.cpp:399
+#: AdvancedFrame.cpp:402
 msgid "Display disk usage"
 msgstr "Εμφάνιση χρήσης δίσκου"
 
-#: clientgui/AdvancedFrame.cpp:406
+#: AdvancedFrame.cpp:409
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr "Απλή &Εμφάνιση...\tCtrl+Shift+Ε"
 
-#: clientgui/AdvancedFrame.cpp:407
+#: AdvancedFrame.cpp:410
 msgid "Display the simple graphical interface."
 msgstr "Εμφάνιση απλού γραφικού περιβάλλοντος.                "
 
-#: clientgui/AdvancedFrame.cpp:421
+#: AdvancedFrame.cpp:424
 msgid "&Add project or account manager..."
 msgstr "&Προσθήκη έργου ή διαχειριστή λογαριασμού..."
 
-#: clientgui/AdvancedFrame.cpp:422
+#: AdvancedFrame.cpp:425 sg_ProjectPanel.cpp:76
 msgid "Volunteer for any or all of 30+ projects in many areas of science"
-msgstr "Προσφέρετε εθελοντικό έργο για οποιοδήποτε απο τα 30+ ή και για όλα τα έργα σε πολλούς επιστημονικούς τομείς "
+msgstr ""
+"Προσφέρετε εθελοντικό έργο για οποιοδήποτε απο τα 30+ ή και για όλα τα έργα "
+"σε πολλούς επιστημονικούς τομείς "
 
-#: clientgui/AdvancedFrame.cpp:426
+#: AdvancedFrame.cpp:429
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "&Συγχρονισμός με %s"
 
-#: clientgui/AdvancedFrame.cpp:430
+#: AdvancedFrame.cpp:433
 #, c-format
 msgid "Get current settings from %s"
 msgstr "Παραλαβή τρεχόντων ρυθμίσεων από το %s"
 
-#: clientgui/AdvancedFrame.cpp:440
+#: AdvancedFrame.cpp:443
 msgid "&Add project..."
 msgstr "&Προσθήκη έργου..."
 
-#: clientgui/AdvancedFrame.cpp:441
+#: AdvancedFrame.cpp:444
 msgid "Add a project"
 msgstr "Προσθήκη ενός έργου"
 
-#: clientgui/AdvancedFrame.cpp:444
+#: AdvancedFrame.cpp:447
 #, c-format
 msgid "S&top using %s..."
 msgstr "Π&αύση χρήσης του %s..."
 
-#: clientgui/AdvancedFrame.cpp:450
+#: AdvancedFrame.cpp:453
 msgid "Remove this computer from account manager control."
-msgstr "Αφαίρεση αυτού του υπολογιστή απο τον έλεγχο του διαχειριστή λογαριασμών."
+msgstr ""
+"Αφαίρεση αυτού του υπολογιστή απο τον έλεγχο του διαχειριστή λογαριασμών."
 
-#: clientgui/AdvancedFrame.cpp:455
+#: AdvancedFrame.cpp:458 sg_BoincSimpleFrame.cpp:178
 msgid "&Options..."
 msgstr "&Επιλογές..."
 
-#: clientgui/AdvancedFrame.cpp:456
+#: AdvancedFrame.cpp:459 sg_BoincSimpleFrame.cpp:179
 msgid "Configure display options and proxy settings"
 msgstr "Διαμόρφωση επιλογών προβολής και ρυθμίσεων proxy"
 
-#: clientgui/AdvancedFrame.cpp:460
+#: AdvancedFrame.cpp:463 sg_BoincSimpleFrame.cpp:172
 msgid "Computing &preferences..."
 msgstr "&Προτιμήσεις επεξεργασίας..."
 
-#: clientgui/AdvancedFrame.cpp:461
+#: AdvancedFrame.cpp:464 sg_BoincSimpleFrame.cpp:173
 msgid "Configure computing preferences"
 msgstr "Διαμόρφωση προτιμήσεων επεξεργασίας"
 
-#: clientgui/AdvancedFrame.cpp:469
+#: AdvancedFrame.cpp:472
 msgid "&Run always"
 msgstr "&Διαρκής εκτέλεση"
 
-#: clientgui/AdvancedFrame.cpp:470
+#: AdvancedFrame.cpp:473
 msgid "Allow work regardless of preferences"
 msgstr "Εκτέλεση &ανεξαρτήτως των προτιμήσεων"
 
-#: clientgui/AdvancedFrame.cpp:474
+#: AdvancedFrame.cpp:477
 msgid "Run based on &preferences"
 msgstr "Εκτέλεση βάσει &προτιμήσεων"
 
-#: clientgui/AdvancedFrame.cpp:475
+#: AdvancedFrame.cpp:478
 msgid "Allow work according to preferences"
 msgstr "Εκτέλεση σύμφωνα με τις προτιμήσεις σας"
 
-#: clientgui/AdvancedFrame.cpp:479
+#: AdvancedFrame.cpp:482
 msgid "&Suspend"
 msgstr "Προσωρινή παύση"
 
-#: clientgui/AdvancedFrame.cpp:480
+#: AdvancedFrame.cpp:483
 msgid "Stop work regardless of preferences"
 msgstr "Παύση ανεξαρτήτως των προτιμήσεων"
 
-#: clientgui/AdvancedFrame.cpp:505
+#: AdvancedFrame.cpp:508
 msgid "Use GPU always"
 msgstr "Συνεχής χρήση της μονάδας επεξεργασίας γραφικών"
 
-#: clientgui/AdvancedFrame.cpp:506
+#: AdvancedFrame.cpp:509
 msgid "Allow GPU work regardless of preferences"
-msgstr "Εκτέλεση εργασιών για τη μονάδα επεξεργασίας γραφικών ανεξαρτήτως των προτιμήσεων"
+msgstr ""
+"Εκτέλεση εργασιών για τη μονάδα επεξεργασίας γραφικών ανεξαρτήτως των "
+"προτιμήσεων"
 
-#: clientgui/AdvancedFrame.cpp:510
+#: AdvancedFrame.cpp:513
 msgid "Use GPU based on preferences"
 msgstr "Χρήση της μονάδα επεξεργασίας γραφικών βάση των προτιμήσεων"
 
-#: clientgui/AdvancedFrame.cpp:511
+#: AdvancedFrame.cpp:514
 msgid "Allow GPU work according to preferences"
-msgstr "Χρήση εργασιών για τη μονάδα επεξεργασίας γραφικών σύμφωνα με τις προτιμήσεις σας"
+msgstr ""
+"Χρήση εργασιών για τη μονάδα επεξεργασίας γραφικών σύμφωνα με τις "
+"προτιμήσεις σας"
 
-#: clientgui/AdvancedFrame.cpp:515
+#: AdvancedFrame.cpp:518
 msgid "Suspend GPU"
 msgstr "Παύση της μονάδας επεξεργασίας γραφικών"
 
-#: clientgui/AdvancedFrame.cpp:516
+#: AdvancedFrame.cpp:519
 msgid "Stop GPU work regardless of preferences"
 msgstr "Παύση της μονάδας επεξεργασίας γραφικών ανεξαρτήτως των προτιμήσεων"
 
-#: clientgui/AdvancedFrame.cpp:540
+#: AdvancedFrame.cpp:543
 msgid "Network activity always available"
 msgstr "Συνεχής πρόβαση στο δίκτυο"
 
-#: clientgui/AdvancedFrame.cpp:541
+#: AdvancedFrame.cpp:544
 msgid "Allow network activity regardless of preferences"
 msgstr "Σύνδεση στο δίκτυο &ανεξαρτήτως των προτιμήσεων"
 
-#: clientgui/AdvancedFrame.cpp:545
+#: AdvancedFrame.cpp:548
 msgid "Network activity based on preferences"
 msgstr "Πρόσβαση στο δίκτυο βάση προτιμήσεων"
 
-#: clientgui/AdvancedFrame.cpp:546
+#: AdvancedFrame.cpp:549
 msgid "Allow network activity according to preferences"
 msgstr "Σύνδεση στο δίκτυο σύμφωνα με τις προτιμήσεις"
 
-#: clientgui/AdvancedFrame.cpp:550
+#: AdvancedFrame.cpp:553
 msgid "Network activity suspended"
 msgstr "Παύση πρόσβασης στο δίκτυο"
 
-#: clientgui/AdvancedFrame.cpp:551
+#: AdvancedFrame.cpp:554
 msgid "Stop BOINC network activity"
 msgstr "Να σταματήσει η χρήση του δικτύου απο το BOINC"
 
-#: clientgui/AdvancedFrame.cpp:561
+#: AdvancedFrame.cpp:564
 #, c-format
 msgid "Connect to another computer running %s"
 msgstr "Σύνδεση σε κάποιον άλλον υπολογιστή εκτελόντας %s"
 
-#: clientgui/AdvancedFrame.cpp:566
+#: AdvancedFrame.cpp:569
 msgid "Select computer..."
 msgstr "Επιλογή Υπολογιστή..."
 
-#: clientgui/AdvancedFrame.cpp:571
+#: AdvancedFrame.cpp:574
 msgid "Shut down connected client..."
 msgstr "Κλείσιμο συνδεδεμένου προογράμματος..."
 
-#: clientgui/AdvancedFrame.cpp:572
+#: AdvancedFrame.cpp:575
 msgid "Shut down the currently connected client"
 msgstr "Κλείσιμο του τρέχοντος συνδεδεμένου προγράμματος"
 
-#: clientgui/AdvancedFrame.cpp:576
+#: AdvancedFrame.cpp:579
 msgid "Run CPU &benchmarks"
 msgstr "Εκτέλεση &μετρήσεων κεντρικής μονάδας επεξεργασίας"
 
-#: clientgui/AdvancedFrame.cpp:577
+#: AdvancedFrame.cpp:580
 msgid "Runs BOINC CPU benchmarks"
 msgstr "Εκτέλεση μετρήσεων υπολογιστικής ισχύως επεξεργαστή για το BOINC"
 
-#: clientgui/AdvancedFrame.cpp:581
+#: AdvancedFrame.cpp:584
 msgid "Do network communication"
 msgstr "Επικοινωνία με το δίκτυο"
 
-#: clientgui/AdvancedFrame.cpp:582
+#: AdvancedFrame.cpp:585
 msgid "Do all pending network communication"
 msgstr "Εκτέλεση επικοινωνιών με το δίκτυο που εκκρεμούν"
 
 # 94%
-#: clientgui/AdvancedFrame.cpp:586
+#: AdvancedFrame.cpp:589
 #, fuzzy
 msgid "Read config files"
 msgstr "Άνοιγμα αρχείων διαμόρφωσης"
 
-#: clientgui/AdvancedFrame.cpp:587
+#: AdvancedFrame.cpp:590
 msgid "Read configuration info from cc_config.xml and any app_config.xml files"
-msgstr "Άνοιγμα πληροφοριών διαμόρφωσης απο τα αρχεία cc_config.xml και app_config.xml"
+msgstr ""
+"Άνοιγμα πληροφοριών διαμόρφωσης απο τα αρχεία cc_config.xml και "
+"app_config.xml"
 
-#: clientgui/AdvancedFrame.cpp:591
+#: AdvancedFrame.cpp:594
 msgid "Read local prefs file"
 msgstr "Διαβάστε το αρχείο προτιμήσεων"
 
-#: clientgui/AdvancedFrame.cpp:592
+#: AdvancedFrame.cpp:595
 msgid "Read preferences from global_prefs_override.xml."
 msgstr "Άνοιγμα των προτιμήσεων από το αρχείο global_prefs_override.xml."
 
-#: clientgui/AdvancedFrame.cpp:597
+#: AdvancedFrame.cpp:600
 #, c-format
 msgid "Launch another instance of %s..."
 msgstr "Εκτέλεση ενός αντίτυπου του %s..."
 
-#: clientgui/AdvancedFrame.cpp:601
+#: AdvancedFrame.cpp:604
 #, c-format
 msgid "Launch another %s"
 msgstr "Εκτέλεση ενός %s"
 
-#: clientgui/AdvancedFrame.cpp:611
+#: AdvancedFrame.cpp:614
 msgid "Event Log...\tCtrl+Shift+E"
 msgstr "Ημερολόγιο γεγονότων...\t Ctrl+Shift+E"
 
-#: clientgui/AdvancedFrame.cpp:612
+#: AdvancedFrame.cpp:615
 msgid "Display diagnostic messages."
 msgstr "Εμφάνιση διαγνωστικών μηνυμάτων."
 
-#: clientgui/AdvancedFrame.cpp:616
-msgid "Event Log Diagnostic Flags...\tCtrl+Shift+F"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:617
-msgid "Enable or disable various diagnostic messages"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:626
+#: AdvancedFrame.cpp:625 sg_BoincSimpleFrame.cpp:188
 #, c-format
 msgid "%s &help"
 msgstr "%s& βοήθεια"
 
-#: clientgui/AdvancedFrame.cpp:632
+#: AdvancedFrame.cpp:631 sg_BoincSimpleFrame.cpp:194
 #, c-format
 msgid "Show information about %s"
 msgstr "Έμφάνιση πληροφοριών για%s"
 
-#: clientgui/AdvancedFrame.cpp:644
+#: AdvancedFrame.cpp:643
 #, c-format
 msgid "&%s help"
 msgstr "&Βοήθεια για το %s "
 
-#: clientgui/AdvancedFrame.cpp:650
+#: AdvancedFrame.cpp:649 sg_BoincSimpleFrame.cpp:212
 #, c-format
 msgid "Show information about the %s"
 msgstr "Προβολή πληροφοριών σχετικά με το %s"
 
-#: clientgui/AdvancedFrame.cpp:662
+#: AdvancedFrame.cpp:661 sg_BoincSimpleFrame.cpp:224
 #, c-format
 msgid "%s &web site"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:668
+#: AdvancedFrame.cpp:667 sg_BoincSimpleFrame.cpp:230
 #, c-format
 msgid "Show information about BOINC and %s"
 msgstr "Προβολή πληροφοριών για το BOINC και το %s"
 
-#: clientgui/AdvancedFrame.cpp:680
-#: clientgui/BOINCTaskBar.cpp:544
+#: AdvancedFrame.cpp:679 BOINCTaskBar.cpp:530 sg_BoincSimpleFrame.cpp:242
 #, c-format
 msgid "&About %s..."
 msgstr "&Σχετικά με το %s..."
 
-#: clientgui/AdvancedFrame.cpp:686
+#: AdvancedFrame.cpp:685 sg_BoincSimpleFrame.cpp:248
 msgid "Licensing and copyright information."
 msgstr "Πληροφορίες άδειας χρήσης και copyright."
 
-#: clientgui/AdvancedFrame.cpp:693
+#: AdvancedFrame.cpp:692 sg_BoincSimpleFrame.cpp:255
 msgid "&File"
 msgstr "&Αρχείο"
 
-#: clientgui/AdvancedFrame.cpp:697
+#: AdvancedFrame.cpp:696 sg_BoincSimpleFrame.cpp:259
 msgid "&View"
 msgstr "&Προβολή"
 
-#: clientgui/AdvancedFrame.cpp:701
+#: AdvancedFrame.cpp:700 sg_BoincSimpleFrame.cpp:263
 msgid "&Tools"
 msgstr "&Εργαλεία"
 
-#: clientgui/AdvancedFrame.cpp:705
+#: AdvancedFrame.cpp:704
 msgid "&Activity"
 msgstr "&Δραστηριότητα"
 
-#: clientgui/AdvancedFrame.cpp:709
+#: AdvancedFrame.cpp:708
 msgid "A&dvanced"
 msgstr "&Για προχωρημένους"
 
-#: clientgui/AdvancedFrame.cpp:713
+#: AdvancedFrame.cpp:712 DlgEventLog.cpp:332 sg_BoincSimpleFrame.cpp:267
+#: wizardex.cpp:374 wizardex.cpp:381
 msgid "&Help"
 msgstr "&Βοήθεια"
 
-#: clientgui/AdvancedFrame.cpp:1185
+#: AdvancedFrame.cpp:1199
 #, c-format
 msgid "%s - Stop using %s"
 msgstr "%s - Παύση χρήσης του %s"
 
-#: clientgui/AdvancedFrame.cpp:1190
+#: AdvancedFrame.cpp:1204
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -577,12 +572,12 @@ msgstr ""
 "\n"
 "Θέλετε όντως να σταματήσετε να χρησιμοποιείτε το %s;"
 
-#: clientgui/AdvancedFrame.cpp:1397
+#: AdvancedFrame.cpp:1401
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s - Κλείσιμο του τρέχοντος προγράμματος..."
 
-#: clientgui/AdvancedFrame.cpp:1406
+#: AdvancedFrame.cpp:1410
 #, c-format
 msgid ""
 "%s will shut down the current client\n"
@@ -591,36 +586,36 @@ msgstr ""
 "%s θα κλείσει το τρέχον πρόγραμμα\n"
 "και θα σας παρακινήσει για να συνδεθείτε σε άλλο πάροχο."
 
-#: clientgui/AdvancedFrame.cpp:1806
+#: AdvancedFrame.cpp:1745 DlgAbout.cpp:119
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: clientgui/AdvancedFrame.cpp:1815
+#: AdvancedFrame.cpp:1754
 #, c-format
 msgid "%s has successfully added %s"
 msgstr "%s προσέθεσε επιτυχώς το %s"
 
-#: clientgui/AdvancedFrame.cpp:1953
+#: AdvancedFrame.cpp:1893
 #, c-format
 msgid "%s - (%s)"
 msgstr "%s - (%s)"
 
-#: clientgui/AdvancedFrame.cpp:1957
+#: AdvancedFrame.cpp:1897
 #, c-format
 msgid "Connecting to %s"
 msgstr "Σύνδεση στο %s"
 
-#: clientgui/AdvancedFrame.cpp:1960
+#: AdvancedFrame.cpp:1900
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "Συνδέθηκε στο %s (%s)"
 
-#: clientgui/AlreadyExistsPage.cpp:184
+#: AlreadyExistsPage.cpp:184
 msgid "Username already in use"
 msgstr "Το όνομα του χρήστη χρησιμοποιείται ήδη"
 
-#: clientgui/AlreadyExistsPage.cpp:187
+#: AlreadyExistsPage.cpp:187
 msgid ""
 "An account with that username already exists and has a\n"
 "different password than the one you entered.\n"
@@ -630,13 +625,14 @@ msgstr ""
 "Ένας λογαριασμός με αυτό το όνομα χρήστη υπάρχει ήδη και έχει ένα\n"
 "διαφορετικό κωδικό πρόσβασης από αυτόν που εισήγατε.\n"
 "\n"
-"Παρακαλούμε επισκεφθείτε την ιστοσελίδα του έργου και ακολουθήστε τις οδηγίες εκεί."
+"Παρακαλούμε επισκεφθείτε την ιστοσελίδα του έργου και ακολουθήστε τις "
+"οδηγίες εκεί."
 
-#: clientgui/AlreadyExistsPage.cpp:191
+#: AlreadyExistsPage.cpp:191
 msgid "Email address already in use"
 msgstr "Αυτή η διεύθυνση email χρησιμοποείται ήδη"
 
-#: clientgui/AlreadyExistsPage.cpp:194
+#: AlreadyExistsPage.cpp:194
 msgid ""
 "An account with that email address already exists and has a\n"
 "different password than the one you entered.\n"
@@ -646,45 +642,48 @@ msgstr ""
 "Ένας λογαριασμός με αυτή τη διεύθυνση email υπάρχει ήδη και έχει\n"
 "διαφορετικό κωδικό πρόσβασης από αυτό που εισάγατε.\n"
 "\n"
-"Παρακαλούμε επισκεφθείτε την ιστοσελίδα του προγράμματος και ακολουθήστε τις οδηγίες εκεί."
+"Παρακαλούμε επισκεφθείτε την ιστοσελίδα του προγράμματος και ακολουθήστε τις "
+"οδηγίες εκεί."
 
-#: clientgui/AsyncRPC.cpp:1031
+#: AsyncRPC.cpp:1031
 msgid "Communicating with BOINC client.  Please wait ..."
 msgstr "Γίνεται επικοινωνία με το πρόγραμμα του BOINC. Παρακαλώ περιμένετε..."
 
-#: clientgui/AsyncRPC.cpp:1034
+#: AsyncRPC.cpp:1034
 #, c-format
 msgid "&Quit %s"
 msgstr "&Έξοδος %s"
 
-#: clientgui/AsyncRPC.cpp:1036
+#: AsyncRPC.cpp:1036
 #, c-format
 msgid "E&xit %s"
 msgstr "Έ&ξοδος %s"
 
-#: clientgui/AsyncRPC.cpp:1040
+#: AsyncRPC.cpp:1040
 #, c-format
 msgid "%s - Communication"
 msgstr "%s - Επικοινωνία"
 
-#: clientgui/AsyncRPC.cpp:1056
+#: AsyncRPC.cpp:1056 DlgAdvPreferencesBase.cpp:107 sg_DlgPreferences.cpp:433
 msgid "Cancel"
 msgstr "Ακύρωση"
 
-#: clientgui/BOINCBaseFrame.cpp:504
+#: BOINCBaseFrame.cpp:505
 #, c-format
 msgid "%s - Connection Error"
 msgstr "%s - Σφάλμα Επικοινωνίας"
 
-#: clientgui/BOINCBaseFrame.cpp:513
+#: BOINCBaseFrame.cpp:514
 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 ""
 "Αυτή τη στιγμή δεν έχετε δικαίωμα να διαχειριστείτε το πρόγραμμα.\n"
-"Παρακαλώ επικοινωνήστε με τον διαχειριστή σας για να σας προσθέσει στην τοπική λίστα χρηστών 'χρήστες του BOINC'.  "
+"Παρακαλώ επικοινωνήστε με τον διαχειριστή σας για να σας προσθέσει στην "
+"τοπική λίστα χρηστών 'χρήστες του BOINC'.  "
 
-#: clientgui/BOINCBaseFrame.cpp:522
+#: BOINCBaseFrame.cpp:523
 msgid ""
 "Authorization failed connecting to running client.\n"
 "Make sure you start this program in the same directory as the client."
@@ -692,20 +691,20 @@ msgstr ""
 "Η άδεια σύνδεσης για την εκτέλεση του προγράμματος απέτυχε.\n"
 "Φροντίστε να ξεκινήσετε το έργο στην ίδια τοποθεσία με το πρόγραμμα."
 
-#: clientgui/BOINCBaseFrame.cpp:524
+#: BOINCBaseFrame.cpp:525
 msgid "Authorization failed connecting to running client."
 msgstr "Η άδεια εισόδου για την εκτέλεση του προγράμματος απέτυχε."
 
-#: clientgui/BOINCBaseFrame.cpp:532
+#: BOINCBaseFrame.cpp:533
 msgid "The password you have provided is incorrect, please try again."
 msgstr "Ο κωδικός που εισάγατε είναι λανθασμένος, παρακαλούμε ξαναδοκιμάστε"
 
-#: clientgui/BOINCBaseFrame.cpp:576
+#: BOINCBaseFrame.cpp:577
 #, c-format
 msgid "%s - Connection Failed"
 msgstr "%s- Η σύνδεση απέτυχε"
 
-#: clientgui/BOINCBaseFrame.cpp:585
+#: BOINCBaseFrame.cpp:586
 #, c-format
 msgid ""
 "%s is not able to connect to a %s client.\n"
@@ -714,23 +713,26 @@ msgstr ""
 "%s δε μπορεί να συνδεθεί στο %s πρόγραμμα.\n"
 "Θέλετε να δοκιμάσετε ξανά;"
 
-#: clientgui/BOINCBaseFrame.cpp:621
+#: BOINCBaseFrame.cpp:622
 #, c-format
 msgid "%s - Daemon Start Failed"
 msgstr "%s - Η εκκίνηση του Daemon απέτυχε"
 
-#: clientgui/BOINCBaseFrame.cpp:631
+#: BOINCBaseFrame.cpp:632
 #, 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 ""
 "%s δε μπορεί να εκκινήσει το %s πρόγραμμα.\n"
-"Παρακαλώ ανοίξτε τον Πίνακα Ελέγχου->Εργαλεία Διαχειριστή->Πρόγραμμα υπηρεσιών και ξεκινήστε την υπηρεσία BOINC."
+"Παρακαλώ ανοίξτε τον Πίνακα Ελέγχου->Εργαλεία Διαχειριστή->Πρόγραμμα "
+"υπηρεσιών και ξεκινήστε την υπηρεσία BOINC."
 
 # daemon??
-#: clientgui/BOINCBaseFrame.cpp:637
+#: BOINCBaseFrame.cpp:638
 #, c-format
+#, c-format, fuzzy
 msgid ""
 "%s is not able to start a %s client.\n"
 "Please start the daemon and try again."
@@ -738,47 +740,52 @@ msgstr ""
 "%s δε μπορεί να εκκινήσει το %s πρόγραμμα.\n"
 "Παρακαλώ ανοίξτε το daemon και δοκιμάστε ξανά."
 
-#: clientgui/BOINCBaseFrame.cpp:688
+#: BOINCBaseFrame.cpp:689
 #, c-format
 msgid "%s - Connection Status"
 msgstr "%s - Κατάσταση Σύνδεσης"
 
-#: clientgui/BOINCBaseFrame.cpp:699
+#: BOINCBaseFrame.cpp:700
 #, c-format
+#, c-format, fuzzy
 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 ""
 "%s δεν ειναι συνδεδεμένο αυτή τη στιγμή σε ένα %s πρόγραμμα.\n"
-"Παρακαλώ χρησιμοποιείστε την επιλογή \" Προχωρημένα\\ Επιλογή Υπολογιστή...\" για να συνδεθείτε σε ένα %s πρόγραμμα.\n"
-"Για να συνδεθείτε στον τοπικό σας υπολογιστή, παρακαλώ χρησιμοποιείστε το \"τοπικός φιλοξενητής\" ως όνομα φιλοξενητή."
+"Παρακαλώ χρησιμοποιείστε την επιλογή \" Προχωρημένα\\ Επιλογή Υπολογιστή...\" "
+"για να συνδεθείτε σε ένα %s πρόγραμμα.\n"
+"Για να συνδεθείτε στον τοπικό σας υπολογιστή, παρακαλώ χρησιμοποιείστε το "
+"\"τοπικός φιλοξενητής\" ως όνομα φιλοξενητή."
 
-#: clientgui/BOINCBaseView.cpp:752
+#: BOINCBaseView.cpp:779
 #, fuzzy
 msgid "Project web pages"
 msgstr "Ιστοσελίδες Έργου"
 
-#: clientgui/BOINCClientManager.cpp:573
+#: BOINCClientManager.cpp:575
 #, c-format
 msgid "%s - Unexpected Exit"
 msgstr "%s - Απρόσμενη Έξοδος"
 
-#: clientgui/BOINCClientManager.cpp:583
+#: BOINCClientManager.cpp:585
 #, 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 ""
-"Το %s πρόγραμα έχει κλείσει απροσδόκητα 3 φορές στο διάστημα των τελευταίων %d λεπτών.\n"
+"Το %s πρόγραμα έχει κλείσει απροσδόκητα 3 φορές στο διάστημα των τελευταίων "
+"%d λεπτών.\n"
 "Θα θέλατε να γίνει επανεκκίνηση ξανά;                "
 
-#: clientgui/BOINCDialupManager.cpp:61
+#: BOINCDialupManager.cpp:61
 #, c-format
 msgid "%s - Network Status"
 msgstr "%s- Κατάσταση δικτύου"
 
-#: clientgui/BOINCDialupManager.cpp:241
+#: BOINCDialupManager.cpp:241
 #, c-format
 msgid ""
 "%s needs to connect to the Internet.\n"
@@ -787,22 +794,22 @@ msgstr ""
 "%s χρειάζεται να συνδεθεί στο διαδίκτυο.\n"
 "Να το επιχειρήσει τώρα;"
 
-#: clientgui/BOINCDialupManager.cpp:254
+#: BOINCDialupManager.cpp:254
 #, c-format
 msgid "%s is connecting to the Internet."
 msgstr "%s συνδέεται στο διαδίκτυο."
 
-#: clientgui/BOINCDialupManager.cpp:303
+#: BOINCDialupManager.cpp:303
 #, c-format
 msgid "%s has successfully connected to the Internet."
 msgstr "%s συνθέθηκε επιτυχώς στο διαδίκτυο."
 
-#: clientgui/BOINCDialupManager.cpp:331
+#: BOINCDialupManager.cpp:331
 #, c-format
 msgid "%s failed to connect to the Internet."
 msgstr "%s απέτυχε να συνδεθεί στο διαδίκτυο."
 
-#: clientgui/BOINCDialupManager.cpp:372
+#: BOINCDialupManager.cpp:372
 #, c-format
 msgid ""
 "%s has detected it is now connected to the Internet.\n"
@@ -811,18 +818,19 @@ msgstr ""
 "%s εντόπισε ότι είναι συνδεδεμένο στο διαδίκτυο.\n"
 "Ενημέρωση όλων των έργων και επανάληψη όλων των μεταφορών."
 
-#: clientgui/BOINCDialupManager.cpp:417
+#: BOINCDialupManager.cpp:417
 #, c-format
 msgid "%s has successfully disconnected from the Internet."
 msgstr "%s αποσυνδέθηκε επιτυχώς από το διαδίκτυο."
 
-#: clientgui/BOINCDialupManager.cpp:433
+#: BOINCDialupManager.cpp:433
 #, c-format
 msgid "%s failed to disconnected from the Internet."
 msgstr "%s απέτυχε να αποσυνδεθεί από το διαδίκτυο."
 
-#: clientgui/BOINCGUIApp.cpp:595
+#: BOINCGUIApp.cpp:339
 #, c-format
+#, fuzzy, c-format
 msgid ""
 "You currently are not authorized to manage the client.\n"
 "\n"
@@ -839,27 +847,30 @@ msgstr ""
 "- κάντε επανεγκατάσταση %s απαντώντας \"Ναί\" στην ερώτηση για \n"
 "μη-διαχειριστές χρήστες\n"
 "ή\n"
-"επικοινωνήστε με τον διαχειριστή σας για να σας προσθέσει στους 'χρήστες του boinc\"\n"
+"επικοινωνήστε με τον διαχειριστή σας για να σας προσθέσει στους 'χρήστες του "
+"boinc\"\n"
 "λίστα χρηστών."
 
-#: clientgui/BOINCGUIApp.cpp:601
+#: BOINCGUIApp.cpp:345
 #, c-format
 msgid ""
 "%s ownership or permissions are not set properly; please reinstall %s.\n"
 "(Error code %d"
 msgstr ""
-"%s δικαιώματα ιδιοκτησίας ή δικαιώματα χρήσης δεν ρυθμίστηκαν σωστά, παρακαλώ επαναγκαταστείστε το %s.\n"
+"%s δικαιώματα ιδιοκτησίας ή δικαιώματα χρήσης δεν ρυθμίστηκαν σωστά, "
+"παρακαλώ επαναγκαταστείστε το %s.\n"
 "(Κωδικός σφάλματος %d"
 
-#: clientgui/BOINCGUIApp.cpp:607
+#: BOINCGUIApp.cpp:351
 msgid " at "
 msgstr "στο"
 
-#: clientgui/BOINCGUIApp.cpp:610
+#: BOINCGUIApp.cpp:354 MainDocument.cpp:2484 MainDocument.cpp:2534
+#: MainDocument.cpp:2554 ViewTransfers.cpp:803
 msgid ")"
 msgstr ")"
 
-#: clientgui/BOINCGUIApp.cpp:640
+#: BOINCGUIApp.cpp:384
 msgid ""
 "A reboot is required in order for BOINC to run properly.\n"
 "Please reboot your computer and try again."
@@ -867,314 +878,312 @@ msgstr ""
 "Χρειάζεται να γίνει επανεκκίνηση ώστε το BOINC να τρέξει σωστά.\n"
 "Παρακαλώ επανακκινείστε τον υπολογιστή σας και δοκιμάστε ξανά."
 
-#: clientgui/BOINCGUIApp.cpp:641
+#: BOINCGUIApp.cpp:385 DlgAbout.cpp:153
 msgid "BOINC Manager"
 msgstr "Διαχειριστής του BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:902
+#: BOINCGUIApp.cpp:572
 msgid "BOINC Manager was started by the operating system automatically"
 msgstr "Ο διαχειριστής του BOINC ξεκίνησε αυτόματα με το λειτουργικό σύστημα"
 
-#: clientgui/BOINCGUIApp.cpp:904
+#: BOINCGUIApp.cpp:574
 msgid "Startup BOINC so only the system tray icon is visible"
-msgstr "Εκίννηση του BOINC ούτως ώστε μόνο το εικονίδιο στη μπάρα να είναι ορατό"
+msgstr ""
+"Εκίννηση του BOINC ούτως ώστε μόνο το εικονίδιο στη μπάρα να είναι ορατό"
 
-#: clientgui/BOINCGUIApp.cpp:906
+#: BOINCGUIApp.cpp:576
 msgid "Directory containing the BOINC Client executable"
 msgstr "Διεύθυνση που περιέχει το εκτελέσιμο πρόγραμμα του BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:907
+#: BOINCGUIApp.cpp:577
 msgid "BOINC data directory"
 msgstr "διεύθυνση δεδομένων του BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:909
+#: BOINCGUIApp.cpp:579
 msgid "Host name or IP address"
 msgstr "Όνομα παρόχου ή διεύθυνση IP"
 
-#: clientgui/BOINCGUIApp.cpp:910
+#: BOINCGUIApp.cpp:580
 msgid "GUI RPC port number"
 msgstr "Αριθμός θύρας GUI RPC"
 
-#: clientgui/BOINCGUIApp.cpp:911
+#: BOINCGUIApp.cpp:581
 msgid "Password"
 msgstr "Κωδικός"
 
-#: clientgui/BOINCGUIApp.cpp:912
+#: BOINCGUIApp.cpp:582
 msgid "Startup BOINC with these optional arguments"
 msgstr "Εκκίνηση του Boinc με αυτές τις προαιρετικές ρυθμίσεις"
 
-#: clientgui/BOINCGUIApp.cpp:913
+#: BOINCGUIApp.cpp:583
 msgid "disable BOINC security users and permissions"
 msgstr "Απενεργοποιήστε τις ασφάλειες και τα δικαιώματα του χρήστη"
 
-#: clientgui/BOINCGUIApp.cpp:914
+#: BOINCGUIApp.cpp:584
 msgid "set skin debugging mode to enable skin manager error messages"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:915
+#: BOINCGUIApp.cpp:585
 msgid "multiple instances of BOINC Manager allowed"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:917
+#: BOINCGUIApp.cpp:587
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:1164
+#: BOINCGUIApp.cpp:814
 msgid "(Automatic Detection)"
 msgstr "(Αυτόματη Αναγνώριση)"
 
-#: clientgui/BOINCGUIApp.cpp:1165
+#: BOINCGUIApp.cpp:815
 msgid "(Unknown)"
 msgstr "(Άγνωστο)"
 
-#: clientgui/BOINCGUIApp.cpp:1166
+#: BOINCGUIApp.cpp:816
 msgid "(User Defined)"
 msgstr "(Καθορισμός από το Χρήστη)"
 
-#: clientgui/BOINCTaskBar.cpp:522
+#: BOINCTaskBar.cpp:508
 #, c-format
 msgid "Open %s Web..."
 msgstr "Άνοιγμα %s ιστού..."
 
-#: clientgui/BOINCTaskBar.cpp:529
+#: BOINCTaskBar.cpp:515
 #, c-format
 msgid "Open %s..."
 msgstr "Άνοιγμα %s..."
 
-#: clientgui/BOINCTaskBar.cpp:536
-#: clientgui/BOINCTaskBar.cpp:633
-#: clientgui/BOINCTaskBar.cpp:641
+#: BOINCTaskBar.cpp:522 BOINCTaskBar.cpp:619 BOINCTaskBar.cpp:627
 msgid "Snooze"
 msgstr "Αδρανοποίηση"
 
-#: clientgui/BOINCTaskBar.cpp:538
-#: clientgui/BOINCTaskBar.cpp:660
-#: clientgui/BOINCTaskBar.cpp:668
+#: BOINCTaskBar.cpp:524 BOINCTaskBar.cpp:646 BOINCTaskBar.cpp:654
 msgid "Snooze GPU"
 msgstr "Αδρανοποίηση μονάδας επεξεργασίας γραφικών"
 
-#: clientgui/BOINCTaskBar.cpp:556
+#: BOINCTaskBar.cpp:542
 msgid "E&xit"
 msgstr "Έ%ξοδος"
 
-#: clientgui/BOINCTaskBar.cpp:626
+#: BOINCTaskBar.cpp:612 ViewProjects.cpp:718 ViewWork.cpp:795
+#: sg_BoincSimpleFrame.cpp:758 sg_ProjectCommandPopup.cpp:110
+#: sg_TaskCommandPopup.cpp:102
 msgid "Resume"
 msgstr "Συνέχεια"
 
-#: clientgui/BOINCTaskBar.cpp:653
+#: BOINCTaskBar.cpp:639
 #, fuzzy
 msgid "Resume GPU"
 msgstr "Συνέχεια μετά από παύση"
 
-#: clientgui/BOINCTaskBar.cpp:727
+#: BOINCTaskBar.cpp:713
 msgid "Computing is enabled"
 msgstr "Η επεξεργασία έχει ενεργοποιηθεί"
 
-#: clientgui/BOINCTaskBar.cpp:731
+#: BOINCTaskBar.cpp:717
 msgid "Computing is suspended - "
 msgstr "Η επεξεργασία έχει παυθεί -"
 
-#: clientgui/BOINCTaskBar.cpp:741
+#: BOINCTaskBar.cpp:727
 msgid "GPU computing is enabled"
 msgstr "Η επεξεργασία με την μονάδα επεξεργασίας γραφικών έχει ενεργοποιηθεί"
 
-#: clientgui/BOINCTaskBar.cpp:744
+#: BOINCTaskBar.cpp:730
 msgid "GPU computing is suspended - "
 msgstr "Η επεξεργασία με την μονάδα επεξεργασίας γραφικών έχει παυθεί -"
 
-#: clientgui/BOINCTaskBar.cpp:753
+#: BOINCTaskBar.cpp:739
 msgid "Network is enabled"
 msgstr "Το δίκτυο έχει ενεργοποιηθεί"
 
-#: clientgui/BOINCTaskBar.cpp:756
+#: BOINCTaskBar.cpp:742
 msgid "Network is suspended - "
 msgstr "Το δίκτυο έχει παυθεί -"
 
-#: clientgui/BOINCTaskBar.cpp:764
+#: BOINCTaskBar.cpp:750
 msgid "Reconnecting to client."
 msgstr "Επανασύνδεση με το πρόγραμμα."
 
-#: clientgui/BOINCTaskBar.cpp:766
+#: BOINCTaskBar.cpp:752
 msgid "Not connected to a client."
 msgstr "Μη συνδεδεμένος με το πρόγραμμα."
 
-#: clientgui/BOINCTaskBar.cpp:819
+#: BOINCTaskBar.cpp:805
 #, c-format
 msgid "%s Notices"
 msgstr "%s Ανακοινώσεις"
 
-#: clientgui/BOINCTaskBar.cpp:825
+#: BOINCTaskBar.cpp:811
 msgid "There are new notices - click to view."
 msgstr "Υπάρχουν νέες ανακοινώσεις - πατήστε για να τις δείτε."
 
-#: clientgui/CompletionErrorPage.cpp:199
+#: CompletionErrorPage.cpp:199
 msgid "Failed to add project"
 msgstr "Αποτυχία προσθήκης έργου"
 
-#: clientgui/CompletionErrorPage.cpp:204
+#: CompletionErrorPage.cpp:204
 msgid "Failed to update account manager"
 msgstr "Αποτυχία ενημέρωσης του διαχειριστή λογαριασμού"
 
-#: clientgui/CompletionErrorPage.cpp:208
+#: CompletionErrorPage.cpp:208
 msgid "Failed to remove account manager"
 msgstr "Αποτυχία αφαίρεσης διαχειριστή λογαριασμού"
 
-#: clientgui/CompletionErrorPage.cpp:212
+#: CompletionErrorPage.cpp:212
 msgid "Failed to add account manager"
 msgstr "Αποτυχία προσθήκης του διαχειριστή λογαριασμού"
 
-#: clientgui/CompletionErrorPage.cpp:221
+#: CompletionErrorPage.cpp:221
 msgid ""
 "Please try again later.\n"
 "\n"
 "Click Finish to close."
 msgstr ""
 
-#: clientgui/CompletionErrorPage.cpp:225
-#: clientgui/CompletionPage.cpp:222
-#: clientgui/CompletionPage.cpp:242
-#: clientgui/CompletionPage.cpp:273
+#: CompletionErrorPage.cpp:225 CompletionPage.cpp:222 CompletionPage.cpp:242
+#: CompletionPage.cpp:273
 msgid "Click Finish to close."
 msgstr "Πατήστε Τέλος για να κλείσετε"
 
-#: clientgui/CompletionErrorPage.cpp:234
+#: CompletionErrorPage.cpp:234
 msgid "Messages from server:"
 msgstr "Μηνύματα από το διακομιστή:"
 
-#: clientgui/CompletionPage.cpp:207
+#: CompletionPage.cpp:207
 msgid "Project added"
 msgstr "Το έργο προστέθηκε"
 
-#: clientgui/CompletionPage.cpp:213
+#: CompletionPage.cpp:213
 msgid "This project has been successfully added."
 msgstr "Αυτό το έργο προστέθηκε με επιτυχία."
 
-#: clientgui/CompletionPage.cpp:218
+#: 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 ""
-"Όταν κάνετε κλίκ στο Τέλος, ο φυλλομετρητής σας θα μεταφερθεί στη σελίδα όπου\n"
+"Όταν κάνετε κλίκ στο Τέλος, ο φυλλομετρητής σας θα μεταφερθεί στη σελίδα "
+"όπου\n"
 "μπορείτε να καθορίσετε το όνομα του λογαριασμού σας και τις προτιμήσεις σας."
 
-#: clientgui/CompletionPage.cpp:232
+#: CompletionPage.cpp:232
 #, c-format
 msgid "Update from %s completed."
 msgstr "Η ενημέρωση απο το %s ολοκληρώθηκε."
 
-#: clientgui/CompletionPage.cpp:236
+#: CompletionPage.cpp:236
 msgid "Update completed."
 msgstr "Η ενημέρωση ολοκληρώθηκε."
 
-#: clientgui/CompletionPage.cpp:247
+#: CompletionPage.cpp:247
 msgid "Now using account manager"
 msgstr "Τώρα γίνεται χρήση διαχειριστή λογαριασμού"
 
-#: clientgui/CompletionPage.cpp:252
+#: CompletionPage.cpp:252
 #, c-format
 msgid "Welcome to %s!"
 msgstr "Καλώς Ήρθατε στο %s!"
 
-#: clientgui/CompletionPage.cpp:263
+#: CompletionPage.cpp:263
 #, c-format
 msgid "You are now using %s to manage accounts."
-msgstr "Αυτή τη στιγμή χρησιμοποιείτε %s για να διαχειριστείτε του λογαριασμούς."
+msgstr ""
+"Αυτή τη στιγμή χρησιμοποιείτε %s για να διαχειριστείτε του λογαριασμούς."
 
-#: clientgui/CompletionPage.cpp:267
+#: CompletionPage.cpp:267
 msgid "You are now using this account manager."
 msgstr "Αυτή τη στιγμή γίνεται χρήση αυτού του διαχειριστή λογαριασμού."
 
-#: clientgui/DlgAbout.cpp:113
+#: DlgAbout.cpp:113 mac/Mac_GUI.cpp:96
 #, c-format
 msgid "About %s"
 msgstr "Σχετικά με %s"
 
-#: clientgui/DlgAbout.cpp:172
+#: DlgAbout.cpp:172
 msgid "Version:"
 msgstr "Έκδοση:"
 
-#: clientgui/DlgAbout.cpp:180
+#: DlgAbout.cpp:180
 msgid "wxWidgets Version:"
 msgstr "Έκδοση των wxWidgets:"
 
-#: clientgui/DlgAbout.cpp:188
+#: DlgAbout.cpp:188
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: clientgui/DlgAbout.cpp:192
+# 98%
+#: DlgAbout.cpp:192
+#, fuzzy
 msgid ""
-"(C) 2003-2014 University of California, Berkeley.\n"
+"(C) 2003-2013 University of California, Berkeley.\n"
 "All Rights Reserved."
 msgstr ""
+"(C) 2003-2010 Πανεπιστήμιο της Καλιφόρνια, Μπερκελέυ.\n"
+"Όλα τα δικαιώματα κατοχυρώθηκαν."
 
-#: clientgui/DlgAbout.cpp:196
+#: DlgAbout.cpp:196
 msgid "Berkeley Open Infrastructure for Network Computing"
 msgstr "Berkeley Open Infrastructure for Network Computing"
 
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:399
-#: clientgui/DlgSelectComputer.cpp:163
+#: DlgAbout.cpp:208 DlgExitMessage.cpp:173 DlgGenericMessage.cpp:120
+#: DlgOptions.cpp:396 DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "Εντάξει"
 
-#: clientgui/DlgAdvPreferences.cpp:602
+#: DlgAdvPreferences.cpp:544
 msgid "invalid number"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:603
+#: DlgAdvPreferences.cpp:545
 msgid "invalid time, format is HH:MM"
 msgstr "Εσφαλμένος χρόνος, η μορφή είναι ΩΩ:ΛΛ"
 
-#: clientgui/DlgAdvPreferences.cpp:604
+#: DlgAdvPreferences.cpp:546
 msgid "invalid time interval, format is HH:MM-HH:MM"
 msgstr "εσφαλμένο χρονικό διάστημα, η μορφή είναι ΩΩ:ΛΛ-ΩΩ:ΛΛ"
 
-#: clientgui/DlgAdvPreferences.cpp:817
+#: DlgAdvPreferences.cpp:751
 msgid "invalid input value detected"
 msgstr "εντοπίστηκε εσφαλμένη εισαγμένη τιμή"
 
-#: clientgui/DlgAdvPreferences.cpp:819
+#: DlgAdvPreferences.cpp:753
 msgid "Validation Error"
 msgstr "Σφάλμα επικύρωσης"
 
-#: clientgui/DlgAdvPreferences.cpp:969
-#: clientgui/DlgAdvPreferences.cpp:975
-#: clientgui/DlgAdvPreferences.cpp:981
+#: DlgAdvPreferences.cpp:885 DlgAdvPreferences.cpp:891
+#: DlgAdvPreferences.cpp:897
 msgid "Applications to add"
 msgstr "Εφαρμογές για να προσθέσετε"
 
-#: clientgui/DlgAdvPreferences.cpp:998
+#: DlgAdvPreferences.cpp:914
 #, c-format
 msgid "'%s' is not an executable application."
 msgstr "'%s' δεν είναι μια εκτελέσιμη εφαρμογή."
 
-#: clientgui/DlgAdvPreferences.cpp:999
-#: clientgui/DlgAdvPreferences.cpp:1046
-#: clientgui/DlgAdvPreferences.cpp:1070
+#: DlgAdvPreferences.cpp:915 DlgAdvPreferences.cpp:962
+#: DlgAdvPreferences.cpp:986
 msgid "Add Exclusive App"
 msgstr "Προσθήκη Αποκλειστικής εφαρμογής"
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Name of application to add?"
 msgstr "Όνομα εφαρμογής που προσθέτετε;"
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Add exclusive app"
 msgstr "Προσθήκη αποκλειστικής εφαρμογής"
 
-#: clientgui/DlgAdvPreferences.cpp:1045
+#: DlgAdvPreferences.cpp:961
 #, c-format
 msgid "Application names must end with '%s'"
 msgstr "Τα ονόματα εφαρμογών πρέπει να τελειώνουν σε '%s'"
 
-#: clientgui/DlgAdvPreferences.cpp:1069
+#: DlgAdvPreferences.cpp:985
 #, c-format
 msgid "'%s' is already in the list."
 msgstr "'%s' υπάρχει ήδη στη λίστα."
 
-#: clientgui/DlgAdvPreferences.cpp:1161
+#: DlgAdvPreferences.cpp:1077
 msgid ""
 "Do you really want to clear all local preferences?\n"
 "(This will not affect exclusive applications.)"
@@ -1182,16 +1191,16 @@ msgstr ""
 "Θέλετε πραγματικά να σβήσετε όλες τις τοπικές προτιμήσεις;\n"
 "(Αυτό δε θα επηρεάσει τις αποκλειστικές εφαρμογές.)"
 
-#: clientgui/DlgAdvPreferences.cpp:1162
+#: DlgAdvPreferences.cpp:1078 sg_DlgPreferences.cpp:1030
 msgid "Confirmation"
 msgstr "Επιβεβαίωση"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:49
+#: DlgAdvPreferencesBase.cpp:46 sg_DlgPreferences.cpp:946
 #, c-format
-msgid "%s - Computing preferences"
-msgstr ""
+msgid "%s - Preferences"
+msgstr "%s - Προτιμήσεις"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:66
+#: DlgAdvPreferencesBase.cpp:62
 #, fuzzy
 msgid ""
 "This dialog controls preferences for this computer only.\n"
@@ -1200,283 +1209,287 @@ msgid ""
 msgstr ""
 "Αυτό το παράθυρο ελέγχει τις προτιμήσεις για αυτόν τον υπολογιστή μόνο.\n"
 "Πατήστε Εντάξει για να θέσετε τις προτιμήσεις σας.\n"
-"Πατήστε Εκκαθάριση για να επαναφέρετε τις προεπιλεγμένες ρυθμίσεις (εξαιρούνται οι αποκλειστικές εφαρμογές)."
+"Πατήστε Εκκαθάριση για να επαναφέρετε τις προεπιλεγμένες ρυθμίσεις "
+"(εξαιρούνται οι αποκλειστικές εφαρμογές)."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:69
+#: DlgAdvPreferencesBase.cpp:65 sg_DlgPreferences.cpp:428
 msgid "Clear"
 msgstr "Εκκαθάριση"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:70
+#: DlgAdvPreferencesBase.cpp:66
 msgid "clear all local preferences and close the dialog"
 msgstr "εκκαθάριση όλων των τοπικών προτιμήσεων και κλείσιμο διαλόγου"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:85
+#: DlgAdvPreferencesBase.cpp:81
 msgid "processor usage"
 msgstr "χρήση επεξεργαστή"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:88
+#: DlgAdvPreferencesBase.cpp:84
 msgid "network usage"
 msgstr "χρήση δικτύου"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:91
+#: DlgAdvPreferencesBase.cpp:87
 msgid "disk and memory usage"
 msgstr "χρήση δίσκου και μνήμης"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:94
+#: DlgAdvPreferencesBase.cpp:90
 msgid "exclusive applications"
 msgstr "αποκλειστικές εφαρμογές"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:107
-#: clientgui/DlgDiagnosticLogFlags.cpp:104
+#: DlgAdvPreferencesBase.cpp:102 sg_DlgPreferences.cpp:424
 msgid "OK"
 msgstr "ΕΝΤΑΞΕΙ"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:108
+#: DlgAdvPreferencesBase.cpp:103
 msgid "save all values and close the dialog"
 msgstr "σώσε όλες τις τιμές και κλείσε το παράθυρο"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:114
+#: DlgAdvPreferencesBase.cpp:108
 msgid "close the dialog without saving"
 msgstr "κλείσε το παράθυρο χωρίς να σωθούν οι τιμές"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:118
-#: clientgui/Localization.cpp:35
-#: clientgui/Localization.cpp:121
-#: clientgui/Localization.cpp:139
+#: DlgAdvPreferencesBase.cpp:112 Localization.cpp:35 Localization.cpp:121
+#: Localization.cpp:139 sg_BoincSimpleFrame.cpp:794 sg_DlgPreferences.cpp:439
 msgid "Help"
 msgstr "Βοήθεια"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
+#: DlgAdvPreferencesBase.cpp:113
 msgid "shows the preferences web page"
 msgstr "δείχνει την ιστοσελίδα προτιμήσεων"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:141
+#: DlgAdvPreferencesBase.cpp:135
 msgid "Computing allowed"
 msgstr "Επεξεργασία επιτρέπεται"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
+#: DlgAdvPreferencesBase.cpp:139
 msgid "While computer is on batteries"
 msgstr "Ενώ ο υπολογιστής τροφοδοτείται απο μπαταρίες"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:149
-msgid "check this if you want this computer to do work while it runs on batteries"
-msgstr "επιλέξτε αυτό αν θέλετε ο υπολογιστής σας να εκτελεί εργασίες , ενώ τροφοδοτείται απο μπαταρίες"
+#: DlgAdvPreferencesBase.cpp:142
+msgid ""
+"check this if you want this computer to do work while it runs on batteries"
+msgstr ""
+"επιλέξτε αυτό αν θέλετε ο υπολογιστής σας να εκτελεί εργασίες , ενώ "
+"τροφοδοτείται απο μπαταρίες"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:155
+#: DlgAdvPreferencesBase.cpp:148
 msgid "While computer is in use"
 msgstr "Όταν ο υπολογιστης είναι σε χρήση"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:158
-msgid "check this if you want this computer to do work even when you're using it"
-msgstr "επιλέξτε αυτό αν θέλετε ο υπολογιστής σας να εκτελεί εργασίες ακόμη και αν τον χρησιμοποιείτε"
+#: DlgAdvPreferencesBase.cpp:151
+msgid ""
+"check this if you want this computer to do work even when you're using it"
+msgstr ""
+"επιλέξτε αυτό αν θέλετε ο υπολογιστής σας να εκτελεί εργασίες ακόμη και αν "
+"τον χρησιμοποιείτε"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:164
+#: DlgAdvPreferencesBase.cpp:157
 msgid "Use GPU while computer is in use"
-msgstr "Χρήση της μονάδας επεξεργασίας γραφικών ενώ ο υπολογιστής χρησιμοποιείται"
+msgstr ""
+"Χρήση της μονάδας επεξεργασίας γραφικών ενώ ο υπολογιστής χρησιμοποιείται"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:167
-msgid "check this if you want your GPU to do work even when you're using the computer"
-msgstr "επιλέξτε αυτό, αν θέλετε η μονάδα επεξεργασίας γραφικών να εκτελεί εργασίες ακόμη και αν χρησιμοποιείτε τον υπολογιστή σας"
+#: DlgAdvPreferencesBase.cpp:160
+msgid ""
+"check this if you want your GPU to do work even when you're using the "
+"computer"
+msgstr ""
+"επιλέξτε αυτό, αν θέλετε η μονάδα επεξεργασίας γραφικών να εκτελεί εργασίες "
+"ακόμη και αν χρησιμοποιείτε τον υπολογιστή σας"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:179
+#: DlgAdvPreferencesBase.cpp:172
 msgid "Only after computer has been idle for"
 msgstr "Μόνο αν ο υπολογιστής ήταν αδρανής για"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:188
-msgid "do work only after you haven't used the computer for this number of minutes"
-msgstr "εκτέλεση εργασιών μόνο αν δεν έχετε χρησιμοποιήσει τον υπολογιστή σας για τον εξής αριθμό λεπτών"
+#: DlgAdvPreferencesBase.cpp:182
+msgid ""
+"do work only after you haven't used the computer for this number of minutes"
+msgstr ""
+"εκτέλεση εργασιών μόνο αν δεν έχετε χρησιμοποιήσει τον υπολογιστή σας για "
+"τον εξής αριθμό λεπτών"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:193
-#: clientgui/DlgAdvPreferencesBase.cpp:342
+#: DlgAdvPreferencesBase.cpp:187 DlgAdvPreferencesBase.cpp:336
+#: sg_DlgPreferences.cpp:417
 msgid "minutes"
 msgstr "λεπτά"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:212
+#: DlgAdvPreferencesBase.cpp:206
 msgid "While processor usage is less than"
 msgstr "Ενώ η χρήση του επεξεργαστή είναι μικρότερη απο"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:221
+#: DlgAdvPreferencesBase.cpp:216
 msgid "suspend work if processor usage exceeds this level"
 msgstr "αναστολή εργασιών εάν η χρήση του επεξεργαστή υπερβεί το όριο"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:226
+#: DlgAdvPreferencesBase.cpp:221
 msgid "percent (0 means no restriction)"
 msgstr "τοις εκατό (0 σημαίνει κανένας περιορισμός)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:240
-#: clientgui/DlgAdvPreferencesBase.cpp:506
+#: DlgAdvPreferencesBase.cpp:235 DlgAdvPreferencesBase.cpp:496
 msgid "Every day between hours of"
 msgstr "Κάθε μέρα μεταξύ των ορών"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: DlgAdvPreferencesBase.cpp:239
 msgid "start work at this time"
 msgstr "εκκίνηση εργασιών αυτή την ώρα"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:248
-#: clientgui/DlgAdvPreferencesBase.cpp:514
+#: DlgAdvPreferencesBase.cpp:243 DlgAdvPreferencesBase.cpp:504
+#: sg_DlgPreferences.cpp:326 sg_DlgPreferences.cpp:348
 msgid "and"
 msgstr "και"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:252
+#: DlgAdvPreferencesBase.cpp:247
 msgid "stop work at this time"
 msgstr "σταμάτημα εργασιών αυτή την ώρα"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
-#: clientgui/DlgAdvPreferencesBase.cpp:522
+#: DlgAdvPreferencesBase.cpp:251 DlgAdvPreferencesBase.cpp:512
 msgid "(no restriction if equal)"
 msgstr "(κανένας περιορισμός εάν είναι ίσα)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:261
-#: clientgui/DlgAdvPreferencesBase.cpp:527
+#: DlgAdvPreferencesBase.cpp:256 DlgAdvPreferencesBase.cpp:517
 msgid "Day-of-week override:"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:266
-#: clientgui/DlgAdvPreferencesBase.cpp:532
+#: DlgAdvPreferencesBase.cpp:261 DlgAdvPreferencesBase.cpp:522
 msgid "check box to specify hours for this day of week"
-msgstr "επιλέξτε το κουτάκι για να προσδιορίσετε τις ώρες για αυτή τη μέρα της εβδομάδας"
+msgstr ""
+"επιλέξτε το κουτάκι για να προσδιορίσετε τις ώρες για αυτή τη μέρα της "
+"εβδομάδας"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:272
-#: clientgui/DlgAdvPreferencesBase.cpp:538
+#: DlgAdvPreferencesBase.cpp:267 DlgAdvPreferencesBase.cpp:528
 msgid "Monday"
 msgstr "Δευτέρα"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:279
-#: clientgui/DlgAdvPreferencesBase.cpp:545
+#: DlgAdvPreferencesBase.cpp:274 DlgAdvPreferencesBase.cpp:535
 msgid "Tuesday"
 msgstr "Τρίτη"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:286
-#: clientgui/DlgAdvPreferencesBase.cpp:552
+#: DlgAdvPreferencesBase.cpp:281 DlgAdvPreferencesBase.cpp:542
 msgid "Wednesday"
 msgstr "Τετάρτη"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:293
-#: clientgui/DlgAdvPreferencesBase.cpp:559
+#: DlgAdvPreferencesBase.cpp:288 DlgAdvPreferencesBase.cpp:549
 msgid "Thursday"
 msgstr "Πέμπτη"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:300
-#: clientgui/DlgAdvPreferencesBase.cpp:566
+#: DlgAdvPreferencesBase.cpp:295 DlgAdvPreferencesBase.cpp:556
 msgid "Friday"
 msgstr "Παρασκευή"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:307
-#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: DlgAdvPreferencesBase.cpp:302 DlgAdvPreferencesBase.cpp:563
 msgid "Saturday"
 msgstr "Σάββατο"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:580
+#: DlgAdvPreferencesBase.cpp:309 DlgAdvPreferencesBase.cpp:570
 msgid "Sunday"
 msgstr "Κυριακή"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:328
+#: DlgAdvPreferencesBase.cpp:323
 msgid "Other options"
 msgstr "Άλλες επιλογές"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:336
+#: DlgAdvPreferencesBase.cpp:330
 msgid "Switch between applications every"
 msgstr "Αλλαγή ανάμεσα στις εφαρμογές κάθε"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:345
+#: DlgAdvPreferencesBase.cpp:339
 msgid "On multiprocessor systems, use at most"
 msgstr "Σε πολυεπεξεργαστικά συστήματα, χρήση μέχρι"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
+#: DlgAdvPreferencesBase.cpp:346
 #, no-c-format
-msgid "% of the processors (0 means no restriction)"
+msgid "% of the processors (0 means ignore this setting)"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:355
-#: clientgui/DlgAdvPreferencesBase.cpp:618
-#: clientgui/DlgAdvPreferencesBase.cpp:640
-#: clientgui/DlgAdvPreferencesBase.cpp:661
-#: clientgui/DlgAdvPreferencesBase.cpp:683
-#: clientgui/DlgAdvPreferencesBase.cpp:694
+#: DlgAdvPreferencesBase.cpp:349 DlgAdvPreferencesBase.cpp:605
+#: DlgAdvPreferencesBase.cpp:627 DlgAdvPreferencesBase.cpp:648
+#: DlgAdvPreferencesBase.cpp:669 DlgAdvPreferencesBase.cpp:679
 msgid "Use at most"
 msgstr "Χρήση μέχρι"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:362
+#: DlgAdvPreferencesBase.cpp:356
 #, no-c-format
-msgid "% of CPU time (0 means no restriction)"
-msgstr ""
+msgid "% CPU time"
+msgstr "% χρόνος χρήσης κεντρικής μονάδας επεξεργασίας"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:386
+#: DlgAdvPreferencesBase.cpp:378
 msgid "General options"
 msgstr "Γενικές επιλογές"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:395
+#: DlgAdvPreferencesBase.cpp:386
 msgid "Maximum download rate"
 msgstr "Μέγιστος ρυθμός λήψης"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:401
-#: clientgui/DlgAdvPreferencesBase.cpp:410
-msgid "KBytes/second (0 means no restriction)"
-msgstr ""
+#: DlgAdvPreferencesBase.cpp:392 DlgAdvPreferencesBase.cpp:401
+msgid "KBytes/sec."
+msgstr "ΚBytes/sec."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:404
+#: DlgAdvPreferencesBase.cpp:395
 msgid "Maximum upload rate"
 msgstr "Μέγιστος ρυθμός αποστολής"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:417
+#: DlgAdvPreferencesBase.cpp:406
+msgid "Transfer at most"
+msgstr "Μεταφορά το μέγιστο"
+
+#: DlgAdvPreferencesBase.cpp:412
+msgid "Mbytes"
+msgstr "Mbytes"
+
+#: DlgAdvPreferencesBase.cpp:415
+msgid "every"
+msgstr "κάθε"
+
+#: DlgAdvPreferencesBase.cpp:421 DlgAdvPreferencesBase.cpp:444
+#: DlgAdvPreferencesBase.cpp:463
+msgid "days"
+msgstr "μέρες"
+
+#: DlgAdvPreferencesBase.cpp:429
 msgid "Minimum work buffer"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:425
+#: DlgAdvPreferencesBase.cpp:438
 msgid "Try to maintain enough tasks to keep busy for this many days"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:431
-#: clientgui/DlgAdvPreferencesBase.cpp:449
-msgid "days (maximum value: 10)"
-msgstr ""
-
-#: clientgui/DlgAdvPreferencesBase.cpp:437
+#: DlgAdvPreferencesBase.cpp:450
 msgid "Max additional work buffer"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:445
+#: DlgAdvPreferencesBase.cpp:459
 msgid "In addition, maintain enough tasks for up to this many days"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:454
-msgid "Transfer at most"
-msgstr "Μεταφορά το μέγιστο"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:462
-msgid "MBytes every"
-msgstr ""
-
-#: clientgui/DlgAdvPreferencesBase.cpp:468
-msgid "days (0 means no restriction)"
-msgstr ""
-
-#: clientgui/DlgAdvPreferencesBase.cpp:476
+#: DlgAdvPreferencesBase.cpp:466
 msgid "Skip image file verification"
 msgstr "Παράκαμψη επαλήθευσης αρχείου εικόνας"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:478
+#: DlgAdvPreferencesBase.cpp:468
 msgid "check this if your Internet provider modifies image files"
-msgstr "επιλέξτε αυτό εάν ο διαδικτυακός σας πάροχος τροποποιεί τα εικονικά αρχεία"
+msgstr ""
+"επιλέξτε αυτό εάν ο διαδικτυακός σας πάροχος τροποποιεί τα εικονικά αρχεία"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:484
+#: DlgAdvPreferencesBase.cpp:476
 msgid "Connect options"
 msgstr "Επιλογές σύνδεσης"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:487
+#: DlgAdvPreferencesBase.cpp:478
 msgid "Confirm before connecting to internet"
 msgstr "Επιβεβαιώστε πρωτού συνδεθείτε στο διαδίκτυο"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
-msgstr "εάν επιλεχθεί, ένα παράθυρο επιβεβαίωσης θα εμφανιστεί πρωτού προσπαθήσετε να συνδεθείτε στο διαδίκτυο"
+#: DlgAdvPreferencesBase.cpp:480
+msgid ""
+"if checked, a confirmation dialog will be displayed before trying to connect "
+"to the Internet"
+msgstr ""
+"εάν επιλεχθεί, ένα παράθυρο επιβεβαίωσης θα εμφανιστεί πρωτού προσπαθήσετε "
+"να συνδεθείτε στο διαδίκτυο"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:493
+#: DlgAdvPreferencesBase.cpp:484
 msgid "Disconnect when done"
 msgstr "Αποσύνδεση όταν τελειώσει"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:495
+#: DlgAdvPreferencesBase.cpp:486
 msgid ""
 "if checked, BOINC hangs up when network usage is done\n"
 "(only relevant for dialup-connection)"
@@ -1484,215 +1497,199 @@ msgstr ""
 "εάν επιλεχθεί, το BOINC θα κολλάει όταν η χρήση του δικτύου ολοκληρώνεται\n"
 "(σχετικό μόνο με dialup-συνδέσεις)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:501
+#: DlgAdvPreferencesBase.cpp:492
 msgid "Network usage allowed"
 msgstr "Χρήση του δικτύου επιτρέπεται"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:510
+#: DlgAdvPreferencesBase.cpp:500
 msgid "network usage start hour"
 msgstr "Ώρα εκκίνησης χρήσης δικτύου"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:518
+#: DlgAdvPreferencesBase.cpp:508
 msgid "network usage stop hour"
 msgstr "Ώρα σταματήματος χρήσης δικτύου"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:610
-#: clientgui/DlgItemProperties.cpp:257
+#: DlgAdvPreferencesBase.cpp:598 DlgItemProperties.cpp:231
 msgid "Disk usage"
 msgstr "Χρήση δίσκου"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:622
+#: DlgAdvPreferencesBase.cpp:609
 msgid "the maximum disk space used by BOINC (in Gigabytes)"
 msgstr "μέγιστος χώρος χρήσης του δίσκου απο το BOINC (σε Gigabytes)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:626
-msgid "Gigabytes disk space (0 means no restriction)"
-msgstr ""
+#: DlgAdvPreferencesBase.cpp:613
+msgid "Gigabytes disk space"
+msgstr "Gigabytes χώρος δίσκου"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:629
+#: DlgAdvPreferencesBase.cpp:616
 msgid "Leave at least"
 msgstr "Άφησε τουλάχιστον "
 
-#: clientgui/DlgAdvPreferencesBase.cpp:633
+#: DlgAdvPreferencesBase.cpp:620
 msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
-msgstr "Το BOINC αφήνει τουλάχιστον αυτό το ποσό του δίσκου ελεύθερο (σε Gigabytes)"
+msgstr ""
+"Το BOINC αφήνει τουλάχιστον αυτό το ποσό του δίσκου ελεύθερο (σε Gigabytes)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:637
+#: DlgAdvPreferencesBase.cpp:624
 msgid "Gigabytes disk space free"
 msgstr "Gigabytes ελεύθερου χώρου στο δίσκο"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
+#: DlgAdvPreferencesBase.cpp:631
 msgid "BOINC uses at most this percentage of total disk space"
 msgstr "Το BOINC χρησιμοποιεί μέγιστο αυτό το ποσοστό του χώρου του δίσκου"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:649
+#: DlgAdvPreferencesBase.cpp:636
 #, no-c-format
 msgid "% of total disk space"
 msgstr "% του συνολικού χώρου του δίσκου"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:652
+#: DlgAdvPreferencesBase.cpp:639
 msgid "Tasks checkpoint to disk at most every"
 msgstr "Εγγραφή σημείων ελέγχου της εφαρμογής στο δίσκο κάθε"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
+#: DlgAdvPreferencesBase.cpp:645
 msgid "seconds"
 msgstr "δευτερόλεπτα"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:668
+#: DlgAdvPreferencesBase.cpp:655
 #, no-c-format
+#, fuzzy, no-c-format
 msgid "% of page file (swap space)"
 msgstr "% του αρχείου σελίδας (swap χώρος)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:675
+#: DlgAdvPreferencesBase.cpp:662
 msgid "Memory usage"
 msgstr "Χρήση μνήμης"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
+#: DlgAdvPreferencesBase.cpp:676
 #, no-c-format
 msgid "% when computer is in use"
 msgstr "% όταν ο υπολογιστης είναι σε χρήση"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:701
+#: DlgAdvPreferencesBase.cpp:686
 #, no-c-format
 msgid "% when computer is idle"
 msgstr "% όταν ο υπολογιστής είναι αδρανής"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:706
+#: DlgAdvPreferencesBase.cpp:691
 msgid "Leave applications in memory while suspended"
 msgstr "Παραμονή των εφαρμογών στην μνήμη ενώ έχου παυθεί οι εργασίες"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:708
+#: DlgAdvPreferencesBase.cpp:693
 msgid "if checked, suspended work units are left in memory"
 msgstr "εάν επιλεγεί, οι αναβληθείσες εργασίες παραμένουν στη μνήμη"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:728
-msgid "Suspend processor and network usage when these applications are running:"
-msgstr "Παύση χρήσης επεξεργαστή και δικτύου όταν εκτελούνται αυτές οι εφαρμογές:"
+#: DlgAdvPreferencesBase.cpp:713
+msgid ""
+"Suspend processor and network usage when these applications are running:"
+msgstr ""
+"Παύση χρήσης επεξεργαστή και δικτύου όταν εκτελούνται αυτές οι εφαρμογές:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:738
+#: DlgAdvPreferencesBase.cpp:722
 msgid "Add..."
 msgstr "Προσθήκη..."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:739
+#: DlgAdvPreferencesBase.cpp:723
 msgid "Add an application to this list"
 msgstr "Προσθήκη μιας εφαρμογής στη λίστα"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:744
+#: DlgAdvPreferencesBase.cpp:728 ViewProjects.cpp:202
+#: sg_ProjectCommandPopup.cpp:85
 msgid "Remove"
 msgstr "Αφαίρεση"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:745
+#: DlgAdvPreferencesBase.cpp:729
 msgid "Remove an application from this list"
 msgstr "Αφαίρεση μιας εφαρμογής απο τη λίστα"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:754
+#: DlgAdvPreferencesBase.cpp:738
 msgid "For advanced options, refer to "
 msgstr "Για προχωρημένες επιλογές, ανατρέξτε στο"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:65
-#, c-format
-msgid "%s Diagnostic Log Flags"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:83
-msgid "These flags enable various types of diagnostic messages in the Event Log."
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:105
-msgid "Save all values and close the dialog"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:108
-msgid "Defaults"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:109
-msgid "Restore default settings"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:113
-msgid "Close the dialog without saving"
-msgstr ""
-
-#: clientgui/DlgEventLog.cpp:226
+#: DlgEventLog.cpp:219
 #, c-format
 msgid "%s - Event Log"
 msgstr "%s - Καταγραφέας Συμβάντων"
 
-#: clientgui/DlgEventLog.cpp:236
+#: DlgEventLog.cpp:232 ViewMessages.cpp:117 ViewProjects.cpp:219
+#: ViewStatistics.cpp:435 ViewStatistics.cpp:2009 ViewTransfers.cpp:182
+#: ViewWork.cpp:232
 msgid "Project"
 msgstr "Πρόγραμμα"
 
-#: clientgui/DlgEventLog.cpp:237
+#: DlgEventLog.cpp:233 ViewMessages.cpp:118
 msgid "Time"
 msgstr "Χρόνος"
 
-#: clientgui/DlgEventLog.cpp:238
+#: DlgEventLog.cpp:234 ViewMessages.cpp:119
 msgid "Message"
 msgstr "Μήνυμα"
 
-#: clientgui/DlgEventLog.cpp:300
-#: clientgui/DlgEventLog.cpp:364
+#: DlgEventLog.cpp:290 DlgEventLog.cpp:354
 #, fuzzy
 msgid "&Show only this project"
 msgstr "&Εμφάνιση μόνο αυτού του προγράμματος"
 
-#: clientgui/DlgEventLog.cpp:304
+#: DlgEventLog.cpp:294
 #, fuzzy
 msgid "Copy &All"
 msgstr "Αντιγραφή &Όλων"
 
-#: clientgui/DlgEventLog.cpp:306
-#: clientgui/DlgEventLog.cpp:310
+#: DlgEventLog.cpp:296 DlgEventLog.cpp:300 ViewMessages.cpp:89
 msgid "Copy all the messages to the clipboard."
 msgstr "Αντιγραφή όλων των μηνυμάτων στο πρόχειρο"
 
-#: clientgui/DlgEventLog.cpp:315
+#: DlgEventLog.cpp:305
 #, fuzzy
 msgid "Copy &Selected"
 msgstr "Αντιγραφή Επιλεγμένων"
 
-#: clientgui/DlgEventLog.cpp:318
-#: clientgui/DlgEventLog.cpp:326
-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 "Αντιγραφή των επιλεγμένων μηνυμάτων στο πρόχειρο. Μπορείτε να επιλέξετε πολλαπλά μηνύματα κρατώντας πατημένο το κουμπί shift ή control ενώ πατάτε στα μηνύματα."
+#: DlgEventLog.cpp:308 DlgEventLog.cpp:316 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 ""
+"Αντιγραφή των επιλεγμένων μηνυμάτων στο πρόχειρο. Μπορείτε να επιλέξετε "
+"πολλαπλά μηνύματα κρατώντας πατημένο το κουμπί shift ή control ενώ πατάτε "
+"στα μηνύματα."
 
-#: clientgui/DlgEventLog.cpp:320
-#: clientgui/DlgEventLog.cpp:328
-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 "Αντιγραφή επιλεγμένων μηνυμάτων στο clipboard. Μπορείτε να επιλέξετε πολλαπλά μηνύματα κρατώντας πατημένο το κουμπί shift ή control όταν κάνετε κλίκ στα μηνύματα."
+#: DlgEventLog.cpp:310 DlgEventLog.cpp:318 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 ""
+"Αντιγραφή επιλεγμένων μηνυμάτων στο clipboard. Μπορείτε να επιλέξετε "
+"πολλαπλά μηνύματα κρατώντας πατημένο το κουμπί shift ή control όταν κάνετε "
+"κλίκ στα μηνύματα."
 
-#: clientgui/DlgEventLog.cpp:335
-#: clientgui/DlgItemProperties.cpp:67
+#: DlgEventLog.cpp:325 DlgItemProperties.cpp:67
 msgid "&Close"
 msgstr "&Έξοδος"
 
-#: clientgui/DlgEventLog.cpp:344
+#: DlgEventLog.cpp:334 sg_BoincSimpleFrame.cpp:798 sg_DlgPreferences.cpp:442
 #, c-format
 msgid "Get help with %s"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:358
+#: DlgEventLog.cpp:348
 #, fuzzy
 msgid "Show all &messages"
 msgstr "Εμφάνιση όλων των μηνυμάτων"
 
-#: clientgui/DlgEventLog.cpp:359
-#: clientgui/DlgEventLog.cpp:361
+#: DlgEventLog.cpp:349 DlgEventLog.cpp:351
 msgid "Show messages for all projects"
 msgstr "Εμφάνιση μηνυμάτων για όλα τα έργα."
 
-#: clientgui/DlgEventLog.cpp:365
-#: clientgui/DlgEventLog.cpp:367
+#: DlgEventLog.cpp:355 DlgEventLog.cpp:357
 msgid "Show only the messages for the selected project"
 msgstr "Εμφάνιση μόνο των μηνυμάτων για το επιλεγμένο έργο"
 
-#: clientgui/DlgExitMessage.cpp:82
+#: DlgExitMessage.cpp:82
 #, c-format
 msgid "%s - Exit Confirmation"
 msgstr "%s- Έξοδος επιβεβαίωσης"
 
-#: clientgui/DlgExitMessage.cpp:130
+#: DlgExitMessage.cpp:130
 #, c-format
 msgid ""
 "You have requested to exit the %s,\n"
@@ -1703,8 +1700,9 @@ msgid ""
 "choose from the following options:"
 msgstr ""
 
-#: clientgui/DlgExitMessage.cpp:135
+#: DlgExitMessage.cpp:135
 #, c-format
+#, fuzzy, c-format
 msgid ""
 "This will shut down %s and its tasks until either the\n"
 "%s or the %s screen saver is run again.\n"
@@ -1716,864 +1714,864 @@ msgstr ""
 "Αυτό θα τερμάτίσει το %s και τις εργασίες του ολοκληρωτικά μέχρι είτε η\n"
 "%s εφαρμογή είτε η προφύλαξη οθόνης του %s ξανατρέξει.\n"
 "\n"
-"Στις περισσότερες περιπτώσεις, είναι καλύτερο απλά να κλείσετε το παράθυρο του %s\n"
-"απο το να κλείσετε την εφαρμογή; πράγμα που θα επιτρέψει στο %s να εκτελέσει τις\n"
+"Στις περισσότερες περιπτώσεις, είναι καλύτερο απλά να κλείσετε το παράθυρο "
+"του %s\n"
+"απο το να κλείσετε την εφαρμογή; πράγμα που θα επιτρέψει στο %s να εκτελέσει "
+"τις\n"
 "εργασίες τις στιγμές που έχετε επιλέξει στις προτιμήσεις σας. "
 
-#: clientgui/DlgExitMessage.cpp:153
+#: DlgExitMessage.cpp:153
 #, c-format
 msgid "Stop running tasks when exiting the %s"
 msgstr ""
 
-#: clientgui/DlgExitMessage.cpp:165
+#: DlgExitMessage.cpp:165
 msgid "Remember this decision and do not show this dialog."
-msgstr "Να απομνημονευτεί η απόφαση και να μην εμφανιστεί ξανά αυτό το παράθυρο."
+msgstr ""
+"Να απομνημονευτεί η απόφαση και να μην εμφανιστεί ξανά αυτό το παράθυρο."
 
-#: clientgui/DlgExitMessage.cpp:178
-#: clientgui/DlgGenericMessage.cpp:125
-#: clientgui/DlgOptions.cpp:404
-#: clientgui/DlgSelectComputer.cpp:168
+#: DlgExitMessage.cpp:178 DlgGenericMessage.cpp:125 DlgOptions.cpp:401
+#: DlgSelectComputer.cpp:168 wizardex.cpp:378
 msgid "&Cancel"
 msgstr "Ακύρωση"
 
-#: clientgui/DlgGenericMessage.cpp:112
+#: DlgGenericMessage.cpp:112
 msgid "Don't show this dialog again."
 msgstr "Μην ξαναεμφανίσεις αυτό το μήνυμα."
 
-#: clientgui/DlgItemProperties.cpp:194
-#: clientgui/DlgItemProperties.cpp:197
-#: clientgui/DlgItemProperties.cpp:200
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:168 DlgItemProperties.cpp:171
+#: DlgItemProperties.cpp:174 DlgItemProperties.cpp:177
 #, fuzzy
 msgid "Don't fetch tasks for "
 msgstr "Δεν δέχεται νέες εργασίες"
 
-#: clientgui/DlgItemProperties.cpp:194
+#: DlgItemProperties.cpp:168
 msgid "Project preference"
 msgstr "Προτιμήσεις έργου"
 
-#: clientgui/DlgItemProperties.cpp:197
+#: DlgItemProperties.cpp:171
 #, fuzzy
 msgid "Account manager preference"
 msgstr "Ιστοσελίδα του προγράμματος διαχείρισης λογαριασμού"
 
-#: clientgui/DlgItemProperties.cpp:200
+#: DlgItemProperties.cpp:174
 #, fuzzy
 msgid "Project has no apps for "
 msgstr "Το πρόγραμμα δεν έχει εφαρμογές για"
 
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:177
 #, fuzzy
 msgid "Client configuration excludes "
 msgstr "Η παραμετροποίηση του προγράμματος αποκλείει"
 
-#: clientgui/DlgItemProperties.cpp:207
+#: DlgItemProperties.cpp:181
 #, fuzzy
 msgid " work fetch deferred for"
 msgstr "η λήψη εργασιών αναβλήθηκε για "
 
-#: clientgui/DlgItemProperties.cpp:208
+#: DlgItemProperties.cpp:182
 msgid " work fetch deferral interval"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:213
 msgid "Properties of project "
 msgstr "Ρυθμίσεις του προγράμματος"
 
-#: clientgui/DlgItemProperties.cpp:243
-#: clientgui/DlgOptions.cpp:221
+#: DlgItemProperties.cpp:217 DlgOptions.cpp:218
 msgid "General"
 msgstr "Γενικά"
 
-#: clientgui/DlgItemProperties.cpp:244
+#: DlgItemProperties.cpp:218
 msgid "Master URL"
 msgstr "Κεντρική ηλεκρονική διεύθυνση"
 
-#: clientgui/DlgItemProperties.cpp:245
+#: DlgItemProperties.cpp:219
 msgid "User name"
 msgstr "Όνομα Χρήστη"
 
-#: clientgui/DlgItemProperties.cpp:246
+#: DlgItemProperties.cpp:220
 msgid "Team name"
 msgstr "Όνομα ομάδας"
 
-#: clientgui/DlgItemProperties.cpp:247
+#: DlgItemProperties.cpp:221 ViewProjects.cpp:224
 msgid "Resource share"
 msgstr "Μερίδα πόρων"
 
-#: clientgui/DlgItemProperties.cpp:249
+#: DlgItemProperties.cpp:223
 msgid "Scheduler RPC deferred for"
 msgstr "Το χρονοδιάγραμμα RPC αναβλήθηκε για"
 
-#: clientgui/DlgItemProperties.cpp:252
+#: DlgItemProperties.cpp:226
 msgid "File downloads deferred for"
 msgstr "Η λήψη του αρχείου αναβλήθηκε για"
 
-#: clientgui/DlgItemProperties.cpp:255
+#: DlgItemProperties.cpp:229
 msgid "File uploads deferred for"
 msgstr "Η αποστολή του αρχείου αναβλήθηκε για"
 
-#: clientgui/DlgItemProperties.cpp:258
+#: DlgItemProperties.cpp:232
 msgid "Computer ID"
 msgstr "Ταυτότητα υπολογιστή"
 
-#: clientgui/DlgItemProperties.cpp:260
+#: DlgItemProperties.cpp:234
 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
+#: DlgItemProperties.cpp:234 DlgItemProperties.cpp:236
+#: DlgItemProperties.cpp:237 DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:242 DlgItemProperties.cpp:251
+#: DlgItemProperties.cpp:254 DlgItemProperties.cpp:257
 msgid "yes"
 msgstr "ναί"
 
-#: clientgui/DlgItemProperties.cpp:262
+#: DlgItemProperties.cpp:236
 msgid "Suspended via GUI"
 msgstr "Παύθηκε μέσω GUI"
 
-#: clientgui/DlgItemProperties.cpp:262
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:236 DlgItemProperties.cpp:237
 msgid "no"
 msgstr "όχι"
 
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:237
 msgid "Don't request more work"
 msgstr "Μη ζητήσετε επιπλέον εργασίες"
 
-#: clientgui/DlgItemProperties.cpp:265
+#: DlgItemProperties.cpp:239
 msgid "Scheduler call in progress"
 msgstr "Κλήση χρονοδιαγράμματος σε εξέλιξη"
 
-#: clientgui/DlgItemProperties.cpp:268
+#: DlgItemProperties.cpp:242
 msgid "Trickle-up pending"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:271
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:245 DlgItemProperties.cpp:247
 #, fuzzy
 msgid "Host location"
 msgstr "Τοποθεσία Φιλοξενητή"
 
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:247
 #, fuzzy
 msgid "default"
 msgstr "Εξ'ορισμού"
 
-#: clientgui/DlgItemProperties.cpp:277
+#: DlgItemProperties.cpp:251
 msgid "Added via account manager"
 msgstr "Προστέθηκε μέσω του διαχειριστή λογαριασμού"
 
-#: clientgui/DlgItemProperties.cpp:280
+#: DlgItemProperties.cpp:254
 msgid "Remove when tasks done"
 msgstr "Αφαίρεση όταν οι εργασίες ολοκληρωθούν"
 
-#: clientgui/DlgItemProperties.cpp:283
+#: DlgItemProperties.cpp:257
 msgid "Ended"
 msgstr "Τελειωμένο"
 
-#: clientgui/DlgItemProperties.cpp:285
-msgid "Tasks completed"
-msgstr ""
-
-#: clientgui/DlgItemProperties.cpp:286
-msgid "Tasks failed"
-msgstr ""
-
-#: clientgui/DlgItemProperties.cpp:288
+#: DlgItemProperties.cpp:259
 msgid "Credit"
 msgstr "Πόντοι"
 
-#: clientgui/DlgItemProperties.cpp:289
+#: DlgItemProperties.cpp:260
 msgid "User"
 msgstr "Χρήστης"
 
-#: clientgui/DlgItemProperties.cpp:296
+#: DlgItemProperties.cpp:267
 msgid "Host"
 msgstr "Πάροχος"
 
-#: clientgui/DlgItemProperties.cpp:305
+#: DlgItemProperties.cpp:276
 msgid "Scheduling"
 msgstr "Χρήση χρονοδιαγράμματος"
 
-#: clientgui/DlgItemProperties.cpp:306
+#: DlgItemProperties.cpp:277
 msgid "Scheduling priority"
 msgstr "Προγραμματισμός προτεραιότητας"
 
-#: clientgui/DlgItemProperties.cpp:307
+#: DlgItemProperties.cpp:278
 msgid "CPU"
 msgstr "Επεξεργαστής"
 
-#: clientgui/DlgItemProperties.cpp:331
+#: DlgItemProperties.cpp:302
 msgid "Duration correction factor"
 msgstr "Παράγοντας διόρθωσης διάρκειας"
 
-#: clientgui/DlgItemProperties.cpp:345
+#: DlgItemProperties.cpp:316
 msgid "Properties of task "
 msgstr "Ιδιότητες εργασίας"
 
-#: clientgui/DlgItemProperties.cpp:357
+#: DlgItemProperties.cpp:328 ViewWork.cpp:238
 msgid "Application"
 msgstr "Εφαρμογή"
 
-#: clientgui/DlgItemProperties.cpp:358
+#: DlgItemProperties.cpp:329 ViewWork.cpp:239
 msgid "Name"
 msgstr "Όνομα"
 
-#: clientgui/DlgItemProperties.cpp:359
+#: DlgItemProperties.cpp:330
 msgid "State"
 msgstr "Κατάσταση"
 
-#: clientgui/DlgItemProperties.cpp:362
+#: DlgItemProperties.cpp:333
 msgid "Received"
 msgstr "Ληφθέντα"
 
-#: clientgui/DlgItemProperties.cpp:365
+#: DlgItemProperties.cpp:336
 msgid "Report deadline"
 msgstr "Προθεσμία αναφοράς"
 
-#: clientgui/DlgItemProperties.cpp:367
+#: DlgItemProperties.cpp:338
 msgid "Resources"
 msgstr "Πόροι"
 
-#: clientgui/DlgItemProperties.cpp:370
+#: DlgItemProperties.cpp:341
 msgid "Estimated computation size"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:373
+#: DlgItemProperties.cpp:344
 msgid "CPU time at last checkpoint"
-msgstr "Χρόνος χρήσης κεντρικής μονάδας επεξεργασίας στο τελευταίο σημείο ελέγχου"
+msgstr ""
+"Χρόνος χρήσης κεντρικής μονάδας επεξεργασίας στο τελευταίο σημείο ελέγχου"
 
-#: clientgui/DlgItemProperties.cpp:374
-#: clientgui/DlgItemProperties.cpp:389
+#: DlgItemProperties.cpp:345 DlgItemProperties.cpp:360
 msgid "CPU time"
 msgstr "Χρόνος Επεξεργαστή"
 
-#: clientgui/DlgItemProperties.cpp:376
-#: clientgui/DlgItemProperties.cpp:390
+#: DlgItemProperties.cpp:347 DlgItemProperties.cpp:361
 msgid "Elapsed time"
 msgstr "Χρόνος που έχει περάσει"
 
-#: clientgui/DlgItemProperties.cpp:378
+#: DlgItemProperties.cpp:349
 msgid "Estimated time remaining"
 msgstr "Εκτιμώμενος χρόνος που απομένει"
 
-#: clientgui/DlgItemProperties.cpp:379
+#: DlgItemProperties.cpp:350
 msgid "Fraction done"
 msgstr "Ολοκλήρωση κλάσματος"
 
-#: clientgui/DlgItemProperties.cpp:380
+#: DlgItemProperties.cpp:351
 msgid "Virtual memory size"
 msgstr "Μέγεθος εικονικής μνήμης"
 
-#: clientgui/DlgItemProperties.cpp:381
+#: DlgItemProperties.cpp:352
 msgid "Working set size"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:383
+#: DlgItemProperties.cpp:354
 msgid "Directory"
 msgstr "Διεύθυνση"
 
-#: clientgui/DlgItemProperties.cpp:386
+#: DlgItemProperties.cpp:357
 msgid "Process ID"
 msgstr "Ταυτότητα διαδικασίας"
 
-#: clientgui/DlgItemProperties.cpp:456
+#: DlgItemProperties.cpp:427 ViewWork.cpp:1032 sg_TaskPanel.cpp:823
 msgid "Local: "
 msgstr "Τοπικό:"
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: DlgOptions.cpp:129 DlgOptions.cpp:135
 msgid "Options"
 msgstr "Επιλογές"
 
-#: clientgui/DlgOptions.cpp:178
+#: DlgOptions.cpp:175
 msgid "Language:"
 msgstr "Γλώσσα:"
 
-#: clientgui/DlgOptions.cpp:185
+#: DlgOptions.cpp:182
 msgid "What language should BOINC use?"
 msgstr "Τι γλώσσα να χρησιμοποιεί το BOINC;"
 
-#: clientgui/DlgOptions.cpp:189
+#: DlgOptions.cpp:186
 msgid "Notice reminder interval:"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:196
+#: DlgOptions.cpp:193
 msgid "How often should BOINC remind you of new notices?"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:201
+#: DlgOptions.cpp:198
 msgid "Run Manager at login?"
 msgstr "Εκτέλεση διαχειριστή κατά τη σύνδεση;"
 
-#: clientgui/DlgOptions.cpp:207
+#: DlgOptions.cpp:204
 msgid "Run the BOINC Manager when you log on."
 msgstr "Εκτέλεση του BOINC διαχειριστή όταν συνδέεστε."
 
-#: clientgui/DlgOptions.cpp:212
+#: DlgOptions.cpp:209
 msgid "Enable Manager exit dialog?"
 msgstr "Ενεργοποίηση παράθυρου εξόδου Διαχειριστή;"
 
-#: clientgui/DlgOptions.cpp:218
+#: DlgOptions.cpp:215
 msgid "Display the exit dialog when shutting down the Manager."
 msgstr "Εμφάνιση του παράθυρου εξόδου όταν τερματίζεται ο Διαχειριστής."
 
-#: clientgui/DlgOptions.cpp:229
+#: DlgOptions.cpp:226
 msgid "Dial-up and Virtual Private Network settings"
 msgstr "Ρυθμίσεις σύνδεσης μέσω τηλεφώνου και Ιδιωτικού Εικονικού Δικτύου"
 
-#: clientgui/DlgOptions.cpp:243
+#: DlgOptions.cpp:240
 msgid "&Set Default"
 msgstr "Καθορισμός Εξ' ορισμού"
 
-#: clientgui/DlgOptions.cpp:248
+#: DlgOptions.cpp:245
 msgid "&Clear Default"
 msgstr "Καθάρισμα Εξ' ορισμού"
 
-#: clientgui/DlgOptions.cpp:255
+#: DlgOptions.cpp:252
 msgid "Default Connection:"
 msgstr "Εξ' ορισμού Σύνδεση:"
 
-#: clientgui/DlgOptions.cpp:262
+#: DlgOptions.cpp:259
 msgid "Connections"
 msgstr "Συνδέσεις"
 
-#: clientgui/DlgOptions.cpp:271
+#: DlgOptions.cpp:268
 msgid "Connect via HTTP proxy server"
 msgstr "Σύνδεση μέσω διακομιστή HTTP proxy"
 
-#: clientgui/DlgOptions.cpp:275
+#: DlgOptions.cpp:272
 msgid "HTTP Proxy Server Configuration"
 msgstr "Ρυθμίσεις διακομιστή HTTP Proxy"
 
-#: clientgui/DlgOptions.cpp:283
-#: clientgui/DlgOptions.cpp:347
+#: DlgOptions.cpp:280 DlgOptions.cpp:344
 msgid "Address:"
 msgstr "Διεύθυνση:"
 
-#: clientgui/DlgOptions.cpp:291
-#: clientgui/DlgOptions.cpp:355
+#: DlgOptions.cpp:288 DlgOptions.cpp:352 ProxyPage.cpp:340 ProxyPage.cpp:360
 msgid "Port:"
 msgstr "Θύρα:"
 
-#: clientgui/DlgOptions.cpp:299
-#: clientgui/DlgOptions.cpp:363
+#: DlgOptions.cpp:296 DlgOptions.cpp:360
 msgid "Don't use proxy for:"
 msgstr "Να μη χρησιμοποιείται η proy για:"
 
-#: clientgui/DlgOptions.cpp:306
-#: clientgui/DlgOptions.cpp:370
+#: DlgOptions.cpp:303 DlgOptions.cpp:367
 msgid "Leave these blank if not needed"
 msgstr "Αφήστε τα κενά εάν δεν χρειάζονται"
 
-#: clientgui/DlgOptions.cpp:312
-#: clientgui/DlgOptions.cpp:376
+#: DlgOptions.cpp:309 DlgOptions.cpp:373 ProxyPage.cpp:343 ProxyPage.cpp:363
 msgid "User Name:"
 msgstr "Όνομα Χρήστη"
 
-#: clientgui/DlgOptions.cpp:320
-#: clientgui/DlgOptions.cpp:384
-#: clientgui/DlgSelectComputer.cpp:152
+#: DlgOptions.cpp:317 DlgOptions.cpp:381 DlgSelectComputer.cpp:152
+#: ProxyPage.cpp:346 ProxyPage.cpp:366
 msgid "Password:"
 msgstr "Κωδικός:"
 
-#: clientgui/DlgOptions.cpp:327
+#: DlgOptions.cpp:324
 msgid "HTTP Proxy"
 msgstr "HTTP Proxy"
 
-#: clientgui/DlgOptions.cpp:335
+#: DlgOptions.cpp:332
 msgid "Connect via SOCKS proxy server"
 msgstr "Σύνδεση μέσω διακομιστή SOCKS proxy"
 
-#: clientgui/DlgOptions.cpp:339
+#: DlgOptions.cpp:336
 msgid "SOCKS Proxy Server Configuration"
 msgstr "Ρυθμίσεις διακομιστή SOCKS Proxy"
 
-#: clientgui/DlgOptions.cpp:391
+#: DlgOptions.cpp:388
 msgid "SOCKS Proxy"
 msgstr "SOCKS Proxy"
 
-#: clientgui/DlgOptions.cpp:589
+#: DlgOptions.cpp:586
 #, fuzzy
 msgid "always"
 msgstr "&Διαρκής εκτέλεση"
 
-#: clientgui/DlgOptions.cpp:590
+#: DlgOptions.cpp:587
 msgid "1 hour"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:591
+#: DlgOptions.cpp:588
 msgid "6 hours"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:592
+#: DlgOptions.cpp:589
 #, fuzzy
 msgid "1 day"
 msgstr "1 μέρα"
 
-#: clientgui/DlgOptions.cpp:593
+#: DlgOptions.cpp:590
 msgid "1 week"
 msgstr "1 εβδομάδα"
 
-#: clientgui/DlgOptions.cpp:594
+#: DlgOptions.cpp:591
 #, fuzzy
 msgid "never"
 msgstr "ποτέ"
 
-#: clientgui/DlgOptions.cpp:691
+#: DlgOptions.cpp:688
 #, c-format
 msgid "%s - Language Selection"
 msgstr "%s- Επιλογή γλώσσας"
 
-#: clientgui/DlgOptions.cpp:698
+#: DlgOptions.cpp:695
 #, c-format
-msgid "The %s's language has been changed.  In order for this change to take effect, you must restart the %s."
-msgstr "Η %s γλώσσα έχει αλλάξει.  Για να τεθεί σε εφαρμογή αυτή η αλλαγή, πρέπει να επανεκκινήσετε το %s."
+#, fuzzy, c-format
+msgid ""
+"The %s's language has been changed.  In order for this change to take "
+"effect, you must restart the %s."
+msgstr ""
+"Η %s γλώσσα έχει αλλάξει.  Για να τεθεί σε εφαρμογή αυτή η αλλαγή, πρέπει να "
+"επανεκκινήσετε το %s."
 
-#: clientgui/DlgSelectComputer.cpp:91
+#: DlgSelectComputer.cpp:91
 #, c-format
 msgid "%s - Select Computer"
 msgstr "%s - Επιλογή Υπολογιστή"
 
-#: clientgui/DlgSelectComputer.cpp:125
+#: DlgSelectComputer.cpp:125
 #, c-format
 msgid ""
 "Another instance of %s is already running \n"
 "on this computer.  Please select a client to monitor."
 msgstr ""
 "To %s εκτελείται ήδη \n"
-"σε αυτόν τον υπολογιστή. Παρακαλώ επιλέξτε ένα άλλο πρόγραμμα για να παρακολουθήσετε."
+"σε αυτόν τον υπολογιστή. Παρακαλώ επιλέξτε ένα άλλο πρόγραμμα για να "
+"παρακολουθήσετε."
 
-#: clientgui/DlgSelectComputer.cpp:143
+#: DlgSelectComputer.cpp:143
 msgid "Host name:"
 msgstr "Όνομα host:"
 
-#: clientgui/Localization.cpp:31
-#: clientgui/Localization.cpp:69
+#: Localization.cpp:31 Localization.cpp:69
 msgid "Message boards"
 msgstr "Ομάδες Συζητήσεων"
 
-#: clientgui/Localization.cpp:33
+#: Localization.cpp:33
 msgid "Correspond with other users on the SETI at home message boards"
 msgstr "Επικοινωνήστε με άλλους χρήστες στις ομάδες συζητήσεων του SETI at Home"
 
-#: clientgui/Localization.cpp:37
+#: Localization.cpp:37
 msgid "Ask questions and report problems"
 msgstr "Υποβάλετε ερωτήσεις να αναφέρετε προβλήματα"
 
-#: clientgui/Localization.cpp:39
-#: clientgui/Localization.cpp:81
-#: clientgui/Localization.cpp:111
-#: clientgui/Localization.cpp:129
+#: Localization.cpp:39 Localization.cpp:81 Localization.cpp:111
+#: Localization.cpp:129
 msgid "Your account"
 msgstr "Ο Λογαριασμός σας"
 
-#: clientgui/Localization.cpp:41
-#: clientgui/Localization.cpp:87
-#: clientgui/Localization.cpp:113
+#: Localization.cpp:41 Localization.cpp:87 Localization.cpp:113
 msgid "View your account information and credit totals"
-msgstr "Εμφάνιση πληροφοριών σχετικών με το λογαριασμό σας και το σύνολο των βαθμών σας"
+msgstr ""
+"Εμφάνιση πληροφοριών σχετικών με το λογαριασμό σας και το σύνολο των βαθμών "
+"σας"
 
-#: clientgui/Localization.cpp:43
+#: Localization.cpp:43
 msgid "Your preferences"
 msgstr "Οι Προτιμήσεις σας"
 
-#: clientgui/Localization.cpp:45
+#: Localization.cpp:45
 msgid "View and modify your SETI at home account profile and preferences"
-msgstr "Εμφάνιση και επεξεργασία του προφίλ λογαριασμού σας στο SETI at Home και των προτιμήσεών σας."
+msgstr ""
+"Εμφάνιση και επεξεργασία του προφίλ λογαριασμού σας στο SETI at Home και των "
+"προτιμήσεών σας."
 
-#: clientgui/Localization.cpp:47
-#: clientgui/Localization.cpp:89
+#: Localization.cpp:47 Localization.cpp:89
 msgid "Your results"
 msgstr "Τα Αποτελέσματά σας"
 
-#: clientgui/Localization.cpp:49
-#: clientgui/Localization.cpp:91
+#: Localization.cpp:49 Localization.cpp:91
 msgid "View your last week (or more) of computational results and work"
-msgstr "Εμφάνιση των αποτελεσμάτων και εργασιών της τελευταιας εβδομάδας (ή παραπάνω)"
+msgstr ""
+"Εμφάνιση των αποτελεσμάτων και εργασιών της τελευταιας εβδομάδας (ή "
+"παραπάνω)"
 
-#: clientgui/Localization.cpp:51
-#: clientgui/Localization.cpp:93
+#: Localization.cpp:51 Localization.cpp:93
 msgid "Your computers"
 msgstr "Οι Υπολογιστές σας"
 
-#: clientgui/Localization.cpp:53
+#: Localization.cpp:53
 msgid "View a listing of all the computers on which you are running SETI at Home"
-msgstr "Εμφάνιση λίστας με όλους τους υπολογιστές στους οποίους εκτελείτε στο SETI at Home"
+msgstr ""
+"Εμφάνιση λίστας με όλους τους υπολογιστές στους οποίους εκτελείτε στο "
+"SETI at Home"
 
-#: clientgui/Localization.cpp:55
-#: clientgui/Localization.cpp:97
+#: Localization.cpp:55 Localization.cpp:97
 msgid "Your team"
 msgstr "Η Ομάδα σας"
 
-#: clientgui/Localization.cpp:57
-#: clientgui/Localization.cpp:99
+#: Localization.cpp:57 Localization.cpp:99
 msgid "View information about your team"
 msgstr "Πληροφορίες σχετικά με την ομάδα σας"
 
-#: clientgui/Localization.cpp:61
+#: Localization.cpp:61
 msgid "Common questions"
 msgstr "Κοινές ερωτήσεις"
 
-#: clientgui/Localization.cpp:63
+#: Localization.cpp:63
 msgid "Read the Einstein at Home Frequently Asked Question list"
 msgstr "Διαβάστε τη λίστα με τις συχνές ερωτήσεις του Einstein at Home"
 
-#: clientgui/Localization.cpp:65
+#: Localization.cpp:65
 msgid "Screensaver info"
 msgstr "Πληροφορίες προφύλαξης οθόνης"
 
-#: clientgui/Localization.cpp:67
+#: Localization.cpp:67
 msgid "Read a detailed description of the Einstein at Home screensaver"
 msgstr "Διαβάστε τη λεπτομερή περιγραφή της προφύλαξης οθόνης του Einstein at Home"
 
-#: clientgui/Localization.cpp:71
+#: Localization.cpp:71
 #, fuzzy
-msgid "Correspond with admins and other users on the Einstein at Home message boards"
-msgstr "Αντιστοιχούν με διαχειριστές και άλλους χρήστε στους πίνακες μηνυμάτων του Einstein at Home"
+msgid ""
+"Correspond with admins and other users on the Einstein at Home message boards"
+msgstr ""
+"Αντιστοιχούν με διαχειριστές και άλλους χρήστε στους πίνακες μηνυμάτων του "
+"Einstein at Home"
 
-#: clientgui/Localization.cpp:73
+#: Localization.cpp:73
 msgid "Einstein status"
 msgstr "Κατάσταση του Einstein"
 
-#: clientgui/Localization.cpp:75
+#: Localization.cpp:75
 msgid "Current status of the Einstein at Home server"
 msgstr "Τρέχουσα κατάσταση του διακομιστή του Einstein at Home"
 
-#: clientgui/Localization.cpp:77
+#: Localization.cpp:77
 msgid "Report problems"
 msgstr "Αναφορά προβλημάτων"
 
-#: clientgui/Localization.cpp:79
+#: Localization.cpp:79
 msgid "A link to the Einstein at Home problems and bug reports message board"
-msgstr "Ένας σύνδεσμος για τον πίνακα μηνυμάτων σχετικά με προβλήματα και αναφορά σφαλμάτων του Einstein at Home"
+msgstr ""
+"Ένας σύνδεσμος για τον πίνακα μηνυμάτων σχετικά με προβλήματα και αναφορά "
+"σφαλμάτων του Einstein at Home"
 
-#: clientgui/Localization.cpp:83
+#: Localization.cpp:83
 msgid "View and modify your Einstein at Home account profile and preferences"
-msgstr "Εμφάνιση και επεξεργασία του προφίλ λογαριασμού σας στο Einstein at Home και των προτιμήσεών σας."
+msgstr ""
+"Εμφάνιση και επεξεργασία του προφίλ λογαριασμού σας στο Einstein at Home και "
+"των προτιμήσεών σας."
 
-#: clientgui/Localization.cpp:85
+#: Localization.cpp:85
 msgid "Account summary"
 msgstr "Σύνωψη λογαριασμού"
 
-#: clientgui/Localization.cpp:95
-msgid "View a listing of all the computers on which you are running Einstein at Home"
-msgstr "Εμφάνιση λίστας με όλους τους υπολογιστές στους οποίους εκτελείτε το Einstein at Home"
+#: Localization.cpp:95
+msgid ""
+"View a listing of all the computers on which you are running Einstein at Home"
+msgstr ""
+"Εμφάνιση λίστας με όλους τους υπολογιστές στους οποίους εκτελείτε το "
+"Einstein at Home"
 
-#: clientgui/Localization.cpp:101
+#: Localization.cpp:101
 msgid "LIGO project"
 msgstr "Πρόγραμμα LIGO"
 
-#: clientgui/Localization.cpp:103
+#: Localization.cpp:103
 #, fuzzy
-msgid "The home page of the Laser Interferometer Gravitational-wave Observatory (LIGO) project"
-msgstr "Η κεντρική ιστοσελίδα του προγάμματος LIGO Laser Interferometer Gravitational-wave Observatory"
+msgid ""
+"The home page of the Laser Interferometer Gravitational-wave Observatory "
+"(LIGO) project"
+msgstr ""
+"Η κεντρική ιστοσελίδα του προγάμματος LIGO Laser Interferometer "
+"Gravitational-wave Observatory"
 
-#: clientgui/Localization.cpp:105
+#: Localization.cpp:105
 msgid "GEO-600 project"
 msgstr "Έργο GEO-600"
 
-#: clientgui/Localization.cpp:107
+#: Localization.cpp:107
 msgid "The home page of the GEO-600 project"
 msgstr "Η ιστοσελίδα του έργου GEO-600"
 
-#: clientgui/Localization.cpp:115
-#: clientgui/Localization.cpp:133
+#: Localization.cpp:115 Localization.cpp:133 ViewProjects.cpp:221
+#: ViewStatistics.cpp:465
 msgid "Team"
 msgstr "Ομάδα"
 
-#: clientgui/Localization.cpp:117
+#: Localization.cpp:117
 msgid "Info about your Team"
 msgstr "Πληροφορίες σχετικά με την ομάδα σας"
 
-#: clientgui/Localization.cpp:123
+#: Localization.cpp:123
 msgid "Get help for climateprediction.net"
 msgstr "Λάβετε βοήθεια για το climaprediction.net"
 
-#: clientgui/Localization.cpp:125
+#: Localization.cpp:125
 msgid "News"
 msgstr "Νέα"
 
-#: clientgui/Localization.cpp:127
+#: Localization.cpp:127
 msgid "climateprediction.net News"
 msgstr "Νέα του climateprediction.net"
 
-#: clientgui/Localization.cpp:131
+#: Localization.cpp:131
 msgid "View your account information, credits, and trickles"
-msgstr "Προβολή των πληροφοριών του λογαριασμού σας, πιστοποιητικα, και trickles"
+msgstr ""
+"Προβολή των πληροφοριών του λογαριασμού σας, πιστοποιητικα, και trickles"
 
-#: clientgui/Localization.cpp:135
+#: Localization.cpp:135
 msgid "Info about your team"
 msgstr "Πληροφορίες για την ομάδα σας"
 
-#: clientgui/Localization.cpp:141
+#: Localization.cpp:141
 msgid "Search for help in our help system"
 msgstr "Ψάξτε για βοήθεια στο σύστημα βοήθειάς μας"
 
-#: clientgui/Localization.cpp:143
+#: Localization.cpp:143
 msgid "Global Statistics"
 msgstr "Σφαιρικά στατιστικά"
 
-#: clientgui/Localization.cpp:145
+#: Localization.cpp:145
 msgid "Summary statistics for World Community Grid"
 msgstr "Συγκεντρωτικά στατιστικά για το World Community Grid"
 
-#: clientgui/Localization.cpp:147
+#: Localization.cpp:147
 msgid "My Grid"
 msgstr "Τα έργα μου"
 
-#: clientgui/Localization.cpp:149
+#: Localization.cpp:149
 msgid "Your statistics and settings"
 msgstr "Τα στατιστικά σας και οι ρυθμίσεις σας"
 
-#: clientgui/Localization.cpp:151
+#: Localization.cpp:151
 msgid "Device Profiles"
 msgstr "Προφίλ Συσκευής"
 
-#: clientgui/Localization.cpp:153
+#: Localization.cpp:153
 msgid "Update your device settings"
 msgstr "Ενημέρωση των ρυθμίσεων της συσκευής σας"
 
-#: clientgui/Localization.cpp:155
+#: Localization.cpp:155
 msgid "Research"
 msgstr "Έρευνα"
 
-#: clientgui/Localization.cpp:157
+#: Localization.cpp:157
 msgid "Learn about the projects hosted at World Community Grid"
 msgstr "Μάθετε για τα προγράμματα που φιλοξενούνται στο World Community Grid"
 
-#: clientgui/MainDocument.cpp:583
+#: MainDocument.cpp:583
 msgid "Starting client"
 msgstr "Εκκίνηση προγράμματος"
 
-#: clientgui/MainDocument.cpp:591
+#: MainDocument.cpp:591
 msgid "Connecting to client"
 msgstr "Σύνδεση με το πρόγραμμα"
 
-#: clientgui/MainDocument.cpp:1205
+#: MainDocument.cpp:1195
 msgid "Retrieving system state; please wait..."
 msgstr "Ανάκτηση κατάστασης συστήματος, παρακαλώ περιμένετε..."
 
-#: clientgui/MainDocument.cpp:1826
+#: MainDocument.cpp:1816
 #, fuzzy
 msgid "Missing application"
 msgstr "Λείπει η εφαρμογή"
 
-#: clientgui/MainDocument.cpp:1827
-msgid "Please download and install the CoRD application from http://cord.sourceforge.net"
+#: MainDocument.cpp:1817
+msgid ""
+"Please download and install the CoRD application from http://cord."
+"sourceforge.net"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2442
+#: MainDocument.cpp:2432
 msgid "on batteries"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2443
+#: MainDocument.cpp:2433
 msgid "computer is in use"
 msgstr "ο υπολογιστης είναι σε χρήση"
 
-#: clientgui/MainDocument.cpp:2444
+#: MainDocument.cpp:2434
 msgid "user request"
 msgstr "αίτημα του χρήστη"
 
-#: clientgui/MainDocument.cpp:2445
+#: MainDocument.cpp:2435
 msgid "time of day"
 msgstr "ώρα της ημέρας"
 
-#: clientgui/MainDocument.cpp:2446
+#: MainDocument.cpp:2436
 msgid "CPU benchmarks in progress"
 msgstr "Εκτέλεση μετρήσεων επεξεργαστή σε πρόοδο"
 
-#: clientgui/MainDocument.cpp:2447
+#: MainDocument.cpp:2437
 msgid "need disk space - check preferences"
 msgstr "χρειάζεται επιπλέον χώρος στο δίσκο - ελέγξτε προτιμήσεις"
 
-#: clientgui/MainDocument.cpp:2448
+#: MainDocument.cpp:2438
 msgid "computer is not in use"
 msgstr "ο υπολογιστής δε χρησιμοποιείται"
 
-#: clientgui/MainDocument.cpp:2449
+#: MainDocument.cpp:2439
 msgid "starting up"
 msgstr "γίνεται εκκίνηση"
 
-#: clientgui/MainDocument.cpp:2450
+#: MainDocument.cpp:2440
 msgid "an exclusive app is running"
 msgstr "μια αποκλειστική εφαρμογή εκτελείται"
 
-#: clientgui/MainDocument.cpp:2451
+#: MainDocument.cpp:2441
 msgid "CPU is busy"
 msgstr "η κεντρική μονάδα επεξεργασίας είναι απασχολημένη"
 
-#: clientgui/MainDocument.cpp:2452
+#: MainDocument.cpp:2442
 msgid "network bandwidth limit exceeded"
 msgstr "ξεπεράστηκε το όριο εύρους ζώνης του δικτύου"
 
-#: clientgui/MainDocument.cpp:2453
+#: MainDocument.cpp:2443
 msgid "requested by operating system"
 msgstr "ζητήθηκε απο το λειτουργικό σύστημα"
 
-#: clientgui/MainDocument.cpp:2455
+#: MainDocument.cpp:2445
 msgid "unknown reason"
 msgstr "άγνωστος λόγος"
 
-#: clientgui/MainDocument.cpp:2477
+#: MainDocument.cpp:2467
 msgid "GPU missing, "
 msgstr "η μονάδα επεξεργασίας γραφικών απουσιάζει,"
 
-#: clientgui/MainDocument.cpp:2484
+#: MainDocument.cpp:2474
 msgid "New"
 msgstr "Νέο"
 
-#: clientgui/MainDocument.cpp:2488
+#: MainDocument.cpp:2478
 msgid "Download failed"
 msgstr "Αποτυχία λήψης"
 
-#: clientgui/MainDocument.cpp:2490
+#: MainDocument.cpp:2480
 msgid "Downloading"
 msgstr "Λήψη"
 
-#: clientgui/MainDocument.cpp:2492
-#: clientgui/MainDocument.cpp:2557
+#: MainDocument.cpp:2482 MainDocument.cpp:2552
 msgid " (suspended - "
 msgstr "(παύθηκε -"
 
-#: clientgui/MainDocument.cpp:2500
+#: MainDocument.cpp:2490
 msgid "Project suspended by user"
 msgstr "Το πρόγραμμα παύθηκε απο τον χρήστη"
 
-#: clientgui/MainDocument.cpp:2502
+#: MainDocument.cpp:2492
 msgid "Task suspended by user"
 msgstr "Η εγασία παύθηκε απο τον χρήστη"
 
-#: clientgui/MainDocument.cpp:2504
+#: MainDocument.cpp:2494
 msgid "Suspended - "
 msgstr "Παύθηκε -"
 
 # 75%
-#: clientgui/MainDocument.cpp:2510
+#: MainDocument.cpp:2500
 #, fuzzy
 msgid "GPU suspended - "
 msgstr "Παύθηκε η χρήση της GPU -"
 
-#: clientgui/MainDocument.cpp:2517
+#: MainDocument.cpp:2507
 msgid "Waiting for memory"
 msgstr "Αναμονή της μνήμης"
 
-#: clientgui/MainDocument.cpp:2519
+#: MainDocument.cpp:2509
 msgid "Waiting for shared memory"
 msgstr "Αναμονή της μοιραζόμενης μνήμης"
 
-#: clientgui/MainDocument.cpp:2521
+#: MainDocument.cpp:2512
+msgid "Running, high priority"
+msgstr "Εκτελείται, υψηλή προτεραιότητα"
+
+#: MainDocument.cpp:2514
 msgid "Running"
 msgstr "Εκτελείται"
 
-#: clientgui/MainDocument.cpp:2523
+#: MainDocument.cpp:2517
 msgid " (non-CPU-intensive)"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2526
+#: MainDocument.cpp:2520
 msgid "Waiting to run"
 msgstr "Αναμένοντας για εκτέλεση"
 
-#: clientgui/MainDocument.cpp:2528
-#: clientgui/MainDocument.cpp:2534
+#: MainDocument.cpp:2522 MainDocument.cpp:2528
 msgid "Ready to start"
 msgstr "Έτοιμο για εκκίνηση"
 
-#: clientgui/MainDocument.cpp:2538
-msgid "Postponed: "
-msgstr ""
+#: MainDocument.cpp:2532
+msgid " (Scheduler wait: "
+msgstr "(Προγραμματιστής περιμένει:"
 
-#: clientgui/MainDocument.cpp:2541
-msgid "Postponed"
-msgstr ""
+#: MainDocument.cpp:2536
+msgid " (Scheduler wait)"
+msgstr "(Προγραμματιστής περιμένει)"
 
-#: clientgui/MainDocument.cpp:2545
-msgid "Waiting for network access"
-msgstr ""
+#: MainDocument.cpp:2540
+#, fuzzy
+msgid " (Waiting for network access)"
+msgstr "(Αναμονή για πρόσβαση στο δίκτυο)"
 
-#: clientgui/MainDocument.cpp:2549
+#: MainDocument.cpp:2544
 msgid "Computation error"
 msgstr "Λάθος Υπολογισμών"
 
-#: clientgui/MainDocument.cpp:2553
+#: MainDocument.cpp:2548
 msgid "Upload failed"
 msgstr "Αποτυχία ανεβάσματος"
 
-#: clientgui/MainDocument.cpp:2555
+#: MainDocument.cpp:2550
 msgid "Uploading"
 msgstr "Ανέβασμα"
 
-#: clientgui/MainDocument.cpp:2566
+#: MainDocument.cpp:2561
 msgid "Aborted by user"
 msgstr "Εγκαταλείφθηκε από το χρήστη"
 
-#: clientgui/MainDocument.cpp:2569
+#: MainDocument.cpp:2564
 msgid "Aborted by project"
 msgstr "Εγκαταλείφθηκε απο το πρόγραμμα"
 
-#: clientgui/MainDocument.cpp:2572
+#: MainDocument.cpp:2567
 #, fuzzy
 msgid "Aborted: not started by deadline"
 msgstr "Απορριφθηκε: δεν ξεκίνησε μέσα στη διορία"
 
-#: clientgui/MainDocument.cpp:2575
+#: MainDocument.cpp:2570
 msgid "Aborted: disk limit exceeded"
 msgstr "Απορρίφθηκε: το όριο του δίσκου ξεπεράστηκε"
 
-#: clientgui/MainDocument.cpp:2578
+#: MainDocument.cpp:2573
 msgid "Aborted: run time limit exceeded"
 msgstr "Απορρίφθηκε: ξεπεράστηκε ο χρόνος εκτέλεσης"
 
-#: clientgui/MainDocument.cpp:2581
+#: MainDocument.cpp:2576
 msgid "Aborted: memory limit exceeded"
 msgstr "Απορρίφθηκε: ξεπεράστηκε το όριο μνήμης"
 
-#: clientgui/MainDocument.cpp:2584
+#: MainDocument.cpp:2579
 msgid "Aborted"
 msgstr "Εγκαταλείφθηκε"
 
-#: clientgui/MainDocument.cpp:2589
+#: MainDocument.cpp:2584
 msgid "Acknowledged"
 msgstr "Αναγνωρίστηκε"
 
-#: clientgui/MainDocument.cpp:2591
+#: MainDocument.cpp:2586
 msgid "Ready to report"
 msgstr "Έτοιμο για αναφορά"
 
-#: clientgui/MainDocument.cpp:2593
+#: MainDocument.cpp:2588
 #, c-format
 msgid "Error: invalid state '%d'"
 msgstr "Σφάλμα: μη έγκυρη κατάσταση '%d'"
 
-#: clientgui/NoInternetConnectionPage.cpp:179
+#: NoInternetConnectionPage.cpp:179
 msgid "No Internet connection"
 msgstr "Καμία σύνδεση στο διαδίκτυο"
 
-#: clientgui/NoInternetConnectionPage.cpp:182
+#: NoInternetConnectionPage.cpp:182
 msgid "Please connect to the Internet and try again."
 msgstr "Παρακαλούμε συνδεθείτε στο διαδίκτυο και ξαναδοκιμάστε."
 
-#: clientgui/NotDetectedPage.cpp:181
+#: NotDetectedPage.cpp:181
 msgid "Project not found"
 msgstr "Δεν βρέθηκε το πρόγραμμα"
 
-#: clientgui/NotDetectedPage.cpp:184
+#: 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 ""
 
-#: clientgui/NotDetectedPage.cpp:188
+#: NotDetectedPage.cpp:188
 msgid "Account manager not found"
 msgstr "Δεν βρέθηκε ο διαχειριστής λογαριασμού"
 
-#: clientgui/NotDetectedPage.cpp:191
+#: NotDetectedPage.cpp:191
 msgid ""
 "The URL you supplied is not that of a BOINC-based account\n"
 "manager.\n"
@@ -2581,93 +2579,97 @@ msgid ""
 "Please check the URL and try again."
 msgstr ""
 
-#: clientgui/NotFoundPage.cpp:181
+#: NotFoundPage.cpp:181
 msgid "Login Failed."
 msgstr "Η σύνδεση απέτυχε."
 
-#: clientgui/NotFoundPage.cpp:185
+#: NotFoundPage.cpp:185
 msgid "Check the username and password, and try again."
 msgstr "Ελέγξτε το όνομα χρήστη και τον κωδικό, και ξαναπροσπαθήστε."
 
-#: clientgui/NotFoundPage.cpp:189
+#: NotFoundPage.cpp:189
 msgid "Check the email address and password, and try again."
 msgstr "Ελέγξτε τη διεύθυνση ηλεκτρονικού ταχυδρομίου, και ξαναπροσπαθήστε."
 
-#: clientgui/NoticeListCtrl.cpp:229
+#: NoticeListCtrl.cpp:222
 msgid "more..."
 msgstr "περισσότερα..."
 
-#: clientgui/ProjectInfoPage.cpp:221
+#: ProjectInfoPage.cpp:477 ProjectInfoPage.cpp:778 ProjectInfoPage.cpp:782
+msgid "All"
+msgstr ""
+
+#: ProjectInfoPage.cpp:615
 msgid "Choose a project"
 msgstr "Επιλέξτε ένα πρόγραμμα"
 
-#: clientgui/ProjectInfoPage.cpp:228
+#: ProjectInfoPage.cpp:619
 msgid "To choose a project, click its name or type its URL below."
-msgstr "Για να επιλέξετε ένα έργο, πατήστε το όνομά του ή πληκτρολογήστε τη διεύθυνσή του παρακάτω."
+msgstr ""
+"Για να επιλέξετε ένα έργο, πατήστε το όνομά του ή πληκτρολογήστε τη "
+"διεύθυνσή του παρακάτω."
 
-#: clientgui/ProjectInfoPage.cpp:246
+#: ProjectInfoPage.cpp:623
 msgid "Categories:"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:267
+#: ProjectInfoPage.cpp:627 sg_ProjectPanel.cpp:89
 #, fuzzy
 msgid "Projects:"
 msgstr "Προγράμματα"
 
-#: clientgui/ProjectInfoPage.cpp:279
+#: ProjectInfoPage.cpp:631
 msgid "Project details"
 msgstr "Λεπτομέρειες προγράμματος"
 
-#: clientgui/ProjectInfoPage.cpp:291
+#: ProjectInfoPage.cpp:635
 msgid "Research area:"
 msgstr "Χώρος έρευνας:"
 
-#: clientgui/ProjectInfoPage.cpp:302
+#: ProjectInfoPage.cpp:639
 msgid "Organization:"
 msgstr "Οργανισμός:"
 
-#: clientgui/ProjectInfoPage.cpp:313
+#: ProjectInfoPage.cpp:643
 #, fuzzy
 msgid "Web site:"
 msgstr "Ιστοσελίδα:"
 
-#: clientgui/ProjectInfoPage.cpp:325
+#: ProjectInfoPage.cpp:647
 msgid "Supported systems:"
 msgstr "Υποστηριζόμενα συστήματα:"
 
-#: clientgui/ProjectInfoPage.cpp:363
+#: ProjectInfoPage.cpp:651
 #, fuzzy
 msgid "Project URL:"
 msgstr "Ηλεκτοκτρονική διεύθυνση προγράμματος"
 
-#: clientgui/ProjectInfoPage.cpp:499
-#: clientgui/ProjectInfoPage.cpp:754
-#: clientgui/ProjectInfoPage.cpp:758
-msgid "All"
+#: ProjectInfoPage.cpp:826
+msgid ""
+"This project may not have work for your type of computer.  Do you want to "
+"add it anyway?"
 msgstr ""
+"Αυτό το έργο πιθανόν να μην έχει εργασίες για τον τύπο του υπολογιστή σας. "
+"Θέλετε να το προσθέσετε οπωσδήποτε;"
 
-#: clientgui/ProjectInfoPage.cpp:802
-msgid "This project may not have work for your type of computer.  Do you want to add it anyway?"
-msgstr "Αυτό το έργο πιθανόν να μην έχει εργασίες για τον τύπο του υπολογιστή σας. Θέλετε να το προσθέσετε οπωσδήποτε;"
-
-#: clientgui/ProjectInfoPage.cpp:826
+#: ProjectInfoPage.cpp:850
 msgid "You already added this project. Please choose a different project."
-msgstr "Έχετε ήδη προσθέσει αυτό το έργο. Παρακαλώ επιλέξτε ένα διαφορετικό έργο."
+msgstr ""
+"Έχετε ήδη προσθέσει αυτό το έργο. Παρακαλώ επιλέξτε ένα διαφορετικό έργο."
 
-#: clientgui/ProjectProcessingPage.cpp:321
+#: ProjectProcessingPage.cpp:321
 msgid "Communicating with project."
 msgstr "Επικοινωνία με το έργο."
 
-#: clientgui/ProjectProcessingPage.cpp:510
+#: ProjectProcessingPage.cpp:509
 msgid "Required files not found on the server."
 msgstr "Απαραίτητα αρχεία δε βρέθηκαν στον διακομιστή."
 
-#: clientgui/ProjectProcessingPage.cpp:513
-#: clientgui/ProjectProcessingPage.cpp:586
+#: ProjectProcessingPage.cpp:512 ProjectProcessingPage.cpp:574
 msgid "An internal server error has occurred."
 msgstr "Προέκυψε ένα εσωτερικό σφάλμα στον διακομιστή."
 
-#: clientgui/ProjectPropertiesPage.cpp:334
+#: ProjectPropertiesPage.cpp:334
 msgid ""
 "Communicating with project\n"
 "Please wait..."
@@ -2675,48 +2677,11 @@ msgstr ""
 "Γίνεται επικοινωνία με το έργο\n"
 "Παρακαλούμε περιμένετε..."
 
-#: clientgui/ProjectWelcomePage.cpp:251
-#, c-format
-msgid "Welcome to %s."
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:254
-msgid "You have volunteered to compute for this project:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:255
-msgid "Name:"
-msgstr "Όνομα:"
-
-#: clientgui/ProjectWelcomePage.cpp:258
-msgid "Home:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:262
-msgid "Description:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:265
-msgid "URL:"
-msgstr "Διεύθυνση:"
-
-#: clientgui/ProjectWelcomePage.cpp:268
-msgid "User:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:273
-msgid "WARNING: This project is not registered with BOINC.  Make sure you trust it before continuing."
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:277
-msgid "To continue, click Next."
-msgstr "Για συνέχεια πατήστε στο Επόμενο."
-
-#: clientgui/ProxyInfoPage.cpp:195
+#: ProxyInfoPage.cpp:195
 msgid "Network communication failure"
 msgstr "Αποτυχία σύνδεσης με το δίκτυο"
 
-#: clientgui/ProxyInfoPage.cpp:199
+#: ProxyInfoPage.cpp:199
 #, fuzzy
 msgid ""
 "The World Community Grid - BOINC software failed to communicate\n"
@@ -2739,15 +2704,17 @@ msgstr ""
 "1) Πρόβλημα σύνδεσιμότητας. Ελεγξτε τη σύνδεση του δικτύου ή του modem\n"
 "και μετά πατήστε Πίσω για να δοκιμάσετε παλι.\n"
 "\n"
-"2) Το προσωπικό πρόγραμμα (τείχος ασφάλειας) εμποδίζει το πρόγραμμα World Community\n"
+"2) Το προσωπικό πρόγραμμα (τείχος ασφάλειας) εμποδίζει το πρόγραμμα World "
+"Community\n"
 "Grid - BOINC. Ρυθμίστε το τείχος ασφάλειας να επιτρέπει\n"
-"στο BOINC και στον διαχειριστή του BOINC να επικοινωνούν στις θύρες 80 και 443 αντίστοιχα,\n"
+"στο BOINC και στον διαχειριστή του BOINC να επικοινωνούν στις θύρες 80 και "
+"443 αντίστοιχα,\n"
 "και μετά πατήστε Πίσω για να δοκιμασετε ξανα.\n"
 "\n"
 "3) Χρησιμοποιείτε ένα διακομιστή proxy.\n"
 "Πατήστε Επόμενο για να διαμορφώσετε τις ρυθμίσεις του proxy του BOINC."
 
-#: clientgui/ProxyInfoPage.cpp:203
+#: ProxyInfoPage.cpp:203
 #, fuzzy
 msgid ""
 "BOINC failed to communicate on the Internet.\n"
@@ -2778,1363 +2745,1310 @@ msgstr ""
 "3) Χρησιμοποιείτε διακομιστή proxy.\n"
 "Πατήστε επόμενο για να διαμορφώσετε τις ρυθμίσεις του proxy του BOINC."
 
-#: clientgui/ProxyPage.cpp:331
+#: ProxyPage.cpp:331
 msgid "Proxy configuration"
 msgstr "Ρυθμίσεις proxy"
 
-#: clientgui/ProxyPage.cpp:334
+#: ProxyPage.cpp:334
 msgid "HTTP proxy"
 msgstr "HTTP proxy"
 
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
+#: ProxyPage.cpp:337 ProxyPage.cpp:357
 msgid "Server:"
 msgstr "Διακομιστής:"
 
-#: clientgui/ProxyPage.cpp:350
+#: ProxyPage.cpp:350
 msgid "Autodetect"
 msgstr "Αυτόματος εντοπισμός"
 
-#: clientgui/ProxyPage.cpp:354
+#: ProxyPage.cpp:354
 msgid "SOCKS proxy"
 msgstr "SOCKS proxy"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:167
-msgid "Advanced View...\tCtrl+Shift+A"
-msgstr "Προηγμένη προβολή...\t Ctrl+Shift+A"
+#: TermsOfUsePage.cpp:218
+msgid "Terms of Use"
+msgstr "Όροι χρήσης"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:168
-#, fuzzy
-msgid "Display the advanced graphical interface."
-msgstr "Εμφάνιση της απλής γραφικής διεπιφάνειας."
+#: TermsOfUsePage.cpp:222
+msgid "Please read the following terms of use:"
+msgstr "Παρακαλώ διαβάστε τους ακόλουθους όρους χρήσης:"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:175
-msgid "Skin"
-msgstr "Εμφάνιση"
+#: TermsOfUsePage.cpp:231
+msgid "I agree to the terms of use."
+msgstr "Συμφωνώ στους όρους χρήσης."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:177
-msgid "Select the appearance of the user interface."
+#: TermsOfUsePage.cpp:237
+msgid "I do not agree to the terms of use."
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:224
-#, c-format
-msgid "&%s"
-msgstr "&%s"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:405
-#, fuzzy
-msgid "Default"
-msgstr "Καθορισμός Εξ' ορισμού"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:848
-msgid "Suspend"
-msgstr "Παύση"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:850
-msgid "Suspend Computing"
-msgstr ""
+#: UnavailablePage.cpp:183
+msgid "Project temporarily unavailable"
+msgstr "Το πρόγραμμα είναι προσωρινά μη διαθέσιμο"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:851
-msgid "Resume Computing"
+#: UnavailablePage.cpp:186
+msgid ""
+"The project is temporarily unavailable.\n"
+"\n"
+"Please try again later."
 msgstr ""
+"Το πρόγραμμα είναι προσωρινά μη διαθέσιμο.\n"
+"\n"
+"Παρακαλούμε δοκιμάστε αργότερα."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:867
-msgid "Notices"
-msgstr "Ανακοινώσεις"
+#: UnavailablePage.cpp:190
+msgid "Account manager temporarily unavailable"
+msgstr "Ο διαχειριστής λογαριασμού είναι προσωρινά μη διαθέσιμος"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:868
-msgid "Open a window to view notices from projects or BOINC"
+#: UnavailablePage.cpp:193
+msgid ""
+"The account manager is temporarily unavailable.\n"
+"\n"
+"Please try again later."
 msgstr ""
+"Ο διαχειριστής λογαριασμού είναι προσωρινά μη διαθέσιμος.\n"
+"\n"
+"Παρακαλούμε δοκιμάστε αργότερα."
 
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
-msgstr ""
+#: ValidateAccountKey.cpp:68
+msgid "Please specify an account key to continue."
+msgstr "Παρακαλούμε καθορίστε ένα κλειδί λογαριασμού για να συνεχίσετε."
 
-#: clientgui/sg_DlgMessages.cpp:132
-msgid "There are no notices at this time."
-msgstr "Δεν υπάρχουν ανακοινώσεις αυτή τη στιγμή."
+#: ValidateAccountKey.cpp:71
+msgid "Invalid Account Key; please enter a valid Account Key"
+msgstr ""
+"Μη έγκυρο κλειδί λογαριασμού: Παρακαλούμε εισάγετε ένα έγκυρο κλειδί "
+"λογαριασμού"
 
-#: clientgui/sg_DlgMessages.cpp:146
-msgid "Close"
-msgstr "Έξοδος"
+#: ValidateAccountKey.cpp:82 ValidateEmailAddress.cpp:86
+msgid "Validation conflict"
+msgstr "Αντίθεση κατά την επικύρωση"
 
-#: clientgui/sg_DlgMessages.cpp:394
-#, c-format
-msgid "%s - Notices"
-msgstr "%s Ανακοινώσεις"
+#: ValidateEmailAddress.cpp:72
+msgid "Please specify an email address"
+msgstr "Παρακαλώ προσδιορίστε μια διεύθυνση ηλεκτρονικού ταχυδρομίου"
 
-#: clientgui/sg_DlgPreferences.cpp:270
-msgid "This dialog controls preferences for this computer only."
+#: ValidateEmailAddress.cpp:75
+msgid "Invalid email address; please enter a valid email address"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:275
-msgid "Click OK to set preferences."
-msgstr ""
+#: ValidateURL.cpp:69
+msgid "Missing URL"
+msgstr "Δεν βρέθηκε διεύθυνση"
 
-#: clientgui/sg_DlgPreferences.cpp:280
-msgid "Click Clear to restore web-based settings for all preferences listed below."
+#: ValidateURL.cpp:70
+msgid ""
+"Please specify a URL.\n"
+"For example:\n"
+"http://www.example.com/"
 msgstr ""
+"Παρακαλούμε καθορίστε μια διεύθυνση.\n"
+"Για παράδειγμα:\n"
+"http:///www.example.com/"
 
-#: clientgui/sg_DlgPreferences.cpp:287
-msgid "For additional settings, select Computing Preferences in the Advanced View."
+#: ValidateURL.cpp:83 ValidateURL.cpp:87 ValidateURL.cpp:91
+#: ValidateURL.cpp:103 ValidateURL.cpp:107 ValidateURL.cpp:110
+msgid "Invalid URL"
+msgstr "Μη έγκυση διεύθυνση"
+
+#: ValidateURL.cpp:84 ValidateURL.cpp:88 ValidateURL.cpp:92
+msgid ""
+"Please specify a valid URL.\n"
+"For example:\n"
+"http://boincproject.example.com"
 msgstr ""
+"Παρακαολούμε καθορίστε μια έγκυρη URL.\n"
+"Για παράδειγμα:\n"
+"http://boincproject.example.com"
 
-#: clientgui/sg_DlgPreferences.cpp:315
-msgid "Do work only between:"
-msgstr "Εκτέλεση εργασιών μόνο μεταξύ:"
+#: ValidateURL.cpp:104 ValidateURL.cpp:108
+#, c-format
+msgid "'%s' does not contain a valid host name."
+msgstr "Το '%s' δεν περιέχει ένα έκγυρο όνομα υπολογιστή"
 
-#: clientgui/sg_DlgPreferences.cpp:337
-msgid "Connect to internet only between:"
-msgstr "Σύνδεση στο διαδίκτυο μόνο μεταξύ:"
+#: ValidateURL.cpp:111
+#, c-format
+msgid "'%s' does not contain a valid path."
+msgstr "Το '%s' δεν περιέχει μια έγκυρη διαδρομή."
 
-#: clientgui/sg_DlgPreferences.cpp:359
-#: clientgui/sg_DlgPreferences.cpp:376
-msgid "Use no more than:"
-msgstr "Χρήση όχι περισσότερο απο:"
+#: ViewMessages.cpp:84 ViewProjects.cpp:170 ViewStatistics.cpp:1978
+#: ViewTransfers.cpp:160 ViewWork.cpp:183
+msgid "Commands"
+msgstr "Εντολές"
 
-#: clientgui/sg_DlgPreferences.cpp:372
-msgid "of disk space"
-msgstr "του χώρου του δίσκου"
+#: ViewMessages.cpp:88
+msgid "Copy all messages"
+msgstr "Αντιγραφή όλων των μηνυμάτων"
 
-#: clientgui/sg_DlgPreferences.cpp:389
-msgid "of the processor"
-msgstr "του επεξεργαστή"
+#: ViewMessages.cpp:95
+msgid "Copy selected messages"
+msgstr "Αντιγραφή επιλεγμένων μηνυμάτων"
 
-#: clientgui/sg_DlgPreferences.cpp:393
-msgid "Do work while on battery?"
-msgstr ""
+#: ViewMessages.cpp:106 ViewMessages.cpp:502
+msgid "Show only this project"
+msgstr "Εμφάνιση μόνο αυτού του προγράμματος"
 
-#: clientgui/sg_DlgPreferences.cpp:406
-msgid "Do work after idle for:"
-msgstr "Εκτέλεση εργασίων ενώ είναι αδρανής για:"
+#: ViewMessages.cpp:107 ViewMessages.cpp:503
+msgid "Show only the messages for the selected project."
+msgstr "Εμφάνιση μηνυμάτων μόνο για το επιλεγμένο έργο."
 
-#: clientgui/sg_DlgPreferences.cpp:431
-msgid "Clear all local preferences listed above and close the dialog"
-msgstr ""
+#: ViewMessages.cpp:164
+msgid "Messages"
+msgstr "Μηνύματα"
 
-#: clientgui/sg_DlgPreferences.cpp:609
-#: clientgui/sg_DlgPreferences.cpp:612
-#: clientgui/sg_DlgPreferences.cpp:688
-#: clientgui/sg_DlgPreferences.cpp:692
-#: clientgui/sg_DlgPreferences.cpp:704
-#: clientgui/sg_DlgPreferences.cpp:708
-#: clientgui/sg_DlgPreferences.cpp:851
-#: clientgui/sg_DlgPreferences.cpp:862
-msgid "Anytime"
-msgstr "Οποιαδήποτε στιγμη"
-
-#: clientgui/sg_DlgPreferences.cpp:645
-msgid "100 MB"
-msgstr "100 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:646
-msgid "200 MB"
-msgstr "200 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:647
-msgid "500 MB"
-msgstr "500 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:648
-msgid "1 GB"
-msgstr "1 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:649
-msgid "2 GB"
-msgstr "2 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:650
-msgid "5 GB"
-msgstr "5 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:651
-msgid "10 GB"
-msgstr "10 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:652
-msgid "20 GB"
-msgstr "20 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:653
-msgid "50 GB"
-msgstr "50 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:654
-msgid "100 GB"
-msgstr "100 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:724
-#, c-format
-msgid "%d MB"
-msgstr "%d MB"
+#: ViewMessages.cpp:187
+msgid "Copying all messages to the clipboard..."
+msgstr "Αντιγραφή όλων των μηνυμάτων στο πρόχειρο..."
 
-#: clientgui/sg_DlgPreferences.cpp:726
-#, c-format
-msgid "%4.2f GB"
-msgstr "%4.2f GB"
+#: ViewMessages.cpp:223
+msgid "Copying selected messages to the clipboard..."
+msgstr "Αντιγραφή των επιλεγμένων μηνυμάτων στο πρόχειρο..."
 
-#: clientgui/sg_DlgPreferences.cpp:767
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
+#: ViewMessages.cpp:286
+msgid "Filtering messages..."
+msgstr "Φιλτράρισμα μηνυμάτων..."
 
-#: clientgui/sg_DlgPreferences.cpp:803
-msgid "0 (Run Always)"
-msgstr "0 (Διαρκής Εκτέλεση)"
+#: ViewMessages.cpp:494
+msgid "Show all messages"
+msgstr "Εμφάνιση όλων των μηνυμάτων"
 
-#: clientgui/sg_DlgPreferences.cpp:806
-#, c-format
-msgid "%d"
-msgstr "%d"
+#: ViewMessages.cpp:495
+msgid "Show messages for all projects."
+msgstr "Εμφάνιση μηνυμάτων για όλα τα προγράμματα."
 
-#: clientgui/sg_DlgPreferences.cpp:953
-#, c-format
-msgid "%s - Computing Preferences"
+#: ViewNotices.cpp:58 sg_DlgMessages.cpp:124
+msgid "Fetching notices; please wait..."
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:1033
-#, fuzzy
-msgid "Do you really want to clear all local preferences?\n"
-msgstr "Θέλετε όντως να αφαιρέσετε όλες τις τοπικές προτιμήσεις;"
+#: ViewNotices.cpp:65 sg_DlgMessages.cpp:132
+msgid "There are no notices at this time."
+msgstr "Δεν υπάρχουν ανακοινώσεις αυτή τη στιγμή."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:66
-#: clientgui/ViewProjects.cpp:179
+#: ViewNotices.cpp:99 sg_BoincSimpleFrame.cpp:776
+msgid "Notices"
+msgstr "Ανακοινώσεις"
+
+#: ViewProjects.cpp:174 sg_ProjectCommandPopup.cpp:61
 msgid "Update"
 msgstr "Ενημέρωση"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:67
-#: clientgui/ViewProjects.cpp:180
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
-msgstr "Αναφορά όλων των ολοκληρωμένων εργασιών, ανάκτηση βαθμολογίας, ανάκτηση προτιμήσεων και πιθανών νέων εργασιών."
+#: ViewProjects.cpp:175 sg_ProjectCommandPopup.cpp:62
+msgid ""
+"Report all completed tasks, get latest credit, get latest preferences, and "
+"possibly get more tasks."
+msgstr ""
+"Αναφορά όλων των ολοκληρωμένων εργασιών, ανάκτηση βαθμολογίας, ανάκτηση "
+"προτιμήσεων και πιθανών νέων εργασιών."
+
+#: 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
+msgid "Suspend"
+msgstr "Παύση"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:73
-#: clientgui/sg_ProjectCommandPopup.cpp:129
-#: clientgui/ViewProjects.cpp:187
-#: clientgui/ViewProjects.cpp:727
+#: ViewProjects.cpp:182 ViewProjects.cpp:722 sg_ProjectCommandPopup.cpp:68
+#: sg_ProjectCommandPopup.cpp:114
 msgid "Suspend tasks for this project."
 msgstr "Παύση εργασιών για αυτό το έργο."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:78
-#: clientgui/sg_ProjectCommandPopup.cpp:136
-#: clientgui/ViewProjects.cpp:193
-#: clientgui/ViewProjects.cpp:746
+#: ViewProjects.cpp:188 ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:73
+#: sg_ProjectCommandPopup.cpp:121
 msgid "No new tasks"
 msgstr "Καμία νέα εργασία"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:79
-#: clientgui/ViewProjects.cpp:194
+#: ViewProjects.cpp:189 sg_ProjectCommandPopup.cpp:74
 msgid "Don't get new tasks for this project."
 msgstr "Να μη λαμβάνονται νέες εργασίες για αυτό το έργο."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:200
+#: ViewProjects.cpp:195 sg_ProjectCommandPopup.cpp:79
 msgid "Reset project"
 msgstr "Επανεκκίνηση προγράμματος"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:85
-#: clientgui/ViewProjects.cpp:201
-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 "Διαγραφή όλων των αρχείων και των εργασιων που σχετίζονται με αυτό το έργο, και λήψη νέων εργασιών. Μπορείτε να κάνετε ενημέρωση του έργου πρώτα ώστε να αναφέρετε τυχόν ολοκληρωμένες εργασίες."
+#: ViewProjects.cpp:196 sg_ProjectCommandPopup.cpp:80
+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:208
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
-msgstr "Αφαίρεση αυτού του έργου. Οι εργασίες που δεν έχουν ολοκληρωθεί θα χαθούν (χρησιμοποιήστε την 'Ενημέρωση' πρώτα για να αναφέρετε τυχών ολοκληρωμένες εργασίες)."
+#: ViewProjects.cpp:203 sg_ProjectCommandPopup.cpp:86
+msgid ""
+"Remove this project.  Tasks in progress will be lost (use 'Update' first to "
+"report any completed tasks)."
+msgstr ""
+"Αφαίρεση αυτού του έργου. Οι εργασίες που δεν έχουν ολοκληρωθεί θα χαθούν "
+"(χρησιμοποιήστε την 'Ενημέρωση' πρώτα για να αναφέρετε τυχών ολοκληρωμένες "
+"εργασίες)."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:96
-#: clientgui/sg_TaskCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:214
+#: ViewProjects.cpp:209 ViewWork.cpp:222 sg_ProjectCommandPopup.cpp:91
+#: sg_TaskCommandPopup.cpp:78
 msgid "Properties"
 msgstr "Ιδιότητες"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:97
-#: clientgui/ViewProjects.cpp:215
+#: ViewProjects.cpp:210 sg_ProjectCommandPopup.cpp:92
 msgid "Show project details."
 msgstr "Εμφάνιση λεπτομερειών προγράμματος."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:126
-#: clientgui/ViewProjects.cpp:723
-msgid "Resume tasks for this project."
-msgstr "Συνέχεια εργασιών για αυτό το έργο."
+#: ViewProjects.cpp:220 ViewStatistics.cpp:450
+msgid "Account"
+msgstr "Λογαριασμός"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:133
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow new tasks"
-msgstr "Να επιτρέπονται νέες εργασίες"
+#: ViewProjects.cpp:222
+msgid "Work done"
+msgstr "Ολοκληρωμένες εργασίες"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:134
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow fetching new tasks for this project."
-msgstr "Να επιτρέπεται η ανάκτηση νέων εργασιών για αυτό το έργο."
+#: ViewProjects.cpp:223
+msgid "Avg. work done"
+msgstr "Μέσος όρος ολοκληρωμένων εργασιών"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:137
-#: clientgui/ViewProjects.cpp:746
-msgid "Don't fetch new tasks for this project."
-msgstr "Να μην επιτρέπεται η ανάκτηση νέων εργασιών για αυτό το έργο."
+#: ViewProjects.cpp:225 ViewTransfers.cpp:188 ViewWork.cpp:234
+msgid "Status"
+msgstr "Κατάσταση"
+
+#: ViewProjects.cpp:250
+msgid "Projects"
+msgstr "Προγράμματα"
+
+#: ViewProjects.cpp:302
+msgid "Updating project..."
+msgstr "Ανανέωση εκτέλεσης προγράμματος..."
+
+#: ViewProjects.cpp:344
+msgid "Resuming project..."
+msgstr "Επανέναρξη εκτέλεσης προγράμματος..."
+
+#: ViewProjects.cpp:348
+msgid "Suspending project..."
+msgstr "Παύση εκτέλεσης προγράμματος..."
+
+#: ViewProjects.cpp:385
+msgid "Telling project to allow additional task downloads..."
+msgstr "Ορίζει στο έργο να επιτρέπει επιπλέον λήψεις εργασιών..."
+
+#: ViewProjects.cpp:389
+msgid "Telling project to not fetch any additional tasks..."
+msgstr "Απαγορεύει στο έργο να δέχεται επιπλέον εργασίες..."
+
+#: ViewProjects.cpp:425
+msgid "Resetting project..."
+msgstr "Επανεκκίνηση προγράμματος..."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:229
-#: clientgui/ViewProjects.cpp:443
+#: ViewProjects.cpp:438 sg_ProjectCommandPopup.cpp:214
 #, c-format
 msgid "Are you sure you want to reset project '%s'?"
 msgstr "Είστε σίγουρος ότι θέλετε να επανεκκινήσετε το πρόγραμμα '%s';"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:235
-#: clientgui/ViewProjects.cpp:449
+#: ViewProjects.cpp:444 sg_ProjectCommandPopup.cpp:220
 msgid "Reset Project"
 msgstr "Επανεκκίνηση Προγράμματος"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:266
-#: clientgui/ViewProjects.cpp:501
+#: ViewProjects.cpp:483
+msgid "Removing project..."
+msgstr "Γίνεται αφαίρεση έργου..."
+
+#: ViewProjects.cpp:496 sg_ProjectCommandPopup.cpp:251
 #, c-format
 msgid "Are you sure you want to remove project '%s'?"
 msgstr "Είστε σίγουρος ότι θέλετε να αφαιρέσετε το έργο '%s';"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:272
-#: clientgui/ViewProjects.cpp:507
+#: ViewProjects.cpp:502 sg_ProjectCommandPopup.cpp:257
 msgid "Remove Project"
 msgstr "Αφαίρεση προγράμματος"
 
-#: clientgui/sg_ProjectPanel.cpp:72
-#, fuzzy
-msgid "Add Project"
-msgstr "Προσθήκη έργου"
+#: ViewProjects.cpp:543 ViewWork.cpp:599
+msgid "Launching browser..."
+msgstr "Άνοιγμα φυλλομετρητή..."
 
-#: clientgui/sg_ProjectPanel.cpp:73
-msgid "Synchronize"
-msgstr ""
+#: ViewProjects.cpp:718 sg_ProjectCommandPopup.cpp:111
+msgid "Resume tasks for this project."
+msgstr "Συνέχεια εργασιών για αυτό το έργο."
 
-#: clientgui/sg_ProjectPanel.cpp:74
-msgid "Work done for this project"
-msgstr ""
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:118
+msgid "Allow new tasks"
+msgstr "Να επιτρέπονται νέες εργασίες"
 
-#: clientgui/sg_ProjectPanel.cpp:77
-msgid "Synchronize projects with account manager system"
-msgstr ""
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:119
+msgid "Allow fetching new tasks for this project."
+msgstr "Να επιτρέπεται η ανάκτηση νέων εργασιών για αυτό το έργο."
 
-#: clientgui/sg_ProjectPanel.cpp:124
-msgid "Select a project to access with the controls below"
-msgstr ""
+#: ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:122
+msgid "Don't fetch new tasks for this project."
+msgstr "Να μην επιτρέπεται η ανάκτηση νέων εργασιών για αυτό το έργο."
 
-#: clientgui/sg_ProjectPanel.cpp:145
+#: ViewProjects.cpp:1058
 #, fuzzy
-msgid "Project Web Pages"
-msgstr "Ιστοσελίδα Έργου"
+msgid "Requested by user"
+msgstr "Παύθηκε από τον χρήστη"
 
-#: clientgui/sg_ProjectPanel.cpp:149
-msgid "Project Commands"
-msgstr ""
+#: ViewProjects.cpp:1059
+#, fuzzy
+msgid "To fetch work"
+msgstr "Όχι νέα εργασία"
 
-#: clientgui/sg_ProjectPanel.cpp:276
-#, c-format
-msgid "Pop up a menu of web sites for project %s"
-msgstr ""
+#: ViewProjects.cpp:1060
+msgid "To report completed tasks"
+msgstr "Για αναφορά ολοκληρωμένων εργασιών"
 
-#: clientgui/sg_ProjectPanel.cpp:278
-#, c-format
-msgid "Pop up a menu of commands to apply to project %s"
+#: ViewProjects.cpp:1061
+msgid "To send trickle-up message"
 msgstr ""
 
-#: clientgui/sg_TaskCommandPopup.cpp:66
-msgid "Show graphics"
-msgstr "Εμφάνιση γραφικών"
-
-#: clientgui/sg_TaskCommandPopup.cpp:67
-msgid "Show application graphics in a window."
-msgstr "Εμφάνιση γραφικών εφαρμογής σε παράθυρο"
+#: ViewProjects.cpp:1062
+#, fuzzy
+msgid "Requested by account manager"
+msgstr "Ζητήθηκε απο τον διαχειριστή λογαριασμού"
 
-#: clientgui/sg_TaskCommandPopup.cpp:73
-msgid "Suspend this task."
-msgstr ""
+#: ViewProjects.cpp:1063
+#, fuzzy
+msgid "Project initialization"
+msgstr "Εκκίνηση έργου"
 
-#: clientgui/sg_TaskCommandPopup.cpp:78
-msgid "Abort"
-msgstr "Ακύρωση"
+#: ViewProjects.cpp:1064
+#, fuzzy
+msgid "Requested by project"
+msgstr "Ζητήθηκε απο το έργο"
 
-#: clientgui/sg_TaskCommandPopup.cpp:79
-msgid "Abandon this task. You will get no credit for it."
-msgstr ""
+#: ViewProjects.cpp:1065
+#, fuzzy
+msgid "Unknown reason"
+msgstr "Άγνωστος λόγος"
 
-#: clientgui/sg_TaskCommandPopup.cpp:85
-msgid "Show task details."
-msgstr "Εμφάνιση λεπτομερειών εργασίας."
+#: ViewProjects.cpp:1079
+msgid "Suspended by user"
+msgstr "Παύθηκε από τον χρήστη"
 
-#: clientgui/sg_TaskCommandPopup.cpp:119
-msgid "Resume work for this task."
-msgstr "Συνέχεια επεξεργασίας για αυτή την εργασία."
+#: ViewProjects.cpp:1082
+msgid "Won't get new tasks"
+msgstr "Δε θα δέχεται νέες εργασίες"
 
-#: clientgui/sg_TaskCommandPopup.cpp:123
-msgid "Suspend work for this task."
-msgstr "Παύση επεξεργασίας για αυτή την εργασία."
+#: ViewProjects.cpp:1085
+msgid "Project ended - OK to remove"
+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 ""
+#: ViewProjects.cpp:1088
+#, fuzzy
+msgid "Will remove when tasks done"
+msgstr "Αφαίρεση όταν οι εργασίες ολοκληρωθούν"
 
-#: clientgui/sg_TaskCommandPopup.cpp:272
-msgid "Abort task"
-msgstr "Ακύρωση εργασίας"
+#: ViewProjects.cpp:1091
+msgid "Scheduler request pending"
+msgstr "Αναμονή αίτησης χρονοδιαγράμματος"
 
-#: clientgui/sg_TaskPanel.cpp:468
-msgid "You don't have any projects.  Please Add a Project."
-msgstr "Δεν έχετε άλλα προγράμματα. Παρακαλώ προσθέστε ένα πρόγραμμα."
+#: ViewProjects.cpp:1097
+#, fuzzy
+msgid "Scheduler request in progress"
+msgstr "Αίτημα χρονοδιαγράμματος σε εξέλιξη"
 
-#: clientgui/sg_TaskPanel.cpp:469
-msgid "Not available"
+#: ViewProjects.cpp:1100
+msgid "Trickle up message pending"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:480
-#, fuzzy
-msgid "Tasks:"
-msgstr "Εργασίες"
+#: ViewProjects.cpp:1106
+msgid "Communication deferred "
+msgstr "Η επικοινωνία αναβλήθηκε"
 
-#: clientgui/sg_TaskPanel.cpp:486
-msgid "Select a task to access"
-msgstr ""
+#: ViewResources.cpp:62
+msgid "Total disk usage"
+msgstr "Συνολική χρήση δίσκου"
 
-#: clientgui/sg_TaskPanel.cpp:497
-msgid "From:"
-msgstr ""
+#: ViewResources.cpp:83
+msgid "Disk usage by BOINC projects"
+msgstr "Χρήση δίσκου απο τα προγράμματα του BOINC"
 
-#: clientgui/sg_TaskPanel.cpp:551
-msgid "This task's progress"
-msgstr ""
+#: ViewResources.cpp:116
+msgid "Disk"
+msgstr "Δίσκος"
 
-#: clientgui/sg_TaskPanel.cpp:569
-msgid "Task Commands"
-msgstr ""
+#: ViewResources.cpp:249
+msgid "no projects: 0 bytes used"
+msgstr "κανένα έργο: 0 bytes χρησιμοποιούνται"
 
-#: clientgui/sg_TaskPanel.cpp:570
-msgid "Pop up a menu of commands to apply to this task"
-msgstr ""
+#: ViewResources.cpp:286
+msgid "used by BOINC: "
+msgstr "χρησιμοποιείται απο το BOINC:"
 
-#: clientgui/sg_TaskPanel.cpp:705
-#, c-format
-msgid "Application: %s"
-msgstr "Εφαρμογή: %s"
+#: ViewResources.cpp:296
+msgid "free, available to BOINC: "
+msgstr "ελεύθερο, διαθέσιμο για το BOINC:"
 
-#: clientgui/sg_TaskPanel.cpp:728
-#, c-format
-msgid "%.3f%%"
-msgstr ""
+#: ViewResources.cpp:306
+msgid "free, not available to BOINC: "
+msgstr "ελεύθερο, μη διαθέσιμο για το BOINC:"
 
-#: clientgui/sg_TaskPanel.cpp:736
-msgid "Application: Not available"
-msgstr ""
+#: ViewResources.cpp:316
+msgid "free: "
+msgstr "ελεύθερο:"
 
-#: clientgui/sg_TaskPanel.cpp:836
-msgid "Not Available"
-msgstr ""
+#: ViewResources.cpp:326
+msgid "used by other programs: "
+msgstr "χρησιμοποιείται απο άλλα προγράμματα:"
 
-#: clientgui/sg_TaskPanel.cpp:851
-#, c-format
-msgid "Elapsed: %s"
-msgstr ""
+#: ViewStatistics.cpp:1205
+msgid "User Total"
+msgstr "Σύνολο χρήστη"
 
-# 84%
-#: clientgui/sg_TaskPanel.cpp:865
-#, c-format
-msgid "Remaining (estimated): %s"
-msgstr ""
+#: ViewStatistics.cpp:1206
+msgid "User Average"
+msgstr "Μέσος Όρος Χρήστη"
+
+#: ViewStatistics.cpp:1207
+msgid "Host Total"
+msgstr "Σύνολο Υπολογιστή"
 
-#: clientgui/sg_TaskPanel.cpp:880
+#: ViewStatistics.cpp:1208
+msgid "Host Average"
+msgstr "Μέσος Όρος Υπολογιστή"
+
+#: ViewStatistics.cpp:1355
 #, c-format
-msgid "Status: %s"
-msgstr ""
+msgid "Last update: %.0f days ago"
+msgstr "Τελευταία ενημέρωση: %.0f μέρες πριν"
 
-#: clientgui/sg_TaskPanel.cpp:1227
-msgid "Retrieving current status."
-msgstr "Ανάκτηση τρέχουσας κατάστασης."
+#: ViewStatistics.cpp:1982
+msgid "Show user total"
+msgstr "Εμφάνιση συνόλου χρήστη"
 
-#: clientgui/sg_TaskPanel.cpp:1233
-msgid "Downloading work from the server."
-msgstr "Λήψη εργασιών απο τον διακομιστή."
+#: ViewStatistics.cpp:1983
+msgid "Show total credit for user"
+msgstr "Εμφάνιση ολικών πόντων χρήστη"
 
-#: clientgui/sg_TaskPanel.cpp:1238
-msgid "Processing Suspended:  Running On Batteries."
-msgstr "Επεξεργασία παύθηκε:Λειτουργία απο μπαταρίες."
+#: ViewStatistics.cpp:1989
+msgid "Show user average"
+msgstr "Εμφάνιση μέσου όρου χρήστη"
 
-#: clientgui/sg_TaskPanel.cpp:1240
-msgid "Processing Suspended:  User Active."
-msgstr "Επεξεργασία παύθηκε:Χρήστης ενεργός."
+#: ViewStatistics.cpp:1990
+msgid "Show average credit for user"
+msgstr "Εμφάνιση μέσου όρου πόντων χρήστη"
 
-#: clientgui/sg_TaskPanel.cpp:1242
-msgid "Processing Suspended:  User paused processing."
-msgstr "Επεξεργασία παύθηκε: Η επεξεργασία παύθηκε απο τον χρήστη."
+#: ViewStatistics.cpp:1996
+msgid "Show host total"
+msgstr "Εμφάνιση συνόλου υπολογιστή"
 
-#: clientgui/sg_TaskPanel.cpp:1244
-msgid "Processing Suspended:  Time of Day."
-msgstr "Επεξεργασία παύθηκε: Ώρα της ημέρας."
+#: ViewStatistics.cpp:1997
+msgid "Show total credit for host"
+msgstr "Εμφάνιση συνολικών πόντων πάροχου"
 
-#: clientgui/sg_TaskPanel.cpp:1246
-msgid "Processing Suspended:  Benchmarks Running."
-msgstr ""
+#: ViewStatistics.cpp:2003
+msgid "Show host average"
+msgstr "Εμφάνιση μέσου όρου πάροχου"
 
-#: clientgui/sg_TaskPanel.cpp:1248
-msgid "Processing Suspended."
-msgstr "Επεξεργασία παύθηκε."
+#: ViewStatistics.cpp:2004
+msgid "Show average credit for host"
+msgstr "Εμφάνιση μέσου όρου πόντων πάροχου"
 
-#: clientgui/sg_TaskPanel.cpp:1252
-msgid "Waiting to contact project servers."
-msgstr "Αναμονή για επικοινωνία με τους διακομιστές του έργου."
+#: ViewStatistics.cpp:2013
+msgid "< &Previous project"
+msgstr "< &Προηγούμενο έργο"
 
-#: clientgui/sg_TaskPanel.cpp:1256
-#: clientgui/sg_TaskPanel.cpp:1265
-msgid "Retrieving current status"
-msgstr "Ανακτώντας την τρέχουσα κατάσταση"
+#: ViewStatistics.cpp:2014
+msgid "Show chart for previous project"
+msgstr "Εμφάνιση γραφήματος για προηγούμενο πρόγραμμα"
 
-#: clientgui/sg_TaskPanel.cpp:1260
-msgid "No work available to process"
-msgstr "Καμία εργασία διαθέσιμη για επεξεργασία"
+#: ViewStatistics.cpp:2019
+msgid "&Next project >"
+msgstr "&Επόμενο πρόγραμμα>"
 
-#: clientgui/sg_TaskPanel.cpp:1262
-msgid "Unable to connect to the core client"
-msgstr "Αδύνατη η σύνδεση με τον πυρήνα του προγράμματος"
+#: ViewStatistics.cpp:2020
+msgid "Show chart for next project"
+msgstr "Εμφάνιση γραφήματος για επόμενο πρόγραμμα"
 
-#: clientgui/TermsOfUsePage.cpp:218
-msgid "Terms of Use"
-msgstr "Όροι χρήσης"
+#: ViewStatistics.cpp:2026 ViewStatistics.cpp:2416
+msgid "Hide project list"
+msgstr "Απόκρυψη λίστας έργων"
 
-#: clientgui/TermsOfUsePage.cpp:222
-msgid "Please read the following terms of use:"
-msgstr "Παρακαλώ διαβάστε τους ακόλουθους όρους χρήσης:"
+#: ViewStatistics.cpp:2027 ViewStatistics.cpp:2416
+msgid "Use entire area for graphs"
+msgstr "Χρήση ολόκληρου του χώρου για τα γραφικά"
 
-#: clientgui/TermsOfUsePage.cpp:231
-msgid "I agree to the terms of use."
-msgstr "Συμφωνώ στους όρους χρήσης."
+#: ViewStatistics.cpp:2032
+msgid "Mode view"
+msgstr "Τρόπος προβολής"
 
-#: clientgui/TermsOfUsePage.cpp:237
-msgid "I do not agree to the terms of use."
-msgstr ""
+#: ViewStatistics.cpp:2036
+msgid "One project"
+msgstr "Ένα πρόγραμμα"
 
-#: clientgui/UnavailablePage.cpp:183
-msgid "Project temporarily unavailable"
-msgstr "Το πρόγραμμα είναι προσωρινά μη διαθέσιμο"
+#: ViewStatistics.cpp:2037
+msgid "Show one chart with selected project"
+msgstr "Εμφάνιση ενός προγράμματος με τα επιλεγμένα προγράμματα"
 
-#: clientgui/UnavailablePage.cpp:186
-msgid ""
-"The project is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-"Το πρόγραμμα είναι προσωρινά μη διαθέσιμο.\n"
-"\n"
-"Παρακαλούμε δοκιμάστε αργότερα."
+#: ViewStatistics.cpp:2043
+msgid "All projects (separate)"
+msgstr "Όλα τα έργα (ξεχωριστά)"
 
-#: clientgui/UnavailablePage.cpp:190
-msgid "Account manager temporarily unavailable"
-msgstr "Ο διαχειριστής λογαριασμού είναι προσωρινά μη διαθέσιμος"
+#: ViewStatistics.cpp:2044
+msgid "Show all projects, one chart per project"
+msgstr "Εμφάνιση όλων των προγραμμάτων, ένα γράφημα για κάθε πρόγραμμα"
 
-#: clientgui/UnavailablePage.cpp:193
-msgid ""
-"The account manager is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-"Ο διαχειριστής λογαριασμού είναι προσωρινά μη διαθέσιμος.\n"
-"\n"
-"Παρακαλούμε δοκιμάστε αργότερα."
+#: ViewStatistics.cpp:2050
+msgid "All projects (together)"
+msgstr "Όλα τα έργα (μαζί)"
 
-#: clientgui/ValidateAccountKey.cpp:68
-msgid "Please specify an account key to continue."
-msgstr "Παρακαλούμε καθορίστε ένα κλειδί λογαριασμού για να συνεχίσετε."
+#: ViewStatistics.cpp:2051
+msgid "Show one chart with all projects"
+msgstr "Εμφάνιση ενός γραφήματος με όλα τα προγράμματα"
 
-#: clientgui/ValidateAccountKey.cpp:71
-msgid "Invalid Account Key; please enter a valid Account Key"
-msgstr "Μη έγκυρο κλειδί λογαριασμού: Παρακαλούμε εισάγετε ένα έγκυρο κλειδί λογαριασμού"
+#: ViewStatistics.cpp:2057
+msgid "All projects (sum)"
+msgstr "Όλα τα έργα (αθροιστικά)"
 
-#: clientgui/ValidateAccountKey.cpp:82
-#: clientgui/ValidateEmailAddress.cpp:86
-msgid "Validation conflict"
-msgstr "Αντίθεση κατά την επικύρωση"
+#: ViewStatistics.cpp:2058
+msgid "Show one chart with sum of projects"
+msgstr "Εμφάνιση ενός γραφήματος με όλα τα έργα αθροιστικά"
 
-#: clientgui/ValidateEmailAddress.cpp:72
-msgid "Please specify an email address"
-msgstr "Παρακαλώ προσδιορίστε μια διεύθυνση ηλεκτρονικού ταχυδρομίου"
+#: ViewStatistics.cpp:2079
+msgid "Statistics"
+msgstr "Στατιστικά"
 
-#: clientgui/ValidateEmailAddress.cpp:75
-msgid "Invalid email address; please enter a valid email address"
-msgstr ""
+#: 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
+msgid "Updating charts..."
+msgstr "Ανανέωση γραφημάτων..."
 
-#: clientgui/ValidateURL.cpp:69
-msgid "Missing URL"
-msgstr "Δεν βρέθηκε διεύθυνση"
+#: ViewStatistics.cpp:2420
+msgid "Show project list"
+msgstr "Εμφάνιση λίστας έργων"
 
-#: clientgui/ValidateURL.cpp:70
-msgid ""
-"Please specify a URL.\n"
-"For example:\n"
-"http://www.example.com/"
-msgstr ""
-"Παρακαλούμε καθορίστε μια διεύθυνση.\n"
-"Για παράδειγμα:\n"
-"http:///www.example.com/"
+#: ViewStatistics.cpp:2420
+msgid "Uses smaller area for graphs"
+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 "Μη έγκυση διεύθυνση"
+#: ViewTransfers.cpp:164
+msgid "Retry Now"
+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"
-"http://boincproject.example.com"
+#: ViewTransfers.cpp:165
+msgid "Retry the file transfer now"
+msgstr "Επανάληψη μεταφοράς αρχείου τώρα"
 
-#: clientgui/ValidateURL.cpp:104
-#: clientgui/ValidateURL.cpp:108
-#, c-format
-msgid "'%s' does not contain a valid host name."
-msgstr "Το '%s' δεν περιέχει ένα έκγυρο όνομα υπολογιστή"
+#: ViewTransfers.cpp:171
+msgid "Abort Transfer"
+msgstr "Ακύρωση Μεταφοράς"
 
-#: clientgui/ValidateURL.cpp:111
-#, c-format
-msgid "'%s' does not contain a valid path."
-msgstr "Το '%s' δεν περιέχει μια έγκυρη διαδρομή."
+#: ViewTransfers.cpp:172
+msgid "Abort this file transfer.  You won't get credit for the task."
+msgstr ""
 
-#: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:175
-msgid "Commands"
-msgstr "Εντολές"
+#: ViewTransfers.cpp:183
+msgid "File"
+msgstr "Αρχείο"
 
-#: clientgui/ViewMessages.cpp:88
-msgid "Copy all messages"
-msgstr "Αντιγραφή όλων των μηνυμάτων"
+#: ViewTransfers.cpp:184 ViewWork.cpp:233
+msgid "Progress"
+msgstr "Πρόοδος"
 
-#: clientgui/ViewMessages.cpp:95
-msgid "Copy selected messages"
-msgstr "Αντιγραφή επιλεγμένων μηνυμάτων"
+#: ViewTransfers.cpp:185
+msgid "Size"
+msgstr "Μέγεθος"
 
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
-msgid "Show only this project"
-msgstr "Εμφάνιση μόνο αυτού του προγράμματος"
+#: ViewTransfers.cpp:186
+msgid "Elapsed Time"
+msgstr "Χρόνος που περάσει"
 
-#: clientgui/ViewMessages.cpp:107
-#: clientgui/ViewMessages.cpp:503
-msgid "Show only the messages for the selected project."
-msgstr "Εμφάνιση μηνυμάτων μόνο για το επιλεγμένο έργο."
+#: ViewTransfers.cpp:187
+msgid "Speed"
+msgstr "Ταχύτητα"
 
-#: clientgui/ViewMessages.cpp:164
-msgid "Messages"
-msgstr "Μηνύματα"
+#: ViewTransfers.cpp:213
+msgid "Transfers"
+msgstr "Μεταφορές"
 
-#: clientgui/ViewMessages.cpp:187
-msgid "Copying all messages to the clipboard..."
-msgstr "Αντιγραφή όλων των μηνυμάτων στο πρόχειρο..."
+#: ViewTransfers.cpp:280
+msgid "Network activity is suspended - "
+msgstr "Η δραστηριότητα του δικτύου παύθηκε -"
 
-#: clientgui/ViewMessages.cpp:223
-msgid "Copying selected messages to the clipboard..."
-msgstr "Αντιγραφή των επιλεγμένων μηνυμάτων στο πρόχειρο..."
+#: ViewTransfers.cpp:282
+msgid ""
+".\n"
+"You can enable it using the Activity menu."
+msgstr ""
+".\n"
+"Μπορείτε να το ενεργοποιήσετε χρησιμοποιόντας το μενού Επιλογών."
 
-#: clientgui/ViewMessages.cpp:286
-msgid "Filtering messages..."
-msgstr "Φιλτράρισμα μηνυμάτων..."
+#: ViewTransfers.cpp:285
+msgid "BOINC"
+msgstr "BOINC"
 
-#: clientgui/ViewMessages.cpp:494
-msgid "Show all messages"
-msgstr "Εμφάνιση όλων των μηνυμάτων"
+#: ViewTransfers.cpp:292
+msgid "Retrying transfer now..."
+msgstr "Επανάληψη μεταφοράς τώρα..."
 
-#: clientgui/ViewMessages.cpp:495
-msgid "Show messages for all projects."
-msgstr "Εμφάνιση μηνυμάτων για όλα τα προγράμματα."
+#: ViewTransfers.cpp:330
+msgid "Aborting transfer..."
+msgstr "Ακύρωση μεταφοράς..."
 
-#: clientgui/ViewProjects.cpp:225
-msgid "Account"
-msgstr "Λογαριασμός"
+#: ViewTransfers.cpp:343
+#, 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/ViewProjects.cpp:227
-msgid "Work done"
-msgstr "Ολοκληρωμένες εργασίες"
+#: ViewTransfers.cpp:349
+msgid "Abort File Transfer"
+msgstr "Ακύρωση Μεταφοράς Αρχείου"
 
-#: clientgui/ViewProjects.cpp:228
-msgid "Avg. work done"
-msgstr "Μέσος όρος ολοκληρωμένων εργασιών"
+#: ViewTransfers.cpp:780
+msgid "Upload"
+msgstr ""
 
-#: clientgui/ViewProjects.cpp:230
-msgid "Status"
-msgstr "Κατάσταση"
+#: ViewTransfers.cpp:780
+msgid "Download"
+msgstr ""
 
-#: clientgui/ViewProjects.cpp:255
-msgid "Projects"
-msgstr "Προγράμματα"
+#: ViewTransfers.cpp:784
+#, fuzzy
+msgid "retry in "
+msgstr "Επανάληψη σε"
 
-#: clientgui/ViewProjects.cpp:307
-msgid "Updating project..."
-msgstr "Ανανέωση εκτέλεσης προγράμματος..."
+#: ViewTransfers.cpp:786
+msgid "failed"
+msgstr ""
 
-#: clientgui/ViewProjects.cpp:349
-msgid "Resuming project..."
-msgstr "Επανέναρξη εκτέλεσης προγράμματος..."
+#: ViewTransfers.cpp:789
+msgid "suspended"
+msgstr ""
 
-#: clientgui/ViewProjects.cpp:353
-msgid "Suspending project..."
-msgstr "Παύση εκτέλεσης προγράμματος..."
+#: ViewTransfers.cpp:794
+msgid "active"
+msgstr "ενεργό"
 
-#: clientgui/ViewProjects.cpp:390
-msgid "Telling project to allow additional task downloads..."
-msgstr "Ορίζει στο έργο να επιτρέπει επιπλέον λήψεις εργασιών..."
+#: ViewTransfers.cpp:796
+msgid "pending"
+msgstr "εκκρεμεί"
 
-#: clientgui/ViewProjects.cpp:394
-msgid "Telling project to not fetch any additional tasks..."
-msgstr "Απαγορεύει στο έργο να δέχεται επιπλέον εργασίες..."
+#: ViewTransfers.cpp:803
+msgid " (project backoff: "
+msgstr "(υπαναχώρηση έργου:"
 
-#: clientgui/ViewProjects.cpp:430
-msgid "Resetting project..."
-msgstr "Επανεκκίνηση προγράμματος..."
+#: ViewWork.cpp:187 ViewWork.cpp:777
+msgid "Show active tasks"
+msgstr "Εμφάνιση ενεργών εργασίων"
 
-#: clientgui/ViewProjects.cpp:488
-msgid "Removing project..."
-msgstr "Γίνεται αφαίρεση έργου..."
+#: ViewWork.cpp:188 ViewWork.cpp:778
+msgid "Show only active tasks."
+msgstr "Εμφάνιση μόνο ενεργών εργασιών."
 
-#: clientgui/ViewProjects.cpp:548
-msgid "Launching browser..."
-msgstr "Άνοιγμα φυλλομετρητή..."
+#: ViewWork.cpp:194 sg_TaskCommandPopup.cpp:60
+msgid "Show graphics"
+msgstr "Εμφάνιση γραφικών"
 
-#: clientgui/ViewProjects.cpp:1063
+#: ViewWork.cpp:195 sg_TaskCommandPopup.cpp:61
+msgid "Show application graphics in a window."
+msgstr "Εμφάνιση γραφικών εφαρμογής σε παράθυρο"
+
+#: ViewWork.cpp:201
 #, fuzzy
-msgid "Requested by user"
-msgstr "Παύθηκε από τον χρήστη"
+msgid "Show VM Console"
+msgstr "Εμφάνιση κονσόλας VM"
 
-#: clientgui/ViewProjects.cpp:1064
+#: ViewWork.cpp:202
 #, fuzzy
-msgid "To fetch work"
-msgstr "Όχι νέα εργασία"
+msgid "Show VM Console in a window."
+msgstr "Εμφάνιση κονσόλας VM σε ένα παράθυρο."
 
-#: clientgui/ViewProjects.cpp:1065
-msgid "To report completed tasks"
-msgstr "Για αναφορά ολοκληρωμένων εργασιών"
+#: ViewWork.cpp:209
+msgid "Suspend work for this result."
+msgstr "Παύση εργασίας για αυτό το αποτέλεσμα."
 
-#: clientgui/ViewProjects.cpp:1066
-msgid "To send trickle-up message"
-msgstr ""
+#: ViewWork.cpp:215 sg_TaskCommandPopup.cpp:72
+msgid "Abort"
+msgstr "Ακύρωση"
 
-#: clientgui/ViewProjects.cpp:1067
-#, fuzzy
-msgid "Requested by account manager"
-msgstr "Ζητήθηκε απο τον διαχειριστή λογαριασμού"
+#: ViewWork.cpp:216
+msgid "Abandon work on the result. You will get no credit for it."
+msgstr ""
+"Εγκατάλειψη εργασίας για αυτό το αποτέλεσμα. Δεν θα λάβετε βαθμούς για αυτό."
 
-#: clientgui/ViewProjects.cpp:1068
-#, fuzzy
-msgid "Project initialization"
-msgstr "Εκκίνηση έργου"
+#: ViewWork.cpp:223 sg_TaskCommandPopup.cpp:79
+msgid "Show task details."
+msgstr "Εμφάνιση λεπτομερειών εργασίας."
 
-#: clientgui/ViewProjects.cpp:1069
-#, fuzzy
-msgid "Requested by project"
-msgstr "Ζητήθηκε απο το έργο"
+#: ViewWork.cpp:235
+msgid "Elapsed"
+msgstr "Που έχει περάσει"
 
-#: clientgui/ViewProjects.cpp:1070
+#: ViewWork.cpp:236
 #, fuzzy
-msgid "Unknown reason"
-msgstr "Άγνωστος λόγος"
+msgid "Remaining (estimated)"
+msgstr "Απομένει (εκτιμάται)"
 
-#: clientgui/ViewProjects.cpp:1084
-msgid "Suspended by user"
-msgstr "Παύθηκε από τον χρήστη"
+#: ViewWork.cpp:237
+msgid "Deadline"
+msgstr "Προθεσμία αναφοράς"
 
-#: clientgui/ViewProjects.cpp:1087
-msgid "Won't get new tasks"
-msgstr "Δε θα δέχεται νέες εργασίες"
+#: ViewWork.cpp:264
+msgid "Tasks"
+msgstr "Εργασίες"
 
-#: clientgui/ViewProjects.cpp:1090
-msgid "Project ended - OK to remove"
-msgstr "Το έργο τελείωσε - ΟΚ για αφαίρεση"
+#: ViewWork.cpp:357
+msgid "Resuming task..."
+msgstr "Γίνεται συνέχιση επεξεργασίας εργασίας..."
 
-#: clientgui/ViewProjects.cpp:1093
-#, fuzzy
-msgid "Will remove when tasks done"
-msgstr "Αφαίρεση όταν οι εργασίες ολοκληρωθούν"
+#: ViewWork.cpp:360
+msgid "Suspending task..."
+msgstr "Γίνεται παύση εργασίας..."
 
-#: clientgui/ViewProjects.cpp:1096
-msgid "Scheduler request pending"
-msgstr "Αναμονή αίτησης χρονοδιαγράμματος"
+#: ViewWork.cpp:389
+msgid "Showing graphics for task..."
+msgstr "Εμφάνιση γραφικών για την εργασία..."
 
-#: clientgui/ViewProjects.cpp:1102
+#: ViewWork.cpp:426
 #, fuzzy
-msgid "Scheduler request in progress"
-msgstr "Αίτημα χρονοδιαγράμματος σε εξέλιξη"
+msgid "Showing VM console for task..."
+msgstr "Εμφάνιση κονσόλας VM για την εργασία..."
 
-#: clientgui/ViewProjects.cpp:1105
-msgid "Trickle up message pending"
+#: ViewWork.cpp:479
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %s, Status: %s)"
 msgstr ""
+"Είστε σίγουροι οτι θέλετε να ματαιώσετε αυτή την εργασία '%s';\n"
+"(Πρόοδος: %s, Κατάσταση: %s)"
 
-#: clientgui/ViewProjects.cpp:1111
-msgid "Communication deferred "
-msgstr "Η επικοινωνία αναβλήθηκε"
+#: ViewWork.cpp:485
+#, c-format
+msgid "Are you sure you want to abort these %d tasks?"
+msgstr "Είστε σίγουρος ότι θέλετε να εγκαταλείψετε τις εργασίες %d;"
 
-#: clientgui/ViewResources.cpp:62
-msgid "Total disk usage"
-msgstr "Συνολική χρήση δίσκου"
+#: ViewWork.cpp:490 sg_TaskCommandPopup.cpp:256
+msgid "Abort task"
+msgstr "Ακύρωση εργασίας"
 
-#: clientgui/ViewResources.cpp:83
-msgid "Disk usage by BOINC projects"
-msgstr "Χρήση δίσκου απο τα προγράμματα του BOINC"
+# 75%
+#: ViewWork.cpp:499
+#, fuzzy
+msgid "Aborting task..."
+msgstr "Ακύρωση εργασίας..."
 
-#: clientgui/ViewResources.cpp:116
-msgid "Disk"
-msgstr "Δίσκος"
+#: ViewWork.cpp:771
+msgid "Show all tasks"
+msgstr "Εμφάνιση όλων των εργασιών"
 
-#: clientgui/ViewResources.cpp:225
-msgid "no projects: 0 bytes used"
-msgstr "κανένα έργο: 0 bytes χρησιμοποιούνται"
+#: ViewWork.cpp:772
+msgid "Show all tasks."
+msgstr "Εμφάνιση όλων των εργασιών."
 
-#: clientgui/ViewResources.cpp:262
-msgid "used by BOINC: "
-msgstr "χρησιμοποιείται απο το BOINC:"
+#: ViewWork.cpp:796 sg_TaskCommandPopup.cpp:103
+msgid "Resume work for this task."
+msgstr "Συνέχεια επεξεργασίας για αυτή την εργασία."
 
-#: clientgui/ViewResources.cpp:272
-msgid "free, available to BOINC: "
-msgstr "ελεύθερο, διαθέσιμο για το BOINC:"
+#: ViewWork.cpp:802 sg_TaskCommandPopup.cpp:107
+msgid "Suspend work for this task."
+msgstr "Παύση επεξεργασίας για αυτή την εργασία."
 
-#: clientgui/ViewResources.cpp:282
-msgid "free, not available to BOINC: "
-msgstr "ελεύθερο, μη διαθέσιμο για το BOINC:"
+#: WelcomePage.cpp:284
+msgid "Add project or account manager"
+msgstr "Προσθήκη έργου ή διαχειριστή λογαριασμού"
 
-#: clientgui/ViewResources.cpp:292
-msgid "free: "
-msgstr "ελεύθερο:"
+#: WelcomePage.cpp:288
+msgid "Add project or use BOINC Account Manager"
+msgstr "Προσθήκη έργου ή χρήση Διαχειριστή Λογιαριασμού BOINC"
 
-#: clientgui/ViewResources.cpp:302
-msgid "used by other programs: "
-msgstr "χρησιμοποιείται απο άλλα προγράμματα:"
+#: 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 ""
 
-#: clientgui/ViewStatistics.cpp:1181
-msgid "User Total"
-msgstr "Σύνολο χρήστη"
+#: 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 ""
 
-#: clientgui/ViewStatistics.cpp:1182
-msgid "User Average"
-msgstr "Μέσος Όρος Χρήστη"
+#: 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 ""
 
-#: clientgui/ViewStatistics.cpp:1183
-msgid "Host Total"
-msgstr "Σύνολο Υπολογιστή"
+#: WelcomePage.cpp:339
+msgid "Use a BOINC Account Manager"
+msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1184
-msgid "Host Average"
-msgstr "Μέσος Όρος Υπολογιστή"
+#: WelcomePage.cpp:352
+msgid "To continue, click Next."
+msgstr "Για συνέχεια πατήστε στο Επόμενο."
 
-#: clientgui/ViewStatistics.cpp:1331
-#, c-format
-msgid "Last update: %.0f days ago"
-msgstr "Τελευταία ενημέρωση: %.0f μέρες πριν"
+#: WelcomePage.cpp:358
+msgid "Add or change your World Community Grid projects"
+msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1956
-msgid "Show user total"
-msgstr "Εμφάνιση συνόλου χρήστη"
+#: WelcomePage.cpp:361
+msgid "Add projects run by other researchers or organizations"
+msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1957
-msgid "Show total credit for user"
-msgstr "Εμφάνιση ολικών πόντων χρήστη"
+#: WizardAttach.cpp:634
+msgid "Do you really want to cancel?"
+msgstr "Είστε σίγουρος ότι θέλετε να ακυρώστε;"
 
-#: clientgui/ViewStatistics.cpp:1963
-msgid "Show user average"
-msgstr "Εμφάνιση μέσου όρου χρήστη"
+#: WizardAttach.cpp:635
+msgid "Question"
+msgstr "Ερώτηση"
 
-#: clientgui/ViewStatistics.cpp:1964
-msgid "Show average credit for user"
-msgstr "Εμφάνιση μέσου όρου πόντων χρήστη"
+#: sg_BoincSimpleFrame.cpp:149
+msgid "Advanced View...\tCtrl+Shift+A"
+msgstr "Προηγμένη προβολή...\t Ctrl+Shift+A"
 
-#: clientgui/ViewStatistics.cpp:1970
-msgid "Show host total"
-msgstr "Εμφάνιση συνόλου υπολογιστή"
+#: sg_BoincSimpleFrame.cpp:150
+#, fuzzy
+msgid "Display the advanced graphical interface."
+msgstr "Εμφάνιση της απλής γραφικής διεπιφάνειας."
 
-#: clientgui/ViewStatistics.cpp:1971
-msgid "Show total credit for host"
-msgstr "Εμφάνιση συνολικών πόντων πάροχου"
+#: sg_BoincSimpleFrame.cpp:157
+msgid "Skin"
+msgstr "Εμφάνιση"
 
-#: clientgui/ViewStatistics.cpp:1977
-msgid "Show host average"
-msgstr "Εμφάνιση μέσου όρου πάροχου"
+#: sg_BoincSimpleFrame.cpp:159
+msgid "Select the appearance of the user interface."
+msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1978
-msgid "Show average credit for host"
-msgstr "Εμφάνιση μέσου όρου πόντων πάροχου"
+#: sg_BoincSimpleFrame.cpp:206
+#, c-format
+msgid "&%s"
+msgstr "&%s"
 
-#: clientgui/ViewStatistics.cpp:1987
-msgid "< &Previous project"
-msgstr "< &Προηγούμενο έργο"
+#: sg_BoincSimpleFrame.cpp:390
+#, fuzzy
+msgid "Default"
+msgstr "Καθορισμός Εξ' ορισμού"
 
-#: clientgui/ViewStatistics.cpp:1988
-msgid "Show chart for previous project"
-msgstr "Εμφάνιση γραφήματος για προηγούμενο πρόγραμμα"
+#: sg_BoincSimpleFrame.cpp:759
+msgid "Suspend Computing"
+msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1993
-msgid "&Next project >"
-msgstr "&Επόμενο πρόγραμμα>"
+#: sg_BoincSimpleFrame.cpp:760
+msgid "Resume Computing"
+msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1994
-msgid "Show chart for next project"
-msgstr "Εμφάνιση γραφήματος για επόμενο πρόγραμμα"
+#: sg_BoincSimpleFrame.cpp:777
+msgid "Open a window to view notices from projects or BOINC"
+msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2000
-#: clientgui/ViewStatistics.cpp:2390
-msgid "Hide project list"
-msgstr "Απόκρυψη λίστας έργων"
+#: sg_DlgMessages.cpp:146
+msgid "Close"
+msgstr "Έξοδος"
 
-#: clientgui/ViewStatistics.cpp:2001
-#: clientgui/ViewStatistics.cpp:2390
-msgid "Use entire area for graphs"
-msgstr "Χρήση ολόκληρου του χώρου για τα γραφικά"
+#: sg_DlgMessages.cpp:389
+#, c-format
+#, fuzzy, c-format
+msgid "%s - Notices"
+msgstr "%s Ανακοινώσεις"
 
-#: clientgui/ViewStatistics.cpp:2006
-msgid "Mode view"
-msgstr "Τρόπος προβολής"
+#: sg_DlgPreferences.cpp:268
+msgid "This dialog controls preferences for this computer only."
+msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2010
-msgid "One project"
-msgstr "Ένα πρόγραμμα"
+#: sg_DlgPreferences.cpp:273
+msgid "Click OK to set preferences."
+msgstr ""
+
+#: sg_DlgPreferences.cpp:278
+msgid ""
+"Click Clear to restore web-based settings for all preferences listed below."
+msgstr ""
+
+#: sg_DlgPreferences.cpp:285
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
+msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2011
-msgid "Show one chart with selected project"
-msgstr "Εμφάνιση ενός προγράμματος με τα επιλεγμένα προγράμματα"
+#: sg_DlgPreferences.cpp:313
+msgid "Do work only between:"
+msgstr "Εκτέλεση εργασιών μόνο μεταξύ:"
 
-#: clientgui/ViewStatistics.cpp:2017
-msgid "All projects (separate)"
-msgstr "Όλα τα έργα (ξεχωριστά)"
+#: sg_DlgPreferences.cpp:335
+msgid "Connect to internet only between:"
+msgstr "Σύνδεση στο διαδίκτυο μόνο μεταξύ:"
 
-#: clientgui/ViewStatistics.cpp:2018
-msgid "Show all projects, one chart per project"
-msgstr "Εμφάνιση όλων των προγραμμάτων, ένα γράφημα για κάθε πρόγραμμα"
+#: sg_DlgPreferences.cpp:357 sg_DlgPreferences.cpp:374
+msgid "Use no more than:"
+msgstr "Χρήση όχι περισσότερο απο:"
 
-#: clientgui/ViewStatistics.cpp:2024
-msgid "All projects (together)"
-msgstr "Όλα τα έργα (μαζί)"
+#: sg_DlgPreferences.cpp:370
+msgid "of disk space"
+msgstr "του χώρου του δίσκου"
 
-#: clientgui/ViewStatistics.cpp:2025
-msgid "Show one chart with all projects"
-msgstr "Εμφάνιση ενός γραφήματος με όλα τα προγράμματα"
+#: sg_DlgPreferences.cpp:387
+msgid "of the processor"
+msgstr "του επεξεργαστή"
 
-#: clientgui/ViewStatistics.cpp:2031
-msgid "All projects (sum)"
-msgstr "Όλα τα έργα (αθροιστικά)"
+#: sg_DlgPreferences.cpp:391
+msgid "Do work while on battery?"
+msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2032
-msgid "Show one chart with sum of projects"
-msgstr "Εμφάνιση ενός γραφήματος με όλα τα έργα αθροιστικά"
+#: sg_DlgPreferences.cpp:404
+msgid "Do work after idle for:"
+msgstr "Εκτέλεση εργασίων ενώ είναι αδρανής για:"
 
-#: clientgui/ViewStatistics.cpp:2053
-msgid "Statistics"
-msgstr "Στατιστικά"
+#: sg_DlgPreferences.cpp:429
+msgid "Clear all local preferences listed above and close the dialog"
+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 "Ανανέωση γραφημάτων..."
+#: 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 "Οποιαδήποτε στιγμη"
 
-#: clientgui/ViewStatistics.cpp:2394
-msgid "Show project list"
-msgstr "Εμφάνιση λίστας έργων"
+#: sg_DlgPreferences.cpp:638
+msgid "100 MB"
+msgstr "100 MB"
 
-#: clientgui/ViewStatistics.cpp:2394
-msgid "Uses smaller area for graphs"
-msgstr "Χρήση μικρότερου χώρου για τα γραφηκά"
+#: sg_DlgPreferences.cpp:639
+msgid "200 MB"
+msgstr "200 MB"
 
-#: clientgui/ViewTransfers.cpp:169
-msgid "Retry Now"
-msgstr "Επανάληψη Τώρα"
+#: sg_DlgPreferences.cpp:640
+msgid "500 MB"
+msgstr "500 MB"
 
-#: clientgui/ViewTransfers.cpp:170
-msgid "Retry the file transfer now"
-msgstr "Επανάληψη μεταφοράς αρχείου τώρα"
+#: sg_DlgPreferences.cpp:641
+msgid "1 GB"
+msgstr "1 GB"
 
-#: clientgui/ViewTransfers.cpp:176
-msgid "Abort Transfer"
-msgstr "Ακύρωση Μεταφοράς"
+#: sg_DlgPreferences.cpp:642
+msgid "2 GB"
+msgstr "2 GB"
 
-#: clientgui/ViewTransfers.cpp:177
-msgid "Abort this file transfer.  You won't get credit for the task."
-msgstr ""
+#: sg_DlgPreferences.cpp:643
+msgid "5 GB"
+msgstr "5 GB"
 
-#: clientgui/ViewTransfers.cpp:188
-msgid "File"
-msgstr "Αρχείο"
+#: sg_DlgPreferences.cpp:644
+msgid "10 GB"
+msgstr "10 GB"
 
-#: clientgui/ViewTransfers.cpp:189
-#: clientgui/ViewWork.cpp:238
-msgid "Progress"
-msgstr "Πρόοδος"
+#: sg_DlgPreferences.cpp:645
+msgid "20 GB"
+msgstr "20 GB"
 
-#: clientgui/ViewTransfers.cpp:190
-msgid "Size"
-msgstr "Μέγεθος"
+#: sg_DlgPreferences.cpp:646
+msgid "50 GB"
+msgstr "50 GB"
 
-#: clientgui/ViewTransfers.cpp:191
-msgid "Elapsed Time"
-msgstr "Χρόνος που περάσει"
+#: sg_DlgPreferences.cpp:647
+msgid "100 GB"
+msgstr "100 GB"
 
-#: clientgui/ViewTransfers.cpp:192
-msgid "Speed"
-msgstr "Ταχύτητα"
+#: sg_DlgPreferences.cpp:717
+#, c-format
+msgid "%d MB"
+msgstr "%d MB"
 
-#: clientgui/ViewTransfers.cpp:218
-msgid "Transfers"
-msgstr "Μεταφορές"
+#: sg_DlgPreferences.cpp:719
+#, c-format
+msgid "%4.2f GB"
+msgstr "%4.2f GB"
 
-#: clientgui/ViewTransfers.cpp:285
-msgid "Network activity is suspended - "
-msgstr "Η δραστηριότητα του δικτύου παύθηκε -"
+#: sg_DlgPreferences.cpp:760
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
 
-#: clientgui/ViewTransfers.cpp:287
-msgid ""
-".\n"
-"You can enable it using the Activity menu."
-msgstr ""
-".\n"
-"Μπορείτε να το ενεργοποιήσετε χρησιμοποιόντας το μενού Επιλογών."
+#: sg_DlgPreferences.cpp:796
+msgid "0 (Run Always)"
+msgstr "0 (Διαρκής Εκτέλεση)"
 
-#: clientgui/ViewTransfers.cpp:290
-msgid "BOINC"
-msgstr "BOINC"
+#: sg_DlgPreferences.cpp:799
+#, c-format
+msgid "%d"
+msgstr "%d"
 
-#: clientgui/ViewTransfers.cpp:297
-msgid "Retrying transfer now..."
-msgstr "Επανάληψη μεταφοράς τώρα..."
+#: sg_DlgPreferences.cpp:1029
+#, fuzzy
+msgid "Do you really want to clear all local preferences?\n"
+msgstr "Θέλετε όντως να αφαιρέσετε όλες τις τοπικές προτιμήσεις;"
 
-#: clientgui/ViewTransfers.cpp:335
-msgid "Aborting transfer..."
-msgstr "Ακύρωση μεταφοράς..."
+#: sg_ProjectPanel.cpp:72
+#, fuzzy
+msgid "Add Project"
+msgstr "Προσθήκη έργου"
 
-#: clientgui/ViewTransfers.cpp:348
-#, 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."
+#: sg_ProjectPanel.cpp:73
+msgid "Synchronize"
 msgstr ""
-"Είστε σίγουροι οτι θέλετε να ακυρώσετε τη μεταφορά του αρχείου '%s';\n"
-"ΣΗΜΕΙΩΣΗ: Η Ακύρωση της μεταφοράς συνεπάγεται ακύρωση της εργασίας και εσείς\n"
-"δε θα λάβετε πόντους για αυτήν."
 
-#: clientgui/ViewTransfers.cpp:354
-msgid "Abort File Transfer"
-msgstr "Ακύρωση Μεταφοράς Αρχείου"
+#: sg_ProjectPanel.cpp:74
+msgid "Work done for this project"
+msgstr ""
 
-#: clientgui/ViewTransfers.cpp:785
-msgid "Upload"
+#: sg_ProjectPanel.cpp:77
+msgid "Synchronize projects with account manager system"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:785
-msgid "Download"
+#: sg_ProjectPanel.cpp:124
+msgid "Select a project to access with the controls below"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:789
+#: sg_ProjectPanel.cpp:145
 #, fuzzy
-msgid "retry in "
-msgstr "Επανάληψη σε"
+msgid "Project Web Pages"
+msgstr "Ιστοσελίδα Έργου"
 
-#: clientgui/ViewTransfers.cpp:791
-msgid "failed"
+#: sg_ProjectPanel.cpp:149
+msgid "Project Commands"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:794
-msgid "suspended"
+#: sg_ProjectPanel.cpp:267
+#, c-format
+msgid "Pop up a menu of web sites for project %s"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:799
-msgid "active"
-msgstr "ενεργό"
+#: sg_ProjectPanel.cpp:269
+#, c-format
+msgid "Pop up a menu of commands to apply to project %s"
+msgstr ""
 
-#: clientgui/ViewTransfers.cpp:801
-msgid "pending"
-msgstr "εκκρεμεί"
+#: sg_TaskCommandPopup.cpp:67
+msgid "Suspend this task."
+msgstr ""
 
-#: clientgui/ViewTransfers.cpp:808
-msgid " (project backoff: "
-msgstr "(υπαναχώρηση έργου:"
+#: sg_TaskCommandPopup.cpp:73
+msgid "Abandon this task. You will get no credit for it."
+msgstr ""
 
-#: clientgui/ViewWork.cpp:192
-#: clientgui/ViewWork.cpp:782
-msgid "Show active tasks"
-msgstr "Εμφάνιση ενεργών εργασίων"
+#: sg_TaskCommandPopup.cpp:251
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %.1lf%%, Status: %s)"
+msgstr ""
 
-#: clientgui/ViewWork.cpp:193
-#: clientgui/ViewWork.cpp:783
-msgid "Show only active tasks."
-msgstr "Εμφάνιση μόνο ενεργών εργασιών."
+#: sg_TaskPanel.cpp:464
+msgid "You don't have any projects.  Please Add a Project."
+msgstr "Δεν έχετε άλλα προγράμματα. Παρακαλώ προσθέστε ένα πρόγραμμα."
 
-#: clientgui/ViewWork.cpp:206
-#, fuzzy
-msgid "Show VM Console"
-msgstr "Εμφάνιση κονσόλας VM"
+#: sg_TaskPanel.cpp:465
+msgid "Not available"
+msgstr ""
 
-#: clientgui/ViewWork.cpp:207
+#: sg_TaskPanel.cpp:476
 #, fuzzy
-msgid "Show VM Console in a window."
-msgstr "Εμφάνιση κονσόλας VM σε ένα παράθυρο."
-
-#: clientgui/ViewWork.cpp:214
-msgid "Suspend work for this result."
-msgstr "Παύση εργασίας για αυτό το αποτέλεσμα."
+msgid "Tasks:"
+msgstr "Εργασίες"
 
-#: clientgui/ViewWork.cpp:221
-msgid "Abandon work on the result. You will get no credit for it."
-msgstr "Εγκατάλειψη εργασίας για αυτό το αποτέλεσμα. Δεν θα λάβετε βαθμούς για αυτό."
+#: sg_TaskPanel.cpp:482
+msgid "Select a task to access"
+msgstr ""
 
-#: clientgui/ViewWork.cpp:240
-msgid "Elapsed"
-msgstr "Που έχει περάσει"
+#: sg_TaskPanel.cpp:493
+msgid "From:"
+msgstr ""
 
-#: clientgui/ViewWork.cpp:241
-#, fuzzy
-msgid "Remaining (estimated)"
-msgstr "Απομένει (εκτιμάται)"
+#: sg_TaskPanel.cpp:547
+msgid "This task's progress"
+msgstr ""
 
-#: clientgui/ViewWork.cpp:242
-msgid "Deadline"
-msgstr "Προθεσμία αναφοράς"
+#: sg_TaskPanel.cpp:565
+msgid "Task Commands"
+msgstr ""
 
-#: clientgui/ViewWork.cpp:269
-msgid "Tasks"
-msgstr "Εργασίες"
+#: sg_TaskPanel.cpp:566
+msgid "Pop up a menu of commands to apply to this task"
+msgstr ""
 
-#: clientgui/ViewWork.cpp:362
-msgid "Resuming task..."
-msgstr "Γίνεται συνέχιση επεξεργασίας εργασίας..."
+#: sg_TaskPanel.cpp:701
+#, c-format
+#, fuzzy, c-format
+msgid "Application: %s"
+msgstr "Εφαρμογή:"
 
-#: clientgui/ViewWork.cpp:365
-msgid "Suspending task..."
-msgstr "Γίνεται παύση εργασίας..."
+#: sg_TaskPanel.cpp:724
+#, c-format
+msgid "%.3f%%"
+msgstr ""
 
-#: clientgui/ViewWork.cpp:394
-msgid "Showing graphics for task..."
-msgstr "Εμφάνιση γραφικών για την εργασία..."
+#: sg_TaskPanel.cpp:732
+msgid "Application: Not available"
+msgstr ""
 
-#: clientgui/ViewWork.cpp:431
-#, fuzzy
-msgid "Showing VM console for task..."
-msgstr "Εμφάνιση κονσόλας VM για την εργασία..."
+#: sg_TaskPanel.cpp:832
+msgid "Not Available"
+msgstr ""
 
-#: clientgui/ViewWork.cpp:484
+#: sg_TaskPanel.cpp:847
 #, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %s, Status: %s)"
+msgid "Elapsed: %s"
 msgstr ""
-"Είστε σίγουροι οτι θέλετε να ματαιώσετε αυτή την εργασία '%s';\n"
-"(Πρόοδος: %s, Κατάσταση: %s)"
 
-#: clientgui/ViewWork.cpp:490
+# 84%
+#: sg_TaskPanel.cpp:861
 #, c-format
-msgid "Are you sure you want to abort these %d tasks?"
-msgstr "Είστε σίγουρος ότι θέλετε να εγκαταλείψετε τις εργασίες %d;"
-
-# 75%
-#: clientgui/ViewWork.cpp:504
-#, fuzzy
-msgid "Aborting task..."
-msgstr "Ακύρωση εργασίας..."
+#, fuzzy, c-format
+msgid "Remaining (estimated): %s"
+msgstr "Απομένει"
 
-#: clientgui/ViewWork.cpp:776
-msgid "Show all tasks"
-msgstr "Εμφάνιση όλων των εργασιών"
+#: sg_TaskPanel.cpp:876
+#, c-format
+msgid "Status: %s"
+msgstr ""
 
-#: clientgui/ViewWork.cpp:777
-msgid "Show all tasks."
-msgstr "Εμφάνιση όλων των εργασιών."
+#: sg_TaskPanel.cpp:1223
+msgid "Retrieving current status."
+msgstr "Ανάκτηση τρέχουσας κατάστασης."
 
-#: clientgui/WelcomePage.cpp:284
-msgid "Add project or account manager"
-msgstr "Προσθήκη έργου ή διαχειριστή λογαριασμού"
+#: sg_TaskPanel.cpp:1229
+msgid "Downloading work from the server."
+msgstr "Λήψη εργασιών απο τον διακομιστή."
 
-#: clientgui/WelcomePage.cpp:288
-msgid "Add project or use BOINC Account Manager"
-msgstr "Προσθήκη έργου ή χρήση Διαχειριστή Λογιαριασμού BOINC"
+#: sg_TaskPanel.cpp:1234
+msgid "Processing Suspended:  Running On Batteries."
+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 ""
+#: sg_TaskPanel.cpp:1236
+msgid "Processing Suspended:  User Active."
+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 ""
+#: sg_TaskPanel.cpp:1238
+msgid "Processing Suspended:  User paused processing."
+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 ""
+#: sg_TaskPanel.cpp:1240
+msgid "Processing Suspended:  Time of Day."
+msgstr "Επεξεργασία παύθηκε: Ώρα της ημέρας."
 
-#: clientgui/WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
+#: sg_TaskPanel.cpp:1242
+msgid "Processing Suspended:  Benchmarks Running."
 msgstr ""
 
-#: clientgui/WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
-msgstr ""
+#: sg_TaskPanel.cpp:1244
+msgid "Processing Suspended."
+msgstr "Επεξεργασία παύθηκε."
 
-#: clientgui/WelcomePage.cpp:361
-msgid "Add projects run by other researchers or organizations"
-msgstr ""
+#: sg_TaskPanel.cpp:1248
+msgid "Waiting to contact project servers."
+msgstr "Αναμονή για επικοινωνία με τους διακομιστές του έργου."
 
-#: clientgui/WizardAttach.cpp:673
-msgid "Do you really want to cancel?"
-msgstr "Είστε σίγουρος ότι θέλετε να ακυρώστε;"
+#: sg_TaskPanel.cpp:1252 sg_TaskPanel.cpp:1261
+msgid "Retrieving current status"
+msgstr "Ανακτώντας την τρέχουσα κατάσταση"
 
-#: clientgui/WizardAttach.cpp:674
-msgid "Question"
-msgstr "Ερώτηση"
+#: sg_TaskPanel.cpp:1256
+msgid "No work available to process"
+msgstr "Καμία εργασία διαθέσιμη για επεξεργασία"
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
+#: sg_TaskPanel.cpp:1258
+msgid "Unable to connect to the core client"
+msgstr "Αδύνατη η σύνδεση με τον πυρήνα του προγράμματος"
+
+#: wizardex.cpp:377 wizardex.cpp:553
 msgid "&Next >"
 msgstr "&Επόμενο >"
 
-#: clientgui/wizardex.cpp:383
+#: wizardex.cpp:383
 msgid "< &Back"
 msgstr "< &Προηγούμενο"
 
-#: clientgui/wizardex.cpp:553
+#: wizardex.cpp:553
 msgid "&Finish"
 msgstr "&Τέλος"
 
-#: clientgui/common/wxPieCtrl.cpp:64
-msgid "Pie Ctrl"
-msgstr ""
+#: mac/Mac_GUI.cpp:110
+#, fuzzy
+msgid "Preferences…"
+msgstr "Προτιμήσεις"
 
-#: clientgui/mac/Mac_GUI.cpp:35
+#: mac/Mac_GUI.cpp:122
 msgid "Services"
 msgstr ""
 
-#: clientgui/mac/Mac_GUI.cpp:36
+#: mac/Mac_GUI.cpp:144
 #, c-format
 msgid "Hide %s"
 msgstr ""
 
-#: clientgui/mac/Mac_GUI.cpp:37
+#: mac/Mac_GUI.cpp:158
 msgid "Hide Others"
 msgstr ""
 
-#: clientgui/mac/Mac_GUI.cpp:38
+#: mac/Mac_GUI.cpp:172
 msgid "Show All"
 msgstr ""
 
-#: clientgui/mac/Mac_GUI.cpp:39
+#: mac/Mac_GUI.cpp:186
 #, c-format
+#, fuzzy, c-format
 msgid "Quit %s"
 msgstr "&Έξοδος %s"
 
-#: clientgui/DlgAdvPreferences.h:30
-msgid "specify work start and stop hours in format HH:MM-HH:MM"
-msgstr ""
-
-#: clientgui/DlgAdvPreferences.h:31
-msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
-msgstr ""
-
-# 98%
-#, fuzzy
-#~ msgid ""
-#~ "(C) 2003-2013 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2010 Πανεπιστήμιο της Καλιφόρνια, Μπερκελέυ.\n"
-#~ "Όλα τα δικαιώματα κατοχυρώθηκαν."
-
-#, c-format
-#~ msgid "%s - Preferences"
-#~ msgstr "%s - Προτιμήσεις"
-
-#, no-c-format
-#~ msgid "% CPU time"
-#~ msgstr "% χρόνος χρήσης κεντρικής μονάδας επεξεργασίας"
-#~ msgid "KBytes/sec."
-#~ msgstr "ΚBytes/sec."
-#~ msgid "Mbytes"
-#~ msgstr "Mbytes"
-#~ msgid "every"
-#~ msgstr "κάθε"
-#~ msgid "days"
-#~ msgstr "μέρες"
-#~ msgid "Gigabytes disk space"
-#~ msgstr "Gigabytes χώρος δίσκου"
-#~ msgid "Running, high priority"
-#~ msgstr "Εκτελείται, υψηλή προτεραιότητα"
-#~ msgid " (Scheduler wait: "
-#~ msgstr "(Προγραμματιστής περιμένει:"
-#~ msgid " (Scheduler wait)"
-#~ msgstr "(Προγραμματιστής περιμένει)"
-
-#, fuzzy
-#~ msgid " (Waiting for network access)"
-#~ msgstr "(Αναμονή για πρόσβαση στο δίκτυο)"
-
-#, fuzzy
-#~ msgid "Preferences…"
-#~ msgstr "Προτιμήσεις"
 #~ msgid "I do not agree with the terms of use."
 #~ msgstr "Δε συμφωνώ με τους όρους χρήσης."
+
 #~ msgid "Workunit name"
 #~ msgstr "Όνομα εργασίας"
 
 #, fuzzy
 #~ msgid "Display the advanced (accessible) graphical interface."
 #~ msgstr "Εμφάνιση της απλής γραφικής διεπιφάνειας."
+
 #~ msgid "Paused: Other work running"
 #~ msgstr "Παύθηκε: Άλλες εργασίες εκτελούνται"
+
 #~ msgid "Paused: User active"
 #~ msgstr "Παύθηκε: Χρήστης ενεργός"
+
 #~ msgid "Paused: Computer on battery"
 #~ msgstr "Παύθηκε: Ο υπολογιστής τροφοδοτείται απο μπαταρίες"
+
 #~ msgid "Paused: Time of Day"
 #~ msgstr "Παύθηκε: Ώρα ημέρας"
+
 #~ msgid "Paused: Benchmarks running"
 #~ msgstr "Παύθηκε: Εκτελούνται μετρήσεις"
+
 #~ msgid "Paused"
 #~ msgstr "Παύθηκε"
+
 #~ msgid "Click to show project graphics"
 #~ msgstr "Κλικάρετε για να εμφανιστούν τα γραφικά του προγράμματος"
+
 #~ msgid "Open a window to view messages"
 #~ msgstr "Ανοίξτε ένα παράθυρο για να δείτε τα μηνύματα"
+
 #~ msgid "Stop all activity"
 #~ msgstr "Σταμάτημα όλων των ενεργειών"
+
 #~ msgid "Resume activity"
 #~ msgstr "Συνέχιση ενεργειών"
+
 #~ msgid "Open a window to set your preferences"
 #~ msgstr "Ανοίξτε ένα παράθυρο για να ορίσετε της προτιμήσεις σας"
+
 #~ msgid "Switch to the BOINC advanced view"
 #~ msgstr "Μεταβείτε στη προχωρημένη μορφή του BOINC"
+
 #~ msgid "My Projects:"
 #~ msgstr "Τα προγράμματά μου:"
 
@@ -4149,24 +4063,31 @@ msgstr ""
 #, c-format
 #~ msgid "%d hr %d min %d sec"
 #~ msgstr "%d ώρα %d λεπτά %d δευτερόλεπτα"
+
 #~ msgid "Are you sure you want to display graphics on a remote machine?"
 #~ msgstr ""
 #~ "Είστε σίγουροι ότι επιθυμείτε να εμφανιστούν γραφικά σε ένα απομακρυσμένο "
 #~ "υπολογιστή;"
+
 #~ msgid "Application: "
 #~ msgstr "Εφαρμογή:"
+
 #~ msgid "Time Remaining: "
 #~ msgstr "Χρόνος που απομένει:"
+
 #~ msgid "Elapsed Time: "
 #~ msgstr "Χρόνος που έχει περάσει:"
+
 #~ msgid "Account manager website"
 #~ msgstr "Ιστοσελίδα του διαχειριστή λογαριασμών"
+
 #~ msgid "Account Manager &URL:"
 #~ msgstr "&Διεύθυνση ιστοσελίδας διαχειριστή λογαριασμού:"
 
 #, c-format
 #~ msgid "%s &website"
 #~ msgstr "&Ιστοσελίδα του %s"
+
 #~ msgid "Notice List"
 #~ msgstr "Λίστα Ανακοινώσεων"
 
@@ -4177,14 +4098,19 @@ msgstr ""
 #, c-format
 #~ msgid "%s; received from %s; on %s"
 #~ msgstr "%s; λήφθηκαν απο %s; στο %s"
+
 #~ msgid "Click"
 #~ msgstr "Πατήστε"
+
 #~ msgid "Project List"
 #~ msgstr "Λίστα Έργων"
+
 #~ msgid "Nvidia GPU Supported"
 #~ msgstr "Υποστήριξη μονάδας επεξεργασίας γραφικών Nvidia"
+
 #~ msgid "ATI GPU Supported"
 #~ msgstr "Υποστήριξη μονάδας επεξεργασίας γραφικών ATI"
+
 #~ msgid "Project Website"
 #~ msgstr "Ιστοσελίδα Έργου"
 
@@ -4192,46 +4118,66 @@ msgstr ""
 #, fuzzy
 #~ msgid "Retry now"
 #~ msgstr "Επανάληψη Τώρα"
+
 #~ msgid "10%"
 #~ msgstr "10%"
+
 #~ msgid "20%"
 #~ msgstr "20%"
+
 #~ msgid "30%"
 #~ msgstr "30%"
+
 #~ msgid "40%"
 #~ msgstr "40%"
+
 #~ msgid "50%"
 #~ msgstr "50%"
+
 #~ msgid "60%"
 #~ msgstr "60%"
+
 #~ msgid "70%"
 #~ msgstr "70%"
+
 #~ msgid "80%"
 #~ msgstr "80%"
+
 #~ msgid "90%"
 #~ msgstr "90%"
+
 #~ msgid "100%"
 #~ msgstr "100%"
+
 #~ msgid "1"
 #~ msgstr "1"
+
 #~ msgid "3"
 #~ msgstr "3"
+
 #~ msgid "5"
 #~ msgstr "5"
+
 #~ msgid "10"
 #~ msgstr "10"
+
 #~ msgid "15"
 #~ msgstr "15"
+
 #~ msgid "30"
 #~ msgstr "30"
+
 #~ msgid "60"
 #~ msgstr "60"
+
 #~ msgid "This panel contains graphs showing user totals for projects"
 #~ msgstr ""
 #~ "Αυτό το παράθυρο περιέχει γραφικά που εμφανίζουν τα συνολικά στατιστικά για "
 #~ "το έργο"
+
 #~ msgid "list of events"
 #~ msgstr "λίστα γεγονότων"
+
 #~ msgid "list of events is empty"
 #~ msgstr "η λίστα γεγονότων είναι κενή"
 
@@ -4242,10 +4188,13 @@ msgstr ""
 #, c-format
 #~ msgid "list of %s is empty"
 #~ msgstr "η λίστα του %s είναι κενή"
+
 #~ msgid "list is empty"
 #~ msgstr "η λίστα είναι κενή"
+
 #~ msgid "blank"
 #~ msgstr "κενό"
+
 #~ msgid "list of projects or account managers"
 #~ msgstr "λίστα με έργα ή διαχειριστές λογαριασμών"
 
@@ -4284,10 +4233,13 @@ msgstr ""
 #, c-format
 #~ msgid "New page appended. Index = %i"
 #~ msgstr "Νέα σελίδα επισυνάπτεται. Ευρετήριο = %i"
+
 #~ msgid "Identify your account "
 #~ msgstr "Αναγνωρίστε τον λογαριασμό σας"
+
 #~ msgid "Read config file"
 #~ msgstr "Άνοιγμα αρχείου διαμόρφωσης"
+
 #~ msgid "Read configuration info from cc_config.xml"
 #~ msgstr "Άνοιγμα των πληροφοριών διαμόρφωσης από το αρχείο cc_config.xml"
 
@@ -4298,10 +4250,13 @@ msgstr ""
 #~ msgstr ""
 #~ "(C) 2003-2010 Πανεπιστήμιο της Καλιφόρνια, Μπερκελέυ.\n"
 #~ "Όλα τα δικαιώματα κατοχυρώθηκαν."
+
 #~ msgid "Multicore CPU Supported"
 #~ msgstr "Υποστήριξη πολυπύρηνων κεντρικών μονάδων επεξεργασίας"
+
 #~ msgid "Click 'Retry now' to transfer the file now"
 #~ msgstr "Πατήστε 'Επανάληψη Τώρα' για να μεταφέρετε το αρχείο τώρα"
+
 #~ msgid ""
 #~ "Click 'Abort transfer' to delete the file from the transfer queue. This "
 #~ "will prevent you from being granted credit for this result."
@@ -4309,6 +4264,7 @@ msgstr ""
 #~ "Πατήστε την 'Ακύρωση Μεταφοράς' για να διαγράψετε το αρχείο από την ουρά "
 #~ "μεταφορών. Αυτό θα αποτρέψει την απόδωση βαθμών για το συγκεκριμένο "
 #~ "αποτέλεσμα."
+
 #~ msgid "Aborting result..."
 #~ msgstr "Ακύρωση επεξεργασίας αποτελέσματος..."
 
@@ -4319,14 +4275,19 @@ msgstr ""
 #, fuzzy
 #~ msgid "Don't fetch ATI GPU tasks"
 #~ msgstr "Δεν δέχεται νέες εργασίες"
+
 #~ msgid "Web sites"
 #~ msgstr "Ιστοσελίδες"
+
 #~ msgid "Connect about every"
 #~ msgstr "Σύνδεση κάθε"
+
 #~ msgid "days (max. 10)"
 #~ msgstr "μέρες (μέγιστο 10)"
+
 #~ msgid "Display and network &options..."
 #~ msgstr "&Επιλογές προβολής και δικτύου..."
+
 #~ msgid ""
 #~ "You have requested to exit the %s,\n"
 #~ "which allows you to view and manage\n"
@@ -4343,123 +4304,180 @@ msgstr ""
 #~ "όταν εσείς\n"
 #~ "κλείνετε τον Διαχειριστή, τότε επιλέξτε ανάμεσα απο τις επόμενες "
 #~ "επιλογές: "
+
 #~ msgid "Stop running science applications when exiting the Manager"
 #~ msgstr ""
 #~ "Σταμάτημα εκτέλεσης επιστημονικών εργασιών, όταν θα κλείσει ο διαχειριστής"
+
 #~ msgid "Estimated app speed"
 #~ msgstr "Εκτιμώμενη ταχύτητα εφαρμογής"
+
 #~ msgid "Estimated task size"
 #~ msgstr "Εκτιμώμενο μέγεθος εργασίας"
+
 #~ msgid "%s - Options"
 #~ msgstr "%s - Επιλογές"
+
 #~ msgid "Retrieving host information; please wait..."
 #~ msgstr "Ανάκτηση πληροφοριών υπολογιστή: παρακαλώ περιμένετε..."
+
 #~ msgid " (waiting for GPU memory)"
 #~ msgstr "(αναμονή για τη μνήμη της μονάδας επεξεργασίας γραφικών)"
+
 #~ msgid "%s - Messages"
 #~ msgstr "%s - Μηνύματα"
+
 #~ msgid "Skin:"
 #~ msgstr "Εμφάνιση:"
+
 #~ msgid "Preferences"
 #~ msgstr "Προτιμήσεις"
+
 #~ msgid "I want to customize my preferences for this computer only."
 #~ msgstr ""
 #~ "Θέλω να τροποποιήσω τις προτιμήσεις μου μόνο για αυτόν τον υπολογιστή."
+
 #~ msgid "Customized Preferences"
 #~ msgstr "Τροποποιημένες προτιμήσεις"
+
 #~ msgid "Upload suspended - "
 #~ msgstr "Το ανέβασμα παύθηκε -"
+
 #~ msgid "Download suspended - "
 #~ msgstr "Η λήψη παύθηκε -"
+
 #~ msgid "Upload pending"
 #~ msgstr "Η αποστολή εκκρεμεί"
+
 #~ msgid "Download pending"
 #~ msgstr "Η λήψη εκκρεμεί"
+
 #~ msgid "Get help with BOINC"
 #~ msgstr "Λάβετε βοήθεια με το BOINC"
+
 #~ msgid "error"
 #~ msgstr "σφάλμα"
+
 #~ msgid "A new version of BOINC is available."
 #~ msgstr "Μια νέα έκδοση του BOINC είναι διαθέσιμη."
+
 #~ msgid "Download it."
 #~ msgstr "Κατεβάστε το."
+
 #~ msgid "Message from"
 #~ msgstr "Μήνυμα απο"
+
 #~ msgid "Syntax error in app_info.xml"
 #~ msgstr "Συντακτικό σφάλμα στο app_info.xml"
+
 #~ msgid "Attaching to project or account manager..."
 #~ msgstr "Σύνδεση σε πρόγραμμα ή διαχειριστή λογαριαμού..."
+
 #~ msgid "%s - Detach from %s"
 #~ msgstr "%s - Αποσύνδεση από το %s"
+
 #~ msgid "Failed to attach to project"
 #~ msgstr "Αποτυχία σύνδεσης σε πρόγραμμα"
+
 #~ msgid "Failed to attach to account manager"
 #~ msgstr "Αποτυχία σύνδεσης στο διαχειριστή λογαριασμού"
+
 #~ msgid "Attached to account manager"
 #~ msgstr "Σύνδεση στο διαχειριστή λογαριασμού"
+
 #~ msgid "You are now successfully attached to this account manager."
 #~ msgstr "Επιτυχημένη σύνδεση στο διαχειριστή λογαριασμού."
+
 #~ msgid "Attach to project"
 #~ msgstr "Σύνδεση σε έργο"
+
 #~ msgid "Attach to account manager"
 #~ msgstr "Σύνδεση στο πρόγραμμα διαχείρισης λογαριασμού"
+
 #~ msgid "You are now successfully attached to this project."
 #~ msgstr "Επιτυχημένη σύνδεση στο πρόγραμμα."
+
 #~ msgid "Detach"
 #~ msgstr "Αποσύνδεση"
+
 #~ msgid "Detaching from project..."
 #~ msgstr "Αποχώρηση από το πρόγραμμα..."
+
 #~ msgid "Are you sure you want to detach from project '%s'?"
 #~ msgstr "Είστε σίγουρος ότι θέλετε να αποχωρήσετε από το '%s';"
+
 #~ msgid "Detach from Project"
 #~ msgstr "Αποχώρηση από το Πρόγραμμα"
+
 #~ msgid "To completion"
 #~ msgstr "Ολοκλήρωση σε"
+
 #~ msgid "Attach to a project or account manager to begin processing work"
 #~ msgstr ""
 #~ "Σύνδεση σε πρόγραμμα ή διαχειριστή λογαριασμού για να ξεκινήσει η "
 #~ "υπολογιστική διαδικασία"
+
 #~ msgid "Attach to a project to begin processing work"
 #~ msgstr "Σύνδεση σε ένα πρόγραμμα για έναρξη εκτέλεσης εργασιών"
+
 #~ msgid "&Close Window\tCtrl+W"
 #~ msgstr "&Κλείσιμο του Παραθύρου\tCtrl+W"
+
 #~ msgid "&Messages\tCtrl+Shift+M"
 #~ msgstr "&Μηνύματα\tCtrl+Shift+M"
+
 #~ msgid "Display news"
 #~ msgstr "Εμφάνιση νέων"
+
 #~ msgid "Retrying communications for project(s)..."
 #~ msgstr "Επανάληψη επικοινωνίας για το(τα) πρόγραμμα(τα)"
+
 #~ msgid "Account Manager URL"
 #~ msgstr "Διεύθυνση διαχειριστή λογαριασμού"
+
 #~ msgid "Enter the URL of the account manager's web site."
 #~ msgstr "Εισάγετε την διεύθυνση της ιστοσελίδας του διαχειριστή λογαριασμού."
+
 #~ msgid "Attach to an account manager"
 #~ msgstr "Σύνδεση σε ένα διαχειριστή λογαριασμού"
+
 #~ msgid "Attaching to project..."
 #~ msgstr "Σύνδεση σε πρόγραμμα..."
+
 #~ msgid "Debug Flags"
 #~ msgstr "Σημαίες Αποσφαλμάτωσης"
+
 #~ msgid "Project Properties Failure"
 #~ msgstr "Αποτυχία Ιδιότήτων Προγράμματος"
+
 #~ msgid "Project Properties URL Failure"
 #~ msgstr "Αποτυχία Διεύθυνσης Ιδιοτήτων Προγράμματος"
+
 #~ msgid "Account Creation Disabled"
 #~ msgstr "Η Δημιουργία Λογαριασμών είναι Απενεργοποιημένη"
+
 #~ msgid "Account Already Exists"
 #~ msgstr "Ο Λογαριασμός Υπάρχει Ήδη"
+
 #~ msgid "Project Already Attached"
 #~ msgstr "Έχετε ήδη Συνδεθεί στο Πρόγραμμα"
+
 #~ msgid "Project Attach Failure"
 #~ msgstr "Αποτυχία Σύνδεσης στο Ππρόγραμμα"
+
 #~ msgid "Net Detection Failure"
 #~ msgstr "Αποτυχία Εντοπισμού Δικτίου"
+
 #~ msgid "You are already attached to this project."
 #~ msgstr "Έχετε ήδη συνδεθεί σε αυτό το πρόγραμμα"
+
 #~ msgid "Account information"
 #~ msgstr "Πληροφορίες Λογαριασμού"
+
 #~ msgid "Do you wish to use an existing account or create a new one?"
 #~ msgstr ""
 #~ "Θέλετε να χρησιμοποποιήσετε κάποιο λογαριασμό η να δημιουργήσετε ένα νέο;"
+
 #~ msgid ""
 #~ "Transition Note: Account keys are used as passwords for accounts created\n"
 #~ "before BOINC migrated to a username and password authentication scheme."
@@ -4469,18 +4487,24 @@ msgstr ""
 #~ " δημιουργήθηκαν πριν την απόφαση στο BOINC να χρησιμοποιείται ένα σύστημα "
 #~ "πιστοποίησης που χρησιμοποιεί\n"
 #~ " όνομα χρήστη και ξεχωριστό κωδικό πρόσβασης"
+
 #~ msgid "Create new &account"
 #~ msgstr "Δημιουργία Νέου Λογαριασμού"
+
 #~ msgid "&Use existing account"
 #~ msgstr "Χρησιμοποίηση ήδη δημιουργημένου λογαριασμού"
+
 #~ msgid "Email address:"
 #~ msgstr "Διεύθυνση email:"
+
 #~ msgid "Enter account key"
 #~ msgstr "Εισάγετε το κλειδί λογαριασμού"
+
 #~ msgid "This project uses an \"account key\" to identify you."
 #~ msgstr ""
 #~ "Αυτό το πρόγραμμα χρησιμοποιεί ένα \"account key\" για να σας "
 #~ "πιστοποιήσει."
+
 #~ msgid ""
 #~ "Go to the project's web site to create an account. Your account\n"
 #~ "key will be emailed to you."
@@ -4488,70 +4512,100 @@ msgstr ""
 #~ "Πηγαίνετε στην ιστοσελίδα του προγράμματος για να δημιουργήσετε ένα "
 #~ "λογαριασμό.\n"
 #~ " Το κλειδί λογαριασμού θα σας σταλεί μέσω email."
+
 #~ msgid "An account key looks like:"
 #~ msgstr "Ένα κλειδί λογαρασμού μοιάζει με:"
+
 #~ msgid "82412313ac88e9a3638f66ea82186948"
 #~ msgstr "82412313ac88e9a3638f66ea82186948"
+
 #~ msgid "Account key:"
 #~ msgstr "Κλειδί λογαριασμού:"
+
 #~ msgid ""
 #~ "Communicating with account manager\n"
 #~ "Please wait..."
 #~ msgstr ""
 #~ "Επικοινωνία με το διαχειριστή λογαριασμού\n"
 #~ "Παρακαλούμε περιμένετε..."
+
 #~ msgid ""
 #~ "Communicating with account manager \n"
 #~ "Please wait..."
 #~ msgstr ""
 #~ "Επικοινωνία με το διαχειριστή λογαριασμού \n"
 #~ "Παρακαλούμε περιμένετε..."
+
 #~ msgid "BOINC is currently suspended...\n"
 #~ msgstr "Το BOINC έχει παύσει τις εργασίες...\n"
+
 #~ msgid "BOINC networking is currently suspended...\n"
 #~ msgstr "Η σύνδεση στο δίκτυο του BOINC έχει σταματήσει...\n"
+
 #~ msgid "&Open BOINC Manager..."
 #~ msgstr "Άνοιγμα BOINC Manager"
+
 #~ msgid "&About BOINC Manager..."
 #~ msgstr "Σχετικά με το BOINC Manager"
+
 #~ msgid ""
 #~ "A software platform for distributed computing using volunteered computer "
 #~ "resources"
 #~ msgstr ""
 #~ "Μια πλατφόρμα λογισμικού για κατανεμημένους υπολογισμούς χρησιμοποιώντας "
 #~ "εθελοντικούς πορους υπολογιστών"
+
 #~ msgid "Your current account manager is:"
 #~ msgstr "Ο τρέχον διαχειριστής λογαριασμού σας είναι:"
+
+#~ msgid "Name:"
+#~ msgstr "Όνομα:"
+
 #~ msgid "foo"
 #~ msgstr "foo"
+
+#~ msgid "URL:"
+#~ msgstr "Διεύθυνση:"
+
 #~ msgid "&Update"
 #~ msgstr "Ανανέωση"
+
 #~ msgid "Change"
 #~ msgstr "Αλλαγή"
+
 #~ msgid "Language Selection:"
 #~ msgstr "Επιλογή Γλώσσας"
+
 #~ msgid "What language should the manager display by default."
 #~ msgstr "Ποια γλώσσα χρησιμοποιεί ο διαχειριστής εξ'ορισμού."
+
 #~ msgid "Reminder Frequency:"
 #~ msgstr "Συχνότητα υπενθύμισης:"
+
 #~ msgid ""
 #~ "How often, in minutes, should the manager remind you of possible "
 #~ "connection events."
 #~ msgstr ""
 #~ "Πόσο συχνά, σε λεπτά, θα σας υπενθυμίζει ο διαχειρστής σχετικά με πιθανά "
 #~ "θέματα σύνδεσης."
+
 #~ msgid "&Automatically detect network connection settings"
 #~ msgstr "Αυτόματη αναγνώριση ρυθμίσεων σύνδεσης δικτύου"
+
 #~ msgid "Use my &Local Area Network(LAN) connection"
 #~ msgstr "Χρησιμοποίηση σύνδεσης Δικτύου Τοπικής Πρόσβασης (LAN)"
+
 #~ msgid "Use my &Dial-up and Virtual Private Network connection"
 #~ msgstr ""
 #~ "Χρησιμοποίηση σύνδεσης μέσω τηλεφώνου και Ιδιωτικού Εικονικού Δικτύου"
+
 #~ msgid "&Prompt for username and password"
 #~ msgstr "Ερώτηση για όνομα χρήστη και κωδικό πρόβασης"
+
 #~ msgid "Failed to create wxStaticText, needed by wxHyperLink!"
 #~ msgstr ""
 #~ "Αποτυχία δημιουργίας wxStaticText, που χρειάζεται από το wxHyperLink!"
+
 #~ msgid ""
 #~ "BOINC could not determine what your default browser is.\n"
 #~ "Please verify that you have either the 'mailcap' package installed or\n"
@@ -4574,34 +4628,47 @@ msgstr ""
 #~ "φυλλομετρητή στην ακόλουθη διεύθυνση:\n"
 #~ "\n"
 #~ "%s"
+
 #~ msgid "BOINC Manager - Connection Error"
 #~ msgstr "BOINC Manager - Πρόβλημα Σύνδεσης"
+
 #~ msgid "BOINC Manager - Connection failed"
 #~ msgstr "BOINC Manager - Αποτυχία Σύνδεσης"
+
 #~ msgid "Connection failed."
 #~ msgstr "Αποτυχία Σύνδεσης"
+
 #~ msgid "BOINC info"
 #~ msgstr "Πληροφορίες BOINC"
+
 #~ msgid "Exit the BOINC Manager"
 #~ msgstr "Έξοδος από το BOINC Manager"
+
 #~ msgid ""
 #~ "Report completed work, get latest credit, get latest preferences, and "
 #~ "possibly get more work."
 #~ msgstr ""
 #~ "Αναφορά ολοκληρωμένων εργασιών, ανάκτηση βαθμολογίας, ανάκτηση "
 #~ "προτιμήσεων και πιθανών νέων εργασιών."
+
 #~ msgid "&Options"
 #~ msgstr "Ρυθμίσεις"
+
 #~ msgid "&BOINC Manager\tF1"
 #~ msgstr "&BOINC Manager\tF1"
+
 #~ msgid "Show information about BOINC and BOINC Manager"
 #~ msgstr "Εμφάνιση πληροφοριών για το BOINC και το BOINC Manager"
+
 #~ msgid "&Projects"
 #~ msgstr "Προγράμματα"
+
 #~ msgid "Language Selection..."
 #~ msgstr "Επιλογή  Γλώσσας..."
+
 #~ msgid "BOINC Manager - Network Status"
 #~ msgstr "BOINC Manager - Κατάσταση Δικτύου"
+
 #~ msgid ""
 #~ "BOINC needs a connection to the Internet to perform some maintenance, "
 #~ "open the BOINC Manager to connect up and perform the needed work."
@@ -4609,67 +4676,93 @@ msgstr ""
 #~ "Το BOINC χρειάζεται σύνδεση στο Διαδίκτυο για να εκτελέσει ορισμένες "
 #~ "εργασίες συντήρησης. Ανοίξτε το BOINC Manager για να συνδεθείτε και να "
 #~ "εκτελέσει τις απαιτούμενες εργασίες."
+
 #~ msgid "The URL you supplied is not that of a BOINC-based project."
 #~ msgstr ""
 #~ "Η διεύθυνση που εισάγατε δεν είναι αυτή ενός προγράμματος βασισμένο στο "
 #~ "BOINC."
+
 #~ msgid "Please check the URL and try again."
 #~ msgstr "Παρακαλούμε ελέξτε τη διεύθυνση και ξαναδοκιμάστε."
+
 #~ msgid ""
 #~ "The URL you supplied is not that of a BOINC-based account\n"
 #~ "manager."
 #~ msgstr ""
 #~ "Η διεύθυνση που εισάγατε δεν είναι αυτή ενός \n"
 #~ "διαχειριστή λογαριασμού BOINC.\" "
+
 #~ msgid "Account not found"
 #~ msgstr "Δεν βρέθηκε ο λογαριασμός"
+
 #~ msgid "Verify your account name and password are correct and try again."
 #~ msgstr ""
 #~ "Επιβεβαιώστε ότι το όνομα λογαριασμού και ο κωδικός είναι σωστοί και "
 #~ "ξαναδοκιμάστε."
+
 #~ msgid "Project URL"
 #~ msgstr "Διεύθυνση προγράμματος"
+
 #~ msgid "Enter the URL of the project's web site."
 #~ msgstr "Εισάγετε την διεύθυνση της ιστοσελίδας του προγράμματος."
+
 #~ msgid "For a list of BOINC-based projects go to:"
 #~ msgstr "Για μια λίστα προγραμμάτων βασισμένα στο BOINC πηγαίντε στο:"
+
 #~ msgid "Total credit"
 #~ msgstr "Συνολικοί βαθμοί"
+
 #~ msgid "Avg. credit"
 #~ msgstr "Μέσος όρος βαθμών"
+
 #~ msgid "Allow new work"
 #~ msgstr "Επιτρέπει νέες εργασίες."
+
 #~ msgid "Disk Space"
 #~ msgstr "Χώρος στο δίσκο"
+
 #~ msgid "Are you sure you want to abort this file transfer '%s'?"
 #~ msgstr ""
 #~ "Είστε σίγουρος ότι θέλετε να ακυρώσετε τη μεταφορά του αρχείου '%s';"
+
 #~ msgid "Work"
 #~ msgstr "Εργασία"
+
 #~ msgid "Resuming result..."
 #~ msgstr "Επανέναρξη επεξεργασίας αποτελέσματος..."
+
 #~ msgid "Abort result"
 #~ msgstr "Ακύρωση αποτελέσματος"
+
 #~ msgid "Preempted"
 #~ msgstr "Αντικαταστάθηκε"
+
 #~ msgid "Ready to run"
 #~ msgstr "Έτοιμο για εκτέλεση"
+
 #~ msgid "Activities suspended by user"
 #~ msgstr "Αναστολή εργασιών από το χρήστη"
+
 #~ msgid "Project Comm Failure"
 #~ msgstr "Αποτυχία Επικοινωνίας με το Πρόγραμμα"
+
 #~ msgid "Google Comm Failure"
 #~ msgstr "Σφάλμα Επικοινωνίας με Google"
+
 #~ msgid "Yahoo Comm Failure"
 #~ msgstr "Σφάλμα Επικοινωνίας με Yahoo"
+
 #~ msgid "Attach to Account Manager"
 #~ msgstr "Σύνδεση σε Διαχειριστή Λογαριασμού"
+
 #~ msgid "Attach to Project"
 #~ msgstr "Σύνδεση σε Πρόγραμμα"
+
 #~ msgid "About BOINC Manager"
 #~ msgstr "Σχετικά με το BOINC Manager"
+
 #~ msgid "Account Manager"
 #~ msgstr "Διαχειριστής Λογαριασμού"
+
 #~ msgid "Dialup Logon"
 #~ msgstr "Σύνδεση σε λογαριασμό μέσω τηλεφώνου"
-
diff --git a/locale/el/BOINC-Setup.mo b/locale/el/BOINC-Setup.mo
index ea73723..91e9f72 100644
Binary files a/locale/el/BOINC-Setup.mo and b/locale/el/BOINC-Setup.mo differ
diff --git a/locale/el/BOINC-Setup.po b/locale/el/BOINC-Setup.po
index fbe6a78..7c6db46 100755
--- a/locale/el/BOINC-Setup.po
+++ b/locale/el/BOINC-Setup.po
@@ -4,50 +4,51 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-01-26 00:00-0800\n"
-"PO-Revision-Date: 2015-02-10 15:22-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: 2013-10-21 15:34+0000\n"
+"Last-Translator: chris g <chr1407 at hotmail.com>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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: 1382369640.0\n"
 "X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: mac_installer\n"
 
 #: Installer.cpp:124
 #, c-format
 msgid "Sorry, this version of %s requires system 10.5 or higher."
 msgstr ""
 
-#: PostInstall.cpp:130
-#: PostInstall.cpp:1136
-#: uninstall.cpp:1618
+#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
 msgid "Yes"
 msgstr "Ναι"
 
-#: PostInstall.cpp:131
-#: PostInstall.cpp:1137
-#: uninstall.cpp:1619
+#: 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 ακόμη και όταν κανένας χρήστης δεν είναι συνδεδεμένος;"
+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"
+"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?"
+"Do you also want non-administrative users to be able to run and control %s "
+"on this Mac?"
 msgstr ""
 
 #: PostInstall.cpp:1444
@@ -79,9 +80,11 @@ msgid ""
 "\n"
 "This will remove the executables but will not touch %s data files."
 msgstr ""
-"Είστε σίγουροι οτι θέλετε να αφαιρέσετε τελείως το %s απο τον υπολογιστή σας;\n"
+"Είστε σίγουροι οτι θέλετε να αφαιρέσετε τελείως το %s απο τον υπολογιστή "
+"σας;\n"
 "\n"
-"Αυτό θα αφαιρέσει τα εκτελέσιμα αρχεία αλλά τα %s αρχεία δεδομένων θα μείνουν ανέπαφα."
+"Αυτό θα αφαιρέσει τα εκτελέσιμα αρχεία αλλά τα %s αρχεία δεδομένων θα "
+"μείνουν ανέπαφα."
 
 #: uninstall.cpp:163
 #, c-format
@@ -118,10 +121,12 @@ msgstr ""
 #: uninstall.cpp:840
 #, c-format
 msgid ""
-"Enter your administrator password to completely remove %s from you computer.\n"
+"Enter your administrator password to completely remove %s from you "
+"computer.\n"
 "\n"
 msgstr ""
-"Βάλτε τον κωδικό διαχειριστή για να αφαιρέσετε τελείως το %s απο τον υπολογιστή σας\n"
+"Βάλτε τον κωδικό διαχειριστή για να αφαιρέσετε τελείως το %s απο τον "
+"υπολογιστή σας\n"
 "\n"
 
 #: uninstall.cpp:1616
@@ -135,4 +140,3 @@ msgstr "Συνέχεια..."
 #, c-format
 #~ msgid "Sorry, this version of %s requires system 10.4 or higher."
 #~ msgstr "Συγγνώμη, αυτή η έκδοση του %s απαιτεί σύστημα 10.4 ή μεγαλύτερο."
-
diff --git a/locale/el/BOINC-Web.mo b/locale/el/BOINC-Web.mo
index a9ffa4e..0634250 100644
Binary files a/locale/el/BOINC-Web.mo and b/locale/el/BOINC-Web.mo differ
diff --git a/locale/el/BOINC-Web.po b/locale/el/BOINC-Web.po
index fc0832b..8b72428 100755
--- a/locale/el/BOINC-Web.po
+++ b/locale/el/BOINC-Web.po
@@ -4,22 +4,23 @@
 # FileID  : $Id$
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\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 15:25-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localication Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: 2010-11-26 20:50+0200\n"
+"Last-Translator: chris g <chr1407 at hotmail.com>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.1.6\n"
 "X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-SearchPath-0: doc\n"
 "X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
 "X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
 "X-Poedit-KeywordsList: tra\n"
-"X-Poedit-SearchPath-0: doc\n"
 
 #: docutil.php:21
 msgid "Search"
@@ -32,10 +33,12 @@ msgstr "Επιστροφή στην κεντρική σελίδα του BOINC"
 #: docutil.php:114
 #, php-format
 msgid "This page is %stranslatable%s."
-msgstr "Αυτή η σελίδα είναι %sμεταφράσιμη%s"
+msgstr "Αυτή η σελίδα είναι %μεταφράσιμη%s"
 
 #: download.php:39
-msgid "We recommend that you also install VirtualBox, so your computer can work on science projects that require it."
+msgid ""
+"We recommend that you also install VirtualBox, so your computer can work on "
+"science projects that require it."
 msgstr ""
 
 #: download.php:41
@@ -46,14 +49,12 @@ msgstr ""
 msgid "Download BOINC + VirtualBox"
 msgstr ""
 
-#: download.php:54
-#: download.php:69
+#: download.php:54 download.php:69
 #, php-format
 msgid "for %s"
 msgstr ""
 
-#: download.php:57
-#: download.php:72
+#: download.php:57 download.php:72
 #, php-format
 msgid "BOINC version %s"
 msgstr ""
@@ -68,19 +69,30 @@ msgid "Download BOINC"
 msgstr "Λήψη του BOINC"
 
 #: download.php:123
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others."
+msgid ""
+"BOINC is a program that lets you donate your idle computer time to science "
+"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, and many others."
 msgstr ""
 
 #: download.php:125
-msgid "After installing BOINC on your computer, you can connect it to as many of these projects as you like."
+msgid ""
+"After installing BOINC on your computer, you can connect it to as many of "
+"these projects as you like."
 msgstr ""
 
 #: download.php:127
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
-msgstr "Μπορείτε να εκτελέσετε αυτό το λογισμικό σε έναν υπολογιστή μόνο εάν σας ανήκει ή εάν έχετε την άδεια του ιδιοκτήτη του."
+msgid ""
+"You may run this software on a computer only if you own the computer or have "
+"the permission of its owner."
+msgstr ""
+"Μπορείτε να εκτελέσετε αυτό το λογισμικό σε έναν υπολογιστή μόνο εάν σας "
+"ανήκει ή εάν έχετε την άδεια του ιδιοκτήτη του."
 
 #: download.php:132
-msgid "We recommend that you download BOINC from the Google Play Store or Amazon Appstore, not from here."
+msgid ""
+"We recommend that you download BOINC from the Google Play Store or Amazon "
+"Appstore, not from here."
 msgstr ""
 
 #: download.php:167
@@ -91,8 +103,7 @@ msgstr "Απαιτήσεις συστήματος"
 msgid "Release notes"
 msgstr "Συμειώσεις κυκλοφορίας"
 
-#: download.php:169
-#: index.php:86
+#: download.php:169 index.php:86
 msgid "Help"
 msgstr "Βοήθεια"
 
@@ -114,21 +125,53 @@ msgstr "BOINC: υπολογισμοί για την επιστήμη"
 
 #: help.php:12
 #, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
+msgid ""
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who "
+"can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"through the process of installing and using BOINC; %s troubleshoot any "
+"problems you might have."
 msgstr ""
+"Η διαδικτυακή βοήθεια (Online Help) του BOINC σας επιτρέπει να μιλήσετε "
+"απευθείας με έμπειρους χρήστες του BOINC, οι οποίοι είναι σε θέση: %s να "
+"απαντήσουν σε ερωτήσεις σχετικά με το BOINC και τον εθελοντικό υπολογισμό, %"
+"s να βοηθήσουν βήμα προς βήμα στην διαδικασία της εγκατάστασης και χρήσης "
+"του BOINC, να αντιμετωπίσουν όποια προβλήματα μπορεί να έχετε."
 
 #: help.php:21
 #, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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 "Η διαδικτυακή βοήθεια (Online Help) του BOINC βασίζετει στο %sSkype%s, ένα τηλεφωνικό σύστημα στο Ίντερνετ. Το Skype διατίθεται δωρεάν (και το λογισμικό και οι κλήσεις). Αν δεν έχετε ήδη το Skype, παρακαλούμε %sκατεβάστε το και εγκαταστήστε το τώρα%s. Όταν τελειώσετε, επιστρέψτε σε αυτή την σελίδα"
+msgid ""
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. "
+"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 ""
+"Η διαδικτυακή βοήθεια (Online Help) του BOINC βασίζετει στο %sSkype%s, ένα "
+"τηλεφωνικό σύστημα στο Ίντερνετ. Το Skype διατίθεται δωρεάν (και το "
+"λογισμικό και οι κλήσεις). Αν δεν έχετε ήδη το Skype, παρακαλούμε %"
+"sκατεβάστε το και εγκαταστήστε το τώρα%s. Όταν τελειώσετε, επιστρέψτε σε "
+"αυτή την σελίδα"
 
 #: help.php:28
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
-msgstr "Ο καλύτερος τρόπος για να βρείτε βοήθεια είναι η ομιλία, για την οποία χρειάζεστε είτε ένα σταθερό μικρόφωνο και ηχεία είτε ακουστικά με ενσωματωμένο μικρόφωνο (headset) για τον υπολογιστή σας. Μπορείτε επίσης να χρησιμοποιήσετε το σύστημα συνομιλίας με κείμενο του Skype ή το ηλεκτρονικό ταχυδρομείο (αν δεν έχετε το Skype) για να επικοινωνείτε με τους Εθελοντές της Βοήθειας (Help Volunteers)."
+msgid ""
+"The best way to get help is by voice, for which you need either built-in "
+"microphone and speakers or an external headset for your computer.  You can "
+"also use Skype's text-based chat system or regular email (if you don't have "
+"Skype) to communicate with Help Volunteers."
+msgstr ""
+"Ο καλύτερος τρόπος για να βρείτε βοήθεια είναι η ομιλία, για την οποία "
+"χρειάζεστε είτε ένα σταθερό μικρόφωνο και ηχεία είτε ακουστικά με "
+"ενσωματωμένο μικρόφωνο (headset) για τον υπολογιστή σας. Μπορείτε επίσης να "
+"χρησιμοποιήσετε το σύστημα συνομιλίας με κείμενο του Skype ή το ηλεκτρονικό "
+"ταχυδρομείο (αν δεν έχετε το Skype) για να επικοινωνείτε με τους Εθελοντές "
+"της Βοήθειας (Help Volunteers)."
 
 #: help.php:31
-msgid "Volunteers speaking several languages are available. Please select a language:"
-msgstr "Εθελοντές που μιλούν διάφορες γλώσσες είναι διαθέσιμοι. Παρακαλούμε επιλέξτε μία γλώσσα:"
+msgid ""
+"Volunteers speaking several languages are available. Please select a "
+"language:"
+msgstr ""
+"Εθελοντές που μιλούν διάφορες γλώσσες είναι διαθέσιμοι. Παρακαλούμε επιλέξτε "
+"μία γλώσσα:"
 
 #: help.php:47
 msgid "Be a Help Volunteer"
@@ -136,21 +179,36 @@ msgstr "Γίνετε Εθελοντής Βοήθειας (Help Volunteer)"
 
 #: help.php:50
 #, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
-msgstr "Αν είστε έμπειρος χρήστης του BOINC, σας ενθαρρύνουμε να %sγίνετε ένας Εθελοντής Βοήθειας%s. Είναι ένας πολύ καλός τρόπος να βοηθήσετε το έργο της επιστημονικής έρευνας και του εθελοντικού υπολογισμού - κι έχει πλάκα!"
+msgid ""
+"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+"Volunteer%s.  It's a great way to help the cause of scientific research and "
+"volunteer computing - and it's fun!"
+msgstr ""
+"Αν είστε έμπειρος χρήστης του BOINC, σας ενθαρρύνουμε να %sγίνετε ένας "
+"Εθελοντής Βοήθειας%s. Είναι ένας πολύ καλός τρόπος να βοηθήσετε το έργο της "
+"επιστημονικής έρευνας και του εθελοντικού υπολογισμού - κι έχει πλάκα!"
 
 #: help.php:56
 #, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
-msgstr "Αν είστε ήδη Εθελοντής Βοήθειας: για να επεξεργαστείτε τις ρυθμίσεις σας, %sπατήστε εδώ%s."
+msgid ""
+"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
+msgstr ""
+"Αν είστε ήδη Εθελοντής Βοήθειας: για να επεξεργαστείτε τις ρυθμίσεις σας, %"
+"sπατήστε εδώ%s."
 
 #: help_funcs.php:107
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
-msgstr "Όσοι βοηθούν στο BONC είναι εθελοντές αφιλοκερδώς. Οι συμβουλές τους δεν έχουν εγκριθεί απο το BOINC ή απο το πανεπιστήμιο της Καλιφόρνιας."
+msgid ""
+"BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
+"or the University of California."
+msgstr ""
+"Όσοι βοηθούν στο BONC είναι εθελοντές αφιλοκερδώς. Οι συμβουλές τους δεν "
+"έχουν εγκριθεί απο το BOINC ή απο το πανεπιστήμιο της Καλιφόρνιας."
 
 #: help_funcs.php:110
 msgid "%1Never%2 give email address or password information to BOINC helpers."
-msgstr "%1Ποτέ%2 μη δείνετε διευθύνσεις ηλεκτρονικού ταχυδρομίου ή κωδικούς πρόσβασης σε συμμετέχοντες στο BOINC."
+msgstr ""
+"%1Ποτέ%2 μη δείνετε διευθύνσεις ηλεκτρονικού ταχυδρομίου ή κωδικούς "
+"πρόσβασης σε συμμετέχοντες στο BOINC."
 
 #: index.php:24
 msgid "Computing power"
@@ -174,7 +232,7 @@ msgstr "εθελοντές,"
 
 #: index.php:55
 msgid "computers.\n"
-msgstr "υπολογιστές.\n"
+msgstr "υπολογιστές."
 
 #: index.php:56
 msgid "24-hour average:"
@@ -198,9 +256,7 @@ msgstr "Γίνετε εθελοντές"
 msgid "Download"
 msgstr "Λήψη"
 
-#: index.php:87
-#: index.php:120
-#: index.php:171
+#: index.php:87 index.php:120 index.php:171
 msgid "Documentation"
 msgstr "Εγχειρίδιο χρήστη"
 
@@ -213,7 +269,10 @@ msgid "Links"
 msgstr ""
 
 #: index.php:94
-msgid "Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:"
+msgid ""
+"Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure "
+"diseases, study global warming, discover pulsars, and do many other types of "
+"scientific research.  It's safe, secure, and easy:"
 msgstr ""
 
 #: index.php:96
@@ -230,8 +289,12 @@ msgstr ""
 
 #: index.php:102
 #, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
-msgstr "Ή, αν τρέχετε περισσότερα έργα, δοκιμάστε ένα %sπρόγραμμα διαχείρισης λογαριασμού%s όπως το %sGridRepublic%s ή το %sBAM!%s."
+msgid ""
+"Or, if you run several projects, try an %saccount manager%s such as %"
+"sGridRepublic%s or %sBAM!%s. "
+msgstr ""
+"Ή, αν τρέχετε περισσότερα έργα, δοκιμάστε ένα %sπρόγραμμα διαχείρισης "
+"λογαριασμού%s όπως το %sGridRepublic%s ή το %sBAM!%s."
 
 #: index.php:118
 msgid "Compute with BOINC"
@@ -242,16 +305,27 @@ msgid "Software updates"
 msgstr "Ενημερώσεις λογισμικού"
 
 #: index.php:128
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
-msgstr "%1Επιστήμονες%2: χρησιμοποιείστε το BOINC για να κατασκευάσετε ένα εθελοντικό έργο%4 και εκμεταλλευτείτε την υπολογιστική δύναμη χιλιάδων κεντρικών μονάδων επεξεργασίας."
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving "
+"you the computing power of thousands of CPUs."
+msgstr ""
+"%1Επιστήμονες%2: χρησιμοποιείστε το BOINC για να κατασκευάσετε ένα "
+"εθελοντικό έργο%4 και εκμεταλλευτείτε την υπολογιστική δύναμη χιλιάδων "
+"κεντρικών μονάδων επεξεργασίας."
 
 #: index.php:132
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
-msgstr "%1Πανεπιστήμια%2: χρησιμοποιείστε το BOINC για να κατασκευάσετε ένα εικονικό υπερυπολογιστικό κέντρο στην πανεπιστημιούπολη%4."
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
+msgstr ""
+"%1Πανεπιστήμια%2: χρησιμοποιείστε το BOINC για να κατασκευάσετε ένα εικονικό "
+"υπερυπολογιστικό κέντρο στην πανεπιστημιούπολη%4."
 
 #: index.php:137
 msgid "%1Companies%2: use BOINC for %3desktop Grid computing%4."
-msgstr "%1Εταιρείες%2: χρησιμοποιείστε το BOINC για %3κάναβο επιτραπέζιας επεξεργασίας%4."
+msgstr ""
+"%1Εταιρείες%2: χρησιμοποιείστε το BOINC για %3κάναβο επιτραπέζιας "
+"επεξεργασίας%4."
 
 #: index.php:149
 msgid "The BOINC project"
@@ -319,8 +393,11 @@ msgstr "APIs for add-on software"
 
 #: index.php:217
 #, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
-msgstr "Λογισμικό ανοιχτού κώδικα για %sεθελοντικό υπολογισμό%s και %sυπολογισμό πλέγματος%s."
+msgid ""
+"Open-source software for %svolunteer computing%s and %sgrid computing%s."
+msgstr ""
+"Λογισμικό ανοιχτού κώδικα για %sεθελοντικό υπολογισμό%s και %sυπολογισμό "
+"πλέγματος%s."
 
 #: index.php:230
 msgid "BOINC is based at The University of California, Berkeley"
@@ -339,7 +416,10 @@ msgid "Seismology"
 msgstr ""
 
 #: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
+msgid ""
+"The Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to Internet-connected computers.  You must buy a "
+"sensor to participate."
 msgstr ""
 
 #: projects.inc:27
@@ -351,23 +431,24 @@ msgid "Environmental research"
 msgstr ""
 
 #: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
+msgid ""
+"This project is creating a free and continuously updated map of radiation "
+"levels by using sensors connected to volunteers' computers.  You must buy a "
+"sensor to participate."
 msgstr ""
 
 #: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
+msgid ""
+"To participate in these projects you must buy a sensor and attach it to your "
+"computer."
 msgstr ""
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
 msgstr ""
 
-#: projects.inc:60
-#: projects.inc:364
-#: projects.inc:408
-#: projects.inc:457
-#: projects.inc:464
-#: projects.inc:511
+#: projects.inc:60 projects.inc:364 projects.inc:408 projects.inc:457
+#: projects.inc:464 projects.inc:511
 msgid "Private"
 msgstr ""
 
@@ -376,7 +457,11 @@ msgid "Artificial intelligence"
 msgstr ""
 
 #: projects.inc:62
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
+msgid ""
+"Parse and convert semantic nets for use in FreeHAL, an artificial "
+"intelligence that uses semantic networks, stemmers, part of speech "
+"databases, and part of speech taggers in order to imitate human behavior in "
+"conversations."
 msgstr ""
 
 #: projects.inc:69
@@ -392,7 +477,12 @@ msgid "Antimalarial drug discovery"
 msgstr ""
 
 #: projects.inc:84
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
+msgid ""
+"The parasite that causes malaria continues to evolve resistance to available "
+"medication. We therefore urgently need to discover new drugs to replace "
+"existing drugs. Importantly, these new drugs need to target NEW proteins in "
+"the parasite. The FightMalaria at Home project is aimed at finding these new "
+"targets."
 msgstr ""
 
 #: projects.inc:90
@@ -404,7 +494,12 @@ msgid "Protein structure prediction"
 msgstr ""
 
 #: projects.inc:92
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
+msgid ""
+"POEM at HOME uses a computational approach to predict the biologically active "
+"structure of proteins, to understand the signal-processing mechanisms when "
+"the proteins interact with one another, to understand diseases related to "
+"protein malfunction or aggregation, and to develop new drugs on the basis of "
+"the three-dimensions structure of biologically important proteins."
 msgstr ""
 
 #: projects.inc:98
@@ -416,7 +511,11 @@ msgid "Study of protein - ligand interactions"
 msgstr ""
 
 #: projects.inc:100
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
+msgid ""
+"Docking at Home has both bioscience and computer science goals. The project "
+"aims to further knowledge of the atomic details of protein-ligand "
+"interactions and, by doing so, will search for insights into the discovery "
+"of novel pharmaceuticals."
 msgstr ""
 
 #: projects.inc:114
@@ -428,7 +527,11 @@ msgid "Molecular simulations of proteins"
 msgstr ""
 
 #: projects.inc:116
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
+msgid ""
+"GPUGrid.net opens novel computational scenarios by the first full-atom "
+"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
+"New biomedical applications suddenly become possible giving a new role to "
+"computational biology for biomedical research."
 msgstr ""
 
 #: projects.inc:122
@@ -440,11 +543,15 @@ msgid "Genetic linkage analysis"
 msgstr ""
 
 #: projects.inc:124
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
+msgid ""
+"Superlink at Technion helps geneticists all over the world find disease-"
+"provoking genes causing some types of diabetes, hypertension (high blood "
+"pressure), cancer, schizophrenia and many others."
 msgstr ""
 
 #: projects.inc:138
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
+msgid ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
 msgstr ""
 
 #: projects.inc:139
@@ -452,7 +559,11 @@ msgid "Life science research"
 msgstr ""
 
 #: projects.inc:140
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
+msgid ""
+"The Lattice Project supplies computing power to scientists at the University "
+"of Maryland studying evolutionary relationships based on DNA sequence data; "
+"bacterial, plasmid, and virus protein sequences; and biological diversity in "
+"nature reserves. "
 msgstr ""
 
 #: projects.inc:146
@@ -464,20 +575,32 @@ msgid "Epidemiology"
 msgstr ""
 
 #: projects.inc:148
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
+msgid ""
+"Simulation models of the transmission dynamics and health effects of malaria "
+"are an important tool for malaria control. They can be used to determine "
+"optimal strategies for delivering mosquito nets, chemotherapy, or new "
+"vaccines which are currently under development and testing.  Such modeling "
+"is extremely computer intensive, requiring simulations of large human "
+"populations with a diverse set of parameters related to biological and "
+"social factors that influence the distribution of the disease. "
 msgstr ""
 
 #: projects.inc:170
 msgid "University of Washington"
 msgstr ""
 
-#: projects.inc:171
-#: projects.inc:179
+#: projects.inc:171 projects.inc:179
 msgid "Biology"
 msgstr ""
 
 #: projects.inc:172
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
+msgid ""
+"Determine the 3-dimensional shapes of proteins in research that may "
+"ultimately lead to finding cures for some major human diseases. By running "
+"Rosetta at home you will help us speed up and extend our research in ways we "
+"couldn't possibly attempt without your help. You will also be helping our "
+"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
+"Cancer, and Alzheimer's"
 msgstr ""
 
 #: projects.inc:178
@@ -485,7 +608,10 @@ msgid "University of Vienna"
 msgstr ""
 
 #: projects.inc:180
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
+msgid ""
+"Calculate similarities between proteins. SIMAP provides a public database of "
+"the resulting data, which plays a key role in many bioinformatics research "
+"projects."
 msgstr ""
 
 #: projects.inc:186
@@ -501,7 +627,15 @@ msgid "Climate study"
 msgstr ""
 
 #: projects.inc:200
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
+msgid ""
+"Investigate the approximations that have to be made in state-of-the-art "
+"climate models. By running the model thousands of times we hope to find out "
+"how the model responds to slight tweaks to these approximations - slight "
+"enough to not make the approximations any less realistic. This will allow us "
+"to improve our understanding of how sensitive our models are to small "
+"changes and also to things like changes in carbon dioxide and the sulphur "
+"cycle. This will allow us to explore how climate may change in the next "
+"century under a wide range of different scenarios."
 msgstr ""
 
 #: projects.inc:207
@@ -513,30 +647,44 @@ msgid "Mechanical engineering"
 msgstr ""
 
 #: projects.inc:214
-msgid "Currently we are calculating the optimum design of a structure call the 52 bar truss"
+msgid ""
+"Currently we are calculating the optimum design of a structure call the 52 "
+"bar truss"
 msgstr ""
 
-#: projects.inc:224
-#: projects.inc:263
-#: projects.inc:271
+#: projects.inc:224 projects.inc:263 projects.inc:271
 msgid "Astronomy"
 msgstr ""
 
 #: projects.inc:225
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
+msgid ""
+"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
+"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
+"Universe. We will measure physical parameters (such as stellar mass surface "
+"density, star formation rate surface density, attenuation, and first-order "
+"star formation history) on a resolved pixel-by-pixel basis using spectral "
+"energy distribution (SED) fitting techniques in a distributed computing mode."
 msgstr ""
 
 #: projects.inc:247
 msgid "University of Texas at Austin"
 msgstr ""
 
-#: projects.inc:248
-#: projects.inc:279
+#: projects.inc:248 projects.inc:279
 msgid "Chemistry"
 msgstr ""
 
 #: projects.inc:249
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
+msgid ""
+"A common problem in theoretical chemistry, condensed matter physics and "
+"materials science is the calculation of the time evolution of an atomic "
+"scale system where, for example, chemical reactions and/or diffusion occur. "
+"Generally the events of interest are quite rare (many orders of magnitude "
+"slower than the vibrational movements of the atoms), and therefore direct "
+"simulations, tracking every movement of the atoms, would take thousands of "
+"years of computer calculations on the fastest present day computer before a "
+"single event of interest can be expected to occur.  Our research group is "
+"interested in calculating the long time dynamics of systems."
 msgstr ""
 
 #: projects.inc:262
@@ -544,7 +692,10 @@ msgid "University of Illinois at Urbana-Champaign"
 msgstr ""
 
 #: projects.inc:264
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
+msgid ""
+"The goal of Cosmology at Home is to search for the model that best describes "
+"our Universe and to find the range of models that agree with the available "
+"astronomical particle physics data."
 msgstr ""
 
 #: projects.inc:270
@@ -552,7 +703,10 @@ msgid "Rensselaer Polytechnic Institute"
 msgstr ""
 
 #: projects.inc:272
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
+msgid ""
+"The goal of Milkyway at Home is to create a highly accurate three dimensional "
+"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
+"Survey."
 msgstr ""
 
 #: projects.inc:278
@@ -560,7 +714,13 @@ msgid "Leiden University, The Netherlands"
 msgstr ""
 
 #: projects.inc:280
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
+msgid ""
+"Surface science calculations using Classical Dynamics.  Leiden Classical "
+"allows volunteers, students and other scientist to submit their personal "
+"calculations to the grid. Each user has his own personal queue for Classical "
+"Dynamics jobs. In this way students have used the grid to simulate liquid "
+"argon, or to test the validity of the ideal gas law by actually doing the "
+"simulations through the grid."
 msgstr ""
 
 #: projects.inc:294
@@ -572,25 +732,36 @@ msgid "Astrophysics"
 msgstr ""
 
 #: projects.inc:296
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
+msgid ""
+"Search for spinning neutron stars (also called pulsars) using data from the "
+"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
+"observatory.  Einstein at Home is a World Year of Physics 2005 project "
+"supported by the American Physical Society (APS) and by a number of "
+"international organizations."
 msgstr ""
 
-#: projects.inc:310
-#: projects.inc:318
+#: projects.inc:310 projects.inc:318
 msgid "CERN (European Organization for Nuclear Research)"
 msgstr ""
 
-#: projects.inc:311
-#: projects.inc:319
+#: projects.inc:311 projects.inc:319
 msgid "Physics"
 msgstr ""
 
 #: projects.inc:312
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
+msgid ""
+"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
+"European Organization for Nuclear Research, the world's largest particle "
+"physics laboratory.  It is the most powerful instrument ever built to "
+"investigate on particles proprieties. LHC at home runs simulations to improve "
+"the design of LHC and its detectors."
 msgstr ""
 
 #: projects.inc:320
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
+msgid ""
+"This project uses CERN-developed virtual machine technology for full-fledged "
+"LHC event physics simulation on volunteer computers.  Requires that you "
+"install VirtualBox on your computer"
 msgstr ""
 
 #: projects.inc:326
@@ -603,7 +774,12 @@ msgid "Astrophysics, astrobiology"
 msgstr ""
 
 #: projects.inc:328
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
+msgid ""
+"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
+"goal is to detect intelligent life outside Earth. One approach, known as "
+"radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
+"signals from space. Such signals are not known to occur naturally, so a "
+"detection would provide evidence of extraterrestrial technology."
 msgstr ""
 
 #: projects.inc:342
@@ -615,7 +791,11 @@ msgid "Chemical engineering and nanotechnology"
 msgstr ""
 
 #: projects.inc:344
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
+msgid ""
+"The study of molecular magnets and controlled nanoscale magnetism.  These "
+"magnetic molecules may be used to develop tiny magnetic switches, with "
+"applications in medicine (such as local tumor chemotherapy) and "
+"biotechnology."
 msgstr ""
 
 #: projects.inc:351
@@ -631,7 +811,10 @@ msgid "Physics, biochemistry, and others"
 msgstr ""
 
 #: projects.inc:358
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
+msgid ""
+"The objective of CAS at home is to encourage and assist scientists in China to "
+"adopt the technologies of volunteer computing and volunteer thinking for "
+"their research."
 msgstr ""
 
 #: projects.inc:365
@@ -639,11 +822,12 @@ msgid "Mathematics, physics, evolution"
 msgstr ""
 
 #: projects.inc:366
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
+msgid ""
+"Yoyo at home is an adapter between BOINC and several existing volunteer "
+"computing projects: ECM, Muon, Evolution at home, and distributed.net"
 msgstr ""
 
-#: projects.inc:371
-#: projects.inc:527
+#: projects.inc:371 projects.inc:527
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 msgstr ""
 
@@ -653,7 +837,11 @@ msgid "European research projects"
 msgstr "Έργα έρευνας"
 
 #: projects.inc:373
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
+msgid ""
+"The EDGeS at Home Beta project integrates volunteer computing into the service "
+"grid network of Europe by allowing service grids to send workunits to be "
+"processed by the volunteers of this project. The scientific projects covered "
+"by the project include math, physics, biology, etc."
 msgstr ""
 
 #: projects.inc:379
@@ -678,7 +866,11 @@ msgid "Medical, environmental and other humanitarian research"
 msgstr ""
 
 #: projects.inc:389
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
+msgid ""
+"To further critical non-profit research on some of humanity's most pressing "
+"problems by creating the world's largest volunteer computing grid.  Research "
+"includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"clean water and many more."
 msgstr ""
 
 #: projects.inc:395
@@ -697,21 +889,18 @@ msgstr ""
 msgid "Simulation of quantum computing; Goldbach's conjecture."
 msgstr ""
 
-#: projects.inc:450
-#: projects.inc:458
+#: projects.inc:450 projects.inc:458
 msgid "Cryptography"
 msgstr ""
 
 #: projects.inc:459
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
+msgid ""
+"Attempt to decode 3 original Enigma messages. The signals were intercepted "
+"in the North Atlantic in 1942 and are believed to be unbroken."
 msgstr ""
 
-#: projects.inc:465
-#: projects.inc:504
-#: projects.inc:512
-#: projects.inc:520
-#: projects.inc:528
-#: projects.inc:568
+#: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
+#: projects.inc:528 projects.inc:568
 msgid "Mathematics"
 msgstr ""
 
@@ -728,11 +917,19 @@ msgid "Factorization of large integers"
 msgstr ""
 
 #: projects.inc:473
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
+msgid ""
+"NFS at Home is a research project that uses Internet-connected computers to do "
+"the lattice sieving step in the Number Field Sieve factorization of large "
+"integers. As a young school student, you gained your first experience at "
+"breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
+"NFS at Home is a continuation of that experience, only with integers that are "
+"hundreds of digits long."
 msgstr ""
 
 #: projects.inc:479
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
+msgid ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
 msgstr ""
 
 #: projects.inc:480
@@ -741,7 +938,11 @@ msgid "Software testing"
 msgstr "Ενημερώσεις λογισμικού"
 
 #: projects.inc:481
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
+msgid ""
+"The aim of this project is to provide a powerful distributed computing "
+"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
+"well as others Lithuanian academic institutions.  Current applications "
+"involve the study of Monte-Carlo based software testing."
 msgstr ""
 
 #: projects.inc:503
@@ -749,11 +950,20 @@ msgid "Mathematical Institute of Leiden University / Kennislink"
 msgstr ""
 
 #: projects.inc:505
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
+msgid ""
+"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
+"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
+"product of the distinct prime factors of n. The ABC conjecture says that "
+"there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for "
+"any real h > 1. The ABC conjecture is currently one of the greatest open "
+"problems in mathematics. If it is proven to be true, a lot of other open "
+"problems can be answered directly from it."
 msgstr ""
 
 #: projects.inc:513
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
+msgid ""
+"Primegrid has multiple projects searching for different forms of very large "
+"prime numbers, including searching for the largest known prime number."
 msgstr ""
 
 #: projects.inc:519
@@ -761,11 +971,15 @@ msgid "Hochschule RheinMain University of Applied Sciences"
 msgstr ""
 
 #: projects.inc:521
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
+msgid ""
+"Search for counterexamples to two conjectures related to the identification "
+"of prime numbers"
 msgstr ""
 
 #: projects.inc:529
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
+msgid ""
+"Find all the generalized binary number systems (in which bases are matrices "
+"and digits are vectors) up to dimension 11."
 msgstr ""
 
 #: ../html/inc/news.inc:40
@@ -780,6 +994,7 @@ msgstr "Τα νέα είναι διαθέσιμα ως %sτροφοδοσία RS
 #, php-format
 #~ msgid "%s for %s (%s MB)"
 #~ msgstr "%s για %s (%s MB)"
+
 #~ msgid ""
 #~ "BOINC is a program that lets you donate your idle computer time to science "
 #~ "projects like SETI at home, Climateprediction.net, Rosetta at home, World "
@@ -791,6 +1006,7 @@ msgstr "Τα νέα είναι διαθέσιμα ως %sτροφοδοσία RS
 #~ "Climateprediction.net, Rosetta at home, World Community Grid και πολλά άλλα. "
 #~ "<p> Αφού εγκαταστήσετε το BOINC στον υπολογιστή σας, μπορείτε να συνδεθείτε "
 #~ "σε όσα από αυτά τα προγράμματα επιθυμείτε."
+
 #~ msgid "Browser default"
 #~ msgstr "Προεπιλεγμένη"
 
@@ -824,16 +1040,19 @@ msgstr "Τα νέα είναι διαθέσιμα ως %sτροφοδοσία RS
 #, fuzzy
 #~ msgid "ABC at home"
 #~ msgstr "Στο σπίτι"
+
 #~ msgid "The current release is known to work with these Linux versions:"
 #~ msgstr ""
 #~ "Η παρούσα έκδοση είναι γνωστό οτι είναι συμβατή με αυτές τις εκδόσεις του "
 #~ "Linux:"
+
 #~ msgid ""
 #~ "For other Linux versions, check if a BOINC package is offered by your "
 #~ "Linux distribution."
 #~ msgstr ""
 #~ "Για άλλες εκδόσεις του Linux, ελέγξτε εάν παρέχεται κάποια έκδοση του "
 #~ "BOINC απο την διανομή του Linux σας."
+
 #~ msgid ""
 #~ "Alternatively, download the %1BOINC client for older Linux versions%2. "
 #~ "This doesn't have a graphical interface, but it should work on all Linux "
@@ -842,6 +1061,7 @@ msgstr "Τα νέα είναι διαθέσιμα ως %sτροφοδοσία RS
 #~ "Εναλλακτικά, κατεβάστε το λογισμικό %1BOINC για παλαιότερες εκδόσεις του "
 #~ "Linux%2. Αυτό δε θα έχει γραφικό περιβάλλον, αλλά θα μπορεί να εκτελείται "
 #~ "σε όλα τα συστήματα linux, και x86 και x64."
+
 #~ msgid ""
 #~ "Note: if your computer is equipped with an Graphics Processing Unit "
 #~ "(GPU), you may be able to %suse it to compute faster%s"
@@ -849,167 +1069,244 @@ msgstr "Τα νέα είναι διαθέσιμα ως %sτροφοδοσία RS
 #~ "Σημείωση: αν ο υπολογιστής σας είναι εφοδιασμένος με μια μονάδα "
 #~ "επεξεργασίας γραφικών (Graphics Processing Unit), είναι πιθανό να "
 #~ "μπορείτε να τη %sχρησιμοποιήσετε για γρηγορότερους υπολογισμούς.%s"
+
 #~ msgid "TeraFLOPS."
 #~ msgstr "TeraFLOPS"
+
 #~ msgid "Conferences"
 #~ msgstr "Συνέδρια"
+
 #~ msgid "[check all that apply]"
 #~ msgstr "[check all that apply]"
+
 #~ msgid "Other:"
 #~ msgstr "Άλλο:"
+
 #~ msgid "Yes - I have been running BOINC on my computer for..."
 #~ msgstr "Ναι - χρησιμοποιώ το BOINC στον υπολογιστή μου εδώ και..."
+
 #~ msgid "less than a week"
 #~ msgstr "λιγότερο από μία εβδομάδα"
+
 #~ msgid "less than a month"
 #~ msgstr "λιγότερο από έναν μήνα"
+
 #~ msgid "less than a year"
 #~ msgstr "λιγότερο από έναν χρόνο"
+
 #~ msgid "more than a year"
 #~ msgstr "περισσότερο από έναν χρόνο"
+
 #~ msgid "No - I used to run BOINC, but..."
 #~ msgstr "Όχι - χρησιμοποιούσα το BOINC, αλλά..."
+
 #~ msgid "I lost interest"
 #~ msgstr "έχασα το ενδιαφέρον"
+
 #~ msgid "it was too complicated"
 #~ msgstr "ήταν πολύ περίπλοκο"
+
 #~ msgid "I stopped it and forgot to start again"
 #~ msgstr "το σταμάτησα και ξέχασα να το ξαναξεκινήσω"
+
 #~ msgid "it caused problems on my computer"
 #~ msgstr "μου προξένησε προβλήματα στον υπολογιστή"
+
 #~ msgid "it used too much electricity"
 #~ msgstr "κατανάλωνε πάρα πολύ ρεύμα"
+
 #~ msgid "I switched to a non-BOINC computing project"
 #~ msgstr "άρχισα να χρησιμοποιώ κάποιο άλλο υπολογιστικό πρόγραμμα"
+
 #~ msgid "No - I tried running BOINC, but..."
 #~ msgstr "Όχι - προσπάθησα να χρησιμοποιήσω το BOINC, αλλά..."
+
 #~ msgid "the software didn't install correctly"
 #~ msgstr "το λογισμικό δεν εγκαταστάθηκε σωστά"
+
 #~ msgid "I couldn't figure out how to use the software"
 #~ msgstr "δεν μπόρεσα να καταλάβω πώς χρησιμοποιείται το λογισμικό"
+
 #~ msgid "I had network communication problems"
 #~ msgstr "είχα πρόβλημα στην επικοινωνία με το δίκτυο"
+
 #~ msgid "I couldn't attach to a project"
 #~ msgstr "δεν μπορούσα να επιλέξω κάποιο έργο"
+
 #~ msgid "I attached to a project, but never got any work"
 #~ msgstr "επέλεξα κάποιο έργο, αλλά δεν λειτούργησε ποτέ"
+
 #~ msgid "No - I never tried running BOINC, because..."
 #~ msgstr "Όχι - δεν προσπάθησα ποτέ να χρησιμοποιήσω το BOINC, επειδή..."
+
 #~ msgid "I was concerned about security"
 #~ msgstr "ανησυχούσα για την ασφάλεια"
+
 #~ msgid "I wasn't interested in any of the projects"
 #~ msgstr "δεν με ενδιέφερε κάποιο από τα έργα"
+
 #~ msgid "I don't have permission to run it on my computer"
 #~ msgstr "δεν έχω την άδεια να το χρησιμοποιήσω στον υπολογιστή μου"
+
 #~ msgid "No version was available for my computer"
 #~ msgstr "δεν υπήρχε καμία έκδοση του προγράμματος για τον υπολογιστή μου"
+
 #~ msgid "What kind of computers do you have running BOINC?"
 #~ msgstr "Σε τι είδους υπολογιστές χρησιμοποιείτε το BOINC;"
+
 #~ msgid "Where are they?"
 #~ msgstr "Πού βρίσκονται;"
+
 #~ msgid "Work"
 #~ msgstr "Στη δουλειά"
+
 #~ msgid "School"
 #~ msgstr "Στο σχολείο"
+
 #~ msgid "How many computers?"
 #~ msgstr "Πόσους υπολογιστές;"
+
 #~ msgid "On average, how many hours per day are they powered on?"
 #~ msgstr "Κατά μέσο όρο, πόσες ώρες την ημέρα βρίσκονται σε λειτουργία;"
+
 #~ msgid "Age"
 #~ msgstr "Ηλικία"
+
 #~ msgid "Sex"
 #~ msgstr "Φύλο"
+
 #~ msgid "Male"
 #~ msgstr "Αρσενικό"
+
 #~ msgid "Female"
 #~ msgstr "Θηλυκό"
+
 #~ msgid "Your level of computer expertise"
 #~ msgstr "Το γνωστικό σας επίπεδο στη χρήση του υπολογιστή"
+
 #~ msgid "Beginner"
 #~ msgstr "Αρχάριος"
+
 #~ msgid "Intermediate"
 #~ msgstr "Μέτριος"
+
 #~ msgid "Advanced"
 #~ msgstr "Προχωρημένος"
+
 #~ msgid "Where did you learn about BOINC projects?"
 #~ msgstr "Από πού μάθατε για τα προγράμματα του BOINC;"
+
 #~ msgid "TV/radio/newspaper"
 #~ msgstr "τηλεόραση/ραδιόφωνο/εφημερίδα"
+
 #~ msgid "From friends, relatives, or coworkers"
 #~ msgstr "Από φίλους, συγγενείς, ή συνεργάτες"
+
 #~ msgid "Team message boards or web sites"
 #~ msgstr "Από φόρουμ ή ιστοσελίδες ομάδων"
+
 #~ msgid "The BOINC web site"
 #~ msgstr "Από την ιστοσελίδα του BOINC"
+
 #~ msgid "Other web sites"
 #~ msgstr "Από άλλες ιστοσελίδες"
+
 #~ msgid ""
 #~ "Which are the most important factors when you decide whether to "
 #~ "participate in a BOINC project?"
 #~ msgstr ""
 #~ "Ποιοι είναι οι σημαντικότεροι παράγοντες που παίζουν ρόλο στην απόφαση "
 #~ "για συμμετοχή ή μη σε κάποιο έργο του BOINC;"
+
 #~ msgid "Nice-looking screensaver graphics"
 #~ msgstr "Όμορφα γραφικά προφύλαξης οθόνης"
+
 #~ msgid "Fair and quick granting of credit for work done"
 #~ msgstr "Δίκαιη και άμεση απόδοση ευσήμων για την ολοκήρωμένη δουλειά"
+
 #~ msgid "Getting more credit from this project than from others"
 #~ msgstr "Λήψη περισσότερων ευσήμων από αυτό το έργο από ότι στα υπόλοιπα"
+
 #~ msgid "Helpful and friendly message boards"
 #~ msgstr "Εξυπηρετικοί και φιλικοί πίνακες μηνυμάτων (forum)"
+
 #~ msgid "Participation by project staff on the message boards"
 #~ msgstr "Συμμετοχή του προσωπικού του έργου στους πίνακες μηνυμάτων (forum)"
+
 #~ msgid "Informative project web site"
 #~ msgstr "Κατατοπιστική ιστοσελίδα του έργου"
+
 #~ msgid "The science is important and beneficial"
 #~ msgstr "Η επιστήμη είναι σημαντική και ωφέλιμη"
+
 #~ msgid "Non-profit, and results are public"
 #~ msgstr "Μη κερδοσκοπικό, και τα αποτελέσματα είναι δημόσια"
+
 #~ msgid "Personal recognition if my computer finds something"
 #~ msgstr "Προσωπική αναγνώριση σε περίπτωση που ο υπολογιστής μου βρει κάτι"
+
 #~ msgid "Publication by the project in scientific journals"
 #~ msgstr "Δημοσίευση του έργου σε επιστημονικές περιοδικές εκδόσεις"
+
 #~ msgid "Periodic email newsletters from the project"
 #~ msgstr ""
 #~ "Περιοδική ενημέρωση για το έργο μέσω ηλεκτρονικού ταχυδρομείου (e-mail)"
+
 #~ msgid "How many BOINC projects do you participate in?"
 #~ msgstr "Σε πόσα έργα του BOINC συμμετέχετε;"
+
 #~ msgid "Do you run BOINC as a screensaver?"
 #~ msgstr "Χρησιμοποιείται το BOINC ως προφύλαξη οθόνης;"
+
 #~ msgid "Yes"
 #~ msgstr "Ναι"
+
 #~ msgid "No"
 #~ msgstr "Όχι"
+
 #~ msgid "Your usage of project messages boards:"
 #~ msgstr "Χρησιμοποιείτε τους πίνακες μηνυμάτων (forum) του έργου:"
+
 #~ msgid "to read information"
 #~ msgstr "για να βρίσκετε πληροφορίες"
+
 #~ msgid "to read and post information"
 #~ msgstr "για να βρίσκετε και να δίνετε πληροφορίες"
+
 #~ msgid "None"
 #~ msgstr "Τίποτα από τα παραπάνω"
+
 #~ msgid ""
 #~ "Where do you get information to help resolve problems with BOINC and/or "
 #~ "BOINC projects?"
 #~ msgstr ""
 #~ "Από πού παίρνετε πληροφορίες για την επίλυση προβλημάτων του BOINC ή/και "
 #~ "των έργων του BOINC;"
+
 #~ msgid "The project message boards"
 #~ msgstr "Τους πίνακες μηνυμάτων (forum) του έργου"
+
 #~ msgid "The BOINC message boards"
 #~ msgstr "Τους πίνακες μηνυμάτων (forum) του BOINC"
+
 #~ msgid "BOINC mailing lists"
 #~ msgstr "Τις λίστες ηλεκτρονικού ταχυδρομείου (e-mail) του BOINC"
+
 #~ msgid "The Unofficial BOINC Wiki"
 #~ msgstr "Την Ανεπίσημη Εγκυκλοπαίδεια του BOINC (Unofficial BOINC Wiki)"
+
 #~ msgid "Team web sites"
 #~ msgstr "Τις ιστοσελίδες των ομάδων"
+
 #~ msgid "Google or other search engines"
 #~ msgstr "Το Google ή άλλες μηχανές αναζήτησης"
+
 #~ msgid "... more"
 #~ msgstr "... περισσότερα"
+
 #~ msgid "BOINC user survey"
 #~ msgstr "Έρευνα για χρήστες του BOINC"
+
 #~ msgid ""
 #~ "Several volunteer computing projects, including Climateprediction.net, "
 #~ "Einstein at home, and SETI at home, use software called BOINC.  If you "
@@ -1033,40 +1330,54 @@ msgstr "Τα νέα είναι διαθέσιμα ως %sτροφοδοσία RS
 #~ "οι νέες σας απαντήσεις θα αντικαταστήσουν τις προηγούμενες. <p> Τα "
 #~ "τρέχοντα αποτελέσματα της έρευνας βρίσκονται <a href=poll_results."
 #~ "php>εδώ</a>."
+
 #~ msgid "Do you run BOINC?"
 #~ msgstr "Χρησιμοποιείτε το πρόγραμμα BOINC;"
+
 #~ msgid "Your participation"
 #~ msgstr "Η συμμετοχή σας"
+
 #~ msgid "Your computers"
 #~ msgstr "Οι υπολογιστές σας"
+
 #~ msgid "You"
 #~ msgstr "Εσείς"
+
 #~ msgid "Nationality"
 #~ msgstr "Εθνικότητα"
+
 #~ msgid "Comments"
 #~ msgstr "Σχόλια"
+
 #~ msgid ""
 #~ "Please suggest ways that BOINC, and the projects that use it, could be "
 #~ "improved:"
 #~ msgstr ""
 #~ "Παρακαλούμε προτείνετε τρόπους που το BOINC, και τα προγράμματα που το "
 #~ "χρησιμοποιούν, μπορούν αν βελτιωθούν:"
+
 #~ msgid "When done click:"
 #~ msgstr "Όταν τελειώσετε πατήστε:"
+
 #~ msgid "Error - results not recorded"
 #~ msgstr "Σφάλμα - τα αποτελέσματα δεν έχουν καταγραφεί"
+
 #~ msgid ""
 #~ "An internal error has prevented us from recording your survey response.  "
 #~ "Please try again later."
 #~ msgstr ""
 #~ "Ένα εσωτερικό σφάλμα μας εμπόδισε από το να καταγράψουμε τις απαντήσεις "
 #~ "σας στην έρευνα. Παρακαλούμε δοκιμάστε ξανά αργότερα."
+
 #~ msgid "Survey response recorded"
 #~ msgstr "Οι απαντήσεις σας στην έρευνα καταγράφηκαν."
+
 #~ msgid "Thank you for completing the BOINC user survey."
 #~ msgstr "Σας ευχαριστούμε που συμπληρώσατε την έρευνα για χρήστες του BOINC."
+
 #~ msgid "Survey results"
 #~ msgstr "Αποτελέσματα της έρευνας"
+
 #~ msgid ""
 #~ "These are the current results of the <a href=poll.php>BOINC user survey</"
 #~ "a>.  This page is updated every hour."
@@ -1074,3 +1385,423 @@ msgstr "Τα νέα είναι διαθέσιμα ως %sτροφοδοσία RS
 #~ "Αυτά είναι τα τρέχοντα αποτελέσματα της <a href=poll.php>έρευνας για "
 #~ "χρήστες του BOINC</a>. Αυτή η σελίδα ανανεώνεται κάθε μία ώρα."
 
+# The charset used for the text in this file (please try to use UTF-8 if possible)
+#~ msgid "CHARSET"
+#~ msgstr "UTF-8"
+
+# The name of this language in this language
+#~ msgid "LANG_NAME_NATIVE"
+#~ msgstr "English"
+
+# The name of this language in an international language (English)
+#~ msgid "LANG_NAME_INTERNATIONAL"
+#~ msgstr "English"
+
+# #######################################
+# poll-related stuff
+# #######################################
+# poll-related stuff
+# #######################################
+#~ msgid "POLL_TITLE"
+#~ msgstr "BOINC user survey"
+
+#~ msgid "POLL_INTRO"
+#~ msgstr ""
+#~ "Several volunteer computing projects, including Climateprediction.net, "
+#~ "Einstein at home, and SETI at home, use software called BOINC. If you "
+#~ "participate in projects like this, we request that you answer the "
+#~ "following questions. This will help BOINC-based projects increase "
+#~ "participation and achieve greater scientific results. <p> Please answer "
+#~ "as many questions as you want, then go to the bottom and click OK. If you "
+#~ "previously completed the survey but your answers have changed, please "
+#~ "complete it again - your new answers will replace the old ones. <p> The "
+#~ "current results of the survey are <a href=poll_results.php>here</a>. "
+
+#~ msgid "POLL_RUN"
+#~ msgstr "Do you run BOINC?"
+
+#~ msgid "POLL_PARTICIPATION"
+#~ msgstr "Your participation"
+
+#~ msgid "POLL_COMPUTERS"
+#~ msgstr "Your computers"
+
+#~ msgid "POLL_YOU"
+#~ msgstr "You"
+
+#~ msgid "POLL_NATIONALITY"
+#~ msgstr "Nationality"
+
+#~ msgid "POLL_COMMENTS"
+#~ msgstr "Comments"
+
+#~ msgid "POLL_COMMENTS_QUESTION"
+#~ msgstr ""
+#~ "Please suggest ways that BOINC, and the projects that use it, could be "
+#~ "improved:"
+
+#~ msgid "POLL_OTHER"
+#~ msgstr "Other:"
+
+#~ msgid "POLL_CHECK_ALL"
+#~ msgstr "[check all that apply]"
+
+#~ msgid "POLL_DONE"
+#~ msgstr "When done click:"
+
+#~ msgid "POLL_CURRENT"
+#~ msgstr "Yes - I have been running BOINC on my computer for..."
+
+#~ msgid "POLL_TWEEK"
+#~ msgstr "less than a week"
+
+#~ msgid "POLL_TMONTH"
+#~ msgstr "less than a month"
+
+#~ msgid "POLL_TYEAR"
+#~ msgstr "less than a year"
+
+#~ msgid "POLL_TMOREYEAR"
+#~ msgstr "more than a year"
+
+#~ msgid "POLL_LAPSED"
+#~ msgstr "No - I was running BOINC, but stopped because..."
+
+#~ msgid "POLL_LINTEREST"
+#~ msgstr "I lost interest"
+
+#~ msgid "POLL_LCOMPLICATED"
+#~ msgstr "it was too complicated"
+
+#~ msgid "POLL_LSTOPPED"
+#~ msgstr "I stopped it and forgot to start again"
+
+#~ msgid "POLL_LPROBLEMS"
+#~ msgstr "it caused problems on my computer"
+
+#~ msgid "POLL_LPOWER"
+#~ msgstr "it used too much electricity"
+
+#~ msgid "POLL_LNONBOINC"
+#~ msgstr "I switched to a non-BOINC computing project"
+
+#~ msgid "POLL_FAILED"
+#~ msgstr "No - I tried running BOINC, but..."
+
+#~ msgid "POLL_FINSTALL"
+#~ msgstr "the software didn't install correctly"
+
+#~ msgid "POLL_FFIGURE"
+#~ msgstr "I couldn't figure out how to use the software"
+
+#~ msgid "POLL_FNETWORK"
+#~ msgstr "I had network communication problems"
+
+#~ msgid "POLL_FATTACH"
+#~ msgstr "I couldn't attach to a project"
+
+#~ msgid "POLL_FWORK"
+#~ msgstr "I attached to a project, but never got any work"
+
+#~ msgid "POLL_NEVER"
+#~ msgstr "No - I never tried running BOINC, because..."
+
+#~ msgid "POLL_NSECURITY"
+#~ msgstr "I was concerned about security"
+
+#~ msgid "POLL_NPROJECT"
+#~ msgstr "I wasn't interested in any of the projects"
+
+#~ msgid "POLL_NPERMISSION"
+#~ msgstr "I don't have permission to run it on my computer"
+
+#~ msgid "POLL_NVERSION"
+#~ msgstr "No version was available for my computer"
+
+#~ msgid "POLL_KIND"
+#~ msgstr "What kind of computers do you have running BOINC?"
+
+#~ msgid "POLL_WHERE"
+#~ msgstr "Where are they?"
+
+#~ msgid "POLL_WORK"
+#~ msgstr "Work"
+
+#~ msgid "POLL_SCHOOL"
+#~ msgstr "School"
+
+#~ msgid "POLL_HOW_MANY"
+#~ msgstr "How many computers?"
+
+#~ msgid "POLL_TURNED_ON"
+#~ msgstr "On average, how many hours per day are they powered on?"
+
+#~ msgid "POLL_AGE"
+#~ msgstr "Age"
+
+#~ msgid "POLL_SEX"
+#~ msgstr "Sex"
+
+#~ msgid "POLL_MALE"
+#~ msgstr "Male"
+
+#~ msgid "POLL_FEMALE"
+#~ msgstr "Female"
+
+#~ msgid "POLL_EXPERTISE"
+#~ msgstr "Your level of computer expertise"
+
+#~ msgid "POLL_LEVB"
+#~ msgstr "Beginner"
+
+#~ msgid "POLL_LEVI"
+#~ msgstr "Intermediate"
+
+#~ msgid "POLL_LEVA"
+#~ msgstr "Advanced"
+
+#~ msgid "POLL_LEARN_WHERE"
+#~ msgstr "Where did you learn about BOINC projects?"
+
+#~ msgid "POLL_WTV"
+#~ msgstr "TV/radio/newspaper"
+
+#~ msgid "POLL_WPERS"
+#~ msgstr "From friends, relatives, or coworkers"
+
+#~ msgid "POLL_WTEAM"
+#~ msgstr "Team message boards or web sites"
+
+#~ msgid "POLL_WBOINC"
+#~ msgstr "The BOINC web site"
+
+#~ msgid "POLL_WWEB"
+#~ msgstr "Other web sites"
+
+#~ msgid "POLL_FACTOR"
+#~ msgstr ""
+#~ "Which are the most important factors when you decide whether to "
+#~ "participate in a BOINC project?"
+
+#~ msgid "POLL_GRAPHICS"
+#~ msgstr "Nice-looking screensaver graphics"
+
+#~ msgid "POLL_CREDIT_FAIR"
+#~ msgstr "Fair and quick granting of credit for work done"
+
+#~ msgid "POLL_CREDIT_MORE"
+#~ msgstr "Getting more credit from this project than from others"
+
+#~ msgid "POLL_MB_FRIENDLY"
+#~ msgstr "Helpful and friendly message boards"
+
+#~ msgid "POLL_MB_STAFF"
+#~ msgstr "Participation by project staff on the message boards"
+
+#~ msgid "POLL_WEB_SITE"
+#~ msgstr "Informative project web site"
+
+#~ msgid "POLL_SCIENCE_IMPORTANT"
+#~ msgstr "The science is important and beneficial"
+
+#~ msgid "POLL_SCIENCE_PUBLIC"
+#~ msgstr "Non-profit, and results are public"
+
+#~ msgid "POLL_RECOGNIZE"
+#~ msgstr "Personal recognition if my computer finds something"
+
+#~ msgid "POLL_PUBLISH"
+#~ msgstr "Publication by the project in scientific journals"
+
+#~ msgid "POLL_EMAIL"
+#~ msgstr "Periodic email newsletters from the project"
+
+#~ msgid "POLL_NPROJECTS"
+#~ msgstr "How many BOINC projects do you participate in?"
+
+#~ msgid "POLL_SSAVER"
+#~ msgstr "Do you run BOINC as a screensaver?"
+
+#~ msgid "POLL_YES"
+#~ msgstr "Yes"
+
+#~ msgid "POLL_NO"
+#~ msgstr "No"
+
+#~ msgid "POLL_MBOARDS"
+#~ msgstr "Your usage of project messages boards:"
+
+#~ msgid "POLL_MBR"
+#~ msgstr "to read information"
+
+#~ msgid "POLL_MBRW"
+#~ msgstr "to read and post information"
+
+#~ msgid "POLL_NONE"
+#~ msgstr "None"
+
+#~ msgid "POLL_HELP"
+#~ msgstr ""
+#~ "Where do you get information to help resolve problems with BOINC and/or "
+#~ "BOINC projects?"
+
+#~ msgid "POLL_HELP_PMB"
+#~ msgstr "The project message boards"
+
+#~ msgid "POLL_HELP_BMB"
+#~ msgstr "The BOINC message boards"
+
+#~ msgid "POLL_HELP_BDOC"
+#~ msgstr "The BOINC web site"
+
+#~ msgid "POLL_HELP_BMLIST"
+#~ msgstr "BOINC mailing lists"
+
+#~ msgid "POLL_HELP_WIKI"
+#~ msgstr "The Unofficial BOINC Wiki"
+
+#~ msgid "POLL_HELP_TEAM"
+#~ msgstr "Team web sites"
+
+#~ msgid "POLL_HELP_GOOGLE"
+#~ msgstr "Google or other search engines"
+
+#~ msgid "POLL_ERROR_TITLE"
+#~ msgstr "Error - results not recorded"
+
+#~ msgid "POLL_ERROR_TEXT"
+#~ msgstr ""
+#~ "An internal error has prevented us from recording your survey response.  "
+#~ "Please try again later."
+
+#~ msgid "POLL_RECORDED"
+#~ msgstr "Survey response recorded"
+
+#~ msgid "POLL_THANKS"
+#~ msgstr "Thank you for completing the BOINC user survey."
+
+#~ msgid "POLL_RESULTS_TITLE"
+#~ msgstr "Survey results"
+
+#~ msgid "POLL_RESULTS_TEXT"
+#~ msgstr ""
+#~ "These are the current results of the <a href=poll.php>BOINC user survey</"
+#~ "a>.  This page is updated every hour."
+
+#~ msgid "DL_MIRRORS"
+#~ msgstr ""
+#~ "Note: files are downloaded from mirror servers at boinc.berkeley.edu, "
+#~ "morel.mit.edu, einstein.aei.mpg.de, einstein.astro.gla.ac.uk, einstein."
+#~ "ligo.caltech.edu, and einstein.aset.psu.edu (thanks to these "
+#~ "institutions). The server is chosen randomly - if a download fails, "
+#~ "reload this page and try again. "
+
+# #############################################
+# help.php
+# #############################################
+#~ msgid "HELP_TITLE"
+#~ msgstr "Getting help with BOINC"
+
+#~ msgid "HELP_HEADING1"
+#~ msgstr "Online Help"
+
+#~ msgid "HELP_P1_1"
+#~ msgstr ""
+#~ "BOINC Online Help lets you talk one-on-one with experienced BOINC users, "
+#~ "who can: %s answer questions about BOINC and volunteer computing; %s walk "
+#~ "you through the process of installing and using BOINC; %s troubleshoot "
+#~ "any problems you might have. "
+
+#~ msgid "HELP_P1_2"
+#~ msgstr ""
+#~ "BOINC Online Help is based on %sSkype%s, an Internet-based telephone "
+#~ "system. 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. "
+
+#~ msgid "HELP_P1_3"
+#~ msgstr ""
+#~ "The best way to get help is by voice, for which you need either built-in "
+#~ "microphone and speakers or an external headset for your computer. You can "
+#~ "also use Skype's text-based chat system or regular email (if you don't "
+#~ "have Skype) to communicate with Help Volunteers."
+
+#~ msgid "HELP_P1_4"
+#~ msgstr ""
+#~ "Volunteers speaking several languages are available. Please select a "
+#~ "language: "
+
+#~ msgid "HELP_HEADING2"
+#~ msgstr "BOINC help on the web"
+
+#~ msgid "HELP_P2_ITEM1"
+#~ msgstr "BOINC user's manual"
+
+#~ msgid "HELP_P2_ITEM2"
+#~ msgstr "Troubleshooting BOINC "
+
+#~ msgid "HELP_P2_ITEM3"
+#~ msgstr "BOINC-related web sites "
+
+#~ msgid "HELP_P2_ITEM4"
+#~ msgstr "The BOINC message boards "
+
+#~ msgid "HELP_P2_ITEM5"
+#~ msgstr "The message boards on any BOINC-based project "
+
+#~ msgid "HELP_HEADING3"
+#~ msgstr "Be a Help Volunteer"
+
+#~ msgid "HELP_P3_1"
+#~ msgstr ""
+#~ "If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+#~ "Volunteer%s. It's a great way to help the cause of scientific research "
+#~ "and volunteer computing - and it's fun!  "
+
+#~ msgid "HELP_P3_2"
+#~ msgstr ""
+#~ "If you're already a Help Volunteer: to edit your settings, %sclick here"
+#~ "%s. "
+
+# #############################################
+# index.php
+# #############################################
+#~ msgid "HOME_HEADING1"
+#~ msgstr "Volunteer"
+
+#~ msgid "HOME_P1"
+#~ msgstr ""
+#~ " Use the idle time on your computer  (Windows, Mac, or Linux)  to cure "
+#~ "diseases, study global warming,  discover pulsars, and do many other "
+#~ "types of scientific research.  It's safe, secure, and easy:  %sChoose%s "
+#~ "projects  %sDownload%s and run BOINC software  %sEnter%s an email address "
+#~ "and password. "
+
+#~ msgid "HOME_P2"
+#~ msgstr ""
+#~ "Or, if you run several projects, try an %saccount manager%s such as "
+#~ "%sGridRepublic%s or %sBAM!%s. "
+
+#~ msgid "HOME_P3"
+#~ msgstr ""
+#~ "If you have any questions, or need help getting started, you can %stalk "
+#~ "to a Volunteer Helper%s. "
+
+#~ msgid "HOME_DOWNLOAD"
+#~ msgstr "Download"
+
+#~ msgid "HOME_WEB_SITES"
+#~ msgstr "Web"
+
+#~ msgid "HOME_ADD_ONS"
+#~ msgstr "Add-ons"
+
+#~ msgid "HOME_SURVEY"
+#~ msgstr "Survey"
+
+#~ msgid "HOME_BOINC"
+#~ msgstr "Berkeley Open Infrastructure for Network Computing"
+
+#~ msgid "HOME_BOINC_DESC"
+#~ msgstr ""
+#~ "Open-source software for %svolunteer computing%s and %sgrid computing%s"
diff --git a/locale/en/BOINC-Manager.mo b/locale/en/BOINC-Manager.mo
new file mode 100644
index 0000000..0a134bb
Binary files /dev/null and b/locale/en/BOINC-Manager.mo differ
diff --git a/locale/en/BOINC-Manager.po b/locale/en/BOINC-Manager.po
new file mode 100644
index 0000000..ae93b19
--- /dev/null
+++ b/locale/en/BOINC-Manager.po
@@ -0,0 +1,3863 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+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"
+"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"
+"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\n"
+"X-Poedit-Country: UNITED STATES\n"
+"X-Poedit-Language: English\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"
+
+#: clientgui/AccountInfoPage.cpp:361
+#, c-format
+msgid "Identify your account at %s"
+msgstr "Identify your account at %s"
+
+#: clientgui/AccountInfoPage.cpp:367
+msgid ""
+"Please enter your account information\n"
+"(to create an account, visit the project's web site)"
+msgstr "Please enter your account information\n(to create an account, visit the project's web site)"
+
+#: 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 "This project is not currently accepting new accounts.\nYou can add it only if you already have an account."
+
+#: clientgui/AccountInfoPage.cpp:375
+msgid "Are you already running this project?"
+msgstr "Are you already running this project?"
+
+#: clientgui/AccountInfoPage.cpp:379
+msgid "&No, new user"
+msgstr "&No, new user"
+
+#: clientgui/AccountInfoPage.cpp:382
+msgid "&Yes, existing user"
+msgstr "&Yes, existing user"
+
+#: clientgui/AccountInfoPage.cpp:387
+msgid ""
+"We were not able to set up your account information\n"
+"automatically.\n"
+"\n"
+"Please click on the 'Find login information' link\n"
+"below to find out what to put in the email address and\n"
+"password fields."
+msgstr "We were not able to set up your account information\nautomatically.\n\nPlease click on the 'Find login information' link\nbelow to find out what to put in the email address and\npassword fields."
+
+#: clientgui/AccountInfoPage.cpp:390
+msgid "Find login information"
+msgstr "Find login information"
+
+#: clientgui/AccountInfoPage.cpp:410 clientgui/AccountInfoPage.cpp:632
+msgid "&Password:"
+msgstr "&Password:"
+
+#: clientgui/AccountInfoPage.cpp:417 clientgui/AccountInfoPage.cpp:656
+msgid "Choose a &password:"
+msgstr "Choose a &password:"
+
+#: clientgui/AccountInfoPage.cpp:420
+msgid "C&onfirm password:"
+msgstr "C&onfirm password:"
+
+#: clientgui/AccountInfoPage.cpp:427
+#, c-format
+msgid "Are you already running %s?"
+msgstr "Are you already running %s?"
+
+#: clientgui/AccountInfoPage.cpp:456
+msgid "&Username:"
+msgstr "&Username:"
+
+#: clientgui/AccountInfoPage.cpp:485
+msgid "&Email address or LDAP ID:"
+msgstr "&Email address or LDAP ID:"
+
+#: clientgui/AccountInfoPage.cpp:489
+msgid "&Email address:"
+msgstr "&Email address:"
+
+#: clientgui/AccountInfoPage.cpp:497
+#, c-format
+msgid "minimum length %d"
+msgstr "minimum length %d"
+
+#: clientgui/AccountInfoPage.cpp:504
+msgid "Forgot your password?"
+msgstr "Forgot your password?"
+
+#: 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 "If you have not yet registered with this account manager,\nplease do so before proceeding.  Click on the link below\nto register or to retrieve a forgotten password."
+
+#: clientgui/AccountInfoPage.cpp:514
+msgid "Account manager web site"
+msgstr "Account manager web site"
+
+#: clientgui/AccountInfoPage.cpp:556
+msgid "Add project"
+msgstr "Add project"
+
+#: clientgui/AccountInfoPage.cpp:558
+msgid "Update account manager"
+msgstr "Update account manager"
+
+#: clientgui/AccountInfoPage.cpp:560
+msgid "Use account manager"
+msgstr "Use account manager"
+
+#: clientgui/AccountInfoPage.cpp:567
+msgid "Please enter a user name."
+msgstr "Please enter a user name."
+
+#: clientgui/AccountInfoPage.cpp:569
+msgid "Please enter an email address."
+msgstr "Please enter an email address."
+
+#: clientgui/AccountInfoPage.cpp:579
+#, c-format
+msgid "Please enter a password of at least %d characters."
+msgstr "Please enter a password of at least %d characters."
+
+#: clientgui/AccountInfoPage.cpp:589
+msgid ""
+"The password and confirmation password do not match. Please type them again."
+msgstr "The password and confirmation password do not match. Please type them again."
+
+#: clientgui/AccountManagerInfoPage.cpp:270
+msgid "Choose an account manager"
+msgstr "Choose an account manager"
+
+#: clientgui/AccountManagerInfoPage.cpp:273
+msgid ""
+"To choose an account manager, click its name or \n"
+"type its URL below."
+msgstr "To choose an account manager, click its name or \ntype its URL below."
+
+#: clientgui/AccountManagerInfoPage.cpp:277
+msgid "Account manager details:"
+msgstr "Account manager details:"
+
+#: clientgui/AccountManagerInfoPage.cpp:281
+msgid "Account manager &URL:"
+msgstr "Account manager &URL:"
+
+#: clientgui/AccountManagerInfoPage.cpp:285
+msgid "Open web page"
+msgstr "Open web page"
+
+#: clientgui/AccountManagerInfoPage.cpp:288
+msgid "Visit this account manager's web site"
+msgstr "Visit this account manager's web site"
+
+#: clientgui/AccountManagerProcessingPage.cpp:186
+#: clientgui/AccountManagerPropertiesPage.cpp:192
+#, c-format
+msgid "Communicating with %s."
+msgstr "Communicating with %s."
+
+#: clientgui/AccountManagerProcessingPage.cpp:193
+#: clientgui/AccountManagerPropertiesPage.cpp:199
+msgid "Communicating with server."
+msgstr "Communicating with server."
+
+#: clientgui/AccountManagerProcessingPage.cpp:198
+#: clientgui/AccountManagerPropertiesPage.cpp:204
+msgid "Please wait..."
+msgstr "Please wait..."
+
+#: clientgui/AccountManagerProcessingPage.cpp:325
+msgid "An internal server error has occurred.\n"
+msgstr "An internal server error has occurred.\n"
+
+#: clientgui/AdvancedFrame.cpp:99
+msgid "Connected"
+msgstr "Connected"
+
+#: clientgui/AdvancedFrame.cpp:107
+msgid "Disconnected"
+msgstr "Disconnected"
+
+#: clientgui/AdvancedFrame.cpp:325
+#, c-format
+msgid "New %s window..."
+msgstr "New %s window..."
+
+#: clientgui/AdvancedFrame.cpp:329
+#, c-format
+msgid "Open another %s window"
+msgstr "Open another %s window"
+
+#: clientgui/AdvancedFrame.cpp:340
+msgid "Select computer..."
+msgstr "Select computer..."
+
+#: clientgui/AdvancedFrame.cpp:341
+msgid "Connect to a BOINC client on another computer"
+msgstr "Connect to a BOINC client on another computer"
+
+#: clientgui/AdvancedFrame.cpp:345
+msgid "Shut down connected client..."
+msgstr "Shut down connected client..."
+
+#: clientgui/AdvancedFrame.cpp:346
+msgid "Shut down the currently connected BOINC client"
+msgstr "Shut down the currently connected BOINC client"
+
+#: clientgui/AdvancedFrame.cpp:351
+#, c-format
+msgid "Close the %s window"
+msgstr "Close the %s window"
+
+#: clientgui/AdvancedFrame.cpp:354
+msgid "&Close window"
+msgstr "&Close window"
+
+#: clientgui/AdvancedFrame.cpp:363 clientgui/AdvancedFrame.cpp:368
+#: clientgui/AdvancedFrame.cpp:373
+#, c-format
+msgid "Exit %s"
+msgstr "Exit %s"
+
+#: clientgui/AdvancedFrame.cpp:386
+msgid "Preferences…"
+msgstr "Preferences…"
+
+#: clientgui/AdvancedFrame.cpp:395
+msgid "&Notices\tCtrl+Shift+N"
+msgstr "&Notices\tCtrl+Shift+N"
+
+#: clientgui/AdvancedFrame.cpp:396
+msgid "Show notices"
+msgstr "Show notices"
+
+#: clientgui/AdvancedFrame.cpp:401
+msgid "&Projects\tCtrl+Shift+P"
+msgstr "&Projects\tCtrl+Shift+P"
+
+#: clientgui/AdvancedFrame.cpp:402
+msgid "Show projects"
+msgstr "Show projects"
+
+#: clientgui/AdvancedFrame.cpp:407
+msgid "&Tasks\tCtrl+Shift+T"
+msgstr "&Tasks\tCtrl+Shift+T"
+
+#: clientgui/AdvancedFrame.cpp:408
+msgid "Show tasks"
+msgstr "Show tasks"
+
+#: clientgui/AdvancedFrame.cpp:413
+msgid "Trans&fers\tCtrl+Shift+X"
+msgstr "Trans&fers\tCtrl+Shift+X"
+
+#: clientgui/AdvancedFrame.cpp:414
+msgid "Show file transfers"
+msgstr "Show file transfers"
+
+#: clientgui/AdvancedFrame.cpp:419
+msgid "&Statistics\tCtrl+Shift+S"
+msgstr "&Statistics\tCtrl+Shift+S"
+
+#: clientgui/AdvancedFrame.cpp:420
+msgid "Show statistics"
+msgstr "Show statistics"
+
+#: clientgui/AdvancedFrame.cpp:425
+msgid "&Disk\tCtrl+Shift+D"
+msgstr "&Disk\tCtrl+Shift+D"
+
+#: clientgui/AdvancedFrame.cpp:426
+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
+msgid "Simple &View...\tCtrl+Shift+V"
+msgstr "Simple &View...\tCtrl+Shift+V"
+
+#: clientgui/AdvancedFrame.cpp:440
+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: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:459
+#, c-format
+msgid "&Synchronize with %s"
+msgstr "&Synchronize with %s"
+
+#: clientgui/AdvancedFrame.cpp:463
+#, 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
+#, c-format
+msgid "S&top using %s..."
+msgstr "S&top using %s..."
+
+#: clientgui/AdvancedFrame.cpp:483
+msgid "Remove this computer from account manager control."
+msgstr "Remove this computer from account manager control."
+
+#: clientgui/AdvancedFrame.cpp:489
+msgid "Run CPU &benchmarks"
+msgstr "Run CPU &benchmarks"
+
+#: clientgui/AdvancedFrame.cpp:490
+msgid "Run tests that measure CPU speed"
+msgstr "Run tests that measure CPU speed"
+
+#: clientgui/AdvancedFrame.cpp:494
+msgid "Retry pending transfers"
+msgstr "Retry pending transfers"
+
+#: clientgui/AdvancedFrame.cpp:495
+msgid "Retry deferred file transfers and task requests"
+msgstr "Retry deferred file transfers and task requests"
+
+#: clientgui/AdvancedFrame.cpp:503
+msgid "&Run always"
+msgstr "&Run always"
+
+#: clientgui/AdvancedFrame.cpp:504
+msgid "Allow work regardless of preferences"
+msgstr "Allow work regardless of preferences"
+
+#: clientgui/AdvancedFrame.cpp:508
+msgid "Run based on &preferences"
+msgstr "Run based on &preferences"
+
+#: clientgui/AdvancedFrame.cpp:509
+msgid "Allow work according to preferences"
+msgstr "Allow work according to preferences"
+
+#: clientgui/AdvancedFrame.cpp:513
+msgid "&Suspend"
+msgstr "&Suspend"
+
+#: clientgui/AdvancedFrame.cpp:514
+msgid "Stop work regardless of preferences"
+msgstr "Stop work regardless of preferences"
+
+#: clientgui/AdvancedFrame.cpp:539
+msgid "Use GPU always"
+msgstr "Use GPU always"
+
+#: clientgui/AdvancedFrame.cpp:540
+msgid "Allow GPU work regardless of preferences"
+msgstr "Allow GPU work regardless of preferences"
+
+#: clientgui/AdvancedFrame.cpp:544
+msgid "Use GPU based on preferences"
+msgstr "Use GPU based on preferences"
+
+#: clientgui/AdvancedFrame.cpp:545
+msgid "Allow GPU work according to preferences"
+msgstr "Allow GPU work according to preferences"
+
+#: clientgui/AdvancedFrame.cpp:549
+msgid "Suspend GPU"
+msgstr "Suspend GPU"
+
+#: clientgui/AdvancedFrame.cpp:550
+msgid "Stop GPU work regardless of preferences"
+msgstr "Stop GPU work regardless of preferences"
+
+#: clientgui/AdvancedFrame.cpp:574
+msgid "Network activity always allowed"
+msgstr "Network activity always allowed"
+
+#: clientgui/AdvancedFrame.cpp:575
+msgid "Allow network activity regardless of preferences"
+msgstr "Allow network activity regardless of preferences"
+
+#: clientgui/AdvancedFrame.cpp:579
+msgid "Network activity based on preferences"
+msgstr "Network activity based on preferences"
+
+#: clientgui/AdvancedFrame.cpp:580
+msgid "Allow network activity according to preferences"
+msgstr "Allow network activity according to preferences"
+
+#: clientgui/AdvancedFrame.cpp:584
+msgid "Network activity suspended"
+msgstr "Network activity suspended"
+
+#: clientgui/AdvancedFrame.cpp:585
+msgid "Stop BOINC network activity"
+msgstr "Stop BOINC network activity"
+
+#: clientgui/AdvancedFrame.cpp:594
+msgid "Computing &preferences..."
+msgstr "Computing &preferences..."
+
+#: clientgui/AdvancedFrame.cpp:595
+msgid "Configure computing preferences"
+msgstr "Configure computing preferences"
+
+#: clientgui/AdvancedFrame.cpp:600
+msgid "Exclusive applications..."
+msgstr "Exclusive applications..."
+
+#: clientgui/AdvancedFrame.cpp:601
+msgid "Configure exclusive applications"
+msgstr "Configure exclusive applications"
+
+#: clientgui/AdvancedFrame.cpp:606
+msgid "Select columns..."
+msgstr "Select columns..."
+
+#: clientgui/AdvancedFrame.cpp:607
+msgid "Select which columns to display"
+msgstr "Select which columns to display"
+
+#: clientgui/AdvancedFrame.cpp:611
+msgid "Event Log options...\tCtrl+Shift+F"
+msgstr "Event Log options...\tCtrl+Shift+F"
+
+#: clientgui/AdvancedFrame.cpp:612
+msgid "Enable or disable various diagnostic messages"
+msgstr "Enable or disable various diagnostic messages"
+
+#: clientgui/AdvancedFrame.cpp:616
+msgid "&Other options..."
+msgstr "&Other options..."
+
+#: clientgui/AdvancedFrame.cpp:617
+msgid "Configure display options and network settings"
+msgstr "Configure display options and network settings"
+
+#: clientgui/AdvancedFrame.cpp:622
+msgid "Read config files"
+msgstr "Read config files"
+
+#: clientgui/AdvancedFrame.cpp:623
+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
+msgid "Read local prefs file"
+msgstr "Read local prefs file"
+
+#: clientgui/AdvancedFrame.cpp:628
+msgid "Read preferences from global_prefs_override.xml."
+msgstr "Read preferences from global_prefs_override.xml."
+
+#: clientgui/AdvancedFrame.cpp:636
+#, c-format
+msgid "%s &help"
+msgstr "%s &help"
+
+#: clientgui/AdvancedFrame.cpp:640
+#, c-format
+msgid "Show information about %s"
+msgstr "Show information about %s"
+
+#: clientgui/AdvancedFrame.cpp:650
+#, c-format
+msgid "&%s help"
+msgstr "&%s help"
+
+#: clientgui/AdvancedFrame.cpp:654
+#, c-format
+msgid "Show information about the %s"
+msgstr "Show information about the %s"
+
+#: clientgui/AdvancedFrame.cpp:665
+#, c-format
+msgid "%s &web site"
+msgstr "%s &web site"
+
+#: clientgui/AdvancedFrame.cpp:669
+#, c-format
+msgid "Show information about BOINC and %s"
+msgstr "Show information about BOINC and %s"
+
+#: clientgui/AdvancedFrame.cpp:680 clientgui/BOINCTaskBar.cpp:544
+#, c-format
+msgid "&About %s..."
+msgstr "&About %s..."
+
+#: clientgui/AdvancedFrame.cpp:686
+msgid "Licensing and copyright information."
+msgstr "Licensing and copyright information."
+
+#: clientgui/AdvancedFrame.cpp:693
+msgid "&File"
+msgstr "&File"
+
+#: clientgui/AdvancedFrame.cpp:697
+msgid "&View"
+msgstr "&View"
+
+#: clientgui/AdvancedFrame.cpp:701
+msgid "&Activity"
+msgstr "&Activity"
+
+#: clientgui/AdvancedFrame.cpp:705
+msgid "&Options"
+msgstr "&Options"
+
+#: clientgui/AdvancedFrame.cpp:709
+msgid "&Tools"
+msgstr "&Tools"
+
+#: clientgui/AdvancedFrame.cpp:713
+msgid "&Help"
+msgstr "&Help"
+
+#: clientgui/AdvancedFrame.cpp:1188
+#, c-format
+msgid "%s - Stop using %s"
+msgstr "%s - Stop using %s"
+
+#: clientgui/AdvancedFrame.cpp:1193
+#, c-format
+msgid ""
+"If you stop using %s,\n"
+"you'll keep all your current projects,\n"
+"but you'll have to manage projects manually.\n"
+"\n"
+"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
+#, c-format
+msgid "%s - Shut down the current client..."
+msgstr "%s - Shut down the current client..."
+
+#: clientgui/AdvancedFrame.cpp:1429
+#, 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
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: clientgui/AdvancedFrame.cpp:1841
+#, c-format
+msgid "%s has successfully added %s"
+msgstr "%s has successfully added %s"
+
+#: clientgui/AdvancedFrame.cpp:1977
+#, c-format
+msgid "%s - (%s)"
+msgstr "%s - (%s)"
+
+#: clientgui/AdvancedFrame.cpp:1981
+#, c-format
+msgid "Connecting to %s"
+msgstr "Connecting to %s"
+
+#: clientgui/AdvancedFrame.cpp:1984
+#, c-format
+msgid "Connected to %s (%s)"
+msgstr "Connected to %s (%s)"
+
+#: clientgui/AlreadyExistsPage.cpp:184
+msgid "Username already in use"
+msgstr "Username already in use"
+
+#: clientgui/AlreadyExistsPage.cpp:187
+msgid ""
+"An account with that username already exists and has a\n"
+"different password than the one you entered.\n"
+"\n"
+"Please visit the project's web site and follow the instructions there."
+msgstr "An account with that username already exists and has a\ndifferent password than the one you entered.\n\nPlease visit the project's web site and follow the instructions there."
+
+#: clientgui/AlreadyExistsPage.cpp:191
+msgid "Email address already in use"
+msgstr "Email address already in use"
+
+#: 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"
+"\n"
+"Please visit the project's web site and follow the instructions there."
+msgstr "An account with that email address already exists and has a\ndifferent password than the one you entered.\n\nPlease visit the project's web site and follow the instructions there."
+
+#: clientgui/AsyncRPC.cpp:1031
+msgid "Communicating with BOINC client.  Please wait ..."
+msgstr "Communicating with BOINC client.  Please wait ..."
+
+#: clientgui/AsyncRPC.cpp:1034
+#, c-format
+msgid "&Quit %s"
+msgstr "&Quit %s"
+
+#: clientgui/AsyncRPC.cpp:1036
+#, c-format
+msgid "E&xit %s"
+msgstr "E&xit %s"
+
+#: clientgui/AsyncRPC.cpp:1040
+#, c-format
+msgid "%s - Communication"
+msgstr "%s - Communication"
+
+#: clientgui/AsyncRPC.cpp:1056
+msgid "Cancel"
+msgstr "Cancel"
+
+#: clientgui/BOINCBaseFrame.cpp:512
+#, c-format
+msgid "%s - Connection Error"
+msgstr "%s - Connection Error"
+
+#: 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 "You currently are not authorized to manage the client.\nPlease contact your administrator to add you to the 'boinc_users' local user group."
+
+#: 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 "Authorization failed connecting to running client.\nMake sure you start this program in the same directory as the client."
+
+#: clientgui/BOINCBaseFrame.cpp:532
+msgid "Authorization failed connecting to running client."
+msgstr "Authorization failed connecting to running client."
+
+#: clientgui/BOINCBaseFrame.cpp:540
+msgid "The password you have provided is incorrect, please try again."
+msgstr "The password you have provided is incorrect, please try again."
+
+#: clientgui/BOINCBaseFrame.cpp:584
+#, c-format
+msgid "%s - Connection Failed"
+msgstr "%s - Connection Failed"
+
+#: 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 is not able to connect to a %s client.\nWould you like to try to connect again?"
+
+#: clientgui/BOINCBaseFrame.cpp:629
+#, c-format
+msgid "%s - Daemon Start Failed"
+msgstr "%s - Daemon Start Failed"
+
+#: 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 is not able to start a %s client.\nPlease launch the Control Panel->Administative Tools->Services applet and start the BOINC service."
+
+#: 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 is not able to start a %s client.\nPlease start the daemon and try again."
+
+#: clientgui/BOINCBaseFrame.cpp:696
+#, c-format
+msgid "%s - Connection Status"
+msgstr "%s - Connection Status"
+
+#: clientgui/BOINCBaseFrame.cpp:707
+#, 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"
+"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."
+
+#: clientgui/BOINCBaseView.cpp:790
+msgid "Project web pages"
+msgstr "Project web pages"
+
+#: clientgui/BOINCClientManager.cpp:573
+#, c-format
+msgid "%s - Unexpected Exit"
+msgstr "%s - Unexpected Exit"
+
+#: 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 "The %s client has exited unexpectedly 3 times within the last %d minutes.\nWould you like to restart it again?"
+
+#: clientgui/BOINCDialupManager.cpp:61
+#, c-format
+msgid "%s - Network Status"
+msgstr "%s - Network Status"
+
+#: clientgui/BOINCDialupManager.cpp:241
+#, c-format
+msgid ""
+"%s needs to connect to the Internet.\n"
+"May it do so now?"
+msgstr "%s needs to connect to the Internet.\nMay it do so now?"
+
+#: clientgui/BOINCDialupManager.cpp:254
+#, c-format
+msgid "%s is connecting to the Internet."
+msgstr "%s is connecting to the Internet."
+
+#: clientgui/BOINCDialupManager.cpp:303
+#, c-format
+msgid "%s has successfully connected to the Internet."
+msgstr "%s has successfully connected to the Internet."
+
+#: clientgui/BOINCDialupManager.cpp:331
+#, c-format
+msgid "%s failed to connect to the Internet."
+msgstr "%s failed to connect to the Internet."
+
+#: 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 has detected it is now connected to the Internet.\nUpdating all projects and retrying all transfers."
+
+#: clientgui/BOINCDialupManager.cpp:417
+#, c-format
+msgid "%s has successfully disconnected from the Internet."
+msgstr "%s has successfully disconnected from the Internet."
+
+#: clientgui/BOINCDialupManager.cpp:433
+#, c-format
+msgid "%s failed to disconnected from the Internet."
+msgstr "%s failed to disconnected from the Internet."
+
+#: clientgui/BOINCGUIApp.cpp:597
+#, c-format
+msgid ""
+"You currently are not authorized to manage the client.\n"
+"\n"
+"To run %s as this user, please:\n"
+"  - reinstall %s answering \"Yes\" to the question about\n"
+"     non-administrative users\n"
+" or\n"
+"  - contact your administrator to add you to the 'boinc_master'\n"
+"     user group."
+msgstr "You currently are not authorized to manage the client.\n\nTo run %s as this user, please:\n  - reinstall %s answering \"Yes\" to the question about\n     non-administrative users\n or\n  - contact your administrator to add you to the 'boinc_master'\n     user group."
+
+#: clientgui/BOINCGUIApp.cpp:603
+#, c-format
+msgid ""
+"%s ownership or permissions are not set properly; please reinstall %s.\n"
+"(Error code %d"
+msgstr "%s ownership or permissions are not set properly; please reinstall %s.\n(Error code %d"
+
+#: clientgui/BOINCGUIApp.cpp:609
+msgid " at "
+msgstr " at "
+
+#: clientgui/BOINCGUIApp.cpp:612
+msgid ")"
+msgstr ")"
+
+#: 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 "A reboot is required in order for BOINC to run properly.\nPlease reboot your computer and try again."
+
+#: clientgui/BOINCGUIApp.cpp:643
+msgid "BOINC Manager"
+msgstr "BOINC Manager"
+
+#: clientgui/BOINCGUIApp.cpp:904
+msgid "BOINC Manager was started by the operating system automatically"
+msgstr "BOINC Manager was started by the operating system automatically"
+
+#: clientgui/BOINCGUIApp.cpp:906
+msgid "Startup BOINC so only the system tray icon is visible"
+msgstr "Startup BOINC so only the system tray icon is visible"
+
+#: clientgui/BOINCGUIApp.cpp:908
+msgid "Directory containing the BOINC Client executable"
+msgstr "Directory containing the BOINC Client executable"
+
+#: clientgui/BOINCGUIApp.cpp:909
+msgid "BOINC data directory"
+msgstr "BOINC data directory"
+
+#: clientgui/BOINCGUIApp.cpp:911
+msgid "Host name or IP address"
+msgstr "Host name or IP address"
+
+#: clientgui/BOINCGUIApp.cpp:912
+msgid "GUI RPC port number"
+msgstr "GUI RPC port number"
+
+#: clientgui/BOINCGUIApp.cpp:913
+msgid "Password"
+msgstr "Password"
+
+#: clientgui/BOINCGUIApp.cpp:914
+msgid "Startup BOINC with these optional arguments"
+msgstr "Startup BOINC with these optional arguments"
+
+#: clientgui/BOINCGUIApp.cpp:915
+msgid "disable BOINC security users and permissions"
+msgstr "disable BOINC security users and permissions"
+
+#: clientgui/BOINCGUIApp.cpp:916
+msgid "set skin debugging mode to enable skin manager error messages"
+msgstr "set skin debugging mode to enable skin manager error messages"
+
+#: clientgui/BOINCGUIApp.cpp:917
+msgid "multiple instances of BOINC Manager allowed"
+msgstr "multiple instances of BOINC Manager allowed"
+
+#: clientgui/BOINCGUIApp.cpp:919
+msgid "Not used: workaround for bug in XCode 4.2"
+msgstr "Not used: workaround for bug in XCode 4.2"
+
+#: clientgui/BOINCGUIApp.cpp:1166
+msgid "(Automatic Detection)"
+msgstr "(Automatic Detection)"
+
+#: clientgui/BOINCGUIApp.cpp:1167
+msgid "(Unknown)"
+msgstr "(Unknown)"
+
+#: clientgui/BOINCGUIApp.cpp:1168
+msgid "(User Defined)"
+msgstr "(User Defined)"
+
+#: clientgui/BOINCTaskBar.cpp:522
+#, c-format
+msgid "Open %s Web..."
+msgstr "Open %s Web..."
+
+#: clientgui/BOINCTaskBar.cpp:529
+#, c-format
+msgid "Open %s..."
+msgstr "Open %s..."
+
+#: clientgui/BOINCTaskBar.cpp:536 clientgui/BOINCTaskBar.cpp:633
+#: clientgui/BOINCTaskBar.cpp:641
+msgid "Snooze"
+msgstr "Snooze"
+
+#: clientgui/BOINCTaskBar.cpp:538 clientgui/BOINCTaskBar.cpp:660
+#: clientgui/BOINCTaskBar.cpp:668
+msgid "Snooze GPU"
+msgstr "Snooze GPU"
+
+#: clientgui/BOINCTaskBar.cpp:556
+msgid "E&xit"
+msgstr "E&xit"
+
+#: clientgui/BOINCTaskBar.cpp:626
+msgid "Resume"
+msgstr "Resume"
+
+#: clientgui/BOINCTaskBar.cpp:653
+msgid "Resume GPU"
+msgstr "Resume GPU"
+
+#: clientgui/BOINCTaskBar.cpp:727
+msgid "Computing is enabled"
+msgstr "Computing is enabled"
+
+#: clientgui/BOINCTaskBar.cpp:731
+msgid "Computing is suspended - "
+msgstr "Computing is suspended - "
+
+#: clientgui/BOINCTaskBar.cpp:741
+msgid "GPU computing is enabled"
+msgstr "GPU computing is enabled"
+
+#: clientgui/BOINCTaskBar.cpp:744
+msgid "GPU computing is suspended - "
+msgstr "GPU computing is suspended - "
+
+#: clientgui/BOINCTaskBar.cpp:753
+msgid "Network is enabled"
+msgstr "Network is enabled"
+
+#: clientgui/BOINCTaskBar.cpp:756
+msgid "Network is suspended - "
+msgstr "Network is suspended - "
+
+#: clientgui/BOINCTaskBar.cpp:764
+msgid "Reconnecting to client."
+msgstr "Reconnecting to client."
+
+#: clientgui/BOINCTaskBar.cpp:766
+msgid "Not connected to a client."
+msgstr "Not connected to a client."
+
+#: clientgui/BOINCTaskBar.cpp:819
+#, c-format
+msgid "%s Notices"
+msgstr "%s Notices"
+
+#: clientgui/BOINCTaskBar.cpp:825
+msgid "There are new notices - click to view."
+msgstr "There are new notices - click to view."
+
+#: clientgui/CompletionErrorPage.cpp:199
+msgid "Failed to add project"
+msgstr "Failed to add project"
+
+#: clientgui/CompletionErrorPage.cpp:204
+msgid "Failed to update account manager"
+msgstr "Failed to update account manager"
+
+#: clientgui/CompletionErrorPage.cpp:208
+msgid "Failed to remove account manager"
+msgstr "Failed to remove account manager"
+
+#: clientgui/CompletionErrorPage.cpp:212
+msgid "Failed to add account manager"
+msgstr "Failed to add account manager"
+
+#: clientgui/CompletionErrorPage.cpp:221
+msgid ""
+"Please try again later.\n"
+"\n"
+"Click Finish to close."
+msgstr "Please try again later.\n\nClick Finish to close."
+
+#: clientgui/CompletionErrorPage.cpp:225 clientgui/CompletionPage.cpp:222
+#: clientgui/CompletionPage.cpp:242 clientgui/CompletionPage.cpp:273
+msgid "Click Finish to close."
+msgstr "Click Finish to close."
+
+#: clientgui/CompletionErrorPage.cpp:234
+msgid "Messages from server:"
+msgstr "Messages from server:"
+
+#: clientgui/CompletionPage.cpp:207
+msgid "Project added"
+msgstr "Project added"
+
+#: clientgui/CompletionPage.cpp:213
+msgid "This project has been successfully added."
+msgstr "This project has been successfully added."
+
+#: 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 "When you click Finish, your web browser will go to a page where\nyou can set your account name and preferences."
+
+#: clientgui/CompletionPage.cpp:232
+#, c-format
+msgid "Update from %s completed."
+msgstr "Update from %s completed."
+
+#: clientgui/CompletionPage.cpp:236
+msgid "Update completed."
+msgstr "Update completed."
+
+#: clientgui/CompletionPage.cpp:247
+msgid "Now using account manager"
+msgstr "Now using account manager"
+
+#: clientgui/CompletionPage.cpp:252
+#, c-format
+msgid "Welcome to %s!"
+msgstr "Welcome to %s!"
+
+#: clientgui/CompletionPage.cpp:263
+#, c-format
+msgid "You are now using %s to manage accounts."
+msgstr "You are now using %s to manage accounts."
+
+#: clientgui/CompletionPage.cpp:267
+msgid "You are now using this account manager."
+msgstr "You are now using this account manager."
+
+#: clientgui/DlgAbout.cpp:113
+#, c-format
+msgid "About %s"
+msgstr "About %s"
+
+#: clientgui/DlgAbout.cpp:172
+msgid "Version:"
+msgstr "Version:"
+
+#: clientgui/DlgAbout.cpp:180
+msgid "wxWidgets Version:"
+msgstr "wxWidgets Version:"
+
+#: clientgui/DlgAbout.cpp:188
+msgid "Copyright:"
+msgstr "Copyright:"
+
+#: clientgui/DlgAbout.cpp:192
+msgid ""
+"(C) 2003-2015 University of California, Berkeley.\n"
+"All Rights Reserved."
+msgstr "(C) 2003-2015 University of California, Berkeley.\nAll Rights Reserved."
+
+#: clientgui/DlgAbout.cpp:196
+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 "
+
+#: clientgui/DlgAbout.cpp:211
+msgid "for more information."
+msgstr "for more information."
+
+#: clientgui/DlgAbout.cpp:219 clientgui/DlgExitMessage.cpp:173
+#: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:399
+#: clientgui/DlgSelectComputer.cpp:163
+msgid "&OK"
+msgstr "&OK"
+
+#: clientgui/DlgAdvPreferences.cpp:669
+msgid "Invalid number"
+msgstr "Invalid number"
+
+#: clientgui/DlgAdvPreferences.cpp:670
+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
+msgid "Number must be between 0 and 10"
+msgstr "Number must be between 0 and 10"
+
+#: clientgui/DlgAdvPreferences.cpp:672
+msgid "Number must be between 0 and 100"
+msgstr "Number must be between 0 and 100"
+
+#: clientgui/DlgAdvPreferences.cpp:905
+msgid "invalid input value detected"
+msgstr "invalid input value detected"
+
+#: clientgui/DlgAdvPreferences.cpp:907
+msgid "Validation Error"
+msgstr "Validation Error"
+
+#: clientgui/DlgAdvPreferences.cpp:1119
+msgid "Discard local preferences and use web-based preferences?"
+msgstr "Discard local preferences and use web-based preferences?"
+
+#: clientgui/DlgAdvPreferences.cpp:1120
+msgid "Confirmation"
+msgstr "Confirmation"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:54
+#, c-format
+msgid "%s - Computing preferences"
+msgstr "%s - Computing preferences"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:77
+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
+msgid "Using web-based preferences from"
+msgstr "Using web-based preferences from"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:102
+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
+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
+msgid "Clear"
+msgstr "Clear"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:115
+msgid "Clear all local preferences and close the dialog."
+msgstr "Clear all local preferences and close the dialog."
+
+#: clientgui/DlgAdvPreferencesBase.cpp:118
+msgid "Use web prefs"
+msgstr "Use web prefs"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:119
+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
+msgid "Computing"
+msgstr "Computing"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:146
+#: clientgui/DlgAdvPreferencesBase.cpp:785
+msgid "Network"
+msgstr "Network"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:149
+msgid "Disk and memory"
+msgstr "Disk and memory"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:152
+msgid "Daily schedules"
+msgstr "Daily schedules"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:165
+#: clientgui/DlgDiagnosticLogFlags.cpp:119 clientgui/DlgExclusiveApps.cpp:146
+#: clientgui/DlgHiddenColumns.cpp:100
+msgid "OK"
+msgstr "OK"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:166
+msgid "Save all values and close the dialog."
+msgstr "Save all values and close the dialog."
+
+#: clientgui/DlgAdvPreferencesBase.cpp:172
+msgid "Close the dialog without saving."
+msgstr "Close the dialog without saving."
+
+#: clientgui/DlgAdvPreferencesBase.cpp:176 clientgui/DlgExclusiveApps.cpp:157
+msgid "Help"
+msgstr "Help"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:177
+msgid "Shows the preferences web page."
+msgstr "Shows the preferences web page."
+
+#: clientgui/DlgAdvPreferencesBase.cpp:239
+#: clientgui/DlgAdvPreferencesBase.cpp:425
+msgid "Usage limits"
+msgstr "Usage limits"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:244
+#, 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
+msgid "Use at most"
+msgstr "Use at most"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:251
+#, no-c-format
+msgid "% of the CPUs"
+msgstr "% of the CPUs"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:256
+#, 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."
+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
+#, no-c-format
+msgid "% of CPU time"
+msgstr "% of CPU time"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:270
+msgid "When to suspend"
+msgstr "When to suspend"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:276
+msgid "Suspend when computer is on battery"
+msgstr "Suspend when computer is on battery"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:279
+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
+msgid "Suspend when computer is in use"
+msgstr "Suspend when computer is in use"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:288
+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
+msgid "Suspend GPU computing when computer is in use"
+msgstr "Suspend GPU computing when computer is in use"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:297
+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
+msgid "This determines when the computer is considered 'in use'."
+msgstr "This determines when the computer is considered 'in use'."
+
+#: clientgui/DlgAdvPreferencesBase.cpp:306
+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
+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:323
+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
+msgid "Other"
+msgstr "Other"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:349
+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
+msgid "Store at least"
+msgstr "Store at least"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:360
+#: clientgui/DlgAdvPreferencesBase.cpp:376
+msgid "days of work"
+msgstr "days of work"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:365
+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
+msgid "Store up to an additional"
+msgstr "Store up to an additional"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:381
+#, 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
+msgid "Switch between tasks every"
+msgstr "Switch between tasks every"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:391
+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
+msgid "Request tasks to checkpoint at most every"
+msgstr "Request tasks to checkpoint at most every"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:396
+msgid "seconds"
+msgstr "seconds"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:431
+msgid "Limit the download rate of file transfers."
+msgstr "Limit the download rate of file transfers."
+
+#: clientgui/DlgAdvPreferencesBase.cpp:432
+msgid "Limit download rate to"
+msgstr "Limit download rate to"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:436
+#: clientgui/DlgAdvPreferencesBase.cpp:445
+msgid "KB/second"
+msgstr "KB/second"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:440
+msgid "Limit the upload rate of file transfers."
+msgstr "Limit the upload rate of file transfers."
+
+#: clientgui/DlgAdvPreferencesBase.cpp:441
+msgid "Limit upload rate to"
+msgstr "Limit upload rate to"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:452
+#, 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
+msgid "Limit usage to"
+msgstr "Limit usage to"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:458
+msgid "MB every"
+msgstr "MB every"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:462
+msgid "days"
+msgstr "days"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:479
+#, 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
+msgid "Skip data verification for image files"
+msgstr "Skip data verification for image files"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:485
+msgid "Confirm before connecting to Internet"
+msgstr "Confirm before connecting to Internet"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:486
+#: clientgui/DlgAdvPreferencesBase.cpp:490
+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
+msgid "Disconnect when done"
+msgstr "Disconnect when done"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:516
+msgid "Disk"
+msgstr "Disk"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:521
+#, 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
+#, 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
+msgid "Use no more than"
+msgstr "Use no more than"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:534
+msgid "GB"
+msgstr "GB"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:539
+#, 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
+msgid "Leave at least"
+msgstr "Leave at least"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:546
+msgid "GB free"
+msgstr "GB free"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:551
+#, 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
+#, no-c-format
+msgid "% of total"
+msgstr "% of total"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:566
+msgid "Memory"
+msgstr "Memory"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:571
+#, 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
+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
+#, no-c-format
+msgid "%"
+msgstr "%"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:584
+#, 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
+msgid "When computer is not in use, use at most"
+msgstr "When computer is not in use, use at most"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:595
+msgid "Leave non-GPU tasks in memory while suspended"
+msgstr "Leave non-GPU tasks in memory while suspended"
+
+#: 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."
+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
+#, 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
+msgid "Page/swap file: use at most"
+msgstr "Page/swap file: use at most"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:627
+msgid "and"
+msgstr "and"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:628
+msgid "to"
+msgstr "to"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:641
+msgid "Compute only during a particular period each day."
+msgstr "Compute only during a particular period each day."
+
+#: clientgui/DlgAdvPreferencesBase.cpp:644
+msgid "Compute only between"
+msgstr "Compute only between"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:654
+#: clientgui/DlgAdvPreferencesBase.cpp:801
+msgid "Day-of-week override"
+msgstr "Day-of-week override"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:658
+#: clientgui/DlgAdvPreferencesBase.cpp:805
+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
+msgid "Monday"
+msgstr "Monday"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:691
+#: clientgui/DlgAdvPreferencesBase.cpp:837
+msgid "Friday"
+msgstr "Friday"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:704
+#: clientgui/DlgAdvPreferencesBase.cpp:850
+msgid "Tuesday"
+msgstr "Tuesday"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:719
+#: clientgui/DlgAdvPreferencesBase.cpp:865
+msgid "Saturday"
+msgstr "Saturday"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:732
+#: clientgui/DlgAdvPreferencesBase.cpp:878
+msgid "Wednesday"
+msgstr "Wednesday"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:747
+#: clientgui/DlgAdvPreferencesBase.cpp:893
+msgid "Sunday"
+msgstr "Sunday"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:760
+#: clientgui/DlgAdvPreferencesBase.cpp:906
+msgid "Thursday"
+msgstr "Thursday"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:789
+msgid "Transfer files only during a particular period each day."
+msgstr "Transfer files only during a particular period each day."
+
+#: clientgui/DlgAdvPreferencesBase.cpp:791
+msgid "Transfer files only between"
+msgstr "Transfer files only between"
+
+#: clientgui/DlgDiagnosticLogFlags.cpp:65
+#, c-format
+msgid "%s Diagnostic Log Flags"
+msgstr "%s Diagnostic Log Flags"
+
+#: clientgui/DlgDiagnosticLogFlags.cpp:83
+msgid ""
+"These flags enable various types of diagnostic messages in the Event Log."
+msgstr "These flags enable various types of diagnostic messages in the Event Log."
+
+#: clientgui/DlgDiagnosticLogFlags.cpp:99
+msgid "More info ..."
+msgstr "More info ..."
+
+#: clientgui/DlgDiagnosticLogFlags.cpp:120 clientgui/DlgHiddenColumns.cpp:101
+msgid "Save all values and close the dialog"
+msgstr "Save all values and close the dialog"
+
+#: clientgui/DlgDiagnosticLogFlags.cpp:123 clientgui/DlgHiddenColumns.cpp:104
+msgid "Defaults"
+msgstr "Defaults"
+
+#: clientgui/DlgDiagnosticLogFlags.cpp:124 clientgui/DlgHiddenColumns.cpp:105
+msgid "Restore default settings"
+msgstr "Restore default settings"
+
+#: clientgui/DlgDiagnosticLogFlags.cpp:128 clientgui/DlgHiddenColumns.cpp:109
+msgid "Close the dialog without saving"
+msgstr "Close the dialog without saving"
+
+#: clientgui/DlgEventLog.cpp:227
+#, c-format
+msgid "%s - Event Log"
+msgstr "%s - Event Log"
+
+#: clientgui/DlgEventLog.cpp:237
+msgid "Project"
+msgstr "Project"
+
+#: clientgui/DlgEventLog.cpp:238
+msgid "Time"
+msgstr "Time"
+
+#: clientgui/DlgEventLog.cpp:239
+msgid "Message"
+msgstr "Message"
+
+#: clientgui/DlgEventLog.cpp:301 clientgui/DlgEventLog.cpp:351
+msgid "&Show only this project"
+msgstr "&Show only this project"
+
+#: clientgui/DlgEventLog.cpp:305
+msgid "Copy &All"
+msgstr "Copy &All"
+
+#: clientgui/DlgEventLog.cpp:307 clientgui/DlgEventLog.cpp:311
+msgid "Copy all the messages to the clipboard."
+msgstr "Copy all the messages to the clipboard."
+
+#: clientgui/DlgEventLog.cpp:316
+msgid "Copy &Selected"
+msgstr "Copy &Selected"
+
+#: 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."
+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
+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 "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:336 clientgui/DlgItemProperties.cpp:67
+msgid "&Close"
+msgstr "&Close"
+
+#: clientgui/DlgEventLog.cpp:345
+msgid "Show all &messages"
+msgstr "Show all &messages"
+
+#: clientgui/DlgEventLog.cpp:346 clientgui/DlgEventLog.cpp:348
+msgid "Show messages for all projects"
+msgstr "Show messages for all projects"
+
+#: clientgui/DlgEventLog.cpp:352 clientgui/DlgEventLog.cpp:354
+msgid "Show only the messages for the selected project"
+msgstr "Show only the messages for the selected project"
+
+#: clientgui/DlgExclusiveApps.cpp:60
+#, c-format
+msgid "%s - Exclusive Applications"
+msgstr "%s - Exclusive Applications"
+
+#: clientgui/DlgExclusiveApps.cpp:72
+msgid ""
+"Suspend processor and network usage when these applications are running:"
+msgstr "Suspend processor and network usage when these applications are running:"
+
+#: clientgui/DlgExclusiveApps.cpp:80 clientgui/DlgExclusiveApps.cpp:104
+msgid "Add..."
+msgstr "Add..."
+
+#: clientgui/DlgExclusiveApps.cpp:81 clientgui/DlgExclusiveApps.cpp:105
+msgid "Add an application to this list"
+msgstr "Add an application to this list"
+
+#: clientgui/DlgExclusiveApps.cpp:86 clientgui/DlgExclusiveApps.cpp:110
+msgid "Remove"
+msgstr "Remove"
+
+#: clientgui/DlgExclusiveApps.cpp:87 clientgui/DlgExclusiveApps.cpp:111
+msgid "Remove an application from this list"
+msgstr "Remove an application from this list"
+
+#: clientgui/DlgExclusiveApps.cpp:96
+msgid "Suspend GPU usage when these applications are running:"
+msgstr "Suspend GPU usage when these applications are running:"
+
+#: clientgui/DlgExclusiveApps.cpp:122
+msgid "For advanced options, refer to "
+msgstr "For advanced options, refer to "
+
+#: clientgui/DlgExclusiveApps.cpp:147
+msgid "save all values and close the dialog"
+msgstr "save all values and close the dialog"
+
+#: clientgui/DlgExclusiveApps.cpp:153
+msgid "close the dialog without saving"
+msgstr "close the dialog without saving"
+
+#: clientgui/DlgExclusiveApps.cpp:158
+msgid "shows the preferences web page"
+msgstr "shows the preferences web page"
+
+#: clientgui/DlgExclusiveApps.cpp:303 clientgui/DlgExclusiveApps.cpp:309
+#: clientgui/DlgExclusiveApps.cpp:315
+msgid "Applications to add"
+msgstr "Applications to add"
+
+#: clientgui/DlgExclusiveApps.cpp:332
+#, c-format
+msgid "'%s' is not an executable application."
+msgstr "'%s' is not an executable application."
+
+#: clientgui/DlgExclusiveApps.cpp:333 clientgui/DlgExclusiveApps.cpp:380
+#: clientgui/DlgExclusiveApps.cpp:404
+msgid "Add Exclusive App"
+msgstr "Add Exclusive App"
+
+#: clientgui/DlgExclusiveApps.cpp:345
+msgid "Name of application to add?"
+msgstr "Name of application to add?"
+
+#: clientgui/DlgExclusiveApps.cpp:345
+msgid "Add exclusive app"
+msgstr "Add exclusive app"
+
+#: clientgui/DlgExclusiveApps.cpp:379
+#, c-format
+msgid "Application names must end with '%s'"
+msgstr "Application names must end with '%s'"
+
+#: clientgui/DlgExclusiveApps.cpp:403
+#, c-format
+msgid "'%s' is already in the list."
+msgstr "'%s' is already in the list."
+
+#: clientgui/DlgExitMessage.cpp:82
+#, c-format
+msgid "%s - Exit Confirmation"
+msgstr "%s - Exit Confirmation"
+
+#: clientgui/DlgExitMessage.cpp:130
+#, c-format
+msgid ""
+"You have requested to exit the %s,\n"
+"which allows you to view and manage\n"
+"the tasks running on your computer.\n"
+"\n"
+"If you also want to stop running the tasks,\n"
+"choose from the following options:"
+msgstr "You have requested to exit the %s,\nwhich allows you to view and manage\nthe tasks running on your computer.\n\nIf you also want to stop running the tasks,\nchoose from the following options:"
+
+#: clientgui/DlgExitMessage.cpp:135
+#, c-format
+msgid ""
+"This will shut down %s and its tasks until either the\n"
+"%s or the %s screen saver is run again.\n"
+"\n"
+"In most cases, it is better just to close the %s window\n"
+"rather than to exit the application; that will allow %s to run its\n"
+"tasks at the times you selected in your preferences."
+msgstr "This will shut down %s and its tasks until either the\n%s or the %s screen saver is run again.\n\nIn most cases, it is better just to close the %s window\nrather than to exit the application; that will allow %s to run its\ntasks at the times you selected in your preferences."
+
+#: clientgui/DlgExitMessage.cpp:153
+#, c-format
+msgid "Stop running tasks when exiting the %s"
+msgstr "Stop running tasks when exiting the %s"
+
+#: clientgui/DlgExitMessage.cpp:165
+msgid "Remember this decision and do not show this dialog."
+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
+msgid "&Cancel"
+msgstr "&Cancel"
+
+#: clientgui/DlgGenericMessage.cpp:112
+msgid "Don't show this dialog again."
+msgstr "Don't show this dialog again."
+
+#: clientgui/DlgHiddenColumns.cpp:64
+#, c-format
+msgid "%s Column Selection"
+msgstr "%s Column Selection"
+
+#: clientgui/DlgHiddenColumns.cpp:77
+#, c-format
+msgid "Select which columns %s should show."
+msgstr "Select which columns %s should show."
+
+#: clientgui/DlgHiddenColumns.cpp:314
+msgid ""
+"Are you sure you want to reset all list columns to the default "
+"configurations?"
+msgstr "Are you sure you want to reset all list columns to the default configurations?"
+
+#: clientgui/DlgHiddenColumns.cpp:315
+msgid "Confirm defaults"
+msgstr "Confirm defaults"
+
+#: clientgui/DlgItemProperties.cpp:194 clientgui/DlgItemProperties.cpp:197
+#: clientgui/DlgItemProperties.cpp:200 clientgui/DlgItemProperties.cpp:203
+msgid "Don't fetch tasks for "
+msgstr "Don't fetch tasks for "
+
+#: clientgui/DlgItemProperties.cpp:194
+msgid "Project preference"
+msgstr "Project preference"
+
+#: clientgui/DlgItemProperties.cpp:197
+msgid "Account manager preference"
+msgstr "Account manager preference"
+
+#: clientgui/DlgItemProperties.cpp:200
+msgid "Project has no apps for "
+msgstr "Project has no apps for "
+
+#: clientgui/DlgItemProperties.cpp:203
+msgid "Client configuration excludes "
+msgstr "Client configuration excludes "
+
+#: clientgui/DlgItemProperties.cpp:207
+msgid " work fetch deferred for"
+msgstr " work fetch deferred for"
+
+#: clientgui/DlgItemProperties.cpp:208
+msgid " work fetch deferral interval"
+msgstr " work fetch deferral interval"
+
+#: clientgui/DlgItemProperties.cpp:239
+msgid "Properties of project "
+msgstr "Properties of project "
+
+#: clientgui/DlgItemProperties.cpp:243 clientgui/DlgOptions.cpp:221
+msgid "General"
+msgstr "General"
+
+#: clientgui/DlgItemProperties.cpp:244
+msgid "Master URL"
+msgstr "Master URL"
+
+#: clientgui/DlgItemProperties.cpp:245
+msgid "User name"
+msgstr "User name"
+
+#: clientgui/DlgItemProperties.cpp:246
+msgid "Team name"
+msgstr "Team name"
+
+#: clientgui/DlgItemProperties.cpp:247
+msgid "Resource share"
+msgstr "Resource share"
+
+#: clientgui/DlgItemProperties.cpp:249
+msgid "Scheduler RPC deferred for"
+msgstr "Scheduler RPC deferred for"
+
+#: clientgui/DlgItemProperties.cpp:252
+msgid "File downloads deferred for"
+msgstr "File downloads deferred for"
+
+#: clientgui/DlgItemProperties.cpp:255
+msgid "File uploads deferred for"
+msgstr "File uploads deferred for"
+
+#: clientgui/DlgItemProperties.cpp:257
+msgid "Disk usage"
+msgstr "Disk usage"
+
+#: clientgui/DlgItemProperties.cpp:258
+msgid "Computer ID"
+msgstr "Computer ID"
+
+#: clientgui/DlgItemProperties.cpp:260
+msgid "Non CPU intensive"
+msgstr "Non CPU intensive"
+
+#: 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 "yes"
+
+#: clientgui/DlgItemProperties.cpp:262
+msgid "Suspended via GUI"
+msgstr "Suspended via GUI"
+
+#: clientgui/DlgItemProperties.cpp:262 clientgui/DlgItemProperties.cpp:263
+msgid "no"
+msgstr "no"
+
+#: clientgui/DlgItemProperties.cpp:263
+msgid "Don't request more work"
+msgstr "Don't request more work"
+
+#: clientgui/DlgItemProperties.cpp:265
+msgid "Scheduler call in progress"
+msgstr "Scheduler call in progress"
+
+#: clientgui/DlgItemProperties.cpp:268
+msgid "Trickle-up pending"
+msgstr "Trickle-up pending"
+
+#: clientgui/DlgItemProperties.cpp:271 clientgui/DlgItemProperties.cpp:273
+msgid "Host location"
+msgstr "Host location"
+
+#: clientgui/DlgItemProperties.cpp:273
+msgid "default"
+msgstr "default"
+
+#: clientgui/DlgItemProperties.cpp:277
+msgid "Added via account manager"
+msgstr "Added via account manager"
+
+#: clientgui/DlgItemProperties.cpp:280
+msgid "Remove when tasks done"
+msgstr "Remove when tasks done"
+
+#: clientgui/DlgItemProperties.cpp:283
+msgid "Ended"
+msgstr "Ended"
+
+#: clientgui/DlgItemProperties.cpp:285
+msgid "Tasks completed"
+msgstr "Tasks completed"
+
+#: clientgui/DlgItemProperties.cpp:286
+msgid "Tasks failed"
+msgstr "Tasks failed"
+
+#: clientgui/DlgItemProperties.cpp:288
+msgid "Credit"
+msgstr "Credit"
+
+#: clientgui/DlgItemProperties.cpp:289
+msgid "User"
+msgstr "User"
+
+#: clientgui/DlgItemProperties.cpp:296
+msgid "Host"
+msgstr "Host"
+
+#: clientgui/DlgItemProperties.cpp:305
+msgid "Scheduling"
+msgstr "Scheduling"
+
+#: clientgui/DlgItemProperties.cpp:306
+msgid "Scheduling priority"
+msgstr "Scheduling priority"
+
+#: clientgui/DlgItemProperties.cpp:307
+msgid "CPU"
+msgstr "CPU"
+
+#: clientgui/DlgItemProperties.cpp:331
+msgid "Duration correction factor"
+msgstr "Duration correction factor"
+
+#: clientgui/DlgItemProperties.cpp:345
+msgid "Properties of task "
+msgstr "Properties of task "
+
+#: clientgui/DlgItemProperties.cpp:357
+msgid "Application"
+msgstr "Application"
+
+#: clientgui/DlgItemProperties.cpp:358
+msgid "Name"
+msgstr "Name"
+
+#: clientgui/DlgItemProperties.cpp:359
+msgid "State"
+msgstr "State"
+
+#: clientgui/DlgItemProperties.cpp:362
+msgid "Received"
+msgstr "Received"
+
+#: clientgui/DlgItemProperties.cpp:365
+msgid "Report deadline"
+msgstr "Report deadline"
+
+#: clientgui/DlgItemProperties.cpp:367
+msgid "Resources"
+msgstr "Resources"
+
+#: clientgui/DlgItemProperties.cpp:370
+msgid "Estimated computation size"
+msgstr "Estimated computation size"
+
+#: clientgui/DlgItemProperties.cpp:373
+msgid "CPU time at last checkpoint"
+msgstr "CPU time at last checkpoint"
+
+#: clientgui/DlgItemProperties.cpp:374 clientgui/DlgItemProperties.cpp:389
+msgid "CPU time"
+msgstr "CPU time"
+
+#: clientgui/DlgItemProperties.cpp:376 clientgui/DlgItemProperties.cpp:390
+msgid "Elapsed time"
+msgstr "Elapsed time"
+
+#: clientgui/DlgItemProperties.cpp:378
+msgid "Estimated time remaining"
+msgstr "Estimated time remaining"
+
+#: clientgui/DlgItemProperties.cpp:379
+msgid "Fraction done"
+msgstr "Fraction done"
+
+#: clientgui/DlgItemProperties.cpp:380
+msgid "Virtual memory size"
+msgstr "Virtual memory size"
+
+#: clientgui/DlgItemProperties.cpp:381
+msgid "Working set size"
+msgstr "Working set size"
+
+#: clientgui/DlgItemProperties.cpp:383
+msgid "Directory"
+msgstr "Directory"
+
+#: clientgui/DlgItemProperties.cpp:386
+msgid "Process ID"
+msgstr "Process ID"
+
+#: clientgui/DlgItemProperties.cpp:456
+msgid "Local: "
+msgstr "Local: "
+
+#: clientgui/DlgOptions.cpp:129 clientgui/DlgOptions.cpp:135
+msgid "Options"
+msgstr "Options"
+
+#: clientgui/DlgOptions.cpp:178
+msgid "Language:"
+msgstr "Language:"
+
+#: clientgui/DlgOptions.cpp:185
+msgid "What language should BOINC use?"
+msgstr "What language should BOINC use?"
+
+#: clientgui/DlgOptions.cpp:189
+msgid "Notice reminder interval:"
+msgstr "Notice reminder interval:"
+
+#: clientgui/DlgOptions.cpp:196
+msgid "How often should BOINC remind you of new notices?"
+msgstr "How often should BOINC remind you of new notices?"
+
+#: clientgui/DlgOptions.cpp:201
+msgid "Run Manager at login?"
+msgstr "Run Manager at login?"
+
+#: clientgui/DlgOptions.cpp:207
+msgid "Run the BOINC Manager when you log on."
+msgstr "Run the BOINC Manager when you log on."
+
+#: clientgui/DlgOptions.cpp:212
+msgid "Enable Manager exit dialog?"
+msgstr "Enable Manager exit dialog?"
+
+#: clientgui/DlgOptions.cpp:218
+msgid "Display the exit dialog when shutting down the Manager."
+msgstr "Display the exit dialog when shutting down the Manager."
+
+#: clientgui/DlgOptions.cpp:229
+msgid "Dial-up and Virtual Private Network settings"
+msgstr "Dial-up and Virtual Private Network settings"
+
+#: clientgui/DlgOptions.cpp:243
+msgid "&Set Default"
+msgstr "&Set Default"
+
+#: clientgui/DlgOptions.cpp:248
+msgid "&Clear Default"
+msgstr "&Clear Default"
+
+#: clientgui/DlgOptions.cpp:255
+msgid "Default Connection:"
+msgstr "Default Connection:"
+
+#: clientgui/DlgOptions.cpp:262
+msgid "Connections"
+msgstr "Connections"
+
+#: clientgui/DlgOptions.cpp:271
+msgid "Connect via HTTP proxy server"
+msgstr "Connect via HTTP proxy server"
+
+#: clientgui/DlgOptions.cpp:275
+msgid "HTTP Proxy Server Configuration"
+msgstr "HTTP Proxy Server Configuration"
+
+#: clientgui/DlgOptions.cpp:283 clientgui/DlgOptions.cpp:347
+msgid "Address:"
+msgstr "Address:"
+
+#: clientgui/DlgOptions.cpp:291 clientgui/DlgOptions.cpp:355
+msgid "Port:"
+msgstr "Port:"
+
+#: clientgui/DlgOptions.cpp:299 clientgui/DlgOptions.cpp:363
+msgid "Don't use proxy for:"
+msgstr "Don't use proxy for:"
+
+#: clientgui/DlgOptions.cpp:306 clientgui/DlgOptions.cpp:370
+msgid "Leave these blank if not needed"
+msgstr "Leave these blank if not needed"
+
+#: clientgui/DlgOptions.cpp:312 clientgui/DlgOptions.cpp:376
+msgid "User Name:"
+msgstr "User Name:"
+
+#: clientgui/DlgOptions.cpp:320 clientgui/DlgOptions.cpp:384
+#: clientgui/DlgSelectComputer.cpp:152
+msgid "Password:"
+msgstr "Password:"
+
+#: clientgui/DlgOptions.cpp:327
+msgid "HTTP Proxy"
+msgstr "HTTP Proxy"
+
+#: clientgui/DlgOptions.cpp:335
+msgid "Connect via SOCKS proxy server"
+msgstr "Connect via SOCKS proxy server"
+
+#: clientgui/DlgOptions.cpp:339
+msgid "SOCKS Proxy Server Configuration"
+msgstr "SOCKS Proxy Server Configuration"
+
+#: clientgui/DlgOptions.cpp:391
+msgid "SOCKS Proxy"
+msgstr "SOCKS Proxy"
+
+#: clientgui/DlgOptions.cpp:589
+msgid "always"
+msgstr "always"
+
+#: clientgui/DlgOptions.cpp:590
+msgid "1 hour"
+msgstr "1 hour"
+
+#: clientgui/DlgOptions.cpp:591
+msgid "6 hours"
+msgstr "6 hours"
+
+#: clientgui/DlgOptions.cpp:592
+msgid "1 day"
+msgstr "1 day"
+
+#: clientgui/DlgOptions.cpp:593
+msgid "1 week"
+msgstr "1 week"
+
+#: clientgui/DlgOptions.cpp:594
+msgid "never"
+msgstr "never"
+
+#: clientgui/DlgOptions.cpp:691
+#, c-format
+msgid "%s - Language Selection"
+msgstr "%s - Language Selection"
+
+#: 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 "The %s's language has been changed.  In order for this change to take effect, you must restart the %s."
+
+#: clientgui/DlgSelectComputer.cpp:91
+#, c-format
+msgid "%s - Select Computer"
+msgstr "%s - Select Computer"
+
+#: 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 "Another instance of %s is already running \non this computer.  Please select a client to monitor."
+
+#: clientgui/DlgSelectComputer.cpp:143
+msgid "Host name:"
+msgstr "Host name:"
+
+#: clientgui/Localization.cpp:31 clientgui/Localization.cpp:69
+msgid "Message boards"
+msgstr "Message boards"
+
+#: clientgui/Localization.cpp:33
+msgid "Correspond with other users on the SETI at home message boards"
+msgstr "Correspond with other users on the SETI at home message boards"
+
+#: clientgui/Localization.cpp:37
+msgid "Ask questions and report problems"
+msgstr "Ask questions and report problems"
+
+#: clientgui/Localization.cpp:39 clientgui/Localization.cpp:81
+#: clientgui/Localization.cpp:111 clientgui/Localization.cpp:129
+msgid "Your account"
+msgstr "Your account"
+
+#: clientgui/Localization.cpp:41 clientgui/Localization.cpp:87
+#: clientgui/Localization.cpp:113
+msgid "View your account information and credit totals"
+msgstr "View your account information and credit totals"
+
+#: clientgui/Localization.cpp:43
+msgid "Your preferences"
+msgstr "Your preferences"
+
+#: clientgui/Localization.cpp:45
+msgid "View and modify your SETI at home account profile and preferences"
+msgstr "View and modify your SETI at home account profile and preferences"
+
+#: clientgui/Localization.cpp:47 clientgui/Localization.cpp:89
+msgid "Your results"
+msgstr "Your results"
+
+#: clientgui/Localization.cpp:49 clientgui/Localization.cpp:91
+msgid "View your last week (or more) of computational results and work"
+msgstr "View your last week (or more) of computational results and work"
+
+#: clientgui/Localization.cpp:51 clientgui/Localization.cpp:93
+msgid "Your computers"
+msgstr "Your computers"
+
+#: clientgui/Localization.cpp:53
+msgid "View a listing of all the computers on which you are running SETI at Home"
+msgstr "View a listing of all the computers on which you are running SETI at Home"
+
+#: clientgui/Localization.cpp:55 clientgui/Localization.cpp:97
+msgid "Your team"
+msgstr "Your team"
+
+#: clientgui/Localization.cpp:57 clientgui/Localization.cpp:99
+msgid "View information about your team"
+msgstr "View information about your team"
+
+#: clientgui/Localization.cpp:61
+msgid "Common questions"
+msgstr "Common questions"
+
+#: clientgui/Localization.cpp:63
+msgid "Read the Einstein at Home Frequently Asked Question list"
+msgstr "Read the Einstein at Home Frequently Asked Question list"
+
+#: clientgui/Localization.cpp:65
+msgid "Screensaver info"
+msgstr "Screensaver info"
+
+#: clientgui/Localization.cpp:67
+msgid "Read a detailed description of the Einstein at Home screensaver"
+msgstr "Read a detailed description of the Einstein at Home screensaver"
+
+#: clientgui/Localization.cpp:71
+msgid ""
+"Correspond with admins and other users on the Einstein at Home message boards"
+msgstr "Correspond with admins and other users on the Einstein at Home message boards"
+
+#: clientgui/Localization.cpp:73
+msgid "Einstein status"
+msgstr "Einstein status"
+
+#: clientgui/Localization.cpp:75
+msgid "Current status of the Einstein at Home server"
+msgstr "Current status of the Einstein at Home server"
+
+#: clientgui/Localization.cpp:77
+msgid "Report problems"
+msgstr "Report problems"
+
+#: clientgui/Localization.cpp:79
+msgid "A link to the Einstein at Home problems and bug reports message board"
+msgstr "A link to the Einstein at Home problems and bug reports message board"
+
+#: clientgui/Localization.cpp:83
+msgid "View and modify your Einstein at Home account profile and preferences"
+msgstr "View and modify your Einstein at Home account profile and preferences"
+
+#: clientgui/Localization.cpp:85
+msgid "Account summary"
+msgstr "Account summary"
+
+#: clientgui/Localization.cpp:95
+msgid ""
+"View a listing of all the computers on which you are running Einstein at Home"
+msgstr "View a listing of all the computers on which you are running Einstein at Home"
+
+#: clientgui/Localization.cpp:101
+msgid "LIGO project"
+msgstr "LIGO project"
+
+#: clientgui/Localization.cpp:103
+msgid ""
+"The home page of the Laser Interferometer Gravitational-wave Observatory "
+"(LIGO) project"
+msgstr "The home page of the Laser Interferometer Gravitational-wave Observatory (LIGO) project"
+
+#: clientgui/Localization.cpp:105
+msgid "GEO-600 project"
+msgstr "GEO-600 project"
+
+#: clientgui/Localization.cpp:107
+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
+msgid "Team"
+msgstr "Team"
+
+#: clientgui/Localization.cpp:117
+msgid "Info about your Team"
+msgstr "Info about your Team"
+
+#: clientgui/Localization.cpp:123
+msgid "Get help for climateprediction.net"
+msgstr "Get help for climateprediction.net"
+
+#: clientgui/Localization.cpp:125
+msgid "News"
+msgstr "News"
+
+#: clientgui/Localization.cpp:127
+msgid "climateprediction.net News"
+msgstr "climateprediction.net News"
+
+#: clientgui/Localization.cpp:131
+msgid "View your account information, credits, and trickles"
+msgstr "View your account information, credits, and trickles"
+
+#: clientgui/Localization.cpp:135
+msgid "Info about your team"
+msgstr "Info about your team"
+
+#: clientgui/Localization.cpp:141
+msgid "Search for help in our help system"
+msgstr "Search for help in our help system"
+
+#: clientgui/Localization.cpp:143
+msgid "Global Statistics"
+msgstr "Global Statistics"
+
+#: clientgui/Localization.cpp:145
+msgid "Summary statistics for World Community Grid"
+msgstr "Summary statistics for World Community Grid"
+
+#: clientgui/Localization.cpp:147
+msgid "My Grid"
+msgstr "My Grid"
+
+#: clientgui/Localization.cpp:149
+msgid "Your statistics and settings"
+msgstr "Your statistics and settings"
+
+#: clientgui/Localization.cpp:151
+msgid "Device Profiles"
+msgstr "Device Profiles"
+
+#: clientgui/Localization.cpp:153
+msgid "Update your device settings"
+msgstr "Update your device settings"
+
+#: clientgui/Localization.cpp:155
+msgid "Research"
+msgstr "Research"
+
+#: clientgui/Localization.cpp:157
+msgid "Learn about the projects hosted at World Community Grid"
+msgstr "Learn about the projects hosted at World Community Grid"
+
+#: clientgui/MainDocument.cpp:583
+msgid "Starting client"
+msgstr "Starting client"
+
+#: clientgui/MainDocument.cpp:591
+msgid "Connecting to client"
+msgstr "Connecting to client"
+
+#: clientgui/MainDocument.cpp:1205
+msgid "Retrieving system state; please wait..."
+msgstr "Retrieving system state; please wait..."
+
+#: clientgui/MainDocument.cpp:1826
+msgid "Missing application"
+msgstr "Missing application"
+
+#: clientgui/MainDocument.cpp:1827
+msgid ""
+"Please download and install the CoRD application from "
+"http://cord.sourceforge.net"
+msgstr "Please download and install the CoRD application from http://cord.sourceforge.net"
+
+#: clientgui/MainDocument.cpp:2442
+msgid "on batteries"
+msgstr "on batteries"
+
+#: clientgui/MainDocument.cpp:2443
+msgid "computer is in use"
+msgstr "computer is in use"
+
+#: clientgui/MainDocument.cpp:2444
+msgid "user request"
+msgstr "user request"
+
+#: clientgui/MainDocument.cpp:2445
+msgid "time of day"
+msgstr "time of day"
+
+#: clientgui/MainDocument.cpp:2446
+msgid "CPU benchmarks in progress"
+msgstr "CPU benchmarks in progress"
+
+#: clientgui/MainDocument.cpp:2447
+msgid "need disk space - check preferences"
+msgstr "need disk space - check preferences"
+
+#: clientgui/MainDocument.cpp:2448
+msgid "computer is not in use"
+msgstr "computer is not in use"
+
+#: clientgui/MainDocument.cpp:2449
+msgid "starting up"
+msgstr "starting up"
+
+#: clientgui/MainDocument.cpp:2450
+msgid "an exclusive app is running"
+msgstr "an exclusive app is running"
+
+#: clientgui/MainDocument.cpp:2451
+msgid "CPU is busy"
+msgstr "CPU is busy"
+
+#: clientgui/MainDocument.cpp:2452
+msgid "network bandwidth limit exceeded"
+msgstr "network bandwidth limit exceeded"
+
+#: clientgui/MainDocument.cpp:2453
+msgid "requested by operating system"
+msgstr "requested by operating system"
+
+#: clientgui/MainDocument.cpp:2455
+msgid "unknown reason"
+msgstr "unknown reason"
+
+#: clientgui/MainDocument.cpp:2477
+msgid "GPU missing, "
+msgstr "GPU missing, "
+
+#: clientgui/MainDocument.cpp:2484
+msgid "New"
+msgstr "New"
+
+#: clientgui/MainDocument.cpp:2488
+msgid "Download failed"
+msgstr "Download failed"
+
+#: clientgui/MainDocument.cpp:2490
+msgid "Downloading"
+msgstr "Downloading"
+
+#: clientgui/MainDocument.cpp:2492 clientgui/MainDocument.cpp:2551
+msgid " (suspended - "
+msgstr " (suspended - "
+
+#: clientgui/MainDocument.cpp:2500
+msgid "Project suspended by user"
+msgstr "Project suspended by user"
+
+#: clientgui/MainDocument.cpp:2502
+msgid "Task suspended by user"
+msgstr "Task suspended by user"
+
+#: clientgui/MainDocument.cpp:2507
+msgid "Suspended - "
+msgstr "Suspended - "
+
+#: clientgui/MainDocument.cpp:2510
+msgid "GPU suspended - "
+msgstr "GPU suspended - "
+
+#: clientgui/MainDocument.cpp:2514
+msgid "Waiting for memory"
+msgstr "Waiting for memory"
+
+#: clientgui/MainDocument.cpp:2516
+msgid "Waiting for shared memory"
+msgstr "Waiting for shared memory"
+
+#: clientgui/MainDocument.cpp:2518
+msgid "Running"
+msgstr "Running"
+
+#: clientgui/MainDocument.cpp:2520
+msgid " (non-CPU-intensive)"
+msgstr " (non-CPU-intensive)"
+
+#: clientgui/MainDocument.cpp:2523
+msgid "Waiting to run"
+msgstr "Waiting to run"
+
+#: clientgui/MainDocument.cpp:2525 clientgui/MainDocument.cpp:2528
+msgid "Ready to start"
+msgstr "Ready to start"
+
+#: clientgui/MainDocument.cpp:2532
+msgid "Postponed: "
+msgstr "Postponed: "
+
+#: clientgui/MainDocument.cpp:2535
+msgid "Postponed"
+msgstr "Postponed"
+
+#: clientgui/MainDocument.cpp:2539
+msgid "Waiting for network access"
+msgstr "Waiting for network access"
+
+#: clientgui/MainDocument.cpp:2543
+msgid "Computation error"
+msgstr "Computation error"
+
+#: clientgui/MainDocument.cpp:2547
+msgid "Upload failed"
+msgstr "Upload failed"
+
+#: clientgui/MainDocument.cpp:2549
+msgid "Uploading"
+msgstr "Uploading"
+
+#: clientgui/MainDocument.cpp:2560
+msgid "Aborted by user"
+msgstr "Aborted by user"
+
+#: clientgui/MainDocument.cpp:2563
+msgid "Aborted by project"
+msgstr "Aborted by project"
+
+#: clientgui/MainDocument.cpp:2566
+msgid "Aborted: not started by deadline"
+msgstr "Aborted: not started by deadline"
+
+#: clientgui/MainDocument.cpp:2569
+msgid "Aborted: disk limit exceeded"
+msgstr "Aborted: disk limit exceeded"
+
+#: clientgui/MainDocument.cpp:2572
+msgid "Aborted: run time limit exceeded"
+msgstr "Aborted: run time limit exceeded"
+
+#: clientgui/MainDocument.cpp:2575
+msgid "Aborted: memory limit exceeded"
+msgstr "Aborted: memory limit exceeded"
+
+#: clientgui/MainDocument.cpp:2578
+msgid "Aborted"
+msgstr "Aborted"
+
+#: clientgui/MainDocument.cpp:2583
+msgid "Acknowledged"
+msgstr "Acknowledged"
+
+#: clientgui/MainDocument.cpp:2585
+msgid "Ready to report"
+msgstr "Ready to report"
+
+#: clientgui/MainDocument.cpp:2587
+#, c-format
+msgid "Error: invalid state '%d'"
+msgstr "Error: invalid state '%d'"
+
+#: clientgui/NoInternetConnectionPage.cpp:179
+msgid "No Internet connection"
+msgstr "No Internet connection"
+
+#: clientgui/NoInternetConnectionPage.cpp:182
+msgid "Please connect to the Internet and try again."
+msgstr "Please connect to the Internet and try again."
+
+#: clientgui/NotDetectedPage.cpp:181
+msgid "Project not found"
+msgstr "Project not found"
+
+#: 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 "The URL you supplied is not that of a BOINC-based project.\n\nPlease check the URL and try again."
+
+#: clientgui/NotDetectedPage.cpp:188
+msgid "Account manager not found"
+msgstr "Account manager not found"
+
+#: clientgui/NotDetectedPage.cpp:191
+msgid ""
+"The URL you supplied is not that of a BOINC-based account\n"
+"manager.\n"
+"\n"
+"Please check the URL and try again."
+msgstr "The URL you supplied is not that of a BOINC-based account\nmanager.\n\nPlease check the URL and try again."
+
+#: clientgui/NotFoundPage.cpp:181
+msgid "Login Failed."
+msgstr "Login Failed."
+
+#: clientgui/NotFoundPage.cpp:185
+msgid "Check the username and password, and try again."
+msgstr "Check the username and password, and try again."
+
+#: clientgui/NotFoundPage.cpp:189
+msgid "Check the email address and password, and try again."
+msgstr "Check the email address and password, and try again."
+
+#: clientgui/NoticeListCtrl.cpp:229
+msgid "more..."
+msgstr "more..."
+
+#: clientgui/ProjectInfoPage.cpp:221
+msgid "Choose a project"
+msgstr "Choose a project"
+
+#: clientgui/ProjectInfoPage.cpp:226
+msgid "To choose a project, click its name or type its URL below."
+msgstr "To choose a project, click its name or type its URL below."
+
+#: clientgui/ProjectInfoPage.cpp:242
+msgid "Categories:"
+msgstr "Categories:"
+
+#: clientgui/ProjectInfoPage.cpp:262
+msgid "Projects:"
+msgstr "Projects:"
+
+#: clientgui/ProjectInfoPage.cpp:274
+msgid "Project details"
+msgstr "Project details"
+
+#: clientgui/ProjectInfoPage.cpp:284
+msgid "Research area:"
+msgstr "Research area:"
+
+#: clientgui/ProjectInfoPage.cpp:294
+msgid "Organization:"
+msgstr "Organization:"
+
+#: clientgui/ProjectInfoPage.cpp:304
+msgid "Web site:"
+msgstr "Web site:"
+
+#: clientgui/ProjectInfoPage.cpp:315
+msgid "Supported systems:"
+msgstr "Supported systems:"
+
+#: clientgui/ProjectInfoPage.cpp:352
+msgid "Project URL:"
+msgstr "Project URL:"
+
+#: clientgui/ProjectInfoPage.cpp:486 clientgui/ProjectInfoPage.cpp:686
+#: clientgui/ProjectInfoPage.cpp:690
+msgid "All"
+msgstr "All"
+
+#: clientgui/ProjectInfoPage.cpp:735
+msgid ""
+"This project may not have work for your type of computer.  Do you want to "
+"add it anyway?"
+msgstr "This project may not have work for your type of computer.  Do you want to add it anyway?"
+
+#: clientgui/ProjectInfoPage.cpp:767
+msgid "You already added this project. Please choose a different project."
+msgstr "You already added this project. Please choose a different project."
+
+#: clientgui/ProjectProcessingPage.cpp:321
+msgid "Communicating with project."
+msgstr "Communicating with project."
+
+#: clientgui/ProjectProcessingPage.cpp:509
+msgid "Required files not found on the server."
+msgstr "Required files not found on the server."
+
+#: clientgui/ProjectProcessingPage.cpp:512
+#: clientgui/ProjectProcessingPage.cpp:585
+msgid "An internal server error has occurred."
+msgstr "An internal server error has occurred."
+
+#: clientgui/ProjectPropertiesPage.cpp:334
+msgid ""
+"Communicating with project\n"
+"Please wait..."
+msgstr "Communicating with project\nPlease wait..."
+
+#: clientgui/ProjectWelcomePage.cpp:251
+#, c-format
+msgid "Welcome to %s."
+msgstr "Welcome to %s."
+
+#: clientgui/ProjectWelcomePage.cpp:254
+msgid "You have volunteered to compute for this project:"
+msgstr "You have volunteered to compute for this project:"
+
+#: clientgui/ProjectWelcomePage.cpp:255
+msgid "Name:"
+msgstr "Name:"
+
+#: clientgui/ProjectWelcomePage.cpp:258
+msgid "Home:"
+msgstr "Home:"
+
+#: clientgui/ProjectWelcomePage.cpp:262
+msgid "Description:"
+msgstr "Description:"
+
+#: clientgui/ProjectWelcomePage.cpp:265
+msgid "URL:"
+msgstr "URL:"
+
+#: clientgui/ProjectWelcomePage.cpp:268
+msgid "User:"
+msgstr "User:"
+
+#: clientgui/ProjectWelcomePage.cpp:273
+msgid ""
+"WARNING: This project is not registered with BOINC.  Make sure you trust it "
+"before continuing."
+msgstr "WARNING: This project is not registered with BOINC.  Make sure you trust it before continuing."
+
+#: clientgui/ProjectWelcomePage.cpp:277
+msgid "To continue, click Next."
+msgstr "To continue, click Next."
+
+#: clientgui/ProxyInfoPage.cpp:195
+msgid "Network communication failure"
+msgstr "Network communication failure"
+
+#: clientgui/ProxyInfoPage.cpp:199
+msgid ""
+"The World Community Grid - BOINC software failed to communicate\n"
+"over the Internet. The most likely reasons are:\n"
+"\n"
+"1) Connectivity problem.  Check your network or modem connection\n"
+"and then click Back to try again.\n"
+"\n"
+"2) Personal firewall software is blocking the World Community\n"
+"Grid - BOINC software.  Configure your personal firewall to let\n"
+"BOINC and BOINC Manager communicate on port 80 and port 443,\n"
+"then click Back to try again.\n"
+"\n"
+"3) You are using a proxy server.\n"
+"Click Next to configure BOINC's proxy settings."
+msgstr "The World Community Grid - BOINC software failed to communicate\nover the Internet. The most likely reasons are:\n\n1) Connectivity problem.  Check your network or modem connection\nand then click Back to try again.\n\n2) Personal firewall software is blocking the World Community\nGrid - BOINC software.  Configure your personal firewall to let\nBOINC and BOINC Manager communicate on port 80 and port 443,\nthen click Back to try again.\n\n3) You are using a proxy server.\nClick Ne [...]
+
+#: clientgui/ProxyInfoPage.cpp:203
+msgid ""
+"BOINC failed to communicate on the Internet.\n"
+"The most likely reasons are:\n"
+"\n"
+"1) Connectivity problem.  Check your network\n"
+"or modem connection and then click Back to try again.\n"
+"\n"
+"2) Personal firewall software is blocking BOINC.\n"
+"Configure your personal firewall to let BOINC and\n"
+"BOINC Manager communicate on port 80,\n"
+"then click Back to try again.\n"
+"\n"
+"3) You are using a proxy server.\n"
+"Click Next to configure BOINC's proxy settings."
+msgstr "BOINC failed to communicate on the Internet.\nThe most likely reasons are:\n\n1) Connectivity problem.  Check your network\nor modem connection and then click Back to try again.\n\n2) Personal firewall software is blocking BOINC.\nConfigure your personal firewall to let BOINC and\nBOINC Manager communicate on port 80,\nthen click Back to try again.\n\n3) You are using a proxy server.\nClick Next to configure BOINC's proxy settings."
+
+#: clientgui/ProxyPage.cpp:331
+msgid "Proxy configuration"
+msgstr "Proxy configuration"
+
+#: clientgui/ProxyPage.cpp:334
+msgid "HTTP proxy"
+msgstr "HTTP proxy"
+
+#: clientgui/ProxyPage.cpp:337 clientgui/ProxyPage.cpp:357
+msgid "Server:"
+msgstr "Server:"
+
+#: clientgui/ProxyPage.cpp:350
+msgid "Autodetect"
+msgstr "Autodetect"
+
+#: clientgui/ProxyPage.cpp:354
+msgid "SOCKS proxy"
+msgstr "SOCKS proxy"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:166
+msgid "Skin"
+msgstr "Skin"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:168
+msgid "Select the appearance of the user interface."
+msgstr "Select the appearance of the user interface."
+
+#: clientgui/sg_BoincSimpleFrame.cpp:179
+msgid "Display diagnostic messages."
+msgstr "Display diagnostic messages."
+
+#: clientgui/sg_BoincSimpleFrame.cpp:184
+msgid "Advanced View...\tCtrl+Shift+A"
+msgstr "Advanced View...\tCtrl+Shift+A"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:185
+msgid "Display the advanced graphical interface."
+msgstr "Display the advanced graphical interface."
+
+#: clientgui/sg_BoincSimpleFrame.cpp:201
+msgid "Configure display options and proxy settings"
+msgstr "Configure display options and proxy settings"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:222
+#, c-format
+msgid "&%s"
+msgstr "&%s"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:396
+msgid "Default"
+msgstr "Default"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:838
+msgid "Suspend"
+msgstr "Suspend"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:840
+msgid "Suspend Computing"
+msgstr "Suspend Computing"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:841
+msgid "Resume Computing"
+msgstr "Resume Computing"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:857
+msgid "Notices"
+msgstr "Notices"
+
+#: 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/sg_BoincSimpleFrame.cpp:879
+#, c-format
+msgid "Get help with %s"
+msgstr "Get help with %s"
+
+#: clientgui/sg_DlgMessages.cpp:124
+msgid "Fetching notices; please wait..."
+msgstr "Fetching notices; please wait..."
+
+#: clientgui/sg_DlgMessages.cpp:132
+msgid "There are no notices at this time."
+msgstr "There are no notices at this time."
+
+#: 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:187
+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:289
+msgid "GB of disk space"
+msgstr "GB of disk space"
+
+#: clientgui/sg_DlgPreferences.cpp:980
+#, c-format
+msgid "%s - Computing Preferences"
+msgstr "%s - Computing Preferences"
+
+#: 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/sg_ProjectCommandPopup.cpp:66
+msgid "Update"
+msgstr "Update"
+
+#: 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/sg_ProjectCommandPopup.cpp:73
+#: clientgui/sg_ProjectCommandPopup.cpp:129
+msgid "Suspend tasks for this project."
+msgstr "Suspend tasks for this project."
+
+#: clientgui/sg_ProjectCommandPopup.cpp:78
+#: clientgui/sg_ProjectCommandPopup.cpp:136
+msgid "No new tasks"
+msgstr "No new tasks"
+
+#: 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
+msgid "Reset project"
+msgstr "Reset project"
+
+#: 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
+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/sg_ProjectCommandPopup.cpp:96
+#: clientgui/sg_TaskCommandPopup.cpp:84
+msgid "Properties"
+msgstr "Properties"
+
+#: 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/sg_ProjectCommandPopup.cpp:134
+msgid "Allow fetching new tasks for this project."
+msgstr "Allow fetching new tasks for this project."
+
+#: 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:251 clientgui/ViewTransfers.cpp:215
+#: clientgui/ViewWork.cpp:262
+msgid "Status"
+msgstr "Status"
+
+#: clientgui/ViewProjects.cpp:330
+msgid "Projects"
+msgstr "Projects"
+
+#: clientgui/ViewProjects.cpp:382
+msgid "Updating project..."
+msgstr "Updating project..."
+
+#: clientgui/ViewProjects.cpp:424
+msgid "Resuming project..."
+msgstr "Resuming project..."
+
+#: clientgui/ViewProjects.cpp:428
+msgid "Suspending project..."
+msgstr "Suspending project..."
+
+#: clientgui/ViewProjects.cpp:465
+msgid "Telling project to allow additional task downloads..."
+msgstr "Telling project to allow additional task downloads..."
+
+#: clientgui/ViewProjects.cpp:469
+msgid "Telling project to not fetch any additional tasks..."
+msgstr "Telling project to not fetch any additional tasks..."
+
+#: clientgui/ViewProjects.cpp:505
+msgid "Resetting project..."
+msgstr "Resetting project..."
+
+#: clientgui/ViewProjects.cpp:563
+msgid "Removing project..."
+msgstr "Removing project..."
+
+#: clientgui/ViewProjects.cpp:623 clientgui/ViewWork.cpp:686
+msgid "Launching browser..."
+msgstr "Launching browser..."
+
+#: clientgui/ViewProjects.cpp:1140
+msgid "Requested by user"
+msgstr "Requested by user"
+
+#: clientgui/ViewProjects.cpp:1141
+msgid "To fetch work"
+msgstr "To fetch work"
+
+#: clientgui/ViewProjects.cpp:1142
+msgid "To report completed tasks"
+msgstr "To report completed tasks"
+
+#: clientgui/ViewProjects.cpp:1143
+msgid "To send trickle-up message"
+msgstr "To send trickle-up message"
+
+#: clientgui/ViewProjects.cpp:1144
+msgid "Requested by account manager"
+msgstr "Requested by account manager"
+
+#: clientgui/ViewProjects.cpp:1145
+msgid "Project initialization"
+msgstr "Project initialization"
+
+#: clientgui/ViewProjects.cpp:1146
+msgid "Requested by project"
+msgstr "Requested by project"
+
+#: clientgui/ViewProjects.cpp:1147
+msgid "Unknown reason"
+msgstr "Unknown reason"
+
+#: clientgui/ViewProjects.cpp:1161
+msgid "Suspended by user"
+msgstr "Suspended by user"
+
+#: clientgui/ViewProjects.cpp:1164
+msgid "Won't get new tasks"
+msgstr "Won't get new tasks"
+
+#: clientgui/ViewProjects.cpp:1167
+msgid "Project ended - OK to remove"
+msgstr "Project ended - OK to remove"
+
+#: clientgui/ViewProjects.cpp:1170
+msgid "Will remove when tasks done"
+msgstr "Will remove when tasks done"
+
+#: clientgui/ViewProjects.cpp:1173
+msgid "Scheduler request pending"
+msgstr "Scheduler request pending"
+
+#: clientgui/ViewProjects.cpp:1179
+msgid "Scheduler request in progress"
+msgstr "Scheduler request in progress"
+
+#: clientgui/ViewProjects.cpp:1182
+msgid "Trickle up message pending"
+msgstr "Trickle up message pending"
+
+#: clientgui/ViewProjects.cpp:1188
+msgid "Communication deferred "
+msgstr "Communication deferred "
+
+#: clientgui/ViewResources.cpp:62
+msgid "Total disk usage"
+msgstr "Total disk usage"
+
+#: clientgui/ViewResources.cpp:83
+msgid "Disk usage by BOINC projects"
+msgstr "Disk usage by BOINC projects"
+
+#: clientgui/ViewResources.cpp:225
+msgid "no projects: 0 bytes used"
+msgstr "no projects: 0 bytes used"
+
+#: clientgui/ViewResources.cpp:259
+msgid "used by BOINC: "
+msgstr "used by BOINC: "
+
+#: clientgui/ViewResources.cpp:269
+msgid "free, available to BOINC: "
+msgstr "free, available to BOINC: "
+
+#: clientgui/ViewResources.cpp:279
+msgid "free, not available to BOINC: "
+msgstr "free, not available to BOINC: "
+
+#: clientgui/ViewResources.cpp:289
+msgid "free: "
+msgstr "free: "
+
+#: clientgui/ViewResources.cpp:299
+msgid "used by other programs: "
+msgstr "used by other programs: "
+
+#: clientgui/ViewStatistics.cpp:1181
+msgid "User Total"
+msgstr "User Total"
+
+#: clientgui/ViewStatistics.cpp:1182
+msgid "User Average"
+msgstr "User Average"
+
+#: clientgui/ViewStatistics.cpp:1183
+msgid "Host Total"
+msgstr "Host Total"
+
+#: clientgui/ViewStatistics.cpp:1184
+msgid "Host Average"
+msgstr "Host Average"
+
+#: clientgui/ViewStatistics.cpp:1331
+#, c-format
+msgid "Last update: %.0f days ago"
+msgstr "Last update: %.0f days ago"
+
+#: clientgui/ViewStatistics.cpp:1956
+msgid "Show user total"
+msgstr "Show user total"
+
+#: clientgui/ViewStatistics.cpp:1957
+msgid "Show total credit for user"
+msgstr "Show total credit for user"
+
+#: clientgui/ViewStatistics.cpp:1963
+msgid "Show user average"
+msgstr "Show user average"
+
+#: clientgui/ViewStatistics.cpp:1964
+msgid "Show average credit for user"
+msgstr "Show average credit for user"
+
+#: clientgui/ViewStatistics.cpp:1970
+msgid "Show host total"
+msgstr "Show host total"
+
+#: clientgui/ViewStatistics.cpp:1971
+msgid "Show total credit for host"
+msgstr "Show total credit for host"
+
+#: clientgui/ViewStatistics.cpp:1977
+msgid "Show host average"
+msgstr "Show host average"
+
+#: clientgui/ViewStatistics.cpp:1978
+msgid "Show average credit for host"
+msgstr "Show average credit for host"
+
+#: clientgui/ViewStatistics.cpp:1987
+msgid "< &Previous project"
+msgstr "< &Previous project"
+
+#: clientgui/ViewStatistics.cpp:1988
+msgid "Show chart for previous project"
+msgstr "Show chart for previous project"
+
+#: clientgui/ViewStatistics.cpp:1993
+msgid "&Next project >"
+msgstr "&Next project >"
+
+#: clientgui/ViewStatistics.cpp:1994
+msgid "Show chart for next project"
+msgstr "Show chart for next project"
+
+#: clientgui/ViewStatistics.cpp:2000 clientgui/ViewStatistics.cpp:2390
+msgid "Hide project list"
+msgstr "Hide project list"
+
+#: clientgui/ViewStatistics.cpp:2001 clientgui/ViewStatistics.cpp:2390
+msgid "Use entire area for graphs"
+msgstr "Use entire area for graphs"
+
+#: clientgui/ViewStatistics.cpp:2006
+msgid "Mode view"
+msgstr "Mode view"
+
+#: clientgui/ViewStatistics.cpp:2010
+msgid "One project"
+msgstr "One project"
+
+#: clientgui/ViewStatistics.cpp:2011
+msgid "Show one chart with selected project"
+msgstr "Show one chart with selected project"
+
+#: clientgui/ViewStatistics.cpp:2017
+msgid "All projects (separate)"
+msgstr "All projects (separate)"
+
+#: clientgui/ViewStatistics.cpp:2018
+msgid "Show all projects, one chart per project"
+msgstr "Show all projects, one chart per project"
+
+#: clientgui/ViewStatistics.cpp:2024
+msgid "All projects (together)"
+msgstr "All projects (together)"
+
+#: clientgui/ViewStatistics.cpp:2025
+msgid "Show one chart with all projects"
+msgstr "Show one chart with all projects"
+
+#: clientgui/ViewStatistics.cpp:2031
+msgid "All projects (sum)"
+msgstr "All projects (sum)"
+
+#: clientgui/ViewStatistics.cpp:2032
+msgid "Show one chart with sum of projects"
+msgstr "Show one chart with sum of projects"
+
+#: clientgui/ViewStatistics.cpp:2053
+msgid "Statistics"
+msgstr "Statistics"
+
+#: 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 "Updating charts..."
+
+#: clientgui/ViewStatistics.cpp:2394
+msgid "Show project list"
+msgstr "Show project list"
+
+#: clientgui/ViewStatistics.cpp:2394
+msgid "Uses smaller area for graphs"
+msgstr "Uses smaller area for graphs"
+
+#: clientgui/ViewTransfers.cpp:187
+msgid "Retry Now"
+msgstr "Retry Now"
+
+#: clientgui/ViewTransfers.cpp:188
+msgid "Retry the file transfer now"
+msgstr "Retry the file transfer now"
+
+#: clientgui/ViewTransfers.cpp:194
+msgid "Abort Transfer"
+msgstr "Abort Transfer"
+
+#: clientgui/ViewTransfers.cpp:195
+msgid "Abort this file transfer.  You won't get credit for the task."
+msgstr "Abort this file transfer.  You won't get credit for the task."
+
+#: clientgui/ViewTransfers.cpp:210
+msgid "File"
+msgstr "File"
+
+#: clientgui/ViewTransfers.cpp:211 clientgui/ViewWork.cpp:261
+msgid "Progress"
+msgstr "Progress"
+
+#: clientgui/ViewTransfers.cpp:212
+msgid "Size"
+msgstr "Size"
+
+#: clientgui/ViewTransfers.cpp:213 clientgui/ViewWork.cpp:263
+msgid "Elapsed"
+msgstr "Elapsed"
+
+#: clientgui/ViewTransfers.cpp:214
+msgid "Speed"
+msgstr "Speed"
+
+#: clientgui/ViewTransfers.cpp:295
+msgid "Transfers"
+msgstr "Transfers"
+
+#: clientgui/ViewTransfers.cpp:362
+msgid "Network activity is suspended - "
+msgstr "Network activity is suspended - "
+
+#: clientgui/ViewTransfers.cpp:364
+msgid ""
+".\n"
+"You can enable it using the Activity menu."
+msgstr ".\nYou can enable it using the Activity menu."
+
+#: clientgui/ViewTransfers.cpp:367
+msgid "BOINC"
+msgstr "BOINC"
+
+#: 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: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: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: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: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/WelcomePage.cpp:284
+msgid "Add project or account manager"
+msgstr "Add project or account manager"
+
+#: clientgui/WelcomePage.cpp:288
+msgid "Add project or use BOINC Account Manager"
+msgstr "Add project or use BOINC Account Manager"
+
+#: 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/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/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/WelcomePage.cpp:339
+msgid "Use a BOINC Account Manager"
+msgstr "Use a BOINC Account Manager"
+
+#: clientgui/WelcomePage.cpp:358
+msgid "Add or change your World Community Grid projects"
+msgstr "Add or change your World Community Grid projects"
+
+#: clientgui/WelcomePage.cpp:361
+msgid "Add projects run by other researchers or organizations"
+msgstr "Add projects run by other researchers or organizations"
+
+#: clientgui/WizardAttach.cpp:560
+msgid "Do you really want to cancel?"
+msgstr "Do you really want to cancel?"
+
+#: clientgui/WizardAttach.cpp:561
+msgid "Question"
+msgstr "Question"
+
+#: clientgui/wizardex.cpp:377 clientgui/wizardex.cpp:553
+msgid "&Next >"
+msgstr "&Next >"
+
+#: clientgui/wizardex.cpp:383
+msgid "< &Back"
+msgstr "< &Back"
+
+#: clientgui/wizardex.cpp:553
+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."
+
+#: clientgui/DlgAdvPreferencesBase.h:46
+msgid "On this day of the week, transfer files only during these hours."
+msgstr "On this day of the week, transfer files only during these hours."
diff --git a/locale/en/BOINC-Project-Generic.po b/locale/en/BOINC-Project-Generic.po
new file mode 100644
index 0000000..a021104
--- /dev/null
+++ b/locale/en/BOINC-Project-Generic.po
@@ -0,0 +1,6453 @@
+# BOINC web translation
+# Copyright (C) 2008 University of California
+# 
+# This file is distributed under the same license as BOINC.
+# 
+# FileID  : $Id$
+# 
+# Translators:
+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-03 12:00 PST\n"
+"PO-Revision-Date: 2015-03-03 20:02+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"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "LANG_NAME_NATIVE"
+msgstr "LANG_NAME_NATIVE"
+
+msgid "LANG_NAME_INTERNATIONAL"
+msgstr "LANG_NAME_INTERNATIONAL"
+
+#: ../inc/account.inc:38
+msgid "Invitation Code"
+msgstr "Invitation Code"
+
+#: ../inc/account.inc:38
+msgid "A valid invitation code is required to create an account."
+msgstr "A valid invitation code is required to create an account."
+
+#: ../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 "Identifies you on our web site. Use your real name or a nickname."
+
+#: ../inc/account.inc:48
+msgid "Email Address"
+msgstr "Email Address"
+
+#: ../inc/account.inc:48
+msgid "Must be a valid address of the form 'name at domain'."
+msgstr "Must be a valid address of the form 'name at domain'."
+
+#: ../inc/account.inc:57 ../user/edit_email_form.php:47
+msgid "Password"
+msgstr "Password"
+
+#: ../inc/account.inc:58
+msgid "Must be at least %1 characters"
+msgstr "Must be at least %1 characters"
+
+#: ../inc/account.inc:61
+msgid "Confirm password"
+msgstr "Confirm password"
+
+#: ../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 "Country"
+
+#: ../inc/account.inc:63 ../user/account_finish.php:45
+msgid "Select the country you want to represent, if any."
+msgstr "Select the country you want to represent, if any."
+
+#: ../inc/account.inc:70 ../user/account_finish.php:51
+msgid "Postal or ZIP Code"
+msgstr "Postal or ZIP Code"
+
+#: ../inc/account.inc:70 ../user/account_finish.php:51
+msgid "Optional"
+msgstr "Optional"
+
+#: ../inc/account.inc:86
+msgid "Create account"
+msgstr "Create account"
+
+#: ../inc/account.inc:101
+msgid "Email address:"
+msgstr "Email address:"
+
+#: ../inc/account.inc:103
+msgid "forgot email address?"
+msgstr "forgot email address?"
+
+#: ../inc/account.inc:106
+msgid "Password:"
+msgstr "Password:"
+
+#: ../inc/account.inc:106
+msgid "forgot password?"
+msgstr "forgot password?"
+
+#: ../inc/account.inc:109
+msgid "Stay logged in"
+msgstr "Stay logged in"
+
+#: ../inc/account.inc:114 ../inc/util.inc:238 ../user/login_form.php:41
+msgid "Log in"
+msgstr "Log in"
+
+#: ../inc/bbcode_html.inc:11
+msgid "Bold text: [b]text[/b]  (alt+b)"
+msgstr "Bold text: [b]text[/b]  (alt+b)"
+
+#: ../inc/bbcode_html.inc:14
+msgid "Italic text: [i]text[/i]  (alt+i)"
+msgstr "Italic text: [i]text[/i]  (alt+i)"
+
+#: ../inc/bbcode_html.inc:17
+msgid "Underline text: [u]text[/u]  (alt+u)"
+msgstr "Underline text: [u]text[/u]  (alt+u)"
+
+#: ../inc/bbcode_html.inc:20
+msgid "Strikethrough text: [s]text[/s]  (alt+k)"
+msgstr "Strikethrough text: [s]text[/s]  (alt+k)"
+
+#: ../inc/bbcode_html.inc:23
+msgid "Quote text: [quote]text[/quote]  (alt+q)"
+msgstr "Quote text: [quote]text[/quote]  (alt+q)"
+
+#: ../inc/bbcode_html.inc:26
+msgid "Code display: [code]code[/code]  (alt+c)"
+msgstr "Code display: [code]code[/code]  (alt+c)"
+
+#: ../inc/bbcode_html.inc:29
+msgid "List: [list]text[/list] (alt+l)"
+msgstr "List: [list]text[/list] (alt+l)"
+
+#: ../inc/bbcode_html.inc:32
+msgid "Ordered list: [list=]text[/list]  (alt+o)"
+msgstr "Ordered list: [list=]text[/list]  (alt+o)"
+
+#: ../inc/bbcode_html.inc:35
+msgid "Insert image: [img]http://image_url[/img]  (alt+p)"
+msgstr "Insert image: [img]http://image_url[/img]  (alt+p)"
+
+#: ../inc/bbcode_html.inc:38
+msgid ""
+"Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url]  (alt+w)"
+msgstr "Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url]  (alt+w)"
+
+#: ../inc/bbcode_html.inc:45
+msgid "Font color"
+msgstr "Font color"
+
+#: ../inc/bbcode_html.inc:46
+msgid ""
+"Font color: [color=red]text[/color]  Tip: you can also use color=#FF0000"
+msgstr "Font color: [color=red]text[/color]  Tip: you can also use color=#FF0000"
+
+#: ../inc/bbcode_html.inc:47 ../inc/bbcode_html.inc:62
+#: ../inc/prefs_util.inc:546
+msgid "Default"
+msgstr "Default"
+
+#: ../inc/bbcode_html.inc:48
+msgid "Dark Red"
+msgstr "Dark Red"
+
+#: ../inc/bbcode_html.inc:49
+msgid "Red"
+msgstr "Red"
+
+#: ../inc/bbcode_html.inc:50
+msgid "Orange"
+msgstr "Orange"
+
+#: ../inc/bbcode_html.inc:51
+msgid "Brown"
+msgstr "Brown"
+
+#: ../inc/bbcode_html.inc:52
+msgid "Yellow"
+msgstr "Yellow"
+
+#: ../inc/bbcode_html.inc:53
+msgid "Green"
+msgstr "Green"
+
+#: ../inc/bbcode_html.inc:54
+msgid "Olive"
+msgstr "Olive"
+
+#: ../inc/bbcode_html.inc:55
+msgid "Cyan"
+msgstr "Cyan"
+
+#: ../inc/bbcode_html.inc:56
+msgid "Blue"
+msgstr "Blue"
+
+#: ../inc/bbcode_html.inc:57
+msgid "Dark Blue"
+msgstr "Dark Blue"
+
+#: ../inc/bbcode_html.inc:58
+msgid "Indigo"
+msgstr "Indigo"
+
+#: ../inc/bbcode_html.inc:59
+msgid "Violet"
+msgstr "Violet"
+
+#: ../inc/bbcode_html.inc:60
+msgid "Font size"
+msgstr "Font size"
+
+#: ../inc/bbcode_html.inc:61
+msgid "Font size: [size=x-small]small text[/size]"
+msgstr "Font size: [size=x-small]small text[/size]"
+
+#: ../inc/bbcode_html.inc:63
+msgid "Small"
+msgstr "Small"
+
+#: ../inc/bbcode_html.inc:64
+msgid "Normal"
+msgstr "Normal"
+
+#: ../inc/bbcode_html.inc:65
+msgid "Large"
+msgstr "Large"
+
+#: ../inc/bbcode_html.inc:68
+msgid "Close all open bbCode tags"
+msgstr "Close all open bbCode tags"
+
+#: ../inc/bbcode_html.inc:68
+msgid "Close Tags"
+msgstr "Close Tags"
+
+#: ../inc/forum.inc:38
+msgid "Oldest first"
+msgstr "Oldest first"
+
+#: ../inc/forum.inc:39 ../inc/forum.inc:45
+msgid "Newest first"
+msgstr "Newest first"
+
+#: ../inc/forum.inc:40
+msgid "Highest rated posts first"
+msgstr "Highest rated posts first"
+
+#: ../inc/forum.inc:42
+msgid "Newest post first"
+msgstr "Newest post first"
+
+#: ../inc/forum.inc:43
+msgid "Most views first"
+msgstr "Most views first"
+
+#: ../inc/forum.inc:44
+msgid "Most posts first"
+msgstr "Most posts first"
+
+#: ../inc/forum.inc:126
+msgid "Search for words in forum messages"
+msgstr "Search for words in forum messages"
+
+#: ../inc/forum.inc:126
+msgid "Search forums"
+msgstr "Search forums"
+
+#: ../inc/forum.inc:127
+msgid "Advanced search"
+msgstr "Advanced search"
+
+#: ../inc/forum.inc:133 ../inc/user.inc:325 ../user/pm.php:69
+#: ../user/pm.php:138
+msgid "Private messages"
+msgstr "Private messages"
+
+#: ../inc/forum.inc:152 ../user/forum_forum.php:74
+#: ../user/sample_index.php:128
+msgid "Questions and Answers"
+msgstr "Questions and Answers"
+
+#: ../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 "Message boards"
+
+#: ../inc/forum.inc:188 ../inc/forum.inc:196
+msgid "%1 message board"
+msgstr "%1 message board"
+
+#: ../inc/forum.inc:246 ../inc/result.inc:717
+msgid "Previous"
+msgstr "Previous"
+
+#: ../inc/forum.inc:284 ../inc/result.inc:726
+msgid "Next"
+msgstr "Next"
+
+#: ../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 "Author"
+
+#: ../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:583
+msgid "Send message"
+msgstr "Send message"
+
+#: ../inc/forum.inc:583
+msgid "Send %1 a private message"
+msgstr "Send %1 a private message"
+
+#: ../inc/forum.inc:584
+msgid "Joined: %1"
+msgstr "Joined: %1"
+
+#: ../inc/forum.inc:593
+msgid "Posts: %1"
+msgstr "Posts: %1"
+
+#: ../inc/forum.inc:599
+msgid "Credit: %1"
+msgstr "Credit: %1"
+
+#: ../inc/forum.inc:600
+msgid "RAC: %1"
+msgstr "RAC: %1"
+
+#: ../inc/forum.inc:624
+msgid "You haven't read this message yet"
+msgstr "You haven't read this message yet"
+
+#: ../inc/forum.inc:624
+msgid "Unread"
+msgstr "Unread"
+
+#: ../inc/forum.inc:627 ../inc/forum.inc:632 ../inc/forum.inc:731
+msgid "Message %1"
+msgstr "Message %1"
+
+#: ../inc/forum.inc:628 ../inc/user.inc:409 ../user/forum_forum.php:178
+msgid "hidden"
+msgstr "hidden"
+
+#: ../inc/forum.inc:629
+msgid "Posted: %1"
+msgstr "Posted: %1"
+
+#: ../inc/forum.inc:632
+msgid " - in response to "
+msgstr " - in response to "
+
+#: ../inc/forum.inc:635
+msgid "Edit"
+msgstr "Edit"
+
+#: ../inc/forum.inc:635
+msgid "Edit this message"
+msgstr "Edit this message"
+
+#: ../inc/forum.inc:641
+msgid "Last modified: %1"
+msgstr "Last modified: %1"
+
+#: ../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 "This post is not shown because the sender is on your 'ignore' list.  Click %1here%2 to view this post"
+
+#: ../inc/forum.inc:672 ../inc/forum.inc:683
+msgid "Report this post as offensive"
+msgstr "Report this post as offensive"
+
+#: ../inc/forum.inc:672 ../inc/forum.inc:683
+msgid "Report as offensive"
+msgstr "Report as offensive"
+
+#: ../inc/forum.inc:676
+msgid "Rating: %1"
+msgstr "Rating: %1"
+
+#: ../inc/forum.inc:676
+msgid "rate: "
+msgstr "rate: "
+
+#: ../inc/forum.inc:679
+msgid "Click if you like this message"
+msgstr "Click if you like this message"
+
+#: ../inc/forum.inc:679
+msgid "Rate +"
+msgstr "Rate +"
+
+#: ../inc/forum.inc:681
+msgid "Click if you don't like this message"
+msgstr "Click if you don't like this message"
+
+#: ../inc/forum.inc:681
+msgid "Rate -"
+msgstr "Rate -"
+
+#: ../inc/forum.inc:689 ../user/pm.php:111 ../user/pm.php:151
+msgid "Reply"
+msgstr "Reply"
+
+#: ../inc/forum.inc:689
+msgid "Post a reply to this message"
+msgstr "Post a reply to this message"
+
+#: ../inc/forum.inc:691
+msgid "Quote"
+msgstr "Quote"
+
+#: ../inc/forum.inc:691
+msgid "Post a reply by quoting this message"
+msgstr "Post a reply by quoting this message"
+
+#: ../inc/forum.inc:712
+msgid "Hidden by a moderator"
+msgstr "Hidden by a moderator"
+
+#: ../inc/forum.inc:733
+msgid "Posted %1 by %2"
+msgstr "Posted %1 by %2"
+
+#: ../inc/forum.inc:751
+msgid "You may not post or rate messages until %1"
+msgstr "You may not post or rate messages until %1"
+
+#: ../inc/forum.inc:762
+msgid ""
+"\n"
+"        <ul>\n"
+"        <li> Posts must be 'kid friendly': they may not contain\n"
+"            content that is obscene, hate-related,\n"
+"            sexually explicit or suggestive.\n"
+"        <li> No commercial advertisements.\n"
+"        <li> No links to web sites involving sexual content,\n"
+"            gambling, or intolerance of others.\n"
+"        <li> No messages intended to annoy or antagonize other people,\n"
+"            or to hijack a thread.\n"
+"        <li> No messages that are deliberately hostile or insulting.\n"
+"        <li> No abusive comments involving race, religion,\n"
+"            nationality, gender, class or sexuality.\n"
+"        "
+msgstr "\n        <ul>\n        <li> Posts must be 'kid friendly': they may not contain\n            content that is obscene, hate-related,\n            sexually explicit or suggestive.\n        <li> No commercial advertisements.\n        <li> No links to web sites involving sexual content,\n            gambling, or intolerance of others.\n        <li> No messages intended to annoy or antagonize other people,\n            or to hijack a thread.\n        <li> No messages that are delibera [...]
+
+#: ../inc/forum.inc:784
+msgid "Rules:"
+msgstr "Rules:"
+
+#: ../inc/forum.inc:785
+msgid "More info"
+msgstr "More info"
+
+#: ../inc/forum.inc:1082 ../user/forum_thread.php:190
+msgid "Unhide"
+msgstr "Unhide"
+
+#: ../inc/forum.inc:1082
+msgid "Unhide this post"
+msgstr "Unhide this post"
+
+#: ../inc/forum.inc:1084 ../user/forum_thread.php:196
+msgid "Hide"
+msgstr "Hide"
+
+#: ../inc/forum.inc:1084
+msgid "Hide this post"
+msgstr "Hide this post"
+
+#: ../inc/forum.inc:1089 ../user/forum_thread.php:229
+msgid "Move"
+msgstr "Move"
+
+#: ../inc/forum.inc:1089
+msgid "Move post to a different thread"
+msgstr "Move post to a different thread"
+
+#: ../inc/forum.inc:1094
+msgid "Banish author"
+msgstr "Banish author"
+
+#: ../inc/forum.inc:1101
+msgid "Vote to banish author"
+msgstr "Vote to banish author"
+
+#: ../inc/forum.inc:1105
+msgid "Vote not to banish author"
+msgstr "Vote not to banish author"
+
+#: ../inc/forum.inc:1110
+msgid "Start vote to banish author"
+msgstr "Start vote to banish author"
+
+#: ../inc/forum.inc:1115 ../inc/user.inc:312 ../user/forum_thread.php:243
+#: ../user/pm.php:112 ../user/pm.php:152
+msgid "Delete"
+msgstr "Delete"
+
+#: ../inc/forum.inc:1115
+msgid "Delete this post"
+msgstr "Delete this post"
+
+#: ../inc/forum.inc:1153
+msgid "Only team members can post to the team message board"
+msgstr "Only team members can post to the team message board"
+
+#: ../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 "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."
+
+#: ../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 "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."
+
+#: ../inc/forum.inc:1177
+msgid ""
+"This thread is locked. Only forum moderators and administrators are allowed "
+"to post there."
+msgstr "This thread is locked. Only forum moderators and administrators are allowed to post there."
+
+#: ../inc/forum.inc:1182
+msgid "Can't post to a hidden thread."
+msgstr "Can't post to a hidden thread."
+
+#: ../inc/forum.inc:1216
+msgid "Thread"
+msgstr "Thread"
+
+#: ../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:1219 ../user/forum_forum.php:141
+msgid "Views"
+msgstr "Views"
+
+#: ../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 "Last post"
+
+#: ../inc/forum.inc:1278
+msgid "New posts in the thread %1"
+msgstr "New posts in the thread %1"
+
+#: ../inc/forum.inc:1283
+msgid "New posts in subscribed thread"
+msgstr "New posts in subscribed thread"
+
+#: ../inc/forum.inc:1284
+msgid "There are new posts in the thread '%1'"
+msgstr "There are new posts in the thread '%1'"
+
+#: ../inc/forum.inc:1294
+msgid "Mark all threads as read"
+msgstr "Mark all threads as read"
+
+#: ../inc/forum.inc:1295
+msgid "Mark all threads in all message boards as read."
+msgstr "Mark all threads in all message boards as read."
+
+#: ../inc/host.inc:25
+msgid "No host"
+msgstr "No host"
+
+#: ../inc/host.inc:27
+msgid "Unavailable"
+msgstr "Unavailable"
+
+#: ../inc/host.inc:56 ../inc/prefs.inc:657 ../inc/prefs_util.inc:547
+msgid "Home"
+msgstr "Home"
+
+#: ../inc/host.inc:57 ../inc/prefs.inc:658 ../inc/prefs_util.inc:549
+#: ../user/server_status.php:138
+msgid "Work"
+msgstr "Work"
+
+#: ../inc/host.inc:58 ../inc/prefs.inc:659 ../inc/prefs_util.inc:548
+msgid "School"
+msgstr "School"
+
+#: ../inc/host.inc:60 ../user/edit_forum_preferences_form.php:161
+#: ../user/edit_forum_preferences_form.php:162
+msgid "Update"
+msgstr "Update"
+
+#: ../inc/host.inc:84
+msgid "Computer information"
+msgstr "Computer information"
+
+#: ../inc/host.inc:88 ../inc/host.inc:93
+msgid "IP address"
+msgstr "IP address"
+
+#: ../inc/host.inc:88
+msgid "(same the last %1 times)"
+msgstr "(same the last %1 times)"
+
+#: ../inc/host.inc:90
+msgid "External IP address"
+msgstr "External IP address"
+
+#: ../inc/host.inc:93
+msgid "Show IP address"
+msgstr "Show IP address"
+
+#: ../inc/host.inc:95
+msgid "Domain name"
+msgstr "Domain name"
+
+#: ../inc/host.inc:97
+msgid "Product name"
+msgstr "Product name"
+
+#: ../inc/host.inc:101
+msgid "Local Standard Time"
+msgstr "Local Standard Time"
+
+#: ../inc/host.inc:101
+msgid "UTC %1 hours"
+msgstr "UTC %1 hours"
+
+#: ../inc/host.inc:105 ../inc/host.inc:107 ../inc/host.inc:222
+msgid "Owner"
+msgstr "Owner"
+
+#: ../inc/host.inc:107 ../inc/host.inc:360
+msgid "Anonymous"
+msgstr "Anonymous"
+
+#: ../inc/host.inc:111 ../inc/result.inc:634 ../user/apps.php:56
+msgid "Created"
+msgstr "Created"
+
+#: ../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 "Total credit"
+
+#: ../inc/host.inc:113 ../inc/user.inc:126 ../user/team_search.php:83
+#: ../user/user_search.php:124
+msgid "Average credit"
+msgstr "Average credit"
+
+#: ../inc/host.inc:115
+msgid "Cross project credit"
+msgstr "Cross project credit"
+
+#: ../inc/host.inc:117
+msgid "CPU type"
+msgstr "CPU type"
+
+#: ../inc/host.inc:118
+msgid "Number of processors"
+msgstr "Number of processors"
+
+#: ../inc/host.inc:120
+msgid "Coprocessors"
+msgstr "Coprocessors"
+
+#: ../inc/host.inc:122 ../inc/host.inc:692
+msgid "Operating System"
+msgstr "Operating System"
+
+#: ../inc/host.inc:125 ../inc/host.inc:235
+msgid "BOINC version"
+msgstr "BOINC version"
+
+#: ../inc/host.inc:129 ../inc/prefs.inc:229
+msgid "Memory"
+msgstr "Memory"
+
+#: ../inc/host.inc:129 ../inc/host.inc:139
+msgid "%1 MB"
+msgstr "%1 MB"
+
+#: ../inc/host.inc:133
+msgid "Cache"
+msgstr "Cache"
+
+#: ../inc/host.inc:133
+msgid "%1 KB"
+msgstr "%1 KB"
+
+#: ../inc/host.inc:139
+msgid "Swap space"
+msgstr "Swap space"
+
+#: ../inc/host.inc:142
+msgid "Total disk space"
+msgstr "Total disk space"
+
+#: ../inc/host.inc:142 ../inc/host.inc:145
+msgid "%1 GB"
+msgstr "%1 GB"
+
+#: ../inc/host.inc:145
+msgid "Free Disk Space"
+msgstr "Free Disk Space"
+
+#: ../inc/host.inc:149
+msgid "Measured floating point speed"
+msgstr "Measured floating point speed"
+
+#: ../inc/host.inc:149 ../inc/host.inc:152
+msgid "%1 million ops/sec"
+msgstr "%1 million ops/sec"
+
+#: ../inc/host.inc:152
+msgid "Measured integer speed"
+msgstr "Measured integer speed"
+
+#: ../inc/host.inc:156 ../inc/host.inc:158
+msgid "Average upload rate"
+msgstr "Average upload rate"
+
+#: ../inc/host.inc:156 ../inc/host.inc:163
+msgid "%1 KB/sec"
+msgstr "%1 KB/sec"
+
+#: ../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 "Unknown"
+
+#: ../inc/host.inc:163 ../inc/host.inc:165
+msgid "Average download rate"
+msgstr "Average download rate"
+
+#: ../inc/host.inc:168 ../user/host_app_versions.php:65
+msgid "Average turnaround time"
+msgstr "Average turnaround time"
+
+#: ../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 days"
+
+#: ../inc/host.inc:169
+msgid "Application details"
+msgstr "Application details"
+
+#: ../inc/host.inc:170
+msgid "Show"
+msgstr "Show"
+
+#: ../inc/host.inc:180 ../inc/host.inc:341 ../inc/user.inc:155
+msgid "Tasks"
+msgstr "Tasks"
+
+#: ../inc/host.inc:184 ../inc/host.inc:206
+msgid "Number of times client has contacted server"
+msgstr "Number of times client has contacted server"
+
+#: ../inc/host.inc:185
+msgid "Last time contacted server"
+msgstr "Last time contacted server"
+
+#: ../inc/host.inc:186
+msgid "Fraction of time BOINC is running"
+msgstr "Fraction of time BOINC is running"
+
+#: ../inc/host.inc:188
+msgid ""
+"While BOINC is running, fraction of time computer has an Internet connection"
+msgstr "While BOINC is running, fraction of time computer has an Internet connection"
+
+#: ../inc/host.inc:190
+msgid "While BOINC is running, fraction of time computing is allowed"
+msgstr "While BOINC is running, fraction of time computing is allowed"
+
+#: ../inc/host.inc:191
+msgid "While is BOINC running, fraction of time GPU computing is allowed"
+msgstr "While is BOINC running, fraction of time GPU computing is allowed"
+
+#: ../inc/host.inc:193
+msgid "Average CPU efficiency"
+msgstr "Average CPU efficiency"
+
+#: ../inc/host.inc:196
+msgid "Task duration correction factor"
+msgstr "Task duration correction factor"
+
+#: ../inc/host.inc:198 ../inc/host.inc:679
+msgid "Location"
+msgstr "Location"
+
+#: ../inc/host.inc:200
+msgid "Delete this computer"
+msgstr "Delete this computer"
+
+#: ../inc/host.inc:204
+msgid "Merge duplicate records of this computer"
+msgstr "Merge duplicate records of this computer"
+
+#: ../inc/host.inc:204
+msgid "Merge"
+msgstr "Merge"
+
+#: ../inc/host.inc:207 ../inc/host.inc:694
+msgid "Last contact"
+msgstr "Last contact"
+
+#: ../inc/host.inc:220
+msgid "Computer info"
+msgstr "Computer info"
+
+#: ../inc/host.inc:221 ../inc/host.inc:681 ../inc/team.inc:366
+#: ../user/top_users.php:48
+msgid "Rank"
+msgstr "Rank"
+
+#: ../inc/host.inc:225 ../inc/host.inc:684
+msgid "Avg. credit"
+msgstr "Avg. credit"
+
+#: ../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 "Recent average credit"
+
+#: ../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:690
+msgid "GPU"
+msgstr "GPU"
+
+#: ../inc/host.inc:238
+msgid "Operating system"
+msgstr "Operating system"
+
+#: ../inc/host.inc:320
+msgid "(%1 processors)"
+msgstr "(%1 processors)"
+
+#: ../inc/host.inc:340
+msgid "Details"
+msgstr "Details"
+
+#: ../inc/host.inc:345
+msgid "Cross-project stats:"
+msgstr "Cross-project stats:"
+
+#: ../inc/host.inc:520
+msgid "Host %1 has overlapping lifetime:"
+msgstr "Host %1 has overlapping lifetime:"
+
+#: ../inc/host.inc:527
+msgid "Host %1 has an incompatible OS:"
+msgstr "Host %1 has an incompatible OS:"
+
+#: ../inc/host.inc:533
+msgid "Host %1 has an incompatible CPU:"
+msgstr "Host %1 has an incompatible CPU:"
+
+#: ../inc/host.inc:600
+msgid "same host"
+msgstr "same host"
+
+#: ../inc/host.inc:603
+msgid "Can't merge host %1 into %2 - they're incompatible"
+msgstr "Can't merge host %1 into %2 - they're incompatible"
+
+#: ../inc/host.inc:606
+msgid "Merging host %1 into host %2"
+msgstr "Merging host %1 into host %2"
+
+#: ../inc/host.inc:623
+msgid "Couldn't update credit of new computer"
+msgstr "Couldn't update credit of new computer"
+
+#: ../inc/host.inc:627
+msgid "Couldn't update results"
+msgstr "Couldn't update results"
+
+#: ../inc/host.inc:632
+msgid "Couldn't retire old computer"
+msgstr "Couldn't retire old computer"
+
+#: ../inc/host.inc:634
+msgid "Retired old computer %1"
+msgstr "Retired old computer %1"
+
+#: ../inc/host.inc:657 ../inc/host.inc:660
+msgid "Show:"
+msgstr "Show:"
+
+#: ../inc/host.inc:657 ../inc/host.inc:660
+msgid "All computers"
+msgstr "All computers"
+
+#: ../inc/host.inc:657 ../inc/host.inc:660
+msgid "Only computers active in past 30 days"
+msgstr "Only computers active in past 30 days"
+
+#: ../inc/host.inc:671 ../inc/result.inc:642
+msgid "Computer ID"
+msgstr "Computer ID"
+
+#: ../inc/host.inc:687
+msgid "BOINC<br>version"
+msgstr "BOINC<br>version"
+
+#: ../inc/host.inc:750 ../user/merge_by_name.php:65
+msgid "Merge computers by name"
+msgstr "Merge computers by name"
+
+#: ../inc/language_names.inc:62
+msgid "Browser default"
+msgstr "Browser default"
+
+#: ../inc/news.inc:40
+msgid "Comment"
+msgstr "Comment"
+
+#: ../inc/news.inc:111
+#, php-format
+msgid "News is available as an %sRSS feed%s"
+msgstr "News is available as an %sRSS feed%s"
+
+#: ../inc/pm.inc:25 ../inc/pm.inc:176 ../user/pm.php:69 ../user/pm.php:153
+msgid "Inbox"
+msgstr "Inbox"
+
+#: ../inc/pm.inc:26 ../inc/pm.inc:180
+msgid "Write"
+msgstr "Write"
+
+#: ../inc/pm.inc:33 ../inc/user.inc:458
+msgid "Send private message"
+msgstr "Send private message"
+
+#: ../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: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 "Preview"
+
+#: ../inc/pm.inc:48 ../user/pm.php:136
+msgid "no such message"
+msgstr "no such message"
+
+#: ../inc/pm.inc:82
+msgid "To"
+msgstr "To"
+
+#: ../inc/pm.inc:82
+msgid "User IDs or unique usernames, separated with commas"
+msgstr "User IDs or unique usernames, separated with commas"
+
+#: ../inc/pm.inc:85 ../user/pm.php:90 ../user/pm.php:144
+msgid "Subject"
+msgstr "Subject"
+
+#: ../inc/pm.inc:89
+msgid "Send message"
+msgstr "Send message"
+
+#: ../inc/pm.inc:122
+msgid "sent you a private message; subject:"
+msgstr "sent you a private message; subject:"
+
+#: ../inc/pm.inc:129
+msgid "Private message%1 from %2, subject:"
+msgstr "Private message%1 from %2, subject:"
+
+#: ../inc/pm.inc:137
+msgid "Couldn't create message"
+msgstr "Couldn't create message"
+
+#: ../inc/pm.inc:168
+msgid ""
+"You are not allowed to send privates messages so often. Please wait some "
+"time before sending more messages."
+msgstr "You are not allowed to send privates messages so often. Please wait some time before sending more messages."
+
+#: ../inc/pm.inc:178 ../user/forum_forum.php:190
+msgid "unread"
+msgstr "unread"
+
+#: ../inc/pm.inc:188
+msgid "For email notification, %1edit community prefs%2"
+msgstr "For email notification, %1edit community prefs%2"
+
+#: ../inc/pm.inc:204
+msgid "Private message"
+msgstr "Private message"
+
+#: ../inc/prefs.inc:45 ../inc/prefs.inc:179
+msgid "Usage limits"
+msgstr "Usage limits"
+
+#: ../inc/prefs.inc:47 ../inc/prefs.inc:53
+msgid "Use at most"
+msgstr "Use at most"
+
+#: ../inc/prefs.inc:48
+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."
+
+#: ../inc/prefs.inc:50
+#, php-format
+msgid "% of the CPUs"
+msgstr "% of the CPUs"
+
+#: ../inc/prefs.inc:54
+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/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."
+
+#: ../inc/prefs.inc:56
+#, php-format
+msgid "% of CPU time"
+msgstr "% of CPU time"
+
+#: ../inc/prefs.inc:58 ../inc/prefs.inc:200
+msgid "When to suspend"
+msgstr "When to suspend"
+
+#: ../inc/prefs.inc:60
+msgid "Suspend when computer is on battery"
+msgstr "Suspend when computer is on battery"
+
+#: ../inc/prefs.inc:61
+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."
+
+#: ../inc/prefs.inc:66
+msgid "Suspend when computer is in use"
+msgstr "Suspend when computer is in use"
+
+#: ../inc/prefs.inc:67
+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."
+
+#: ../inc/prefs.inc:72
+msgid "Suspend GPU computing when computer is in use"
+msgstr "Suspend GPU computing when computer is in use"
+
+#: ../inc/prefs.inc:73
+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."
+
+#: ../inc/prefs.inc:78
+msgid "'In use' means mouse/keyboard input in last"
+msgstr "'In use' means mouse/keyboard input in last"
+
+#: ../inc/prefs.inc:79
+msgid "This determines when the computer is considered 'in use'."
+msgstr "This determines when the computer is considered 'in use'."
+
+#: ../inc/prefs.inc:81 ../inc/prefs.inc:88 ../inc/prefs.inc:118
+msgid "minutes"
+msgstr "minutes"
+
+#: ../inc/prefs.inc:85
+msgid "Suspend when no mouse/keyboard input in last"
+msgstr "Suspend when no mouse/keyboard input in last"
+
+#: ../inc/prefs.inc:86
+msgid "This allows some computers to enter low-power mode when not in use."
+msgstr "This allows some computers to enter low-power mode when not in use."
+
+#: ../inc/prefs.inc:91
+msgid "Suspend when non-BOINC CPU usage is above"
+msgstr "Suspend when non-BOINC CPU usage is above"
+
+#: ../inc/prefs.inc:92
+msgid "Suspend computing when your computer is busy running other programs."
+msgstr "Suspend computing when your computer is busy running other programs."
+
+#: ../inc/prefs.inc:97
+msgid "Compute only between"
+msgstr "Compute only between"
+
+#: ../inc/prefs.inc:98
+msgid "Compute only during a particular period each day."
+msgstr "Compute only during a particular period each day."
+
+#: ../inc/prefs.inc:101 ../inc/prefs.inc:206
+#: ../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 "Other"
+
+#: ../inc/prefs.inc:103
+msgid "Store at least"
+msgstr "Store at least"
+
+#: ../inc/prefs.inc:104
+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."
+
+#: ../inc/prefs.inc:106 ../inc/prefs.inc:112
+msgid "days of work"
+msgstr "days of work"
+
+#: ../inc/prefs.inc:109
+msgid "Store up to an additional"
+msgstr "Store up to an additional"
+
+#: ../inc/prefs.inc:110
+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."
+
+#: ../inc/prefs.inc:115
+msgid "Switch between tasks about every"
+msgstr "Switch between tasks about every"
+
+#: ../inc/prefs.inc:116
+msgid "If you run several projects, BOINC may switch between them this often."
+msgstr "If you run several projects, BOINC may switch between them this often."
+
+#: ../inc/prefs.inc:121
+msgid "Request tasks to checkpoint at most every"
+msgstr "Request tasks to checkpoint at most every"
+
+#: ../inc/prefs.inc:122
+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."
+
+#: ../inc/prefs.inc:124
+msgid "seconds"
+msgstr "seconds"
+
+#: ../inc/prefs.inc:132 ../inc/prefs.inc:144
+msgid "Use no more than"
+msgstr "Use no more than"
+
+#: ../inc/prefs.inc:133
+msgid "Limit the total amount of disk space used by BOINC."
+msgstr "Limit the total amount of disk space used by BOINC."
+
+#: ../inc/prefs.inc:135
+msgid "GB"
+msgstr "GB"
+
+#: ../inc/prefs.inc:138
+msgid "Leave at least"
+msgstr "Leave at least"
+
+#: ../inc/prefs.inc:139
+msgid ""
+"Limit disk usage to leave this much free space on the volume where BOINC "
+"stores data."
+msgstr "Limit disk usage to leave this much free space on the volume where BOINC stores data."
+
+#: ../inc/prefs.inc:141
+msgid "GB free"
+msgstr "GB free"
+
+#: ../inc/prefs.inc:145
+msgid ""
+"Limit the percentage of disk space used by BOINC on the volume where it "
+"stores data."
+msgstr "Limit the percentage of disk space used by BOINC on the volume where it stores data."
+
+#: ../inc/prefs.inc:147
+#, php-format
+msgid "% of total"
+msgstr "% of total"
+
+#: ../inc/prefs.inc:153
+msgid "When computer is in use, use at most"
+msgstr "When computer is in use, use at most"
+
+#: ../inc/prefs.inc:154
+msgid "Limit the memory used by BOINC when you're using the computer."
+msgstr "Limit the memory used by BOINC when you're using the computer."
+
+#: ../inc/prefs.inc:156 ../inc/prefs.inc:162 ../inc/prefs.inc:174
+msgid "%"
+msgstr "%"
+
+#: ../inc/prefs.inc:159
+msgid "When computer is not in use, use at most"
+msgstr "When computer is not in use, use at most"
+
+#: ../inc/prefs.inc:160
+msgid "Limit the memory used by BOINC when you're not using the computer."
+msgstr "Limit the memory used by BOINC when you're not using the computer."
+
+#: ../inc/prefs.inc:165
+msgid "Leave non-GPU tasks in memory while suspended"
+msgstr "Leave non-GPU tasks in memory while suspended"
+
+#: ../inc/prefs.inc:166
+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."
+
+#: ../inc/prefs.inc:171
+msgid "Page/swap file: use at most"
+msgstr "Page/swap file: use at most"
+
+#: ../inc/prefs.inc:172
+msgid "Limit the swap space (page file) used by BOINC."
+msgstr "Limit the swap space (page file) used by BOINC."
+
+#: ../inc/prefs.inc:181
+msgid "Limit download rate to"
+msgstr "Limit download rate to"
+
+#: ../inc/prefs.inc:182
+msgid "Limit the download rate of file transfers."
+msgstr "Limit the download rate of file transfers."
+
+#: ../inc/prefs.inc:184 ../inc/prefs.inc:190
+msgid "KB/second"
+msgstr "KB/second"
+
+#: ../inc/prefs.inc:187
+msgid "Limit upload rate to"
+msgstr "Limit upload rate to"
+
+#: ../inc/prefs.inc:188
+msgid "Limit the upload rate of file transfers."
+msgstr "Limit the upload rate of file transfers."
+
+#: ../inc/prefs.inc:193
+msgid "Limit usage to"
+msgstr "Limit usage to"
+
+#: ../inc/prefs.inc:194
+msgid "Example: BOINC should transfer at most 2000 MB of data every 30 days."
+msgstr "Example: BOINC should transfer at most 2000 MB of data every 30 days."
+
+#: ../inc/prefs.inc:197
+msgid "MB every"
+msgstr "MB every"
+
+#: ../inc/prefs.inc:198 ../inc/util.inc:303
+msgid "days"
+msgstr "days"
+
+#: ../inc/prefs.inc:202
+msgid "Transfer files only between"
+msgstr "Transfer files only between"
+
+#: ../inc/prefs.inc:203
+msgid "Transfer files only during a particular period each day."
+msgstr "Transfer files only during a particular period each day."
+
+#: ../inc/prefs.inc:208
+msgid "Skip data verification for image files"
+msgstr "Skip data verification for image files"
+
+#: ../inc/prefs.inc:209
+msgid ""
+"Check this only if your Internet provider modifies image files. Skipping "
+"verification reduces the security of BOINC."
+msgstr "Check this only if your Internet provider modifies image files. Skipping verification reduces the security of BOINC."
+
+#: ../inc/prefs.inc:214
+msgid "Confirm before connecting to Internet"
+msgstr "Confirm before connecting to Internet"
+
+#: ../inc/prefs.inc:215 ../inc/prefs.inc:221
+msgid "Useful only if you have a modem, ISDN or VPN connection."
+msgstr "Useful only if you have a modem, ISDN or VPN connection."
+
+#: ../inc/prefs.inc:220
+msgid "Disconnect when done"
+msgstr "Disconnect when done"
+
+#: ../inc/prefs.inc:227 ../inc/prefs.inc:464 ../user/explain_state.php:94
+msgid "Computing"
+msgstr "Computing"
+
+#: ../inc/prefs.inc:228
+msgid "Disk"
+msgstr "Disk"
+
+#: ../inc/prefs.inc:230
+msgid "Network"
+msgstr "Network"
+
+#: ../inc/prefs.inc:233
+msgid ""
+"These preferences apply to all the BOINC projects in which you participate."
+msgstr "These preferences apply to all the BOINC projects in which you participate."
+
+#: ../inc/prefs.inc:236
+msgid ""
+"%1Unable to update preferences.%2 The values marked in red below were out of"
+" range or not numeric."
+msgstr "%1Unable to update preferences.%2 The values marked in red below were out of range or not numeric."
+
+#: ../inc/prefs.inc:475
+msgid "Separate preferences for %1"
+msgstr "Separate preferences for %1"
+
+#: ../inc/prefs.inc:485 ../inc/prefs.inc:520 ../inc/prefs_project.inc:291
+msgid "Edit preferences"
+msgstr "Edit preferences"
+
+#: ../inc/prefs.inc:486 ../user/edit_forum_preferences_form.php:149
+#: ../user/team_admins.php:36
+msgid "Remove"
+msgstr "Remove"
+
+#: ../inc/prefs.inc:491
+msgid "Add separate preferences for %1"
+msgstr "Add separate preferences for %1"
+
+#: ../inc/prefs.inc:498
+msgid "These settings apply to all computers using this account except"
+msgstr "These settings apply to all computers using this account except"
+
+#: ../inc/prefs.inc:500
+msgid ""
+"computers where you have set preferences locally using the BOINC Manager"
+msgstr "computers where you have set preferences locally using the BOINC Manager"
+
+#: ../inc/prefs.inc:502
+msgid "Android devices"
+msgstr "Android devices"
+
+#: ../inc/prefs.inc:505
+msgid "(Switch view)"
+msgstr "(Switch view)"
+
+#: ../inc/prefs.inc:507 ../inc/prefs_project.inc:272
+msgid "Combined preferences"
+msgstr "Combined preferences"
+
+#: ../inc/prefs.inc:514 ../inc/prefs_project.inc:283
+msgid "Primary (default) preferences"
+msgstr "Primary (default) preferences"
+
+#: ../inc/prefs.inc:529
+msgid "Preferences last modified:"
+msgstr "Preferences last modified:"
+
+#: ../inc/prefs.inc:545
+msgid "Add preferences"
+msgstr "Add preferences"
+
+#: ../inc/prefs.inc:549
+msgid "Update preferences"
+msgstr "Update preferences"
+
+#: ../inc/prefs.inc:620 ../project.sample/project_specific_prefs.inc:83
+#: ../project.sample/project_specific_prefs.inc:223
+msgid "yes"
+msgstr "yes"
+
+#: ../inc/prefs.inc:622 ../project.sample/project_specific_prefs.inc:85
+#: ../project.sample/project_specific_prefs.inc:223
+msgid "no"
+msgstr "no"
+
+#: ../inc/prefs.inc:630
+msgid "Default computer location"
+msgstr "Default computer location"
+
+#: ../inc/prefs.inc:631
+msgid ""
+"New computers will use this location for computing and project preferences."
+msgstr "New computers will use this location for computing and project preferences."
+
+#: ../inc/prefs_project.inc:52
+msgid "Resource share"
+msgstr "Resource share"
+
+#: ../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 "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."
+
+#: ../inc/prefs_project.inc:61
+msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
+msgstr "Accelerate GPU tasks by dedicating a CPU to each one?"
+
+#: ../inc/prefs_project.inc:70
+msgid "Use CPU"
+msgstr "Use CPU"
+
+#: ../inc/prefs_project.inc:79
+msgid "Use ATI GPU"
+msgstr "Use ATI GPU"
+
+#: ../inc/prefs_project.inc:88
+msgid "Use NVIDIA GPU"
+msgstr "Use NVIDIA GPU"
+
+#: ../inc/prefs_project.inc:97
+msgid "Use Intel GPU"
+msgstr "Use Intel GPU"
+
+#: ../inc/prefs_project.inc:107
+msgid "Run test applications?"
+msgstr "Run test applications?"
+
+#: ../inc/prefs_project.inc:108
+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"
+
+#: ../inc/prefs_project.inc:115
+msgid ""
+"Emails will be sent from %1; make sure your spam filter accepts this "
+"address."
+msgstr "Emails will be sent from %1; make sure your spam filter accepts this address."
+
+#: ../inc/prefs_project.inc:123
+msgid "Is it OK for %1 and your team (if any) to email you?"
+msgstr "Is it OK for %1 and your team (if any) to email you?"
+
+#: ../inc/prefs_project.inc:130
+msgid "Should %1 show your computers on its web site?"
+msgstr "Should %1 show your computers on its web site?"
+
+#: ../inc/prefs_project.inc:270
+msgid "(Switch View)"
+msgstr "(Switch View)"
+
+#: ../inc/prefs_project.inc:276
+msgid "Project specific settings"
+msgstr "Project specific settings"
+
+#: ../inc/prefs_util.inc:33
+msgid "bad venue: %1"
+msgstr "bad venue: %1"
+
+#: ../inc/prefs_util.inc:39
+msgid "bad subset: %1"
+msgstr "bad subset: %1"
+
+#: ../inc/prefs_util.inc:476 ../inc/prefs_util.inc:500
+msgid "and"
+msgstr "and"
+
+#: ../inc/profile.inc:86
+msgid ""
+"Your profile will be made visible to other people as soon as it has been "
+"approved by the project. This may take up to a few days."
+msgstr "Your profile will be made visible to other people as soon as it has been approved by the project. This may take up to a few days."
+
+#: ../inc/profile.inc:92
+msgid ""
+"Your profile has been marked as unacceptable. It is not visible to other "
+"people. Please change it."
+msgstr "Your profile has been marked as unacceptable. It is not visible to other people. Please change it."
+
+#: ../inc/profile.inc:172 ../user/friend.php:107 ../user/friend.php:174
+msgid "Database error"
+msgstr "Database error"
+
+#: ../inc/profile.inc:193
+msgid ""
+"To prevent spam, profiles of users with an average credit of less than %1 "
+"are displayed only to logged-in users. We apologize for this inconvenience."
+msgstr "To prevent spam, profiles of users with an average credit of less than %1 are displayed only to logged-in users. We apologize for this inconvenience."
+
+#: ../inc/profile.inc:197
+msgid "User is banished"
+msgstr "User is banished"
+
+#: ../inc/profile.inc:211
+msgid "No profile exists for that user ID."
+msgstr "No profile exists for that user ID."
+
+#: ../inc/profile.inc:219 ../user/create_profile.php:309
+msgid "Edit your profile"
+msgstr "Edit your profile"
+
+#: ../inc/profile.inc:262
+msgid "Your feedback on this profile"
+msgstr "Your feedback on this profile"
+
+#: ../inc/profile.inc:264
+msgid "Recommend this profile for User of the Day:"
+msgstr "Recommend this profile for User of the Day:"
+
+#: ../inc/profile.inc:265
+msgid "I %1like%2 this profile"
+msgstr "I %1like%2 this profile"
+
+#: ../inc/profile.inc:268
+msgid "Alert administrators to an offensive profile:"
+msgstr "Alert administrators to an offensive profile:"
+
+#: ../inc/profile.inc:269
+msgid "I %1do not like%2 this profile"
+msgstr "I %1do not like%2 this profile"
+
+#: ../inc/result.inc:35
+msgid "Anonymous platform"
+msgstr "Anonymous platform"
+
+#: ../inc/result.inc:53 ../user/host_app_versions.php:26
+msgid "NVIDIA GPU"
+msgstr "NVIDIA GPU"
+
+#: ../inc/result.inc:55 ../user/host_app_versions.php:27
+msgid "ATI GPU"
+msgstr "ATI GPU"
+
+#: ../inc/result.inc:57 ../user/host_app_versions.php:28
+msgid "Intel GPU"
+msgstr "Intel GPU"
+
+#: ../inc/result.inc:65
+msgid "Not in DB"
+msgstr "Not in DB"
+
+#: ../inc/result.inc:91
+msgid "pending"
+msgstr "pending"
+
+#: ../inc/result.inc:114 ../user/forum_search.php:62
+msgid "All"
+msgstr "All"
+
+#: ../inc/result.inc:115 ../inc/result.inc:176 ../inc/result.inc:223
+#: ../user/server_status.php:163
+msgid "In progress"
+msgstr "In progress"
+
+#: ../inc/result.inc:116
+msgid "Validation pending"
+msgstr "Validation pending"
+
+#: ../inc/result.inc:117
+msgid "Validation inconclusive"
+msgstr "Validation inconclusive"
+
+#: ../inc/result.inc:118 ../inc/result.inc:268
+msgid "Valid"
+msgstr "Valid"
+
+#: ../inc/result.inc:119 ../inc/result.inc:271
+msgid "Invalid"
+msgstr "Invalid"
+
+#: ../inc/result.inc:120 ../inc/result.inc:209
+msgid "Error"
+msgstr "Error"
+
+#: ../inc/result.inc:174 ../inc/result.inc:221 ../user/explain_state.php:34
+msgid "Inactive"
+msgstr "Inactive"
+
+#: ../inc/result.inc:175 ../inc/result.inc:222 ../user/explain_state.php:37
+#: ../user/server_status.php:163
+msgid "Unsent"
+msgstr "Unsent"
+
+#: ../inc/result.inc:181
+msgid "Completed, waiting for validation"
+msgstr "Completed, waiting for validation"
+
+#: ../inc/result.inc:182
+msgid "Completed and validated"
+msgstr "Completed and validated"
+
+#: ../inc/result.inc:183
+msgid "Completed, marked as invalid"
+msgstr "Completed, marked as invalid"
+
+#: ../inc/result.inc:184
+msgid "Completed, can't validate"
+msgstr "Completed, can't validate"
+
+#: ../inc/result.inc:185
+msgid "Completed, validation inconclusive"
+msgstr "Completed, validation inconclusive"
+
+#: ../inc/result.inc:186
+msgid "Completed, too late to validate"
+msgstr "Completed, too late to validate"
+
+#: ../inc/result.inc:188
+msgid "Completed"
+msgstr "Completed"
+
+#: ../inc/result.inc:189 ../inc/result.inc:233 ../user/explain_state.php:62
+msgid "Couldn't send"
+msgstr "Couldn't send"
+
+#: ../inc/result.inc:194 ../inc/result.inc:257
+msgid "Cancelled by server"
+msgstr "Cancelled by server"
+
+#: ../inc/result.inc:199
+msgid "Not started by deadline - canceled"
+msgstr "Not started by deadline - canceled"
+
+#: ../inc/result.inc:202
+msgid "Error while downloading"
+msgstr "Error while downloading"
+
+#: ../inc/result.inc:204
+msgid "Error while computing"
+msgstr "Error while computing"
+
+#: ../inc/result.inc:205
+msgid "Error while uploading"
+msgstr "Error while uploading"
+
+#: ../inc/result.inc:206 ../inc/result.inc:259
+msgid "Aborted by user"
+msgstr "Aborted by user"
+
+#: ../inc/result.inc:207 ../inc/result.inc:260
+msgid "Upload failed"
+msgstr "Upload failed"
+
+#: ../inc/result.inc:210
+msgid "Timed out - no response"
+msgstr "Timed out - no response"
+
+#: ../inc/result.inc:211 ../inc/result.inc:240 ../user/explain_state.php:71
+msgid "Didn't need"
+msgstr "Didn't need"
+
+#: ../inc/result.inc:212 ../inc/result.inc:241 ../user/explain_state.php:74
+msgid "Validate error"
+msgstr "Validate error"
+
+#: ../inc/result.inc:213 ../inc/result.inc:242
+msgid "Abandoned"
+msgstr "Abandoned"
+
+#: ../inc/result.inc:224 ../user/explain_state.php:43
+msgid "Over"
+msgstr "Over"
+
+#: ../inc/result.inc:232 ../user/explain_state.php:59
+msgid "Success"
+msgstr "Success"
+
+#: ../inc/result.inc:236
+msgid "Computation error"
+msgstr "Computation error"
+
+#: ../inc/result.inc:238
+msgid "Redundant result"
+msgstr "Redundant result"
+
+#: ../inc/result.inc:239 ../user/explain_state.php:68
+msgid "No reply"
+msgstr "No reply"
+
+#: ../inc/result.inc:249 ../user/explain_state.php:85
+msgid "New"
+msgstr "New"
+
+#: ../inc/result.inc:250 ../user/explain_state.php:91
+msgid "Downloading"
+msgstr "Downloading"
+
+#: ../inc/result.inc:251
+msgid "Processing"
+msgstr "Processing"
+
+#: ../inc/result.inc:252
+msgid "Compute error"
+msgstr "Compute error"
+
+#: ../inc/result.inc:253 ../user/explain_state.php:97
+msgid "Uploading"
+msgstr "Uploading"
+
+#: ../inc/result.inc:254 ../user/explain_state.php:88
+msgid "Done"
+msgstr "Done"
+
+#: ../inc/result.inc:267
+msgid "Initial"
+msgstr "Initial"
+
+#: ../inc/result.inc:273
+msgid "Not necessary"
+msgstr "Not necessary"
+
+#: ../inc/result.inc:274
+msgid "Workunit error - check skipped"
+msgstr "Workunit error - check skipped"
+
+#: ../inc/result.inc:275
+msgid "Checked, but no consensus yet"
+msgstr "Checked, but no consensus yet"
+
+#: ../inc/result.inc:276
+msgid "Task was reported too late to validate"
+msgstr "Task was reported too late to validate"
+
+#: ../inc/result.inc:302
+msgid "Couldn't send result"
+msgstr "Couldn't send result"
+
+#: ../inc/result.inc:306
+msgid "Too many errors (may have bug)"
+msgstr "Too many errors (may have bug)"
+
+#: ../inc/result.inc:310
+msgid "Too many results (may be nondeterministic)"
+msgstr "Too many results (may be nondeterministic)"
+
+#: ../inc/result.inc:314
+msgid "Too many total results"
+msgstr "Too many total results"
+
+#: ../inc/result.inc:318
+msgid "WU cancelled"
+msgstr "WU cancelled"
+
+#: ../inc/result.inc:322
+msgid "Canonical result is missing"
+msgstr "Canonical result is missing"
+
+#: ../inc/result.inc:326
+msgid "Unrecognized Error: %1"
+msgstr "Unrecognized Error: %1"
+
+#: ../inc/result.inc:353
+msgid "Task name"
+msgstr "Task name"
+
+#: ../inc/result.inc:353 ../inc/result.inc:358 ../inc/result.inc:361
+#: ../inc/result.inc:364
+msgid "click for details"
+msgstr "click for details"
+
+#: ../inc/result.inc:353
+msgid "Show IDs"
+msgstr "Show IDs"
+
+#: ../inc/result.inc:358
+msgid "Show names"
+msgstr "Show names"
+
+#: ../inc/result.inc:361
+msgid "Task"
+msgstr "Task"
+
+#: ../inc/result.inc:364
+msgid "Work unit"
+msgstr "Work unit"
+
+#: ../inc/result.inc:373
+msgid "Computer"
+msgstr "Computer"
+
+#: ../inc/result.inc:376 ../inc/result.inc:635
+msgid "Sent"
+msgstr "Sent"
+
+#: ../inc/result.inc:377
+msgid "Time reported<br />or deadline"
+msgstr "Time reported<br />or deadline"
+
+#: ../inc/result.inc:378
+msgid "explain"
+msgstr "explain"
+
+#: ../inc/result.inc:380 ../user/server_status.php:113
+msgid "Status"
+msgstr "Status"
+
+#: ../inc/result.inc:381
+msgid "Run time<br />(sec)"
+msgstr "Run time<br />(sec)"
+
+#: ../inc/result.inc:382
+msgid "CPU time<br />(sec)"
+msgstr "CPU time<br />(sec)"
+
+#: ../inc/result.inc:383 ../inc/result.inc:646
+msgid "Credit"
+msgstr "Credit"
+
+#: ../inc/result.inc:384 ../inc/result.inc:746 ../user/server_status.php:163
+msgid "Application"
+msgstr "Application"
+
+#: ../inc/result.inc:633
+msgid "Workunit"
+msgstr "Workunit"
+
+#: ../inc/result.inc:636
+msgid "Report deadline"
+msgstr "Report deadline"
+
+#: ../inc/result.inc:637
+msgid "Received"
+msgstr "Received"
+
+#: ../inc/result.inc:638
+msgid "Server state"
+msgstr "Server state"
+
+#: ../inc/result.inc:639
+msgid "Outcome"
+msgstr "Outcome"
+
+#: ../inc/result.inc:640
+msgid "Client state"
+msgstr "Client state"
+
+#: ../inc/result.inc:641
+msgid "Exit status"
+msgstr "Exit status"
+
+#: ../inc/result.inc:643
+msgid "Run time"
+msgstr "Run time"
+
+#: ../inc/result.inc:644
+msgid "CPU time"
+msgstr "CPU time"
+
+#: ../inc/result.inc:645
+msgid "Validate state"
+msgstr "Validate state"
+
+#: ../inc/result.inc:647
+msgid "Device peak FLOPS"
+msgstr "Device peak FLOPS"
+
+#: ../inc/result.inc:648
+msgid "Application version"
+msgstr "Application version"
+
+#: ../inc/result.inc:673
+msgid "Output files"
+msgstr "Output files"
+
+#: ../inc/result.inc:676
+msgid "Stderr output"
+msgstr "Stderr output"
+
+#: ../inc/result.inc:728
+msgid "State"
+msgstr "State"
+
+#: ../inc/result.inc:769
+msgid "Task name:"
+msgstr "Task name:"
+
+#: ../inc/team.inc:40
+msgid "Search criteria (use one or more)"
+msgstr "Search criteria (use one or more)"
+
+#: ../inc/team.inc:41
+msgid "Key words"
+msgstr "Key words"
+
+#: ../inc/team.inc:41
+msgid "Find teams with these words in their names or descriptions"
+msgstr "Find teams with these words in their names or descriptions"
+
+#: ../inc/team.inc:49 ../inc/team.inc:468
+msgid "Type of team"
+msgstr "Type of team"
+
+#: ../inc/team.inc:51
+msgid "Show only active teams"
+msgstr "Show only active teams"
+
+#: ../inc/team.inc:52 ../user/profile_menu.php:78 ../user/user_search.php:70
+msgid "Search"
+msgstr "Search"
+
+#: ../inc/team.inc:61
+msgid "Requested by you, and founder response deadline has passed."
+msgstr "Requested by you, and founder response deadline has passed."
+
+#: ../inc/team.inc:63
+msgid "Complete foundership transfer"
+msgstr "Complete foundership transfer"
+
+#: ../inc/team.inc:67
+msgid "Requested by you"
+msgstr "Requested by you"
+
+#: ../inc/team.inc:67
+msgid "founder response deadline is %1"
+msgstr "founder response deadline is %1"
+
+#: ../inc/team.inc:72 ../inc/team.inc:570 ../inc/user.inc:358
+#: ../inc/user.inc:449
+msgid "None"
+msgstr "None"
+
+#: ../inc/team.inc:74
+msgid "Initiate request"
+msgstr "Initiate request"
+
+#: ../inc/team.inc:77
+msgid "Deferred"
+msgstr "Deferred"
+
+#: ../inc/team.inc:87
+msgid "Team info"
+msgstr "Team info"
+
+#: ../inc/team.inc:89 ../user/team_forum.php:72 ../user/team_search.php:82
+msgid "Description"
+msgstr "Description"
+
+#: ../inc/team.inc:101
+msgid "Web site"
+msgstr "Web site"
+
+#: ../inc/team.inc:127
+msgid "Cross-project stats"
+msgstr "Cross-project stats"
+
+#: ../inc/team.inc:130 ../inc/team.inc:383 ../user/team_search.php:84
+msgid "Type"
+msgstr "Type"
+
+#: ../inc/team.inc:134 ../user/team_manage.php:65
+msgid "Message board"
+msgstr "Message board"
+
+#: ../inc/team.inc:135 ../user/forum_forum.php:138 ../user/forum_index.php:98
+msgid "Threads"
+msgstr "Threads"
+
+#: ../inc/team.inc:143
+msgid "Join this team"
+msgstr "Join this team"
+
+#: ../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: if 'OK to email' is set in your project preferences, joining a team gives its founder access to your email address."
+
+#: ../inc/team.inc:147
+msgid "Not accepting new members"
+msgstr "Not accepting new members"
+
+#: ../inc/team.inc:154
+msgid "Foundership change requested"
+msgstr "Foundership change requested"
+
+#: ../inc/team.inc:155
+msgid "Respond by %1"
+msgstr "Respond by %1"
+
+#: ../inc/team.inc:159
+msgid "Team foundership change"
+msgstr "Team foundership change"
+
+#: ../inc/team.inc:163 ../inc/team.inc:368
+msgid "Members"
+msgstr "Members"
+
+#: ../inc/team.inc:164 ../inc/team.inc:263
+msgid "Founder"
+msgstr "Founder"
+
+#: ../inc/team.inc:178
+msgid "Admins"
+msgstr "Admins"
+
+#: ../inc/team.inc:193
+msgid "New members in last day"
+msgstr "New members in last day"
+
+#: ../inc/team.inc:194
+msgid "Total members"
+msgstr "Total members"
+
+#: ../inc/team.inc:194 ../inc/team.inc:195 ../inc/team.inc:196
+msgid "view"
+msgstr "view"
+
+#: ../inc/team.inc:195
+msgid "Active members"
+msgstr "Active members"
+
+#: ../inc/team.inc:196
+msgid "Members with credit"
+msgstr "Members with credit"
+
+#: ../inc/team.inc:265
+msgid "Admin"
+msgstr "Admin"
+
+#: ../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 "Previous %1"
+
+#: ../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 "Next %1"
+
+#: ../inc/team.inc:298
+msgid "No such team."
+msgstr "No such team."
+
+#: ../inc/team.inc:311
+msgid "This operation requires foundership."
+msgstr "This operation requires foundership."
+
+#: ../inc/team.inc:335
+msgid "This operation requires team admin privileges"
+msgstr "This operation requires team admin privileges"
+
+#: ../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 "WARNING: this is a BOINC-wide team. If you make changes here, they will soon be overwritten. Edit the %1BOINC-wide team%2 instead."
+
+#: ../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 "%1Privacy note%2: if you create a team, your project preferences (resource share, graphics preferences) will be visible to the public."
+
+#: ../inc/team.inc:447
+msgid "Team name, text version"
+msgstr "Team name, text version"
+
+#: ../inc/team.inc:448
+msgid "Don't use HTML tags."
+msgstr "Don't use HTML tags."
+
+#: ../inc/team.inc:451
+msgid "Team name, HTML version"
+msgstr "Team name, HTML version"
+
+#: ../inc/team.inc:453 ../inc/team.inc:463
+msgid "You may use %1limited HTML tags%2."
+msgstr "You may use %1limited HTML tags%2."
+
+#: ../inc/team.inc:454
+msgid "If you don't know HTML, leave this box blank."
+msgstr "If you don't know HTML, leave this box blank."
+
+#: ../inc/team.inc:457
+msgid "URL of team web page, if any"
+msgstr "URL of team web page, if any"
+
+#: ../inc/team.inc:457
+msgid "without \"http://\""
+msgstr "without \"http://\""
+
+#: ../inc/team.inc:458
+msgid "This URL will be linked to from the team's page on this site."
+msgstr "This URL will be linked to from the team's page on this site."
+
+#: ../inc/team.inc:461
+msgid "Description of team"
+msgstr "Description of team"
+
+#: ../inc/team.inc:477
+msgid "Accept new members?"
+msgstr "Accept new members?"
+
+#: ../inc/uotd.inc:30
+msgid "User profile"
+msgstr "User profile"
+
+#: ../inc/user.inc:120
+msgid "Projects in which you are participating"
+msgstr "Projects in which you are participating"
+
+#: ../inc/user.inc:122
+msgid "Projects in which %1 is participating"
+msgstr "Projects in which %1 is participating"
+
+#: ../inc/user.inc:126
+msgid "Project"
+msgstr "Project"
+
+#: ../inc/user.inc:126
+msgid "Click for user page"
+msgstr "Click for user page"
+
+#: ../inc/user.inc:126
+msgid "Since"
+msgstr "Since"
+
+#: ../inc/user.inc:151
+msgid "Computing and credit"
+msgstr "Computing and credit"
+
+#: ../inc/user.inc:154
+msgid "Computers on this account"
+msgstr "Computers on this account"
+
+#: ../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 "View"
+
+#: ../inc/user.inc:164
+msgid "Cross-project ID"
+msgstr "Cross-project ID"
+
+#: ../inc/user.inc:165
+msgid "Cross-project statistics"
+msgstr "Cross-project statistics"
+
+#: ../inc/user.inc:166
+msgid "Account"
+msgstr "Account"
+
+#: ../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:170
+msgid "Cross-project"
+msgstr "Cross-project"
+
+#: ../inc/user.inc:171
+msgid "Certificate"
+msgstr "Certificate"
+
+#: ../inc/user.inc:172
+msgid "Stats on your cell phone"
+msgstr "Stats on your cell phone"
+
+#: ../inc/user.inc:197
+msgid "Account information"
+msgstr "Account information"
+
+#: ../inc/user.inc:206 ../user/get_passwd.php:31
+#: ../user/team_email_list.php:73
+msgid "Email address"
+msgstr "Email address"
+
+#: ../inc/user.inc:210 ../inc/user.inc:400
+msgid "URL"
+msgstr "URL"
+
+#: ../inc/user.inc:213
+msgid "Postal code"
+msgstr "Postal code"
+
+#: ../inc/user.inc:214 ../inc/user.inc:394
+msgid "%1 member since"
+msgstr "%1 member since"
+
+#: ../inc/user.inc:219 ../inc/user.inc:223
+msgid "Change"
+msgstr "Change"
+
+#: ../inc/user.inc:224
+msgid "email address"
+msgstr "email address"
+
+#: ../inc/user.inc:225
+msgid "password"
+msgstr "password"
+
+#: ../inc/user.inc:226
+msgid "other account info"
+msgstr "other account info"
+
+#: ../inc/user.inc:229 ../inc/user.inc:393
+msgid "User ID"
+msgstr "User ID"
+
+#: ../inc/user.inc:229
+msgid "Used in community functions"
+msgstr "Used in community functions"
+
+#: ../inc/user.inc:232 ../user/weak_auth.php:25
+msgid "Account keys"
+msgstr "Account keys"
+
+#: ../inc/user.inc:237
+msgid "Preferences"
+msgstr "Preferences"
+
+#: ../inc/user.inc:240
+msgid "When and how BOINC uses your computer"
+msgstr "When and how BOINC uses your computer"
+
+#: ../inc/user.inc:241
+msgid "Computing preferences"
+msgstr "Computing preferences"
+
+#: ../inc/user.inc:244
+msgid "Message boards and private messages"
+msgstr "Message boards and private messages"
+
+#: ../inc/user.inc:245 ../user/edit_forum_preferences_form.php:31
+msgid "Community preferences"
+msgstr "Community preferences"
+
+#: ../inc/user.inc:248
+msgid "Preferences for this project"
+msgstr "Preferences for this project"
+
+#: ../inc/user.inc:249 ../user/prefs.php:30
+msgid "%1 preferences"
+msgstr "%1 preferences"
+
+#: ../inc/user.inc:266
+msgid "View the profile of %1"
+msgstr "View the profile of %1"
+
+#: ../inc/user.inc:267 ../inc/user.inc:316 ../inc/user.inc:482
+msgid "Profile"
+msgstr "Profile"
+
+#: ../inc/user.inc:307 ../user/sample_index.php:114
+msgid "Community"
+msgstr "Community"
+
+#: ../inc/user.inc:314
+msgid "Create"
+msgstr "Create"
+
+#: ../inc/user.inc:321 ../inc/user.inc:454
+msgid "%1 posts"
+msgstr "%1 posts"
+
+#: ../inc/user.inc:339 ../user/edit_forum_preferences_form.php:40
+msgid "Notifications"
+msgstr "Notifications"
+
+#: ../inc/user.inc:346
+msgid "Quit team"
+msgstr "Quit team"
+
+#: ../inc/user.inc:348 ../inc/user.inc:365
+msgid "Administer"
+msgstr "Administer"
+
+#: ../inc/user.inc:354 ../inc/user.inc:367
+msgid "(foundership change request pending)"
+msgstr "(foundership change request pending)"
+
+#: ../inc/user.inc:356
+msgid "Member of team"
+msgstr "Member of team"
+
+#: ../inc/user.inc:358
+msgid "find a team"
+msgstr "find a team"
+
+#: ../inc/user.inc:369
+msgid "Founder but not member of"
+msgstr "Founder but not member of"
+
+#: ../inc/user.inc:375
+msgid "Find friends"
+msgstr "Find friends"
+
+#: ../inc/user.inc:383 ../inc/user.inc:385 ../inc/user.inc:465
+#: ../inc/user.inc:467 ../inc/user.inc:476
+msgid "Friends"
+msgstr "Friends"
+
+#: ../inc/user.inc:407 ../inc/user.inc:409 ../user/server_status.php:153
+msgid "Computers"
+msgstr "Computers"
+
+#: ../inc/user.inc:415
+msgid "Donor"
+msgstr "Donor"
+
+#: ../inc/user.inc:458
+msgid "Contact"
+msgstr "Contact"
+
+#: ../inc/user.inc:461
+msgid "This person is a friend"
+msgstr "This person is a friend"
+
+#: ../inc/user.inc:462 ../user/friend.php:240
+msgid "Cancel friendship"
+msgstr "Cancel friendship"
+
+#: ../inc/user.inc:465 ../user/friend.php:39
+msgid "Request pending"
+msgstr "Request pending"
+
+#: ../inc/user.inc:467
+msgid "Add as friend"
+msgstr "Add as friend"
+
+#: ../inc/user.inc:526
+msgid "user name cannot have leading or trailing white space"
+msgstr "user name cannot have leading or trailing white space"
+
+#: ../inc/user.inc:530
+msgid "user name must be nonempty"
+msgstr "user name must be nonempty"
+
+#: ../inc/user.inc:534
+msgid "user name may not contain HTML tags"
+msgstr "user name may not contain HTML tags"
+
+#: ../inc/util.inc:161
+msgid "log out"
+msgstr "log out"
+
+#: ../inc/util.inc:163
+msgid "log in"
+msgstr "log in"
+
+#: ../inc/util.inc:239 ../user/create_account_form.php:41
+msgid "Create an account"
+msgstr "Create an account"
+
+#: ../inc/util.inc:240
+msgid "Server status page"
+msgstr "Server status page"
+
+#: ../inc/util.inc:277
+msgid ""
+"A database error occurred while handling your request; please try again "
+"later."
+msgstr "A database error occurred while handling your request; please try again later."
+
+#: ../inc/util.inc:286
+msgid "Unable to handle request"
+msgstr "Unable to handle request"
+
+#: ../inc/util.inc:306
+msgid "hours"
+msgstr "hours"
+
+#: ../inc/util.inc:309
+msgid "min"
+msgstr "min"
+
+#: ../inc/util.inc:312
+msgid "sec"
+msgstr "sec"
+
+#: ../inc/util.inc:473
+msgid ""
+"Link has timed out. Please click Back, refresh the page, and try again."
+msgstr "Link has timed out. Please click Back, refresh the page, and try again."
+
+#: ../inc/util.inc:552
+msgid "Use BBCode tags to format your text"
+msgstr "Use BBCode tags to format your text"
+
+#: ../inc/util.inc:779
+msgid "Project down for maintenance"
+msgstr "Project down for maintenance"
+
+#: ../inc/util.inc:782
+msgid "%1 is temporarily shut down for maintenance.  Please try again later."
+msgstr "%1 is temporarily shut down for maintenance.  Please try again later."
+
+#: ../inc/util.inc:800
+msgid "Unable to connect to database - please try again later"
+msgstr "Unable to connect to database - please try again later"
+
+#: ../inc/util.inc:804
+msgid "Unable to select database - please try again later"
+msgstr "Unable to select database - please try again later"
+
+#: ../inc/util.inc:976
+msgid "characters remaining"
+msgstr "characters remaining"
+
+#: ../inc/util_ops.inc:115 ../user/get_passwd.php:72
+msgid "Stay logged in on this computer"
+msgstr "Stay logged in on this computer"
+
+#: ../user/account_finish.php:34
+msgid "Finish account setup"
+msgstr "Finish account setup"
+
+#: ../user/account_finish_action.php:27
+msgid "You must supply a name for your account"
+msgstr "You must supply a name for your account"
+
+#: ../user/account_finish_action.php:30
+msgid "HTML tags not allowed in name"
+msgstr "HTML tags not allowed in name"
+
+#: ../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 "Edit %1 preferences"
+
+#: ../user/add_venue.php:82
+msgid "Add %1 preferences for %2"
+msgstr "Add %1 preferences for %2"
+
+#: ../user/apps.php:31 ../user/sample_index.php:104
+msgid "Applications"
+msgstr "Applications"
+
+#: ../user/apps.php:32
+msgid ""
+"%1 currently has the following applications. When you participate in %1, "
+"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 currently has the following applications. When you participate in %1, 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."
+
+#: ../user/apps.php:54
+msgid "Platform"
+msgstr "Platform"
+
+#: ../user/apps.php:55
+msgid "Version"
+msgstr "Version"
+
+#: ../user/apps.php:57
+msgid "Average computing"
+msgstr "Average computing"
+
+#: ../user/bbcode.php:23
+msgid "BBCode tags"
+msgstr "BBCode tags"
+
+#: ../user/bbcode.php:25
+msgid ""
+"BBCode tags let you format text in your profile and message-board postings.\n"
+"It's similar to HTML, but simpler. The tags start with a [ (where you would\n"
+"have used %1 in HTML) and end with ] (where you would have used %2 in\n"
+"HTML)."
+msgstr "BBCode tags let you format text in your profile and message-board postings.\nIt's similar to HTML, but simpler. The tags start with a [ (where you would\nhave used %1 in HTML) and end with ] (where you would have used %2 in\nHTML)."
+
+#: ../user/bbcode.php:31
+msgid "Examples"
+msgstr "Examples"
+
+#: ../user/bbcode.php:32
+msgid "Bold"
+msgstr "Bold"
+
+#: ../user/bbcode.php:33
+msgid "Italic"
+msgstr "Italic"
+
+#: ../user/bbcode.php:34
+msgid "Underline"
+msgstr "Underline"
+
+#: ../user/bbcode.php:35
+msgid "Strikethrough"
+msgstr "Strikethrough"
+
+#: ../user/bbcode.php:36
+msgid "Superscript"
+msgstr "Superscript"
+
+#: ../user/bbcode.php:37
+msgid "Big text"
+msgstr "Big text"
+
+#: ../user/bbcode.php:38
+msgid "Red text"
+msgstr "Red text"
+
+#: ../user/bbcode.php:39
+msgid "link to website"
+msgstr "link to website"
+
+#: ../user/bbcode.php:40
+msgid "Quoted text"
+msgstr "Quoted text"
+
+#: ../user/bbcode.php:40
+msgid "use for quoted blocks of text"
+msgstr "use for quoted blocks of text"
+
+#: ../user/bbcode.php:41
+msgid "use to display an image"
+msgstr "use to display an image"
+
+#: ../user/bbcode.php:42
+msgid "Code snippet here"
+msgstr "Code snippet here"
+
+#: ../user/bbcode.php:42
+msgid "use to display some code"
+msgstr "use to display some code"
+
+#: ../user/bbcode.php:43
+msgid "Pre-formatted text"
+msgstr "Pre-formatted text"
+
+#: ../user/bbcode.php:43
+msgid "use to display pre-formatted (usually monospaced) text"
+msgstr "use to display pre-formatted (usually monospaced) text"
+
+#: ../user/bbcode.php:44
+msgid "Item 1"
+msgstr "Item 1"
+
+#: ../user/bbcode.php:44
+msgid "Item2"
+msgstr "Item2"
+
+#: ../user/bbcode.php:44
+msgid "Item 2"
+msgstr "Item 2"
+
+#: ../user/bbcode.php:46
+msgid "use to link to Trac ticket on BOINC website"
+msgstr "use to link to Trac ticket on BOINC website"
+
+#: ../user/bbcode.php:48
+msgid "use to link to Trac Wiki on BOINC website"
+msgstr "use to link to Trac Wiki on BOINC website"
+
+#: ../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 "If you don't close a tag or don't specify a parameter correctly,\nthe raw tag itself will display instead of the formatted text."
+
+#: ../user/create_account_action.php:26
+msgid "Can't create account"
+msgstr "Can't create account"
+
+#: ../user/create_account_action.php:29
+msgid "Click your browser's <b>Back</b> button to try again."
+msgstr "Click your browser's <b>Back</b> button to try again."
+
+#: ../user/create_account_action.php:46
+msgid "Your reCAPTCHA response was not correct. Please try again."
+msgstr "Your reCAPTCHA response was not correct. Please try again."
+
+#: ../user/create_account_action.php:69
+msgid "You must supply an invitation code to create an account."
+msgstr "You must supply an invitation code to create an account."
+
+#: ../user/create_account_action.php:72
+msgid "The invitation code you gave is not valid."
+msgstr "The invitation code you gave is not valid."
+
+#: ../user/create_account_action.php:83
+msgid ""
+"Invalid email address: you must enter a valid address of the form "
+"name at domain"
+msgstr "Invalid email address: you must enter a valid address of the form name at domain"
+
+#: ../user/create_account_action.php:87
+msgid "There's already an account with that email address."
+msgstr "There's already an account with that email address."
+
+#: ../user/create_account_action.php:93 ../user/edit_passwd_action.php:32
+msgid "New passwords are different"
+msgstr "New passwords are different"
+
+#: ../user/create_account_action.php:100 ../user/edit_passwd_action.php:40
+msgid "Passwords may only include ASCII characters."
+msgstr "Passwords may only include ASCII characters."
+
+#: ../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 "New password is too short: minimum password length is %1 characters."
+
+#: ../user/create_account_action.php:126
+msgid "Couldn't create account"
+msgstr "Couldn't create account"
+
+#: ../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: If you use the BOINC Manager, don't use this form. Just run BOINC, select Add Project, and enter an email address and password."
+
+#: ../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 "This account will belong to the team %1 and will have the project preferences of its founder."
+
+#: ../user/create_profile.php:52
+msgid "Picture"
+msgstr "Picture"
+
+#: ../user/create_profile.php:66
+msgid "%1 Your profile picture is shown to the left."
+msgstr "%1 Your profile picture is shown to the left."
+
+#: ../user/create_profile.php:68
+msgid ""
+"To replace it, click the \"Browse\" button and select a JPEG or PNG file (%1"
+" or less)."
+msgstr "To replace it, click the \"Browse\" button and select a JPEG or PNG file (%1 or less)."
+
+#: ../user/create_profile.php:71
+msgid "To remove it from your profile, check this box:"
+msgstr "To remove it from your profile, check this box:"
+
+#: ../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 "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."
+
+#: ../user/create_profile.php:91
+msgid "Language"
+msgstr "Language"
+
+#: ../user/create_profile.php:94
+msgid "Select the language in which your profile is written:"
+msgstr "Select the language in which your profile is written:"
+
+#: ../user/create_profile.php:106
+msgid "Submit profile"
+msgstr "Submit profile"
+
+#: ../user/create_profile.php:112
+msgid "Create/edit profile"
+msgstr "Create/edit profile"
+
+#: ../user/create_profile.php:134
+msgid "The format of your uploaded image is not supported."
+msgstr "The format of your uploaded image is not supported."
+
+#: ../user/create_profile.php:163
+msgid ""
+"Your %1profile%2 lets you share your opinions and background with the %3 "
+"community."
+msgstr "Your %1profile%2 lets you share your opinions and background with the %3 community."
+
+#: ../user/create_profile.php:209
+msgid "Your ReCaptcha response was not correct.  Please try again."
+msgstr "Your ReCaptcha response was not correct.  Please try again."
+
+#: ../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 "Your first response was flagged as spam by the Akismet anti-spam system.  Please modify your text and try again."
+
+#: ../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 "Your second response was flagged as spam by the Akismet anti-spam system.  Please modify your text and try again."
+
+#: ../user/create_profile.php:242
+msgid "Your profile submission was empty."
+msgstr "Your profile submission was empty."
+
+#: ../user/create_profile.php:281
+msgid "Could not update the profile: database error"
+msgstr "Could not update the profile: database error"
+
+#: ../user/create_profile.php:293
+msgid "Could not create the profile: database error"
+msgstr "Could not create the profile: database error"
+
+#: ../user/create_profile.php:298
+msgid "Profile saved"
+msgstr "Profile saved"
+
+#: ../user/create_profile.php:300
+msgid ""
+"Congratulations! Your profile was successfully entered into our database."
+msgstr "Congratulations! Your profile was successfully entered into our database."
+
+#: ../user/create_profile.php:302
+msgid "%1View your profile%2"
+msgstr "%1View your profile%2"
+
+#: ../user/create_profile.php:311
+msgid "Create a profile"
+msgstr "Create a profile"
+
+#: ../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."
+msgstr "To prevent spam, an average credit of %1 or greater is required to create or edit a profile.  We apologize for this inconvenience."
+
+#: ../user/delete_account.php:57
+msgid "Couldn't delete account"
+msgstr "Couldn't delete account"
+
+#: ../user/delete_account.php:59
+msgid "Account deleted"
+msgstr "Account deleted"
+
+#: ../user/delete_account.php:60
+msgid "Your account has been deleted."
+msgstr "Your account has been deleted."
+
+#: ../user/delete_account.php:64
+msgid "Confirm delete account"
+msgstr "Confirm delete account"
+
+#: ../user/delete_account.php:67
+msgid ""
+"Deleting your account will remove all of your\n"
+"personal information from our servers,\n"
+"including your profile and message-board posts.\n"
+"No jobs will be issued to any computers attached\n"
+"to this account."
+msgstr "Deleting your account will remove all of your\npersonal information from our servers,\nincluding your profile and message-board posts.\nNo jobs will be issued to any computers attached\nto this account."
+
+#: ../user/delete_account.php:73
+msgid ""
+"This cannot be undone.\n"
+"Once your account has been deleted, you cannot get it back."
+msgstr "This cannot be undone.\nOnce your account has been deleted, you cannot get it back."
+
+#: ../user/delete_account.php:76
+msgid "Are you sure you want to delete your account?"
+msgstr "Are you sure you want to delete your account?"
+
+#: ../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 "Yes"
+
+#: ../user/delete_account.php:79
+msgid "Delete this account"
+msgstr "Delete this account"
+
+#: ../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 "No"
+
+#: ../user/delete_account.php:80
+msgid "Do not delete this account"
+msgstr "Do not delete this account"
+
+#: ../user/delete_profile.php:32
+msgid "couldn't delete profile - please try again later"
+msgstr "couldn't delete profile - please try again later"
+
+#: ../user/delete_profile.php:35
+msgid "Delete Confirmation"
+msgstr "Delete Confirmation"
+
+#: ../user/delete_profile.php:37
+msgid "Your profile has been deleted."
+msgstr "Your profile has been deleted."
+
+#: ../user/delete_profile.php:42
+msgid "Profile delete confirmation"
+msgstr "Profile delete confirmation"
+
+#: ../user/delete_profile.php:45
+msgid "Are you sure?"
+msgstr "Are you sure?"
+
+#: ../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 "Deleted profiles are gone forever and cannot be recovered --\nyou will have to start from scratch\nif you want another profile in the future."
+
+#: ../user/delete_profile.php:50
+msgid ""
+"If you're sure, click 'Yes'\n"
+"to remove your profile from our database."
+msgstr "If you're sure, click 'Yes'\nto remove your profile from our database."
+
+#: ../user/delete_profile.php:54
+msgid "Delete my profile"
+msgstr "Delete my profile"
+
+#: ../user/delete_profile.php:55
+msgid "Do not delete my profile"
+msgstr "Do not delete my profile"
+
+#: ../user/donated.php:25
+msgid "PayPal - Transaction Completed"
+msgstr "PayPal - Transaction Completed"
+
+#: ../user/donated.php:28
+msgid "Thank you for donating!"
+msgstr "Thank you for donating!"
+
+#: ../user/donated.php:29
+msgid "Your donation for has been completed."
+msgstr "Your donation for has been completed."
+
+#: ../user/donated.php:30
+msgid ""
+"Your donation will be added to the progress bar after confirmation by "
+"PayPal."
+msgstr "Your donation will be added to the progress bar after confirmation by PayPal."
+
+#: ../user/donated.php:32
+msgid "You have canceled your donation."
+msgstr "You have canceled your donation."
+
+#: ../user/donations.php:24
+msgid "This project is not accepting donations."
+msgstr "This project is not accepting donations."
+
+#: ../user/donations.php:34
+msgid "%1 donations"
+msgstr "%1 donations"
+
+#: ../user/donations.php:39
+msgid ""
+"This project is accepting donations via\n"
+"%1."
+msgstr "This project is accepting donations via\n%1."
+
+#: ../user/donations.php:42
+msgid ""
+"To donate, fill in the amount you want to donate using the field below.\n"
+"        PayPal is accepting multiple currencies\n"
+"        (Canadian Dollars, Euros, Pounds Sterling, U.S. Dollars,\n"
+"         Yen, Australian Dollars, New Zealand Dollars,\n"
+"        Swiss Francs, Hong Kong Dollars, Singapore Dollars, Swedish Kronor,\n"
+"        Danish Kroner, Polish Zloty, Norwegian Kroner,\n"
+"        Hungarian Forint, Czech Koruna).\n"
+"        You can use included currency converter\n"
+"        to see the donation amount equivalent in different currencies\n"
+"        (please note that the rates are only estimates\n"
+"         and the actual amount may differ)."
+msgstr "To donate, fill in the amount you want to donate using the field below.\n        PayPal is accepting multiple currencies\n        (Canadian Dollars, Euros, Pounds Sterling, U.S. Dollars,\n         Yen, Australian Dollars, New Zealand Dollars,\n        Swiss Francs, Hong Kong Dollars, Singapore Dollars, Swedish Kronor,\n        Danish Kroner, Polish Zloty, Norwegian Kroner,\n        Hungarian Forint, Czech Koruna).\n        You can use included currency converter\n        to see t [...]
+
+#: ../user/donations.php:316
+msgid "Amount you would like to donate"
+msgstr "Amount you would like to donate"
+
+#: ../user/donations.php:317
+msgid "Estimated value in"
+msgstr "Estimated value in"
+
+#: ../user/donations.php:320 ../user/donations.php:324
+msgid "Anonymous donation"
+msgstr "Anonymous donation"
+
+#: ../user/donations.php:320
+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 "Select this if you dont want your name and account number displayed in\ndonator lists.<br>If not checked, you will be recorded as user ID %1"
+
+#: ../user/donations.php:324
+msgid "To assign the donation with your user ID, please log in."
+msgstr "To assign the donation with your user ID, please log in."
+
+#: ../user/donations.php:328
+msgid "Proceed"
+msgstr "Proceed"
+
+#: ../user/donations.php:329
+msgid "Donations are accepted through"
+msgstr "Donations are accepted through"
+
+#: ../user/download_network.php:25
+msgid "Download BOINC add-on software"
+msgstr "Download BOINC add-on software"
+
+#: ../user/download_network.php:28
+msgid "You can download applications in several categories."
+msgstr "You can download applications in several categories."
+
+#: ../user/download_network.php:31
+msgid ""
+"These applications are not endorsed by %1 and you use them at your own risk."
+msgstr "These applications are not endorsed by %1 and you use them at your own risk."
+
+#: ../user/download_network.php:33
+msgid ""
+"We do not provide instructions for installing these applications.\n"
+"However, the author may have provided some help on installing or uninstalling the application. \n"
+"If this is not enough you should contact the author."
+msgstr "We do not provide instructions for installing these applications.\nHowever, the author may have provided some help on installing or uninstalling the application. \nIf this is not enough you should contact the author."
+
+#: ../user/download_network.php:36
+msgid "Instructions for installing and running BOINC are %1here%2."
+msgstr "Instructions for installing and running BOINC are %1here%2."
+
+#: ../user/download_network.php:38
+msgid "This list is managed centrally at %1the BOINC website%2."
+msgstr "This list is managed centrally at %1the BOINC website%2."
+
+#: ../user/edit_email_action.php:31
+msgid "Change email address of account"
+msgstr "Change email address of account"
+
+#: ../user/edit_email_action.php:34 ../user/edit_email_action.php:36
+msgid "New email address '%1' is invalid."
+msgstr "New email address '%1' is invalid."
+
+#: ../user/edit_email_action.php:38
+msgid "New email address is same as existing address. Nothing is changed."
+msgstr "New email address is same as existing address. Nothing is changed."
+
+#: ../user/edit_email_action.php:42
+msgid "There's already an account with that email address"
+msgstr "There's already an account with that email address"
+
+#: ../user/edit_email_action.php:54
+msgid "Invalid password."
+msgstr "Invalid password."
+
+#: ../user/edit_email_action.php:62
+msgid "The email address of your account is now %1."
+msgstr "The email address of your account is now %1."
+
+#: ../user/edit_email_action.php:64
+msgid "Please %1validate this email address%2."
+msgstr "Please %1validate this email address%2."
+
+#: ../user/edit_email_action.php:67
+msgid ""
+"We can't update your email address due to a database problem.  Please try "
+"again later."
+msgstr "We can't update your email address due to a database problem.  Please try again later."
+
+#: ../user/edit_email_form.php:27 ../user/edit_email_form.php:51
+msgid "Change email address"
+msgstr "Change email address"
+
+#: ../user/edit_email_form.php:36
+msgid "Change the email address of your account"
+msgstr "Change the email address of your account"
+
+#: ../user/edit_email_form.php:37
+msgid "New email address"
+msgstr "New email address"
+
+#: ../user/edit_email_form.php:38
+msgid "Must be a valid address of the form 'name at domain'"
+msgstr "Must be a valid address of the form 'name at domain'"
+
+#: ../user/edit_email_form.php:48
+msgid "No password?"
+msgstr "No password?"
+
+#: ../user/edit_forum_preferences_action.php:33
+msgid "Confirm reset"
+msgstr "Confirm reset"
+
+#: ../user/edit_forum_preferences_action.php:34
+msgid ""
+"This action will erase any changes you have made in your community "
+"preferences. To cancel, click your browser's Back button."
+msgstr "This action will erase any changes you have made in your community preferences. To cancel, click your browser's Back button."
+
+#: ../user/edit_forum_preferences_action.php:38
+msgid "Reset preferences"
+msgstr "Reset preferences"
+
+#: ../user/edit_forum_preferences_action.php:95
+msgid "Error: Not the right kind of file, only PNG and JPEG are supported."
+msgstr "Error: Not the right kind of file, only PNG and JPEG are supported."
+
+#: ../user/edit_forum_preferences_action.php:120
+msgid "Your signature was too long, please keep it less than 250 characters."
+msgstr "Your signature was too long, please keep it less than 250 characters."
+
+#: ../user/edit_forum_preferences_action.php:139
+#: ../user/edit_forum_preferences_action.php:153
+msgid "No such user: %1"
+msgstr "No such user: %1"
+
+#: ../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 "How should we notify you of new private messages, friend requests, posts in subscribed threads, and other events?"
+
+#: ../user/edit_forum_preferences_form.php:46
+msgid "On my Account page (no email)"
+msgstr "On my Account page (no email)"
+
+#: ../user/edit_forum_preferences_form.php:47
+msgid "Immediately, by email"
+msgstr "Immediately, by email"
+
+#: ../user/edit_forum_preferences_form.php:48
+msgid "In a single daily email"
+msgstr "In a single daily email"
+
+#: ../user/edit_forum_preferences_form.php:65
+msgid "Message-board identity"
+msgstr "Message-board identity"
+
+#: ../user/edit_forum_preferences_form.php:66
+msgid "Avatar"
+msgstr "Avatar"
+
+#: ../user/edit_forum_preferences_form.php:67
+msgid "An image representing you on the message boards."
+msgstr "An image representing you on the message boards."
+
+#: ../user/edit_forum_preferences_form.php:68
+msgid "Format: JPG or PNG. Size: at most 4 KB, 100x100 pixels"
+msgstr "Format: JPG or PNG. Size: at most 4 KB, 100x100 pixels"
+
+#: ../user/edit_forum_preferences_form.php:70
+msgid "Don't use an avatar"
+msgstr "Don't use an avatar"
+
+#: ../user/edit_forum_preferences_form.php:72
+msgid "Use a Globally Recognized Avatar provided by %1"
+msgstr "Use a Globally Recognized Avatar provided by %1"
+
+#: ../user/edit_forum_preferences_form.php:74
+msgid "Use this uploaded avatar:"
+msgstr "Use this uploaded avatar:"
+
+#: ../user/edit_forum_preferences_form.php:77
+msgid "Avatar preview"
+msgstr "Avatar preview"
+
+#: ../user/edit_forum_preferences_form.php:77
+msgid "This is how your avatar will look"
+msgstr "This is how your avatar will look"
+
+#: ../user/edit_forum_preferences_form.php:86
+msgid "Signature for message board posts"
+msgstr "Signature for message board posts"
+
+#: ../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 "Check out %1various free services%2\n<br> providing dynamic 'signature images'\n<br> showing your latest credit info, project news, etc."
+
+#: ../user/edit_forum_preferences_form.php:93
+msgid "Attach signature by default"
+msgstr "Attach signature by default"
+
+#: ../user/edit_forum_preferences_form.php:96
+msgid "Signature preview"
+msgstr "Signature preview"
+
+#: ../user/edit_forum_preferences_form.php:97
+msgid "This is how your signature will look in the forums"
+msgstr "This is how your signature will look in the forums"
+
+#: ../user/edit_forum_preferences_form.php:115
+msgid "Message display"
+msgstr "Message display"
+
+#: ../user/edit_forum_preferences_form.php:117
+msgid "What to display"
+msgstr "What to display"
+
+#: ../user/edit_forum_preferences_form.php:118
+msgid "Hide avatar images"
+msgstr "Hide avatar images"
+
+#: ../user/edit_forum_preferences_form.php:119
+msgid "Hide signatures"
+msgstr "Hide signatures"
+
+#: ../user/edit_forum_preferences_form.php:120
+msgid "Show images as links"
+msgstr "Show images as links"
+
+#: ../user/edit_forum_preferences_form.php:121
+msgid "Open links in new window/tab"
+msgstr "Open links in new window/tab"
+
+#: ../user/edit_forum_preferences_form.php:122
+msgid "Highlight special users"
+msgstr "Highlight special users"
+
+#: ../user/edit_forum_preferences_form.php:123
+msgid "Display this many messages per page"
+msgstr "Display this many messages per page"
+
+#: ../user/edit_forum_preferences_form.php:127
+msgid "How to sort"
+msgstr "How to sort"
+
+#: ../user/edit_forum_preferences_form.php:128
+msgid "Threads:"
+msgstr "Threads:"
+
+#: ../user/edit_forum_preferences_form.php:128
+msgid "Posts:"
+msgstr "Posts:"
+
+#: ../user/edit_forum_preferences_form.php:129
+msgid "Jump to first new post in thread automatically"
+msgstr "Jump to first new post in thread automatically"
+
+#: ../user/edit_forum_preferences_form.php:130
+msgid "Don't move sticky posts to top"
+msgstr "Don't move sticky posts to top"
+
+#: ../user/edit_forum_preferences_form.php:137
+msgid "Message filtering"
+msgstr "Message filtering"
+
+#: ../user/edit_forum_preferences_form.php:153
+msgid "Filtered users"
+msgstr "Filtered users"
+
+#: ../user/edit_forum_preferences_form.php:154
+msgid "Ignore message board posts and private messages from these users."
+msgstr "Ignore message board posts and private messages from these users."
+
+#: ../user/edit_forum_preferences_form.php:156
+msgid "User ID (For instance: 123456789)"
+msgstr "User ID (For instance: 123456789)"
+
+#: ../user/edit_forum_preferences_form.php:157 ../user/pm.php:256
+msgid "Add user to filter"
+msgstr "Add user to filter"
+
+#: ../user/edit_forum_preferences_form.php:162
+msgid "Click here to update preferences"
+msgstr "Click here to update preferences"
+
+#: ../user/edit_forum_preferences_form.php:164
+#: ../user/edit_forum_preferences_form.php:166
+msgid "Reset"
+msgstr "Reset"
+
+#: ../user/edit_forum_preferences_form.php:165
+msgid "Or click here to reset preferences to the defaults"
+msgstr "Or click here to reset preferences to the defaults"
+
+#: ../user/edit_passwd_action.php:50
+msgid ""
+"We can't update your password due to a database problem. Please try again "
+"later."
+msgstr "We can't update your password due to a database problem. Please try again later."
+
+#: ../user/edit_passwd_action.php:53 ../user/edit_passwd_form.php:25
+#: ../user/edit_passwd_form.php:34
+msgid "Change password"
+msgstr "Change password"
+
+#: ../user/edit_passwd_action.php:54
+msgid "Your password has been changed."
+msgstr "Your password has been changed."
+
+#: ../user/edit_passwd_form.php:32
+msgid "New password"
+msgstr "New password"
+
+#: ../user/edit_passwd_form.php:33
+msgid "New password, again"
+msgstr "New password, again"
+
+#: ../user/edit_user_info_action.php:31
+msgid "HTML tags are not allowed in your name."
+msgstr "HTML tags are not allowed in your name."
+
+#: ../user/edit_user_info_action.php:34
+msgid "You must supply a name for your account."
+msgstr "You must supply a name for your account."
+
+#: ../user/edit_user_info_action.php:58
+msgid "Couldn't update user info."
+msgstr "Couldn't update user info."
+
+#: ../user/edit_user_info_form.php:27
+msgid "Edit account information"
+msgstr "Edit account information"
+
+#: ../user/edit_user_info_form.php:32
+msgid "Name %1 real name or nickname%2"
+msgstr "Name %1 real name or nickname%2"
+
+#: ../user/edit_user_info_form.php:35
+msgid "URL %1 of your web page; optional%2"
+msgstr "URL %1 of your web page; optional%2"
+
+#: ../user/edit_user_info_form.php:43
+msgid "Postal (ZIP) code %1 Optional%2"
+msgstr "Postal (ZIP) code %1 Optional%2"
+
+#: ../user/edit_user_info_form.php:47
+msgid "Update info"
+msgstr "Update info"
+
+#: ../user/explain_state.php:27
+msgid "Server states"
+msgstr "Server states"
+
+#: ../user/explain_state.php:30
+msgid ""
+"A tasks's <b>server state</b> indicates whether the task has been sent to a "
+"computer, and if so whether the computer has finished it. Possible values "
+"are:"
+msgstr "A tasks's <b>server state</b> indicates whether the task has been sent to a computer, and if so whether the computer has finished it. Possible values are:"
+
+#: ../user/explain_state.php:35
+msgid ""
+"The task is not ready to send (for example, because its input files are "
+"unavailable)"
+msgstr "The task is not ready to send (for example, because its input files are unavailable)"
+
+#: ../user/explain_state.php:38
+msgid "The task is ready to send, but hasn't been sent yet."
+msgstr "The task is ready to send, but hasn't been sent yet."
+
+#: ../user/explain_state.php:40
+msgid "In Progress"
+msgstr "In Progress"
+
+#: ../user/explain_state.php:41
+msgid "The task has been sent; waiting for completion."
+msgstr "The task has been sent; waiting for completion."
+
+#: ../user/explain_state.php:44
+msgid ""
+"The task has been sent to a computer and either it has timed out or the "
+"computer has reported its completion."
+msgstr "The task has been sent to a computer and either it has timed out or the computer has reported its completion."
+
+#: ../user/explain_state.php:49
+msgid "Outcomes"
+msgstr "Outcomes"
+
+#: ../user/explain_state.php:52
+msgid ""
+"A tasks's <b>outcome</b> is defined if its server state is <b>over</b>. "
+"Possible values are:"
+msgstr "A tasks's <b>outcome</b> is defined if its server state is <b>over</b>. Possible values are:"
+
+#: ../user/explain_state.php:57
+msgid ""
+"The task was sent to a computer, but the computer has not yet completed the "
+"work and reported the outcome."
+msgstr "The task was sent to a computer, but the computer has not yet completed the work and reported the outcome."
+
+#: ../user/explain_state.php:60
+msgid "A computer completed and reported the task successfully."
+msgstr "A computer completed and reported the task successfully."
+
+#: ../user/explain_state.php:63
+msgid ""
+"The server wasn't able to send the task to a computer (perhaps because its "
+"resource requirements were too large)"
+msgstr "The server wasn't able to send the task to a computer (perhaps because its resource requirements were too large)"
+
+#: ../user/explain_state.php:65
+msgid "Client error"
+msgstr "Client error"
+
+#: ../user/explain_state.php:66
+msgid "The task was sent to a computer and an error occurred."
+msgstr "The task was sent to a computer and an error occurred."
+
+#: ../user/explain_state.php:69
+msgid ""
+"The task was sent to a computer and no reply was received within the time "
+"limit."
+msgstr "The task was sent to a computer and no reply was received within the time limit."
+
+#: ../user/explain_state.php:72
+msgid ""
+"The task wasn't sent to a computer because enough other tasks were completed"
+" for this workunit."
+msgstr "The task wasn't sent to a computer because enough other tasks were completed for this workunit."
+
+#: ../user/explain_state.php:75
+msgid ""
+"The task was reported but could not be validated, typically because the "
+"output files were lost on the server."
+msgstr "The task was reported but could not be validated, typically because the output files were lost on the server."
+
+#: ../user/explain_state.php:80
+msgid "Client states"
+msgstr "Client states"
+
+#: ../user/explain_state.php:81
+msgid ""
+"A result's <b>client state</b> indicates the stage of processing at which an"
+" error occurred."
+msgstr "A result's <b>client state</b> indicates the stage of processing at which an error occurred."
+
+#: ../user/explain_state.php:86
+msgid "The computer has not yet completed the task."
+msgstr "The computer has not yet completed the task."
+
+#: ../user/explain_state.php:89
+msgid "The computer completed the task successfully."
+msgstr "The computer completed the task successfully."
+
+#: ../user/explain_state.php:92
+msgid "The computer couldn't download the application or input files."
+msgstr "The computer couldn't download the application or input files."
+
+#: ../user/explain_state.php:95
+msgid "An error occurred during computation."
+msgstr "An error occurred during computation."
+
+#: ../user/explain_state.php:98
+msgid "The computer couldn't upload the output files."
+msgstr "The computer couldn't upload the output files."
+
+#: ../user/explain_state.php:103
+msgid "Time reported and deadline"
+msgstr "Time reported and deadline"
+
+#: ../user/explain_state.php:106
+msgid ""
+"A task's <b>Time reported or deadline</b> field depends on whether the task "
+"has been reported yet:"
+msgstr "A task's <b>Time reported or deadline</b> field depends on whether the task has been reported yet:"
+
+#: ../user/explain_state.php:110
+msgid "Already reported"
+msgstr "Already reported"
+
+#: ../user/explain_state.php:110
+msgid "The date/time it was reported"
+msgstr "The date/time it was reported"
+
+#: ../user/explain_state.php:111
+msgid "Not reported yet, deadline in the future"
+msgstr "Not reported yet, deadline in the future"
+
+#: ../user/explain_state.php:112
+msgid "Deadline, shown in green."
+msgstr "Deadline, shown in green."
+
+#: ../user/explain_state.php:114
+msgid "Not reported yet, deadline in the past"
+msgstr "Not reported yet, deadline in the past"
+
+#: ../user/explain_state.php:115
+msgid "Deadline, shown in red."
+msgstr "Deadline, shown in red."
+
+#: ../user/explain_state.php:120
+msgid "Unknown field"
+msgstr "Unknown field"
+
+#: ../user/ffmail_action.php:47
+msgid "Email preview"
+msgstr "Email preview"
+
+#: ../user/ffmail_action.php:48
+msgid "Your email will appear as follows:"
+msgstr "Your email will appear as follows:"
+
+#: ../user/ffmail_action.php:57
+msgid "Send email"
+msgstr "Send email"
+
+#: ../user/ffmail_action.php:59
+msgid "Use your browser's back button to return to message form"
+msgstr "Use your browser's back button to return to message form"
+
+#: ../user/ffmail_action.php:63
+msgid "Sending emails"
+msgstr "Sending emails"
+
+#: ../user/ffmail_action.php:82
+msgid "email sent successfully to %1"
+msgstr "email sent successfully to %1"
+
+#: ../user/ffmail_action.php:84
+msgid "failed to send email to %1: %2"
+msgstr "failed to send email to %1: %2"
+
+#: ../user/ffmail_action.php:90
+msgid "Thanks for telling your friends about %1"
+msgstr "Thanks for telling your friends about %1"
+
+#: ../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."
+msgstr "You forgot to enter your friends' names and/or email addresses; Please %1return to the form%2 and enter them."
+
+#: ../user/ffmail_form.php:30
+msgid ""
+"This project hasn't created an email message - please notify its "
+"administrators"
+msgstr "This project hasn't created an email message - please notify its administrators"
+
+#: ../user/ffmail_form.php:33
+msgid "Tell your friends about %1"
+msgstr "Tell your friends about %1"
+
+#: ../user/ffmail_form.php:37
+msgid "Help us by telling your friends, family and coworkers about %1"
+msgstr "Help us by telling your friends, family and coworkers about %1"
+
+#: ../user/ffmail_form.php:39
+msgid ""
+"Fill in this form with the names and email addresses of people you think "
+"might be interested in %1. We'll send them an email in your name, and you "
+"can add your own message if you like."
+msgstr "Fill in this form with the names and email addresses of people you think might be interested in %1. We'll send them an email in your name, and you can add your own message if you like."
+
+#: ../user/ffmail_form.php:42
+msgid "Your name:"
+msgstr "Your name:"
+
+#: ../user/ffmail_form.php:42
+msgid "Your email address:"
+msgstr "Your email address:"
+
+#: ../user/ffmail_form.php:48
+msgid "Friend's name:"
+msgstr "Friend's name:"
+
+#: ../user/ffmail_form.php:48
+msgid "Friend's email address:"
+msgstr "Friend's email address:"
+
+#: ../user/ffmail_form.php:56
+msgid "Additional message (optional)"
+msgstr "Additional message (optional)"
+
+#: ../user/ffmail_form.php:59
+msgid "Send"
+msgstr "Send"
+
+#: ../user/forum_banishment_vote.php:37
+#: ../user/forum_banishment_vote_action.php:35
+msgid "You are not authorized to banish users."
+msgstr "You are not authorized to banish users."
+
+#: ../user/forum_banishment_vote.php:43 ../user/forum_banishment_vote.php:48
+msgid "Banishment Vote"
+msgstr "Banishment Vote"
+
+#: ../user/forum_banishment_vote.php:52
+msgid "No user with this ID found."
+msgstr "No user with this ID found."
+
+#: ../user/forum_banishment_vote.php:57 ../user/forum_moderate_post.php:79
+msgid "User is already banished"
+msgstr "User is already banished"
+
+#: ../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 "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."
+
+#: ../user/forum_banishment_vote.php:64
+msgid ""
+"Select the reason category, optionally write a longer description of why the"
+" user should be banished."
+msgstr "Select the reason category, optionally write a longer description of why the user should be banished."
+
+#: ../user/forum_banishment_vote.php:65 ../user/forum_moderate_thread.php:56
+msgid "Category"
+msgstr "Category"
+
+#: ../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 "Obscene"
+
+#: ../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 "Flame/Hate mail"
+
+#: ../user/forum_banishment_vote.php:69
+#: ../user/forum_banishment_vote_action.php:63
+#: ../user/forum_moderate_post.php:62
+msgid "User Request"
+msgstr "User Request"
+
+#: ../user/forum_banishment_vote.php:72 ../user/forum_moderate_post.php:56
+#: ../user/forum_moderate_thread.php:100
+msgid "Reason"
+msgstr "Reason"
+
+#: ../user/forum_banishment_vote.php:72 ../user/forum_moderate_thread.php:100
+msgid "Mailed if nonempty"
+msgstr "Mailed if nonempty"
+
+#: ../user/forum_banishment_vote.php:77
+msgid "Proceed with vote"
+msgstr "Proceed with vote"
+
+#: ../user/forum_banishment_vote_action.php:41
+#: ../user/forum_moderate_post_action.php:66
+msgid "You must specify an action..."
+msgstr "You must specify an action..."
+
+#: ../user/forum_edit.php:41
+msgid ""
+"You can no longer edit this post.<br/>Posts can only be edited at most %1 "
+"minutes after they have been created."
+msgstr "You can no longer edit this post.<br/>Posts can only be edited at most %1 minutes after they have been created."
+
+#: ../user/forum_edit.php:47
+msgid "You are not authorized to edit this post."
+msgstr "You are not authorized to edit this post."
+
+#: ../user/forum_edit.php:86 ../user/forum_search.php:74
+msgid "Forum"
+msgstr "Forum"
+
+#: ../user/forum_edit.php:110
+msgid "Edit your message"
+msgstr "Edit your message"
+
+#: ../user/forum_edit.php:115 ../user/forum_edit.php:120
+#: ../user/forum_post.php:113 ../user/forum_post.php:115
+#: ../user/team_forum.php:71
+msgid "Title"
+msgstr "Title"
+
+#: ../user/forum_edit.php:144 ../user/forum_post.php:133
+msgid "Add my signature to this post"
+msgstr "Add my signature to this post"
+
+#: ../user/forum_forum.php:46
+msgid "Not visible to you"
+msgstr "Not visible to you"
+
+#: ../user/forum_forum.php:83
+msgid "Team message board for %1"
+msgstr "Team message board for %1"
+
+#: ../user/forum_forum.php:99
+msgid "New thread"
+msgstr "New thread"
+
+#: ../user/forum_forum.php:99
+msgid "Add a new thread to this forum"
+msgstr "Add a new thread to this forum"
+
+#: ../user/forum_forum.php:119
+msgid "This message board is available as an %1RSS feed%2"
+msgstr "This message board is available as an %1RSS feed%2"
+
+#: ../user/forum_forum.php:178
+msgid "This thread is hidden"
+msgstr "This thread is hidden"
+
+#: ../user/forum_forum.php:182
+msgid "This thread is sticky and locked, and you haven't read it yet"
+msgstr "This thread is sticky and locked, and you haven't read it yet"
+
+#: ../user/forum_forum.php:182
+msgid "sticky/locked/unread"
+msgstr "sticky/locked/unread"
+
+#: ../user/forum_forum.php:184
+msgid "This thread is sticky and you haven't read it yet"
+msgstr "This thread is sticky and you haven't read it yet"
+
+#: ../user/forum_forum.php:184
+msgid "sticky/unread"
+msgstr "sticky/unread"
+
+#: ../user/forum_forum.php:188
+msgid "You haven't read this thread yet, and it's locked"
+msgstr "You haven't read this thread yet, and it's locked"
+
+#: ../user/forum_forum.php:188
+msgid "unread/locked"
+msgstr "unread/locked"
+
+#: ../user/forum_forum.php:190
+msgid "You haven't read this thread yet"
+msgstr "You haven't read this thread yet"
+
+#: ../user/forum_forum.php:196
+msgid "This thread is sticky and locked"
+msgstr "This thread is sticky and locked"
+
+#: ../user/forum_forum.php:196
+msgid "sticky/locked"
+msgstr "sticky/locked"
+
+#: ../user/forum_forum.php:198
+msgid "This thread is sticky"
+msgstr "This thread is sticky"
+
+#: ../user/forum_forum.php:198
+msgid "sticky"
+msgstr "sticky"
+
+#: ../user/forum_forum.php:202
+msgid "This thread is locked"
+msgstr "This thread is locked"
+
+#: ../user/forum_forum.php:202
+msgid "locked"
+msgstr "locked"
+
+#: ../user/forum_forum.php:204
+msgid "You read this thread"
+msgstr "You read this thread"
+
+#: ../user/forum_forum.php:204
+msgid "read"
+msgstr "read"
+
+#: ../user/forum_help_desk.php:29
+msgid "Questions and answers"
+msgstr "Questions and answers"
+
+#: ../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 "Talk live via Skype with a volunteer, in any of several languages. Go to %1BOINC Online Help%2."
+
+#: ../user/forum_help_desk.php:46 ../user/forum_index.php:97
+msgid "Topic"
+msgstr "Topic"
+
+#: ../user/forum_help_desk.php:47
+msgid "Questions"
+msgstr "Questions"
+
+#: ../user/forum_index.php:58 ../user/team_forum.php:70
+msgid "Discussion among members of %1"
+msgstr "Discussion among members of %1"
+
+#: ../user/forum_index.php:74
+msgid "%1 Message boards"
+msgstr "%1 Message boards"
+
+#: ../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 "If you have a question or problem, please use the %1Questions & Answers%2 section of the message boards."
+
+#: ../user/forum_index.php:128
+msgid "Subscribed threads"
+msgstr "Subscribed threads"
+
+#: ../user/forum_moderate_post.php:45
+msgid "Moderate post"
+msgstr "Moderate post"
+
+#: ../user/forum_moderate_post.php:55
+msgid "Hide post"
+msgstr "Hide post"
+
+#: ../user/forum_moderate_post.php:60 ../user/forum_moderate_thread.php:60
+msgid "Commercial spam"
+msgstr "Commercial spam"
+
+#: ../user/forum_moderate_post.php:61
+msgid "Doublepost"
+msgstr "Doublepost"
+
+#: ../user/forum_moderate_post.php:66
+msgid "Move post"
+msgstr "Move post"
+
+#: ../user/forum_moderate_post.php:68
+msgid "Destination thread ID:"
+msgstr "Destination thread ID:"
+
+#: ../user/forum_moderate_post.php:81
+msgid "Banish user"
+msgstr "Banish user"
+
+#: ../user/forum_moderate_post.php:83
+msgid "Ban duration"
+msgstr "Ban duration"
+
+#: ../user/forum_moderate_post.php:84
+msgid "4 hours"
+msgstr "4 hours"
+
+#: ../user/forum_moderate_post.php:85 ../user/forum_search.php:47
+msgid "1 day"
+msgstr "1 day"
+
+#: ../user/forum_moderate_post.php:86
+msgid "1 week"
+msgstr "1 week"
+
+#: ../user/forum_moderate_post.php:87
+msgid "2 weeks"
+msgstr "2 weeks"
+
+#: ../user/forum_moderate_post.php:88
+msgid "1 month"
+msgstr "1 month"
+
+#: ../user/forum_moderate_post.php:89
+msgid "Forever"
+msgstr "Forever"
+
+#: ../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.php:107
+msgid "Optional explanation %1 This is included in email to user.%2"
+msgstr "Optional explanation %1 This is included in email to user.%2"
+
+#: ../user/forum_moderate_post_action.php:60
+msgid "You are not authorized to moderate this post."
+msgstr "You are not authorized to moderate this post."
+
+#: ../user/forum_moderate_post_action.php:105
+msgid "Can't move to different category type"
+msgstr "Can't move to different category type"
+
+#: ../user/forum_moderate_post_action.php:109
+msgid "Can't move to different category"
+msgstr "Can't move to different category"
+
+#: ../user/forum_moderate_post_action.php:130
+msgid "Not authorized to banish users"
+msgstr "Not authorized to banish users"
+
+#: ../user/forum_moderate_post_action.php:146
+msgid "Banishment"
+msgstr "Banishment"
+
+#: ../user/forum_moderate_post_action.php:148
+msgid "User %1 has been banished."
+msgstr "User %1 has been banished."
+
+#: ../user/forum_moderate_post_action.php:151
+msgid "Action failed: possible database problem"
+msgstr "Action failed: possible database problem"
+
+#: ../user/forum_moderate_thread.php:38
+msgid "not authorized"
+msgstr "not authorized"
+
+#: ../user/forum_moderate_thread.php:41
+msgid "Moderate thread '%1'"
+msgstr "Moderate thread '%1'"
+
+#: ../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 "Select the reason category, or write a longer description of why you're hiding or locking the thread; then press OK."
+
+#: ../user/forum_moderate_thread.php:78
+msgid "Current forum"
+msgstr "Current forum"
+
+#: ../user/forum_moderate_thread.php:79
+msgid "Destination forum"
+msgstr "Destination forum"
+
+#: ../user/forum_moderate_thread.php:83
+msgid "New title:"
+msgstr "New title:"
+
+#: ../user/forum_post.php:44
+msgid ""
+"Only project admins may create a thread here. However, you may reply to "
+"existing threads."
+msgstr "Only project admins may create a thread here. However, you may reply to existing threads."
+
+#: ../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 "Your message was flagged as spam by the Akismet anti-spam system. Please modify your text and try again."
+
+#: ../user/forum_post.php:74
+msgid "Create new thread"
+msgstr "Create new thread"
+
+#: ../user/forum_post.php:104
+msgid "Create a new thread"
+msgstr "Create a new thread"
+
+#: ../user/forum_post.php:109
+msgid "Remember to add a title"
+msgstr "Remember to add a title"
+
+#: ../user/forum_post.php:131
+msgid "Show this item as a Notice in the BOINC Manager"
+msgstr "Show this item as a Notice in the BOINC Manager"
+
+#: ../user/forum_post.php:131
+msgid "Do so only for items likely to be of interest to all volunteers."
+msgstr "Do so only for items likely to be of interest to all volunteers."
+
+#: ../user/forum_rate.php:28
+msgid "Rating offline"
+msgstr "Rating offline"
+
+#: ../user/forum_rate.php:29
+msgid "This function is turned off by the project"
+msgstr "This function is turned off by the project"
+
+#: ../user/forum_rate.php:60
+msgid "You need more average or total credit to rate a post."
+msgstr "You need more average or total credit to rate a post."
+
+#: ../user/forum_rate.php:64
+msgid "You have already rated this post."
+msgstr "You have already rated this post."
+
+#: ../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 "Return to thread"
+
+#: ../user/forum_rate.php:74
+msgid "Input Recorded"
+msgstr "Input Recorded"
+
+#: ../user/forum_rate.php:75
+msgid "Your input has been recorded. Thanks for your help."
+msgstr "Your input has been recorded. Thanks for your help."
+
+#: ../user/forum_rate.php:77
+msgid "Vote Registered"
+msgstr "Vote Registered"
+
+#: ../user/forum_rate.php:78
+msgid "Your rating has been recorded. Thanks for your input."
+msgstr "Your rating has been recorded. Thanks for your input."
+
+#: ../user/forum_rate.php:82
+msgid "Vote Submission Problem"
+msgstr "Vote Submission Problem"
+
+#: ../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 "Your post has been flagged as spam by the Akismet anti-spam system. Please modify your text and try again."
+
+#: ../user/forum_reply.php:91 ../user/forum_thread.php:159
+#: ../user/forum_thread.php:284
+msgid "Post to thread"
+msgstr "Post to thread"
+
+#: ../user/forum_reply.php:143
+msgid "Message:"
+msgstr "Message:"
+
+#: ../user/forum_reply.php:146
+msgid "reply to %1Message ID%2:"
+msgstr "reply to %1Message ID%2:"
+
+#: ../user/forum_reply.php:172
+msgid "Post reply"
+msgstr "Post reply"
+
+#: ../user/forum_reply.php:175
+msgid "Add my signature to this reply"
+msgstr "Add my signature to this reply"
+
+#: ../user/forum_report_post.php:48
+msgid "You need more average or total credit to report a post."
+msgstr "You need more average or total credit to report a post."
+
+#: ../user/forum_report_post.php:68
+msgid "Report Registered"
+msgstr "Report Registered"
+
+#: ../user/forum_report_post.php:69
+msgid "Your report has been recorded. Thanks for your input."
+msgstr "Your report has been recorded. Thanks for your input."
+
+#: ../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 "A moderator will now look at your report and decide what will happen - this may take a little while, so please be patient"
+
+#: ../user/forum_report_post.php:74
+msgid "Report a forum post"
+msgstr "Report a forum post"
+
+#: ../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 "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."
+
+#: ../user/forum_report_post.php:83
+msgid "Report post"
+msgstr "Report post"
+
+#: ../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 "Why do you find the post offensive: %1Please include enough information so that a person that\nhas not yet read the thread will quickly be able to identify the issue.%2"
+
+#: ../user/forum_report_post.php:93
+msgid "Report not registered"
+msgstr "Report not registered"
+
+#: ../user/forum_report_post.php:94
+msgid "Your report could not be recorded. Please wait a while and try again."
+msgstr "Your report could not be recorded. Please wait a while and try again."
+
+#: ../user/forum_report_post.php:95
+msgid ""
+"If this is not a temporary error, please report it to the project "
+"developers."
+msgstr "If this is not a temporary error, please report it to the project developers."
+
+#: ../user/forum_rss.php:38
+msgid "%1 RSS feed"
+msgstr "%1 RSS feed"
+
+#: ../user/forum_rss.php:39
+msgid "This message board is available as an RSS feed."
+msgstr "This message board is available as an RSS feed."
+
+#: ../user/forum_rss.php:41
+msgid "Options:"
+msgstr "Options:"
+
+#: ../user/forum_rss.php:45
+msgid "Include only posts by user ID %1 (default: all users)."
+msgstr "Include only posts by user ID %1 (default: all users)."
+
+#: ../user/forum_rss.php:47
+msgid "Include only posts from the last %1 days (default: 30)."
+msgstr "Include only posts from the last %1 days (default: 30)."
+
+#: ../user/forum_rss.php:49
+msgid "Threads only: %1 (Include only the first post of every thread)"
+msgstr "Threads only: %1 (Include only the first post of every thread)"
+
+#: ../user/forum_search.php:29
+msgid "Forum search"
+msgstr "Forum search"
+
+#: ../user/forum_search.php:33
+msgid "Search query"
+msgstr "Search query"
+
+#: ../user/forum_search.php:34
+msgid "Search for keywords:"
+msgstr "Search for keywords:"
+
+#: ../user/forum_search.php:35
+msgid "Posts that contain all the specified words will be displayed"
+msgstr "Posts that contain all the specified words will be displayed"
+
+#: ../user/forum_search.php:37
+msgid "For example: \"screensaver freeze\""
+msgstr "For example: \"screensaver freeze\""
+
+#: ../user/forum_search.php:38
+msgid "Search for author ID:"
+msgstr "Search for author ID:"
+
+#: ../user/forum_search.php:39
+msgid "Only posts by this author will be displayed"
+msgstr "Only posts by this author will be displayed"
+
+#: ../user/forum_search.php:41
+msgid "For example: \"43214\""
+msgstr "For example: \"43214\""
+
+#: ../user/forum_search.php:43
+msgid "Search options"
+msgstr "Search options"
+
+#: ../user/forum_search.php:44
+msgid "Search limits"
+msgstr "Search limits"
+
+#: ../user/forum_search.php:45
+msgid "Search at most this many days back in time"
+msgstr "Search at most this many days back in time"
+
+#: ../user/forum_search.php:52 ../user/forum_search.php:53
+msgid "%1 months"
+msgstr "%1 months"
+
+#: ../user/forum_search.php:54
+msgid "1 year"
+msgstr "1 year"
+
+#: ../user/forum_search.php:55
+msgid "no limit"
+msgstr "no limit"
+
+#: ../user/forum_search.php:75
+msgid "Only display posts from this forum"
+msgstr "Only display posts from this forum"
+
+#: ../user/forum_search.php:86
+msgid "Sort by"
+msgstr "Sort by"
+
+#: ../user/forum_search.php:90
+msgid "Start the search"
+msgstr "Start the search"
+
+#: ../user/forum_search_action.php:143
+msgid "Forum search results"
+msgstr "Forum search results"
+
+#: ../user/forum_search_action.php:176
+msgid "Thread titles matching your query:"
+msgstr "Thread titles matching your query:"
+
+#: ../user/forum_search_action.php:196
+msgid "Messages matching your query:"
+msgstr "Messages matching your query:"
+
+#: ../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 "Sorry, couldn't find anything matching your search query. You can try to broaden your search by using less words (or less specific words)."
+
+#: ../user/forum_search_action.php:221
+msgid "You can also %1try the same search on Google.%2"
+msgstr "You can also %1try the same search on Google.%2"
+
+#: ../user/forum_search_action.php:226
+msgid "Perform another search"
+msgstr "Perform another search"
+
+#: ../user/forum_subscribe.php:48
+msgid "Subscription successful"
+msgstr "Subscription successful"
+
+#: ../user/forum_subscribe.php:51
+msgid ""
+"You are now subscribed to %1. You will be notified whenever there is a new "
+"post."
+msgstr "You are now subscribed to %1. You will be notified whenever there is a new post."
+
+#: ../user/forum_subscribe.php:53
+msgid "Subscription failed"
+msgstr "Subscription failed"
+
+#: ../user/forum_subscribe.php:54
+msgid ""
+"We are currently unable to subscribe you to %1. Please try again later.."
+msgstr "We are currently unable to subscribe you to %1. Please try again later.."
+
+#: ../user/forum_subscribe.php:63
+msgid "Unsubscription successful"
+msgstr "Unsubscription successful"
+
+#: ../user/forum_subscribe.php:66
+msgid ""
+"You are no longer subscribed to %1. You will no longer receive notifications"
+" for this thread."
+msgstr "You are no longer subscribed to %1. You will no longer receive notifications for this thread."
+
+#: ../user/forum_subscribe.php:68
+msgid "Unsubscription failed"
+msgstr "Unsubscription failed"
+
+#: ../user/forum_subscribe.php:69
+msgid ""
+"We are currently unable to unsubscribe you from %1. Please try again later.."
+msgstr "We are currently unable to unsubscribe you from %1. Please try again later.."
+
+#: ../user/forum_subscribe.php:76
+msgid "Unknown subscription action"
+msgstr "Unknown subscription action"
+
+#: ../user/forum_thread.php:66
+msgid "This forum is not visible to you."
+msgstr "This forum is not visible to you."
+
+#: ../user/forum_thread.php:74
+msgid "This thread has been hidden by moderators."
+msgstr "This thread has been hidden by moderators."
+
+#: ../user/forum_thread.php:129
+msgid "My question was answered"
+msgstr "My question was answered"
+
+#: ../user/forum_thread.php:130
+msgid "Click here if your question has been adequately answered"
+msgstr "Click here if your question has been adequately answered"
+
+#: ../user/forum_thread.php:138
+msgid "I've also got this question"
+msgstr "I've also got this question"
+
+#: ../user/forum_thread.php:160 ../user/forum_thread.php:285
+msgid "Add a new message to this thread"
+msgstr "Add a new message to this thread"
+
+#: ../user/forum_thread.php:172
+msgid "Unsubscribe"
+msgstr "Unsubscribe"
+
+#: ../user/forum_thread.php:173
+msgid "You are subscribed to this thread.  Click here to unsubscribe."
+msgstr "You are subscribed to this thread.  Click here to unsubscribe."
+
+#: ../user/forum_thread.php:179
+msgid "Subscribe"
+msgstr "Subscribe"
+
+#: ../user/forum_thread.php:180
+msgid "Click to get email when there are new posts in this thread"
+msgstr "Click to get email when there are new posts in this thread"
+
+#: ../user/forum_thread.php:191
+msgid "Unhide this thread"
+msgstr "Unhide this thread"
+
+#: ../user/forum_thread.php:197
+msgid "Hide this thread"
+msgstr "Hide this thread"
+
+#: ../user/forum_thread.php:203
+msgid "Make unsticky"
+msgstr "Make unsticky"
+
+#: ../user/forum_thread.php:204
+msgid "Make this thread not sticky"
+msgstr "Make this thread not sticky"
+
+#: ../user/forum_thread.php:209
+msgid "Make sticky"
+msgstr "Make sticky"
+
+#: ../user/forum_thread.php:210
+msgid "Make this thread always appear at top of forum"
+msgstr "Make this thread always appear at top of forum"
+
+#: ../user/forum_thread.php:216
+msgid "Unlock"
+msgstr "Unlock"
+
+#: ../user/forum_thread.php:217
+msgid "Allow new posts in this thread"
+msgstr "Allow new posts in this thread"
+
+#: ../user/forum_thread.php:222
+msgid "Lock"
+msgstr "Lock"
+
+#: ../user/forum_thread.php:223
+msgid "Don't allow new posts in this thread"
+msgstr "Don't allow new posts in this thread"
+
+#: ../user/forum_thread.php:230
+msgid "Move this thread to a different forum"
+msgstr "Move this thread to a different forum"
+
+#: ../user/forum_thread.php:235
+msgid "Edit title"
+msgstr "Edit title"
+
+#: ../user/forum_thread.php:236
+msgid "Edit thread title"
+msgstr "Edit thread title"
+
+#: ../user/forum_thread.php:244
+msgid "Delete thread permanently"
+msgstr "Delete thread permanently"
+
+#: ../user/forum_thread.php:254
+msgid "Export as Notice"
+msgstr "Export as Notice"
+
+#: ../user/forum_thread.php:260
+msgid "Don't export"
+msgstr "Don't export"
+
+#: ../user/forum_thread.php:261
+msgid "Don't export this news item as a Notice"
+msgstr "Don't export this news item as a Notice"
+
+#: ../user/forum_thread.php:270 ../user/forum_thread.php:272
+msgid "Sort"
+msgstr "Sort"
+
+#: ../user/forum_thread_status.php:54
+msgid "Thread status updated"
+msgstr "Thread status updated"
+
+#: ../user/forum_thread_status.php:55
+msgid "The status has been updated."
+msgstr "The status has been updated."
+
+#: ../user/forum_user_posts.php:75
+msgid "Posts by %1"
+msgstr "Posts by %1"
+
+#: ../user/friend.php:35
+msgid "Already friends"
+msgstr "Already friends"
+
+#: ../user/friend.php:41
+msgid "You requested friendship with %1 on %2."
+msgstr "You requested friendship with %1 on %2."
+
+#: ../user/friend.php:43
+msgid "This request is still pending confirmation."
+msgstr "This request is still pending confirmation."
+
+#: ../user/friend.php:54
+msgid "%1 is not accepting friendship requests from you"
+msgstr "%1 is not accepting friendship requests from you"
+
+#: ../user/friend.php:63
+msgid "You can't be friends with yourself"
+msgstr "You can't be friends with yourself"
+
+#: ../user/friend.php:71
+msgid "Add friend"
+msgstr "Add friend"
+
+#: ../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 "You have asked to add %1 as a friend. We will notify %1 and will ask him/her to confirm that you are friends."
+
+#: ../user/friend.php:79
+msgid "Add an optional message here:"
+msgstr "Add an optional message here:"
+
+#: ../user/friend.php:117
+msgid "Friend request sent"
+msgstr "Friend request sent"
+
+#: ../user/friend.php:118
+msgid "We have notified %1 of your request."
+msgstr "We have notified %1 of your request."
+
+#: ../user/friend.php:128
+msgid "Please log in as %1"
+msgstr "Please log in as %1"
+
+#: ../user/friend.php:129
+msgid "You must log in as %1 to view this friend request"
+msgstr "You must log in as %1 to view this friend request"
+
+#: ../user/friend.php:140
+msgid "Friend request"
+msgstr "Friend request"
+
+#: ../user/friend.php:143
+msgid "%1 has requested friendship with you."
+msgstr "%1 has requested friendship with you."
+
+#: ../user/friend.php:145
+msgid "%1 says: %2"
+msgstr "%1 says: %2"
+
+#: ../user/friend.php:148
+msgid "Accept friendship"
+msgstr "Accept friendship"
+
+#: ../user/friend.php:148
+msgid "Click accept if %1 is in fact a friend"
+msgstr "Click accept if %1 is in fact a friend"
+
+#: ../user/friend.php:149
+msgid "Decline"
+msgstr "Decline"
+
+#: ../user/friend.php:149
+msgid "Click decline if %1 is not a friend"
+msgstr "Click decline if %1 is not a friend"
+
+#: ../user/friend.php:188
+msgid "Friendship confirmed"
+msgstr "Friendship confirmed"
+
+#: ../user/friend.php:189
+msgid "Your friendship with %1 has been confirmed."
+msgstr "Your friendship with %1 has been confirmed."
+
+#: ../user/friend.php:207
+msgid "Friendship declined"
+msgstr "Friendship declined"
+
+#: ../user/friend.php:208
+msgid "You have declined friendship with %1"
+msgstr "You have declined friendship with %1"
+
+#: ../user/friend.php:223
+msgid "Notification not found"
+msgstr "Notification not found"
+
+#: ../user/friend.php:225
+msgid "Friend confirmed"
+msgstr "Friend confirmed"
+
+#: ../user/friend.php:226
+msgid "You are now friends with %1."
+msgstr "You are now friends with %1."
+
+#: ../user/friend.php:234
+msgid "Cancel friendship?"
+msgstr "Cancel friendship?"
+
+#: ../user/friend.php:236
+msgid "Are you sure you want to cancel your friendship with %1?"
+msgstr "Are you sure you want to cancel your friendship with %1?"
+
+#: ../user/friend.php:241
+msgid "Stay friends"
+msgstr "Stay friends"
+
+#: ../user/friend.php:251
+msgid "Friendship cancelled"
+msgstr "Friendship cancelled"
+
+#: ../user/friend.php:252
+msgid "Your friendship with %1 has been cancelled."
+msgstr "Your friendship with %1 has been cancelled."
+
+#: ../user/get_passwd.php:27
+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:"
+
+#: ../user/get_passwd.php:28
+msgid ""
+"Enter the email address below, and click OK. You will be sent email "
+"instructions for resetting your password."
+msgstr "Enter the email address below, and click OK. You will be sent email instructions for resetting your password."
+
+#: ../user/get_passwd.php:46
+msgid ""
+"2) If you forgot your account's email address, or you can't receive email "
+"there:"
+msgstr "2) If you forgot your account's email address, or you can't receive email there:"
+
+#: ../user/get_passwd.php:47
+msgid ""
+"If you have run BOINC under this account, you can still access it. Here's "
+"how:"
+msgstr "If you have run BOINC under this account, you can still access it. Here's how:"
+
+#: ../user/get_passwd.php:50
+msgid ""
+"Go to the BOINC data directory on your computer (its location is written to "
+"the Event Log at startup)."
+msgstr "Go to the BOINC data directory on your computer (its location is written to the Event Log at startup)."
+
+#: ../user/get_passwd.php:51
+msgid "Find your account file for this project; it will be named <b>%1</b>."
+msgstr "Find your account file for this project; it will be named <b>%1</b>."
+
+#: ../user/get_passwd.php:52
+msgid "Open the file in a text editor like Notepad. You'll see something like"
+msgstr "Open the file in a text editor like Notepad. You'll see something like"
+
+#: ../user/get_passwd.php:62
+msgid ""
+"Select and Copy the string between %1 and %2 (%3 in the above example)."
+msgstr "Select and Copy the string between %1 and %2 (%3 in the above example)."
+
+#: ../user/get_passwd.php:64
+msgid "Paste the string into the field below, and click OK."
+msgstr "Paste the string into the field below, and click OK."
+
+#: ../user/get_passwd.php:65
+msgid ""
+"You will now be logged in to your account; update the email and password of "
+"your account."
+msgstr "You will now be logged in to your account; update the email and password of your account."
+
+#: ../user/get_passwd.php:71
+msgid "Log in with authenticator"
+msgstr "Log in with authenticator"
+
+#: ../user/get_passwd.php:81
+msgid "Forgot your account info?"
+msgstr "Forgot your account info?"
+
+#: ../user/gpu_list.php:150 ../user/gpu_list.php:176
+msgid "No GPU tasks reported"
+msgstr "No GPU tasks reported"
+
+#: ../user/gpu_list.php:206
+msgid "Top GPU models"
+msgstr "Top GPU models"
+
+#: ../user/gpu_list.php:207
+msgid ""
+"The following lists show the most productive GPU models on different "
+"platforms.  Relative speeds, measured by average elapsed time of tasks, are "
+"shown in parentheses."
+msgstr "The following lists show the most productive GPU models on different platforms.  Relative speeds, measured by average elapsed time of tasks, are shown in parentheses."
+
+#: ../user/home.php:42
+msgid "Welcome to %1"
+msgstr "Welcome to %1"
+
+#: ../user/home.php:43
+msgid "View and edit your account preferences using the links below."
+msgstr "View and edit your account preferences using the links below."
+
+#: ../user/home.php:46
+msgid "If you have not already done so, %1download BOINC client software%2."
+msgstr "If you have not already done so, %1download BOINC client software%2."
+
+#: ../user/home.php:49 ../project.sample/project.inc:70
+msgid "Your account"
+msgstr "Your account"
+
+#: ../user/host_app_versions.php:37
+msgid "Anonymous platform, missing app"
+msgstr "Anonymous platform, missing app"
+
+#: ../user/host_app_versions.php:40
+msgid "anonymous platform"
+msgstr "anonymous platform"
+
+#: ../user/host_app_versions.php:43
+msgid "Missing app version"
+msgstr "Missing app version"
+
+#: ../user/host_app_versions.php:45
+msgid "Missing app"
+msgstr "Missing app"
+
+#: ../user/host_app_versions.php:47
+msgid "Missing platform"
+msgstr "Missing platform"
+
+#: ../user/host_app_versions.php:56
+msgid "Number of tasks completed"
+msgstr "Number of tasks completed"
+
+#: ../user/host_app_versions.php:57
+msgid "Max tasks per day"
+msgstr "Max tasks per day"
+
+#: ../user/host_app_versions.php:58
+msgid "Number of tasks today"
+msgstr "Number of tasks today"
+
+#: ../user/host_app_versions.php:59
+msgid "Consecutive valid tasks"
+msgstr "Consecutive valid tasks"
+
+#: ../user/host_app_versions.php:63
+msgid "Average processing rate"
+msgstr "Average processing rate"
+
+#: ../user/host_app_versions.php:72
+msgid "Application details for host %1"
+msgstr "Application details for host %1"
+
+#: ../user/host_delete.php:31
+msgid "We have no record of that computer."
+msgstr "We have no record of that computer."
+
+#: ../user/host_delete.php:38
+msgid ""
+"You can not delete our record of this computer because our database still "
+"contains work for it. You must wait a few days until the work for this "
+"computer has been deleted from the project database."
+msgstr "You can not delete our record of this computer because our database still contains work for it. You must wait a few days until the work for this computer has been deleted from the project database."
+
+#: ../user/host_delete.php:40
+msgid "Delete record of computer"
+msgstr "Delete record of computer"
+
+#: ../user/host_delete.php:41
+msgid "Record deleted."
+msgstr "Record deleted."
+
+#: ../user/host_delete.php:42 ../user/host_edit_action.php:65
+msgid "Return to list of your computers"
+msgstr "Return to list of your computers"
+
+#: ../user/host_edit_action.php:39
+msgid "Merge computer records"
+msgstr "Merge computer records"
+
+#: ../user/host_edit_form.php:35
+msgid "Merge computers"
+msgstr "Merge computers"
+
+#: ../user/host_edit_form.php:38
+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."
+
+#: ../user/host_edit_form.php:56
+msgid "No hosts are eligible for merging with this one."
+msgstr "No hosts are eligible for merging with this one."
+
+#: ../user/host_edit_form.php:58 ../user/host_edit_form.php:114
+msgid "Show details"
+msgstr "Show details"
+
+#: ../user/host_edit_form.php:66
+msgid ""
+"Check the computers that are the same as %1 (created %2, computer ID %3):"
+msgstr "Check the computers that are the same as %1 (created %2, computer ID %3):"
+
+#: ../user/host_edit_form.php:70 ../user/workunit.php:39
+msgid "name"
+msgstr "name"
+
+#: ../user/host_edit_form.php:70 ../user/workunit.php:41
+msgid "created"
+msgstr "created"
+
+#: ../user/host_edit_form.php:70
+msgid "computer ID"
+msgstr "computer ID"
+
+#: ../user/host_edit_form.php:77
+msgid "no hostname"
+msgstr "no hostname"
+
+#: ../user/host_edit_form.php:109
+msgid "Merge hosts"
+msgstr "Merge hosts"
+
+#: ../user/host_update_credit.php:27
+msgid "Updating computer credit"
+msgstr "Updating computer credit"
+
+#: ../user/host_update_credit.php:37
+msgid "Host credit updated"
+msgstr "Host credit updated"
+
+#: ../user/host_venue_action.php:41
+msgid "Host venue updated"
+msgstr "Host venue updated"
+
+#: ../user/host_venue_action.php:43
+msgid "none"
+msgstr "none"
+
+#: ../user/host_venue_action.php:46
+msgid "The venue of this host has been set to %1."
+msgstr "The venue of this host has been set to %1."
+
+#: ../user/host_venue_action.php:48
+msgid ""
+"This change will take effect the next time the host communicates with this "
+"project."
+msgstr "This change will take effect the next time the host communicates with this project."
+
+#: ../user/host_venue_action.php:50
+msgid "Return to host page"
+msgstr "Return to host page"
+
+#: ../user/hosts_user.php:53
+msgid "Computers belonging to %1"
+msgstr "Computers belonging to %1"
+
+#: ../user/hosts_user.php:55
+msgid "Computers hidden"
+msgstr "Computers hidden"
+
+#: ../user/hosts_user.php:56
+msgid ""
+"This user has chosen not to show information about his or her computers."
+msgstr "This user has chosen not to show information about his or her computers."
+
+#: ../user/hosts_user.php:64
+msgid "Your computers"
+msgstr "Your computers"
+
+#: ../user/html.php:23
+msgid "Allowed HTML tags"
+msgstr "Allowed HTML tags"
+
+#: ../user/html.php:25
+msgid "The following HTML tags are allowed in team descriptions:"
+msgstr "The following HTML tags are allowed in team descriptions:"
+
+#: ../user/html.php:27
+msgid "bold"
+msgstr "bold"
+
+#: ../user/html.php:28
+msgid "italics"
+msgstr "italics"
+
+#: ../user/html.php:29
+msgid "hyperlink"
+msgstr "hyperlink"
+
+#: ../user/html.php:30
+msgid "paragraph"
+msgstr "paragraph"
+
+#: ../user/html.php:31
+msgid "break"
+msgstr "break"
+
+#: ../user/html.php:32
+msgid "preformatted"
+msgstr "preformatted"
+
+#: ../user/html.php:33
+msgid ""
+"image; height cannot exceed 450 pixels. Please do not link to images without"
+" permission of the web site where the image is hosted."
+msgstr "image; height cannot exceed 450 pixels. Please do not link to images without permission of the web site where the image is hosted."
+
+#: ../user/html.php:35
+msgid "You can also use ampersand notation for special characters."
+msgstr "You can also use ampersand notation for special characters."
+
+#: ../user/info.php:24 ../user/sample_index.php:78
+msgid "Read our rules and policies"
+msgstr "Read our rules and policies"
+
+#: ../user/info.php:35
+msgid "Run %1 only on authorized computers"
+msgstr "Run %1 only on authorized computers"
+
+#: ../user/info.php:36
+msgid ""
+"Run %1 only on computers that you own, or for which you have obtained the "
+"owner's permission. Some companies and schools have policies that prohibit "
+"using their computers for projects such as %1."
+msgstr "Run %1 only on computers that you own, or for which you have obtained the owner's permission. Some companies and schools have policies that prohibit using their computers for projects such as %1."
+
+#: ../user/info.php:38
+msgid "How %1 will use your computer"
+msgstr "How %1 will use your computer"
+
+#: ../user/info.php:39
+msgid ""
+"When you run %1 on your computer, it will use part of the computer's CPU "
+"power, disk space, and network bandwidth. You can control how much of your "
+"resources are used by %1, and when it uses them."
+msgstr "When you run %1 on your computer, it will use part of the computer's CPU power, disk space, and network bandwidth. You can control how much of your resources are used by %1, and when it uses them."
+
+#: ../user/info.php:40
+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 "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."
+
+#: ../user/info.php:42
+msgid "Privacy policy"
+msgstr "Privacy policy"
+
+#: ../user/info.php:43
+msgid ""
+"Your account on %1 is identified by a name that you choose. This name may be"
+" shown on the %1 web site, along with a summary of the work your computer "
+"has done for %1. If you want to be anonymous, choose a name that doesn't "
+"reveal your identity."
+msgstr "Your account on %1 is identified by a name that you choose. This name may be shown on the %1 web site, along with a summary of the work your computer has done for %1. If you want to be anonymous, choose a name that doesn't reveal your identity."
+
+#: ../user/info.php:44
+msgid ""
+"If you participate in %1, information about your computer (such as its "
+"processor type, amount of memory, etc.) will be recorded by %1 and used to "
+"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 "If you participate in %1, information about your computer (such as its processor type, amount of memory, etc.) will be recorded by %1 and used to 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."
+
+#: ../user/info.php:45
+msgid ""
+"To participate in %1, you must give an address where you receive email. This"
+" address will not be shown on the %1 web site or shared with organizations. "
+"%1 may send you periodic newsletters; however, you can opt out at any time."
+msgstr "To participate in %1, you must give an address where you receive email. This address will not be shown on the %1 web site or shared with organizations. %1 may send you periodic newsletters; however, you can opt out at any time."
+
+#: ../user/info.php:46
+msgid ""
+"Private messages sent on the %1 web site are visible only to the sender and "
+"recipient.  %1 does not examine or police the content of private messages.  "
+"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 "Private messages sent on the %1 web site are visible only to the sender and recipient.  %1 does not examine or police the content of private messages.  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."
+
+#: ../user/info.php:47
+msgid ""
+"If you use our web site forums you must follow the %2posting guidelines%3.  "
+"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 "If you use our web site forums you must follow the %2posting guidelines%3.  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."
+
+#: ../user/info.php:48
+msgid "Is it safe to run %1?"
+msgstr "Is it safe to run %1?"
+
+#: ../user/info.php:49
+msgid ""
+"Any time you download a program through the Internet you are taking a "
+"chance: the program might have dangerous errors, or the download server "
+"might have been hacked. %1 has made efforts to minimize these risks. We have"
+" tested our applications carefully. Our servers are behind a firewall and "
+"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 "Any time you download a program through the Internet you are taking a chance: the program might have dangerous errors, or the download server might have been hacked. %1 has made efforts to minimize these risks. We have tested our applications carefully. Our servers are behind a firewall and 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."
+
+#: ../user/info.php:50
+msgid ""
+"The applications run by %1 may cause some computers to overheat. If this "
+"happens, stop running %1 or use a %2utility program%3 that limits CPU usage."
+msgstr "The applications run by %1 may cause some computers to overheat. If this happens, stop running %1 or use a %2utility program%3 that limits CPU usage."
+
+#: ../user/info.php:51
+msgid ""
+"%1 was developed by %2. BOINC was developed at the University of California."
+msgstr "%1 was developed by %2. BOINC was developed at the University of California."
+
+#: ../user/info.php:53
+msgid "Liability"
+msgstr "Liability"
+
+#: ../user/info.php:54
+msgid ""
+"%1 and %2 assume no liability for damage to your computer, loss of data, or "
+"any other event or condition that may occur as a result of participating in "
+"%1."
+msgstr "%1 and %2 assume no liability for damage to your computer, loss of data, or any other event or condition that may occur as a result of participating in %1."
+
+#: ../user/info.php:56
+msgid "Other BOINC projects"
+msgstr "Other BOINC projects"
+
+#: ../user/info.php:57
+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 "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."
+
+#: ../user/info.php:58
+msgid ""
+"These other projects are not associated with %1, and we cannot vouch for "
+"their security practices or the nature of their research. Join them at your "
+"own risk."
+msgstr "These other projects are not associated with %1, and we cannot vouch for their security practices or the nature of their research. Join them at your own risk."
+
+#: ../user/language_select.php:47
+msgid "Language selection"
+msgstr "Language selection"
+
+#: ../user/language_select.php:73
+msgid ""
+"This web site is available in several languages. The currently selected "
+"language is %1."
+msgstr "This web site is available in several languages. The currently selected language is %1."
+
+#: ../user/language_select.php:78
+msgid ""
+"Normally the choice of language is determined by your browser's language "
+"setting, which is: %1.  You can change this setting using:"
+msgstr "Normally the choice of language is determined by your browser's language setting, which is: %1.  You can change this setting using:"
+
+#: ../user/language_select.php:83
+msgid "Firefox: Tools/Options/General"
+msgstr "Firefox: Tools/Options/General"
+
+#: ../user/language_select.php:85
+msgid "Microsoft IE: Tools/Internet Options/Languages"
+msgstr "Microsoft IE: Tools/Internet Options/Languages"
+
+#: ../user/language_select.php:89
+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 "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."
+
+#: ../user/language_select.php:95
+msgid "Language name (click to select)"
+msgstr "Language name (click to select)"
+
+#: ../user/language_select.php:97
+msgid "Use browser language setting"
+msgstr "Use browser language setting"
+
+#: ../user/language_select.php:113
+msgid ""
+"Translations are done by volunteers.  If your native language is not here, "
+"%1you can provide a translation%2."
+msgstr "Translations are done by volunteers.  If your native language is not here, %1you can provide a translation%2."
+
+#: ../user/login_form.php:57
+msgid "or %1create an account%2."
+msgstr "or %1create an account%2."
+
+#: ../user/merge_by_name.php:31
+msgid "Processing %1"
+msgstr "Processing %1"
+
+#: ../user/merge_by_name.php:43
+msgid "Merged %1 into %2"
+msgstr "Merged %1 into %2"
+
+#: ../user/merge_by_name.php:72
+msgid "Return to the list of your computers"
+msgstr "Return to the list of your computers"
+
+#: ../user/merge_by_name.php:76
+msgid ""
+"This operation merges computers based on their domain name.\n"
+"        <p>\n"
+"        For each domain name, it will merge all older computers\n"
+"        having that name with the newest computer having that name.\n"
+"        Incompatible computers will not be merged.\n"
+"        <p>"
+msgstr "This operation merges computers based on their domain name.\n        <p>\n        For each domain name, it will merge all older computers\n        having that name with the newest computer having that name.\n        Incompatible computers will not be merged.\n        <p>"
+
+#: ../user/merge_by_name.php:82
+msgid "Go ahead and do this"
+msgstr "Go ahead and do this"
+
+#: ../user/merge_by_name.php:83
+msgid "Return to the list of computers"
+msgstr "Return to the list of computers"
+
+#: ../user/moderation.php:26
+msgid ""
+"\n"
+"To maximize discussion and flow of information,\n"
+"our message boards are moderated.\n"
+"Message board postings are subject to the following posting rules:\n"
+msgstr "\nTo maximize discussion and flow of information,\nour message boards are moderated.\nMessage board postings are subject to the following posting rules:\n"
+
+#: ../user/moderation.php:30
+msgid ""
+"\n"
+"<p>\n"
+"Moderators may delete posts that violate any of these rules.\n"
+"The authors of deleted posts will be notified via email.\n"
+"Gross offenders may have their ability to post messages temporarily revoked\n"
+"(though to prevent abuse only project administrators have the ability to do so).\n"
+"Additional kinds of bad behavior (\"bugging\" posts to trap the\n"
+"IP addresses of other participants, excessive thread creation to spam\n"
+"the forums, etc.), while not listed in the formal rules, may still\n"
+"lead to similar penalties.\n"
+"<p>\n"
+"If you think a post violates any of the posting rules,\n"
+"click the red X on the post and fill out the form;\n"
+"moderators will be notified of your complaint.\n"
+"Please use this button only for clear violations - not\n"
+"personal disputes.\n"
+"<p>\n"
+"We try to be as fair as we can when moderating,\n"
+"but in a large community of users, with many different viewpoints,\n"
+"there will always be some people that will not be happy\n"
+"with our moderation decisions.\n"
+"While we regret that this happens,\n"
+"please realize that we cannot suit all of the people all of the time\n"
+"and have to make decisions based on our resources and\n"
+"what is best for the forum overall.\n"
+"Please don't discuss our moderation policy on the forums. We aren't\n"
+"a social engineering project nor are we in the business of creating\n"
+"a perfectly fair system. So such discussions tend to be counterproductive\n"
+"and potentially incendiary. If you have a legitimate claim,\n"
+"send email to the address below.\n"
+"<p>\n"
+"This moderation policy is set by the %1 project.\n"
+"If you have comments about the policy, email %2.\n"
+"\n"
+msgstr "\n<p>\nModerators may delete posts that violate any of these rules.\nThe authors of deleted posts will be notified via email.\nGross offenders may have their ability to post messages temporarily revoked\n(though to prevent abuse only project administrators have the ability to do so).\nAdditional kinds of bad behavior (\"bugging\" posts to trap the\nIP addresses of other participants, excessive thread creation to spam\nthe forums, etc.), while not listed in the formal rules, may s [...]
+
+#: ../user/pending.php:66
+msgid "Pending credit"
+msgstr "Pending credit"
+
+#: ../user/pending.php:68
+msgid "Result ID"
+msgstr "Result ID"
+
+#: ../user/pending.php:68
+msgid "Workunit ID"
+msgstr "Workunit ID"
+
+#: ../user/pending.php:68
+msgid "Host ID"
+msgstr "Host ID"
+
+#: ../user/pending.php:68
+msgid "Claimed credit"
+msgstr "Claimed credit"
+
+#: ../user/pending.php:81
+msgid "Pending credit: %1"
+msgstr "Pending credit: %1"
+
+#: ../user/pm.php:32
+msgid "Block messages from this user"
+msgstr "Block messages from this user"
+
+#: ../user/pm.php:32
+msgid "Block user"
+msgstr "Block user"
+
+#: ../user/pm.php:73
+msgid "Your message has been sent."
+msgstr "Your message has been sent."
+
+#: ../user/pm.php:83
+msgid "You have no private messages."
+msgstr "You have no private messages."
+
+#: ../user/pm.php:90
+msgid "Sender and date"
+msgstr "Sender and date"
+
+#: ../user/pm.php:111
+msgid "Reply to this message"
+msgstr "Reply to this message"
+
+#: ../user/pm.php:112
+msgid "Delete this message"
+msgstr "Delete this message"
+
+#: ../user/pm.php:117
+msgid "Select all"
+msgstr "Select all"
+
+#: ../user/pm.php:119
+msgid "Unselect all"
+msgstr "Unselect all"
+
+#: ../user/pm.php:122
+msgid "Delete selected messages"
+msgstr "Delete selected messages"
+
+#: ../user/pm.php:145
+msgid "Sender"
+msgstr "Sender"
+
+#: ../user/pm.php:148
+msgid "Date"
+msgstr "Date"
+
+#: ../user/pm.php:190
+msgid "You need to fill all fields to send a private message"
+msgstr "You need to fill all fields to send a private message"
+
+#: ../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 "Your message was flagged as spam\n                by the Akismet anti-spam system.\n                Please modify your text and try again."
+
+#: ../user/pm.php:210
+msgid "Could not find user with id %1"
+msgstr "Could not find user with id %1"
+
+#: ../user/pm.php:215
+msgid "Could not find user with username %1"
+msgstr "Could not find user with username %1"
+
+#: ../user/pm.php:217
+msgid "%1 is not a unique username; you will have to use user ID"
+msgstr "%1 is not a unique username; you will have to use user ID"
+
+#: ../user/pm.php:222
+msgid "User %1 (ID: %2) is not accepting private messages from you."
+msgstr "User %1 (ID: %2) is not accepting private messages from you."
+
+#: ../user/pm.php:245 ../user/view_profile.php:28
+msgid "No such user"
+msgstr "No such user"
+
+#: ../user/pm.php:247
+msgid "Really block %1?"
+msgstr "Really block %1?"
+
+#: ../user/pm.php:248
+msgid ""
+"Are you really sure you want to block user %1 from sending you private "
+"messages?"
+msgstr "Are you really sure you want to block user %1 from sending you private messages?"
+
+#: ../user/pm.php:249
+msgid "Please note that you can only block a limited amount of users."
+msgstr "Please note that you can only block a limited amount of users."
+
+#: ../user/pm.php:250
+msgid ""
+"Once the user has been blocked you can unblock it using forum preferences "
+"page."
+msgstr "Once the user has been blocked you can unblock it using forum preferences page."
+
+#: ../user/pm.php:257
+msgid "No, cancel"
+msgstr "No, cancel"
+
+#: ../user/pm.php:265 ../user/team_admins.php:100
+msgid "no such user"
+msgstr "no such user"
+
+#: ../user/pm.php:268
+msgid "User %1 blocked"
+msgstr "User %1 blocked"
+
+#: ../user/pm.php:270
+msgid "User %1 has been blocked from sending you private messages."
+msgstr "User %1 has been blocked from sending you private messages."
+
+#: ../user/pm.php:271
+msgid "To unblock, visit %1message board preferences%2"
+msgstr "To unblock, visit %1message board preferences%2"
+
+#: ../user/pm.php:307
+msgid "Unknown action"
+msgstr "Unknown action"
+
+#: ../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 "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."
+
+#: ../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 "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."
+
+#: ../user/prefs_edit.php:66 ../user/prefs_edit.php:94
+msgid "%1 for %2"
+msgstr "%1 for %2"
+
+#: ../user/prefs_edit.php:112
+msgid "Back to preferences"
+msgstr "Back to preferences"
+
+#: ../user/prefs_remove.php:46
+msgid "Confirm delete preferences"
+msgstr "Confirm delete preferences"
+
+#: ../user/prefs_remove.php:49
+msgid "Are you sure you want to delete your separate %1 preferences for %2?"
+msgstr "Are you sure you want to delete your separate %1 preferences for %2?"
+
+#: ../user/prefs_remove.php:53
+msgid "Remove preferences"
+msgstr "Remove preferences"
+
+#: ../user/prefs_remove.php:55
+msgid "Cancel"
+msgstr "Cancel"
+
+#: ../user/profile_menu.php:34 ../user/sample_index.php:119
+msgid "Profiles"
+msgstr "Profiles"
+
+#: ../user/profile_menu.php:37
+msgid ""
+"%1Profiles%2 let individuals share backgrounds and opinions with the %3 "
+"community."
+msgstr "%1Profiles%2 let individuals share backgrounds and opinions with the %3 community."
+
+#: ../user/profile_menu.php:38
+msgid ""
+"Explore the diversity of your fellow volunteers, and contribute your own "
+"views for others to enjoy."
+msgstr "Explore the diversity of your fellow volunteers, and contribute your own views for others to enjoy."
+
+#: ../user/profile_menu.php:39
+msgid ""
+"If you haven't already, you can %1create your own user profile%2 for others "
+"to see!"
+msgstr "If you haven't already, you can %1create your own user profile%2 for others to see!"
+
+#: ../user/profile_menu.php:44
+msgid "User of the Day"
+msgstr "User of the Day"
+
+#: ../user/profile_menu.php:59
+msgid "User Profile Explorer"
+msgstr "User Profile Explorer"
+
+#: ../user/profile_menu.php:62
+msgid "View the %1User Picture Gallery%2."
+msgstr "View the %1User Picture Gallery%2."
+
+#: ../user/profile_menu.php:63
+msgid "Browse profiles %1by country%2."
+msgstr "Browse profiles %1by country%2."
+
+#: ../user/profile_menu.php:64
+msgid ""
+"Browse profiles %1at random%2, %3at random with pictures%2, or %4at random "
+"without pictures%2."
+msgstr "Browse profiles %1at random%2, %3at random with pictures%2, or %4at random without pictures%2."
+
+#: ../user/profile_menu.php:68
+msgid "Alphabetical profile listings:"
+msgstr "Alphabetical profile listings:"
+
+#: ../user/profile_menu.php:74
+msgid "Search profile text"
+msgstr "Search profile text"
+
+#: ../user/profile_menu.php:100
+msgid "No profiles"
+msgstr "No profiles"
+
+#: ../user/profile_menu.php:101
+msgid "No profiles matched your query."
+msgstr "No profiles matched your query."
+
+#: ../user/profile_rate.php:31
+msgid "Invalid vote type:"
+msgstr "Invalid vote type:"
+
+#: ../user/profile_rate.php:36
+msgid "Vote Recorded"
+msgstr "Vote Recorded"
+
+#: ../user/profile_rate.php:40
+msgid "Thank you"
+msgstr "Thank you"
+
+#: ../user/profile_rate.php:43
+msgid "Your recommendation has been recorded."
+msgstr "Your recommendation has been recorded."
+
+#: ../user/profile_rate.php:45
+msgid "Your vote to reject this profile has been recorded."
+msgstr "Your vote to reject this profile has been recorded."
+
+#: ../user/profile_rate.php:48
+msgid "Return to profile."
+msgstr "Return to profile."
+
+#: ../user/profile_search_action.php:38
+msgid "Profiles containing '%1'"
+msgstr "Profiles containing '%1'"
+
+#: ../user/profile_search_action.php:42
+msgid "User name"
+msgstr "User name"
+
+#: ../user/profile_search_action.php:43
+msgid "Joined project"
+msgstr "Joined project"
+
+#: ../user/profile_search_action.php:46
+msgid "Recent credit"
+msgstr "Recent credit"
+
+#: ../user/profile_search_action.php:56
+msgid "No profiles found containing '%1'"
+msgstr "No profiles found containing '%1'"
+
+#: ../user/result.php:35
+msgid "Task %1"
+msgstr "Task %1"
+
+#: ../user/results.php:29
+msgid "This feature is turned off temporarily"
+msgstr "This feature is turned off temporarily"
+
+#: ../user/results.php:56
+msgid "No computer with ID %1 found"
+msgstr "No computer with ID %1 found"
+
+#: ../user/results.php:63
+msgid "No access"
+msgstr "No access"
+
+#: ../user/results.php:69
+msgid "Missing user ID or host ID"
+msgstr "Missing user ID or host ID"
+
+#: ../user/results.php:107
+msgid "No tasks to display"
+msgstr "No tasks to display"
+
+#: ../user/sample_index.php:195
+msgid "User of the day"
+msgstr "User of the day"
+
+#: ../user/server_status.php:59
+msgid "Not Running"
+msgstr "Not Running"
+
+#: ../user/server_status.php:63
+msgid "Running"
+msgstr "Running"
+
+#: ../user/server_status.php:67
+msgid "Disabled"
+msgstr "Disabled"
+
+#: ../user/server_status.php:105
+msgid "Project status"
+msgstr "Project status"
+
+#: ../user/server_status.php:110
+msgid "Server status"
+msgstr "Server status"
+
+#: ../user/server_status.php:113
+msgid "Program"
+msgstr "Program"
+
+#: ../user/server_status.php:113
+msgid "Host"
+msgstr "Host"
+
+#: ../user/server_status.php:125
+msgid "Database schema version: "
+msgstr "Database schema version: "
+
+#: ../user/server_status.php:134
+msgid "Computing status"
+msgstr "Computing status"
+
+#: ../user/server_status.php:149
+msgid "Users"
+msgstr "Users"
+
+#: ../user/server_status.php:161
+msgid "Tasks by application"
+msgstr "Tasks by application"
+
+#: ../user/server_status.php:164
+msgid "Runtime of last 100 tasks in hours: average, min, max"
+msgstr "Runtime of last 100 tasks in hours: average, min, max"
+
+#: ../user/server_status.php:165
+msgid "Users in last 24 hours"
+msgstr "Users in last 24 hours"
+
+#: ../user/show_host_detail.php:40
+msgid "Computer %1"
+msgstr "Computer %1"
+
+#: ../user/stats.php:21
+msgid "Statistics and leaderboards"
+msgstr "Statistics and leaderboards"
+
+#: ../user/stats.php:30
+msgid "Statistics for %1"
+msgstr "Statistics for %1"
+
+#: ../user/stats.php:32 ../user/top_users.php:117
+msgid "Top participants"
+msgstr "Top participants"
+
+#: ../user/stats.php:40 ../user/team.php:48
+msgid "Top teams"
+msgstr "Top teams"
+
+#: ../user/stats.php:47
+msgid "Top computers"
+msgstr "Top computers"
+
+#: ../user/stats.php:48
+msgid "GPU models"
+msgstr "GPU models"
+
+#: ../user/stats.php:49
+msgid "CPU models"
+msgstr "CPU models"
+
+#: ../user/stats.php:53
+msgid ""
+"More detailed statistics for %1 and other BOINC-based projects are available"
+" at several web sites:"
+msgstr "More detailed statistics for %1 and other BOINC-based projects are available at several web sites:"
+
+#: ../user/stats.php:56
+msgid ""
+"You can also get your current statistics in the form of a \"signature "
+"image\":"
+msgstr "You can also get your current statistics in the form of a \"signature image\":"
+
+#: ../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 "Additionally you can get your individual statistics summed across all BOINC projects from several sites; see your %1home page%2."
+
+#: ../user/team.php:27
+msgid "Teams"
+msgstr "Teams"
+
+#: ../user/team.php:29
+msgid "%1 participants may form %2teams%3."
+msgstr "%1 participants may form %2teams%3."
+
+#: ../user/team.php:31
+msgid ""
+"You may belong to only one team. You can join or quit a team at any time."
+msgstr "You may belong to only one team. You can join or quit a team at any time."
+
+#: ../user/team.php:33
+msgid "Each team has a %1founder%2 who may:"
+msgstr "Each team has a %1founder%2 who may:"
+
+#: ../user/team.php:35
+msgid "access team members' email addresses"
+msgstr "access team members' email addresses"
+
+#: ../user/team.php:36
+msgid "edit the team's name and description"
+msgstr "edit the team's name and description"
+
+#: ../user/team.php:37
+msgid "add or remove team admins"
+msgstr "add or remove team admins"
+
+#: ../user/team.php:38
+msgid "remove members from the team"
+msgstr "remove members from the team"
+
+#: ../user/team.php:39
+msgid "disband a team if it has no members"
+msgstr "disband a team if it has no members"
+
+#: ../user/team.php:42
+msgid "To join a team, visit its team page and click %1Join this team%2."
+msgstr "To join a team, visit its team page and click %1Join this team%2."
+
+#: ../user/team.php:43 ../user/team_search.php:201
+msgid "Find a team"
+msgstr "Find a team"
+
+#: ../user/team.php:50
+msgid "All teams"
+msgstr "All teams"
+
+#: ../user/team.php:54
+msgid "%1 teams"
+msgstr "%1 teams"
+
+#: ../user/team.php:60
+msgid "Create a new team"
+msgstr "Create a new team"
+
+#: ../user/team.php:61
+msgid ""
+"If you cannot find a team that is right for you, you can %1create a team%2."
+msgstr "If you cannot find a team that is right for you, you can %1create a team%2."
+
+#: ../user/team_admins.php:36
+msgid "Remove Team Admin status from this member"
+msgstr "Remove Team Admin status from this member"
+
+#: ../user/team_admins.php:42 ../user/team_admins.php:53
+msgid "Add or remove Team Admins"
+msgstr "Add or remove Team Admins"
+
+#: ../user/team_admins.php:43
+msgid "You can select team members as 'Team Admins'. Team Admins can:"
+msgstr "You can select team members as 'Team Admins'. Team Admins can:"
+
+#: ../user/team_admins.php:45
+msgid "Edit team information (name, URL, description, country)"
+msgstr "Edit team information (name, URL, description, country)"
+
+#: ../user/team_admins.php:46
+msgid "View the team's join/quit history"
+msgstr "View the team's join/quit history"
+
+#: ../user/team_admins.php:47
+msgid ""
+"Moderate the team forum, if any (admins get email notification of moderation"
+" events and red X reports)"
+msgstr "Moderate the team forum, if any (admins get email notification of moderation events and red X reports)"
+
+#: ../user/team_admins.php:49
+msgid "Team Admins cannot:"
+msgstr "Team Admins cannot:"
+
+#: ../user/team_admins.php:51
+msgid "Change the team founder"
+msgstr "Change the team founder"
+
+#: ../user/team_admins.php:52 ../user/team_manage.php:56
+msgid "Remove members"
+msgstr "Remove members"
+
+#: ../user/team_admins.php:55
+msgid "If a Team Admin quits the team, they cease to be a Team Admin."
+msgstr "If a Team Admin quits the team, they cease to be a Team Admin."
+
+#: ../user/team_admins.php:56
+msgid ""
+"We recommend that you select only people you know and trust very well as "
+"Team Admins."
+msgstr "We recommend that you select only people you know and trust very well as Team Admins."
+
+#: ../user/team_admins.php:61
+msgid "There are currently no Team Admins"
+msgstr "There are currently no Team Admins"
+
+#: ../user/team_admins.php:63
+msgid "Current Team Admins"
+msgstr "Current Team Admins"
+
+#: ../user/team_admins.php:64
+msgid "Became Team Admin on"
+msgstr "Became Team Admin on"
+
+#: ../user/team_admins.php:79
+msgid "Add Team Admin"
+msgstr "Add Team Admin"
+
+#: ../user/team_admins.php:80
+msgid "Email address of team member:"
+msgstr "Email address of team member:"
+
+#: ../user/team_admins.php:81
+msgid "Add"
+msgstr "Add"
+
+#: ../user/team_admins.php:92
+msgid "failed to remove admin"
+msgstr "failed to remove admin"
+
+#: ../user/team_admins.php:101
+msgid "User is not member of team"
+msgstr "User is not member of team"
+
+#: ../user/team_admins.php:103
+msgid "%1 is already an admin of %2"
+msgstr "%1 is already an admin of %2"
+
+#: ../user/team_admins.php:107
+msgid "Couldn't add admin"
+msgstr "Couldn't add admin"
+
+#: ../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 "No such team"
+
+#: ../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 "no such team"
+
+#: ../user/team_change_founder_action.php:40
+msgid "User is not a member of %1"
+msgstr "User is not a member of %1"
+
+#: ../user/team_change_founder_action.php:43
+msgid "Changing founder of %1"
+msgstr "Changing founder of %1"
+
+#: ../user/team_change_founder_action.php:45
+msgid "%1 is now founder of %2"
+msgstr "%1 is now founder of %2"
+
+#: ../user/team_change_founder_form.php:39
+msgid "Change founder of %1"
+msgstr "Change founder of %1"
+
+#: ../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 "Team member %1 requested this team's foundership on %2, but left the team, thus canceling the request."
+
+#: ../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 "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."
+
+#: ../user/team_change_founder_form.php:57
+msgid "decline request"
+msgstr "decline request"
+
+#: ../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 "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."
+
+#: ../user/team_change_founder_form.php:68
+msgid "No transfer request is pending."
+msgstr "No transfer request is pending."
+
+#: ../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 "To assign foundership of this team to another member, check the box next to member name and click <strong>Change founder</strong> below."
+
+#: ../user/team_change_founder_form.php:78
+msgid "New founder?"
+msgstr "New founder?"
+
+#: ../user/team_change_founder_form.php:107 ../user/team_manage.php:58
+msgid "Change founder"
+msgstr "Change founder"
+
+#: ../user/team_change_founder_form.php:110
+msgid "There are no users to transfer team to."
+msgstr "There are no users to transfer team to."
+
+#: ../user/team_create_action.php:31
+msgid "You must choose a non-blank team name"
+msgstr "You must choose a non-blank team name"
+
+#: ../user/team_create_action.php:36
+msgid "A team named %1 already exists - try another name"
+msgstr "A team named %1 already exists - try another name"
+
+#: ../user/team_create_action.php:56
+msgid "Could not create team - please try later."
+msgstr "Could not create team - please try later."
+
+#: ../user/team_create_form.php:29 ../user/team_create_form.php:34
+msgid "Create a team"
+msgstr "Create a team"
+
+#: ../user/team_create_form.php:32
+msgid ""
+"You belong to %1. You must %2quit this team%3 before creating a new one."
+msgstr "You belong to %1. You must %2quit this team%3 before creating a new one."
+
+#: ../user/team_delta.php:66
+msgid "Not founder or admin"
+msgstr "Not founder or admin"
+
+#: ../user/team_delta.php:73
+msgid "Team history for %1"
+msgstr "Team history for %1"
+
+#: ../user/team_delta.php:76
+msgid "When"
+msgstr "When"
+
+#: ../user/team_delta.php:77
+msgid "User"
+msgstr "User"
+
+#: ../user/team_delta.php:78
+msgid "Action"
+msgstr "Action"
+
+#: ../user/team_delta.php:79
+msgid "Total credit at time of action"
+msgstr "Total credit at time of action"
+
+#: ../user/team_edit_action.php:55
+msgid "bad country"
+msgstr "bad country"
+
+#: ../user/team_edit_action.php:61
+msgid "The name '%1' is being used by another team."
+msgstr "The name '%1' is being used by another team."
+
+#: ../user/team_edit_action.php:64
+msgid "Must specify team name"
+msgstr "Must specify team name"
+
+#: ../user/team_edit_action.php:92
+msgid "Could not update team - please try again later."
+msgstr "Could not update team - please try again later."
+
+#: ../user/team_edit_form.php:35
+msgid "Edit %1"
+msgstr "Edit %1"
+
+#: ../user/team_edit_form.php:36
+msgid "Update team info"
+msgstr "Update team info"
+
+#: ../user/team_email_list.php:70
+msgid "%1 Email List"
+msgstr "%1 Email List"
+
+#: ../user/team_email_list.php:72
+msgid "Member list of %1"
+msgstr "Member list of %1"
+
+#: ../user/team_email_list.php:87
+msgid "Show as plain text"
+msgstr "Show as plain text"
+
+#: ../user/team_forum.php:30 ../user/team_forum.php:41
+msgid "Create Message Board"
+msgstr "Create Message Board"
+
+#: ../user/team_forum.php:31
+msgid "You may create a message board for use by %1."
+msgstr "You may create a message board for use by %1."
+
+#: ../user/team_forum.php:33
+msgid "Only team members will be able to post."
+msgstr "Only team members will be able to post."
+
+#: ../user/team_forum.php:34
+msgid "At your option, only members will be able to read."
+msgstr "At your option, only members will be able to read."
+
+#: ../user/team_forum.php:35
+msgid "You and your Team Admins will have moderator privileges."
+msgstr "You and your Team Admins will have moderator privileges."
+
+#: ../user/team_forum.php:42
+msgid "Create a message board for %1"
+msgstr "Create a message board for %1"
+
+#: ../user/team_forum.php:50
+msgid "Team already has a message board"
+msgstr "Team already has a message board"
+
+#: ../user/team_forum.php:61
+msgid "Team Message Board"
+msgstr "Team Message Board"
+
+#: ../user/team_forum.php:73
+msgid "Minimum time between posts (seconds)"
+msgstr "Minimum time between posts (seconds)"
+
+#: ../user/team_forum.php:76
+msgid "Minimum total credit to post"
+msgstr "Minimum total credit to post"
+
+#: ../user/team_forum.php:79
+msgid "Minimum average credit to post"
+msgstr "Minimum average credit to post"
+
+#: ../user/team_forum.php:82
+msgid "Submit"
+msgstr "Submit"
+
+#: ../user/team_forum.php:91
+msgid "Remove your team's message board."
+msgstr "Remove your team's message board."
+
+#: ../user/team_forum.php:99
+msgid "Really remove message board?"
+msgstr "Really remove message board?"
+
+#: ../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 "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)."
+
+#: ../user/team_forum.php:102
+msgid "Yes - remove message board"
+msgstr "Yes - remove message board"
+
+#: ../user/team_forum.php:123
+msgid "Message board removed"
+msgstr "Message board removed"
+
+#: ../user/team_forum.php:126
+msgid ""
+"Your team's message board has been removed. You may now %1create a new "
+"one%2."
+msgstr "Your team's message board has been removed. You may now %1create a new one%2."
+
+#: ../user/team_forum.php:145
+msgid "Team Message Board Updated"
+msgstr "Team Message Board Updated"
+
+#: ../user/team_forum.php:146
+msgid "Update successful"
+msgstr "Update successful"
+
+#: ../user/team_forum.php:149
+msgid "Update failed"
+msgstr "Update failed"
+
+#: ../user/team_forum.php:156
+msgid "Team has no forum"
+msgstr "Team has no forum"
+
+#: ../user/team_founder_transfer_action.php:38
+msgid "You must be a member of a team to access this page."
+msgstr "You must be a member of a team to access this page."
+
+#: ../user/team_founder_transfer_action.php:92
+msgid "Requesting foundership of %1"
+msgstr "Requesting foundership of %1"
+
+#: ../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 "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."
+
+#: ../user/team_founder_transfer_action.php:104
+#: ../user/team_founder_transfer_action.php:115
+msgid "Foundership request not allowed now"
+msgstr "Foundership request not allowed now"
+
+#: ../user/team_founder_transfer_action.php:111
+msgid "Assumed foundership of %1"
+msgstr "Assumed foundership of %1"
+
+#: ../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 "Congratulations, you are now the founder of team %1. Go to %2Your Account page%3 to find the Team Admin options."
+
+#: ../user/team_founder_transfer_action.php:122
+msgid "Decline founder change request"
+msgstr "Decline founder change request"
+
+#: ../user/team_founder_transfer_action.php:129
+msgid "The foundership request from %1 has been declined."
+msgstr "The foundership request from %1 has been declined."
+
+#: ../user/team_founder_transfer_action.php:132
+msgid "There were no foundership requests."
+msgstr "There were no foundership requests."
+
+#: ../user/team_founder_transfer_action.php:136
+msgid "undefined action %1"
+msgstr "undefined action %1"
+
+#: ../user/team_founder_transfer_action.php:139
+#: ../user/team_founder_transfer_form.php:85
+msgid "Return to team page"
+msgstr "Return to team page"
+
+#: ../user/team_founder_transfer_form.php:30
+msgid "You need to be a member of a team to access this page."
+msgstr "You need to be a member of a team to access this page."
+
+#: ../user/team_founder_transfer_form.php:33
+msgid "Request foundership of %1"
+msgstr "Request foundership of %1"
+
+#: ../user/team_founder_transfer_form.php:40
+msgid "You are now founder of team %1."
+msgstr "You are now founder of team %1."
+
+#: ../user/team_founder_transfer_form.php:46
+msgid "You requested the foundership of %1 on %2."
+msgstr "You requested the foundership of %1 on %2."
+
+#: ../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 days have elapsed since your request, and the founder has not responded. You may now assume foundership by clicking here:"
+
+#: ../user/team_founder_transfer_form.php:52
+msgid "Assume foundership"
+msgstr "Assume foundership"
+
+#: ../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 "The founder was notified of your request. If he/she does not respond by %1 you will be given an option to become founder."
+
+#: ../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 "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?"
+
+#: ../user/team_founder_transfer_form.php:67
+msgid "Request foundership"
+msgstr "Request foundership"
+
+#: ../user/team_founder_transfer_form.php:76
+msgid "Founder change has already been requested by %1 on %2."
+msgstr "Founder change has already been requested by %1 on %2."
+
+#: ../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 "A foundership change was requested during the last 90 days, so new requests are not allowed. Please try again later."
+
+#: ../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 "The team %1 is not joinable."
+
+#: ../user/team_join.php:37 ../user/team_join_action.php:37
+msgid "Already a member"
+msgstr "Already a member"
+
+#: ../user/team_join.php:38 ../user/team_join_action.php:38
+msgid "You are already a member of %1."
+msgstr "You are already a member of %1."
+
+#: ../user/team_join.php:44 ../user/team_join_action.php:45
+msgid "Couldn't join team - please try again later."
+msgstr "Couldn't join team - please try again later."
+
+#: ../user/team_join_action.php:42
+msgid "Joined %1"
+msgstr "Joined %1"
+
+#: ../user/team_join_action.php:43
+msgid "You have joined %1."
+msgstr "You have joined %1."
+
+#: ../user/team_join_form.php:34
+msgid "Join %1"
+msgstr "Join %1"
+
+#: ../user/team_join_form.php:35
+msgid "Please note:"
+msgstr "Please note:"
+
+#: ../user/team_join_form.php:37
+msgid "Joining a team gives its founder access to your email address."
+msgstr "Joining a team gives its founder access to your email address."
+
+#: ../user/team_join_form.php:38
+msgid "Joining a team does not affect your account's credit."
+msgstr "Joining a team does not affect your account's credit."
+
+#: ../user/team_join_form.php:45
+msgid "Join team"
+msgstr "Join team"
+
+#: ../user/team_lookup.php:86
+msgid "Search Results"
+msgstr "Search Results"
+
+#: ../user/team_lookup.php:88
+msgid "Search results for '%1'"
+msgstr "Search results for '%1'"
+
+#: ../user/team_lookup.php:90
+msgid "You may view these teams' members, statistics, and information."
+msgstr "You may view these teams' members, statistics, and information."
+
+#: ../user/team_lookup.php:100
+msgid "More than 100 teams match your search. The first 100 are shown."
+msgstr "More than 100 teams match your search. The first 100 are shown."
+
+#: ../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 "End of results. %1 If you cannot find the team you are looking for, you may %2create a team%3 yourself."
+
+#: ../user/team_manage.php:28
+msgid "Team administration for %1"
+msgstr "Team administration for %1"
+
+#: ../user/team_manage.php:31
+msgid "Edit team info"
+msgstr "Edit team info"
+
+#: ../user/team_manage.php:32
+msgid "Change team name, URL, description, type, or country"
+msgstr "Change team name, URL, description, type, or country"
+
+#: ../user/team_manage.php:34
+msgid "Member list:"
+msgstr "Member list:"
+
+#: ../user/team_manage.php:35 ../user/team_manage.php:39
+msgid "HTML"
+msgstr "HTML"
+
+#: ../user/team_manage.php:36
+msgid "text"
+msgstr "text"
+
+#: ../user/team_manage.php:37
+msgid "View member names and email addresses"
+msgstr "View member names and email addresses"
+
+#: ../user/team_manage.php:38
+msgid "View change history:"
+msgstr "View change history:"
+
+#: ../user/team_manage.php:40
+msgid "XML"
+msgstr "XML"
+
+#: ../user/team_manage.php:41
+msgid "See when members joined or quit this team"
+msgstr "See when members joined or quit this team"
+
+#: ../user/team_manage.php:52
+msgid "Respond to foundership request."
+msgstr "Respond to foundership request."
+
+#: ../user/team_manage.php:52
+msgid "If you don't respond by %1, %2 may assume foundership of this team."
+msgstr "If you don't respond by %1, %2 may assume foundership of this team."
+
+#: ../user/team_manage.php:57
+msgid "Remove inactive or unwanted members from this team"
+msgstr "Remove inactive or unwanted members from this team"
+
+#: ../user/team_manage.php:59
+msgid "Transfer foundership to another member"
+msgstr "Transfer foundership to another member"
+
+#: ../user/team_manage.php:60
+msgid "Add/remove Team Admins"
+msgstr "Add/remove Team Admins"
+
+#: ../user/team_manage.php:61
+msgid "Give selected team members Team Admin privileges"
+msgstr "Give selected team members Team Admin privileges"
+
+#: ../user/team_manage.php:63
+msgid "Remove team"
+msgstr "Remove team"
+
+#: ../user/team_manage.php:64
+msgid "Allowed only if team has no members"
+msgstr "Allowed only if team has no members"
+
+#: ../user/team_manage.php:66
+msgid "Create or manage a team message board"
+msgstr "Create or manage a team message board"
+
+#: ../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 "To have this team created on all BOINC projects (current and future) you can make it into a %1BOINC-wide team%2."
+
+#: ../user/team_manage.php:75
+msgid ""
+"Team admins are encouraged to join and participate in the Google %1boinc-"
+"team-founders%2 group."
+msgstr "Team admins are encouraged to join and participate in the Google %1boinc-team-founders%2 group."
+
+#: ../user/team_manage.php:91
+msgid "Can't delete non-empty team"
+msgstr "Can't delete non-empty team"
+
+#: ../user/team_manage.php:95
+msgid "Team %1 deleted"
+msgstr "Team %1 deleted"
+
+#: ../user/team_members.php:38
+msgid "Limit exceeded:  Can only display the first 1000 members."
+msgstr "Limit exceeded:  Can only display the first 1000 members."
+
+#: ../user/team_members.php:51
+msgid "Members of %1"
+msgstr "Members of %1"
+
+#: ../user/team_quit_action.php:34
+msgid "Unable to quit team"
+msgstr "Unable to quit team"
+
+#: ../user/team_quit_action.php:35
+msgid "Team doesn't exist, or you don't belong to it."
+msgstr "Team doesn't exist, or you don't belong to it."
+
+#: ../user/team_quit_form.php:33
+msgid "Quit %1"
+msgstr "Quit %1"
+
+#: ../user/team_quit_form.php:34
+msgid ""
+"<strong>Please note before quitting a team:</strong>\n"
+"         <ul>\n"
+"         <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>Please note before quitting a team:</strong>\n         <ul>\n         <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>"
+
+#: ../user/team_quit_form.php:42
+msgid "Quit Team"
+msgstr "Quit Team"
+
+#: ../user/team_remove_inactive_action.php:33
+msgid "Removing users from %1"
+msgstr "Removing users from %1"
+
+#: ../user/team_remove_inactive_action.php:41
+msgid "%1 is not a member of %2"
+msgstr "%1 is not a member of %2"
+
+#: ../user/team_remove_inactive_action.php:44
+msgid "%1 has been removed"
+msgstr "%1 has been removed"
+
+#: ../user/team_remove_inactive_form.php:34
+msgid "Remove members from %1"
+msgstr "Remove members from %1"
+
+#: ../user/team_remove_inactive_form.php:41
+msgid "Remove?"
+msgstr "Remove?"
+
+#: ../user/team_remove_inactive_form.php:42
+msgid "Name (ID)"
+msgstr "Name (ID)"
+
+#: ../user/team_remove_inactive_form.php:67
+msgid "No members are eligible for removal."
+msgstr "No members are eligible for removal."
+
+#: ../user/team_remove_inactive_form.php:70
+msgid "Remove users"
+msgstr "Remove users"
+
+#: ../user/team_search.php:76
+msgid "Team name"
+msgstr "Team name"
+
+#: ../user/team_search.php:113
+msgid "Team search results"
+msgstr "Team search results"
+
+#: ../user/team_search.php:115
+msgid "No teams were found matching your criteria. Try another search."
+msgstr "No teams were found matching your criteria. Try another search."
+
+#: ../user/team_search.php:117
+msgid "Or you can %1create a new team%2."
+msgstr "Or you can %1create a new team%2."
+
+#: ../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 "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."
+
+#: ../user/team_search.php:128
+msgid "Change your search"
+msgstr "Change your search"
+
+#: ../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 "You can team up with other people with similar interests, or from the same country, company, or school."
+
+#: ../user/team_search.php:204
+msgid "Use this form to find teams that might be right for you."
+msgstr "Use this form to find teams that might be right for you."
+
+#: ../user/team_search.php:209
+msgid "%1I'm not interested%2 in joining a team right now."
+msgstr "%1I'm not interested%2 in joining a team right now."
+
+#: ../user/top_hosts.php:67 ../user/top_teams.php:102
+#: ../user/top_users.php:113
+msgid "Limit exceeded - Sorry, first %1 items only"
+msgstr "Limit exceeded - Sorry, first %1 items only"
+
+#: ../user/top_hosts.php:82
+msgid "Top hosts"
+msgstr "Top hosts"
+
+#: ../user/top_teams.php:107
+msgid "Top %1 teams"
+msgstr "Top %1 teams"
+
+#: ../user/top_teams.php:110
+msgid "There are no %1 teams"
+msgstr "There are no %1 teams"
+
+#: ../user/top_users.php:64
+msgid "Participant since"
+msgstr "Participant since"
+
+#: ../user/uotd.php:31
+msgid "No user of the day has been chosen."
+msgstr "No user of the day has been chosen."
+
+#: ../user/uotd.php:35
+msgid "User of the Day for %1: %2"
+msgstr "User of the Day for %1: %2"
+
+#: ../user/user_search.php:51
+msgid "Filters"
+msgstr "Filters"
+
+#: ../user/user_search.php:52
+msgid "User name starts with"
+msgstr "User name starts with"
+
+#: ../user/user_search.php:53
+msgid "Any"
+msgstr "Any"
+
+#: ../user/user_search.php:56
+msgid "With profile?"
+msgstr "With profile?"
+
+#: ../user/user_search.php:57 ../user/user_search.php:62
+msgid "Either"
+msgstr "Either"
+
+#: ../user/user_search.php:61
+msgid "On a team?"
+msgstr "On a team?"
+
+#: ../user/user_search.php:66
+msgid "Ordering"
+msgstr "Ordering"
+
+#: ../user/user_search.php:67
+msgid "Decreasing sign-up time"
+msgstr "Decreasing sign-up time"
+
+#: ../user/user_search.php:68
+msgid "Decreasing average credit"
+msgstr "Decreasing average credit"
+
+#: ../user/user_search.php:69
+msgid "Decreasing total credit"
+msgstr "Decreasing total credit"
+
+#: ../user/user_search.php:84
+msgid "search string must be at least 3 characters"
+msgstr "search string must be at least 3 characters"
+
+#: ../user/user_search.php:118
+msgid "User search results"
+msgstr "User search results"
+
+#: ../user/user_search.php:125
+msgid "Joined"
+msgstr "Joined"
+
+#: ../user/user_search.php:133
+msgid "No users match your search criteria."
+msgstr "No users match your search criteria."
+
+#: ../user/userw.php:35
+msgid "User not found!"
+msgstr "User not found!"
+
+#: ../user/userw.php:44
+msgid "Account Data<br/>for %1<br/>Time:"
+msgstr "Account Data<br/>for %1<br/>Time:"
+
+#: ../user/userw.php:47
+msgid "Team:"
+msgstr "Team:"
+
+#: ../user/userw.php:48
+msgid "Team TotCred:"
+msgstr "Team TotCred:"
+
+#: ../user/userw.php:49
+msgid "Team AvgCred:"
+msgstr "Team AvgCred:"
+
+#: ../user/userw.php:51
+msgid "Team: None"
+msgstr "Team: None"
+
+#: ../user/validate_email_addr.php:30
+msgid "Validate BOINC email address"
+msgstr "Validate BOINC email address"
+
+#: ../user/validate_email_addr.php:31
+msgid ""
+"Please visit the following link to validate the email address of your %1 "
+"account:"
+msgstr "Please visit the following link to validate the email address of your %1 account:"
+
+#: ../user/validate_email_addr.php:34
+msgid "Validate email sent"
+msgstr "Validate email sent"
+
+#: ../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 "An email has been sent to %1. Visit the link it contains to validate your email address."
+
+#: ../user/validate_email_addr.php:44
+msgid "No such user."
+msgstr "No such user."
+
+#: ../user/validate_email_addr.php:49
+msgid "Error in URL data - can't validate email address"
+msgstr "Error in URL data - can't validate email address"
+
+#: ../user/validate_email_addr.php:54
+msgid "Database update failed - please try again later."
+msgstr "Database update failed - please try again later."
+
+#: ../user/validate_email_addr.php:57
+msgid "Validate email address"
+msgstr "Validate email address"
+
+#: ../user/validate_email_addr.php:58
+msgid "The email address of your account has been validated."
+msgstr "The email address of your account has been validated."
+
+#: ../user/view_profile.php:38
+msgid "This user has no profile"
+msgstr "This user has no profile"
+
+#: ../user/view_profile.php:56
+msgid "Profile: %1"
+msgstr "Profile: %1"
+
+#: ../user/view_profile.php:65
+msgid "Account data"
+msgstr "Account data"
+
+#: ../user/weak_auth.php:52
+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 "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:"
+
+#: ../user/weak_auth.php:57
+msgid "This key can be used to:"
+msgstr "This key can be used to:"
+
+#: ../user/weak_auth.php:59
+msgid "log in to your account on the web"
+msgstr "log in to your account on the web"
+
+#: ../user/weak_auth.php:61
+msgid ""
+"to attach a computer to your account without using the BOINC Manager.\n"
+"       To do so, install BOINC,\n"
+"       create a file named %1 in the BOINC\n"
+"       data directory, and set its contents to:"
+msgstr "to attach a computer to your account without using the BOINC Manager.\n       To do so, install BOINC,\n       create a file named %1 in the BOINC\n       data directory, and set its contents to:"
+
+#: ../user/weak_auth.php:73
+msgid "Weak account key"
+msgstr "Weak account key"
+
+#: ../user/weak_auth.php:74
+msgid ""
+"Your 'weak account key' can be used to attach computers to your account\n"
+"    as described above, but cannot be used to log in to your account or change it in any way.\n"
+"    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 "Your 'weak account key' can be used to attach computers to your account\n    as described above, but cannot be used to log in to your account or change it in any way.\n    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:"
+
+#: ../user/weak_auth.php:81
+msgid ""
+"If you change your password, your weak account key changes, and your "
+"previous weak account key becomes invalid."
+msgstr "If you change your password, your weak account key changes, and your previous weak account key becomes invalid."
+
+#: ../user/workunit.php:32
+msgid "can't find workunit"
+msgstr "can't find workunit"
+
+#: ../user/workunit.php:35
+msgid "Workunit %1"
+msgstr "Workunit %1"
+
+#: ../user/workunit.php:40
+msgid "application"
+msgstr "application"
+
+#: ../user/workunit.php:43
+msgid "canonical result"
+msgstr "canonical result"
+
+#: ../user/workunit.php:46
+msgid "granted credit"
+msgstr "granted credit"
+
+#: ../user/workunit.php:55
+msgid "Tasks in progress"
+msgstr "Tasks in progress"
+
+#: ../user/workunit.php:55
+msgid "suppressed pending completion"
+msgstr "suppressed pending completion"
+
+#: ../user/workunit.php:58
+msgid "minimum quorum"
+msgstr "minimum quorum"
+
+#: ../user/workunit.php:59
+msgid "initial replication"
+msgstr "initial replication"
+
+#: ../user/workunit.php:60
+msgid "max # of error/total/success tasks"
+msgstr "max # of error/total/success tasks"
+
+#: ../user/workunit.php:64
+msgid "errors"
+msgstr "errors"
+
+#: ../user/workunit.php:67
+msgid "validation"
+msgstr "validation"
+
+#: ../user/workunit.php:67
+msgid "Pending"
+msgstr "Pending"
+
+#: ../project.sample/project.inc:70
+msgid "Main page"
+msgstr "Main page"
+
+#: ../project.sample/project.inc:72
+msgid "Copyright"
+msgstr "Copyright"
+
+#: ../project.sample/project.inc:75
+msgid "Generated"
+msgstr "Generated"
+
+#: ../project.sample/project.inc:106
+msgid "Your personal background."
+msgstr "Your personal background."
+
+#: ../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 "Tell us about yourself. You could tell us where you're from, your age, occupation, hobbies, or anything else about yourself."
+
+#: ../project.sample/project.inc:114
+msgid "Your opinions about %1"
+msgstr "Your opinions about %1"
+
+#: ../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 "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>"
+
+#: ../project.sample/project_specific_prefs.inc:53
+msgid "Color scheme for graphics"
+msgstr "Color scheme for graphics"
+
+#: ../project.sample/project_specific_prefs.inc:54
+msgid "Maximum CPU % for graphics%10 ... 100%2"
+msgstr "Maximum CPU % for graphics%10 ... 100%2"
+
+#: ../project.sample/project_specific_prefs.inc:55
+msgid "Run only the selected applications"
+msgstr "Run only the selected applications"
+
+#: ../project.sample/project_specific_prefs.inc:56
+msgid ""
+"Only get tasks for certain applications. Useful to focus on particular "
+"applications, or to exclude them."
+msgstr "Only get tasks for certain applications. Useful to focus on particular applications, or to exclude them."
+
+#: ../project.sample/project_specific_prefs.inc:57
+msgid ""
+"If no work for selected applications is available, accept work from other "
+"applications?"
+msgstr "If no work for selected applications is available, accept work from other applications?"
+
+#: ../project.sample/project_specific_prefs.inc:58
+msgid "Use faster non-graphical applications if available?"
+msgstr "Use faster non-graphical applications if available?"
+
+#: ../project.sample/project_specific_prefs.inc:89
+msgid "(all applications)"
+msgstr "(all applications)"
diff --git a/locale/es/BOINC-Client.mo b/locale/es/BOINC-Client.mo
index f985fab..beda754 100644
Binary files a/locale/es/BOINC-Client.mo and b/locale/es/BOINC-Client.mo differ
diff --git a/locale/es/BOINC-Client.po b/locale/es/BOINC-Client.po
old mode 100755
new mode 100644
index 139baa8..cbf8c28
--- a/locale/es/BOINC-Client.po
+++ b/locale/es/BOINC-Client.po
@@ -1,24 +1,23 @@
 # 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: BOINC 7.4\n"
+"Project-Id-Version: boinc\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-10-15 22:25-0700\n"
-"PO-Revision-Date: 2015-02-10 18:27-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: es\n"
+"PO-Revision-Date: 2015-02-23 23:14+0000\n"
+"Last-Translator: Rom Walton\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/boinc/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-POOTLE-MTIME: 1379883430.0\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: acct_mgr.cpp:450
-#: acct_mgr.cpp:459
+#: acct_mgr.cpp:450 acct_mgr.cpp:459
 msgid "Message from account manager"
 msgstr "Mensaje del administrador de cuentas"
 
@@ -27,12 +26,14 @@ msgid "Message from server"
 msgstr "Mensaje del servidor "
 
 #: client_state.cpp:258
-msgid "Some tasks need more memory than allowed by your preferences.  Please check the preferences."
-msgstr "Algunas tareas necesitan más memoria que la permitida por sus preferencias.   Por favor compruebe las preferencias."
+msgid ""
+"Some tasks need more memory than allowed by your preferences.  Please check "
+"the preferences."
+msgstr "Algunas tareas necesitan más memoria que la permitida por sus preferencias. Revíselas."
 
 #: client_state.cpp:520
 msgid "Couldn't write state file; check directory permissions"
-msgstr "No se pudo escribir en el archivo state; compruebe los permisos de la carpeta"
+msgstr "No se ha podido escribir el archivo de estado; compruebe los permisos de la carpeta"
 
 #: cs_cmdline.cpp:303
 msgid "The HTTP_PROXY environment variable must specify an HTTP proxy"
@@ -40,111 +41,116 @@ msgstr "La variable de entorno HTTP_PROXY debe especificar un 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 "Usted ha utilizado una URL incorrecta para este proyecto.   Cuando le sea conveniente, elimine este proyecto, entonces añada %s"
+msgid ""
+"You used the wrong URL for this project.  When convenient, remove this "
+"project, then add %s"
+msgstr "Ha usado una URL incorrecta para este proyecto. Cuando le convenga, elimine este proyecto y añada %s"
 
-#: cs_statefile.cpp:828
-#: ../sched/sched_types.cpp:259
+#: cs_statefile.cpp:828 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
 msgstr "Error de sintaxis en app_info.xml"
 
 #: cs_statefile.cpp:868
 msgid "File referenced in app_info.xml does not exist: "
-msgstr "Un archivo referenciado en app_info.xml no existe: "
+msgstr "No existe un archivo referido en app_info.xml: "
 
 #: current_version.cpp:91
 msgid "A new version of BOINC is available."
-msgstr "Una nueva versión de BOINC está disponible."
+msgstr "Está disponible una versión nueva de BOINC."
 
-#: current_version.cpp:94
-#: current_version.cpp:102
+#: current_version.cpp:94 current_version.cpp:102
 msgid "Download"
 msgstr "Descargar"
 
-#: log_flags.cpp:269
-#: log_flags.cpp:449
+#: log_flags.cpp:269 log_flags.cpp:449
 msgid "Unexpected text in cc_config.xml"
 msgstr "Texto inesperado en cc_config.xml"
 
-#: log_flags.cpp:423
-#: log_flags.cpp:475
+#: log_flags.cpp:423 log_flags.cpp:475
 msgid "Unrecognized tag in cc_config.xml"
 msgstr "Etiqueta no reconocida en cc_config.xml"
 
 #: log_flags.cpp:440
 msgid "Missing start tag in cc_config.xml"
-msgstr "Etiqueta de inicio perdida en cc_config.xml"
+msgstr "Falta una etiqueta de apertura en cc_config.xml"
 
 #: log_flags.cpp:465
 msgid "Error in cc_config.xml options"
-msgstr "Error en las opciones en cc_config.xml"
+msgstr "Error en las opciones de cc_config.xml"
 
 #: log_flags.cpp:483
 msgid "Missing end tag in cc_config.xml"
-msgstr "Etiqueta de final perdida en cc_config.xml"
+msgstr "Falta una etiqueta de cierre en cc_config.xml"
 
 #: ../sched/handle_request.cpp:307
 msgid "Invalid or missing account key.  To fix, remove and add this project."
-msgstr "Clave de cuenta inválida o perdida.     Para solucionarlo, sepárese y vuelva a unirse a este proyecto."
+msgstr "Falta la clave de cuenta o es incorrecta. Para solucionarlo, sepárese y vuelva a unirse a este proyecto."
 
 #: ../sched/handle_request.cpp:849
 msgid "Invalid code signing key.  To fix, remove and add this project."
-msgstr "Clave de firma de código inválida.   Para solucionarlo, sepárese y vuelva a unirse a este proyecto."
+msgstr "Clave de firma del código incorrecta. Para solucionarlo, sepárese y vuelva a unirse a este proyecto."
 
 #: ../sched/handle_request.cpp:859
-msgid "The project has changed its security key.  Please remove and add this project."
-msgstr "El proyecto a cambiado la clave de seguridad.   Por favor, sepárese y vuelva a unirse a este proyecto."
+msgid ""
+"The project has changed its security key.  Please remove and add this "
+"project."
+msgstr "El proyecto ha cambiado su clave de seguridad. Sepárese y vuelva a unirse a este proyecto."
 
 #: ../sched/handle_request.cpp:943
 msgid "This project doesn't support operating system"
-msgstr "Este proyecto no soporta este sistema operativo"
+msgstr "Este proyecto no admite el sistema operativo"
 
 #: ../sched/handle_request.cpp:969
 msgid "This project doesn't support CPU type"
-msgstr "Este proyecto no soporta este tipo de CPU"
+msgstr "Este proyecto no admite el tipo de CPU"
 
 #: ../sched/handle_request.cpp:993
-msgid "Your BOINC client software is too old.  Please install the current version."
-msgstr "Su versión de BOINC es demasiado antigua.  Por favor instale la versión actual."
+msgid ""
+"Your BOINC client software is too old.  Please install the current version."
+msgstr "Su versión de BOINC es demasiado antigua. Instale la versión actual."
 
 #: ../sched/handle_request.cpp:1259
 msgid "This project doesn't support computers of type"
-msgstr "Este proyecto no soporta computadores de este tipo"
+msgstr "Este proyecto no admite computadores del tipo"
 
 #: ../sched/sched_send.cpp:1092
-msgid "Upgrade to the latest driver to process tasks using your computer's GPU"
-msgstr "Actualice a la última versión del controlador para procesar tareas usando la GPU de su ordenador "
+msgid ""
+"Upgrade to the latest driver to process tasks using your computer's GPU"
+msgstr "Actualice el controlador a la última versión para procesar tareas usando la GPU de su computador"
 
 #: ../sched/sched_send.cpp:1099
-msgid "Upgrade to the latest driver to use all of this project's GPU applications"
-msgstr "Actualice a la última versión del controlador para usar todas las aplicaciones de GPU de este proyecto"
+msgid ""
+"Upgrade to the latest driver to use all of this project's GPU applications"
+msgstr "Actualice el controlador a la última versión para usar todas las aplicaciones de GPU de este proyecto"
 
 #: ../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 "Es necesaria una nueva versión de BOINC para usar su GPU NVIDIA; por favor actualícelo a la versión actual"
+msgid ""
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to"
+" the current version"
+msgstr "Es necesaria una nueva versión de BOINC para usar su GPU NVIDIA; actualícelo a la versión actual"
 
-# 94%
 #: ../sched/sched_send.cpp:1146
 #, c-format
 msgid "An %s GPU is required to run tasks for this project"
-msgstr "Es necesario una GPU %s para ejecutar tareas de este proyecto"
+msgstr "Es necesaria una GPU %s para ejecutar tareas de este proyecto"
 
 #: ../sched/sched_send.cpp:1262
 msgid "No tasks are available for the applications you have selected."
-msgstr "No hay tareas disponibles para las aplicaciones que ha selecionado."
+msgstr "No hay tareas disponibles para las aplicaciones que ha elegido."
 
 #: ../sched/sched_send.cpp:1288
 msgid "Your computer type is not supported by this project"
-msgstr "Su tipo de ordenador no está soportado por este proyecto"
+msgstr "Este proyecto no admite su tipo de computador"
 
 #: ../sched/sched_send.cpp:1294
 msgid "Newer BOINC version required; please install current version"
-msgstr "Es necesaria una versión de BOINC más actualizada; por favor intale la versión actual"
+msgstr "Es necesaria una versión más reciente de BOINC; instale la versión actual"
 
 #: ../sched/sched_send.cpp:1305
 #, c-format
-msgid "Tasks for %s are available, but your preferences are set to not accept them"
-msgstr "Hay tareas disponibles para %s, pero tus preferencias han sido configuradas para no aceptarlas."
+msgid ""
+"Tasks for %s are available, but your preferences are set to not accept them"
+msgstr "Hay tareas disponibles para %s, pero ha configurado sus preferencias para no aceptarlas."
 
 #: ../sched/sched_types.cpp:254
 msgid "Unknown app name in app_info.xml"
@@ -152,55 +158,4 @@ msgstr "Nombre de aplicación desconocido en app_info.xml"
 
 #: ../sched/sched_version.cpp:214
 msgid "Your app_info.xml file doesn't have a usable version of"
-msgstr "Su archivo app_info.xml no tiene una versión utilizable de"
-
-#~ msgid "Download it."
-#~ msgstr "Descargarlo."
-#~ msgid "An NVIDIA or ATI GPU is required to run tasks for this project"
-#~ msgstr "Es necesario una GPU NVIDIA o ATI para ejecutar tareas de este proyecto"
-#~ msgid "An NVIDIA GPU is required to run tasks for this project"
-#~ msgstr "Es necesario una GPU NVIDIA para ejecutar tareas de este proyecto"
-#~ msgid "An ATI GPU is required to run tasks for this project"
-#~ msgstr "Es necesario una GPU ATI para ejecutar tareas de este proyecto"
-#~ msgid ""
-#~ "Tasks for NVIDIA GPU are available, but your preferences are set to not "
-#~ "accept them"
-#~ msgstr ""
-#~ "Hay disponibles tareas para la GPU NVIDIA, pero en sus preferencias está "
-#~ "seleccionado no aceptarlas"
-#~ msgid ""
-#~ "Tasks for ATI GPU are available, but your preferences are set to not accept "
-#~ "them"
-#~ msgstr ""
-#~ "Hay diponibles tareas para la GPU ATI, pero en sus preferencias está "
-#~ "seleccionado no aceptarlas"
-#~ msgid ""
-#~ "Tasks for CPU are available, but your preferences are set to not accept them"
-#~ msgstr ""
-#~ "Hay disponibles tareas para la CPU, pero en sus preferencias está "
-#~ "seleccionado no aceptarlas"
-#~ msgid "error"
-#~ msgstr "error"
-#~ msgid "Can't resolve hostname in remote_hosts.cfg"
-#~ msgstr "No se puede resolver el nombre del host en remote_host.cfg"
-
-#, fuzzy
-#~ msgid "is not available for"
-#~ msgstr "no está disponible para su tipo de ordenador"
-#~ msgid ""
-#~ "You may have an outdated code signing key.  Try attaching and reattaching "
-#~ "this project."
-#~ msgstr ""
-#~ "Usted debe tener una clave de firma de código antigua.   Pruebe a "
-#~ "separarse y volver a unirse a este proyecto."
-#~ msgid "XML syntax error in"
-#~ msgstr "Error de sintaxis XML en"
-#~ msgid "Unparsed tag in"
-#~ msgstr "Etiqueta no analizada sintácticamente en"
-#~ msgid ""
-#~ "Your preference for network connection interval is too high for this "
-#~ "project"
-#~ msgstr ""
-#~ "Sus preferencias de intervalo de conexión a la red es demasiado grande "
-#~ "para este proyecto"
-
+msgstr "Su archivo app_info.xml no tiene una versión usable de"
diff --git a/locale/es/BOINC-Manager.mo b/locale/es/BOINC-Manager.mo
index 41043f3..06afcc8 100644
Binary files a/locale/es/BOINC-Manager.mo and b/locale/es/BOINC-Manager.mo differ
diff --git a/locale/es/BOINC-Manager.po b/locale/es/BOINC-Manager.po
old mode 100644
new mode 100755
index 00a2620..d1ad6fe
--- a/locale/es/BOINC-Manager.po
+++ b/locale/es/BOINC-Manager.po
@@ -4,32 +4,34 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.x\n"
+"Project-Id-Version: BOINC Manager 4.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-15 14:15-0500\n"
-"PO-Revision-Date: 2015-02-10 18:29-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"POT-Creation-Date: 2014-02-02 00:00-0800\n"
+"PO-Revision-Date: 2013-09-22 20:57+0000\n"
+"Last-Translator: Anonymous Pootle User\n"
+"Language-Team: BOINC Development Team <rwalton at ssl.berkeley.edu>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.5.0\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc_7.4\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1422429584.0\n"
 "X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-SearchPath-0: clientgui\n"
 "X-Poedit-SearchPath-1: clientgui/msw\n"
 "X-Poedit-SearchPath-2: clientgui/gtk\n"
 "X-Poedit-SearchPath-3: clientgui/mac\n"
+"X-Poedit-SearchPath-0: clientgui\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\n"
+"X-POOTLE-MTIME: 1379883430.0\n"
 
-#: clientgui/AccountInfoPage.cpp:387
+# 81%
+#: AccountInfoPage.cpp:387
 #, c-format
 msgid "Identify your account at %s"
 msgstr "Identifique su cuenta en %s"
 
-#: clientgui/AccountInfoPage.cpp:393
+#: AccountInfoPage.cpp:393
 msgid ""
 "Please enter your account information\n"
 "(to create an account, visit the project's web site)"
@@ -37,7 +39,7 @@ msgstr ""
 "Por favor introduzca la información de su cuenta\n"
 "(para crear una cuenta, visite la página del proyecto)"
 
-#: clientgui/AccountInfoPage.cpp:397
+#: AccountInfoPage.cpp:397
 msgid ""
 "This project is not currently accepting new accounts.\n"
 "You can add it only if you already have an account."
@@ -45,19 +47,19 @@ msgstr ""
 "Este proyecto no acepta actualmente nuevas cuentas.\n"
 "Usted puede unirse sólo si ya tiene una cuenta."
 
-#: clientgui/AccountInfoPage.cpp:401
+#: AccountInfoPage.cpp:401
 msgid "Are you already running this project?"
 msgstr "¿Ha ejecutando este proyecto antes?"
 
-#: clientgui/AccountInfoPage.cpp:405
+#: AccountInfoPage.cpp:405
 msgid "&No, new user"
 msgstr "&No, nuevo usuario"
 
-#: clientgui/AccountInfoPage.cpp:408
+#: AccountInfoPage.cpp:408
 msgid "&Yes, existing user"
 msgstr "Sí, usuario &existente"
 
-#: clientgui/AccountInfoPage.cpp:413
+#: AccountInfoPage.cpp:413
 msgid ""
 "We were not able to set up your account information\n"
 "automatically.\n"
@@ -73,51 +75,45 @@ msgstr ""
 "debajo para encontrar que poner en los campos\n"
 "dirección de correo y contraseña."
 
-#: clientgui/AccountInfoPage.cpp:416
+#: AccountInfoPage.cpp:416
 msgid "Find login information"
 msgstr "Buscar información de acceso"
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:649
+#: AccountInfoPage.cpp:436 AccountInfoPage.cpp:641
 msgid "&Password:"
 msgstr "C&lave:"
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:673
+#: AccountInfoPage.cpp:443 AccountInfoPage.cpp:665
 msgid "Choose a &password:"
 msgstr "Escoja una c&lave:"
 
-#: clientgui/AccountInfoPage.cpp:446
+#: AccountInfoPage.cpp:446
 msgid "C&onfirm password:"
 msgstr "C&onfirmar clave:"
 
-#: clientgui/AccountInfoPage.cpp:453
+#: AccountInfoPage.cpp:453
 #, c-format
 msgid "Are you already running %s?"
 msgstr "¿Está usted ejecutando ya %s?"
 
-#: clientgui/AccountInfoPage.cpp:482
+#: AccountInfoPage.cpp:482
 msgid "&Username:"
 msgstr "&Nombre  de usuario:"
 
-#: clientgui/AccountInfoPage.cpp:511
-msgid "&Email address or LDAP ID:"
-msgstr ""
-
-#: clientgui/AccountInfoPage.cpp:515
+#: AccountInfoPage.cpp:508
 msgid "&Email address:"
 msgstr "&Dirección de correo:"
 
-#: clientgui/AccountInfoPage.cpp:523
+#: AccountInfoPage.cpp:515
 #, c-format
 msgid "minimum length %d"
 msgstr "longitud mínima %d"
 
-#: clientgui/AccountInfoPage.cpp:530
+#: AccountInfoPage.cpp:522
 msgid "Forgot your password?"
 msgstr "¿Olvidó su clave?"
 
-#: clientgui/AccountInfoPage.cpp:537
+#: AccountInfoPage.cpp:529
 msgid ""
 "If you have not yet registered with this account manager,\n"
 "please do so before proceeding.  Click on the link below\n"
@@ -127,46 +123,49 @@ msgstr ""
 "por favor, hágalo antes de continuar.  Pulse en el vínculo de debajo\n"
 "para registrarse o recuperar una contraseña olvidada."
 
-#: clientgui/AccountInfoPage.cpp:540
+#: AccountInfoPage.cpp:532
 #, fuzzy
 msgid "Account manager web site"
 msgstr "Sitio web del administrador de cuentas"
 
-#: clientgui/AccountInfoPage.cpp:582
+#: AccountInfoPage.cpp:574 WelcomePage.cpp:348
 msgid "Add project"
 msgstr "Añadir proyecto"
 
-#: clientgui/AccountInfoPage.cpp:584
+#: AccountInfoPage.cpp:576
 msgid "Update account manager"
 msgstr "Actualizar el administrador de cuentas"
 
-#: clientgui/AccountInfoPage.cpp:586
+#: AccountInfoPage.cpp:578 WelcomePage.cpp:307 WelcomePage.cpp:321
 msgid "Use account manager"
 msgstr "Usar administrador de cuentas"
 
-#: clientgui/AccountInfoPage.cpp:593
+#: AccountInfoPage.cpp:585
 msgid "Please enter a user name."
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:595
+#: AccountInfoPage.cpp:587
 #, fuzzy
 msgid "Please enter an email address."
 msgstr "Por favor especifique una dirección de correo"
 
-#: clientgui/AccountInfoPage.cpp:605
+#: AccountInfoPage.cpp:597
 #, c-format
 msgid "Please enter a password of at least %d characters."
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:615
-msgid "The password and confirmation password do not match. Please type them again."
-msgstr "La clave y la confirmación de clave no concuerdan. Por favor tecléelas de nuevo."
+#: AccountInfoPage.cpp:607
+msgid ""
+"The password and confirmation password do not match. Please type them again."
+msgstr ""
+"La clave y la confirmación de clave no concuerdan. Por favor tecléelas de "
+"nuevo."
 
-#: clientgui/AccountManagerInfoPage.cpp:272
+#: AccountManagerInfoPage.cpp:272
 msgid "Choose an account manager"
 msgstr "Elija un administrador de cuentas"
 
-#: clientgui/AccountManagerInfoPage.cpp:275
+#: AccountManagerInfoPage.cpp:275
 msgid ""
 "To choose an account manager, click its name or \n"
 "type its URL below."
@@ -174,398 +173,385 @@ msgstr ""
 "Para elegir un administrador de cuentas, pulse sobre su nombre o \n"
 "introduzca su URL debajo."
 
-#: clientgui/AccountManagerInfoPage.cpp:279
+#: AccountManagerInfoPage.cpp:279
 #, fuzzy
 msgid "Account manager details:"
 msgstr "Sitio web del administrador de cuentas"
 
-#: clientgui/AccountManagerInfoPage.cpp:283
+#: AccountManagerInfoPage.cpp:283
 #, fuzzy
 msgid "Account manager &URL:"
 msgstr "U&RL del Administrador de Cuentas:"
 
-#: clientgui/AccountManagerInfoPage.cpp:287
+#: AccountManagerInfoPage.cpp:287
 msgid "Open web page"
 msgstr ""
 
-#: clientgui/AccountManagerInfoPage.cpp:290
+#: AccountManagerInfoPage.cpp:290
 msgid "Visit this account manager's web site"
 msgstr ""
 
-#: clientgui/AccountManagerProcessingPage.cpp:186
-#: clientgui/AccountManagerPropertiesPage.cpp:192
+#: AccountManagerProcessingPage.cpp:187 AccountManagerPropertiesPage.cpp:193
 #, c-format
 msgid "Communicating with %s."
 msgstr "Comunicándose con %s."
 
-#: clientgui/AccountManagerProcessingPage.cpp:193
-#: clientgui/AccountManagerPropertiesPage.cpp:199
+#: AccountManagerProcessingPage.cpp:194 AccountManagerPropertiesPage.cpp:200
 msgid "Communicating with server."
 msgstr "Comunicándose con el servidor."
 
-#: clientgui/AccountManagerProcessingPage.cpp:198
-#: clientgui/AccountManagerPropertiesPage.cpp:204
+#: AccountManagerProcessingPage.cpp:199 AccountManagerPropertiesPage.cpp:205
 msgid "Please wait..."
 msgstr "Por favor espere..."
 
-#: clientgui/AccountManagerProcessingPage.cpp:325
+#: AccountManagerProcessingPage.cpp:326
 msgid "An internal server error has occurred.\n"
 msgstr "Ha ocurrido un error interno en el servidor.\n"
 
-#: clientgui/AdvancedFrame.cpp:96
+#: AdvancedFrame.cpp:95
 msgid "Connected"
 msgstr "Conectado"
 
-#: clientgui/AdvancedFrame.cpp:104
+#: AdvancedFrame.cpp:103
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: clientgui/AdvancedFrame.cpp:318
+#: AdvancedFrame.cpp:322 sg_BoincSimpleFrame.cpp:119
 #, c-format
 msgid "Close the %s window"
 msgstr "Cerrar la ventana %s"
 
-#: clientgui/AdvancedFrame.cpp:321
+#: AdvancedFrame.cpp:325 sg_BoincSimpleFrame.cpp:122
 msgid "&Close Window"
 msgstr "&Cerrar Ventana"
 
-#: clientgui/AdvancedFrame.cpp:332
-#: clientgui/AdvancedFrame.cpp:339
-#: clientgui/AdvancedFrame.cpp:346
+#: AdvancedFrame.cpp:336 AdvancedFrame.cpp:343 AdvancedFrame.cpp:350
 #, c-format
 msgid "Exit %s"
 msgstr "Salir de %s"
 
-#: clientgui/AdvancedFrame.cpp:359
-#, fuzzy
-msgid "Preferences..."
-msgstr "Preferencias"
-
-#: clientgui/AdvancedFrame.cpp:368
+#: AdvancedFrame.cpp:371
 msgid "&Notices\tCtrl+Shift+N"
 msgstr "&Avisos\t Ctrl+Shift+A"
 
-#: clientgui/AdvancedFrame.cpp:369
+#: AdvancedFrame.cpp:372
 msgid "Display notices"
 msgstr "Visualiza los anuncios"
 
-#: clientgui/AdvancedFrame.cpp:374
+#: AdvancedFrame.cpp:377
 msgid "&Projects\tCtrl+Shift+P"
 msgstr "&Proyectos\t Crtl+Shift+P"
 
-#: clientgui/AdvancedFrame.cpp:375
+#: AdvancedFrame.cpp:378
 msgid "Display projects"
 msgstr "Visualizar los proyectos"
 
-#: clientgui/AdvancedFrame.cpp:380
+#: AdvancedFrame.cpp:383
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr "&Tareas\tCtrl+Shift+T"
 
-#: clientgui/AdvancedFrame.cpp:381
+#: AdvancedFrame.cpp:384
 msgid "Display tasks"
 msgstr "Visualizar las tareas"
 
-#: clientgui/AdvancedFrame.cpp:386
+#: AdvancedFrame.cpp:389
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr "Trans&ferencias\tCtrl+Shift+F"
 
-#: clientgui/AdvancedFrame.cpp:387
+#: AdvancedFrame.cpp:390
 msgid "Display transfers"
 msgstr "Visualizar las transferencias"
 
-#: clientgui/AdvancedFrame.cpp:392
+#: AdvancedFrame.cpp:395
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "&Estadísticas\t Ctrl+Shift+E"
 
-#: clientgui/AdvancedFrame.cpp:393
+#: AdvancedFrame.cpp:396
 msgid "Display statistics"
 msgstr "Visualizar las estadísticas"
 
-#: clientgui/AdvancedFrame.cpp:398
+#: AdvancedFrame.cpp:401
 msgid "&Disk usage\tCtrl+Shift+D"
 msgstr "&Disco\tCtrl+Shift+D"
 
-#: clientgui/AdvancedFrame.cpp:399
+#: AdvancedFrame.cpp:402
 msgid "Display disk usage"
 msgstr "Visualizar uso del disco"
 
-#: clientgui/AdvancedFrame.cpp:406
+#: AdvancedFrame.cpp:409
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr "&Vista Simple...\tCtrl+Shift+V"
 
-#: clientgui/AdvancedFrame.cpp:407
+#: AdvancedFrame.cpp:410
 msgid "Display the simple graphical interface."
 msgstr "Muestra el interfaz gráfico simple de BOINC."
 
-#: clientgui/AdvancedFrame.cpp:421
+#: AdvancedFrame.cpp:424
 msgid "&Add project or account manager..."
 msgstr "&Añadir un proyecto o un administrador de cuentas..."
 
-#: clientgui/AdvancedFrame.cpp:422
+#: AdvancedFrame.cpp:425 sg_ProjectPanel.cpp:76
 msgid "Volunteer for any or all of 30+ projects in many areas of science"
-msgstr "Ser voluntario de alguno o todos de los más de 30 proyectos en muchas áreas de la ciencia"
+msgstr ""
+"Ser voluntario de alguno o todos de los más de 30 proyectos en muchas áreas "
+"de la ciencia"
 
-#: clientgui/AdvancedFrame.cpp:426
+#: AdvancedFrame.cpp:429
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "&Sincronizar con %s"
 
-#: clientgui/AdvancedFrame.cpp:430
+#: AdvancedFrame.cpp:433
 #, c-format
 msgid "Get current settings from %s"
 msgstr "Obtener las preferencias actuales de %s"
 
-#: clientgui/AdvancedFrame.cpp:440
+#: AdvancedFrame.cpp:443
 msgid "&Add project..."
 msgstr "&Añadir proyecto..."
 
-#: clientgui/AdvancedFrame.cpp:441
+#: AdvancedFrame.cpp:444
 msgid "Add a project"
 msgstr "Añadir un proyecto"
 
-#: clientgui/AdvancedFrame.cpp:444
+#: AdvancedFrame.cpp:447
 #, c-format
 msgid "S&top using %s..."
 msgstr "&Parar de usar %s..."
 
-#: clientgui/AdvancedFrame.cpp:450
+#: AdvancedFrame.cpp:453
 msgid "Remove this computer from account manager control."
 msgstr "Eliminar el control de este ordenador por el administrador de cuentas."
 
-#: clientgui/AdvancedFrame.cpp:455
+#: AdvancedFrame.cpp:458 sg_BoincSimpleFrame.cpp:178
 msgid "&Options..."
 msgstr "&Opciones..."
 
-#: clientgui/AdvancedFrame.cpp:456
+#: AdvancedFrame.cpp:459 sg_BoincSimpleFrame.cpp:179
 msgid "Configure display options and proxy settings"
 msgstr "Configurar las opciones del interfaz de usuario y los valores del proxy"
 
-#: clientgui/AdvancedFrame.cpp:460
+#: AdvancedFrame.cpp:463 sg_BoincSimpleFrame.cpp:172
 msgid "Computing &preferences..."
 msgstr "&Preferencias de computación..."
 
-#: clientgui/AdvancedFrame.cpp:461
+#: AdvancedFrame.cpp:464 sg_BoincSimpleFrame.cpp:173
 msgid "Configure computing preferences"
 msgstr "Configurar preferencias de computación"
 
-#: clientgui/AdvancedFrame.cpp:469
+#: AdvancedFrame.cpp:472
 msgid "&Run always"
 msgstr "&Ejecutar siempre"
 
-#: clientgui/AdvancedFrame.cpp:470
+#: AdvancedFrame.cpp:473
 msgid "Allow work regardless of preferences"
 msgstr "Permitir el trabajo sin tener en cuenta sus preferencias"
 
-#: clientgui/AdvancedFrame.cpp:474
+#: AdvancedFrame.cpp:477
 msgid "Run based on &preferences"
 msgstr "Ejecutar según &preferencias"
 
-#: clientgui/AdvancedFrame.cpp:475
+#: AdvancedFrame.cpp:478
 msgid "Allow work according to preferences"
 msgstr "Permitir el trabajo de acuerdo con sus preferencias"
 
-#: clientgui/AdvancedFrame.cpp:479
+#: AdvancedFrame.cpp:482
 msgid "&Suspend"
 msgstr "S&uspender"
 
-#: clientgui/AdvancedFrame.cpp:480
+#: AdvancedFrame.cpp:483
 msgid "Stop work regardless of preferences"
 msgstr "Detiene el trabajo sin tener en cuenta sus preferencias"
 
-#: clientgui/AdvancedFrame.cpp:505
+#: AdvancedFrame.cpp:508
 msgid "Use GPU always"
 msgstr "Usar la GPU siempre"
 
-#: clientgui/AdvancedFrame.cpp:506
+#: AdvancedFrame.cpp:509
 msgid "Allow GPU work regardless of preferences"
 msgstr "Permitir trabajar a la GPU sin tener en cuenta sus preferencias"
 
-#: clientgui/AdvancedFrame.cpp:510
+#: AdvancedFrame.cpp:513
 msgid "Use GPU based on preferences"
 msgstr "Usar &GPU según preferencias"
 
-#: clientgui/AdvancedFrame.cpp:511
+#: AdvancedFrame.cpp:514
 msgid "Allow GPU work according to preferences"
 msgstr "Permitir trabajar a la GPU de acuerdo con sus preferencias"
 
-#: clientgui/AdvancedFrame.cpp:515
+#: AdvancedFrame.cpp:518
 msgid "Suspend GPU"
 msgstr "Suspender GPU"
 
-#: clientgui/AdvancedFrame.cpp:516
+#: AdvancedFrame.cpp:519
 msgid "Stop GPU work regardless of preferences"
 msgstr "Detiene el trabajo de la GPU sin tener en cuenta sus preferencias"
 
-#: clientgui/AdvancedFrame.cpp:540
+#: AdvancedFrame.cpp:543
 msgid "Network activity always available"
 msgstr "Actividad de red siempre &disponible"
 
-#: clientgui/AdvancedFrame.cpp:541
+#: AdvancedFrame.cpp:544
 msgid "Allow network activity regardless of preferences"
 msgstr "Actividad de red sin tener en cuenta sus preferencias"
 
-#: clientgui/AdvancedFrame.cpp:545
+#: AdvancedFrame.cpp:548
 msgid "Network activity based on preferences"
 msgstr "Actividad de red basada en sus preferencias"
 
-#: clientgui/AdvancedFrame.cpp:546
+#: AdvancedFrame.cpp:549
 msgid "Allow network activity according to preferences"
 msgstr "Perimitir actividad de red de acuerdo con sus preferencias"
 
-#: clientgui/AdvancedFrame.cpp:550
+#: AdvancedFrame.cpp:553
 msgid "Network activity suspended"
 msgstr "Actividad de red suspendida"
 
-#: clientgui/AdvancedFrame.cpp:551
+#: AdvancedFrame.cpp:554
 msgid "Stop BOINC network activity"
 msgstr "Detiene la actividad de red de BOINC"
 
-#: clientgui/AdvancedFrame.cpp:561
+#: AdvancedFrame.cpp:564
 #, c-format
 msgid "Connect to another computer running %s"
 msgstr "Conecta a otro ordenador ejecutando %s"
 
-#: clientgui/AdvancedFrame.cpp:566
+#: AdvancedFrame.cpp:569
 msgid "Select computer..."
 msgstr "Seleccionar orde&nador..."
 
-#: clientgui/AdvancedFrame.cpp:571
+#: AdvancedFrame.cpp:574
 msgid "Shut down connected client..."
 msgstr "Cerrar c&liente conectado..."
 
-#: clientgui/AdvancedFrame.cpp:572
+#: AdvancedFrame.cpp:575
 msgid "Shut down the currently connected client"
 msgstr "Cerrar el cliente actualmente conectado"
 
-#: clientgui/AdvancedFrame.cpp:576
+#: AdvancedFrame.cpp:579
 msgid "Run CPU &benchmarks"
 msgstr "Ejecutar &pruebas de rendimiento de la CPU"
 
-#: clientgui/AdvancedFrame.cpp:577
+#: AdvancedFrame.cpp:580
 msgid "Runs BOINC CPU benchmarks"
 msgstr "Ejecuta las pruebas de rendimiento de BOINC"
 
-#: clientgui/AdvancedFrame.cpp:581
+#: AdvancedFrame.cpp:584
 msgid "Do network communication"
 msgstr "Ejecutar comunicaciones de red"
 
-#: clientgui/AdvancedFrame.cpp:582
+#: AdvancedFrame.cpp:585
 msgid "Do all pending network communication"
 msgstr "Ejecutar todas las comunicaciones de red pendientes"
 
 # 94%
-#: clientgui/AdvancedFrame.cpp:586
+#: AdvancedFrame.cpp:589
 msgid "Read config files"
 msgstr "Leer ficheros de configuración"
 
-#: clientgui/AdvancedFrame.cpp:587
+#: AdvancedFrame.cpp:590
 msgid "Read configuration info from cc_config.xml and any app_config.xml files"
-msgstr "Leer información de configuración de los ficheros cc_config.xml y todos los app_config.xml"
+msgstr ""
+"Leer información de configuración de los ficheros cc_config.xml y todos los "
+"app_config.xml"
 
-#: clientgui/AdvancedFrame.cpp:591
+#: AdvancedFrame.cpp:594
 msgid "Read local prefs file"
 msgstr "Leer a&rchivo local de preferencias"
 
-#: clientgui/AdvancedFrame.cpp:592
+#: AdvancedFrame.cpp:595
 msgid "Read preferences from global_prefs_override.xml."
 msgstr "Leer preferencias de global_prefs_override.xml."
 
-#: clientgui/AdvancedFrame.cpp:597
+#: AdvancedFrame.cpp:600
 #, c-format
 msgid "Launch another instance of %s..."
 msgstr "Ejecutar otro proceso de %s..."
 
-#: clientgui/AdvancedFrame.cpp:601
+#: AdvancedFrame.cpp:604
 #, c-format
 msgid "Launch another %s"
 msgstr "Ejecutar otro %s"
 
-#: clientgui/AdvancedFrame.cpp:611
+#: AdvancedFrame.cpp:614
 msgid "Event Log...\tCtrl+Shift+E"
 msgstr "Registro de sucesos... \t Ctrl+Shift+E"
 
-#: clientgui/AdvancedFrame.cpp:612
+#: AdvancedFrame.cpp:615
 msgid "Display diagnostic messages."
 msgstr "Visualizar mensajes de diagnóstico."
 
-#: clientgui/AdvancedFrame.cpp:616
-msgid "Event Log Diagnostic Flags...\tCtrl+Shift+F"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:617
-msgid "Enable or disable various diagnostic messages"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:626
+#: AdvancedFrame.cpp:625 sg_BoincSimpleFrame.cpp:188
 #, c-format
 msgid "%s &help"
 msgstr "A&yuda %s"
 
-#: clientgui/AdvancedFrame.cpp:632
+#: AdvancedFrame.cpp:631 sg_BoincSimpleFrame.cpp:194
 #, c-format
 msgid "Show information about %s"
 msgstr "Muestra información acerca de  %s"
 
-#: clientgui/AdvancedFrame.cpp:644
+#: AdvancedFrame.cpp:643
 #, c-format
 msgid "&%s help"
 msgstr "Ayuda &%s"
 
-#: clientgui/AdvancedFrame.cpp:650
+#: AdvancedFrame.cpp:649 sg_BoincSimpleFrame.cpp:212
 #, c-format
 msgid "Show information about the %s"
 msgstr "Muestra información acerca de %s"
 
-#: clientgui/AdvancedFrame.cpp:662
+#: AdvancedFrame.cpp:661 sg_BoincSimpleFrame.cpp:224
 #, c-format
+#, c-format, fuzzy
 msgid "%s &web site"
 msgstr "Página &web de %s"
 
-#: clientgui/AdvancedFrame.cpp:668
+#: AdvancedFrame.cpp:667 sg_BoincSimpleFrame.cpp:230
 #, c-format
 msgid "Show information about BOINC and %s"
 msgstr "Muestra información acerca de BOINC y %s"
 
-#: clientgui/AdvancedFrame.cpp:680
-#: clientgui/BOINCTaskBar.cpp:544
+#: AdvancedFrame.cpp:679 BOINCTaskBar.cpp:530 sg_BoincSimpleFrame.cpp:242
 #, c-format
 msgid "&About %s..."
 msgstr "A&cerca de %s..."
 
-#: clientgui/AdvancedFrame.cpp:686
+#: AdvancedFrame.cpp:685 sg_BoincSimpleFrame.cpp:248
 msgid "Licensing and copyright information."
 msgstr "Información de licencia y copyright"
 
-#: clientgui/AdvancedFrame.cpp:693
+#: AdvancedFrame.cpp:692 sg_BoincSimpleFrame.cpp:255
 msgid "&File"
 msgstr "&Archivo"
 
-#: clientgui/AdvancedFrame.cpp:697
+#: AdvancedFrame.cpp:696 sg_BoincSimpleFrame.cpp:259
 msgid "&View"
 msgstr "&Ver"
 
-#: clientgui/AdvancedFrame.cpp:701
+#: AdvancedFrame.cpp:700 sg_BoincSimpleFrame.cpp:263
 msgid "&Tools"
 msgstr "&Herramientas"
 
-#: clientgui/AdvancedFrame.cpp:705
+#: AdvancedFrame.cpp:704
 msgid "&Activity"
 msgstr "Ac&tividad"
 
-#: clientgui/AdvancedFrame.cpp:709
+#: AdvancedFrame.cpp:708
 msgid "A&dvanced"
 msgstr "Avan&zado"
 
-#: clientgui/AdvancedFrame.cpp:713
+#: AdvancedFrame.cpp:712 DlgEventLog.cpp:332 sg_BoincSimpleFrame.cpp:267
+#: wizardex.cpp:374 wizardex.cpp:381
 msgid "&Help"
 msgstr "A&yuda"
 
-#: clientgui/AdvancedFrame.cpp:1185
+#: AdvancedFrame.cpp:1199
 #, c-format
 msgid "%s - Stop using %s"
 msgstr "%s - Dejar de usar %s"
 
-#: clientgui/AdvancedFrame.cpp:1190
+#: AdvancedFrame.cpp:1204
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -580,12 +566,12 @@ msgstr ""
 "\n"
 "¿Quiere dejar de usar %s?"
 
-#: clientgui/AdvancedFrame.cpp:1397
+#: AdvancedFrame.cpp:1401
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s - Cerrar el cliente actual..."
 
-#: clientgui/AdvancedFrame.cpp:1406
+#: AdvancedFrame.cpp:1410
 #, c-format
 msgid ""
 "%s will shut down the current client\n"
@@ -594,36 +580,36 @@ msgstr ""
 "%s cerrá el cliente actual y le pedirá\n"
 "otro ordenador al que conectarse (host)."
 
-#: clientgui/AdvancedFrame.cpp:1806
+#: AdvancedFrame.cpp:1745 DlgAbout.cpp:119
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: clientgui/AdvancedFrame.cpp:1815
+#: AdvancedFrame.cpp:1754
 #, c-format
 msgid "%s has successfully added %s"
 msgstr "%s ha agregado con éxito %s"
 
-#: clientgui/AdvancedFrame.cpp:1953
+#: AdvancedFrame.cpp:1893
 #, c-format
 msgid "%s - (%s)"
 msgstr "%s - (%s)"
 
-#: clientgui/AdvancedFrame.cpp:1957
+#: AdvancedFrame.cpp:1897
 #, c-format
 msgid "Connecting to %s"
 msgstr "Conectando a %s"
 
-#: clientgui/AdvancedFrame.cpp:1960
+#: AdvancedFrame.cpp:1900
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "Conectado a %s (%s)"
 
-#: clientgui/AlreadyExistsPage.cpp:184
+#: AlreadyExistsPage.cpp:184
 msgid "Username already in use"
 msgstr "Nombre de usuario ya en uso."
 
-#: clientgui/AlreadyExistsPage.cpp:187
+#: AlreadyExistsPage.cpp:187
 msgid ""
 "An account with that username already exists and has a\n"
 "different password than the one you entered.\n"
@@ -635,11 +621,11 @@ msgstr ""
 "\n"
 "Por favor visite la página web del proyecto y siga allí las instrucciones."
 
-#: clientgui/AlreadyExistsPage.cpp:191
+#: AlreadyExistsPage.cpp:191
 msgid "Email address already in use"
 msgstr "Dirección de correo ya en uso."
 
-#: clientgui/AlreadyExistsPage.cpp:194
+#: AlreadyExistsPage.cpp:194
 msgid ""
 "An account with that email address already exists and has a\n"
 "different password than the one you entered.\n"
@@ -651,43 +637,45 @@ msgstr ""
 "\n"
 "Por favor visite la página web del proyecto y siga allí las instrucciones."
 
-#: clientgui/AsyncRPC.cpp:1031
+#: AsyncRPC.cpp:1031
 msgid "Communicating with BOINC client.  Please wait ..."
 msgstr "Comunicando con cliente BOINC._ Por favor, espere ..."
 
-#: clientgui/AsyncRPC.cpp:1034
+#: AsyncRPC.cpp:1034
 #, c-format
 msgid "&Quit %s"
 msgstr "&Cerrar %s"
 
-#: clientgui/AsyncRPC.cpp:1036
+#: AsyncRPC.cpp:1036
 #, c-format
 msgid "E&xit %s"
 msgstr "&Salir de %s"
 
-#: clientgui/AsyncRPC.cpp:1040
+#: AsyncRPC.cpp:1040
 #, c-format
 msgid "%s - Communication"
 msgstr "%s - Comunicación"
 
-#: clientgui/AsyncRPC.cpp:1056
+#: AsyncRPC.cpp:1056 DlgAdvPreferencesBase.cpp:107 sg_DlgPreferences.cpp:433
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: clientgui/BOINCBaseFrame.cpp:504
+#: BOINCBaseFrame.cpp:505
 #, c-format
 msgid "%s - Connection Error"
 msgstr "%s - Error de Conexión"
 
-#: clientgui/BOINCBaseFrame.cpp:513
+#: BOINCBaseFrame.cpp:514
 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 ""
 "Usted no está autorizado actualmente a administrar el cliente.\n"
-"Por favor, contacte con su administrador para que le añada al grupo de usuarios locales 'boinc_users'."
+"Por favor, contacte con su administrador para que le añada al grupo de "
+"usuarios locales 'boinc_users'."
 
-#: clientgui/BOINCBaseFrame.cpp:522
+#: BOINCBaseFrame.cpp:523
 msgid ""
 "Authorization failed connecting to running client.\n"
 "Make sure you start this program in the same directory as the client."
@@ -695,20 +683,20 @@ msgstr ""
 "Fallo en la autorización para conectarse a un cliente en ejecución.\n"
 "Asegúrese de que inicia este programa en el mismo directorio que el cliente."
 
-#: clientgui/BOINCBaseFrame.cpp:524
+#: BOINCBaseFrame.cpp:525
 msgid "Authorization failed connecting to running client."
 msgstr "Falló la autorización la conectar a cliente en ejecución."
 
-#: clientgui/BOINCBaseFrame.cpp:532
+#: BOINCBaseFrame.cpp:533
 msgid "The password you have provided is incorrect, please try again."
 msgstr "La clave que ha introducido no es válida, por favor inténtelo de nuevo."
 
-#: clientgui/BOINCBaseFrame.cpp:576
+#: BOINCBaseFrame.cpp:577
 #, c-format
 msgid "%s - Connection Failed"
 msgstr "%s - Conexión Fallida"
 
-#: clientgui/BOINCBaseFrame.cpp:585
+#: BOINCBaseFrame.cpp:586
 #, c-format
 msgid ""
 "%s is not able to connect to a %s client.\n"
@@ -717,21 +705,23 @@ msgstr ""
 "%s no ha podido conectar con un cliente %s.\n"
 "¿Le gustaría intentarlo de nuevo?"
 
-#: clientgui/BOINCBaseFrame.cpp:621
+#: BOINCBaseFrame.cpp:622
 #, c-format
 msgid "%s - Daemon Start Failed"
 msgstr "%s - Inicio de Servicio Fallido"
 
-#: clientgui/BOINCBaseFrame.cpp:631
+#: BOINCBaseFrame.cpp:632
 #, 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 ""
 "%s no puede iniciar un cliente %s.\n"
-"Por favor, vaya a Panel de Control->Herramientas Administrativas->Servicios e inicie el servicio BOINC."
+"Por favor, vaya a Panel de Control->Herramientas Administrativas->Servicios "
+"e inicie el servicio BOINC."
 
-#: clientgui/BOINCBaseFrame.cpp:637
+#: BOINCBaseFrame.cpp:638
 #, c-format
 msgid ""
 "%s is not able to start a %s client.\n"
@@ -740,46 +730,50 @@ msgstr ""
 "%s no puede iniciar un cliente %s.\n"
 "Por favor inicie el servicio e inténtelo de nuevo"
 
-#: clientgui/BOINCBaseFrame.cpp:688
+#: BOINCBaseFrame.cpp:689
 #, c-format
 msgid "%s - Connection Status"
 msgstr "%s - Estado de la Conexión"
 
-#: clientgui/BOINCBaseFrame.cpp:699
+#: BOINCBaseFrame.cpp:700
 #, 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 ""
 "%s no está actualmente conectado a un cliente %s.\n"
-"Por favor utilice la opción de menú 'Avanzado\\Seleccionar ordenador...' para conectar a un cliente %s.\n"
-"Para conectar a su ordenador local por favor utilice 'localhost' como nombre del ordenador."
+"Por favor utilice la opción de menú 'Avanzado\\Seleccionar ordenador...' para "
+"conectar a un cliente %s.\n"
+"Para conectar a su ordenador local por favor utilice 'localhost' como nombre "
+"del ordenador."
 
-#: clientgui/BOINCBaseView.cpp:752
+#: BOINCBaseView.cpp:779
 msgid "Project web pages"
 msgstr "Páginas web del proyecto"
 
-#: clientgui/BOINCClientManager.cpp:573
+#: BOINCClientManager.cpp:575
 #, c-format
 msgid "%s - Unexpected Exit"
 msgstr "%s - Salida inesperada"
 
-#: clientgui/BOINCClientManager.cpp:583
+#: BOINCClientManager.cpp:585
 #, 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 cliente %s ha salido inesperadamente 3 veces durante los últimos %d minutos.\n"
+"El cliente %s ha salido inesperadamente 3 veces durante los últimos %d "
+"minutos.\n"
 "¿Desea reiniciarlo de nuevo?"
 
-#: clientgui/BOINCDialupManager.cpp:61
+#: BOINCDialupManager.cpp:61
 #, c-format
 msgid "%s - Network Status"
 msgstr "%s - Estado de la Red"
 
-#: clientgui/BOINCDialupManager.cpp:241
+#: BOINCDialupManager.cpp:241
 #, c-format
 msgid ""
 "%s needs to connect to the Internet.\n"
@@ -788,22 +782,22 @@ msgstr ""
 "%s necesita conectar a Internet.\n"
 "¿Puede hacerlo ahora?"
 
-#: clientgui/BOINCDialupManager.cpp:254
+#: BOINCDialupManager.cpp:254
 #, c-format
 msgid "%s is connecting to the Internet."
 msgstr "%s está conectando a Internet."
 
-#: clientgui/BOINCDialupManager.cpp:303
+#: BOINCDialupManager.cpp:303
 #, c-format
 msgid "%s has successfully connected to the Internet."
 msgstr "%s se ha conectado a Internet con éxito."
 
-#: clientgui/BOINCDialupManager.cpp:331
+#: BOINCDialupManager.cpp:331
 #, c-format
 msgid "%s failed to connect to the Internet."
 msgstr "%s falló al conectarse a Internet."
 
-#: clientgui/BOINCDialupManager.cpp:372
+#: BOINCDialupManager.cpp:372
 #, c-format
 msgid ""
 "%s has detected it is now connected to the Internet.\n"
@@ -812,17 +806,17 @@ msgstr ""
 "%s ha detectado que ahora está conectado a Internet.\n"
 "Actualizando todos los proyectos y reintentando todas las transferencias."
 
-#: clientgui/BOINCDialupManager.cpp:417
+#: BOINCDialupManager.cpp:417
 #, c-format
 msgid "%s has successfully disconnected from the Internet."
 msgstr "%s se ha desconectado de Internet con éxito."
 
-#: clientgui/BOINCDialupManager.cpp:433
+#: BOINCDialupManager.cpp:433
 #, c-format
 msgid "%s failed to disconnected from the Internet."
 msgstr "%s falló al desconectarse de Internet."
 
-#: clientgui/BOINCGUIApp.cpp:595
+#: BOINCGUIApp.cpp:339
 #, c-format
 msgid ""
 "You currently are not authorized to manage the client.\n"
@@ -843,24 +837,26 @@ msgstr ""
 "    - contacte con su administrador para que le añada al\n"
 "           grupo de usuarios 'boinc_master'."
 
-#: clientgui/BOINCGUIApp.cpp:601
+#: BOINCGUIApp.cpp:345
 #, c-format
 msgid ""
 "%s ownership or permissions are not set properly; please reinstall %s.\n"
 "(Error code %d"
 msgstr ""
-"Los permisos o los propietarios de %s no están configurados correctamente; por favor reinstale %s.\n"
+"Los permisos o los propietarios de %s no están configurados correctamente; "
+"por favor reinstale %s.\n"
 "(Código de error %d"
 
-#: clientgui/BOINCGUIApp.cpp:607
+#: BOINCGUIApp.cpp:351
 msgid " at "
 msgstr " en "
 
-#: clientgui/BOINCGUIApp.cpp:610
+#: BOINCGUIApp.cpp:354 MainDocument.cpp:2484 MainDocument.cpp:2534
+#: MainDocument.cpp:2554 ViewTransfers.cpp:803
 msgid ")"
 msgstr ")"
 
-#: clientgui/BOINCGUIApp.cpp:640
+#: BOINCGUIApp.cpp:384
 msgid ""
 "A reboot is required in order for BOINC to run properly.\n"
 "Please reboot your computer and try again."
@@ -868,188 +864,190 @@ msgstr ""
 "Es necesario reiniciar para que BOINC funcione correctamente.\n"
 "Por favor, reinicie su ordenador e inténtelo de nuevo."
 
-#: clientgui/BOINCGUIApp.cpp:641
+#: BOINCGUIApp.cpp:385 DlgAbout.cpp:153
 msgid "BOINC Manager"
 msgstr "Administrador BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:902
+#: BOINCGUIApp.cpp:572
 msgid "BOINC Manager was started by the operating system automatically"
-msgstr "El Administrador BOINC ha sido iniciado por el sistema operativo automáticamente"
+msgstr ""
+"El Administrador BOINC ha sido iniciado por el sistema operativo "
+"automáticamente"
 
-#: clientgui/BOINCGUIApp.cpp:904
+#: BOINCGUIApp.cpp:574
 msgid "Startup BOINC so only the system tray icon is visible"
-msgstr "Inicia BOINC de forma que sólo sea visible el icono en el área de notificación"
+msgstr ""
+"Inicia BOINC de forma que sólo sea visible el icono en el área de "
+"notificación"
 
-#: clientgui/BOINCGUIApp.cpp:906
+#: BOINCGUIApp.cpp:576
 msgid "Directory containing the BOINC Client executable"
 msgstr "Carpeta que contiene el ejecutable del Cliente BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:907
+#: BOINCGUIApp.cpp:577
 msgid "BOINC data directory"
 msgstr "Carpeta con los datos de BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:909
+#: BOINCGUIApp.cpp:579
 msgid "Host name or IP address"
 msgstr "Nombre del ordenador o dirección IP"
 
-#: clientgui/BOINCGUIApp.cpp:910
+#: BOINCGUIApp.cpp:580
 msgid "GUI RPC port number"
 msgstr "Número de puerto GUI RPC"
 
-#: clientgui/BOINCGUIApp.cpp:911
+#: BOINCGUIApp.cpp:581
 msgid "Password"
 msgstr "Contraseña"
 
-#: clientgui/BOINCGUIApp.cpp:912
+#: BOINCGUIApp.cpp:582
 msgid "Startup BOINC with these optional arguments"
 msgstr "Arrancar BOINC con estos argumentos opcionales"
 
-#: clientgui/BOINCGUIApp.cpp:913
+#: BOINCGUIApp.cpp:583
 msgid "disable BOINC security users and permissions"
 msgstr "desactiva la seguridad de usuarios y permisos en BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:914
+#: BOINCGUIApp.cpp:584
 msgid "set skin debugging mode to enable skin manager error messages"
-msgstr "activar modo depuración de pieles (skin) para permitir los mensajes de error del administrador de pieles"
+msgstr ""
+"activar modo depuración de pieles (skin) para permitir los mensajes de error "
+"del administrador de pieles"
 
-#: clientgui/BOINCGUIApp.cpp:915
+#: BOINCGUIApp.cpp:585
 msgid "multiple instances of BOINC Manager allowed"
 msgstr "permitidas múltiples instancias del administrador BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:917
+#: BOINCGUIApp.cpp:587
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr "No usado: solución temporal para el error en XCode 4.2"
 
-#: clientgui/BOINCGUIApp.cpp:1164
+#: BOINCGUIApp.cpp:814
 msgid "(Automatic Detection)"
 msgstr "(Detección Automática)"
 
-#: clientgui/BOINCGUIApp.cpp:1165
+#: BOINCGUIApp.cpp:815
 msgid "(Unknown)"
 msgstr "(Desconocido)"
 
-#: clientgui/BOINCGUIApp.cpp:1166
+#: BOINCGUIApp.cpp:816
 msgid "(User Defined)"
 msgstr "(Definido por el Usuario)"
 
-#: clientgui/BOINCTaskBar.cpp:522
+#: BOINCTaskBar.cpp:508
 #, c-format
 msgid "Open %s Web..."
 msgstr "Abrir la web %s..."
 
-#: clientgui/BOINCTaskBar.cpp:529
+#: BOINCTaskBar.cpp:515
 #, c-format
 msgid "Open %s..."
 msgstr "Abrir %s..."
 
-#: clientgui/BOINCTaskBar.cpp:536
-#: clientgui/BOINCTaskBar.cpp:633
-#: clientgui/BOINCTaskBar.cpp:641
+#: BOINCTaskBar.cpp:522 BOINCTaskBar.cpp:619 BOINCTaskBar.cpp:627
 msgid "Snooze"
 msgstr "Dormitar"
 
-#: clientgui/BOINCTaskBar.cpp:538
-#: clientgui/BOINCTaskBar.cpp:660
-#: clientgui/BOINCTaskBar.cpp:668
+#: BOINCTaskBar.cpp:524 BOINCTaskBar.cpp:646 BOINCTaskBar.cpp:654
 msgid "Snooze GPU"
 msgstr "Dormitar la GPU"
 
-#: clientgui/BOINCTaskBar.cpp:556
+#: BOINCTaskBar.cpp:542
 msgid "E&xit"
 msgstr "&Salir"
 
-#: clientgui/BOINCTaskBar.cpp:626
+#: BOINCTaskBar.cpp:612 ViewProjects.cpp:718 ViewWork.cpp:795
+#: sg_BoincSimpleFrame.cpp:758 sg_ProjectCommandPopup.cpp:110
+#: sg_TaskCommandPopup.cpp:102
 msgid "Resume"
 msgstr "Reanudar"
 
-#: clientgui/BOINCTaskBar.cpp:653
+#: BOINCTaskBar.cpp:639
 msgid "Resume GPU"
 msgstr "Reanudar GPU"
 
-#: clientgui/BOINCTaskBar.cpp:727
+#: BOINCTaskBar.cpp:713
 msgid "Computing is enabled"
 msgstr "Computación permitida"
 
-#: clientgui/BOINCTaskBar.cpp:731
+#: BOINCTaskBar.cpp:717
 msgid "Computing is suspended - "
 msgstr "Computación suspendida - "
 
-#: clientgui/BOINCTaskBar.cpp:741
+#: BOINCTaskBar.cpp:727
 msgid "GPU computing is enabled"
 msgstr "Computación de la GPU permitida"
 
-#: clientgui/BOINCTaskBar.cpp:744
+#: BOINCTaskBar.cpp:730
 msgid "GPU computing is suspended - "
 msgstr "Computación de la GPU suspendida - "
 
-#: clientgui/BOINCTaskBar.cpp:753
+#: BOINCTaskBar.cpp:739
 msgid "Network is enabled"
 msgstr "Uso de la red permitido"
 
-#: clientgui/BOINCTaskBar.cpp:756
+#: BOINCTaskBar.cpp:742
 msgid "Network is suspended - "
 msgstr "Actividad de red suspendida - "
 
-#: clientgui/BOINCTaskBar.cpp:764
+#: BOINCTaskBar.cpp:750
 msgid "Reconnecting to client."
 msgstr "Reconectando a cliente."
 
-#: clientgui/BOINCTaskBar.cpp:766
+#: BOINCTaskBar.cpp:752
 msgid "Not connected to a client."
 msgstr "No conectado a un cliente."
 
-#: clientgui/BOINCTaskBar.cpp:819
+#: BOINCTaskBar.cpp:805
 #, c-format
 msgid "%s Notices"
 msgstr "%s Avisos"
 
-#: clientgui/BOINCTaskBar.cpp:825
+#: BOINCTaskBar.cpp:811
 msgid "There are new notices - click to view."
 msgstr "Hay nuevos avisos - haz click para verlos."
 
-#: clientgui/CompletionErrorPage.cpp:199
+#: CompletionErrorPage.cpp:199
 msgid "Failed to add project"
 msgstr "Fallo al añadir el proyecto"
 
-#: clientgui/CompletionErrorPage.cpp:204
+#: CompletionErrorPage.cpp:204
 msgid "Failed to update account manager"
 msgstr "Fallo al actualizar el administrador de cuentas"
 
-#: clientgui/CompletionErrorPage.cpp:208
+#: CompletionErrorPage.cpp:208
 msgid "Failed to remove account manager"
 msgstr "Fallo al borrar el administrador de cuentas"
 
-#: clientgui/CompletionErrorPage.cpp:212
+#: CompletionErrorPage.cpp:212
 msgid "Failed to add account manager"
 msgstr "Fallo al añadir el administrador de cuentas"
 
-#: clientgui/CompletionErrorPage.cpp:221
+#: CompletionErrorPage.cpp:221
 msgid ""
 "Please try again later.\n"
 "\n"
 "Click Finish to close."
 msgstr ""
 
-#: clientgui/CompletionErrorPage.cpp:225
-#: clientgui/CompletionPage.cpp:222
-#: clientgui/CompletionPage.cpp:242
-#: clientgui/CompletionPage.cpp:273
+#: CompletionErrorPage.cpp:225 CompletionPage.cpp:222 CompletionPage.cpp:242
+#: CompletionPage.cpp:273
 msgid "Click Finish to close."
 msgstr "Haga clic en Finalizar para cerrar."
 
-#: clientgui/CompletionErrorPage.cpp:234
+#: CompletionErrorPage.cpp:234
 msgid "Messages from server:"
 msgstr "Mensajes del servidor:"
 
-#: clientgui/CompletionPage.cpp:207
+#: CompletionPage.cpp:207
 msgid "Project added"
 msgstr "Proyecto añadido"
 
-#: clientgui/CompletionPage.cpp:213
+#: CompletionPage.cpp:213
 msgid "This project has been successfully added."
 msgstr "Este proyecto ha sido añadido correctamente."
 
-#: clientgui/CompletionPage.cpp:218
+#: 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."
@@ -1057,128 +1055,122 @@ msgstr ""
 "Cuando haga clic en Finalizar, su navegador irá a la página donde\n"
 "usted pueda establecer su nombre de cuenta y preferencias."
 
-#: clientgui/CompletionPage.cpp:232
+#: CompletionPage.cpp:232
 #, c-format
 msgid "Update from %s completed."
 msgstr "Actualización desde %s completada."
 
-#: clientgui/CompletionPage.cpp:236
+#: CompletionPage.cpp:236
 msgid "Update completed."
 msgstr "Actualización completada."
 
-#: clientgui/CompletionPage.cpp:247
+#: CompletionPage.cpp:247
 msgid "Now using account manager"
 msgstr "Actualmente se está usando administrador de cuentas"
 
-#: clientgui/CompletionPage.cpp:252
+#: CompletionPage.cpp:252
 #, c-format
 msgid "Welcome to %s!"
 msgstr "¡Bienvenido a %s!"
 
-#: clientgui/CompletionPage.cpp:263
+#: CompletionPage.cpp:263
 #, c-format
 msgid "You are now using %s to manage accounts."
 msgstr "Usted está utilizando %s para administrar sus cuentas."
 
-#: clientgui/CompletionPage.cpp:267
+#: CompletionPage.cpp:267
 msgid "You are now using this account manager."
 msgstr "Usted está usando este administrador de cuentas."
 
-#: clientgui/DlgAbout.cpp:113
+#: DlgAbout.cpp:113 mac/Mac_GUI.cpp:96
 #, c-format
 msgid "About %s"
 msgstr "Acerca de %s"
 
-#: clientgui/DlgAbout.cpp:172
+#: DlgAbout.cpp:172
 msgid "Version:"
 msgstr "Versión:"
 
-#: clientgui/DlgAbout.cpp:180
+#: DlgAbout.cpp:180
 msgid "wxWidgets Version:"
 msgstr "Versión de wxWidgets"
 
-#: clientgui/DlgAbout.cpp:188
+#: DlgAbout.cpp:188
 msgid "Copyright:"
 msgstr "Copyright:"
 
 # 98%
-#: clientgui/DlgAbout.cpp:192
-#, fuzzy
+#: DlgAbout.cpp:192
 msgid ""
-"(C) 2003-2014 University of California, Berkeley.\n"
+"(C) 2003-2013 University of California, Berkeley.\n"
 "All Rights Reserved."
 msgstr ""
 "(C) 2003-2013 Universidad de California, Berkeley.\n"
 "Reservados Todos los Derechos."
 
-#: clientgui/DlgAbout.cpp:196
+#: DlgAbout.cpp:196
 msgid "Berkeley Open Infrastructure for Network Computing"
 msgstr "Infraestructura Abierta de Berkeley para Computación en Red"
 
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:399
-#: clientgui/DlgSelectComputer.cpp:163
+#: DlgAbout.cpp:208 DlgExitMessage.cpp:173 DlgGenericMessage.cpp:120
+#: DlgOptions.cpp:396 DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "&Aceptar"
 
-#: clientgui/DlgAdvPreferences.cpp:602
+#: DlgAdvPreferences.cpp:544
 msgid "invalid number"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:603
+#: DlgAdvPreferences.cpp:545
 msgid "invalid time, format is HH:MM"
 msgstr "hora inválida, el format es HH:MM"
 
-#: clientgui/DlgAdvPreferences.cpp:604
+#: DlgAdvPreferences.cpp:546
 msgid "invalid time interval, format is HH:MM-HH:MM"
 msgstr "intervalo de tiempo inválido, el formato es HH:MM-HH:MM"
 
-#: clientgui/DlgAdvPreferences.cpp:817
+#: DlgAdvPreferences.cpp:751
 msgid "invalid input value detected"
 msgstr "detectada introducción de valor inválido"
 
-#: clientgui/DlgAdvPreferences.cpp:819
+#: DlgAdvPreferences.cpp:753
 msgid "Validation Error"
 msgstr "Error de Validación"
 
-#: clientgui/DlgAdvPreferences.cpp:969
-#: clientgui/DlgAdvPreferences.cpp:975
-#: clientgui/DlgAdvPreferences.cpp:981
+#: DlgAdvPreferences.cpp:885 DlgAdvPreferences.cpp:891
+#: DlgAdvPreferences.cpp:897
 msgid "Applications to add"
 msgstr "Aplicaciones a añadir"
 
-#: clientgui/DlgAdvPreferences.cpp:998
+#: DlgAdvPreferences.cpp:914
 #, c-format
 msgid "'%s' is not an executable application."
 msgstr "'%s' no es una aplicación ejecutable."
 
-#: clientgui/DlgAdvPreferences.cpp:999
-#: clientgui/DlgAdvPreferences.cpp:1046
-#: clientgui/DlgAdvPreferences.cpp:1070
+#: DlgAdvPreferences.cpp:915 DlgAdvPreferences.cpp:962
+#: DlgAdvPreferences.cpp:986
 msgid "Add Exclusive App"
 msgstr "Añadir Aplicación Exclusiva"
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Name of application to add?"
 msgstr "¿Nombre de la aplicación a añadir?"
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Add exclusive app"
 msgstr "Añadir aplicación exclusiva"
 
-#: clientgui/DlgAdvPreferences.cpp:1045
+#: DlgAdvPreferences.cpp:961
 #, c-format
 msgid "Application names must end with '%s'"
 msgstr "Los nombres de aplicación deben terminar en '%s'"
 
-#: clientgui/DlgAdvPreferences.cpp:1069
+#: DlgAdvPreferences.cpp:985
 #, c-format
 msgid "'%s' is already in the list."
 msgstr "'%s' ya está en la lista."
 
-#: clientgui/DlgAdvPreferences.cpp:1161
+#: DlgAdvPreferences.cpp:1077
 msgid ""
 "Do you really want to clear all local preferences?\n"
 "(This will not affect exclusive applications.)"
@@ -1186,16 +1178,16 @@ msgstr ""
 "¿Quiere realmente borrar todas las preferencias locales?\n"
 "(Esto no afectará a las aplicaciones exclusivas.)"
 
-#: clientgui/DlgAdvPreferences.cpp:1162
+#: DlgAdvPreferences.cpp:1078 sg_DlgPreferences.cpp:1030
 msgid "Confirmation"
 msgstr "Confirmación"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:49
+#: DlgAdvPreferencesBase.cpp:46 sg_DlgPreferences.cpp:946
 #, c-format
-msgid "%s - Computing preferences"
-msgstr ""
+msgid "%s - Preferences"
+msgstr "%s - Preferencias"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:66
+#: DlgAdvPreferencesBase.cpp:62
 msgid ""
 "This dialog controls preferences for this computer only.\n"
 "Click OK to set preferences.\n"
@@ -1203,284 +1195,287 @@ msgid ""
 msgstr ""
 "Este diálogo sólo controla las preferencias de este ordenador.\n"
 "Pulse Aceptar para guardar las preferencias.\n"
-"Pulse Restablecer para restaurar las preferencias basadas en web (excepto aplicaciones exclusivas)."
+"Pulse Restablecer para restaurar las preferencias basadas en web (excepto "
+"aplicaciones exclusivas)."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:69
+#: DlgAdvPreferencesBase.cpp:65 sg_DlgPreferences.cpp:428
 msgid "Clear"
 msgstr "Restablecer"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:70
+#: DlgAdvPreferencesBase.cpp:66
 msgid "clear all local preferences and close the dialog"
 msgstr "restaurar todas las preferencias locales y cerrar la ventana"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:85
+#: DlgAdvPreferencesBase.cpp:81
 msgid "processor usage"
 msgstr "uso del procesador"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:88
+#: DlgAdvPreferencesBase.cpp:84
 msgid "network usage"
 msgstr "uso de la red"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:91
+#: DlgAdvPreferencesBase.cpp:87
 msgid "disk and memory usage"
 msgstr "uso de disco y memoria"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:94
+#: DlgAdvPreferencesBase.cpp:90
 msgid "exclusive applications"
 msgstr "aplicaciones exclusivas"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:107
-#: clientgui/DlgDiagnosticLogFlags.cpp:104
+#: DlgAdvPreferencesBase.cpp:102 sg_DlgPreferences.cpp:424
 msgid "OK"
 msgstr "Aceptar"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:108
+#: DlgAdvPreferencesBase.cpp:103
 msgid "save all values and close the dialog"
 msgstr "grabar todos los valores y cerrar la ventana"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:114
+#: DlgAdvPreferencesBase.cpp:108
 msgid "close the dialog without saving"
 msgstr "cerrar la ventana sin grabar"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:118
-#: clientgui/Localization.cpp:35
-#: clientgui/Localization.cpp:121
-#: clientgui/Localization.cpp:139
+#: DlgAdvPreferencesBase.cpp:112 Localization.cpp:35 Localization.cpp:121
+#: Localization.cpp:139 sg_BoincSimpleFrame.cpp:794 sg_DlgPreferences.cpp:439
 msgid "Help"
 msgstr "Ayuda"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
+#: DlgAdvPreferencesBase.cpp:113
 msgid "shows the preferences web page"
 msgstr "muestra la página web de preferencias"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:141
+#: DlgAdvPreferencesBase.cpp:135
 msgid "Computing allowed"
 msgstr "Computación permitida"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
+#: DlgAdvPreferencesBase.cpp:139
 msgid "While computer is on batteries"
 msgstr "Cuando el ordenador funcione con baterías"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:149
-msgid "check this if you want this computer to do work while it runs on batteries"
-msgstr "márquela si quiere que este ordenador trabaje mientras está funcionando con baterías"
+#: DlgAdvPreferencesBase.cpp:142
+msgid ""
+"check this if you want this computer to do work while it runs on batteries"
+msgstr ""
+"márquela si quiere que este ordenador trabaje mientras está funcionando con "
+"baterías"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:155
+#: DlgAdvPreferencesBase.cpp:148
 msgid "While computer is in use"
 msgstr "Cuando el ordenador está en uso"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:158
-msgid "check this if you want this computer to do work even when you're using it"
-msgstr "márquela si quiere que este ordenador trabaje incluso cuando usted lo está usando"
+#: DlgAdvPreferencesBase.cpp:151
+msgid ""
+"check this if you want this computer to do work even when you're using it"
+msgstr ""
+"márquela si quiere que este ordenador trabaje incluso cuando usted lo está "
+"usando"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:164
+#: DlgAdvPreferencesBase.cpp:157
 msgid "Use GPU while computer is in use"
 msgstr "Usar la GPU cuando el ordenador está en uso"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:167
-msgid "check this if you want your GPU to do work even when you're using the computer"
-msgstr "márquela si quiere que su GPU ejecute tareas incluso cuando usted esté usando su ordenador"
+#: DlgAdvPreferencesBase.cpp:160
+msgid ""
+"check this if you want your GPU to do work even when you're using the "
+"computer"
+msgstr ""
+"márquela si quiere que su GPU ejecute tareas incluso cuando usted esté "
+"usando su ordenador"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:179
+#: DlgAdvPreferencesBase.cpp:172
 msgid "Only after computer has been idle for"
 msgstr "Sólo si el ordenador ha estado inactivo durante"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:188
-msgid "do work only after you haven't used the computer for this number of minutes"
-msgstr "hacer trabajo sólo cuando no se haya usado el ordenador durante este número de minutos"
+#: DlgAdvPreferencesBase.cpp:182
+msgid ""
+"do work only after you haven't used the computer for this number of minutes"
+msgstr ""
+"hacer trabajo sólo cuando no se haya usado el ordenador durante este número "
+"de minutos"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:193
-#: clientgui/DlgAdvPreferencesBase.cpp:342
+#: DlgAdvPreferencesBase.cpp:187 DlgAdvPreferencesBase.cpp:336
+#: sg_DlgPreferences.cpp:417
 msgid "minutes"
 msgstr "minutos"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:212
+#: DlgAdvPreferencesBase.cpp:206
 msgid "While processor usage is less than"
 msgstr "Cuando el uso del procesador es menor que"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:221
+#: DlgAdvPreferencesBase.cpp:216
 msgid "suspend work if processor usage exceeds this level"
 msgstr "suspender el trabajo si el uso del procesador excede este nivel"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:226
+#: DlgAdvPreferencesBase.cpp:221
 msgid "percent (0 means no restriction)"
 msgstr "porciento (0 significa sin restricciones)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:240
-#: clientgui/DlgAdvPreferencesBase.cpp:506
+#: DlgAdvPreferencesBase.cpp:235 DlgAdvPreferencesBase.cpp:496
 msgid "Every day between hours of"
 msgstr "Cada día entre las horas"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: DlgAdvPreferencesBase.cpp:239
 msgid "start work at this time"
 msgstr "empezar el trabajo a esta hora"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:248
-#: clientgui/DlgAdvPreferencesBase.cpp:514
+#: DlgAdvPreferencesBase.cpp:243 DlgAdvPreferencesBase.cpp:504
+#: sg_DlgPreferences.cpp:326 sg_DlgPreferences.cpp:348
 msgid "and"
 msgstr "y"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:252
+#: DlgAdvPreferencesBase.cpp:247
 msgid "stop work at this time"
 msgstr "suspender el trabajo a esta hora"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
-#: clientgui/DlgAdvPreferencesBase.cpp:522
+#: DlgAdvPreferencesBase.cpp:251 DlgAdvPreferencesBase.cpp:512
 msgid "(no restriction if equal)"
 msgstr "(sin restricciones si son iguales)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:261
-#: clientgui/DlgAdvPreferencesBase.cpp:527
+#: DlgAdvPreferencesBase.cpp:256 DlgAdvPreferencesBase.cpp:517
 msgid "Day-of-week override:"
 msgstr "Inactividad por día de la semana:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:266
-#: clientgui/DlgAdvPreferencesBase.cpp:532
+#: DlgAdvPreferencesBase.cpp:261 DlgAdvPreferencesBase.cpp:522
 msgid "check box to specify hours for this day of week"
-msgstr "seleccione el cuadro para especificar las horas para este día de la semana"
+msgstr ""
+"seleccione el cuadro para especificar las horas para este día de la semana"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:272
-#: clientgui/DlgAdvPreferencesBase.cpp:538
+#: DlgAdvPreferencesBase.cpp:267 DlgAdvPreferencesBase.cpp:528
 msgid "Monday"
 msgstr "Lunes"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:279
-#: clientgui/DlgAdvPreferencesBase.cpp:545
+#: DlgAdvPreferencesBase.cpp:274 DlgAdvPreferencesBase.cpp:535
 msgid "Tuesday"
 msgstr "Martes"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:286
-#: clientgui/DlgAdvPreferencesBase.cpp:552
+#: DlgAdvPreferencesBase.cpp:281 DlgAdvPreferencesBase.cpp:542
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:293
-#: clientgui/DlgAdvPreferencesBase.cpp:559
+#: DlgAdvPreferencesBase.cpp:288 DlgAdvPreferencesBase.cpp:549
 msgid "Thursday"
 msgstr "Jueves"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:300
-#: clientgui/DlgAdvPreferencesBase.cpp:566
+#: DlgAdvPreferencesBase.cpp:295 DlgAdvPreferencesBase.cpp:556
 msgid "Friday"
 msgstr "Viernes"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:307
-#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: DlgAdvPreferencesBase.cpp:302 DlgAdvPreferencesBase.cpp:563
 msgid "Saturday"
 msgstr "Sábado"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:580
+#: DlgAdvPreferencesBase.cpp:309 DlgAdvPreferencesBase.cpp:570
 msgid "Sunday"
 msgstr "Domingo"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:328
+#: DlgAdvPreferencesBase.cpp:323
 msgid "Other options"
 msgstr "Otras opciones"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:336
+#: DlgAdvPreferencesBase.cpp:330
 msgid "Switch between applications every"
 msgstr "Cambio entre aplicaciones cada"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:345
+#: DlgAdvPreferencesBase.cpp:339
 msgid "On multiprocessor systems, use at most"
 msgstr "En sistemas multiprocesador, utilizar como máximo"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
+#: DlgAdvPreferencesBase.cpp:346
 #, no-c-format
-msgid "% of the processors (0 means no restriction)"
+msgid "% of the processors (0 means ignore this setting)"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:355
-#: clientgui/DlgAdvPreferencesBase.cpp:618
-#: clientgui/DlgAdvPreferencesBase.cpp:640
-#: clientgui/DlgAdvPreferencesBase.cpp:661
-#: clientgui/DlgAdvPreferencesBase.cpp:683
-#: clientgui/DlgAdvPreferencesBase.cpp:694
+#: DlgAdvPreferencesBase.cpp:349 DlgAdvPreferencesBase.cpp:605
+#: DlgAdvPreferencesBase.cpp:627 DlgAdvPreferencesBase.cpp:648
+#: DlgAdvPreferencesBase.cpp:669 DlgAdvPreferencesBase.cpp:679
 msgid "Use at most"
 msgstr "Utilizar como  máximo"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:362
+#: DlgAdvPreferencesBase.cpp:356
 #, no-c-format
-msgid "% of CPU time (0 means no restriction)"
-msgstr ""
+msgid "% CPU time"
+msgstr "% del tiempo de la CPU"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:386
+#: DlgAdvPreferencesBase.cpp:378
 msgid "General options"
 msgstr "Opciones generales"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:395
+#: DlgAdvPreferencesBase.cpp:386
 msgid "Maximum download rate"
 msgstr "Velocidad máxima de descarga"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:401
-#: clientgui/DlgAdvPreferencesBase.cpp:410
-msgid "KBytes/second (0 means no restriction)"
-msgstr ""
+#: DlgAdvPreferencesBase.cpp:392 DlgAdvPreferencesBase.cpp:401
+msgid "KBytes/sec."
+msgstr "KB/s"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:404
+#: DlgAdvPreferencesBase.cpp:395
 msgid "Maximum upload rate"
 msgstr "Velocidad máxima de envío"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:417
+#: DlgAdvPreferencesBase.cpp:406
+msgid "Transfer at most"
+msgstr "Transferir como máximo"
+
+#: DlgAdvPreferencesBase.cpp:412
+msgid "Mbytes"
+msgstr "Mbytes"
+
+#: DlgAdvPreferencesBase.cpp:415
+msgid "every"
+msgstr "cada"
+
+#: DlgAdvPreferencesBase.cpp:421 DlgAdvPreferencesBase.cpp:444
+#: DlgAdvPreferencesBase.cpp:463
+msgid "days"
+msgstr "días"
+
+#: DlgAdvPreferencesBase.cpp:429
 msgid "Minimum work buffer"
 msgstr "Bufer mínimo de trabajo"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:425
+#: DlgAdvPreferencesBase.cpp:438
 msgid "Try to maintain enough tasks to keep busy for this many days"
-msgstr "Trata de mantener suficientes tareas para estar ocupado durante todos estos días"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:431
-#: clientgui/DlgAdvPreferencesBase.cpp:449
-msgid "days (maximum value: 10)"
 msgstr ""
+"Trata de mantener suficientes tareas para estar ocupado durante todos estos "
+"días"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:437
+#: DlgAdvPreferencesBase.cpp:450
 msgid "Max additional work buffer"
 msgstr "Bufer máximo de trabajo adicional"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:445
+#: DlgAdvPreferencesBase.cpp:459
 msgid "In addition, maintain enough tasks for up to this many days"
-msgstr "Adicionalmente, mantener suficientes tareas como máximo para todos estos días"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:454
-msgid "Transfer at most"
-msgstr "Transferir como máximo"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:462
-msgid "MBytes every"
 msgstr ""
+"Adicionalmente, mantener suficientes tareas como máximo para todos estos "
+"días"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:468
-#, fuzzy
-msgid "days (0 means no restriction)"
-msgstr "porciento (0 significa sin restricciones)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:476
+#: DlgAdvPreferencesBase.cpp:466
 msgid "Skip image file verification"
 msgstr "No verificar archivos de imagen"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:478
+#: DlgAdvPreferencesBase.cpp:468
 msgid "check this if your Internet provider modifies image files"
 msgstr "márquela si su proveedor de Internet modifica los archivos de imágenes"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:484
+#: DlgAdvPreferencesBase.cpp:476
 msgid "Connect options"
 msgstr "Opciones de conexión"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:487
+#: DlgAdvPreferencesBase.cpp:478
 msgid "Confirm before connecting to internet"
 msgstr "Confirmar antes de conectar a Internet"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
-msgstr "si está marcada, una venta aparecerá antes de intentar conectar a Internet"
+#: DlgAdvPreferencesBase.cpp:480
+msgid ""
+"if checked, a confirmation dialog will be displayed before trying to connect "
+"to the Internet"
+msgstr ""
+"si está marcada, una venta aparecerá antes de intentar conectar a Internet"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:493
+#: DlgAdvPreferencesBase.cpp:484
 msgid "Disconnect when done"
 msgstr "Desconectar cuando finalice"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:495
+#: DlgAdvPreferencesBase.cpp:486
 msgid ""
 "if checked, BOINC hangs up when network usage is done\n"
 "(only relevant for dialup-connection)"
@@ -1488,214 +1483,197 @@ msgstr ""
 "si está marcada, BOINC cuelga cuando ha terminado de usar la red\n"
 "( sólo para conexiones  a través de módem) "
 
-#: clientgui/DlgAdvPreferencesBase.cpp:501
+#: DlgAdvPreferencesBase.cpp:492
 msgid "Network usage allowed"
 msgstr "Uso de la red permitido"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:510
+#: DlgAdvPreferencesBase.cpp:500
 msgid "network usage start hour"
 msgstr "hora de comienzo de uso de la red"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:518
+#: DlgAdvPreferencesBase.cpp:508
 msgid "network usage stop hour"
 msgstr "hora de finalización de uso de la red"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:610
-#: clientgui/DlgItemProperties.cpp:257
+#: DlgAdvPreferencesBase.cpp:598 DlgItemProperties.cpp:231
 msgid "Disk usage"
 msgstr "Uso del disco"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:622
+#: DlgAdvPreferencesBase.cpp:609
 msgid "the maximum disk space used by BOINC (in Gigabytes)"
 msgstr "el espacio máximo de disco usado por BOINC (en gigabytes)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:626
-msgid "Gigabytes disk space (0 means no restriction)"
-msgstr ""
+#: DlgAdvPreferencesBase.cpp:613
+msgid "Gigabytes disk space"
+msgstr "gigabytes de espacio en disco"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:629
+#: DlgAdvPreferencesBase.cpp:616
 msgid "Leave at least"
 msgstr "Dejar como mínimo"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:633
+#: DlgAdvPreferencesBase.cpp:620
 msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
-msgstr "BOINC deja como mínimo esta cantidad de espacio de disco libre (en gigabytes)"
+msgstr ""
+"BOINC deja como mínimo esta cantidad de espacio de disco libre (en "
+"gigabytes)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:637
+#: DlgAdvPreferencesBase.cpp:624
 msgid "Gigabytes disk space free"
 msgstr "gigabytes de espacio libre en disco"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
+#: DlgAdvPreferencesBase.cpp:631
 msgid "BOINC uses at most this percentage of total disk space"
 msgstr "BOINC usa como máximo este porcentaje del espacio total del disco"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:649
+#: DlgAdvPreferencesBase.cpp:636
 #, no-c-format
 msgid "% of total disk space"
 msgstr "% del espacio total de disco"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:652
+#: DlgAdvPreferencesBase.cpp:639
 msgid "Tasks checkpoint to disk at most every"
 msgstr "Las tareas vuelcan al disco al menos cada"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
+#: DlgAdvPreferencesBase.cpp:645
 msgid "seconds"
 msgstr "segundos"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:668
+#: DlgAdvPreferencesBase.cpp:655
 #, no-c-format
 msgid "% of page file (swap space)"
 msgstr "% del archivo de paginación (espacio de intercambio)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:675
+#: DlgAdvPreferencesBase.cpp:662
 msgid "Memory usage"
 msgstr "Uso de memoria"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
+#: DlgAdvPreferencesBase.cpp:676
 #, no-c-format
 msgid "% when computer is in use"
 msgstr "% cuando el ordenador se usa"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:701
+#: DlgAdvPreferencesBase.cpp:686
 #, no-c-format
 msgid "% when computer is idle"
 msgstr "% cuando el ordenador esta inactivo"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:706
+#: DlgAdvPreferencesBase.cpp:691
 msgid "Leave applications in memory while suspended"
 msgstr "Dejar las aplicaciones en memoria mientras están suspendidas"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:708
+#: DlgAdvPreferencesBase.cpp:693
 msgid "if checked, suspended work units are left in memory"
-msgstr "si está marcada, las unidades de trabajo suspendidas son dejadas en memoria"
+msgstr ""
+"si está marcada, las unidades de trabajo suspendidas son dejadas en memoria"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:728
-msgid "Suspend processor and network usage when these applications are running:"
-msgstr "Suspender el uso del procesador y la red cuando estas aplicaciones estén funcionando:"
+#: DlgAdvPreferencesBase.cpp:713
+msgid ""
+"Suspend processor and network usage when these applications are running:"
+msgstr ""
+"Suspender el uso del procesador y la red cuando estas aplicaciones estén "
+"funcionando:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:738
+#: DlgAdvPreferencesBase.cpp:722
 msgid "Add..."
 msgstr "Añadir..."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:739
+#: DlgAdvPreferencesBase.cpp:723
 msgid "Add an application to this list"
 msgstr "Añadir una aplicación a esta lista"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:744
+#: DlgAdvPreferencesBase.cpp:728 ViewProjects.cpp:202
+#: sg_ProjectCommandPopup.cpp:85
 msgid "Remove"
 msgstr "Eliminar"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:745
+#: DlgAdvPreferencesBase.cpp:729
 msgid "Remove an application from this list"
 msgstr "Eliminar una aplicación de esta lista"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:754
+#: DlgAdvPreferencesBase.cpp:738
 msgid "For advanced options, refer to "
 msgstr "Para opciones avanzadas, dirigirse a "
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:65
-#, c-format
-msgid "%s Diagnostic Log Flags"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:83
-msgid "These flags enable various types of diagnostic messages in the Event Log."
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:105
-#, fuzzy
-msgid "Save all values and close the dialog"
-msgstr "grabar todos los valores y cerrar la ventana"
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:108
-#, fuzzy
-msgid "Defaults"
-msgstr "Predeterminado"
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:109
-msgid "Restore default settings"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:113
-#, fuzzy
-msgid "Close the dialog without saving"
-msgstr "cerrar la ventana sin grabar"
-
-#: clientgui/DlgEventLog.cpp:226
+#: DlgEventLog.cpp:219
 #, c-format
 msgid "%s - Event Log"
 msgstr "%s - Registro de Sucesos"
 
-#: clientgui/DlgEventLog.cpp:236
+#: DlgEventLog.cpp:232 ViewMessages.cpp:117 ViewProjects.cpp:219
+#: ViewStatistics.cpp:435 ViewStatistics.cpp:2009 ViewTransfers.cpp:182
+#: ViewWork.cpp:232
 msgid "Project"
 msgstr "Proyecto"
 
-#: clientgui/DlgEventLog.cpp:237
+#: DlgEventLog.cpp:233 ViewMessages.cpp:118
 msgid "Time"
 msgstr "Hora"
 
-#: clientgui/DlgEventLog.cpp:238
+#: DlgEventLog.cpp:234 ViewMessages.cpp:119
 msgid "Message"
 msgstr "Mensaje"
 
-#: clientgui/DlgEventLog.cpp:300
-#: clientgui/DlgEventLog.cpp:364
+#: DlgEventLog.cpp:290 DlgEventLog.cpp:354
 msgid "&Show only this project"
 msgstr "Mostrar sólo este &proyecto"
 
-#: clientgui/DlgEventLog.cpp:304
+#: DlgEventLog.cpp:294
 msgid "Copy &All"
 msgstr "Copiar &Todo"
 
-#: clientgui/DlgEventLog.cpp:306
-#: clientgui/DlgEventLog.cpp:310
+#: DlgEventLog.cpp:296 DlgEventLog.cpp:300 ViewMessages.cpp:89
 msgid "Copy all the messages to the clipboard."
 msgstr "Copia todos los mensajes al portapapeles"
 
-#: clientgui/DlgEventLog.cpp:315
+#: DlgEventLog.cpp:305
 msgid "Copy &Selected"
 msgstr "Copiar &Selección"
 
-#: clientgui/DlgEventLog.cpp:318
-#: clientgui/DlgEventLog.cpp:326
-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 "Copia los mensajes seleccionados al portapapeles. Puede seleccionar múltiples mensajes manteniendo pulsadas las teclas Shift o Control mientras hace clic en los mensajes."
+#: DlgEventLog.cpp:308 DlgEventLog.cpp:316 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 ""
+"Copia los mensajes seleccionados al portapapeles. Puede seleccionar "
+"múltiples mensajes manteniendo pulsadas las teclas Shift o Control mientras "
+"hace clic en los mensajes."
 
-#: clientgui/DlgEventLog.cpp:320
-#: clientgui/DlgEventLog.cpp:328
-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 "Copia los mensajes seleccionados al portapapeles. Puede seleccionar múltiples mensajes manteniendo pulsadas las teclas Shift y/o Control mientras hace clic en los mensajes."
+#: DlgEventLog.cpp:310 DlgEventLog.cpp:318 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 ""
+"Copia los mensajes seleccionados al portapapeles. Puede seleccionar "
+"múltiples mensajes manteniendo pulsadas las teclas Shift y/o Control "
+"mientras hace clic en los mensajes."
 
-#: clientgui/DlgEventLog.cpp:335
-#: clientgui/DlgItemProperties.cpp:67
+#: DlgEventLog.cpp:325 DlgItemProperties.cpp:67
 msgid "&Close"
 msgstr "&Cerrar"
 
-#: clientgui/DlgEventLog.cpp:344
+#: DlgEventLog.cpp:334 sg_BoincSimpleFrame.cpp:798 sg_DlgPreferences.cpp:442
 #, c-format
 msgid "Get help with %s"
 msgstr "Obtener ayuda con %s"
 
-#: clientgui/DlgEventLog.cpp:358
+#: DlgEventLog.cpp:348
 msgid "Show all &messages"
 msgstr "Mostrar todos los &mensajes"
 
-#: clientgui/DlgEventLog.cpp:359
-#: clientgui/DlgEventLog.cpp:361
+#: DlgEventLog.cpp:349 DlgEventLog.cpp:351
 msgid "Show messages for all projects"
 msgstr "Mostar los mensajes de todos los proyectos"
 
-#: clientgui/DlgEventLog.cpp:365
-#: clientgui/DlgEventLog.cpp:367
+#: DlgEventLog.cpp:355 DlgEventLog.cpp:357
 msgid "Show only the messages for the selected project"
 msgstr "Mostrar sólo los mensajes para el proyecto seleccionado"
 
-#: clientgui/DlgExitMessage.cpp:82
+#: DlgExitMessage.cpp:82
 #, c-format
 msgid "%s - Exit Confirmation"
 msgstr "%s - Confirmación de Salir"
 
-#: clientgui/DlgExitMessage.cpp:130
+#: DlgExitMessage.cpp:130
 #, c-format
 msgid ""
 "You have requested to exit the %s,\n"
@@ -1712,7 +1690,7 @@ msgstr ""
 "Si también quiere parar de ejecutar las tareas,\n"
 "elija entre las siguientes opciones:"
 
-#: clientgui/DlgExitMessage.cpp:135
+#: DlgExitMessage.cpp:135
 #, c-format
 msgid ""
 "This will shut down %s and its tasks until either the\n"
@@ -1729,417 +1707,394 @@ msgstr ""
 "más que salir de la aplicación, eso le permitirá a %s ejecutar sus\n"
 "tareas a las horas que usted seleccionó en sus preferencias."
 
-#: clientgui/DlgExitMessage.cpp:153
+#: DlgExitMessage.cpp:153
 #, c-format
 msgid "Stop running tasks when exiting the %s"
 msgstr "Detener la ejecución de tareas al salir de %s"
 
-#: clientgui/DlgExitMessage.cpp:165
+#: DlgExitMessage.cpp:165
 msgid "Remember this decision and do not show this dialog."
 msgstr "Recordar esta opción y no volver a mostrar este mensaje."
 
-#: clientgui/DlgExitMessage.cpp:178
-#: clientgui/DlgGenericMessage.cpp:125
-#: clientgui/DlgOptions.cpp:404
-#: clientgui/DlgSelectComputer.cpp:168
+#: DlgExitMessage.cpp:178 DlgGenericMessage.cpp:125 DlgOptions.cpp:401
+#: DlgSelectComputer.cpp:168 wizardex.cpp:378
 msgid "&Cancel"
 msgstr "&Cancelar"
 
-#: clientgui/DlgGenericMessage.cpp:112
+#: DlgGenericMessage.cpp:112
 msgid "Don't show this dialog again."
 msgstr "No mostrar este mensaje de nuevo."
 
-#: clientgui/DlgItemProperties.cpp:194
-#: clientgui/DlgItemProperties.cpp:197
-#: clientgui/DlgItemProperties.cpp:200
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:168 DlgItemProperties.cpp:171
+#: DlgItemProperties.cpp:174 DlgItemProperties.cpp:177
 msgid "Don't fetch tasks for "
 msgstr "No buscar tareas para "
 
-#: clientgui/DlgItemProperties.cpp:194
+#: DlgItemProperties.cpp:168
 msgid "Project preference"
 msgstr "Preferencia del proyecto"
 
-#: clientgui/DlgItemProperties.cpp:197
+#: DlgItemProperties.cpp:171
 msgid "Account manager preference"
 msgstr "Preferencia del administrador de cuentas"
 
-#: clientgui/DlgItemProperties.cpp:200
+#: DlgItemProperties.cpp:174
 msgid "Project has no apps for "
 msgstr "El proyecto no tiene aplicaciones para "
 
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:177
 msgid "Client configuration excludes "
 msgstr "La configuración del cliente excluye "
 
-#: clientgui/DlgItemProperties.cpp:207
+#: DlgItemProperties.cpp:181
 msgid " work fetch deferred for"
 msgstr " búsqueda de trabajo aplazada"
 
-#: clientgui/DlgItemProperties.cpp:208
+#: DlgItemProperties.cpp:182
 msgid " work fetch deferral interval"
 msgstr " intervalo diferido la búsqueda de trabajo "
 
-#: clientgui/DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:213
 msgid "Properties of project "
 msgstr "Propiedades del proyecto "
 
-#: clientgui/DlgItemProperties.cpp:243
-#: clientgui/DlgOptions.cpp:221
+#: DlgItemProperties.cpp:217 DlgOptions.cpp:218
 msgid "General"
 msgstr "General"
 
-#: clientgui/DlgItemProperties.cpp:244
+#: DlgItemProperties.cpp:218
 msgid "Master URL"
 msgstr "URL principal"
 
-#: clientgui/DlgItemProperties.cpp:245
+#: DlgItemProperties.cpp:219
 msgid "User name"
 msgstr "Nombre de usuario:"
 
-#: clientgui/DlgItemProperties.cpp:246
+#: DlgItemProperties.cpp:220
 msgid "Team name"
 msgstr "Nombre del equipo"
 
-#: clientgui/DlgItemProperties.cpp:247
+#: DlgItemProperties.cpp:221 ViewProjects.cpp:224
 msgid "Resource share"
 msgstr "Asignación de recursos"
 
-#: clientgui/DlgItemProperties.cpp:249
+#: DlgItemProperties.cpp:223
 msgid "Scheduler RPC deferred for"
 msgstr "Petición (RPC) del planificador aplazada"
 
-#: clientgui/DlgItemProperties.cpp:252
+#: DlgItemProperties.cpp:226
 msgid "File downloads deferred for"
 msgstr "Descargas de archivos aplazada durante"
 
-#: clientgui/DlgItemProperties.cpp:255
+#: DlgItemProperties.cpp:229
 msgid "File uploads deferred for"
 msgstr "Envíos de archivos aplazados durante"
 
-#: clientgui/DlgItemProperties.cpp:258
+#: DlgItemProperties.cpp:232
 msgid "Computer ID"
 msgstr "ID del ordenador"
 
-#: clientgui/DlgItemProperties.cpp:260
+#: DlgItemProperties.cpp:234
 msgid "Non CPU intensive"
 msgstr "Uso no intensivo de CPU"
 
-#: 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
+#: DlgItemProperties.cpp:234 DlgItemProperties.cpp:236
+#: DlgItemProperties.cpp:237 DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:242 DlgItemProperties.cpp:251
+#: DlgItemProperties.cpp:254 DlgItemProperties.cpp:257
 msgid "yes"
 msgstr "si"
 
-#: clientgui/DlgItemProperties.cpp:262
+#: DlgItemProperties.cpp:236
 msgid "Suspended via GUI"
 msgstr "Suspendido mediante interfaz gráfica (GUI)"
 
-#: clientgui/DlgItemProperties.cpp:262
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:236 DlgItemProperties.cpp:237
 msgid "no"
 msgstr "no"
 
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:237
 msgid "Don't request more work"
 msgstr "No solicitar más trabajo"
 
-#: clientgui/DlgItemProperties.cpp:265
+#: DlgItemProperties.cpp:239
 msgid "Scheduler call in progress"
 msgstr "Llamada al planificador en progreso"
 
-#: clientgui/DlgItemProperties.cpp:268
+#: DlgItemProperties.cpp:242
 msgid "Trickle-up pending"
 msgstr "Trickle-up pendiente"
 
-#: clientgui/DlgItemProperties.cpp:271
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:245 DlgItemProperties.cpp:247
 msgid "Host location"
 msgstr "Ubicación del host"
 
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:247
 msgid "default"
 msgstr "predeterminado"
 
-#: clientgui/DlgItemProperties.cpp:277
+#: DlgItemProperties.cpp:251
 msgid "Added via account manager"
 msgstr "Añadido mediante administrador de cuentas"
 
-#: clientgui/DlgItemProperties.cpp:280
+#: DlgItemProperties.cpp:254
 msgid "Remove when tasks done"
 msgstr "Eliminar cuando las tareas estén terminadas"
 
-#: clientgui/DlgItemProperties.cpp:283
+#: DlgItemProperties.cpp:257
 msgid "Ended"
 msgstr "Finalizado"
 
-#: clientgui/DlgItemProperties.cpp:285
-msgid "Tasks completed"
-msgstr ""
-
-#: clientgui/DlgItemProperties.cpp:286
-msgid "Tasks failed"
-msgstr ""
-
-#: clientgui/DlgItemProperties.cpp:288
+#: DlgItemProperties.cpp:259
 msgid "Credit"
 msgstr "Crédito"
 
-#: clientgui/DlgItemProperties.cpp:289
+#: DlgItemProperties.cpp:260
 msgid "User"
 msgstr "Usuario"
 
-#: clientgui/DlgItemProperties.cpp:296
+#: DlgItemProperties.cpp:267
 msgid "Host"
 msgstr "Ordenador"
 
-#: clientgui/DlgItemProperties.cpp:305
+#: DlgItemProperties.cpp:276
 msgid "Scheduling"
 msgstr "Planificando"
 
-#: clientgui/DlgItemProperties.cpp:306
+#: DlgItemProperties.cpp:277
 msgid "Scheduling priority"
 msgstr "Planificando prioridad"
 
-#: clientgui/DlgItemProperties.cpp:307
+#: DlgItemProperties.cpp:278
 msgid "CPU"
 msgstr "CPU"
 
-#: clientgui/DlgItemProperties.cpp:331
+#: DlgItemProperties.cpp:302
 msgid "Duration correction factor"
 msgstr "Factor de corrección de duración"
 
-#: clientgui/DlgItemProperties.cpp:345
+#: DlgItemProperties.cpp:316
 msgid "Properties of task "
 msgstr "Propiedades de la tarea "
 
-#: clientgui/DlgItemProperties.cpp:357
+#: DlgItemProperties.cpp:328 ViewWork.cpp:238
 msgid "Application"
 msgstr "Programa"
 
-#: clientgui/DlgItemProperties.cpp:358
+#: DlgItemProperties.cpp:329 ViewWork.cpp:239
 msgid "Name"
 msgstr "Nombre"
 
-#: clientgui/DlgItemProperties.cpp:359
+#: DlgItemProperties.cpp:330
 msgid "State"
 msgstr "Estado"
 
-#: clientgui/DlgItemProperties.cpp:362
+#: DlgItemProperties.cpp:333
 msgid "Received"
 msgstr "Recibido"
 
-#: clientgui/DlgItemProperties.cpp:365
+#: DlgItemProperties.cpp:336
 msgid "Report deadline"
 msgstr "Límite para informar"
 
-#: clientgui/DlgItemProperties.cpp:367
+#: DlgItemProperties.cpp:338
 msgid "Resources"
 msgstr "Recursos"
 
-#: clientgui/DlgItemProperties.cpp:370
+#: DlgItemProperties.cpp:341
 msgid "Estimated computation size"
 msgstr "Tamaño de cálculo estimado"
 
-#: clientgui/DlgItemProperties.cpp:373
+#: DlgItemProperties.cpp:344
 msgid "CPU time at last checkpoint"
 msgstr "Tiempo de CPU en el último chequeo"
 
-#: clientgui/DlgItemProperties.cpp:374
-#: clientgui/DlgItemProperties.cpp:389
+#: DlgItemProperties.cpp:345 DlgItemProperties.cpp:360
 msgid "CPU time"
 msgstr "Tiempo de CPU"
 
-#: clientgui/DlgItemProperties.cpp:376
-#: clientgui/DlgItemProperties.cpp:390
+#: DlgItemProperties.cpp:347 DlgItemProperties.cpp:361
 msgid "Elapsed time"
 msgstr "Tiempo transcurrido"
 
-#: clientgui/DlgItemProperties.cpp:378
+#: DlgItemProperties.cpp:349
 msgid "Estimated time remaining"
 msgstr "Tiempo restante aproximado"
 
-#: clientgui/DlgItemProperties.cpp:379
+#: DlgItemProperties.cpp:350
 msgid "Fraction done"
 msgstr "Parte hecha"
 
-#: clientgui/DlgItemProperties.cpp:380
+#: DlgItemProperties.cpp:351
 msgid "Virtual memory size"
 msgstr "Tamaño de la memoria virtual"
 
-#: clientgui/DlgItemProperties.cpp:381
+#: DlgItemProperties.cpp:352
 msgid "Working set size"
 msgstr "Tamaño conjunto trabajo"
 
-#: clientgui/DlgItemProperties.cpp:383
+#: DlgItemProperties.cpp:354
 msgid "Directory"
 msgstr "Carpeta"
 
-#: clientgui/DlgItemProperties.cpp:386
+#: DlgItemProperties.cpp:357
 msgid "Process ID"
 msgstr "ID de proceso"
 
-#: clientgui/DlgItemProperties.cpp:456
+#: DlgItemProperties.cpp:427 ViewWork.cpp:1032 sg_TaskPanel.cpp:823
 msgid "Local: "
 msgstr "Local: "
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: DlgOptions.cpp:129 DlgOptions.cpp:135
 msgid "Options"
 msgstr "Opciones"
 
-#: clientgui/DlgOptions.cpp:178
+#: DlgOptions.cpp:175
 msgid "Language:"
 msgstr "Idioma:"
 
-#: clientgui/DlgOptions.cpp:185
+#: DlgOptions.cpp:182
 msgid "What language should BOINC use?"
 msgstr "¿Qué idioma debe usar BOINC?"
 
-#: clientgui/DlgOptions.cpp:189
+#: DlgOptions.cpp:186
 msgid "Notice reminder interval:"
 msgstr "Intervalo de recuerdo de avisos:"
 
-#: clientgui/DlgOptions.cpp:196
+#: DlgOptions.cpp:193
 msgid "How often should BOINC remind you of new notices?"
 msgstr "¿Con qué frecuencia debe BOINC recordarle los nuevos avisos?"
 
-#: clientgui/DlgOptions.cpp:201
+#: DlgOptions.cpp:198
 msgid "Run Manager at login?"
 msgstr "¿Ejecutar el Administrador al iniciar la sesión?"
 
-#: clientgui/DlgOptions.cpp:207
+#: DlgOptions.cpp:204
 msgid "Run the BOINC Manager when you log on."
 msgstr "Ejecutar el Administrador BOINC cuando inicie la sesión."
 
-#: clientgui/DlgOptions.cpp:212
+#: DlgOptions.cpp:209
 msgid "Enable Manager exit dialog?"
 msgstr "¿Habilitar el mensaje de salida del Administrador?"
 
-#: clientgui/DlgOptions.cpp:218
+#: DlgOptions.cpp:215
 msgid "Display the exit dialog when shutting down the Manager."
 msgstr "Visualizar el mensaje de salida cuando cierre el Administrador."
 
-#: clientgui/DlgOptions.cpp:229
+#: DlgOptions.cpp:226
 msgid "Dial-up and Virtual Private Network settings"
 msgstr "Configuración de Módem de Acceso Telefónico y Red Privada Virtual"
 
-#: clientgui/DlgOptions.cpp:243
+#: DlgOptions.cpp:240
 msgid "&Set Default"
 msgstr "&Establecer como Predeterminada"
 
-#: clientgui/DlgOptions.cpp:248
+#: DlgOptions.cpp:245
 msgid "&Clear Default"
 msgstr "&Borrar como Predeterminada"
 
-#: clientgui/DlgOptions.cpp:255
+#: DlgOptions.cpp:252
 msgid "Default Connection:"
 msgstr "Conexión por Defecto:"
 
-#: clientgui/DlgOptions.cpp:262
+#: DlgOptions.cpp:259
 msgid "Connections"
 msgstr "Conexiones"
 
-#: clientgui/DlgOptions.cpp:271
+#: DlgOptions.cpp:268
 msgid "Connect via HTTP proxy server"
 msgstr "Conectar vía servidor proxy HTTP"
 
-#: clientgui/DlgOptions.cpp:275
+#: DlgOptions.cpp:272
 msgid "HTTP Proxy Server Configuration"
 msgstr "Configuración Servidor Proxy HTTP"
 
-#: clientgui/DlgOptions.cpp:283
-#: clientgui/DlgOptions.cpp:347
+#: DlgOptions.cpp:280 DlgOptions.cpp:344
 msgid "Address:"
 msgstr "Dirección:"
 
-#: clientgui/DlgOptions.cpp:291
-#: clientgui/DlgOptions.cpp:355
+#: DlgOptions.cpp:288 DlgOptions.cpp:352 ProxyPage.cpp:340 ProxyPage.cpp:360
 msgid "Port:"
 msgstr "Puerto:"
 
-#: clientgui/DlgOptions.cpp:299
-#: clientgui/DlgOptions.cpp:363
+#: DlgOptions.cpp:296 DlgOptions.cpp:360
 msgid "Don't use proxy for:"
 msgstr "No usar proxy para:"
 
-#: clientgui/DlgOptions.cpp:306
-#: clientgui/DlgOptions.cpp:370
+#: DlgOptions.cpp:303 DlgOptions.cpp:367
 msgid "Leave these blank if not needed"
 msgstr "Dejarlos en blanco si no se necesitan"
 
-#: clientgui/DlgOptions.cpp:312
-#: clientgui/DlgOptions.cpp:376
+#: DlgOptions.cpp:309 DlgOptions.cpp:373 ProxyPage.cpp:343 ProxyPage.cpp:363
 msgid "User Name:"
 msgstr "Nombre de usuario:"
 
-#: clientgui/DlgOptions.cpp:320
-#: clientgui/DlgOptions.cpp:384
-#: clientgui/DlgSelectComputer.cpp:152
+#: DlgOptions.cpp:317 DlgOptions.cpp:381 DlgSelectComputer.cpp:152
+#: ProxyPage.cpp:346 ProxyPage.cpp:366
 msgid "Password:"
 msgstr "Clave:"
 
-#: clientgui/DlgOptions.cpp:327
+#: DlgOptions.cpp:324
 msgid "HTTP Proxy"
 msgstr "Proxy HTTP"
 
-#: clientgui/DlgOptions.cpp:335
+#: DlgOptions.cpp:332
 msgid "Connect via SOCKS proxy server"
 msgstr "Conectar vía servidor proxy SOCKS"
 
-#: clientgui/DlgOptions.cpp:339
+#: DlgOptions.cpp:336
 msgid "SOCKS Proxy Server Configuration"
 msgstr "Configuración Servidor Proxy SOCKS"
 
-#: clientgui/DlgOptions.cpp:391
+#: DlgOptions.cpp:388
 msgid "SOCKS Proxy"
 msgstr "Proxy SOCKS"
 
-#: clientgui/DlgOptions.cpp:589
+#: DlgOptions.cpp:586
 msgid "always"
 msgstr "siempre"
 
-#: clientgui/DlgOptions.cpp:590
+#: DlgOptions.cpp:587
 msgid "1 hour"
 msgstr "1 hora"
 
-#: clientgui/DlgOptions.cpp:591
+#: DlgOptions.cpp:588
 msgid "6 hours"
 msgstr "6 horas"
 
-#: clientgui/DlgOptions.cpp:592
+#: DlgOptions.cpp:589
 msgid "1 day"
 msgstr "1 día"
 
-#: clientgui/DlgOptions.cpp:593
+#: DlgOptions.cpp:590
 msgid "1 week"
 msgstr "1 semana"
 
-#: clientgui/DlgOptions.cpp:594
+#: DlgOptions.cpp:591
 msgid "never"
 msgstr "nunca"
 
-#: clientgui/DlgOptions.cpp:691
+#: DlgOptions.cpp:688
 #, c-format
 msgid "%s - Language Selection"
 msgstr "%s - Selección de Idioma"
 
-#: clientgui/DlgOptions.cpp:698
+#: DlgOptions.cpp:695
 #, c-format
-msgid "The %s's language has been changed.  In order for this change to take effect, you must restart the %s."
-msgstr "Se ha cambiado el idioma de %s.   Para que este cambio tenga efecto usted debe reiniciar %s."
+#, c-format, c-format
+msgid ""
+"The %s's language has been changed.  In order for this change to take "
+"effect, you must restart the %s."
+msgstr ""
+"Se ha cambiado el idioma de %s.   Para que este cambio tenga efecto usted "
+"debe reiniciar %s."
 
-#: clientgui/DlgSelectComputer.cpp:91
+#: DlgSelectComputer.cpp:91
 #, c-format
 msgid "%s - Select Computer"
 msgstr "%s - Seleccionar ordenador"
 
-#: clientgui/DlgSelectComputer.cpp:125
+#: DlgSelectComputer.cpp:125
 #, c-format
 msgid ""
 "Another instance of %s is already running \n"
@@ -2148,416 +2103,423 @@ msgstr ""
 "Otra instancia de %s ya está ejecutándose\n"
 "en este ordenador.   Por favor seleccione un cliente a monitorizar."
 
-#: clientgui/DlgSelectComputer.cpp:143
+#: DlgSelectComputer.cpp:143
 msgid "Host name:"
 msgstr "Nombre del ordenador:"
 
-#: clientgui/Localization.cpp:31
-#: clientgui/Localization.cpp:69
+#: Localization.cpp:31 Localization.cpp:69
 msgid "Message boards"
 msgstr "Foros"
 
-#: clientgui/Localization.cpp:33
+#: Localization.cpp:33
 msgid "Correspond with other users on the SETI at home message boards"
 msgstr "Escríbase con otros usuarios en los foros de SETI at home"
 
-#: clientgui/Localization.cpp:37
+#: Localization.cpp:37
 msgid "Ask questions and report problems"
 msgstr "Haga preguntas e informe de problemas"
 
-#: clientgui/Localization.cpp:39
-#: clientgui/Localization.cpp:81
-#: clientgui/Localization.cpp:111
-#: clientgui/Localization.cpp:129
+#: Localization.cpp:39 Localization.cpp:81 Localization.cpp:111
+#: Localization.cpp:129
 msgid "Your account"
 msgstr "Su cuenta"
 
-#: clientgui/Localization.cpp:41
-#: clientgui/Localization.cpp:87
-#: clientgui/Localization.cpp:113
+#: Localization.cpp:41 Localization.cpp:87 Localization.cpp:113
 msgid "View your account information and credit totals"
 msgstr "Vea información de su cuenta y sus créditos totales"
 
-#: clientgui/Localization.cpp:43
+#: Localization.cpp:43
 msgid "Your preferences"
 msgstr "Sus preferencias"
 
-#: clientgui/Localization.cpp:45
+#: Localization.cpp:45
 msgid "View and modify your SETI at home account profile and preferences"
 msgstr "Vea y modifique su perfil y preferencias de su cuenta SETI at home"
 
-#: clientgui/Localization.cpp:47
-#: clientgui/Localization.cpp:89
+#: Localization.cpp:47 Localization.cpp:89
 msgid "Your results"
 msgstr "Sus resultados"
 
-#: clientgui/Localization.cpp:49
-#: clientgui/Localization.cpp:91
+#: Localization.cpp:49 Localization.cpp:91
 msgid "View your last week (or more) of computational results and work"
 msgstr "Vea el trabajo y resultados de su última semana (o más)"
 
-#: clientgui/Localization.cpp:51
-#: clientgui/Localization.cpp:93
+#: Localization.cpp:51 Localization.cpp:93
 msgid "Your computers"
 msgstr "Sus ordenadores"
 
-#: clientgui/Localization.cpp:53
+#: Localization.cpp:53
 msgid "View a listing of all the computers on which you are running SETI at Home"
-msgstr "Vea una lista de todos los ordenadores en los que usted está ejecutando SETI at home"
+msgstr ""
+"Vea una lista de todos los ordenadores en los que usted está ejecutando "
+"SETI at home"
 
-#: clientgui/Localization.cpp:55
-#: clientgui/Localization.cpp:97
+#: Localization.cpp:55 Localization.cpp:97
 msgid "Your team"
 msgstr "Su equipo"
 
-#: clientgui/Localization.cpp:57
-#: clientgui/Localization.cpp:99
+#: Localization.cpp:57 Localization.cpp:99
 msgid "View information about your team"
 msgstr "Vea información acerca de su equipo"
 
-#: clientgui/Localization.cpp:61
+#: Localization.cpp:61
 msgid "Common questions"
 msgstr "Preguntas más frecuentes"
 
-#: clientgui/Localization.cpp:63
+#: Localization.cpp:63
 msgid "Read the Einstein at Home Frequently Asked Question list"
 msgstr "Lea la lista de Preguntas Más Frecuentes en Einstein at Home"
 
-#: clientgui/Localization.cpp:65
+#: Localization.cpp:65
 msgid "Screensaver info"
 msgstr "Información del salvapantallas"
 
-#: clientgui/Localization.cpp:67
+#: Localization.cpp:67
 msgid "Read a detailed description of the Einstein at Home screensaver"
 msgstr "Lea la descripción detallada del salvapantallas de Einstein at Home"
 
-#: clientgui/Localization.cpp:71
-msgid "Correspond with admins and other users on the Einstein at Home message boards"
-msgstr "Escríbase con lo administradores y otros usuarios en los foros de Einstein at Home"
+#: Localization.cpp:71
+msgid ""
+"Correspond with admins and other users on the Einstein at Home message boards"
+msgstr ""
+"Escríbase con lo administradores y otros usuarios en los foros de "
+"Einstein at Home"
 
-#: clientgui/Localization.cpp:73
+#: Localization.cpp:73
 msgid "Einstein status"
 msgstr "Estado de Einstein"
 
-#: clientgui/Localization.cpp:75
+#: Localization.cpp:75
 msgid "Current status of the Einstein at Home server"
 msgstr "Estado actual del servidor de Einstein at Home"
 
-#: clientgui/Localization.cpp:77
+#: Localization.cpp:77
 msgid "Report problems"
 msgstr "Informe de problemas"
 
-#: clientgui/Localization.cpp:79
+#: Localization.cpp:79
 msgid "A link to the Einstein at Home problems and bug reports message board"
 msgstr "Un enlace a los foros de informe de problemas y fallos en Einstein at Home"
 
-#: clientgui/Localization.cpp:83
+#: Localization.cpp:83
 msgid "View and modify your Einstein at Home account profile and preferences"
 msgstr "Vea y modifique su perfil y preferencias de su cuenta Einstein at Home"
 
-#: clientgui/Localization.cpp:85
+#: Localization.cpp:85
 msgid "Account summary"
 msgstr "Sumario de cuentas"
 
-#: clientgui/Localization.cpp:95
-msgid "View a listing of all the computers on which you are running Einstein at Home"
-msgstr "Vea una lista de todos los ordenadores en los que usted está ejecutando Einstein at Home"
+#: Localization.cpp:95
+msgid ""
+"View a listing of all the computers on which you are running Einstein at Home"
+msgstr ""
+"Vea una lista de todos los ordenadores en los que usted está ejecutando "
+"Einstein at Home"
 
-#: clientgui/Localization.cpp:101
+#: Localization.cpp:101
 msgid "LIGO project"
 msgstr "Proyecto LIGO"
 
-#: clientgui/Localization.cpp:103
-msgid "The home page of the Laser Interferometer Gravitational-wave Observatory (LIGO) project"
-msgstr "La página de inicio del proyecto LIGO (Observatorio de Ondas Gravitacionales por Interferometría Laser)"
+#: Localization.cpp:103
+msgid ""
+"The home page of the Laser Interferometer Gravitational-wave Observatory "
+"(LIGO) project"
+msgstr ""
+"La página de inicio del proyecto LIGO (Observatorio de Ondas Gravitacionales "
+"por Interferometría Laser)"
 
-#: clientgui/Localization.cpp:105
+#: Localization.cpp:105
 msgid "GEO-600 project"
 msgstr "Proyecto GEO-600"
 
-#: clientgui/Localization.cpp:107
+#: Localization.cpp:107
 msgid "The home page of the GEO-600 project"
 msgstr "La página de inicio del proyecto GEO-600"
 
-#: clientgui/Localization.cpp:115
-#: clientgui/Localization.cpp:133
+#: Localization.cpp:115 Localization.cpp:133 ViewProjects.cpp:221
+#: ViewStatistics.cpp:465
 msgid "Team"
 msgstr "Equipo"
 
-#: clientgui/Localization.cpp:117
+#: Localization.cpp:117
 msgid "Info about your Team"
 msgstr "Información acerca de su Equipo"
 
-#: clientgui/Localization.cpp:123
+#: Localization.cpp:123
 msgid "Get help for climateprediction.net"
 msgstr "Consiga ayuda para climateprediction.net"
 
-#: clientgui/Localization.cpp:125
+#: Localization.cpp:125
 msgid "News"
 msgstr "Noticias"
 
-#: clientgui/Localization.cpp:127
+#: Localization.cpp:127
 msgid "climateprediction.net News"
 msgstr "Noticias de climateprediction.net"
 
-#: clientgui/Localization.cpp:131
+#: Localization.cpp:131
 msgid "View your account information, credits, and trickles"
 msgstr "Vea la información de su cuenta, créditos totales y progresos"
 
-#: clientgui/Localization.cpp:135
+#: Localization.cpp:135
 msgid "Info about your team"
 msgstr "Información acerca de su equipo"
 
-#: clientgui/Localization.cpp:141
+#: Localization.cpp:141
 msgid "Search for help in our help system"
 msgstr "Buscar ayuda en nuestro sistema de ayuda"
 
-#: clientgui/Localization.cpp:143
+#: Localization.cpp:143
 msgid "Global Statistics"
 msgstr "Estadísticas Globales"
 
-#: clientgui/Localization.cpp:145
+#: Localization.cpp:145
 msgid "Summary statistics for World Community Grid"
 msgstr "Sumario de las estadísticas de World Community Grid"
 
-#: clientgui/Localization.cpp:147
+#: Localization.cpp:147
 msgid "My Grid"
 msgstr "Mis datos"
 
-#: clientgui/Localization.cpp:149
+#: Localization.cpp:149
 msgid "Your statistics and settings"
 msgstr "Sus estadísticas y configuración"
 
-#: clientgui/Localization.cpp:151
+#: Localization.cpp:151
 msgid "Device Profiles"
 msgstr "Perfiles de Dispositivo"
 
-#: clientgui/Localization.cpp:153
+#: Localization.cpp:153
 msgid "Update your device settings"
 msgstr "Actualiza la configuración de su dispositivo"
 
-#: clientgui/Localization.cpp:155
+#: Localization.cpp:155
 msgid "Research"
 msgstr "Investigación"
 
-#: clientgui/Localization.cpp:157
+#: Localization.cpp:157
 msgid "Learn about the projects hosted at World Community Grid"
 msgstr "Aprenda acerca de los proyectos albergados en World Community Grid"
 
-#: clientgui/MainDocument.cpp:583
+#: MainDocument.cpp:583
 msgid "Starting client"
 msgstr "Iniciando cliente"
 
-#: clientgui/MainDocument.cpp:591
+#: MainDocument.cpp:591
 msgid "Connecting to client"
 msgstr "Conectando al cliente"
 
-#: clientgui/MainDocument.cpp:1205
+#: MainDocument.cpp:1195
 msgid "Retrieving system state; please wait..."
 msgstr "Recuperando estado del sistema; por favor espere..."
 
-#: clientgui/MainDocument.cpp:1826
+#: MainDocument.cpp:1816
 msgid "Missing application"
 msgstr "Aplicación perdida"
 
-#: clientgui/MainDocument.cpp:1827
-msgid "Please download and install the CoRD application from http://cord.sourceforge.net"
-msgstr "Por favor descargue e instale la aplicación CoRD de http://cord.sourceforge.net"
+#: MainDocument.cpp:1817
+msgid ""
+"Please download and install the CoRD application from http://cord."
+"sourceforge.net"
+msgstr ""
+"Por favor descargue e instale la aplicación CoRD de "
+"http://cord.sourceforge.net"
 
-#: clientgui/MainDocument.cpp:2442
+#: MainDocument.cpp:2432
 msgid "on batteries"
 msgstr "con baterías"
 
-#: clientgui/MainDocument.cpp:2443
+#: MainDocument.cpp:2433
 msgid "computer is in use"
 msgstr "ordenador está en uso"
 
-#: clientgui/MainDocument.cpp:2444
+#: MainDocument.cpp:2434
 msgid "user request"
 msgstr "petición del usuario"
 
-#: clientgui/MainDocument.cpp:2445
+#: MainDocument.cpp:2435
 msgid "time of day"
 msgstr "hora del día"
 
-#: clientgui/MainDocument.cpp:2446
+#: MainDocument.cpp:2436
 msgid "CPU benchmarks in progress"
 msgstr "benchmarks de CPU en progreso"
 
-#: clientgui/MainDocument.cpp:2447
+#: MainDocument.cpp:2437
 msgid "need disk space - check preferences"
 msgstr "se necesita espacio en disco - compruebe las preferencias"
 
-#: clientgui/MainDocument.cpp:2448
+#: MainDocument.cpp:2438
 msgid "computer is not in use"
 msgstr "ordenador no está en uso"
 
-#: clientgui/MainDocument.cpp:2449
+#: MainDocument.cpp:2439
 msgid "starting up"
 msgstr "Iniciando"
 
-#: clientgui/MainDocument.cpp:2450
+#: MainDocument.cpp:2440
 msgid "an exclusive app is running"
 msgstr "una aplicación se está ejecuntando en exclusiva"
 
-#: clientgui/MainDocument.cpp:2451
+#: MainDocument.cpp:2441
 msgid "CPU is busy"
 msgstr "la CPU está ocupada"
 
-#: clientgui/MainDocument.cpp:2452
+#: MainDocument.cpp:2442
 msgid "network bandwidth limit exceeded"
 msgstr "límite de ancho de banda de red excedido"
 
-#: clientgui/MainDocument.cpp:2453
+#: MainDocument.cpp:2443
 msgid "requested by operating system"
 msgstr "solicitado por el sistema operativo"
 
-#: clientgui/MainDocument.cpp:2455
+#: MainDocument.cpp:2445
 msgid "unknown reason"
 msgstr "razón desconocida"
 
-#: clientgui/MainDocument.cpp:2477
+#: MainDocument.cpp:2467
 msgid "GPU missing, "
 msgstr "falta GPU,  "
 
-#: clientgui/MainDocument.cpp:2484
+#: MainDocument.cpp:2474
 msgid "New"
 msgstr "Nuevo"
 
-#: clientgui/MainDocument.cpp:2488
+#: MainDocument.cpp:2478
 msgid "Download failed"
 msgstr "Descarga fallida"
 
-#: clientgui/MainDocument.cpp:2490
+#: MainDocument.cpp:2480
 msgid "Downloading"
 msgstr "Descargando"
 
-#: clientgui/MainDocument.cpp:2492
-#: clientgui/MainDocument.cpp:2557
+#: MainDocument.cpp:2482 MainDocument.cpp:2552
 msgid " (suspended - "
 msgstr " (suspendido - "
 
-#: clientgui/MainDocument.cpp:2500
+#: MainDocument.cpp:2490
 msgid "Project suspended by user"
 msgstr "Proyecto suspendido por el usuario"
 
-#: clientgui/MainDocument.cpp:2502
+#: MainDocument.cpp:2492
 msgid "Task suspended by user"
 msgstr "Tarea suspendida por el usuario"
 
-#: clientgui/MainDocument.cpp:2504
+#: MainDocument.cpp:2494
 msgid "Suspended - "
 msgstr "Suspendido - "
 
 # 75%
-#: clientgui/MainDocument.cpp:2510
+#: MainDocument.cpp:2500
 msgid "GPU suspended - "
 msgstr "GPU suspendida - "
 
-#: clientgui/MainDocument.cpp:2517
+#: MainDocument.cpp:2507
 msgid "Waiting for memory"
 msgstr "Esperando memoria"
 
-#: clientgui/MainDocument.cpp:2519
+#: MainDocument.cpp:2509
 msgid "Waiting for shared memory"
 msgstr "Esperando memoria compartida"
 
-#: clientgui/MainDocument.cpp:2521
+#: MainDocument.cpp:2512
+msgid "Running, high priority"
+msgstr "Ejecutando, alta prioridad"
+
+#: MainDocument.cpp:2514
 msgid "Running"
 msgstr "Ejecutando"
 
-#: clientgui/MainDocument.cpp:2523
+#: MainDocument.cpp:2517
 msgid " (non-CPU-intensive)"
 msgstr "(no-CPU-intensivo)"
 
-#: clientgui/MainDocument.cpp:2526
+#: MainDocument.cpp:2520
 msgid "Waiting to run"
 msgstr "Esperando para ejecutar"
 
-#: clientgui/MainDocument.cpp:2528
-#: clientgui/MainDocument.cpp:2534
+#: MainDocument.cpp:2522 MainDocument.cpp:2528
 msgid "Ready to start"
 msgstr "Listo para comenzar"
 
-#: clientgui/MainDocument.cpp:2538
-msgid "Postponed: "
-msgstr ""
+#: MainDocument.cpp:2532
+msgid " (Scheduler wait: "
+msgstr "  (Planificador en espera: "
 
-#: clientgui/MainDocument.cpp:2541
-msgid "Postponed"
-msgstr ""
+#: MainDocument.cpp:2536
+msgid " (Scheduler wait)"
+msgstr "  (Planificador en espera)"
 
-#: clientgui/MainDocument.cpp:2545
-#, fuzzy
-msgid "Waiting for network access"
+#: MainDocument.cpp:2540
+msgid " (Waiting for network access)"
 msgstr " (Esperando acceso a la red)"
 
-#: clientgui/MainDocument.cpp:2549
+#: MainDocument.cpp:2544
 msgid "Computation error"
 msgstr "Error de cálculo"
 
-#: clientgui/MainDocument.cpp:2553
+#: MainDocument.cpp:2548
 msgid "Upload failed"
 msgstr "Envío fallido"
 
-#: clientgui/MainDocument.cpp:2555
+#: MainDocument.cpp:2550
 msgid "Uploading"
 msgstr "Enviando"
 
-#: clientgui/MainDocument.cpp:2566
+#: MainDocument.cpp:2561
 msgid "Aborted by user"
 msgstr "Abortado por el usuario"
 
-#: clientgui/MainDocument.cpp:2569
+#: MainDocument.cpp:2564
 msgid "Aborted by project"
 msgstr "Abortado por el proyecto"
 
-#: clientgui/MainDocument.cpp:2572
+#: MainDocument.cpp:2567
 msgid "Aborted: not started by deadline"
 msgstr "Abortado: no iniciado por el límite de tiempo"
 
-#: clientgui/MainDocument.cpp:2575
+#: MainDocument.cpp:2570
 msgid "Aborted: disk limit exceeded"
 msgstr "Abortado: límite de disco excedido"
 
-#: clientgui/MainDocument.cpp:2578
+#: MainDocument.cpp:2573
 msgid "Aborted: run time limit exceeded"
 msgstr "Abortado: límite de tiempo de ejecución excedido"
 
-#: clientgui/MainDocument.cpp:2581
+#: MainDocument.cpp:2576
 msgid "Aborted: memory limit exceeded"
 msgstr "Abortado: límite de memoria excedido"
 
-#: clientgui/MainDocument.cpp:2584
+#: MainDocument.cpp:2579
 msgid "Aborted"
 msgstr "Abortado"
 
-#: clientgui/MainDocument.cpp:2589
+#: MainDocument.cpp:2584
 msgid "Acknowledged"
 msgstr "Aceptado"
 
-#: clientgui/MainDocument.cpp:2591
+#: MainDocument.cpp:2586
 msgid "Ready to report"
 msgstr "Listo para informar"
 
-#: clientgui/MainDocument.cpp:2593
+#: MainDocument.cpp:2588
 #, c-format
 msgid "Error: invalid state '%d'"
 msgstr "Error: estado inválido '%d'"
 
-#: clientgui/NoInternetConnectionPage.cpp:179
+#: NoInternetConnectionPage.cpp:179
 msgid "No Internet connection"
 msgstr "Sin conexión a Internet"
 
-#: clientgui/NoInternetConnectionPage.cpp:182
+#: NoInternetConnectionPage.cpp:182
 msgid "Please connect to the Internet and try again."
 msgstr "Por favor conecte a Internet e inténtelo de nuevo."
 
-#: clientgui/NotDetectedPage.cpp:181
+#: NotDetectedPage.cpp:181
 msgid "Project not found"
 msgstr "Proyecto no encontrado"
 
-#: clientgui/NotDetectedPage.cpp:184
+#: NotDetectedPage.cpp:184
 msgid ""
 "The URL you supplied is not that of a BOINC-based project.\n"
 "\n"
@@ -2567,11 +2529,11 @@ msgstr ""
 "\n"
 "Por favor compruebe la dirección e inténtelo de nuevo."
 
-#: clientgui/NotDetectedPage.cpp:188
+#: NotDetectedPage.cpp:188
 msgid "Account manager not found"
 msgstr "Administrador de cuentas no encontrado"
 
-#: clientgui/NotDetectedPage.cpp:191
+#: NotDetectedPage.cpp:191
 msgid ""
 "The URL you supplied is not that of a BOINC-based account\n"
 "manager.\n"
@@ -2583,90 +2545,92 @@ msgstr ""
 "\n"
 "Por favor compruebe la dirección e inténtelo de nuevo."
 
-#: clientgui/NotFoundPage.cpp:181
+#: NotFoundPage.cpp:181
 msgid "Login Failed."
 msgstr "Identificación Fallida."
 
-#: clientgui/NotFoundPage.cpp:185
+#: NotFoundPage.cpp:185
 msgid "Check the username and password, and try again."
 msgstr "Verifique su nombre de usuario y clave e inténtelo de nuevo."
 
-#: clientgui/NotFoundPage.cpp:189
+#: NotFoundPage.cpp:189
 msgid "Check the email address and password, and try again."
 msgstr "Verifique que su dirección de correo y clave e inténtelo de nuevo."
 
-#: clientgui/NoticeListCtrl.cpp:229
+#: NoticeListCtrl.cpp:222
 msgid "more..."
 msgstr "más..."
 
-#: clientgui/ProjectInfoPage.cpp:221
+#: ProjectInfoPage.cpp:477 ProjectInfoPage.cpp:778 ProjectInfoPage.cpp:782
+msgid "All"
+msgstr "Todo"
+
+#: ProjectInfoPage.cpp:615
 msgid "Choose a project"
 msgstr "Elegir un proyecto"
 
-#: clientgui/ProjectInfoPage.cpp:228
+#: ProjectInfoPage.cpp:619
 msgid "To choose a project, click its name or type its URL below."
-msgstr "Para elegir un proyecto, pulse sobre su nombre o introduzca su URL debajo."
+msgstr ""
+"Para elegir un proyecto, pulse sobre su nombre o introduzca su URL debajo."
 
-#: clientgui/ProjectInfoPage.cpp:246
+#: ProjectInfoPage.cpp:623
 msgid "Categories:"
 msgstr "Categorías:"
 
-#: clientgui/ProjectInfoPage.cpp:267
+#: ProjectInfoPage.cpp:627 sg_ProjectPanel.cpp:89
 msgid "Projects:"
 msgstr "Proyectos:"
 
-#: clientgui/ProjectInfoPage.cpp:279
+#: ProjectInfoPage.cpp:631
 msgid "Project details"
 msgstr "Detalles del proyecto"
 
-#: clientgui/ProjectInfoPage.cpp:291
+#: ProjectInfoPage.cpp:635
 msgid "Research area:"
 msgstr "Área de investigación:"
 
-#: clientgui/ProjectInfoPage.cpp:302
+#: ProjectInfoPage.cpp:639
 msgid "Organization:"
 msgstr "Organización:"
 
-#: clientgui/ProjectInfoPage.cpp:313
+#: ProjectInfoPage.cpp:643
 msgid "Web site:"
 msgstr "Sitio web:"
 
-#: clientgui/ProjectInfoPage.cpp:325
+#: ProjectInfoPage.cpp:647
 msgid "Supported systems:"
 msgstr "Sistemas soportados:"
 
-#: clientgui/ProjectInfoPage.cpp:363
+#: ProjectInfoPage.cpp:651
 msgid "Project URL:"
 msgstr "URL del proyecto:"
 
-#: clientgui/ProjectInfoPage.cpp:499
-#: clientgui/ProjectInfoPage.cpp:754
-#: clientgui/ProjectInfoPage.cpp:758
-msgid "All"
-msgstr "Todo"
-
-#: clientgui/ProjectInfoPage.cpp:802
-msgid "This project may not have work for your type of computer.  Do you want to add it anyway?"
-msgstr "Puede que este proyecto no tenga trabajo para su tipo de ordenador.  ¿Quiere añadirlo de todas formas?"
+#: ProjectInfoPage.cpp:826
+msgid ""
+"This project may not have work for your type of computer.  Do you want to "
+"add it anyway?"
+msgstr ""
+"Puede que este proyecto no tenga trabajo para su tipo de ordenador.  ¿Quiere "
+"añadirlo de todas formas?"
 
-#: clientgui/ProjectInfoPage.cpp:826
+#: ProjectInfoPage.cpp:850
 msgid "You already added this project. Please choose a different project."
 msgstr "Usted ya ha agregado este proyecto. Por favor, elija otro proyecto."
 
-#: clientgui/ProjectProcessingPage.cpp:321
+#: ProjectProcessingPage.cpp:321
 msgid "Communicating with project."
 msgstr "Comunicando con el proyecto."
 
-#: clientgui/ProjectProcessingPage.cpp:510
+#: ProjectProcessingPage.cpp:509
 msgid "Required files not found on the server."
 msgstr "Los archivos requeridos no se encuentran en el servidor."
 
-#: clientgui/ProjectProcessingPage.cpp:513
-#: clientgui/ProjectProcessingPage.cpp:586
+#: ProjectProcessingPage.cpp:512 ProjectProcessingPage.cpp:574
 msgid "An internal server error has occurred."
 msgstr "Ha ocurrido un error interno en el servidor."
 
-#: clientgui/ProjectPropertiesPage.cpp:334
+#: ProjectPropertiesPage.cpp:334
 msgid ""
 "Communicating with project\n"
 "Please wait..."
@@ -2674,50 +2638,11 @@ msgstr ""
 "Comunicando con el proyecto\n"
 "Por favor espere..."
 
-#: clientgui/ProjectWelcomePage.cpp:251
-#, fuzzy, c-format
-msgid "Welcome to %s."
-msgstr "¡Bienvenido a %s!"
-
-#: clientgui/ProjectWelcomePage.cpp:254
-msgid "You have volunteered to compute for this project:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:255
-#, fuzzy
-msgid "Name:"
-msgstr "Nombre"
-
-#: clientgui/ProjectWelcomePage.cpp:258
-msgid "Home:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:262
-msgid "Description:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:265
-msgid "URL:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:268
-#, fuzzy
-msgid "User:"
-msgstr "Usuario"
-
-#: clientgui/ProjectWelcomePage.cpp:273
-msgid "WARNING: This project is not registered with BOINC.  Make sure you trust it before continuing."
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:277
-msgid "To continue, click Next."
-msgstr "Para continuar, haga clic en Siguiente."
-
-#: clientgui/ProxyInfoPage.cpp:195
+#: ProxyInfoPage.cpp:195
 msgid "Network communication failure"
 msgstr "Fallo en comunicación de red"
 
-#: clientgui/ProxyInfoPage.cpp:199
+#: ProxyInfoPage.cpp:199
 msgid ""
 "The World Community Grid - BOINC software failed to communicate\n"
 "over the Internet. The most likely reasons are:\n"
@@ -2747,7 +2672,7 @@ msgstr ""
 "2) Usted está utilizando un servidor proxy.\n"
 "Haga clic en Siguiente para configurar los parámetros proxy de BOINC."
 
-#: clientgui/ProxyInfoPage.cpp:203
+#: ProxyInfoPage.cpp:203
 msgid ""
 "BOINC failed to communicate on the Internet.\n"
 "The most likely reasons are:\n"
@@ -2777,1372 +2702,1331 @@ msgstr ""
 "2) Usted está utilizando un servidor proxy.\n"
 "Haga clic en Siguiente para configurar los parámetros proxy de BOINC."
 
-#: clientgui/ProxyPage.cpp:331
+#: ProxyPage.cpp:331
 msgid "Proxy configuration"
 msgstr "Configuración proxy"
 
-#: clientgui/ProxyPage.cpp:334
+#: ProxyPage.cpp:334
 msgid "HTTP proxy"
 msgstr "Proxy HTTP"
 
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
+#: ProxyPage.cpp:337 ProxyPage.cpp:357
 msgid "Server:"
 msgstr "Servidor:"
 
-#: clientgui/ProxyPage.cpp:350
+#: ProxyPage.cpp:350
 msgid "Autodetect"
 msgstr "Autodetección"
 
-#: clientgui/ProxyPage.cpp:354
+#: ProxyPage.cpp:354
 msgid "SOCKS proxy"
 msgstr "Proxy SOCKS"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:167
-msgid "Advanced View...\tCtrl+Shift+A"
-msgstr "Vista Avanzada\tCtrl+Shift+A"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:168
-msgid "Display the advanced graphical interface."
-msgstr "Muestra la interfaz gráfica avanzada."
+#: TermsOfUsePage.cpp:218
+msgid "Terms of Use"
+msgstr "Terminos de Uso"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:175
-msgid "Skin"
-msgstr "Piel"
+#: TermsOfUsePage.cpp:222
+msgid "Please read the following terms of use:"
+msgstr "Por favor, lea los siguientes términos de uso:"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:177
-msgid "Select the appearance of the user interface."
-msgstr "Seleccione el aspecto de la interfaz de usuario."
+#: TermsOfUsePage.cpp:231
+msgid "I agree to the terms of use."
+msgstr "Acepto los términos de uso."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:224
-#, c-format
-msgid "&%s"
-msgstr "&%s"
+#: TermsOfUsePage.cpp:237
+#, fuzzy
+msgid "I do not agree to the terms of use."
+msgstr "No acepto los términos de uso:"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:405
-msgid "Default"
-msgstr "Predeterminado"
+#: UnavailablePage.cpp:183
+msgid "Project temporarily unavailable"
+msgstr "Proyecto temporalmente no disponible"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:848
-msgid "Suspend"
-msgstr "Suspender"
+#: UnavailablePage.cpp:186
+msgid ""
+"The project is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr ""
+"El proyecto actualmente no está disponible.\n"
+"\n"
+"Por favor inténtelo más tarde."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:850
-msgid "Suspend Computing"
-msgstr "Suspender la Computación"
+#: UnavailablePage.cpp:190
+msgid "Account manager temporarily unavailable"
+msgstr "Administrador de cuentas temporalmente no disponible"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:851
-msgid "Resume Computing"
-msgstr "Reanudar la Computación"
+#: UnavailablePage.cpp:193
+msgid ""
+"The account manager is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr ""
+"El administrador de cuentas no está actualmente disponible.\n"
+"\n"
+"Por favor inténtelo más tarde."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:867
-msgid "Notices"
-msgstr "Avisos"
+#: ValidateAccountKey.cpp:68
+msgid "Please specify an account key to continue."
+msgstr "Por favor especifique una clave de cuenta para continuar."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:868
-msgid "Open a window to view notices from projects or BOINC"
-msgstr "Abrir una ventana para ver avisos de los proyectos o de BOINC"
+#: ValidateAccountKey.cpp:71
+msgid "Invalid Account Key; please enter a valid Account Key"
+msgstr "Clave de Cuenta inválida; por favor introduzca una clave válida"
 
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
-msgstr "Buscando avisos; por favor espere..."
+#: ValidateAccountKey.cpp:82 ValidateEmailAddress.cpp:86
+msgid "Validation conflict"
+msgstr "Error de validación"
 
-#: clientgui/sg_DlgMessages.cpp:132
-msgid "There are no notices at this time."
-msgstr "No hay avisos en este momento."
+#: ValidateEmailAddress.cpp:72
+msgid "Please specify an email address"
+msgstr "Por favor especifique una dirección de correo"
 
-#: clientgui/sg_DlgMessages.cpp:146
-msgid "Close"
-msgstr "Cerrar"
+#: ValidateEmailAddress.cpp:75
+msgid "Invalid email address; please enter a valid email address"
+msgstr "Dirección de correo inválida; por favor introduzca una dirección válida"
 
-#: clientgui/sg_DlgMessages.cpp:394
-#, c-format
-msgid "%s - Notices"
-msgstr "%s - Avisos"
+#: ValidateURL.cpp:69
+msgid "Missing URL"
+msgstr "URL no introducida"
 
-#: clientgui/sg_DlgPreferences.cpp:270
-msgid "This dialog controls preferences for this computer only."
-msgstr "Este diálogo contola las preferencias de este ordenador solamente."
+#: ValidateURL.cpp:70
+msgid ""
+"Please specify a URL.\n"
+"For example:\n"
+"http://www.example.com/"
+msgstr ""
+"Por favor especifique una URL.\n"
+"Por ejemplo:\n"
+"http://www.ejemplo.com/"
 
-#: clientgui/sg_DlgPreferences.cpp:275
-msgid "Click OK to set preferences."
-msgstr "Pulse Aceptar para establecer las preferencias."
+#: ValidateURL.cpp:83 ValidateURL.cpp:87 ValidateURL.cpp:91
+#: ValidateURL.cpp:103 ValidateURL.cpp:107 ValidateURL.cpp:110
+msgid "Invalid URL"
+msgstr "URL inválida"
 
-#: clientgui/sg_DlgPreferences.cpp:280
-msgid "Click Clear to restore web-based settings for all preferences listed below."
+#: ValidateURL.cpp:84 ValidateURL.cpp:88 ValidateURL.cpp:92
+msgid ""
+"Please specify a valid URL.\n"
+"For example:\n"
+"http://boincproject.example.com"
 msgstr ""
+"Por favor especifique una URL válida.\n"
+"Por ejemplo:\n"
+"http://proyectoboinc.ejemplo.com"
 
-#: clientgui/sg_DlgPreferences.cpp:287
-#, fuzzy
-msgid "For additional settings, select Computing Preferences in the Advanced View."
-msgstr "Para ajustes adicionales, seleccione Preferencias de Computación en"
+#: ValidateURL.cpp:104 ValidateURL.cpp:108
+#, c-format
+msgid "'%s' does not contain a valid host name."
+msgstr "'%s' no contiene un nombre válido de ordenador."
 
-#: clientgui/sg_DlgPreferences.cpp:315
-msgid "Do work only between:"
-msgstr "Trabajar sólo entre:"
+#: ValidateURL.cpp:111
+#, c-format
+msgid "'%s' does not contain a valid path."
+msgstr "'%s' no contiene una ruta válida."
 
-#: clientgui/sg_DlgPreferences.cpp:337
-msgid "Connect to internet only between:"
-msgstr "Conectar a Internet sólo entre:"
+#: ViewMessages.cpp:84 ViewProjects.cpp:170 ViewStatistics.cpp:1978
+#: ViewTransfers.cpp:160 ViewWork.cpp:183
+msgid "Commands"
+msgstr "Comandos"
 
-#: clientgui/sg_DlgPreferences.cpp:359
-#: clientgui/sg_DlgPreferences.cpp:376
-msgid "Use no more than:"
-msgstr "No usar más de:"
+#: ViewMessages.cpp:88
+msgid "Copy all messages"
+msgstr "Copiar todos los mensajes"
 
-#: clientgui/sg_DlgPreferences.cpp:372
-msgid "of disk space"
-msgstr "de espacio en disco"
+#: ViewMessages.cpp:95
+msgid "Copy selected messages"
+msgstr "Copiar los mensajes seleccionados"
 
-#: clientgui/sg_DlgPreferences.cpp:389
-msgid "of the processor"
-msgstr "del procesador"
+#: ViewMessages.cpp:106 ViewMessages.cpp:502
+msgid "Show only this project"
+msgstr "Mostrar sólo este proyecto"
 
-#: clientgui/sg_DlgPreferences.cpp:393
-msgid "Do work while on battery?"
-msgstr "¿Trabajar cuando use baterías?"
+#: ViewMessages.cpp:107 ViewMessages.cpp:503
+msgid "Show only the messages for the selected project."
+msgstr "Mostrar sólo los mensajes del proyecto seleccionado."
 
-#: clientgui/sg_DlgPreferences.cpp:406
-msgid "Do work after idle for:"
-msgstr "Trabajar después de estar inactivo durante:"
+#: ViewMessages.cpp:164
+msgid "Messages"
+msgstr "Mensajes"
 
-#: clientgui/sg_DlgPreferences.cpp:431
-#, fuzzy
-msgid "Clear all local preferences listed above and close the dialog"
-msgstr "restaurar todas las preferencias locales y cerrar la ventana"
+#: ViewMessages.cpp:187
+msgid "Copying all messages to the clipboard..."
+msgstr "Copiando todos los mensajes al portapapeles..."
 
-#: clientgui/sg_DlgPreferences.cpp:609
-#: clientgui/sg_DlgPreferences.cpp:612
-#: clientgui/sg_DlgPreferences.cpp:688
-#: clientgui/sg_DlgPreferences.cpp:692
-#: clientgui/sg_DlgPreferences.cpp:704
-#: clientgui/sg_DlgPreferences.cpp:708
-#: clientgui/sg_DlgPreferences.cpp:851
-#: clientgui/sg_DlgPreferences.cpp:862
-msgid "Anytime"
-msgstr "En cualquier momento"
-
-#: clientgui/sg_DlgPreferences.cpp:645
-msgid "100 MB"
-msgstr "100 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:646
-msgid "200 MB"
-msgstr "200 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:647
-msgid "500 MB"
-msgstr "500 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:648
-msgid "1 GB"
-msgstr "1 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:649
-msgid "2 GB"
-msgstr "2 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:650
-msgid "5 GB"
-msgstr "5 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:651
-msgid "10 GB"
-msgstr "10 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:652
-msgid "20 GB"
-msgstr "20 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:653
-msgid "50 GB"
-msgstr "50 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:654
-msgid "100 GB"
-msgstr "100 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:724
-#, c-format
-msgid "%d MB"
-msgstr "%d MB"
+#: ViewMessages.cpp:223
+msgid "Copying selected messages to the clipboard..."
+msgstr "Copiando los mensajes seleccionados al portapapeles..."
 
-#: clientgui/sg_DlgPreferences.cpp:726
-#, c-format
-msgid "%4.2f GB"
-msgstr "%4.2f GB"
+#: ViewMessages.cpp:286
+msgid "Filtering messages..."
+msgstr "Filtrando mensajes..."
 
-#: clientgui/sg_DlgPreferences.cpp:767
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
+#: ViewMessages.cpp:494
+msgid "Show all messages"
+msgstr "Mostrar todos los mensajes"
 
-#: clientgui/sg_DlgPreferences.cpp:803
-msgid "0 (Run Always)"
-msgstr "0 (Ejecutar siempre)"
+#: ViewMessages.cpp:495
+msgid "Show messages for all projects."
+msgstr "Mostar los mensajes de todos los proyectos."
 
-#: clientgui/sg_DlgPreferences.cpp:806
-#, c-format
-msgid "%d"
-msgstr "%d"
+#: ViewNotices.cpp:58 sg_DlgMessages.cpp:124
+msgid "Fetching notices; please wait..."
+msgstr "Buscando avisos; por favor espere..."
 
-#: clientgui/sg_DlgPreferences.cpp:953
-#, c-format
-msgid "%s - Computing Preferences"
-msgstr ""
+#: ViewNotices.cpp:65 sg_DlgMessages.cpp:132
+msgid "There are no notices at this time."
+msgstr "No hay avisos en este momento."
 
-#: clientgui/sg_DlgPreferences.cpp:1033
-msgid "Do you really want to clear all local preferences?\n"
-msgstr "¿Realmente desea borrar todas las preferencias locales?\n"
+#: ViewNotices.cpp:99 sg_BoincSimpleFrame.cpp:776
+msgid "Notices"
+msgstr "Avisos"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:66
-#: clientgui/ViewProjects.cpp:179
+#: ViewProjects.cpp:174 sg_ProjectCommandPopup.cpp:61
 msgid "Update"
 msgstr "Actualizar"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:67
-#: clientgui/ViewProjects.cpp:180
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
-msgstr "Enviar todas las tareas completadas, actualizar los créditos, actualizar sus preferencias y posiblemente descargar más tareas."
+#: ViewProjects.cpp:175 sg_ProjectCommandPopup.cpp:62
+msgid ""
+"Report all completed tasks, get latest credit, get latest preferences, and "
+"possibly get more tasks."
+msgstr ""
+"Enviar todas las tareas completadas, actualizar los créditos, actualizar sus "
+"preferencias y posiblemente descargar más tareas."
+
+#: 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
+msgid "Suspend"
+msgstr "Suspender"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:73
-#: clientgui/sg_ProjectCommandPopup.cpp:129
-#: clientgui/ViewProjects.cpp:187
-#: clientgui/ViewProjects.cpp:727
+#: ViewProjects.cpp:182 ViewProjects.cpp:722 sg_ProjectCommandPopup.cpp:68
+#: sg_ProjectCommandPopup.cpp:114
 msgid "Suspend tasks for this project."
 msgstr "Suspender las tareas de este proyecto."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:78
-#: clientgui/sg_ProjectCommandPopup.cpp:136
-#: clientgui/ViewProjects.cpp:193
-#: clientgui/ViewProjects.cpp:746
+#: ViewProjects.cpp:188 ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:73
+#: sg_ProjectCommandPopup.cpp:121
 msgid "No new tasks"
 msgstr "No pedir nuevas tareas"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:79
-#: clientgui/ViewProjects.cpp:194
+#: ViewProjects.cpp:189 sg_ProjectCommandPopup.cpp:74
 msgid "Don't get new tasks for this project."
 msgstr "No pedir más tareas para este proyecto."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:200
+#: ViewProjects.cpp:195 sg_ProjectCommandPopup.cpp:79
 msgid "Reset project"
 msgstr "Reiniciar proyecto"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:85
-#: clientgui/ViewProjects.cpp:201
-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 "Borrar todos los archivos y tareas asociadas a este proyecto, y pedir nuevas tareas. Puede actualizar antes el proyecto para enviar cualquier tarea completada."
+#: ViewProjects.cpp:196 sg_ProjectCommandPopup.cpp:80
+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 ""
+"Borrar todos los archivos y tareas asociadas a este proyecto, y pedir nuevas "
+"tareas. Puede actualizar antes el proyecto para enviar cualquier tarea "
+"completada."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:91
-#: clientgui/ViewProjects.cpp:208
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
-msgstr "Eliminar este proyecto.   Las tareas en progreso se perderán (use 'Actualizar' en primer lugar para informar las tareas completadas)."
+#: ViewProjects.cpp:203 sg_ProjectCommandPopup.cpp:86
+msgid ""
+"Remove this project.  Tasks in progress will be lost (use 'Update' first to "
+"report any completed tasks)."
+msgstr ""
+"Eliminar este proyecto.   Las tareas en progreso se perderán (use "
+"'Actualizar' en primer lugar para informar las tareas completadas)."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:96
-#: clientgui/sg_TaskCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:214
+#: ViewProjects.cpp:209 ViewWork.cpp:222 sg_ProjectCommandPopup.cpp:91
+#: sg_TaskCommandPopup.cpp:78
 msgid "Properties"
 msgstr "Propiedades"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:97
-#: clientgui/ViewProjects.cpp:215
+#: ViewProjects.cpp:210 sg_ProjectCommandPopup.cpp:92
 msgid "Show project details."
 msgstr "Mostrar los detalles del proyecto."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:126
-#: clientgui/ViewProjects.cpp:723
-msgid "Resume tasks for this project."
-msgstr "Reanudar las tareas para este proyecto"
+#: ViewProjects.cpp:220 ViewStatistics.cpp:450
+msgid "Account"
+msgstr "Cuenta"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:133
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow new tasks"
-msgstr "Permitir nuevas tareas"
+#: ViewProjects.cpp:222
+msgid "Work done"
+msgstr "Trabajo finalizado"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:134
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow fetching new tasks for this project."
-msgstr "Permitir conseguir nuevas tareas para este proyecto."
+#: ViewProjects.cpp:223
+msgid "Avg. work done"
+msgstr "Promedio trabajo realizado"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:137
-#: clientgui/ViewProjects.cpp:746
-msgid "Don't fetch new tasks for this project."
-msgstr "No pedir más tareas para este proyecto."
+#: ViewProjects.cpp:225 ViewTransfers.cpp:188 ViewWork.cpp:234
+msgid "Status"
+msgstr "Estado"
+
+#: ViewProjects.cpp:250
+msgid "Projects"
+msgstr "Proyectos"
+
+#: ViewProjects.cpp:302
+msgid "Updating project..."
+msgstr "Actualizando proyecto..."
+
+#: ViewProjects.cpp:344
+msgid "Resuming project..."
+msgstr "Reanudando proyecto..."
+
+#: ViewProjects.cpp:348
+msgid "Suspending project..."
+msgstr "Suspendiendo proyecto..."
+
+#: ViewProjects.cpp:385
+msgid "Telling project to allow additional task downloads..."
+msgstr "Solicitando al proyecto que permita la descarga de más tareas..."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:229
-#: clientgui/ViewProjects.cpp:443
+#: ViewProjects.cpp:389
+msgid "Telling project to not fetch any additional tasks..."
+msgstr "Solicitando al proyecto que no consiga más tareas..."
+
+#: ViewProjects.cpp:425
+msgid "Resetting project..."
+msgstr "Reiniciando proyecto..."
+
+#: ViewProjects.cpp:438 sg_ProjectCommandPopup.cpp:214
 #, c-format
 msgid "Are you sure you want to reset project '%s'?"
 msgstr "¿Está seguro de que quiere reiniciar el proyecto '%s'?"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:235
-#: clientgui/ViewProjects.cpp:449
+#: ViewProjects.cpp:444 sg_ProjectCommandPopup.cpp:220
 msgid "Reset Project"
 msgstr "Reiniciar Proyecto"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:266
-#: clientgui/ViewProjects.cpp:501
+#: ViewProjects.cpp:483
+msgid "Removing project..."
+msgstr "Eliminando proyecto..."
+
+#: ViewProjects.cpp:496 sg_ProjectCommandPopup.cpp:251
 #, c-format
 msgid "Are you sure you want to remove project '%s'?"
 msgstr "¿Está seguro de que quiere eliminar el proyecto '%s'?"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:272
-#: clientgui/ViewProjects.cpp:507
+#: ViewProjects.cpp:502 sg_ProjectCommandPopup.cpp:257
 msgid "Remove Project"
 msgstr "Eliminar Proyecto"
 
-#: clientgui/sg_ProjectPanel.cpp:72
-msgid "Add Project"
-msgstr "Añadir proyecto"
+#: ViewProjects.cpp:543 ViewWork.cpp:599
+msgid "Launching browser..."
+msgstr "Lanzando navegador..."
 
-#: clientgui/sg_ProjectPanel.cpp:73
-msgid "Synchronize"
-msgstr "Sincronizar"
+#: ViewProjects.cpp:718 sg_ProjectCommandPopup.cpp:111
+msgid "Resume tasks for this project."
+msgstr "Reanudar las tareas para este proyecto"
 
-#: clientgui/sg_ProjectPanel.cpp:74
-msgid "Work done for this project"
-msgstr "Trabajo realizado para este proyecto"
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:118
+msgid "Allow new tasks"
+msgstr "Permitir nuevas tareas"
 
-#: clientgui/sg_ProjectPanel.cpp:77
-msgid "Synchronize projects with account manager system"
-msgstr "Sincronizar los proyectos con el sistema de administrador de cuentas"
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:119
+msgid "Allow fetching new tasks for this project."
+msgstr "Permitir conseguir nuevas tareas para este proyecto."
 
-#: clientgui/sg_ProjectPanel.cpp:124
-msgid "Select a project to access with the controls below"
-msgstr "Seleccione un proyecto al que acceder con los controles de abajo"
+#: ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:122
+msgid "Don't fetch new tasks for this project."
+msgstr "No pedir más tareas para este proyecto."
 
-#: clientgui/sg_ProjectPanel.cpp:145
-msgid "Project Web Pages"
-msgstr "Páginas Web del Proyecto"
+#: ViewProjects.cpp:1058
+msgid "Requested by user"
+msgstr "Pedido por el usuario"
 
-#: clientgui/sg_ProjectPanel.cpp:149
-msgid "Project Commands"
-msgstr "Comandos del Proyecto"
+#: ViewProjects.cpp:1059
+msgid "To fetch work"
+msgstr "Buscar trabajo"
 
-#: clientgui/sg_ProjectPanel.cpp:276
-#, c-format
-msgid "Pop up a menu of web sites for project %s"
-msgstr "Saca un menú de sitios web del proyecto %s"
+#: ViewProjects.cpp:1060
+msgid "To report completed tasks"
+msgstr "Informar las tareas completadas"
 
-#: clientgui/sg_ProjectPanel.cpp:278
-#, c-format
-msgid "Pop up a menu of commands to apply to project %s"
-msgstr "Saca un menú de comandos a aplicar al proyecto %s"
+#: ViewProjects.cpp:1061
+msgid "To send trickle-up message"
+msgstr "Enviar mensaje trickle-up"
 
-#: clientgui/sg_TaskCommandPopup.cpp:66
-msgid "Show graphics"
-msgstr "Mostrar gráficos"
+#: ViewProjects.cpp:1062
+msgid "Requested by account manager"
+msgstr "Pedido por el administrador de cuentas"
 
-#: clientgui/sg_TaskCommandPopup.cpp:67
-msgid "Show application graphics in a window."
-msgstr "Mostrar los gráficos de la aplicación en una ventana."
+#: ViewProjects.cpp:1063
+msgid "Project initialization"
+msgstr "Iniciación del proyecto"
 
-#: clientgui/sg_TaskCommandPopup.cpp:73
-msgid "Suspend this task."
-msgstr "Suspender esta tarea."
+#: ViewProjects.cpp:1064
+msgid "Requested by project"
+msgstr "Pedido por el proyecto"
 
-#: clientgui/sg_TaskCommandPopup.cpp:78
-msgid "Abort"
-msgstr "Cancelar"
+#: ViewProjects.cpp:1065
+msgid "Unknown reason"
+msgstr "Razón desconocida"
 
-#: clientgui/sg_TaskCommandPopup.cpp:79
-msgid "Abandon this task. You will get no credit for it."
-msgstr "Abandonar este tarea. No obtendrá crédito por ella."
+#: ViewProjects.cpp:1079
+msgid "Suspended by user"
+msgstr "Suspendido por el usuario"
 
-#: clientgui/sg_TaskCommandPopup.cpp:85
-msgid "Show task details."
-msgstr "Mostrar detalles de la tarea."
+#: ViewProjects.cpp:1082
+msgid "Won't get new tasks"
+msgstr "No se descargarán nuevas tareas"
 
-#: clientgui/sg_TaskCommandPopup.cpp:119
-msgid "Resume work for this task."
-msgstr "Reanudar el trabajo para esta tarea."
+#: ViewProjects.cpp:1085
+msgid "Project ended - OK to remove"
+msgstr "Proyecto finalizado - listo para eliminarlo"
 
-#: clientgui/sg_TaskCommandPopup.cpp:123
-msgid "Suspend work for this task."
-msgstr "Suspender el trabajo para esta tarea."
+#: ViewProjects.cpp:1088
+msgid "Will remove when tasks done"
+msgstr "Se eliminará cuando las tareas estén terminadas"
 
-#: 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á seguro de querer cancelar la tarea '%s'?\n"
-"(Progreso: %.1lf%%, Estado: %s)"
+#: ViewProjects.cpp:1091
+msgid "Scheduler request pending"
+msgstr "Pendiente petición al Planificador"
 
-#: clientgui/sg_TaskCommandPopup.cpp:272
-msgid "Abort task"
-msgstr "Cancelar tarea"
+#: ViewProjects.cpp:1097
+msgid "Scheduler request in progress"
+msgstr "Petición al planificador en progreso"
 
-#: clientgui/sg_TaskPanel.cpp:468
-msgid "You don't have any projects.  Please Add a Project."
-msgstr "Usted no tiene ningún proyecto. Por favor únase a uno."
+#: ViewProjects.cpp:1100
+msgid "Trickle up message pending"
+msgstr "Mensaje trickle up pendiente"
 
-#: clientgui/sg_TaskPanel.cpp:469
-msgid "Not available"
-msgstr "No disponible"
+#: ViewProjects.cpp:1106
+msgid "Communication deferred "
+msgstr "Comunicación aplazada "
 
-#: clientgui/sg_TaskPanel.cpp:480
-msgid "Tasks:"
-msgstr "Tareas:"
+#: ViewResources.cpp:62
+msgid "Total disk usage"
+msgstr "Total de disco utilizado"
 
-#: clientgui/sg_TaskPanel.cpp:486
-msgid "Select a task to access"
-msgstr "Seleccione una tarea a la que acceder"
+#: ViewResources.cpp:83
+msgid "Disk usage by BOINC projects"
+msgstr "Disco utilizado por los proyectos BOINC"
 
-#: clientgui/sg_TaskPanel.cpp:497
-msgid "From:"
-msgstr "De:"
+#: ViewResources.cpp:116
+msgid "Disk"
+msgstr "Disco"
 
-#: clientgui/sg_TaskPanel.cpp:551
-msgid "This task's progress"
-msgstr "Progreso de esta tarea"
+#: ViewResources.cpp:249
+msgid "no projects: 0 bytes used"
+msgstr "sin proyectos: 0 bytes usados"
 
-#: clientgui/sg_TaskPanel.cpp:569
-msgid "Task Commands"
-msgstr "Comandos de la Tarea"
+#: ViewResources.cpp:286
+msgid "used by BOINC: "
+msgstr "utilizado por BOINC:  "
 
-#: clientgui/sg_TaskPanel.cpp:570
-msgid "Pop up a menu of commands to apply to this task"
-msgstr "Visualizar un menú de comandos aplicables a esta tarea"
+#: ViewResources.cpp:296
+msgid "free, available to BOINC: "
+msgstr "libre, disponible para BOINC: "
 
-#: clientgui/sg_TaskPanel.cpp:705
-#, c-format
-msgid "Application: %s"
-msgstr "Aplicación: %s"
+#: ViewResources.cpp:306
+msgid "free, not available to BOINC: "
+msgstr "libre, no disponible para BOINC: "
 
-#: clientgui/sg_TaskPanel.cpp:728
-#, c-format
-msgid "%.3f%%"
-msgstr "%.3f%%"
+#: ViewResources.cpp:316
+msgid "free: "
+msgstr "libre: "
 
-#: clientgui/sg_TaskPanel.cpp:736
-msgid "Application: Not available"
-msgstr "Aplicación: No disponible"
+#: ViewResources.cpp:326
+msgid "used by other programs: "
+msgstr "utilizado por otros programas:  "
 
-#: clientgui/sg_TaskPanel.cpp:836
-msgid "Not Available"
-msgstr "No Disponible"
+#: ViewStatistics.cpp:1205
+msgid "User Total"
+msgstr "Total Usuario"
 
-#: clientgui/sg_TaskPanel.cpp:851
-#, c-format
-msgid "Elapsed: %s"
-msgstr "Transcurrido: %s"
+#: ViewStatistics.cpp:1206
+msgid "User Average"
+msgstr "Promedio Usuario"
 
-#: clientgui/sg_TaskPanel.cpp:865
-#, c-format
-msgid "Remaining (estimated): %s"
-msgstr "Restante (estimado): %s"
+#: ViewStatistics.cpp:1207
+msgid "Host Total"
+msgstr "Total Ordenador"
 
-#: clientgui/sg_TaskPanel.cpp:880
-#, c-format
-msgid "Status: %s"
-msgstr "Estado: %s"
+#: ViewStatistics.cpp:1208
+msgid "Host Average"
+msgstr "Promedio Ordenador"
 
-#: clientgui/sg_TaskPanel.cpp:1227
-msgid "Retrieving current status."
-msgstr "Recuperando estado actual."
+#: ViewStatistics.cpp:1355
+#, c-format
+msgid "Last update: %.0f days ago"
+msgstr "Última actualización: hace %.0f días"
 
-#: clientgui/sg_TaskPanel.cpp:1233
-msgid "Downloading work from the server."
-msgstr "Descargando trabajo del servidor."
+#: ViewStatistics.cpp:1982
+msgid "Show user total"
+msgstr "Mostrar totales del usuario"
 
-#: clientgui/sg_TaskPanel.cpp:1238
-msgid "Processing Suspended:  Running On Batteries."
-msgstr "Procesamiento Suspendido: Funcionando con Baterías."
+#: ViewStatistics.cpp:1983
+msgid "Show total credit for user"
+msgstr "Muestra el crédito total del usuario"
 
-#: clientgui/sg_TaskPanel.cpp:1240
-msgid "Processing Suspended:  User Active."
-msgstr "Procesamiento Suspendido: Usuario Activo."
+#: ViewStatistics.cpp:1989
+msgid "Show user average"
+msgstr "Mostrar promedios del usuario"
 
-#: clientgui/sg_TaskPanel.cpp:1242
-msgid "Processing Suspended:  User paused processing."
-msgstr "Procesamiento Suspendido: Usuario suspendió actividad."
+#: ViewStatistics.cpp:1990
+msgid "Show average credit for user"
+msgstr "Muestra el crédito promedio del usuario"
 
-#: clientgui/sg_TaskPanel.cpp:1244
-msgid "Processing Suspended:  Time of Day."
-msgstr "Procesamiento Suspendido: Hora del Día."
+#: ViewStatistics.cpp:1996
+msgid "Show host total"
+msgstr "Mostrar totales del ordenador"
 
-#: clientgui/sg_TaskPanel.cpp:1246
-msgid "Processing Suspended:  Benchmarks Running."
-msgstr "Procesamiento Suspendido: Ejecutando Pruebas Rendimiento."
+#: ViewStatistics.cpp:1997
+msgid "Show total credit for host"
+msgstr "Muestra el crédito total del ordenador"
 
-#: clientgui/sg_TaskPanel.cpp:1248
-msgid "Processing Suspended."
-msgstr "Procesamiento Suspendido."
+#: ViewStatistics.cpp:2003
+msgid "Show host average"
+msgstr "Mostrar promedios del ordenador"
 
-#: clientgui/sg_TaskPanel.cpp:1252
-msgid "Waiting to contact project servers."
-msgstr "Esperando a contactar con los servidores del proyecto."
+#: ViewStatistics.cpp:2004
+msgid "Show average credit for host"
+msgstr "Muestra el crédito promedio del ordenador"
 
-#: clientgui/sg_TaskPanel.cpp:1256
-#: clientgui/sg_TaskPanel.cpp:1265
-msgid "Retrieving current status"
-msgstr "Recuperando estado actual"
+#: ViewStatistics.cpp:2013
+msgid "< &Previous project"
+msgstr "< Proyecto &anterior"
 
-#: clientgui/sg_TaskPanel.cpp:1260
-msgid "No work available to process"
-msgstr "No hay trabajo disponible para procesar"
+#: ViewStatistics.cpp:2014
+msgid "Show chart for previous project"
+msgstr "Muestra el gráfico del proyecto anterior"
 
-#: clientgui/sg_TaskPanel.cpp:1262
-msgid "Unable to connect to the core client"
-msgstr "No se puede conectar al cliente núcleo"
+#: ViewStatistics.cpp:2019
+msgid "&Next project >"
+msgstr "&Siguiente proyecto >"
 
-#: clientgui/TermsOfUsePage.cpp:218
-msgid "Terms of Use"
-msgstr "Terminos de Uso"
+#: ViewStatistics.cpp:2020
+msgid "Show chart for next project"
+msgstr "Muestra el gráfico del siguiente proyecto"
 
-#: clientgui/TermsOfUsePage.cpp:222
-msgid "Please read the following terms of use:"
-msgstr "Por favor, lea los siguientes términos de uso:"
+#: ViewStatistics.cpp:2026 ViewStatistics.cpp:2416
+msgid "Hide project list"
+msgstr "Ocultar la lista de proyectos"
 
-#: clientgui/TermsOfUsePage.cpp:231
-msgid "I agree to the terms of use."
-msgstr "Acepto los términos de uso."
+#: ViewStatistics.cpp:2027 ViewStatistics.cpp:2416
+msgid "Use entire area for graphs"
+msgstr "Usar todo el área para gráficos"
 
-#: clientgui/TermsOfUsePage.cpp:237
-#, fuzzy
-msgid "I do not agree to the terms of use."
-msgstr "No acepto los términos de uso:"
+#: ViewStatistics.cpp:2032
+msgid "Mode view"
+msgstr "Modo de presentación"
 
-#: clientgui/UnavailablePage.cpp:183
-msgid "Project temporarily unavailable"
-msgstr "Proyecto temporalmente no disponible"
+#: ViewStatistics.cpp:2036
+msgid "One project"
+msgstr "Un proyecto"
 
-#: clientgui/UnavailablePage.cpp:186
-msgid ""
-"The project is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-"El proyecto actualmente no está disponible.\n"
-"\n"
-"Por favor inténtelo más tarde."
+#: ViewStatistics.cpp:2037
+msgid "Show one chart with selected project"
+msgstr "Muestra un gráfico del proyecto seleccionado"
 
-#: clientgui/UnavailablePage.cpp:190
-msgid "Account manager temporarily unavailable"
-msgstr "Administrador de cuentas temporalmente no disponible"
+#: ViewStatistics.cpp:2043
+msgid "All projects (separate)"
+msgstr "Todos los proyectos (separados)"
 
-#: clientgui/UnavailablePage.cpp:193
-msgid ""
-"The account manager is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-"El administrador de cuentas no está actualmente disponible.\n"
-"\n"
-"Por favor inténtelo más tarde."
+#: ViewStatistics.cpp:2044
+msgid "Show all projects, one chart per project"
+msgstr "Muestra todos los proyectos, un gráfico por proyecto"
 
-#: clientgui/ValidateAccountKey.cpp:68
-msgid "Please specify an account key to continue."
-msgstr "Por favor especifique una clave de cuenta para continuar."
+#: ViewStatistics.cpp:2050
+msgid "All projects (together)"
+msgstr "Todos los proyectos (juntos)"
 
-#: clientgui/ValidateAccountKey.cpp:71
-msgid "Invalid Account Key; please enter a valid Account Key"
-msgstr "Clave de Cuenta inválida; por favor introduzca una clave válida"
+#: ViewStatistics.cpp:2051
+msgid "Show one chart with all projects"
+msgstr "Muestra un gráfico con todos los proyectos"
 
-#: clientgui/ValidateAccountKey.cpp:82
-#: clientgui/ValidateEmailAddress.cpp:86
-msgid "Validation conflict"
-msgstr "Error de validación"
+#: ViewStatistics.cpp:2057
+msgid "All projects (sum)"
+msgstr "Todos los proyectos (suma)"
 
-#: clientgui/ValidateEmailAddress.cpp:72
-msgid "Please specify an email address"
-msgstr "Por favor especifique una dirección de correo"
+#: ViewStatistics.cpp:2058
+msgid "Show one chart with sum of projects"
+msgstr "Muestra un gráfico con la suma de los proyectos"
 
-#: clientgui/ValidateEmailAddress.cpp:75
-msgid "Invalid email address; please enter a valid email address"
-msgstr "Dirección de correo inválida; por favor introduzca una dirección válida"
+#: ViewStatistics.cpp:2079
+msgid "Statistics"
+msgstr "Estadísticas"
 
-#: clientgui/ValidateURL.cpp:69
-msgid "Missing URL"
-msgstr "URL no introducida"
+#: 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
+msgid "Updating charts..."
+msgstr "Actualizando gráficas..."
 
-#: clientgui/ValidateURL.cpp:70
-msgid ""
-"Please specify a URL.\n"
-"For example:\n"
-"http://www.example.com/"
-msgstr ""
-"Por favor especifique una URL.\n"
-"Por ejemplo:\n"
-"http://www.ejemplo.com/"
+#: ViewStatistics.cpp:2420
+msgid "Show project list"
+msgstr "Mostrar la lista de proyectos"
 
-#: 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álida"
+#: ViewStatistics.cpp:2420
+msgid "Uses smaller area for graphs"
+msgstr "Usar un área menor para gráficos"
 
-#: 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 una URL válida.\n"
-"Por ejemplo:\n"
-"http://proyectoboinc.ejemplo.com"
+#: ViewTransfers.cpp:164
+msgid "Retry Now"
+msgstr "Reintentar Ahora"
 
-#: clientgui/ValidateURL.cpp:104
-#: clientgui/ValidateURL.cpp:108
-#, c-format
-msgid "'%s' does not contain a valid host name."
-msgstr "'%s' no contiene un nombre válido de ordenador."
+#: ViewTransfers.cpp:165
+msgid "Retry the file transfer now"
+msgstr "Reintentar la transferencia del archivo ahora"
 
-#: clientgui/ValidateURL.cpp:111
-#, c-format
-msgid "'%s' does not contain a valid path."
-msgstr "'%s' no contiene una ruta válida."
+#: ViewTransfers.cpp:171
+msgid "Abort Transfer"
+msgstr "Abortar Transferencia"
 
-#: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:175
-msgid "Commands"
-msgstr "Comandos"
+#: ViewTransfers.cpp:172
+msgid "Abort this file transfer.  You won't get credit for the task."
+msgstr ""
+"Abortar la transferencia de este archivo.   No obtendrá crédito por la "
+"tarea."
 
-#: clientgui/ViewMessages.cpp:88
-msgid "Copy all messages"
-msgstr "Copiar todos los mensajes"
+#: ViewTransfers.cpp:183
+msgid "File"
+msgstr "Archivo"
 
-#: clientgui/ViewMessages.cpp:95
-msgid "Copy selected messages"
-msgstr "Copiar los mensajes seleccionados"
+#: ViewTransfers.cpp:184 ViewWork.cpp:233
+msgid "Progress"
+msgstr "Progreso"
 
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
-msgid "Show only this project"
-msgstr "Mostrar sólo este proyecto"
+#: ViewTransfers.cpp:185
+msgid "Size"
+msgstr "Tamaño"
 
-#: clientgui/ViewMessages.cpp:107
-#: clientgui/ViewMessages.cpp:503
-msgid "Show only the messages for the selected project."
-msgstr "Mostrar sólo los mensajes del proyecto seleccionado."
+#: ViewTransfers.cpp:186
+msgid "Elapsed Time"
+msgstr "Tiempo transcurrido"
 
-#: clientgui/ViewMessages.cpp:164
-msgid "Messages"
-msgstr "Mensajes"
+#: ViewTransfers.cpp:187
+msgid "Speed"
+msgstr "Velocidad"
 
-#: clientgui/ViewMessages.cpp:187
-msgid "Copying all messages to the clipboard..."
-msgstr "Copiando todos los mensajes al portapapeles..."
+#: ViewTransfers.cpp:213
+msgid "Transfers"
+msgstr "Transferencias"
 
-#: clientgui/ViewMessages.cpp:223
-msgid "Copying selected messages to the clipboard..."
-msgstr "Copiando los mensajes seleccionados al portapapeles..."
+#: ViewTransfers.cpp:280
+msgid "Network activity is suspended - "
+msgstr "La actividad de red está suspendida - "
 
-#: clientgui/ViewMessages.cpp:286
-msgid "Filtering messages..."
-msgstr "Filtrando mensajes..."
+#: ViewTransfers.cpp:282
+msgid ""
+".\n"
+"You can enable it using the Activity menu."
+msgstr ""
+".\n"
+"Usted puede habilitarlo usando el menú Actividad."
 
-#: clientgui/ViewMessages.cpp:494
-msgid "Show all messages"
-msgstr "Mostrar todos los mensajes"
+#: ViewTransfers.cpp:285
+msgid "BOINC"
+msgstr "BOINC"
 
-#: clientgui/ViewMessages.cpp:495
-msgid "Show messages for all projects."
-msgstr "Mostar los mensajes de todos los proyectos."
+#: ViewTransfers.cpp:292
+msgid "Retrying transfer now..."
+msgstr "Reintentando transferencia ahora..."
 
-#: clientgui/ViewProjects.cpp:225
-msgid "Account"
-msgstr "Cuenta"
+#: ViewTransfers.cpp:330
+msgid "Aborting transfer..."
+msgstr "Cancelando la transferencia..."
 
-#: clientgui/ViewProjects.cpp:227
-msgid "Work done"
-msgstr "Trabajo finalizado"
+#: ViewTransfers.cpp:343
+#, 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 ""
+"¿Está seguro de que quiere abortar la transferencia de este fichero  '%s'?\n"
+"NOTA: Abortar una transferencia invalidará la tarea y usted\n"
+"no recibirá créditos por ella."
 
-#: clientgui/ViewProjects.cpp:228
-msgid "Avg. work done"
-msgstr "Promedio trabajo realizado"
+#: ViewTransfers.cpp:349
+msgid "Abort File Transfer"
+msgstr "Cancelar Transferencia de Archivo"
 
-#: clientgui/ViewProjects.cpp:230
-msgid "Status"
-msgstr "Estado"
+#: ViewTransfers.cpp:780
+msgid "Upload"
+msgstr "Enviar"
 
-#: clientgui/ViewProjects.cpp:255
-msgid "Projects"
-msgstr "Proyectos"
+#: ViewTransfers.cpp:780
+msgid "Download"
+msgstr "Descargar"
 
-#: clientgui/ViewProjects.cpp:307
-msgid "Updating project..."
-msgstr "Actualizando proyecto..."
+#: ViewTransfers.cpp:784
+msgid "retry in "
+msgstr "reintentar en "
 
-#: clientgui/ViewProjects.cpp:349
-msgid "Resuming project..."
-msgstr "Reanudando proyecto..."
+#: ViewTransfers.cpp:786
+msgid "failed"
+msgstr "falló"
 
-#: clientgui/ViewProjects.cpp:353
-msgid "Suspending project..."
-msgstr "Suspendiendo proyecto..."
+#: ViewTransfers.cpp:789
+msgid "suspended"
+msgstr "suspendido"
 
-#: clientgui/ViewProjects.cpp:390
-msgid "Telling project to allow additional task downloads..."
-msgstr "Solicitando al proyecto que permita la descarga de más tareas..."
+#: ViewTransfers.cpp:794
+msgid "active"
+msgstr "activo"
 
-#: clientgui/ViewProjects.cpp:394
-msgid "Telling project to not fetch any additional tasks..."
-msgstr "Solicitando al proyecto que no consiga más tareas..."
+#: ViewTransfers.cpp:796
+msgid "pending"
+msgstr "pendiente"
 
-#: clientgui/ViewProjects.cpp:430
-msgid "Resetting project..."
-msgstr "Reiniciando proyecto..."
+#: ViewTransfers.cpp:803
+msgid " (project backoff: "
+msgstr "  (proyecto parado:_"
 
-#: clientgui/ViewProjects.cpp:488
-msgid "Removing project..."
-msgstr "Eliminando proyecto..."
+#: ViewWork.cpp:187 ViewWork.cpp:777
+msgid "Show active tasks"
+msgstr "Mostrar tareas activas"
 
-#: clientgui/ViewProjects.cpp:548
-msgid "Launching browser..."
-msgstr "Lanzando navegador..."
+#: ViewWork.cpp:188 ViewWork.cpp:778
+msgid "Show only active tasks."
+msgstr "Mostrar sólo tareas activas."
 
-#: clientgui/ViewProjects.cpp:1063
-msgid "Requested by user"
-msgstr "Pedido por el usuario"
+#: ViewWork.cpp:194 sg_TaskCommandPopup.cpp:60
+msgid "Show graphics"
+msgstr "Mostrar gráficos"
 
-#: clientgui/ViewProjects.cpp:1064
-msgid "To fetch work"
-msgstr "Buscar trabajo"
+#: ViewWork.cpp:195 sg_TaskCommandPopup.cpp:61
+msgid "Show application graphics in a window."
+msgstr "Mostrar los gráficos de la aplicación en una ventana."
 
-#: clientgui/ViewProjects.cpp:1065
-msgid "To report completed tasks"
-msgstr "Informar las tareas completadas"
+#: ViewWork.cpp:201
+msgid "Show VM Console"
+msgstr "Mostrar Consola VM"
 
-#: clientgui/ViewProjects.cpp:1066
-msgid "To send trickle-up message"
-msgstr "Enviar mensaje trickle-up"
+#: ViewWork.cpp:202
+msgid "Show VM Console in a window."
+msgstr "Mostrar la Consola VM en una ventana."
 
-#: clientgui/ViewProjects.cpp:1067
-msgid "Requested by account manager"
-msgstr "Pedido por el administrador de cuentas"
+#: ViewWork.cpp:209
+msgid "Suspend work for this result."
+msgstr "Suspender el trabajo para este resultado."
 
-#: clientgui/ViewProjects.cpp:1068
-msgid "Project initialization"
-msgstr "Iniciación del proyecto"
+#: ViewWork.cpp:215 sg_TaskCommandPopup.cpp:72
+msgid "Abort"
+msgstr "Cancelar"
 
-#: clientgui/ViewProjects.cpp:1069
-msgid "Requested by project"
-msgstr "Pedido por el proyecto"
+#: ViewWork.cpp:216
+msgid "Abandon work on the result. You will get no credit for it."
+msgstr "Abandonar el trabajo con el resultado. No conseguirá crédito por él."
 
-#: clientgui/ViewProjects.cpp:1070
-msgid "Unknown reason"
-msgstr "Razón desconocida"
+#: ViewWork.cpp:223 sg_TaskCommandPopup.cpp:79
+msgid "Show task details."
+msgstr "Mostrar detalles de la tarea."
 
-#: clientgui/ViewProjects.cpp:1084
-msgid "Suspended by user"
-msgstr "Suspendido por el usuario"
+#: ViewWork.cpp:235
+msgid "Elapsed"
+msgstr "Transcurrido"
 
-#: clientgui/ViewProjects.cpp:1087
-msgid "Won't get new tasks"
-msgstr "No se descargarán nuevas tareas"
+#: ViewWork.cpp:236
+msgid "Remaining (estimated)"
+msgstr "Restante (estimado)"
 
-#: clientgui/ViewProjects.cpp:1090
-msgid "Project ended - OK to remove"
-msgstr "Proyecto finalizado - listo para eliminarlo"
+#: ViewWork.cpp:237
+msgid "Deadline"
+msgstr "Límite para informar"
 
-#: clientgui/ViewProjects.cpp:1093
-msgid "Will remove when tasks done"
-msgstr "Se eliminará cuando las tareas estén terminadas"
+#: ViewWork.cpp:264
+msgid "Tasks"
+msgstr "Tareas"
 
-#: clientgui/ViewProjects.cpp:1096
-msgid "Scheduler request pending"
-msgstr "Pendiente petición al Planificador"
+#: ViewWork.cpp:357
+msgid "Resuming task..."
+msgstr "Reanudando tareas..."
 
-#: clientgui/ViewProjects.cpp:1102
-msgid "Scheduler request in progress"
-msgstr "Petición al planificador en progreso"
+#: ViewWork.cpp:360
+msgid "Suspending task..."
+msgstr "Suspendiendo tareas..."
 
-#: clientgui/ViewProjects.cpp:1105
-msgid "Trickle up message pending"
-msgstr "Mensaje trickle up pendiente"
+#: ViewWork.cpp:389
+msgid "Showing graphics for task..."
+msgstr "Mostrando gráficos para la tarea..."
 
-#: clientgui/ViewProjects.cpp:1111
-msgid "Communication deferred "
-msgstr "Comunicación aplazada "
+#: ViewWork.cpp:426
+msgid "Showing VM console for task..."
+msgstr "Mostrando consola VM para la tarea..."
 
-#: clientgui/ViewResources.cpp:62
-msgid "Total disk usage"
-msgstr "Total de disco utilizado"
+#: ViewWork.cpp:479
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %s, Status: %s)"
+msgstr ""
+"¿Está seguro de querer cancelar esta tarea '%s'?\n"
+"(Progreso: %s, Estado: %s)"
 
-#: clientgui/ViewResources.cpp:83
-msgid "Disk usage by BOINC projects"
-msgstr "Disco utilizado por los proyectos BOINC"
+#: ViewWork.cpp:485
+#, c-format
+msgid "Are you sure you want to abort these %d tasks?"
+msgstr "¿Está seguro de querer abortar estas %d tareas?"
 
-#: clientgui/ViewResources.cpp:116
-msgid "Disk"
-msgstr "Disco"
+#: ViewWork.cpp:490 sg_TaskCommandPopup.cpp:256
+msgid "Abort task"
+msgstr "Cancelar tarea"
 
-#: clientgui/ViewResources.cpp:225
-msgid "no projects: 0 bytes used"
-msgstr "sin proyectos: 0 bytes usados"
+# 75%
+#: ViewWork.cpp:499
+msgid "Aborting task..."
+msgstr "Abortando tarea..."
 
-#: clientgui/ViewResources.cpp:262
-msgid "used by BOINC: "
-msgstr "utilizado por BOINC:  "
+#: ViewWork.cpp:771
+msgid "Show all tasks"
+msgstr "Mostrar todas las tareas"
 
-#: clientgui/ViewResources.cpp:272
-msgid "free, available to BOINC: "
-msgstr "libre, disponible para BOINC: "
+#: ViewWork.cpp:772
+msgid "Show all tasks."
+msgstr "Mostrar todas las tareas."
 
-#: clientgui/ViewResources.cpp:282
-msgid "free, not available to BOINC: "
-msgstr "libre, no disponible para BOINC: "
+#: ViewWork.cpp:796 sg_TaskCommandPopup.cpp:103
+msgid "Resume work for this task."
+msgstr "Reanudar el trabajo para esta tarea."
 
-#: clientgui/ViewResources.cpp:292
-msgid "free: "
-msgstr "libre: "
+#: ViewWork.cpp:802 sg_TaskCommandPopup.cpp:107
+msgid "Suspend work for this task."
+msgstr "Suspender el trabajo para esta tarea."
 
-#: clientgui/ViewResources.cpp:302
-msgid "used by other programs: "
-msgstr "utilizado por otros programas:  "
+#: WelcomePage.cpp:284
+msgid "Add project or account manager"
+msgstr "Añadir proyecto o administrador de cuentas"
 
-#: clientgui/ViewStatistics.cpp:1181
-msgid "User Total"
-msgstr "Total Usuario"
+#: WelcomePage.cpp:288
+msgid "Add project or use BOINC Account Manager"
+msgstr "Añadir proyecto o usar Administrador de Cuentas BOINC"
 
-#: clientgui/ViewStatistics.cpp:1182
-msgid "User Average"
-msgstr "Promedio Usuario"
+#: 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 es posible, añada proyectos desde el\n"
+"sitio web de %s.\n"
+"\n"
+"Los proyectos que son añadidos a través de esta opción no serán\n"
+"listados o administrados a través de %s."
 
-#: clientgui/ViewStatistics.cpp:1183
-msgid "Host Total"
-msgstr "Total Ordenador"
+#: 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 ""
+"Hay más de 30 proyectos basados en BOINC\n"
+"investigando en muchas áreas de la ciencia,\n"
+"y usted puede ser voluntario en tantos de ellos como desee.\n"
+"Usted puede unirse a un proyecto directamente,\n"
+"o usar un sitio web 'Administrador de cuentas' para elegir los proyectos."
 
-#: clientgui/ViewStatistics.cpp:1184
-msgid "Host Average"
-msgstr "Promedio Ordenador"
+#: 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 ""
+"Usted ha elegido añadir un nuevo proyecto de computación voluntaria o "
+"cambiar los proyectos\n"
+"con los que contribuye.\n"
+"\n"
+"Algunos de estos proyectos son mantenidos y dirigidos por World Community "
+"Grid, mientras que otros\n"
+"son mantenidos y dirigidos por otros investigadores u organizaciones. El "
+"programa BOINC\n"
+"puede dividir la potencia de procesamiento libre entre cualquier combinación "
+"de proyectos.\n"
+"\n"
+"Alternativamente, si usted se ha registrado con un Administrador de Cuentas "
+"BOINC, usted puede usarlo\n"
+"para elegir qué proyectos apoyar.\n"
+"\n"
+"Por favor, elija qué tipo de cambio le gustaría hacer:\n"
 
-#: clientgui/ViewStatistics.cpp:1331
-#, c-format
-msgid "Last update: %.0f days ago"
-msgstr "Última actualización: hace %.0f días"
+#: WelcomePage.cpp:339
+msgid "Use a BOINC Account Manager"
+msgstr "Usar un Administrador de Cuentas BOINC"
 
-#: clientgui/ViewStatistics.cpp:1956
-msgid "Show user total"
-msgstr "Mostrar totales del usuario"
+#: WelcomePage.cpp:352
+msgid "To continue, click Next."
+msgstr "Para continuar, haga clic en Siguiente."
 
-#: clientgui/ViewStatistics.cpp:1957
-msgid "Show total credit for user"
-msgstr "Muestra el crédito total del usuario"
+#: WelcomePage.cpp:358
+msgid "Add or change your World Community Grid projects"
+msgstr "Añadir o cambiar sus proyectos de World Community Grid"
 
-#: clientgui/ViewStatistics.cpp:1963
-msgid "Show user average"
-msgstr "Mostrar promedios del usuario"
+#: WelcomePage.cpp:361
+msgid "Add projects run by other researchers or organizations"
+msgstr "Agregar proyectos dirigidos por otros investigadores u organizaciones"
 
-#: clientgui/ViewStatistics.cpp:1964
-msgid "Show average credit for user"
-msgstr "Muestra el crédito promedio del usuario"
+#: WizardAttach.cpp:634
+msgid "Do you really want to cancel?"
+msgstr "¿Realmente desea cancelar?"
 
-#: clientgui/ViewStatistics.cpp:1970
-msgid "Show host total"
-msgstr "Mostrar totales del ordenador"
+#: WizardAttach.cpp:635
+msgid "Question"
+msgstr "Pregunta"
 
-#: clientgui/ViewStatistics.cpp:1971
-msgid "Show total credit for host"
-msgstr "Muestra el crédito total del ordenador"
+#: sg_BoincSimpleFrame.cpp:149
+msgid "Advanced View...\tCtrl+Shift+A"
+msgstr "Vista Avanzada\tCtrl+Shift+A"
 
-#: clientgui/ViewStatistics.cpp:1977
-msgid "Show host average"
-msgstr "Mostrar promedios del ordenador"
+#: sg_BoincSimpleFrame.cpp:150
+msgid "Display the advanced graphical interface."
+msgstr "Muestra la interfaz gráfica avanzada."
 
-#: clientgui/ViewStatistics.cpp:1978
-msgid "Show average credit for host"
-msgstr "Muestra el crédito promedio del ordenador"
+#: sg_BoincSimpleFrame.cpp:157
+msgid "Skin"
+msgstr "Piel"
 
-#: clientgui/ViewStatistics.cpp:1987
-msgid "< &Previous project"
-msgstr "< Proyecto &anterior"
+#: sg_BoincSimpleFrame.cpp:159
+msgid "Select the appearance of the user interface."
+msgstr "Seleccione el aspecto de la interfaz de usuario."
 
-#: clientgui/ViewStatistics.cpp:1988
-msgid "Show chart for previous project"
-msgstr "Muestra el gráfico del proyecto anterior"
+#: sg_BoincSimpleFrame.cpp:206
+#, c-format
+msgid "&%s"
+msgstr "&%s"
 
-#: clientgui/ViewStatistics.cpp:1993
-msgid "&Next project >"
-msgstr "&Siguiente proyecto >"
+#: sg_BoincSimpleFrame.cpp:390
+msgid "Default"
+msgstr "Predeterminado"
 
-#: clientgui/ViewStatistics.cpp:1994
-msgid "Show chart for next project"
-msgstr "Muestra el gráfico del siguiente proyecto"
+#: sg_BoincSimpleFrame.cpp:759
+msgid "Suspend Computing"
+msgstr "Suspender la Computación"
 
-#: clientgui/ViewStatistics.cpp:2000
-#: clientgui/ViewStatistics.cpp:2390
-msgid "Hide project list"
-msgstr "Ocultar la lista de proyectos"
+#: sg_BoincSimpleFrame.cpp:760
+msgid "Resume Computing"
+msgstr "Reanudar la Computación"
 
-#: clientgui/ViewStatistics.cpp:2001
-#: clientgui/ViewStatistics.cpp:2390
-msgid "Use entire area for graphs"
-msgstr "Usar todo el área para gráficos"
+#: sg_BoincSimpleFrame.cpp:777
+msgid "Open a window to view notices from projects or BOINC"
+msgstr "Abrir una ventana para ver avisos de los proyectos o de BOINC"
 
-#: clientgui/ViewStatistics.cpp:2006
-msgid "Mode view"
-msgstr "Modo de presentación"
+#: sg_DlgMessages.cpp:146
+msgid "Close"
+msgstr "Cerrar"
 
-#: clientgui/ViewStatistics.cpp:2010
-msgid "One project"
-msgstr "Un proyecto"
+#: sg_DlgMessages.cpp:389
+#, c-format
+msgid "%s - Notices"
+msgstr "%s - Avisos"
 
-#: clientgui/ViewStatistics.cpp:2011
-msgid "Show one chart with selected project"
-msgstr "Muestra un gráfico del proyecto seleccionado"
+#: sg_DlgPreferences.cpp:268
+msgid "This dialog controls preferences for this computer only."
+msgstr "Este diálogo contola las preferencias de este ordenador solamente."
 
-#: clientgui/ViewStatistics.cpp:2017
-msgid "All projects (separate)"
-msgstr "Todos los proyectos (separados)"
+#: sg_DlgPreferences.cpp:273
+msgid "Click OK to set preferences."
+msgstr "Pulse Aceptar para establecer las preferencias."
 
-#: clientgui/ViewStatistics.cpp:2018
-msgid "Show all projects, one chart per project"
-msgstr "Muestra todos los proyectos, un gráfico por proyecto"
+#: sg_DlgPreferences.cpp:278
+msgid ""
+"Click Clear to restore web-based settings for all preferences listed below."
+msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2024
-msgid "All projects (together)"
-msgstr "Todos los proyectos (juntos)"
+#: sg_DlgPreferences.cpp:285
+#, fuzzy
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
+msgstr "Para ajustes adicionales, seleccione Preferencias de Computación en"
 
-#: clientgui/ViewStatistics.cpp:2025
-msgid "Show one chart with all projects"
-msgstr "Muestra un gráfico con todos los proyectos"
+#: sg_DlgPreferences.cpp:313
+msgid "Do work only between:"
+msgstr "Trabajar sólo entre:"
 
-#: clientgui/ViewStatistics.cpp:2031
-msgid "All projects (sum)"
-msgstr "Todos los proyectos (suma)"
+#: sg_DlgPreferences.cpp:335
+msgid "Connect to internet only between:"
+msgstr "Conectar a Internet sólo entre:"
 
-#: clientgui/ViewStatistics.cpp:2032
-msgid "Show one chart with sum of projects"
-msgstr "Muestra un gráfico con la suma de los proyectos"
+#: sg_DlgPreferences.cpp:357 sg_DlgPreferences.cpp:374
+msgid "Use no more than:"
+msgstr "No usar más de:"
 
-#: clientgui/ViewStatistics.cpp:2053
-msgid "Statistics"
-msgstr "Estadísticas"
+#: sg_DlgPreferences.cpp:370
+msgid "of disk space"
+msgstr "de espacio en disco"
 
-#: 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 "Actualizando gráficas..."
+#: sg_DlgPreferences.cpp:387
+msgid "of the processor"
+msgstr "del procesador"
 
-#: clientgui/ViewStatistics.cpp:2394
-msgid "Show project list"
-msgstr "Mostrar la lista de proyectos"
+#: sg_DlgPreferences.cpp:391
+msgid "Do work while on battery?"
+msgstr "¿Trabajar cuando use baterías?"
 
-#: clientgui/ViewStatistics.cpp:2394
-msgid "Uses smaller area for graphs"
-msgstr "Usar un área menor para gráficos"
+#: sg_DlgPreferences.cpp:404
+msgid "Do work after idle for:"
+msgstr "Trabajar después de estar inactivo durante:"
 
-#: clientgui/ViewTransfers.cpp:169
-msgid "Retry Now"
-msgstr "Reintentar Ahora"
+#: sg_DlgPreferences.cpp:429
+#, fuzzy
+msgid "Clear all local preferences listed above and close the dialog"
+msgstr "restaurar todas las preferencias locales y cerrar la ventana"
 
-#: clientgui/ViewTransfers.cpp:170
-msgid "Retry the file transfer now"
-msgstr "Reintentar la transferencia del archivo ahora"
+#: 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 cualquier momento"
 
-#: clientgui/ViewTransfers.cpp:176
-msgid "Abort Transfer"
-msgstr "Abortar Transferencia"
+#: sg_DlgPreferences.cpp:638
+msgid "100 MB"
+msgstr "100 MB"
 
-#: clientgui/ViewTransfers.cpp:177
-msgid "Abort this file transfer.  You won't get credit for the task."
-msgstr "Abortar la transferencia de este archivo.   No obtendrá crédito por la tarea."
+#: sg_DlgPreferences.cpp:639
+msgid "200 MB"
+msgstr "200 MB"
 
-#: clientgui/ViewTransfers.cpp:188
-msgid "File"
-msgstr "Archivo"
+#: sg_DlgPreferences.cpp:640
+msgid "500 MB"
+msgstr "500 MB"
 
-#: clientgui/ViewTransfers.cpp:189
-#: clientgui/ViewWork.cpp:238
-msgid "Progress"
-msgstr "Progreso"
+#: sg_DlgPreferences.cpp:641
+msgid "1 GB"
+msgstr "1 GB"
 
-#: clientgui/ViewTransfers.cpp:190
-msgid "Size"
-msgstr "Tamaño"
+#: sg_DlgPreferences.cpp:642
+msgid "2 GB"
+msgstr "2 GB"
 
-#: clientgui/ViewTransfers.cpp:191
-msgid "Elapsed Time"
-msgstr "Tiempo transcurrido"
+#: sg_DlgPreferences.cpp:643
+msgid "5 GB"
+msgstr "5 GB"
 
-#: clientgui/ViewTransfers.cpp:192
-msgid "Speed"
-msgstr "Velocidad"
+#: sg_DlgPreferences.cpp:644
+msgid "10 GB"
+msgstr "10 GB"
 
-#: clientgui/ViewTransfers.cpp:218
-msgid "Transfers"
-msgstr "Transferencias"
+#: sg_DlgPreferences.cpp:645
+msgid "20 GB"
+msgstr "20 GB"
 
-#: clientgui/ViewTransfers.cpp:285
-msgid "Network activity is suspended - "
-msgstr "La actividad de red está suspendida - "
+#: sg_DlgPreferences.cpp:646
+msgid "50 GB"
+msgstr "50 GB"
 
-#: clientgui/ViewTransfers.cpp:287
-msgid ""
-".\n"
-"You can enable it using the Activity menu."
-msgstr ""
-".\n"
-"Usted puede habilitarlo usando el menú Actividad."
+#: sg_DlgPreferences.cpp:647
+msgid "100 GB"
+msgstr "100 GB"
 
-#: clientgui/ViewTransfers.cpp:290
-msgid "BOINC"
-msgstr "BOINC"
+#: sg_DlgPreferences.cpp:717
+#, c-format
+msgid "%d MB"
+msgstr "%d MB"
+
+#: sg_DlgPreferences.cpp:719
+#, c-format
+msgid "%4.2f GB"
+msgstr "%4.2f GB"
 
-#: clientgui/ViewTransfers.cpp:297
-msgid "Retrying transfer now..."
-msgstr "Reintentando transferencia ahora..."
+#: sg_DlgPreferences.cpp:760
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
 
-#: clientgui/ViewTransfers.cpp:335
-msgid "Aborting transfer..."
-msgstr "Cancelando la transferencia..."
+#: sg_DlgPreferences.cpp:796
+msgid "0 (Run Always)"
+msgstr "0 (Ejecutar siempre)"
 
-#: clientgui/ViewTransfers.cpp:348
+#: sg_DlgPreferences.cpp:799
 #, 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 ""
-"¿Está seguro de que quiere abortar la transferencia de este fichero  '%s'?\n"
-"NOTA: Abortar una transferencia invalidará la tarea y usted\n"
-"no recibirá créditos por ella."
+msgid "%d"
+msgstr "%d"
 
-#: clientgui/ViewTransfers.cpp:354
-msgid "Abort File Transfer"
-msgstr "Cancelar Transferencia de Archivo"
+#: sg_DlgPreferences.cpp:1029
+msgid "Do you really want to clear all local preferences?\n"
+msgstr "¿Realmente desea borrar todas las preferencias locales?"
 
-#: clientgui/ViewTransfers.cpp:785
-msgid "Upload"
-msgstr "Enviar"
+#: sg_ProjectPanel.cpp:72
+msgid "Add Project"
+msgstr "Añadir proyecto"
 
-#: clientgui/ViewTransfers.cpp:785
-msgid "Download"
-msgstr "Descargar"
+#: sg_ProjectPanel.cpp:73
+msgid "Synchronize"
+msgstr "Sincronizar"
 
-#: clientgui/ViewTransfers.cpp:789
-msgid "retry in "
-msgstr "reintentar en "
+#: sg_ProjectPanel.cpp:74
+msgid "Work done for this project"
+msgstr "Trabajo realizado para este proyecto"
 
-#: clientgui/ViewTransfers.cpp:791
-msgid "failed"
-msgstr "falló"
+#: sg_ProjectPanel.cpp:77
+msgid "Synchronize projects with account manager system"
+msgstr "Sincronizar los proyectos con el sistema de administrador de cuentas"
 
-#: clientgui/ViewTransfers.cpp:794
-msgid "suspended"
-msgstr "suspendido"
+#: sg_ProjectPanel.cpp:124
+msgid "Select a project to access with the controls below"
+msgstr "Seleccione un proyecto al que acceder con los controles de abajo"
 
-#: clientgui/ViewTransfers.cpp:799
-msgid "active"
-msgstr "activo"
+#: sg_ProjectPanel.cpp:145
+msgid "Project Web Pages"
+msgstr "Páginas Web del Proyecto"
 
-#: clientgui/ViewTransfers.cpp:801
-msgid "pending"
-msgstr "pendiente"
+#: sg_ProjectPanel.cpp:149
+msgid "Project Commands"
+msgstr "Comandos del Proyecto"
 
-#: clientgui/ViewTransfers.cpp:808
-msgid " (project backoff: "
-msgstr "  (proyecto parado:_"
+#: sg_ProjectPanel.cpp:267
+#, c-format
+#, c-format, fuzzy
+msgid "Pop up a menu of web sites for project %s"
+msgstr "Saca un menú de sitios web del proyecto %s"
 
-#: clientgui/ViewWork.cpp:192
-#: clientgui/ViewWork.cpp:782
-msgid "Show active tasks"
-msgstr "Mostrar tareas activas"
+#: sg_ProjectPanel.cpp:269
+#, c-format
+msgid "Pop up a menu of commands to apply to project %s"
+msgstr "Saca un menú de comandos a aplicar al proyecto %s"
 
-#: clientgui/ViewWork.cpp:193
-#: clientgui/ViewWork.cpp:783
-msgid "Show only active tasks."
-msgstr "Mostrar sólo tareas activas."
+#: sg_TaskCommandPopup.cpp:67
+msgid "Suspend this task."
+msgstr "Suspender esta tarea."
 
-#: clientgui/ViewWork.cpp:206
-msgid "Show VM Console"
-msgstr "Mostrar Consola VM"
+#: sg_TaskCommandPopup.cpp:73
+msgid "Abandon this task. You will get no credit for it."
+msgstr "Abandonar este tarea. No obtendrá crédito por ella."
 
-#: clientgui/ViewWork.cpp:207
-msgid "Show VM Console in a window."
-msgstr "Mostrar la Consola VM en una ventana."
+#: sg_TaskCommandPopup.cpp:251
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %.1lf%%, Status: %s)"
+msgstr ""
+"¿Está seguro de querer cancelar la tarea '%s'?\n"
+"(Progreso: %.1lf%%, Estado: %s)"
 
-#: clientgui/ViewWork.cpp:214
-msgid "Suspend work for this result."
-msgstr "Suspender el trabajo para este resultado."
+#: sg_TaskPanel.cpp:464
+msgid "You don't have any projects.  Please Add a Project."
+msgstr "Usted no tiene ningún proyecto. Por favor únase a uno."
 
-#: clientgui/ViewWork.cpp:221
-msgid "Abandon work on the result. You will get no credit for it."
-msgstr "Abandonar el trabajo con el resultado. No conseguirá crédito por él."
+#: sg_TaskPanel.cpp:465
+msgid "Not available"
+msgstr "No disponible"
 
-#: clientgui/ViewWork.cpp:240
-msgid "Elapsed"
-msgstr "Transcurrido"
+#: sg_TaskPanel.cpp:476
+msgid "Tasks:"
+msgstr "Tareas:"
 
-#: clientgui/ViewWork.cpp:241
-msgid "Remaining (estimated)"
-msgstr "Restante (estimado)"
+#: sg_TaskPanel.cpp:482
+msgid "Select a task to access"
+msgstr "Seleccione una tarea a la que acceder"
 
-#: clientgui/ViewWork.cpp:242
-msgid "Deadline"
-msgstr "Límite para informar"
+#: sg_TaskPanel.cpp:493
+msgid "From:"
+msgstr "De:"
 
-#: clientgui/ViewWork.cpp:269
-msgid "Tasks"
-msgstr "Tareas"
+#: sg_TaskPanel.cpp:547
+msgid "This task's progress"
+msgstr "Progreso de esta tarea"
 
-#: clientgui/ViewWork.cpp:362
-msgid "Resuming task..."
-msgstr "Reanudando tareas..."
+#: sg_TaskPanel.cpp:565
+msgid "Task Commands"
+msgstr "Comandos de la Tarea"
 
-#: clientgui/ViewWork.cpp:365
-msgid "Suspending task..."
-msgstr "Suspendiendo tareas..."
+#: sg_TaskPanel.cpp:566
+msgid "Pop up a menu of commands to apply to this task"
+msgstr "Visualizar un menú de comandos aplicables a esta tarea"
 
-#: clientgui/ViewWork.cpp:394
-msgid "Showing graphics for task..."
-msgstr "Mostrando gráficos para la tarea..."
+#: sg_TaskPanel.cpp:701
+#, c-format
+msgid "Application: %s"
+msgstr "Aplicación: %s"
 
-#: clientgui/ViewWork.cpp:431
-msgid "Showing VM console for task..."
-msgstr "Mostrando consola VM para la tarea..."
+#: sg_TaskPanel.cpp:724
+#, c-format
+msgid "%.3f%%"
+msgstr "%.3f%%"
+
+#: sg_TaskPanel.cpp:732
+msgid "Application: Not available"
+msgstr "Aplicación: No disponible"
+
+#: sg_TaskPanel.cpp:832
+msgid "Not Available"
+msgstr "No Disponible"
 
-#: clientgui/ViewWork.cpp:484
+#: sg_TaskPanel.cpp:847
 #, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %s, Status: %s)"
-msgstr ""
-"¿Está seguro de querer cancelar esta tarea '%s'?\n"
-"(Progreso: %s, Estado: %s)"
+msgid "Elapsed: %s"
+msgstr "Transcurrido: %s"
 
-#: clientgui/ViewWork.cpp:490
+#: sg_TaskPanel.cpp:861
 #, c-format
-msgid "Are you sure you want to abort these %d tasks?"
-msgstr "¿Está seguro de querer abortar estas %d tareas?"
+msgid "Remaining (estimated): %s"
+msgstr "Restante (estimado): %s"
 
-# 75%
-#: clientgui/ViewWork.cpp:504
-msgid "Aborting task..."
-msgstr "Abortando tarea..."
+#: sg_TaskPanel.cpp:876
+#, c-format
+msgid "Status: %s"
+msgstr "Estado: %s"
 
-#: clientgui/ViewWork.cpp:776
-msgid "Show all tasks"
-msgstr "Mostrar todas las tareas"
+#: sg_TaskPanel.cpp:1223
+msgid "Retrieving current status."
+msgstr "Recuperando estado actual."
 
-#: clientgui/ViewWork.cpp:777
-msgid "Show all tasks."
-msgstr "Mostrar todas las tareas."
+#: sg_TaskPanel.cpp:1229
+msgid "Downloading work from the server."
+msgstr "Descargando trabajo del servidor."
 
-#: clientgui/WelcomePage.cpp:284
-msgid "Add project or account manager"
-msgstr "Añadir proyecto o administrador de cuentas"
+#: sg_TaskPanel.cpp:1234
+msgid "Processing Suspended:  Running On Batteries."
+msgstr "Procesamiento Suspendido: Funcionando con Baterías."
 
-#: clientgui/WelcomePage.cpp:288
-msgid "Add project or use BOINC Account Manager"
-msgstr "Añadir proyecto o usar Administrador de Cuentas BOINC"
+#: sg_TaskPanel.cpp:1236
+msgid "Processing Suspended:  User Active."
+msgstr "Procesamiento Suspendido: Usuario 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 ""
-"Si es posible, añada proyectos desde el\n"
-"sitio web de %s.\n"
-"\n"
-"Los proyectos que son añadidos a través de esta opción no serán\n"
-"listados o administrados a través de %s."
+#: sg_TaskPanel.cpp:1238
+msgid "Processing Suspended:  User paused processing."
+msgstr "Procesamiento Suspendido: Usuario suspendió actividad."
 
-#: 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 ""
-"Hay más de 30 proyectos basados en BOINC\n"
-"investigando en muchas áreas de la ciencia,\n"
-"y usted puede ser voluntario en tantos de ellos como desee.\n"
-"Usted puede unirse a un proyecto directamente,\n"
-"o usar un sitio web 'Administrador de cuentas' para elegir los proyectos."
+#: sg_TaskPanel.cpp:1240
+msgid "Processing Suspended:  Time of Day."
+msgstr "Procesamiento Suspendido: Hora del Día."
 
-#: 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 ""
-"Usted ha elegido añadir un nuevo proyecto de computación voluntaria o cambiar los proyectos\n"
-"con los que contribuye.\n"
-"\n"
-"Algunos de estos proyectos son mantenidos y dirigidos por World Community Grid, mientras que otros\n"
-"son mantenidos y dirigidos por otros investigadores u organizaciones. El programa BOINC\n"
-"puede dividir la potencia de procesamiento libre entre cualquier combinación de proyectos.\n"
-"\n"
-"Alternativamente, si usted se ha registrado con un Administrador de Cuentas BOINC, usted puede usarlo\n"
-"para elegir qué proyectos apoyar.\n"
-"\n"
-"Por favor, elija qué tipo de cambio le gustaría hacer:\n"
+#: sg_TaskPanel.cpp:1242
+msgid "Processing Suspended:  Benchmarks Running."
+msgstr "Procesamiento Suspendido: Ejecutando Pruebas Rendimiento."
 
-#: clientgui/WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
-msgstr "Usar un Administrador de Cuentas BOINC"
+#: sg_TaskPanel.cpp:1244
+msgid "Processing Suspended."
+msgstr "Procesamiento Suspendido."
 
-#: clientgui/WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
-msgstr "Añadir o cambiar sus proyectos de World Community Grid"
+#: sg_TaskPanel.cpp:1248
+msgid "Waiting to contact project servers."
+msgstr "Esperando a contactar con los servidores del proyecto."
 
-#: clientgui/WelcomePage.cpp:361
-msgid "Add projects run by other researchers or organizations"
-msgstr "Agregar proyectos dirigidos por otros investigadores u organizaciones"
+#: sg_TaskPanel.cpp:1252 sg_TaskPanel.cpp:1261
+msgid "Retrieving current status"
+msgstr "Recuperando estado actual"
 
-#: clientgui/WizardAttach.cpp:673
-msgid "Do you really want to cancel?"
-msgstr "¿Realmente desea cancelar?"
+#: sg_TaskPanel.cpp:1256
+msgid "No work available to process"
+msgstr "No hay trabajo disponible para procesar"
 
-#: clientgui/WizardAttach.cpp:674
-msgid "Question"
-msgstr "Pregunta"
+#: sg_TaskPanel.cpp:1258
+msgid "Unable to connect to the core client"
+msgstr "No se puede conectar al cliente núcleo"
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
+#: wizardex.cpp:377 wizardex.cpp:553
 msgid "&Next >"
 msgstr "&Siguiente >"
 
-#: clientgui/wizardex.cpp:383
+#: wizardex.cpp:383
 msgid "< &Back"
 msgstr "< &Anterior"
 
-#: clientgui/wizardex.cpp:553
+#: wizardex.cpp:553
 msgid "&Finish"
 msgstr "&Finalizar"
 
-#: clientgui/common/wxPieCtrl.cpp:64
-msgid "Pie Ctrl"
-msgstr "Control de Gráficas"
+#: mac/Mac_GUI.cpp:110
+msgid "Preferences…"
+msgstr "Preferencias..."
 
-#: clientgui/mac/Mac_GUI.cpp:35
+#: mac/Mac_GUI.cpp:122
 msgid "Services"
 msgstr "Servicios"
 
-#: clientgui/mac/Mac_GUI.cpp:36
+#: mac/Mac_GUI.cpp:144
 #, c-format
 msgid "Hide %s"
 msgstr "Ocultar %s"
 
-#: clientgui/mac/Mac_GUI.cpp:37
+#: mac/Mac_GUI.cpp:158
 msgid "Hide Others"
 msgstr "Ocultar los Otros"
 
-#: clientgui/mac/Mac_GUI.cpp:38
+#: mac/Mac_GUI.cpp:172
 msgid "Show All"
 msgstr "Mostrar Todo"
 
-#: clientgui/mac/Mac_GUI.cpp:39
+#: mac/Mac_GUI.cpp:186
 #, c-format
 msgid "Quit %s"
 msgstr "Cerrar %s"
 
-#: clientgui/DlgAdvPreferences.h:30
-msgid "specify work start and stop hours in format HH:MM-HH:MM"
-msgstr "especificar horas de comienzo y final del trabajo en el formato HH:MM-HH:MM"
-
-#: clientgui/DlgAdvPreferences.h:31
-msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
-msgstr "especificar horas de comienzo y final de uso de la red en el formato HH:MM-HH:MM"
-
-# 98%
-#~ msgid ""
-#~ "(C) 2003-2013 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2013 Universidad de California, Berkeley.\n"
-#~ "Reservados Todos los Derechos."
-#, c-format
-#~ msgid "%s - Preferences"
-#~ msgstr "%s - Preferencias"
-
-#, no-c-format
-#~ msgid "% CPU time"
-#~ msgstr "% del tiempo de la CPU"
-#~ msgid "KBytes/sec."
-#~ msgstr "KB/s"
-#~ msgid "Mbytes"
-#~ msgstr "Mbytes"
-#~ msgid "every"
-#~ msgstr "cada"
-#~ msgid "days"
-#~ msgstr "días"
-#~ msgid "Gigabytes disk space"
-#~ msgstr "gigabytes de espacio en disco"
-#~ msgid "Running, high priority"
-#~ msgstr "Ejecutando, alta prioridad"
-#~ msgid " (Scheduler wait: "
-#~ msgstr "  (Planificador en espera: "
-#~ msgid " (Scheduler wait)"
-#~ msgstr "  (Planificador en espera)"
-#~ msgid " (Waiting for network access)"
-#~ msgstr " (Esperando acceso a la red)"
-#~ msgid "Preferences…"
-#~ msgstr "Preferencias..."
 #~ msgid "I do not agree with the terms of use."
 #~ msgstr "No acepto los términos de uso:"
+
 #~ msgid "Click Clear to restore web-based settings."
 #~ msgstr "Haga clic en Restablecer para restaurar la configuración basada en web."
+
 #~ msgid "For additional settings, select Computing Preferences in "
 #~ msgstr "Para ajustes adicionales, seleccione Preferencias de Computación en"
+
 #~ msgid "the Advanced View."
 #~ msgstr "la Vista Avanzada."
+
 #~ msgid "Workunit name"
 #~ msgstr "Nombre unidad trabajo"
+
 #~ msgid "invalid float"
 #~ msgstr "número inválido"
+
 #~ msgid "Display the advanced (accessible) graphical interface."
 #~ msgstr "Cambiar al interfaz gráfico avanzado (accesible)."
+
 #~ msgid "Paused: Other work running"
 #~ msgstr "Detenido: Otro trabajo ejecutándose"
+
 #~ msgid "Paused: User initiated.  Click 'Resume' to continue"
 #~ msgstr "En pausa: Usuario iniciado.   Pulse 'Reanudar' para continuar"
+
 #~ msgid "Paused: User active"
 #~ msgstr "Detenido: Usuario activo"
+
 #~ msgid "Paused: Computer on battery"
 #~ msgstr "Detenido: Ordenador funcionando con batería"
+
 #~ msgid "Paused: Time of Day"
 #~ msgstr "Detenido: Hora del Día."
+
 #~ msgid "Paused: Benchmarks running"
 #~ msgstr "Detenido: Ejecutando pruebas de rendimiento."
+
 #~ msgid "Paused"
 #~ msgstr "Detenido"
+
 #~ msgid "Paused: Application start delayed"
 #~ msgstr "En pausa: Inicio del programa aplazado"
+
 #~ msgid "Click to show project graphics"
 #~ msgstr "Pulse para mostrar los gráficos del proyecto"
+
 #~ msgid "Open a window to view messages"
 #~ msgstr "Abrir una ventana para ver los mensajes"
+
 #~ msgid "Stop all activity"
 #~ msgstr "Detener toda actividad"
+
 #~ msgid "Resume activity"
 #~ msgstr "Continuar actividad"
+
 #~ msgid "Open a window to set your preferences"
 #~ msgstr "Abre una ventana para establecer sus preferencias"
+
 #~ msgid "Switch to the BOINC advanced view"
 #~ msgstr "Cambiar a la vista avanzada de BOINC"
+
 #~ msgid "My Projects:"
 #~ msgstr "Mis proyectos:"
 
@@ -4157,22 +4041,29 @@ msgstr "especificar horas de comienzo y final de uso de la red en el formato HH:
 #, c-format
 #~ msgid "%d hr %d min %d sec"
 #~ msgstr "%d hr %d min %d seg"
+
 #~ msgid "Are you sure you want to display graphics on a remote machine?"
 #~ msgstr "¿Está seguro que desea mostrar los gráficos en un ordenador remoto?"
+
 #~ msgid "Application: "
 #~ msgstr "Aplicación:"
+
 #~ msgid "Time Remaining: "
 #~ msgstr "Tiempo Restante:"
+
 #~ msgid "Elapsed Time: "
 #~ msgstr "Tiempo transcurrido:"
+
 #~ msgid "Account manager website"
 #~ msgstr "Sitio web del administrador de cuentas"
+
 #~ msgid "Account Manager &URL:"
 #~ msgstr "U&RL del Administrador de Cuentas:"
 
 #, c-format
 #~ msgid "%s &website"
 #~ msgstr "Página &web de %s"
+
 #~ msgid "Notice List"
 #~ msgstr "Lista de Avisos"
 
@@ -4183,73 +4074,102 @@ msgstr "especificar horas de comienzo y final de uso de la red en el formato HH:
 #, c-format
 #~ msgid "%s; received from %s; on %s"
 #~ msgstr "%s; recibido de %s; en %s"
+
 #~ msgid "Click"
 #~ msgstr "Pulsar"
+
 #~ msgid "Project List"
 #~ msgstr "Lista de Proyectos"
+
 #~ msgid "Nvidia GPU Supported"
 #~ msgstr "GPU Nvidia soportada"
+
 #~ msgid "ATI GPU Supported"
 #~ msgstr "GPU ATI soportada"
+
 #~ msgid "Project Website"
 #~ msgstr "Sitio Web del proyecto"
+
 #~ msgid "One or more items failed to load from the Internet."
 #~ msgstr "Uno o más elementos fallaron la carga desde Internet."
 
 # 88%
 #~ msgid "Retry now"
 #~ msgstr "Reintentar ahora"
+
 #~ msgid "10%"
 #~ msgstr "10%"
+
 #~ msgid "20%"
 #~ msgstr "20%"
+
 #~ msgid "30%"
 #~ msgstr "30%"
+
 #~ msgid "40%"
 #~ msgstr "40%"
+
 #~ msgid "50%"
 #~ msgstr "50%"
+
 #~ msgid "60%"
 #~ msgstr "60%"
+
 #~ msgid "70%"
 #~ msgstr "70%"
+
 #~ msgid "80%"
 #~ msgstr "80%"
+
 #~ msgid "90%"
 #~ msgstr "90%"
+
 #~ msgid "100%"
 #~ msgstr "100%"
+
 #~ msgid "1"
 #~ msgstr "1"
+
 #~ msgid "3"
 #~ msgstr "3"
+
 #~ msgid "5"
 #~ msgstr "5"
+
 #~ msgid "10"
 #~ msgstr "10"
+
 #~ msgid "15"
 #~ msgstr "15"
+
 #~ msgid "30"
 #~ msgstr "30"
+
 #~ msgid "60"
 #~ msgstr "60"
+
 #, c-format
 #~ msgid "Pop up a menu of websites for project %s"
 #~ msgstr "Saca un menú de sitios web del proyecto %s"
+
 #~ msgid ""
 #~ "for accessibility support, please select advanced from the view menu or type "
 #~ "command shift a"
 #~ msgstr ""
 #~ "para soporte para accesibilidad, por favor seleccione avanzada en el menu "
 #~ "ver o pulse ctrl shift a"
+
 #~ msgid "This panel contains graphs showing user totals for projects"
 #~ msgstr ""
 #~ "Este panel contiene gráficos que muestran los totales del usuario para los "
 #~ "proyectos"
+
 #~ msgid "list headers"
 #~ msgstr "encabezados de la lista"
+
 #~ msgid "list of events"
 #~ msgstr "lista de eventos"
+
 #~ msgid "list of events is empty"
 #~ msgstr "la lista de eventos está vacía"
 
@@ -4272,6 +4192,7 @@ msgstr "especificar horas de comienzo y final de uso de la red en el formato HH:
 #, c-format
 #~ msgid "; column %d of %d; "
 #~ msgstr "; columna %d de %d; "
+
 #~ msgid "list is empty"
 #~ msgstr "la lista está vacía"
 
@@ -4290,8 +4211,10 @@ msgstr "especificar horas de comienzo y final de uso de la red en el formato HH:
 #, c-format
 #~ msgid "; row %d of %d; "
 #~ msgstr "; fila %d de %d; "
+
 #~ msgid "blank"
 #~ msgstr "en blanco"
+
 #~ msgid "list of projects or account managers"
 #~ msgstr "lista de proyectos o administradores de cuenta"
 
@@ -4302,18 +4225,22 @@ msgstr "especificar horas de comienzo y final de uso de la red en el formato HH:
 #, c-format
 #~ msgid "row %d of %d; "
 #~ msgstr "fila %d de %d; "
+
 #~ msgid "The minimum username length for this project is 1. Please enter a different username."
 #~ msgstr ""
 #~ "La longitud mínima de usuario para este proyecto es 1. Por favor, introduzca "
 #~ "un usuario diferente."
+
 #~ msgid "The minimum username length for this account manager is 1. Please enter a different username."
 #~ msgstr ""
 #~ "La longitud mínima de usuario para este administrador de cuentas es 1. Por "
 #~ "favor, introduzca un usuario diferente."
+
 #~ msgid "The minimum email address length for this project is 1. Please enter a different email address."
 #~ msgstr ""
 #~ "La longitud mínima de correo electrónico para este proyecto es 1. Por favor, "
 #~ "introduzca un correo electrónico diferente."
+
 #~ msgid "The minimum email address length for this account manager is 1. Please enter a different email address."
 #~ msgstr ""
 #~ "La longitud mínima de correo electrónico para este administrador de cuentas "
@@ -4330,6 +4257,7 @@ msgstr "especificar horas de comienzo y final de uso de la red en el formato HH:
 #~ msgstr ""
 #~ "La longitud mínima de clave para este administrador de cuentas es %d. Por "
 #~ "favor introduzca una clave diferente."
+
 #~ msgid ""
 #~ "An error has occurred;\n"
 #~ "check the Event Log for details.\n"
@@ -4360,28 +4288,50 @@ msgstr "especificar horas de comienzo y final de uso de la red en el formato HH:
 #, c-format
 #~ msgid "OnDropTarget: index by HitTest = %i"
 #~ msgstr "AlSoltarObjetivo: índice por HitTest = %i"
+
+#~ msgid "Pie Ctrl"
+#~ msgstr "Control de Gráficas"
+
+#~ msgid "specify work start and stop hours in format HH:MM-HH:MM"
+#~ msgstr ""
+#~ "especificar horas de comienzo y final del trabajo en el formato HH:MM-HH:MM"
+
+#~ msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
+#~ msgstr ""
+#~ "especificar horas de comienzo y final de uso de la red en el formato HH:MM-"
+#~ "HH:MM"
+
 #~ msgid "Identify your account "
 #~ msgstr "Identifique su cuenta "
+
 #~ msgid "Read config file"
 #~ msgstr "Leer &fichero de configuración"
+
 #~ msgid "Read configuration info from cc_config.xml"
 #~ msgstr "Leer información de configuración de cc_config.xml"
+
 #~ msgid ""
 #~ "(C) 2003-2011 University of California, Berkeley.\n"
 #~ "All Rights Reserved."
 #~ msgstr ""
 #~ "(C) 2003-2011 Universidad de California, Berkeley.\n"
 #~ "Reservados Todos los Derechos."
+
 #~ msgid "NVIDIA GPU"
 #~ msgstr "GPU NVIDIA"
+
 #~ msgid "ATI GPU"
 #~ msgstr "GPU ATI"
+
 #~ msgid "Multicore CPU Supported"
 #~ msgstr "CPU multinúcleo soportada"
+
 #~ msgid "%s: %.0f"
 #~ msgstr "%s: %.0f"
+
 #~ msgid "Click 'Retry now' to transfer the file now"
 #~ msgstr "Haga clic en 'Reintentar Ahora' para tranferir ahora el archivo"
+
 #~ msgid ""
 #~ "Click 'Abort transfer' to delete the file from the transfer queue. This "
 #~ "will prevent you from being granted credit for this result."
@@ -4389,8 +4339,10 @@ msgstr "especificar horas de comienzo y final de uso de la red en el formato HH:
 #~ "Haga clic en 'Abortar Transferencia' para eliminar el archivo de la cola "
 #~ "de transferencias. Esto le impedirá conseguir los créditos por este "
 #~ "resultado."
+
 #~ msgid "Aborting result..."
 #~ msgstr "Cancelando resultado..."
+
 #~ msgid ""
 #~ "You have chosen to add a new BOINC project.  Adding a new\n"
 #~ "project means that you will be connecting your computer to a new "
@@ -4422,34 +4374,47 @@ msgstr "especificar horas de comienzo y final de uso de la red en el formato HH:
 #~ "\n"
 #~ "Para cambiar qué programas de investigación le son enviados desde\n"
 #~ "World Community Grid por favor pulse el siguiente botón: "
+
 #~ msgid "Change Research Applications at World Community Grid"
 #~ msgstr "Cambiar Programas de Investigación en World Community Grid"
+
 #~ msgid "Don't fetch NVIDIA GPU tasks"
 #~ msgstr "No buscar tareas para la GPU NVIDIA"
+
 #~ msgid "NVIDIA GPU work fetch deferred for"
 #~ msgstr "Búsqueda de trabajo para la GPU NVIDIA aplazada"
+
 #~ msgid "NVIDIA GPU work fetch deferral interval"
 #~ msgstr "Intervalo de búsqueda de trabajo para la GPU NVIDIA"
+
 #~ msgid "Don't fetch ATI GPU tasks"
 #~ msgstr "No buscar tareas para la GPU ATI"
+
 #~ msgid "ATI GPU work fetch deferred for"
 #~ msgstr "Búsqueda de trabajo para la GPU ATI aplazada"
+
 #~ msgid "ATI GPU work fetch deferral interval"
 #~ msgstr "Intervalo de búsqueda de trabajo para la GPU ATI"
+
 #~ msgid "Web sites"
 #~ msgstr "Páginas web"
+
 #~ msgid "Connect about every"
 #~ msgstr "Conectar cada"
+
 #~ msgid ""
 #~ "this computer is connected to the Internet about every X days\n"
 #~ "(0 if it's always connected)"
 #~ msgstr ""
 #~ "este ordenador se conecta a Internet aproximadamente cada X días\n"
 #~ "(0 si está siempre conectado)"
+
 #~ msgid "days (max. 10)"
 #~ msgstr "días(máx.10)"
+
 #~ msgid "Display and network &options..."
 #~ msgstr "&Opciones visualización y red..."
+
 #~ msgid ""
 #~ "You have requested to exit the %s,\n"
 #~ "which allows you to view and manage\n"
@@ -4465,91 +4430,133 @@ msgstr "especificar horas de comienzo y final de uso de la red en el formato HH:
 #~ "Si también desea parar de ejecutar los programas científicos cuando "
 #~ "usted\n"
 #~ "salga del Administrador, entonces escoja entre las siguientes opciones:"
+
 #~ msgid "Stop running science applications when exiting the Manager"
 #~ msgstr ""
 #~ "Parar de ejecutar las aplicaciones científicas al salir del Administrador"
+
 #~ msgid "CPU work fetch priority"
 #~ msgstr "Búsqueda de trabajo para la CPU prioritaria"
+
 #~ msgid "NVIDIA GPU scheduling priority"
 #~ msgstr "Planificación de GPU NVIDIA prioritaria"
+
 #~ msgid "NVIDIA GPU work fetch priority"
 #~ msgstr "Búsqueda de trabajo para la GPU NVIDIA prioritaria"
+
 #~ msgid "ATI GPU scheduling priority"
 #~ msgstr "Planificación de GPU ATI prioritaria"
+
 #~ msgid "ATI GPU work fetch priority"
 #~ msgstr "Búsqueda de trabajo para la GPU ATI prioritaria"
+
 #~ msgid "%s - Options"
 #~ msgstr "%s - Opciones"
+
 #~ msgid "Retrieving host information; please wait..."
 #~ msgstr "Recuperando información del ordenador; por favor espere..."
+
 #~ msgid " (waiting for GPU memory)"
 #~ msgstr " (esperando por memoria de la GPU)"
+
 #~ msgid "%s - Messages"
 #~ msgstr "%s - Mensajes"
+
 #~ msgid "Skin:"
 #~ msgstr "Piel:"
+
 #~ msgid "Preferences"
 #~ msgstr "Preferencias"
+
 #~ msgid "I want to customize my preferences for this computer only."
 #~ msgstr "Quiero personalizar mis preferencias sólo para este ordenador."
+
 #~ msgid "Customized Preferences"
 #~ msgstr "Preferencias Personalizadas"
+
 #~ msgid "Upload suspended - "
 #~ msgstr "Envío suspendido - "
+
 #~ msgid "Download suspended - "
 #~ msgstr "Descarga suspendida - "
+
 #~ msgid "Upload pending"
 #~ msgstr "Envío pendiente"
+
 #~ msgid "Download pending"
 #~ msgstr "Descarga pendiente"
+
 #~ msgid "Get help with BOINC"
 #~ msgstr "Consiga ayuda con BOINC"
+
 #~ msgid "Event Log..."
 #~ msgstr "Registro de Sucesos..."
+
 #~ msgid "error"
 #~ msgstr "error"
+
 #~ msgid "A new version of BOINC is available."
 #~ msgstr "Hay diponible una nueva versión de BOINC."
+
 #~ msgid "Download it."
 #~ msgstr "Descárgalo."
+
 #~ msgid "Couldn't write state file; check directory permissions"
 #~ msgstr ""
 #~ "No se pudo escribir en el archivo state; compuebe los permisos de la "
 #~ "carpeta"
+
 #~ msgid "The HTTP_PROXY environment variable must specify an HTTP proxy"
 #~ msgstr "La variable de entorno HTTP_PROXY debe especificar un proxy HTTP"
+
 #~ msgid "Attaching to project or account manager..."
 #~ msgstr "Conectando a proyecto o administrador de cuentas..."
+
 #~ msgid "%s - Detach from %s"
 #~ msgstr "%s - Separarse de %s"
+
 #~ msgid "Retrying communications."
 #~ msgstr "Reintentando comunicaciones."
+
 #~ msgid "Failed to attach to project"
 #~ msgstr "Fallo al unirse a un proyecto"
+
 #~ msgid "Failed to attach to account manager"
 #~ msgstr "Fallo al unirse al administrador de cuentas"
+
 #~ msgid "Attached to account manager"
 #~ msgstr "Unido al administrador de cuentas"
+
 #~ msgid "You are now successfully attached to the %s system."
 #~ msgstr "Usted ahora se ha unido con éxito al sistema %s."
+
 #~ msgid "You are now successfully attached to this account manager."
 #~ msgstr "Usted se ha unido con éxito a este administrador de cuentas."
+
 #~ msgid "News Feeds"
 #~ msgstr "Fuentes de noticias"
+
 #~ msgid "Display the latest news about BOINC"
 #~ msgstr "Mostrar las últimas noticias sobre BOINC"
+
 #~ msgid "not attached to any BOINC project: 0 bytes"
 #~ msgstr "no unido a ningún proyecto BOINC: 0 bytes"
+
 #~ msgid "All projects"
 #~ msgstr "Todos los proyectos"
+
 #~ msgid "Attach to project"
 #~ msgstr "Unirse a un pro&yecto"
+
 #~ msgid "Attach to account manager"
 #~ msgstr "Unirse a un administrador de cuentas"
+
 #~ msgid "Attach to a project"
 #~ msgstr "Unirse a un proyecto"
+
 #~ msgid "%s needs to connect to the Internet.  Please click to open %s."
 #~ msgstr "%s necesita conectar a Internet. Por favor haga clic para abrir %s."
+
 #~ msgid ""
 #~ "%s is unable to communicate with a project and needs an Internet "
 #~ "connection.\n"
@@ -4560,6 +4567,7 @@ msgstr "especificar horas de comienzo y final de uso de la red en el formato HH:
 #~ "Internet.\n"
 #~ "Por favor, conéctese a Internet, y entonces seleccione la opción "
 #~ "'Ejecutar comunicaciones de red' dentro del menú Avanzado."
+
 #~ msgid ""
 #~ "%s couldn't do Internet communication, and no default connection is "
 #~ "selected.\n"
@@ -4570,110 +4578,156 @@ msgstr "especificar horas de comienzo y final de uso de la red en el formato HH:
 #~ "por defecto.\n"
 #~ "Por favor conéctese a Internet, o especifique una conexión por defecto\n"
 #~ "en Avanzado/Opciones/Conexiones."
+
 #~ msgid "One or more notices are now available for viewing."
 #~ msgstr "Uno o más avisos están disponibles."
+
 #~ msgid "Attached to project"
 #~ msgstr "Unido a un proyecto"
+
 #~ msgid "You are now successfully attached to this project."
 #~ msgstr "Usted se ha unido con éxito a este proyecto."
+
 #~ msgid "Attached to %s"
 #~ msgstr "Unido a %s"
+
 #~ msgid "Detach when done"
 #~ msgstr "Separarse cuando termine"
+
 #~ msgid "Retrieving notices..."
 #~ msgstr "Recuperando avisos..."
+
 #~ msgid "Detach"
 #~ msgstr "Separarse"
+
 #~ msgid "Detaching from project..."
 #~ msgstr "Separándose del proyecto..."
+
 #~ msgid "Are you sure you want to detach from project '%s'?"
 #~ msgstr "¿Está seguro de que quiere separarse del proyecto '%s'?"
+
 #~ msgid "Detach from Project"
 #~ msgstr "Separarse del proyecto"
+
 #~ msgid "Message from project server:"
 #~ msgstr "Mensaje del servidor del proyecto:"
+
 #~ msgid "XML syntax error in"
 #~ msgstr "Error de sintaxis XML en"
+
 #~ msgid "Can't resolve hostname in"
 #~ msgstr "No se puede resolver el nombre del host en"
+
 #~ msgid "Unrecognized tag in"
 #~ msgstr "Etiqueta no reconocida en"
+
 #~ msgid "Missing start tag in"
 #~ msgstr "Etiqueta de inicio perdida en"
+
 #~ msgid "Unparsed tag in"
 #~ msgstr "Etiqueta no analizada sintácticamente en"
+
 #~ msgid "Missing end tag in"
 #~ msgstr "Etiqueta de final perdida en"
+
 #~ msgid ""
 #~ "BOINC can't access Internet - check network connection or proxy "
 #~ "configuration."
 #~ msgstr ""
 #~ "BOINC no puede acceder a Internet - compruebe la conexión a la red o la "
 #~ "configuración proxy."
+
 #~ msgid "Attach this computer to a project or account manager"
 #~ msgstr "Unir este ordenador a un proyecto o administrador de cuentas"
+
 #~ msgid " - user active"
 #~ msgstr "- usuario activo"
+
 #~ msgid " - computation suspended"
 #~ msgstr "- computación suspendida"
+
 #~ msgid " - need disk space"
 #~ msgstr "- necesita espacio en disco"
+
 #~ msgid "Attach to an additional project"
 #~ msgstr "Unirse a un proyecto adicional"
+
 #~ msgid "To completion"
 #~ msgstr "Tiempo restante"
+
 #~ msgid ""
 #~ "We'll guide you through the process of attaching\n"
 #~ "to a project or account manager."
 #~ msgstr ""
 #~ "Le guiaremos a través del proceso de unirse\n"
 #~ "a un proyecto o administrador de cuentas."
+
 #~ msgid "events"
 #~ msgstr "sucesos"
+
 #~ msgid " is empty"
 #~ msgstr " está vacío"
+
 #~ msgid "%d of %d; "
 #~ msgstr "%d de %d; "
+
 #~ msgid "current sort column "
 #~ msgstr "columna de orden actual "
+
 #~ msgid " descending order "
 #~ msgstr " orden descendente "
+
 #~ msgid " ascending order "
 #~ msgstr " orden ascendente "
+
 #~ msgid "column "
 #~ msgstr "columna "
+
 #~ msgid "of %d; "
 #~ msgstr "de %d; "
+
 #~ msgid "Attach to a project or account manager to begin processing work"
 #~ msgstr ""
 #~ "Unirse a un proyecto o administrador de cuentas para comenzar a procesar "
 #~ "trabajo"
+
 #~ msgid "Attach to a project to begin processing work"
 #~ msgstr "Únase a un proyecto para empezar a procesar trabajo"
+
 #~ msgid "Use GPU never"
 #~ msgstr "No usar nunca la GPU"
+
 #~ msgid "BOINC Notification"
 #~ msgstr "Notificación de BOINC"
+
 #~ msgid ""
 #~ "TEST: Fluffy at Home just found out that the Fluffy project has been "
 #~ "published in Nature"
 #~ msgstr ""
 #~ "PRUEBA: Fluffy at Home ha encontrado que el proyecto Fluffy ha sido "
 #~ "publicado en Nature"
+
 #~ msgid "%s: %.2f%% completed."
 #~ msgstr "%s: %.2f%% completado."
+
 #~ msgid "%d tasks running."
 #~ msgstr "%d tareas ejecutándose."
+
 #~ msgid "&Close Window\tCtrl+W"
 #~ msgstr "&Cerrar Ventana\tCtrl+W"
+
 #~ msgid "&Messages\tCtrl+Shift+M"
 #~ msgstr "&Mensajes\tCtrl+Shift+M"
+
 #~ msgid "Display messages"
 #~ msgstr "Visualizar los mensajes"
+
 #~ msgid "Display news"
 #~ msgstr "Visualizar las noticias"
+
 #~ msgid "%s - Can't find web browser"
 #~ msgstr "%s - No puede encontrar un navegador web"
+
 #~ msgid ""
 #~ "%s tried to display the web page\n"
 #~ "\t%s\n"
@@ -4688,61 +4742,87 @@ msgstr "especificar horas de comienzo y final de uso de la red en el formato HH:
 #~ "Para arreglar esto, establezca la variable de entorno\n"
 #~ "BROWSER con la ruta hacia su navegador,\n"
 #~ "y entonces reinicie %s."
+
 #~ msgid "Starting client services; please wait..."
 #~ msgstr "Iniciando servicios cliente; por favor espere..."
+
 #~ msgid "BOINC Website"
 #~ msgstr "Sitio web de BOINC"
+
 #~ msgid "Display the latest news about BOINC from the BOINC website"
 #~ msgstr ""
 #~ "Mostrar las últimas noticias sobre BOINC desde el sitio web de BOINC"
+
 #~ msgid "User information"
 #~ msgstr "Información de usuario"
+
 #~ msgid "Account Manager URL"
 #~ msgstr "URL del Administrador de Cuentas"
+
 #~ msgid "Enter the URL of the account manager's web site."
 #~ msgstr "Introduzca la URL de la página web del administrador de cuentas."
+
 #~ msgid "Close BOINC Manager Window."
 #~ msgstr "Cerrar la ventana del Administrador BOINC."
+
 #~ msgid "Exit the %s"
 #~ msgstr "Salir de %s"
+
 #~ msgid "&Advanced View\tCTRL+SHIFT+A"
 #~ msgstr "Vista &Avanzada\tCTRL+SHIFT+A"
+
 #~ msgid ""
 #~ "Advanced views allow you to sort various columns and displays graphical "
 #~ "progress bars."
 #~ msgstr ""
 #~ "La vista avanzada le permite ordenar diferentes columnas y visualiza "
 #~ "barras de progreso."
+
 #~ msgid "&Simple View...\tCTRL+SHIFT+S"
 #~ msgstr "Vista &Simple...\tCTRL+SHIFT+S"
+
 #~ msgid "Display the simple BOINC graphical interface."
 #~ msgstr "Muestra el interfaz gráfico BOINC simple."
+
 #~ msgid "Attach to &account manager..."
 #~ msgstr "Unirse a un &administrador de cuentas..."
+
 #~ msgid "Attach to an account manager"
 #~ msgstr "Unirse a un administrador de cuentas"
+
 #~ msgid "Attach to &project"
 #~ msgstr "&Unirse a un proyecto"
+
 #~ msgid "Attaching to project..."
 #~ msgstr "Uniéndose a un proyecto..."
+
 #~ msgid "Retrying communications for project(s)..."
 #~ msgstr "Reintentando la comunicación con el(los) proyecto(s)..."
+
 #~ msgid "Removal from %s completed."
 #~ msgstr "Eliminación de %s completada."
+
 #~ msgid "Removal succeeded!"
 #~ msgstr "¡Eliminación con éxito!"
+
 #~ msgid "Switch between applications between every"
 #~ msgstr "Cambiar entre aplicaciones cada"
+
 #~ msgid "Write to disk at most every"
 #~ msgstr "Escribir al disco como máximo cada"
+
 #~ msgid "Slot"
 #~ msgstr "Espacio (slot)"
+
 #~ msgid "Already Attached to Project"
 #~ msgstr "Unido ya al Proyecto"
+
 #~ msgid "This project may not have work for your type of computer."
 #~ msgstr "Este proyecto podría no tener trabajo para su tipo de ordenador."
+
 #~ msgid "Click here to go to %s's website."
 #~ msgstr "Pulse aquí para ir al sitio web de %s."
+
 #~ msgid ""
 #~ "Required wizard file(s) are missing from the target server.\n"
 #~ "(lookup_account.php/create_account.php)\n"
@@ -4750,24 +4830,34 @@ msgstr "especificar horas de comienzo y final de uso de la red en el formato HH:
 #~ "Los ficheros requeridos por el asistente no se encuentran en el servidor "
 #~ "señalado.\n"
 #~ "(lookup_account.php/create_account.php)\n"
+
 #~ msgid "ID"
 #~ msgstr "ID"
+
 #~ msgid "Priority"
 #~ msgstr "Prioridad"
+
 #~ msgid "MessagesGrid"
 #~ msgstr "Mensajes"
+
 #~ msgid "Copying selected messages to Clipboard..."
 #~ msgstr "Copiando los mensajes seleccionados al portapapeles..."
+
 #~ msgid "Info"
 #~ msgstr "Información"
+
 #~ msgid "Warning"
 #~ msgstr "Advertencia"
+
 #~ msgid "ProjectsGrid"
 #~ msgstr "Proyectos"
+
 #~ msgid "TransfersGrid"
 #~ msgstr "Transferencias"
+
 #~ msgid "Aborting transfer(s)..."
 #~ msgstr "Cancelando transferencia(s)..."
+
 #~ msgid ""
 #~ "Are you sure you want to abort this file(s) transfer ?\n"
 #~ "NOTE: Aborting a transfer will invalidate a task and you\n"
@@ -4777,24 +4867,30 @@ msgstr "especificar horas de comienzo y final de uso de la red en el formato HH:
 #~ "fichero(s)?\n"
 #~ "NOTA: Cancelar una transferencia invalidará la tarea y usted\n"
 #~ "no recibirá créditos por ella."
+
 #~ msgid "Abort File Transfer(s)"
 #~ msgstr "Cancelar Transferencia(s) de Archivo(s)"
+
 #~ msgid "TasksGrid"
 #~ msgstr "Tareas"
+
 #~ msgid ""
 #~ "We'll now guide you through the process of attaching\n"
 #~ "to a project."
 #~ msgstr ""
 #~ "Nosotros ahora le guiaremos a través del proceso de unión\n"
 #~ "a un proyecto."
+
 #~ msgid "&Stop using%s"
 #~ msgstr "&Dejar de usar%s"
+
 #~ msgid ""
 #~ "We'll now remove this computer from %s.  From now on,\n"
 #~ "attach and detach projects directly from this computer.\n"
 #~ msgstr ""
 #~ "Nosotros ahora eliminaremos este ordenador de %s. A partir de ahora,\n"
 #~ " únase y sepárese de los proyectos directamente desde este ordenador.\n"
+
 #~ msgid ""
 #~ "We'll now guide you through the process of attaching\n"
 #~ "to an account manager.\n"
@@ -4807,52 +4903,74 @@ msgstr "especificar horas de comienzo y final de uso de la red en el formato HH:
 #~ "\n"
 #~ "Si quiere unirse a un único proyecto, haga clic en Cancelar,\n"
 #~ "y después seleccione la opción de Menú \"Unirse a un proyecto\"."
+
 #~ msgid "Debug Flags"
 #~ msgstr "Marcas de depuración"
+
 #~ msgid "Project Properties Failure"
 #~ msgstr "Fallo en Propiedades del Proyecto"
+
 #~ msgid "Project Communication Failure"
 #~ msgstr "Fallo de Comunicaciones del Proyecto"
+
 #~ msgid "Project Properties URL Failure"
 #~ msgstr "Fallo en la URL de Propiedades del Proyecto"
+
 #~ msgid "Account Creation Disabled"
 #~ msgstr "Creación de Cuentas Desactivada"
+
 #~ msgid "Account Already Exists"
 #~ msgstr "Cuenta ya Existente"
+
 #~ msgid "Project Already Attached"
 #~ msgstr "Ya está unido a este proyecto"
+
 #~ msgid "Project Attach Failure"
 #~ msgstr "Fallo en Unión al Proyecto"
+
 #~ msgid "Failure Communicating with Reference Site"
 #~ msgstr "Fallo en la Comunicación con el Servidor de Referencia"
+
 #~ msgid "Net Detection Failure"
 #~ msgstr "Fallo en Detección de Red"
+
 #~ msgid ""
 #~ "You can copy and paste the URL from your browser's\n"
 #~ "address bar."
 #~ msgstr ""
 #~ "Usted puede copiar y pegar la URL desde la barra\n"
 #~ "de direcciones de su navegador."
+
 #~ msgid "For a list of account managers go to:"
 #~ msgstr "Para una lista de administradores de cuentas vaya a:"
+
 #~ msgid "&Advanced View"
 #~ msgstr "Vista &Avanzada"
+
 #~ msgid "Already attached to project"
 #~ msgstr "Unido ya a proyecto"
+
 #~ msgid "You are already attached to this project."
 #~ msgstr "Usted ya está unido a este proyecto."
+
 #~ msgid "Static text"
 #~ msgstr "Texto estático"
+
 #~ msgid "Radiobutton"
 #~ msgstr "Botón de selección"
+
 #~ msgid "Short term debt"
 #~ msgstr "Planificación de CPU prioritaria"
+
 #~ msgid "Long term debt"
 #~ msgstr "Búsqueda de trabajo prioritaria"
+
 #~ msgid "Test"
 #~ msgstr "Prueba"
+
 #~ msgid "Enter account key"
 #~ msgstr "Introduzca la clave de cuenta"
+
 #~ msgid ""
 #~ "This project uses an \"account key\" to identify you.\n"
 #~ "\n"
@@ -4863,33 +4981,43 @@ msgstr "especificar horas de comienzo y final de uso de la red en el formato HH:
 #~ "\n"
 #~ "Vaya al la página web del proyecto para crear una cuenta. Su clave\n"
 #~ "de cuenta le será enviada por correo electrónico."
+
 #~ msgid "An account key looks like:"
 #~ msgstr "La clave de cuenta se parece a esto:"
+
 #~ msgid "82412313ac88e9a3638f66ea82186948"
 #~ msgstr "82412313ac88e9a3638f66ea82186948"
+
 #~ msgid "Account key:"
 #~ msgstr "Clave de cuenta:"
+
 #~ msgid "For a list of BOINC-based account managers go to:"
 #~ msgstr ""
 #~ "Para una lista de los administradores de cuenta basados en BOINC vaya a:"
+
 #~ msgid "&Accessible View"
 #~ msgstr "Vista &Accesible"
+
 #~ msgid ""
 #~ "Accessible views are compatible with accessibility aids such as screen "
 #~ "readers."
 #~ msgstr ""
 #~ "Las Vistas accesibles son compatibles con ayudas para accesibilidad tales "
 #~ "como lectores de pantalla."
+
 #~ msgid "&Grid View"
 #~ msgstr "Vista &Gráfica"
+
 #~ msgid ""
 #~ "Grid views allow you to sort various columns and displays graphical "
 #~ "progress bars."
 #~ msgstr ""
 #~ "Las Vistas gráficas le permiten ordenar varias columnas y visualiza "
 #~ "barras de progreso."
+
 #~ msgid ":"
 #~ msgstr ":"
+
 #~ msgid ""
 #~ "%s is going to shutdown the core client it is currently connected to.\n"
 #~ "NOTE: Choosing 'OK' will cause the select new computer dialog to appear \n"
@@ -4899,26 +5027,33 @@ msgstr "especificar horas de comienzo y final de uso de la red en el formato HH:
 #~ "NOTA: Si elige 'Aceptar' provocará que aparezca el diálogo para "
 #~ "seleccionar un nuevo ordenador\n"
 #~ "de forma que pueda unirse a un nuevo cliente núcleo."
+
 #~ msgid "BOINC leaves at least this amount of disk space free (in Gigagytes)"
 #~ msgstr ""
 #~ "BOINC deja como mínimo esta cantidad de espacio de disco libre (en "
 #~ "gigabytes)"
+
 #~ msgid "Click here to disable displaying this message in the future."
 #~ msgstr "Haga Clic aquí para desactivar este mensaje en el futuro."
+
 #~ msgid "Language Selection:"
 #~ msgstr "Selección de Idioma:"
+
 #~ msgid "What language should the manager display by default."
 #~ msgstr "Qué idioma debe el administrador mostrar por defecto."
+
 #~ msgid "Reminder Frequency:"
 #~ msgstr ""
 #~ "Frecuencia de Recordatorio:\n"
 #~ "(para eventos de conexión)"
+
 #~ msgid ""
 #~ "How often, in minutes, should the manager remind you of possible "
 #~ "connection events."
 #~ msgstr ""
 #~ "Cada cuánto, en minutos, debe recordarle el administrador de posibles "
 #~ "eventos de conexión."
+
 #~ msgid ""
 #~ "BOINC failed to communicate on the Internet. The most likely\n"
 #~ "reasons are:\n"
@@ -4946,20 +5081,27 @@ msgstr "especificar horas de comienzo y final de uso de la red en el formato HH:
 #~ "\n"
 #~ "2) Usted está utilizando un servidor proxy.\n"
 #~ "Haga clic en Siguiente para configurar los parámetros proxy en BOINC."
+
 #~ msgid "total disk usage"
 #~ msgstr "uso total del disco"
+
 #~ msgid "disk usage by BOINC projects"
 #~ msgstr "uso del disco por los proyectos BOINC"
+
 #~ msgid "not attached to any BOINC project - 0 bytes"
 #~ msgstr "no unido a ningún proyecto BOINC - 0 bytes"
+
 #~ msgid "used by BOINC - "
 #~ msgstr "utilizado por BOINC - "
+
 #~ msgid "used by other programs - "
 #~ msgstr "utilizado por otros programas - "
+
 #~ msgid "Project Comm Failure"
 #~ msgstr "Fallo en Comunicación con Proyecto"
+
 #~ msgid "Google Comm Failure"
 #~ msgstr "Fallo de Comunicación con Google"
+
 #~ msgid "Yahoo Comm Failure"
 #~ msgstr "Fallo de Comunicación con Yahoo"
-
diff --git a/locale/es/BOINC-Setup.mo b/locale/es/BOINC-Setup.mo
index b290a33..be2de84 100644
Binary files a/locale/es/BOINC-Setup.mo and b/locale/es/BOINC-Setup.mo differ
diff --git a/locale/es/BOINC-Setup.po b/locale/es/BOINC-Setup.po
old mode 100755
new mode 100644
index 1b37033..7d683d7
--- a/locale/es/BOINC-Setup.po
+++ b/locale/es/BOINC-Setup.po
@@ -1,39 +1,32 @@
 # 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: BOINC 7.4\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-10 18:33-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: es\n"
+"PO-Revision-Date: 2015-02-23 23:14+0000\n"
+"Last-Translator: Rom Walton\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/boinc/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-Basepath: /Volumes/Cheer/BOINC_GIT/boinc_trunk\n"
-"X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: mac_installer\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: Installer.cpp:124
 #, c-format
 msgid "Sorry, this version of %s requires system 10.5 or higher."
-msgstr ""
+msgstr "Lo sentimos, esta versión de %s requiere un sistema 10.5 o superior."
 
-#: PostInstall.cpp:130
-#: PostInstall.cpp:1136
-#: uninstall.cpp:1618
+#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
 msgid "Yes"
 msgstr "Sí"
 
-#: PostInstall.cpp:131
-#: PostInstall.cpp:1137
-#: uninstall.cpp:1619
+#: PostInstall.cpp:131 PostInstall.cpp:1137 uninstall.cpp:1619
 msgid "No"
 msgstr "No"
 
@@ -47,26 +40,26 @@ 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 ""
+msgstr "A los usuarios con permiso para administrar este computador se les permitirá automáticamente ejecutar y controlar %s.\n\n¿Quiere que los usuarios no administradores también puedan ejecutar y controlar %s en este Mac?"
 
 #: PostInstall.cpp:1444
 #, c-format
 msgid "Do you want to set %s as the screensaver for all %s users on this Mac?"
-msgstr ""
+msgstr "¿Quiere definir %s como el salvapantallas de todos los usuarios de %s de este Mac?"
 
 #: uninstall.cpp:82
 msgid "OK"
-msgstr "OK"
+msgstr "Aceptar"
 
 #: uninstall.cpp:136
 msgid "Permission error after relaunch"
-msgstr ""
+msgstr "Error de permisos tras reiniciar"
 
 #: uninstall.cpp:141
 msgid ""
 "Removal may take several minutes.\n"
 "Please be patient."
-msgstr ""
+msgstr "La eliminación puede tardar varios minutos.\nTenga paciencia."
 
 #: uninstall.cpp:156
 #, c-format
@@ -74,27 +67,27 @@ 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 ""
+msgstr "¿Está seguro de que quiere eliminar completamente %s de su computador?\n\nEso borrará los ejecutables pero no tocará los archivos de datos de %s."
 
 #: uninstall.cpp:163
 #, c-format
 msgid "Canceled: %s has not been touched."
-msgstr ""
+msgstr "Cancelado: no se ha tocado %s."
 
 #: uninstall.cpp:174
 #, c-format
 msgid "An error occurred: error code %d"
-msgstr ""
+msgstr "Ha ocurrido un error: código %d"
 
 #: uninstall.cpp:230
 msgid "name  of user"
-msgstr ""
+msgstr "nombre del usuario"
 
 #: uninstall.cpp:272
 msgid ""
 "Do you also want to remove VirtualBox from your computer?\n"
 "(VirtualBox was installed along with BOINC.)"
-msgstr ""
+msgstr "¿También quiere eliminar Virtualbox de su computador?\n(Virtualbox se instaló junto con BOINC.)"
 
 #: uninstall.cpp:312
 #, c-format
@@ -106,14 +99,14 @@ msgid ""
 "\n"
 "for each user, the file\n"
 "\"%s\"."
-msgstr ""
+msgstr "Eliminación terminada.\n\n Puede que quiera eliminar los siguientes elementos restantes usando el Finder: \nel directorio «%s»\n\npara cada usuario, el archivo\n«%s»."
 
 #: uninstall.cpp:840
 #, c-format
 msgid ""
 "Enter your administrator password to completely remove %s from you computer.\n"
 "\n"
-msgstr ""
+msgstr "Escriba la contraseña de administrador para borrar completamente %s del computador.\n\n"
 
 #: uninstall.cpp:1616
 msgid "Cancel"
@@ -122,4 +115,3 @@ msgstr "Cancelar"
 #: uninstall.cpp:1617
 msgid "Continue..."
 msgstr "Continuar..."
-
diff --git a/locale/es/BOINC-Web.mo b/locale/es/BOINC-Web.mo
index c031c85..12a8c13 100644
Binary files a/locale/es/BOINC-Web.mo and b/locale/es/BOINC-Web.mo differ
diff --git a/locale/es/BOINC-Web.po b/locale/es/BOINC-Web.po
old mode 100755
new mode 100644
index 4dc6b9a..b6fdb4d
--- a/locale/es/BOINC-Web.po
+++ b/locale/es/BOINC-Web.po
@@ -1,26 +1,26 @@
 # BOINC web translation
 # Copyright (C) 2008-2009 University of California
+# 
 # This file is distributed under the same license as BOINC.
+# 
 # FileID  : $Id$
+# 
+# Translators:
+# Antonio Regidor García <chikitosan at gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: \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 18:33-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: \n"
-"Language: es\n"
+"PO-Revision-Date: 2015-03-29 19:41+0000\n"
+"Last-Translator: Antonio Regidor García <chikitosan at gmail.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/boinc/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
-"X-POOTLE-MTIME: 1418678709.0\n"
-"X-Poedit-KeywordsList: tra\n"
-"X-Poedit-SearchPath-0: doc\n"
 
 #: docutil.php:21
 msgid "Search"
@@ -36,25 +36,25 @@ msgid "This page is %stranslatable%s."
 msgstr "Esta página es %straducible%s."
 
 #: download.php:39
-msgid "We recommend that you also install VirtualBox, so your computer can work on science projects that require it."
+msgid ""
+"We recommend that you also install VirtualBox, so your computer can work on "
+"science projects that require it."
 msgstr "Le recomendamos que instale también VirtualBox, para que su computador pueda trabajar para los proyectos científicos que lo requieren."
 
 #: download.php:41
 msgid "Learn more about VirtualBox."
-msgstr "Saber más sobre VirtualBox."
+msgstr "Saber más de VirtualBox."
 
 #: download.php:51
 msgid "Download BOINC + VirtualBox"
 msgstr "Bajar BOINC y VirtualBox"
 
-#: download.php:54
-#: download.php:69
+#: download.php:54 download.php:69
 #, php-format
 msgid "for %s"
 msgstr "para %s"
 
-#: download.php:57
-#: download.php:72
+#: download.php:57 download.php:72
 #, php-format
 msgid "BOINC version %s"
 msgstr "Versión %s de BOINC"
@@ -64,43 +64,44 @@ msgstr "Versión %s de BOINC"
 msgid "VirtualBox version %s"
 msgstr "Versión %s de VirtualBox"
 
-# #######################################
-# download.php
-# download.php 2006/08/03 by je2bwm
-# ######################################<br />
-# <br />
-# download.php<br />
-# #######################################<br />
 #: download.php:67
 msgid "Download BOINC"
 msgstr "Descargar BOINC"
 
 #: download.php:123
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others."
+msgid ""
+"BOINC is a program that lets you donate your idle computer time to science "
+"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, and many others."
 msgstr "BOINC es un programa que le permite donar el tiempo en que su computador está inactivo a proyectos científicos como SETI at home, Climateprediction.net, Rosetta at home, World Community Grid y muchos otros."
 
 #: download.php:125
-msgid "After installing BOINC on your computer, you can connect it to as many of these projects as you like."
-msgstr "Después de instalar BOINC en su computador, puede conectarlo con tantos proyectos como quiera."
+msgid ""
+"After installing BOINC on your computer, you can connect it to as many of "
+"these projects as you like."
+msgstr "Tras instalar BOINC en su computador, puede conectarlo con tantos proyectos como quiera."
 
 #: download.php:127
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
-msgstr "Puedes ejecutar este software en un ordenador sólo si es de tu propiedad o tienes permiso de su propietario."
+msgid ""
+"You may run this software on a computer only if you own the computer or have"
+" the permission of its owner."
+msgstr "Puede ejecutar este programa en un computador sólo si es de su propiedad o tiene permiso de su propietario."
 
 #: download.php:132
-msgid "We recommend that you download BOINC from the Google Play Store or Amazon Appstore, not from here."
+msgid ""
+"We recommend that you download BOINC from the Google Play Store or Amazon "
+"Appstore, not from here."
 msgstr "Le recomendamos que descargue BOINC de Google Play o Amazon Appstore, no de aquí."
 
 #: download.php:167
 msgid "System requirements"
-msgstr "Requerimientos del sistema"
+msgstr "Requisitos del sistema"
 
 #: download.php:168
 msgid "Release notes"
 msgstr "Notas de la versión"
 
-#: download.php:169
-#: index.php:86
+#: download.php:169 index.php:86
 msgid "Help"
 msgstr "Ayuda"
 
@@ -122,55 +123,75 @@ msgstr "BOINC: computar para la ciencia"
 
 #: help.php:12
 #, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
-msgstr "La ayuda Online de BOINC le permite hablar directamente con usuarios BOINC con experiencia, que pueden: %s contestar preguntas sobre BOINC y computación voluntaria; %s guiarle en el proceso de instalar y usar BOINC; %s resolver cualquier problema que pudiera tener."
+msgid ""
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who"
+" can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"through the process of installing and using BOINC; %s troubleshoot any "
+"problems you might have."
+msgstr "La ayuda en línea de BOINC le permite hablar de forma individual con usuarios de BOINC con experiencia, que pueden: %s contestar a preguntas sobre BOINC y la computación voluntaria, %s guiarle en el proceso de instalar y usar BOINC, y %s resolver cualquier problema que pudiera tener."
 
 #: help.php:21
 #, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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 "La ayuda Online de BOINC está basada en %sSkype%s, un sistema de telefonía basado en Internet. Skype es gratuito (el programa y las llamadas). Si todavía no tiene Skype, por favor, %sdescarguelo e instálelo ahora%s. Cuando haya terminado, vuelva a esta página."
+msgid ""
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system."
+" 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 "La ayuda en línea de BOINC está basada en %sSkype%s, un sistema de telefonía por Internet. Skype es gratuito (el programa y las llamadas). Si todavía no tiene Skype, %sdescárguelo e instálelo%s. Cuando haya terminado, vuelva a esta página."
 
 #: help.php:28
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
-msgstr "El mejor modo de obtener ayuda es por voz, para lo que necesita micrófono y altavoces integrados en su ordenador o externos a su ordenador. Usted puede usar también el chat basado en texto de Skype o coreo electrónico normal (si no tiene Skype) para comunicarse con Voluntarios para Ayuda."
+msgid ""
+"The best way to get help is by voice, for which you need either built-in "
+"microphone and speakers or an external headset for your computer.  You can "
+"also use Skype's text-based chat system or regular email (if you don't have "
+"Skype) to communicate with Help Volunteers."
+msgstr "El mejor modo de obtener ayuda es por voz, para lo que necesita un micrófono y altavoces integrados en su computador o externos. Puede usar también el chat de texto de Skype o el correo electrónico normal (si no tiene Skype) para comunicarse con ayudantes voluntarios."
 
 #: help.php:31
-msgid "Volunteers speaking several languages are available. Please select a language:"
-msgstr "Hay disponibles voluntarios que hablan distintos idiomas. Por favor, seleccione un idioma:"
+msgid ""
+"Volunteers speaking several languages are available. Please select a "
+"language:"
+msgstr "Hay disponibles voluntarios que hablan distintos idiomas. Elija un idioma:"
 
 #: help.php:47
 msgid "Be a Help Volunteer"
-msgstr "Sea Voluntario para Ayuda"
+msgstr "Sea un ayudante voluntario"
 
 #: help.php:50
 #, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
-msgstr "Si usted es un usuario BOINC con experiencia, le animamos a %sser Voluntario para Ayuda%s. Este es un gran modo de ayudar a la causa de la investigación científica y computación voluntaria - ¡y es divertido! "
+msgid ""
+"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+"Volunteer%s.  It's a great way to help the cause of scientific research and "
+"volunteer computing - and it's fun!"
+msgstr "Si es un usuario de BOINC con experiencia, le animamos a %sser ayudante voluntario%s. Es una estupenda manera de ayudar a la causa de la investigación científica y la computación voluntaria. ¡Y es interesante!"
 
 #: help.php:56
 #, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
-msgstr "Si usted es ya un Voluntario para Ayuda: para editar sus preferencias, %spulse aquí%s. "
+msgid ""
+"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
+msgstr "Si ya es ayudante voluntario: %spulse aquí%s para cambiar sus preferencias."
 
 #: help_funcs.php:107
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
-msgstr "Los colaboradores de BOINC no son remunerados. Su consejo no esta avalado por BOINC o por la Universidad de California."
+msgid ""
+"BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
+"or the University of California."
+msgstr "Los ayudantes de BOINC son voluntarios no remunerados. Sus consejos no están avalados por BOINC o por la Universidad de California."
 
 #: help_funcs.php:110
 msgid "%1Never%2 give email address or password information to BOINC helpers."
-msgstr "%1Nunca%2 revele su email o contraseña a los colaboradores de BOINC."
+msgstr "%1Nunca%2 revele su email o contraseña a los ayudantes de BOINC."
 
 #: index.php:24
 msgid "Computing power"
-msgstr "Potencia computacional"
+msgstr "Potencia de cálculo"
 
 #: index.php:26
 msgid "Top 100 volunteers"
-msgstr "Top 100 de voluntarios"
+msgstr "Mejores 100 voluntarios"
 
 #: index.php:27
 msgid "Statistics"
-msgstr "Estadísticas"
+msgstr "Estadística"
 
 #: index.php:55
 msgid "Active:"
@@ -182,13 +203,12 @@ msgstr "voluntarios,"
 
 #: index.php:55
 msgid "computers.\n"
-msgstr "ordenadores.\n"
+msgstr "computadores.\n"
 
 #: index.php:56
 msgid "24-hour average:"
-msgstr "de media en 24 horas:"
+msgstr "media de 24 horas:"
 
-# 80%
 #: index.php:56
 msgid "PetaFLOPS."
 msgstr "PetaFLOPS."
@@ -199,22 +219,13 @@ msgstr "Noticias"
 
 #: index.php:83
 msgid "Volunteer"
-msgstr "Voluntario"
-
-# #######################################
-# download.php
-# download.php 2006/08/03 by je2bwm
-# ######################################<br />
-# <br />
-# download.php<br />
-# #######################################<br />
+msgstr "Ayudar"
+
 #: index.php:85
 msgid "Download"
 msgstr "Descargar"
 
-#: index.php:87
-#: index.php:120
-#: index.php:171
+#: index.php:87 index.php:120 index.php:171
 msgid "Documentation"
 msgstr "Documentación"
 
@@ -227,16 +238,19 @@ msgid "Links"
 msgstr "Enlaces"
 
 #: index.php:94
-msgid "Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:"
-msgstr "Use el tiempo en que su computador está inactivo (Windows, Mac, Linux o Android) para curar enfermedades, estudiar el calentamiento global, descubrir púlsares y muchos otros tipos de investigaciones científicas. Es seguro y fácil:"
+msgid ""
+"Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure"
+" diseases, study global warming, discover pulsars, and do many other types "
+"of scientific research.  It's safe, secure, and easy:"
+msgstr "Use el tiempo en que su computador (Windows, Mac, Linux o Android) está inactivo para curar enfermedades, estudiar el calentamiento global, descubrir púlsares y muchos otros tipos de investigaciones científicas. Es seguro y fácil:"
 
 #: index.php:96
 msgid "Choose projects"
-msgstr "Elija proyectos"
+msgstr "Elegir proyectos"
 
 #: index.php:97
 msgid "Download BOINC software"
-msgstr "Descargue los programas BOINC"
+msgstr "Descargar BOINC"
 
 #: index.php:98
 msgid "Enter an email address and password."
@@ -244,28 +258,34 @@ msgstr "Escriba una dirección de email y una contraseña."
 
 #: index.php:102
 #, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
-msgstr "O, si usted ejecuta varios proyectos, pruebe un %sadministrador de cuentas%s tales como %sGridRepublic%s o %sBAM!%s."
+msgid ""
+"Or, if you run several projects, try an %saccount manager%s such as "
+"%sGridRepublic%s or %sBAM!%s. "
+msgstr "O, si ejecuta varios proyectos, pruebe un %sadministrador de cuentas%s, como %sGridRepublic%s o %sBAM!%s."
 
 #: index.php:118
 msgid "Compute with BOINC"
-msgstr "Compute con BOINC"
+msgstr "Computar con BOINC"
 
 #: index.php:121
 msgid "Software updates"
-msgstr "Actualizaciones de software"
+msgstr "Actualizaciones de programas"
 
 #: index.php:128
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
-msgstr "%1Científicos%2: usa BOINC para crear un %3proyecto de computación voluntaria%4 obteniendo la potencia de procesamiento de miles de CPUs."
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving"
+" you the computing power of thousands of CPUs."
+msgstr "%1Científicos%2: usen BOINC para crear un %3proyecto de computación voluntaria%4 que les dará la potencia de procesamiento de miles de CPUs."
 
 #: index.php:132
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
-msgstr "%1Universidades%2: usa BOINC para crear un %3Campus Virtual de Supercomputación%4"
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
+msgstr "%1Universidades%2: usen BOINC para crear un %3centro de supercomputación virtual del campus%4"
 
 #: index.php:137
 msgid "%1Companies%2: use BOINC for %3desktop Grid computing%4."
-msgstr "%1Empresas%2: usa BOINC para %3computación en Red con ordenadores personales%4"
+msgstr "%1Empresas%2: usen BOINC para la %3computación en red con ordenadores de sobremesa%4."
 
 #: index.php:149
 msgid "The BOINC project"
@@ -289,7 +309,7 @@ msgstr "Eventos"
 
 #: index.php:159
 msgid "Papers and talks"
-msgstr "Prensa y charlas"
+msgstr "Artículos y charlas"
 
 #: index.php:160
 msgid "Research projects"
@@ -305,7 +325,7 @@ msgstr "y"
 
 #: index.php:166
 msgid "Help wanted"
-msgstr "¡Se busca ayuda!"
+msgstr "Se busca ayuda"
 
 #: index.php:168
 msgid "Programming"
@@ -325,26 +345,26 @@ msgstr "Publicidad"
 
 #: index.php:174
 msgid "Software development"
-msgstr "Desarrollo de software"
+msgstr "Desarrollo de programas"
 
 #: index.php:175
 msgid "APIs for add-on software"
-msgstr "APIs para software add-on"
+msgstr "APIs para complementos"
 
 #: index.php:217
 #, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
-msgstr "Programas de código abierto para %scomputación voluntaria%s y %scomputación en red (grid)%s"
+msgid ""
+"Open-source software for %svolunteer computing%s and %sgrid computing%s."
+msgstr "Programas de código abierto para %scomputación voluntaria%s y %scomputación en red%s."
 
 #: index.php:230
 msgid "BOINC is based at The University of California, Berkeley"
-msgstr "BOINC está emplazado en la Universidad de California, Berkeley"
+msgstr "BOINC tiene su sede en la Universidad de California en Berkeley"
 
 #: projects.inc:14
 msgid "Distributed sensing"
 msgstr "Sensores distribuidos"
 
-# 78%
 #: projects.inc:19
 msgid "Stanford University"
 msgstr "Universidad de Stanford"
@@ -354,7 +374,10 @@ msgid "Seismology"
 msgstr "Sismología"
 
 #: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
+msgid ""
+"The Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to Internet-connected computers.  You must buy a "
+"sensor to participate."
 msgstr "La Quake-Catcher Network está desarrollando la mayor red sísmica del mundo usando computadores con sensores conectados con Internet. Tiene que comprar un sensor para participar."
 
 #: projects.inc:27
@@ -366,23 +389,24 @@ msgid "Environmental research"
 msgstr "Investigación medioambiental"
 
 #: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
+msgid ""
+"This project is creating a free and continuously updated map of radiation "
+"levels by using sensors connected to volunteers' computers.  You must buy a "
+"sensor to participate."
 msgstr "Este proyecto está creando un mapa de niveles de radiación libre y actualizado continuamente usando sensores conectados con los computadores de los voluntarios. Tiene que comprar un sensor para participar."
 
 #: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
+msgid ""
+"To participate in these projects you must buy a sensor and attach it to your"
+" computer."
 msgstr "Para participar en estos proyectos tiene que comprar un sensor y conectarlo con su computador."
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
 msgstr "Ciencia cognitiva e inteligencia artificial"
 
-#: projects.inc:60
-#: projects.inc:364
-#: projects.inc:408
-#: projects.inc:457
-#: projects.inc:464
-#: projects.inc:511
+#: projects.inc:60 projects.inc:364 projects.inc:408 projects.inc:457
+#: projects.inc:464 projects.inc:511
 msgid "Private"
 msgstr "Privado"
 
@@ -391,12 +415,16 @@ msgid "Artificial intelligence"
 msgstr "Inteligencia artificial"
 
 #: projects.inc:62
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
-msgstr "Analizar y convertir redes semánticas para su uso en FreeHAL, inteligencia artificial que utiliza redes semánticas, lematizadores, bases de datos del habla, y etiquetado gramatical con el fin de imitar el comportamiento humano en las conversaciones."
+msgid ""
+"Parse and convert semantic nets for use in FreeHAL, an artificial "
+"intelligence that uses semantic networks, stemmers, part of speech "
+"databases, and part of speech taggers in order to imitate human behavior in "
+"conversations."
+msgstr "Analiza sintáticamente y convierte redes semánticas para usarlas en FreeHAL, una inteligencia artificial que usa redes semánticas, lematizadores, bases de datos de categorías gramaticales y etiquetadores de categorías gramaticales con el fin de imitar el comportamiento humano en las conversaciones."
 
 #: projects.inc:69
 msgid "Biology and Medicine"
-msgstr "Biología y Medicina"
+msgstr "Biología y medicina"
 
 #: projects.inc:82
 msgid "University College Dublin"
@@ -407,8 +435,13 @@ msgid "Antimalarial drug discovery"
 msgstr "Descubrimiento de medicamentos antimalaria"
 
 #: projects.inc:84
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
-msgstr "El parásito que causa la malaria sigue desarrollando resistencia a la medicación disponible. Por tanto, necesitamos urgentemente descubrir medicamentos nuevos para reemplazar a los existentes. Y lo más importante, estos medicamentos deben estar dirigidos a proteínas del parásito NUEVAS. El objetivo del proyecto FightMalaria at Home es encontrar estas proteínas nuevas."
+msgid ""
+"The parasite that causes malaria continues to evolve resistance to available"
+" medication. We therefore urgently need to discover new drugs to replace "
+"existing drugs. Importantly, these new drugs need to target NEW proteins in "
+"the parasite. The FightMalaria at Home project is aimed at finding these new "
+"targets."
+msgstr "El parásito que causa la malaria sigue desarrollando resistencia a la medicación disponible. Por tanto, necesitamos descubrir con urgencia medicamentos nuevos para reemplazar a los existentes. Y, lo más importante, estos medicamentos deben estar dirigidos a proteínas del parásito NUEVAS. El objetivo del proyecto FightMalaria at Home es encontrar estas proteínas nuevas."
 
 #: projects.inc:90
 msgid "University of Karlsruhe (Germany)"
@@ -419,8 +452,13 @@ msgid "Protein structure prediction"
 msgstr "Predicción de la estructura de las proteínas"
 
 #: projects.inc:92
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
-msgstr "POEM at HOME usa una aproximación computacional para predecir la estructura biológicamente activa de las proteínas, para entender los mecanismos del procesamiento de señales cuando las proteínas interactúan con otra, para entender enfermedades relacionadas con el mal funcionamiento o agregación de las proteínas, y para desarrollar nuevos medicamentos basados en las estructuras tridimensionales de proteínas biológicamente importantes."
+msgid ""
+"POEM at HOME uses a computational approach to predict the biologically active "
+"structure of proteins, to understand the signal-processing mechanisms when "
+"the proteins interact with one another, to understand diseases related to "
+"protein malfunction or aggregation, and to develop new drugs on the basis of"
+" the three-dimensions structure of biologically important proteins."
+msgstr "POEM at HOME usa un enfoque computacional para predecir la estructura biológicamente activa de las proteínas, para entender los mecanismos del procesamiento de señales cuando las proteínas interactúan entre sí, para entender enfermedades relacionadas con el mal funcionamiento o agregación de las proteínas y para desarrollar nuevos medicamentos basados en las estructuras tridimensionales de proteínas importantes biológicamente."
 
 #: projects.inc:98
 msgid "University of Delaware"
@@ -431,8 +469,12 @@ msgid "Study of protein - ligand interactions"
 msgstr "Estudio de las interacciones proteína-ligando"
 
 #: projects.inc:100
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
-msgstr "Docking at Home tiene objetivos científicos en biociencia y en ciencia informática. El proyecto aspira ir más lejos en el conocimiento de los detalles atómicos de las interacciones proteína-ligando y, de esta manera, buscará el conocimiento para el descubrimiento de fármacos novedosos."
+msgid ""
+"Docking at Home has both bioscience and computer science goals. The project "
+"aims to further knowledge of the atomic details of protein-ligand "
+"interactions and, by doing so, will search for insights into the discovery "
+"of novel pharmaceuticals."
+msgstr "Docking at Home tiene objetivos tanto biocientíficos como informáticos. El proyecto pretende aumentar el conocimiento de los detalles atómicos de las interacciones proteína-ligando y, con ello, buscar pistas para descubrir fármacos novedosos."
 
 #: projects.inc:114
 msgid "Barcelona Biomedical Research Park (PRBB)"
@@ -443,8 +485,12 @@ msgid "Molecular simulations of proteins"
 msgstr "Simulaciones moleculares de proteínas"
 
 #: projects.inc:116
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
-msgstr "GPUGrid.net abre nuevas posibilidades computacionales con el primer código de dinámica molecular totalmente atómico (CellMD) especialmente optimizado para ejecutarse en las GPU NVIDIA. Nuevas aplicaciones biomédicas de pronto han sido posibles dándole un nuevo papel a la biología computacional para la investigación biomédica."
+msgid ""
+"GPUGrid.net opens novel computational scenarios by the first full-atom "
+"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
+"New biomedical applications suddenly become possible giving a new role to "
+"computational biology for biomedical research."
+msgstr "GPUGrid.net abre nuevas posibilidades computacionales con el primer código de dinámica molecular a nivel atómico (CellMD) optimizado para ejecutarse en las GPU NVIDIA. De repente se han vuelto posibles nuevas aplicaciones biomédicas, lo que le da un nuevo papel a la biología computacional para la investigación biomédica."
 
 #: projects.inc:122
 msgid "Technion, Israel"
@@ -455,53 +501,76 @@ msgid "Genetic linkage analysis"
 msgstr "Análisis del ligamiento genético"
 
 #: projects.inc:124
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
-msgstr "Superlink at Technion ayuda a genetistas de todo el modo a encontrar genes provocadores de enfermedades causando algunos tipos de diabetes, hipertensión (presión alta de la sangre), cancer, esquizofrenia y muchas otras."
+msgid ""
+"Superlink at Technion helps geneticists all over the world find disease-"
+"provoking genes causing some types of diabetes, hypertension (high blood "
+"pressure), cancer, schizophrenia and many others."
+msgstr "Superlink at Technion ayuda a genetistas de todo el mundo a encontrar genes que provocan enfermedades y son la causa de algunos tipos de diabetes, hipertensión (presión sanguínea alta), cáncer, esquizofrenia y muchas otras."
 
 #: projects.inc:138
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
-msgstr "Universidad de Maryland Centro de Bioinformática y Biología Computacional"
+msgid ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
+msgstr "Centro de Bioinformática y Biología Computacional de la Universidad de Maryland"
 
 #: projects.inc:139
 msgid "Life science research"
-msgstr "Investigación de las ciencias de la vida"
+msgstr "Investigaciones de las ciencias de la vida"
 
 #: projects.inc:140
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
-msgstr "El Lattice Project proporciona potencia de cálculo a los científicos de la Universidad de Maryland en el estudio del parentesco evolutivo basado en los datos de secuencias de ADN; de las secuencias de proteinas de bacterias, plásmidos y virus; y la diversidad biológica en las reservas naturales."
+msgid ""
+"The Lattice Project supplies computing power to scientists at the University"
+" of Maryland studying evolutionary relationships based on DNA sequence data;"
+" bacterial, plasmid, and virus protein sequences; and biological diversity "
+"in nature reserves. "
+msgstr "El Lattice Project proporciona potencia de cálculo a los científicos de la Universidad de Maryland que estudian el parentesco evolutivo basado en los datos de secuencias de ADN; las secuencias de proteínas de bacterias, plásmidos y virus; y la diversidad biológica de las reservas naturales."
 
 #: projects.inc:146
 msgid "The Swiss Tropical Institute"
-msgstr "El Instituto Swiss Tropical"
+msgstr "El Instituto Tropical Suizo"
 
 #: projects.inc:147
 msgid "Epidemiology"
 msgstr "Epidemiología"
 
 #: projects.inc:148
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
-msgstr "Los modelos de simulación de la dinámica de transmisión y efectos en la salud de la malaria son una herramienta importante para el control de la malaria. Pueden ser utilizados para determinar las estrategias óptimas para la entrega de mosquiteros, la quimioterapia o las nuevas vacunas que están actualmente en desarrollo y pruebas. Este tipo de modelos es extremadamente intensivo, y requieren simulaciones de grandes poblaciones humanas con un variado conjunto de parámetros relacio [...]
+msgid ""
+"Simulation models of the transmission dynamics and health effects of malaria"
+" are an important tool for malaria control. They can be used to determine "
+"optimal strategies for delivering mosquito nets, chemotherapy, or new "
+"vaccines which are currently under development and testing.  Such modeling "
+"is extremely computer intensive, requiring simulations of large human "
+"populations with a diverse set of parameters related to biological and "
+"social factors that influence the distribution of the disease. "
+msgstr "Los modelos de simulación de la dinámica de transmisión y efectos en la salud de la malaria son una herramienta importante para el control de esta enfermedad. Pueden usarse para determinar las estrategias óptimas para suministrar mosquiteras, quimioterapia o nuevas vacunas que están actualmente en desarrollo y pruebas. Esa modelización requiere mucha potencia de cálculo; se necesitan simulaciones de poblaciones humanas grandes con un conjunto diverso de parámetros relacionados co [...]
 
 #: projects.inc:170
 msgid "University of Washington"
 msgstr "Universidad de Washington"
 
-#: projects.inc:171
-#: projects.inc:179
+#: projects.inc:171 projects.inc:179
 msgid "Biology"
 msgstr "Biología"
 
 #: projects.inc:172
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
-msgstr "Determina las formas tridimensionales de proteínas en investigación que pueden conducir a la larga a encontrar la cura de enfermedades humanas importantes. Ejecutando Rosetta at home usted nos ayudará a acelerar y extender nuestra investigación de modos que no sería posible intentarlo sin su ayuda. Usted también está ayudando en nuestros esfuerzos por diseñar nuevas proteínas para luchar contra enfermedades tales como VIH, Malaria, Cáncer y Alzheimer"
+msgid ""
+"Determine the 3-dimensional shapes of proteins in research that may "
+"ultimately lead to finding cures for some major human diseases. By running "
+"Rosetta at home you will help us speed up and extend our research in ways we "
+"couldn't possibly attempt without your help. You will also be helping our "
+"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
+"Cancer, and Alzheimer's"
+msgstr "Determina las formas tridimensionales de las proteínas, en una investigación que puede conducir a la larga a encontrar la cura de enfermedades humanas importantes. Ejecutando Rosetta at home nos ayudará a acelerar y extender nuestra investigación de modos que probablemente no podríamos intentar sin su ayuda. Usted también está ayudando en nuestros esfuerzos por diseñar nuevas proteínas para luchar contra enfermedades como el VIH, la malaria, el cáncer y el alzheimer"
 
 #: projects.inc:178
 msgid "University of Vienna"
 msgstr "Universidad de Viena"
 
 #: projects.inc:180
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
-msgstr "Calcula las semejanzas entre proteínas. SIMAP proporciona una base de datos pública de los datos resultantes, que juegan un papel clave en muchos proyectos de investigación bioinformática."
+msgid ""
+"Calculate similarities between proteins. SIMAP provides a public database of"
+" the resulting data, which plays a key role in many bioinformatics research "
+"projects."
+msgstr "Calcula semejanzas entre proteínas. SIMAP proporciona una base de datos pública de los datos resultantes, que juegan un papel clave en muchos proyectos de investigación bioinformática."
 
 #: projects.inc:186
 msgid "Earth Sciences"
@@ -516,8 +585,16 @@ msgid "Climate study"
 msgstr "Estudio del clima"
 
 #: projects.inc:200
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
-msgstr "Investiga las aproximaciones que han de hacerse en los modelos climáticos más avanzados. Ejecutando el modelo miles de veces esperamos encontrar cómo responde a ligeras modificaciones de estas aproximaciones - lo suficientemente pequeñas para no hacer las aproximaciones menos realistas. Esto nos permitirá mejorar nuestro conocimiento sobre la sensibilidad de nuestros modelos a pequeños cambios y también a cosas como cambios en el dióxido de carbono y en el ciclo del azufre. Esto  [...]
+msgid ""
+"Investigate the approximations that have to be made in state-of-the-art "
+"climate models. By running the model thousands of times we hope to find out "
+"how the model responds to slight tweaks to these approximations - slight "
+"enough to not make the approximations any less realistic. This will allow us"
+" to improve our understanding of how sensitive our models are to small "
+"changes and also to things like changes in carbon dioxide and the sulphur "
+"cycle. This will allow us to explore how climate may change in the next "
+"century under a wide range of different scenarios."
+msgstr "Investiga las aproximaciones que han de hacerse en los modelos climáticos más avanzados. Ejecutando el modelo miles de veces esperamos averiguar cómo responde a ligeros ajustes de estas aproximaciones (lo bastante pequeñas para no hacer las aproximaciones menos realistas). Esto nos permitirá mejorar nuestro conocimiento sobre la sensibilidad de nuestros modelos a cambios pequeños y también a cosas como cambios en el dióxido de carbono y en el ciclo del azufre. Esto nos permitirá  [...]
 
 #: projects.inc:207
 msgid "Physical Science"
@@ -528,97 +605,139 @@ msgid "Mechanical engineering"
 msgstr "Ingeniería mecánica"
 
 #: projects.inc:214
-msgid "Currently we are calculating the optimum design of a structure call the 52 bar truss"
+msgid ""
+"Currently we are calculating the optimum design of a structure call the 52 "
+"bar truss"
 msgstr "En la actualidad estamos calculando el diseño óptimo de una estructura llamada el armazón de 52 barras"
 
-#: projects.inc:224
-#: projects.inc:263
-#: projects.inc:271
+#: projects.inc:224 projects.inc:263 projects.inc:271
 msgid "Astronomy"
 msgstr "Astronomía"
 
 #: projects.inc:225
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
+msgid ""
+"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
+"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
+"Universe. We will measure physical parameters (such as stellar mass surface "
+"density, star formation rate surface density, attenuation, and first-order "
+"star formation history) on a resolved pixel-by-pixel basis using spectral "
+"energy distribution (SED) fitting techniques in a distributed computing "
+"mode."
 msgstr "Combinaremos los rangos espectrales de GALEX, Pan-STARRS1 y WISE para generar un atlas de galaxias del universo cercano multifrecuencia, en ultravioleta, visible e infrarrojo cercano. Mediremos parámetros físicos (como la densidad superficial de la masa estelar, la densidad superficial de la tasa de formación estelar, la atenuación y la historia de primer orden de la formación estelar) con resolución completa, píxel por píxel, usando técnicas de ajuste de la distribución de la en [...]
 
 #: projects.inc:247
 msgid "University of Texas at Austin"
 msgstr "Universidad de Texas en Austin"
 
-#: projects.inc:248
-#: projects.inc:279
+#: projects.inc:248 projects.inc:279
 msgid "Chemistry"
 msgstr "Química"
 
 #: projects.inc:249
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
-msgstr "Un problema comun en quimica teorica, fisica de la materia condensada y ciencia de los materiales es el calculo de la evolucion temporal de un sistema a escala atomica donde, por ejemplo, ocurre difucion o reacciones quimicas. Generalmente los eventos de interes son bastante raros (muchos ordenes de magnitud mas lento que los movimientos atomicos vibracionales), y por lo tanto la simulacion directa, el seguimiento de todos los moviemientos de los atomos, llevaria cientos de años  [...]
+msgid ""
+"A common problem in theoretical chemistry, condensed matter physics and "
+"materials science is the calculation of the time evolution of an atomic "
+"scale system where, for example, chemical reactions and/or diffusion occur. "
+"Generally the events of interest are quite rare (many orders of magnitude "
+"slower than the vibrational movements of the atoms), and therefore direct "
+"simulations, tracking every movement of the atoms, would take thousands of "
+"years of computer calculations on the fastest present day computer before a "
+"single event of interest can be expected to occur.  Our research group is "
+"interested in calculating the long time dynamics of systems."
+msgstr "Un problema común en química teórica, física de la materia condensada y ciencia de los materiales es el cálculo de la evolución temporal de un sistema a escala atómica donde, por ejemplo, ocurren reacciones químicas o difusión. Normalmente, los eventos de interés son bastante raros (muchos órdenes de magnitud más lentos que los movimientos vibratorios de los átomos) y por lo tanto las simulaciones directas, siguiendo cada movimiento de los átomos, llevarían miles de años de cálcu [...]
 
-# 95%
 #: projects.inc:262
 msgid "University of Illinois at Urbana-Champaign"
 msgstr "Universidad de Illinois en Urbana-Champaign"
 
 #: projects.inc:264
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
-msgstr "El objetivo de Cosmology at Home es la busqueda del modelo que describa mejor nuestro Universo y de encontrar la gama de modelos que concuerden con los datos disponibles en la fisica de partículas astronomicas."
+msgid ""
+"The goal of Cosmology at Home is to search for the model that best describes "
+"our Universe and to find the range of models that agree with the available "
+"astronomical particle physics data."
+msgstr "El objetivo de Cosmology at Home es buscar el modelo que describa mejor nuestro universo y encontrar la serie de modelos que concuerden con los datos astronómicos y de física de partículas disponibles."
 
 #: projects.inc:270
 msgid "Rensselaer Polytechnic Institute"
 msgstr "Instituto Politécnico Rensselaer"
 
 #: projects.inc:272
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
-msgstr "El objetivo de Milkyway at home es crear un modelo tridimensional de alta precisión de la galaxia Via Lactea usando los datos reunidos por el Sloan Digital Sky Survey."
+msgid ""
+"The goal of Milkyway at Home is to create a highly accurate three dimensional "
+"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
+"Survey."
+msgstr "El objetivo de Milkyway at Home es crear un modelo tridimensional de alta precisión de la Vía Láctea usando datos recolectados por el Sloan Digital Sky Survey."
 
 #: projects.inc:278
 msgid "Leiden University, The Netherlands"
-msgstr "Universidad de Leiden, Países Bajos"
+msgstr "Universidad de Leiden, los Países Bajos"
 
 #: projects.inc:280
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
+msgid ""
+"Surface science calculations using Classical Dynamics.  Leiden Classical "
+"allows volunteers, students and other scientist to submit their personal "
+"calculations to the grid. Each user has his own personal queue for Classical"
+" Dynamics jobs. In this way students have used the grid to simulate liquid "
+"argon, or to test the validity of the ideal gas law by actually doing the "
+"simulations through the grid."
 msgstr "Cálculos de ciencia de superficies usando dinámica clásica. Leiden Classical permite a voluntarios, estudiantes y otros científicos enviar sus cálculos personales a la red. Cada usuario tiene su propia cola personal de tareas de dinámica clásica. Los estudiantes han usado el grid de esta manera para simular argón líquido o comprobar la validez de la ley de los gases ideales haciendo simulaciones reales mediante la red."
 
 #: projects.inc:294
 msgid "Univ. of Wisconsin - Milwaukee, Max Planck Institute"
-msgstr "Univ. de Wisconsin - Milwaukee, Instituto Max Planck"
+msgstr "Univ. de Wisconsin-Milwaukee e Instituto Max Planck"
 
 #: projects.inc:295
 msgid "Astrophysics"
 msgstr "Astrofísica"
 
 #: projects.inc:296
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
+msgid ""
+"Search for spinning neutron stars (also called pulsars) using data from the "
+"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
+"observatory.  Einstein at Home is a World Year of Physics 2005 project "
+"supported by the American Physical Society (APS) and by a number of "
+"international organizations."
 msgstr "Busca estrellas de neutrones en rotación (llamadas también púlsares) usando datos de los detectores de ondas gravitatorias LIGO y GEO, y del radiotelescopio de Arecibo. Einstein at Home es un proyecto del Año Mundial de la Física 2005 financiado por la Sociedad Estadounidense de Física y diversas organizaciones extranjeras."
 
-#: projects.inc:310
-#: projects.inc:318
+#: projects.inc:310 projects.inc:318
 msgid "CERN (European Organization for Nuclear Research)"
 msgstr "CERN (Organización Europea para la Investigación Nuclear)"
 
-#: projects.inc:311
-#: projects.inc:319
+#: projects.inc:311 projects.inc:319
 msgid "Physics"
 msgstr "Física"
 
 #: projects.inc:312
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
+msgid ""
+"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
+"European Organization for Nuclear Research, the world's largest particle "
+"physics laboratory.  It is the most powerful instrument ever built to "
+"investigate on particles proprieties. LHC at home runs simulations to improve "
+"the design of LHC and its detectors."
 msgstr "El Gran Colisionador de Hadrones (LHC, por sus siglas en inglés) es un acelerador de partículas del CERN, la Organización Europea para la Investigación Nuclear, el mayor laboratorio de física de partículas del mundo. Es el instrumento más potente jamás construido para investigar las propiedades de las partículas. LHC at home ejecuta simulaciones para mejorar el diseño del LHC y sus detectores."
 
 #: projects.inc:320
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
+msgid ""
+"This project uses CERN-developed virtual machine technology for full-fledged"
+" LHC event physics simulation on volunteer computers.  Requires that you "
+"install VirtualBox on your computer"
 msgstr "Este proyecto usa tecnología de máquinas virtuales creada por el CERN para simular la física de los eventos del LHC con todo detalle en los computadores de los voluntarios. Requiere que instale VirtualBox en su computador."
 
 #: projects.inc:326
 msgid "University of California, Berkeley"
-msgstr "Universidad de California, Berkeley"
+msgstr "Universidad de California en Berkeley"
 
 #: projects.inc:327
 msgid "Astrophysics, astrobiology"
-msgstr "Astrofísica, astrobiología"
+msgstr "Astrofísica y astrobiología"
 
 #: projects.inc:328
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
+msgid ""
+"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
+"goal is to detect intelligent life outside Earth. One approach, known as "
+"radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
+"signals from space. Such signals are not known to occur naturally, so a "
+"detection would provide evidence of extraterrestrial technology."
 msgstr "La búsqueda de inteligencia extraterrestre (SETI, por sus siglas en inglés) es un campo científico cuyo objetivo es detectar vida inteligente fuera de la Tierra. Un enfoque, conocido como radioSETI, usa radiotelescopios para escuchar señales de radio del espacio de banda estrecha. No se conocen señales de ese tipo que ocurran de forma natural, por lo que una detección nos daría una evidencia de tecnología extraterrestre."
 
 #: projects.inc:342
@@ -630,12 +749,16 @@ msgid "Chemical engineering and nanotechnology"
 msgstr "Ingeniería química y nanotecnología"
 
 #: projects.inc:344
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
+msgid ""
+"The study of molecular magnets and controlled nanoscale magnetism.  These "
+"magnetic molecules may be used to develop tiny magnetic switches, with "
+"applications in medicine (such as local tumor chemotherapy) and "
+"biotechnology."
 msgstr "El estudio de los imanes moleculares y el magnetismo a nanoescala controlado. Estas moléculas magnéticas se pueden usar para desarrollar minúsculos interruptores magnéticos, con aplicaciones en medicina (como quimioterapia local de tumores) y biotecnología."
 
 #: projects.inc:351
 msgid "Multiple applications"
-msgstr "Múltiples aplicaciones"
+msgstr "Varias aplicaciones"
 
 #: projects.inc:356
 msgid "Chinese Academy of Sciences"
@@ -643,22 +766,26 @@ msgstr "Academia China de las Ciencias"
 
 #: projects.inc:357
 msgid "Physics, biochemistry, and others"
-msgstr "Física, bioquímica, y otros"
+msgstr "Física, bioquímica y otros"
 
 #: projects.inc:358
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
+msgid ""
+"The objective of CAS at home is to encourage and assist scientists in China to "
+"adopt the technologies of volunteer computing and volunteer thinking for "
+"their research."
 msgstr "El objetivo de CAS at home is fomentar y ayudar a los científicos de China a adoptar las tecnologías de la computación voluntaria y el pensamiento voluntario para sus investigaciones."
 
 #: projects.inc:365
 msgid "Mathematics, physics, evolution"
-msgstr "Matemáticas, física, evolución"
+msgstr "Matemáticas, física y evolución"
 
 #: projects.inc:366
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
+msgid ""
+"Yoyo at home is an adapter between BOINC and several existing volunteer "
+"computing projects: ECM, Muon, Evolution at home, and distributed.net"
 msgstr "Yoyo at home es un adaptador entre BOINC y varios proyectos de computación voluntaria existentes: ECM, Muon, Evolution at home y distributed.net"
 
-#: projects.inc:371
-#: projects.inc:527
+#: projects.inc:371 projects.inc:527
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 msgstr "Laboratorio MTA-SZTAKI de Sistemas Paralelos y Distribuidos (Hungría)"
 
@@ -667,7 +794,11 @@ msgid "European research projects"
 msgstr "Proyectos de investigación europeos"
 
 #: projects.inc:373
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
+msgid ""
+"The EDGeS at Home Beta project integrates volunteer computing into the service "
+"grid network of Europe by allowing service grids to send workunits to be "
+"processed by the volunteers of this project. The scientific projects covered"
+" by the project include math, physics, biology, etc."
 msgstr "El proyecto EDGeS at Home Beta integra la computación voluntaria en la red de grids de servicio de Europa permitiendo a los grids de servicio enviar tareas para que las procesen los voluntarios del proyecto. Los proyectos científicos que cubre EDGeS at Home son de matemáticas, física, biología, etc."
 
 #: projects.inc:379
@@ -680,7 +811,7 @@ msgstr "Varios proyectos de investigación españoles"
 
 #: projects.inc:381
 msgid "Research in physics, material science, and biomedicine"
-msgstr "Investigación en física, ciencia de los materiales, y biomedicina"
+msgstr "Investigación en física, ciencia de materiales y biomedicina"
 
 #: projects.inc:387
 msgid "IBM Corporate Citizenship"
@@ -691,7 +822,11 @@ msgid "Medical, environmental and other humanitarian research"
 msgstr "Investigación humanitaria en medicina, medio ambiente y otros campos"
 
 #: projects.inc:389
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
+msgid ""
+"To further critical non-profit research on some of humanity's most pressing "
+"problems by creating the world's largest volunteer computing grid.  Research"
+" includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"clean water and many more."
 msgstr "Desarrollar investigaciones cruciales sin ánimo de lucro sobre algunos de los problemas más acuciantes de la humanidad creando la mayor red de computación voluntaria del mundo. Los campos de investigación incluyen el SIDA-VIH, el cáncer, las enfermedades tropicales y olvidadas, la energía solar, la depuración del agua y muchos otros."
 
 #: projects.inc:395
@@ -710,50 +845,59 @@ msgstr "Matemáticas, física e inteligencia artificial"
 msgid "Simulation of quantum computing; Goldbach's conjecture."
 msgstr "Simulación de computación cuántica y conjetura de Goldbach."
 
-#: projects.inc:450
-#: projects.inc:458
+#: projects.inc:450 projects.inc:458
 msgid "Cryptography"
 msgstr "Criptografía"
 
 #: projects.inc:459
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
+msgid ""
+"Attempt to decode 3 original Enigma messages. The signals were intercepted "
+"in the North Atlantic in 1942 and are believed to be unbroken."
 msgstr "Intenta descifrar tres mensajes originales de Enigma. Las señales se interceptaron en el Atlántico Norte en 1942 y se cree que están por descifrar."
 
-#: projects.inc:465
-#: projects.inc:504
-#: projects.inc:512
-#: projects.inc:520
-#: projects.inc:528
-#: projects.inc:568
+#: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
+#: projects.inc:528 projects.inc:568
 msgid "Mathematics"
 msgstr "Matemáticas"
 
 #: projects.inc:466
 msgid "Study the Collatz Conjecture, an unsolved conjecture in mathematics"
-msgstr "Estudio de la Conjetura de Collatz, una conjetura no resuelta por las matemáticas"
+msgstr "Estudia la Conjetura de Collatz, una conjetura matemática no resuelta"
 
 #: projects.inc:471
 msgid "California State University Fullerton"
-msgstr "Universidad del Estado de California Fullerton"
+msgstr "Universidad Estatal de California Fullerton"
 
 #: projects.inc:472
 msgid "Factorization of large integers"
 msgstr "Factorización de enteros grandes"
 
 #: projects.inc:473
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
-msgstr "NFS at Home es un proyecto de investigación que usa computadores conectados a Internet para hacer el paso del cribado de red en la factorización de enteros grandes mediante la criba de cuerpos numéricos. Seguramente usted tuvo su primera experiencia con la descomposición de enteros en factores primos cuando estudiaba en la escuela primaria, haciendo descomposiciones como  15 = 3 * 5 o 35 = 5 * 7. NFS at Home es una continuación de esa experiencia, sólo que con enteros de cientos de cifras."
+msgid ""
+"NFS at Home is a research project that uses Internet-connected computers to do "
+"the lattice sieving step in the Number Field Sieve factorization of large "
+"integers. As a young school student, you gained your first experience at "
+"breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
+"NFS at Home is a continuation of that experience, only with integers that are "
+"hundreds of digits long."
+msgstr "NFS at Home es un proyecto de investigación que usa computadores conectados con Internet para hacer el paso del cribado de red en la factorización de enteros grandes mediante la criba de cuerpos numéricos. Seguramente usted tuvo su primera experiencia con la descomposición de enteros en factores primos cuando estudiaba en la escuela primaria, haciendo descomposiciones como  15 = 3 * 5 o 35 = 5 * 7. NFS at Home es una continuación de esa experiencia, sólo que con enteros de cientos de cifras."
 
 #: projects.inc:479
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
+msgid ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
 msgstr "Universidad Técnica Vilnius Gediminas y Universidad de Tecnología Kaunas (Lituania)"
 
 #: projects.inc:480
 msgid "Software testing"
-msgstr "Prueba de software"
+msgstr "Prueba de programas"
 
 #: projects.inc:481
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
+msgid ""
+"The aim of this project is to provide a powerful distributed computing "
+"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
+"well as others Lithuanian academic institutions.  Current applications "
+"involve the study of Monte-Carlo based software testing."
 msgstr "El objetivo de este proyecto es suministrar una plataforma de computación distribuida potente a los científicos de la Universidad Técnica Vilnius Gediminas y de otras instituciones académicas lituanas. Las aplicaciones actuales involucran el estudio de pruebas de programas basadas en el método de Monte Carlo."
 
 #: projects.inc:503
@@ -761,11 +905,20 @@ msgid "Mathematical Institute of Leiden University / Kennislink"
 msgstr "Instituto Matemático de la Universidad de Leiden / Kennislink"
 
 #: projects.inc:505
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
+msgid ""
+"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
+"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
+"product of the distinct prime factors of n. The ABC conjecture says that "
+"there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for "
+"any real h > 1. The ABC conjecture is currently one of the greatest open "
+"problems in mathematics. If it is proven to be true, a lot of other open "
+"problems can be answered directly from it."
 msgstr "Busca ternas abc: enteros positivos a, b y c tales que a+b=c; a < b < c; a, b y c no tienen divisores comunes y c > rad(abc), donde rad(n) es el producto de los factores primos distintos de n. La conjetura ABC dice que sólo hay un número finito de a, b y c tales que log(c)/log(rad(abc)) > h para todo real h > 1. La conjetura ABC es uno de los mayores problemas abiertos de las matemáticas en la actualidad. Si se demostrara que es cierta, se podrían resolver directamente a pa [...]
 
 #: projects.inc:513
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
+msgid ""
+"Primegrid has multiple projects searching for different forms of very large "
+"prime numbers, including searching for the largest known prime number."
 msgstr "Primegrid tiene muchos proyectos, que buscan números primos muy grandes de distintos tipos, incluida la búsqueda del mayor número primo conocido."
 
 #: projects.inc:519
@@ -773,423 +926,22 @@ msgid "Hochschule RheinMain University of Applied Sciences"
 msgstr "Universidad Hochschule RheinMain de Ciencias Aplicadas"
 
 #: projects.inc:521
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
+msgid ""
+"Search for counterexamples to two conjectures related to the identification "
+"of prime numbers"
 msgstr "Busca contraejemplos de dos conjeturas relacionadas con la identificación de números primos"
 
 #: projects.inc:529
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
+msgid ""
+"Find all the generalized binary number systems (in which bases are matrices "
+"and digits are vectors) up to dimension 11."
 msgstr "Encontrar todos los sistemas numéricos binarios generalizados (en los que las bases son matrices y las cifras son vectores) hasta la dimensión 11."
 
 #: ../html/inc/news.inc:40
 msgid "Comment"
-msgstr "Comentarios"
+msgstr "Comentar"
 
 #: ../html/inc/news.inc:111
 #, php-format
 msgid "News is available as an %sRSS feed%s"
 msgstr "Las noticias están disponibles en formato %sRSS feed%s"
-
-# 75%
-#, fuzzy
-#~ msgid "Astronomy, Physics, and Chemistry"
-#~ msgstr "Astronomía/Física/Química"
-
-#, php-format
-#~ msgid "%s for %s (%s MB)"
-#~ msgstr "%s para %s (%s MB)"
-#~ msgid ""
-#~ "BOINC is a program that lets you donate your idle computer time to science "
-#~ "projects like SETI at home, Climateprediction.net, Rosetta at home, World "
-#~ "Community Grid, and many others. <p> After installing BOINC on your "
-#~ "computer, you can connect it to as many of these projects as you like."
-#~ msgstr ""
-#~ "BOINC es un programa que le permite donar tiempo de inactividad de su "
-#~ "ordenador a proyectos científicos como SETI at home, Climateprediction.net, "
-#~ "Rosetta at home, World Community Grid, y muchos otros. <p> Después de instalar "
-#~ "BOINC en su ordenador, usted puede unirlo a tantos de dichos proyectos como "
-#~ "quiera."
-#~ msgid "Browser default"
-#~ msgstr "Idioma del navegador"
-
-#, php-format
-#~ msgid ""
-#~ " Use the idle time on your computer (Windows, Mac, or Linux) to cure "
-#~ "diseases, study global warming, discover pulsars, and do many other types of "
-#~ "scientific research.  It's safe, secure, and easy:  %sChoose%s projects  "
-#~ "%sDownload%s and run BOINC software  %sEnter%s an email address and "
-#~ "password. "
-#~ msgstr ""
-#~ " Use el tiempo de inactividad de su ordenador (Windows, Mac, o Linux) para "
-#~ "curar enfermedades, estudiar el calentamiento global, descubrir pulsares, y "
-#~ "haga muchos otros tipos de investigación científica. Es seguro, estable, y "
-#~ "fácil: %sElija%s proyectos %sDescargue%s y ejecute el programa BOINC %"
-#~ "sIntroduzca%s una dirección de correo electrónico y una contraseña."
-#~ msgid "Humanitarian research on disease, natural disasters and hunger."
-#~ msgstr ""
-#~ "Investigaciòn humanitaria de enfermedades, desastres naturales y hambre."
-#~ msgid "FreeHAL"
-#~ msgstr "FreeHAL"
-#~ msgid "private"
-#~ msgstr "privado"
-#~ msgid "POEM at HOME"
-#~ msgstr "POEM at HOME"
-#~ msgid "Docking at Home"
-#~ msgstr "Docking at Home"
-#~ msgid "GPUGrid.net"
-#~ msgstr "GPUGrid.net"
-#~ msgid "Superlink at Technion"
-#~ msgstr "Superlink at Technion"
-#~ msgid "The Lattice Project"
-#~ msgstr "El Proyecto Lattice"
-#~ msgid "Malariacontrol.net"
-#~ msgstr "Malariacontrol.net"
-#~ msgid "Rosetta at home"
-#~ msgstr "Rosetta at home"
-#~ msgid "SIMAP"
-#~ msgstr "SIMAP"
-#~ msgid "Virtual Prairie"
-#~ msgstr "Virtual Prairie"
-#~ msgid "University of Houston"
-#~ msgstr "Universidad de Houston"
-#~ msgid "Study of botanical ecosystems"
-#~ msgstr "Estudio de los ecosistemas botánicos"
-#~ msgid ""
-#~ "Provide ecological guidelines on the design of prairies with the best "
-#~ "potential for water purification."
-#~ msgstr ""
-#~ "Proporciona directrices ecológicas en el diseño de praderas con el mejor "
-#~ "potencial para la purificación del agua."
-#~ msgid "Climateprediction.net"
-#~ msgstr "Climateprediction.net"
-#~ msgid "Astronomy/Physics/Chemistry"
-#~ msgstr "Astronomía/Física/Química"
-#~ msgid "eOn"
-#~ msgstr "eOn"
-#~ msgid "Orbit at home"
-#~ msgstr "Orbit at home"
-#~ msgid "Planetary Science Institute"
-#~ msgstr "Instituto de Ciencias Planetarias"
-#~ msgid "Monitor and study the hazard posed by near-Earth asteroids"
-#~ msgstr ""
-#~ "Monitorizar y estudiar los peligros planteados por los asteroides "
-#~ "cercanos a la Tierra"
-#~ msgid "Cosmology at Home"
-#~ msgstr "Cosmology at Home"
-#~ msgid "University of Illinois at Urbana-Chamapign"
-#~ msgstr "Universidad de Illinois en Urbana-Chamapign"
-#~ msgid "Milkyway at home"
-#~ msgstr "Milkyway at home"
-#~ msgid "Leiden Classical"
-#~ msgstr "Leiden Classical"
-#~ msgid "uFluids at home"
-#~ msgstr "uFluids at home"
-#~ msgid "Purdue University"
-#~ msgstr "Universidad Purdue"
-#~ msgid "Physics/Aeronautics"
-#~ msgstr "Física/Aeronáutica"
-#~ msgid ""
-#~ "The uFluids project simulates two-phase fluid behavior in microgravity "
-#~ "and microfluidics problems. Our goal is to design better satellite "
-#~ "propellant management devices and address two-phase flow in microchannel "
-#~ "and MEMS devices."
-#~ msgstr ""
-#~ "El proyecto uFluids simula el comportamiento de fluidos bifase en "
-#~ "microgravedad y problemas de microfluidos. Nuestro objetivo es diseñar "
-#~ "mejores dispositivos de control del propergol de satélites y dirigir el "
-#~ "flujo bifase en dispositivos de microcanales y MEMS."
-#~ msgid "Einstein at home"
-#~ msgstr "Einstein at home"
-#~ msgid "LHC at home"
-#~ msgstr "LHC at home"
-#~ msgid "SETI at home"
-#~ msgstr "SETI at home"
-#~ msgid "Quantum Monte Carlo at Home"
-#~ msgstr "Quantum Monte Carlo at Home"
-#~ msgid "University of Muenster (Germany)"
-#~ msgstr "Universidad de Muenster (Alemania)"
-#~ msgid ""
-#~ "Study the structure and reactivity of molecules using Quantum Chemistry."
-#~ msgstr ""
-#~ "Estudio de la estructura y reactividad de las moleculas usando Química "
-#~ "Cuántica"
-#~ msgid "Spinhenge at home"
-#~ msgstr "Spinhenge at home"
-#~ msgid "CAS at home"
-#~ msgstr "CAS at home"
-#~ msgid "Yoyo at home"
-#~ msgstr "Yoyo at home"
-#~ msgid "EDGeS at Home"
-#~ msgstr "EDGeS at Home"
-#~ msgid "Ibercivis"
-#~ msgstr "Ibercivis"
-#~ msgid "World Community Grid"
-#~ msgstr "World Community Grid"
-#~ msgid "Enigma at Home"
-#~ msgstr "Enigma at Home"
-#~ msgid "Collatz Conjecture"
-#~ msgstr "Conjetura de Collatz"
-#~ msgid "NFS at home"
-#~ msgstr "NFS at home"
-#~ msgid "VTU at home"
-#~ msgstr "VTU at home"
-#~ msgid "AQUA at home"
-#~ msgstr "AQUA at home"
-#~ msgid "D-Wave Systems, Inc."
-#~ msgstr "D-Wave Systems, Inc."
-#~ msgid "Quantum computing"
-#~ msgstr "Computación cuántica"
-#~ msgid "ABC at home"
-#~ msgstr "ABC at home"
-#~ msgid "PrimeGrid"
-#~ msgstr "PrimeGrid"
-#~ msgid "Chess960 at home"
-#~ msgstr "Chess960 at home"
-#~ msgid "Chess-960.org"
-#~ msgstr "Chess-960.org"
-#~ msgid "The current release is known to work with these Linux versions:"
-#~ msgstr ""
-#~ "La versión actual se sabe que funciona con estas versiones de Linux:"
-#~ msgid ""
-#~ "For other Linux versions, check if a BOINC package is offered by your "
-#~ "Linux distribution."
-#~ msgstr ""
-#~ "Para otras versiones de Linux, comprueba si tu distribución de Linux "
-#~ "ofrece un paquete de BOINC."
-#~ msgid ""
-#~ "Alternatively, download the %1BOINC client for older Linux versions%2. "
-#~ "This doesn't have a graphical interface, but it should work on all Linux "
-#~ "systems, both x86 and x64."
-#~ msgstr ""
-#~ "Como alternativa, descarga el %1cliente BOINC para antiguas versiones de "
-#~ "Linux%2. Este no tiene interfaz gráfica, pero deberían funcionar en todos "
-#~ "los sistemas Linux, tanto x86 como x64."
-#~ msgid ""
-#~ "Note: if your computer is equipped with an Graphics Processing Unit "
-#~ "(GPU), you may be able to %suse it to compute faster%s"
-#~ msgstr ""
-#~ "Nota: si su ordenador dispone de una Unidad de Procesamiento Gráfico "
-#~ "(GPU), es posible que pueda %susarla para computar más rápido%s"
-#~ msgid "TeraFLOPS."
-#~ msgstr "TeraFLOPS."
-#~ msgid "Conferences"
-#~ msgstr "Congresos"
-#~ msgid "[check all that apply]"
-#~ msgstr "[Marque todas las que correspondan]"
-#~ msgid "Other:"
-#~ msgstr "Otros:"
-#~ msgid "Yes - I have been running BOINC on my computer for..."
-#~ msgstr "Sí - he estado usando BOINC en mi ordenador durante..."
-#~ msgid "less than a week"
-#~ msgstr "menos de una semana"
-#~ msgid "less than a month"
-#~ msgstr "menos de un mes"
-#~ msgid "less than a year"
-#~ msgstr "menos de un año"
-#~ msgid "more than a year"
-#~ msgstr "más de un año"
-#~ msgid "No - I used to run BOINC, but..."
-#~ msgstr "No -  usaba BOINC, pero ya no lo hago porque..."
-#~ msgid "I lost interest"
-#~ msgstr "perdí el interés"
-#~ msgid "it was too complicated"
-#~ msgstr "era demasiado complicado"
-#~ msgid "I stopped it and forgot to start again"
-#~ msgstr "lo detuve y me olvidé iniciarlo de nuevo"
-#~ msgid "it caused problems on my computer"
-#~ msgstr "causó problemas en mi computadora"
-#~ msgid "it used too much electricity"
-#~ msgstr "usaba demasiada electricidad"
-#~ msgid "I switched to a non-BOINC computing project"
-#~ msgstr "me cambié a un proyecto de cálculo no basado en BOINC"
-#~ msgid "No - I tried running BOINC, but..."
-#~ msgstr "No - intenté ejecutar BOINC, pero..."
-#~ msgid "the software didn't install correctly"
-#~ msgstr "el programa no se instaló correctamente"
-#~ msgid "I couldn't figure out how to use the software"
-#~ msgstr "no pude averiguar cómo utilizar el programa"
-#~ msgid "I had network communication problems"
-#~ msgstr "tuve problemas con la conexión de red"
-#~ msgid "I couldn't attach to a project"
-#~ msgstr "no pude unirme a un proyecto"
-#~ msgid "I attached to a project, but never got any work"
-#~ msgstr "me uní a un proyecto, pero nunca recibí trabajo alguno"
-#~ msgid "No - I never tried running BOINC, because..."
-#~ msgstr "No - nunca intenté ejecutar BOINC, porque..."
-#~ msgid "I was concerned about security"
-#~ msgstr "me preocupó la seguridad"
-#~ msgid "I wasn't interested in any of the projects"
-#~ msgstr "no estaba interesado en ninguno de los proyectos"
-#~ msgid "I don't have permission to run it on my computer"
-#~ msgstr "no tengo permiso para ejecutarlo en mi ordenador"
-#~ msgid "No version was available for my computer"
-#~ msgstr "no había una versión disponible para mi ordenador"
-#~ msgid "What kind of computers do you have running BOINC?"
-#~ msgstr "¿En qué tipo de ordenador ejecuta BOINC?"
-#~ msgid "Where are they?"
-#~ msgstr "¿Dónde están situados?"
-#~ msgid "Work"
-#~ msgstr "En el trabajo"
-#~ msgid "School"
-#~ msgstr "En la escuela"
-#~ msgid "How many computers?"
-#~ msgstr "¿Cuántos ordenadores?"
-#~ msgid "On average, how many hours per day are they powered on?"
-#~ msgstr "De promedio, ¿cuántas horas al día están encendidos?"
-#~ msgid "Age"
-#~ msgstr "Edad"
-#~ msgid "Sex"
-#~ msgstr "Sexo"
-#~ msgid "Male"
-#~ msgstr "Masculino"
-#~ msgid "Female"
-#~ msgstr "Femenino"
-#~ msgid "Your level of computer expertise"
-#~ msgstr "Su nivel técnico con los ordenadores"
-#~ msgid "Beginner"
-#~ msgstr "Principiante"
-#~ msgid "Intermediate"
-#~ msgstr "Intermedio"
-#~ msgid "Advanced"
-#~ msgstr "Avanzado"
-#~ msgid "Where did you learn about BOINC projects?"
-#~ msgstr "¿Donde se enteró de los proyectos BOINC?"
-#~ msgid "TV/radio/newspaper"
-#~ msgstr "TV/radio/prensa"
-#~ msgid "From friends, relatives, or coworkers"
-#~ msgstr "Por amigos, parientes, compañeros de trabajo"
-#~ msgid "Team message boards or web sites"
-#~ msgstr "Foros de equipos o sitios web"
-#~ msgid "The BOINC web site"
-#~ msgstr "En la página web de BOINC"
-#~ msgid "Other web sites"
-#~ msgstr "Otros sitios web"
-#~ msgid ""
-#~ "Which are the most important factors when you decide whether to "
-#~ "participate in a BOINC project?"
-#~ msgstr ""
-#~ "¿Cuáles son los factores más importantes cuando decide si unirse a un "
-#~ "proyecto BOINC?"
-#~ msgid "Nice-looking screensaver graphics"
-#~ msgstr "Protector de pantalla con gráficos atractivos"
-#~ msgid "Fair and quick granting of credit for work done"
-#~ msgstr "El crédito por el trabajo hecho se otorga de manera rápida y justa"
-#~ msgid "Getting more credit from this project than from others"
-#~ msgstr "Conseguir más crédito de éste proyecto que de otros"
-#~ msgid "Helpful and friendly message boards"
-#~ msgstr "Los foros de mensajes son útiles y amigables"
-#~ msgid "Participation by project staff on the message boards"
-#~ msgstr ""
-#~ "Los administradores del proyecto participan en los foros de mensajes"
-#~ msgid "Informative project web site"
-#~ msgstr "El sitio web del proyecto es informativo"
-#~ msgid "The science is important and beneficial"
-#~ msgstr "La ciencia es importante y beneficiosa"
-#~ msgid "Non-profit, and results are public"
-#~ msgstr "No tiene fines de lucro, y con resultados públicos"
-#~ msgid "Personal recognition if my computer finds something"
-#~ msgstr "Reconocimiento personal si mi ordenador encuentra algo"
-#~ msgid "Publication by the project in scientific journals"
-#~ msgstr "Participación del proyecto en publicaciones mensuales científicas"
-#~ msgid "Periodic email newsletters from the project"
-#~ msgstr "El proyecto envía boletines periódicos por correo electrónico"
-#~ msgid "How many BOINC projects do you participate in?"
-#~ msgstr "¿En cuántos proyectos BOINC participa?"
-#~ msgid "Do you run BOINC as a screensaver?"
-#~ msgstr "¿Usa BOINC como salvapantallas?"
-#~ msgid "Yes"
-#~ msgstr "Sí"
-#~ msgid "No"
-#~ msgstr "No"
-#~ msgid "Your usage of project messages boards:"
-#~ msgstr "Uso los foros del proyecto:"
-#~ msgid "to read information"
-#~ msgstr "para leer información"
-#~ msgid "to read and post information"
-#~ msgstr "para leer y escribir información"
-#~ msgid "None"
-#~ msgstr "no los uso"
-#~ msgid ""
-#~ "Where do you get information to help resolve problems with BOINC and/or "
-#~ "BOINC projects?"
-#~ msgstr ""
-#~ "¿Dónde obtiene información de ayuda para resolver los problemas con BOINC "
-#~ "y/o sus proyectos?"
-#~ msgid "The project message boards"
-#~ msgstr "Los foros del proyecto"
-#~ msgid "The BOINC message boards"
-#~ msgstr "Los foros de BOINC"
-#~ msgid "BOINC mailing lists"
-#~ msgstr "Listas de correo de BOINC"
-#~ msgid "The Unofficial BOINC Wiki"
-#~ msgstr "El Wiki no oficial de BOINC"
-#~ msgid "Team web sites"
-#~ msgstr "Páginas web de los equipos"
-#~ msgid "Google or other search engines"
-#~ msgstr "Google u otros buscadores"
-#~ msgid "... more"
-#~ msgstr "... más"
-#~ msgid "BOINC user survey"
-#~ msgstr "Encuesta para usuarios de BOINC"
-#~ msgid ""
-#~ "Several volunteer computing projects, including Climateprediction.net, "
-#~ "Einstein at home, and SETI at home, use software called BOINC.  If you "
-#~ "participate in projects like this, we request that you answer the "
-#~ "following questions.  This will help BOINC-based projects increase "
-#~ "participation and achieve greater scientific results. <p> Please answer "
-#~ "as many questions as you want, then go to the bottom and click OK. If you "
-#~ "previously completed the survey but your answers have changed, please "
-#~ "complete it again - your new answers will replace the old ones. <p> The "
-#~ "current results of the survey are <a href=poll_results.php>here</a>. "
-#~ msgstr ""
-#~ "Varios proyectos voluntarios de cálculo computacional, incluyendo  "
-#~ "Climateprediction.net, Einstein at home, y SETI at home, usan un programa "
-#~ "llamado BOINC. Si participa en proyectos como estos, le pedimos que "
-#~ "responda las siguientes preguntas. Esto ayudará a los proyectos basados "
-#~ "en BOINC a incrementar la participación y alcanzar mayores resultados "
-#~ "científicos.  <p> Por favor, reponda a todas las preguntas que desee, y "
-#~ "después vaya al final de la página y pulse OK . Si usted ha completado la "
-#~ "encuesta anteriormente pero sus respuestas han cambiado, por favor, "
-#~ "complételo de nuevo - sus nuevas respuestas reemplazarán a las "
-#~ "anteriores.  <p> Los resultados actuales de la encuesta están <a "
-#~ "href=poll_results.php>aquí</a>. "
-#~ msgid "Do you run BOINC?"
-#~ msgstr "¿Utiliza BOINC?"
-#~ msgid "Your participation"
-#~ msgstr "Su participación"
-#~ msgid "Your computers"
-#~ msgstr "Sus ordenadores"
-#~ msgid "You"
-#~ msgstr "Usted"
-#~ msgid "Nationality"
-#~ msgstr "Nacionalidad"
-#~ msgid "Comments"
-#~ msgstr "Comentarios"
-#~ msgid ""
-#~ "Please suggest ways that BOINC, and the projects that use it, could be "
-#~ "improved:"
-#~ msgstr ""
-#~ "Por favor sugiera formas en las que BOINC y los proyectos que lo "
-#~ "utilizan, puedan ser mejorados:"
-#~ msgid "When done click:"
-#~ msgstr "Al terminar haga clic:"
-#~ msgid "Error - results not recorded"
-#~ msgstr "Error - no se grabaron los resultados"
-#~ msgid ""
-#~ "An internal error has prevented us from recording your survey response.  "
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Un error interno nos ha impedido grabar sus respuestas a la encuesta. Por "
-#~ "favor inténtelo de nuevo más tarde."
-#~ msgid "Survey response recorded"
-#~ msgstr "Respuestas a la encuesta grabadas"
-#~ msgid "Thank you for completing the BOINC user survey."
-#~ msgstr "Muchas gracias por completar la encuesta para usuarios de BOINC."
-#~ msgid "Survey results"
-#~ msgstr "Resultados de la encuesta"
-#~ msgid ""
-#~ "These are the current results of the <a href=poll.php>BOINC user survey</"
-#~ "a>.  This page is updated every hour."
-#~ msgstr ""
-#~ "Estos son los resultados actuales de la <a href=poll.php> encuesta a "
-#~ "usuarios de BOINC</a>. Esta página se actualiza cada hora."
-
diff --git a/locale/fa/BOINC-Client.mo b/locale/fa/BOINC-Client.mo
index 327bf58..26804e0 100644
Binary files a/locale/fa/BOINC-Client.mo and b/locale/fa/BOINC-Client.mo differ
diff --git a/locale/fa/BOINC-Client.po b/locale/fa/BOINC-Client.po
index ab949f7..a9df094 100644
--- a/locale/fa/BOINC-Client.po
+++ b/locale/fa/BOINC-Client.po
@@ -4,20 +4,19 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-06-05 10:24-0700\n"
-"PO-Revision-Date: 2015-02-10 20:27-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.2.1\n"
 
-#: acct_mgr.cpp:448
-#: acct_mgr.cpp:457
+#: acct_mgr.cpp:448 acct_mgr.cpp:457
 msgid "Message from account manager"
 msgstr ""
 
@@ -26,7 +25,9 @@ msgid "Message from server"
 msgstr ""
 
 #: client_state.cpp:246
-msgid "Some tasks need more memory than allowed by your preferences.  Please check the preferences."
+msgid ""
+"Some tasks need more memory than allowed by your preferences.  Please check "
+"the preferences."
 msgstr ""
 
 #: client_state.cpp:501
@@ -39,11 +40,12 @@ msgstr ""
 
 #: cs_scheduler.cpp:575
 #, c-format
-msgid "You used the wrong URL for this project.  When convenient, remove this project, then add %s"
+msgid ""
+"You used the wrong URL for this project.  When convenient, remove this "
+"project, then add %s"
 msgstr ""
 
-#: cs_statefile.cpp:829
-#: ../sched/sched_types.cpp:259
+#: cs_statefile.cpp:829 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
 msgstr ""
 
@@ -59,13 +61,11 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: log_flags.cpp:259
-#: log_flags.cpp:436
+#: log_flags.cpp:259 log_flags.cpp:436
 msgid "Unexpected text in cc_config.xml"
 msgstr ""
 
-#: log_flags.cpp:410
-#: log_flags.cpp:462
+#: log_flags.cpp:410 log_flags.cpp:462
 msgid "Unrecognized tag in cc_config.xml"
 msgstr ""
 
@@ -90,7 +90,9 @@ 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."
+msgid ""
+"The project has changed its security key.  Please remove and add this "
+"project."
 msgstr ""
 
 #: ../sched/handle_request.cpp:943
@@ -102,7 +104,8 @@ 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."
+msgid ""
+"Your BOINC client software is too old.  Please install the current version."
 msgstr ""
 
 #: ../sched/handle_request.cpp:1259
@@ -114,11 +117,14 @@ 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"
+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"
+msgid ""
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to "
+"the current version"
 msgstr ""
 
 #: ../sched/sched_send.cpp:1146
@@ -140,7 +146,8 @@ msgstr ""
 
 #: ../sched/sched_send.cpp:1305
 #, c-format
-msgid "Tasks for %s are available, but your preferences are set to not accept them"
+msgid ""
+"Tasks for %s are available, but your preferences are set to not accept them"
 msgstr ""
 
 #: ../sched/sched_types.cpp:254
@@ -150,4 +157,3 @@ msgstr ""
 #: ../sched/sched_version.cpp:214
 msgid "Your app_info.xml file doesn't have a usable version of"
 msgstr ""
-
diff --git a/locale/fa/BOINC-Manager.mo b/locale/fa/BOINC-Manager.mo
index ca7972b..590a359 100644
Binary files a/locale/fa/BOINC-Manager.mo and b/locale/fa/BOINC-Manager.mo differ
diff --git a/locale/fa/BOINC-Manager.po b/locale/fa/BOINC-Manager.po
index e8c30bc..c6ae40a 100644
--- a/locale/fa/BOINC-Manager.po
+++ b/locale/fa/BOINC-Manager.po
@@ -4,12 +4,12 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-06-18 11:32-0500\n"
-"PO-Revision-Date: 2015-02-10 20:28-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,11 +17,11 @@ msgstr ""
 "X-Generator: Translate Toolkit 1.2.1\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
 "X-Poedit-SearchPath-0: clientgui\n"
 "X-Poedit-SearchPath-1: clientgui/msw\n"
 "X-Poedit-SearchPath-2: clientgui/gtk\n"
 "X-Poedit-SearchPath-3: clientgui/mac\n"
+"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
 
 #: clientgui/AccountInfoPage.cpp:387
 #, c-format
@@ -66,13 +66,11 @@ msgstr ""
 msgid "Find login information"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:668
+#: clientgui/AccountInfoPage.cpp:436 clientgui/AccountInfoPage.cpp:668
 msgid "&Password:"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:692
+#: clientgui/AccountInfoPage.cpp:443 clientgui/AccountInfoPage.cpp:692
 msgid "Choose a &password:"
 msgstr ""
 
@@ -126,33 +124,46 @@ msgid "Use account manager"
 msgstr ""
 
 #: clientgui/AccountInfoPage.cpp:587
-msgid "The minimum username length for this project is 1. Please enter a different username."
+msgid ""
+"The minimum username length for this project is 1. Please enter a different "
+"username."
 msgstr ""
 
 #: clientgui/AccountInfoPage.cpp:592
-msgid "The minimum username length for this account manager is 1. Please enter a different username."
+msgid ""
+"The minimum username length for this account manager is 1. Please enter a "
+"different username."
 msgstr ""
 
 #: clientgui/AccountInfoPage.cpp:598
-msgid "The minimum email address length for this project is 1. Please enter a different email address."
+msgid ""
+"The minimum email address length for this project is 1. Please enter a "
+"different email address."
 msgstr ""
 
 #: clientgui/AccountInfoPage.cpp:603
-msgid "The minimum email address length for this account manager is 1. Please enter a different email address."
+msgid ""
+"The minimum email address length for this account manager is 1. Please enter "
+"a different email address."
 msgstr ""
 
 #: clientgui/AccountInfoPage.cpp:616
 #, c-format
-msgid "The minimum password length for this project is %d. Please enter a different password."
+msgid ""
+"The minimum password length for this project is %d. Please enter a different "
+"password."
 msgstr ""
 
 #: clientgui/AccountInfoPage.cpp:622
 #, c-format
-msgid "The minimum password length for this account manager is %d. Please enter a different password."
+msgid ""
+"The minimum password length for this account manager is %d. Please enter a "
+"different password."
 msgstr ""
 
 #: clientgui/AccountInfoPage.cpp:634
-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:248
@@ -206,8 +217,7 @@ msgstr ""
 msgid "&Close Window"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:329
-#: clientgui/AdvancedFrame.cpp:336
+#: clientgui/AdvancedFrame.cpp:329 clientgui/AdvancedFrame.cpp:336
 #: clientgui/AdvancedFrame.cpp:343
 #, c-format
 msgid "Exit %s"
@@ -629,7 +639,8 @@ msgstr ""
 #: clientgui/BOINCBaseFrame.cpp:514
 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:523
@@ -667,7 +678,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:638
@@ -686,7 +698,8 @@ 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 ""
 
@@ -858,14 +871,12 @@ msgstr ""
 msgid "Open %s..."
 msgstr ""
 
-#: clientgui/BOINCTaskBar.cpp:525
-#: clientgui/BOINCTaskBar.cpp:621
+#: clientgui/BOINCTaskBar.cpp:525 clientgui/BOINCTaskBar.cpp:621
 #: clientgui/BOINCTaskBar.cpp:629
 msgid "Snooze"
 msgstr ""
 
-#: clientgui/BOINCTaskBar.cpp:527
-#: clientgui/BOINCTaskBar.cpp:648
+#: clientgui/BOINCTaskBar.cpp:527 clientgui/BOINCTaskBar.cpp:648
 #: clientgui/BOINCTaskBar.cpp:656
 msgid "Snooze GPU"
 msgstr ""
@@ -947,10 +958,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 ""
 
@@ -1026,10 +1035,8 @@ msgstr ""
 msgid "Berkeley Open Infrastructure for Network Computing"
 msgstr ""
 
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:396
+#: clientgui/DlgAbout.cpp:208 clientgui/DlgExitMessage.cpp:173
+#: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:396
 #: clientgui/DlgSelectComputer.cpp:162
 msgid "&OK"
 msgstr ""
@@ -1054,8 +1061,7 @@ msgstr ""
 msgid "Validation Error"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:797
-#: clientgui/DlgAdvPreferences.cpp:803
+#: clientgui/DlgAdvPreferences.cpp:797 clientgui/DlgAdvPreferences.cpp:803
 #: clientgui/DlgAdvPreferences.cpp:809
 msgid "Applications to add"
 msgstr ""
@@ -1065,8 +1071,7 @@ msgstr ""
 msgid "'%s' is not an executable application."
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:827
-#: clientgui/DlgAdvPreferences.cpp:874
+#: clientgui/DlgAdvPreferences.cpp:827 clientgui/DlgAdvPreferences.cpp:874
 #: clientgui/DlgAdvPreferences.cpp:898
 msgid "Add Exclusive App"
 msgstr ""
@@ -1164,7 +1169,8 @@ msgid "While computer is on batteries"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:142
-msgid "check this if you want this computer to do work while it runs on batteries"
+msgid ""
+"check this if you want this computer to do work while it runs on batteries"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:148
@@ -1172,7 +1178,8 @@ msgid "While computer is in use"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:151
-msgid "check this if you want this computer to do work even when you're using it"
+msgid ""
+"check this if you want this computer to do work even when you're using it"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:157
@@ -1180,7 +1187,9 @@ msgid "Use GPU while computer is in use"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:160
-msgid "check this if you want your GPU to do work even when you're using the computer"
+msgid ""
+"check this if you want your GPU to do work even when you're using the "
+"computer"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:172
@@ -1188,7 +1197,8 @@ msgid "Only after computer has been idle for"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:182
-msgid "do work only after you haven't used the computer for this number of minutes"
+msgid ""
+"do work only after you haven't used the computer for this number of minutes"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:187
@@ -1375,7 +1385,9 @@ msgid "Confirm before connecting to internet"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:479
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
+msgid ""
+"if checked, a confirmation dialog will be displayed before trying to connect "
+"to the Internet"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:483
@@ -1400,8 +1412,7 @@ msgstr ""
 msgid "network usage stop hour"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:597
-#: clientgui/DlgItemProperties.cpp:226
+#: clientgui/DlgAdvPreferencesBase.cpp:597 clientgui/DlgItemProperties.cpp:226
 msgid "Disk usage"
 msgstr ""
 
@@ -1470,7 +1481,8 @@ msgid "if checked, suspended work units are left in memory"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:712
-msgid "Suspend processor and network usage when these applications are running:"
+msgid ""
+"Suspend processor and network usage when these applications are running:"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:721
@@ -1510,8 +1522,7 @@ msgstr ""
 msgid "Message"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:287
-#: clientgui/DlgEventLog.cpp:351
+#: clientgui/DlgEventLog.cpp:287 clientgui/DlgEventLog.cpp:351
 msgid "&Show only this project"
 msgstr ""
 
@@ -1519,8 +1530,7 @@ msgstr ""
 msgid "Copy &All"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:293
-#: clientgui/DlgEventLog.cpp:297
+#: clientgui/DlgEventLog.cpp:293 clientgui/DlgEventLog.cpp:297
 msgid "Copy all the messages to the clipboard."
 msgstr ""
 
@@ -1528,18 +1538,19 @@ msgstr ""
 msgid "Copy &Selected"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:305
-#: clientgui/DlgEventLog.cpp:313
-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:305 clientgui/DlgEventLog.cpp:313
+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:307
-#: clientgui/DlgEventLog.cpp:315
-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:307 clientgui/DlgEventLog.cpp:315
+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:322
-#: clientgui/DlgItemProperties.cpp:66
+#: clientgui/DlgEventLog.cpp:322 clientgui/DlgItemProperties.cpp:66
 msgid "&Close"
 msgstr ""
 
@@ -1552,13 +1563,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 ""
 
@@ -1598,10 +1607,8 @@ msgstr ""
 msgid "Remember this decision and do not show this dialog."
 msgstr ""
 
-#: clientgui/DlgExitMessage.cpp:178
-#: clientgui/DlgGenericMessage.cpp:125
-#: clientgui/DlgOptions.cpp:401
-#: clientgui/DlgSelectComputer.cpp:167
+#: clientgui/DlgExitMessage.cpp:178 clientgui/DlgGenericMessage.cpp:125
+#: clientgui/DlgOptions.cpp:401 clientgui/DlgSelectComputer.cpp:167
 msgid "&Cancel"
 msgstr ""
 
@@ -1609,10 +1616,8 @@ msgstr ""
 msgid "Don't show this dialog again."
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:163
-#: clientgui/DlgItemProperties.cpp:166
-#: clientgui/DlgItemProperties.cpp:169
-#: clientgui/DlgItemProperties.cpp:172
+#: clientgui/DlgItemProperties.cpp:163 clientgui/DlgItemProperties.cpp:166
+#: clientgui/DlgItemProperties.cpp:169 clientgui/DlgItemProperties.cpp:172
 msgid "Don't fetch tasks for "
 msgstr ""
 
@@ -1644,8 +1649,7 @@ msgstr ""
 msgid "Properties of project "
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:212
-#: clientgui/DlgOptions.cpp:218
+#: clientgui/DlgItemProperties.cpp:212 clientgui/DlgOptions.cpp:218
 msgid "General"
 msgstr ""
 
@@ -1685,14 +1689,10 @@ msgstr ""
 msgid "Non CPU intensive"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:229
-#: clientgui/DlgItemProperties.cpp:231
-#: clientgui/DlgItemProperties.cpp:232
-#: clientgui/DlgItemProperties.cpp:234
-#: clientgui/DlgItemProperties.cpp:237
-#: clientgui/DlgItemProperties.cpp:246
-#: clientgui/DlgItemProperties.cpp:249
-#: clientgui/DlgItemProperties.cpp:252
+#: clientgui/DlgItemProperties.cpp:229 clientgui/DlgItemProperties.cpp:231
+#: clientgui/DlgItemProperties.cpp:232 clientgui/DlgItemProperties.cpp:234
+#: clientgui/DlgItemProperties.cpp:237 clientgui/DlgItemProperties.cpp:246
+#: clientgui/DlgItemProperties.cpp:249 clientgui/DlgItemProperties.cpp:252
 msgid "yes"
 msgstr ""
 
@@ -1700,8 +1700,7 @@ msgstr ""
 msgid "Suspended via GUI"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:231
-#: clientgui/DlgItemProperties.cpp:232
+#: clientgui/DlgItemProperties.cpp:231 clientgui/DlgItemProperties.cpp:232
 msgid "no"
 msgstr ""
 
@@ -1717,8 +1716,7 @@ msgstr ""
 msgid "Trickle-up pending"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:240
-#: clientgui/DlgItemProperties.cpp:242
+#: clientgui/DlgItemProperties.cpp:240 clientgui/DlgItemProperties.cpp:242
 msgid "Host location"
 msgstr ""
 
@@ -1802,13 +1800,11 @@ msgstr ""
 msgid "CPU time at last checkpoint"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:340
-#: clientgui/DlgItemProperties.cpp:355
+#: clientgui/DlgItemProperties.cpp:340 clientgui/DlgItemProperties.cpp:355
 msgid "CPU time"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:342
-#: clientgui/DlgItemProperties.cpp:356
+#: clientgui/DlgItemProperties.cpp:342 clientgui/DlgItemProperties.cpp:356
 msgid "Elapsed time"
 msgstr ""
 
@@ -1840,8 +1836,7 @@ msgstr ""
 msgid "Local: "
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: clientgui/DlgOptions.cpp:129 clientgui/DlgOptions.cpp:135
 msgid "Options"
 msgstr ""
 
@@ -1905,33 +1900,27 @@ msgstr ""
 msgid "HTTP Proxy Server Configuration"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:280
-#: clientgui/DlgOptions.cpp:344
+#: clientgui/DlgOptions.cpp:280 clientgui/DlgOptions.cpp:344
 msgid "Address:"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:288
-#: clientgui/DlgOptions.cpp:352
+#: clientgui/DlgOptions.cpp:288 clientgui/DlgOptions.cpp:352
 msgid "Port:"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:296
-#: clientgui/DlgOptions.cpp:360
+#: clientgui/DlgOptions.cpp:296 clientgui/DlgOptions.cpp:360
 msgid "Don't use proxy for:"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:303
-#: clientgui/DlgOptions.cpp:367
+#: clientgui/DlgOptions.cpp:303 clientgui/DlgOptions.cpp:367
 msgid "Leave these blank if not needed"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:309
-#: clientgui/DlgOptions.cpp:373
+#: clientgui/DlgOptions.cpp:309 clientgui/DlgOptions.cpp:373
 msgid "User Name:"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:317
-#: clientgui/DlgOptions.cpp:381
+#: clientgui/DlgOptions.cpp:317 clientgui/DlgOptions.cpp:381
 #: clientgui/DlgSelectComputer.cpp:151
 msgid "Password:"
 msgstr ""
@@ -1983,7 +1972,9 @@ msgstr ""
 
 #: clientgui/DlgOptions.cpp:695
 #, 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:90
@@ -2002,8 +1993,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 ""
 
@@ -2015,15 +2005,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 ""
@@ -2036,18 +2023,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 ""
 
@@ -2055,13 +2039,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 ""
 
@@ -2082,7 +2064,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
@@ -2110,7 +2093,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
@@ -2118,7 +2102,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
@@ -2129,8 +2115,7 @@ 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
 msgid "Team"
 msgstr ""
 
@@ -2211,7 +2196,9 @@ msgid "Missing application"
 msgstr ""
 
 #: clientgui/MainDocument.cpp:1805
-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:2418
@@ -2282,8 +2269,7 @@ msgstr ""
 msgid "Downloading"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2468
-#: clientgui/MainDocument.cpp:2538
+#: clientgui/MainDocument.cpp:2468 clientgui/MainDocument.cpp:2538
 msgid " (suspended - "
 msgstr ""
 
@@ -2327,8 +2313,7 @@ msgstr ""
 msgid "Waiting to run"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2508
-#: clientgui/MainDocument.cpp:2514
+#: clientgui/MainDocument.cpp:2508 clientgui/MainDocument.cpp:2514
 msgid "Ready to start"
 msgstr ""
 
@@ -2454,8 +2439,7 @@ msgstr ""
 msgid "%s; received from %s; on %s"
 msgstr ""
 
-#: clientgui/NoticeListCtrl.cpp:282
-#: clientgui/ProjectListCtrl.cpp:282
+#: clientgui/NoticeListCtrl.cpp:282 clientgui/ProjectListCtrl.cpp:282
 msgid "Click"
 msgstr ""
 
@@ -2463,8 +2447,7 @@ msgstr ""
 msgid "more..."
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:451
-#: clientgui/ProjectInfoPage.cpp:739
+#: clientgui/ProjectInfoPage.cpp:451 clientgui/ProjectInfoPage.cpp:739
 #: clientgui/ProjectInfoPage.cpp:743
 msgid "All"
 msgstr ""
@@ -2510,7 +2493,9 @@ msgid "Project URL:"
 msgstr ""
 
 #: clientgui/ProjectInfoPage.cpp:787
-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:811
@@ -2598,8 +2583,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 ""
 
@@ -2611,8 +2595,7 @@ msgstr ""
 msgid "SOCKS proxy"
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:136
-#: clientgui/sg_BoincSimpleGUI.cpp:119
+#: clientgui/sg_BoincSimpleFrame.cpp:136 clientgui/sg_BoincSimpleGUI.cpp:119
 msgid "Advanced View...\tCtrl+Shift+A"
 msgstr ""
 
@@ -2628,8 +2611,7 @@ msgstr ""
 msgid "Select the appearance of the user interface."
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:193
-#: clientgui/sg_BoincSimpleGUI.cpp:147
+#: clientgui/sg_BoincSimpleFrame.cpp:193 clientgui/sg_BoincSimpleGUI.cpp:147
 #, c-format
 msgid "&%s"
 msgstr ""
@@ -2876,8 +2858,7 @@ msgstr ""
 msgid "Connect to internet only between:"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:376
-#: clientgui/sg_DlgPreferences.cpp:393
+#: clientgui/sg_DlgPreferences.cpp:376 clientgui/sg_DlgPreferences.cpp:393
 msgid "Use no more than:"
 msgstr ""
 
@@ -2897,14 +2878,10 @@ msgstr ""
 msgid "Do work after idle for:"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:621
-#: clientgui/sg_DlgPreferences.cpp:624
-#: clientgui/sg_DlgPreferences.cpp:683
-#: clientgui/sg_DlgPreferences.cpp:687
-#: clientgui/sg_DlgPreferences.cpp:699
-#: clientgui/sg_DlgPreferences.cpp:703
-#: clientgui/sg_DlgPreferences.cpp:846
-#: clientgui/sg_DlgPreferences.cpp:857
+#: clientgui/sg_DlgPreferences.cpp:621 clientgui/sg_DlgPreferences.cpp:624
+#: clientgui/sg_DlgPreferences.cpp:683 clientgui/sg_DlgPreferences.cpp:687
+#: clientgui/sg_DlgPreferences.cpp:699 clientgui/sg_DlgPreferences.cpp:703
+#: clientgui/sg_DlgPreferences.cpp:846 clientgui/sg_DlgPreferences.cpp:857
 msgid "Anytime"
 msgstr ""
 
@@ -2977,7 +2954,9 @@ msgid "Update"
 msgstr ""
 
 #: clientgui/sg_ProjectCommandPopup.cpp:62
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
+msgid ""
+"Report all completed tasks, get latest credit, get latest preferences, and "
+"possibly get more tasks."
 msgstr ""
 
 #: clientgui/sg_ProjectCommandPopup.cpp:68
@@ -2999,11 +2978,15 @@ msgid "Reset project"
 msgstr ""
 
 #: clientgui/sg_ProjectCommandPopup.cpp:80
-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."
+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:86
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
+msgid ""
+"Remove this project.  Tasks in progress will be lost (use 'Update' first to "
+"report any completed tasks)."
 msgstr ""
 
 #: clientgui/sg_ProjectCommandPopup.cpp:91
@@ -3047,8 +3030,7 @@ msgid "Are you sure you want to remove project '%s'?"
 msgstr ""
 
 #: clientgui/sg_ProjectCommandPopup.cpp:257
-#: clientgui/sg_StatImageLoader.cpp:138
-#: clientgui/sg_StatImageLoader.cpp:198
+#: clientgui/sg_StatImageLoader.cpp:138 clientgui/sg_StatImageLoader.cpp:198
 msgid "Remove Project"
 msgstr ""
 
@@ -3064,8 +3046,7 @@ msgstr ""
 msgid "Work done for this project"
 msgstr ""
 
-#: clientgui/sg_ProjectPanel.cpp:77
-#: clientgui/sg_ProjectsComponent.cpp:123
+#: clientgui/sg_ProjectPanel.cpp:77 clientgui/sg_ProjectsComponent.cpp:123
 msgid "Synchronize projects with account manager system"
 msgstr ""
 
@@ -3121,8 +3102,7 @@ msgstr ""
 msgid "%s. Work done by %s: %0.2f"
 msgstr ""
 
-#: clientgui/sg_TaskCommandPopup.cpp:60
-#: clientgui/sg_ViewTabPage.cpp:424
+#: clientgui/sg_TaskCommandPopup.cpp:60 clientgui/sg_ViewTabPage.cpp:424
 msgid "Show graphics"
 msgstr ""
 
@@ -3226,8 +3206,7 @@ msgstr ""
 msgid "Status: %s"
 msgstr ""
 
-#: clientgui/sg_ViewTabPage.cpp:140
-#: clientgui/sg_ViewTabPage.cpp:280
+#: clientgui/sg_ViewTabPage.cpp:140 clientgui/sg_ViewTabPage.cpp:280
 #, c-format
 msgid "%.1lf"
 msgstr ""
@@ -3245,8 +3224,7 @@ msgstr ""
 msgid "Application: "
 msgstr ""
 
-#: clientgui/sg_ViewTabPage.cpp:449
-#: clientgui/sg_ViewTabPage.cpp:453
+#: clientgui/sg_ViewTabPage.cpp:449 clientgui/sg_ViewTabPage.cpp:453
 msgid "Time Remaining: "
 msgstr ""
 
@@ -3300,8 +3278,7 @@ msgstr ""
 msgid "Invalid Account Key; please enter a valid Account Key"
 msgstr ""
 
-#: clientgui/ValidateAccountKey.cpp:82
-#: clientgui/ValidateEmailAddress.cpp:86
+#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
 msgid "Validation conflict"
 msgstr ""
 
@@ -3324,17 +3301,13 @@ msgid ""
 "http://www.example.com/"
 msgstr ""
 
-#: clientgui/ValidateURL.cpp:83
-#: clientgui/ValidateURL.cpp:87
-#: clientgui/ValidateURL.cpp:91
-#: clientgui/ValidateURL.cpp:103
-#: clientgui/ValidateURL.cpp:107
-#: clientgui/ValidateURL.cpp:110
+#: clientgui/ValidateURL.cpp:83 clientgui/ValidateURL.cpp:87
+#: clientgui/ValidateURL.cpp:91 clientgui/ValidateURL.cpp:103
+#: clientgui/ValidateURL.cpp:107 clientgui/ValidateURL.cpp:110
 msgid "Invalid URL"
 msgstr ""
 
-#: clientgui/ValidateURL.cpp:84
-#: clientgui/ValidateURL.cpp:88
+#: clientgui/ValidateURL.cpp:84 clientgui/ValidateURL.cpp:88
 #: clientgui/ValidateURL.cpp:92
 msgid ""
 "Please specify a valid URL.\n"
@@ -3342,8 +3315,7 @@ msgid ""
 "http://boincproject.example.com"
 msgstr ""
 
-#: clientgui/ValidateURL.cpp:104
-#: clientgui/ValidateURL.cpp:108
+#: clientgui/ValidateURL.cpp:104 clientgui/ValidateURL.cpp:108
 #, c-format
 msgid "'%s' does not contain a valid host name."
 msgstr ""
@@ -3353,10 +3325,8 @@ msgstr ""
 msgid "'%s' does not contain a valid path."
 msgstr ""
 
-#: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:169
-#: clientgui/ViewStatistics.cpp:1965
-#: clientgui/ViewTransfers.cpp:159
+#: clientgui/ViewMessages.cpp:84 clientgui/ViewProjects.cpp:169
+#: clientgui/ViewStatistics.cpp:1965 clientgui/ViewTransfers.cpp:159
 #: clientgui/ViewWork.cpp:182
 msgid "Commands"
 msgstr ""
@@ -3369,13 +3339,11 @@ msgstr ""
 msgid "Copy selected messages"
 msgstr ""
 
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
+#: clientgui/ViewMessages.cpp:106 clientgui/ViewMessages.cpp:502
 msgid "Show only this project"
 msgstr ""
 
-#: clientgui/ViewMessages.cpp:107
-#: clientgui/ViewMessages.cpp:503
+#: clientgui/ViewMessages.cpp:107 clientgui/ViewMessages.cpp:503
 msgid "Show only the messages for the selected project."
 msgstr ""
 
@@ -3403,8 +3371,7 @@ msgstr ""
 msgid "Show messages for all projects."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:219
-#: clientgui/ViewStatistics.cpp:442
+#: clientgui/ViewProjects.cpp:219 clientgui/ViewStatistics.cpp:442
 msgid "Account"
 msgstr ""
 
@@ -3416,8 +3383,7 @@ msgstr ""
 msgid "Avg. work done"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:224
-#: clientgui/ViewTransfers.cpp:187
+#: clientgui/ViewProjects.cpp:224 clientgui/ViewTransfers.cpp:187
 #: clientgui/ViewWork.cpp:233
 msgid "Status"
 msgstr ""
@@ -3454,8 +3420,7 @@ msgstr ""
 msgid "Removing project..."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:542
-#: clientgui/ViewWork.cpp:598
+#: clientgui/ViewProjects.cpp:542 clientgui/ViewWork.cpp:598
 msgid "Launching browser..."
 msgstr ""
 
@@ -3628,13 +3593,11 @@ msgstr ""
 msgid "Show chart for next project"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2013
-#: clientgui/ViewStatistics.cpp:2410
+#: clientgui/ViewStatistics.cpp:2013 clientgui/ViewStatistics.cpp:2410
 msgid "Hide project list"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2014
-#: clientgui/ViewStatistics.cpp:2410
+#: clientgui/ViewStatistics.cpp:2014 clientgui/ViewStatistics.cpp:2410
 msgid "Use entire area for graphs"
 msgstr ""
 
@@ -3678,16 +3641,11 @@ msgstr ""
 msgid "Statistics"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2097
-#: clientgui/ViewStatistics.cpp:2118
-#: clientgui/ViewStatistics.cpp:2139
-#: clientgui/ViewStatistics.cpp:2161
-#: clientgui/ViewStatistics.cpp:2182
-#: clientgui/ViewStatistics.cpp:2203
-#: clientgui/ViewStatistics.cpp:2224
-#: clientgui/ViewStatistics.cpp:2245
-#: clientgui/ViewStatistics.cpp:2266
-#: clientgui/ViewStatistics.cpp:2290
+#: clientgui/ViewStatistics.cpp:2097 clientgui/ViewStatistics.cpp:2118
+#: clientgui/ViewStatistics.cpp:2139 clientgui/ViewStatistics.cpp:2161
+#: clientgui/ViewStatistics.cpp:2182 clientgui/ViewStatistics.cpp:2203
+#: clientgui/ViewStatistics.cpp:2224 clientgui/ViewStatistics.cpp:2245
+#: clientgui/ViewStatistics.cpp:2266 clientgui/ViewStatistics.cpp:2290
 msgid "Updating charts..."
 msgstr ""
 
@@ -3719,8 +3677,7 @@ msgstr ""
 msgid "File"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:183
-#: clientgui/ViewWork.cpp:232
+#: clientgui/ViewTransfers.cpp:183 clientgui/ViewWork.cpp:232
 msgid "Progress"
 msgstr ""
 
@@ -3806,13 +3763,11 @@ msgstr ""
 msgid " (project backoff: "
 msgstr ""
 
-#: clientgui/ViewWork.cpp:186
-#: clientgui/ViewWork.cpp:766
+#: clientgui/ViewWork.cpp:186 clientgui/ViewWork.cpp:766
 msgid "Show active tasks"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:187
-#: clientgui/ViewWork.cpp:767
+#: clientgui/ViewWork.cpp:187 clientgui/ViewWork.cpp:767
 msgid "Show only active tasks."
 msgstr ""
 
@@ -3921,14 +3876,18 @@ msgstr ""
 
 #: clientgui/WelcomePage.cpp:325
 msgid ""
-"You have chosen to add a new volunteer computing project or change which projects\n"
+"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"
+"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"
+"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"
@@ -3958,8 +3917,7 @@ msgstr ""
 msgid "Question"
 msgstr ""
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
+#: clientgui/wizardex.cpp:377 clientgui/wizardex.cpp:553
 msgid "&Next >"
 msgstr ""
 
@@ -3996,7 +3954,9 @@ msgid "Pie Ctrl"
 msgstr ""
 
 #: clientgui/mac/MacAccessiblity.cpp:257
-msgid "for accessibility support, please select advanced from the view menu or type command shift a"
+msgid ""
+"for accessibility support, please select advanced from the view menu or type "
+"command shift a"
 msgstr ""
 
 #: clientgui/mac/MacAccessiblity.cpp:302
@@ -4044,8 +4004,7 @@ msgstr ""
 msgid "list is empty"
 msgstr ""
 
-#: clientgui/mac/MacAccessiblity.cpp:858
-#: clientgui/mac/MacAccessiblity.cpp:870
+#: clientgui/mac/MacAccessiblity.cpp:858 clientgui/mac/MacAccessiblity.cpp:870
 #, c-format
 msgid "; row %d; "
 msgstr ""
@@ -4116,4 +4075,3 @@ msgstr ""
 #: clientgui/DlgAdvPreferences.h:31
 msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
 msgstr ""
-
diff --git a/locale/fa/BOINC-Setup.mo b/locale/fa/BOINC-Setup.mo
index 3b00588..86a21d7 100644
Binary files a/locale/fa/BOINC-Setup.mo and b/locale/fa/BOINC-Setup.mo differ
diff --git a/locale/fa/BOINC-Setup.po b/locale/fa/BOINC-Setup.po
index d3b3870..d1b8a3d 100644
--- a/locale/fa/BOINC-Setup.po
+++ b/locale/fa/BOINC-Setup.po
@@ -5,12 +5,12 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-08-06 16:50-0800\n"
-"PO-Revision-Date: 2015-02-10 20:29-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,13 +23,11 @@ msgstr ""
 msgid "Sorry, this version of %s requires system 10.4 or higher."
 msgstr ""
 
-#: mac_installer/PostInstall.cpp:131
-#: mac_installer/PostInstall.cpp:1211
+#: mac_installer/PostInstall.cpp:131 mac_installer/PostInstall.cpp:1211
 msgid "Yes"
 msgstr ""
 
-#: mac_installer/PostInstall.cpp:132
-#: mac_installer/PostInstall.cpp:1212
+#: mac_installer/PostInstall.cpp:132 mac_installer/PostInstall.cpp:1212
 msgid "No"
 msgstr ""
 
@@ -40,9 +38,11 @@ msgstr ""
 #: mac_installer/PostInstall.cpp:1491
 #, c-format
 msgid ""
-"Users who are permitted to administer this computer will automatically be allowed to run and control %s.\n"
+"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?"
+"Do you also want non-administrative users to be able to run and control %s "
+"on this Mac?"
 msgstr ""
 
 #: mac_installer/PostInstall.cpp:1519
@@ -101,7 +101,8 @@ msgstr ""
 #: mac_installer/uninstall.cpp:796
 #, c-format
 msgid ""
-"Enter your administrator password to completely remove %s from you computer.\n"
+"Enter your administrator password to completely remove %s from you "
+"computer.\n"
 "\n"
 msgstr ""
 
@@ -112,4 +113,3 @@ msgstr ""
 #: mac_installer/uninstall.cpp:1544
 msgid "Continue..."
 msgstr ""
-
diff --git a/locale/fa/BOINC-Web.mo b/locale/fa/BOINC-Web.mo
index 4b368dd..1f90503 100644
Binary files a/locale/fa/BOINC-Web.mo and b/locale/fa/BOINC-Web.mo differ
diff --git a/locale/fa/BOINC-Web.po b/locale/fa/BOINC-Web.po
index e6b8d1d..9ab46fb 100644
--- a/locale/fa/BOINC-Web.po
+++ b/locale/fa/BOINC-Web.po
@@ -4,12 +4,12 @@
 # FileID  : $Id$
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at ssl.berkeley.edu>\n"
 "POT-Creation-Date: 2013-08-22 16:22 PDT\n"
-"PO-Revision-Date: 2015-02-10 20:30-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,7 +30,10 @@ msgid "Seismology"
 msgstr ""
 
 #: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
+msgid ""
+"The Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to Internet-connected computers.  You must buy a "
+"sensor to participate."
 msgstr ""
 
 #: projects.inc:27
@@ -42,23 +45,24 @@ msgid "Environmental research"
 msgstr ""
 
 #: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
+msgid ""
+"This project is creating a free and continuously updated map of radiation "
+"levels by using sensors connected to volunteers' computers.  You must buy a "
+"sensor to participate."
 msgstr ""
 
 #: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
+msgid ""
+"To participate in these projects you must buy a sensor and attach it to your "
+"computer."
 msgstr ""
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
 msgstr ""
 
-#: projects.inc:50
-#: projects.inc:342
-#: projects.inc:386
-#: projects.inc:435
-#: projects.inc:442
-#: projects.inc:489
+#: projects.inc:50 projects.inc:342 projects.inc:386 projects.inc:435
+#: projects.inc:442 projects.inc:489
 msgid "Private"
 msgstr ""
 
@@ -67,7 +71,11 @@ msgid "Artificial intelligence"
 msgstr ""
 
 #: projects.inc:52
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
+msgid ""
+"Parse and convert semantic nets for use in FreeHAL, an artificial "
+"intelligence that uses semantic networks, stemmers, part of speech "
+"databases, and part of speech taggers in order to imitate human behavior in "
+"conversations."
 msgstr ""
 
 #: projects.inc:58
@@ -83,7 +91,12 @@ msgid "Antimalarial drug discovery"
 msgstr ""
 
 #: projects.inc:73
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
+msgid ""
+"The parasite that causes malaria continues to evolve resistance to available "
+"medication. We therefore urgently need to discover new drugs to replace "
+"existing drugs. Importantly, these new drugs need to target NEW proteins in "
+"the parasite. The FightMalaria at Home project is aimed at finding these new "
+"targets."
 msgstr ""
 
 #: projects.inc:79
@@ -95,7 +108,12 @@ msgid "Protein structure prediction"
 msgstr ""
 
 #: projects.inc:81
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
+msgid ""
+"POEM at HOME uses a computational approach to predict the biologically active "
+"structure of proteins, to understand the signal-processing mechanisms when "
+"the proteins interact with one another, to understand diseases related to "
+"protein malfunction or aggregation, and to develop new drugs on the basis of "
+"the three-dimensions structure of biologically important proteins."
 msgstr ""
 
 #: projects.inc:87
@@ -107,7 +125,11 @@ msgid "Study of protein - ligand interactions"
 msgstr ""
 
 #: projects.inc:89
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
+msgid ""
+"Docking at Home has both bioscience and computer science goals. The project "
+"aims to further knowledge of the atomic details of protein-ligand "
+"interactions and, by doing so, will search for insights into the discovery "
+"of novel pharmaceuticals."
 msgstr ""
 
 #: projects.inc:103
@@ -119,7 +141,11 @@ msgid "Molecular simulations of proteins"
 msgstr ""
 
 #: projects.inc:105
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
+msgid ""
+"GPUGrid.net opens novel computational scenarios by the first full-atom "
+"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
+"New biomedical applications suddenly become possible giving a new role to "
+"computational biology for biomedical research."
 msgstr ""
 
 #: projects.inc:111
@@ -131,11 +157,15 @@ msgid "Genetic linkage analysis"
 msgstr ""
 
 #: projects.inc:113
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
+msgid ""
+"Superlink at Technion helps geneticists all over the world find disease-"
+"provoking genes causing some types of diabetes, hypertension (high blood "
+"pressure), cancer, schizophrenia and many others."
 msgstr ""
 
 #: projects.inc:127
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
+msgid ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
 msgstr ""
 
 #: projects.inc:128
@@ -143,7 +173,11 @@ msgid "Life science research"
 msgstr ""
 
 #: projects.inc:129
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
+msgid ""
+"The Lattice Project supplies computing power to scientists at the University "
+"of Maryland studying evolutionary relationships based on DNA sequence data; "
+"bacterial, plasmid, and virus protein sequences; and biological diversity in "
+"nature reserves. "
 msgstr ""
 
 #: projects.inc:135
@@ -155,20 +189,32 @@ msgid "Epidemiology"
 msgstr ""
 
 #: projects.inc:137
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
+msgid ""
+"Simulation models of the transmission dynamics and health effects of malaria "
+"are an important tool for malaria control. They can be used to determine "
+"optimal strategies for delivering mosquito nets, chemotherapy, or new "
+"vaccines which are currently under development and testing.  Such modeling "
+"is extremely computer intensive, requiring simulations of large human "
+"populations with a diverse set of parameters related to biological and "
+"social factors that influence the distribution of the disease. "
 msgstr ""
 
 #: projects.inc:159
 msgid "University of Washington"
 msgstr ""
 
-#: projects.inc:160
-#: projects.inc:168
+#: projects.inc:160 projects.inc:168
 msgid "Biology"
 msgstr ""
 
 #: projects.inc:161
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
+msgid ""
+"Determine the 3-dimensional shapes of proteins in research that may "
+"ultimately lead to finding cures for some major human diseases. By running "
+"Rosetta at home you will help us speed up and extend our research in ways we "
+"couldn't possibly attempt without your help. You will also be helping our "
+"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
+"Cancer, and Alzheimer's"
 msgstr ""
 
 #: projects.inc:167
@@ -176,7 +222,10 @@ msgid "University of Vienna"
 msgstr ""
 
 #: projects.inc:169
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
+msgid ""
+"Calculate similarities between proteins. SIMAP provides a public database of "
+"the resulting data, which plays a key role in many bioinformatics research "
+"projects."
 msgstr ""
 
 #: projects.inc:175
@@ -192,34 +241,54 @@ msgid "Climate study"
 msgstr ""
 
 #: projects.inc:189
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
+msgid ""
+"Investigate the approximations that have to be made in state-of-the-art "
+"climate models. By running the model thousands of times we hope to find out "
+"how the model responds to slight tweaks to these approximations - slight "
+"enough to not make the approximations any less realistic. This will allow us "
+"to improve our understanding of how sensitive our models are to small "
+"changes and also to things like changes in carbon dioxide and the sulphur "
+"cycle. This will allow us to explore how climate may change in the next "
+"century under a wide range of different scenarios."
 msgstr ""
 
 #: projects.inc:196
 msgid "Astronomy, Physics, and Chemistry"
 msgstr ""
 
-#: projects.inc:202
-#: projects.inc:241
-#: projects.inc:249
+#: projects.inc:202 projects.inc:241 projects.inc:249
 msgid "Astronomy"
 msgstr ""
 
 #: projects.inc:203
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
+msgid ""
+"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
+"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
+"Universe. We will measure physical parameters (such as stellar mass surface "
+"density, star formation rate surface density, attenuation, and first-order "
+"star formation history) on a resolved pixel-by-pixel basis using spectral "
+"energy distribution (SED) fitting techniques in a distributed computing mode."
 msgstr ""
 
 #: projects.inc:225
 msgid "University of Texas at Austin"
 msgstr ""
 
-#: projects.inc:226
-#: projects.inc:257
+#: projects.inc:226 projects.inc:257
 msgid "Chemistry"
 msgstr ""
 
 #: projects.inc:227
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
+msgid ""
+"A common problem in theoretical chemistry, condensed matter physics and "
+"materials science is the calculation of the time evolution of an atomic "
+"scale system where, for example, chemical reactions and/or diffusion occur. "
+"Generally the events of interest are quite rare (many orders of magnitude "
+"slower than the vibrational movements of the atoms), and therefore direct "
+"simulations, tracking every movement of the atoms, would take thousands of "
+"years of computer calculations on the fastest present day computer before a "
+"single event of interest can be expected to occur.  Our research group is "
+"interested in calculating the long time dynamics of systems."
 msgstr ""
 
 #: projects.inc:240
@@ -227,7 +296,10 @@ msgid "University of Illinois at Urbana-Champaign"
 msgstr ""
 
 #: projects.inc:242
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
+msgid ""
+"The goal of Cosmology at Home is to search for the model that best describes "
+"our Universe and to find the range of models that agree with the available "
+"astronomical particle physics data."
 msgstr ""
 
 #: projects.inc:248
@@ -235,7 +307,10 @@ msgid "Rensselaer Polytechnic Institute"
 msgstr ""
 
 #: projects.inc:250
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
+msgid ""
+"The goal of Milkyway at Home is to create a highly accurate three dimensional "
+"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
+"Survey."
 msgstr ""
 
 #: projects.inc:256
@@ -243,7 +318,13 @@ msgid "Leiden University, The Netherlands"
 msgstr ""
 
 #: projects.inc:258
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
+msgid ""
+"Surface science calculations using Classical Dynamics.  Leiden Classical "
+"allows volunteers, students and other scientist to submit their personal "
+"calculations to the grid. Each user has his own personal queue for Classical "
+"Dynamics jobs. In this way students have used the grid to simulate liquid "
+"argon, or to test the validity of the ideal gas law by actually doing the "
+"simulations through the grid."
 msgstr ""
 
 #: projects.inc:272
@@ -255,25 +336,36 @@ msgid "Astrophysics"
 msgstr ""
 
 #: projects.inc:274
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
+msgid ""
+"Search for spinning neutron stars (also called pulsars) using data from the "
+"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
+"observatory.  Einstein at Home is a World Year of Physics 2005 project "
+"supported by the American Physical Society (APS) and by a number of "
+"international organizations."
 msgstr ""
 
-#: projects.inc:288
-#: projects.inc:296
+#: projects.inc:288 projects.inc:296
 msgid "CERN (European Organization for Nuclear Research)"
 msgstr ""
 
-#: projects.inc:289
-#: projects.inc:297
+#: projects.inc:289 projects.inc:297
 msgid "Physics"
 msgstr ""
 
 #: projects.inc:290
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
+msgid ""
+"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
+"European Organization for Nuclear Research, the world's largest particle "
+"physics laboratory.  It is the most powerful instrument ever built to "
+"investigate on particles proprieties. LHC at home runs simulations to improve "
+"the design of LHC and its detectors."
 msgstr ""
 
 #: projects.inc:298
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
+msgid ""
+"This project uses CERN-developed virtual machine technology for full-fledged "
+"LHC event physics simulation on volunteer computers.  Requires that you "
+"install VirtualBox on your computer"
 msgstr ""
 
 #: projects.inc:304
@@ -285,7 +377,12 @@ msgid "Astrophysics, astrobiology"
 msgstr ""
 
 #: projects.inc:306
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
+msgid ""
+"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
+"goal is to detect intelligent life outside Earth. One approach, known as "
+"radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
+"signals from space. Such signals are not known to occur naturally, so a "
+"detection would provide evidence of extraterrestrial technology."
 msgstr ""
 
 #: projects.inc:320
@@ -297,7 +394,11 @@ msgid "Chemical engineering and nanotechnology"
 msgstr ""
 
 #: projects.inc:322
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
+msgid ""
+"The study of molecular magnets and controlled nanoscale magnetism.  These "
+"magnetic molecules may be used to develop tiny magnetic switches, with "
+"applications in medicine (such as local tumor chemotherapy) and "
+"biotechnology."
 msgstr ""
 
 #: projects.inc:329
@@ -313,7 +414,10 @@ msgid "Physics, biochemistry, and others"
 msgstr ""
 
 #: projects.inc:336
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
+msgid ""
+"The objective of CAS at home is to encourage and assist scientists in China to "
+"adopt the technologies of volunteer computing and volunteer thinking for "
+"their research."
 msgstr ""
 
 #: projects.inc:343
@@ -321,11 +425,12 @@ msgid "Mathematics, physics, evolution"
 msgstr ""
 
 #: projects.inc:344
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
+msgid ""
+"Yoyo at home is an adapter between BOINC and several existing volunteer "
+"computing projects: ECM, Muon, Evolution at home, and distributed.net"
 msgstr ""
 
-#: projects.inc:349
-#: projects.inc:505
+#: projects.inc:349 projects.inc:505
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 msgstr ""
 
@@ -334,7 +439,11 @@ msgid "European research projects"
 msgstr ""
 
 #: projects.inc:351
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
+msgid ""
+"The EDGeS at Home Beta project integrates volunteer computing into the service "
+"grid network of Europe by allowing service grids to send workunits to be "
+"processed by the volunteers of this project. The scientific projects covered "
+"by the project include math, physics, biology, etc."
 msgstr ""
 
 #: projects.inc:357
@@ -358,7 +467,11 @@ msgid "Medical, environmental and other humanitarian research"
 msgstr ""
 
 #: projects.inc:367
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
+msgid ""
+"To further critical non-profit research on some of humanity's most pressing "
+"problems by creating the world's largest volunteer computing grid.  Research "
+"includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"clean water and many more."
 msgstr ""
 
 #: projects.inc:373
@@ -377,21 +490,18 @@ msgstr ""
 msgid "Simulation of quantum computing; Goldbach's conjecture."
 msgstr ""
 
-#: projects.inc:428
-#: projects.inc:436
+#: projects.inc:428 projects.inc:436
 msgid "Cryptography"
 msgstr ""
 
 #: projects.inc:437
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
+msgid ""
+"Attempt to decode 3 original Enigma messages. The signals were intercepted "
+"in the North Atlantic in 1942 and are believed to be unbroken."
 msgstr ""
 
-#: projects.inc:443
-#: projects.inc:482
-#: projects.inc:490
-#: projects.inc:498
-#: projects.inc:506
-#: projects.inc:546
+#: projects.inc:443 projects.inc:482 projects.inc:490 projects.inc:498
+#: projects.inc:506 projects.inc:546
 msgid "Mathematics"
 msgstr ""
 
@@ -408,11 +518,19 @@ msgid "Factorization of large integers"
 msgstr ""
 
 #: projects.inc:451
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
+msgid ""
+"NFS at Home is a research project that uses Internet-connected computers to do "
+"the lattice sieving step in the Number Field Sieve factorization of large "
+"integers. As a young school student, you gained your first experience at "
+"breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
+"NFS at Home is a continuation of that experience, only with integers that are "
+"hundreds of digits long."
 msgstr ""
 
 #: projects.inc:457
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
+msgid ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
 msgstr ""
 
 #: projects.inc:458
@@ -420,7 +538,11 @@ msgid "Software testing"
 msgstr ""
 
 #: projects.inc:459
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
+msgid ""
+"The aim of this project is to provide a powerful distributed computing "
+"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
+"well as others Lithuanian academic institutions.  Current applications "
+"involve the study of Monte-Carlo based software testing."
 msgstr ""
 
 #: projects.inc:481
@@ -428,11 +550,20 @@ msgid "Mathematical Institute of Leiden University / Kennislink"
 msgstr ""
 
 #: projects.inc:483
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
+msgid ""
+"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
+"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
+"product of the distinct prime factors of n. The ABC conjecture says that "
+"there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for "
+"any real h > 1. The ABC conjecture is currently one of the greatest open "
+"problems in mathematics. If it is proven to be true, a lot of other open "
+"problems can be answered directly from it."
 msgstr ""
 
 #: projects.inc:491
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
+msgid ""
+"Primegrid has multiple projects searching for different forms of very large "
+"prime numbers, including searching for the largest known prime number."
 msgstr ""
 
 #: projects.inc:497
@@ -440,11 +571,15 @@ msgid "Hochschule RheinMain University of Applied Sciences"
 msgstr ""
 
 #: projects.inc:499
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
+msgid ""
+"Search for counterexamples to two conjectures related to the identification "
+"of prime numbers"
 msgstr ""
 
 #: projects.inc:507
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
+msgid ""
+"Find all the generalized binary number systems (in which bases are matrices "
+"and digits are vectors) up to dimension 11."
 msgstr ""
 
 #: docutil.php:21
@@ -470,11 +605,17 @@ msgid "%s for %s (%s MB)"
 msgstr ""
 
 #: download.php:87
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others. <p> After installing BOINC on your computer, you can connect it to as many of these projects as you like."
+msgid ""
+"BOINC is a program that lets you donate your idle computer time to science "
+"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, and many others. <p> After installing BOINC on your "
+"computer, you can connect it to as many of these projects as you like."
 msgstr ""
 
 #: download.php:89
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
+msgid ""
+"You may run this software on a computer only if you own the computer or have "
+"the permission of its owner."
 msgstr ""
 
 #: download.php:131
@@ -485,8 +626,7 @@ msgstr ""
 msgid "Release notes"
 msgstr ""
 
-#: download.php:133
-#: index.php:85
+#: download.php:133 index.php:85
 msgid "Help"
 msgstr ""
 
@@ -508,20 +648,34 @@ msgstr ""
 
 #: help.php:12
 #, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
+msgid ""
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who "
+"can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"through the process of installing and using BOINC; %s troubleshoot any "
+"problems you might have."
 msgstr ""
 
 #: help.php:21
 #, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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."
+msgid ""
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. "
+"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 ""
 
 #: help.php:28
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
+msgid ""
+"The best way to get help is by voice, for which you need either built-in "
+"microphone and speakers or an external headset for your computer.  You can "
+"also use Skype's text-based chat system or regular email (if you don't have "
+"Skype) to communicate with Help Volunteers."
 msgstr ""
 
 #: help.php:31
-msgid "Volunteers speaking several languages are available. Please select a language:"
+msgid ""
+"Volunteers speaking several languages are available. Please select a "
+"language:"
 msgstr ""
 
 #: help.php:47
@@ -530,16 +684,22 @@ msgstr ""
 
 #: help.php:50
 #, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
+msgid ""
+"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+"Volunteer%s.  It's a great way to help the cause of scientific research and "
+"volunteer computing - and it's fun!"
 msgstr ""
 
 #: help.php:56
 #, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
+msgid ""
+"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
 msgstr ""
 
 #: help_funcs.php:107
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
+msgid ""
+"BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
+"or the University of California."
 msgstr ""
 
 #: help_funcs.php:110
@@ -590,9 +750,7 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: index.php:86
-#: index.php:123
-#: index.php:174
+#: index.php:86 index.php:123 index.php:174
 msgid "Documentation"
 msgstr ""
 
@@ -606,12 +764,19 @@ msgstr ""
 
 #: index.php:94
 #, php-format
-msgid " Use the idle time on your computer (Windows, Mac, or Linux) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:  %sChoose%s projects  %sDownload%s and run BOINC software  %sEnter%s an email address and password. "
+msgid ""
+" Use the idle time on your computer (Windows, Mac, or Linux) to cure "
+"diseases, study global warming, discover pulsars, and do many other types of "
+"scientific research.  It's safe, secure, and easy:  %sChoose%s projects  "
+"%sDownload%s and run BOINC software  %sEnter%s an email address and "
+"password. "
 msgstr ""
 
 #: index.php:105
 #, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
+msgid ""
+"Or, if you run several projects, try an %saccount manager%s such as "
+"%sGridRepublic%s or %sBAM!%s. "
 msgstr ""
 
 #: index.php:121
@@ -623,11 +788,15 @@ msgid "Software updates"
 msgstr ""
 
 #: index.php:131
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving "
+"you the computing power of thousands of CPUs."
 msgstr ""
 
 #: index.php:135
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
 msgstr ""
 
 #: index.php:140
@@ -704,7 +873,8 @@ msgstr ""
 
 #: index.php:265
 #, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
+msgid ""
+"Open-source software for %svolunteer computing%s and %sgrid computing%s."
 msgstr ""
 
 #: index.php:278
@@ -719,4 +889,3 @@ msgstr ""
 #, php-format
 msgid "News is available as an %sRSS feed%s"
 msgstr ""
-
diff --git a/locale/fi/BOINC-Client.mo b/locale/fi/BOINC-Client.mo
index 54b3d4e..454b65e 100644
Binary files a/locale/fi/BOINC-Client.mo and b/locale/fi/BOINC-Client.mo differ
diff --git a/locale/fi/BOINC-Client.po b/locale/fi/BOINC-Client.po
old mode 100755
new mode 100644
index 98dc554..a394515
--- a/locale/fi/BOINC-Client.po
+++ b/locale/fi/BOINC-Client.po
@@ -1,23 +1,25 @@
 # 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:
+# Sami Nordlund <sami.nordlund at kolumbus.fi>, 2015
+# Vesa Nilakari, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-10-15 22:25-0700\n"
-"PO-Revision-Date: 2015-02-10 21:24-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: fi\n"
+"PO-Revision-Date: 2015-03-14 11:42+0000\n"
+"Last-Translator: Sami Nordlund <sami.nordlund at kolumbus.fi>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/boinc/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.1.6\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: acct_mgr.cpp:450
-#: acct_mgr.cpp:459
+#: acct_mgr.cpp:450 acct_mgr.cpp:459
 msgid "Message from account manager"
 msgstr "Viesti tilihallitsijalta"
 
@@ -26,26 +28,29 @@ msgid "Message from server"
 msgstr "Viesti palvelimelta"
 
 #: client_state.cpp:258
-msgid "Some tasks need more memory than allowed by your preferences.  Please check the preferences."
-msgstr "Osa tehtävistä vaatii enemmän muistia kuin asetuksissa on sallittu.  Tarkista asetukset."
+msgid ""
+"Some tasks need more memory than allowed by your preferences.  Please check "
+"the preferences."
+msgstr "Osa tehtävistä vaatii enemmän muistia kuin asetuksissa on sallittu.  Tarkistathan asetukset."
 
 #: client_state.cpp:520
 msgid "Couldn't write state file; check directory permissions"
-msgstr "Tiedoston kirjoitus ei onnistu, tarkista kansion käyttöoikeudet"
+msgstr "Tilatiedoston kirjoitus ei onnistu, tarkista kansion käyttöoikeudet"
 
 #: cs_cmdline.cpp:303
 msgid "The HTTP_PROXY environment variable must specify an HTTP proxy"
-msgstr "HTTP_PROXY ympäristömuuttujalle pitää määritellä HTTP proxy"
+msgstr "HTTP_PROXY-ympäristömuuttujalle pitää määritellä HTTP-välityspalvelin"
 
 #: cs_scheduler.cpp:613
 #, c-format
-msgid "You used the wrong URL for this project.  When convenient, remove this project, then add %s"
-msgstr "Käytit väärää URLia tälle projektille.  Sopivan tilaisuuden tullen poista projekti ja lisää %s"
+msgid ""
+"You used the wrong URL for this project.  When convenient, remove this "
+"project, then add %s"
+msgstr "Käytit väärää URL:a tälle projektille.  Sopivan tilaisuuden tullen poista tämä projekti, sitten lisää %s"
 
-#: cs_statefile.cpp:828
-#: ../sched/sched_types.cpp:259
+#: cs_statefile.cpp:828 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
-msgstr "Syntaksivirhe app_info.xml -tiedostossa"
+msgstr "Syntaksivirhe tiedostossa app_info.xml"
 
 #: cs_statefile.cpp:868
 msgid "File referenced in app_info.xml does not exist: "
@@ -55,18 +60,15 @@ msgstr "app_info.xml -tiedostossa olevaa tiedostoviittausta ei ole: "
 msgid "A new version of BOINC is available."
 msgstr "Uusi versio BOINCista on saatavilla."
 
-#: current_version.cpp:94
-#: current_version.cpp:102
+#: current_version.cpp:94 current_version.cpp:102
 msgid "Download"
 msgstr "Lataa"
 
-#: log_flags.cpp:269
-#: log_flags.cpp:449
+#: log_flags.cpp:269 log_flags.cpp:449
 msgid "Unexpected text in cc_config.xml"
 msgstr "Odottamatonta tekstiä cc_config.xml -tiedostossa"
 
-#: log_flags.cpp:423
-#: log_flags.cpp:475
+#: log_flags.cpp:423 log_flags.cpp:475
 msgid "Unrecognized tag in cc_config.xml"
 msgstr "Tunnistamaton merkki cc_config.xml -tiedostossa"
 
@@ -76,11 +78,11 @@ msgstr "Puuttuva alkumerkki cc_config.xml -tiedostossa"
 
 #: log_flags.cpp:465
 msgid "Error in cc_config.xml options"
-msgstr "Virhe cc_config.xml -tiedostossa"
+msgstr "Virhe tiedoston cc_config.xml valinnoissa"
 
 #: log_flags.cpp:483
 msgid "Missing end tag in cc_config.xml"
-msgstr "Puuttuva loppumerkki cc_config.xml -tiedostossa"
+msgstr "Puuttuva loppumerkki tiedostossa cc_config.xml"
 
 #: ../sched/handle_request.cpp:307
 msgid "Invalid or missing account key.  To fix, remove and add this project."
@@ -91,7 +93,9 @@ msgid "Invalid code signing key.  To fix, remove and add this project."
 msgstr "Virheellinen varmenneavain.  Kokeile poistaa projekti ja lisätä se uudelleen."
 
 #: ../sched/handle_request.cpp:859
-msgid "The project has changed its security key.  Please remove and add this project."
+msgid ""
+"The project has changed its security key.  Please remove and add this "
+"project."
 msgstr "Projekti on vaihtanut suojausavaintaan.  Poista projekti ja lisää se uudelleen."
 
 #: ../sched/handle_request.cpp:943
@@ -103,7 +107,8 @@ msgid "This project doesn't support CPU type"
 msgstr "Projekti ei tue CPU-tyyppiä"
 
 #: ../sched/handle_request.cpp:993
-msgid "Your BOINC client software is too old.  Please install the current version."
+msgid ""
+"Your BOINC client software is too old.  Please install the current version."
 msgstr "BOINC-versiosi on liian vanha.  Asenna uusin versio."
 
 #: ../sched/handle_request.cpp:1259
@@ -111,22 +116,25 @@ msgid "This project doesn't support computers of type"
 msgstr "Tämä projekti ei tue tietokonetyyppejä"
 
 #: ../sched/sched_send.cpp:1092
-msgid "Upgrade to the latest driver to process tasks using your computer's GPU"
+msgid ""
+"Upgrade to the latest driver to process tasks using your computer's GPU"
 msgstr "Päivitä tuoreimpaan ajuriin käyttääksesi tietokoneen GPUta laskennassa"
 
 #: ../sched/sched_send.cpp:1099
-msgid "Upgrade to the latest driver to use all of this project's GPU applications"
+msgid ""
+"Upgrade to the latest driver to use all of this project's GPU applications"
 msgstr "Päivitä tuoreimpaan ajuriin käyttääksesi projektin kaikkia GPU-sovelluksia"
 
 #: ../sched/sched_send.cpp:1118
-msgid "A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to the current version"
+msgid ""
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to"
+" the current version"
 msgstr "NVIDIA GPUn käyttöön tarvitaan uudempi versio BOINCista, päivitä versio"
 
-# 94%
 #: ../sched/sched_send.cpp:1146
 #, c-format
 msgid "An %s GPU is required to run tasks for this project"
-msgstr "%s GPU tarvitaan tämän projektin pakettien suorittamiseen"
+msgstr "%s GPU tarvitaan tämän projektin tehtävien suorittamiseen"
 
 #: ../sched/sched_send.cpp:1262
 msgid "No tasks are available for the applications you have selected."
@@ -142,56 +150,14 @@ msgstr "Uudempi BOINC-versio tarvitaan, asenna uusin versio"
 
 #: ../sched/sched_send.cpp:1305
 #, c-format
-msgid "Tasks for %s are available, but your preferences are set to not accept them"
+msgid ""
+"Tasks for %s are available, but your preferences are set to not accept them"
 msgstr "%s -tehtäviä on saatavilla, mutta asetuksesi estävät niiden saannin"
 
 #: ../sched/sched_types.cpp:254
 msgid "Unknown app name in app_info.xml"
-msgstr "Tunnistamaton sovellusnimi app_info.xml -tiedostossa"
+msgstr "Tunnistamaton sovellusnimi tiedostossa 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 -tiedostossa ei ole sopivaa versiota"
-
-#~ msgid "Download it."
-#~ msgstr "Lataa se."
-#~ msgid "An NVIDIA or ATI GPU is required to run tasks for this project"
-#~ msgstr "Projektin tehtävät vaativat NVIDIAn tai ATIn GPUn"
-#~ msgid "An NVIDIA GPU is required to run tasks for this project"
-#~ msgstr "Projektin tehtävät vaativat NVIDIAn GPUn"
-#~ msgid "An ATI GPU is required to run tasks for this project"
-#~ msgstr "Projektin tehtävät vaativat ATIn GPUn"
-#~ msgid ""
-#~ "Tasks for NVIDIA GPU are available, but your preferences are set to not "
-#~ "accept them"
-#~ msgstr ""
-#~ "NVIDIAn GPUlle on tehtäviä, mutta niiden saanti on estetty asetuksissasi"
-#~ msgid ""
-#~ "Tasks for ATI GPU are available, but your preferences are set to not accept "
-#~ "them"
-#~ msgstr "ATIn GPUlle on tehtäviä, mutta niiden saanti on estetty asetuksissasi"
-#~ msgid ""
-#~ "Tasks for CPU are available, but your preferences are set to not accept them"
-#~ msgstr "CPUlle on tehtäviä, mutta niiden saanti on estetty asetuksissasi"
-#~ msgid "error"
-#~ msgstr "virhe"
-#~ msgid "Can't resolve hostname in remote_hosts.cfg"
-#~ msgstr "Konenimen selvitys ei onnistu remote_hosts.cfg -tiedostossa"
-#~ msgid "is not available for"
-#~ msgstr "ei ole saatavissa"
-#~ msgid ""
-#~ "You may have an outdated code signing key.  Try attaching and reattaching "
-#~ "this project."
-#~ msgstr ""
-#~ "Varmenneavain on saattanut vanhentua. Kokeile irrottautua projektista ja "
-#~ "liittyä uudelleen."
-#~ msgid "XML syntax error in"
-#~ msgstr "XML-syntaksivirhe"
-#~ msgid "Unparsed tag in"
-#~ msgstr "Jäsentämätön merkki"
-#~ msgid ""
-#~ "Your preference for network connection interval is too high for this "
-#~ "project"
-#~ msgstr ""
-#~ "Asetuksissasi on määritelty liian tiheä nettiyhteys tälle projektille."
-
+msgstr "App_info.xml -tiedostossasi ei ole sopivaa versiota"
diff --git a/locale/fi/BOINC-Manager.mo b/locale/fi/BOINC-Manager.mo
index 9d0e639..0cda9fc 100644
Binary files a/locale/fi/BOINC-Manager.mo and b/locale/fi/BOINC-Manager.mo differ
diff --git a/locale/fi/BOINC-Manager.po b/locale/fi/BOINC-Manager.po
index fc40225..196004a 100644
--- a/locale/fi/BOINC-Manager.po
+++ b/locale/fi/BOINC-Manager.po
@@ -1,64 +1,63 @@
 # 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:
+# Sami Nordlund <sami.nordlund at kolumbus.fi>, 2015
+# Vesa Nilakari, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-15 14:15-0500\n"
-"PO-Revision-Date: 2015-02-10 21:24-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: fi\n"
+"POT-Creation-Date: 2015-03-03 14:52-0500\n"
+"PO-Revision-Date: 2015-03-05 21:39+0000\n"
+"Last-Translator: Sami Nordlund <sami.nordlund at kolumbus.fi>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/boinc/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc_7.4\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1418722737.0\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\n"
+"X-Poedit-Country: UNITED STATES\n"
+"X-Poedit-Language: English\n"
 "X-Poedit-SearchPath-0: clientgui\n"
-"X-Poedit-SearchPath-1: clientgui/msw\n"
-"X-Poedit-SearchPath-2: clientgui/gtk\n"
-"X-Poedit-SearchPath-3: clientgui/mac\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"
 
-# 81%
-#: clientgui/AccountInfoPage.cpp:387
+#: clientgui/AccountInfoPage.cpp:361
 #, c-format
 msgid "Identify your account at %s"
 msgstr "Yksilöi %s -tilisi"
 
-#: clientgui/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 ""
-"Syötä tilisi tiedot\n"
-"(luodaksesi tilin, käy projektin verkkosivuilla)"
+msgstr "Syötä tilisi tiedot\n(luodaksesi tilin, käy projektin verkkosivuilla)"
 
-#: clientgui/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 ""
-"Tämä projekti ei tällä hetkellä hyväksy uusia tilejä.\n"
-"Voit liittyä projektiin vain, jos sinulla on jo tili."
+msgstr "Tämä projekti ei tällä hetkellä hyväksy uusia tilejä.\nVoit liittyä projektiin vain, jos sinulla on jo tili."
 
-#: clientgui/AccountInfoPage.cpp:401
+#: clientgui/AccountInfoPage.cpp:375
 msgid "Are you already running this project?"
 msgstr "Oletko jo liittynyt tähän projektiin?"
 
-#: clientgui/AccountInfoPage.cpp:405
+#: clientgui/AccountInfoPage.cpp:379
 msgid "&No, new user"
 msgstr "&En, uusi käyttäjä"
 
-#: clientgui/AccountInfoPage.cpp:408
+#: clientgui/AccountInfoPage.cpp:382
 msgid "&Yes, existing user"
 msgstr "&Kyllä, olemassa oleva käyttäjä"
 
-#: clientgui/AccountInfoPage.cpp:413
+#: clientgui/AccountInfoPage.cpp:387
 msgid ""
 "We were not able to set up your account information\n"
 "automatically.\n"
@@ -66,126 +65,114 @@ msgid ""
 "Please click on the 'Find login information' link\n"
 "below to find out what to put in the email address and\n"
 "password fields."
-msgstr ""
-"Tilitietojasi ei voitu asettaa\n"
-"automaattisesti.\n"
-"\n"
-"Napsauta \"Hae kirjautumistiedot\" -linkkiä\n"
-"jotta tiedät, mitä laitat sähköpostiosoite- ja\n"
-"salasanakenttiin."
+msgstr "Tilitietojasi ei voitu asettaa\nautomaattisesti.\n\nNapsauta \"Hae kirjautumistiedot\" -linkkiä\njotta tiedät, mitä laitat sähköpostiosoite- ja\nsalasanakenttiin."
 
-#: clientgui/AccountInfoPage.cpp:416
+#: clientgui/AccountInfoPage.cpp:390
 msgid "Find login information"
 msgstr "Hae kirjautumistiedot"
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:649
+#: clientgui/AccountInfoPage.cpp:410 clientgui/AccountInfoPage.cpp:632
 msgid "&Password:"
 msgstr "&Salasana:"
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:673
+#: clientgui/AccountInfoPage.cpp:417 clientgui/AccountInfoPage.cpp:656
 msgid "Choose a &password:"
 msgstr "Valitse &salasana:"
 
-#: clientgui/AccountInfoPage.cpp:446
+#: clientgui/AccountInfoPage.cpp:420
 msgid "C&onfirm password:"
 msgstr "Vahvista salasana:"
 
-#: clientgui/AccountInfoPage.cpp:453
+#: clientgui/AccountInfoPage.cpp:427
 #, c-format
 msgid "Are you already running %s?"
 msgstr "Osallistutko jo %s -projektiin?"
 
-#: clientgui/AccountInfoPage.cpp:482
+#: clientgui/AccountInfoPage.cpp:456
 msgid "&Username:"
 msgstr "&Käyttäjänimi:"
 
-#: clientgui/AccountInfoPage.cpp:511
+#: clientgui/AccountInfoPage.cpp:485
 msgid "&Email address or LDAP ID:"
-msgstr "&Sähköpostiosoite tai LDAP-tunniste:"
+msgstr "&Sähköpostiosoite tai LDAP-tunnus:"
 
-#: clientgui/AccountInfoPage.cpp:515
+#: clientgui/AccountInfoPage.cpp:489
 msgid "&Email address:"
 msgstr "&Sähköpostiosoite:"
 
-#: clientgui/AccountInfoPage.cpp:523
+#: clientgui/AccountInfoPage.cpp:497
 #, c-format
 msgid "minimum length %d"
 msgstr "vähimmäispituus %d"
 
-#: clientgui/AccountInfoPage.cpp:530
+#: clientgui/AccountInfoPage.cpp:504
 msgid "Forgot your password?"
 msgstr "Salasana unohtunut?"
 
-#: clientgui/AccountInfoPage.cpp:537
+#: 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 ""
-"Jos et ole vielä rekisteröitynyt tämän tilihallitsijan käyttäjäksi,\n"
-"tee se ennen kuin jatkat eteenpäin.  Napsauta allaolevaa linkkiä\n"
-"rekisteröityäksesi tai saadaksesi unohtuneen salasanan."
+msgstr "Jos et ole vielä rekisteröitynyt tämän tilihallitsijan käyttäjäksi,\ntee se ennen kuin jatkat eteenpäin.  Napsauta allaolevaa linkkiä\nrekisteröityäksesi tai saadaksesi unohtuneen salasanan."
 
-#: clientgui/AccountInfoPage.cpp:540
+#: clientgui/AccountInfoPage.cpp:514
 msgid "Account manager web site"
 msgstr "Tilihallitsijan nettisivu"
 
-#: clientgui/AccountInfoPage.cpp:582
+#: clientgui/AccountInfoPage.cpp:556
 msgid "Add project"
 msgstr "Liity projektiin"
 
-#: clientgui/AccountInfoPage.cpp:584
+#: clientgui/AccountInfoPage.cpp:558
 msgid "Update account manager"
 msgstr "Päivitä tilihallitsija"
 
-#: clientgui/AccountInfoPage.cpp:586
+#: clientgui/AccountInfoPage.cpp:560
 msgid "Use account manager"
 msgstr "Käytä tilihallitsijaa"
 
-#: clientgui/AccountInfoPage.cpp:593
+#: clientgui/AccountInfoPage.cpp:567
 msgid "Please enter a user name."
 msgstr "Syötä käyttäjänimi."
 
-#: clientgui/AccountInfoPage.cpp:595
+#: clientgui/AccountInfoPage.cpp:569
 msgid "Please enter an email address."
 msgstr "Anna sähköpostiosoite."
 
-#: clientgui/AccountInfoPage.cpp:605
+#: clientgui/AccountInfoPage.cpp:579
 #, c-format
 msgid "Please enter a password of at least %d characters."
 msgstr "Anna vähintään %d merkin pituinen salasana."
 
-#: clientgui/AccountInfoPage.cpp:615
-msgid "The password and confirmation password do not match. Please type them again."
+#: clientgui/AccountInfoPage.cpp:589
+msgid ""
+"The password and confirmation password do not match. Please type them again."
 msgstr "Salasana ja salasanan vahvistus eivät täsmää. Kirjoita ne uudelleen."
 
-#: clientgui/AccountManagerInfoPage.cpp:272
+#: clientgui/AccountManagerInfoPage.cpp:270
 msgid "Choose an account manager"
 msgstr "Valitse tilihallitsija"
 
-#: clientgui/AccountManagerInfoPage.cpp:275
+#: clientgui/AccountManagerInfoPage.cpp:273
 msgid ""
 "To choose an account manager, click its name or \n"
 "type its URL below."
-msgstr ""
-"Valitse tilihallitsija napsauttamalla sen nimeä tai \n"
-"kirjoita sen URL-osoite."
+msgstr "Valitse tilihallitsija napsauttamalla sen nimeä tai \nkirjoita sen URL-osoite."
 
-#: clientgui/AccountManagerInfoPage.cpp:279
+#: clientgui/AccountManagerInfoPage.cpp:277
 msgid "Account manager details:"
 msgstr "Tilihallitsijan tiedot:"
 
-#: clientgui/AccountManagerInfoPage.cpp:283
+#: clientgui/AccountManagerInfoPage.cpp:281
 msgid "Account manager &URL:"
 msgstr "Tilihallitsijan &URL:"
 
-#: clientgui/AccountManagerInfoPage.cpp:287
+#: clientgui/AccountManagerInfoPage.cpp:285
 msgid "Open web page"
 msgstr "Avaa nettisivu"
 
-#: clientgui/AccountManagerInfoPage.cpp:290
+#: clientgui/AccountManagerInfoPage.cpp:288
 msgid "Visit this account manager's web site"
 msgstr "Käy tämän tilihallitsijan nettisivulla"
 
@@ -209,359 +196,373 @@ msgstr "Odota..."
 msgid "An internal server error has occurred.\n"
 msgstr "Palvelimella tapahtui virhe.\n"
 
-#: clientgui/AdvancedFrame.cpp:96
+#: clientgui/AdvancedFrame.cpp:99
 msgid "Connected"
 msgstr "Yhdistetty"
 
-#: clientgui/AdvancedFrame.cpp:104
+#: clientgui/AdvancedFrame.cpp:107
 msgid "Disconnected"
 msgstr "Yhteys katkaistu"
 
-#: clientgui/AdvancedFrame.cpp:318
+#: clientgui/AdvancedFrame.cpp:327
 #, c-format
 msgid "Close the %s window"
 msgstr "Sulje %s ikkuna"
 
-#: clientgui/AdvancedFrame.cpp:321
+#: clientgui/AdvancedFrame.cpp:330
 msgid "&Close Window"
 msgstr "&Sulje ikkuna"
 
-#: clientgui/AdvancedFrame.cpp:332
-#: clientgui/AdvancedFrame.cpp:339
-#: clientgui/AdvancedFrame.cpp:346
+#: clientgui/AdvancedFrame.cpp:341 clientgui/AdvancedFrame.cpp:348
+#: clientgui/AdvancedFrame.cpp:355
 #, c-format
 msgid "Exit %s"
 msgstr "Lopeta %s"
 
-#: clientgui/AdvancedFrame.cpp:359
-msgid "Preferences..."
-msgstr "Asetukset..."
-
 #: clientgui/AdvancedFrame.cpp:368
+msgid "Preferences…"
+msgstr "Asetukset…"
+
+#: clientgui/AdvancedFrame.cpp:377
 msgid "&Notices\tCtrl+Shift+N"
 msgstr "&Ilmoitukset\t Ctrl+Shift+N"
 
-#: clientgui/AdvancedFrame.cpp:369
+#: clientgui/AdvancedFrame.cpp:378
 msgid "Display notices"
 msgstr "Näytä ilmoitukset"
 
-#: clientgui/AdvancedFrame.cpp:374
+#: clientgui/AdvancedFrame.cpp:383
 msgid "&Projects\tCtrl+Shift+P"
 msgstr "&Projektit\t Ctrl+Shift+P"
 
-#: clientgui/AdvancedFrame.cpp:375
+#: clientgui/AdvancedFrame.cpp:384
 msgid "Display projects"
 msgstr "Näytä projektit"
 
-#: clientgui/AdvancedFrame.cpp:380
+#: clientgui/AdvancedFrame.cpp:389
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr "&Työpaketit\t Ctrl+Shift+T"
 
-#: clientgui/AdvancedFrame.cpp:381
+#: clientgui/AdvancedFrame.cpp:390
 msgid "Display tasks"
 msgstr "Näytä työpaketit"
 
-#: clientgui/AdvancedFrame.cpp:386
+#: clientgui/AdvancedFrame.cpp:395
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr "Sii&rrot\t Ctrl+Shift+X"
 
-#: clientgui/AdvancedFrame.cpp:387
+#: clientgui/AdvancedFrame.cpp:396
 msgid "Display transfers"
 msgstr "Näytä siirrot"
 
-#: clientgui/AdvancedFrame.cpp:392
+#: clientgui/AdvancedFrame.cpp:401
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "&Tilastot\t Ctrl+Shift+S"
 
-#: clientgui/AdvancedFrame.cpp:393
+#: clientgui/AdvancedFrame.cpp:402
 msgid "Display statistics"
 msgstr "Näytä tilastot"
 
-#: clientgui/AdvancedFrame.cpp:398
+#: clientgui/AdvancedFrame.cpp:407
 msgid "&Disk usage\tCtrl+Shift+D"
 msgstr "&Levynkäyttö\t Ctrl+Shift+D"
 
-#: clientgui/AdvancedFrame.cpp:399
+#: clientgui/AdvancedFrame.cpp:408
 msgid "Display disk usage"
 msgstr "Näytä levynkäyttö"
 
-#: clientgui/AdvancedFrame.cpp:406
+#: clientgui/AdvancedFrame.cpp:415
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr "Yksinkertainen &näkymä...\t Ctrl+Shift+V"
 
-#: clientgui/AdvancedFrame.cpp:407
+#: clientgui/AdvancedFrame.cpp:416
 msgid "Display the simple graphical interface."
 msgstr "Näytä yksinkertainen näkymä."
 
-#: clientgui/AdvancedFrame.cpp:421
+#: clientgui/AdvancedFrame.cpp:430
 msgid "&Add project or account manager..."
 msgstr "&Lisää projekti tai tilihallitsija..."
 
-#: clientgui/AdvancedFrame.cpp:422
+#: clientgui/AdvancedFrame.cpp:431
 msgid "Volunteer for any or all of 30+ projects in many areas of science"
 msgstr "Osallistu yhteen tai useampaan yli 30:sta projektista tieteen monilla alueilla"
 
-#: clientgui/AdvancedFrame.cpp:426
+#: clientgui/AdvancedFrame.cpp:435
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "&Synkronoi %s kanssa"
 
-#: clientgui/AdvancedFrame.cpp:430
+#: clientgui/AdvancedFrame.cpp:439
 #, c-format
 msgid "Get current settings from %s"
 msgstr "Hae nykyiset asetukset %s:sta"
 
-#: clientgui/AdvancedFrame.cpp:440
+#: clientgui/AdvancedFrame.cpp:449
 msgid "&Add project..."
 msgstr "&Liity projektiin..."
 
-#: clientgui/AdvancedFrame.cpp:441
+#: clientgui/AdvancedFrame.cpp:450
 msgid "Add a project"
 msgstr "Lisää projekti"
 
-#: clientgui/AdvancedFrame.cpp:444
+#: clientgui/AdvancedFrame.cpp:453
 #, c-format
 msgid "S&top using %s..."
 msgstr "L&opeta %s:n käyttö..."
 
-#: clientgui/AdvancedFrame.cpp:450
+#: clientgui/AdvancedFrame.cpp:459
 msgid "Remove this computer from account manager control."
 msgstr "Poista tämä tietokone tilihallitsijasta."
 
-#: clientgui/AdvancedFrame.cpp:455
+#: clientgui/AdvancedFrame.cpp:464
 msgid "&Options..."
 msgstr "&Asetukset..."
 
-#: clientgui/AdvancedFrame.cpp:456
+#: clientgui/AdvancedFrame.cpp:465
 msgid "Configure display options and proxy settings"
 msgstr "Muuta näytön ja proxyn asetuksia"
 
-#: clientgui/AdvancedFrame.cpp:460
+#: clientgui/AdvancedFrame.cpp:469
 msgid "Computing &preferences..."
 msgstr "La&skenta-asetukset..."
 
-#: clientgui/AdvancedFrame.cpp:461
+#: clientgui/AdvancedFrame.cpp:470
 msgid "Configure computing preferences"
 msgstr "Muuta laskennan asetuksia"
 
-#: clientgui/AdvancedFrame.cpp:469
+#: clientgui/AdvancedFrame.cpp:475
+msgid "Exclusive applications..."
+msgstr "Erityissovellukset..."
+
+#: clientgui/AdvancedFrame.cpp:476
+msgid "Configure exclusive applications"
+msgstr "Määritä erityissovellusten asetukset"
+
+#: clientgui/AdvancedFrame.cpp:484
 msgid "&Run always"
 msgstr "&Suorita aina"
 
-#: clientgui/AdvancedFrame.cpp:470
+#: clientgui/AdvancedFrame.cpp:485
 msgid "Allow work regardless of preferences"
 msgstr "Salli työ riippumatta asetuksista"
 
-#: clientgui/AdvancedFrame.cpp:474
+#: clientgui/AdvancedFrame.cpp:489
 msgid "Run based on &preferences"
 msgstr "Suorita &asetusten perusteella"
 
-#: clientgui/AdvancedFrame.cpp:475
+#: clientgui/AdvancedFrame.cpp:490
 msgid "Allow work according to preferences"
 msgstr "Salli työ asetusten mukaisesti"
 
-#: clientgui/AdvancedFrame.cpp:479
+#: clientgui/AdvancedFrame.cpp:494
 msgid "&Suspend"
 msgstr "&Hyllytä"
 
-#: clientgui/AdvancedFrame.cpp:480
+#: clientgui/AdvancedFrame.cpp:495
 msgid "Stop work regardless of preferences"
 msgstr "Keskeytä työ riippumatta asetuksista"
 
-#: clientgui/AdvancedFrame.cpp:505
+#: clientgui/AdvancedFrame.cpp:520
 msgid "Use GPU always"
 msgstr "Käytä näytönohjainta aina"
 
-#: clientgui/AdvancedFrame.cpp:506
+#: clientgui/AdvancedFrame.cpp:521
 msgid "Allow GPU work regardless of preferences"
 msgstr "Salli näytönohjaimen työ riippumatta asetuksista"
 
-#: clientgui/AdvancedFrame.cpp:510
+#: clientgui/AdvancedFrame.cpp:525
 msgid "Use GPU based on preferences"
 msgstr "Käytä näytönohjainta asetusten mukaan"
 
-#: clientgui/AdvancedFrame.cpp:511
+#: clientgui/AdvancedFrame.cpp:526
 msgid "Allow GPU work according to preferences"
 msgstr "Salli näytönohjaimen työ asetusten mukaan"
 
-#: clientgui/AdvancedFrame.cpp:515
+#: clientgui/AdvancedFrame.cpp:530
 msgid "Suspend GPU"
 msgstr "Hyllytä näytönohjain"
 
-#: clientgui/AdvancedFrame.cpp:516
+#: clientgui/AdvancedFrame.cpp:531
 msgid "Stop GPU work regardless of preferences"
 msgstr "Pysäytä näytönohjaimen työ riippumatta asetuksista"
 
-#: clientgui/AdvancedFrame.cpp:540
+#: clientgui/AdvancedFrame.cpp:555
 msgid "Network activity always available"
 msgstr "Verkkoyhteys aina saatavilla"
 
-#: clientgui/AdvancedFrame.cpp:541
+#: clientgui/AdvancedFrame.cpp:556
 msgid "Allow network activity regardless of preferences"
 msgstr "Salli verkon käyttö asetuksista riippumatta"
 
-#: clientgui/AdvancedFrame.cpp:545
+#: clientgui/AdvancedFrame.cpp:560
 msgid "Network activity based on preferences"
 msgstr "Verkon käyttö asetusten mukaan"
 
-#: clientgui/AdvancedFrame.cpp:546
+#: clientgui/AdvancedFrame.cpp:561
 msgid "Allow network activity according to preferences"
 msgstr "Salli verkon käyttö asetusten mukaan"
 
-#: clientgui/AdvancedFrame.cpp:550
+#: clientgui/AdvancedFrame.cpp:565
 msgid "Network activity suspended"
 msgstr "Verkkoyhteys hyllytetty"
 
-#: clientgui/AdvancedFrame.cpp:551
+#: clientgui/AdvancedFrame.cpp:566
 msgid "Stop BOINC network activity"
 msgstr "Pysäytä BOINCin verkkoyhteys"
 
-#: clientgui/AdvancedFrame.cpp:561
+#: clientgui/AdvancedFrame.cpp:576
 #, c-format
 msgid "Connect to another computer running %s"
 msgstr "Ota yhteys toiseen tietokoneeseen, jossa %s on käytössä"
 
-#: clientgui/AdvancedFrame.cpp:566
+#: clientgui/AdvancedFrame.cpp:581
 msgid "Select computer..."
 msgstr "Valitse tietokone..."
 
-#: clientgui/AdvancedFrame.cpp:571
+#: clientgui/AdvancedFrame.cpp:586
 msgid "Shut down connected client..."
 msgstr "Sulje yhdistetty ydinohjelma..."
 
-#: clientgui/AdvancedFrame.cpp:572
+#: clientgui/AdvancedFrame.cpp:587
 msgid "Shut down the currently connected client"
 msgstr "Sulje tällä hetkellä yhdistetty ydinohjelma"
 
-#: clientgui/AdvancedFrame.cpp:576
+#: clientgui/AdvancedFrame.cpp:591
 msgid "Run CPU &benchmarks"
 msgstr "Aja keskusyksikön &suorituskykytestit"
 
-#: clientgui/AdvancedFrame.cpp:577
+#: clientgui/AdvancedFrame.cpp:592
 msgid "Runs BOINC CPU benchmarks"
 msgstr "Ajaa BOINC CPU -suorituskykytestit"
 
-#: clientgui/AdvancedFrame.cpp:581
+#: clientgui/AdvancedFrame.cpp:596
 msgid "Do network communication"
 msgstr "Suorita verkkotoiminnot"
 
-#: clientgui/AdvancedFrame.cpp:582
+#: clientgui/AdvancedFrame.cpp:597
 msgid "Do all pending network communication"
 msgstr "Suorittaa kaikki odottavat verkkoyhteystoiminnot"
 
-# 94%
-#: clientgui/AdvancedFrame.cpp:586
+#: clientgui/AdvancedFrame.cpp:601
 msgid "Read config files"
 msgstr "Lue kokoonpanotiedosto"
 
-#: clientgui/AdvancedFrame.cpp:587
-msgid "Read configuration info from cc_config.xml and any app_config.xml files"
+#: clientgui/AdvancedFrame.cpp:602
+msgid ""
+"Read configuration info from cc_config.xml and any app_config.xml files"
 msgstr "Lue kokoonpanotiedot cc_config.xml -tiedostosta ja kaikista app_config.xml -tiedostoista"
 
-#: clientgui/AdvancedFrame.cpp:591
+#: clientgui/AdvancedFrame.cpp:606
 msgid "Read local prefs file"
 msgstr "Lue paikallinen asetustiedosto"
 
-#: clientgui/AdvancedFrame.cpp:592
+#: clientgui/AdvancedFrame.cpp:607
 msgid "Read preferences from global_prefs_override.xml."
 msgstr "Lue asetukset global_prefs_override.xml -tiedostosta."
 
-#: clientgui/AdvancedFrame.cpp:597
+#: clientgui/AdvancedFrame.cpp:612
 #, c-format
 msgid "Launch another instance of %s..."
 msgstr "Käynnistä toinen %s -instanssi..."
 
-#: clientgui/AdvancedFrame.cpp:601
+#: clientgui/AdvancedFrame.cpp:616
 #, c-format
 msgid "Launch another %s"
 msgstr "Käynnistä uusi %s"
 
-#: clientgui/AdvancedFrame.cpp:611
+#: clientgui/AdvancedFrame.cpp:626
 msgid "Event Log...\tCtrl+Shift+E"
 msgstr "Tapahtumaloki...\t Ctrl+Shift+E"
 
-#: clientgui/AdvancedFrame.cpp:612
+#: clientgui/AdvancedFrame.cpp:627
 msgid "Display diagnostic messages."
 msgstr "Näytä diagnostiikkaviestit."
 
-#: clientgui/AdvancedFrame.cpp:616
+#: clientgui/AdvancedFrame.cpp:631
 msgid "Event Log Diagnostic Flags...\tCtrl+Shift+F"
-msgstr ""
+msgstr "Tapahtumalokin diagnostiikkaliput...⇥Ctrl+Shift+F"
 
-#: clientgui/AdvancedFrame.cpp:617
+#: clientgui/AdvancedFrame.cpp:632
 msgid "Enable or disable various diagnostic messages"
-msgstr "Kytke päälle tai poista käytöstä erilaisia diagnostiikkaviestejä"
+msgstr "Salli tai poista käytöstä erilaisia diagnostiikkaviestejä"
 
-#: clientgui/AdvancedFrame.cpp:626
+#: clientgui/AdvancedFrame.cpp:636
+msgid "Select display columns..."
+msgstr "Valitse näytettävät sarakkeet..."
+
+#: clientgui/AdvancedFrame.cpp:637
+msgid "Select which columns to display"
+msgstr "Valitse mitkä sarakkeet näytetään"
+
+#: clientgui/AdvancedFrame.cpp:647
 #, c-format
 msgid "%s &help"
 msgstr "%s &ohje"
 
-#: clientgui/AdvancedFrame.cpp:632
+#: clientgui/AdvancedFrame.cpp:653
 #, c-format
 msgid "Show information about %s"
 msgstr "Näytä tietoja %s:sta"
 
-#: clientgui/AdvancedFrame.cpp:644
+#: clientgui/AdvancedFrame.cpp:665
 #, c-format
 msgid "&%s help"
 msgstr "&%s apua"
 
-#: clientgui/AdvancedFrame.cpp:650
+#: clientgui/AdvancedFrame.cpp:671
 #, c-format
 msgid "Show information about the %s"
 msgstr "Näytä tietoja %s:sta"
 
-#: clientgui/AdvancedFrame.cpp:662
+#: clientgui/AdvancedFrame.cpp:683
 #, c-format
 msgid "%s &web site"
 msgstr "%s &nettisivu"
 
-#: clientgui/AdvancedFrame.cpp:668
+#: clientgui/AdvancedFrame.cpp:689
 #, c-format
 msgid "Show information about BOINC and %s"
 msgstr "Näytä tietoja BOINCista ja %s:sta"
 
-#: clientgui/AdvancedFrame.cpp:680
-#: clientgui/BOINCTaskBar.cpp:544
+#: clientgui/AdvancedFrame.cpp:701 clientgui/BOINCTaskBar.cpp:544
 #, c-format
 msgid "&About %s..."
 msgstr "&Tietoja %s:sta..."
 
-#: clientgui/AdvancedFrame.cpp:686
+#: clientgui/AdvancedFrame.cpp:707
 msgid "Licensing and copyright information."
 msgstr "Lisenssi- ja tekijänoikeustiedot."
 
-#: clientgui/AdvancedFrame.cpp:693
+#: clientgui/AdvancedFrame.cpp:714
 msgid "&File"
 msgstr "&Tiedosto"
 
-#: clientgui/AdvancedFrame.cpp:697
+#: clientgui/AdvancedFrame.cpp:718
 msgid "&View"
 msgstr "&Näytä"
 
-#: clientgui/AdvancedFrame.cpp:701
+#: clientgui/AdvancedFrame.cpp:722
 msgid "&Tools"
 msgstr "&Työkalut"
 
-#: clientgui/AdvancedFrame.cpp:705
+#: clientgui/AdvancedFrame.cpp:726
 msgid "&Activity"
 msgstr "&Toiminta"
 
-#: clientgui/AdvancedFrame.cpp:709
+#: clientgui/AdvancedFrame.cpp:730
 msgid "A&dvanced"
 msgstr "L&isäasetukset"
 
-#: clientgui/AdvancedFrame.cpp:713
+#: clientgui/AdvancedFrame.cpp:734
 msgid "&Help"
 msgstr "&Apua"
 
-#: clientgui/AdvancedFrame.cpp:1185
+#: clientgui/AdvancedFrame.cpp:1209
 #, c-format
 msgid "%s - Stop using %s"
 msgstr "%s - Lopeta %s:n käyttö"
 
-#: clientgui/AdvancedFrame.cpp:1190
+#: clientgui/AdvancedFrame.cpp:1214
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -569,48 +570,41 @@ msgid ""
 "but you'll have to manage projects manually.\n"
 "\n"
 "Do you want to stop using %s?"
-msgstr ""
-"Jos lopetat %s:n käytön,\n"
-"kaikki nykyiset projektisi säilyvät,\n"
-"mutta sinun on hallittava niitä itse.\n"
-"\n"
-"Haluatko lopettaa %s:n käytön?"
+msgstr "Jos lopetat %s:n käytön,\nkaikki nykyiset projektisi säilyvät,\nmutta sinun on hallittava niitä itse.\n\nHaluatko lopettaa %s:n käytön?"
 
-#: clientgui/AdvancedFrame.cpp:1397
+#: clientgui/AdvancedFrame.cpp:1441
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s - Sulje nykyinen ohjelma..."
 
-#: clientgui/AdvancedFrame.cpp:1406
+#: clientgui/AdvancedFrame.cpp:1450
 #, c-format
 msgid ""
 "%s will shut down the current client\n"
 "and prompt you for another host to connect to."
-msgstr ""
-"%s sulkee nykyisen ohjelman ja\n"
-"pyytää toista konetta, johon yhteys otetaan."
+msgstr "%s sulkee nykyisen ohjelman ja\npyytää toista konetta, johon yhteys otetaan."
 
-#: clientgui/AdvancedFrame.cpp:1806
+#: clientgui/AdvancedFrame.cpp:1853
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: clientgui/AdvancedFrame.cpp:1815
+#: clientgui/AdvancedFrame.cpp:1862
 #, c-format
 msgid "%s has successfully added %s"
 msgstr "%s on onnistuneesti lisätty %s"
 
-#: clientgui/AdvancedFrame.cpp:1953
+#: clientgui/AdvancedFrame.cpp:1998
 #, c-format
 msgid "%s - (%s)"
 msgstr "%s - (%s)"
 
-#: clientgui/AdvancedFrame.cpp:1957
+#: clientgui/AdvancedFrame.cpp:2002
 #, c-format
 msgid "Connecting to %s"
 msgstr "Otetaan yhteyttä %s"
 
-#: clientgui/AdvancedFrame.cpp:1960
+#: clientgui/AdvancedFrame.cpp:2005
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "Yhteydessä %s:iin (%s)"
@@ -625,11 +619,7 @@ msgid ""
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"Käyttäjänimellä on jo tili ja sen\n"
-"salasana on eri kuin antamasi.\n"
-"\n"
-"Käy projektin nettisivuilla ja seuraa siellä olevia ohjeita."
+msgstr "Käyttäjänimellä on jo tili ja sen\nsalasana on eri kuin antamasi.\n\nKäy projektin nettisivuilla ja seuraa siellä olevia ohjeita."
 
 #: clientgui/AlreadyExistsPage.cpp:191
 msgid "Email address already in use"
@@ -641,15 +631,11 @@ msgid ""
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"Sähköpostiosoitteella on jo tili ja sen\n"
-"salasana on eri kuin antamasi.\n"
-"\n"
-"Käy projektin nettisivuilla ja seuraa siellä olevia ohjeita."
+msgstr "Sähköpostiosoitteella on jo tili ja sen\nsalasana on eri kuin antamasi.\n\nKäy projektin nettisivuilla ja seuraa siellä olevia ohjeita."
 
 #: clientgui/AsyncRPC.cpp:1031
 msgid "Communicating with BOINC client.  Please wait ..."
-msgstr "Ollaan yhteydessä BOINC-ohjelmaan.  Odota ..."
+msgstr "Ollaan yhteydessä BOINC-ohjelmaan.  Odota..."
 
 #: clientgui/AsyncRPC.cpp:1034
 #, c-format
@@ -670,89 +656,76 @@ msgstr "%s - Verkkoyhteys"
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: clientgui/BOINCBaseFrame.cpp:504
+#: clientgui/BOINCBaseFrame.cpp:512
 #, c-format
 msgid "%s - Connection Error"
 msgstr "%s - Yhteysvirhe"
 
-#: clientgui/BOINCBaseFrame.cpp:513
+#: 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 ""
-"Sinulla ei ole oikeuksia hallinnoida ohjelmaa.\n"
-"Ota yhteys ylläpitäjään, joka lisää sinut paikalliseen \"boinc_users\" -käyttäjäryhmään."
+msgstr "Sinulla ei ole oikeuksia hallinnoida ohjelmaa.\nOta yhteys ylläpitäjään, joka lisää sinut paikalliseen \"boinc_users\" -käyttäjäryhmään."
 
-#: clientgui/BOINCBaseFrame.cpp:522
+#: 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 ""
-"Käyttöoikeusvirhe otettaessa yhteyttä ohjelmaan.\n"
-"Varmista, että molemmat ohjelmat käynnistetään samasta hakemistosta."
+msgstr "Käyttöoikeusvirhe otettaessa yhteyttä ohjelmaan.\nVarmista, että molemmat ohjelmat käynnistetään samasta hakemistosta."
 
-#: clientgui/BOINCBaseFrame.cpp:524
+#: clientgui/BOINCBaseFrame.cpp:532
 msgid "Authorization failed connecting to running client."
 msgstr "Käyttöoikeusvirhe otettaessa yhteyttä ohjelmaan."
 
-#: clientgui/BOINCBaseFrame.cpp:532
+#: clientgui/BOINCBaseFrame.cpp:540
 msgid "The password you have provided is incorrect, please try again."
 msgstr "Antamasi salasana on virheellinen, yritä uudelleen."
 
-#: clientgui/BOINCBaseFrame.cpp:576
+#: clientgui/BOINCBaseFrame.cpp:584
 #, c-format
 msgid "%s - Connection Failed"
 msgstr "%s - Yhteydenotto epäonnistui"
 
-#: clientgui/BOINCBaseFrame.cpp:585
+#: 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 ei saa yhteyttä %s -ohjelmaan.\n"
-"Haluatko yrittää yhteyttä uudelleen?"
+msgstr "%s ei saa yhteyttä %s -ohjelmaan.\nHaluatko yrittää yhteyttä uudelleen?"
 
-#: clientgui/BOINCBaseFrame.cpp:621
+#: clientgui/BOINCBaseFrame.cpp:629
 #, c-format
 msgid "%s - Daemon Start Failed"
 msgstr "%s - Daemonin käynnistys epäonnistui"
 
-#: clientgui/BOINCBaseFrame.cpp:631
+#: 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 ei pysty käynnistämään %s -ohjelmaa.\n"
-"Avaa Ohjauspaneeli->Valvontatyökalut->Palvelut ja käynnistä BOINC-palvelu."
+msgstr "%s ei pysty käynnistämään %s -ohjelmaa.\nAvaa Ohjauspaneeli->Valvontatyökalut->Palvelut ja käynnistä BOINC-palvelu."
 
-#: clientgui/BOINCBaseFrame.cpp:637
+#: 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 ei onnistu käynnistämään %s ohjelmaa.\n"
-"Käynnistä daemoni ja yritä uudelleen."
+msgstr "%s ei onnistu käynnistämään %s ohjelmaa.\nKäynnistä daemoni ja yritä uudelleen."
 
-#: clientgui/BOINCBaseFrame.cpp:688
+#: clientgui/BOINCBaseFrame.cpp:696
 #, c-format
 msgid "%s - Connection Status"
 msgstr "%s - Yhteyden tila"
 
-#: clientgui/BOINCBaseFrame.cpp:699
+#: clientgui/BOINCBaseFrame.cpp:707
 #, 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"
 "To connect up to your local computer please use 'localhost' as the host name."
-msgstr ""
-"%s ei tällä hetkellä ole yhteydessä %s -ohjelmaan.\n"
-"Valitse valikosta \"Lisäasetukset\\Valitse tietokone...\" ottaaksesi yhteyden %s -ohjelmaan.\n"
-"Jos otat yhteyttä paikalliseen koneeseen, käytä konenimenä \"localhost\"."
+msgstr "%s ei tällä hetkellä ole yhteydessä %s -ohjelmaan.\nValitse valikosta \"Lisäasetukset\\Valitse tietokone...\" ottaaksesi yhteyden %s -ohjelmaan.\nJos otat yhteyttä paikalliseen koneeseen, käytä konenimenä \"localhost\"."
 
-#: clientgui/BOINCBaseView.cpp:752
+#: clientgui/BOINCBaseView.cpp:790
 msgid "Project web pages"
 msgstr "Projektin nettisivut"
 
@@ -766,9 +739,7 @@ msgstr "%s - Odottamaton lopetus"
 msgid ""
 "The %s client has exited unexpectedly 3 times within the last %d minutes.\n"
 "Would you like to restart it again?"
-msgstr ""
-"%s -ohjelma on lopettanut toimintansa odottamatta 3 kertaa viimeisen %d minuutin aikana.\n"
-"Haluatko käynnistää sen uudelleen?"
+msgstr "%s -ohjelma on lopettanut toimintansa odottamatta 3 kertaa viimeisen %d minuutin aikana.\nHaluatko käynnistää sen uudelleen?"
 
 #: clientgui/BOINCDialupManager.cpp:61
 #, c-format
@@ -780,9 +751,7 @@ msgstr "%s - Verkon tila"
 msgid ""
 "%s needs to connect to the Internet.\n"
 "May it do so now?"
-msgstr ""
-"%s tarvitsee ottaa yhteyden internetiin.\n"
-"Saako se ottaa?"
+msgstr "%s tarvitsee ottaa yhteyden internetiin.\nSaako se ottaa?"
 
 #: clientgui/BOINCDialupManager.cpp:254
 #, c-format
@@ -804,9 +773,7 @@ msgstr "%s yhteys internetiin epäonnistui."
 msgid ""
 "%s has detected it is now connected to the Internet.\n"
 "Updating all projects and retrying all transfers."
-msgstr ""
-"%s on nyt saanut internetyhteyden.\n"
-"Päivitetään kaikki projektit ja yritetään uudelleen kaikkia siirtoja."
+msgstr "%s on nyt saanut internetyhteyden.\nPäivitetään kaikki projektit ja yritetään uudelleen kaikkia siirtoja."
 
 #: clientgui/BOINCDialupManager.cpp:417
 #, c-format
@@ -818,7 +785,7 @@ msgstr "%s yhteys internetiin on katkaistu."
 msgid "%s failed to disconnected from the Internet."
 msgstr "%s yhteyden katkaisu internetiin epäonnistui."
 
-#: clientgui/BOINCGUIApp.cpp:595
+#: clientgui/BOINCGUIApp.cpp:597
 #, c-format
 msgid ""
 "You currently are not authorized to manage the client.\n"
@@ -829,102 +796,90 @@ msgid ""
 " or\n"
 "  - contact your administrator to add you to the 'boinc_master'\n"
 "     user group."
-msgstr ""
-"Sinulla ei ole oikeuksia hallinnoida ohjelmaa.\n"
-"\n"
-"Käyttääksesi %s tällä käyttäjällä:\n"
-"  - asenna %s uudelleen ja vastaa \"Kyllä\" kysymykseen\n"
-"     ei-ylläpitäjäkäyttäjistä\n"
-" tai\n"
-"  - ota yhteyttä ylläpitoon joka lisää sinut 'boinc_master-'\n"
-"     käyttäjäryhmään."
-
-#: clientgui/BOINCGUIApp.cpp:601
+msgstr "Sinulla ei ole oikeuksia hallinnoida ohjelmaa.\n\nKäyttääksesi %s tällä käyttäjällä:\n  - asenna %s uudelleen ja vastaa \"Kyllä\" kysymykseen\n     ei-ylläpitäjäkäyttäjistä\n tai\n  - ota yhteyttä ylläpitoon joka lisää sinut 'boinc_master-'\n     käyttäjäryhmään."
+
+#: clientgui/BOINCGUIApp.cpp:603
 #, c-format
 msgid ""
 "%s ownership or permissions are not set properly; please reinstall %s.\n"
 "(Error code %d"
-msgstr ""
-"%s -käyttöoikeuksia ei ole asetettu oikein; asenna %s uudelleen.\n"
-"(Virhekoodi %d"
+msgstr "%s -käyttöoikeuksia ei ole asetettu oikein; asenna %s uudelleen.\n(Virhekoodi %d"
 
-#: clientgui/BOINCGUIApp.cpp:607
+#: clientgui/BOINCGUIApp.cpp:609
 msgid " at "
 msgstr " paikassa "
 
-#: clientgui/BOINCGUIApp.cpp:610
+#: clientgui/BOINCGUIApp.cpp:612
 msgid ")"
 msgstr ")"
 
-#: clientgui/BOINCGUIApp.cpp:640
+#: 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 ""
-"Tarvitaan uudelleenkäynnistys, jotta BOINC voisi toimia kunnolla.\n"
-"Uudelleenkäynnistä tietokoneesi ja yritä uudelleen."
+msgstr "Tarvitaan uudelleenkäynnistys, jotta BOINC voisi toimia kunnolla.\nUudelleenkäynnistä tietokoneesi ja yritä uudelleen."
 
-#: clientgui/BOINCGUIApp.cpp:641
+#: clientgui/BOINCGUIApp.cpp:643
 msgid "BOINC Manager"
 msgstr "BOINC Manager"
 
-#: clientgui/BOINCGUIApp.cpp:902
+#: clientgui/BOINCGUIApp.cpp:904
 msgid "BOINC Manager was started by the operating system automatically"
 msgstr "Käyttöjärjestelmä käynnisti BOINC Managerin automaattisesti"
 
-#: clientgui/BOINCGUIApp.cpp:904
+#: clientgui/BOINCGUIApp.cpp:906
 msgid "Startup BOINC so only the system tray icon is visible"
 msgstr "Käynnistä BOINC niin, että vain tehtäväpalkin kuvake on näkyvissä"
 
-#: clientgui/BOINCGUIApp.cpp:906
+#: clientgui/BOINCGUIApp.cpp:908
 msgid "Directory containing the BOINC Client executable"
 msgstr "Hakemisto, joka sisältää BOINCin ohjelmatiedoston"
 
-#: clientgui/BOINCGUIApp.cpp:907
+#: clientgui/BOINCGUIApp.cpp:909
 msgid "BOINC data directory"
 msgstr "BOINCin datahakemisto"
 
-#: clientgui/BOINCGUIApp.cpp:909
+#: clientgui/BOINCGUIApp.cpp:911
 msgid "Host name or IP address"
 msgstr "Konenimi tai IP-osoite"
 
-#: clientgui/BOINCGUIApp.cpp:910
+#: clientgui/BOINCGUIApp.cpp:912
 msgid "GUI RPC port number"
 msgstr "GUI RPC porttinumero"
 
-#: clientgui/BOINCGUIApp.cpp:911
+#: clientgui/BOINCGUIApp.cpp:913
 msgid "Password"
 msgstr "Salasana"
 
-#: clientgui/BOINCGUIApp.cpp:912
+#: clientgui/BOINCGUIApp.cpp:914
 msgid "Startup BOINC with these optional arguments"
 msgstr "Käynnistä BOINC näillä lisäoptioilla"
 
-#: clientgui/BOINCGUIApp.cpp:913
+#: clientgui/BOINCGUIApp.cpp:915
 msgid "disable BOINC security users and permissions"
 msgstr "poista käytöstä BOINCin turvakäyttäjät ja käyttöoikeudet"
 
-#: clientgui/BOINCGUIApp.cpp:914
+#: clientgui/BOINCGUIApp.cpp:916
 msgid "set skin debugging mode to enable skin manager error messages"
 msgstr "laita ulkoasun virheenkorjaus päälle nähdäksesi virheviestit"
 
-#: clientgui/BOINCGUIApp.cpp:915
+#: clientgui/BOINCGUIApp.cpp:917
 msgid "multiple instances of BOINC Manager allowed"
 msgstr "useita BOINC Manager -instansseja sallittu"
 
-#: clientgui/BOINCGUIApp.cpp:917
+#: clientgui/BOINCGUIApp.cpp:919
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr "Ei käytetä: tilapäinen korjaus bugiin XCode 4.2:ssa"
 
-#: clientgui/BOINCGUIApp.cpp:1164
+#: clientgui/BOINCGUIApp.cpp:1166
 msgid "(Automatic Detection)"
 msgstr "(Automaattinen tunnistus)"
 
-#: clientgui/BOINCGUIApp.cpp:1165
+#: clientgui/BOINCGUIApp.cpp:1167
 msgid "(Unknown)"
 msgstr "(Tuntematon)"
 
-#: clientgui/BOINCGUIApp.cpp:1166
+#: clientgui/BOINCGUIApp.cpp:1168
 msgid "(User Defined)"
 msgstr "(Käyttäjän määrittelemä)"
 
@@ -938,14 +893,12 @@ msgstr "Avaa %s netti..."
 msgid "Open %s..."
 msgstr "Avaa %s..."
 
-#: clientgui/BOINCTaskBar.cpp:536
-#: clientgui/BOINCTaskBar.cpp:633
+#: clientgui/BOINCTaskBar.cpp:536 clientgui/BOINCTaskBar.cpp:633
 #: clientgui/BOINCTaskBar.cpp:641
 msgid "Snooze"
 msgstr "Nukuta"
 
-#: clientgui/BOINCTaskBar.cpp:538
-#: clientgui/BOINCTaskBar.cpp:660
+#: clientgui/BOINCTaskBar.cpp:538 clientgui/BOINCTaskBar.cpp:660
 #: clientgui/BOINCTaskBar.cpp:668
 msgid "Snooze GPU"
 msgstr "Nukuta näytönohjain"
@@ -1024,15 +977,10 @@ msgid ""
 "Please try again later.\n"
 "\n"
 "Click Finish to close."
-msgstr ""
-"Yritä myöhemmin uudelleen.\n"
-"\n"
-"Napsauta Lopeta sulkeaksesi."
+msgstr "Yritä myöhemmin uudelleen.\n\nNapsauta Lopeta sulkeaksesi."
 
-#: 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 "Napsauta Lopeta."
 
@@ -1052,9 +1000,7 @@ msgstr "Tämä projekti on lisätty onnistuneesti."
 msgid ""
 "When you click Finish, your web browser will go to a page where\n"
 "you can set your account name and preferences."
-msgstr ""
-"Kun napsautat Valmis, selaimesi siirtyy sivulle, jossa\n"
-"voit muuttaa tilisi nimen ja asetuksia."
+msgstr "Kun napsautat Valmis, selaimesi siirtyy sivulle, jossa\nvoit muuttaa tilisi nimen ja asetuksia."
 
 #: clientgui/CompletionPage.cpp:232
 #, c-format
@@ -1100,590 +1046,682 @@ msgstr "wxWidgettien versio:"
 msgid "Copyright:"
 msgstr "Tekijänoikeus:"
 
-# 98%
 #: clientgui/DlgAbout.cpp:192
 msgid ""
-"(C) 2003-2014 University of California, Berkeley.\n"
+"(C) 2003-2015 University of California, Berkeley.\n"
 "All Rights Reserved."
-msgstr ""
-"(C) 2003-2014 Kalifornian yliopisto, Berkeley.\n"
-"Kaikki oikeudet pidätetään."
+msgstr "(C) 2003-2015 Kalifornian yliopisto, Berkeley.\nKaikki oikeudet pidätetään."
 
 #: clientgui/DlgAbout.cpp:196
 msgid "Berkeley Open Infrastructure for Network Computing"
 msgstr "Berkeleyn avoin infrastruktuuri verkkolaskentaan"
 
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:399
+#: clientgui/DlgAbout.cpp:208 clientgui/DlgExitMessage.cpp:173
+#: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:399
 #: clientgui/DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "&OK"
 
-#: clientgui/DlgAdvPreferences.cpp:602
-msgid "invalid number"
-msgstr "virheellinen numero"
+#: clientgui/DlgAdvPreferences.cpp:675
+msgid "Invalid number"
+msgstr "Epäkelpo numero"
 
-#: clientgui/DlgAdvPreferences.cpp:603
-msgid "invalid time, format is HH:MM"
-msgstr "virheellinen aika, muoto on HH:MM"
+#: clientgui/DlgAdvPreferences.cpp:676
+msgid "Invalid time, value must be between 0:00 and 24:00, format is HH:MM"
+msgstr "Epäkelpo aika, arvo on oltava 0:00 ja 24:00 väliltä, formaatti on HH:MM"
 
-#: clientgui/DlgAdvPreferences.cpp:604
-msgid "invalid time interval, format is HH:MM-HH:MM"
-msgstr "virheellinen aikaväli, muoto on HH:MM-HH:MM"
+#: clientgui/DlgAdvPreferences.cpp:677
+msgid "Number must be between 0 and 10"
+msgstr "Numeron tulee olla 0:n ja 10:n välillä"
 
-#: clientgui/DlgAdvPreferences.cpp:817
+#: clientgui/DlgAdvPreferences.cpp:678
+msgid "Number must be between 0 and 100"
+msgstr "Numeron tulee olla 0:n ja 100:n välillä"
+
+#: clientgui/DlgAdvPreferences.cpp:911
 msgid "invalid input value detected"
 msgstr "virheellinen syöttöarvo havaittu"
 
-#: clientgui/DlgAdvPreferences.cpp:819
+#: clientgui/DlgAdvPreferences.cpp:913
 msgid "Validation Error"
 msgstr "Vahvistusvirhe"
 
-#: clientgui/DlgAdvPreferences.cpp:969
-#: clientgui/DlgAdvPreferences.cpp:975
-#: clientgui/DlgAdvPreferences.cpp:981
-msgid "Applications to add"
-msgstr "Lisättävät sovellukset"
-
-#: clientgui/DlgAdvPreferences.cpp:998
-#, c-format
-msgid "'%s' is not an executable application."
-msgstr "\"%s\" ei ole ajettava sovellus."
-
-#: clientgui/DlgAdvPreferences.cpp:999
-#: clientgui/DlgAdvPreferences.cpp:1046
-#: clientgui/DlgAdvPreferences.cpp:1070
-msgid "Add Exclusive App"
-msgstr "Lisää erityissovellus"
-
-#: clientgui/DlgAdvPreferences.cpp:1011
-msgid "Name of application to add?"
-msgstr "Lisättävän sovelluksen nimi?"
-
-#: clientgui/DlgAdvPreferences.cpp:1011
-msgid "Add exclusive app"
-msgstr "Lisää erityissovellus"
+#: clientgui/DlgAdvPreferences.cpp:1129
+msgid "Discard local preferences and use web-based preferences?"
+msgstr "Hylkää paikalliset asetukset ja käytä nettipohjaisia asetuksia?"
 
-#: clientgui/DlgAdvPreferences.cpp:1045
-#, c-format
-msgid "Application names must end with '%s'"
-msgstr "Sovellusnimien pitää päätyä \"%s\""
-
-#: clientgui/DlgAdvPreferences.cpp:1069
-#, c-format
-msgid "'%s' is already in the list."
-msgstr "\"%s\" on jo listalla."
-
-#: clientgui/DlgAdvPreferences.cpp:1161
-msgid ""
-"Do you really want to clear all local preferences?\n"
-"(This will not affect exclusive applications.)"
-msgstr ""
-"Haluatko tyhjentää kaikki paikalliset asetukset?\n"
-"(Tämä ei vaikuta erityissovelluksiin.)"
-
-#: clientgui/DlgAdvPreferences.cpp:1162
+#: clientgui/DlgAdvPreferences.cpp:1130
 msgid "Confirmation"
 msgstr "Vahvistus"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:49
+#: clientgui/DlgAdvPreferencesBase.cpp:54
 #, c-format
 msgid "%s - Computing preferences"
 msgstr "%s - Laskenta-asetukset"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:66
+#: clientgui/DlgAdvPreferencesBase.cpp:77
+msgid ""
+"Using local preferences.\n"
+"Click \"Use web prefs\" to use web-based preferences from"
+msgstr "Käytetään paikallisia asetuksia.\nNapsauta \"Käytä nettiasetuksia\" käyttääksesi nettipohjaisia asetuksia paikasta"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:85
+msgid "Using web-based preferences from"
+msgstr "Käytetään nettipohjaisia asetuksia paikasta"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:102
+msgid "Set values and click OK to use local preferences instead."
+msgstr "Anna arvot ja napsauta OK käyttääksesi paikallisia asetuksia."
+
+#: clientgui/DlgAdvPreferencesBase.cpp:111
 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 ""
-"Tässä voit muuttaa vain tämän tietokoneen asetuksia.\n"
-"Napsauta OK muuttaaksesi asetuksia.\n"
-"Napsauta Tyhjennä palauttaaksesi web-pohjaiset asetukset (poislukien erityissovellukset)."
+"Click Clear to restore web-based settings."
+msgstr "Tässä säädetään vain tämän tietokoneen asetuksia.\nNapsauta OK asettaaksesi asetukset.\nNapsauta Tyhjennä palauttaaksesi nettipohjaiset asetukset."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:69
+#: clientgui/DlgAdvPreferencesBase.cpp:114
 msgid "Clear"
 msgstr "Tyhjennä"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:70
-msgid "clear all local preferences and close the dialog"
-msgstr "tyhjennä kaikki paikalliset asetukset ja sulje ikkuna"
+#: clientgui/DlgAdvPreferencesBase.cpp:115
+msgid "Clear all local preferences and close the dialog."
+msgstr "Tyhjennä kaikki paikalliset asetukset ja sulje ikkuna."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:85
-msgid "processor usage"
-msgstr "prosessorin käyttö"
+#: clientgui/DlgAdvPreferencesBase.cpp:118
+msgid "Use web prefs"
+msgstr "Käytä nettiasetuksia"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:119
+msgid "Restore web-based preferences and close the dialog."
+msgstr "Palauta nettipohjaiset asetukset ja sulje ikkuna."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:88
-msgid "network usage"
-msgstr "verkon käyttö"
+#: clientgui/DlgAdvPreferencesBase.cpp:143
+#: clientgui/DlgAdvPreferencesBase.cpp:637
+msgid "Computing"
+msgstr "Laskenta"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:91
-msgid "disk and memory usage"
-msgstr "levyn ja muistin käyttö"
+#: clientgui/DlgAdvPreferencesBase.cpp:146
+#: clientgui/DlgAdvPreferencesBase.cpp:785
+msgid "Network"
+msgstr "Verkko"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:94
-msgid "exclusive applications"
-msgstr "erityissovellukset"
+#: clientgui/DlgAdvPreferencesBase.cpp:149
+msgid "Disk & Memory"
+msgstr "Levy & muisti"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:107
-#: clientgui/DlgDiagnosticLogFlags.cpp:104
+#: clientgui/DlgAdvPreferencesBase.cpp:152
+msgid "Daily Schedules"
+msgstr "Päivittäiset toiminnot"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:165
+#: clientgui/DlgDiagnosticLogFlags.cpp:119 clientgui/DlgExclusiveApps.cpp:146
+#: clientgui/DlgHiddenColumns.cpp:100
 msgid "OK"
 msgstr "OK"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:108
-msgid "save all values and close the dialog"
-msgstr "tallenna kaikki arvot ja sulje"
+#: clientgui/DlgAdvPreferencesBase.cpp:166
+msgid "Save all values and close the dialog."
+msgstr "Tallenna kaikki arvot ja sulje ikkuna."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:114
-msgid "close the dialog without saving"
-msgstr "sulje tallentamatta"
+#: clientgui/DlgAdvPreferencesBase.cpp:172
+msgid "Close the dialog without saving."
+msgstr "Sulje ikkuna tallentamatta."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:118
-#: clientgui/Localization.cpp:35
-#: clientgui/Localization.cpp:121
-#: clientgui/Localization.cpp:139
+#: clientgui/DlgAdvPreferencesBase.cpp:176 clientgui/DlgExclusiveApps.cpp:157
 msgid "Help"
 msgstr "Apua"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
-msgid "shows the preferences web page"
-msgstr "näyttää asetusten nettisivun"
+#: clientgui/DlgAdvPreferencesBase.cpp:177
+msgid "Shows the preferences web page."
+msgstr "Näyttää asetusten nettisivun."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:141
-msgid "Computing allowed"
-msgstr "Laskenta sallittu"
+#: clientgui/DlgAdvPreferencesBase.cpp:239
+#: clientgui/DlgAdvPreferencesBase.cpp:425
+msgid "Usage limits"
+msgstr "Käyttörajat"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
-msgid "While computer is on batteries"
-msgstr "Tietokoneen ollessa akkukäytöllä"
+#: clientgui/DlgAdvPreferencesBase.cpp:244
+#, no-c-format
+msgid ""
+"Keep some CPUs free for other applications. Example: 75% means use 6 cores "
+"on an 8-core CPU."
+msgstr "Pidä osa prosessoreista vapaana muille ohjelmille. Esimerkiksi: 75% tarkoittaa, että 8-ytimisessä koneessa käytetään 6-ydintä."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:149
-msgid "check this if you want this computer to do work while it runs on batteries"
-msgstr "valitse tämä, jos haluat tietokoneen suorittavan laskentaa myös silloin, kun kone on akkukäytöllä"
+#: clientgui/DlgAdvPreferencesBase.cpp:246
+#: clientgui/DlgAdvPreferencesBase.cpp:258
+msgid "Use at most"
+msgstr "Käytä enintään"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:155
-msgid "While computer is in use"
-msgstr "Tietokoneen ollessa käytössä"
+#: clientgui/DlgAdvPreferencesBase.cpp:251
+#, no-c-format
+msgid "% of the CPUs"
+msgstr "% suorittimista"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:158
-msgid "check this if you want this computer to do work even when you're using it"
-msgstr "valitse tämä, jos haluat tietokoneen suorittavan laskentaa myös silloin kun itse käytät sitä"
+#: clientgui/DlgAdvPreferencesBase.cpp:256
+#, 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."
+msgstr "Hyllytä/jatka laskentaa muutaman sekunnin välein vähentääksesi prosessorin lämpötilaa ja energiankulutusta. Esimerkiksi: 75% tarkoittaa, että lasketaan 3 sekuntia, odotetaan 1 sekunti ja toistetaan."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:164
-msgid "Use GPU while computer is in use"
-msgstr "Käytä näytönohjainta koneen ollessa käytössä"
+#: clientgui/DlgAdvPreferencesBase.cpp:263
+#, no-c-format
+msgid "% of CPU time"
+msgstr "% suoritinajasta"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:270
+msgid "When to suspend"
+msgstr "Milloin hyllytetään"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:276
+msgid "Suspend when computer is on battery"
+msgstr "Hyllytä koneen ollessa akkukäytöllä"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:279
+msgid ""
+"Check this to suspend computing on portables when running on battery power."
+msgstr "Valitse tämä hyllyttääksesi laskennan kannettavissa silloin, kun kone on akkukäytöllä."
+
+#: clientgui/DlgAdvPreferencesBase.cpp:285
+msgid "Suspend when computer is in use"
+msgstr "Hyllytä koneen ollessa käytössä"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:288
+msgid ""
+"Check this to suspend computing and file transfers when you're using the "
+"computer."
+msgstr "Valitse tämä hyllyttääksesi laskennan ja tiedostonsiirron kun käytät konetta."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:167
-msgid "check this if you want your GPU to do work even when you're using the computer"
-msgstr "valitse tämä, jos haluat näytönohjaimen suorittavan laskentaa myös silloin kun itse käytät konetta"
+#: clientgui/DlgAdvPreferencesBase.cpp:294
+msgid "Suspend GPU computing when computer is in use"
+msgstr "Hyllytä GPU-laskenta koneen ollessa käytössä"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:179
-msgid "Only after computer has been idle for"
-msgstr "Vasta kun tietokone on ollut jouten"
+#: clientgui/DlgAdvPreferencesBase.cpp:297
+msgid "Check this to suspend GPU computing when you're using the computer."
+msgstr "Valitse tämä hyllyttääksesi GPU-laskennan kun käytät konetta."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:188
-msgid "do work only after you haven't used the computer for this number of minutes"
-msgstr "salli työ vasta sen jälkeen kun et ole käyttänyt tietokonetta näin moneen minuuttiin"
+#: clientgui/DlgAdvPreferencesBase.cpp:302
+msgid "This determines when the computer is considered 'in use'."
+msgstr "Tämä määrittelee sen, milloin koneen tulkitaan olevan \"käytössä\"."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:193
-#: clientgui/DlgAdvPreferencesBase.cpp:342
+#: clientgui/DlgAdvPreferencesBase.cpp:306
+msgid "'In use' means mouse/keyboard input in last"
+msgstr "'Käytössä' tarkoittaa hiiren/näppäimistön aktiviteettiä viimeisimmän"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:314
+#: clientgui/DlgAdvPreferencesBase.cpp:387
 msgid "minutes"
 msgstr "minuuttia"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:212
-msgid "While processor usage is less than"
-msgstr "Prosessorin kuorman ollessa alle"
+#: clientgui/DlgAdvPreferencesBase.cpp:321
+#, c-format
+msgid "Suspend when non-%s CPU usage is above"
+msgstr "Hyllytä silloin kun ei-%s CPU-käyttö ylittää"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:221
-msgid "suspend work if processor usage exceeds this level"
-msgstr "hyllytä työ jos prosessorin käyttö ylittää tämän tason"
+#: clientgui/DlgAdvPreferencesBase.cpp:323
+msgid "Suspend computing when your computer is busy running other programs."
+msgstr "Hyllytä laskenta kun tietokoneesi ajaa muita ohjelmia."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:226
-msgid "percent (0 means no restriction)"
-msgstr "prosenttia (0 tarkoittaa ei rajoitusta)"
+#: clientgui/DlgAdvPreferencesBase.cpp:344
+#: clientgui/DlgAdvPreferencesBase.cpp:474
+msgid "Other"
+msgstr "Muu"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:240
-#: clientgui/DlgAdvPreferencesBase.cpp:506
-msgid "Every day between hours of"
-msgstr "Joka päivä aikavälillä"
+#: clientgui/DlgAdvPreferencesBase.cpp:349
+msgid "Store at least enough tasks to keep the computer busy for this long."
+msgstr "Varastoi tarpeeksi työtä pitääksesi koneen työssä näin kauan."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
-msgid "start work at this time"
-msgstr "aloita työ tähän aikaan"
+#: clientgui/DlgAdvPreferencesBase.cpp:352
+msgid "Store at least"
+msgstr "Varastoi vähintään"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:248
-#: clientgui/DlgAdvPreferencesBase.cpp:514
-msgid "and"
-msgstr "ja"
+#: clientgui/DlgAdvPreferencesBase.cpp:360
+#: clientgui/DlgAdvPreferencesBase.cpp:376
+msgid "days of work"
+msgstr "työpäivän aikana"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:252
-msgid "stop work at this time"
-msgstr "lopeta työ tähän aikaan"
+#: clientgui/DlgAdvPreferencesBase.cpp:365
+msgid ""
+"Store additional tasks above the minimum level.  Determines how much work is"
+" requested when contacting a project."
+msgstr "Varastoi lisäksi työtä minimitason yli. Määrittää, kuinka paljon työtä pyydetään otettaessa yhteyttä projektiin."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
-#: clientgui/DlgAdvPreferencesBase.cpp:522
-msgid "(no restriction if equal)"
-msgstr "(ei rajoitusta jos yhtä suuret)"
+#: clientgui/DlgAdvPreferencesBase.cpp:368
+msgid "Store up to an additional"
+msgstr "Varastoi lisäksi"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:261
-#: clientgui/DlgAdvPreferencesBase.cpp:527
-msgid "Day-of-week override:"
-msgstr "Viikonpäivän ohitus:"
+#: clientgui/DlgAdvPreferencesBase.cpp:381
+#, c-format
+msgid "If you run several projects, %s may switch between them this often."
+msgstr "Jos suoritat useita projekteita, %s voi vaihtaa niiden välillä näin usein."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:266
-#: clientgui/DlgAdvPreferencesBase.cpp:532
-msgid "check box to specify hours for this day of week"
-msgstr "valitse määritelläksesi tunnit tälle päivälle"
+#: clientgui/DlgAdvPreferencesBase.cpp:383
+msgid "Switch between tasks every"
+msgstr "Vaihda tehtävien välillä joka"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:272
-#: clientgui/DlgAdvPreferencesBase.cpp:538
-msgid "Monday"
-msgstr "Maanantai"
+#: clientgui/DlgAdvPreferencesBase.cpp:391
+msgid ""
+"This controls how often tasks save their state to disk, so that they can be "
+"restarted later."
+msgstr "Tämä määrittelee sen, kuinka usein tehtävät tallentavat tilansa levylle, jotta ne voidaan aloittaa uudelleen myöhemmin."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:279
-#: clientgui/DlgAdvPreferencesBase.cpp:545
-msgid "Tuesday"
-msgstr "Tiistai"
+#: clientgui/DlgAdvPreferencesBase.cpp:392
+msgid "Request tasks to checkpoint at most every"
+msgstr "Pyydä tarkistuspiste enintään joka"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:286
-#: clientgui/DlgAdvPreferencesBase.cpp:552
-msgid "Wednesday"
-msgstr "Keskiviikko"
+#: clientgui/DlgAdvPreferencesBase.cpp:396
+msgid "seconds"
+msgstr "sekunti"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:293
-#: clientgui/DlgAdvPreferencesBase.cpp:559
-msgid "Thursday"
-msgstr "Torstai"
+#: clientgui/DlgAdvPreferencesBase.cpp:431
+msgid "Limit the download rate of file transfers."
+msgstr "Rajoita tiedostojen siirron latausnopeutta."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:300
-#: clientgui/DlgAdvPreferencesBase.cpp:566
-msgid "Friday"
-msgstr "Perjantai"
+#: clientgui/DlgAdvPreferencesBase.cpp:432
+msgid "Limit download rate to"
+msgstr "Rajoita latausnopeus arvoon"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:307
-#: clientgui/DlgAdvPreferencesBase.cpp:573
-msgid "Saturday"
-msgstr "Lauantai"
+#: clientgui/DlgAdvPreferencesBase.cpp:436
+#: clientgui/DlgAdvPreferencesBase.cpp:445
+msgid "KB/second"
+msgstr "kt/sekunti"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:580
-msgid "Sunday"
-msgstr "Sunnuntai"
+#: clientgui/DlgAdvPreferencesBase.cpp:440
+msgid "Limit the upload rate of file transfers."
+msgstr "Rajoita tiedostojen siirron lähetysnopeutta."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:328
-msgid "Other options"
-msgstr "Muut asetukset"
+#: clientgui/DlgAdvPreferencesBase.cpp:441
+msgid "Limit upload rate to"
+msgstr "Rajoita lähetysnopeus arvoon"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:336
-msgid "Switch between applications every"
-msgstr "Vaihda sovellusten välillä joka"
+#: clientgui/DlgAdvPreferencesBase.cpp:452
+#, c-format
+msgid "Example: %s should transfer at most 2000 MB of data every 30 days."
+msgstr "Esimerkki: %s siirtää enintään 2000 Mt 30 päivän aikana."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:345
-msgid "On multiprocessor systems, use at most"
-msgstr "Moniprosessorikoneissa käytä enintään"
+#: clientgui/DlgAdvPreferencesBase.cpp:454
+msgid "Limit usage to"
+msgstr "Rajoita käyttö"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
-#, no-c-format
-msgid "% of the processors (0 means no restriction)"
-msgstr "% prosessoreista (0 tarkoittaa ei rajoitusta)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:355
-#: clientgui/DlgAdvPreferencesBase.cpp:618
-#: clientgui/DlgAdvPreferencesBase.cpp:640
-#: clientgui/DlgAdvPreferencesBase.cpp:661
-#: clientgui/DlgAdvPreferencesBase.cpp:683
-#: clientgui/DlgAdvPreferencesBase.cpp:694
-msgid "Use at most"
-msgstr "Käytä enintään"
+#: clientgui/DlgAdvPreferencesBase.cpp:458
+msgid "MB every"
+msgstr "Mt joka"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:362
-#, no-c-format
-msgid "% of CPU time (0 means no restriction)"
-msgstr "% CPU-ajasta (0 tarkoittaa ei rajoitusta)"
+#: clientgui/DlgAdvPreferencesBase.cpp:462
+msgid "days"
+msgstr "vrk"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:386
-msgid "General options"
-msgstr "Yleiset asetukset"
+#: clientgui/DlgAdvPreferencesBase.cpp:479
+#, c-format
+msgid ""
+"Check this only if your Internet provider modifies image files. Skipping "
+"verification reduces the security of %s."
+msgstr "Valitse tämä vain jos operaattorisi muokkaa kuvatiedostoja. Varmentamisen ohittaminen heikentää %s :n turvallisuutta."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:395
-msgid "Maximum download rate"
-msgstr "Suurin latausnopeus"
+#: clientgui/DlgAdvPreferencesBase.cpp:481
+msgid "Skip data verification for image files"
+msgstr "Ohita kuvatiedostojen varmennus"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:401
-#: clientgui/DlgAdvPreferencesBase.cpp:410
-msgid "KBytes/second (0 means no restriction)"
-msgstr "Kt/sekunti (0 tarkoittaa ei rajoitusta)"
+#: clientgui/DlgAdvPreferencesBase.cpp:485
+msgid "Confirm before connecting to Internet"
+msgstr "Pyydä vahvistus ennen internet-yhteyden avaamista"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:404
-msgid "Maximum upload rate"
-msgstr "Suurin lähetysnopeus"
+#: clientgui/DlgAdvPreferencesBase.cpp:486
+#: clientgui/DlgAdvPreferencesBase.cpp:490
+msgid "Useful only if you have a modem, ISDN or VPN connection."
+msgstr "Käytännöllinen vain, jos on modeemi-, ISDN- tai VPN-yhteys."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:417
-msgid "Minimum work buffer"
-msgstr "Minimityömäärä"
+#: clientgui/DlgAdvPreferencesBase.cpp:489
+msgid "Disconnect when done"
+msgstr "Katkaise yhteys lopuksi"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:425
-msgid "Try to maintain enough tasks to keep busy for this many days"
-msgstr "Yritä pitää työpaketteja näin monen päivän edestä"
+#: clientgui/DlgAdvPreferencesBase.cpp:516
+msgid "Disk"
+msgstr "Levy"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:431
-#: clientgui/DlgAdvPreferencesBase.cpp:449
-msgid "days (maximum value: 10)"
-msgstr "päivää (suurin arvo: 10)"
+#: clientgui/DlgAdvPreferencesBase.cpp:521
+#, c-format
+msgid "%s will use the most restrictive of these settings:"
+msgstr "%s käyttää näistä tiukinta asetusta:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:437
-msgid "Max additional work buffer"
-msgstr "Suurin lisämäärä työtä"
+#: clientgui/DlgAdvPreferencesBase.cpp:527
+#, c-format
+msgid "Limit the total amount of disk space used by %s."
+msgstr "Rajoita %s :n käyttämää kokonaislevytilaa."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:445
-msgid "In addition, maintain enough tasks for up to this many days"
-msgstr "Pidä lisäksi työpaketteja näin monen päivän edestä"
+#: clientgui/DlgAdvPreferencesBase.cpp:530
+#: clientgui/DlgAdvPreferencesBase.cpp:554
+msgid "Use no more than"
+msgstr "Älä käytä enempää kuin"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:454
-msgid "Transfer at most"
-msgstr "Siirrä enintään"
+#: clientgui/DlgAdvPreferencesBase.cpp:534
+msgid "GB"
+msgstr "Gt"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:462
-msgid "MBytes every"
-msgstr "Mtavua joka"
+#: clientgui/DlgAdvPreferencesBase.cpp:539
+#, c-format
+msgid ""
+"Limit disk usage to leave this much free space on the volume where %s stores"
+" data."
+msgstr "Rajoita levynkäyttöä jättämällä näin paljon vapaata tilaa osiolle, jonne %s tallentaa dataa."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:468
-msgid "days (0 means no restriction)"
-msgstr "päivää (0 tarkoittaa ei rajoitusta)"
+#: clientgui/DlgAdvPreferencesBase.cpp:542
+msgid "Leave at least"
+msgstr "Jätä vähintään"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:476
-msgid "Skip image file verification"
-msgstr "Ohita kuvatiedoston varmennus"
+#: clientgui/DlgAdvPreferencesBase.cpp:546
+msgid "GB free"
+msgstr "Gt vapaata"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:478
-msgid "check this if your Internet provider modifies image files"
-msgstr "valitse tämä jos operaattorisi muokkaa kuvatiedostoja"
+#: clientgui/DlgAdvPreferencesBase.cpp:551
+#, c-format
+msgid ""
+"Limit the percentage of disk space used by %s on the volume where it stores "
+"data."
+msgstr "Rajoita %s :n prosentuaalista levytilaa osiolla, jonne se tallentaa dataa."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:484
-msgid "Connect options"
-msgstr "Yhteysasetukset"
+#: clientgui/DlgAdvPreferencesBase.cpp:559
+#, no-c-format
+msgid "% of total"
+msgstr "% kokonaismäärästä"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:487
-msgid "Confirm before connecting to internet"
-msgstr "Pyydä vahvistus ennen internet-yhteyden avaamista"
+#: clientgui/DlgAdvPreferencesBase.cpp:566
+msgid "Memory"
+msgstr "Muistia"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
-msgstr "jos valittu, vahvistusikkuna näytetään ennen kuin yritetään yhteyttä internetiin"
+#: clientgui/DlgAdvPreferencesBase.cpp:571
+#, c-format
+msgid "Limit the memory used by %s when you're using the computer."
+msgstr "Rajoittaa %s käyttämän muistin määrää käyttäessäsi konetta."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:493
-msgid "Disconnect when done"
-msgstr "Katkaise yhteys lopuksi"
+#: clientgui/DlgAdvPreferencesBase.cpp:573
+msgid "When computer is in use, use at most"
+msgstr "Tietokoneen ollessa käytössä, käytä enintään"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:495
-msgid ""
-"if checked, BOINC hangs up when network usage is done\n"
-"(only relevant for dialup-connection)"
-msgstr ""
-"jos valittuna, BOINC katkaisee verkkoyhteyden lopuksi\n"
-"(koskee vain puhelinverkkoyhteyksiä)"
+#: clientgui/DlgAdvPreferencesBase.cpp:579
+#: clientgui/DlgAdvPreferencesBase.cpp:591
+#: clientgui/DlgAdvPreferencesBase.cpp:607
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:501
-msgid "Network usage allowed"
-msgstr "Verkon käyttö sallittu"
+#: clientgui/DlgAdvPreferencesBase.cpp:584
+#, c-format
+msgid "Limit the memory used by %s when you're not using the computer."
+msgstr "Rajoittaa %s käyttämän muistin määrää kun et käytä konetta."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:510
-msgid "network usage start hour"
-msgstr "verkon käytön alkamistunti"
+#: clientgui/DlgAdvPreferencesBase.cpp:586
+msgid "When computer is not in use, use at most"
+msgstr "Tietokoneen ollessa jouten, käytä enintään"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:518
-msgid "network usage stop hour"
-msgstr "verkon käytön lopetustunti"
+#: clientgui/DlgAdvPreferencesBase.cpp:595
+msgid "Leave non-GPU tasks in memory while suspended"
+msgstr "Jätä muut kuin GPU tehtävät muistiin hyllytyksen ajaksi"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:610
-#: clientgui/DlgItemProperties.cpp:257
-msgid "Disk usage"
-msgstr "Levyn käyttö"
+#: 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."
+msgstr "Jos valittuna, hyllytetyt työt pysyvät muistissa eikä työtä menetetä jatkettaessa laskentaa. Jos ei valittuna, hyllytetyt työt poistetaan muistista ja jatketaan viimeisestä tarkistuspisteestä."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:622
-msgid "the maximum disk space used by BOINC (in Gigabytes)"
-msgstr "suurin levytila, jota BOINC käyttää (gigatavuina)"
+#: clientgui/DlgAdvPreferencesBase.cpp:600
+#, c-format
+msgid "Limit the swap space (page file) used by %s."
+msgstr "Rajoita %s käyttämää näennäismuistia (sivutustiedostoa)."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:626
-msgid "Gigabytes disk space (0 means no restriction)"
-msgstr "Gigatavua levytilaa (0 tarkoittaa ei rajoitusta)"
+#: clientgui/DlgAdvPreferencesBase.cpp:602
+msgid "Page/swap file: use at most"
+msgstr "Sivutus/näennäismuisti: käytä enintään"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:629
-msgid "Leave at least"
-msgstr "Jätä vähintään"
+#: clientgui/DlgAdvPreferencesBase.cpp:627
+msgid "and"
+msgstr "ja"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:633
-msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
-msgstr "BOINC jättää vähintään tämän verran levytilaa vapaaksi (gigatavuina)"
+#: clientgui/DlgAdvPreferencesBase.cpp:628
+msgid "to"
+msgstr " "
 
-#: clientgui/DlgAdvPreferencesBase.cpp:637
-msgid "Gigabytes disk space free"
-msgstr "Gigatavua vapaata levytilaa"
+#: clientgui/DlgAdvPreferencesBase.cpp:641
+msgid "Compute only during a particular period each day."
+msgstr "Laske vain tiettynä aikana joka päivä."
 
 #: clientgui/DlgAdvPreferencesBase.cpp:644
-msgid "BOINC uses at most this percentage of total disk space"
-msgstr "BOINC käyttää enintään tämän verran kokonaislevytilasta prosentteina"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:649
-#, no-c-format
-msgid "% of total disk space"
-msgstr "% kokonaislevytilasta"
+msgid "Compute only between"
+msgstr "Laske vain välillä"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:652
-msgid "Tasks checkpoint to disk at most every"
-msgstr "Paketin tarkistuspiste levylle joka"
+#: clientgui/DlgAdvPreferencesBase.cpp:654
+#: clientgui/DlgAdvPreferencesBase.cpp:801
+msgid "Day-of-week override"
+msgstr "Viikonpäivän ohitus"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:658
-msgid "seconds"
-msgstr "sekunti"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:668
-#, no-c-format
-msgid "% of page file (swap space)"
-msgstr "% sivutustiedostosta (näennäismuistista)"
+#: clientgui/DlgAdvPreferencesBase.cpp:805
+msgid "Override the times above on the selected days:"
+msgstr "Ohita ylläolevat ajat valittuina päivinä:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:675
-msgid "Memory usage"
-msgstr "Muistin käyttö"
+#: clientgui/DlgAdvPreferencesBase.cpp:676
+#: clientgui/DlgAdvPreferencesBase.cpp:822
+msgid "Monday"
+msgstr "Maanantai"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:691
-#, no-c-format
-msgid "% when computer is in use"
-msgstr "% tietokoneen ollessa käytössä"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:701
-#, no-c-format
-msgid "% when computer is idle"
-msgstr "% tietokoneen ollessa jouten"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:706
-msgid "Leave applications in memory while suspended"
-msgstr "Jätä sovellukset muistiin hyllytyksen ajaksi"
+#: clientgui/DlgAdvPreferencesBase.cpp:837
+msgid "Friday"
+msgstr "Perjantai"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:708
-msgid "if checked, suspended work units are left in memory"
-msgstr "jos valittuna, hyllytetyt työt jätetään muistiin"
+#: clientgui/DlgAdvPreferencesBase.cpp:704
+#: clientgui/DlgAdvPreferencesBase.cpp:850
+msgid "Tuesday"
+msgstr "Tiistai"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:728
-msgid "Suspend processor and network usage when these applications are running:"
-msgstr "Hyllytä prosessori- ja verkkokäyttö kun nämä sovellukset ovat käynnissä:"
+#: clientgui/DlgAdvPreferencesBase.cpp:719
+#: clientgui/DlgAdvPreferencesBase.cpp:865
+msgid "Saturday"
+msgstr "Lauantai"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:738
-msgid "Add..."
-msgstr "Lisää..."
+#: clientgui/DlgAdvPreferencesBase.cpp:732
+#: clientgui/DlgAdvPreferencesBase.cpp:878
+msgid "Wednesday"
+msgstr "Keskiviikko"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:739
-msgid "Add an application to this list"
-msgstr "Lisää sovellus tähän listaan"
+#: clientgui/DlgAdvPreferencesBase.cpp:747
+#: clientgui/DlgAdvPreferencesBase.cpp:893
+msgid "Sunday"
+msgstr "Sunnuntai"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:744
-msgid "Remove"
-msgstr "Poista"
+#: clientgui/DlgAdvPreferencesBase.cpp:760
+#: clientgui/DlgAdvPreferencesBase.cpp:906
+msgid "Thursday"
+msgstr "Torstai"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:745
-msgid "Remove an application from this list"
-msgstr "Poista sovellus tästä listasta"
+#: clientgui/DlgAdvPreferencesBase.cpp:789
+msgid "Transfer files only during a particular period each day."
+msgstr "Siirrä tiedostoja vain tiettynä aikana joka päivä."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:754
-msgid "For advanced options, refer to "
-msgstr "Lisäasetukset, katso "
+#: clientgui/DlgAdvPreferencesBase.cpp:791
+msgid "Transfer files only between"
+msgstr "Siirrä tiedostoja vain välillä"
 
 #: clientgui/DlgDiagnosticLogFlags.cpp:65
 #, c-format
 msgid "%s Diagnostic Log Flags"
-msgstr ""
+msgstr "%s diagnostiikkalokin liput"
 
 #: clientgui/DlgDiagnosticLogFlags.cpp:83
-msgid "These flags enable various types of diagnostic messages in the Event Log."
-msgstr ""
+msgid ""
+"These flags enable various types of diagnostic messages in the Event Log."
+msgstr "Nämä liput ottavat käyttöön eri tyypin diagnostiikkaviestejä tapahtumalokissa."
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:105
+#: clientgui/DlgDiagnosticLogFlags.cpp:99
+msgid "More info ..."
+msgstr "Lisää tietoa ..."
+
+#: clientgui/DlgDiagnosticLogFlags.cpp:120 clientgui/DlgHiddenColumns.cpp:101
 msgid "Save all values and close the dialog"
 msgstr "Tallenna kaikki arvot ja sulje ikkuna"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:108
+#: clientgui/DlgDiagnosticLogFlags.cpp:123 clientgui/DlgHiddenColumns.cpp:104
 msgid "Defaults"
 msgstr "Oletukset"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:109
+#: clientgui/DlgDiagnosticLogFlags.cpp:124 clientgui/DlgHiddenColumns.cpp:105
 msgid "Restore default settings"
 msgstr "Palauta oletusasetukset"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:113
+#: clientgui/DlgDiagnosticLogFlags.cpp:128 clientgui/DlgHiddenColumns.cpp:109
 msgid "Close the dialog without saving"
 msgstr "Sulje ikkuna tallentamatta"
 
-#: clientgui/DlgEventLog.cpp:226
+#: clientgui/DlgEventLog.cpp:227
 #, c-format
 msgid "%s - Event Log"
 msgstr "%s - Tapahtumaloki"
 
-#: clientgui/DlgEventLog.cpp:236
+#: clientgui/DlgEventLog.cpp:237
 msgid "Project"
 msgstr "Projekti"
 
-#: clientgui/DlgEventLog.cpp:237
+#: clientgui/DlgEventLog.cpp:238
 msgid "Time"
 msgstr "Aika"
 
-#: clientgui/DlgEventLog.cpp:238
+#: clientgui/DlgEventLog.cpp:239
 msgid "Message"
 msgstr "Viesti"
 
-#: clientgui/DlgEventLog.cpp:300
-#: clientgui/DlgEventLog.cpp:364
+#: clientgui/DlgEventLog.cpp:301 clientgui/DlgEventLog.cpp:365
 msgid "&Show only this project"
 msgstr "&Näytä vain tämä projekti"
 
-#: clientgui/DlgEventLog.cpp:304
+#: clientgui/DlgEventLog.cpp:305
 msgid "Copy &All"
 msgstr "Kopioi &kaikki"
 
-#: clientgui/DlgEventLog.cpp:306
-#: clientgui/DlgEventLog.cpp:310
+#: clientgui/DlgEventLog.cpp:307 clientgui/DlgEventLog.cpp:311
 msgid "Copy all the messages to the clipboard."
 msgstr "Kopioi kaikki viestit leikepöydälle."
 
-#: clientgui/DlgEventLog.cpp:315
+#: clientgui/DlgEventLog.cpp:316
 msgid "Copy &Selected"
 msgstr "Kopioi &valitut"
 
-#: clientgui/DlgEventLog.cpp:318
-#: clientgui/DlgEventLog.cpp:326
-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
+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 "Kopioi valitut viestit leikepöydälle. Voit valita useampia viestejä pitämällä shift- tai command-näppäintä pohjassa samalla kun napsautat viestiä."
 
-#: clientgui/DlgEventLog.cpp:320
-#: clientgui/DlgEventLog.cpp:328
-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
+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 "Kopioi valitut viestit leikepöydälle. Voit valita useampia viestejä pitämällä shift- tai control-näppäintä pohjassa samalla kun napsautat viestiä."
 
-#: clientgui/DlgEventLog.cpp:335
-#: clientgui/DlgItemProperties.cpp:67
+#: clientgui/DlgEventLog.cpp:336 clientgui/DlgItemProperties.cpp:67
 msgid "&Close"
 msgstr "&Sulje"
 
-#: clientgui/DlgEventLog.cpp:344
+#: clientgui/DlgEventLog.cpp:345
 #, c-format
 msgid "Get help with %s"
 msgstr "Hae apua %s:iin"
 
-#: clientgui/DlgEventLog.cpp:358
+#: clientgui/DlgEventLog.cpp:359
 msgid "Show all &messages"
 msgstr "Näytä kaikki &viestit"
 
-#: clientgui/DlgEventLog.cpp:359
-#: clientgui/DlgEventLog.cpp:361
+#: clientgui/DlgEventLog.cpp:360 clientgui/DlgEventLog.cpp:362
 msgid "Show messages for all projects"
 msgstr "Näytä kaikkien projektien viestit"
 
-#: clientgui/DlgEventLog.cpp:365
-#: clientgui/DlgEventLog.cpp:367
+#: clientgui/DlgEventLog.cpp:366 clientgui/DlgEventLog.cpp:368
 msgid "Show only the messages for the selected project"
 msgstr "Näytä vain valitun projektin viestit"
 
+#: clientgui/DlgExclusiveApps.cpp:60
+#, c-format
+msgid "%s - Exclusive Applications"
+msgstr "%s - Erityissovellukset"
+
+#: clientgui/DlgExclusiveApps.cpp:72
+msgid ""
+"Suspend processor and network usage when these applications are running:"
+msgstr "Hyllytä prosessori- ja verkkokäyttö kun nämä sovellukset ovat käynnissä:"
+
+#: clientgui/DlgExclusiveApps.cpp:80 clientgui/DlgExclusiveApps.cpp:104
+msgid "Add..."
+msgstr "Lisää..."
+
+#: clientgui/DlgExclusiveApps.cpp:81 clientgui/DlgExclusiveApps.cpp:105
+msgid "Add an application to this list"
+msgstr "Lisää sovellus tähän listaan"
+
+#: clientgui/DlgExclusiveApps.cpp:86 clientgui/DlgExclusiveApps.cpp:110
+msgid "Remove"
+msgstr "Poista"
+
+#: clientgui/DlgExclusiveApps.cpp:87 clientgui/DlgExclusiveApps.cpp:111
+msgid "Remove an application from this list"
+msgstr "Poista sovellus tästä listasta"
+
+#: clientgui/DlgExclusiveApps.cpp:96
+msgid "Suspend GPU usage when these applications are running:"
+msgstr "Hyllytä GPU näiden sovellusten ollessa käynnissä:"
+
+#: clientgui/DlgExclusiveApps.cpp:122
+msgid "For advanced options, refer to "
+msgstr "Lisäasetukset, katso "
+
+#: clientgui/DlgExclusiveApps.cpp:147
+msgid "save all values and close the dialog"
+msgstr "tallenna kaikki arvot ja sulje"
+
+#: clientgui/DlgExclusiveApps.cpp:153
+msgid "close the dialog without saving"
+msgstr "sulje tallentamatta"
+
+#: clientgui/DlgExclusiveApps.cpp:158
+msgid "shows the preferences web page"
+msgstr "näyttää asetusten nettisivun"
+
+#: clientgui/DlgExclusiveApps.cpp:303 clientgui/DlgExclusiveApps.cpp:309
+#: clientgui/DlgExclusiveApps.cpp:315
+msgid "Applications to add"
+msgstr "Lisättävät sovellukset"
+
+#: clientgui/DlgExclusiveApps.cpp:332
+#, c-format
+msgid "'%s' is not an executable application."
+msgstr "\"%s\" ei ole ajettava sovellus."
+
+#: clientgui/DlgExclusiveApps.cpp:333 clientgui/DlgExclusiveApps.cpp:380
+#: clientgui/DlgExclusiveApps.cpp:404
+msgid "Add Exclusive App"
+msgstr "Lisää erityissovellus"
+
+#: clientgui/DlgExclusiveApps.cpp:345
+msgid "Name of application to add?"
+msgstr "Lisättävän sovelluksen nimi?"
+
+#: clientgui/DlgExclusiveApps.cpp:345
+msgid "Add exclusive app"
+msgstr "Lisää erityissovellus"
+
+#: clientgui/DlgExclusiveApps.cpp:379
+#, c-format
+msgid "Application names must end with '%s'"
+msgstr "Sovellusnimien pitää päätyä \"%s\""
+
+#: clientgui/DlgExclusiveApps.cpp:403
+#, c-format
+msgid "'%s' is already in the list."
+msgstr "\"%s\" on jo listalla."
+
 #: clientgui/DlgExitMessage.cpp:82
 #, c-format
 msgid "%s - Exit Confirmation"
@@ -1698,13 +1736,7 @@ msgid ""
 "\n"
 "If you also want to stop running the tasks,\n"
 "choose from the following options:"
-msgstr ""
-"Haluat lopettaa %s:n,\n"
-"jolla voit katsoa ja hallinnoida\n"
-"käynnissä olevia tehtäviä koneellasi.\n"
-"\n"
-"Jos haluat lopettaa myös tehtävien suorittamisen,\n"
-"niin valitse seuraavista vaihtoehdoista:"
+msgstr "Haluat lopettaa %s:n,\njolla voit katsoa ja hallinnoida\nkäynnissä olevia tehtäviä koneellasi.\n\nJos haluat lopettaa myös tehtävien suorittamisen,\nniin valitse seuraavista vaihtoehdoista:"
 
 #: clientgui/DlgExitMessage.cpp:135
 #, c-format
@@ -1715,13 +1747,7 @@ msgid ""
 "In most cases, it is better just to close the %s window\n"
 "rather than to exit the application; that will allow %s to run its\n"
 "tasks at the times you selected in your preferences."
-msgstr ""
-"Tämä sammuttaa %s:n ja kaikki sen työpaketit kunnes joko\n"
-"%s -sovellus tai %s -näytönsäästäjä käynnistyy jälleen.\n"
-"\n"
-"Useimmissa tapauksissa on parempi sulkea %s -ikkuna\n"
-"kuin lopettaa sovellus kokonaan; siten %s pysyy käynnissä ja\n"
-"työpakettien suoritus jatkuu asetusten mukaisesti."
+msgstr "Tämä sammuttaa %s:n ja kaikki sen työpaketit kunnes joko\n%s -sovellus tai %s -näytönsäästäjä käynnistyy jälleen.\n\nUseimmissa tapauksissa on parempi sulkea %s -ikkuna\nkuin lopettaa sovellus kokonaan; siten %s pysyy käynnissä ja\ntyöpakettien suoritus jatkuu asetusten mukaisesti."
 
 #: clientgui/DlgExitMessage.cpp:153
 #, c-format
@@ -1732,10 +1758,8 @@ msgstr "Lopeta pakettien suoritus kun %s lopetetaan"
 msgid "Remember this decision and do not show this dialog."
 msgstr "Muista valinta äläkä näytä tätä uudelleen."
 
-#: 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
 msgid "&Cancel"
 msgstr "&Peruuta"
 
@@ -1743,10 +1767,28 @@ msgstr "&Peruuta"
 msgid "Don't show this dialog again."
 msgstr "Älä näytä tätä uudelleen."
 
-#: clientgui/DlgItemProperties.cpp:194
-#: clientgui/DlgItemProperties.cpp:197
-#: clientgui/DlgItemProperties.cpp:200
-#: clientgui/DlgItemProperties.cpp:203
+#: clientgui/DlgHiddenColumns.cpp:64
+#, c-format
+msgid "%s Column Selection"
+msgstr "%s Sarakevalinta"
+
+#: clientgui/DlgHiddenColumns.cpp:77
+#, c-format
+msgid "Select which columns %s should show."
+msgstr "Valitse mitkä sarakkeet %s tulisi näyttää."
+
+#: clientgui/DlgHiddenColumns.cpp:314
+msgid ""
+"Are you sure you want to reset all list columns to the default "
+"configurations?"
+msgstr "Haluatko varmasti palauttaa kaikki sarakkeet oletusasetuksiinsa?"
+
+#: clientgui/DlgHiddenColumns.cpp:315
+msgid "Confirm defaults"
+msgstr "Vahvista oletukset"
+
+#: clientgui/DlgItemProperties.cpp:194 clientgui/DlgItemProperties.cpp:197
+#: clientgui/DlgItemProperties.cpp:200 clientgui/DlgItemProperties.cpp:203
 msgid "Don't fetch tasks for "
 msgstr "Älä lataa työtä prosessorille "
 
@@ -1778,8 +1820,7 @@ msgstr " työn latauksen lykkäysaikaväli"
 msgid "Properties of project "
 msgstr "Tietoja projektista "
 
-#: clientgui/DlgItemProperties.cpp:243
-#: clientgui/DlgOptions.cpp:221
+#: clientgui/DlgItemProperties.cpp:243 clientgui/DlgOptions.cpp:221
 msgid "General"
 msgstr "Yleiset"
 
@@ -1811,6 +1852,10 @@ msgstr "Tiedoston latausta lykätty"
 msgid "File uploads deferred for"
 msgstr "Tiedoston lähetystä lykätty"
 
+#: clientgui/DlgItemProperties.cpp:257
+msgid "Disk usage"
+msgstr "Levyn käyttö"
+
 #: clientgui/DlgItemProperties.cpp:258
 msgid "Computer ID"
 msgstr "Tietokoneen tunniste"
@@ -1819,14 +1864,10 @@ msgstr "Tietokoneen tunniste"
 msgid "Non CPU intensive"
 msgstr "Ei prosessorikuormittava"
 
-#: 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 "kyllä"
 
@@ -1834,8 +1875,7 @@ msgstr "kyllä"
 msgid "Suspended via GUI"
 msgstr "Hyllytetty käyttöliittymän kautta"
 
-#: clientgui/DlgItemProperties.cpp:262
-#: clientgui/DlgItemProperties.cpp:263
+#: clientgui/DlgItemProperties.cpp:262 clientgui/DlgItemProperties.cpp:263
 msgid "no"
 msgstr "ei"
 
@@ -1851,8 +1891,7 @@ msgstr "Pyyntö aikatauluttajalle käynnissä"
 msgid "Trickle-up pending"
 msgstr "Väliaikaviesti odottaa"
 
-#: clientgui/DlgItemProperties.cpp:271
-#: clientgui/DlgItemProperties.cpp:273
+#: clientgui/DlgItemProperties.cpp:271 clientgui/DlgItemProperties.cpp:273
 msgid "Host location"
 msgstr "Koneen sijainti"
 
@@ -1874,11 +1913,11 @@ msgstr "Päättynyt"
 
 #: clientgui/DlgItemProperties.cpp:285
 msgid "Tasks completed"
-msgstr "Suoritetut paketit"
+msgstr "Valmistuneet tehtävät"
 
 #: clientgui/DlgItemProperties.cpp:286
 msgid "Tasks failed"
-msgstr "Virheelliset paketit"
+msgstr "Epäonnistuneet tehtävät"
 
 #: clientgui/DlgItemProperties.cpp:288
 msgid "Credit"
@@ -1944,13 +1983,11 @@ msgstr "Arvioitu laskentakoko"
 msgid "CPU time at last checkpoint"
 msgstr "Suoritinaika viim. tarkistuspisteessä"
 
-#: clientgui/DlgItemProperties.cpp:374
-#: clientgui/DlgItemProperties.cpp:389
+#: clientgui/DlgItemProperties.cpp:374 clientgui/DlgItemProperties.cpp:389
 msgid "CPU time"
 msgstr "Suoritinaika"
 
-#: clientgui/DlgItemProperties.cpp:376
-#: clientgui/DlgItemProperties.cpp:390
+#: clientgui/DlgItemProperties.cpp:376 clientgui/DlgItemProperties.cpp:390
 msgid "Elapsed time"
 msgstr "Kulunut aika"
 
@@ -1982,8 +2019,7 @@ msgstr "Prosessin tunniste"
 msgid "Local: "
 msgstr "Paikallinen: "
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: clientgui/DlgOptions.cpp:129 clientgui/DlgOptions.cpp:135
 msgid "Options"
 msgstr "Asetukset"
 
@@ -2047,33 +2083,27 @@ msgstr "Yhdistä HTTP proxypalvelimen kautta"
 msgid "HTTP Proxy Server Configuration"
 msgstr "HTTP proxypalvelimen asetukset"
 
-#: clientgui/DlgOptions.cpp:283
-#: clientgui/DlgOptions.cpp:347
+#: clientgui/DlgOptions.cpp:283 clientgui/DlgOptions.cpp:347
 msgid "Address:"
 msgstr "Osoite:"
 
-#: clientgui/DlgOptions.cpp:291
-#: clientgui/DlgOptions.cpp:355
+#: clientgui/DlgOptions.cpp:291 clientgui/DlgOptions.cpp:355
 msgid "Port:"
 msgstr "Portti:"
 
-#: clientgui/DlgOptions.cpp:299
-#: clientgui/DlgOptions.cpp:363
+#: clientgui/DlgOptions.cpp:299 clientgui/DlgOptions.cpp:363
 msgid "Don't use proxy for:"
 msgstr "Älä käytä proxya:"
 
-#: clientgui/DlgOptions.cpp:306
-#: clientgui/DlgOptions.cpp:370
+#: clientgui/DlgOptions.cpp:306 clientgui/DlgOptions.cpp:370
 msgid "Leave these blank if not needed"
 msgstr "Jätä tyhjäksi jos ei tarvita"
 
-#: clientgui/DlgOptions.cpp:312
-#: clientgui/DlgOptions.cpp:376
+#: clientgui/DlgOptions.cpp:312 clientgui/DlgOptions.cpp:376
 msgid "User Name:"
 msgstr "Käyttäjänimi:"
 
-#: clientgui/DlgOptions.cpp:320
-#: clientgui/DlgOptions.cpp:384
+#: clientgui/DlgOptions.cpp:320 clientgui/DlgOptions.cpp:384
 #: clientgui/DlgSelectComputer.cpp:152
 msgid "Password:"
 msgstr "Salasana:"
@@ -2125,7 +2155,9 @@ msgstr "%s - Kielen valinta"
 
 #: 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 "%s:n kieli on vaihdettu.  Jotta muutos tulee voimaan, %s pitää käynnistää uudelleen."
 
 #: clientgui/DlgSelectComputer.cpp:91
@@ -2138,16 +2170,13 @@ msgstr "%s - Valitse tietokone"
 msgid ""
 "Another instance of %s is already running \n"
 "on this computer.  Please select a client to monitor."
-msgstr ""
-"Toinen instanssi %s:sta on jo käynnissä \n"
-"tässä koneessa.  Valitse ohjelma seurataksesi."
+msgstr "Toinen instanssi %s:sta on jo käynnissä \ntässä koneessa.  Valitse ohjelma seurataksesi."
 
 #: clientgui/DlgSelectComputer.cpp:143
 msgid "Host name:"
 msgstr "Konenimi:"
 
-#: clientgui/Localization.cpp:31
-#: clientgui/Localization.cpp:69
+#: clientgui/Localization.cpp:31 clientgui/Localization.cpp:69
 msgid "Message boards"
 msgstr "Keskustelupalstat"
 
@@ -2159,15 +2188,12 @@ msgstr "Keskustele muiden käyttäjien kanssa SETI at homen keskustelupalstoilla"
 msgid "Ask questions and report problems"
 msgstr "Kysy kysymyksiä ja raportoi ongelmista"
 
-#: 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 "Tilisi"
 
-#: 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 "Katso tilisi tietoja ja kokonaispisteitäsi"
@@ -2180,18 +2206,15 @@ msgstr "Asetuksesi"
 msgid "View and modify your SETI at home account profile and preferences"
 msgstr "Tarkastele ja muokkaa SETI at homen tilin profiilia ja asetuksia"
 
-#: clientgui/Localization.cpp:47
-#: clientgui/Localization.cpp:89
+#: clientgui/Localization.cpp:47 clientgui/Localization.cpp:89
 msgid "Your results"
 msgstr "Tuloksesi"
 
-#: 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 "Katsele viime viikon (tai pidemmältä ajalta) laskentatuloksia ja töitä"
 
-#: clientgui/Localization.cpp:51
-#: clientgui/Localization.cpp:93
+#: clientgui/Localization.cpp:51 clientgui/Localization.cpp:93
 msgid "Your computers"
 msgstr "Tietokoneesi"
 
@@ -2199,13 +2222,11 @@ msgstr "Tietokoneesi"
 msgid "View a listing of all the computers on which you are running SETI at Home"
 msgstr "Selaa tietokoneitasi, joilla osallistut SETI at Homeen"
 
-#: clientgui/Localization.cpp:55
-#: clientgui/Localization.cpp:97
+#: clientgui/Localization.cpp:55 clientgui/Localization.cpp:97
 msgid "Your team"
 msgstr "Tiimisi"
 
-#: clientgui/Localization.cpp:57
-#: clientgui/Localization.cpp:99
+#: clientgui/Localization.cpp:57 clientgui/Localization.cpp:99
 msgid "View information about your team"
 msgstr "Katsele tiimisi tietoja"
 
@@ -2226,7 +2247,8 @@ msgid "Read a detailed description of the Einstein at Home screensaver"
 msgstr "Lue yksityiskohtaiset tiedot Einstein at Homen näytönsäästäjästä"
 
 #: 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 "Keskustele ylläpitäjien ja muiden käyttäjien kanssa Einstein at Home -keskustelupalstoilla"
 
 #: clientgui/Localization.cpp:73
@@ -2254,7 +2276,8 @@ msgid "Account summary"
 msgstr "Tilin yhteenveto"
 
 #: 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 "Selaa tietokoneitasi, joilla osallistut Einstein at Homeen"
 
 #: clientgui/Localization.cpp:101
@@ -2262,7 +2285,9 @@ msgid "LIGO project"
 msgstr "LIGO projekti"
 
 #: 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 "Laser Interferometer Gravitational-wave Observatory (LIGO) -projektin kotisivu"
 
 #: clientgui/Localization.cpp:105
@@ -2273,8 +2298,7 @@ msgstr "GEO-600 projekti"
 msgid "The home page of the GEO-600 project"
 msgstr "GEO-600 -projektin kotisivu"
 
-#: clientgui/Localization.cpp:115
-#: clientgui/Localization.cpp:133
+#: clientgui/Localization.cpp:115 clientgui/Localization.cpp:133
 msgid "Team"
 msgstr "Tiimi"
 
@@ -2355,7 +2379,9 @@ msgid "Missing application"
 msgstr "Puuttuva sovellus"
 
 #: 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 "Lataa ja asenna CoRD-sovellus osoitteesta http://cord.sourceforge.net"
 
 #: clientgui/MainDocument.cpp:2442
@@ -2376,7 +2402,7 @@ msgstr "aika päivästä"
 
 #: clientgui/MainDocument.cpp:2446
 msgid "CPU benchmarks in progress"
-msgstr "CPU-suorituskykytestit käynnissä"
+msgstr "suorituskykytestit käynnissä"
 
 #: clientgui/MainDocument.cpp:2447
 msgid "need disk space - check preferences"
@@ -2426,8 +2452,7 @@ msgstr "Lataus epäonnistui"
 msgid "Downloading"
 msgstr "Ladataan"
 
-#: clientgui/MainDocument.cpp:2492
-#: clientgui/MainDocument.cpp:2557
+#: clientgui/MainDocument.cpp:2492 clientgui/MainDocument.cpp:2548
 msgid " (suspended - "
 msgstr " (hyllytetty - "
 
@@ -2443,98 +2468,95 @@ msgstr "Tehtävä on käyttäjän hyllyttämä"
 msgid "Suspended - "
 msgstr "Hyllytetty - "
 
-# 75%
-#: clientgui/MainDocument.cpp:2510
+#: clientgui/MainDocument.cpp:2507
 msgid "GPU suspended - "
 msgstr "GPU hyllytetty - "
 
-#: clientgui/MainDocument.cpp:2517
+#: clientgui/MainDocument.cpp:2511
 msgid "Waiting for memory"
 msgstr "Odottaa muistia"
 
-#: clientgui/MainDocument.cpp:2519
+#: clientgui/MainDocument.cpp:2513
 msgid "Waiting for shared memory"
 msgstr "Odottaa jaettua muistia"
 
-#: clientgui/MainDocument.cpp:2521
+#: clientgui/MainDocument.cpp:2515
 msgid "Running"
 msgstr "Suoritetaan"
 
-#: clientgui/MainDocument.cpp:2523
+#: clientgui/MainDocument.cpp:2517
 msgid " (non-CPU-intensive)"
 msgstr " (ei prosessorikuormittava)"
 
-#: clientgui/MainDocument.cpp:2526
+#: clientgui/MainDocument.cpp:2520
 msgid "Waiting to run"
 msgstr "Odottaa suorittamista"
 
-#: clientgui/MainDocument.cpp:2528
-#: clientgui/MainDocument.cpp:2534
+#: clientgui/MainDocument.cpp:2522 clientgui/MainDocument.cpp:2525
 msgid "Ready to start"
 msgstr "Valmiina aloitettavaksi"
 
-#: clientgui/MainDocument.cpp:2538
+#: clientgui/MainDocument.cpp:2529
 msgid "Postponed: "
-msgstr "Siirretty myöhemmäksi: "
+msgstr "Lykätty:"
 
-#: clientgui/MainDocument.cpp:2541
+#: clientgui/MainDocument.cpp:2532
 msgid "Postponed"
-msgstr "Siirretty myöhemmäksi"
+msgstr "Lykätty"
 
-#: clientgui/MainDocument.cpp:2545
+#: clientgui/MainDocument.cpp:2536
 msgid "Waiting for network access"
-msgstr "Odottaa verkkoyhteyttä"
+msgstr "Odottaa pääsyä verkkoon"
 
-#: clientgui/MainDocument.cpp:2549
+#: clientgui/MainDocument.cpp:2540
 msgid "Computation error"
 msgstr "Laskentavirhe"
 
-#: clientgui/MainDocument.cpp:2553
+#: clientgui/MainDocument.cpp:2544
 msgid "Upload failed"
 msgstr "Lähetys epäonnistui"
 
-#: clientgui/MainDocument.cpp:2555
+#: clientgui/MainDocument.cpp:2546
 msgid "Uploading"
 msgstr "Lähetetään"
 
-#: clientgui/MainDocument.cpp:2566
+#: clientgui/MainDocument.cpp:2557
 msgid "Aborted by user"
 msgstr "Käyttäjän hylkäämä"
 
-#: clientgui/MainDocument.cpp:2569
+#: clientgui/MainDocument.cpp:2560
 msgid "Aborted by project"
 msgstr "Projektin hylkäämä"
 
-#: clientgui/MainDocument.cpp:2572
+#: clientgui/MainDocument.cpp:2563
 msgid "Aborted: not started by deadline"
 msgstr "Hylätty: ei ehditty aloittaa ennen takarajaa"
 
-#: clientgui/MainDocument.cpp:2575
+#: clientgui/MainDocument.cpp:2566
 msgid "Aborted: disk limit exceeded"
 msgstr "Hylätty: levyraja saavutettu"
 
-# 78%
-#: clientgui/MainDocument.cpp:2578
+#: clientgui/MainDocument.cpp:2569
 msgid "Aborted: run time limit exceeded"
 msgstr "Hylätty: suoritusajan raja saavutettu"
 
-#: clientgui/MainDocument.cpp:2581
+#: clientgui/MainDocument.cpp:2572
 msgid "Aborted: memory limit exceeded"
 msgstr "Hylätty: muistiraja saavutettu"
 
-#: clientgui/MainDocument.cpp:2584
+#: clientgui/MainDocument.cpp:2575
 msgid "Aborted"
 msgstr "Hylätty"
 
-#: clientgui/MainDocument.cpp:2589
+#: clientgui/MainDocument.cpp:2580
 msgid "Acknowledged"
 msgstr "Hyväksytty"
 
-#: clientgui/MainDocument.cpp:2591
+#: clientgui/MainDocument.cpp:2582
 msgid "Ready to report"
 msgstr "Valmiina raportoitavaksi"
 
-#: clientgui/MainDocument.cpp:2593
+#: clientgui/MainDocument.cpp:2584
 #, c-format
 msgid "Error: invalid state '%d'"
 msgstr "Virhe: virheellinen tila \"%d\""
@@ -2556,10 +2578,7 @@ msgid ""
 "The URL you supplied is not that of a BOINC-based project.\n"
 "\n"
 "Please check the URL and try again."
-msgstr ""
-"Antamasi URL-osoite ei kuulu BOINC-projektille.\n"
-"\n"
-"Tarkista URL-osoite ja yritä uudelleen."
+msgstr "Antamasi URL-osoite ei kuulu BOINC-projektille.\n\nTarkista URL-osoite ja yritä uudelleen."
 
 #: clientgui/NotDetectedPage.cpp:188
 msgid "Account manager not found"
@@ -2571,11 +2590,7 @@ msgid ""
 "manager.\n"
 "\n"
 "Please check the URL and try again."
-msgstr ""
-"Antamasi URL-osoite ei kuulu BOINCin\n"
-"tilihallitsijalle.\n"
-"\n"
-"Tarkista URL-osoite ja yritä uudelleen."
+msgstr "Antamasi URL-osoite ei kuulu BOINCin\ntilihallitsijalle.\n\nTarkista URL-osoite ja yritä uudelleen."
 
 #: clientgui/NotFoundPage.cpp:181
 msgid "Login Failed."
@@ -2597,53 +2612,54 @@ msgstr "lisää..."
 msgid "Choose a project"
 msgstr "Valitse projekti"
 
-#: clientgui/ProjectInfoPage.cpp:228
+#: clientgui/ProjectInfoPage.cpp:226
 msgid "To choose a project, click its name or type its URL below."
 msgstr "Valitse projekti listasta napsauttamalla nimeä tai kirjoita sen URL-osoite."
 
-#: clientgui/ProjectInfoPage.cpp:246
+#: clientgui/ProjectInfoPage.cpp:242
 msgid "Categories:"
 msgstr "Kategoriat:"
 
-#: clientgui/ProjectInfoPage.cpp:267
+#: clientgui/ProjectInfoPage.cpp:262
 msgid "Projects:"
 msgstr "Projektit:"
 
-#: clientgui/ProjectInfoPage.cpp:279
+#: clientgui/ProjectInfoPage.cpp:274
 msgid "Project details"
 msgstr "Projektitiedot"
 
-#: clientgui/ProjectInfoPage.cpp:291
+#: clientgui/ProjectInfoPage.cpp:284
 msgid "Research area:"
 msgstr "Tutkimusala:"
 
-#: clientgui/ProjectInfoPage.cpp:302
+#: clientgui/ProjectInfoPage.cpp:294
 msgid "Organization:"
 msgstr "Organisaatio:"
 
-#: clientgui/ProjectInfoPage.cpp:313
+#: clientgui/ProjectInfoPage.cpp:304
 msgid "Web site:"
 msgstr "Nettisivu:"
 
-#: clientgui/ProjectInfoPage.cpp:325
+#: clientgui/ProjectInfoPage.cpp:315
 msgid "Supported systems:"
 msgstr "Tuetut järjestelmät:"
 
-#: clientgui/ProjectInfoPage.cpp:363
+#: clientgui/ProjectInfoPage.cpp:352
 msgid "Project URL:"
 msgstr "Projektin URL-osoite:"
 
-#: clientgui/ProjectInfoPage.cpp:499
-#: clientgui/ProjectInfoPage.cpp:754
-#: clientgui/ProjectInfoPage.cpp:758
+#: clientgui/ProjectInfoPage.cpp:486 clientgui/ProjectInfoPage.cpp:686
+#: clientgui/ProjectInfoPage.cpp:690
 msgid "All"
 msgstr "Kaikki"
 
-#: clientgui/ProjectInfoPage.cpp:802
-msgid "This project may not have work for your type of computer.  Do you want to add it anyway?"
+#: clientgui/ProjectInfoPage.cpp:735
+msgid ""
+"This project may not have work for your type of computer.  Do you want to "
+"add it anyway?"
 msgstr "Tällä projektilla ei ehkä ole työtä tietokoneesi tyypille.  Lisätäänkö se kuitenkin?"
 
-#: clientgui/ProjectInfoPage.cpp:826
+#: clientgui/ProjectInfoPage.cpp:767
 msgid "You already added this project. Please choose a different project."
 msgstr "Olet jo liittynyt tähän projektiin. Valitse toinen projekti."
 
@@ -2651,12 +2667,12 @@ msgstr "Olet jo liittynyt tähän projektiin. Valitse toinen projekti."
 msgid "Communicating with project."
 msgstr "Ollaan yhteydessä projektiin."
 
-#: clientgui/ProjectProcessingPage.cpp:510
+#: clientgui/ProjectProcessingPage.cpp:509
 msgid "Required files not found on the server."
 msgstr "Palvelimelta ei löydy tarvittavia tiedostoja."
 
-#: clientgui/ProjectProcessingPage.cpp:513
-#: clientgui/ProjectProcessingPage.cpp:586
+#: clientgui/ProjectProcessingPage.cpp:512
+#: clientgui/ProjectProcessingPage.cpp:585
 msgid "An internal server error has occurred."
 msgstr "Palvelimella on tapahtunut virhe."
 
@@ -2664,18 +2680,16 @@ msgstr "Palvelimella on tapahtunut virhe."
 msgid ""
 "Communicating with project\n"
 "Please wait..."
-msgstr ""
-"Ollaan yhteydessä projektiin\n"
-"Odota..."
+msgstr "Ollaan yhteydessä projektiin\nOdota..."
 
 #: clientgui/ProjectWelcomePage.cpp:251
 #, c-format
 msgid "Welcome to %s."
-msgstr "Tervetuloa %s projektiin."
+msgstr "Tervetuloa %s-ohjelmaan."
 
 #: clientgui/ProjectWelcomePage.cpp:254
 msgid "You have volunteered to compute for this project:"
-msgstr "Olet tarjoutunut laskemaan tähän projektiin:"
+msgstr "Suoritat laskentaa tälle projektille:"
 
 #: clientgui/ProjectWelcomePage.cpp:255
 msgid "Name:"
@@ -2698,8 +2712,10 @@ msgid "User:"
 msgstr "Käyttäjä:"
 
 #: clientgui/ProjectWelcomePage.cpp:273
-msgid "WARNING: This project is not registered with BOINC.  Make sure you trust it before continuing."
-msgstr "VAROITUS: Tämä projekti ei ole rekisteröity BOINCiin.  Varmista, että luotat siihen ennen kuin jatkat."
+msgid ""
+"WARNING: This project is not registered with BOINC.  Make sure you trust it "
+"before continuing."
+msgstr "VAROITUS: Tätä projektia ei ole rekisteröity BOINCiin. Varmista, että luotat siihen ennen kuin jatkat."
 
 #: clientgui/ProjectWelcomePage.cpp:277
 msgid "To continue, click Next."
@@ -2724,20 +2740,7 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"The World Community Grid - BOINC-ohjelmisto ei onnistunut saamaan\n"
-"yhteyttä internetiin. Yleisimmät syyt ovat:\n"
-"\n"
-"1) Yhteysongelma.  Tarkista verkko- tai modeemiyhteys,\n"
-"napsauta Takaisin ja yritä uudelleen.\n"
-"\n"
-"2) Palomuuri on estänyt World Community Grid - BOINC\n"
-"-ohjelmiston.  Muokkaa palomuurisi asetuksia ja salli\n"
-"BOINCin ja BOINC Managerin ottaa yhteys porttiin 80 ja porttiin 443,\n"
-"napsauta Takaisin ja yritä uudelleen.\n"
-"\n"
-"3) Käytät proxy-palvelinta.\n"
-"Napsauta Seuraava ja muokkaa BOINCin proxy-asetuksia."
+msgstr "The World Community Grid - BOINC-ohjelmisto ei onnistunut saamaan\nyhteyttä internetiin. Yleisimmät syyt ovat:\n\n1) Yhteysongelma.  Tarkista verkko- tai modeemiyhteys,\nnapsauta Takaisin ja yritä uudelleen.\n\n2) Palomuuri on estänyt World Community Grid - BOINC\n-ohjelmiston.  Muokkaa palomuurisi asetuksia ja salli\nBOINCin ja BOINC Managerin ottaa yhteys porttiin 80 ja porttiin 443,\nnapsauta Takaisin ja yritä uudelleen.\n\n3) Käytät proxy-palvelinta.\nNapsauta Seuraava ja muo [...]
 
 #: clientgui/ProxyInfoPage.cpp:203
 msgid ""
@@ -2754,20 +2757,7 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"BOINC-ohjelmisto ei onnistunut saamaan\n"
-"yhteyttä internetiin. Yleisimmät syyt ovat:\n"
-"\n"
-"1) Yhteysongelma.  Tarkista verkko- tai modeemiyhteys,\n"
-"napsauta Takaisin ja yritä uudelleen.\n"
-"\n"
-"2) Palomuuri on estänyt BOINC-ohjelmiston.\n"
-"Muokkaa palomuurisi asetuksia ja salli BOINCin\n"
-"ja BOINC Managerin ottaa yhteys porttiin 80,\n"
-"napsauta Takaisin ja yritä uudelleen.\n"
-"\n"
-"3) Käytät proxy-palvelinta.\n"
-"Napsauta Seuraava ja muokkaa BOINCin proxy-asetuksia."
+msgstr "BOINC-ohjelmisto ei onnistunut saamaan\nyhteyttä internetiin. Yleisimmät syyt ovat:\n\n1) Yhteysongelma.  Tarkista verkko- tai modeemiyhteys,\nnapsauta Takaisin ja yritä uudelleen.\n\n2) Palomuuri on estänyt BOINC-ohjelmiston.\nMuokkaa palomuurisi asetuksia ja salli BOINCin\nja BOINC Managerin ottaa yhteys porttiin 80,\nnapsauta Takaisin ja yritä uudelleen.\n\n3) Käytät proxy-palvelinta.\nNapsauta Seuraava ja muokkaa BOINCin proxy-asetuksia."
 
 #: clientgui/ProxyPage.cpp:331
 msgid "Proxy configuration"
@@ -2777,8 +2767,7 @@ msgstr "Proxy-asetukset"
 msgid "HTTP proxy"
 msgstr "HTTP proxy"
 
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
+#: clientgui/ProxyPage.cpp:337 clientgui/ProxyPage.cpp:357
 msgid "Server:"
 msgstr "Palvelin:"
 
@@ -2815,23 +2804,23 @@ msgstr "&%s"
 msgid "Default"
 msgstr "Oletus"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:848
+#: clientgui/sg_BoincSimpleFrame.cpp:847
 msgid "Suspend"
 msgstr "Hyllytä"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:850
+#: clientgui/sg_BoincSimpleFrame.cpp:849
 msgid "Suspend Computing"
 msgstr "Hyllytä laskenta"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:851
+#: clientgui/sg_BoincSimpleFrame.cpp:850
 msgid "Resume Computing"
 msgstr "Jatka laskentaa"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:867
+#: clientgui/sg_BoincSimpleFrame.cpp:866
 msgid "Notices"
 msgstr "Ilmoitukset"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:868
+#: clientgui/sg_BoincSimpleFrame.cpp:867
 msgid "Open a window to view notices from projects or BOINC"
 msgstr "Avaa ikkuna katsoaksesi ilmoituksia projektilta tai BOINCilta"
 
@@ -2861,11 +2850,13 @@ msgid "Click OK to set preferences."
 msgstr "Napsauta OK muuttaaksesi asetuksia."
 
 #: clientgui/sg_DlgPreferences.cpp:280
-msgid "Click Clear to restore web-based settings for all preferences listed below."
+msgid ""
+"Click Clear to restore web-based settings for all preferences listed below."
 msgstr "Napsauta Tyhjennä palauttaaksesi nettipohjaiset asetukset kaikkiin alla oleviin asetuksiin."
 
 #: clientgui/sg_DlgPreferences.cpp:287
-msgid "For additional settings, select Computing Preferences in the Advanced View."
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
 msgstr "Lisää asetuksia valitsemalla Laskenta-asetukset laajennetussa näkymässä."
 
 #: clientgui/sg_DlgPreferences.cpp:315
@@ -2876,8 +2867,7 @@ msgstr "Salli työ vain välillä:"
 msgid "Connect to internet only between:"
 msgstr "Ota internetyhteys vain välillä:"
 
-#: clientgui/sg_DlgPreferences.cpp:359
-#: clientgui/sg_DlgPreferences.cpp:376
+#: clientgui/sg_DlgPreferences.cpp:359 clientgui/sg_DlgPreferences.cpp:376
 msgid "Use no more than:"
 msgstr "Älä käytä enempää kuin:"
 
@@ -2901,14 +2891,10 @@ msgstr "Suorita, kun on ollut jouten:"
 msgid "Clear all local preferences listed above and close the dialog"
 msgstr "Tyhjennä kaikki ylläolevat paikalliset asetukset ja sulje ikkuna"
 
-#: clientgui/sg_DlgPreferences.cpp:609
-#: clientgui/sg_DlgPreferences.cpp:612
-#: clientgui/sg_DlgPreferences.cpp:688
-#: clientgui/sg_DlgPreferences.cpp:692
-#: clientgui/sg_DlgPreferences.cpp:704
-#: clientgui/sg_DlgPreferences.cpp:708
-#: clientgui/sg_DlgPreferences.cpp:851
-#: clientgui/sg_DlgPreferences.cpp:862
+#: clientgui/sg_DlgPreferences.cpp:609 clientgui/sg_DlgPreferences.cpp:612
+#: clientgui/sg_DlgPreferences.cpp:688 clientgui/sg_DlgPreferences.cpp:692
+#: clientgui/sg_DlgPreferences.cpp:704 clientgui/sg_DlgPreferences.cpp:708
+#: clientgui/sg_DlgPreferences.cpp:851 clientgui/sg_DlgPreferences.cpp:862
 msgid "Anytime"
 msgstr "Milloin vain"
 
@@ -2986,99 +2972,85 @@ msgid "Do you really want to clear all local preferences?\n"
 msgstr "Haluatko tyhjentää kaikki paikalliset asetukset?\n"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:66
-#: clientgui/ViewProjects.cpp:179
 msgid "Update"
 msgstr "Päivitä"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:67
-#: clientgui/ViewProjects.cpp:180
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
+msgid ""
+"Report all completed tasks, get latest credit, get latest preferences, and "
+"possibly get more tasks."
 msgstr "Raportoi kaikki valmiit työpaketit, hae viimeisimmät pisteet ja asetukset sekä mahdollisesti lisää paketteja."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:73
 #: clientgui/sg_ProjectCommandPopup.cpp:129
-#: clientgui/ViewProjects.cpp:187
-#: clientgui/ViewProjects.cpp:727
 msgid "Suspend tasks for this project."
 msgstr "Hyllytä tämän projektin tehtävät."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:78
 #: clientgui/sg_ProjectCommandPopup.cpp:136
-#: clientgui/ViewProjects.cpp:193
-#: clientgui/ViewProjects.cpp:746
 msgid "No new tasks"
 msgstr "Ei uusia töitä"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:79
-#: clientgui/ViewProjects.cpp:194
 msgid "Don't get new tasks for this project."
 msgstr "Älä lataa uusia töitä tälle projektille."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:200
 msgid "Reset project"
 msgstr "Nollaa projekti"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:85
-#: clientgui/ViewProjects.cpp:201
-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."
+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 "Poista kaikki tämän projektit tiedostot ja työpaketit sekä lataa uusia paketteja.  Voit ensin päivittää projektin raportoidaksesi valmiit paketit."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:91
-#: clientgui/ViewProjects.cpp:208
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
+msgid ""
+"Remove this project.  Tasks in progress will be lost (use 'Update' first to "
+"report any completed tasks)."
 msgstr "Poista tämä projekti.  Laskennassa olevat paketit menetetään (käytä Päivitä-nappia ensin raportoidaksesi valmiit paketit)."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:96
 #: clientgui/sg_TaskCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:214
 msgid "Properties"
 msgstr "Tiedot"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:97
-#: clientgui/ViewProjects.cpp:215
 msgid "Show project details."
 msgstr "Näytä projektin tiedot."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:126
-#: clientgui/ViewProjects.cpp:723
 msgid "Resume tasks for this project."
 msgstr "Jatka tämän projektin suorittamista."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:133
-#: clientgui/ViewProjects.cpp:742
 msgid "Allow new tasks"
 msgstr "Salli uusi työ"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:134
-#: clientgui/ViewProjects.cpp:742
 msgid "Allow fetching new tasks for this project."
 msgstr "Salli tämän projektin ladata uusia työpaketteja."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:137
-#: clientgui/ViewProjects.cpp:746
 msgid "Don't fetch new tasks for this project."
 msgstr "Älä salli tämän projektin ladata uusia työpaketteja."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:229
-#: clientgui/ViewProjects.cpp:443
 #, c-format
 msgid "Are you sure you want to reset project '%s'?"
 msgstr "Haluatko nollata \"%s\" projektin?"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:235
-#: clientgui/ViewProjects.cpp:449
 msgid "Reset Project"
 msgstr "Nollaa projekti"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:266
-#: clientgui/ViewProjects.cpp:501
 #, c-format
 msgid "Are you sure you want to remove project '%s'?"
 msgstr "Haluatko poistaa projektin \"%s\"?"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:272
-#: clientgui/ViewProjects.cpp:507
 msgid "Remove Project"
 msgstr "Poista projekti"
 
@@ -3157,9 +3129,7 @@ msgstr "Hyllytä tämä paketti."
 msgid ""
 "Are you sure you want to abort this task '%s'?\n"
 "(Progress: %.1lf%%, Status: %s)"
-msgstr ""
-"Haluatko varmasti hylätä paketin \"%s\"?\n"
-"(Suoritettu: %.1lf%%, Tila: %s)"
+msgstr "Haluatko varmasti hylätä paketin \"%s\"?\n(Suoritettu: %.1lf%%, Tila: %s)"
 
 #: clientgui/sg_TaskCommandPopup.cpp:272
 msgid "Abort task"
@@ -3266,8 +3236,7 @@ msgstr "Laskenta hyllytetty."
 msgid "Waiting to contact project servers."
 msgstr "Odotetaan yhteydenottoa projektin palvelimeen."
 
-#: clientgui/sg_TaskPanel.cpp:1256
-#: clientgui/sg_TaskPanel.cpp:1265
+#: clientgui/sg_TaskPanel.cpp:1256 clientgui/sg_TaskPanel.cpp:1265
 msgid "Retrieving current status"
 msgstr "Haetaan nykyinen tila"
 
@@ -3304,10 +3273,7 @@ msgid ""
 "The project is temporarily unavailable.\n"
 "\n"
 "Please try again later."
-msgstr ""
-"Projekti on tilapäisesti poissa käytöstä.\n"
-"\n"
-"Yritä myöhemmin uudelleen."
+msgstr "Projekti on tilapäisesti poissa käytöstä.\n\nYritä myöhemmin uudelleen."
 
 #: clientgui/UnavailablePage.cpp:190
 msgid "Account manager temporarily unavailable"
@@ -3318,10 +3284,7 @@ msgid ""
 "The account manager is temporarily unavailable.\n"
 "\n"
 "Please try again later."
-msgstr ""
-"Tilihallitsija on tilapäisesti poissa käytöstä.\n"
-"\n"
-"Yritä myöhemmin uudelleen."
+msgstr "Tilihallitsija on tilapäisesti poissa käytöstä.\n\nYritä myöhemmin uudelleen."
 
 #: clientgui/ValidateAccountKey.cpp:68
 msgid "Please specify an account key to continue."
@@ -3331,8 +3294,7 @@ msgstr "Anna tiliavaimesi jatkaaksesi."
 msgid "Invalid Account Key; please enter a valid Account Key"
 msgstr "Virheellinen tiliavain; anna kunnollinen tiliavain"
 
-#: clientgui/ValidateAccountKey.cpp:82
-#: clientgui/ValidateEmailAddress.cpp:86
+#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
 msgid "Validation conflict"
 msgstr "Vahvistusristiriita"
 
@@ -3353,34 +3315,23 @@ msgid ""
 "Please specify a URL.\n"
 "For example:\n"
 "http://www.example.com/"
-msgstr ""
-"Anna URL-osoite.\n"
-"Esimerkiksi:\n"
-"http://www.esimerkki.fi/"
-
-#: clientgui/ValidateURL.cpp:83
-#: clientgui/ValidateURL.cpp:87
-#: clientgui/ValidateURL.cpp:91
-#: clientgui/ValidateURL.cpp:103
-#: clientgui/ValidateURL.cpp:107
-#: clientgui/ValidateURL.cpp:110
+msgstr "Anna URL-osoite.\nEsimerkiksi:\nhttp://www.esimerkki.fi/"
+
+#: 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 "Virheellinen URL-osoite"
 
-#: clientgui/ValidateURL.cpp:84
-#: clientgui/ValidateURL.cpp:88
+#: clientgui/ValidateURL.cpp:84 clientgui/ValidateURL.cpp:88
 #: clientgui/ValidateURL.cpp:92
 msgid ""
 "Please specify a valid URL.\n"
 "For example:\n"
 "http://boincproject.example.com"
-msgstr ""
-"Anna kunnollinen URL-osoite.\n"
-"Esimerkiksi:\n"
-"http://boincprojekti.esimerkki.fi"
+msgstr "Anna kunnollinen URL-osoite.\nEsimerkiksi:\nhttp://boincprojekti.esimerkki.fi"
 
-#: clientgui/ValidateURL.cpp:104
-#: clientgui/ValidateURL.cpp:108
+#: clientgui/ValidateURL.cpp:104 clientgui/ValidateURL.cpp:108
 #, c-format
 msgid "'%s' does not contain a valid host name."
 msgstr "\"%s\" ei sisällä kunnollista konenimeä."
@@ -3391,7 +3342,6 @@ msgid "'%s' does not contain a valid path."
 msgstr "\"%s\" ei sisällä kunnollista polkua."
 
 #: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:175
 msgid "Commands"
 msgstr "Komennot"
 
@@ -3403,13 +3353,11 @@ msgstr "Kopioi kaikki viestit"
 msgid "Copy selected messages"
 msgstr "Kopioi valitut viestit"
 
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
+#: clientgui/ViewMessages.cpp:106 clientgui/ViewMessages.cpp:502
 msgid "Show only this project"
 msgstr "Näytä vain tämä projekti"
 
-#: clientgui/ViewMessages.cpp:107
-#: clientgui/ViewMessages.cpp:503
+#: clientgui/ViewMessages.cpp:107 clientgui/ViewMessages.cpp:503
 msgid "Show only the messages for the selected project."
 msgstr "Näytä vain valitun projektin viestit."
 
@@ -3437,119 +3385,120 @@ msgstr "Näytä kaikki viestit"
 msgid "Show messages for all projects."
 msgstr "Näytä kaikkien projektien viestit."
 
-#: clientgui/ViewProjects.cpp:225
+#: clientgui/ViewProjects.cpp:246 clientgui/ViewStatistics.cpp:426
 msgid "Account"
 msgstr "Tili"
 
-#: clientgui/ViewProjects.cpp:227
+#: clientgui/ViewProjects.cpp:248
 msgid "Work done"
 msgstr "Pisteet"
 
-#: clientgui/ViewProjects.cpp:228
+#: clientgui/ViewProjects.cpp:249
 msgid "Avg. work done"
 msgstr "Keskim. pisteet"
 
-#: clientgui/ViewProjects.cpp:230
+#: clientgui/ViewProjects.cpp:251 clientgui/ViewTransfers.cpp:215
+#: clientgui/ViewWork.cpp:262
 msgid "Status"
 msgstr "Tila"
 
-#: clientgui/ViewProjects.cpp:255
+#: clientgui/ViewProjects.cpp:330
 msgid "Projects"
 msgstr "Projektit"
 
-#: clientgui/ViewProjects.cpp:307
+#: clientgui/ViewProjects.cpp:382
 msgid "Updating project..."
 msgstr "Päivitetään projektia..."
 
-#: clientgui/ViewProjects.cpp:349
+#: clientgui/ViewProjects.cpp:424
 msgid "Resuming project..."
 msgstr "Jatketaan projektia..."
 
-#: clientgui/ViewProjects.cpp:353
+#: clientgui/ViewProjects.cpp:428
 msgid "Suspending project..."
 msgstr "Hyllytetään projektia..."
 
-#: clientgui/ViewProjects.cpp:390
+#: clientgui/ViewProjects.cpp:465
 msgid "Telling project to allow additional task downloads..."
 msgstr "Kerrotaan projektille, että uusien pakettien lataus on sallittu..."
 
-#: clientgui/ViewProjects.cpp:394
+#: clientgui/ViewProjects.cpp:469
 msgid "Telling project to not fetch any additional tasks..."
 msgstr "Kerrotaan projektille, ettei uusia paketteja ladata..."
 
-#: clientgui/ViewProjects.cpp:430
+#: clientgui/ViewProjects.cpp:505
 msgid "Resetting project..."
 msgstr "Nollataan projektia..."
 
-#: clientgui/ViewProjects.cpp:488
+#: clientgui/ViewProjects.cpp:563
 msgid "Removing project..."
 msgstr "Poistetaan projekti..."
 
-#: clientgui/ViewProjects.cpp:548
+#: clientgui/ViewProjects.cpp:623 clientgui/ViewWork.cpp:686
 msgid "Launching browser..."
 msgstr "Käynnistetään selain..."
 
-#: clientgui/ViewProjects.cpp:1063
+#: clientgui/ViewProjects.cpp:1140
 msgid "Requested by user"
 msgstr "Käyttäjän pyytämä"
 
-#: clientgui/ViewProjects.cpp:1064
+#: clientgui/ViewProjects.cpp:1141
 msgid "To fetch work"
 msgstr "Noudetaan työtä"
 
-#: clientgui/ViewProjects.cpp:1065
+#: clientgui/ViewProjects.cpp:1142
 msgid "To report completed tasks"
 msgstr "Raportoidaan valmiit paketit"
 
-#: clientgui/ViewProjects.cpp:1066
+#: clientgui/ViewProjects.cpp:1143
 msgid "To send trickle-up message"
 msgstr "Lähetetään väliaikaviestiä"
 
-#: clientgui/ViewProjects.cpp:1067
+#: clientgui/ViewProjects.cpp:1144
 msgid "Requested by account manager"
 msgstr "Tilihallitsijan pyytämä"
 
-#: clientgui/ViewProjects.cpp:1068
+#: clientgui/ViewProjects.cpp:1145
 msgid "Project initialization"
 msgstr "Projektin alustus"
 
-#: clientgui/ViewProjects.cpp:1069
+#: clientgui/ViewProjects.cpp:1146
 msgid "Requested by project"
 msgstr "Projektin pyytämä"
 
-#: clientgui/ViewProjects.cpp:1070
+#: clientgui/ViewProjects.cpp:1147
 msgid "Unknown reason"
 msgstr "Tuntematon syy"
 
-#: clientgui/ViewProjects.cpp:1084
+#: clientgui/ViewProjects.cpp:1161
 msgid "Suspended by user"
 msgstr "Käyttäjän hyllyttämä"
 
-#: clientgui/ViewProjects.cpp:1087
+#: clientgui/ViewProjects.cpp:1164
 msgid "Won't get new tasks"
 msgstr "Älä lataa uutta työtä"
 
-#: clientgui/ViewProjects.cpp:1090
+#: clientgui/ViewProjects.cpp:1167
 msgid "Project ended - OK to remove"
 msgstr "Projekti päättynyt - voi poistaa"
 
-#: clientgui/ViewProjects.cpp:1093
+#: clientgui/ViewProjects.cpp:1170
 msgid "Will remove when tasks done"
 msgstr "Poistuu paketin valmistuttua"
 
-#: clientgui/ViewProjects.cpp:1096
+#: clientgui/ViewProjects.cpp:1173
 msgid "Scheduler request pending"
 msgstr "Odotetaan pyyntöä aikatauluttajalle"
 
-#: clientgui/ViewProjects.cpp:1102
+#: clientgui/ViewProjects.cpp:1179
 msgid "Scheduler request in progress"
 msgstr "Suoritetaan pyyntöä aikatauluttajalle"
 
-#: clientgui/ViewProjects.cpp:1105
+#: clientgui/ViewProjects.cpp:1182
 msgid "Trickle up message pending"
 msgstr "Väliaikaviesti odottaa"
 
-#: clientgui/ViewProjects.cpp:1111
+#: clientgui/ViewProjects.cpp:1188
 msgid "Communication deferred "
 msgstr "Yhteyttä lykätty "
 
@@ -3561,10 +3510,6 @@ msgstr "Levyn kokonaiskäyttö"
 msgid "Disk usage by BOINC projects"
 msgstr "BOINC-projektien levynkäyttö"
 
-#: clientgui/ViewResources.cpp:116
-msgid "Disk"
-msgstr "Levy"
-
 #: clientgui/ViewResources.cpp:225
 msgid "no projects: 0 bytes used"
 msgstr "ei projekteja: 0 tavua käytetty"
@@ -3658,13 +3603,11 @@ msgstr "&Seuraava projekti >"
 msgid "Show chart for next project"
 msgstr "Näytä seuraavan projektin taulukko"
 
-#: clientgui/ViewStatistics.cpp:2000
-#: clientgui/ViewStatistics.cpp:2390
+#: clientgui/ViewStatistics.cpp:2000 clientgui/ViewStatistics.cpp:2390
 msgid "Hide project list"
 msgstr "Piilota projektilista"
 
-#: clientgui/ViewStatistics.cpp:2001
-#: clientgui/ViewStatistics.cpp:2390
+#: clientgui/ViewStatistics.cpp:2001 clientgui/ViewStatistics.cpp:2390
 msgid "Use entire area for graphs"
 msgstr "Käytä koko alue grafiikalle"
 
@@ -3708,16 +3651,11 @@ msgstr "Näytä kaikki projektit summattuna yhdellä kaaviolla"
 msgid "Statistics"
 msgstr "Tilastot"
 
-#: clientgui/ViewStatistics.cpp:2077
-#: clientgui/ViewStatistics.cpp:2098
-#: clientgui/ViewStatistics.cpp:2119
-#: clientgui/ViewStatistics.cpp:2141
-#: clientgui/ViewStatistics.cpp:2162
-#: clientgui/ViewStatistics.cpp:2183
-#: clientgui/ViewStatistics.cpp:2204
-#: clientgui/ViewStatistics.cpp:2225
-#: clientgui/ViewStatistics.cpp:2246
-#: clientgui/ViewStatistics.cpp:2270
+#: clientgui/ViewStatistics.cpp:2077 clientgui/ViewStatistics.cpp:2098
+#: clientgui/ViewStatistics.cpp:2119 clientgui/ViewStatistics.cpp:2141
+#: clientgui/ViewStatistics.cpp:2162 clientgui/ViewStatistics.cpp:2183
+#: clientgui/ViewStatistics.cpp:2204 clientgui/ViewStatistics.cpp:2225
+#: clientgui/ViewStatistics.cpp:2246 clientgui/ViewStatistics.cpp:2270
 msgid "Updating charts..."
 msgstr "Päivitetään taulukkoja..."
 
@@ -3729,200 +3667,185 @@ msgstr "Näytä projektilistaus"
 msgid "Uses smaller area for graphs"
 msgstr "Käyttää pienempää aluetta grafiikalle"
 
-#: clientgui/ViewTransfers.cpp:169
+#: clientgui/ViewTransfers.cpp:187
 msgid "Retry Now"
 msgstr "Yritä uudelleen"
 
-#: clientgui/ViewTransfers.cpp:170
+#: clientgui/ViewTransfers.cpp:188
 msgid "Retry the file transfer now"
 msgstr "Yritä tiedostonsiirtoa nyt"
 
-#: clientgui/ViewTransfers.cpp:176
+#: clientgui/ViewTransfers.cpp:194
 msgid "Abort Transfer"
 msgstr "Keskeytä siirto"
 
-#: clientgui/ViewTransfers.cpp:177
+#: clientgui/ViewTransfers.cpp:195
 msgid "Abort this file transfer.  You won't get credit for the task."
 msgstr "Keskeytä tämä tiedostosiirto.  Et saa paketista pisteitä."
 
-#: clientgui/ViewTransfers.cpp:188
+#: clientgui/ViewTransfers.cpp:210
 msgid "File"
 msgstr "Tiedosto"
 
-#: clientgui/ViewTransfers.cpp:189
-#: clientgui/ViewWork.cpp:238
+#: clientgui/ViewTransfers.cpp:211 clientgui/ViewWork.cpp:261
 msgid "Progress"
 msgstr "Edistyminen"
 
-#: clientgui/ViewTransfers.cpp:190
+#: clientgui/ViewTransfers.cpp:212
 msgid "Size"
 msgstr "Koko"
 
-#: clientgui/ViewTransfers.cpp:191
-msgid "Elapsed Time"
-msgstr "Kulunut aika"
+#: clientgui/ViewTransfers.cpp:213 clientgui/ViewWork.cpp:263
+msgid "Elapsed"
+msgstr "Kulunut"
 
-#: clientgui/ViewTransfers.cpp:192
+#: clientgui/ViewTransfers.cpp:214
 msgid "Speed"
 msgstr "Nopeus"
 
-#: clientgui/ViewTransfers.cpp:218
+#: clientgui/ViewTransfers.cpp:295
 msgid "Transfers"
 msgstr "Siirrot"
 
-#: clientgui/ViewTransfers.cpp:285
+#: clientgui/ViewTransfers.cpp:362
 msgid "Network activity is suspended - "
 msgstr "Verkon toiminta hyllytetty - "
 
-#: clientgui/ViewTransfers.cpp:287
+#: clientgui/ViewTransfers.cpp:364
 msgid ""
 ".\n"
 "You can enable it using the Activity menu."
-msgstr ""
-".\n"
-"Voit sallia sen Toiminta-valikosta."
+msgstr ".\nVoit sallia sen Toiminta-valikosta."
 
-#: clientgui/ViewTransfers.cpp:290
+#: clientgui/ViewTransfers.cpp:367
 msgid "BOINC"
 msgstr "BOINC"
 
-#: clientgui/ViewTransfers.cpp:297
+#: clientgui/ViewTransfers.cpp:374
 msgid "Retrying transfer now..."
 msgstr "Yritetään nyt siirtoa..."
 
-#: clientgui/ViewTransfers.cpp:335
+#: clientgui/ViewTransfers.cpp:412
 msgid "Aborting transfer..."
 msgstr "Keskeytetään siirtoa..."
 
-#: clientgui/ViewTransfers.cpp:348
+#: 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 ""
-"Haluatko keskeyttää tämän tiedoston siirron: \"%s\"?\n"
-"HUOMAA: Siirron keskeyttäminen ei vahvista pakettia\n"
-"etkä siis saa siitä pisteitä."
+msgstr "Haluatko keskeyttää tämän tiedoston siirron: \"%s\"?\nHUOMAA: Siirron keskeyttäminen ei vahvista pakettia\netkä siis saa siitä pisteitä."
 
-#: clientgui/ViewTransfers.cpp:354
+#: clientgui/ViewTransfers.cpp:431
 msgid "Abort File Transfer"
 msgstr "Keskeytä tiedoston siirto"
 
-#: clientgui/ViewTransfers.cpp:785
+#: clientgui/ViewTransfers.cpp:864
 msgid "Upload"
 msgstr "Lähetys"
 
-#: clientgui/ViewTransfers.cpp:785
+#: clientgui/ViewTransfers.cpp:864
 msgid "Download"
 msgstr "Lataus"
 
-#: clientgui/ViewTransfers.cpp:789
+#: clientgui/ViewTransfers.cpp:868
 msgid "retry in "
 msgstr "uudelleenyritys "
 
-#: clientgui/ViewTransfers.cpp:791
+#: clientgui/ViewTransfers.cpp:870
 msgid "failed"
 msgstr "epäonnistui"
 
-#: clientgui/ViewTransfers.cpp:794
+#: clientgui/ViewTransfers.cpp:873
 msgid "suspended"
 msgstr "hyllytetty"
 
-#: clientgui/ViewTransfers.cpp:799
+#: clientgui/ViewTransfers.cpp:878
 msgid "active"
 msgstr "aktiivinen"
 
-#: clientgui/ViewTransfers.cpp:801
+#: clientgui/ViewTransfers.cpp:880
 msgid "pending"
 msgstr "odottaa"
 
-#: clientgui/ViewTransfers.cpp:808
+#: clientgui/ViewTransfers.cpp:887
 msgid " (project backoff: "
 msgstr " (projektin viivyttämä: "
 
-#: clientgui/ViewWork.cpp:192
-#: clientgui/ViewWork.cpp:782
+#: clientgui/ViewWork.cpp:211 clientgui/ViewWork.cpp:864
 msgid "Show active tasks"
 msgstr "Näytä suoritettavat paketit"
 
-#: clientgui/ViewWork.cpp:193
-#: clientgui/ViewWork.cpp:783
+#: clientgui/ViewWork.cpp:212 clientgui/ViewWork.cpp:865
 msgid "Show only active tasks."
 msgstr "Näytä vain suorituksessa olevat paketit."
 
-#: clientgui/ViewWork.cpp:206
+#: clientgui/ViewWork.cpp:225
 msgid "Show VM Console"
 msgstr "Näytä VM Console"
 
-#: clientgui/ViewWork.cpp:207
+#: clientgui/ViewWork.cpp:226
 msgid "Show VM Console in a window."
 msgstr "Näytä VM Console ikkunassa."
 
-#: clientgui/ViewWork.cpp:214
+#: clientgui/ViewWork.cpp:233
 msgid "Suspend work for this result."
 msgstr "Hyllytä tämä paketti."
 
-#: clientgui/ViewWork.cpp:221
+#: clientgui/ViewWork.cpp:240
 msgid "Abandon work on the result. You will get no credit for it."
 msgstr "Hylkää työpaketti. Et saa siitä pisteitä."
 
-#: clientgui/ViewWork.cpp:240
-msgid "Elapsed"
-msgstr "Kulunut"
-
-#: clientgui/ViewWork.cpp:241
+#: clientgui/ViewWork.cpp:264
 msgid "Remaining (estimated)"
 msgstr "Jäljellä (arvio)"
 
-#: clientgui/ViewWork.cpp:242
+#: clientgui/ViewWork.cpp:265
 msgid "Deadline"
 msgstr "Takaraja"
 
-#: clientgui/ViewWork.cpp:269
+#: clientgui/ViewWork.cpp:351
 msgid "Tasks"
 msgstr "Paketit"
 
-#: clientgui/ViewWork.cpp:362
+#: clientgui/ViewWork.cpp:444
 msgid "Resuming task..."
 msgstr "Jatketaan pakettia..."
 
-#: clientgui/ViewWork.cpp:365
+#: clientgui/ViewWork.cpp:447
 msgid "Suspending task..."
 msgstr "Hyllytetään pakettia..."
 
-#: clientgui/ViewWork.cpp:394
+#: clientgui/ViewWork.cpp:476
 msgid "Showing graphics for task..."
 msgstr "Näytetään paketin grafiikat..."
 
-#: clientgui/ViewWork.cpp:431
+#: clientgui/ViewWork.cpp:513
 msgid "Showing VM console for task..."
 msgstr "Näytetään VM konsoli tehtävälle..."
 
-#: clientgui/ViewWork.cpp:484
+#: clientgui/ViewWork.cpp:566
 #, c-format
 msgid ""
 "Are you sure you want to abort this task '%s'?\n"
 "(Progress: %s, Status: %s)"
-msgstr ""
-"Haluatko varmasti hylätä paketin \"%s\"?\n"
-"(Suoritettu: %s, Tila: %s)"
+msgstr "Haluatko varmasti hylätä paketin \"%s\"?\n(Suoritettu: %s, Tila: %s)"
 
-#: clientgui/ViewWork.cpp:490
+#: clientgui/ViewWork.cpp:572
 #, c-format
 msgid "Are you sure you want to abort these %d tasks?"
 msgstr "Haluatko varmasti hylätä nämä %d paketit?"
 
-# 75%
-#: clientgui/ViewWork.cpp:504
+#: clientgui/ViewWork.cpp:586
 msgid "Aborting task..."
 msgstr "Hylätään pakettia..."
 
-#: clientgui/ViewWork.cpp:776
+#: clientgui/ViewWork.cpp:858
 msgid "Show all tasks"
 msgstr "Näytä kaikki paketit"
 
-#: clientgui/ViewWork.cpp:777
+#: clientgui/ViewWork.cpp:859
 msgid "Show all tasks."
 msgstr "Näytä kaikki paketit."
 
@@ -3942,12 +3865,7 @@ msgid ""
 "\n"
 "Projects added via this wizard will not be\n"
 "listed on or managed via %s."
-msgstr ""
-"Mikäli mahdollista, lisää projekteja\n"
-"%s -nettisivun kautta.\n"
-"\n"
-"Projektit, jotka lisätään tämän avustajan kautta,\n"
-"eivät listaudu eikä niitä hallinoida %s kautta."
+msgstr "Mikäli mahdollista, lisää projekteja\n%s -nettisivun kautta.\n\nProjektit, jotka lisätään tämän avustajan kautta,\neivät listaudu eikä niitä hallinoida %s kautta."
 
 #: clientgui/WelcomePage.cpp:313
 msgid ""
@@ -3956,12 +3874,7 @@ msgid ""
 "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 ""
-"Yli 30 BOINC-pohjaista projektia suorittaa\n"
-"tutkimusta monilla tieteen aloilla ja\n"
-"voit osallistua niin moneen kuin haluat.\n"
-"Voit lisätä projektin suoraan\n"
-"tai käyttää Tilihallitsijan nettisivua projektien valintaan."
+msgstr "Yli 30 BOINC-pohjaista projektia suorittaa\ntutkimusta monilla tieteen aloilla ja\nvoit osallistua niin moneen kuin haluat.\nVoit lisätä projektin suoraan\ntai käyttää Tilihallitsijan nettisivua projektien valintaan."
 
 #: clientgui/WelcomePage.cpp:325
 msgid ""
@@ -3976,18 +3889,7 @@ msgid ""
 "this to choose which projects to support.\n"
 "\n"
 "Please choose which type of change you would like to make:\n"
-msgstr ""
-"Olet päättänyt lisätä uuden projektin tai muuttaa projekteja\n"
-"joihin osallistut.\n"
-"\n"
-"Osa projekteista on World Community Gridin ylläpitämiä ja osa\n"
-"on muiden tutkijoiden tai organisaatioiden hoitamia. BOINC-ohjelma\n"
-"voi jakaa koneesi laskentatehon eri projekteille.\n"
-"\n"
-"Jos olet rekisteröitynyt BOINC tilihallitsijalla, voit käyttää sitä\n"
-"valitaksesi haluamasi projektit.\n"
-"\n"
-"Minkälaisen muutoksen haluat tehdä:\n"
+msgstr "Olet päättänyt lisätä uuden projektin tai muuttaa projekteja\njoihin osallistut.\n\nOsa projekteista on World Community Gridin ylläpitämiä ja osa\non muiden tutkijoiden tai organisaatioiden hoitamia. BOINC-ohjelma\nvoi jakaa koneesi laskentatehon eri projekteille.\n\nJos olet rekisteröitynyt BOINC tilihallitsijalla, voit käyttää sitä\nvalitaksesi haluamasi projektit.\n\nMinkälaisen muutoksen haluat tehdä:\n"
 
 #: clientgui/WelcomePage.cpp:339
 msgid "Use a BOINC Account Manager"
@@ -4001,16 +3903,15 @@ msgstr "Lisää tai muuta World Community Grid -projektejasi"
 msgid "Add projects run by other researchers or organizations"
 msgstr "Lisää muiden tutkijoiden tai organisaatioiden projekteja"
 
-#: clientgui/WizardAttach.cpp:673
+#: clientgui/WizardAttach.cpp:560
 msgid "Do you really want to cancel?"
 msgstr "Haluatko todella peruuttaa?"
 
-#: clientgui/WizardAttach.cpp:674
+#: clientgui/WizardAttach.cpp:561
 msgid "Question"
 msgstr "Kysymys"
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
+#: clientgui/wizardex.cpp:377 clientgui/wizardex.cpp:553
 msgid "&Next >"
 msgstr "&Seuraava>"
 
@@ -4024,7 +3925,7 @@ msgstr "&Valmis"
 
 #: clientgui/common/wxPieCtrl.cpp:64
 msgid "Pie Ctrl"
-msgstr "Ympyräkaavion hallinta"
+msgstr "Kakunhallinta"
 
 #: clientgui/mac/Mac_GUI.cpp:35
 msgid "Services"
@@ -4048,477 +3949,10 @@ msgstr "Näytä kaikki"
 msgid "Quit %s"
 msgstr "Sulje %s"
 
-#: clientgui/DlgAdvPreferences.h:30
-msgid "specify work start and stop hours in format HH:MM-HH:MM"
-msgstr "anna laskennan alkamis- ja päättymistunti muodossa HH:MM-HH:MM"
-
-#: clientgui/DlgAdvPreferences.h:31
-msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
-msgstr "anna verkkoyhteyden käytön alkamis- ja päättymistunti muodossa HH:MM-HH:MM"
-
-# 98%
-#~ msgid ""
-#~ "(C) 2003-2013 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2013 Kalifornian yliopisto, Berkeley.\n"
-#~ "Kaikki oikeudet pidätetään."
-#, c-format
-#~ msgid "%s - Preferences"
-#~ msgstr "%s - Asetukset"
-
-#, no-c-format
-#~ msgid "% of the processors (0 means ignore this setting)"
-#~ msgstr "% prosessoreista (0 tarkoittaa jätä huomiotta)"
-
-#, no-c-format
-#~ msgid "% CPU time"
-#~ msgstr "% prosessoriajasta"
-#~ msgid "KBytes/sec."
-#~ msgstr "Ktavua/sek."
-#~ msgid "Mbytes"
-#~ msgstr "Megatavua"
-#~ msgid "every"
-#~ msgstr "joka"
-#~ msgid "days"
-#~ msgstr "vrk"
-#~ msgid "Gigabytes disk space"
-#~ msgstr "Gigatavua levytilaa"
-#~ msgid "Running, high priority"
-#~ msgstr "Suoritetaan, korkea prioriteetti"
-#~ msgid " (Scheduler wait: "
-#~ msgstr " (Odottaa ajoittamista: "
-#~ msgid " (Scheduler wait)"
-#~ msgstr " (Odottaa ajoittamista)"
-#~ msgid " (Waiting for network access)"
-#~ msgstr " (Odottaa pääsyä verkkoon)"
-#~ msgid "Preferences…"
-#~ msgstr "Asetukset…"
-#~ msgid "I do not agree with the terms of use."
-#~ msgstr "En hyväksy käyttöehtoja."
-#~ msgid "Click Clear to restore web-based settings."
-#~ msgstr "Napsauta Tyhjennä palauttaaksesi web-pohjaiset asetukset."
-#~ msgid "For additional settings, select Computing Preferences in "
-#~ msgstr "Lisää asetuksia kohdassa Laskenta-asetukset "
-#~ msgid "the Advanced View."
-#~ msgstr "laajennetussa näkymässä."
-#~ msgid "Workunit name"
-#~ msgstr "Työpaketin nimi"
-#~ msgid "invalid float"
-#~ msgstr "virheellinen liukuluku"
-#~ msgid "Display the advanced (accessible) graphical interface."
-#~ msgstr "Näytä laajennettu graafinen käyttöliittymä."
-#~ msgid "Paused: Other work running"
-#~ msgstr "Tauotettu: Toinen työ käynnissä"
-#~ msgid "Paused: User initiated.  Click 'Resume' to continue"
-#~ msgstr "Tauotettu: Käyttäjän toimesta.  Napsauta \"Jatka\""
-#~ msgid "Paused: User active"
-#~ msgstr "Tauotettu: Käyttäjä aktiivinen"
-#~ msgid "Paused: Computer on battery"
-#~ msgstr "Tauotettu: Tietokone on akkukäytöllä"
-#~ msgid "Paused: Time of Day"
-#~ msgstr "Tauotettu: Aika päivästä"
-#~ msgid "Paused: Benchmarks running"
-#~ msgstr "Tauotettu: Suorituskykytestit käynnissä"
-#~ msgid "Paused"
-#~ msgstr "Tauotettu"
-#~ msgid "Paused: Application start delayed"
-#~ msgstr "Tauotettu: Sovelluksen käynnistystä lykätty"
-#~ msgid "Click to show project graphics"
-#~ msgstr "Napsauta nähdäksesi projektin grafiikan"
-#~ msgid "Open a window to view messages"
-#~ msgstr "Avaa ikkuna katsoaksesi viestejä"
-#~ msgid "Stop all activity"
-#~ msgstr "Pysäytä kaikki toiminta"
-#~ msgid "Resume activity"
-#~ msgstr "Jatka toimintaa"
-#~ msgid "Open a window to set your preferences"
-#~ msgstr "Avaa ikkuna asetuksien muuttamiseksi"
-#~ msgid "Switch to the BOINC advanced view"
-#~ msgstr "Vaihda BOINCin laajennettuun näkymään"
-#~ msgid "My Projects:"
-#~ msgstr "Projektini:"
-
-#, c-format
-#~ msgid "%s. Work done by %s: %0.2f"
-#~ msgstr "%s. %s:n tekemä työ: %0.2f"
-
-#, c-format
-#~ msgid "%.1lf"
-#~ msgstr "%.1lf"
-
-#, c-format
-#~ msgid "%d hr %d min %d sec"
-#~ msgstr "%d t %d min %d sek"
-#~ msgid "Are you sure you want to display graphics on a remote machine?"
-#~ msgstr "Haluatko näyttää etäkoneen grafiikat?"
-#~ msgid "Application: "
-#~ msgstr "Sovellus: "
-#~ msgid "Time Remaining: "
-#~ msgstr "Aikaa jäljellä: "
-#~ msgid "Elapsed Time: "
-#~ msgstr "Kulunut aika: "
-#~ msgid "Account manager website"
-#~ msgstr "Tilihallitsijan nettisivu"
-#~ msgid "Account Manager &URL:"
-#~ msgstr "Tilihallitsijan &URL:"
-
-#, c-format
-#~ msgid "%s &website"
-#~ msgstr "%s &nettisivu"
-#~ msgid "Notice List"
-#~ msgstr "Ilmoituslista"
-
-#, c-format
-#~ msgid "%s; received on %s"
-#~ msgstr "%s; vastaanotettu %s"
-
-#, c-format
-#~ msgid "%s; received from %s; on %s"
-#~ msgstr "%s; vastaanotettu %s; aika %s"
-#~ msgid "Click"
-#~ msgstr "Napsauta"
-#~ msgid "Project List"
-#~ msgstr "Projektiluettelo"
-#~ msgid "Nvidia GPU Supported"
-#~ msgstr "Tukee Nvidian näytönohjainta"
-#~ msgid "ATI GPU Supported"
-#~ msgstr "Tukee ATIn näytönohjainta"
-#~ msgid "Project Website"
-#~ msgstr "Projektin nettisivu"
-#~ msgid "One or more items failed to load from the Internet."
-#~ msgstr "Yhden tai useamman tiedon lataus internetistä epäonnistui."
-
-# 88%
-#~ msgid "Retry now"
-#~ msgstr "Yritä uudelleen nyt"
-#~ msgid "10%"
-#~ msgstr "10 %"
-#~ msgid "20%"
-#~ msgstr "20 %"
-#~ msgid "30%"
-#~ msgstr "30 %"
-#~ msgid "40%"
-#~ msgstr "40 %"
-#~ msgid "50%"
-#~ msgstr "50 %"
-#~ msgid "60%"
-#~ msgstr "60 %"
-#~ msgid "70%"
-#~ msgstr "70 %"
-#~ msgid "80%"
-#~ msgstr "80 %"
-#~ msgid "90%"
-#~ msgstr "90 %"
-#~ msgid "100%"
-#~ msgstr "100 %"
-#~ msgid "1"
-#~ msgstr "1"
-#~ msgid "3"
-#~ msgstr "3"
-#~ msgid "5"
-#~ msgstr "5"
-#~ msgid "10"
-#~ msgstr "10"
-#~ msgid "15"
-#~ msgstr "15"
-#~ msgid "30"
-#~ msgstr "30"
-#~ msgid "60"
-#~ msgstr "60"
-#, c-format
-#~ msgid "Pop up a menu of websites for project %s"
-#~ msgstr "Ponnahdusvalikko projektin %s nettisivuista"
-#~ msgid ""
-#~ "for accessibility support, please select advanced from the view menu or type "
-#~ "command shift a"
-#~ msgstr ""
-#~ "paremman tuen saamiseksi valitse laajennettu näkymä näytä-valikosta tai "
-#~ "käytä näppäinyhdistelmää command shift a"
-#~ msgid "This panel contains graphs showing user totals for projects"
-#~ msgstr "Tässä paneelissa näkyvät käyttäjän kokonaispisteet projektille"
-#~ msgid "list headers"
-#~ msgstr "listan otsikkotiedot"
-#~ msgid "list of events"
-#~ msgstr "tapahtumien lista"
-#~ msgid "list of events is empty"
-#~ msgstr "tapahtumien lista on tyhjä"
-
-#, c-format
-#~ msgid "list of %s"
-#~ msgstr "%s-lista"
-
-#, c-format
-#~ msgid "list of %s is empty"
-#~ msgstr "%s-lista on tyhjä"
-
-#, c-format
-#~ msgid "; current sort column %d of %d; descending order; "
-#~ msgstr "; nykyinen lajittelusarake %d %d:sta; laskeva järjestys; "
-
-#, c-format
-#~ msgid "; current sort column %d of %d; ascending order; "
-#~ msgstr "; nykyinen lajittelusarake %d %d:sta; nouseva järjestys; "
-
-#, c-format
-#~ msgid "; column %d of %d; "
-#~ msgstr "; sarake %d %d:sta; "
-#~ msgid "list is empty"
-#~ msgstr "lista on tyhjä"
-
-#, c-format
-#~ msgid "; row %d; "
-#~ msgstr "; rivi %d; "
-
-#, c-format
-#~ msgid "; selected row %d of %d; "
-#~ msgstr "; valittu rivi %d %d:sta; "
-
-#, c-format
-#~ msgid "; selected row %d ; "
-#~ msgstr "; valittu rivi %d; "
-
-#, c-format
-#~ msgid "; row %d of %d; "
-#~ msgstr "; rivi %d %d:sta; "
-#~ msgid "blank"
-#~ msgstr "tyhjä"
-#~ msgid "list of projects or account managers"
-#~ msgstr "luettelo projekteista tai tilihallitsijoista"
-
-#, c-format
-#~ msgid "selected row %d of %d; "
-#~ msgstr "valittu rivi %d %d:sta; "
-
-#, c-format
-#~ msgid "row %d of %d; "
-#~ msgstr "rivi %d %d:sta; "
-#~ msgid "The minimum username length for this project is 1. Please enter a different username."
-#~ msgstr ""
-#~ "Käyttäjänimen minimipituus tässä projektissa on 1. Anna toinen käyttäjänimi."
-#~ msgid "The minimum username length for this account manager is 1. Please enter a different username."
-#~ msgstr ""
-#~ "Käyttäjänimen minimipituus tässä tilihallitsijassa on 1. Anna toinen "
-#~ "käyttäjänimi."
-#~ msgid "The minimum email address length for this project is 1. Please enter a different email address."
-#~ msgstr ""
-#~ "Sähköpostiosoitteen minimipituus tässä projektissa on 1. Anna toinen "
-#~ "sähköpostiosoite."
-#~ msgid "The minimum email address length for this account manager is 1. Please enter a different email address."
-#~ msgstr ""
-#~ "Sähköpostiosoitteen minimipituus tässä tilihallitsijassa on 1. Anna toinen "
-#~ "sähköpostiosoite."
-
-#, c-format
-#~ msgid "The minimum password length for this project is %d. Please enter a different password."
-#~ msgstr ""
-#~ "Salasanan vähimmäispituus tässä projektissa on %d. Anna toinen salasana."
-
-#, c-format
-#~ msgid "The minimum password length for this account manager is %d. Please enter a different password."
-#~ msgstr ""
-#~ "Salasanan vähimmäispituus tässä tilihallitsijassa on %d. Anna toinen "
-#~ "salasana."
-#~ msgid ""
-#~ "An error has occurred;\n"
-#~ "check the Event Log for details.\n"
-#~ "\n"
-#~ "Click Finish to close."
-#~ msgstr ""
-#~ "Tapahtui virhe;\n"
-#~ "katso Tapahtumalokista lisätietoja.\n"
-#~ "\n"
-#~ "Napsauta Lopeta."
-
-#, no-c-format
-#~ msgid "% of the processors"
-#~ msgstr "% prosessoreista"
-
-#, c-format
-#~ msgid "New page inserted. Index = %i"
-#~ msgstr "Uusi sivu lisätty. Index = %i"
-
-#, c-format
-#~ msgid "New page appended. Index = %i"
-#~ msgstr "Uusi sivu liitetty. Index = %i"
-
-#, c-format
-#~ msgid "Old Page Index = %i"
-#~ msgstr "Old Page Index = %i"
-
-#, c-format
-#~ msgid "OnDropTarget: index by HitTest = %i"
-#~ msgstr "OnDropTarget: index by HitTest = %i"
-#~ msgid "Identify your account "
-#~ msgstr "Yksilöi tilisi "
-#~ msgid "Read config file"
-#~ msgstr "Lue asetustiedosto"
-#~ msgid "Read configuration info from cc_config.xml"
-#~ msgstr "Lue asetustiedot cc_config.xml -tiedostosta"
-#~ msgid ""
-#~ "(C) 2003-2011 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2011 Kalifornian yliopisto, Berkeley.\n"
-#~ "Kaikki oikeudet pidätetään."
-#~ msgid "NVIDIA GPU"
-#~ msgstr "NVIDIA GPU"
-#~ msgid "ATI GPU"
-#~ msgstr "ATI GPU"
-#~ msgid "Multicore CPU Supported"
-#~ msgstr "Tukee moniydinprosessoreita"
-#~ msgid "%s: %.0f"
-#~ msgstr "%s: %.0f"
-#~ msgid "Click 'Retry now' to transfer the file now"
-#~ msgstr "Napsauta \"Yritä uudelleen\" siirtääksesi tiedoston heti"
-#~ msgid ""
-#~ "Click 'Abort transfer' to delete the file from the transfer queue. This "
-#~ "will prevent you from being granted credit for this result."
-#~ msgstr ""
-#~ "Napsauta \"Keskeytä siirto\" poistaaksesi tiedoston jonosta. Et saa siitä "
-#~ "pisteitä."
-#~ msgid "Aborting result..."
-#~ msgstr "Hylätään pakettia..."
-#~ msgid ""
-#~ "You have chosen to add a new BOINC project.  Adding a new\n"
-#~ "project means that you will be connecting your computer to a new "
-#~ "organization.\n"
-#~ "If this is what you wanted to do, please click on\n"
-#~ "the 'Next' button below.\n"
-#~ "\n"
-#~ "Some projects like World Community Grid run multiple research "
-#~ "applications.\n"
-#~ "If you want to change which research applications are sent to your "
-#~ "computer\n"
-#~ "to run, visit the project's website and modify your\n"
-#~ "preferences there.\n"
-#~ "\n"
-#~ "To change which research applications are sent to you from\n"
-#~ "World Community Grid then please click on the following button:"
-#~ msgstr ""
-#~ "Olet päättänyt lisätä uuden BOINC-projektin.  Uuden projektin lisääminen\n"
-#~ "tarkoittaa, että tietokoneesi on yhteydessä uuteen organisaatioon.\n"
-#~ "Jos tämä oli tarkoituksesi, napsauta\n"
-#~ "allaolevaa \"Seuraava\" nappia.\n"
-#~ "\n"
-#~ "Jotkin projektit, kuten World Community Grid, käyttävät useita "
-#~ "sovelluksia.\n"
-#~ "Jos haluat vaihtaa koneellesi lähetettäviä sovelluksia,\n"
-#~ "käy projektin nettisivuilla ja muokkaa\n"
-#~ "asetuksia.\n"
-#~ "\n"
-#~ "Vaihtaaksesi niitä sovelluksia, joita koneellesi lähetetään\n"
-#~ "World Community Gridistä, napsauta seuraavaa nappia:"
-#~ msgid "Change Research Applications at World Community Grid"
-#~ msgstr "Vaihda World Community Grid -sovelluksia"
-#~ msgid "Don't fetch NVIDIA GPU tasks"
-#~ msgstr "Älä lataa NVIDIAn GPU-paketteja"
-#~ msgid "NVIDIA GPU work fetch deferred for"
-#~ msgstr "NVIDIAn GPU-pakettien latausta lykätty"
-#~ msgid "NVIDIA GPU work fetch deferral interval"
-#~ msgstr "NVIDIAn GPU-pakettien latauksen lykkäysaikaväli"
-#~ msgid "Don't fetch ATI GPU tasks"
-#~ msgstr "Älä lataa ATIn GPU-paketteja"
-#~ msgid "ATI GPU work fetch deferred for"
-#~ msgstr "ATIn GPU-pakettien latausta lykätty"
-#~ msgid "ATI GPU work fetch deferral interval"
-#~ msgstr "ATIn GPU-pakettien latauksen lykkäysaikaväli"
-#~ msgid "Remaining"
-#~ msgstr "Jäljellä"
-#~ msgid "Web sites"
-#~ msgstr "Nettisivut"
-#~ msgid "Connect about every"
-#~ msgstr "Ota yhteys"
-#~ msgid ""
-#~ "this computer is connected to the Internet about every X days\n"
-#~ "(0 if it's always connected)"
-#~ msgstr ""
-#~ "tämä kone on yhteydessä internetiin X päivän välein\n"
-#~ "(0 jos yhteys on aina)"
-#~ msgid "days (max. 10)"
-#~ msgstr "päivää (enint. 10)"
-#~ msgid "%d.%d%%"
-#~ msgstr "%d.%d%%"
-#~ msgid "Display and network &options..."
-#~ msgstr "Näytön ja verkon &asetukset..."
-#~ msgid ""
-#~ "You have requested to exit the %s,\n"
-#~ "which allows you to view and manage\n"
-#~ "the science applications running on your computer.\n"
-#~ "\n"
-#~ "If you also want to stop running the science applications when you\n"
-#~ "exit the Manager, then choose from the following options:"
-#~ msgstr ""
-#~ "Haluat lopettaa %s:n,\n"
-#~ "jolla voit katsoa ja hallinnoida\n"
-#~ "sovellusten suorittamista koneellasi.\n"
-#~ "\n"
-#~ "Jos haluat lopettaa myös sovellusten suorittamisen\n"
-#~ "lopettaessasi Managerin, niin valitse seuraavista:"
-#~ msgid "Stop running science applications when exiting the Manager"
-#~ msgstr "Lopeta sovellusten suorittaminen lopettaessasi Managerin"
-#~ msgid "CPU work fetch priority"
-#~ msgstr "CPU-pakettien latausprioriteetti"
-#~ msgid "NVIDIA GPU scheduling priority"
-#~ msgstr "NVIDIA GPU aikataulutusprioriteetti"
-#~ msgid "NVIDIA GPU work fetch priority"
-#~ msgstr "NVIDIAn GPU-pakettien latausprioriteetti"
-#~ msgid "ATI GPU scheduling priority"
-#~ msgstr "ATI GPU aikataulutusprioriteetti"
-#~ msgid "ATI GPU work fetch priority"
-#~ msgstr "ATIn GPU-pakettien latausprioriteetti"
-#~ msgid "Estimated app speed"
-#~ msgstr "Arvioitu sovellusnopeus"
-#~ msgid "Estimated task size"
-#~ msgstr "Arvioitu työpaketin koko"
-#~ msgid "Max RAM usage"
-#~ msgstr "Suurin keskusmuistin käyttö"
-#~ msgid "%s - Options"
-#~ msgstr "%s - Valinnat"
-#~ msgid "Retrieving host information; please wait..."
-#~ msgstr "Noudetaan konetiedot, odota..."
-#~ msgid " (waiting for GPU memory)"
-#~ msgstr " (odottaa näytönohjaimen muistia)"
-#~ msgid "Manager Settings..."
-#~ msgstr "Managerin asetukset..."
-#~ msgid "Pause"
-#~ msgstr "Tauko"
-#~ msgid "%s - Messages"
-#~ msgstr "%s - Viestit"
-#~ msgid "Skin:"
-#~ msgstr "Ulkoasu:"
-#~ msgid "Preferences"
-#~ msgstr "Asetukset"
-#~ msgid "I want to customize my preferences for this computer only."
-#~ msgstr "Haluan muokata vain tämän tietokoneen asetuksia."
-#~ msgid "Customized Preferences"
-#~ msgstr "Mukautetut asetukset"
-#~ msgid "My total work done this Project"
-#~ msgstr "Tälle projektille tekemäni kokonaistyö"
-#~ msgid "My Tasks:"
-#~ msgstr "Pakettini:"
-#~ msgid "From Project:"
-#~ msgstr "Projektilta:"
-#~ msgid "Elapsed Time: %s"
-#~ msgstr "Kulunut aika: %s"
-#~ msgid "Time Remaining: %s"
-#~ msgstr "Aikaa jäljellä: %s"
-#~ msgid "Upload suspended - "
-#~ msgstr "Lähetys hyllytetty - "
-#~ msgid "Download suspended - "
-#~ msgstr "Lataus hyllytetty - "
-#~ msgid "Upload pending"
-#~ msgstr "Odottaa lähettämistä"
-#~ msgid "Download pending"
-#~ msgstr "Odottaa lataamista"
-#~ msgid "New Simple View..."
-#~ msgstr "Uusi yksinkertainen näkymä..."
-#~ msgid "Display the new simple graphical interface."
-#~ msgstr "Näytä uusi yksinkertainen graafinen käyttöliittymä."
-#~ msgid "Old Simple View..."
-#~ msgstr "Vanha yksinkertainen näkymä..."
-#~ msgid "Display the old simple graphical interface."
-#~ msgstr "Näytä vanha yksinkertainen graafinen käyttöliittymä."
-#~ msgid "Get help with BOINC"
-#~ msgstr "Hae apua BOINCiin"
+#: clientgui/DlgAdvPreferencesBase.h:45
+msgid "On this day of the week, compute only during these hours."
+msgstr "Tänä viikon päivänä, laske vain näinä tunteina."
 
+#: clientgui/DlgAdvPreferencesBase.h:46
+msgid "On this day of the week, transfer files only during these hours."
+msgstr "Tänä viikon päivänä, siirrä tiedostoja vain näinä tunteina."
diff --git a/locale/fi/BOINC-Setup.mo b/locale/fi/BOINC-Setup.mo
index b8b5ccc..b6d10d6 100644
Binary files a/locale/fi/BOINC-Setup.mo and b/locale/fi/BOINC-Setup.mo differ
diff --git a/locale/fi/BOINC-Setup.po b/locale/fi/BOINC-Setup.po
old mode 100755
new mode 100644
index 963a034..b7dc544
--- a/locale/fi/BOINC-Setup.po
+++ b/locale/fi/BOINC-Setup.po
@@ -1,40 +1,33 @@
 # 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:
+# Vesa Nilakari, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\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-10 21:35-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: fi\n"
+"PO-Revision-Date: 2015-03-05 05:13+0000\n"
+"Last-Translator: Vesa Nilakari\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/boinc/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-Basepath: /Volumes/Cheer/BOINC_GIT/boinc_trunk\n"
-"X-POOTLE-MTIME: 1391169782.0\n"
-"X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: mac_installer\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: Installer.cpp:124
 #, c-format
 msgid "Sorry, this version of %s requires system 10.5 or higher."
 msgstr "Tämä %s -versio vaatii järjestelmän 10.5 tai uudemman."
 
-#: PostInstall.cpp:130
-#: PostInstall.cpp:1136
-#: uninstall.cpp:1618
+#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
 msgid "Yes"
 msgstr "Kyllä"
 
-#: PostInstall.cpp:131
-#: PostInstall.cpp:1137
-#: uninstall.cpp:1619
+#: PostInstall.cpp:131 PostInstall.cpp:1137 uninstall.cpp:1619
 msgid "No"
 msgstr "Ei"
 
@@ -48,10 +41,7 @@ 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 ""
-"Käyttäjät, joilla on ylläpito-oikeudet, saavat automaattisesti ajaa ja hallinnoida %s.\n"
-"\n"
-"Haluatko myös muiden käyttäjien ajaa ja hallita %s tässä Macissa?"
+msgstr "Käyttäjät, joilla on ylläpito-oikeudet, saavat automaattisesti ajaa ja hallinnoida %s.\n\nHaluatko myös muiden käyttäjien ajaa ja hallita %s tässä Macissa?"
 
 #: PostInstall.cpp:1444
 #, c-format
@@ -70,9 +60,7 @@ msgstr "Käyttöoikeusvirhe uudelleenkäynnistyksen jälkeen"
 msgid ""
 "Removal may take several minutes.\n"
 "Please be patient."
-msgstr ""
-"Poistaminen voi kestää useita minuutteja.\n"
-"Ole kärsivällinen."
+msgstr "Poistaminen voi kestää useita minuutteja.\nOle kärsivällinen."
 
 #: uninstall.cpp:156
 #, c-format
@@ -80,10 +68,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 ""
-"Haluatko varmasti poistaa %s tietokoneelta?\n"
-"\n"
-"Tämä poistaa ohjelmatiedostot mutta ei koske %s datatiedostoihin."
+msgstr "Haluatko varmasti poistaa %s tietokoneelta?\n\nTämä poistaa ohjelmatiedostot mutta ei koske %s datatiedostoihin."
 
 #: uninstall.cpp:163
 #, c-format
@@ -97,15 +82,13 @@ msgstr "Tapahtui virhe: virhekoodi %d"
 
 #: uninstall.cpp:230
 msgid "name  of user"
-msgstr "käyttäjän  nimi"
+msgstr "käyttäjän nimi"
 
 #: uninstall.cpp:272
 msgid ""
 "Do you also want to remove VirtualBox from your computer?\n"
 "(VirtualBox was installed along with BOINC.)"
-msgstr ""
-"Haluatko poistaa myös VirtualBoxin tietokoneesta?\n"
-"(VirtualBox asennettiin BOINCin kanssa.)"
+msgstr "Haluatko poistaa myös VirtualBoxin tietokoneesta?\n(VirtualBox asennettiin BOINCin kanssa.)"
 
 #: uninstall.cpp:312
 #, c-format
@@ -117,23 +100,14 @@ msgid ""
 "\n"
 "for each user, the file\n"
 "\"%s\"."
-msgstr ""
-"Poistaminen valmis.\n"
-"\n"
-" Seuraavat kohdat voi poistaa käyttämällä Finderia: \n"
-"hakemisto \"%s\"\n"
-"\n"
-"jokaiselta käyttäjältä tiedosto\n"
-"\"%s\"."
+msgstr "Poistaminen valmis.\n\n Seuraavat kohdat voi poistaa käyttämällä Finderia: \nhakemisto \"%s\"\n\njokaiselta käyttäjältä tiedosto\n\"%s\"."
 
 #: uninstall.cpp:840
 #, c-format
 msgid ""
 "Enter your administrator password to completely remove %s from you computer.\n"
 "\n"
-msgstr ""
-"Anna ylläpitäjän salasana poistaaksesi %s kokonaan tietokoneesta.\n"
-"\n"
+msgstr "Anna ylläpitäjän salasana poistaaksesi %s kokonaan tietokoneesta.\n\n"
 
 #: uninstall.cpp:1616
 msgid "Cancel"
@@ -142,24 +116,3 @@ msgstr "Peruuta"
 #: uninstall.cpp:1617
 msgid "Continue..."
 msgstr "Jatka..."
-
-#, c-format
-#~ msgid "Sorry, this version of %s requires system 10.4 or higher."
-#~ msgstr "%s -versio vaatii 10.4-järjestelmän tai uudemman."
-#~ msgid ""
-#~ "Removal completed.\n"
-#~ "\n"
-#~ " You may want to remove the following remaining items using the Finder: \n"
-#~ "\"/Library/Application Support/BOINC Data\" directory\n"
-#~ "\n"
-#~ "for each user, the file\n"
-#~ "\"/Users/[username]/Library/Preferences/BOINC Manager Preferences\"."
-#~ msgstr ""
-#~ "Poisto suoritettu.\n"
-#~ "\n"
-#~ " Nämä jäljellejääneet tiedot voit poistaa käyttämällä Finderia: \n"
-#~ "\"/Library/Application Support/BOINC Data\" hakemisto\n"
-#~ "\n"
-#~ "jokaisen käyttäjän kohdalla tiedosto\n"
-#~ "\"/Users/[käyttäjänimi]/Library/Preferences/BOINC Manager Preferences\"."
-
diff --git a/locale/fi/BOINC-Web.mo b/locale/fi/BOINC-Web.mo
index 0f130f4..7a1dc1c 100644
Binary files a/locale/fi/BOINC-Web.mo and b/locale/fi/BOINC-Web.mo differ
diff --git a/locale/fi/BOINC-Web.po b/locale/fi/BOINC-Web.po
index c9ce435..2c23678 100644
--- a/locale/fi/BOINC-Web.po
+++ b/locale/fi/BOINC-Web.po
@@ -1,30 +1,35 @@
 # BOINC web translation
 # Copyright (C) 2008-2009 University of California
+# 
 # This file is distributed under the same license as BOINC.
+# 
 # FileID  : $Id$
+# 
+# Translators:
+# Sami Nordlund <sami.nordlund at kolumbus.fi>, 2015
+# Vesa Nilakari, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\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 21:36-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: fi\n"
+"PO-Revision-Date: 2015-03-14 11:40+0000\n"
+"Last-Translator: Sami Nordlund <sami.nordlund at kolumbus.fi>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/boinc/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1418724760.0\n"
 
 #: docutil.php:21
 msgid "Search"
-msgstr "Hae"
+msgstr "Etsi"
 
 #: docutil.php:103
 msgid "Return to BOINC main page"
-msgstr "BOINCin etusivulle"
+msgstr "Palaa BOINC:n pääsivulle"
 
 #: docutil.php:114
 #, php-format
@@ -32,7 +37,9 @@ msgid "This page is %stranslatable%s."
 msgstr "Tämä sivu on %skäännettävissä%s."
 
 #: download.php:39
-msgid "We recommend that you also install VirtualBox, so your computer can work on science projects that require it."
+msgid ""
+"We recommend that you also install VirtualBox, so your computer can work on "
+"science projects that require it."
 msgstr "VirtualBoxin asentamista suositellaan, jolloin tietokoneesi voi osallistua projekteihin, jotka vaativat sen."
 
 #: download.php:41
@@ -43,41 +50,48 @@ msgstr "Lisätietoja VirtualBoxista."
 msgid "Download BOINC + VirtualBox"
 msgstr "Lataa BOINC + Virtualbox"
 
-#: download.php:54
-#: download.php:69
+#: download.php:54 download.php:69
 #, php-format
 msgid "for %s"
 msgstr "järjestelmälle %s"
 
-#: download.php:57
-#: download.php:72
+#: download.php:57 download.php:72
 #, php-format
 msgid "BOINC version %s"
-msgstr "BOINC versio %s"
+msgstr "BOINC, versio %s"
 
 #: download.php:59
 #, php-format
 msgid "VirtualBox version %s"
-msgstr "VirtualBox versio %s"
+msgstr "VirtualBox, versio %s"
 
 #: download.php:67
 msgid "Download BOINC"
 msgstr "Lataa BOINC"
 
 #: download.php:123
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others."
+msgid ""
+"BOINC is a program that lets you donate your idle computer time to science "
+"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, and many others."
 msgstr "BOINC on ohjelma, jolla voit antaa tietokoneesi joutoaikaa sellaisiin projekteihin kuin SETI at home, Climateprediction.net, Rosetta at home, World Community Grid ja moniin muihin."
 
 #: download.php:125
-msgid "After installing BOINC on your computer, you can connect it to as many of these projects as you like."
+msgid ""
+"After installing BOINC on your computer, you can connect it to as many of "
+"these projects as you like."
 msgstr "BOINCin asennuksen jälkeen voit osallistua niin moneen projektiin kuin haluat."
 
 #: download.php:127
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
+msgid ""
+"You may run this software on a computer only if you own the computer or have"
+" the permission of its owner."
 msgstr "Voit ajaa tätä ohjelmistoa vain omalla tietokoneellasi tai muulla tietokoneella, jos sinulla on tietokoneen omistajan lupa."
 
 #: download.php:132
-msgid "We recommend that you download BOINC from the Google Play Store or Amazon Appstore, not from here."
+msgid ""
+"We recommend that you download BOINC from the Google Play Store or Amazon "
+"Appstore, not from here."
 msgstr "Suosittelemme lataamaan BOINCin Google Play Storesta tai Amazon Appstoresta, ei täältä."
 
 #: download.php:167
@@ -88,8 +102,7 @@ msgstr "Järjestelmävaatimukset"
 msgid "Release notes"
 msgstr "Julkaisutiedot"
 
-#: download.php:169
-#: index.php:86
+#: download.php:169 index.php:86
 msgid "Help"
 msgstr "Apua"
 
@@ -111,20 +124,34 @@ msgstr "BOINC: laskentaa tieteen hyväksi"
 
 #: help.php:12
 #, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
+msgid ""
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who"
+" can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"through the process of installing and using BOINC; %s troubleshoot any "
+"problems you might have."
 msgstr "BOINC Online apu mahdollistaa puhumisen kokeneen BOINC-käyttäjän kanssa, joka %s osaa vastata kysymyksiin BOINCista ja laskennasta, %s auttaa BOINCin asennuksessa ja käytössä, %s ratkaisee ongelmia joita sinulla saattaa olla."
 
 #: help.php:21
 #, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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."
+msgid ""
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system."
+" 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 apu perustuu %sSkypeen%s, Internet-pohjaiseen puhelinjärjestelmään. Skype on ilmainen (sekä ohjelmiston että puheluiden osalta).  Jos sinulla ei vielä ole Skypeä, %slataa ja asenna se%s.  Palaa sen jälkeen tälle sivulle."
 
 #: help.php:28
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
+msgid ""
+"The best way to get help is by voice, for which you need either built-in "
+"microphone and speakers or an external headset for your computer.  You can "
+"also use Skype's text-based chat system or regular email (if you don't have "
+"Skype) to communicate with Help Volunteers."
 msgstr "Paras tapa avun saamiseksi on puheen välityksellä, johon tarvitset mikrofonin ja kaiuttimet tai kuulokkeet tietokoneeseesi.  Voit myös käyttää Skypen tekstipohjaista chattia tai perinteistä sähköpostia (jos sinulla ei ole Skypea) avun saamiseksi."
 
 #: help.php:31
-msgid "Volunteers speaking several languages are available. Please select a language:"
+msgid ""
+"Volunteers speaking several languages are available. Please select a "
+"language:"
 msgstr "Vapaaehtoisista löytyy useiden kielien taitajia. Valitse oma kielesi:"
 
 #: help.php:47
@@ -133,16 +160,22 @@ msgstr "Tule vapaaehtoisavustajaksi"
 
 #: help.php:50
 #, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
+msgid ""
+"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+"Volunteer%s.  It's a great way to help the cause of scientific research and "
+"volunteer computing - and it's fun!"
 msgstr "Jos olet kokenut BOINC-käyttäjä, tule %svapaaehtoiseksi avustajaksi%s.  Se on hieno tapa auttaa tieteellisessä tutkimuksessa ja laskennassa - lisäksi se on hauskaa!"
 
 #: help.php:56
 #, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
+msgid ""
+"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
 msgstr "Jos olet jo avustajana, voit muokata asetuksiasi %stästä%s."
 
 #: help_funcs.php:107
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
+msgid ""
+"BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
+"or the University of California."
 msgstr "BOINC-avustajat ovat palkattomia vapaaehtoisia.  Heidän ohjeitaan ei ole erikseen hyväksytty BOINCin tai Kalifornian yliopiston taholta."
 
 #: help_funcs.php:110
@@ -159,7 +192,7 @@ msgstr "Vapaaehtoisten TOP 100"
 
 #: index.php:27
 msgid "Statistics"
-msgstr "Tilastot"
+msgstr "Tilastotietoa"
 
 #: index.php:55
 msgid "Active:"
@@ -175,9 +208,8 @@ msgstr "tietokonetta.\n"
 
 #: index.php:56
 msgid "24-hour average:"
-msgstr "24:n tunnin keskiarvo:"
+msgstr "24 tunnin keskiarvo:"
 
-# 80%
 #: index.php:56
 msgid "PetaFLOPS."
 msgstr "PetaFLOPSia."
@@ -194,9 +226,7 @@ msgstr "Vapaaehtoisena"
 msgid "Download"
 msgstr "Lataa"
 
-#: index.php:87
-#: index.php:120
-#: index.php:171
+#: index.php:87 index.php:120 index.php:171
 msgid "Documentation"
 msgstr "Dokumentaatio"
 
@@ -209,7 +239,10 @@ msgid "Links"
 msgstr "Linkit"
 
 #: index.php:94
-msgid "Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:"
+msgid ""
+"Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure"
+" diseases, study global warming, discover pulsars, and do many other types "
+"of scientific research.  It's safe, secure, and easy:"
 msgstr "Käytä tietokoneen (Windows, Mac, Linux tai Android) joutoaikaa parantamaan sairauksia, tutkimaan ilmaston lämpenemistä, löytämään pulsareita ja tekemään monia muita tieteellisiä tutkimuksia.  Se on turvallista, varmaa ja helppoa:"
 
 #: index.php:96
@@ -226,7 +259,9 @@ msgstr "Anna sähköpostiosoite ja salasana."
 
 #: index.php:102
 #, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
+msgid ""
+"Or, if you run several projects, try an %saccount manager%s such as "
+"%sGridRepublic%s or %sBAM!%s. "
 msgstr "Jos osallistut useisiin projekteihin, kokeile %stilihallitsijaa%s kuten %sGridRepublic%s tai %sBAM!%s. "
 
 #: index.php:118
@@ -238,11 +273,15 @@ msgid "Software updates"
 msgstr "Ohjelmistopäivitykset"
 
 #: index.php:128
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving"
+" you the computing power of thousands of CPUs."
 msgstr "%1Tutkijat%2 voivat käyttää BOINCia %3julkisen laskennan projekteihin%4 saaden tuhansien tietokoneiden laskentatehon."
 
 #: index.php:132
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
 msgstr "%1Yliopistot%2 voivat käyttää BOINCia tehdäkseen %3virtuaalisen supertietokoneen%4."
 
 #: index.php:137
@@ -287,7 +326,7 @@ msgstr "ja"
 
 #: index.php:166
 msgid "Help wanted"
-msgstr "Apua kaivataan"
+msgstr "Apua tarvitaan"
 
 #: index.php:168
 msgid "Programming"
@@ -307,7 +346,7 @@ msgstr "Julkisuus"
 
 #: index.php:174
 msgid "Software development"
-msgstr "Ohjelmistokehittely"
+msgstr "Ohjelmistokehitys"
 
 #: index.php:175
 msgid "APIs for add-on software"
@@ -315,7 +354,8 @@ msgstr "APIt ohjelmiston laajennoksille"
 
 #: index.php:217
 #, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
+msgid ""
+"Open-source software for %svolunteer computing%s and %sgrid computing%s."
 msgstr "Avoimen lähdekoodin ohjelmisto %sjulkiseen laskentaan%s ja %ssisäiseen laskentaan%s."
 
 #: index.php:230
@@ -326,7 +366,6 @@ msgstr "BOINC sijaitsee Kalifornian yliopistolla, Berkeleyssä"
 msgid "Distributed sensing"
 msgstr "Hajautettu anturitekniikka"
 
-# 78%
 #: projects.inc:19
 msgid "Stanford University"
 msgstr "Stanfordin yliopisto"
@@ -336,7 +375,10 @@ msgid "Seismology"
 msgstr "Seismologia"
 
 #: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
+msgid ""
+"The Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to Internet-connected computers.  You must buy a "
+"sensor to participate."
 msgstr "Quake-Catcher Network kehittää maailman suurinta seismistä verkkoa käyttämällä internetiin kytkettyjä tietokoneita, joissa on anturi.  Sinun tulee ostaa anturi, jotta voit osallistua."
 
 #: projects.inc:27
@@ -348,23 +390,24 @@ msgid "Environmental research"
 msgstr "Ympäristöntutkimus"
 
 #: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
+msgid ""
+"This project is creating a free and continuously updated map of radiation "
+"levels by using sensors connected to volunteers' computers.  You must buy a "
+"sensor to participate."
 msgstr "Tämä projekti luo ilmaisen ja jatkuvasti päivittyvän kartan säteilytasoista käyttämällä vapaaehtoisten tietokoneisiin kytkettyjä antureita.  Sinun on ostettava anturi osallistuaksesi."
 
 #: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
+msgid ""
+"To participate in these projects you must buy a sensor and attach it to your"
+" computer."
 msgstr "Osallistuaksesi näihin projekteihin sinun pitää ostaa anturi ja liittää se tietokoneeseesi."
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
 msgstr "Kognitiivinen tiede ja tekoäly"
 
-#: projects.inc:60
-#: projects.inc:364
-#: projects.inc:408
-#: projects.inc:457
-#: projects.inc:464
-#: projects.inc:511
+#: projects.inc:60 projects.inc:364 projects.inc:408 projects.inc:457
+#: projects.inc:464 projects.inc:511
 msgid "Private"
 msgstr "Yksityinen"
 
@@ -373,7 +416,11 @@ msgid "Artificial intelligence"
 msgstr "Tekoäly"
 
 #: projects.inc:62
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
+msgid ""
+"Parse and convert semantic nets for use in FreeHAL, an artificial "
+"intelligence that uses semantic networks, stemmers, part of speech "
+"databases, and part of speech taggers in order to imitate human behavior in "
+"conversations."
 msgstr "Muuntaa ja jäsentää semanttisia verkkoja FreeHAL-tekoälyn käyttöön, joka käyttää semanttisia verkkoja, sanojen vartaloita ja osia puhetietokannoista jäljitelläkseen ihmisen käyttäytymistä keskustelutilanteissa."
 
 #: projects.inc:69
@@ -389,7 +436,12 @@ msgid "Antimalarial drug discovery"
 msgstr "Malarialääkkeen löytäminen"
 
 #: projects.inc:84
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
+msgid ""
+"The parasite that causes malaria continues to evolve resistance to available"
+" medication. We therefore urgently need to discover new drugs to replace "
+"existing drugs. Importantly, these new drugs need to target NEW proteins in "
+"the parasite. The FightMalaria at Home project is aimed at finding these new "
+"targets."
 msgstr "Malariaa aiheuttavat loiset ovat yhä vastustuskykyisempiä nykyisille lääkkeille. Sen vuoksi on tarpeen löytää uusia lääkkeitä vanhojen tilalle. Uusien lääkkeiden tulisi kohdistua loisen UUSIIN proteiineihin. FightMalaria at Home -projekti tähtää näiden uusien kohteiden löytämiseen."
 
 #: projects.inc:90
@@ -401,7 +453,12 @@ msgid "Protein structure prediction"
 msgstr "Proteiinirakenteiden ennakointi"
 
 #: projects.inc:92
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
+msgid ""
+"POEM at HOME uses a computational approach to predict the biologically active "
+"structure of proteins, to understand the signal-processing mechanisms when "
+"the proteins interact with one another, to understand diseases related to "
+"protein malfunction or aggregation, and to develop new drugs on the basis of"
+" the three-dimensions structure of biologically important proteins."
 msgstr "POEM at HOME käyttää laskennallista lähestymistapaa ennakoimaan proteiinien biologisesti aktiivisia rakenteita, ymmärtämään signaalinkäsittelymekanismeja proteiinien vuorovaikuttaessa toistensa kanssa, ymmärtämään proteiinien virhetoimintoihin tai yhdistymiseen liittyviä sairauksia ja kehittämään uusia lääkkeitä biologisesti tärkeiden proteiinien kolmiulotteisten rakenteiden pohjalta."
 
 #: projects.inc:98
@@ -413,7 +470,11 @@ msgid "Study of protein - ligand interactions"
 msgstr "Proteiinitutkimus - ligandin vuorovaikutukset"
 
 #: projects.inc:100
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
+msgid ""
+"Docking at Home has both bioscience and computer science goals. The project "
+"aims to further knowledge of the atomic details of protein-ligand "
+"interactions and, by doing so, will search for insights into the discovery "
+"of novel pharmaceuticals."
 msgstr "Docking at Homella on sekä biologinen että tietojenkäsittelyopillinen päämäärä. Projekti tähtää tiedon lisäämiseen proteiiniligandien vuorovaikutuksista ja sitä myöten löytää uusia lääkkeitä."
 
 #: projects.inc:114
@@ -425,7 +486,11 @@ msgid "Molecular simulations of proteins"
 msgstr "Proteiinien molekyylisimuloinnit"
 
 #: projects.inc:116
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
+msgid ""
+"GPUGrid.net opens novel computational scenarios by the first full-atom "
+"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
+"New biomedical applications suddenly become possible giving a new role to "
+"computational biology for biomedical research."
 msgstr "GPUGrid.net avaa uudenlaisia skenaarioita molekyylidynaamisen koodin laskennalle, joka on erityisesti optimoitu NVIDIAn näytönohjaimille. Uudet biolääketieteelliset sovellukset tulivat mahdollisiksi antaen uuden roolin bioinformatiikalle biolääketieteellisessä tutkimuksessa."
 
 #: projects.inc:122
@@ -437,11 +502,15 @@ msgid "Genetic linkage analysis"
 msgstr "Geneettisten sidonnaisuuksien tutkimus"
 
 #: projects.inc:124
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
+msgid ""
+"Superlink at Technion helps geneticists all over the world find disease-"
+"provoking genes causing some types of diabetes, hypertension (high blood "
+"pressure), cancer, schizophrenia and many others."
 msgstr "Superlink at Technion auttaa tutkijoita kaikkialla maailmassa löytämään geenejä, jotka aiheuttavat tietyntyyppistä diabetestä, kohonnutta verenpainetta, syöpää, skitsofreniaa ja muita sairauksia."
 
 #: projects.inc:138
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
+msgid ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
 msgstr "Marylandin yliopiston bioinformatiikan keskus"
 
 #: projects.inc:139
@@ -449,7 +518,11 @@ msgid "Life science research"
 msgstr "Biologiset tieteet"
 
 #: projects.inc:140
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
+msgid ""
+"The Lattice Project supplies computing power to scientists at the University"
+" of Maryland studying evolutionary relationships based on DNA sequence data;"
+" bacterial, plasmid, and virus protein sequences; and biological diversity "
+"in nature reserves. "
 msgstr "Lattice-projekti tarjoaa laskentatehoa Marylandin yliopiston tutkijoille tutkittaessa kehitysopillisia yhteyksiä, jotka perustuvat DNA-ketjuun: bakteeri-, plasmidi- ja virusproteiinisarjoja; ja biologista monimuotoisuutta luonnonsuojelualueilla. "
 
 #: projects.inc:146
@@ -461,20 +534,32 @@ msgid "Epidemiology"
 msgstr "Epidemiologia"
 
 #: projects.inc:148
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
+msgid ""
+"Simulation models of the transmission dynamics and health effects of malaria"
+" are an important tool for malaria control. They can be used to determine "
+"optimal strategies for delivering mosquito nets, chemotherapy, or new "
+"vaccines which are currently under development and testing.  Such modeling "
+"is extremely computer intensive, requiring simulations of large human "
+"populations with a diverse set of parameters related to biological and "
+"social factors that influence the distribution of the disease. "
 msgstr "Malarian torjunnassa tärkeinä työkaluina ovat leviämisdynamiikan ja terveysvaikutusten simulaatiomallit. Niitä voidaan käyttää määrittämään optimaalisia strategioita hyttysverkkojen toimittamiseen, kemoterapiassa tai uusien rokotteiden kehittämiseen ja testaukseen.  Tällaiset mallinnokset vaativat erittäin paljon laskentatehoa. Taudin leviämisen simulointiin vaaditaan suuri ihmispopulaatio, jossa on lukuisia biologisiin ja sosiaalisiin tekijöihin liittyviä parametreja. "
 
 #: projects.inc:170
 msgid "University of Washington"
 msgstr "Washingtonin yliopisto"
 
-#: projects.inc:171
-#: projects.inc:179
+#: projects.inc:171 projects.inc:179
 msgid "Biology"
 msgstr "Biologia"
 
 #: projects.inc:172
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
+msgid ""
+"Determine the 3-dimensional shapes of proteins in research that may "
+"ultimately lead to finding cures for some major human diseases. By running "
+"Rosetta at home you will help us speed up and extend our research in ways we "
+"couldn't possibly attempt without your help. You will also be helping our "
+"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
+"Cancer, and Alzheimer's"
 msgstr "Määrittää kolmiulotteisia proteiinien muotoja tutkimuksessa, joka voi lopulta johtaa parannuskeinoihin joidenkin tautien osalta. Ajamalla Rosetta at homea autat meitä nopeuttamaan ja laajentamaan tutkimusta tavalla, joka ei olisi muuten mahdollista. Autat myös uusien proteiinien suunnittelussa taistelussa HIVia, malariaa, syöpää ja Alzheimerin tautia vastaan"
 
 #: projects.inc:178
@@ -482,7 +567,10 @@ msgid "University of Vienna"
 msgstr "Wienin yliopisto"
 
 #: projects.inc:180
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
+msgid ""
+"Calculate similarities between proteins. SIMAP provides a public database of"
+" the resulting data, which plays a key role in many bioinformatics research "
+"projects."
 msgstr "Laskee proteiinien välisiä yhtäläisyyksiä. SIMAP tarjoaa tuloksista julkisen tietokannan, jolla on merkittävä rooli monissa bioinformatiikan tutkimusprojekteissa."
 
 #: projects.inc:186
@@ -498,7 +586,15 @@ msgid "Climate study"
 msgstr "Ilmastotutkimus"
 
 #: projects.inc:200
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
+msgid ""
+"Investigate the approximations that have to be made in state-of-the-art "
+"climate models. By running the model thousands of times we hope to find out "
+"how the model responds to slight tweaks to these approximations - slight "
+"enough to not make the approximations any less realistic. This will allow us"
+" to improve our understanding of how sensitive our models are to small "
+"changes and also to things like changes in carbon dioxide and the sulphur "
+"cycle. This will allow us to explore how climate may change in the next "
+"century under a wide range of different scenarios."
 msgstr "Tutkii approksimaatioita, joita tarvitaan huipputarkassa ilmastomallissa. Kun malli ajetaan tuhansia kertoja, saadaan selville, miten malli käyttäytyy pieniin approksimaation muutoksiin, jotka ovat kuitenkin sellaisia, jotka pitävät sen realistisena. Näin saadaan selville, kuinka herkkiä mallit ovat pienille muutoksille ja myös mm. hiilidioksidin ja rikin kierron muutoksille. Näin voidaan tutkia, miten ilmasto muuttuu seuraavan vuosisadan aikana eri skenaarioiden mukaan."
 
 #: projects.inc:207
@@ -510,39 +606,56 @@ msgid "Mechanical engineering"
 msgstr "Konetekniikka"
 
 #: projects.inc:214
-msgid "Currently we are calculating the optimum design of a structure call the 52 bar truss"
-msgstr "Lasketaan optimaalista rakennetta nk. 52 tangon ristikkopalkille"
+msgid ""
+"Currently we are calculating the optimum design of a structure call the 52 "
+"bar truss"
+msgstr "Lasketaan optimaalista rakennetta nk. 52 tangon ristikkopalkille."
 
-#: projects.inc:224
-#: projects.inc:263
-#: projects.inc:271
+#: projects.inc:224 projects.inc:263 projects.inc:271
 msgid "Astronomy"
 msgstr "Astronomia"
 
 #: projects.inc:225
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
+msgid ""
+"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
+"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
+"Universe. We will measure physical parameters (such as stellar mass surface "
+"density, star formation rate surface density, attenuation, and first-order "
+"star formation history) on a resolved pixel-by-pixel basis using spectral "
+"energy distribution (SED) fitting techniques in a distributed computing "
+"mode."
 msgstr "Yhdistämme GALEX:n, Pan-STARRS1:n ja WISE:n spektrit muodostaaksemme moniaaltopituisen UV-optis-infrapunagalaktisen kartaston lähiuniversumista. Mittaamme fysikaalisia parametreja (kuten tähden pintatiheyden, muodostumisnopeuden ja historia) käyttämällä SED:iin sovitettuja tekniikoita hajautetussa laskennassa."
 
 #: projects.inc:247
 msgid "University of Texas at Austin"
 msgstr "Texasin yliopisto, Austin"
 
-#: projects.inc:248
-#: projects.inc:279
+#: projects.inc:248 projects.inc:279
 msgid "Chemistry"
 msgstr "Kemia"
 
 #: projects.inc:249
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
+msgid ""
+"A common problem in theoretical chemistry, condensed matter physics and "
+"materials science is the calculation of the time evolution of an atomic "
+"scale system where, for example, chemical reactions and/or diffusion occur. "
+"Generally the events of interest are quite rare (many orders of magnitude "
+"slower than the vibrational movements of the atoms), and therefore direct "
+"simulations, tracking every movement of the atoms, would take thousands of "
+"years of computer calculations on the fastest present day computer before a "
+"single event of interest can be expected to occur.  Our research group is "
+"interested in calculating the long time dynamics of systems."
 msgstr "Yleinen ongelma teoreettisessa kemiassa, tiiviin aineen fysiikassa ja materiaalitekniikassa on laskea atomin mittakaavassa systeemin aikaevoluutio, jossa esim. kemialliset reaktiot ja/tai diffuusiot tapahtuvat. Yleensä mielenkiintoiset tapahtumat ovat hyvin harvinaisia (monta kertaluokkaa pienempiä kuin atomien värähtelyliikkeet) ja sen vuoksi suora simulointi, jokaisen atomin liikkeen seuranta, veisi tuhansia vuosia aikaa laskea nykyään nopeimmalla tietokoneella ennen kuin voida [...]
 
-# 95%
 #: projects.inc:262
 msgid "University of Illinois at Urbana-Champaign"
 msgstr "Illinoisin yliopisto, Urbana-Champaign"
 
 #: projects.inc:264
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
+msgid ""
+"The goal of Cosmology at Home is to search for the model that best describes "
+"our Universe and to find the range of models that agree with the available "
+"astronomical particle physics data."
 msgstr "Cosmology at Homen tavoitteena on etsiä mallia, joka parhaiten kuvaa universumiamme sekä löytää malleja, jotka ovat sopusoinnussa hiukkasfysiikan tietojen kanssa."
 
 #: projects.inc:270
@@ -550,7 +663,10 @@ msgid "Rensselaer Polytechnic Institute"
 msgstr "Rensselaerin teknillinen yliopisto"
 
 #: projects.inc:272
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
+msgid ""
+"The goal of Milkyway at Home is to create a highly accurate three dimensional "
+"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
+"Survey."
 msgstr "Milkyway at Homen tavoitteena on luoda erittäin tarkka kolmiulotteinen malli linnunradasta käyttäen Sloan Digital Sky Surveyn keräämää aineistoa."
 
 #: projects.inc:278
@@ -558,7 +674,13 @@ msgid "Leiden University, The Netherlands"
 msgstr "Leidenin yliopisto, Hollanti"
 
 #: projects.inc:280
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
+msgid ""
+"Surface science calculations using Classical Dynamics.  Leiden Classical "
+"allows volunteers, students and other scientist to submit their personal "
+"calculations to the grid. Each user has his own personal queue for Classical"
+" Dynamics jobs. In this way students have used the grid to simulate liquid "
+"argon, or to test the validity of the ideal gas law by actually doing the "
+"simulations through the grid."
 msgstr "Classical Dynamics käyttää pintatiedelaskentaa.  Leiden Classical sallii vapaaehtoisten, opiskelijoiden ja muiden tutkijoiden lähettää omia laskelmiaan verkkoon. Jokaisella käyttäjällä on oma jononsa Classical Dynamicsissa. Tällä tavalla opiskelijat ovat käyttäneet verkkoa simuloimaan nestemäistä argonia tai testaamaan ideaalikaasulain oikeellisuutta tekemällä simulaatioita verkossa."
 
 #: projects.inc:294
@@ -570,25 +692,36 @@ msgid "Astrophysics"
 msgstr "Astrofysiikka"
 
 #: projects.inc:296
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
+msgid ""
+"Search for spinning neutron stars (also called pulsars) using data from the "
+"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
+"observatory.  Einstein at Home is a World Year of Physics 2005 project "
+"supported by the American Physical Society (APS) and by a number of "
+"international organizations."
 msgstr "Pyörivien neutronitähtien (eli pulsarien) hakua käyttämällä gravitaatioaaltoja havaitsevien LIGOn ja GEOn sekä Arecibon radioteleskoopin tietoja.  Einstein at Home on maailman vuoden fysiikka 2005 projekti, jota on tukenut American Physical Society (APS) sekä joukko kansainvälisiä järjestöjä."
 
-#: projects.inc:310
-#: projects.inc:318
+#: projects.inc:310 projects.inc:318
 msgid "CERN (European Organization for Nuclear Research)"
 msgstr "CERN (Euroopan ydintutkimuskeskus)"
 
-#: projects.inc:311
-#: projects.inc:319
+#: projects.inc:311 projects.inc:319
 msgid "Physics"
 msgstr "Fysiikka"
 
 #: projects.inc:312
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
+msgid ""
+"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
+"European Organization for Nuclear Research, the world's largest particle "
+"physics laboratory.  It is the most powerful instrument ever built to "
+"investigate on particles proprieties. LHC at home runs simulations to improve "
+"the design of LHC and its detectors."
 msgstr "Suuri hadronitörmäytin eli The Large Hadron Collider (LHC) on hiukkaskiihdytin CERNissä, Euroopan ydintutkimuskeskuksessa, ja se on maailman suurin hiukkasfysiikan laboratorio.  Se on tehokkain koskaan rakennettu laite, jolla tutkitaan hiukkasten ominaisuuksia. LHC at home ajaa simulaatioita, joilla parannetaan LHC:n suunnittelua ja sen ilmaisimia."
 
 #: projects.inc:320
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
+msgid ""
+"This project uses CERN-developed virtual machine technology for full-fledged"
+" LHC event physics simulation on volunteer computers.  Requires that you "
+"install VirtualBox on your computer"
 msgstr "Projekti käyttää CERNissä kehitettyä virtuaaliteknologiaa valmiiden LHC-tapahtumien fysiikan simulointiin.  Tämä vaatii, että koneellesi on asennettu VirtualBox"
 
 #: projects.inc:326
@@ -600,7 +733,12 @@ msgid "Astrophysics, astrobiology"
 msgstr "Astrofysiikka, astrobiologia"
 
 #: projects.inc:328
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
+msgid ""
+"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
+"goal is to detect intelligent life outside Earth. One approach, known as "
+"radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
+"signals from space. Such signals are not known to occur naturally, so a "
+"detection would provide evidence of extraterrestrial technology."
 msgstr "SETI (Search for Extraterrestrial Intelligence) on tieteenala, jonka päämääränä on havaita älyllistä elämää maan ulkopuolella. Yksi lähestymistapa, joka tunnetaan radioSETInä, käyttää radioteleskooppeja kuuntelemassa kapeaa kaistaa avaruudesta saapuvasta radiosignaalista. Sellaisia signaaleja ei tiedetä esiintyvän luonnollisesti, joten signaalin havaitseminen voi tarjota todisteen maan ulkopuolisesta teknologiasta."
 
 #: projects.inc:342
@@ -612,7 +750,11 @@ msgid "Chemical engineering and nanotechnology"
 msgstr "Kemiantekniikka ja nanoteknologia"
 
 #: projects.inc:344
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
+msgid ""
+"The study of molecular magnets and controlled nanoscale magnetism.  These "
+"magnetic molecules may be used to develop tiny magnetic switches, with "
+"applications in medicine (such as local tumor chemotherapy) and "
+"biotechnology."
 msgstr "Tutkimus molekyylimagneeteista ja nanomittakaavan magnetismista.  Magneettisia molekyylejä voidaan käyttää pieninä magneettisina kytkiminä lääketieteellisissä sovelluksissa (kuten kemoterapiassa) ja bioteknologiassa."
 
 #: projects.inc:351
@@ -628,7 +770,10 @@ msgid "Physics, biochemistry, and others"
 msgstr "Fysiikka, biokemia ja muita"
 
 #: projects.inc:358
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
+msgid ""
+"The objective of CAS at home is to encourage and assist scientists in China to "
+"adopt the technologies of volunteer computing and volunteer thinking for "
+"their research."
 msgstr "CAS at homen tarkoituksena on rohkaista ja avustaa tutkijoita Kiinassa ottamaan käyttöön hajautettu laskenta ja sen ajatus."
 
 #: projects.inc:365
@@ -636,11 +781,12 @@ msgid "Mathematics, physics, evolution"
 msgstr "Matematiikka, fysiikka, evoluutio"
 
 #: projects.inc:366
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
+msgid ""
+"Yoyo at home is an adapter between BOINC and several existing volunteer "
+"computing projects: ECM, Muon, Evolution at home, and distributed.net"
 msgstr "Yoyo at home toimii välikappaleena BOINCin ja useiden projektien kuten ECM, Muon, Evolution at home ja distributed.net välillä"
 
-#: projects.inc:371
-#: projects.inc:527
+#: projects.inc:371 projects.inc:527
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 msgstr "MTA-SZTAKI Rinnakkaisten ja hajautettujen järjestelmien laboratorio (Unkari)"
 
@@ -649,7 +795,11 @@ msgid "European research projects"
 msgstr "Eurooppalaiset tutkimusprojektit"
 
 #: projects.inc:373
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
+msgid ""
+"The EDGeS at Home Beta project integrates volunteer computing into the service "
+"grid network of Europe by allowing service grids to send workunits to be "
+"processed by the volunteers of this project. The scientific projects covered"
+" by the project include math, physics, biology, etc."
 msgstr "EDGeS at Home Beta -projekti yhdistää vapaaehtoista laskentaa Euroopan palveluverkostoon sallimalla verkon lähettää työpaketteja projektin vapaaehtoisten käsiteltäväksi. Tieteelliset projektit sisältävät mm. matematiikkaa, fysiikkaa ja biologiaa."
 
 #: projects.inc:379
@@ -673,7 +823,11 @@ msgid "Medical, environmental and other humanitarian research"
 msgstr "Lääketieteellistä, ympäristöntutkimusta ja muita humanitaarisia tutkimuksia"
 
 #: projects.inc:389
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
+msgid ""
+"To further critical non-profit research on some of humanity's most pressing "
+"problems by creating the world's largest volunteer computing grid.  Research"
+" includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"clean water and many more."
 msgstr "Ei-kaupallista tutkimusta tärkeimmistä ongelmista luomalla maailman suurimman tietokoneverkon.  Tutkimus käsittää mm. HIV-AIDSia, syöpää, trooppisia ja muita tutkimattomia tauteja, aurinkoenergiaa ja puhdasta vettä."
 
 #: projects.inc:395
@@ -692,21 +846,18 @@ msgstr "Matematiikka, fysiikka, keinoäly"
 msgid "Simulation of quantum computing; Goldbach's conjecture."
 msgstr "Kvanttilaskennan simulointi; Goldbachin konjektuuri."
 
-#: projects.inc:450
-#: projects.inc:458
+#: projects.inc:450 projects.inc:458
 msgid "Cryptography"
 msgstr "Kryptografia"
 
 #: projects.inc:459
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
+msgid ""
+"Attempt to decode 3 original Enigma messages. The signals were intercepted "
+"in the North Atlantic in 1942 and are believed to be unbroken."
 msgstr "Yrityksenä purkaa 3 alkuperäistä Enigma-viestiä. Signaalit on kaapattu Pohjois-Atlantilla vuonna 1942 ja niiden uskotaan olevan murtamattomia."
 
-#: projects.inc:465
-#: projects.inc:504
-#: projects.inc:512
-#: projects.inc:520
-#: projects.inc:528
-#: projects.inc:568
+#: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
+#: projects.inc:528 projects.inc:568
 msgid "Mathematics"
 msgstr "Matematiikka"
 
@@ -723,11 +874,19 @@ msgid "Factorization of large integers"
 msgstr "Suurten kokonaislukujen jakaminen tekijöihin"
 
 #: projects.inc:473
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
+msgid ""
+"NFS at Home is a research project that uses Internet-connected computers to do "
+"the lattice sieving step in the Number Field Sieve factorization of large "
+"integers. As a young school student, you gained your first experience at "
+"breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
+"NFS at Home is a continuation of that experience, only with integers that are "
+"hundreds of digits long."
 msgstr "NFS at Home on tutkimusprojekti, joka käyttää internetiin kytkettyjä tietokoneita suorittamaan lukukuntaseulontaa suurten kokonaislukujen jakamisessa tekijöihinsä. Opiskelija saa ensimmäisen kokemuksensa kokonaisluvun jakamisesta alkutekijöihinsä, kuten esim. 15 = 3 * 5 tai 35 = 5 * 7. NFS at Home suorittaa samaa satoja merkkejä pitkillä kokonaisluvuilla."
 
 #: projects.inc:479
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
+msgid ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
 msgstr "Vilnan Gediminasin teknillinen yliopisto ja Kaunasin teknillinen yliopisto (Liettua)"
 
 #: projects.inc:480
@@ -735,7 +894,11 @@ msgid "Software testing"
 msgstr "Ohjelmistotestaus"
 
 #: projects.inc:481
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
+msgid ""
+"The aim of this project is to provide a powerful distributed computing "
+"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
+"well as others Lithuanian academic institutions.  Current applications "
+"involve the study of Monte-Carlo based software testing."
 msgstr "Projekti antaa hajautetun laskennan alustan Vilnan teknillisen yliopiston (VGTU) tutkijoille ja muille Liettuan akatemian laitoksille.  Nykyiset sovellukset käsittelevät Monte-Carlo -pohjaista ohjelmistotestausta."
 
 #: projects.inc:503
@@ -743,11 +906,20 @@ msgid "Mathematical Institute of Leiden University / Kennislink"
 msgstr "Leidenin yliopiston matematiikan laitos / Kennislink"
 
 #: projects.inc:505
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
+msgid ""
+"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
+"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
+"product of the distinct prime factors of n. The ABC conjecture says that "
+"there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for "
+"any real h > 1. The ABC conjecture is currently one of the greatest open "
+"problems in mathematics. If it is proven to be true, a lot of other open "
+"problems can be answered directly from it."
 msgstr "Hakee \"abc-kolmikkoja\", positiivisia kokonaislukuja (a, b, c), kuten a+b=c, a < b < c, luvuilla a,b,c ei ole yhteisiä jakajia ja c > rad(abc), jossa rad(n) on luvun n erillisten alkutekijöiden tulos. ABC-konjektuurin mukaan on vain rajallinen määrä kolmikkoja, jotta log(c)/log(rad(abc)) > h mille tahansa luonnolliselle h:n arvolle, joka on suurempi kuin 1. ABC-konjektuuri on tällä hetkellä yksi matematiikan suurimmista avoimista ongelmista. Jos se todistetaan oikeaksi, mo [...]
 
 #: projects.inc:513
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
+msgid ""
+"Primegrid has multiple projects searching for different forms of very large "
+"prime numbers, including searching for the largest known prime number."
 msgstr "Primegridillä on useita projekteja, joilla etsitään suurten alkulukujen eri muotoja sekä suurimman tunnetun alkuluvun etsintä."
 
 #: projects.inc:519
@@ -755,11 +927,15 @@ msgid "Hochschule RheinMain University of Applied Sciences"
 msgstr "RheinMainin ammattikorkeakoulu"
 
 #: projects.inc:521
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
+msgid ""
+"Search for counterexamples to two conjectures related to the identification "
+"of prime numbers"
 msgstr "Löytää poikkeukset kahteen konjektuuriin, jotka liittyvät alkulukujen tunnistamiseen"
 
 #: projects.inc:529
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
+msgid ""
+"Find all the generalized binary number systems (in which bases are matrices "
+"and digits are vectors) up to dimension 11."
 msgstr "Etsiä kaikki yleistetyt binäärilukujärjestelmät (joissa kantoina ovat matriisit ja numeroina vektorit) 11:een dimensioon asti."
 
 #: ../html/inc/news.inc:40
@@ -770,243 +946,3 @@ msgstr "Kommentti"
 #, php-format
 msgid "News is available as an %sRSS feed%s"
 msgstr "Uutiset saatavana %sRSS-syötteenä%s"
-
-# 75%
-#~ msgid "Astronomy, Physics, and Chemistry"
-#~ msgstr "Astronomia, fysiikka ja kemia"
-#~ msgid "Download BOINC + Virtualbox"
-#~ msgstr "Lataa BOINC + Virtualbox"
-#, php-format
-#~ msgid "%s for %s (%s MB)"
-#~ msgstr "%s %s:lle (%s Mt)"
-#~ msgid ""
-#~ "BOINC is a program that lets you donate your idle computer time to science "
-#~ "projects like SETI at home, Climateprediction.net, Rosetta at home, World "
-#~ "Community Grid, and many others. <p> After installing BOINC on your "
-#~ "computer, you can connect it to as many of these projects as you like."
-#~ msgstr ""
-#~ "BOINC on ohjelma, jolla voit antaa tietokoneesi laskentatehoa tieteelliseen "
-#~ "käyttöön sellaisissa projekteissa kuin SETI at home, Climateprediction.net, "
-#~ "Rosetta at home, World Community Grid ja moniin muihin. <p> Asennuksen jälkeen "
-#~ "voit osallistua niin moneen projektiin kuin haluat."
-
-#, php-format
-#~ msgid ""
-#~ " Use the idle time on your computer (Windows, Mac, Linux, or Android) to "
-#~ "cure diseases, study global warming, discover pulsars, and do many other "
-#~ "types of scientific research.  It's safe, secure, and easy:  %sChoose%s "
-#~ "projects  %sDownload%s and run BOINC software  %sEnter%s an email address "
-#~ "and password. "
-#~ msgstr ""
-#~ " Käytä tietokoneesi joutoaikaa (Windows, Mac, Linux tai Android) tautien "
-#~ "parantamiseen, ilmastonlämpenemisen tutkimiseen, pulsarien löytämiseen ja "
-#~ "moniin muihin tieteellisiin tutkimuksiin.  Se on turvallista, varmaa ja "
-#~ "helppoa:  %sValitse%s projektit  %sLataa%s ja aja BOINC ohjelmisto  %sAnna%s "
-#~ "sähköpostiosoite ja salasana. "
-#~ msgid "Browser default"
-#~ msgstr "Selaimen oletus"
-
-#, php-format
-#~ msgid ""
-#~ " Use the idle time on your computer (Windows, Mac, or Linux) to cure "
-#~ "diseases, study global warming, discover pulsars, and do many other types of "
-#~ "scientific research.  It's safe, secure, and easy:  %sChoose%s projects  "
-#~ "%sDownload%s and run BOINC software  %sEnter%s an email address and "
-#~ "password. "
-#~ msgstr ""
-#~ " Käytä tietokoneesi joutoaikaa (Windows, Mac tai Linux) parantamaan "
-#~ "sairauksia, tutkimaan ilmastonlämpenemistä, löytämään pulsareita ja tekemään "
-#~ "monia muita tieteellisiä tutkimuksia.  Se on turvallista, luotettavaa ja "
-#~ "helppoa:  %sValitse%s projektit  %sLataa%s ja aja BOINC-ohjelmisto  %sAnna%s "
-#~ "sähköpostiosoite ja salasana. "
-#~ msgid "IBM Corporate Community Relations"
-#~ msgstr "IBM Corporate Community Relations"
-#~ msgid "Humanitarian research on disease, natural disasters and hunger."
-#~ msgstr ""
-#~ "Humanitääristä tutkimusta taudeista, luonnonkatastrofeista ja "
-#~ "nälänhädästä."
-#~ msgid ""
-#~ "To further critical non-profit research on some of humanity's most "
-#~ "pressing problems by creating the world's largest volunteer computing "
-#~ "grid.  Research includes HIV/AIDS, cancer, muscular dystrophy, dengue "
-#~ "fever, and many more."
-#~ msgstr ""
-#~ "Edistää tutkimusta joissakin ihmiskunnan kovimmissa ongelmissa.  Tutkimus "
-#~ "käsittää mm. seuraavat taudit: HIV/AIDS, syöpä, lihasrappeuma ja "
-#~ "Denguekuume."
-#~ msgid ""
-#~ "Primegrid is generating a public sequential prime number database, and is "
-#~ "searching for large twin primes of the form k*2<sup>n</sup>+1 and "
-#~ "k*2<sup>n</sup>-1"
-#~ msgstr ""
-#~ "Primegrid muodostaa julkista peräkkäisten alkulukujen tietokantaa ja "
-#~ "etsii suuria alkulukupareja, jotka ovat muotoa k*2<sup>n</sup>+1 ja "
-#~ "k*2<sup>n</sup>-1"
-#~ msgid "FreeHAL"
-#~ msgstr "FreeHAL"
-#~ msgid "private"
-#~ msgstr "yksityinen"
-#~ msgid "POEM at HOME"
-#~ msgstr "POEM at HOME"
-#~ msgid "Docking at Home"
-#~ msgstr "Docking at Home"
-#~ msgid "GPUGrid.net"
-#~ msgstr "GPUGrid.net"
-#~ msgid "Superlink at Technion"
-#~ msgstr "Superlink at Technion"
-#~ msgid "The Lattice Project"
-#~ msgstr "Lattice-projekti"
-#~ msgid "Malariacontrol.net"
-#~ msgstr "Malariacontrol.net"
-#~ msgid "Rosetta at home"
-#~ msgstr "Rosetta at home"
-#~ msgid "SIMAP"
-#~ msgstr "SIMAP"
-#~ msgid "Virtual Prairie"
-#~ msgstr "Virtuaalipreeria"
-#~ msgid "University of Houston"
-#~ msgstr "Houstonin yliopisto"
-#~ msgid "Study of botanical ecosystems"
-#~ msgstr "Tutkimus kasvien ekosysteemeistä"
-#~ msgid ""
-#~ "Provide ecological guidelines on the design of prairies with the best "
-#~ "potential for water purification."
-#~ msgstr ""
-#~ "Tarjoaa ekologisia suuntauksia preerioiden suunnitteluun ja parhaimman "
-#~ "mahdollisuuden veden puhdistamiselle."
-#~ msgid "Climateprediction.net"
-#~ msgstr "Climateprediction.net"
-#~ msgid "Astronomy/Physics/Chemistry"
-#~ msgstr "Astronomia/Fysiikka/Kemia"
-#~ msgid "eOn"
-#~ msgstr "eOn"
-#~ msgid "Orbit at home"
-#~ msgstr "Orbit at home"
-#~ msgid "Planetary Science Institute"
-#~ msgstr "Planeettatutkimuksen instituutti"
-#~ msgid "Monitor and study the hazard posed by near-Earth asteroids"
-#~ msgstr "Tutkimus maan lähellä olevien asteroidien aiheuttamasta vaarasta"
-#~ msgid "Cosmology at Home"
-#~ msgstr "Cosmology at Home"
-#~ msgid "University of Illinois at Urbana-Chamapign"
-#~ msgstr "Illinoisin yliopisto, Urbana-Chamapign"
-#~ msgid "Milkyway at home"
-#~ msgstr "Milkyway at home"
-#~ msgid "Leiden Classical"
-#~ msgstr "Leiden Classical"
-#~ msgid "uFluids at home"
-#~ msgstr "uFluids at home"
-#~ msgid "Purdue University"
-#~ msgstr "Purduen yliopisto"
-#~ msgid "Physics/Aeronautics"
-#~ msgstr "Fysiikka/ilmailu"
-#~ msgid ""
-#~ "The uFluids project simulates two-phase fluid behavior in microgravity "
-#~ "and microfluidics problems. Our goal is to design better satellite "
-#~ "propellant management devices and address two-phase flow in microchannel "
-#~ "and MEMS devices."
-#~ msgstr ""
-#~ "uFluids-projekti simuloi kaksifaasisen nesteen käyttäytymistä "
-#~ "mikropainovoimassa ja mikrofluidisia ongelmia. Tavoitteena on suunnitella "
-#~ "parempia työntöjärjestelmiä satelliitteihin ja esittää virtausta "
-#~ "mikrokanavissa ja MEMS-laitteissa."
-#~ msgid "Einstein at home"
-#~ msgstr "Einstein at home"
-#~ msgid "LHC at home"
-#~ msgstr "LHC at home"
-#~ msgid "SETI at home"
-#~ msgstr "SETI at home"
-#~ msgid "Quantum Monte Carlo at Home"
-#~ msgstr "Quantum Monte Carlo at Home"
-#~ msgid "University of Muenster (Germany)"
-#~ msgstr "Münsterin yliopisto (Saksa)"
-#~ msgid ""
-#~ "Study the structure and reactivity of molecules using Quantum Chemistry."
-#~ msgstr ""
-#~ "Tutkii molekyylien rakennetta ja reaktiivisuutta kvanttikemian avulla."
-#~ msgid "Spinhenge at home"
-#~ msgstr "Spinhenge at home"
-#~ msgid "CAS at home"
-#~ msgstr "CAS at home"
-#~ msgid "Yoyo at home"
-#~ msgstr "Yoyo at home"
-#~ msgid "EDGeS at Home"
-#~ msgstr "EDGeS at Home"
-#~ msgid "Ibercivis"
-#~ msgstr "Ibercivis"
-#~ msgid "World Community Grid"
-#~ msgstr "World Community Grid"
-#~ msgid "Enigma at Home"
-#~ msgstr "Enigma at Home"
-#~ msgid "Collatz Conjecture"
-#~ msgstr "Collatzin konjektuuri"
-#~ msgid "NFS at home"
-#~ msgstr "NFS at home"
-#~ msgid "VTU at home"
-#~ msgstr "VTU at home"
-#~ msgid "AQUA at home"
-#~ msgstr "AQUA at home"
-#~ msgid "D-Wave Systems, Inc."
-#~ msgstr "D-Wave Systems, Inc."
-#~ msgid "Quantum computing"
-#~ msgstr "Kvanttilaskenta"
-#~ msgid ""
-#~ "D-Wave's AQUA (Adiabatic QUantum Algorithms) is a research project whose "
-#~ "goal is to predict the performance of superconducting adiabatic quantum "
-#~ "computers on a variety of hard problems arising in fields ranging from "
-#~ "materials science to machine learning. AQUA at home uses Internet-connected "
-#~ "computers to help design and analyze quantum computing algorithms, using "
-#~ "Quantum Monte Carlo techniques."
-#~ msgstr ""
-#~ "D-Wave's AQUA (Adiabatic QUantum Algorithms) on projekti, jonka "
-#~ "päämääränä on ennustaa suprajohtavien adiabaattisten kvanttitietokoneiden "
-#~ "suorituskykyä materiaalitieteen ja koneopin vaikeissa ongelmissa. "
-#~ "AQUA at home käyttää internetiin yhdistettyjä tietokoneita kvanttilaskennan "
-#~ "algoritmien suunnitteluun ja analysointiin käyttäen Quantum Monte Carlo -"
-#~ "tekniikkaa."
-#~ msgid "ABC at home"
-#~ msgstr "ABC at home"
-#~ msgid "PrimeGrid"
-#~ msgstr "PrimeGrid"
-#~ msgid "primaboinca"
-#~ msgstr "primaboinca"
-#~ msgid "SZTAKI Desktop Grid"
-#~ msgstr "SZTAKI Desktop Grid"
-#~ msgid "Chess960 at home"
-#~ msgstr "Chess960 at home"
-#~ msgid "Chess-960.org"
-#~ msgstr "Chess-960.org"
-#~ msgid "Game-playing"
-#~ msgstr "Pelaaminen"
-#~ msgid ""
-#~ "This project studies Chess 960, a variant of orthodox chess. In classical "
-#~ "chess the starting position of the game never changes.  In Chess 960, "
-#~ "just before the start of every game, the initial configuration of the "
-#~ "chess pieces is determined randomly."
-#~ msgstr ""
-#~ "Projekti tutkii Chess 960:aa, perinteisen shakin muunnelmaa. Klassisessa "
-#~ "shakissa pelin alkuasetelma on aina sama.  Chess 960:ssa pelinappuloiden "
-#~ "alkutilanne määritetään satunnaisesti juuri ennen pelin alkua."
-#~ msgid "The current release is known to work with these Linux versions:"
-#~ msgstr "Tämänhetkinen versio toimii näissä Linux-versioissa:"
-#~ msgid ""
-#~ "For other Linux versions, check if a BOINC package is offered by your "
-#~ "Linux distribution."
-#~ msgstr "Muille Linux-versioille BOINC-paketti saattaa olla Linux-distrossa."
-#~ msgid ""
-#~ "Alternatively, download the %1BOINC client for older Linux versions%2. "
-#~ "This doesn't have a graphical interface, but it should work on all Linux "
-#~ "systems, both x86 and x64."
-#~ msgstr ""
-#~ "Vaihtoehtoisesti voit ladata %1vanhemmille Linuxeille tarkoitetun BOINCin"
-#~ "%2. Tässä ei ole graafista käyttöliittymää, mutta sen pitäisi toimia "
-#~ "kaikissa Linux-järjestelmissä, sekä x86 että x64."
-#~ msgid ""
-#~ "Note: if your computer is equipped with an Graphics Processing Unit "
-#~ "(GPU), you may be able to %suse it to compute faster%s"
-#~ msgstr ""
-#~ "Huom: jos tietokoneessasi on sopiva näytönohjain (GPU), saattaa olla "
-#~ "mahdollista käyttää sitä %slaskennassa%s"
-#~ msgid "TeraFLOPS."
-#~ msgstr "TeraFLOPSia."
-
diff --git a/locale/fr/BOINC-Client.mo b/locale/fr/BOINC-Client.mo
index b853016..0f2d50b 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
index a15cbf7..0333dc3 100755
--- a/locale/fr/BOINC-Client.po
+++ b/locale/fr/BOINC-Client.po
@@ -4,21 +4,21 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-10-15 22:25-0700\n"
-"PO-Revision-Date: 2015-02-10 22:27-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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
+#: acct_mgr.cpp:450 acct_mgr.cpp:459
 msgid "Message from account manager"
 msgstr "Message du gestionnaire de compte"
 
@@ -27,12 +27,17 @@ msgid "Message from server"
 msgstr "Message du serveur"
 
 #: client_state.cpp:258
-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."
+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."
 
 #: 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 ""
+"Écriture du fichier d'état impossible; vérifiez les droits des répertoires"
 
 #: cs_cmdline.cpp:303
 msgid "The HTTP_PROXY environment variable must specify an HTTP proxy"
@@ -40,11 +45,14 @@ msgstr "La variable d'environnement HTTP_PROXY doit définir un 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 "Vous avez utilisé la mauvaise URL pour ce projet. Retirez ce projet puis ajoutez de nouveau %s"
+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"
 
-#: cs_statefile.cpp:828
-#: ../sched/sched_types.cpp:259
+#: cs_statefile.cpp:828 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
 msgstr "Erreur de syntaxe dans app_info.xml"
 
@@ -56,18 +64,15 @@ msgstr "Le fichier référencé dans app_info.xml n'existe pas: "
 msgid "A new version of BOINC is available."
 msgstr "Une nouvelle version de BOINC est disponible."
 
-#: current_version.cpp:94
-#: current_version.cpp:102
+#: current_version.cpp:94 current_version.cpp:102
 msgid "Download"
 msgstr "Télécharger"
 
-#: log_flags.cpp:269
-#: log_flags.cpp:449
+#: log_flags.cpp:269 log_flags.cpp:449
 msgid "Unexpected text in cc_config.xml"
 msgstr "Texte incorrect dans cc_config.xml "
 
-#: log_flags.cpp:423
-#: log_flags.cpp:475
+#: log_flags.cpp:423 log_flags.cpp:475
 msgid "Unrecognized tag in cc_config.xml"
 msgstr "Balise non reconnue dans cc_config.xml"
 
@@ -85,15 +90,23 @@ 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."
+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."
 
 #: ../sched/handle_request.cpp:943
 msgid "This project doesn't support operating system"
@@ -104,8 +117,11 @@ msgid "This project doesn't support CPU type"
 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."
+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."
 
 #: ../sched/handle_request.cpp:1259
 msgid "This project doesn't support computers of type"
@@ -113,25 +129,38 @@ 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"
+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"
+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"
 
 #: ../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"
+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"
 
 # 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"
@@ -139,12 +168,17 @@ 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"
+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"
 
 #: ../sched/sched_types.cpp:254
 msgid "Unknown app name in app_info.xml"
@@ -156,49 +190,60 @@ 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 d3b4518..6a62fd7 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 e4dd2f2..8611ee4 100644
--- a/locale/fr/BOINC-Manager.po
+++ b/locale/fr/BOINC-Manager.po
@@ -1,61 +1,65 @@
-# Arnaud <bidibulle25_at_yahoo.fr>, 2007.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Arnaud <bidibulle25_at_yahoo.fr>, 2007
+# BUNS Nicolas, 2015
+# Jerome Cadet <jerome.cadet at pobox.com>, 2015
+# PINSET Romaric <pinset.romaric at gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-15 14:15-0500\n"
-"PO-Revision-Date: 2015-02-10 22:29-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: fr\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"
+"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"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc_7.4\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1421098383.0\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\n"
+"X-Poedit-Country: UNITED STATES\n"
+"X-Poedit-Language: English\n"
 "X-Poedit-SearchPath-0: clientgui\n"
-"X-Poedit-SearchPath-1: clientgui/msw\n"
-"X-Poedit-SearchPath-2: clientgui/gtk\n"
-"X-Poedit-SearchPath-3: clientgui/mac\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"
 
-# 81%
-#: clientgui/AccountInfoPage.cpp:387
+#: clientgui/AccountInfoPage.cpp:361
 #, c-format
 msgid "Identify your account at %s"
 msgstr "Identifiez votre compte à %s"
 
-#: clientgui/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 ""
-"Veuillez entrer les informations de votre compte\n"
-"(pour créer un compte, visitez le site web du projet)"
+msgstr "Veuillez entrer les informations de votre compte\n(pour créer un compte, visitez le site web du projet)"
 
-#: clientgui/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 ""
-"Ce projet n'accepte plus de nouveaux comptes pour le moment.\n"
-"Vous pouvez l'ajouter seulement si vous avez déjà un compte."
+msgstr "Ce projet n'accepte plus de nouveaux comptes pour le moment.\nVous pouvez l'ajouter seulement si vous avez déjà un compte."
 
-#: clientgui/AccountInfoPage.cpp:401
+#: clientgui/AccountInfoPage.cpp:375
 msgid "Are you already running this project?"
 msgstr "Participez-vous déjà à ce projet ?"
 
-#: clientgui/AccountInfoPage.cpp:405
+#: clientgui/AccountInfoPage.cpp:379
 msgid "&No, new user"
 msgstr "&Non, nouvel utilisateur"
 
-#: clientgui/AccountInfoPage.cpp:408
+#: clientgui/AccountInfoPage.cpp:382
 msgid "&Yes, existing user"
 msgstr "&Oui, utilisateur existant"
 
-#: clientgui/AccountInfoPage.cpp:413
+#: clientgui/AccountInfoPage.cpp:387
 msgid ""
 "We were not able to set up your account information\n"
 "automatically.\n"
@@ -63,128 +67,114 @@ msgid ""
 "Please click on the 'Find login information' link\n"
 "below to find out what to put in the email address and\n"
 "password fields."
-msgstr ""
-"Nous n'avons pas été en mesure de mettre en place vos informations de compte\n"
-"automatiquement.\n"
-"\n"
-"Veuillez cliquer sur le lien 'Rechercher les informations de connexion' \n"
-"ci-dessous pour savoir quoi mettre dans les champs adresse e-mail et\n"
-"mot de passe."
+msgstr "Nous n'avons pas été en mesure de mettre en place vos informations de compte\nautomatiquement.\n\nVeuillez cliquer sur le lien 'Rechercher les informations de connexion' \nci-dessous pour savoir quoi mettre dans les champs adresse e-mail et\nmot de passe."
 
-#: clientgui/AccountInfoPage.cpp:416
+#: clientgui/AccountInfoPage.cpp:390
 msgid "Find login information"
 msgstr "Trouvez les informations de connexion"
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:649
+#: clientgui/AccountInfoPage.cpp:410 clientgui/AccountInfoPage.cpp:632
 msgid "&Password:"
 msgstr "&Mot de passe:"
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:673
+#: clientgui/AccountInfoPage.cpp:417 clientgui/AccountInfoPage.cpp:656
 msgid "Choose a &password:"
 msgstr "Choisissez un &mot de passe:"
 
-#: clientgui/AccountInfoPage.cpp:446
+#: clientgui/AccountInfoPage.cpp:420
 msgid "C&onfirm password:"
 msgstr "C&onfirmez le mot de passe:"
 
-#: clientgui/AccountInfoPage.cpp:453
+#: clientgui/AccountInfoPage.cpp:427
 #, c-format
 msgid "Are you already running %s?"
 msgstr "Participez-vous déjà à %s ?"
 
-#: clientgui/AccountInfoPage.cpp:482
+#: clientgui/AccountInfoPage.cpp:456
 msgid "&Username:"
 msgstr "&Nom d'utilisateur:"
 
-#: clientgui/AccountInfoPage.cpp:511
+#: clientgui/AccountInfoPage.cpp:485
 msgid "&Email address or LDAP ID:"
-msgstr "Adresse &email ou ID LDAP:"
+msgstr "&adresse E-mail ou LDAP ID:"
 
-#: clientgui/AccountInfoPage.cpp:515
+#: clientgui/AccountInfoPage.cpp:489
 msgid "&Email address:"
 msgstr "&Adresse de courriel:"
 
-#: clientgui/AccountInfoPage.cpp:523
+#: clientgui/AccountInfoPage.cpp:497
 #, c-format
 msgid "minimum length %d"
 msgstr "longueur minimum %d"
 
-#: clientgui/AccountInfoPage.cpp:530
+#: clientgui/AccountInfoPage.cpp:504
 msgid "Forgot your password?"
 msgstr "Mot de passe oublié?"
 
-#: clientgui/AccountInfoPage.cpp:537
+#: 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 vous ne vous êtres pas encore inscrit à ce gestionnaire de compte, \n"
-"merci de la faire avant de continuer. Cliquez sur le lien ci-dessous pour \n"
-"vous enregistrer ou pour récupérer un mot de passe oublié."
+msgstr "Si vous ne vous êtres pas encore inscrit à ce gestionnaire de compte, \nmerci de la faire avant de continuer. Cliquez sur le lien ci-dessous pour \nvous enregistrer ou pour récupérer un mot de passe oublié."
 
-#: clientgui/AccountInfoPage.cpp:540
+#: clientgui/AccountInfoPage.cpp:514
 msgid "Account manager web site"
 msgstr "Site du gestionnaire de compte"
 
-# changement de terminologie boinc (cf. comm de David Anderson sur boinc_loc)
-#: clientgui/AccountInfoPage.cpp:582
+#: clientgui/AccountInfoPage.cpp:556
 msgid "Add project"
 msgstr "Ajouter un projet"
 
-#: clientgui/AccountInfoPage.cpp:584
+#: clientgui/AccountInfoPage.cpp:558
 msgid "Update account manager"
 msgstr "Mettre à jour le gestionnaire de compte"
 
-# changement de terminologie boinc (cf. comm de David Anderson sur boinc_loc)
-#: clientgui/AccountInfoPage.cpp:586
+#: clientgui/AccountInfoPage.cpp:560
 msgid "Use account manager"
 msgstr "Utiliser le gestionnaire de compte"
 
-#: clientgui/AccountInfoPage.cpp:593
+#: clientgui/AccountInfoPage.cpp:567
 msgid "Please enter a user name."
 msgstr "Veuillez saisir un nom d'utilisateur."
 
-#: clientgui/AccountInfoPage.cpp:595
+#: clientgui/AccountInfoPage.cpp:569
 msgid "Please enter an email address."
 msgstr "Veuillez saisir une adresse de courriel."
 
-#: clientgui/AccountInfoPage.cpp:605
+#: clientgui/AccountInfoPage.cpp:579
 #, c-format
 msgid "Please enter a password of at least %d characters."
 msgstr "Veuillez entrer un mot de passe d'au moins %d caractères."
 
-#: clientgui/AccountInfoPage.cpp:615
-msgid "The password and confirmation password do not match. Please type them again."
+#: clientgui/AccountInfoPage.cpp:589
+msgid ""
+"The password and confirmation password do not match. Please type them again."
 msgstr "Le mot de passe et la confirmation du mot de passe sont différents. Entrez-les à nouveau, svp."
 
-#: clientgui/AccountManagerInfoPage.cpp:272
+#: clientgui/AccountManagerInfoPage.cpp:270
 msgid "Choose an account manager"
 msgstr "Choisir un gestionnaire de compte"
 
-#: clientgui/AccountManagerInfoPage.cpp:275
+#: clientgui/AccountManagerInfoPage.cpp:273
 msgid ""
 "To choose an account manager, click its name or \n"
 "type its URL below."
-msgstr ""
-"Pour choisir un gestionnaire de compte, cliquez sur son nom\n"
-"ou tapez son URL ci-dessous."
+msgstr "Pour choisir un gestionnaire de compte, cliquez sur son nom\nou tapez son URL ci-dessous."
 
-#: clientgui/AccountManagerInfoPage.cpp:279
+#: clientgui/AccountManagerInfoPage.cpp:277
 msgid "Account manager details:"
 msgstr "Détails sur le gestionnaire de compte:"
 
-#: clientgui/AccountManagerInfoPage.cpp:283
+#: clientgui/AccountManagerInfoPage.cpp:281
 msgid "Account manager &URL:"
 msgstr "URL du gestionnaire de compte:"
 
-#: clientgui/AccountManagerInfoPage.cpp:287
+#: clientgui/AccountManagerInfoPage.cpp:285
 msgid "Open web page"
 msgstr "Ouvrir une page web"
 
-#: clientgui/AccountManagerInfoPage.cpp:290
+#: clientgui/AccountManagerInfoPage.cpp:288
 msgid "Visit this account manager's web site"
 msgstr "Visiter le site web du gestionnaire de compte"
 
@@ -208,324 +198,334 @@ msgstr "Veuillez patienter..."
 msgid "An internal server error has occurred.\n"
 msgstr "Une erreur interne du serveur a eu lieu.\n"
 
-#: clientgui/AdvancedFrame.cpp:96
+#: clientgui/AdvancedFrame.cpp:99
 msgid "Connected"
 msgstr "Connecté"
 
-#: clientgui/AdvancedFrame.cpp:104
+#: clientgui/AdvancedFrame.cpp:107
 msgid "Disconnected"
 msgstr "Déconnecté"
 
-#: clientgui/AdvancedFrame.cpp:318
+#: clientgui/AdvancedFrame.cpp:325
+#, c-format
+msgid "New %s window..."
+msgstr "Nouveauté %s fenêtre..."
+
+#: clientgui/AdvancedFrame.cpp:329
+#, c-format
+msgid "Open another %s window"
+msgstr "Ouvrir une autre %s fenêtre"
+
+#: clientgui/AdvancedFrame.cpp:340
+msgid "Select computer..."
+msgstr "Sélectionner un ordinateur..."
+
+#: clientgui/AdvancedFrame.cpp:341
+msgid "Connect to a BOINC client on another computer"
+msgstr "Se connecter au client BOINC depuis un autre ordinateur"
+
+#: clientgui/AdvancedFrame.cpp:345
+msgid "Shut down connected client..."
+msgstr "Arrêter le client connecté..."
+
+#: clientgui/AdvancedFrame.cpp:346
+msgid "Shut down the currently connected BOINC client"
+msgstr "Fermer le client BOINC actuellement connecté "
+
+#: clientgui/AdvancedFrame.cpp:351
 #, c-format
 msgid "Close the %s window"
 msgstr "Fermez la fenêtre %s"
 
-#: clientgui/AdvancedFrame.cpp:321
-msgid "&Close Window"
+#: clientgui/AdvancedFrame.cpp:354
+msgid "&Close window"
 msgstr "&Fermer la fenêtre"
 
-#: clientgui/AdvancedFrame.cpp:332
-#: clientgui/AdvancedFrame.cpp:339
-#: clientgui/AdvancedFrame.cpp:346
+#: clientgui/AdvancedFrame.cpp:363 clientgui/AdvancedFrame.cpp:368
+#: clientgui/AdvancedFrame.cpp:373
 #, c-format
 msgid "Exit %s"
 msgstr "Quitter %s"
 
-#: clientgui/AdvancedFrame.cpp:359
-msgid "Preferences..."
+#: clientgui/AdvancedFrame.cpp:386
+msgid "Preferences…"
 msgstr "Préférences..."
 
-#: clientgui/AdvancedFrame.cpp:368
+#: clientgui/AdvancedFrame.cpp:395
 msgid "&Notices\tCtrl+Shift+N"
 msgstr "&Remarques\tCtrl+Shift+N"
 
-#: clientgui/AdvancedFrame.cpp:369
-msgid "Display notices"
-msgstr "Afficher les remarques"
+#: clientgui/AdvancedFrame.cpp:396
+msgid "Show notices"
+msgstr "Montrer les notifications"
 
-#: clientgui/AdvancedFrame.cpp:374
+#: clientgui/AdvancedFrame.cpp:401
 msgid "&Projects\tCtrl+Shift+P"
 msgstr "&Projets\tCtrl+Shift+P"
 
-#: clientgui/AdvancedFrame.cpp:375
-msgid "Display projects"
-msgstr "Afficher les projets"
+#: clientgui/AdvancedFrame.cpp:402
+msgid "Show projects"
+msgstr "Monter les projets"
 
-#: clientgui/AdvancedFrame.cpp:380
+#: clientgui/AdvancedFrame.cpp:407
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr "&Tâches\tCtrl+Shift+T"
 
-#: clientgui/AdvancedFrame.cpp:381
-msgid "Display tasks"
-msgstr "Afficher les tâches"
+#: clientgui/AdvancedFrame.cpp:408
+msgid "Show tasks"
+msgstr "Montrer les tâches"
 
-#: clientgui/AdvancedFrame.cpp:386
+#: clientgui/AdvancedFrame.cpp:413
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr "Trans&ferts\tCtrl+Shift+X"
 
-#: clientgui/AdvancedFrame.cpp:387
-msgid "Display transfers"
-msgstr "Afficher les transferts"
+#: clientgui/AdvancedFrame.cpp:414
+msgid "Show file transfers"
+msgstr "Montrer les transferts de fichiers "
 
-#: clientgui/AdvancedFrame.cpp:392
+#: clientgui/AdvancedFrame.cpp:419
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "&Statistiques\tCtrl+Shift+S"
 
-#: clientgui/AdvancedFrame.cpp:393
-msgid "Display statistics"
-msgstr "Afficher les statistiques"
+#: clientgui/AdvancedFrame.cpp:420
+msgid "Show statistics"
+msgstr "Montrer les statistiques"
 
-#: clientgui/AdvancedFrame.cpp:398
-msgid "&Disk usage\tCtrl+Shift+D"
-msgstr "Utilisation &Disque\tCtrl+Shift+D"
+#: clientgui/AdvancedFrame.cpp:425
+msgid "&Disk\tCtrl+Shift+D"
+msgstr "&Disque⇥Ctrl+Shift+D"
 
-#: clientgui/AdvancedFrame.cpp:399
-msgid "Display disk usage"
-msgstr "Afficher l'utilisation disque"
+#: clientgui/AdvancedFrame.cpp:426
+msgid "Show disk usage"
+msgstr "Montrer l'utilisation du disque"
 
-#: clientgui/AdvancedFrame.cpp:406
+#: 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
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr "&Vue Simple...\tCTRL+SHIFT+S"
 
-#: clientgui/AdvancedFrame.cpp:407
-msgid "Display the simple graphical interface."
-msgstr "Affiche l'interface graphique simplifiée"
+#: clientgui/AdvancedFrame.cpp:440
+msgid "Switch to the Simple View"
+msgstr "Basculer en Vue Simplifié"
 
-#: clientgui/AdvancedFrame.cpp:421
+#: clientgui/AdvancedFrame.cpp:454
 msgid "&Add project or account manager..."
 msgstr "&Rejoindre un projet ou un gestionnaire de compte..."
 
-#: clientgui/AdvancedFrame.cpp:422
-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/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:426
+#: clientgui/AdvancedFrame.cpp:459
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "&Synchronisation avec %s"
 
-#: clientgui/AdvancedFrame.cpp:430
+#: clientgui/AdvancedFrame.cpp:463
 #, c-format
 msgid "Get current settings from %s"
 msgstr "Récupération des paramètres actuels de %s "
 
-# changement de terminologie boinc (cf. comm de David Anderson sur boinc_loc)
-#: clientgui/AdvancedFrame.cpp:440
+#: clientgui/AdvancedFrame.cpp:473
 msgid "&Add project..."
 msgstr "Ajouter un &projet..."
 
-# changement de terminologie boinc (cf. comm de David Anderson sur boinc_loc)
-#: clientgui/AdvancedFrame.cpp:441
+#: clientgui/AdvancedFrame.cpp:474
 msgid "Add a project"
 msgstr "Ajouter un projet"
 
-# Is this a serious real message ???
-#: clientgui/AdvancedFrame.cpp:444
+#: clientgui/AdvancedFrame.cpp:477
 #, c-format
 msgid "S&top using %s..."
 msgstr "&Arrêter d'utiliser %s..."
 
-#: clientgui/AdvancedFrame.cpp:450
+#: clientgui/AdvancedFrame.cpp:483
 msgid "Remove this computer from account manager control."
 msgstr "Enlever cet ordinateur du contrôle du gestionnaire de compte."
 
-#: clientgui/AdvancedFrame.cpp:455
-msgid "&Options..."
-msgstr "&Options..."
+#: clientgui/AdvancedFrame.cpp:489
+msgid "Run CPU &benchmarks"
+msgstr "Effectuer les &tests de puissance de votre CPU"
 
-#: clientgui/AdvancedFrame.cpp:456
-msgid "Configure display options and proxy settings"
-msgstr "Configuration des options d'affichage et des paramètres de proxy"
+#: clientgui/AdvancedFrame.cpp:490
+msgid "Run tests that measure CPU speed"
+msgstr "Effectuer les tests mesurant la vitesse des processeurs"
 
-#: clientgui/AdvancedFrame.cpp:460
-msgid "Computing &preferences..."
-msgstr "&Préférences de calcul..."
+#: clientgui/AdvancedFrame.cpp:494
+msgid "Retry pending transfers"
+msgstr "Réessayer les transferts en attente"
 
-#: clientgui/AdvancedFrame.cpp:461
-msgid "Configure computing preferences"
-msgstr "Configurer les préférences de calcul"
+#: clientgui/AdvancedFrame.cpp:495
+msgid "Retry deferred file transfers and task requests"
+msgstr "Réessayer les transferts de fichiers et les taches différés "
 
-#: clientgui/AdvancedFrame.cpp:469
+#: clientgui/AdvancedFrame.cpp:503
 msgid "&Run always"
 msgstr "&Calculer en permanence"
 
-#: clientgui/AdvancedFrame.cpp:470
+#: clientgui/AdvancedFrame.cpp:504
 msgid "Allow work regardless of preferences"
 msgstr "Autorise le travail sans tenir compte des préférences"
 
-#: clientgui/AdvancedFrame.cpp:474
+#: clientgui/AdvancedFrame.cpp:508
 msgid "Run based on &preferences"
 msgstr "Calculer selon les &préférences"
 
-#: clientgui/AdvancedFrame.cpp:475
+#: clientgui/AdvancedFrame.cpp:509
 msgid "Allow work according to preferences"
 msgstr "Autorise le travail selon les préférences"
 
-#: clientgui/AdvancedFrame.cpp:479
+#: clientgui/AdvancedFrame.cpp:513
 msgid "&Suspend"
 msgstr "&Suspendre"
 
-#: clientgui/AdvancedFrame.cpp:480
+#: clientgui/AdvancedFrame.cpp:514
 msgid "Stop work regardless of preferences"
 msgstr "Arrêter les calculs sans tenir compte des préférences"
 
-#: clientgui/AdvancedFrame.cpp:505
+#: clientgui/AdvancedFrame.cpp:539
 msgid "Use GPU always"
 msgstr "Toujours utiliser le GPU"
 
-#: clientgui/AdvancedFrame.cpp:506
+#: clientgui/AdvancedFrame.cpp:540
 msgid "Allow GPU work regardless of preferences"
 msgstr "Autorise le calcul GPU sans tenir compte des préférences"
 
-#: clientgui/AdvancedFrame.cpp:510
+#: clientgui/AdvancedFrame.cpp:544
 msgid "Use GPU based on preferences"
 msgstr "Utiliser le GPU selon les préférences"
 
-#: clientgui/AdvancedFrame.cpp:511
+#: clientgui/AdvancedFrame.cpp:545
 msgid "Allow GPU work according to preferences"
 msgstr "Autoriser le calcul GPU selon les préférences"
 
-#: clientgui/AdvancedFrame.cpp:515
+#: clientgui/AdvancedFrame.cpp:549
 msgid "Suspend GPU"
 msgstr "Suspendre le GPU"
 
-#: clientgui/AdvancedFrame.cpp:516
+#: clientgui/AdvancedFrame.cpp:550
 msgid "Stop GPU work regardless of preferences"
 msgstr "Arrête les calculs du GPU sans tenir compte des préférences"
 
-#: clientgui/AdvancedFrame.cpp:540
-msgid "Network activity always available"
-msgstr "Activité réseau toujours disponible"
+#: clientgui/AdvancedFrame.cpp:574
+msgid "Network activity always allowed"
+msgstr "Activité réseau autorisé en permanence"
 
-#: clientgui/AdvancedFrame.cpp:541
+#: clientgui/AdvancedFrame.cpp:575
 msgid "Allow network activity regardless of preferences"
 msgstr "Autoriser l'activité réseau sans tenir compte des préférences"
 
-#: clientgui/AdvancedFrame.cpp:545
+#: clientgui/AdvancedFrame.cpp:579
 msgid "Network activity based on preferences"
 msgstr "Activité réseau selon les préférences"
 
-#: clientgui/AdvancedFrame.cpp:546
+#: clientgui/AdvancedFrame.cpp:580
 msgid "Allow network activity according to preferences"
 msgstr "Autoriser l'activité réseau selon les préférences"
 
-#: clientgui/AdvancedFrame.cpp:550
+#: clientgui/AdvancedFrame.cpp:584
 msgid "Network activity suspended"
 msgstr "Activité réseau suspendue"
 
-#: clientgui/AdvancedFrame.cpp:551
+#: clientgui/AdvancedFrame.cpp:585
 msgid "Stop BOINC network activity"
 msgstr "Arrêter l'activité réseau de BOINC"
 
-#: clientgui/AdvancedFrame.cpp:561
-#, c-format
-msgid "Connect to another computer running %s"
-msgstr "Se connecter à un autre ordinateur travaillant sur %s"
+#: clientgui/AdvancedFrame.cpp:594
+msgid "Computing &preferences..."
+msgstr "&Préférences de calcul..."
 
-#: clientgui/AdvancedFrame.cpp:566
-msgid "Select computer..."
-msgstr "Sélectionner un ordinateur..."
+#: clientgui/AdvancedFrame.cpp:595
+msgid "Configure computing preferences"
+msgstr "Configurer les préférences de calcul"
 
-#: clientgui/AdvancedFrame.cpp:571
-msgid "Shut down connected client..."
-msgstr "Arrêter le client connecté..."
+#: clientgui/AdvancedFrame.cpp:600
+msgid "Exclusive applications..."
+msgstr "Applications exclusive..."
 
-#: clientgui/AdvancedFrame.cpp:572
-msgid "Shut down the currently connected client"
-msgstr "Arrêter le client actuellement connecté"
+#: clientgui/AdvancedFrame.cpp:601
+msgid "Configure exclusive applications"
+msgstr "Configurer les applications exclusives"
 
-#: clientgui/AdvancedFrame.cpp:576
-msgid "Run CPU &benchmarks"
-msgstr "Effectuer les &tests de puissance de votre CPU"
+#: clientgui/AdvancedFrame.cpp:606
+msgid "Select columns..."
+msgstr "Sélectionnez les colonnes"
 
-#: clientgui/AdvancedFrame.cpp:577
-msgid "Runs BOINC CPU benchmarks"
-msgstr "Effectue les tests de puissance BOINC de votre CPU"
+#: clientgui/AdvancedFrame.cpp:607
+msgid "Select which columns to display"
+msgstr "Sélectionnez les colonnes à montrer"
 
-#: clientgui/AdvancedFrame.cpp:581
-msgid "Do network communication"
-msgstr "Relancer les communications réseaux"
+#: clientgui/AdvancedFrame.cpp:611
+msgid "Event Log options...\tCtrl+Shift+F"
+msgstr "Options du Journal des événements... Ctrl+Shift+F"
 
-#: clientgui/AdvancedFrame.cpp:582
-msgid "Do all pending network communication"
-msgstr "Relancer toutes les communications réseau en attente"
+#: clientgui/AdvancedFrame.cpp:612
+msgid "Enable or disable various diagnostic messages"
+msgstr "Activer ou désactiver les messages de diagnostic divers"
 
-# 94%
-#: clientgui/AdvancedFrame.cpp:586
+#: clientgui/AdvancedFrame.cpp:616
+msgid "&Other options..."
+msgstr "& Autres options..."
+
+#: clientgui/AdvancedFrame.cpp:617
+msgid "Configure display options and network settings"
+msgstr "Configuration des options d'affichage et des paramètres réseaux"
+
+#: clientgui/AdvancedFrame.cpp:622
 msgid "Read config files"
 msgstr "Lire les fichiers de configuration"
 
-#: clientgui/AdvancedFrame.cpp:587
-msgid "Read configuration info from cc_config.xml and any app_config.xml files"
+#: clientgui/AdvancedFrame.cpp:623
+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:591
+#: clientgui/AdvancedFrame.cpp:627
 msgid "Read local prefs file"
 msgstr "Lire le fichier de préférences locales"
 
-#: clientgui/AdvancedFrame.cpp:592
+#: clientgui/AdvancedFrame.cpp:628
 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:597
-#, c-format
-msgid "Launch another instance of %s..."
-msgstr "Démarrer une nouvelle instance de %s..."
-
-#: clientgui/AdvancedFrame.cpp:601
-#, c-format
-msgid "Launch another %s"
-msgstr "Démarrer un autre %s"
-
-#: clientgui/AdvancedFrame.cpp:611
-msgid "Event Log...\tCtrl+Shift+E"
-msgstr "Journal des évènements...\t Ctrl+Shift+E"
-
-#: clientgui/AdvancedFrame.cpp:612
-msgid "Display diagnostic messages."
-msgstr "Afficher les messages de diagnostique."
-
-#: clientgui/AdvancedFrame.cpp:616
-msgid "Event Log Diagnostic Flags...\tCtrl+Shift+F"
-msgstr "Choix des diagnostiques du journal d'évènements...\tCtrl+Shift+F"
-
-#: clientgui/AdvancedFrame.cpp:617
-msgid "Enable or disable various diagnostic messages"
-msgstr "Activer ou désactiver divers messages de diagnostique "
-
-#: clientgui/AdvancedFrame.cpp:626
+#: clientgui/AdvancedFrame.cpp:636
 #, c-format
 msgid "%s &help"
 msgstr "&Aide sur %s"
 
-#: clientgui/AdvancedFrame.cpp:632
+#: clientgui/AdvancedFrame.cpp:640
 #, c-format
 msgid "Show information about %s"
 msgstr "Affiche les informations à propos de %s"
 
-#: clientgui/AdvancedFrame.cpp:644
+#: clientgui/AdvancedFrame.cpp:650
 #, c-format
 msgid "&%s help"
 msgstr "&Aide sur le %s"
 
-#: clientgui/AdvancedFrame.cpp:650
+#: clientgui/AdvancedFrame.cpp:654
 #, c-format
 msgid "Show information about the %s"
 msgstr "Affiche les informations à propos du %s"
 
-#: clientgui/AdvancedFrame.cpp:662
+#: clientgui/AdvancedFrame.cpp:665
 #, c-format
 msgid "%s &web site"
 msgstr "Site web de %s"
 
-#: clientgui/AdvancedFrame.cpp:668
+#: clientgui/AdvancedFrame.cpp:669
 #, 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:680 clientgui/BOINCTaskBar.cpp:544
 #, c-format
 msgid "&About %s..."
 msgstr "&A propos de %s..."
@@ -543,27 +543,27 @@ msgid "&View"
 msgstr "&Affichage"
 
 #: clientgui/AdvancedFrame.cpp:701
-msgid "&Tools"
-msgstr "&Outils"
-
-#: clientgui/AdvancedFrame.cpp:705
 msgid "&Activity"
 msgstr "&Activité"
 
+#: clientgui/AdvancedFrame.cpp:705
+msgid "&Options"
+msgstr "&Options..."
+
 #: clientgui/AdvancedFrame.cpp:709
-msgid "A&dvanced"
-msgstr "A&vancé"
+msgid "&Tools"
+msgstr "&Outils"
 
 #: clientgui/AdvancedFrame.cpp:713
 msgid "&Help"
 msgstr "&Aide"
 
-#: clientgui/AdvancedFrame.cpp:1185
+#: clientgui/AdvancedFrame.cpp:1188
 #, c-format
 msgid "%s - Stop using %s"
 msgstr "%s - Arrêter d'utiliser %s"
 
-#: clientgui/AdvancedFrame.cpp:1190
+#: clientgui/AdvancedFrame.cpp:1193
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -571,47 +571,41 @@ msgid ""
 "but you'll have to manage projects manually.\n"
 "\n"
 "Do you want to stop using %s?"
-msgstr ""
-"Si vous cessez d'utiliser %s, \n"
-"vous conserverez tous vos projets \n"
-"mais vous devrez les gérer manuellement.\n"
-"Voulez-vous cesser d'utiliser %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:1397
+#: clientgui/AdvancedFrame.cpp:1420
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s - Arrêter le client actuel..."
 
-#: clientgui/AdvancedFrame.cpp:1406
+#: clientgui/AdvancedFrame.cpp:1429
 #, 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é\n"
-"et vous invitera à vous connecter à un autre ordinateur."
+msgstr "%s arrêtera le client connecté\net vous invitera à vous connecter à un autre ordinateur."
 
-#: clientgui/AdvancedFrame.cpp:1806
+#: clientgui/AdvancedFrame.cpp:1832
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: clientgui/AdvancedFrame.cpp:1815
+#: clientgui/AdvancedFrame.cpp:1841
 #, c-format
 msgid "%s has successfully added %s"
 msgstr "%s a ajouté avec succès %s"
 
-#: clientgui/AdvancedFrame.cpp:1953
+#: clientgui/AdvancedFrame.cpp:1977
 #, c-format
 msgid "%s - (%s)"
 msgstr "%s - (%s)"
 
-#: clientgui/AdvancedFrame.cpp:1957
+#: clientgui/AdvancedFrame.cpp:1981
 #, c-format
 msgid "Connecting to %s"
 msgstr "Connexion à %s en cours"
 
-#: clientgui/AdvancedFrame.cpp:1960
+#: clientgui/AdvancedFrame.cpp:1984
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "Connecté à %s (%s)"
@@ -626,11 +620,7 @@ msgid ""
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"Un compte avec ce nom d'utilisateur existe déjà et a\n"
-"un mot de passe différent de celui que vous avez entré.\n"
-"\n"
-"Visitez le site web du projet et suivez ses instructions, svp."
+msgstr "Un compte avec ce nom d'utilisateur existe déjà et a\nun mot de passe différent de celui que vous avez entré.\n\nVisitez le site web du projet et suivez ses instructions, svp."
 
 #: clientgui/AlreadyExistsPage.cpp:191
 msgid "Email address already in use"
@@ -642,11 +632,7 @@ msgid ""
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"Un compte avec cette adresse de courriel existe déjà et a\n"
-"un mot de passe différent de celui que vous avez entré.\n"
-"\n"
-"Visitez le site web du projet et suivez ses instructions, svp"
+msgstr "Un compte avec cette adresse de courriel existe déjà et a\nun mot de passe différent de celui que vous avez entré.\n\nVisitez le site web du projet et suivez ses instructions, svp"
 
 #: clientgui/AsyncRPC.cpp:1031
 msgid "Communicating with BOINC client.  Please wait ..."
@@ -671,89 +657,76 @@ msgstr "%s - Communication"
 msgid "Cancel"
 msgstr "Annuler"
 
-#: clientgui/BOINCBaseFrame.cpp:504
+#: clientgui/BOINCBaseFrame.cpp:512
 #, c-format
 msgid "%s - Connection Error"
 msgstr "%s - Erreur de connexion"
 
-#: clientgui/BOINCBaseFrame.cpp:513
+#: 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 ""
-"Vous n'êtes actuellement pas autorisé à gérer le client. \n"
-"Demandez à votre administrateur système de vous ajouter au groupe local \"boinc_users\"."
+msgstr "Vous n'êtes actuellement pas autorisé à gérer le client. \nDemandez à votre administrateur système de vous ajouter au groupe local \"boinc_users\"."
 
-#: clientgui/BOINCBaseFrame.cpp:522
+#: 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 ""
-"L'autorisation de se connecter à un client a échoué.\n"
-"Assurez-vous que vous démarrer ce programme dans le même dossier que le client."
+msgstr "L'autorisation de se connecter à un client a échoué.\nAssurez-vous que vous démarrer ce programme dans le même dossier que le client."
 
-#: clientgui/BOINCBaseFrame.cpp:524
+#: clientgui/BOINCBaseFrame.cpp:532
 msgid "Authorization failed connecting to running client."
 msgstr "Autorisation de se connecter au client en cours d'exécution refusée."
 
-#: clientgui/BOINCBaseFrame.cpp:532
+#: clientgui/BOINCBaseFrame.cpp:540
 msgid "The password you have provided is incorrect, please try again."
 msgstr "Le mot de passe que vous avez fourni est incorrect, merci d'essayer à nouveau."
 
-#: clientgui/BOINCBaseFrame.cpp:576
+#: clientgui/BOINCBaseFrame.cpp:584
 #, c-format
 msgid "%s - Connection Failed"
 msgstr "%s - La connexion a échoué"
 
-#: clientgui/BOINCBaseFrame.cpp:585
+#: 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 n'a pas réussi à se connecter à un client %s.\n"
-"Voulez-vous tenter d'établir la connexion à nouveau?"
+msgstr "%s n'a pas réussi à se connecter à un client %s.\nVoulez-vous tenter d'établir la connexion à nouveau?"
 
-#: clientgui/BOINCBaseFrame.cpp:621
+#: clientgui/BOINCBaseFrame.cpp:629
 #, c-format
 msgid "%s - Daemon Start Failed"
 msgstr "%s - Le démarrage du service a échoué"
 
-#: clientgui/BOINCBaseFrame.cpp:631
+#: 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 ne peut pas démarrer un client %s.\n"
-"Merci d'ouvrir le Panneau de Contrôle->Outils d'Administration->Gestionnaire de Services et démarrez le service BOINC."
+msgstr "%s ne peut pas démarrer un client %s.\nMerci d'ouvrir le Panneau de Contrôle->Outils d'Administration->Gestionnaire de Services et démarrez le service BOINC."
 
-#: clientgui/BOINCBaseFrame.cpp:637
+#: 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 ne peut pas démarrer un client %s\n"
-"Merci de démarrer le service et de réessayer."
+msgstr "%s ne peut pas démarrer un client %s\nMerci de démarrer le service et de réessayer."
 
-#: clientgui/BOINCBaseFrame.cpp:688
+#: clientgui/BOINCBaseFrame.cpp:696
 #, c-format
 msgid "%s - Connection Status"
 msgstr "%s - État de la Connexion"
 
-#: clientgui/BOINCBaseFrame.cpp:699
+#: clientgui/BOINCBaseFrame.cpp:707
 #, 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"
 "To connect up to your local computer please use 'localhost' as the host name."
-msgstr ""
-"%s n'est actuellement pas connecté à un client %s.\n"
-"Veuillez utiliser l'option du menu 'Avancé\\Sélectionner un ordinateur...' pour vous connecter à un client %s.\n"
-"Pour vous connecter à votre ordinateur local, veuillez utiliser 'localhost' comme nom d'hôte."
+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."
 
-#: clientgui/BOINCBaseView.cpp:752
+#: clientgui/BOINCBaseView.cpp:790
 msgid "Project web pages"
 msgstr "Pages Web du projet"
 
@@ -767,9 +740,7 @@ msgstr "%s - Fermeture inattendue"
 msgid ""
 "The %s client has exited unexpectedly 3 times within the last %d minutes.\n"
 "Would you like to restart it again?"
-msgstr ""
-"Le client %s s'est terminé de façon inattendue 3 fois durant les dernières %d minutes.\n"
-"Voulez-vous le relancer ?"
+msgstr "Le client %s s'est terminé de façon inattendue 3 fois durant les dernières %d minutes.\nVoulez-vous le relancer ?"
 
 #: clientgui/BOINCDialupManager.cpp:61
 #, c-format
@@ -781,9 +752,7 @@ msgstr "%s - État du réseau"
 msgid ""
 "%s needs to connect to the Internet.\n"
 "May it do so now?"
-msgstr ""
-"%s a besoin de se connecter à l'Internet.\n"
-"Peut-il le faire maintenant?"
+msgstr "%s a besoin de se connecter à l'Internet.\nPeut-il le faire maintenant?"
 
 #: clientgui/BOINCDialupManager.cpp:254
 #, c-format
@@ -805,9 +774,7 @@ msgstr "%s n'a pas réussi à se connecter à Internet."
 msgid ""
 "%s has detected it is now connected to the Internet.\n"
 "Updating all projects and retrying all transfers."
-msgstr ""
-"%s a détecté qu'il est maintenant connecté à Internet.\n"
-"Mise à jour de tous les projets et essais de transfert en cours."
+msgstr "%s a détecté qu'il est maintenant connecté à Internet.\nMise à jour de tous les projets et essais de transfert en cours."
 
 #: clientgui/BOINCDialupManager.cpp:417
 #, c-format
@@ -819,7 +786,7 @@ msgstr "%s a réussi à se déconnecter d'Internet."
 msgid "%s failed to disconnected from the Internet."
 msgstr "%s n'a pas réussi à se déconnecter d'Internet."
 
-#: clientgui/BOINCGUIApp.cpp:595
+#: clientgui/BOINCGUIApp.cpp:597
 #, c-format
 msgid ""
 "You currently are not authorized to manage the client.\n"
@@ -830,102 +797,90 @@ msgid ""
 " or\n"
 "  - contact your administrator to add you to the 'boinc_master'\n"
 "     user group."
-msgstr ""
-"Vous n'êtes pas autorisé actuellement à gérer le client.\n"
-"\n"
-"Pour exécuter %s à l'aide de ce compte, merci de :\n"
-"- réinstaller %s en répondant \"Oui\" à la question sur\n"
-"les utilisateurs non-administrateurs\n"
-"ou\n"
-"- contacter votre administrateur pour qu'il ajoute ce compte au\n"
-"groupe utilisateur \"boinc_master\"."
-
-#: clientgui/BOINCGUIApp.cpp:601
+msgstr "Vous n'êtes pas autorisé actuellement à gérer le client.\n\nPour exécuter %s à l'aide de ce compte, merci de :\n- réinstaller %s en répondant \"Oui\" à la question sur\nles utilisateurs non-administrateurs\nou\n- contacter votre administrateur pour qu'il ajoute ce compte au\ngroupe utilisateur \"boinc_master\"."
+
+#: clientgui/BOINCGUIApp.cpp:603
 #, c-format
 msgid ""
 "%s ownership or permissions are not set properly; please reinstall %s.\n"
 "(Error code %d"
-msgstr ""
-"Les autorisations des fichiers %s ne sont pas paramétrées correctement; veuillez réinstaller %s.\n"
-"(Code erreur %d"
+msgstr "Les autorisations des fichiers %s ne sont pas paramétrées correctement; veuillez réinstaller %s.\n(Code erreur %d"
 
-#: clientgui/BOINCGUIApp.cpp:607
+#: clientgui/BOINCGUIApp.cpp:609
 msgid " at "
 msgstr " chez "
 
-#: clientgui/BOINCGUIApp.cpp:610
+#: clientgui/BOINCGUIApp.cpp:612
 msgid ")"
 msgstr ")"
 
-#: clientgui/BOINCGUIApp.cpp:640
+#: 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 ""
-"Un redémarrage est requis pour le bon fonctionnement de BOINC.\n"
-"Veuillez redémarrer votre ordinateur et réessayer."
+msgstr "Un redémarrage est requis pour le bon fonctionnement de BOINC.\nVeuillez redémarrer votre ordinateur et réessayer."
 
-#: clientgui/BOINCGUIApp.cpp:641
+#: clientgui/BOINCGUIApp.cpp:643
 msgid "BOINC Manager"
 msgstr "Manager BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:902
+#: clientgui/BOINCGUIApp.cpp:904
 msgid "BOINC Manager was started by the operating system automatically"
 msgstr "BOINC Manager a été démarré automatiquement par le système d'exploitation."
 
-#: clientgui/BOINCGUIApp.cpp:904
+#: clientgui/BOINCGUIApp.cpp:906
 msgid "Startup BOINC so only the system tray icon is visible"
 msgstr "Démarrer BOINC avec seulement l'icône de la barre des tâches visible"
 
-#: clientgui/BOINCGUIApp.cpp:906
+#: clientgui/BOINCGUIApp.cpp:908
 msgid "Directory containing the BOINC Client executable"
 msgstr "Répertoire contenant les fichiers exécutables de BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:907
+#: clientgui/BOINCGUIApp.cpp:909
 msgid "BOINC data directory"
 msgstr "Répertoire des données BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:909
+#: clientgui/BOINCGUIApp.cpp:911
 msgid "Host name or IP address"
 msgstr "Nom de l'hôte ou adresse IP"
 
-#: clientgui/BOINCGUIApp.cpp:910
+#: clientgui/BOINCGUIApp.cpp:912
 msgid "GUI RPC port number"
 msgstr "Numéro de port GUI RPC"
 
-#: clientgui/BOINCGUIApp.cpp:911
+#: clientgui/BOINCGUIApp.cpp:913
 msgid "Password"
 msgstr "Mot de passe"
 
-#: clientgui/BOINCGUIApp.cpp:912
+#: clientgui/BOINCGUIApp.cpp:914
 msgid "Startup BOINC with these optional arguments"
 msgstr "Démarrer BOINC avec ces arguments optionnels"
 
-#: clientgui/BOINCGUIApp.cpp:913
+#: clientgui/BOINCGUIApp.cpp:915
 msgid "disable BOINC security users and permissions"
 msgstr "désactiver les permissions et les sécurités utilisateur de BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:914
+#: clientgui/BOINCGUIApp.cpp:916
 msgid "set skin debugging mode to enable skin manager error messages"
 msgstr "sélectionner le mode débogage d'apparence pour activer les messages d'erreur du gestionnaire d'apparence"
 
-#: clientgui/BOINCGUIApp.cpp:915
+#: clientgui/BOINCGUIApp.cpp:917
 msgid "multiple instances of BOINC Manager allowed"
 msgstr "instances multiples du gestionnaire BOINC autorisées"
 
-#: clientgui/BOINCGUIApp.cpp:917
+#: clientgui/BOINCGUIApp.cpp:919
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr "Non utilisé: contournement du bogue dans XCode 4.2"
 
-#: clientgui/BOINCGUIApp.cpp:1164
+#: clientgui/BOINCGUIApp.cpp:1166
 msgid "(Automatic Detection)"
 msgstr "(Détection automatique)"
 
-#: clientgui/BOINCGUIApp.cpp:1165
+#: clientgui/BOINCGUIApp.cpp:1167
 msgid "(Unknown)"
 msgstr "(Inconnu)"
 
-#: clientgui/BOINCGUIApp.cpp:1166
+#: clientgui/BOINCGUIApp.cpp:1168
 msgid "(User Defined)"
 msgstr "(Défini par l'utilisateur)"
 
@@ -939,14 +894,12 @@ msgstr "Ouvre le site web de %s..."
 msgid "Open %s..."
 msgstr "Ouvrir %s..."
 
-#: clientgui/BOINCTaskBar.cpp:536
-#: clientgui/BOINCTaskBar.cpp:633
+#: clientgui/BOINCTaskBar.cpp:536 clientgui/BOINCTaskBar.cpp:633
 #: clientgui/BOINCTaskBar.cpp:641
 msgid "Snooze"
 msgstr "Mettre en veille"
 
-#: clientgui/BOINCTaskBar.cpp:538
-#: clientgui/BOINCTaskBar.cpp:660
+#: clientgui/BOINCTaskBar.cpp:538 clientgui/BOINCTaskBar.cpp:660
 #: clientgui/BOINCTaskBar.cpp:668
 msgid "Snooze GPU"
 msgstr "Mettre en veille le GPU"
@@ -1025,15 +978,10 @@ msgid ""
 "Please try again later.\n"
 "\n"
 "Click Finish to close."
-msgstr ""
-"Veuillez réessayer ultérieurement.\n"
-"\n"
-"Cliquer sur Terminer pour fermer."
+msgstr "Veuillez réessayer ultérieurement.\n\nCliquer sur Terminer pour fermer."
 
-#: 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 "Cliquez sur Fin pour fermer."
 
@@ -1053,9 +1001,7 @@ msgstr "Ce projet a été ajouté avec succès."
 msgid ""
 "When you click Finish, your web browser will go to a page where\n"
 "you can set your account name and preferences."
-msgstr ""
-"Quand vous cliquerez sur Fin, votre navigateur se rendra sur une page web\n"
-"vous pourrez régler vos préférences et votre nom de compte."
+msgstr "Quand vous cliquerez sur Fin, votre navigateur se rendra sur une page web\nvous pourrez régler vos préférences et votre nom de compte."
 
 #: clientgui/CompletionPage.cpp:232
 #, c-format
@@ -1101,590 +1047,684 @@ msgstr "Version de wxWidgets :"
 msgid "Copyright:"
 msgstr "Copyright :"
 
-# 98%
 #: clientgui/DlgAbout.cpp:192
 msgid ""
-"(C) 2003-2014 University of California, Berkeley.\n"
+"(C) 2003-2015 University of California, Berkeley.\n"
 "All Rights Reserved."
-msgstr ""
-"(C) 2003-2014 Université de Californie, Berkeley.\n"
-"Tous droits réservés."
+msgstr "(C) 2003-2015 Université de Californie, Berkeley.\nTous droits réservés."
 
 #: clientgui/DlgAbout.cpp:196
-msgid "Berkeley Open Infrastructure for Network Computing"
-msgstr "Berkeley Open Infrastructure for Network Computing"
+msgid "BOINC is distributed under the GNU Lesser General Public License v3.0."
+msgstr "BOINC est distribué sous la GNU Lesser General Public License v3.0."
 
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:399
+#: clientgui/DlgAbout.cpp:203
+msgid "Visit "
+msgstr "Visitez le site web"
+
+#: clientgui/DlgAbout.cpp:211
+msgid "for more information."
+msgstr "Pour plus d'informations."
+
+#: clientgui/DlgAbout.cpp:219 clientgui/DlgExitMessage.cpp:173
+#: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:399
 #: clientgui/DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "&OK"
 
-#: clientgui/DlgAdvPreferences.cpp:602
-msgid "invalid number"
+#: clientgui/DlgAdvPreferences.cpp:669
+msgid "Invalid number"
 msgstr "nombre invalide"
 
-#: clientgui/DlgAdvPreferences.cpp:603
-msgid "invalid time, format is HH:MM"
-msgstr "heure invalide, le format est HH:MM"
+#: clientgui/DlgAdvPreferences.cpp:670
+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
+msgid "Number must be between 0 and 10"
+msgstr "Le nombre doit être compris entre 0 et 10"
 
-#: clientgui/DlgAdvPreferences.cpp:604
-msgid "invalid time interval, format is HH:MM-HH:MM"
-msgstr "intervale de temps invalide, le format est HH:MM-HH:MM"
+#: clientgui/DlgAdvPreferences.cpp:672
+msgid "Number must be between 0 and 100"
+msgstr "Le nombre doit être compris entre 0 et 100"
 
-#: clientgui/DlgAdvPreferences.cpp:817
+#: clientgui/DlgAdvPreferences.cpp:905
 msgid "invalid input value detected"
 msgstr "valeur invalide détectée"
 
-#: clientgui/DlgAdvPreferences.cpp:819
+#: clientgui/DlgAdvPreferences.cpp:907
 msgid "Validation Error"
 msgstr "Erreur de Validation"
 
-#: clientgui/DlgAdvPreferences.cpp:969
-#: clientgui/DlgAdvPreferences.cpp:975
-#: clientgui/DlgAdvPreferences.cpp:981
-msgid "Applications to add"
-msgstr "Applications à ajouter"
-
-#: clientgui/DlgAdvPreferences.cpp:998
-#, c-format
-msgid "'%s' is not an executable application."
-msgstr "'%s' n'est pas une application exécutable."
+#: clientgui/DlgAdvPreferences.cpp:1119
+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:999
-#: clientgui/DlgAdvPreferences.cpp:1046
-#: clientgui/DlgAdvPreferences.cpp:1070
-msgid "Add Exclusive App"
-msgstr "Ajouter une application exclusive"
-
-#: clientgui/DlgAdvPreferences.cpp:1011
-msgid "Name of application to add?"
-msgstr "Nom de l'application à ajouter?"
-
-#: clientgui/DlgAdvPreferences.cpp:1011
-msgid "Add exclusive app"
-msgstr "Ajouter une application exclusive"
-
-#: clientgui/DlgAdvPreferences.cpp:1045
-#, c-format
-msgid "Application names must end with '%s'"
-msgstr "Les noms d'application doivent finir par '%s'"
+#: clientgui/DlgAdvPreferences.cpp:1120
+msgid "Confirmation"
+msgstr "Confirmation"
 
-#: clientgui/DlgAdvPreferences.cpp:1069
+#: clientgui/DlgAdvPreferencesBase.cpp:54
 #, c-format
-msgid "'%s' is already in the list."
-msgstr "'%s' est déjà dans la liste."
+msgid "%s - Computing preferences"
+msgstr "%s - Préférence de calcul"
 
-#: clientgui/DlgAdvPreferences.cpp:1161
+#: clientgui/DlgAdvPreferencesBase.cpp:77
 msgid ""
-"Do you really want to clear all local preferences?\n"
-"(This will not affect exclusive applications.)"
-msgstr ""
-"Voulez-vous réellement supprimer vos préférences locales ? \n"
-"(cela n'affectera pas vos applications exclusives)"
+"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/DlgAdvPreferences.cpp:1162
-msgid "Confirmation"
-msgstr "Confirmation"
+#: clientgui/DlgAdvPreferencesBase.cpp:85
+msgid "Using web-based preferences from"
+msgstr "Utilisation des préférences enregistrées sur le web"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:49
-#, c-format
-msgid "%s - Computing preferences"
-msgstr "%s - Préférences de calcul"
+#: clientgui/DlgAdvPreferencesBase.cpp:102
+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:66
+#: clientgui/DlgAdvPreferencesBase.cpp:111
 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 ""
-"Cette fenêtre contrôle les préférences pour cet ordinateur uniquement.\n"
-"Cliquez sur OK pour enregistrer ces préférences.\n"
-"Cliquez sur Effacer pour restaurer les paramètres du site internet(sauf les applications exclusives)."
+"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:69
+#: clientgui/DlgAdvPreferencesBase.cpp:114
 msgid "Clear"
 msgstr "Supprimer"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:70
-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:85
-msgid "processor usage"
-msgstr "utilisation du processeur"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:88
-msgid "network usage"
-msgstr "utilisation du réseau"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:91
-msgid "disk and memory usage"
-msgstr "utilisation du disque et de la mémoire"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:94
-msgid "exclusive applications"
-msgstr "applications exclusives"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:107
-#: clientgui/DlgDiagnosticLogFlags.cpp:104
-msgid "OK"
-msgstr "OK"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:108
-msgid "save all values and close the dialog"
-msgstr "sauvegarder toutes les valeurs et fermer la fenêtre"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:114
-msgid "close the dialog without saving"
-msgstr "fermer la fenêtre sans sauvegarder"
+#: clientgui/DlgAdvPreferencesBase.cpp:115
+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/Localization.cpp:35
-#: clientgui/Localization.cpp:121
-#: clientgui/Localization.cpp:139
-msgid "Help"
-msgstr "Aide"
+msgid "Use web prefs"
+msgstr "Utiliser les préférences web"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:119
-msgid "shows the preferences web page"
-msgstr "affiche la page web des préférences"
+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:141
-msgid "Computing allowed"
-msgstr "Calcul autorisé"
+#: clientgui/DlgAdvPreferencesBase.cpp:143
+#: clientgui/DlgAdvPreferencesBase.cpp:637
+msgid "Computing"
+msgstr "Calculs en cours"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:146
-msgid "While computer is on batteries"
-msgstr " Lorsque l'ordinateur est sur batterie"
+#: clientgui/DlgAdvPreferencesBase.cpp:785
+msgid "Network"
+msgstr "Utilisation du réseau"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:149
-msgid "check this if you want this computer to do work while it runs on batteries"
-msgstr "cocher si vous voulez que cet ordinateur calcule alors qu'il est sur batterie"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:155
-msgid "While computer is in use"
-msgstr " Lorsque l'ordinateur est utilisé"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:158
-msgid "check this if you want this computer to do work even when you're using it"
-msgstr "cocher si vous voulez que cet ordinateur calcule même si vous êtes en train de l'utiliser"
+msgid "Disk and memory"
+msgstr "Disque et mémoire"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:164
-msgid "Use GPU while computer is in use"
-msgstr "Utiliser le GPU lorsque l'ordinateur est utilisé"
+#: clientgui/DlgAdvPreferencesBase.cpp:152
+msgid "Daily schedules"
+msgstr "Planifications journalières"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:167
-msgid "check this if you want your GPU to do work even when you're using the computer"
-msgstr "cocher si vous voulez que le GPU de cet ordinateur calcule même si vous êtes en train de l'utiliser"
+#: clientgui/DlgAdvPreferencesBase.cpp:165
+#: clientgui/DlgDiagnosticLogFlags.cpp:119 clientgui/DlgExclusiveApps.cpp:146
+#: clientgui/DlgHiddenColumns.cpp:100
+msgid "OK"
+msgstr "OK"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:179
-msgid "Only after computer has been idle for"
-msgstr "Seulement quand l'ordinateur est en veille depuis"
+#: clientgui/DlgAdvPreferencesBase.cpp:166
+msgid "Save all values and close the dialog."
+msgstr "Enregistrer toutes les préférences et fermer la fenêtre."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:188
-msgid "do work only after you haven't used the computer for this number of minutes"
-msgstr "ne faire du calcul que si vous n'avez pas utilisé l'ordinateur durant le nombre de minutes suivant"
+#: clientgui/DlgAdvPreferencesBase.cpp:172
+msgid "Close the dialog without saving."
+msgstr "Fermer la fenêtre sans enregistrer les changements."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:193
-#: clientgui/DlgAdvPreferencesBase.cpp:342
-msgid "minutes"
-msgstr "minutes"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:212
-msgid "While processor usage is less than"
-msgstr "Tant que l'utilisation du processeur est inférieure à"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:221
-msgid "suspend work if processor usage exceeds this level"
-msgstr "suspendre le travail si l'utilisation du processeur dépasse ce niveau"
+#: clientgui/DlgAdvPreferencesBase.cpp:176 clientgui/DlgExclusiveApps.cpp:157
+msgid "Help"
+msgstr "Aide"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:226
-msgid "percent (0 means no restriction)"
-msgstr "pour-cent (0 signifie pas de restriction)"
+#: clientgui/DlgAdvPreferencesBase.cpp:177
+msgid "Shows the preferences web page."
+msgstr "Afficher la page web des préférences."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:240
-#: clientgui/DlgAdvPreferencesBase.cpp:506
-msgid "Every day between hours of"
-msgstr "Tous les jours entre les heures suivantes"
+#: clientgui/DlgAdvPreferencesBase.cpp:239
+#: clientgui/DlgAdvPreferencesBase.cpp:425
+msgid "Usage limits"
+msgstr "Les limites d'utilisation"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:244
-msgid "start work at this time"
-msgstr "commencer le travail à cette heure"
+#, 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:248
-#: clientgui/DlgAdvPreferencesBase.cpp:514
-msgid "and"
-msgstr "et"
+#: clientgui/DlgAdvPreferencesBase.cpp:246
+#: clientgui/DlgAdvPreferencesBase.cpp:258
+msgid "Use at most"
+msgstr "Utiliser au plus"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:252
-msgid "stop work at this time"
-msgstr "cesser le travail à cette heure"
+#: clientgui/DlgAdvPreferencesBase.cpp:251
+#, no-c-format
+msgid "% of the CPUs"
+msgstr "% du temps CPU"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:256
-#: clientgui/DlgAdvPreferencesBase.cpp:522
-msgid "(no restriction if equal)"
-msgstr "(pas de restriction si égaux)"
+#, 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."
+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:261
-#: clientgui/DlgAdvPreferencesBase.cpp:527
-msgid "Day-of-week override:"
-msgstr "Contrainte sur jours de la semaine:"
+#: clientgui/DlgAdvPreferencesBase.cpp:263
+#, no-c-format
+msgid "% of CPU time"
+msgstr "% du temps CPU"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:266
-#: clientgui/DlgAdvPreferencesBase.cpp:532
-msgid "check box to specify hours for this day of week"
-msgstr "cocher pour préciser les heures pour cette journée de la semaine"
+#: clientgui/DlgAdvPreferencesBase.cpp:270
+msgid "When to suspend"
+msgstr "Quand suspendre les calculs"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:272
-#: clientgui/DlgAdvPreferencesBase.cpp:538
-msgid "Monday"
-msgstr "Lundi"
+#: clientgui/DlgAdvPreferencesBase.cpp:276
+msgid "Suspend when computer is on battery"
+msgstr "Suspension quand l'ordinateur est sur batterie"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:279
-#: clientgui/DlgAdvPreferencesBase.cpp:545
-msgid "Tuesday"
-msgstr "Mardi"
+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:286
-#: clientgui/DlgAdvPreferencesBase.cpp:552
-msgid "Wednesday"
-msgstr "Mercredi"
+#: clientgui/DlgAdvPreferencesBase.cpp:285
+msgid "Suspend when computer is in use"
+msgstr "Suspendre les calculs lorsque l'ordinateur est utilisé"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:293
-#: clientgui/DlgAdvPreferencesBase.cpp:559
-msgid "Thursday"
-msgstr "Jeudi"
+#: clientgui/DlgAdvPreferencesBase.cpp:288
+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:300
-#: clientgui/DlgAdvPreferencesBase.cpp:566
-msgid "Friday"
-msgstr "Vendredi"
+#: clientgui/DlgAdvPreferencesBase.cpp:294
+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:307
-#: clientgui/DlgAdvPreferencesBase.cpp:573
-msgid "Saturday"
-msgstr "Samedi"
+#: clientgui/DlgAdvPreferencesBase.cpp:297
+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
+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
+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:580
-msgid "Sunday"
-msgstr "Dimanche"
+#: clientgui/DlgAdvPreferencesBase.cpp:387
+msgid "minutes"
+msgstr "minutes"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:321
+#, 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:328
-msgid "Other options"
-msgstr "Autres options"
+#: clientgui/DlgAdvPreferencesBase.cpp:323
+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:336
-msgid "Switch between applications every"
-msgstr "Changer d'application toutes les"
+#: clientgui/DlgAdvPreferencesBase.cpp:344
+#: clientgui/DlgAdvPreferencesBase.cpp:474
+msgid "Other"
+msgstr "Autre"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:345
-msgid "On multiprocessor systems, use at most"
-msgstr "Sur les systèmes multiprocesseurs, utiliser au plus"
+#: clientgui/DlgAdvPreferencesBase.cpp:349
+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
-#, no-c-format
-msgid "% of the processors (0 means no restriction)"
-msgstr "% des processeurs (0 pour ignorer ce paramètre)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:355
-#: clientgui/DlgAdvPreferencesBase.cpp:618
-#: clientgui/DlgAdvPreferencesBase.cpp:640
-#: clientgui/DlgAdvPreferencesBase.cpp:661
-#: clientgui/DlgAdvPreferencesBase.cpp:683
-#: clientgui/DlgAdvPreferencesBase.cpp:694
-msgid "Use at most"
-msgstr "Utiliser au plus"
+msgid "Store at least"
+msgstr "Stocker au moins"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:362
-#, no-c-format
-msgid "% of CPU time (0 means no restriction)"
-msgstr "% du temps CPU (0 signifie pas de restriction)"
+#: clientgui/DlgAdvPreferencesBase.cpp:360
+#: clientgui/DlgAdvPreferencesBase.cpp:376
+msgid "days of work"
+msgstr "jours de travail"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:386
-msgid "General options"
-msgstr "Options générales"
+#: clientgui/DlgAdvPreferencesBase.cpp:365
+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:395
-msgid "Maximum download rate"
-msgstr "Débit maximum de téléchargement descendant"
+#: clientgui/DlgAdvPreferencesBase.cpp:368
+msgid "Store up to an additional"
+msgstr "Stocker jusqu'à un additionnel"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:401
-#: clientgui/DlgAdvPreferencesBase.cpp:410
-msgid "KBytes/second (0 means no restriction)"
-msgstr "KOctets/seconde (0 signifie pas de restriction)"
+#: clientgui/DlgAdvPreferencesBase.cpp:381
+#, 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:404
-msgid "Maximum upload rate"
-msgstr "Débit maximum de téléchargement ascendant"
+#: clientgui/DlgAdvPreferencesBase.cpp:383
+msgid "Switch between tasks every"
+msgstr "Permuter entre les tâches toutes les"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:417
-msgid "Minimum work buffer"
-msgstr "Réserve de travail minimale"
+#: clientgui/DlgAdvPreferencesBase.cpp:391
+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:425
-msgid "Try to maintain enough tasks to keep busy for this many days"
-msgstr "Essayer d'avoir suffisamment de tâches pour rester actif durant ce nombre de jours"
+#: clientgui/DlgAdvPreferencesBase.cpp:392
+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
+msgid "seconds"
+msgstr "secondes"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:431
-#: clientgui/DlgAdvPreferencesBase.cpp:449
-msgid "days (maximum value: 10)"
-msgstr "jours (valeur maximum: 10)"
+msgid "Limit the download rate of file transfers."
+msgstr "Limiter le taux de transfert de fichiers descendant (download)."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:437
-msgid "Max additional work buffer"
-msgstr "Réserve de travail maximale"
+#: clientgui/DlgAdvPreferencesBase.cpp:432
+msgid "Limit download rate to"
+msgstr "Taux limite de téléchargement descendant"
 
+#: clientgui/DlgAdvPreferencesBase.cpp:436
 #: clientgui/DlgAdvPreferencesBase.cpp:445
-msgid "In addition, maintain enough tasks for up to this many days"
-msgstr "Additionnellement, avoir suffisamment de tâches pour au plus ce nombre de jours"
+msgid "KB/second"
+msgstr "KB/seconde"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:454
-msgid "Transfer at most"
-msgstr "Transférer au plus"
+#: clientgui/DlgAdvPreferencesBase.cpp:440
+msgid "Limit the upload rate of file transfers."
+msgstr "Limiter le taux de transferts de fichiers ascendant (upload)."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:462
-msgid "MBytes every"
-msgstr "MOctets chaque"
+#: clientgui/DlgAdvPreferencesBase.cpp:441
+msgid "Limit upload rate to"
+msgstr "Taux limite de téléchargement ascendant"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:452
+#, 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:468
-msgid "days (0 means no restriction)"
-msgstr "jours (0 signifie pas de restriction)"
+#: clientgui/DlgAdvPreferencesBase.cpp:454
+msgid "Limit usage to"
+msgstr "Limiter à"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:458
+msgid "MB every"
+msgstr "MB chaque"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:476
-msgid "Skip image file verification"
-msgstr " Ignorer la vérification du fichier image"
+#: clientgui/DlgAdvPreferencesBase.cpp:462
+msgid "days"
+msgstr "jours"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:478
-msgid "check this if your Internet provider modifies image files"
-msgstr "cocher si votre fournisseur d'accès Internet modifie les fichiers images"
+#: clientgui/DlgAdvPreferencesBase.cpp:479
+#, 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:484
-msgid "Connect options"
-msgstr "Options de connexion"
+#: clientgui/DlgAdvPreferencesBase.cpp:481
+msgid "Skip data verification for image files"
+msgstr "Ignorer la vérification des données pour les fichiers image"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:487
-msgid "Confirm before connecting to internet"
+#: clientgui/DlgAdvPreferencesBase.cpp:485
+msgid "Confirm before connecting to Internet"
 msgstr "Confirmer avant de se connecter à internet"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
-msgstr "si coché, un message de confirmation sera affiché avant d'essayer de se connecter à Internet"
+#: clientgui/DlgAdvPreferencesBase.cpp:486
+#: clientgui/DlgAdvPreferencesBase.cpp:490
+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:493
+#: clientgui/DlgAdvPreferencesBase.cpp:489
 msgid "Disconnect when done"
 msgstr "Se déconnecter dès que terminé"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:495
-msgid ""
-"if checked, BOINC hangs up when network usage is done\n"
-"(only relevant for dialup-connection)"
-msgstr ""
-"si coché, BOINC raccrochera dès que l'utilisation du réseau sera terminée\n"
-"(utile uniquement pour une connexion RTC)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:501
-msgid "Network usage allowed"
-msgstr "Utilisation du réseau autorisée"
+#: clientgui/DlgAdvPreferencesBase.cpp:516
+msgid "Disk"
+msgstr "Disque"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:510
-msgid "network usage start hour"
-msgstr "heure de début d'utilisation du réseau"
+#: clientgui/DlgAdvPreferencesBase.cpp:521
+#, 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:518
-msgid "network usage stop hour"
-msgstr "heure de fin d'utilisation du réseau"
+#: clientgui/DlgAdvPreferencesBase.cpp:527
+#, 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:610
-#: clientgui/DlgItemProperties.cpp:257
-msgid "Disk usage"
-msgstr "Utilisation du disque"
+#: clientgui/DlgAdvPreferencesBase.cpp:530
+#: clientgui/DlgAdvPreferencesBase.cpp:554
+msgid "Use no more than"
+msgstr "Ne pas utiliser plus de:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:622
-msgid "the maximum disk space used by BOINC (in Gigabytes)"
-msgstr "l'espace disque utilisé par BOINC au maximum (en Gigaoctets)"
+#: clientgui/DlgAdvPreferencesBase.cpp:534
+msgid "GB"
+msgstr "Go"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:626
-msgid "Gigabytes disk space (0 means no restriction)"
-msgstr "Espace disque en GigaOctets (0 signifie pas de restriction)"
+#: clientgui/DlgAdvPreferencesBase.cpp:539
+#, 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:629
+#: clientgui/DlgAdvPreferencesBase.cpp:542
 msgid "Leave at least"
 msgstr "Laisser au moins"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:633
-msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
-msgstr "BOINC laisse au minimum cette quantité d'espace disque libre (en Gigaoctets)"
+#: clientgui/DlgAdvPreferencesBase.cpp:546
+msgid "GB free"
+msgstr "GB libre"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:637
-msgid "Gigabytes disk space free"
-msgstr "Gigaoctets d'espace disque libre"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:644
-msgid "BOINC uses at most this percentage of total disk space"
-msgstr "BOINC utilise au maximum ce pourcentage d'espace disque total"
+#: clientgui/DlgAdvPreferencesBase.cpp:551
+#, 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:649
+#: clientgui/DlgAdvPreferencesBase.cpp:559
 #, no-c-format
-msgid "% of total disk space"
-msgstr "% de l'espace disque total"
+msgid "% of total"
+msgstr "% du total"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:652
-msgid "Tasks checkpoint to disk at most every"
-msgstr "Ecrire les points de contrôle sur le disque au plus toutes les"
+#: clientgui/DlgAdvPreferencesBase.cpp:566
+msgid "Memory"
+msgstr "Mémoire"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
-msgid "seconds"
-msgstr "secondes"
+#: clientgui/DlgAdvPreferencesBase.cpp:571
+#, 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
+msgid "When computer is in use, use at most"
+msgstr "Lorsque l'ordinateur est utilisé, utilisez au maximum"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:668
+#: clientgui/DlgAdvPreferencesBase.cpp:579
+#: clientgui/DlgAdvPreferencesBase.cpp:591
+#: clientgui/DlgAdvPreferencesBase.cpp:607
 #, no-c-format
-msgid "% of page file (swap space)"
-msgstr "% de la mémoire physique (espace swap)"
+msgid "%"
+msgstr "%"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:675
-msgid "Memory usage"
-msgstr "Utilisation mémoire"
+#: clientgui/DlgAdvPreferencesBase.cpp:584
+#, 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:691
-#, no-c-format
-msgid "% when computer is in use"
-msgstr "% quand l'ordinateur est utilisé"
+#: clientgui/DlgAdvPreferencesBase.cpp:586
+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:701
-#, no-c-format
-msgid "% when computer is idle"
-msgstr "% quand l'ordinateur n'est pas utilisé"
+#: clientgui/DlgAdvPreferencesBase.cpp:595
+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:706
-msgid "Leave applications in memory while suspended"
-msgstr " Laisser les applications en mémoire lorsqu'elles sont suspendues"
+#: 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."
+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:708
-msgid "if checked, suspended work units are left in memory"
-msgstr "si coché, les tâches suspendues seront laissées en mémoire"
+#: clientgui/DlgAdvPreferencesBase.cpp:600
+#, 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:728
-msgid "Suspend processor and network usage when these applications are running:"
-msgstr "Suspendre l'utilisation du processeur et l'activité réseau quand ces applications sont en cours:"
+#: clientgui/DlgAdvPreferencesBase.cpp:602
+msgid "Page/swap file: use at most"
+msgstr "Espace d'échange (swap) : utiliser au plus"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:738
-msgid "Add..."
-msgstr "Ajouter..."
+#: clientgui/DlgAdvPreferencesBase.cpp:627
+msgid "and"
+msgstr "et"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:739
-msgid "Add an application to this list"
-msgstr "Ajouter une application à cette liste"
+#: clientgui/DlgAdvPreferencesBase.cpp:628
+msgid "to"
+msgstr "à"
 
-# changement de terminologie boinc (cf. comm de David Anderson sur boinc_loc)
-#: clientgui/DlgAdvPreferencesBase.cpp:744
-msgid "Remove"
-msgstr "Retirer"
+#: clientgui/DlgAdvPreferencesBase.cpp:641
+msgid "Compute only during a particular period each day."
+msgstr "Autoriser les calculs seulement durant  une certaine période chaque jour."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:745
-msgid "Remove an application from this list"
-msgstr "Retirer une application de cette liste"
+#: clientgui/DlgAdvPreferencesBase.cpp:644
+msgid "Compute only between"
+msgstr "Réaliser des calculs seulement entre"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:754
-msgid "For advanced options, refer to "
-msgstr "Pour les paramètres avancés, se référer à"
+#: clientgui/DlgAdvPreferencesBase.cpp:654
+#: clientgui/DlgAdvPreferencesBase.cpp:801
+msgid "Day-of-week override"
+msgstr "Restreindre sur les jours de la semaine:"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:658
+#: clientgui/DlgAdvPreferencesBase.cpp:805
+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
+msgid "Monday"
+msgstr "Lundi"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:691
+#: clientgui/DlgAdvPreferencesBase.cpp:837
+msgid "Friday"
+msgstr "Vendredi"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:704
+#: clientgui/DlgAdvPreferencesBase.cpp:850
+msgid "Tuesday"
+msgstr "Mardi"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:719
+#: clientgui/DlgAdvPreferencesBase.cpp:865
+msgid "Saturday"
+msgstr "Samedi"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:732
+#: clientgui/DlgAdvPreferencesBase.cpp:878
+msgid "Wednesday"
+msgstr "Mercredi"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:747
+#: clientgui/DlgAdvPreferencesBase.cpp:893
+msgid "Sunday"
+msgstr "Dimanche"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:760
+#: clientgui/DlgAdvPreferencesBase.cpp:906
+msgid "Thursday"
+msgstr "Jeudi"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:789
+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
+msgid "Transfer files only between"
+msgstr "Transférer des fichiers seulement entre"
 
 #: clientgui/DlgDiagnosticLogFlags.cpp:65
 #, c-format
 msgid "%s Diagnostic Log Flags"
-msgstr "%s Paramétrage du journal de diagnostique"
+msgstr "Drapeaux de journal de diagnostic de %s"
 
 #: clientgui/DlgDiagnosticLogFlags.cpp:83
-msgid "These flags enable various types of diagnostic messages in the Event Log."
-msgstr "Ces choix activent divers types de message dans le journal d'évènements."
+msgid ""
+"These flags enable various types of diagnostic messages in the Event Log."
+msgstr "Ces indicateurs permettent différents types de messages de diagnostic dans le journal des événements."
+
+#: clientgui/DlgDiagnosticLogFlags.cpp:99
+msgid "More info ..."
+msgstr "Plus d'informations ..."
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:105
+#: clientgui/DlgDiagnosticLogFlags.cpp:120 clientgui/DlgHiddenColumns.cpp:101
 msgid "Save all values and close the dialog"
-msgstr "Sauvegarder toutes les valeurs et fermer la fenêtre"
+msgstr "Enregistrer toutes les valeurs et fermer la boîte de dialogue"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:108
+#: clientgui/DlgDiagnosticLogFlags.cpp:123 clientgui/DlgHiddenColumns.cpp:104
 msgid "Defaults"
-msgstr "Valeur par défaut"
+msgstr "Par défaut"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:109
+#: clientgui/DlgDiagnosticLogFlags.cpp:124 clientgui/DlgHiddenColumns.cpp:105
 msgid "Restore default settings"
-msgstr "Restaurer les valeurs par défaut"
+msgstr "Restaurer les paramètres par défaut"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:113
+#: clientgui/DlgDiagnosticLogFlags.cpp:128 clientgui/DlgHiddenColumns.cpp:109
 msgid "Close the dialog without saving"
 msgstr "Fermer la fenêtre sans sauvegarder"
 
-#: clientgui/DlgEventLog.cpp:226
+#: clientgui/DlgEventLog.cpp:227
 #, c-format
 msgid "%s - Event Log"
 msgstr "%s - Journal des événements"
 
-#: clientgui/DlgEventLog.cpp:236
+#: clientgui/DlgEventLog.cpp:237
 msgid "Project"
 msgstr "Projet"
 
-#: clientgui/DlgEventLog.cpp:237
+#: clientgui/DlgEventLog.cpp:238
 msgid "Time"
 msgstr "Date"
 
-#: clientgui/DlgEventLog.cpp:238
-msgid "Message"
-msgstr "Message"
+#: clientgui/DlgEventLog.cpp:239
+msgid "Message"
+msgstr "Message"
+
+#: clientgui/DlgEventLog.cpp:301 clientgui/DlgEventLog.cpp:351
+msgid "&Show only this project"
+msgstr "Ne montrer que ce projet"
+
+#: clientgui/DlgEventLog.cpp:305
+msgid "Copy &All"
+msgstr "Tout copier"
+
+#: clientgui/DlgEventLog.cpp:307 clientgui/DlgEventLog.cpp:311
+msgid "Copy all the messages to the clipboard."
+msgstr "Copie tous les messages dans le presse-papiers"
+
+#: clientgui/DlgEventLog.cpp:316
+msgid "Copy &Selected"
+msgstr "Copier la sélection"
+
+#: 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."
+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
+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 "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:336 clientgui/DlgItemProperties.cpp:67
+msgid "&Close"
+msgstr "&Fermer"
+
+#: clientgui/DlgEventLog.cpp:345
+msgid "Show all &messages"
+msgstr "Montrer tous les messages"
+
+#: clientgui/DlgEventLog.cpp:346 clientgui/DlgEventLog.cpp:348
+msgid "Show messages for all projects"
+msgstr "Montrer les messages de tous les projets."
+
+#: clientgui/DlgEventLog.cpp:352 clientgui/DlgEventLog.cpp:354
+msgid "Show only the messages for the selected project"
+msgstr "Ne montrer que les messages du projet sélectionné."
+
+#: clientgui/DlgExclusiveApps.cpp:60
+#, c-format
+msgid "%s - Exclusive Applications"
+msgstr "%s - Applications exclusives"
+
+#: clientgui/DlgExclusiveApps.cpp:72
+msgid ""
+"Suspend processor and network usage when these applications are running:"
+msgstr "Suspendre l'utilisation du processeur et l'activité réseau quand ces applications sont en cours:"
+
+#: clientgui/DlgExclusiveApps.cpp:80 clientgui/DlgExclusiveApps.cpp:104
+msgid "Add..."
+msgstr "Ajouter..."
+
+#: clientgui/DlgExclusiveApps.cpp:81 clientgui/DlgExclusiveApps.cpp:105
+msgid "Add an application to this list"
+msgstr "Ajouter une application à cette liste"
+
+#: clientgui/DlgExclusiveApps.cpp:86 clientgui/DlgExclusiveApps.cpp:110
+msgid "Remove"
+msgstr "Retirer"
 
-#: clientgui/DlgEventLog.cpp:300
-#: clientgui/DlgEventLog.cpp:364
-msgid "&Show only this project"
-msgstr "Ne montrer que ce projet"
+#: clientgui/DlgExclusiveApps.cpp:87 clientgui/DlgExclusiveApps.cpp:111
+msgid "Remove an application from this list"
+msgstr "Retirer une application de cette liste"
 
-#: clientgui/DlgEventLog.cpp:304
-msgid "Copy &All"
-msgstr "Tout copier"
+#: clientgui/DlgExclusiveApps.cpp:96
+msgid "Suspend GPU usage when these applications are running:"
+msgstr "Interrompre l'utilisation GPU lorsque ces applications sont exécutées :"
 
-#: clientgui/DlgEventLog.cpp:306
-#: clientgui/DlgEventLog.cpp:310
-msgid "Copy all the messages to the clipboard."
-msgstr "Copie tous les messages dans le presse-papiers"
+#: clientgui/DlgExclusiveApps.cpp:122
+msgid "For advanced options, refer to "
+msgstr "Pour les paramètres avancés, se référer à"
 
-#: clientgui/DlgEventLog.cpp:315
-msgid "Copy &Selected"
-msgstr "Copier la sélection"
+#: clientgui/DlgExclusiveApps.cpp:147
+msgid "save all values and close the dialog"
+msgstr "sauvegarder toutes les valeurs et fermer la fenêtre"
 
-#: clientgui/DlgEventLog.cpp:318
-#: clientgui/DlgEventLog.cpp:326
-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 "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/DlgExclusiveApps.cpp:153
+msgid "close the dialog without saving"
+msgstr "fermer la fenêtre sans sauvegarder"
 
-#: clientgui/DlgEventLog.cpp:320
-#: clientgui/DlgEventLog.cpp:328
-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 "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/DlgExclusiveApps.cpp:158
+msgid "shows the preferences web page"
+msgstr "affiche la page web des préférences"
 
-#: clientgui/DlgEventLog.cpp:335
-#: clientgui/DlgItemProperties.cpp:67
-msgid "&Close"
-msgstr "&Fermer"
+#: clientgui/DlgExclusiveApps.cpp:303 clientgui/DlgExclusiveApps.cpp:309
+#: clientgui/DlgExclusiveApps.cpp:315
+msgid "Applications to add"
+msgstr "Applications à ajouter"
 
-#: clientgui/DlgEventLog.cpp:344
+#: clientgui/DlgExclusiveApps.cpp:332
 #, c-format
-msgid "Get help with %s"
-msgstr "Obtenir de l'aide avec %s"
+msgid "'%s' is not an executable application."
+msgstr "'%s' n'est pas une application exécutable."
 
-#: clientgui/DlgEventLog.cpp:358
-msgid "Show all &messages"
-msgstr "Montrer tous les messages"
+#: clientgui/DlgExclusiveApps.cpp:333 clientgui/DlgExclusiveApps.cpp:380
+#: clientgui/DlgExclusiveApps.cpp:404
+msgid "Add Exclusive App"
+msgstr "Ajouter une application exclusive"
 
-#: clientgui/DlgEventLog.cpp:359
-#: clientgui/DlgEventLog.cpp:361
-msgid "Show messages for all projects"
-msgstr "Montrer les messages de tous les projets."
+#: clientgui/DlgExclusiveApps.cpp:345
+msgid "Name of application to add?"
+msgstr "Nom de l'application à ajouter?"
 
-#: clientgui/DlgEventLog.cpp:365
-#: clientgui/DlgEventLog.cpp:367
-msgid "Show only the messages for the selected project"
-msgstr "Ne montrer que les messages du projet sélectionné."
+#: clientgui/DlgExclusiveApps.cpp:345
+msgid "Add exclusive app"
+msgstr "Ajouter une application exclusive"
+
+#: clientgui/DlgExclusiveApps.cpp:379
+#, c-format
+msgid "Application names must end with '%s'"
+msgstr "Les noms d'application doivent finir par '%s'"
+
+#: clientgui/DlgExclusiveApps.cpp:403
+#, c-format
+msgid "'%s' is already in the list."
+msgstr "'%s' est déjà dans la liste."
 
 #: clientgui/DlgExitMessage.cpp:82
 #, c-format
@@ -1700,13 +1740,7 @@ msgid ""
 "\n"
 "If you also want to stop running the tasks,\n"
 "choose from the following options:"
-msgstr ""
-"Vous avez demandé à fermer le %s,\n"
-"qui vous permet de voir et gérer\n"
-"les tâches s'exécutant sur votre ordinateur.\n"
-"\n"
-"Si vous voulez également arrêter les applications en cours,\n"
-"choisissez parmi les options suivantes:"
+msgstr "Vous avez demandé à fermer le %s,\nqui vous permet de voir et gérer\nles tâches s'exécutant sur votre ordinateur.\n\nSi vous voulez également arrêter les applications en cours,\nchoisissez parmi les options suivantes:"
 
 #: clientgui/DlgExitMessage.cpp:135
 #, c-format
@@ -1717,13 +1751,7 @@ msgid ""
 "In most cases, it is better just to close the %s window\n"
 "rather than to exit the application; that will allow %s to run its\n"
 "tasks at the times you selected in your preferences."
-msgstr ""
-"Cela va entièrement arrêter %s et ses tâches jusqu'à ce que\n"
-"l'application %s ou l'écran de veille de %s soit redémarré.\n"
-"\n"
-"Dans la plupart des cas, mieux vaut simplement fermer la fenêtre du %s \n"
-"plutôt que de quitter l'application; cela permettra à %s de\n"
-"traiter les tâches aux moments que vous avez choisis dans les préférences."
+msgstr "Cela va entièrement arrêter %s et ses tâches jusqu'à ce que\nl'application %s ou l'écran de veille de %s soit redémarré.\n\nDans la plupart des cas, mieux vaut simplement fermer la fenêtre du %s \nplutôt que de quitter l'application; cela permettra à %s de\ntraiter les tâches aux moments que vous avez choisis dans les préférences."
 
 #: clientgui/DlgExitMessage.cpp:153
 #, c-format
@@ -1734,10 +1762,8 @@ msgstr "Arrêter les tâches en cours en quittant le %s"
 msgid "Remember this decision and do not show this dialog."
 msgstr "Se rappeler de cette décision et ne plus afficher cette fenêtre."
 
-#: clientgui/DlgExitMessage.cpp:178
-#: clientgui/DlgGenericMessage.cpp:125
-#: clientgui/DlgOptions.cpp:404
-#: clientgui/DlgSelectComputer.cpp:168
+#: clientgui/DlgExitMessage.cpp:178 clientgui/DlgGenericMessage.cpp:125
+#: clientgui/DlgOptions.cpp:404 clientgui/DlgSelectComputer.cpp:168
 msgid "&Cancel"
 msgstr "&Annuler"
 
@@ -1745,10 +1771,28 @@ msgstr "&Annuler"
 msgid "Don't show this dialog again."
 msgstr "Ne plus afficher cette fenêtre."
 
-#: clientgui/DlgItemProperties.cpp:194
-#: clientgui/DlgItemProperties.cpp:197
-#: clientgui/DlgItemProperties.cpp:200
-#: clientgui/DlgItemProperties.cpp:203
+#: clientgui/DlgHiddenColumns.cpp:64
+#, c-format
+msgid "%s Column Selection"
+msgstr "Sélection de colonnes %s"
+
+#: clientgui/DlgHiddenColumns.cpp:77
+#, c-format
+msgid "Select which columns %s should show."
+msgstr "Sélectionnez les colonnes que %s devrait montrer."
+
+#: clientgui/DlgHiddenColumns.cpp:314
+msgid ""
+"Are you sure you want to reset all list columns to the default "
+"configurations?"
+msgstr "Êtes-vous sûr de vouloir réinitialiser toutes les colonnes de la liste pour les configurations par défaut ?"
+
+#: clientgui/DlgHiddenColumns.cpp:315
+msgid "Confirm defaults"
+msgstr "Confirmer les valeurs par défaut"
+
+#: clientgui/DlgItemProperties.cpp:194 clientgui/DlgItemProperties.cpp:197
+#: clientgui/DlgItemProperties.cpp:200 clientgui/DlgItemProperties.cpp:203
 msgid "Don't fetch tasks for "
 msgstr "Ne pas charger de tâches pour "
 
@@ -1780,8 +1824,7 @@ msgstr "Intervalle d'ajournement de demande de travail"
 msgid "Properties of project "
 msgstr "Propriétés du projet "
 
-#: clientgui/DlgItemProperties.cpp:243
-#: clientgui/DlgOptions.cpp:221
+#: clientgui/DlgItemProperties.cpp:243 clientgui/DlgOptions.cpp:221
 msgid "General"
 msgstr "Général"
 
@@ -1813,23 +1856,22 @@ msgstr "Téléchargement de fichiers différé pour"
 msgid "File uploads deferred for"
 msgstr "Envoi de fichiers différé pour"
 
+#: clientgui/DlgItemProperties.cpp:257
+msgid "Disk usage"
+msgstr "Utilisation du disque"
+
 #: clientgui/DlgItemProperties.cpp:258
 msgid "Computer ID"
 msgstr "ID Ordinateur"
 
-# I don't know the context of this message
 #: clientgui/DlgItemProperties.cpp:260
 msgid "Non CPU intensive"
 msgstr "Sollicite peu le CPU"
 
-#: 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 "oui"
 
@@ -1837,8 +1879,7 @@ msgstr "oui"
 msgid "Suspended via GUI"
 msgstr "Suspendu via l'interface graphique"
 
-#: clientgui/DlgItemProperties.cpp:262
-#: clientgui/DlgItemProperties.cpp:263
+#: clientgui/DlgItemProperties.cpp:262 clientgui/DlgItemProperties.cpp:263
 msgid "no"
 msgstr "non"
 
@@ -1854,8 +1895,7 @@ msgstr "Requête au planificateur en cours"
 msgid "Trickle-up pending"
 msgstr "Envoi des notifications d'avancement en attente"
 
-#: clientgui/DlgItemProperties.cpp:271
-#: clientgui/DlgItemProperties.cpp:273
+#: clientgui/DlgItemProperties.cpp:271 clientgui/DlgItemProperties.cpp:273
 msgid "Host location"
 msgstr "Emplacement de l'hôte"
 
@@ -1881,7 +1921,7 @@ msgstr "Tâches terminées"
 
 #: clientgui/DlgItemProperties.cpp:286
 msgid "Tasks failed"
-msgstr "Tâches en erreur"
+msgstr "Tâches échouées"
 
 #: clientgui/DlgItemProperties.cpp:288
 msgid "Credit"
@@ -1947,13 +1987,11 @@ msgstr "Taille de tâche estimée"
 msgid "CPU time at last checkpoint"
 msgstr "Temps processeur au dernier point de sauvegarde"
 
-#: clientgui/DlgItemProperties.cpp:374
-#: clientgui/DlgItemProperties.cpp:389
+#: clientgui/DlgItemProperties.cpp:374 clientgui/DlgItemProperties.cpp:389
 msgid "CPU time"
 msgstr "Temps de calcul"
 
-#: clientgui/DlgItemProperties.cpp:376
-#: clientgui/DlgItemProperties.cpp:390
+#: clientgui/DlgItemProperties.cpp:376 clientgui/DlgItemProperties.cpp:390
 msgid "Elapsed time"
 msgstr "Temps écoulé"
 
@@ -1985,8 +2023,7 @@ msgstr "ID du process"
 msgid "Local: "
 msgstr "Local:"
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: clientgui/DlgOptions.cpp:129 clientgui/DlgOptions.cpp:135
 msgid "Options"
 msgstr "Options"
 
@@ -2050,33 +2087,27 @@ msgstr "Se connecter via un serveur proxy HTTP"
 msgid "HTTP Proxy Server Configuration"
 msgstr "Configuration d'un serveur proxy HTTP"
 
-#: clientgui/DlgOptions.cpp:283
-#: clientgui/DlgOptions.cpp:347
+#: clientgui/DlgOptions.cpp:283 clientgui/DlgOptions.cpp:347
 msgid "Address:"
 msgstr "Adresse:"
 
-#: clientgui/DlgOptions.cpp:291
-#: clientgui/DlgOptions.cpp:355
+#: clientgui/DlgOptions.cpp:291 clientgui/DlgOptions.cpp:355
 msgid "Port:"
 msgstr "Port:"
 
-#: clientgui/DlgOptions.cpp:299
-#: clientgui/DlgOptions.cpp:363
+#: clientgui/DlgOptions.cpp:299 clientgui/DlgOptions.cpp:363
 msgid "Don't use proxy for:"
 msgstr "Ne pas utiliser de proxy pour:"
 
-#: clientgui/DlgOptions.cpp:306
-#: clientgui/DlgOptions.cpp:370
+#: clientgui/DlgOptions.cpp:306 clientgui/DlgOptions.cpp:370
 msgid "Leave these blank if not needed"
 msgstr "Laisser vide si non nécessaire"
 
-#: clientgui/DlgOptions.cpp:312
-#: clientgui/DlgOptions.cpp:376
+#: clientgui/DlgOptions.cpp:312 clientgui/DlgOptions.cpp:376
 msgid "User Name:"
 msgstr "Nom d'utilisateur:"
 
-#: clientgui/DlgOptions.cpp:320
-#: clientgui/DlgOptions.cpp:384
+#: clientgui/DlgOptions.cpp:320 clientgui/DlgOptions.cpp:384
 #: clientgui/DlgSelectComputer.cpp:152
 msgid "Password:"
 msgstr "Mot de passe:"
@@ -2128,7 +2159,9 @@ msgstr "%s - Choix de la Langue"
 
 #: 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 "La langue par défaut du %s a été modifiée. Pour que le changement prenne effet, vous devez redémarrer le %s."
 
 #: clientgui/DlgSelectComputer.cpp:91
@@ -2141,16 +2174,13 @@ msgstr "%s - Sélectionner un ordinateur"
 msgid ""
 "Another instance of %s is already running \n"
 "on this computer.  Please select a client to monitor."
-msgstr ""
-"Une autre instance de %s est en cours d'exécution \n"
-"sur cet ordinateur. Veuillez sélectionnez un client à superviser."
+msgstr "Une autre instance de %s est en cours d'exécution \nsur cet ordinateur. Veuillez sélectionnez un client à superviser."
 
 #: clientgui/DlgSelectComputer.cpp:143
 msgid "Host name:"
 msgstr "Nom d'hôte:"
 
-#: clientgui/Localization.cpp:31
-#: clientgui/Localization.cpp:69
+#: clientgui/Localization.cpp:31 clientgui/Localization.cpp:69
 msgid "Message boards"
 msgstr "Forums"
 
@@ -2162,15 +2192,12 @@ msgstr "Discuter avec d'autres utilisateurs sur les forums de SETI at home"
 msgid "Ask questions and report problems"
 msgstr "Poser des questions et signaler des problèmes"
 
-#: 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 "Votre compte"
 
-#: 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 "Voir les infos de votre compte et les crédits totaux"
@@ -2183,18 +2210,15 @@ msgstr "Vos préférences"
 msgid "View and modify your SETI at home account profile and preferences"
 msgstr "Voir et modifier les préférences et le profil de votre compte SETI at home"
 
-#: clientgui/Localization.cpp:47
-#: clientgui/Localization.cpp:89
+#: clientgui/Localization.cpp:47 clientgui/Localization.cpp:89
 msgid "Your results"
 msgstr "Vos résultats"
 
-#: 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 "Voir la dernière semaine (ou plus) de travail et de résultats"
 
-#: clientgui/Localization.cpp:51
-#: clientgui/Localization.cpp:93
+#: clientgui/Localization.cpp:51 clientgui/Localization.cpp:93
 msgid "Your computers"
 msgstr "Vos ordinateurs"
 
@@ -2202,13 +2226,11 @@ msgstr "Vos ordinateurs"
 msgid "View a listing of all the computers on which you are running SETI at Home"
 msgstr "Voir une liste de tous les ordinateurs sur lesquels vous exécutez SETI at Home"
 
-#: clientgui/Localization.cpp:55
-#: clientgui/Localization.cpp:97
+#: clientgui/Localization.cpp:55 clientgui/Localization.cpp:97
 msgid "Your team"
 msgstr "Votre équipe"
 
-#: clientgui/Localization.cpp:57
-#: clientgui/Localization.cpp:99
+#: clientgui/Localization.cpp:57 clientgui/Localization.cpp:99
 msgid "View information about your team"
 msgstr "Voir les infos de votre équipe"
 
@@ -2229,7 +2251,8 @@ msgid "Read a detailed description of the Einstein at Home screensaver"
 msgstr "Lire une description détaillée de l'écran de veille Einstein at Home"
 
 #: 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 "Discuter avec les administrateurs et les autres utilisateurs sur les forums d'Einstein at Home"
 
 #: clientgui/Localization.cpp:73
@@ -2257,7 +2280,8 @@ msgid "Account summary"
 msgstr "Résumé du compte"
 
 #: 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 "Voir une liste de tous les ordinateurs sur lesquels vous exécutez Einstein at Home"
 
 #: clientgui/Localization.cpp:101
@@ -2265,7 +2289,9 @@ msgid "LIGO project"
 msgstr "Projet LIGO"
 
 #: 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 "La page d'accueil du projet LIGO (Laser Interferometer Gravitational-wave Observatory)"
 
 #: clientgui/Localization.cpp:105
@@ -2276,8 +2302,7 @@ msgstr "Projet GEO-600"
 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/Localization.cpp:115 clientgui/Localization.cpp:133
 msgid "Team"
 msgstr "Equipe"
 
@@ -2358,7 +2383,9 @@ msgid "Missing application"
 msgstr "Application manquante"
 
 #: 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 "Merci d'installer l'application CorD à partir de http://cord.sourceforge.net"
 
 #: clientgui/MainDocument.cpp:2442
@@ -2429,8 +2456,7 @@ msgstr "Echec du téléchargement"
 msgid "Downloading"
 msgstr "Téléchargement en cours"
 
-#: clientgui/MainDocument.cpp:2492
-#: clientgui/MainDocument.cpp:2557
+#: clientgui/MainDocument.cpp:2492 clientgui/MainDocument.cpp:2551
 msgid " (suspended - "
 msgstr " (suspendu - "
 
@@ -2442,101 +2468,99 @@ msgstr "Projet suspendu par l'utilisateur"
 msgid "Task suspended by user"
 msgstr "Tâche suspendue par l'utilisateur"
 
-#: clientgui/MainDocument.cpp:2504
+#: clientgui/MainDocument.cpp:2507
 msgid "Suspended - "
 msgstr "Suspendu - "
 
-# 75%
 #: clientgui/MainDocument.cpp:2510
 msgid "GPU suspended - "
 msgstr "Activité du GPU suspendue"
 
-#: clientgui/MainDocument.cpp:2517
+#: clientgui/MainDocument.cpp:2514
 msgid "Waiting for memory"
 msgstr "En attente de mémoire"
 
-#: clientgui/MainDocument.cpp:2519
+#: clientgui/MainDocument.cpp:2516
 msgid "Waiting for shared memory"
 msgstr "En attente de mémoire partagée"
 
-#: clientgui/MainDocument.cpp:2521
+#: clientgui/MainDocument.cpp:2518
 msgid "Running"
 msgstr "Calculs en cours"
 
-#: clientgui/MainDocument.cpp:2523
+#: clientgui/MainDocument.cpp:2520
 msgid " (non-CPU-intensive)"
 msgstr " (CPU-non-intensif)"
 
-#: clientgui/MainDocument.cpp:2526
+#: clientgui/MainDocument.cpp:2523
 msgid "Waiting to run"
 msgstr "Calculs en attente"
 
-#: clientgui/MainDocument.cpp:2528
-#: clientgui/MainDocument.cpp:2534
+#: clientgui/MainDocument.cpp:2525 clientgui/MainDocument.cpp:2528
 msgid "Ready to start"
 msgstr "Prêt à démarrer"
 
-#: clientgui/MainDocument.cpp:2538
+#: clientgui/MainDocument.cpp:2532
 msgid "Postponed: "
-msgstr "Retardé: "
+msgstr "Reporté : "
 
-#: clientgui/MainDocument.cpp:2541
+#: clientgui/MainDocument.cpp:2535
 msgid "Postponed"
-msgstr "Retardé"
+msgstr "Reporté"
 
-#: clientgui/MainDocument.cpp:2545
+#: clientgui/MainDocument.cpp:2539
 msgid "Waiting for network access"
-msgstr "En attente d’accès réseau"
+msgstr " En attente d’accès réseau"
 
-#: clientgui/MainDocument.cpp:2549
+#: clientgui/MainDocument.cpp:2543
 msgid "Computation error"
 msgstr "Erreur de calcul"
 
-#: clientgui/MainDocument.cpp:2553
+#: clientgui/MainDocument.cpp:2547
 msgid "Upload failed"
 msgstr "Echec de l'envoi"
 
-#: clientgui/MainDocument.cpp:2555
+#: clientgui/MainDocument.cpp:2549
 msgid "Uploading"
 msgstr "Envoi en cours"
 
-#: clientgui/MainDocument.cpp:2566
+#: clientgui/MainDocument.cpp:2560
 msgid "Aborted by user"
 msgstr "Abandonné par l'utilisateur"
 
-#: clientgui/MainDocument.cpp:2569
+#: clientgui/MainDocument.cpp:2563
 msgid "Aborted by project"
 msgstr "Annulé par le projet"
 
-#: clientgui/MainDocument.cpp:2572
+#: clientgui/MainDocument.cpp:2566
 msgid "Aborted: not started by deadline"
 msgstr "Avorté : non démarré dans le délai imparti"
 
-#: clientgui/MainDocument.cpp:2575
+#: clientgui/MainDocument.cpp:2569
 msgid "Aborted: disk limit exceeded"
 msgstr "Abandon: limite du disque excédée"
 
-#: clientgui/MainDocument.cpp:2578
+#: clientgui/MainDocument.cpp:2572
 msgid "Aborted: run time limit exceeded"
 msgstr "Abandon: limite du temps d'exécution excédée"
 
-#: clientgui/MainDocument.cpp:2581
+#: clientgui/MainDocument.cpp:2575
 msgid "Aborted: memory limit exceeded"
 msgstr "Abandon: limite de la mémoire excédée"
 
-#: clientgui/MainDocument.cpp:2584
+#: clientgui/MainDocument.cpp:2578
 msgid "Aborted"
 msgstr "Annulé"
 
-#: clientgui/MainDocument.cpp:2589
+#: clientgui/MainDocument.cpp:2583
 msgid "Acknowledged"
 msgstr "Confirmé"
 
-#: clientgui/MainDocument.cpp:2591
+#: clientgui/MainDocument.cpp:2585
 msgid "Ready to report"
 msgstr "Prêt à valider"
 
-#: clientgui/MainDocument.cpp:2593
+#: clientgui/MainDocument.cpp:2587
 #, c-format
 msgid "Error: invalid state '%d'"
 msgstr "Erreur: état invalide '%d'"
@@ -2558,10 +2582,7 @@ msgid ""
 "The URL you supplied is not that of a BOINC-based project.\n"
 "\n"
 "Please check the URL and try again."
-msgstr ""
-"L'URL que vous avez entrée n'est pas celle d'un projet basé sur BOINC.\n"
-"\n"
-"Veuillez vérifier l'URL et réessayer, svp."
+msgstr "L'URL que vous avez entrée n'est pas celle d'un projet basé sur BOINC.\n\nVeuillez vérifier l'URL et réessayer, svp."
 
 #: clientgui/NotDetectedPage.cpp:188
 msgid "Account manager not found"
@@ -2573,11 +2594,7 @@ msgid ""
 "manager.\n"
 "\n"
 "Please check the URL and try again."
-msgstr ""
-"L'URL que vous avez entrée n'est pas celle d'un\n"
-"gestionnaire de compte basé sur BOINC.\n"
-"\n"
-"Veuillez vérifier l'URL et réessayer, svp."
+msgstr "L'URL que vous avez entrée n'est pas celle d'un\ngestionnaire de compte basé sur BOINC.\n\nVeuillez vérifier l'URL et réessayer, svp."
 
 #: clientgui/NotFoundPage.cpp:181
 msgid "Login Failed."
@@ -2599,53 +2616,54 @@ msgstr "suivant..."
 msgid "Choose a project"
 msgstr "Choisissez un projet"
 
-#: clientgui/ProjectInfoPage.cpp:228
+#: clientgui/ProjectInfoPage.cpp:226
 msgid "To choose a project, click its name or type its URL below."
 msgstr "Pour choisir un projet, cliquez sur son nom ou tapez son URL ci-dessous."
 
-#: clientgui/ProjectInfoPage.cpp:246
+#: clientgui/ProjectInfoPage.cpp:242
 msgid "Categories:"
 msgstr "Catégories:"
 
-#: clientgui/ProjectInfoPage.cpp:267
+#: clientgui/ProjectInfoPage.cpp:262
 msgid "Projects:"
 msgstr "Projets:"
 
-#: clientgui/ProjectInfoPage.cpp:279
+#: clientgui/ProjectInfoPage.cpp:274
 msgid "Project details"
 msgstr "Détails du projet"
 
-#: clientgui/ProjectInfoPage.cpp:291
+#: clientgui/ProjectInfoPage.cpp:284
 msgid "Research area:"
 msgstr "Domaine de recherche:"
 
-#: clientgui/ProjectInfoPage.cpp:302
+#: clientgui/ProjectInfoPage.cpp:294
 msgid "Organization:"
 msgstr "Organisation:"
 
-#: clientgui/ProjectInfoPage.cpp:313
+#: clientgui/ProjectInfoPage.cpp:304
 msgid "Web site:"
 msgstr "Site Web:"
 
-#: clientgui/ProjectInfoPage.cpp:325
+#: clientgui/ProjectInfoPage.cpp:315
 msgid "Supported systems:"
 msgstr "Systèmes compatibles:"
 
-#: clientgui/ProjectInfoPage.cpp:363
+#: clientgui/ProjectInfoPage.cpp:352
 msgid "Project URL:"
 msgstr "URL du projet:"
 
-#: clientgui/ProjectInfoPage.cpp:499
-#: clientgui/ProjectInfoPage.cpp:754
-#: clientgui/ProjectInfoPage.cpp:758
+#: clientgui/ProjectInfoPage.cpp:486 clientgui/ProjectInfoPage.cpp:686
+#: clientgui/ProjectInfoPage.cpp:690
 msgid "All"
 msgstr "Tous"
 
-#: clientgui/ProjectInfoPage.cpp:802
-msgid "This project may not have work for your type of computer.  Do you want to add it anyway?"
+#: clientgui/ProjectInfoPage.cpp:735
+msgid ""
+"This project may not have work for your type of computer.  Do you want to "
+"add it anyway?"
 msgstr "Il se peut que ce projet n'ait pas d'unité de travail pour votre système d'exploitation. Êtes vous sur de vouloir l'ajouter?"
 
-#: clientgui/ProjectInfoPage.cpp:826
+#: clientgui/ProjectInfoPage.cpp:767
 msgid "You already added this project. Please choose a different project."
 msgstr "Vous avez déjà ajouté ce projet. Merci de choisir un projet différent."
 
@@ -2653,12 +2671,12 @@ msgstr "Vous avez déjà ajouté ce projet. Merci de choisir un projet différen
 msgid "Communicating with project."
 msgstr "Communication avec le projet en cours."
 
-#: clientgui/ProjectProcessingPage.cpp:510
+#: clientgui/ProjectProcessingPage.cpp:509
 msgid "Required files not found on the server."
 msgstr "Fichiers requis non trouvés sur le serveur."
 
-#: clientgui/ProjectProcessingPage.cpp:513
-#: clientgui/ProjectProcessingPage.cpp:586
+#: clientgui/ProjectProcessingPage.cpp:512
+#: clientgui/ProjectProcessingPage.cpp:585
 msgid "An internal server error has occurred."
 msgstr "Une erreur interne du serveur a eu lieu."
 
@@ -2666,18 +2684,16 @@ msgstr "Une erreur interne du serveur a eu lieu."
 msgid ""
 "Communicating with project\n"
 "Please wait..."
-msgstr ""
-"Communication avec le projet en cours \n"
-"Veuillez patienter..."
+msgstr "Communication avec le projet en cours \nVeuillez patienter..."
 
 #: clientgui/ProjectWelcomePage.cpp:251
 #, c-format
 msgid "Welcome to %s."
-msgstr "Bienvenue à %s."
+msgstr "Bienvenue sur %s."
 
 #: clientgui/ProjectWelcomePage.cpp:254
 msgid "You have volunteered to compute for this project:"
-msgstr "Vous êtes volontaire pour calculer bénévolement pour ce projet:"
+msgstr "Vous avez fait du bénévolat pour calculer ce projet :"
 
 #: clientgui/ProjectWelcomePage.cpp:255
 msgid "Name:"
@@ -2693,15 +2709,17 @@ msgstr "Description:"
 
 #: clientgui/ProjectWelcomePage.cpp:265
 msgid "URL:"
-msgstr "URL:"
+msgstr "URL :"
 
 #: clientgui/ProjectWelcomePage.cpp:268
 msgid "User:"
 msgstr "Utilisateur:"
 
 #: clientgui/ProjectWelcomePage.cpp:273
-msgid "WARNING: This project is not registered with BOINC.  Make sure you trust it before continuing."
-msgstr "ATTENTION: Ce projet n'est pas enregistrer avec BOINC. Soyez certain de pouvoir lui faire confiance avant de continuer."
+msgid ""
+"WARNING: This project is not registered with BOINC.  Make sure you trust it "
+"before continuing."
+msgstr "AVERTISSEMENT : Ce projet n'est pas enregistré avec BOINC.  Veillez à ce que vous lui faite confiance avant de continuer."
 
 #: clientgui/ProjectWelcomePage.cpp:277
 msgid "To continue, click Next."
@@ -2726,20 +2744,7 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"Le logiciel  World Community Grid - BOINC n'a pas réussi à communiquer avec l'Internet.\n"
-"Les raisons les plus probables sont :\n"
-"\n"
-"1) Un problème de connexion. Veuillez vérifier votre connexion au réseau ou à votre modem\n"
-"et pressez le bouton Retour pour essayer de nouveau.\n"
-"\n"
-"2) Un pare-feu personnel bloque le logiciel  World Community Grid - BOINC. Vous devez configurer\n"
-"votre pare-feu personnel afin de laisser BOINC et BOINC Manager communiquer\n"
-"par le port 80 et le port 443. Une fois cela réglé, cliquez sur Retour pour\n"
-"essayer à nouveau.\n"
-"\n"
-"3) Vous utilisez un serveur proxy.\n"
-"Cliquez sur Suivant pour configurer les paramètres proxy de BOINC."
+msgstr "Le logiciel  World Community Grid - BOINC n'a pas réussi à communiquer avec l'Internet.\nLes raisons les plus probables sont :\n\n1) Un problème de connexion. Veuillez vérifier votre connexion au réseau ou à votre modem\net pressez le bouton Retour pour essayer de nouveau.\n\n2) Un pare-feu personnel bloque le logiciel  World Community Grid - BOINC. Vous devez configurer\nvotre pare-feu personnel afin de laisser BOINC et BOINC Manager communiquer\npar le port 80 et le port 443. U [...]
 
 #: clientgui/ProxyInfoPage.cpp:203
 msgid ""
@@ -2756,20 +2761,7 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"BOINC n'a pas réussi à communiquer avec Internet.\n"
-"Les raisons les plus probables sont:\n"
-"\n"
-"1) Un problème de connexion. Veuillez vérifier votre connexion au réseau ou à votre modem\n"
-"et cliquez sur Retour pour essayer à nouveau.\n"
-"\n"
-"2) Un pare-feu personnel bloque BOINC.\n"
-"Vous devez configurer votre pare-feu personnel afin de laisser BOINC et\n"
-"le BOINC Manager communiquer par le port 80.\n"
-"Une fois cela réglé, cliquez sur Retour pour essayer à nouveau.\n"
-"\n"
-"3) Vous utilisez un serveur proxy.\n"
-"Cliquez sur Suivant pour configurer les paramètres proxy de BOINC."
+msgstr "BOINC n'a pas réussi à communiquer avec Internet.\nLes raisons les plus probables sont:\n\n1) Un problème de connexion. Veuillez vérifier votre connexion au réseau ou à votre modem\net cliquez sur Retour pour essayer à nouveau.\n\n2) Un pare-feu personnel bloque BOINC.\nVous devez configurer votre pare-feu personnel afin de laisser BOINC et\nle BOINC Manager communiquer par le port 80.\nUne fois cela réglé, cliquez sur Retour pour essayer à nouveau.\n\n3) Vous utilisez un serveur [...]
 
 #: clientgui/ProxyPage.cpp:331
 msgid "Proxy configuration"
@@ -2779,8 +2771,7 @@ msgstr "Configuration du Proxy"
 msgid "HTTP proxy"
 msgstr "Proxy HTTP"
 
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
+#: clientgui/ProxyPage.cpp:337 clientgui/ProxyPage.cpp:357
 msgid "Server:"
 msgstr "Serveur:"
 
@@ -2792,51 +2783,64 @@ msgstr "Détection automatique"
 msgid "SOCKS proxy"
 msgstr "Proxy SOCKS"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:167
+#: clientgui/sg_BoincSimpleFrame.cpp:166
+msgid "Skin"
+msgstr "Apparence"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:168
+msgid "Select the appearance of the user interface."
+msgstr "Choisissez l'apparence de l'interface utilisateur."
+
+#: clientgui/sg_BoincSimpleFrame.cpp:179
+msgid "Display diagnostic messages."
+msgstr "Afficher les messages de diagnostique."
+
+#: clientgui/sg_BoincSimpleFrame.cpp:184
 msgid "Advanced View...\tCtrl+Shift+A"
 msgstr "Vue Avancée\tCTRL+SHIFT+A"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:168
+#: clientgui/sg_BoincSimpleFrame.cpp:185
 msgid "Display the advanced graphical interface."
 msgstr "Afficher l'interface graphique avancée."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:175
-msgid "Skin"
-msgstr "Apparence"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:177
-msgid "Select the appearance of the user interface."
-msgstr "Choisissez l'apparence de l'interface utilisateur."
+#: clientgui/sg_BoincSimpleFrame.cpp:201
+msgid "Configure display options and proxy settings"
+msgstr "Configuration des options d'affichage et des paramètres de proxy"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:224
+#: clientgui/sg_BoincSimpleFrame.cpp:222
 #, c-format
 msgid "&%s"
 msgstr "&%s"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:405
+#: clientgui/sg_BoincSimpleFrame.cpp:396
 msgid "Default"
 msgstr "Valeur par défaut"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:848
+#: clientgui/sg_BoincSimpleFrame.cpp:838
 msgid "Suspend"
 msgstr "Suspendre"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:850
+#: clientgui/sg_BoincSimpleFrame.cpp:840
 msgid "Suspend Computing"
 msgstr "Suspendre le calcul"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:851
+#: clientgui/sg_BoincSimpleFrame.cpp:841
 msgid "Resume Computing"
 msgstr "Reprendre le calcul"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:867
+#: clientgui/sg_BoincSimpleFrame.cpp:857
 msgid "Notices"
 msgstr "Remarques"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:868
+#: clientgui/sg_BoincSimpleFrame.cpp:858
 msgid "Open a window to view notices from projects or BOINC"
 msgstr "Ouvrir une fenêtre pour voir les messages des projets ou de BOINC"
 
+#: clientgui/sg_BoincSimpleFrame.cpp:879
+#, c-format
+msgid "Get help with %s"
+msgstr "Obtenir de l'aide avec %s"
+
 #: clientgui/sg_DlgMessages.cpp:124
 msgid "Fetching notices; please wait..."
 msgstr "Recherche d'avis; patientez s'il-vous-plaît..."
@@ -2854,238 +2858,107 @@ msgstr "Fermer"
 msgid "%s - Notices"
 msgstr "Notifications de %s"
 
-#: clientgui/sg_DlgPreferences.cpp:270
-msgid "This dialog controls preferences for this computer only."
-msgstr "Cet écran permet de contrôler les préférences pour cet ordinateur uniquement."
-
-#: clientgui/sg_DlgPreferences.cpp:275
-msgid "Click OK to set preferences."
-msgstr "Cliquez sur OK pour enregistrer les préférences."
-
-#: clientgui/sg_DlgPreferences.cpp:280
-msgid "Click Clear to restore web-based settings for all preferences listed below."
-msgstr "Cliquer sur Effacer pour restaurer les paramètres du site pour toutes les préférences listées ci-dessous."
-
-#: clientgui/sg_DlgPreferences.cpp:287
-msgid "For additional settings, select Computing Preferences in the Advanced View."
+#: clientgui/sg_DlgPreferences.cpp:187
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
 msgstr "Pour des réglages supplémentaires, choisissez Préférences de Calcul dans la vue Avancée."
 
-#: clientgui/sg_DlgPreferences.cpp:315
-msgid "Do work only between:"
-msgstr "Travailler seulement entre:"
-
-#: clientgui/sg_DlgPreferences.cpp:337
-msgid "Connect to internet only between:"
-msgstr "Se connecter à internet seulement entre:"
-
-#: clientgui/sg_DlgPreferences.cpp:359
-#: clientgui/sg_DlgPreferences.cpp:376
-msgid "Use no more than:"
-msgstr "Ne pas utiliser plus de:"
-
-#: clientgui/sg_DlgPreferences.cpp:372
-msgid "of disk space"
-msgstr "d'espace disque"
-
-#: clientgui/sg_DlgPreferences.cpp:389
-msgid "of the processor"
-msgstr "du processeur"
-
-#: clientgui/sg_DlgPreferences.cpp:393
-msgid "Do work while on battery?"
-msgstr "Travailler lorsque l'ordinateur est sur batteries ?"
-
-#: clientgui/sg_DlgPreferences.cpp:406
-msgid "Do work after idle for:"
-msgstr "Travailler après que l'ordinateur soit inactif pendant:"
-
-#: clientgui/sg_DlgPreferences.cpp:431
-msgid "Clear all local preferences listed above and close the dialog"
-msgstr "Effacer toutes les préférences locales et fermer la fenêtre"
-
-#: clientgui/sg_DlgPreferences.cpp:609
-#: clientgui/sg_DlgPreferences.cpp:612
-#: clientgui/sg_DlgPreferences.cpp:688
-#: clientgui/sg_DlgPreferences.cpp:692
-#: clientgui/sg_DlgPreferences.cpp:704
-#: clientgui/sg_DlgPreferences.cpp:708
-#: clientgui/sg_DlgPreferences.cpp:851
-#: clientgui/sg_DlgPreferences.cpp:862
-msgid "Anytime"
-msgstr "N'importe quand"
-
-#: clientgui/sg_DlgPreferences.cpp:645
-msgid "100 MB"
-msgstr "100 MO"
-
-#: clientgui/sg_DlgPreferences.cpp:646
-msgid "200 MB"
-msgstr "200 MO"
-
-#: clientgui/sg_DlgPreferences.cpp:647
-msgid "500 MB"
-msgstr "500 MO"
-
-#: clientgui/sg_DlgPreferences.cpp:648
-msgid "1 GB"
-msgstr "1 GO"
-
-#: clientgui/sg_DlgPreferences.cpp:649
-msgid "2 GB"
-msgstr "2 GO"
-
-#: clientgui/sg_DlgPreferences.cpp:650
-msgid "5 GB"
-msgstr "5 GO"
-
-#: clientgui/sg_DlgPreferences.cpp:651
-msgid "10 GB"
-msgstr "10 GO"
-
-#: clientgui/sg_DlgPreferences.cpp:652
-msgid "20 GB"
-msgstr "20 GO"
-
-#: clientgui/sg_DlgPreferences.cpp:653
-msgid "50 GB"
-msgstr "50 GO"
-
-#: clientgui/sg_DlgPreferences.cpp:654
-msgid "100 GB"
-msgstr "100 GO"
-
-#: clientgui/sg_DlgPreferences.cpp:724
-#, c-format
-msgid "%d MB"
-msgstr "%d MO"
-
-#: clientgui/sg_DlgPreferences.cpp:726
-#, c-format
-msgid "%4.2f GB"
-msgstr "%4.2f GO"
-
-#: clientgui/sg_DlgPreferences.cpp:767
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: clientgui/sg_DlgPreferences.cpp:803
-msgid "0 (Run Always)"
-msgstr "0 (Toujours Calculer)"
-
-#: clientgui/sg_DlgPreferences.cpp:806
-#, c-format
-msgid "%d"
-msgstr "%d"
+#: clientgui/sg_DlgPreferences.cpp:289
+msgid "GB of disk space"
+msgstr "Go d'espace disque"
 
-#: clientgui/sg_DlgPreferences.cpp:953
+#: clientgui/sg_DlgPreferences.cpp:980
 #, c-format
 msgid "%s - Computing Preferences"
-msgstr "%s - Préférences de calculs"
+msgstr "%s - Préférences de calcul"
 
-#: clientgui/sg_DlgPreferences.cpp:1033
-msgid "Do you really want to clear all local preferences?\n"
-msgstr "Voulez-vous vraiment annuler toutes les préférences locales ?\n"
+#: clientgui/sg_DlgPreferences.cpp:1061
+msgid "Discard all local preferences and use web-based preferences?"
+msgstr "Remplacer les préférences locales par les préférences enregistrées sur le web ?"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:66
-#: clientgui/ViewProjects.cpp:179
 msgid "Update"
 msgstr "Mettre à jour"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:67
-#: clientgui/ViewProjects.cpp:180
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
+msgid ""
+"Report all completed tasks, get latest credit, get latest preferences, and "
+"possibly get more tasks."
 msgstr "Envoie le travail terminé, obtient les crédits les plus récents, met à jour les préférences, et si possible télécharge du travail."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:73
 #: clientgui/sg_ProjectCommandPopup.cpp:129
-#: clientgui/ViewProjects.cpp:187
-#: clientgui/ViewProjects.cpp:727
 msgid "Suspend tasks for this project."
 msgstr "Suspend le travail de ce projet."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:78
 #: clientgui/sg_ProjectCommandPopup.cpp:136
-#: clientgui/ViewProjects.cpp:193
-#: clientgui/ViewProjects.cpp:746
 msgid "No new tasks"
 msgstr "Pas de nouveau travail"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:79
-#: clientgui/ViewProjects.cpp:194
 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:200
 msgid "Reset project"
 msgstr "Recommencer le projet"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:85
-#: clientgui/ViewProjects.cpp:201
-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."
+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é."
 
-# changement de terminologie boinc (cf. comm de David Anderson sur boinc_loc)
 #: clientgui/sg_ProjectCommandPopup.cpp:91
-#: clientgui/ViewProjects.cpp:208
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
+msgid ""
+"Remove this project.  Tasks in progress will be lost (use 'Update' first to "
+"report any completed tasks)."
 msgstr "Retirer ce projet. Le travail en cours sera perdu. (Cliquez d'abord sur 'Mettre à jour' pour envoyer le travail terminé)."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:96
 #: clientgui/sg_TaskCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:214
 msgid "Properties"
 msgstr "Propriétés"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:97
-#: clientgui/ViewProjects.cpp:215
 msgid "Show project details."
 msgstr "Afficher les détails du projet."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:126
-#: clientgui/ViewProjects.cpp:723
 msgid "Resume tasks for this project."
 msgstr "Reprend le travail pour ce projet."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:133
-#: clientgui/ViewProjects.cpp:742
 msgid "Allow new tasks"
 msgstr "Autoriser du nouveau travail"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:134
-#: clientgui/ViewProjects.cpp:742
 msgid "Allow fetching new tasks for this project."
 msgstr "Autorise le téléchargement de nouveau travail pour ce projet."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:137
-#: clientgui/ViewProjects.cpp:746
 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
-#: clientgui/ViewProjects.cpp:443
 #, 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
-#: clientgui/ViewProjects.cpp:449
 msgid "Reset Project"
 msgstr "Recommencer le projet"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:266
-#: clientgui/ViewProjects.cpp:501
 #, 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
-#: clientgui/ViewProjects.cpp:507
 msgid "Remove Project"
 msgstr "Supprimer le projet"
 
-# changement de terminologie boinc (cf. comm de David Anderson sur boinc_loc)
 #: clientgui/sg_ProjectPanel.cpp:72
 msgid "Add Project"
 msgstr "Ajouter un projet"
@@ -3098,6 +2971,10 @@ msgstr "Synchroniser"
 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"
@@ -3161,9 +3038,7 @@ msgstr "Suspendre le calcul de cette unité."
 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)"
+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"
@@ -3234,52 +3109,51 @@ msgstr "Restant (estimation): %s"
 msgid "Status: %s"
 msgstr "Statut: %s"
 
-#: clientgui/sg_TaskPanel.cpp:1227
+#: clientgui/sg_TaskPanel.cpp:1228
 msgid "Retrieving current status."
 msgstr "Recherche de l'état actuel"
 
-#: clientgui/sg_TaskPanel.cpp:1233
+#: 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:1238
+#: clientgui/sg_TaskPanel.cpp:1239
 msgid "Processing Suspended:  Running On Batteries."
 msgstr "Traitement Suspendu: Fonctionne sur Batteries."
 
-#: clientgui/sg_TaskPanel.cpp:1240
+#: clientgui/sg_TaskPanel.cpp:1241
 msgid "Processing Suspended:  User Active."
 msgstr "Traitement Suspendu: Utilisateur Actif"
 
-#: clientgui/sg_TaskPanel.cpp:1242
+#: 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:1244
+#: clientgui/sg_TaskPanel.cpp:1245
 msgid "Processing Suspended:  Time of Day."
 msgstr "Traitement Suspendu: Moment de la Journée."
 
-#: clientgui/sg_TaskPanel.cpp:1246
+#: clientgui/sg_TaskPanel.cpp:1247
 msgid "Processing Suspended:  Benchmarks Running."
 msgstr "Traitement Suspendu: Tests de puissance de l'ordinateur."
 
-#: clientgui/sg_TaskPanel.cpp:1248
+#: clientgui/sg_TaskPanel.cpp:1249
 msgid "Processing Suspended."
 msgstr "Traitement Suspendu."
 
-#: clientgui/sg_TaskPanel.cpp:1252
+#: clientgui/sg_TaskPanel.cpp:1253
 msgid "Waiting to contact project servers."
 msgstr "En attente du contact des serveurs des projets."
 
-#: clientgui/sg_TaskPanel.cpp:1256
-#: clientgui/sg_TaskPanel.cpp:1265
+#: clientgui/sg_TaskPanel.cpp:1257 clientgui/sg_TaskPanel.cpp:1266
 msgid "Retrieving current status"
 msgstr "Recherche de l'état actuel"
 
-#: clientgui/sg_TaskPanel.cpp:1260
+#: clientgui/sg_TaskPanel.cpp:1261
 msgid "No work available to process"
 msgstr "Aucun travail disponible à traiter"
 
-#: clientgui/sg_TaskPanel.cpp:1262
+#: clientgui/sg_TaskPanel.cpp:1263
 msgid "Unable to connect to the core client"
 msgstr "Incapable de se connecter au client BOINC"
 
@@ -3308,10 +3182,7 @@ msgid ""
 "The project is temporarily unavailable.\n"
 "\n"
 "Please try again later."
-msgstr ""
-"Le projet est momentanément indisponible.\n"
-"\n"
-"Essayez plus tard, svp."
+msgstr "Le projet est momentanément indisponible.\n\nEssayez plus tard, svp."
 
 #: clientgui/UnavailablePage.cpp:190
 msgid "Account manager temporarily unavailable"
@@ -3322,10 +3193,7 @@ msgid ""
 "The account manager is temporarily unavailable.\n"
 "\n"
 "Please try again later."
-msgstr ""
-"Le gestionnaire de compte est momentanément indisponible.\n"
-"\n"
-"Essayez plus tard, svp."
+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."
@@ -3335,8 +3203,7 @@ msgstr "Entrez une clé d'identification pour continuer, svp."
 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
+#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
 msgid "Validation conflict"
 msgstr "Conflit de validation"
 
@@ -3357,34 +3224,23 @@ msgid ""
 "Please specify a URL.\n"
 "For example:\n"
 "http://www.example.com/"
-msgstr ""
-"Veuillez entrer une URL.\n"
-"Par exemple:\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
+#: 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: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.\n"
-"Par exemple:\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
+#: 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."
@@ -3395,7 +3251,6 @@ msgid "'%s' does not contain a valid path."
 msgstr "'%s' ne contient pas de chemin valide."
 
 #: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:175
 msgid "Commands"
 msgstr "Commandes"
 
@@ -3407,13 +3262,11 @@ msgstr "Copier tous les messages"
 msgid "Copy selected messages"
 msgstr "Copier les messages sélectionnés"
 
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
+#: 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
+#: 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é."
 
@@ -3441,125 +3294,120 @@ msgstr "Montrer tous les messages"
 msgid "Show messages for all projects."
 msgstr "Montre les messages pour tous les projets."
 
-#: clientgui/ViewProjects.cpp:225
+#: clientgui/ViewProjects.cpp:246 clientgui/ViewStatistics.cpp:426
 msgid "Account"
 msgstr "Compte"
 
-#: clientgui/ViewProjects.cpp:227
+#: clientgui/ViewProjects.cpp:248
 msgid "Work done"
 msgstr "Travail effectué"
 
-#: clientgui/ViewProjects.cpp:228
+#: clientgui/ViewProjects.cpp:249
 msgid "Avg. work done"
 msgstr "Travail moyen"
 
-#: clientgui/ViewProjects.cpp:230
+#: clientgui/ViewProjects.cpp:251 clientgui/ViewTransfers.cpp:215
+#: clientgui/ViewWork.cpp:262
 msgid "Status"
 msgstr "Etat"
 
-#: clientgui/ViewProjects.cpp:255
+#: clientgui/ViewProjects.cpp:330
 msgid "Projects"
 msgstr "Projets"
 
-#: clientgui/ViewProjects.cpp:307
+#: clientgui/ViewProjects.cpp:382
 msgid "Updating project..."
 msgstr "Mise à jour du projet en cours..."
 
-#: clientgui/ViewProjects.cpp:349
+#: clientgui/ViewProjects.cpp:424
 msgid "Resuming project..."
 msgstr "Reprise du projet en cours..."
 
-#: clientgui/ViewProjects.cpp:353
+#: clientgui/ViewProjects.cpp:428
 msgid "Suspending project..."
 msgstr "Suspension du projet en cours..."
 
-#: clientgui/ViewProjects.cpp:390
+#: clientgui/ViewProjects.cpp:465
 msgid "Telling project to allow additional task downloads..."
 msgstr "Informe le projet qu'il peut télécharger du travail supplémentaire..."
 
-#: clientgui/ViewProjects.cpp:394
+#: clientgui/ViewProjects.cpp:469
 msgid "Telling project to not fetch any additional tasks..."
 msgstr "Informe le projet de ne pas télécharger de travail supplémentaire..."
 
-#: clientgui/ViewProjects.cpp:430
+#: clientgui/ViewProjects.cpp:505
 msgid "Resetting project..."
 msgstr "Réinitialisation du projet en cours..."
 
-# changement de terminologie boinc (cf. comm de David Anderson sur boinc_loc)
-#: clientgui/ViewProjects.cpp:488
+#: clientgui/ViewProjects.cpp:563
 msgid "Removing project..."
 msgstr "En train de retirer le projet..."
 
-#: clientgui/ViewProjects.cpp:548
+#: clientgui/ViewProjects.cpp:623 clientgui/ViewWork.cpp:686
 msgid "Launching browser..."
 msgstr "Lancement du navigateur en cours..."
 
-#: clientgui/ViewProjects.cpp:1063
+#: clientgui/ViewProjects.cpp:1140
 msgid "Requested by user"
 msgstr "Demandé par l'utilisateur"
 
-#: clientgui/ViewProjects.cpp:1064
+#: clientgui/ViewProjects.cpp:1141
 msgid "To fetch work"
 msgstr "Pour demander du travail"
 
-#: clientgui/ViewProjects.cpp:1065
+#: clientgui/ViewProjects.cpp:1142
 msgid "To report completed tasks"
 msgstr "Pour rapporter une tâche terminée"
 
-# divers débat sur la traduction de trickle up ont eu lieu sur boinc_loc, pas de conclusion claire
-#: clientgui/ViewProjects.cpp:1066
+#: clientgui/ViewProjects.cpp:1143
 msgid "To send trickle-up message"
 msgstr "Pour envoyer les messages de progression de tâche"
 
-# changement de terminologie boinc (cf. comm de David Anderson sur boinc_loc)
-#: clientgui/ViewProjects.cpp:1067
+#: clientgui/ViewProjects.cpp:1144
 msgid "Requested by account manager"
 msgstr "Demandé par le gestionnaire de compte"
 
-#: clientgui/ViewProjects.cpp:1068
+#: clientgui/ViewProjects.cpp:1145
 msgid "Project initialization"
 msgstr "Initialisation du projet"
 
-#: clientgui/ViewProjects.cpp:1069
+#: clientgui/ViewProjects.cpp:1146
 msgid "Requested by project"
 msgstr "Demandé par le projet"
 
-#: clientgui/ViewProjects.cpp:1070
+#: clientgui/ViewProjects.cpp:1147
 msgid "Unknown reason"
 msgstr "Raison inconnue"
 
-#: clientgui/ViewProjects.cpp:1084
+#: clientgui/ViewProjects.cpp:1161
 msgid "Suspended by user"
 msgstr "Suspendu par l'utilisateur"
 
-#: clientgui/ViewProjects.cpp:1087
+#: clientgui/ViewProjects.cpp:1164
 msgid "Won't get new tasks"
 msgstr "Pas de nouveau travail"
 
-# changement de terminologie boinc (cf. comm de David Anderson sur boinc_loc)
-#: clientgui/ViewProjects.cpp:1090
+#: clientgui/ViewProjects.cpp:1167
 msgid "Project ended - OK to remove"
 msgstr "Projet terminé - OK pour le retirer."
 
-# changement de terminologie boinc (cf. comm de David Anderson sur boinc_loc)
-#: clientgui/ViewProjects.cpp:1093
+#: clientgui/ViewProjects.cpp:1170
 msgid "Will remove when tasks done"
 msgstr "Le projet sera retiré lorsque les tâches seront terminées"
 
-#: clientgui/ViewProjects.cpp:1096
+#: clientgui/ViewProjects.cpp:1173
 msgid "Scheduler request pending"
 msgstr "Requête au planificateur en attente"
 
-#: clientgui/ViewProjects.cpp:1102
+#: clientgui/ViewProjects.cpp:1179
 msgid "Scheduler request in progress"
 msgstr "Requête au planificateur en cours"
 
-# divers débat sur la traduction de trickle up ont eu lieu sur boinc_loc, pas de conclusion claire
-#: clientgui/ViewProjects.cpp:1105
+#: clientgui/ViewProjects.cpp:1182
 msgid "Trickle up message pending"
 msgstr "Message de progression de tâche en cours"
 
-#: clientgui/ViewProjects.cpp:1111
+#: clientgui/ViewProjects.cpp:1188
 msgid "Communication deferred "
 msgstr "Communication différée "
 
@@ -3571,31 +3419,27 @@ msgstr "Occupation totale du disque"
 msgid "Disk usage by BOINC projects"
 msgstr "Occupation du disque par les projets BOINC"
 
-#: clientgui/ViewResources.cpp:116
-msgid "Disk"
-msgstr "Disque"
-
 #: clientgui/ViewResources.cpp:225
 msgid "no projects: 0 bytes used"
 msgstr "Aucun projet: 0 octet utilisé"
 
-#: clientgui/ViewResources.cpp:262
+#: clientgui/ViewResources.cpp:259
 msgid "used by BOINC: "
 msgstr "utilisé par BOINC: "
 
-#: clientgui/ViewResources.cpp:272
+#: clientgui/ViewResources.cpp:269
 msgid "free, available to BOINC: "
 msgstr "libre, disponible pour BOINC: "
 
-#: clientgui/ViewResources.cpp:282
+#: clientgui/ViewResources.cpp:279
 msgid "free, not available to BOINC: "
 msgstr "libre, non disponible pour BOINC: "
 
-#: clientgui/ViewResources.cpp:292
+#: clientgui/ViewResources.cpp:289
 msgid "free: "
 msgstr "libre: "
 
-#: clientgui/ViewResources.cpp:302
+#: clientgui/ViewResources.cpp:299
 msgid "used by other programs: "
 msgstr "utilisé par d'autres programmes: "
 
@@ -3668,13 +3512,11 @@ msgstr "&Projet suivant >"
 msgid "Show chart for next project"
 msgstr "Montre le graphique du projet suivant"
 
-#: clientgui/ViewStatistics.cpp:2000
-#: clientgui/ViewStatistics.cpp:2390
+#: clientgui/ViewStatistics.cpp:2000 clientgui/ViewStatistics.cpp:2390
 msgid "Hide project list"
 msgstr "Masquer la liste de projets"
 
-#: clientgui/ViewStatistics.cpp:2001
-#: clientgui/ViewStatistics.cpp:2390
+#: clientgui/ViewStatistics.cpp:2001 clientgui/ViewStatistics.cpp:2390
 msgid "Use entire area for graphs"
 msgstr "Utilisez toute la zone pour les graphiques"
 
@@ -3718,16 +3560,11 @@ msgstr "Montre un graphique avec la somme de tous les projets"
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: clientgui/ViewStatistics.cpp:2077
-#: clientgui/ViewStatistics.cpp:2098
-#: clientgui/ViewStatistics.cpp:2119
-#: clientgui/ViewStatistics.cpp:2141
-#: clientgui/ViewStatistics.cpp:2162
-#: clientgui/ViewStatistics.cpp:2183
-#: clientgui/ViewStatistics.cpp:2204
-#: clientgui/ViewStatistics.cpp:2225
-#: clientgui/ViewStatistics.cpp:2246
-#: clientgui/ViewStatistics.cpp:2270
+#: clientgui/ViewStatistics.cpp:2077 clientgui/ViewStatistics.cpp:2098
+#: clientgui/ViewStatistics.cpp:2119 clientgui/ViewStatistics.cpp:2141
+#: clientgui/ViewStatistics.cpp:2162 clientgui/ViewStatistics.cpp:2183
+#: clientgui/ViewStatistics.cpp:2204 clientgui/ViewStatistics.cpp:2225
+#: clientgui/ViewStatistics.cpp:2246 clientgui/ViewStatistics.cpp:2270
 msgid "Updating charts..."
 msgstr "Mise à jour des diagrammes en cours..."
 
@@ -3739,205 +3576,188 @@ msgstr "Montrer la liste des projets"
 msgid "Uses smaller area for graphs"
 msgstr "Utilisez une zone plus petite pour les graphiques"
 
-#: clientgui/ViewTransfers.cpp:169
+#: clientgui/ViewTransfers.cpp:187
 msgid "Retry Now"
 msgstr "Réessayer maintenant"
 
-#: clientgui/ViewTransfers.cpp:170
+#: clientgui/ViewTransfers.cpp:188
 msgid "Retry the file transfer now"
 msgstr "Réassayez de transférer ce fichier maintenant."
 
-# erreur d'orthographe
-#: clientgui/ViewTransfers.cpp:176
+#: clientgui/ViewTransfers.cpp:194
 msgid "Abort Transfer"
 msgstr "Annuler le transfert"
 
-#: clientgui/ViewTransfers.cpp:177
+#: clientgui/ViewTransfers.cpp:195
 msgid "Abort this file transfer.  You won't get credit for the task."
 msgstr "Abandonner ce transfert de fichier. Vous ne recevrez pas de crédit pour cette tâche."
 
-#: clientgui/ViewTransfers.cpp:188
+#: clientgui/ViewTransfers.cpp:210
 msgid "File"
 msgstr "Fichier"
 
-#: clientgui/ViewTransfers.cpp:189
-#: clientgui/ViewWork.cpp:238
+#: clientgui/ViewTransfers.cpp:211 clientgui/ViewWork.cpp:261
 msgid "Progress"
 msgstr "Avancement"
 
-#: clientgui/ViewTransfers.cpp:190
+#: clientgui/ViewTransfers.cpp:212
 msgid "Size"
 msgstr "Taille"
 
-#: clientgui/ViewTransfers.cpp:191
-msgid "Elapsed Time"
-msgstr "Temps écoulé"
+#: clientgui/ViewTransfers.cpp:213 clientgui/ViewWork.cpp:263
+msgid "Elapsed"
+msgstr "Ecoulé"
 
-#: clientgui/ViewTransfers.cpp:192
+#: clientgui/ViewTransfers.cpp:214
 msgid "Speed"
 msgstr "Vitesse"
 
-#: clientgui/ViewTransfers.cpp:218
+#: clientgui/ViewTransfers.cpp:295
 msgid "Transfers"
 msgstr "Transferts"
 
-#: clientgui/ViewTransfers.cpp:285
+#: clientgui/ViewTransfers.cpp:362
 msgid "Network activity is suspended - "
 msgstr "Activité réseau suspendue - "
 
-#: clientgui/ViewTransfers.cpp:287
+#: clientgui/ViewTransfers.cpp:364
 msgid ""
 ".\n"
 "You can enable it using the Activity menu."
-msgstr ""
-".\n"
-"Vous pouvez l'activer par le menu Activité."
+msgstr ".\nVous pouvez l'activer par le menu Activité."
 
-#: clientgui/ViewTransfers.cpp:290
+#: clientgui/ViewTransfers.cpp:367
 msgid "BOINC"
 msgstr "BOINC"
 
-#: clientgui/ViewTransfers.cpp:297
+#: clientgui/ViewTransfers.cpp:374
 msgid "Retrying transfer now..."
 msgstr "Réessai du transfert en cours..."
 
-#: clientgui/ViewTransfers.cpp:335
+#: clientgui/ViewTransfers.cpp:412
 msgid "Aborting transfer..."
 msgstr "Annulation du transfert en cours..."
 
-#: clientgui/ViewTransfers.cpp:348
+#: 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' ?\n"
-"NOTE: L'abandon d'un transfert invalidera la tâche et\n"
-"vous ne recevrez pas de crédits pour cette tâche."
+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:354
+#: clientgui/ViewTransfers.cpp:431
 msgid "Abort File Transfer"
 msgstr "Annuler le transfert de fichier"
 
-#: clientgui/ViewTransfers.cpp:785
+#: clientgui/ViewTransfers.cpp:864
 msgid "Upload"
 msgstr "Envoi"
 
-#: clientgui/ViewTransfers.cpp:785
+#: clientgui/ViewTransfers.cpp:864
 msgid "Download"
 msgstr "Téléchargement"
 
-#: clientgui/ViewTransfers.cpp:789
+#: clientgui/ViewTransfers.cpp:868
 msgid "retry in "
 msgstr "réessayer dans "
 
-#: clientgui/ViewTransfers.cpp:791
+#: clientgui/ViewTransfers.cpp:870
 msgid "failed"
 msgstr "échoué"
 
-#: clientgui/ViewTransfers.cpp:794
+#: clientgui/ViewTransfers.cpp:873
 msgid "suspended"
 msgstr "suspendu"
 
-#: clientgui/ViewTransfers.cpp:799
+#: clientgui/ViewTransfers.cpp:878
 msgid "active"
 msgstr "actif"
 
-#: clientgui/ViewTransfers.cpp:801
+#: clientgui/ViewTransfers.cpp:880
 msgid "pending"
 msgstr "en attente"
 
-#: clientgui/ViewTransfers.cpp:808
+#: clientgui/ViewTransfers.cpp:887
 msgid " (project backoff: "
 msgstr " (retrait de projet: "
 
-#: clientgui/ViewWork.cpp:192
-#: clientgui/ViewWork.cpp:782
+#: clientgui/ViewWork.cpp:211 clientgui/ViewWork.cpp:864
 msgid "Show active tasks"
 msgstr "Montrer les tâches actives"
 
-#: clientgui/ViewWork.cpp:193
-#: clientgui/ViewWork.cpp:783
+#: clientgui/ViewWork.cpp:212 clientgui/ViewWork.cpp:865
 msgid "Show only active tasks."
 msgstr "Ne montre que les tâches actives."
 
-#: clientgui/ViewWork.cpp:206
+#: clientgui/ViewWork.cpp:225
 msgid "Show VM Console"
 msgstr "Montrer la console VM"
 
-#: clientgui/ViewWork.cpp:207
+#: clientgui/ViewWork.cpp:226
 msgid "Show VM Console in a window."
 msgstr "Montrer la console VM dans une fenêtre."
 
-#: clientgui/ViewWork.cpp:214
+#: clientgui/ViewWork.cpp:233
 msgid "Suspend work for this result."
 msgstr "Suspendre le calcul de cette unité."
 
-#: clientgui/ViewWork.cpp:221
+#: 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:240
-msgid "Elapsed"
-msgstr "Ecoulé"
-
-#: clientgui/ViewWork.cpp:241
+#: clientgui/ViewWork.cpp:264
 msgid "Remaining (estimated)"
 msgstr "Restant (estimation)"
 
-#: clientgui/ViewWork.cpp:242
+#: clientgui/ViewWork.cpp:265
 msgid "Deadline"
 msgstr "Date limite d'envoi"
 
-#: clientgui/ViewWork.cpp:269
+#: clientgui/ViewWork.cpp:351
 msgid "Tasks"
 msgstr "Tâches"
 
-#: clientgui/ViewWork.cpp:362
+#: clientgui/ViewWork.cpp:444
 msgid "Resuming task..."
 msgstr "Reprise de la tâche en cours..."
 
-#: clientgui/ViewWork.cpp:365
+#: clientgui/ViewWork.cpp:447
 msgid "Suspending task..."
 msgstr "Suspension de la tâche en cours..."
 
-#: clientgui/ViewWork.cpp:394
+#: clientgui/ViewWork.cpp:476
 msgid "Showing graphics for task..."
 msgstr "Affichage des graphiques de cette tâche en cours..."
 
-#: clientgui/ViewWork.cpp:431
+#: clientgui/ViewWork.cpp:513
 msgid "Showing VM console for task..."
 msgstr "Montrer la console VM pour la tâche..."
 
-#: clientgui/ViewWork.cpp:484
+#: 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)"
+msgstr "Etes-vous sûr de vouloir abandonner cette tâche '%s' ?\n(Avancement: %s, Etat: %s)"
 
-#: clientgui/ViewWork.cpp:490
+#: 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 ?"
 
-# 75%
-#: clientgui/ViewWork.cpp:504
+#: clientgui/ViewWork.cpp:586
 msgid "Aborting task..."
 msgstr "Annulation de la tâche..."
 
-#: clientgui/ViewWork.cpp:776
+#: clientgui/ViewWork.cpp:858
 msgid "Show all tasks"
 msgstr "Montrer toutes les tâches"
 
-#: clientgui/ViewWork.cpp:777
+#: clientgui/ViewWork.cpp:859
 msgid "Show all tasks."
 msgstr "Montre toutes les tâches."
 
-# changement de terminologie (annoncé par David Anderson sur boinc_loc)
 #: clientgui/WelcomePage.cpp:284
 msgid "Add project or account manager"
 msgstr "Ajouter un projet ou un gestionnaire de compte"
@@ -3954,11 +3774,7 @@ msgid ""
 "\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"
-"\n"
-"Les projets ajoutés via cet assistant ne seront pas\n"
-"listés ou gérables via %s."
+msgstr "De préférence, ajoutez les projets sur le site %s.\n\nLes projets ajoutés via cet assistant ne seront pas\nlistés ou gérables via %s."
 
 #: clientgui/WelcomePage.cpp:313
 msgid ""
@@ -3967,12 +3783,7 @@ msgid ""
 "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\n"
-"faisant de le recherche dans de nombreux domaines des sciences,\n"
-"et vous pouvez vous porter volontaire pour tous ceux que vous voudrez.\n"
-"Vous pouvez ajouter un projet directement,\n"
-"ou utiliser un site web 'Gestionnaire de Comptes' pour sélectionner des projets."
+msgstr "Il y a plus de 30 projets basés sur BOINC\nfaisant de le recherche dans de nombreux domaines des sciences,\net vous pouvez vous porter volontaire pour tous ceux que vous voudrez.\nVous pouvez ajouter un projet directement,\nou utiliser un site web 'Gestionnaire de Comptes' pour sélectionner des projets."
 
 #: clientgui/WelcomePage.cpp:325
 msgid ""
@@ -3987,14 +3798,7 @@ msgid ""
 "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.\n"
-"Quelques projets sont exécutés et administrés par World Community Grid, quand d'autres\n"
-"sont exécutés et administrés par d'autres chercheurs ou organisations. Le programme BOINC\n"
-"peut répartir la puissance de calcul que vous avez décidé de partager parmi une liste de projets.\n"
-"Sinon, si vous vous êtes enregistrés avec un Gestionnaire de compte BOINC, vous pouvez l'utiliser\n"
-"pour choisir quels projets supporter.\n"
-"S'il-vous-plaît, choisissez quel genre de changement vous voudriez faire:\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/WelcomePage.cpp:339
 msgid "Use a BOINC Account Manager"
@@ -4008,16 +3812,15 @@ msgstr "Ajouter ou modifier vos projets World Community Grid"
 msgid "Add projects run by other researchers or organizations"
 msgstr "Ajouter des projets réalisés par d'autres chercheurs ou organisations"
 
-#: clientgui/WizardAttach.cpp:673
+#: clientgui/WizardAttach.cpp:560
 msgid "Do you really want to cancel?"
 msgstr "Voulez-vous vraiment annuler ?"
 
-#: clientgui/WizardAttach.cpp:674
+#: clientgui/WizardAttach.cpp:561
 msgid "Question"
 msgstr "Question"
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
+#: clientgui/wizardex.cpp:377 clientgui/wizardex.cpp:553
 msgid "&Next >"
 msgstr "&Suivant >"
 
@@ -4031,7 +3834,7 @@ msgstr "&Fin"
 
 #: clientgui/common/wxPieCtrl.cpp:64
 msgid "Pie Ctrl"
-msgstr "Légende du Camembert"
+msgstr "Contrôle Camembert"
 
 #: clientgui/mac/Mac_GUI.cpp:35
 msgid "Services"
@@ -4055,336 +3858,10 @@ msgstr "Montrer tout"
 msgid "Quit %s"
 msgstr "Quitter %s"
 
-#: clientgui/DlgAdvPreferences.h:30
-msgid "specify work start and stop hours in format HH:MM-HH:MM"
-msgstr "spécifiez les heures de début et de fin de travail dans le format HH:MM-HH:MM"
-
-#: clientgui/DlgAdvPreferences.h:31
-msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
-msgstr "spécifiez les heures de début et de fin d'utilisation du réseau dans le format HH:MM-HH:MM"
-
-# 98%
-#~ msgid ""
-#~ "(C) 2003-2013 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2013 Université de Californie, Berkeley.\n"
-#~ "Tous droits réservés."
-#, c-format
-#~ msgid "%s - Preferences"
-#~ msgstr "%s - Préférences"
-
-#, no-c-format
-#~ msgid "% of the processors (0 means ignore this setting)"
-#~ msgstr "% des processeurs (0 pour ignorer ce paramètre)"
-
-#, no-c-format
-#~ msgid "% CPU time"
-#~ msgstr "% du temps processeur"
-#~ msgid "KBytes/sec."
-#~ msgstr "KOctets/sec."
-#~ msgid "Mbytes"
-#~ msgstr "Moctets"
-#~ msgid "every"
-#~ msgstr "chaque"
-#~ msgid "days"
-#~ msgstr "jours"
-#~ msgid "Gigabytes disk space"
-#~ msgstr "Gigaoctets d'espace disque"
-#~ msgid "Running, high priority"
-#~ msgstr "En cours d'exécution, priorité haute"
-#~ msgid " (Scheduler wait: "
-#~ msgstr " (Attente de planification: "
-#~ msgid " (Scheduler wait)"
-#~ msgstr "(En attente de planification)"
-#~ msgid " (Waiting for network access)"
-#~ msgstr " (En attente d’accès réseau)"
-#~ msgid "Preferences…"
-#~ msgstr "Préférences..."
-#~ msgid "I do not agree with the terms of use."
-#~ msgstr "Je n'accepte pas les conditions d'utilisation."
-#~ msgid "Click Clear to restore web-based settings."
-#~ msgstr "Cliquez sur Effacer pour revenir aux réglages du site web."
-#~ msgid "For additional settings, select Computing Preferences in "
-#~ msgstr ""
-#~ "Pour des réglages supplémentaires, choisissez Préférences de Calcul dans"
-#~ msgid "the Advanced View."
-#~ msgstr "la Vue avancée."
-#~ msgid "Workunit name"
-#~ msgstr "Nom de la tâche"
-#~ msgid "invalid float"
-#~ msgstr "nombre flottant invalide"
-#~ msgid "Display the advanced (accessible) graphical interface."
-#~ msgstr "Afficher l'interface graphique avancée (accessible)"
-#~ msgid "Paused: Other work running"
-#~ msgstr "En pause : Autre tâche en cours"
-#~ msgid "Paused: User initiated.  Click 'Resume' to continue"
-#~ msgstr ""
-#~ "En pause : demandé par l'utilisateur. Cliquez 'Reprendre' pour continuer"
-#~ msgid "Paused: User active"
-#~ msgstr "En pause : Utilisateur actif"
-#~ msgid "Paused: Computer on battery"
-#~ msgstr "En pause : Ordinateur sur batterie"
-#~ msgid "Paused: Time of Day"
-#~ msgstr "En pause : Période de la journée"
-#~ msgid "Paused: Benchmarks running"
-#~ msgstr "En pause : Tests de puissance en cours"
-#~ msgid "Paused"
-#~ msgstr "En pause"
-#~ msgid "Paused: Application start delayed"
-#~ msgstr "En pause : Démarrage de l'application retardé"
-#~ msgid "Click to show project graphics"
-#~ msgstr "Cliquer pour afficher les graphiques du projet"
-#~ msgid "Open a window to view messages"
-#~ msgstr "Ouvrir une fenêtre pour voir les messages"
-#~ msgid "Stop all activity"
-#~ msgstr "Arrêter toute l'activité"
-#~ msgid "Resume activity"
-#~ msgstr "Reprendre l'activité"
-#~ msgid "Open a window to set your preferences"
-#~ msgstr "Ouvrir une fenêtre pour régler vos préférences"
-#~ msgid "Switch to the BOINC advanced view"
-#~ msgstr "Passer à l'affichage avancé de BOINC"
-#~ msgid "My Projects:"
-#~ msgstr "Mes projets :"
-
-#, c-format
-#~ msgid "%s. Work done by %s: %0.2f"
-#~ msgstr "%s. Travail effectué par %s: %0.2f"
-
-#, c-format
-#~ msgid "%.1lf"
-#~ msgstr "%.1lf"
-
-#, c-format
-#~ msgid "%d hr %d min %d sec"
-#~ msgstr "%d h %d min %d sec"
-#~ msgid "Are you sure you want to display graphics on a remote machine?"
-#~ msgstr ""
-#~ "Etes vous sûr de vouloir afficher les graphiques sur une machine distante ?"
-#~ msgid "Application: "
-#~ msgstr "Application: "
-#~ msgid "Time Remaining: "
-#~ msgstr "Temps restant: "
-#~ msgid "Elapsed Time: "
-#~ msgstr "Temps écoulé: "
-#~ msgid "Account manager website"
-#~ msgstr "Site du gestionnaire de compte"
-#~ msgid "Account Manager &URL:"
-#~ msgstr "&URL du gestionnaire de compte:"
-
-#, c-format
-#~ msgid "%s &website"
-#~ msgstr "&Site web de %s"
-#~ msgid "Notice List"
-#~ msgstr "Liste des messages"
-
-#, c-format
-#~ msgid "%s; received on %s"
-#~ msgstr "%s; reçu le %s"
-
-#, c-format
-#~ msgid "%s; received from %s; on %s"
-#~ msgstr "%s; reçu de %s; le %s"
-#~ msgid "Click"
-#~ msgstr "Cliquer"
-#~ msgid "Project List"
-#~ msgstr "Liste des Projets"
-#~ msgid "Nvidia GPU Supported"
-#~ msgstr "GPU NVidia supportés"
-#~ msgid "ATI GPU Supported"
-#~ msgstr "GPU ATI supportés"
-#~ msgid "Project Website"
-#~ msgstr "Site web du projet"
-#~ msgid "One or more items failed to load from the Internet."
-#~ msgstr "Un ou plusieurs objet(s) n'ont pas été téléchargés depuis Internet"
-
-# 88%
-#~ msgid "Retry now"
-#~ msgstr "Réessayer maintenant"
-#~ msgid "10%"
-#~ msgstr "10%"
-#~ msgid "20%"
-#~ msgstr "20%"
-#~ msgid "30%"
-#~ msgstr "30%"
-#~ msgid "40%"
-#~ msgstr "40%"
-#~ msgid "50%"
-#~ msgstr "50%"
-#~ msgid "60%"
-#~ msgstr "60%"
-#~ msgid "70%"
-#~ msgstr "70%"
-#~ msgid "80%"
-#~ msgstr "80%"
-#~ msgid "90%"
-#~ msgstr "90%"
-#~ msgid "100%"
-#~ msgstr "100%"
-#~ msgid "1"
-#~ msgstr "1"
-#~ msgid "3"
-#~ msgstr "3"
-#~ msgid "5"
-#~ msgstr "5"
-#~ msgid "10"
-#~ msgstr "10"
-#~ msgid "15"
-#~ msgstr "15"
-#~ msgid "30"
-#~ msgstr "30"
-#~ msgid "60"
-#~ msgstr "60"
-#, c-format
-#~ msgid "Pop up a menu of websites for project %s"
-#~ msgstr "Afficher une liste des sites web du projet %s"
-#~ msgid ""
-#~ "for accessibility support, please select advanced from the view menu or type "
-#~ "command shift a"
-#~ msgstr ""
-#~ "pour le support de l'accessibilité, veuillez sélectionner avancé dans le "
-#~ "menu affichage ou entrez la commande shift-a"
-#~ msgid "This panel contains graphs showing user totals for projects"
-#~ msgstr ""
-#~ "Ce panneau contient des graphes montrant le total pour les utilisateurs des "
-#~ "projets"
-#~ msgid "list headers"
-#~ msgstr "en-têtes de liste"
-#~ msgid "list of events"
-#~ msgstr "liste des évènements"
-#~ msgid "list of events is empty"
-#~ msgstr "la liste des évènements est vide"
-
-#, c-format
-#~ msgid "list of %s"
-#~ msgstr "liste de %s"
-
-#, c-format
-#~ msgid "list of %s is empty"
-#~ msgstr "la liste de %s est vide"
-
-#, c-format
-#~ msgid "; current sort column %d of %d; descending order; "
-#~ msgstr "; colonne de tri courante %d de %d; ordre décroissant; "
-
-#, c-format
-#~ msgid "; current sort column %d of %d; ascending order; "
-#~ msgstr "; colonne de tri courante %d de %d; ordre croissant; "
-
-#, c-format
-#~ msgid "; column %d of %d; "
-#~ msgstr "; colonne %d de %d; "
-#~ msgid "list is empty"
-#~ msgstr "la liste est vide"
-
-#, c-format
-#~ msgid "; row %d; "
-#~ msgstr "; ligne %d; "
-
-#, c-format
-#~ msgid "; selected row %d of %d; "
-#~ msgstr "; ligne sélectionnée %d de %d; "
-
-#, c-format
-#~ msgid "; selected row %d ; "
-#~ msgstr "; ligne sélectionnée %d ; "
-
-#, c-format
-#~ msgid "; row %d of %d; "
-#~ msgstr "; ligne %d de %d; "
-#~ msgid "blank"
-#~ msgstr "vide"
-#~ msgid "list of projects or account managers"
-#~ msgstr "liste de projets ou de gestionnaires de compte"
-
-#, c-format
-#~ msgid "selected row %d of %d; "
-#~ msgstr "ligne sélectionnée %d de %d; "
-
-#, c-format
-#~ msgid "row %d of %d; "
-#~ msgstr "ligne %d de %d; "
-#~ msgid "The minimum username length for this project is 1. Please enter a different username."
-#~ msgstr ""
-#~ "La longueur minimale du nom d'utilisateur pour ce projet est de 1 "
-#~ "caractères. S'il-vous-plaît, entrez un nom d'utilisateur différent."
-#~ msgid "The minimum username length for this account manager is 1. Please enter a different username."
-#~ msgstr ""
-#~ "La longueur minimale du nom d'utilisateur pour ce gestionnaire de compte est "
-#~ "de 1. S'il-vous-plaît, entrez un nom d'utilisateur différent."
-#~ msgid "The minimum email address length for this project is 1. Please enter a different email address."
-#~ msgstr ""
-#~ "La longueur minimale de l'adresse e-mail pour ce projet est 1. S'il-vous-"
-#~ "plaît, entrez une adresse e-mail différente."
-#~ msgid "The minimum email address length for this account manager is 1. Please enter a different email address."
-#~ msgstr ""
-#~ "La longueur minimale de votre adresse de courrier électronique pour ce "
-#~ "gestionnaire de compte est 1. S'il-vous-plaît, entrez une adresse de "
-#~ "courrier électronique différente."
-
-#, c-format
-#~ msgid "The minimum password length for this project is %d. Please enter a different password."
-#~ msgstr ""
-#~ "La longueur minimum du mot de passe pour ce projet est de %d caractères. "
-#~ "Entrez un mot de passe différent, svp."
-
-#, c-format
-#~ msgid "The minimum password length for this account manager is %d. Please enter a different password."
-#~ msgstr ""
-#~ "La longueur minimum du mot de passe pour ce gestionnaire de compte est de %d "
-#~ "caractères. Entrez un mot de passe différent, svp."
-#~ msgid ""
-#~ "An error has occurred;\n"
-#~ "check the Event Log for details.\n"
-#~ "\n"
-#~ "Click Finish to close."
-#~ msgstr ""
-#~ "Une erreur est survenue.\n"
-#~ " Veuillez vérifier la fenêtre de notifications pour plus de détails.\n"
-#~ "\n"
-#~ "Cliquez sur Fin pour fermer."
-
-#, no-c-format
-#~ msgid "% of the processors"
-#~ msgstr "% des processeurs"
-
-#, c-format
-#~ msgid "New page inserted. Index = %i"
-#~ msgstr "Nouvelle page insérée. Index = %i"
-
-#, c-format
-#~ msgid "New page appended. Index = %i"
-#~ msgstr "Nouvelle page ajoutée. Index = %i"
-
-#, c-format
-#~ msgid "Old Page Index = %i"
-#~ msgstr "Index de l'Ancienne Page = %i"
-
-#, c-format
-#~ msgid "OnDropTarget: index by HitTest = %i"
-#~ msgstr "OnDropTarget: index by HitTest = %i"
-#~ msgid "Identify your account "
-#~ msgstr "Identifiez votre compte "
-#~ msgid "Read config file"
-#~ msgstr "Lire le fichier de configuration"
-#~ msgid "Read configuration info from cc_config.xml"
-#~ msgstr "Lire les infos de configuration du fichier cc_config.xml."
-#~ msgid ""
-#~ "(C) 2003-2011 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2011 Université de Californie, Berkeley.\n"
-#~ "Tous droits réservés."
-#~ msgid "NVIDIA GPU"
-#~ msgstr "Processeur graphique NVIDIA"
-#~ msgid "ATI GPU"
-#~ msgstr "Processeur graphique ATI"
-#~ msgid "Multicore CPU Supported"
-#~ msgstr "CPU multi-cœurs supportés"
-#~ msgid "%s: %.0f"
-#~ msgstr "%s: %.de"
-#~ msgid "Click 'Retry now' to transfer the file now"
-#~ msgstr ""
-#~ "Cliquez sur 'Réessayer maintenant' pour transférer le fichier maintenant"
+#: 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."
 
+#: clientgui/DlgAdvPreferencesBase.h:46
+msgid "On this day of the week, transfer files only during these hours."
+msgstr "En ce jour de la semaine, transférer des fichiers que pendant ces heures."
diff --git a/locale/fr/BOINC-Project-Generic.po b/locale/fr/BOINC-Project-Generic.po
old mode 100755
new mode 100644
index 71fd34d..1ea15d3
--- a/locale/fr/BOINC-Project-Generic.po
+++ b/locale/fr/BOINC-Project-Generic.po
@@ -1,23 +1,25 @@
 # BOINC web translation
 # Copyright (C) 2008 University of California
+# 
 # This file is distributed under the same license as BOINC.
+# 
 # FileID  : $Id$
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\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: 2014-02-02 22:07+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-02-08 17:07+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\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-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1391378827.0\n"
 
 msgid "LANG_NAME_NATIVE"
 msgstr "LANG_NAME_NATIVE"
@@ -60,9 +62,7 @@ msgstr "Insérer une image: [img]http://image_url[/img]  (alt+p)"
 #: ../inc/bbcode_html.inc:35
 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)"
+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
 msgid "Font color"
@@ -71,9 +71,7 @@ msgstr "Couleur de la police"
 #: ../inc/bbcode_html.inc:43
 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"
+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
 msgid "Default"
@@ -294,11 +292,9 @@ msgstr "Dernière modification: %1"
 
 #: ../inc/forum.inc:640
 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."
+"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
 msgid "Report this post as offensive"
@@ -316,7 +312,6 @@ msgstr "Classement: %1"
 msgid "rate: "
 msgstr "classer: "
 
-# 83%
 #: ../inc/forum.inc:675
 msgid "Click if you like this message"
 msgstr "Cliquez si vous aimez ce message"
@@ -377,29 +372,7 @@ msgid ""
 "        <li> No abusive comments involving race, religion,\n"
 "            nationality, gender, class or sexuality.\n"
 "        "
-msgstr ""
-"                                 <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 sexuel,\n"
-"                                              lié aux jeux d'argent ou à "
-"l'intolérance envers les autres.\n"
-"                                 <li> Aucun messages destinés à gêner ou "
-"contrarier d'autres personnes,\n"
-"                                              ou à détourner un sujet de "
-"conversation.\n"
-"                                 <li> Pas de messages délibérément hostiles "
-"ou insultants.\n"
-"                                 <li> Pas de commentaires abusifs impliquant "
-"la race, la religion,\n"
-"                                              la nationalité, le sexe, la "
-"classe ou la sexualité.\n"
+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
 msgid "Rules:"
@@ -457,27 +430,20 @@ msgstr "Seuls les membres d'équipes peuvent écrire dans le forum d'équipe"
 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."
+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
 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."
+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
 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."
+msgstr "Ce sujet est verrouillé. Seul les modérateurs et administrateurs du forum sont autorisés à écrire ici."
 
 #: ../inc/forum.inc:1145
 msgid "Can't post to a hidden thread."
@@ -739,9 +705,7 @@ msgstr "% de temps de fonctionnement de BOINC"
 #: ../inc/host.inc:189
 #, php-format
 msgid "While BOINC running, % of time host has an Internet connection"
-msgstr ""
-"Lorsque BOINC est en fonctionnement, % du temps où l'hôte a une connexion "
-"internet."
+msgstr "Lorsque BOINC est en fonctionnement, % du temps où l'hôte a une connexion internet."
 
 #: ../inc/host.inc:191
 #, php-format
@@ -841,8 +805,7 @@ msgstr "même hôte"
 
 #: ../inc/host.inc:598
 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"
+msgstr "Impossible de fusionner l'hôte %1 avec l'hôte %2 - ils sont incompatibles"
 
 #: ../inc/host.inc:601
 msgid "Merging host %1 into host %2"
@@ -967,9 +930,7 @@ msgstr "Impossible de créer le message"
 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."
+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
 msgid "unread"
@@ -977,8 +938,7 @@ msgstr "non lu"
 
 #: ../inc/pm.inc:186
 msgid "For email notification, %1edit community prefs%2"
-msgstr ""
-"Pour les notifications par email,  %1éditer les préférences de communauté%2"
+msgstr "Pour les notifications par email,  %1éditer les préférences de communauté%2"
 
 #: ../inc/pm.inc:198
 msgid "Private message"
@@ -988,9 +948,7 @@ msgstr "Message privé"
 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"
+msgstr "Suspendre les calculs si l'ordinateur est sur batterie ? %1 Ne concerne que les ordinateurs portables %2"
 
 #: ../inc/prefs.inc:85
 msgid "Suspend work while computer is in use?"
@@ -999,15 +957,11 @@ msgstr "Suspendre les calculs lorsque l'ordinateur est utilisé ?"
 #: ../inc/prefs.inc:91
 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"
+msgstr "Suspendre les calculs du GPU lorsque l'ordinateur est utilisé ? %1 Applicable depuis la version 6.6.21 et plus %2"
 
 #: ../inc/prefs.inc:99
 msgid "'In use' means mouse/keyboard activity in last"
-msgstr ""
-"'Est utilisé' signifie qu'il y a eu une activité de la souris ou du clavier "
-"dans les dernières"
+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
 msgid "minutes"
@@ -1017,33 +971,23 @@ msgstr "minutes"
 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"
+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: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"
+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: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"
+msgstr "N'exécuter les calculs qu'entre les horaires de %1 Aucune restriction si égal à %2"
 
 #: ../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"
+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:139
 msgid "Switch between tasks every %1 Recommended: 60 minutes %2"
@@ -1059,9 +1003,7 @@ msgstr "processeurs"
 
 #: ../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"
+msgstr "Sur les systèmes multiprocesseurs, utiliser au plus %1 Applicable depuis la version 6.1 ou plus %2"
 
 #: ../inc/prefs.inc:158
 #, php-format
@@ -1070,8 +1012,7 @@ msgstr "% des processeurs"
 
 #: ../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"
+msgstr "Utiliser au plus %1 Peut être utilisé pour réduire la température du CPU %2"
 
 #: ../inc/prefs.inc:167
 #, php-format
@@ -1088,9 +1029,7 @@ msgstr "Go"
 
 #: ../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"
+msgstr "Disque : Laisser disponible au moins %1 Les valeurs inférieures à %2 sont ignorées %3"
 
 #: ../inc/prefs.inc:191 ../inc/prefs.inc:201 ../inc/prefs.inc:206
 #: ../inc/prefs.inc:211
@@ -1120,9 +1059,7 @@ msgstr "Mémoire : lorsque l'ordinateur n'est pas utilisé, utiliser au plus"
 
 #: ../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"
+msgstr "Récupérer suffisamment de travail pour rester occupé durant au moins%1(maximum 10 jours).%Q"
 
 #: ../inc/prefs.inc:223 ../inc/prefs.inc:228 ../inc/prefs.inc:270
 #: ../inc/util.inc:274
@@ -1137,17 +1074,13 @@ msgstr "... et jusqu'à un additionnel "
 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"
+msgstr "Confirmer avant de se connecter à internet ? %1 Utile uniquement si vous avez un modem, une connexion RNIS ou VPN %2"
 
 #: ../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"
+msgstr "Déconnecter lorsque terminé ? %1 Utile uniquement si vous avez un modem, une connexion RNIS ou VPN %2"
 
 #: ../inc/prefs.inc:249
 msgid "Maximum download rate:"
@@ -1176,24 +1109,17 @@ msgstr "Moctets chaque"
 #: ../inc/prefs.inc:274
 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"
+"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"
 
 #: ../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 "
+"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."
+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:298
 msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
@@ -1209,36 +1135,27 @@ msgstr "Utiliser le GPU ATI %1 Applicable depuis la version 6.10 et plus %2"
 
 #: ../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"
+msgstr "Utiliser le GPU NVIDIA si présent %1 Applicable depuis la version 6.10 et plus %2"
 
 #: ../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"
+msgstr "Utiliser le GPU Intel %1 Applicable depuis la version 7.2 et suivantes %2"
 
 #: ../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"
+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: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."
+"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: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 ?"
+msgstr "Acceptez-vous que %1 et votre équipe (si vous en avez une) puisse vous envoyer des e-mails ?"
 
 #: ../inc/prefs.inc:380
 msgid "Should %1 show your computers on its web site?"
@@ -1259,17 +1176,13 @@ msgstr "Utilisation du réseau"
 #: ../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."
+msgstr "Ces préférences s'appliquent à tous les projets BOINC auxquels vous participez."
 
 #: ../inc/prefs.inc:395
 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."
+"%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:445
 msgid "bad venue: %1"
@@ -1342,16 +1255,13 @@ msgstr "Modifier les préférences de %1"
 
 #: ../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."
+msgstr "Ceux-ci s'appliquent sur tous les projets BOINC auxquels vous participez."
 
 #: ../inc/prefs.inc:887
 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."
+msgstr "Sur les ordinateurs participants à plusieurs projets, les préférences mises à jours le plus récemment seront utilisées."
 
 #: ../inc/prefs.inc:889
 msgid "These preferences do not apply to Android devices."
@@ -1381,17 +1291,13 @@ msgstr "et"
 msgid ""
 "Your profile will be made visible to other people as soon as it has been "
 "approved by the project. This may take up to a few days."
-msgstr ""
-"Votre profil sera visible pour les autres personnes dès qu'il aura été "
-"approuvé par le projet. Cela peut prendre quelques jours."
+msgstr "Votre profil sera visible pour les autres personnes dès qu'il aura été approuvé par le projet. Cela peut prendre quelques jours."
 
 #: ../inc/profile.inc:92
 msgid ""
 "Your profile has been marked as unacceptable. It is not visible to other "
 "people. Please change it."
-msgstr ""
-"Votre profil a été marqué comme inacceptable. Il n'est pas visible par les "
-"autres personnes. Veuillez en changer."
+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
 msgid "Database error"
@@ -1401,10 +1307,7 @@ msgstr "Erreur de base de données"
 msgid ""
 "To prevent spam, profiles of users with an average credit of less than %1 "
 "are displayed only to logged-in users. We apologize for this inconvenience."
-msgstr ""
-"Pour éviter le spam, les profils des utilisateurs ayant un crédit moyen "
-"inférieur à %1 ne seront affichés que si ces utilisateurs sont enregistrés. "
-"Veuillez nous excuser pour cet inconvénient."
+msgstr "Pour éviter le spam, les profils des utilisateurs ayant un crédit moyen inférieur à %1 ne seront affichés que si ces utilisateurs sont enregistrés. Veuillez nous excuser pour cet inconvénient."
 
 #: ../inc/profile.inc:197
 msgid "User is banished"
@@ -1426,7 +1329,6 @@ msgstr "Vos impressions sur ce profil"
 msgid "Recommend this profile for User of the Day:"
 msgstr "Recommander ce profil en tant qu'utilisateur du jour :"
 
-# ?????
 #: ../inc/profile.inc:265
 msgid "I %1like%2 this profile"
 msgstr "J'%1aime%2 ce profil"
@@ -1435,7 +1337,6 @@ msgstr "J'%1aime%2 ce profil"
 msgid "Alert administrators to an offensive profile:"
 msgstr "Alerter les administrateurs sur un profil problématique : "
 
-# ???????
 #: ../inc/profile.inc:269
 msgid "I %1do not like%2 this profile"
 msgstr "Je %1n'aime pas%2 ce profil"
@@ -1795,8 +1696,7 @@ msgstr "Mots clefs"
 
 #: ../inc/team.inc:41
 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"
+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
@@ -1822,8 +1722,7 @@ msgstr "Recherche"
 
 #: ../inc/team.inc:61
 msgid "Requested by you, and founder response deadline has passed."
-msgstr ""
-"Vous l'avez requis, et la date de limite de réponse du fondateur est passée."
+msgstr "Vous l'avez requis, et la date de limite de réponse du fondateur est passée."
 
 #: ../inc/team.inc:63
 msgid "Complete foundership transfer"
@@ -1882,15 +1781,11 @@ msgstr "Sujets"
 msgid "Join this team"
 msgstr "Rejoindre cette équipe"
 
-# Verifier si le OK to email est traduisible ou pas
 #: ../inc/team.inc:137
 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."
+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
 msgid "Not accepting new members"
@@ -1928,7 +1823,6 @@ msgstr "Nouveaux membres de la veille"
 msgid "Total members"
 msgstr "Membres totaux"
 
-# vue ?
 #: ../inc/team.inc:185 ../inc/team.inc:186 ../inc/team.inc:187
 msgid "view"
 msgstr "voir"
@@ -1971,20 +1865,15 @@ msgstr "Cette opération requiert les privilèges d'administrateur de l'équipe"
 
 #: ../inc/team.inc:422
 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."
+"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
 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."
+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
 msgid "Team name, text version"
@@ -2058,7 +1947,6 @@ msgstr "Calculs et crédits"
 msgid "Computers on this account"
 msgstr "Ordinateurs de ce compte"
 
-# vue ?
 #: ../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
@@ -2297,9 +2185,7 @@ msgstr "État du serveur"
 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."
+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
 msgid "Unable to handle request"
@@ -2318,10 +2204,9 @@ msgid "sec"
 msgstr "sec"
 
 #: ../inc/util.inc:444
-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."
+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"
@@ -2337,21 +2222,15 @@ msgstr "Le projet est arrêté pour cause de maintenance."
 
 #: ../inc/util.inc:799
 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."
+msgstr "%1 est temporairement arrêté pour cause de maintenance. Veuillez réessayer ultérieurement."
 
 #: ../inc/util.inc:817
 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."
+msgstr "Impossible de se connecter à la base de données - veuillez réessayer ultérieurement."
 
 #: ../inc/util.inc:821
 msgid "Unable to select database - please try again later"
-msgstr ""
-"Impossible d'interroger la base de données - veuillez réessayer "
-"ultérieurement"
+msgstr "Impossible d'interroger la base de données - veuillez réessayer ultérieurement"
 
 #: ../inc/util_ops.inc:109 ../user/get_passwd.php:72
 msgid "Stay logged in on this computer"
@@ -2363,8 +2242,7 @@ 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."
+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."
@@ -2401,11 +2279,7 @@ msgid ""
 "work 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."
+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
 msgid "Platform"
@@ -2429,14 +2303,7 @@ msgid ""
 "It's similar to HTML, but simpler. The tags start with a [ (where you would\n"
 "have used %1 in HTML) and end with ] (where you would have used %2 in\n"
 "HTML)."
-msgstr ""
-"Les balises BBCode vous permettent de formater le texte de votre profil et "
-"les messages publiés.\n"
-"C'est similaire au HTML, mais en plus simple. Les balises commencent par un "
-"[ (là où vous\n"
-"auriez dû utiliser %1 en HTML) et se terminent par ] (où vous auriez dû "
-"utiliser %2 \n"
-"en HTML)."
+msgstr "Les balises BBCode vous permettent de formater le texte de votre profil et les messages publiés.\nC'est similaire au HTML, mais en plus simple. Les balises commencent par un [ (là où vous\nauriez dû utiliser %1 en HTML) et se terminent par ] (où vous auriez dû utiliser %2 \nen HTML)."
 
 #: ../user/bbcode.php:31
 msgid "Examples"
@@ -2520,17 +2387,13 @@ 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"
+msgstr "utiliser pour renvoyer sur SVN gestion des changements sur le site BOINC"
 
 #: ../user/bbcode.php:53
 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, \n"
-"le texte même de la balise sera affiché et non le texte formaté."
+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"
@@ -2612,9 +2475,7 @@ msgstr "Impossible de créer le compte "
 
 #: ../user/create_account_action.php:29
 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."
+msgstr "Cliquer sur le bouton <b>Retour</b> de votre navigateur pour essayer à nouveau."
 
 #: ../user/create_account_action.php:47
 msgid "Your reCAPTCHA response was not correct. Please try again."
@@ -2630,10 +2491,9 @@ msgstr "Le code d'invitation que vous avez fourni n'est pas valide."
 
 #: ../user/create_account_action.php:84
 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'."
+"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
 msgid "There's already an account with that email address."
@@ -2649,9 +2509,7 @@ msgstr "Les mots de passe peuvent seulement contenir des caractères ASCII."
 
 #: ../user/create_account_action.php:106 ../user/edit_passwd_action.php:45
 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."
+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
 msgid "Couldn't create account"
@@ -2661,18 +2519,13 @@ msgstr "Impossible de créer le compte "
 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."
+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
 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."
+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"
@@ -2720,11 +2573,9 @@ msgstr "%1 Votre image de profil s'affiche à gauche."
 
 #: ../user/create_profile.php:66
 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)."
+"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
 msgid "To remove it from your profile, check this box:"
@@ -2734,9 +2585,7 @@ msgstr "Cochez cette case pour la supprimer de votre profil : "
 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."
+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
 msgid "Language"
@@ -2766,9 +2615,7 @@ msgstr "Le format de l'image que vous avez envoyé n'est pas supporté."
 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."
+msgstr "Votre %1profil%2 vous permet de partager vos opinions et votre vécu avec la communauté %3."
 
 #: ../user/create_profile.php:213
 msgid "Your ReCaptcha response was not correct.  Please try again."
@@ -2778,17 +2625,13 @@ msgstr "Votre réponse ReCaptcha est incorrecte.  Veuillez réessayer."
 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."
+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
 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."
+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
 msgid "Your profile submission was empty."
@@ -2809,9 +2652,7 @@ msgstr "Profil sauvegardé"
 #: ../user/create_profile.php:304
 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."
+msgstr "Félicitations ! Votre profil a été créé avec succès dans notre base de données."
 
 #: ../user/create_profile.php:306
 msgid "%1View your profile%2"
@@ -2823,12 +2664,9 @@ msgstr "Créer un profil"
 
 #: ../user/create_profile.php:343
 msgid ""
-"To prevent spam, an average credit of %1 or greater is required to create or "
-"edit a profile.  We apologize for this inconvenience."
-msgstr ""
-"Pour nous protéger du spam, un crédit moyen de %1 ou plus est requis pour "
-"pouvoir créer ou éditer un profil.  Toutes nos excuses pour la gène "
-"occasionnée."
+"To prevent spam, an average credit of %1 or greater is required to create or"
+" edit a profile.  We apologize for this inconvenience."
+msgstr "Pour nous protéger du spam, un crédit moyen de %1 ou plus est requis pour pouvoir créer ou éditer un profil.  Toutes nos excuses pour la gène occasionnée."
 
 #: ../user/delete_account.php:57
 msgid "Couldn't delete account"
@@ -2853,20 +2691,13 @@ msgid ""
 "including your profile and message-board posts.\n"
 "No jobs will be issued to any computers attached\n"
 "to this account."
-msgstr ""
-"Supprimer votre compte va retirer toutes\n"
-"vos informations personnelles de nos serveurs,\n"
-"y compris votre profil et vos messages sur le forum.\n"
-"Aucune tâche ne sera plus envoyée sur aucun\n"
-"ordinateur rattaché à ce compte."
+msgstr "Supprimer votre compte va retirer toutes\nvos informations personnelles de nos serveurs,\ny compris votre profil et vos messages sur le forum.\nAucune tâche ne sera plus envoyée sur aucun\nordinateur rattaché à ce compte."
 
 #: ../user/delete_account.php:73
 msgid ""
 "This cannot be undone.\n"
 "Once your account has been deleted, you cannot get it back."
-msgstr ""
-"Ceci ne peut pas être annulé.\n"
-"Une fois votre compte supprimé, vous ne pouvez plus le récupérer."
+msgstr "Ceci ne peut pas être annulé.\nUne fois votre compte supprimé, vous ne pouvez plus le récupérer."
 
 #: ../user/delete_account.php:76
 msgid "Are you sure you want to delete your account?"
@@ -2918,24 +2749,18 @@ 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 --\n"
-"vous devrez tout recommencer si vous voulez \n"
-"un nouveau profil par la suite."
+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
 msgid ""
 "If you're sure, click 'Yes'\n"
 "to remove your profile from our database."
-msgstr ""
-"Si vous êtes sûr, cliquez sur 'Oui'\n"
-"pour supprimer votre profil de notre base de données."
+msgstr "Si vous êtes sûr, cliquez sur 'Oui'\npour supprimer votre profil de notre base de données."
 
 #: ../user/delete_profile.php:52
 msgid "Delete my profile"
 msgstr "Supprimer mon profil"
 
-# ???????
 #: ../user/delete_profile.php:53
 msgid "Do not delete my profile"
 msgstr "Ne pas supprimer mon profil"
@@ -2954,10 +2779,9 @@ msgstr "Votre don a été enregistré."
 
 #: ../user/donated.php:30
 msgid ""
-"Your donation will be added to the progress bar after confirmation by PayPal."
-msgstr ""
-"Votre don sera ajouté à la barre de progression après confirmation par "
-"PayPal. "
+"Your donation will be added to the progress bar after confirmation by "
+"PayPal."
+msgstr "Votre don sera ajouté à la barre de progression après confirmation par PayPal. "
 
 #: ../user/donated.php:32
 msgid "You have canceled your donation."
@@ -2975,9 +2799,7 @@ msgstr "%1 dons"
 msgid ""
 "This project is accepting donations via\n"
 "%1."
-msgstr ""
-"Ce projet accepte les dons via\n"
-"%1."
+msgstr "Ce projet accepte les dons via\n%1."
 
 #: ../user/donations.php:42
 msgid ""
@@ -2992,18 +2814,7 @@ msgid ""
 "        to see the donation amount equivalent in different currencies\n"
 "        (please note that the rates are only estimates\n"
 "         and the actual amount may differ)."
-msgstr ""
-"Pour faire un don, remplir le montant que voulez donner dans les champs ci-"
-"dessous.\n"
-"            PayPal accepte diverses devises (Dollars Canadiens, Euros, \n"
-"            Livres Sterling, U.S. Dollars, Yen, Dollars Australiens, Dollars "
-"Néo Zélandais,\n"
-"            Francs Suisses, Dollars de Hong Kong, Dollars de Singapour, \n"
-"            Couronnes Suédoises, Couronnes Danoises, Zloty Polonais, \n"
-"            Couronnes Norvégiennes, Florins Hongrois, Couronnes Tchèques).\n"
-"            Vous pouvez utiliser le convertisseur de devises intégré\n"
-"             (veuillez noter que les taux de conversion sont estimés et que \n"
-"               le montant réel peut légèrement différer)."
+msgstr "Pour faire un don, remplir le montant que voulez donner dans les champs ci-dessous.\n            PayPal accepte diverses devises (Dollars Canadiens, Euros, \n            Livres Sterling, U.S. Dollars, Yen, Dollars Australiens, Dollars Néo Zélandais,\n            Francs Suisses, Dollars de Hong Kong, Dollars de Singapour, \n            Couronnes Suédoises, Couronnes Danoises, Zloty Polonais, \n            Couronnes Norvégiennes, Florins Hongrois, Couronnes Tchèques).\n             [...]
 
 #: ../user/donations.php:316
 msgid "Amount you would like to donate"
@@ -3021,16 +2832,11 @@ msgstr "Donation anonyme"
 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 ""
-"Choisissez cette option si vous ne voulez pas que le nom et numéro de votre "
-"compte soient affichés dans\n"
-"la liste des donateurs. <br>Si cette option n'est pas cochée vous serez "
-"enregistré comme utilisateur n° %1"
+msgstr "Choisissez cette option si vous ne voulez pas que le nom et numéro de votre compte soient affichés dans\nla liste des donateurs. <br>Si cette option n'est pas cochée vous serez enregistré comme utilisateur n° %1"
 
 #: ../user/donations.php:324
 msgid "To assign the donation with your user ID, please log in."
-msgstr ""
-"Pour associer votre don à votre compte utilisateur, veuillez vous connecter."
+msgstr "Pour associer votre don à votre compte utilisateur, veuillez vous connecter."
 
 #: ../user/donations.php:328
 msgid "Proceed"
@@ -3051,21 +2857,14 @@ msgstr "Vous pouvez télécharger des applications dans plusieurs catégories."
 #: ../user/download_network.php:31
 msgid ""
 "These applications are not endorsed by %1 and you use them at your own risk."
-msgstr ""
-"Ces applications ne sont pas supportées par %1 et vous les utilisez à vos "
-"risques."
+msgstr "Ces applications ne sont pas supportées par %1 et vous les utilisez à vos risques."
 
 #: ../user/download_network.php:33
 msgid ""
 "We do not provide instructions for installing these applications.\n"
-"However, the author may have provided some help on installing or "
-"uninstalling the application. \n"
+"However, the author may have provided some help on installing or uninstalling the application. \n"
 "If this is not enough you should contact the author."
-msgstr ""
-"Nous ne fournissons pas d'instructions pour installer ces applications.\n"
-"Toutefois, l'auteur peut avoir fourni de l'aide sur son installation ou sa "
-"suppression. \n"
-"Si ce n'est pas suffisant, merci de contacter l'auteur."
+msgstr "Nous ne fournissons pas d'instructions pour installer ces applications.\nToutefois, l'auteur peut avoir fourni de l'aide sur son installation ou sa suppression. \nSi ce n'est pas suffisant, merci de contacter l'auteur."
 
 #: ../user/download_network.php:36
 msgid "Instructions for installing and running BOINC are %1here%2."
@@ -3085,8 +2884,7 @@ msgstr "La nouvelle adresse email %1 est invalide."
 
 #: ../user/edit_email_action.php:38
 msgid "New email address is same as existing address. Nothing is changed."
-msgstr ""
-"La nouvelle adresse email est la même que l'actuelle. Rien n'a été changé."
+msgstr "La nouvelle adresse email est la même que l'actuelle. Rien n'a été changé."
 
 #: ../user/edit_email_action.php:42
 msgid "There's already an account with that email address"
@@ -3108,9 +2906,7 @@ msgstr "Veuillez %1valider l'adresse e-mail%2."
 msgid ""
 "We can't update your email address due to a database problem.  Please try "
 "again later."
-msgstr ""
-"Impossible de mettre à jour la base de données - veuillez réessayer "
-"ultérieurement"
+msgstr "Impossible de mettre à jour la base de données - veuillez réessayer ultérieurement"
 
 #: ../user/edit_email_form.php:27 ../user/edit_email_form.php:51
 msgid "Change email address"
@@ -3140,9 +2936,7 @@ msgstr "Confirmer la réinitialisation"
 msgid ""
 "This action will erase any changes you have made in your community "
 "preferences. To cancel, click your browser's Back button."
-msgstr ""
-"Cette action va supprimer tout changement fait dans vos préférence de "
-"communauté. Pour annuler cliquer sur le bouton Retour de votre navigateur."
+msgstr "Cette action va supprimer tout changement fait dans vos préférence de communauté. Pour annuler cliquer sur le bouton Retour de votre navigateur."
 
 #: ../user/edit_forum_preferences_action.php:38
 msgid "Reset preferences"
@@ -3150,9 +2944,7 @@ msgstr "Réinitialiser les préférences"
 
 #: ../user/edit_forum_preferences_action.php:88
 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."
+msgstr "Erreur : mauvais format de fichier, seuls les PNG et les JPEG sont supportés."
 
 #: ../user/edit_forum_preferences_action.php:114
 msgid "Your signature was too long, please keep it less than 250 characters."
@@ -3167,9 +2959,7 @@ msgstr "Utilisateur inexistant: %1"
 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 ?"
+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
 msgid "On my Account page (no email)"
@@ -3228,10 +3018,7 @@ 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> \n"
-"offrant des images de signature dynamique<br> \n"
-"montrant vos statistiques, des nouvelles des projets, 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"
@@ -3311,8 +3098,7 @@ msgstr "Utilisateurs filtrés"
 
 #: ../user/edit_forum_preferences_form.php:165
 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."
+msgstr "Ignorer les messages du forum et les messages privés de ces utilisateurs."
 
 #: ../user/edit_forum_preferences_form.php:167
 msgid "User ID (For instance: 123456789)"
@@ -3333,9 +3119,7 @@ msgstr "Réinitialiser"
 
 #: ../user/edit_forum_preferences_form.php:176
 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"
+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"
@@ -3362,9 +3146,7 @@ msgstr "Votre mot de passe a été changé."
 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."
+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"
@@ -3439,17 +3221,13 @@ msgid ""
 "A tasks's <b>server state</b> indicates whether the task has been sent to a "
 "computer, and if so whether the computer has finished it. Possible values "
 "are:"
-msgstr ""
-"L'état de serveur d'une tâche indique si la tâche a été envoyée à un "
-"ordinateur, et si l'ordinateur l'a terminé. Les valeurs possibles sont :"
+msgstr "L'état de serveur d'une tâche indique si la tâche a été envoyée à un ordinateur, et si l'ordinateur l'a terminé. Les valeurs possibles sont :"
 
 #: ../user/explain_state.php:35
 msgid ""
 "The task is not ready to send (for example, because its input files are "
 "unavailable)"
-msgstr ""
-"Cette tâche n'est pas prête à être envoyée (par exemple parce que ses "
-"fichiers d'entrée ne sont pas disponibles)"
+msgstr "Cette tâche n'est pas prête à être envoyée (par exemple parce que ses fichiers d'entrée ne sont pas disponibles)"
 
 #: ../user/explain_state.php:38
 msgid "The task is ready to send, but hasn't been sent yet."
@@ -3467,9 +3245,7 @@ msgstr "Cette tâche a été envoyée ; en attente de finalisation."
 msgid ""
 "The task has been sent to a computer and either it has timed out or the "
 "computer has reported its completion."
-msgstr ""
-"Cette tâche a été envoyée à un ordinateur et soit sa durée maximale de "
-"calcul a été dépassée, soit l'ordinateur a signalé sa finalisation."
+msgstr "Cette tâche a été envoyée à un ordinateur et soit sa durée maximale de calcul a été dépassée, soit l'ordinateur a signalé sa finalisation."
 
 #: ../user/explain_state.php:49
 msgid "Outcomes"
@@ -3479,30 +3255,23 @@ msgstr "Résultats"
 msgid ""
 "A tasks's <b>outcome</b> is defined if its server state is <b>over</b>. "
 "Possible values are:"
-msgstr ""
-"Un <b>résultat</b> de tâche est défini si son statut de serveur est "
-"<b>terminé</b>. Les valeurs possibles sont :"
+msgstr "Un <b>résultat</b> de tâche est défini si son statut de serveur est <b>terminé</b>. Les valeurs possibles sont :"
 
 #: ../user/explain_state.php:57
 msgid ""
 "The task was sent to a computer, but the computer has not yet completed the "
 "work and reported the outcome."
-msgstr ""
-"La tâche a été envoyée à un ordinateur mais il ne l'a pas terminé ni renvoyé "
-"les résultats."
+msgstr "La tâche a été envoyée à un ordinateur mais il ne l'a pas terminé ni renvoyé les résultats."
 
 #: ../user/explain_state.php:60
 msgid "A computer completed and reported the task successfully."
-msgstr ""
-"Un ordinateur a terminé et envoyé les résultats de la tâche avec succès."
+msgstr "Un ordinateur a terminé et envoyé les résultats de la tâche avec succès."
 
 #: ../user/explain_state.php:63
 msgid ""
 "The server wasn't able to send the task to a computer (perhaps because its "
 "resource requirements were too large)"
-msgstr ""
-"Le serveur n'a pas pu envoyer la tâche à un ordinateur (peut-être car les "
-"besoins en ressources étaient trop important)"
+msgstr "Le serveur n'a pas pu envoyer la tâche à un ordinateur (peut-être car les besoins en ressources étaient trop important)"
 
 #: ../user/explain_state.php:65
 msgid "Client error"
@@ -3516,25 +3285,19 @@ msgstr "La tâche a été envoyée à un ordinateur et une erreur est survenue."
 msgid ""
 "The task was sent to a computer and no reply was received within the time "
 "limit."
-msgstr ""
-"La tâche a été envoyée à un ordinateur et aucune réponse n'a été reçue dans "
-"la limite de durée prévue."
+msgstr "La tâche a été envoyée à un ordinateur et aucune réponse n'a été reçue dans la limite de durée prévue."
 
 #: ../user/explain_state.php:72
 msgid ""
-"The task wasn't sent to a computer because enough other tasks were completed "
-"for this workunit."
-msgstr ""
-"La tâche n'a pas été envoyée à un ordinateur car suffisamment de tâches ont "
-"été terminées pour cette unité de travail."
+"The task wasn't sent to a computer because enough other tasks were completed"
+" for this workunit."
+msgstr "La tâche n'a pas été envoyée à un ordinateur car suffisamment de tâches ont été terminées pour cette unité de travail."
 
 #: ../user/explain_state.php:75
 msgid ""
 "The task was reported but could not be validated, typically because the "
 "output files were lost on the server."
-msgstr ""
-"La tâche a été renvoyée mais n'a pas pu être validée, généralement car les "
-"fichiers en sortie ont été perdus sur le serveur."
+msgstr "La tâche a été renvoyée mais n'a pas pu être validée, généralement car les fichiers en sortie ont été perdus sur le serveur."
 
 #: ../user/explain_state.php:80
 msgid "Client states"
@@ -3542,11 +3305,9 @@ msgstr "États du client"
 
 #: ../user/explain_state.php:81
 msgid ""
-"A result's <b>client state</b> indicates the stage of processing at which an "
-"error occurred."
-msgstr ""
-"<b>L'état de client</b> d'un résultat indique l'étape du calcul à laquelle "
-"une erreur est survenue."
+"A result's <b>client state</b> indicates the stage of processing at which an"
+" error occurred."
+msgstr "<b>L'état de client</b> d'un résultat indique l'étape du calcul à laquelle une erreur est survenue."
 
 #: ../user/explain_state.php:86
 msgid "The computer has not yet completed the task."
@@ -3558,8 +3319,7 @@ msgstr "L'ordinateur a terminé la tâche avec succès."
 
 #: ../user/explain_state.php:92
 msgid "The computer couldn't download the application or input files."
-msgstr ""
-"L'ordinateur n'a pas pu télécharger l'application les fichiers d'entrée."
+msgstr "L'ordinateur n'a pas pu télécharger l'application les fichiers d'entrée."
 
 #: ../user/explain_state.php:95
 msgid "An error occurred during computation."
@@ -3577,9 +3337,7 @@ msgstr "Temps écoulé et date limite"
 msgid ""
 "A task's <b>Time reported or deadline</b> field depends on whether the task "
 "has been reported yet:"
-msgstr ""
-"Le champ <b>Temps écoulé ou date limite</b>  d'une tâche dépend de si elle a "
-"déjà été renvoyée:"
+msgstr "Le champ <b>Temps écoulé ou date limite</b>  d'une tâche dépend de si elle a déjà été renvoyée:"
 
 #: ../user/explain_state.php:110
 msgid "Already reported"
@@ -3623,9 +3381,7 @@ msgstr "Envoyer l'email "
 
 #: ../user/ffmail_action.php:59
 msgid "Use your browser's back button to return to message form"
-msgstr ""
-"Utilisez la bouton Retour de votre navigateur pour revenir au formulaire de "
-"message"
+msgstr "Utilisez la bouton Retour de votre navigateur pour revenir au formulaire de message"
 
 #: ../user/ffmail_action.php:63
 msgid "Sending emails"
@@ -3645,19 +3401,15 @@ msgstr "Merci d'avoir parlé à vos amis de %1"
 
 #: ../user/ffmail_action.php:94
 msgid ""
-"You forgot to enter your friends' names and/or email addresses; Please %"
-"1return to the form%2 and enter them."
-msgstr ""
-"Vous avez omis d'entrer les noms et/ou adresses emails de vos amis; merci de "
-"%1revenir sur le formulaire%2 pour les saisir."
+"You forgot to enter your friends' names and/or email addresses; Please "
+"%1return to the form%2 and enter them."
+msgstr "Vous avez omis d'entrer les noms et/ou adresses emails de vos amis; merci de %1revenir sur le formulaire%2 pour les saisir."
 
 #: ../user/ffmail_form.php:30
 msgid ""
 "This project hasn't created an email message - please notify its "
 "administrators"
-msgstr ""
-"Ce projet n'a pas créé de message email - Veuillez notifier ses "
-"administrateurs"
+msgstr "Ce projet n'a pas créé de message email - Veuillez notifier ses administrateurs"
 
 #: ../user/ffmail_form.php:33
 msgid "Tell your friends about %1"
@@ -3672,10 +3424,7 @@ msgid ""
 "Fill in this form with the names and email addresses of people you think "
 "might be interested in %1. We'll send them an email in your name, and you "
 "can add your own message if you like."
-msgstr ""
-"Remplissez le formulaire avec les noms et adresses emails des personnes qui "
-"pourraient être intéressées par %1. Nous leur enverrons un email en votre "
-"nom, et vous pouvez ajouter votre propre message si vous le souhaitez."
+msgstr "Remplissez le formulaire avec les noms et adresses emails des personnes qui pourraient être intéressées par %1. Nous leur enverrons un email en votre nom, et vous pouvez ajouter votre propre message si vous le souhaitez."
 
 #: ../user/ffmail_form.php:42
 msgid "Your name:"
@@ -3723,18 +3472,13 @@ 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."
+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
 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. "
+"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
 msgid "Category"
@@ -3786,9 +3530,7 @@ msgstr "Vous devez choisir une action ..."
 msgid ""
 "You can no longer edit this post.<br/>Posts can only be edited at most %1 "
 "minutes after they have been created."
-msgstr ""
-"Vous ne pouvez plus éditer ce message.<br/>Les messages peuvent être édités "
-"seulement %1 minutes après qu'ils ont été créés."
+msgstr "Vous ne pouvez plus éditer ce message.<br/>Les messages peuvent être édités seulement %1 minutes après qu'ils ont été créés."
 
 #: ../user/forum_edit.php:47
 msgid "You are not authorized to edit this post."
@@ -3902,11 +3644,9 @@ msgstr "Questions et Réponses"
 
 #: ../user/forum_help_desk.php:30
 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."
+"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
 msgid "Topic"
@@ -3924,14 +3664,11 @@ msgstr "Discussions entres les membres de %1"
 msgid "%1 Message boards"
 msgstr "%1 Forums"
 
-# On est sûr que c'est aussi traduit dans les forums ?
 #: ../user/forum_index.php:78
 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."
+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
 msgid "Subscribed threads"
@@ -3995,8 +3732,7 @@ 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"
+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
@@ -4045,10 +3781,7 @@ msgstr "Modérer le sujet '%1'"
 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."
+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
 msgid "Current forum"
@@ -4066,17 +3799,13 @@ msgstr "Nouveau titre:"
 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."
+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
 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."
+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
 msgid "Create new thread"
@@ -4096,9 +3825,7 @@ msgstr "Montrer cette information comme une notification dans le BOINC Manager"
 
 #: ../user/forum_post.php:127
 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."
+msgstr "Ne le faire que pour des informations pouvant être intéressantes pour tous les volontaires."
 
 #: ../user/forum_rate.php:26
 msgid "Rating offline"
@@ -4110,9 +3837,7 @@ msgstr "Cette fonctionnalité est désactivée temporairement"
 
 #: ../user/forum_rate.php:58
 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."
+msgstr "Vous devez avoir un crédit moyen ou total supérieur pour pouvoir noter un message."
 
 #: ../user/forum_rate.php:62
 msgid "You have already rated this post."
@@ -4149,9 +3874,7 @@ msgstr "Problème d'envoi de vote"
 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."
+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
@@ -4176,15 +3899,12 @@ msgstr "Ajouter ma signature à ce message"
 
 #: ../user/forum_report_post.php:45
 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."
+msgstr "Vous devez avoir un crédit moyen ou total supérieur pour pouvoir signaler ce message."
 
 #: ../user/forum_report_post.php:65
 msgid "Report Registered"
 msgstr "Signalement enregistré"
 
-# 92%
 #: ../user/forum_report_post.php:66
 msgid "Your report has been recorded. Thanks for your input."
 msgstr "Votre signalement a été enregistré. Merci de votre participation."
@@ -4193,9 +3913,7 @@ msgstr "Votre signalement a été enregistré. Merci de votre participation."
 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."
+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
 msgid "Report a forum post"
@@ -4203,14 +3921,10 @@ msgstr "Signaler un message du forum"
 
 #: ../user/forum_report_post.php:73
 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 "
+"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."
+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
 msgid "Report post"
@@ -4218,14 +3932,9 @@ msgstr "Signaler un message"
 
 #: ../user/forum_report_post.php:81
 msgid ""
-"Why do you find the post offensive: %1Please include enough information so "
-"that a person that\n"
+"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 \n"
-"n'ayant pas encore lu le sujet puisse être capable d'identifier rapidement "
-"le problème%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
 msgid "Report not registered"
@@ -4233,16 +3942,13 @@ msgstr "Signalement non enregistré"
 
 #: ../user/forum_report_post.php:91
 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."
+msgstr "Votre signalement n'a pas pu être enregistré. Merci d'attendre avant d'essayer de nouveau."
 
 #: ../user/forum_report_post.php:92
 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."
+"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
 msgid "%1 RSS feed"
@@ -4258,25 +3964,19 @@ msgstr "Options:"
 
 #: ../user/forum_rss.php:47
 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)"
+msgstr "N'inclure que les messages pour l'utilisateur ID %1 (valeur par défaut : tous les utilisateurs)"
 
 #: ../user/forum_rss.php:49
 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)"
+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)"
+msgstr "Tronquer les messages : %1 (n'inclure que les 256 premiers caractères de chaque message)"
 
 #: ../user/forum_rss.php:53
 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)"
+msgstr "Sujets seulement: %1 (n'inclure que les premiers messages de chaque sujet)"
 
 #: ../user/forum_search.php:27
 msgid "Forum search"
@@ -4358,10 +4058,7 @@ msgstr "Messages correspondant à votre requête :"
 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)."
+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
 msgid "You can also %1try the same search on Google.%2"
@@ -4379,9 +4076,7 @@ msgstr "Abonnement réussi"
 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."
+msgstr "Vous êtes maintenant abonné à %1. Vous serez notifiés à chaque nouveau message."
 
 #: ../user/forum_subscribe.php:51
 msgid "Subscription failed"
@@ -4390,9 +4085,7 @@ msgstr "Abonnement échoué"
 #: ../user/forum_subscribe.php:52
 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.."
+msgstr "Nous ne pouvons pas actuellement vous abonner à %1. Veuillez réessayer plus tard.."
 
 #: ../user/forum_subscribe.php:61
 msgid "Unsubscription successful"
@@ -4400,11 +4093,9 @@ msgstr "Désabonnement réussi"
 
 #: ../user/forum_subscribe.php:64
 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."
+"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
 msgid "Unsubscription failed"
@@ -4413,9 +4104,7 @@ msgstr "Désabonnement échoué"
 #: ../user/forum_subscribe.php:67
 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."
+msgstr "Nous ne pouvons pas vous désabonner maintenant de %1. Veuillez réessayer plus tard."
 
 #: ../user/forum_subscribe.php:74
 msgid "Unknown subscription action"
@@ -4459,9 +4148,7 @@ msgstr "Souscription"
 
 #: ../user/forum_thread.php:179
 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"
+msgstr "Cliquez ici pour être averti par email lorsque de nouveaux messages sont ajoutés à ce sujet"
 
 #: ../user/forum_thread.php:190
 msgid "Unhide this thread"
@@ -4569,11 +4256,9 @@ msgstr "Ajouter ami"
 
 #: ../user/friend.php:74
 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."
+"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
 msgid "Add an optional message here:"
@@ -4677,59 +4362,46 @@ msgstr "Vous avez oublié les informations de votre compte ?"
 
 #: ../user/get_passwd.php:28
 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 :"
+"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
 msgid ""
 "Enter the email address below, and click OK. You will be sent email "
 "instructions for resetting your password."
-msgstr ""
-"Entrez l'adresse email ci-dessous et cliquez OK. Vous allez recevoir un "
-"email avec les instructions pour réinitialiser votre mot de passe."
+msgstr "Entrez l'adresse email ci-dessous et cliquez OK. Vous allez recevoir un email avec les instructions pour réinitialiser votre mot de passe."
 
 #: ../user/get_passwd.php:46
 msgid ""
 "2) If you forgot your account's email address, or you can't receive email "
 "there:"
-msgstr ""
-"2) Si vous avez oublié l'adresse email de votre compte, ou si vous ne pouvez "
-"pas recevoir d'email ici :"
+msgstr "2) Si vous avez oublié l'adresse email de votre compte, ou si vous ne pouvez pas recevoir d'email ici :"
 
 #: ../user/get_passwd.php:47
 msgid ""
 "If you have run BOINC under this account, you can still access it. Here's "
 "how:"
-msgstr ""
-"Si vous avez exécuté BOINC avec ce compte, vous pouvez toujours y avoir "
-"accès. Voici comment : "
+msgstr "Si vous avez exécuté BOINC avec ce compte, vous pouvez toujours y avoir accès. Voici comment : "
 
 #: ../user/get_passwd.php:50
 msgid ""
 "Go to the BOINC data directory on your computer (its location is written to "
 "the Event Log at startup)."
-msgstr ""
-"Aller dans le répertoire de données de BOINC de votre ordinateur (son chemin "
-"est inscrit dans le Journal d’événements au démarrage).                "
+msgstr "Aller dans le répertoire de données de BOINC de votre ordinateur (son chemin est inscrit dans le Journal d’événements au démarrage).                "
 
 #: ../user/get_passwd.php:51
 msgid "Find your account file for this project; it will be named <b>%1</b>."
-msgstr ""
-"Trouvez votre fichier de compte pour ce projet, il sera nommé <b>%1</b>."
+msgstr "Trouvez votre fichier de compte pour ce projet, il sera nommé <b>%1</b>."
 
 #: ../user/get_passwd.php:52
 msgid "Open the file in a text editor like Notepad. You'll see something like"
-msgstr ""
-"Ouvrez ce fichier dans un éditeur de texte tel que Notepad. Vous verrez "
-"quelque chose ressemblant à "
+msgstr "Ouvrez ce fichier dans un éditeur de texte tel que Notepad. Vous verrez quelque chose ressemblant à "
 
 #: ../user/get_passwd.php:62
-msgid "Select and Copy the string between %1 and %2 (%3 in the above example)."
-msgstr ""
-"Sélectionnez et copiez la chaîne de caractères entre %1 et %2 (%3 dans "
-"l'exemple du dessus)."
+msgid ""
+"Select and Copy the string between %1 and %2 (%3 in the above example)."
+msgstr "Sélectionnez et copiez la chaîne de caractères entre %1 et %2 (%3 dans l'exemple du dessus)."
 
 #: ../user/get_passwd.php:64
 msgid "Paste the string into the field below, and click OK."
@@ -4739,9 +4411,7 @@ msgstr "Collez la chaîne dans le champ ci-dessous et cliquez OK"
 msgid ""
 "You will now be logged in to your account; update the email and password of "
 "your account."
-msgstr ""
-"Vous serez alors connecté à votre compte, mettez à jour votre email et votre "
-"mot de passe."
+msgstr "Vous serez alors connecté à votre compte, mettez à jour votre email et votre mot de passe."
 
 #: ../user/get_passwd.php:71
 msgid "Log in with authenticator"
@@ -4755,10 +4425,7 @@ msgstr "Pas de tâche GPU rapportée "
 msgid ""
 "The following lists show the most productive GPU models on different "
 "platforms.  Relative speeds 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."
+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
 msgid "Welcome to %1"
@@ -4766,13 +4433,11 @@ msgstr "Bienvenue sur %1"
 
 #: ../user/home.php:43
 msgid "View and edit your account preferences using the links below."
-msgstr ""
-"Voir et éditer vos préférences de compte en utilisant les liens ci-dessous."
+msgstr "Voir et éditer vos préférences de compte en utilisant les liens ci-dessous."
 
 #: ../user/home.php:46
 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."
+msgstr "Si vous ne l'avez pas déjà fait, %1téléchargez le logiciel client BOINC %2."
 
 #: ../user/host_app_versions.php:37
 msgid "Anonymous platform, missing app"
@@ -4827,11 +4492,7 @@ msgid ""
 "You can not delete our record of this computer because our database still "
 "contains work for it. You must wait a few days until the work for this "
 "computer has been deleted from the project database."
-msgstr ""
-"Vous ne pouvez pas supprimer les enregistrements pour cet ordinateur car "
-"notre base de données contient toujours des unités de travail pour lui. Vous "
-"devez attendre quelques jours avant que le travail de cet ordinateur soit "
-"supprimé de la base de données du projet."
+msgstr "Vous ne pouvez pas supprimer les enregistrements pour cet ordinateur car notre base de données contient toujours des unités de travail pour lui. Vous devez attendre quelques jours avant que le travail de cet ordinateur soit supprimé de la base de données du projet."
 
 #: ../user/host_delete.php:40
 msgid "Delete record of computer"
@@ -4855,12 +4516,9 @@ msgstr "Fusionner les ordinateurs"
 
 #: ../user/host_edit_form.php:38
 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 ""
-"Dans certains cas BOINC donne des identifiants séparés à un même ordinateur "
-"par erreur. Vous pouvez corriger cela en fusionnant les anciennes identités "
-"avec la nouvelle."
+"Sometimes BOINC assigns separate identities to the same computer by mistake."
+" You can correct this by merging old identities with the newest one."
+msgstr "Dans certains cas BOINC donne des identifiants séparés à un même ordinateur par erreur. Vous pouvez corriger cela en fusionnant les anciennes identités avec la nouvelle."
 
 #: ../user/host_edit_form.php:56
 msgid "No hosts are eligible for merging with this one."
@@ -4873,9 +4531,7 @@ msgstr "Afficher les détails"
 #: ../user/host_edit_form.php:66
 msgid ""
 "Check the computers that are the same as %1 (created %2, computer ID %3):"
-msgstr ""
-"Vérifier les ordinateurs qui sont les mêmes que %1 (créé le %2, ID "
-"ordinateur %3):"
+msgstr "Vérifier les ordinateurs qui sont les mêmes que %1 (créé le %2, ID ordinateur %3):"
 
 #: ../user/host_edit_form.php:70 ../user/workunit.php:39
 msgid "name"
@@ -4917,9 +4573,7 @@ msgstr "L'emplacement de cet hôte a été défini comme %1."
 msgid ""
 "This change will take effect the next time the host communicates with this "
 "project."
-msgstr ""
-"Ce changement prendra effet la prochaine fois que cet hôte communiquera avec "
-"le projet."
+msgstr "Ce changement prendra effet la prochaine fois que cet hôte communiquera avec le projet."
 
 #: ../user/host_venue_action.php:50
 msgid "Return to host page"
@@ -4936,9 +4590,7 @@ msgstr "Ordinateurs masqués"
 #: ../user/hosts_user.php:56
 msgid ""
 "This user has chosen not to show information about his or her computers."
-msgstr ""
-"Cet utilisateur a choisi de ne pas montrer d'information au sujet de ses "
-"ordinateurs."
+msgstr "Cet utilisateur a choisi de ne pas montrer d'information au sujet de ses ordinateurs."
 
 #: ../user/hosts_user.php:64
 msgid "Your computers"
@@ -4950,8 +4602,7 @@ msgstr "Balises HTML autorisées."
 
 #: ../user/html.php:25
 msgid "The following HTML tags are allowed in team descriptions:"
-msgstr ""
-"Les balises HTML suivantes sont autorisées dans la description de l'équipe:"
+msgstr "Les balises HTML suivantes sont autorisées dans la description de l'équipe:"
 
 #: ../user/html.php:27
 msgid "bold"
@@ -4979,34 +4630,24 @@ msgstr "pré-formaté"
 
 #: ../user/html.php:33
 msgid ""
-"image; height cannot exceed 450 pixels. Please do not link to images without "
-"permission of the web site where the image is hosted."
-msgstr ""
-"image ; la hauteur ne peut excéder 450 pixels. Merci de ne pas faire de lien "
-"vers des images sans la permission du site où l'image est hébergée. "
+"image; height cannot exceed 450 pixels. Please do not link to images without"
+" permission of the web site where the image is hosted."
+msgstr "image ; la hauteur ne peut excéder 450 pixels. Merci de ne pas faire de lien vers des images sans la permission du site où l'image est hébergée. "
 
 #: ../user/html.php:35
 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."
+msgstr "Vous pouvez également utiliser la notation esperluète pour les caractères spéciaux."
 
 #: ../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"
+msgstr "N'utilisez %1 que sur des machines pour lesquelles vous en avez l'autorisation"
 
 #: ../user/info.php:36
 msgid ""
 "Run %1 only on computers that you own, or for which you have obtained the "
 "owner's permission. Some companies and schools have policies that prohibit "
 "using their computers for projects such as %1."
-msgstr ""
-"N'utilisez %1 que sur des ordinateurs qui vous appartiennent, ou pour "
-"lesquels vous avez obtenu l'autorisation de leur propriétaire. Certaines "
-"entreprises ou écoles ont des règles qui interdisent l'usage de leurs "
-"ressources informatiques pour des projets tels que %1."
+msgstr "N'utilisez %1 que sur des ordinateurs qui vous appartiennent, ou pour lesquels vous avez obtenu l'autorisation de leur propriétaire. Certaines entreprises ou écoles ont des règles qui interdisent l'usage de leurs ressources informatiques pour des projets tels que %1."
 
 #: ../user/info.php:38
 msgid "How %1 will use your computer"
@@ -5017,20 +4658,13 @@ msgid ""
 "When you run %1 on your computer, it will use part of the computer's CPU "
 "power, disk space, and network bandwidth. You can control how much of your "
 "resources are used by %1, and when it uses them."
-msgstr ""
-"Lorsque %1 fonctionne sur votre ordinateur, une partie de votre puissance "
-"CPU, espace disque dur, et bande passante réseau sera utilisée. Vous pouvez "
-"contrôler la quantité de ces ressources utilisables par %1, et à quel moment "
-"elles pourront être utilisées."
+msgstr "Lorsque %1 fonctionne sur votre ordinateur, une partie de votre puissance CPU, espace disque dur, et bande passante réseau sera utilisée. Vous pouvez contrôler la quantité de ces ressources utilisables par %1, et à quel moment elles pourront être utilisées."
 
 #: ../user/info.php:40
 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 ""
-"Le travail effectué par votre ordinateur contribue à atteindre les objectifs "
-"de %1, tels que décrits sur son site web. L'application de calcul peut "
-"varier de temps en temps."
+msgstr "Le travail effectué par votre ordinateur contribue à atteindre les objectifs de %1, tels que décrits sur son site web. L'application de calcul peut varier de temps en temps."
 
 #: ../user/info.php:42
 msgid "Privacy policy"
@@ -5038,15 +4672,11 @@ msgstr "Politique de confidentialité"
 
 #: ../user/info.php:43
 msgid ""
-"Your account on %1 is identified by a name that you choose. This name may be "
-"shown on the %1 web site, along with a summary of the work your computer has "
-"done for %1. If you want to be anonymous, choose a name that doesn't reveal "
-"your identity."
-msgstr ""
-"Votre compte sur %1 est identifié par un pseudonyme que vous choisissez. Ce "
-"pseudo peut être affiché sur le site %1 ainsi qu'un résumé des jobs calculés "
-"par votre ordinateur %1. Si vous désirez rester anonyme, choisissez un nom "
-"qui ne révèle pas votre identité."
+"Your account on %1 is identified by a name that you choose. This name may be"
+" shown on the %1 web site, along with a summary of the work your computer "
+"has done for %1. If you want to be anonymous, choose a name that doesn't "
+"reveal your identity."
+msgstr "Votre compte sur %1 est identifié par un pseudonyme que vous choisissez. Ce pseudo peut être affiché sur le site %1 ainsi qu'un résumé des jobs calculés par votre ordinateur %1. Si vous désirez rester anonyme, choisissez un nom qui ne révèle pas votre identité."
 
 #: ../user/info.php:44
 msgid ""
@@ -5055,24 +4685,14 @@ 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 ""
-"Si vous participez à %1, des informations concernant votre ordinateur (comme "
-"votre processeur, la mémoire installée, etc...) seront enregistrées par %1 "
-"et utilisées afin de décider quel type de job vous recevrez. Ces "
-"informations seront également visibles sur le site de %1. En revanche, rien "
-"ne servant à vous identifier (comme votre nom de domaine ou votre adresse "
-"réseau) ne sera affiché."
+msgstr "Si vous participez à %1, des informations concernant votre ordinateur (comme votre processeur, la mémoire installée, etc...) seront enregistrées par %1 et utilisées afin de décider quel type de job vous recevrez. Ces informations seront également visibles sur le site de %1. En revanche, rien ne servant à vous identifier (comme votre nom de domaine ou votre adresse réseau) ne sera affiché."
 
 #: ../user/info.php:45
 msgid ""
-"To participate in %1, you must give an address where you receive email. This "
-"address will not be shown on the %1 web site or shared with organizations. %"
-"1 may send you periodic newsletters; however, you can opt out at any time."
-msgstr ""
-"Pour participer à %1, vous devez donner une adresse mail valide. Celle-ci ne "
-"sera pas montrée sur le site de %1, ni partagée avec d'autres sites ou "
-"sociétés. %1 peut vous y envoyer ses newsletters, mais vous pouvez vous y "
-"désinscrire quand bon vous semble."
+"To participate in %1, you must give an address where you receive email. This"
+" address will not be shown on the %1 web site or shared with organizations. "
+"%1 may send you periodic newsletters; however, you can opt out at any time."
+msgstr "Pour participer à %1, vous devez donner une adresse mail valide. Celle-ci ne sera pas montrée sur le site de %1, ni partagée avec d'autres sites ou sociétés. %1 peut vous y envoyer ses newsletters, mais vous pouvez vous y désinscrire quand bon vous semble."
 
 #: ../user/info.php:46
 msgid ""
@@ -5081,25 +4701,15 @@ 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 ""
-"Les messages privés envoyés sur le site de %1 ne sont visibles que de "
-"l'expéditeur et du destinataire. %1 n'examine ni ne modère le contenu de ces "
-"messages. Si vous recevez des messages non désirés en provenance d'un autre "
-"utilisateur de %1, vous pouvez ajouter cette personne à votre %2filtre de "
-"messages%3. Les messages publics et privés en provenance de cet utilisateur "
-"seront bloqués."
+msgstr "Les messages privés envoyés sur le site de %1 ne sont visibles que de l'expéditeur et du destinataire. %1 n'examine ni ne modère le contenu de ces messages. Si vous recevez des messages non désirés en provenance d'un autre utilisateur de %1, vous pouvez ajouter cette personne à votre %2filtre de messages%3. Les messages publics et privés en provenance de cet utilisateur seront bloqués."
 
 #: ../user/info.php:47
 msgid ""
 "If you use our web site forums you must follow the %2posting guidelines%3.  "
 "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 ""
-"Si vous utilisez les forums de notre site, vous devez suivre le %2guide du "
-"forum%3.  Les messages postés sur les forums %1 sont visibles pour tous, "
-"même les non-membres.  En postant sur les forums, vous accorder à tout le "
-"monde, de façon irrévocable, la possibilité de voir et copier vos messages."
+"members.  By posting to the forums, you are granting irrevocable license for"
+" anyone to view and copy your posts."
+msgstr "Si vous utilisez les forums de notre site, vous devez suivre le %2guide du forum%3.  Les messages postés sur les forums %1 sont visibles pour tous, même les non-membres.  En postant sur les forums, vous accorder à tout le monde, de façon irrévocable, la possibilité de voir et copier vos messages."
 
 #: ../user/info.php:48
 msgid "Is it safe to run %1?"
@@ -5109,36 +4719,23 @@ msgstr "Est-il sûr de lancer %1 ?"
 msgid ""
 "Any time you download a program through the Internet you are taking a "
 "chance: the program might have dangerous errors, or the download server "
-"might have been hacked. %1 has made efforts to minimize these risks. We have "
-"tested our applications carefully. Our servers are behind a firewall and 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 ""
-"A chaque fois que vous téléchargez un programme par internet vous jouez "
-"votre chance : le programme peut contenir des erreurs dangereuses, ou le "
-"serveur de téléchargement peut avoir été compromis. %1 a fait des efforts "
-"pour minimiser ces risques. Nous avons testé nos applications avec "
-"attention. Nos serveurs sont derrière des pares-feu et sont configurés pour "
-"une haute sécurité. Pour assurer l'intégrité des téléchargements de "
-"programmes, tous les fichiers exécutables sont signés numériquement sur un "
-"ordinateur sécurisé non connecté à internet."
+"might have been hacked. %1 has made efforts to minimize these risks. We have"
+" tested our applications carefully. Our servers are behind a firewall and "
+"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 "A chaque fois que vous téléchargez un programme par internet vous jouez votre chance : le programme peut contenir des erreurs dangereuses, ou le serveur de téléchargement peut avoir été compromis. %1 a fait des efforts pour minimiser ces risques. Nous avons testé nos applications avec attention. Nos serveurs sont derrière des pares-feu et sont configurés pour une haute sécurité. Pour assurer l'intégrité des téléchargements de programmes, tous les fichiers exécutables sont signés  [...]
 
 #: ../user/info.php:50
 msgid ""
 "The applications run by %1 may cause some computers to overheat. If this "
 "happens, stop running %1 or use a %2utility program%3 that limits CPU usage."
-msgstr ""
-"Les applications lancées par %1 peuvent engendrer une surchauffe sur "
-"certains ordinateurs. Si cela se produit, arrêter %1 ou utiliser un %"
-"2programme utilitaire%3 pour limiter l'utilisation du CPU."
+msgstr "Les applications lancées par %1 peuvent engendrer une surchauffe sur certains ordinateurs. Si cela se produit, arrêter %1 ou utiliser un %2programme utilitaire%3 pour limiter l'utilisation du CPU."
 
 #: ../user/info.php:51
 msgid ""
 "%1 was developed by %2. BOINC was developed at the University of California."
-msgstr ""
-"%1 a été développé par %2. BOINC a été développé à l'Université de "
-"Californie."
+msgstr "%1 a été développé par %2. BOINC a été développé à l'Université de Californie."
 
 #: ../user/info.php:53
 msgid "Liability"
@@ -5147,12 +4744,9 @@ msgstr "Responsabilité"
 #: ../user/info.php:54
 msgid ""
 "%1 and %2 assume no liability for damage to your computer, loss of data, or "
-"any other event or condition that may occur as a result of participating in %"
-"1."
-msgstr ""
-"%1 et %2 n'assument aucune responsabilité pour les dommages éventuels à "
-"votre ordinateur, la perte de données, ou tout autre événement ou condition "
-"qui peuvent être engendrés par la participation à %1."
+"any other event or condition that may occur as a result of participating in "
+"%1."
+msgstr "%1 et %2 n'assument aucune responsabilité pour les dommages éventuels à votre ordinateur, la perte de données, ou tout autre événement ou condition qui peuvent être engendrés par la participation à %1."
 
 #: ../user/info.php:56
 msgid "Other BOINC projects"
@@ -5160,24 +4754,17 @@ msgstr "Autres projets BOINC"
 
 #: ../user/info.php:57
 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 "
+"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 ""
-"D'autre projets utilisent la même plateforme BOINC, comme %1. Vous pouvez "
-"participer à un ou plusieurs de ces projets. Ce faisant, votre ordinateur "
-"participera à un travail utile, même lorsque %1 n'a aucune tâche disponible "
-"actuellement."
+msgstr "D'autre projets utilisent la même plateforme BOINC, comme %1. Vous pouvez participer à un ou plusieurs de ces projets. Ce faisant, votre ordinateur participera à un travail utile, même lorsque %1 n'a aucune tâche disponible actuellement."
 
 #: ../user/info.php:58
 msgid ""
 "These other projects are not associated with %1, and we cannot vouch for "
 "their security practices or the nature of their research. Join them at your "
 "own risk."
-msgstr ""
-"Ces autres projets ne sont pas associés à %1, et nous ne pouvons pas nous "
-"porter garant de leur pratiques de sécurité ou de la nature de leur "
-"recherches. Vous pouvez les rejoindre mais à vos propres risques."
+msgstr "Ces autres projets ne sont pas associés à %1, et nous ne pouvons pas nous porter garant de leur pratiques de sécurité ou de la nature de leur recherches. Vous pouvez les rejoindre mais à vos propres risques."
 
 #: ../user/language_select.php:47
 msgid "Language selection"
@@ -5187,17 +4774,13 @@ msgstr "Choix de la langue"
 msgid ""
 "This web site is available in several languages. The currently selected "
 "language is %1."
-msgstr ""
-"Ce site web est disponible dans plusieurs langues. La langue sélectionnée "
-"actuellement est %1."
+msgstr "Ce site web est disponible dans plusieurs langues. La langue sélectionnée actuellement est %1."
 
 #: ../user/language_select.php:78
 msgid ""
 "Normally the choice of language is determined by your browser's language "
 "setting, which is: %1.  You can change this setting using:"
-msgstr ""
-"Normalement, le choix de la langue est déterminé par la langue configurée "
-"dans votre navigateur, qui est : %1.  Vous pouvez la modifier en utilisant :"
+msgstr "Normalement, le choix de la langue est déterminé par la langue configurée dans votre navigateur, qui est : %1.  Vous pouvez la modifier en utilisant :"
 
 #: ../user/language_select.php:83
 msgid "Firefox: Tools/Options/General"
@@ -5212,10 +4795,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 ""
-"Ou vous pouvez choisir une langue en cliquant sur l'un des liens.  Ceci "
-"enverra un cookie à votre navigateur. Assurez-vous alors que votre "
-"navigateur accepte les cookies provenant de notre domaine."
+msgstr "Ou vous pouvez choisir une langue en cliquant sur l'un des liens.  Ceci enverra un cookie à votre navigateur. Assurez-vous alors que votre navigateur accepte les cookies provenant de notre domaine."
 
 #: ../user/language_select.php:95
 msgid "Language name (click to select)"
@@ -5227,11 +4807,9 @@ msgstr "Utiliser la langue paramétrée dans le navigateur"
 
 #: ../user/language_select.php:113
 msgid ""
-"Translations are done by volunteers.  If your native language is not here, %"
-"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."
+"Translations are done by volunteers.  If your native language is not here, "
+"%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:"
@@ -5277,17 +4855,7 @@ msgid ""
 "        having that name with the newest computer having that name.\n"
 "        Incompatible computers will not be merged.\n"
 "        <p>"
-msgstr ""
-"Cette opération fusionne les ordinateurs en fonction de leur nom de domaine. "
-" \n"
-"                     <p>\n"
-"                        Pour chaque nom de domaine, tous les ordinateurs les "
-"plus anciens ayant ce nom\n"
-"                       seront fusionnés avec les ordinateurs les plus "
-"récents ayant ce nom.\n"
-"                       Les ordinateurs incompatibles ne seront pas "
-"fusionnés.\n"
-"                       <p>"
+msgstr "Cette opération fusionne les ordinateurs en fonction de leur nom de domaine.  \n                     <p>\n                        Pour chaque nom de domaine, tous les ordinateurs les plus anciens ayant ce nom\n                       seront fusionnés avec les ordinateurs les plus récents ayant ce nom.\n                       Les ordinateurs incompatibles ne seront pas fusionnés.\n                       <p>"
 
 #: ../user/merge_by_name.php:82
 msgid "Go ahead and do this"
@@ -5303,10 +4871,7 @@ msgid ""
 "To maximize discussion and flow of information,\n"
 "our message boards are moderated.\n"
 "Message board postings are subject to the following posting rules:\n"
-msgstr ""
-"Afin de maximiser la discussion et la circulation de l'information, \n"
-"nos forums sont modérés.\n"
-"Les messages des forums sont soumis aux règles suivantes:\n"
+msgstr "\nAfin de maximiser la discussion et la circulation de l'information, \nnos forums sont modérés.\nLes messages des forums sont soumis aux règles suivantes:\n"
 
 #: ../user/moderation.php:30
 msgid ""
@@ -5315,8 +4880,7 @@ msgid ""
 "Moderators may delete posts that violate any of these rules.\n"
 "The authors of deleted posts will be notified via email.\n"
 "Gross offenders may have their ability to post messages temporarily revoked\n"
-"(though to prevent abuse only project administrators have the ability to do "
-"so).\n"
+"(though to prevent abuse only project administrators have the ability to do so).\n"
 "Additional kinds of bad behavior (\"bugging\" posts to trap the\n"
 "IP addresses of other participants, excessive thread creation to spam\n"
 "the forums, etc.), while not listed in the formal rules, may still\n"
@@ -5345,53 +4909,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>Les modérateurs peuvent supprimer les messages qui ne respectent pas "
-"l'une de ces règles.\n"
-"Les auteurs des messages supprimés seront avisés par e-mail.\n"
-"Les auteurs offensants peuvent avoir leur capacité à envoyer des messages "
-"temporairement\n"
-"révoquée(mais pour éviter les abus seuls les administrateurs de projets ont "
-"la capacité de le\n"
-"faire).\n"
-"D'autres types de mauvais comportement («messages piégés» pour  pour "
-"récupérer les \n"
-"Adresses IP des autres participants, création de sujets excessive pour "
-"spammerles forums, etc),\n"
-"bien que ne figurant pas dans les règles formelles, peuvent conduire à des "
-"sanctions similaires.\n"
-"<p>\n"
-" Si vous pensez qu'un message viole l'une des règles du forum,cliquez sur le "
-"X rouge\n"
-" sur le message et remplissez le formulaire,les modérateurs seront avisés de "
-"votre plainte.\n"
-"Veuillez n'utiliser ce bouton que pour des violations claires - pas des "
-"conflits personnels.\n"
-"<p>\n"
-"Nous essayons d'être aussi justes que possible dans la modération,mais dans "
-"une large\n"
-" communauté d'utilisateurs avec de nombreux points de vue différents,il y "
-"aura toujours\n"
-" certaines personnes qui ne seront pas satisfaites de nos décisions de "
-"modération.\n"
-"Bien que nous regrettions que cela se produise,comprennez que nous ne "
-"pouvons pas\n"
-" satisfaire tout le monde tout le temps et devons prendre des décisions "
-"basées sur nos\n"
-" ressources et sur ce qui est le mieux pour le forum dans son ensemble.\n"
-"Merci de ne pas critiquer notre politique de modération sur les forums. Nous "
-"ne sommes pas\n"
-"un projet d'ingénierie sociale et nous ne sommes dans le domaine de la "
-"créationd'un système\n"
-" tout à fait juste. Donc ce type de discussion tend à être contre-"
-"productiveet potentiellement incendiaire.\n"
-" Si vous avez une réclamation légitime,envoyez un courriel à l'adresse ci-"
-"dessous.\n"
-"<p>\n"
-" Cette politique de modération est fixée par le projet 1%.\n"
-"Si vous avez des commentaires au sujet de cette politique, envoyez un e-mail "
-"à 2%.\n"
+msgstr "\n<p>Les modérateurs peuvent supprimer les messages qui ne respectent pas l'une de ces règles.\nLes auteurs des messages supprimés seront avisés par e-mail.\nLes auteurs offensants peuvent avoir leur capacité à envoyer des messages temporairement\nrévoquée(mais pour éviter les abus seuls les administrateurs de projets ont la capacité de le\nfaire).\nD'autres types de mauvais comportement («messages piégés» pour  pour récupérer les \nAdresses IP des autres participants, création d [...]
 
 #: ../user/pending.php:66
 msgid "Pending credit"
@@ -5474,12 +4992,7 @@ 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."
+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
 msgid "Could not find user with id %1"
@@ -5491,9 +5004,7 @@ msgstr "Impossible de trouver l'utilisateur avec le nom d'utilisateur %1"
 
 #: ../user/pm.php:212
 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."
+msgstr "%1 est un nom d'utilisateur déjà attribué; merci de choisir un autre identifiant."
 
 #: ../user/pm.php:217
 msgid "User %1 (ID: %2) is not accepting private messages from you."
@@ -5511,23 +5022,17 @@ msgstr "Voulez-vous réellement bloquer %1 ?"
 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 ?"
+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
 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."
+msgstr "Veuillez noter que vous ne pouvez bloquer qu'un nombre limité d'utilisateurs."
 
 #: ../user/pm.php:245
 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\"."
+msgstr "Un fois l'utilisateur bloqué, vous pouvez le débloquer en utilisant la page \"préférences du forum\"."
 
 #: ../user/pm.php:252
 msgid "No, cancel"
@@ -5543,9 +5048,7 @@ msgstr "Utilisateur %1 bloqué"
 
 #: ../user/pm.php:265
 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."
+msgstr "L'utilisateur %1 a été bloqué et ne peut plus vous envoyer de messages privés."
 
 #: ../user/pm.php:266
 msgid "To unblock, visit %1message board preferences%2"
@@ -5560,22 +5063,14 @@ 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\n"
-"seront prises en compte lorsque votre ordinateur communiquera avec %1\n"
-"ou si vous utilisez la commande %2Mise à jour%3 depuis le 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
 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."
+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
 msgid "%1 for %2"
@@ -5605,25 +5100,19 @@ msgstr "Annuler"
 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é."
+msgstr "%1Profils%2 permet à chacun de partager des choses et opinions avec la communauté."
 
 #: ../user/profile_menu.php:36
 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."
+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
 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 !"
+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
 msgid "User of the Day"
@@ -5645,9 +5134,7 @@ msgstr "Parcourir les profils %1par pays%2."
 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."
+msgstr "Parcourir les profils %1aléatoirement%2, %3aléatoirement avec photos%2, ou %4aléatoirement sans photos%2."
 
 #: ../user/profile_menu.php:66
 msgid "Alphabetical profile listings:"
@@ -5829,7 +5316,6 @@ msgstr "Unités de travail en attente de nettoyage de fichiers"
 msgid "Tasks waiting for file deletion"
 msgstr "Tâches en attente de nettoyage de fichiers"
 
-# aucune idée de comment traduire ce truc...
 #: ../user/server_status.php:367
 msgid "Transitioner backlog (hours)"
 msgstr "Transitioner backlog (heures)"
@@ -5892,28 +5378,21 @@ msgstr "Statistiques de %1"
 
 #: ../user/stats.php:37
 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 :"
+"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
 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\" :"
+"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
 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."
+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 "%1 participants may form %2teams%3."
@@ -5922,9 +5401,7 @@ msgstr "%1 participants peuvent former une %2équipes%"
 #: ../user/team.php:29
 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."
+msgstr "Vous ne pouvez appartenir qu'à une seule équipe. Vous pouvez quitter ou joindre une équipe à tout moment."
 
 #: ../user/team.php:31
 msgid "Each team has a %1founder%2 who may:"
@@ -5952,9 +5429,7 @@ msgstr "supprimer l'équipe si elle n'a aucun membre"
 
 #: ../user/team.php:40
 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."
+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
 msgid "Find a team"
@@ -5975,9 +5450,7 @@ msgstr "Créer une nouvelle équipe"
 #: ../user/team.php:59
 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."
+msgstr "Si vous ne trouvez pas d'équipe vous correspondant, vous pouvez %1créer une équipe%2."
 
 #: ../user/team_admins.php:34
 msgid "Remove Team Admin status from this member"
@@ -5989,10 +5462,7 @@ msgstr "Ajouter ou supprimer des administrateurs de l'équipe"
 
 #: ../user/team_admins.php:41
 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'.\n"
-"Ces administrateurs peuvent :"
+msgstr "Vous pouvez sélectionner des membres de l'équipe comme 'administrateurs de l'équipe'.\nCes administrateurs peuvent :"
 
 #: ../user/team_admins.php:43
 msgid "Edit team information (name, URL, description, country)"
@@ -6004,12 +5474,9 @@ msgstr "Voir l'historique des entrées/départs de l'équipe"
 
 #: ../user/team_admins.php:45
 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')"
+"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
 msgid "Team Admins cannot:"
@@ -6025,18 +5492,13 @@ msgstr "Supprimer des membres"
 
 #: ../user/team_admins.php:53
 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."
+msgstr "Si une administrateur quitte l'équipe, il cesse d'être administrateur d'équipe."
 
 #: ../user/team_admins.php:54
 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."
+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
 msgid "There are currently no Team Admins"
@@ -6106,18 +5568,13 @@ msgstr "Modifier le fondateur de %1"
 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."
+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
 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."
+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
 msgid "decline request"
@@ -6125,15 +5582,9 @@ msgstr "décline la requête"
 
 #: ../user/team_change_founder_form.php:58
 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."
+"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
 msgid "No transfer request is pending."
@@ -6143,10 +5594,7 @@ msgstr "Aucune requête de transfert en attente."
 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."
+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
 msgid "New founder?"
@@ -6179,9 +5627,7 @@ msgstr "Créer une équipe"
 #: ../user/team_create_form.php:30
 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."
+msgstr "Vous appartenez à l'équipe %1. Vous devez %2quitter cette équipe%3 avant d'en créer une."
 
 #: ../user/team_delta.php:65
 msgid "Not founder or admin"
@@ -6261,9 +5707,7 @@ msgstr "Selon votre choix, seuls les membres pourront lire."
 
 #: ../user/team_forum.php:33
 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."
+msgstr "Vous et les administrateurs de votre équipe auront les privilèges de modérateur."
 
 #: ../user/team_forum.php:40
 msgid "Create a message board for %1"
@@ -6306,10 +5750,7 @@ 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)."
+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
 msgid "Yes - remove message board"
@@ -6321,10 +5762,9 @@ msgstr "Le forum a été supprimé"
 
 #: ../user/team_forum.php:124
 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."
+"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
 msgid "Team Message Board Updated"
@@ -6352,21 +5792,14 @@ msgstr "Demande en cours du titre de fondateur pour %1"
 
 #: ../user/team_founder_transfer_action.php:98
 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."
+"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
 msgid "Foundership request not allowed now"
-msgstr ""
-"Les requêtes pour le titre de fondateur ne sont pas autorisées actuellement."
+msgstr "Les requêtes pour le titre de fondateur ne sont pas autorisées actuellement."
 
 #: ../user/team_founder_transfer_action.php:109
 msgid "Assumed foundership of %1"
@@ -6376,9 +5809,7 @@ msgstr "Titre de fondateur assumé pour %1"
 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."
+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
 msgid "Decline founder change request"
@@ -6421,10 +5852,7 @@ msgstr "Vous avez demandé le titre de fondateur de %1 le %2."
 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 :"
+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
 msgid "Assume foundership"
@@ -6434,26 +5862,13 @@ msgstr "Prendre le titre de fondateur"
 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."
+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
 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"
+"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 ?"
+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
 msgid "Request foundership"
@@ -6461,16 +5876,13 @@ msgstr "Demander le titre de fondateur"
 
 #: ../user/team_founder_transfer_form.php:74
 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."
+msgstr "Une demande de changement de fondateur a déjà été effectuée par %1 le %2."
 
 #: ../user/team_founder_transfer_form.php:77
 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."
+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
@@ -6507,8 +5919,7 @@ msgstr "Veuillez noter :"
 
 #: ../user/team_join_form.php:35
 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."
+msgstr "Rejoindre une équipe donne à son fondateur l'accès à votre adresse e-mail."
 
 #: ../user/team_join_form.php:36
 msgid "Joining a team does not affect your account's credit."
@@ -6528,23 +5939,17 @@ msgstr "Résultats pour la recherche de '%1'"
 
 #: ../user/team_lookup.php:88
 msgid "You may view these teams' members, statistics, and information."
-msgstr ""
-"Vous pouvez voir les membres, les statistiques et les informations de ces "
-"équipes."
+msgstr "Vous pouvez voir les membres, les statistiques et les informations de ces équipes."
 
 #: ../user/team_lookup.php:98
 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."
+msgstr "Plus de 100 équipes correspondent à vos critères de recherche. Seules les 100 premières sont affichées."
 
 #: ../user/team_lookup.php:104
 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."
+"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
 msgid "Team administration for %1"
@@ -6592,9 +5997,7 @@ msgstr "Répondre à une requête de titre de fondateur."
 
 #: ../user/team_manage.php:50
 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."
+msgstr "Si vous ne répondez pas par %1, %2 pourra obtenir le titre de fondateur de cette équipe."
 
 #: ../user/team_manage.php:55
 msgid "Remove inactive or unwanted members from this team"
@@ -6610,8 +6013,7 @@ msgstr "Ajouter/Supprimer un administrateur de l'équipe"
 
 #: ../user/team_manage.php:59
 msgid "Give selected team members Team Admin privileges"
-msgstr ""
-"Donner les privilèges d'administrateur de l'équipe aux membres sélectionnés"
+msgstr "Donner les privilèges d'administrateur de l'équipe aux membres sélectionnés"
 
 #: ../user/team_manage.php:61
 msgid "Remove team"
@@ -6627,27 +6029,21 @@ msgstr "Créer ou gérer un forum d'équipe"
 
 #: ../user/team_manage.php:71
 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."
+"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
 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."
+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."
+"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"
@@ -6659,8 +6055,7 @@ msgstr "L'équipe %1 a été supprimée"
 
 #: ../user/team_members.php:36
 msgid "Limit exceeded:  Can only display the first 1000 members."
-msgstr ""
-"Limite dépassée : seuls les 1000 premiers membres peuvent être affichés."
+msgstr "Limite dépassée : seuls les 1000 premiers membres peuvent être affichés."
 
 #: ../user/team_members.php:49
 msgid "Members of %1"
@@ -6682,19 +6077,10 @@ msgstr "Quitter %1"
 msgid ""
 "<strong>Please note before quitting a team:</strong>\n"
 "         <ul>\n"
-"         <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"
+"         <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>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>"
+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
 msgid "Quit Team"
@@ -6742,9 +6128,7 @@ msgstr "Résultats de la recherche d'équipe"
 
 #: ../user/team_search.php:94
 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."
+msgstr "Aucune équipe correspondant à vos critères n'a été trouvée. Essayez une autre recherche."
 
 #: ../user/team_search.php:96
 msgid "Or you can %1create a new team%2."
@@ -6755,12 +6139,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 ""
-"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."
+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
 msgid "Change your search"
@@ -6770,16 +6149,11 @@ msgstr "Modifier votre recherche"
 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."
+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
 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."
+msgstr "Utiliser ce formulaire pour trouver des équipes qui peuvent vous correspondre."
 
 #: ../user/team_search.php:188
 msgid "%1I'm not interested%2 in joining a team right now."
@@ -6902,9 +6276,7 @@ msgstr "Valider l'adresse e-mail BOINC"
 msgid ""
 "Please visit the following link to validate the email address of your %1 "
 "account:"
-msgstr ""
-"Veuillez visiter le lien suivant pour valider l'adresse e-mail pour votre "
-"compte %1 :"
+msgstr "Veuillez visiter le lien suivant pour valider l'adresse e-mail pour votre compte %1 :"
 
 #: ../user/validate_email_addr.php:34
 msgid "Validate email sent"
@@ -6914,9 +6286,7 @@ msgstr "E-mail de validation envoyé"
 msgid ""
 "An email has been sent to %1. Visit the link it contains to validate your "
 "email address."
-msgstr ""
-"Un e-mail a été envoyé à %1. Visitez le lien qu'il contient pour valider "
-"votre adresse e-mail."
+msgstr "Un e-mail a été envoyé à %1. Visitez le lien qu'il contient pour valider votre adresse e-mail."
 
 #: ../user/validate_email_addr.php:44
 msgid "No such user."
@@ -6924,14 +6294,11 @@ msgstr "Utilisateur inexistant."
 
 #: ../user/validate_email_addr.php:49
 msgid "Error in URL data - can't validate email address"
-msgstr ""
-"Erreur dans les données de l'URL - impossible de valider l'adresse e-mail"
+msgstr "Erreur dans les données de l'URL - impossible de valider l'adresse e-mail"
 
 #: ../user/validate_email_addr.php:54
 msgid "Database update failed - please try again later."
-msgstr ""
-"Échec de la mise à jour de la base de données - veuillez réessayer "
-"ultérieurement."
+msgstr "Échec de la mise à jour de la base de données - veuillez réessayer ultérieurement."
 
 #: ../user/validate_email_addr.php:57
 msgid "Validate email address"
@@ -6955,15 +6322,10 @@ msgstr "Données de compte"
 
 #: ../user/weak_auth.php:52
 msgid ""
-"You can access your account either by using your email address and "
-"password,\n"
+"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 ""
-"Vous pouvez accéder à votre compte soit en utilisant votre adresse email et "
-"mot de passe\n"
-"             ou en utilisant une 'clé de compte'.\n"
-"             Votre clé de compte est :"
+msgstr "Vous pouvez accéder à votre compte soit en utilisant votre adresse email et mot de passe\n             ou en utilisant une 'clé de compte'.\n             Votre clé de compte est :"
 
 #: ../user/weak_auth.php:57
 msgid "This key can be used to:"
@@ -6979,11 +6341,7 @@ msgid ""
 "       To do so, install BOINC,\n"
 "       create a file named %1 in the BOINC\n"
 "       data directory, and set its contents to:"
-msgstr ""
-"pour rattacher un ordinateur à votre compte sans utiliser le BOINC Manager\n"
-"                        Vous devez installer BOINC,\n"
-"                        crée un répertoire nommé %1 dans le répertoire\n"
-"                         de données BOINC, et définir son contenu à:"
+msgstr "pour rattacher un ordinateur à votre compte sans utiliser le BOINC Manager\n                        Vous devez installer BOINC,\n                        crée un répertoire nommé %1 dans le répertoire\n                         de données BOINC, et définir son contenu à:"
 
 #: ../user/weak_auth.php:73
 msgid "Weak account key"
@@ -6992,28 +6350,17 @@ msgstr "Clé de compte non robuste"
 #: ../user/weak_auth.php:74
 msgid ""
 "Your 'weak account key' can be used to attach computers to your account\n"
-"    as described above, but cannot be used to log in to your account or "
-"change it in any way.\n"
+"    as described above, but cannot be used to log in to your account or change it in any way.\n"
 "    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 ""
-"Votre 'clé de compte non robuste' peut être utilisée pour rattacher des "
-"ordinateurs à votre compte\n"
-"        comme décrit ci-dessus, mais ne peut pas être utilisée pour se "
-"connecter à votre compte ou le modifier en aucune façon.\n"
-"        Si vous voulez rattacher des ordinateurs dans lesquels vous n'avez "
-"pas confiance ou qui ne sont pas sûrs à votre compte,\n"
-"        faites le avec votre clé de compte non robuste.\n"
-"        Votre clé de compte non robuste est:"
+msgstr "Votre 'clé de compte non robuste' peut être utilisée pour rattacher des ordinateurs à votre compte\n        comme décrit ci-dessus, mais ne peut pas être utilisée pour se connecter à votre compte ou le modifier en aucune façon.\n        Si vous voulez rattacher des ordinateurs dans lesquels vous n'avez pas confiance ou qui ne sont pas sûrs à votre compte,\n        faites le avec votre clé de compte non robuste.\n        Votre clé de compte non robuste est:"
 
 #: ../user/weak_auth.php:81
 msgid ""
 "If you change your password, your weak account key changes, and your "
 "previous weak account key becomes invalid."
-msgstr ""
-"Si vous changez votre mot de passe, votre clé de compte non robuste change, "
-"et vos clés de compte non robustes antérieures ne sont plus valides."
+msgstr "Si vous changez votre mot de passe, votre clé de compte non robuste change, et vos clés de compte non robustes antérieures ne sont plus valides."
 
 #: ../user/workunit.php:32
 msgid "can't find workunit"
@@ -7079,9 +6426,7 @@ msgstr "Votre parcours personnel."
 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."
+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
 msgid "Your opinions about %1"
@@ -7094,12 +6439,7 @@ msgid ""
 "    <li>What are your views about the project?\n"
 "    <li>Any suggestions?\n"
 "    </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>"
+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
 msgid "Color scheme for graphics"
@@ -7117,301 +6457,8 @@ msgstr "Utiliser uniquement les applications sélectionnées"
 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 ? "
+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
 msgid "(all applications)"
 msgstr "(toutes les applications)"
-
-#~ msgid "Error:"
-#~ msgstr "Erreur:"
-
-#~ msgid "Account creation is disabled"
-#~ msgstr "La création de compte est désactivée"
-
-#~ msgid ""
-#~ "Sorry, this project has disabled the creation of new accounts.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Désolé, ce projet a désactivé la création de nouveaux comptes.\n"
-#~ "Merci de réessayer plus tard."
-
-#~ msgid "Account creation is currently disabled. Please try again later."
-#~ msgstr ""
-#~ "La création de compte est désactivée pour le moment. Veuillez réessayer plus "
-#~ "tard."
-
-#~ msgid "nvidia GPU"
-#~ msgstr "GPU nvidia"
-
-#~ msgid ""
-#~ "This project hasn\\'t created an email message - please notify its "
-#~ "administrators"
-#~ msgstr ""
-#~ "Ce projet n'a pas créé de message email - merci de le signaler à ses "
-#~ "administrateurs"
-
-#~ msgid ""
-#~ "These apply to all BOINC projects in which you participate.<br>\n"
-#~ "             On computers participating in multiple projects, the most "
-#~ "recently modified preferences will be used."
-#~ msgstr ""
-#~ "Cela s'applique à tous les projets BOINC auxquels vous participez.<br>\n"
-#~ "           Sur les ordinateurs qui participent à plusieurs projets, les "
-#~ "dernières modifications des préférences seront utilisées."
-
-#~ msgid "Export this news item as a Notice"
-#~ msgstr "Exporter cette actualité en tant que Notification"
-
-#~ msgid ""
-#~ "Go to the BOINC data directory on your computer (on Windows this is usually "
-#~ "<b>C:\\Documents and Settings\\All Users\\Application Data\\BOINC</b> or "
-#~ "<b>C:\\Program Files\\BOINC</b>."
-#~ msgstr ""
-#~ "Aller dans le répertoire BOINC data sur votre ordinateur (sous Windows cela "
-#~ "se trouve généralement   <b>C:\\Documents and Settings\\All Users\\Application "
-#~ "Data\\BOINC</b> ou <b>C:\\Program Files\\BOINC</b>)."
-
-#~ msgid "No such task"
-#~ msgstr "Aucune tâche de ce type"
-
-#~ msgid ""
-#~ "Computer is connected to the Internet about every %1 Leave blank or 0 if "
-#~ "always connected. %2 BOINC will try to maintain at least this much work (max "
-#~ "10 days). %3"
-#~ msgstr ""
-#~ "L'ordinateur est connecté à internet environ tous les %1 Laisser vide ou à 0 "
-#~ "si connecté en permanence.%2BOINC va essayer de maintenir au moins cette "
-#~ "quantité de travail (10 jours max).%3"
-
-#~ msgid "Maintain enough work for an additional"
-#~ msgstr "Maintenir suffisamment de travail pour un additionnel"
-
-#~ msgid "Update failed: "
-#~ msgstr "Échec de la mise à jour : "
-
-#~ msgid "Provides %1limited access%2 to your account"
-#~ msgstr "Fournit un %1accès limité%2 àvotre compte"
-
-#~ msgid ""
-#~ "Don't use this form. Just run BOINC, select Add Project, and enter an email "
-#~ "address and password."
-#~ msgstr ""
-#~ "N'utilisez pas ce formulaire. Lancez simplement le BOINC manager, "
-#~ "sélectionnez \"Ajouter un projet\", et saisissez votre adresse email et votre "
-#~ "mot de passe."
-
-#~ msgid "Do not reorder sticky posts"
-#~ msgstr "Ne pas trier les sujets épinglés"
-
-#~ msgid "If a thread contains more than this number of posts"
-#~ msgstr "Si un sujet contient plus que ce nombre de messages"
-
-#~ msgid "only display the first one and this many of the last ones"
-#~ msgstr "ne montrer que le premier message et cette quantité parmi les derniers"
-
-#~ msgid "Your report has been recorded. Thanks you for your input."
-#~ msgstr "Votre signalement a été enregistré. Merci de votre participation."
-
-#~ msgid "Search type"
-#~ msgstr "Type de recherche"
-
-#~ msgid "User names starting with"
-#~ msgstr "Noms d'utilisateurs commençant par"
-
-#~ msgid ""
-#~ "Your 'weak account key' lets you link a computer to your account without "
-#~ "giving it the ability to log in to your account or to change it in any way."
-#~ msgstr ""
-#~ "Votre 'clé de compte faible' vous permet d'attacher des ordinateurs à votre "
-#~ "compte sans pour autant leur donner la possibilité de se connecter à votre "
-#~ "compte ou de le modifier."
-
-#~ msgid ""
-#~ "This mechanism works only with projects that have upgraded their server "
-#~ "software 7 Dec 2007 or later."
-#~ msgstr ""
-#~ "Ce mécanisme fonctionne seulement avec les projets qui ont fait une mise à "
-#~ "niveau logicielle de leur serveurs vers une version du 7 décembre 2007 ou "
-#~ "plus récente."
-
-#~ msgid "Your weak account key for this project is:"
-#~ msgstr "Votre clef de compte simplifiée pour ce projet est : "
-
-#~ msgid ""
-#~ "To use your weak account key on a given host, find or create the 'account "
-#~ "file' for this project. This file has a name of the form "
-#~ "<b>account_PROJECT_URL.xml</b>. The account file for %1 is <b>%2</b>."
-#~ msgstr ""
-#~ "Pour utiliser votre clef de compte simplifiée sur un hôte donné, rechercher "
-#~ "ou créer le 'fichier de compte' pour ce projet. Ce fichier a un nom de la "
-#~ "forme <b>compte_PROJET_URL.xml</b>. Le fichier de compte pour %1 est <b>%"
-#~ "2</b>."
-
-#~ msgid "Create this file if needed. Set its contents to:"
-#~ msgstr "Créer ce fichier si nécessaire. Y mettre le contenu suivant :"
-
-#~ msgid ""
-#~ "Your weak account key is a function of your password. If you change your "
-#~ "password, your weak account key changes, and your previous weak account key "
-#~ "becomes invalid."
-#~ msgstr ""
-#~ "Votre clef de compte simplifiée est fonction de votre mot de passe. Si vous "
-#~ "modifiez votre mot de passe, votre clef de compte simplifiée change, et vos "
-#~ "clefs de compte simplifiées précédentes deviennent invalides."
-
-#~ msgid "Account key"
-#~ msgstr "Clé de compte"
-
-#~ msgid "Provides full access to your account"
-#~ msgstr "Accès complet à votre compte"
-
-#~ msgid "Export"
-#~ msgstr "Exporter"
-
-#~ msgid "- private message"
-#~ msgstr "- message privé"
-
-#~ msgid "Private message from"
-#~ msgstr "Message privé de"
-
-#~ msgid "Email address verification pending"
-#~ msgstr "Vérification de l'adresse email en attente"
-
-#~ msgid "Logged in as %1."
-#~ msgstr "Connecté en tant que %1."
-
-#~ msgid "Log in as someone else."
-#~ msgstr "Connecté avec une autre identité."
-
-#~ msgid "No thread with id %1. Please check the link and try again."
-#~ msgstr "Aucun sujet avec l'id %1. Veuillez vérifier le lien et réessayer."
-
-#~ msgid "Request not found"
-#~ msgstr "Requête introuvable"
-
-#~ msgid "%1 has added you as a friend."
-#~ msgstr "%1 vous a ajouté en tant qu'ami."
-
-#~ msgid "Account data for %1"
-#~ msgstr "Données de compte pour %1"
-
-#~ msgid "couldn't create message board"
-#~ msgstr "impossible de créer le forum"
-
-#~ msgid "message board not found"
-#~ msgstr "impossible de trouver le forum"
-
-#~ msgid "no such forum"
-#~ msgstr "Ce forum n'existe pas"
-
-#~ msgid "unknown command %1"
-#~ msgstr "commande inconnue %1"
-
-#~ msgid "ERROR: %1 does not exist!  Cannot create combo box.<br>"
-#~ msgstr "ERREUR: %1 n'existe pas!  Impossible de créer la combo box.<br>"
-
-#~ msgid ""
-#~ "To protect the project's webpages from spam, we kindly ask you to type in "
-#~ "the two words shown in the image:<br>\n"
-#~ msgstr ""
-#~ "Afin de protéger les pages web du projet contre les attaques de spammeurs "
-#~ "nous vous demandons de bien vouloir saisir les deux mots de l'image :"
-#~ "<br>\n"
-
-#~ msgid "BOINC client version"
-#~ msgstr "Version du client BOINC"
-
-#~ msgid "Client detached"
-#~ msgstr "Client détaché"
-
-#~ msgid "Maximum daily WU quota per CPU"
-#~ msgstr "Quota maximum d'unité de travail (WU) journalier par CPU"
-
-#~ msgid "%1/day"
-#~ msgstr "%1 par jour"
-
-#~ msgid "Anonymous platform - CPU"
-#~ msgstr "Plateforme anonyme - CPU"
-
-#~ msgid "Anonymous platform - NVIDIA GPU"
-#~ msgstr "Plateforme anonyme - GPU NVIDIA"
-
-#~ msgid "Anonymous platform - ATI GPU"
-#~ msgstr "Plateforme anonyme - GPU ATI"
-
-#~ msgid "Task ID"
-#~ msgstr "ID de tâche"
-
-#~ msgid "Granted credit"
-#~ msgstr "Crédit accordé"
-
-#~ msgid "Click to"
-#~ msgstr "Cliquer pour"
-
-#~ msgid "(no restriction if equal)"
-#~ msgstr "(aucune restriction si égaux)"
-
-#~ msgid "percent of CPU time"
-#~ msgstr "pourcents du temps CPU"
-
-#~ msgid "Leave at least"
-#~ msgstr "Laisser au moins"
-
-#~ msgid "% of page file (swap space)"
-#~ msgstr "% du fichier de pagination (swap)"
-
-#~ msgid "Use ATI GPU if present %1(enforced by 6.10+ clients)%2"
-#~ msgstr "Utiliser le GPU ATI si présent %1(applicable aux clients 6.10+)%2"
-
-#~ msgid "KB/s"
-#~ msgstr "KB/s"
-
-#~ msgid "GB disk space"
-#~ msgstr "GB d'espace disque"
-
-#~ msgid "GB disk space free"
-#~ msgstr "GB d'espace disque disponible"
-
-#~ msgid "(no restriction)"
-#~ msgstr "(aucune restriction)"
-
-#~ msgid "%1 GB disk space"
-#~ msgstr "%1 GB d'espace disque"
-
-#~ msgid "%1 GB disk space free"
-#~ msgstr "%1 GB d'espace disque disponible"
-
-#~ msgid ""
-#~ "Resource share %1If you participate in multiple BOINC projects, this is "
-#~ "the proportion of your resources used by %2%3"
-#~ msgstr ""
-#~ "Partage de ressources %1Si vous participez à plusieurs projets BOINC, "
-#~ "c'est la proportion de vos ressources utilisée par %2%3"
-
-#~ msgid "Gbytes"
-#~ msgstr "Goctets"
-
-#~ msgid "Resource share"
-#~ msgstr "Ressource partagée"
-
-#~ msgid "stderr out"
-#~ msgstr "Sortie sur stderr"
-
-#~ msgid "<p>"
-#~ msgstr "<p>"
-
-#~ msgid "Last %1"
-#~ msgstr "Derniers %1"
-
-#~ msgid "CHARSET"
-#~ msgstr "CHARSET"
-
-#~ msgid "Resource share and graphics"
-#~ msgstr "Partage de ressources et graphiques"
-
-# c'est quoi ça ?
-#~ msgid "fll"
-#~ msgstr "fll"
diff --git a/locale/fr/BOINC-Setup.mo b/locale/fr/BOINC-Setup.mo
index 6d91479..4d7112a 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
index de473b4..95b4eb8 100755
--- a/locale/fr/BOINC-Setup.po
+++ b/locale/fr/BOINC-Setup.po
@@ -4,37 +4,36 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-01-26 00:00-0800\n"
-"PO-Revision-Date: 2015-02-10 22:30-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
-"X-Poedit-SearchPath-0: mac_installer\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
+#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
 msgid "Yes"
 msgstr "Oui"
 
-#: PostInstall.cpp:131
-#: PostInstall.cpp:1137
-#: uninstall.cpp:1619
+#: PostInstall.cpp:131 PostInstall.cpp:1137 uninstall.cpp:1619
 msgid "No"
 msgstr "Non"
 
@@ -45,18 +44,24 @@ 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"
+"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?"
+"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"
+"Les utilisateurs ayant les privilèges administrateurs sur cet ordinateur "
+"seront automatiquement autorisés à exécuter et contrôler %s.\n"
 "\n"
-"Voulez-vous aussi autoriser les utilisateurs non-administrateurs à exécuter et contrôler %s sur ce Mac ?"
+"Voulez-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"
@@ -83,7 +88,8 @@ msgid ""
 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."
+"Cela supprimera les fichiers exécutables mais pas les fichiers de données %"
+"s."
 
 #: uninstall.cpp:163
 #, c-format
@@ -120,7 +126,8 @@ msgid ""
 msgstr ""
 "Suppression effectuée.\n"
 "\n"
-"Vous voulez peut-être supprimer les éléments restants suivants en utilisant l'outil de recherche: \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"
@@ -129,10 +136,12 @@ msgstr ""
 #: uninstall.cpp:840
 #, c-format
 msgid ""
-"Enter your administrator password to completely remove %s from you computer.\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"
+"Inscrivez votre mot de passe administrateur pour effacer complètement %s de "
+"votre ordinateur. \n"
 "\n"
 
 #: uninstall.cpp:1616
@@ -142,4 +151,3 @@ msgstr "Annuler"
 #: uninstall.cpp:1617
 msgid "Continue..."
 msgstr "Continuer..."
-
diff --git a/locale/fr/BOINC-Web.mo b/locale/fr/BOINC-Web.mo
index 0e85633..6c52320 100644
Binary files a/locale/fr/BOINC-Web.mo and b/locale/fr/BOINC-Web.mo differ
diff --git a/locale/fr/BOINC-Web.po b/locale/fr/BOINC-Web.po
index 12fcaf6..66bfdd5 100755
--- a/locale/fr/BOINC-Web.po
+++ b/locale/fr/BOINC-Web.po
@@ -4,23 +4,24 @@
 # FileID  : $Id$
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\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 22:31-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: 2014-02-02 21:53+0000\n"
+"Last-Translator: Jerome Cadet <jerome.cadet at pobox.com>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Pootle 2.5.0\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
+"X-Poedit-SearchPath-0: doc\n"
 "X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
 "X-POOTLE-MTIME: 1391378007.0\n"
 "X-Poedit-KeywordsList: tra\n"
-"X-Poedit-SearchPath-0: doc\n"
 
 #: docutil.php:21
 msgid "Search"
@@ -36,8 +37,12 @@ msgid "This page is %stranslatable%s."
 msgstr "Cette page est %straduisible%s."
 
 #: download.php:39
-msgid "We recommend that you also install VirtualBox, so your computer can work on science projects that require it."
-msgstr "Nous vous recommandons d'installer également VirtualBox afin que votre ordinateur puisse aussi faire fonctionner les projets qui le nécessitent."
+msgid ""
+"We recommend that you also install VirtualBox, so your computer can work on "
+"science projects that require it."
+msgstr ""
+"Nous vous recommandons d'installer également VirtualBox afin que votre "
+"ordinateur puisse aussi faire fonctionner les projets qui le nécessitent."
 
 #: download.php:41
 msgid "Learn more about VirtualBox."
@@ -47,14 +52,12 @@ msgstr "En apprendre plus sur VirtualBox."
 msgid "Download BOINC + VirtualBox"
 msgstr "Télécharger BOINC + VirtualBox"
 
-#: download.php:54
-#: download.php:69
+#: download.php:54 download.php:69
 #, php-format
 msgid "for %s"
 msgstr "pour %s"
 
-#: download.php:57
-#: download.php:72
+#: download.php:57 download.php:72
 #, php-format
 msgid "BOINC version %s"
 msgstr "BOINC version %s"
@@ -69,20 +72,39 @@ msgid "Download BOINC"
 msgstr "Télécharger BOINC"
 
 #: download.php:123
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others."
-msgstr "BOINC est un programme qui vous permet d'offrir le temps de calcul inutilisé de votre ordinateur  à des projets scientifiques comme SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, et beaucoup d'autres."
+msgid ""
+"BOINC is a program that lets you donate your idle computer time to science "
+"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, and many others."
+msgstr ""
+"BOINC est un programme qui vous permet d'offrir le temps de calcul inutilisé "
+"de votre ordinateur  à des projets scientifiques comme SETI at home, "
+"Climateprediction.net, Rosetta at home, World Community Grid, et beaucoup "
+"d'autres."
 
 #: download.php:125
-msgid "After installing BOINC on your computer, you can connect it to as many of these projects as you like."
-msgstr "Après avoir installé BOINC sur votre ordinateur, vous pouvez le connecter à autant de ces projets que vous le désirez."
+msgid ""
+"After installing BOINC on your computer, you can connect it to as many of "
+"these projects as you like."
+msgstr ""
+"Après avoir installé BOINC sur votre ordinateur, vous pouvez le connecter à "
+"autant de ces projets que vous le désirez."
 
 #: download.php:127
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
-msgstr "Vous ne devez faire fonctionner ce logiciel sur un ordinateur que s'il vous appartient ou si vous  avez la permission de son propriétaire."
+msgid ""
+"You may run this software on a computer only if you own the computer or have "
+"the permission of its owner."
+msgstr ""
+"Vous ne devez faire fonctionner ce logiciel sur un ordinateur que s'il vous "
+"appartient ou si vous  avez la permission de son propriétaire."
 
 #: download.php:132
-msgid "We recommend that you download BOINC from the Google Play Store or Amazon Appstore, not from here."
-msgstr "Nous vous recommandons de télécharger BOINC depuis le site de Google Play ou d'Amazon Appstore, et non d'ici."
+msgid ""
+"We recommend that you download BOINC from the Google Play Store or Amazon "
+"Appstore, not from here."
+msgstr ""
+"Nous vous recommandons de télécharger BOINC depuis le site de Google Play ou "
+"d'Amazon Appstore, et non d'ici."
 
 #: download.php:167
 msgid "System requirements"
@@ -92,8 +114,7 @@ msgstr "Prérequis système"
 msgid "Release notes"
 msgstr "Notes de publication"
 
-#: download.php:169
-#: index.php:86
+#: download.php:169 index.php:86
 msgid "Help"
 msgstr "Aide"
 
@@ -115,21 +136,51 @@ msgstr "BOINC : calculez pour la science"
 
 #: help.php:12
 #, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
-msgstr "L'aide en ligne BOINC vous permet de converser de vive voix avec des utilisateurs expérimentés, qui peuvent : %s répondre aux questions concernant BOINC et le calcul distribué bénévole; %s vous guider dans l'installation et l'utilisation de BOINC; %s solutionner les problèmes que vous pourriez rencontrer."
+msgid ""
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who "
+"can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"through the process of installing and using BOINC; %s troubleshoot any "
+"problems you might have."
+msgstr ""
+"L'aide en ligne BOINC vous permet de converser de vive voix avec des "
+"utilisateurs expérimentés, qui peuvent : %s répondre aux questions "
+"concernant BOINC et le calcul distribué bénévole; %s vous guider dans "
+"l'installation et l'utilisation de BOINC; %s solutionner les problèmes que "
+"vous pourriez rencontrer."
 
 #: help.php:21
 #, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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 "L'aide en ligne BOINC est basée sur %sSkype%s, un système de téléphonie basé sur Internet. Skype est gratuit (le logiciel et les communications).  Si vous ne possédez pas encore Skype, veuillez %sle télécharger et l'installer maintenant%s.  Lorsque vous aurez terminé, revenez sur cette page."
+msgid ""
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. "
+"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 ""
+"L'aide en ligne BOINC est basée sur %sSkype%s, un système de téléphonie basé "
+"sur Internet. Skype est gratuit (le logiciel et les communications).  Si "
+"vous ne possédez pas encore Skype, veuillez %sle télécharger et l'installer "
+"maintenant%s.  Lorsque vous aurez terminé, revenez sur cette page."
 
 #: help.php:28
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
-msgstr "La meilleure façon de demander de l'aide est de la faire de vive voix. Pour cela vous devez disposer d'un microphone et d'enceintes ou d'un casque de communication. Vous pouvez également utiliser le système de tchat textuel de Skype ou plus classiquemeent le courriel (si vous ne disposez pas de Skype) pour communiquer avec les volontaires."
+msgid ""
+"The best way to get help is by voice, for which you need either built-in "
+"microphone and speakers or an external headset for your computer.  You can "
+"also use Skype's text-based chat system or regular email (if you don't have "
+"Skype) to communicate with Help Volunteers."
+msgstr ""
+"La meilleure façon de demander de l'aide est de la faire de vive voix. Pour "
+"cela vous devez disposer d'un microphone et d'enceintes ou d'un casque de "
+"communication. Vous pouvez également utiliser le système de tchat textuel de "
+"Skype ou plus classiquemeent le courriel (si vous ne disposez pas de Skype) "
+"pour communiquer avec les volontaires."
 
 #: help.php:31
-msgid "Volunteers speaking several languages are available. Please select a language:"
-msgstr "Des volontaires parlant plusieurs langues sont disponibles. Veuillez sélectionner une langue : "
+msgid ""
+"Volunteers speaking several languages are available. Please select a "
+"language:"
+msgstr ""
+"Des volontaires parlant plusieurs langues sont disponibles. Veuillez "
+"sélectionner une langue : "
 
 #: help.php:47
 msgid "Be a Help Volunteer"
@@ -137,21 +188,37 @@ msgstr "Devenez un volontaire de support"
 
 #: help.php:50
 #, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
-msgstr "Si vous êtes un utilisateur expérimenté de BOINC, nous vous encourageons à %sdevenir un volontaire de support%s.  C'est un bon moyen d'aider la recherche scientifique et le calcul distribué bénévole - et c'est sympathique !"
+msgid ""
+"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+"Volunteer%s.  It's a great way to help the cause of scientific research and "
+"volunteer computing - and it's fun!"
+msgstr ""
+"Si vous êtes un utilisateur expérimenté de BOINC, nous vous encourageons à %"
+"sdevenir un volontaire de support%s.  C'est un bon moyen d'aider la "
+"recherche scientifique et le calcul distribué bénévole - et c'est "
+"sympathique !"
 
 #: help.php:56
 #, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
-msgstr "Si vous êtes un volontaire de support : pour éditer vos paramètres, %scliquez ici%s."
+msgid ""
+"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
+msgstr ""
+"Si vous êtes un volontaire de support : pour éditer vos paramètres, %"
+"scliquez ici%s."
 
 #: help_funcs.php:107
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
-msgstr "Les volontaires de support BOINC sont bénévoles. Leurs conseils ne sont pas sous la responsabilité de BOINC ou l'Université de Californie."
+msgid ""
+"BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
+"or the University of California."
+msgstr ""
+"Les volontaires de support BOINC sont bénévoles. Leurs conseils ne sont pas "
+"sous la responsabilité de BOINC ou l'Université de Californie."
 
 #: help_funcs.php:110
 msgid "%1Never%2 give email address or password information to BOINC helpers."
-msgstr "%1Ne jamais%2 donner votre adresse mail ou votre mot de passe aux volontaires de support BOINC."
+msgstr ""
+"%1Ne jamais%2 donner votre adresse mail ou votre mot de passe aux "
+"volontaires de support BOINC."
 
 #: index.php:24
 msgid "Computing power"
@@ -198,9 +265,7 @@ msgstr "Participant"
 msgid "Download"
 msgstr "Téléchargement"
 
-#: index.php:87
-#: index.php:120
-#: index.php:171
+#: index.php:87 index.php:120 index.php:171
 msgid "Documentation"
 msgstr "Documentation"
 
@@ -213,8 +278,15 @@ msgid "Links"
 msgstr "Liens"
 
 #: index.php:94
-msgid "Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:"
-msgstr "Utilise les ressources inexploitées de votre ordinateur (Windows, Mac, Linux ou Android) pour guérir des maladies, étudier le réchauffement planétaire, découvrir des pulsars et faire beaucoup d'autres types de recherches scientifiques. C'est sans danger, sécurisé et facile:"
+msgid ""
+"Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure "
+"diseases, study global warming, discover pulsars, and do many other types of "
+"scientific research.  It's safe, secure, and easy:"
+msgstr ""
+"Utilise les ressources inexploitées de votre ordinateur (Windows, Mac, Linux "
+"ou Android) pour guérir des maladies, étudier le réchauffement planétaire, "
+"découvrir des pulsars et faire beaucoup d'autres types de recherches "
+"scientifiques. C'est sans danger, sécurisé et facile:"
 
 #: index.php:96
 msgid "Choose projects"
@@ -230,8 +302,12 @@ msgstr "Entrer une adresse courriel et un mot de passe."
 
 #: index.php:102
 #, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
-msgstr "Ou, si vous participez à plusieurs projets, essayez un %sgestionnaire de compte%s comme %sGridRepublic%s ou %sBAM!%s. "
+msgid ""
+"Or, if you run several projects, try an %saccount manager%s such as %"
+"sGridRepublic%s or %sBAM!%s. "
+msgstr ""
+"Ou, si vous participez à plusieurs projets, essayez un %sgestionnaire de "
+"compte%s comme %sGridRepublic%s ou %sBAM!%s. "
 
 #: index.php:118
 msgid "Compute with BOINC"
@@ -242,12 +318,20 @@ msgid "Software updates"
 msgstr "Mises à jour logicielles"
 
 #: index.php:128
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
-msgstr "%1Scientifiques%2 : utilisez BOINC pour créer un %3projet de calcul bénévole%4 vous procurant ainsi la puissance de calcul de milliers de CPUs."
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving "
+"you the computing power of thousands of CPUs."
+msgstr ""
+"%1Scientifiques%2 : utilisez BOINC pour créer un %3projet de calcul bénévole"
+"%4 vous procurant ainsi la puissance de calcul de milliers de CPUs."
 
 #: index.php:132
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
-msgstr "%1Universités%2 : utilisez BOINC pour créer un %3centre de calcul d'un campus virtuel%4."
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
+msgstr ""
+"%1Universités%2 : utilisez BOINC pour créer un %3centre de calcul d'un "
+"campus virtuel%4."
 
 #: index.php:137
 msgid "%1Companies%2: use BOINC for %3desktop Grid computing%4."
@@ -319,7 +403,8 @@ msgstr "API pour extensions logicielles"
 
 #: index.php:217
 #, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
+msgid ""
+"Open-source software for %svolunteer computing%s and %sgrid computing%s."
 msgstr "Logiciel libre pour le %scalcul bénévole%s et %sle calcul distribué%s."
 
 #: index.php:230
@@ -340,8 +425,15 @@ msgid "Seismology"
 msgstr "Sismologie"
 
 #: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
-msgstr "Le Réseau de Capteurs Sismiques QCN développe le plus grand réseau sismologique au monde en utilisant les capteurs sismiques reliés à des ordinateurs connectés sur Internet.Vous devez acheter un capteur pour y participer."
+msgid ""
+"The Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to Internet-connected computers.  You must buy a "
+"sensor to participate."
+msgstr ""
+"Le Réseau de Capteurs Sismiques QCN développe le plus grand réseau "
+"sismologique au monde en utilisant les capteurs sismiques reliés à des "
+"ordinateurs connectés sur Internet.Vous devez acheter un capteur pour y "
+"participer."
 
 #: projects.inc:27
 msgid "BOINC Poland Foundation"
@@ -352,23 +444,29 @@ msgid "Environmental research"
 msgstr "Recherche environnementale"
 
 #: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
-msgstr "Ce projet créé une cartographie gratuite continuellement à jour des niveaux de radiation en utilisant des capteurs reliés aux ordinateurs des volontaires. Vous devez acheter un capteur pour y participer."
+msgid ""
+"This project is creating a free and continuously updated map of radiation "
+"levels by using sensors connected to volunteers' computers.  You must buy a "
+"sensor to participate."
+msgstr ""
+"Ce projet créé une cartographie gratuite continuellement à jour des niveaux "
+"de radiation en utilisant des capteurs reliés aux ordinateurs des "
+"volontaires. Vous devez acheter un capteur pour y participer."
 
 #: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
-msgstr "Pour participer à ces projets, vous devez acheter un capteur et le brancher sur votre ordinateur."
+msgid ""
+"To participate in these projects you must buy a sensor and attach it to your "
+"computer."
+msgstr ""
+"Pour participer à ces projets, vous devez acheter un capteur et le brancher "
+"sur votre ordinateur."
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
 msgstr "Science cognitive et intelligence artificielle"
 
-#: projects.inc:60
-#: projects.inc:364
-#: projects.inc:408
-#: projects.inc:457
-#: projects.inc:464
-#: projects.inc:511
+#: projects.inc:60 projects.inc:364 projects.inc:408 projects.inc:457
+#: projects.inc:464 projects.inc:511
 msgid "Private"
 msgstr "Privé"
 
@@ -377,8 +475,16 @@ msgid "Artificial intelligence"
 msgstr "Intelligence artificielle"
 
 #: projects.inc:62
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
-msgstr "Analyser et convertir les filets sémantiques pour une utilisation dans FreeHAL, une intelligence artificielle qui utilise des réseaux sémantiques, des analyseurs morphologiques et une partie des bases de données orales afin d'imiter le comportement humain dans les conversations."
+msgid ""
+"Parse and convert semantic nets for use in FreeHAL, an artificial "
+"intelligence that uses semantic networks, stemmers, part of speech "
+"databases, and part of speech taggers in order to imitate human behavior in "
+"conversations."
+msgstr ""
+"Analyser et convertir les filets sémantiques pour une utilisation dans "
+"FreeHAL, une intelligence artificielle qui utilise des réseaux sémantiques, "
+"des analyseurs morphologiques et une partie des bases de données orales afin "
+"d'imiter le comportement humain dans les conversations."
 
 #: projects.inc:69
 msgid "Biology and Medicine"
@@ -393,8 +499,18 @@ msgid "Antimalarial drug discovery"
 msgstr "Découverte de médicaments antipaludiques"
 
 #: projects.inc:84
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
-msgstr "Le parasite causant la malaria continue de développer une résistance aux médicaments disponibles. C'est pourquoi, il est urgent de découvrir de nouveaux médicaments pour les remplacer. Plus important encore; ces nouveaux médicaments doivent cibler de nouvelles protéines du parasite. Le projet FightMalaria at Home a pour but de trouver ces nouvelles cibles."
+msgid ""
+"The parasite that causes malaria continues to evolve resistance to available "
+"medication. We therefore urgently need to discover new drugs to replace "
+"existing drugs. Importantly, these new drugs need to target NEW proteins in "
+"the parasite. The FightMalaria at Home project is aimed at finding these new "
+"targets."
+msgstr ""
+"Le parasite causant la malaria continue de développer une résistance aux "
+"médicaments disponibles. C'est pourquoi, il est urgent de découvrir de "
+"nouveaux médicaments pour les remplacer. Plus important encore; ces nouveaux "
+"médicaments doivent cibler de nouvelles protéines du parasite. Le projet "
+"FightMalaria at Home a pour but de trouver ces nouvelles cibles."
 
 #: projects.inc:90
 msgid "University of Karlsruhe (Germany)"
@@ -405,8 +521,20 @@ msgid "Protein structure prediction"
 msgstr "Prédiction de la structure des protéines"
 
 #: projects.inc:92
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
-msgstr "POEM @ HOME utilise une approche informatique pour prédire la structure des protéines biologiquement actives, pour comprendre les mécanismes de traitement du signal lorsque les protéines interagissent les unes avec les autres, pour comprendre les maladies liées à un dysfonctionnement des protéines ou l'agrégation, et à développer de nouveaux médicaments sur la base de structures tridimensionnelle des protéines biologiquement importantes."
+msgid ""
+"POEM at HOME uses a computational approach to predict the biologically active "
+"structure of proteins, to understand the signal-processing mechanisms when "
+"the proteins interact with one another, to understand diseases related to "
+"protein malfunction or aggregation, and to develop new drugs on the basis of "
+"the three-dimensions structure of biologically important proteins."
+msgstr ""
+"POEM @ HOME utilise une approche informatique pour prédire la structure des "
+"protéines biologiquement actives, pour comprendre les mécanismes de "
+"traitement du signal lorsque les protéines interagissent les unes avec les "
+"autres, pour comprendre les maladies liées à un dysfonctionnement des "
+"protéines ou l'agrégation, et à développer de nouveaux médicaments sur la "
+"base de structures tridimensionnelle des protéines biologiquement "
+"importantes."
 
 #: projects.inc:98
 msgid "University of Delaware"
@@ -417,8 +545,16 @@ msgid "Study of protein - ligand interactions"
 msgstr "Étude de protéine - interactions de ligand"
 
 #: projects.inc:100
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
-msgstr "Docking at Home a pour buts l'informatique et la bio-science. Le projet vise à de nouvelles connaissances des détails atomiques d'interactions de protéine-ligand, et ainsi, par leur analyse découvrir de nouveaux produits pharmaceutiques."
+msgid ""
+"Docking at Home has both bioscience and computer science goals. The project "
+"aims to further knowledge of the atomic details of protein-ligand "
+"interactions and, by doing so, will search for insights into the discovery "
+"of novel pharmaceuticals."
+msgstr ""
+"Docking at Home a pour buts l'informatique et la bio-science. Le projet vise à "
+"de nouvelles connaissances des détails atomiques d'interactions de protéine-"
+"ligand, et ainsi, par leur analyse découvrir de nouveaux produits "
+"pharmaceutiques."
 
 #: projects.inc:114
 msgid "Barcelona Biomedical Research Park (PRBB)"
@@ -429,8 +565,17 @@ msgid "Molecular simulations of proteins"
 msgstr "Simulations moléculaires de protéines"
 
 #: projects.inc:116
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
-msgstr "GPUGrid.net ouvre des nouveaux scénarios informatiques par l'emploi du premier code dynamique moléculaire atomique (CeIIMD) spécialement optimisé pour fonctionner sur des chipsets graphiques NVIDIA. De nouvelles applications biomédicales deviennent soudainement possibles donnant un nouveau rôle à la biologie informatique pour la recherche biomédicale."
+msgid ""
+"GPUGrid.net opens novel computational scenarios by the first full-atom "
+"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
+"New biomedical applications suddenly become possible giving a new role to "
+"computational biology for biomedical research."
+msgstr ""
+"GPUGrid.net ouvre des nouveaux scénarios informatiques par l'emploi du "
+"premier code dynamique moléculaire atomique (CeIIMD) spécialement optimisé "
+"pour fonctionner sur des chipsets graphiques NVIDIA. De nouvelles "
+"applications biomédicales deviennent soudainement possibles donnant un "
+"nouveau rôle à la biologie informatique pour la recherche biomédicale."
 
 #: projects.inc:122
 msgid "Technion, Israel"
@@ -441,20 +586,37 @@ msgid "Genetic linkage analysis"
 msgstr "Analyse des liens génétiques"
 
 #: projects.inc:124
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
-msgstr "Superlink at Technion aide les généticiens du monde entier à trouver les gènes responsables de quelques types de diabète, l'hypertension, cancer, schizophrénie et bien d'autres."
+msgid ""
+"Superlink at Technion helps geneticists all over the world find disease-"
+"provoking genes causing some types of diabetes, hypertension (high blood "
+"pressure), cancer, schizophrenia and many others."
+msgstr ""
+"Superlink at Technion aide les généticiens du monde entier à trouver les gènes "
+"responsables de quelques types de diabète, l'hypertension, cancer, "
+"schizophrénie et bien d'autres."
 
 #: projects.inc:138
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
-msgstr "Centre Universitaire du Maryland pour la bio-informatique et la biologie informatique"
+msgid ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
+msgstr ""
+"Centre Universitaire du Maryland pour la bio-informatique et la biologie "
+"informatique"
 
 #: projects.inc:139
 msgid "Life science research"
 msgstr "Recherche en sciences de la vie"
 
 #: projects.inc:140
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
-msgstr "The Lattice Project fournit la puissance de calcul aux scientifiques de l'Université du Maryland étudiant l'évolution des relations basée sur les données séquentielles d'ADN; bactérien, plasmide, séquences de protéine virales, et biodiversité dans les réserves naturelles."
+msgid ""
+"The Lattice Project supplies computing power to scientists at the University "
+"of Maryland studying evolutionary relationships based on DNA sequence data; "
+"bacterial, plasmid, and virus protein sequences; and biological diversity in "
+"nature reserves. "
+msgstr ""
+"The Lattice Project fournit la puissance de calcul aux scientifiques de "
+"l'Université du Maryland étudiant l'évolution des relations basée sur les "
+"données séquentielles d'ADN; bactérien, plasmide, séquences de protéine "
+"virales, et biodiversité dans les réserves naturelles."
 
 #: projects.inc:146
 msgid "The Swiss Tropical Institute"
@@ -465,29 +627,63 @@ msgid "Epidemiology"
 msgstr "Épidémiologie"
 
 #: projects.inc:148
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
-msgstr "Les modèles de simulation dynamique de transmission et d'effets sur la santé de la malaria sont un outil important pour le contrôle de la malaria. Ils peuvent être utilisés pour déterminer les stratégies optimales pour livrer des moustiquaires, la chimiothérapie, ou de nouveaux vaccins qui sont actuellement en cours de développement et de test. Une telle modélisation est extrêmement gourmande en puissance de calcul, exigeant des simulations sur de larges populations humaines avec [...]
+msgid ""
+"Simulation models of the transmission dynamics and health effects of malaria "
+"are an important tool for malaria control. They can be used to determine "
+"optimal strategies for delivering mosquito nets, chemotherapy, or new "
+"vaccines which are currently under development and testing.  Such modeling "
+"is extremely computer intensive, requiring simulations of large human "
+"populations with a diverse set of parameters related to biological and "
+"social factors that influence the distribution of the disease. "
+msgstr ""
+"Les modèles de simulation dynamique de transmission et d'effets sur la santé "
+"de la malaria sont un outil important pour le contrôle de la malaria. Ils "
+"peuvent être utilisés pour déterminer les stratégies optimales pour livrer "
+"des moustiquaires, la chimiothérapie, ou de nouveaux vaccins qui sont "
+"actuellement en cours de développement et de test. Une telle modélisation "
+"est extrêmement gourmande en puissance de calcul, exigeant des simulations "
+"sur de larges populations humaines avec un ensemble de paramètres divers "
+"liés aux facteurs biologiques et sociaux qui influencent la diffusion de la "
+"maladie."
 
 #: projects.inc:170
 msgid "University of Washington"
 msgstr "Université de Washington"
 
-#: projects.inc:171
-#: projects.inc:179
+#: projects.inc:171 projects.inc:179
 msgid "Biology"
 msgstr "Biologie"
 
 #: projects.inc:172
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
-msgstr "Déterminer les structures tridimensionnel de protéines dans la recherche qui peut en fin de compte mener à la découverte de remèdes pour quelques maladies humaines majeures. En calculant pour Rosetta at home vous nous aiderez à accélérer et prolonger notre recherche bien plus que nous ne pourrions le faire sans votre aide. Vous nous aiderez également dans nos efforts à concevoir de nouvelles protéines pour combattre les maladies telles que HIV, la malaria, le Cancer, et l'Alzheimer"
+msgid ""
+"Determine the 3-dimensional shapes of proteins in research that may "
+"ultimately lead to finding cures for some major human diseases. By running "
+"Rosetta at home you will help us speed up and extend our research in ways we "
+"couldn't possibly attempt without your help. You will also be helping our "
+"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
+"Cancer, and Alzheimer's"
+msgstr ""
+"Déterminer les structures tridimensionnel de protéines dans la recherche qui "
+"peut en fin de compte mener à la découverte de remèdes pour quelques "
+"maladies humaines majeures. En calculant pour Rosetta at home vous nous aiderez "
+"à accélérer et prolonger notre recherche bien plus que nous ne pourrions le "
+"faire sans votre aide. Vous nous aiderez également dans nos efforts à "
+"concevoir de nouvelles protéines pour combattre les maladies telles que HIV, "
+"la malaria, le Cancer, et l'Alzheimer"
 
 #: projects.inc:178
 msgid "University of Vienna"
 msgstr "Université de Vienne"
 
 #: projects.inc:180
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
-msgstr "Calculez les similarités entre les protéines. SIMAP fournit une base de données publique des résultats qui joue un rôle-clé dans de nombreux projets de recherche en bio-informatique. "
+msgid ""
+"Calculate similarities between proteins. SIMAP provides a public database of "
+"the resulting data, which plays a key role in many bioinformatics research "
+"projects."
+msgstr ""
+"Calculez les similarités entre les protéines. SIMAP fournit une base de "
+"données publique des résultats qui joue un rôle-clé dans de nombreux projets "
+"de recherche en bio-informatique. "
 
 #: projects.inc:186
 msgid "Earth Sciences"
@@ -502,8 +698,25 @@ msgid "Climate study"
 msgstr "Étude du climat"
 
 #: projects.inc:200
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
-msgstr "Étudier les approximations qui doivent être faites à L'État-de-L'Art des modèles climatiques. En relançant le modèle des centaines de fois, nous espérons trouver comment le modèle réagit aux petits ajustements de ces approximations - suffisamment petites pour ne pas rendre ces approximations irréalistes. Cela nous permettra de mieux comprendre à quel point nos modèles sont sensibles à ces petits changements et aussi à des choses comme des changements dans le dioxyde de carbone et [...]
+msgid ""
+"Investigate the approximations that have to be made in state-of-the-art "
+"climate models. By running the model thousands of times we hope to find out "
+"how the model responds to slight tweaks to these approximations - slight "
+"enough to not make the approximations any less realistic. This will allow us "
+"to improve our understanding of how sensitive our models are to small "
+"changes and also to things like changes in carbon dioxide and the sulphur "
+"cycle. This will allow us to explore how climate may change in the next "
+"century under a wide range of different scenarios."
+msgstr ""
+"Étudier les approximations qui doivent être faites à L'État-de-L'Art des "
+"modèles climatiques. En relançant le modèle des centaines de fois, nous "
+"espérons trouver comment le modèle réagit aux petits ajustements de ces "
+"approximations - suffisamment petites pour ne pas rendre ces approximations "
+"irréalistes. Cela nous permettra de mieux comprendre à quel point nos "
+"modèles sont sensibles à ces petits changements et aussi à des choses comme "
+"des changements dans le dioxyde de carbone et le cycle du soufre. Cela nous "
+"permettras de voir comment pourrait évoluer le climat au cours du prochain "
+"siècle à travers un grand nombre de scénarios différents."
 
 #: projects.inc:207
 msgid "Physical Science"
@@ -514,31 +727,66 @@ msgid "Mechanical engineering"
 msgstr "Ingénierie Mécanique"
 
 #: projects.inc:214
-msgid "Currently we are calculating the optimum design of a structure call the 52 bar truss"
-msgstr "Nous sommes en train de calculer le design optimum d'une structure appelée le \"52 bar truss\""
+msgid ""
+"Currently we are calculating the optimum design of a structure call the 52 "
+"bar truss"
+msgstr ""
+"Nous sommes en train de calculer le design optimum d'une structure appelée "
+"le \"52 bar truss\""
 
-#: projects.inc:224
-#: projects.inc:263
-#: projects.inc:271
+#: projects.inc:224 projects.inc:263 projects.inc:271
 msgid "Astronomy"
 msgstr "Astronomie"
 
 #: projects.inc:225
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
-msgstr "Nous combinerons les couvertures spectrales de GALEX, Pan-STARRS1 et WISE pour générer un atlas des galaxies de l'Univers proche, caractérisées par leurs spectres UV-visible-NIR. Nous mesurerons des paramètres physiques (tels que la densité surfacique de masse stellaire, la densité surfacique de taux de formation d’étoile, l'atténuation et l’historique de la formation des étoiles de 1ère génération) basé sur une résolution au pixel près en utilisant la distribution d'énergie spec [...]
+msgid ""
+"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
+"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
+"Universe. We will measure physical parameters (such as stellar mass surface "
+"density, star formation rate surface density, attenuation, and first-order "
+"star formation history) on a resolved pixel-by-pixel basis using spectral "
+"energy distribution (SED) fitting techniques in a distributed computing mode."
+msgstr ""
+"Nous combinerons les couvertures spectrales de GALEX, Pan-STARRS1 et WISE "
+"pour générer un atlas des galaxies de l'Univers proche, caractérisées par "
+"leurs spectres UV-visible-NIR. Nous mesurerons des paramètres physiques "
+"(tels que la densité surfacique de masse stellaire, la densité surfacique de "
+"taux de formation d’étoile, l'atténuation et l’historique de la formation "
+"des étoiles de 1ère génération) basé sur une résolution au pixel près en "
+"utilisant la distribution d'énergie spectrale qui convient parfaitement aux "
+"techniques de calculs distribués."
 
 #: projects.inc:247
 msgid "University of Texas at Austin"
 msgstr "Université du Texas à Austin"
 
-#: projects.inc:248
-#: projects.inc:279
+#: projects.inc:248 projects.inc:279
 msgid "Chemistry"
 msgstr "Chimie"
 
 #: projects.inc:249
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
-msgstr "Un problème classique en chimie théorique, la physique de condensation de la matière et les sciences de la matière est le calcul de la durée d'évolution d'un système à l'échelle atomique où, par exemple, des réactions chimiques et/ou une diffusion chimique ont lieu. En général les évènements intéressants sont très rares (de nombreux ordres de grandeur plus lent que le mouvement vibratoire des atomes) et de ce fait les simulations directes, retraçant tous les mouvements des atomes [...]
+msgid ""
+"A common problem in theoretical chemistry, condensed matter physics and "
+"materials science is the calculation of the time evolution of an atomic "
+"scale system where, for example, chemical reactions and/or diffusion occur. "
+"Generally the events of interest are quite rare (many orders of magnitude "
+"slower than the vibrational movements of the atoms), and therefore direct "
+"simulations, tracking every movement of the atoms, would take thousands of "
+"years of computer calculations on the fastest present day computer before a "
+"single event of interest can be expected to occur.  Our research group is "
+"interested in calculating the long time dynamics of systems."
+msgstr ""
+"Un problème classique en chimie théorique, la physique de condensation de la "
+"matière et les sciences de la matière est le calcul de la durée d'évolution "
+"d'un système à l'échelle atomique où, par exemple, des réactions chimiques "
+"et/ou une diffusion chimique ont lieu. En général les évènements "
+"intéressants sont très rares (de nombreux ordres de grandeur plus lent que "
+"le mouvement vibratoire des atomes) et de ce fait les simulations directes, "
+"retraçant tous les mouvements des atomes, prendraient des milliers d'année "
+"de calcul information sur le superordinateur actuel le plus rapide avant "
+"qu'un seul évènement intéressant puisse se produire. Notre groupe de "
+"recherche est intéressé par le calcul de la dynamique à long terme de ces "
+"systèmes."
 
 # 95%
 #: projects.inc:262
@@ -546,24 +794,49 @@ msgid "University of Illinois at Urbana-Champaign"
 msgstr "Université de l'Illinois à Urbana-Champaign"
 
 #: projects.inc:264
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
-msgstr "Le but de Cosmology at Home est de rechercher le modèle qui décrit le mieux notre Univers et de trouver la gamme de modèles conformes aux données disponibles en physique des particules en astronomie."
+msgid ""
+"The goal of Cosmology at Home is to search for the model that best describes "
+"our Universe and to find the range of models that agree with the available "
+"astronomical particle physics data."
+msgstr ""
+"Le but de Cosmology at Home est de rechercher le modèle qui décrit le mieux "
+"notre Univers et de trouver la gamme de modèles conformes aux données "
+"disponibles en physique des particules en astronomie."
 
 #: projects.inc:270
 msgid "Rensselaer Polytechnic Institute"
 msgstr "Institut Polytechnique Rensselaer"
 
 #: projects.inc:272
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
-msgstr "Le but de Milkyway at Home est de créer un modèle tridimensionnel de haute précision de la Galaxie Voie Lactée en utilisant les données recueillies par The Sloan Digital Sky Survey (SDSS)."
+msgid ""
+"The goal of Milkyway at Home is to create a highly accurate three dimensional "
+"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
+"Survey."
+msgstr ""
+"Le but de Milkyway at Home est de créer un modèle tridimensionnel de haute "
+"précision de la Galaxie Voie Lactée en utilisant les données recueillies par "
+"The Sloan Digital Sky Survey (SDSS)."
 
 #: projects.inc:278
 msgid "Leiden University, The Netherlands"
 msgstr "Université de Leyde, Pays-Bas"
 
 #: projects.inc:280
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
-msgstr "Calculs scientifiques de surface en utilisant la dynamique classique. Leiden Classical permet à des bénévoles, des étudiants et des scientifiques à soumettre leurs calculs personnels à la grille. Chaque utilisateur a sa file d'attente personnelle pour des tâches de dynamique classique. Ainsi, des étudiants ont utilisé la grille pour simuler l'argon liquide, ou pour tester la validité de la loi des gaz parfaits en faisant des simulations à travers la grille de calcul."
+msgid ""
+"Surface science calculations using Classical Dynamics.  Leiden Classical "
+"allows volunteers, students and other scientist to submit their personal "
+"calculations to the grid. Each user has his own personal queue for Classical "
+"Dynamics jobs. In this way students have used the grid to simulate liquid "
+"argon, or to test the validity of the ideal gas law by actually doing the "
+"simulations through the grid."
+msgstr ""
+"Calculs scientifiques de surface en utilisant la dynamique classique. Leiden "
+"Classical permet à des bénévoles, des étudiants et des scientifiques à "
+"soumettre leurs calculs personnels à la grille. Chaque utilisateur a sa file "
+"d'attente personnelle pour des tâches de dynamique classique. Ainsi, des "
+"étudiants ont utilisé la grille pour simuler l'argon liquide, ou pour tester "
+"la validité de la loi des gaz parfaits en faisant des simulations à travers "
+"la grille de calcul."
 
 #: projects.inc:294
 msgid "Univ. of Wisconsin - Milwaukee, Max Planck Institute"
@@ -574,26 +847,52 @@ msgid "Astrophysics"
 msgstr "Astrophysique"
 
 #: projects.inc:296
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
-msgstr "Recherche d'étoiles à neutrons en rotation (également appelés pulsars) en utilisant les données des détecteurs d'ondes gravitationnelles LIGO et GEO, et de l'observatoire radio d'Arecibo. Einstein at Home est un projet de l'Année Mondiale de la Physique 2005 soutenu par l'American Physical Society (APS) et par un certain nombre d'organisations internationales."
+msgid ""
+"Search for spinning neutron stars (also called pulsars) using data from the "
+"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
+"observatory.  Einstein at Home is a World Year of Physics 2005 project "
+"supported by the American Physical Society (APS) and by a number of "
+"international organizations."
+msgstr ""
+"Recherche d'étoiles à neutrons en rotation (également appelés pulsars) en "
+"utilisant les données des détecteurs d'ondes gravitationnelles LIGO et GEO, "
+"et de l'observatoire radio d'Arecibo. Einstein at Home est un projet de l'Année "
+"Mondiale de la Physique 2005 soutenu par l'American Physical Society (APS) "
+"et par un certain nombre d'organisations internationales."
 
-#: projects.inc:310
-#: projects.inc:318
+#: projects.inc:310 projects.inc:318
 msgid "CERN (European Organization for Nuclear Research)"
 msgstr "CERN (Organisation Européenne pour la Recherche Nucléaire)"
 
-#: projects.inc:311
-#: projects.inc:319
+#: projects.inc:311 projects.inc:319
 msgid "Physics"
 msgstr "Physique"
 
 #: projects.inc:312
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
-msgstr "Le grand collisionneur de hadrons (LHC) est un accélérateur de particules au CERN, l'organisation européenne pour la recherche nucléaire, le plus grand laboratoire mondial de physique de la matière. C'est l’instrument le plus puissant jamais construit pour l'étude des propriétés de la matière. LHC at home exécute des simulations pour améliorer la conception du LHC et de ses détecteurs."
+msgid ""
+"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
+"European Organization for Nuclear Research, the world's largest particle "
+"physics laboratory.  It is the most powerful instrument ever built to "
+"investigate on particles proprieties. LHC at home runs simulations to improve "
+"the design of LHC and its detectors."
+msgstr ""
+"Le grand collisionneur de hadrons (LHC) est un accélérateur de particules au "
+"CERN, l'organisation européenne pour la recherche nucléaire, le plus grand "
+"laboratoire mondial de physique de la matière. C'est l’instrument le plus "
+"puissant jamais construit pour l'étude des propriétés de la matière. "
+"LHC at home exécute des simulations pour améliorer la conception du LHC et de "
+"ses détecteurs."
 
 #: projects.inc:320
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
-msgstr "Ce projet utilise la technologie de machines virtuelles développées par le CERN pour simuler sur les ordinateurs des volontaires, des évènements physiques propres au LHC. Cela requiert l'installation de VirtualBox sur votre ordinateur"
+msgid ""
+"This project uses CERN-developed virtual machine technology for full-fledged "
+"LHC event physics simulation on volunteer computers.  Requires that you "
+"install VirtualBox on your computer"
+msgstr ""
+"Ce projet utilise la technologie de machines virtuelles développées par le "
+"CERN pour simuler sur les ordinateurs des volontaires, des évènements "
+"physiques propres au LHC. Cela requiert l'installation de VirtualBox sur "
+"votre ordinateur"
 
 #: projects.inc:326
 msgid "University of California, Berkeley"
@@ -604,8 +903,19 @@ msgid "Astrophysics, astrobiology"
 msgstr "Astrophysique, astrobiologie"
 
 #: projects.inc:328
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
-msgstr "SETI (Search for Extraterrestrial Intelligence) est un domaine scientifique dont l'objectif est de détecter la vie intelligente en dehors de la Terre. Une approche, connue sous le nom de radio SETI, utilise des radiotélescopes pour écouter les signaux radio à bande passante étroite de l'espace. Ces signaux ne sont pas connus pour se produire naturellement, en détecter serait une preuve de la technologie extraterrestre."
+msgid ""
+"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
+"goal is to detect intelligent life outside Earth. One approach, known as "
+"radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
+"signals from space. Such signals are not known to occur naturally, so a "
+"detection would provide evidence of extraterrestrial technology."
+msgstr ""
+"SETI (Search for Extraterrestrial Intelligence) est un domaine scientifique "
+"dont l'objectif est de détecter la vie intelligente en dehors de la Terre. "
+"Une approche, connue sous le nom de radio SETI, utilise des radiotélescopes "
+"pour écouter les signaux radio à bande passante étroite de l'espace. Ces "
+"signaux ne sont pas connus pour se produire naturellement, en détecter "
+"serait une preuve de la technologie extraterrestre."
 
 #: projects.inc:342
 msgid "Bielefeld University of Applied Sciences"
@@ -616,8 +926,17 @@ msgid "Chemical engineering and nanotechnology"
 msgstr "Ingénierie chimique et nanotechnologie"
 
 #: projects.inc:344
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
-msgstr "L'étude des aimants moléculaires et du magnétisme contrôlé à l'échelle nanométrique. Ces molécules magnétiques peuvent être utilisées pour développer de minuscules interrupteurs magnétiques, avec des applications en médecine (comme la chimiothérapie locale de la tumeur) et en biotechnologie."
+msgid ""
+"The study of molecular magnets and controlled nanoscale magnetism.  These "
+"magnetic molecules may be used to develop tiny magnetic switches, with "
+"applications in medicine (such as local tumor chemotherapy) and "
+"biotechnology."
+msgstr ""
+"L'étude des aimants moléculaires et du magnétisme contrôlé à l'échelle "
+"nanométrique. Ces molécules magnétiques peuvent être utilisées pour "
+"développer de minuscules interrupteurs magnétiques, avec des applications en "
+"médecine (comme la chimiothérapie locale de la tumeur) et en "
+"biotechnologie."
 
 #: projects.inc:351
 msgid "Multiple applications"
@@ -632,19 +951,28 @@ msgid "Physics, biochemistry, and others"
 msgstr "Physique, biochimie, et autres"
 
 #: projects.inc:358
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
-msgstr "L'objectif de CAS at home est d'encourager et d'assister les scientifiques en Chine à adopter les technologies de calcul volontaire partagé et la réflexion des volontaires pour leur recherche."
+msgid ""
+"The objective of CAS at home is to encourage and assist scientists in China to "
+"adopt the technologies of volunteer computing and volunteer thinking for "
+"their research."
+msgstr ""
+"L'objectif de CAS at home est d'encourager et d'assister les scientifiques en "
+"Chine à adopter les technologies de calcul volontaire partagé et la "
+"réflexion des volontaires pour leur recherche."
 
 #: projects.inc:365
 msgid "Mathematics, physics, evolution"
 msgstr "Mathématique, physique, évolution"
 
 #: projects.inc:366
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
-msgstr "Yoyo at home est un adaptateur entre BOINC et plusieurs projets existants de calcul partagé: ECM, Muon, Evolution at home, et distributed.net"
+msgid ""
+"Yoyo at home is an adapter between BOINC and several existing volunteer "
+"computing projects: ECM, Muon, Evolution at home, and distributed.net"
+msgstr ""
+"Yoyo at home est un adaptateur entre BOINC et plusieurs projets existants de "
+"calcul partagé: ECM, Muon, Evolution at home, et distributed.net"
 
-#: projects.inc:371
-#: projects.inc:527
+#: projects.inc:371 projects.inc:527
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 msgstr "Laboratoire MTA-SZTAKI de Systèmes parallèles et distribués (Hongrie)"
 
@@ -653,8 +981,17 @@ msgid "European research projects"
 msgstr "Projets de recherche européens"
 
 #: projects.inc:373
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
-msgstr "Le projet EGDeS at Home Beta intègre le calcul bénévole dans le réseau de grille de service de l'Europe en permettant aux grilles existantes d'envoyer des unités de travail pour être traitées par des bénévoles. Les projets scientifiques couverts par le projet comprennent les mathématiques, la physique, la biologie, etc"
+msgid ""
+"The EDGeS at Home Beta project integrates volunteer computing into the service "
+"grid network of Europe by allowing service grids to send workunits to be "
+"processed by the volunteers of this project. The scientific projects covered "
+"by the project include math, physics, biology, etc."
+msgstr ""
+"Le projet EGDeS at Home Beta intègre le calcul bénévole dans le réseau de "
+"grille de service de l'Europe en permettant aux grilles existantes d'envoyer "
+"des unités de travail pour être traitées par des bénévoles. Les projets "
+"scientifiques couverts par le projet comprennent les mathématiques, la "
+"physique, la biologie, etc"
 
 #: projects.inc:379
 msgid "Spanish universities and research centers"
@@ -677,8 +1014,16 @@ msgid "Medical, environmental and other humanitarian research"
 msgstr "Recherches médicale, environnementale et autre recherche humanitaire"
 
 #: projects.inc:389
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
-msgstr "Pour aider des recherches à but non lucratif critiques sur les problèmes les plus urgents de l'humanité en créant le plus grand réseau de calcul partagé volontaire. La recherche inclue le SIDA, le cancer, les maladies tropicales et orphelines, l'énergie solaire, l'eau propre, et bien d'autres."
+msgid ""
+"To further critical non-profit research on some of humanity's most pressing "
+"problems by creating the world's largest volunteer computing grid.  Research "
+"includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"clean water and many more."
+msgstr ""
+"Pour aider des recherches à but non lucratif critiques sur les problèmes les "
+"plus urgents de l'humanité en créant le plus grand réseau de calcul partagé "
+"volontaire. La recherche inclue le SIDA, le cancer, les maladies tropicales "
+"et orphelines, l'énergie solaire, l'eau propre, et bien d'autres."
 
 #: projects.inc:395
 msgid "Mathematics, computing, and games"
@@ -696,27 +1041,29 @@ msgstr "Mathématiques, Physique, Intelligence Artificielle"
 msgid "Simulation of quantum computing; Goldbach's conjecture."
 msgstr "Simulation de calculateur quantique; conjecture de Goldbach"
 
-#: projects.inc:450
-#: projects.inc:458
+#: projects.inc:450 projects.inc:458
 msgid "Cryptography"
 msgstr "Chiffrement"
 
 #: projects.inc:459
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
-msgstr "Tente de décoder 3 messages originaux d'Enigma. Les signaux ont été interceptés dans l'Atlantique nord en 1942 et sont réputés ne pas avoir été décodés."
-
-#: projects.inc:465
-#: projects.inc:504
-#: projects.inc:512
-#: projects.inc:520
-#: projects.inc:528
-#: projects.inc:568
+msgid ""
+"Attempt to decode 3 original Enigma messages. The signals were intercepted "
+"in the North Atlantic in 1942 and are believed to be unbroken."
+msgstr ""
+"Tente de décoder 3 messages originaux d'Enigma. Les signaux ont été "
+"interceptés dans l'Atlantique nord en 1942 et sont réputés ne pas avoir été "
+"décodés."
+
+#: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
+#: projects.inc:528 projects.inc:568
 msgid "Mathematics"
 msgstr "Mathématiques"
 
 #: projects.inc:466
 msgid "Study the Collatz Conjecture, an unsolved conjecture in mathematics"
-msgstr "Étude de la conjecture de Collatz, une conjecture non résolue en mathématique."
+msgstr ""
+"Étude de la conjecture de Collatz, une conjecture non résolue en "
+"mathématique."
 
 #: projects.inc:471
 msgid "California State University Fullerton"
@@ -727,44 +1074,97 @@ msgid "Factorization of large integers"
 msgstr "Factorisation de grands nombres entiers"
 
 #: projects.inc:473
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
-msgstr "NFS at Home est un projet de recherche qui utilise des ordinateurs connectés à Internet pour calculer des étapes de factorisation de grands nombres entiers (Sieve). En tant que jeune étudiant vous avez eu votre première expérience en décomposant un nombre entier en facteurs premiers, tels que 15 = 3 * 35 = 5 ou 5 * 7. NFS at Home est la continuation de cette expérience, mais avec des nombres entiers longs de centaines de chiffres."
+msgid ""
+"NFS at Home is a research project that uses Internet-connected computers to do "
+"the lattice sieving step in the Number Field Sieve factorization of large "
+"integers. As a young school student, you gained your first experience at "
+"breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
+"NFS at Home is a continuation of that experience, only with integers that are "
+"hundreds of digits long."
+msgstr ""
+"NFS at Home est un projet de recherche qui utilise des ordinateurs connectés à "
+"Internet pour calculer des étapes de factorisation de grands nombres entiers "
+"(Sieve). En tant que jeune étudiant vous avez eu votre première expérience "
+"en décomposant un nombre entier en facteurs premiers, tels que 15 = 3 * 35 = "
+"5 ou 5 * 7. NFS at Home est la continuation de cette expérience, mais avec des "
+"nombres entiers longs de centaines de chiffres."
 
 #: projects.inc:479
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
-msgstr "Université Technique de Vilnius Gediminas et Université Technologique de Kaunas (Lituanie)"
+msgid ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
+msgstr ""
+"Université Technique de Vilnius Gediminas et Université Technologique de "
+"Kaunas (Lituanie)"
 
 #: projects.inc:480
 msgid "Software testing"
 msgstr "Test de logiciels"
 
 #: projects.inc:481
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
-msgstr "L'objectif de ce projet est de fournir une plate-forme informatique distribuée puissante pour les scientifiques de l'Université technique Gediminas de Vilnius (VGTU) ainsi que d'autres institutions universitaires lituaniennes. Les applications actuelles concernent l'étude de test de logiciels basé sur la méthode Monte-Carlo."
+msgid ""
+"The aim of this project is to provide a powerful distributed computing "
+"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
+"well as others Lithuanian academic institutions.  Current applications "
+"involve the study of Monte-Carlo based software testing."
+msgstr ""
+"L'objectif de ce projet est de fournir une plate-forme informatique "
+"distribuée puissante pour les scientifiques de l'Université technique "
+"Gediminas de Vilnius (VGTU) ainsi que d'autres institutions universitaires "
+"lituaniennes. Les applications actuelles concernent l'étude de test de "
+"logiciels basé sur la méthode Monte-Carlo."
 
 #: projects.inc:503
 msgid "Mathematical Institute of Leiden University / Kennislink"
 msgstr "Institut mathématique de l'université de Leiden / Kennislink "
 
 #: projects.inc:505
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
-msgstr "Recherche de 'abc-triple »: entiers positifs a, b​​, c tel que a + b = c, a <b <c, a, b​​, c n'ont pas diviseurs communs et c> rad (abc), où rad (n) est le produit de n facteurs premiers distincts. La conjecture ABC indique qu'il y a seulement un nombre fini de a, b​​, c tels que log (c) / log (rad (abc))> h pour tout réel h> 1. La conjecture ABC est actuellement l'un des plus grands problèmes ouverts en mathématiques. S'il est démontré être vrai, beaucoup d'autres problèmes ouve [...]
+msgid ""
+"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
+"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
+"product of the distinct prime factors of n. The ABC conjecture says that "
+"there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for "
+"any real h > 1. The ABC conjecture is currently one of the greatest open "
+"problems in mathematics. If it is proven to be true, a lot of other open "
+"problems can be answered directly from it."
+msgstr ""
+"Recherche de 'abc-triple »: entiers positifs a, b​​, c tel que a + b = c, a "
+"<b <c, a, b​​, c n'ont pas diviseurs communs et c> rad (abc), où rad (n) est "
+"le produit de n facteurs premiers distincts. La conjecture ABC indique "
+"qu'il y a seulement un nombre fini de a, b​​, c tels que log (c) / log (rad "
+"(abc))> h pour tout réel h> 1. La conjecture ABC est actuellement l'un des "
+"plus grands problèmes ouverts en mathématiques. S'il est démontré être vrai, "
+"beaucoup d'autres problèmes ouverts peuvent être résolus directement."
 
 #: projects.inc:513
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
-msgstr "Primegrid regroupe divers projets de recherche sur différentes formes de très grands nombres premiers, incluant des recherches sur les plus grands nombres premiers connus."
+msgid ""
+"Primegrid has multiple projects searching for different forms of very large "
+"prime numbers, including searching for the largest known prime number."
+msgstr ""
+"Primegrid regroupe divers projets de recherche sur différentes formes de "
+"très grands nombres premiers, incluant des recherches sur les plus grands "
+"nombres premiers connus."
 
 #: projects.inc:519
 msgid "Hochschule RheinMain University of Applied Sciences"
 msgstr "Université de Hochschule RheinMain des sciences appliquées"
 
 #: projects.inc:521
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
-msgstr "Recherche de contre-exemples à deux conjectures liées à l'identification de nombres premiers"
+msgid ""
+"Search for counterexamples to two conjectures related to the identification "
+"of prime numbers"
+msgstr ""
+"Recherche de contre-exemples à deux conjectures liées à l'identification de "
+"nombres premiers"
 
 #: projects.inc:529
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
-msgstr "Trouvez tous les systèmes de nombre binaires généralisés (dans lequel les bases sont des matrices et les chiffres sont des vecteurs) jusqu'à la dimension 11."
+msgid ""
+"Find all the generalized binary number systems (in which bases are matrices "
+"and digits are vectors) up to dimension 11."
+msgstr ""
+"Trouvez tous les systèmes de nombre binaires généralisés (dans lequel les "
+"bases sont des matrices et les chiffres sont des vecteurs) jusqu'à la "
+"dimension 11."
 
 #: ../html/inc/news.inc:40
 msgid "Comment"
@@ -783,6 +1183,7 @@ msgstr "Les nouvelles sont disponibles en tant que %sflux RSS%s"
 #, php-format
 #~ msgid "%s for %s (%s MB)"
 #~ msgstr "%s pour %s (%s Mo)"
+
 #~ msgid ""
 #~ "BOINC is a program that lets you donate your idle computer time to science "
 #~ "projects like SETI at home, Climateprediction.net, Rosetta at home, World "
@@ -794,6 +1195,7 @@ msgstr "Les nouvelles sont disponibles en tant que %sflux RSS%s"
 #~ "Climateprediction.net, Rosetta at home, World Community Grid, et de nombreux "
 #~ "autres. <p> Après avoir installé BOINC sur votre ordinateur, vous pouvez le "
 #~ "connecter à autant de projets de ce type que vous souhaitez."
+
 #~ msgid "Browser default"
 #~ msgstr "Navigateur par défaut"
 
@@ -811,12 +1213,15 @@ msgstr "Les nouvelles sont disponibles en tant que %sflux RSS%s"
 #~ "C'est sûr, sécurisé et facile :  %sChoisissez%s des projets  %sTéléchargez%s "
 #~ "et lancez le logiciel BOINC  %sSaisissez%s une adresse email et un mot de "
 #~ "passe. "
+
 #~ msgid "IBM Corporate Community Relations"
 #~ msgstr "IBM Relations avec la communauté des entreprises"
+
 #~ msgid "Humanitarian research on disease, natural disasters and hunger."
 #~ msgstr ""
 #~ "Recherches humanitaire sur les maladies, les désastres naturels et la "
 #~ "famine."
+
 #~ msgid ""
 #~ "To further critical non-profit research on some of humanity's most "
 #~ "pressing problems by creating the world's largest volunteer computing "
@@ -827,6 +1232,7 @@ msgstr "Les nouvelles sont disponibles en tant que %sflux RSS%s"
 #~ "problèmes les plus pressants de l'humanité en créant la plus grande "
 #~ "grille de calcul bénévole du monde. La recherche comprend le VIH / sida, "
 #~ "le cancer, la dystrophie musculaire, la dengue, et bien d'autres sujets."
+
 #~ msgid ""
 #~ "Primegrid is generating a public sequential prime number database, and is "
 #~ "searching for large twin primes of the form k*2<sup>n</sup>+1 and "
@@ -836,65 +1242,93 @@ msgstr "Les nouvelles sont disponibles en tant que %sflux RSS%s"
 #~ "données publique et séquentielle de nombres premiers, et est à la "
 #~ "recherche de grands nombres premiers jumeaux de la forme k * 2^n +1 et k "
 #~ "* 2^n -1"
+
 #~ msgid "FreeHAL"
 #~ msgstr "FreeHAL"
+
 #~ msgid "private"
 #~ msgstr "privé"
+
 #~ msgid "POEM at HOME"
 #~ msgstr "POEM at HOME"
+
 #~ msgid "Docking at Home"
 #~ msgstr "Docking at Home"
+
 #~ msgid "GPUGrid.net"
 #~ msgstr "GPUGrid.net"
+
 #~ msgid "Superlink at Technion"
 #~ msgstr "Superlink at Technion"
+
 #~ msgid "The Lattice Project"
 #~ msgstr "The Lattice Project"
+
 #~ msgid "Malariacontrol.net"
 #~ msgstr "Malariacontrol.net"
+
 #~ msgid "Rosetta at home"
 #~ msgstr "Rosetta at home"
+
 #~ msgid "SIMAP"
 #~ msgstr "SIMAP"
+
 #~ msgid "Virtual Prairie"
 #~ msgstr "Virtual Prairie"
+
 #~ msgid "University of Houston"
 #~ msgstr "Université de Houston"
+
 #~ msgid "Study of botanical ecosystems"
 #~ msgstr "Étude des écosystèmes botaniques"
+
 #~ msgid ""
 #~ "Provide ecological guidelines on the design of prairies with the best "
 #~ "potential for water purification."
 #~ msgstr ""
 #~ "Fournir les directives écologiques sur la conception des prairies avec le "
 #~ "meilleur potentiel pour la purification d'eau."
+
 #~ msgid "Climateprediction.net"
 #~ msgstr "Climateprediction.net"
+
 #~ msgid "Astronomy/Physics/Chemistry"
 #~ msgstr "Astronomie/Physique/Chimie"
+
 #~ msgid "eOn"
 #~ msgstr "eOn"
+
 #~ msgid "Orbit at home"
 #~ msgstr "Orbit at home"
+
 #~ msgid "Planetary Science Institute"
 #~ msgstr "Institut de Science Planétaire"
+
 #~ msgid "Monitor and study the hazard posed by near-Earth asteroids"
 #~ msgstr ""
 #~ "Surveiller et étudier le risque posé par les astéroïdes géocroiseurs"
+
 #~ msgid "Cosmology at Home"
 #~ msgstr "Cosmology at Home"
+
 #~ msgid "University of Illinois at Urbana-Chamapign"
 #~ msgstr "Université de l'Illinois à Urbana-Chamapign"
+
 #~ msgid "Milkyway at home"
 #~ msgstr "Milkyway at home"
+
 #~ msgid "Leiden Classical"
 #~ msgstr "Leiden Classical"
+
 #~ msgid "uFluids at home"
 #~ msgstr "uFluids at home"
+
 #~ msgid "Purdue University"
 #~ msgstr "Université de Purdue"
+
 #~ msgid "Physics/Aeronautics"
 #~ msgstr "Physique/Aéronautique"
+
 #~ msgid ""
 #~ "The uFluids project simulates two-phase fluid behavior in microgravity "
 #~ "and microfluidics problems. Our goal is to design better satellite "
@@ -906,47 +1340,67 @@ msgstr "Les nouvelles sont disponibles en tant que %sflux RSS%s"
 #~ "concevoir de meilleurs dispositifs de gestion de propulseurs de "
 #~ "satellites et adresser le flux à deux phases dans le microcanal des "
 #~ "dispositifs MEMS."
+
 #~ msgid "Einstein at home"
 #~ msgstr "Einstein at home"
+
 #~ msgid "LHC at home"
 #~ msgstr "LHC at home"
+
 #~ msgid "SETI at home"
 #~ msgstr "SETI at home"
+
 #~ msgid "Quantum Monte Carlo at Home"
 #~ msgstr "Quantum Monte Carlo at Home"
+
 #~ msgid "University of Muenster (Germany)"
 #~ msgstr "Université de Muenster (Allemagne)"
+
 #~ msgid ""
 #~ "Study the structure and reactivity of molecules using Quantum Chemistry."
 #~ msgstr ""
 #~ "Étudier la structure et la réactivité des molécules par la chimie "
 #~ "quantique"
+
 #~ msgid "Spinhenge at home"
 #~ msgstr "Spinhenge at home"
+
 #~ msgid "CAS at home"
 #~ msgstr "CAS at home"
+
 #~ msgid "Yoyo at home"
 #~ msgstr "Yoyo at home"
+
 #~ msgid "EDGeS at Home"
 #~ msgstr "EDGeS at Home"
+
 #~ msgid "Ibercivis"
 #~ msgstr "Ibercivis"
+
 #~ msgid "World Community Grid"
 #~ msgstr "World Community Grid"
+
 #~ msgid "Enigma at Home"
 #~ msgstr "Enigma at Home"
+
 #~ msgid "Collatz Conjecture"
 #~ msgstr "Conjecture de Collatz"
+
 #~ msgid "NFS at home"
 #~ msgstr "NFS at home"
+
 #~ msgid "VTU at home"
 #~ msgstr "VTU at home"
+
 #~ msgid "AQUA at home"
 #~ msgstr "AQUA at home"
+
 #~ msgid "D-Wave Systems, Inc."
 #~ msgstr "D-Wave Systems, Inc."
+
 #~ msgid "Quantum computing"
 #~ msgstr "Informatique quantique"
+
 #~ msgid ""
 #~ "D-Wave's AQUA (Adiabatic QUantum Algorithms) is a research project whose "
 #~ "goal is to predict the performance of superconducting adiabatic quantum "
@@ -963,20 +1417,28 @@ msgstr "Les nouvelles sont disponibles en tant que %sflux RSS%s"
 #~ "ordinateurs connectés à Internet pour aider à concevoir et analyser des "
 #~ "algorithmes de calcul quantique, en utilisant des techniques de Monte "
 #~ "Carlo quantiques."
+
 #~ msgid "ABC at home"
 #~ msgstr "ABC at home"
+
 #~ msgid "PrimeGrid"
 #~ msgstr "PrimeGrid"
+
 #~ msgid "primaboinca"
 #~ msgstr "primaboinca"
+
 #~ msgid "SZTAKI Desktop Grid"
 #~ msgstr "SZTAKI Desktop Grid"
+
 #~ msgid "Chess960 at home"
 #~ msgstr "Chess960 at home"
+
 #~ msgid "Chess-960.org"
 #~ msgstr "Chess-960.org"
+
 #~ msgid "Game-playing"
 #~ msgstr "Jeu"
+
 #~ msgid ""
 #~ "This project studies Chess 960, a variant of orthodox chess. In classical "
 #~ "chess the starting position of the game never changes.  In Chess 960, "
@@ -987,14 +1449,17 @@ msgstr "Les nouvelles sont disponibles en tant que %sflux RSS%s"
 #~ "les échecs classiques la position de départ du jeu ne change jamais. Dans "
 #~ "les échecs 960, juste avant le début de chaque partie, la configuration "
 #~ "initiale des pièces d'échecs soit déterminé aléatoirement."
+
 #~ msgid "The current release is known to work with these Linux versions:"
 #~ msgstr "La version actuelle fonctionne avec ces versions de Linux:"
+
 #~ msgid ""
 #~ "For other Linux versions, check if a BOINC package is offered by your "
 #~ "Linux distribution."
 #~ msgstr ""
 #~ "Pour les autres versions de Linux, vérifiez si un paquet BOINC est "
 #~ "proposé par votre distribution Linux."
+
 #~ msgid ""
 #~ "Alternatively, download the %1BOINC client for older Linux versions%2. "
 #~ "This doesn't have a graphical interface, but it should work on all Linux "
@@ -1003,177 +1468,255 @@ msgstr "Les nouvelles sont disponibles en tant que %sflux RSS%s"
 #~ "Sinon, téléchargez le client %1BOINC pour des versions de Linux "
 #~ "antérieures%2. Il ne possède pas d'interface graphique mais devrait "
 #~ "fonctionner sur tous les systèmes Linux, x86 et x64."
+
 #~ msgid ""
 #~ "Note: if your computer is equipped with an Graphics Processing Unit "
 #~ "(GPU), you may be able to %suse it to compute faster%s"
 #~ msgstr ""
 #~ "Note: si votre ordinateur est équipé d'un processeur graphique (GPU), "
 #~ "vous pourrez peut-être %sl'utiliser pour calculer plus rapidement%s"
+
 #~ msgid "TeraFLOPS."
 #~ msgstr "TeraFLOPS."
+
 #~ msgid "Conferences"
 #~ msgstr "Conférences"
+
 #~ msgid "[check all that apply]"
 #~ msgstr "[cochez tout ce qui s'applique]"
+
 #~ msgid "Other:"
 #~ msgstr "Autre : "
+
 #~ msgid "Yes - I have been running BOINC on my computer for..."
 #~ msgstr "Oui - J'utilise BOINC sur mon ordinateur depuis ..."
+
 #~ msgid "less than a week"
 #~ msgstr "moins d'une semaine"
+
 #~ msgid "less than a month"
 #~ msgstr "moins d'un mois"
+
 #~ msgid "less than a year"
 #~ msgstr "moins d'un an"
+
 #~ msgid "more than a year"
 #~ msgstr "plus d'un an"
+
 #~ msgid "No - I used to run BOINC, but..."
 #~ msgstr "Non - J'utilisais BOINC, mais j'ai arrêté parce que ..."
+
 #~ msgid "I lost interest"
 #~ msgstr "j'ai perdu l'intérêt"
+
 #~ msgid "it was too complicated"
 #~ msgstr "c'était trop compliqué"
+
 #~ msgid "I stopped it and forgot to start again"
 #~ msgstr "j'ai arrêté et oublié de recommencer"
+
 #~ msgid "it caused problems on my computer"
 #~ msgstr "des problèmes sont apparus sur mon ordinateur"
+
 #~ msgid "it used too much electricity"
 #~ msgstr "l'ordinateur consommait trop d'électricité"
+
 #~ msgid "I switched to a non-BOINC computing project"
 #~ msgstr ""
 #~ "je suis passé à du calcul distribué n'utilisant pas la plateforme BOINC"
+
 #~ msgid "No - I tried running BOINC, but..."
 #~ msgstr "Non - J'ai tenté d'utiliser BOINC, mais ..."
+
 #~ msgid "the software didn't install correctly"
 #~ msgstr "le logiciel ne s'est pas installé correctement"
+
 #~ msgid "I couldn't figure out how to use the software"
 #~ msgstr "je n'ai pas compris comment utiliser le logiciel"
+
 #~ msgid "I had network communication problems"
 #~ msgstr "j'ai rencontré des problèmes de communication réseau"
+
 #~ msgid "I couldn't attach to a project"
 #~ msgstr "je n'ai pas réussi à y attacher un projet"
+
 #~ msgid "I attached to a project, but never got any work"
 #~ msgstr ""
 #~ "j'ai attaché un projet, mais je n'ai jamais reçu de travail à effectuer"
+
 #~ msgid "No - I never tried running BOINC, because..."
 #~ msgstr "Non - Je n'ai jamais utilisé BOINC, parce que..."
+
 #~ msgid "I was concerned about security"
 #~ msgstr "sa sécurité me préoccupe"
+
 #~ msgid "I wasn't interested in any of the projects"
 #~ msgstr "aucun des projets ne m'intéresse"
+
 #~ msgid "I don't have permission to run it on my computer"
 #~ msgstr "je ne suis pas autorisé à l'utiliser sur mon ordinateur"
+
 #~ msgid "No version was available for my computer"
 #~ msgstr "il n'existe pas de version compatible avec mon ordinateur"
+
 #~ msgid "What kind of computers do you have running BOINC?"
 #~ msgstr "Sur quels types d'ordinateurs utilisez-vous BOINC ?"
+
 #~ msgid "Where are they?"
 #~ msgstr "Où sont-ils ?"
+
 #~ msgid "Work"
 #~ msgstr "Lieu de travail"
+
 #~ msgid "School"
 #~ msgstr "Lieu d'études"
+
 #~ msgid "How many computers?"
 #~ msgstr "Combien d'ordinateurs ?"
+
 #~ msgid "On average, how many hours per day are they powered on?"
 #~ msgstr "En moyenne, combien d'heures par jour fonctionnent-ils ?"
+
 #~ msgid "Age"
 #~ msgstr "Age"
+
 #~ msgid "Sex"
 #~ msgstr "Sexe"
+
 #~ msgid "Male"
 #~ msgstr "Homme"
+
 #~ msgid "Female"
 #~ msgstr "Femme"
+
 #~ msgid "Your level of computer expertise"
 #~ msgstr "Votre degré d'expertise en informatique"
+
 #~ msgid "Beginner"
 #~ msgstr "Débutant"
+
 #~ msgid "Intermediate"
 #~ msgstr "Intermédiaire"
+
 #~ msgid "Advanced"
 #~ msgstr "Avancé"
+
 #~ msgid "Where did you learn about BOINC projects?"
 #~ msgstr "Comment avez-vous découvert les projets BOINC ?"
+
 #~ msgid "TV/radio/newspaper"
 #~ msgstr "TV/radio/presse"
+
 #~ msgid "From friends, relatives, or coworkers"
 #~ msgstr "Par des amis, proches ou collègues"
+
 #~ msgid "Team message boards or web sites"
 #~ msgstr "Par le forum de mon équipe ou ses sites web"
+
 #~ msgid "The BOINC web site"
 #~ msgstr "Le site web de BOINC"
+
 #~ msgid "Other web sites"
 #~ msgstr "D'autres sites web"
+
 #~ msgid ""
 #~ "Which are the most important factors when you decide whether to "
 #~ "participate in a BOINC project?"
 #~ msgstr ""
 #~ "Quels sont les facteurs les plus importants lorsque vous choisissez de "
 #~ "participer à un projet BOINC ?"
+
 #~ msgid "Nice-looking screensaver graphics"
 #~ msgstr "De jolis graphismes dans son économiseur d'écran"
+
 #~ msgid "Fair and quick granting of credit for work done"
 #~ msgstr ""
 #~ "Une distribution rapide et équitable du crédit pour le travail effectué"
+
 #~ msgid "Getting more credit from this project than from others"
 #~ msgstr "L'obtention de plus de crédit pour ce projet que pour un autre"
+
 #~ msgid "Helpful and friendly message boards"
 #~ msgstr "Un forum associé utile et amical"
+
 #~ msgid "Participation by project staff on the message boards"
 #~ msgstr "La participation de l'équipe du projet dans le forum associé"
+
 #~ msgid "Informative project web site"
 #~ msgstr "Un site web fournissant des informations sur le projet"
+
 #~ msgid "The science is important and beneficial"
 #~ msgstr "Le sujet scientifique abordé est important et utile"
+
 #~ msgid "Non-profit, and results are public"
 #~ msgstr "Les résultats sont publics et aucune rémunération n'en sera tirée"
+
 #~ msgid "Personal recognition if my computer finds something"
 #~ msgstr ""
 #~ "Une reconnaissance personnelle dans le cas où mon ordinateur trouverait "
 #~ "quelquechose"
+
 #~ msgid "Publication by the project in scientific journals"
 #~ msgstr "Des publications du projet dans des revues scientifiques"
+
 #~ msgid "Periodic email newsletters from the project"
 #~ msgstr "Des lettres d'information périodiques de la part du projet"
+
 #~ msgid "How many BOINC projects do you participate in?"
 #~ msgstr "A combien de projets BOINC participez-vous ?"
+
 #~ msgid "Do you run BOINC as a screensaver?"
 #~ msgstr "Utilisez-vous l'économiseur d'écran de BOINC ?"
+
 #~ msgid "Yes"
 #~ msgstr "Oui"
+
 #~ msgid "No"
 #~ msgstr "Non"
+
 #~ msgid "Your usage of project messages boards:"
 #~ msgstr "Votre utilisation des fora associés aux projets :"
+
 #~ msgid "to read information"
 #~ msgstr "lecture d'informations"
+
 #~ msgid "to read and post information"
 #~ msgstr "lecture et fourniture d'informations"
+
 #~ msgid "None"
 #~ msgstr "aucune"
+
 #~ msgid ""
 #~ "Where do you get information to help resolve problems with BOINC and/or "
 #~ "BOINC projects?"
 #~ msgstr ""
 #~ "Où trouvez-vous les informations nécessaires à la résolution de problèmes "
 #~ "liés à BOINC et ses projets ?"
+
 #~ msgid "The project message boards"
 #~ msgstr "Le forum du projet"
+
 #~ msgid "The BOINC message boards"
 #~ msgstr "Le forum de BOINC"
+
 #~ msgid "BOINC mailing lists"
 #~ msgstr "Les listes de diffusion BOINC"
+
 #~ msgid "The Unofficial BOINC Wiki"
 #~ msgstr "Le Wiki non-officiel de BOINC"
+
 #~ msgid "Team web sites"
 #~ msgstr "Les sites web des équipes"
+
 #~ msgid "Google or other search engines"
 #~ msgstr "Google ou d'autres moteurs de recherche"
+
 #~ msgid "... more"
 #~ msgstr "... suivant"
+
 #~ msgid "BOINC user survey"
 #~ msgstr "Enquête utilisateurs BOINC"
+
 #~ msgid ""
 #~ "Several volunteer computing projects, including Climateprediction.net, "
 #~ "Einstein at home, and SETI at home, use software called BOINC.  If you "
@@ -1196,40 +1739,54 @@ msgstr "Les nouvelles sont disponibles en tant que %sflux RSS%s"
 #~ "changé, merci d'y prendre part à nouveau - vos nouvelles réponses "
 #~ "remplaceront les anciennes. <p> Les résultats actuels de l'enquête sont "
 #~ "<a href=poll_results.php>ici</a>. "
+
 #~ msgid "Do you run BOINC?"
 #~ msgstr "Utilisez-vous BOINC ?"
+
 #~ msgid "Your participation"
 #~ msgstr "Votre participation"
+
 #~ msgid "Your computers"
 #~ msgstr "Vos ordinateurs"
+
 #~ msgid "You"
 #~ msgstr "Vous"
+
 #~ msgid "Nationality"
 #~ msgstr "Nationalité"
+
 #~ msgid "Comments"
 #~ msgstr "Commentaires"
+
 #~ msgid ""
 #~ "Please suggest ways that BOINC, and the projects that use it, could be "
 #~ "improved:"
 #~ msgstr ""
 #~ "Merci de suggérer des pistes pour améliorer BOINC, et les projets qui "
 #~ "l'utilisent :"
+
 #~ msgid "When done click:"
 #~ msgstr "Cliquez lorsque vous avez terminé :"
+
 #~ msgid "Error - results not recorded"
 #~ msgstr "Erreur - les résultats n'ont pas été enregistrés"
+
 #~ msgid ""
 #~ "An internal error has prevented us from recording your survey response.  "
 #~ "Please try again later."
 #~ msgstr ""
 #~ "Une erreur interne nous a empêchés d'enregistrer vos réponses à "
 #~ "l'enquête.  Veuillez réessayer plus tard."
+
 #~ msgid "Survey response recorded"
 #~ msgstr "Réponses enregistrées"
+
 #~ msgid "Thank you for completing the BOINC user survey."
 #~ msgstr "Merci d'avoir répondu à l'enquête sur les utilisateurs de BOINC."
+
 #~ msgid "Survey results"
 #~ msgstr "Résultats de l'enquête"
+
 #~ msgid ""
 #~ "These are the current results of the <a href=poll.php>BOINC user survey</"
 #~ "a>.  This page is updated every hour."
@@ -1237,3 +1794,299 @@ msgstr "Les nouvelles sont disponibles en tant que %sflux RSS%s"
 #~ "Voici les résultats actuels de <a href=poll.php>l'enquête sur les "
 #~ "utilisateurs de BOINC</a>.  La page est mise à jour toutes les heures."
 
+# The charset used for the text in this file (please try to use UTF-8 if possible)
+#~ msgid "CHARSET"
+#~ msgstr "UTF-8"
+
+# The name of this language in this language<br />
+# <br />
+# The name of this language in this language
+#~ msgid "LANG_NAME_NATIVE"
+#~ msgstr "Français"
+
+# The name of this language in an international language (English)
+#~ msgid "LANG_NAME_INTERNATIONAL"
+#~ msgstr "French"
+
+#~ msgid "POLL_AGE"
+#~ msgstr "Age"
+
+#~ msgid "HELP_P1_1"
+#~ msgstr ""
+#~ "BOINC Online Help lets you talk one-on-one with experienced BOINC users, "
+#~ "who can: %s answer questions about BOINC and volunteer computing; %s walk "
+#~ "you through the process of installing and using BOINC; %s troubleshoot "
+#~ "any problems you might have. "
+
+#~ msgid "HELP_P1_2"
+#~ msgstr ""
+#~ "BOINC Online Help is based on %sSkype%s, an Internet-based telephone "
+#~ "system. 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. "
+
+#~ msgid "HELP_P1_3"
+#~ msgstr ""
+#~ "The best way to get help is by voice, for which you need either built-in "
+#~ "microphone and speakers or an external headset for your computer. You can "
+#~ "also use Skype's text-based chat system or regular email (if you don't "
+#~ "have Skype) to communicate with Help Volunteers."
+
+#~ msgid "HELP_P1_4"
+#~ msgstr ""
+#~ "Volunteers speaking several languages are available. Please select a "
+#~ "language: "
+
+#~ msgid "HELP_HEADING2"
+#~ msgstr "BOINC help on the web"
+
+#~ msgid "HELP_P2_ITEM1"
+#~ msgstr "BOINC user's manual"
+
+#~ msgid "HELP_P2_ITEM2"
+#~ msgstr "Troubleshooting BOINC "
+
+#~ msgid "HELP_P2_ITEM3"
+#~ msgstr "BOINC-related web sites "
+
+#~ msgid "HELP_P2_ITEM4"
+#~ msgstr "The BOINC message boards "
+
+#~ msgid "HELP_P2_ITEM5"
+#~ msgstr "The message boards on any BOINC-based project "
+
+#~ msgid "HELP_HEADING3"
+#~ msgstr "Be a Help Volunteer"
+
+#~ msgid "HELP_P3_1"
+#~ msgstr ""
+#~ "If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+#~ "Volunteer%s. It's a great way to help the cause of scientific research "
+#~ "and volunteer computing - and it's fun!  "
+
+#~ msgid "HELP_P3_2"
+#~ msgstr ""
+#~ "If you're already a Help Volunteer: to edit your settings, %sclick here"
+#~ "%s. "
+
+#~ msgid "HOME_P1"
+#~ msgstr ""
+#~ " Use the idle time on your computer  (Windows, Mac, or Linux)  to cure "
+#~ "diseases, study global warming,  discover pulsars, and do many other "
+#~ "types of scientific research.  It's safe, secure, and easy:  %sChoose%s "
+#~ "projects  %sDownload%s and run BOINC software  %sEnter%s an email address "
+#~ "and password. "
+
+#~ msgid "HOME_P2"
+#~ msgstr ""
+#~ "Or, if you run several projects, try an %saccount manager%s such as "
+#~ "%sGridRepublic%s or %sBAM!%s. "
+
+#~ msgid "HOME_P3"
+#~ msgstr ""
+#~ "If you have any questions, or need help getting started, you can %stalk "
+#~ "to a Volunteer Helper%s. "
+
+#~ msgid "HOME_DOWNLOAD"
+#~ msgstr "Download"
+
+#~ msgid "HOME_WEB_SITES"
+#~ msgstr "Web"
+
+#~ msgid "HOME_ADD_ONS"
+#~ msgstr "Add-ons"
+
+#~ msgid "HOME_SURVEY"
+#~ msgstr "Survey"
+
+#~ msgid "HOME_BOINC"
+#~ msgstr "Berkeley Open Infrastructure for Network Computing"
+
+#~ msgid "HOME_BOINC_DESC"
+#~ msgstr ""
+#~ "Open-source software for %svolunteer computing%s and %sgrid computing%s"
+
+#~ msgid "DL_DOWNLOAD"
+#~ msgstr "Télécharger BOINC"
+
+#~ msgid "DL_VERSION_LNAME_SIZE"
+#~ msgstr "%s pour %s (%s Mo)"
+
+#~ msgid "DL_WHATS_BOINC"
+#~ msgstr ""
+#~ " BOINC est un programme qui vous permet d'offrir        le temps "
+#~ "inutilisé par votre ordinateur à des projets scientifiques tels "
+#~ "que        SETI at home, Climateprediction.net, Rosetta at home,        World "
+#~ "Community Grid, et bien d'autres.        <p>        Après avoir installé "
+#~ "BOINC sur votre ordinateur,        vous pourrez vous connecter à autant "
+#~ "de projets BOINC que vous le souhaitez.        <p>"
+
+#~ msgid "DL_SYSTEMREQ"
+#~ msgstr "Configuration minimale"
+
+#~ msgid "DL_RELNOTES"
+#~ msgstr "Notes de version"
+
+#~ msgid "DL_TROUBLE"
+#~ msgstr "Résolution de problèmes"
+
+#~ msgid "DL_OTHERSYS"
+#~ msgstr "Autres systèmes"
+
+#~ msgid "DL_ALLVERSIONS"
+#~ msgstr "Toutes les versions"
+
+#~ msgid "DL_IF_OTHERTYPES"
+#~ msgstr ""
+#~ "Si votre ordinateur est d'un autre type que ceux mentionnés ci-dessus, "
+#~ "vous pouvez"
+
+#~ msgid "DL_MAKEYOUROWN"
+#~ msgstr "%s générer votre propre client %s ou"
+
+#~ msgid "DL_DL_FROM3RDP"
+#~ msgstr ""
+#~ "%s télécharger les exécutables depuis une site tiers %s (disponible pour "
+#~ "Solaris/Opteron, Linux/Opteron, Linux/PPC, HP-UX, FreeBSD, et autres)."
+
+#~ msgid "DL_DOWNLOAD_TITLE"
+#~ msgstr "BOINC : calculez pour la science"
+
+# #############################################
+# system_requirements.php by je2bwm 2006/08/07
+# #############################################
+#~ msgid "SRQ_PAGE_TITLE"
+#~ msgstr "Prérequis système"
+
+#~ msgid "SRQ_INTRO"
+#~ msgstr ""
+#~ "Votre ordinateur doit satisfaire aux prérequis suivants pour faire "
+#~ "fonctionner BOINC. Les projets peuvent avoir des exigences "
+#~ "supplémentaires."
+
+#~ msgid "SRQ_MSWIN"
+#~ msgstr "Windows"
+
+#~ msgid "SRQ_OS"
+#~ msgstr "Systèmes d'exploitation"
+
+#~ msgid "SRQ_MSWIN_REQ_OS"
+#~ msgstr "Windows 98 ou plus récent"
+
+#~ msgid "SRQ_MIN_HARDWARE"
+#~ msgstr "Configuration matérielle minimale"
+
+#~ msgid "SRQ_MSWIN_REQ_CPU"
+#~ msgstr "Pentium 233 MHz (Pentium 500 MHz ou plus rapide recommandé)"
+
+#~ msgid "SRQ_MSWIN_REQ_RAM"
+#~ msgstr "64 Mo de mémoire RAM (128 Mo ou plus recommandé)"
+
+#~ msgid "SRQ_MSWIN_REQ_DISK"
+#~ msgstr "20 Mo d'espace disque"
+
+#~ msgid "SRQ_APPLMAC"
+#~ msgstr "Macintosh"
+
+#~ msgid "SRQ_APPLMAC_REQ_OS"
+#~ msgstr "Mac OS X 10.3 ou plus récent"
+
+#~ msgid "SRQ_APPLMAC_REQ_CPU"
+#~ msgstr ""
+#~ "Un ordinateur Macintosh avec un processeur Intel x86 ou PowerPC G3, G4, "
+#~ "or G5"
+
+#~ msgid "SRQ_APPLMAC_REQ_RAM"
+#~ msgstr "128 Mo de RAM (256 Mo de RAM ou plus recommandé)"
+
+#~ msgid "SRQ_APPLMAC_REQ_DISK"
+#~ msgstr "200 Mo d'espace disque"
+
+#~ msgid "SRQ_LINUX"
+#~ msgstr "Linux"
+
+#~ msgid "SRQ_LINUX_REQ_KERNEL"
+#~ msgstr "Linux kernel 2.2.14 or plus récent"
+
+#~ msgid "SRQ_LINUX_REQ_GLIBC"
+#~ msgstr "glibc 2.3.2 ou plus récent"
+
+#~ msgid "SRQ_LINUX_REQ_XFREE86"
+#~ msgstr "XFree86-3.3.6 ou plus récent"
+
+#~ msgid "SRQ_LINUX_REQ_GTKPLUS"
+#~ msgstr "gtk+2.0 ou plus récent"
+
+#~ msgid "SRQ_LINUX_REQ_CPU"
+#~ msgstr "Processeur Pentium 500 MHz ou plus"
+
+#~ msgid "SRQ_LINUX_REQ_RAM"
+#~ msgstr "64 Mo de RAM"
+
+#~ msgid "SRQ_LINUX_REQ_DISK"
+#~ msgstr "50 Mo d'espace disque"
+
+# #############################################
+# release_notes.php
+# #############################################
+#~ msgid "RLN_PAGE_TITLE"
+#~ msgstr "Notes de version"
+
+#~ msgid "RLN_WHATS_NEW"
+#~ msgstr "Nouveautés dans %s"
+
+#~ msgid "RLN_INSTALLING"
+#~ msgstr "Installation"
+
+#~ msgid "RLN_UNINSTALLING"
+#~ msgstr "Désinstallation"
+
+#~ msgid "RLN_KNOWN_ISSUES"
+#~ msgstr "Problèmes connus"
+
+#~ msgid "RLN_WIN_INSTALL_PROBLEMS"
+#~ msgstr ""
+#~ "(Windows) Dans de rares cas, l'installation peut échouer parce qu' une "
+#~ "version de BOINC est déjà installée. Si cela se produit : %s Quittez "
+#~ "BOINC s'il est lancé, et désintallez BOINC en utilisant %s Démarrer/"
+#~ "Panneau de configuration/Ajout-Suppression de programmes%s. Installez à "
+#~ "nouveau la version la plus récente. %s En cas d'échec, réinstallez la "
+#~ "version de BOINC que vous utilisiez auparavant(les anciennes versions de "
+#~ "BOINC se trouvent %sici%s). Désinstallez la comme indiqué ci-dessus et "
+#~ "installez la nouvelle version. %s En cas de nouvel échec, téléchargez "
+#~ "l'utilitaire %sde nettoyage de l'installeur Windows%s de Microsoft et "
+#~ "lancez le. L'ancienne version de BOINC apparaît en tant que BOINC.msi ou "
+#~ "sous la forme d'une icone de fichier *.msi corrumpu (dans les options du "
+#~ "haut). Cliquez dessus pour le sélectionner, puis cliquez sur Enlever et "
+#~ "Quitter. Redémarrez votre ordinateur. Installez la nouvelle version. "
+#~ "(Attention : ne touchez pas aux autres fichiers .msi, vous risqueriez "
+#~ "d'avoir des problèmes pour désintaller d'autres programmes). %s "
+
+#~ msgid "RLN_TROUBLESHOOT"
+#~ msgstr "Résolution de problèmes liés à BOINC"
+
+#~ msgid "RLN_NEWF_5_4_AM"
+#~ msgstr ""
+#~ "Support des 'Gestionnaires de comptes' - des sites web vous permettant de "
+#~ "naviguer entre les projets BOINC, d'attacher/détacher, changer le partage "
+#~ "de ressources et les paramètres, par de simples clics. Les gestionnaires "
+#~ "de comptes sont aussi très utiles lorsque vous avez plusieurs ordinateurs "
+#~ "- les changements n'ont à être faits qu'une fois."
+
+#~ msgid "RLN_NEWF_5_4_PREF_OVERRIDE"
+#~ msgstr ""
+#~ "Les préférences générales peuvent être remplacées par celles d'un fichier "
+#~ "local ; des détails sont disponibles %s ici %s."
+
+#~ msgid "RLN_NEWF_5_4_ALERTS_CONNECT"
+#~ msgstr ""
+#~ "Maintenant BOINC vous alerte lorsqu'il a besoin de vous pour se connecter "
+#~ "au réseau."
+
+#~ msgid "RLN_5_8_SIMPLE_GUI"
+#~ msgstr ""
+#~ "Le 'BOINC Manager' propose 2 interfaces différentes :  une "
+#~ "'simple' (légère, graphique, skinnable)  et une 'avancée' donnant accès "
+#~ "au maximum d'informations.  L'interface simple permet une édition locale "
+#~ "des paramètres.  Vous pouvez passer de la vue simple à la vue avancée et "
+#~ "vice-versa. "
diff --git a/locale/gl/BOINC-Client.mo b/locale/gl/BOINC-Client.mo
index f7b4427..e52aaf4 100644
Binary files a/locale/gl/BOINC-Client.mo and b/locale/gl/BOINC-Client.mo differ
diff --git a/locale/gl/BOINC-Client.po b/locale/gl/BOINC-Client.po
index 411abc4..fdb2d20 100644
--- a/locale/gl/BOINC-Client.po
+++ b/locale/gl/BOINC-Client.po
@@ -4,20 +4,19 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-06-05 10:24-0700\n"
-"PO-Revision-Date: 2015-02-10 22:35-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.2.1\n"
 
-#: acct_mgr.cpp:448
-#: acct_mgr.cpp:457
+#: acct_mgr.cpp:448 acct_mgr.cpp:457
 msgid "Message from account manager"
 msgstr ""
 
@@ -26,7 +25,9 @@ msgid "Message from server"
 msgstr ""
 
 #: client_state.cpp:246
-msgid "Some tasks need more memory than allowed by your preferences.  Please check the preferences."
+msgid ""
+"Some tasks need more memory than allowed by your preferences.  Please check "
+"the preferences."
 msgstr ""
 
 #: client_state.cpp:501
@@ -39,11 +40,12 @@ msgstr ""
 
 #: cs_scheduler.cpp:575
 #, c-format
-msgid "You used the wrong URL for this project.  When convenient, remove this project, then add %s"
+msgid ""
+"You used the wrong URL for this project.  When convenient, remove this "
+"project, then add %s"
 msgstr ""
 
-#: cs_statefile.cpp:829
-#: ../sched/sched_types.cpp:259
+#: cs_statefile.cpp:829 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
 msgstr ""
 
@@ -59,13 +61,11 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: log_flags.cpp:259
-#: log_flags.cpp:436
+#: log_flags.cpp:259 log_flags.cpp:436
 msgid "Unexpected text in cc_config.xml"
 msgstr ""
 
-#: log_flags.cpp:410
-#: log_flags.cpp:462
+#: log_flags.cpp:410 log_flags.cpp:462
 msgid "Unrecognized tag in cc_config.xml"
 msgstr ""
 
@@ -90,7 +90,9 @@ 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."
+msgid ""
+"The project has changed its security key.  Please remove and add this "
+"project."
 msgstr ""
 
 #: ../sched/handle_request.cpp:943
@@ -102,7 +104,8 @@ 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."
+msgid ""
+"Your BOINC client software is too old.  Please install the current version."
 msgstr ""
 
 #: ../sched/handle_request.cpp:1259
@@ -114,11 +117,14 @@ 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"
+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"
+msgid ""
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to "
+"the current version"
 msgstr ""
 
 #: ../sched/sched_send.cpp:1146
@@ -140,7 +146,8 @@ msgstr ""
 
 #: ../sched/sched_send.cpp:1305
 #, c-format
-msgid "Tasks for %s are available, but your preferences are set to not accept them"
+msgid ""
+"Tasks for %s are available, but your preferences are set to not accept them"
 msgstr ""
 
 #: ../sched/sched_types.cpp:254
@@ -150,4 +157,3 @@ msgstr ""
 #: ../sched/sched_version.cpp:214
 msgid "Your app_info.xml file doesn't have a usable version of"
 msgstr ""
-
diff --git a/locale/gl/BOINC-Manager.mo b/locale/gl/BOINC-Manager.mo
index 763ee2e..886189f 100644
Binary files a/locale/gl/BOINC-Manager.mo and b/locale/gl/BOINC-Manager.mo differ
diff --git a/locale/gl/BOINC-Manager.po b/locale/gl/BOINC-Manager.po
index 41cba3b..90cd094 100644
--- a/locale/gl/BOINC-Manager.po
+++ b/locale/gl/BOINC-Manager.po
@@ -4,24 +4,25 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: BOINC Manager 6.6.x\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-06-18 11:32-0500\n"
-"PO-Revision-Date: 2015-02-10 22:39-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: 2013-06-05 19:49+0200\n"
+"Last-Translator: Anonymous Pootle User\n"
+"Language-Team: Galician <LL at li.org>\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.1.6\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
 "X-Poedit-SearchPath-0: clientgui\n"
 "X-Poedit-SearchPath-1: clientgui/msw\n"
 "X-Poedit-SearchPath-2: clientgui/gtk\n"
 "X-Poedit-SearchPath-3: clientgui/mac\n"
+"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
 
 #: clientgui/AccountInfoPage.cpp:387
 #, c-format
@@ -71,13 +72,11 @@ msgstr ""
 msgid "Find login information"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:668
+#: clientgui/AccountInfoPage.cpp:436 clientgui/AccountInfoPage.cpp:668
 msgid "&Password:"
 msgstr "&Contrasinal:"
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:692
+#: clientgui/AccountInfoPage.cpp:443 clientgui/AccountInfoPage.cpp:692
 msgid "Choose a &password:"
 msgstr "Escolla un contrasinal:"
 
@@ -133,33 +132,50 @@ msgid "Use account manager"
 msgstr "Xestor de contas"
 
 #: clientgui/AccountInfoPage.cpp:587
-msgid "The minimum username length for this project is 1. Please enter a different username."
+msgid ""
+"The minimum username length for this project is 1. Please enter a different "
+"username."
 msgstr ""
 
 #: clientgui/AccountInfoPage.cpp:592
-msgid "The minimum username length for this account manager is 1. Please enter a different username."
+msgid ""
+"The minimum username length for this account manager is 1. Please enter a "
+"different username."
 msgstr ""
 
 #: clientgui/AccountInfoPage.cpp:598
-msgid "The minimum email address length for this project is 1. Please enter a different email address."
+msgid ""
+"The minimum email address length for this project is 1. Please enter a "
+"different email address."
 msgstr ""
 
 #: clientgui/AccountInfoPage.cpp:603
-msgid "The minimum email address length for this account manager is 1. Please enter a different email address."
+msgid ""
+"The minimum email address length for this account manager is 1. Please enter "
+"a different email address."
 msgstr ""
 
 #: clientgui/AccountInfoPage.cpp:616
 #, c-format
-msgid "The minimum password length for this project is %d. Please enter a different password."
-msgstr "A lonxitude mínima do contrasinal para este proxecto é de %d. Introduza un contrasinal distinto."
+msgid ""
+"The minimum password length for this project is %d. Please enter a different "
+"password."
+msgstr ""
+"A lonxitude mínima do contrasinal para este proxecto é de %d. Introduza un "
+"contrasinal distinto."
 
 #: clientgui/AccountInfoPage.cpp:622
 #, c-format
-msgid "The minimum password length for this account manager is %d. Please enter a different password."
-msgstr "A lonxitude mínima do contrasinal para este xestor de contas é de %d. Introduza un contrasinal distinto."
+msgid ""
+"The minimum password length for this account manager is %d. Please enter a "
+"different password."
+msgstr ""
+"A lonxitude mínima do contrasinal para este xestor de contas é de %d. "
+"Introduza un contrasinal distinto."
 
 #: clientgui/AccountInfoPage.cpp:634
-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 "O contrasinal e a confirmación non concordan. Escríbaos de novo."
 
 #: clientgui/AccountManagerInfoPage.cpp:248
@@ -171,7 +187,8 @@ msgstr ""
 msgid ""
 "To choose an account manager, click its name or \n"
 "type its URL below."
-msgstr "Para escoller un proxecto, faga clic no seu nome ou introduza a URL embaixo."
+msgstr ""
+"Para escoller un proxecto, faga clic no seu nome ou introduza a URL embaixo."
 
 #: clientgui/AccountManagerInfoPage.cpp:254
 msgid "Account Manager &URL:"
@@ -195,7 +212,7 @@ msgstr "Agarde, por favor..."
 
 #: clientgui/AccountManagerProcessingPage.cpp:327
 msgid "An internal server error has occurred.\n"
-msgstr "Houbo un erro interno no servidor.\n"
+msgstr "Houbo un erro interno no servidor."
 
 #: clientgui/AdvancedFrame.cpp:95
 msgid "Connected"
@@ -214,8 +231,7 @@ msgstr ""
 msgid "&Close Window"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:329
-#: clientgui/AdvancedFrame.cpp:336
+#: clientgui/AdvancedFrame.cpp:329 clientgui/AdvancedFrame.cpp:336
 #: clientgui/AdvancedFrame.cpp:343
 #, c-format
 msgid "Exit %s"
@@ -675,10 +691,12 @@ msgstr "%s - Erro de conexión"
 #: clientgui/BOINCBaseFrame.cpp:514
 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 ""
 "Neste momento non está autorizado a controlar o xestor.\n"
-"Contacte co seu administrador para que o engada ao grupo de usuarios 'boinc_users'."
+"Contacte co seu administrador para que o engada ao grupo de usuarios "
+"'boinc_users'."
 
 #: clientgui/BOINCBaseFrame.cpp:523
 msgid ""
@@ -719,10 +737,12 @@ msgstr "%s - Fallo no inicio do Daemon"
 #, 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 ""
 "%s non é quen de iniciar un cliente %s.\n"
-"Execute o Panel de Control->Ferramentas de Administración->Miniaplicación de servizos e arrinque o servizo BOINC."
+"Execute o Panel de Control->Ferramentas de Administración->Miniaplicación de "
+"servizos e arrinque o servizo BOINC."
 
 #: clientgui/BOINCBaseFrame.cpp:638
 #, c-format
@@ -742,12 +762,15 @@ msgstr "%s - Estado da conexión"
 #, 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 ""
 "%s non está conectado neste intre a un cliente %s.\n"
-"Use a opción do mení 'Avanzado\\Escoller computador...' para conectar a un cliente %s.\n"
-"Para conectar ao teu computador persoal use 'localhosts' como nome do servidor."
+"Use a opción do mení 'Avanzado\\Escoller computador...' para conectar a un "
+"cliente %s.\n"
+"Para conectar ao teu computador persoal use 'localhosts' como nome do "
+"servidor."
 
 #: clientgui/BOINCBaseView.cpp:774
 #, fuzzy
@@ -829,7 +852,8 @@ msgid ""
 "     user group."
 msgstr ""
 "Neste momento non está autorizado a controlar o xestor.\n"
-"Contacte co seu administrador para que o engada ao grupo de usuarios 'boinc_users'."
+"Contacte co seu administrador para que o engada ao grupo de usuarios "
+"'boinc_users'."
 
 #: clientgui/BOINCGUIApp.cpp:351
 #, c-format
@@ -929,14 +953,12 @@ msgstr "Abrir a web de %s..."
 msgid "Open %s..."
 msgstr "Abrir %s..."
 
-#: clientgui/BOINCTaskBar.cpp:525
-#: clientgui/BOINCTaskBar.cpp:621
+#: clientgui/BOINCTaskBar.cpp:525 clientgui/BOINCTaskBar.cpp:621
 #: clientgui/BOINCTaskBar.cpp:629
 msgid "Snooze"
 msgstr "Dormitar"
 
-#: clientgui/BOINCTaskBar.cpp:527
-#: clientgui/BOINCTaskBar.cpp:648
+#: clientgui/BOINCTaskBar.cpp:527 clientgui/BOINCTaskBar.cpp:648
 #: clientgui/BOINCTaskBar.cpp:656
 msgid "Snooze GPU"
 msgstr ""
@@ -1031,10 +1053,8 @@ msgstr ""
 "\n"
 "Faga clic en Rematar para pechar."
 
-#: 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 "Faga clic en Rematar para pechar."
 
@@ -1117,10 +1137,8 @@ msgstr ""
 msgid "Berkeley Open Infrastructure for Network Computing"
 msgstr "Infraestrutura Aberta para Computación en Rede de Berkeley (BOINC)"
 
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:396
+#: clientgui/DlgAbout.cpp:208 clientgui/DlgExitMessage.cpp:173
+#: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:396
 #: clientgui/DlgSelectComputer.cpp:162
 msgid "&OK"
 msgstr "&Aceptar"
@@ -1145,8 +1163,7 @@ msgstr "detectado valor de entrada incorrecto"
 msgid "Validation Error"
 msgstr "Erro de Validación"
 
-#: clientgui/DlgAdvPreferences.cpp:797
-#: clientgui/DlgAdvPreferences.cpp:803
+#: clientgui/DlgAdvPreferences.cpp:797 clientgui/DlgAdvPreferences.cpp:803
 #: clientgui/DlgAdvPreferences.cpp:809
 msgid "Applications to add"
 msgstr ""
@@ -1156,8 +1173,7 @@ msgstr ""
 msgid "'%s' is not an executable application."
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:827
-#: clientgui/DlgAdvPreferences.cpp:874
+#: clientgui/DlgAdvPreferences.cpp:827 clientgui/DlgAdvPreferences.cpp:874
 #: clientgui/DlgAdvPreferences.cpp:898
 msgid "Add Exclusive App"
 msgstr ""
@@ -1260,7 +1276,8 @@ msgid "While computer is on batteries"
 msgstr " Mentres funciona con baterías"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:142
-msgid "check this if you want this computer to do work while it runs on batteries"
+msgid ""
+"check this if you want this computer to do work while it runs on batteries"
 msgstr "de marcarse, o computador traballará mentres funcione con baterías"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:148
@@ -1269,7 +1286,8 @@ msgid "While computer is in use"
 msgstr " Mentres está en uso"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:151
-msgid "check this if you want this computer to do work even when you're using it"
+msgid ""
+"check this if you want this computer to do work even when you're using it"
 msgstr "de marcarse, o computador traballará tamén mentres o estea a usar."
 
 #: clientgui/DlgAdvPreferencesBase.cpp:157
@@ -1278,7 +1296,9 @@ msgid "Use GPU while computer is in use"
 msgstr " Mentres está en uso"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:160
-msgid "check this if you want your GPU to do work even when you're using the computer"
+msgid ""
+"check this if you want your GPU to do work even when you're using the "
+"computer"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:172
@@ -1286,7 +1306,8 @@ msgid "Only after computer has been idle for"
 msgstr "Só cando leve inactivo"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:182
-msgid "do work only after you haven't used the computer for this number of minutes"
+msgid ""
+"do work only after you haven't used the computer for this number of minutes"
 msgstr "traballar só cando non use o computador durante este número de minutos"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:187
@@ -1470,7 +1491,8 @@ msgstr " Non verificar arquivo de imaxe"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:467
 msgid "check this if your Internet provider modifies image files"
-msgstr "marque isto se o seu provedor de Internet modifica os arquivos de imaxe"
+msgstr ""
+"marque isto se o seu provedor de Internet modifica os arquivos de imaxe"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:475
 msgid "Connect options"
@@ -1481,8 +1503,12 @@ msgid "Confirm before connecting to internet"
 msgstr "Confirmar antes de conectar á Internet"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:479
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
-msgstr "de marcarse, aparecerá un diálogo de confirmación antes das conexións á Internet"
+msgid ""
+"if checked, a confirmation dialog will be displayed before trying to connect "
+"to the Internet"
+msgstr ""
+"de marcarse, aparecerá un diálogo de confirmación antes das conexións á "
+"Internet"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:483
 msgid "Disconnect when done"
@@ -1508,8 +1534,7 @@ msgstr "hora de inico do uso da rede"
 msgid "network usage stop hour"
 msgstr "hora de final do uso da rede"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:597
-#: clientgui/DlgItemProperties.cpp:226
+#: clientgui/DlgAdvPreferencesBase.cpp:597 clientgui/DlgItemProperties.cpp:226
 msgid "Disk usage"
 msgstr "Uso do disco"
 
@@ -1579,7 +1604,8 @@ msgid "if checked, suspended work units are left in memory"
 msgstr "de marcarse, o traballo suspendido quedará na memoria"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:712
-msgid "Suspend processor and network usage when these applications are running:"
+msgid ""
+"Suspend processor and network usage when these applications are running:"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:721
@@ -1620,8 +1646,7 @@ msgstr "Data"
 msgid "Message"
 msgstr "Mensaxe"
 
-#: clientgui/DlgEventLog.cpp:287
-#: clientgui/DlgEventLog.cpp:351
+#: clientgui/DlgEventLog.cpp:287 clientgui/DlgEventLog.cpp:351
 #, fuzzy
 msgid "&Show only this project"
 msgstr "Amosar só este proxecto"
@@ -1630,8 +1655,7 @@ msgstr "Amosar só este proxecto"
 msgid "Copy &All"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:293
-#: clientgui/DlgEventLog.cpp:297
+#: clientgui/DlgEventLog.cpp:293 clientgui/DlgEventLog.cpp:297
 msgid "Copy all the messages to the clipboard."
 msgstr "Copiar tódalas mensaxes."
 
@@ -1639,18 +1663,23 @@ msgstr "Copiar tódalas mensaxes."
 msgid "Copy &Selected"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:305
-#: clientgui/DlgEventLog.cpp:313
-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 "Copia as mensaxes escollidas ao portarretallos. Pode escoller varias mensaxes premendo a tecla shift ou control mentres fai clic nas mensaxes."
+#: clientgui/DlgEventLog.cpp:305 clientgui/DlgEventLog.cpp:313
+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 ""
+"Copia as mensaxes escollidas ao portarretallos. Pode escoller varias "
+"mensaxes premendo a tecla shift ou control mentres fai clic nas mensaxes."
 
-#: clientgui/DlgEventLog.cpp:307
-#: clientgui/DlgEventLog.cpp:315
-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 "Copia as mensaxes escollidas ao portarretallos. Pode escoller varias mensaxes premendo a tecla shift ou control mentres fai clic nas mensaxes."
+#: clientgui/DlgEventLog.cpp:307 clientgui/DlgEventLog.cpp:315
+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 ""
+"Copia as mensaxes escollidas ao portarretallos. Pode escoller varias "
+"mensaxes premendo a tecla shift ou control mentres fai clic nas mensaxes."
 
-#: clientgui/DlgEventLog.cpp:322
-#: clientgui/DlgItemProperties.cpp:66
+#: clientgui/DlgEventLog.cpp:322 clientgui/DlgItemProperties.cpp:66
 msgid "&Close"
 msgstr "&Pechar"
 
@@ -1664,14 +1693,12 @@ msgstr ""
 msgid "Show all &messages"
 msgstr "Amosar tódalas mensaxes"
 
-#: clientgui/DlgEventLog.cpp:346
-#: clientgui/DlgEventLog.cpp:348
+#: clientgui/DlgEventLog.cpp:346 clientgui/DlgEventLog.cpp:348
 #, fuzzy
 msgid "Show messages for all projects"
 msgstr "Amosar mensaxes de tódolos proxectos."
 
-#: clientgui/DlgEventLog.cpp:352
-#: clientgui/DlgEventLog.cpp:354
+#: clientgui/DlgEventLog.cpp:352 clientgui/DlgEventLog.cpp:354
 #, fuzzy
 msgid "Show only the messages for the selected project"
 msgstr "Amosar só as mensaxes do proxecto escollido."
@@ -1718,10 +1745,8 @@ msgstr ""
 msgid "Remember this decision and do not show this dialog."
 msgstr "Lembrar esta decisión e non amosar este diálogo."
 
-#: clientgui/DlgExitMessage.cpp:178
-#: clientgui/DlgGenericMessage.cpp:125
-#: clientgui/DlgOptions.cpp:401
-#: clientgui/DlgSelectComputer.cpp:167
+#: clientgui/DlgExitMessage.cpp:178 clientgui/DlgGenericMessage.cpp:125
+#: clientgui/DlgOptions.cpp:401 clientgui/DlgSelectComputer.cpp:167
 msgid "&Cancel"
 msgstr "&Cancelar"
 
@@ -1729,10 +1754,8 @@ msgstr "&Cancelar"
 msgid "Don't show this dialog again."
 msgstr "Non amosar máis este diálogo."
 
-#: clientgui/DlgItemProperties.cpp:163
-#: clientgui/DlgItemProperties.cpp:166
-#: clientgui/DlgItemProperties.cpp:169
-#: clientgui/DlgItemProperties.cpp:172
+#: clientgui/DlgItemProperties.cpp:163 clientgui/DlgItemProperties.cpp:166
+#: clientgui/DlgItemProperties.cpp:169 clientgui/DlgItemProperties.cpp:172
 #, fuzzy
 msgid "Don't fetch tasks for "
 msgstr "Sen novas tarefas"
@@ -1770,8 +1793,7 @@ msgstr ""
 msgid "Properties of project "
 msgstr "Propiedades do proxecto "
 
-#: clientgui/DlgItemProperties.cpp:212
-#: clientgui/DlgOptions.cpp:218
+#: clientgui/DlgItemProperties.cpp:212 clientgui/DlgOptions.cpp:218
 msgid "General"
 msgstr "Xeral"
 
@@ -1811,14 +1833,10 @@ msgstr ""
 msgid "Non CPU intensive"
 msgstr "Sen CPU intensiva"
 
-#: clientgui/DlgItemProperties.cpp:229
-#: clientgui/DlgItemProperties.cpp:231
-#: clientgui/DlgItemProperties.cpp:232
-#: clientgui/DlgItemProperties.cpp:234
-#: clientgui/DlgItemProperties.cpp:237
-#: clientgui/DlgItemProperties.cpp:246
-#: clientgui/DlgItemProperties.cpp:249
-#: clientgui/DlgItemProperties.cpp:252
+#: clientgui/DlgItemProperties.cpp:229 clientgui/DlgItemProperties.cpp:231
+#: clientgui/DlgItemProperties.cpp:232 clientgui/DlgItemProperties.cpp:234
+#: clientgui/DlgItemProperties.cpp:237 clientgui/DlgItemProperties.cpp:246
+#: clientgui/DlgItemProperties.cpp:249 clientgui/DlgItemProperties.cpp:252
 msgid "yes"
 msgstr "si"
 
@@ -1826,8 +1844,7 @@ msgstr "si"
 msgid "Suspended via GUI"
 msgstr "Suspender por GUI"
 
-#: clientgui/DlgItemProperties.cpp:231
-#: clientgui/DlgItemProperties.cpp:232
+#: clientgui/DlgItemProperties.cpp:231 clientgui/DlgItemProperties.cpp:232
 msgid "no"
 msgstr "non"
 
@@ -1843,8 +1860,7 @@ msgstr "Chamada ao planificador en progreso"
 msgid "Trickle-up pending"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:240
-#: clientgui/DlgItemProperties.cpp:242
+#: clientgui/DlgItemProperties.cpp:240 clientgui/DlgItemProperties.cpp:242
 #, fuzzy
 msgid "Host location"
 msgstr "Total do Servidor"
@@ -1932,13 +1948,11 @@ msgstr ""
 msgid "CPU time at last checkpoint"
 msgstr "Tempo da CPU na última comprobación"
 
-#: clientgui/DlgItemProperties.cpp:340
-#: clientgui/DlgItemProperties.cpp:355
+#: clientgui/DlgItemProperties.cpp:340 clientgui/DlgItemProperties.cpp:355
 msgid "CPU time"
 msgstr "Tempo da CPU"
 
-#: clientgui/DlgItemProperties.cpp:342
-#: clientgui/DlgItemProperties.cpp:356
+#: clientgui/DlgItemProperties.cpp:342 clientgui/DlgItemProperties.cpp:356
 msgid "Elapsed time"
 msgstr "Tempo transcorrido"
 
@@ -1970,8 +1984,7 @@ msgstr ""
 msgid "Local: "
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: clientgui/DlgOptions.cpp:129 clientgui/DlgOptions.cpp:135
 msgid "Options"
 msgstr ""
 
@@ -1994,7 +2007,9 @@ msgstr ""
 #: clientgui/DlgOptions.cpp:193
 #, fuzzy
 msgid "How often should BOINC remind you of new notices?"
-msgstr "Cada canto tempo debe o Xestor lembrarlle a necesidade dunha conexión de rede?"
+msgstr ""
+"Cada canto tempo debe o Xestor lembrarlle a necesidade dunha conexión de "
+"rede?"
 
 #: clientgui/DlgOptions.cpp:198
 msgid "Run Manager at login?"
@@ -2040,33 +2055,27 @@ msgstr "Conectar por servidor proxy HTTP"
 msgid "HTTP Proxy Server Configuration"
 msgstr "Configuración do servidor proxy HTTP"
 
-#: clientgui/DlgOptions.cpp:280
-#: clientgui/DlgOptions.cpp:344
+#: clientgui/DlgOptions.cpp:280 clientgui/DlgOptions.cpp:344
 msgid "Address:"
 msgstr "Enderezo:"
 
-#: clientgui/DlgOptions.cpp:288
-#: clientgui/DlgOptions.cpp:352
+#: clientgui/DlgOptions.cpp:288 clientgui/DlgOptions.cpp:352
 msgid "Port:"
 msgstr "Porto:"
 
-#: clientgui/DlgOptions.cpp:296
-#: clientgui/DlgOptions.cpp:360
+#: clientgui/DlgOptions.cpp:296 clientgui/DlgOptions.cpp:360
 msgid "Don't use proxy for:"
 msgstr "Non usar proxy para:"
 
-#: clientgui/DlgOptions.cpp:303
-#: clientgui/DlgOptions.cpp:367
+#: clientgui/DlgOptions.cpp:303 clientgui/DlgOptions.cpp:367
 msgid "Leave these blank if not needed"
 msgstr "Deixar en branco se non o precisa"
 
-#: clientgui/DlgOptions.cpp:309
-#: clientgui/DlgOptions.cpp:373
+#: clientgui/DlgOptions.cpp:309 clientgui/DlgOptions.cpp:373
 msgid "User Name:"
 msgstr "Nome de usuario:"
 
-#: clientgui/DlgOptions.cpp:317
-#: clientgui/DlgOptions.cpp:381
+#: clientgui/DlgOptions.cpp:317 clientgui/DlgOptions.cpp:381
 #: clientgui/DlgSelectComputer.cpp:151
 msgid "Password:"
 msgstr "Contrasinal:"
@@ -2121,8 +2130,12 @@ msgstr "%s - Selección de idioma"
 
 #: clientgui/DlgOptions.cpp:695
 #, fuzzy, c-format
-msgid "The %s's language has been changed.  In order for this change to take effect, you must restart the %s."
-msgstr "O idioma por defecto de %s cambiou, para facer efectivo o cambio, debe reiniciar o %s."
+msgid ""
+"The %s's language has been changed.  In order for this change to take "
+"effect, you must restart the %s."
+msgstr ""
+"O idioma por defecto de %s cambiou, para facer efectivo o cambio, debe "
+"reiniciar o %s."
 
 #: clientgui/DlgSelectComputer.cpp:90
 #, c-format
@@ -2140,8 +2153,7 @@ msgstr ""
 msgid "Host name:"
 msgstr "Nome do servidor:"
 
-#: clientgui/Localization.cpp:31
-#: clientgui/Localization.cpp:69
+#: clientgui/Localization.cpp:31 clientgui/Localization.cpp:69
 msgid "Message boards"
 msgstr "Taboleiros de mensaxes"
 
@@ -2153,15 +2165,12 @@ msgstr "Contacte con outros usuarios nos taboleiros de SETI at home"
 msgid "Ask questions and report problems"
 msgstr "Faga preguntas e avise de erros"
 
-#: 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 "A súa conta"
 
-#: 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 "Vexa a información da súa conta e os totais de créditos"
@@ -2174,18 +2183,15 @@ msgstr "As súas preferencias"
 msgid "View and modify your SETI at home account profile and preferences"
 msgstr "Vexa e modifique a súa conta e preferencias de SETI at home"
 
-#: clientgui/Localization.cpp:47
-#: clientgui/Localization.cpp:89
+#: clientgui/Localization.cpp:47 clientgui/Localization.cpp:89
 msgid "Your results"
 msgstr "Os seus resultados"
 
-#: 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 "Vexa os seus resultados e traballos da última semana (ou máis)"
 
-#: clientgui/Localization.cpp:51
-#: clientgui/Localization.cpp:93
+#: clientgui/Localization.cpp:51 clientgui/Localization.cpp:93
 msgid "Your computers"
 msgstr "Os seus computadores"
 
@@ -2193,13 +2199,11 @@ msgstr "Os seus computadores"
 msgid "View a listing of all the computers on which you are running SETI at Home"
 msgstr "Vexa unha lista de tódolos computadores nos que executa SETI at home"
 
-#: clientgui/Localization.cpp:55
-#: clientgui/Localization.cpp:97
+#: clientgui/Localization.cpp:55 clientgui/Localization.cpp:97
 msgid "Your team"
 msgstr "O seu equipo"
 
-#: clientgui/Localization.cpp:57
-#: clientgui/Localization.cpp:99
+#: clientgui/Localization.cpp:57 clientgui/Localization.cpp:99
 msgid "View information about your team"
 msgstr "Vexa a información do seu equipo"
 
@@ -2220,8 +2224,11 @@ msgid "Read a detailed description of the Einstein at Home screensaver"
 msgstr "Lea unha descrición detallada do salvapantallas do Einstein at home"
 
 #: clientgui/Localization.cpp:71
-msgid "Correspond with admins and other users on the Einstein at Home message boards"
-msgstr "Contacte cos administradores e outros usuarios do Einstein at home nos taboleiros"
+msgid ""
+"Correspond with admins and other users on the Einstein at Home message boards"
+msgstr ""
+"Contacte cos administradores e outros usuarios do Einstein at home nos "
+"taboleiros"
 
 #: clientgui/Localization.cpp:73
 msgid "Einstein status"
@@ -2237,7 +2244,8 @@ msgstr "Reportar problemas"
 
 #: clientgui/Localization.cpp:79
 msgid "A link to the Einstein at Home problems and bug reports message board"
-msgstr "Unha ligazón ao taboleiro de reporte de erros e problemas do Einstein at home"
+msgstr ""
+"Unha ligazón ao taboleiro de reporte de erros e problemas do Einstein at home"
 
 #: clientgui/Localization.cpp:83
 msgid "View and modify your Einstein at Home account profile and preferences"
@@ -2248,7 +2256,8 @@ msgid "Account summary"
 msgstr "Resumo da conta"
 
 #: 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 "Vexa unha lista de tódolos computadores nos que executa Einstein at home"
 
 #: clientgui/Localization.cpp:101
@@ -2256,8 +2265,12 @@ msgid "LIGO project"
 msgstr "Proxecto LIGO"
 
 #: clientgui/Localization.cpp:103
-msgid "The home page of the Laser Interferometer Gravitational-wave Observatory (LIGO) project"
-msgstr "A páxina do proxecto do Observatorio Láser de Interferometría de onda Gravitacional (LIGO)"
+msgid ""
+"The home page of the Laser Interferometer Gravitational-wave Observatory "
+"(LIGO) project"
+msgstr ""
+"A páxina do proxecto do Observatorio Láser de Interferometría de onda "
+"Gravitacional (LIGO)"
 
 #: clientgui/Localization.cpp:105
 msgid "GEO-600 project"
@@ -2267,8 +2280,7 @@ msgstr "Proxecto GEO-600"
 msgid "The home page of the GEO-600 project"
 msgstr "A páxina do proxecto GEO-600"
 
-#: clientgui/Localization.cpp:115
-#: clientgui/Localization.cpp:133
+#: clientgui/Localization.cpp:115 clientgui/Localization.cpp:133
 msgid "Team"
 msgstr "Equipo"
 
@@ -2351,7 +2363,9 @@ msgid "Missing application"
 msgstr "Aplicación"
 
 #: clientgui/MainDocument.cpp:1805
-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:2418
@@ -2429,8 +2443,7 @@ msgstr "Descarga fallida"
 msgid "Downloading"
 msgstr "A descargar"
 
-#: clientgui/MainDocument.cpp:2468
-#: clientgui/MainDocument.cpp:2538
+#: clientgui/MainDocument.cpp:2468 clientgui/MainDocument.cpp:2538
 #, fuzzy
 msgid " (suspended - "
 msgstr "Suspendida"
@@ -2478,8 +2491,7 @@ msgstr " (sen CPU intensiva)"
 msgid "Waiting to run"
 msgstr "Á espera"
 
-#: clientgui/MainDocument.cpp:2508
-#: clientgui/MainDocument.cpp:2514
+#: clientgui/MainDocument.cpp:2508 clientgui/MainDocument.cpp:2514
 msgid "Ready to start"
 msgstr "Listo para comezar"
 
@@ -2613,8 +2625,7 @@ msgstr ""
 msgid "%s; received from %s; on %s"
 msgstr ""
 
-#: clientgui/NoticeListCtrl.cpp:282
-#: clientgui/ProjectListCtrl.cpp:282
+#: clientgui/NoticeListCtrl.cpp:282 clientgui/ProjectListCtrl.cpp:282
 msgid "Click"
 msgstr ""
 
@@ -2622,8 +2633,7 @@ msgstr ""
 msgid "more..."
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:451
-#: clientgui/ProjectInfoPage.cpp:739
+#: clientgui/ProjectInfoPage.cpp:451 clientgui/ProjectInfoPage.cpp:739
 #: clientgui/ProjectInfoPage.cpp:743
 msgid "All"
 msgstr ""
@@ -2634,7 +2644,8 @@ msgstr "Escolla un proxecto"
 
 #: clientgui/ProjectInfoPage.cpp:586
 msgid "To choose a project, click its name or type its URL below."
-msgstr "Para escoller un proxecto, faga clic no seu nome ou introduza a URL embaixo."
+msgstr ""
+"Para escoller un proxecto, faga clic no seu nome ou introduza a URL embaixo."
 
 #: clientgui/ProjectInfoPage.cpp:590
 msgid "Categories:"
@@ -2672,7 +2683,9 @@ msgid "Project URL:"
 msgstr "&URL do proxecto:"
 
 #: clientgui/ProjectInfoPage.cpp:787
-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:811
@@ -2717,7 +2730,7 @@ msgid ""
 "Please wait..."
 msgstr ""
 "A comunicar co proxecto\n"
-"Agarde, por favor..."
+"Agarde, por favor...\n"
 
 #: clientgui/ProxyInfoPage.cpp:195
 msgid "Network communication failure"
@@ -2792,8 +2805,7 @@ msgstr "Configuración do proxy"
 msgid "HTTP proxy"
 msgstr "Proxy HTTP"
 
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
+#: clientgui/ProxyPage.cpp:337 clientgui/ProxyPage.cpp:357
 msgid "Server:"
 msgstr "Servidor:"
 
@@ -2805,8 +2817,7 @@ msgstr "Autodetectar"
 msgid "SOCKS proxy"
 msgstr "Proxy SOCKS"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:136
-#: clientgui/sg_BoincSimpleGUI.cpp:119
+#: clientgui/sg_BoincSimpleFrame.cpp:136 clientgui/sg_BoincSimpleGUI.cpp:119
 msgid "Advanced View...\tCtrl+Shift+A"
 msgstr ""
 
@@ -2823,8 +2834,7 @@ msgstr "Tema"
 msgid "Select the appearance of the user interface."
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:193
-#: clientgui/sg_BoincSimpleGUI.cpp:147
+#: clientgui/sg_BoincSimpleFrame.cpp:193 clientgui/sg_BoincSimpleGUI.cpp:147
 #, c-format
 msgid "&%s"
 msgstr "&%s"
@@ -3076,8 +3086,7 @@ msgstr "Traballar só entre:"
 msgid "Connect to internet only between:"
 msgstr "Conectar á Internet só entre:"
 
-#: clientgui/sg_DlgPreferences.cpp:376
-#: clientgui/sg_DlgPreferences.cpp:393
+#: clientgui/sg_DlgPreferences.cpp:376 clientgui/sg_DlgPreferences.cpp:393
 msgid "Use no more than:"
 msgstr "Non usar máis de:"
 
@@ -3097,14 +3106,10 @@ msgstr "Traballar con baterías?"
 msgid "Do work after idle for:"
 msgstr "Traballar tras unha inactividade de:"
 
-#: clientgui/sg_DlgPreferences.cpp:621
-#: clientgui/sg_DlgPreferences.cpp:624
-#: clientgui/sg_DlgPreferences.cpp:683
-#: clientgui/sg_DlgPreferences.cpp:687
-#: clientgui/sg_DlgPreferences.cpp:699
-#: clientgui/sg_DlgPreferences.cpp:703
-#: clientgui/sg_DlgPreferences.cpp:846
-#: clientgui/sg_DlgPreferences.cpp:857
+#: clientgui/sg_DlgPreferences.cpp:621 clientgui/sg_DlgPreferences.cpp:624
+#: clientgui/sg_DlgPreferences.cpp:683 clientgui/sg_DlgPreferences.cpp:687
+#: clientgui/sg_DlgPreferences.cpp:699 clientgui/sg_DlgPreferences.cpp:703
+#: clientgui/sg_DlgPreferences.cpp:846 clientgui/sg_DlgPreferences.cpp:857
 msgid "Anytime"
 msgstr "Todo o tempo"
 
@@ -3121,7 +3126,7 @@ msgstr "%4.2f GB"
 #: clientgui/sg_DlgPreferences.cpp:762
 #, c-format
 msgid "%d%%"
-msgstr "%d%%"
+msgstr "%s%%"
 
 #: clientgui/sg_DlgPreferences.cpp:798
 msgid "0 (Run Always)"
@@ -3179,8 +3184,12 @@ msgid "Update"
 msgstr "Actualizar"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:62
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
-msgstr "Reportar tódalas tarefas completas, obter crédito, preferencias e pode que máis tarefas."
+msgid ""
+"Report all completed tasks, get latest credit, get latest preferences, and "
+"possibly get more tasks."
+msgstr ""
+"Reportar tódalas tarefas completas, obter crédito, preferencias e pode que "
+"máis tarefas."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:68
 #: clientgui/sg_ProjectCommandPopup.cpp:114
@@ -3201,13 +3210,21 @@ msgid "Reset project"
 msgstr "Reiniciar proxecto"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:80
-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 "Borra tódolos arquivos e tarefas deste proxecto e obtén novas tarefas. Pode actualizar o proxecto antes para reportar tarefas completadas."
+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 ""
+"Borra tódolos arquivos e tarefas deste proxecto e obtén novas tarefas. Pode "
+"actualizar o proxecto antes para reportar tarefas completadas."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:86
 #, fuzzy
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
-msgstr "Separar o computador deste proxeto. As tarefas en progreso perderanse (use 'Actualizar' antes para reportalas)."
+msgid ""
+"Remove this project.  Tasks in progress will be lost (use 'Update' first to "
+"report any completed tasks)."
+msgstr ""
+"Separar o computador deste proxeto. As tarefas en progreso perderanse (use "
+"'Actualizar' antes para reportalas)."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:91
 #: clientgui/sg_TaskCommandPopup.cpp:78
@@ -3250,8 +3267,7 @@ msgid "Are you sure you want to remove project '%s'?"
 msgstr "Seguro que quere reiniciar o proxecto '%s'?"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:257
-#: clientgui/sg_StatImageLoader.cpp:138
-#: clientgui/sg_StatImageLoader.cpp:198
+#: clientgui/sg_StatImageLoader.cpp:138 clientgui/sg_StatImageLoader.cpp:198
 msgid "Remove Project"
 msgstr "Eliminar Proxecto"
 
@@ -3268,8 +3284,7 @@ msgstr ""
 msgid "Work done for this project"
 msgstr ""
 
-#: clientgui/sg_ProjectPanel.cpp:77
-#: clientgui/sg_ProjectsComponent.cpp:123
+#: clientgui/sg_ProjectPanel.cpp:77 clientgui/sg_ProjectsComponent.cpp:123
 msgid "Synchronize projects with account manager system"
 msgstr "Sincronizar proxectos co sistema do xestor"
 
@@ -3327,8 +3342,7 @@ msgstr "Os meus Proxectos:"
 msgid "%s. Work done by %s: %0.2f"
 msgstr "%s. Traballo feito por %s: %0.2f"
 
-#: clientgui/sg_TaskCommandPopup.cpp:60
-#: clientgui/sg_ViewTabPage.cpp:424
+#: clientgui/sg_TaskCommandPopup.cpp:60 clientgui/sg_ViewTabPage.cpp:424
 msgid "Show graphics"
 msgstr "Amosar gráficos"
 
@@ -3436,8 +3450,7 @@ msgstr "Tempo restante: "
 msgid "Status: %s"
 msgstr ""
 
-#: clientgui/sg_ViewTabPage.cpp:140
-#: clientgui/sg_ViewTabPage.cpp:280
+#: clientgui/sg_ViewTabPage.cpp:140 clientgui/sg_ViewTabPage.cpp:280
 #, c-format
 msgid "%.1lf"
 msgstr "%.1lf"
@@ -3455,8 +3468,7 @@ msgstr "Seguro que quere ver os gráficos nunha máquina remota?"
 msgid "Application: "
 msgstr "Aplicación: "
 
-#: clientgui/sg_ViewTabPage.cpp:449
-#: clientgui/sg_ViewTabPage.cpp:453
+#: clientgui/sg_ViewTabPage.cpp:449 clientgui/sg_ViewTabPage.cpp:453
 msgid "Time Remaining: "
 msgstr "Tempo restante: "
 
@@ -3516,8 +3528,7 @@ msgstr "Especifique unha chave de conta para continuar."
 msgid "Invalid Account Key; please enter a valid Account Key"
 msgstr "Chave inválida; introduza unha chave válida"
 
-#: clientgui/ValidateAccountKey.cpp:82
-#: clientgui/ValidateEmailAddress.cpp:86
+#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
 msgid "Validation conflict"
 msgstr "Conflito de validación"
 
@@ -3543,17 +3554,13 @@ msgstr ""
 "Por exemplo:\n"
 "http://www.exemplo.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
+#: 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álida"
 
-#: clientgui/ValidateURL.cpp:84
-#: clientgui/ValidateURL.cpp:88
+#: clientgui/ValidateURL.cpp:84 clientgui/ValidateURL.cpp:88
 #: clientgui/ValidateURL.cpp:92
 msgid ""
 "Please specify a valid URL.\n"
@@ -3564,8 +3571,7 @@ msgstr ""
 "Por exemplo:\n"
 "http://proxectoboinc.exemplo.com"
 
-#: clientgui/ValidateURL.cpp:104
-#: clientgui/ValidateURL.cpp:108
+#: clientgui/ValidateURL.cpp:104 clientgui/ValidateURL.cpp:108
 #, c-format
 msgid "'%s' does not contain a valid host name."
 msgstr "'%s' non contén un nome de servidor válido."
@@ -3575,10 +3581,8 @@ msgstr "'%s' non contén un nome de servidor válido."
 msgid "'%s' does not contain a valid path."
 msgstr "'%s' non contén unha ruta válida."
 
-#: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:169
-#: clientgui/ViewStatistics.cpp:1965
-#: clientgui/ViewTransfers.cpp:159
+#: clientgui/ViewMessages.cpp:84 clientgui/ViewProjects.cpp:169
+#: clientgui/ViewStatistics.cpp:1965 clientgui/ViewTransfers.cpp:159
 #: clientgui/ViewWork.cpp:182
 msgid "Commands"
 msgstr "Comandos"
@@ -3591,13 +3595,11 @@ msgstr "Copiar tódalas mensaxes"
 msgid "Copy selected messages"
 msgstr "Copiar mensaxes escollidas"
 
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
+#: clientgui/ViewMessages.cpp:106 clientgui/ViewMessages.cpp:502
 msgid "Show only this project"
 msgstr "Amosar só este proxecto"
 
-#: clientgui/ViewMessages.cpp:107
-#: clientgui/ViewMessages.cpp:503
+#: clientgui/ViewMessages.cpp:107 clientgui/ViewMessages.cpp:503
 msgid "Show only the messages for the selected project."
 msgstr "Amosar só as mensaxes do proxecto escollido."
 
@@ -3625,8 +3627,7 @@ msgstr "Amosar tódalas mensaxes"
 msgid "Show messages for all projects."
 msgstr "Amosar mensaxes de tódolos proxectos."
 
-#: clientgui/ViewProjects.cpp:219
-#: clientgui/ViewStatistics.cpp:442
+#: clientgui/ViewProjects.cpp:219 clientgui/ViewStatistics.cpp:442
 msgid "Account"
 msgstr "Conta"
 
@@ -3638,8 +3639,7 @@ msgstr "Traballo feito"
 msgid "Avg. work done"
 msgstr "Traballo medio"
 
-#: clientgui/ViewProjects.cpp:224
-#: clientgui/ViewTransfers.cpp:187
+#: clientgui/ViewProjects.cpp:224 clientgui/ViewTransfers.cpp:187
 #: clientgui/ViewWork.cpp:233
 msgid "Status"
 msgstr "Estado"
@@ -3677,8 +3677,7 @@ msgstr "A reiniciar proxecto..."
 msgid "Removing project..."
 msgstr "A retomar proxecto..."
 
-#: clientgui/ViewProjects.cpp:542
-#: clientgui/ViewWork.cpp:598
+#: clientgui/ViewProjects.cpp:542 clientgui/ViewWork.cpp:598
 msgid "Launching browser..."
 msgstr "A iniciar navegador..."
 
@@ -3858,13 +3857,11 @@ msgstr "&Seguinte proxecto >"
 msgid "Show chart for next project"
 msgstr "Amosar gráfica do proxecto seguinte"
 
-#: clientgui/ViewStatistics.cpp:2013
-#: clientgui/ViewStatistics.cpp:2410
+#: clientgui/ViewStatistics.cpp:2013 clientgui/ViewStatistics.cpp:2410
 msgid "Hide project list"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2014
-#: clientgui/ViewStatistics.cpp:2410
+#: clientgui/ViewStatistics.cpp:2014 clientgui/ViewStatistics.cpp:2410
 msgid "Use entire area for graphs"
 msgstr ""
 
@@ -3910,16 +3907,11 @@ msgstr "Amosa unha gráfica con tódolos proxectos"
 msgid "Statistics"
 msgstr "Estatísticas"
 
-#: clientgui/ViewStatistics.cpp:2097
-#: clientgui/ViewStatistics.cpp:2118
-#: clientgui/ViewStatistics.cpp:2139
-#: clientgui/ViewStatistics.cpp:2161
-#: clientgui/ViewStatistics.cpp:2182
-#: clientgui/ViewStatistics.cpp:2203
-#: clientgui/ViewStatistics.cpp:2224
-#: clientgui/ViewStatistics.cpp:2245
-#: clientgui/ViewStatistics.cpp:2266
-#: clientgui/ViewStatistics.cpp:2290
+#: clientgui/ViewStatistics.cpp:2097 clientgui/ViewStatistics.cpp:2118
+#: clientgui/ViewStatistics.cpp:2139 clientgui/ViewStatistics.cpp:2161
+#: clientgui/ViewStatistics.cpp:2182 clientgui/ViewStatistics.cpp:2203
+#: clientgui/ViewStatistics.cpp:2224 clientgui/ViewStatistics.cpp:2245
+#: clientgui/ViewStatistics.cpp:2266 clientgui/ViewStatistics.cpp:2290
 msgid "Updating charts..."
 msgstr "A actualizar gráficas..."
 
@@ -3951,8 +3943,7 @@ msgstr ""
 msgid "File"
 msgstr "Arquivo"
 
-#: clientgui/ViewTransfers.cpp:183
-#: clientgui/ViewWork.cpp:232
+#: clientgui/ViewTransfers.cpp:183 clientgui/ViewWork.cpp:232
 msgid "Progress"
 msgstr "Progreso"
 
@@ -4043,13 +4034,11 @@ msgstr ""
 msgid " (project backoff: "
 msgstr ""
 
-#: clientgui/ViewWork.cpp:186
-#: clientgui/ViewWork.cpp:766
+#: clientgui/ViewWork.cpp:186 clientgui/ViewWork.cpp:766
 msgid "Show active tasks"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:187
-#: clientgui/ViewWork.cpp:767
+#: clientgui/ViewWork.cpp:187 clientgui/ViewWork.cpp:767
 msgid "Show only active tasks."
 msgstr ""
 
@@ -4173,14 +4162,18 @@ msgstr ""
 
 #: clientgui/WelcomePage.cpp:325
 msgid ""
-"You have chosen to add a new volunteer computing project or change which projects\n"
+"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"
+"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"
+"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"
@@ -4210,8 +4203,7 @@ msgstr "Seguro que quere cancelar?"
 msgid "Question"
 msgstr "Pregunta"
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
+#: clientgui/wizardex.cpp:377 clientgui/wizardex.cpp:553
 msgid "&Next >"
 msgstr "&Seguinte >"
 
@@ -4248,7 +4240,9 @@ msgid "Pie Ctrl"
 msgstr "Pie Ctrl"
 
 #: clientgui/mac/MacAccessiblity.cpp:257
-msgid "for accessibility support, please select advanced from the view menu or type command shift a"
+msgid ""
+"for accessibility support, please select advanced from the view menu or type "
+"command shift a"
 msgstr ""
 
 #: clientgui/mac/MacAccessiblity.cpp:302
@@ -4296,8 +4290,7 @@ msgstr ""
 msgid "list is empty"
 msgstr ""
 
-#: clientgui/mac/MacAccessiblity.cpp:858
-#: clientgui/mac/MacAccessiblity.cpp:870
+#: clientgui/mac/MacAccessiblity.cpp:858 clientgui/mac/MacAccessiblity.cpp:870
 #, c-format
 msgid "; row %d; "
 msgstr ""
@@ -4365,11 +4358,13 @@ msgstr ""
 
 #: clientgui/DlgAdvPreferences.h:30
 msgid "specify work start and stop hours in format HH:MM-HH:MM"
-msgstr "especifica as horas de inicio e remate do traballo co formato HH:MM-HH:MM"
+msgstr ""
+"especifica as horas de inicio e remate do traballo co formato HH:MM-HH:MM"
 
 #: clientgui/DlgAdvPreferences.h:31
 msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
-msgstr "especifica as horas de inicio e remate do uso da rede co formato HH:MM-HH:MM"
+msgstr ""
+"especifica as horas de inicio e remate do uso da rede co formato HH:MM-HH:MM"
 
 #~ msgid "Read config file"
 #~ msgstr "Ler arquivo de configuración"
@@ -4385,14 +4380,17 @@ msgstr "especifica as horas de inicio e remate do uso da rede co formato HH:MM-H
 #~ msgstr ""
 #~ "(C) 2003-2009 Universidade de California, Berkeley.\n"
 #~ "Tódolos dereitos reservados."
+
 #~ msgid "Click 'Retry now' to transfer the file now"
 #~ msgstr "Faga clic en 'Probar de novo' para transferir o arquivo agora"
+
 #~ msgid ""
 #~ "Click 'Abort transfer' to delete the file from the transfer queue. This "
 #~ "will prevent you from being granted credit for this result."
 #~ msgstr ""
 #~ "Faga clic en 'Abortar transferencia' para borrar o arquivo da fila. Isto "
 #~ "fará que non obteña créditos polo resultado xerado."
+
 #~ msgid "Aborting result..."
 #~ msgstr "A abortar resultado..."
 
@@ -4430,6 +4428,7 @@ msgstr "especifica as horas de inicio e remate do uso da rede co formato HH:MM-H
 #~ "Para cambiar as aplicacións que se lle envían dende a World Community "
 #~ "Grid,\n"
 #~ "prema o seguinte botón:"
+
 #~ msgid "Change Research Applications at World Community Grid"
 #~ msgstr "Cambiar Aplicacións de Investigación na World Community Grid"
 
@@ -4440,18 +4439,23 @@ msgstr "especifica as horas de inicio e remate do uso da rede co formato HH:MM-H
 #, fuzzy
 #~ msgid "Don't fetch ATI GPU tasks"
 #~ msgstr "Sen novas tarefas"
+
 #~ msgid "Web sites"
 #~ msgstr "Sitios web"
+
 #~ msgid "Connect about every"
 #~ msgstr "Conectar cada"
+
 #~ msgid ""
 #~ "this computer is connected to the Internet about every X days\n"
 #~ "(0 if it's always connected)"
 #~ msgstr ""
 #~ "este computador está conectado á Internet cada X días\n"
 #~ "(0 se o está sempre)"
+
 #~ msgid "days (max. 10)"
 #~ msgstr "días (máx. 10)"
+
 #~ msgid ""
 #~ "You have requested to exit the %s,\n"
 #~ "which allows you to view and manage\n"
@@ -4466,52 +4470,76 @@ msgstr "especifica as horas de inicio e remate do uso da rede co formato HH:MM-H
 #~ "\n"
 #~ "Se tamén quere saír das aplicacións científicas cando\n"
 #~ "sae do xestor, escolla nas seguintes opcións:"
+
 #~ msgid "Stop running science applications when exiting the Manager"
 #~ msgstr "Deter as aplicacións científicas ao saír do Xestor"
+
 #~ msgid "%s - Options"
 #~ msgstr "%s - Opcións"
+
 #~ msgid "Retrieving host information; please wait..."
 #~ msgstr "A solicitar información do servidor; agarde..."
+
 #~ msgid "%s - Messages"
 #~ msgstr "%s - Mensaxes"
+
 #~ msgid "Skin:"
 #~ msgstr "Tema:"
+
 #~ msgid "Preferences"
 #~ msgstr "Preferencias"
+
 #~ msgid "I want to customize my preferences for this computer only."
 #~ msgstr "Quero cambiar as miñas preferencias só para este computador."
+
 #~ msgid "Customized Preferences"
 #~ msgstr "Preferencias persoales"
+
 #~ msgid "Upload pending"
 #~ msgstr "Suba pendente"
+
 #~ msgid "Download pending"
 #~ msgstr "Descarga pendente"
+
 #~ msgid "Get help with BOINC"
 #~ msgstr "Obter axuda do BOINC"
+
 #~ msgid "%s - Detach from %s"
 #~ msgstr "%s - Separarse de %s"
+
 #~ msgid "Failed to attach to project"
 #~ msgstr "Fallo ao unirse a un proxecto"
+
 #~ msgid "Failed to attach to account manager"
 #~ msgstr "Fallo ao unirse a un xestor de contas"
+
 #~ msgid "Attached to account manager"
 #~ msgstr "Unido a un xestor de contas"
+
 #~ msgid "You are now successfully attached to the %s system."
 #~ msgstr "Agora está correctamente unido ao sistema %s."
+
 #~ msgid "You are now successfully attached to this account manager."
 #~ msgstr "Agora está correctamente unido a este xestor de contas."
+
 #~ msgid "not attached to any BOINC project: 0 bytes"
 #~ msgstr "non está unido a ningún proxecto: 0 bytes"
+
 #~ msgid "All projects"
 #~ msgstr "Tódolos proxectos"
+
 #~ msgid "Attach to project"
 #~ msgstr "Unirse a un proxecto"
+
 #~ msgid "Attach to account manager"
 #~ msgstr "Unirse ao xestor de contas"
+
 #~ msgid "Attach to a project"
 #~ msgstr "Unirse a un proxecto"
+
 #~ msgid "%s needs to connect to the Internet.  Please click to open %s."
 #~ msgstr "%s precisa conectar coa Internet. Faga clic para abrir %s."
+
 #~ msgid ""
 #~ "%s is unable to communicate with a project and needs an Internet "
 #~ "connection.\n"
@@ -4522,6 +4550,7 @@ msgstr "especifica as horas de inicio e remate do uso da rede co formato HH:MM-H
 #~ "Internet.\n"
 #~ "Conéctese á Internet e escolla o elemento 'Realizar conexións de rede' no "
 #~ "menú Avanzado."
+
 #~ msgid ""
 #~ "%s couldn't do Internet communication, and no default connection is "
 #~ "selected.\n"
@@ -4532,40 +4561,58 @@ msgstr "especifica as horas de inicio e remate do uso da rede co formato HH:MM-H
 #~ "por defecto.\n"
 #~ "Conecte coa Internet ou escolla unha conexión por defecto\n"
 #~ "usando Avanzado/Opcións/Conexións"
+
 #~ msgid "Attached to project"
 #~ msgstr "Unido ao proxecto"
+
 #~ msgid "You are now successfully attached to this project."
 #~ msgstr "Está unido a este proxecto correctamente."
+
 #~ msgid "Attached to %s"
 #~ msgstr "Unido a %s"
+
 #~ msgid "Detach when done"
 #~ msgstr "Separarse ao rematar"
+
 #~ msgid "Detach"
 #~ msgstr "Separarse"
+
 #~ msgid "Detaching from project..."
 #~ msgstr "A separarse do proxecto..."
+
 #~ msgid "Are you sure you want to detach from project '%s'?"
 #~ msgstr "Seguro que quere separarse do proxecto '%s'?"
+
 #~ msgid "Detach from Project"
 #~ msgstr "Separarse do Proxecto"
+
 #~ msgid " - user active"
 #~ msgstr " - usuario activo"
+
 #~ msgid " - computation suspended"
 #~ msgstr " - computación suspendida"
+
 #~ msgid " - need disk space"
 #~ msgstr " - precisa espazo en disco"
+
 #~ msgid "Attach to an additional project"
 #~ msgstr "Unirse a outro proxecto máis"
+
 #~ msgid "To completion"
 #~ msgstr "Para rematar"
+
 #~ msgid "Attach to a project to begin processing work"
 #~ msgstr "Únase a un proxecto para comezar a procesar traballo"
+
 #~ msgid "%s: %.2f%% completed."
 #~ msgstr "%s: %.2f%% completado."
+
 #~ msgid "%d tasks running."
 #~ msgstr "%d tarefas activas."
+
 #~ msgid "%s - Can't find web browser"
 #~ msgstr "%s - Non se atopa o navegador"
+
 #~ msgid ""
 #~ "%s tried to display the web page\n"
 #~ "\t%s\n"
@@ -4580,62 +4627,87 @@ msgstr "especifica as horas de inicio e remate do uso da rede co formato HH:MM-H
 #~ "Para solucionalo, configure a variable\n"
 #~ "de entorno BROWSER cara a ruta do seu\n"
 #~ "navegador, despois reinicie o %s."
+
 #~ msgid "Starting client services; please wait..."
 #~ msgstr "A iniciar servizos do cliente; agarde..."
+
 #~ msgid "Retrying communications for project(s)..."
 #~ msgstr "A tentar as comunicacións de novo..."
+
 #~ msgid ""
 #~ "Required wizard file(s) are missing from the target server.\n"
 #~ "(lookup_account.php/create_account.php)\n"
 #~ msgstr ""
 #~ "Algún(s) arquivo(s) do asistente non están no servidor.\n"
 #~ "(lookup_account.php/create_account.php)\n"
+
 #~ msgid "User information"
 #~ msgstr "Información do usuario"
+
 #~ msgid "Account Manager URL"
 #~ msgstr "URL do xestor de contas"
+
 #~ msgid "Enter the URL of the account manager's web site."
 #~ msgstr "Introduza a URL da web do xestor de contas."
+
 #~ msgid "Close BOINC Manager Window."
 #~ msgstr "Pechar a fiestra do xestor BOINC."
+
 #~ msgid "Exit the %s"
 #~ msgstr "Saír de %s"
+
 #~ msgid ""
 #~ "Advanced views allow you to sort various columns and displays graphical "
 #~ "progress bars."
 #~ msgstr ""
 #~ "A Vista Avanzada permítelle ordenar varias columnas e amosa barras de "
 #~ "progreso gráficas."
+
 #~ msgid "Attach to &project"
 #~ msgstr "&Unirse a un proxecto"
+
 #~ msgid "Attaching to project..."
 #~ msgstr "A se unir a un proxecto..."
+
 #~ msgid "Removal from %s completed."
 #~ msgstr "Eliminación dende %s completada."
+
 #~ msgid "Removal succeeded!"
 #~ msgstr "Eliminación completada!"
+
 #~ msgid "Write to disk at most every"
 #~ msgstr "Escribir no disco como moito cada"
+
 #~ msgid "Click here to go to %s's website."
 #~ msgstr "Faga clic aquí para ir ao sitio de %s."
+
 #~ msgid "ID"
 #~ msgstr "ID"
+
 #~ msgid "Priority"
 #~ msgstr "Prioridade"
+
 #~ msgid "MessagesGrid"
 #~ msgstr "MensaxesGrid"
+
 #~ msgid "Copying selected messages to Clipboard..."
 #~ msgstr "A copiar mensaxes escollidas ao Portarretallos..."
+
 #~ msgid "Info"
 #~ msgstr "Información"
+
 #~ msgid "Warning"
 #~ msgstr "Advertencia"
+
 #~ msgid "ProjectsGrid"
 #~ msgstr "ProxectoGrid"
+
 #~ msgid "TransfersGrid"
 #~ msgstr "TransferenciasGrid"
+
 #~ msgid "Aborting transfer(s)..."
 #~ msgstr "A abortar transferencia(s)..."
+
 #~ msgid ""
 #~ "Are you sure you want to abort this file(s) transfer ?\n"
 #~ "NOTE: Aborting a transfer will invalidate a task and you\n"
@@ -4644,24 +4716,30 @@ msgstr "especifica as horas de inicio e remate do uso da rede co formato HH:MM-H
 #~ "Seguro que quere abortar esta transferencia de arquivo(s)?\n"
 #~ "NOTA: Abortar unha transferencia invalidará a tarefa e\n"
 #~ "non obterá crédito por ela."
+
 #~ msgid "Abort File Transfer(s)"
 #~ msgstr "Abortar transferencia de arquivo(s)"
+
 #~ msgid "TasksGrid"
 #~ msgstr "TarefasGrid"
+
 #~ msgid ""
 #~ "We'll now guide you through the process of attaching\n"
 #~ "to a project."
 #~ msgstr ""
 #~ "Agora guiarémolo polo proceso de unión a un\n"
 #~ "proxecto."
+
 #~ msgid "&Stop using%s"
 #~ msgstr "&Deixar de usar %s"
+
 #~ msgid ""
 #~ "We'll now remove this computer from %s.  From now on,\n"
 #~ "attach and detach projects directly from this computer.\n"
 #~ msgstr ""
 #~ "Agora eliminaremos este computador de %s. De agora en\n"
 #~ "diante, únase e sepárese dos proxectos desde este computador."
+
 #~ msgid ""
 #~ "We'll now guide you through the process of attaching\n"
 #~ "to an account manager.\n"
@@ -4674,46 +4752,64 @@ msgstr "especifica as horas de inicio e remate do uso da rede co formato HH:MM-H
 #~ "\n"
 #~ "Se quere unirse a un único proxecto, prema Cancelar e\n"
 #~ "escolla o elemento do menú 'Unirse a un proxecto'."
+
 #~ msgid "Debug Flags"
 #~ msgstr "Marcas de axuste"
+
 #~ msgid "Project Properties Failure"
 #~ msgstr "Fallo nas propiedades do proxecto"
+
 #~ msgid "Project Communication Failure"
 #~ msgstr "Fallo na comunicación do proxecto"
+
 #~ msgid "Project Properties URL Failure"
 #~ msgstr "Fallo nas propiedades da URL do proxecto"
+
 #~ msgid "Account Creation Disabled"
 #~ msgstr "Creación de contas desactivada"
+
 #~ msgid "Account Already Exists"
 #~ msgstr "conta xa existente"
+
 #~ msgid "Project Already Attached"
 #~ msgstr "Xa unido a este proxecto"
+
 #~ msgid "Project Attach Failure"
 #~ msgstr "Fallo na unión ao proxecto"
+
 #~ msgid "Failure Communicating with Reference Site"
 #~ msgstr "Fallo ao comunicar co sitio de referencia"
+
 #~ msgid "Net Detection Failure"
 #~ msgstr "Fallo na detección de rede"
+
 #~ msgid ""
 #~ "You can copy and paste the URL from your browser's\n"
 #~ "address bar."
 #~ msgstr ""
 #~ "Pode copiar e pegar a URL da barra de\n"
 #~ "enderezo do seu navegador."
+
 #~ msgid "For a list of account managers go to:"
 #~ msgstr "Para unha lista de xestores vaia a:"
+
 #~ msgid "&Advanced View"
 #~ msgstr "Vista &Avanzada"
+
 #~ msgid "You are already attached to this project."
 #~ msgstr "Xa esta unido a este proxecto."
+
 #~ msgid "Static text"
 #~ msgstr "Texto estático"
+
 #~ msgid "Radiobutton"
 #~ msgstr "Botón-radio"
+
 #~ msgid "Short term debt"
 #~ msgstr "Débeda a curto prazo"
+
 #~ msgid "Long term debt"
 #~ msgstr "Débeda a longo prazo"
+
 #~ msgid "Test"
 #~ msgstr "Proba"
-
diff --git a/locale/gl/BOINC-Setup.mo b/locale/gl/BOINC-Setup.mo
index 804ffc2..b8e2537 100644
Binary files a/locale/gl/BOINC-Setup.mo and b/locale/gl/BOINC-Setup.mo differ
diff --git a/locale/gl/BOINC-Setup.po b/locale/gl/BOINC-Setup.po
index 13a9d89..3a2d0d1 100644
--- a/locale/gl/BOINC-Setup.po
+++ b/locale/gl/BOINC-Setup.po
@@ -5,12 +5,12 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-08-06 16:50-0800\n"
-"PO-Revision-Date: 2015-02-10 22:41-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,13 +23,11 @@ msgstr ""
 msgid "Sorry, this version of %s requires system 10.4 or higher."
 msgstr ""
 
-#: mac_installer/PostInstall.cpp:131
-#: mac_installer/PostInstall.cpp:1211
+#: mac_installer/PostInstall.cpp:131 mac_installer/PostInstall.cpp:1211
 msgid "Yes"
 msgstr ""
 
-#: mac_installer/PostInstall.cpp:132
-#: mac_installer/PostInstall.cpp:1212
+#: mac_installer/PostInstall.cpp:132 mac_installer/PostInstall.cpp:1212
 msgid "No"
 msgstr ""
 
@@ -40,9 +38,11 @@ msgstr ""
 #: mac_installer/PostInstall.cpp:1491
 #, c-format
 msgid ""
-"Users who are permitted to administer this computer will automatically be allowed to run and control %s.\n"
+"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?"
+"Do you also want non-administrative users to be able to run and control %s "
+"on this Mac?"
 msgstr ""
 
 #: mac_installer/PostInstall.cpp:1519
@@ -101,7 +101,8 @@ msgstr ""
 #: mac_installer/uninstall.cpp:796
 #, c-format
 msgid ""
-"Enter your administrator password to completely remove %s from you computer.\n"
+"Enter your administrator password to completely remove %s from you "
+"computer.\n"
 "\n"
 msgstr ""
 
@@ -112,4 +113,3 @@ msgstr ""
 #: mac_installer/uninstall.cpp:1544
 msgid "Continue..."
 msgstr ""
-
diff --git a/locale/gl/BOINC-Web.mo b/locale/gl/BOINC-Web.mo
index f0e65b2..f926127 100644
Binary files a/locale/gl/BOINC-Web.mo and b/locale/gl/BOINC-Web.mo differ
diff --git a/locale/gl/BOINC-Web.po b/locale/gl/BOINC-Web.po
index f83d76b..121c3e2 100644
--- a/locale/gl/BOINC-Web.po
+++ b/locale/gl/BOINC-Web.po
@@ -4,16 +4,17 @@
 # FileID  : $Id$
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at ssl.berkeley.edu>\n"
 "POT-Creation-Date: 2013-08-22 16:22 PDT\n"
-"PO-Revision-Date: 2015-02-10 22:43-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: 2009-02-04 14:52-0700\n"
+"Last-Translator: Xurxo Suarez Pardo <webmaster at hexentreffen.net>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 1.2.1\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
@@ -31,7 +32,10 @@ msgid "Seismology"
 msgstr ""
 
 #: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
+msgid ""
+"The Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to Internet-connected computers.  You must buy a "
+"sensor to participate."
 msgstr ""
 
 #: projects.inc:27
@@ -43,23 +47,24 @@ msgid "Environmental research"
 msgstr ""
 
 #: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
+msgid ""
+"This project is creating a free and continuously updated map of radiation "
+"levels by using sensors connected to volunteers' computers.  You must buy a "
+"sensor to participate."
 msgstr ""
 
 #: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
+msgid ""
+"To participate in these projects you must buy a sensor and attach it to your "
+"computer."
 msgstr ""
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
 msgstr ""
 
-#: projects.inc:50
-#: projects.inc:342
-#: projects.inc:386
-#: projects.inc:435
-#: projects.inc:442
-#: projects.inc:489
+#: projects.inc:50 projects.inc:342 projects.inc:386 projects.inc:435
+#: projects.inc:442 projects.inc:489
 msgid "Private"
 msgstr ""
 
@@ -68,7 +73,11 @@ msgid "Artificial intelligence"
 msgstr ""
 
 #: projects.inc:52
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
+msgid ""
+"Parse and convert semantic nets for use in FreeHAL, an artificial "
+"intelligence that uses semantic networks, stemmers, part of speech "
+"databases, and part of speech taggers in order to imitate human behavior in "
+"conversations."
 msgstr ""
 
 #: projects.inc:58
@@ -84,7 +93,12 @@ msgid "Antimalarial drug discovery"
 msgstr ""
 
 #: projects.inc:73
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
+msgid ""
+"The parasite that causes malaria continues to evolve resistance to available "
+"medication. We therefore urgently need to discover new drugs to replace "
+"existing drugs. Importantly, these new drugs need to target NEW proteins in "
+"the parasite. The FightMalaria at Home project is aimed at finding these new "
+"targets."
 msgstr ""
 
 #: projects.inc:79
@@ -96,7 +110,12 @@ msgid "Protein structure prediction"
 msgstr ""
 
 #: projects.inc:81
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
+msgid ""
+"POEM at HOME uses a computational approach to predict the biologically active "
+"structure of proteins, to understand the signal-processing mechanisms when "
+"the proteins interact with one another, to understand diseases related to "
+"protein malfunction or aggregation, and to develop new drugs on the basis of "
+"the three-dimensions structure of biologically important proteins."
 msgstr ""
 
 #: projects.inc:87
@@ -108,7 +127,11 @@ msgid "Study of protein - ligand interactions"
 msgstr ""
 
 #: projects.inc:89
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
+msgid ""
+"Docking at Home has both bioscience and computer science goals. The project "
+"aims to further knowledge of the atomic details of protein-ligand "
+"interactions and, by doing so, will search for insights into the discovery "
+"of novel pharmaceuticals."
 msgstr ""
 
 #: projects.inc:103
@@ -120,7 +143,11 @@ msgid "Molecular simulations of proteins"
 msgstr ""
 
 #: projects.inc:105
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
+msgid ""
+"GPUGrid.net opens novel computational scenarios by the first full-atom "
+"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
+"New biomedical applications suddenly become possible giving a new role to "
+"computational biology for biomedical research."
 msgstr ""
 
 #: projects.inc:111
@@ -132,11 +159,15 @@ msgid "Genetic linkage analysis"
 msgstr ""
 
 #: projects.inc:113
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
+msgid ""
+"Superlink at Technion helps geneticists all over the world find disease-"
+"provoking genes causing some types of diabetes, hypertension (high blood "
+"pressure), cancer, schizophrenia and many others."
 msgstr ""
 
 #: projects.inc:127
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
+msgid ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
 msgstr ""
 
 #: projects.inc:128
@@ -144,7 +175,11 @@ msgid "Life science research"
 msgstr ""
 
 #: projects.inc:129
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
+msgid ""
+"The Lattice Project supplies computing power to scientists at the University "
+"of Maryland studying evolutionary relationships based on DNA sequence data; "
+"bacterial, plasmid, and virus protein sequences; and biological diversity in "
+"nature reserves. "
 msgstr ""
 
 #: projects.inc:135
@@ -156,20 +191,32 @@ msgid "Epidemiology"
 msgstr ""
 
 #: projects.inc:137
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
+msgid ""
+"Simulation models of the transmission dynamics and health effects of malaria "
+"are an important tool for malaria control. They can be used to determine "
+"optimal strategies for delivering mosquito nets, chemotherapy, or new "
+"vaccines which are currently under development and testing.  Such modeling "
+"is extremely computer intensive, requiring simulations of large human "
+"populations with a diverse set of parameters related to biological and "
+"social factors that influence the distribution of the disease. "
 msgstr ""
 
 #: projects.inc:159
 msgid "University of Washington"
 msgstr ""
 
-#: projects.inc:160
-#: projects.inc:168
+#: projects.inc:160 projects.inc:168
 msgid "Biology"
 msgstr ""
 
 #: projects.inc:161
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
+msgid ""
+"Determine the 3-dimensional shapes of proteins in research that may "
+"ultimately lead to finding cures for some major human diseases. By running "
+"Rosetta at home you will help us speed up and extend our research in ways we "
+"couldn't possibly attempt without your help. You will also be helping our "
+"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
+"Cancer, and Alzheimer's"
 msgstr ""
 
 #: projects.inc:167
@@ -177,7 +224,10 @@ msgid "University of Vienna"
 msgstr ""
 
 #: projects.inc:169
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
+msgid ""
+"Calculate similarities between proteins. SIMAP provides a public database of "
+"the resulting data, which plays a key role in many bioinformatics research "
+"projects."
 msgstr ""
 
 #: projects.inc:175
@@ -193,34 +243,54 @@ msgid "Climate study"
 msgstr ""
 
 #: projects.inc:189
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
+msgid ""
+"Investigate the approximations that have to be made in state-of-the-art "
+"climate models. By running the model thousands of times we hope to find out "
+"how the model responds to slight tweaks to these approximations - slight "
+"enough to not make the approximations any less realistic. This will allow us "
+"to improve our understanding of how sensitive our models are to small "
+"changes and also to things like changes in carbon dioxide and the sulphur "
+"cycle. This will allow us to explore how climate may change in the next "
+"century under a wide range of different scenarios."
 msgstr ""
 
 #: projects.inc:196
 msgid "Astronomy, Physics, and Chemistry"
 msgstr ""
 
-#: projects.inc:202
-#: projects.inc:241
-#: projects.inc:249
+#: projects.inc:202 projects.inc:241 projects.inc:249
 msgid "Astronomy"
 msgstr ""
 
 #: projects.inc:203
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
+msgid ""
+"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
+"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
+"Universe. We will measure physical parameters (such as stellar mass surface "
+"density, star formation rate surface density, attenuation, and first-order "
+"star formation history) on a resolved pixel-by-pixel basis using spectral "
+"energy distribution (SED) fitting techniques in a distributed computing mode."
 msgstr ""
 
 #: projects.inc:225
 msgid "University of Texas at Austin"
 msgstr ""
 
-#: projects.inc:226
-#: projects.inc:257
+#: projects.inc:226 projects.inc:257
 msgid "Chemistry"
 msgstr ""
 
 #: projects.inc:227
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
+msgid ""
+"A common problem in theoretical chemistry, condensed matter physics and "
+"materials science is the calculation of the time evolution of an atomic "
+"scale system where, for example, chemical reactions and/or diffusion occur. "
+"Generally the events of interest are quite rare (many orders of magnitude "
+"slower than the vibrational movements of the atoms), and therefore direct "
+"simulations, tracking every movement of the atoms, would take thousands of "
+"years of computer calculations on the fastest present day computer before a "
+"single event of interest can be expected to occur.  Our research group is "
+"interested in calculating the long time dynamics of systems."
 msgstr ""
 
 #: projects.inc:240
@@ -228,7 +298,10 @@ msgid "University of Illinois at Urbana-Champaign"
 msgstr ""
 
 #: projects.inc:242
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
+msgid ""
+"The goal of Cosmology at Home is to search for the model that best describes "
+"our Universe and to find the range of models that agree with the available "
+"astronomical particle physics data."
 msgstr ""
 
 #: projects.inc:248
@@ -236,7 +309,10 @@ msgid "Rensselaer Polytechnic Institute"
 msgstr ""
 
 #: projects.inc:250
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
+msgid ""
+"The goal of Milkyway at Home is to create a highly accurate three dimensional "
+"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
+"Survey."
 msgstr ""
 
 #: projects.inc:256
@@ -244,7 +320,13 @@ msgid "Leiden University, The Netherlands"
 msgstr ""
 
 #: projects.inc:258
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
+msgid ""
+"Surface science calculations using Classical Dynamics.  Leiden Classical "
+"allows volunteers, students and other scientist to submit their personal "
+"calculations to the grid. Each user has his own personal queue for Classical "
+"Dynamics jobs. In this way students have used the grid to simulate liquid "
+"argon, or to test the validity of the ideal gas law by actually doing the "
+"simulations through the grid."
 msgstr ""
 
 #: projects.inc:272
@@ -256,25 +338,36 @@ msgid "Astrophysics"
 msgstr ""
 
 #: projects.inc:274
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
+msgid ""
+"Search for spinning neutron stars (also called pulsars) using data from the "
+"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
+"observatory.  Einstein at Home is a World Year of Physics 2005 project "
+"supported by the American Physical Society (APS) and by a number of "
+"international organizations."
 msgstr ""
 
-#: projects.inc:288
-#: projects.inc:296
+#: projects.inc:288 projects.inc:296
 msgid "CERN (European Organization for Nuclear Research)"
 msgstr ""
 
-#: projects.inc:289
-#: projects.inc:297
+#: projects.inc:289 projects.inc:297
 msgid "Physics"
 msgstr ""
 
 #: projects.inc:290
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
+msgid ""
+"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
+"European Organization for Nuclear Research, the world's largest particle "
+"physics laboratory.  It is the most powerful instrument ever built to "
+"investigate on particles proprieties. LHC at home runs simulations to improve "
+"the design of LHC and its detectors."
 msgstr ""
 
 #: projects.inc:298
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
+msgid ""
+"This project uses CERN-developed virtual machine technology for full-fledged "
+"LHC event physics simulation on volunteer computers.  Requires that you "
+"install VirtualBox on your computer"
 msgstr ""
 
 #: projects.inc:304
@@ -286,7 +379,12 @@ msgid "Astrophysics, astrobiology"
 msgstr ""
 
 #: projects.inc:306
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
+msgid ""
+"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
+"goal is to detect intelligent life outside Earth. One approach, known as "
+"radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
+"signals from space. Such signals are not known to occur naturally, so a "
+"detection would provide evidence of extraterrestrial technology."
 msgstr ""
 
 #: projects.inc:320
@@ -298,7 +396,11 @@ msgid "Chemical engineering and nanotechnology"
 msgstr ""
 
 #: projects.inc:322
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
+msgid ""
+"The study of molecular magnets and controlled nanoscale magnetism.  These "
+"magnetic molecules may be used to develop tiny magnetic switches, with "
+"applications in medicine (such as local tumor chemotherapy) and "
+"biotechnology."
 msgstr ""
 
 #: projects.inc:329
@@ -314,7 +416,10 @@ msgid "Physics, biochemistry, and others"
 msgstr ""
 
 #: projects.inc:336
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
+msgid ""
+"The objective of CAS at home is to encourage and assist scientists in China to "
+"adopt the technologies of volunteer computing and volunteer thinking for "
+"their research."
 msgstr ""
 
 #: projects.inc:343
@@ -322,11 +427,12 @@ msgid "Mathematics, physics, evolution"
 msgstr ""
 
 #: projects.inc:344
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
+msgid ""
+"Yoyo at home is an adapter between BOINC and several existing volunteer "
+"computing projects: ECM, Muon, Evolution at home, and distributed.net"
 msgstr ""
 
-#: projects.inc:349
-#: projects.inc:505
+#: projects.inc:349 projects.inc:505
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 msgstr ""
 
@@ -335,7 +441,11 @@ msgid "European research projects"
 msgstr ""
 
 #: projects.inc:351
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
+msgid ""
+"The EDGeS at Home Beta project integrates volunteer computing into the service "
+"grid network of Europe by allowing service grids to send workunits to be "
+"processed by the volunteers of this project. The scientific projects covered "
+"by the project include math, physics, biology, etc."
 msgstr ""
 
 #: projects.inc:357
@@ -359,7 +469,11 @@ msgid "Medical, environmental and other humanitarian research"
 msgstr ""
 
 #: projects.inc:367
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
+msgid ""
+"To further critical non-profit research on some of humanity's most pressing "
+"problems by creating the world's largest volunteer computing grid.  Research "
+"includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"clean water and many more."
 msgstr ""
 
 #: projects.inc:373
@@ -378,21 +492,18 @@ msgstr ""
 msgid "Simulation of quantum computing; Goldbach's conjecture."
 msgstr ""
 
-#: projects.inc:428
-#: projects.inc:436
+#: projects.inc:428 projects.inc:436
 msgid "Cryptography"
 msgstr ""
 
 #: projects.inc:437
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
+msgid ""
+"Attempt to decode 3 original Enigma messages. The signals were intercepted "
+"in the North Atlantic in 1942 and are believed to be unbroken."
 msgstr ""
 
-#: projects.inc:443
-#: projects.inc:482
-#: projects.inc:490
-#: projects.inc:498
-#: projects.inc:506
-#: projects.inc:546
+#: projects.inc:443 projects.inc:482 projects.inc:490 projects.inc:498
+#: projects.inc:506 projects.inc:546
 msgid "Mathematics"
 msgstr ""
 
@@ -409,11 +520,19 @@ msgid "Factorization of large integers"
 msgstr ""
 
 #: projects.inc:451
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
+msgid ""
+"NFS at Home is a research project that uses Internet-connected computers to do "
+"the lattice sieving step in the Number Field Sieve factorization of large "
+"integers. As a young school student, you gained your first experience at "
+"breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
+"NFS at Home is a continuation of that experience, only with integers that are "
+"hundreds of digits long."
 msgstr ""
 
 #: projects.inc:457
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
+msgid ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
 msgstr ""
 
 #: projects.inc:458
@@ -421,7 +540,11 @@ msgid "Software testing"
 msgstr ""
 
 #: projects.inc:459
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
+msgid ""
+"The aim of this project is to provide a powerful distributed computing "
+"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
+"well as others Lithuanian academic institutions.  Current applications "
+"involve the study of Monte-Carlo based software testing."
 msgstr ""
 
 #: projects.inc:481
@@ -429,11 +552,20 @@ msgid "Mathematical Institute of Leiden University / Kennislink"
 msgstr ""
 
 #: projects.inc:483
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
+msgid ""
+"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
+"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
+"product of the distinct prime factors of n. The ABC conjecture says that "
+"there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for "
+"any real h > 1. The ABC conjecture is currently one of the greatest open "
+"problems in mathematics. If it is proven to be true, a lot of other open "
+"problems can be answered directly from it."
 msgstr ""
 
 #: projects.inc:491
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
+msgid ""
+"Primegrid has multiple projects searching for different forms of very large "
+"prime numbers, including searching for the largest known prime number."
 msgstr ""
 
 #: projects.inc:497
@@ -441,11 +573,15 @@ msgid "Hochschule RheinMain University of Applied Sciences"
 msgstr ""
 
 #: projects.inc:499
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
+msgid ""
+"Search for counterexamples to two conjectures related to the identification "
+"of prime numbers"
 msgstr ""
 
 #: projects.inc:507
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
+msgid ""
+"Find all the generalized binary number systems (in which bases are matrices "
+"and digits are vectors) up to dimension 11."
 msgstr ""
 
 #: docutil.php:21
@@ -473,11 +609,21 @@ msgid "%s for %s (%s MB)"
 msgstr "%s para %s (%s MB)"
 
 #: download.php:87
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others. <p> After installing BOINC on your computer, you can connect it to as many of these projects as you like."
-msgstr "O BOINC é un programa que lle permite donar o tempo de inactividade do seu computador a proxectos científicos coma o SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, e moitos outros. <p> Despois de instalar BOINC no seu computador, vostede pode unilo a tantos proxectos como queira."
+msgid ""
+"BOINC is a program that lets you donate your idle computer time to science "
+"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, and many others. <p> After installing BOINC on your "
+"computer, you can connect it to as many of these projects as you like."
+msgstr ""
+"O BOINC é un programa que lle permite donar o tempo de inactividade do seu "
+"computador a proxectos científicos coma o SETI at home, Climateprediction.net, "
+"Rosetta at home, World Community Grid, e moitos outros. <p> Despois de instalar "
+"BOINC no seu computador, vostede pode unilo a tantos proxectos como queira."
 
 #: download.php:89
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
+msgid ""
+"You may run this software on a computer only if you own the computer or have "
+"the permission of its owner."
 msgstr ""
 
 #: download.php:131
@@ -488,8 +634,7 @@ msgstr "Requerimentos do sistema"
 msgid "Release notes"
 msgstr "Notas da versión"
 
-#: download.php:133
-#: index.php:85
+#: download.php:133 index.php:85
 msgid "Help"
 msgstr "Axuda"
 
@@ -511,20 +656,34 @@ msgstr "BOINC: computar para a ciencia"
 
 #: help.php:12
 #, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
+msgid ""
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who "
+"can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"through the process of installing and using BOINC; %s troubleshoot any "
+"problems you might have."
 msgstr ""
 
 #: help.php:21
 #, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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."
+msgid ""
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. "
+"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 ""
 
 #: help.php:28
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
+msgid ""
+"The best way to get help is by voice, for which you need either built-in "
+"microphone and speakers or an external headset for your computer.  You can "
+"also use Skype's text-based chat system or regular email (if you don't have "
+"Skype) to communicate with Help Volunteers."
 msgstr ""
 
 #: help.php:31
-msgid "Volunteers speaking several languages are available. Please select a language:"
+msgid ""
+"Volunteers speaking several languages are available. Please select a "
+"language:"
 msgstr ""
 
 #: help.php:47
@@ -533,16 +692,22 @@ msgstr ""
 
 #: help.php:50
 #, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
+msgid ""
+"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+"Volunteer%s.  It's a great way to help the cause of scientific research and "
+"volunteer computing - and it's fun!"
 msgstr ""
 
 #: help.php:56
 #, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
+msgid ""
+"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
 msgstr ""
 
 #: help_funcs.php:107
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
+msgid ""
+"BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
+"or the University of California."
 msgstr ""
 
 #: help_funcs.php:110
@@ -593,9 +758,7 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: index.php:86
-#: index.php:123
-#: index.php:174
+#: index.php:86 index.php:123 index.php:174
 msgid "Documentation"
 msgstr ""
 
@@ -609,12 +772,19 @@ msgstr ""
 
 #: index.php:94
 #, php-format
-msgid " Use the idle time on your computer (Windows, Mac, or Linux) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:  %sChoose%s projects  %sDownload%s and run BOINC software  %sEnter%s an email address and password. "
+msgid ""
+" Use the idle time on your computer (Windows, Mac, or Linux) to cure "
+"diseases, study global warming, discover pulsars, and do many other types of "
+"scientific research.  It's safe, secure, and easy:  %sChoose%s projects  "
+"%sDownload%s and run BOINC software  %sEnter%s an email address and "
+"password. "
 msgstr ""
 
 #: index.php:105
 #, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
+msgid ""
+"Or, if you run several projects, try an %saccount manager%s such as "
+"%sGridRepublic%s or %sBAM!%s. "
 msgstr ""
 
 #: index.php:121
@@ -626,11 +796,15 @@ msgid "Software updates"
 msgstr ""
 
 #: index.php:131
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving "
+"you the computing power of thousands of CPUs."
 msgstr ""
 
 #: index.php:135
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
 msgstr ""
 
 #: index.php:140
@@ -707,7 +881,8 @@ msgstr ""
 
 #: index.php:265
 #, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
+msgid ""
+"Open-source software for %svolunteer computing%s and %sgrid computing%s."
 msgstr ""
 
 #: index.php:278
@@ -727,3 +902,443 @@ msgstr ""
 #~ msgid "POEM at HOME"
 #~ msgstr "Na casa"
 
+# The charset used for the text in this file (please try to use UTF-8 if possible)
+#~ msgid "CHARSET"
+#~ msgstr "UTF-8"
+
+# The name of this language in this language
+#~ msgid "LANG_NAME_NATIVE"
+#~ msgstr "Galego"
+
+# The name of this language in an international language (English)
+#~ msgid "LANG_NAME_INTERNATIONAL"
+#~ msgstr "Galician"
+
+# ######################################<br />
+# <br />
+# poll-related stuff<br />
+# <br />
+# ######################################
+#~ msgid "POLL_TITLE"
+#~ msgstr "Enquisa para usuarios do BOINC"
+
+#~ msgid "POLL_INTRO"
+#~ msgstr ""
+#~ "Algúns proxectos voluntarios de cálculo computacional, incluíndo  "
+#~ "Climateprediction.net, Einstein at home, e SETI at home, usan un software "
+#~ "chamado BOINC. Se participa en proxectos como estes, pedímoslle que "
+#~ "responda ás seguintes preguntas. Isto axudará aos proxectos baseados en "
+#~ "BOINC a incrementar a participación e acadar mellores resultados "
+#~ "científicos.  <p> Por favor, reponda a tódalas preguntas que desexe, e "
+#~ "despois vaia ao final da páxina e prema OK . Se completou a enquisa "
+#~ "anteriormente pero as súas respostas cambiaron, por favor, compléteo de "
+#~ "novo - as súas novas respostas remplazarán ás anteriores.  <p> Os "
+#~ "resultados actuais da enquisa están <a href=poll_results.php>aquí</a>. "
+
+#~ msgid "POLL_RUN"
+#~ msgstr "Utiliza o BOINC?"
+
+#~ msgid "POLL_PARTICIPATION"
+#~ msgstr "A súa participación"
+
+#~ msgid "POLL_COMPUTERS"
+#~ msgstr "Os seus computadores"
+
+#~ msgid "POLL_YOU"
+#~ msgstr "Vostede"
+
+#~ msgid "POLL_NATIONALITY"
+#~ msgstr "Nacionalidade"
+
+#~ msgid "POLL_COMMENTS"
+#~ msgstr "Comentarios"
+
+#~ msgid "POLL_COMMENTS_QUESTION"
+#~ msgstr ""
+#~ "Por favor, suxira formas nas que BOINC e os proxectos que o utilizan, "
+#~ "poidan ser mellorados:"
+
+#~ msgid "POLL_OTHER"
+#~ msgstr "Outros:"
+
+#~ msgid "POLL_CHECK_ALL"
+#~ msgstr "[Marcar todas as que correspondan]"
+
+#~ msgid "POLL_DONE"
+#~ msgstr "Ao rematar faga clic:"
+
+#~ msgid "POLL_CURRENT"
+#~ msgstr "Si - estiven usando o BOINC no meu ordenador durante..."
+
+#~ msgid "POLL_TWEEK"
+#~ msgstr "menos dunha semana"
+
+#~ msgid "POLL_TMONTH"
+#~ msgstr "menos dun mes"
+
+#~ msgid "POLL_TYEAR"
+#~ msgstr "menos dun ano"
+
+#~ msgid "POLL_TMOREYEAR"
+#~ msgstr "máis dun ano"
+
+#~ msgid "POLL_LAPSED"
+#~ msgstr "Non - usaba o BOINC, pero xa non o fago porque..."
+
+#~ msgid "POLL_LINTEREST"
+#~ msgstr "perdín o interese"
+
+#~ msgid "POLL_LCOMPLICATED"
+#~ msgstr "era complicado de máis"
+
+#~ msgid "POLL_LSTOPPED"
+#~ msgstr "detíveno e esquecín inicialo de novo"
+
+#~ msgid "POLL_LPROBLEMS"
+#~ msgstr "causou problemas no meu computador"
+
+#~ msgid "POLL_LPOWER"
+#~ msgstr "usaba demasiada electricidade"
+
+#~ msgid "POLL_LNONBOINC"
+#~ msgstr "cambiei a un proxecto de cálculo non baseado no BOINC"
+
+#~ msgid "POLL_FAILED"
+#~ msgstr "Non - intentei executar o BOINC, pero..."
+
+#~ msgid "POLL_FINSTALL"
+#~ msgstr "o software non se instalou correctamente"
+
+#~ msgid "POLL_FFIGURE"
+#~ msgstr "non puiden imaxinar cómo utilizar o software"
+
+#~ msgid "POLL_FNETWORK"
+#~ msgstr "tiven problemas coa conexión de rede"
+
+#~ msgid "POLL_FATTACH"
+#~ msgstr "non me puiden unir a un proxecto"
+
+#~ msgid "POLL_FWORK"
+#~ msgstr "unínme a un proxecto, pero nunca recibín traballo algún"
+
+#~ msgid "POLL_NEVER"
+#~ msgstr "Non - nunca intentei executar BOINC, porque..."
+
+#~ msgid "POLL_NSECURITY"
+#~ msgstr "preocupábame a seguridade"
+
+#~ msgid "POLL_NPROJECT"
+#~ msgstr "non estaba interesado en ningún dos proxectos"
+
+#~ msgid "POLL_NPERMISSION"
+#~ msgstr "non teño permisos para executarlo no meu ordenador"
+
+#~ msgid "POLL_NVERSION"
+#~ msgstr "non había unha versión dispoñible para o meu ordenador"
+
+#~ msgid "POLL_KIND"
+#~ msgstr "En que tipo de computador executa BOINC?"
+
+#~ msgid "POLL_WHERE"
+#~ msgstr "Onde están situados?"
+
+#~ msgid "POLL_WORK"
+#~ msgstr "No traballo"
+
+#~ msgid "POLL_SCHOOL"
+#~ msgstr "Na escola"
+
+#~ msgid "POLL_HOW_MANY"
+#~ msgstr "Cantos computadores?"
+
+#~ msgid "POLL_TURNED_ON"
+#~ msgstr "De promedio, cantas horas ao día están acesos?"
+
+#~ msgid "POLL_AGE"
+#~ msgstr "Idade"
+
+#~ msgid "POLL_SEX"
+#~ msgstr "Sexo"
+
+#~ msgid "POLL_MALE"
+#~ msgstr "Home"
+
+#~ msgid "POLL_FEMALE"
+#~ msgstr "Muller"
+
+#~ msgid "POLL_EXPERTISE"
+#~ msgstr "O seu nivel técnico cos ordenadores"
+
+#~ msgid "POLL_LEVB"
+#~ msgstr "Principiante"
+
+#~ msgid "POLL_LEVI"
+#~ msgstr "Intermedio"
+
+#~ msgid "POLL_LEVA"
+#~ msgstr "Avanzado"
+
+#~ msgid "POLL_LEARN_WHERE"
+#~ msgstr "Onde soubo dos proyectos BOINC?"
+
+#~ msgid "POLL_WTV"
+#~ msgstr "TV/radio/prensa"
+
+#~ msgid "POLL_WPERS"
+#~ msgstr "Por amigos, parentes, compañeiros de traballo"
+
+#~ msgid "POLL_WTEAM"
+#~ msgstr "Foros de mensaxes ou sitios web"
+
+#~ msgid "POLL_WBOINC"
+#~ msgstr "Na páxina web do BOINC"
+
+#~ msgid "POLL_WWEB"
+#~ msgstr "Noutros sitios web"
+
+#~ msgid "POLL_FACTOR"
+#~ msgstr ""
+#~ "Cales son os factores máis importantes cando decide unirse a un proxecto "
+#~ "do BOINC?"
+
+#~ msgid "POLL_GRAPHICS"
+#~ msgstr "Protector de pantalla con gráficas atractivas"
+
+#~ msgid "POLL_CREDIT_FAIR"
+#~ msgstr "O crédito polo traballo feito outórgase dun xeito rápido e xusto"
+
+#~ msgid "POLL_CREDIT_MORE"
+#~ msgstr "Conseguir máis crédito deste proxecto que de outros"
+
+#~ msgid "POLL_MB_FRIENDLY"
+#~ msgstr "Os foros de mensaxes son útiles e amigables"
+
+#~ msgid "POLL_MB_STAFF"
+#~ msgstr "Os administradores do proxecto participan nos foros de mensaxes"
+
+#~ msgid "POLL_WEB_SITE"
+#~ msgstr "O sitio web do proxecto é informativo"
+
+#~ msgid "POLL_SCIENCE_IMPORTANT"
+#~ msgstr "A ciencia involucrada é importante e beneficiosa"
+
+#~ msgid "POLL_SCIENCE_PUBLIC"
+#~ msgstr "Non ten fins de lucro, e con resultados públicos"
+
+#~ msgid "POLL_RECOGNIZE"
+#~ msgstr "Recoñecemento persoal se o meu ordenador atopa algo"
+
+#~ msgid "POLL_PUBLISH"
+#~ msgstr "Participación do proxecto en publicacións mensuais científicas"
+
+#~ msgid "POLL_EMAIL"
+#~ msgstr "O proxecto envía boletíns periódicos por correo electrónico"
+
+#~ msgid "POLL_NPROJECTS"
+#~ msgstr "En cantos proxectos do BOINC participa?"
+
+#~ msgid "POLL_SSAVER"
+#~ msgstr "Usa o BOINC como salvapantallas?"
+
+#~ msgid "POLL_YES"
+#~ msgstr "Si"
+
+#~ msgid "POLL_NO"
+#~ msgstr "Non"
+
+#~ msgid "POLL_MBOARDS"
+#~ msgstr "O seu uso dos foros de mensaxes do proxecto:"
+
+#~ msgid "POLL_MBR"
+#~ msgstr "para ler información"
+
+#~ msgid "POLL_MBRW"
+#~ msgstr "para ler e escribir información"
+
+#~ msgid "POLL_NONE"
+#~ msgstr "non os uso"
+
+#~ msgid "POLL_HELP"
+#~ msgstr ""
+#~ "De onde obtén a información para resolver os problemas co BOINC e/ou os "
+#~ "seus proxectos?"
+
+#~ msgid "POLL_HELP_PMB"
+#~ msgstr "Os foros de mensaxes do proxecto"
+
+#~ msgid "POLL_HELP_BMB"
+#~ msgstr "Os foros de mensaxes do BOINC"
+
+#~ msgid "POLL_HELP_BDOC"
+#~ msgstr "A páxina web do BOINC"
+
+#~ msgid "POLL_HELP_BMLIST"
+#~ msgstr "Listas de correo do BOINC"
+
+#~ msgid "POLL_HELP_WIKI"
+#~ msgstr "O Wiki non oficial do BOINC"
+
+#~ msgid "POLL_HELP_TEAM"
+#~ msgstr "Páxinas web dos equipos"
+
+#~ msgid "POLL_HELP_GOOGLE"
+#~ msgstr "Google ou outros buscadores"
+
+#~ msgid "POLL_ERROR_TITLE"
+#~ msgstr "Erro - non se gardaron os resultados"
+
+#~ msgid "POLL_ERROR_TEXT"
+#~ msgstr ""
+#~ "Un erro interno impediunos gardar as súas respostas á enquisa. Por favor "
+#~ "inténteo de novo máis tarde."
+
+#~ msgid "POLL_RECORDED"
+#~ msgstr "Respostas á enquisa gardadas"
+
+#~ msgid "POLL_THANKS"
+#~ msgstr "Moitas grazas por completar a enquisa para usuarios do BOINC."
+
+#~ msgid "POLL_RESULTS_TITLE"
+#~ msgstr "Resultados da enquisa"
+
+#~ msgid "POLL_RESULTS_TEXT"
+#~ msgstr ""
+#~ "Estes son os resultados actuais da <a href=poll.php>enquisa a usuarios do "
+#~ "BOINC</a>. Esta páxina actualízase cada hora."
+
+#~ msgid "Other systems"
+#~ msgstr "Outros sistemas"
+
+#~ msgid "If your computer is not of one of the above types, you can"
+#~ msgstr ""
+#~ "Se o seu computador non é de ningún tipo dos anteriores, vostede pode"
+
+#~ msgid "%s make your own client software %s or"
+#~ msgstr "%s crear o seu propio programa cliente %s ou"
+
+#~ msgid ""
+#~ "%s download executables from a third-party site %s (available for Solaris/"
+#~ "Opteron, Linux/Opteron, Linux/PPC, HP-UX, and FreeBSD, and others)."
+#~ msgstr ""
+#~ "%s obter executables de sitios web de terceiros %s (dispoñibles para "
+#~ "Solaris/Opteron, Linux/Opteron, Linux/PPC, HP-UX, FreeBSD, e outros)."
+
+#~ msgid "DL_MIRRORS"
+#~ msgstr ""
+#~ "Nota: os arquivos son descargados de servidores espello en boinc.berkeley."
+#~ "edu, morel.mit.edu, einstein.aei.mpg.de, einstein.astro.gla.ac.uk, "
+#~ "einstein.ligo.caltech.edu, e einstein.aset.psu.edu (grazas a estas "
+#~ "institucións). O servidor é elixido aleatoriamente - se a descarga falla, "
+#~ "recargue esta páxina e inténteo de novo."
+
+# #############################################
+# help.php
+# #############################################
+#~ msgid "HELP_TITLE"
+#~ msgstr "Axuda para o BOINC"
+
+#~ msgid "HELP_HEADING1"
+#~ msgstr "Axuda en liña"
+
+#~ msgid "HELP_P1_1"
+#~ msgstr ""
+#~ "A axuda Online do BOINC permítelle falar directamente con usuarios do "
+#~ "BOINC con experiencia, que poden: %s contestar preguntas sobre o BOINC e "
+#~ "computación voluntaria; %s guiaráo no proceso de instalar e usar BOINC; "
+#~ "%s resolverá calquer problema que puidera ter."
+
+#~ msgid "HELP_P1_2"
+#~ msgstr ""
+#~ "A axuda Online do BOINC está baseada no %sSkype%s, un sistema de "
+#~ "telefonía baseado na Internet. Skype é gratuito (o programa e as "
+#~ "chamadas). Se aínda non ten Skype, por favor, %sdescárgueo e instáleo "
+#~ "agora%s. Cando remate, volva a esta páxina."
+
+#~ msgid "HELP_P1_3"
+#~ msgstr ""
+#~ "O mellor xeito de obter axuda é por voz, para o que precisa micrófono e "
+#~ "altavoces integrados ou externos. Pode usar tamén o chat baseado en texto "
+#~ "de Skype ou coreo electrónico normal (se non ten Skype) para comunicarse "
+#~ "con Voluntarios para Axuda."
+
+#~ msgid "HELP_P1_4"
+#~ msgstr ""
+#~ "Hai dispoñibles Voluntarios que falan distintos idiomas. Por favor, "
+#~ "seleccione un idioma: "
+
+#~ msgid "HELP_HEADING2"
+#~ msgstr "Axuda para o BOINC na web"
+
+#~ msgid "HELP_P2_ITEM1"
+#~ msgstr "manual de usuario do BOINC"
+
+#~ msgid "HELP_P2_ITEM2"
+#~ msgstr "Solucións a problemas do BOINC "
+
+#~ msgid "HELP_P2_ITEM3"
+#~ msgstr "Sitios web relacionados co BOINC "
+
+#~ msgid "HELP_P2_ITEM4"
+#~ msgstr "Os foros do BOINC "
+
+#~ msgid "HELP_P2_ITEM5"
+#~ msgstr "Os foros sobre calquer proxecto baseado no BOINC "
+
+#~ msgid "HELP_HEADING3"
+#~ msgstr "Sexa Voluntario para Axuda"
+
+#~ msgid "HELP_P3_1"
+#~ msgstr ""
+#~ "Se vostede é un usuario do BOINC con experiencia, animámolo a %sser un "
+#~ "Voluntario para Axuda%s. Este é un gran xeito de axudar á causa da "
+#~ "investigación científica e computación voluntaria - ademáis é divertido!"
+
+#~ msgid "HELP_P3_2"
+#~ msgstr ""
+#~ "Se vostede é xa un Voluntario para Axuda: para editar as súas "
+#~ "preferencias, %sprema aquí%s. "
+
+# #############################################
+# index.php
+# #############################################
+#~ msgid "HOME_HEADING1"
+#~ msgstr "Voluntario"
+
+#~ msgid "HOME_P1"
+#~ msgstr ""
+#~ "Use o tempo de inactividade do seu computador (Windows, Mac, ou Linux) "
+#~ "para curar enfermidades, estudiar o quencemento global, descubra "
+#~ "púlsares, e faga moitos outros tipos de investigación científica. É "
+#~ "seguro, protexido, e doado: %sEscolla%s proxectos %sDescargue%s e execute "
+#~ "o programa BOINC %sIntroduza%s un enderezo de correo electrónico e un "
+#~ "contrasinal."
+
+#~ msgid "HOME_P2"
+#~ msgstr ""
+#~ "Ou, se vostede executa varios proxectos, probe un %sxestor de contas%s "
+#~ "coma %sGridRepublic%s ou %sBAM!%s. "
+
+#~ msgid "HOME_P3"
+#~ msgstr ""
+#~ "Se ten algunha pregunta, ou precisa axuda para comezar, pode %sfalar cun "
+#~ "Voluntario para Axuda%s. "
+
+#~ msgid "HOME_DOWNLOAD"
+#~ msgstr "Descargar"
+
+#~ msgid "HOME_WEB_SITES"
+#~ msgstr "A Web"
+
+#~ msgid "HOME_ADD_ONS"
+#~ msgstr "Complementos"
+
+#~ msgid "HOME_SURVEY"
+#~ msgstr "Enquisa"
+
+#~ msgid "HOME_BOINC"
+#~ msgstr "Infraestrutura Aberta de Berkeley para Computación en Rede (BOINC)"
+
+#~ msgid "HOME_BOINC_DESC"
+#~ msgstr ""
+#~ "Programas de código aberto para %scomputación voluntaria%s e "
+#~ "%scomputación en rede (grid)%s"
diff --git a/locale/he/BOINC-Client.mo b/locale/he/BOINC-Client.mo
index 16c0efa..aea4f79 100644
Binary files a/locale/he/BOINC-Client.mo and b/locale/he/BOINC-Client.mo differ
diff --git a/locale/he/BOINC-Client.po b/locale/he/BOINC-Client.po
index 56a92f5..8fd02f7 100755
--- a/locale/he/BOINC-Client.po
+++ b/locale/he/BOINC-Client.po
@@ -4,20 +4,20 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: BOINC-Client\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-10-15 22:25-0700\n"
-"PO-Revision-Date: 2015-02-10 22:48-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: 2012-04-26 04:05+0200\n"
+"Last-Translator: Ido <dj_legolas1 at hotmail.com>\n"
+"Language-Team: IOPanel.net\n"
 "Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.1.6\n"
 
-#: acct_mgr.cpp:450
-#: acct_mgr.cpp:459
+#: acct_mgr.cpp:450 acct_mgr.cpp:459
 msgid "Message from account manager"
 msgstr "הודעה ממנהל החשבונות"
 
@@ -26,8 +26,12 @@ 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 "חלק מהמשימות מצריכות יותר זיכרון מהכמות המאושרת בהגדרות שלך. אנא בדוק את ההגדרות."
+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"
@@ -39,11 +43,12 @@ msgstr "משתנה הסביבה HTTP_PROXY חייב לציין פרוקסי מס
 
 #: cs_scheduler.cpp:613
 #, c-format
-msgid "You used the wrong URL for this project.  When convenient, remove this project, then add %s"
+msgid ""
+"You used the wrong URL for this project.  When convenient, remove this "
+"project, then add %s"
 msgstr "השתמשת בכתובת שגויה לפרוייקט זה. כשיהיה נוח, הסר פרוייקט זה והוסף %s"
 
-#: cs_statefile.cpp:828
-#: ../sched/sched_types.cpp:259
+#: cs_statefile.cpp:828 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
 msgstr "שגיאת תחביר ב-app_info.xml"
 
@@ -55,18 +60,15 @@ msgstr "קובץ שהופנה מ-app_info.xml אינו קיים:"
 msgid "A new version of BOINC is available."
 msgstr "גרסה חדשה של BOINC זמינה."
 
-#: current_version.cpp:94
-#: current_version.cpp:102
+#: current_version.cpp:94 current_version.cpp:102
 msgid "Download"
 msgstr ""
 
-#: log_flags.cpp:269
-#: log_flags.cpp:449
+#: 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
+#: log_flags.cpp:423 log_flags.cpp:475
 msgid "Unrecognized tag in cc_config.xml"
 msgstr "תג לא מוכר ב-cc_config.xml"
 
@@ -91,7 +93,9 @@ 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."
+msgid ""
+"The project has changed its security key.  Please remove and add this "
+"project."
 msgstr "הפרוייקט שינה את מפתח האבטחה שלו. הסר והוסף פרוייקט זה מחדש."
 
 #: ../sched/handle_request.cpp:943
@@ -103,7 +107,8 @@ 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."
+msgid ""
+"Your BOINC client software is too old.  Please install the current version."
 msgstr "גרסת קליינט ה-BOINC ישנה מידי. אנא התקן את הגירסה הנוכחית."
 
 #: ../sched/handle_request.cpp:1259
@@ -115,17 +120,25 @@ 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 "עדכן למנהלי ההתקן האחרונים כדי להשתמש בכל היישומים הזמינים עבור המעבד הגרפי"
+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 "יש צורך בגרסה חדשה יותר של BOINC על מנת להשתמש במעבד הגרפי של NVIDIA; אנא עדכן לגרסה הנוכחית"
+msgid ""
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to "
+"the current version"
+msgstr ""
+"יש צורך בגרסה חדשה יותר של BOINC על מנת להשתמש במעבד הגרפי של NVIDIA; אנא "
+"עדכן לגרסה הנוכחית"
 
+# 94%
 #: ../sched/sched_send.cpp:1146
 #, c-format
+#, c-format, fuzzy
 msgid "An %s GPU is required to run tasks for this project"
-msgstr ""
+msgstr "נדרש מעבד גרפי של  ATI להרצת משימות מפרוייקט זה"
 
 #: ../sched/sched_send.cpp:1262
 msgid "No tasks are available for the applications you have selected."
@@ -141,7 +154,8 @@ msgstr "נדרשת גרסה חדשה של BOINC; אנא התקן גרסה נוכ
 
 #: ../sched/sched_send.cpp:1305
 #, c-format
-msgid "Tasks for %s are available, but your preferences are set to not accept them"
+msgid ""
+"Tasks for %s are available, but your preferences are set to not accept them"
 msgstr ""
 
 #: ../sched/sched_types.cpp:254
@@ -152,3 +166,61 @@ msgstr "שם יישום לא מוכר ב-app_info.xml"
 msgid "Your app_info.xml file doesn't have a usable version of"
 msgstr "קובץ ה- app_info.xml שלך אינו מכיל גרסה שמישה של"
 
+#~ msgid "Download it."
+#~ msgstr "הורד אותה."
+
+#~ msgid "An NVIDIA or ATI GPU is required to run tasks for this project"
+#~ msgstr "נדרש מעבד גרפי של NVIDIA או ATI להרצת משימות מפרוייקט זה"
+
+#~ msgid "An NVIDIA GPU is required to run tasks for this project"
+#~ msgstr "נדרש מעבד גרפי של NVIDIA להרצת משימות מפרוייקט זה"
+
+#~ msgid "An ATI GPU is required to run tasks for this project"
+#~ msgstr "נדרש מעבד גרפי של  ATI להרצת משימות מפרוייקט זה"
+
+#~ msgid ""
+#~ "Tasks for NVIDIA GPU are available, but your preferences are set to not "
+#~ "accept them"
+#~ msgstr ""
+#~ "משימות עבור מעבד גרפי של NVIDIA זמינות, אך ההעדפות שלך מוגדרות ללא לקבל אותן"
+
+#~ msgid ""
+#~ "Tasks for ATI GPU are available, but your preferences are set to not accept "
+#~ "them"
+#~ msgstr ""
+#~ "משימות עבור מעבד גרפי של ATI זמינות, אך ההעדפות שלך מוגדרות ללא לקבל אותן"
+
+#~ msgid ""
+#~ "Tasks for CPU are available, but your preferences are set to not accept them"
+#~ msgstr "משימות למעבד זמינות, אך ההעדפות שלך מוגדרות ללא לקבל אותן"
+
+#~ msgid "error"
+#~ msgstr "שגיאה"
+
+#~ msgid "Can't resolve hostname in remote_hosts.cfg"
+#~ msgstr "לא יכול לפענח שם-מחשב ב-remote_hosts.cfg"
+
+#~ msgid "is not available for"
+#~ msgstr "אינו זמין עבור"
+
+#~ msgid "Notice from BOINC"
+#~ msgstr "התראה מ-BOINC"
+
+#~ msgid "Message from"
+#~ msgstr "הודעה מאת"
+
+#~ msgid ""
+#~ "You may have an outdated code signing key.  Try attaching and reattaching "
+#~ "this project."
+#~ msgstr "מפתח חתימת הקוד שלך פג תוקף. נסה להתנתק ולהתחבר מחדש לפרוייקט."
+
+#~ msgid "XML syntax error in"
+#~ msgstr "שגיאת תחביר XML ב- "
+
+#~ msgid "Unparsed tag in"
+#~ msgstr "לא ניתן לפענח את התג ב-"
+
+#~ msgid ""
+#~ "Your preference for network connection interval is too high for this "
+#~ "project"
+#~ msgstr "ההעדפות שלך למרווחי ביחורים לרשת גבוהים מידי בפרוייקט זה"
diff --git a/locale/he/BOINC-Manager.mo b/locale/he/BOINC-Manager.mo
index 65fdc80..ccf47a3 100644
Binary files a/locale/he/BOINC-Manager.mo and b/locale/he/BOINC-Manager.mo differ
diff --git a/locale/he/BOINC-Manager.po b/locale/he/BOINC-Manager.po
index 5470e67..a76e55e 100755
--- a/locale/he/BOINC-Manager.po
+++ b/locale/he/BOINC-Manager.po
@@ -4,32 +4,35 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: BOINC 6.10.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-15 14:15-0500\n"
-"PO-Revision-Date: 2015-02-10 23:13-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"POT-Creation-Date: 2014-02-02 00:00-0800\n"
+"PO-Revision-Date: 2012-04-26 04:05+0000\n"
+"Last-Translator: Ido <dj_legolas1 at hotmail.com>\n"
+"Language-Team: IOPanel.net\n"
 "Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.5.0\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc_7.4\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1335413110.0\n"
 "X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-SearchPath-0: clientgui\n"
 "X-Poedit-SearchPath-1: clientgui/msw\n"
 "X-Poedit-SearchPath-2: clientgui/gtk\n"
 "X-Poedit-SearchPath-3: clientgui/mac\n"
+"X-Poedit-SearchPath-0: clientgui\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\n"
+"X-POOTLE-MTIME: 1335413110.0\n"
 
-#: clientgui/AccountInfoPage.cpp:387
+# 81%
+#: AccountInfoPage.cpp:387
 #, c-format
+#, fuzzy, c-format
 msgid "Identify your account at %s"
-msgstr ""
+msgstr "זהה את חשבונך"
 
-#: clientgui/AccountInfoPage.cpp:393
+#: AccountInfoPage.cpp:393
 msgid ""
 "Please enter your account information\n"
 "(to create an account, visit the project's web site)"
@@ -37,7 +40,7 @@ msgstr ""
 "אנא הזן את פרטי חשבונך\n"
 "(בכדי ליצור חשבון, היכנס לאתר הפרוייקט)"
 
-#: clientgui/AccountInfoPage.cpp:397
+#: AccountInfoPage.cpp:397
 msgid ""
 "This project is not currently accepting new accounts.\n"
 "You can add it only if you already have an account."
@@ -45,19 +48,19 @@ msgstr ""
 "פרוייקט זה אינו מקבל חשבונות חדשים כרגע.\n"
 "אתה יכול להוסיף אותו במידה וכבר יש ברשותך חשבון."
 
-#: clientgui/AccountInfoPage.cpp:401
+#: AccountInfoPage.cpp:401
 msgid "Are you already running this project?"
 msgstr "האם אתה מריץ כבר פרוייקט זה?"
 
-#: clientgui/AccountInfoPage.cpp:405
+#: AccountInfoPage.cpp:405
 msgid "&No, new user"
 msgstr "&לא, משתמש חדש"
 
-#: clientgui/AccountInfoPage.cpp:408
+#: AccountInfoPage.cpp:408
 msgid "&Yes, existing user"
 msgstr "&כן, משתמש קיים"
 
-#: clientgui/AccountInfoPage.cpp:413
+#: AccountInfoPage.cpp:413
 msgid ""
 "We were not able to set up your account information\n"
 "automatically.\n"
@@ -72,51 +75,45 @@ msgstr ""
 "למטה בכדי לגלות מה להזין בשדות הדוא\"ל\n"
 "והסיסמה."
 
-#: clientgui/AccountInfoPage.cpp:416
+#: AccountInfoPage.cpp:416
 msgid "Find login information"
 msgstr "מצא פרטי התחברות"
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:649
+#: AccountInfoPage.cpp:436 AccountInfoPage.cpp:641
 msgid "&Password:"
 msgstr "&סיסמה:"
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:673
+#: AccountInfoPage.cpp:443 AccountInfoPage.cpp:665
 msgid "Choose a &password:"
 msgstr "בחר &סיסמה:"
 
-#: clientgui/AccountInfoPage.cpp:446
+#: AccountInfoPage.cpp:446
 msgid "C&onfirm password:"
 msgstr "וו&דא סיסמה:"
 
-#: clientgui/AccountInfoPage.cpp:453
+#: AccountInfoPage.cpp:453
 #, c-format
 msgid "Are you already running %s?"
 msgstr "האם אתה משתמש כבר ב-%s?"
 
-#: clientgui/AccountInfoPage.cpp:482
+#: AccountInfoPage.cpp:482
 msgid "&Username:"
 msgstr "&משתמש:"
 
-#: clientgui/AccountInfoPage.cpp:511
-msgid "&Email address or LDAP ID:"
-msgstr ""
-
-#: clientgui/AccountInfoPage.cpp:515
+#: AccountInfoPage.cpp:508
 msgid "&Email address:"
 msgstr "&כתובת דוא\"ל:"
 
-#: clientgui/AccountInfoPage.cpp:523
+#: AccountInfoPage.cpp:515
 #, c-format
 msgid "minimum length %d"
 msgstr "אורך מינימלי %d"
 
-#: clientgui/AccountInfoPage.cpp:530
+#: AccountInfoPage.cpp:522
 msgid "Forgot your password?"
 msgstr "שכחת את הסיסמה?"
 
-#: clientgui/AccountInfoPage.cpp:537
+#: AccountInfoPage.cpp:529
 msgid ""
 "If you have not yet registered with this account manager,\n"
 "please do so before proceeding.  Click on the link below\n"
@@ -126,45 +123,46 @@ msgstr ""
 "עשה זאת לפני שתמשיך. לחץ על הקישור למטה\n"
 "בכדי להירשם או לשחזר סיסמה שנשכחה."
 
-#: clientgui/AccountInfoPage.cpp:540
+#: AccountInfoPage.cpp:532
 msgid "Account manager web site"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:582
+#: AccountInfoPage.cpp:574 WelcomePage.cpp:348
 msgid "Add project"
 msgstr "הוסף פרוייקט"
 
-#: clientgui/AccountInfoPage.cpp:584
+#: AccountInfoPage.cpp:576
 msgid "Update account manager"
 msgstr "עדכן מנהל חשבונות"
 
-#: clientgui/AccountInfoPage.cpp:586
+#: AccountInfoPage.cpp:578 WelcomePage.cpp:307 WelcomePage.cpp:321
 msgid "Use account manager"
 msgstr "השתמש במנהל חשבונות"
 
-#: clientgui/AccountInfoPage.cpp:593
+#: AccountInfoPage.cpp:585
 msgid "Please enter a user name."
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:595
+#: AccountInfoPage.cpp:587
 #, fuzzy
 msgid "Please enter an email address."
 msgstr "אנא הזן כתובת דוא\"ל"
 
-#: clientgui/AccountInfoPage.cpp:605
+#: AccountInfoPage.cpp:597
 #, c-format
 msgid "Please enter a password of at least %d characters."
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:615
-msgid "The password and confirmation password do not match. Please type them again."
+#: AccountInfoPage.cpp:607
+msgid ""
+"The password and confirmation password do not match. Please type them again."
 msgstr "הסיסמה וסיסמת האימות אינן תואמות. אנא הזן אותן מחדש."
 
-#: clientgui/AccountManagerInfoPage.cpp:272
+#: AccountManagerInfoPage.cpp:272
 msgid "Choose an account manager"
 msgstr "בחר מנהל חשבונות"
 
-#: clientgui/AccountManagerInfoPage.cpp:275
+#: AccountManagerInfoPage.cpp:275
 msgid ""
 "To choose an account manager, click its name or \n"
 "type its URL below."
@@ -172,396 +170,379 @@ msgstr ""
 "כדי לבחור מנהל חשבונות, לחץ על השם שלו או \n"
 "רשום את כתובת האינטרנט שלו למטה. "
 
-#: clientgui/AccountManagerInfoPage.cpp:279
+#: AccountManagerInfoPage.cpp:279
 msgid "Account manager details:"
 msgstr ""
 
-#: clientgui/AccountManagerInfoPage.cpp:283
+#: AccountManagerInfoPage.cpp:283
 msgid "Account manager &URL:"
 msgstr ""
 
-#: clientgui/AccountManagerInfoPage.cpp:287
+#: AccountManagerInfoPage.cpp:287
 msgid "Open web page"
 msgstr ""
 
-#: clientgui/AccountManagerInfoPage.cpp:290
+#: AccountManagerInfoPage.cpp:290
 msgid "Visit this account manager's web site"
 msgstr ""
 
-#: clientgui/AccountManagerProcessingPage.cpp:186
-#: clientgui/AccountManagerPropertiesPage.cpp:192
+#: AccountManagerProcessingPage.cpp:187 AccountManagerPropertiesPage.cpp:193
 #, c-format
 msgid "Communicating with %s."
 msgstr "מתקשר עם %s."
 
-#: clientgui/AccountManagerProcessingPage.cpp:193
-#: clientgui/AccountManagerPropertiesPage.cpp:199
+#: AccountManagerProcessingPage.cpp:194 AccountManagerPropertiesPage.cpp:200
 msgid "Communicating with server."
 msgstr "מתקשר עם השרת."
 
-#: clientgui/AccountManagerProcessingPage.cpp:198
-#: clientgui/AccountManagerPropertiesPage.cpp:204
+#: AccountManagerProcessingPage.cpp:199 AccountManagerPropertiesPage.cpp:205
 msgid "Please wait..."
 msgstr "אנא המתן..."
 
-#: clientgui/AccountManagerProcessingPage.cpp:325
+#: AccountManagerProcessingPage.cpp:326
 msgid "An internal server error has occurred.\n"
 msgstr "התרחשה שגיאת שרת פנימי.\n"
 
-#: clientgui/AdvancedFrame.cpp:96
+#: AdvancedFrame.cpp:95
 msgid "Connected"
 msgstr "מחובר"
 
-#: clientgui/AdvancedFrame.cpp:104
+#: AdvancedFrame.cpp:103
 msgid "Disconnected"
 msgstr "מנותק"
 
-#: clientgui/AdvancedFrame.cpp:318
+#: AdvancedFrame.cpp:322 sg_BoincSimpleFrame.cpp:119
 #, c-format
 msgid "Close the %s window"
 msgstr "סגור את חלון %s"
 
-#: clientgui/AdvancedFrame.cpp:321
+#: AdvancedFrame.cpp:325 sg_BoincSimpleFrame.cpp:122
 msgid "&Close Window"
 msgstr "&סגור חלון"
 
-#: clientgui/AdvancedFrame.cpp:332
-#: clientgui/AdvancedFrame.cpp:339
-#: clientgui/AdvancedFrame.cpp:346
+#: AdvancedFrame.cpp:336 AdvancedFrame.cpp:343 AdvancedFrame.cpp:350
 #, c-format
 msgid "Exit %s"
 msgstr "צא מ-%s"
 
-#: clientgui/AdvancedFrame.cpp:359
-msgid "Preferences..."
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:368
+#: AdvancedFrame.cpp:371
 msgid "&Notices\tCtrl+Shift+N"
 msgstr "&התראות\tCtrl+Shift+N"
 
-#: clientgui/AdvancedFrame.cpp:369
+#: AdvancedFrame.cpp:372
 msgid "Display notices"
 msgstr "הצג התראות"
 
-#: clientgui/AdvancedFrame.cpp:374
+#: AdvancedFrame.cpp:377
 msgid "&Projects\tCtrl+Shift+P"
 msgstr "&פרוייקטים\tCtrl+Shift+P"
 
-#: clientgui/AdvancedFrame.cpp:375
+#: AdvancedFrame.cpp:378
 msgid "Display projects"
 msgstr "הצג פרוייקטים"
 
-#: clientgui/AdvancedFrame.cpp:380
+#: AdvancedFrame.cpp:383
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr "&משימות\t Ctrl+Shift+T"
 
-#: clientgui/AdvancedFrame.cpp:381
+#: AdvancedFrame.cpp:384
 msgid "Display tasks"
 msgstr "הצג משימות"
 
-#: clientgui/AdvancedFrame.cpp:386
+#: AdvancedFrame.cpp:389
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr "ה&עברות\tCtrl+Shift+X"
 
-#: clientgui/AdvancedFrame.cpp:387
+#: AdvancedFrame.cpp:390
 msgid "Display transfers"
 msgstr "הצג העברות"
 
-#: clientgui/AdvancedFrame.cpp:392
+#: AdvancedFrame.cpp:395
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "&סטטיסטיקות\tCtrl+Shift+S"
 
-#: clientgui/AdvancedFrame.cpp:393
+#: AdvancedFrame.cpp:396
 msgid "Display statistics"
 msgstr "הצג סטטיסטיקות"
 
-#: clientgui/AdvancedFrame.cpp:398
+#: AdvancedFrame.cpp:401
 msgid "&Disk usage\tCtrl+Shift+D"
 msgstr "&ניצול דיסק\tCtrl+Shift+D"
 
-#: clientgui/AdvancedFrame.cpp:399
+#: AdvancedFrame.cpp:402
 msgid "Display disk usage"
 msgstr "הצג ניצול דיסק"
 
-#: clientgui/AdvancedFrame.cpp:406
+#: AdvancedFrame.cpp:409
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr "&תצוגה פשוטה...\tCtrl+Shift+V"
 
-#: clientgui/AdvancedFrame.cpp:407
+#: AdvancedFrame.cpp:410
 msgid "Display the simple graphical interface."
 msgstr "הצג ממשק גרפי פשוט."
 
-#: clientgui/AdvancedFrame.cpp:421
+#: AdvancedFrame.cpp:424
 msgid "&Add project or account manager..."
 msgstr "&הוסף פרוייקט או מנהל חשבונות..."
 
-#: clientgui/AdvancedFrame.cpp:422
+#: AdvancedFrame.cpp:425 sg_ProjectPanel.cpp:76
 msgid "Volunteer for any or all of 30+ projects in many areas of science"
 msgstr "התנדב לאחד מלמעלה מ-30 פרוייקטים, או יותר, בתחומי מדע שונים"
 
-#: clientgui/AdvancedFrame.cpp:426
+#: AdvancedFrame.cpp:429
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "&התסנכן עם %s"
 
-#: clientgui/AdvancedFrame.cpp:430
+#: AdvancedFrame.cpp:433
 #, c-format
 msgid "Get current settings from %s"
 msgstr "קבל הגדרות נוכחיות מ-%s"
 
-#: clientgui/AdvancedFrame.cpp:440
+#: AdvancedFrame.cpp:443
 msgid "&Add project..."
 msgstr "&הוסף פרוייקט..."
 
-#: clientgui/AdvancedFrame.cpp:441
+#: AdvancedFrame.cpp:444
 msgid "Add a project"
 msgstr "הוסף פרוייקט"
 
-#: clientgui/AdvancedFrame.cpp:444
+#: AdvancedFrame.cpp:447
 #, c-format
 msgid "S&top using %s..."
 msgstr "&הפסק שימוש ב-%s..."
 
-#: clientgui/AdvancedFrame.cpp:450
+#: AdvancedFrame.cpp:453
 msgid "Remove this computer from account manager control."
 msgstr "הסר מחשב משליטת מנהל חשבונות."
 
-#: clientgui/AdvancedFrame.cpp:455
+#: AdvancedFrame.cpp:458 sg_BoincSimpleFrame.cpp:178
 msgid "&Options..."
 msgstr "&אפשרויות..."
 
-#: clientgui/AdvancedFrame.cpp:456
+#: AdvancedFrame.cpp:459 sg_BoincSimpleFrame.cpp:179
 msgid "Configure display options and proxy settings"
 msgstr "הגדר אפשרויות תצוגה ושרת פרוקסי"
 
-#: clientgui/AdvancedFrame.cpp:460
+#: AdvancedFrame.cpp:463 sg_BoincSimpleFrame.cpp:172
 msgid "Computing &preferences..."
 msgstr "&העדפות חישוב..."
 
-#: clientgui/AdvancedFrame.cpp:461
+#: AdvancedFrame.cpp:464 sg_BoincSimpleFrame.cpp:173
 msgid "Configure computing preferences"
 msgstr "הגדר העדפות חישוב"
 
-#: clientgui/AdvancedFrame.cpp:469
+#: AdvancedFrame.cpp:472
 msgid "&Run always"
 msgstr "&הרץ תמיד"
 
-#: clientgui/AdvancedFrame.cpp:470
+#: AdvancedFrame.cpp:473
 msgid "Allow work regardless of preferences"
 msgstr "אפשר עבודה ללא קשר להעדפות"
 
-#: clientgui/AdvancedFrame.cpp:474
+#: AdvancedFrame.cpp:477
 msgid "Run based on &preferences"
 msgstr "ה&רץ לפי העדפות"
 
-#: clientgui/AdvancedFrame.cpp:475
+#: AdvancedFrame.cpp:478
 msgid "Allow work according to preferences"
 msgstr "אפשר עבודה בהתאם להעדפות"
 
-#: clientgui/AdvancedFrame.cpp:479
+#: AdvancedFrame.cpp:482
 msgid "&Suspend"
 msgstr "ה&שהה"
 
-#: clientgui/AdvancedFrame.cpp:480
+#: AdvancedFrame.cpp:483
 msgid "Stop work regardless of preferences"
 msgstr "עצור עבודה ללא קשר להעדפות"
 
-#: clientgui/AdvancedFrame.cpp:505
+#: AdvancedFrame.cpp:508
 msgid "Use GPU always"
 msgstr "השתמש תמיד במעבד הגרפי"
 
-#: clientgui/AdvancedFrame.cpp:506
+#: AdvancedFrame.cpp:509
 msgid "Allow GPU work regardless of preferences"
 msgstr "אפשר עבודת מעבד גרפי ללא קשר להעדפות"
 
-#: clientgui/AdvancedFrame.cpp:510
+#: AdvancedFrame.cpp:513
 msgid "Use GPU based on preferences"
 msgstr "השתמש במעבד הגרפי בהתאם להעדפות"
 
-#: clientgui/AdvancedFrame.cpp:511
+#: AdvancedFrame.cpp:514
 msgid "Allow GPU work according to preferences"
 msgstr "אפשר עבודת מעבד גרפי בהתאם להעדפות"
 
-#: clientgui/AdvancedFrame.cpp:515
+#: AdvancedFrame.cpp:518
 msgid "Suspend GPU"
 msgstr "השהה מעבד גרפי"
 
-#: clientgui/AdvancedFrame.cpp:516
+#: AdvancedFrame.cpp:519
 msgid "Stop GPU work regardless of preferences"
 msgstr "עצור עבודת מעבד גרפי ללא קשר להעדפות"
 
-#: clientgui/AdvancedFrame.cpp:540
+#: AdvancedFrame.cpp:543
 msgid "Network activity always available"
 msgstr "פעילות רשת תמיד זמינה"
 
-#: clientgui/AdvancedFrame.cpp:541
+#: AdvancedFrame.cpp:544
 msgid "Allow network activity regardless of preferences"
 msgstr "אפשר פעילות רשת ללא קשר להגדרות"
 
-#: clientgui/AdvancedFrame.cpp:545
+#: AdvancedFrame.cpp:548
 msgid "Network activity based on preferences"
 msgstr "פעילות רשת בהתאם להעדפות"
 
-#: clientgui/AdvancedFrame.cpp:546
+#: AdvancedFrame.cpp:549
 msgid "Allow network activity according to preferences"
 msgstr "אפשר פעילות רשת בהתאם להעדפות"
 
-#: clientgui/AdvancedFrame.cpp:550
+#: AdvancedFrame.cpp:553
 msgid "Network activity suspended"
 msgstr "פעילות רשת מושהית"
 
-#: clientgui/AdvancedFrame.cpp:551
+#: AdvancedFrame.cpp:554
 msgid "Stop BOINC network activity"
 msgstr "עצור פעילות רשת של BOINC"
 
-#: clientgui/AdvancedFrame.cpp:561
+#: AdvancedFrame.cpp:564
 #, c-format
 msgid "Connect to another computer running %s"
 msgstr "התחבר למחשב אחר המריץ %s"
 
-#: clientgui/AdvancedFrame.cpp:566
+#: AdvancedFrame.cpp:569
 msgid "Select computer..."
 msgstr "בחר מחשב..."
 
-#: clientgui/AdvancedFrame.cpp:571
+#: AdvancedFrame.cpp:574
 msgid "Shut down connected client..."
 msgstr "כבה מחשב מחובר..."
 
-#: clientgui/AdvancedFrame.cpp:572
+#: AdvancedFrame.cpp:575
 msgid "Shut down the currently connected client"
 msgstr "כבה את המחשב המחובר כעת"
 
-#: clientgui/AdvancedFrame.cpp:576
+#: AdvancedFrame.cpp:579
 msgid "Run CPU &benchmarks"
 msgstr "הרץ &הערכת ביצועים למעבד הגרפי"
 
-#: clientgui/AdvancedFrame.cpp:577
+#: AdvancedFrame.cpp:580
 msgid "Runs BOINC CPU benchmarks"
 msgstr "מריץ הערכת ביצועי מעבד של BOINC"
 
-#: clientgui/AdvancedFrame.cpp:581
+#: AdvancedFrame.cpp:584
 msgid "Do network communication"
 msgstr "בצע התקשרות לרשת"
 
-#: clientgui/AdvancedFrame.cpp:582
+#: AdvancedFrame.cpp:585
 msgid "Do all pending network communication"
 msgstr "בצע את כל ההתקשרויות הממתינות לרשת"
 
 # 94%
-#: clientgui/AdvancedFrame.cpp:586
+#: AdvancedFrame.cpp:589
 #, fuzzy
 msgid "Read config files"
 msgstr "קרא קובץ תצורה"
 
-#: clientgui/AdvancedFrame.cpp:587
+#: AdvancedFrame.cpp:590
 msgid "Read configuration info from cc_config.xml and any app_config.xml files"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:591
+#: AdvancedFrame.cpp:594
 msgid "Read local prefs file"
 msgstr "קרא קובץ העדפות מקומי"
 
-#: clientgui/AdvancedFrame.cpp:592
+#: AdvancedFrame.cpp:595
 msgid "Read preferences from global_prefs_override.xml."
 msgstr "קרא נתוני העדפות מ-global_prefs_override.xml."
 
-#: clientgui/AdvancedFrame.cpp:597
+#: AdvancedFrame.cpp:600
 #, c-format
 msgid "Launch another instance of %s..."
 msgstr "הרץ עותק נוסף של %s"
 
-#: clientgui/AdvancedFrame.cpp:601
+#: AdvancedFrame.cpp:604
 #, c-format
 msgid "Launch another %s"
 msgstr "הפעל %s נוסף"
 
-#: clientgui/AdvancedFrame.cpp:611
+#: AdvancedFrame.cpp:614
 msgid "Event Log...\tCtrl+Shift+E"
 msgstr "יומן אירועים...\tCtrl+Shift+E"
 
-#: clientgui/AdvancedFrame.cpp:612
+#: AdvancedFrame.cpp:615
 msgid "Display diagnostic messages."
 msgstr "הצג הודעות אבחון"
 
-#: clientgui/AdvancedFrame.cpp:616
-msgid "Event Log Diagnostic Flags...\tCtrl+Shift+F"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:617
-msgid "Enable or disable various diagnostic messages"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:626
+#: AdvancedFrame.cpp:625 sg_BoincSimpleFrame.cpp:188
 #, c-format
 msgid "%s &help"
 msgstr "&עזרה של %s"
 
-#: clientgui/AdvancedFrame.cpp:632
+#: AdvancedFrame.cpp:631 sg_BoincSimpleFrame.cpp:194
 #, c-format
 msgid "Show information about %s"
 msgstr "הצג מידע אודות %s"
 
-#: clientgui/AdvancedFrame.cpp:644
+#: AdvancedFrame.cpp:643
 #, c-format
 msgid "&%s help"
 msgstr "ע&זרה של %s"
 
-#: clientgui/AdvancedFrame.cpp:650
+#: AdvancedFrame.cpp:649 sg_BoincSimpleFrame.cpp:212
 #, c-format
 msgid "Show information about the %s"
 msgstr "הצג מידע אודות ה-%s"
 
-#: clientgui/AdvancedFrame.cpp:662
+#: AdvancedFrame.cpp:661 sg_BoincSimpleFrame.cpp:224
 #, c-format
 msgid "%s &web site"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:668
+#: AdvancedFrame.cpp:667 sg_BoincSimpleFrame.cpp:230
 #, c-format
 msgid "Show information about BOINC and %s"
 msgstr "הצג מידע אודות BOINC ו-%s"
 
-#: clientgui/AdvancedFrame.cpp:680
-#: clientgui/BOINCTaskBar.cpp:544
+#: AdvancedFrame.cpp:679 BOINCTaskBar.cpp:530 sg_BoincSimpleFrame.cpp:242
 #, c-format
 msgid "&About %s..."
 msgstr "&אודות %s..."
 
-#: clientgui/AdvancedFrame.cpp:686
+#: AdvancedFrame.cpp:685 sg_BoincSimpleFrame.cpp:248
 msgid "Licensing and copyright information."
 msgstr "מידע על רשיון וזכויות יוצרים."
 
-#: clientgui/AdvancedFrame.cpp:693
+#: AdvancedFrame.cpp:692 sg_BoincSimpleFrame.cpp:255
 msgid "&File"
 msgstr "&קובץ"
 
-#: clientgui/AdvancedFrame.cpp:697
+#: AdvancedFrame.cpp:696 sg_BoincSimpleFrame.cpp:259
 msgid "&View"
 msgstr "&תצוגה"
 
-#: clientgui/AdvancedFrame.cpp:701
+#: AdvancedFrame.cpp:700 sg_BoincSimpleFrame.cpp:263
 msgid "&Tools"
 msgstr "&כלים"
 
-#: clientgui/AdvancedFrame.cpp:705
+#: AdvancedFrame.cpp:704
 msgid "&Activity"
 msgstr "&פעילות"
 
-#: clientgui/AdvancedFrame.cpp:709
+#: AdvancedFrame.cpp:708
 msgid "A&dvanced"
 msgstr "&מתקדם"
 
-#: clientgui/AdvancedFrame.cpp:713
+#: AdvancedFrame.cpp:712 DlgEventLog.cpp:332 sg_BoincSimpleFrame.cpp:267
+#: wizardex.cpp:374 wizardex.cpp:381
 msgid "&Help"
 msgstr "&עזרה"
 
-#: clientgui/AdvancedFrame.cpp:1185
+#: AdvancedFrame.cpp:1199
 #, c-format
 msgid "%s - Stop using %s"
 msgstr "%s - הפסק שימוש ב-%s"
 
-#: clientgui/AdvancedFrame.cpp:1190
+#: AdvancedFrame.cpp:1204
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -576,12 +557,12 @@ msgstr ""
 "\n"
 "האם אתה בטוח שברצונך להתנתק מ-%s?"
 
-#: clientgui/AdvancedFrame.cpp:1397
+#: AdvancedFrame.cpp:1401
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s - מכבה את הקליינט הנוכחי..."
 
-#: clientgui/AdvancedFrame.cpp:1406
+#: AdvancedFrame.cpp:1410
 #, c-format
 msgid ""
 "%s will shut down the current client\n"
@@ -590,36 +571,36 @@ msgstr ""
 "%s יסגור את הקליינט המחובר כרגע\n"
 "ויבקש ממך להתחבר למחשב מארח אחר."
 
-#: clientgui/AdvancedFrame.cpp:1806
+#: AdvancedFrame.cpp:1745 DlgAbout.cpp:119
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: clientgui/AdvancedFrame.cpp:1815
+#: AdvancedFrame.cpp:1754
 #, c-format
 msgid "%s has successfully added %s"
 msgstr "%s הוסיף בהצלחה את %s"
 
-#: clientgui/AdvancedFrame.cpp:1953
+#: AdvancedFrame.cpp:1893
 #, c-format
 msgid "%s - (%s)"
 msgstr "%s - (%s)"
 
-#: clientgui/AdvancedFrame.cpp:1957
+#: AdvancedFrame.cpp:1897
 #, c-format
 msgid "Connecting to %s"
 msgstr "מתחבר ל-%s"
 
-#: clientgui/AdvancedFrame.cpp:1960
+#: AdvancedFrame.cpp:1900
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "מחובר ל-%s (%s)"
 
-#: clientgui/AlreadyExistsPage.cpp:184
+#: AlreadyExistsPage.cpp:184
 msgid "Username already in use"
 msgstr "שם משתמש כבר בשימוש"
 
-#: clientgui/AlreadyExistsPage.cpp:187
+#: AlreadyExistsPage.cpp:187
 msgid ""
 "An account with that username already exists and has a\n"
 "different password than the one you entered.\n"
@@ -631,11 +612,11 @@ msgstr ""
 "\n"
 "אנא היכנס לאתר הפרוייקט ועקוב אחר ההוראות שם."
 
-#: clientgui/AlreadyExistsPage.cpp:191
+#: AlreadyExistsPage.cpp:191
 msgid "Email address already in use"
 msgstr "כתובת דוא\"ל כבר בשימוש"
 
-#: clientgui/AlreadyExistsPage.cpp:194
+#: AlreadyExistsPage.cpp:194
 msgid ""
 "An account with that email address already exists and has a\n"
 "different password than the one you entered.\n"
@@ -647,43 +628,45 @@ msgstr ""
 "\n"
 "אנא היכנס לאתר הפרוייקט ועקוב אחר ההוראות שם."
 
-#: clientgui/AsyncRPC.cpp:1031
+#: AsyncRPC.cpp:1031
 msgid "Communicating with BOINC client.  Please wait ..."
 msgstr "מתקשר עם קליינט BOINC. אנא המתן..."
 
-#: clientgui/AsyncRPC.cpp:1034
+#: AsyncRPC.cpp:1034
 #, c-format
 msgid "&Quit %s"
 msgstr "&הפסק %s"
 
-#: clientgui/AsyncRPC.cpp:1036
+#: AsyncRPC.cpp:1036
 #, c-format
 msgid "E&xit %s"
 msgstr "&צא מ-%s"
 
-#: clientgui/AsyncRPC.cpp:1040
+#: AsyncRPC.cpp:1040
 #, c-format
 msgid "%s - Communication"
 msgstr "%s - תיקשורת"
 
-#: clientgui/AsyncRPC.cpp:1056
+#: AsyncRPC.cpp:1056 DlgAdvPreferencesBase.cpp:107 sg_DlgPreferences.cpp:433
 msgid "Cancel"
 msgstr "ביטול"
 
-#: clientgui/BOINCBaseFrame.cpp:504
+#: BOINCBaseFrame.cpp:505
 #, c-format
 msgid "%s - Connection Error"
 msgstr "%s - שגיאת התחברות"
 
-#: clientgui/BOINCBaseFrame.cpp:513
+#: BOINCBaseFrame.cpp:514
 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 ""
 "כרגע אין לך הרשאות לנהל את הקליינט.\n"
-"אנא צור קשר עם מנהל המערכת שלך על מנת להוסיף אותך לקבוצת המשתמשים המקומית של 'boinc_users'."
+"אנא צור קשר עם מנהל המערכת שלך על מנת להוסיף אותך לקבוצת המשתמשים המקומית של "
+"'boinc_users'."
 
-#: clientgui/BOINCBaseFrame.cpp:522
+#: BOINCBaseFrame.cpp:523
 msgid ""
 "Authorization failed connecting to running client.\n"
 "Make sure you start this program in the same directory as the client."
@@ -691,20 +674,20 @@ msgstr ""
 "האישור כשל בהתחברות לקליינט רץ.\n"
 "וודא שאתה מפעיל את התוכנה באותה תיקייה כמו של הקליינט."
 
-#: clientgui/BOINCBaseFrame.cpp:524
+#: BOINCBaseFrame.cpp:525
 msgid "Authorization failed connecting to running client."
 msgstr "האישור כשל בהתחברות לקליינט רץ."
 
-#: clientgui/BOINCBaseFrame.cpp:532
+#: BOINCBaseFrame.cpp:533
 msgid "The password you have provided is incorrect, please try again."
 msgstr "הסיסמה שהזנת איננה נכונה, אנא נסה מחדש..."
 
-#: clientgui/BOINCBaseFrame.cpp:576
+#: BOINCBaseFrame.cpp:577
 #, c-format
 msgid "%s - Connection Failed"
 msgstr "%s - כשל בהתחברות"
 
-#: clientgui/BOINCBaseFrame.cpp:585
+#: BOINCBaseFrame.cpp:586
 #, c-format
 msgid ""
 "%s is not able to connect to a %s client.\n"
@@ -713,21 +696,22 @@ msgstr ""
 "%s אינו מצליח להתחבר לקליינט %s.\n"
 "תרצה לנסות להתחבר שוב?"
 
-#: clientgui/BOINCBaseFrame.cpp:621
+#: BOINCBaseFrame.cpp:622
 #, c-format
 msgid "%s - Daemon Start Failed"
 msgstr "%s - השרת נכשל בהתחלת התהליך"
 
-#: clientgui/BOINCBaseFrame.cpp:631
+#: BOINCBaseFrame.cpp:632
 #, 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 ""
 "%s לא מצליח להפעיל את קליינט %s.\n"
 "אנא הרץ את לוח הבקרה->כלי ניהול->שירותים והפעל את שירות BOINC."
 
-#: clientgui/BOINCBaseFrame.cpp:637
+#: BOINCBaseFrame.cpp:638
 #, c-format
 msgid ""
 "%s is not able to start a %s client.\n"
@@ -736,33 +720,34 @@ msgstr ""
 "%s לא הצליח להפעיל את קליינט %s.\n"
 "אנא נסה להפעיל את התהליך מחדש."
 
-#: clientgui/BOINCBaseFrame.cpp:688
+#: BOINCBaseFrame.cpp:689
 #, c-format
 msgid "%s - Connection Status"
 msgstr "%s - מצב החיבור"
 
-#: clientgui/BOINCBaseFrame.cpp:699
+#: BOINCBaseFrame.cpp:700
 #, 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 ""
 "%s אינו מחובר לקליינט %s.\n"
 "השתמש באפשרות בתפריט 'מתקדם/בחר מחשב...' כדי להתחבר לקליינט %s.\n"
 "על מנת להתחבר למחשב המקומי, השתמש בשם 'localhost' כשם המחשב."
 
-#: clientgui/BOINCBaseView.cpp:752
+#: BOINCBaseView.cpp:779
 #, fuzzy
 msgid "Project web pages"
 msgstr "אתרי הפרוייקט"
 
-#: clientgui/BOINCClientManager.cpp:573
+#: BOINCClientManager.cpp:575
 #, c-format
 msgid "%s - Unexpected Exit"
 msgstr "%s - יציאה לא צפוייה"
 
-#: clientgui/BOINCClientManager.cpp:583
+#: BOINCClientManager.cpp:585
 #, c-format
 msgid ""
 "The %s client has exited unexpectedly 3 times within the last %d minutes.\n"
@@ -771,12 +756,12 @@ msgstr ""
 "קליינט ה-%s ביצע יציאה לא צפויה 3 פעמים במשך %d הדקות האחרונות.\n"
 "תרצה להתחיל אותו מחדש?"
 
-#: clientgui/BOINCDialupManager.cpp:61
+#: BOINCDialupManager.cpp:61
 #, c-format
 msgid "%s - Network Status"
 msgstr "%s - מצב הרשת"
 
-#: clientgui/BOINCDialupManager.cpp:241
+#: BOINCDialupManager.cpp:241
 #, c-format
 msgid ""
 "%s needs to connect to the Internet.\n"
@@ -785,22 +770,22 @@ msgstr ""
 "%s צריך להתחבר לאינטרנט.\n"
 "האם לאפשר לו כעת?"
 
-#: clientgui/BOINCDialupManager.cpp:254
+#: BOINCDialupManager.cpp:254
 #, c-format
 msgid "%s is connecting to the Internet."
 msgstr "%s מתחבר לאינטרנט."
 
-#: clientgui/BOINCDialupManager.cpp:303
+#: BOINCDialupManager.cpp:303
 #, c-format
 msgid "%s has successfully connected to the Internet."
 msgstr "%s התחבר לאינטרנט בהצלחה."
 
-#: clientgui/BOINCDialupManager.cpp:331
+#: BOINCDialupManager.cpp:331
 #, c-format
 msgid "%s failed to connect to the Internet."
 msgstr "%s כשל בהתחברות לאינטרנט."
 
-#: clientgui/BOINCDialupManager.cpp:372
+#: BOINCDialupManager.cpp:372
 #, c-format
 msgid ""
 "%s has detected it is now connected to the Internet.\n"
@@ -809,17 +794,17 @@ msgstr ""
 "%s זיהה שהוא מחובר לאינטרנט.\n"
 "מעדכן את כל הפרוייקטים ומנסה לבצע העברות מחדש."
 
-#: clientgui/BOINCDialupManager.cpp:417
+#: BOINCDialupManager.cpp:417
 #, c-format
 msgid "%s has successfully disconnected from the Internet."
 msgstr "%s התנתק מהאינטרנט בהצלחה."
 
-#: clientgui/BOINCDialupManager.cpp:433
+#: BOINCDialupManager.cpp:433
 #, c-format
 msgid "%s failed to disconnected from the Internet."
 msgstr "%s כשל בהתנתקות מהאינטרנט."
 
-#: clientgui/BOINCGUIApp.cpp:595
+#: BOINCGUIApp.cpp:339
 #, c-format
 msgid ""
 "You currently are not authorized to manage the client.\n"
@@ -840,7 +825,7 @@ msgstr ""
 "  -צור קשר עם מנהל הרשת על מנת להוסיף אותך לקבוצת\n"
 "     המשתמשים 'boinc_master'."
 
-#: clientgui/BOINCGUIApp.cpp:601
+#: BOINCGUIApp.cpp:345
 #, c-format
 msgid ""
 "%s ownership or permissions are not set properly; please reinstall %s.\n"
@@ -849,16 +834,17 @@ msgstr ""
 "הבעלות או ההרשאות של %s אינן מוגדרות כראוי; אנא התקן מחדש את %s.\n"
 "(קוד שגיאה: %d"
 
-#: clientgui/BOINCGUIApp.cpp:607
+#: BOINCGUIApp.cpp:351
 #, fuzzy
 msgid " at "
 msgstr " ב "
 
-#: clientgui/BOINCGUIApp.cpp:610
+#: BOINCGUIApp.cpp:354 MainDocument.cpp:2484 MainDocument.cpp:2534
+#: MainDocument.cpp:2554 ViewTransfers.cpp:803
 msgid ")"
 msgstr ")"
 
-#: clientgui/BOINCGUIApp.cpp:640
+#: BOINCGUIApp.cpp:384
 msgid ""
 "A reboot is required in order for BOINC to run properly.\n"
 "Please reboot your computer and try again."
@@ -866,189 +852,185 @@ msgstr ""
 "איתחול נחוץ כדי ש-BOINC ירוץ בצורה תקינה.\n"
 "אנא אתחל את המחשב ונסה שוב לאחר מכן."
 
-#: clientgui/BOINCGUIApp.cpp:641
+#: BOINCGUIApp.cpp:385 DlgAbout.cpp:153
 msgid "BOINC Manager"
 msgstr "BOINC Manager"
 
-#: clientgui/BOINCGUIApp.cpp:902
+#: BOINCGUIApp.cpp:572
 msgid "BOINC Manager was started by the operating system automatically"
 msgstr "BOINC Manager הופעל אוטומטית על ידי המערכת הפעלה"
 
-#: clientgui/BOINCGUIApp.cpp:904
+#: BOINCGUIApp.cpp:574
 msgid "Startup BOINC so only the system tray icon is visible"
 msgstr "הפעל את BOINC כך שניתן יהיה לראות רק את הסמל בשורת המשימות."
 
-#: clientgui/BOINCGUIApp.cpp:906
+#: BOINCGUIApp.cpp:576
 msgid "Directory containing the BOINC Client executable"
 msgstr "התיקייה המכילה את קבצי ההפעלה של קליינט ה-BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:907
+#: BOINCGUIApp.cpp:577
 msgid "BOINC data directory"
 msgstr "תיקיית קבצי המידע של BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:909
+#: BOINCGUIApp.cpp:579
 msgid "Host name or IP address"
 msgstr "שם מחשב או כתובת IP"
 
-#: clientgui/BOINCGUIApp.cpp:910
+#: BOINCGUIApp.cpp:580
 msgid "GUI RPC port number"
 msgstr "מספר הפורט של פרוצדורת קריאה מרוחקת לממשק משתמש גרפי"
 
-#: clientgui/BOINCGUIApp.cpp:911
+#: BOINCGUIApp.cpp:581
 msgid "Password"
 msgstr "סיסמה"
 
-#: clientgui/BOINCGUIApp.cpp:912
+#: BOINCGUIApp.cpp:582
 msgid "Startup BOINC with these optional arguments"
 msgstr "הפעל BOINC עם הגדרות אופציונליות אלו"
 
-#: clientgui/BOINCGUIApp.cpp:913
+#: BOINCGUIApp.cpp:583
 msgid "disable BOINC security users and permissions"
 msgstr "נטרל את משתמשי האבטחה וההרשאות של BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:914
+#: BOINCGUIApp.cpp:584
 msgid "set skin debugging mode to enable skin manager error messages"
 msgstr "הפעל מצב איתור שגיאות מראה בכדי לאפשר הודעות שגיאה ממנהל המראה"
 
-#: clientgui/BOINCGUIApp.cpp:915
+#: BOINCGUIApp.cpp:585
 msgid "multiple instances of BOINC Manager allowed"
 msgstr "ריבוי עותקי BOINC Manager מאושר"
 
-#: clientgui/BOINCGUIApp.cpp:917
+#: BOINCGUIApp.cpp:587
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:1164
+#: BOINCGUIApp.cpp:814
 msgid "(Automatic Detection)"
 msgstr "(זיהויי אוטומטי)"
 
-#: clientgui/BOINCGUIApp.cpp:1165
+#: BOINCGUIApp.cpp:815
 msgid "(Unknown)"
 msgstr "(לא ידוע)"
 
-#: clientgui/BOINCGUIApp.cpp:1166
+#: BOINCGUIApp.cpp:816
 msgid "(User Defined)"
 msgstr "(מוגדר ע\"י משתמש)"
 
-#: clientgui/BOINCTaskBar.cpp:522
+#: BOINCTaskBar.cpp:508
 #, c-format
 msgid "Open %s Web..."
 msgstr "פתח את אתר %s..."
 
-#: clientgui/BOINCTaskBar.cpp:529
+#: BOINCTaskBar.cpp:515
 #, c-format
 msgid "Open %s..."
 msgstr "פתח את %s..."
 
-#: clientgui/BOINCTaskBar.cpp:536
-#: clientgui/BOINCTaskBar.cpp:633
-#: clientgui/BOINCTaskBar.cpp:641
+#: BOINCTaskBar.cpp:522 BOINCTaskBar.cpp:619 BOINCTaskBar.cpp:627
 msgid "Snooze"
 msgstr "השהה עיבוד"
 
-#: clientgui/BOINCTaskBar.cpp:538
-#: clientgui/BOINCTaskBar.cpp:660
-#: clientgui/BOINCTaskBar.cpp:668
+#: BOINCTaskBar.cpp:524 BOINCTaskBar.cpp:646 BOINCTaskBar.cpp:654
 msgid "Snooze GPU"
 msgstr "השהה עיבוד מעבד גרפי"
 
-#: clientgui/BOINCTaskBar.cpp:556
+#: BOINCTaskBar.cpp:542
 msgid "E&xit"
 msgstr "י&ציאה"
 
-#: clientgui/BOINCTaskBar.cpp:626
+#: BOINCTaskBar.cpp:612 ViewProjects.cpp:718 ViewWork.cpp:795
+#: sg_BoincSimpleFrame.cpp:758 sg_ProjectCommandPopup.cpp:110
+#: sg_TaskCommandPopup.cpp:102
 msgid "Resume"
 msgstr "המשך"
 
-#: clientgui/BOINCTaskBar.cpp:653
+#: BOINCTaskBar.cpp:639
 #, fuzzy
 msgid "Resume GPU"
 msgstr "המשך שימוש  במעבד הגרפי"
 
-#: clientgui/BOINCTaskBar.cpp:727
+#: BOINCTaskBar.cpp:713
 msgid "Computing is enabled"
 msgstr "החישוב מאופשר"
 
-#: clientgui/BOINCTaskBar.cpp:731
+#: BOINCTaskBar.cpp:717
 msgid "Computing is suspended - "
 msgstr "החישוב מושהה - "
 
-#: clientgui/BOINCTaskBar.cpp:741
+#: BOINCTaskBar.cpp:727
 msgid "GPU computing is enabled"
 msgstr "חישובי מעבד גרפי מאופשרים"
 
-#: clientgui/BOINCTaskBar.cpp:744
+#: BOINCTaskBar.cpp:730
 msgid "GPU computing is suspended - "
 msgstr "חישובי מעבד גרפי מושהים - "
 
-#: clientgui/BOINCTaskBar.cpp:753
+#: BOINCTaskBar.cpp:739
 msgid "Network is enabled"
 msgstr "רשת מופעלת"
 
-#: clientgui/BOINCTaskBar.cpp:756
+#: BOINCTaskBar.cpp:742
 msgid "Network is suspended - "
 msgstr "רשת מושהית"
 
-#: clientgui/BOINCTaskBar.cpp:764
+#: BOINCTaskBar.cpp:750
 msgid "Reconnecting to client."
 msgstr "מתחבר מחדש לקליינט."
 
-#: clientgui/BOINCTaskBar.cpp:766
+#: BOINCTaskBar.cpp:752
 msgid "Not connected to a client."
 msgstr "לא מחובר לקליינט."
 
-#: clientgui/BOINCTaskBar.cpp:819
+#: BOINCTaskBar.cpp:805
 #, c-format
 msgid "%s Notices"
 msgstr "התראות %s"
 
-#: clientgui/BOINCTaskBar.cpp:825
+#: BOINCTaskBar.cpp:811
 msgid "There are new notices - click to view."
 msgstr "קיימות התראות חדשות - לחץ לצפייה."
 
-#: clientgui/CompletionErrorPage.cpp:199
+#: CompletionErrorPage.cpp:199
 msgid "Failed to add project"
 msgstr "הוספת הפרוייקט נכשלה"
 
-#: clientgui/CompletionErrorPage.cpp:204
+#: CompletionErrorPage.cpp:204
 msgid "Failed to update account manager"
 msgstr "נכשל בעדכון מנהל חשבונות"
 
-#: clientgui/CompletionErrorPage.cpp:208
+#: CompletionErrorPage.cpp:208
 msgid "Failed to remove account manager"
 msgstr "נכשל בהסרת מנהל חשבונות"
 
-#: clientgui/CompletionErrorPage.cpp:212
+#: CompletionErrorPage.cpp:212
 msgid "Failed to add account manager"
 msgstr "כשל בהוספת מנהל חשבונות"
 
-#: clientgui/CompletionErrorPage.cpp:221
+#: CompletionErrorPage.cpp:221
 msgid ""
 "Please try again later.\n"
 "\n"
 "Click Finish to close."
 msgstr ""
 
-#: clientgui/CompletionErrorPage.cpp:225
-#: clientgui/CompletionPage.cpp:222
-#: clientgui/CompletionPage.cpp:242
-#: clientgui/CompletionPage.cpp:273
+#: CompletionErrorPage.cpp:225 CompletionPage.cpp:222 CompletionPage.cpp:242
+#: CompletionPage.cpp:273
 msgid "Click Finish to close."
 msgstr "לחץ סיום כדי לסגור."
 
-#: clientgui/CompletionErrorPage.cpp:234
+#: CompletionErrorPage.cpp:234
 msgid "Messages from server:"
 msgstr "הודעות משרת:"
 
-#: clientgui/CompletionPage.cpp:207
+#: CompletionPage.cpp:207
 msgid "Project added"
 msgstr "פרוייקט הוסף"
 
-#: clientgui/CompletionPage.cpp:213
+#: CompletionPage.cpp:213
 msgid "This project has been successfully added."
 msgstr "פרוייקט זה הוסף בהצלחה."
 
-#: clientgui/CompletionPage.cpp:218
+#: 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."
@@ -1056,126 +1038,125 @@ msgstr ""
 "כשתלחץ 'סיום', דפדפן האינטרנט שלך יעבור לדף בו\n"
 "תוכל להגדיר את שם המשתמש שלך והעדפות."
 
-#: clientgui/CompletionPage.cpp:232
+#: CompletionPage.cpp:232
 #, c-format
 msgid "Update from %s completed."
 msgstr "עדכון מ-%s הושלם."
 
-#: clientgui/CompletionPage.cpp:236
+#: CompletionPage.cpp:236
 msgid "Update completed."
 msgstr "עדכון הושלם."
 
-#: clientgui/CompletionPage.cpp:247
+#: CompletionPage.cpp:247
 msgid "Now using account manager"
 msgstr "משתמש כעת במנהל חשבונות"
 
-#: clientgui/CompletionPage.cpp:252
+#: CompletionPage.cpp:252
 #, c-format
 msgid "Welcome to %s!"
 msgstr "ברוך הבא ל-%s!"
 
-#: clientgui/CompletionPage.cpp:263
+#: CompletionPage.cpp:263
 #, c-format
 msgid "You are now using %s to manage accounts."
 msgstr "התחלת להשתמש ב-%s לניהול חשבונות."
 
-#: clientgui/CompletionPage.cpp:267
+#: CompletionPage.cpp:267
 msgid "You are now using this account manager."
 msgstr "אתה משתמש כעת במנהל חשבונות זה."
 
-#: clientgui/DlgAbout.cpp:113
+#: DlgAbout.cpp:113 mac/Mac_GUI.cpp:96
 #, c-format
 msgid "About %s"
 msgstr "אודות %s"
 
-#: clientgui/DlgAbout.cpp:172
+#: DlgAbout.cpp:172
 msgid "Version:"
 msgstr "גרסה:"
 
-#: clientgui/DlgAbout.cpp:180
+#: DlgAbout.cpp:180
 msgid "wxWidgets Version:"
 msgstr "גרסת wxWidgets:"
 
-#: clientgui/DlgAbout.cpp:188
+#: DlgAbout.cpp:188
 msgid "Copyright:"
 msgstr "זכויות יוצרים:"
 
-#: clientgui/DlgAbout.cpp:192
+# 98%
+#: DlgAbout.cpp:192
+#, fuzzy
 msgid ""
-"(C) 2003-2014 University of California, Berkeley.\n"
+"(C) 2003-2013 University of California, Berkeley.\n"
 "All Rights Reserved."
 msgstr ""
+"(C) 2003-2011 אוניברסיטת קליפורניה, ברקלי.\n"
+"כל הזכויות שמורות."
 
-#: clientgui/DlgAbout.cpp:196
+#: DlgAbout.cpp:196
 msgid "Berkeley Open Infrastructure for Network Computing"
 msgstr "Berkeley Open Infrastructure for Network Computing"
 
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:399
-#: clientgui/DlgSelectComputer.cpp:163
+#: DlgAbout.cpp:208 DlgExitMessage.cpp:173 DlgGenericMessage.cpp:120
+#: DlgOptions.cpp:396 DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "&אישור"
 
-#: clientgui/DlgAdvPreferences.cpp:602
+#: DlgAdvPreferences.cpp:544
 msgid "invalid number"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:603
+#: DlgAdvPreferences.cpp:545
 msgid "invalid time, format is HH:MM"
 msgstr "זמן לא נכון, הצורה צריכה להיות HH:MM"
 
-#: clientgui/DlgAdvPreferences.cpp:604
+#: DlgAdvPreferences.cpp:546
 msgid "invalid time interval, format is HH:MM-HH:MM"
 msgstr "מרווח זמן שגוי, הצורה צריכה להיות HH:MM-HH:MM"
 
-#: clientgui/DlgAdvPreferences.cpp:817
+#: DlgAdvPreferences.cpp:751
 msgid "invalid input value detected"
 msgstr "זוהה ערך מוזן לא נכון"
 
-#: clientgui/DlgAdvPreferences.cpp:819
+#: DlgAdvPreferences.cpp:753
 msgid "Validation Error"
 msgstr "תקלת אימות"
 
-#: clientgui/DlgAdvPreferences.cpp:969
-#: clientgui/DlgAdvPreferences.cpp:975
-#: clientgui/DlgAdvPreferences.cpp:981
+#: DlgAdvPreferences.cpp:885 DlgAdvPreferences.cpp:891
+#: DlgAdvPreferences.cpp:897
 msgid "Applications to add"
 msgstr "אפליקציות להוספה"
 
-#: clientgui/DlgAdvPreferences.cpp:998
+#: DlgAdvPreferences.cpp:914
 #, c-format
 msgid "'%s' is not an executable application."
 msgstr "\"%s\" אינה אפליקציה הניתנת להרצה."
 
-#: clientgui/DlgAdvPreferences.cpp:999
-#: clientgui/DlgAdvPreferences.cpp:1046
-#: clientgui/DlgAdvPreferences.cpp:1070
+#: DlgAdvPreferences.cpp:915 DlgAdvPreferences.cpp:962
+#: DlgAdvPreferences.cpp:986
 #, fuzzy
 msgid "Add Exclusive App"
 msgstr "הוסף אפליקציה מיוחדת"
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Name of application to add?"
 msgstr "שם האפליקציה להוספה?"
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 #, fuzzy
 msgid "Add exclusive app"
 msgstr "הוסף אפליקציה מיוחדת"
 
-#: clientgui/DlgAdvPreferences.cpp:1045
+#: DlgAdvPreferences.cpp:961
 #, c-format
 msgid "Application names must end with '%s'"
 msgstr "שם האפליקציה חייב להסתיים ב-'%s'"
 
-#: clientgui/DlgAdvPreferences.cpp:1069
+#: DlgAdvPreferences.cpp:985
 #, c-format
 msgid "'%s' is already in the list."
 msgstr "'%s' כבר קיים ברשימה."
 
-#: clientgui/DlgAdvPreferences.cpp:1161
+#: DlgAdvPreferences.cpp:1077
 #, fuzzy
 msgid ""
 "Do you really want to clear all local preferences?\n"
@@ -1184,16 +1165,16 @@ msgstr ""
 "אתה בטוח שברצונך למחוק את ההעדפות המקומיות?\n"
 "(פעולה זו לא תשפיעה על האפליקציות המיוחדות.)"
 
-#: clientgui/DlgAdvPreferences.cpp:1162
+#: DlgAdvPreferences.cpp:1078 sg_DlgPreferences.cpp:1030
 msgid "Confirmation"
 msgstr "אימות"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:49
+#: DlgAdvPreferencesBase.cpp:46 sg_DlgPreferences.cpp:946
 #, c-format
-msgid "%s - Computing preferences"
-msgstr ""
+msgid "%s - Preferences"
+msgstr "%s - העדפות"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:66
+#: DlgAdvPreferencesBase.cpp:62
 #, fuzzy
 msgid ""
 "This dialog controls preferences for this computer only.\n"
@@ -1204,286 +1185,275 @@ msgstr ""
 "לחץ 'אישור' כדי לקבוע את ההעדפות.\n"
 "לחץ 'נקה' כדי לשחזר הגדרות מבוססות-אתר (למעט אפליקציות מיוחדות)."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:69
+#: DlgAdvPreferencesBase.cpp:65 sg_DlgPreferences.cpp:428
 msgid "Clear"
 msgstr "נקה"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:70
+#: DlgAdvPreferencesBase.cpp:66
 msgid "clear all local preferences and close the dialog"
 msgstr "נקה את כל ההעדפות המקומיות וסגור את החלון"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:85
+#: DlgAdvPreferencesBase.cpp:81
 msgid "processor usage"
 msgstr "שימוש במעבד"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:88
+#: DlgAdvPreferencesBase.cpp:84
 msgid "network usage"
 msgstr "שימוש ברשת"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:91
+#: DlgAdvPreferencesBase.cpp:87
 msgid "disk and memory usage"
 msgstr "שימוש בדיסק וזיכרון"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:94
+#: DlgAdvPreferencesBase.cpp:90
 #, fuzzy
 msgid "exclusive applications"
 msgstr "אפליקציות מיוחדות"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:107
-#: clientgui/DlgDiagnosticLogFlags.cpp:104
+#: DlgAdvPreferencesBase.cpp:102 sg_DlgPreferences.cpp:424
 msgid "OK"
 msgstr "אישור"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:108
+#: DlgAdvPreferencesBase.cpp:103
 msgid "save all values and close the dialog"
 msgstr "שמור את כל הערכים וסגור את החלון"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:114
+#: DlgAdvPreferencesBase.cpp:108
 msgid "close the dialog without saving"
 msgstr "סגור את החלון ללא שמירה"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:118
-#: clientgui/Localization.cpp:35
-#: clientgui/Localization.cpp:121
-#: clientgui/Localization.cpp:139
+#: DlgAdvPreferencesBase.cpp:112 Localization.cpp:35 Localization.cpp:121
+#: Localization.cpp:139 sg_BoincSimpleFrame.cpp:794 sg_DlgPreferences.cpp:439
 msgid "Help"
 msgstr "עזרה"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
+#: DlgAdvPreferencesBase.cpp:113
 msgid "shows the preferences web page"
 msgstr "מציג את עמוד האינטרנט של ההעדפות"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:141
+#: DlgAdvPreferencesBase.cpp:135
 msgid "Computing allowed"
 msgstr "אפשר עבודה"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
+#: DlgAdvPreferencesBase.cpp:139
 msgid "While computer is on batteries"
 msgstr "בזמן עבודה עם סוללות"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:149
-msgid "check this if you want this computer to do work while it runs on batteries"
+#: DlgAdvPreferencesBase.cpp:142
+msgid ""
+"check this if you want this computer to do work while it runs on batteries"
 msgstr "סמן אם ברצונך שהמחשב יעבד מידע בזמן שהוא עובד על סוללות"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:155
+#: DlgAdvPreferencesBase.cpp:148
 msgid "While computer is in use"
 msgstr "בזמן שהמחשב בשימוש"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:158
-msgid "check this if you want this computer to do work even when you're using it"
+#: DlgAdvPreferencesBase.cpp:151
+msgid ""
+"check this if you want this computer to do work even when you're using it"
 msgstr "סמן אם ברצונך שהמחשב יעבד מידע גם בזמן שאתה משתמש בו"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:164
+#: DlgAdvPreferencesBase.cpp:157
 msgid "Use GPU while computer is in use"
 msgstr "השתמש במעבד גרפי בזמן שהמחשב בשימוש"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:167
-msgid "check this if you want your GPU to do work even when you're using the computer"
+#: DlgAdvPreferencesBase.cpp:160
+msgid ""
+"check this if you want your GPU to do work even when you're using the "
+"computer"
 msgstr "סמן אם ברצונך שהמעבד הגרפי יעבד מידע גם בזמן שאתה משתמש במחשב"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:179
+#: DlgAdvPreferencesBase.cpp:172
 msgid "Only after computer has been idle for"
 msgstr "רק אחרי שהמחשב לא בשימוש במשך"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:188
-msgid "do work only after you haven't used the computer for this number of minutes"
+#: DlgAdvPreferencesBase.cpp:182
+msgid ""
+"do work only after you haven't used the computer for this number of minutes"
 msgstr "עבד מידע רק אחרי שלא השתמשת במחשב למשך מספר הדקות הזה"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:193
-#: clientgui/DlgAdvPreferencesBase.cpp:342
+#: DlgAdvPreferencesBase.cpp:187 DlgAdvPreferencesBase.cpp:336
+#: sg_DlgPreferences.cpp:417
 msgid "minutes"
 msgstr "דקות"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:212
+#: DlgAdvPreferencesBase.cpp:206
 msgid "While processor usage is less than"
 msgstr "כל עוד השימוש במעבד נמוך מ"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:221
+#: DlgAdvPreferencesBase.cpp:216
 msgid "suspend work if processor usage exceeds this level"
 msgstr "השהה עבודה אם השימוש במעבד חרג מהערך הבא"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:226
+#: DlgAdvPreferencesBase.cpp:221
 msgid "percent (0 means no restriction)"
 msgstr "אחוז (0 משמעותו ללא הגבלה)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:240
-#: clientgui/DlgAdvPreferencesBase.cpp:506
+#: DlgAdvPreferencesBase.cpp:235 DlgAdvPreferencesBase.cpp:496
 msgid "Every day between hours of"
 msgstr "כל יום בין השעות"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: DlgAdvPreferencesBase.cpp:239
 msgid "start work at this time"
 msgstr "התחל עבודה בזמן זה"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:248
-#: clientgui/DlgAdvPreferencesBase.cpp:514
+#: DlgAdvPreferencesBase.cpp:243 DlgAdvPreferencesBase.cpp:504
+#: sg_DlgPreferences.cpp:326 sg_DlgPreferences.cpp:348
 msgid "and"
 msgstr "ו"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:252
+#: DlgAdvPreferencesBase.cpp:247
 msgid "stop work at this time"
 msgstr "עצור עבודה בזמן זה"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
-#: clientgui/DlgAdvPreferencesBase.cpp:522
+#: DlgAdvPreferencesBase.cpp:251 DlgAdvPreferencesBase.cpp:512
 msgid "(no restriction if equal)"
 msgstr "(ללא הגבלה במידה ושווה)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:261
-#: clientgui/DlgAdvPreferencesBase.cpp:527
+#: DlgAdvPreferencesBase.cpp:256 DlgAdvPreferencesBase.cpp:517
 msgid "Day-of-week override:"
 msgstr "מעקף של יום בשבוע:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:266
-#: clientgui/DlgAdvPreferencesBase.cpp:532
+#: DlgAdvPreferencesBase.cpp:261 DlgAdvPreferencesBase.cpp:522
 msgid "check box to specify hours for this day of week"
 msgstr "סמן את התא כדי להגדיר את השעות של אותו יום בשבוע"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:272
-#: clientgui/DlgAdvPreferencesBase.cpp:538
+#: DlgAdvPreferencesBase.cpp:267 DlgAdvPreferencesBase.cpp:528
 msgid "Monday"
 msgstr "שני"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:279
-#: clientgui/DlgAdvPreferencesBase.cpp:545
+#: DlgAdvPreferencesBase.cpp:274 DlgAdvPreferencesBase.cpp:535
 msgid "Tuesday"
 msgstr "שלישי"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:286
-#: clientgui/DlgAdvPreferencesBase.cpp:552
+#: DlgAdvPreferencesBase.cpp:281 DlgAdvPreferencesBase.cpp:542
 msgid "Wednesday"
 msgstr "רביעי"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:293
-#: clientgui/DlgAdvPreferencesBase.cpp:559
+#: DlgAdvPreferencesBase.cpp:288 DlgAdvPreferencesBase.cpp:549
 msgid "Thursday"
 msgstr "חמישי"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:300
-#: clientgui/DlgAdvPreferencesBase.cpp:566
+#: DlgAdvPreferencesBase.cpp:295 DlgAdvPreferencesBase.cpp:556
 msgid "Friday"
 msgstr "שישי"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:307
-#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: DlgAdvPreferencesBase.cpp:302 DlgAdvPreferencesBase.cpp:563
 msgid "Saturday"
 msgstr "שבת"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:580
+#: DlgAdvPreferencesBase.cpp:309 DlgAdvPreferencesBase.cpp:570
 msgid "Sunday"
 msgstr "ראשון"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:328
+#: DlgAdvPreferencesBase.cpp:323
 msgid "Other options"
 msgstr "אפשרויות נוספות"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:336
+#: DlgAdvPreferencesBase.cpp:330
 msgid "Switch between applications every"
 msgstr "החלף בין יישומים כל"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:345
+#: DlgAdvPreferencesBase.cpp:339
 msgid "On multiprocessor systems, use at most"
 msgstr "במערכות מרובות מעבדים, השתמש לכל היותר ב-"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
+#: DlgAdvPreferencesBase.cpp:346
 #, no-c-format
-msgid "% of the processors (0 means no restriction)"
+msgid "% of the processors (0 means ignore this setting)"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:355
-#: clientgui/DlgAdvPreferencesBase.cpp:618
-#: clientgui/DlgAdvPreferencesBase.cpp:640
-#: clientgui/DlgAdvPreferencesBase.cpp:661
-#: clientgui/DlgAdvPreferencesBase.cpp:683
-#: clientgui/DlgAdvPreferencesBase.cpp:694
+#: DlgAdvPreferencesBase.cpp:349 DlgAdvPreferencesBase.cpp:605
+#: DlgAdvPreferencesBase.cpp:627 DlgAdvPreferencesBase.cpp:648
+#: DlgAdvPreferencesBase.cpp:669 DlgAdvPreferencesBase.cpp:679
 msgid "Use at most"
 msgstr "השתמש לכל היותר ב-"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:362
+#: DlgAdvPreferencesBase.cpp:356
 #, no-c-format
-msgid "% of CPU time (0 means no restriction)"
-msgstr ""
+msgid "% CPU time"
+msgstr "אחוזים מזמן מעבד"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:386
+#: DlgAdvPreferencesBase.cpp:378
 msgid "General options"
 msgstr "אפשרויות כלליות"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:395
+#: DlgAdvPreferencesBase.cpp:386
 msgid "Maximum download rate"
 msgstr "קצב הורדה מקסימלי"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:401
-#: clientgui/DlgAdvPreferencesBase.cpp:410
-msgid "KBytes/second (0 means no restriction)"
-msgstr ""
+#: DlgAdvPreferencesBase.cpp:392 DlgAdvPreferencesBase.cpp:401
+msgid "KBytes/sec."
+msgstr "ק\"ב לשנייה"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:404
+#: DlgAdvPreferencesBase.cpp:395
 msgid "Maximum upload rate"
 msgstr "קצב העלאה מקסימלי"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:417
+#: DlgAdvPreferencesBase.cpp:406
+msgid "Transfer at most"
+msgstr "העבר לכל היותר"
+
+#: DlgAdvPreferencesBase.cpp:412
+msgid "Mbytes"
+msgstr "מ\"ב"
+
+#: DlgAdvPreferencesBase.cpp:415
+msgid "every"
+msgstr "כל"
+
+#: DlgAdvPreferencesBase.cpp:421 DlgAdvPreferencesBase.cpp:444
+#: DlgAdvPreferencesBase.cpp:463
+msgid "days"
+msgstr "ימים"
+
+#: DlgAdvPreferencesBase.cpp:429
 #, fuzzy
 msgid "Minimum work buffer"
 msgstr "מאגר עבודה מינימלי"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:425
+#: DlgAdvPreferencesBase.cpp:438
 #, fuzzy
 msgid "Try to maintain enough tasks to keep busy for this many days"
 msgstr "נסה לשמור על מספיק משימות כדי לשמור על מצב עסוק למשך כמות ימים של"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:431
-#: clientgui/DlgAdvPreferencesBase.cpp:449
-msgid "days (maximum value: 10)"
-msgstr ""
-
-#: clientgui/DlgAdvPreferencesBase.cpp:437
+#: DlgAdvPreferencesBase.cpp:450
 #, fuzzy
 msgid "Max additional work buffer"
 msgstr "מאגר עבודה נוסף מקסימלי"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:445
+#: DlgAdvPreferencesBase.cpp:459
 #, fuzzy
 msgid "In addition, maintain enough tasks for up to this many days"
 msgstr "בנוסף, שמור על מספיק משימות למשך עד כמות ימים של"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:454
-msgid "Transfer at most"
-msgstr "העבר לכל היותר"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:462
-msgid "MBytes every"
-msgstr ""
-
-#: clientgui/DlgAdvPreferencesBase.cpp:468
-msgid "days (0 means no restriction)"
-msgstr ""
-
-#: clientgui/DlgAdvPreferencesBase.cpp:476
+#: DlgAdvPreferencesBase.cpp:466
 msgid "Skip image file verification"
 msgstr "דלג על אימות קובץ תמונה"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:478
+#: DlgAdvPreferencesBase.cpp:468
 msgid "check this if your Internet provider modifies image files"
 msgstr "סמן במידה וספקית האינטרנט שלך משנה קבצי תמונה"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:484
+#: DlgAdvPreferencesBase.cpp:476
 msgid "Connect options"
 msgstr "אפשרויות חיבור"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:487
+#: DlgAdvPreferencesBase.cpp:478
 msgid "Confirm before connecting to internet"
 msgstr "וודא לפני התחברות לאינטרנט"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
+#: DlgAdvPreferencesBase.cpp:480
+msgid ""
+"if checked, a confirmation dialog will be displayed before trying to connect "
+"to the Internet"
 msgstr "אם מסומן, חלון אימות יופיע לפני ניסיון התחברות לאינטרנט"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:493
+#: DlgAdvPreferencesBase.cpp:484
 msgid "Disconnect when done"
 msgstr "התנתק בסיום"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:495
+#: DlgAdvPreferencesBase.cpp:486
 msgid ""
 "if checked, BOINC hangs up when network usage is done\n"
 "(only relevant for dialup-connection)"
@@ -1491,216 +1461,197 @@ msgstr ""
 "אם מסומן, BOINC ינתק את החיבור לרשת כשיסיים\n"
 "(רלוונטי לחיבורי חייגן בלבד)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:501
+#: DlgAdvPreferencesBase.cpp:492
 msgid "Network usage allowed"
 msgstr "שימוש ברשת מאושר"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:510
+#: DlgAdvPreferencesBase.cpp:500
 msgid "network usage start hour"
 msgstr "שעת התחלת השימוש ברשת"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:518
+#: DlgAdvPreferencesBase.cpp:508
 msgid "network usage stop hour"
 msgstr "שעת סיום השימוש ברשת"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:610
-#: clientgui/DlgItemProperties.cpp:257
+#: DlgAdvPreferencesBase.cpp:598 DlgItemProperties.cpp:231
 msgid "Disk usage"
 msgstr "שימוש בדיסק"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:622
+#: DlgAdvPreferencesBase.cpp:609
 msgid "the maximum disk space used by BOINC (in Gigabytes)"
 msgstr "השטח השימוש המקסימלי בדיסק על ידי BOINC (ב-GB)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:626
-msgid "Gigabytes disk space (0 means no restriction)"
-msgstr ""
+#: DlgAdvPreferencesBase.cpp:613
+msgid "Gigabytes disk space"
+msgstr "GB משטח הדיסק"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:629
+#: DlgAdvPreferencesBase.cpp:616
 msgid "Leave at least"
 msgstr "השאר לפחות"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:633
+#: DlgAdvPreferencesBase.cpp:620
 msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
 msgstr "BOINC ישאיר לפחות את הכמות הזאת של שטח פנוי (ב-GB)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:637
+#: DlgAdvPreferencesBase.cpp:624
 msgid "Gigabytes disk space free"
 msgstr "GB משטח הדיסק פנויים"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
+#: DlgAdvPreferencesBase.cpp:631
 msgid "BOINC uses at most this percentage of total disk space"
 msgstr "BOINC ישתמש לכל היותר באחוז זה מכלל שטח הדיסק"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:649
+#: DlgAdvPreferencesBase.cpp:636
 #, no-c-format
 msgid "% of total disk space"
 msgstr "% משטח הדיסק הכללי"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:652
+#: DlgAdvPreferencesBase.cpp:639
 msgid "Tasks checkpoint to disk at most every"
 msgstr "משימות יבצעו נקודות ביקורת בדיסק לכל היותר כל"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
+#: DlgAdvPreferencesBase.cpp:645
 msgid "seconds"
 msgstr "שניות"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:668
+#: DlgAdvPreferencesBase.cpp:655
 #, no-c-format
 msgid "% of page file (swap space)"
 msgstr "% מקובץ העמוד (החלף מקום)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:675
+#: DlgAdvPreferencesBase.cpp:662
 msgid "Memory usage"
 msgstr "שימוש בזיכרון"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
+#: DlgAdvPreferencesBase.cpp:676
 #, no-c-format
 msgid "% when computer is in use"
 msgstr "% כאשר המחשב בשימוש"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:701
+#: DlgAdvPreferencesBase.cpp:686
 #, no-c-format
 msgid "% when computer is idle"
 msgstr "% כאשר המחשב לא בשימוש"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:706
+#: DlgAdvPreferencesBase.cpp:691
 msgid "Leave applications in memory while suspended"
 msgstr "השאר את היישומים בזיכרון כאשר הם מושהים"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:708
+#: DlgAdvPreferencesBase.cpp:693
 msgid "if checked, suspended work units are left in memory"
 msgstr "אם מסומן, יחידות העבודה המושהות ישארו בזיכרון"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:728
-msgid "Suspend processor and network usage when these applications are running:"
+#: DlgAdvPreferencesBase.cpp:713
+msgid ""
+"Suspend processor and network usage when these applications are running:"
 msgstr "השהה השימוש במעבד והרשת כאשר האפליקציות הבאות רצות:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:738
+#: DlgAdvPreferencesBase.cpp:722
 msgid "Add..."
 msgstr "הוסף..."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:739
+#: DlgAdvPreferencesBase.cpp:723
 msgid "Add an application to this list"
 msgstr "הוסף אפליקציה לרשימה"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:744
+#: DlgAdvPreferencesBase.cpp:728 ViewProjects.cpp:202
+#: sg_ProjectCommandPopup.cpp:85
 msgid "Remove"
 msgstr "הסר"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:745
+#: DlgAdvPreferencesBase.cpp:729
 msgid "Remove an application from this list"
 msgstr "הסר אפליקציה מהרשימה"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:754
+#: DlgAdvPreferencesBase.cpp:738
 #, fuzzy
 msgid "For advanced options, refer to "
 msgstr "לאפשרויות מתקדמות, עבור ל "
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:65
-#, c-format
-msgid "%s Diagnostic Log Flags"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:83
-msgid "These flags enable various types of diagnostic messages in the Event Log."
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:105
-msgid "Save all values and close the dialog"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:108
-msgid "Defaults"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:109
-msgid "Restore default settings"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:113
-msgid "Close the dialog without saving"
-msgstr ""
-
-#: clientgui/DlgEventLog.cpp:226
+#: DlgEventLog.cpp:219
 #, c-format
 msgid "%s - Event Log"
 msgstr "%s - יומן אירועים"
 
-#: clientgui/DlgEventLog.cpp:236
+#: DlgEventLog.cpp:232 ViewMessages.cpp:117 ViewProjects.cpp:219
+#: ViewStatistics.cpp:435 ViewStatistics.cpp:2009 ViewTransfers.cpp:182
+#: ViewWork.cpp:232
 msgid "Project"
 msgstr "פרוייקט"
 
-#: clientgui/DlgEventLog.cpp:237
+#: DlgEventLog.cpp:233 ViewMessages.cpp:118
 msgid "Time"
 msgstr "זמן"
 
-#: clientgui/DlgEventLog.cpp:238
+#: DlgEventLog.cpp:234 ViewMessages.cpp:119
 msgid "Message"
 msgstr "הודעה"
 
-#: clientgui/DlgEventLog.cpp:300
-#: clientgui/DlgEventLog.cpp:364
+#: DlgEventLog.cpp:290 DlgEventLog.cpp:354
 msgid "&Show only this project"
 msgstr "&הצג פרוייקט זה בלבד"
 
-#: clientgui/DlgEventLog.cpp:304
+#: DlgEventLog.cpp:294
 #, fuzzy
 msgid "Copy &All"
 msgstr "ה&עתק הכל"
 
-#: clientgui/DlgEventLog.cpp:306
-#: clientgui/DlgEventLog.cpp:310
+#: DlgEventLog.cpp:296 DlgEventLog.cpp:300 ViewMessages.cpp:89
 msgid "Copy all the messages to the clipboard."
 msgstr "העתק את כל ההודעות ללוח."
 
-#: clientgui/DlgEventLog.cpp:315
+#: DlgEventLog.cpp:305
 #, fuzzy
 msgid "Copy &Selected"
 msgstr "העתק הודעות נבחרות"
 
-#: clientgui/DlgEventLog.cpp:318
-#: clientgui/DlgEventLog.cpp:326
-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 "העתק הודעות נבחרות ללוח. באפשרותך לבחור הודעות מרובות על ידי לחיצה ממושכת על לחצן shift או command בזמן הלחיצה על ההודעות."
+#: DlgEventLog.cpp:308 DlgEventLog.cpp:316 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 ""
+"העתק הודעות נבחרות ללוח. באפשרותך לבחור הודעות מרובות על ידי לחיצה ממושכת על "
+"לחצן shift או command בזמן הלחיצה על ההודעות."
 
-#: clientgui/DlgEventLog.cpp:320
-#: clientgui/DlgEventLog.cpp:328
-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 "העתק הודעות נבחרות ללוח. באפשרותך לבחור הודעות מרובות על ידי לחיצה ממושכת על לחצן shift או control בזמן הלחיצה על ההודעות."
+#: DlgEventLog.cpp:310 DlgEventLog.cpp:318 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 ""
+"העתק הודעות נבחרות ללוח. באפשרותך לבחור הודעות מרובות על ידי לחיצה ממושכת על "
+"לחצן shift או control בזמן הלחיצה על ההודעות."
 
-#: clientgui/DlgEventLog.cpp:335
-#: clientgui/DlgItemProperties.cpp:67
+#: DlgEventLog.cpp:325 DlgItemProperties.cpp:67
 msgid "&Close"
 msgstr "&סגור"
 
-#: clientgui/DlgEventLog.cpp:344
+#: DlgEventLog.cpp:334 sg_BoincSimpleFrame.cpp:798 sg_DlgPreferences.cpp:442
 #, c-format
+#, fuzzy, c-format
 msgid "Get help with %s"
 msgstr "קבל עזרה עם %s"
 
-#: clientgui/DlgEventLog.cpp:358
+#: DlgEventLog.cpp:348
 #, fuzzy
 msgid "Show all &messages"
 msgstr "ה&צג את כל ההודעות"
 
-#: clientgui/DlgEventLog.cpp:359
-#: clientgui/DlgEventLog.cpp:361
+#: DlgEventLog.cpp:349 DlgEventLog.cpp:351
 msgid "Show messages for all projects"
 msgstr "הצג הודעות מכל הפרוייקטים"
 
-#: clientgui/DlgEventLog.cpp:365
-#: clientgui/DlgEventLog.cpp:367
+#: DlgEventLog.cpp:355 DlgEventLog.cpp:357
 msgid "Show only the messages for the selected project"
 msgstr "הצג את ההודעות הקשורות לפרוייקט הנבחר בלבד"
 
-#: clientgui/DlgExitMessage.cpp:82
+#: DlgExitMessage.cpp:82
 #, c-format
 msgid "%s - Exit Confirmation"
 msgstr "%s - אישור יציאה"
 
-#: clientgui/DlgExitMessage.cpp:130
+#: DlgExitMessage.cpp:130
 #, c-format
+#, fuzzy, c-format
 msgid ""
 "You have requested to exit the %s,\n"
 "which allows you to view and manage\n"
@@ -1716,7 +1667,7 @@ msgstr ""
 "אם אתה רוצה להפסיק להריץ את היישומים,\n"
 "בחר זאת מהאפשרויות הבאות:"
 
-#: clientgui/DlgExitMessage.cpp:135
+#: DlgExitMessage.cpp:135
 #, c-format
 msgid ""
 "This will shut down %s and its tasks until either the\n"
@@ -1726,425 +1677,408 @@ msgid ""
 "rather than to exit the application; that will allow %s to run its\n"
 "tasks at the times you selected in your preferences."
 msgstr ""
+"אפשרות זו תכבה את %s ואת המשימות לגמרי עד\n"
+"אשר אפליקציית %s או שומר המסך ירוץ שוב.\n"
+"\n"
+"ברוב המקרים, עדיף פשוט לסגור את חלון ה-%s\n"
+"מאשר לצאת מהיישום; דבר זה יאפשר ל-%s להריץ את\n"
+"היישומים בזמנים שבחרת בהעדפות."
 
-#: clientgui/DlgExitMessage.cpp:153
+#: DlgExitMessage.cpp:153
 #, c-format
+#, fuzzy, c-format
 msgid "Stop running tasks when exiting the %s"
 msgstr "הפסק להריץ משימות כאשר יוצאים מ-%s"
 
-#: clientgui/DlgExitMessage.cpp:165
+#: DlgExitMessage.cpp:165
 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
+#: DlgExitMessage.cpp:178 DlgGenericMessage.cpp:125 DlgOptions.cpp:401
+#: DlgSelectComputer.cpp:168 wizardex.cpp:378
 msgid "&Cancel"
 msgstr "&ביטול"
 
-#: clientgui/DlgGenericMessage.cpp:112
+#: DlgGenericMessage.cpp:112
 msgid "Don't show this dialog again."
 msgstr "אל תציג חלון זה שוב."
 
-#: clientgui/DlgItemProperties.cpp:194
-#: clientgui/DlgItemProperties.cpp:197
-#: clientgui/DlgItemProperties.cpp:200
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:168 DlgItemProperties.cpp:171
+#: DlgItemProperties.cpp:174 DlgItemProperties.cpp:177
 #, fuzzy
 msgid "Don't fetch tasks for "
 msgstr "אל תקבל משימות למעבד"
 
-#: clientgui/DlgItemProperties.cpp:194
+#: DlgItemProperties.cpp:168
 msgid "Project preference"
 msgstr "העדפת פרוייקט"
 
-#: clientgui/DlgItemProperties.cpp:197
+#: DlgItemProperties.cpp:171
 #, fuzzy
 msgid "Account manager preference"
 msgstr "אתר מנהל חשבונות"
 
-#: clientgui/DlgItemProperties.cpp:200
+#: DlgItemProperties.cpp:174
 #, fuzzy
 msgid "Project has no apps for "
 msgstr "אתרי הפרוייקט"
 
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:177
 msgid "Client configuration excludes "
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:207
+#: DlgItemProperties.cpp:181
 #, fuzzy
 msgid " work fetch deferred for"
 msgstr "קבלת עבודה למעבד נדחתה למשך"
 
-#: clientgui/DlgItemProperties.cpp:208
+#: DlgItemProperties.cpp:182
 #, fuzzy
 msgid " work fetch deferral interval"
 msgstr "משך זמן ההמתנה לקבלת עבודה למעבד"
 
-#: clientgui/DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:213
 msgid "Properties of project "
 msgstr "מאפייני פרוייקט"
 
-#: clientgui/DlgItemProperties.cpp:243
-#: clientgui/DlgOptions.cpp:221
+#: DlgItemProperties.cpp:217 DlgOptions.cpp:218
 msgid "General"
 msgstr "כללי"
 
-#: clientgui/DlgItemProperties.cpp:244
+#: DlgItemProperties.cpp:218
 msgid "Master URL"
 msgstr "כתובת אתר ראשית"
 
-#: clientgui/DlgItemProperties.cpp:245
+#: DlgItemProperties.cpp:219
 msgid "User name"
 msgstr "שם משתמש"
 
-#: clientgui/DlgItemProperties.cpp:246
+#: DlgItemProperties.cpp:220
 msgid "Team name"
 msgstr "שם הקבוצה"
 
-#: clientgui/DlgItemProperties.cpp:247
+#: DlgItemProperties.cpp:221 ViewProjects.cpp:224
 msgid "Resource share"
 msgstr "שתוף משאבים"
 
-#: clientgui/DlgItemProperties.cpp:249
+#: DlgItemProperties.cpp:223
 msgid "Scheduler RPC deferred for"
 msgstr "תזמון RPC נדחה ל-"
 
-#: clientgui/DlgItemProperties.cpp:252
+#: DlgItemProperties.cpp:226
 msgid "File downloads deferred for"
 msgstr "הורדת קבצים נדחתה ל-"
 
-#: clientgui/DlgItemProperties.cpp:255
+#: DlgItemProperties.cpp:229
 msgid "File uploads deferred for"
 msgstr "העלאת קבצים נדחתה ל-"
 
-#: clientgui/DlgItemProperties.cpp:258
+#: DlgItemProperties.cpp:232
 msgid "Computer ID"
 msgstr "זהות המחשב"
 
-#: clientgui/DlgItemProperties.cpp:260
+#: DlgItemProperties.cpp:234
 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
+#: DlgItemProperties.cpp:234 DlgItemProperties.cpp:236
+#: DlgItemProperties.cpp:237 DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:242 DlgItemProperties.cpp:251
+#: DlgItemProperties.cpp:254 DlgItemProperties.cpp:257
 msgid "yes"
 msgstr "כן"
 
-#: clientgui/DlgItemProperties.cpp:262
+#: DlgItemProperties.cpp:236
 msgid "Suspended via GUI"
 msgstr "הושהה בעזרת הממשק הגרפי"
 
-#: clientgui/DlgItemProperties.cpp:262
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:236 DlgItemProperties.cpp:237
 msgid "no"
 msgstr "לא"
 
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:237
 msgid "Don't request more work"
 msgstr "אל תבקש עוד עבודה"
 
-#: clientgui/DlgItemProperties.cpp:265
+#: DlgItemProperties.cpp:239
 msgid "Scheduler call in progress"
 msgstr "מתבצעת פנייה למתזמן"
 
-#: clientgui/DlgItemProperties.cpp:268
+#: DlgItemProperties.cpp:242
 msgid "Trickle-up pending"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:271
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:245 DlgItemProperties.cpp:247
 msgid "Host location"
 msgstr "מיקום המחשב"
 
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:247
 msgid "default"
 msgstr "ברירת מחדל"
 
-#: clientgui/DlgItemProperties.cpp:277
+#: DlgItemProperties.cpp:251
 msgid "Added via account manager"
 msgstr "התווסף באמצעות מנהל חשבונות"
 
-#: clientgui/DlgItemProperties.cpp:280
+#: DlgItemProperties.cpp:254
 msgid "Remove when tasks done"
 msgstr "הסר כאשר משימות הושלמו"
 
-#: clientgui/DlgItemProperties.cpp:283
+#: DlgItemProperties.cpp:257
 msgid "Ended"
 msgstr "נגמר"
 
-#: clientgui/DlgItemProperties.cpp:285
-msgid "Tasks completed"
-msgstr ""
-
-#: clientgui/DlgItemProperties.cpp:286
-msgid "Tasks failed"
-msgstr ""
-
-#: clientgui/DlgItemProperties.cpp:288
+#: DlgItemProperties.cpp:259
 msgid "Credit"
 msgstr "ניקוד"
 
-#: clientgui/DlgItemProperties.cpp:289
+#: DlgItemProperties.cpp:260
 msgid "User"
 msgstr "משתמש"
 
-#: clientgui/DlgItemProperties.cpp:296
+#: DlgItemProperties.cpp:267
 msgid "Host"
 msgstr "מחשב"
 
-#: clientgui/DlgItemProperties.cpp:305
+#: DlgItemProperties.cpp:276
 msgid "Scheduling"
 msgstr "תזמון"
 
-#: clientgui/DlgItemProperties.cpp:306
+#: DlgItemProperties.cpp:277
 #, fuzzy
 msgid "Scheduling priority"
 msgstr "עדיפות תזמון"
 
-#: clientgui/DlgItemProperties.cpp:307
+#: DlgItemProperties.cpp:278
 msgid "CPU"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:331
+#: DlgItemProperties.cpp:302
 msgid "Duration correction factor"
 msgstr "גורם תיקון הזמן"
 
-#: clientgui/DlgItemProperties.cpp:345
+#: DlgItemProperties.cpp:316
 msgid "Properties of task "
 msgstr "מאפייני משימה"
 
-#: clientgui/DlgItemProperties.cpp:357
+#: DlgItemProperties.cpp:328 ViewWork.cpp:238
 msgid "Application"
 msgstr "יישום"
 
-#: clientgui/DlgItemProperties.cpp:358
+#: DlgItemProperties.cpp:329 ViewWork.cpp:239
 msgid "Name"
 msgstr "שם"
 
-#: clientgui/DlgItemProperties.cpp:359
+#: DlgItemProperties.cpp:330
 msgid "State"
 msgstr "מצב"
 
-#: clientgui/DlgItemProperties.cpp:362
+#: DlgItemProperties.cpp:333
 msgid "Received"
 msgstr "התקבל"
 
-#: clientgui/DlgItemProperties.cpp:365
+#: DlgItemProperties.cpp:336
 msgid "Report deadline"
 msgstr "מועד אחרון לדיווח"
 
-#: clientgui/DlgItemProperties.cpp:367
+#: DlgItemProperties.cpp:338
 msgid "Resources"
 msgstr "משאבים"
 
-#: clientgui/DlgItemProperties.cpp:370
+#: DlgItemProperties.cpp:341
 #, fuzzy
 msgid "Estimated computation size"
 msgstr "נפח חישוב משוער"
 
-#: clientgui/DlgItemProperties.cpp:373
+#: DlgItemProperties.cpp:344
 msgid "CPU time at last checkpoint"
 msgstr "זמן מעבד בנקודת ביקורת אחרונה"
 
-#: clientgui/DlgItemProperties.cpp:374
-#: clientgui/DlgItemProperties.cpp:389
+#: DlgItemProperties.cpp:345 DlgItemProperties.cpp:360
 msgid "CPU time"
 msgstr "זמן מעבד"
 
-#: clientgui/DlgItemProperties.cpp:376
-#: clientgui/DlgItemProperties.cpp:390
+#: DlgItemProperties.cpp:347 DlgItemProperties.cpp:361
 msgid "Elapsed time"
 msgstr "זמן שחלף"
 
-#: clientgui/DlgItemProperties.cpp:378
+#: DlgItemProperties.cpp:349
 msgid "Estimated time remaining"
 msgstr "זמן משוער שנשאר"
 
-#: clientgui/DlgItemProperties.cpp:379
+#: DlgItemProperties.cpp:350
 msgid "Fraction done"
 msgstr "החלק שהושלם"
 
-#: clientgui/DlgItemProperties.cpp:380
+#: DlgItemProperties.cpp:351
 msgid "Virtual memory size"
 msgstr "גודל זיכרון וירטואלי"
 
-#: clientgui/DlgItemProperties.cpp:381
+#: DlgItemProperties.cpp:352
 msgid "Working set size"
 msgstr "גודל שטח עבודה"
 
-#: clientgui/DlgItemProperties.cpp:383
+#: DlgItemProperties.cpp:354
 msgid "Directory"
 msgstr "תיקייה"
 
-#: clientgui/DlgItemProperties.cpp:386
+#: DlgItemProperties.cpp:357
 msgid "Process ID"
 msgstr "זהות יישום"
 
-#: clientgui/DlgItemProperties.cpp:456
+#: DlgItemProperties.cpp:427 ViewWork.cpp:1032 sg_TaskPanel.cpp:823
 msgid "Local: "
 msgstr "מקומי:"
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: DlgOptions.cpp:129 DlgOptions.cpp:135
 msgid "Options"
 msgstr "אפשרויות"
 
-#: clientgui/DlgOptions.cpp:178
+#: DlgOptions.cpp:175
 msgid "Language:"
 msgstr "שפה:"
 
-#: clientgui/DlgOptions.cpp:185
+#: DlgOptions.cpp:182
 msgid "What language should BOINC use?"
 msgstr "באיזו שפה על BOINC להשתמש?"
 
-#: clientgui/DlgOptions.cpp:189
+#: DlgOptions.cpp:186
 msgid "Notice reminder interval:"
 msgstr "מרווח התזכורות להתראות:"
 
-#: clientgui/DlgOptions.cpp:196
+#: DlgOptions.cpp:193
 msgid "How often should BOINC remind you of new notices?"
 msgstr "באיזו תכיפות על BOINC להזכיר שיש התראות חדשות?"
 
-#: clientgui/DlgOptions.cpp:201
+#: DlgOptions.cpp:198
 msgid "Run Manager at login?"
 msgstr "להפעיל את המנהל בעת הפעלת המחשב?"
 
-#: clientgui/DlgOptions.cpp:207
+#: DlgOptions.cpp:204
 msgid "Run the BOINC Manager when you log on."
 msgstr "הרץ את BOINC Manager כאשר אתה מתחבר."
 
-#: clientgui/DlgOptions.cpp:212
+#: DlgOptions.cpp:209
 msgid "Enable Manager exit dialog?"
 msgstr "לאפשר חלון יציאה מהמנהל?"
 
-#: clientgui/DlgOptions.cpp:218
+#: DlgOptions.cpp:215
 msgid "Display the exit dialog when shutting down the Manager."
 msgstr "מציג את חלון היציאה כאשר מכבים את המנהל."
 
-#: clientgui/DlgOptions.cpp:229
+#: DlgOptions.cpp:226
 msgid "Dial-up and Virtual Private Network settings"
 msgstr "הגדרות חייגן ורשת וירטואלית פרטית"
 
-#: clientgui/DlgOptions.cpp:243
+#: DlgOptions.cpp:240
 msgid "&Set Default"
 msgstr "&הגדר ברירת מחדל"
 
-#: clientgui/DlgOptions.cpp:248
+#: DlgOptions.cpp:245
 msgid "&Clear Default"
 msgstr "&מחק ברירת מחדל"
 
-#: clientgui/DlgOptions.cpp:255
+#: DlgOptions.cpp:252
 msgid "Default Connection:"
 msgstr "חיבור ברירת מחדל:"
 
-#: clientgui/DlgOptions.cpp:262
+#: DlgOptions.cpp:259
 msgid "Connections"
 msgstr "חיבורים"
 
-#: clientgui/DlgOptions.cpp:271
+#: DlgOptions.cpp:268
 msgid "Connect via HTTP proxy server"
 msgstr "התחבר באמצעות שרת פרוקסי מסוג HTTP"
 
-#: clientgui/DlgOptions.cpp:275
+#: DlgOptions.cpp:272
 msgid "HTTP Proxy Server Configuration"
 msgstr "תצורת שרת פרוקסי מסוג HTTP"
 
-#: clientgui/DlgOptions.cpp:283
-#: clientgui/DlgOptions.cpp:347
+#: DlgOptions.cpp:280 DlgOptions.cpp:344
 msgid "Address:"
 msgstr "כתובת:"
 
-#: clientgui/DlgOptions.cpp:291
-#: clientgui/DlgOptions.cpp:355
+#: DlgOptions.cpp:288 DlgOptions.cpp:352 ProxyPage.cpp:340 ProxyPage.cpp:360
 msgid "Port:"
 msgstr "פורט:"
 
-#: clientgui/DlgOptions.cpp:299
-#: clientgui/DlgOptions.cpp:363
+#: DlgOptions.cpp:296 DlgOptions.cpp:360
 msgid "Don't use proxy for:"
 msgstr "אל תמשתש בפרוקסי עבור:"
 
-#: clientgui/DlgOptions.cpp:306
-#: clientgui/DlgOptions.cpp:370
+#: DlgOptions.cpp:303 DlgOptions.cpp:367
 msgid "Leave these blank if not needed"
 msgstr "השאר ריק במידה ולא נחוץ"
 
-#: clientgui/DlgOptions.cpp:312
-#: clientgui/DlgOptions.cpp:376
+#: DlgOptions.cpp:309 DlgOptions.cpp:373 ProxyPage.cpp:343 ProxyPage.cpp:363
 msgid "User Name:"
 msgstr "שם משתמש"
 
-#: clientgui/DlgOptions.cpp:320
-#: clientgui/DlgOptions.cpp:384
-#: clientgui/DlgSelectComputer.cpp:152
+#: DlgOptions.cpp:317 DlgOptions.cpp:381 DlgSelectComputer.cpp:152
+#: ProxyPage.cpp:346 ProxyPage.cpp:366
 msgid "Password:"
 msgstr "סיסמה:"
 
-#: clientgui/DlgOptions.cpp:327
+#: DlgOptions.cpp:324
 msgid "HTTP Proxy"
 msgstr "שרת פרוקסי מסוג HTTP"
 
-#: clientgui/DlgOptions.cpp:335
+#: DlgOptions.cpp:332
 msgid "Connect via SOCKS proxy server"
 msgstr "התחבר באמצעות שרת פרוקסי מסוג SOCKS"
 
-#: clientgui/DlgOptions.cpp:339
+#: DlgOptions.cpp:336
 msgid "SOCKS Proxy Server Configuration"
 msgstr "תצורת שרת פרוקסי SOCKS"
 
-#: clientgui/DlgOptions.cpp:391
+#: DlgOptions.cpp:388
 msgid "SOCKS Proxy"
 msgstr "שרת פרוקסי מסוג SOCKS"
 
-#: clientgui/DlgOptions.cpp:589
+#: DlgOptions.cpp:586
 msgid "always"
 msgstr "תמיד"
 
-#: clientgui/DlgOptions.cpp:590
+#: DlgOptions.cpp:587
 msgid "1 hour"
 msgstr "שעה אחת"
 
-#: clientgui/DlgOptions.cpp:591
+#: DlgOptions.cpp:588
 msgid "6 hours"
 msgstr "6 שעות"
 
-#: clientgui/DlgOptions.cpp:592
+#: DlgOptions.cpp:589
 msgid "1 day"
 msgstr "יום אחד"
 
-#: clientgui/DlgOptions.cpp:593
+#: DlgOptions.cpp:590
 msgid "1 week"
 msgstr "שבוע אחד"
 
-#: clientgui/DlgOptions.cpp:594
+#: DlgOptions.cpp:591
 msgid "never"
 msgstr "אף פעם"
 
-#: clientgui/DlgOptions.cpp:691
+#: DlgOptions.cpp:688
 #, c-format
 msgid "%s - Language Selection"
 msgstr "%s - בחירת שפה"
 
-#: clientgui/DlgOptions.cpp:698
+#: DlgOptions.cpp:695
 #, c-format
-msgid "The %s's language has been changed.  In order for this change to take effect, you must restart the %s."
-msgstr "שפת ברירת המחדל של %s שונתה, על מנת ששינוי זה יכנס לתוקף עליך לאתחל את %s."
+#, fuzzy, c-format
+msgid ""
+"The %s's language has been changed.  In order for this change to take "
+"effect, you must restart the %s."
+msgstr ""
+"שפת ברירת המחדל של %s שונתה, על מנת ששינוי זה יכנס לתוקף עליך לאתחל את %s."
 
-#: clientgui/DlgSelectComputer.cpp:91
+#: DlgSelectComputer.cpp:91
 #, c-format
 msgid "%s - Select Computer"
 msgstr "%s - בחר מחשב"
 
-#: clientgui/DlgSelectComputer.cpp:125
+#: DlgSelectComputer.cpp:125
 #, c-format
 msgid ""
 "Another instance of %s is already running \n"
@@ -2153,418 +2087,419 @@ msgstr ""
 "עותק אחר של %s כבר רץ על מחשב זה.\n"
 "בחר קליינט לניתור."
 
-#: clientgui/DlgSelectComputer.cpp:143
+#: DlgSelectComputer.cpp:143
 msgid "Host name:"
 msgstr "שם המחשב:"
 
-#: clientgui/Localization.cpp:31
-#: clientgui/Localization.cpp:69
+#: Localization.cpp:31 Localization.cpp:69
 msgid "Message boards"
 msgstr "לוחות הודעות"
 
-#: clientgui/Localization.cpp:33
+#: Localization.cpp:33
 msgid "Correspond with other users on the SETI at home message boards"
 msgstr "התכתב עם משתמשים אחרים על גבי לוחות ההודעות של SETI at home"
 
-#: clientgui/Localization.cpp:37
+#: Localization.cpp:37
 msgid "Ask questions and report problems"
 msgstr "שאל שאלות ודווח על תקלות"
 
-#: clientgui/Localization.cpp:39
-#: clientgui/Localization.cpp:81
-#: clientgui/Localization.cpp:111
-#: clientgui/Localization.cpp:129
+#: Localization.cpp:39 Localization.cpp:81 Localization.cpp:111
+#: Localization.cpp:129
 msgid "Your account"
 msgstr "החשבון שלך"
 
-#: clientgui/Localization.cpp:41
-#: clientgui/Localization.cpp:87
-#: clientgui/Localization.cpp:113
+#: Localization.cpp:41 Localization.cpp:87 Localization.cpp:113
 msgid "View your account information and credit totals"
 msgstr "הצג מידע על החשבון שלך וסיכום נקודות"
 
-#: clientgui/Localization.cpp:43
+#: Localization.cpp:43
 msgid "Your preferences"
 msgstr "ההעדפות שלך"
 
-#: clientgui/Localization.cpp:45
+#: Localization.cpp:45
 msgid "View and modify your SETI at home account profile and preferences"
 msgstr "מראה ומשנה את פרופיל החשבון והעדפות שלך ב-SETI at home"
 
-#: clientgui/Localization.cpp:47
-#: clientgui/Localization.cpp:89
+#: Localization.cpp:47 Localization.cpp:89
 msgid "Your results"
 msgstr "התוצאות שלך"
 
-#: clientgui/Localization.cpp:49
-#: clientgui/Localization.cpp:91
+#: Localization.cpp:49 Localization.cpp:91
 msgid "View your last week (or more) of computational results and work"
 msgstr "הצג את התוצאות החישוב  והעבודה שלך מהשבוע שעבר (או יותר)"
 
-#: clientgui/Localization.cpp:51
-#: clientgui/Localization.cpp:93
+#: Localization.cpp:51 Localization.cpp:93
 msgid "Your computers"
 msgstr "המחשבים שלך"
 
-#: clientgui/Localization.cpp:53
+#: Localization.cpp:53
 msgid "View a listing of all the computers on which you are running SETI at Home"
 msgstr "הצג רשימה של כל המחשבים שמריצים את SETI at home"
 
-#: clientgui/Localization.cpp:55
-#: clientgui/Localization.cpp:97
+#: Localization.cpp:55 Localization.cpp:97
 msgid "Your team"
 msgstr "הקבוצה שלך"
 
-#: clientgui/Localization.cpp:57
-#: clientgui/Localization.cpp:99
+#: Localization.cpp:57 Localization.cpp:99
 msgid "View information about your team"
 msgstr "הצג מידע אודות הקבוצה שלך"
 
-#: clientgui/Localization.cpp:61
+#: Localization.cpp:61
 msgid "Common questions"
 msgstr "שאלות נפוצות"
 
-#: clientgui/Localization.cpp:63
+#: Localization.cpp:63
 msgid "Read the Einstein at Home Frequently Asked Question list"
 msgstr "קרא את רשימת השאלות הנפוצות של Einstein at Home"
 
-#: clientgui/Localization.cpp:65
+#: Localization.cpp:65
 msgid "Screensaver info"
 msgstr "מידע על השומר מסך"
 
-#: clientgui/Localization.cpp:67
+#: Localization.cpp:67
 msgid "Read a detailed description of the Einstein at Home screensaver"
 msgstr "קרא תאור מפורט אודות שומר המסך של Einstein at Home"
 
-#: clientgui/Localization.cpp:71
-msgid "Correspond with admins and other users on the Einstein at Home message boards"
+#: Localization.cpp:71
+msgid ""
+"Correspond with admins and other users on the Einstein at Home message boards"
 msgstr "התכתב עם מנהלים ומשתמשים אחרים על גבי לוחות ההודעות של Einstein at home"
 
-#: clientgui/Localization.cpp:73
+#: Localization.cpp:73
 msgid "Einstein status"
 msgstr "מצב Einstein"
 
-#: clientgui/Localization.cpp:75
+#: Localization.cpp:75
 msgid "Current status of the Einstein at Home server"
 msgstr "המצב הנוכחי של שרת ה-Einstein at Home"
 
-#: clientgui/Localization.cpp:77
+#: Localization.cpp:77
 msgid "Report problems"
 msgstr "דווח על תקלות"
 
-#: clientgui/Localization.cpp:79
+#: Localization.cpp:79
 msgid "A link to the Einstein at Home problems and bug reports message board"
 msgstr "קישור ללוח ההודעות על דיווחי שגיאות ותקלות של  Einstein at Home"
 
-#: clientgui/Localization.cpp:83
+#: Localization.cpp:83
 msgid "View and modify your Einstein at Home account profile and preferences"
 msgstr "הצג ושנה את פרופיל החשבון והעדפות שלך ב-Einstein at Home"
 
-#: clientgui/Localization.cpp:85
+#: Localization.cpp:85
 msgid "Account summary"
 msgstr "סיכום החשבון"
 
-#: clientgui/Localization.cpp:95
-msgid "View a listing of all the computers on which you are running Einstein at Home"
+#: Localization.cpp:95
+msgid ""
+"View a listing of all the computers on which you are running Einstein at Home"
 msgstr "הצג את כל המחשבים שמריצים את Einstein at Home"
 
-#: clientgui/Localization.cpp:101
+#: Localization.cpp:101
 msgid "LIGO project"
 msgstr "פרוייקט LIGO"
 
-#: clientgui/Localization.cpp:103
-msgid "The home page of the Laser Interferometer Gravitational-wave Observatory (LIGO) project"
-msgstr "עמוד הבית של פרוייקט ה-Laser Interferometer Gravitational-wave Observatory (LIGO)"
+#: Localization.cpp:103
+msgid ""
+"The home page of the Laser Interferometer Gravitational-wave Observatory "
+"(LIGO) project"
+msgstr ""
+"עמוד הבית של פרוייקט ה-Laser Interferometer Gravitational-wave Observatory "
+"(LIGO)"
 
-#: clientgui/Localization.cpp:105
+#: Localization.cpp:105
 msgid "GEO-600 project"
 msgstr "פרוייקט GEO-600"
 
-#: clientgui/Localization.cpp:107
+#: Localization.cpp:107
 msgid "The home page of the GEO-600 project"
 msgstr "עמוד הבית של פרוייקט ה-GEO-600"
 
-#: clientgui/Localization.cpp:115
-#: clientgui/Localization.cpp:133
+#: Localization.cpp:115 Localization.cpp:133 ViewProjects.cpp:221
+#: ViewStatistics.cpp:465
 msgid "Team"
 msgstr "קבוצה"
 
-#: clientgui/Localization.cpp:117
+#: Localization.cpp:117
 msgid "Info about your Team"
 msgstr "מידע אודות הקבוצה שלך"
 
-#: clientgui/Localization.cpp:123
+#: Localization.cpp:123
 msgid "Get help for climateprediction.net"
 msgstr "קבל עזרה מ-climateprediction.net"
 
-#: clientgui/Localization.cpp:125
+#: Localization.cpp:125
 msgid "News"
 msgstr "חדשות"
 
-#: clientgui/Localization.cpp:127
+#: Localization.cpp:127
 msgid "climateprediction.net News"
 msgstr "חדשות climateprediction.net"
 
-#: clientgui/Localization.cpp:131
+#: Localization.cpp:131
 msgid "View your account information, credits, and trickles"
 msgstr "צפה בפרטי החשבון שלך, נקודות זכות וחלקי מידע"
 
-#: clientgui/Localization.cpp:135
+#: Localization.cpp:135
 msgid "Info about your team"
 msgstr "מידע אודות הקבוצה שלך"
 
-#: clientgui/Localization.cpp:141
+#: Localization.cpp:141
 msgid "Search for help in our help system"
 msgstr "חפש עזרה במערכת העזרה שלנו"
 
-#: clientgui/Localization.cpp:143
+#: Localization.cpp:143
 msgid "Global Statistics"
 msgstr "סטטיסטיקות גלובליות"
 
-#: clientgui/Localization.cpp:145
+#: Localization.cpp:145
 msgid "Summary statistics for World Community Grid"
 msgstr "סטטיסטיקות מתומצתות על World Community Grid"
 
-#: clientgui/Localization.cpp:147
+#: Localization.cpp:147
 msgid "My Grid"
 msgstr "ה-Grid שלי"
 
-#: clientgui/Localization.cpp:149
+#: Localization.cpp:149
 msgid "Your statistics and settings"
 msgstr "הסטטיסטיקות והגדרות שלך"
 
-#: clientgui/Localization.cpp:151
+#: Localization.cpp:151
 msgid "Device Profiles"
 msgstr "פרופילי התקנים"
 
-#: clientgui/Localization.cpp:153
+#: Localization.cpp:153
 msgid "Update your device settings"
 msgstr "עדכן את הגדרות ההתקנים שלך"
 
-#: clientgui/Localization.cpp:155
+#: Localization.cpp:155
 msgid "Research"
 msgstr "מחקר"
 
-#: clientgui/Localization.cpp:157
+#: Localization.cpp:157
 msgid "Learn about the projects hosted at World Community Grid"
 msgstr "למד אודות הפרוייקטים של World Community Grid"
 
-#: clientgui/MainDocument.cpp:583
+#: MainDocument.cpp:583
 msgid "Starting client"
 msgstr "מפעיל קליינט"
 
-#: clientgui/MainDocument.cpp:591
+#: MainDocument.cpp:591
 msgid "Connecting to client"
 msgstr "מתחבר לקליינט"
 
-#: clientgui/MainDocument.cpp:1205
+#: MainDocument.cpp:1195
 msgid "Retrieving system state; please wait..."
 msgstr "מאחזר את מצב המערכת; אנא המתן..."
 
-#: clientgui/MainDocument.cpp:1826
+#: MainDocument.cpp:1816
 #, fuzzy
 msgid "Missing application"
 msgstr "אפליקציות מיוחדות"
 
-#: clientgui/MainDocument.cpp:1827
-msgid "Please download and install the CoRD application from http://cord.sourceforge.net"
+#: MainDocument.cpp:1817
+msgid ""
+"Please download and install the CoRD application from http://cord."
+"sourceforge.net"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2442
+#: MainDocument.cpp:2432
 msgid "on batteries"
 msgstr "פועל על סוללות"
 
-#: clientgui/MainDocument.cpp:2443
+#: MainDocument.cpp:2433
 msgid "computer is in use"
 msgstr "המחשב בשימוש"
 
-#: clientgui/MainDocument.cpp:2444
+#: MainDocument.cpp:2434
 msgid "user request"
 msgstr "בקשת משתמש"
 
-#: clientgui/MainDocument.cpp:2445
+#: MainDocument.cpp:2435
 msgid "time of day"
 msgstr "זמן של היום"
 
-#: clientgui/MainDocument.cpp:2446
+#: MainDocument.cpp:2436
 msgid "CPU benchmarks in progress"
 msgstr "הערכת ביצועי מעבד מתבצעת"
 
-#: clientgui/MainDocument.cpp:2447
+#: MainDocument.cpp:2437
 msgid "need disk space - check preferences"
 msgstr "יש צורך בשטח דיסק - בדוק העדפות"
 
-#: clientgui/MainDocument.cpp:2448
+#: MainDocument.cpp:2438
 msgid "computer is not in use"
 msgstr "המחשב אינו בשימוש"
 
-#: clientgui/MainDocument.cpp:2449
+#: MainDocument.cpp:2439
 msgid "starting up"
 msgstr "מתחיל"
 
-#: clientgui/MainDocument.cpp:2450
+#: MainDocument.cpp:2440
 msgid "an exclusive app is running"
 msgstr "יישום יחודי רץ כרגע"
 
-#: clientgui/MainDocument.cpp:2451
+#: MainDocument.cpp:2441
 msgid "CPU is busy"
 msgstr "מעבד תפוס"
 
-#: clientgui/MainDocument.cpp:2452
+#: MainDocument.cpp:2442
 msgid "network bandwidth limit exceeded"
 msgstr "חריגה מהגבלת רוחב הפס של הרשת"
 
-#: clientgui/MainDocument.cpp:2453
+#: MainDocument.cpp:2443
 #, fuzzy
 msgid "requested by operating system"
 msgstr "נתבקש על ידי מערכת ההפעלה"
 
-#: clientgui/MainDocument.cpp:2455
+#: MainDocument.cpp:2445
 msgid "unknown reason"
 msgstr "סיבה לא ידועה"
 
-#: clientgui/MainDocument.cpp:2477
+#: MainDocument.cpp:2467
 msgid "GPU missing, "
 msgstr "מעבד גרפי חסר."
 
-#: clientgui/MainDocument.cpp:2484
+#: MainDocument.cpp:2474
 msgid "New"
 msgstr "חדש"
 
-#: clientgui/MainDocument.cpp:2488
+#: MainDocument.cpp:2478
 msgid "Download failed"
 msgstr "הורדה נכשלה"
 
-#: clientgui/MainDocument.cpp:2490
+#: MainDocument.cpp:2480
 msgid "Downloading"
 msgstr "מוריד"
 
-#: clientgui/MainDocument.cpp:2492
-#: clientgui/MainDocument.cpp:2557
+#: MainDocument.cpp:2482 MainDocument.cpp:2552
 msgid " (suspended - "
 msgstr "(מושהה - "
 
-#: clientgui/MainDocument.cpp:2500
+#: MainDocument.cpp:2490
 msgid "Project suspended by user"
 msgstr "פרוייקט הושהה על ידי המשתמש"
 
-#: clientgui/MainDocument.cpp:2502
+#: MainDocument.cpp:2492
 msgid "Task suspended by user"
 msgstr "משימה הושתה על ידי המשתמש"
 
-#: clientgui/MainDocument.cpp:2504
+#: MainDocument.cpp:2494
 msgid "Suspended - "
 msgstr "מושהה -"
 
 # 75%
-#: clientgui/MainDocument.cpp:2510
+#: MainDocument.cpp:2500
 #, fuzzy
 msgid "GPU suspended - "
 msgstr "(מושהה - "
 
-#: clientgui/MainDocument.cpp:2517
+#: MainDocument.cpp:2507
 msgid "Waiting for memory"
 msgstr "ממתין לזיכרון"
 
-#: clientgui/MainDocument.cpp:2519
+#: MainDocument.cpp:2509
 msgid "Waiting for shared memory"
 msgstr "ממתין לזיכרון משותף"
 
-#: clientgui/MainDocument.cpp:2521
+#: MainDocument.cpp:2512
+msgid "Running, high priority"
+msgstr "רץ, עדיפות גבוהה"
+
+#: MainDocument.cpp:2514
 msgid "Running"
 msgstr "רץ"
 
-#: clientgui/MainDocument.cpp:2523
+#: MainDocument.cpp:2517
 msgid " (non-CPU-intensive)"
 msgstr "(ללא דרישת מעבד)"
 
-#: clientgui/MainDocument.cpp:2526
+#: MainDocument.cpp:2520
 msgid "Waiting to run"
 msgstr "ממתין להרצה"
 
-#: clientgui/MainDocument.cpp:2528
-#: clientgui/MainDocument.cpp:2534
+#: MainDocument.cpp:2522 MainDocument.cpp:2528
 msgid "Ready to start"
 msgstr "מוכן להתחיל"
 
-#: clientgui/MainDocument.cpp:2538
-msgid "Postponed: "
+#: MainDocument.cpp:2532
+msgid " (Scheduler wait: "
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2541
-msgid "Postponed"
+#: MainDocument.cpp:2536
+msgid " (Scheduler wait)"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2545
-msgid "Waiting for network access"
-msgstr ""
+#: MainDocument.cpp:2540
+#, fuzzy
+msgid " (Waiting for network access)"
+msgstr "ממתין לזיכרון"
 
-#: clientgui/MainDocument.cpp:2549
+#: MainDocument.cpp:2544
 msgid "Computation error"
 msgstr "שגיאת עיבוד"
 
-#: clientgui/MainDocument.cpp:2553
+#: MainDocument.cpp:2548
 msgid "Upload failed"
 msgstr "העלאה נכשלה"
 
-#: clientgui/MainDocument.cpp:2555
+#: MainDocument.cpp:2550
 msgid "Uploading"
 msgstr "מעלה"
 
-#: clientgui/MainDocument.cpp:2566
+#: MainDocument.cpp:2561
 msgid "Aborted by user"
 msgstr "בוטל על ידי המשתמש"
 
-#: clientgui/MainDocument.cpp:2569
+#: MainDocument.cpp:2564
 msgid "Aborted by project"
 msgstr "בוטל על ידי הפרוייקט"
 
-#: clientgui/MainDocument.cpp:2572
+#: MainDocument.cpp:2567
 msgid "Aborted: not started by deadline"
 msgstr "בוטל: לא התחיל לפני התאריך האחרון לביצוע"
 
-#: clientgui/MainDocument.cpp:2575
+#: MainDocument.cpp:2570
 msgid "Aborted: disk limit exceeded"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2578
+#: MainDocument.cpp:2573
 msgid "Aborted: run time limit exceeded"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2581
+#: MainDocument.cpp:2576
 msgid "Aborted: memory limit exceeded"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2584
+#: MainDocument.cpp:2579
 msgid "Aborted"
 msgstr "בוטל"
 
-#: clientgui/MainDocument.cpp:2589
+#: MainDocument.cpp:2584
 msgid "Acknowledged"
 msgstr "אושר"
 
-#: clientgui/MainDocument.cpp:2591
+#: MainDocument.cpp:2586
 msgid "Ready to report"
 msgstr "מוכן לדיווח"
 
-#: clientgui/MainDocument.cpp:2593
+#: MainDocument.cpp:2588
 #, c-format
 msgid "Error: invalid state '%d'"
 msgstr "שגיאה: מצב לא חוקי '%d'"
 
-#: clientgui/NoInternetConnectionPage.cpp:179
+#: NoInternetConnectionPage.cpp:179
 msgid "No Internet connection"
 msgstr "אין חיבור לאינטרנט"
 
-#: clientgui/NoInternetConnectionPage.cpp:182
+#: NoInternetConnectionPage.cpp:182
 msgid "Please connect to the Internet and try again."
 msgstr "אנא התחבר לאינטרנט ונסה שוב."
 
-#: clientgui/NotDetectedPage.cpp:181
+#: NotDetectedPage.cpp:181
 msgid "Project not found"
 msgstr "הפרוייקט לא נמצא"
 
-#: clientgui/NotDetectedPage.cpp:184
+#: NotDetectedPage.cpp:184
 msgid ""
 "The URL you supplied is not that of a BOINC-based project.\n"
 "\n"
@@ -2574,11 +2509,11 @@ msgstr ""
 "\n"
 "אנא בדוק את הכתובת ונסה שוב."
 
-#: clientgui/NotDetectedPage.cpp:188
+#: NotDetectedPage.cpp:188
 msgid "Account manager not found"
 msgstr "מנהל חשבונות לא נמצא"
 
-#: clientgui/NotDetectedPage.cpp:191
+#: NotDetectedPage.cpp:191
 msgid ""
 "The URL you supplied is not that of a BOINC-based account\n"
 "manager.\n"
@@ -2589,93 +2524,92 @@ msgstr ""
 "\n"
 "אנא בדוק את הכתובת ונסה שוב."
 
-#: clientgui/NotFoundPage.cpp:181
+#: NotFoundPage.cpp:181
 msgid "Login Failed."
 msgstr "התחברות נכשלה."
 
-#: clientgui/NotFoundPage.cpp:185
+#: NotFoundPage.cpp:185
 msgid "Check the username and password, and try again."
 msgstr "בדוק את שם המשתמש והסיסמה, ונסה שוב."
 
-#: clientgui/NotFoundPage.cpp:189
+#: NotFoundPage.cpp:189
 msgid "Check the email address and password, and try again."
 msgstr "בדוק את כתובת הדוא\"ל והסיסמה, ונסה שוב."
 
-#: clientgui/NoticeListCtrl.cpp:229
+#: NoticeListCtrl.cpp:222
 msgid "more..."
 msgstr "עוד..."
 
-#: clientgui/ProjectInfoPage.cpp:221
+#: ProjectInfoPage.cpp:477 ProjectInfoPage.cpp:778 ProjectInfoPage.cpp:782
+msgid "All"
+msgstr "הכל"
+
+#: ProjectInfoPage.cpp:615
 msgid "Choose a project"
 msgstr "בחר פרוייקט"
 
-#: clientgui/ProjectInfoPage.cpp:228
+#: ProjectInfoPage.cpp:619
 msgid "To choose a project, click its name or type its URL below."
 msgstr "כדי לבחור פרוייקט, לחץ על השם שלו או רשום את כתובת האינטרנט שלו למטה."
 
-#: clientgui/ProjectInfoPage.cpp:246
+#: ProjectInfoPage.cpp:623
 #, fuzzy
 msgid "Categories:"
 msgstr "קטגוריות:"
 
-#: clientgui/ProjectInfoPage.cpp:267
+#: ProjectInfoPage.cpp:627 sg_ProjectPanel.cpp:89
 msgid "Projects:"
 msgstr "פרוייקטים:"
 
-#: clientgui/ProjectInfoPage.cpp:279
+#: ProjectInfoPage.cpp:631
 msgid "Project details"
 msgstr "פרטי הפרוייקט"
 
-#: clientgui/ProjectInfoPage.cpp:291
+#: ProjectInfoPage.cpp:635
 msgid "Research area:"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:302
+#: ProjectInfoPage.cpp:639
 #, fuzzy
 msgid "Organization:"
 msgstr "אירגון:"
 
-#: clientgui/ProjectInfoPage.cpp:313
+#: ProjectInfoPage.cpp:643
 msgid "Web site:"
 msgstr "אתר אינטרנט:"
 
-#: clientgui/ProjectInfoPage.cpp:325
+#: ProjectInfoPage.cpp:647
 #, fuzzy
 msgid "Supported systems:"
 msgstr "מערכות נתמכות:"
 
-#: clientgui/ProjectInfoPage.cpp:363
+#: ProjectInfoPage.cpp:651
 msgid "Project URL:"
 msgstr "כתובת האינטרנט של הפרוייקט:"
 
-#: clientgui/ProjectInfoPage.cpp:499
-#: clientgui/ProjectInfoPage.cpp:754
-#: clientgui/ProjectInfoPage.cpp:758
-msgid "All"
-msgstr "הכל"
-
-#: clientgui/ProjectInfoPage.cpp:802
-msgid "This project may not have work for your type of computer.  Do you want to add it anyway?"
+#: ProjectInfoPage.cpp:826
+msgid ""
+"This project may not have work for your type of computer.  Do you want to "
+"add it anyway?"
 msgstr "ייתכן ולפרוייקט זה אין עבודה לסוג המחשב שלך. האם תרצה להוסיפו בכל זאת?"
 
-#: clientgui/ProjectInfoPage.cpp:826
+#: ProjectInfoPage.cpp:850
 msgid "You already added this project. Please choose a different project."
 msgstr "כבר הוספת פרוייקט זה. אנא בחר פרוייקט אחר."
 
-#: clientgui/ProjectProcessingPage.cpp:321
+#: ProjectProcessingPage.cpp:321
 msgid "Communicating with project."
 msgstr "מתקשר עם הפרוייקט."
 
-#: clientgui/ProjectProcessingPage.cpp:510
+#: ProjectProcessingPage.cpp:509
 msgid "Required files not found on the server."
 msgstr "קבצים דרושים לא נמצאו על השרת."
 
-#: clientgui/ProjectProcessingPage.cpp:513
-#: clientgui/ProjectProcessingPage.cpp:586
+#: ProjectProcessingPage.cpp:512 ProjectProcessingPage.cpp:574
 msgid "An internal server error has occurred."
 msgstr "התרחשה שגיאת שרת פנימית."
 
-#: clientgui/ProjectPropertiesPage.cpp:334
+#: ProjectPropertiesPage.cpp:334
 msgid ""
 "Communicating with project\n"
 "Please wait..."
@@ -2683,48 +2617,11 @@ msgstr ""
 "מתקשר עם הפרוייקט\n"
 "אנא המתן..."
 
-#: clientgui/ProjectWelcomePage.cpp:251
-#, c-format
-msgid "Welcome to %s."
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:254
-msgid "You have volunteered to compute for this project:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:255
-msgid "Name:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:258
-msgid "Home:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:262
-msgid "Description:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:265
-msgid "URL:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:268
-msgid "User:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:273
-msgid "WARNING: This project is not registered with BOINC.  Make sure you trust it before continuing."
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:277
-msgid "To continue, click Next."
-msgstr "כדי להמשיך, לחץ 'הבא'."
-
-#: clientgui/ProxyInfoPage.cpp:195
+#: ProxyInfoPage.cpp:195
 msgid "Network communication failure"
 msgstr "תקשורת לרשת נכשלה"
 
-#: clientgui/ProxyInfoPage.cpp:199
+#: ProxyInfoPage.cpp:199
 msgid ""
 "The World Community Grid - BOINC software failed to communicate\n"
 "over the Internet. The most likely reasons are:\n"
@@ -2754,7 +2651,7 @@ msgstr ""
 "3) אתה משתמש בשרת פרוקסי.\n"
 "לחץ 'הבא' כדי להגדיר את הגדרות הפרוקסי של BOINC."
 
-#: clientgui/ProxyInfoPage.cpp:203
+#: ProxyInfoPage.cpp:203
 msgid ""
 "BOINC failed to communicate on the Internet.\n"
 "The most likely reasons are:\n"
@@ -2784,1368 +2681,1317 @@ msgstr ""
 "3) אתה משתמש בשרת פרוקסי.\n"
 "לחץ 'הבא' כדי להגדיר את הגדרות הפרוקסי של BOINC."
 
-#: clientgui/ProxyPage.cpp:331
+#: ProxyPage.cpp:331
 msgid "Proxy configuration"
 msgstr "תצורת פרוקסי"
 
-#: clientgui/ProxyPage.cpp:334
+#: ProxyPage.cpp:334
 msgid "HTTP proxy"
 msgstr "שרת פרוקסי מסוג HTTP"
 
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
+#: ProxyPage.cpp:337 ProxyPage.cpp:357
 msgid "Server:"
 msgstr "שרת:"
 
-#: clientgui/ProxyPage.cpp:350
+#: ProxyPage.cpp:350
 msgid "Autodetect"
 msgstr "זיהוי אוטומטי"
 
-#: clientgui/ProxyPage.cpp:354
+#: ProxyPage.cpp:354
 msgid "SOCKS proxy"
 msgstr "שרת פרוקסי מסוג SOCKS"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:167
-msgid "Advanced View...\tCtrl+Shift+A"
-msgstr "תצוגה מתקדמת...\tCtrl+Shift+A"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:168
-msgid "Display the advanced graphical interface."
-msgstr "הצג ממשק גרפי מתקדם."
+#: TermsOfUsePage.cpp:218
+msgid "Terms of Use"
+msgstr "תנאי השימוש"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:175
-msgid "Skin"
-msgstr "מראה"
+#: TermsOfUsePage.cpp:222
+msgid "Please read the following terms of use:"
+msgstr "אנא קרא את תנאי השימוש הבאים:"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:177
-#, fuzzy
-msgid "Select the appearance of the user interface."
-msgstr "בחר את המראה של ממשק המשתמש."
+#: TermsOfUsePage.cpp:231
+msgid "I agree to the terms of use."
+msgstr "אני מסכים לתנאי השימוש."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:224
-#, c-format
-msgid "&%s"
-msgstr "&%s"
+#: TermsOfUsePage.cpp:237
+msgid "I do not agree to the terms of use."
+msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:405
-msgid "Default"
-msgstr "ברירת מחדל"
+#: UnavailablePage.cpp:183
+msgid "Project temporarily unavailable"
+msgstr "זמנית הפרוייקט לא זמין"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:848
-msgid "Suspend"
-msgstr "השהה"
+#: UnavailablePage.cpp:186
+msgid ""
+"The project is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr ""
+"זמנית הפרוייקט אינו זמין.\n"
+"\n"
+"אנא נסה במועד מאוחר יותר."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:850
-#, fuzzy
-msgid "Suspend Computing"
-msgstr "השהה חישובים"
+#: UnavailablePage.cpp:190
+msgid "Account manager temporarily unavailable"
+msgstr "זמנית מנהל החשבונות אינו זמין"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:851
-#, fuzzy
-msgid "Resume Computing"
-msgstr "המשך חישובים"
+#: UnavailablePage.cpp:193
+msgid ""
+"The account manager is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr ""
+"זמנית מנהל החשבונות אינו זמין.\n"
+"\n"
+"אנא נסה במועד באוחר יותר."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:867
-msgid "Notices"
-msgstr "התראות"
+#: ValidateAccountKey.cpp:68
+msgid "Please specify an account key to continue."
+msgstr "אנא הזן קוד חשבון כדי להמשיך."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:868
-msgid "Open a window to view notices from projects or BOINC"
-msgstr "פתח חלון לצפיה בהתראות מהפרוייקטים או מ-BOINC"
+#: ValidateAccountKey.cpp:71
+msgid "Invalid Account Key; please enter a valid Account Key"
+msgstr "קוד חשבון לא נכון; אנא הזן קוד חשבון תקף"
 
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
-msgstr ""
+#: ValidateAccountKey.cpp:82 ValidateEmailAddress.cpp:86
+msgid "Validation conflict"
+msgstr "סתירת אימות"
 
-#: clientgui/sg_DlgMessages.cpp:132
-msgid "There are no notices at this time."
-msgstr "אין התראות להציג בשלב זה."
+#: ValidateEmailAddress.cpp:72
+msgid "Please specify an email address"
+msgstr "אנא הזן כתובת דוא\"ל"
 
-#: clientgui/sg_DlgMessages.cpp:146
-msgid "Close"
-msgstr "&סגור"
+#: ValidateEmailAddress.cpp:75
+msgid "Invalid email address; please enter a valid email address"
+msgstr "כתובת דוא\"ל לא חוקית; אנא הזן כתובת דוא\"ל חוקית"
 
-#: clientgui/sg_DlgMessages.cpp:394
-#, c-format
-msgid "%s - Notices"
-msgstr "%s - התראות"
+#: ValidateURL.cpp:69
+msgid "Missing URL"
+msgstr "כתובת אינטרנט חסרה"
 
-#: clientgui/sg_DlgPreferences.cpp:270
-msgid "This dialog controls preferences for this computer only."
+#: ValidateURL.cpp:70
+msgid ""
+"Please specify a URL.\n"
+"For example:\n"
+"http://www.example.com/"
 msgstr ""
+"אנא הזן כתובת אתר.\n"
+"לדוגמא:\n"
+"http://www.example.com/"
 
-#: clientgui/sg_DlgPreferences.cpp:275
-msgid "Click OK to set preferences."
-msgstr ""
+#: ValidateURL.cpp:83 ValidateURL.cpp:87 ValidateURL.cpp:91
+#: ValidateURL.cpp:103 ValidateURL.cpp:107 ValidateURL.cpp:110
+msgid "Invalid URL"
+msgstr "כתובת אתר לא חוקית"
 
-#: clientgui/sg_DlgPreferences.cpp:280
-msgid "Click Clear to restore web-based settings for all preferences listed below."
+#: ValidateURL.cpp:84 ValidateURL.cpp:88 ValidateURL.cpp:92
+msgid ""
+"Please specify a valid URL.\n"
+"For example:\n"
+"http://boincproject.example.com"
 msgstr ""
+"אנא הזן כתובת אתר חוקית.\n"
+"לדוגמא:\n"
+"http://boincproject.example.com"
 
-#: clientgui/sg_DlgPreferences.cpp:287
-msgid "For additional settings, select Computing Preferences in the Advanced View."
-msgstr ""
+#: ValidateURL.cpp:104 ValidateURL.cpp:108
+#, c-format
+msgid "'%s' does not contain a valid host name."
+msgstr "'%s אינו מכיל שם מחשב תקף."
 
-#: clientgui/sg_DlgPreferences.cpp:315
-msgid "Do work only between:"
-msgstr "תעבוד רק בין:"
+#: ValidateURL.cpp:111
+#, c-format
+msgid "'%s' does not contain a valid path."
+msgstr "'%s' אינו מכיל נתיב תקף."
 
-#: clientgui/sg_DlgPreferences.cpp:337
-msgid "Connect to internet only between:"
-msgstr "התחבר לאינטרנט רק בין:"
+#: ViewMessages.cpp:84 ViewProjects.cpp:170 ViewStatistics.cpp:1978
+#: ViewTransfers.cpp:160 ViewWork.cpp:183
+msgid "Commands"
+msgstr "פקודות"
 
-#: clientgui/sg_DlgPreferences.cpp:359
-#: clientgui/sg_DlgPreferences.cpp:376
-msgid "Use no more than:"
-msgstr "השתמש לכל היותר ב-"
+#: ViewMessages.cpp:88
+msgid "Copy all messages"
+msgstr "העתק את כל ההודעות"
 
-#: clientgui/sg_DlgPreferences.cpp:372
-msgid "of disk space"
-msgstr "מתוך שטח הדיסק"
+#: ViewMessages.cpp:95
+msgid "Copy selected messages"
+msgstr "העתק הודעות נבחרות"
 
-#: clientgui/sg_DlgPreferences.cpp:389
-msgid "of the processor"
-msgstr "של המעבד"
+#: ViewMessages.cpp:106 ViewMessages.cpp:502
+msgid "Show only this project"
+msgstr "הצג פרוייקט זה בלבד"
 
-#: clientgui/sg_DlgPreferences.cpp:393
-msgid "Do work while on battery?"
-msgstr "האם לבצע חישובים בזמן עבודה על סוללות?"
+#: ViewMessages.cpp:107 ViewMessages.cpp:503
+msgid "Show only the messages for the selected project."
+msgstr "הצג את ההודעות הקשורות לפרוייקט הנבחר בלבד."
 
-#: clientgui/sg_DlgPreferences.cpp:406
-msgid "Do work after idle for:"
-msgstr "התחל לעבוד אחרי אי שימוש במחשב במשך:"
+#: ViewMessages.cpp:164
+msgid "Messages"
+msgstr "הודעות"
 
-#: clientgui/sg_DlgPreferences.cpp:431
-msgid "Clear all local preferences listed above and close the dialog"
-msgstr ""
+#: ViewMessages.cpp:187
+msgid "Copying all messages to the clipboard..."
+msgstr "מעתיק את כל ההודעות ללוח..."
 
-#: clientgui/sg_DlgPreferences.cpp:609
-#: clientgui/sg_DlgPreferences.cpp:612
-#: clientgui/sg_DlgPreferences.cpp:688
-#: clientgui/sg_DlgPreferences.cpp:692
-#: clientgui/sg_DlgPreferences.cpp:704
-#: clientgui/sg_DlgPreferences.cpp:708
-#: clientgui/sg_DlgPreferences.cpp:851
-#: clientgui/sg_DlgPreferences.cpp:862
-msgid "Anytime"
-msgstr "תמיד"
+#: ViewMessages.cpp:223
+msgid "Copying selected messages to the clipboard..."
+msgstr "מעתיק הודעות נבחרות ללוח..."
 
-#: clientgui/sg_DlgPreferences.cpp:645
-msgid "100 MB"
-msgstr "100 MB"
+#: ViewMessages.cpp:286
+msgid "Filtering messages..."
+msgstr "מסנן הודעות..."
 
-#: clientgui/sg_DlgPreferences.cpp:646
-msgid "200 MB"
-msgstr "200 MB"
+#: ViewMessages.cpp:494
+msgid "Show all messages"
+msgstr "הצג את כל ההודעות"
 
-#: clientgui/sg_DlgPreferences.cpp:647
-msgid "500 MB"
-msgstr "500 MB"
+#: ViewMessages.cpp:495
+msgid "Show messages for all projects."
+msgstr "הצג הודעות לכל הפרוייקטים."
 
-#: clientgui/sg_DlgPreferences.cpp:648
-msgid "1 GB"
-msgstr "1 GB"
+#: ViewNotices.cpp:58 sg_DlgMessages.cpp:124
+msgid "Fetching notices; please wait..."
+msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:649
-msgid "2 GB"
-msgstr "2 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:650
-msgid "5 GB"
-msgstr "5 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:651
-msgid "10 GB"
-msgstr "10 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:652
-msgid "20 GB"
-msgstr "20 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:653
-msgid "50 GB"
-msgstr "50 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:654
-msgid "100 GB"
-msgstr "100 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:724
-#, c-format
-msgid "%d MB"
-msgstr "%d MB"
-
-#: clientgui/sg_DlgPreferences.cpp:726
-#, c-format
-msgid "%4.2f GB"
-msgstr "%4.2f GB"
-
-#: clientgui/sg_DlgPreferences.cpp:767
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: clientgui/sg_DlgPreferences.cpp:803
-msgid "0 (Run Always)"
-msgstr "0 (תריץ תמיד)"
-
-#: clientgui/sg_DlgPreferences.cpp:806
-#, c-format
-msgid "%d"
-msgstr "%d"
-
-#: clientgui/sg_DlgPreferences.cpp:953
-#, c-format
-msgid "%s - Computing Preferences"
-msgstr ""
+#: ViewNotices.cpp:65 sg_DlgMessages.cpp:132
+msgid "There are no notices at this time."
+msgstr "אין התראות להציג בשלב זה."
 
-#: clientgui/sg_DlgPreferences.cpp:1033
-#, fuzzy
-msgid "Do you really want to clear all local preferences?\n"
-msgstr "האם אתה בטוח שברצונך למחוק את כל ההעדפות המקומיות?"
+#: ViewNotices.cpp:99 sg_BoincSimpleFrame.cpp:776
+msgid "Notices"
+msgstr "התראות"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:66
-#: clientgui/ViewProjects.cpp:179
+#: ViewProjects.cpp:174 sg_ProjectCommandPopup.cpp:61
 msgid "Update"
 msgstr "עדכן"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:67
-#: clientgui/ViewProjects.cpp:180
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
-msgstr "דווח את כל המשימות שהושלמו, קבל את הניקוד העדכני, קבל את ההעדפות המעודכנות וככל הנראה קבל עוד משימות. ."
+#: ViewProjects.cpp:175 sg_ProjectCommandPopup.cpp:62
+msgid ""
+"Report all completed tasks, get latest credit, get latest preferences, and "
+"possibly get more tasks."
+msgstr ""
+"דווח את כל המשימות שהושלמו, קבל את הניקוד העדכני, קבל את ההעדפות המעודכנות "
+"וככל הנראה קבל עוד משימות. ."
+
+#: 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
+msgid "Suspend"
+msgstr "השהה"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:73
-#: clientgui/sg_ProjectCommandPopup.cpp:129
-#: clientgui/ViewProjects.cpp:187
-#: clientgui/ViewProjects.cpp:727
+#: ViewProjects.cpp:182 ViewProjects.cpp:722 sg_ProjectCommandPopup.cpp:68
+#: sg_ProjectCommandPopup.cpp:114
 msgid "Suspend tasks for this project."
 msgstr "השהה משימות של פרוייקט זה."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:78
-#: clientgui/sg_ProjectCommandPopup.cpp:136
-#: clientgui/ViewProjects.cpp:193
-#: clientgui/ViewProjects.cpp:746
+#: ViewProjects.cpp:188 ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:73
+#: sg_ProjectCommandPopup.cpp:121
 msgid "No new tasks"
 msgstr "אין משימות חדשות"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:79
-#: clientgui/ViewProjects.cpp:194
+#: ViewProjects.cpp:189 sg_ProjectCommandPopup.cpp:74
 msgid "Don't get new tasks for this project."
 msgstr "אל תקבל משימות חדשות לפרוייקט זה."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:200
+#: ViewProjects.cpp:195 sg_ProjectCommandPopup.cpp:79
 msgid "Reset project"
 msgstr "אתחל פרוייקט"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:85
-#: clientgui/ViewProjects.cpp:201
-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 "מחק את כל הקבצים והמשימות המשוייכים לפרוייקט זה וקבל חדשים. באפשרותך לעדכן קודם את הפרוייקט בכדי לדווח משימות שהושלמו."
+#: ViewProjects.cpp:196 sg_ProjectCommandPopup.cpp:80
+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:208
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
-msgstr "הסר פרוייקט זה. משימות בפעולה יאבדו (תחילה השתמש ב'עדכן' על מנת לדווח משימות שהושלמו)."
+#: ViewProjects.cpp:203 sg_ProjectCommandPopup.cpp:86
+msgid ""
+"Remove this project.  Tasks in progress will be lost (use 'Update' first to "
+"report any completed tasks)."
+msgstr ""
+"הסר פרוייקט זה. משימות בפעולה יאבדו (תחילה השתמש ב'עדכן' על מנת לדווח משימות "
+"שהושלמו)."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:96
-#: clientgui/sg_TaskCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:214
+#: ViewProjects.cpp:209 ViewWork.cpp:222 sg_ProjectCommandPopup.cpp:91
+#: sg_TaskCommandPopup.cpp:78
 msgid "Properties"
 msgstr "מאפיינים"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:97
-#: clientgui/ViewProjects.cpp:215
+#: ViewProjects.cpp:210 sg_ProjectCommandPopup.cpp:92
 msgid "Show project details."
 msgstr "הצג פרטים על הפרוייקט."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:126
-#: clientgui/ViewProjects.cpp:723
-msgid "Resume tasks for this project."
-msgstr "המשך משימות של פרוייקט זה."
+#: ViewProjects.cpp:220 ViewStatistics.cpp:450
+msgid "Account"
+msgstr "חשבון"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:133
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow new tasks"
-msgstr "אפשר משימות חדשות"
+#: ViewProjects.cpp:222
+msgid "Work done"
+msgstr "עבודה שהסתיימה"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:134
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow fetching new tasks for this project."
-msgstr "אפשר קבלת משימות חדשות לפרוייקט זה."
+#: ViewProjects.cpp:223
+msgid "Avg. work done"
+msgstr "ממוצע העבודה שהסתיימה"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:137
-#: clientgui/ViewProjects.cpp:746
-msgid "Don't fetch new tasks for this project."
-msgstr "אל תקבל משימות חדשות לפרוייקט זה."
+#: ViewProjects.cpp:225 ViewTransfers.cpp:188 ViewWork.cpp:234
+msgid "Status"
+msgstr "מצב"
+
+#: ViewProjects.cpp:250
+msgid "Projects"
+msgstr "פרוייקטים"
+
+#: ViewProjects.cpp:302
+msgid "Updating project..."
+msgstr "מעדכן פרוייקט..."
+
+#: ViewProjects.cpp:344
+msgid "Resuming project..."
+msgstr "ממשיך בפרוייקט..."
+
+#: ViewProjects.cpp:348
+msgid "Suspending project..."
+msgstr "משהה פרוייקט..."
+
+#: ViewProjects.cpp:385
+msgid "Telling project to allow additional task downloads..."
+msgstr "מדווח לפרוייקט לאפשר הורדת משימות נוספות..."
+
+#: ViewProjects.cpp:389
+msgid "Telling project to not fetch any additional tasks..."
+msgstr "מדווח לפרוייקט לא לקבל משימות נוספות..."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:229
-#: clientgui/ViewProjects.cpp:443
+#: ViewProjects.cpp:425
+msgid "Resetting project..."
+msgstr "מאפס את הפרוייקט..."
+
+#: ViewProjects.cpp:438 sg_ProjectCommandPopup.cpp:214
 #, c-format
 msgid "Are you sure you want to reset project '%s'?"
 msgstr "האם אתה בטוח שברצונך לאפס את הפרוייקט '%s'?"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:235
-#: clientgui/ViewProjects.cpp:449
+#: ViewProjects.cpp:444 sg_ProjectCommandPopup.cpp:220
 msgid "Reset Project"
 msgstr "אפס את הפרוייקט"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:266
-#: clientgui/ViewProjects.cpp:501
+#: ViewProjects.cpp:483
+msgid "Removing project..."
+msgstr "מסיר פרוייקט..."
+
+#: ViewProjects.cpp:496 sg_ProjectCommandPopup.cpp:251
 #, c-format
 msgid "Are you sure you want to remove project '%s'?"
 msgstr "האם אתה בטוח שברצונך להסיר את הפרוייקט '%s'?"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:272
-#: clientgui/ViewProjects.cpp:507
+#: ViewProjects.cpp:502 sg_ProjectCommandPopup.cpp:257
 msgid "Remove Project"
 msgstr "הסר פרוייקט"
 
-#: clientgui/sg_ProjectPanel.cpp:72
-msgid "Add Project"
-msgstr "הוסף פרוייקט"
+#: ViewProjects.cpp:543 ViewWork.cpp:599
+msgid "Launching browser..."
+msgstr "מפעיל את הדפדפן..."
 
-#: clientgui/sg_ProjectPanel.cpp:73
-msgid "Synchronize"
-msgstr "סנכרן"
+#: ViewProjects.cpp:718 sg_ProjectCommandPopup.cpp:111
+msgid "Resume tasks for this project."
+msgstr "המשך משימות של פרוייקט זה."
 
-#: clientgui/sg_ProjectPanel.cpp:74
-msgid "Work done for this project"
-msgstr ""
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:118
+msgid "Allow new tasks"
+msgstr "אפשר משימות חדשות"
 
-#: clientgui/sg_ProjectPanel.cpp:77
-msgid "Synchronize projects with account manager system"
-msgstr "סנכרן את הפרוייקטים עם מערכת מנהל חשבונות"
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:119
+msgid "Allow fetching new tasks for this project."
+msgstr "אפשר קבלת משימות חדשות לפרוייקט זה."
 
-#: clientgui/sg_ProjectPanel.cpp:124
-msgid "Select a project to access with the controls below"
-msgstr "בחר פרוייקט על מנת לגשת אליו עם בקרי השליטה מטה"
+#: ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:122
+msgid "Don't fetch new tasks for this project."
+msgstr "אל תקבל משימות חדשות לפרוייקט זה."
 
-#: clientgui/sg_ProjectPanel.cpp:145
-#, fuzzy
-msgid "Project Web Pages"
-msgstr "אתרי הפרוייקט"
+#: ViewProjects.cpp:1058
+msgid "Requested by user"
+msgstr "התבקש על ידי המשתמש"
 
-#: clientgui/sg_ProjectPanel.cpp:149
+#: ViewProjects.cpp:1059
 #, fuzzy
-msgid "Project Commands"
-msgstr "פקודות הפרוייקט"
+msgid "To fetch work"
+msgstr "להביא ל-"
 
-#: clientgui/sg_ProjectPanel.cpp:276
-#, c-format
-msgid "Pop up a menu of web sites for project %s"
-msgstr ""
+#: ViewProjects.cpp:1060
+msgid "To report completed tasks"
+msgstr "לדווח על משימות מוכנות"
 
-#: clientgui/sg_ProjectPanel.cpp:278
-#, c-format
-msgid "Pop up a menu of commands to apply to project %s"
-msgstr "הקפץ תפריט של פקודות ליישום על פרוייקט %s"
+#: ViewProjects.cpp:1061
+#, fuzzy
+msgid "To send trickle-up message"
+msgstr "לשלוח הודעה מהדהדת"
 
-#: clientgui/sg_TaskCommandPopup.cpp:66
-msgid "Show graphics"
-msgstr "הצג גרפיקה"
+#: ViewProjects.cpp:1062
+msgid "Requested by account manager"
+msgstr "התבקש על ידי מנהל חשבונות"
 
-#: clientgui/sg_TaskCommandPopup.cpp:67
-msgid "Show application graphics in a window."
-msgstr "הצג גרפיקת יישום בחלון חדש."
+#: ViewProjects.cpp:1063
+msgid "Project initialization"
+msgstr "אתמול פרוייקט"
 
-#: clientgui/sg_TaskCommandPopup.cpp:73
-msgid "Suspend this task."
-msgstr ""
+#: ViewProjects.cpp:1064
+msgid "Requested by project"
+msgstr "התבקש על ידי הפרוייקט"
 
-#: clientgui/sg_TaskCommandPopup.cpp:78
-msgid "Abort"
-msgstr "בטל"
+#: ViewProjects.cpp:1065
+msgid "Unknown reason"
+msgstr "סיבה לא ידועה"
 
-#: clientgui/sg_TaskCommandPopup.cpp:79
-msgid "Abandon this task. You will get no credit for it."
-msgstr ""
+#: ViewProjects.cpp:1079
+msgid "Suspended by user"
+msgstr "הושהה על ידי המשתמש"
 
-#: clientgui/sg_TaskCommandPopup.cpp:85
-msgid "Show task details."
-msgstr "הצג מידע על המשימה."
+#: ViewProjects.cpp:1082
+msgid "Won't get new tasks"
+msgstr "לא מקבל משימות חדשות"
 
-#: clientgui/sg_TaskCommandPopup.cpp:119
-msgid "Resume work for this task."
-msgstr "המשך עבודה עבור משימה זו."
+#: ViewProjects.cpp:1085
+msgid "Project ended - OK to remove"
+msgstr "הפרוייקט הסתיים - לחץ 'אישור' כדי להסיר"
 
-#: clientgui/sg_TaskCommandPopup.cpp:123
-msgid "Suspend work for this task."
-msgstr "השהה עבודה עבור משימה זו."
+#: ViewProjects.cpp:1088
+msgid "Will remove when tasks done"
+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)"
+#: ViewProjects.cpp:1091
+msgid "Scheduler request pending"
+msgstr "ממתין לבקשת מתזמן"
 
-#: clientgui/sg_TaskCommandPopup.cpp:272
-msgid "Abort task"
-msgstr "בטל משימה"
+#: ViewProjects.cpp:1097
+msgid "Scheduler request in progress"
+msgstr "בקשת מתזמן בתהליך"
 
-#: clientgui/sg_TaskPanel.cpp:468
-msgid "You don't have any projects.  Please Add a Project."
-msgstr "אין לך פרוייקטים. אנא הוסף פרוייקט."
+#: ViewProjects.cpp:1100
+msgid "Trickle up message pending"
+msgstr "הודעת Trickle Up ממתינה"
 
-#: clientgui/sg_TaskPanel.cpp:469
-msgid "Not available"
-msgstr "לא זמין"
+#: ViewProjects.cpp:1106
+msgid "Communication deferred "
+msgstr "התקשרות נדחתה"
 
-#: clientgui/sg_TaskPanel.cpp:480
-#, fuzzy
-msgid "Tasks:"
-msgstr "משימות"
+#: ViewResources.cpp:62
+msgid "Total disk usage"
+msgstr "ניצול דיסק כללי"
 
-#: clientgui/sg_TaskPanel.cpp:486
-msgid "Select a task to access"
-msgstr "בחר משימה אליה ברצונך לגשת"
+#: ViewResources.cpp:83
+msgid "Disk usage by BOINC projects"
+msgstr "ניצול הדיסק על ידי פרוייקטי BOINC"
 
-#: clientgui/sg_TaskPanel.cpp:497
-#, fuzzy
-msgid "From:"
-msgstr "מ"
+#: ViewResources.cpp:116
+msgid "Disk"
+msgstr "דיסק"
 
-#: clientgui/sg_TaskPanel.cpp:551
-msgid "This task's progress"
-msgstr "התקדמות משימה זו"
+#: ViewResources.cpp:249
+msgid "no projects: 0 bytes used"
+msgstr "אין פרוייקטים: שימוש ב-0 בייטים"
 
-#: clientgui/sg_TaskPanel.cpp:569
-msgid "Task Commands"
-msgstr "פקודות משימה"
+#: ViewResources.cpp:286
+msgid "used by BOINC: "
+msgstr "בשימוש על ידי BOINC:"
 
-#: clientgui/sg_TaskPanel.cpp:570
-msgid "Pop up a menu of commands to apply to this task"
-msgstr "הקפץ תפריט של פקודות ליישם עבור משימה זו"
+#: ViewResources.cpp:296
+msgid "free, available to BOINC: "
+msgstr "פנוי, זמין ל-BOINC:"
 
-#: clientgui/sg_TaskPanel.cpp:705
-#, c-format
-msgid "Application: %s"
-msgstr "יישום: %s"
+#: ViewResources.cpp:306
+msgid "free, not available to BOINC: "
+msgstr "פנוי, לא זמין ל-BOINC:"
 
-#: clientgui/sg_TaskPanel.cpp:728
-#, c-format
-msgid "%.3f%%"
-msgstr ""
+#: ViewResources.cpp:316
+msgid "free: "
+msgstr "פנוי:"
 
-#: clientgui/sg_TaskPanel.cpp:736
-msgid "Application: Not available"
-msgstr "יישום: לא זמין"
+#: ViewResources.cpp:326
+msgid "used by other programs: "
+msgstr "בשימוש על ידי תוכנות אחרות:"
 
-#: clientgui/sg_TaskPanel.cpp:836
-msgid "Not Available"
-msgstr "לא זמין"
+#: ViewStatistics.cpp:1205
+msgid "User Total"
+msgstr "סה\"כ למשתמש"
 
-#: clientgui/sg_TaskPanel.cpp:851
-#, c-format
-msgid "Elapsed: %s"
-msgstr ""
+#: ViewStatistics.cpp:1206
+msgid "User Average"
+msgstr "ממוצע למשתמש"
 
-#: clientgui/sg_TaskPanel.cpp:865
-#, c-format
-msgid "Remaining (estimated): %s"
-msgstr "זמן שנותר: %s"
+#: ViewStatistics.cpp:1207
+msgid "Host Total"
+msgstr "סה\"כ למחשב"
+
+#: ViewStatistics.cpp:1208
+msgid "Host Average"
+msgstr "ממוצע למחשב"
 
-#: clientgui/sg_TaskPanel.cpp:880
+#: ViewStatistics.cpp:1355
 #, c-format
-msgid "Status: %s"
-msgstr "מצב: %s"
+msgid "Last update: %.0f days ago"
+msgstr "עדכון אחרון: לפני %.0f ימים"
 
-#: clientgui/sg_TaskPanel.cpp:1227
-msgid "Retrieving current status."
-msgstr "מאחזר מצב נוכחי."
+#: ViewStatistics.cpp:1982
+msgid "Show user total"
+msgstr "הצג סה\"כ למשתמש"
 
-#: clientgui/sg_TaskPanel.cpp:1233
-msgid "Downloading work from the server."
-msgstr "מוריד עבודה מהשרת."
+#: ViewStatistics.cpp:1983
+msgid "Show total credit for user"
+msgstr "הצג את סך כל הניקוד למשתמש"
 
-#: clientgui/sg_TaskPanel.cpp:1238
-msgid "Processing Suspended:  Running On Batteries."
-msgstr "חישוב מושהה: עובד על סוללות."
+#: ViewStatistics.cpp:1989
+msgid "Show user average"
+msgstr "הצג ממוצע למשתמש"
 
-#: clientgui/sg_TaskPanel.cpp:1240
-msgid "Processing Suspended:  User Active."
-msgstr "חישוב מושהה: משתמש פעיל."
+#: ViewStatistics.cpp:1990
+msgid "Show average credit for user"
+msgstr "הצג ניקוד ממוצע למשתמש"
 
-#: clientgui/sg_TaskPanel.cpp:1242
-msgid "Processing Suspended:  User paused processing."
-msgstr "חישוב מושהה: המשתמש השהה חישובים."
+#: ViewStatistics.cpp:1996
+msgid "Show host total"
+msgstr "הצג סה\"כ למחשב"
 
-#: clientgui/sg_TaskPanel.cpp:1244
-msgid "Processing Suspended:  Time of Day."
-msgstr "החישוב מושהה: זמן היום."
+#: ViewStatistics.cpp:1997
+msgid "Show total credit for host"
+msgstr "הצג את סך כל הניקוד למחשב"
 
-#: clientgui/sg_TaskPanel.cpp:1246
-msgid "Processing Suspended:  Benchmarks Running."
-msgstr "חישוב מושהה: מבחני ביצועים רצים."
+#: ViewStatistics.cpp:2003
+msgid "Show host average"
+msgstr "הצג ממוצע למחשב"
 
-#: clientgui/sg_TaskPanel.cpp:1248
-msgid "Processing Suspended."
-msgstr "חישוב מושהה."
+#: ViewStatistics.cpp:2004
+msgid "Show average credit for host"
+msgstr "הצג ניקוד ממוצע למחשב"
 
-#: clientgui/sg_TaskPanel.cpp:1252
-msgid "Waiting to contact project servers."
-msgstr "ממתין ליצירת קשר עם שרתי הפרוייקט."
+#: ViewStatistics.cpp:2013
+msgid "< &Previous project"
+msgstr "< &הפרוייקט הקודם"
 
-#: clientgui/sg_TaskPanel.cpp:1256
-#: clientgui/sg_TaskPanel.cpp:1265
-msgid "Retrieving current status"
-msgstr "מאחזר מצב נוכחי"
+#: ViewStatistics.cpp:2014
+msgid "Show chart for previous project"
+msgstr "הצג תרשים לפרוייקט הקודם"
 
-#: clientgui/sg_TaskPanel.cpp:1260
-msgid "No work available to process"
-msgstr "אין עבודה זמינה לעיבוד"
+#: ViewStatistics.cpp:2019
+msgid "&Next project >"
+msgstr "&הפרוייקט הבא >"
 
-#: clientgui/sg_TaskPanel.cpp:1262
-msgid "Unable to connect to the core client"
-msgstr "לא מצליח להתחבר לקליינט המקור."
+#: ViewStatistics.cpp:2020
+msgid "Show chart for next project"
+msgstr "הצג תרשים לפרוייקט הבא"
 
-#: clientgui/TermsOfUsePage.cpp:218
-msgid "Terms of Use"
-msgstr "תנאי השימוש"
+#: ViewStatistics.cpp:2026 ViewStatistics.cpp:2416
+msgid "Hide project list"
+msgstr "הסתר רשימת פרוייקטים"
 
-#: clientgui/TermsOfUsePage.cpp:222
-msgid "Please read the following terms of use:"
-msgstr "אנא קרא את תנאי השימוש הבאים:"
+#: ViewStatistics.cpp:2027 ViewStatistics.cpp:2416
+msgid "Use entire area for graphs"
+msgstr "השתמש בכל השטח עבור הגרפים"
 
-#: clientgui/TermsOfUsePage.cpp:231
-msgid "I agree to the terms of use."
-msgstr "אני מסכים לתנאי השימוש."
+#: ViewStatistics.cpp:2032
+msgid "Mode view"
+msgstr "מצב תצוגה"
 
-#: clientgui/TermsOfUsePage.cpp:237
-msgid "I do not agree to the terms of use."
-msgstr ""
+#: ViewStatistics.cpp:2036
+msgid "One project"
+msgstr "פרוייקט יחיד"
 
-#: clientgui/UnavailablePage.cpp:183
-msgid "Project temporarily unavailable"
-msgstr "זמנית הפרוייקט לא זמין"
+#: ViewStatistics.cpp:2037
+msgid "Show one chart with selected project"
+msgstr "הצג תרשים אחד עם הפרוייקט הנבחר"
 
-#: clientgui/UnavailablePage.cpp:186
-msgid ""
-"The project is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-"זמנית הפרוייקט אינו זמין.\n"
-"\n"
-"אנא נסה במועד מאוחר יותר."
+#: ViewStatistics.cpp:2043
+msgid "All projects (separate)"
+msgstr "כל הפרוייקטים (בנפרד)"
 
-#: clientgui/UnavailablePage.cpp:190
-msgid "Account manager temporarily unavailable"
-msgstr "זמנית מנהל החשבונות אינו זמין"
+#: ViewStatistics.cpp:2044
+msgid "Show all projects, one chart per project"
+msgstr "הצג את כל הפרוייקטים, תרשים אחד לכל פרוייקט"
 
-#: clientgui/UnavailablePage.cpp:193
-msgid ""
-"The account manager is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-"זמנית מנהל החשבונות אינו זמין.\n"
-"\n"
-"אנא נסה במועד באוחר יותר."
+#: ViewStatistics.cpp:2050
+msgid "All projects (together)"
+msgstr "כל הפרוייקטים (ביחד)"
 
-#: clientgui/ValidateAccountKey.cpp:68
-msgid "Please specify an account key to continue."
-msgstr "אנא הזן קוד חשבון כדי להמשיך."
+#: ViewStatistics.cpp:2051
+msgid "Show one chart with all projects"
+msgstr "הצג תרשים אחד עם כל הפרוייקטים"
 
-#: clientgui/ValidateAccountKey.cpp:71
-msgid "Invalid Account Key; please enter a valid Account Key"
-msgstr "קוד חשבון לא נכון; אנא הזן קוד חשבון תקף"
+#: ViewStatistics.cpp:2057
+msgid "All projects (sum)"
+msgstr "כל הפרוייקטים (סיכום)"
 
-#: clientgui/ValidateAccountKey.cpp:82
-#: clientgui/ValidateEmailAddress.cpp:86
-msgid "Validation conflict"
-msgstr "סתירת אימות"
+#: ViewStatistics.cpp:2058
+msgid "Show one chart with sum of projects"
+msgstr "הצג תרשים אחד עם סיכום הפרוייקטים"
 
-#: clientgui/ValidateEmailAddress.cpp:72
-msgid "Please specify an email address"
-msgstr "אנא הזן כתובת דוא\"ל"
+#: ViewStatistics.cpp:2079
+msgid "Statistics"
+msgstr "סטטיסטיקות"
 
-#: clientgui/ValidateEmailAddress.cpp:75
-msgid "Invalid email address; please enter a valid email address"
-msgstr "כתובת דוא\"ל לא חוקית; אנא הזן כתובת דוא\"ל חוקית"
+#: 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
+msgid "Updating charts..."
+msgstr "מעדכן תרשימים..."
 
-#: clientgui/ValidateURL.cpp:69
-msgid "Missing URL"
-msgstr "כתובת אינטרנט חסרה"
+#: ViewStatistics.cpp:2420
+msgid "Show project list"
+msgstr "הצג רשימת פרוייקטים"
 
-#: clientgui/ValidateURL.cpp:70
-msgid ""
-"Please specify a URL.\n"
-"For example:\n"
-"http://www.example.com/"
-msgstr ""
-"אנא הזן כתובת אתר.\n"
-"לדוגמא:\n"
-"http://www.example.com/"
+#: ViewStatistics.cpp:2420
+msgid "Uses smaller area for graphs"
+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 "כתובת אתר לא חוקית"
+#: ViewTransfers.cpp:164
+msgid "Retry Now"
+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"
+#: ViewTransfers.cpp:165
+msgid "Retry the file transfer now"
 msgstr ""
-"אנא הזן כתובת אתר חוקית.\n"
-"לדוגמא:\n"
-"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 אינו מכיל שם מחשב תקף."
+#: ViewTransfers.cpp:171
+msgid "Abort Transfer"
+msgstr "בטל העברה"
 
-#: clientgui/ValidateURL.cpp:111
-#, c-format
-msgid "'%s' does not contain a valid path."
-msgstr "'%s' אינו מכיל נתיב תקף."
+#: ViewTransfers.cpp:172
+msgid "Abort this file transfer.  You won't get credit for the task."
+msgstr ""
 
-#: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:175
-msgid "Commands"
-msgstr "פקודות"
+#: ViewTransfers.cpp:183
+msgid "File"
+msgstr "קובץ"
 
-#: clientgui/ViewMessages.cpp:88
-msgid "Copy all messages"
-msgstr "העתק את כל ההודעות"
+#: ViewTransfers.cpp:184 ViewWork.cpp:233
+msgid "Progress"
+msgstr "התקדמות"
 
-#: clientgui/ViewMessages.cpp:95
-msgid "Copy selected messages"
-msgstr "העתק הודעות נבחרות"
+#: ViewTransfers.cpp:185
+msgid "Size"
+msgstr "גודל"
 
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
-msgid "Show only this project"
-msgstr "הצג פרוייקט זה בלבד"
+#: ViewTransfers.cpp:186
+msgid "Elapsed Time"
+msgstr "זמן שחלף"
 
-#: clientgui/ViewMessages.cpp:107
-#: clientgui/ViewMessages.cpp:503
-msgid "Show only the messages for the selected project."
-msgstr "הצג את ההודעות הקשורות לפרוייקט הנבחר בלבד."
+#: ViewTransfers.cpp:187
+msgid "Speed"
+msgstr "מהירות"
 
-#: clientgui/ViewMessages.cpp:164
-msgid "Messages"
-msgstr "הודעות"
+#: ViewTransfers.cpp:213
+msgid "Transfers"
+msgstr "העברות"
 
-#: clientgui/ViewMessages.cpp:187
-msgid "Copying all messages to the clipboard..."
-msgstr "מעתיק את כל ההודעות ללוח..."
+#: ViewTransfers.cpp:280
+msgid "Network activity is suspended - "
+msgstr "פעילות הרשת מושהת - "
 
-#: clientgui/ViewMessages.cpp:223
-msgid "Copying selected messages to the clipboard..."
-msgstr "מעתיק הודעות נבחרות ללוח..."
+#: ViewTransfers.cpp:282
+msgid ""
+".\n"
+"You can enable it using the Activity menu."
+msgstr ""
+".\n"
+"אתה יכול לאפשר אותה בעזרת תפריט 'פעילות'."
 
-#: clientgui/ViewMessages.cpp:286
-msgid "Filtering messages..."
-msgstr "מסנן הודעות..."
+#: ViewTransfers.cpp:285
+msgid "BOINC"
+msgstr "BOINC"
 
-#: clientgui/ViewMessages.cpp:494
-msgid "Show all messages"
-msgstr "הצג את כל ההודעות"
+#: ViewTransfers.cpp:292
+msgid "Retrying transfer now..."
+msgstr "מנסה העברה מחדש כעת..."
 
-#: clientgui/ViewMessages.cpp:495
-msgid "Show messages for all projects."
-msgstr "הצג הודעות לכל הפרוייקטים."
+#: ViewTransfers.cpp:330
+msgid "Aborting transfer..."
+msgstr "מבטל העברה..."
 
-#: clientgui/ViewProjects.cpp:225
-msgid "Account"
-msgstr "חשבון"
+#: ViewTransfers.cpp:343
+#, 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/ViewProjects.cpp:227
-msgid "Work done"
-msgstr "עבודה שהסתיימה"
+#: ViewTransfers.cpp:349
+msgid "Abort File Transfer"
+msgstr "בטל העברת קובץ"
 
-#: clientgui/ViewProjects.cpp:228
-msgid "Avg. work done"
-msgstr "ממוצע העבודה שהסתיימה"
+#: ViewTransfers.cpp:780
+msgid "Upload"
+msgstr ""
 
-#: clientgui/ViewProjects.cpp:230
-msgid "Status"
-msgstr "מצב"
+#: ViewTransfers.cpp:780
+msgid "Download"
+msgstr ""
 
-#: clientgui/ViewProjects.cpp:255
-msgid "Projects"
-msgstr "פרוייקטים"
+#: ViewTransfers.cpp:784
+#, fuzzy
+msgid "retry in "
+msgstr "מנסה מחדש תוך"
 
-#: clientgui/ViewProjects.cpp:307
-msgid "Updating project..."
-msgstr "מעדכן פרוייקט..."
+#: ViewTransfers.cpp:786
+msgid "failed"
+msgstr ""
 
-#: clientgui/ViewProjects.cpp:349
-msgid "Resuming project..."
-msgstr "ממשיך בפרוייקט..."
+#: ViewTransfers.cpp:789
+msgid "suspended"
+msgstr ""
 
-#: clientgui/ViewProjects.cpp:353
-msgid "Suspending project..."
-msgstr "משהה פרוייקט..."
+#: ViewTransfers.cpp:794
+msgid "active"
+msgstr ""
 
-#: clientgui/ViewProjects.cpp:390
-msgid "Telling project to allow additional task downloads..."
-msgstr "מדווח לפרוייקט לאפשר הורדת משימות נוספות..."
+#: ViewTransfers.cpp:796
+msgid "pending"
+msgstr ""
 
-#: clientgui/ViewProjects.cpp:394
-msgid "Telling project to not fetch any additional tasks..."
-msgstr "מדווח לפרוייקט לא לקבל משימות נוספות..."
+#: ViewTransfers.cpp:803
+msgid " (project backoff: "
+msgstr "(נסיגת פרוייקט:"
 
-#: clientgui/ViewProjects.cpp:430
-msgid "Resetting project..."
-msgstr "מאפס את הפרוייקט..."
+#: ViewWork.cpp:187 ViewWork.cpp:777
+msgid "Show active tasks"
+msgstr "הצג משימות פעילות"
 
-#: clientgui/ViewProjects.cpp:488
-msgid "Removing project..."
-msgstr "מסיר פרוייקט..."
+#: ViewWork.cpp:188 ViewWork.cpp:778
+msgid "Show only active tasks."
+msgstr "הצג משימות פעילות בלבד"
 
-#: clientgui/ViewProjects.cpp:548
-msgid "Launching browser..."
-msgstr "מפעיל את הדפדפן..."
+#: ViewWork.cpp:194 sg_TaskCommandPopup.cpp:60
+msgid "Show graphics"
+msgstr "הצג גרפיקה"
 
-#: clientgui/ViewProjects.cpp:1063
-msgid "Requested by user"
-msgstr "התבקש על ידי המשתמש"
+#: ViewWork.cpp:195 sg_TaskCommandPopup.cpp:61
+msgid "Show application graphics in a window."
+msgstr "הצג גרפיקת יישום בחלון חדש."
 
-#: clientgui/ViewProjects.cpp:1064
+#: ViewWork.cpp:201
 #, fuzzy
-msgid "To fetch work"
-msgstr "להביא ל-"
-
-#: clientgui/ViewProjects.cpp:1065
-msgid "To report completed tasks"
-msgstr "לדווח על משימות מוכנות"
+msgid "Show VM Console"
+msgstr "הצג סה\"כ למחשב"
 
-#: clientgui/ViewProjects.cpp:1066
+#: ViewWork.cpp:202
 #, fuzzy
-msgid "To send trickle-up message"
-msgstr "לשלוח הודעה מהדהדת"
+msgid "Show VM Console in a window."
+msgstr "הצג גרפיקת יישום בחלון חדש."
 
-#: clientgui/ViewProjects.cpp:1067
-msgid "Requested by account manager"
-msgstr "התבקש על ידי מנהל חשבונות"
+#: ViewWork.cpp:209
+msgid "Suspend work for this result."
+msgstr "השהה עבודה לתוצאה זו."
 
-#: clientgui/ViewProjects.cpp:1068
-msgid "Project initialization"
-msgstr "אתמול פרוייקט"
+#: ViewWork.cpp:215 sg_TaskCommandPopup.cpp:72
+msgid "Abort"
+msgstr "בטל"
 
-#: clientgui/ViewProjects.cpp:1069
-msgid "Requested by project"
-msgstr "התבקש על ידי הפרוייקט"
+#: ViewWork.cpp:216
+msgid "Abandon work on the result. You will get no credit for it."
+msgstr "בטל את העבודה על תוצאה זו. אתה לא תקבל שום ניקוד תמורתה."
 
-#: clientgui/ViewProjects.cpp:1070
-msgid "Unknown reason"
-msgstr "סיבה לא ידועה"
+#: ViewWork.cpp:223 sg_TaskCommandPopup.cpp:79
+msgid "Show task details."
+msgstr "הצג מידע על המשימה."
 
-#: clientgui/ViewProjects.cpp:1084
-msgid "Suspended by user"
-msgstr "הושהה על ידי המשתמש"
+#: ViewWork.cpp:235
+msgid "Elapsed"
+msgstr "עבר"
 
-#: clientgui/ViewProjects.cpp:1087
-msgid "Won't get new tasks"
-msgstr "לא מקבל משימות חדשות"
+#: ViewWork.cpp:236
+#, fuzzy
+msgid "Remaining (estimated)"
+msgstr "נשאר"
 
-#: clientgui/ViewProjects.cpp:1090
-msgid "Project ended - OK to remove"
-msgstr "הפרוייקט הסתיים - לחץ 'אישור' כדי להסיר"
+#: ViewWork.cpp:237
+msgid "Deadline"
+msgstr "מועד אחרון לדיווח"
 
-#: clientgui/ViewProjects.cpp:1093
-msgid "Will remove when tasks done"
-msgstr "יוסר עם השלמת המשימות"
+#: ViewWork.cpp:264
+msgid "Tasks"
+msgstr "משימות"
 
-#: clientgui/ViewProjects.cpp:1096
-msgid "Scheduler request pending"
-msgstr "ממתין לבקשת מתזמן"
+#: ViewWork.cpp:357
+msgid "Resuming task..."
+msgstr "ממשיך את המשימה..."
 
-#: clientgui/ViewProjects.cpp:1102
-msgid "Scheduler request in progress"
-msgstr "בקשת מתזמן בתהליך"
+#: ViewWork.cpp:360
+msgid "Suspending task..."
+msgstr "משהה את המשימה..."
 
-#: clientgui/ViewProjects.cpp:1105
-msgid "Trickle up message pending"
-msgstr "הודעת Trickle Up ממתינה"
+#: ViewWork.cpp:389
+msgid "Showing graphics for task..."
+msgstr "מציג גרפיקה של המשימה..."
 
-#: clientgui/ViewProjects.cpp:1111
-msgid "Communication deferred "
-msgstr "התקשרות נדחתה"
+#: ViewWork.cpp:426
+#, fuzzy
+msgid "Showing VM console for task..."
+msgstr "מציג גרפיקה של המשימה..."
 
-#: clientgui/ViewResources.cpp:62
-msgid "Total disk usage"
-msgstr "ניצול דיסק כללי"
+#: ViewWork.cpp:479
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %s, Status: %s)"
+msgstr ""
+"האם אתה בטוח שברצונך לבטל את המשימה '%s'?\n"
+"(התקדמות: %s, מצב: %s)"
 
-#: clientgui/ViewResources.cpp:83
-msgid "Disk usage by BOINC projects"
-msgstr "ניצול הדיסק על ידי פרוייקטי BOINC"
+#: ViewWork.cpp:485
+#, c-format
+msgid "Are you sure you want to abort these %d tasks?"
+msgstr "האם אתה בטוח שברצונך לבטל את %d המשימות הללו?"
 
-#: clientgui/ViewResources.cpp:116
-msgid "Disk"
-msgstr "דיסק"
+#: ViewWork.cpp:490 sg_TaskCommandPopup.cpp:256
+msgid "Abort task"
+msgstr "בטל משימה"
 
-#: clientgui/ViewResources.cpp:225
-msgid "no projects: 0 bytes used"
-msgstr "אין פרוייקטים: שימוש ב-0 בייטים"
+# 75%
+#: ViewWork.cpp:499
+#, fuzzy
+msgid "Aborting task..."
+msgstr "מבטל העברה..."
 
-#: clientgui/ViewResources.cpp:262
-msgid "used by BOINC: "
-msgstr "בשימוש על ידי BOINC:"
+#: ViewWork.cpp:771
+msgid "Show all tasks"
+msgstr "הצג את כל המשימות"
 
-#: clientgui/ViewResources.cpp:272
-msgid "free, available to BOINC: "
-msgstr "פנוי, זמין ל-BOINC:"
+#: ViewWork.cpp:772
+msgid "Show all tasks."
+msgstr "הצג את כל המשימות."
 
-#: clientgui/ViewResources.cpp:282
-msgid "free, not available to BOINC: "
-msgstr "פנוי, לא זמין ל-BOINC:"
+#: ViewWork.cpp:796 sg_TaskCommandPopup.cpp:103
+msgid "Resume work for this task."
+msgstr "המשך עבודה עבור משימה זו."
 
-#: clientgui/ViewResources.cpp:292
-msgid "free: "
-msgstr "פנוי:"
+#: ViewWork.cpp:802 sg_TaskCommandPopup.cpp:107
+msgid "Suspend work for this task."
+msgstr "השהה עבודה עבור משימה זו."
 
-#: clientgui/ViewResources.cpp:302
-msgid "used by other programs: "
-msgstr "בשימוש על ידי תוכנות אחרות:"
+#: WelcomePage.cpp:284
+msgid "Add project or account manager"
+msgstr "הוסף פרוייקט או מנהל חשבונות"
 
-#: clientgui/ViewStatistics.cpp:1181
-msgid "User Total"
-msgstr "סה\"כ למשתמש"
+#: WelcomePage.cpp:288
+msgid "Add project or use BOINC Account Manager"
+msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1182
-msgid "User Average"
-msgstr "ממוצע למשתמש"
+#: 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/ViewStatistics.cpp:1183
-msgid "Host Total"
-msgstr "סה\"כ למחשב"
+#: 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/ViewStatistics.cpp:1184
-msgid "Host Average"
-msgstr "ממוצע למחשב"
+#: 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 ""
 
-#: clientgui/ViewStatistics.cpp:1331
-#, c-format
-msgid "Last update: %.0f days ago"
-msgstr "עדכון אחרון: לפני %.0f ימים"
+#: WelcomePage.cpp:339
+msgid "Use a BOINC Account Manager"
+msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1956
-msgid "Show user total"
-msgstr "הצג סה\"כ למשתמש"
+#: WelcomePage.cpp:352
+msgid "To continue, click Next."
+msgstr "כדי להמשיך, לחץ 'הבא'."
 
-#: clientgui/ViewStatistics.cpp:1957
-msgid "Show total credit for user"
-msgstr "הצג את סך כל הניקוד למשתמש"
+#: WelcomePage.cpp:358
+msgid "Add or change your World Community Grid projects"
+msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1963
-msgid "Show user average"
-msgstr "הצג ממוצע למשתמש"
+#: WelcomePage.cpp:361
+msgid "Add projects run by other researchers or organizations"
+msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1964
-msgid "Show average credit for user"
-msgstr "הצג ניקוד ממוצע למשתמש"
+#: WizardAttach.cpp:634
+msgid "Do you really want to cancel?"
+msgstr "האם אתה בטוח שברצונך לבטל?"
 
-#: clientgui/ViewStatistics.cpp:1970
-msgid "Show host total"
-msgstr "הצג סה\"כ למחשב"
+#: WizardAttach.cpp:635
+msgid "Question"
+msgstr "שאלה"
 
-#: clientgui/ViewStatistics.cpp:1971
-msgid "Show total credit for host"
-msgstr "הצג את סך כל הניקוד למחשב"
+#: sg_BoincSimpleFrame.cpp:149
+msgid "Advanced View...\tCtrl+Shift+A"
+msgstr "תצוגה מתקדמת...\tCtrl+Shift+A"
 
-#: clientgui/ViewStatistics.cpp:1977
-msgid "Show host average"
-msgstr "הצג ממוצע למחשב"
+#: sg_BoincSimpleFrame.cpp:150
+msgid "Display the advanced graphical interface."
+msgstr "הצג ממשק גרפי מתקדם."
 
-#: clientgui/ViewStatistics.cpp:1978
-msgid "Show average credit for host"
-msgstr "הצג ניקוד ממוצע למחשב"
+#: sg_BoincSimpleFrame.cpp:157
+msgid "Skin"
+msgstr "מראה"
 
-#: clientgui/ViewStatistics.cpp:1987
-msgid "< &Previous project"
-msgstr "< &הפרוייקט הקודם"
+#: sg_BoincSimpleFrame.cpp:159
+#, fuzzy
+msgid "Select the appearance of the user interface."
+msgstr "בחר את המראה של ממשק המשתמש."
 
-#: clientgui/ViewStatistics.cpp:1988
-msgid "Show chart for previous project"
-msgstr "הצג תרשים לפרוייקט הקודם"
+#: sg_BoincSimpleFrame.cpp:206
+#, c-format
+msgid "&%s"
+msgstr "&%s"
 
-#: clientgui/ViewStatistics.cpp:1993
-msgid "&Next project >"
-msgstr "&הפרוייקט הבא >"
+#: sg_BoincSimpleFrame.cpp:390
+msgid "Default"
+msgstr "ברירת מחדל"
 
-#: clientgui/ViewStatistics.cpp:1994
-msgid "Show chart for next project"
-msgstr "הצג תרשים לפרוייקט הבא"
+#: sg_BoincSimpleFrame.cpp:759
+#, fuzzy
+msgid "Suspend Computing"
+msgstr "השהה חישובים"
 
-#: clientgui/ViewStatistics.cpp:2000
-#: clientgui/ViewStatistics.cpp:2390
-msgid "Hide project list"
-msgstr "הסתר רשימת פרוייקטים"
+#: sg_BoincSimpleFrame.cpp:760
+#, fuzzy
+msgid "Resume Computing"
+msgstr "המשך חישובים"
 
-#: clientgui/ViewStatistics.cpp:2001
-#: clientgui/ViewStatistics.cpp:2390
-msgid "Use entire area for graphs"
-msgstr "השתמש בכל השטח עבור הגרפים"
+#: sg_BoincSimpleFrame.cpp:777
+msgid "Open a window to view notices from projects or BOINC"
+msgstr "פתח חלון לצפיה בהתראות מהפרוייקטים או מ-BOINC"
 
-#: clientgui/ViewStatistics.cpp:2006
-msgid "Mode view"
-msgstr "מצב תצוגה"
+#: sg_DlgMessages.cpp:146
+msgid "Close"
+msgstr "&סגור"
 
-#: clientgui/ViewStatistics.cpp:2010
-msgid "One project"
-msgstr "פרוייקט יחיד"
+#: sg_DlgMessages.cpp:389
+#, c-format
+#, fuzzy, c-format
+msgid "%s - Notices"
+msgstr "%s - התראות"
 
-#: clientgui/ViewStatistics.cpp:2011
-msgid "Show one chart with selected project"
-msgstr "הצג תרשים אחד עם הפרוייקט הנבחר"
+#: sg_DlgPreferences.cpp:268
+msgid "This dialog controls preferences for this computer only."
+msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2017
-msgid "All projects (separate)"
-msgstr "כל הפרוייקטים (בנפרד)"
+#: sg_DlgPreferences.cpp:273
+msgid "Click OK to set preferences."
+msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2018
-msgid "Show all projects, one chart per project"
-msgstr "הצג את כל הפרוייקטים, תרשים אחד לכל פרוייקט"
+#: sg_DlgPreferences.cpp:278
+msgid ""
+"Click Clear to restore web-based settings for all preferences listed below."
+msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2024
-msgid "All projects (together)"
-msgstr "כל הפרוייקטים (ביחד)"
+#: sg_DlgPreferences.cpp:285
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
+msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2025
-msgid "Show one chart with all projects"
-msgstr "הצג תרשים אחד עם כל הפרוייקטים"
+#: sg_DlgPreferences.cpp:313
+msgid "Do work only between:"
+msgstr "תעבוד רק בין:"
 
-#: clientgui/ViewStatistics.cpp:2031
-msgid "All projects (sum)"
-msgstr "כל הפרוייקטים (סיכום)"
+#: sg_DlgPreferences.cpp:335
+msgid "Connect to internet only between:"
+msgstr "התחבר לאינטרנט רק בין:"
+
+#: sg_DlgPreferences.cpp:357 sg_DlgPreferences.cpp:374
+msgid "Use no more than:"
+msgstr "השתמש לכל היותר ב-"
+
+#: sg_DlgPreferences.cpp:370
+msgid "of disk space"
+msgstr "מתוך שטח הדיסק"
+
+#: sg_DlgPreferences.cpp:387
+msgid "of the processor"
+msgstr "של המעבד"
+
+#: sg_DlgPreferences.cpp:391
+msgid "Do work while on battery?"
+msgstr "האם לבצע חישובים בזמן עבודה על סוללות?"
+
+#: sg_DlgPreferences.cpp:404
+msgid "Do work after idle for:"
+msgstr "התחל לעבוד אחרי אי שימוש במחשב במשך:"
 
-#: clientgui/ViewStatistics.cpp:2032
-msgid "Show one chart with sum of projects"
-msgstr "הצג תרשים אחד עם סיכום הפרוייקטים"
+#: sg_DlgPreferences.cpp:429
+msgid "Clear all local preferences listed above and close the dialog"
+msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2053
-msgid "Statistics"
-msgstr "סטטיסטיקות"
+#: 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 "תמיד"
 
-#: 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 "מעדכן תרשימים..."
+#: sg_DlgPreferences.cpp:638
+msgid "100 MB"
+msgstr "100 MB"
 
-#: clientgui/ViewStatistics.cpp:2394
-msgid "Show project list"
-msgstr "הצג רשימת פרוייקטים"
+#: sg_DlgPreferences.cpp:639
+msgid "200 MB"
+msgstr "200 MB"
 
-#: clientgui/ViewStatistics.cpp:2394
-msgid "Uses smaller area for graphs"
-msgstr "משתמש בשטח קטן יותר עבור הגרפים"
+#: sg_DlgPreferences.cpp:640
+msgid "500 MB"
+msgstr "500 MB"
 
-#: clientgui/ViewTransfers.cpp:169
-msgid "Retry Now"
-msgstr "נסה מחדש כעת"
+#: sg_DlgPreferences.cpp:641
+msgid "1 GB"
+msgstr "1 GB"
 
-#: clientgui/ViewTransfers.cpp:170
-msgid "Retry the file transfer now"
-msgstr ""
+#: sg_DlgPreferences.cpp:642
+msgid "2 GB"
+msgstr "2 GB"
 
-#: clientgui/ViewTransfers.cpp:176
-msgid "Abort Transfer"
-msgstr "בטל העברה"
+#: sg_DlgPreferences.cpp:643
+msgid "5 GB"
+msgstr "5 GB"
 
-#: clientgui/ViewTransfers.cpp:177
-msgid "Abort this file transfer.  You won't get credit for the task."
-msgstr ""
+#: sg_DlgPreferences.cpp:644
+msgid "10 GB"
+msgstr "10 GB"
 
-#: clientgui/ViewTransfers.cpp:188
-msgid "File"
-msgstr "קובץ"
+#: sg_DlgPreferences.cpp:645
+msgid "20 GB"
+msgstr "20 GB"
 
-#: clientgui/ViewTransfers.cpp:189
-#: clientgui/ViewWork.cpp:238
-msgid "Progress"
-msgstr "התקדמות"
+#: sg_DlgPreferences.cpp:646
+msgid "50 GB"
+msgstr "50 GB"
 
-#: clientgui/ViewTransfers.cpp:190
-msgid "Size"
-msgstr "גודל"
+#: sg_DlgPreferences.cpp:647
+msgid "100 GB"
+msgstr "100 GB"
 
-#: clientgui/ViewTransfers.cpp:191
-msgid "Elapsed Time"
-msgstr "זמן שחלף"
+#: sg_DlgPreferences.cpp:717
+#, c-format
+msgid "%d MB"
+msgstr "%d MB"
 
-#: clientgui/ViewTransfers.cpp:192
-msgid "Speed"
-msgstr "מהירות"
+#: sg_DlgPreferences.cpp:719
+#, c-format
+msgid "%4.2f GB"
+msgstr "%4.2f GB"
 
-#: clientgui/ViewTransfers.cpp:218
-msgid "Transfers"
-msgstr "העברות"
+#: sg_DlgPreferences.cpp:760
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
 
-#: clientgui/ViewTransfers.cpp:285
-msgid "Network activity is suspended - "
-msgstr "פעילות הרשת מושהת - "
+#: sg_DlgPreferences.cpp:796
+msgid "0 (Run Always)"
+msgstr "0 (תריץ תמיד)"
 
-#: clientgui/ViewTransfers.cpp:287
-msgid ""
-".\n"
-"You can enable it using the Activity menu."
-msgstr ""
-".\n"
-"אתה יכול לאפשר אותה בעזרת תפריט 'פעילות'."
+#: sg_DlgPreferences.cpp:799
+#, c-format
+msgid "%d"
+msgstr "%d"
 
-#: clientgui/ViewTransfers.cpp:290
-msgid "BOINC"
-msgstr "BOINC"
+#: sg_DlgPreferences.cpp:1029
+#, fuzzy
+msgid "Do you really want to clear all local preferences?\n"
+msgstr "האם אתה בטוח שברצונך למחוק את כל ההעדפות המקומיות?"
 
-#: clientgui/ViewTransfers.cpp:297
-msgid "Retrying transfer now..."
-msgstr "מנסה העברה מחדש כעת..."
+#: sg_ProjectPanel.cpp:72
+msgid "Add Project"
+msgstr "הוסף פרוייקט"
 
-#: clientgui/ViewTransfers.cpp:335
-msgid "Aborting transfer..."
-msgstr "מבטל העברה..."
+#: sg_ProjectPanel.cpp:73
+msgid "Synchronize"
+msgstr "סנכרן"
 
-#: clientgui/ViewTransfers.cpp:348
-#, 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."
+#: sg_ProjectPanel.cpp:74
+msgid "Work done for this project"
 msgstr ""
-"אתה בטוח שברצונך לבטל את העברת הקובץ '%s'?\n"
-"שים לב: ביטול העברת הקובץ יגרום לפסילת המשימה ולכן\n"
-"לא תקבל עליה ניקוד."
 
-#: clientgui/ViewTransfers.cpp:354
-msgid "Abort File Transfer"
-msgstr "בטל העברת קובץ"
+#: sg_ProjectPanel.cpp:77
+msgid "Synchronize projects with account manager system"
+msgstr "סנכרן את הפרוייקטים עם מערכת מנהל חשבונות"
 
-#: clientgui/ViewTransfers.cpp:785
-msgid "Upload"
-msgstr ""
+#: sg_ProjectPanel.cpp:124
+msgid "Select a project to access with the controls below"
+msgstr "בחר פרוייקט על מנת לגשת אליו עם בקרי השליטה מטה"
 
-#: clientgui/ViewTransfers.cpp:785
-msgid "Download"
-msgstr ""
+#: sg_ProjectPanel.cpp:145
+#, fuzzy
+msgid "Project Web Pages"
+msgstr "אתרי הפרוייקט"
 
-#: clientgui/ViewTransfers.cpp:789
+#: sg_ProjectPanel.cpp:149
 #, fuzzy
-msgid "retry in "
-msgstr "מנסה מחדש תוך"
+msgid "Project Commands"
+msgstr "פקודות הפרוייקט"
 
-#: clientgui/ViewTransfers.cpp:791
-msgid "failed"
+#: sg_ProjectPanel.cpp:267
+#, c-format
+msgid "Pop up a menu of web sites for project %s"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:794
-msgid "suspended"
-msgstr ""
+#: sg_ProjectPanel.cpp:269
+#, c-format
+msgid "Pop up a menu of commands to apply to project %s"
+msgstr "הקפץ תפריט של פקודות ליישום על פרוייקט %s"
 
-#: clientgui/ViewTransfers.cpp:799
-msgid "active"
+#: sg_TaskCommandPopup.cpp:67
+msgid "Suspend this task."
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:801
-msgid "pending"
+#: sg_TaskCommandPopup.cpp:73
+msgid "Abandon this task. You will get no credit for it."
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:808
-msgid " (project backoff: "
-msgstr "(נסיגת פרוייקט:"
-
-#: clientgui/ViewWork.cpp:192
-#: clientgui/ViewWork.cpp:782
-msgid "Show active tasks"
-msgstr "הצג משימות פעילות"
+#: sg_TaskCommandPopup.cpp:251
+#, 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:193
-#: clientgui/ViewWork.cpp:783
-msgid "Show only active tasks."
-msgstr "הצג משימות פעילות בלבד"
+#: sg_TaskPanel.cpp:464
+msgid "You don't have any projects.  Please Add a Project."
+msgstr "אין לך פרוייקטים. אנא הוסף פרוייקט."
 
-#: clientgui/ViewWork.cpp:206
-#, fuzzy
-msgid "Show VM Console"
-msgstr "הצג סה\"כ למחשב"
+#: sg_TaskPanel.cpp:465
+msgid "Not available"
+msgstr "לא זמין"
 
-#: clientgui/ViewWork.cpp:207
+#: sg_TaskPanel.cpp:476
 #, fuzzy
-msgid "Show VM Console in a window."
-msgstr "הצג גרפיקת יישום בחלון חדש."
-
-#: clientgui/ViewWork.cpp:214
-msgid "Suspend work for this result."
-msgstr "השהה עבודה לתוצאה זו."
-
-#: clientgui/ViewWork.cpp:221
-msgid "Abandon work on the result. You will get no credit for it."
-msgstr "בטל את העבודה על תוצאה זו. אתה לא תקבל שום ניקוד תמורתה."
+msgid "Tasks:"
+msgstr "משימות"
 
-#: clientgui/ViewWork.cpp:240
-msgid "Elapsed"
-msgstr "עבר"
+#: sg_TaskPanel.cpp:482
+msgid "Select a task to access"
+msgstr "בחר משימה אליה ברצונך לגשת"
 
-#: clientgui/ViewWork.cpp:241
+#: sg_TaskPanel.cpp:493
 #, fuzzy
-msgid "Remaining (estimated)"
-msgstr "נשאר"
+msgid "From:"
+msgstr "מ"
 
-#: clientgui/ViewWork.cpp:242
-msgid "Deadline"
-msgstr "מועד אחרון לדיווח"
+#: sg_TaskPanel.cpp:547
+msgid "This task's progress"
+msgstr "התקדמות משימה זו"
 
-#: clientgui/ViewWork.cpp:269
-msgid "Tasks"
-msgstr "משימות"
+#: sg_TaskPanel.cpp:565
+msgid "Task Commands"
+msgstr "פקודות משימה"
 
-#: clientgui/ViewWork.cpp:362
-msgid "Resuming task..."
-msgstr "ממשיך את המשימה..."
+#: sg_TaskPanel.cpp:566
+msgid "Pop up a menu of commands to apply to this task"
+msgstr "הקפץ תפריט של פקודות ליישם עבור משימה זו"
 
-#: clientgui/ViewWork.cpp:365
-msgid "Suspending task..."
-msgstr "משהה את המשימה..."
+#: sg_TaskPanel.cpp:701
+#, c-format
+msgid "Application: %s"
+msgstr "יישום: %s"
 
-#: clientgui/ViewWork.cpp:394
-msgid "Showing graphics for task..."
-msgstr "מציג גרפיקה של המשימה..."
+#: sg_TaskPanel.cpp:724
+#, c-format
+msgid "%.3f%%"
+msgstr ""
 
-#: clientgui/ViewWork.cpp:431
-#, fuzzy
-msgid "Showing VM console for task..."
-msgstr "מציג גרפיקה של המשימה..."
+#: sg_TaskPanel.cpp:732
+msgid "Application: Not available"
+msgstr "יישום: לא זמין"
+
+#: sg_TaskPanel.cpp:832
+msgid "Not Available"
+msgstr "לא זמין"
 
-#: clientgui/ViewWork.cpp:484
+#: sg_TaskPanel.cpp:847
 #, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %s, Status: %s)"
+msgid "Elapsed: %s"
 msgstr ""
-"האם אתה בטוח שברצונך לבטל את המשימה '%s'?\n"
-"(התקדמות: %s, מצב: %s)"
 
-#: clientgui/ViewWork.cpp:490
+#: sg_TaskPanel.cpp:861
 #, c-format
-msgid "Are you sure you want to abort these %d tasks?"
-msgstr "האם אתה בטוח שברצונך לבטל את %d המשימות הללו?"
-
-# 75%
-#: clientgui/ViewWork.cpp:504
-#, fuzzy
-msgid "Aborting task..."
-msgstr "מבטל העברה..."
-
-#: clientgui/ViewWork.cpp:776
-msgid "Show all tasks"
-msgstr "הצג את כל המשימות"
+#, fuzzy, c-format
+msgid "Remaining (estimated): %s"
+msgstr "זמן שנותר: %s"
 
-#: clientgui/ViewWork.cpp:777
-msgid "Show all tasks."
-msgstr "הצג את כל המשימות."
+#: sg_TaskPanel.cpp:876
+#, c-format
+msgid "Status: %s"
+msgstr "מצב: %s"
 
-#: clientgui/WelcomePage.cpp:284
-msgid "Add project or account manager"
-msgstr "הוסף פרוייקט או מנהל חשבונות"
+#: sg_TaskPanel.cpp:1223
+msgid "Retrieving current status."
+msgstr "מאחזר מצב נוכחי."
 
-#: clientgui/WelcomePage.cpp:288
-msgid "Add project or use BOINC Account Manager"
-msgstr ""
+#: sg_TaskPanel.cpp:1229
+msgid "Downloading work from the server."
+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."
+#: sg_TaskPanel.cpp:1234
+msgid "Processing Suspended:  Running On Batteries."
+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"
-"או להשתמש באתר \"מנהל חשבונות\" כדי לבחור פרוייקטים."
+#: sg_TaskPanel.cpp:1236
+msgid "Processing Suspended:  User Active."
+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 ""
+#: sg_TaskPanel.cpp:1238
+msgid "Processing Suspended:  User paused processing."
+msgstr "חישוב מושהה: המשתמש השהה חישובים."
 
-#: clientgui/WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
-msgstr ""
+#: sg_TaskPanel.cpp:1240
+msgid "Processing Suspended:  Time of Day."
+msgstr "החישוב מושהה: זמן היום."
 
-#: clientgui/WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
-msgstr ""
+#: sg_TaskPanel.cpp:1242
+msgid "Processing Suspended:  Benchmarks Running."
+msgstr "חישוב מושהה: מבחני ביצועים רצים."
 
-#: clientgui/WelcomePage.cpp:361
-msgid "Add projects run by other researchers or organizations"
-msgstr ""
+#: sg_TaskPanel.cpp:1244
+msgid "Processing Suspended."
+msgstr "חישוב מושהה."
 
-#: clientgui/WizardAttach.cpp:673
-msgid "Do you really want to cancel?"
-msgstr "האם אתה בטוח שברצונך לבטל?"
+#: sg_TaskPanel.cpp:1248
+msgid "Waiting to contact project servers."
+msgstr "ממתין ליצירת קשר עם שרתי הפרוייקט."
 
-#: clientgui/WizardAttach.cpp:674
-msgid "Question"
-msgstr "שאלה"
+#: sg_TaskPanel.cpp:1252 sg_TaskPanel.cpp:1261
+msgid "Retrieving current status"
+msgstr "מאחזר מצב נוכחי"
+
+#: sg_TaskPanel.cpp:1256
+msgid "No work available to process"
+msgstr "אין עבודה זמינה לעיבוד"
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
+#: sg_TaskPanel.cpp:1258
+msgid "Unable to connect to the core client"
+msgstr "לא מצליח להתחבר לקליינט המקור."
+
+#: wizardex.cpp:377 wizardex.cpp:553
 msgid "&Next >"
 msgstr "&הבא >"
 
-#: clientgui/wizardex.cpp:383
+#: wizardex.cpp:383
 msgid "< &Back"
 msgstr "< ה&קודם"
 
-#: clientgui/wizardex.cpp:553
+#: wizardex.cpp:553
 msgid "&Finish"
 msgstr "&סיום"
 
-#: clientgui/common/wxPieCtrl.cpp:64
-msgid "Pie Ctrl"
-msgstr "Pie Ctrl"
+#: mac/Mac_GUI.cpp:110
+msgid "Preferences…"
+msgstr "העדפות..."
 
-#: clientgui/mac/Mac_GUI.cpp:35
+#: mac/Mac_GUI.cpp:122
 msgid "Services"
 msgstr "שירותים"
 
-#: clientgui/mac/Mac_GUI.cpp:36
+#: mac/Mac_GUI.cpp:144
 #, c-format
 msgid "Hide %s"
-msgstr "הסתר את %s"
+msgstr "הסתר את $s"
 
-#: clientgui/mac/Mac_GUI.cpp:37
+#: mac/Mac_GUI.cpp:158
 msgid "Hide Others"
 msgstr "הסתר את האחרים"
 
-#: clientgui/mac/Mac_GUI.cpp:38
+#: mac/Mac_GUI.cpp:172
 msgid "Show All"
 msgstr "הצג הכל"
 
-#: clientgui/mac/Mac_GUI.cpp:39
+#: mac/Mac_GUI.cpp:186
 #, c-format
 msgid "Quit %s"
 msgstr "הפסק %s"
 
-#: clientgui/DlgAdvPreferences.h:30
-msgid "specify work start and stop hours in format HH:MM-HH:MM"
-msgstr "פרט שעות התחלת וסיום של העבודה בצורה של HH:MM-HH:MM"
-
-#: clientgui/DlgAdvPreferences.h:31
-msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
-msgstr "פרט שעות התחלת וסיום של השימוש ברשת בצורה של HH:MM-HH:MM"
-
-# 98%
-#, fuzzy
-#~ msgid ""
-#~ "(C) 2003-2013 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2011 אוניברסיטת קליפורניה, ברקלי.\n"
-#~ "כל הזכויות שמורות."
-
-#, c-format
-#~ msgid "%s - Preferences"
-#~ msgstr "%s - העדפות"
-
-#, no-c-format
-#~ msgid "% CPU time"
-#~ msgstr "אחוזים מזמן מעבד"
-#~ msgid "KBytes/sec."
-#~ msgstr "ק\"ב לשנייה"
-#~ msgid "Mbytes"
-#~ msgstr "מ\"ב"
-#~ msgid "every"
-#~ msgstr "כל"
-#~ msgid "days"
-#~ msgstr "ימים"
-#~ msgid "Gigabytes disk space"
-#~ msgstr "GB משטח הדיסק"
-#~ msgid "Running, high priority"
-#~ msgstr "רץ, עדיפות גבוהה"
-
-#, fuzzy
-#~ msgid " (Waiting for network access)"
-#~ msgstr "ממתין לזיכרון"
-#~ msgid "Preferences…"
-#~ msgstr "העדפות..."
 #~ msgid "I do not agree with the terms of use."
 #~ msgstr "אני לא מסכים לתנאי השימוש."
+
 #~ msgid "Workunit name"
 #~ msgstr "שם יחידת העבודה"
+
 #~ msgid "invalid float"
 #~ msgstr "ערך לא חוקי"
+
 #~ msgid "Display the advanced (accessible) graphical interface."
 #~ msgstr "הצג את הממשק הגרפי המתקדם (נגיש)."
+
 #~ msgid "Paused: Other work running"
 #~ msgstr "נעצר: עבודה אחרת רצה"
+
 #~ msgid "Paused: User initiated.  Click 'Resume' to continue"
 #~ msgstr "נעצר: יוזמת המשתמש. לחץ 'המשך' כדי להתחיל מחדש"
+
 #~ msgid "Paused: User active"
 #~ msgstr "נעצר: משתמש פעיל"
+
 #~ msgid "Paused: Computer on battery"
 #~ msgstr "נעצר: המחשב על סוללות"
+
 #~ msgid "Paused: Time of Day"
 #~ msgstr "נעצר: זמן היום"
+
 #~ msgid "Paused: Benchmarks running"
 #~ msgstr "נעצר: מבחני ביצועים רצים"
+
 #~ msgid "Paused"
 #~ msgstr "השהה"
+
 #~ msgid "Paused: Application start delayed"
 #~ msgstr "נעצר: התחלת היישום מושהה"
+
 #~ msgid "Click to show project graphics"
 #~ msgstr "לחץ כדי להציג את הגרפיקה של הפרוייקט"
+
 #~ msgid "Open a window to view messages"
 #~ msgstr "פתח חלון כדי לראות הודעות"
+
 #~ msgid "Stop all activity"
 #~ msgstr "עצור את כל הפעילויות"
+
 #~ msgid "Resume activity"
 #~ msgstr "חזור לפעילות"
+
 #~ msgid "Open a window to set your preferences"
 #~ msgstr "פתח חלון כדי להגדיר את ההעדפות שלך"
+
 #~ msgid "Switch to the BOINC advanced view"
 #~ msgstr "החלף לתצוגה גרפית מתקדמת של BOINC"
+
 #~ msgid "My Projects:"
 #~ msgstr "הפרוייקטים שלי:"
 
@@ -4160,22 +4006,29 @@ msgstr "פרט שעות התחלת וסיום של השימוש ברשת בצו
 #, c-format
 #~ msgid "%d hr %d min %d sec"
 #~ msgstr "%d שע' %d דק' %d שנ'"
+
 #~ msgid "Are you sure you want to display graphics on a remote machine?"
 #~ msgstr "אתה בטוח שברצונך להציג גרפיקה במחשב מרוחק?"
+
 #~ msgid "Application: "
 #~ msgstr "יישום:"
+
 #~ msgid "Time Remaining: "
 #~ msgstr "זמן שנותר:"
+
 #~ msgid "Elapsed Time: "
 #~ msgstr "זמן שעבר:"
+
 #~ msgid "Account manager website"
 #~ msgstr "אתר מנהל חשבונות"
+
 #~ msgid "Account Manager &URL:"
 #~ msgstr "&כתובת מנהל חשבונות:"
 
 #, c-format
 #~ msgid "%s &website"
 #~ msgstr "&אתר %s"
+
 #~ msgid "Notice List"
 #~ msgstr "רשימת התראות"
 
@@ -4186,14 +4039,19 @@ msgstr "פרט שעות התחלת וסיום של השימוש ברשת בצו
 #, c-format
 #~ msgid "%s; received from %s; on %s"
 #~ msgstr "%s; התקבל מ-%s; ב-%s"
+
 #~ msgid "Click"
 #~ msgstr "לחץ"
+
 #~ msgid "Project List"
 #~ msgstr "רשימת פרוייקטים"
+
 #~ msgid "Nvidia GPU Supported"
 #~ msgstr "קיימת תמיכה במעבד גרפי של NVIDIA"
+
 #~ msgid "ATI GPU Supported"
 #~ msgstr "קיימת תמיכה במעבד גרפי של ATI"
+
 #~ msgid "Project Website"
 #~ msgstr "אתר הפרוייקט"
 
@@ -4201,56 +4059,78 @@ msgstr "פרט שעות התחלת וסיום של השימוש ברשת בצו
 #, fuzzy
 #~ msgid "Retry now"
 #~ msgstr "נסה מחדש כעת"
+
 #~ msgid "10%"
 #~ msgstr "10%"
+
 #~ msgid "20%"
 #~ msgstr "20%"
+
 #~ msgid "30%"
 #~ msgstr "30%"
+
 #~ msgid "40%"
 #~ msgstr "40%"
+
 #~ msgid "50%"
 #~ msgstr "50%"
+
 #~ msgid "60%"
 #~ msgstr "60%"
+
 #~ msgid "70%"
 #~ msgstr "70%"
+
 #~ msgid "80%"
 #~ msgstr "80%"
+
 #~ msgid "90%"
 #~ msgstr "90%"
+
 #~ msgid "100%"
 #~ msgstr "100%"
+
 #~ msgid "1"
 #~ msgstr "1"
+
 #~ msgid "3"
 #~ msgstr "3"
+
 #~ msgid "5"
 #~ msgstr "5"
+
 #~ msgid "10"
 #~ msgstr "10"
+
 #~ msgid "15"
 #~ msgstr "15"
+
 #~ msgid "30"
 #~ msgstr "30"
+
 #~ msgid "60"
 #~ msgstr "60"
 
 #, c-format
 #~ msgid "Pop up a menu of websites for project %s"
 #~ msgstr "הקפץ תפריט של אתרי אינטרנט עבור הפרוייקט %s"
+
 #~ msgid ""
 #~ "for accessibility support, please select advanced from the view menu or type "
 #~ "command shift a"
 #~ msgstr ""
 #~ "לתמיכת נגישות, אנא בחר 'מתקדם' מתוך תפריט 'תצוגה' או לחץ במקלדת על השילוב "
 #~ "command-shift-a"
+
 #~ msgid "This panel contains graphs showing user totals for projects"
 #~ msgstr "לוח זה מכיל גרפים המראים סיכומים של המשתמש עבור פרוייקטים"
+
 #~ msgid "list headers"
 #~ msgstr "רשימת כותרות"
+
 #~ msgid "list of events"
 #~ msgstr "רשימת אירועים"
+
 #~ msgid "list of events is empty"
 #~ msgstr "רשימת האירועים ריקה"
 
@@ -4273,6 +4153,7 @@ msgstr "פרט שעות התחלת וסיום של השימוש ברשת בצו
 #, c-format
 #~ msgid "; column %d of %d; "
 #~ msgstr "; עמודה %d מתוך %d;"
+
 #~ msgid "list is empty"
 #~ msgstr "הרשימה ריקה"
 
@@ -4291,8 +4172,10 @@ msgstr "פרט שעות התחלת וסיום של השימוש ברשת בצו
 #, c-format
 #~ msgid "; row %d of %d; "
 #~ msgstr "; שורה %d מתוך %d;"
+
 #~ msgid "blank"
 #~ msgstr "ריק"
+
 #~ msgid "list of projects or account managers"
 #~ msgstr "רשימת פרוייקטים או מנהלי חשבונות"
 
@@ -4311,6 +4194,7 @@ msgstr "פרט שעות התחלת וסיום של השימוש ברשת בצו
 #, c-format
 #~ msgid "The minimum password length for this account manager is %d. Please enter a different password."
 #~ msgstr "אורך הסיסמה המינימלי למנהל חשבונות זה הוא %d. אנא הזן סיסמה אחרת."
+
 #~ msgid ""
 #~ "An error has occurred;\n"
 #~ "check the Event Log for details.\n"
@@ -4341,34 +4225,52 @@ msgstr "פרט שעות התחלת וסיום של השימוש ברשת בצו
 #, c-format
 #~ msgid "OnDropTarget: index by HitTest = %i"
 #~ msgstr "OnDropTarget: אינדקס על ידי HitTest = %i"
+
+#~ msgid "Pie Ctrl"
+#~ msgstr "Pie Ctrl"
+
+#~ msgid "specify work start and stop hours in format HH:MM-HH:MM"
+#~ msgstr "פרט שעות התחלת וסיום של העבודה בצורה של HH:MM-HH:MM"
+
+#~ msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
+#~ msgstr "פרט שעות התחלת וסיום של השימוש ברשת בצורה של HH:MM-HH:MM"
+
 #~ msgid "Identify your account "
 #~ msgstr "זהה את חשבונך"
+
 #~ msgid "Read config file"
 #~ msgstr "קרא קובץ תצורה"
+
 #~ msgid "Read configuration info from cc_config.xml"
 #~ msgstr "קרא נתוני תצורה מ-cc_config.xml."
+
 #~ msgid ""
 #~ "(C) 2003-2011 University of California, Berkeley.\n"
 #~ "All Rights Reserved."
 #~ msgstr ""
 #~ "(C) 2003-2011 אוניברסיטת קליפורניה, ברקלי.\n"
 #~ "כל הזכויות שמורות."
+
 #~ msgid "Multicore CPU Supported"
 #~ msgstr "קיימת תמיכה במעבד בעל ליבות מרובות"
 
 #, fuzzy
 #~ msgid "%s: %.0f"
 #~ msgstr "%s: %0.2f"
+
 #~ msgid "Click 'Retry now' to transfer the file now"
 #~ msgstr "לחץ 'נסה מחדש כעת' כדי לשלוח את הקובץ"
+
 #~ msgid ""
 #~ "Click 'Abort transfer' to delete the file from the transfer queue. This "
 #~ "will prevent you from being granted credit for this result."
 #~ msgstr ""
 #~ "לחץ 'בטל העברה' כדי למחוק את הקובץ מתור ההעברות. דבר זה ימנע ממך לקבל "
 #~ "ניקוד על תוצאה זו."
+
 #~ msgid "Aborting result..."
 #~ msgstr "מבטל תוצאה..."
+
 #~ msgid ""
 #~ "You have chosen to add a new BOINC project.  Adding a new\n"
 #~ "project means that you will be connecting your computer to a new "
@@ -4396,36 +4298,50 @@ msgstr "פרט שעות התחלת וסיום של השימוש ברשת בצו
 #~ "\n"
 #~ "על מנת לשנות אילו יישומי מחקר יישלחו אליך\n"
 #~ " מ-World CommunityGrid, לחץ על הלחצן הבא:"
+
 #~ msgid "Change Research Applications at World Community Grid"
 #~ msgstr "שנה יישומי מחקר ב-World Community Grid"
+
 #~ msgid "Don't fetch NVIDIA GPU tasks"
 #~ msgstr "אל תקבל משימות למעבד גרפי של NVIDIA"
+
 #~ msgid "NVIDIA GPU work fetch deferred for"
 #~ msgstr "קבלת עבודה למעבד גרפי של NVIDIA נדחתה למשך"
+
 #~ msgid "NVIDIA GPU work fetch deferral interval"
 #~ msgstr "משך זמן ההמתנה לקבלת עבודה למעבד גרפי של NVIDIA"
+
 #~ msgid "Don't fetch ATI GPU tasks"
 #~ msgstr "אל תקבל משימות למעבד גרפי של ATI"
+
 #~ msgid "ATI GPU work fetch deferred for"
 #~ msgstr "קבלת עבודה למעבד גרפי של ATI נדחתה למשך"
+
 #~ msgid "ATI GPU work fetch deferral interval"
 #~ msgstr "משך זמן ההמתנה לקבלת עבודה למעבד גרפי של ATI"
+
 #~ msgid "Web sites"
 #~ msgstr "אתרי אינטרנט"
+
 #~ msgid "Connect about every"
 #~ msgstr "התחבר אחת ל-"
+
 #~ msgid ""
 #~ "this computer is connected to the Internet about every X days\n"
 #~ "(0 if it's always connected)"
 #~ msgstr ""
 #~ "מחשב זה מחובר לאינטרנט בערך כל X ימים\n"
 #~ "(0 אם תמיד מחובר)"
+
 #~ msgid "days (max. 10)"
 #~ msgstr "ימים (מקס' 10)"
+
 #~ msgid "%d.%d%%"
 #~ msgstr "%d.%d%%"
+
 #~ msgid "Display and network &options..."
 #~ msgstr "&אפשרויות תצוגה ורשת.."
+
 #~ msgid ""
 #~ "You have requested to exit the %s,\n"
 #~ "which allows you to view and manage\n"
@@ -4440,129 +4356,190 @@ msgstr "פרט שעות התחלת וסיום של השימוש ברשת בצו
 #~ "\n"
 #~ "אם ברצונך גם לעצור את היישומים המדעיים כאשר\n"
 #~ "אתה סוגר את התוכנה, בחר באפשרויות הבאות:"
+
 #~ msgid "Stop running science applications when exiting the Manager"
 #~ msgstr "הפסק הרצה של יישומים מדעיים ביציאה מהתוכנה."
+
 #~ msgid "CPU work fetch priority"
 #~ msgstr "עדיפות קבלת עבודה למעבד"
+
 #~ msgid "NVIDIA GPU scheduling priority"
 #~ msgstr "עדיפות תזמון למעבד גרפי של NVIDIA"
+
 #~ msgid "NVIDIA GPU work fetch priority"
 #~ msgstr "עדיפות קבלת עבודה למעבד גרפי של NVIDIA"
+
 #~ msgid "ATI GPU scheduling priority"
 #~ msgstr "עדיפות תזמון למעבד גרפי של ATI"
+
 #~ msgid "ATI GPU work fetch priority"
 #~ msgstr "עדיפות קבלת עבודה למעבד גרפי של ATI"
+
 #~ msgid "Estimated app speed"
 #~ msgstr "מהירות יישום משוערת"
+
 #~ msgid "Estimated task size"
 #~ msgstr "גודל משימה משוער"
+
 #~ msgid "Max RAM usage"
 #~ msgstr "שימוש מקסימלי ב-RAM"
+
 #~ msgid "%s - Options"
 #~ msgstr "%s - אפשרויות"
+
 #~ msgid "Retrieving host information; please wait..."
 #~ msgstr "מאחזר מידע על המחשב; אנא המתן..."
+
 #~ msgid " (waiting for GPU memory)"
 #~ msgstr "(ממתין לזיכרון מעבד גרפי)"
+
 #~ msgid "Pause"
 #~ msgstr "השהה"
+
 #~ msgid "%s - Messages"
 #~ msgstr "%s - הודעות"
+
 #~ msgid "Skin:"
 #~ msgstr "מראה:"
+
 #~ msgid "Preferences"
 #~ msgstr "העדפות"
+
 #~ msgid "I want to customize my preferences for this computer only."
 #~ msgstr "ברצוני לשנות את ההעדפות שלי למחשב זה בלבד."
+
 #~ msgid "Customized Preferences"
 #~ msgstr "העדפות מותאמות אישית"
+
 #~ msgid "My total work done this Project"
 #~ msgstr "כמות העבודה הכללית לפרוייקט זה"
+
 #~ msgid "My Tasks:"
 #~ msgstr "המשימות שלי:"
+
 #~ msgid "From Project:"
 #~ msgstr "מפרוייקט:"
+
 #~ msgid "Elapsed Time: %s"
 #~ msgstr "זמן שחלף: %s"
+
 #~ msgid "Upload suspended - "
 #~ msgstr "העלאה מושהת - "
+
 #~ msgid "Download suspended - "
 #~ msgstr "הורדה מושהת - "
+
 #~ msgid "Upload pending"
 #~ msgstr "העלאה ממתינה"
+
 #~ msgid "Download pending"
 #~ msgstr "הורדה ממתינה"
+
 #~ msgid "Display the new simple graphical interface."
 #~ msgstr "הצג את הממשק הגרפי הפשוט החדש."
+
 #~ msgid "Get help with BOINC"
 #~ msgstr "קבל עזרה עם BOINC"
+
 #~ msgid "Event Log..."
 #~ msgstr "יומן אירועים..."
+
 #~ msgid "error"
 #~ msgstr "שגיאה"
+
 #~ msgid "A new version of BOINC is available."
 #~ msgstr "גרסה חדשה של BOINC זמינה."
+
 #~ msgid "Download it."
 #~ msgstr "הורדה אותה."
+
 #~ msgid "Notice from BOINC"
 #~ msgstr "התראה מ-BOINC"
+
 #~ msgid "Couldn't write state file; check directory permissions"
 #~ msgstr "ללא יכולת לרשום קובץ מצב; בדוק הרשאות תיקייה"
+
 #~ msgid "The HTTP_PROXY environment variable must specify an HTTP proxy"
 #~ msgstr "שתנה הסביבה HTTP_PROXY חייב לציין פרוקסי מסוג HTTP"
+
 #~ msgid ""
 #~ "You used the wrong URL for this project.  When convenient, remove this "
 #~ "project, then add %s"
 #~ msgstr ""
 #~ "השתמשת בכתובת שגויה לפרוייקט זה. כשיהיה נוח, הסר פרוייקט זה והוסף %s"
+
 #~ msgid "Message from"
 #~ msgstr "הודעה מאת"
+
 #~ msgid "Syntax error in app_info.xml"
 #~ msgstr "שגיאת תחביר ב-app_info.xml"
+
 #~ msgid "File referenced in app_info.xml does not exist: "
 #~ msgstr "קובץ שהופנה מ-app_info.xml אינו קיים:"
+
 #~ msgid "Can't resolve hostname in remote_hosts.cfg"
 #~ msgstr "לא יכול לפענח שם-מחשב ב-remote_hosts.cfg"
+
 #~ msgid "Unexpected text in cc_config.xml"
 #~ msgstr "טקסט לא צפוי ב-cc_config.xml"
+
 #~ msgid "Unrecognized tag in cc_config.xml"
 #~ msgstr "תג לא מוכר ב-cc_config.xml"
+
 #~ msgid "Missing start tag in cc_config.xml"
 #~ msgstr "חוסר בתג התחלה ב-cc_config.xml"
+
 #~ msgid "Missing end tag in cc_config.xml"
 #~ msgstr "חוסר בתג סיום ב-cc_config.xml"
+
 #~ msgid "Attaching to project or account manager..."
 #~ msgstr "מצרף פרוייקט או מנהל חשבונת..."
+
 #~ msgid "%s - Detach from %s"
 #~ msgstr "%s - התנתק מ-%s"
+
 #~ msgid "Retrying communications."
 #~ msgstr "מנסה לתקשר מחדש."
+
 #~ msgid "Failed to attach to project"
 #~ msgstr "נכשל בהצטרפות לפרוייקט"
+
 #~ msgid "Failed to attach to account manager"
 #~ msgstr "נכשל בהצתרפות למנהל חשבונות"
+
 #~ msgid "Attached to account manager"
 #~ msgstr "מצורף למנהל חשבונות"
+
 #~ msgid "You are now successfully attached to the %s system."
 #~ msgstr "התחברת בהצלחה למערכת %s."
+
 #~ msgid "You are now successfully attached to this account manager."
 #~ msgstr "התחברת בהצלחה למנהל חשבונות זה."
+
 #~ msgid "News Feeds"
 #~ msgstr "זרימת חדשות"
+
 #~ msgid "Display the latest news about BOINC"
 #~ msgstr "הצג את החדשות האחרונות אודות BOINC"
+
 #~ msgid "not attached to any BOINC project: 0 bytes"
 #~ msgstr "לא מחובר לאף פרוייקט של BOINC: 0 Bytes"
+
 #~ msgid "All projects"
 #~ msgstr "כל הפרוייקטים"
+
 #~ msgid "Attach to project"
 #~ msgstr "הצטרף לפרוייקט"
+
 #~ msgid "Attach to account manager"
 #~ msgstr "הצטרף למנהל חשבונות"
+
 #~ msgid "Attach to a project"
 #~ msgstr "הצטרף לפרוייקט"
+
 #~ msgid "%s needs to connect to the Internet.  Please click to open %s."
 #~ msgstr "%s צריך להתחבר לאינטרנט. לחץ כדי לפתוח את %s."
+
 #~ msgid ""
 #~ "%s is unable to communicate with a project and needs an Internet "
 #~ "connection.\n"
@@ -4572,6 +4549,7 @@ msgstr "פרט שעות התחלת וסיום של השימוש ברשת בצו
 #~ "%s לא הצליח לתקשר עם הפרוייקט וצריך חיבור לאינטרנט.\n"
 #~ "התחבר לאינטרנט, ולאחר מכן תבחר באפשרות 'בצע התקשרות לרשת' שנמצא בתפריט "
 #~ "'מתקדם'."
+
 #~ msgid ""
 #~ "%s couldn't do Internet communication, and no default connection is "
 #~ "selected.\n"
@@ -4581,63 +4559,91 @@ msgstr "פרט שעות התחלת וסיום של השימוש ברשת בצו
 #~ "%s לא מצליח לתקשר עם האינטרנט ולא נבחר אף חיבור ברירת מחדל.\n"
 #~ "אנא התחבר לאינטרנט, או בחר בחיבור ברירת מחדל\n"
 #~ "בעזרת התפריט מתקדם/אפשרויות/חיבורים."
+
 #~ msgid "One or more notices are now available for viewing."
 #~ msgstr "התראה אחת או יותר מוכנות עכשיו לצפייה."
+
 #~ msgid "Attached to project"
 #~ msgstr "מחובר לפרוייקט"
+
 #~ msgid "You are now successfully attached to this project."
 #~ msgstr "התחברת בהצלחה לפרוייקט זה."
+
 #~ msgid "Attached to %s"
 #~ msgstr "מצורף ל-%s"
+
 #~ msgid "Detach when done"
 #~ msgstr "התנתק כשיסתיים"
+
 #~ msgid "Retrieving notices..."
 #~ msgstr "מאחזר התראות..."
+
 #~ msgid "Detach"
 #~ msgstr "התנתק"
+
 #~ msgid "Detaching from project..."
 #~ msgstr "התנתק מהפרוייקט..."
+
 #~ msgid "Are you sure you want to detach from project '%s'?"
 #~ msgstr "אתה בטוח שברצונך להתנתק מפרוייקט '%s'?"
+
 #~ msgid "Detach from Project"
 #~ msgstr "התנתק מפרוייקט"
+
 #~ msgid "Message from project server:"
 #~ msgstr "הודעות משרת הפרוייקט:"
+
 #~ msgid "XML syntax error in"
 #~ msgstr "שגיאת תחביר XML ב- "
+
 #~ msgid "Can't resolve hostname in"
 #~ msgstr "לא יכול לפענח שם-מחשב ב-"
+
 #~ msgid "Unrecognized tag in"
 #~ msgstr "תג לא מוכר ב-"
+
 #~ msgid "Missing start tag in"
 #~ msgstr "חוסר בתג התחלה ב-"
+
 #~ msgid "Unparsed tag in"
 #~ msgstr "לא ניתן לפענח את התג ב-"
+
 #~ msgid "Missing end tag in"
 #~ msgstr "חוסר בתג סיום ב-"
+
 #~ msgid ""
 #~ "BOINC can't access Internet - check network connection or proxy "
 #~ "configuration."
 #~ msgstr ""
 #~ "BOINC אינו מצליח להתחבר לאינטרנט - בדוק חיבור לרשת או הגדרות פרוקסי."
+
 #~ msgid "&Messages\tCtrl+Shift+M"
 #~ msgstr "&הודעות\tCtrl+Shift+M"
+
 #~ msgid "Attach to a project to begin processing work"
 #~ msgstr "צרף פרוייקט כדי להתחיל לעבד יחידות עבודה"
+
 #~ msgid "Use GPU never"
 #~ msgstr "אל תשתמש במעבד הגרפי"
+
 #~ msgid "%s: %.2f%% completed."
 #~ msgstr "%s: %.2f%% הושלם."
+
 #~ msgid "%d tasks running."
 #~ msgstr "%d ישומים רצים."
+
 #~ msgid " - user active"
 #~ msgstr "- משתמש פעיל"
+
 #~ msgid " - computation suspended"
 #~ msgstr "- חישובים מושהיים"
+
 #~ msgid " - need disk space"
 #~ msgstr "- צריך שטח דיסק"
+
 #~ msgid "%s - Can't find web browser"
 #~ msgstr "%s - לא מצליח למצוא סייר אינטרנט"
+
 #~ msgid ""
 #~ "%s tried to display the web page\n"
 #~ "\t%s\n"
@@ -4652,40 +4658,56 @@ msgstr "פרט שעות התחלת וסיום של השימוש ברשת בצו
 #~ "כדי לפתור בעיה זו, הגדר את סביבת המשתנה\n"
 #~ "'BROWSER' למיקום סייר האינטרנט שלך,\n"
 #~ "ולאחר מכן תאתחל את %s."
+
 #~ msgid "Starting client services; please wait..."
 #~ msgstr "מתחיל שירותי קליינט; אנא המתן..."
+
 #~ msgid ""
 #~ "Required wizard file(s) are missing from the target server.\n"
 #~ "(lookup_account.php/create_account.php)\n"
 #~ msgstr ""
 #~ "קבצי אשף הגדרה נחוצים לא נמצאים בשרת היעד.\n"
 #~ "(lookup_account.php/create_account.php)\n"
+
 #~ msgid "ID"
 #~ msgstr "זהות"
+
 #~ msgid "Priority"
 #~ msgstr "עדיפות"
+
 #~ msgid "MessagesGrid"
 #~ msgstr "MessagesGrid"
+
 #~ msgid "Copying selected messages to Clipboard..."
 #~ msgstr "מעתיק הודעות נבחרות ללוח..."
+
 #~ msgid "Info"
 #~ msgstr "מידע"
+
 #~ msgid "Warning"
 #~ msgstr "אזהרה"
+
 #~ msgid "BOINC Website"
 #~ msgstr "אתר BOINC"
+
 #~ msgid "Display the latest news about BOINC from the BOINC website"
 #~ msgstr "הצג את החדשות האחרונות אודות BOINC מאתר BOINC"
+
 #~ msgid "ProjectsGrid"
 #~ msgstr "ProjectsGrid"
+
 #~ msgid "Suspended upload"
 #~ msgstr "העלאה מושהת"
+
 #~ msgid "Suspended download"
 #~ msgstr "הורדה מושהת"
+
 #~ msgid "TransfersGrid"
 #~ msgstr "TransfersGrid"
+
 #~ msgid "Aborting transfer(s)..."
 #~ msgstr "מבטל העברה/ות..."
+
 #~ msgid ""
 #~ "Are you sure you want to abort this file(s) transfer ?\n"
 #~ "NOTE: Aborting a transfer will invalidate a task and you\n"
@@ -4694,34 +4716,46 @@ msgstr "פרט שעות התחלת וסיום של השימוש ברשת בצו
 #~ "האם אתה בטוח שברצונך לבטל את העברת הקובץ/ים? \n"
 #~ "שים לב: ביטול ההעברה יגרום לביטול הישום ולכן לא\n"
 #~ "תקבל ניקוד עבורו."
+
 #~ msgid "Abort File Transfer(s)"
 #~ msgstr "בטל העברת/ות קובץ"
+
 #~ msgid "To completion"
 #~ msgstr "לסיום"
+
 #~ msgid "TasksGrid"
 #~ msgstr "TasksGrid"
+
 #~ msgid ""
 #~ "We'll guide you through the process of attaching\n"
 #~ "to a project or account manager."
 #~ msgstr ""
 #~ "נדריך אותך בתהליך ההצטרפות\n"
 #~ "לפרוייקט או מנהל חשבונות."
+
 #~ msgid "Attach to a project or account manager to begin processing work"
 #~ msgstr "צרף פרוייקט או מנהל חשבונות כדי להתחיל לעבד עבודה"
+
 #~ msgid "Attach to an additional project"
 #~ msgstr "הצטרף לפרוייקט נוסף"
+
 #~ msgid " is empty"
 #~ msgstr "ריק"
+
 #~ msgid "%d of %d; "
 #~ msgstr "%d מתוך %d;"
+
 #~ msgid "current sort column "
 #~ msgstr "סוג עמודה נוכחי"
+
 #~ msgid " descending order "
 #~ msgstr "סדר יורד"
+
 #~ msgid " ascending order "
 #~ msgstr "סדר עולה"
+
 #~ msgid "column "
 #~ msgstr "עמודה"
+
 #~ msgid "of %d; "
 #~ msgstr "מ-%d;"
-
diff --git a/locale/he/BOINC-Setup.mo b/locale/he/BOINC-Setup.mo
index 597c4da..b12362a 100644
Binary files a/locale/he/BOINC-Setup.mo and b/locale/he/BOINC-Setup.mo differ
diff --git a/locale/he/BOINC-Setup.po b/locale/he/BOINC-Setup.po
index 4465bef..e31e256 100755
--- a/locale/he/BOINC-Setup.po
+++ b/locale/he/BOINC-Setup.po
@@ -4,36 +4,32 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-01-26 00:00-0800\n"
-"PO-Revision-Date: 2015-02-10 23:22-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\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-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: mac_installer\n"
 
 #: Installer.cpp:124
 #, c-format
 msgid "Sorry, this version of %s requires system 10.5 or higher."
 msgstr ""
 
-#: PostInstall.cpp:130
-#: PostInstall.cpp:1136
-#: uninstall.cpp:1618
+#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
 msgid "Yes"
 msgstr ""
 
-#: PostInstall.cpp:131
-#: PostInstall.cpp:1137
-#: uninstall.cpp:1619
+#: PostInstall.cpp:131 PostInstall.cpp:1137 uninstall.cpp:1619
 msgid "No"
 msgstr ""
 
@@ -44,9 +40,11 @@ msgstr ""
 #: PostInstall.cpp:1416
 #, c-format
 msgid ""
-"Users who are permitted to administer this computer will automatically be allowed to run and control %s.\n"
+"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?"
+"Do you also want non-administrative users to be able to run and control %s "
+"on this Mac?"
 msgstr ""
 
 #: PostInstall.cpp:1444
@@ -111,7 +109,8 @@ msgstr ""
 #: uninstall.cpp:840
 #, c-format
 msgid ""
-"Enter your administrator password to completely remove %s from you computer.\n"
+"Enter your administrator password to completely remove %s from you "
+"computer.\n"
 "\n"
 msgstr ""
 
@@ -122,4 +121,3 @@ msgstr ""
 #: uninstall.cpp:1617
 msgid "Continue..."
 msgstr ""
-
diff --git a/locale/he/BOINC-Web.mo b/locale/he/BOINC-Web.mo
index 4caee7f..e7caafe 100644
Binary files a/locale/he/BOINC-Web.mo and b/locale/he/BOINC-Web.mo differ
diff --git a/locale/he/BOINC-Web.po b/locale/he/BOINC-Web.po
index b44b024..2239161 100755
--- a/locale/he/BOINC-Web.po
+++ b/locale/he/BOINC-Web.po
@@ -4,16 +4,17 @@
 # FileID  : $Id$
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\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 23:23-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: 2012-04-26 04:05+0200\n"
+"Last-Translator: Ido <dj_legolas1 at hotmail.com>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.1.6\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
@@ -31,7 +32,9 @@ msgid "This page is %stranslatable%s."
 msgstr "עמוד זה %sניתן לתרגום%s."
 
 #: download.php:39
-msgid "We recommend that you also install VirtualBox, so your computer can work on science projects that require it."
+msgid ""
+"We recommend that you also install VirtualBox, so your computer can work on "
+"science projects that require it."
 msgstr ""
 
 #: download.php:41
@@ -42,14 +45,12 @@ msgstr ""
 msgid "Download BOINC + VirtualBox"
 msgstr ""
 
-#: download.php:54
-#: download.php:69
+#: download.php:54 download.php:69
 #, php-format
 msgid "for %s"
 msgstr ""
 
-#: download.php:57
-#: download.php:72
+#: download.php:57 download.php:72
 #, php-format
 msgid "BOINC version %s"
 msgstr ""
@@ -64,19 +65,30 @@ msgid "Download BOINC"
 msgstr "הורד את BOINC"
 
 #: download.php:123
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others."
+msgid ""
+"BOINC is a program that lets you donate your idle computer time to science "
+"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, and many others."
 msgstr ""
 
 #: download.php:125
-msgid "After installing BOINC on your computer, you can connect it to as many of these projects as you like."
+msgid ""
+"After installing BOINC on your computer, you can connect it to as many of "
+"these projects as you like."
 msgstr ""
 
 #: download.php:127
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
-msgstr "אתה רשאי להריץ תוכנה זו על מחשב רק במידה ואתה הבעלים שלו או שיש לך רשות מהבעלים."
+msgid ""
+"You may run this software on a computer only if you own the computer or have "
+"the permission of its owner."
+msgstr ""
+"אתה רשאי להריץ תוכנה זו על מחשב רק במידה ואתה הבעלים שלו או שיש לך רשות "
+"מהבעלים."
 
 #: download.php:132
-msgid "We recommend that you download BOINC from the Google Play Store or Amazon Appstore, not from here."
+msgid ""
+"We recommend that you download BOINC from the Google Play Store or Amazon "
+"Appstore, not from here."
 msgstr ""
 
 #: download.php:167
@@ -87,8 +99,7 @@ msgstr "דרישות מערכת"
 msgid "Release notes"
 msgstr "הערות הפצה"
 
-#: download.php:169
-#: index.php:86
+#: download.php:169 index.php:86
 msgid "Help"
 msgstr "עזרה"
 
@@ -110,20 +121,43 @@ msgstr "BOINC: חישובים עבור המדע"
 
 #: help.php:12
 #, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
-msgstr "העזרה המקוונת של BOINC מאפשרת לך לדבר אחד-על-אחד עם משתמשי BOINC מנוסים, אשר יכולים: %s לענות על שאלות אודות BOINC ועיבוד התנדבותי; %s להנחות אותך בתהליך ההתקנה והשימוש ב-BOINC; %s לפתור כל בעיה בה אתה עשוי להיתקל."
+msgid ""
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who "
+"can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"through the process of installing and using BOINC; %s troubleshoot any "
+"problems you might have."
+msgstr ""
+"העזרה המקוונת של BOINC מאפשרת לך לדבר אחד-על-אחד עם משתמשי BOINC מנוסים, אשר "
+"יכולים: %s לענות על שאלות אודות BOINC ועיבוד התנדבותי; %s להנחות אותך "
+"בתהליך ההתקנה והשימוש ב-BOINC; %s לפתור כל בעיה בה אתה עשוי להיתקל."
 
 #: help.php:21
 #, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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 מבוססת על %sSkype%s, מערכת טלפוניה מבוססת אינטרנט. Skype היא תוכנה חינמית, כמו גם השיחות עצמן. במידה ואין לך עדיין Skype, %sהורד והתקן אותה עכשיו%s. בסיום, חזור לעמוד זה."
+msgid ""
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. "
+"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 מבוססת על %sSkype%s, מערכת טלפוניה מבוססת אינטרנט. "
+"Skype היא תוכנה חינמית, כמו גם השיחות עצמן. במידה ואין לך עדיין Skype, %"
+"sהורד והתקן אותה עכשיו%s. בסיום, חזור לעמוד זה."
 
 #: help.php:28
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
-msgstr "הדרך הטובה ביותר לקבלת עזרה היא בדיבור, ולצורך כך תזדקק למיקרופון ורמקולים או אוזניות עם מיקרופון מובנה. באפשרותך להשתמש בצ'אט המובנה ב-Skype או דוא\"ל (במידה ואין לך Skype) להתקשרות עם התומכים המתנדבים."
+msgid ""
+"The best way to get help is by voice, for which you need either built-in "
+"microphone and speakers or an external headset for your computer.  You can "
+"also use Skype's text-based chat system or regular email (if you don't have "
+"Skype) to communicate with Help Volunteers."
+msgstr ""
+"הדרך הטובה ביותר לקבלת עזרה היא בדיבור, ולצורך כך תזדקק למיקרופון ורמקולים "
+"או אוזניות עם מיקרופון מובנה. באפשרותך להשתמש בצ'אט המובנה ב-Skype או דוא\"ל "
+"(במידה ואין לך Skype) להתקשרות עם התומכים המתנדבים."
 
 #: help.php:31
-msgid "Volunteers speaking several languages are available. Please select a language:"
+msgid ""
+"Volunteers speaking several languages are available. Please select a "
+"language:"
 msgstr "קיימים מתנדבים המדברים מספר שפות. בחר שפה:"
 
 #: help.php:47
@@ -132,17 +166,27 @@ msgstr "הפוך לתומך מתנדב"
 
 #: help.php:50
 #, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
-msgstr "אם אתה משתמש BOINC מנוסה, אנו מעודדים אותך %sלהפוך לתומך מתנדב%s. זו דרך מצויינת לסייע למטרות המחקר המדעי ולחישוב התנדבותי - וזה כיף!"
+msgid ""
+"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+"Volunteer%s.  It's a great way to help the cause of scientific research and "
+"volunteer computing - and it's fun!"
+msgstr ""
+"אם אתה משתמש BOINC מנוסה, אנו מעודדים אותך %sלהפוך לתומך מתנדב%s. זו דרך "
+"מצויינת לסייע למטרות המחקר המדעי ולחישוב התנדבותי - וזה כיף!"
 
 #: help.php:56
 #, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
+msgid ""
+"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
 msgstr "במידה ואתה כבר תומך מתנדב: לעריכת ההגדרות שלך, %sלחץ כאן%s."
 
 #: help_funcs.php:107
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
-msgstr "תומכי BOINC הם מתנדבים שלא בתשלום. העצה שלהם אינה מאושרת ע\"י BOINC או האוניברסיטה של קליפורניה."
+msgid ""
+"BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
+"or the University of California."
+msgstr ""
+"תומכי BOINC הם מתנדבים שלא בתשלום. העצה שלהם אינה מאושרת ע\"י BOINC או "
+"האוניברסיטה של קליפורניה."
 
 #: help_funcs.php:110
 msgid "%1Never%2 give email address or password information to BOINC helpers."
@@ -194,9 +238,7 @@ msgstr "התנדב"
 msgid "Download"
 msgstr "הורדה"
 
-#: index.php:87
-#: index.php:120
-#: index.php:171
+#: index.php:87 index.php:120 index.php:171
 msgid "Documentation"
 msgstr "תיעוד"
 
@@ -209,7 +251,10 @@ msgid "Links"
 msgstr ""
 
 #: index.php:94
-msgid "Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:"
+msgid ""
+"Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure "
+"diseases, study global warming, discover pulsars, and do many other types of "
+"scientific research.  It's safe, secure, and easy:"
 msgstr ""
 
 #: index.php:96
@@ -226,8 +271,12 @@ msgstr ""
 
 #: index.php:102
 #, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
-msgstr "או, אם אתה מריץ מספר פרוייקטים, נסה %sמנהל חשבונות%s כדוגמת %sGridRepublic%s או %sBAM!%s. "
+msgid ""
+"Or, if you run several projects, try an %saccount manager%s such as %"
+"sGridRepublic%s or %sBAM!%s. "
+msgstr ""
+"או, אם אתה מריץ מספר פרוייקטים, נסה %sמנהל חשבונות%s כדוגמת %sGridRepublic%s "
+"או %sBAM!%s. "
 
 #: index.php:118
 msgid "Compute with BOINC"
@@ -238,11 +287,17 @@ msgid "Software updates"
 msgstr "עדכוני תוכנה"
 
 #: index.php:128
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
-msgstr "%1מדענים%2: השתמשו ב-BOINC ליצירת %3פרוייקט חישוב התנדבותי%4 המעניק לך את כוח החישוב של אלפי מעבדים."
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving "
+"you the computing power of thousands of CPUs."
+msgstr ""
+"%1מדענים%2: השתמשו ב-BOINC ליצירת %3פרוייקט חישוב התנדבותי%4 המעניק לך את "
+"כוח החישוב של אלפי מעבדים."
 
 #: index.php:132
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
 msgstr "%1אוניברסיטאות%2: השתמשו ב-BOINC ליצירת %3מרכז עיבוד-על וירטואלי%4."
 
 #: index.php:137
@@ -315,7 +370,8 @@ msgstr "ממשקים לתכנות עבור התקני הרחבה"
 
 #: index.php:217
 #, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
+msgid ""
+"Open-source software for %svolunteer computing%s and %sgrid computing%s."
 msgstr "תוכנת קוד-פתוח עבור %sחישוב התנדבותי%s ו%sחישוב רשתי%s."
 
 #: index.php:230
@@ -335,7 +391,10 @@ msgid "Seismology"
 msgstr ""
 
 #: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
+msgid ""
+"The Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to Internet-connected computers.  You must buy a "
+"sensor to participate."
 msgstr ""
 
 #: projects.inc:27
@@ -347,23 +406,24 @@ msgid "Environmental research"
 msgstr ""
 
 #: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
+msgid ""
+"This project is creating a free and continuously updated map of radiation "
+"levels by using sensors connected to volunteers' computers.  You must buy a "
+"sensor to participate."
 msgstr ""
 
 #: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
+msgid ""
+"To participate in these projects you must buy a sensor and attach it to your "
+"computer."
 msgstr ""
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
 msgstr ""
 
-#: projects.inc:60
-#: projects.inc:364
-#: projects.inc:408
-#: projects.inc:457
-#: projects.inc:464
-#: projects.inc:511
+#: projects.inc:60 projects.inc:364 projects.inc:408 projects.inc:457
+#: projects.inc:464 projects.inc:511
 msgid "Private"
 msgstr ""
 
@@ -372,7 +432,11 @@ msgid "Artificial intelligence"
 msgstr ""
 
 #: projects.inc:62
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
+msgid ""
+"Parse and convert semantic nets for use in FreeHAL, an artificial "
+"intelligence that uses semantic networks, stemmers, part of speech "
+"databases, and part of speech taggers in order to imitate human behavior in "
+"conversations."
 msgstr ""
 
 #: projects.inc:69
@@ -388,7 +452,12 @@ msgid "Antimalarial drug discovery"
 msgstr ""
 
 #: projects.inc:84
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
+msgid ""
+"The parasite that causes malaria continues to evolve resistance to available "
+"medication. We therefore urgently need to discover new drugs to replace "
+"existing drugs. Importantly, these new drugs need to target NEW proteins in "
+"the parasite. The FightMalaria at Home project is aimed at finding these new "
+"targets."
 msgstr ""
 
 #: projects.inc:90
@@ -400,7 +469,12 @@ msgid "Protein structure prediction"
 msgstr ""
 
 #: projects.inc:92
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
+msgid ""
+"POEM at HOME uses a computational approach to predict the biologically active "
+"structure of proteins, to understand the signal-processing mechanisms when "
+"the proteins interact with one another, to understand diseases related to "
+"protein malfunction or aggregation, and to develop new drugs on the basis of "
+"the three-dimensions structure of biologically important proteins."
 msgstr ""
 
 #: projects.inc:98
@@ -412,7 +486,11 @@ msgid "Study of protein - ligand interactions"
 msgstr ""
 
 #: projects.inc:100
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
+msgid ""
+"Docking at Home has both bioscience and computer science goals. The project "
+"aims to further knowledge of the atomic details of protein-ligand "
+"interactions and, by doing so, will search for insights into the discovery "
+"of novel pharmaceuticals."
 msgstr ""
 
 #: projects.inc:114
@@ -424,7 +502,11 @@ msgid "Molecular simulations of proteins"
 msgstr ""
 
 #: projects.inc:116
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
+msgid ""
+"GPUGrid.net opens novel computational scenarios by the first full-atom "
+"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
+"New biomedical applications suddenly become possible giving a new role to "
+"computational biology for biomedical research."
 msgstr ""
 
 #: projects.inc:122
@@ -436,11 +518,15 @@ msgid "Genetic linkage analysis"
 msgstr ""
 
 #: projects.inc:124
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
+msgid ""
+"Superlink at Technion helps geneticists all over the world find disease-"
+"provoking genes causing some types of diabetes, hypertension (high blood "
+"pressure), cancer, schizophrenia and many others."
 msgstr ""
 
 #: projects.inc:138
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
+msgid ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
 msgstr ""
 
 #: projects.inc:139
@@ -448,7 +534,11 @@ msgid "Life science research"
 msgstr ""
 
 #: projects.inc:140
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
+msgid ""
+"The Lattice Project supplies computing power to scientists at the University "
+"of Maryland studying evolutionary relationships based on DNA sequence data; "
+"bacterial, plasmid, and virus protein sequences; and biological diversity in "
+"nature reserves. "
 msgstr ""
 
 #: projects.inc:146
@@ -460,20 +550,32 @@ msgid "Epidemiology"
 msgstr ""
 
 #: projects.inc:148
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
+msgid ""
+"Simulation models of the transmission dynamics and health effects of malaria "
+"are an important tool for malaria control. They can be used to determine "
+"optimal strategies for delivering mosquito nets, chemotherapy, or new "
+"vaccines which are currently under development and testing.  Such modeling "
+"is extremely computer intensive, requiring simulations of large human "
+"populations with a diverse set of parameters related to biological and "
+"social factors that influence the distribution of the disease. "
 msgstr ""
 
 #: projects.inc:170
 msgid "University of Washington"
 msgstr ""
 
-#: projects.inc:171
-#: projects.inc:179
+#: projects.inc:171 projects.inc:179
 msgid "Biology"
 msgstr ""
 
 #: projects.inc:172
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
+msgid ""
+"Determine the 3-dimensional shapes of proteins in research that may "
+"ultimately lead to finding cures for some major human diseases. By running "
+"Rosetta at home you will help us speed up and extend our research in ways we "
+"couldn't possibly attempt without your help. You will also be helping our "
+"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
+"Cancer, and Alzheimer's"
 msgstr ""
 
 #: projects.inc:178
@@ -481,7 +583,10 @@ msgid "University of Vienna"
 msgstr ""
 
 #: projects.inc:180
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
+msgid ""
+"Calculate similarities between proteins. SIMAP provides a public database of "
+"the resulting data, which plays a key role in many bioinformatics research "
+"projects."
 msgstr ""
 
 #: projects.inc:186
@@ -497,7 +602,15 @@ msgid "Climate study"
 msgstr ""
 
 #: projects.inc:200
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
+msgid ""
+"Investigate the approximations that have to be made in state-of-the-art "
+"climate models. By running the model thousands of times we hope to find out "
+"how the model responds to slight tweaks to these approximations - slight "
+"enough to not make the approximations any less realistic. This will allow us "
+"to improve our understanding of how sensitive our models are to small "
+"changes and also to things like changes in carbon dioxide and the sulphur "
+"cycle. This will allow us to explore how climate may change in the next "
+"century under a wide range of different scenarios."
 msgstr ""
 
 #: projects.inc:207
@@ -509,30 +622,44 @@ msgid "Mechanical engineering"
 msgstr ""
 
 #: projects.inc:214
-msgid "Currently we are calculating the optimum design of a structure call the 52 bar truss"
+msgid ""
+"Currently we are calculating the optimum design of a structure call the 52 "
+"bar truss"
 msgstr ""
 
-#: projects.inc:224
-#: projects.inc:263
-#: projects.inc:271
+#: projects.inc:224 projects.inc:263 projects.inc:271
 msgid "Astronomy"
 msgstr ""
 
 #: projects.inc:225
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
+msgid ""
+"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
+"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
+"Universe. We will measure physical parameters (such as stellar mass surface "
+"density, star formation rate surface density, attenuation, and first-order "
+"star formation history) on a resolved pixel-by-pixel basis using spectral "
+"energy distribution (SED) fitting techniques in a distributed computing mode."
 msgstr ""
 
 #: projects.inc:247
 msgid "University of Texas at Austin"
 msgstr ""
 
-#: projects.inc:248
-#: projects.inc:279
+#: projects.inc:248 projects.inc:279
 msgid "Chemistry"
 msgstr ""
 
 #: projects.inc:249
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
+msgid ""
+"A common problem in theoretical chemistry, condensed matter physics and "
+"materials science is the calculation of the time evolution of an atomic "
+"scale system where, for example, chemical reactions and/or diffusion occur. "
+"Generally the events of interest are quite rare (many orders of magnitude "
+"slower than the vibrational movements of the atoms), and therefore direct "
+"simulations, tracking every movement of the atoms, would take thousands of "
+"years of computer calculations on the fastest present day computer before a "
+"single event of interest can be expected to occur.  Our research group is "
+"interested in calculating the long time dynamics of systems."
 msgstr ""
 
 #: projects.inc:262
@@ -540,7 +667,10 @@ msgid "University of Illinois at Urbana-Champaign"
 msgstr ""
 
 #: projects.inc:264
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
+msgid ""
+"The goal of Cosmology at Home is to search for the model that best describes "
+"our Universe and to find the range of models that agree with the available "
+"astronomical particle physics data."
 msgstr ""
 
 #: projects.inc:270
@@ -548,7 +678,10 @@ msgid "Rensselaer Polytechnic Institute"
 msgstr ""
 
 #: projects.inc:272
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
+msgid ""
+"The goal of Milkyway at Home is to create a highly accurate three dimensional "
+"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
+"Survey."
 msgstr ""
 
 #: projects.inc:278
@@ -556,7 +689,13 @@ msgid "Leiden University, The Netherlands"
 msgstr ""
 
 #: projects.inc:280
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
+msgid ""
+"Surface science calculations using Classical Dynamics.  Leiden Classical "
+"allows volunteers, students and other scientist to submit their personal "
+"calculations to the grid. Each user has his own personal queue for Classical "
+"Dynamics jobs. In this way students have used the grid to simulate liquid "
+"argon, or to test the validity of the ideal gas law by actually doing the "
+"simulations through the grid."
 msgstr ""
 
 #: projects.inc:294
@@ -568,25 +707,36 @@ msgid "Astrophysics"
 msgstr ""
 
 #: projects.inc:296
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
+msgid ""
+"Search for spinning neutron stars (also called pulsars) using data from the "
+"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
+"observatory.  Einstein at Home is a World Year of Physics 2005 project "
+"supported by the American Physical Society (APS) and by a number of "
+"international organizations."
 msgstr ""
 
-#: projects.inc:310
-#: projects.inc:318
+#: projects.inc:310 projects.inc:318
 msgid "CERN (European Organization for Nuclear Research)"
 msgstr ""
 
-#: projects.inc:311
-#: projects.inc:319
+#: projects.inc:311 projects.inc:319
 msgid "Physics"
 msgstr ""
 
 #: projects.inc:312
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
+msgid ""
+"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
+"European Organization for Nuclear Research, the world's largest particle "
+"physics laboratory.  It is the most powerful instrument ever built to "
+"investigate on particles proprieties. LHC at home runs simulations to improve "
+"the design of LHC and its detectors."
 msgstr ""
 
 #: projects.inc:320
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
+msgid ""
+"This project uses CERN-developed virtual machine technology for full-fledged "
+"LHC event physics simulation on volunteer computers.  Requires that you "
+"install VirtualBox on your computer"
 msgstr ""
 
 #: projects.inc:326
@@ -599,7 +749,12 @@ msgid "Astrophysics, astrobiology"
 msgstr ""
 
 #: projects.inc:328
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
+msgid ""
+"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
+"goal is to detect intelligent life outside Earth. One approach, known as "
+"radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
+"signals from space. Such signals are not known to occur naturally, so a "
+"detection would provide evidence of extraterrestrial technology."
 msgstr ""
 
 #: projects.inc:342
@@ -611,7 +766,11 @@ msgid "Chemical engineering and nanotechnology"
 msgstr ""
 
 #: projects.inc:344
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
+msgid ""
+"The study of molecular magnets and controlled nanoscale magnetism.  These "
+"magnetic molecules may be used to develop tiny magnetic switches, with "
+"applications in medicine (such as local tumor chemotherapy) and "
+"biotechnology."
 msgstr ""
 
 #: projects.inc:351
@@ -627,7 +786,10 @@ msgid "Physics, biochemistry, and others"
 msgstr ""
 
 #: projects.inc:358
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
+msgid ""
+"The objective of CAS at home is to encourage and assist scientists in China to "
+"adopt the technologies of volunteer computing and volunteer thinking for "
+"their research."
 msgstr ""
 
 #: projects.inc:365
@@ -635,11 +797,12 @@ msgid "Mathematics, physics, evolution"
 msgstr ""
 
 #: projects.inc:366
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
+msgid ""
+"Yoyo at home is an adapter between BOINC and several existing volunteer "
+"computing projects: ECM, Muon, Evolution at home, and distributed.net"
 msgstr ""
 
-#: projects.inc:371
-#: projects.inc:527
+#: projects.inc:371 projects.inc:527
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 msgstr ""
 
@@ -649,7 +812,11 @@ msgid "European research projects"
 msgstr "פרוייקטי מחקר"
 
 #: projects.inc:373
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
+msgid ""
+"The EDGeS at Home Beta project integrates volunteer computing into the service "
+"grid network of Europe by allowing service grids to send workunits to be "
+"processed by the volunteers of this project. The scientific projects covered "
+"by the project include math, physics, biology, etc."
 msgstr ""
 
 #: projects.inc:379
@@ -674,7 +841,11 @@ msgid "Medical, environmental and other humanitarian research"
 msgstr ""
 
 #: projects.inc:389
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
+msgid ""
+"To further critical non-profit research on some of humanity's most pressing "
+"problems by creating the world's largest volunteer computing grid.  Research "
+"includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"clean water and many more."
 msgstr ""
 
 #: projects.inc:395
@@ -693,21 +864,18 @@ msgstr ""
 msgid "Simulation of quantum computing; Goldbach's conjecture."
 msgstr ""
 
-#: projects.inc:450
-#: projects.inc:458
+#: projects.inc:450 projects.inc:458
 msgid "Cryptography"
 msgstr ""
 
 #: projects.inc:459
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
+msgid ""
+"Attempt to decode 3 original Enigma messages. The signals were intercepted "
+"in the North Atlantic in 1942 and are believed to be unbroken."
 msgstr ""
 
-#: projects.inc:465
-#: projects.inc:504
-#: projects.inc:512
-#: projects.inc:520
-#: projects.inc:528
-#: projects.inc:568
+#: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
+#: projects.inc:528 projects.inc:568
 msgid "Mathematics"
 msgstr ""
 
@@ -724,11 +892,19 @@ msgid "Factorization of large integers"
 msgstr ""
 
 #: projects.inc:473
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
+msgid ""
+"NFS at Home is a research project that uses Internet-connected computers to do "
+"the lattice sieving step in the Number Field Sieve factorization of large "
+"integers. As a young school student, you gained your first experience at "
+"breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
+"NFS at Home is a continuation of that experience, only with integers that are "
+"hundreds of digits long."
 msgstr ""
 
 #: projects.inc:479
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
+msgid ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
 msgstr ""
 
 #: projects.inc:480
@@ -737,7 +913,11 @@ msgid "Software testing"
 msgstr "עדכוני תוכנה"
 
 #: projects.inc:481
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
+msgid ""
+"The aim of this project is to provide a powerful distributed computing "
+"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
+"well as others Lithuanian academic institutions.  Current applications "
+"involve the study of Monte-Carlo based software testing."
 msgstr ""
 
 #: projects.inc:503
@@ -745,11 +925,20 @@ msgid "Mathematical Institute of Leiden University / Kennislink"
 msgstr ""
 
 #: projects.inc:505
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
+msgid ""
+"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
+"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
+"product of the distinct prime factors of n. The ABC conjecture says that "
+"there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for "
+"any real h > 1. The ABC conjecture is currently one of the greatest open "
+"problems in mathematics. If it is proven to be true, a lot of other open "
+"problems can be answered directly from it."
 msgstr ""
 
 #: projects.inc:513
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
+msgid ""
+"Primegrid has multiple projects searching for different forms of very large "
+"prime numbers, including searching for the largest known prime number."
 msgstr ""
 
 #: projects.inc:519
@@ -757,11 +946,15 @@ msgid "Hochschule RheinMain University of Applied Sciences"
 msgstr ""
 
 #: projects.inc:521
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
+msgid ""
+"Search for counterexamples to two conjectures related to the identification "
+"of prime numbers"
 msgstr ""
 
 #: projects.inc:529
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
+msgid ""
+"Find all the generalized binary number systems (in which bases are matrices "
+"and digits are vectors) up to dimension 11."
 msgstr ""
 
 #: ../html/inc/news.inc:40
@@ -776,6 +969,7 @@ msgstr ""
 #, php-format
 #~ msgid "%s for %s (%s MB)"
 #~ msgstr "%s למשך %s (%s MB)"
+
 #~ msgid ""
 #~ "BOINC is a program that lets you donate your idle computer time to science "
 #~ "projects like SETI at home, Climateprediction.net, Rosetta at home, World "
@@ -786,6 +980,7 @@ msgstr ""
 #~ "כדוגמת SETI at home, Climateprediction.net, Rosetta at home, World Community Grid "
 #~ "ורבים אחרים. <p> לאחר התקנת BOINC על מחשבך, באפשרותך לחבר אותו לכמות בלתי "
 #~ "מוגבלת של הפרוייקטים הנ\"ל."
+
 #~ msgid "Browser default"
 #~ msgstr "ברירת המחדל של הדפדפן"
 
@@ -805,13 +1000,16 @@ msgstr ""
 #, fuzzy
 #~ msgid "The Lattice Project"
 #~ msgstr "פרוייקט ה-BOINC"
+
 #~ msgid "The current release is known to work with these Linux versions:"
 #~ msgstr "הגרסה הנוכחית יודעת לעבוד עם גרסאות הלינוקס הבאות:"
+
 #~ msgid ""
 #~ "For other Linux versions, check if a BOINC package is offered by your "
 #~ "Linux distribution."
 #~ msgstr ""
 #~ "לגרסאות לינוקס אחרות, בדוק אם חבילת BOINC מוצעת ע\"י מפיצי הלינוקס באזורך."
+
 #~ msgid ""
 #~ "Alternatively, download the %1BOINC client for older Linux versions%2. "
 #~ "This doesn't have a graphical interface, but it should work on all Linux "
@@ -819,12 +1017,13 @@ msgstr ""
 #~ msgstr ""
 #~ "לחילופין, הורד את %1קליינט BOINC לגרסאות לינוקס ישנות%2. לקליינט זה אין "
 #~ "ממש גרפי, אך הוא אמור לעבוד על כל מערכות לינוקס, הן x84 והן x64."
+
 #~ msgid ""
 #~ "Note: if your computer is equipped with an Graphics Processing Unit "
 #~ "(GPU), you may be able to %suse it to compute faster%s"
 #~ msgstr ""
 #~ "שים לב: אם קיימת במחשבך יחידת עיבוד גרפית (GPU), באפשרותך %sלהשתמש בה על "
 #~ "מנך לחשב מהר יותר%s"
+
 #~ msgid "TeraFLOPS."
 #~ msgstr "TeraFLOPS"
-
diff --git a/locale/hr/BOINC-Client.mo b/locale/hr/BOINC-Client.mo
index e6d03b3..dd0c6f9 100644
Binary files a/locale/hr/BOINC-Client.mo and b/locale/hr/BOINC-Client.mo differ
diff --git a/locale/hr/BOINC-Client.po b/locale/hr/BOINC-Client.po
index 1635455..7f46242 100755
--- a/locale/hr/BOINC-Client.po
+++ b/locale/hr/BOINC-Client.po
@@ -4,21 +4,22 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-10-15 22:25-0700\n"
-"PO-Revision-Date: 2015-02-10 23:37-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: 2013-11-21 18:16+0000\n"
+"Last-Translator: Josip <J.Matijevic at inet.hr>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
 "X-Generator: Pootle 2.5.0\n"
 "X-POOTLE-MTIME: 1385057796.0\n"
 
-#: acct_mgr.cpp:450
-#: acct_mgr.cpp:459
+#: acct_mgr.cpp:450 acct_mgr.cpp:459
 msgid "Message from account manager"
 msgstr "Poruka od upravitelja računa"
 
@@ -27,7 +28,9 @@ msgid "Message from server"
 msgstr "Poruka poslužitelja"
 
 #: client_state.cpp:258
-msgid "Some tasks need more memory than allowed by your preferences.  Please check the preferences."
+msgid ""
+"Some tasks need more memory than allowed by your preferences.  Please check "
+"the preferences."
 msgstr ""
 
 #: client_state.cpp:520
@@ -40,11 +43,12 @@ msgstr ""
 
 #: cs_scheduler.cpp:613
 #, c-format
-msgid "You used the wrong URL for this project.  When convenient, remove this project, then add %s"
+msgid ""
+"You used the wrong URL for this project.  When convenient, remove this "
+"project, then add %s"
 msgstr ""
 
-#: cs_statefile.cpp:828
-#: ../sched/sched_types.cpp:259
+#: cs_statefile.cpp:828 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
 msgstr ""
 
@@ -56,18 +60,15 @@ msgstr ""
 msgid "A new version of BOINC is available."
 msgstr ""
 
-#: current_version.cpp:94
-#: current_version.cpp:102
+#: current_version.cpp:94 current_version.cpp:102
 msgid "Download"
 msgstr ""
 
-#: log_flags.cpp:269
-#: log_flags.cpp:449
+#: log_flags.cpp:269 log_flags.cpp:449
 msgid "Unexpected text in cc_config.xml"
 msgstr ""
 
-#: log_flags.cpp:423
-#: log_flags.cpp:475
+#: log_flags.cpp:423 log_flags.cpp:475
 msgid "Unrecognized tag in cc_config.xml"
 msgstr ""
 
@@ -92,7 +93,9 @@ 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."
+msgid ""
+"The project has changed its security key.  Please remove and add this "
+"project."
 msgstr ""
 
 #: ../sched/handle_request.cpp:943
@@ -104,7 +107,8 @@ 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."
+msgid ""
+"Your BOINC client software is too old.  Please install the current version."
 msgstr ""
 
 #: ../sched/handle_request.cpp:1259
@@ -116,11 +120,14 @@ 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"
+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"
+msgid ""
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to "
+"the current version"
 msgstr ""
 
 #: ../sched/sched_send.cpp:1146
@@ -142,7 +149,8 @@ msgstr ""
 
 #: ../sched/sched_send.cpp:1305
 #, c-format
-msgid "Tasks for %s are available, but your preferences are set to not accept them"
+msgid ""
+"Tasks for %s are available, but your preferences are set to not accept them"
 msgstr ""
 
 #: ../sched/sched_types.cpp:254
@@ -152,4 +160,3 @@ msgstr ""
 #: ../sched/sched_version.cpp:214
 msgid "Your app_info.xml file doesn't have a usable version of"
 msgstr ""
-
diff --git a/locale/hr/BOINC-Manager.mo b/locale/hr/BOINC-Manager.mo
index 936f6cf..19e2a96 100644
Binary files a/locale/hr/BOINC-Manager.mo and b/locale/hr/BOINC-Manager.mo differ
diff --git a/locale/hr/BOINC-Manager.po b/locale/hr/BOINC-Manager.po
index 0cfb12c..d887f0d 100755
--- a/locale/hr/BOINC-Manager.po
+++ b/locale/hr/BOINC-Manager.po
@@ -4,55 +4,57 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: BOINC Manager 4.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-15 14:15-0500\n"
-"PO-Revision-Date: 2015-02-10 23:52-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
+"POT-Creation-Date: 2014-02-02 00:00-0800\n"
+"PO-Revision-Date: 2012-02-22 23:12+0200\n"
+"Last-Translator: Josip <J.Matijevic at inet.hr>\n"
 "Language-Team: BOINC Development Team <boinc_loc at ssl.berkeley.edu>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
 "X-Generator: Pootle 2.1.6\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc_7.4\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-SearchPath-0: clientgui\n"
 "X-Poedit-SearchPath-1: clientgui/msw\n"
 "X-Poedit-SearchPath-2: clientgui/gtk\n"
 "X-Poedit-SearchPath-3: clientgui/mac\n"
+"X-Poedit-SearchPath-0: clientgui\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\n"
+"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
 
-#: clientgui/AccountInfoPage.cpp:387
+#: AccountInfoPage.cpp:387
 #, c-format
 msgid "Identify your account at %s"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:393
+#: AccountInfoPage.cpp:393
 msgid ""
 "Please enter your account information\n"
 "(to create an account, visit the project's web site)"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:397
+#: AccountInfoPage.cpp:397
 msgid ""
 "This project is not currently accepting new accounts.\n"
 "You can add it only if you already have an account."
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:401
+#: AccountInfoPage.cpp:401
 msgid "Are you already running this project?"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:405
+#: AccountInfoPage.cpp:405
 msgid "&No, new user"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:408
+#: AccountInfoPage.cpp:408
 msgid "&Yes, existing user"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:413
+#: AccountInfoPage.cpp:413
 msgid ""
 "We were not able to set up your account information\n"
 "automatically.\n"
@@ -62,513 +64,494 @@ msgid ""
 "password fields."
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:416
+#: AccountInfoPage.cpp:416
 msgid "Find login information"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:649
+#: AccountInfoPage.cpp:436 AccountInfoPage.cpp:641
 #, fuzzy
 msgid "&Password:"
 msgstr "Lozinka:"
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:673
+#: AccountInfoPage.cpp:443 AccountInfoPage.cpp:665
 msgid "Choose a &password:"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:446
+#: AccountInfoPage.cpp:446
 msgid "C&onfirm password:"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:453
+#: AccountInfoPage.cpp:453
 #, c-format
 msgid "Are you already running %s?"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:482
+#: AccountInfoPage.cpp:482
 #, fuzzy
 msgid "&Username:"
 msgstr "Korisničko ime:"
 
-#: clientgui/AccountInfoPage.cpp:511
-msgid "&Email address or LDAP ID:"
-msgstr ""
-
-#: clientgui/AccountInfoPage.cpp:515
+#: AccountInfoPage.cpp:508
 msgid "&Email address:"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:523
+#: AccountInfoPage.cpp:515
 #, c-format
 msgid "minimum length %d"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:530
+#: AccountInfoPage.cpp:522
 msgid "Forgot your password?"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:537
+#: AccountInfoPage.cpp:529
 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 ""
 
-#: clientgui/AccountInfoPage.cpp:540
+#: AccountInfoPage.cpp:532
 msgid "Account manager web site"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:582
+#: AccountInfoPage.cpp:574 WelcomePage.cpp:348
 #, fuzzy
 msgid "Add project"
 msgstr "Priključi se projektu"
 
-#: clientgui/AccountInfoPage.cpp:584
+#: AccountInfoPage.cpp:576
 #, fuzzy
 msgid "Update account manager"
 msgstr "Menadžer računa"
 
-#: clientgui/AccountInfoPage.cpp:586
+#: AccountInfoPage.cpp:578 WelcomePage.cpp:307 WelcomePage.cpp:321
 #, fuzzy
 msgid "Use account manager"
 msgstr "Menadžer računa"
 
-#: clientgui/AccountInfoPage.cpp:593
+#: AccountInfoPage.cpp:585
 msgid "Please enter a user name."
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:595
+#: AccountInfoPage.cpp:587
 msgid "Please enter an email address."
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:605
+#: AccountInfoPage.cpp:597
 #, c-format
 msgid "Please enter a password of at least %d characters."
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:615
-msgid "The password and confirmation password do not match. Please type them again."
+#: AccountInfoPage.cpp:607
+msgid ""
+"The password and confirmation password do not match. Please type them again."
 msgstr ""
 
-#: clientgui/AccountManagerInfoPage.cpp:272
+#: AccountManagerInfoPage.cpp:272
 msgid "Choose an account manager"
 msgstr ""
 
-#: clientgui/AccountManagerInfoPage.cpp:275
+#: AccountManagerInfoPage.cpp:275
 msgid ""
 "To choose an account manager, click its name or \n"
 "type its URL below."
 msgstr ""
 
-#: clientgui/AccountManagerInfoPage.cpp:279
+#: AccountManagerInfoPage.cpp:279
 msgid "Account manager details:"
 msgstr ""
 
-#: clientgui/AccountManagerInfoPage.cpp:283
+#: AccountManagerInfoPage.cpp:283
 msgid "Account manager &URL:"
 msgstr ""
 
-#: clientgui/AccountManagerInfoPage.cpp:287
+#: AccountManagerInfoPage.cpp:287
 msgid "Open web page"
 msgstr ""
 
-#: clientgui/AccountManagerInfoPage.cpp:290
+#: AccountManagerInfoPage.cpp:290
 msgid "Visit this account manager's web site"
 msgstr ""
 
-#: clientgui/AccountManagerProcessingPage.cpp:186
-#: clientgui/AccountManagerPropertiesPage.cpp:192
+#: AccountManagerProcessingPage.cpp:187 AccountManagerPropertiesPage.cpp:193
 #, c-format
 msgid "Communicating with %s."
 msgstr ""
 
-#: clientgui/AccountManagerProcessingPage.cpp:193
-#: clientgui/AccountManagerPropertiesPage.cpp:199
+#: AccountManagerProcessingPage.cpp:194 AccountManagerPropertiesPage.cpp:200
 msgid "Communicating with server."
 msgstr ""
 
-#: clientgui/AccountManagerProcessingPage.cpp:198
-#: clientgui/AccountManagerPropertiesPage.cpp:204
+#: AccountManagerProcessingPage.cpp:199 AccountManagerPropertiesPage.cpp:205
 msgid "Please wait..."
 msgstr ""
 
-#: clientgui/AccountManagerProcessingPage.cpp:325
+#: AccountManagerProcessingPage.cpp:326
 msgid "An internal server error has occurred.\n"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:96
+#: AdvancedFrame.cpp:95
 msgid "Connected"
 msgstr "Spojeno"
 
-#: clientgui/AdvancedFrame.cpp:104
+#: AdvancedFrame.cpp:103
 msgid "Disconnected"
 msgstr "Prekinuto"
 
-#: clientgui/AdvancedFrame.cpp:318
+#: AdvancedFrame.cpp:322 sg_BoincSimpleFrame.cpp:119
 #, c-format
 msgid "Close the %s window"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:321
+#: AdvancedFrame.cpp:325 sg_BoincSimpleFrame.cpp:122
 msgid "&Close Window"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:332
-#: clientgui/AdvancedFrame.cpp:339
-#: clientgui/AdvancedFrame.cpp:346
+#: AdvancedFrame.cpp:336 AdvancedFrame.cpp:343 AdvancedFrame.cpp:350
 #, c-format
 msgid "Exit %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:359
-msgid "Preferences..."
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:368
+#: AdvancedFrame.cpp:371
 msgid "&Notices\tCtrl+Shift+N"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:369
+#: AdvancedFrame.cpp:372
 msgid "Display notices"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:374
+#: AdvancedFrame.cpp:377
 msgid "&Projects\tCtrl+Shift+P"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:375
+#: AdvancedFrame.cpp:378
 msgid "Display projects"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:380
+#: AdvancedFrame.cpp:383
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:381
+#: AdvancedFrame.cpp:384
 msgid "Display tasks"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:386
+#: AdvancedFrame.cpp:389
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:387
+#: AdvancedFrame.cpp:390
 msgid "Display transfers"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:392
+#: AdvancedFrame.cpp:395
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:393
+#: AdvancedFrame.cpp:396
 msgid "Display statistics"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:398
+#: AdvancedFrame.cpp:401
 msgid "&Disk usage\tCtrl+Shift+D"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:399
+#: AdvancedFrame.cpp:402
 msgid "Display disk usage"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:406
+#: AdvancedFrame.cpp:409
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:407
+#: AdvancedFrame.cpp:410
 msgid "Display the simple graphical interface."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:421
+#: AdvancedFrame.cpp:424
 #, fuzzy
 msgid "&Add project or account manager..."
 msgstr "Uključujem se u projekt..."
 
-#: clientgui/AdvancedFrame.cpp:422
+#: AdvancedFrame.cpp:425 sg_ProjectPanel.cpp:76
 msgid "Volunteer for any or all of 30+ projects in many areas of science"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:426
+#: AdvancedFrame.cpp:429
 #, c-format
 msgid "&Synchronize with %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:430
+#: AdvancedFrame.cpp:433
 #, c-format
 msgid "Get current settings from %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:440
+#: AdvancedFrame.cpp:443
 #, fuzzy
 msgid "&Add project..."
 msgstr "Uključujem se u projekt..."
 
-#: clientgui/AdvancedFrame.cpp:441
+#: AdvancedFrame.cpp:444
 #, fuzzy
 msgid "Add a project"
 msgstr "Priključi se"
 
-#: clientgui/AdvancedFrame.cpp:444
+#: AdvancedFrame.cpp:447
 #, c-format
+#, fuzzy, c-format
 msgid "S&top using %s..."
-msgstr ""
+msgstr "Zaustavljam rezultat..."
 
-#: clientgui/AdvancedFrame.cpp:450
+#: AdvancedFrame.cpp:453
 msgid "Remove this computer from account manager control."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:455
+#: AdvancedFrame.cpp:458 sg_BoincSimpleFrame.cpp:178
 msgid "&Options..."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:456
+#: AdvancedFrame.cpp:459 sg_BoincSimpleFrame.cpp:179
 #, fuzzy
 msgid "Configure display options and proxy settings"
 msgstr "Podešava GUI opcije i proxy postavke"
 
-#: clientgui/AdvancedFrame.cpp:460
+#: AdvancedFrame.cpp:463 sg_BoincSimpleFrame.cpp:172
 #, fuzzy
 msgid "Computing &preferences..."
 msgstr "&Radi ovisno o postavkama"
 
-#: clientgui/AdvancedFrame.cpp:461
+#: AdvancedFrame.cpp:464 sg_BoincSimpleFrame.cpp:173
 #, fuzzy
 msgid "Configure computing preferences"
 msgstr "&Radi ovisno o postavkama"
 
-#: clientgui/AdvancedFrame.cpp:469
+#: AdvancedFrame.cpp:472
 msgid "&Run always"
 msgstr "&Uvijek radi"
 
-#: clientgui/AdvancedFrame.cpp:470
+#: AdvancedFrame.cpp:473
 #, fuzzy
 msgid "Allow work regardless of preferences"
 msgstr "Obrađuje bez obzira na postavke"
 
-#: clientgui/AdvancedFrame.cpp:474
+#: AdvancedFrame.cpp:477
 msgid "Run based on &preferences"
 msgstr "&Radi ovisno o postavkama"
 
-#: clientgui/AdvancedFrame.cpp:475
+#: AdvancedFrame.cpp:478
 #, fuzzy
 msgid "Allow work according to preferences"
 msgstr "Obrađuje ovisno o postavkama"
 
-#: clientgui/AdvancedFrame.cpp:479
+#: AdvancedFrame.cpp:482
 msgid "&Suspend"
 msgstr "&Zaustavi"
 
-#: clientgui/AdvancedFrame.cpp:480
+#: AdvancedFrame.cpp:483
 #, fuzzy
 msgid "Stop work regardless of preferences"
 msgstr "Zaustavlja obradu bez obzira na postavke"
 
-#: clientgui/AdvancedFrame.cpp:505
+#: AdvancedFrame.cpp:508
 msgid "Use GPU always"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:506
+#: AdvancedFrame.cpp:509
 #, fuzzy
 msgid "Allow GPU work regardless of preferences"
 msgstr "Obrađuje bez obzira na postavke"
 
-#: clientgui/AdvancedFrame.cpp:510
+#: AdvancedFrame.cpp:513
 #, fuzzy
 msgid "Use GPU based on preferences"
 msgstr "&Radi ovisno o postavkama"
 
-#: clientgui/AdvancedFrame.cpp:511
+#: AdvancedFrame.cpp:514
 #, fuzzy
 msgid "Allow GPU work according to preferences"
 msgstr "Obrađuje ovisno o postavkama"
 
-#: clientgui/AdvancedFrame.cpp:515
+#: AdvancedFrame.cpp:518
 #, fuzzy
 msgid "Suspend GPU"
 msgstr "Zaustavi"
 
-#: clientgui/AdvancedFrame.cpp:516
+#: AdvancedFrame.cpp:519
 #, fuzzy
 msgid "Stop GPU work regardless of preferences"
 msgstr "Zaustavlja obradu bez obzira na postavke"
 
-#: clientgui/AdvancedFrame.cpp:540
+#: AdvancedFrame.cpp:543
 msgid "Network activity always available"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:541
+#: AdvancedFrame.cpp:544
 #, fuzzy
 msgid "Allow network activity regardless of preferences"
 msgstr "Obrađuje bez obzira na postavke"
 
-#: clientgui/AdvancedFrame.cpp:545
+#: AdvancedFrame.cpp:548
 #, fuzzy
 msgid "Network activity based on preferences"
 msgstr "Obrađuje bez obzira na postavke"
 
-#: clientgui/AdvancedFrame.cpp:546
+#: AdvancedFrame.cpp:549
 #, fuzzy
 msgid "Allow network activity according to preferences"
 msgstr "Obrađuje ovisno o postavkama"
 
-#: clientgui/AdvancedFrame.cpp:550
+#: AdvancedFrame.cpp:553
 #, fuzzy
 msgid "Network activity suspended"
 msgstr "Aktivnosti zaustavljene"
 
-#: clientgui/AdvancedFrame.cpp:551
+#: AdvancedFrame.cpp:554
 #, fuzzy
 msgid "Stop BOINC network activity"
 msgstr "Zaustavlja mrežnu aktivnost BOINC-a"
 
-#: clientgui/AdvancedFrame.cpp:561
+#: AdvancedFrame.cpp:564
 #, c-format
+#, fuzzy, c-format
 msgid "Connect to another computer running %s"
-msgstr ""
+msgstr "Spojite se na drugo računolo koje ima BOINC"
 
-#: clientgui/AdvancedFrame.cpp:566
+#: AdvancedFrame.cpp:569
 #, fuzzy
 msgid "Select computer..."
 msgstr "Odaberite računalo..."
 
-#: clientgui/AdvancedFrame.cpp:571
+#: AdvancedFrame.cpp:574
 msgid "Shut down connected client..."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:572
+#: AdvancedFrame.cpp:575
 msgid "Shut down the currently connected client"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:576
+#: AdvancedFrame.cpp:579
 msgid "Run CPU &benchmarks"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:577
+#: AdvancedFrame.cpp:580
 msgid "Runs BOINC CPU benchmarks"
 msgstr "Pokreće BOINC-ove testove procesora"
 
-#: clientgui/AdvancedFrame.cpp:581
+#: AdvancedFrame.cpp:584
 msgid "Do network communication"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:582
+#: AdvancedFrame.cpp:585
 msgid "Do all pending network communication"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:586
+#: AdvancedFrame.cpp:589
 msgid "Read config files"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:587
+#: AdvancedFrame.cpp:590
 msgid "Read configuration info from cc_config.xml and any app_config.xml files"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:591
+#: AdvancedFrame.cpp:594
 msgid "Read local prefs file"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:592
+#: AdvancedFrame.cpp:595
 msgid "Read preferences from global_prefs_override.xml."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:597
+#: AdvancedFrame.cpp:600
 #, c-format
 msgid "Launch another instance of %s..."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:601
+#: AdvancedFrame.cpp:604
 #, c-format
 msgid "Launch another %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:611
+#: AdvancedFrame.cpp:614
 msgid "Event Log...\tCtrl+Shift+E"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:612
+#: AdvancedFrame.cpp:615
 msgid "Display diagnostic messages."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:616
-msgid "Event Log Diagnostic Flags...\tCtrl+Shift+F"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:617
-msgid "Enable or disable various diagnostic messages"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:626
+#: AdvancedFrame.cpp:625 sg_BoincSimpleFrame.cpp:188
 #, c-format
 msgid "%s &help"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:632
+#: AdvancedFrame.cpp:631 sg_BoincSimpleFrame.cpp:194
 #, c-format
 msgid "Show information about %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:644
+#: AdvancedFrame.cpp:643
 #, c-format
 msgid "&%s help"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:650
+#: AdvancedFrame.cpp:649 sg_BoincSimpleFrame.cpp:212
 #, c-format
 msgid "Show information about the %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:662
+#: AdvancedFrame.cpp:661 sg_BoincSimpleFrame.cpp:224
 #, c-format
 msgid "%s &web site"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:668
+#: AdvancedFrame.cpp:667 sg_BoincSimpleFrame.cpp:230
 #, c-format
+#, fuzzy, c-format
 msgid "Show information about BOINC and %s"
-msgstr ""
+msgstr "Pokazuje informacije o BOINC menadžeru"
 
-#: clientgui/AdvancedFrame.cpp:680
-#: clientgui/BOINCTaskBar.cpp:544
+#: AdvancedFrame.cpp:679 BOINCTaskBar.cpp:530 sg_BoincSimpleFrame.cpp:242
 #, c-format
 msgid "&About %s..."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:686
+#: AdvancedFrame.cpp:685 sg_BoincSimpleFrame.cpp:248
 msgid "Licensing and copyright information."
 msgstr "Licenčne i autorske informacije."
 
-#: clientgui/AdvancedFrame.cpp:693
+#: AdvancedFrame.cpp:692 sg_BoincSimpleFrame.cpp:255
 msgid "&File"
 msgstr "&Datoteka"
 
-#: clientgui/AdvancedFrame.cpp:697
+#: AdvancedFrame.cpp:696 sg_BoincSimpleFrame.cpp:259
 msgid "&View"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:701
+#: AdvancedFrame.cpp:700 sg_BoincSimpleFrame.cpp:263
 msgid "&Tools"
 msgstr "&Alati"
 
-#: clientgui/AdvancedFrame.cpp:705
+#: AdvancedFrame.cpp:704
 msgid "&Activity"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:709
+#: AdvancedFrame.cpp:708
 msgid "A&dvanced"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:713
+#: AdvancedFrame.cpp:712 DlgEventLog.cpp:332 sg_BoincSimpleFrame.cpp:267
+#: wizardex.cpp:374 wizardex.cpp:381
 msgid "&Help"
 msgstr "&Pomoć"
 
-#: clientgui/AdvancedFrame.cpp:1185
+#: AdvancedFrame.cpp:1199
 #, c-format
 msgid "%s - Stop using %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:1190
+#: AdvancedFrame.cpp:1204
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -578,48 +561,49 @@ msgid ""
 "Do you want to stop using %s?"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:1397
+#: AdvancedFrame.cpp:1401
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:1406
+#: AdvancedFrame.cpp:1410
 #, c-format
 msgid ""
 "%s will shut down the current client\n"
 "and prompt you for another host to connect to."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:1806
+#: AdvancedFrame.cpp:1745 DlgAbout.cpp:119
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:1815
+#: AdvancedFrame.cpp:1754
 #, c-format
 msgid "%s has successfully added %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:1953
+#: AdvancedFrame.cpp:1893
 #, c-format
 msgid "%s - (%s)"
 msgstr "%s - (%s)"
 
-#: clientgui/AdvancedFrame.cpp:1957
+#: AdvancedFrame.cpp:1897
 #, c-format
 msgid "Connecting to %s"
 msgstr "Spajam se na %s"
 
-#: clientgui/AdvancedFrame.cpp:1960
+#: AdvancedFrame.cpp:1900
 #, c-format
+#, fuzzy, c-format
 msgid "Connected to %s (%s)"
-msgstr ""
+msgstr "Spojeno na %s"
 
-#: clientgui/AlreadyExistsPage.cpp:184
+#: AlreadyExistsPage.cpp:184
 msgid "Username already in use"
 msgstr ""
 
-#: clientgui/AlreadyExistsPage.cpp:187
+#: AlreadyExistsPage.cpp:187
 msgid ""
 "An account with that username already exists and has a\n"
 "different password than the one you entered.\n"
@@ -627,11 +611,11 @@ msgid ""
 "Please visit the project's web site and follow the instructions there."
 msgstr ""
 
-#: clientgui/AlreadyExistsPage.cpp:191
+#: AlreadyExistsPage.cpp:191
 msgid "Email address already in use"
 msgstr ""
 
-#: clientgui/AlreadyExistsPage.cpp:194
+#: AlreadyExistsPage.cpp:194
 msgid ""
 "An account with that email address already exists and has a\n"
 "different password than the one you entered.\n"
@@ -639,161 +623,175 @@ msgid ""
 "Please visit the project's web site and follow the instructions there."
 msgstr ""
 
-#: clientgui/AsyncRPC.cpp:1031
+#: AsyncRPC.cpp:1031
 msgid "Communicating with BOINC client.  Please wait ..."
 msgstr ""
 
-#: clientgui/AsyncRPC.cpp:1034
+#: AsyncRPC.cpp:1034
 #, c-format
 msgid "&Quit %s"
 msgstr ""
 
-#: clientgui/AsyncRPC.cpp:1036
+#: AsyncRPC.cpp:1036
 #, c-format
 msgid "E&xit %s"
 msgstr ""
 
-#: clientgui/AsyncRPC.cpp:1040
+#: AsyncRPC.cpp:1040
 #, c-format
 msgid "%s - Communication"
 msgstr ""
 
-#: clientgui/AsyncRPC.cpp:1056
+#: AsyncRPC.cpp:1056 DlgAdvPreferencesBase.cpp:107 sg_DlgPreferences.cpp:433
 #, fuzzy
 msgid "Cancel"
 msgstr "&Poništi"
 
-#: clientgui/BOINCBaseFrame.cpp:504
+#: BOINCBaseFrame.cpp:505
 #, c-format
 msgid "%s - Connection Error"
 msgstr ""
 
-#: clientgui/BOINCBaseFrame.cpp:513
+#: BOINCBaseFrame.cpp:514
 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:522
+#: BOINCBaseFrame.cpp:523
 msgid ""
 "Authorization failed connecting to running client.\n"
 "Make sure you start this program in the same directory as the client."
 msgstr ""
 
-#: clientgui/BOINCBaseFrame.cpp:524
+#: BOINCBaseFrame.cpp:525
 msgid "Authorization failed connecting to running client."
 msgstr ""
 
-#: clientgui/BOINCBaseFrame.cpp:532
+#: BOINCBaseFrame.cpp:533
 msgid "The password you have provided is incorrect, please try again."
 msgstr "Lozinka koju ste unijeli je netočna, molimo pokušajte ponovno."
 
-#: clientgui/BOINCBaseFrame.cpp:576
+#: BOINCBaseFrame.cpp:577
 #, c-format
 msgid "%s - Connection Failed"
 msgstr ""
 
-#: clientgui/BOINCBaseFrame.cpp:585
+#: BOINCBaseFrame.cpp:586
 #, c-format
 msgid ""
 "%s is not able to connect to a %s client.\n"
 "Would you like to try to connect again?"
 msgstr ""
 
-#: clientgui/BOINCBaseFrame.cpp:621
+#: BOINCBaseFrame.cpp:622
 #, c-format
 msgid "%s - Daemon Start Failed"
 msgstr ""
 
-#: clientgui/BOINCBaseFrame.cpp:631
+#: BOINCBaseFrame.cpp:632
 #, 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:637
+#: BOINCBaseFrame.cpp:638
 #, c-format
 msgid ""
 "%s is not able to start a %s client.\n"
 "Please start the daemon and try again."
 msgstr ""
 
-#: clientgui/BOINCBaseFrame.cpp:688
+#: BOINCBaseFrame.cpp:689
 #, c-format
 msgid "%s - Connection Status"
 msgstr ""
 
-#: clientgui/BOINCBaseFrame.cpp:699
+#: BOINCBaseFrame.cpp:700
 #, 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 ""
 
-#: clientgui/BOINCBaseView.cpp:752
+#: BOINCBaseView.cpp:779
 #, fuzzy
 msgid "Project web pages"
 msgstr "Projekt"
 
-#: clientgui/BOINCClientManager.cpp:573
+#: BOINCClientManager.cpp:575
 #, c-format
 msgid "%s - Unexpected Exit"
 msgstr ""
 
-#: clientgui/BOINCClientManager.cpp:583
+#: BOINCClientManager.cpp:585
 #, 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 ""
 
-#: clientgui/BOINCDialupManager.cpp:61
+#: BOINCDialupManager.cpp:61
 #, c-format
 msgid "%s - Network Status"
 msgstr ""
 
-#: clientgui/BOINCDialupManager.cpp:241
+#: BOINCDialupManager.cpp:241
 #, c-format
+#, fuzzy, c-format
 msgid ""
 "%s needs to connect to the Internet.\n"
 "May it do so now?"
 msgstr ""
+"BOINC se treba spojiti na internet.\n"
+"Može li to učiniti sada"
 
-#: clientgui/BOINCDialupManager.cpp:254
+#: BOINCDialupManager.cpp:254
 #, c-format
+#, fuzzy, c-format
 msgid "%s is connecting to the Internet."
-msgstr ""
+msgstr "BOINC se spaja na internet."
 
-#: clientgui/BOINCDialupManager.cpp:303
+#: BOINCDialupManager.cpp:303
 #, c-format
+#, fuzzy, c-format
 msgid "%s has successfully connected to the Internet."
-msgstr ""
+msgstr "BOINC se uspješno odpojio s interneta."
 
-#: clientgui/BOINCDialupManager.cpp:331
+#: BOINCDialupManager.cpp:331
 #, c-format
+#, fuzzy, c-format
 msgid "%s failed to connect to the Internet."
-msgstr ""
+msgstr "BOINC se nije uspio spojiti na internet."
 
-#: clientgui/BOINCDialupManager.cpp:372
+#: BOINCDialupManager.cpp:372
 #, c-format
+#, fuzzy, c-format
 msgid ""
 "%s has detected it is now connected to the Internet.\n"
 "Updating all projects and retrying all transfers."
 msgstr ""
+"BOINC je detektirao vezu na internet, ažurira sve projekte i ponovo pokušava "
+"sve prijenose."
 
-#: clientgui/BOINCDialupManager.cpp:417
+#: BOINCDialupManager.cpp:417
 #, c-format
+#, fuzzy, c-format
 msgid "%s has successfully disconnected from the Internet."
-msgstr ""
+msgstr "BOINC se uspješno odpojio s interneta."
 
-#: clientgui/BOINCDialupManager.cpp:433
+#: BOINCDialupManager.cpp:433
 #, c-format
+#, fuzzy, c-format
 msgid "%s failed to disconnected from the Internet."
-msgstr ""
+msgstr "BOINC se nije uspio odpojiti s interneta."
 
-#: clientgui/BOINCGUIApp.cpp:595
+#: BOINCGUIApp.cpp:339
 #, c-format
 msgid ""
 "You currently are not authorized to manage the client.\n"
@@ -806,852 +804,817 @@ msgid ""
 "     user group."
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:601
+#: BOINCGUIApp.cpp:345
 #, c-format
 msgid ""
 "%s ownership or permissions are not set properly; please reinstall %s.\n"
 "(Error code %d"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:607
+#: BOINCGUIApp.cpp:351
 msgid " at "
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:610
+#: BOINCGUIApp.cpp:354 MainDocument.cpp:2484 MainDocument.cpp:2534
+#: MainDocument.cpp:2554 ViewTransfers.cpp:803
 msgid ")"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:640
+#: BOINCGUIApp.cpp:384
 msgid ""
 "A reboot is required in order for BOINC to run properly.\n"
 "Please reboot your computer and try again."
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:641
+#: BOINCGUIApp.cpp:385 DlgAbout.cpp:153
 msgid "BOINC Manager"
 msgstr "BOINC Menadžer"
 
-#: clientgui/BOINCGUIApp.cpp:902
+#: BOINCGUIApp.cpp:572
 msgid "BOINC Manager was started by the operating system automatically"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:904
+#: BOINCGUIApp.cpp:574
 msgid "Startup BOINC so only the system tray icon is visible"
 msgstr "Pokrenuti BOINC tako da je vidljiva samo ikona u trayu"
 
-#: clientgui/BOINCGUIApp.cpp:906
+#: BOINCGUIApp.cpp:576
 msgid "Directory containing the BOINC Client executable"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:907
+#: BOINCGUIApp.cpp:577
 msgid "BOINC data directory"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:909
+#: BOINCGUIApp.cpp:579
 msgid "Host name or IP address"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:910
+#: BOINCGUIApp.cpp:580
 msgid "GUI RPC port number"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:911
+#: BOINCGUIApp.cpp:581
 #, fuzzy
 msgid "Password"
 msgstr "Lozinka:"
 
-#: clientgui/BOINCGUIApp.cpp:912
+#: BOINCGUIApp.cpp:582
 msgid "Startup BOINC with these optional arguments"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:913
+#: BOINCGUIApp.cpp:583
 msgid "disable BOINC security users and permissions"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:914
+#: BOINCGUIApp.cpp:584
 msgid "set skin debugging mode to enable skin manager error messages"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:915
+#: BOINCGUIApp.cpp:585
 msgid "multiple instances of BOINC Manager allowed"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:917
+#: BOINCGUIApp.cpp:587
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:1164
+#: BOINCGUIApp.cpp:814
 msgid "(Automatic Detection)"
 msgstr "(Automatska detekcija)"
 
-#: clientgui/BOINCGUIApp.cpp:1165
+#: BOINCGUIApp.cpp:815
 msgid "(Unknown)"
 msgstr "(Nepoznato)"
 
-#: clientgui/BOINCGUIApp.cpp:1166
+#: BOINCGUIApp.cpp:816
 msgid "(User Defined)"
 msgstr "(Korisnički određeno)"
 
-#: clientgui/BOINCTaskBar.cpp:522
+#: BOINCTaskBar.cpp:508
 #, c-format
 msgid "Open %s Web..."
 msgstr ""
 
-#: clientgui/BOINCTaskBar.cpp:529
+#: BOINCTaskBar.cpp:515
 #, c-format
 msgid "Open %s..."
 msgstr ""
 
-#: clientgui/BOINCTaskBar.cpp:536
-#: clientgui/BOINCTaskBar.cpp:633
-#: clientgui/BOINCTaskBar.cpp:641
+#: BOINCTaskBar.cpp:522 BOINCTaskBar.cpp:619 BOINCTaskBar.cpp:627
 msgid "Snooze"
 msgstr ""
 
-#: clientgui/BOINCTaskBar.cpp:538
-#: clientgui/BOINCTaskBar.cpp:660
-#: clientgui/BOINCTaskBar.cpp:668
+#: BOINCTaskBar.cpp:524 BOINCTaskBar.cpp:646 BOINCTaskBar.cpp:654
 msgid "Snooze GPU"
 msgstr ""
 
-#: clientgui/BOINCTaskBar.cpp:556
+#: BOINCTaskBar.cpp:542
 msgid "E&xit"
 msgstr "&Izlaz"
 
-#: clientgui/BOINCTaskBar.cpp:626
+#: BOINCTaskBar.cpp:612 ViewProjects.cpp:718 ViewWork.cpp:795
+#: sg_BoincSimpleFrame.cpp:758 sg_ProjectCommandPopup.cpp:110
+#: sg_TaskCommandPopup.cpp:102
 msgid "Resume"
 msgstr "Nastavi"
 
-#: clientgui/BOINCTaskBar.cpp:653
+#: BOINCTaskBar.cpp:639
 #, fuzzy
 msgid "Resume GPU"
 msgstr "Nastavi"
 
-#: clientgui/BOINCTaskBar.cpp:727
+#: BOINCTaskBar.cpp:713
 msgid "Computing is enabled"
 msgstr ""
 
-#: clientgui/BOINCTaskBar.cpp:731
+#: BOINCTaskBar.cpp:717
 #, fuzzy
 msgid "Computing is suspended - "
 msgstr "Aktivnosti zaustavljene od korisnika"
 
-#: clientgui/BOINCTaskBar.cpp:741
+#: BOINCTaskBar.cpp:727
 msgid "GPU computing is enabled"
 msgstr ""
 
-#: clientgui/BOINCTaskBar.cpp:744
+#: BOINCTaskBar.cpp:730
 #, fuzzy
 msgid "GPU computing is suspended - "
 msgstr "Aktivnosti zaustavljene od korisnika"
 
-#: clientgui/BOINCTaskBar.cpp:753
+#: BOINCTaskBar.cpp:739
 #, fuzzy
 msgid "Network is enabled"
 msgstr "Aktivnosti zaustavljene"
 
-#: clientgui/BOINCTaskBar.cpp:756
+#: BOINCTaskBar.cpp:742
 #, fuzzy
 msgid "Network is suspended - "
 msgstr "Aktivnosti zaustavljene"
 
-#: clientgui/BOINCTaskBar.cpp:764
+#: BOINCTaskBar.cpp:750
 msgid "Reconnecting to client."
 msgstr ""
 
-#: clientgui/BOINCTaskBar.cpp:766
+#: BOINCTaskBar.cpp:752
 msgid "Not connected to a client."
 msgstr ""
 
-#: clientgui/BOINCTaskBar.cpp:819
+#: BOINCTaskBar.cpp:805
 #, c-format
 msgid "%s Notices"
 msgstr ""
 
-#: clientgui/BOINCTaskBar.cpp:825
+#: BOINCTaskBar.cpp:811
 msgid "There are new notices - click to view."
 msgstr ""
 
-#: clientgui/CompletionErrorPage.cpp:199
+#: CompletionErrorPage.cpp:199
 msgid "Failed to add project"
 msgstr ""
 
-#: clientgui/CompletionErrorPage.cpp:204
+#: CompletionErrorPage.cpp:204
 msgid "Failed to update account manager"
 msgstr ""
 
-#: clientgui/CompletionErrorPage.cpp:208
+#: CompletionErrorPage.cpp:208
 msgid "Failed to remove account manager"
 msgstr ""
 
-#: clientgui/CompletionErrorPage.cpp:212
+#: CompletionErrorPage.cpp:212
 msgid "Failed to add account manager"
 msgstr ""
 
-#: clientgui/CompletionErrorPage.cpp:221
+#: CompletionErrorPage.cpp:221
 msgid ""
 "Please try again later.\n"
 "\n"
 "Click Finish to close."
 msgstr ""
 
-#: clientgui/CompletionErrorPage.cpp:225
-#: clientgui/CompletionPage.cpp:222
-#: clientgui/CompletionPage.cpp:242
-#: clientgui/CompletionPage.cpp:273
+#: CompletionErrorPage.cpp:225 CompletionPage.cpp:222 CompletionPage.cpp:242
+#: CompletionPage.cpp:273
 msgid "Click Finish to close."
 msgstr ""
 
-#: clientgui/CompletionErrorPage.cpp:234
+#: CompletionErrorPage.cpp:234
 msgid "Messages from server:"
 msgstr ""
 
-#: clientgui/CompletionPage.cpp:207
+#: CompletionPage.cpp:207
 #, fuzzy
 msgid "Project added"
 msgstr "Projekt"
 
-#: clientgui/CompletionPage.cpp:213
+#: CompletionPage.cpp:213
 msgid "This project has been successfully added."
 msgstr ""
 
-#: clientgui/CompletionPage.cpp:218
+#: 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 ""
 
-#: clientgui/CompletionPage.cpp:232
+#: CompletionPage.cpp:232
 #, c-format
 msgid "Update from %s completed."
 msgstr ""
 
-#: clientgui/CompletionPage.cpp:236
+#: CompletionPage.cpp:236
 msgid "Update completed."
 msgstr ""
 
-#: clientgui/CompletionPage.cpp:247
+#: CompletionPage.cpp:247
 msgid "Now using account manager"
 msgstr ""
 
-#: clientgui/CompletionPage.cpp:252
+#: CompletionPage.cpp:252
 #, c-format
 msgid "Welcome to %s!"
 msgstr ""
 
-#: clientgui/CompletionPage.cpp:263
+#: CompletionPage.cpp:263
 #, c-format
 msgid "You are now using %s to manage accounts."
 msgstr ""
 
-#: clientgui/CompletionPage.cpp:267
+#: CompletionPage.cpp:267
 msgid "You are now using this account manager."
 msgstr ""
 
-#: clientgui/DlgAbout.cpp:113
+#: DlgAbout.cpp:113 mac/Mac_GUI.cpp:96
 #, c-format
 msgid "About %s"
 msgstr ""
 
-#: clientgui/DlgAbout.cpp:172
+#: DlgAbout.cpp:172
 msgid "Version:"
 msgstr "Verzija:"
 
-#: clientgui/DlgAbout.cpp:180
+#: DlgAbout.cpp:180
 msgid "wxWidgets Version:"
 msgstr ""
 
-#: clientgui/DlgAbout.cpp:188
+#: DlgAbout.cpp:188
 msgid "Copyright:"
 msgstr "Autorska prava:"
 
-#: clientgui/DlgAbout.cpp:192
+# 98%
+#: DlgAbout.cpp:192
+#, fuzzy
 msgid ""
-"(C) 2003-2014 University of California, Berkeley.\n"
+"(C) 2003-2013 University of California, Berkeley.\n"
 "All Rights Reserved."
 msgstr ""
+"(C) 2005 Kalifornijsko sveučilište u Berkeleyu.\n"
+"Sva prava pridržana."
 
-#: clientgui/DlgAbout.cpp:196
+#: DlgAbout.cpp:196
 msgid "Berkeley Open Infrastructure for Network Computing"
 msgstr "Berkeley Open Infrastructure for Network Computing"
 
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:399
-#: clientgui/DlgSelectComputer.cpp:163
+#: DlgAbout.cpp:208 DlgExitMessage.cpp:173 DlgGenericMessage.cpp:120
+#: DlgOptions.cpp:396 DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "&U redu"
 
-#: clientgui/DlgAdvPreferences.cpp:602
+#: DlgAdvPreferences.cpp:544
 msgid "invalid number"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:603
+#: DlgAdvPreferences.cpp:545
 msgid "invalid time, format is HH:MM"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:604
+#: DlgAdvPreferences.cpp:546
 msgid "invalid time interval, format is HH:MM-HH:MM"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:817
+#: DlgAdvPreferences.cpp:751
 msgid "invalid input value detected"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:819
+#: DlgAdvPreferences.cpp:753
 msgid "Validation Error"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:969
-#: clientgui/DlgAdvPreferences.cpp:975
-#: clientgui/DlgAdvPreferences.cpp:981
+#: DlgAdvPreferences.cpp:885 DlgAdvPreferences.cpp:891
+#: DlgAdvPreferences.cpp:897
 msgid "Applications to add"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:998
+#: DlgAdvPreferences.cpp:914
 #, c-format
 msgid "'%s' is not an executable application."
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:999
-#: clientgui/DlgAdvPreferences.cpp:1046
-#: clientgui/DlgAdvPreferences.cpp:1070
+#: DlgAdvPreferences.cpp:915 DlgAdvPreferences.cpp:962
+#: DlgAdvPreferences.cpp:986
 msgid "Add Exclusive App"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Name of application to add?"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Add exclusive app"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1045
+#: DlgAdvPreferences.cpp:961
 #, c-format
 msgid "Application names must end with '%s'"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1069
+#: DlgAdvPreferences.cpp:985
 #, c-format
 msgid "'%s' is already in the list."
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1161
+#: DlgAdvPreferences.cpp:1077
 msgid ""
 "Do you really want to clear all local preferences?\n"
 "(This will not affect exclusive applications.)"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1162
+#: DlgAdvPreferences.cpp:1078 sg_DlgPreferences.cpp:1030
 msgid "Confirmation"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:49
+#: DlgAdvPreferencesBase.cpp:46 sg_DlgPreferences.cpp:946
 #, c-format
-msgid "%s - Computing preferences"
+msgid "%s - Preferences"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:66
+#: DlgAdvPreferencesBase.cpp:62
 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 ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:69
+#: DlgAdvPreferencesBase.cpp:65 sg_DlgPreferences.cpp:428
 msgid "Clear"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:70
+#: DlgAdvPreferencesBase.cpp:66
 msgid "clear all local preferences and close the dialog"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:85
+#: DlgAdvPreferencesBase.cpp:81
 msgid "processor usage"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:88
+#: DlgAdvPreferencesBase.cpp:84
 msgid "network usage"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:91
+#: DlgAdvPreferencesBase.cpp:87
 msgid "disk and memory usage"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:94
+#: DlgAdvPreferencesBase.cpp:90
 msgid "exclusive applications"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:107
-#: clientgui/DlgDiagnosticLogFlags.cpp:104
+#: DlgAdvPreferencesBase.cpp:102 sg_DlgPreferences.cpp:424
 msgid "OK"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:108
+#: DlgAdvPreferencesBase.cpp:103
 msgid "save all values and close the dialog"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:114
+#: DlgAdvPreferencesBase.cpp:108
 msgid "close the dialog without saving"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:118
-#: clientgui/Localization.cpp:35
-#: clientgui/Localization.cpp:121
-#: clientgui/Localization.cpp:139
+#: DlgAdvPreferencesBase.cpp:112 Localization.cpp:35 Localization.cpp:121
+#: Localization.cpp:139 sg_BoincSimpleFrame.cpp:794 sg_DlgPreferences.cpp:439
 #, fuzzy
 msgid "Help"
 msgstr "&Pomoć"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
+#: DlgAdvPreferencesBase.cpp:113
 msgid "shows the preferences web page"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:141
+#: DlgAdvPreferencesBase.cpp:135
 msgid "Computing allowed"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
+#: DlgAdvPreferencesBase.cpp:139
 msgid "While computer is on batteries"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:149
-msgid "check this if you want this computer to do work while it runs on batteries"
+#: DlgAdvPreferencesBase.cpp:142
+msgid ""
+"check this if you want this computer to do work while it runs on batteries"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:155
+#: DlgAdvPreferencesBase.cpp:148
 msgid "While computer is in use"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:158
-msgid "check this if you want this computer to do work even when you're using it"
+#: DlgAdvPreferencesBase.cpp:151
+msgid ""
+"check this if you want this computer to do work even when you're using it"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:164
+#: DlgAdvPreferencesBase.cpp:157
 msgid "Use GPU while computer is in use"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:167
-msgid "check this if you want your GPU to do work even when you're using the computer"
+#: DlgAdvPreferencesBase.cpp:160
+msgid ""
+"check this if you want your GPU to do work even when you're using the "
+"computer"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:179
+#: DlgAdvPreferencesBase.cpp:172
 msgid "Only after computer has been idle for"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:188
-msgid "do work only after you haven't used the computer for this number of minutes"
+#: DlgAdvPreferencesBase.cpp:182
+msgid ""
+"do work only after you haven't used the computer for this number of minutes"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:193
-#: clientgui/DlgAdvPreferencesBase.cpp:342
+#: DlgAdvPreferencesBase.cpp:187 DlgAdvPreferencesBase.cpp:336
+#: sg_DlgPreferences.cpp:417
 msgid "minutes"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:212
+#: DlgAdvPreferencesBase.cpp:206
 msgid "While processor usage is less than"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:221
+#: DlgAdvPreferencesBase.cpp:216
 msgid "suspend work if processor usage exceeds this level"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:226
+#: DlgAdvPreferencesBase.cpp:221
 msgid "percent (0 means no restriction)"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:240
-#: clientgui/DlgAdvPreferencesBase.cpp:506
+#: DlgAdvPreferencesBase.cpp:235 DlgAdvPreferencesBase.cpp:496
 msgid "Every day between hours of"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: DlgAdvPreferencesBase.cpp:239
 msgid "start work at this time"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:248
-#: clientgui/DlgAdvPreferencesBase.cpp:514
+#: DlgAdvPreferencesBase.cpp:243 DlgAdvPreferencesBase.cpp:504
+#: sg_DlgPreferences.cpp:326 sg_DlgPreferences.cpp:348
 msgid "and"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:252
+#: DlgAdvPreferencesBase.cpp:247
 msgid "stop work at this time"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
-#: clientgui/DlgAdvPreferencesBase.cpp:522
+#: DlgAdvPreferencesBase.cpp:251 DlgAdvPreferencesBase.cpp:512
 msgid "(no restriction if equal)"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:261
-#: clientgui/DlgAdvPreferencesBase.cpp:527
+#: DlgAdvPreferencesBase.cpp:256 DlgAdvPreferencesBase.cpp:517
 msgid "Day-of-week override:"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:266
-#: clientgui/DlgAdvPreferencesBase.cpp:532
+#: DlgAdvPreferencesBase.cpp:261 DlgAdvPreferencesBase.cpp:522
 msgid "check box to specify hours for this day of week"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:272
-#: clientgui/DlgAdvPreferencesBase.cpp:538
+#: DlgAdvPreferencesBase.cpp:267 DlgAdvPreferencesBase.cpp:528
 msgid "Monday"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:279
-#: clientgui/DlgAdvPreferencesBase.cpp:545
+#: DlgAdvPreferencesBase.cpp:274 DlgAdvPreferencesBase.cpp:535
 msgid "Tuesday"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:286
-#: clientgui/DlgAdvPreferencesBase.cpp:552
+#: DlgAdvPreferencesBase.cpp:281 DlgAdvPreferencesBase.cpp:542
 msgid "Wednesday"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:293
-#: clientgui/DlgAdvPreferencesBase.cpp:559
+#: DlgAdvPreferencesBase.cpp:288 DlgAdvPreferencesBase.cpp:549
 msgid "Thursday"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:300
-#: clientgui/DlgAdvPreferencesBase.cpp:566
+#: DlgAdvPreferencesBase.cpp:295 DlgAdvPreferencesBase.cpp:556
 msgid "Friday"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:307
-#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: DlgAdvPreferencesBase.cpp:302 DlgAdvPreferencesBase.cpp:563
 msgid "Saturday"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:580
+#: DlgAdvPreferencesBase.cpp:309 DlgAdvPreferencesBase.cpp:570
 msgid "Sunday"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:328
+#: DlgAdvPreferencesBase.cpp:323
 msgid "Other options"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:336
+#: DlgAdvPreferencesBase.cpp:330
 msgid "Switch between applications every"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:345
+#: DlgAdvPreferencesBase.cpp:339
 msgid "On multiprocessor systems, use at most"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
+#: DlgAdvPreferencesBase.cpp:346
 #, no-c-format
-msgid "% of the processors (0 means no restriction)"
+msgid "% of the processors (0 means ignore this setting)"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:355
-#: clientgui/DlgAdvPreferencesBase.cpp:618
-#: clientgui/DlgAdvPreferencesBase.cpp:640
-#: clientgui/DlgAdvPreferencesBase.cpp:661
-#: clientgui/DlgAdvPreferencesBase.cpp:683
-#: clientgui/DlgAdvPreferencesBase.cpp:694
+#: DlgAdvPreferencesBase.cpp:349 DlgAdvPreferencesBase.cpp:605
+#: DlgAdvPreferencesBase.cpp:627 DlgAdvPreferencesBase.cpp:648
+#: DlgAdvPreferencesBase.cpp:669 DlgAdvPreferencesBase.cpp:679
 msgid "Use at most"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:362
+#: DlgAdvPreferencesBase.cpp:356
 #, no-c-format
-msgid "% of CPU time (0 means no restriction)"
-msgstr ""
+#, fuzzy, no-c-format
+msgid "% CPU time"
+msgstr "Procesorsko vrijeme"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:386
+#: DlgAdvPreferencesBase.cpp:378
 msgid "General options"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:395
+#: DlgAdvPreferencesBase.cpp:386
 msgid "Maximum download rate"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:401
-#: clientgui/DlgAdvPreferencesBase.cpp:410
-msgid "KBytes/second (0 means no restriction)"
+#: DlgAdvPreferencesBase.cpp:392 DlgAdvPreferencesBase.cpp:401
+msgid "KBytes/sec."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:404
+#: DlgAdvPreferencesBase.cpp:395
 msgid "Maximum upload rate"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:417
-msgid "Minimum work buffer"
-msgstr ""
+#: DlgAdvPreferencesBase.cpp:406
+#, fuzzy
+msgid "Transfer at most"
+msgstr "Prijenosi"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:425
-msgid "Try to maintain enough tasks to keep busy for this many days"
+#: DlgAdvPreferencesBase.cpp:412
+msgid "Mbytes"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:431
-#: clientgui/DlgAdvPreferencesBase.cpp:449
-msgid "days (maximum value: 10)"
+#: DlgAdvPreferencesBase.cpp:415
+msgid "every"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:437
-msgid "Max additional work buffer"
+#: DlgAdvPreferencesBase.cpp:421 DlgAdvPreferencesBase.cpp:444
+#: DlgAdvPreferencesBase.cpp:463
+msgid "days"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:445
-msgid "In addition, maintain enough tasks for up to this many days"
+#: DlgAdvPreferencesBase.cpp:429
+msgid "Minimum work buffer"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:454
-#, fuzzy
-msgid "Transfer at most"
-msgstr "Prijenosi"
+#: DlgAdvPreferencesBase.cpp:438
+msgid "Try to maintain enough tasks to keep busy for this many days"
+msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:462
-msgid "MBytes every"
+#: DlgAdvPreferencesBase.cpp:450
+msgid "Max additional work buffer"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:468
-msgid "days (0 means no restriction)"
+#: DlgAdvPreferencesBase.cpp:459
+msgid "In addition, maintain enough tasks for up to this many days"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:476
+#: DlgAdvPreferencesBase.cpp:466
 msgid "Skip image file verification"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:478
+#: DlgAdvPreferencesBase.cpp:468
 msgid "check this if your Internet provider modifies image files"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:484
+#: DlgAdvPreferencesBase.cpp:476
 msgid "Connect options"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:487
+#: DlgAdvPreferencesBase.cpp:478
 msgid "Confirm before connecting to internet"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
+#: DlgAdvPreferencesBase.cpp:480
+msgid ""
+"if checked, a confirmation dialog will be displayed before trying to connect "
+"to the Internet"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:493
+#: DlgAdvPreferencesBase.cpp:484
 msgid "Disconnect when done"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:495
+#: DlgAdvPreferencesBase.cpp:486
 msgid ""
 "if checked, BOINC hangs up when network usage is done\n"
 "(only relevant for dialup-connection)"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:501
+#: DlgAdvPreferencesBase.cpp:492
 msgid "Network usage allowed"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:510
+#: DlgAdvPreferencesBase.cpp:500
 msgid "network usage start hour"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:518
+#: DlgAdvPreferencesBase.cpp:508
 msgid "network usage stop hour"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:610
-#: clientgui/DlgItemProperties.cpp:257
+#: DlgAdvPreferencesBase.cpp:598 DlgItemProperties.cpp:231
 msgid "Disk usage"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:622
+#: DlgAdvPreferencesBase.cpp:609
 msgid "the maximum disk space used by BOINC (in Gigabytes)"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:626
-msgid "Gigabytes disk space (0 means no restriction)"
+#: DlgAdvPreferencesBase.cpp:613
+msgid "Gigabytes disk space"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:629
+#: DlgAdvPreferencesBase.cpp:616
 msgid "Leave at least"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:633
+#: DlgAdvPreferencesBase.cpp:620
 msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:637
+#: DlgAdvPreferencesBase.cpp:624
 msgid "Gigabytes disk space free"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
+#: DlgAdvPreferencesBase.cpp:631
 msgid "BOINC uses at most this percentage of total disk space"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:649
+#: DlgAdvPreferencesBase.cpp:636
 #, no-c-format
 msgid "% of total disk space"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:652
+#: DlgAdvPreferencesBase.cpp:639
 msgid "Tasks checkpoint to disk at most every"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
+#: DlgAdvPreferencesBase.cpp:645
 msgid "seconds"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:668
+#: DlgAdvPreferencesBase.cpp:655
 #, no-c-format
 msgid "% of page file (swap space)"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:675
+#: DlgAdvPreferencesBase.cpp:662
 msgid "Memory usage"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
+#: DlgAdvPreferencesBase.cpp:676
 #, no-c-format
 msgid "% when computer is in use"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:701
+#: DlgAdvPreferencesBase.cpp:686
 #, no-c-format
 msgid "% when computer is idle"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:706
+#: DlgAdvPreferencesBase.cpp:691
 msgid "Leave applications in memory while suspended"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:708
+#: DlgAdvPreferencesBase.cpp:693
 msgid "if checked, suspended work units are left in memory"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:728
-msgid "Suspend processor and network usage when these applications are running:"
+#: DlgAdvPreferencesBase.cpp:713
+msgid ""
+"Suspend processor and network usage when these applications are running:"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:738
+#: DlgAdvPreferencesBase.cpp:722
 msgid "Add..."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:739
+#: DlgAdvPreferencesBase.cpp:723
 msgid "Add an application to this list"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:744
+#: DlgAdvPreferencesBase.cpp:728 ViewProjects.cpp:202
+#: sg_ProjectCommandPopup.cpp:85
 #, fuzzy
 msgid "Remove"
 msgstr "Nastavi"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:745
+#: DlgAdvPreferencesBase.cpp:729
 msgid "Remove an application from this list"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:754
+#: DlgAdvPreferencesBase.cpp:738
 msgid "For advanced options, refer to "
 msgstr ""
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:65
-#, c-format
-msgid "%s Diagnostic Log Flags"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:83
-msgid "These flags enable various types of diagnostic messages in the Event Log."
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:105
-msgid "Save all values and close the dialog"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:108
-msgid "Defaults"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:109
-msgid "Restore default settings"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:113
-msgid "Close the dialog without saving"
-msgstr ""
-
-#: clientgui/DlgEventLog.cpp:226
+#: DlgEventLog.cpp:219
 #, c-format
 msgid "%s - Event Log"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:236
+#: DlgEventLog.cpp:232 ViewMessages.cpp:117 ViewProjects.cpp:219
+#: ViewStatistics.cpp:435 ViewStatistics.cpp:2009 ViewTransfers.cpp:182
+#: ViewWork.cpp:232
 msgid "Project"
 msgstr "Projekt"
 
-#: clientgui/DlgEventLog.cpp:237
+#: DlgEventLog.cpp:233 ViewMessages.cpp:118
 msgid "Time"
 msgstr "Vrijeme"
 
-#: clientgui/DlgEventLog.cpp:238
+#: DlgEventLog.cpp:234 ViewMessages.cpp:119
 msgid "Message"
 msgstr "Poruka"
 
-#: clientgui/DlgEventLog.cpp:300
-#: clientgui/DlgEventLog.cpp:364
+#: DlgEventLog.cpp:290 DlgEventLog.cpp:354
 msgid "&Show only this project"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:304
+#: DlgEventLog.cpp:294
 msgid "Copy &All"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:306
-#: clientgui/DlgEventLog.cpp:310
+#: DlgEventLog.cpp:296 DlgEventLog.cpp:300 ViewMessages.cpp:89
 msgid "Copy all the messages to the clipboard."
 msgstr "Kopiraj sve poruke u memoriju"
 
-#: clientgui/DlgEventLog.cpp:315
+#: DlgEventLog.cpp:305
 msgid "Copy &Selected"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:318
-#: clientgui/DlgEventLog.cpp:326
+#: DlgEventLog.cpp:308 DlgEventLog.cpp:316 ViewMessages.cpp:97
 #, fuzzy
-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 "Kopiraj označene poruke u memoriju. Možete označiti više poruka držeći shift ili ctrl dok klikate na poruke."
+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 ""
+"Kopiraj označene poruke u memoriju. Možete označiti više poruka držeći shift "
+"ili ctrl dok klikate na poruke."
 
-#: clientgui/DlgEventLog.cpp:320
-#: clientgui/DlgEventLog.cpp:328
-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 "Kopiraj označene poruke u memoriju. Možete označiti više poruka držeći shift ili ctrl dok klikate na poruke."
+#: DlgEventLog.cpp:310 DlgEventLog.cpp:318 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 ""
+"Kopiraj označene poruke u memoriju. Možete označiti više poruka držeći shift "
+"ili ctrl dok klikate na poruke."
 
-#: clientgui/DlgEventLog.cpp:335
-#: clientgui/DlgItemProperties.cpp:67
+#: DlgEventLog.cpp:325 DlgItemProperties.cpp:67
 #, fuzzy
 msgid "&Close"
 msgstr "Zatvoriti"
 
-#: clientgui/DlgEventLog.cpp:344
+#: DlgEventLog.cpp:334 sg_BoincSimpleFrame.cpp:798 sg_DlgPreferences.cpp:442
 #, c-format
 msgid "Get help with %s"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:358
+#: DlgEventLog.cpp:348
 #, fuzzy
 msgid "Show all &messages"
 msgstr "Kopiraj sve poruke"
 
-#: clientgui/DlgEventLog.cpp:359
-#: clientgui/DlgEventLog.cpp:361
+#: DlgEventLog.cpp:349 DlgEventLog.cpp:351
 msgid "Show messages for all projects"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:365
-#: clientgui/DlgEventLog.cpp:367
+#: DlgEventLog.cpp:355 DlgEventLog.cpp:357
 #, fuzzy
 msgid "Show only the messages for the selected project"
 msgstr "Kopiraj sve poruke u memoriju"
 
-#: clientgui/DlgExitMessage.cpp:82
+#: DlgExitMessage.cpp:82
 #, c-format
 msgid "%s - Exit Confirmation"
 msgstr ""
 
-#: clientgui/DlgExitMessage.cpp:130
+#: DlgExitMessage.cpp:130
 #, c-format
 msgid ""
 "You have requested to exit the %s,\n"
@@ -1662,7 +1625,7 @@ msgid ""
 "choose from the following options:"
 msgstr ""
 
-#: clientgui/DlgExitMessage.cpp:135
+#: DlgExitMessage.cpp:135
 #, c-format
 msgid ""
 "This will shut down %s and its tasks until either the\n"
@@ -1673,857 +1636,833 @@ msgid ""
 "tasks at the times you selected in your preferences."
 msgstr ""
 
-#: clientgui/DlgExitMessage.cpp:153
+#: DlgExitMessage.cpp:153
 #, c-format
 msgid "Stop running tasks when exiting the %s"
 msgstr ""
 
-#: clientgui/DlgExitMessage.cpp:165
+#: DlgExitMessage.cpp:165
 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
+#: DlgExitMessage.cpp:178 DlgGenericMessage.cpp:125 DlgOptions.cpp:401
+#: DlgSelectComputer.cpp:168 wizardex.cpp:378
 msgid "&Cancel"
 msgstr "&Poništi"
 
-#: clientgui/DlgGenericMessage.cpp:112
+#: DlgGenericMessage.cpp:112
 msgid "Don't show this dialog again."
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:194
-#: clientgui/DlgItemProperties.cpp:197
-#: clientgui/DlgItemProperties.cpp:200
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:168 DlgItemProperties.cpp:171
+#: DlgItemProperties.cpp:174 DlgItemProperties.cpp:177
 #, fuzzy
 msgid "Don't fetch tasks for "
 msgstr "Neće dobiti novi posao"
 
-#: clientgui/DlgItemProperties.cpp:194
+#: DlgItemProperties.cpp:168
 msgid "Project preference"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:197
+#: DlgItemProperties.cpp:171
 #, fuzzy
 msgid "Account manager preference"
 msgstr "Adresa menadžera računa:"
 
-#: clientgui/DlgItemProperties.cpp:200
+#: DlgItemProperties.cpp:174
 msgid "Project has no apps for "
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:177
 msgid "Client configuration excludes "
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:207
+#: DlgItemProperties.cpp:181
 msgid " work fetch deferred for"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:208
+#: DlgItemProperties.cpp:182
 msgid " work fetch deferral interval"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:213
 msgid "Properties of project "
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:243
-#: clientgui/DlgOptions.cpp:221
+#: DlgItemProperties.cpp:217 DlgOptions.cpp:218
 msgid "General"
 msgstr "Općenito"
 
-#: clientgui/DlgItemProperties.cpp:244
+#: DlgItemProperties.cpp:218
 msgid "Master URL"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:245
+#: DlgItemProperties.cpp:219
 #, fuzzy
 msgid "User name"
 msgstr "Korisničko ime:"
 
-#: clientgui/DlgItemProperties.cpp:246
+#: DlgItemProperties.cpp:220
 msgid "Team name"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:247
+#: DlgItemProperties.cpp:221 ViewProjects.cpp:224
 msgid "Resource share"
 msgstr "Djeljenje resursa"
 
-#: clientgui/DlgItemProperties.cpp:249
+#: DlgItemProperties.cpp:223
 msgid "Scheduler RPC deferred for"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:252
+#: DlgItemProperties.cpp:226
 msgid "File downloads deferred for"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:255
+#: DlgItemProperties.cpp:229
 msgid "File uploads deferred for"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:258
+#: DlgItemProperties.cpp:232
 msgid "Computer ID"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:260
+#: DlgItemProperties.cpp:234
 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
+#: DlgItemProperties.cpp:234 DlgItemProperties.cpp:236
+#: DlgItemProperties.cpp:237 DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:242 DlgItemProperties.cpp:251
+#: DlgItemProperties.cpp:254 DlgItemProperties.cpp:257
 msgid "yes"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:262
+#: DlgItemProperties.cpp:236
 msgid "Suspended via GUI"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:262
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:236 DlgItemProperties.cpp:237
 msgid "no"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:237
 msgid "Don't request more work"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:265
+#: DlgItemProperties.cpp:239
 msgid "Scheduler call in progress"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:268
+#: DlgItemProperties.cpp:242
 msgid "Trickle-up pending"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:271
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:245 DlgItemProperties.cpp:247
 #, fuzzy
 msgid "Host location"
 msgstr "Ukupan kredit računala"
 
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:247
 #, fuzzy
 msgid "default"
 msgstr "&Postavi kao pretpostavljeno"
 
-#: clientgui/DlgItemProperties.cpp:277
+#: DlgItemProperties.cpp:251
 #, fuzzy
 msgid "Added via account manager"
 msgstr "Menadžer računa"
 
-#: clientgui/DlgItemProperties.cpp:280
+#: DlgItemProperties.cpp:254
 msgid "Remove when tasks done"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:283
+#: DlgItemProperties.cpp:257
 msgid "Ended"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:285
-msgid "Tasks completed"
-msgstr ""
-
-#: clientgui/DlgItemProperties.cpp:286
-msgid "Tasks failed"
-msgstr ""
-
-#: clientgui/DlgItemProperties.cpp:288
+#: DlgItemProperties.cpp:259
 msgid "Credit"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:289
+#: DlgItemProperties.cpp:260
 msgid "User"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:296
+#: DlgItemProperties.cpp:267
 msgid "Host"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:305
+#: DlgItemProperties.cpp:276
 msgid "Scheduling"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:306
+#: DlgItemProperties.cpp:277
 msgid "Scheduling priority"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:307
+#: DlgItemProperties.cpp:278
 msgid "CPU"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:331
+#: DlgItemProperties.cpp:302
 msgid "Duration correction factor"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:345
+#: DlgItemProperties.cpp:316
 msgid "Properties of task "
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:357
+#: DlgItemProperties.cpp:328 ViewWork.cpp:238
 msgid "Application"
 msgstr "Aplikacija"
 
-#: clientgui/DlgItemProperties.cpp:358
+#: DlgItemProperties.cpp:329 ViewWork.cpp:239
 msgid "Name"
 msgstr "Ime"
 
-#: clientgui/DlgItemProperties.cpp:359
+#: DlgItemProperties.cpp:330
 msgid "State"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:362
+#: DlgItemProperties.cpp:333
 msgid "Received"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:365
+#: DlgItemProperties.cpp:336
 msgid "Report deadline"
 msgstr "Rok prijave"
 
-#: clientgui/DlgItemProperties.cpp:367
+#: DlgItemProperties.cpp:338
 msgid "Resources"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:370
+#: DlgItemProperties.cpp:341
 msgid "Estimated computation size"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:373
+#: DlgItemProperties.cpp:344
 msgid "CPU time at last checkpoint"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:374
-#: clientgui/DlgItemProperties.cpp:389
+#: DlgItemProperties.cpp:345 DlgItemProperties.cpp:360
 msgid "CPU time"
 msgstr "Procesorsko vrijeme"
 
-#: clientgui/DlgItemProperties.cpp:376
-#: clientgui/DlgItemProperties.cpp:390
+#: DlgItemProperties.cpp:347 DlgItemProperties.cpp:361
 #, fuzzy
 msgid "Elapsed time"
 msgstr "Proteklo vrijeme"
 
-#: clientgui/DlgItemProperties.cpp:378
+#: DlgItemProperties.cpp:349
 msgid "Estimated time remaining"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:379
+#: DlgItemProperties.cpp:350
 msgid "Fraction done"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:380
+#: DlgItemProperties.cpp:351
 msgid "Virtual memory size"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:381
+#: DlgItemProperties.cpp:352
 msgid "Working set size"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:383
+#: DlgItemProperties.cpp:354
 msgid "Directory"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:386
+#: DlgItemProperties.cpp:357
 msgid "Process ID"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:456
+#: DlgItemProperties.cpp:427 ViewWork.cpp:1032 sg_TaskPanel.cpp:823
 msgid "Local: "
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: DlgOptions.cpp:129 DlgOptions.cpp:135
 msgid "Options"
 msgstr "Opcije"
 
-#: clientgui/DlgOptions.cpp:178
+#: DlgOptions.cpp:175
 msgid "Language:"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:185
+#: DlgOptions.cpp:182
 msgid "What language should BOINC use?"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:189
+#: DlgOptions.cpp:186
 msgid "Notice reminder interval:"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:196
+#: DlgOptions.cpp:193
 msgid "How often should BOINC remind you of new notices?"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:201
+#: DlgOptions.cpp:198
 msgid "Run Manager at login?"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:207
+#: DlgOptions.cpp:204
 msgid "Run the BOINC Manager when you log on."
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:212
+#: DlgOptions.cpp:209
 msgid "Enable Manager exit dialog?"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:218
+#: DlgOptions.cpp:215
 msgid "Display the exit dialog when shutting down the Manager."
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:229
+#: DlgOptions.cpp:226
 msgid "Dial-up and Virtual Private Network settings"
 msgstr "Modemske i VPN postavke"
 
-#: clientgui/DlgOptions.cpp:243
+#: DlgOptions.cpp:240
 msgid "&Set Default"
 msgstr "&Postavi kao pretpostavljeno"
 
-#: clientgui/DlgOptions.cpp:248
+#: DlgOptions.cpp:245
 msgid "&Clear Default"
 msgstr "O&briši pretpostavljeno"
 
-#: clientgui/DlgOptions.cpp:255
+#: DlgOptions.cpp:252
 msgid "Default Connection:"
 msgstr "Pretpostavljena veza:"
 
-#: clientgui/DlgOptions.cpp:262
+#: DlgOptions.cpp:259
 msgid "Connections"
 msgstr "Veze"
 
-#: clientgui/DlgOptions.cpp:271
+#: DlgOptions.cpp:268
 msgid "Connect via HTTP proxy server"
 msgstr "Spoji se preko HTTP proxy servera"
 
-#: clientgui/DlgOptions.cpp:275
+#: DlgOptions.cpp:272
 msgid "HTTP Proxy Server Configuration"
 msgstr "Konfiguracija HTTP proxy servera"
 
-#: clientgui/DlgOptions.cpp:283
-#: clientgui/DlgOptions.cpp:347
+#: DlgOptions.cpp:280 DlgOptions.cpp:344
 msgid "Address:"
 msgstr "Adresa:"
 
-#: clientgui/DlgOptions.cpp:291
-#: clientgui/DlgOptions.cpp:355
+#: DlgOptions.cpp:288 DlgOptions.cpp:352 ProxyPage.cpp:340 ProxyPage.cpp:360
 msgid "Port:"
 msgstr "Port:"
 
-#: clientgui/DlgOptions.cpp:299
-#: clientgui/DlgOptions.cpp:363
+#: DlgOptions.cpp:296 DlgOptions.cpp:360
 msgid "Don't use proxy for:"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:306
-#: clientgui/DlgOptions.cpp:370
+#: DlgOptions.cpp:303 DlgOptions.cpp:367
 msgid "Leave these blank if not needed"
 msgstr "Ne ispunjavajte ukoliko nije potrebno"
 
-#: clientgui/DlgOptions.cpp:312
-#: clientgui/DlgOptions.cpp:376
+#: DlgOptions.cpp:309 DlgOptions.cpp:373 ProxyPage.cpp:343 ProxyPage.cpp:363
 msgid "User Name:"
 msgstr "Korisničko ime:"
 
-#: clientgui/DlgOptions.cpp:320
-#: clientgui/DlgOptions.cpp:384
-#: clientgui/DlgSelectComputer.cpp:152
+#: DlgOptions.cpp:317 DlgOptions.cpp:381 DlgSelectComputer.cpp:152
+#: ProxyPage.cpp:346 ProxyPage.cpp:366
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: clientgui/DlgOptions.cpp:327
+#: DlgOptions.cpp:324
 msgid "HTTP Proxy"
 msgstr "HTTP Proxy"
 
-#: clientgui/DlgOptions.cpp:335
+#: DlgOptions.cpp:332
 msgid "Connect via SOCKS proxy server"
 msgstr "Spoji se preko SOCKS proxy servera"
 
-#: clientgui/DlgOptions.cpp:339
+#: DlgOptions.cpp:336
 msgid "SOCKS Proxy Server Configuration"
 msgstr "Konfiguracija SOCKS proxy servera"
 
-#: clientgui/DlgOptions.cpp:391
+#: DlgOptions.cpp:388
 msgid "SOCKS Proxy"
 msgstr "SOCKS Proxy"
 
-#: clientgui/DlgOptions.cpp:589
+#: DlgOptions.cpp:586
 #, fuzzy
 msgid "always"
 msgstr "&Uvijek radi"
 
-#: clientgui/DlgOptions.cpp:590
+#: DlgOptions.cpp:587
 msgid "1 hour"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:591
+#: DlgOptions.cpp:588
 msgid "6 hours"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:592
+#: DlgOptions.cpp:589
 msgid "1 day"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:593
+#: DlgOptions.cpp:590
 msgid "1 week"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:594
+#: DlgOptions.cpp:591
 msgid "never"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:691
+#: DlgOptions.cpp:688
 #, c-format
 msgid "%s - Language Selection"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:698
+#: DlgOptions.cpp:695
 #, c-format
-msgid "The %s's language has been changed.  In order for this change to take effect, you must restart the %s."
+#, fuzzy, c-format
+msgid ""
+"The %s's language has been changed.  In order for this change to take "
+"effect, you must restart the %s."
 msgstr ""
+"BOINC menadžerov pretpostavljeni jezik je promijenjen, da bi ta promjena "
+"stupila na snagu menadžer mora biti restartiran."
 
-#: clientgui/DlgSelectComputer.cpp:91
+#: DlgSelectComputer.cpp:91
 #, c-format
+#, fuzzy, c-format
 msgid "%s - Select Computer"
-msgstr ""
+msgstr "Odaberi računalo"
 
-#: clientgui/DlgSelectComputer.cpp:125
+#: DlgSelectComputer.cpp:125
 #, c-format
 msgid ""
 "Another instance of %s is already running \n"
 "on this computer.  Please select a client to monitor."
 msgstr ""
 
-#: clientgui/DlgSelectComputer.cpp:143
+#: DlgSelectComputer.cpp:143
 msgid "Host name:"
 msgstr "Naziv računala:"
 
-#: clientgui/Localization.cpp:31
-#: clientgui/Localization.cpp:69
+#: Localization.cpp:31 Localization.cpp:69
 msgid "Message boards"
 msgstr ""
 
-#: clientgui/Localization.cpp:33
+#: Localization.cpp:33
 msgid "Correspond with other users on the SETI at home message boards"
 msgstr ""
 
-#: clientgui/Localization.cpp:37
+#: Localization.cpp:37
 msgid "Ask questions and report problems"
 msgstr ""
 
-#: clientgui/Localization.cpp:39
-#: clientgui/Localization.cpp:81
-#: clientgui/Localization.cpp:111
-#: clientgui/Localization.cpp:129
+#: Localization.cpp:39 Localization.cpp:81 Localization.cpp:111
+#: Localization.cpp:129
 msgid "Your account"
 msgstr ""
 
-#: clientgui/Localization.cpp:41
-#: clientgui/Localization.cpp:87
-#: clientgui/Localization.cpp:113
+#: Localization.cpp:41 Localization.cpp:87 Localization.cpp:113
 msgid "View your account information and credit totals"
 msgstr ""
 
-#: clientgui/Localization.cpp:43
+#: Localization.cpp:43
 msgid "Your preferences"
 msgstr ""
 
-#: clientgui/Localization.cpp:45
+#: Localization.cpp:45
 msgid "View and modify your SETI at home account profile and preferences"
 msgstr ""
 
-#: clientgui/Localization.cpp:47
-#: clientgui/Localization.cpp:89
+#: Localization.cpp:47 Localization.cpp:89
 msgid "Your results"
 msgstr ""
 
-#: clientgui/Localization.cpp:49
-#: clientgui/Localization.cpp:91
+#: Localization.cpp:49 Localization.cpp:91
 msgid "View your last week (or more) of computational results and work"
 msgstr ""
 
-#: clientgui/Localization.cpp:51
-#: clientgui/Localization.cpp:93
+#: Localization.cpp:51 Localization.cpp:93
 msgid "Your computers"
 msgstr ""
 
-#: clientgui/Localization.cpp:53
+#: Localization.cpp:53
 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
+#: Localization.cpp:55 Localization.cpp:97
 msgid "Your team"
 msgstr ""
 
-#: clientgui/Localization.cpp:57
-#: clientgui/Localization.cpp:99
+#: Localization.cpp:57 Localization.cpp:99
 msgid "View information about your team"
 msgstr ""
 
-#: clientgui/Localization.cpp:61
+#: Localization.cpp:61
 msgid "Common questions"
 msgstr ""
 
-#: clientgui/Localization.cpp:63
+#: Localization.cpp:63
 msgid "Read the Einstein at Home Frequently Asked Question list"
 msgstr ""
 
-#: clientgui/Localization.cpp:65
+#: Localization.cpp:65
 msgid "Screensaver info"
 msgstr ""
 
-#: clientgui/Localization.cpp:67
+#: Localization.cpp:67
 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"
+#: Localization.cpp:71
+msgid ""
+"Correspond with admins and other users on the Einstein at Home message boards"
 msgstr ""
 
-#: clientgui/Localization.cpp:73
+#: Localization.cpp:73
 msgid "Einstein status"
 msgstr ""
 
-#: clientgui/Localization.cpp:75
+#: Localization.cpp:75
 msgid "Current status of the Einstein at Home server"
 msgstr ""
 
-#: clientgui/Localization.cpp:77
+#: Localization.cpp:77
 msgid "Report problems"
 msgstr ""
 
-#: clientgui/Localization.cpp:79
+#: Localization.cpp:79
 msgid "A link to the Einstein at Home problems and bug reports message board"
 msgstr ""
 
-#: clientgui/Localization.cpp:83
+#: Localization.cpp:83
 msgid "View and modify your Einstein at Home account profile and preferences"
 msgstr ""
 
-#: clientgui/Localization.cpp:85
+#: Localization.cpp:85
 msgid "Account summary"
 msgstr ""
 
-#: clientgui/Localization.cpp:95
-msgid "View a listing of all the computers on which you are running Einstein at Home"
+#: Localization.cpp:95
+msgid ""
+"View a listing of all the computers on which you are running Einstein at Home"
 msgstr ""
 
-#: clientgui/Localization.cpp:101
+#: Localization.cpp:101
 msgid "LIGO project"
 msgstr ""
 
-#: clientgui/Localization.cpp:103
-msgid "The home page of the Laser Interferometer Gravitational-wave Observatory (LIGO) project"
+#: Localization.cpp:103
+msgid ""
+"The home page of the Laser Interferometer Gravitational-wave Observatory "
+"(LIGO) project"
 msgstr ""
 
-#: clientgui/Localization.cpp:105
+#: Localization.cpp:105
 msgid "GEO-600 project"
 msgstr ""
 
-#: clientgui/Localization.cpp:107
+#: Localization.cpp:107
 msgid "The home page of the GEO-600 project"
 msgstr ""
 
-#: clientgui/Localization.cpp:115
-#: clientgui/Localization.cpp:133
+#: Localization.cpp:115 Localization.cpp:133 ViewProjects.cpp:221
+#: ViewStatistics.cpp:465
 msgid "Team"
 msgstr "Tim"
 
-#: clientgui/Localization.cpp:117
+#: Localization.cpp:117
 msgid "Info about your Team"
 msgstr ""
 
-#: clientgui/Localization.cpp:123
+#: Localization.cpp:123
 msgid "Get help for climateprediction.net"
 msgstr ""
 
-#: clientgui/Localization.cpp:125
+#: Localization.cpp:125
 #, fuzzy
 msgid "News"
 msgstr "Novo"
 
-#: clientgui/Localization.cpp:127
+#: Localization.cpp:127
 msgid "climateprediction.net News"
 msgstr ""
 
-#: clientgui/Localization.cpp:131
+#: Localization.cpp:131
 msgid "View your account information, credits, and trickles"
 msgstr ""
 
-#: clientgui/Localization.cpp:135
+#: Localization.cpp:135
 msgid "Info about your team"
 msgstr ""
 
-#: clientgui/Localization.cpp:141
+#: Localization.cpp:141
 msgid "Search for help in our help system"
 msgstr ""
 
-#: clientgui/Localization.cpp:143
+#: Localization.cpp:143
 msgid "Global Statistics"
 msgstr ""
 
-#: clientgui/Localization.cpp:145
+#: Localization.cpp:145
 msgid "Summary statistics for World Community Grid"
 msgstr ""
 
-#: clientgui/Localization.cpp:147
+#: Localization.cpp:147
 msgid "My Grid"
 msgstr ""
 
-#: clientgui/Localization.cpp:149
+#: Localization.cpp:149
 msgid "Your statistics and settings"
 msgstr ""
 
-#: clientgui/Localization.cpp:151
+#: Localization.cpp:151
 msgid "Device Profiles"
 msgstr ""
 
-#: clientgui/Localization.cpp:153
+#: Localization.cpp:153
 msgid "Update your device settings"
 msgstr ""
 
-#: clientgui/Localization.cpp:155
+#: Localization.cpp:155
 msgid "Research"
 msgstr ""
 
-#: clientgui/Localization.cpp:157
+#: Localization.cpp:157
 msgid "Learn about the projects hosted at World Community Grid"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:583
+#: MainDocument.cpp:583
 msgid "Starting client"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:591
+#: MainDocument.cpp:591
 msgid "Connecting to client"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:1205
+#: MainDocument.cpp:1195
 msgid "Retrieving system state; please wait..."
 msgstr "Provjeravam stanje sistema; molimo pričekajte..."
 
-#: clientgui/MainDocument.cpp:1826
+#: MainDocument.cpp:1816
 #, fuzzy
 msgid "Missing application"
 msgstr "Aplikacija"
 
-#: clientgui/MainDocument.cpp:1827
-msgid "Please download and install the CoRD application from http://cord.sourceforge.net"
+#: MainDocument.cpp:1817
+msgid ""
+"Please download and install the CoRD application from http://cord."
+"sourceforge.net"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2442
+#: MainDocument.cpp:2432
 msgid "on batteries"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2443
+#: MainDocument.cpp:2433
 msgid "computer is in use"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2444
+#: MainDocument.cpp:2434
 msgid "user request"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2445
+#: MainDocument.cpp:2435
 msgid "time of day"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2446
+#: MainDocument.cpp:2436
 msgid "CPU benchmarks in progress"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2447
+#: MainDocument.cpp:2437
 msgid "need disk space - check preferences"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2448
+#: MainDocument.cpp:2438
 msgid "computer is not in use"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2449
+#: MainDocument.cpp:2439
 msgid "starting up"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2450
+#: MainDocument.cpp:2440
 msgid "an exclusive app is running"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2451
+#: MainDocument.cpp:2441
 msgid "CPU is busy"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2452
+#: MainDocument.cpp:2442
 msgid "network bandwidth limit exceeded"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2453
+#: MainDocument.cpp:2443
 msgid "requested by operating system"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2455
+#: MainDocument.cpp:2445
 #, fuzzy
 msgid "unknown reason"
 msgstr "(Nepoznato)"
 
-#: clientgui/MainDocument.cpp:2477
+#: MainDocument.cpp:2467
 msgid "GPU missing, "
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2484
+#: MainDocument.cpp:2474
 msgid "New"
 msgstr "Novo"
 
-#: clientgui/MainDocument.cpp:2488
+#: MainDocument.cpp:2478
 msgid "Download failed"
 msgstr "Skidanje neuspjelo"
 
-#: clientgui/MainDocument.cpp:2490
+#: MainDocument.cpp:2480
 msgid "Downloading"
 msgstr "Skidanje"
 
-#: clientgui/MainDocument.cpp:2492
-#: clientgui/MainDocument.cpp:2557
+#: MainDocument.cpp:2482 MainDocument.cpp:2552
 #, fuzzy
 msgid " (suspended - "
 msgstr "Zaustavljeno"
 
-#: clientgui/MainDocument.cpp:2500
+#: MainDocument.cpp:2490
 msgid "Project suspended by user"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2502
+#: MainDocument.cpp:2492
 msgid "Task suspended by user"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2504
+#: MainDocument.cpp:2494
 #, fuzzy
 msgid "Suspended - "
 msgstr "Zaustavljeno"
 
 # 75%
-#: clientgui/MainDocument.cpp:2510
+#: MainDocument.cpp:2500
 #, fuzzy
 msgid "GPU suspended - "
 msgstr "Zaustavljeno"
 
-#: clientgui/MainDocument.cpp:2517
+#: MainDocument.cpp:2507
 msgid "Waiting for memory"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2519
+#: MainDocument.cpp:2509
 msgid "Waiting for shared memory"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2521
+#: MainDocument.cpp:2512
+msgid "Running, high priority"
+msgstr ""
+
+#: MainDocument.cpp:2514
 msgid "Running"
 msgstr "Radi"
 
-#: clientgui/MainDocument.cpp:2523
+#: MainDocument.cpp:2517
 msgid " (non-CPU-intensive)"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2526
+#: MainDocument.cpp:2520
 msgid "Waiting to run"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2528
-#: clientgui/MainDocument.cpp:2534
+#: MainDocument.cpp:2522 MainDocument.cpp:2528
 msgid "Ready to start"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2538
-msgid "Postponed: "
+#: MainDocument.cpp:2532
+msgid " (Scheduler wait: "
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2541
-msgid "Postponed"
+#: MainDocument.cpp:2536
+msgid " (Scheduler wait)"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2545
-msgid "Waiting for network access"
+#: MainDocument.cpp:2540
+msgid " (Waiting for network access)"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2549
+#: MainDocument.cpp:2544
 msgid "Computation error"
 msgstr "Greška pri obradi"
 
-#: clientgui/MainDocument.cpp:2553
+#: MainDocument.cpp:2548
 msgid "Upload failed"
 msgstr "Dizanje neuspjelo"
 
-#: clientgui/MainDocument.cpp:2555
+#: MainDocument.cpp:2550
 msgid "Uploading"
 msgstr "Dizanje"
 
-#: clientgui/MainDocument.cpp:2566
+#: MainDocument.cpp:2561
 msgid "Aborted by user"
 msgstr "Obrisan od korisnika"
 
-#: clientgui/MainDocument.cpp:2569
+#: MainDocument.cpp:2564
 msgid "Aborted by project"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2572
+#: MainDocument.cpp:2567
 msgid "Aborted: not started by deadline"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2575
+#: MainDocument.cpp:2570
 msgid "Aborted: disk limit exceeded"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2578
+#: MainDocument.cpp:2573
 msgid "Aborted: run time limit exceeded"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2581
+#: MainDocument.cpp:2576
 msgid "Aborted: memory limit exceeded"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2584
+#: MainDocument.cpp:2579
 msgid "Aborted"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2589
+#: MainDocument.cpp:2584
 msgid "Acknowledged"
 msgstr "Potvrđeno"
 
-#: clientgui/MainDocument.cpp:2591
+#: MainDocument.cpp:2586
 msgid "Ready to report"
 msgstr "Spreman za prijavu"
 
-#: clientgui/MainDocument.cpp:2593
+#: MainDocument.cpp:2588
 #, c-format
 msgid "Error: invalid state '%d'"
 msgstr "Greška: nedopušteno stanje '%d'"
 
-#: clientgui/NoInternetConnectionPage.cpp:179
+#: NoInternetConnectionPage.cpp:179
 msgid "No Internet connection"
 msgstr ""
 
-#: clientgui/NoInternetConnectionPage.cpp:182
+#: NoInternetConnectionPage.cpp:182
 msgid "Please connect to the Internet and try again."
 msgstr ""
 
-#: clientgui/NotDetectedPage.cpp:181
+#: NotDetectedPage.cpp:181
 msgid "Project not found"
 msgstr ""
 
-#: clientgui/NotDetectedPage.cpp:184
+#: 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 ""
 
-#: clientgui/NotDetectedPage.cpp:188
+#: NotDetectedPage.cpp:188
 msgid "Account manager not found"
 msgstr ""
 
-#: clientgui/NotDetectedPage.cpp:191
+#: NotDetectedPage.cpp:191
 msgid ""
 "The URL you supplied is not that of a BOINC-based account\n"
 "manager.\n"
@@ -2531,139 +2470,101 @@ msgid ""
 "Please check the URL and try again."
 msgstr ""
 
-#: clientgui/NotFoundPage.cpp:181
+#: NotFoundPage.cpp:181
 msgid "Login Failed."
 msgstr ""
 
-#: clientgui/NotFoundPage.cpp:185
+#: NotFoundPage.cpp:185
 msgid "Check the username and password, and try again."
 msgstr ""
 
-#: clientgui/NotFoundPage.cpp:189
+#: NotFoundPage.cpp:189
 msgid "Check the email address and password, and try again."
 msgstr ""
 
-#: clientgui/NoticeListCtrl.cpp:229
+#: NoticeListCtrl.cpp:222
 msgid "more..."
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:221
+#: ProjectInfoPage.cpp:477 ProjectInfoPage.cpp:778 ProjectInfoPage.cpp:782
+msgid "All"
+msgstr ""
+
+#: ProjectInfoPage.cpp:615
 msgid "Choose a project"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:228
+#: ProjectInfoPage.cpp:619
 msgid "To choose a project, click its name or type its URL below."
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:246
+#: ProjectInfoPage.cpp:623
 msgid "Categories:"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:267
+#: ProjectInfoPage.cpp:627 sg_ProjectPanel.cpp:89
 #, fuzzy
 msgid "Projects:"
 msgstr "Projekti"
 
-#: clientgui/ProjectInfoPage.cpp:279
+#: ProjectInfoPage.cpp:631
 msgid "Project details"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:291
+#: ProjectInfoPage.cpp:635
 msgid "Research area:"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:302
+#: ProjectInfoPage.cpp:639
 msgid "Organization:"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:313
+#: ProjectInfoPage.cpp:643
 #, fuzzy
 msgid "Web site:"
 msgstr "Web stranice"
 
-#: clientgui/ProjectInfoPage.cpp:325
+#: ProjectInfoPage.cpp:647
 msgid "Supported systems:"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:363
+#: ProjectInfoPage.cpp:651
 msgid "Project URL:"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:499
-#: clientgui/ProjectInfoPage.cpp:754
-#: clientgui/ProjectInfoPage.cpp:758
-msgid "All"
-msgstr ""
-
-#: clientgui/ProjectInfoPage.cpp:802
-msgid "This project may not have work for your type of computer.  Do you want to add it anyway?"
+#: ProjectInfoPage.cpp:826
+msgid ""
+"This project may not have work for your type of computer.  Do you want to "
+"add it anyway?"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:826
+#: ProjectInfoPage.cpp:850
 msgid "You already added this project. Please choose a different project."
 msgstr ""
 
-#: clientgui/ProjectProcessingPage.cpp:321
+#: ProjectProcessingPage.cpp:321
 msgid "Communicating with project."
 msgstr ""
 
-#: clientgui/ProjectProcessingPage.cpp:510
+#: ProjectProcessingPage.cpp:509
 msgid "Required files not found on the server."
 msgstr ""
 
-#: clientgui/ProjectProcessingPage.cpp:513
-#: clientgui/ProjectProcessingPage.cpp:586
+#: ProjectProcessingPage.cpp:512 ProjectProcessingPage.cpp:574
 msgid "An internal server error has occurred."
 msgstr ""
 
-#: clientgui/ProjectPropertiesPage.cpp:334
+#: ProjectPropertiesPage.cpp:334
 msgid ""
 "Communicating with project\n"
 "Please wait..."
 msgstr ""
 
-#: clientgui/ProjectWelcomePage.cpp:251
-#, c-format
-msgid "Welcome to %s."
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:254
-msgid "You have volunteered to compute for this project:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:255
-msgid "Name:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:258
-msgid "Home:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:262
-msgid "Description:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:265
-msgid "URL:"
-msgstr "Adresa:"
-
-#: clientgui/ProjectWelcomePage.cpp:268
-msgid "User:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:273
-msgid "WARNING: This project is not registered with BOINC.  Make sure you trust it before continuing."
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:277
-msgid "To continue, click Next."
-msgstr ""
-
-#: clientgui/ProxyInfoPage.cpp:195
+#: ProxyInfoPage.cpp:195
 msgid "Network communication failure"
 msgstr ""
 
-#: clientgui/ProxyInfoPage.cpp:199
+#: ProxyInfoPage.cpp:199
 msgid ""
 "The World Community Grid - BOINC software failed to communicate\n"
 "over the Internet. The most likely reasons are:\n"
@@ -2680,7 +2581,7 @@ msgid ""
 "Click Next to configure BOINC's proxy settings."
 msgstr ""
 
-#: clientgui/ProxyInfoPage.cpp:203
+#: ProxyInfoPage.cpp:203
 msgid ""
 "BOINC failed to communicate on the Internet.\n"
 "The most likely reasons are:\n"
@@ -2697,1306 +2598,1263 @@ msgid ""
 "Click Next to configure BOINC's proxy settings."
 msgstr ""
 
-#: clientgui/ProxyPage.cpp:331
+#: ProxyPage.cpp:331
 msgid "Proxy configuration"
 msgstr ""
 
-#: clientgui/ProxyPage.cpp:334
+#: ProxyPage.cpp:334
 #, fuzzy
 msgid "HTTP proxy"
 msgstr "HTTP Proxy"
 
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
+#: ProxyPage.cpp:337 ProxyPage.cpp:357
 msgid "Server:"
 msgstr ""
 
-#: clientgui/ProxyPage.cpp:350
+#: ProxyPage.cpp:350
 msgid "Autodetect"
 msgstr ""
 
-#: clientgui/ProxyPage.cpp:354
+#: ProxyPage.cpp:354
 #, fuzzy
 msgid "SOCKS proxy"
 msgstr "SOCKS Proxy"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:167
-msgid "Advanced View...\tCtrl+Shift+A"
-msgstr ""
-
-#: clientgui/sg_BoincSimpleFrame.cpp:168
-msgid "Display the advanced graphical interface."
+#: TermsOfUsePage.cpp:218
+msgid "Terms of Use"
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:175
-msgid "Skin"
+#: TermsOfUsePage.cpp:222
+msgid "Please read the following terms of use:"
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:177
-msgid "Select the appearance of the user interface."
+#: TermsOfUsePage.cpp:231
+msgid "I agree to the terms of use."
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:224
-#, c-format
-msgid "&%s"
+#: TermsOfUsePage.cpp:237
+msgid "I do not agree to the terms of use."
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:405
-#, fuzzy
-msgid "Default"
-msgstr "&Postavi kao pretpostavljeno"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:848
-msgid "Suspend"
-msgstr "Zaustavi"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:850
-msgid "Suspend Computing"
+#: UnavailablePage.cpp:183
+msgid "Project temporarily unavailable"
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:851
-msgid "Resume Computing"
+#: UnavailablePage.cpp:186
+msgid ""
+"The project is temporarily unavailable.\n"
+"\n"
+"Please try again later."
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:867
-msgid "Notices"
+#: UnavailablePage.cpp:190
+msgid "Account manager temporarily unavailable"
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:868
-msgid "Open a window to view notices from projects or BOINC"
+#: UnavailablePage.cpp:193
+msgid ""
+"The account manager is temporarily unavailable.\n"
+"\n"
+"Please try again later."
 msgstr ""
 
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
+#: ValidateAccountKey.cpp:68
+msgid "Please specify an account key to continue."
 msgstr ""
 
-#: clientgui/sg_DlgMessages.cpp:132
-msgid "There are no notices at this time."
+#: ValidateAccountKey.cpp:71
+msgid "Invalid Account Key; please enter a valid Account Key"
 msgstr ""
+"Neispravan identifikator računa; molimo unesite valjani identifikator "
+"računa."
 
-#: clientgui/sg_DlgMessages.cpp:146
-#, fuzzy
-msgid "Close"
-msgstr "Zatvoriti"
+#: ValidateAccountKey.cpp:82 ValidateEmailAddress.cpp:86
+msgid "Validation conflict"
+msgstr "Konflikt pri validaciji."
 
-#: clientgui/sg_DlgMessages.cpp:394
-#, c-format
-msgid "%s - Notices"
+#: ValidateEmailAddress.cpp:72
+msgid "Please specify an email address"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:270
-msgid "This dialog controls preferences for this computer only."
+#: ValidateEmailAddress.cpp:75
+msgid "Invalid email address; please enter a valid email address"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:275
-msgid "Click OK to set preferences."
+#: ValidateURL.cpp:69
+msgid "Missing URL"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:280
-msgid "Click Clear to restore web-based settings for all preferences listed below."
+#: ValidateURL.cpp:70
+msgid ""
+"Please specify a URL.\n"
+"For example:\n"
+"http://www.example.com/"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:287
-msgid "For additional settings, select Computing Preferences in the Advanced View."
+#: ValidateURL.cpp:83 ValidateURL.cpp:87 ValidateURL.cpp:91
+#: ValidateURL.cpp:103 ValidateURL.cpp:107 ValidateURL.cpp:110
+msgid "Invalid URL"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:315
-msgid "Do work only between:"
+#: ValidateURL.cpp:84 ValidateURL.cpp:88 ValidateURL.cpp:92
+msgid ""
+"Please specify a valid URL.\n"
+"For example:\n"
+"http://boincproject.example.com"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:337
-msgid "Connect to internet only between:"
-msgstr ""
+#: ValidateURL.cpp:104 ValidateURL.cpp:108
+#, c-format
+msgid "'%s' does not contain a valid host name."
+msgstr "'%s' ne sadrži valjano ime računala"
 
-#: clientgui/sg_DlgPreferences.cpp:359
-#: clientgui/sg_DlgPreferences.cpp:376
-msgid "Use no more than:"
-msgstr ""
+#: ValidateURL.cpp:111
+#, c-format
+msgid "'%s' does not contain a valid path."
+msgstr "'%s' ne sadrži valjan put."
 
-#: clientgui/sg_DlgPreferences.cpp:372
-msgid "of disk space"
+#: ViewMessages.cpp:84 ViewProjects.cpp:170 ViewStatistics.cpp:1978
+#: ViewTransfers.cpp:160 ViewWork.cpp:183
+msgid "Commands"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:389
-msgid "of the processor"
-msgstr ""
+#: ViewMessages.cpp:88
+msgid "Copy all messages"
+msgstr "Kopiraj sve poruke"
 
-#: clientgui/sg_DlgPreferences.cpp:393
-msgid "Do work while on battery?"
-msgstr ""
+#: ViewMessages.cpp:95
+msgid "Copy selected messages"
+msgstr "Kopiraj oznčene poruke"
 
-#: clientgui/sg_DlgPreferences.cpp:406
-msgid "Do work after idle for:"
+#: ViewMessages.cpp:106 ViewMessages.cpp:502
+msgid "Show only this project"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:431
-msgid "Clear all local preferences listed above and close the dialog"
-msgstr ""
+#: ViewMessages.cpp:107 ViewMessages.cpp:503
+#, fuzzy
+msgid "Show only the messages for the selected project."
+msgstr "Kopiraj sve poruke u memoriju"
 
-#: clientgui/sg_DlgPreferences.cpp:609
-#: clientgui/sg_DlgPreferences.cpp:612
-#: clientgui/sg_DlgPreferences.cpp:688
-#: clientgui/sg_DlgPreferences.cpp:692
-#: clientgui/sg_DlgPreferences.cpp:704
-#: clientgui/sg_DlgPreferences.cpp:708
-#: clientgui/sg_DlgPreferences.cpp:851
-#: clientgui/sg_DlgPreferences.cpp:862
-msgid "Anytime"
-msgstr ""
+#: ViewMessages.cpp:164
+msgid "Messages"
+msgstr "Poruke"
 
-#: clientgui/sg_DlgPreferences.cpp:645
-msgid "100 MB"
-msgstr ""
+#: ViewMessages.cpp:187
+msgid "Copying all messages to the clipboard..."
+msgstr "Kopiranje svih poruka u memoriju..."
 
-#: clientgui/sg_DlgPreferences.cpp:646
-msgid "200 MB"
-msgstr ""
+#: ViewMessages.cpp:223
+#, fuzzy
+msgid "Copying selected messages to the clipboard..."
+msgstr "Kopiranje svih poruka u memoriju..."
 
-#: clientgui/sg_DlgPreferences.cpp:647
-msgid "500 MB"
+#: ViewMessages.cpp:286
+msgid "Filtering messages..."
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:648
-msgid "1 GB"
-msgstr ""
+#: ViewMessages.cpp:494
+#, fuzzy
+msgid "Show all messages"
+msgstr "Kopiraj sve poruke"
 
-#: clientgui/sg_DlgPreferences.cpp:649
-msgid "2 GB"
+#: ViewMessages.cpp:495
+msgid "Show messages for all projects."
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:650
-msgid "5 GB"
+#: ViewNotices.cpp:58 sg_DlgMessages.cpp:124
+msgid "Fetching notices; please wait..."
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:651
-msgid "10 GB"
+#: ViewNotices.cpp:65 sg_DlgMessages.cpp:132
+msgid "There are no notices at this time."
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:652
-msgid "20 GB"
+#: ViewNotices.cpp:99 sg_BoincSimpleFrame.cpp:776
+msgid "Notices"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:653
-msgid "50 GB"
+#: ViewProjects.cpp:174 sg_ProjectCommandPopup.cpp:61
+msgid "Update"
+msgstr "Ažuriraj"
+
+#: ViewProjects.cpp:175 sg_ProjectCommandPopup.cpp:62
+#, fuzzy
+msgid ""
+"Report all completed tasks, get latest credit, get latest preferences, and "
+"possibly get more tasks."
 msgstr ""
+"Prijavi sav završen posao, prihvati najnoviji kredit, prihvati najnovije "
+"poruke, i možda dobij još posla."
 
-#: clientgui/sg_DlgPreferences.cpp:654
-msgid "100 GB"
+#: 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
+msgid "Suspend"
+msgstr "Zaustavi"
+
+#: ViewProjects.cpp:182 ViewProjects.cpp:722 sg_ProjectCommandPopup.cpp:68
+#: sg_ProjectCommandPopup.cpp:114
+#, fuzzy
+msgid "Suspend tasks for this project."
+msgstr "Zaustavi posao za ovaj projekt"
+
+#: ViewProjects.cpp:188 ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:73
+#: sg_ProjectCommandPopup.cpp:121
+msgid "No new tasks"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:724
-#, c-format
-msgid "%d MB"
+#: ViewProjects.cpp:189 sg_ProjectCommandPopup.cpp:74
+#, fuzzy
+msgid "Don't get new tasks for this project."
+msgstr "Ne skida posao za ovaj projekt"
+
+#: ViewProjects.cpp:195 sg_ProjectCommandPopup.cpp:79
+msgid "Reset project"
+msgstr "Resetiraj projekt"
+
+#: ViewProjects.cpp:196 sg_ProjectCommandPopup.cpp:80
+#, fuzzy
+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 ""
+"Briše sve datoteke i posao vezan uz projekt, i skida novi posao. Možete prvo "
+"ažurirati projekt kako bi prijavili mogući završeni posao."
 
-#: clientgui/sg_DlgPreferences.cpp:726
-#, c-format
-msgid "%4.2f GB"
+#: ViewProjects.cpp:203 sg_ProjectCommandPopup.cpp:86
+#, fuzzy
+msgid ""
+"Remove this project.  Tasks in progress will be lost (use 'Update' first to "
+"report any completed tasks)."
 msgstr ""
+"Isključuje ovo računalo iz označenog projekta. Posao u tijeku bit će "
+"izgubljen. Možete prvo ažurirati projekt kako bi prijavili mogući završeni "
+"posao."
 
-#: clientgui/sg_DlgPreferences.cpp:767
-#, c-format
-msgid "%d%%"
+#: ViewProjects.cpp:209 ViewWork.cpp:222 sg_ProjectCommandPopup.cpp:91
+#: sg_TaskCommandPopup.cpp:78
+msgid "Properties"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:803
-msgid "0 (Run Always)"
+#: ViewProjects.cpp:210 sg_ProjectCommandPopup.cpp:92
+msgid "Show project details."
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:806
-#, c-format
-msgid "%d"
-msgstr ""
+#: ViewProjects.cpp:220 ViewStatistics.cpp:450
+msgid "Account"
+msgstr "Račun"
 
-#: clientgui/sg_DlgPreferences.cpp:953
-#, c-format
-msgid "%s - Computing Preferences"
+#: ViewProjects.cpp:222
+msgid "Work done"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:1033
-msgid "Do you really want to clear all local preferences?\n"
+#: ViewProjects.cpp:223
+msgid "Avg. work done"
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:66
-#: clientgui/ViewProjects.cpp:179
-msgid "Update"
-msgstr "Ažuriraj"
+#: ViewProjects.cpp:225 ViewTransfers.cpp:188 ViewWork.cpp:234
+msgid "Status"
+msgstr "Stanje"
+
+#: ViewProjects.cpp:250
+msgid "Projects"
+msgstr "Projekti"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:67
-#: clientgui/ViewProjects.cpp:180
+#: ViewProjects.cpp:302
+msgid "Updating project..."
+msgstr "Ažuriram projekt..."
+
+#: ViewProjects.cpp:344
+msgid "Resuming project..."
+msgstr "Nastavljam projekt"
+
+#: ViewProjects.cpp:348
+msgid "Suspending project..."
+msgstr "Zaustavljam projekt"
+
+#: ViewProjects.cpp:385
 #, fuzzy
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
-msgstr "Prijavi sav završen posao, prihvati najnoviji kredit, prihvati najnovije poruke, i možda dobij još posla."
+msgid "Telling project to allow additional task downloads..."
+msgstr "Govorim projektu da dopusti skidanje novog posla..."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:73
-#: clientgui/sg_ProjectCommandPopup.cpp:129
-#: clientgui/ViewProjects.cpp:187
-#: clientgui/ViewProjects.cpp:727
+#: ViewProjects.cpp:389
 #, fuzzy
-msgid "Suspend tasks for this project."
-msgstr "Zaustavi posao za ovaj projekt"
+msgid "Telling project to not fetch any additional tasks..."
+msgstr "Govorim projektu da ne skida novi posao..."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:78
-#: clientgui/sg_ProjectCommandPopup.cpp:136
-#: clientgui/ViewProjects.cpp:193
-#: clientgui/ViewProjects.cpp:746
-msgid "No new tasks"
-msgstr ""
+#: ViewProjects.cpp:425
+msgid "Resetting project..."
+msgstr "Resetiram projekt"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:79
-#: clientgui/ViewProjects.cpp:194
-#, fuzzy
-msgid "Don't get new tasks for this project."
-msgstr "Ne skida posao za ovaj projekt"
+#: ViewProjects.cpp:438 sg_ProjectCommandPopup.cpp:214
+#, c-format
+msgid "Are you sure you want to reset project '%s'?"
+msgstr "Jeste li sigurni da želite resetirati projekt '%s'?"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:200
-msgid "Reset project"
+#: ViewProjects.cpp:444 sg_ProjectCommandPopup.cpp:220
+msgid "Reset Project"
 msgstr "Resetiraj projekt"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:85
-#: clientgui/ViewProjects.cpp:201
+#: ViewProjects.cpp:483
 #, fuzzy
-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 "Briše sve datoteke i posao vezan uz projekt, i skida novi posao. Možete prvo ažurirati projekt kako bi prijavili mogući završeni posao."
+msgid "Removing project..."
+msgstr "Nastavljam projekt"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:91
-#: clientgui/ViewProjects.cpp:208
-#, fuzzy
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
-msgstr "Isključuje ovo računalo iz označenog projekta. Posao u tijeku bit će izgubljen. Možete prvo ažurirati projekt kako bi prijavili mogući završeni posao."
+#: ViewProjects.cpp:496 sg_ProjectCommandPopup.cpp:251
+#, c-format
+#, fuzzy, c-format
+msgid "Are you sure you want to remove project '%s'?"
+msgstr "Jeste li sigurni da želite resetirati projekt '%s'?"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:96
-#: clientgui/sg_TaskCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:214
-msgid "Properties"
+#: ViewProjects.cpp:502 sg_ProjectCommandPopup.cpp:257
+msgid "Remove Project"
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:97
-#: clientgui/ViewProjects.cpp:215
-msgid "Show project details."
-msgstr ""
+#: ViewProjects.cpp:543 ViewWork.cpp:599
+msgid "Launching browser..."
+msgstr "Otvaram pretraživač..."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:126
-#: clientgui/ViewProjects.cpp:723
+#: ViewProjects.cpp:718 sg_ProjectCommandPopup.cpp:111
 #, fuzzy
 msgid "Resume tasks for this project."
 msgstr "Nastavi posao za ovaj projekt."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:133
-#: clientgui/ViewProjects.cpp:742
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:118
 msgid "Allow new tasks"
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:134
-#: clientgui/ViewProjects.cpp:742
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:119
 #, fuzzy
 msgid "Allow fetching new tasks for this project."
 msgstr "Dopušta skidanje novog posla za ovaj projekt."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:137
-#: clientgui/ViewProjects.cpp:746
+#: ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:122
 #, fuzzy
 msgid "Don't fetch new tasks for this project."
 msgstr "Ne skida posao za ovaj projekt"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:229
-#: clientgui/ViewProjects.cpp:443
-#, c-format
-msgid "Are you sure you want to reset project '%s'?"
-msgstr "Jeste li sigurni da želite resetirati projekt '%s'?"
+#: ViewProjects.cpp:1058
+#, fuzzy
+msgid "Requested by user"
+msgstr "Zaustavljen od korisnika"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:235
-#: clientgui/ViewProjects.cpp:449
-msgid "Reset Project"
-msgstr "Resetiraj projekt"
+#: ViewProjects.cpp:1059
+#, fuzzy
+msgid "To fetch work"
+msgstr "Ne skidaj više posla"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:266
-#: clientgui/ViewProjects.cpp:501
-#, c-format
-msgid "Are you sure you want to remove project '%s'?"
-msgstr "Jeste li sigurni da želite resetirati projekt '%s'?"
+#: ViewProjects.cpp:1060
+msgid "To report completed tasks"
+msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:272
-#: clientgui/ViewProjects.cpp:507
-msgid "Remove Project"
+#: ViewProjects.cpp:1061
+msgid "To send trickle-up message"
 msgstr ""
 
-#: clientgui/sg_ProjectPanel.cpp:72
+#: ViewProjects.cpp:1062
 #, fuzzy
-msgid "Add Project"
-msgstr "Priključi se projektu"
+msgid "Requested by account manager"
+msgstr "Menadžer računa"
 
-#: clientgui/sg_ProjectPanel.cpp:73
-msgid "Synchronize"
+#: ViewProjects.cpp:1063
+msgid "Project initialization"
 msgstr ""
 
-#: clientgui/sg_ProjectPanel.cpp:74
-msgid "Work done for this project"
-msgstr ""
+#: ViewProjects.cpp:1064
+#, fuzzy
+msgid "Requested by project"
+msgstr "Resetiraj projekt"
 
-#: clientgui/sg_ProjectPanel.cpp:77
-msgid "Synchronize projects with account manager system"
-msgstr ""
+#: ViewProjects.cpp:1065
+#, fuzzy
+msgid "Unknown reason"
+msgstr "(Nepoznato)"
 
-#: clientgui/sg_ProjectPanel.cpp:124
-msgid "Select a project to access with the controls below"
-msgstr ""
+#: ViewProjects.cpp:1079
+msgid "Suspended by user"
+msgstr "Zaustavljen od korisnika"
 
-# 88%
-#: clientgui/sg_ProjectPanel.cpp:145
+#: ViewProjects.cpp:1082
 #, fuzzy
-msgid "Project Web Pages"
-msgstr "Projekt"
-
-#: clientgui/sg_ProjectPanel.cpp:149
-msgid "Project Commands"
-msgstr ""
+msgid "Won't get new tasks"
+msgstr "Neće dobiti novi posao"
 
-#: clientgui/sg_ProjectPanel.cpp:276
-#, c-format
-msgid "Pop up a menu of web sites for project %s"
+#: ViewProjects.cpp:1085
+msgid "Project ended - OK to remove"
 msgstr ""
 
-#: clientgui/sg_ProjectPanel.cpp:278
-#, c-format
-msgid "Pop up a menu of commands to apply to project %s"
+#: ViewProjects.cpp:1088
+msgid "Will remove when tasks done"
 msgstr ""
 
-#: clientgui/sg_TaskCommandPopup.cpp:66
-msgid "Show graphics"
-msgstr "Pokaži grafiku"
+#: ViewProjects.cpp:1091
+msgid "Scheduler request pending"
+msgstr "Scheduler request pending"
 
-#: clientgui/sg_TaskCommandPopup.cpp:67
-msgid "Show application graphics in a window."
-msgstr "Pokazuje grafiku aplikacije u prozoru"
+#: ViewProjects.cpp:1097
+msgid "Scheduler request in progress"
+msgstr ""
 
-#: clientgui/sg_TaskCommandPopup.cpp:73
-msgid "Suspend this task."
+#: ViewProjects.cpp:1100
+msgid "Trickle up message pending"
 msgstr ""
 
-#: clientgui/sg_TaskCommandPopup.cpp:78
-msgid "Abort"
-msgstr "Obriši"
+#: ViewProjects.cpp:1106
+msgid "Communication deferred "
+msgstr "Communication deferred "
 
-#: clientgui/sg_TaskCommandPopup.cpp:79
-msgid "Abandon this task. You will get no credit for it."
+#: ViewResources.cpp:62
+msgid "Total disk usage"
 msgstr ""
 
-#: clientgui/sg_TaskCommandPopup.cpp:85
-msgid "Show task details."
+#: ViewResources.cpp:83
+msgid "Disk usage by BOINC projects"
 msgstr ""
 
-#: clientgui/sg_TaskCommandPopup.cpp:119
-#, fuzzy
-msgid "Resume work for this task."
-msgstr "Nastavi posao za ovaj rezultat"
-
-#: clientgui/sg_TaskCommandPopup.cpp:123
-#, fuzzy
-msgid "Suspend work for this task."
-msgstr "Zausavi posao za ovaj rezultat."
+#: ViewResources.cpp:116
+msgid "Disk"
+msgstr "Disk"
 
-#: clientgui/sg_TaskCommandPopup.cpp:267
-#, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %.1lf%%, Status: %s)"
+#: ViewResources.cpp:249
+msgid "no projects: 0 bytes used"
 msgstr ""
 
-#: clientgui/sg_TaskCommandPopup.cpp:272
-msgid "Abort task"
+#: ViewResources.cpp:286
+msgid "used by BOINC: "
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:468
-msgid "You don't have any projects.  Please Add a Project."
+#: ViewResources.cpp:296
+msgid "free, available to BOINC: "
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:469
-msgid "Not available"
+#: ViewResources.cpp:306
+msgid "free, not available to BOINC: "
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:480
-#, fuzzy
-msgid "Tasks:"
-msgstr "Zadaće"
-
-#: clientgui/sg_TaskPanel.cpp:486
-msgid "Select a task to access"
+#: ViewResources.cpp:316
+msgid "free: "
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:497
-msgid "From:"
+#: ViewResources.cpp:326
+msgid "used by other programs: "
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:551
-msgid "This task's progress"
-msgstr ""
+#: ViewStatistics.cpp:1205
+msgid "User Total"
+msgstr "Ukupno po korisniku"
 
-#: clientgui/sg_TaskPanel.cpp:569
-msgid "Task Commands"
-msgstr ""
+#: ViewStatistics.cpp:1206
+msgid "User Average"
+msgstr "Korisnikov prosjek"
 
-#: clientgui/sg_TaskPanel.cpp:570
-msgid "Pop up a menu of commands to apply to this task"
-msgstr ""
+#: ViewStatistics.cpp:1207
+msgid "Host Total"
+msgstr "Ukupan kredit računala"
 
-#: clientgui/sg_TaskPanel.cpp:705
-#, c-format
-msgid "Application: %s"
-msgstr ""
+#: ViewStatistics.cpp:1208
+msgid "Host Average"
+msgstr "Prosjek računala"
 
-#: clientgui/sg_TaskPanel.cpp:728
+#: ViewStatistics.cpp:1355
 #, c-format
-msgid "%.3f%%"
+msgid "Last update: %.0f days ago"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:736
-msgid "Application: Not available"
-msgstr ""
+#: ViewStatistics.cpp:1982
+msgid "Show user total"
+msgstr "Pokaži ukupan korisnikov kredit"
 
-#: clientgui/sg_TaskPanel.cpp:836
-msgid "Not Available"
+#: ViewStatistics.cpp:1983
+msgid "Show total credit for user"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:851
-#, c-format
-msgid "Elapsed: %s"
-msgstr ""
+#: ViewStatistics.cpp:1989
+msgid "Show user average"
+msgstr "Pokaži korisnički prosjek"
 
-# 84%
-#: clientgui/sg_TaskPanel.cpp:865
-#, c-format
-msgid "Remaining (estimated): %s"
+#: ViewStatistics.cpp:1990
+msgid "Show average credit for user"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:880
-#, c-format
-msgid "Status: %s"
-msgstr ""
+#: ViewStatistics.cpp:1996
+msgid "Show host total"
+msgstr "Pokaži ukupan kredit računala"
 
-#: clientgui/sg_TaskPanel.cpp:1227
-msgid "Retrieving current status."
+#: ViewStatistics.cpp:1997
+msgid "Show total credit for host"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1233
-msgid "Downloading work from the server."
-msgstr ""
+#: ViewStatistics.cpp:2003
+msgid "Show host average"
+msgstr "pokaži prosjek računala"
 
-#: clientgui/sg_TaskPanel.cpp:1238
-msgid "Processing Suspended:  Running On Batteries."
+#: ViewStatistics.cpp:2004
+msgid "Show average credit for host"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1240
-msgid "Processing Suspended:  User Active."
+#: ViewStatistics.cpp:2013
+msgid "< &Previous project"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1242
-msgid "Processing Suspended:  User paused processing."
+#: ViewStatistics.cpp:2014
+msgid "Show chart for previous project"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1244
-msgid "Processing Suspended:  Time of Day."
+#: ViewStatistics.cpp:2019
+msgid "&Next project >"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1246
-msgid "Processing Suspended:  Benchmarks Running."
+#: ViewStatistics.cpp:2020
+msgid "Show chart for next project"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1248
-msgid "Processing Suspended."
+#: ViewStatistics.cpp:2026 ViewStatistics.cpp:2416
+msgid "Hide project list"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1252
-msgid "Waiting to contact project servers."
+#: ViewStatistics.cpp:2027 ViewStatistics.cpp:2416
+msgid "Use entire area for graphs"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1256
-#: clientgui/sg_TaskPanel.cpp:1265
-msgid "Retrieving current status"
+#: ViewStatistics.cpp:2032
+msgid "Mode view"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1260
-msgid "No work available to process"
+#: ViewStatistics.cpp:2036
+msgid "One project"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1262
-msgid "Unable to connect to the core client"
+#: ViewStatistics.cpp:2037
+msgid "Show one chart with selected project"
 msgstr ""
 
-#: clientgui/TermsOfUsePage.cpp:218
-msgid "Terms of Use"
+#: ViewStatistics.cpp:2043
+msgid "All projects (separate)"
 msgstr ""
 
-#: clientgui/TermsOfUsePage.cpp:222
-msgid "Please read the following terms of use:"
+#: ViewStatistics.cpp:2044
+msgid "Show all projects, one chart per project"
 msgstr ""
 
-#: clientgui/TermsOfUsePage.cpp:231
-msgid "I agree to the terms of use."
+#: ViewStatistics.cpp:2050
+msgid "All projects (together)"
 msgstr ""
 
-#: clientgui/TermsOfUsePage.cpp:237
-msgid "I do not agree to the terms of use."
+#: ViewStatistics.cpp:2051
+msgid "Show one chart with all projects"
 msgstr ""
 
-#: clientgui/UnavailablePage.cpp:183
-msgid "Project temporarily unavailable"
+#: ViewStatistics.cpp:2057
+msgid "All projects (sum)"
 msgstr ""
 
-#: clientgui/UnavailablePage.cpp:186
-msgid ""
-"The project is temporarily unavailable.\n"
-"\n"
-"Please try again later."
+#: ViewStatistics.cpp:2058
+msgid "Show one chart with sum of projects"
 msgstr ""
 
-#: clientgui/UnavailablePage.cpp:190
-msgid "Account manager temporarily unavailable"
-msgstr ""
+#: ViewStatistics.cpp:2079
+msgid "Statistics"
+msgstr "Statistika"
 
-#: clientgui/UnavailablePage.cpp:193
-msgid ""
-"The account manager is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
+#: 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
+msgid "Updating charts..."
+msgstr "Ažuriram grafove"
 
-#: clientgui/ValidateAccountKey.cpp:68
-msgid "Please specify an account key to continue."
+#: ViewStatistics.cpp:2420
+msgid "Show project list"
 msgstr ""
 
-#: clientgui/ValidateAccountKey.cpp:71
-msgid "Invalid Account Key; please enter a valid Account Key"
-msgstr "Neispravan identifikator računa; molimo unesite valjani identifikator računa."
+#: ViewStatistics.cpp:2420
+msgid "Uses smaller area for graphs"
+msgstr ""
 
-#: clientgui/ValidateAccountKey.cpp:82
-#: clientgui/ValidateEmailAddress.cpp:86
-msgid "Validation conflict"
-msgstr "Konflikt pri validaciji."
+#: ViewTransfers.cpp:164
+msgid "Retry Now"
+msgstr "Ponovi sada"
 
-#: clientgui/ValidateEmailAddress.cpp:72
-msgid "Please specify an email address"
+#: ViewTransfers.cpp:165
+msgid "Retry the file transfer now"
 msgstr ""
 
-#: clientgui/ValidateEmailAddress.cpp:75
-msgid "Invalid email address; please enter a valid email address"
-msgstr ""
+#: ViewTransfers.cpp:171
+msgid "Abort Transfer"
+msgstr "Prekini prijenos"
 
-#: clientgui/ValidateURL.cpp:69
-msgid "Missing URL"
+#: ViewTransfers.cpp:172
+msgid "Abort this file transfer.  You won't get credit for the task."
 msgstr ""
 
-#: clientgui/ValidateURL.cpp:70
+#: ViewTransfers.cpp:183
+msgid "File"
+msgstr "Datoteka"
+
+#: ViewTransfers.cpp:184 ViewWork.cpp:233
+msgid "Progress"
+msgstr "Napredak"
+
+#: ViewTransfers.cpp:185
+msgid "Size"
+msgstr "Veličina"
+
+#: ViewTransfers.cpp:186
+msgid "Elapsed Time"
+msgstr "Proteklo vrijeme"
+
+#: ViewTransfers.cpp:187
+msgid "Speed"
+msgstr "Brzina"
+
+#: ViewTransfers.cpp:213
+msgid "Transfers"
+msgstr "Prijenosi"
+
+#: ViewTransfers.cpp:280
+#, fuzzy
+msgid "Network activity is suspended - "
+msgstr "Aktivnosti zaustavljene"
+
+#: ViewTransfers.cpp:282
 msgid ""
-"Please specify a URL.\n"
-"For example:\n"
-"http://www.example.com/"
+".\n"
+"You can enable it using the Activity menu."
 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"
+#: ViewTransfers.cpp:285
+msgid "BOINC"
 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 ""
+#: ViewTransfers.cpp:292
+msgid "Retrying transfer now..."
+msgstr "Ponovo pokušavam prenijeti sada..."
 
-#: clientgui/ValidateURL.cpp:104
-#: clientgui/ValidateURL.cpp:108
-#, c-format
-msgid "'%s' does not contain a valid host name."
-msgstr "'%s' ne sadrži valjano ime računala"
+#: ViewTransfers.cpp:330
+msgid "Aborting transfer..."
+msgstr "Prekidam prijenos..."
 
-#: clientgui/ValidateURL.cpp:111
+#: ViewTransfers.cpp:343
 #, c-format
-msgid "'%s' does not contain a valid path."
-msgstr "'%s' ne sadrži valjan put."
-
-#: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:175
-msgid "Commands"
+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/ViewMessages.cpp:88
-msgid "Copy all messages"
-msgstr "Kopiraj sve poruke"
+#: ViewTransfers.cpp:349
+msgid "Abort File Transfer"
+msgstr "Prekini prijenos datoteke"
 
-#: clientgui/ViewMessages.cpp:95
-msgid "Copy selected messages"
-msgstr "Kopiraj oznčene poruke"
+#: ViewTransfers.cpp:780
+msgid "Upload"
+msgstr ""
 
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
-msgid "Show only this project"
+#: ViewTransfers.cpp:780
+msgid "Download"
 msgstr ""
 
-#: clientgui/ViewMessages.cpp:107
-#: clientgui/ViewMessages.cpp:503
+#: ViewTransfers.cpp:784
 #, fuzzy
-msgid "Show only the messages for the selected project."
-msgstr "Kopiraj sve poruke u memoriju"
-
-#: clientgui/ViewMessages.cpp:164
-msgid "Messages"
-msgstr "Poruke"
-
-#: clientgui/ViewMessages.cpp:187
-msgid "Copying all messages to the clipboard..."
-msgstr "Kopiranje svih poruka u memoriju..."
+msgid "retry in "
+msgstr "Ponovi za"
 
-#: clientgui/ViewMessages.cpp:223
-#, fuzzy
-msgid "Copying selected messages to the clipboard..."
-msgstr "Kopiranje svih poruka u memoriju..."
+#: ViewTransfers.cpp:786
+msgid "failed"
+msgstr ""
 
-#: clientgui/ViewMessages.cpp:286
-msgid "Filtering messages..."
+#: ViewTransfers.cpp:789
+msgid "suspended"
 msgstr ""
 
-#: clientgui/ViewMessages.cpp:494
-#, fuzzy
-msgid "Show all messages"
-msgstr "Kopiraj sve poruke"
+#: ViewTransfers.cpp:794
+msgid "active"
+msgstr ""
 
-#: clientgui/ViewMessages.cpp:495
-msgid "Show messages for all projects."
+#: ViewTransfers.cpp:796
+msgid "pending"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:225
-msgid "Account"
-msgstr "Račun"
+#: ViewTransfers.cpp:803
+msgid " (project backoff: "
+msgstr ""
 
-#: clientgui/ViewProjects.cpp:227
-msgid "Work done"
+#: ViewWork.cpp:187 ViewWork.cpp:777
+msgid "Show active tasks"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:228
-msgid "Avg. work done"
+#: ViewWork.cpp:188 ViewWork.cpp:778
+msgid "Show only active tasks."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:230
-msgid "Status"
-msgstr "Stanje"
+#: ViewWork.cpp:194 sg_TaskCommandPopup.cpp:60
+msgid "Show graphics"
+msgstr "Pokaži grafiku"
 
-#: clientgui/ViewProjects.cpp:255
-msgid "Projects"
-msgstr "Projekti"
+#: ViewWork.cpp:195 sg_TaskCommandPopup.cpp:61
+msgid "Show application graphics in a window."
+msgstr "Pokazuje grafiku aplikacije u prozoru"
 
-#: clientgui/ViewProjects.cpp:307
-msgid "Updating project..."
-msgstr "Ažuriram projekt..."
+#: ViewWork.cpp:201
+#, fuzzy
+msgid "Show VM Console"
+msgstr "Pokaži ukupan kredit računala"
 
-#: clientgui/ViewProjects.cpp:349
-msgid "Resuming project..."
-msgstr "Nastavljam projekt"
+#: ViewWork.cpp:202
+#, fuzzy
+msgid "Show VM Console in a window."
+msgstr "Pokazuje grafiku aplikacije u prozoru"
 
-#: clientgui/ViewProjects.cpp:353
-msgid "Suspending project..."
-msgstr "Zaustavljam projekt"
+#: ViewWork.cpp:209
+msgid "Suspend work for this result."
+msgstr "Zausavi posao za ovaj rezultat."
+
+#: ViewWork.cpp:215 sg_TaskCommandPopup.cpp:72
+msgid "Abort"
+msgstr "Obriši"
+
+#: ViewWork.cpp:216
+msgid "Abandon work on the result. You will get no credit for it."
+msgstr "Napusti posao n rezultatu. Nećete dobit kredit za njega."
+
+#: ViewWork.cpp:223 sg_TaskCommandPopup.cpp:79
+msgid "Show task details."
+msgstr ""
 
-#: clientgui/ViewProjects.cpp:390
+#: ViewWork.cpp:235
+msgid "Elapsed"
+msgstr ""
+
+#: ViewWork.cpp:236
 #, fuzzy
-msgid "Telling project to allow additional task downloads..."
-msgstr "Govorim projektu da dopusti skidanje novog posla..."
+msgid "Remaining (estimated)"
+msgstr "Radi"
 
-#: clientgui/ViewProjects.cpp:394
+#: ViewWork.cpp:237
 #, fuzzy
-msgid "Telling project to not fetch any additional tasks..."
-msgstr "Govorim projektu da ne skida novi posao..."
+msgid "Deadline"
+msgstr "Rok prijave"
 
-#: clientgui/ViewProjects.cpp:430
-msgid "Resetting project..."
-msgstr "Resetiram projekt"
+#: ViewWork.cpp:264
+msgid "Tasks"
+msgstr "Zadaće"
 
-#: clientgui/ViewProjects.cpp:488
-#, fuzzy
-msgid "Removing project..."
-msgstr "Nastavljam projekt"
+#: ViewWork.cpp:357
+msgid "Resuming task..."
+msgstr ""
 
-#: clientgui/ViewProjects.cpp:548
-msgid "Launching browser..."
-msgstr "Otvaram pretraživač..."
+#: ViewWork.cpp:360
+#, fuzzy
+msgid "Suspending task..."
+msgstr "Zaustavljam rezultat..."
 
-#: clientgui/ViewProjects.cpp:1063
+#: ViewWork.cpp:389
 #, fuzzy
-msgid "Requested by user"
-msgstr "Zaustavljen od korisnika"
+msgid "Showing graphics for task..."
+msgstr "Prikazujem grafiku za rezultat..."
 
-#: clientgui/ViewProjects.cpp:1064
+#: ViewWork.cpp:426
 #, fuzzy
-msgid "To fetch work"
-msgstr "Ne skidaj više posla"
+msgid "Showing VM console for task..."
+msgstr "Prikazujem grafiku za rezultat..."
 
-#: clientgui/ViewProjects.cpp:1065
-msgid "To report completed tasks"
+#: ViewWork.cpp:479
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %s, Status: %s)"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1066
-msgid "To send trickle-up message"
+#: ViewWork.cpp:485
+#, c-format
+#, fuzzy, c-format
+msgid "Are you sure you want to abort these %d tasks?"
+msgstr "Jeste li sigurni da želite obrisati rezultat '%s'?"
+
+#: ViewWork.cpp:490 sg_TaskCommandPopup.cpp:256
+msgid "Abort task"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1067
+# 75%
+#: ViewWork.cpp:499
 #, fuzzy
-msgid "Requested by account manager"
-msgstr "Menadžer računa"
+msgid "Aborting task..."
+msgstr "Prekidam prijenos..."
 
-#: clientgui/ViewProjects.cpp:1068
-msgid "Project initialization"
+#: ViewWork.cpp:771
+msgid "Show all tasks"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1069
-#, fuzzy
-msgid "Requested by project"
-msgstr "Resetiraj projekt"
+#: ViewWork.cpp:772
+msgid "Show all tasks."
+msgstr ""
 
-#: clientgui/ViewProjects.cpp:1070
+#: ViewWork.cpp:796 sg_TaskCommandPopup.cpp:103
 #, fuzzy
-msgid "Unknown reason"
-msgstr "(Nepoznato)"
+msgid "Resume work for this task."
+msgstr "Nastavi posao za ovaj rezultat"
 
-#: clientgui/ViewProjects.cpp:1084
-msgid "Suspended by user"
-msgstr "Zaustavljen od korisnika"
+#: ViewWork.cpp:802 sg_TaskCommandPopup.cpp:107
+#, fuzzy
+msgid "Suspend work for this task."
+msgstr "Zausavi posao za ovaj rezultat."
 
-#: clientgui/ViewProjects.cpp:1087
+#: WelcomePage.cpp:284
 #, fuzzy
-msgid "Won't get new tasks"
-msgstr "Neće dobiti novi posao"
+msgid "Add project or account manager"
+msgstr "Uključujem se u projekt..."
 
-#: clientgui/ViewProjects.cpp:1090
-msgid "Project ended - OK to remove"
+#: WelcomePage.cpp:288
+msgid "Add project or use BOINC Account Manager"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1093
-msgid "Will remove when tasks done"
+#: 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 ""
 
-#: clientgui/ViewProjects.cpp:1096
-msgid "Scheduler request pending"
-msgstr "Scheduler request pending"
-
-#: clientgui/ViewProjects.cpp:1102
-msgid "Scheduler request in progress"
+#: 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 ""
 
-#: clientgui/ViewProjects.cpp:1105
-msgid "Trickle up message pending"
+#: 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 ""
 
-#: clientgui/ViewProjects.cpp:1111
-msgid "Communication deferred "
-msgstr "Communication deferred "
-
-#: clientgui/ViewResources.cpp:62
-msgid "Total disk usage"
+#: WelcomePage.cpp:339
+msgid "Use a BOINC Account Manager"
 msgstr ""
 
-#: clientgui/ViewResources.cpp:83
-msgid "Disk usage by BOINC projects"
+#: WelcomePage.cpp:352
+msgid "To continue, click Next."
 msgstr ""
 
-#: clientgui/ViewResources.cpp:116
-msgid "Disk"
-msgstr "Disk"
-
-#: clientgui/ViewResources.cpp:225
-msgid "no projects: 0 bytes used"
+#: WelcomePage.cpp:358
+msgid "Add or change your World Community Grid projects"
 msgstr ""
 
-#: clientgui/ViewResources.cpp:262
-msgid "used by BOINC: "
+#: WelcomePage.cpp:361
+msgid "Add projects run by other researchers or organizations"
 msgstr ""
 
-#: clientgui/ViewResources.cpp:272
-msgid "free, available to BOINC: "
+#: WizardAttach.cpp:634
+msgid "Do you really want to cancel?"
 msgstr ""
 
-#: clientgui/ViewResources.cpp:282
-msgid "free, not available to BOINC: "
+#: WizardAttach.cpp:635
+msgid "Question"
 msgstr ""
 
-#: clientgui/ViewResources.cpp:292
-msgid "free: "
+#: sg_BoincSimpleFrame.cpp:149
+msgid "Advanced View...\tCtrl+Shift+A"
 msgstr ""
 
-#: clientgui/ViewResources.cpp:302
-msgid "used by other programs: "
+#: sg_BoincSimpleFrame.cpp:150
+msgid "Display the advanced graphical interface."
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1181
-msgid "User Total"
-msgstr "Ukupno po korisniku"
-
-#: clientgui/ViewStatistics.cpp:1182
-msgid "User Average"
-msgstr "Korisnikov prosjek"
-
-#: clientgui/ViewStatistics.cpp:1183
-msgid "Host Total"
-msgstr "Ukupan kredit računala"
+#: sg_BoincSimpleFrame.cpp:157
+msgid "Skin"
+msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1184
-msgid "Host Average"
-msgstr "Prosjek računala"
+#: sg_BoincSimpleFrame.cpp:159
+msgid "Select the appearance of the user interface."
+msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1331
+#: sg_BoincSimpleFrame.cpp:206
 #, c-format
-msgid "Last update: %.0f days ago"
+msgid "&%s"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1956
-msgid "Show user total"
-msgstr "Pokaži ukupan korisnikov kredit"
+#: sg_BoincSimpleFrame.cpp:390
+#, fuzzy
+msgid "Default"
+msgstr "&Postavi kao pretpostavljeno"
 
-#: clientgui/ViewStatistics.cpp:1957
-msgid "Show total credit for user"
+#: sg_BoincSimpleFrame.cpp:759
+msgid "Suspend Computing"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1963
-msgid "Show user average"
-msgstr "Pokaži korisnički prosjek"
-
-#: clientgui/ViewStatistics.cpp:1964
-msgid "Show average credit for user"
+#: sg_BoincSimpleFrame.cpp:760
+msgid "Resume Computing"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1970
-msgid "Show host total"
-msgstr "Pokaži ukupan kredit računala"
-
-#: clientgui/ViewStatistics.cpp:1971
-msgid "Show total credit for host"
+#: sg_BoincSimpleFrame.cpp:777
+msgid "Open a window to view notices from projects or BOINC"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1977
-msgid "Show host average"
-msgstr "pokaži prosjek računala"
+#: sg_DlgMessages.cpp:146
+#, fuzzy
+msgid "Close"
+msgstr "Zatvoriti"
 
-#: clientgui/ViewStatistics.cpp:1978
-msgid "Show average credit for host"
+#: sg_DlgMessages.cpp:389
+#, c-format
+msgid "%s - Notices"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1987
-msgid "< &Previous project"
+#: sg_DlgPreferences.cpp:268
+msgid "This dialog controls preferences for this computer only."
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1988
-msgid "Show chart for previous project"
+#: sg_DlgPreferences.cpp:273
+msgid "Click OK to set preferences."
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1993
-msgid "&Next project >"
+#: sg_DlgPreferences.cpp:278
+msgid ""
+"Click Clear to restore web-based settings for all preferences listed below."
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1994
-msgid "Show chart for next project"
+#: sg_DlgPreferences.cpp:285
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2000
-#: clientgui/ViewStatistics.cpp:2390
-msgid "Hide project list"
+#: sg_DlgPreferences.cpp:313
+msgid "Do work only between:"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2001
-#: clientgui/ViewStatistics.cpp:2390
-msgid "Use entire area for graphs"
+#: sg_DlgPreferences.cpp:335
+msgid "Connect to internet only between:"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2006
-msgid "Mode view"
+#: sg_DlgPreferences.cpp:357 sg_DlgPreferences.cpp:374
+msgid "Use no more than:"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2010
-msgid "One project"
+#: sg_DlgPreferences.cpp:370
+msgid "of disk space"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2011
-msgid "Show one chart with selected project"
+#: sg_DlgPreferences.cpp:387
+msgid "of the processor"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2017
-msgid "All projects (separate)"
+#: sg_DlgPreferences.cpp:391
+msgid "Do work while on battery?"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2018
-msgid "Show all projects, one chart per project"
+#: sg_DlgPreferences.cpp:404
+msgid "Do work after idle for:"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2024
-msgid "All projects (together)"
+#: sg_DlgPreferences.cpp:429
+msgid "Clear all local preferences listed above and close the dialog"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2025
-msgid "Show one chart with all projects"
+#: 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 ""
 
-#: clientgui/ViewStatistics.cpp:2031
-msgid "All projects (sum)"
+#: sg_DlgPreferences.cpp:638
+msgid "100 MB"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2032
-msgid "Show one chart with sum of projects"
+#: sg_DlgPreferences.cpp:639
+msgid "200 MB"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2053
-msgid "Statistics"
-msgstr "Statistika"
-
-#: 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 "Ažuriram grafove"
-
-#: clientgui/ViewStatistics.cpp:2394
-msgid "Show project list"
+#: sg_DlgPreferences.cpp:640
+msgid "500 MB"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2394
-msgid "Uses smaller area for graphs"
+#: sg_DlgPreferences.cpp:641
+msgid "1 GB"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:169
-msgid "Retry Now"
-msgstr "Ponovi sada"
-
-#: clientgui/ViewTransfers.cpp:170
-msgid "Retry the file transfer now"
+#: sg_DlgPreferences.cpp:642
+msgid "2 GB"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:176
-msgid "Abort Transfer"
-msgstr "Prekini prijenos"
-
-#: clientgui/ViewTransfers.cpp:177
-msgid "Abort this file transfer.  You won't get credit for the task."
+#: sg_DlgPreferences.cpp:643
+msgid "5 GB"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:188
-msgid "File"
-msgstr "Datoteka"
-
-#: clientgui/ViewTransfers.cpp:189
-#: clientgui/ViewWork.cpp:238
-msgid "Progress"
-msgstr "Napredak"
-
-#: clientgui/ViewTransfers.cpp:190
-msgid "Size"
-msgstr "Veličina"
-
-#: clientgui/ViewTransfers.cpp:191
-msgid "Elapsed Time"
-msgstr "Proteklo vrijeme"
-
-#: clientgui/ViewTransfers.cpp:192
-msgid "Speed"
-msgstr "Brzina"
+#: sg_DlgPreferences.cpp:644
+msgid "10 GB"
+msgstr ""
 
-#: clientgui/ViewTransfers.cpp:218
-msgid "Transfers"
-msgstr "Prijenosi"
+#: sg_DlgPreferences.cpp:645
+msgid "20 GB"
+msgstr ""
 
-#: clientgui/ViewTransfers.cpp:285
-#, fuzzy
-msgid "Network activity is suspended - "
-msgstr "Aktivnosti zaustavljene"
+#: sg_DlgPreferences.cpp:646
+msgid "50 GB"
+msgstr ""
 
-#: clientgui/ViewTransfers.cpp:287
-msgid ""
-".\n"
-"You can enable it using the Activity menu."
+#: sg_DlgPreferences.cpp:647
+msgid "100 GB"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:290
-msgid "BOINC"
+#: sg_DlgPreferences.cpp:717
+#, c-format
+msgid "%d MB"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:297
-msgid "Retrying transfer now..."
-msgstr "Ponovo pokušavam prenijeti sada..."
-
-#: clientgui/ViewTransfers.cpp:335
-msgid "Aborting transfer..."
-msgstr "Prekidam prijenos..."
+#: sg_DlgPreferences.cpp:719
+#, c-format
+msgid "%4.2f GB"
+msgstr ""
 
-#: clientgui/ViewTransfers.cpp:348
+#: sg_DlgPreferences.cpp:760
 #, 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."
+msgid "%d%%"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:354
-msgid "Abort File Transfer"
-msgstr "Prekini prijenos datoteke"
+#: sg_DlgPreferences.cpp:796
+msgid "0 (Run Always)"
+msgstr ""
 
-#: clientgui/ViewTransfers.cpp:785
-msgid "Upload"
+#: sg_DlgPreferences.cpp:799
+#, c-format
+msgid "%d"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:785
-msgid "Download"
+#: sg_DlgPreferences.cpp:1029
+msgid "Do you really want to clear all local preferences?\n"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:789
+#: sg_ProjectPanel.cpp:72
 #, fuzzy
-msgid "retry in "
-msgstr "Ponovi za"
+msgid "Add Project"
+msgstr "Priključi se projektu"
 
-#: clientgui/ViewTransfers.cpp:791
-msgid "failed"
+#: sg_ProjectPanel.cpp:73
+msgid "Synchronize"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:794
-msgid "suspended"
+#: sg_ProjectPanel.cpp:74
+msgid "Work done for this project"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:799
-msgid "active"
+#: sg_ProjectPanel.cpp:77
+msgid "Synchronize projects with account manager system"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:801
-msgid "pending"
+#: sg_ProjectPanel.cpp:124
+msgid "Select a project to access with the controls below"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:808
-msgid " (project backoff: "
+# 88%
+#: sg_ProjectPanel.cpp:145
+#, fuzzy
+msgid "Project Web Pages"
+msgstr "Projekt"
+
+#: sg_ProjectPanel.cpp:149
+msgid "Project Commands"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:192
-#: clientgui/ViewWork.cpp:782
-msgid "Show active tasks"
+#: sg_ProjectPanel.cpp:267
+#, c-format
+msgid "Pop up a menu of web sites for project %s"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:193
-#: clientgui/ViewWork.cpp:783
-msgid "Show only active tasks."
+#: sg_ProjectPanel.cpp:269
+#, c-format
+msgid "Pop up a menu of commands to apply to project %s"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:206
-#, fuzzy
-msgid "Show VM Console"
-msgstr "Pokaži ukupan kredit računala"
+#: sg_TaskCommandPopup.cpp:67
+msgid "Suspend this task."
+msgstr ""
 
-#: clientgui/ViewWork.cpp:207
-#, fuzzy
-msgid "Show VM Console in a window."
-msgstr "Pokazuje grafiku aplikacije u prozoru"
+#: sg_TaskCommandPopup.cpp:73
+msgid "Abandon this task. You will get no credit for it."
+msgstr ""
 
-#: clientgui/ViewWork.cpp:214
-msgid "Suspend work for this result."
-msgstr "Zausavi posao za ovaj rezultat."
+#: sg_TaskCommandPopup.cpp:251
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %.1lf%%, Status: %s)"
+msgstr ""
 
-#: clientgui/ViewWork.cpp:221
-msgid "Abandon work on the result. You will get no credit for it."
-msgstr "Napusti posao n rezultatu. Nećete dobit kredit za njega."
+#: sg_TaskPanel.cpp:464
+msgid "You don't have any projects.  Please Add a Project."
+msgstr ""
 
-#: clientgui/ViewWork.cpp:240
-msgid "Elapsed"
+#: sg_TaskPanel.cpp:465
+msgid "Not available"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:241
+#: sg_TaskPanel.cpp:476
 #, fuzzy
-msgid "Remaining (estimated)"
-msgstr "Radi"
+msgid "Tasks:"
+msgstr "Zadaće"
 
-#: clientgui/ViewWork.cpp:242
-#, fuzzy
-msgid "Deadline"
-msgstr "Rok prijave"
+#: sg_TaskPanel.cpp:482
+msgid "Select a task to access"
+msgstr ""
 
-#: clientgui/ViewWork.cpp:269
-msgid "Tasks"
-msgstr "Zadaće"
+#: sg_TaskPanel.cpp:493
+msgid "From:"
+msgstr ""
 
-#: clientgui/ViewWork.cpp:362
-msgid "Resuming task..."
+#: sg_TaskPanel.cpp:547
+msgid "This task's progress"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:365
-#, fuzzy
-msgid "Suspending task..."
-msgstr "Zaustavljam rezultat..."
+#: sg_TaskPanel.cpp:565
+msgid "Task Commands"
+msgstr ""
 
-#: clientgui/ViewWork.cpp:394
-#, fuzzy
-msgid "Showing graphics for task..."
-msgstr "Prikazujem grafiku za rezultat..."
+#: sg_TaskPanel.cpp:566
+msgid "Pop up a menu of commands to apply to this task"
+msgstr ""
 
-#: clientgui/ViewWork.cpp:431
-#, fuzzy
-msgid "Showing VM console for task..."
-msgstr "Prikazujem grafiku za rezultat..."
+#: sg_TaskPanel.cpp:701
+#, c-format
+#, fuzzy, c-format
+msgid "Application: %s"
+msgstr "Aplikacija"
 
-#: clientgui/ViewWork.cpp:484
+#: sg_TaskPanel.cpp:724
 #, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %s, Status: %s)"
+msgid "%.3f%%"
+msgstr ""
+
+#: sg_TaskPanel.cpp:732
+msgid "Application: Not available"
+msgstr ""
+
+#: sg_TaskPanel.cpp:832
+msgid "Not Available"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:490
+#: sg_TaskPanel.cpp:847
 #, c-format
-msgid "Are you sure you want to abort these %d tasks?"
+msgid "Elapsed: %s"
 msgstr ""
 
-# 75%
-#: clientgui/ViewWork.cpp:504
-#, fuzzy
-msgid "Aborting task..."
-msgstr "Prekidam prijenos..."
+# 84%
+#: sg_TaskPanel.cpp:861
+#, c-format
+#, fuzzy, c-format
+msgid "Remaining (estimated): %s"
+msgstr "Radi"
 
-#: clientgui/ViewWork.cpp:776
-msgid "Show all tasks"
+#: sg_TaskPanel.cpp:876
+#, c-format
+msgid "Status: %s"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:777
-msgid "Show all tasks."
+#: sg_TaskPanel.cpp:1223
+msgid "Retrieving current status."
 msgstr ""
 
-#: clientgui/WelcomePage.cpp:284
-#, fuzzy
-msgid "Add project or account manager"
-msgstr "Uključujem se u projekt..."
+#: sg_TaskPanel.cpp:1229
+msgid "Downloading work from the server."
+msgstr ""
 
-#: clientgui/WelcomePage.cpp:288
-msgid "Add project or use BOINC Account Manager"
+#: sg_TaskPanel.cpp:1234
+msgid "Processing Suspended:  Running On Batteries."
 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."
+#: sg_TaskPanel.cpp:1236
+msgid "Processing Suspended:  User Active."
 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."
+#: sg_TaskPanel.cpp:1238
+msgid "Processing Suspended:  User paused processing."
 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"
+#: sg_TaskPanel.cpp:1240
+msgid "Processing Suspended:  Time of Day."
 msgstr ""
 
-#: clientgui/WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
+#: sg_TaskPanel.cpp:1242
+msgid "Processing Suspended:  Benchmarks Running."
 msgstr ""
 
-#: clientgui/WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
+#: sg_TaskPanel.cpp:1244
+msgid "Processing Suspended."
 msgstr ""
 
-#: clientgui/WelcomePage.cpp:361
-msgid "Add projects run by other researchers or organizations"
+#: sg_TaskPanel.cpp:1248
+msgid "Waiting to contact project servers."
 msgstr ""
 
-#: clientgui/WizardAttach.cpp:673
-msgid "Do you really want to cancel?"
+#: sg_TaskPanel.cpp:1252 sg_TaskPanel.cpp:1261
+msgid "Retrieving current status"
 msgstr ""
 
-#: clientgui/WizardAttach.cpp:674
-msgid "Question"
+#: sg_TaskPanel.cpp:1256
+msgid "No work available to process"
+msgstr ""
+
+#: sg_TaskPanel.cpp:1258
+msgid "Unable to connect to the core client"
 msgstr ""
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
+#: wizardex.cpp:377 wizardex.cpp:553
 msgid "&Next >"
 msgstr ""
 
-#: clientgui/wizardex.cpp:383
+#: wizardex.cpp:383
 msgid "< &Back"
 msgstr ""
 
-#: clientgui/wizardex.cpp:553
+#: wizardex.cpp:553
 msgid "&Finish"
 msgstr ""
 
-#: clientgui/common/wxPieCtrl.cpp:64
-msgid "Pie Ctrl"
+#: mac/Mac_GUI.cpp:110
+msgid "Preferences…"
 msgstr ""
 
-#: clientgui/mac/Mac_GUI.cpp:35
+#: mac/Mac_GUI.cpp:122
 msgid "Services"
 msgstr ""
 
-#: clientgui/mac/Mac_GUI.cpp:36
+#: mac/Mac_GUI.cpp:144
 #, c-format
 msgid "Hide %s"
 msgstr ""
 
-#: clientgui/mac/Mac_GUI.cpp:37
+#: mac/Mac_GUI.cpp:158
 msgid "Hide Others"
 msgstr ""
 
-#: clientgui/mac/Mac_GUI.cpp:38
+#: mac/Mac_GUI.cpp:172
 msgid "Show All"
 msgstr ""
 
-#: clientgui/mac/Mac_GUI.cpp:39
+#: mac/Mac_GUI.cpp:186
 #, c-format
 msgid "Quit %s"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.h:30
-msgid "specify work start and stop hours in format HH:MM-HH:MM"
-msgstr ""
-
-#: clientgui/DlgAdvPreferences.h:31
-msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
-msgstr ""
-
-# 98%
-#, fuzzy
-#~ msgid ""
-#~ "(C) 2003-2013 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2005 Kalifornijsko sveučilište u Berkeleyu.\n"
-#~ "Sva prava pridržana."
-
-#, no-c-format
-#~ msgid "% CPU time"
-#~ msgstr "Procesorsko vrijeme"
-
 # 75%
 # 100%
 #, fuzzy
@@ -4039,14 +3897,17 @@ msgstr ""
 #~ msgstr ""
 #~ "(C) 2005 Kalifornijsko sveučilište u Berkeleyu.\n"
 #~ "Sva prava pridržana."
+
 #~ msgid "Click 'Retry now' to transfer the file now"
 #~ msgstr "Klikni na 'ponovi sada' da prenesete datoteku sada"
+
 #~ msgid ""
 #~ "Click 'Abort transfer' to delete the file from the transfer queue. This "
 #~ "will prevent you from being granted credit for this result."
 #~ msgstr ""
 #~ "Klikni 'prekini prijenos' da obrišete datoteku iz popisa za prijenos. to "
 #~ "će vas spriječiti da dobijete kredit za taj rezultat."
+
 #~ msgid "Aborting result..."
 #~ msgstr "Brišem rezultat..."
 
@@ -4057,30 +3918,43 @@ msgstr ""
 #, fuzzy
 #~ msgid "Don't fetch ATI GPU tasks"
 #~ msgstr "Neće dobiti novi posao"
+
 #~ msgid "Web sites"
 #~ msgstr "Web stranice"
+
 #~ msgid "Retrieving host information; please wait..."
 #~ msgstr "Provjeravam stanje računala; molimo pričekajte..."
+
 #~ msgid "Detach"
 #~ msgstr "Isključi se"
+
 #~ msgid "Detaching from project..."
 #~ msgstr "Isključujem se iz projekta..."
+
 #~ msgid "Are you sure you want to detach from project '%s'?"
 #~ msgstr "Jeste li sigurni da se želite isključiti iz projekta '%s'?"
+
 #~ msgid "Detach from Project"
 #~ msgstr "Odvoji se od projekta"
+
 #~ msgid "To completion"
 #~ msgstr "Do završetka"
+
 #~ msgid "Attaching to project..."
 #~ msgstr "Uključujem se u projekt..."
+
 #~ msgid "&Open BOINC Manager..."
 #~ msgstr "&Otvori BOINC menadžer"
+
 #~ msgid "&Disable BOINC network access"
 #~ msgstr "Za&brani pristup mreži"
+
 #~ msgid "&About BOINC Manager..."
 #~ msgstr "O &BOINC menadžeru"
+
 #~ msgid "http://boinc.berkeley.edu/"
 #~ msgstr "http://boinc.berkeley.edu/"
+
 #~ msgid ""
 #~ "Account managers make it easy to find and join BOINC projects.\n"
 #~ "For more information, click on the link below."
@@ -4088,18 +3962,28 @@ msgstr ""
 #~ "Menadžeri računa olakšavaju pronalažanje i opredjeljivanje BOINC "
 #~ "projektima.\n"
 #~ " Za više informacija, kliknite povezicu ispod."
+
 #~ msgid "Login:"
 #~ msgstr "Ime:"
+
 #~ msgid "Your current account manager:"
 #~ msgstr "Vaš trenutni menadžer računa:"
+
 #~ msgid "http://a/b/c/"
 #~ msgstr "http://a/b/c/"
+
 #~ msgid "&Update accounts"
 #~ msgstr "&Ažuriraj račune"
+
 #~ msgid "Change manager"
 #~ msgstr "Promjena menadžera"
+
+#~ msgid "URL:"
+#~ msgstr "Adresa:"
+
 #~ msgid "Account Key:"
 #~ msgstr "Identifikator računa:"
+
 #~ msgid ""
 #~ "These are emailed to you when you create an account.\n"
 #~ "Go to project web sites to create accounts.\n"
@@ -4108,112 +3992,155 @@ msgstr ""
 #~ "Te podatke dobivate putem e-pošte kad stvorite račun.\n"
 #~ "Za stvaranje računa posjetite web stranicu projekta.\n"
 #~ "Posjetite http://boinc.berkeley.edu za popis projekata."
+
 #~ msgid "Language Selection:"
 #~ msgstr "Odabir jezika:"
+
 #~ msgid "What language should the manager display by default."
 #~ msgstr "Koji jezik će se prikazivati automatski."
+
 #~ msgid "Reminder Frequency:"
 #~ msgstr "Frekvencija podsjećenja:"
+
 #~ msgid ""
 #~ "How often, in minutes, should the manager remind you of possible "
 #~ "connection events."
 #~ msgstr ""
 #~ "Koliko često, u minutama, će vas menadžer podsjećati o mogućim spajanjima:"
+
 #~ msgid "&Automatically detect network connection settings"
 #~ msgstr "&Automatski ispitaj postavke spajanja na mrežu"
+
 #~ msgid "Use my &Local Area Network(LAN) connection"
 #~ msgstr "Koristi moju &Lokalnu mrežnu (LAN) vezu"
+
 #~ msgid "Use my &Dial-up and Virtual Private Network connection"
 #~ msgstr "Koristi moju &modemsku i VPN vezu"
+
 #~ msgid "&Prompt for username and password"
 #~ msgstr "&Upitaj korisničko ime i lozinku"
+
 #~ msgid "Failed to create wxStaticText, needed by wxHyperLink!"
 #~ msgstr "Neuspjelo kreiranje wxStaticTexta, koji je potreban wxHyperLink-u!"
+
 #~ msgid "BOINC Manager - Connection Error"
 #~ msgstr "BOINC menadžer - greška u spaanju"
+
 #~ msgid "BOINC Manager - Connection failed"
 #~ msgstr "BOINC menadžer - Veza prekinuta"
+
 #~ msgid "Connection failed."
 #~ msgstr "Veza prekinuta."
+
 #~ msgid "BOINC info"
 #~ msgstr "BOINC info"
+
 #~ msgid "Closes the main BOINC Manager window"
 #~ msgstr "Zatvara glavni prozor BOINC menadžera"
+
 #~ msgid "&Hide"
 #~ msgstr "&Sakrij"
+
 #~ msgid "Hides the main BOINC Manager window"
 #~ msgstr "Sakriva glavni prozor BOINC menadžera"
+
 #~ msgid "&Disable BOINC Network Access"
 #~ msgstr "O&nemogući pristup mreži"
+
 #~ msgid "Run &Benchmarks"
 #~ msgstr "Pokreni &testove"
+
 #~ msgid "Exit the BOINC Manager"
 #~ msgstr "Zatvori BOINC menadžer"
+
 #~ msgid "&Manage Accounts"
 #~ msgstr "&Uređivanje računa"
+
 #~ msgid ""
 #~ "Connect to an account manager website and update all of your accounts"
 #~ msgstr "Spojite se na website menadžera računa i ažurirajte sve vaše račune"
+
 #~ msgid "&Options"
 #~ msgstr "&Opcije"
+
 #~ msgid "&BOINC Manager\tF1"
 #~ msgstr "&BOINC menadžer\tF1"
+
 #~ msgid "Show information about BOINC and BOINC Manager"
 #~ msgstr "Pokazuje informacije o BOINC-u i BOINC menadžeru"
+
 #~ msgid "Language Selection..."
 #~ msgstr "Odabir jezika..."
+
 #~ msgid "BOINC Manager - Network Status"
 #~ msgstr "BOINC menadžer - Stanje mreže"
+
 #~ msgid ""
 #~ "BOINC needs a connection to the Internet to perform some maintenance, "
 #~ "open the BOINC Manager to connect up and perform the needed work."
 #~ msgstr ""
 #~ "BOINC treba vezu na internet radi održavanja, otvorite BOINC menadžer da "
 #~ "se spoji i obavi potreban posao."
+
 #~ msgid ""
 #~ "BOINC has successfully connected to the internet, updating all transfers "
 #~ "and projects."
 #~ msgstr ""
 #~ "BOINC se uspješno spojio na internet, ažurira sve projekte i ponovo "
 #~ "pokušava sve prijenose."
+
 #~ msgid "Update All"
 #~ msgstr "Ažuriraj sve"
+
 #~ msgid ""
 #~ "Report all upload items, completed work, get latest credit, get latest "
 #~ "preferences, and possibly get more work."
 #~ msgstr ""
 #~ "Podigni sve završene radne jedinice, prijavi sav završen posao, prihvati "
 #~ "najnoviji kredit, prihvati najnovije poruke, i možda dobij još posla."
+
 #~ msgid ""
 #~ "Attach this computer to a BOINC project.  You'll need a project URL and "
 #~ "account key (visit the project's web site to get these)."
 #~ msgstr ""
 #~ "Priključite ovo računalo novom projektu. Trebat će vam URL projekta i "
 #~ "identifikator računa (posjetite web stranicu projekta za ove podatke)."
+
 #~ msgid "Total credit"
 #~ msgstr "Ukupan kredit"
+
 #~ msgid "Avg. credit"
 #~ msgstr "Prosječan kredit"
+
 #~ msgid "Updating all project(s)..."
 #~ msgstr "Ažuriram sve projekte..."
+
 #~ msgid "Allow new work"
 #~ msgstr "Dopusti novi posao"
+
 #~ msgid "Disk Space"
 #~ msgstr "Diskovni prostor"
+
 #~ msgid "Are you sure you want to abort this file transfer '%s'?"
 #~ msgstr "Jeste li sigurni da želite prekinuti prijenos '%s'?"
+
 #~ msgid "Work"
 #~ msgstr "Posao"
+
 #~ msgid "Resuming result..."
 #~ msgstr "Nastavljam rezultat..."
+
 #~ msgid "Abort result"
 #~ msgstr "Obriši rezultat"
+
 #~ msgid "Preempted"
 #~ msgstr "Pauziran"
+
 #~ msgid "Ready to run"
 #~ msgstr "Spreman za obradu"
+
 #~ msgid "About BOINC Manager"
 #~ msgstr "O BOINC menadžeru"
+
 #~ msgid "Dialup Logon"
 #~ msgstr "Modemska prijava"
-
diff --git a/locale/hr/BOINC-Setup.mo b/locale/hr/BOINC-Setup.mo
index 0d620ee..5f76179 100644
Binary files a/locale/hr/BOINC-Setup.mo and b/locale/hr/BOINC-Setup.mo differ
diff --git a/locale/hr/BOINC-Setup.po b/locale/hr/BOINC-Setup.po
index de5e4bd..7b90214 100755
--- a/locale/hr/BOINC-Setup.po
+++ b/locale/hr/BOINC-Setup.po
@@ -4,36 +4,32 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-01-26 00:00-0800\n"
-"PO-Revision-Date: 2015-02-10 23:53-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\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-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: mac_installer\n"
 
 #: Installer.cpp:124
 #, c-format
 msgid "Sorry, this version of %s requires system 10.5 or higher."
 msgstr ""
 
-#: PostInstall.cpp:130
-#: PostInstall.cpp:1136
-#: uninstall.cpp:1618
+#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
 msgid "Yes"
 msgstr ""
 
-#: PostInstall.cpp:131
-#: PostInstall.cpp:1137
-#: uninstall.cpp:1619
+#: PostInstall.cpp:131 PostInstall.cpp:1137 uninstall.cpp:1619
 msgid "No"
 msgstr ""
 
@@ -44,9 +40,11 @@ msgstr ""
 #: PostInstall.cpp:1416
 #, c-format
 msgid ""
-"Users who are permitted to administer this computer will automatically be allowed to run and control %s.\n"
+"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?"
+"Do you also want non-administrative users to be able to run and control %s "
+"on this Mac?"
 msgstr ""
 
 #: PostInstall.cpp:1444
@@ -111,7 +109,8 @@ msgstr ""
 #: uninstall.cpp:840
 #, c-format
 msgid ""
-"Enter your administrator password to completely remove %s from you computer.\n"
+"Enter your administrator password to completely remove %s from you "
+"computer.\n"
 "\n"
 msgstr ""
 
@@ -122,4 +121,3 @@ msgstr ""
 #: uninstall.cpp:1617
 msgid "Continue..."
 msgstr ""
-
diff --git a/locale/hr/BOINC-Web.mo b/locale/hr/BOINC-Web.mo
index 657b7fb..269f51e 100644
Binary files a/locale/hr/BOINC-Web.mo and b/locale/hr/BOINC-Web.mo differ
diff --git a/locale/hr/BOINC-Web.po b/locale/hr/BOINC-Web.po
index 8dbdda9..3dfe322 100755
--- a/locale/hr/BOINC-Web.po
+++ b/locale/hr/BOINC-Web.po
@@ -4,22 +4,22 @@
 # FileID  : $Id$
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\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 23:54-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.2.1\n"
 "X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-SearchPath-0: doc\n"
 "X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
 "X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
 "X-Poedit-KeywordsList: tra\n"
-"X-Poedit-SearchPath-0: doc\n"
 
 #: docutil.php:21
 msgid "Search"
@@ -35,7 +35,9 @@ msgid "This page is %stranslatable%s."
 msgstr ""
 
 #: download.php:39
-msgid "We recommend that you also install VirtualBox, so your computer can work on science projects that require it."
+msgid ""
+"We recommend that you also install VirtualBox, so your computer can work on "
+"science projects that require it."
 msgstr ""
 
 #: download.php:41
@@ -46,14 +48,12 @@ msgstr ""
 msgid "Download BOINC + VirtualBox"
 msgstr ""
 
-#: download.php:54
-#: download.php:69
+#: download.php:54 download.php:69
 #, php-format
 msgid "for %s"
 msgstr ""
 
-#: download.php:57
-#: download.php:72
+#: download.php:57 download.php:72
 #, php-format
 msgid "BOINC version %s"
 msgstr ""
@@ -68,19 +68,28 @@ msgid "Download BOINC"
 msgstr ""
 
 #: download.php:123
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others."
+msgid ""
+"BOINC is a program that lets you donate your idle computer time to science "
+"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, and many others."
 msgstr ""
 
 #: download.php:125
-msgid "After installing BOINC on your computer, you can connect it to as many of these projects as you like."
+msgid ""
+"After installing BOINC on your computer, you can connect it to as many of "
+"these projects as you like."
 msgstr ""
 
 #: download.php:127
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
+msgid ""
+"You may run this software on a computer only if you own the computer or have "
+"the permission of its owner."
 msgstr ""
 
 #: download.php:132
-msgid "We recommend that you download BOINC from the Google Play Store or Amazon Appstore, not from here."
+msgid ""
+"We recommend that you download BOINC from the Google Play Store or Amazon "
+"Appstore, not from here."
 msgstr ""
 
 #: download.php:167
@@ -91,8 +100,7 @@ msgstr ""
 msgid "Release notes"
 msgstr ""
 
-#: download.php:169
-#: index.php:86
+#: download.php:169 index.php:86
 msgid "Help"
 msgstr ""
 
@@ -114,20 +122,34 @@ msgstr ""
 
 #: help.php:12
 #, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
+msgid ""
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who "
+"can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"through the process of installing and using BOINC; %s troubleshoot any "
+"problems you might have."
 msgstr ""
 
 #: help.php:21
 #, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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."
+msgid ""
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. "
+"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 ""
 
 #: help.php:28
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
+msgid ""
+"The best way to get help is by voice, for which you need either built-in "
+"microphone and speakers or an external headset for your computer.  You can "
+"also use Skype's text-based chat system or regular email (if you don't have "
+"Skype) to communicate with Help Volunteers."
 msgstr ""
 
 #: help.php:31
-msgid "Volunteers speaking several languages are available. Please select a language:"
+msgid ""
+"Volunteers speaking several languages are available. Please select a "
+"language:"
 msgstr ""
 
 #: help.php:47
@@ -136,16 +158,22 @@ msgstr ""
 
 #: help.php:50
 #, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
+msgid ""
+"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+"Volunteer%s.  It's a great way to help the cause of scientific research and "
+"volunteer computing - and it's fun!"
 msgstr ""
 
 #: help.php:56
 #, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
+msgid ""
+"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
 msgstr ""
 
 #: help_funcs.php:107
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
+msgid ""
+"BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
+"or the University of California."
 msgstr ""
 
 #: help_funcs.php:110
@@ -196,9 +224,7 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: index.php:87
-#: index.php:120
-#: index.php:171
+#: index.php:87 index.php:120 index.php:171
 msgid "Documentation"
 msgstr ""
 
@@ -211,7 +237,10 @@ msgid "Links"
 msgstr ""
 
 #: index.php:94
-msgid "Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:"
+msgid ""
+"Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure "
+"diseases, study global warming, discover pulsars, and do many other types of "
+"scientific research.  It's safe, secure, and easy:"
 msgstr ""
 
 #: index.php:96
@@ -228,7 +257,9 @@ msgstr ""
 
 #: index.php:102
 #, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
+msgid ""
+"Or, if you run several projects, try an %saccount manager%s such as %"
+"sGridRepublic%s or %sBAM!%s. "
 msgstr ""
 
 #: index.php:118
@@ -240,11 +271,15 @@ msgid "Software updates"
 msgstr ""
 
 #: index.php:128
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving "
+"you the computing power of thousands of CPUs."
 msgstr ""
 
 #: index.php:132
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
 msgstr ""
 
 #: index.php:137
@@ -317,7 +352,8 @@ msgstr ""
 
 #: index.php:217
 #, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
+msgid ""
+"Open-source software for %svolunteer computing%s and %sgrid computing%s."
 msgstr ""
 
 #: index.php:230
@@ -337,7 +373,10 @@ msgid "Seismology"
 msgstr ""
 
 #: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
+msgid ""
+"The Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to Internet-connected computers.  You must buy a "
+"sensor to participate."
 msgstr ""
 
 #: projects.inc:27
@@ -349,23 +388,24 @@ msgid "Environmental research"
 msgstr ""
 
 #: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
+msgid ""
+"This project is creating a free and continuously updated map of radiation "
+"levels by using sensors connected to volunteers' computers.  You must buy a "
+"sensor to participate."
 msgstr ""
 
 #: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
+msgid ""
+"To participate in these projects you must buy a sensor and attach it to your "
+"computer."
 msgstr ""
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
 msgstr ""
 
-#: projects.inc:60
-#: projects.inc:364
-#: projects.inc:408
-#: projects.inc:457
-#: projects.inc:464
-#: projects.inc:511
+#: projects.inc:60 projects.inc:364 projects.inc:408 projects.inc:457
+#: projects.inc:464 projects.inc:511
 msgid "Private"
 msgstr ""
 
@@ -374,7 +414,11 @@ msgid "Artificial intelligence"
 msgstr ""
 
 #: projects.inc:62
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
+msgid ""
+"Parse and convert semantic nets for use in FreeHAL, an artificial "
+"intelligence that uses semantic networks, stemmers, part of speech "
+"databases, and part of speech taggers in order to imitate human behavior in "
+"conversations."
 msgstr ""
 
 #: projects.inc:69
@@ -390,7 +434,12 @@ msgid "Antimalarial drug discovery"
 msgstr ""
 
 #: projects.inc:84
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
+msgid ""
+"The parasite that causes malaria continues to evolve resistance to available "
+"medication. We therefore urgently need to discover new drugs to replace "
+"existing drugs. Importantly, these new drugs need to target NEW proteins in "
+"the parasite. The FightMalaria at Home project is aimed at finding these new "
+"targets."
 msgstr ""
 
 #: projects.inc:90
@@ -402,7 +451,12 @@ msgid "Protein structure prediction"
 msgstr ""
 
 #: projects.inc:92
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
+msgid ""
+"POEM at HOME uses a computational approach to predict the biologically active "
+"structure of proteins, to understand the signal-processing mechanisms when "
+"the proteins interact with one another, to understand diseases related to "
+"protein malfunction or aggregation, and to develop new drugs on the basis of "
+"the three-dimensions structure of biologically important proteins."
 msgstr ""
 
 #: projects.inc:98
@@ -414,7 +468,11 @@ msgid "Study of protein - ligand interactions"
 msgstr ""
 
 #: projects.inc:100
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
+msgid ""
+"Docking at Home has both bioscience and computer science goals. The project "
+"aims to further knowledge of the atomic details of protein-ligand "
+"interactions and, by doing so, will search for insights into the discovery "
+"of novel pharmaceuticals."
 msgstr ""
 
 #: projects.inc:114
@@ -426,7 +484,11 @@ msgid "Molecular simulations of proteins"
 msgstr ""
 
 #: projects.inc:116
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
+msgid ""
+"GPUGrid.net opens novel computational scenarios by the first full-atom "
+"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
+"New biomedical applications suddenly become possible giving a new role to "
+"computational biology for biomedical research."
 msgstr ""
 
 #: projects.inc:122
@@ -438,11 +500,15 @@ msgid "Genetic linkage analysis"
 msgstr ""
 
 #: projects.inc:124
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
+msgid ""
+"Superlink at Technion helps geneticists all over the world find disease-"
+"provoking genes causing some types of diabetes, hypertension (high blood "
+"pressure), cancer, schizophrenia and many others."
 msgstr ""
 
 #: projects.inc:138
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
+msgid ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
 msgstr ""
 
 #: projects.inc:139
@@ -450,7 +516,11 @@ msgid "Life science research"
 msgstr ""
 
 #: projects.inc:140
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
+msgid ""
+"The Lattice Project supplies computing power to scientists at the University "
+"of Maryland studying evolutionary relationships based on DNA sequence data; "
+"bacterial, plasmid, and virus protein sequences; and biological diversity in "
+"nature reserves. "
 msgstr ""
 
 #: projects.inc:146
@@ -462,20 +532,32 @@ msgid "Epidemiology"
 msgstr ""
 
 #: projects.inc:148
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
+msgid ""
+"Simulation models of the transmission dynamics and health effects of malaria "
+"are an important tool for malaria control. They can be used to determine "
+"optimal strategies for delivering mosquito nets, chemotherapy, or new "
+"vaccines which are currently under development and testing.  Such modeling "
+"is extremely computer intensive, requiring simulations of large human "
+"populations with a diverse set of parameters related to biological and "
+"social factors that influence the distribution of the disease. "
 msgstr ""
 
 #: projects.inc:170
 msgid "University of Washington"
 msgstr ""
 
-#: projects.inc:171
-#: projects.inc:179
+#: projects.inc:171 projects.inc:179
 msgid "Biology"
 msgstr ""
 
 #: projects.inc:172
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
+msgid ""
+"Determine the 3-dimensional shapes of proteins in research that may "
+"ultimately lead to finding cures for some major human diseases. By running "
+"Rosetta at home you will help us speed up and extend our research in ways we "
+"couldn't possibly attempt without your help. You will also be helping our "
+"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
+"Cancer, and Alzheimer's"
 msgstr ""
 
 #: projects.inc:178
@@ -483,7 +565,10 @@ msgid "University of Vienna"
 msgstr ""
 
 #: projects.inc:180
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
+msgid ""
+"Calculate similarities between proteins. SIMAP provides a public database of "
+"the resulting data, which plays a key role in many bioinformatics research "
+"projects."
 msgstr ""
 
 #: projects.inc:186
@@ -499,7 +584,15 @@ msgid "Climate study"
 msgstr ""
 
 #: projects.inc:200
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
+msgid ""
+"Investigate the approximations that have to be made in state-of-the-art "
+"climate models. By running the model thousands of times we hope to find out "
+"how the model responds to slight tweaks to these approximations - slight "
+"enough to not make the approximations any less realistic. This will allow us "
+"to improve our understanding of how sensitive our models are to small "
+"changes and also to things like changes in carbon dioxide and the sulphur "
+"cycle. This will allow us to explore how climate may change in the next "
+"century under a wide range of different scenarios."
 msgstr ""
 
 #: projects.inc:207
@@ -511,30 +604,44 @@ msgid "Mechanical engineering"
 msgstr ""
 
 #: projects.inc:214
-msgid "Currently we are calculating the optimum design of a structure call the 52 bar truss"
+msgid ""
+"Currently we are calculating the optimum design of a structure call the 52 "
+"bar truss"
 msgstr ""
 
-#: projects.inc:224
-#: projects.inc:263
-#: projects.inc:271
+#: projects.inc:224 projects.inc:263 projects.inc:271
 msgid "Astronomy"
 msgstr ""
 
 #: projects.inc:225
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
+msgid ""
+"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
+"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
+"Universe. We will measure physical parameters (such as stellar mass surface "
+"density, star formation rate surface density, attenuation, and first-order "
+"star formation history) on a resolved pixel-by-pixel basis using spectral "
+"energy distribution (SED) fitting techniques in a distributed computing mode."
 msgstr ""
 
 #: projects.inc:247
 msgid "University of Texas at Austin"
 msgstr ""
 
-#: projects.inc:248
-#: projects.inc:279
+#: projects.inc:248 projects.inc:279
 msgid "Chemistry"
 msgstr ""
 
 #: projects.inc:249
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
+msgid ""
+"A common problem in theoretical chemistry, condensed matter physics and "
+"materials science is the calculation of the time evolution of an atomic "
+"scale system where, for example, chemical reactions and/or diffusion occur. "
+"Generally the events of interest are quite rare (many orders of magnitude "
+"slower than the vibrational movements of the atoms), and therefore direct "
+"simulations, tracking every movement of the atoms, would take thousands of "
+"years of computer calculations on the fastest present day computer before a "
+"single event of interest can be expected to occur.  Our research group is "
+"interested in calculating the long time dynamics of systems."
 msgstr ""
 
 #: projects.inc:262
@@ -542,7 +649,10 @@ msgid "University of Illinois at Urbana-Champaign"
 msgstr ""
 
 #: projects.inc:264
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
+msgid ""
+"The goal of Cosmology at Home is to search for the model that best describes "
+"our Universe and to find the range of models that agree with the available "
+"astronomical particle physics data."
 msgstr ""
 
 #: projects.inc:270
@@ -550,7 +660,10 @@ msgid "Rensselaer Polytechnic Institute"
 msgstr ""
 
 #: projects.inc:272
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
+msgid ""
+"The goal of Milkyway at Home is to create a highly accurate three dimensional "
+"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
+"Survey."
 msgstr ""
 
 #: projects.inc:278
@@ -558,7 +671,13 @@ msgid "Leiden University, The Netherlands"
 msgstr ""
 
 #: projects.inc:280
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
+msgid ""
+"Surface science calculations using Classical Dynamics.  Leiden Classical "
+"allows volunteers, students and other scientist to submit their personal "
+"calculations to the grid. Each user has his own personal queue for Classical "
+"Dynamics jobs. In this way students have used the grid to simulate liquid "
+"argon, or to test the validity of the ideal gas law by actually doing the "
+"simulations through the grid."
 msgstr ""
 
 #: projects.inc:294
@@ -570,25 +689,36 @@ msgid "Astrophysics"
 msgstr ""
 
 #: projects.inc:296
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
+msgid ""
+"Search for spinning neutron stars (also called pulsars) using data from the "
+"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
+"observatory.  Einstein at Home is a World Year of Physics 2005 project "
+"supported by the American Physical Society (APS) and by a number of "
+"international organizations."
 msgstr ""
 
-#: projects.inc:310
-#: projects.inc:318
+#: projects.inc:310 projects.inc:318
 msgid "CERN (European Organization for Nuclear Research)"
 msgstr ""
 
-#: projects.inc:311
-#: projects.inc:319
+#: projects.inc:311 projects.inc:319
 msgid "Physics"
 msgstr ""
 
 #: projects.inc:312
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
+msgid ""
+"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
+"European Organization for Nuclear Research, the world's largest particle "
+"physics laboratory.  It is the most powerful instrument ever built to "
+"investigate on particles proprieties. LHC at home runs simulations to improve "
+"the design of LHC and its detectors."
 msgstr ""
 
 #: projects.inc:320
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
+msgid ""
+"This project uses CERN-developed virtual machine technology for full-fledged "
+"LHC event physics simulation on volunteer computers.  Requires that you "
+"install VirtualBox on your computer"
 msgstr ""
 
 #: projects.inc:326
@@ -600,7 +730,12 @@ msgid "Astrophysics, astrobiology"
 msgstr ""
 
 #: projects.inc:328
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
+msgid ""
+"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
+"goal is to detect intelligent life outside Earth. One approach, known as "
+"radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
+"signals from space. Such signals are not known to occur naturally, so a "
+"detection would provide evidence of extraterrestrial technology."
 msgstr ""
 
 #: projects.inc:342
@@ -612,7 +747,11 @@ msgid "Chemical engineering and nanotechnology"
 msgstr ""
 
 #: projects.inc:344
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
+msgid ""
+"The study of molecular magnets and controlled nanoscale magnetism.  These "
+"magnetic molecules may be used to develop tiny magnetic switches, with "
+"applications in medicine (such as local tumor chemotherapy) and "
+"biotechnology."
 msgstr ""
 
 #: projects.inc:351
@@ -628,7 +767,10 @@ msgid "Physics, biochemistry, and others"
 msgstr ""
 
 #: projects.inc:358
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
+msgid ""
+"The objective of CAS at home is to encourage and assist scientists in China to "
+"adopt the technologies of volunteer computing and volunteer thinking for "
+"their research."
 msgstr ""
 
 #: projects.inc:365
@@ -636,11 +778,12 @@ msgid "Mathematics, physics, evolution"
 msgstr ""
 
 #: projects.inc:366
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
+msgid ""
+"Yoyo at home is an adapter between BOINC and several existing volunteer "
+"computing projects: ECM, Muon, Evolution at home, and distributed.net"
 msgstr ""
 
-#: projects.inc:371
-#: projects.inc:527
+#: projects.inc:371 projects.inc:527
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 msgstr ""
 
@@ -649,7 +792,11 @@ msgid "European research projects"
 msgstr ""
 
 #: projects.inc:373
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
+msgid ""
+"The EDGeS at Home Beta project integrates volunteer computing into the service "
+"grid network of Europe by allowing service grids to send workunits to be "
+"processed by the volunteers of this project. The scientific projects covered "
+"by the project include math, physics, biology, etc."
 msgstr ""
 
 #: projects.inc:379
@@ -673,7 +820,11 @@ msgid "Medical, environmental and other humanitarian research"
 msgstr ""
 
 #: projects.inc:389
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
+msgid ""
+"To further critical non-profit research on some of humanity's most pressing "
+"problems by creating the world's largest volunteer computing grid.  Research "
+"includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"clean water and many more."
 msgstr ""
 
 #: projects.inc:395
@@ -692,21 +843,18 @@ msgstr ""
 msgid "Simulation of quantum computing; Goldbach's conjecture."
 msgstr ""
 
-#: projects.inc:450
-#: projects.inc:458
+#: projects.inc:450 projects.inc:458
 msgid "Cryptography"
 msgstr ""
 
 #: projects.inc:459
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
+msgid ""
+"Attempt to decode 3 original Enigma messages. The signals were intercepted "
+"in the North Atlantic in 1942 and are believed to be unbroken."
 msgstr ""
 
-#: projects.inc:465
-#: projects.inc:504
-#: projects.inc:512
-#: projects.inc:520
-#: projects.inc:528
-#: projects.inc:568
+#: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
+#: projects.inc:528 projects.inc:568
 msgid "Mathematics"
 msgstr ""
 
@@ -723,11 +871,19 @@ msgid "Factorization of large integers"
 msgstr ""
 
 #: projects.inc:473
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
+msgid ""
+"NFS at Home is a research project that uses Internet-connected computers to do "
+"the lattice sieving step in the Number Field Sieve factorization of large "
+"integers. As a young school student, you gained your first experience at "
+"breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
+"NFS at Home is a continuation of that experience, only with integers that are "
+"hundreds of digits long."
 msgstr ""
 
 #: projects.inc:479
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
+msgid ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
 msgstr ""
 
 #: projects.inc:480
@@ -735,7 +891,11 @@ msgid "Software testing"
 msgstr ""
 
 #: projects.inc:481
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
+msgid ""
+"The aim of this project is to provide a powerful distributed computing "
+"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
+"well as others Lithuanian academic institutions.  Current applications "
+"involve the study of Monte-Carlo based software testing."
 msgstr ""
 
 #: projects.inc:503
@@ -743,11 +903,20 @@ msgid "Mathematical Institute of Leiden University / Kennislink"
 msgstr ""
 
 #: projects.inc:505
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
+msgid ""
+"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
+"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
+"product of the distinct prime factors of n. The ABC conjecture says that "
+"there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for "
+"any real h > 1. The ABC conjecture is currently one of the greatest open "
+"problems in mathematics. If it is proven to be true, a lot of other open "
+"problems can be answered directly from it."
 msgstr ""
 
 #: projects.inc:513
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
+msgid ""
+"Primegrid has multiple projects searching for different forms of very large "
+"prime numbers, including searching for the largest known prime number."
 msgstr ""
 
 #: projects.inc:519
@@ -755,11 +924,15 @@ msgid "Hochschule RheinMain University of Applied Sciences"
 msgstr ""
 
 #: projects.inc:521
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
+msgid ""
+"Search for counterexamples to two conjectures related to the identification "
+"of prime numbers"
 msgstr ""
 
 #: projects.inc:529
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
+msgid ""
+"Find all the generalized binary number systems (in which bases are matrices "
+"and digits are vectors) up to dimension 11."
 msgstr ""
 
 #: ../html/inc/news.inc:40
@@ -775,3 +948,423 @@ msgstr ""
 #~ msgid "POEM at HOME"
 #~ msgstr "Home"
 
+# The charset used for the text in this file (please try to use UTF-8 if possible)
+#~ msgid "CHARSET"
+#~ msgstr "UTF-8"
+
+# The name of this language in this language
+#~ msgid "LANG_NAME_NATIVE"
+#~ msgstr "English"
+
+# The name of this language in an international language (English)
+#~ msgid "LANG_NAME_INTERNATIONAL"
+#~ msgstr "English"
+
+# #######################################
+# poll-related stuff
+# #######################################
+# #######################################
+# poll-related stuff
+#~ msgid "POLL_TITLE"
+#~ msgstr "BOINC user survey"
+
+#~ msgid "POLL_INTRO"
+#~ msgstr ""
+#~ "Several volunteer computing projects, including Climateprediction.net, "
+#~ "Einstein at home, and SETI at home, use software called BOINC. If you "
+#~ "participate in projects like this, we request that you answer the "
+#~ "following questions. This will help BOINC-based projects increase "
+#~ "participation and achieve greater scientific results. <p> Please answer "
+#~ "as many questions as you want, then go to the bottom and click OK. If you "
+#~ "previously completed the survey but your answers have changed, please "
+#~ "complete it again - your new answers will replace the old ones. <p> The "
+#~ "current results of the survey are <a href=poll_results.php>here</a>. "
+
+#~ msgid "POLL_RUN"
+#~ msgstr "Do you run BOINC?"
+
+#~ msgid "POLL_PARTICIPATION"
+#~ msgstr "Your participation"
+
+#~ msgid "POLL_COMPUTERS"
+#~ msgstr "Your computers"
+
+#~ msgid "POLL_YOU"
+#~ msgstr "You"
+
+#~ msgid "POLL_NATIONALITY"
+#~ msgstr "Nationality"
+
+#~ msgid "POLL_COMMENTS"
+#~ msgstr "Comments"
+
+#~ msgid "POLL_COMMENTS_QUESTION"
+#~ msgstr ""
+#~ "Please suggest ways that BOINC, and the projects that use it, could be "
+#~ "improved:"
+
+#~ msgid "POLL_OTHER"
+#~ msgstr "Other:"
+
+#~ msgid "POLL_CHECK_ALL"
+#~ msgstr "[check all that apply]"
+
+#~ msgid "POLL_DONE"
+#~ msgstr "When done click:"
+
+#~ msgid "POLL_CURRENT"
+#~ msgstr "Yes - I have been running BOINC on my computer for..."
+
+#~ msgid "POLL_TWEEK"
+#~ msgstr "less than a week"
+
+#~ msgid "POLL_TMONTH"
+#~ msgstr "less than a month"
+
+#~ msgid "POLL_TYEAR"
+#~ msgstr "less than a year"
+
+#~ msgid "POLL_TMOREYEAR"
+#~ msgstr "more than a year"
+
+#~ msgid "POLL_LAPSED"
+#~ msgstr "No - I was running BOINC, but stopped because..."
+
+#~ msgid "POLL_LINTEREST"
+#~ msgstr "I lost interest"
+
+#~ msgid "POLL_LCOMPLICATED"
+#~ msgstr "it was too complicated"
+
+#~ msgid "POLL_LSTOPPED"
+#~ msgstr "I stopped it and forgot to start again"
+
+#~ msgid "POLL_LPROBLEMS"
+#~ msgstr "it caused problems on my computer"
+
+#~ msgid "POLL_LPOWER"
+#~ msgstr "it used too much electricity"
+
+#~ msgid "POLL_LNONBOINC"
+#~ msgstr "I switched to a non-BOINC computing project"
+
+#~ msgid "POLL_FAILED"
+#~ msgstr "No - I tried running BOINC, but..."
+
+#~ msgid "POLL_FINSTALL"
+#~ msgstr "the software didn't install correctly"
+
+#~ msgid "POLL_FFIGURE"
+#~ msgstr "I couldn't figure out how to use the software"
+
+#~ msgid "POLL_FNETWORK"
+#~ msgstr "I had network communication problems"
+
+#~ msgid "POLL_FATTACH"
+#~ msgstr "I couldn't attach to a project"
+
+#~ msgid "POLL_FWORK"
+#~ msgstr "I attached to a project, but never got any work"
+
+#~ msgid "POLL_NEVER"
+#~ msgstr "No - I never tried running BOINC, because..."
+
+#~ msgid "POLL_NSECURITY"
+#~ msgstr "I was concerned about security"
+
+#~ msgid "POLL_NPROJECT"
+#~ msgstr "I wasn't interested in any of the projects"
+
+#~ msgid "POLL_NPERMISSION"
+#~ msgstr "I don't have permission to run it on my computer"
+
+#~ msgid "POLL_NVERSION"
+#~ msgstr "No version was available for my computer"
+
+#~ msgid "POLL_KIND"
+#~ msgstr "What kind of computers do you have running BOINC?"
+
+#~ msgid "POLL_WHERE"
+#~ msgstr "Where are they?"
+
+#~ msgid "POLL_WORK"
+#~ msgstr "Work"
+
+#~ msgid "POLL_SCHOOL"
+#~ msgstr "School"
+
+#~ msgid "POLL_HOW_MANY"
+#~ msgstr "How many computers?"
+
+#~ msgid "POLL_TURNED_ON"
+#~ msgstr "On average, how many hours per day are they powered on?"
+
+#~ msgid "POLL_AGE"
+#~ msgstr "Age"
+
+#~ msgid "POLL_SEX"
+#~ msgstr "Sex"
+
+#~ msgid "POLL_MALE"
+#~ msgstr "Male"
+
+#~ msgid "POLL_FEMALE"
+#~ msgstr "Female"
+
+#~ msgid "POLL_EXPERTISE"
+#~ msgstr "Your level of computer expertise"
+
+#~ msgid "POLL_LEVB"
+#~ msgstr "Beginner"
+
+#~ msgid "POLL_LEVI"
+#~ msgstr "Intermediate"
+
+#~ msgid "POLL_LEVA"
+#~ msgstr "Advanced"
+
+#~ msgid "POLL_LEARN_WHERE"
+#~ msgstr "Where did you learn about BOINC projects?"
+
+#~ msgid "POLL_WTV"
+#~ msgstr "TV/radio/newspaper"
+
+#~ msgid "POLL_WPERS"
+#~ msgstr "From friends, relatives, or coworkers"
+
+#~ msgid "POLL_WTEAM"
+#~ msgstr "Team message boards or web sites"
+
+#~ msgid "POLL_WBOINC"
+#~ msgstr "The BOINC web site"
+
+#~ msgid "POLL_WWEB"
+#~ msgstr "Other web sites"
+
+#~ msgid "POLL_FACTOR"
+#~ msgstr ""
+#~ "Which are the most important factors when you decide whether to "
+#~ "participate in a BOINC project?"
+
+#~ msgid "POLL_GRAPHICS"
+#~ msgstr "Nice-looking screensaver graphics"
+
+#~ msgid "POLL_CREDIT_FAIR"
+#~ msgstr "Fair and quick granting of credit for work done"
+
+#~ msgid "POLL_CREDIT_MORE"
+#~ msgstr "Getting more credit from this project than from others"
+
+#~ msgid "POLL_MB_FRIENDLY"
+#~ msgstr "Helpful and friendly message boards"
+
+#~ msgid "POLL_MB_STAFF"
+#~ msgstr "Participation by project staff on the message boards"
+
+#~ msgid "POLL_WEB_SITE"
+#~ msgstr "Informative project web site"
+
+#~ msgid "POLL_SCIENCE_IMPORTANT"
+#~ msgstr "The science is important and beneficial"
+
+#~ msgid "POLL_SCIENCE_PUBLIC"
+#~ msgstr "Non-profit, and results are public"
+
+#~ msgid "POLL_RECOGNIZE"
+#~ msgstr "Personal recognition if my computer finds something"
+
+#~ msgid "POLL_PUBLISH"
+#~ msgstr "Publication by the project in scientific journals"
+
+#~ msgid "POLL_EMAIL"
+#~ msgstr "Periodic email newsletters from the project"
+
+#~ msgid "POLL_NPROJECTS"
+#~ msgstr "How many BOINC projects do you participate in?"
+
+#~ msgid "POLL_SSAVER"
+#~ msgstr "Do you run BOINC as a screensaver?"
+
+#~ msgid "POLL_YES"
+#~ msgstr "Yes"
+
+#~ msgid "POLL_NO"
+#~ msgstr "No"
+
+#~ msgid "POLL_MBOARDS"
+#~ msgstr "Your usage of project messages boards:"
+
+#~ msgid "POLL_MBR"
+#~ msgstr "to read information"
+
+#~ msgid "POLL_MBRW"
+#~ msgstr "to read and post information"
+
+#~ msgid "POLL_NONE"
+#~ msgstr "None"
+
+#~ msgid "POLL_HELP"
+#~ msgstr ""
+#~ "Where do you get information to help resolve problems with BOINC and/or "
+#~ "BOINC projects?"
+
+#~ msgid "POLL_HELP_PMB"
+#~ msgstr "The project message boards"
+
+#~ msgid "POLL_HELP_BMB"
+#~ msgstr "The BOINC message boards"
+
+#~ msgid "POLL_HELP_BDOC"
+#~ msgstr "The BOINC web site"
+
+#~ msgid "POLL_HELP_BMLIST"
+#~ msgstr "BOINC mailing lists"
+
+#~ msgid "POLL_HELP_WIKI"
+#~ msgstr "The Unofficial BOINC Wiki"
+
+#~ msgid "POLL_HELP_TEAM"
+#~ msgstr "Team web sites"
+
+#~ msgid "POLL_HELP_GOOGLE"
+#~ msgstr "Google or other search engines"
+
+#~ msgid "POLL_ERROR_TITLE"
+#~ msgstr "Error - results not recorded"
+
+#~ msgid "POLL_ERROR_TEXT"
+#~ msgstr ""
+#~ "An internal error has prevented us from recording your survey response.  "
+#~ "Please try again later."
+
+#~ msgid "POLL_RECORDED"
+#~ msgstr "Survey response recorded"
+
+#~ msgid "POLL_THANKS"
+#~ msgstr "Thank you for completing the BOINC user survey."
+
+#~ msgid "POLL_RESULTS_TITLE"
+#~ msgstr "Survey results"
+
+#~ msgid "POLL_RESULTS_TEXT"
+#~ msgstr ""
+#~ "These are the current results of the <a href=poll.php>BOINC user survey</"
+#~ "a>.  This page is updated every hour."
+
+#~ msgid "DL_MIRRORS"
+#~ msgstr ""
+#~ "Note: files are downloaded from mirror servers at boinc.berkeley.edu, "
+#~ "morel.mit.edu, einstein.aei.mpg.de, einstein.astro.gla.ac.uk, einstein."
+#~ "ligo.caltech.edu, and einstein.aset.psu.edu (thanks to these "
+#~ "institutions). The server is chosen randomly - if a download fails, "
+#~ "reload this page and try again. "
+
+# #############################################
+# help.php
+# #############################################
+#~ msgid "HELP_TITLE"
+#~ msgstr "Getting help with BOINC"
+
+#~ msgid "HELP_HEADING1"
+#~ msgstr "Online Help"
+
+#~ msgid "HELP_P1_1"
+#~ msgstr ""
+#~ "BOINC Online Help lets you talk one-on-one with experienced BOINC users, "
+#~ "who can: %s answer questions about BOINC and volunteer computing; %s walk "
+#~ "you through the process of installing and using BOINC; %s troubleshoot "
+#~ "any problems you might have. "
+
+#~ msgid "HELP_P1_2"
+#~ msgstr ""
+#~ "BOINC Online Help is based on %sSkype%s, an Internet-based telephone "
+#~ "system. 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. "
+
+#~ msgid "HELP_P1_3"
+#~ msgstr ""
+#~ "The best way to get help is by voice, for which you need either built-in "
+#~ "microphone and speakers or an external headset for your computer. You can "
+#~ "also use Skype's text-based chat system or regular email (if you don't "
+#~ "have Skype) to communicate with Help Volunteers."
+
+#~ msgid "HELP_P1_4"
+#~ msgstr ""
+#~ "Volunteers speaking several languages are available. Please select a "
+#~ "language: "
+
+#~ msgid "HELP_HEADING2"
+#~ msgstr "BOINC help on the web"
+
+#~ msgid "HELP_P2_ITEM1"
+#~ msgstr "BOINC user's manual"
+
+#~ msgid "HELP_P2_ITEM2"
+#~ msgstr "Troubleshooting BOINC "
+
+#~ msgid "HELP_P2_ITEM3"
+#~ msgstr "BOINC-related web sites "
+
+#~ msgid "HELP_P2_ITEM4"
+#~ msgstr "The BOINC message boards "
+
+#~ msgid "HELP_P2_ITEM5"
+#~ msgstr "The message boards on any BOINC-based project "
+
+#~ msgid "HELP_HEADING3"
+#~ msgstr "Be a Help Volunteer"
+
+#~ msgid "HELP_P3_1"
+#~ msgstr ""
+#~ "If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+#~ "Volunteer%s. It's a great way to help the cause of scientific research "
+#~ "and volunteer computing - and it's fun!  "
+
+#~ msgid "HELP_P3_2"
+#~ msgstr ""
+#~ "If you're already a Help Volunteer: to edit your settings, %sclick here"
+#~ "%s. "
+
+# #############################################
+# index.php
+# #############################################
+#~ msgid "HOME_HEADING1"
+#~ msgstr "Volunteer"
+
+#~ msgid "HOME_P1"
+#~ msgstr ""
+#~ " Use the idle time on your computer  (Windows, Mac, or Linux)  to cure "
+#~ "diseases, study global warming,  discover pulsars, and do many other "
+#~ "types of scientific research.  It's safe, secure, and easy:  %sChoose%s "
+#~ "projects  %sDownload%s and run BOINC software  %sEnter%s an email address "
+#~ "and password. "
+
+#~ msgid "HOME_P2"
+#~ msgstr ""
+#~ "Or, if you run several projects, try an %saccount manager%s such as "
+#~ "%sGridRepublic%s or %sBAM!%s. "
+
+#~ msgid "HOME_P3"
+#~ msgstr ""
+#~ "If you have any questions, or need help getting started, you can %stalk "
+#~ "to a Volunteer Helper%s. "
+
+#~ msgid "HOME_DOWNLOAD"
+#~ msgstr "Download"
+
+#~ msgid "HOME_WEB_SITES"
+#~ msgstr "Web"
+
+#~ msgid "HOME_ADD_ONS"
+#~ msgstr "Add-ons"
+
+#~ msgid "HOME_SURVEY"
+#~ msgstr "Survey"
+
+#~ msgid "HOME_BOINC"
+#~ msgstr "Berkeley Open Infrastructure for Network Computing"
+
+#~ msgid "HOME_BOINC_DESC"
+#~ msgstr ""
+#~ "Open-source software for %svolunteer computing%s and %sgrid computing%s"
diff --git a/locale/hu/BOINC-Client.mo b/locale/hu/BOINC-Client.mo
index 1050254..6da83a8 100644
Binary files a/locale/hu/BOINC-Client.mo and b/locale/hu/BOINC-Client.mo differ
diff --git a/locale/hu/BOINC-Client.po b/locale/hu/BOINC-Client.po
old mode 100755
new mode 100644
index 89e83a4..819247b
--- a/locale/hu/BOINC-Client.po
+++ b/locale/hu/BOINC-Client.po
@@ -1,24 +1,24 @@
 # 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:
+# Gabor Cseh <csega at mailbox.hu>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: boinc\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-10-15 22:25-0700\n"
-"PO-Revision-Date: 2015-02-11 00:03-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: hu\n"
+"PO-Revision-Date: 2015-02-23 23:14+0000\n"
+"Last-Translator: Gabor Cseh <csega at mailbox.hu>\n"
+"Language-Team: Hungarian (http://www.transifex.com/projects/p/boinc/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-POOTLE-MTIME: 1381310913.0\n"
+"Language: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: acct_mgr.cpp:450
-#: acct_mgr.cpp:459
+#: acct_mgr.cpp:450 acct_mgr.cpp:459
 msgid "Message from account manager"
 msgstr "Üzenet a fiókkezelőtől"
 
@@ -27,12 +27,14 @@ msgid "Message from server"
 msgstr "Üzenet a szervertől"
 
 #: client_state.cpp:258
-msgid "Some tasks need more memory than allowed by your preferences.  Please check the preferences."
-msgstr "Néhány feladatnak a beállításokban engedélyezettnél több memóriára van szüksége. Kérjük, ellenőrizze a beállításokat."
+msgid ""
+"Some tasks need more memory than allowed by your preferences.  Please check "
+"the preferences."
+msgstr "Néhány feladatnak a beállításokban engedélyezettnél több memóriára van szüksége. Kérjük, ellenőrizd a beállításokat."
 
 #: client_state.cpp:520
 msgid "Couldn't write state file; check directory permissions"
-msgstr "Az állapotadatok nem írhatók; kérjük, ellenőrizze a könyvtár jogosultságait"
+msgstr "Az állapotadatok nem írhatók; kérjük, ellenőrizd a könyvtár jogosultságait"
 
 #: cs_cmdline.cpp:303
 msgid "The HTTP_PROXY environment variable must specify an HTTP proxy"
@@ -40,11 +42,12 @@ msgstr "A HTTP_PROXY környezeti változónak egy HTTP proxy-t kell megadnia"
 
 #: cs_scheduler.cpp:613
 #, c-format
-msgid "You used the wrong URL for this project.  When convenient, remove this project, then add %s"
-msgstr "Nem megfelelő URL-t adott meg a projekthez. Távolítsa el ezt a projektet, majd adja hozzá %s-t"
+msgid ""
+"You used the wrong URL for this project.  When convenient, remove this "
+"project, then add %s"
+msgstr "Nem megfelelő URL-t adtál meg a projekthez. Távolítsd el ezt a projektet, majd add hozzá %s-t"
 
-#: cs_statefile.cpp:828
-#: ../sched/sched_types.cpp:259
+#: cs_statefile.cpp:828 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
 msgstr "Szintaktikai hiba az app_info.xml-ben"
 
@@ -56,18 +59,15 @@ msgstr "A hivatkozott fájl nem létezik az app_info.xml-ben:"
 msgid "A new version of BOINC is available."
 msgstr "Új BOINC verzió érhető el."
 
-#: current_version.cpp:94
-#: current_version.cpp:102
+#: current_version.cpp:94 current_version.cpp:102
 msgid "Download"
 msgstr "Letöltés"
 
-#: log_flags.cpp:269
-#: log_flags.cpp:449
+#: log_flags.cpp:269 log_flags.cpp:449
 msgid "Unexpected text in cc_config.xml"
 msgstr "Váratlan szöveg a cc_config.xml fájlban"
 
-#: log_flags.cpp:423
-#: log_flags.cpp:475
+#: log_flags.cpp:423 log_flags.cpp:475
 msgid "Unrecognized tag in cc_config.xml"
 msgstr "Felismerhetetlen címke a cc_config.xml-ben"
 
@@ -81,19 +81,21 @@ msgstr "Hiba a cc_config.xml beállításaiban"
 
 #: log_flags.cpp:483
 msgid "Missing end tag in cc_config.xml"
-msgstr "Hiányzó lezáró címke a cc_config.xml-ben"
+msgstr "Hiányzó lezáró címke a cc_config.xml fájlban"
 
 #: ../sched/handle_request.cpp:307
 msgid "Invalid or missing account key.  To fix, remove and add this project."
-msgstr "Érvénytelen vagy hiányzó fiókkulcs. A hiba kijavításához csatlakoztassa le, majd adja hozzá újra ezt a projektet."
+msgstr "Érvénytelen vagy hiányzó fiókkulcs. A hiba kijavításához csatlakoztasd le, majd add hozzá újra ezt a projektet."
 
 #: ../sched/handle_request.cpp:849
 msgid "Invalid code signing key.  To fix, remove and add this project."
-msgstr "Érvénytelen aláíró kulcs. A hiba kijavításához csatlakozzon le, majd adja hozzá újra ezt a projektet."
+msgstr "Érvénytelen aláíró kulcs. A hiba kijavításához csatlakozz le, majd add hozzá újra ezt a projektet."
 
 #: ../sched/handle_request.cpp:859
-msgid "The project has changed its security key.  Please remove and add this project."
-msgstr "A projekt megváltoztatta a biztonsági kulcsát. Kérjük, csatlakoztassa le, majd adja hozzá újra ezt a projektet."
+msgid ""
+"The project has changed its security key.  Please remove and add this "
+"project."
+msgstr "A projekt megváltoztatta a biztonsági kulcsát. Kérjük, csatlakoztasd le, majd add hozzá újra ezt a projektet."
 
 #: ../sched/handle_request.cpp:943
 msgid "This project doesn't support operating system"
@@ -104,7 +106,8 @@ msgid "This project doesn't support CPU type"
 msgstr "Ez a projekt nem támogatja az alábbi CPU típust"
 
 #: ../sched/handle_request.cpp:993
-msgid "Your BOINC client software is too old.  Please install the current version."
+msgid ""
+"Your BOINC client software is too old.  Please install the current version."
 msgstr "Az Ön BOINC kliens szoftvere túl régi. Kérjük, telepítse a jelenlegi verziót."
 
 #: ../sched/handle_request.cpp:1259
@@ -112,18 +115,21 @@ msgid "This project doesn't support computers of type"
 msgstr "Ez a projekt nem támogatja az alábbí típusú számítógépet"
 
 #: ../sched/sched_send.cpp:1092
-msgid "Upgrade to the latest driver to process tasks using your computer's GPU"
-msgstr "A számítógép GPU-ját használó feladatok futtatásához telepítse a legfrissebb videókártya illesztőprogramot"
+msgid ""
+"Upgrade to the latest driver to process tasks using your computer's GPU"
+msgstr "A számítógép GPU-ját használó feladatok futtatásához telepítsd a legfrissebb videókártya illesztőprogramot"
 
 #: ../sched/sched_send.cpp:1099
-msgid "Upgrade to the latest driver to use all of this project's GPU applications"
-msgstr "Ezen projekt GPU-alkalmazásainak használatához telepítse a legfrissebb videókártya illesztőprogramot"
+msgid ""
+"Upgrade to the latest driver to use all of this project's GPU applications"
+msgstr "E projekt GPU-alkalmazásainak használatához telepítsd a legfrissebb videókártya illesztőprogramot"
 
 #: ../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 GPU-jának használatához a BOINC újabb verziója szükséges; kérjük, telepítse a jelenlegi verziót"
+msgid ""
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to"
+" the current version"
+msgstr "NVIDIA GPU-d használatához a BOINC újabb verziója szükséges; kérjük, telepítsd a jelenlegi verziót"
 
-# 94%
 #: ../sched/sched_send.cpp:1146
 #, c-format
 msgid "An %s GPU is required to run tasks for this project"
@@ -131,20 +137,21 @@ msgstr "%s GPU szükséges a projekt feladatainak futtatásához"
 
 #: ../sched/sched_send.cpp:1262
 msgid "No tasks are available for the applications you have selected."
-msgstr "Az Ön által kiválasztott alkalmazásokhoz nincs elérhető feladat."
+msgstr "Az általad kiválasztott alkalmazásokhoz nincs elérhető feladat."
 
 #: ../sched/sched_send.cpp:1288
 msgid "Your computer type is not supported by this project"
-msgstr "Ez a projekt nem támogatja az ön számítógéptípusát"
+msgstr "Ez a projekt nem támogatja a számítógéptípusodat"
 
 #: ../sched/sched_send.cpp:1294
 msgid "Newer BOINC version required; please install current version"
-msgstr "Újabb BOINC verzió szükséges, töltse le a legfrissebbet"
+msgstr "Újabb BOINC verzió szükséges; kérjük, telepítsd a legfrissebbet"
 
 #: ../sched/sched_send.cpp:1305
 #, c-format
-msgid "Tasks for %s are available, but your preferences are set to not accept them"
-msgstr "%s számára elérhetőek feladatok, de az Ön beállításai miatt nem futtathatók"
+msgid ""
+"Tasks for %s are available, but your preferences are set to not accept them"
+msgstr "%s számára elérhetőek feladatok, de a beállításaid miatt nem futtathatók"
 
 #: ../sched/sched_types.cpp:254
 msgid "Unknown app name in app_info.xml"
@@ -152,44 +159,4 @@ msgstr "Ismeretlen alkalmazásnév az app_info.xml fájlban"
 
 #: ../sched/sched_version.cpp:214
 msgid "Your app_info.xml file doesn't have a usable version of"
-msgstr "Az app_info.xml fájljának nincsen használható verziója erről a projektről:"
-
-#~ msgid "Download it."
-#~ msgstr "Kérjük, töltse le."
-#~ msgid "An NVIDIA or ATI GPU is required to run tasks for this project"
-#~ msgstr "Ezen projekt feladatainak futtatásához NVIDIA vagy ATI GPU szükséges"
-#~ msgid "An NVIDIA GPU is required to run tasks for this project"
-#~ msgstr "Ezen projekt feladatinak futtatásához NVIDIA GPU szükséges"
-#~ msgid "An ATI GPU is required to run tasks for this project"
-#~ msgstr "Ezen projekt feladatainak futtatásához ATI GPU szükséges"
-#~ msgid ""
-#~ "Tasks for NVIDIA GPU are available, but your preferences are set to not "
-#~ "accept them"
-#~ msgstr ""
-#~ "Feladatok elérhetőek NVIDIA GPU-ra, de az Ön beállításai nem teszik lehetővé "
-#~ "az elfogadásukat."
-#~ msgid ""
-#~ "Tasks for ATI GPU are available, but your preferences are set to not accept "
-#~ "them"
-#~ msgstr ""
-#~ "Feladatok elérhetőek ATI GPU-ra, de az Ön beállításai nem teszik lehetővé az "
-#~ "elfogadásukat."
-#~ msgid ""
-#~ "Tasks for CPU are available, but your preferences are set to not accept them"
-#~ msgstr ""
-#~ "Feladatok elérhetőek CPU-ra, de az Ön beállításai nem teszik lehetővé az "
-#~ "elfogadásukat."
-#~ msgid "error"
-#~ msgstr "hiba"
-#~ msgid "Can't resolve hostname in remote_hosts.cfg"
-#~ msgstr ""
-#~ "Nem sikerült feloldani a gazdaszámítógép nevét a remote_host.cfg fájlban"
-#~ msgid "is not available for"
-#~ msgstr "nem érhető el"
-#~ msgid "Notice from BOINC"
-#~ msgstr "Üzenetek a BOINCtól"
-#~ msgid "Message from"
-#~ msgstr "Üzenet ettől:"
-#~ msgid "XML syntax error in"
-#~ msgstr "XML szintaktikai hiba itt:"
-
+msgstr "Az app_info.xml fájlodnak nincsen használható verziója erről a projektről:"
diff --git a/locale/hu/BOINC-Manager.mo b/locale/hu/BOINC-Manager.mo
index 3a38706..39341f0 100644
Binary files a/locale/hu/BOINC-Manager.mo and b/locale/hu/BOINC-Manager.mo differ
diff --git a/locale/hu/BOINC-Manager.po b/locale/hu/BOINC-Manager.po
old mode 100755
new mode 100644
index 58a6e4a..b8f49c0
--- a/locale/hu/BOINC-Manager.po
+++ b/locale/hu/BOINC-Manager.po
@@ -1,64 +1,53 @@
 # 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:
+# Gabor Cseh <csega at mailbox.hu>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: boinc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-15 14:15-0500\n"
-"PO-Revision-Date: 2015-02-11 00:05-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: hu\n"
+"POT-Creation-Date: 2014-02-02 00:00-0800\n"
+"PO-Revision-Date: 2015-02-22 07:59+0000\n"
+"Last-Translator: Gabor Cseh <csega at mailbox.hu>\n"
+"Language-Team: Hungarian (http://www.transifex.com/projects/p/boinc/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc_7.4\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1393082210.0\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-SearchPath-0: clientgui\n"
-"X-Poedit-SearchPath-1: clientgui/msw\n"
-"X-Poedit-SearchPath-2: clientgui/gtk\n"
-"X-Poedit-SearchPath-3: clientgui/mac\n"
-
-# 81%
-#: clientgui/AccountInfoPage.cpp:387
+"Language: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: AccountInfoPage.cpp:387
 #, c-format
 msgid "Identify your account at %s"
-msgstr "Fiókjának azonosítása itt: %s"
+msgstr "Fiókod azonosítása itt: %s"
 
-#: clientgui/AccountInfoPage.cpp:393
+#: AccountInfoPage.cpp:393
 msgid ""
 "Please enter your account information\n"
 "(to create an account, visit the project's web site)"
-msgstr ""
-"Kérjük, adja meg fiókinformációit\n"
-"(fiók létrehozásához keresse fel a projekt weblapját)"
+msgstr "Kérjük, add meg fiókinformációid\n(fiók létrehozásához keresd fel a projekt weblapját)"
 
-#: clientgui/AccountInfoPage.cpp:397
+#: AccountInfoPage.cpp:397
 msgid ""
 "This project is not currently accepting new accounts.\n"
 "You can add it only if you already have an account."
-msgstr ""
-"Ebben a projektben jelenleg nem készíthetők új fiókok.\n"
-"Csak akkor csatlakozhat, ha már van fiókja."
+msgstr "Ebben a projektben jelenleg nem készíthetők új fiókok.\nCsak akkor csatlakozhatsz, ha már van fiókod."
 
-#: clientgui/AccountInfoPage.cpp:401
+#: AccountInfoPage.cpp:401
 msgid "Are you already running this project?"
-msgstr "Már futtatja ezt a projektet?"
+msgstr "Már futtatod ezt a projektet?"
 
-#: clientgui/AccountInfoPage.cpp:405
+#: AccountInfoPage.cpp:405
 msgid "&No, new user"
 msgstr "&Nem, új felhasználó"
 
-#: clientgui/AccountInfoPage.cpp:408
+#: AccountInfoPage.cpp:408
 msgid "&Yes, existing user"
 msgstr "&Igen, létező felhasználó"
 
-#: clientgui/AccountInfoPage.cpp:413
+#: AccountInfoPage.cpp:413
 msgid ""
 "We were not able to set up your account information\n"
 "automatically.\n"
@@ -66,502 +55,469 @@ msgid ""
 "Please click on the 'Find login information' link\n"
 "below to find out what to put in the email address and\n"
 "password fields."
-msgstr ""
-"Az automatikus fiókinformáció-beállítás\n"
-"nem sikerült.\n"
-"\n"
-"Kérjük, kattintson az alábbi 'Bejelentkezési infók keresése'\n"
-"linkre a megfelelő email cím és jelszó\n"
-"információkért."
+msgstr "Az automatikus fiókinformáció-beállítás\nnem sikerült.\n\nKérjük, kattints az alábbi 'Bejelentkezési infók keresése' linkre\na megfelelő email cím és jelszó\ninformációkért."
 
-#: clientgui/AccountInfoPage.cpp:416
+#: AccountInfoPage.cpp:416
 msgid "Find login information"
 msgstr "Bejelentkezési infók keresése"
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:649
+#: AccountInfoPage.cpp:436 AccountInfoPage.cpp:641
 msgid "&Password:"
 msgstr "&Jelszó:"
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:673
+#: AccountInfoPage.cpp:443 AccountInfoPage.cpp:665
 msgid "Choose a &password:"
-msgstr "Válasszon &jelszót:"
+msgstr "Válassz &jelszót:"
 
-#: clientgui/AccountInfoPage.cpp:446
+#: AccountInfoPage.cpp:446
 msgid "C&onfirm password:"
 msgstr "Jelszó &megerősítése:"
 
-#: clientgui/AccountInfoPage.cpp:453
+#: AccountInfoPage.cpp:453
 #, c-format
 msgid "Are you already running %s?"
-msgstr "Már futtatja a(z) %s projektet?"
+msgstr "Már futtatod a(z) %s projektet?"
 
-#: clientgui/AccountInfoPage.cpp:482
+#: AccountInfoPage.cpp:482
 msgid "&Username:"
 msgstr "&Felhasználói név:"
 
-#: clientgui/AccountInfoPage.cpp:511
-msgid "&Email address or LDAP ID:"
-msgstr ""
-
-#: clientgui/AccountInfoPage.cpp:515
+#: AccountInfoPage.cpp:508
 msgid "&Email address:"
 msgstr "&Email cím:"
 
-#: clientgui/AccountInfoPage.cpp:523
+#: AccountInfoPage.cpp:515
 #, c-format
 msgid "minimum length %d"
 msgstr "minimum hossz: %d"
 
-#: clientgui/AccountInfoPage.cpp:530
+#: AccountInfoPage.cpp:522
 msgid "Forgot your password?"
-msgstr "Elfelejtette a jelszavát?"
+msgstr "Elfelejtetted a jelszavad?"
 
-#: clientgui/AccountInfoPage.cpp:537
+#: AccountInfoPage.cpp:529
 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 ""
-"Ha még nem regisztrált erre a fiókkezelőre,\n"
-"kérjük, tegye meg, mielőtt továbbmenne. Kattintson az alábbi\n"
-"linkre a regisztrációhoz, vagy az elfelejtett jelszó visszaszerzéséhez."
+msgstr "Ha még nem regisztrált erre a fiókkezelőre,\nkérjük, tegye meg, mielőtt továbbmenne. Kattintson az alábbi\nlinkre a regisztrációhoz, vagy az elfelejtett jelszó visszaszerzéséhez."
 
-#: clientgui/AccountInfoPage.cpp:540
+#: AccountInfoPage.cpp:532
 msgid "Account manager web site"
 msgstr "A fiókkezelő honlapja"
 
-#: clientgui/AccountInfoPage.cpp:582
+#: AccountInfoPage.cpp:574 WelcomePage.cpp:348
 msgid "Add project"
 msgstr "Projekt hozzáadása"
 
-#: clientgui/AccountInfoPage.cpp:584
+#: AccountInfoPage.cpp:576
 msgid "Update account manager"
 msgstr "Fiókkezelő frissítése"
 
-#: clientgui/AccountInfoPage.cpp:586
+#: AccountInfoPage.cpp:578 WelcomePage.cpp:307 WelcomePage.cpp:321
 msgid "Use account manager"
 msgstr "Fiókkezelő használata"
 
-#: clientgui/AccountInfoPage.cpp:593
+#: AccountInfoPage.cpp:585
 msgid "Please enter a user name."
 msgstr "Kérjük, adjon meg egy felhasználónevet."
 
-#: clientgui/AccountInfoPage.cpp:595
+#: AccountInfoPage.cpp:587
 msgid "Please enter an email address."
 msgstr "Kérjük, adjon meg egy email címet:"
 
-#: clientgui/AccountInfoPage.cpp:605
+#: AccountInfoPage.cpp:597
 #, c-format
 msgid "Please enter a password of at least %d characters."
 msgstr "Kérjük, adjon meg egy legalább %d karakter hosszú jelszót."
 
-#: clientgui/AccountInfoPage.cpp:615
-msgid "The password and confirmation password do not match. Please type them again."
+#: AccountInfoPage.cpp:607
+msgid ""
+"The password and confirmation password do not match. Please type them again."
 msgstr "A jelszó és megerősítése nem egyezik. Kérem, próbálja újra."
 
-#: clientgui/AccountManagerInfoPage.cpp:272
+#: AccountManagerInfoPage.cpp:272
 msgid "Choose an account manager"
 msgstr "Válasszon fiókkezelőt"
 
-#: clientgui/AccountManagerInfoPage.cpp:275
+#: AccountManagerInfoPage.cpp:275
 msgid ""
 "To choose an account manager, click its name or \n"
 "type its URL below."
-msgstr ""
-"Fiókkezelő kiválasztásához kattintson a fiókkezelő nevére\n"
-"vagy gépelje be alább az URL-jét."
+msgstr "Fiókkezelő kiválasztásához kattintson a fiókkezelő nevére\nvagy gépelje be alább az URL-jét."
 
-#: clientgui/AccountManagerInfoPage.cpp:279
+#: AccountManagerInfoPage.cpp:279
 msgid "Account manager details:"
 msgstr "Fiókkezelő részletek:"
 
-#: clientgui/AccountManagerInfoPage.cpp:283
+#: AccountManagerInfoPage.cpp:283
 msgid "Account manager &URL:"
 msgstr "Fiókkezelő &URL-je:"
 
-#: clientgui/AccountManagerInfoPage.cpp:287
+#: AccountManagerInfoPage.cpp:287
 msgid "Open web page"
 msgstr "Weboldal megnyitása"
 
-#: clientgui/AccountManagerInfoPage.cpp:290
+#: AccountManagerInfoPage.cpp:290
 msgid "Visit this account manager's web site"
-msgstr ""
+msgstr "Fiókkezelő honlapjának megtekintése"
 
-#: clientgui/AccountManagerProcessingPage.cpp:186
-#: clientgui/AccountManagerPropertiesPage.cpp:192
+#: AccountManagerProcessingPage.cpp:187 AccountManagerPropertiesPage.cpp:193
 #, c-format
 msgid "Communicating with %s."
-msgstr ""
+msgstr "Kommunikáció ezzel: %s."
 
-#: clientgui/AccountManagerProcessingPage.cpp:193
-#: clientgui/AccountManagerPropertiesPage.cpp:199
+#: AccountManagerProcessingPage.cpp:194 AccountManagerPropertiesPage.cpp:200
 msgid "Communicating with server."
 msgstr "Kommunikáció a szerverrel."
 
-#: clientgui/AccountManagerProcessingPage.cpp:198
-#: clientgui/AccountManagerPropertiesPage.cpp:204
+#: AccountManagerProcessingPage.cpp:199 AccountManagerPropertiesPage.cpp:205
 msgid "Please wait..."
 msgstr "Kérem, várjon..."
 
-#: clientgui/AccountManagerProcessingPage.cpp:325
+#: AccountManagerProcessingPage.cpp:326
 msgid "An internal server error has occurred.\n"
 msgstr "Belső szerverhiba történt.\n"
 
-#: clientgui/AdvancedFrame.cpp:96
+#: AdvancedFrame.cpp:95
 msgid "Connected"
 msgstr "Kapcsolódva"
 
-#: clientgui/AdvancedFrame.cpp:104
+#: AdvancedFrame.cpp:103
 msgid "Disconnected"
 msgstr "Kapcsolat megszakítva"
 
-#: clientgui/AdvancedFrame.cpp:318
+#: AdvancedFrame.cpp:322 sg_BoincSimpleFrame.cpp:119
 #, c-format
 msgid "Close the %s window"
 msgstr "%s ablak bezárása"
 
-#: clientgui/AdvancedFrame.cpp:321
+#: AdvancedFrame.cpp:325 sg_BoincSimpleFrame.cpp:122
 msgid "&Close Window"
 msgstr "&Ablak bezárása"
 
-#: clientgui/AdvancedFrame.cpp:332
-#: clientgui/AdvancedFrame.cpp:339
-#: clientgui/AdvancedFrame.cpp:346
+#: AdvancedFrame.cpp:336 AdvancedFrame.cpp:343 AdvancedFrame.cpp:350
 #, c-format
 msgid "Exit %s"
 msgstr "%s bezárása"
 
-#: clientgui/AdvancedFrame.cpp:359
-msgid "Preferences..."
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:368
+#: AdvancedFrame.cpp:371
 msgid "&Notices\tCtrl+Shift+N"
 msgstr "&Értesítések\tCtrl+Shift+N"
 
-#: clientgui/AdvancedFrame.cpp:369
+#: AdvancedFrame.cpp:372
 msgid "Display notices"
 msgstr "Értesítések megjelenítése"
 
-#: clientgui/AdvancedFrame.cpp:374
+#: AdvancedFrame.cpp:377
 msgid "&Projects\tCtrl+Shift+P"
 msgstr "&Projektek\tCtrl+Shift+P"
 
-#: clientgui/AdvancedFrame.cpp:375
+#: AdvancedFrame.cpp:378
 msgid "Display projects"
 msgstr "Projektek mutatása"
 
-#: clientgui/AdvancedFrame.cpp:380
+#: AdvancedFrame.cpp:383
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr "&Feladatok\tCtrl+Shift+T"
 
-#: clientgui/AdvancedFrame.cpp:381
+#: AdvancedFrame.cpp:384
 msgid "Display tasks"
 msgstr "Feladatok mutatása"
 
-#: clientgui/AdvancedFrame.cpp:386
+#: AdvancedFrame.cpp:389
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr "A&datforgalom\tCtrl+Shift+X"
 
-#: clientgui/AdvancedFrame.cpp:387
+#: AdvancedFrame.cpp:390
 msgid "Display transfers"
 msgstr "Adatforgalom mutatása"
 
-#: clientgui/AdvancedFrame.cpp:392
+#: AdvancedFrame.cpp:395
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "&Statisztika\tCtrl+Shift+S"
 
-#: clientgui/AdvancedFrame.cpp:393
+#: AdvancedFrame.cpp:396
 msgid "Display statistics"
 msgstr "Statisztikák mutatása"
 
-#: clientgui/AdvancedFrame.cpp:398
+#: AdvancedFrame.cpp:401
 msgid "&Disk usage\tCtrl+Shift+D"
 msgstr "&Lemezhasználat\tCtrl+Shift+D"
 
-#: clientgui/AdvancedFrame.cpp:399
+#: AdvancedFrame.cpp:402
 msgid "Display disk usage"
 msgstr "Lemezhasználat mutatása"
 
-#: clientgui/AdvancedFrame.cpp:406
+#: AdvancedFrame.cpp:409
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr "Egyszerű &nézet\tCtrl+Shift+V"
 
-#: clientgui/AdvancedFrame.cpp:407
+#: AdvancedFrame.cpp:410
 msgid "Display the simple graphical interface."
 msgstr "Az egyszerű grafikus felület megjelenítése."
 
-#: clientgui/AdvancedFrame.cpp:421
+#: AdvancedFrame.cpp:424
 msgid "&Add project or account manager..."
 msgstr "&Projekt vagy fiókkezelő hozzáadása"
 
-#: clientgui/AdvancedFrame.cpp:422
+#: AdvancedFrame.cpp:425 sg_ProjectPanel.cpp:76
 msgid "Volunteer for any or all of 30+ projects in many areas of science"
 msgstr "Vegyen részt bármelyikben a több, mint 30 különböző tudományos projektből"
 
-#: clientgui/AdvancedFrame.cpp:426
+#: AdvancedFrame.cpp:429
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "&Szinkronizáció ezzel: %s"
 
-#: clientgui/AdvancedFrame.cpp:430
+#: AdvancedFrame.cpp:433
 #, c-format
 msgid "Get current settings from %s"
 msgstr "Aktuális beállítások betöltése innen: %s"
 
-#: clientgui/AdvancedFrame.cpp:440
+#: AdvancedFrame.cpp:443
 msgid "&Add project..."
 msgstr "&Projekt hozzáadása..."
 
-#: clientgui/AdvancedFrame.cpp:441
+#: AdvancedFrame.cpp:444
 msgid "Add a project"
 msgstr "Projekt hozzáadása"
 
-#: clientgui/AdvancedFrame.cpp:444
+#: AdvancedFrame.cpp:447
 #, c-format
 msgid "S&top using %s..."
 msgstr "%s használatának &befejezése..."
 
-#: clientgui/AdvancedFrame.cpp:450
+#: AdvancedFrame.cpp:453
 msgid "Remove this computer from account manager control."
 msgstr "Számítógép eltávolítása a fiókkezelő felügyelete alól."
 
-#: clientgui/AdvancedFrame.cpp:455
+#: AdvancedFrame.cpp:458 sg_BoincSimpleFrame.cpp:178
 msgid "&Options..."
 msgstr "&Opciók..."
 
-#: clientgui/AdvancedFrame.cpp:456
+#: AdvancedFrame.cpp:459 sg_BoincSimpleFrame.cpp:179
 msgid "Configure display options and proxy settings"
 msgstr "A grafikus megjelentés és a proxy beállítása"
 
-#: clientgui/AdvancedFrame.cpp:460
+#: AdvancedFrame.cpp:463 sg_BoincSimpleFrame.cpp:172
 msgid "Computing &preferences..."
 msgstr "Számítási &beállítások..."
 
-#: clientgui/AdvancedFrame.cpp:461
+#: AdvancedFrame.cpp:464 sg_BoincSimpleFrame.cpp:173
 msgid "Configure computing preferences"
 msgstr "Számítási beállítások konfigurálása"
 
-#: clientgui/AdvancedFrame.cpp:469
+#: AdvancedFrame.cpp:472
 msgid "&Run always"
 msgstr "&Mindig fut"
 
-#: clientgui/AdvancedFrame.cpp:470
+#: AdvancedFrame.cpp:473
 msgid "Allow work regardless of preferences"
 msgstr "Munka engedélyezése a beállítások figyelmen kívül hagyásával"
 
-#: clientgui/AdvancedFrame.cpp:474
+#: AdvancedFrame.cpp:477
 msgid "Run based on &preferences"
 msgstr "&Beállítások szerint fut"
 
-#: clientgui/AdvancedFrame.cpp:475
+#: AdvancedFrame.cpp:478
 msgid "Allow work according to preferences"
 msgstr "Munka engedélyezése a beállítások figyelembevételével"
 
-#: clientgui/AdvancedFrame.cpp:479
+#: AdvancedFrame.cpp:482
 msgid "&Suspend"
 msgstr "&Felfüggeszt"
 
-#: clientgui/AdvancedFrame.cpp:480
+#: AdvancedFrame.cpp:483
 msgid "Stop work regardless of preferences"
 msgstr "Beállítások figyelembe vétele nélkül leáll"
 
-#: clientgui/AdvancedFrame.cpp:505
+#: AdvancedFrame.cpp:508
 msgid "Use GPU always"
 msgstr "GPU használata mindig"
 
-#: clientgui/AdvancedFrame.cpp:506
+#: AdvancedFrame.cpp:509
 msgid "Allow GPU work regardless of preferences"
 msgstr "GPU munka engedélyezése a beállításoktól függetlenül"
 
-#: clientgui/AdvancedFrame.cpp:510
+#: AdvancedFrame.cpp:513
 msgid "Use GPU based on preferences"
 msgstr "A GPU beállítások szerinti használata"
 
-#: clientgui/AdvancedFrame.cpp:511
+#: AdvancedFrame.cpp:514
 msgid "Allow GPU work according to preferences"
 msgstr "GPU munka engedélyezése a beállítások figyelembevételével"
 
-#: clientgui/AdvancedFrame.cpp:515
+#: AdvancedFrame.cpp:518
 msgid "Suspend GPU"
 msgstr "GPU felfüggesztése"
 
-#: clientgui/AdvancedFrame.cpp:516
+#: AdvancedFrame.cpp:519
 msgid "Stop GPU work regardless of preferences"
 msgstr "A GPU munka leállítása a beállításoktól függetlenül"
 
-#: clientgui/AdvancedFrame.cpp:540
+#: AdvancedFrame.cpp:543
 msgid "Network activity always available"
 msgstr "A hálózati forgalom mindig elérhető"
 
-#: clientgui/AdvancedFrame.cpp:541
+#: AdvancedFrame.cpp:544
 msgid "Allow network activity regardless of preferences"
 msgstr "Beállítások mellőzésével a hálózatra kapcsolódhat"
 
-#: clientgui/AdvancedFrame.cpp:545
+#: AdvancedFrame.cpp:548
 msgid "Network activity based on preferences"
 msgstr "Hálózati forgalom a beállítások alapján"
 
-#: clientgui/AdvancedFrame.cpp:546
+#: AdvancedFrame.cpp:549
 msgid "Allow network activity according to preferences"
 msgstr "Hálózati forgalom engedélyezése a beállítások szerint"
 
-#: clientgui/AdvancedFrame.cpp:550
+#: AdvancedFrame.cpp:553
 msgid "Network activity suspended"
 msgstr "Hálózati forgalom felfüggesztve"
 
-#: clientgui/AdvancedFrame.cpp:551
+#: AdvancedFrame.cpp:554
 msgid "Stop BOINC network activity"
 msgstr "BOINC hálózati aktivitásának leállítása"
 
-#: clientgui/AdvancedFrame.cpp:561
+#: AdvancedFrame.cpp:564
 #, c-format
 msgid "Connect to another computer running %s"
 msgstr "Kapcsolódás másik %s -t futtató számítógéphez"
 
-#: clientgui/AdvancedFrame.cpp:566
+#: AdvancedFrame.cpp:569
 msgid "Select computer..."
 msgstr "Számítógép kiválasztása..."
 
-#: clientgui/AdvancedFrame.cpp:571
+#: AdvancedFrame.cpp:574
 msgid "Shut down connected client..."
 msgstr "Kapcsolódott kliens leállítása..."
 
-#: clientgui/AdvancedFrame.cpp:572
+#: AdvancedFrame.cpp:575
 msgid "Shut down the currently connected client"
 msgstr "A jelenleg kapcsolódott kliens leállítása"
 
-#: clientgui/AdvancedFrame.cpp:576
+#: AdvancedFrame.cpp:579
 msgid "Run CPU &benchmarks"
 msgstr "&Sebességmérés futtatása"
 
-#: clientgui/AdvancedFrame.cpp:577
+#: AdvancedFrame.cpp:580
 msgid "Runs BOINC CPU benchmarks"
 msgstr "A BOINC processzor-sebesség mérésének futtatása "
 
-#: clientgui/AdvancedFrame.cpp:581
+#: AdvancedFrame.cpp:584
 msgid "Do network communication"
 msgstr "Hálózati kommunikáció létesítése"
 
-#: clientgui/AdvancedFrame.cpp:582
+#: AdvancedFrame.cpp:585
 msgid "Do all pending network communication"
 msgstr "Minden függőben lévő hálózati kommunikáció folytatása"
 
-# 94%
-#: clientgui/AdvancedFrame.cpp:586
+#: AdvancedFrame.cpp:589
 msgid "Read config files"
 msgstr "Konfigurációs fájlok beolvasása"
 
-#: clientgui/AdvancedFrame.cpp:587
-msgid "Read configuration info from cc_config.xml and any app_config.xml files"
-msgstr ""
+#: AdvancedFrame.cpp:590
+msgid ""
+"Read configuration info from cc_config.xml and any app_config.xml files"
+msgstr "Konfiguráció olvasása a cc_config.xml, és az app_config.xml fájlokból"
 
-#: clientgui/AdvancedFrame.cpp:591
+#: AdvancedFrame.cpp:594
 msgid "Read local prefs file"
 msgstr "Helyi beállításfájl beolvasása"
 
-#: clientgui/AdvancedFrame.cpp:592
+#: AdvancedFrame.cpp:595
 msgid "Read preferences from global_prefs_override.xml."
 msgstr "Beállítások beolvasása a global_prefs_override.xml fájlból."
 
-#: clientgui/AdvancedFrame.cpp:597
+#: AdvancedFrame.cpp:600
 #, c-format
 msgid "Launch another instance of %s..."
 msgstr "A(z) %s másik példányának indítása..."
 
-#: clientgui/AdvancedFrame.cpp:601
+#: AdvancedFrame.cpp:604
 #, c-format
 msgid "Launch another %s"
 msgstr "Másik %s indítása"
 
-#: clientgui/AdvancedFrame.cpp:611
+#: AdvancedFrame.cpp:614
 msgid "Event Log...\tCtrl+Shift+E"
 msgstr "Eseménynapló...\t Ctrl+Shift+E"
 
-#: clientgui/AdvancedFrame.cpp:612
+#: AdvancedFrame.cpp:615
 msgid "Display diagnostic messages."
 msgstr "Diagnosztikai üzenetek mutatása."
 
-#: clientgui/AdvancedFrame.cpp:616
-msgid "Event Log Diagnostic Flags...\tCtrl+Shift+F"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:617
-msgid "Enable or disable various diagnostic messages"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:626
+#: AdvancedFrame.cpp:625 sg_BoincSimpleFrame.cpp:188
 #, c-format
 msgid "%s &help"
 msgstr "%s &segítség"
 
-#: clientgui/AdvancedFrame.cpp:632
+#: AdvancedFrame.cpp:631 sg_BoincSimpleFrame.cpp:194
 #, c-format
 msgid "Show information about %s"
 msgstr "Információk erről: %s"
 
-#: clientgui/AdvancedFrame.cpp:644
+#: AdvancedFrame.cpp:643
 #, c-format
 msgid "&%s help"
 msgstr "&%s segítség"
 
-#: clientgui/AdvancedFrame.cpp:650
+#: AdvancedFrame.cpp:649 sg_BoincSimpleFrame.cpp:212
 #, c-format
 msgid "Show information about the %s"
 msgstr "Információk erről: %s"
 
-#: clientgui/AdvancedFrame.cpp:662
+#: AdvancedFrame.cpp:661 sg_BoincSimpleFrame.cpp:224
 #, c-format
 msgid "%s &web site"
 msgstr "%s &weboldal"
 
-#: clientgui/AdvancedFrame.cpp:668
+#: AdvancedFrame.cpp:667 sg_BoincSimpleFrame.cpp:230
 #, c-format
 msgid "Show information about BOINC and %s"
 msgstr "Információk a BOINC kezelőről és erről: %s"
 
-#: clientgui/AdvancedFrame.cpp:680
-#: clientgui/BOINCTaskBar.cpp:544
+#: AdvancedFrame.cpp:679 BOINCTaskBar.cpp:530 sg_BoincSimpleFrame.cpp:242
 #, c-format
 msgid "&About %s..."
 msgstr "%s &névjegye..."
 
-#: clientgui/AdvancedFrame.cpp:686
+#: AdvancedFrame.cpp:685 sg_BoincSimpleFrame.cpp:248
 msgid "Licensing and copyright information."
 msgstr "Licensz és szerzői jogi információ."
 
-#: clientgui/AdvancedFrame.cpp:693
+#: AdvancedFrame.cpp:692 sg_BoincSimpleFrame.cpp:255
 msgid "&File"
 msgstr "&Fájl"
 
-#: clientgui/AdvancedFrame.cpp:697
+#: AdvancedFrame.cpp:696 sg_BoincSimpleFrame.cpp:259
 msgid "&View"
 msgstr "&Nézet"
 
-#: clientgui/AdvancedFrame.cpp:701
+#: AdvancedFrame.cpp:700 sg_BoincSimpleFrame.cpp:263
 msgid "&Tools"
 msgstr "&Eszközök"
 
-#: clientgui/AdvancedFrame.cpp:705
+#: AdvancedFrame.cpp:704
 msgid "&Activity"
 msgstr "&Aktivitás"
 
-#: clientgui/AdvancedFrame.cpp:709
+#: AdvancedFrame.cpp:708
 msgid "A&dvanced"
 msgstr "&Haladó"
 
-#: clientgui/AdvancedFrame.cpp:713
+#: AdvancedFrame.cpp:712 DlgEventLog.cpp:332 sg_BoincSimpleFrame.cpp:267
+#: wizardex.cpp:374 wizardex.cpp:381
 msgid "&Help"
 msgstr "&Segítség"
 
-#: clientgui/AdvancedFrame.cpp:1185
+#: AdvancedFrame.cpp:1199
 #, c-format
 msgid "%s - Stop using %s"
 msgstr "%s - %s használatának befejezése"
 
-#: clientgui/AdvancedFrame.cpp:1190
+#: AdvancedFrame.cpp:1204
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -569,180 +525,154 @@ msgid ""
 "but you'll have to manage projects manually.\n"
 "\n"
 "Do you want to stop using %s?"
-msgstr ""
-"Ha befejezi %s használatát,\n"
-"azzal bár megtartja jelenlegi projektjeit,\n"
-"de csak manuálisan tudja kezelni azokat.\n"
-"\n"
-"Biztosan befejezi %s használatát?"
+msgstr "Ha befejezi %s használatát,\nazzal bár megtartja jelenlegi projektjeit,\nde csak manuálisan tudja kezelni azokat.\n\nBiztosan befejezi %s használatát?"
 
-#: clientgui/AdvancedFrame.cpp:1397
+#: AdvancedFrame.cpp:1401
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s - A jelenlegi kliens leállítása..."
 
-#: clientgui/AdvancedFrame.cpp:1406
+#: AdvancedFrame.cpp:1410
 #, c-format
 msgid ""
 "%s will shut down the current client\n"
 "and prompt you for another host to connect to."
-msgstr ""
-"%s leállítja a jelenleg kapcsolódott klienst,\n"
-"és javasol Önnek egy másik klienst, amihez csatlakozhat."
+msgstr "%s le fogja állítani az aktuális klienst\nés bekéri tőled egy másik gazdagép adatait."
 
-#: clientgui/AdvancedFrame.cpp:1806
+#: AdvancedFrame.cpp:1745 DlgAbout.cpp:119
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: clientgui/AdvancedFrame.cpp:1815
+#: AdvancedFrame.cpp:1754
 #, c-format
 msgid "%s has successfully added %s"
 msgstr "%s sikeresen hozzáadva ehhez: %s"
 
-#: clientgui/AdvancedFrame.cpp:1953
+#: AdvancedFrame.cpp:1893
 #, c-format
 msgid "%s - (%s)"
 msgstr "%s - (%s)"
 
-#: clientgui/AdvancedFrame.cpp:1957
+#: AdvancedFrame.cpp:1897
 #, c-format
 msgid "Connecting to %s"
 msgstr "Kapcsolódás %s-hoz"
 
-#: clientgui/AdvancedFrame.cpp:1960
+#: AdvancedFrame.cpp:1900
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "Kapcsolódva ehhez: %s (%s)"
 
-#: clientgui/AlreadyExistsPage.cpp:184
+#: AlreadyExistsPage.cpp:184
 msgid "Username already in use"
 msgstr "Már létezik ilyen felhasználói név"
 
-#: clientgui/AlreadyExistsPage.cpp:187
+#: AlreadyExistsPage.cpp:187
 msgid ""
 "An account with that username already exists and has a\n"
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"Már létezik fiók ezzel az email címmel, de a hozzá\n"
-"tartozó jelszó nem egyezik az Ön által megadottal.\n"
-"\n"
-"Kérem, látogasson el a projekt weboldalára, és kövesse az ott leírt teendőket."
+msgstr "Már létezik fiók ezzel az email címmel, de a hozzá\ntartozó jelszó nem egyezik az Ön által megadottal.\n\nKérem, látogasson el a projekt weboldalára, és kövesse az ott leírt teendőket."
 
-#: clientgui/AlreadyExistsPage.cpp:191
+#: AlreadyExistsPage.cpp:191
 msgid "Email address already in use"
 msgstr "Az email cím már foglalt."
 
-#: clientgui/AlreadyExistsPage.cpp:194
+#: AlreadyExistsPage.cpp:194
 msgid ""
 "An account with that email address already exists and has a\n"
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"Egy fiók már létezik ezzel az email címmel, de a hozzá\n"
-"tartozó jelszó nem egyezik az Ön által megadottal.\n"
-"\n"
-"Kérem, látogasson el a projekt weboldalára, és kövesse az ott leírt teendőket."
+msgstr "Egy fiók már létezik ezzel az email címmel, de a hozzá\ntartozó jelszó nem egyezik az Ön által megadottal.\n\nKérem, látogasson el a projekt weboldalára, és kövesse az ott leírt teendőket."
 
-#: clientgui/AsyncRPC.cpp:1031
+#: AsyncRPC.cpp:1031
 msgid "Communicating with BOINC client.  Please wait ..."
 msgstr "Kommunikáció a BOINC klienssel. Kérem, várjon..."
 
-#: clientgui/AsyncRPC.cpp:1034
+#: AsyncRPC.cpp:1034
 #, c-format
 msgid "&Quit %s"
 msgstr "%s &bezárása"
 
-#: clientgui/AsyncRPC.cpp:1036
+#: AsyncRPC.cpp:1036
 #, c-format
 msgid "E&xit %s"
 msgstr "%s &bezárása"
 
-#: clientgui/AsyncRPC.cpp:1040
+#: AsyncRPC.cpp:1040
 #, c-format
 msgid "%s - Communication"
 msgstr "%s - Kommunikáció"
 
-#: clientgui/AsyncRPC.cpp:1056
+#: AsyncRPC.cpp:1056 DlgAdvPreferencesBase.cpp:107 sg_DlgPreferences.cpp:433
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: clientgui/BOINCBaseFrame.cpp:504
+#: BOINCBaseFrame.cpp:505
 #, c-format
 msgid "%s - Connection Error"
 msgstr "%s - Hiba a kapcsolatban"
 
-#: clientgui/BOINCBaseFrame.cpp:513
+#: BOINCBaseFrame.cpp:514
 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 ""
-"Jelenleg nincs jogosultsága a kliens kezelésére.\n"
-"Kérjük, lépjen kapcsolatba a rendszergazdával és kérje meg, hogy adja hozzá a\n"
-" 'boinc_users' helyi felhasználói csoporthoz."
+msgstr "Jelenleg nincs jogosultsága a kliens kezelésére.\nKérjük, lépjen kapcsolatba a rendszergazdával és kérje meg, hogy adja hozzá a\n 'boinc_users' helyi felhasználói csoporthoz."
 
-#: clientgui/BOINCBaseFrame.cpp:522
+#: BOINCBaseFrame.cpp:523
 msgid ""
 "Authorization failed connecting to running client.\n"
 "Make sure you start this program in the same directory as the client."
-msgstr ""
-"Az engedélyezés sikertelen a futó klienshez való csatlakozáskor.\n"
-"Kérjük győződjön meg róla, hogy ezt a programot ugyanabban a könyvtárban indította, mint a klienst."
+msgstr "Az engedélyezés sikertelen a futó klienshez való csatlakozáskor.\nKérjük győződjön meg róla, hogy ezt a programot ugyanabban a könyvtárban indította, mint a klienst."
 
-#: clientgui/BOINCBaseFrame.cpp:524
+#: BOINCBaseFrame.cpp:525
 msgid "Authorization failed connecting to running client."
 msgstr "Az engedélyezés sikertelen a futó klienshez való csatlakozáskor."
 
-#: clientgui/BOINCBaseFrame.cpp:532
+#: BOINCBaseFrame.cpp:533
 msgid "The password you have provided is incorrect, please try again."
 msgstr "A megadott jelszó hibás, kérem próbálja újra."
 
-#: clientgui/BOINCBaseFrame.cpp:576
+#: BOINCBaseFrame.cpp:577
 #, c-format
 msgid "%s - Connection Failed"
 msgstr "%s - A kapcsolódás sikertelen"
 
-#: clientgui/BOINCBaseFrame.cpp:585
+#: BOINCBaseFrame.cpp:586
 #, c-format
 msgid ""
 "%s is not able to connect to a %s client.\n"
 "Would you like to try to connect again?"
-msgstr ""
-"%s nem tud kapcsolódni egy %s klienshez.\n"
-"Megpróbál újra kapcsolódni?"
+msgstr "%s nem tud kapcsolódni egy %s klienshez.\nMegpróbál újra kapcsolódni?"
 
-#: clientgui/BOINCBaseFrame.cpp:621
+#: BOINCBaseFrame.cpp:622
 #, c-format
 msgid "%s - Daemon Start Failed"
 msgstr "%s - A kiszolgáló indítása sikertelen"
 
-#: clientgui/BOINCBaseFrame.cpp:631
+#: BOINCBaseFrame.cpp:632
 #, 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 nem tud egy %s klienst elindítani.\n"
-"Kérjük, navigáljon a Vezérlőpult->Felügyeleti eszközök->Szolgáltatások helyre és indítsa el a  BOINC szolgáltatást."
+msgstr "%s nem tud egy %s klienst elindítani.\nKérjük, navigáljon a Vezérlőpult->Felügyeleti eszközök->Szolgáltatások helyre és indítsa el a  BOINC szolgáltatást."
 
-#: clientgui/BOINCBaseFrame.cpp:637
+#: BOINCBaseFrame.cpp:638
 #, c-format
 msgid ""
 "%s is not able to start a %s client.\n"
 "Please start the daemon and try again."
-msgstr ""
-"%s nem tud elindítani egy %s klienst.\n"
-"Kérjük, indítsa el a kiszolgálót és próbálja újra."
+msgstr "%s nem tud elindítani egy %s klienst.\nKérjük, indítsa el a kiszolgálót és próbálja újra."
 
-#: clientgui/BOINCBaseFrame.cpp:688
+#: BOINCBaseFrame.cpp:689
 #, c-format
 msgid "%s - Connection Status"
 msgstr "%s - A kapcsolat állapota"
 
-#: clientgui/BOINCBaseFrame.cpp:699
+#: BOINCBaseFrame.cpp:700
 #, c-format
 msgid ""
 "%s is not currently connected to a %s client.\n"
@@ -750,73 +680,67 @@ msgid ""
 "To connect up to your local computer please use 'localhost' as the host name."
 msgstr "%s jelenleg nem kapcsolódik egy %s klienshez sem.Kérjük, használja a 'Haladó\\Számítógép kiválasztása...' menüpontot egy %s klienshez való csatlakozáshoz.A helyi számítógép csatlakoztatásához a számítógépnév megadásánál használja a 'localhost' kifejezést."
 
-#: clientgui/BOINCBaseView.cpp:752
+#: BOINCBaseView.cpp:779
 msgid "Project web pages"
 msgstr "A projekt weboldalai"
 
-#: clientgui/BOINCClientManager.cpp:573
+#: BOINCClientManager.cpp:575
 #, c-format
 msgid "%s - Unexpected Exit"
 msgstr "%s - Váratlan kilépés"
 
-#: clientgui/BOINCClientManager.cpp:583
+#: BOINCClientManager.cpp:585
 #, 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 ""
-"A %s kliens 3 alkalommal is váratlanul kilépett az utóbbi %d percben.\n"
-"Szeretné megint újraindítani?"
+msgstr "A %s kliens 3 alkalommal is váratlanul kilépett az utóbbi %d percben.\nSzeretné megint újraindítani?"
 
-#: clientgui/BOINCDialupManager.cpp:61
+#: BOINCDialupManager.cpp:61
 #, c-format
 msgid "%s - Network Status"
 msgstr "%s - Hálózati Állapot"
 
-#: clientgui/BOINCDialupManager.cpp:241
+#: BOINCDialupManager.cpp:241
 #, c-format
 msgid ""
 "%s needs to connect to the Internet.\n"
 "May it do so now?"
-msgstr ""
-"A következőnek internetkapcsolatra van szüksége: %s.\n"
-"Csatlakozzon most?"
+msgstr "A következőnek internetkapcsolatra van szüksége: %s.\nCsatlakozzon most?"
 
-#: clientgui/BOINCDialupManager.cpp:254
+#: BOINCDialupManager.cpp:254
 #, c-format
 msgid "%s is connecting to the Internet."
 msgstr "%s kapcsolódik az internetre."
 
-#: clientgui/BOINCDialupManager.cpp:303
+#: BOINCDialupManager.cpp:303
 #, c-format
 msgid "%s has successfully connected to the Internet."
 msgstr "%s sikeresen kapcsolódott az internetre."
 
-#: clientgui/BOINCDialupManager.cpp:331
+#: BOINCDialupManager.cpp:331
 #, c-format
 msgid "%s failed to connect to the Internet."
 msgstr "%s nem tudott az internetre kapcsolódni."
 
-#: clientgui/BOINCDialupManager.cpp:372
+#: 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 érzékelte, hogy kapcsolódott az internetre.\n"
-"Minden projekt frissítése, és az átvitelek újrapróbálása."
+msgstr "%s érzékelte, hogy kapcsolódott az internetre.\nMinden projekt frissítése, és az átvitelek újrapróbálása."
 
-#: clientgui/BOINCDialupManager.cpp:417
+#: BOINCDialupManager.cpp:417
 #, c-format
 msgid "%s has successfully disconnected from the Internet."
 msgstr "%s sikeresen lekapcsolódott az internetről."
 
-#: clientgui/BOINCDialupManager.cpp:433
+#: BOINCDialupManager.cpp:433
 #, c-format
 msgid "%s failed to disconnected from the Internet."
 msgstr "%s nem tudott lekapcsolódni az internetről."
 
-#: clientgui/BOINCGUIApp.cpp:595
+#: BOINCGUIApp.cpp:339
 #, c-format
 msgid ""
 "You currently are not authorized to manage the client.\n"
@@ -827,861 +751,798 @@ msgid ""
 " or\n"
 "  - contact your administrator to add you to the 'boinc_master'\n"
 "     user group."
-msgstr ""
-"Jelenleg nem jogosult a kliens kezelésére.\n"
-"\n"
-"%s használata ezzel a felhasználóval:\n"
-"- telepítse újra %s-t és válaszoljon \"Igen\"-nel a\n"
-"nem adminisztratív felhasználóra vonatkozó kérdésre\n"
-"vagy\n"
-"- lépjen kapcsolatba a rendszergazdával és kérje meg, hogy adja hozzá a\n"
-"'boinc_master' felhasználói csoporthoz."
-
-#: clientgui/BOINCGUIApp.cpp:601
+msgstr "Jelenleg nem jogosult a kliens kezelésére.\n\n%s használata ezzel a felhasználóval:\n- telepítse újra %s-t és válaszoljon \"Igen\"-nel a\nnem adminisztratív felhasználóra vonatkozó kérdésre\nvagy\n- lépjen kapcsolatba a rendszergazdával és kérje meg, hogy adja hozzá a\n'boinc_master' felhasználói csoporthoz."
+
+#: BOINCGUIApp.cpp:345
 #, c-format
 msgid ""
 "%s ownership or permissions are not set properly; please reinstall %s.\n"
 "(Error code %d"
-msgstr ""
-"A(z) %s tulajdonosi és hozzáférési jogai nincsenek megfelelően beállítva; kérjük, telepítse újra a(z) %s-t.\n"
-"(Hibakód %d"
+msgstr "A(z) %s tulajdonosi és hozzáférési jogai nincsenek megfelelően beállítva; kérjük, telepítse újra a(z) %s-t.\n(Hibakód %d"
 
-#: clientgui/BOINCGUIApp.cpp:607
+#: BOINCGUIApp.cpp:351
 msgid " at "
 msgstr "itt:"
 
-#: clientgui/BOINCGUIApp.cpp:610
+#: BOINCGUIApp.cpp:354 MainDocument.cpp:2484 MainDocument.cpp:2534
+#: MainDocument.cpp:2554 ViewTransfers.cpp:803
 msgid ")"
 msgstr ")"
 
-#: clientgui/BOINCGUIApp.cpp:640
+#: BOINCGUIApp.cpp:384
 msgid ""
 "A reboot is required in order for BOINC to run properly.\n"
 "Please reboot your computer and try again."
-msgstr ""
-"A BOINC megfelelő futásához újraindítás szükséges.\n"
-"Kérjük, indítsa újra a számítógépét, majd próbálja újra."
+msgstr "A BOINC megfelelő futásához újraindítás szükséges.\nKérjük, indítsa újra a számítógépét, majd próbálja újra."
 
-#: clientgui/BOINCGUIApp.cpp:641
+#: BOINCGUIApp.cpp:385 DlgAbout.cpp:153
 msgid "BOINC Manager"
 msgstr "BOINC Kezelő"
 
-#: clientgui/BOINCGUIApp.cpp:902
+#: BOINCGUIApp.cpp:572
 msgid "BOINC Manager was started by the operating system automatically"
 msgstr "A BOINC Kezelőt az operációs rendszer automatikusan indította"
 
-#: clientgui/BOINCGUIApp.cpp:904
+#: BOINCGUIApp.cpp:574
 msgid "Startup BOINC so only the system tray icon is visible"
 msgstr "A BOINC csak tálcaikonként történő indítása"
 
-#: clientgui/BOINCGUIApp.cpp:906
+#: BOINCGUIApp.cpp:576
 msgid "Directory containing the BOINC Client executable"
 msgstr "A futtatható BOINC Klienst tartalmazó könyvtár"
 
-#: clientgui/BOINCGUIApp.cpp:907
+#: BOINCGUIApp.cpp:577
 msgid "BOINC data directory"
 msgstr "BOINC adatkönyvtár"
 
-#: clientgui/BOINCGUIApp.cpp:909
+#: BOINCGUIApp.cpp:579
 msgid "Host name or IP address"
 msgstr "Hostnév vagy IP cím"
 
-#: clientgui/BOINCGUIApp.cpp:910
+#: BOINCGUIApp.cpp:580
 msgid "GUI RPC port number"
 msgstr "GUI RPC portszám"
 
-#: clientgui/BOINCGUIApp.cpp:911
+#: BOINCGUIApp.cpp:581
 msgid "Password"
 msgstr "Jelszó"
 
-#: clientgui/BOINCGUIApp.cpp:912
+#: BOINCGUIApp.cpp:582
 msgid "Startup BOINC with these optional arguments"
 msgstr "A BOINC indítása a következő opcionális lehetőségekkel"
 
-#: clientgui/BOINCGUIApp.cpp:913
+#: BOINCGUIApp.cpp:583
 msgid "disable BOINC security users and permissions"
 msgstr "BOINC biztonsági felhasználók és hozzáférések kikapcsolása"
 
-#: clientgui/BOINCGUIApp.cpp:914
+#: BOINCGUIApp.cpp:584
 msgid "set skin debugging mode to enable skin manager error messages"
 msgstr "kinézet hibakereső mód beállítása, ezzel a kinézetkezelő hibaüzeneteinek engedélyezése"
 
-#: clientgui/BOINCGUIApp.cpp:915
+#: BOINCGUIApp.cpp:585
 msgid "multiple instances of BOINC Manager allowed"
 msgstr "a BOINC Kezelő több példányának futása engedélyezett"
 
-#: clientgui/BOINCGUIApp.cpp:917
+#: BOINCGUIApp.cpp:587
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr "Nem használt: az XCode 4.2-ben található megoldás a hibára"
 
-#: clientgui/BOINCGUIApp.cpp:1164
+#: BOINCGUIApp.cpp:814
 msgid "(Automatic Detection)"
 msgstr "(Automatikus felismerés)"
 
-#: clientgui/BOINCGUIApp.cpp:1165
+#: BOINCGUIApp.cpp:815
 msgid "(Unknown)"
 msgstr "(Ismeretlen)"
 
-#: clientgui/BOINCGUIApp.cpp:1166
+#: BOINCGUIApp.cpp:816
 msgid "(User Defined)"
 msgstr "(Felhasználó által megadott)"
 
-#: clientgui/BOINCTaskBar.cpp:522
+#: BOINCTaskBar.cpp:508
 #, c-format
 msgid "Open %s Web..."
 msgstr "%s megnyitása a Weben..."
 
-#: clientgui/BOINCTaskBar.cpp:529
+#: BOINCTaskBar.cpp:515
 #, c-format
 msgid "Open %s..."
 msgstr "%s megnyitása"
 
-#: clientgui/BOINCTaskBar.cpp:536
-#: clientgui/BOINCTaskBar.cpp:633
-#: clientgui/BOINCTaskBar.cpp:641
+#: BOINCTaskBar.cpp:522 BOINCTaskBar.cpp:619 BOINCTaskBar.cpp:627
 msgid "Snooze"
 msgstr "Szundi"
 
-#: clientgui/BOINCTaskBar.cpp:538
-#: clientgui/BOINCTaskBar.cpp:660
-#: clientgui/BOINCTaskBar.cpp:668
+#: BOINCTaskBar.cpp:524 BOINCTaskBar.cpp:646 BOINCTaskBar.cpp:654
 msgid "Snooze GPU"
 msgstr "GPU szundi"
 
-#: clientgui/BOINCTaskBar.cpp:556
+#: BOINCTaskBar.cpp:542
 msgid "E&xit"
 msgstr "K&ilépés"
 
-#: clientgui/BOINCTaskBar.cpp:626
+#: BOINCTaskBar.cpp:612 ViewProjects.cpp:718 ViewWork.cpp:795
+#: sg_BoincSimpleFrame.cpp:758 sg_ProjectCommandPopup.cpp:110
+#: sg_TaskCommandPopup.cpp:102
 msgid "Resume"
 msgstr "Folytatás"
 
-#: clientgui/BOINCTaskBar.cpp:653
+#: BOINCTaskBar.cpp:639
 msgid "Resume GPU"
 msgstr "GPU folytatása"
 
-#: clientgui/BOINCTaskBar.cpp:727
+#: BOINCTaskBar.cpp:713
 msgid "Computing is enabled"
 msgstr "Számítás engedélyezve"
 
-#: clientgui/BOINCTaskBar.cpp:731
+#: BOINCTaskBar.cpp:717
 msgid "Computing is suspended - "
 msgstr "Számítás felfüggesztve -"
 
-#: clientgui/BOINCTaskBar.cpp:741
+#: BOINCTaskBar.cpp:727
 msgid "GPU computing is enabled"
 msgstr "GPU számítás engedélyezve"
 
-#: clientgui/BOINCTaskBar.cpp:744
+#: BOINCTaskBar.cpp:730
 msgid "GPU computing is suspended - "
 msgstr "GPU számítás felfüggesztve -"
 
-#: clientgui/BOINCTaskBar.cpp:753
+#: BOINCTaskBar.cpp:739
 msgid "Network is enabled"
 msgstr "Hálózati forgalom engedélyezve"
 
-#: clientgui/BOINCTaskBar.cpp:756
+#: BOINCTaskBar.cpp:742
 msgid "Network is suspended - "
 msgstr "Hálózati forgalom felfüggesztve -"
 
-#: clientgui/BOINCTaskBar.cpp:764
+#: BOINCTaskBar.cpp:750
 msgid "Reconnecting to client."
 msgstr "Újracsatlakozás a klienshez."
 
-#: clientgui/BOINCTaskBar.cpp:766
+#: BOINCTaskBar.cpp:752
 msgid "Not connected to a client."
 msgstr "Nincs kapcsolódva a klienshez."
 
-#: clientgui/BOINCTaskBar.cpp:819
+#: BOINCTaskBar.cpp:805
 #, c-format
 msgid "%s Notices"
 msgstr "%s Megjegyzések"
 
-#: clientgui/BOINCTaskBar.cpp:825
+#: BOINCTaskBar.cpp:811
 msgid "There are new notices - click to view."
 msgstr "Új üzenetek érkeztek - kattintson a megtekintésükhöz."
 
-#: clientgui/CompletionErrorPage.cpp:199
+#: CompletionErrorPage.cpp:199
 msgid "Failed to add project"
 msgstr "Projekt hozzáadása sikertelen"
 
-#: clientgui/CompletionErrorPage.cpp:204
+#: CompletionErrorPage.cpp:204
 msgid "Failed to update account manager"
 msgstr "A fiókkezelő frissítése sikertelen"
 
-#: clientgui/CompletionErrorPage.cpp:208
+#: CompletionErrorPage.cpp:208
 msgid "Failed to remove account manager"
 msgstr "A fiókkezelő eltávolítása sikertelen"
 
-#: clientgui/CompletionErrorPage.cpp:212
+#: CompletionErrorPage.cpp:212
 msgid "Failed to add account manager"
 msgstr "A fiókkezelő hozzáadása sikertelen"
 
-#: clientgui/CompletionErrorPage.cpp:221
+#: CompletionErrorPage.cpp:221
 msgid ""
 "Please try again later.\n"
 "\n"
 "Click Finish to close."
-msgstr ""
+msgstr "Kérjük, próbáld újra később.\n\nKattints a Befejezésre a bezáráshoz."
 
-#: clientgui/CompletionErrorPage.cpp:225
-#: clientgui/CompletionPage.cpp:222
-#: clientgui/CompletionPage.cpp:242
-#: clientgui/CompletionPage.cpp:273
+#: CompletionErrorPage.cpp:225 CompletionPage.cpp:222 CompletionPage.cpp:242
+#: CompletionPage.cpp:273
 msgid "Click Finish to close."
 msgstr "A bezáráshoz kattintson a Befejez gombra"
 
-#: clientgui/CompletionErrorPage.cpp:234
+#: CompletionErrorPage.cpp:234
 msgid "Messages from server:"
 msgstr "Üzenetek a szervertől:"
 
-#: clientgui/CompletionPage.cpp:207
+#: CompletionPage.cpp:207
 msgid "Project added"
 msgstr "Projekt hozzáadva"
 
-#: clientgui/CompletionPage.cpp:213
+#: CompletionPage.cpp:213
 msgid "This project has been successfully added."
 msgstr "A projektet sikeresen hozzáadtuk."
 
-#: clientgui/CompletionPage.cpp:218
+#: 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 ""
-"Ha a Befejez gombra kattint, akkor a böngészőjében megnyílik az az oldal,\n"
-"ahol megadhatja a fiókjának nevét és beállításait."
+msgstr "Ha a Befejez gombra kattint, akkor a böngészőjében megnyílik az az oldal,\nahol megadhatja a fiókjának nevét és beállításait."
 
-#: clientgui/CompletionPage.cpp:232
+#: CompletionPage.cpp:232
 #, c-format
 msgid "Update from %s completed."
 msgstr "A frissítés a(z) %s helyről elkészült."
 
-#: clientgui/CompletionPage.cpp:236
+#: CompletionPage.cpp:236
 msgid "Update completed."
 msgstr "Frissítés kész."
 
-#: clientgui/CompletionPage.cpp:247
+#: CompletionPage.cpp:247
 msgid "Now using account manager"
 msgstr "Most már fiókkezelőt használ"
 
-#: clientgui/CompletionPage.cpp:252
+#: CompletionPage.cpp:252
 #, c-format
 msgid "Welcome to %s!"
 msgstr "Üdvözöljük a(z) %s projektben!"
 
-#: clientgui/CompletionPage.cpp:263
+#: CompletionPage.cpp:263
 #, c-format
 msgid "You are now using %s to manage accounts."
 msgstr "Jelenleg a(z) %s-t használja fiókjai kezelésére."
 
-#: clientgui/CompletionPage.cpp:267
+#: CompletionPage.cpp:267
 msgid "You are now using this account manager."
 msgstr "Jelenleg ezt a fiókkezelőt használja."
 
-#: clientgui/DlgAbout.cpp:113
+#: DlgAbout.cpp:113 mac/Mac_GUI.cpp:96
 #, c-format
 msgid "About %s"
 msgstr "%s névjegye"
 
-#: clientgui/DlgAbout.cpp:172
+#: DlgAbout.cpp:172
 msgid "Version:"
 msgstr "Verzió:"
 
-#: clientgui/DlgAbout.cpp:180
+#: DlgAbout.cpp:180
 msgid "wxWidgets Version:"
 msgstr "wxWidgets verzió:"
 
-#: clientgui/DlgAbout.cpp:188
+#: DlgAbout.cpp:188
 msgid "Copyright:"
 msgstr "Készítő:"
 
-#: clientgui/DlgAbout.cpp:192
+#: DlgAbout.cpp:192
 msgid ""
-"(C) 2003-2014 University of California, Berkeley.\n"
+"(C) 2003-2013 University of California, Berkeley.\n"
 "All Rights Reserved."
-msgstr ""
+msgstr "(C) 2003-2013 Kaliforniai Egyetem, Berkeley.\nMinden jog fenntartva."
 
-#: clientgui/DlgAbout.cpp:196
+#: DlgAbout.cpp:196
 msgid "Berkeley Open Infrastructure for Network Computing"
 msgstr "Berkeley Nyílt Rendszer a Hálózati Számitásért (BOINC)"
 
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:399
-#: clientgui/DlgSelectComputer.cpp:163
+#: DlgAbout.cpp:208 DlgExitMessage.cpp:173 DlgGenericMessage.cpp:120
+#: DlgOptions.cpp:396 DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "&OK"
 
-#: clientgui/DlgAdvPreferences.cpp:602
+#: DlgAdvPreferences.cpp:544
 msgid "invalid number"
-msgstr ""
+msgstr "érvénytelen szám"
 
-#: clientgui/DlgAdvPreferences.cpp:603
+#: DlgAdvPreferences.cpp:545
 msgid "invalid time, format is HH:MM"
 msgstr "érvénytelen idő, a helyes formátum: ÓÓ:PP"
 
-#: clientgui/DlgAdvPreferences.cpp:604
+#: DlgAdvPreferences.cpp:546
 msgid "invalid time interval, format is HH:MM-HH:MM"
 msgstr "érvénytelen időintervallum, a helyes formátum: ÓÓ:PP-ÓÓ:PP"
 
-#: clientgui/DlgAdvPreferences.cpp:817
+#: DlgAdvPreferences.cpp:751
 msgid "invalid input value detected"
 msgstr "érvénytelen bemeneti értéket észleltem"
 
-#: clientgui/DlgAdvPreferences.cpp:819
+#: DlgAdvPreferences.cpp:753
 msgid "Validation Error"
 msgstr "Érvényesítési hiba"
 
-#: clientgui/DlgAdvPreferences.cpp:969
-#: clientgui/DlgAdvPreferences.cpp:975
-#: clientgui/DlgAdvPreferences.cpp:981
+#: DlgAdvPreferences.cpp:885 DlgAdvPreferences.cpp:891
+#: DlgAdvPreferences.cpp:897
 msgid "Applications to add"
 msgstr "Hozzáadható alkalmazások"
 
-#: clientgui/DlgAdvPreferences.cpp:998
+#: DlgAdvPreferences.cpp:914
 #, c-format
 msgid "'%s' is not an executable application."
 msgstr "'%s' nem végrehajtható alkalmazás."
 
-#: clientgui/DlgAdvPreferences.cpp:999
-#: clientgui/DlgAdvPreferences.cpp:1046
-#: clientgui/DlgAdvPreferences.cpp:1070
+#: DlgAdvPreferences.cpp:915 DlgAdvPreferences.cpp:962
+#: DlgAdvPreferences.cpp:986
 msgid "Add Exclusive App"
 msgstr "Exkluzív alkalmazás hozzáadása"
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Name of application to add?"
 msgstr "Mi a hozzáadandó alkalmazás neve?"
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Add exclusive app"
 msgstr "Exkluzív alkalmazás hozzáadása"
 
-#: clientgui/DlgAdvPreferences.cpp:1045
+#: DlgAdvPreferences.cpp:961
 #, c-format
 msgid "Application names must end with '%s'"
 msgstr "Az alkalmazás nevének '%s'-re kell végződnie"
 
-#: clientgui/DlgAdvPreferences.cpp:1069
+#: DlgAdvPreferences.cpp:985
 #, c-format
 msgid "'%s' is already in the list."
 msgstr "'%s' már a listában van."
 
-#: clientgui/DlgAdvPreferences.cpp:1161
+#: DlgAdvPreferences.cpp:1077
 msgid ""
 "Do you really want to clear all local preferences?\n"
 "(This will not affect exclusive applications.)"
-msgstr ""
-"BIztosan törölni szeretne minden helyi beállítást?\n"
-"(Ez nem érinti az exkluzív alkalmazásokat.)"
+msgstr "BIztosan törölni szeretne minden helyi beállítást?\n(Ez nem érinti az exkluzív alkalmazásokat.)"
 
-#: clientgui/DlgAdvPreferences.cpp:1162
+#: DlgAdvPreferences.cpp:1078 sg_DlgPreferences.cpp:1030
 msgid "Confirmation"
 msgstr "Megerősítés"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:49
+#: DlgAdvPreferencesBase.cpp:46 sg_DlgPreferences.cpp:946
 #, c-format
-msgid "%s - Computing preferences"
-msgstr ""
+msgid "%s - Preferences"
+msgstr "%s - Beállítások"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:66
+#: DlgAdvPreferencesBase.cpp:62
 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 ""
-"Ez a párbeszédpanel csak az ehhez a számítógéphez tartozó beállításokat kezeli.\n"
-"Kattintson az OK-ra a beállítások módosításához.\n"
-"Kattintson a Törlés-re a webes beállítások visszaállításához (kivéve az exkluzív alkalmazásokat)."
+msgstr "Ez a párbeszédpanel csak az ehhez a számítógéphez tartozó beállításokat kezeli.\nKattintson az OK-ra a beállítások módosításához.\nKattintson a Törlés-re a webes beállítások visszaállításához (kivéve az exkluzív alkalmazásokat)."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:69
+#: DlgAdvPreferencesBase.cpp:65 sg_DlgPreferences.cpp:428
 msgid "Clear"
 msgstr "Törlés"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:70
+#: DlgAdvPreferencesBase.cpp:66
 msgid "clear all local preferences and close the dialog"
 msgstr "minden helyi beállítás törlése és a párbeszédpanel bezárása"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:85
+#: DlgAdvPreferencesBase.cpp:81
 msgid "processor usage"
 msgstr "processzor használat"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:88
+#: DlgAdvPreferencesBase.cpp:84
 msgid "network usage"
 msgstr "hálózathasználat"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:91
+#: DlgAdvPreferencesBase.cpp:87
 msgid "disk and memory usage"
 msgstr "lemez- és memóriahasználat"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:94
+#: DlgAdvPreferencesBase.cpp:90
 msgid "exclusive applications"
 msgstr "exkluzív alkalmazások"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:107
-#: clientgui/DlgDiagnosticLogFlags.cpp:104
+#: DlgAdvPreferencesBase.cpp:102 sg_DlgPreferences.cpp:424
 msgid "OK"
 msgstr "OK"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:108
+#: DlgAdvPreferencesBase.cpp:103
 msgid "save all values and close the dialog"
 msgstr "mentse az összes értéket majd zárja be a párbeszédablakot"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:114
+#: DlgAdvPreferencesBase.cpp:108
 msgid "close the dialog without saving"
 msgstr "zárja be a párbeszédablakot mentés nélkül"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:118
-#: clientgui/Localization.cpp:35
-#: clientgui/Localization.cpp:121
-#: clientgui/Localization.cpp:139
+#: DlgAdvPreferencesBase.cpp:112 Localization.cpp:35 Localization.cpp:121
+#: Localization.cpp:139 sg_BoincSimpleFrame.cpp:794 sg_DlgPreferences.cpp:439
 msgid "Help"
 msgstr "Súgó"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
+#: DlgAdvPreferencesBase.cpp:113
 msgid "shows the preferences web page"
 msgstr "megmutatja a webes beállításokat"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:141
+#: DlgAdvPreferencesBase.cpp:135
 msgid "Computing allowed"
 msgstr "Számítás engedélyezve"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
+#: DlgAdvPreferencesBase.cpp:139
 msgid "While computer is on batteries"
 msgstr "Amikor a számítógép akkumulátorról működik"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:149
-msgid "check this if you want this computer to do work while it runs on batteries"
+#: DlgAdvPreferencesBase.cpp:142
+msgid ""
+"check this if you want this computer to do work while it runs on batteries"
 msgstr "jelölje be, ha azt szeretné, hogy a számítógépe akkor is (fel)dolgozzon, amikor akkumulátorról működik"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:155
+#: DlgAdvPreferencesBase.cpp:148
 msgid "While computer is in use"
 msgstr "Ha a számítógép használatban van"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:158
-msgid "check this if you want this computer to do work even when you're using it"
+#: DlgAdvPreferencesBase.cpp:151
+msgid ""
+"check this if you want this computer to do work even when you're using it"
 msgstr "jelölje be, ha azt szeretné, hogy a számítógépe akkor is (fel)dolgozzon, amikor Ön használja azt"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:164
+#: DlgAdvPreferencesBase.cpp:157
 msgid "Use GPU while computer is in use"
 msgstr "GPU használata, amikor a számítógép használatban van"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:167
-msgid "check this if you want your GPU to do work even when you're using the computer"
+#: DlgAdvPreferencesBase.cpp:160
+msgid ""
+"check this if you want your GPU to do work even when you're using the "
+"computer"
 msgstr "jelölje be, ha azt szeretné, hogy a GPU is (fel)dolgozzon, mialatt Ön a számítógépet használja"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:179
+#: DlgAdvPreferencesBase.cpp:172
 msgid "Only after computer has been idle for"
 msgstr "Csak miután a számítógép legalább ennyi ideje tétlen:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:188
-msgid "do work only after you haven't used the computer for this number of minutes"
+#: DlgAdvPreferencesBase.cpp:182
+msgid ""
+"do work only after you haven't used the computer for this number of minutes"
 msgstr "csak akkor kezdjen el dolgozni, miután Ön a számítógépet már ennyi perce nem használja:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:193
-#: clientgui/DlgAdvPreferencesBase.cpp:342
+#: DlgAdvPreferencesBase.cpp:187 DlgAdvPreferencesBase.cpp:336
+#: sg_DlgPreferences.cpp:417
 msgid "minutes"
 msgstr "perc"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:212
+#: DlgAdvPreferencesBase.cpp:206
 msgid "While processor usage is less than"
 msgstr "Ha a processzor használat kevesebb mint"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:221
+#: DlgAdvPreferencesBase.cpp:216
 msgid "suspend work if processor usage exceeds this level"
 msgstr "munka felfüggesztése, ha a processzorhasználat meghaladja ezt a szintet"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:226
+#: DlgAdvPreferencesBase.cpp:221
 msgid "percent (0 means no restriction)"
 msgstr "százalék (0 esetén nincs korlátozás)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:240
-#: clientgui/DlgAdvPreferencesBase.cpp:506
+#: DlgAdvPreferencesBase.cpp:235 DlgAdvPreferencesBase.cpp:496
 msgid "Every day between hours of"
 msgstr "Minden nap"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: DlgAdvPreferencesBase.cpp:239
 msgid "start work at this time"
 msgstr "ekkor kezdje a feldolgozást"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:248
-#: clientgui/DlgAdvPreferencesBase.cpp:514
+#: DlgAdvPreferencesBase.cpp:243 DlgAdvPreferencesBase.cpp:504
+#: sg_DlgPreferences.cpp:326 sg_DlgPreferences.cpp:348
 msgid "and"
 msgstr "és"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:252
+#: DlgAdvPreferencesBase.cpp:247
 msgid "stop work at this time"
 msgstr "ekkor fejezze be a feldolgozást"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
-#: clientgui/DlgAdvPreferencesBase.cpp:522
+#: DlgAdvPreferencesBase.cpp:251 DlgAdvPreferencesBase.cpp:512
 msgid "(no restriction if equal)"
 msgstr "óra között (ha megegyeznek, nincs korlátozva)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:261
-#: clientgui/DlgAdvPreferencesBase.cpp:527
+#: DlgAdvPreferencesBase.cpp:256 DlgAdvPreferencesBase.cpp:517
 msgid "Day-of-week override:"
 msgstr "Felülírás a hét napjaira:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:266
-#: clientgui/DlgAdvPreferencesBase.cpp:532
+#: DlgAdvPreferencesBase.cpp:261 DlgAdvPreferencesBase.cpp:522
 msgid "check box to specify hours for this day of week"
 msgstr "jelölje be a négyzetet, ha a hét ezen napjára külön szeretné beállítani az időtartamot"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:272
-#: clientgui/DlgAdvPreferencesBase.cpp:538
+#: DlgAdvPreferencesBase.cpp:267 DlgAdvPreferencesBase.cpp:528
 msgid "Monday"
 msgstr "Hétfő"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:279
-#: clientgui/DlgAdvPreferencesBase.cpp:545
+#: DlgAdvPreferencesBase.cpp:274 DlgAdvPreferencesBase.cpp:535
 msgid "Tuesday"
 msgstr "Kedd"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:286
-#: clientgui/DlgAdvPreferencesBase.cpp:552
+#: DlgAdvPreferencesBase.cpp:281 DlgAdvPreferencesBase.cpp:542
 msgid "Wednesday"
 msgstr "Szerda"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:293
-#: clientgui/DlgAdvPreferencesBase.cpp:559
+#: DlgAdvPreferencesBase.cpp:288 DlgAdvPreferencesBase.cpp:549
 msgid "Thursday"
 msgstr "Csütörtök"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:300
-#: clientgui/DlgAdvPreferencesBase.cpp:566
+#: DlgAdvPreferencesBase.cpp:295 DlgAdvPreferencesBase.cpp:556
 msgid "Friday"
 msgstr "Péntek"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:307
-#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: DlgAdvPreferencesBase.cpp:302 DlgAdvPreferencesBase.cpp:563
 msgid "Saturday"
 msgstr "Szombat"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:580
+#: DlgAdvPreferencesBase.cpp:309 DlgAdvPreferencesBase.cpp:570
 msgid "Sunday"
 msgstr "Vasárnap"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:328
+#: DlgAdvPreferencesBase.cpp:323
 msgid "Other options"
 msgstr "Egyéb beállítások"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:336
+#: DlgAdvPreferencesBase.cpp:330
 msgid "Switch between applications every"
 msgstr "Váltás az alkalmazások között ilyen gyakorisággal:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:345
+#: DlgAdvPreferencesBase.cpp:339
 msgid "On multiprocessor systems, use at most"
 msgstr "Többprocesszoros rendszereken legfeljebb"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
+#: DlgAdvPreferencesBase.cpp:346
 #, no-c-format
-msgid "% of the processors (0 means no restriction)"
-msgstr ""
+msgid "% of the processors (0 means ignore this setting)"
+msgstr "%-a a processzoroknak (0 esetén figyelmen kívül hagyva)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:355
-#: clientgui/DlgAdvPreferencesBase.cpp:618
-#: clientgui/DlgAdvPreferencesBase.cpp:640
-#: clientgui/DlgAdvPreferencesBase.cpp:661
-#: clientgui/DlgAdvPreferencesBase.cpp:683
-#: clientgui/DlgAdvPreferencesBase.cpp:694
+#: DlgAdvPreferencesBase.cpp:349 DlgAdvPreferencesBase.cpp:605
+#: DlgAdvPreferencesBase.cpp:627 DlgAdvPreferencesBase.cpp:648
+#: DlgAdvPreferencesBase.cpp:669 DlgAdvPreferencesBase.cpp:679
 msgid "Use at most"
 msgstr "Legfeljebb"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:362
+#: DlgAdvPreferencesBase.cpp:356
 #, no-c-format
-msgid "% of CPU time (0 means no restriction)"
-msgstr ""
+msgid "% CPU time"
+msgstr "%-át használja a CPU időnek"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:386
+#: DlgAdvPreferencesBase.cpp:378
 msgid "General options"
 msgstr "Általános beállítások"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:395
+#: DlgAdvPreferencesBase.cpp:386
 msgid "Maximum download rate"
 msgstr "Max letöltési sebesség"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:401
-#: clientgui/DlgAdvPreferencesBase.cpp:410
-msgid "KBytes/second (0 means no restriction)"
-msgstr ""
+#: DlgAdvPreferencesBase.cpp:392 DlgAdvPreferencesBase.cpp:401
+msgid "KBytes/sec."
+msgstr "KByte/sec."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:404
+#: DlgAdvPreferencesBase.cpp:395
 msgid "Maximum upload rate"
 msgstr "Max feltöltési sebesség"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:417
+#: DlgAdvPreferencesBase.cpp:406
+msgid "Transfer at most"
+msgstr "Legfeljebb"
+
+#: DlgAdvPreferencesBase.cpp:412
+msgid "Mbytes"
+msgstr "Mbájt"
+
+#: DlgAdvPreferencesBase.cpp:415
+msgid "every"
+msgstr "minden"
+
+#: DlgAdvPreferencesBase.cpp:421 DlgAdvPreferencesBase.cpp:444
+#: DlgAdvPreferencesBase.cpp:463
+msgid "days"
+msgstr "nap"
+
+#: DlgAdvPreferencesBase.cpp:429
 msgid "Minimum work buffer"
 msgstr "Minimum munka buffer"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:425
+#: DlgAdvPreferencesBase.cpp:438
 msgid "Try to maintain enough tasks to keep busy for this many days"
 msgstr "Próbáljon ennyi napra elegendő feladatot készenlétben tartani:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:431
-#: clientgui/DlgAdvPreferencesBase.cpp:449
-msgid "days (maximum value: 10)"
-msgstr ""
-
-#: clientgui/DlgAdvPreferencesBase.cpp:437
+#: DlgAdvPreferencesBase.cpp:450
 msgid "Max additional work buffer"
 msgstr "Max kiegészítő munka buffer"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:445
+#: DlgAdvPreferencesBase.cpp:459
 msgid "In addition, maintain enough tasks for up to this many days"
 msgstr "Legfeljebb ennyi napra elegendő feladatot tartson készenlétben:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:454
-msgid "Transfer at most"
-msgstr "Legfeljebb"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:462
-msgid "MBytes every"
-msgstr ""
-
-#: clientgui/DlgAdvPreferencesBase.cpp:468
-msgid "days (0 means no restriction)"
-msgstr ""
-
-#: clientgui/DlgAdvPreferencesBase.cpp:476
+#: DlgAdvPreferencesBase.cpp:466
 msgid "Skip image file verification"
 msgstr "Képfájl ellenőrzés kihagyása"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:478
+#: DlgAdvPreferencesBase.cpp:468
 msgid "check this if your Internet provider modifies image files"
 msgstr "jelölje be, ha az internetszolgáltatója módosítja a képfájlokat"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:484
+#: DlgAdvPreferencesBase.cpp:476
 msgid "Connect options"
 msgstr "Csatlakozási opciók"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:487
+#: DlgAdvPreferencesBase.cpp:478
 msgid "Confirm before connecting to internet"
 msgstr "Jóváhagyás internetre csatlakozás előtt"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
+#: DlgAdvPreferencesBase.cpp:480
+msgid ""
+"if checked, a confirmation dialog will be displayed before trying to connect"
+" to the Internet"
 msgstr "ha aktív, egy jóváhagyás kérés fog megjelenni internetre csatlakozás elött"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:493
+#: DlgAdvPreferencesBase.cpp:484
 msgid "Disconnect when done"
 msgstr "Lecsatlakozik ha kész"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:495
+#: DlgAdvPreferencesBase.cpp:486
 msgid ""
 "if checked, BOINC hangs up when network usage is done\n"
 "(only relevant for dialup-connection)"
-msgstr ""
-"ha aktív, a BOINC lecsatlakozik miután befejezte a hálózat használatát\n"
-"(csak betárcsázós kapcsolatnál számít)"
+msgstr "ha aktív, a BOINC lecsatlakozik miután befejezte a hálózat használatát\n(csak betárcsázós kapcsolatnál számít)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:501
+#: DlgAdvPreferencesBase.cpp:492
 msgid "Network usage allowed"
 msgstr "Hálózathasználat engedélyezése"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:510
+#: DlgAdvPreferencesBase.cpp:500
 msgid "network usage start hour"
 msgstr "hálózathasználat kezdeti ideje"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:518
+#: DlgAdvPreferencesBase.cpp:508
 msgid "network usage stop hour"
 msgstr "hálózathasználat befejezési ideje"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:610
-#: clientgui/DlgItemProperties.cpp:257
+#: DlgAdvPreferencesBase.cpp:598 DlgItemProperties.cpp:231
 msgid "Disk usage"
 msgstr "Lemezhasználat"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:622
+#: DlgAdvPreferencesBase.cpp:609
 msgid "the maximum disk space used by BOINC (in Gigabytes)"
 msgstr "a BOINC által maxmálisan használt lemezterület (Gigabájtban)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:626
-msgid "Gigabytes disk space (0 means no restriction)"
-msgstr ""
+#: DlgAdvPreferencesBase.cpp:613
+msgid "Gigabytes disk space"
+msgstr "Gigabájt lemezterület"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:629
+#: DlgAdvPreferencesBase.cpp:616
 msgid "Leave at least"
 msgstr "Hagyjon legalább"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:633
+#: DlgAdvPreferencesBase.cpp:620
 msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
 msgstr "A BOINC legalább ennyi lemezterületet szabadon hagy (Gigabájtban)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:637
+#: DlgAdvPreferencesBase.cpp:624
 msgid "Gigabytes disk space free"
 msgstr "Gigabájt szabad lemezterületet"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
+#: DlgAdvPreferencesBase.cpp:631
 msgid "BOINC uses at most this percentage of total disk space"
 msgstr "A BOINC legfeljebb a teljes lemezterület ekkora hányadát használja"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:649
+#: DlgAdvPreferencesBase.cpp:636
 #, no-c-format
 msgid "% of total disk space"
 msgstr "%-át használja a teljes lemezterületnek"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:652
+#: DlgAdvPreferencesBase.cpp:639
 msgid "Tasks checkpoint to disk at most every"
 msgstr "Feladat állapotának lemezre írása legalább minden"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
+#: DlgAdvPreferencesBase.cpp:645
 msgid "seconds"
 msgstr "másodpercben"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:668
+#: DlgAdvPreferencesBase.cpp:655
 #, no-c-format
 msgid "% of page file (swap space)"
 msgstr "%-át használja a lapozófájlnak (swap terület)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:675
+#: DlgAdvPreferencesBase.cpp:662
 msgid "Memory usage"
 msgstr "Memóriahasználat"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
+#: DlgAdvPreferencesBase.cpp:676
 #, no-c-format
 msgid "% when computer is in use"
 msgstr "% ha a számítógép használatban van"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:701
+#: DlgAdvPreferencesBase.cpp:686
 #, no-c-format
 msgid "% when computer is idle"
 msgstr "% amikor a számítógép tétlen"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:706
+#: DlgAdvPreferencesBase.cpp:691
 msgid "Leave applications in memory while suspended"
 msgstr "Hagyja az alkalmazásokat a memóriában a felfüggesztésük alatt"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:708
+#: DlgAdvPreferencesBase.cpp:693
 msgid "if checked, suspended work units are left in memory"
 msgstr "ha be van jelölve, akkor a felfüggesztett munkacsomagok a memóriában maradnak"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:728
-msgid "Suspend processor and network usage when these applications are running:"
+#: DlgAdvPreferencesBase.cpp:713
+msgid ""
+"Suspend processor and network usage when these applications are running:"
 msgstr "Függessze fel a processzor- és hálózathasználatot, amikor a következő alkalmazások futnak:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:738
+#: DlgAdvPreferencesBase.cpp:722
 msgid "Add..."
 msgstr "Hozzáadás..."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:739
+#: DlgAdvPreferencesBase.cpp:723
 msgid "Add an application to this list"
 msgstr "Alkalmazás hozzáadása ehhez a listához"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:744
+#: DlgAdvPreferencesBase.cpp:728 ViewProjects.cpp:202
+#: sg_ProjectCommandPopup.cpp:85
 msgid "Remove"
 msgstr "Eltávolítás"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:745
+#: DlgAdvPreferencesBase.cpp:729
 msgid "Remove an application from this list"
 msgstr "Alkalmazás eltávolítása ebből a listából"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:754
+#: DlgAdvPreferencesBase.cpp:738
 msgid "For advanced options, refer to "
 msgstr "Haladó beállításokhoz lásd"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:65
-#, c-format
-msgid "%s Diagnostic Log Flags"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:83
-msgid "These flags enable various types of diagnostic messages in the Event Log."
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:105
-msgid "Save all values and close the dialog"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:108
-msgid "Defaults"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:109
-msgid "Restore default settings"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:113
-msgid "Close the dialog without saving"
-msgstr ""
-
-#: clientgui/DlgEventLog.cpp:226
+#: DlgEventLog.cpp:219
 #, c-format
 msgid "%s - Event Log"
 msgstr "%s - Eseménynapló"
 
-#: clientgui/DlgEventLog.cpp:236
+#: DlgEventLog.cpp:232 ViewMessages.cpp:117 ViewProjects.cpp:219
+#: ViewStatistics.cpp:435 ViewStatistics.cpp:2009 ViewTransfers.cpp:182
+#: ViewWork.cpp:232
 msgid "Project"
 msgstr "Projekt"
 
-#: clientgui/DlgEventLog.cpp:237
+#: DlgEventLog.cpp:233 ViewMessages.cpp:118
 msgid "Time"
 msgstr "Idő"
 
-#: clientgui/DlgEventLog.cpp:238
+#: DlgEventLog.cpp:234 ViewMessages.cpp:119
 msgid "Message"
 msgstr "Üzenet"
 
-#: clientgui/DlgEventLog.cpp:300
-#: clientgui/DlgEventLog.cpp:364
+#: DlgEventLog.cpp:290 DlgEventLog.cpp:354
 msgid "&Show only this project"
 msgstr "&Csak ezt a projektet mutassa"
 
-#: clientgui/DlgEventLog.cpp:304
+#: DlgEventLog.cpp:294
 msgid "Copy &All"
 msgstr "&Mindent másol"
 
-#: clientgui/DlgEventLog.cpp:306
-#: clientgui/DlgEventLog.cpp:310
+#: DlgEventLog.cpp:296 DlgEventLog.cpp:300 ViewMessages.cpp:89
 msgid "Copy all the messages to the clipboard."
 msgstr "Minden üzenet másolása a vágólapra."
 
-#: clientgui/DlgEventLog.cpp:315
+#: DlgEventLog.cpp:305
 msgid "Copy &Selected"
 msgstr "&Kijelöltek másolása"
 
-#: clientgui/DlgEventLog.cpp:318
-#: clientgui/DlgEventLog.cpp:326
-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."
+#: DlgEventLog.cpp:308 DlgEventLog.cpp:316 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 "A kiválasztott üzenetek másolása a vágólapra. Több üzenetet is kiválaszthat, ha az üzenetkre történő kattintás közben nyomva tartja a Shift, vagy a parancsbillentyűt."
 
-#: clientgui/DlgEventLog.cpp:320
-#: clientgui/DlgEventLog.cpp:328
-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."
+#: DlgEventLog.cpp:310 DlgEventLog.cpp:318 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 "A kiválasztott üzenetek másolása a vágólapra. Több üzenetek is kiváaszthat a SHIFT vagy CTRL gombok lenyomásával, miközben az üzenetekre kattint."
 
-#: clientgui/DlgEventLog.cpp:335
-#: clientgui/DlgItemProperties.cpp:67
+#: DlgEventLog.cpp:325 DlgItemProperties.cpp:67
 msgid "&Close"
 msgstr "&Bezárás"
 
-#: clientgui/DlgEventLog.cpp:344
+#: DlgEventLog.cpp:334 sg_BoincSimpleFrame.cpp:798 sg_DlgPreferences.cpp:442
 #, c-format
 msgid "Get help with %s"
 msgstr "Segítség ehhez: %s"
 
-#: clientgui/DlgEventLog.cpp:358
+#: DlgEventLog.cpp:348
 msgid "Show all &messages"
 msgstr "&Minden üzenet mutatása"
 
-#: clientgui/DlgEventLog.cpp:359
-#: clientgui/DlgEventLog.cpp:361
+#: DlgEventLog.cpp:349 DlgEventLog.cpp:351
 msgid "Show messages for all projects"
 msgstr "Az összes projekt üzeneteinek mutatása."
 
-#: clientgui/DlgEventLog.cpp:365
-#: clientgui/DlgEventLog.cpp:367
+#: DlgEventLog.cpp:355 DlgEventLog.cpp:357
 msgid "Show only the messages for the selected project"
 msgstr "Csak a kiválasztott projekt üzeneteit mutassa"
 
-#: clientgui/DlgExitMessage.cpp:82
+#: DlgExitMessage.cpp:82
 #, c-format
 msgid "%s - Exit Confirmation"
 msgstr "%s - Kilépés megerősítése"
 
-#: clientgui/DlgExitMessage.cpp:130
+#: DlgExitMessage.cpp:130
 #, c-format
 msgid ""
 "You have requested to exit the %s,\n"
@@ -1690,15 +1551,9 @@ msgid ""
 "\n"
 "If you also want to stop running the tasks,\n"
 "choose from the following options:"
-msgstr ""
-"A(z) %s programból való kilépésre készül,\n"
-"ami lehetővé teszi a számítógépen futó\n"
-"feladatok figyelését és kezelését.\n"
-"\n"
-"Ha a feladatok futását is le akarja állítani,\n"
-"válasszon az alábbi lehetőségek közül:"
+msgstr "A(z) %s programból való kilépésre készül,\nami lehetővé teszi a számítógépen futó\nfeladatok figyelését és kezelését.\n\nHa a feladatok futását is le akarja állítani,\nválasszon az alábbi lehetőségek közül:"
 
-#: clientgui/DlgExitMessage.cpp:135
+#: DlgExitMessage.cpp:135
 #, c-format
 msgid ""
 "This will shut down %s and its tasks until either the\n"
@@ -1707,1001 +1562,916 @@ msgid ""
 "In most cases, it is better just to close the %s window\n"
 "rather than to exit the application; that will allow %s to run its\n"
 "tasks at the times you selected in your preferences."
-msgstr ""
-"Ezzel teljesen leállítja %st és feladatait addig, amíg a(z)\n"
-"%s alkalmazás vagy a(z) %s képernyővédő újra futni nem kezd.\n"
-"\n"
-"A legtöbb esetben jobb csupán lecsukni a(z) %s ablakát\n"
-"mint kilépni az alkalmazásból; ezzel engedélyezi a(z) %s feladatainak\n"
-"futtatását a beállításoknál megadott időpontokban."
+msgstr "Ezzel teljesen leállítja %st és feladatait addig, amíg a(z)\n%s alkalmazás vagy a(z) %s képernyővédő újra futni nem kezd.\n\nA legtöbb esetben jobb csupán lecsukni a(z) %s ablakát\nmint kilépni az alkalmazásból; ezzel engedélyezi a(z) %s feladatainak\nfuttatását a beállításoknál megadott időpontokban."
 
-#: clientgui/DlgExitMessage.cpp:153
+#: DlgExitMessage.cpp:153
 #, c-format
 msgid "Stop running tasks when exiting the %s"
 msgstr "A futó feladatok leállítása %s leállításakor"
 
-#: clientgui/DlgExitMessage.cpp:165
+#: DlgExitMessage.cpp:165
 msgid "Remember this decision and do not show this dialog."
 msgstr "Emlékezzen a döntésemre és ne mutassa többé ezt az ablakot."
 
-#: clientgui/DlgExitMessage.cpp:178
-#: clientgui/DlgGenericMessage.cpp:125
-#: clientgui/DlgOptions.cpp:404
-#: clientgui/DlgSelectComputer.cpp:168
+#: DlgExitMessage.cpp:178 DlgGenericMessage.cpp:125 DlgOptions.cpp:401
+#: DlgSelectComputer.cpp:168 wizardex.cpp:378
 msgid "&Cancel"
 msgstr "Mégsem"
 
-#: clientgui/DlgGenericMessage.cpp:112
+#: DlgGenericMessage.cpp:112
 msgid "Don't show this dialog again."
 msgstr "Ne mutassa újra ezt a párbeszédablakot."
 
-#: clientgui/DlgItemProperties.cpp:194
-#: clientgui/DlgItemProperties.cpp:197
-#: clientgui/DlgItemProperties.cpp:200
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:168 DlgItemProperties.cpp:171
+#: DlgItemProperties.cpp:174 DlgItemProperties.cpp:177
 msgid "Don't fetch tasks for "
 msgstr "Ne töltsön le feladatokat ehhez:"
 
-#: clientgui/DlgItemProperties.cpp:194
+#: DlgItemProperties.cpp:168
 msgid "Project preference"
 msgstr "A projekt élvez elsőbbséget"
 
-#: clientgui/DlgItemProperties.cpp:197
+#: DlgItemProperties.cpp:171
 msgid "Account manager preference"
 msgstr "A fiókkezelő élvez elsőbbséget"
 
-#: clientgui/DlgItemProperties.cpp:200
+#: DlgItemProperties.cpp:174
 msgid "Project has no apps for "
 msgstr "A projektnek nincs alkalmazása ehhez: "
 
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:177
 msgid "Client configuration excludes "
 msgstr "A kliens beállításai kizárják ezt:  "
 
-#: clientgui/DlgItemProperties.cpp:207
+#: DlgItemProperties.cpp:181
 msgid " work fetch deferred for"
 msgstr " munka letöltése elhalasztva ennyi időre"
 
-#: clientgui/DlgItemProperties.cpp:208
+#: DlgItemProperties.cpp:182
 msgid " work fetch deferral interval"
 msgstr "munkaletöltés újrapróbálási időköze"
 
-#: clientgui/DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:213
 msgid "Properties of project "
 msgstr "Projekt tulajdonságok"
 
-#: clientgui/DlgItemProperties.cpp:243
-#: clientgui/DlgOptions.cpp:221
+#: DlgItemProperties.cpp:217 DlgOptions.cpp:218
 msgid "General"
 msgstr "Általános"
 
-#: clientgui/DlgItemProperties.cpp:244
+#: DlgItemProperties.cpp:218
 msgid "Master URL"
 msgstr "Mester URL"
 
-#: clientgui/DlgItemProperties.cpp:245
+#: DlgItemProperties.cpp:219
 msgid "User name"
 msgstr "Felhasználónév"
 
-#: clientgui/DlgItemProperties.cpp:246
+#: DlgItemProperties.cpp:220
 msgid "Team name"
 msgstr "Csapatnév"
 
-#: clientgui/DlgItemProperties.cpp:247
+#: DlgItemProperties.cpp:221 ViewProjects.cpp:224
 msgid "Resource share"
 msgstr "Erőforrásmegosztás"
 
-#: clientgui/DlgItemProperties.cpp:249
+#: DlgItemProperties.cpp:223
 msgid "Scheduler RPC deferred for"
 msgstr "Ütemező RPC elhalasztva ennyi időre"
 
-#: clientgui/DlgItemProperties.cpp:252
+#: DlgItemProperties.cpp:226
 msgid "File downloads deferred for"
 msgstr "Fájlok letöltése elhalasztva ennyi időre"
 
-#: clientgui/DlgItemProperties.cpp:255
+#: DlgItemProperties.cpp:229
 msgid "File uploads deferred for"
 msgstr "Fájlok feltöltése elhalasztva ennyi időre"
 
-#: clientgui/DlgItemProperties.cpp:258
+#: DlgItemProperties.cpp:232
 msgid "Computer ID"
 msgstr "Számítógép azonosító (ID)"
 
-#: clientgui/DlgItemProperties.cpp:260
+#: DlgItemProperties.cpp:234
 msgid "Non CPU intensive"
 msgstr "Nem processzorigényes"
 
-#: 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
+#: DlgItemProperties.cpp:234 DlgItemProperties.cpp:236
+#: DlgItemProperties.cpp:237 DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:242 DlgItemProperties.cpp:251
+#: DlgItemProperties.cpp:254 DlgItemProperties.cpp:257
 msgid "yes"
 msgstr "igen"
 
-#: clientgui/DlgItemProperties.cpp:262
+#: DlgItemProperties.cpp:236
 msgid "Suspended via GUI"
 msgstr "GUI-n keresztül felfüggesztve"
 
-#: clientgui/DlgItemProperties.cpp:262
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:236 DlgItemProperties.cpp:237
 msgid "no"
 msgstr "nem"
 
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:237
 msgid "Don't request more work"
 msgstr "Ne kérjen több feladatot"
 
-#: clientgui/DlgItemProperties.cpp:265
+#: DlgItemProperties.cpp:239
 msgid "Scheduler call in progress"
 msgstr "Ütemező hívása folyamatban"
 
-#: clientgui/DlgItemProperties.cpp:268
+#: DlgItemProperties.cpp:242
 msgid "Trickle-up pending"
 msgstr "Időközi jelentés függőben"
 
-#: clientgui/DlgItemProperties.cpp:271
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:245 DlgItemProperties.cpp:247
 msgid "Host location"
 msgstr "A számítógép helyzete"
 
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:247
 msgid "default"
 msgstr "alapértelmezett"
 
-#: clientgui/DlgItemProperties.cpp:277
+#: DlgItemProperties.cpp:251
 msgid "Added via account manager"
 msgstr "Hozzáadva a fiókkezelővel"
 
-#: clientgui/DlgItemProperties.cpp:280
+#: DlgItemProperties.cpp:254
 msgid "Remove when tasks done"
 msgstr "Eltávolítás a munkák elkészültekor"
 
-#: clientgui/DlgItemProperties.cpp:283
+#: DlgItemProperties.cpp:257
 msgid "Ended"
 msgstr "Vége"
 
-#: clientgui/DlgItemProperties.cpp:285
-msgid "Tasks completed"
-msgstr ""
-
-#: clientgui/DlgItemProperties.cpp:286
-msgid "Tasks failed"
-msgstr ""
-
-#: clientgui/DlgItemProperties.cpp:288
+#: DlgItemProperties.cpp:259
 msgid "Credit"
 msgstr "Kredit"
 
-#: clientgui/DlgItemProperties.cpp:289
+#: DlgItemProperties.cpp:260
 msgid "User"
 msgstr "Felhasználó"
 
-#: clientgui/DlgItemProperties.cpp:296
+#: DlgItemProperties.cpp:267
 msgid "Host"
 msgstr "Számítógép"
 
-#: clientgui/DlgItemProperties.cpp:305
+#: DlgItemProperties.cpp:276
 msgid "Scheduling"
 msgstr "Ütemezés"
 
-#: clientgui/DlgItemProperties.cpp:306
+#: DlgItemProperties.cpp:277
 msgid "Scheduling priority"
 msgstr "Ütemezés prioritása"
 
-#: clientgui/DlgItemProperties.cpp:307
+#: DlgItemProperties.cpp:278
 msgid "CPU"
 msgstr "CPU"
 
-#: clientgui/DlgItemProperties.cpp:331
+#: DlgItemProperties.cpp:302
 msgid "Duration correction factor"
 msgstr "Időtartam korrekciós faktor"
 
-#: clientgui/DlgItemProperties.cpp:345
+#: DlgItemProperties.cpp:316
 msgid "Properties of task "
 msgstr "Feladat tulajdonságai: "
 
-#: clientgui/DlgItemProperties.cpp:357
+#: DlgItemProperties.cpp:328 ViewWork.cpp:238
 msgid "Application"
 msgstr "Alkalmazás"
 
-#: clientgui/DlgItemProperties.cpp:358
+#: DlgItemProperties.cpp:329 ViewWork.cpp:239
 msgid "Name"
 msgstr "Név"
 
-#: clientgui/DlgItemProperties.cpp:359
+#: DlgItemProperties.cpp:330
 msgid "State"
 msgstr "Állapot"
 
-#: clientgui/DlgItemProperties.cpp:362
+#: DlgItemProperties.cpp:333
 msgid "Received"
 msgstr "Letöltve"
 
-#: clientgui/DlgItemProperties.cpp:365
+#: DlgItemProperties.cpp:336
 msgid "Report deadline"
 msgstr "Jelentési határidő"
 
-#: clientgui/DlgItemProperties.cpp:367
+#: DlgItemProperties.cpp:338
 msgid "Resources"
 msgstr "Erőforrások"
 
-#: clientgui/DlgItemProperties.cpp:370
+#: DlgItemProperties.cpp:341
 msgid "Estimated computation size"
 msgstr "Becsült kiszámítási idő"
 
-#: clientgui/DlgItemProperties.cpp:373
+#: DlgItemProperties.cpp:344
 msgid "CPU time at last checkpoint"
 msgstr "CPU idő az utolsó ellenőrzőpontnál"
 
-#: clientgui/DlgItemProperties.cpp:374
-#: clientgui/DlgItemProperties.cpp:389
+#: DlgItemProperties.cpp:345 DlgItemProperties.cpp:360
 msgid "CPU time"
 msgstr "Processzor idő"
 
-#: clientgui/DlgItemProperties.cpp:376
-#: clientgui/DlgItemProperties.cpp:390
+#: DlgItemProperties.cpp:347 DlgItemProperties.cpp:361
 msgid "Elapsed time"
 msgstr "Eltelt idő"
 
-#: clientgui/DlgItemProperties.cpp:378
+#: DlgItemProperties.cpp:349
 msgid "Estimated time remaining"
 msgstr "Becsült hátralévő idő"
 
-#: clientgui/DlgItemProperties.cpp:379
+#: DlgItemProperties.cpp:350
 msgid "Fraction done"
 msgstr "Elkészült rész"
 
-#: clientgui/DlgItemProperties.cpp:380
+#: DlgItemProperties.cpp:351
 msgid "Virtual memory size"
 msgstr "A virtuális memória mérete"
 
-#: clientgui/DlgItemProperties.cpp:381
+#: DlgItemProperties.cpp:352
 msgid "Working set size"
 msgstr "A munkahalmaz mérete"
 
-#: clientgui/DlgItemProperties.cpp:383
+#: DlgItemProperties.cpp:354
 msgid "Directory"
 msgstr "Mappa"
 
-#: clientgui/DlgItemProperties.cpp:386
+#: DlgItemProperties.cpp:357
 msgid "Process ID"
 msgstr "Folyamat azonosító"
 
-#: clientgui/DlgItemProperties.cpp:456
+#: DlgItemProperties.cpp:427 ViewWork.cpp:1032 sg_TaskPanel.cpp:823
 msgid "Local: "
 msgstr "Helyi:"
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: DlgOptions.cpp:129 DlgOptions.cpp:135
 msgid "Options"
 msgstr "Beállítások"
 
-#: clientgui/DlgOptions.cpp:178
+#: DlgOptions.cpp:175
 msgid "Language:"
 msgstr "Nyelv:"
 
-#: clientgui/DlgOptions.cpp:185
+#: DlgOptions.cpp:182
 msgid "What language should BOINC use?"
 msgstr "Milyen nyelvet használjon a BOINC?"
 
-#: clientgui/DlgOptions.cpp:189
+#: DlgOptions.cpp:186
 msgid "Notice reminder interval:"
 msgstr "Értesítések emlékeztetési intervelluma:"
 
-#: clientgui/DlgOptions.cpp:196
+#: DlgOptions.cpp:193
 msgid "How often should BOINC remind you of new notices?"
 msgstr "Milyen gyakran emlékeztesse a BOINC az új értesítésekre?"
 
-#: clientgui/DlgOptions.cpp:201
+#: DlgOptions.cpp:198
 msgid "Run Manager at login?"
 msgstr "Bejelentkezéskor elinduljon a Kezelő?"
 
-#: clientgui/DlgOptions.cpp:207
+#: DlgOptions.cpp:204
 msgid "Run the BOINC Manager when you log on."
 msgstr "A BOINC Kezelő elindítása, amikor Ön bejelentkezik."
 
-#: clientgui/DlgOptions.cpp:212
+#: DlgOptions.cpp:209
 msgid "Enable Manager exit dialog?"
 msgstr "Engedélyezi a Kezelő kilépési párbeszédpanelét?"
 
-#: clientgui/DlgOptions.cpp:218
+#: DlgOptions.cpp:215
 msgid "Display the exit dialog when shutting down the Manager."
 msgstr "A kilépési bárbeszédpanel megjelenítése a Kezelő bezárásakor."
 
-#: clientgui/DlgOptions.cpp:229
+#: DlgOptions.cpp:226
 msgid "Dial-up and Virtual Private Network settings"
 msgstr "Betárcsázós és Virtuális Magán Hálózat (VPN) beállítások"
 
-#: clientgui/DlgOptions.cpp:243
+#: DlgOptions.cpp:240
 msgid "&Set Default"
 msgstr "Alapértelmezettként beállít"
 
-#: clientgui/DlgOptions.cpp:248
+#: DlgOptions.cpp:245
 msgid "&Clear Default"
 msgstr "Alapértelmezett törlése"
 
-#: clientgui/DlgOptions.cpp:255
+#: DlgOptions.cpp:252
 msgid "Default Connection:"
 msgstr "Alapértelmezett kapcsolat:"
 
-#: clientgui/DlgOptions.cpp:262
+#: DlgOptions.cpp:259
 msgid "Connections"
 msgstr "Kapcsolatok"
 
-#: clientgui/DlgOptions.cpp:271
+#: DlgOptions.cpp:268
 msgid "Connect via HTTP proxy server"
 msgstr "Csatlakozás HTTP proxy szerveren keresztül"
 
-#: clientgui/DlgOptions.cpp:275
+#: DlgOptions.cpp:272
 msgid "HTTP Proxy Server Configuration"
 msgstr "HTTP proxy szerver beállítás"
 
-#: clientgui/DlgOptions.cpp:283
-#: clientgui/DlgOptions.cpp:347
+#: DlgOptions.cpp:280 DlgOptions.cpp:344
 msgid "Address:"
 msgstr "Cím:"
 
-#: clientgui/DlgOptions.cpp:291
-#: clientgui/DlgOptions.cpp:355
+#: DlgOptions.cpp:288 DlgOptions.cpp:352 ProxyPage.cpp:340 ProxyPage.cpp:360
 msgid "Port:"
 msgstr "Port:"
 
-#: clientgui/DlgOptions.cpp:299
-#: clientgui/DlgOptions.cpp:363
+#: DlgOptions.cpp:296 DlgOptions.cpp:360
 msgid "Don't use proxy for:"
 msgstr "Ne használja a proxit az alábbi(ak)hoz:"
 
-#: clientgui/DlgOptions.cpp:306
-#: clientgui/DlgOptions.cpp:370
+#: DlgOptions.cpp:303 DlgOptions.cpp:367
 msgid "Leave these blank if not needed"
 msgstr "Csak szükség esetén töltse ki"
 
-#: clientgui/DlgOptions.cpp:312
-#: clientgui/DlgOptions.cpp:376
+#: DlgOptions.cpp:309 DlgOptions.cpp:373 ProxyPage.cpp:343 ProxyPage.cpp:363
 msgid "User Name:"
 msgstr "Felhasználói név:"
 
-#: clientgui/DlgOptions.cpp:320
-#: clientgui/DlgOptions.cpp:384
-#: clientgui/DlgSelectComputer.cpp:152
+#: DlgOptions.cpp:317 DlgOptions.cpp:381 DlgSelectComputer.cpp:152
+#: ProxyPage.cpp:346 ProxyPage.cpp:366
 msgid "Password:"
 msgstr "Jelszó:"
 
-#: clientgui/DlgOptions.cpp:327
+#: DlgOptions.cpp:324
 msgid "HTTP Proxy"
 msgstr "HTTP proxy"
 
-#: clientgui/DlgOptions.cpp:335
+#: DlgOptions.cpp:332
 msgid "Connect via SOCKS proxy server"
 msgstr "Csatlakozás SOCKS proxy szerveren keresztül"
 
-#: clientgui/DlgOptions.cpp:339
+#: DlgOptions.cpp:336
 msgid "SOCKS Proxy Server Configuration"
 msgstr "SOCKS proxy szerver beállítása"
 
-#: clientgui/DlgOptions.cpp:391
+#: DlgOptions.cpp:388
 msgid "SOCKS Proxy"
 msgstr "SOCKS proxy"
 
-#: clientgui/DlgOptions.cpp:589
+#: DlgOptions.cpp:586
 msgid "always"
 msgstr "mindig"
 
-#: clientgui/DlgOptions.cpp:590
+#: DlgOptions.cpp:587
 msgid "1 hour"
 msgstr "1 óra"
 
-#: clientgui/DlgOptions.cpp:591
+#: DlgOptions.cpp:588
 msgid "6 hours"
 msgstr "6 óra"
 
-#: clientgui/DlgOptions.cpp:592
+#: DlgOptions.cpp:589
 msgid "1 day"
 msgstr "1 nap"
 
-#: clientgui/DlgOptions.cpp:593
+#: DlgOptions.cpp:590
 msgid "1 week"
 msgstr "1 hét"
 
-#: clientgui/DlgOptions.cpp:594
+#: DlgOptions.cpp:591
 msgid "never"
 msgstr "soha"
 
-#: clientgui/DlgOptions.cpp:691
+#: DlgOptions.cpp:688
 #, c-format
 msgid "%s - Language Selection"
 msgstr "%s - Nyelv kiválasztása"
 
-#: clientgui/DlgOptions.cpp:698
+#: DlgOptions.cpp:695
 #, 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 "A(z) %s alapértelmezett nyelve megváltozott, a változás érvénybe lépéséhez újra kell indítani %s-t."
 
-#: clientgui/DlgSelectComputer.cpp:91
+#: DlgSelectComputer.cpp:91
 #, c-format
 msgid "%s - Select Computer"
 msgstr "%s - Számítógép kiválasztása"
 
-#: clientgui/DlgSelectComputer.cpp:125
+#: DlgSelectComputer.cpp:125
 #, c-format
 msgid ""
 "Another instance of %s is already running \n"
 "on this computer.  Please select a client to monitor."
-msgstr ""
-"Jelenleg %s egy másik példánya is fut a számítógépen.\n"
-" Kérem válasszon egy klienst a megfigyeléshez."
+msgstr "Jelenleg %s egy másik példánya is fut a számítógépen.\n Kérem válasszon egy klienst a megfigyeléshez."
 
-#: clientgui/DlgSelectComputer.cpp:143
+#: DlgSelectComputer.cpp:143
 msgid "Host name:"
 msgstr "Számítógépnév:"
 
-#: clientgui/Localization.cpp:31
-#: clientgui/Localization.cpp:69
+#: Localization.cpp:31 Localization.cpp:69
 msgid "Message boards"
 msgstr "Üzenőtáblák"
 
-#: clientgui/Localization.cpp:33
+#: Localization.cpp:33
 msgid "Correspond with other users on the SETI at home message boards"
 msgstr "A többi felhasználőval levelezhet  SETI at home üzenőtábláin"
 
-#: clientgui/Localization.cpp:37
+#: Localization.cpp:37
 msgid "Ask questions and report problems"
 msgstr "Tegyen fel kérdéseit és jelentse a problémákat"
 
-#: clientgui/Localization.cpp:39
-#: clientgui/Localization.cpp:81
-#: clientgui/Localization.cpp:111
-#: clientgui/Localization.cpp:129
+#: Localization.cpp:39 Localization.cpp:81 Localization.cpp:111
+#: Localization.cpp:129
 msgid "Your account"
 msgstr "Az Ön fiókja"
 
-#: clientgui/Localization.cpp:41
-#: clientgui/Localization.cpp:87
-#: clientgui/Localization.cpp:113
+#: Localization.cpp:41 Localization.cpp:87 Localization.cpp:113
 msgid "View your account information and credit totals"
 msgstr "Megnézheti a fiókjának adatait és az kredit összesítéseket"
 
-#: clientgui/Localization.cpp:43
+#: Localization.cpp:43
 msgid "Your preferences"
 msgstr "Az Ön beállításai"
 
-#: clientgui/Localization.cpp:45
+#: Localization.cpp:45
 msgid "View and modify your SETI at home account profile and preferences"
 msgstr "Megnézheti és megváltoztathatja a SETI at home fiók profilját és beállításait"
 
-#: clientgui/Localization.cpp:47
-#: clientgui/Localization.cpp:89
+#: Localization.cpp:47 Localization.cpp:89
 msgid "Your results"
 msgstr "Az Ön eredményei"
 
-#: clientgui/Localization.cpp:49
-#: clientgui/Localization.cpp:91
+#: Localization.cpp:49 Localization.cpp:91
 msgid "View your last week (or more) of computational results and work"
 msgstr "Megnézheti a múlt (esetleg több) hét számítási eredményeit és munkáit"
 
-#: clientgui/Localization.cpp:51
-#: clientgui/Localization.cpp:93
+#: Localization.cpp:51 Localization.cpp:93
 msgid "Your computers"
 msgstr "Az Ön számítógépei"
 
-#: clientgui/Localization.cpp:53
+#: Localization.cpp:53
 msgid "View a listing of all the computers on which you are running SETI at Home"
 msgstr "Megnézheti azon számítógépeinek listáját, amelyekkel Ön a SETI at home-hoz csatlakozott"
 
-#: clientgui/Localization.cpp:55
-#: clientgui/Localization.cpp:97
+#: Localization.cpp:55 Localization.cpp:97
 msgid "Your team"
 msgstr "Az Ön csapata"
 
-#: clientgui/Localization.cpp:57
-#: clientgui/Localization.cpp:99
+#: Localization.cpp:57 Localization.cpp:99
 msgid "View information about your team"
 msgstr "Megnézheti a csapatának adatait"
 
-#: clientgui/Localization.cpp:61
+#: Localization.cpp:61
 msgid "Common questions"
 msgstr "Általános kérdések"
 
-#: clientgui/Localization.cpp:63
+#: Localization.cpp:63
 msgid "Read the Einstein at Home Frequently Asked Question list"
 msgstr "Olvassa el az Einstein at Home gyakori kérdések listáját"
 
-#: clientgui/Localization.cpp:65
+#: Localization.cpp:65
 msgid "Screensaver info"
 msgstr "Képernyővédő infó"
 
-#: clientgui/Localization.cpp:67
+#: Localization.cpp:67
 msgid "Read a detailed description of the Einstein at Home screensaver"
 msgstr "Olvassa el az Einstein at Home képernyővédő részletes leírását"
 
-#: clientgui/Localization.cpp:71
-msgid "Correspond with admins and other users on the Einstein at Home message boards"
+#: Localization.cpp:71
+msgid ""
+"Correspond with admins and other users on the Einstein at Home message boards"
 msgstr "Társalogjon az Einstein at Home üzenőfalán az adminisztrátorokkal és más felhasználókkal"
 
-#: clientgui/Localization.cpp:73
+#: Localization.cpp:73
 msgid "Einstein status"
 msgstr "Einstein állapot"
 
-#: clientgui/Localization.cpp:75
+#: Localization.cpp:75
 msgid "Current status of the Einstein at Home server"
 msgstr "Az Einstein at Home szerver jelenlegi állapota"
 
-#: clientgui/Localization.cpp:77
+#: Localization.cpp:77
 msgid "Report problems"
 msgstr "Hibabejelentés"
 
-#: clientgui/Localization.cpp:79
+#: Localization.cpp:79
 msgid "A link to the Einstein at Home problems and bug reports message board"
 msgstr "Link az Einstein at Home probléma- és hibajelentések üzenőfalára"
 
-#: clientgui/Localization.cpp:83
+#: Localization.cpp:83
 msgid "View and modify your Einstein at Home account profile and preferences"
 msgstr "Megnézheti és megváltoztathatja az Einstein at Home fiók profilját és beállításait"
 
-#: clientgui/Localization.cpp:85
+#: Localization.cpp:85
 msgid "Account summary"
 msgstr "Felhasználói fiók összegzése"
 
-#: clientgui/Localization.cpp:95
-msgid "View a listing of all the computers on which you are running Einstein at Home"
+#: Localization.cpp:95
+msgid ""
+"View a listing of all the computers on which you are running Einstein at Home"
 msgstr "Megnézheti azon számítógépeinek listáját, amelyekkel Ön az Einstein at Home-hoz csatlakozott"
 
-#: clientgui/Localization.cpp:101
+#: Localization.cpp:101
 msgid "LIGO project"
 msgstr "LIGO projekt"
 
-#: clientgui/Localization.cpp:103
-msgid "The home page of the Laser Interferometer Gravitational-wave Observatory (LIGO) project"
+#: Localization.cpp:103
+msgid ""
+"The home page of the Laser Interferometer Gravitational-wave Observatory "
+"(LIGO) project"
 msgstr "A Lézer-interferometrikus Gravitációs-hullám Obszervatórium (LIGO) projekt honlapja"
 
-#: clientgui/Localization.cpp:105
+#: Localization.cpp:105
 msgid "GEO-600 project"
 msgstr "GEO-600 projekt"
 
-#: clientgui/Localization.cpp:107
+#: Localization.cpp:107
 msgid "The home page of the GEO-600 project"
 msgstr "A GEO-600 projekt honlapja"
 
-#: clientgui/Localization.cpp:115
-#: clientgui/Localization.cpp:133
+#: Localization.cpp:115 Localization.cpp:133 ViewProjects.cpp:221
+#: ViewStatistics.cpp:465
 msgid "Team"
 msgstr "Csapat"
 
-#: clientgui/Localization.cpp:117
+#: Localization.cpp:117
 msgid "Info about your Team"
 msgstr "Információk a csapatáról"
 
-#: clientgui/Localization.cpp:123
+#: Localization.cpp:123
 msgid "Get help for climateprediction.net"
 msgstr "Segítség a climateprediction.net-hez"
 
-#: clientgui/Localization.cpp:125
+#: Localization.cpp:125
 msgid "News"
 msgstr "Hírek"
 
-#: clientgui/Localization.cpp:127
+#: Localization.cpp:127
 msgid "climateprediction.net News"
 msgstr "climateprediction.net hírek"
 
-#: clientgui/Localization.cpp:131
+#: Localization.cpp:131
 msgid "View your account information, credits, and trickles"
 msgstr "Megnézheti a felhasználói fiókja információit, kreditjeit és fejleményeit"
 
-#: clientgui/Localization.cpp:135
+#: Localization.cpp:135
 msgid "Info about your team"
 msgstr "Információ a csapatáról"
 
-#: clientgui/Localization.cpp:141
+#: Localization.cpp:141
 msgid "Search for help in our help system"
 msgstr "Segítség keresése adatbázisunkban"
 
-#: clientgui/Localization.cpp:143
+#: Localization.cpp:143
 msgid "Global Statistics"
 msgstr "Globális statisztikák"
 
-#: clientgui/Localization.cpp:145
+#: Localization.cpp:145
 msgid "Summary statistics for World Community Grid"
 msgstr "A World Community Grid összegző statisztikái"
 
-#: clientgui/Localization.cpp:147
+#: Localization.cpp:147
 msgid "My Grid"
 msgstr "Gridem"
 
-#: clientgui/Localization.cpp:149
+#: Localization.cpp:149
 msgid "Your statistics and settings"
 msgstr "Az Ön statisztikái és beállításai"
 
-#: clientgui/Localization.cpp:151
+#: Localization.cpp:151
 msgid "Device Profiles"
 msgstr "Eszközprofilok"
 
-#: clientgui/Localization.cpp:153
+#: Localization.cpp:153
 msgid "Update your device settings"
 msgstr "Frissítse eszközbeállításait"
 
-#: clientgui/Localization.cpp:155
+#: Localization.cpp:155
 msgid "Research"
 msgstr "Kutatás"
 
-#: clientgui/Localization.cpp:157
+#: Localization.cpp:157
 msgid "Learn about the projects hosted at World Community Grid"
 msgstr "Tudjon meg többet a World Community Gridnél futó projektekről"
 
-#: clientgui/MainDocument.cpp:583
+#: MainDocument.cpp:583
 msgid "Starting client"
 msgstr "Induló kliens"
 
-#: clientgui/MainDocument.cpp:591
+#: MainDocument.cpp:591
 msgid "Connecting to client"
 msgstr "Csatlakozás a klienshez"
 
-#: clientgui/MainDocument.cpp:1205
+#: MainDocument.cpp:1195
 msgid "Retrieving system state; please wait..."
 msgstr "Rendszerállapot lekérdezése, kérem várjon..."
 
-#: clientgui/MainDocument.cpp:1826
+#: MainDocument.cpp:1816
 msgid "Missing application"
 msgstr "Hiányzó alkalmazás"
 
-#: clientgui/MainDocument.cpp:1827
-msgid "Please download and install the CoRD application from http://cord.sourceforge.net"
+#: MainDocument.cpp:1817
+msgid ""
+"Please download and install the CoRD application from "
+"http://cord.sourceforge.net"
 msgstr "Kérjük, töltse le és telepítse a CoRD alkalmazást a http://cord.sourceforge.net oldalról"
 
-#: clientgui/MainDocument.cpp:2442
+#: MainDocument.cpp:2432
 msgid "on batteries"
 msgstr "akkumulátorról működik"
 
-#: clientgui/MainDocument.cpp:2443
+#: MainDocument.cpp:2433
 msgid "computer is in use"
 msgstr "a számítógép használatban van"
 
-#: clientgui/MainDocument.cpp:2444
+#: MainDocument.cpp:2434
 msgid "user request"
 msgstr "felhasználói kérés"
 
-#: clientgui/MainDocument.cpp:2445
+#: MainDocument.cpp:2435
 msgid "time of day"
 msgstr "napszak"
 
-#: clientgui/MainDocument.cpp:2446
+#: MainDocument.cpp:2436
 msgid "CPU benchmarks in progress"
 msgstr "CPU sebességmérés fut"
 
-#: clientgui/MainDocument.cpp:2447
+#: MainDocument.cpp:2437
 msgid "need disk space - check preferences"
 msgstr "több lemezterület szükséges - ellenőrizze a beállításokat"
 
-#: clientgui/MainDocument.cpp:2448
+#: MainDocument.cpp:2438
 msgid "computer is not in use"
 msgstr "a számítógép nincs használatban"
 
-#: clientgui/MainDocument.cpp:2449
+#: MainDocument.cpp:2439
 msgid "starting up"
 msgstr "elindulás"
 
-#: clientgui/MainDocument.cpp:2450
+#: MainDocument.cpp:2440
 msgid "an exclusive app is running"
 msgstr "egy alkalmazás kizárólagosan fut"
 
-#: clientgui/MainDocument.cpp:2451
+#: MainDocument.cpp:2441
 msgid "CPU is busy"
 msgstr "a CPU foglalt"
 
-#: clientgui/MainDocument.cpp:2452
+#: MainDocument.cpp:2442
 msgid "network bandwidth limit exceeded"
 msgstr "hálózati sávszélességi korlát túllépve"
 
-#: clientgui/MainDocument.cpp:2453
+#: MainDocument.cpp:2443
 msgid "requested by operating system"
 msgstr "az operációs rendszer kérésére"
 
-#: clientgui/MainDocument.cpp:2455
+#: MainDocument.cpp:2445
 msgid "unknown reason"
 msgstr "ismerelten ok"
 
-#: clientgui/MainDocument.cpp:2477
+#: MainDocument.cpp:2467
 msgid "GPU missing, "
 msgstr "GPU hiányzik,"
 
-#: clientgui/MainDocument.cpp:2484
+#: MainDocument.cpp:2474
 msgid "New"
 msgstr "Új"
 
-#: clientgui/MainDocument.cpp:2488
+#: MainDocument.cpp:2478
 msgid "Download failed"
 msgstr "Sikertelen letöltés"
 
-#: clientgui/MainDocument.cpp:2490
+#: MainDocument.cpp:2480
 msgid "Downloading"
 msgstr "Letöltés..."
 
-#: clientgui/MainDocument.cpp:2492
-#: clientgui/MainDocument.cpp:2557
+#: MainDocument.cpp:2482 MainDocument.cpp:2552
 msgid " (suspended - "
 msgstr " (felfüggesztve - "
 
-#: clientgui/MainDocument.cpp:2500
+#: MainDocument.cpp:2490
 msgid "Project suspended by user"
 msgstr "A projektet a felhasználó felfüggesztette"
 
-#: clientgui/MainDocument.cpp:2502
+#: MainDocument.cpp:2492
 msgid "Task suspended by user"
 msgstr "A feladatot a felhasználó felfüggesztette"
 
-#: clientgui/MainDocument.cpp:2504
+#: MainDocument.cpp:2494
 msgid "Suspended - "
 msgstr "Felfüggesztve - "
 
-# 75%
-#: clientgui/MainDocument.cpp:2510
-#, fuzzy
+#: MainDocument.cpp:2500
 msgid "GPU suspended - "
-msgstr " (felfüggesztve - "
+msgstr "GPU felfüggesztve - "
 
-#: clientgui/MainDocument.cpp:2517
+#: MainDocument.cpp:2507
 msgid "Waiting for memory"
 msgstr "Várakozás memóriára"
 
-#: clientgui/MainDocument.cpp:2519
+#: MainDocument.cpp:2509
 msgid "Waiting for shared memory"
 msgstr "Várakozás megosztott memóriára"
 
-#: clientgui/MainDocument.cpp:2521
+#: MainDocument.cpp:2512
+msgid "Running, high priority"
+msgstr "Fut (magas prioritással)"
+
+#: MainDocument.cpp:2514
 msgid "Running"
 msgstr "Fut"
 
-#: clientgui/MainDocument.cpp:2523
+#: MainDocument.cpp:2517
 msgid " (non-CPU-intensive)"
 msgstr " (nem CPU igényes)"
 
-#: clientgui/MainDocument.cpp:2526
+#: MainDocument.cpp:2520
 msgid "Waiting to run"
 msgstr "Futásra vár"
 
-#: clientgui/MainDocument.cpp:2528
-#: clientgui/MainDocument.cpp:2534
+#: MainDocument.cpp:2522 MainDocument.cpp:2528
 msgid "Ready to start"
 msgstr "Indításra kész"
 
-#: clientgui/MainDocument.cpp:2538
-msgid "Postponed: "
-msgstr ""
+#: MainDocument.cpp:2532
+msgid " (Scheduler wait: "
+msgstr "(Ütemező vár: "
 
-#: clientgui/MainDocument.cpp:2541
-msgid "Postponed"
-msgstr ""
+#: MainDocument.cpp:2536
+msgid " (Scheduler wait)"
+msgstr "(Ütemező vár)"
 
-#: clientgui/MainDocument.cpp:2545
-msgid "Waiting for network access"
-msgstr ""
+#: MainDocument.cpp:2540
+msgid " (Waiting for network access)"
+msgstr "(Várakozás hálózati hozzáférésre)"
 
-#: clientgui/MainDocument.cpp:2549
+#: MainDocument.cpp:2544
 msgid "Computation error"
 msgstr "Számolási hiba"
 
-#: clientgui/MainDocument.cpp:2553
+#: MainDocument.cpp:2548
 msgid "Upload failed"
 msgstr "Sikertelen feltöltés"
 
-#: clientgui/MainDocument.cpp:2555
+#: MainDocument.cpp:2550
 msgid "Uploading"
 msgstr "Feltöltés..."
 
-#: clientgui/MainDocument.cpp:2566
+#: MainDocument.cpp:2561
 msgid "Aborted by user"
 msgstr "Felhasználó által eldobva"
 
-#: clientgui/MainDocument.cpp:2569
+#: MainDocument.cpp:2564
 msgid "Aborted by project"
 msgstr "A projekt által eldobva"
 
-#: clientgui/MainDocument.cpp:2572
+#: MainDocument.cpp:2567
 msgid "Aborted: not started by deadline"
 msgstr "Eldobva: a jelentési határidőig nem indult el"
 
-#: clientgui/MainDocument.cpp:2575
+#: MainDocument.cpp:2570
 msgid "Aborted: disk limit exceeded"
-msgstr ""
+msgstr "Megszakítva: tárhelykorlát meghaladva"
 
-#: clientgui/MainDocument.cpp:2578
+#: MainDocument.cpp:2573
 msgid "Aborted: run time limit exceeded"
-msgstr ""
+msgstr "Megszakítva: futási idő korlát túllépve"
 
-#: clientgui/MainDocument.cpp:2581
+#: MainDocument.cpp:2576
 msgid "Aborted: memory limit exceeded"
-msgstr ""
+msgstr "Megszakítva: memória korlát túllépve"
 
-#: clientgui/MainDocument.cpp:2584
+#: MainDocument.cpp:2579
 msgid "Aborted"
 msgstr "Eldobva"
 
-#: clientgui/MainDocument.cpp:2589
+#: MainDocument.cpp:2584
 msgid "Acknowledged"
 msgstr "Nyugtázva"
 
-#: clientgui/MainDocument.cpp:2591
+#: MainDocument.cpp:2586
 msgid "Ready to report"
 msgstr "Jelentésre kész"
 
-#: clientgui/MainDocument.cpp:2593
+#: MainDocument.cpp:2588
 #, c-format
 msgid "Error: invalid state '%d'"
 msgstr "Hiba: érvénytelen állapot \"%d\""
 
-#: clientgui/NoInternetConnectionPage.cpp:179
+#: NoInternetConnectionPage.cpp:179
 msgid "No Internet connection"
 msgstr "Nincs internetkapcsolat"
 
-#: clientgui/NoInternetConnectionPage.cpp:182
+#: NoInternetConnectionPage.cpp:182
 msgid "Please connect to the Internet and try again."
 msgstr "Kérem, kapcsolódjon az internetre, és próbálja úrja."
 
-#: clientgui/NotDetectedPage.cpp:181
+#: NotDetectedPage.cpp:181
 msgid "Project not found"
 msgstr "Projekt nem található"
 
-#: clientgui/NotDetectedPage.cpp:184
+#: 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 ""
-"Az Ön által megadott URL nem egy BOINC-alapú projektre mutat.\n"
-"\n"
-"Kérjük, ellenőrizze az URL-t és próbálja újra."
+msgstr "Az Ön által megadott URL nem egy BOINC-alapú projektre mutat.\n\nKérjük, ellenőrizze az URL-t és próbálja újra."
 
-#: clientgui/NotDetectedPage.cpp:188
+#: NotDetectedPage.cpp:188
 msgid "Account manager not found"
 msgstr "Fiókkezelő nem található"
 
-#: clientgui/NotDetectedPage.cpp:191
+#: NotDetectedPage.cpp:191
 msgid ""
 "The URL you supplied is not that of a BOINC-based account\n"
 "manager.\n"
 "\n"
 "Please check the URL and try again."
-msgstr ""
-"Az Ön által megadott URL nem egy BOINC-alapú fiókkezelőre\n"
-"mutat.\n"
-"\n"
-"Kérjük, ellenőrizze az URL-t és próbálja újra."
+msgstr "Az Ön által megadott URL nem egy BOINC-alapú fiókkezelőre\nmutat.\n\nKérjük, ellenőrizze az URL-t és próbálja újra."
 
-#: clientgui/NotFoundPage.cpp:181
+#: NotFoundPage.cpp:181
 msgid "Login Failed."
 msgstr "A bejelentkezés sikertelen."
 
-#: clientgui/NotFoundPage.cpp:185
+#: NotFoundPage.cpp:185
 msgid "Check the username and password, and try again."
 msgstr "Ellenőrizze a felhasználónevet és a jelszót, majd próbálja újra."
 
-#: clientgui/NotFoundPage.cpp:189
+#: NotFoundPage.cpp:189
 msgid "Check the email address and password, and try again."
 msgstr "Ellenőrizze az emailcímet és a jelszót, majd próbálja újra."
 
-#: clientgui/NoticeListCtrl.cpp:229
+#: NoticeListCtrl.cpp:222
 msgid "more..."
 msgstr "tovább..."
 
-#: clientgui/ProjectInfoPage.cpp:221
+#: ProjectInfoPage.cpp:477 ProjectInfoPage.cpp:778 ProjectInfoPage.cpp:782
+msgid "All"
+msgstr "Mind"
+
+#: ProjectInfoPage.cpp:615
 msgid "Choose a project"
 msgstr "Válasszon egy projektet"
 
-#: clientgui/ProjectInfoPage.cpp:228
+#: ProjectInfoPage.cpp:619
 msgid "To choose a project, click its name or type its URL below."
 msgstr "Projekt kiválasztásához kattintson annak nevére vagy gépelje be alább az URL-jét."
 
-#: clientgui/ProjectInfoPage.cpp:246
+#: ProjectInfoPage.cpp:623
 msgid "Categories:"
 msgstr "Kategóriák:"
 
-#: clientgui/ProjectInfoPage.cpp:267
+#: ProjectInfoPage.cpp:627 sg_ProjectPanel.cpp:89
 msgid "Projects:"
 msgstr "Projektek:"
 
-#: clientgui/ProjectInfoPage.cpp:279
+#: ProjectInfoPage.cpp:631
 msgid "Project details"
 msgstr "Projekt részletek"
 
-#: clientgui/ProjectInfoPage.cpp:291
+#: ProjectInfoPage.cpp:635
 msgid "Research area:"
 msgstr "Kutatási terület:"
 
-#: clientgui/ProjectInfoPage.cpp:302
+#: ProjectInfoPage.cpp:639
 msgid "Organization:"
 msgstr "Szervezet:"
 
-#: clientgui/ProjectInfoPage.cpp:313
+#: ProjectInfoPage.cpp:643
 msgid "Web site:"
 msgstr "Weboldal:"
 
-#: clientgui/ProjectInfoPage.cpp:325
+#: ProjectInfoPage.cpp:647
 msgid "Supported systems:"
 msgstr "Támogatott rendszerek:"
 
-#: clientgui/ProjectInfoPage.cpp:363
+#: ProjectInfoPage.cpp:651
 msgid "Project URL:"
 msgstr "Projekt URL:"
 
-#: clientgui/ProjectInfoPage.cpp:499
-#: clientgui/ProjectInfoPage.cpp:754
-#: clientgui/ProjectInfoPage.cpp:758
-msgid "All"
-msgstr "Mind"
-
-#: clientgui/ProjectInfoPage.cpp:802
-msgid "This project may not have work for your type of computer.  Do you want to add it anyway?"
+#: ProjectInfoPage.cpp:826
+msgid ""
+"This project may not have work for your type of computer.  Do you want to "
+"add it anyway?"
 msgstr "Elképzelhető, hogy ez a projekt nem tud az Ön számítógépének megfelelő munkát biztosítani. Mégis hozzá szeretné adni?"
 
-#: clientgui/ProjectInfoPage.cpp:826
+#: ProjectInfoPage.cpp:850
 msgid "You already added this project. Please choose a different project."
 msgstr "Már hozzáadta ezt a projektet. Kérjük, válasszon másikat."
 
-#: clientgui/ProjectProcessingPage.cpp:321
+#: ProjectProcessingPage.cpp:321
 msgid "Communicating with project."
 msgstr "Kommunikáció a projekttel."
 
-#: clientgui/ProjectProcessingPage.cpp:510
+#: ProjectProcessingPage.cpp:509
 msgid "Required files not found on the server."
 msgstr "A szükséges fájlok nem találhatók a szerveren."
 
-#: clientgui/ProjectProcessingPage.cpp:513
-#: clientgui/ProjectProcessingPage.cpp:586
+#: ProjectProcessingPage.cpp:512 ProjectProcessingPage.cpp:574
 msgid "An internal server error has occurred."
 msgstr "Belső szerverhiba történt."
 
-#: clientgui/ProjectPropertiesPage.cpp:334
+#: ProjectPropertiesPage.cpp:334
 msgid ""
 "Communicating with project\n"
 "Please wait..."
-msgstr ""
-"Kommunikáció a projekttel.\n"
-"Kérem, várjon..."
-
-#: clientgui/ProjectWelcomePage.cpp:251
-#, c-format
-msgid "Welcome to %s."
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:254
-msgid "You have volunteered to compute for this project:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:255
-msgid "Name:"
-msgstr "Név:"
-
-#: clientgui/ProjectWelcomePage.cpp:258
-msgid "Home:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:262
-msgid "Description:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:265
-msgid "URL:"
-msgstr "URL:"
-
-#: clientgui/ProjectWelcomePage.cpp:268
-msgid "User:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:273
-msgid "WARNING: This project is not registered with BOINC.  Make sure you trust it before continuing."
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:277
-msgid "To continue, click Next."
-msgstr "A folytatáshoz kattintson az Előre gomba"
+msgstr "Kommunikáció a projekttel.\nKérem, várjon..."
 
-#: clientgui/ProxyInfoPage.cpp:195
+#: ProxyInfoPage.cpp:195
 msgid "Network communication failure"
 msgstr "Hálózati kommunikációs hiba"
 
-#: clientgui/ProxyInfoPage.cpp:199
+#: ProxyInfoPage.cpp:199
 msgid ""
 "The World Community Grid - BOINC software failed to communicate\n"
 "over the Internet. The most likely reasons are:\n"
@@ -2716,23 +2486,9 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"A World Community Grid - BOINC szoftver nem tudott kommunikálni\n"
-"az interneten keresztül. A legvalószínűbb okok:\n"
-"\n"
-"1) Összeköttetési probléma. Ellenőrizze a hálózati- vagy\n"
-"modemcsatlakozását, majd kattintson a Vissza gombra az\n"
-"újrapróbáláshoz.\n"
-"\n"
-"2) Személyes tűzfalprogram blokkolja a World Community Grid -\n"
-"BOINC szoftvert. Állítsa be tűzfalát úgy, hogy az engedje a BOINC-ot\n"
-"és a BOINC Managert a 80-as és a 443-as portokon kommunikálni,\n"
-"majd kattintson a Vissza gombra az újrapróbáláshoz.\n"
-"\n"
-"3) Proxy szervert használ.\n"
-"Kattintson a Tovább gombra a BOINC proxybeállításainak megadásához."
+msgstr "A World Community Grid - BOINC szoftver nem tudott kommunikálni\naz interneten keresztül. A legvalószínűbb okok:\n\n1) Összeköttetési probléma. Ellenőrizze a hálózati- vagy\nmodemcsatlakozását, majd kattintson a Vissza gombra az\nújrapróbáláshoz.\n\n2) Személyes tűzfalprogram blokkolja a World Community Grid -\nBOINC szoftvert. Állítsa be tűzfalát úgy, hogy az engedje a BOINC-ot\nés a BOINC Managert a 80-as és a 443-as portokon kommunikálni,\nmajd kattintson a Vissza gombra az új [...]
 
-#: clientgui/ProxyInfoPage.cpp:203
+#: ProxyInfoPage.cpp:203
 msgid ""
 "BOINC failed to communicate on the Internet.\n"
 "The most likely reasons are:\n"
@@ -2747,2107 +2503,1201 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"A BOINC nem tudott kommunikálni az interneten keresztül.\n"
-"A legvalószínűbb okok:\n"
-"\n"
-"1) Összeköttetési probléma. Ellenőrizze a hálózati- vagy\n"
-"modemcsatlakozását, majd kattintson a Vissza gombra az\n"
-"újrapróbáláshoz.\n"
-"\n"
-"2) Személyes tűzfalprogram blokkolja a BOINC-ot. Állítsa be\n"
-"tűzfalát úgy, hogy az engedje a BOINC-ot és a\n"
-"BOINC Managert a 80-as porton kommunikálni,\n"
-"majd kattintson a Vissza gombra az újrapróbáláshoz.\n"
-"\n"
-"3) Proxy szervert használ.\n"
-"Kattintson a Tovább gombra a BOINC proxybeállításainak megadásához."
+msgstr "A BOINC nem tudott kommunikálni az interneten keresztül.\nA legvalószínűbb okok:\n\n1) Összeköttetési probléma. Ellenőrizze a hálózati- vagy\nmodemcsatlakozását, majd kattintson a Vissza gombra az\nújrapróbáláshoz.\n\n2) Személyes tűzfalprogram blokkolja a BOINC-ot. Állítsa be\ntűzfalát úgy, hogy az engedje a BOINC-ot és a\nBOINC Managert a 80-as porton kommunikálni,\nmajd kattintson a Vissza gombra az újrapróbáláshoz.\n\n3) Proxy szervert használ.\nKattintson a Tovább gombra a B [...]
 
-#: clientgui/ProxyPage.cpp:331
+#: ProxyPage.cpp:331
 msgid "Proxy configuration"
 msgstr "Proxy beállítás"
 
-#: clientgui/ProxyPage.cpp:334
+#: ProxyPage.cpp:334
 msgid "HTTP proxy"
 msgstr "HTTP proxy"
 
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
+#: ProxyPage.cpp:337 ProxyPage.cpp:357
 msgid "Server:"
 msgstr "Server:"
 
-#: clientgui/ProxyPage.cpp:350
+#: ProxyPage.cpp:350
 msgid "Autodetect"
 msgstr "Automatikus felismerés"
 
-#: clientgui/ProxyPage.cpp:354
+#: ProxyPage.cpp:354
 msgid "SOCKS proxy"
 msgstr "SOCKS proxy"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:167
-msgid "Advanced View...\tCtrl+Shift+A"
-msgstr "Haladó nézet...\t Ctrl+Shift+A"
+#: TermsOfUsePage.cpp:218
+msgid "Terms of Use"
+msgstr "Felhasználási feltételek"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:168
-msgid "Display the advanced graphical interface."
-msgstr "Az haladó grafikus felület megjelenítése."
+#: TermsOfUsePage.cpp:222
+msgid "Please read the following terms of use:"
+msgstr "Kérjük, olvassa el a következő felhasználási feltételeket:"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:175
-msgid "Skin"
-msgstr "Kinézet"
+#: TermsOfUsePage.cpp:231
+msgid "I agree to the terms of use."
+msgstr "Elfogadom a felhasználási feltételeket."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:177
-msgid "Select the appearance of the user interface."
-msgstr "Válassza ki a felhasználói felület kinézetét."
+#: TermsOfUsePage.cpp:237
+msgid "I do not agree to the terms of use."
+msgstr "Nem fogadom el a felhasználási feltételeket."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:224
-#, c-format
-msgid "&%s"
-msgstr "&%s"
+#: UnavailablePage.cpp:183
+msgid "Project temporarily unavailable"
+msgstr "Projekt ideiglenesen nem elérhető"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:405
-msgid "Default"
-msgstr "Alapértelmezett"
+#: UnavailablePage.cpp:186
+msgid ""
+"The project is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "A projekt ideiglenesen nem elérhető.\n\nKérem, próbálja úrja. "
 
-#: clientgui/sg_BoincSimpleFrame.cpp:848
-msgid "Suspend"
-msgstr "Felfüggesztés"
+#: UnavailablePage.cpp:190
+msgid "Account manager temporarily unavailable"
+msgstr "Fiókkezelő ideiglenesen nem elérhető"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:850
-msgid "Suspend Computing"
-msgstr "Számítás felfüggesztése"
+#: UnavailablePage.cpp:193
+msgid ""
+"The account manager is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "A fiókkezelő ideiglenesen nem elérhető.\n\nKérem, próbálja úrja. "
 
-#: clientgui/sg_BoincSimpleFrame.cpp:851
-msgid "Resume Computing"
-msgstr "Számítás folytatása"
+#: ValidateAccountKey.cpp:68
+msgid "Please specify an account key to continue."
+msgstr "Kérem adjon meg egy fiókkulcsot a folytatáshoz"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:867
-msgid "Notices"
-msgstr "Értesítések"
+#: ValidateAccountKey.cpp:71
+msgid "Invalid Account Key; please enter a valid Account Key"
+msgstr "Érvénytelen fiókkulcs, kérem, adjon meg egy érvényes fiókkulcsot"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:868
-msgid "Open a window to view notices from projects or BOINC"
-msgstr "Ablak nyitása a BOINC-tól vagy a projektektől érkező üzenetek megtekintéséhez"
+#: ValidateAccountKey.cpp:82 ValidateEmailAddress.cpp:86
+msgid "Validation conflict"
+msgstr "Ellenőrzési hiba"
 
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
-msgstr ""
+#: ValidateEmailAddress.cpp:72
+msgid "Please specify an email address"
+msgstr "Kérjük, adja meg email címét"
 
-#: clientgui/sg_DlgMessages.cpp:132
-msgid "There are no notices at this time."
-msgstr "Jelenleg nincsenek megjegyzések."
+#: ValidateEmailAddress.cpp:75
+msgid "Invalid email address; please enter a valid email address"
+msgstr "Érvénytelen email cím; kérjük, érvényes emailcímet adjon meg"
 
-#: clientgui/sg_DlgMessages.cpp:146
-msgid "Close"
-msgstr "Bezár"
+#: ValidateURL.cpp:69
+msgid "Missing URL"
+msgstr "Hiányzó URL"
 
-#: clientgui/sg_DlgMessages.cpp:394
-#, c-format
-msgid "%s - Notices"
-msgstr "%s - Értesítések"
+#: ValidateURL.cpp:70
+msgid ""
+"Please specify a URL.\n"
+"For example:\n"
+"http://www.example.com/"
+msgstr "Kérem adjon meg egy URL-t.\nPéldául:\nhttp://www.pelda.hu/"
 
-#: clientgui/sg_DlgPreferences.cpp:270
-msgid "This dialog controls preferences for this computer only."
-msgstr "Ez a panel csak ennek a számítógépnek a beállításait befolyásolja."
+#: ValidateURL.cpp:83 ValidateURL.cpp:87 ValidateURL.cpp:91
+#: ValidateURL.cpp:103 ValidateURL.cpp:107 ValidateURL.cpp:110
+msgid "Invalid URL"
+msgstr "Érvénytelen URL"
 
-#: clientgui/sg_DlgPreferences.cpp:275
-msgid "Click OK to set preferences."
-msgstr "Kattintson az OK-ra a beállítások érvényesítéséhez."
+#: ValidateURL.cpp:84 ValidateURL.cpp:88 ValidateURL.cpp:92
+msgid ""
+"Please specify a valid URL.\n"
+"For example:\n"
+"http://boincproject.example.com"
+msgstr "Kérjük, adjon meg egy érvényes URL-t.\nPéldául:\nhttp://boincprojekt.pelda.hu"
 
-#: clientgui/sg_DlgPreferences.cpp:280
-msgid "Click Clear to restore web-based settings for all preferences listed below."
-msgstr ""
+#: ValidateURL.cpp:104 ValidateURL.cpp:108
+#, c-format
+msgid "'%s' does not contain a valid host name."
+msgstr "\"%s\" nem tartalmaz érvényes gépnevet."
 
-#: clientgui/sg_DlgPreferences.cpp:287
-#, fuzzy
-msgid "For additional settings, select Computing Preferences in the Advanced View."
-msgstr "További beállításokhoz válassza a Számítási beállításokat a"
+#: ValidateURL.cpp:111
+#, c-format
+msgid "'%s' does not contain a valid path."
+msgstr "\"%s\" nem tartalmaz érvényes útvonalat."
 
-#: clientgui/sg_DlgPreferences.cpp:315
-msgid "Do work only between:"
-msgstr "Csak ettől eddig dolgozzon:"
+#: ViewMessages.cpp:84 ViewProjects.cpp:170 ViewStatistics.cpp:1978
+#: ViewTransfers.cpp:160 ViewWork.cpp:183
+msgid "Commands"
+msgstr "Parancsok"
 
-#: clientgui/sg_DlgPreferences.cpp:337
-msgid "Connect to internet only between:"
-msgstr "Csak ettől eddig kapcsolódhat az internetre:"
+#: ViewMessages.cpp:88
+msgid "Copy all messages"
+msgstr "Minden üzenet másolása"
 
-#: clientgui/sg_DlgPreferences.cpp:359
-#: clientgui/sg_DlgPreferences.cpp:376
-msgid "Use no more than:"
-msgstr "Legfeljebb"
+#: ViewMessages.cpp:95
+msgid "Copy selected messages"
+msgstr "Kijelölt üzenetek másolása"
 
-#: clientgui/sg_DlgPreferences.cpp:372
-msgid "of disk space"
-msgstr "%-át használja a lemezterületnek"
+#: ViewMessages.cpp:106 ViewMessages.cpp:502
+msgid "Show only this project"
+msgstr "Csak ezt a projektet mutassa"
 
-#: clientgui/sg_DlgPreferences.cpp:389
-msgid "of the processor"
-msgstr "%-át használja a processzoroknak"
+#: ViewMessages.cpp:107 ViewMessages.cpp:503
+msgid "Show only the messages for the selected project."
+msgstr "Csak a kiválasztott projekt üzeneteit mutassa."
 
-#: clientgui/sg_DlgPreferences.cpp:393
-msgid "Do work while on battery?"
-msgstr "Akkus üzem esetén dolgozhat?"
-
-#: clientgui/sg_DlgPreferences.cpp:406
-msgid "Do work after idle for:"
-msgstr "Ennyi üresjárat után dolgozhat:"
-
-#: clientgui/sg_DlgPreferences.cpp:431
-#, fuzzy
-msgid "Clear all local preferences listed above and close the dialog"
-msgstr "minden helyi beállítás törlése és a párbeszédpanel bezárása"
-
-#: clientgui/sg_DlgPreferences.cpp:609
-#: clientgui/sg_DlgPreferences.cpp:612
-#: clientgui/sg_DlgPreferences.cpp:688
-#: clientgui/sg_DlgPreferences.cpp:692
-#: clientgui/sg_DlgPreferences.cpp:704
-#: clientgui/sg_DlgPreferences.cpp:708
-#: clientgui/sg_DlgPreferences.cpp:851
-#: clientgui/sg_DlgPreferences.cpp:862
-msgid "Anytime"
-msgstr "Bármikor"
-
-#: clientgui/sg_DlgPreferences.cpp:645
-msgid "100 MB"
-msgstr "100 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:646
-msgid "200 MB"
-msgstr "200 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:647
-msgid "500 MB"
-msgstr "500 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:648
-msgid "1 GB"
-msgstr "1 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:649
-msgid "2 GB"
-msgstr "2 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:650
-msgid "5 GB"
-msgstr "5 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:651
-msgid "10 GB"
-msgstr "10 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:652
-msgid "20 GB"
-msgstr "20 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:653
-msgid "50 GB"
-msgstr "50 GB"
+#: ViewMessages.cpp:164
+msgid "Messages"
+msgstr "Üzenetek"
 
-#: clientgui/sg_DlgPreferences.cpp:654
-msgid "100 GB"
-msgstr "100 GB"
+#: ViewMessages.cpp:187
+msgid "Copying all messages to the clipboard..."
+msgstr "Minden üzenet másolása a vágólapra..."
 
-#: clientgui/sg_DlgPreferences.cpp:724
-#, c-format
-msgid "%d MB"
-msgstr "%d MB"
+#: ViewMessages.cpp:223
+msgid "Copying selected messages to the clipboard..."
+msgstr "Kiválasztott üzenetek másolása a vágólapra..."
 
-#: clientgui/sg_DlgPreferences.cpp:726
-#, c-format
-msgid "%4.2f GB"
-msgstr "%4.2f GB"
+#: ViewMessages.cpp:286
+msgid "Filtering messages..."
+msgstr "Üzenetek szűrése..."
 
-#: clientgui/sg_DlgPreferences.cpp:767
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
+#: ViewMessages.cpp:494
+msgid "Show all messages"
+msgstr "Minden üzenet mutatása"
 
-#: clientgui/sg_DlgPreferences.cpp:803
-msgid "0 (Run Always)"
-msgstr "0 (mindig fut)"
+#: ViewMessages.cpp:495
+msgid "Show messages for all projects."
+msgstr "Az összes projekt üzeneteinek mutatása."
 
-#: clientgui/sg_DlgPreferences.cpp:806
-#, c-format
-msgid "%d"
-msgstr "%d"
+#: ViewNotices.cpp:58 sg_DlgMessages.cpp:124
+msgid "Fetching notices; please wait..."
+msgstr "Megjegyzések betöltése; kérjük, várj..."
 
-#: clientgui/sg_DlgPreferences.cpp:953
-#, c-format
-msgid "%s - Computing Preferences"
-msgstr ""
+#: ViewNotices.cpp:65 sg_DlgMessages.cpp:132
+msgid "There are no notices at this time."
+msgstr "Jelenleg nincsenek megjegyzések."
 
-#: clientgui/sg_DlgPreferences.cpp:1033
-msgid "Do you really want to clear all local preferences?\n"
-msgstr "Biztosan törölni akar minden helyi beállítást?\n"
+#: ViewNotices.cpp:99 sg_BoincSimpleFrame.cpp:776
+msgid "Notices"
+msgstr "Értesítések"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:66
-#: clientgui/ViewProjects.cpp:179
+#: ViewProjects.cpp:174 sg_ProjectCommandPopup.cpp:61
 msgid "Update"
 msgstr "Frissítés"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:67
-#: clientgui/ViewProjects.cpp:180
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
+#: ViewProjects.cpp:175 sg_ProjectCommandPopup.cpp:62
+msgid ""
+"Report all completed tasks, get latest credit, get latest preferences, and "
+"possibly get more tasks."
 msgstr "Befejezett feladatok jelentése, legutóbbi kreditek és beállítások letöltése, esetlegesen új munka letöltése."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:73
-#: clientgui/sg_ProjectCommandPopup.cpp:129
-#: clientgui/ViewProjects.cpp:187
-#: clientgui/ViewProjects.cpp:727
+#: 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
+msgid "Suspend"
+msgstr "Felfüggesztés"
+
+#: ViewProjects.cpp:182 ViewProjects.cpp:722 sg_ProjectCommandPopup.cpp:68
+#: sg_ProjectCommandPopup.cpp:114
 msgid "Suspend tasks for this project."
 msgstr "Ezen projekt feladatainak felfüggesztése."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:78
-#: clientgui/sg_ProjectCommandPopup.cpp:136
-#: clientgui/ViewProjects.cpp:193
-#: clientgui/ViewProjects.cpp:746
+#: ViewProjects.cpp:188 ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:73
+#: sg_ProjectCommandPopup.cpp:121
 msgid "No new tasks"
 msgstr "Nincs új feladat"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:79
-#: clientgui/ViewProjects.cpp:194
+#: ViewProjects.cpp:189 sg_ProjectCommandPopup.cpp:74
 msgid "Don't get new tasks for this project."
 msgstr "Ehhez a projekthez nem töltődnek le új feladatok."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:200
+#: ViewProjects.cpp:195 sg_ProjectCommandPopup.cpp:79
 msgid "Reset project"
 msgstr "Projekt nullázása"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:85
-#: clientgui/ViewProjects.cpp:201
-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."
+#: ViewProjects.cpp:196 sg_ProjectCommandPopup.cpp:80
+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 "A projekthez kapcsolódó összes fájl és feladat törlése, és új feladatok kérése. Először frissítse a projektet, hogy ezzel az összes elkészült feladatot jelentse."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:91
-#: clientgui/ViewProjects.cpp:208
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
+#: ViewProjects.cpp:203 sg_ProjectCommandPopup.cpp:86
+msgid ""
+"Remove this project.  Tasks in progress will be lost (use 'Update' first to "
+"report any completed tasks)."
 msgstr "A számítógép leválasztása a projektről. Folyamatban lévő munka elvész (először használja a 'Frissítés'-t, hogy az összes elkészült munkát jelentse)."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:96
-#: clientgui/sg_TaskCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:214
+#: ViewProjects.cpp:209 ViewWork.cpp:222 sg_ProjectCommandPopup.cpp:91
+#: sg_TaskCommandPopup.cpp:78
 msgid "Properties"
 msgstr "Tulajdonságok"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:97
-#: clientgui/ViewProjects.cpp:215
+#: ViewProjects.cpp:210 sg_ProjectCommandPopup.cpp:92
 msgid "Show project details."
 msgstr "A projekt részleteinek mutatása."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:126
-#: clientgui/ViewProjects.cpp:723
-msgid "Resume tasks for this project."
-msgstr "Ezen projekt feladatainak folytatása."
+#: ViewProjects.cpp:220 ViewStatistics.cpp:450
+msgid "Account"
+msgstr "Fiók"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:133
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow new tasks"
-msgstr "Új feladatok engedélyezése"
+#: ViewProjects.cpp:222
+msgid "Work done"
+msgstr "Elkészült munka"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:134
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow fetching new tasks for this project."
-msgstr "Engedélyezi új feladatok letöltését e projekthez."
+#: ViewProjects.cpp:223
+msgid "Avg. work done"
+msgstr "Átl. elkészült munka"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:137
-#: clientgui/ViewProjects.cpp:746
-msgid "Don't fetch new tasks for this project."
-msgstr "Letiltja új feladatok letöltését e projekthez."
+#: ViewProjects.cpp:225 ViewTransfers.cpp:188 ViewWork.cpp:234
+msgid "Status"
+msgstr "Állapot"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:229
-#: clientgui/ViewProjects.cpp:443
+#: ViewProjects.cpp:250
+msgid "Projects"
+msgstr "Projektek"
+
+#: ViewProjects.cpp:302
+msgid "Updating project..."
+msgstr "Projekt frissítése..."
+
+#: ViewProjects.cpp:344
+msgid "Resuming project..."
+msgstr "Projekt folytatása..."
+
+#: ViewProjects.cpp:348
+msgid "Suspending project..."
+msgstr "Projekt felfüggesztése..."
+
+#: ViewProjects.cpp:385
+msgid "Telling project to allow additional task downloads..."
+msgstr "A projekt felkérése további feladatok letöltésének engedélyezésére..."
+
+#: ViewProjects.cpp:389
+msgid "Telling project to not fetch any additional tasks..."
+msgstr "A projekt felkérése további feladatok letöltésének tiltására..."
+
+#: ViewProjects.cpp:425
+msgid "Resetting project..."
+msgstr "Projekt nullázása..."
+
+#: ViewProjects.cpp:438 sg_ProjectCommandPopup.cpp:214
 #, c-format
 msgid "Are you sure you want to reset project '%s'?"
 msgstr "Biztos benne, hogy a(z) \"%s\" projektet nullázza?"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:235
-#: clientgui/ViewProjects.cpp:449
+#: ViewProjects.cpp:444 sg_ProjectCommandPopup.cpp:220
 msgid "Reset Project"
 msgstr "Projekt nullázása"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:266
-#: clientgui/ViewProjects.cpp:501
+#: ViewProjects.cpp:483
+msgid "Removing project..."
+msgstr "Projekt eltávolítása..."
+
+#: ViewProjects.cpp:496 sg_ProjectCommandPopup.cpp:251
 #, c-format
 msgid "Are you sure you want to remove project '%s'?"
 msgstr "Biztos benne, hogy eltávolítja a(z) \"%s\" projektet?"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:272
-#: clientgui/ViewProjects.cpp:507
+#: ViewProjects.cpp:502 sg_ProjectCommandPopup.cpp:257
 msgid "Remove Project"
 msgstr "Projekt eltávolítása"
 
-#: clientgui/sg_ProjectPanel.cpp:72
-msgid "Add Project"
-msgstr "Projekt hozzáadása"
+#: ViewProjects.cpp:543 ViewWork.cpp:599
+msgid "Launching browser..."
+msgstr "Böngésző indítása..."
 
-#: clientgui/sg_ProjectPanel.cpp:73
-msgid "Synchronize"
-msgstr "Szinkronizáció"
+#: ViewProjects.cpp:718 sg_ProjectCommandPopup.cpp:111
+msgid "Resume tasks for this project."
+msgstr "Ezen projekt feladatainak folytatása."
 
-#: clientgui/sg_ProjectPanel.cpp:74
-msgid "Work done for this project"
-msgstr "A projektben elvégzett munka"
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:118
+msgid "Allow new tasks"
+msgstr "Új feladatok engedélyezése"
 
-#: clientgui/sg_ProjectPanel.cpp:77
-msgid "Synchronize projects with account manager system"
-msgstr "Projektek szinkronizálása a fiókkezelő rendszerrel"
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:119
+msgid "Allow fetching new tasks for this project."
+msgstr "Engedélyezi új feladatok letöltését e projekthez."
 
-#: clientgui/sg_ProjectPanel.cpp:124
-msgid "Select a project to access with the controls below"
-msgstr "Válasszon ki egy projektet, amelyhez a lenti beállítások szerint kíván hozzáférni"
+#: ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:122
+msgid "Don't fetch new tasks for this project."
+msgstr "Letiltja új feladatok letöltését e projekthez."
 
-#: clientgui/sg_ProjectPanel.cpp:145
-msgid "Project Web Pages"
-msgstr "A projekt weboldalai"
+#: ViewProjects.cpp:1058
+msgid "Requested by user"
+msgstr "A felhasználó kezdeményezte"
 
-#: clientgui/sg_ProjectPanel.cpp:149
-msgid "Project Commands"
-msgstr "Projekt parancsok"
+#: ViewProjects.cpp:1059
+msgid "To fetch work"
+msgstr "Új munka kérése"
 
-#: clientgui/sg_ProjectPanel.cpp:276
-#, c-format
-msgid "Pop up a menu of web sites for project %s"
-msgstr "Jelenjen meg egy menü a(z) %s projekt weboldalairól"
+#: ViewProjects.cpp:1060
+msgid "To report completed tasks"
+msgstr "Elkészült feladatok jelentése"
 
-#: clientgui/sg_ProjectPanel.cpp:278
-#, c-format
-msgid "Pop up a menu of commands to apply to project %s"
-msgstr "Jelenjen meg egy menü a(z) %s projektre alkalmazható parancsokról"
+#: ViewProjects.cpp:1061
+msgid "To send trickle-up message"
+msgstr "Időközi jelentés küldése"
 
-#: clientgui/sg_TaskCommandPopup.cpp:66
-msgid "Show graphics"
-msgstr "Grafikus ablak megjelenítése"
+#: ViewProjects.cpp:1062
+msgid "Requested by account manager"
+msgstr "A fiókkezelő kezdeményezte"
 
-#: clientgui/sg_TaskCommandPopup.cpp:67
-msgid "Show application graphics in a window."
-msgstr "Az alkalmazás grafikájának megjelenítése egy új ablakban."
+#: ViewProjects.cpp:1063
+msgid "Project initialization"
+msgstr "Projekt előkészítése"
 
-#: clientgui/sg_TaskCommandPopup.cpp:73
-msgid "Suspend this task."
-msgstr ""
+#: ViewProjects.cpp:1064
+msgid "Requested by project"
+msgstr "Projekt kezdeményezte"
 
-#: clientgui/sg_TaskCommandPopup.cpp:78
-msgid "Abort"
-msgstr "Eldobás"
+#: ViewProjects.cpp:1065
+msgid "Unknown reason"
+msgstr "Ismeretlen ok"
 
-#: clientgui/sg_TaskCommandPopup.cpp:79
-msgid "Abandon this task. You will get no credit for it."
-msgstr ""
+#: ViewProjects.cpp:1079
+msgid "Suspended by user"
+msgstr "Felhasználó által felfüggesztve"
 
-#: clientgui/sg_TaskCommandPopup.cpp:85
-msgid "Show task details."
-msgstr "Feladat részleteinek megjelenítése."
+#: ViewProjects.cpp:1082
+msgid "Won't get new tasks"
+msgstr "Nem tölt le új feladatot"
 
-#: clientgui/sg_TaskCommandPopup.cpp:119
-msgid "Resume work for this task."
-msgstr "Munka folytatása e feladaton."
+#: ViewProjects.cpp:1085
+msgid "Project ended - OK to remove"
+msgstr "A projekt befejeződött - nyomjon OK-t az eltávolításához"
 
-#: clientgui/sg_TaskCommandPopup.cpp:123
-msgid "Suspend work for this task."
-msgstr "Munka felfüggesztése e feladaton."
+#: ViewProjects.cpp:1088
+msgid "Will remove when tasks done"
+msgstr "Eltávolítás a feladatok befejezésekor"
 
-#: clientgui/sg_TaskCommandPopup.cpp:267
-#, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %.1lf%%, Status: %s)"
-msgstr ""
-"Biztosan eldobja ezt a csomagot: '%s'?\n"
-"(Elkészült: %.1lf%%, Status: %s)"
+#: ViewProjects.cpp:1091
+msgid "Scheduler request pending"
+msgstr "Függő kérés az ütemezőhöz"
 
-#: clientgui/sg_TaskCommandPopup.cpp:272
-msgid "Abort task"
-msgstr "Feladat eldobása"
+#: ViewProjects.cpp:1097
+msgid "Scheduler request in progress"
+msgstr "Ütemező által indított kérés folyamatban"
 
-#: clientgui/sg_TaskPanel.cpp:468
-msgid "You don't have any projects.  Please Add a Project."
-msgstr "Nincs egy projektje sem. Kérjük, adjon hozzá egyet."
+#: ViewProjects.cpp:1100
+msgid "Trickle up message pending"
+msgstr "Időközi jelentés függőben"
 
-#: clientgui/sg_TaskPanel.cpp:469
-msgid "Not available"
-msgstr "Nem elérhető"
+#: ViewProjects.cpp:1106
+msgid "Communication deferred "
+msgstr "Kommunikáció elhalsztva "
 
-#: clientgui/sg_TaskPanel.cpp:480
-msgid "Tasks:"
-msgstr "Feladatok:"
+#: ViewResources.cpp:62
+msgid "Total disk usage"
+msgstr "Teljes lemezhasználat"
 
-#: clientgui/sg_TaskPanel.cpp:486
-msgid "Select a task to access"
-msgstr "Válasszon ki egy feladatot, amelyhez hozzá kíván férni"
+#: ViewResources.cpp:83
+msgid "Disk usage by BOINC projects"
+msgstr "A BOINC projektek lemezhasználata"
 
-#: clientgui/sg_TaskPanel.cpp:497
-msgid "From:"
-msgstr "Innen:"
+#: ViewResources.cpp:116
+msgid "Disk"
+msgstr "Lemez"
 
-#: clientgui/sg_TaskPanel.cpp:551
-msgid "This task's progress"
-msgstr "Ezen feladat állapota"
+#: ViewResources.cpp:249
+msgid "no projects: 0 bytes used"
+msgstr "nincs projekt, felhasználva: 0 bájt"
 
-#: clientgui/sg_TaskPanel.cpp:569
-msgid "Task Commands"
-msgstr "Feladatparancsok"
+#: ViewResources.cpp:286
+msgid "used by BOINC: "
+msgstr "BOINC által használt:"
 
-#: clientgui/sg_TaskPanel.cpp:570
-msgid "Pop up a menu of commands to apply to this task"
-msgstr "Jelenjen meg egy menü az ezen feladatra alkalmazható parancsokról"
+#: ViewResources.cpp:296
+msgid "free, available to BOINC: "
+msgstr "szabad, a BOINC rendelkezésére áll:"
 
-#: clientgui/sg_TaskPanel.cpp:705
-#, c-format
-msgid "Application: %s"
-msgstr "Alkalmazás: %s"
+#: ViewResources.cpp:306
+msgid "free, not available to BOINC: "
+msgstr "szabad, de nem áll a BOINC rendelkezésére:"
 
-#: clientgui/sg_TaskPanel.cpp:728
-#, c-format
-msgid "%.3f%%"
-msgstr "%.3f%%"
+#: ViewResources.cpp:316
+msgid "free: "
+msgstr "szabad:"
 
-#: clientgui/sg_TaskPanel.cpp:736
-msgid "Application: Not available"
-msgstr "Alkalmazás: Nem elérhető"
+#: ViewResources.cpp:326
+msgid "used by other programs: "
+msgstr "más programok által használt: "
 
-#: clientgui/sg_TaskPanel.cpp:836
-msgid "Not Available"
-msgstr "Nem elérhető"
+#: ViewStatistics.cpp:1205
+msgid "User Total"
+msgstr "Felhasználó - Összes kredit"
 
-#: clientgui/sg_TaskPanel.cpp:851
-#, c-format
-msgid "Elapsed: %s"
-msgstr "Eltelt: %s"
+#: ViewStatistics.cpp:1206
+msgid "User Average"
+msgstr "Felhasználó - Átlag kredit"
 
-#: clientgui/sg_TaskPanel.cpp:865
-#, c-format
-msgid "Remaining (estimated): %s"
-msgstr "Hátralévő (becsült): %s"
-
-#: clientgui/sg_TaskPanel.cpp:880
-#, c-format
-msgid "Status: %s"
-msgstr "Állapot: %s"
-
-#: clientgui/sg_TaskPanel.cpp:1227
-msgid "Retrieving current status."
-msgstr "Aktuális állapot lekérdezése."
-
-#: clientgui/sg_TaskPanel.cpp:1233
-msgid "Downloading work from the server."
-msgstr "Munka letöltése a szerverről."
-
-#: clientgui/sg_TaskPanel.cpp:1238
-msgid "Processing Suspended:  Running On Batteries."
-msgstr "Számítás felfüggesztve: A gép akkumulátorról működik."
-
-#: clientgui/sg_TaskPanel.cpp:1240
-msgid "Processing Suspended:  User Active."
-msgstr "Számítás felfüggesztve: a felhasználó aktív."
-
-#: clientgui/sg_TaskPanel.cpp:1242
-msgid "Processing Suspended:  User paused processing."
-msgstr "Számítás felfüggesztve: a felhasználó függesztette fel."
-
-#: clientgui/sg_TaskPanel.cpp:1244
-msgid "Processing Suspended:  Time of Day."
-msgstr "Számítás felfüggesztve: ilyenkor nem dolgozhat."
-
-#: clientgui/sg_TaskPanel.cpp:1246
-msgid "Processing Suspended:  Benchmarks Running."
-msgstr "Számítás felfüggesztve: sebességmérés fut."
-
-#: clientgui/sg_TaskPanel.cpp:1248
-msgid "Processing Suspended."
-msgstr "Számítás felfüggesztve."
-
-#: clientgui/sg_TaskPanel.cpp:1252
-msgid "Waiting to contact project servers."
-msgstr "Várakozás a projektszerverekkel való kapcsolatfelvételre."
-
-#: clientgui/sg_TaskPanel.cpp:1256
-#: clientgui/sg_TaskPanel.cpp:1265
-msgid "Retrieving current status"
-msgstr "Aktuális állapot lekérdezése"
-
-#: clientgui/sg_TaskPanel.cpp:1260
-msgid "No work available to process"
-msgstr "Nincs feldolgozható munka"
-
-#: clientgui/sg_TaskPanel.cpp:1262
-msgid "Unable to connect to the core client"
-msgstr "Nem lehet csatlakozni a magklienshez"
-
-#: clientgui/TermsOfUsePage.cpp:218
-msgid "Terms of Use"
-msgstr "Felhasználási feltételek"
-
-#: clientgui/TermsOfUsePage.cpp:222
-msgid "Please read the following terms of use:"
-msgstr "Kérjük, olvassa el a következő felhasználási feltételeket:"
-
-#: clientgui/TermsOfUsePage.cpp:231
-msgid "I agree to the terms of use."
-msgstr "Elfogadom a felhasználási feltételeket."
-
-#: clientgui/TermsOfUsePage.cpp:237
-#, fuzzy
-msgid "I do not agree to the terms of use."
-msgstr "Nem fogadom el a felhasználási feltételeket."
-
-#: clientgui/UnavailablePage.cpp:183
-msgid "Project temporarily unavailable"
-msgstr "Projekt ideiglenesen nem elérhető"
-
-#: clientgui/UnavailablePage.cpp:186
-msgid ""
-"The project is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-"A projekt ideiglenesen nem elérhető.\n"
-"\n"
-"Kérem, próbálja úrja. "
-
-#: clientgui/UnavailablePage.cpp:190
-msgid "Account manager temporarily unavailable"
-msgstr "Fiókkezelő ideiglenesen nem elérhető"
-
-#: clientgui/UnavailablePage.cpp:193
-msgid ""
-"The account manager is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-"A fiókkezelő ideiglenesen nem elérhető.\n"
-"\n"
-"Kérem, próbálja úrja. "
-
-#: clientgui/ValidateAccountKey.cpp:68
-msgid "Please specify an account key to continue."
-msgstr "Kérem adjon meg egy fiókkulcsot a folytatáshoz"
-
-#: clientgui/ValidateAccountKey.cpp:71
-msgid "Invalid Account Key; please enter a valid Account Key"
-msgstr "Érvénytelen fiókkulcs, kérem, adjon meg egy érvényes fiókkulcsot"
-
-#: clientgui/ValidateAccountKey.cpp:82
-#: clientgui/ValidateEmailAddress.cpp:86
-msgid "Validation conflict"
-msgstr "Ellenőrzési hiba"
-
-#: clientgui/ValidateEmailAddress.cpp:72
-msgid "Please specify an email address"
-msgstr "Kérjük, adja meg email címét"
-
-#: clientgui/ValidateEmailAddress.cpp:75
-msgid "Invalid email address; please enter a valid email address"
-msgstr "Érvénytelen email cím; kérjük, érvényes emailcímet adjon meg"
-
-#: clientgui/ValidateURL.cpp:69
-msgid "Missing URL"
-msgstr "Hiányzó URL"
-
-#: clientgui/ValidateURL.cpp:70
-msgid ""
-"Please specify a URL.\n"
-"For example:\n"
-"http://www.example.com/"
-msgstr ""
-"Kérem adjon meg egy URL-t.\n"
-"Például:\n"
-"http://www.pelda.hu/"
-
-#: 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 "Érvénytelen 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 ""
-"Kérjük, adjon meg egy érvényes URL-t.\n"
-"Például:\n"
-"http://boincprojekt.pelda.hu"
-
-#: clientgui/ValidateURL.cpp:104
-#: clientgui/ValidateURL.cpp:108
-#, c-format
-msgid "'%s' does not contain a valid host name."
-msgstr "\"%s\" nem tartalmaz érvényes gépnevet."
-
-#: clientgui/ValidateURL.cpp:111
-#, c-format
-msgid "'%s' does not contain a valid path."
-msgstr "\"%s\" nem tartalmaz érvényes útvonalat."
-
-#: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:175
-msgid "Commands"
-msgstr "Parancsok"
-
-#: clientgui/ViewMessages.cpp:88
-msgid "Copy all messages"
-msgstr "Minden üzenet másolása"
-
-#: clientgui/ViewMessages.cpp:95
-msgid "Copy selected messages"
-msgstr "Kijelölt üzenetek másolása"
-
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
-msgid "Show only this project"
-msgstr "Csak ezt a projektet mutassa"
-
-#: clientgui/ViewMessages.cpp:107
-#: clientgui/ViewMessages.cpp:503
-msgid "Show only the messages for the selected project."
-msgstr "Csak a kiválasztott projekt üzeneteit mutassa."
-
-#: clientgui/ViewMessages.cpp:164
-msgid "Messages"
-msgstr "Üzenetek"
-
-#: clientgui/ViewMessages.cpp:187
-msgid "Copying all messages to the clipboard..."
-msgstr "Minden üzenet másolása a vágólapra..."
-
-#: clientgui/ViewMessages.cpp:223
-msgid "Copying selected messages to the clipboard..."
-msgstr "Kiválasztott üzenetek másolása a vágólapra..."
-
-#: clientgui/ViewMessages.cpp:286
-msgid "Filtering messages..."
-msgstr "Üzenetek szűrése..."
-
-#: clientgui/ViewMessages.cpp:494
-msgid "Show all messages"
-msgstr "Minden üzenet mutatása"
-
-#: clientgui/ViewMessages.cpp:495
-msgid "Show messages for all projects."
-msgstr "Az összes projekt üzeneteinek mutatása."
-
-#: clientgui/ViewProjects.cpp:225
-msgid "Account"
-msgstr "Fiók"
-
-#: clientgui/ViewProjects.cpp:227
-msgid "Work done"
-msgstr "Elkészült munka"
-
-#: clientgui/ViewProjects.cpp:228
-msgid "Avg. work done"
-msgstr "Átl. elkészült munka"
-
-#: clientgui/ViewProjects.cpp:230
-msgid "Status"
-msgstr "Állapot"
-
-#: clientgui/ViewProjects.cpp:255
-msgid "Projects"
-msgstr "Projektek"
-
-#: clientgui/ViewProjects.cpp:307
-msgid "Updating project..."
-msgstr "Projekt frissítése..."
-
-#: clientgui/ViewProjects.cpp:349
-msgid "Resuming project..."
-msgstr "Projekt folytatása..."
-
-#: clientgui/ViewProjects.cpp:353
-msgid "Suspending project..."
-msgstr "Projekt felfüggesztése..."
-
-#: clientgui/ViewProjects.cpp:390
-msgid "Telling project to allow additional task downloads..."
-msgstr "A projekt felkérése további feladatok letöltésének engedélyezésére..."
-
-#: clientgui/ViewProjects.cpp:394
-msgid "Telling project to not fetch any additional tasks..."
-msgstr "A projekt felkérése további feladatok letöltésének tiltására..."
-
-#: clientgui/ViewProjects.cpp:430
-msgid "Resetting project..."
-msgstr "Projekt nullázása..."
-
-#: clientgui/ViewProjects.cpp:488
-msgid "Removing project..."
-msgstr "Projekt eltávolítása..."
-
-#: clientgui/ViewProjects.cpp:548
-msgid "Launching browser..."
-msgstr "Böngésző indítása..."
-
-#: clientgui/ViewProjects.cpp:1063
-msgid "Requested by user"
-msgstr "A felhasználó kezdeményezte"
-
-#: clientgui/ViewProjects.cpp:1064
-msgid "To fetch work"
-msgstr "Új munka kérése"
-
-#: clientgui/ViewProjects.cpp:1065
-msgid "To report completed tasks"
-msgstr "Elkészült feladatok jelentése"
-
-#: clientgui/ViewProjects.cpp:1066
-msgid "To send trickle-up message"
-msgstr "Időközi jelentés küldése"
-
-#: clientgui/ViewProjects.cpp:1067
-msgid "Requested by account manager"
-msgstr "A fiókkezelő kezdeményezte"
-
-#: clientgui/ViewProjects.cpp:1068
-msgid "Project initialization"
-msgstr "Projekt előkészítése"
-
-#: clientgui/ViewProjects.cpp:1069
-msgid "Requested by project"
-msgstr "Projekt kezdeményezte"
-
-#: clientgui/ViewProjects.cpp:1070
-msgid "Unknown reason"
-msgstr "Ismeretlen ok"
-
-#: clientgui/ViewProjects.cpp:1084
-msgid "Suspended by user"
-msgstr "Felhasználó által felfüggesztve"
-
-#: clientgui/ViewProjects.cpp:1087
-msgid "Won't get new tasks"
-msgstr "Nem tölt le új feladatot"
-
-#: clientgui/ViewProjects.cpp:1090
-msgid "Project ended - OK to remove"
-msgstr "A projekt befejeződött - nyomjon OK-t az eltávolításához"
-
-#: clientgui/ViewProjects.cpp:1093
-msgid "Will remove when tasks done"
-msgstr "Eltávolítás a feladatok befejezésekor"
-
-#: clientgui/ViewProjects.cpp:1096
-msgid "Scheduler request pending"
-msgstr "Függő kérés az ütemezőhöz"
-
-#: clientgui/ViewProjects.cpp:1102
-msgid "Scheduler request in progress"
-msgstr "Ütemező által indított kérés folyamatban"
-
-#: clientgui/ViewProjects.cpp:1105
-msgid "Trickle up message pending"
-msgstr "Időközi jelentés függőben"
-
-#: clientgui/ViewProjects.cpp:1111
-msgid "Communication deferred "
-msgstr "Kommunikáció elhalsztva "
-
-#: clientgui/ViewResources.cpp:62
-msgid "Total disk usage"
-msgstr "Teljes lemezhasználat"
-
-#: clientgui/ViewResources.cpp:83
-msgid "Disk usage by BOINC projects"
-msgstr "A BOINC projektek lemezhasználata"
-
-#: clientgui/ViewResources.cpp:116
-msgid "Disk"
-msgstr "Lemez"
-
-#: clientgui/ViewResources.cpp:225
-msgid "no projects: 0 bytes used"
-msgstr "nincs projekt, felhasználva: 0 bájt"
-
-#: clientgui/ViewResources.cpp:262
-msgid "used by BOINC: "
-msgstr "BOINC által használt:"
-
-#: clientgui/ViewResources.cpp:272
-msgid "free, available to BOINC: "
-msgstr "szabad, a BOINC rendelkezésére áll:"
-
-#: clientgui/ViewResources.cpp:282
-msgid "free, not available to BOINC: "
-msgstr "szabad, de nem áll a BOINC rendelkezésére:"
-
-#: clientgui/ViewResources.cpp:292
-msgid "free: "
-msgstr "szabad:"
-
-#: clientgui/ViewResources.cpp:302
-msgid "used by other programs: "
-msgstr "más programok által használt: "
-
-#: clientgui/ViewStatistics.cpp:1181
-msgid "User Total"
-msgstr "Felhasználó - Összes kredit"
-
-#: clientgui/ViewStatistics.cpp:1182
-msgid "User Average"
-msgstr "Felhasználó - Átlag kredit"
-
-#: clientgui/ViewStatistics.cpp:1183
+#: ViewStatistics.cpp:1207
 msgid "Host Total"
 msgstr "Számítógép - Összes kredit"
 
-#: clientgui/ViewStatistics.cpp:1184
+#: ViewStatistics.cpp:1208
 msgid "Host Average"
 msgstr "Számítógép - Átlag kredit"
 
-#: clientgui/ViewStatistics.cpp:1331
+#: ViewStatistics.cpp:1355
 #, c-format
 msgid "Last update: %.0f days ago"
 msgstr "Utolsó frissítés: %.0f napja"
 
-#: clientgui/ViewStatistics.cpp:1956
+#: ViewStatistics.cpp:1982
 msgid "Show user total"
 msgstr "Felhasználó - Összes kredit"
 
-#: clientgui/ViewStatistics.cpp:1957
+#: ViewStatistics.cpp:1983
 msgid "Show total credit for user"
 msgstr "A felhasználó összes kreditjének mutatása"
 
-#: clientgui/ViewStatistics.cpp:1963
+#: ViewStatistics.cpp:1989
 msgid "Show user average"
 msgstr "Felhasználó - Átlag kredit"
 
-#: clientgui/ViewStatistics.cpp:1964
+#: ViewStatistics.cpp:1990
 msgid "Show average credit for user"
 msgstr "A felhasználó kreditátlagának mutatása"
 
-#: clientgui/ViewStatistics.cpp:1970
+#: ViewStatistics.cpp:1996
 msgid "Show host total"
 msgstr "Számítógép - Összes kredit"
 
-#: clientgui/ViewStatistics.cpp:1971
+#: ViewStatistics.cpp:1997
 msgid "Show total credit for host"
 msgstr "A számítógép összes kreditjének mutatása"
 
-#: clientgui/ViewStatistics.cpp:1977
+#: ViewStatistics.cpp:2003
 msgid "Show host average"
 msgstr "Számítógép - Átlag kredit"
 
-#: clientgui/ViewStatistics.cpp:1978
+#: ViewStatistics.cpp:2004
 msgid "Show average credit for host"
 msgstr "A számítógép kreditátlagának mutatása"
 
-#: clientgui/ViewStatistics.cpp:1987
+#: ViewStatistics.cpp:2013
 msgid "< &Previous project"
 msgstr "< E&lőző projekt"
 
-#: clientgui/ViewStatistics.cpp:1988
+#: ViewStatistics.cpp:2014
 msgid "Show chart for previous project"
 msgstr "Az előző projekt grafikonjának megjelenítése"
 
-#: clientgui/ViewStatistics.cpp:1993
+#: ViewStatistics.cpp:2019
 msgid "&Next project >"
 msgstr "&Következő projekt >"
 
-#: clientgui/ViewStatistics.cpp:1994
+#: ViewStatistics.cpp:2020
 msgid "Show chart for next project"
 msgstr "A következő projekt grafikonjának megjelenítése"
 
-#: clientgui/ViewStatistics.cpp:2000
-#: clientgui/ViewStatistics.cpp:2390
+#: ViewStatistics.cpp:2026 ViewStatistics.cpp:2416
 msgid "Hide project list"
 msgstr "Projektlista elrejtése"
 
-#: clientgui/ViewStatistics.cpp:2001
-#: clientgui/ViewStatistics.cpp:2390
+#: ViewStatistics.cpp:2027 ViewStatistics.cpp:2416
 msgid "Use entire area for graphs"
 msgstr "Használja a teljes területet a grafikonhoz"
 
-#: clientgui/ViewStatistics.cpp:2006
+#: ViewStatistics.cpp:2032
 msgid "Mode view"
 msgstr "Mód nézet"
 
-#: clientgui/ViewStatistics.cpp:2010
+#: ViewStatistics.cpp:2036
 msgid "One project"
 msgstr "Egy projekt"
 
-#: clientgui/ViewStatistics.cpp:2011
+#: ViewStatistics.cpp:2037
 msgid "Show one chart with selected project"
 msgstr "Egy grafikon mutatása a kiválasztott projekttel"
 
-#: clientgui/ViewStatistics.cpp:2017
+#: ViewStatistics.cpp:2043
 msgid "All projects (separate)"
 msgstr "Minden projekt (külön)"
 
-#: clientgui/ViewStatistics.cpp:2018
+#: ViewStatistics.cpp:2044
 msgid "Show all projects, one chart per project"
 msgstr "Megmutatja az összes projektet, projektenként külön grafikonon"
 
-#: clientgui/ViewStatistics.cpp:2024
+#: ViewStatistics.cpp:2050
 msgid "All projects (together)"
 msgstr "Minden projekt (együtt)"
 
-#: clientgui/ViewStatistics.cpp:2025
+#: ViewStatistics.cpp:2051
 msgid "Show one chart with all projects"
 msgstr "Az összes projekt ábrázolása egy grafikonon"
 
-#: clientgui/ViewStatistics.cpp:2031
+#: ViewStatistics.cpp:2057
 msgid "All projects (sum)"
 msgstr "Minden projekt (összeg)"
 
-#: clientgui/ViewStatistics.cpp:2032
+#: ViewStatistics.cpp:2058
 msgid "Show one chart with sum of projects"
 msgstr "Egy grafikonon ábrázolja a projektek összegeit"
 
-#: clientgui/ViewStatistics.cpp:2053
+#: ViewStatistics.cpp:2079
 msgid "Statistics"
 msgstr "Statisztika"
 
-#: 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
+#: 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
 msgid "Updating charts..."
 msgstr "Grafikonok frissítése..."
 
-#: clientgui/ViewStatistics.cpp:2394
+#: ViewStatistics.cpp:2420
 msgid "Show project list"
 msgstr "Projektlista megjelenítése"
 
-#: clientgui/ViewStatistics.cpp:2394
+#: ViewStatistics.cpp:2420
 msgid "Uses smaller area for graphs"
 msgstr "A grafikonokhoz kisebb területet használ"
 
-#: clientgui/ViewTransfers.cpp:169
+#: ViewTransfers.cpp:164
 msgid "Retry Now"
 msgstr "Próbálja most"
 
-#: clientgui/ViewTransfers.cpp:170
+#: ViewTransfers.cpp:165
 msgid "Retry the file transfer now"
-msgstr ""
+msgstr "Fájlátvitel újrapróbálása most"
 
-#: clientgui/ViewTransfers.cpp:176
+#: ViewTransfers.cpp:171
 msgid "Abort Transfer"
 msgstr "Átvitel megszakítása"
 
-#: clientgui/ViewTransfers.cpp:177
+#: ViewTransfers.cpp:172
 msgid "Abort this file transfer.  You won't get credit for the task."
-msgstr ""
+msgstr "Fájlátvitel megszakítása. Nem fogsz kreditet kapni a feladatért."
 
-#: clientgui/ViewTransfers.cpp:188
+#: ViewTransfers.cpp:183
 msgid "File"
 msgstr "Fájl"
 
-#: clientgui/ViewTransfers.cpp:189
-#: clientgui/ViewWork.cpp:238
+#: ViewTransfers.cpp:184 ViewWork.cpp:233
 msgid "Progress"
 msgstr "Feldolgozottság"
 
-#: clientgui/ViewTransfers.cpp:190
+#: ViewTransfers.cpp:185
 msgid "Size"
 msgstr "Méret"
 
-#: clientgui/ViewTransfers.cpp:191
+#: ViewTransfers.cpp:186
 msgid "Elapsed Time"
 msgstr "Eltelt idő"
 
-#: clientgui/ViewTransfers.cpp:192
+#: ViewTransfers.cpp:187
 msgid "Speed"
 msgstr "Sebesség"
 
-#: clientgui/ViewTransfers.cpp:218
+#: ViewTransfers.cpp:213
 msgid "Transfers"
 msgstr "Adatforgalom"
 
-#: clientgui/ViewTransfers.cpp:285
+#: ViewTransfers.cpp:280
 msgid "Network activity is suspended - "
 msgstr "Hálózati aktivitás felfüggesztve - "
 
-#: clientgui/ViewTransfers.cpp:287
+#: ViewTransfers.cpp:282
 msgid ""
 ".\n"
 "You can enable it using the Activity menu."
-msgstr ""
-".\n"
-"Az aktivitás menüben tudja engedélyezni."
+msgstr ".\nAz aktivitás menüben tudja engedélyezni."
 
-#: clientgui/ViewTransfers.cpp:290
+#: ViewTransfers.cpp:285
 msgid "BOINC"
 msgstr "BOINC"
 
-#: clientgui/ViewTransfers.cpp:297
+#: ViewTransfers.cpp:292
 msgid "Retrying transfer now..."
 msgstr "Próbálkozás az átvitellel..."
 
-#: clientgui/ViewTransfers.cpp:335
+#: ViewTransfers.cpp:330
 msgid "Aborting transfer..."
 msgstr "Átvitel megszakítása..."
 
-#: clientgui/ViewTransfers.cpp:348
+#: ViewTransfers.cpp:343
 #, 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 ""
-"Biztos, hogy megszakítja ezt a fájlátvitelt: '%s'?\n"
-"FIGYELEM: Az átvitel megszakítása érvényteleníti a feladatot,\n"
-"és így nem fog érte kreditet kapni."
+msgstr "Biztos, hogy megszakítja ezt a fájlátvitelt: '%s'?\nFIGYELEM: Az átvitel megszakítása érvényteleníti a feladatot,\nés így nem fog érte kreditet kapni."
 
-#: clientgui/ViewTransfers.cpp:354
+#: ViewTransfers.cpp:349
 msgid "Abort File Transfer"
 msgstr "Adatátvitel megszakítása"
 
-#: clientgui/ViewTransfers.cpp:785
+#: ViewTransfers.cpp:780
 msgid "Upload"
 msgstr "Feltöltés"
 
-#: clientgui/ViewTransfers.cpp:785
+#: ViewTransfers.cpp:780
 msgid "Download"
 msgstr "Letöltés"
 
-#: clientgui/ViewTransfers.cpp:789
+#: ViewTransfers.cpp:784
 msgid "retry in "
 msgstr "Újrapróbálás ennyi idő múlva: "
 
-#: clientgui/ViewTransfers.cpp:791
+#: ViewTransfers.cpp:786
 msgid "failed"
 msgstr "nem sikerült"
 
-#: clientgui/ViewTransfers.cpp:794
+#: ViewTransfers.cpp:789
 msgid "suspended"
 msgstr "felfüggesztve"
 
-#: clientgui/ViewTransfers.cpp:799
+#: ViewTransfers.cpp:794
 msgid "active"
 msgstr "aktív"
 
-#: clientgui/ViewTransfers.cpp:801
+#: ViewTransfers.cpp:796
 msgid "pending"
 msgstr "függőben"
 
-#: clientgui/ViewTransfers.cpp:808
+#: ViewTransfers.cpp:803
 msgid " (project backoff: "
 msgstr "(a projekt visszatartja:"
 
-#: clientgui/ViewWork.cpp:192
-#: clientgui/ViewWork.cpp:782
+#: ViewWork.cpp:187 ViewWork.cpp:777
 msgid "Show active tasks"
 msgstr "Aktív feladatok mutatása"
 
-#: clientgui/ViewWork.cpp:193
-#: clientgui/ViewWork.cpp:783
-msgid "Show only active tasks."
-msgstr "Csak az aktív feladatok mutatása."
+#: ViewWork.cpp:188 ViewWork.cpp:778
+msgid "Show only active tasks."
+msgstr "Csak az aktív feladatok mutatása."
+
+#: ViewWork.cpp:194 sg_TaskCommandPopup.cpp:60
+msgid "Show graphics"
+msgstr "Grafikus ablak megjelenítése"
+
+#: ViewWork.cpp:195 sg_TaskCommandPopup.cpp:61
+msgid "Show application graphics in a window."
+msgstr "Az alkalmazás grafikájának megjelenítése egy új ablakban."
+
+#: ViewWork.cpp:201
+msgid "Show VM Console"
+msgstr "Virtuális gép konzol"
+
+#: ViewWork.cpp:202
+msgid "Show VM Console in a window."
+msgstr "Virtuális gép konzol megjelenítése új ablakban."
+
+#: ViewWork.cpp:209
+msgid "Suspend work for this result."
+msgstr "Munka felfüggesztése a jelen csomagon."
+
+#: ViewWork.cpp:215 sg_TaskCommandPopup.cpp:72
+msgid "Abort"
+msgstr "Eldobás"
+
+#: ViewWork.cpp:216
+msgid "Abandon work on the result. You will get no credit for it."
+msgstr "Jelen munka eredményének eldobása. Nem fogsz kreditet kapni érte."
+
+#: ViewWork.cpp:223 sg_TaskCommandPopup.cpp:79
+msgid "Show task details."
+msgstr "Feladat részleteinek megjelenítése."
+
+#: ViewWork.cpp:235
+msgid "Elapsed"
+msgstr "Eltelt"
+
+#: ViewWork.cpp:236
+msgid "Remaining (estimated)"
+msgstr "Hátralévő (becsült)"
+
+#: ViewWork.cpp:237
+msgid "Deadline"
+msgstr "Határidő"
+
+#: ViewWork.cpp:264
+msgid "Tasks"
+msgstr "Feladatok"
+
+#: ViewWork.cpp:357
+msgid "Resuming task..."
+msgstr "Feladat folytatása..."
+
+#: ViewWork.cpp:360
+msgid "Suspending task..."
+msgstr "Feladat felfüggesztése..."
+
+#: ViewWork.cpp:389
+msgid "Showing graphics for task..."
+msgstr "A feladat grafikájának megjelenítése..."
+
+#: ViewWork.cpp:426
+msgid "Showing VM console for task..."
+msgstr "Virtuális gép konzol mutatása a feladathoz..."
+
+#: ViewWork.cpp:479
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %s, Status: %s)"
+msgstr "Biztosan eldobja ezt a csomagot: '%s'?\n(Elkészült: %s, állapot: %s)"
+
+#: ViewWork.cpp:485
+#, c-format
+msgid "Are you sure you want to abort these %d tasks?"
+msgstr "Biztosan eldobja ezeket a(z) %d feladatokat?"
+
+#: ViewWork.cpp:490 sg_TaskCommandPopup.cpp:256
+msgid "Abort task"
+msgstr "Feladat eldobása"
+
+#: ViewWork.cpp:499
+msgid "Aborting task..."
+msgstr "Feladat megszakítása..."
+
+#: ViewWork.cpp:771
+msgid "Show all tasks"
+msgstr "Minden feladat mutatása"
+
+#: ViewWork.cpp:772
+msgid "Show all tasks."
+msgstr "Minden feladat mutatása."
+
+#: ViewWork.cpp:796 sg_TaskCommandPopup.cpp:103
+msgid "Resume work for this task."
+msgstr "Munka folytatása e feladaton."
+
+#: ViewWork.cpp:802 sg_TaskCommandPopup.cpp:107
+msgid "Suspend work for this task."
+msgstr "Munka felfüggesztése e feladaton."
+
+#: WelcomePage.cpp:284
+msgid "Add project or account manager"
+msgstr "Projekt vagy fiókkezelő hozzáadása"
+
+#: WelcomePage.cpp:288
+msgid "Add project or use BOINC Account Manager"
+msgstr "Projekt hozzáadása vagy a BOINC fiókkezelő használata"
+
+#: 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 "Ha lehetséges, akkor a(z) %s\nweboldalán adjon hozzá projekteket.\n\nAz ezen varázslóval hozzáadott projekteket\nnem listázza és nem kezeli a(z) %s."
+
+#: 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 "Több mint 30, különféle tudományos kutatást végző\nBOINC alapú projekt létezik, és Ön ezek közül\nannyihoz csatlakozhat, ahányhoz csak szeretne.\nKözvetlenül is hozzáadhat projekteket,\nde kiválaszthatja őket egy ún. fiókkezelő weboldalán keresztül is."
+
+#: 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 "Új önkéntes számítási projekt hozzáadását, vagy a meglévő projektjeid\nlistájának megváltoztatását\nválasztottad.\n\nE projektek közül néhány a World Community Griden fut,\nmíg másokat\nmás kutatók vagy szervezetek futtatnak és tartanak karban. A BOINC szoftver\nszét tudja osztani a kihasználatlan processzor kapacitást a projektek bármilyen kombinációja között.\n\nHa regisztráltál egy BOINC fiókkezelőben, akkor használhatod azt is\na támogatott projektjeid kiválasztásához.\n\nKér [...]
+
+#: WelcomePage.cpp:339
+msgid "Use a BOINC Account Manager"
+msgstr "BOINC fiókkezelő használata"
+
+#: WelcomePage.cpp:352
+msgid "To continue, click Next."
+msgstr "A folytatáshoz kattintson az Előre gomba"
+
+#: WelcomePage.cpp:358
+msgid "Add or change your World Community Grid projects"
+msgstr "Word Community Grid projektek hozzáadása vagy módosítása"
+
+#: WelcomePage.cpp:361
+msgid "Add projects run by other researchers or organizations"
+msgstr "Más kutatók vagy szervezetek által futtatott projektek hozzáadása"
+
+#: WizardAttach.cpp:634
+msgid "Do you really want to cancel?"
+msgstr "Tényleg meg akarja szakítani?"
+
+#: WizardAttach.cpp:635
+msgid "Question"
+msgstr "Kérdés"
+
+#: sg_BoincSimpleFrame.cpp:149
+msgid "Advanced View...\tCtrl+Shift+A"
+msgstr "Haladó nézet...\t Ctrl+Shift+A"
+
+#: sg_BoincSimpleFrame.cpp:150
+msgid "Display the advanced graphical interface."
+msgstr "Az haladó grafikus felület megjelenítése."
+
+#: sg_BoincSimpleFrame.cpp:157
+msgid "Skin"
+msgstr "Kinézet"
+
+#: sg_BoincSimpleFrame.cpp:159
+msgid "Select the appearance of the user interface."
+msgstr "Válassza ki a felhasználói felület kinézetét."
+
+#: sg_BoincSimpleFrame.cpp:206
+#, c-format
+msgid "&%s"
+msgstr "&%s"
+
+#: sg_BoincSimpleFrame.cpp:390
+msgid "Default"
+msgstr "Alapértelmezett"
+
+#: sg_BoincSimpleFrame.cpp:759
+msgid "Suspend Computing"
+msgstr "Számítás felfüggesztése"
+
+#: sg_BoincSimpleFrame.cpp:760
+msgid "Resume Computing"
+msgstr "Számítás folytatása"
+
+#: sg_BoincSimpleFrame.cpp:777
+msgid "Open a window to view notices from projects or BOINC"
+msgstr "Ablak nyitása a BOINC-tól vagy a projektektől érkező üzenetek megtekintéséhez"
+
+#: sg_DlgMessages.cpp:146
+msgid "Close"
+msgstr "Bezár"
+
+#: sg_DlgMessages.cpp:389
+#, c-format
+msgid "%s - Notices"
+msgstr "%s - Értesítések"
+
+#: sg_DlgPreferences.cpp:268
+msgid "This dialog controls preferences for this computer only."
+msgstr "Ez a panel csak ennek a számítógépnek a beállításait befolyásolja."
+
+#: sg_DlgPreferences.cpp:273
+msgid "Click OK to set preferences."
+msgstr "Kattintson az OK-ra a beállítások érvényesítéséhez."
+
+#: sg_DlgPreferences.cpp:278
+msgid ""
+"Click Clear to restore web-based settings for all preferences listed below."
+msgstr "Az alább listázott beállítások weboldalon beállított változatának visszaállításához kattints a Törlés gombra."
+
+#: sg_DlgPreferences.cpp:285
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
+msgstr "További beállításokért válaszd ki a Számítási beállításokat a Haladó nézetben."
+
+#: sg_DlgPreferences.cpp:313
+msgid "Do work only between:"
+msgstr "Csak ettől eddig dolgozzon:"
+
+#: sg_DlgPreferences.cpp:335
+msgid "Connect to internet only between:"
+msgstr "Csak ettől eddig kapcsolódhat az internetre:"
+
+#: sg_DlgPreferences.cpp:357 sg_DlgPreferences.cpp:374
+msgid "Use no more than:"
+msgstr "Legfeljebb"
+
+#: sg_DlgPreferences.cpp:370
+msgid "of disk space"
+msgstr "%-át használja a lemezterületnek"
+
+#: sg_DlgPreferences.cpp:387
+msgid "of the processor"
+msgstr "%-át használja a processzoroknak"
+
+#: sg_DlgPreferences.cpp:391
+msgid "Do work while on battery?"
+msgstr "Akkus üzem esetén dolgozhat?"
+
+#: sg_DlgPreferences.cpp:404
+msgid "Do work after idle for:"
+msgstr "Ennyi üresjárat után dolgozhat:"
 
-#: clientgui/ViewWork.cpp:206
-msgid "Show VM Console"
-msgstr "Virtuális gép konzol"
+#: sg_DlgPreferences.cpp:429
+msgid "Clear all local preferences listed above and close the dialog"
+msgstr "Minden fentebb listázott helyi beállítás törlése és a párbeszédablak bezárása"
 
-#: clientgui/ViewWork.cpp:207
-msgid "Show VM Console in a window."
-msgstr "Virtuális gép konzol megjelenítése új ablakban."
+#: 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 "Bármikor"
 
-#: clientgui/ViewWork.cpp:214
-msgid "Suspend work for this result."
-msgstr "Munka felfüggesztése a jelen csomagon."
+#: sg_DlgPreferences.cpp:638
+msgid "100 MB"
+msgstr "100 MB"
 
-#: clientgui/ViewWork.cpp:221
-msgid "Abandon work on the result. You will get no credit for it."
-msgstr "Jelen csomag eldobása. Nem fog kreditet kapni érte."
+#: sg_DlgPreferences.cpp:639
+msgid "200 MB"
+msgstr "200 MB"
 
-#: clientgui/ViewWork.cpp:240
-msgid "Elapsed"
-msgstr "Eltelt"
+#: sg_DlgPreferences.cpp:640
+msgid "500 MB"
+msgstr "500 MB"
 
-#: clientgui/ViewWork.cpp:241
-msgid "Remaining (estimated)"
-msgstr "Hátralévő (becsült)"
+#: sg_DlgPreferences.cpp:641
+msgid "1 GB"
+msgstr "1 GB"
 
-#: clientgui/ViewWork.cpp:242
-msgid "Deadline"
-msgstr "Határidő"
+#: sg_DlgPreferences.cpp:642
+msgid "2 GB"
+msgstr "2 GB"
 
-#: clientgui/ViewWork.cpp:269
-msgid "Tasks"
-msgstr "Feladatok"
+#: sg_DlgPreferences.cpp:643
+msgid "5 GB"
+msgstr "5 GB"
 
-#: clientgui/ViewWork.cpp:362
-msgid "Resuming task..."
-msgstr "Feladat folytatása..."
+#: sg_DlgPreferences.cpp:644
+msgid "10 GB"
+msgstr "10 GB"
 
-#: clientgui/ViewWork.cpp:365
-msgid "Suspending task..."
-msgstr "Feladat felfüggesztése..."
+#: sg_DlgPreferences.cpp:645
+msgid "20 GB"
+msgstr "20 GB"
 
-#: clientgui/ViewWork.cpp:394
-msgid "Showing graphics for task..."
-msgstr "A feladat grafikájának megjelenítése..."
+#: sg_DlgPreferences.cpp:646
+msgid "50 GB"
+msgstr "50 GB"
 
-#: clientgui/ViewWork.cpp:431
-msgid "Showing VM console for task..."
-msgstr "Virtuális gép konzol mutatása a feladathoz..."
+#: sg_DlgPreferences.cpp:647
+msgid "100 GB"
+msgstr "100 GB"
 
-#: clientgui/ViewWork.cpp:484
+#: sg_DlgPreferences.cpp:717
 #, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %s, Status: %s)"
-msgstr ""
-"Biztosan eldobja ezt a csomagot: '%s'?\n"
-"(Elkészült: %s, állapot: %s)"
+msgid "%d MB"
+msgstr "%d MB"
 
-#: clientgui/ViewWork.cpp:490
+#: sg_DlgPreferences.cpp:719
 #, c-format
-msgid "Are you sure you want to abort these %d tasks?"
-msgstr "Biztosan eldobja ezeket a(z) %d feladatokat?"
-
-# 75%
-#: clientgui/ViewWork.cpp:504
-#, fuzzy
-msgid "Aborting task..."
-msgstr "Átvitel megszakítása..."
-
-#: clientgui/ViewWork.cpp:776
-msgid "Show all tasks"
-msgstr "Minden feladat mutatása"
-
-#: clientgui/ViewWork.cpp:777
-msgid "Show all tasks."
-msgstr "Minden feladat mutatása."
+msgid "%4.2f GB"
+msgstr "%4.2f GB"
 
-#: clientgui/WelcomePage.cpp:284
-msgid "Add project or account manager"
-msgstr "Projekt vagy fiókkezelő hozzáadása"
+#: sg_DlgPreferences.cpp:760
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
 
-#: clientgui/WelcomePage.cpp:288
-msgid "Add project or use BOINC Account Manager"
-msgstr ""
+#: sg_DlgPreferences.cpp:796
+msgid "0 (Run Always)"
+msgstr "0 (mindig fut)"
 
-#: clientgui/WelcomePage.cpp:297
+#: sg_DlgPreferences.cpp:799
 #, 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 ""
-"Ha lehetséges, akkor a(z) %s\n"
-"weboldalán adjon hozzá projekteket.\n"
-"\n"
-"Az ezen varázslóval hozzáadott projekteket\n"
-"nem listázza és nem kezeli a(z) %s."
+msgid "%d"
+msgstr "%d"
 
-#: 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 ""
-"Több mint 30, különféle tudományos kutatást végző\n"
-"BOINC alapú projekt létezik, és Ön ezek közül\n"
-"annyihoz csatlakozhat, ahányhoz csak szeretne.\n"
-"Közvetlenül is hozzáadhat projekteket,\n"
-"de kiválaszthatja őket egy ún. fiókkezelő weboldalán keresztül is."
+#: sg_DlgPreferences.cpp:1029
+msgid "Do you really want to clear all local preferences?\n"
+msgstr "Biztosan törölni akar minden helyi beállítást?\n"
 
-#: clientgui/WelcomePage.cpp:325
-msgid ""
-"You have chosen to add a new volunteer computing project or change which projects\n"
-"you contribute to.\n"
-"\n"
-"Some of these projects are run and managed by World Community Grid, while others\n"
-"are run and managed by other researchers or organizations. The BOINC software\n"
-"can divide your spare processing power among any combination of projects.\n"
-"\n"
-"Alternatively, if you have registered with a BOINC Account Manager, you can use\n"
-"this to choose which projects to support.\n"
-"\n"
-"Please choose which type of change you would like to make:\n"
-msgstr ""
+#: sg_ProjectPanel.cpp:72
+msgid "Add Project"
+msgstr "Projekt hozzáadása"
 
-#: clientgui/WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
-msgstr ""
+#: sg_ProjectPanel.cpp:73
+msgid "Synchronize"
+msgstr "Szinkronizáció"
 
-#: clientgui/WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
-msgstr ""
+#: sg_ProjectPanel.cpp:74
+msgid "Work done for this project"
+msgstr "A projektben elvégzett munka"
 
-#: clientgui/WelcomePage.cpp:361
-msgid "Add projects run by other researchers or organizations"
-msgstr ""
+#: sg_ProjectPanel.cpp:77
+msgid "Synchronize projects with account manager system"
+msgstr "Projektek szinkronizálása a fiókkezelő rendszerrel"
 
-#: clientgui/WizardAttach.cpp:673
-msgid "Do you really want to cancel?"
-msgstr "Tényleg meg akarja szakítani?"
+#: sg_ProjectPanel.cpp:124
+msgid "Select a project to access with the controls below"
+msgstr "Válasszon ki egy projektet, amelyhez a lenti beállítások szerint kíván hozzáférni"
 
-#: clientgui/WizardAttach.cpp:674
-msgid "Question"
-msgstr "Kérdés"
+#: sg_ProjectPanel.cpp:145
+msgid "Project Web Pages"
+msgstr "A projekt weboldalai"
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
-msgid "&Next >"
-msgstr "Előre >"
+#: sg_ProjectPanel.cpp:149
+msgid "Project Commands"
+msgstr "Projekt parancsok"
 
-#: clientgui/wizardex.cpp:383
-msgid "< &Back"
-msgstr "< Vissza"
+#: sg_ProjectPanel.cpp:267
+#, c-format
+msgid "Pop up a menu of web sites for project %s"
+msgstr "Jelenjen meg egy menü a(z) %s projekt weboldalairól"
 
-#: clientgui/wizardex.cpp:553
-msgid "&Finish"
-msgstr "Befejez"
+#: sg_ProjectPanel.cpp:269
+#, c-format
+msgid "Pop up a menu of commands to apply to project %s"
+msgstr "Jelenjen meg egy menü a(z) %s projektre alkalmazható parancsokról"
 
-#: clientgui/common/wxPieCtrl.cpp:64
-msgid "Pie Ctrl"
-msgstr "Diagramszabályzás"
+#: sg_TaskCommandPopup.cpp:67
+msgid "Suspend this task."
+msgstr "Feladat felfüggesztése."
 
-#: clientgui/mac/Mac_GUI.cpp:35
-msgid "Services"
-msgstr "Szolgáltatások"
+#: sg_TaskCommandPopup.cpp:73
+msgid "Abandon this task. You will get no credit for it."
+msgstr "Feladat eldobása. Nem fogsz kreditet kapni érte."
 
-#: clientgui/mac/Mac_GUI.cpp:36
+#: sg_TaskCommandPopup.cpp:251
 #, c-format
-msgid "Hide %s"
-msgstr "%s elrejtése"
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %.1lf%%, Status: %s)"
+msgstr "Biztosan eldobja ezt a csomagot: '%s'?\n(Elkészült: %.1lf%%, Status: %s)"
 
-#: clientgui/mac/Mac_GUI.cpp:37
-msgid "Hide Others"
-msgstr "Többi elrejtése"
+#: sg_TaskPanel.cpp:464
+msgid "You don't have any projects.  Please Add a Project."
+msgstr "Nincs egy projektje sem. Kérjük, adjon hozzá egyet."
 
-#: clientgui/mac/Mac_GUI.cpp:38
-msgid "Show All"
-msgstr "Mutasd mindet"
+#: sg_TaskPanel.cpp:465
+msgid "Not available"
+msgstr "Nem elérhető"
 
-#: clientgui/mac/Mac_GUI.cpp:39
-#, c-format
-msgid "Quit %s"
-msgstr "%s bezárása"
+#: sg_TaskPanel.cpp:476
+msgid "Tasks:"
+msgstr "Feladatok:"
 
-#: clientgui/DlgAdvPreferences.h:30
-msgid "specify work start and stop hours in format HH:MM-HH:MM"
-msgstr "adja meg a végrehajtás kezdetét és végét ÓÓ:PP-ÓÓ:PP formátumban"
+#: sg_TaskPanel.cpp:482
+msgid "Select a task to access"
+msgstr "Válasszon ki egy feladatot, amelyhez hozzá kíván férni"
 
-#: clientgui/DlgAdvPreferences.h:31
-msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
-msgstr "adja meg a hálózat használatának kezdetét és végét ÓÓ:PP-ÓÓ:PP formátumban"
+#: sg_TaskPanel.cpp:493
+msgid "From:"
+msgstr "Innen:"
 
-# 98%
-#, fuzzy
-#~ msgid ""
-#~ "(C) 2003-2013 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2011 Kaliforniai Berkeley Egyetem.\n"
-#~ "Minden jog fenntartva."
+#: sg_TaskPanel.cpp:547
+msgid "This task's progress"
+msgstr "Ezen feladat állapota"
 
-#, c-format
-#~ msgid "%s - Preferences"
-#~ msgstr "%s - Beállítások"
+#: sg_TaskPanel.cpp:565
+msgid "Task Commands"
+msgstr "Feladatparancsok"
 
-#, no-c-format
-#~ msgid "% CPU time"
-#~ msgstr "%-át használja a CPU időnek"
-#~ msgid "KBytes/sec."
-#~ msgstr "KByte/sec."
-#~ msgid "Mbytes"
-#~ msgstr "Mbájt"
-#~ msgid "every"
-#~ msgstr "minden"
-#~ msgid "days"
-#~ msgstr "nap"
-#~ msgid "Gigabytes disk space"
-#~ msgstr "Gigabájt lemezterület"
-#~ msgid "Running, high priority"
-#~ msgstr "Fut (magas prioritással)"
-#~ msgid " (Scheduler wait: "
-#~ msgstr "(Ütemező vár: "
-#~ msgid " (Scheduler wait)"
-#~ msgstr "(Ütemező vár)"
-#~ msgid " (Waiting for network access)"
-#~ msgstr "(Várakozás hálózati hozzáférésre)"
-#~ msgid "Preferences…"
-#~ msgstr "Beállítások..."
-#~ msgid "I do not agree with the terms of use."
-#~ msgstr "Nem fogadom el a felhasználási feltételeket."
-#~ msgid "Click Clear to restore web-based settings."
-#~ msgstr "Kattintson a Törlésre a web-alapú beállítások visszaállításához."
-#~ msgid "For additional settings, select Computing Preferences in "
-#~ msgstr "További beállításokhoz válassza a Számítási beállításokat a"
-#~ msgid "the Advanced View."
-#~ msgstr "haladó nézetben."
-#~ msgid "Workunit name"
-#~ msgstr "A munkacsomag neve"
-#~ msgid "invalid float"
-#~ msgstr "érvénytelen lebegőpontos"
-#~ msgid "Display the advanced (accessible) graphical interface."
-#~ msgstr "A haladó (elérhető) grafikus felület megjelenítése."
-#~ msgid "Paused: Other work running"
-#~ msgstr "Megállítva: más munka fut"
-#~ msgid "Paused: User initiated.  Click 'Resume' to continue"
-#~ msgstr ""
-#~ "Megállítva: felhasználó által. A folytatáshoz kattintson a 'Folytatás' "
-#~ "gombra."
-#~ msgid "Paused: User active"
-#~ msgstr "Megállítva: a felhasználó aktív"
-#~ msgid "Paused: Computer on battery"
-#~ msgstr "Megállítva: a számítógép akkumulátorról üzemel"
-#~ msgid "Paused: Time of Day"
-#~ msgstr "Megállítva: ilyenkor nem dolgozhat"
-#~ msgid "Paused: Benchmarks running"
-#~ msgstr "Megállítva: sebességmérés fut"
-#~ msgid "Paused"
-#~ msgstr "Megállítva"
-#~ msgid "Paused: Application start delayed"
-#~ msgstr "Megállítva: az alkalmazás indítása elhalasztva"
-#~ msgid "Click to show project graphics"
-#~ msgstr "Kattintson ide a projekt grafikájának megtekintéséhez"
-#~ msgid "Open a window to view messages"
-#~ msgstr "Ablak megnyitása az üzenetek megtekintéséhez"
-#~ msgid "Stop all activity"
-#~ msgstr "Minden művelet megállítása"
-#~ msgid "Resume activity"
-#~ msgstr "Műveletek folytatása"
-#~ msgid "Open a window to set your preferences"
-#~ msgstr "Ablak nyitása a beállítások megadásához"
-#~ msgid "Switch to the BOINC advanced view"
-#~ msgstr "Váltás a BOINC haladó nézetére"
-#~ msgid "My Projects:"
-#~ msgstr "Projektjeim:"
+#: sg_TaskPanel.cpp:566
+msgid "Pop up a menu of commands to apply to this task"
+msgstr "Jelenjen meg egy menü az ezen feladatra alkalmazható parancsokról"
 
+#: sg_TaskPanel.cpp:701
 #, c-format
-#~ msgid "%s. Work done by %s: %0.2f"
-#~ msgstr "%s. %s által elvégzett munka: %0.2f"
+msgid "Application: %s"
+msgstr "Alkalmazás: %s"
 
+#: sg_TaskPanel.cpp:724
 #, c-format
-#~ msgid "%.1lf"
-#~ msgstr "%.1lf"
+msgid "%.3f%%"
+msgstr "%.3f%%"
 
-#, c-format
-#~ msgid "%d hr %d min %d sec"
-#~ msgstr "%d óra %d perc %d másodperc"
-#~ msgid "Are you sure you want to display graphics on a remote machine?"
-#~ msgstr "Biztosan egy távoli gépen szeretné megjeleníteni a grafikus felületet?"
-#~ msgid "Application: "
-#~ msgstr "Alkalmazás:"
-#~ msgid "Time Remaining: "
-#~ msgstr "Hátralévő idő:"
-#~ msgid "Elapsed Time: "
-#~ msgstr "Eltelt idő:"
-#~ msgid "Account manager website"
-#~ msgstr "Fiókkezelő honlap"
-#~ msgid "Account Manager &URL:"
-#~ msgstr "Fiókkezelő &URL-je:"
+#: sg_TaskPanel.cpp:732
+msgid "Application: Not available"
+msgstr "Alkalmazás: Nem elérhető"
 
-#, c-format
-#~ msgid "%s &website"
-#~ msgstr "%s &weboldal"
-#~ msgid "Notice List"
-#~ msgstr "Megjegyzések listája"
+#: sg_TaskPanel.cpp:832
+msgid "Not Available"
+msgstr "Nem elérhető"
 
+#: sg_TaskPanel.cpp:847
 #, c-format
-#~ msgid "%s; received on %s"
-#~ msgstr "%s; érkezett ehhez: %s"
+msgid "Elapsed: %s"
+msgstr "Eltelt: %s"
 
+#: sg_TaskPanel.cpp:861
 #, c-format
-#~ msgid "%s; received from %s; on %s"
-#~ msgstr "%s, érkezett innen: %s, ehhez: %s"
-#~ msgid "Click"
-#~ msgstr "Klikk"
-#~ msgid "Project List"
-#~ msgstr "Projektlista"
-#~ msgid "Nvidia GPU Supported"
-#~ msgstr "Nvidia GPU támogatva"
-#~ msgid "ATI GPU Supported"
-#~ msgstr "ATI GPU támogatva"
-#~ msgid "Project Website"
-#~ msgstr "A projekt weboldala"
-
-# 88%
-#, fuzzy
-#~ msgid "Retry now"
-#~ msgstr "Próbálja most"
-#~ msgid "10%"
-#~ msgstr "10%"
-#~ msgid "20%"
-#~ msgstr "20%"
-#~ msgid "30%"
-#~ msgstr "30%"
-#~ msgid "40%"
-#~ msgstr "40%"
-#~ msgid "50%"
-#~ msgstr "50%"
-#~ msgid "60%"
-#~ msgstr "60%"
-#~ msgid "70%"
-#~ msgstr "70%"
-#~ msgid "80%"
-#~ msgstr "80%"
-#~ msgid "90%"
-#~ msgstr "90%"
-#~ msgid "100%"
-#~ msgstr "100%"
-#~ msgid "1"
-#~ msgstr "1"
-#~ msgid "3"
-#~ msgstr "3"
-#~ msgid "5"
-#~ msgstr "5"
-#~ msgid "10"
-#~ msgstr "10"
-#~ msgid "15"
-#~ msgstr "15"
-#~ msgid "30"
-#~ msgstr "30"
-#~ msgid "60"
-#~ msgstr "60"
+msgid "Remaining (estimated): %s"
+msgstr "Hátralévő (becsült): %s"
 
+#: sg_TaskPanel.cpp:876
 #, c-format
-#~ msgid "Pop up a menu of websites for project %s"
-#~ msgstr "Jelenjen meg egy menü a(z) %s projekt weboldalairól"
-#~ msgid ""
-#~ "for accessibility support, please select advanced from the view menu or type "
-#~ "command shift a"
-#~ msgstr ""
-#~ "elérhetőségi támogatásért kérjük, válassza a Haladó beállítást a Nézet "
-#~ "menüből, vagy használja Command+Shift+A billentyűkombinációt"
-#~ msgid "This panel contains graphs showing user totals for projects"
-#~ msgstr "Ez a panel grafikonokat mutat a felhasználó projektösszesítőiről"
-#~ msgid "list headers"
-#~ msgstr "listázza a fejléceket"
-#~ msgid "list of events"
-#~ msgstr "események listája"
-#~ msgid "list of events is empty"
-#~ msgstr "az eseménylista üres"
+msgid "Status: %s"
+msgstr "Állapot: %s"
 
-#, c-format
-#~ msgid "list of %s"
-#~ msgstr "%s listája"
+#: sg_TaskPanel.cpp:1223
+msgid "Retrieving current status."
+msgstr "Aktuális állapot lekérdezése."
 
-#, c-format
-#~ msgid "list of %s is empty"
-#~ msgstr "a(z) %s lista üres"
+#: sg_TaskPanel.cpp:1229
+msgid "Downloading work from the server."
+msgstr "Munka letöltése a szerverről."
 
-#, c-format
-#~ msgid "; current sort column %d of %d; descending order; "
-#~ msgstr "; rendezés a(z) %d/%d. oszlop szerint; csökkenő sorrend; "
+#: sg_TaskPanel.cpp:1234
+msgid "Processing Suspended:  Running On Batteries."
+msgstr "Számítás felfüggesztve: A gép akkumulátorról működik."
 
-#, c-format
-#~ msgid "; current sort column %d of %d; ascending order; "
-#~ msgstr "; rendezés a(z) %d/%d. oszlop szerint; növekvő sorrend;"
+#: sg_TaskPanel.cpp:1236
+msgid "Processing Suspended:  User Active."
+msgstr "Számítás felfüggesztve: a felhasználó aktív."
 
-#, c-format
-#~ msgid "; column %d of %d; "
-#~ msgstr "; %d/%d oszlop"
-#~ msgid "list is empty"
-#~ msgstr "a lista üres"
+#: sg_TaskPanel.cpp:1238
+msgid "Processing Suspended:  User paused processing."
+msgstr "Számítás felfüggesztve: a felhasználó függesztette fel."
 
-#, c-format
-#~ msgid "; row %d; "
-#~ msgstr "; %d. sor;"
+#: sg_TaskPanel.cpp:1240
+msgid "Processing Suspended:  Time of Day."
+msgstr "Számítás felfüggesztve: ilyenkor nem dolgozhat."
 
-#, c-format
-#~ msgid "; selected row %d of %d; "
-#~ msgstr "; %d/%d. sor kiválasztva"
+#: sg_TaskPanel.cpp:1242
+msgid "Processing Suspended:  Benchmarks Running."
+msgstr "Számítás felfüggesztve: sebességmérés fut."
 
-#, c-format
-#~ msgid "; selected row %d ; "
-#~ msgstr "; %d. sor kiválasztva ;"
+#: sg_TaskPanel.cpp:1244
+msgid "Processing Suspended."
+msgstr "Számítás felfüggesztve."
 
-#, c-format
-#~ msgid "; row %d of %d; "
-#~ msgstr "; %d/%d sor;"
-#~ msgid "blank"
-#~ msgstr "üres"
-#~ msgid "list of projects or account managers"
-#~ msgstr "projektek vagy fiókkezelők listája"
+#: sg_TaskPanel.cpp:1248
+msgid "Waiting to contact project servers."
+msgstr "Várakozás a projektszerverekkel való kapcsolatfelvételre."
 
-#, c-format
-#~ msgid "selected row %d of %d; "
-#~ msgstr "%d/%d sor kiválasztva;"
+#: sg_TaskPanel.cpp:1252 sg_TaskPanel.cpp:1261
+msgid "Retrieving current status"
+msgstr "Aktuális állapot lekérdezése"
 
-#, c-format
-#~ msgid "row %d of %d; "
-#~ msgstr "%d/%d sor;"
-#~ msgid "The minimum username length for this project is 1. Please enter a different username."
-#~ msgstr ""
-#~ "A felhasználónév minimális hossza ennél a projektnél 1. Kérjük, írjon be "
-#~ "másik nevet."
-#~ msgid "The minimum username length for this account manager is 1. Please enter a different username."
-#~ msgstr ""
-#~ "A felhasználónév minimális hossza ennél a fiókkezelőnél 1. Kérjük, írjon be "
-#~ "másik nevet."
-#~ msgid "The minimum email address length for this project is 1. Please enter a different email address."
-#~ msgstr ""
-#~ "Az email cím minimális hossza ennél a projektnél 1. Kérjük, írjon be másik "
-#~ "email címet."
-#~ msgid "The minimum email address length for this account manager is 1. Please enter a different email address."
-#~ msgstr ""
-#~ "Az email cím minimális hossza ennél a fiókkezelőnél 1. Kérjük, írjon be "
-#~ "másik email címet."
+#: sg_TaskPanel.cpp:1256
+msgid "No work available to process"
+msgstr "Nincs feldolgozható munka"
 
-#, c-format
-#~ msgid "The minimum password length for this project is %d. Please enter a different password."
-#~ msgstr ""
-#~ "A minimális jelszóhossz ennél a projektnél: %d. Kérem, válasszon másik "
-#~ "jelszót."
+#: sg_TaskPanel.cpp:1258
+msgid "Unable to connect to the core client"
+msgstr "Nem lehet csatlakozni a magklienshez"
 
-#, c-format
-#~ msgid "The minimum password length for this account manager is %d. Please enter a different password."
-#~ msgstr ""
-#~ "A minimális jelszóhossz ennél a fiókkezelőnél: %d. Kérem, válasszon másik "
-#~ "jelszót."
-#~ msgid ""
-#~ "An error has occurred;\n"
-#~ "check the Event Log for details.\n"
-#~ "\n"
-#~ "Click Finish to close."
-#~ msgstr ""
-#~ "Hiba történt;\n"
-#~ "a részletekért nézze meg az Eseménynaplót.\n"
-#~ "\n"
-#~ "Kattintson a Befejez gombra a bezáráshoz."
+#: wizardex.cpp:377 wizardex.cpp:553
+msgid "&Next >"
+msgstr "Előre >"
 
-#, no-c-format
-#~ msgid "% of the processors"
-#~ msgstr "%-át használja a processzoroknak"
+#: wizardex.cpp:383
+msgid "< &Back"
+msgstr "< Vissza"
 
-#, c-format
-#~ msgid "New page inserted. Index = %i"
-#~ msgstr "Új oldal lett beillesztve. Száma = %i"
+#: wizardex.cpp:553
+msgid "&Finish"
+msgstr "Befejez"
 
-#, c-format
-#~ msgid "New page appended. Index = %i"
-#~ msgstr "Új oldal lett hozzáfűzve. Száma = %i"
+#: mac/Mac_GUI.cpp:110
+msgid "Preferences…"
+msgstr "Beállítások..."
 
-#, c-format
-#~ msgid "Old Page Index = %i"
-#~ msgstr "Régi oldalszám = %i"
+#: mac/Mac_GUI.cpp:122
+msgid "Services"
+msgstr "Szolgáltatások"
 
+#: mac/Mac_GUI.cpp:144
 #, c-format
-#~ msgid "OnDropTarget: index by HitTest = %i"
-#~ msgstr "OnDropTarget: HitTest index = %i"
-#~ msgid "Identify your account "
-#~ msgstr "Fiókjának azonosítása"
-#~ msgid "Read config file"
-#~ msgstr "Konfigurációs fájl beolvasása"
-#~ msgid "Read configuration info from cc_config.xml"
-#~ msgstr "Konfigurációs infók beolvasása a cc_config.xml fájlból"
-#~ msgid ""
-#~ "(C) 2003-2011 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2011 Kaliforniai Berkeley Egyetem.\n"
-#~ "Minden jog fenntartva."
-#~ msgid "NVIDIA GPU"
-#~ msgstr "NVIDIA GPU"
-#~ msgid "ATI GPU"
-#~ msgstr "ATI GPU"
-#~ msgid "Multicore CPU Supported"
-#~ msgstr "Többmagos processzor támogatva"
-#~ msgid "%s: %.0f"
-#~ msgstr "%s: %.0f"
-#~ msgid "Click 'Retry now' to transfer the file now"
-#~ msgstr "Kattintson a \"Próbálja most\" gombra a fájl átviteléhez"
-#~ msgid ""
-#~ "Click 'Abort transfer' to delete the file from the transfer queue. This "
-#~ "will prevent you from being granted credit for this result."
-#~ msgstr ""
-#~ "Kattintson a \"Átvitel megszakítása\" gombra, hogy törölje a fájlt az "
-#~ "átviteli sorból. Ez megakadályozza, hogy a munkáért kreditet kapjon."
-#~ msgid "Aborting result..."
-#~ msgstr "Csomag eldobása..."
-#~ msgid ""
-#~ "You have chosen to add a new BOINC project.  Adding a new\n"
-#~ "project means that you will be connecting your computer to a new "
-#~ "organization.\n"
-#~ "If this is what you wanted to do, please click on\n"
-#~ "the 'Next' button below.\n"
-#~ "\n"
-#~ "Some projects like World Community Grid run multiple research "
-#~ "applications.\n"
-#~ "If you want to change which research applications are sent to your "
-#~ "computer\n"
-#~ "to run, visit the project's website and modify your\n"
-#~ "preferences there.\n"
-#~ "\n"
-#~ "To change which research applications are sent to you from\n"
-#~ "World Community Grid then please click on the following button:"
-#~ msgstr ""
-#~ "Azt választotta, hogy hozzáad egy új BOINC projektet. Egy új projekt "
-#~ "hozzáadása\n"
-#~ "egyúttal számítógépének egy új szervezethez való csatlakoztatását is "
-#~ "jelenti.\n"
-#~ "Ha ez az, amit tenni szeretne, kérem, kattintson a lenti \"Következő\" "
-#~ "gombra.\n"
-#~ "\n"
-#~ "Egyes projektek, mint például a World Community Grid, többféle kutatási "
-#~ "alkalmazást is\n"
-#~ "futtatnak. Ha módosítani szeretné a projekt által az Ön számítógépén "
-#~ "használható alkalmazások\n"
-#~ "listáját, látogassa meg annak weboldalát, és ott módosítsa a "
-#~ "beállításait.\n"
-#~ "\n"
-#~ "A World Community Gridtől kapott alkalmazások kiválasztásához kérem,\n"
-#~ "kattintson az alábbi gombra:"
-#~ msgid "Change Research Applications at World Community Grid"
-#~ msgstr "A World Community Grid kutatási alkalmazásainak kiválasztása"
-#~ msgid "Don't fetch NVIDIA GPU tasks"
-#~ msgstr "Ne töltsön le NVIDIA GPU feladatokat"
-#~ msgid "NVIDIA GPU work fetch deferred for"
-#~ msgstr "NVIDIA GPU munkaletöltés elhalasztva"
-#~ msgid "NVIDIA GPU work fetch deferral interval"
-#~ msgstr "NVIDIA GPU munkaletöltés elhalasztási intervalluma"
-#~ msgid "Don't fetch ATI GPU tasks"
-#~ msgstr "Ne töltsön le ATI GPU feladatokat"
-#~ msgid "ATI GPU work fetch deferred for"
-#~ msgstr "ATI GPU munka letöltése elhalasztva"
-#~ msgid "ATI GPU work fetch deferral interval"
-#~ msgstr "ATI GPU munkaletöltés elhalasztási intervalluma"
-#~ msgid "Remaining"
-#~ msgstr "Hátravan"
-#~ msgid "Web sites"
-#~ msgstr "Weboldalak"
-#~ msgid "Connect about every"
-#~ msgstr "Csatlakozás kb. ilyen gyakran:"
-#~ msgid ""
-#~ "this computer is connected to the Internet about every X days\n"
-#~ "(0 if it's always connected)"
-#~ msgstr ""
-#~ "ez a számítógép kb. X naponta kapcsolódik az internetre\n"
-#~ "(0 ha mindig kapcsolódik)"
-#~ msgid "days (max. 10)"
-#~ msgstr "nap (max. 10)"
-#~ msgid "%d.%d%%"
-#~ msgstr "%d.%d%%"
-#~ msgid "Display and network &options..."
-#~ msgstr "Megjelenítési és hálózati &beállítások..."
-#~ msgid ""
-#~ "You have requested to exit the %s,\n"
-#~ "which allows you to view and manage\n"
-#~ "the science applications running on your computer.\n"
-#~ "\n"
-#~ "If you also want to stop running the science applications when you\n"
-#~ "exit the Manager, then choose from the following options:"
-#~ msgstr ""
-#~ "Abból a %s-ből való kilépést választotta,\n"
-#~ "amelyik lehetővé teszi tudományos alkalmazások futtatását és "
-#~ "megtekintését a számítógépén.\n"
-#~ "\n"
-#~ "Amennyiben a tudományos alkalmazások futtatását is le akarja állítani\n"
-#~ "a Kezelőből való kilépéskor, akkor válasszon a következő lehetőségek "
-#~ "közül:"
-#~ msgid "Stop running science applications when exiting the Manager"
-#~ msgstr ""
-#~ "Állítsa le a futó tudományos alkalmazásokat a Kezelőből való kilépéskor"
-#~ msgid "CPU work fetch priority"
-#~ msgstr "CPU munka letöltési prioritás"
-#~ msgid "NVIDIA GPU scheduling priority"
-#~ msgstr "NVIDIA GPU ütemezési prioritás"
-#~ msgid "NVIDIA GPU work fetch priority"
-#~ msgstr "NVIDIA GPU munkaletöltési prioritás"
-#~ msgid "ATI GPU scheduling priority"
-#~ msgstr "ATI GPU ütemezési prioritás"
-#~ msgid "ATI GPU work fetch priority"
-#~ msgstr "ATI GPU munkaletöltési prioritás"
-#~ msgid "Estimated app speed"
-#~ msgstr "Becsült számítási sebesség"
-#~ msgid "Estimated task size"
-#~ msgstr "Becsült feladatméret"
-#~ msgid "Max RAM usage"
-#~ msgstr "Maximum RAM használat"
-#~ msgid "%s - Options"
-#~ msgstr "%s - Beállítások"
-#~ msgid "Retrieving host information; please wait..."
-#~ msgstr "Gépre vonatkozó beállítások lekérdezése, kérem várjon..."
-#~ msgid " (waiting for GPU memory)"
-#~ msgstr " (GPU memóriára várakozik)"
-#~ msgid "Manager Settings..."
-#~ msgstr "A Kezelő beállításai..."
-#~ msgid "Pause"
-#~ msgstr "Megállítás"
-#~ msgid "%s - Messages"
-#~ msgstr "%s - Üzenetek"
-#~ msgid "Skin:"
-#~ msgstr "Kinézet:"
-#~ msgid "Preferences"
-#~ msgstr "Beállítások"
-#~ msgid "I want to customize my preferences for this computer only."
-#~ msgstr ""
-#~ "Csak ehhez a számítógéphez szeretném testre szabni a beállításaimat."
-#~ msgid "Customized Preferences"
-#~ msgstr "Testre szabott beállítások"
-#~ msgid "My total work done this Project"
-#~ msgstr "E projektben végzett összes munkám"
-#~ msgid "My Tasks:"
-#~ msgstr "Feladataim:"
-#~ msgid "From Project:"
-#~ msgstr "Ettől a projekttől: "
-#~ msgid "Elapsed Time: %s"
-#~ msgstr "Eltelt idő: %s"
-#~ msgid "Time Remaining: %s"
-#~ msgstr "Hátralévő idő: %s"
-#~ msgid "Upload suspended - "
-#~ msgstr "Feltöltés felfüggesztve - "
-#~ msgid "Download suspended - "
-#~ msgstr "Letöltés felfüggesztve - "
-#~ msgid "Upload pending"
-#~ msgstr "Feltöltés függőben"
-#~ msgid "Download pending"
-#~ msgstr "Letöltés függőben"
-#~ msgid "Get help with BOINC"
-#~ msgstr "Segítség kérése a BOINChoz"
-#~ msgid "Event Log..."
-#~ msgstr "Eseménynapló..."
-#~ msgid "Attaching to project or account manager..."
-#~ msgstr "Csatlakozás projekthez vagy fiókkezelőhöz..."
-#~ msgid "%s - Detach from %s"
-#~ msgstr "%s - Leválasztás innen: %s"
-#~ msgid "Retrying communications."
-#~ msgstr "Kapcsolódás újra."
-#~ msgid "Failed to attach to project"
-#~ msgstr "A projekthez való csatlakozás sikertelen"
-#~ msgid "Failed to attach to account manager"
-#~ msgstr "A fiókkezelőhöz való csatlakozás sikertelen"
-#~ msgid "Attached to account manager"
-#~ msgstr "Csatlakozott a fiókkezelőhöz"
-#~ msgid "You are now successfully attached to the %s system."
-#~ msgstr "Ön most sikeresen csatlakozott a(z) %s rendszerhez."
-#~ msgid "You are now successfully attached to this account manager."
-#~ msgstr "Ön most sikeresen csatlakozott ehhez a fiókkezelőhöz."
-#~ msgid "Attach to project"
-#~ msgstr "Csatlakozás projekthez"
-#~ msgid "Attach to account manager"
-#~ msgstr "Csatlakozás fiókkezelőhöz"
-#~ msgid "%s needs to connect to the Internet.  Please click to open %s."
-#~ msgstr ""
-#~ "%s szeretne kapcsolódni az Internetre. Kérjük, kattintson %s "
-#~ "megnyitásához."
-#~ msgid ""
-#~ "%s is unable to communicate with a project and needs an Internet "
-#~ "connection.\n"
-#~ "Please connect to the Internet, then select the 'Do network "
-#~ "communications' item from the Advanced menu."
-#~ msgstr ""
-#~ "%s nem képes kommunikálni egy projekttel és internetkapcsolatra van "
-#~ "szüksége.Kérjük, csatlakozzon az Internetre, majd válassza a 'Hálózati "
-#~ "kommunikáció létesítése' pontot a Haladó menüben."
-#~ msgid ""
-#~ "%s couldn't do Internet communication, and no default connection is "
-#~ "selected.\n"
-#~ "Please connect to the Internet, or select a default connection\n"
-#~ "using Advanced/Options/Connections."
-#~ msgstr ""
-#~ "%s nem képes internetkapcsolatot létesíteni, és nincs kijelölve "
-#~ "alapértelmezett kapcsolat. Kérjük, csatlakozzon az Internetre, vagy "
-#~ "válasszon alapértelmezett kapcsolatota Haladó/Opciók/Kapcsolatok "
-#~ "menüpontban."
-#~ msgid "One or more notices are now available for viewing."
-#~ msgstr "Egy vagy több megjegyzés megtekinthető."
-#~ msgid "You are now successfully attached to this project."
-#~ msgstr "Ön most sikeresen csatlakozott ehhez a projekhez."
-#~ msgid "Attached to %s"
-#~ msgstr "Csatlakozott a(z) %s projekthez"
-#~ msgid "Detach when done"
-#~ msgstr "Leválasztás, ha kész"
-#~ msgid "Detach"
-#~ msgstr "Leválasztás"
-#~ msgid "Detaching from project..."
-#~ msgstr "Leválasztás a projektről..."
-#~ msgid "Are you sure you want to detach from project '%s'?"
-#~ msgstr "Biztos benne, hogy a(z) '%s' projektről leválasztja a számítógépet?"
-#~ msgid "Detach from Project"
-#~ msgstr "Leválasztás a projektről"
-#~ msgid "Attach this computer to a project or account manager"
-#~ msgstr "A számítógép csatlakoztatása egy projekthez vagy fiókkezelőhöz"
-#~ msgid "Client is processing results."
-#~ msgstr "A Kliens eredményeket dolgoz fel."
-#~ msgid "To completion"
-#~ msgstr "Idő a befejezésig"
-#~ msgid "Attach to a project or account manager to begin processing work"
-#~ msgstr ""
-#~ "A feldolgozási munka megkezdéséhez csatlakozzon egy projekthez vagy "
-#~ "fiókkezelőhöz"
-#~ msgid "Attach to a project to begin processing work"
-#~ msgstr "Csatlakozzon egy projekthez a feldolgozás megkezdéséhez"
-#~ msgid "%s: %.2f%% completed."
-#~ msgstr "%s: %.2f%% kész."
-#~ msgid "%d tasks running."
-#~ msgstr "%d feladat fut."
-#~ msgid "&Close Window\tCtrl+W"
-#~ msgstr "Ablak &bezárása\tCtrl+W"
-#~ msgid "&Messages\tCtrl+Shift+M"
-#~ msgstr "&Üzenetek\tCtrl+Shift+M"
-#~ msgid "Display news"
-#~ msgstr "Hírek mutatása"
-#~ msgid "Retrying communications for project(s)..."
-#~ msgstr "Újra kapcsolódik a projekt(ek)het..."
-#~ msgid "User information"
-#~ msgstr "Felhasználói információ"
-#~ msgid "Account Manager URL"
-#~ msgstr "Fiókkezelő URL-je"
-#~ msgid "Enter the URL of the account manager's web site."
-#~ msgstr "Adja meg a fiókkezelő weboldalának URL-jét."
-#~ msgid "Close BOINC Manager Window."
-#~ msgstr "A BOINC kezelő ablakának bezárása."
-#~ msgid "Exit the %s"
-#~ msgstr "Kilépés ebből: %s"
-#~ msgid ""
-#~ "Advanced views allow you to sort various columns and displays graphical "
-#~ "progress bars."
-#~ msgstr ""
-#~ "Haladó nézetben különböző oszlopok szerint rendezheti listáit, a "
-#~ "folyamatokról állapotjelzők segítségével szerezhet információkat."
-#~ msgid "Attach to &account manager..."
-#~ msgstr "Csatlakozás &fiókkezelőhöz..."
-#~ msgid "Attach to an account manager"
-#~ msgstr "Csatlakozás egy fiókkezelőhöz"
-#~ msgid "Attach to &project"
-#~ msgstr "Csatlakozás &projekthez"
-#~ msgid "Attaching to project..."
-#~ msgstr "Csatlakozás egy projekthez"
-#~ msgid "Debug Flags"
-#~ msgstr "Hibaszűrési jelzés"
-#~ msgid "Project Properties Failure"
-#~ msgstr "Projekt beállítások hiba"
-#~ msgid "Project Properties URL Failure"
-#~ msgstr "Projekt beállítások URL hiba"
-#~ msgid "Account Creation Disabled"
-#~ msgstr "Fióklétrehozás letiltva"
-#~ msgid "Account Already Exists"
-#~ msgstr "Fiók már létezik"
-#~ msgid "Project Already Attached"
-#~ msgstr "Már csatlakozott a projekthez"
-#~ msgid "Project Attach Failure"
-#~ msgstr "Projekt csatlakozási hiba"
-#~ msgid "Net Detection Failure"
-#~ msgstr "Hálózat felismerési hiba"
-#~ msgid ""
-#~ "You can copy and paste the URL from your browser's\n"
-#~ "address bar."
-#~ msgstr ""
-#~ "Írja be a megfelelő URL-t vagy másolja ki\n"
-#~ "böngészője címsorából és illessze be ide."
-#~ msgid "For a list of account managers go to:"
-#~ msgstr "A fiókkezelők listáját itt találja:"
-#~ msgid "&Advanced View"
-#~ msgstr "&Haladó nézet"
-#~ msgid "You are already attached to this project."
-#~ msgstr "Ön már csatlakozott ehhez a projekhez."
-#~ msgid "Test"
-#~ msgstr "Teszt"
-#~ msgid "Account information"
-#~ msgstr "Fiók információ"
-#~ msgid "Do you wish to use an existing account or create a new one?"
-#~ msgstr "Már meglévő fiókot akar használni, vagy újat készít?"
-#~ msgid ""
-#~ "Transition Note: Account keys are used as passwords for accounts created\n"
-#~ "before BOINC migrated to a username and password authentication scheme."
-#~ msgstr ""
-#~ "Átmeneti megjegyzés: Korábban létrehozott fiókokhoz a BOINC "
-#~ "fiókkulcsokat, mint\n"
-#~ "jelszavakat használt, a jelenlegi felhasználónévvel és jelszóval történő "
-#~ "azonosítás helyett."
-#~ msgid "Create new &account"
-#~ msgstr "Új fiók létrehozása"
-#~ msgid "&Use existing account"
-#~ msgstr "Létező fiók használata"
-#~ msgid "Email address:"
-#~ msgstr "Email cím:"
-#~ msgid "Enter account key"
-#~ msgstr "Adja mef fiókkulcsát"
-#~ msgid "This project uses an \"account key\" to identify you."
-#~ msgstr "Ez a projekt az azonosításhoz \"fiókkulcsot\" használ."
-#~ msgid ""
-#~ "Go to the project's web site to create an account. Your account\n"
-#~ "key will be emailed to you."
-#~ msgstr ""
-#~ "A projekt honlapján hosszon létre egy fiókot.\n"
-#~ "A fiók kulcsát emailben kapja meg."
-#~ msgid "An account key looks like:"
-#~ msgstr "Egy fiókkulcs ilyen alakú:"
-#~ msgid "82412313ac88e9a3638f66ea82186948"
-#~ msgstr "82412313ac88e9a3638f66ea82186948"
-#~ msgid "Account key:"
-#~ msgstr "Fiókkulcs:"
-#~ msgid ""
-#~ "Communicating with account manager\n"
-#~ "Please wait..."
-#~ msgstr ""
-#~ "Kapcsolat a fiókkezelővel\n"
-#~ "Kérem várjon..."
-#~ msgid ""
-#~ "Communicating with account manager \n"
-#~ "Please wait..."
-#~ msgstr ""
-#~ "Kapcsolat a fiókkezelővel \n"
-#~ "Kérem várjon..."
-#~ msgid "BOINC is currently suspended...\n"
-#~ msgstr "BOINC jelenleg fel van függesztve...\n"
-#~ msgid "BOINC networking is currently suspended...\n"
-#~ msgstr "BOINC hálózati kapcsolata jelenleg fel van függesztve...\n"
-#~ msgid "&Open BOINC Manager..."
-#~ msgstr "BOINC kezelő megnyitása..."
-#~ msgid "&About BOINC Manager..."
-#~ msgstr "BOINC kezelő névjegye..."
-#~ msgid ""
-#~ "A software platform for distributed computing using volunteered computer "
-#~ "resources"
-#~ msgstr ""
-#~ "Egy szoftveres felület az adományozott számítógépes erőforrások\n"
-#~ "felhasználására az elosztott számítástechnikában."
-#~ msgid "Your current account manager is:"
-#~ msgstr "Az Ön jelenelegi fiókkezelője:"
-#~ msgid "foo"
-#~ msgstr "foo"
-#~ msgid "&Update"
-#~ msgstr "Frissítés"
-#~ msgid "Change"
-#~ msgstr "Változtat"
-#~ msgid "Language Selection:"
-#~ msgstr "Nyelv kiválasztása:"
-#~ msgid "What language should the manager display by default."
-#~ msgstr "Melyik nyelvet hasznlja a kezelő alapértelmezettként."
-#~ msgid "Reminder Frequency:"
-#~ msgstr "Emlékeztető gyakorisága:"
-#~ msgid ""
-#~ "How often, in minutes, should the manager remind you of possible "
-#~ "connection events."
-#~ msgstr ""
-#~ "Milyen gyakran emlékeztesse a kezelő Önt a lehetséges kapcsolódási "
-#~ "eseményekre (percekben)."
-#~ msgid "&Automatically detect network connection settings"
-#~ msgstr "Automatikusan ismerje fel a hálózati beállításokat"
-#~ msgid "Use my &Local Area Network(LAN) connection"
-#~ msgstr "Használja a Helyi hálózati (LAN) kapcsolatot"
-#~ msgid "Use my &Dial-up and Virtual Private Network connection"
-#~ msgstr ""
-#~ "Használja a Betárcsázós és Virtuális Mangán Hálózat (VPN) kapcsolatot"
-#~ msgid "&Prompt for username and password"
-#~ msgstr "Felhasználói név és jelszó kérése"
-#~ msgid "Failed to create wxStaticText, needed by wxHyperLink!"
-#~ msgstr "Nem sikerült a wxHyperLink által kért wxStaticText létrehozása!"
-#~ msgid ""
-#~ "BOINC could not determine what your default browser is.\n"
-#~ "Please verify that you have either the 'mailcap' package installed or\n"
-#~ "'mime' package installed, and that the 'text/html' mime type is\n"
-#~ "configured for your favorite browser. Another method is to set the\n"
-#~ "BROWSER environment variable to point to whatever your favorite\n"
-#~ "web browser is.  Please open a browser window to the following URL:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "BOINC nem tudta meghatározni az Ön alapértelmezett böngészőjét.\n"
-#~ "Kérem elleneőrizze, hogy a \"mailcap\" vagy a \"mime\" csomag talapítve "
-#~ "van,\n"
-#~ "és azt hogy a \"text/html\" mime típus be van állítva a kedvenc "
-#~ "bögészőjében.\n"
-#~ "Másik lehetőség, hogy a BROWSER környezeti változóban beállítja "
-#~ "tetszőleges\n"
-#~ "kedvenc böngészőjét.Kérem nyissa meg a böngészőjében az alábbi URL-t:\n"
-#~ "\n"
-#~ "%s"
-#~ msgid "BOINC Manager - Connection Error"
-#~ msgstr "BOINC kezelő - Kapcsolódási hiba"
-#~ msgid "BOINC Manager - Connection failed"
-#~ msgstr "BOINC kezelő - Sikertelen kapcsolódás"
-#~ msgid "Connection failed."
-#~ msgstr "Sikertelen kapcsolódás."
-#~ msgid "BOINC info"
-#~ msgstr "BOINC információ"
-#~ msgid "Exit the BOINC Manager"
-#~ msgstr "Kilépés a BOINC kezelőből"
-#~ msgid ""
-#~ "Report completed work, get latest credit, get latest preferences, and "
-#~ "possibly get more work."
-#~ msgstr ""
-#~ "Befejezett munka jelentése, legutóbbi kreditek és beállítások letöltése, "
-#~ "és talán új munka letöltése."
-#~ msgid "&Options"
-#~ msgstr "Beállítások"
-#~ msgid "&BOINC Manager\tF1"
-#~ msgstr "BOINC kezelő\tF1"
-#~ msgid "Show information about BOINC and BOINC Manager"
-#~ msgstr "BOINC és BOINC kezelő információi"
-#~ msgid "&Projects"
-#~ msgstr "Projektek"
-#~ msgid "Language Selection..."
-#~ msgstr "Nyelv kiválasztása..."
-#~ msgid "BOINC Manager - Network Status"
-#~ msgstr "BOINC kezelő - Hálózat állapota"
-#~ msgid ""
-#~ "BOINC needs a connection to the Internet to perform some maintenance, "
-#~ "open the BOINC Manager to connect up and perform the needed work."
-#~ msgstr ""
-#~ "BOINC-nak szüksége van internetkapcsolatra, nyissa meg a BOINC kezelőt a "
-#~ "kapcsolódáshoz és a szükséges munka elvégzéséhez."
-#~ msgid "The URL you supplied is not that of a BOINC-based project."
-#~ msgstr "Az Ön által megadott URL-en nem található BOINC-projekt."
-#~ msgid "Please check the URL and try again."
-#~ msgstr "Kérem, ellenőrizze az URL-t, és próbálja újra"
-#~ msgid ""
-#~ "The URL you supplied is not that of a BOINC-based account\n"
-#~ "manager."
-#~ msgstr "Az Ön által megadott URL-en nem található fiókkezeló"
-#~ msgid "Account not found"
-#~ msgstr "Fiók nem található"
-#~ msgid "Verify your account name and password are correct and try again."
-#~ msgstr "Ellenőrizze, hogy a fióknév és a jelszó helyes-e, és próbálja újra."
-#~ msgid "Project URL"
-#~ msgstr "Projekt URL"
-#~ msgid "Enter the URL of the project's web site."
-#~ msgstr "Adja meg a projek weboldalának URL-jét."
-#~ msgid "For a list of BOINC-based projects go to:"
-#~ msgstr "A BOINC-alapú projektek listájához látogasson el ide:"
-#~ msgid "Total credit"
-#~ msgstr "Összes kredit"
-#~ msgid "Avg. credit"
-#~ msgstr "Átlag kredit"
-#~ msgid "Allow new work"
-#~ msgstr "Új munka engedélyezése"
-#~ msgid "Disk Space"
-#~ msgstr "Lemezterület"
-#~ msgid "Are you sure you want to abort this file transfer '%s'?"
-#~ msgstr "Biztosan megszakítja a(z) \"%s\" fájl átvitelét?"
-#~ msgid "Work"
-#~ msgstr "Munka"
-#~ msgid "Resuming result..."
-#~ msgstr "Munka folytatása a jelen csomagon..."
-#~ msgid "Abort result"
-#~ msgstr "Csomag eldobása"
-#~ msgid "Activities suspended"
-#~ msgstr "Tevékenység felfüggesztve"
-#~ msgid "Preempted"
-#~ msgstr "Megelőzve"
-#~ msgid "Ready to run"
-#~ msgstr "Indításra kész"
-#~ msgid "Activities suspended by user"
-#~ msgstr "Tevékenység felfüggesztve a felhasználó által"
-#~ msgid "Project Comm Failure"
-#~ msgstr "Projekt kommunikciós hiba"
-#~ msgid "Google Comm Failure"
-#~ msgstr "Google kommunikációs hiba"
-#~ msgid "Yahoo Comm Failure"
-#~ msgstr "Yahoo kommunikácis hiba"
-#~ msgid "Attach to Account Manager"
-#~ msgstr "Csatlakozás fiókkezelőhöz"
-#~ msgid "Attach to Project"
-#~ msgstr "Csatlakozás projekthez"
-#~ msgid "About BOINC Manager"
-#~ msgstr "BOINC kezelő névjegye"
-#~ msgid "Account Manager"
-#~ msgstr "Fiókkezelő"
-#~ msgid "Dialup Logon"
-#~ msgstr "Betárcsázás bejelentkezéskor"
+msgid "Hide %s"
+msgstr "%s elrejtése"
+
+#: mac/Mac_GUI.cpp:158
+msgid "Hide Others"
+msgstr "Többi elrejtése"
+
+#: mac/Mac_GUI.cpp:172
+msgid "Show All"
+msgstr "Mutasd mindet"
 
+#: mac/Mac_GUI.cpp:186
+#, c-format
+msgid "Quit %s"
+msgstr "%s bezárása"
diff --git a/locale/hu/BOINC-Setup.mo b/locale/hu/BOINC-Setup.mo
index 24be3e7..6cdceda 100644
Binary files a/locale/hu/BOINC-Setup.mo and b/locale/hu/BOINC-Setup.mo differ
diff --git a/locale/hu/BOINC-Setup.po b/locale/hu/BOINC-Setup.po
index 56380b7..b25450d 100755
--- a/locale/hu/BOINC-Setup.po
+++ b/locale/hu/BOINC-Setup.po
@@ -4,37 +4,34 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-01-26 00:00-0800\n"
-"PO-Revision-Date: 2015-02-11 00:05-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: 2014-01-19 08:29+0000\n"
+"Last-Translator: Gabor <csega at mailbox.hu>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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: 1390120193.0\n"
 "X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: mac_installer\n"
 
 #: Installer.cpp:124
 #, c-format
 msgid "Sorry, this version of %s requires system 10.5 or higher."
 msgstr "Sajnos a(z) %s ezen verziója 10.5 vagy nagyobb rendszerverziót igényel."
 
-#: PostInstall.cpp:130
-#: PostInstall.cpp:1136
-#: uninstall.cpp:1618
+#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
 msgid "Yes"
 msgstr "Igen"
 
-#: PostInstall.cpp:131
-#: PostInstall.cpp:1137
-#: uninstall.cpp:1619
+#: PostInstall.cpp:131 PostInstall.cpp:1137 uninstall.cpp:1619
 msgid "No"
 msgstr "Nem"
 
@@ -45,9 +42,11 @@ msgstr "Akkor is fusson a BOINC, ha mindenki kijelentkezett?"
 #: PostInstall.cpp:1416
 #, c-format
 msgid ""
-"Users who are permitted to administer this computer will automatically be allowed to run and control %s.\n"
+"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?"
+"Do you also want non-administrative users to be able to run and control %s "
+"on this Mac?"
 msgstr ""
 
 #: PostInstall.cpp:1444
@@ -112,7 +111,8 @@ msgstr ""
 #: uninstall.cpp:840
 #, c-format
 msgid ""
-"Enter your administrator password to completely remove %s from you computer.\n"
+"Enter your administrator password to completely remove %s from you "
+"computer.\n"
 "\n"
 msgstr ""
 
@@ -125,6 +125,6 @@ msgid "Continue..."
 msgstr ""
 
 #, c-format
+#, c-format, c-format
 #~ msgid "Sorry, this version of %s requires system 10.4 or higher."
 #~ msgstr "Sajnos a(z) %s ezen verziója 10.4 vagy nagyobb rendszerverziót igényel."
-
diff --git a/locale/hu/BOINC-Web.mo b/locale/hu/BOINC-Web.mo
index 38985e9..7275218 100644
Binary files a/locale/hu/BOINC-Web.mo and b/locale/hu/BOINC-Web.mo differ
diff --git a/locale/hu/BOINC-Web.po b/locale/hu/BOINC-Web.po
index 79c4180..813f87c 100755
--- a/locale/hu/BOINC-Web.po
+++ b/locale/hu/BOINC-Web.po
@@ -4,23 +4,24 @@
 # FileID  : $Id$
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\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-11 00:06-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: 2013-10-09 09:40+0000\n"
+"Last-Translator: Gabor <csega at mailbox.hu>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n !=1);\n"
 "X-Generator: Pootle 2.5.0\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
+"X-Poedit-SearchPath-0: doc\n"
 "X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
 "X-POOTLE-MTIME: 1381311614.0\n"
 "X-Poedit-KeywordsList: tra\n"
-"X-Poedit-SearchPath-0: doc\n"
 
 #: docutil.php:21
 msgid "Search"
@@ -36,7 +37,9 @@ msgid "This page is %stranslatable%s."
 msgstr "Ez az oldal %slefordítható%s."
 
 #: download.php:39
-msgid "We recommend that you also install VirtualBox, so your computer can work on science projects that require it."
+msgid ""
+"We recommend that you also install VirtualBox, so your computer can work on "
+"science projects that require it."
 msgstr ""
 
 #: download.php:41
@@ -47,14 +50,12 @@ msgstr ""
 msgid "Download BOINC + VirtualBox"
 msgstr ""
 
-#: download.php:54
-#: download.php:69
+#: download.php:54 download.php:69
 #, php-format
 msgid "for %s"
 msgstr ""
 
-#: download.php:57
-#: download.php:72
+#: download.php:57 download.php:72
 #, php-format
 msgid "BOINC version %s"
 msgstr ""
@@ -69,19 +70,30 @@ msgid "Download BOINC"
 msgstr "A BOINC letöltése"
 
 #: download.php:123
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others."
+msgid ""
+"BOINC is a program that lets you donate your idle computer time to science "
+"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, and many others."
 msgstr ""
 
 #: download.php:125
-msgid "After installing BOINC on your computer, you can connect it to as many of these projects as you like."
+msgid ""
+"After installing BOINC on your computer, you can connect it to as many of "
+"these projects as you like."
 msgstr ""
 
 #: download.php:127
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
-msgstr "Csak olyan számítógépeken futtassa ezt a szoftvert, ahol ön a tulajdonos, vagy rendelkezik a tulajdonos engedélyével."
+msgid ""
+"You may run this software on a computer only if you own the computer or have "
+"the permission of its owner."
+msgstr ""
+"Csak olyan számítógépeken futtassa ezt a szoftvert, ahol ön a tulajdonos, "
+"vagy rendelkezik a tulajdonos engedélyével."
 
 #: download.php:132
-msgid "We recommend that you download BOINC from the Google Play Store or Amazon Appstore, not from here."
+msgid ""
+"We recommend that you download BOINC from the Google Play Store or Amazon "
+"Appstore, not from here."
 msgstr ""
 
 #: download.php:167
@@ -92,8 +104,7 @@ msgstr "Rendszerigény"
 msgid "Release notes"
 msgstr "Verzióinformáció"
 
-#: download.php:169
-#: index.php:86
+#: download.php:169 index.php:86
 msgid "Help"
 msgstr "Segítség"
 
@@ -115,21 +126,50 @@ msgstr "BOINC: számítás a tudományért"
 
 #: help.php:12
 #, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
-msgstr "A BOINC Online Segítség lehetőséget biztosít olyan tapasztalt felhasználókkal való személyes beszélgetésre, akik %s megválaszolják a BOINC-kal és az önkéntes részvétellel kapcsolatos kérdéseit; %s végigvezetik a BOINC telepítésének és használatának folyamatán; %s segítenek a felmerülő problémák megoldásában."
+msgid ""
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who "
+"can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"through the process of installing and using BOINC; %s troubleshoot any "
+"problems you might have."
+msgstr ""
+"A BOINC Online Segítség lehetőséget biztosít olyan tapasztalt "
+"felhasználókkal való személyes beszélgetésre, akik %s megválaszolják a "
+"BOINC-kal és az önkéntes részvétellel kapcsolatos kérdéseit; %s végigvezetik "
+"a BOINC telepítésének és használatának folyamatán; %s segítenek a felmerülő "
+"problémák megoldásában."
 
 #: help.php:21
 #, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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 "A BOINC Online Segítség alapja a %sSkype%s, egy internetes telefonrendszer. A Skype ingyenes (a szoftver és a hívások is). Ha önnek még nincs meg a Skype, kérem %stöltse le és telepítse most%s. Ha ezzel végzett, térjen vissza erre az oldalra."
+msgid ""
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. "
+"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 ""
+"A BOINC Online Segítség alapja a %sSkype%s, egy internetes telefonrendszer. "
+"A Skype ingyenes (a szoftver és a hívások is). Ha önnek még nincs meg a "
+"Skype, kérem %stöltse le és telepítse most%s. Ha ezzel végzett, térjen "
+"vissza erre az oldalra."
 
 #: help.php:28
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
-msgstr "Szóban a legjobb segítséget kapni, de ehhez szüksége lesz egy beépített mikrofonra és hangszórókra, vagy egy külső headsetre a számítógépén. Használhatja a Skype szöveg alapú csevegő rendszerét is, vagy (ha önnek nincs Skype-ja) emailen keresztül is kommunikálhat az önkéntes segítőkkel."
+msgid ""
+"The best way to get help is by voice, for which you need either built-in "
+"microphone and speakers or an external headset for your computer.  You can "
+"also use Skype's text-based chat system or regular email (if you don't have "
+"Skype) to communicate with Help Volunteers."
+msgstr ""
+"Szóban a legjobb segítséget kapni, de ehhez szüksége lesz egy beépített "
+"mikrofonra és hangszórókra, vagy egy külső headsetre a számítógépén. "
+"Használhatja a Skype szöveg alapú csevegő rendszerét is, vagy (ha önnek "
+"nincs Skype-ja) emailen keresztül is kommunikálhat az önkéntes segítőkkel."
 
 #: help.php:31
-msgid "Volunteers speaking several languages are available. Please select a language:"
-msgstr "Önkénteseink számos különböző nyelven beszélnek. Kérem válasszon egy nyelvet:"
+msgid ""
+"Volunteers speaking several languages are available. Please select a "
+"language:"
+msgstr ""
+"Önkénteseink számos különböző nyelven beszélnek. Kérem válasszon egy "
+"nyelvet:"
 
 #: help.php:47
 msgid "Be a Help Volunteer"
@@ -137,21 +177,34 @@ msgstr "Legyen Ön is önkéntes segítő"
 
 #: help.php:50
 #, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
-msgstr "Ha ön egy tapasztalt BOINC felhasználó, bátran %sjelentkezzen önkéntes segítőnek%s. Ez egy nagyszerű lehetőség a tudományos kutatások és az önkéntes számítási rendszer ügyének elősegítésére - és szórakoztató is!"
+msgid ""
+"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+"Volunteer%s.  It's a great way to help the cause of scientific research and "
+"volunteer computing - and it's fun!"
+msgstr ""
+"Ha ön egy tapasztalt BOINC felhasználó, bátran %sjelentkezzen önkéntes "
+"segítőnek%s. Ez egy nagyszerű lehetőség a tudományos kutatások és az "
+"önkéntes számítási rendszer ügyének elősegítésére - és szórakoztató is!"
 
 #: help.php:56
 #, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
-msgstr "Ha ön már önkéntes segítő: a beállításai szerkesztéséhez %skattintson ide%s."
+msgid ""
+"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
+msgstr ""
+"Ha ön már önkéntes segítő: a beállításai szerkesztéséhez %skattintson ide%s."
 
 #: help_funcs.php:107
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
-msgstr "A BOINC segítők nem fizetett alkalmazottak. Tanácsaikért sem a BOINC, sem a Kaliforniai Egyetem nem vállal felelősséget."
+msgid ""
+"BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
+"or the University of California."
+msgstr ""
+"A BOINC segítők nem fizetett alkalmazottak. Tanácsaikért sem a BOINC, sem a "
+"Kaliforniai Egyetem nem vállal felelősséget."
 
 #: help_funcs.php:110
 msgid "%1Never%2 give email address or password information to BOINC helpers."
-msgstr "%1Soha%2 ne adja ki emailcímét vagy jelszó információit a BOINC segítőknek."
+msgstr ""
+"%1Soha%2 ne adja ki emailcímét vagy jelszó információit a BOINC segítőknek."
 
 #: index.php:24
 msgid "Computing power"
@@ -198,9 +251,7 @@ msgstr "Részvétel"
 msgid "Download"
 msgstr "Letöltés"
 
-#: index.php:87
-#: index.php:120
-#: index.php:171
+#: index.php:87 index.php:120 index.php:171
 msgid "Documentation"
 msgstr "Dokumentáció"
 
@@ -213,7 +264,10 @@ msgid "Links"
 msgstr "Linkek"
 
 #: index.php:94
-msgid "Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:"
+msgid ""
+"Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure "
+"diseases, study global warming, discover pulsars, and do many other types of "
+"scientific research.  It's safe, secure, and easy:"
 msgstr ""
 
 #: index.php:96
@@ -230,8 +284,12 @@ msgstr ""
 
 #: index.php:102
 #, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
-msgstr "Ha több projektben is részt vesz, próbáljon ki egy %sfiókkezelőt%s, mint például a %sGridRepublic%s vagy a %sBAM!%s."
+msgid ""
+"Or, if you run several projects, try an %saccount manager%s such as %"
+"sGridRepublic%s or %sBAM!%s. "
+msgstr ""
+"Ha több projektben is részt vesz, próbáljon ki egy %sfiókkezelőt%s, mint "
+"például a %sGridRepublic%s vagy a %sBAM!%s."
 
 #: index.php:118
 msgid "Compute with BOINC"
@@ -242,16 +300,27 @@ msgid "Software updates"
 msgstr "Szoftverfrissítések"
 
 #: index.php:128
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
-msgstr "%1Kutatók%2: Használjanak BOINC-ot egy olyan %3önkéntes számítási projekt%4 létrehozásához, amellyel több ezer processzor számítási teljesítményét használhatja fel."
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving "
+"you the computing power of thousands of CPUs."
+msgstr ""
+"%1Kutatók%2: Használjanak BOINC-ot egy olyan %3önkéntes számítási projekt%4 "
+"létrehozásához, amellyel több ezer processzor számítási teljesítményét "
+"használhatja fel."
 
 #: index.php:132
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
-msgstr "%1Egyetemek%2: Használjanak BOINC-ot egy %3Virtuális Campus Szuperszámítóközpont%4 létrehozásához."
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
+msgstr ""
+"%1Egyetemek%2: Használjanak BOINC-ot egy %3Virtuális Campus "
+"Szuperszámítóközpont%4 létrehozásához."
 
 #: index.php:137
 msgid "%1Companies%2: use BOINC for %3desktop Grid computing%4."
-msgstr "%1Vállalatok%2: Használjanak BOINC-ot %3asztali Grid számítások%4 létrehozásához."
+msgstr ""
+"%1Vállalatok%2: Használjanak BOINC-ot %3asztali Grid számítások%4 "
+"létrehozásához."
 
 #: index.php:149
 msgid "The BOINC project"
@@ -319,8 +388,11 @@ msgstr "API-k kiegészítő szoftverekhez"
 
 #: index.php:217
 #, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
-msgstr "Nyílt forráskódú szoftver %sönkéntes%s, illetve %sgriden végzett számításokhoz%s."
+msgid ""
+"Open-source software for %svolunteer computing%s and %sgrid computing%s."
+msgstr ""
+"Nyílt forráskódú szoftver %sönkéntes%s, illetve %sgriden végzett "
+"számításokhoz%s."
 
 #: index.php:230
 msgid "BOINC is based at The University of California, Berkeley"
@@ -341,7 +413,10 @@ msgid "Seismology"
 msgstr "Szeizmológia"
 
 #: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
+msgid ""
+"The Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to Internet-connected computers.  You must buy a "
+"sensor to participate."
 msgstr ""
 
 #: projects.inc:27
@@ -353,23 +428,24 @@ msgid "Environmental research"
 msgstr "Környezeti kutatás"
 
 #: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
+msgid ""
+"This project is creating a free and continuously updated map of radiation "
+"levels by using sensors connected to volunteers' computers.  You must buy a "
+"sensor to participate."
 msgstr ""
 
 #: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
+msgid ""
+"To participate in these projects you must buy a sensor and attach it to your "
+"computer."
 msgstr ""
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
 msgstr "Kognitív tudomány és mesterséges intelligencia"
 
-#: projects.inc:60
-#: projects.inc:364
-#: projects.inc:408
-#: projects.inc:457
-#: projects.inc:464
-#: projects.inc:511
+#: projects.inc:60 projects.inc:364 projects.inc:408 projects.inc:457
+#: projects.inc:464 projects.inc:511
 msgid "Private"
 msgstr "Magán"
 
@@ -378,8 +454,16 @@ msgid "Artificial intelligence"
 msgstr "mesterséges intelligencia"
 
 #: projects.inc:62
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
-msgstr "Szemantikus hálók feldolgozása és konvertálása a FreeHAL-hoz, egy mesterséges intelligenciához, amely szemantikus hálózatokat, szótő keresést, szófaj adatbázisokat, szövegkörnyezet vizsgálatot használ, hogy imitálja az emberi viselkedést a párbeszédekben."
+msgid ""
+"Parse and convert semantic nets for use in FreeHAL, an artificial "
+"intelligence that uses semantic networks, stemmers, part of speech "
+"databases, and part of speech taggers in order to imitate human behavior in "
+"conversations."
+msgstr ""
+"Szemantikus hálók feldolgozása és konvertálása a FreeHAL-hoz, egy "
+"mesterséges intelligenciához, amely szemantikus hálózatokat, szótő keresést, "
+"szófaj adatbázisokat, szövegkörnyezet vizsgálatot használ, hogy imitálja az "
+"emberi viselkedést a párbeszédekben."
 
 #: projects.inc:69
 msgid "Biology and Medicine"
@@ -394,7 +478,12 @@ msgid "Antimalarial drug discovery"
 msgstr ""
 
 #: projects.inc:84
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
+msgid ""
+"The parasite that causes malaria continues to evolve resistance to available "
+"medication. We therefore urgently need to discover new drugs to replace "
+"existing drugs. Importantly, these new drugs need to target NEW proteins in "
+"the parasite. The FightMalaria at Home project is aimed at finding these new "
+"targets."
 msgstr ""
 
 #: projects.inc:90
@@ -406,8 +495,20 @@ msgid "Protein structure prediction"
 msgstr "Fehérjestruktúra előrejelzés"
 
 #: projects.inc:92
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
-msgstr "A POEM at HOME egy olyan számítási megközelítést használ, aminek segítségével igyekszik előre jelezni adott összetételű fehérjék biológiailag aktív szerkezetét, megérteni a kölcsönhatásuk során lezajló jelfeldolgozási mechanizmusokat, megismerni a fehérjék helytelen működése vagy felhalmozódása miatt kialakuló betegségeket, illetve az élettani szempontból lényeges fehérjék háromdimenziós szerkezete alapján új gyógyszereket kifejleszteni."
+msgid ""
+"POEM at HOME uses a computational approach to predict the biologically active "
+"structure of proteins, to understand the signal-processing mechanisms when "
+"the proteins interact with one another, to understand diseases related to "
+"protein malfunction or aggregation, and to develop new drugs on the basis of "
+"the three-dimensions structure of biologically important proteins."
+msgstr ""
+"A POEM at HOME egy olyan számítási megközelítést használ, aminek segítségével "
+"igyekszik előre jelezni adott összetételű fehérjék biológiailag aktív "
+"szerkezetét, megérteni a kölcsönhatásuk során lezajló jelfeldolgozási "
+"mechanizmusokat, megismerni a fehérjék helytelen működése vagy "
+"felhalmozódása miatt kialakuló betegségeket, illetve az élettani szempontból "
+"lényeges fehérjék háromdimenziós szerkezete alapján új gyógyszereket "
+"kifejleszteni."
 
 #: projects.inc:98
 msgid "University of Delaware"
@@ -418,8 +519,16 @@ msgid "Study of protein - ligand interactions"
 msgstr "Fehérje - ligandum interakciók tanulmányozása"
 
 #: projects.inc:100
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
-msgstr "A Docking at Home egyszerre szolgál élettudományi és számítástechnikai célokat. A projekt a fehérje-ligandum kölcsönhatások atomi szinten történő, még jobb megismerését célozza meg, egyúttal újfajta gyógyszerkészítmények felfedezésének módjait is kutatja."
+msgid ""
+"Docking at Home has both bioscience and computer science goals. The project "
+"aims to further knowledge of the atomic details of protein-ligand "
+"interactions and, by doing so, will search for insights into the discovery "
+"of novel pharmaceuticals."
+msgstr ""
+"A Docking at Home egyszerre szolgál élettudományi és számítástechnikai célokat. "
+"A projekt a fehérje-ligandum kölcsönhatások atomi szinten történő, még jobb "
+"megismerését célozza meg, egyúttal újfajta gyógyszerkészítmények "
+"felfedezésének módjait is kutatja."
 
 #: projects.inc:114
 msgid "Barcelona Biomedical Research Park (PRBB)"
@@ -430,8 +539,17 @@ msgid "Molecular simulations of proteins"
 msgstr "Fehérjék molekuláris szimulációja"
 
 #: projects.inc:116
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
-msgstr "A GPUGrid.net új számítási utakat nyit az első, speciálisan NVIDIA GPU-ra optimalizált, teljes-atomos molekuladinamikai kódja (CellMD) révén. Segítségével új orvosbiológiai alkalmazások gyorsabban válnak megvalósíthatóvá, ezzel új szerepet adva a biológiai számítástudománynak az orvosbiológiai kutatások területén."
+msgid ""
+"GPUGrid.net opens novel computational scenarios by the first full-atom "
+"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
+"New biomedical applications suddenly become possible giving a new role to "
+"computational biology for biomedical research."
+msgstr ""
+"A GPUGrid.net új számítási utakat nyit az első, speciálisan NVIDIA GPU-ra "
+"optimalizált, teljes-atomos molekuladinamikai kódja (CellMD) révén. "
+"Segítségével új orvosbiológiai alkalmazások gyorsabban válnak "
+"megvalósíthatóvá, ezzel új szerepet adva a biológiai számítástudománynak az "
+"orvosbiológiai kutatások területén."
 
 #: projects.inc:122
 msgid "Technion, Israel"
@@ -442,11 +560,18 @@ msgid "Genetic linkage analysis"
 msgstr "Genetikai okok felderítése"
 
 #: projects.inc:124
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
-msgstr "A Superlink at Technion segít a világ genetikusainak, hogy megtalálják azokat a betegségeket keltő géneket, amelyek sok más mellett a cukorbetegség, a magas vérnyomás, a rák és a skizofrénia egyes típusainak okozói."
+msgid ""
+"Superlink at Technion helps geneticists all over the world find disease-"
+"provoking genes causing some types of diabetes, hypertension (high blood "
+"pressure), cancer, schizophrenia and many others."
+msgstr ""
+"A Superlink at Technion segít a világ genetikusainak, hogy megtalálják azokat a "
+"betegségeket keltő géneket, amelyek sok más mellett a cukorbetegség, a "
+"magas vérnyomás, a rák és a skizofrénia egyes típusainak okozói."
 
 #: projects.inc:138
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
+msgid ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
 msgstr "Maryland Egyetem Bioinformatikai és Biomodellezési Központ"
 
 #: projects.inc:139
@@ -454,8 +579,16 @@ msgid "Life science research"
 msgstr "Élettudományok kutatása"
 
 #: projects.inc:140
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
-msgstr "A Lattice Projekt számítási teljesítményt biztosít a Maryland egyetem kutatóinak, evolúciós kapcsolatok DNS szekvencia adatokon, baktérium, plazmid, és vírus protein szekvenciákon, valamint természetvédelmi területek biodiverzitásán alapuló tanulmányozásához."
+msgid ""
+"The Lattice Project supplies computing power to scientists at the University "
+"of Maryland studying evolutionary relationships based on DNA sequence data; "
+"bacterial, plasmid, and virus protein sequences; and biological diversity in "
+"nature reserves. "
+msgstr ""
+"A Lattice Projekt számítási teljesítményt biztosít a Maryland egyetem "
+"kutatóinak, evolúciós kapcsolatok DNS szekvencia adatokon, baktérium, "
+"plazmid, és vírus protein szekvenciákon, valamint természetvédelmi területek "
+"biodiverzitásán alapuló tanulmányozásához."
 
 #: projects.inc:146
 msgid "The Swiss Tropical Institute"
@@ -466,29 +599,61 @@ msgid "Epidemiology"
 msgstr "Járványtan"
 
 #: projects.inc:148
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
-msgstr "A malária egészségre való hatásának, illetve terjedési dinamizmusának szimulációs modellezése a malária megfékezésének fontos eszköze. Ezek felhasználhatók a szúnyoghálók szállítási stratégiájának, a kemoterápia vagy az új, még fejlesztés és tesztelés alatt álló védőoltások megfelelő megtervezéséhez. Ez a modellezés azonban rendkívül számításigényes, hiszen nagy emberpopulációkat kell szimulálnia, méghozzá a fertőzés terjedését befolyásoló számos élettani és társadalmi tényező fü [...]
+msgid ""
+"Simulation models of the transmission dynamics and health effects of malaria "
+"are an important tool for malaria control. They can be used to determine "
+"optimal strategies for delivering mosquito nets, chemotherapy, or new "
+"vaccines which are currently under development and testing.  Such modeling "
+"is extremely computer intensive, requiring simulations of large human "
+"populations with a diverse set of parameters related to biological and "
+"social factors that influence the distribution of the disease. "
+msgstr ""
+"A malária egészségre való hatásának, illetve terjedési dinamizmusának "
+"szimulációs modellezése a malária megfékezésének fontos eszköze. Ezek "
+"felhasználhatók a szúnyoghálók szállítási stratégiájának, a kemoterápia vagy "
+"az új, még fejlesztés és tesztelés alatt álló védőoltások megfelelő "
+"megtervezéséhez. Ez a modellezés azonban rendkívül számításigényes, hiszen "
+"nagy emberpopulációkat kell szimulálnia, méghozzá a fertőzés terjedését "
+"befolyásoló számos élettani és társadalmi tényező függvényében."
 
 #: projects.inc:170
 msgid "University of Washington"
 msgstr "Washingtoni Egyetem"
 
-#: projects.inc:171
-#: projects.inc:179
+#: projects.inc:171 projects.inc:179
 msgid "Biology"
 msgstr "Biológia"
 
 #: projects.inc:172
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
-msgstr "Kutatásunk célja a fehérjék háromdimenziós alakjának meghatározása, amely végül egyes jelentős emberi betegségek gyógyszereinek felfedezéséhez vezethet. A Rosetta at home futtatásával segíthet kutatásunk olyan mértékű felgyorsításában és kiterjesztésében, amire az Önök segítsége nélkül bizonyosan képtelenek volnánk. Egyúttal olyan fehérjék megtervezését célzó kutatásunkat is segítheti, amelyek például a HIV, a malária, a rák vagy az Alzheimer-kór leküzdéséhez járulhatnak hozzá."
+msgid ""
+"Determine the 3-dimensional shapes of proteins in research that may "
+"ultimately lead to finding cures for some major human diseases. By running "
+"Rosetta at home you will help us speed up and extend our research in ways we "
+"couldn't possibly attempt without your help. You will also be helping our "
+"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
+"Cancer, and Alzheimer's"
+msgstr ""
+"Kutatásunk célja a fehérjék háromdimenziós alakjának meghatározása, amely "
+"végül egyes jelentős emberi betegségek gyógyszereinek felfedezéséhez "
+"vezethet. A Rosetta at home futtatásával segíthet kutatásunk olyan mértékű "
+"felgyorsításában és kiterjesztésében, amire az Önök segítsége nélkül "
+"bizonyosan képtelenek volnánk. Egyúttal olyan fehérjék megtervezését célzó "
+"kutatásunkat is segítheti, amelyek például a HIV, a malária, a rák vagy az "
+"Alzheimer-kór leküzdéséhez járulhatnak hozzá."
 
 #: projects.inc:178
 msgid "University of Vienna"
 msgstr "Bécsi Egyetem"
 
 #: projects.inc:180
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
-msgstr "Fehérjék közötti hasonlóságokat számol. A SIMAP a kiszámolt adatokból egy nyilvános adatbázist hoz létre, amely jelentős szerepet játszik több bioinformatikai kutatási projektben."
+msgid ""
+"Calculate similarities between proteins. SIMAP provides a public database of "
+"the resulting data, which plays a key role in many bioinformatics research "
+"projects."
+msgstr ""
+"Fehérjék közötti hasonlóságokat számol. A SIMAP a kiszámolt adatokból egy "
+"nyilvános adatbázist hoz létre, amely jelentős szerepet játszik több "
+"bioinformatikai kutatási projektben."
 
 #: projects.inc:186
 msgid "Earth Sciences"
@@ -503,8 +668,25 @@ msgid "Climate study"
 msgstr "Klíma tanulmány"
 
 #: projects.inc:200
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
-msgstr "A projekt olyan közelítéseket vizsgál, melyek megfelelnek a legújabb klímamodellekkel szemben támasztott elvárásoknak. Egy modellt több ezer alkalommal lefuttatva reményeink szerint megláthatjuk, miként válaszol, ha kis módosításokat végzünk e közelítésekben – elég kicsiket ahhoz, hogy a közelítések még realisztikusak maradjanak. Mindez lehetővé teszi számunkra annak megértését, hogy mennyire érzékenyek ezek a modellek kis változtatásokra, például a szén-dioxid- vagy a kénciklusb [...]
+msgid ""
+"Investigate the approximations that have to be made in state-of-the-art "
+"climate models. By running the model thousands of times we hope to find out "
+"how the model responds to slight tweaks to these approximations - slight "
+"enough to not make the approximations any less realistic. This will allow us "
+"to improve our understanding of how sensitive our models are to small "
+"changes and also to things like changes in carbon dioxide and the sulphur "
+"cycle. This will allow us to explore how climate may change in the next "
+"century under a wide range of different scenarios."
+msgstr ""
+"A projekt olyan közelítéseket vizsgál, melyek megfelelnek a legújabb "
+"klímamodellekkel szemben támasztott elvárásoknak. Egy modellt több ezer "
+"alkalommal lefuttatva reményeink szerint megláthatjuk, miként válaszol, ha "
+"kis módosításokat végzünk e közelítésekben – elég kicsiket ahhoz, hogy a "
+"közelítések még realisztikusak maradjanak. Mindez lehetővé teszi számunkra "
+"annak megértését, hogy mennyire érzékenyek ezek a modellek kis "
+"változtatásokra, például a szén-dioxid- vagy a kénciklusban. Így "
+"ráláthatunk, miként változhat az éghajlat az elkövetkező évszázadban, "
+"számolva nagyszámú különböző forgatókönyvvel."
 
 #: projects.inc:207
 msgid "Physical Science"
@@ -515,31 +697,54 @@ msgid "Mechanical engineering"
 msgstr ""
 
 #: projects.inc:214
-msgid "Currently we are calculating the optimum design of a structure call the 52 bar truss"
+msgid ""
+"Currently we are calculating the optimum design of a structure call the 52 "
+"bar truss"
 msgstr ""
 
-#: projects.inc:224
-#: projects.inc:263
-#: projects.inc:271
+#: projects.inc:224 projects.inc:263 projects.inc:271
 msgid "Astronomy"
 msgstr "Csillagászat"
 
 #: projects.inc:225
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
+msgid ""
+"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
+"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
+"Universe. We will measure physical parameters (such as stellar mass surface "
+"density, star formation rate surface density, attenuation, and first-order "
+"star formation history) on a resolved pixel-by-pixel basis using spectral "
+"energy distribution (SED) fitting techniques in a distributed computing mode."
 msgstr ""
 
 #: projects.inc:247
 msgid "University of Texas at Austin"
 msgstr "Texasi Egyetem, Austin"
 
-#: projects.inc:248
-#: projects.inc:279
+#: projects.inc:248 projects.inc:279
 msgid "Chemistry"
 msgstr "Kémia"
 
 #: projects.inc:249
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
-msgstr "Az elméleti kémia, a kondenzált anyagfizika és az anyagtudomány egy általános problémája azon atomi méretű rendszerek időfejlődésének kiszámítása, amelyekben például kémiai reakciók és/vagy diffúzió történik. Általános esetben ezek az események nagyon ritkák (több nagyságrenddel lassabbak, mint az atomok rezgések miatt bekövetkező mozgása), ezért a közvetlen szimuláció - azaz az atomok mozgásának pontos követése - évezredekig kellene, hogy fusson a jelenlegi leggyorsabb számítógé [...]
+msgid ""
+"A common problem in theoretical chemistry, condensed matter physics and "
+"materials science is the calculation of the time evolution of an atomic "
+"scale system where, for example, chemical reactions and/or diffusion occur. "
+"Generally the events of interest are quite rare (many orders of magnitude "
+"slower than the vibrational movements of the atoms), and therefore direct "
+"simulations, tracking every movement of the atoms, would take thousands of "
+"years of computer calculations on the fastest present day computer before a "
+"single event of interest can be expected to occur.  Our research group is "
+"interested in calculating the long time dynamics of systems."
+msgstr ""
+"Az elméleti kémia, a kondenzált anyagfizika és az anyagtudomány egy "
+"általános problémája azon atomi méretű rendszerek időfejlődésének "
+"kiszámítása, amelyekben például kémiai reakciók és/vagy diffúzió történik. "
+"Általános esetben ezek az események nagyon ritkák (több nagyságrenddel "
+"lassabbak, mint az atomok rezgések miatt bekövetkező mozgása), ezért a "
+"közvetlen szimuláció - azaz az atomok mozgásának pontos követése - "
+"évezredekig kellene, hogy fusson a jelenlegi leggyorsabb számítógépeken, "
+"mire várhatóan egyetlen érdekes esemény bekövetkezne. Kutatócsoportunk a "
+"rendszerek hosszútávú dinamikájának vizsgálatát tűzte ki célul."
 
 # 95%
 #: projects.inc:262
@@ -547,24 +752,50 @@ msgid "University of Illinois at Urbana-Champaign"
 msgstr "Illinois-i Egyetem, Urbana-Champaign"
 
 #: projects.inc:264
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
-msgstr "A Cosmology at Home célja egy olyan modell keresése, amely a lehető legjobb leírást adja az Univerzumunkról, valamint megtalálni a modellek azon halmazát, amelyek összhangban vannak a csillagászati részecskefizika elérhető adataival."
+msgid ""
+"The goal of Cosmology at Home is to search for the model that best describes "
+"our Universe and to find the range of models that agree with the available "
+"astronomical particle physics data."
+msgstr ""
+"A Cosmology at Home célja egy olyan modell keresése, amely a lehető legjobb "
+"leírást adja az Univerzumunkról, valamint megtalálni a modellek azon "
+"halmazát, amelyek összhangban vannak a csillagászati részecskefizika "
+"elérhető adataival."
 
 #: projects.inc:270
 msgid "Rensselaer Polytechnic Institute"
 msgstr "Rensselaer-i Műszaki Egyetem"
 
 #: projects.inc:272
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
-msgstr "A Milkyway at Home célja a Tejútrendszer egy igen pontos, háromdimenziós modelljének elkészítése a Sloan Digitális Égboltfelmérési Program által begyűjtött adatok felhasználásával."
+msgid ""
+"The goal of Milkyway at Home is to create a highly accurate three dimensional "
+"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
+"Survey."
+msgstr ""
+"A Milkyway at Home célja a Tejútrendszer egy igen pontos, háromdimenziós "
+"modelljének elkészítése a Sloan Digitális Égboltfelmérési Program által "
+"begyűjtött adatok felhasználásával."
 
 #: projects.inc:278
 msgid "Leiden University, The Netherlands"
 msgstr "Leiden-i Egyetem, Hollandia"
 
 #: projects.inc:280
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
-msgstr "Klasszikus dinamikát használó felszíni számítások. A Leiden Classical használatával önkéntesek, hallgatók, diákok és más kutatók küldhetik fel személyes számolásaikat a gridre. Minden felhasználónak saját várakozási sora van a klasszikus dinamikai feladatokhoz. Ilyen módon használták már hallgatók a gridet folyékony argon szimulációjához, vagy az ideális gáztörvény érvényességének ellenőrzésére a griden végzett szimuláció segítségével."
+msgid ""
+"Surface science calculations using Classical Dynamics.  Leiden Classical "
+"allows volunteers, students and other scientist to submit their personal "
+"calculations to the grid. Each user has his own personal queue for Classical "
+"Dynamics jobs. In this way students have used the grid to simulate liquid "
+"argon, or to test the validity of the ideal gas law by actually doing the "
+"simulations through the grid."
+msgstr ""
+"Klasszikus dinamikát használó felszíni számítások. A Leiden Classical "
+"használatával önkéntesek, hallgatók, diákok és más kutatók küldhetik fel "
+"személyes számolásaikat a gridre. Minden felhasználónak saját várakozási "
+"sora van a klasszikus dinamikai feladatokhoz. Ilyen módon használták már "
+"hallgatók a gridet folyékony argon szimulációjához, vagy az ideális "
+"gáztörvény érvényességének ellenőrzésére a griden végzett szimuláció "
+"segítségével."
 
 #: projects.inc:294
 msgid "Univ. of Wisconsin - Milwaukee, Max Planck Institute"
@@ -575,25 +806,47 @@ msgid "Astrophysics"
 msgstr "Asztrofizika"
 
 #: projects.inc:296
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
-msgstr "A projekt célja forgó neutroncsillagok (más néven pulzárok) keresése a LIGO és GEO gravitációshullám-detektorok, illetve az Arecibo rádióobszervatórium adatainak felhasználásával.  Az Einstein at Home egy a \"Fizika Nemzetközi Éve 2005\" projekt alprojektjei közül, melyet az Amerikai Fizikai Társaság (American Physical Society - APS) és számos nemzetközi szervezet is támogat."
+msgid ""
+"Search for spinning neutron stars (also called pulsars) using data from the "
+"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
+"observatory.  Einstein at Home is a World Year of Physics 2005 project "
+"supported by the American Physical Society (APS) and by a number of "
+"international organizations."
+msgstr ""
+"A projekt célja forgó neutroncsillagok (más néven pulzárok) keresése a LIGO "
+"és GEO gravitációshullám-detektorok, illetve az Arecibo rádióobszervatórium "
+"adatainak felhasználásával.  Az Einstein at Home egy a \"Fizika Nemzetközi Éve "
+"2005\" projekt alprojektjei közül, melyet az Amerikai Fizikai Társaság "
+"(American Physical Society - APS) és számos nemzetközi szervezet is támogat."
 
-#: projects.inc:310
-#: projects.inc:318
+#: projects.inc:310 projects.inc:318
 msgid "CERN (European Organization for Nuclear Research)"
 msgstr "CERN (Nukleáris Kutatások Európai Szervezete)"
 
-#: projects.inc:311
-#: projects.inc:319
+#: projects.inc:311 projects.inc:319
 msgid "Physics"
 msgstr "Fizika"
 
 #: projects.inc:312
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
-msgstr "A Nagy Hadronütköztető (Large Hadron Collider - LHC) egy részecskegyorsító a CERNnél, azaz a Nukleáris Kutatások Európai Szervezeténél, mely a világ legnagyobb részecskefizikai laboratóriuma. Ez a valaha épített legnagyobb teljesítményű eszköz, melyet a részecskék tulajdonságainak vizsgálata céljából hoztak létre. Az LHC at home az LHC, és detektorainak tervezését elősegítő szimulációkat futtat."
+msgid ""
+"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
+"European Organization for Nuclear Research, the world's largest particle "
+"physics laboratory.  It is the most powerful instrument ever built to "
+"investigate on particles proprieties. LHC at home runs simulations to improve "
+"the design of LHC and its detectors."
+msgstr ""
+"A Nagy Hadronütköztető (Large Hadron Collider - LHC) egy részecskegyorsító a "
+"CERNnél, azaz a Nukleáris Kutatások Európai Szervezeténél, mely a világ "
+"legnagyobb részecskefizikai laboratóriuma. Ez a valaha épített legnagyobb "
+"teljesítményű eszköz, melyet a részecskék tulajdonságainak vizsgálata "
+"céljából hoztak létre. Az LHC at home az LHC, és detektorainak tervezését "
+"elősegítő szimulációkat futtat."
 
 #: projects.inc:320
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
+msgid ""
+"This project uses CERN-developed virtual machine technology for full-fledged "
+"LHC event physics simulation on volunteer computers.  Requires that you "
+"install VirtualBox on your computer"
 msgstr ""
 
 #: projects.inc:326
@@ -605,8 +858,18 @@ msgid "Astrophysics, astrobiology"
 msgstr "Asztrofizika, asztrobiológia"
 
 #: projects.inc:328
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
-msgstr "A SETI (Földönkívüli Intelligencia Keresése) egy olyan tudományos terület, mely Földön kívüli értelmes életet keres. Ennek egyik módja a rádió-SETI, melynél rádióteleszkópokkal figyelik az űrből érkező keskeny sávszélességű rádiójeleket. Az ilyen jelek jellemzően nem keletkeznek természetes úton, tehát észlelésük bizonyítéka lehetne földönkívüli technológia létezésének."
+msgid ""
+"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
+"goal is to detect intelligent life outside Earth. One approach, known as "
+"radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
+"signals from space. Such signals are not known to occur naturally, so a "
+"detection would provide evidence of extraterrestrial technology."
+msgstr ""
+"A SETI (Földönkívüli Intelligencia Keresése) egy olyan tudományos terület, "
+"mely Földön kívüli értelmes életet keres. Ennek egyik módja a rádió-SETI, "
+"melynél rádióteleszkópokkal figyelik az űrből érkező keskeny sávszélességű "
+"rádiójeleket. Az ilyen jelek jellemzően nem keletkeznek természetes úton, "
+"tehát észlelésük bizonyítéka lehetne földönkívüli technológia létezésének."
 
 #: projects.inc:342
 msgid "Bielefeld University of Applied Sciences"
@@ -617,8 +880,16 @@ msgid "Chemical engineering and nanotechnology"
 msgstr "Kémiai tervezés és nanotechnológia"
 
 #: projects.inc:344
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
-msgstr "A molekuláris mágnesek és az irányított nanoméretű mágnesesség tanulmányozása.  Ezek a mágneses molekulák segíthetnének apró mágneses kapcsolók kifejlesztésében, melyek a gyógyászatban (például helyi tumorkemoterápiában) és a biotechnológiában lennének alkalmazhatók."
+msgid ""
+"The study of molecular magnets and controlled nanoscale magnetism.  These "
+"magnetic molecules may be used to develop tiny magnetic switches, with "
+"applications in medicine (such as local tumor chemotherapy) and "
+"biotechnology."
+msgstr ""
+"A molekuláris mágnesek és az irányított nanoméretű mágnesesség "
+"tanulmányozása.  Ezek a mágneses molekulák segíthetnének apró mágneses "
+"kapcsolók kifejlesztésében, melyek a gyógyászatban (például helyi "
+"tumorkemoterápiában) és a biotechnológiában lennének alkalmazhatók."
 
 #: projects.inc:351
 msgid "Multiple applications"
@@ -633,29 +904,48 @@ msgid "Physics, biochemistry, and others"
 msgstr "Fizika, biokémia és egyebek"
 
 #: projects.inc:358
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
-msgstr "A CAS at home célja, hogy ösztönözze és segítse Kína tudósait, hogy kutatásukhoz befogadják az önkéntesi gondolkodás és számítás technológiáját."
+msgid ""
+"The objective of CAS at home is to encourage and assist scientists in China to "
+"adopt the technologies of volunteer computing and volunteer thinking for "
+"their research."
+msgstr ""
+"A CAS at home célja, hogy ösztönözze és segítse Kína tudósait, hogy "
+"kutatásukhoz befogadják az önkéntesi gondolkodás és számítás technológiáját."
 
 #: projects.inc:365
 msgid "Mathematics, physics, evolution"
 msgstr "Matematika, fizika, evolúció"
 
 #: projects.inc:366
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
-msgstr "A Yoyo at home egy illesztő alkalmazás a BOINC és különböző, már létező önkéntes számítási projektek között. Ilyenek az: ECM, Muon, Evolution at home és a distributed.net"
+msgid ""
+"Yoyo at home is an adapter between BOINC and several existing volunteer "
+"computing projects: ECM, Muon, Evolution at home, and distributed.net"
+msgstr ""
+"A Yoyo at home egy illesztő alkalmazás a BOINC és különböző, már létező "
+"önkéntes számítási projektek között. Ilyenek az: ECM, Muon, Evolution at home "
+"és a distributed.net"
 
-#: projects.inc:371
-#: projects.inc:527
+#: projects.inc:371 projects.inc:527
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
-msgstr "MTA-SZTAKI Párhuzamos és Elosztott Rendszerek Laboratóriuma (Magyarország)"
+msgstr ""
+"MTA-SZTAKI Párhuzamos és Elosztott Rendszerek Laboratóriuma (Magyarország)"
 
 #: projects.inc:372
 msgid "European research projects"
 msgstr "Európai kutatási projektek"
 
 #: projects.inc:373
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
-msgstr "Az EDGeS at Home Beta projekt az önkéntes számítást az európai szolgáltatási grid hálózatba integrálja, ezáltal lehetővé téve a szolgáltatási gridek számára munkacsomagok küldését az e projektben résztvevő önkénteseknek. A projekt által lefedett tudományos projektek matematikai, fizikai, biológiai stb. témájúak."
+msgid ""
+"The EDGeS at Home Beta project integrates volunteer computing into the service "
+"grid network of Europe by allowing service grids to send workunits to be "
+"processed by the volunteers of this project. The scientific projects covered "
+"by the project include math, physics, biology, etc."
+msgstr ""
+"Az EDGeS at Home Beta projekt az önkéntes számítást az európai szolgáltatási "
+"grid hálózatba integrálja, ezáltal lehetővé téve a szolgáltatási gridek "
+"számára munkacsomagok küldését az e projektben résztvevő önkénteseknek. A "
+"projekt által lefedett tudományos projektek matematikai, fizikai, biológiai "
+"stb. témájúak."
 
 #: projects.inc:379
 msgid "Spanish universities and research centers"
@@ -678,7 +968,11 @@ msgid "Medical, environmental and other humanitarian research"
 msgstr ""
 
 #: projects.inc:389
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
+msgid ""
+"To further critical non-profit research on some of humanity's most pressing "
+"problems by creating the world's largest volunteer computing grid.  Research "
+"includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"clean water and many more."
 msgstr ""
 
 #: projects.inc:395
@@ -697,27 +991,28 @@ msgstr ""
 msgid "Simulation of quantum computing; Goldbach's conjecture."
 msgstr ""
 
-#: projects.inc:450
-#: projects.inc:458
+#: projects.inc:450 projects.inc:458
 msgid "Cryptography"
 msgstr "Kriptográfia"
 
 #: projects.inc:459
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
-msgstr "Megpróbálunk dekódolni 3 eredeti Enigma üzenetet. A feltörhetetlennek hitt jeleket az Észak-Atlanti térségben fogták 1942-ben."
-
-#: projects.inc:465
-#: projects.inc:504
-#: projects.inc:512
-#: projects.inc:520
-#: projects.inc:528
-#: projects.inc:568
+msgid ""
+"Attempt to decode 3 original Enigma messages. The signals were intercepted "
+"in the North Atlantic in 1942 and are believed to be unbroken."
+msgstr ""
+"Megpróbálunk dekódolni 3 eredeti Enigma üzenetet. A feltörhetetlennek hitt "
+"jeleket az Észak-Atlanti térségben fogták 1942-ben."
+
+#: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
+#: projects.inc:528 projects.inc:568
 msgid "Mathematics"
 msgstr "Matematika"
 
 #: projects.inc:466
 msgid "Study the Collatz Conjecture, an unsolved conjecture in mathematics"
-msgstr "Egy a matematikában még megoldatlan, az úgynevezett Collatz-sejtést tanulmányozzuk"
+msgstr ""
+"Egy a matematikában még megoldatlan, az úgynevezett Collatz-sejtést "
+"tanulmányozzuk"
 
 #: projects.inc:471
 msgid "California State University Fullerton"
@@ -728,11 +1023,25 @@ msgid "Factorization of large integers"
 msgstr "Nagy egész számok faktorizációja"
 
 #: projects.inc:473
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
-msgstr "Az NFS at Home olyan kutatási projekt, mely interneteléréssel rendelkező számítógépeket használ nagy egész számok rácson történő szitálásához. Általános iskolásként Ön is megszerezte első tapasztalatait egy egész szám prímtényezőkre való bontásával kapcsolatban, mint például hogy 15 = 3 * 5, vagy hogy 35 = 5 * 7. Az NFS at Home ezen tapasztalatok kiterjesztése, csak éppen több száz számjegy hosszúságú egész számokra."
+msgid ""
+"NFS at Home is a research project that uses Internet-connected computers to do "
+"the lattice sieving step in the Number Field Sieve factorization of large "
+"integers. As a young school student, you gained your first experience at "
+"breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
+"NFS at Home is a continuation of that experience, only with integers that are "
+"hundreds of digits long."
+msgstr ""
+"Az NFS at Home olyan kutatási projekt, mely interneteléréssel rendelkező "
+"számítógépeket használ nagy egész számok rácson történő szitálásához. "
+"Általános iskolásként Ön is megszerezte első tapasztalatait egy egész szám "
+"prímtényezőkre való bontásával kapcsolatban, mint például hogy 15 = 3 * 5, "
+"vagy hogy 35 = 5 * 7. Az NFS at Home ezen tapasztalatok kiterjesztése, csak "
+"éppen több száz számjegy hosszúságú egész számokra."
 
 #: projects.inc:479
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
+msgid ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
 msgstr "Vilnius Gediminas Műszaki Egyetem és Kaunas Műszaki Egyetem (Litvánia)"
 
 #: projects.inc:480
@@ -740,19 +1049,43 @@ msgid "Software testing"
 msgstr "Szoftvertesztelés"
 
 #: projects.inc:481
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
-msgstr "Jelen projekt célja egy szélesen elosztott számítógépes platform létrehozása a Vilnius Gediminas Műszaki Egyetem (VGME) illetve más litvániai akadémiai intézmények kutatóinak számára. Jelen alkalmazások Monte-Carlo alapú szoftvertesztelési kutatások részei."
+msgid ""
+"The aim of this project is to provide a powerful distributed computing "
+"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
+"well as others Lithuanian academic institutions.  Current applications "
+"involve the study of Monte-Carlo based software testing."
+msgstr ""
+"Jelen projekt célja egy szélesen elosztott számítógépes platform létrehozása "
+"a Vilnius Gediminas Műszaki Egyetem (VGME) illetve más litvániai akadémiai "
+"intézmények kutatóinak számára. Jelen alkalmazások Monte-Carlo alapú "
+"szoftvertesztelési kutatások részei."
 
 #: projects.inc:503
 msgid "Mathematical Institute of Leiden University / Kennislink"
 msgstr "A Leideni Egyetem Matematikai Intézete / Kennislink"
 
 #: projects.inc:505
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
-msgstr "'ABC-hármasok' keresése: a, b és c olyan pozitív egész számok, melyekre igaz, hogy a+b=c, a < b < nincs közös osztójuk és c > rad(abc), ahol rad(n) az n különböző egész szorzóinak eredménye. Az ABC-feltevés szerint véges számban találhatóak olyan a, b, és c számok, melyekre igaz, hogy log(c)/log(rad(abc)) > h, ahol h 1-nél nagyobb valós szám. Az ABC-feltevés napjainkban a matematika egyik legnagyobb nyitott problémája. Ha igaznak bizonyul, rengeteg egyéb nyitott problémára  [...]
+msgid ""
+"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
+"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
+"product of the distinct prime factors of n. The ABC conjecture says that "
+"there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for "
+"any real h > 1. The ABC conjecture is currently one of the greatest open "
+"problems in mathematics. If it is proven to be true, a lot of other open "
+"problems can be answered directly from it."
+msgstr ""
+"'ABC-hármasok' keresése: a, b és c olyan pozitív egész számok, melyekre "
+"igaz, hogy a+b=c, a < b < nincs közös osztójuk és c > rad(abc), ahol "
+"rad(n) az n különböző egész szorzóinak eredménye. Az ABC-feltevés szerint "
+"véges számban találhatóak olyan a, b, és c számok, melyekre igaz, hogy "
+"log(c)/log(rad(abc)) > h, ahol h 1-nél nagyobb valós szám. Az ABC-feltevés "
+"napjainkban a matematika egyik legnagyobb nyitott problémája. Ha igaznak "
+"bizonyul, rengeteg egyéb nyitott problémára fog majd választ adni."
 
 #: projects.inc:513
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
+msgid ""
+"Primegrid has multiple projects searching for different forms of very large "
+"prime numbers, including searching for the largest known prime number."
 msgstr ""
 
 #: projects.inc:519
@@ -760,12 +1093,20 @@ msgid "Hochschule RheinMain University of Applied Sciences"
 msgstr "RheinMaini Alkalmazott Tudományok Egyeteme"
 
 #: projects.inc:521
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
-msgstr "Prímszámok azonosításához kapcsolódó két sejtéshez tartozó ellenpéldák keresése"
+msgid ""
+"Search for counterexamples to two conjectures related to the identification "
+"of prime numbers"
+msgstr ""
+"Prímszámok azonosításához kapcsolódó két sejtéshez tartozó ellenpéldák "
+"keresése"
 
 #: projects.inc:529
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
-msgstr "Találja meg az összes általánosított kettes számrendszert (melyekben a bázisok mátrixok, a számjegyek pedig vektorok) egészen a 11. dimenzióig."
+msgid ""
+"Find all the generalized binary number systems (in which bases are matrices "
+"and digits are vectors) up to dimension 11."
+msgstr ""
+"Találja meg az összes általánosított kettes számrendszert (melyekben a "
+"bázisok mátrixok, a számjegyek pedig vektorok) egészen a 11. dimenzióig."
 
 #: ../html/inc/news.inc:40
 msgid "Comment"
@@ -779,9 +1120,11 @@ msgstr ""
 # 75%
 #~ msgid "Astronomy, Physics, and Chemistry"
 #~ msgstr "Csillagászat, fizika és kémia"
+
 #, php-format
 #~ msgid "%s for %s (%s MB)"
 #~ msgstr "%s %s verzió (%s MB)"
+
 #~ msgid ""
 #~ "BOINC is a program that lets you donate your idle computer time to science "
 #~ "projects like SETI at home, Climateprediction.net, Rosetta at home, World "
@@ -793,6 +1136,7 @@ msgstr ""
 #~ "Climateprediction.net, Rosetta at home, World Community Grid, és sokan mások. "
 #~ "<p> Számítógépre telepítés után a BOINC tetszőleges számú projekthez "
 #~ "csalakoztatható."
+
 #~ msgid "Browser default"
 #~ msgstr "Böngésző alapértelmezés"
 
@@ -810,12 +1154,15 @@ msgstr ""
 #~ "részt. Mindezt egyszerűen és biztonságosan: %sVálasszon%s projekteket %"
 #~ "sTöltse le%s és futtassa a BOINC szoftvert %sAdjon meg%s egy email címet és "
 #~ "jelszót."
+
 #~ msgid "IBM Corporate Community Relations"
 #~ msgstr "IBM Vállalati Közösségi Kapcsolatok"
+
 #~ msgid "Humanitarian research on disease, natural disasters and hunger."
 #~ msgstr ""
 #~ "Humanitárius kutatás a betegségek, természeti katasztrófák és éhség "
 #~ "leküzdésére."
+
 #~ msgid ""
 #~ "To further critical non-profit research on some of humanity's most "
 #~ "pressing problems by creating the world's largest volunteer computing "
@@ -826,6 +1173,7 @@ msgstr ""
 #~ "elősegítésére létrehoztuk a világ legnagyobb önkéntes számítási gridjét. "
 #~ "Sok más mellett foglalkozunk a HIV/AIDS, a rák, az izomdisztrófia és a "
 #~ "trópusi náthaláz kutatásával."
+
 #~ msgid ""
 #~ "Primegrid is generating a public sequential prime number database, and is "
 #~ "searching for large twin primes of the form k*2<sup>n</sup>+1 and "
@@ -834,64 +1182,92 @@ msgstr ""
 #~ "A Primegrid projekt nyilvános, növekvő prímszám-adatbázist épít és "
 #~ "k*2<sup>n</sup>+1 and k*2<sup>n</sup>-1 formátumú, nagy ikerprímek után "
 #~ "kutat."
+
 #~ msgid "FreeHAL"
 #~ msgstr "FreeHAL"
+
 #~ msgid "private"
 #~ msgstr "magán"
+
 #~ msgid "POEM at HOME"
 #~ msgstr "POEM at HOME"
+
 #~ msgid "Docking at Home"
 #~ msgstr "Docking at Home"
+
 #~ msgid "GPUGrid.net"
 #~ msgstr "GPUGrid.net"
+
 #~ msgid "Superlink at Technion"
 #~ msgstr "Superlink at Technion"
+
 #~ msgid "The Lattice Project"
 #~ msgstr "A Lattice Projekt"
+
 #~ msgid "Malariacontrol.net"
 #~ msgstr "Malariacontrol.net"
+
 #~ msgid "Rosetta at home"
 #~ msgstr "Rosetta at home"
+
 #~ msgid "SIMAP"
 #~ msgstr "SIMAP"
+
 #~ msgid "Virtual Prairie"
 #~ msgstr "Virtuális Préri"
+
 #~ msgid "University of Houston"
 #~ msgstr "Houstoni Egyetem"
+
 #~ msgid "Study of botanical ecosystems"
 #~ msgstr "Botanikai ökoszisztémák tanulmányozása"
+
 #~ msgid ""
 #~ "Provide ecological guidelines on the design of prairies with the best "
 #~ "potential for water purification."
 #~ msgstr ""
 #~ "Ökológiai irányelveket nyújt a prérik olyan megtervezéséhez, ahol a "
 #~ "legjobbak a víztisztítás feltételei."
+
 #~ msgid "Climateprediction.net"
 #~ msgstr "Climateprediction.net"
+
 #~ msgid "Astronomy/Physics/Chemistry"
 #~ msgstr "Csillagászat/Fizika/Kémia"
+
 #~ msgid "eOn"
 #~ msgstr "eOn"
+
 #~ msgid "Orbit at home"
 #~ msgstr "Orbit at home"
+
 #~ msgid "Planetary Science Institute"
 #~ msgstr "Planetológiai Intézet"
+
 #~ msgid "Monitor and study the hazard posed by near-Earth asteroids"
 #~ msgstr "Földközeli aszteroidák okozta veszély figyelése és elemzése"
+
 #~ msgid "Cosmology at Home"
 #~ msgstr "Cosmology at Home"
+
 #~ msgid "University of Illinois at Urbana-Chamapign"
 #~ msgstr "Illinois-i Egyetem, Urbana-Champaign"
+
 #~ msgid "Milkyway at home"
 #~ msgstr "Milkyway at home"
+
 #~ msgid "Leiden Classical"
 #~ msgstr "Leiden Classical"
+
 #~ msgid "uFluids at home"
 #~ msgstr "uFluids at home"
+
 #~ msgid "Purdue University"
 #~ msgstr "Purdue Egyetem"
+
 #~ msgid "Physics/Aeronautics"
 #~ msgstr "Fizika/Repüléstan"
+
 #~ msgid ""
 #~ "The uFluids project simulates two-phase fluid behavior in microgravity "
 #~ "and microfluidics problems. Our goal is to design better satellite "
@@ -902,47 +1278,67 @@ msgstr ""
 #~ "mikrogravitációs és mikrofolyadéktani problémáknál. Célunk jobb műhold "
 #~ "hajtóanyagvezérlő eszközök kifejlesztése és a kétfázisú áramlások "
 #~ "vizsgálata mikrocsatornákban és MEMS eszközökben."
+
 #~ msgid "Einstein at home"
 #~ msgstr "Einstein at home"
+
 #~ msgid "LHC at home"
 #~ msgstr "LHC at home"
+
 #~ msgid "SETI at home"
 #~ msgstr "SETI at home"
+
 #~ msgid "Quantum Monte Carlo at Home"
 #~ msgstr "Quantum Monte Carlo at Home"
+
 #~ msgid "University of Muenster (Germany)"
 #~ msgstr "Münster-i Egyetem (Németország)"
+
 #~ msgid ""
 #~ "Study the structure and reactivity of molecules using Quantum Chemistry."
 #~ msgstr ""
 #~ "Molekulák struktúrájának és reakcióképességének tanulmányozása "
 #~ "kvantumkémia segítségével."
+
 #~ msgid "Spinhenge at home"
 #~ msgstr "Spinhenge at home"
+
 #~ msgid "CAS at home"
 #~ msgstr "CAS at home"
+
 #~ msgid "Yoyo at home"
 #~ msgstr "Yoyo at home"
+
 #~ msgid "EDGeS at Home"
 #~ msgstr "EDGeS at Home"
+
 #~ msgid "Ibercivis"
 #~ msgstr "Ibercivis"
+
 #~ msgid "World Community Grid"
 #~ msgstr "World Community Grid"
+
 #~ msgid "Enigma at Home"
 #~ msgstr "Enigma at Home"
+
 #~ msgid "Collatz Conjecture"
 #~ msgstr "Collatz Conjecture"
+
 #~ msgid "NFS at home"
 #~ msgstr "NFS at home"
+
 #~ msgid "VTU at home"
 #~ msgstr "VTU at home"
+
 #~ msgid "AQUA at home"
 #~ msgstr "AQUA at home"
+
 #~ msgid "D-Wave Systems, Inc."
 #~ msgstr "D-Wave Systems, Inc."
+
 #~ msgid "Quantum computing"
 #~ msgstr "Kvantumszámítás"
+
 #~ msgid ""
 #~ "D-Wave's AQUA (Adiabatic QUantum Algorithms) is a research project whose "
 #~ "goal is to predict the performance of superconducting adiabatic quantum "
@@ -958,20 +1354,28 @@ msgstr ""
 #~ "interneteléréssel rendelkező számítógépeket használ kvantum algoritmusok "
 #~ "megtervezéséhez és elemzéséhez, a Quantum Monte Carlo technikák "
 #~ "alkalmazásával."
+
 #~ msgid "ABC at home"
 #~ msgstr "ABC at home"
+
 #~ msgid "PrimeGrid"
 #~ msgstr "PrimeGrid"
+
 #~ msgid "primaboinca"
 #~ msgstr "primaboinca"
+
 #~ msgid "SZTAKI Desktop Grid"
 #~ msgstr "SZTAKI Desktop Grid"
+
 #~ msgid "Chess960 at home"
 #~ msgstr "Chess960 at home"
+
 #~ msgid "Chess-960.org"
 #~ msgstr "Chess-960.org"
+
 #~ msgid "Game-playing"
 #~ msgstr "Játékmenet"
+
 #~ msgid ""
 #~ "This project studies Chess 960, a variant of orthodox chess. In classical "
 #~ "chess the starting position of the game never changes.  In Chess 960, "
@@ -982,14 +1386,17 @@ msgstr ""
 #~ "tanulmányozza. A klasszikus sakkban a játék kezdőpozíciója soha nem "
 #~ "változik. A Sakk 960-ban a figurák kezdeti pozíciója minden játék elején "
 #~ "véletlenszerűen kerül meghatározásra."
+
 #~ msgid "The current release is known to work with these Linux versions:"
 #~ msgstr "A jelenlegi kiadás biztosan működik a következő Linux verziókkal:"
+
 #~ msgid ""
 #~ "For other Linux versions, check if a BOINC package is offered by your "
 #~ "Linux distribution."
 #~ msgstr ""
 #~ "Egyéb Linux verzióknál ellenőrize, hogy rendelkezésre áll-e BOINC csomag "
 #~ "a disztribúción belül."
+
 #~ msgid ""
 #~ "Alternatively, download the %1BOINC client for older Linux versions%2. "
 #~ "This doesn't have a graphical interface, but it should work on all Linux "
@@ -998,88 +1405,556 @@ msgstr ""
 #~ "Alternatívaként töltse le a %1régebbi Linux verziókra szánt BOINC klienst"
 #~ "%2. Ehhez nem tartozik grafikus felület, viszont működőképes minden Linux "
 #~ "rendszeren, x86-on és x64-en is."
+
 #~ msgid ""
 #~ "Note: if your computer is equipped with an Graphics Processing Unit "
 #~ "(GPU), you may be able to %suse it to compute faster%s"
 #~ msgstr ""
 #~ "Megjegyzés: ha számítógépe tartalmaz Grafikus Processzort (GPU), akkor "
 #~ "lehetséges, hogy az felhasználható a %sszámítások gyorsításához%s"
+
 #~ msgid "TeraFLOPS."
 #~ msgstr "TeraFLOPS."
+
 #~ msgid "Other:"
 #~ msgstr "Egyéb:"
+
 #~ msgid "Yes - I have been running BOINC on my computer for..."
 #~ msgstr "Igen - futtatom a BOINCot a számítógépemen ennyi ideje:"
+
 #~ msgid "less than a week"
 #~ msgstr "kevesebb, mint egy hete"
+
 #~ msgid "less than a month"
 #~ msgstr "kevesebb, mint egy hónapja"
+
 #~ msgid "less than a year"
 #~ msgstr "kevesebb, mint egy éve"
+
 #~ msgid "more than a year"
 #~ msgstr "több mint egy éve"
+
 #~ msgid "No - I used to run BOINC, but..."
 #~ msgstr "Nem - régebben futtattam a BOINC-ot, de..."
+
 #~ msgid "I lost interest"
 #~ msgstr "elvesztettem az érdeklődésemet iránta"
+
 #~ msgid "it was too complicated"
 #~ msgstr "túl bonyolult volt"
+
 #~ msgid "I stopped it and forgot to start again"
 #~ msgstr "leállítottam és elfelejtettem újra elindítani"
+
 #~ msgid "it caused problems on my computer"
 #~ msgstr "problémákat okozott a számítógépemen"
+
 #~ msgid "it used too much electricity"
 #~ msgstr "túl sok áramot fogyasztott"
+
 #~ msgid "I switched to a non-BOINC computing project"
 #~ msgstr "egy nem BOINCos számítási projekthez csatlakoztam"
+
 #~ msgid "No - I tried running BOINC, but..."
 #~ msgstr "Nem - Megpróbáltam futtatni a BOINC-ot, de..."
+
 #~ msgid "the software didn't install correctly"
 #~ msgstr "a szoftver nem megfelelően települt fel"
+
 #~ msgid "I couldn't figure out how to use the software"
 #~ msgstr "nem jöttem rá, hogyan kell használni a programot"
+
 #~ msgid "I had network communication problems"
 #~ msgstr "hálózati problémáim adódtak"
+
 #~ msgid "I couldn't attach to a project"
 #~ msgstr "nem tudtam csatlakozni egy projekthez"
+
 #~ msgid "I attached to a project, but never got any work"
 #~ msgstr "csatlakoztam egy projekthez, de nem kaptam munkacsomagot"
+
 #~ msgid "No - I never tried running BOINC, because..."
 #~ msgstr "Nem - soha nem próbáltam futtatni a BOINCot, mert..."
+
 #~ msgid "I was concerned about security"
 #~ msgstr "aggódtam a biztonság miatt"
+
 #~ msgid "I wasn't interested in any of the projects"
 #~ msgstr "egyik projekt sem érdekelt"
+
 #~ msgid "I don't have permission to run it on my computer"
 #~ msgstr "nincs jogosultságom, hogy futtassam a gépemen"
+
 #~ msgid "No version was available for my computer"
 #~ msgstr "nem volt a számítógépem számára elérhető verzió"
+
 #~ msgid "What kind of computers do you have running BOINC?"
 #~ msgstr "Milyen típusú számítógépen futtatja a BOINCot?"
+
 #~ msgid "Where are they?"
 #~ msgstr "Hol találhatók ezek?"
+
 #~ msgid "Work"
 #~ msgstr "Munkahelyen"
+
 #~ msgid "School"
 #~ msgstr "Iskolában"
+
 #~ msgid "How many computers?"
 #~ msgstr "Hány számítógépen futtatja a BOINCot?"
+
 #~ msgid "On average, how many hours per day are they powered on?"
 #~ msgstr "Átlagosan hány órát vannak bekapcsolva naponta?"
+
 #~ msgid "Age"
 #~ msgstr "Kora"
+
 #~ msgid "Sex"
 #~ msgstr "Neme"
+
 #~ msgid "Male"
 #~ msgstr "Férfi"
+
 #~ msgid "Female"
 #~ msgstr "Nő"
+
 #~ msgid "Your level of computer expertise"
 #~ msgstr "Számítógépes tapasztalatának szintje"
+
 #~ msgid "Beginner"
 #~ msgstr "Kezdő"
+
 #~ msgid "Intermediate"
 #~ msgstr "Középhaladó"
+
 #~ msgid "Advanced"
 #~ msgstr "Haladó"
 
+# The charset used for the text in this file (please try to use UTF-8 if possible)
+#~ msgid "CHARSET"
+#~ msgstr "UTF-8"
+
+# The name of this language in this language
+#~ msgid "LANG_NAME_NATIVE"
+#~ msgstr "English"
+
+# The name of this language in an international language (English)
+#~ msgid "LANG_NAME_INTERNATIONAL"
+#~ msgstr "English"
+
+# #######################################
+# poll-related stuff
+# #######################################
+# #######################################
+# poll-related stuff
+#~ msgid "POLL_TITLE"
+#~ msgstr "BOINC user survey"
+
+#~ msgid "POLL_INTRO"
+#~ msgstr ""
+#~ "Several volunteer computing projects, including Climateprediction.net, "
+#~ "Einstein at home, and SETI at home, use software called BOINC. If you "
+#~ "participate in projects like this, we request that you answer the "
+#~ "following questions. This will help BOINC-based projects increase "
+#~ "participation and achieve greater scientific results. <p> Please answer "
+#~ "as many questions as you want, then go to the bottom and click OK. If you "
+#~ "previously completed the survey but your answers have changed, please "
+#~ "complete it again - your new answers will replace the old ones. <p> The "
+#~ "current results of the survey are <a href=poll_results.php>here</a>. "
+
+#~ msgid "POLL_RUN"
+#~ msgstr "Do you run BOINC?"
+
+#~ msgid "POLL_PARTICIPATION"
+#~ msgstr "Your participation"
+
+#~ msgid "POLL_COMPUTERS"
+#~ msgstr "Your computers"
+
+#~ msgid "POLL_YOU"
+#~ msgstr "You"
+
+#~ msgid "POLL_NATIONALITY"
+#~ msgstr "Nationality"
+
+#~ msgid "POLL_COMMENTS"
+#~ msgstr "Comments"
+
+#~ msgid "POLL_COMMENTS_QUESTION"
+#~ msgstr ""
+#~ "Please suggest ways that BOINC, and the projects that use it, could be "
+#~ "improved:"
+
+#~ msgid "POLL_OTHER"
+#~ msgstr "Other:"
+
+#~ msgid "POLL_CHECK_ALL"
+#~ msgstr "[check all that apply]"
+
+#~ msgid "POLL_DONE"
+#~ msgstr "When done click:"
+
+#~ msgid "POLL_CURRENT"
+#~ msgstr "Yes - I have been running BOINC on my computer for..."
+
+#~ msgid "POLL_TWEEK"
+#~ msgstr "less than a week"
+
+#~ msgid "POLL_TMONTH"
+#~ msgstr "less than a month"
+
+#~ msgid "POLL_TYEAR"
+#~ msgstr "less than a year"
+
+#~ msgid "POLL_TMOREYEAR"
+#~ msgstr "more than a year"
+
+#~ msgid "POLL_LAPSED"
+#~ msgstr "No - I was running BOINC, but stopped because..."
+
+#~ msgid "POLL_LINTEREST"
+#~ msgstr "I lost interest"
+
+#~ msgid "POLL_LCOMPLICATED"
+#~ msgstr "it was too complicated"
+
+#~ msgid "POLL_LSTOPPED"
+#~ msgstr "I stopped it and forgot to start again"
+
+#~ msgid "POLL_LPROBLEMS"
+#~ msgstr "it caused problems on my computer"
+
+#~ msgid "POLL_LPOWER"
+#~ msgstr "it used too much electricity"
+
+#~ msgid "POLL_LNONBOINC"
+#~ msgstr "I switched to a non-BOINC computing project"
+
+#~ msgid "POLL_FAILED"
+#~ msgstr "No - I tried running BOINC, but..."
+
+#~ msgid "POLL_FINSTALL"
+#~ msgstr "the software didn't install correctly"
+
+#~ msgid "POLL_FFIGURE"
+#~ msgstr "I couldn't figure out how to use the software"
+
+#~ msgid "POLL_FNETWORK"
+#~ msgstr "I had network communication problems"
+
+#~ msgid "POLL_FATTACH"
+#~ msgstr "I couldn't attach to a project"
+
+#~ msgid "POLL_FWORK"
+#~ msgstr "I attached to a project, but never got any work"
+
+#~ msgid "POLL_NEVER"
+#~ msgstr "No - I never tried running BOINC, because..."
+
+#~ msgid "POLL_NSECURITY"
+#~ msgstr "I was concerned about security"
+
+#~ msgid "POLL_NPROJECT"
+#~ msgstr "I wasn't interested in any of the projects"
+
+#~ msgid "POLL_NPERMISSION"
+#~ msgstr "I don't have permission to run it on my computer"
+
+#~ msgid "POLL_NVERSION"
+#~ msgstr "No version was available for my computer"
+
+#~ msgid "POLL_KIND"
+#~ msgstr "What kind of computers do you have running BOINC?"
+
+#~ msgid "POLL_WHERE"
+#~ msgstr "Where are they?"
+
+#~ msgid "POLL_WORK"
+#~ msgstr "Work"
+
+#~ msgid "POLL_SCHOOL"
+#~ msgstr "School"
+
+#~ msgid "POLL_HOW_MANY"
+#~ msgstr "How many computers?"
+
+#~ msgid "POLL_TURNED_ON"
+#~ msgstr "On average, how many hours per day are they powered on?"
+
+#~ msgid "POLL_AGE"
+#~ msgstr "Age"
+
+#~ msgid "POLL_SEX"
+#~ msgstr "Sex"
+
+#~ msgid "POLL_MALE"
+#~ msgstr "Male"
+
+#~ msgid "POLL_FEMALE"
+#~ msgstr "Female"
+
+#~ msgid "POLL_EXPERTISE"
+#~ msgstr "Your level of computer expertise"
+
+#~ msgid "POLL_LEVB"
+#~ msgstr "Beginner"
+
+#~ msgid "POLL_LEVI"
+#~ msgstr "Intermediate"
+
+#~ msgid "POLL_LEVA"
+#~ msgstr "Advanced"
+
+#~ msgid "POLL_LEARN_WHERE"
+#~ msgstr "Where did you learn about BOINC projects?"
+
+#~ msgid "POLL_WTV"
+#~ msgstr "TV/radio/newspaper"
+
+#~ msgid "POLL_WPERS"
+#~ msgstr "From friends, relatives, or coworkers"
+
+#~ msgid "POLL_WTEAM"
+#~ msgstr "Team message boards or web sites"
+
+#~ msgid "POLL_WBOINC"
+#~ msgstr "The BOINC web site"
+
+#~ msgid "POLL_WWEB"
+#~ msgstr "Other web sites"
+
+#~ msgid "POLL_FACTOR"
+#~ msgstr ""
+#~ "Which are the most important factors when you decide whether to "
+#~ "participate in a BOINC project?"
+
+#~ msgid "POLL_GRAPHICS"
+#~ msgstr "Nice-looking screensaver graphics"
+
+#~ msgid "POLL_CREDIT_FAIR"
+#~ msgstr "Fair and quick granting of credit for work done"
+
+#~ msgid "POLL_CREDIT_MORE"
+#~ msgstr "Getting more credit from this project than from others"
+
+#~ msgid "POLL_MB_FRIENDLY"
+#~ msgstr "Helpful and friendly message boards"
+
+#~ msgid "POLL_MB_STAFF"
+#~ msgstr "Participation by project staff on the message boards"
+
+#~ msgid "POLL_WEB_SITE"
+#~ msgstr "Informative project web site"
+
+#~ msgid "POLL_SCIENCE_IMPORTANT"
+#~ msgstr "The science is important and beneficial"
+
+#~ msgid "POLL_SCIENCE_PUBLIC"
+#~ msgstr "Non-profit, and results are public"
+
+#~ msgid "POLL_RECOGNIZE"
+#~ msgstr "Personal recognition if my computer finds something"
+
+#~ msgid "POLL_PUBLISH"
+#~ msgstr "Publication by the project in scientific journals"
+
+#~ msgid "POLL_EMAIL"
+#~ msgstr "Periodic email newsletters from the project"
+
+#~ msgid "POLL_NPROJECTS"
+#~ msgstr "How many BOINC projects do you participate in?"
+
+#~ msgid "POLL_SSAVER"
+#~ msgstr "Do you run BOINC as a screensaver?"
+
+#~ msgid "POLL_YES"
+#~ msgstr "Yes"
+
+#~ msgid "POLL_NO"
+#~ msgstr "No"
+
+#~ msgid "POLL_MBOARDS"
+#~ msgstr "Your usage of project messages boards:"
+
+#~ msgid "POLL_MBR"
+#~ msgstr "to read information"
+
+#~ msgid "POLL_MBRW"
+#~ msgstr "to read and post information"
+
+#~ msgid "POLL_NONE"
+#~ msgstr "None"
+
+#~ msgid "POLL_HELP"
+#~ msgstr ""
+#~ "Where do you get information to help resolve problems with BOINC and/or "
+#~ "BOINC projects?"
+
+#~ msgid "POLL_HELP_PMB"
+#~ msgstr "The project message boards"
+
+#~ msgid "POLL_HELP_BMB"
+#~ msgstr "The BOINC message boards"
+
+#~ msgid "POLL_HELP_BDOC"
+#~ msgstr "The BOINC web site"
+
+#~ msgid "POLL_HELP_BMLIST"
+#~ msgstr "BOINC mailing lists"
+
+#~ msgid "POLL_HELP_WIKI"
+#~ msgstr "The Unofficial BOINC Wiki"
+
+#~ msgid "POLL_HELP_TEAM"
+#~ msgstr "Team web sites"
+
+#~ msgid "POLL_HELP_GOOGLE"
+#~ msgstr "Google or other search engines"
+
+#~ msgid "POLL_ERROR_TITLE"
+#~ msgstr "Error - results not recorded"
+
+#~ msgid "POLL_ERROR_TEXT"
+#~ msgstr ""
+#~ "An internal error has prevented us from recording your survey response.  "
+#~ "Please try again later."
+
+#~ msgid "POLL_RECORDED"
+#~ msgstr "Survey response recorded"
+
+#~ msgid "POLL_THANKS"
+#~ msgstr "Thank you for completing the BOINC user survey."
+
+#~ msgid "POLL_RESULTS_TITLE"
+#~ msgstr "Survey results"
+
+#~ msgid "POLL_RESULTS_TEXT"
+#~ msgstr ""
+#~ "These are the current results of the <a href=poll.php>BOINC user survey</"
+#~ "a>.  This page is updated every hour."
+
+#~ msgid "DL_MIRRORS"
+#~ msgstr ""
+#~ "Note: files are downloaded from mirror servers at boinc.berkeley.edu, "
+#~ "morel.mit.edu, einstein.aei.mpg.de, einstein.astro.gla.ac.uk, einstein."
+#~ "ligo.caltech.edu, and einstein.aset.psu.edu (thanks to these "
+#~ "institutions). The server is chosen randomly - if a download fails, "
+#~ "reload this page and try again. "
+
+# #############################################
+# help.php
+# #############################################
+#~ msgid "HELP_TITLE"
+#~ msgstr "Getting help with BOINC"
+
+#~ msgid "HELP_HEADING1"
+#~ msgstr "Online Help"
+
+#~ msgid "HELP_P1_1"
+#~ msgstr ""
+#~ "BOINC Online Help lets you talk one-on-one with experienced BOINC users, "
+#~ "who can: %s answer questions about BOINC and volunteer computing; %s walk "
+#~ "you through the process of installing and using BOINC; %s troubleshoot "
+#~ "any problems you might have. "
+
+#~ msgid "HELP_P1_2"
+#~ msgstr ""
+#~ "BOINC Online Help is based on %sSkype%s, an Internet-based telephone "
+#~ "system. 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. "
+
+#~ msgid "HELP_P1_3"
+#~ msgstr ""
+#~ "The best way to get help is by voice, for which you need either built-in "
+#~ "microphone and speakers or an external headset for your computer. You can "
+#~ "also use Skype's text-based chat system or regular email (if you don't "
+#~ "have Skype) to communicate with Help Volunteers."
+
+#~ msgid "HELP_P1_4"
+#~ msgstr ""
+#~ "Volunteers speaking several languages are available. Please select a "
+#~ "language: "
+
+#~ msgid "HELP_HEADING2"
+#~ msgstr "BOINC help on the web"
+
+#~ msgid "HELP_P2_ITEM1"
+#~ msgstr "BOINC user's manual"
+
+#~ msgid "HELP_P2_ITEM2"
+#~ msgstr "Troubleshooting BOINC "
+
+#~ msgid "HELP_P2_ITEM3"
+#~ msgstr "BOINC-related web sites "
+
+#~ msgid "HELP_P2_ITEM4"
+#~ msgstr "The BOINC message boards "
+
+#~ msgid "HELP_P2_ITEM5"
+#~ msgstr "The message boards on any BOINC-based project "
+
+#~ msgid "HELP_HEADING3"
+#~ msgstr "Be a Help Volunteer"
+
+#~ msgid "HELP_P3_1"
+#~ msgstr ""
+#~ "If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+#~ "Volunteer%s. It's a great way to help the cause of scientific research "
+#~ "and volunteer computing - and it's fun!  "
+
+#~ msgid "HELP_P3_2"
+#~ msgstr ""
+#~ "If you're already a Help Volunteer: to edit your settings, %sclick here"
+#~ "%s. "
+
+# #############################################
+# index.php
+# #############################################
+#~ msgid "HOME_HEADING1"
+#~ msgstr "Volunteer"
+
+#~ msgid "HOME_P1"
+#~ msgstr ""
+#~ " Use the idle time on your computer  (Windows, Mac, or Linux)  to cure "
+#~ "diseases, study global warming,  discover pulsars, and do many other "
+#~ "types of scientific research.  It's safe, secure, and easy:  %sChoose%s "
+#~ "projects  %sDownload%s and run BOINC software  %sEnter%s an email address "
+#~ "and password. "
+
+#~ msgid "HOME_P2"
+#~ msgstr ""
+#~ "Or, if you run several projects, try an %saccount manager%s such as "
+#~ "%sGridRepublic%s or %sBAM!%s. "
+
+#~ msgid "HOME_P3"
+#~ msgstr ""
+#~ "If you have any questions, or need help getting started, you can %stalk "
+#~ "to a Volunteer Helper%s. "
+
+#~ msgid "HOME_DOWNLOAD"
+#~ msgstr "Download"
+
+#~ msgid "HOME_WEB_SITES"
+#~ msgstr "Web"
+
+#~ msgid "HOME_ADD_ONS"
+#~ msgstr "Add-ons"
+
+#~ msgid "HOME_SURVEY"
+#~ msgstr "Survey"
+
+#~ msgid "HOME_BOINC"
+#~ msgstr "Berkeley Open Infrastructure for Network Computing"
+
+# The charset used for the text in this file (please try to use UTF-8 if possible)
+# The name of this language in this language
+# The name of this language in an international language (English)
+# #######################################
+# poll-related stuff
+# #############################################
+# help.php
+# index.php
+#~ msgid "HOME_BOINC_DESC"
+#~ msgstr ""
+#~ "Open-source software for %svolunteer computing%s and %sgrid computing%s"
diff --git a/locale/it_IT/BOINC-Client.mo b/locale/it_IT/BOINC-Client.mo
index 28f1282..839b8ca 100644
Binary files a/locale/it_IT/BOINC-Client.mo and b/locale/it_IT/BOINC-Client.mo differ
diff --git a/locale/it_IT/BOINC-Client.po b/locale/it_IT/BOINC-Client.po
old mode 100755
new mode 100644
index c85404d..7cfc5db
--- a/locale/it_IT/BOINC-Client.po
+++ b/locale/it_IT/BOINC-Client.po
@@ -1,23 +1,23 @@
 # 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: BOINC 7.4\n"
+"Project-Id-Version: boinc\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-10-15 22:25-0700\n"
-"PO-Revision-Date: 2015-02-11 00:12-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: it_IT\n"
+"PO-Revision-Date: 2015-02-08 21:33+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\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"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.1.6\n"
+"Language: it_IT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: acct_mgr.cpp:450
-#: acct_mgr.cpp:459
+#: acct_mgr.cpp:450 acct_mgr.cpp:459
 msgid "Message from account manager"
 msgstr "Messaggio dal gestore dell'account"
 
@@ -26,7 +26,9 @@ msgid "Message from server"
 msgstr "Messaggio dal server"
 
 #: client_state.cpp:258
-msgid "Some tasks need more memory than allowed by your preferences.  Please check the preferences."
+msgid ""
+"Some tasks need more memory than allowed by your preferences.  Please check "
+"the preferences."
 msgstr "Alcuni lavori richiedono più memoria di quella resa disponibile dalle tue preferenze.  Per favore controllale."
 
 #: client_state.cpp:520
@@ -39,11 +41,12 @@ msgstr "La variabile di ambiente HTTP_PROXY deve specificare un 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"
+msgid ""
+"You used the wrong URL for this project.  When convenient, remove this "
+"project, then add %s"
 msgstr "Hai usato l'URL sbagliato per questo progetto.  Quando hai tempo, rimuovi questo progetto, poi aggiungi %s"
 
-#: cs_statefile.cpp:828
-#: ../sched/sched_types.cpp:259
+#: cs_statefile.cpp:828 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
 msgstr "Errore di sintassi nel file app_info.xml"
 
@@ -55,18 +58,15 @@ msgstr "ll file referenziato in app_info.xml non esiste: "
 msgid "A new version of BOINC is available."
 msgstr "Una nuova versione di BOINC è disponibile."
 
-#: current_version.cpp:94
-#: current_version.cpp:102
+#: current_version.cpp:94 current_version.cpp:102
 msgid "Download"
 msgstr "Scarica"
 
-#: log_flags.cpp:269
-#: log_flags.cpp:449
+#: log_flags.cpp:269 log_flags.cpp:449
 msgid "Unexpected text in cc_config.xml"
 msgstr "Testo inaspettato nel file cc_config.xml"
 
-#: log_flags.cpp:423
-#: log_flags.cpp:475
+#: log_flags.cpp:423 log_flags.cpp:475
 msgid "Unrecognized tag in cc_config.xml"
 msgstr "Tag non riconosciuto nel file cc_config.xml"
 
@@ -91,7 +91,9 @@ msgid "Invalid code signing key.  To fix, remove and add this project."
 msgstr "Codice di chiave account invalido.  Per risolvere, disconnetti e riconnetti questo progetto."
 
 #: ../sched/handle_request.cpp:859
-msgid "The project has changed its security key.  Please remove and add this project."
+msgid ""
+"The project has changed its security key.  Please remove and add this "
+"project."
 msgstr "Il progetto ha modificato la sua chiave di sicurezza.  Per favore disconnetti e riconnetti questo progetto."
 
 #: ../sched/handle_request.cpp:943
@@ -103,7 +105,8 @@ msgid "This project doesn't support CPU type"
 msgstr "Il progetto non supporta questo tipo di CPU"
 
 #: ../sched/handle_request.cpp:993
-msgid "Your BOINC client software is too old.  Please install the current version."
+msgid ""
+"Your BOINC client software is too old.  Please install the current version."
 msgstr "Una versione di BOINC più recente è richiesta.  Per favore installa la versione corrente."
 
 #: ../sched/handle_request.cpp:1259
@@ -111,18 +114,21 @@ msgid "This project doesn't support computers of type"
 msgstr "Il progetto non supporta questo tipo di computer"
 
 #: ../sched/sched_send.cpp:1092
-msgid "Upgrade to the latest driver to process tasks using your computer's GPU"
+msgid ""
+"Upgrade to the latest driver to process tasks using your computer's GPU"
 msgstr "Aggiorna i driver all'ultima versione per eseguire i lavori che utilizzano la GPU del tuo computer"
 
 #: ../sched/sched_send.cpp:1099
-msgid "Upgrade to the latest driver to use all of this project's GPU applications"
+msgid ""
+"Upgrade to the latest driver to use all of this project's GPU applications"
 msgstr "Aggiorna i driver all'ultima versione per eseguire le applicazioni di questo progetto che utilizzano la GPU"
 
 #: ../sched/sched_send.cpp:1118
-msgid "A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to the current version"
+msgid ""
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to"
+" the current version"
 msgstr "Una nuova versione di BOINC è necessaria per usare la tua GPU NVIDIA; per favore aggiorna alla versione corrente"
 
-# 94%
 #: ../sched/sched_send.cpp:1146
 #, c-format
 msgid "An %s GPU is required to run tasks for this project"
@@ -142,7 +148,8 @@ msgstr "Una versione di BOINC più recente è richiesta; per favore installa la
 
 #: ../sched/sched_send.cpp:1305
 #, c-format
-msgid "Tasks for %s are available, but your preferences are set to not accept them"
+msgid ""
+"Tasks for %s are available, but your preferences are set to not accept them"
 msgstr "Lavori per %s sono disponibili, ma le tue preferenze sono impostate per non accettarli"
 
 #: ../sched/sched_types.cpp:254
@@ -152,58 +159,3 @@ msgstr "Nome sconosciuto di app nel file app_info.xml"
 #: ../sched/sched_version.cpp:214
 msgid "Your app_info.xml file doesn't have a usable version of"
 msgstr "Il tuo file app_info.xml non ha una versione utilizzabile di"
-
-#~ msgid "Download it."
-#~ msgstr "Scaricala."
-#~ msgid "An NVIDIA or ATI GPU is required to run tasks for this project"
-#~ msgstr ""
-#~ "Una GPU ATI o NVIDIA è richiesta per eseguire i lavori di questo progetto"
-#~ msgid "An NVIDIA GPU is required to run tasks for this project"
-#~ msgstr "Una GPU NVIDIA è richiesta per eseguire i lavori di questo progetto"
-#~ msgid "An ATI GPU is required to run tasks for this project"
-#~ msgstr "Una GPU ATI è richiesta per eseguire i lavori di questo progetto"
-#~ msgid ""
-#~ "Tasks for NVIDIA GPU are available, but your preferences are set to not "
-#~ "accept them"
-#~ msgstr ""
-#~ "Sono disponibili lavori per una GPU NVIDIA, ma le tue preferenze sono "
-#~ "settate per non accettarli"
-#~ msgid ""
-#~ "Tasks for ATI GPU are available, but your preferences are set to not "
-#~ "accept them"
-#~ msgstr ""
-#~ "Sono disponibili lavori per una GPU ATI, ma le tue preferenze sono "
-#~ "settate per non accettarli"
-#~ msgid ""
-#~ "Tasks for CPU are available, but your preferences are set to not accept "
-#~ "them"
-#~ msgstr ""
-#~ "Sono disponibili lavori per la CPU , ma le tue preferenze sono settate "
-#~ "per non accettarli"
-#~ msgid "error"
-#~ msgstr "errore"
-#~ msgid "Can't resolve hostname in remote_hosts.cfg"
-#~ msgstr "Impossibile risolvere il nome dell'hostname in remote_hosts.cfg"
-#~ msgid "is not available for"
-#~ msgstr "non è disponibile per il tuo tipo di computer"
-#~ msgid "Notice from BOINC"
-#~ msgstr "Avviso da BOINC"
-#~ msgid "Message from"
-#~ msgstr "Messaggio da"
-#~ msgid ""
-#~ "You may have an outdated code signing key.  Try attaching and reattaching "
-#~ "this project."
-#~ msgstr ""
-#~ "Potresti avere una chiave di autenticazione obsoleta.  Per risolvere, "
-#~ "disconnetti e riconnetti questo progetto."
-#~ msgid "XML syntax error in"
-#~ msgstr "errore di sintassi nel file XML"
-#~ msgid "Unparsed tag in"
-#~ msgstr "Tag non riconosciuto"
-#~ msgid ""
-#~ "Your preference for network connection interval is too high for this "
-#~ "project"
-#~ msgstr ""
-#~ "Le tue preferenze di intervallo tra le connessioni di rete sono troppo "
-#~ "alte per questo progetto"
-
diff --git a/locale/it_IT/BOINC-Manager.mo b/locale/it_IT/BOINC-Manager.mo
index 9164336..abc0aef 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
old mode 100755
new mode 100644
index 6340dd7..4ac069b
--- a/locale/it_IT/BOINC-Manager.po
+++ b/locale/it_IT/BOINC-Manager.po
@@ -1,64 +1,62 @@
 # 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:
+# Gianfranco Costamagna <costamagnagianfranco at yahoo.it>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-15 14:15-0500\n"
-"PO-Revision-Date: 2015-02-11 00:13-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC.Italy team <contact at boincitaly.org>\n"
-"Language: it_IT\n"
+"POT-Creation-Date: 2015-03-24 13:36-0500\n"
+"PO-Revision-Date: 2015-03-24 21:39+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc_7.4\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1418721159.0\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
+"Language: it_IT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\n"
+"X-Poedit-Country: UNITED STATES\n"
+"X-Poedit-Language: English\n"
 "X-Poedit-SearchPath-0: clientgui\n"
-"X-Poedit-SearchPath-1: clientgui/msw\n"
-"X-Poedit-SearchPath-2: clientgui/gtk\n"
-"X-Poedit-SearchPath-3: clientgui/mac\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"
 
-# 81%
-#: clientgui/AccountInfoPage.cpp:387
+#: clientgui/AccountInfoPage.cpp:361
 #, c-format
 msgid "Identify your account at %s"
 msgstr "Identifica il tuo account su %s"
 
-#: clientgui/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 ""
-"Inserisci i dati del tuo account\n"
-"(per creare un account, visita il sito web del progetto)"
+msgstr "Inserisci i dati del tuo account\n(per creare un account, visita il sito web del progetto)"
 
-#: clientgui/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 ""
-"Questo progetto attualmente non accetta nuove iscrizioni.\n"
-"Puoi connetterti al progetto solo se hai già un account."
+msgstr "Questo progetto attualmente non accetta nuove iscrizioni.\nPuoi connetterti al progetto solo se hai già un account."
 
-#: clientgui/AccountInfoPage.cpp:401
+#: clientgui/AccountInfoPage.cpp:375
 msgid "Are you already running this project?"
 msgstr "Hai già un account su questo progetto?"
 
-#: clientgui/AccountInfoPage.cpp:405
+#: clientgui/AccountInfoPage.cpp:379
 msgid "&No, new user"
 msgstr "&No, nuovo utente"
 
-#: clientgui/AccountInfoPage.cpp:408
+#: clientgui/AccountInfoPage.cpp:382
 msgid "&Yes, existing user"
 msgstr "&Si, utente registrato"
 
-#: clientgui/AccountInfoPage.cpp:413
+#: clientgui/AccountInfoPage.cpp:387
 msgid ""
 "We were not able to set up your account information\n"
 "automatically.\n"
@@ -66,125 +64,114 @@ msgid ""
 "Please click on the 'Find login information' link\n"
 "below to find out what to put in the email address and\n"
 "password fields."
-msgstr ""
-"Non siamo stati in grado di impostare le informazioni del tuo account automaticamente.\n"
-"\n"
-"Clicca sul link 'Recupera le informazioni di accesso'\n"
-"in basso per trovare cosa inserire nei campi\n"
-"indirizzo email e password."
+msgstr "Non siamo stati in grado di impostare le informazioni del tuo account automaticamente.\n\nClicca sul link 'Recupera le informazioni di accesso'\nin basso per trovare cosa inserire nei campi\nindirizzo email e password."
 
-#: clientgui/AccountInfoPage.cpp:416
+#: clientgui/AccountInfoPage.cpp:390
 msgid "Find login information"
 msgstr "Recupera le informazioni di accesso"
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:649
+#: clientgui/AccountInfoPage.cpp:410 clientgui/AccountInfoPage.cpp:632
 msgid "&Password:"
 msgstr "&Password:"
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:673
+#: clientgui/AccountInfoPage.cpp:417 clientgui/AccountInfoPage.cpp:656
 msgid "Choose a &password:"
 msgstr "Scegli una &password:"
 
-#: clientgui/AccountInfoPage.cpp:446
+#: clientgui/AccountInfoPage.cpp:420
 msgid "C&onfirm password:"
 msgstr "C&onferma la password:"
 
-#: clientgui/AccountInfoPage.cpp:453
+#: clientgui/AccountInfoPage.cpp:427
 #, c-format
 msgid "Are you already running %s?"
 msgstr "Hai già un account sul progetto %s?"
 
-#: clientgui/AccountInfoPage.cpp:482
+#: clientgui/AccountInfoPage.cpp:456
 msgid "&Username:"
 msgstr "&Nome utente:"
 
-#: clientgui/AccountInfoPage.cpp:511
+#: clientgui/AccountInfoPage.cpp:485
 msgid "&Email address or LDAP ID:"
-msgstr "Indirizzo &email oppure ID LDAP"
+msgstr "indirizzo &Email o ID LDAP:"
 
-#: clientgui/AccountInfoPage.cpp:515
+#: clientgui/AccountInfoPage.cpp:489
 msgid "&Email address:"
 msgstr "&Indirizzo email:"
 
-#: clientgui/AccountInfoPage.cpp:523
+#: clientgui/AccountInfoPage.cpp:497
 #, c-format
 msgid "minimum length %d"
 msgstr "lunghezza minima %d"
 
-#: clientgui/AccountInfoPage.cpp:530
+#: clientgui/AccountInfoPage.cpp:504
 msgid "Forgot your password?"
 msgstr "Hai dimenticato la password?"
 
-#: clientgui/AccountInfoPage.cpp:537
+#: 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 ""
-"Se non sei già registrato con questo account manager,\n"
-"sei pregato di farlo prima di procedere.  Clicca sul link qui sotto\n"
-"per registrarti o per recuperare la password dimenticata."
+msgstr "Se non sei già registrato con questo account manager,\nsei pregato di farlo prima di procedere.  Clicca sul link qui sotto\nper registrarti o per recuperare la password dimenticata."
 
-#: clientgui/AccountInfoPage.cpp:540
+#: clientgui/AccountInfoPage.cpp:514
 msgid "Account manager web site"
 msgstr "Sito web dell'account manager"
 
-#: clientgui/AccountInfoPage.cpp:582
+#: clientgui/AccountInfoPage.cpp:556
 msgid "Add project"
 msgstr "Aggiungi un progetto"
 
-#: clientgui/AccountInfoPage.cpp:584
+#: clientgui/AccountInfoPage.cpp:558
 msgid "Update account manager"
 msgstr "Aggiorna l'account manager"
 
-#: clientgui/AccountInfoPage.cpp:586
+#: clientgui/AccountInfoPage.cpp:560
 msgid "Use account manager"
 msgstr "Usa l'account manager"
 
-#: clientgui/AccountInfoPage.cpp:593
+#: clientgui/AccountInfoPage.cpp:567
 msgid "Please enter a user name."
 msgstr "Si prega di inserire il nome utente."
 
-#: clientgui/AccountInfoPage.cpp:595
+#: clientgui/AccountInfoPage.cpp:569
 msgid "Please enter an email address."
 msgstr "Inserire il proprio indirizzo email."
 
-#: clientgui/AccountInfoPage.cpp:605
+#: clientgui/AccountInfoPage.cpp:579
 #, c-format
 msgid "Please enter a password of at least %d characters."
 msgstr "Per favore inserisci una password di almeno %d caratteri."
 
-#: clientgui/AccountInfoPage.cpp:615
-msgid "The password and confirmation password do not match. Please type them again."
+#: clientgui/AccountInfoPage.cpp:589
+msgid ""
+"The password and confirmation password do not match. Please type them again."
 msgstr "La password e la password di conferma non corrispondono. Prova a scriverle di nuovo."
 
-#: clientgui/AccountManagerInfoPage.cpp:272
+#: clientgui/AccountManagerInfoPage.cpp:270
 msgid "Choose an account manager"
 msgstr "Scegli un account manager"
 
-#: clientgui/AccountManagerInfoPage.cpp:275
+#: clientgui/AccountManagerInfoPage.cpp:273
 msgid ""
 "To choose an account manager, click its name or \n"
 "type its URL below."
-msgstr ""
-"Per selezionare un account manager, clicca sul suo nome o \n"
-"digita il suo indirizzo (URL) in basso."
+msgstr "Per selezionare un account manager, clicca sul suo nome o \ndigita il suo indirizzo (URL) in basso."
 
-#: clientgui/AccountManagerInfoPage.cpp:279
+#: clientgui/AccountManagerInfoPage.cpp:277
 msgid "Account manager details:"
 msgstr "Sito web dell'account manager:"
 
-#: clientgui/AccountManagerInfoPage.cpp:283
+#: clientgui/AccountManagerInfoPage.cpp:281
 msgid "Account manager &URL:"
 msgstr "&URL dell'account manager:"
 
-#: clientgui/AccountManagerInfoPage.cpp:287
+#: clientgui/AccountManagerInfoPage.cpp:285
 msgid "Open web page"
 msgstr "Apri la pagina web"
 
-#: clientgui/AccountManagerInfoPage.cpp:290
+#: clientgui/AccountManagerInfoPage.cpp:288
 msgid "Visit this account manager's web site"
 msgstr "Visita il sito web del gestore account"
 
@@ -208,321 +195,334 @@ msgstr "Si prega di attendere..."
 msgid "An internal server error has occurred.\n"
 msgstr "Si è verificato un errore interno del server.\n"
 
-#: clientgui/AdvancedFrame.cpp:96
+#: clientgui/AdvancedFrame.cpp:99
 msgid "Connected"
 msgstr "Connesso"
 
-#: clientgui/AdvancedFrame.cpp:104
+#: clientgui/AdvancedFrame.cpp:107
 msgid "Disconnected"
 msgstr "Disconnesso"
 
-#: clientgui/AdvancedFrame.cpp:318
+#: clientgui/AdvancedFrame.cpp:325
+#, c-format
+msgid "New %s window..."
+msgstr "Nuova finestra %s ..."
+
+#: clientgui/AdvancedFrame.cpp:329
+#, c-format
+msgid "Open another %s window"
+msgstr "Avvia una nuova finestra di %s"
+
+#: clientgui/AdvancedFrame.cpp:340
+msgid "Select computer..."
+msgstr "Seleziona un computer..."
+
+#: clientgui/AdvancedFrame.cpp:341
+msgid "Connect to a BOINC client on another computer"
+msgstr "Connetti ad un client BOINC su un altro computer"
+
+#: clientgui/AdvancedFrame.cpp:345
+msgid "Shut down connected client..."
+msgstr "Arresta il client attualmente connesso..."
+
+#: clientgui/AdvancedFrame.cpp:346
+msgid "Shut down the currently connected BOINC client"
+msgstr "Arresta tutti i client BOINC attualmente connessi"
+
+#: clientgui/AdvancedFrame.cpp:351
 #, c-format
 msgid "Close the %s window"
 msgstr "Chiudi la finestra di %s"
 
-#: clientgui/AdvancedFrame.cpp:321
-msgid "&Close Window"
+#: clientgui/AdvancedFrame.cpp:354
+msgid "&Close window"
 msgstr "&Chiudi finestra"
 
-#: clientgui/AdvancedFrame.cpp:332
-#: clientgui/AdvancedFrame.cpp:339
-#: clientgui/AdvancedFrame.cpp:346
+#: clientgui/AdvancedFrame.cpp:363 clientgui/AdvancedFrame.cpp:368
+#: clientgui/AdvancedFrame.cpp:373
 #, c-format
 msgid "Exit %s"
 msgstr "Esci da %s"
 
-#: clientgui/AdvancedFrame.cpp:359
-msgid "Preferences..."
+#: clientgui/AdvancedFrame.cpp:386
+msgid "Preferences…"
 msgstr "Preferenze..."
 
-#: clientgui/AdvancedFrame.cpp:368
+#: clientgui/AdvancedFrame.cpp:395
 msgid "&Notices\tCtrl+Shift+N"
 msgstr "&Avvisi\tCtrl+Shift+N"
 
-#: clientgui/AdvancedFrame.cpp:369
-msgid "Display notices"
-msgstr "Visualizza avvisi"
+#: clientgui/AdvancedFrame.cpp:396
+msgid "Show notices"
+msgstr "Visualizza notifiche"
 
-#: clientgui/AdvancedFrame.cpp:374
+#: clientgui/AdvancedFrame.cpp:401
 msgid "&Projects\tCtrl+Shift+P"
 msgstr "&Progetti\tCtrl+Shift+P"
 
-#: clientgui/AdvancedFrame.cpp:375
-msgid "Display projects"
-msgstr "Visualizza i progetti"
+#: clientgui/AdvancedFrame.cpp:402
+msgid "Show projects"
+msgstr "Mostra i progetti"
 
-#: clientgui/AdvancedFrame.cpp:380
+#: clientgui/AdvancedFrame.cpp:407
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr "&Elaborazioni\tCtrl+Shift+T"
 
-#: clientgui/AdvancedFrame.cpp:381
-msgid "Display tasks"
+#: clientgui/AdvancedFrame.cpp:408
+msgid "Show tasks"
 msgstr "Visualizza le elaborazioni"
 
-#: clientgui/AdvancedFrame.cpp:386
+#: clientgui/AdvancedFrame.cpp:413
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr "Tras&ferimenti\tCtrl+Shift+X"
 
-#: clientgui/AdvancedFrame.cpp:387
-msgid "Display transfers"
-msgstr "Visualizza i trasferimenti"
+#: clientgui/AdvancedFrame.cpp:414
+msgid "Show file transfers"
+msgstr "Visualizza i trasferimenti dei file"
 
-#: clientgui/AdvancedFrame.cpp:392
+#: clientgui/AdvancedFrame.cpp:419
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "&Statistiche\tCtrl+Shift+S"
 
-#: clientgui/AdvancedFrame.cpp:393
-msgid "Display statistics"
+#: clientgui/AdvancedFrame.cpp:420
+msgid "Show statistics"
 msgstr "Visualizza le statistiche"
 
-#: clientgui/AdvancedFrame.cpp:398
-msgid "&Disk usage\tCtrl+Shift+D"
-msgstr "Utilizzo del &disco\tCtrl+Shift+D"
+#: clientgui/AdvancedFrame.cpp:425
+msgid "&Disk\tCtrl+Shift+D"
+msgstr "Utilizzo &disco⇥Ctrl+Shift+D"
 
-#: clientgui/AdvancedFrame.cpp:399
-msgid "Display disk usage"
-msgstr "Visualizza l'utilizzo del disco"
+#: clientgui/AdvancedFrame.cpp:426
+msgid "Show disk usage"
+msgstr "Visualizza utilizzo disco"
 
-#: clientgui/AdvancedFrame.cpp:406
+#: 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
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr "&Visualizzazione Semplice...\tCtrl+Shift+V"
 
-#: clientgui/AdvancedFrame.cpp:407
-msgid "Display the simple graphical interface."
-msgstr "Visualizza l'interfaccia grafica semplice di BOINC"
+#: clientgui/AdvancedFrame.cpp:440
+msgid "Switch to the Simple View"
+msgstr "Passa alla Vista Semplice"
 
-#: clientgui/AdvancedFrame.cpp:421
+#: clientgui/AdvancedFrame.cpp:454
 msgid "&Add project or account manager..."
 msgstr "Connessione ad un &progetto o ad un account manager..."
 
-#: clientgui/AdvancedFrame.cpp:422
-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/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:426
+#: clientgui/AdvancedFrame.cpp:459
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "&Sincronizza con %s"
 
-#: clientgui/AdvancedFrame.cpp:430
+#: clientgui/AdvancedFrame.cpp:463
 #, c-format
 msgid "Get current settings from %s"
 msgstr "Preleva le impostazioni correnti da %s"
 
-#: clientgui/AdvancedFrame.cpp:440
+#: clientgui/AdvancedFrame.cpp:473
 msgid "&Add project..."
 msgstr "&Connessione ad un progetto..."
 
-#: clientgui/AdvancedFrame.cpp:441
+#: clientgui/AdvancedFrame.cpp:474
 msgid "Add a project"
 msgstr "Connessione ad un progetto"
 
-#: clientgui/AdvancedFrame.cpp:444
+#: clientgui/AdvancedFrame.cpp:477
 #, c-format
 msgid "S&top using %s..."
 msgstr "&Smetti di utilizzare %s..."
 
-#: clientgui/AdvancedFrame.cpp:450
+#: clientgui/AdvancedFrame.cpp:483
 msgid "Remove this computer from account manager control."
 msgstr "Rimuovi questo computer dal controllo dell'account manager."
 
-#: clientgui/AdvancedFrame.cpp:455
-msgid "&Options..."
-msgstr "&Opzioni..."
+#: clientgui/AdvancedFrame.cpp:489
+msgid "Run CPU &benchmarks"
+msgstr "Esegui i &benchmark per la CPU"
 
-#: clientgui/AdvancedFrame.cpp:456
-msgid "Configure display options and proxy settings"
-msgstr "Configura le opzioni dell'interfaccia grafica e del proxy"
+#: clientgui/AdvancedFrame.cpp:490
+msgid "Run tests that measure CPU speed"
+msgstr "Avvia i test di misurazione della velocità CPU"
 
-#: clientgui/AdvancedFrame.cpp:460
-msgid "Computing &preferences..."
-msgstr "&Preferenze di elaborazione..."
+#: clientgui/AdvancedFrame.cpp:494
+msgid "Retry pending transfers"
+msgstr "Ritenta i trasferimenti in attesa"
 
-#: clientgui/AdvancedFrame.cpp:461
-msgid "Configure computing preferences"
-msgstr "Configura le preferenze locali di elaborazione"
+#: clientgui/AdvancedFrame.cpp:495
+msgid "Retry deferred file transfers and task requests"
+msgstr "Ritenta i trasferimenti e le richieste di nuove elaborazioni rimandate"
 
-#: clientgui/AdvancedFrame.cpp:469
+#: clientgui/AdvancedFrame.cpp:503
 msgid "&Run always"
 msgstr "Elabo&razione continua"
 
-#: clientgui/AdvancedFrame.cpp:470
+#: clientgui/AdvancedFrame.cpp:504
 msgid "Allow work regardless of preferences"
 msgstr "Elabora senza interruzioni e indipendentemente dalle preferenze"
 
-#: clientgui/AdvancedFrame.cpp:474
+#: clientgui/AdvancedFrame.cpp:508
 msgid "Run based on &preferences"
 msgstr "Elaborazione secondo le &preferenze"
 
-#: clientgui/AdvancedFrame.cpp:475
+#: clientgui/AdvancedFrame.cpp:509
 msgid "Allow work according to preferences"
 msgstr "Consenti l'invio di lavoro secondo le preferenze"
 
-#: clientgui/AdvancedFrame.cpp:479
+#: clientgui/AdvancedFrame.cpp:513
 msgid "&Suspend"
 msgstr "&Sospendi"
 
-#: clientgui/AdvancedFrame.cpp:480
+#: clientgui/AdvancedFrame.cpp:514
 msgid "Stop work regardless of preferences"
 msgstr "Sospendi l'elaborazione indipendentemente dalle preferenze"
 
-#: clientgui/AdvancedFrame.cpp:505
+#: clientgui/AdvancedFrame.cpp:539
 msgid "Use GPU always"
 msgstr "E&laborazione GPU continua"
 
-#: clientgui/AdvancedFrame.cpp:506
+#: clientgui/AdvancedFrame.cpp:540
 msgid "Allow GPU work regardless of preferences"
 msgstr "Elabora con la GPU senza interruzioni e indipendentemente dalle preferenze"
 
-#: clientgui/AdvancedFrame.cpp:510
+#: clientgui/AdvancedFrame.cpp:544
 msgid "Use GPU based on preferences"
 msgstr "Ela&borazione GPU secondo le preferenze"
 
-#: clientgui/AdvancedFrame.cpp:511
+#: clientgui/AdvancedFrame.cpp:545
 msgid "Allow GPU work according to preferences"
 msgstr "consenti l'invio di lavoro per la GPU secondo le preferenze"
 
-#: clientgui/AdvancedFrame.cpp:515
+#: clientgui/AdvancedFrame.cpp:549
 msgid "Suspend GPU"
 msgstr "Sospendi l'uso della GPU"
 
-#: clientgui/AdvancedFrame.cpp:516
+#: clientgui/AdvancedFrame.cpp:550
 msgid "Stop GPU work regardless of preferences"
 msgstr "Sospendi l'elaborazione della GPU indipendentemente dalle preferenze"
 
-#: clientgui/AdvancedFrame.cpp:540
-msgid "Network activity always available"
-msgstr "Attività di rete sempre disponibile"
+#: clientgui/AdvancedFrame.cpp:574
+msgid "Network activity always allowed"
+msgstr "Attività di rete sempre permessa"
 
-#: clientgui/AdvancedFrame.cpp:541
+#: clientgui/AdvancedFrame.cpp:575
 msgid "Allow network activity regardless of preferences"
 msgstr "Permetti l'attività di rete senza interruzioni e indipendentemente dalle preferenze"
 
-#: clientgui/AdvancedFrame.cpp:545
+#: clientgui/AdvancedFrame.cpp:579
 msgid "Network activity based on preferences"
 msgstr "Attività di rete secondo le pr&eferenze"
 
-#: clientgui/AdvancedFrame.cpp:546
+#: clientgui/AdvancedFrame.cpp:580
 msgid "Allow network activity according to preferences"
 msgstr "Permetti l'attività di rete secondo le preferenze"
 
-#: clientgui/AdvancedFrame.cpp:550
+#: clientgui/AdvancedFrame.cpp:584
 msgid "Network activity suspended"
 msgstr "Attività di rete s&ospesa"
 
-#: clientgui/AdvancedFrame.cpp:551
+#: clientgui/AdvancedFrame.cpp:585
 msgid "Stop BOINC network activity"
 msgstr "Sospendi l'attività di rete indipendentemente dalle preferenze"
 
-#: clientgui/AdvancedFrame.cpp:561
-#, c-format
-msgid "Connect to another computer running %s"
-msgstr "Stabilisce una connessione ad un altro computer in cui è attivo %s"
+#: clientgui/AdvancedFrame.cpp:594
+msgid "Computing &preferences..."
+msgstr "&Preferenze di elaborazione..."
 
-#: clientgui/AdvancedFrame.cpp:566
-msgid "Select computer..."
-msgstr "Seleziona un computer..."
+#: clientgui/AdvancedFrame.cpp:595
+msgid "Configure computing preferences"
+msgstr "Configura le preferenze locali di elaborazione"
 
-#: clientgui/AdvancedFrame.cpp:571
-msgid "Shut down connected client..."
-msgstr "Arresta il client attualmente connesso..."
+#: clientgui/AdvancedFrame.cpp:600
+msgid "Exclusive applications..."
+msgstr "Applicazioni esclusive..."
 
-#: clientgui/AdvancedFrame.cpp:572
-msgid "Shut down the currently connected client"
-msgstr "Arresta tutte le elaborazioni in corso"
+#: clientgui/AdvancedFrame.cpp:601
+msgid "Configure exclusive applications"
+msgstr "Configura applicazioni esclusive"
 
-#: clientgui/AdvancedFrame.cpp:576
-msgid "Run CPU &benchmarks"
-msgstr "Esegui i &benchmark per la CPU"
+#: clientgui/AdvancedFrame.cpp:606
+msgid "Select columns..."
+msgstr "Seleziona colonne..."
+
+#: clientgui/AdvancedFrame.cpp:607
+msgid "Select which columns to display"
+msgstr "Seleziona le colonne da visualizzare"
 
-#: clientgui/AdvancedFrame.cpp:577
-msgid "Runs BOINC CPU benchmarks"
-msgstr "Esegue i benchmark di BOINC per la CPU"
+#: clientgui/AdvancedFrame.cpp:611
+msgid "Event Log options...\tCtrl+Shift+F"
+msgstr "Opzioni Log Eventi...⇥Ctrl+Shift+F"
 
-#: clientgui/AdvancedFrame.cpp:581
-msgid "Do network communication"
-msgstr "Ritenta le &comunicazioni di rete"
+#: clientgui/AdvancedFrame.cpp:612
+msgid "Enable or disable various diagnostic messages"
+msgstr "Abilita o disabilita vari messaggi di diagnostica"
+
+#: clientgui/AdvancedFrame.cpp:616
+msgid "&Other options..."
+msgstr "Altre &opzioni..."
 
-#: clientgui/AdvancedFrame.cpp:582
-msgid "Do all pending network communication"
-msgstr "Ritenta tutte le comunicazioni di rete rinviate"
+#: clientgui/AdvancedFrame.cpp:617
+msgid "Configure display options and network settings"
+msgstr "Configura le opzioni del display e le impostazioni di rete"
 
-# 94%
-#: clientgui/AdvancedFrame.cpp:586
+#: clientgui/AdvancedFrame.cpp:622
 msgid "Read config files"
 msgstr "Leggi i file di configurazione"
 
-#: clientgui/AdvancedFrame.cpp:587
-msgid "Read configuration info from cc_config.xml and any app_config.xml files"
+#: clientgui/AdvancedFrame.cpp:623
+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:591
+#: clientgui/AdvancedFrame.cpp:627
 msgid "Read local prefs file"
 msgstr "Leggi il file delle preferenze locali"
 
-#: clientgui/AdvancedFrame.cpp:592
+#: clientgui/AdvancedFrame.cpp:628
 msgid "Read preferences from global_prefs_override.xml."
 msgstr "Leggi le preferenze dal file global_prefs_override.xml"
 
-#: clientgui/AdvancedFrame.cpp:597
-#, c-format
-msgid "Launch another instance of %s..."
-msgstr "Avvio delle altre istanze di %s..."
-
-#: clientgui/AdvancedFrame.cpp:601
-#, c-format
-msgid "Launch another %s"
-msgstr "Avvio di un altro %s"
-
-#: clientgui/AdvancedFrame.cpp:611
-msgid "Event Log...\tCtrl+Shift+E"
-msgstr "Lista degli eventi...\t Ctrl+Shift+E"
-
-#: clientgui/AdvancedFrame.cpp:612
-msgid "Display diagnostic messages."
-msgstr "Visualizza i messaggi di diagnostica del client."
-
-#: clientgui/AdvancedFrame.cpp:616
-msgid "Event Log Diagnostic Flags...\tCtrl+Shift+F"
-msgstr "Flag Della Diagnostica Eventi...\tCtrl+Shift+F"
-
-#: clientgui/AdvancedFrame.cpp:617
-msgid "Enable or disable various diagnostic messages"
-msgstr "Abilita o disabilita vari messaggi di diagnostica"
-
-#: clientgui/AdvancedFrame.cpp:626
+#: clientgui/AdvancedFrame.cpp:636
 #, c-format
 msgid "%s &help"
 msgstr "&Aiuto su %s"
 
-#: clientgui/AdvancedFrame.cpp:632
+#: clientgui/AdvancedFrame.cpp:640
 #, c-format
 msgid "Show information about %s"
 msgstr "Mostra le informazioni su %s"
 
-#: clientgui/AdvancedFrame.cpp:644
+#: clientgui/AdvancedFrame.cpp:650
 #, c-format
 msgid "&%s help"
 msgstr "Aiuto sul &%s"
 
-#: clientgui/AdvancedFrame.cpp:650
+#: clientgui/AdvancedFrame.cpp:654
 #, c-format
 msgid "Show information about the %s"
 msgstr "Mostra le informazioni sul %s"
 
-#: clientgui/AdvancedFrame.cpp:662
+#: clientgui/AdvancedFrame.cpp:665
 #, c-format
 msgid "%s &web site"
 msgstr "sito &web di %s"
 
-#: clientgui/AdvancedFrame.cpp:668
+#: clientgui/AdvancedFrame.cpp:669
 #, 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:680 clientgui/BOINCTaskBar.cpp:544
 #, c-format
 msgid "&About %s..."
 msgstr "&Informazioni sul %s..."
@@ -540,27 +540,27 @@ msgid "&View"
 msgstr "&Visualizza"
 
 #: clientgui/AdvancedFrame.cpp:701
-msgid "&Tools"
-msgstr "&Strumenti"
-
-#: clientgui/AdvancedFrame.cpp:705
 msgid "&Activity"
 msgstr "&Attività"
 
+#: clientgui/AdvancedFrame.cpp:705
+msgid "&Options"
+msgstr "&Opzioni"
+
 #: clientgui/AdvancedFrame.cpp:709
-msgid "A&dvanced"
-msgstr "Ava&nzate"
+msgid "&Tools"
+msgstr "&Strumenti"
 
 #: clientgui/AdvancedFrame.cpp:713
 msgid "&Help"
 msgstr "A&iuto"
 
-#: clientgui/AdvancedFrame.cpp:1185
+#: clientgui/AdvancedFrame.cpp:1188
 #, c-format
 msgid "%s - Stop using %s"
 msgstr "%s - Arresto nell'uso di %s"
 
-#: clientgui/AdvancedFrame.cpp:1190
+#: clientgui/AdvancedFrame.cpp:1193
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -568,48 +568,41 @@ msgid ""
 "but you'll have to manage projects manually.\n"
 "\n"
 "Do you want to stop using %s?"
-msgstr ""
-"Se tu finisci di usare %s,\n"
-"manterrai tutti i tuoi progetti correnti,\n"
-"ma dovrai gestirli manualmente.\n"
-"\n"
-"Vuoi finire di usare %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:1397
+#: clientgui/AdvancedFrame.cpp:1420
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s - Chiudi il client corrente..."
 
-#: clientgui/AdvancedFrame.cpp:1406
+#: clientgui/AdvancedFrame.cpp:1429
 #, 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,\n"
-"e ti chiederà di indicarne un altro a cui connettersi."
+msgstr "%s chiuderà il client attualmente connesso,\ne ti chiederà di indicarne un altro a cui connettersi."
 
-#: clientgui/AdvancedFrame.cpp:1806
+#: clientgui/AdvancedFrame.cpp:1832
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: clientgui/AdvancedFrame.cpp:1815
+#: clientgui/AdvancedFrame.cpp:1841
 #, c-format
 msgid "%s has successfully added %s"
 msgstr "%s ha aggiunto con successo %s"
 
-#: clientgui/AdvancedFrame.cpp:1953
+#: clientgui/AdvancedFrame.cpp:1977
 #, c-format
 msgid "%s - (%s)"
 msgstr "%s - (%s)"
 
-#: clientgui/AdvancedFrame.cpp:1957
+#: clientgui/AdvancedFrame.cpp:1981
 #, c-format
 msgid "Connecting to %s"
 msgstr "Connessione a %s in corso"
 
-#: clientgui/AdvancedFrame.cpp:1960
+#: clientgui/AdvancedFrame.cpp:1984
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "Connesso a %s (%s)"
@@ -624,11 +617,7 @@ msgid ""
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"Un account con il nome utente specificato esiste già e ha una\n"
-"password diversa da quella appena inserita.\n"
-"\n"
-"Visita il sito web del progetto e segui le istruzioni riportate."
+msgstr "Un account con il nome utente specificato esiste già e ha una\npassword diversa da quella appena inserita.\n\nVisita il sito web del progetto e segui le istruzioni riportate."
 
 #: clientgui/AlreadyExistsPage.cpp:191
 msgid "Email address already in use"
@@ -640,11 +629,7 @@ msgid ""
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"Un account con l'indirizzo e-mail specificato esiste già e ha una\n"
-"password diversa da quella appena inserita.\n"
-"\n"
-"Visita il sito web del progetto e segui le istruzioni riportate."
+msgstr "Un account con l'indirizzo e-mail specificato esiste già e ha una\npassword diversa da quella appena inserita.\n\nVisita il sito web del progetto e segui le istruzioni riportate."
 
 #: clientgui/AsyncRPC.cpp:1031
 msgid "Communicating with BOINC client.  Please wait ..."
@@ -669,89 +654,76 @@ msgstr "%s - Comunicazione"
 msgid "Cancel"
 msgstr "Annulla"
 
-#: clientgui/BOINCBaseFrame.cpp:504
+#: clientgui/BOINCBaseFrame.cpp:512
 #, c-format
 msgid "%s - Connection Error"
 msgstr "%s - Errore di connessione"
 
-#: clientgui/BOINCBaseFrame.cpp:513
+#: 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 ""
-"Non sei autorizzato a gestire il client BOINC.\n"
-"Contatta l'amministratore del computer per aggiungere il tuo account al gruppo 'boinc_users'."
+msgstr "Non sei autorizzato a gestire il client BOINC.\nContatta l'amministratore del computer per aggiungere il tuo account al gruppo 'boinc_users'."
 
-#: clientgui/BOINCBaseFrame.cpp:522
+#: 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 ""
-"Autorizzazione fallita durante la connessione al client BOINC in esecuzione.\n"
-"Assicurati di avviare questo programma dalla stessa cartella."
+msgstr "Autorizzazione fallita durante la connessione al client BOINC in esecuzione.\nAssicurati di avviare questo programma dalla stessa cartella."
 
-#: clientgui/BOINCBaseFrame.cpp:524
+#: clientgui/BOINCBaseFrame.cpp:532
 msgid "Authorization failed connecting to running client."
 msgstr "Autorizzazione fallita durante la connessione al client BOINC in esecuzione."
 
-#: clientgui/BOINCBaseFrame.cpp:532
+#: clientgui/BOINCBaseFrame.cpp:540
 msgid "The password you have provided is incorrect, please try again."
 msgstr "La password inserita non è corretta, riprova ancora."
 
-#: clientgui/BOINCBaseFrame.cpp:576
+#: clientgui/BOINCBaseFrame.cpp:584
 #, c-format
 msgid "%s - Connection Failed"
 msgstr "%s - Connessione fallita"
 
-#: clientgui/BOINCBaseFrame.cpp:585
+#: 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 non può connettersi al client %s.\n"
-"Ritentare la connessione?"
+msgstr "%s non può connettersi al client %s.\nRitentare la connessione?"
 
-#: clientgui/BOINCBaseFrame.cpp:621
+#: clientgui/BOINCBaseFrame.cpp:629
 #, c-format
 msgid "%s - Daemon Start Failed"
 msgstr "%s - Avvio del servizio non riuscito"
 
-#: clientgui/BOINCBaseFrame.cpp:631
+#: 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 non riesce ad avviare il client %s.\n"
-"Vai su Pannello di controllo->Strumenti di amministrazione->Servizi componenti ed avvia il servizio BOINC."
+msgstr "%s non riesce ad avviare il client %s.\nVai su Pannello di controllo->Strumenti di amministrazione->Servizi componenti ed avvia il servizio BOINC."
 
-#: clientgui/BOINCBaseFrame.cpp:637
+#: 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 non riesce ad avviare il client %s.\n"
-"Avvia il servizio e riprova."
+msgstr "%s non riesce ad avviare il client %s.\nAvvia il servizio e riprova."
 
-#: clientgui/BOINCBaseFrame.cpp:688
+#: clientgui/BOINCBaseFrame.cpp:696
 #, c-format
 msgid "%s - Connection Status"
 msgstr "%s - Stato della connessione"
 
-#: clientgui/BOINCBaseFrame.cpp:699
+#: clientgui/BOINCBaseFrame.cpp:707
 #, 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"
 "To connect up to your local computer please use 'localhost' as the host name."
-msgstr ""
-"%s al momento non è connesso al client %s.\n"
-"Usa l'opzione del menù 'Avanzate\\Seleziona un computer...' per connettersi al client %s.\n"
-"Per connetterti al computer locale usa 'localhost' come 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."
 
-#: clientgui/BOINCBaseView.cpp:752
+#: clientgui/BOINCBaseView.cpp:790
 msgid "Project web pages"
 msgstr "Siti web del progetto"
 
@@ -765,9 +737,7 @@ msgstr "%s - Disconnessione Inaspettata "
 msgid ""
 "The %s client has exited unexpectedly 3 times within the last %d minutes.\n"
 "Would you like to restart it again?"
-msgstr ""
-"Il client %s si è disconnesso in modo imprevisto 3 volte negli ultimi %d minuti.\n"
-"Vuoi ricollegarti?"
+msgstr "Il client %s si è disconnesso in modo imprevisto 3 volte negli ultimi %d minuti.\nVuoi ricollegarti?"
 
 #: clientgui/BOINCDialupManager.cpp:61
 #, c-format
@@ -779,9 +749,7 @@ msgstr "%s - Stato della rete"
 msgid ""
 "%s needs to connect to the Internet.\n"
 "May it do so now?"
-msgstr ""
-"%s deve connettersi a Internet.\n"
-"Può farlo ora?"
+msgstr "%s deve connettersi a Internet.\nPuò farlo ora?"
 
 #: clientgui/BOINCDialupManager.cpp:254
 #, c-format
@@ -803,9 +771,7 @@ msgstr "%s non è riuscito a connettersi a Internet."
 msgid ""
 "%s has detected it is now connected to the Internet.\n"
 "Updating all projects and retrying all transfers."
-msgstr ""
-"%s ha individuato una connessione a Internet.\n"
-"L'aggiornamento di tutti i progetti e i nuovi tentativi di trasferimento sono in corso."
+msgstr "%s ha individuato una connessione a Internet.\nL'aggiornamento di tutti i progetti e i nuovi tentativi di trasferimento sono in corso."
 
 #: clientgui/BOINCDialupManager.cpp:417
 #, c-format
@@ -817,7 +783,7 @@ msgstr "%s è riuscito a disconnettersi da Internet."
 msgid "%s failed to disconnected from the Internet."
 msgstr "%s non è riuscito a disconnettersi da Internet."
 
-#: clientgui/BOINCGUIApp.cpp:595
+#: clientgui/BOINCGUIApp.cpp:597
 #, c-format
 msgid ""
 "You currently are not authorized to manage the client.\n"
@@ -828,102 +794,90 @@ msgid ""
 " or\n"
 "  - contact your administrator to add you to the 'boinc_master'\n"
 "     user group."
-msgstr ""
-"Non sei autorizzato a gestire il client.\n"
-"\n"
-"Per avviare %s come utente semplice:\n"
-"  - reinstalla %s rispondendo \"Si\" alla domanda sugli\n"
-"     utenti non-amministratori\n"
-" o\n"
-"  - contatta l'amministratore del computer per aggiungere il tuo \n"
-"     account al gruppo 'boinc_master'."
-
-#: clientgui/BOINCGUIApp.cpp:601
+msgstr "Non sei autorizzato a gestire il client.\n\nPer avviare %s come utente semplice:\n  - reinstalla %s rispondendo \"Si\" alla domanda sugli\n     utenti non-amministratori\n o\n  - contatta l'amministratore del computer per aggiungere il tuo \n     account al gruppo 'boinc_master'."
+
+#: clientgui/BOINCGUIApp.cpp:603
 #, c-format
 msgid ""
 "%s ownership or permissions are not set properly; please reinstall %s.\n"
 "(Error code %d"
-msgstr ""
-"La proprietà o i permessi di %s non sono impostati correttamente; per risolvere il problema installa nuovamente %s.\n"
-"(Codice errore %d)"
+msgstr "La proprietà o i permessi di %s non sono impostati correttamente; per risolvere il problema installa nuovamente %s.\n(Codice errore %d)"
 
-#: clientgui/BOINCGUIApp.cpp:607
+#: clientgui/BOINCGUIApp.cpp:609
 msgid " at "
 msgstr "a"
 
-#: clientgui/BOINCGUIApp.cpp:610
+#: clientgui/BOINCGUIApp.cpp:612
 msgid ")"
 msgstr ")"
 
-#: clientgui/BOINCGUIApp.cpp:640
+#: 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 ""
-"Per un corretto funzionamento di BOINC è necessario riavviare il sistema.\n"
-"Riavvia e prova nuovamente."
+msgstr "Per un corretto funzionamento di BOINC è necessario riavviare il sistema.\nRiavvia e prova nuovamente."
 
-#: clientgui/BOINCGUIApp.cpp:641
+#: clientgui/BOINCGUIApp.cpp:643
 msgid "BOINC Manager"
 msgstr "BOINC Manager"
 
-#: clientgui/BOINCGUIApp.cpp:902
+#: clientgui/BOINCGUIApp.cpp:904
 msgid "BOINC Manager was started by the operating system automatically"
 msgstr "BOINC Manager è stato avviato dal sistema operativo in modo automatico"
 
-#: clientgui/BOINCGUIApp.cpp:904
+#: clientgui/BOINCGUIApp.cpp:906
 msgid "Startup BOINC so only the system tray icon is visible"
 msgstr "Avvia BOINC in modo che sia visibile solo l'icona nella barra di sistema"
 
-#: clientgui/BOINCGUIApp.cpp:906
+#: clientgui/BOINCGUIApp.cpp:908
 msgid "Directory containing the BOINC Client executable"
 msgstr "Cartella contenente file eseguibili del client BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:907
+#: clientgui/BOINCGUIApp.cpp:909
 msgid "BOINC data directory"
 msgstr "Cartella dei dati di BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:909
+#: clientgui/BOINCGUIApp.cpp:911
 msgid "Host name or IP address"
 msgstr "Nome del host o indirizzo IP"
 
-#: clientgui/BOINCGUIApp.cpp:910
+#: clientgui/BOINCGUIApp.cpp:912
 msgid "GUI RPC port number"
 msgstr "Numero della porta GUI RPC"
 
-#: clientgui/BOINCGUIApp.cpp:911
+#: clientgui/BOINCGUIApp.cpp:913
 msgid "Password"
 msgstr "Chiave d'accesso"
 
-#: clientgui/BOINCGUIApp.cpp:912
+#: clientgui/BOINCGUIApp.cpp:914
 msgid "Startup BOINC with these optional arguments"
 msgstr "Avvia BOINC con questi parametri opzionali"
 
-#: clientgui/BOINCGUIApp.cpp:913
+#: clientgui/BOINCGUIApp.cpp:915
 msgid "disable BOINC security users and permissions"
 msgstr "disabilita la sicurezza utenti e i permessi di BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:914
+#: clientgui/BOINCGUIApp.cpp:916
 msgid "set skin debugging mode to enable skin manager error messages"
 msgstr "imposta la modalità di debug per la visualizzazione per abilitarne i messaggi di errore del gestore"
 
-#: clientgui/BOINCGUIApp.cpp:915
+#: clientgui/BOINCGUIApp.cpp:917
 msgid "multiple instances of BOINC Manager allowed"
 msgstr "Sono consentite istanze multiple del BOINC Manager"
 
-#: clientgui/BOINCGUIApp.cpp:917
+#: clientgui/BOINCGUIApp.cpp:919
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr "Non utilizzato: workaround per il bug in XCode 4.2"
 
-#: clientgui/BOINCGUIApp.cpp:1164
+#: clientgui/BOINCGUIApp.cpp:1166
 msgid "(Automatic Detection)"
 msgstr "(Rilevazione automatica)"
 
-#: clientgui/BOINCGUIApp.cpp:1165
+#: clientgui/BOINCGUIApp.cpp:1167
 msgid "(Unknown)"
 msgstr "(Sconosciuto)"
 
-#: clientgui/BOINCGUIApp.cpp:1166
+#: clientgui/BOINCGUIApp.cpp:1168
 msgid "(User Defined)"
 msgstr "(Stabilito dall'utente)"
 
@@ -937,14 +891,12 @@ msgstr "Apri %s Web..."
 msgid "Open %s..."
 msgstr "Apri %s..."
 
-#: clientgui/BOINCTaskBar.cpp:536
-#: clientgui/BOINCTaskBar.cpp:633
+#: clientgui/BOINCTaskBar.cpp:536 clientgui/BOINCTaskBar.cpp:633
 #: clientgui/BOINCTaskBar.cpp:641
 msgid "Snooze"
 msgstr "Sospendi tutto"
 
-#: clientgui/BOINCTaskBar.cpp:538
-#: clientgui/BOINCTaskBar.cpp:660
+#: clientgui/BOINCTaskBar.cpp:538 clientgui/BOINCTaskBar.cpp:660
 #: clientgui/BOINCTaskBar.cpp:668
 msgid "Snooze GPU"
 msgstr "Ferma GPU"
@@ -1023,15 +975,10 @@ msgid ""
 "Please try again later.\n"
 "\n"
 "Click Finish to close."
-msgstr ""
-"Per favore riprova più tardi.\n"
-"\n"
-"Clicca Fine per chiudere."
+msgstr "Per favore riprova più tardi.\n\nClicca Fine per chiudere."
 
-#: 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 "Clicca su 'Fine' per chiudere."
 
@@ -1051,9 +998,7 @@ msgstr "Questo progetto è stato correttamente aggiunto."
 msgid ""
 "When you click Finish, your web browser will go to a page where\n"
 "you can set your account name and preferences."
-msgstr ""
-"Quando clicchi su Fine, il tuo browser ti reindirizzerà verso una pagina dove\n"
-"potrai gestire il tuo account e le tue preferenze."
+msgstr "Quando clicchi su Fine, il tuo browser ti reindirizzerà verso una pagina dove\npotrai gestire il tuo account e le tue preferenze."
 
 #: clientgui/CompletionPage.cpp:232
 #, c-format
@@ -1099,594 +1044,685 @@ msgstr "Versione dei wxWidget:"
 msgid "Copyright:"
 msgstr "Copyright"
 
-# 98%
 #: clientgui/DlgAbout.cpp:192
 msgid ""
-"(C) 2003-2014 University of California, Berkeley.\n"
+"(C) 2003-2015 University of California, Berkeley.\n"
 "All Rights Reserved."
-msgstr ""
-"(C) 2003-2014 Università della California, Berkeley.\n"
-"Tutti i diritti riservati."
+msgstr "(C) 2003-2015 Università della California, Berkeley.\nTutti i diritti riservati."
 
 #: clientgui/DlgAbout.cpp:196
-msgid "Berkeley Open Infrastructure for Network Computing"
-msgstr ""
-"Traduzione a cura di BOINC.Italy (www.boincitaly.org)\n"
-"\n"
-"Berkeley Open Infrastructure for Network Computing"
+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"
+
+#: clientgui/DlgAbout.cpp:211
+msgid "for more information."
+msgstr "per ulteriori informazioni."
 
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:399
+#: clientgui/DlgAbout.cpp:219 clientgui/DlgExitMessage.cpp:173
+#: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:399
 #: clientgui/DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "&OK"
 
-#: clientgui/DlgAdvPreferences.cpp:602
-msgid "invalid number"
-msgstr "numero non valido"
+#: clientgui/DlgAdvPreferences.cpp:669
+msgid "Invalid number"
+msgstr "Numero non valido"
 
-#: clientgui/DlgAdvPreferences.cpp:603
-msgid "invalid time, format is HH:MM"
-msgstr "orario non valido, il formato deve essere HH:MM"
+#: clientgui/DlgAdvPreferences.cpp:670
+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:604
-msgid "invalid time interval, format is HH:MM-HH:MM"
-msgstr "intervallo di tempo non valido, il formato deve essere HH:MM-HH:MM"
+#: clientgui/DlgAdvPreferences.cpp:671
+msgid "Number must be between 0 and 10"
+msgstr "Il numero deve essere compreso tra 0 e 10"
 
-#: clientgui/DlgAdvPreferences.cpp:817
+#: clientgui/DlgAdvPreferences.cpp:672
+msgid "Number must be between 0 and 100"
+msgstr "I numeri devono essere compresi tra 0 e 100"
+
+#: clientgui/DlgAdvPreferences.cpp:905
 msgid "invalid input value detected"
 msgstr "trovato un valore inserito non valido"
 
-#: clientgui/DlgAdvPreferences.cpp:819
+#: clientgui/DlgAdvPreferences.cpp:907
 msgid "Validation Error"
 msgstr "Errore di validazione"
 
-#: clientgui/DlgAdvPreferences.cpp:969
-#: clientgui/DlgAdvPreferences.cpp:975
-#: clientgui/DlgAdvPreferences.cpp:981
-msgid "Applications to add"
-msgstr "Applicazioni da aggiungere"
-
-#: clientgui/DlgAdvPreferences.cpp:998
-#, c-format
-msgid "'%s' is not an executable application."
-msgstr "%s non è un'applicazione eseguibile"
-
-#: clientgui/DlgAdvPreferences.cpp:999
-#: clientgui/DlgAdvPreferences.cpp:1046
-#: clientgui/DlgAdvPreferences.cpp:1070
-msgid "Add Exclusive App"
-msgstr "Aggiungi Applicazione Esclusiva"
-
-#: clientgui/DlgAdvPreferences.cpp:1011
-msgid "Name of application to add?"
-msgstr "Nome dell'applicazione da aggiungere?"
-
-# 88%
-#: clientgui/DlgAdvPreferences.cpp:1011
-msgid "Add exclusive app"
-msgstr "Aggiungi applicazioni esclusive"
-
-#: clientgui/DlgAdvPreferences.cpp:1045
-#, c-format
-msgid "Application names must end with '%s'"
-msgstr "I nomi delle applicazioni devono finire con '%s'"
-
-#: clientgui/DlgAdvPreferences.cpp:1069
-#, c-format
-msgid "'%s' is already in the list."
-msgstr "'%s' è già nella lista."
-
-#: clientgui/DlgAdvPreferences.cpp:1161
-msgid ""
-"Do you really want to clear all local preferences?\n"
-"(This will not affect exclusive applications.)"
-msgstr ""
-"Vuoi veramente cancellare tutte le tue preferenze locali?\n"
-"(Questo non modificherà le applicazioni esclusive.)"
+#: clientgui/DlgAdvPreferences.cpp:1119
+msgid "Discard local preferences and use web-based preferences?"
+msgstr "Scartare le preferenze locali e utilizzare quelle web?"
 
-#: clientgui/DlgAdvPreferences.cpp:1162
+#: clientgui/DlgAdvPreferences.cpp:1120
 msgid "Confirmation"
 msgstr "Conferma"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:49
+#: clientgui/DlgAdvPreferencesBase.cpp:54
 #, c-format
 msgid "%s - Computing preferences"
 msgstr "%s - Preferenze di elaborazione"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:66
+#: clientgui/DlgAdvPreferencesBase.cpp:77
 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 ""
-"Da qui puoi impostare le preferenze solo per questo computer.\n"
-"Clicca OK per impostare le preferenze.\n"
-"Clicca sul pulsante Rimuovi per ripristinare l'uso delle impostazioni via web (tranne per le applicazioni esclusive)."
-
-#: clientgui/DlgAdvPreferencesBase.cpp:69
-msgid "Clear"
-msgstr "Rimuovi"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:70
-msgid "clear all local preferences and close the dialog"
-msgstr "rimuovi tutte le preferenze locali e chiudi la finestra"
+"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
-msgid "processor usage"
-msgstr "uso del processore"
+msgid "Using web-based preferences from"
+msgstr "Preferenze web in uso da"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:88
-msgid "network usage"
-msgstr "uso della rete"
+#: clientgui/DlgAdvPreferencesBase.cpp:102
+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:91
-msgid "disk and memory usage"
-msgstr "uso del disco e della memoria"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:94
-msgid "exclusive applications"
-msgstr "applicazioni esclusive"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:107
-#: clientgui/DlgDiagnosticLogFlags.cpp:104
-msgid "OK"
-msgstr "OK"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:108
-msgid "save all values and close the dialog"
-msgstr "salva tutto e chiudi la finestra"
+#: clientgui/DlgAdvPreferencesBase.cpp:111
+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
-msgid "close the dialog without saving"
-msgstr "chiudi la finestra senza salvare"
+msgid "Clear"
+msgstr "Rimuovi"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:115
+msgid "Clear all local preferences and close the dialog."
+msgstr "Cancella tutte le preferenze locali e chiudi la finestra."
 
 #: clientgui/DlgAdvPreferencesBase.cpp:118
-#: clientgui/Localization.cpp:35
-#: clientgui/Localization.cpp:121
-#: clientgui/Localization.cpp:139
-msgid "Help"
-msgstr "Aiuto"
+msgid "Use web prefs"
+msgstr "Usa le preferenze web"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:119
-msgid "shows the preferences web page"
-msgstr "mostra la pagina web di aiuto sulle preferenze"
+msgid "Restore web-based preferences and close the dialog."
+msgstr "Ripristina le preferenze web e chiudi la finestra."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:141
-msgid "Computing allowed"
-msgstr "Elaborazione abilitata"
+#: clientgui/DlgAdvPreferencesBase.cpp:143
+#: clientgui/DlgAdvPreferencesBase.cpp:637
+msgid "Computing"
+msgstr "Computazione"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:146
-msgid "While computer is on batteries"
-msgstr "Quando il computer va a batterie"
+#: clientgui/DlgAdvPreferencesBase.cpp:785
+msgid "Network"
+msgstr "Rete"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:149
-msgid "check this if you want this computer to do work while it runs on batteries"
-msgstr "spunta questa voce se vuoi che il computer elabori anche se è alimentato a batteria"
+msgid "Disk and memory"
+msgstr "Disco e memoria"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:155
-msgid "While computer is in use"
-msgstr "Quando il computer è in uso"
+#: clientgui/DlgAdvPreferencesBase.cpp:152
+msgid "Daily schedules"
+msgstr "Programmazioni giornaliere"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:158
-msgid "check this if you want this computer to do work even when you're using it"
-msgstr "spunta questa voce se vuoi che il computer elabori anche quando lo stai utilizzando"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:164
-msgid "Use GPU while computer is in use"
-msgstr "Usa GPU mentre il computer è in uso"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:167
-msgid "check this if you want your GPU to do work even when you're using the computer"
-msgstr "spunta questa voce se vuoi che la GPU elabori anche quando stai utilizzando il computer"
+#: clientgui/DlgAdvPreferencesBase.cpp:165
+#: clientgui/DlgDiagnosticLogFlags.cpp:119 clientgui/DlgExclusiveApps.cpp:146
+#: clientgui/DlgHiddenColumns.cpp:100
+msgid "OK"
+msgstr "OK"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:179
-msgid "Only after computer has been idle for"
-msgstr "Solamente quando il computer è inutilizzato da più di"
+#: clientgui/DlgAdvPreferencesBase.cpp:166
+msgid "Save all values and close the dialog."
+msgstr "Salva tutti i valori e chiude la finestra."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:188
-msgid "do work only after you haven't used the computer for this number of minutes"
-msgstr "elabora solo dopo che il computer non è utilizzato per questo numero di minuti"
+#: clientgui/DlgAdvPreferencesBase.cpp:172
+msgid "Close the dialog without saving."
+msgstr "Chiudi la finestra senza salvare."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:193
-#: clientgui/DlgAdvPreferencesBase.cpp:342
-msgid "minutes"
-msgstr "minuti"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:212
-msgid "While processor usage is less than"
-msgstr "Quando l'utilizzo del processore è minore del"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:221
-msgid "suspend work if processor usage exceeds this level"
-msgstr "sospendere i lavori se l'utilizzo del processore supera questo livello"
+#: clientgui/DlgAdvPreferencesBase.cpp:176 clientgui/DlgExclusiveApps.cpp:157
+msgid "Help"
+msgstr "Aiuto"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:226
-msgid "percent (0 means no restriction)"
-msgstr "percento (0 indica nessuna restrizione)"
+#: clientgui/DlgAdvPreferencesBase.cpp:177
+msgid "Shows the preferences web page."
+msgstr "Mostra la pagina web sulle preferenze"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:240
-#: clientgui/DlgAdvPreferencesBase.cpp:506
-msgid "Every day between hours of"
-msgstr "Ogni giorno tra le"
+#: clientgui/DlgAdvPreferencesBase.cpp:239
+#: clientgui/DlgAdvPreferencesBase.cpp:425
+msgid "Usage limits"
+msgstr "Limite di utilizzo"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:244
-msgid "start work at this time"
-msgstr "inizia l'elaborazione a quest'ora"
+#, 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:248
-#: clientgui/DlgAdvPreferencesBase.cpp:514
-msgid "and"
-msgstr "e le"
+#: clientgui/DlgAdvPreferencesBase.cpp:246
+#: clientgui/DlgAdvPreferencesBase.cpp:258
+msgid "Use at most"
+msgstr "Usa al massimo"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:252
-msgid "stop work at this time"
-msgstr "sospende l'elaborazione a quest'ora"
+#: clientgui/DlgAdvPreferencesBase.cpp:251
+#, no-c-format
+msgid "% of the CPUs"
+msgstr "% delle CPU"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:256
-#: clientgui/DlgAdvPreferencesBase.cpp:522
-msgid "(no restriction if equal)"
-msgstr "(nessuna restrizione se sono uguali)"
+#, 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."
+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:261
-#: clientgui/DlgAdvPreferencesBase.cpp:527
-msgid "Day-of-week override:"
-msgstr "Impostazioni speciali per alcuni giorni della settimana:"
+#: clientgui/DlgAdvPreferencesBase.cpp:263
+#, no-c-format
+msgid "% of CPU time"
+msgstr "% del tempo della CPU"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:266
-#: clientgui/DlgAdvPreferencesBase.cpp:532
-msgid "check box to specify hours for this day of week"
-msgstr "spunta la voce del giorno della settimana per specificare le ore di funzionamento"
+#: clientgui/DlgAdvPreferencesBase.cpp:270
+msgid "When to suspend"
+msgstr "Quando sospendere"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:272
-#: clientgui/DlgAdvPreferencesBase.cpp:538
-msgid "Monday"
-msgstr "Lunedì"
+#: clientgui/DlgAdvPreferencesBase.cpp:276
+msgid "Suspend when computer is on battery"
+msgstr "Sospendi quando il computer è alimentato a batteria"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:279
-#: clientgui/DlgAdvPreferencesBase.cpp:545
-msgid "Tuesday"
-msgstr "Martedì"
+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:286
-#: clientgui/DlgAdvPreferencesBase.cpp:552
-msgid "Wednesday"
-msgstr "Mercoledì"
+#: clientgui/DlgAdvPreferencesBase.cpp:285
+msgid "Suspend when computer is in use"
+msgstr "Sospendi quando il computer è in uso"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:293
-#: clientgui/DlgAdvPreferencesBase.cpp:559
-msgid "Thursday"
-msgstr "Giovedì"
+#: clientgui/DlgAdvPreferencesBase.cpp:288
+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:300
-#: clientgui/DlgAdvPreferencesBase.cpp:566
-msgid "Friday"
-msgstr "Venerdì"
+#: clientgui/DlgAdvPreferencesBase.cpp:294
+msgid "Suspend GPU computing when computer is in use"
+msgstr "Sospendo l'elaborazione GPU quando il computer è in uso"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:307
-#: clientgui/DlgAdvPreferencesBase.cpp:573
-msgid "Saturday"
-msgstr "Sabato"
+#: clientgui/DlgAdvPreferencesBase.cpp:297
+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
+msgid "This determines when the computer is considered 'in use'."
+msgstr "Questo determina quando il computer è considerato 'in uso'."
+
+#: clientgui/DlgAdvPreferencesBase.cpp:306
+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:580
-msgid "Sunday"
-msgstr "Domenica"
+#: clientgui/DlgAdvPreferencesBase.cpp:387
+msgid "minutes"
+msgstr "minuti"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:328
-msgid "Other options"
-msgstr "Altre opzioni"
+#: 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:336
-msgid "Switch between applications every"
-msgstr "Cambia applicazione ogni"
+#: clientgui/DlgAdvPreferencesBase.cpp:323
+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
+msgid "Other"
+msgstr "Altro"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:345
-msgid "On multiprocessor systems, use at most"
-msgstr "Sui sistemi multiprocessore, usa al massimo"
+#: clientgui/DlgAdvPreferencesBase.cpp:349
+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
-#, no-c-format
-msgid "% of the processors (0 means no restriction)"
-msgstr "% dei processori (0 significa ignora questa impostazione)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:355
-#: clientgui/DlgAdvPreferencesBase.cpp:618
-#: clientgui/DlgAdvPreferencesBase.cpp:640
-#: clientgui/DlgAdvPreferencesBase.cpp:661
-#: clientgui/DlgAdvPreferencesBase.cpp:683
-#: clientgui/DlgAdvPreferencesBase.cpp:694
-msgid "Use at most"
-msgstr "Usa al massimo"
+msgid "Store at least"
+msgstr "Memorizza almeno"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:362
-#, no-c-format
-msgid "% of CPU time (0 means no restriction)"
-msgstr "% del tempo CPU (0 significa ignora questa impostazione)"
+#: clientgui/DlgAdvPreferencesBase.cpp:360
+#: clientgui/DlgAdvPreferencesBase.cpp:376
+msgid "days of work"
+msgstr "giorni di lavoro"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:386
-msgid "General options"
-msgstr "Opzioni generali"
+#: clientgui/DlgAdvPreferencesBase.cpp:365
+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:395
-msgid "Maximum download rate"
-msgstr "Velocità massima di scaricamento"
+#: clientgui/DlgAdvPreferencesBase.cpp:368
+msgid "Store up to an additional"
+msgstr "Memorizza fino ad ulteriori"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:401
-#: clientgui/DlgAdvPreferencesBase.cpp:410
-msgid "KBytes/second (0 means no restriction)"
-msgstr "KBytes/secondo (0 significa ignora questa impostazione)"
+#: clientgui/DlgAdvPreferencesBase.cpp:381
+#, 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:404
-msgid "Maximum upload rate"
-msgstr "Velocità massima di invio"
+#: clientgui/DlgAdvPreferencesBase.cpp:383
+msgid "Switch between tasks every"
+msgstr "Cambia applicazione ogni"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:417
-msgid "Minimum work buffer"
-msgstr "Riserva di lavoro addizionale minima"
+#: clientgui/DlgAdvPreferencesBase.cpp:391
+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:425
-msgid "Try to maintain enough tasks to keep busy for this many days"
-msgstr "Cerca di mantenere sufficienti lavori per rimanere occupato per questi giorni"
+#: clientgui/DlgAdvPreferencesBase.cpp:392
+msgid "Request tasks to checkpoint at most every"
+msgstr "Richiedi alle elaborazioni dei checkpoint al massimo ogni"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:396
+msgid "seconds"
+msgstr "secondi"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:431
-#: clientgui/DlgAdvPreferencesBase.cpp:449
-msgid "days (maximum value: 10)"
-msgstr "giorni (valore massimo: 10)"
+msgid "Limit the download rate of file transfers."
+msgstr "Limita la velocità di download per i trasferimenti dei file."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:437
-msgid "Max additional work buffer"
-msgstr "Riserva di lavoro addizionale massima"
+#: clientgui/DlgAdvPreferencesBase.cpp:432
+msgid "Limit download rate to"
+msgstr "Limita la velocità di download a"
 
+#: clientgui/DlgAdvPreferencesBase.cpp:436
 #: clientgui/DlgAdvPreferencesBase.cpp:445
-msgid "In addition, maintain enough tasks for up to this many days"
-msgstr "In aggiunta, mantieni lavori sufficienti per per questi giorni"
+msgid "KB/second"
+msgstr "KB/secondo"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:440
+msgid "Limit the upload rate of file transfers."
+msgstr "Limita la velocità di upload per i trasferimenti dei file."
+
+#: clientgui/DlgAdvPreferencesBase.cpp:441
+msgid "Limit upload rate to"
+msgstr "Limita la velocità di upload a"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:452
+#, 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
-msgid "Transfer at most"
-msgstr "Trasferisci al massimo"
+msgid "Limit usage to"
+msgstr "Limita l'utilizzo a"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:462
-msgid "MBytes every"
-msgstr "MBytes ogni"
+#: clientgui/DlgAdvPreferencesBase.cpp:458
+msgid "MB every"
+msgstr "MB ogni"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:468
-msgid "days (0 means no restriction)"
-msgstr "giorni (0 significa ignora questa impostazione)"
+#: clientgui/DlgAdvPreferencesBase.cpp:462
+msgid "days"
+msgstr "giorni"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:476
-msgid "Skip image file verification"
-msgstr "Salta la verifica dei file immagine"
+#: clientgui/DlgAdvPreferencesBase.cpp:479
+#, 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:478
-msgid "check this if your Internet provider modifies image files"
-msgstr "spunta questa voce se il tuo provider Internet modifica i file immagine"
+#: clientgui/DlgAdvPreferencesBase.cpp:481
+msgid "Skip data verification for image files"
+msgstr "Salta la verifica dati per i file immagine"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:484
-msgid "Connect options"
-msgstr "Opzioni di connessione"
+#: clientgui/DlgAdvPreferencesBase.cpp:485
+msgid "Confirm before connecting to Internet"
+msgstr "Conferma prima di connettersi ad Internet"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:487
-msgid "Confirm before connecting to internet"
-msgstr "Chiede conferma prima di connettersi ad Internet"
+#: clientgui/DlgAdvPreferencesBase.cpp:486
+#: clientgui/DlgAdvPreferencesBase.cpp:490
+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
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
-msgstr "se la voce è spuntata, sarà chiesta una conferma prima di effettuare una connessione ad Internet"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:493
 msgid "Disconnect when done"
 msgstr "Disconnetti al termine delle operazioni"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:495
-msgid ""
-"if checked, BOINC hangs up when network usage is done\n"
-"(only relevant for dialup-connection)"
-msgstr ""
-"se la voce è spuntata, BOINC riaggancia al termine delle operazioni\n"
-"(rilevante solo per connessioni dialup)"
+#: clientgui/DlgAdvPreferencesBase.cpp:516
+msgid "Disk"
+msgstr "Disco"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:501
-msgid "Network usage allowed"
-msgstr "Uso della rete"
+#: clientgui/DlgAdvPreferencesBase.cpp:521
+#, c-format
+msgid "%s will use the most restrictive of these settings:"
+msgstr "%s utilizzerà le più restrittive di queste impostazioni:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:510
-msgid "network usage start hour"
-msgstr "ora di inizio dell'uso della rete"
+#: clientgui/DlgAdvPreferencesBase.cpp:527
+#, 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:518
-msgid "network usage stop hour"
-msgstr "ora di interruzione dell'uso della rete"
+#: clientgui/DlgAdvPreferencesBase.cpp:530
+#: clientgui/DlgAdvPreferencesBase.cpp:554
+msgid "Use no more than"
+msgstr "Usa non più di"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:610
-#: clientgui/DlgItemProperties.cpp:257
-msgid "Disk usage"
-msgstr "Uso del disco"
+#: clientgui/DlgAdvPreferencesBase.cpp:534
+msgid "GB"
+msgstr "GB"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:622
-msgid "the maximum disk space used by BOINC (in Gigabytes)"
-msgstr "il massimo spazio su disco usato da BOINC (in Gigabytes)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:626
-msgid "Gigabytes disk space (0 means no restriction)"
-msgstr "Gigabytes di spazio su disco (0 significa ignora questa impostazione)"
+#: clientgui/DlgAdvPreferencesBase.cpp:539
+#, 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:629
+#: clientgui/DlgAdvPreferencesBase.cpp:542
 msgid "Leave at least"
 msgstr "Lascia come minimo"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:633
-msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
-msgstr "BOINC lascia almeno questa quantità di spazio libero su disco (in Gigabytes)"
+#: clientgui/DlgAdvPreferencesBase.cpp:546
+msgid "GB free"
+msgstr "GB liberi"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:637
-msgid "Gigabytes disk space free"
-msgstr "Gigabytes di spazio libero sul disco"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:644
-msgid "BOINC uses at most this percentage of total disk space"
-msgstr "BOINC usa al massimo questa percentuale di spazio del disco"
+#: clientgui/DlgAdvPreferencesBase.cpp:551
+#, 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:649
+#: clientgui/DlgAdvPreferencesBase.cpp:559
 #, no-c-format
-msgid "% of total disk space"
-msgstr "% dello spazio totale del disco"
+msgid "% of total"
+msgstr "% di spazio totale su disco"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:652
-msgid "Tasks checkpoint to disk at most every"
-msgstr "Scrivi su disco al massimo ogni"
+#: clientgui/DlgAdvPreferencesBase.cpp:566
+msgid "Memory"
+msgstr "Memoria"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
-msgid "seconds"
-msgstr "secondi"
+#: clientgui/DlgAdvPreferencesBase.cpp:571
+#, 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:668
+#: clientgui/DlgAdvPreferencesBase.cpp:573
+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
 #, no-c-format
-msgid "% of page file (swap space)"
-msgstr "% del file di paging (spazio di swap)"
+msgid "%"
+msgstr "%"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:675
-msgid "Memory usage"
-msgstr "Uso della memoria"
+#: clientgui/DlgAdvPreferencesBase.cpp:584
+#, 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:691
-#, no-c-format
-msgid "% when computer is in use"
-msgstr "% quando il computer è in uso"
+#: clientgui/DlgAdvPreferencesBase.cpp:586
+msgid "When computer is not in use, use at most"
+msgstr "Quando il computer non è in uso, utilizza al massimo"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:701
-#, no-c-format
-msgid "% when computer is idle"
-msgstr "% quando il computer non è in uso"
+#: clientgui/DlgAdvPreferencesBase.cpp:595
+msgid "Leave non-GPU tasks in memory while suspended"
+msgstr "Lascia le elaborazioni non-GPU in memoria quando sospese"
+
+#: 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."
+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:706
-msgid "Leave applications in memory while suspended"
-msgstr " Lascia le applicazioni in memoria quando sono sospese"
+#: clientgui/DlgAdvPreferencesBase.cpp:600
+#, 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:708
-msgid "if checked, suspended work units are left in memory"
-msgstr "se la voce è spuntata, le elaborazioni sospese vengono lasciate in memoria"
+#: clientgui/DlgAdvPreferencesBase.cpp:602
+msgid "Page/swap file: use at most"
+msgstr "Spazio di swap: utilizza al massimo"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:728
-msgid "Suspend processor and network usage when these applications are running:"
-msgstr "Sospendi il processore e l'utilizzo della rete quando queste applicazioni sono in esecuzione:"
+#: clientgui/DlgAdvPreferencesBase.cpp:627
+msgid "and"
+msgstr "e le"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:738
-msgid "Add..."
-msgstr "Aggiungi..."
+#: clientgui/DlgAdvPreferencesBase.cpp:628
+msgid "to"
+msgstr "a"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:739
-msgid "Add an application to this list"
-msgstr "Aggiungi un'applicazione alla lista"
+#: clientgui/DlgAdvPreferencesBase.cpp:641
+msgid "Compute only during a particular period each day."
+msgstr "Elabora solo durante un particolare periodo ogni giorno."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:744
-msgid "Remove"
-msgstr "Rimuovi"
+#: clientgui/DlgAdvPreferencesBase.cpp:644
+msgid "Compute only between"
+msgstr "Elabora solo tra"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:745
-msgid "Remove an application from this list"
-msgstr "Rimuovi applicazione dalla lista"
+#: clientgui/DlgAdvPreferencesBase.cpp:654
+#: clientgui/DlgAdvPreferencesBase.cpp:801
+msgid "Day-of-week override"
+msgstr "Sovrascrivi giorno della settimana"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:754
-msgid "For advanced options, refer to "
-msgstr "Per le opzioni avanzate, vai su"
+#: clientgui/DlgAdvPreferencesBase.cpp:658
+#: clientgui/DlgAdvPreferencesBase.cpp:805
+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
+msgid "Monday"
+msgstr "Lunedì"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:691
+#: clientgui/DlgAdvPreferencesBase.cpp:837
+msgid "Friday"
+msgstr "Venerdì"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:704
+#: clientgui/DlgAdvPreferencesBase.cpp:850
+msgid "Tuesday"
+msgstr "Martedì"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:719
+#: clientgui/DlgAdvPreferencesBase.cpp:865
+msgid "Saturday"
+msgstr "Sabato"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:732
+#: clientgui/DlgAdvPreferencesBase.cpp:878
+msgid "Wednesday"
+msgstr "Mercoledì"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:747
+#: clientgui/DlgAdvPreferencesBase.cpp:893
+msgid "Sunday"
+msgstr "Domenica"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:760
+#: clientgui/DlgAdvPreferencesBase.cpp:906
+msgid "Thursday"
+msgstr "Giovedì"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:789
+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
+msgid "Transfer files only between"
+msgstr "Trasferisci files solo tra"
 
 #: clientgui/DlgDiagnosticLogFlags.cpp:65
 #, c-format
 msgid "%s Diagnostic Log Flags"
-msgstr "%s Flags di Log Diagnostici"
+msgstr "%s Flag di Log Diagnostici"
 
 #: clientgui/DlgDiagnosticLogFlags.cpp:83
-msgid "These flags enable various types of diagnostic messages in the Event Log."
-msgstr "Questi flags abilitano vari tipi di messaggi diagnostici nel Log Eventi."
+msgid ""
+"These flags enable various types of diagnostic messages in the Event Log."
+msgstr "Questi flag abilitano vari tipi di messaggi di diagnostica nel Log Eventi."
+
+#: clientgui/DlgDiagnosticLogFlags.cpp:99
+msgid "More info ..."
+msgstr "Maggiori informazioni ..."
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:105
+#: clientgui/DlgDiagnosticLogFlags.cpp:120 clientgui/DlgHiddenColumns.cpp:101
 msgid "Save all values and close the dialog"
-msgstr "Salva tutto e chiude la finestra"
+msgstr "Salva tutti i valori e chiudi la finestra"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:108
+#: clientgui/DlgDiagnosticLogFlags.cpp:123 clientgui/DlgHiddenColumns.cpp:104
 msgid "Defaults"
-msgstr "Predefiniti"
+msgstr "Predefinito"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:109
+#: clientgui/DlgDiagnosticLogFlags.cpp:124 clientgui/DlgHiddenColumns.cpp:105
 msgid "Restore default settings"
-msgstr "Ripristina le impostazioni di default"
+msgstr "Ripristina le impostazioni predefinite"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:113
+#: clientgui/DlgDiagnosticLogFlags.cpp:128 clientgui/DlgHiddenColumns.cpp:109
 msgid "Close the dialog without saving"
-msgstr "Chiude la finestra senza salvare"
+msgstr "Chiudi la finestra senza salvare"
 
-#: clientgui/DlgEventLog.cpp:226
+#: clientgui/DlgEventLog.cpp:227
 #, c-format
 msgid "%s - Event Log"
 msgstr "%s - Log Eventi"
 
-#: clientgui/DlgEventLog.cpp:236
+#: clientgui/DlgEventLog.cpp:237
 msgid "Project"
 msgstr "Progetto"
 
-#: clientgui/DlgEventLog.cpp:237
+#: clientgui/DlgEventLog.cpp:238
 msgid "Time"
 msgstr "Ora"
 
-#: clientgui/DlgEventLog.cpp:238
+#: clientgui/DlgEventLog.cpp:239
 msgid "Message"
 msgstr "Messaggio"
 
-#: clientgui/DlgEventLog.cpp:300
-#: clientgui/DlgEventLog.cpp:364
+#: clientgui/DlgEventLog.cpp:301 clientgui/DlgEventLog.cpp:351
 msgid "&Show only this project"
 msgstr "Mostra &solo questo progetto"
 
-#: clientgui/DlgEventLog.cpp:304
+#: clientgui/DlgEventLog.cpp:305
 msgid "Copy &All"
 msgstr "Copi&a Tutto"
 
-#: clientgui/DlgEventLog.cpp:306
-#: clientgui/DlgEventLog.cpp:310
+#: clientgui/DlgEventLog.cpp:307 clientgui/DlgEventLog.cpp:311
 msgid "Copy all the messages to the clipboard."
 msgstr "Copia tutti i messaggi negli appunti."
 
-#: clientgui/DlgEventLog.cpp:315
+#: clientgui/DlgEventLog.cpp:316
 msgid "Copy &Selected"
 msgstr "Copia &Selezionati"
 
-#: clientgui/DlgEventLog.cpp:318
-#: clientgui/DlgEventLog.cpp:326
-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
+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 "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:320
-#: clientgui/DlgEventLog.cpp:328
-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
+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 "Copia i messaggi selezionati negli appunti. Puoi selezionare più messaggi insieme tenendo premuto il tasto Shift o Ctrl mentre clicchi sui messaggi."
 
-#: clientgui/DlgEventLog.cpp:335
-#: clientgui/DlgItemProperties.cpp:67
+#: clientgui/DlgEventLog.cpp:336 clientgui/DlgItemProperties.cpp:67
 msgid "&Close"
 msgstr "&Chiudi"
 
-#: clientgui/DlgEventLog.cpp:344
-#, c-format
-msgid "Get help with %s"
-msgstr "Ottieni aiuto con %s"
-
-#: clientgui/DlgEventLog.cpp:358
+#: clientgui/DlgEventLog.cpp:345
 msgid "Show all &messages"
 msgstr "Mostra tutti i &messaggi"
 
-#: clientgui/DlgEventLog.cpp:359
-#: clientgui/DlgEventLog.cpp:361
+#: clientgui/DlgEventLog.cpp:346 clientgui/DlgEventLog.cpp:348
 msgid "Show messages for all projects"
 msgstr "Mostra i messaggi di tutti i progetti"
 
-#: clientgui/DlgEventLog.cpp:365
-#: clientgui/DlgEventLog.cpp:367
+#: clientgui/DlgEventLog.cpp:352 clientgui/DlgEventLog.cpp:354
 msgid "Show only the messages for the selected project"
 msgstr "Mostra solamente i messaggi del progetto selezionato"
 
+#: clientgui/DlgExclusiveApps.cpp:60
+#, c-format
+msgid "%s - Exclusive Applications"
+msgstr "%s - Applicazioni Esclusive"
+
+#: clientgui/DlgExclusiveApps.cpp:72
+msgid ""
+"Suspend processor and network usage when these applications are running:"
+msgstr "Sospendi il processore e l'utilizzo della rete quando queste applicazioni sono in esecuzione:"
+
+#: clientgui/DlgExclusiveApps.cpp:80 clientgui/DlgExclusiveApps.cpp:104
+msgid "Add..."
+msgstr "Aggiungi..."
+
+#: clientgui/DlgExclusiveApps.cpp:81 clientgui/DlgExclusiveApps.cpp:105
+msgid "Add an application to this list"
+msgstr "Aggiungi un'applicazione alla lista"
+
+#: clientgui/DlgExclusiveApps.cpp:86 clientgui/DlgExclusiveApps.cpp:110
+msgid "Remove"
+msgstr "Rimuovi"
+
+#: clientgui/DlgExclusiveApps.cpp:87 clientgui/DlgExclusiveApps.cpp:111
+msgid "Remove an application from this list"
+msgstr "Rimuovi applicazione dalla lista"
+
+#: clientgui/DlgExclusiveApps.cpp:96
+msgid "Suspend GPU usage when these applications are running:"
+msgstr "Sospendi l'utilizzo GPU quando queste applicazioni sono in funzione:"
+
+#: clientgui/DlgExclusiveApps.cpp:122
+msgid "For advanced options, refer to "
+msgstr "Per le opzioni avanzate, vai su"
+
+#: clientgui/DlgExclusiveApps.cpp:147
+msgid "save all values and close the dialog"
+msgstr "salva tutto e chiudi la finestra"
+
+#: clientgui/DlgExclusiveApps.cpp:153
+msgid "close the dialog without saving"
+msgstr "chiudi la finestra senza salvare"
+
+#: clientgui/DlgExclusiveApps.cpp:158
+msgid "shows the preferences web page"
+msgstr "mostra la pagina web di aiuto sulle preferenze"
+
+#: clientgui/DlgExclusiveApps.cpp:303 clientgui/DlgExclusiveApps.cpp:309
+#: clientgui/DlgExclusiveApps.cpp:315
+msgid "Applications to add"
+msgstr "Applicazioni da aggiungere"
+
+#: clientgui/DlgExclusiveApps.cpp:332
+#, c-format
+msgid "'%s' is not an executable application."
+msgstr "%s non è un'applicazione eseguibile"
+
+#: clientgui/DlgExclusiveApps.cpp:333 clientgui/DlgExclusiveApps.cpp:380
+#: clientgui/DlgExclusiveApps.cpp:404
+msgid "Add Exclusive App"
+msgstr "Aggiungi Applicazione Esclusiva"
+
+#: clientgui/DlgExclusiveApps.cpp:345
+msgid "Name of application to add?"
+msgstr "Nome dell'applicazione da aggiungere?"
+
+#: clientgui/DlgExclusiveApps.cpp:345
+msgid "Add exclusive app"
+msgstr "Aggiungi applicazioni esclusive"
+
+#: clientgui/DlgExclusiveApps.cpp:379
+#, c-format
+msgid "Application names must end with '%s'"
+msgstr "I nomi delle applicazioni devono finire con '%s'"
+
+#: clientgui/DlgExclusiveApps.cpp:403
+#, c-format
+msgid "'%s' is already in the list."
+msgstr "'%s' è già nella lista."
+
 #: clientgui/DlgExitMessage.cpp:82
 #, c-format
 msgid "%s - Exit Confirmation"
@@ -1701,13 +1737,7 @@ msgid ""
 "\n"
 "If you also want to stop running the tasks,\n"
 "choose from the following options:"
-msgstr ""
-"Hai chiesto di uscire da %s,\n"
-"che ti permette di vedere e gestire\n"
-"i lavori in corso sul tuo computer.\n"
-"\n"
-"Se vuoi anche fermare i lavori in corso,\n"
-"scegli dalle opzioni seguenti:"
+msgstr "Hai chiesto di uscire da %s,\nche ti permette di vedere e gestire\ni lavori in corso sul tuo computer.\n\nSe vuoi anche fermare i lavori in corso,\nscegli dalle opzioni seguenti:"
 
 #: clientgui/DlgExitMessage.cpp:135
 #, c-format
@@ -1718,13 +1748,7 @@ msgid ""
 "In most cases, it is better just to close the %s window\n"
 "rather than to exit the application; that will allow %s to run its\n"
 "tasks at the times you selected in your preferences."
-msgstr ""
-"Questo terminerà %s e tutti i suoi processi finchè l'applicazione\n"
-"%s o lo screensaver di %s verranno eseguiti nuovamente.\n"
-"\n"
-"In molti casi, è consigliabile chiudere solo la finestra del %s invece\n"
-"che uscire dall'applicazione; questo permetterebbe a %s di eseguire i suoi\n"
-"processi negli orari che hai selezionato nelle tue preferenze."
+msgstr "Questo terminerà %s e tutti i suoi processi finchè l'applicazione\n%s o lo screensaver di %s verranno eseguiti nuovamente.\n\nIn molti casi, è consigliabile chiudere solo la finestra del %s invece\nche uscire dall'applicazione; questo permetterebbe a %s di eseguire i suoi\nprocessi negli orari che hai selezionato nelle tue preferenze."
 
 #: clientgui/DlgExitMessage.cpp:153
 #, c-format
@@ -1735,10 +1759,8 @@ msgstr "Ferma i lavori in corso quando esci da %s"
 msgid "Remember this decision and do not show this dialog."
 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/DlgExitMessage.cpp:178 clientgui/DlgGenericMessage.cpp:125
+#: clientgui/DlgOptions.cpp:404 clientgui/DlgSelectComputer.cpp:168
 msgid "&Cancel"
 msgstr "&Annulla"
 
@@ -1746,10 +1768,28 @@ msgstr "&Annulla"
 msgid "Don't show this dialog again."
 msgstr "Non visualizzare piu questo messaggio."
 
-#: clientgui/DlgItemProperties.cpp:194
-#: clientgui/DlgItemProperties.cpp:197
-#: clientgui/DlgItemProperties.cpp:200
-#: clientgui/DlgItemProperties.cpp:203
+#: clientgui/DlgHiddenColumns.cpp:64
+#, c-format
+msgid "%s Column Selection"
+msgstr "%s Selezione Colonna"
+
+#: clientgui/DlgHiddenColumns.cpp:77
+#, c-format
+msgid "Select which columns %s should show."
+msgstr "Seleziona quali colonne %s deve visualizzare."
+
+#: clientgui/DlgHiddenColumns.cpp:314
+msgid ""
+"Are you sure you want to reset all list columns to the default "
+"configurations?"
+msgstr "Sei sicuro di voler resettare tutte colonne delle liste alla configurazione predefinita?"
+
+#: clientgui/DlgHiddenColumns.cpp:315
+msgid "Confirm defaults"
+msgstr "Conferma le impostazioni predefinite"
+
+#: clientgui/DlgItemProperties.cpp:194 clientgui/DlgItemProperties.cpp:197
+#: clientgui/DlgItemProperties.cpp:200 clientgui/DlgItemProperties.cpp:203
 msgid "Don't fetch tasks for "
 msgstr "Non richiedere nuovo lavoro per"
 
@@ -1781,8 +1821,7 @@ msgstr " intervallo di rinvio per la richiesta di nuovi lavori"
 msgid "Properties of project "
 msgstr "Proprietà del progetto "
 
-#: clientgui/DlgItemProperties.cpp:243
-#: clientgui/DlgOptions.cpp:221
+#: clientgui/DlgItemProperties.cpp:243 clientgui/DlgOptions.cpp:221
 msgid "General"
 msgstr "Dati generali"
 
@@ -1814,6 +1853,10 @@ msgstr "Scaricamento dei file rimandato di"
 msgid "File uploads deferred for"
 msgstr "Invio dei file rimandato di"
 
+#: clientgui/DlgItemProperties.cpp:257
+msgid "Disk usage"
+msgstr "Uso del disco"
+
 #: clientgui/DlgItemProperties.cpp:258
 msgid "Computer ID"
 msgstr "Computer ID"
@@ -1822,14 +1865,10 @@ msgstr "Computer ID"
 msgid "Non CPU intensive"
 msgstr "Non intensivo per la CPU"
 
-#: 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 "si"
 
@@ -1837,8 +1876,7 @@ msgstr "si"
 msgid "Suspended via GUI"
 msgstr "Sospeso dall'utente"
 
-#: clientgui/DlgItemProperties.cpp:262
-#: clientgui/DlgItemProperties.cpp:263
+#: clientgui/DlgItemProperties.cpp:262 clientgui/DlgItemProperties.cpp:263
 msgid "no"
 msgstr "no"
 
@@ -1854,8 +1892,7 @@ msgstr "Richiesta allo scheduler in corso"
 msgid "Trickle-up pending"
 msgstr "Messaggio istantaneo in attesa"
 
-#: clientgui/DlgItemProperties.cpp:271
-#: clientgui/DlgItemProperties.cpp:273
+#: clientgui/DlgItemProperties.cpp:271 clientgui/DlgItemProperties.cpp:273
 msgid "Host location"
 msgstr "Posizione dell'host"
 
@@ -1947,13 +1984,11 @@ msgstr "Durata stimata lavoro"
 msgid "CPU time at last checkpoint"
 msgstr "Tempo CPU all'ultimo checkpoint"
 
-#: clientgui/DlgItemProperties.cpp:374
-#: clientgui/DlgItemProperties.cpp:389
+#: clientgui/DlgItemProperties.cpp:374 clientgui/DlgItemProperties.cpp:389
 msgid "CPU time"
 msgstr "Tempo CPU"
 
-#: clientgui/DlgItemProperties.cpp:376
-#: clientgui/DlgItemProperties.cpp:390
+#: clientgui/DlgItemProperties.cpp:376 clientgui/DlgItemProperties.cpp:390
 msgid "Elapsed time"
 msgstr "Tempo trascorso"
 
@@ -1985,8 +2020,7 @@ msgstr "ID processo"
 msgid "Local: "
 msgstr "Locale:"
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: clientgui/DlgOptions.cpp:129 clientgui/DlgOptions.cpp:135
 msgid "Options"
 msgstr "Opzioni"
 
@@ -2050,33 +2084,27 @@ msgstr "Connetti tramite server proxy HTTP"
 msgid "HTTP Proxy Server Configuration"
 msgstr "Configurazione server proxy HTTP"
 
-#: clientgui/DlgOptions.cpp:283
-#: clientgui/DlgOptions.cpp:347
+#: clientgui/DlgOptions.cpp:283 clientgui/DlgOptions.cpp:347
 msgid "Address:"
 msgstr "Indirizzo:"
 
-#: clientgui/DlgOptions.cpp:291
-#: clientgui/DlgOptions.cpp:355
+#: clientgui/DlgOptions.cpp:291 clientgui/DlgOptions.cpp:355
 msgid "Port:"
 msgstr "Porta:"
 
-#: clientgui/DlgOptions.cpp:299
-#: clientgui/DlgOptions.cpp:363
+#: clientgui/DlgOptions.cpp:299 clientgui/DlgOptions.cpp:363
 msgid "Don't use proxy for:"
 msgstr "Non utilizzare il proxy per:"
 
-#: clientgui/DlgOptions.cpp:306
-#: clientgui/DlgOptions.cpp:370
+#: clientgui/DlgOptions.cpp:306 clientgui/DlgOptions.cpp:370
 msgid "Leave these blank if not needed"
 msgstr "Lascia questi spazi vuoti se non necessari"
 
-#: clientgui/DlgOptions.cpp:312
-#: clientgui/DlgOptions.cpp:376
+#: clientgui/DlgOptions.cpp:312 clientgui/DlgOptions.cpp:376
 msgid "User Name:"
 msgstr "Nome utente:"
 
-#: clientgui/DlgOptions.cpp:320
-#: clientgui/DlgOptions.cpp:384
+#: clientgui/DlgOptions.cpp:320 clientgui/DlgOptions.cpp:384
 #: clientgui/DlgSelectComputer.cpp:152
 msgid "Password:"
 msgstr "Password:"
@@ -2128,7 +2156,9 @@ msgstr "%s - Selezione della lingua"
 
 #: 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 "La lingua di %s è stata cambiata.  Per rendere effettive le modifiche, devi riavviare %s."
 
 #: clientgui/DlgSelectComputer.cpp:91
@@ -2141,16 +2171,13 @@ msgstr "%s - Seleziona un computer"
 msgid ""
 "Another instance of %s is already running \n"
 "on this computer.  Please select a client to monitor."
-msgstr ""
-"Un'altra istanza di %s sta già elaborando \n"
-"su questo computer. Per favore seleziona quale client seguire. "
+msgstr "Un'altra istanza di %s sta già elaborando \nsu questo computer. Per favore seleziona quale client seguire. "
 
 #: clientgui/DlgSelectComputer.cpp:143
 msgid "Host name:"
 msgstr "Nome del computer:"
 
-#: clientgui/Localization.cpp:31
-#: clientgui/Localization.cpp:69
+#: clientgui/Localization.cpp:31 clientgui/Localization.cpp:69
 msgid "Message boards"
 msgstr "Forum"
 
@@ -2162,15 +2189,12 @@ msgstr "Discuti con altri utenti sul forum di SETI at home"
 msgid "Ask questions and report problems"
 msgstr "Fai domande e riporta problemi"
 
-#: 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 "Il tuo account"
 
-#: 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 "Visualizza le informazioni sul tuo account e sui crediti totali"
@@ -2183,18 +2207,15 @@ msgstr "Le tue preferenze"
 msgid "View and modify your SETI at home account profile and preferences"
 msgstr "Visualizza e modifica il profilo del tuo account SETI at home e le tue preferenze"
 
-#: clientgui/Localization.cpp:47
-#: clientgui/Localization.cpp:89
+#: clientgui/Localization.cpp:47 clientgui/Localization.cpp:89
 msgid "Your results"
 msgstr "I tuoi risultati"
 
-#: 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 "Visualizza la tua ultima settimana (o più) di elaborazioni"
 
-#: clientgui/Localization.cpp:51
-#: clientgui/Localization.cpp:93
+#: clientgui/Localization.cpp:51 clientgui/Localization.cpp:93
 msgid "Your computers"
 msgstr "I tuoi computer"
 
@@ -2202,13 +2223,11 @@ msgstr "I tuoi computer"
 msgid "View a listing of all the computers on which you are running SETI at Home"
 msgstr "Visualizza l'elenco di tutti i computer con cui stai partecipando a SETI at Home"
 
-#: clientgui/Localization.cpp:55
-#: clientgui/Localization.cpp:97
+#: clientgui/Localization.cpp:55 clientgui/Localization.cpp:97
 msgid "Your team"
 msgstr "Il tuo team"
 
-#: clientgui/Localization.cpp:57
-#: clientgui/Localization.cpp:99
+#: clientgui/Localization.cpp:57 clientgui/Localization.cpp:99
 msgid "View information about your team"
 msgstr "Visualizza le informazioni sul tuo team"
 
@@ -2229,7 +2248,8 @@ msgid "Read a detailed description of the Einstein at Home screensaver"
 msgstr "Leggi una descrizione dettagliata dello sreensaver di Einstein at Home"
 
 #: 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 "Discuti con gli amministratori e gli altri utenti sul forum di Einstein at Home"
 
 #: clientgui/Localization.cpp:73
@@ -2257,7 +2277,8 @@ msgid "Account summary"
 msgstr "Riepilogo dell'account"
 
 #: 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 "Visualizza l'elenco di tutti i computer con cui stai partecipando ad Einstein at Home"
 
 #: clientgui/Localization.cpp:101
@@ -2265,7 +2286,9 @@ msgid "LIGO project"
 msgstr "Progetto LIGO"
 
 #: 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 "Pagina iniziale del progetto Laser Interferometer Gravitational-wave Observatory (LIGO)"
 
 #: clientgui/Localization.cpp:105
@@ -2276,8 +2299,7 @@ msgstr "Progetto GEO-600"
 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/Localization.cpp:115 clientgui/Localization.cpp:133
 msgid "Team"
 msgstr "Team"
 
@@ -2358,7 +2380,9 @@ msgid "Missing application"
 msgstr "Applicazione mancante"
 
 #: 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 "Per favore scarica e installa l'applicazione CoRd da http://cord.sourceforge.net"
 
 #: clientgui/MainDocument.cpp:2442
@@ -2429,8 +2453,7 @@ msgstr "Scaricamento fallito"
 msgid "Downloading"
 msgstr "Scaricamento in corso"
 
-#: clientgui/MainDocument.cpp:2492
-#: clientgui/MainDocument.cpp:2557
+#: clientgui/MainDocument.cpp:2492 clientgui/MainDocument.cpp:2551
 msgid " (suspended - "
 msgstr "(sospesa-"
 
@@ -2442,101 +2465,99 @@ msgstr "Progetto sospeso dall'utente"
 msgid "Task suspended by user"
 msgstr "Elaborazione sospesa dall'utente"
 
-#: clientgui/MainDocument.cpp:2504
+#: clientgui/MainDocument.cpp:2507
 msgid "Suspended - "
 msgstr "Sospesa -"
 
-# 75%
 #: clientgui/MainDocument.cpp:2510
 msgid "GPU suspended - "
 msgstr "GPU sospesa - "
 
-#: clientgui/MainDocument.cpp:2517
+#: clientgui/MainDocument.cpp:2514
 msgid "Waiting for memory"
 msgstr "In attesa di memoria"
 
-#: clientgui/MainDocument.cpp:2519
+#: clientgui/MainDocument.cpp:2516
 msgid "Waiting for shared memory"
 msgstr "In attesa di memoria condivisa"
 
-#: clientgui/MainDocument.cpp:2521
+#: clientgui/MainDocument.cpp:2518
 msgid "Running"
 msgstr "In elaborazione"
 
-#: clientgui/MainDocument.cpp:2523
+#: clientgui/MainDocument.cpp:2520
 msgid " (non-CPU-intensive)"
 msgstr "(non intensivo per la CPU)"
 
-#: clientgui/MainDocument.cpp:2526
+#: clientgui/MainDocument.cpp:2523
 msgid "Waiting to run"
 msgstr "In attesa di esecuzione"
 
-#: clientgui/MainDocument.cpp:2528
-#: clientgui/MainDocument.cpp:2534
+#: clientgui/MainDocument.cpp:2525 clientgui/MainDocument.cpp:2528
 msgid "Ready to start"
 msgstr "Pronto per l'elaborazione"
 
-#: clientgui/MainDocument.cpp:2538
+#: clientgui/MainDocument.cpp:2532
 msgid "Postponed: "
-msgstr "Posticipato: "
+msgstr "Ritardata:"
 
-#: clientgui/MainDocument.cpp:2541
+#: clientgui/MainDocument.cpp:2535
 msgid "Postponed"
-msgstr "Posticipato"
+msgstr "Ritardata"
 
-#: clientgui/MainDocument.cpp:2545
+#: clientgui/MainDocument.cpp:2539
 msgid "Waiting for network access"
-msgstr "In attesa di accesso alla rete"
+msgstr "in attesa di accesso alla rete"
 
-#: clientgui/MainDocument.cpp:2549
+#: clientgui/MainDocument.cpp:2543
 msgid "Computation error"
 msgstr "Errore di calcolo"
 
-#: clientgui/MainDocument.cpp:2553
+#: clientgui/MainDocument.cpp:2547
 msgid "Upload failed"
 msgstr "Invio non riuscito"
 
-#: clientgui/MainDocument.cpp:2555
+#: clientgui/MainDocument.cpp:2549
 msgid "Uploading"
 msgstr "Invio in corso"
 
-#: clientgui/MainDocument.cpp:2566
+#: clientgui/MainDocument.cpp:2560
 msgid "Aborted by user"
 msgstr "Annullato dall'utente"
 
-#: clientgui/MainDocument.cpp:2569
+#: clientgui/MainDocument.cpp:2563
 msgid "Aborted by project"
 msgstr "Annullato dal progetto"
 
-#: clientgui/MainDocument.cpp:2572
+#: clientgui/MainDocument.cpp:2566
 msgid "Aborted: not started by deadline"
 msgstr "Annullato: non è partito a causa della scadenza"
 
-#: clientgui/MainDocument.cpp:2575
+#: clientgui/MainDocument.cpp:2569
 msgid "Aborted: disk limit exceeded"
 msgstr "Annullato: limite disco superato"
 
-#: clientgui/MainDocument.cpp:2578
+#: clientgui/MainDocument.cpp:2572
 msgid "Aborted: run time limit exceeded"
 msgstr "Annullato: limite di elaborazione superato"
 
-#: clientgui/MainDocument.cpp:2581
+#: clientgui/MainDocument.cpp:2575
 msgid "Aborted: memory limit exceeded"
 msgstr "Annullato: limite di memoria superato"
 
-#: clientgui/MainDocument.cpp:2584
+#: clientgui/MainDocument.cpp:2578
 msgid "Aborted"
 msgstr "Annullato"
 
-#: clientgui/MainDocument.cpp:2589
+#: clientgui/MainDocument.cpp:2583
 msgid "Acknowledged"
 msgstr "Riconosciuto"
 
-#: clientgui/MainDocument.cpp:2591
+#: clientgui/MainDocument.cpp:2585
 msgid "Ready to report"
 msgstr "Pronto per il report"
 
-#: clientgui/MainDocument.cpp:2593
+#: clientgui/MainDocument.cpp:2587
 #, c-format
 msgid "Error: invalid state '%d'"
 msgstr "Errore: stato non valido '%d'"
@@ -2558,10 +2579,7 @@ msgid ""
 "The URL you supplied is not that of a BOINC-based project.\n"
 "\n"
 "Please check the URL and try again."
-msgstr ""
-"L'URL inserito non è quello di un progetto basato su BOINC.\n"
-"\n"
-"Controlla l'URL e riprova."
+msgstr "L'URL inserito non è quello di un progetto basato su BOINC.\n\nControlla l'URL e riprova."
 
 #: clientgui/NotDetectedPage.cpp:188
 msgid "Account manager not found"
@@ -2573,11 +2591,7 @@ msgid ""
 "manager.\n"
 "\n"
 "Please check the URL and try again."
-msgstr ""
-"L'URL inserito non è quello di un account manager\n"
-"basato su BOINC.\n"
-"\n"
-"Controlla l'URL e riprova."
+msgstr "L'URL inserito non è quello di un account manager\nbasato su BOINC.\n\nControlla l'URL e riprova."
 
 #: clientgui/NotFoundPage.cpp:181
 msgid "Login Failed."
@@ -2599,53 +2613,54 @@ msgstr "ancora..."
 msgid "Choose a project"
 msgstr "Scegli un progetto"
 
-#: clientgui/ProjectInfoPage.cpp:228
+#: clientgui/ProjectInfoPage.cpp:226
 msgid "To choose a project, click its name or type its URL below."
 msgstr "Per selezionare un progetto, clicca sul nome o digita il suo indirizzo sotto."
 
-#: clientgui/ProjectInfoPage.cpp:246
+#: clientgui/ProjectInfoPage.cpp:242
 msgid "Categories:"
 msgstr "Categorie:"
 
-#: clientgui/ProjectInfoPage.cpp:267
+#: clientgui/ProjectInfoPage.cpp:262
 msgid "Projects:"
 msgstr "Progetti:"
 
-#: clientgui/ProjectInfoPage.cpp:279
+#: clientgui/ProjectInfoPage.cpp:274
 msgid "Project details"
 msgstr "Dettagli progetto"
 
-#: clientgui/ProjectInfoPage.cpp:291
+#: clientgui/ProjectInfoPage.cpp:284
 msgid "Research area:"
 msgstr "Area di ricerca:"
 
-#: clientgui/ProjectInfoPage.cpp:302
+#: clientgui/ProjectInfoPage.cpp:294
 msgid "Organization:"
 msgstr "Organizzazione:"
 
-#: clientgui/ProjectInfoPage.cpp:313
+#: clientgui/ProjectInfoPage.cpp:304
 msgid "Web site:"
 msgstr "Sito web:"
 
-#: clientgui/ProjectInfoPage.cpp:325
+#: clientgui/ProjectInfoPage.cpp:315
 msgid "Supported systems:"
 msgstr "Sistemi supportati:"
 
-#: clientgui/ProjectInfoPage.cpp:363
+#: clientgui/ProjectInfoPage.cpp:352
 msgid "Project URL:"
 msgstr "URL del progetto:"
 
-#: clientgui/ProjectInfoPage.cpp:499
-#: clientgui/ProjectInfoPage.cpp:754
-#: clientgui/ProjectInfoPage.cpp:758
+#: clientgui/ProjectInfoPage.cpp:486 clientgui/ProjectInfoPage.cpp:686
+#: clientgui/ProjectInfoPage.cpp:690
 msgid "All"
 msgstr "Tutto"
 
-#: clientgui/ProjectInfoPage.cpp:802
-msgid "This project may not have work for your type of computer.  Do you want to add it anyway?"
+#: clientgui/ProjectInfoPage.cpp:735
+msgid ""
+"This project may not have work for your type of computer.  Do you want to "
+"add it anyway?"
 msgstr "Questo progetto potrebbe non avere lavoro per il tuo tipo di computer. Sei sicuro di volerlo aggiungere comunque?"
 
-#: clientgui/ProjectInfoPage.cpp:826
+#: clientgui/ProjectInfoPage.cpp:767
 msgid "You already added this project. Please choose a different project."
 msgstr "Sei già connesso a questo progetto. Scegli un progetto diverso."
 
@@ -2653,12 +2668,12 @@ msgstr "Sei già connesso a questo progetto. Scegli un progetto diverso."
 msgid "Communicating with project."
 msgstr "In comunicazione con il progetto."
 
-#: clientgui/ProjectProcessingPage.cpp:510
+#: clientgui/ProjectProcessingPage.cpp:509
 msgid "Required files not found on the server."
 msgstr "I file richiesti non sono stati trovati sul server del progetto."
 
-#: clientgui/ProjectProcessingPage.cpp:513
-#: clientgui/ProjectProcessingPage.cpp:586
+#: clientgui/ProjectProcessingPage.cpp:512
+#: clientgui/ProjectProcessingPage.cpp:585
 msgid "An internal server error has occurred."
 msgstr "Si è verificato un errore interno del server."
 
@@ -2666,18 +2681,16 @@ msgstr "Si è verificato un errore interno del server."
 msgid ""
 "Communicating with project\n"
 "Please wait..."
-msgstr ""
-"Comunicazione col progetto in corso\n"
-"Attendere prego..."
+msgstr "Comunicazione col progetto in corso\nAttendere prego..."
 
 #: clientgui/ProjectWelcomePage.cpp:251
 #, c-format
 msgid "Welcome to %s."
-msgstr "Benvenuto su %s."
+msgstr "Benvenuto in %s."
 
 #: clientgui/ProjectWelcomePage.cpp:254
 msgid "You have volunteered to compute for this project:"
-msgstr "Hai deciso di elaborare per questo progetto:"
+msgstr "Hai deciso di contribuire per questo progetto:"
 
 #: clientgui/ProjectWelcomePage.cpp:255
 msgid "Name:"
@@ -2685,7 +2698,7 @@ msgstr "Nome:"
 
 #: clientgui/ProjectWelcomePage.cpp:258
 msgid "Home:"
-msgstr "Homepage:"
+msgstr "Home:"
 
 #: clientgui/ProjectWelcomePage.cpp:262
 msgid "Description:"
@@ -2700,8 +2713,10 @@ msgid "User:"
 msgstr "Utente:"
 
 #: clientgui/ProjectWelcomePage.cpp:273
-msgid "WARNING: This project is not registered with BOINC.  Make sure you trust it before continuing."
-msgstr "WARNING: Questo progetto non è registrato con BOINC.  Assicurati che sia fidato prima di continuare."
+msgid ""
+"WARNING: This project is not registered with BOINC.  Make sure you trust it "
+"before continuing."
+msgstr "ATTENZIONE: Questo progetto non è registrato su BOINC. Assicurati che sia fidato prima di continuare."
 
 #: clientgui/ProjectWelcomePage.cpp:277
 msgid "To continue, click Next."
@@ -2726,19 +2741,7 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"Il programma BOINC di World Community Grid non riesce a\n"
-"comunicare su internet. Le principali ragioni sono:\n"
-"\n"
-"1) Problemi di connettività. Controlla la tua connessione di rete o\n"
-"la connessione del modem e poi riprova l'operazione.\n"
-"\n"
-"2) Il firewall sta bloccando il progetto BOINC World Community Grid. Devi configurare il tuo\n"
-"firewall per permettere a BOINC di comunicare sulle porte 80 e 443.\n"
-"Una volta fatto questo, clicca su indietro e riprova.\n"
-"\n"
-"3) Stai usando un server proxy e BOINC non è configurato.\n"
-"Clicca su \"Next\" configurarlo per il proxy."
+msgstr "Il programma BOINC di World Community Grid non riesce a\ncomunicare su internet. Le principali ragioni sono:\n\n1) Problemi di connettività. Controlla la tua connessione di rete o\nla connessione del modem e poi riprova l'operazione.\n\n2) Il firewall sta bloccando il progetto BOINC World Community Grid. Devi configurare il tuo\nfirewall per permettere a BOINC di comunicare sulle porte 80 e 443.\nUna volta fatto questo, clicca su indietro e riprova.\n\n3) Stai usando un server pr [...]
 
 #: clientgui/ProxyInfoPage.cpp:203
 msgid ""
@@ -2755,19 +2758,7 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"BOINC non riesce a comunicare su internet. Le principali\n"
-"ragioni sono:\n"
-"\n"
-"1) Problemi di connettività. Controlla la tua connessione di rete o\n"
-"la connessione del modem e poi riprova l'operazione.\n"
-"\n"
-"2) Il firewall sta bloccando BOINC. Devi configurare il tuo\n"
-"firewall per permettere a BOINC di comunicare sulla porta 80.\n"
-"Una volta fatto questo, clicca su indietro e riprova.\n"
-"\n"
-"3) Stai usando un server proxy e BOINC non è configurato.\n"
-"Clicca su \"Next\" configurarlo per il proxy."
+msgstr "BOINC non riesce a comunicare su internet. Le principali\nragioni sono:\n\n1) Problemi di connettività. Controlla la tua connessione di rete o\nla connessione del modem e poi riprova l'operazione.\n\n2) Il firewall sta bloccando BOINC. Devi configurare il tuo\nfirewall per permettere a BOINC di comunicare sulla porta 80.\nUna volta fatto questo, clicca su indietro e riprova.\n\n3) Stai usando un server proxy e BOINC non è configurato.\nClicca su \"Next\" configurarlo per il proxy."
 
 #: clientgui/ProxyPage.cpp:331
 msgid "Proxy configuration"
@@ -2777,8 +2768,7 @@ msgstr "Configurazione proxy"
 msgid "HTTP proxy"
 msgstr "Proxy HTTP"
 
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
+#: clientgui/ProxyPage.cpp:337 clientgui/ProxyPage.cpp:357
 msgid "Server:"
 msgstr "Server:"
 
@@ -2790,51 +2780,64 @@ msgstr "Rilevazione automatica"
 msgid "SOCKS proxy"
 msgstr "Proxy SOCKS"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:167
+#: clientgui/sg_BoincSimpleFrame.cpp:166
+msgid "Skin"
+msgstr "Interfaccia"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:168
+msgid "Select the appearance of the user interface."
+msgstr "Seleziona la grafica dell'interfaccia utente."
+
+#: clientgui/sg_BoincSimpleFrame.cpp:179
+msgid "Display diagnostic messages."
+msgstr "Visualizza i messaggi di diagnostica del client."
+
+#: clientgui/sg_BoincSimpleFrame.cpp:184
 msgid "Advanced View...\tCtrl+Shift+A"
 msgstr "Visualizzazione Avanzata...\tCtrl+Shift+A"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:168
+#: clientgui/sg_BoincSimpleFrame.cpp:185
 msgid "Display the advanced graphical interface."
 msgstr "Visualizza l'interfaccia grafica avanzata di BOINC"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:175
-msgid "Skin"
-msgstr "Interfaccia"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:177
-msgid "Select the appearance of the user interface."
-msgstr "Seleziona la grafica dell'interfaccia utente."
+#: clientgui/sg_BoincSimpleFrame.cpp:201
+msgid "Configure display options and proxy settings"
+msgstr "Configura le opzioni dell'interfaccia grafica e del proxy"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:224
+#: clientgui/sg_BoincSimpleFrame.cpp:222
 #, c-format
 msgid "&%s"
 msgstr "&%s"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:405
+#: clientgui/sg_BoincSimpleFrame.cpp:396
 msgid "Default"
 msgstr "Predefinito"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:848
+#: clientgui/sg_BoincSimpleFrame.cpp:838
 msgid "Suspend"
 msgstr "Sospendi"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:850
+#: clientgui/sg_BoincSimpleFrame.cpp:840
 msgid "Suspend Computing"
 msgstr "Sospendi Lavoro"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:851
+#: clientgui/sg_BoincSimpleFrame.cpp:841
 msgid "Resume Computing"
 msgstr "Riprendi Lavoro"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:867
+#: clientgui/sg_BoincSimpleFrame.cpp:857
 msgid "Notices"
 msgstr "Avvisi"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:868
+#: 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/sg_BoincSimpleFrame.cpp:879
+#, c-format
+msgid "Get help with %s"
+msgstr "Ottieni aiuto con %s"
+
 #: clientgui/sg_DlgMessages.cpp:124
 msgid "Fetching notices; please wait..."
 msgstr "Scaricamento notizie; attendere prego..."
@@ -2852,233 +2855,104 @@ msgstr "Chiudi"
 msgid "%s - Notices"
 msgstr "Avvisi di %s"
 
-#: clientgui/sg_DlgPreferences.cpp:270
-msgid "This dialog controls preferences for this computer only."
-msgstr "Questa finestra controlla le preferenze solo di questo computer."
-
-#: clientgui/sg_DlgPreferences.cpp:275
-msgid "Click OK to set preferences."
-msgstr "Clicca OK per salvare le preferenze."
-
-#: clientgui/sg_DlgPreferences.cpp:280
-msgid "Click Clear to restore web-based settings for all preferences listed below."
-msgstr "Clicca \"Cancella\" per ripristinare le impostazioni basate sul web per tutte le preferenze elencate sotto."
-
-#: clientgui/sg_DlgPreferences.cpp:287
-msgid "For additional settings, select Computing Preferences in the Advanced View."
+#: 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/sg_DlgPreferences.cpp:315
-msgid "Do work only between:"
-msgstr "Elabora solamente tra:"
-
-#: clientgui/sg_DlgPreferences.cpp:337
-msgid "Connect to internet only between:"
-msgstr "Connetti ad internet solamente tra:"
-
-#: clientgui/sg_DlgPreferences.cpp:359
-#: clientgui/sg_DlgPreferences.cpp:376
-msgid "Use no more than:"
-msgstr "Non utilizzare più di:"
-
-#: clientgui/sg_DlgPreferences.cpp:372
-msgid "of disk space"
-msgstr "di spazio sul disco"
-
-#: clientgui/sg_DlgPreferences.cpp:389
-msgid "of the processor"
-msgstr "del processore"
-
-#: clientgui/sg_DlgPreferences.cpp:393
-msgid "Do work while on battery?"
-msgstr "Elabora quando il pc è alimentato a batterie?"
-
-#: clientgui/sg_DlgPreferences.cpp:406
-msgid "Do work after idle for:"
-msgstr "Elabora dopo che il PC è inutilizzato da:"
-
-#: clientgui/sg_DlgPreferences.cpp:431
-msgid "Clear all local preferences listed above and close the dialog"
-msgstr "Rimuovi tutte le preferenze locali e chiudi la finestra"
-
-#: clientgui/sg_DlgPreferences.cpp:609
-#: clientgui/sg_DlgPreferences.cpp:612
-#: clientgui/sg_DlgPreferences.cpp:688
-#: clientgui/sg_DlgPreferences.cpp:692
-#: clientgui/sg_DlgPreferences.cpp:704
-#: clientgui/sg_DlgPreferences.cpp:708
-#: clientgui/sg_DlgPreferences.cpp:851
-#: clientgui/sg_DlgPreferences.cpp:862
-msgid "Anytime"
-msgstr "Qualunque momento"
-
-#: clientgui/sg_DlgPreferences.cpp:645
-msgid "100 MB"
-msgstr "100 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:646
-msgid "200 MB"
-msgstr "200 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:647
-msgid "500 MB"
-msgstr "500 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:648
-msgid "1 GB"
-msgstr "1 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:649
-msgid "2 GB"
-msgstr "2 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:650
-msgid "5 GB"
-msgstr "5 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:651
-msgid "10 GB"
-msgstr "10 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:652
-msgid "20 GB"
-msgstr "20 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:653
-msgid "50 GB"
-msgstr "50 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:654
-msgid "100 GB"
-msgstr "100 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:724
-#, c-format
-msgid "%d MB"
-msgstr "%d MB"
-
-#: clientgui/sg_DlgPreferences.cpp:726
-#, c-format
-msgid "%4.2f GB"
-msgstr "%4.2f GB"
-
-#: clientgui/sg_DlgPreferences.cpp:767
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: clientgui/sg_DlgPreferences.cpp:803
-msgid "0 (Run Always)"
-msgstr "0 (Elabora sempre)"
+#: clientgui/sg_DlgPreferences.cpp:289
+msgid "GB of disk space"
+msgstr "GB di spazio su disco"
 
-#: clientgui/sg_DlgPreferences.cpp:806
-#, c-format
-msgid "%d"
-msgstr "%d"
-
-#: clientgui/sg_DlgPreferences.cpp:953
+#: clientgui/sg_DlgPreferences.cpp:980
 #, c-format
 msgid "%s - Computing Preferences"
 msgstr "%s - Preferenze di Elaborazione"
 
-#: clientgui/sg_DlgPreferences.cpp:1033
-msgid "Do you really want to clear all local preferences?\n"
-msgstr "Vuoi veramente cancellare tutte le preferenze locali?\n"
+#: 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/sg_ProjectCommandPopup.cpp:66
-#: clientgui/ViewProjects.cpp:179
 msgid "Update"
 msgstr "Aggiorna"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:67
-#: clientgui/ViewProjects.cpp:180
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
+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/sg_ProjectCommandPopup.cpp:73
 #: clientgui/sg_ProjectCommandPopup.cpp:129
-#: clientgui/ViewProjects.cpp:187
-#: clientgui/ViewProjects.cpp:727
 msgid "Suspend tasks for this project."
 msgstr "Sospendi il lavoro per questo progetto."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:78
 #: clientgui/sg_ProjectCommandPopup.cpp:136
-#: clientgui/ViewProjects.cpp:193
-#: clientgui/ViewProjects.cpp:746
 msgid "No new tasks"
 msgstr "Blocca la richiesta di lavoro"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:79
-#: clientgui/ViewProjects.cpp:194
 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:200
 msgid "Reset project"
 msgstr "Reset del progetto"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:85
-#: clientgui/ViewProjects.cpp:201
-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."
+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:208
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
+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/sg_ProjectCommandPopup.cpp:96
 #: clientgui/sg_TaskCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:214
 msgid "Properties"
 msgstr "Proprietà"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:97
-#: clientgui/ViewProjects.cpp:215
 msgid "Show project details."
 msgstr "Visualizza i dettagli del progetto."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:126
-#: clientgui/ViewProjects.cpp:723
 msgid "Resume tasks for this project."
 msgstr "Riprendi il lavoro per questo progetto."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:133
-#: clientgui/ViewProjects.cpp:742
 msgid "Allow new tasks"
 msgstr "Abilita richiesta lavoro"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:134
-#: clientgui/ViewProjects.cpp:742
 msgid "Allow fetching new tasks for this project."
 msgstr "Permetti a questo progetto di richiedere nuovo lavoro."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:137
-#: clientgui/ViewProjects.cpp:746
 msgid "Don't fetch new tasks for this project."
 msgstr "Non richiedere nuovo lavoro per questo progetto."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:229
-#: clientgui/ViewProjects.cpp:443
 #, 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
-#: clientgui/ViewProjects.cpp:449
 msgid "Reset Project"
 msgstr "Reset del progetto"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:266
-#: clientgui/ViewProjects.cpp:501
 #, c-format
 msgid "Are you sure you want to remove project '%s'?"
 msgstr "Vuoi davvero rimuovere il progetto '%s'?"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:272
-#: clientgui/ViewProjects.cpp:507
 msgid "Remove Project"
 msgstr "Disconnettiti dal progetto"
 
@@ -3094,6 +2968,10 @@ msgstr "Sincronizza"
 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"
@@ -3157,9 +3035,7 @@ msgstr "Sospendi l'elaborazione selezionata."
 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)"
+msgstr "Sei sicuro di voler annullare l'elaborazione di '%s'?\n(Avanzamento: %.1lf%%, Stato: %s)"
 
 #: clientgui/sg_TaskCommandPopup.cpp:272
 msgid "Abort task"
@@ -3230,52 +3106,51 @@ msgstr "Tempo mancante: %s"
 msgid "Status: %s"
 msgstr "Stato: %s"
 
-#: clientgui/sg_TaskPanel.cpp:1227
+#: clientgui/sg_TaskPanel.cpp:1228
 msgid "Retrieving current status."
 msgstr "Ricezione dello stato corrente in corso."
 
-#: clientgui/sg_TaskPanel.cpp:1233
+#: clientgui/sg_TaskPanel.cpp:1234
 msgid "Downloading work from the server."
 msgstr "Scaricamento del lavoro dal server in corso."
 
-#: clientgui/sg_TaskPanel.cpp:1238
+#: clientgui/sg_TaskPanel.cpp:1239
 msgid "Processing Suspended:  Running On Batteries."
 msgstr "Elaborazione sospesa:  alimentazione a batterie."
 
-#: clientgui/sg_TaskPanel.cpp:1240
+#: clientgui/sg_TaskPanel.cpp:1241
 msgid "Processing Suspended:  User Active."
 msgstr "Elaborazione sospesa:  l'utente è attivo."
 
-#: clientgui/sg_TaskPanel.cpp:1242
+#: clientgui/sg_TaskPanel.cpp:1243
 msgid "Processing Suspended:  User paused processing."
 msgstr "Elaborazione sospesa:  l'utente ha sospeso l'elaborazione."
 
-#: clientgui/sg_TaskPanel.cpp:1244
+#: clientgui/sg_TaskPanel.cpp:1245
 msgid "Processing Suspended:  Time of Day."
 msgstr "Elaborazione sospesa:  superati i limiti di orario."
 
-#: clientgui/sg_TaskPanel.cpp:1246
+#: clientgui/sg_TaskPanel.cpp:1247
 msgid "Processing Suspended:  Benchmarks Running."
 msgstr "Elaborazione sospesa:  esecuzione dei benchmark."
 
-#: clientgui/sg_TaskPanel.cpp:1248
+#: clientgui/sg_TaskPanel.cpp:1249
 msgid "Processing Suspended."
 msgstr "Elaborazione sospesa."
 
-#: clientgui/sg_TaskPanel.cpp:1252
+#: clientgui/sg_TaskPanel.cpp:1253
 msgid "Waiting to contact project servers."
 msgstr "In attesa di contattare i server dei progetti."
 
-#: clientgui/sg_TaskPanel.cpp:1256
-#: clientgui/sg_TaskPanel.cpp:1265
+#: 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:1260
+#: clientgui/sg_TaskPanel.cpp:1261
 msgid "No work available to process"
 msgstr "Nessun lavoro disponibile da elaborare"
 
-#: clientgui/sg_TaskPanel.cpp:1262
+#: clientgui/sg_TaskPanel.cpp:1263
 msgid "Unable to connect to the core client"
 msgstr "Impossibile connettersi al client BOINC"
 
@@ -3304,10 +3179,7 @@ msgid ""
 "The project is temporarily unavailable.\n"
 "\n"
 "Please try again later."
-msgstr ""
-"Il Progetto è temporaneamente non disponibile.\n"
-"\n"
-"Si prega di riprovare più tardi."
+msgstr "Il Progetto è temporaneamente non disponibile.\n\nSi prega di riprovare più tardi."
 
 #: clientgui/UnavailablePage.cpp:190
 msgid "Account manager temporarily unavailable"
@@ -3318,10 +3190,7 @@ msgid ""
 "The account manager is temporarily unavailable.\n"
 "\n"
 "Please try again later."
-msgstr ""
-"L'account manager non è temporaneamente disponibile.\n"
-"\n"
-"Si prega di riprovare più tardi."
+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."
@@ -3331,8 +3200,7 @@ msgstr "Inserire la chiave di accesso per proseguire."
 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
+#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
 msgid "Validation conflict"
 msgstr "Conflitto di validazione"
 
@@ -3353,34 +3221,23 @@ msgid ""
 "Please specify a URL.\n"
 "For example:\n"
 "http://www.example.com/"
-msgstr ""
-"Specificare un URL.\n"
-"Per esempio:\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
+#: 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: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.\n"
-"Per esempio:\n"
-"http://boincproject.example.com"
+msgstr "Specificare un URL valido.\nPer esempio:\nhttp://boincproject.example.com"
 
-#: clientgui/ValidateURL.cpp:104
-#: clientgui/ValidateURL.cpp:108
+#: clientgui/ValidateURL.cpp:104 clientgui/ValidateURL.cpp:108
 #, c-format
 msgid "'%s' does not contain a valid host name."
 msgstr "'%s' non contiene un nome di computer valido."
@@ -3391,7 +3248,6 @@ msgid "'%s' does not contain a valid path."
 msgstr "'%s' non contiene un percorso valido."
 
 #: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:175
 msgid "Commands"
 msgstr "Comandi"
 
@@ -3403,13 +3259,11 @@ msgstr "Copia tutti i messaggi"
 msgid "Copy selected messages"
 msgstr "Copia i messaggi selezionati"
 
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
+#: 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
+#: 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."
 
@@ -3437,119 +3291,120 @@ msgstr "Mostra tutti i messaggi"
 msgid "Show messages for all projects."
 msgstr "Mostra i messaggi di tutti i progetti."
 
-#: clientgui/ViewProjects.cpp:225
+#: clientgui/ViewProjects.cpp:246 clientgui/ViewStatistics.cpp:426
 msgid "Account"
 msgstr "Account"
 
-#: clientgui/ViewProjects.cpp:227
+#: clientgui/ViewProjects.cpp:248
 msgid "Work done"
 msgstr "Crediti totali"
 
-#: clientgui/ViewProjects.cpp:228
+#: clientgui/ViewProjects.cpp:249
 msgid "Avg. work done"
 msgstr "Media dei crediti"
 
-#: clientgui/ViewProjects.cpp:230
+#: clientgui/ViewProjects.cpp:251 clientgui/ViewTransfers.cpp:215
+#: clientgui/ViewWork.cpp:262
 msgid "Status"
 msgstr "Stato"
 
-#: clientgui/ViewProjects.cpp:255
+#: clientgui/ViewProjects.cpp:330
 msgid "Projects"
 msgstr "Progetti"
 
-#: clientgui/ViewProjects.cpp:307
+#: clientgui/ViewProjects.cpp:382
 msgid "Updating project..."
 msgstr "Aggiornamento del progetto in corso..."
 
-#: clientgui/ViewProjects.cpp:349
+#: clientgui/ViewProjects.cpp:424
 msgid "Resuming project..."
 msgstr "Riavvio del progetto in corso..."
 
-#: clientgui/ViewProjects.cpp:353
+#: clientgui/ViewProjects.cpp:428
 msgid "Suspending project..."
 msgstr "Sospensione del progetto in corso..."
 
-#: clientgui/ViewProjects.cpp:390
+#: clientgui/ViewProjects.cpp:465
 msgid "Telling project to allow additional task downloads..."
 msgstr "Comunicazione con il progetto per abilitare lo scaricamento di ulteriore lavoro in corso..."
 
-#: clientgui/ViewProjects.cpp:394
+#: clientgui/ViewProjects.cpp:469
 msgid "Telling project to not fetch any additional tasks..."
 msgstr "Comunicazione con il progetto per non ottenere ulteriore lavoro in corso..."
 
-#: clientgui/ViewProjects.cpp:430
+#: clientgui/ViewProjects.cpp:505
 msgid "Resetting project..."
 msgstr "Reset del progetto in corso..."
 
-#: clientgui/ViewProjects.cpp:488
+#: clientgui/ViewProjects.cpp:563
 msgid "Removing project..."
 msgstr "Rimozione del progetto in corso..."
 
-#: clientgui/ViewProjects.cpp:548
+#: clientgui/ViewProjects.cpp:623 clientgui/ViewWork.cpp:686
 msgid "Launching browser..."
 msgstr "Avvio del browser in corso..."
 
-#: clientgui/ViewProjects.cpp:1063
+#: clientgui/ViewProjects.cpp:1140
 msgid "Requested by user"
 msgstr "Richiesto dall'utente"
 
-#: clientgui/ViewProjects.cpp:1064
+#: clientgui/ViewProjects.cpp:1141
 msgid "To fetch work"
 msgstr "Per ottenere lavoro"
 
-#: clientgui/ViewProjects.cpp:1065
+#: clientgui/ViewProjects.cpp:1142
 msgid "To report completed tasks"
 msgstr "Per riportare attività completate"
 
-#: clientgui/ViewProjects.cpp:1066
+#: clientgui/ViewProjects.cpp:1143
 msgid "To send trickle-up message"
 msgstr "Per mandare un messaggio istantaneo al server"
 
-#: clientgui/ViewProjects.cpp:1067
+#: clientgui/ViewProjects.cpp:1144
 msgid "Requested by account manager"
 msgstr "Richiesto dall'account manager"
 
-#: clientgui/ViewProjects.cpp:1068
+#: clientgui/ViewProjects.cpp:1145
 msgid "Project initialization"
 msgstr "Inizializzazione del progetto"
 
-#: clientgui/ViewProjects.cpp:1069
+#: clientgui/ViewProjects.cpp:1146
 msgid "Requested by project"
 msgstr "Richiesto dal progetto"
 
-#: clientgui/ViewProjects.cpp:1070
+#: clientgui/ViewProjects.cpp:1147
 msgid "Unknown reason"
 msgstr "Motivo sconosciuto"
 
-#: clientgui/ViewProjects.cpp:1084
+#: clientgui/ViewProjects.cpp:1161
 msgid "Suspended by user"
 msgstr "Sospeso dall'utente"
 
-#: clientgui/ViewProjects.cpp:1087
+#: clientgui/ViewProjects.cpp:1164
 msgid "Won't get new tasks"
 msgstr "Non richiedere nuovo lavoro"
 
-#: clientgui/ViewProjects.cpp:1090
+#: clientgui/ViewProjects.cpp:1167
 msgid "Project ended - OK to remove"
 msgstr "Progetto concluso. E' possibile rimuoverlo senza conseguenze."
 
-#: clientgui/ViewProjects.cpp:1093
+#: clientgui/ViewProjects.cpp:1170
 msgid "Will remove when tasks done"
 msgstr "Rimuovi il progetto al termine dell'elaborazione"
 
-#: clientgui/ViewProjects.cpp:1096
+#: clientgui/ViewProjects.cpp:1173
 msgid "Scheduler request pending"
 msgstr "Richiesta allo scheduler in attesa"
 
-#: clientgui/ViewProjects.cpp:1102
+#: clientgui/ViewProjects.cpp:1179
 msgid "Scheduler request in progress"
 msgstr "Richiesta allo scheduler in corso"
 
-#: clientgui/ViewProjects.cpp:1105
+#: clientgui/ViewProjects.cpp:1182
 msgid "Trickle up message pending"
 msgstr "attesa su messaggio trickle"
 
-#: clientgui/ViewProjects.cpp:1111
+#: clientgui/ViewProjects.cpp:1188
 msgid "Communication deferred "
 msgstr "Comunicazione rinviata "
 
@@ -3561,31 +3416,27 @@ msgstr "Totale dello spazio del disco utilizzato"
 msgid "Disk usage by BOINC projects"
 msgstr "Spazio del disco utilizzato dai progetti BOINC"
 
-#: clientgui/ViewResources.cpp:116
-msgid "Disk"
-msgstr "Disco"
-
 #: clientgui/ViewResources.cpp:225
 msgid "no projects: 0 bytes used"
 msgstr "Nessun progetto: 0 bytes utlizzati"
 
-#: clientgui/ViewResources.cpp:262
+#: clientgui/ViewResources.cpp:259
 msgid "used by BOINC: "
 msgstr "usato da BOINC:"
 
-#: clientgui/ViewResources.cpp:272
+#: clientgui/ViewResources.cpp:269
 msgid "free, available to BOINC: "
 msgstr "libero, utilizzabile da BOINC:"
 
-#: clientgui/ViewResources.cpp:282
+#: clientgui/ViewResources.cpp:279
 msgid "free, not available to BOINC: "
 msgstr "libero, non utilizzabile da BOINC:"
 
-#: clientgui/ViewResources.cpp:292
+#: clientgui/ViewResources.cpp:289
 msgid "free: "
 msgstr "libero:"
 
-#: clientgui/ViewResources.cpp:302
+#: clientgui/ViewResources.cpp:299
 msgid "used by other programs: "
 msgstr "utilizzato da altri programmi:"
 
@@ -3658,13 +3509,11 @@ msgstr "Progetto &successivo >"
 msgid "Show chart for next project"
 msgstr "Mostra il grafico per il progetto successivo"
 
-#: clientgui/ViewStatistics.cpp:2000
-#: clientgui/ViewStatistics.cpp:2390
+#: clientgui/ViewStatistics.cpp:2000 clientgui/ViewStatistics.cpp:2390
 msgid "Hide project list"
 msgstr "Nascondi la lista dei progetti"
 
-#: clientgui/ViewStatistics.cpp:2001
-#: clientgui/ViewStatistics.cpp:2390
+#: clientgui/ViewStatistics.cpp:2001 clientgui/ViewStatistics.cpp:2390
 msgid "Use entire area for graphs"
 msgstr "Utilizza l'intera area per i grafici"
 
@@ -3708,16 +3557,11 @@ msgstr "Mostrala somma dei progetti in un unico grafico"
 msgid "Statistics"
 msgstr "Statistiche"
 
-#: clientgui/ViewStatistics.cpp:2077
-#: clientgui/ViewStatistics.cpp:2098
-#: clientgui/ViewStatistics.cpp:2119
-#: clientgui/ViewStatistics.cpp:2141
-#: clientgui/ViewStatistics.cpp:2162
-#: clientgui/ViewStatistics.cpp:2183
-#: clientgui/ViewStatistics.cpp:2204
-#: clientgui/ViewStatistics.cpp:2225
-#: clientgui/ViewStatistics.cpp:2246
-#: clientgui/ViewStatistics.cpp:2270
+#: clientgui/ViewStatistics.cpp:2077 clientgui/ViewStatistics.cpp:2098
+#: clientgui/ViewStatistics.cpp:2119 clientgui/ViewStatistics.cpp:2141
+#: clientgui/ViewStatistics.cpp:2162 clientgui/ViewStatistics.cpp:2183
+#: clientgui/ViewStatistics.cpp:2204 clientgui/ViewStatistics.cpp:2225
+#: clientgui/ViewStatistics.cpp:2246 clientgui/ViewStatistics.cpp:2270
 msgid "Updating charts..."
 msgstr "Aggiornamento dei grafici in corso..."
 
@@ -3729,200 +3573,185 @@ msgstr "Mostra la lista dei progetti"
 msgid "Uses smaller area for graphs"
 msgstr "Utilizza un'area minore per i grafici"
 
-#: clientgui/ViewTransfers.cpp:169
+#: clientgui/ViewTransfers.cpp:187
 msgid "Retry Now"
 msgstr "Ritenta il trasferimento"
 
-#: clientgui/ViewTransfers.cpp:170
+#: clientgui/ViewTransfers.cpp:188
 msgid "Retry the file transfer now"
 msgstr "Riprova il trasferimento del file ora"
 
-#: clientgui/ViewTransfers.cpp:176
+#: clientgui/ViewTransfers.cpp:194
 msgid "Abort Transfer"
 msgstr "Annulla il trasferimento"
 
-#: clientgui/ViewTransfers.cpp:177
+#: clientgui/ViewTransfers.cpp:195
 msgid "Abort this file transfer.  You won't get credit for the task."
 msgstr "Annulla il trasferimento di questo file.  Non otterrai crediti per il lavoro."
 
-#: clientgui/ViewTransfers.cpp:188
+#: clientgui/ViewTransfers.cpp:210
 msgid "File"
 msgstr "File"
 
-#: clientgui/ViewTransfers.cpp:189
-#: clientgui/ViewWork.cpp:238
+#: clientgui/ViewTransfers.cpp:211 clientgui/ViewWork.cpp:261
 msgid "Progress"
 msgstr "Avanzamento"
 
-#: clientgui/ViewTransfers.cpp:190
+#: clientgui/ViewTransfers.cpp:212
 msgid "Size"
 msgstr "Dimensione"
 
-#: clientgui/ViewTransfers.cpp:191
-msgid "Elapsed Time"
-msgstr "Tempo trascorso"
+#: clientgui/ViewTransfers.cpp:213 clientgui/ViewWork.cpp:263
+msgid "Elapsed"
+msgstr "Tempo"
 
-#: clientgui/ViewTransfers.cpp:192
+#: clientgui/ViewTransfers.cpp:214
 msgid "Speed"
 msgstr "Velocità"
 
-#: clientgui/ViewTransfers.cpp:218
+#: clientgui/ViewTransfers.cpp:295
 msgid "Transfers"
 msgstr "Trasferimenti"
 
-#: clientgui/ViewTransfers.cpp:285
+#: clientgui/ViewTransfers.cpp:362
 msgid "Network activity is suspended - "
 msgstr "L'attività di rete è sospesa -"
 
-#: clientgui/ViewTransfers.cpp:287
+#: clientgui/ViewTransfers.cpp:364
 msgid ""
 ".\n"
 "You can enable it using the Activity menu."
-msgstr ""
-".\n"
-"Puoi attivarlo utlizzando il menù Attività"
+msgstr ".\nPuoi attivarlo utlizzando il menù Attività"
 
-#: clientgui/ViewTransfers.cpp:290
+#: clientgui/ViewTransfers.cpp:367
 msgid "BOINC"
 msgstr "BOINC"
 
-#: clientgui/ViewTransfers.cpp:297
+#: clientgui/ViewTransfers.cpp:374
 msgid "Retrying transfer now..."
 msgstr "Tentativo di trasferimento in corso..."
 
-#: clientgui/ViewTransfers.cpp:335
+#: clientgui/ViewTransfers.cpp:412
 msgid "Aborting transfer..."
 msgstr "Interruzione del trasferimento in corso..."
 
-#: clientgui/ViewTransfers.cpp:348
+#: 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'?\n"
-"NOTA: Annullando il trasferimento, invaliderai l'elaborazione e\n"
-"non otterrai i relativi crediti."
+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:354
+#: clientgui/ViewTransfers.cpp:431
 msgid "Abort File Transfer"
 msgstr "Annulla il trasferimento del file"
 
-#: clientgui/ViewTransfers.cpp:785
+#: clientgui/ViewTransfers.cpp:864
 msgid "Upload"
 msgstr "Invio"
 
-#: clientgui/ViewTransfers.cpp:785
+#: clientgui/ViewTransfers.cpp:864
 msgid "Download"
 msgstr "Ricezione"
 
-#: clientgui/ViewTransfers.cpp:789
+#: clientgui/ViewTransfers.cpp:868
 msgid "retry in "
 msgstr "Riprova tra "
 
-#: clientgui/ViewTransfers.cpp:791
+#: clientgui/ViewTransfers.cpp:870
 msgid "failed"
 msgstr "fallito"
 
-#: clientgui/ViewTransfers.cpp:794
+#: clientgui/ViewTransfers.cpp:873
 msgid "suspended"
 msgstr "sospeso"
 
-#: clientgui/ViewTransfers.cpp:799
+#: clientgui/ViewTransfers.cpp:878
 msgid "active"
 msgstr "attivo"
 
-#: clientgui/ViewTransfers.cpp:801
+#: clientgui/ViewTransfers.cpp:880
 msgid "pending"
 msgstr "in attesa"
 
-#: clientgui/ViewTransfers.cpp:808
+#: clientgui/ViewTransfers.cpp:887
 msgid " (project backoff: "
 msgstr "(rinvio causa progetto: "
 
-#: clientgui/ViewWork.cpp:192
-#: clientgui/ViewWork.cpp:782
+#: clientgui/ViewWork.cpp:211 clientgui/ViewWork.cpp:864
 msgid "Show active tasks"
 msgstr "Mostra le elaborazioni in corso"
 
-#: clientgui/ViewWork.cpp:193
-#: clientgui/ViewWork.cpp:783
+#: clientgui/ViewWork.cpp:212 clientgui/ViewWork.cpp:865
 msgid "Show only active tasks."
 msgstr "Mostra solo le elaborazioni in corso."
 
-#: clientgui/ViewWork.cpp:206
+#: clientgui/ViewWork.cpp:225
 msgid "Show VM Console"
 msgstr "Mostra la Console VM"
 
-#: clientgui/ViewWork.cpp:207
+#: clientgui/ViewWork.cpp:226
 msgid "Show VM Console in a window."
 msgstr "Mostra la console VM in una finestra."
 
-#: clientgui/ViewWork.cpp:214
+#: clientgui/ViewWork.cpp:233
 msgid "Suspend work for this result."
 msgstr "Sospende l'elaborazione selezionata."
 
-#: clientgui/ViewWork.cpp:221
+#: 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:240
-msgid "Elapsed"
-msgstr "Tempo"
-
-#: clientgui/ViewWork.cpp:241
+#: clientgui/ViewWork.cpp:264
 msgid "Remaining (estimated)"
 msgstr "Tempo mancante (stimato)"
 
-#: clientgui/ViewWork.cpp:242
+#: clientgui/ViewWork.cpp:265
 msgid "Deadline"
 msgstr "Scadenza"
 
-#: clientgui/ViewWork.cpp:269
+#: clientgui/ViewWork.cpp:351
 msgid "Tasks"
 msgstr "Elaborazioni"
 
-#: clientgui/ViewWork.cpp:362
+#: clientgui/ViewWork.cpp:444
 msgid "Resuming task..."
 msgstr "Avvio dell'elaborazione..."
 
-#: clientgui/ViewWork.cpp:365
+#: clientgui/ViewWork.cpp:447
 msgid "Suspending task..."
 msgstr "Sospensione dell'elaborazione..."
 
-#: clientgui/ViewWork.cpp:394
+#: clientgui/ViewWork.cpp:476
 msgid "Showing graphics for task..."
 msgstr "Mostra la grafica dell'applicazione..."
 
-#: clientgui/ViewWork.cpp:431
+#: clientgui/ViewWork.cpp:513
 msgid "Showing VM console for task..."
 msgstr "Mostra la console VM per il lavoro..."
 
-#: clientgui/ViewWork.cpp:484
+#: 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)"
+msgstr "Sei sicuro di voler annullare l'elaborazione di '%s'?\n(Avanzamento: %s, Stato: %s)"
 
-#: clientgui/ViewWork.cpp:490
+#: 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?"
 
-# 75%
-#: clientgui/ViewWork.cpp:504
+#: clientgui/ViewWork.cpp:586
 msgid "Aborting task..."
 msgstr "Interruzione del lavoro in corso..."
 
-#: clientgui/ViewWork.cpp:776
+#: clientgui/ViewWork.cpp:858
 msgid "Show all tasks"
 msgstr "Mostra tutte le elaborazioni"
 
-#: clientgui/ViewWork.cpp:777
+#: clientgui/ViewWork.cpp:859
 msgid "Show all tasks."
 msgstr "Mostra tutte le elaborazioni."
 
@@ -3942,12 +3771,7 @@ msgid ""
 "\n"
 "Projects added via this wizard will not be\n"
 "listed on or managed via %s."
-msgstr ""
-"Se possibile, aggiungi progetti dal\n"
-"sito web di %s.\n"
-"\n"
-"I progetti aggiunti tramite la procedura guidata\n"
-"non saranno mostrati o gestiti da %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/WelcomePage.cpp:313
 msgid ""
@@ -3956,12 +3780,7 @@ msgid ""
 "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\n"
-"per fare ricerca in molte aree della scienza,\n"
-"e si può fare volontariato per il maggior numero di essi.\n"
-"È possibile aggiungere un progetto direttamente,\n"
-"oppure utilizzare un 'Account Manager per selezionare i progetti."
+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/WelcomePage.cpp:325
 msgid ""
@@ -3976,18 +3795,7 @@ msgid ""
 "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\n"
-"sui quali contribuire.\n"
-"\n"
-"Alcuni di questi progetti sono fatti girare e gestiti dalla World Community Grid, mentre altri\n"
-"sono fatti girare e gestiti da altri istituti di ricerca o organizzazioni. Il software BOINC\n"
-"può dividere il tuo tempo di elaborazione libero su una combinazione qualunque dei progetti.\n"
-"\n"
-"Alternativamente, se ti sei registrato con un BOINC Account Manager, puoi usare\n"
-"questo per scegliere quali progetti supportare.\n"
-"\n"
-"Per favore scegli quale tipo di cambiamento vuoi effettuare:\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/WelcomePage.cpp:339
 msgid "Use a BOINC Account Manager"
@@ -4001,16 +3809,15 @@ msgstr "Aggiungi o cambia i tuoi progetti World Community Grid"
 msgid "Add projects run by other researchers or organizations"
 msgstr "Aggiungi progetti gestiti da altri istituti di ricerca o organizzazioni"
 
-#: clientgui/WizardAttach.cpp:673
+#: clientgui/WizardAttach.cpp:560
 msgid "Do you really want to cancel?"
 msgstr "Sei certo di voler annullare?"
 
-#: clientgui/WizardAttach.cpp:674
+#: clientgui/WizardAttach.cpp:561
 msgid "Question"
 msgstr "Domanda"
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
+#: clientgui/wizardex.cpp:377 clientgui/wizardex.cpp:553
 msgid "&Next >"
 msgstr "&Avanti >"
 
@@ -4024,7 +3831,7 @@ msgstr "&Fine"
 
 #: clientgui/common/wxPieCtrl.cpp:64
 msgid "Pie Ctrl"
-msgstr "Controllo"
+msgstr "Grafico a Torta"
 
 #: clientgui/mac/Mac_GUI.cpp:35
 msgid "Services"
@@ -4048,610 +3855,10 @@ msgstr "Mostra tutti"
 msgid "Quit %s"
 msgstr "Esci da %s"
 
-#: clientgui/DlgAdvPreferences.h:30
-msgid "specify work start and stop hours in format HH:MM-HH:MM"
-msgstr "specifica l'orario di avvio e arresto dell'elaborazione nel formato HH:MM-HH:MM"
-
-#: clientgui/DlgAdvPreferences.h:31
-msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
-msgstr "specifica l'orario di avvio e arresto per l'uso della rete nel formato HH:MM-HH:MM"
-
-# 98%
-#~ msgid ""
-#~ "(C) 2003-2013 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2013 Università della California, Berkeley.\n"
-#~ "Tutti i diritti riservati."
-#, c-format
-#~ msgid "%s - Preferences"
-#~ msgstr "%s - Preferenze"
-
-#, no-c-format
-#~ msgid "% of the processors (0 means ignore this setting)"
-#~ msgstr "% dei processori (0 significa ignora questa impostazione)"
-
-#, no-c-format
-#~ msgid "% CPU time"
-#~ msgstr "% della CPU"
-#~ msgid "KBytes/sec."
-#~ msgstr "KBytes/sec."
-#~ msgid "Mbytes"
-#~ msgstr "Mbytes"
-#~ msgid "every"
-#~ msgstr "ogni"
-#~ msgid "days"
-#~ msgstr "giorni"
-#~ msgid "Gigabytes disk space"
-#~ msgstr "Gigabytes di spazio sul disco"
-#~ msgid "Running, high priority"
-#~ msgstr "In elaborazione, priorità alta"
-#~ msgid " (Scheduler wait: "
-#~ msgstr " (In attesa dello Scheduler:"
-#~ msgid " (Scheduler wait)"
-#~ msgstr " (Attesa dello scheduler)"
-#~ msgid " (Waiting for network access)"
-#~ msgstr " (In attesa di accesso alla rete)"
-#~ msgid "Preferences…"
-#~ msgstr "Preferenze..."
-#~ msgid "Account manager website"
-#~ msgstr "Sito web dell'account manager"
-#~ msgid "Account Manager &URL:"
-#~ msgstr "&URL dell'Account Manager:"
-
-#, c-format
-#~ msgid "%s &website"
-#~ msgstr "Sito &web di %s"
-#~ msgid "invalid float"
-#~ msgstr "numero decimale non valido"
-#~ msgid "Workunit name"
-#~ msgstr "Nome dell'unità di lavoro"
-#~ msgid "Notice List"
-#~ msgstr "Lista degli avvisi"
-
-#, c-format
-#~ msgid "%s; received on %s"
-#~ msgstr "%s; ricevuto su %s"
-
-#, c-format
-#~ msgid "%s; received from %s; on %s"
-#~ msgstr "%s: ricevuto da %s; su %s"
-#~ msgid "Click"
-#~ msgstr "Clicca"
-#~ msgid "Project List"
-#~ msgstr "Lista dei Progetti"
-#~ msgid "Nvidia GPU Supported"
-#~ msgstr "GPU Nvidia Supportata"
-#~ msgid "ATI GPU Supported"
-#~ msgstr "GPU ATI Supportata"
-#~ msgid "Project Website"
-#~ msgstr "Sito web progetto"
-#~ msgid "I do not agree with the terms of use."
-#~ msgstr "Non accetto le condizioni d'uso."
-#~ msgid "One or more items failed to load from the Internet."
-#~ msgstr "Lo scaricamento di uno o più elementi da Internet è fallito."
-
-# 88%
-#~ msgid "Retry now"
-#~ msgstr "Ritenta ora"
-#~ msgid "Display the advanced (accessible) graphical interface."
-#~ msgstr "Visualizza l'interfaccia grafica avanzata."
-#~ msgid "10%"
-#~ msgstr "10%"
-#~ msgid "20%"
-#~ msgstr "20%"
-#~ msgid "30%"
-#~ msgstr "30%"
-#~ msgid "40%"
-#~ msgstr "40%"
-#~ msgid "50%"
-#~ msgstr "50%"
-#~ msgid "60%"
-#~ msgstr "60%"
-#~ msgid "70%"
-#~ msgstr "70%"
-#~ msgid "80%"
-#~ msgstr "80%"
-#~ msgid "90%"
-#~ msgstr "90%"
-#~ msgid "100%"
-#~ msgstr "100%"
-#~ msgid "1"
-#~ msgstr "1"
-#~ msgid "3"
-#~ msgstr "3"
-#~ msgid "5"
-#~ msgstr "5"
-#~ msgid "10"
-#~ msgstr "10"
-#~ msgid "15"
-#~ msgstr "15"
-#~ msgid "30"
-#~ msgstr "30"
-#~ msgid "60"
-#~ msgstr "60"
-#~ msgid "Click Clear to restore web-based settings."
-#~ msgstr "Clicca Cancella per ripristinare le preferenze web."
-#~ msgid "For additional settings, select Computing Preferences in "
-#~ msgstr "Per impostazioni aggiuntive, seleziona Preferenze di elaborazione nel "
-#~ msgid "the Advanced View."
-#~ msgstr "la Visualizzazione Avanzata."
-#~ msgid "Paused: Other work running"
-#~ msgstr "In pausa: altre elaborazioni in corso"
-#~ msgid "Paused: User initiated.  Click 'Resume' to continue"
-#~ msgstr "In pausa: impostato dall'utente.  Clicca su 'Riprendi' per continuare"
-#~ msgid "Paused: User active"
-#~ msgstr "In pausa: utente attivo"
-#~ msgid "Paused: Computer on battery"
-#~ msgstr "In pausa: alimentazione a batteria"
-#~ msgid "Paused: Time of Day"
-#~ msgstr "In pausa: superati i limiti di orario"
-#~ msgid "Paused: Benchmarks running"
-#~ msgstr "In pausa: esecuzione dei benchmark"
-#~ msgid "Paused"
-#~ msgstr "Sospeso"
-#~ msgid "Paused: Application start delayed"
-#~ msgstr "Sospeso: l'avvio dell'applicazione è stato rimandato"
-#~ msgid "Click to show project graphics"
-#~ msgstr "Clicca per visualizzare la grafica del progetto"
-#, c-format
-#~ msgid "Pop up a menu of websites for project %s"
-#~ msgstr "Apri una finestra con i siti web per il progetto %s"
-#~ msgid "Open a window to view messages"
-#~ msgstr "Apri la finestra per visualizzare i messaggi"
-#~ msgid "Stop all activity"
-#~ msgstr "Ferma tutte le attività"
-#~ msgid "Resume activity"
-#~ msgstr "Riprendi le attività"
-#~ msgid "Open a window to set your preferences"
-#~ msgstr "Apri la finestra per impostare le tue preferenze"
-#~ msgid "Switch to the BOINC advanced view"
-#~ msgstr "Passa alla visualizzazione avanzata di BOINC"
-#~ msgid "My Projects:"
-#~ msgstr "I miei progetti:"
-
-#, c-format
-#~ msgid "%s. Work done by %s: %0.2f"
-#~ msgstr "%s. Crediti ottenuti da %s: %0.2f"
-
-#, c-format
-#~ msgid "%.1lf"
-#~ msgstr "%.1lf"
-
-#, c-format
-#~ msgid "%d hr %d min %d sec"
-#~ msgstr "%d ore %d min %d sec"
-#~ msgid "Are you sure you want to display graphics on a remote machine?"
-#~ msgstr "Sei sicuro di voler mostrare la grafica in remoto?"
-#~ msgid "Application: "
-#~ msgstr "Applicazione:"
-#~ msgid "Time Remaining: "
-#~ msgstr "Tempo mancante:"
-#~ msgid "Elapsed Time: "
-#~ msgstr "Tempo trascorso:"
-#~ msgid ""
-#~ "for accessibility support, please select advanced from the view menu or type "
-#~ "command shift a"
-#~ msgstr ""
-#~ "per il supporto accessibilità, per favore seleziona avanzate dal menu "
-#~ "visualizza oppure premi command shift a"
-#~ msgid "This panel contains graphs showing user totals for projects"
-#~ msgstr ""
-#~ "Questo pannello contiene grafici che visualizzano il totale utente per i "
-#~ "progetti"
-#~ msgid "list headers"
-#~ msgstr "intestazioni della lista"
-#~ msgid "list of events"
-#~ msgstr "lista degli eventi"
-#~ msgid "list of events is empty"
-#~ msgstr "la lista degli eventi è vuota"
-
-#, c-format
-#~ msgid "list of %s"
-#~ msgstr "lista di %s"
-
-#, c-format
-#~ msgid "list of %s is empty"
-#~ msgstr "la lista di %s è vuota"
-
-#, c-format
-#~ msgid "; current sort column %d of %d; descending order; "
-#~ msgstr "; ordinamento corrente della colonna %d di %d; ordine discendente;"
-
-#, c-format
-#~ msgid "; current sort column %d of %d; ascending order; "
-#~ msgstr "; ordinamento corrente della colonna %d di %d; ordinamento ascendente;"
-
-#, c-format
-#~ msgid "; column %d of %d; "
-#~ msgstr "; colonna %d di %d"
-#~ msgid "list is empty"
-#~ msgstr "la lista è vuota"
-
-#, c-format
-#~ msgid "; row %d; "
-#~ msgstr "; riga %d;"
-
-#, c-format
-#~ msgid "; selected row %d of %d; "
-#~ msgstr "; riga selezionara %d di %d"
-
-#, c-format
-#~ msgid "; selected row %d ; "
-#~ msgstr "; riga selezionata %d ;"
-
-#, c-format
-#~ msgid "; row %d of %d; "
-#~ msgstr "riga %d di %d "
-#~ msgid "blank"
-#~ msgstr "vuota"
-#~ msgid "list of projects or account managers"
-#~ msgstr "Elenco dei progetti o degli account manager"
-
-#, c-format
-#~ msgid "selected row %d of %d; "
-#~ msgstr "riga selezionata %d di %d;"
-
-#, c-format
-#~ msgid "row %d of %d; "
-#~ msgstr "riga %d di %d "
-#~ msgid "The minimum username length for this project is 1. Please enter a different username."
-#~ msgstr ""
-#~ "La lunghezza minima dello username per questo progetto è 1. Per favore "
-#~ "inserisci uno username diverso."
-#~ msgid "The minimum username length for this account manager is 1. Please enter a different username."
-#~ msgstr ""
-#~ "La lunghezza minima dello username per questo account manager è 1. Per "
-#~ "favore inserisci uno username diverso."
-#~ msgid "The minimum email address length for this project is 1. Please enter a different email address."
-#~ msgstr ""
-#~ "La lunghezza minima dell'indirizzo email per questo progetto è 1. Per favore "
-#~ "inserisci una email diversa."
-#~ msgid "The minimum email address length for this account manager is 1. Please enter a different email address."
-#~ msgstr ""
-#~ "La lunghezza minima dell'indirizzo email per questo account manager è 1. Per "
-#~ "favore inserisci una email diversa."
-
-#, c-format
-#~ msgid "The minimum password length for this project is %d. Please enter a different password."
-#~ msgstr ""
-#~ "La lunghezza minima della password per questo progetto è %d. Sei pregato di "
-#~ "inserire una password diversa."
-
-#, c-format
-#~ msgid "The minimum password length for this account manager is %d. Please enter a different password."
-#~ msgstr ""
-#~ "La lunghezza minima della password per questo account manager è %d. Sei "
-#~ "pregato di inserire una password diversa."
-#~ msgid ""
-#~ "An error has occurred;\n"
-#~ "check the Event Log for details.\n"
-#~ "\n"
-#~ "Click Finish to close."
-#~ msgstr ""
-#~ "Si è verificato un errore;\n"
-#~ "controlla il Registro eventi per maggiori dettagli.\n"
-#~ "\n"
-#~ "Clicca su Fine per chiudere."
-
-#, no-c-format
-#~ msgid "% of the processors"
-#~ msgstr "% dei processori"
-
-#, c-format
-#~ msgid "New page inserted. Index = %i"
-#~ msgstr "Inserita nuova pagina. Indice = %i"
-
-#, c-format
-#~ msgid "New page appended. Index = %i"
-#~ msgstr "Aggiunta nuova pagina. Indice = %i"
-
-#, c-format
-#~ msgid "Old Page Index = %i"
-#~ msgstr "Indice vecchia pagina = %i"
-
-#, c-format
-#~ msgid "OnDropTarget: index by HitTest = %i"
-#~ msgstr "OnDropTarget: index by HitTest = %i"
-#~ msgid "Identify your account "
-#~ msgstr "Inserisci i tuoi dati "
-#~ msgid "Read config file"
-#~ msgstr "Leggi il file di configurazione"
-#~ msgid "Read configuration info from cc_config.xml"
-#~ msgstr "Leggi le informazioni di configurazione dal file cc_config.xml"
-#~ msgid ""
-#~ "(C) 2003-2011 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2011 Università della California, Berkeley.\n"
-#~ "Tutti i diritti riservati."
-#~ msgid "NVIDIA GPU"
-#~ msgstr "GPU NVIDIA"
-#~ msgid "ATI GPU"
-#~ msgstr "GPU ATI"
-#~ msgid ""
-#~ "The %s's default language has been changed, in order for this change to "
-#~ "take affect you must restart the %s."
-#~ msgstr ""
-#~ "La lingua di default di %s è stata cambiata, per rendere effettive le "
-#~ "modifiche occorre riavviare il %s."
-#~ msgid "Multicore CPU Supported"
-#~ msgstr "CPU Multicore supportata"
-#~ msgid "%s: %.0f"
-#~ msgstr "%s: %.0f"
-#~ msgid "Click 'Retry now' to transfer the file now"
-#~ msgstr "Clicca 'Ritenta il trasferimento' per trasferire nuovamente il file"
-#~ msgid ""
-#~ "Click 'Abort transfer' to delete the file from the transfer queue. This "
-#~ "will prevent you from being granted credit for this result."
-#~ msgstr ""
-#~ "Clicca 'Annulla il trasferimento' per cancellare il file dalla coda dei "
-#~ "trasferimenti. Questa azione comporterà la perdita dei crediti relativi a "
-#~ "questo risultato."
-#~ msgid "Aborting result..."
-#~ msgstr "Annullamento del risultato..."
-#~ msgid ""
-#~ "You have chosen to add a new BOINC project.  Adding a new\n"
-#~ "project means that you will be connecting your computer to a new "
-#~ "organization.\n"
-#~ "If this is what you wanted to do, please click on\n"
-#~ "the 'Next' button below.\n"
-#~ "\n"
-#~ "Some projects like World Community Grid run multiple research "
-#~ "applications.\n"
-#~ "If you want to change which research applications are sent to your "
-#~ "computer\n"
-#~ "to run, visit the project's website and modify your\n"
-#~ "preferences there.\n"
-#~ "\n"
-#~ "To change which research applications are sent to you from\n"
-#~ "World Community Grid then please click on the following button:"
-#~ msgstr ""
-#~ "Hai scelto di connetterti ad un nuovo progetto BOINC. Connettersi ad un "
-#~ "nuovo\n"
-#~ "progetto, significa connettere il proprio computer ad un nuovo sito web "
-#~ "ed a una\n"
-#~ "nuova organizzazione. Se questo è ciò che volevi, clicca sul tasto "
-#~ "'Avanti'\n"
-#~ "qui sotto.\n"
-#~ "\n"
-#~ "Alcuni progetti, come il World Community Grid, supportano diverse "
-#~ "applicazioni\n"
-#~ "di ricerca.Se vuoi cambiare le applicazioni di ricerca che vengono "
-#~ "inviate al tuo\n"
-#~ "computer per essere elaborate, visita la pagina web del progetto e "
-#~ "modifica le\n"
-#~ "tue preferenze.Per cambiare le applicazioni inviate da World Community "
-#~ "Grid,\n"
-#~ "clicca sul tasto seguente: "
-#~ msgid "Change Research Applications at World Community Grid"
-#~ msgstr "Modifica le applicazioni di ricerca su World Community Grid"
-#~ msgid "Don't fetch NVIDIA GPU tasks"
-#~ msgstr "Non richiedere nuovo lavoro per la GPU NVIDIA"
-#~ msgid "NVIDIA GPU work fetch deferred for"
-#~ msgstr "Richiesta di lavoro per la GPU NVIDIA rinviata di"
-#~ msgid "NVIDIA GPU work fetch deferral interval"
-#~ msgstr "Intervallo di rinvio"
-#~ msgid "Don't fetch ATI GPU tasks"
-#~ msgstr "Non richiedere nuovo lavoro per la GPU ATI"
-#~ msgid "ATI GPU work fetch deferred for"
-#~ msgstr "Richiesta di lavoro per la GPU ATI rinviata di"
-#~ msgid "ATI GPU work fetch deferral interval"
-#~ msgstr "Intervallo di rinvio"
-#~ msgid "Web sites"
-#~ msgstr "Siti web"
-#~ msgid "Connect about every"
-#~ msgstr "Connessione alla rete ogni"
-#~ msgid ""
-#~ "this computer is connected to the Internet about every X days\n"
-#~ "(0 if it's always connected)"
-#~ msgstr ""
-#~ "questo computer è connesso a Internet circa ogni X giorni\n"
-#~ "(0 se è sempre connesso)"
-#~ msgid "days (max. 10)"
-#~ msgstr "giorni (max 10)"
-#~ msgid "%d.%d%%"
-#~ msgstr "%d.%d%%"
-#~ msgid "Display and network &options..."
-#~ msgstr "Opzioni di visualizzazione e connessione di rete"
-#~ msgid ""
-#~ "You have requested to exit the %s,\n"
-#~ "which allows you to view and manage\n"
-#~ "the science applications running on your computer.\n"
-#~ "\n"
-#~ "If you also want to stop running the science applications when you\n"
-#~ "exit the Manager, then choose from the following options:"
-#~ msgstr ""
-#~ "Hai richiesto di chiudere il %s,\n"
-#~ "che ti permette di visualizzare e gestire\n"
-#~ "le elaborazioni in corso sul tuo computer.\n"
-#~ "\n"
-#~ "Se vuoi fermare anche le elaborazioni quando esci\n"
-#~ "dal Manager, scegli tra le opzioni seguenti:"
-#~ msgid "Stop running science applications when exiting the Manager"
-#~ msgstr "Ferma l'elaborazione quando esci dal Manager"
-#~ msgid "CPU work fetch priority"
-#~ msgstr "Priorità di richiesta di lavoro per la CPU"
-#~ msgid "NVIDIA GPU scheduling priority"
-#~ msgstr "Priorità esecuzione per la GPU NVIDIA "
-#~ msgid "NVIDIA GPU work fetch priority"
-#~ msgstr "Priorità di richiesta di lavoro per la GPU NVIDIA"
-#~ msgid "ATI GPU scheduling priority"
-#~ msgstr "Priorità della GPU ATI"
-#~ msgid "ATI GPU work fetch priority"
-#~ msgstr "Priorità di richiesta di lavoro per la GPU ATI"
-#~ msgid "Estimated app speed"
-#~ msgstr "Velocità stimata per app"
-#~ msgid "Estimated task size"
-#~ msgstr "Stima delle dimensioni del lavoro"
-#~ msgid "Max RAM usage"
-#~ msgstr "Utilizzo massimo della RAM"
-#~ msgid "%s - Options"
-#~ msgstr "%s - Opzioni..."
-#~ msgid "Retrieving host information; please wait..."
-#~ msgstr ""
-#~ "Recupero informazioni sul computer in corso; attendere per favore..."
-#~ msgid " (waiting for GPU memory)"
-#~ msgstr "(In attesa di memoria per la GPU)"
-#~ msgid "Manager Settings..."
-#~ msgstr "Impostazioni del Manager"
-#~ msgid "Pause"
-#~ msgstr "In pausa"
-#~ msgid "%s - Messages"
-#~ msgstr "%s - Messaggi"
-#~ msgid "Skin:"
-#~ msgstr "Interfaccia:"
-#~ msgid "Preferences"
-#~ msgstr "Preferenze"
-#~ msgid "I want to customize my preferences for this computer only."
-#~ msgstr ""
-#~ "Voglio personalizzare le mie preferenze solamente per questo computer."
-#~ msgid "Customized Preferences"
-#~ msgstr "Preferenze personalizzate"
-#~ msgid "My total work done this Project"
-#~ msgstr "Il mio lavoro totale eseguito in questo Progetto"
-#~ msgid "My Tasks:"
-#~ msgstr "Le mie attività:"
-#~ msgid "From Project:"
-#~ msgstr "Dal Progetto:"
-#~ msgid "Elapsed Time: %s"
-#~ msgstr "Tempo trascorso: %s"
-#~ msgid "Upload suspended - "
-#~ msgstr "Invio sospeso -"
-#~ msgid "Download suspended - "
-#~ msgstr "Scaricamento sospeso -"
-#~ msgid "Upload pending"
-#~ msgstr "Invio in sospeso"
-#~ msgid "Download pending"
-#~ msgstr "Scaricamento in sospeso"
-#~ msgid "New Simple View..."
-#~ msgstr "Nuova Visualizzazione Semplice"
-#~ msgid "Old Simple View..."
-#~ msgstr "Vecchia Visualizzazione Semplice..."
-#~ msgid "Display the old simple graphical interface."
-#~ msgstr "Visualizza la vecchia 'interfaccia grafica semplice di BOINC"
-#~ msgid "Get help with BOINC"
-#~ msgstr "Ottieni aiuto su BOINC"
-#~ msgid "Event Log..."
-#~ msgstr "Log messaggi..."
-#~ msgid "Attaching to project or account manager..."
-#~ msgstr "In connessione al progetto o all'account manager..."
-#~ msgid "%s - Detach from %s"
-#~ msgstr "%s - Scollegarsi da %s"
-#~ msgid "Retrying communications."
-#~ msgstr "Nuovo tentativo di comunicazione con i/il progetti/o"
-#~ msgid "Failed to attach to project"
-#~ msgstr "La connessione al progetto non è riuscita"
-#~ msgid "Failed to attach to account manager"
-#~ msgstr "La connessione all'account manager non è riuscita"
-#~ msgid "Attached to account manager"
-#~ msgstr "Connesso all'account manager"
-#~ msgid "You are now successfully attached to the %s system."
-#~ msgstr "Sei stato connesso con successo al sistema %s."
-#~ msgid "You are now successfully attached to this account manager."
-#~ msgstr "Sei stato connesso con successo a questo account manager."
-#~ msgid "News Feeds"
-#~ msgstr "News Feed"
-#~ msgid "Display the latest news about BOINC"
-#~ msgstr "Mostra le ultime news su BOINC"
-#~ msgid "not attached to any BOINC project: 0 bytes"
-#~ msgstr "non connesso a nessun progetto BOINC - 0 bytes"
-#~ msgid "All projects"
-#~ msgstr "Tutti i progetti"
-#~ msgid "Attach to project"
-#~ msgstr "Connessione ad un progetto"
-#~ msgid "Attach to account manager"
-#~ msgstr "Connessione ad un account manager"
-#~ msgid "%s needs to connect to the Internet.  Please click to open %s."
-#~ msgstr "%s deve connettersi a Internet. Clicca qui per aprire %s."
-#~ msgid ""
-#~ "%s is unable to communicate with a project and needs an Internet "
-#~ "connection.\n"
-#~ "Please connect to the Internet, then select the 'Do network "
-#~ "communications' item from the Advanced menu."
-#~ msgstr ""
-#~ "%s non riesce a comunicare con il progetto e necessita di una connessione "
-#~ "ad Internet.\n"
-#~ "Avvia una connessione ad Internet e poi seleziona la voce 'Ritenta le "
-#~ "comunicazioni' dal menù Avanzate."
-#~ msgid ""
-#~ "%s couldn't do Internet communication, and no default connection is "
-#~ "selected.\n"
-#~ "Please connect to the Internet, or select a default connection\n"
-#~ "using Advanced/Options/Connections."
-#~ msgstr ""
-#~ "%s non riesce a comunicare via Internet e nessuna connessione di default "
-#~ "è stata selezionata.\n"
-#~ "Attiva una connessione Internet o seleziona una connessione di default\n"
-#~ "scegliendo Opzioni dal menù Avanzate, poi scheda Connessioni."
-#~ msgid "Attached to project"
-#~ msgstr "Sei connesso al progetto"
-#~ msgid "You are now successfully attached to this project."
-#~ msgstr "Sei stato connesso con successo a questo progetto."
-#~ msgid "Attached to %s"
-#~ msgstr "Connesso a %s"
-#~ msgid "Detach when done"
-#~ msgstr "Disconnetti dal progetto quando termina l'elaborazione"
-#~ msgid "Retrieving notices..."
-#~ msgstr "Ricezione avvisi..."
-#~ msgid "Detach"
-#~ msgstr "Rimuovi"
-#~ msgid "Detaching from project..."
-#~ msgstr "Rimozione del progetto in corso..."
-#~ msgid "Are you sure you want to detach from project '%s'?"
-#~ msgstr "Sei sicuro di volerti disconnettere dal progetto '%s'?"
-#~ msgid "Detach from Project"
-#~ msgstr "Disconnettiti dal progetto"
-#~ msgid " - user active"
-#~ msgstr " - utente attivo"
-#~ msgid " - computation suspended"
-#~ msgstr " - elaborazione sospesa"
-#~ msgid " - need disk space"
-#~ msgstr " - richiesto di spazio su disco"
-#~ msgid "Attach to an additional project"
-#~ msgstr "Connetti ad un altro progetto"
-#~ msgid "To completion"
-#~ msgstr "Al completamento"
-#~ msgid ""
-#~ "We'll guide you through the process of attaching\n"
-#~ "to a project or account manager."
-#~ msgstr ""
-#~ "Ti faremo da guida nel processo di connessione\n"
-#~ "ad un progetto a ad un account manager."
-#~ msgid "events"
-#~ msgstr "eventi"
-#~ msgid " is empty"
-#~ msgstr " è vuota"
-#~ msgid "%d of %d; "
-#~ msgstr "%d di %d "
-#~ msgid "current sort column "
-#~ msgstr "colonna attualmente ordinata "
-#~ msgid " descending order "
-#~ msgstr " ordine discendente "
-#~ msgid " ascending order "
-#~ msgstr " ordine ascendente  "
-#~ msgid "column "
-#~ msgstr "colonna "
-#~ msgid "of %d; "
-#~ msgstr "di %d "
-#~ msgid "Attach to a project or account manager to begin processing work"
-#~ msgstr ""
-#~ "Connettiti ad un progetto o ad un account manager per iniziare ad "
-#~ "elaborare"
-#~ msgid "Attach to a project to begin processing work"
-#~ msgstr "Connettiti ad un progetto per iniziare ad elaborare"
-#~ msgid "Use GPU never"
-#~ msgstr "Elaborazione GPU sospes&a"
-#~ msgid "BOINC Notification"
-#~ msgstr "Notifiche BOINC"
-#~ msgid ""
-#~ "TEST: Fluffy at Home just found out that the Fluffy project has been "
-#~ "published in Nature"
-#~ msgstr ""
-#~ "TEST: Fluffy at Home è stato trovato e il progetto Fluffy è stato pubblicato "
-#~ "in Nature"
-#~ msgid "%s: %.2f%% completed."
-#~ msgstr "%s: %.2f%% completato."
-#~ msgid "%d tasks running."
-#~ msgstr "%d elaborazioni in esecuzione."
+#: 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."
 
+#: clientgui/DlgAdvPreferencesBase.h:46
+msgid "On this day of the week, transfer files only during these hours."
+msgstr "In questo giorno della settimana, trasferisci file solo durante queste ore."
diff --git a/locale/it_IT/BOINC-Project-Generic.po b/locale/it_IT/BOINC-Project-Generic.po
old mode 100755
new mode 100644
index 8b2bb94..1e9197d
--- a/locale/it_IT/BOINC-Project-Generic.po
+++ b/locale/it_IT/BOINC-Project-Generic.po
@@ -1,26 +1,27 @@
 # BOINC web translation
 # Copyright (C) 2008 University of California
+# 
 # This file is distributed under the same license as BOINC.
+# 
 # FileID  : $Id$
+# 
+# Translators:
+# Daniele <daniele.nasuti at gmail.com>, 2015
+# Gianfranco Costamagna <costamagnagianfranco at yahoo.it>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: \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: 2014-06-27 14:55+0000\n"
-"Last-Translator: Gianfranco <costamagnagianfranco at yahoo.it>\n"
-"Language-Team: \n"
-"Language: it_IT\n"
+"POT-Creation-Date: 2015-03-04 08:56 PST\n"
+"PO-Revision-Date: 2015-03-16 16:30+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.5.0\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-SearchPath-0: html\\user\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
-"X-POOTLE-MTIME: 1403880903.0\n"
 
 msgid "LANG_NAME_NATIVE"
 msgstr "Italiano"
@@ -28,6 +29,96 @@ msgstr "Italiano"
 msgid "LANG_NAME_INTERNATIONAL"
 msgstr "Italian"
 
+#: ../inc/account.inc:38
+msgid "Invitation Code"
+msgstr "Codice d'invito"
+
+#: ../inc/account.inc:38
+msgid "A valid invitation code is required to create an account."
+msgstr "E' necessario un codice d'invito valido per poter creare un account."
+
+#: ../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 "Identificati sul nostro sito. Usa il tuo nome reale oppure un alias."
+
+#: ../inc/account.inc:48
+msgid "Email Address"
+msgstr "Email"
+
+#: ../inc/account.inc:48
+msgid "Must be a valid address of the form 'name at domain'."
+msgstr "Devi inserire un indirizzo email valido nella forma 'nome at dominio'."
+
+#: ../inc/account.inc:57 ../user/edit_email_form.php:47
+msgid "Password"
+msgstr "Password"
+
+#: ../inc/account.inc:58
+msgid "Must be at least %1 characters"
+msgstr "Deve essere di almeno %1 caratteri"
+
+#: ../inc/account.inc:61
+msgid "Confirm password"
+msgstr "Conferma la password"
+
+#: ../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 "Nazionalità"
+
+#: ../inc/account.inc:63 ../user/account_finish.php:45
+msgid "Select the country you want to represent, if any."
+msgstr "Seleziona la nazione che vuoi rappresentare, se lo desideri."
+
+#: ../inc/account.inc:70 ../user/account_finish.php:51
+msgid "Postal or ZIP Code"
+msgstr "CAP"
+
+#: ../inc/account.inc:70 ../user/account_finish.php:51
+msgid "Optional"
+msgstr "Dati facoltativi"
+
+#: ../inc/account.inc:86
+msgid "Create account"
+msgstr "Crea un account"
+
+#: ../inc/account.inc:101
+msgid "Email address:"
+msgstr "Indirizzo E-mail:"
+
+#: ../inc/account.inc:103
+msgid "forgot email address?"
+msgstr "hai dimenticato l'indirizzo mail?"
+
+#: ../inc/account.inc:106
+msgid "Password:"
+msgstr "Chiave d'accesso"
+
+#: ../inc/account.inc:106
+msgid "forgot password?"
+msgstr "hai dimenticato la password?"
+
+#: ../inc/account.inc:109
+msgid "Stay logged in"
+msgstr "Rimani autenticato"
+
+#: ../inc/account.inc:114 ../inc/util.inc:238 ../user/login_form.php:41
+msgid "Log in"
+msgstr "Entra"
+
 #: ../inc/bbcode_html.inc:11
 msgid "Bold text: [b]text[/b]  (alt+b)"
 msgstr "Testo in grassetto: [b]testo[/b]  (alt+b)"
@@ -41,344 +132,327 @@ msgid "Underline text: [u]text[/u]  (alt+u)"
 msgstr "Testo sottolineato: [u]testo[/u]  (alt+u)"
 
 #: ../inc/bbcode_html.inc:20
+msgid "Strikethrough text: [s]text[/s]  (alt+k)"
+msgstr "testo con Strikethrough: [s]testo[/s] (alt+k)"
+
+#: ../inc/bbcode_html.inc:23
 msgid "Quote text: [quote]text[/quote]  (alt+q)"
 msgstr "Testo citato: [quote]testo[/quote]  (alt+q)"
 
-#: ../inc/bbcode_html.inc:23
+#: ../inc/bbcode_html.inc:26
 msgid "Code display: [code]code[/code]  (alt+c)"
 msgstr "Mostra codice: [code]codice[/code]  (alt+c)"
 
-#: ../inc/bbcode_html.inc:26
+#: ../inc/bbcode_html.inc:29
 msgid "List: [list]text[/list] (alt+l)"
 msgstr "Lista: [list]testo[/list] (alt+l)"
 
-#: ../inc/bbcode_html.inc:29
+#: ../inc/bbcode_html.inc:32
 msgid "Ordered list: [list=]text[/list]  (alt+o)"
 msgstr "Lista ordinata: [list=]testo[/list] (alt+o)"
 
-#: ../inc/bbcode_html.inc:32
+#: ../inc/bbcode_html.inc:35
 msgid "Insert image: [img]http://image_url[/img]  (alt+p)"
 msgstr "Inserisci immagine: [img]http://url_immagine[/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 ""
-"Inserisci link: [url]http://link[/url] oppure [url=http://linkl]testo[/url] "
-"(alt+w)"
+msgstr "Inserisci link: [url]http://link[/url] oppure [url=http://linkl]testo[/url] (alt+w)"
 
-#: ../inc/bbcode_html.inc:42
+#: ../inc/bbcode_html.inc:45
 msgid "Font color"
 msgstr "Colore del carattere"
 
-#: ../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 ""
-"Colore del carattere: [color=red]testo[/color] Suggerimento: puoi anche "
-"usare color=#FF0000"
+msgstr "Colore del carattere: [color=red]testo[/color] Suggerimento: puoi anche usare 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 "Predefinito"
 
-#: ../inc/bbcode_html.inc:45
+#: ../inc/bbcode_html.inc:48
 msgid "Dark Red"
 msgstr "Rosso Scuro"
 
-#: ../inc/bbcode_html.inc:46
+#: ../inc/bbcode_html.inc:49
 msgid "Red"
 msgstr "Rosso"
 
-#: ../inc/bbcode_html.inc:47
+#: ../inc/bbcode_html.inc:50
 msgid "Orange"
 msgstr "Arancione"
 
-#: ../inc/bbcode_html.inc:48
+#: ../inc/bbcode_html.inc:51
 msgid "Brown"
 msgstr "Marrone"
 
-#: ../inc/bbcode_html.inc:49
+#: ../inc/bbcode_html.inc:52
 msgid "Yellow"
 msgstr "Giallo"
 
-#: ../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 "Verde oliva"
 
-#: ../inc/bbcode_html.inc:52
+#: ../inc/bbcode_html.inc:55
 msgid "Cyan"
 msgstr "Blu ciano"
 
-#: ../inc/bbcode_html.inc:53
+#: ../inc/bbcode_html.inc:56
 msgid "Blue"
 msgstr "Blu"
 
-#: ../inc/bbcode_html.inc:54
+#: ../inc/bbcode_html.inc:57
 msgid "Dark Blue"
 msgstr "Blu scuro"
 
-#: ../inc/bbcode_html.inc:55
+#: ../inc/bbcode_html.inc:58
 msgid "Indigo"
 msgstr "Indaco"
 
-#: ../inc/bbcode_html.inc:56
+#: ../inc/bbcode_html.inc:59
 msgid "Violet"
 msgstr "Viola"
 
-#: ../inc/bbcode_html.inc:57
+#: ../inc/bbcode_html.inc:60
 msgid "Font size"
 msgstr "Dimensione del carattere"
 
-#: ../inc/bbcode_html.inc:58
+#: ../inc/bbcode_html.inc:61
 msgid "Font size: [size=x-small]small text[/size]"
 msgstr "Dimensione del carattere: [size=x-small]testo piccolo[/size]"
 
-#: ../inc/bbcode_html.inc:60
+#: ../inc/bbcode_html.inc:63
 msgid "Small"
 msgstr "Piccolo"
 
-#: ../inc/bbcode_html.inc:61
+#: ../inc/bbcode_html.inc:64
 msgid "Normal"
 msgstr "Normale"
 
-#: ../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 "Chiudi tutti i tag bbCode aperti"
 
-#: ../inc/bbcode_html.inc:65
+#: ../inc/bbcode_html.inc:68
 msgid "Close Tags"
 msgstr "Chiudi tutti i tag"
 
-#: ../inc/forum.inc:37
+#: ../inc/forum.inc:38
 msgid "Oldest first"
 msgstr "Prima il più vecchio"
 
-#: ../inc/forum.inc:38 ../inc/forum.inc:44
+#: ../inc/forum.inc:39 ../inc/forum.inc:45
 msgid "Newest first"
 msgstr "Prima il più recente"
 
-#: ../inc/forum.inc:39
+#: ../inc/forum.inc:40
 msgid "Highest rated posts first"
 msgstr "Prima i messaggi più votati"
 
-#: ../inc/forum.inc:41
+#: ../inc/forum.inc:42
 msgid "Newest post first"
 msgstr "Prima i messaggi più recenti"
 
-#: ../inc/forum.inc:42
+#: ../inc/forum.inc:43
 msgid "Most views first"
 msgstr "Prima i più visualizzati"
 
-#: ../inc/forum.inc:43
+#: ../inc/forum.inc:44
 msgid "Most posts first"
 msgstr "Prima le discussioni con più messaggi"
 
-#: ../inc/forum.inc:125
+#: ../inc/forum.inc:126
 msgid "Search for words in forum messages"
 msgstr "Cerca delle parole nei messaggi del forum"
 
-#: ../inc/forum.inc:125
+#: ../inc/forum.inc:126
 msgid "Search forums"
 msgstr "Cerca nel forum"
 
-#: ../inc/forum.inc:126
+#: ../inc/forum.inc:127
 msgid "Advanced search"
 msgstr "Ricerca avanzata"
 
-# ########################################
-# Private messages
-#: ../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 "Messaggi privati"
 
-# ########################################
-# Links from the main page
-#: ../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 "Domande e risposte"
 
-#: ../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 "Indice del forum"
 
-# ########################################<br />
-# Forum sample index page
-#: ../inc/forum.inc:187 ../inc/forum.inc:195
+#: ../inc/forum.inc:188 ../inc/forum.inc:196
 msgid "%1 message board"
 msgstr "Forum di %1"
 
-#: ../inc/forum.inc:245 ../inc/result.inc:695
+#: ../inc/forum.inc:246 ../inc/result.inc:717
 msgid "Previous"
 msgstr "Precedente"
 
-#: ../inc/forum.inc:283 ../inc/result.inc:704
+#: ../inc/forum.inc:284 ../inc/result.inc:726
 msgid "Next"
 msgstr "Successivo"
 
-#: ../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 "Autore"
 
-#: ../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 "Messaggio"
 
-#: ../inc/forum.inc:580
+#: ../inc/forum.inc:583
 msgid "Send message"
 msgstr "Spedisci il messaggio"
 
-# ########################################
-# Private messages
-#: ../inc/forum.inc:580
+#: ../inc/forum.inc:583
 msgid "Send %1 a private message"
 msgstr "Spedisci %1 un messaggio privato"
 
-#: ../inc/forum.inc:581
+#: ../inc/forum.inc:584
 msgid "Joined: %1"
 msgstr "Iscritto: %1"
 
-# ########################################
-# Forum
-#: ../inc/forum.inc:590
+#: ../inc/forum.inc:593
 msgid "Posts: %1"
 msgstr "Messaggi: %1"
 
-#: ../inc/forum.inc:596
+#: ../inc/forum.inc:599
 msgid "Credit: %1"
 msgstr "Crediti: %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 "Non hai ancora letto questo messaggio"
 
-#: ../inc/forum.inc:620
+#: ../inc/forum.inc:624
 msgid "Unread"
 msgstr "Non letto"
 
-#: ../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 "Messaggio %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 "nascosto"
 
-# ########################################
-# Forum
-#: ../inc/forum.inc:625
+#: ../inc/forum.inc:629
 msgid "Posted: %1"
 msgstr "Messaggi: %1"
 
-#: ../inc/forum.inc:628
+#: ../inc/forum.inc:632
 msgid " - in response to "
 msgstr "- in risposta a"
 
-#: ../inc/forum.inc:631 ../inc/prefs.inc:705 ../inc/prefs.inc:707
+#: ../inc/forum.inc:635
 msgid "Edit"
 msgstr "Modifica"
 
-#: ../inc/forum.inc:631
+#: ../inc/forum.inc:635
 msgid "Edit this message"
 msgstr "Modifica questo messaggio"
 
-#: ../inc/forum.inc:637
+#: ../inc/forum.inc:641
 msgid "Last modified: %1"
 msgstr "Ultima modifica: %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 ""
-"Questo messaggio non è mostrato perché l'autore è nella tua lista "
-"'ignorati'.  Clicca %1qui%2 per vedere questo messaggio"
+"This post is not shown because the sender is on your 'ignore' list.  Click "
+"%1here%2 to view this post"
+msgstr "Questo messaggio non è mostrato perché l'autore è nella tua lista 'ignorati'.  Clicca %1qui%2 per vedere questo messaggio"
 
-#: ../inc/forum.inc:668 ../inc/forum.inc:679
+#: ../inc/forum.inc:672 ../inc/forum.inc:683
 msgid "Report this post as offensive"
 msgstr "Segnale questo messaggio come offensivo."
 
-#: ../inc/forum.inc:668 ../inc/forum.inc:679
+#: ../inc/forum.inc:672 ../inc/forum.inc:683
 msgid "Report as offensive"
 msgstr "Segnala come offensivo"
 
-#: ../inc/forum.inc:672
+#: ../inc/forum.inc:676
 msgid "Rating: %1"
 msgstr "Valutazione: %1"
 
-#: ../inc/forum.inc:672
+#: ../inc/forum.inc:676
 msgid "rate: "
 msgstr "valutazione:"
 
-# 83%
-#: ../inc/forum.inc:675
+#: ../inc/forum.inc:679
 msgid "Click if you like this message"
 msgstr "Clicca se ti piace questo messaggio"
 
-#: ../inc/forum.inc:675
+#: ../inc/forum.inc:679
 msgid "Rate +"
 msgstr "Valuta +"
 
-#: ../inc/forum.inc:677
+#: ../inc/forum.inc:681
 msgid "Click if you don't like this message"
 msgstr "Clicca se non ti piace questo messaggio"
 
-#: ../inc/forum.inc:677
+#: ../inc/forum.inc:681
 msgid "Rate -"
 msgstr "Valuta -"
 
-#: ../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 "Rispondi"
 
-#: ../inc/forum.inc:685
+#: ../inc/forum.inc:689
 msgid "Post a reply to this message"
 msgstr "Replica a questo messaggio"
 
-#: ../inc/forum.inc:687
+#: ../inc/forum.inc:691
 msgid "Quote"
 msgstr "Cita"
 
-#: ../inc/forum.inc:687
+#: ../inc/forum.inc:691
 msgid "Post a reply by quoting this message"
 msgstr "Replica a questo messaggio citandolo"
 
-#: ../inc/forum.inc:708
+#: ../inc/forum.inc:712
 msgid "Hidden by a moderator"
 msgstr "Nascosto da un moderatore"
 
-# ########################################
-# Forum
-#: ../inc/forum.inc:729
+#: ../inc/forum.inc:733
 msgid "Posted %1 by %2"
 msgstr "Inviato %1 da %2"
 
-#: ../inc/forum.inc:747
+#: ../inc/forum.inc:751
 msgid "You may not post or rate messages until %1"
 msgstr "Non puoi inviare o valutare messaggi fino al %1"
 
-#: ../inc/forum.inc:758
+#: ../inc/forum.inc:762
 msgid ""
 "\n"
 "        <ul>\n"
@@ -394,373 +468,352 @@ msgid ""
 "        <li> No abusive comments involving race, religion,\n"
 "            nationality, gender, class or sexuality.\n"
 "        "
-msgstr ""
-"\n"
-"        <ul>\n"
-"        <li> I messaggi devono essere adatti ai bambini: non devono avere\n"
-"            contenuti osceni, violenti,\n"
-"            sessuali né allusivi né espliciti.\n"
-"        <li> E' vietata la pubblicità.\n"
-"        <li> Sono vietati i link verso siti che comprendono contenuti "
-"sessuali,\n"
-"            gioco d'azzardo o intolleranza verso altri.\n"
-"        <li> Sono vietati i messaggi tesi a dar fastidio o  provocare altre "
-"persone,\n"
-"            o a confondere una discussione.\n"
-"        <li> Sono vietati messaggi deliberatamente ostili o insultanti.\n"
-"        <li> Sono vietati commenti eccessivi riguardo razza, religione,\n"
-"            nazionalità, sesso, ceto od orientamento sessuale.\n"
-"        "
+msgstr "\n        <ul>\n        <li> I messaggi devono essere adatti ai bambini: non devono avere\n            contenuti osceni, violenti,\n            sessuali né allusivi né espliciti.\n        <li> E' vietata la pubblicità.\n        <li> Sono vietati i link verso siti che comprendono contenuti sessuali,\n            gioco d'azzardo o intolleranza verso altri.\n        <li> Sono vietati i messaggi tesi a dar fastidio o  provocare altre persone,\n            o a confondere una discussio [...]
 
-#: ../inc/forum.inc:780
+#: ../inc/forum.inc:784
 msgid "Rules:"
 msgstr "Regole:"
 
-#: ../inc/forum.inc:781
+#: ../inc/forum.inc:785
 msgid "More info"
 msgstr "Maggiori informazioni"
 
-#: ../inc/forum.inc:1055 ../user/forum_thread.php:189
+#: ../inc/forum.inc:1082 ../user/forum_thread.php:190
 msgid "Unhide"
 msgstr "Rendi visibile"
 
-#: ../inc/forum.inc:1055
+#: ../inc/forum.inc:1082
 msgid "Unhide this post"
 msgstr "Rendi visibile questo messaggio"
 
-#: ../inc/forum.inc:1057 ../user/forum_thread.php:195
+#: ../inc/forum.inc:1084 ../user/forum_thread.php:196
 msgid "Hide"
 msgstr "Nascondi"
 
-#: ../inc/forum.inc:1057
+#: ../inc/forum.inc:1084
 msgid "Hide this post"
 msgstr "Nascondi questo messaggio"
 
-#: ../inc/forum.inc:1062 ../user/forum_thread.php:228
+#: ../inc/forum.inc:1089 ../user/forum_thread.php:229
 msgid "Move"
 msgstr "Sposta"
 
-#: ../inc/forum.inc:1062
+#: ../inc/forum.inc:1089
 msgid "Move post to a different thread"
 msgstr "Sposta questo argomento in un'altra discussione"
 
-#: ../inc/forum.inc:1067
+#: ../inc/forum.inc:1094
 msgid "Banish author"
 msgstr "Banna l'autore"
 
-#: ../inc/forum.inc:1074
+#: ../inc/forum.inc:1101
 msgid "Vote to banish author"
 msgstr "Vota per bannare l'utente"
 
-#: ../inc/forum.inc:1078
+#: ../inc/forum.inc:1105
 msgid "Vote not to banish author"
 msgstr "Vota per non bannare l'utente"
 
-#: ../inc/forum.inc:1083
+#: ../inc/forum.inc:1110
 msgid "Start vote to banish author"
 msgstr "Inizia la votazione per bannare l'utente"
 
-#: ../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 "Cancella"
+
+#: ../inc/forum.inc:1115
+msgid "Delete this post"
+msgstr "Cancella questo messaggio"
+
+#: ../inc/forum.inc:1153
 msgid "Only team members can post to the team message board"
 msgstr "Solo i membri del team possono inviare messaggi al forum del team"
 
-#: ../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 ""
-"Per creare un nuovo argomento su %1 devi avere un certo numero di crediti. "
-"Questa precauzione è stata inserita per prevenire e proteggere da qualsiasi "
-"abuso del sistema."
+msgstr "Per creare un nuovo argomento su %1 devi avere un certo numero di crediti. Questa precauzione è stata inserita per prevenire e proteggere da qualsiasi abuso del 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 ""
-"Ora non puoi aprire altri argomenti. Riprova più tardi. Questa precauzione è "
-"stata inserita per proteggere il sistema da eventuali abusi."
+msgstr "Ora non puoi aprire altri argomenti. Riprova più tardi. Questa precauzione è stata inserita per proteggere il sistema da eventuali abusi."
 
-#: ../inc/forum.inc:1140
+#: ../inc/forum.inc:1177
 msgid ""
 "This thread is locked. Only forum moderators and administrators are allowed "
 "to post there."
-msgstr ""
-"Questa discussione è bloccata. Solo i moderatori e gli amministratori "
-"possono scrivere qui."
+msgstr "Questa discussione è bloccata. Solo i moderatori e gli amministratori possono scrivere qui."
 
-#: ../inc/forum.inc:1145
+#: ../inc/forum.inc:1182
 msgid "Can't post to a hidden thread."
 msgstr "Non posso scrivere in un thread nascosto."
 
-#: ../inc/forum.inc:1173
+#: ../inc/forum.inc:1216
 msgid "Thread"
 msgstr "Argomento"
 
-# ########################################
-# Forum
-#: ../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 "Messaggi"
 
-#: ../inc/forum.inc:1176 ../user/forum_forum.php:138
+#: ../inc/forum.inc:1219 ../user/forum_forum.php:141
 msgid "Views"
 msgstr "Visite"
 
-#: ../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 "Ultimo messaggio"
 
-#: ../inc/forum.inc:1235
+#: ../inc/forum.inc:1278
 msgid "New posts in the thread %1"
 msgstr "Nuovi messa nella discussione %1"
 
-#: ../inc/forum.inc:1240
+#: ../inc/forum.inc:1283
 msgid "New posts in subscribed thread"
 msgstr "Nuovi messaggi in discussioni alla quali sei iscritto"
 
-#: ../inc/forum.inc:1241
+#: ../inc/forum.inc:1284
 msgid "There are new posts in the thread '%1'"
 msgstr "Ci sono nuovi messaggi nella discussione '%1'"
 
-#: ../inc/forum.inc:1251
+#: ../inc/forum.inc:1294
 msgid "Mark all threads as read"
 msgstr "Segna tutti gli argomenti come letti"
 
-#: ../inc/forum.inc:1252
+#: ../inc/forum.inc:1295
 msgid "Mark all threads in all message boards as read."
 msgstr "Segna tutte le discussioni nel forum come lette."
 
-#: ../inc/host.inc:24
+#: ../inc/host.inc:25
 msgid "No host"
 msgstr "Nessun host"
 
-#: ../inc/host.inc:26
+#: ../inc/host.inc:27
 msgid "Unavailable"
 msgstr "Non disponibile"
 
-#: ../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 "Lavoro"
 
-#: ../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 "Scuola"
 
-#: ../inc/host.inc:59
-msgid "Mobile"
-msgstr "Cellulare"
-
-#: ../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 "Aggiorna"
 
-#: ../inc/host.inc:85
+#: ../inc/host.inc:84
 msgid "Computer information"
 msgstr "Informazioni sul computer"
 
-#: ../inc/host.inc:89 ../inc/host.inc:94
+#: ../inc/host.inc:88 ../inc/host.inc:93
 msgid "IP address"
 msgstr "Indirizzo IP"
 
-#: ../inc/host.inc:89
+#: ../inc/host.inc:88
 msgid "(same the last %1 times)"
 msgstr "(uguale alle ultime %1 volte)"
 
-#: ../inc/host.inc:91
+#: ../inc/host.inc:90
 msgid "External IP address"
 msgstr "Indirizzo IP esterno"
 
-#: ../inc/host.inc:94
+#: ../inc/host.inc:93
 msgid "Show IP address"
 msgstr "Visualizza indirizzo IP"
 
-#: ../inc/host.inc:96
+#: ../inc/host.inc:95
 msgid "Domain name"
 msgstr "Nome dominio"
 
-#: ../inc/host.inc:98
+#: ../inc/host.inc:97
 msgid "Product name"
 msgstr "Nome prodotto"
 
-#: ../inc/host.inc:102
+#: ../inc/host.inc:101
 msgid "Local Standard Time"
 msgstr "Ora locale"
 
-#: ../inc/host.inc:102
+#: ../inc/host.inc:101
 msgid "UTC %1 hours"
 msgstr "UTC %1 ore"
 
-#: ../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 "Proprietario"
 
-#: ../inc/host.inc:108 ../inc/host.inc:355
+#: ../inc/host.inc:107 ../inc/host.inc:360
 msgid "Anonymous"
 msgstr "Anonimo"
 
-#: ../inc/host.inc:112 ../inc/result.inc:630
+#: ../inc/host.inc:111 ../inc/result.inc:634 ../user/apps.php:56
 msgid "Created"
 msgstr "Creato"
 
-#: ../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 "Crediti totali"
 
-#: ../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 "Credito medio"
 
-#: ../inc/host.inc:116
+#: ../inc/host.inc:115
 msgid "Cross project credit"
 msgstr "Crediti su tutti i progetti"
 
-#: ../inc/host.inc:118
+#: ../inc/host.inc:117
 msgid "CPU type"
 msgstr "tipo di CPU"
 
-#: ../inc/host.inc:119
+#: ../inc/host.inc:118
 msgid "Number of processors"
 msgstr "Numero di processori"
 
-#: ../inc/host.inc:121
+#: ../inc/host.inc:120
 msgid "Coprocessors"
 msgstr "Coprocessori"
 
-#: ../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 "versione BOINC"
 
-#: ../inc/host.inc:130
+#: ../inc/host.inc:129 ../inc/prefs.inc:237
 msgid "Memory"
 msgstr "Memoria"
 
-#: ../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 "Spazio di swap"
 
-#: ../inc/host.inc:143
+#: ../inc/host.inc:142
 msgid "Total disk space"
 msgstr "Spazio totale su 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 "Spazio Libero su Disco"
 
-#: ../inc/host.inc:150
+#: ../inc/host.inc:149
 msgid "Measured floating point speed"
 msgstr "Velocità misurata in calcoli in virgola mobile"
 
-#: ../inc/host.inc:150 ../inc/host.inc:153
+#: ../inc/host.inc:149 ../inc/host.inc:152
 msgid "%1 million ops/sec"
 msgstr "%1 milioni di operazioni/sec"
 
-#: ../inc/host.inc:153
+#: ../inc/host.inc:152
 msgid "Measured integer speed"
 msgstr "Velocità calcoli interi"
 
-#: ../inc/host.inc:157 ../inc/host.inc:159
+#: ../inc/host.inc:156 ../inc/host.inc:158
 msgid "Average upload rate"
 msgstr "Velocità media di upload"
 
-#: ../inc/host.inc:157 ../inc/host.inc:164
+#: ../inc/host.inc:156 ../inc/host.inc:163
 msgid "%1 KB/sec"
 msgstr "%1 KB/sec"
 
-#: ../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 "Sconosciuto"
 
-#: ../inc/host.inc:164 ../inc/host.inc:166
+#: ../inc/host.inc:163 ../inc/host.inc:165
 msgid "Average download rate"
 msgstr "Velocità media di download"
 
-#: ../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 medio di completamento"
 
-#: ../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 giorni"
 
-# ########################################
-# Apps page (apps.php)
-#: ../inc/host.inc:170
+#: ../inc/host.inc:169
 msgid "Application details"
 msgstr "Dettagli dell'applicazione"
 
-#: ../inc/host.inc:171
+#: ../inc/host.inc:170
 msgid "Show"
 msgstr "Visualizza:"
 
-#: ../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 "Elaborazioni"
 
-#: ../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 "Numero di volte che BOINC ha contattato il server"
 
-#: ../inc/host.inc:186
+#: ../inc/host.inc:185
 msgid "Last time contacted server"
 msgstr "Ultima volta in cui è stato contattato il server"
 
-#: ../inc/host.inc:187
-#, php-format
-msgid "% of time BOINC is running"
-msgstr "% di tempo che il client BOINC è attivo"
+#: ../inc/host.inc:186
+msgid "Fraction of time BOINC is running"
+msgstr "Frazione di tempo nel quale BOINC è in uso"
 
-#: ../inc/host.inc:189
-#, php-format
-msgid "While BOINC running, % of time host has an Internet connection"
-msgstr ""
-"Quando BOINC è attivo, % di tempo che l'host ha una connessione Internet"
+#: ../inc/host.inc:188
+msgid ""
+"While BOINC is running, fraction of time computer has an Internet connection"
+msgstr "Quando BOINC è attivo, frazione di tempo che il computer ha una connessione Internet"
+
+#: ../inc/host.inc:190
+msgid "While BOINC is running, fraction of time computing is allowed"
+msgstr "Mentre BOINC è attivo, percentuale di lavoro nel quale l'elaborazione è permessa"
 
 #: ../inc/host.inc:191
-#, php-format
-msgid "While BOINC running, % of time work is allowed"
-msgstr "Quando BOINC è attivo, % di tempo in cui il lavoro è permesso"
+msgid "While is BOINC running, fraction of time GPU computing is allowed"
+msgstr "Mentre BOINC è attivo, frazione del tempo GPU nella quale l'elaborazione è permessa"
 
 #: ../inc/host.inc:193
 msgid "Average CPU efficiency"
@@ -770,7 +823,7 @@ msgstr "Efficienza media CPU"
 msgid "Task duration correction factor"
 msgstr "Fattore di correzione della durata del lavoro"
 
-#: ../inc/host.inc:198 ../inc/host.inc:674
+#: ../inc/host.inc:198 ../inc/host.inc:679
 msgid "Location"
 msgstr "Luogo"
 
@@ -786,7 +839,7 @@ msgstr "Unisci risultati multipli di questo computer"
 msgid "Merge"
 msgstr "Unisci"
 
-#: ../inc/host.inc:207 ../inc/host.inc:689
+#: ../inc/host.inc:207 ../inc/host.inc:694
 msgid "Last contact"
 msgstr "Ultimo contatto"
 
@@ -794,30 +847,30 @@ msgstr "Ultimo contatto"
 msgid "Computer info"
 msgstr "Informazioni 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 "Posizione"
 
-#: ../inc/host.inc:225 ../inc/host.inc:679
+#: ../inc/host.inc:225 ../inc/host.inc:684
 msgid "Avg. credit"
 msgstr "Media dei crediti"
 
-#: ../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 "Media dei crediti recenti"
 
-#: ../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"
 
@@ -825,91 +878,83 @@ msgstr "GPU"
 msgid "Operating system"
 msgstr "Sistema operativo"
 
-#: ../inc/host.inc:315
+#: ../inc/host.inc:320
 msgid "(%1 processors)"
 msgstr "(%1 dei processori)"
 
-#: ../inc/host.inc:335
+#: ../inc/host.inc:340
 msgid "Details"
 msgstr "Dettagli"
 
-#: ../inc/host.inc:340
+#: ../inc/host.inc:345
 msgid "Cross-project stats:"
 msgstr "Statistiche di tutti i progetti:"
 
-#: ../inc/host.inc:515
+#: ../inc/host.inc:520
 msgid "Host %1 has overlapping lifetime:"
 msgstr "L'host %1 ha un tempo di sovrapposizione:"
 
-#: ../inc/host.inc:522
+#: ../inc/host.inc:527
 msgid "Host %1 has an incompatible OS:"
 msgstr "L'Host %1 ha un SO incompatibile:"
 
-#: ../inc/host.inc:528
+#: ../inc/host.inc:533
 msgid "Host %1 has an incompatible CPU:"
 msgstr "L'Host %1 ha una CPU incompatibile:"
 
-#: ../inc/host.inc:595
+#: ../inc/host.inc:600
 msgid "same host"
 msgstr "stesso host"
 
-#: ../inc/host.inc:598
+#: ../inc/host.inc:603
 msgid "Can't merge host %1 into %2 - they're incompatible"
 msgstr "Non posso unire l'host %1 con %2 - sono incompatibili"
 
-#: ../inc/host.inc:601
+#: ../inc/host.inc:606
 msgid "Merging host %1 into host %2"
 msgstr "Unione host %1 con host %2"
 
-#: ../inc/host.inc:618
+#: ../inc/host.inc:623
 msgid "Couldn't update credit of new computer"
 msgstr "Non posso aggiornare il credito dei nuovi computer"
 
-#: ../inc/host.inc:622
+#: ../inc/host.inc:627
 msgid "Couldn't update results"
 msgstr "Non posso aggiornare i risultati"
 
-#: ../inc/host.inc:627
+#: ../inc/host.inc:632
 msgid "Couldn't retire old computer"
 msgstr "Non posso ritirare un vecchio computer"
 
-#: ../inc/host.inc:629
+#: ../inc/host.inc:634
 msgid "Retired old computer %1"
 msgstr "Ritirato il vecchio computer %1"
 
-#: ../inc/host.inc:652 ../inc/host.inc:655
+#: ../inc/host.inc:657 ../inc/host.inc:660
 msgid "Show:"
 msgstr "Visualizza:"
 
-#: ../inc/host.inc:652 ../inc/host.inc:655
+#: ../inc/host.inc:657 ../inc/host.inc:660
 msgid "All computers"
 msgstr "Tutti i 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 "Solo i computer attivi negli ultimi 30 giorni"
 
-#: ../inc/host.inc:666 ../inc/result.inc:637
+#: ../inc/host.inc:671 ../inc/result.inc:642
 msgid "Computer ID"
 msgstr "ID Computer"
 
-#: ../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 "versione <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 "Unisci i computer dal nome"
 
-#: ../inc/language_names.inc:61
+#: ../inc/language_names.inc:62
 msgid "Browser default"
 msgstr "Browser predefinito"
 
@@ -922,31 +967,29 @@ msgstr "Commenta"
 msgid "News is available as an %sRSS feed%s"
 msgstr "Puoi ricevere le news con un %sRSS feed%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 "Leggi"
 
-#: ../inc/pm.inc:26 ../inc/pm.inc:178
+#: ../inc/pm.inc:26 ../inc/pm.inc:180
 msgid "Write"
 msgstr "Scrivi"
 
-# ########################################
-# Private messages
-#: ../inc/pm.inc:33 ../inc/user.inc:378
+#: ../inc/pm.inc:33 ../inc/user.inc:458
 msgid "Send private message"
 msgstr "Spedisci un messaggio privato"
 
 #: ../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 "Anteprima"
 
-#: ../inc/pm.inc:48 ../user/pm.php:131
+#: ../inc/pm.inc:48 ../user/pm.php:136
 msgid "no such message"
 msgstr "nessun messaggio"
 
@@ -958,7 +1001,7 @@ msgstr "Per"
 msgid "User IDs or unique usernames, separated with commas"
 msgstr "ID o nomi degli utenti separati da virgole"
 
-#: ../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 "Oggetto"
 
@@ -966,419 +1009,499 @@ msgstr "Oggetto"
 msgid "Send message"
 msgstr "Spedisci il messaggio"
 
-#: ../inc/pm.inc:121
+#: ../inc/pm.inc:122
 msgid "sent you a private message; subject:"
 msgstr "ti ho mandato un messaggio privato; titolo:"
 
-#: ../inc/pm.inc:127
+#: ../inc/pm.inc:129
 msgid "Private message%1 from %2, subject:"
 msgstr "Messaggio privato%1 da %2, titolo:"
 
-#: ../inc/pm.inc:135
+#: ../inc/pm.inc:137
 msgid "Couldn't create message"
 msgstr "Non in grado di scrivere il messaggio"
 
-#: ../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 ""
-"Non sei autorizzato ad inviare messaggi privati così spesso. Per favore "
-"aspetta qualche minuto prima di inviarne degli altri."
+msgstr "Non sei autorizzato ad inviare messaggi privati così spesso. Per favore aspetta qualche minuto prima di inviarne degli altri."
 
-#: ../inc/pm.inc:176 ../user/forum_forum.php:186
+#: ../inc/pm.inc:178 ../user/forum_forum.php:190
 msgid "unread"
 msgstr "non letto"
 
-#: ../inc/pm.inc:186
+#: ../inc/pm.inc:188
 msgid "For email notification, %1edit community prefs%2"
-msgstr ""
-"Per ricevere le notifiche via mail, %1modifica le preferenze della comunità%"
-"2"
+msgstr "Per ricevere le notifiche via mail, %1modifica le preferenze della comunità%2"
 
-# ########################################
-# Private messages
-#: ../inc/pm.inc:198
+#: ../inc/pm.inc:204
 msgid "Private message"
 msgstr "Messaggi privati"
 
-#: ../inc/prefs.inc:77
+#: ../inc/prefs.inc:45 ../inc/prefs.inc:187
+msgid "Usage limits"
+msgstr "Limiti di utilizzo"
+
+#: ../inc/prefs.inc:47 ../inc/prefs.inc:55
+msgid "Use at most"
+msgstr "Usa al massimo"
+
+#: ../inc/prefs.inc:49
+#, no-php-format
 msgid ""
-"Suspend work while computer is on battery power? %1 Matters only for "
-"portable computers %2"
-msgstr ""
-"Sospendere l'elaborazione mentre il computer funziona a batterie? %"
-"1(riguarda solo i computer portatili)%2"
+"Keep some CPUs free for other applications. Example: 75% means use 6 cores "
+"on an 8-core CPU."
+msgstr "Mantieni una parte di CPU libera per le altre applicazioni. Esempio 75% significa usa 6 core in una CPU da 8 core."
 
-#: ../inc/prefs.inc:85
-msgid "Suspend work while computer is in use?"
-msgstr "Sospendere l'elaborazione mentre il computer è in uso?"
+#: ../inc/prefs.inc:52
+#, no-php-format
+msgid "% of the CPUs"
+msgstr "% delle 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 ""
-"Sospendere l'elaborazione della GPU mentre il computer è in uso? %1 Si "
-"applica dalla versione 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 "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."
+
+#: ../inc/prefs.inc:60
+#, no-php-format
+msgid "% of CPU time"
+msgstr "% del tempo della CPU"
+
+#: ../inc/prefs.inc:62 ../inc/prefs.inc:208
+msgid "When to suspend"
+msgstr "Quando sospendere"
 
-#: ../inc/prefs.inc:99
-msgid "'In use' means mouse/keyboard activity in last"
-msgstr "'In uso' significa che c'è attività del mouse/tastiera negli ultimi"
+#: ../inc/prefs.inc:64
+msgid "Suspend when computer is on battery"
+msgstr "Sospendere quando il computer è alimentato da batteria"
 
-#: ../inc/prefs.inc:101 ../inc/prefs.inc:110 ../inc/prefs.inc:144
+#: ../inc/prefs.inc:65
+msgid ""
+"Check this to suspend computing on portables when running on battery power."
+msgstr "Spunta questa voce per sospendere l'elaborazione su portatili quando si è alimentati a batteria."
+
+#: ../inc/prefs.inc:70
+msgid "Suspend when computer is in use"
+msgstr "Sospendere quando il computer è in uso"
+
+#: ../inc/prefs.inc:71
+msgid ""
+"Check this to suspend computing and file transfers when you're using the "
+"computer."
+msgstr "Spunta questa voce se vuoi sospendere l'elaborazione e il trasferimento di files quando stai utilizzando il computer."
+
+#: ../inc/prefs.inc:76
+msgid "Suspend GPU computing when computer is in use"
+msgstr "Sospendi l'elaborazione GPU quando il computer è in uso"
+
+#: ../inc/prefs.inc:77
+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."
+
+#: ../inc/prefs.inc:82
+msgid "'In use' means mouse/keyboard input in last"
+msgstr "'In uso' significa attività di mouse/tastiera in corso"
+
+#: ../inc/prefs.inc:83
+msgid "This determines when the computer is considered 'in use'."
+msgstr "Questo determina quando il computer è considerato 'in uso'."
+
+#: ../inc/prefs.inc:85 ../inc/prefs.inc:92 ../inc/prefs.inc:122
 msgid "minutes"
 msgstr "minuti"
 
-#: ../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 ""
-"Sospende l'elaborazione se non c'è attività di mouse/tastiera negli ultimi %"
-"1 Necessario per entrare in modalità risparmio energetico in certi computer "
-"%2"
+#: ../inc/prefs.inc:89
+msgid "Suspend when no mouse/keyboard input in last"
+msgstr "Sospendi quando non c'è attività mouse/tastiera in corso"
+
+#: ../inc/prefs.inc:90
+msgid "This allows some computers to enter low-power mode when not in use."
+msgstr "Questo permette ad alcuni computers di entrare in modalità low-power quando non in uso."
+
+#: ../inc/prefs.inc:95
+msgid "Suspend when non-BOINC CPU usage is above"
+msgstr "Sospendi quando l'utilizzo CPU da parte di applicazioni non-BOINC è superiore a"
+
+#: ../inc/prefs.inc:96
+msgid "Suspend computing when your computer is busy running other programs."
+msgstr "Sospendi l'elaborazione quando il tuo computer è occupato da altre applicazioni."
+
+#: ../inc/prefs.inc:101
+msgid "Compute only between"
+msgstr "Calcolare solo tra"
+
+#: ../inc/prefs.inc:102
+msgid "Compute only during a particular period each day."
+msgstr "Elabora solo durante una particolare finestra temporale ogni giorno."
+
+#: ../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 "Altro"
+
+#: ../inc/prefs.inc:107
+msgid "Store at least"
+msgstr "Memorizzare almeno"
+
+#: ../inc/prefs.inc:108
+msgid "Store at least enough tasks to keep the computer busy for this long."
+msgstr "Archivia sufficienti elaborazioni da mantenere il computer occupato per almeno questo tempo."
+
+#: ../inc/prefs.inc:110 ../inc/prefs.inc:116
+msgid "days of work"
+msgstr "giorni di lavoro"
+
+#: ../inc/prefs.inc:113
+msgid "Store up to an additional"
+msgstr "Memorizzare fino ad un ulteriore"
 
 #: ../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 ""
-"Sospendi l'elaborazione se l'uso della CPU è superiore a %1 0 significa "
-"assenza di restrizioni<br>Si applica dalla versione 6.10.30+ %2"
+"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."
+
+#: ../inc/prefs.inc:119
+msgid "Switch between tasks about every"
+msgstr "Cambia elaborazione ogni"
+
+#: ../inc/prefs.inc:120
+msgid "If you run several projects, BOINC may switch between them this often."
+msgstr "Se elabori per diversi progetti, BOINC potrebbe fare lo switch tra i progetti in base a questo tempo."
 
-#: ../inc/prefs.inc:122
-msgid "Do work only between the hours of %1 No restriction if equal %2"
-msgstr "Elabora solamente tra le ore %1. Nessuna restrizione se uguale a %2"
+#: ../inc/prefs.inc:125
+msgid "Request tasks to checkpoint at most every"
+msgstr "Richiedi alle elaborazioni di fare un checkpoint al massimo ogni"
 
-#: ../inc/prefs.inc:130
+#: ../inc/prefs.inc:126
 msgid ""
-"Leave tasks in memory while suspended? %1 Suspended tasks will consume swap "
-"space if 'yes' %2"
-msgstr ""
-"Lasciare le attività in memoria mentre sono sospese? %1 Se 'sì' le attività "
-"sospese consumeranno memoria di swap %2"
+"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 più tardi."
+
+#: ../inc/prefs.inc:128
+msgid "seconds"
+msgstr "secondi"
+
+#: ../inc/prefs.inc:136 ../inc/prefs.inc:148
+msgid "Use no more than"
+msgstr "Utilizzare non più di"
+
+#: ../inc/prefs.inc:137
+msgid "Limit the total amount of disk space used by BOINC."
+msgstr "Limita l'utilizzo totale del disco utilizzato da BOINC."
 
 #: ../inc/prefs.inc:139
-msgid "Switch between tasks every %1 Recommended: 60 minutes %2"
-msgstr "Cambia attività ogni %1 Consigliato: 60 minuti %2"
+msgid "GB"
+msgstr "GB"
+
+#: ../inc/prefs.inc:142
+msgid "Leave at least"
+msgstr "Lascia come minimo"
 
-#: ../inc/prefs.inc:147
-msgid "On multiprocessors, use at most"
-msgstr "Su sistemi multiprocessore, usa al massimo"
+#: ../inc/prefs.inc:143
+msgid ""
+"Limit disk usage to leave this much free space on the volume where BOINC "
+"stores data."
+msgstr "Limita l'utilizzo del disco per lasciare questo spazio libero nel luogo dove BOINC salva i dati."
+
+#: ../inc/prefs.inc:145
+msgid "GB free"
+msgstr "GB liberi"
 
 #: ../inc/prefs.inc:149
-msgid "processors"
-msgstr "processori"
+msgid ""
+"Limit the percentage of disk space used by BOINC on the volume where it "
+"stores data."
+msgstr "Limita la percentuale di spazio disco utilizzato da BOINC nel luogo dove salva i dati."
 
-#: ../inc/prefs.inc:153
-msgid "On multiprocessors, use at most %1 Enforced by version 6.1+ %2"
-msgstr ""
-"Su sistemi multiprocessore usare al massimo %1 Si applica dalla versione "
-"6.1+ %2"
+#: ../inc/prefs.inc:152
+#, no-php-format
+msgid "% of total"
+msgstr "% di spazio totale su disco"
 
 #: ../inc/prefs.inc:158
-#, php-format
-msgid "% of the processors"
-msgstr "% dei processori"
+msgid "When computer is in use, use at most"
+msgstr "Quando il computer è in uso, utilizza al massimo"
 
-#: ../inc/prefs.inc:162
-msgid "Use at most %1 Can be used to reduce CPU heat %2"
-msgstr ""
-"Utilizza al massimo %1. Può essere utlizzato per ridurre il riscaldamento "
-"della CPU %2"
+#: ../inc/prefs.inc:159
+msgid "Limit the memory used by BOINC when you're using the computer."
+msgstr "Limita la memoria utilizzata da BOINC quando stai utilizzando il computer."
 
-#: ../inc/prefs.inc:167
-#, php-format
-msgid "% of CPU time"
-msgstr "% del tempo della CPU"
+#: ../inc/prefs.inc:162 ../inc/prefs.inc:169 ../inc/prefs.inc:182
+#, no-php-format
+msgid "%"
+msgstr "%"
 
-#: ../inc/prefs.inc:175 ../inc/prefs.inc:189
-msgid "Disk: use at most"
-msgstr "Disco: utilizza al massimo"
+#: ../inc/prefs.inc:165
+msgid "When computer is not in use, use at most"
+msgstr "Quando il computer non è in uso, utilizza al massimo"
 
-#: ../inc/prefs.inc:177 ../inc/prefs.inc:186
-msgid "GB"
-msgstr "GB"
+#: ../inc/prefs.inc:166
+msgid "Limit the memory used by BOINC when you're not using the computer."
+msgstr "Limita la memoria utilizzata da BOINC quando non stai utilizzando il computer."
 
-#: ../inc/prefs.inc:180
-msgid "Disk: leave free at least %1 Values smaller than %2 are ignored %3"
-msgstr "Disco: lascia libero almeno %1 Valori minori di %2 vengono ignorati %3"
+#: ../inc/prefs.inc:172
+msgid "Leave non-GPU tasks in memory while suspended"
+msgstr "Lascia le elaborazioni non-GPU in memoria quando sospese"
 
-#: ../inc/prefs.inc:191 ../inc/prefs.inc:201 ../inc/prefs.inc:206
-#: ../inc/prefs.inc:211
-#, php-format
-msgid "% of total"
-msgstr "% di spazio totale su disco"
+#: ../inc/prefs.inc:173
+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 "Quando selezionata, le elaborazioni sospese rimangono in memoria, e riprendono senza lavoro perso. Se non selezionata, le elaborazioni sospese sono rimosse dalla memoria, e l'elaborazione riprende dall'ultimo checkpoint."
 
-#: ../inc/prefs.inc:194
-msgid "Tasks checkpoint to disk at most every"
-msgstr "Checkpoint del lavoro su disco al massimo ogni"
+#: ../inc/prefs.inc:178
+msgid "Page/swap file: use at most"
+msgstr "File di swap: utilizza al massimo"
 
-#: ../inc/prefs.inc:196
-msgid "seconds"
-msgstr "secondi"
+#: ../inc/prefs.inc:179
+msgid "Limit the swap space (page file) used by BOINC."
+msgstr "Limita lo spazio di swap (file di paging) utilizzato da BOINC."
 
-#: ../inc/prefs.inc:199
-msgid "Swap space: use at most"
-msgstr "Spazio di swap: utilizza al massimo"
+#: ../inc/prefs.inc:189
+msgid "Limit download rate to"
+msgstr "Limite di download rate a"
 
-#: ../inc/prefs.inc:204
-msgid "Memory: when computer is in use, use at most"
-msgstr "Memoria: quando il computer è in uso, utilizza al massimo"
+#: ../inc/prefs.inc:190
+msgid "Limit the download rate of file transfers."
+msgstr "Limita la velocità di download per i trasferimenti dei file."
 
-#: ../inc/prefs.inc:209
-msgid "Memory: when computer is not in use, use at most"
-msgstr "Memoria: quando il computer non è in uso, utilizza al massimo "
+#: ../inc/prefs.inc:192 ../inc/prefs.inc:198
+msgid "KB/second"
+msgstr "KB/secondo"
 
-#: ../inc/prefs.inc:218
-msgid "Maintain enough tasks to keep busy for at least%1(max 10 days).%2"
-msgstr ""
-"Mantieni lavori sufficienti per rimanere occupato per almeno%1(massimo 10 "
-"giorni).%2"
+#: ../inc/prefs.inc:195
+msgid "Limit upload rate to"
+msgstr "Limite di upload a "
+
+#: ../inc/prefs.inc:196
+msgid "Limit the upload rate of file transfers."
+msgstr "Limita la velocità di upload per i trasferimenti dei file."
+
+#: ../inc/prefs.inc:201
+msgid "Limit usage to"
+msgstr "Limite di utilizzo per"
+
+#: ../inc/prefs.inc:202
+msgid "Example: BOINC should transfer at most 2000 MB of data every 30 days."
+msgstr "Esempio: BOINC può trasferire al massimo 2000 MB di dati ogni 30 giorni."
+
+#: ../inc/prefs.inc:205
+msgid "MB every"
+msgstr "MB ogni"
 
-#: ../inc/prefs.inc:223 ../inc/prefs.inc:228 ../inc/prefs.inc:270
-#: ../inc/util.inc:274
+#: ../inc/prefs.inc:206 ../inc/util.inc:303
 msgid "days"
 msgstr "giorni"
 
-#: ../inc/prefs.inc:226
-msgid "... and up to an additional"
-msgstr "... e per almeno"
+#: ../inc/prefs.inc:210
+msgid "Transfer files only between"
+msgstr "Trasferisci files solo nell'intervallo"
 
-#: ../inc/prefs.inc:232
-msgid ""
-"Confirm before connecting to Internet? %1 Matters only if you have a modem, "
-"ISDN or VPN connection %2"
-msgstr ""
-"Confermare prima di connettersi a Internet? %1 Ha senso solo in caso tu "
-"abbia un modem, ISDN o una connessione VPN %2"
+#: ../inc/prefs.inc:211
+msgid "Transfer files only during a particular period each day."
+msgstr "Trasferisci files solo durante una certa finestra temporale del giorno."
 
-#: ../inc/prefs.inc:241
+#: ../inc/prefs.inc:216
+msgid "Skip data verification for image files"
+msgstr "Salta la verifica dei dati per le immagini"
+
+#: ../inc/prefs.inc:217
 msgid ""
-"Disconnect when done? %1 Matters only if you have a modem, ISDN or VPN "
-"connection %2"
-msgstr ""
-"Disconnettere al termine? %1 Ha senso solo in caso tu abbia un modem, ISDN o "
-"una connessione VPN %2"
+"Check this only if your Internet provider modifies image files. Skipping "
+"verification reduces the security of BOINC."
+msgstr "Spunta questa voce solo se il tuo provider Internet modifica i files immagine. Saltare la verifica riduce la sicurezza di BOINC."
 
-#: ../inc/prefs.inc:249
-msgid "Maximum download rate:"
-msgstr "Velocità massima di download:"
+#: ../inc/prefs.inc:222
+msgid "Confirm before connecting to Internet"
+msgstr "Conferma prima di connettersi ad Internet"
 
-#: ../inc/prefs.inc:251 ../inc/prefs.inc:256
-msgid "Kbytes/sec"
-msgstr "Kbytes/sec"
+#: ../inc/prefs.inc:223 ../inc/prefs.inc:229
+msgid "Useful only if you have a modem, ISDN or VPN connection."
+msgstr "Utile solo se si possiede una connessione modem, ISDN oppure VPN."
 
-#: ../inc/prefs.inc:254
-msgid "Maximum upload rate:"
-msgstr "Velocità massima di upload:"
+#: ../inc/prefs.inc:228
+msgid "Disconnect when done"
+msgstr "Disconnetti al termine delle operazioni"
 
-#: ../inc/prefs.inc:259
-msgid "Use network only between the hours of"
-msgstr "Utilizza la connessione di rete solamente tra le ore"
+#: ../inc/prefs.inc:235 ../inc/prefs.inc:472 ../user/explain_state.php:94
+msgid "Computing"
+msgstr "Computazione"
 
-#: ../inc/prefs.inc:263
-msgid "Transfer at most %1 Enforced by version 6.10.46+ %2"
-msgstr "Trasferire al massimo %1. Si applica dalla versione 6.10.46+ %2"
+#: ../inc/prefs.inc:236
+msgid "Disk"
+msgstr "Disco"
 
-#: ../inc/prefs.inc:269
-msgid "Mbytes every"
-msgstr "Mbytes ogni"
+#: ../inc/prefs.inc:238
+msgid "Network"
+msgstr "Rete"
 
-#: ../inc/prefs.inc:274
+#: ../inc/prefs.inc:241
 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 ""
-"Salta la verifica dei file immagine? %1 Seleziona questo SOLO se il tuo "
-"Internet provider modifica i file immagine (ad esempio l'UMTS lo fa). %2 "
-"Saltare la verifica riduce la sicurezza di BOINC.%3"
+"These preferences apply to all the BOINC projects in which you participate."
+msgstr "Queste preferenze si applicano a tutti i progetti BOINC ai quali partecipi."
 
-#: ../inc/prefs.inc:287
+#: ../inc/prefs.inc:244
 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 ""
-"Divisione delle risorse %1 Determina la proporzione delle risorse del "
-"computer destinate a questo progetto. Esempio: se partecipi a due progetti "
-"con divisione delle risorse di 100 e 200, il primo progetto riceverà 1/3 "
-"delle tue risorse, mentre il secondo riceverà 2/3 %2"
+"%1Unable to update preferences.%2 The values marked in red below were out of"
+" range or not numeric."
+msgstr "%1Impossibile aggiornare le preferenze.%2 I valori segnati in rosso erano fuori dall'intervallo consentito o non erano numerici."
 
-#: ../inc/prefs.inc:298
-msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
-msgstr "Accelerare le attività GPU dedicando a ciascuna di esse una CPU?"
+#: ../inc/prefs.inc:483
+msgid "Separate preferences for %1"
+msgstr "Preferenze separate per %1"
 
-#: ../inc/prefs.inc:308
-msgid "Use CPU %1 Enforced by version 6.10+ %2"
-msgstr "Usa la CPU %1 Si applica dalla versione 6.10+ %2"
+#: ../inc/prefs.inc:493 ../inc/prefs.inc:528 ../inc/prefs_project.inc:291
+msgid "Edit preferences"
+msgstr "Modifica le Preferenze"
 
-#: ../inc/prefs.inc:320
-msgid "Use ATI GPU %1 Enforced by version 6.10+ %2"
-msgstr "Usa la GPU ATI %1 Si applica dalla versione 6.10+ %2"
+#: ../inc/prefs.inc:494 ../user/edit_forum_preferences_form.php:149
+#: ../user/team_admins.php:36
+msgid "Remove"
+msgstr "Rimuovi"
 
-#: ../inc/prefs.inc:332
-msgid "Use NVIDIA GPU %1 Enforced by version 6.10+ %2"
-msgstr "Usa la GPU NVIDIA %1 Si applica dalla versione 6.10+ %2"
+#: ../inc/prefs.inc:499
+msgid "Add separate preferences for %1"
+msgstr "Aggiungi le preferenze separate per %1"
 
-#: ../inc/prefs.inc:344
-msgid "Use Intel GPU %1 Enforced by version 7.2+ %2"
-msgstr "Usa la GPU Intel %1 Si applica dalla versione 7.2+ %2"
+#: ../inc/prefs.inc:506
+msgid "These settings apply to all computers using this account except"
+msgstr "Queste impostazioni si applicano a tutti i computer con questo account tranne"
 
-#: ../inc/prefs.inc:358
+#: ../inc/prefs.inc:508
 msgid ""
-"Run test applications? %1 This helps us develop applications, but may cause "
-"jobs to fail on your computer %2"
-msgstr ""
-"Avviare le applicazioni test %1? Questo ci aiuta a sviluppare le "
-"applicazioni, ma potrebbe causare fallimenti dei lavori sul tuo computer %2"
+"computers where you have set preferences locally using the BOINC Manager"
+msgstr "computer dove hai selezionato preferenze locali utilizzando il BOINC Manager"
 
-#: ../inc/prefs.inc:367
-msgid ""
-"Emails will be sent from %1; make sure your spam filter accepts this address."
-msgstr ""
-"Verranno mandate email da %1; accertati che il tuo filtro di spam accetti "
-"questo indirizzo. "
+#: ../inc/prefs.inc:510
+msgid "Android devices"
+msgstr "Dispositivi Android"
 
-#: ../inc/prefs.inc:374
-msgid "Is it OK for %1 and your team (if any) to email you?"
-msgstr ""
-"Sei d'accordo che %1 ed il tuo team (se ne hai uno) possano inviarti email?"
-
-#: ../inc/prefs.inc:380
-msgid "Should %1 show your computers on its web site?"
-msgstr "%1 può mostrare i tuoi computer sul suo sito web?"
-
-#: ../inc/prefs.inc:387
-msgid "Disk and memory usage"
-msgstr "Utilizzo disco e memoria"
-
-#: ../inc/prefs.inc:388
-msgid "Processor usage"
-msgstr "Uso del processore"
+#: ../inc/prefs.inc:513
+msgid "(Switch view)"
+msgstr "(Cambia Visuale)"
 
-#: ../inc/prefs.inc:389
-msgid "Network usage"
-msgstr "Utilizzo rete"
+#: ../inc/prefs.inc:515 ../inc/prefs_project.inc:272
+msgid "Combined preferences"
+msgstr "Preferenze combinate"
 
-#: ../inc/prefs.inc:392
-msgid ""
-"These preferences apply to all the BOINC projects in which you participate."
-msgstr ""
-"Queste preferenze si applicano a tutti i progetti BOINC ai quali partecipi."
+#: ../inc/prefs.inc:522 ../inc/prefs_project.inc:283
+msgid "Primary (default) preferences"
+msgstr "Impostazioni principali (predefinite)"
 
-#: ../inc/prefs.inc:395
-msgid ""
-"%1Unable to update preferences.%2 The values marked in red below were out of "
-"range or not numeric."
-msgstr ""
-"%1Impossibile aggiornare le preferenze.%2 I valori segnati in rosso erano "
-"fuori dall'intervallo consentito o non erano numerici."
+#: ../inc/prefs.inc:537
+msgid "Preferences last modified:"
+msgstr "Ultima modifica delle preferenze:"
 
-#: ../inc/prefs.inc:445
-msgid "bad venue: %1"
-msgstr "sede non valida: %1"
+#: ../inc/prefs.inc:553
+msgid "Add preferences"
+msgstr "Aggiungi le preferenze"
 
-#: ../inc/prefs.inc:451
-msgid "bad subset: %1"
-msgstr "sottoclasse non valida: %1"
+#: ../inc/prefs.inc:557
+msgid "Update preferences"
+msgstr "Aggiorna le preferenze"
 
-#: ../inc/prefs.inc:671 ../inc/prefs.inc:674 ../inc/prefs.inc:1025
-#: ../inc/prefs_util.inc:93 ../project.sample/project_specific_prefs.inc:85
+#: ../inc/prefs.inc:628 ../project.sample/project_specific_prefs.inc:84
+#: ../project.sample/project_specific_prefs.inc:224
 msgid "yes"
 msgstr "sì"
 
-#: ../inc/prefs.inc:671 ../inc/prefs.inc:674 ../inc/prefs.inc:1027
-#: ../inc/prefs_util.inc:93 ../project.sample/project_specific_prefs.inc:87
+#: ../inc/prefs.inc:630 ../project.sample/project_specific_prefs.inc:86
+#: ../project.sample/project_specific_prefs.inc:224
 msgid "no"
 msgstr "no"
 
-#: ../inc/prefs.inc:679 ../user/forum_search.php:53
-msgid "no limit"
-msgstr "nessun limite"
-
-#: ../inc/prefs.inc:704 ../user/team_admins.php:79
-msgid "Add"
-msgstr "Aggiungi"
-
-#: ../inc/prefs.inc:706 ../inc/prefs.inc:834
-#: ../user/edit_forum_preferences_form.php:160 ../user/team_admins.php:34
-msgid "Remove"
-msgstr "Rimuovi"
+#: ../inc/prefs.inc:638
+msgid "Default computer location"
+msgstr "Posizione del computer predefinita"
 
-#: ../inc/prefs.inc:812 ../user/explain_state.php:94
-msgid "Computing"
-msgstr "Computazione"
+#: ../inc/prefs.inc:639
+msgid ""
+"New computers will use this location for computing and project preferences."
+msgstr "I nuovi computer utilizzeranno questo luogo per le preferenze di elaborazione e dei progetti."
 
-#: ../inc/prefs.inc:823
-msgid "Separate preferences for %1"
-msgstr "Preferenze separate per %1"
+#: ../inc/prefs_project.inc:52
+msgid "Resource share"
+msgstr "Allocazione risorse"
 
-#: ../inc/prefs.inc:833 ../inc/prefs.inc:914
-msgid "Edit preferences"
-msgstr "Modifica le Preferenze"
+#: ../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 la proporzione delle risorse allocate del tuo computer a questo progetto. Ad esempio, se participi a due progetti BOINC con uno share di risorse di 100 e 200, il primo avrà 1/3 delle tue risorse, mentre il secondo avrà 2/3."
 
-#: ../inc/prefs.inc:839
-msgid "Add separate preferences for %1"
-msgstr "Aggiungi le preferenze separate per %1"
+#: ../inc/prefs_project.inc:61
+msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
+msgstr "Accelerare le attività GPU dedicando a ciascuna di esse una CPU?"
 
-#: ../inc/prefs.inc:847 ../inc/prefs.inc:895
-msgid "(Switch View)"
-msgstr "(Cambia Visuale)"
+#: ../inc/prefs_project.inc:70
+msgid "Use CPU"
+msgstr "Utilizzo CPU"
 
-#: ../inc/prefs.inc:849 ../inc/prefs.inc:898
-msgid "Combined preferences"
-msgstr "Preferenze combinate"
+#: ../inc/prefs_project.inc:79
+msgid "Use ATI GPU"
+msgstr "Utilizzare GPU ATI"
 
-#: ../inc/prefs.inc:854
-msgid "Project specific settings"
-msgstr "Impostazioni specifiche per il progetto"
+#: ../inc/prefs_project.inc:88
+msgid "Use NVIDIA GPU"
+msgstr "Utilizzare GPU NVIDIA"
 
-#: ../inc/prefs.inc:862 ../inc/prefs.inc:907
-msgid "Primary (default) preferences"
-msgstr "Impostazioni principali (predefinite)"
+#: ../inc/prefs_project.inc:97
+msgid "Use Intel GPU"
+msgstr "Utilizzare Intel GPU"
 
-#: ../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 "Modifica le preferenze per %1"
+#: ../inc/prefs_project.inc:107
+msgid "Run test applications?"
+msgstr "Avviare le applicazioni di test?"
 
-#: ../inc/prefs.inc:885
-msgid "These apply to all BOINC projects in which you participate."
-msgstr "Queste si applicano a tutti i progetti BOINC nei quali partecipi."
+#: ../inc/prefs_project.inc:108
+msgid ""
+"This helps us develop applications, but may cause jobs to fail on your "
+"computer"
+msgstr "Questo ci aiuta a sviluppare applicazioni, ma potrebbe causare elaborazioni fallite sul tuo computer"
 
-#: ../inc/prefs.inc:887
+#: ../inc/prefs_project.inc:115
 msgid ""
-"On computers participating in multiple projects, the most recently modified "
-"preferences will be used."
-msgstr ""
-"Su computer che partecipano a progetti multipli, le preferenze modificate "
-"più recentemente verranno utilizzate."
+"Emails will be sent from %1; make sure your spam filter accepts this "
+"address."
+msgstr "Verranno mandate email da %1; accertati che il tuo filtro di spam accetti questo indirizzo. "
 
-#: ../inc/prefs.inc:889
-msgid "These preferences do not apply to Android devices."
-msgstr "Queste preferenze non si applicano ai dispositivi Android."
+#: ../inc/prefs_project.inc:123
+msgid "Is it OK for %1 and your team (if any) to email you?"
+msgstr "Sei d'accordo che %1 ed il tuo team (se ne hai uno) possano inviarti email?"
 
-#: ../inc/prefs.inc:892
-msgid "Preferences last modified:"
-msgstr "Ultima modifica delle preferenze:"
+#: ../inc/prefs_project.inc:130
+msgid "Should %1 show your computers on its web site?"
+msgstr "%1 può mostrare i tuoi computer sul suo sito web?"
 
-#: ../inc/prefs.inc:944
-msgid "Add preferences"
-msgstr "Aggiungi le preferenze"
+#: ../inc/prefs_project.inc:270
+msgid "(Switch View)"
+msgstr "(Cambia Visuale)"
 
-#: ../inc/prefs.inc:948
-msgid "Update preferences"
-msgstr "Aggiorna le preferenze"
+#: ../inc/prefs_project.inc:276
+msgid "Project specific settings"
+msgstr "Impostazioni specifiche per il progetto"
 
-#: ../inc/prefs.inc:1036 ../inc/prefs.inc:1045
-msgid "Default computer location"
-msgstr "Posizione del computer predefinita"
+#: ../inc/prefs_util.inc:33
+msgid "bad venue: %1"
+msgstr "sede non valida: %1"
+
+#: ../inc/prefs_util.inc:39
+msgid "bad subset: %1"
+msgstr "sottoclasse non valida: %1"
 
-#: ../inc/prefs_util.inc:305 ../inc/prefs_util.inc:315
+#: ../inc/prefs_util.inc:476 ../inc/prefs_util.inc:500
 msgid "and"
 msgstr "e"
 
@@ -1386,19 +1509,15 @@ msgstr "e"
 msgid ""
 "Your profile will be made visible to other people as soon as it has been "
 "approved by the project. This may take up to a few days."
-msgstr ""
-"Il tuo profile verrà reso visibile agli altri utenti non appena viene "
-"approvato dal progetto. Questo potrebbe richiedere alcuni giorni."
+msgstr "Il tuo profile verrà reso visibile agli altri utenti non appena viene approvato dal progetto. Questo potrebbe richiedere alcuni giorni."
 
 #: ../inc/profile.inc:92
 msgid ""
 "Your profile has been marked as unacceptable. It is not visible to other "
 "people. Please change it."
-msgstr ""
-"Il tuo profilo è stato considerato inacettabile. Non è visibile agli altri "
-"utenti. Per favore modificalo."
+msgstr "Il tuo profilo è stato considerato inacettabile. Non è visibile agli altri utenti. Per favore modificalo."
 
-#: ../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 "Errore del database"
 
@@ -1406,10 +1525,7 @@ msgstr "Errore del database"
 msgid ""
 "To prevent spam, profiles of users with an average credit of less than %1 "
 "are displayed only to logged-in users. We apologize for this inconvenience."
-msgstr ""
-"Per evitare lo spam, i profili degli utenti con un credito medio inferiore a "
-"%1 vengono mostrati solo agli utenti connessi. Ci scusiamo per questo "
-"inconveniente."
+msgstr "Per evitare lo spam, i profili degli utenti con un credito medio inferiore a %1 vengono mostrati solo agli utenti connessi. Ci scusiamo per questo inconveniente."
 
 #: ../inc/profile.inc:197
 msgid "User is banished"
@@ -1419,7 +1535,7 @@ msgstr "L'utente è stato bannato."
 msgid "No profile exists for that user ID."
 msgstr "Non esiste alcun profilo con questo ID utente."
 
-#: ../inc/profile.inc:219 ../user/create_profile.php:313
+#: ../inc/profile.inc:219 ../user/create_profile.php:309
 msgid "Edit your profile"
 msgstr "Modifica il tuo profilo"
 
@@ -1467,11 +1583,12 @@ msgstr "Non è nel DB"
 msgid "pending"
 msgstr "non assegnato"
 
-#: ../inc/result.inc:114 ../user/forum_search.php:60
+#: ../inc/result.inc:114 ../user/forum_search.php:62
 msgid "All"
 msgstr "Tutti"
 
 #: ../inc/result.inc:115 ../inc/result.inc:176 ../inc/result.inc:223
+#: ../user/server_status.php:163
 msgid "In progress"
 msgstr "In corso"
 
@@ -1500,6 +1617,7 @@ msgid "Inactive"
 msgstr "Non attivo"
 
 #: ../inc/result.inc:175 ../inc/result.inc:222 ../user/explain_state.php:37
+#: ../user/server_status.php:163
 msgid "Unsent"
 msgstr "Non inviato"
 
@@ -1664,129 +1782,135 @@ msgid "WU cancelled"
 msgstr "Lavoro cancellato"
 
 #: ../inc/result.inc:322
+msgid "Canonical result is missing"
+msgstr "Il risultato canonico è mancante."
+
+#: ../inc/result.inc:326
 msgid "Unrecognized Error: %1"
 msgstr "Errore non riconosciuto: %1"
 
-#: ../inc/result.inc:349
+#: ../inc/result.inc:353
 msgid "Task name"
 msgstr "Nome del lavoro"
 
-#: ../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 "clicca per i dettagli"
 
-#: ../inc/result.inc:349
+#: ../inc/result.inc:353
 msgid "Show IDs"
 msgstr "Mostra gli ID"
 
-#: ../inc/result.inc:354
+#: ../inc/result.inc:358
 msgid "Show names"
 msgstr "Visualizza nomi"
 
-#: ../inc/result.inc:357
+#: ../inc/result.inc:361
 msgid "Task"
 msgstr "Attività"
 
-#: ../inc/result.inc:360
+#: ../inc/result.inc:364
 msgid "Work unit"
 msgstr "Unità di lavoro"
 
-#: ../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 "Inviato"
 
-#: ../inc/result.inc:373
+#: ../inc/result.inc:377
 msgid "Time reported<br />or deadline"
 msgstr "Tempo riportato<br />o scadenza"
 
-#: ../inc/result.inc:374
+#: ../inc/result.inc:378
 msgid "explain"
 msgstr "spiega"
 
-#: ../inc/result.inc:376 ../user/server_status.php:241
+#: ../inc/result.inc:380 ../user/server_status.php:113
 msgid "Status"
 msgstr "Stato"
 
-#: ../inc/result.inc:377
+#: ../inc/result.inc:381
 msgid "Run time<br />(sec)"
 msgstr "Tempo di elaborazione<br />(sec)"
 
-#: ../inc/result.inc:378
+#: ../inc/result.inc:382
 msgid "CPU time<br />(sec)"
 msgstr "Tempo CPU<br />(sec)"
 
-#: ../inc/result.inc:379 ../inc/result.inc:642
+#: ../inc/result.inc:383 ../inc/result.inc:646
 msgid "Credit"
 msgstr "Crediti"
 
-# ########################################
-# Apps page (apps.php)
-#: ../inc/result.inc:380 ../inc/result.inc:724
+#: ../inc/result.inc:384 ../inc/result.inc:746 ../user/server_status.php:163
 msgid "Application"
 msgstr "Applicazione"
 
-#: ../inc/result.inc:629
+#: ../inc/result.inc:633
 msgid "Workunit"
 msgstr "Lavoro"
 
-#: ../inc/result.inc:632
+#: ../inc/result.inc:636
+msgid "Report deadline"
+msgstr "Scadenza"
+
+#: ../inc/result.inc:637
 msgid "Received"
 msgstr "Ricevuto"
 
-#: ../inc/result.inc:633
+#: ../inc/result.inc:638
 msgid "Server state"
 msgstr "Stato server"
 
-#: ../inc/result.inc:634
+#: ../inc/result.inc:639
 msgid "Outcome"
 msgstr "Risultato"
 
-#: ../inc/result.inc:635
+#: ../inc/result.inc:640
 msgid "Client state"
 msgstr "Stato client"
 
-#: ../inc/result.inc:636
+#: ../inc/result.inc:641
 msgid "Exit status"
 msgstr "Stato di uscita"
 
-#: ../inc/result.inc:638
-msgid "Report deadline"
-msgstr "Scadenza"
-
-#: ../inc/result.inc:639
+#: ../inc/result.inc:643
 msgid "Run time"
 msgstr "Tempo di elaborazione"
 
-#: ../inc/result.inc:640
+#: ../inc/result.inc:644
 msgid "CPU time"
 msgstr "Tempo CPU"
 
-#: ../inc/result.inc:641
+#: ../inc/result.inc:645
 msgid "Validate state"
 msgstr "Stato di validazione"
 
-#: ../inc/result.inc:643
+#: ../inc/result.inc:647
+msgid "Device peak FLOPS"
+msgstr "Picco di FLOPS del dispositivo"
+
+#: ../inc/result.inc:648
 msgid "Application version"
 msgstr "Versione dell'applicazione"
 
-#: ../inc/result.inc:656
+#: ../inc/result.inc:673
 msgid "Output files"
 msgstr "File di output"
 
-#: ../inc/result.inc:659
+#: ../inc/result.inc:676
 msgid "Stderr output"
 msgstr "Output su Stderr"
 
-#: ../inc/result.inc:706
+#: ../inc/result.inc:728
 msgid "State"
 msgstr "Stato"
 
-#: ../inc/result.inc:747
+#: ../inc/result.inc:769
 msgid "Task name:"
 msgstr "Nome del lavoro:"
 
@@ -1800,20 +1924,9 @@ msgstr "Parole chiave"
 
 #: ../inc/team.inc:41
 msgid "Find teams with these words in their names or descriptions"
-msgstr ""
-"Trova i team che hanno queste parole nel loro nome o nella loro descrizione"
-
-#: ../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 "Nazionalità"
+msgstr "Trova i team che hanno queste parole nel loro nome o nella loro descrizione"
 
-#: ../inc/team.inc:49 ../inc/team.inc:453
+#: ../inc/team.inc:49 ../inc/team.inc:468
 msgid "Type of team"
 msgstr "Tipo di team"
 
@@ -1821,7 +1934,7 @@ msgstr "Tipo di team"
 msgid "Show only active teams"
 msgstr "Mostra solo i team attivi"
 
-#: ../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 "Cerca"
 
@@ -1841,8 +1954,8 @@ msgstr "Richiesto da te"
 msgid "founder response deadline is %1"
 msgstr "il limite massimo per una risposta del fondatore è %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 "Nessuno"
 
@@ -1858,507 +1971,477 @@ msgstr "Rinviato"
 msgid "Team info"
 msgstr "Informazioni sul team"
 
-#: ../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 "Descrizione"
 
-#: ../inc/team.inc:97
+#: ../inc/team.inc:101
 msgid "Web site"
 msgstr "Sito web"
 
-#: ../inc/team.inc:120
+#: ../inc/team.inc:127
 msgid "Cross-project stats"
 msgstr "Statistiche di tutti i progetti"
 
-#: ../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 "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 "Argomenti"
 
-#: ../inc/team.inc:136
+#: ../inc/team.inc:143
 msgid "Join this team"
 msgstr "Unisciti a questo team"
 
-#: ../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 nelle tue preferenze del progetto la voce 'OK alle email' è "
-"spuntata, unendosi al team, si dà il consenso al fondatore ad inviare "
-"messaggi al tuo indirizzo di posta elettronica."
+msgstr "Nota: se nelle tue preferenze del progetto la voce 'OK alle email' è spuntata, unendosi al team, si dà il consenso al fondatore ad inviare messaggi al tuo indirizzo di posta elettronica."
 
-#: ../inc/team.inc:140
+#: ../inc/team.inc:147
 msgid "Not accepting new members"
 msgstr "Non accetta nuovi membri"
 
-#: ../inc/team.inc:147
+#: ../inc/team.inc:154
 msgid "Foundership change requested"
 msgstr "Richiesta di cambio del fondatore"
 
-#: ../inc/team.inc:148
+#: ../inc/team.inc:155
 msgid "Respond by %1"
 msgstr "Risposta di %1"
 
-#: ../inc/team.inc:152
+#: ../inc/team.inc:159
 msgid "Team foundership change"
 msgstr "Cambio di fondatore del team"
 
-#: ../inc/team.inc:156 ../inc/team.inc:359
+#: ../inc/team.inc:163 ../inc/team.inc:368
 msgid "Members"
 msgstr "Membri"
 
-#: ../inc/team.inc:157 ../inc/team.inc:254
+#: ../inc/team.inc:164 ../inc/team.inc:263
 msgid "Founder"
 msgstr "Fondatore"
 
-#: ../inc/team.inc:169
+#: ../inc/team.inc:178
 msgid "Admins"
 msgstr "Amministratori"
 
-#: ../inc/team.inc:184
+#: ../inc/team.inc:193
 msgid "New members in last day"
 msgstr "Nuovi membri nell'ultimo giorno"
 
-#: ../inc/team.inc:185
+#: ../inc/team.inc:194
 msgid "Total members"
 msgstr "Totale dei membri"
 
-#: ../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 "visualizza"
 
-#: ../inc/team.inc:186
+#: ../inc/team.inc:195
 msgid "Active members"
 msgstr "Membri attivi"
 
-#: ../inc/team.inc:187
+#: ../inc/team.inc:196
 msgid "Members with credit"
 msgstr "Membri con credito"
 
-#: ../inc/team.inc:256
+#: ../inc/team.inc:265
 msgid "Admin"
 msgstr "Amministratore"
 
-#: ../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 "Precedente %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 "Successivi %1"
 
-#: ../inc/team.inc:289
+#: ../inc/team.inc:298
 msgid "No such team."
 msgstr "Nessun team."
 
-#: ../inc/team.inc:302
+#: ../inc/team.inc:311
 msgid "This operation requires foundership."
 msgstr "Per fare questa operazione devi essere il fondatore."
 
-#: ../inc/team.inc:326
+#: ../inc/team.inc:335
 msgid "This operation requires team admin privileges"
 msgstr "Per fare questa operazione devi avere i privilegi da amministratore"
 
-#: ../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 ""
-"ATTENZIONE: questo è un grosso team di BOINC. Se fai delle modifiche qui, "
-"saranno presto sovrascritte. Modifica al suo posto il %1BOINC-wide team%2."
+"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 "ATTENZIONE: questo è un grosso team di BOINC. Se fai delle modifiche qui, saranno presto sovrascritte. Modifica al suo posto il %1BOINC-wide team%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 ""
-"%1Nota sulla privacy%2: se hai intenzione di creare un team, le preferenze "
-"del tuo progetto (allocazione delle risorse, preferenze grafiche) saranno "
-"visibili a tutti."
+msgstr "%1Nota sulla privacy%2: se hai intenzione di creare un team, le preferenze del tuo progetto (allocazione delle risorse, preferenze grafiche) saranno visibili a tutti."
 
-#: ../inc/team.inc:432
+#: ../inc/team.inc:447
 msgid "Team name, text version"
 msgstr "Nome del team, versione testuale"
 
-#: ../inc/team.inc:433
+#: ../inc/team.inc:448
 msgid "Don't use HTML tags."
 msgstr "Non usare i tag HTML."
 
-#: ../inc/team.inc:436
+#: ../inc/team.inc:451
 msgid "Team name, HTML version"
 msgstr "Nome del team, versione 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 "Puoi usare %1un numero limitato di tag HTML%2."
 
-#: ../inc/team.inc:439
+#: ../inc/team.inc:454
 msgid "If you don't know HTML, leave this box blank."
 msgstr "Se non conosci l'HTML, lascia questo campo vuoto."
 
-#: ../inc/team.inc:442
+#: ../inc/team.inc:457
 msgid "URL of team web page, if any"
 msgstr "URL del sito web del gruppo, se esiste"
 
-#: ../inc/team.inc:442
+#: ../inc/team.inc:457
 msgid "without \"http://\""
 msgstr "senza \"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 "Questo indirizzo sarà linkato nella pagina del team su questo sito."
 
-#: ../inc/team.inc:446
+#: ../inc/team.inc:461
 msgid "Description of team"
 msgstr "Descrizione del team"
 
-#: ../inc/team.inc:462
+#: ../inc/team.inc:477
 msgid "Accept new members?"
 msgstr "Accetare nuovi membri?"
 
-#: ../inc/uotd.inc:28
+#: ../inc/uotd.inc:30
 msgid "User profile"
 msgstr "Profilo utente"
 
-# ########################################
-# Public user page (show_user.php)
-#: ../inc/user.inc:119
+#: ../inc/user.inc:120
 msgid "Projects in which you are participating"
 msgstr "Progetti a cui stai partecipando"
 
-#: ../inc/user.inc:121
+#: ../inc/user.inc:122
 msgid "Projects in which %1 is participating"
 msgstr "Progetti in cui %1 sta partecipando"
 
-#: ../inc/user.inc:125
+#: ../inc/user.inc:126
 msgid "Project"
 msgstr "Progetto"
 
-#: ../inc/user.inc:125
+#: ../inc/user.inc:126
 msgid "Click for user page"
 msgstr "Clicca qui per la pagina dell'utente"
 
-#: ../inc/user.inc:125
+#: ../inc/user.inc:126
 msgid "Since"
 msgstr "Membro dal"
 
-#: ../inc/user.inc:148
+#: ../inc/user.inc:151
 msgid "Computing and credit"
 msgstr "Elaborazioni e crediti"
 
-#: ../inc/user.inc:151
+#: ../inc/user.inc:154
 msgid "Computers on this account"
 msgstr "Computer di questo account"
 
-#: ../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 "Visualizza"
 
-#: ../inc/user.inc:161
+#: ../inc/user.inc:164
 msgid "Cross-project ID"
 msgstr "ID su tutti i progetti (CPID)"
 
-#: ../inc/user.inc:162
+#: ../inc/user.inc:165
 msgid "Cross-project statistics"
 msgstr "Statistiche di tutti i progetti"
 
-#: ../inc/user.inc:163
+#: ../inc/user.inc:166
 msgid "Account"
 msgstr "Account"
 
-#: ../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 "Inter-progetto"
 
-#: ../inc/user.inc:168 ../user/bs_sample_index.php:54
+#: ../inc/user.inc:171
 msgid "Certificate"
 msgstr "Certificato"
 
-#: ../inc/user.inc:169
+#: ../inc/user.inc:172
 msgid "Stats on your cell phone"
 msgstr "Statistiche sul tuo telefono cellulare"
 
-#: ../inc/user.inc:183
-msgid "Unknown notification type: %1"
-msgstr "Tipo sconosciuto di notifica: %1"
-
-#: ../inc/user.inc:198
+#: ../inc/user.inc:197
 msgid "Account information"
 msgstr "Informazioni sull'account"
 
-#: ../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"
 
-#: ../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 "Codice postale"
 
-#: ../inc/user.inc:207 ../inc/user.inc:316
+#: ../inc/user.inc:214 ../inc/user.inc:394
 msgid "%1 member since"
 msgstr "membro dal %1"
 
-#: ../inc/user.inc:209
+#: ../inc/user.inc:219 ../inc/user.inc:223
 msgid "Change"
 msgstr "Cambia"
 
-#: ../inc/user.inc:209
+#: ../inc/user.inc:224
 msgid "email address"
 msgstr "e-mail"
 
-#: ../inc/user.inc:210
+#: ../inc/user.inc:225
 msgid "password"
 msgstr "password"
 
-#: ../inc/user.inc:211
+#: ../inc/user.inc:226
 msgid "other account info"
 msgstr "altre informazioni sull'account"
 
-#: ../inc/user.inc:213 ../inc/user.inc:315
+#: ../inc/user.inc:229 ../inc/user.inc:393
 msgid "User ID"
 msgstr "ID dell'utente"
 
-#: ../inc/user.inc:213
+#: ../inc/user.inc:229
 msgid "Used in community functions"
 msgstr "Usato nel forum"
 
-# 91%
-#: ../inc/user.inc:216 ../user/weak_auth.php:25
+#: ../inc/user.inc:232 ../user/weak_auth.php:25
 msgid "Account keys"
 msgstr "Chiave di accesso"
 
-#: ../inc/user.inc:221
+#: ../inc/user.inc:237
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: ../inc/user.inc:224
+#: ../inc/user.inc:240
 msgid "When and how BOINC uses your computer"
 msgstr "Quando e come usi BOINC sul tuo computer"
 
-#: ../inc/user.inc:225
+#: ../inc/user.inc:241
 msgid "Computing preferences"
 msgstr "Preferenze di elaborazione"
 
-#: ../inc/user.inc:228
+#: ../inc/user.inc:244
 msgid "Message boards and private messages"
 msgstr "Forum e messaggi privati"
 
-#: ../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 "Preferenze per la comunità"
 
-#: ../inc/user.inc:232
+#: ../inc/user.inc:248
 msgid "Preferences for this project"
 msgstr "Preferenze per questo progetto"
 
-#: ../inc/user.inc:233 ../user/prefs.php:29
+#: ../inc/user.inc:249 ../user/prefs.php:30
 msgid "%1 preferences"
 msgstr "Preferenze per %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 "Mostra il profilo di %1"
+
+#: ../inc/user.inc:267 ../inc/user.inc:316 ../inc/user.inc:482
+msgid "Profile"
+msgstr "Profilo"
+
+#: ../inc/user.inc:307 ../user/sample_index.php:114
 msgid "Community"
 msgstr "Comunità"
 
-#: ../inc/user.inc:243 ../user/pm.php:107 ../user/pm.php:147
-msgid "Delete"
-msgstr "Cancella"
-
-#: ../inc/user.inc:245
+#: ../inc/user.inc:314
 msgid "Create"
 msgstr "Crea"
 
-#: ../inc/user.inc:247 ../inc/user.inc:402 ../inc/util.inc:514
-msgid "Profile"
-msgstr "Profilo"
-
-# ########################################
-# Forum
-#: ../inc/user.inc:250 ../inc/user.inc:375
+#: ../inc/user.inc:321 ../inc/user.inc:454
 msgid "%1 posts"
 msgstr "%1 messaggi"
 
-# ########################################<br />
-# Apps page (apps.php)
-#: ../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 "Notifiche"
 
-#: ../inc/user.inc:269
+#: ../inc/user.inc:346
 msgid "Quit team"
 msgstr "Abbandona il team"
 
-#: ../inc/user.inc:271 ../inc/user.inc:288
+#: ../inc/user.inc:348 ../inc/user.inc:365
 msgid "Administer"
 msgstr "Amministra"
 
-#: ../inc/user.inc:277 ../inc/user.inc:290
+#: ../inc/user.inc:354 ../inc/user.inc:367
 msgid "(foundership change request pending)"
 msgstr "(richiesta per cambio del fondatore in corso)"
 
-#: ../inc/user.inc:279
+#: ../inc/user.inc:356
 msgid "Member of team"
 msgstr "Membro del team"
 
-#: ../inc/user.inc:281
+#: ../inc/user.inc:358
 msgid "find a team"
 msgstr "trova un team"
 
-#: ../inc/user.inc:292
+#: ../inc/user.inc:369
 msgid "Founder but not member of"
 msgstr "Fondatore ma non membro di"
 
-#: ../inc/user.inc:298
+#: ../inc/user.inc:375
 msgid "Find friends"
 msgstr "Trova degli amici"
 
-#: ../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 "Amici"
 
-#: ../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 "Donatore"
 
-#: ../inc/user.inc:378
+#: ../inc/user.inc:458
 msgid "Contact"
 msgstr "Contatta"
 
-#: ../inc/user.inc:381
+#: ../inc/user.inc:461
 msgid "This person is a friend"
 msgstr "Questa persona è un amico"
 
-#: ../inc/user.inc:382 ../user/friend.php:238
+#: ../inc/user.inc:462 ../user/friend.php:240
 msgid "Cancel friendship"
 msgstr "Cancella l'amicizia"
 
-#: ../inc/user.inc:385 ../user/friend.php:37
+#: ../inc/user.inc:465 ../user/friend.php:39
 msgid "Request pending"
 msgstr "Richiesta in corso"
 
-#: ../inc/user.inc:387
+#: ../inc/user.inc:467
 msgid "Add as friend"
 msgstr "Aggiungi come amico"
 
-#: ../inc/user.inc:446
+#: ../inc/user.inc:526
 msgid "user name cannot have leading or trailing white space"
 msgstr "lo username non può iniziare o terminare con uno spazio"
 
-#: ../inc/user.inc:450
+#: ../inc/user.inc:530
 msgid "user name must be nonempty"
 msgstr "lo username non può essere vuoto"
 
-#: ../inc/user.inc:454
+#: ../inc/user.inc:534
 msgid "user name may not contain HTML tags"
 msgstr "lo username non può contenere tag HTML"
 
-#: ../inc/util.inc:131
+#: ../inc/util.inc:161
 msgid "log out"
 msgstr "Esci"
 
-#: ../inc/util.inc:133
+#: ../inc/util.inc:163
 msgid "log in"
 msgstr "accedi"
 
-#: ../inc/util.inc:204 ../user/login_form.php:30 ../user/login_form.php:66
-msgid "Log in"
-msgstr "Entra"
-
-# ########################################
-# Create account form (create_account_form.php)
-#: ../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 "Crea un account"
 
-#: ../inc/util.inc:206
+#: ../inc/util.inc:240
 msgid "Server status page"
 msgstr "Stato del server"
 
-#: ../inc/util.inc:248
+#: ../inc/util.inc:277
 msgid ""
 "A database error occurred while handling your request; please try again "
 "later."
-msgstr ""
-"Si è verificato un errore del database mentre si gestiva la tua richiesta; "
-"per favore riprova più tardi."
+msgstr "Si è verificato un errore del database mentre si gestiva la tua richiesta; per favore riprova più tardi."
 
-#: ../inc/util.inc:257
+#: ../inc/util.inc:286
 msgid "Unable to handle request"
 msgstr "Impossibile gestire la richiesta"
 
-#: ../inc/util.inc:277
+#: ../inc/util.inc:306
 msgid "hours"
 msgstr "ore"
 
-#: ../inc/util.inc:280
+#: ../inc/util.inc:309
 msgid "min"
 msgstr "minuti"
 
-#: ../inc/util.inc:283
+#: ../inc/util.inc:312
 msgid "sec"
 msgstr "secondi"
 
-#: ../inc/util.inc:444
-msgid "Link has timed out. Please click Back, refresh the page, and try again."
-msgstr ""
-"Tempo di connessione al link scaduto. Per favore clicca Indietro, aggiorna "
-"la pagina e prova ancora."
-
-#: ../inc/util.inc:513
-msgid "View the profile of %1"
-msgstr "Mostra il profilo di %1"
+#: ../inc/util.inc:473
+msgid ""
+"Link has timed out. Please click Back, refresh the page, and try again."
+msgstr "Tempo di connessione al link scaduto. Per favore clicca Indietro, aggiorna la pagina e prova ancora."
 
-#: ../inc/util.inc:569
+#: ../inc/util.inc:552
 msgid "Use BBCode tags to format your text"
 msgstr "Usa i tag BBCode per formattare il testo"
 
-#: ../inc/util.inc:796
+#: ../inc/util.inc:779
 msgid "Project down for maintenance"
 msgstr "Progetto sospeso per manutenzione"
 
-#: ../inc/util.inc:799
+#: ../inc/util.inc:782
 msgid "%1 is temporarily shut down for maintenance.  Please try again later."
-msgstr ""
-"%1 è temporaneamente fuori servizio per manutenzione. Riprova più tardi."
+msgstr "%1 è temporaneamente fuori servizio per manutenzione. Riprova più tardi."
 
-#: ../inc/util.inc:817
+#: ../inc/util.inc:800
 msgid "Unable to connect to database - please try again later"
 msgstr "Impossibile connettersi al database - per favore riprova più tardi"
 
-#: ../inc/util.inc:821
+#: ../inc/util.inc:804
 msgid "Unable to select database - please try again later"
 msgstr "Impossibile selezionare il database - per favore riprova più tardi"
 
-#: ../inc/util_ops.inc:109 ../user/get_passwd.php:72
+#: ../inc/util.inc:976
+msgid "characters remaining"
+msgstr "caratteri rimanenti"
+
+#: ../inc/util_ops.inc:115 ../user/get_passwd.php:72
 msgid "Stay logged in on this computer"
 msgstr "Rimani loggato su questo computer"
 
@@ -2366,24 +2449,6 @@ msgstr "Rimani loggato su questo computer"
 msgid "Finish account setup"
 msgstr "Completa la configurazione dell'account"
 
-#: ../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 "Identificati sul nostro sito. Usa il tuo nome reale oppure un alias."
-
-#: ../user/account_finish.php:45 ../user/create_account_form.php:98
-msgid "Select the country you want to represent, if any."
-msgstr "Seleziona la nazione che vuoi rappresentare, se lo desideri."
-
-#: ../user/account_finish.php:51 ../user/create_account_form.php:104
-msgid "Postal or ZIP Code"
-msgstr "CAP"
-
-# ########################################<br />
-# General stuff (create_account_form.php and others)
-#: ../user/account_finish.php:51 ../user/create_account_form.php:104
-msgid "Optional"
-msgstr "Dati facoltativi"
-
 #: ../user/account_finish_action.php:27
 msgid "You must supply a name for your account"
 msgstr "Devi fornire un nome per il tuo account"
@@ -2392,40 +2457,38 @@ msgstr "Devi fornire un nome per il tuo account"
 msgid "HTML tags not allowed in name"
 msgstr "I tag HTML non sono ammessi nel 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 "Modifica le preferenze per %1"
+
+#: ../user/add_venue.php:82
 msgid "Add %1 preferences for %2"
 msgstr "Aggiungi %1 preferenze per %2"
 
-# ########################################
-# Apps page (apps.php)
-#: ../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 "Applicazioni"
 
-#: ../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 ""
-"Attualmente %1 sta usando le seguenti applicazioni. Partecipando a %1, "
-"verranno assegnati al tuo computer dei lavori per una o più di queste "
-"applicazioni. Gli aggiornamenti alle ultime versioni verranno eseguiti "
-"automaticamente."
+msgstr "%1 al momento sta usando le seguenti applicazioni. Quando partecipi a %1, le elaborazioni per una o più di queste applicazioni saranno assegnate al tuo computer. La versione corrente delle applicazioni sarà scaricata sul tuo computer. Questo succede automaticamente; non devi fare nulla."
 
-#: ../user/apps.php:50
+#: ../user/apps.php:54
 msgid "Platform"
 msgstr "Piattaforma"
 
-#: ../user/apps.php:51
+#: ../user/apps.php:55
 msgid "Version"
 msgstr "Versione"
 
-#: ../user/apps.php:52
-msgid "Installation time"
-msgstr "Tempo d'installazione"
+#: ../user/apps.php:57
+msgid "Average computing"
+msgstr "Elaborazione media"
 
 #: ../user/bbcode.php:23
 msgid "BBCode tags"
@@ -2437,19 +2500,12 @@ msgid ""
 "It's similar to HTML, but simpler. The tags start with a [ (where you would\n"
 "have used %1 in HTML) and end with ] (where you would have used %2 in\n"
 "HTML)."
-msgstr ""
-"I tag BBCode ti consentono di formattare il testo del tuo profilo e i "
-"messaggi inviati in bacheca.\n"
-" Essi sono simili all'HTML, ma più semplici. I tag iniziano con una [ (in "
-"HTML potresti\n"
-" usare %1) e terminano con ] (in HTML\n"
-" potresti usare %2)."
+msgstr "I tag BBCode ti consentono di formattare il testo del tuo profilo e i messaggi inviati in bacheca.\n Essi sono simili all'HTML, ma più semplici. I tag iniziano con una [ (in HTML potresti\n usare %1) e terminano con ] (in HTML\n potresti usare %2)."
 
 #: ../user/bbcode.php:31
 msgid "Examples"
 msgstr "Esempi"
 
-# 75%
 #: ../user/bbcode.php:32
 msgid "Bold"
 msgstr "Grassetto"
@@ -2463,162 +2519,78 @@ msgid "Underline"
 msgstr "Sottolineato"
 
 #: ../user/bbcode.php:35
+msgid "Strikethrough"
+msgstr "Barrato"
+
+#: ../user/bbcode.php:36
 msgid "Superscript"
 msgstr "Apice"
 
-#: ../user/bbcode.php:36
+#: ../user/bbcode.php:37
 msgid "Big text"
 msgstr "Testo in grande"
 
-#: ../user/bbcode.php:37
+#: ../user/bbcode.php:38
 msgid "Red text"
 msgstr "Testo in rosso"
 
-#: ../user/bbcode.php:38
+#: ../user/bbcode.php:39
 msgid "link to website"
 msgstr "link al sito"
 
-#: ../user/bbcode.php:39
+#: ../user/bbcode.php:40
 msgid "Quoted text"
 msgstr "Testo citato"
 
-#: ../user/bbcode.php:39
+#: ../user/bbcode.php:40
 msgid "use for quoted blocks of text"
 msgstr "utilizza per le citazioni"
 
-#: ../user/bbcode.php:40
+#: ../user/bbcode.php:41
 msgid "use to display an image"
 msgstr "usa per visualizzare un'immagine"
 
-#: ../user/bbcode.php:41
+#: ../user/bbcode.php:42
 msgid "Code snippet here"
 msgstr "Inserisci qui il frammento di codice"
 
-#: ../user/bbcode.php:41
+#: ../user/bbcode.php:42
 msgid "use to display some code"
 msgstr "usa per visualizzare codici"
 
-#: ../user/bbcode.php:42
+#: ../user/bbcode.php:43
 msgid "Pre-formatted text"
 msgstr "Testo preformattato"
 
-#: ../user/bbcode.php:42
+#: ../user/bbcode.php:43
 msgid "use to display pre-formatted (usually monospaced) text"
-msgstr ""
-"usa per visualizzare un testo preformattato (di solito è un carattere "
-"monospaziato)"
+msgstr "usa per visualizzare un testo preformattato (di solito è un carattere monospaziato)"
 
-#: ../user/bbcode.php:43
+#: ../user/bbcode.php:44
 msgid "Item 1"
 msgstr "Elemento 1"
 
-#: ../user/bbcode.php:43
+#: ../user/bbcode.php:44
 msgid "Item2"
 msgstr "Elemento 2"
 
-#: ../user/bbcode.php:43
+#: ../user/bbcode.php:44
 msgid "Item 2"
 msgstr "Elemento 2"
 
-#: ../user/bbcode.php:45
+#: ../user/bbcode.php:46
 msgid "use to link to Trac ticket on BOINC website"
 msgstr "usa per inserire un link ad un ticket su Trac sul sito BOINC"
 
-#: ../user/bbcode.php:47
+#: ../user/bbcode.php:48
 msgid "use to link to Trac Wiki on BOINC website"
 msgstr "usa per inserire un link alla Wiki Trac sul sito BOINC"
 
-#: ../user/bbcode.php:49
-msgid "use to link to SVN changeset on BOINC website"
-msgstr "usa per inserire un link ad un set di modifiche su SVN sul sito 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 non chiudi un tag, o no specifichi un parametro in maniera corretta,\n"
-"il tag sarà visualizzato in chiaro al posto del testo formattato."
-
-#: ../user/bs_sample_index.php:44
-msgid "Participants"
-msgstr "Partecipanti"
-
-#: ../user/bs_sample_index.php:46
-msgid "Do work"
-msgstr "Lavora"
-
-# ########################################
-# "Your account" page (home.php)
-#: ../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 "Il tuo account"
-
-#: ../user/bs_sample_index.php:47 ../user/bs_sample_index.php:50
-msgid "view stats, modify preferences"
-msgstr "visualizza le statistiche, modifica le preferenze"
-
-#: ../user/bs_sample_index.php:48 ../user/bs_sample_index.php:53
-#: ../user/team.php:25
-msgid "Teams"
-msgstr "Team"
-
-#: ../user/bs_sample_index.php:48 ../user/bs_sample_index.php:53
-msgid "create or join a team"
-msgstr "crea o unisciti ad un team"
-
-#: ../user/bs_sample_index.php:51 ../user/sample_index.php:191
-msgid "User of the day"
-msgstr "Utente del giorno"
-
-#: ../user/bs_sample_index.php:52 ../user/server_status.php:239
-msgid "Server status"
-msgstr "Stato del server"
-
-#: ../user/bs_sample_index.php:60 ../user/profile_menu.php:32
-#: ../user/sample_index.php:127
-msgid "Profiles"
-msgstr "Profili"
-
-#: ../user/bs_sample_index.php:61
-msgid "User search"
-msgstr "Cerca utente"
-
-#: ../user/bs_sample_index.php:64
-msgid "Statistics"
-msgstr "Statistiche"
-
-# ########################################<br /><br />
-# Various top table pages (top users, computers, teams)
-#: ../user/bs_sample_index.php:65 ../user/stats.php:30
-#: ../user/top_users.php:116
-msgid "Top participants"
-msgstr "I migliori utenti"
-
-#: ../user/bs_sample_index.php:66 ../user/stats.php:31
-msgid "Top computers"
-msgstr "I migliori computer"
-
-#: ../user/bs_sample_index.php:67 ../user/stats.php:32 ../user/team.php:46
-msgid "Top teams"
-msgstr "I migliori team"
-
-#: ../user/bs_sample_index.php:68 ../user/gpu_list.php:182
-#: ../user/stats.php:33
-msgid "Top GPU models"
-msgstr "Top modelli GPU"
-
-#: ../user/bs_sample_index.php:70
-msgid "Languages"
-msgstr "Lingue"
-
-# ########################################<br />
-# Rules and Policies page (info.php)
-#: ../user/bs_sample_index.php:149 ../user/info.php:24
-#: ../user/sample_index.php:79
-msgid "Read our rules and policies"
-msgstr "Leggi le nostre regole e linee di condotta"
+msgstr "Se non chiudi un tag, o no specifichi un parametro in maniera corretta,\nil tag sarà visualizzato in chiaro al posto del testo formattato."
 
 #: ../user/create_account_action.php:26
 msgid "Can't create account"
@@ -2628,217 +2600,156 @@ msgstr "Non è possibile creare l'account"
 msgid "Click your browser's <b>Back</b> button to try again."
 msgstr "Fai click sul tasto <b>Indietro</b> del tuo browser per riprovare."
 
-#: ../user/create_account_action.php:47
+#: ../user/create_account_action.php:46
 msgid "Your reCAPTCHA response was not correct. Please try again."
 msgstr "La tua risposta al ReCaptcha non è corretta. Prova di nuovo."
 
-#: ../user/create_account_action.php:70
+#: ../user/create_account_action.php:69
 msgid "You must supply an invitation code to create an account."
 msgstr "Devi fornire un codice d'invito per creare un account."
 
-#: ../user/create_account_action.php:73
+#: ../user/create_account_action.php:72
 msgid "The invitation code you gave is not valid."
 msgstr "Il codice d'invito inserito non è valido."
 
-#: ../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 ""
-"Indirizzo email non valido: deve essere un indirizzo email valido del tipo "
-"nome at dominio"
+"Invalid email address: you must enter a valid address of the form "
+"name at domain"
+msgstr "Indirizzo email non valido: deve essere un indirizzo email valido del tipo 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 "Esiste già un account associato a questo indirizzo 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 "Le nuove password sono diverse"
 
-#: ../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 "Le password possono comprendere solo caratteri 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 ""
-"La nuova password è troppo corta: la lunghezza minima è di %1 caratteri."
+msgstr "La nuova password è troppo corta: la lunghezza minima è di %1 caratteri."
 
-#: ../user/create_account_action.php:127
+#: ../user/create_account_action.php:126
 msgid "Couldn't create account"
 msgstr "Non è stato possibile creare l'account"
 
-#: ../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 utilizzi il BOINC Manager, non usare questo form. Avvia BOINC, "
-"seleziona Aggiungi Progetto, e inserisci una email e una password."
+msgstr "NOTA: Se utilizzi il BOINC Manager, non usare questo form. Avvia BOINC, seleziona Aggiungi Progetto, e inserisci una email e una password."
 
-#: ../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 ""
-"Questo account apparterrà al team %1 ed avrà le preferenze del progetto "
-"decise dal suo fondatore."
-
-#: ../user/create_account_form.php:73
-msgid "Invitation Code"
-msgstr "Codice d'invito"
-
-#: ../user/create_account_form.php:73
-msgid "A valid invitation code is required to create an account."
-msgstr "E' necessario un codice d'invito valido per poter creare un account."
-
-#: ../user/create_account_form.php:83
-msgid "Email Address"
-msgstr "Email"
-
-#: ../user/create_account_form.php:83
-msgid "Must be a valid address of the form 'name at domain'."
-msgstr "Devi inserire un indirizzo email valido nella forma 'nome at dominio'."
-
-#: ../user/create_account_form.php:92 ../user/edit_email_form.php:47
-msgid "Password"
-msgstr "Password"
-
-#: ../user/create_account_form.php:93
-msgid "Must be at least %1 characters"
-msgstr "Deve essere di almeno %1 caratteri"
-
-#: ../user/create_account_form.php:96
-msgid "Confirm password"
-msgstr "Conferma la password"
-
-#: ../user/create_account_form.php:113
-msgid "Please enter the words shown in the image"
-msgstr "Per favore inserisci le parole visualizzate nell'immagine"
-
-#: ../user/create_account_form.php:119
-msgid "Create account"
-msgstr "Crea un account"
+msgstr "Questo account apparterrà al team %1 ed avrà le preferenze del progetto decise dal suo fondatore."
 
-#: ../user/create_profile.php:50
+#: ../user/create_profile.php:52
 msgid "Picture"
 msgstr "Immagine"
 
-#: ../user/create_profile.php:64
+#: ../user/create_profile.php:66
 msgid "%1 Your profile picture is shown to the left."
 msgstr "%1 La tua immagine del profilo è mostrata sulla sinistra."
 
-#: ../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 ""
-"Per cambiarla clicca sul pulsante \"Browse\" e seleziona una file JPEG o PNG "
-"(più piccolo di %1)."
+"To replace it, click the \"Browse\" button and select a JPEG or PNG file (%1"
+" or less)."
+msgstr "Per cambiarla clicca sul pulsante \"Browse\" e seleziona una file JPEG o PNG (più piccolo di %1)."
 
-#: ../user/create_profile.php:69
+#: ../user/create_profile.php:71
 msgid "To remove it from your profile, check this box:"
 msgstr "Per eliminarla dal tuo profilo, seleziona questa l'opzione:"
 
-#: ../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 vuoi aggiungere una immagine al tuo profilo, clicca sul pulsante \"Browse\" "
-"e seleziona una file JPEG o PNG. Sei pregato di scegliere un file più "
-"piccolo di %1."
+msgstr "Se vuoi aggiungere una immagine al tuo profilo, clicca sul pulsante \"Browse\" e seleziona una file JPEG o PNG. Sei pregato di scegliere un file più piccolo di %1."
 
-#: ../user/create_profile.php:89
+#: ../user/create_profile.php:91
 msgid "Language"
 msgstr "Lingua"
 
-#: ../user/create_profile.php:92
+#: ../user/create_profile.php:94
 msgid "Select the language in which your profile is written:"
 msgstr "Seleziona la lingua in cui è scritto il tuo profilo:"
 
-#: ../user/create_profile.php:104
+#: ../user/create_profile.php:106
 msgid "Submit profile"
 msgstr "Invia il profilo"
 
-#: ../user/create_profile.php:110
-msgid "Please enter the words shown in the image."
-msgstr "Per favore inserisci le parole visualizzate nell'immagine."
-
-#: ../user/create_profile.php:115
+#: ../user/create_profile.php:112
 msgid "Create/edit profile"
 msgstr "Crea/modifica il profilo"
 
-#: ../user/create_profile.php:137
+#: ../user/create_profile.php:134
 msgid "The format of your uploaded image is not supported."
 msgstr "Il formato dell'immagine che hai caricato non è supportato."
 
-#: ../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 ""
-"La pagina del tuo %1profilo%2 ti permettere di condividere le tue opinioni e "
-"il tuo background con la comunità di %3."
+msgstr "La pagina del tuo %1profilo%2 ti permettere di condividere le tue opinioni e il tuo background con la comunità di %3."
 
-#: ../user/create_profile.php:213
+#: ../user/create_profile.php:209
 msgid "Your ReCaptcha response was not correct.  Please try again."
 msgstr "La tua risposta al ReCaptcha non è corretta.  Prova di nuovo."
 
-#: ../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 ""
-"Le cose che hai scritto nel primo spazio sono state segnalate come spam dal "
-"sistema anti-spam Akismet.  Modifica il testo e riprova."
+msgstr "Le cose che hai scritto nel primo spazio sono state segnalate come spam dal sistema anti-spam Akismet.  Modifica il testo e riprova."
 
-#: ../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 ""
-"Le cose che hai scritto nel secondo spazio sono state segnalate come spam "
-"dal sistema anti-spam Akismet.  Modifica il testo e riprova."
+msgstr "Le cose che hai scritto nel secondo spazio sono state segnalate come spam dal sistema anti-spam Akismet.  Modifica il testo e riprova."
 
-#: ../user/create_profile.php:246
+#: ../user/create_profile.php:242
 msgid "Your profile submission was empty."
 msgstr "I campi del tuo profilo sono vuoti."
 
-#: ../user/create_profile.php:285
+#: ../user/create_profile.php:281
 msgid "Could not update the profile: database error"
 msgstr "Impossibile aggiornare il profilo: errore del database"
 
-#: ../user/create_profile.php:297
+#: ../user/create_profile.php:293
 msgid "Could not create the profile: database error"
 msgstr "Impossibile creare il profilo: errore del database"
 
-#: ../user/create_profile.php:302
+#: ../user/create_profile.php:298
 msgid "Profile saved"
 msgstr "Il profilo è stato salvato"
 
-#: ../user/create_profile.php:304
+#: ../user/create_profile.php:300
 msgid ""
 "Congratulations! Your profile was successfully entered into our database."
-msgstr ""
-"Congratulazioni! Il tuo profilo è stato inserito con successo nel nostro "
-"database."
+msgstr "Congratulazioni! Il tuo profilo è stato inserito con successo nel nostro database."
 
-#: ../user/create_profile.php:306
+#: ../user/create_profile.php:302
 msgid "%1View your profile%2"
 msgstr "%1Visualizza il tuo profilo%2"
 
-#: ../user/create_profile.php:315
+#: ../user/create_profile.php:311
 msgid "Create a profile"
 msgstr "Crea un profilo"
 
-#: ../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."
-msgstr ""
-"Per prevenire lo spam, è richiesta una media di crediti superiore a %1 per "
-"creare o modificare un profilo.  Ci scusiamo per l'inconveniente."
+"To prevent spam, an average credit of %1 or greater is required to create or"
+" edit a profile.  We apologize for this inconvenience."
+msgstr "Per prevenire lo spam, è richiesta una media di crediti superiore a %1 per creare o modificare un profilo.  Ci scusiamo per l'inconveniente."
 
 #: ../user/delete_account.php:57
 msgid "Couldn't delete account"
@@ -2863,28 +2774,21 @@ msgid ""
 "including your profile and message-board posts.\n"
 "No jobs will be issued to any computers attached\n"
 "to this account."
-msgstr ""
-"La cancellazione del tuo account rimuoverà tutte le tue\n"
-"informazioni personali dai nostri server,\n"
-"incluso il tuo profilo e i messaggi inviati al forum.\n"
-"Non sarà rilasciato nessun lavoro a nessun computer\n"
-"associato a questo account."
+msgstr "La cancellazione del tuo account rimuoverà tutte le tue\ninformazioni personali dai nostri server,\nincluso il tuo profilo e i messaggi inviati al forum.\nNon sarà rilasciato nessun lavoro a nessun computer\nassociato a questo account."
 
 #: ../user/delete_account.php:73
 msgid ""
 "This cannot be undone.\n"
 "Once your account has been deleted, you cannot get it back."
-msgstr ""
-"Impossibile annullare l'operazione.\n"
-"Una volta che il tuo account è stato cancellato, non potrai riabilitarlo."
+msgstr "Impossibile annullare l'operazione.\nUna volta che il tuo account è stato cancellato, non potrai riabilitarlo."
 
 #: ../user/delete_account.php:76
 msgid "Are you sure you want to delete your account?"
 msgstr "Sei sicuro di voler cancellare il tuo account?"
 
-#: ../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 "Si"
@@ -2893,8 +2797,8 @@ msgstr "Si"
 msgid "Delete this account"
 msgstr "Cancella questo account"
 
-#: ../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 "No"
@@ -2903,50 +2807,44 @@ msgstr "No"
 msgid "Do not delete this account"
 msgstr "Non cancellare questo account"
 
-#: ../user/delete_profile.php:30
+#: ../user/delete_profile.php:32
 msgid "couldn't delete profile - please try again later"
 msgstr "non è possibile eliminare il profilo - per favore riprova più tardi"
 
-#: ../user/delete_profile.php:33
+#: ../user/delete_profile.php:35
 msgid "Delete Confirmation"
 msgstr "Conferma eliminazione"
 
-#: ../user/delete_profile.php:35
+#: ../user/delete_profile.php:37
 msgid "Your profile has been deleted."
 msgstr "Il tuo profilo è stato cancellato."
 
-#: ../user/delete_profile.php:40
+#: ../user/delete_profile.php:42
 msgid "Profile delete confirmation"
 msgstr "Conferma eliminazione del profilo"
 
-#: ../user/delete_profile.php:43
+#: ../user/delete_profile.php:45
 msgid "Are you sure?"
 msgstr "Sei sicuro?"
 
-#: ../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 ""
-"I profili cancellati sono perduti per sempre e non possono essere "
-"ripristinati --\n"
-"dovrai ricominciare dall'inizio\n"
-"se vorrai un altro profilo in futuro."
+msgstr "I profili cancellati sono perduti per sempre e non possono essere ripristinati --\ndovrai ricominciare dall'inizio\nse vorrai un altro profilo in 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 sei sicuro, clicca 'Sì'\n"
-"per rimuovere il tuo profilo dal nostro database."
+msgstr "Se sei sicuro, clicca 'Sì'\nper rimuovere il tuo profilo dal nostro database."
 
-#: ../user/delete_profile.php:52
+#: ../user/delete_profile.php:54
 msgid "Delete my profile"
 msgstr "Cancella il mio profilo"
 
-#: ../user/delete_profile.php:53
+#: ../user/delete_profile.php:55
 msgid "Do not delete my profile"
 msgstr "Non cancellare il mio profilo"
 
@@ -2964,10 +2862,9 @@ msgstr "La tua donazione è stata completata."
 
 #: ../user/donated.php:30
 msgid ""
-"Your donation will be added to the progress bar after confirmation by PayPal."
-msgstr ""
-"La tua donazione sarà aggiunta alla barra di avanzamento dopo la conferma da "
-"parte di PayPal."
+"Your donation will be added to the progress bar after confirmation by "
+"PayPal."
+msgstr "La tua donazione sarà aggiunta alla barra di avanzamento dopo la conferma da parte di PayPal."
 
 #: ../user/donated.php:32
 msgid "You have canceled your donation."
@@ -2985,9 +2882,7 @@ msgstr "%1 donazioni"
 msgid ""
 "This project is accepting donations via\n"
 "%1."
-msgstr ""
-"Questo progetto accetta donazioni via\n"
-" %1."
+msgstr "Questo progetto accetta donazioni via\n %1."
 
 #: ../user/donations.php:42
 msgid ""
@@ -3002,20 +2897,7 @@ msgid ""
 "        to see the donation amount equivalent in different currencies\n"
 "        (please note that the rates are only estimates\n"
 "         and the actual amount may differ)."
-msgstr ""
-"Per fare una donazione, inserisci l'importo che vuoi donare usando i "
-"seguenti campi.\n"
-"PayPal accetta diverse valute\n"
-"(Dollari Canadesi, Euro, Sterline, Dollari U.S.A.,\n"
-"Yen, Dollari Australiani, Dollari Neozelandesi,\n"
-"Franchi Svizzeri, Dollari di Hong Kong, Dollari di Singapore, Corone "
-"Svedesi,\n"
-"Corone Danesi, Zloty Polacchi, Corone Norvegesi,\n"
-"Fiorini Ungheresi, Corone Ceche).\n"
-"Puoi usare il convertitore di valuta\n"
-"per vedere la somma donata equivalente nelle diverse valute\n"
-"(per favore nota che i tassi di conversione sono solo stimati\n"
-"e la somma reale potrebbe essere differente)."
+msgstr "Per fare una donazione, inserisci l'importo che vuoi donare usando i seguenti campi.\nPayPal accetta diverse valute\n(Dollari Canadesi, Euro, Sterline, Dollari U.S.A.,\nYen, Dollari Australiani, Dollari Neozelandesi,\nFranchi Svizzeri, Dollari di Hong Kong, Dollari di Singapore, Corone Svedesi,\nCorone Danesi, Zloty Polacchi, Corone Norvegesi,\nFiorini Ungheresi, Corone Ceche).\nPuoi usare il convertitore di valuta\nper vedere la somma donata equivalente nelle diverse valute\n(pe [...]
 
 #: ../user/donations.php:316
 msgid "Amount you would like to donate"
@@ -3033,17 +2915,11 @@ msgstr "Donazione anonima"
 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 ""
-"Seleziona questo se vuoi che il tuo nome e il tuo numero di account non "
-"vengano\n"
-"visualizzati nella lista donatori.<br>Se non selezioni, sarai memorizzato "
-"come un utente con ID %1"
+msgstr "Seleziona questo se vuoi che il tuo nome e il tuo numero di account non vengano\nvisualizzati nella lista donatori.<br>Se non selezioni, sarai memorizzato come un utente con ID %1"
 
 #: ../user/donations.php:324
 msgid "To assign the donation with your user ID, please log in."
-msgstr ""
-"Per associare la donazione al tuo ID utente devi accedere con il tuo "
-"account."
+msgstr "Per associare la donazione al tuo ID utente devi accedere con il tuo account."
 
 #: ../user/donations.php:328
 msgid "Proceed"
@@ -3064,27 +2940,18 @@ msgstr "Puoi scaricare applicazioni di vari tipi."
 #: ../user/download_network.php:31
 msgid ""
 "These applications are not endorsed by %1 and you use them at your own risk."
-msgstr ""
-"Queste applicazioni non sono supportate da %1 e il loro utilizzo è sotto la "
-"tua sola responsabilità."
+msgstr "Queste applicazioni non sono supportate da %1 e il loro utilizzo è sotto la tua sola responsabilità."
 
 #: ../user/download_network.php:33
 msgid ""
 "We do not provide instructions for installing these applications.\n"
-"However, the author may have provided some help on installing or "
-"uninstalling the application. \n"
+"However, the author may have provided some help on installing or uninstalling the application. \n"
 "If this is not enough you should contact the author."
-msgstr ""
-"Non forniamo istruzioni per l'installazione di queste applicazioni.\n"
-"In ogni caso l'autore potrebbe aver fornito qualche informazione "
-"sull'installazione o disinstallazione dell'applicazione. \n"
-"Se questo non è sufficiente dovrai contattare l'autore."
+msgstr "Non forniamo istruzioni per l'installazione di queste applicazioni.\nIn ogni caso l'autore potrebbe aver fornito qualche informazione sull'installazione o disinstallazione dell'applicazione. \nSe questo non è sufficiente dovrai contattare l'autore."
 
 #: ../user/download_network.php:36
 msgid "Instructions for installing and running BOINC are %1here%2."
-msgstr ""
-"Le istruzioni per l'installazione e il funzionamento di BOINC si trovano %"
-"1qui%2."
+msgstr "Le istruzioni per l'installazione e il funzionamento di BOINC si trovano %1qui%2."
 
 #: ../user/download_network.php:38
 msgid "This list is managed centrally at %1the BOINC website%2."
@@ -3100,9 +2967,7 @@ msgstr "Il nuovo indirizzo email '%1' non è valido."
 
 #: ../user/edit_email_action.php:38
 msgid "New email address is same as existing address. Nothing is changed."
-msgstr ""
-"Il nuovo indirizzo email è uguale a quello esistente. Nulla è stato "
-"cambiato."
+msgstr "Il nuovo indirizzo email è uguale a quello esistente. Nulla è stato cambiato."
 
 #: ../user/edit_email_action.php:42
 msgid "There's already an account with that email address"
@@ -3124,9 +2989,7 @@ msgstr "Sei pregato di %1validare questo indirizzo email%2."
 msgid ""
 "We can't update your email address due to a database problem.  Please try "
 "again later."
-msgstr ""
-"Non possiamo aggiornare il tuo indirizzo email a causa di un problema del "
-"database. Per favore riprova più tardi."
+msgstr "Non possiamo aggiornare il tuo indirizzo email a causa di un problema del database. Per favore riprova più tardi."
 
 #: ../user/edit_email_form.php:27 ../user/edit_email_form.php:51
 msgid "Change email address"
@@ -3156,261 +3019,207 @@ msgstr "Conferma il reset"
 msgid ""
 "This action will erase any changes you have made in your community "
 "preferences. To cancel, click your browser's Back button."
-msgstr ""
-"Questa azione eliminerà qualsiasi cambiamento apportato alle tue preferenze. "
-"Per annullare clicca sul pulsante Indietro del tuo browser."
+msgstr "Questa azione eliminerà qualsiasi cambiamento apportato alle tue preferenze. Per annullare clicca sul pulsante Indietro del tuo browser."
 
 #: ../user/edit_forum_preferences_action.php:38
 msgid "Reset preferences"
 msgstr "Reimposta le preferenze"
 
-#: ../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 ""
-"Errore. Questo non è il tipo di file corretto, soltanto immagini PNG e JPEG "
-"sono consentite."
+msgstr "Errore. Questo non è il tipo di file corretto, soltanto immagini PNG e JPEG sono consentite."
 
-#: ../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 "La tua firma era troppo lunga, sono consentiti al più 250 caratteri."
 
-#: ../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 "Nessun utente: %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 ""
-"In che modo possiamo notificarti nuovi messaggi privati, richieste da amici, "
-"avvisi sugli argomenti sottoscritti e altri eventi?"
+msgstr "In che modo possiamo notificarti nuovi messaggi privati, richieste da amici, avvisi sugli argomenti sottoscritti e altri eventi?"
 
-#: ../user/edit_forum_preferences_form.php:57
+#: ../user/edit_forum_preferences_form.php:46
 msgid "On my Account page (no email)"
 msgstr "Sulla mia pagina Account (no email)"
 
-#: ../user/edit_forum_preferences_form.php:58
+#: ../user/edit_forum_preferences_form.php:47
 msgid "Immediately, by email"
 msgstr "Immediatamente, per email"
 
-#: ../user/edit_forum_preferences_form.php:59
+#: ../user/edit_forum_preferences_form.php:48
 msgid "In a single daily email"
 msgstr "In una singola email giornaliera"
 
-#: ../user/edit_forum_preferences_form.php:75
+#: ../user/edit_forum_preferences_form.php:65
 msgid "Message-board identity"
 msgstr "Itentità messaggi"
 
-#: ../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 "Immagine che ti rappresenta sul 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 "Formato: JPG o PNG. Dimensione: al massimo 4KB, 100x100 pixel."
 
-#: ../user/edit_forum_preferences_form.php:80
+#: ../user/edit_forum_preferences_form.php:70
 msgid "Don't use an avatar"
 msgstr "Non usare un 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 "Usa un Globally Recognized Avatar fornito da %1"
 
-#: ../user/edit_forum_preferences_form.php:84
+#: ../user/edit_forum_preferences_form.php:74
 msgid "Use this uploaded avatar:"
 msgstr "Usa questa immagine caricata:"
 
-#: ../user/edit_forum_preferences_form.php:87
+#: ../user/edit_forum_preferences_form.php:77
 msgid "Avatar preview"
 msgstr "Anteprima dell'avatar"
 
-#: ../user/edit_forum_preferences_form.php:87
+#: ../user/edit_forum_preferences_form.php:77
 msgid "This is how your avatar will look"
 msgstr "Così apparirà il tuo avatar"
 
-#: ../user/edit_forum_preferences_form.php:96
+#: ../user/edit_forum_preferences_form.php:86
 msgid "Signature for message board posts"
 msgstr "Firma per i messaggi nel 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 ""
-"Controlla %1 servizi gratuiti%2\n"
-"<br> che forniscono 'immagini da firma' dinamiche\n"
-"<br> che mostrano informazioni sui tuoi crediti recenti, notizie del "
-"progetto, etc."
-
-#: ../user/edit_forum_preferences_form.php:104
-msgid "characters remaining"
-msgstr "caratteri rimanenti"
+msgstr "Controlla %1 servizi gratuiti%2\n<br> che forniscono 'immagini da firma' dinamiche\n<br> che mostrano informazioni sui tuoi crediti recenti, notizie del progetto, etc."
 
-#: ../user/edit_forum_preferences_form.php:105
+#: ../user/edit_forum_preferences_form.php:93
 msgid "Attach signature by default"
 msgstr "Allega di default la firma"
 
-#: ../user/edit_forum_preferences_form.php:108
+#: ../user/edit_forum_preferences_form.php:96
 msgid "Signature preview"
 msgstr "Anteprima della firma"
 
-#: ../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 "La tua firma nel forum apparirà così:"
 
-#: ../user/edit_forum_preferences_form.php:127
+#: ../user/edit_forum_preferences_form.php:115
 msgid "Message display"
 msgstr "Visualizza messaggi"
 
-#: ../user/edit_forum_preferences_form.php:129
+#: ../user/edit_forum_preferences_form.php:117
 msgid "What to display"
 msgstr "Cosa visualizzare"
 
-#: ../user/edit_forum_preferences_form.php:130
+#: ../user/edit_forum_preferences_form.php:118
 msgid "Hide avatar images"
 msgstr "Nascondi le immagini degli avatar"
 
-#: ../user/edit_forum_preferences_form.php:131
+#: ../user/edit_forum_preferences_form.php:119
 msgid "Hide signatures"
 msgstr "Nascondi le firme"
 
-#: ../user/edit_forum_preferences_form.php:132
+#: ../user/edit_forum_preferences_form.php:120
 msgid "Show images as links"
 msgstr "Visualizza le immagini come link"
 
-#: ../user/edit_forum_preferences_form.php:133
+#: ../user/edit_forum_preferences_form.php:121
 msgid "Open links in new window/tab"
 msgstr "Apri i collegamenti in una nuova finestra/scheda"
 
-#: ../user/edit_forum_preferences_form.php:134
+#: ../user/edit_forum_preferences_form.php:122
 msgid "Highlight special users"
 msgstr "Evidenzia utenti speciali"
 
-#: ../user/edit_forum_preferences_form.php:135
+#: ../user/edit_forum_preferences_form.php:123
 msgid "Display this many messages per page"
 msgstr "Virualizza questo numero di messaggi per pagina"
 
-#: ../user/edit_forum_preferences_form.php:139
+#: ../user/edit_forum_preferences_form.php:127
 msgid "How to sort"
 msgstr "Come ordinare"
 
-#: ../user/edit_forum_preferences_form.php:140
+#: ../user/edit_forum_preferences_form.php:128
 msgid "Threads:"
 msgstr "Discussioni:"
 
-# ########################################
-# Forum
-#: ../user/edit_forum_preferences_form.php:140
+#: ../user/edit_forum_preferences_form.php:128
 msgid "Posts:"
 msgstr "Messaggi:"
 
-#: ../user/edit_forum_preferences_form.php:141
+#: ../user/edit_forum_preferences_form.php:129
 msgid "Jump to first new post in thread automatically"
 msgstr "Vai automaticamente al primo nuovo messaggio della discussione"
 
-#: ../user/edit_forum_preferences_form.php:142
+#: ../user/edit_forum_preferences_form.php:130
 msgid "Don't move sticky posts to top"
 msgstr "Non muovere i post offensivi al top"
 
-#: ../user/edit_forum_preferences_form.php:148
+#: ../user/edit_forum_preferences_form.php:137
 msgid "Message filtering"
 msgstr "Filtro messaggi"
 
-#: ../user/edit_forum_preferences_form.php:164
+#: ../user/edit_forum_preferences_form.php:153
 msgid "Filtered users"
 msgstr "Utenti filtrati"
 
-#: ../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 "Ignora i post e i messaggi privati da questi utenti."
 
-#: ../user/edit_forum_preferences_form.php:167
+#: ../user/edit_forum_preferences_form.php:156
 msgid "User ID (For instance: 123456789)"
 msgstr "ID utente (per esempio: 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 "Aggiungi l'utente al filtro"
 
-#: ../user/edit_forum_preferences_form.php:173
+#: ../user/edit_forum_preferences_form.php:162
 msgid "Click here to update preferences"
 msgstr "Clicca qui per aggiornare le preferenze"
 
-#: ../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 "Oppure clicca qui per resettare le preferenze ai valorid di default"
 
 #: ../user/edit_passwd_action.php:50
-msgid "Invalid account key"
-msgstr "Chiave account non valida"
-
-#: ../user/edit_passwd_action.php:55
-msgid "No account with that email address was found"
-msgstr "Non è stato trovato un account con questo indirizzo e-mail"
-
-#: ../user/edit_passwd_action.php:59
-msgid "Invalid password"
-msgstr "Password non valida"
+msgid ""
+"We can't update your password due to a database problem. Please try again "
+"later."
+msgstr "Impossibile aggiornare la password a causa di un problema al database. Per favore riprova più tardi."
 
-#: ../user/edit_passwd_action.php:63 ../user/edit_passwd_form.php:25
-#: ../user/edit_passwd_form.php:55
+#: ../user/edit_passwd_action.php:53 ../user/edit_passwd_form.php:25
+#: ../user/edit_passwd_form.php:34
 msgid "Change password"
 msgstr "Cambia password"
 
-#: ../user/edit_passwd_action.php:67
+#: ../user/edit_passwd_action.php:54
 msgid "Your password has been changed."
 msgstr "La tua password è stata cambiata."
 
-#: ../user/edit_passwd_action.php:69
-msgid ""
-"We can't update your password due to a database problem. Please try again "
-"later."
-msgstr ""
-"Impossibile aggiornare la password a causa di un problema al database. Per "
-"favore riprova più tardi."
-
-#: ../user/edit_passwd_form.php:39
-msgid "You can identify yourself using either"
-msgstr "Puoi identificarti usando"
-
-#: ../user/edit_passwd_form.php:41
-msgid "your email address and old password"
-msgstr "il tuo indirizzo mail e la vecchia password"
-
-#: ../user/edit_passwd_form.php:42
-msgid "your account key"
-msgstr "la tua chiave di accesso"
-
-#: ../user/edit_passwd_form.php:46
-msgid "Current password"
-msgstr "Password corrente"
-
-#: ../user/edit_passwd_form.php:48
-msgid "<b>OR</b>: Account key"
-msgstr "<b>OPPURE</b>: Chiave account"
-
-#: ../user/edit_passwd_form.php:49
-msgid "Get account key by email"
-msgstr "Ottieni una chiave account via email"
-
-#: ../user/edit_passwd_form.php:53
+#: ../user/edit_passwd_form.php:32
 msgid "New password"
 msgstr "Nuova password"
 
-#: ../user/edit_passwd_form.php:54
+#: ../user/edit_passwd_form.php:33
 msgid "New password, again"
 msgstr "Ripeti nuova password"
 
@@ -3455,18 +3264,13 @@ msgid ""
 "A tasks's <b>server state</b> indicates whether the task has been sent to a "
 "computer, and if so whether the computer has finished it. Possible values "
 "are:"
-msgstr ""
-"Lo <b>stato del server</b> di un'attività indica se l'attività è stata "
-"inviata ad un computer e, nel caso, se il computer l'ha completata. I valori "
-"possibili sono:"
+msgstr "Lo <b>stato del server</b> di un'attività indica se l'attività è stata inviata ad un computer e, nel caso, se il computer l'ha completata. I valori possibili sono:"
 
 #: ../user/explain_state.php:35
 msgid ""
 "The task is not ready to send (for example, because its input files are "
 "unavailable)"
-msgstr ""
-"Il lavoro non è pronta per essere inviato (per esempio, perché i suoi file "
-"di input non sono disponibili)"
+msgstr "Il lavoro non è pronta per essere inviato (per esempio, perché i suoi file di input non sono disponibili)"
 
 #: ../user/explain_state.php:38
 msgid "The task is ready to send, but hasn't been sent yet."
@@ -3484,9 +3288,7 @@ msgstr "Il lavoro è stato inviato; in attesa del completamento."
 msgid ""
 "The task has been sent to a computer and either it has timed out or the "
 "computer has reported its completion."
-msgstr ""
-"Il lavoro è stato inviato ad un computer ed è scaduto oppure il computer ha "
-"segnalato il suo completamento."
+msgstr "Il lavoro è stato inviato ad un computer ed è scaduto oppure il computer ha segnalato il suo completamento."
 
 #: ../user/explain_state.php:49
 msgid "Outcomes"
@@ -3496,17 +3298,13 @@ msgstr "Risultati"
 msgid ""
 "A tasks's <b>outcome</b> is defined if its server state is <b>over</b>. "
 "Possible values are:"
-msgstr ""
-"Il <b>risultato</b> di un lavoro è definito se lo stato del suo server è "
-"<b>finito</b>. Valori possibili sono:"
+msgstr "Il <b>risultato</b> di un lavoro è definito se lo stato del suo server è <b>finito</b>. Valori possibili sono:"
 
 #: ../user/explain_state.php:57
 msgid ""
 "The task was sent to a computer, but the computer has not yet completed the "
 "work and reported the outcome."
-msgstr ""
-"Il lavoro è stato inviato ad un computer, ma il computer non ha ancora "
-"completato il lavoro e riportato il risultato."
+msgstr "Il lavoro è stato inviato ad un computer, ma il computer non ha ancora completato il lavoro e riportato il risultato."
 
 #: ../user/explain_state.php:60
 msgid "A computer completed and reported the task successfully."
@@ -3516,9 +3314,7 @@ msgstr "Il computer ha completato e riportato il lavoro con successo."
 msgid ""
 "The server wasn't able to send the task to a computer (perhaps because its "
 "resource requirements were too large)"
-msgstr ""
-"Il server non è stato in grado di inviare il lavoro ad un computer (forse "
-"perché i requisiti di risorse erano troppo elevati)"
+msgstr "Il server non è stato in grado di inviare il lavoro ad un computer (forse perché i requisiti di risorse erano troppo elevati)"
 
 #: ../user/explain_state.php:65
 msgid "Client error"
@@ -3532,26 +3328,19 @@ msgstr "Il lavoro è stato inviato ad un computer ma c'è stato un errore."
 msgid ""
 "The task was sent to a computer and no reply was received within the time "
 "limit."
-msgstr ""
-"Il lavoro è stato inviato ad un computer e nessuna risposta è stata ricevuta "
-"entro il tempo limite."
+msgstr "Il lavoro è stato inviato ad un computer e nessuna risposta è stata ricevuta entro il tempo limite."
 
 #: ../user/explain_state.php:72
 msgid ""
-"The task wasn't sent to a computer because enough other tasks were completed "
-"for this workunit."
-msgstr ""
-"Il lavoro non è stato inviato ad un computer perché sufficienti altri lavori "
-"sono stati completati per questà unità di lavoro."
+"The task wasn't sent to a computer because enough other tasks were completed"
+" for this workunit."
+msgstr "Il lavoro non è stato inviato ad un computer perché sufficienti altri lavori sono stati completati per questà unità di lavoro."
 
 #: ../user/explain_state.php:75
 msgid ""
 "The task was reported but could not be validated, typically because the "
 "output files were lost on the server."
-msgstr ""
-"Il lavoro è stato riportato ma non è stata possibile la validazione, "
-"tipicamente a causa del fatto che i file di output sono stati persi sul "
-"server."
+msgstr "Il lavoro è stato riportato ma non è stata possibile la validazione, tipicamente a causa del fatto che i file di output sono stati persi sul server."
 
 #: ../user/explain_state.php:80
 msgid "Client states"
@@ -3559,11 +3348,9 @@ msgstr "Stato client"
 
 #: ../user/explain_state.php:81
 msgid ""
-"A result's <b>client state</b> indicates the stage of processing at which an "
-"error occurred."
-msgstr ""
-"Il <b>client state</b> di un risultato indica lo stato di processamento nel "
-"quale l'errore è avvenuto."
+"A result's <b>client state</b> indicates the stage of processing at which an"
+" error occurred."
+msgstr "Il <b>client state</b> di un risultato indica lo stato di processamento nel quale l'errore è avvenuto."
 
 #: ../user/explain_state.php:86
 msgid "The computer has not yet completed the task."
@@ -3593,9 +3380,7 @@ msgstr "Tempo riportato e scadenza"
 msgid ""
 "A task's <b>Time reported or deadline</b> field depends on whether the task "
 "has been reported yet:"
-msgstr ""
-"La colonna <b>Tempo riportato o Scadenza</b> di un lavoro dipende dal fatto "
-"che il lavoro è già stato riportato o no:"
+msgstr "La colonna <b>Tempo riportato o Scadenza</b> di un lavoro dipende dal fatto che il lavoro è già stato riportato o no:"
 
 #: ../user/explain_state.php:110
 msgid "Already reported"
@@ -3639,41 +3424,35 @@ msgstr "Spedisci una email"
 
 #: ../user/ffmail_action.php:59
 msgid "Use your browser's back button to return to message form"
-msgstr ""
-"Usa il tasto indietro del browser per tornare alla compilazione del "
-"messaggio"
+msgstr "Usa il tasto indietro del browser per tornare alla compilazione del messaggio"
 
 #: ../user/ffmail_action.php:63
 msgid "Sending emails"
 msgstr "Invio email"
 
-#: ../user/ffmail_action.php:84
+#: ../user/ffmail_action.php:82
 msgid "email sent successfully to %1"
 msgstr "e-mail inviata correttamente a %1"
 
-#: ../user/ffmail_action.php:86
+#: ../user/ffmail_action.php:84
 msgid "failed to send email to %1: %2"
 msgstr "impossibile inviare l'e-mail a %1: %2"
 
-#: ../user/ffmail_action.php:92
+#: ../user/ffmail_action.php:90
 msgid "Thanks for telling your friends about %1"
 msgstr "Grazie per aver segnalato %1 ai tuoi amici"
 
-#: ../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."
-msgstr ""
-"Hai dimenticato di inserire nomi e/o indirizzi e-mail dei tuoi amici; per "
-"favore, %1torna al modulo%2 e inseriscili."
+"You forgot to enter your friends' names and/or email addresses; Please "
+"%1return to the form%2 and enter them."
+msgstr "Hai dimenticato di inserire nomi e/o indirizzi e-mail dei tuoi amici; per favore, %1torna al modulo%2 e inseriscili."
 
 #: ../user/ffmail_form.php:30
 msgid ""
 "This project hasn't created an email message - please notify its "
 "administrators"
-msgstr ""
-"Questo progetto non ha creato un messaggio email - per favore notificalo ai "
-"suoi amministratori"
+msgstr "Questo progetto non ha creato un messaggio email - per favore notificalo ai suoi amministratori"
 
 #: ../user/ffmail_form.php:33
 msgid "Tell your friends about %1"
@@ -3688,10 +3467,7 @@ msgid ""
 "Fill in this form with the names and email addresses of people you think "
 "might be interested in %1. We'll send them an email in your name, and you "
 "can add your own message if you like."
-msgstr ""
-"Compila questo modulo con i nomi e gli indirizzi e-mail delle persone che "
-"pensi possano essere interessate a %1. Invieremo una e-mail a tuo nome, e se "
-"ti va puoi aggiungere il tuo messaggio."
+msgstr "Compila questo modulo con i nomi e gli indirizzi e-mail delle persone che pensi possano essere interessate a %1. Invieremo una e-mail a tuo nome, e se ti va puoi aggiungere il tuo messaggio."
 
 #: ../user/ffmail_form.php:42
 msgid "Your name:"
@@ -3717,85 +3493,73 @@ msgstr "Aggiungi un messaggio (facoltativo):"
 msgid "Send"
 msgstr "Invia"
 
-# bandire o bannare? ...
-#: ../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 "Non sei autorizzato a bandire gli utenti."
 
-#: ../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 "Vota per Bannare"
 
-#: ../user/forum_banishment_vote.php:50
+#: ../user/forum_banishment_vote.php:52
 msgid "No user with this ID found."
 msgstr "Non è stato trovato nessun utente con questo 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 "L'utente è già bannato"
 
-#: ../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 ""
-"Sei sicuro di voler bandire %1?<br/>Questo impedirà a %1 di pubblicare per "
-"il periodo di tempo stabilito.<br/>Dovrebbe essere fatto solo se %1 si è "
-"comportato ripetutamente da troll."
+msgstr "Sei sicuro di voler bandire %1?<br/>Questo impedirà a %1 di pubblicare per il periodo di tempo stabilito.<br/>Dovrebbe essere fatto solo se %1 si è comportato ripetutamente da troll."
 
-#: ../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 ""
-"Seleziona la categoria del motivo e scrivi eventualmente una descrizione più "
-"lunga sul perché l'utente dovrebbe essere bandito."
+"Select the reason category, optionally write a longer description of why the"
+" user should be banished."
+msgstr "Seleziona la categoria del motivo e scrivi eventualmente una descrizione più lunga sul perché l'utente dovrebbe essere bandito."
 
-#: ../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 "Osceno"
 
-#: ../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 "Messaggi di provocazione/odio"
 
-#: ../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 "Richiesta Utente"
 
-#: ../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 "Altro"
-
-#: ../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 "Motivo"
 
-#: ../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 "Spedita se non vuota"
 
-#: ../user/forum_banishment_vote.php:74
+#: ../user/forum_banishment_vote.php:77
 msgid "Proceed with vote"
 msgstr "Procedi con la votazione"
 
-#: ../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 "Devi specificare un'azione..."
 
@@ -3803,15 +3567,13 @@ msgstr "Devi specificare un'azione..."
 msgid ""
 "You can no longer edit this post.<br/>Posts can only be edited at most %1 "
 "minutes after they have been created."
-msgstr ""
-"Non puoi più modificare questo messaggio.<br/>I messaggi possono essere "
-"modificati al massimo %1 minuti dopo che sono stati creati."
+msgstr "Non puoi più modificare questo messaggio.<br/>I messaggi possono essere modificati al massimo %1 minuti dopo che sono stati creati."
 
 #: ../user/forum_edit.php:47
 msgid "You are not authorized to edit this post."
 msgstr "Non sei autorizzato a modificare questo post."
 
-#: ../user/forum_edit.php:86 ../user/forum_search.php:72
+#: ../user/forum_edit.php:86 ../user/forum_search.php:74
 msgid "Forum"
 msgstr "Forum"
 
@@ -3820,940 +3582,863 @@ msgid "Edit your message"
 msgstr "Modifica il tuo messaggio"
 
 #: ../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 "Titolo"
 
-#: ../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 "Aggiungi la mia firma a questo messaggio"
 
-#: ../user/forum_forum.php:41
+#: ../user/forum_forum.php:46
 msgid "Not visible to you"
 msgstr "Non è visibile a te"
 
-#: ../user/forum_forum.php:80
+#: ../user/forum_forum.php:83
 msgid "Team message board for %1"
 msgstr "Forum dei messaggi del team per %1"
 
-#: ../user/forum_forum.php:96
+#: ../user/forum_forum.php:99
 msgid "New thread"
 msgstr "Nuovo thread"
 
-#: ../user/forum_forum.php:96
+#: ../user/forum_forum.php:99
 msgid "Add a new thread to this forum"
 msgstr "Aggiungi un nuovo thread a questo forum"
 
-#: ../user/forum_forum.php:116
+#: ../user/forum_forum.php:119
 msgid "This message board is available as an %1RSS feed%2"
 msgstr "Puoi ricevere le news con un %1RSS feed%2"
 
-# ########################################
-# Forum thread
-#: ../user/forum_forum.php:174
+#: ../user/forum_forum.php:178
 msgid "This thread is hidden"
 msgstr "Questo thread è stato nascosto dai moderatori"
 
-#: ../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 "Questo thread è evidenziato e bloccato, e non letto"
 
-#: ../user/forum_forum.php:178
+#: ../user/forum_forum.php:182
 msgid "sticky/locked/unread"
 msgstr "evidenziati/bloccati/non letti"
 
-#: ../user/forum_forum.php:180
+#: ../user/forum_forum.php:184
 msgid "This thread is sticky and you haven't read it yet"
 msgstr "Questo thread è evidenzato e non letto"
 
-#: ../user/forum_forum.php:180
+#: ../user/forum_forum.php:184
 msgid "sticky/unread"
 msgstr "offensivo/non letto"
 
-#: ../user/forum_forum.php:184
+#: ../user/forum_forum.php:188
 msgid "You haven't read this thread yet, and it's locked"
 msgstr "Nonhai ancora letto questo thread, ed è bloccato"
 
-#: ../user/forum_forum.php:184
+#: ../user/forum_forum.php:188
 msgid "unread/locked"
 msgstr "non letto/bloccato"
 
-# 81%
-#: ../user/forum_forum.php:186
+#: ../user/forum_forum.php:190
 msgid "You haven't read this thread yet"
 msgstr "Non hai ancora letto questo thread"
 
-#: ../user/forum_forum.php:192
+#: ../user/forum_forum.php:196
 msgid "This thread is sticky and locked"
 msgstr "Questo thread è offensivo e bloccato"
 
-#: ../user/forum_forum.php:192
+#: ../user/forum_forum.php:196
 msgid "sticky/locked"
 msgstr "evidenziato/bloccato"
 
-#: ../user/forum_forum.php:194
+#: ../user/forum_forum.php:198
 msgid "This thread is sticky"
 msgstr "Questo thread è offensivo"
 
-#: ../user/forum_forum.php:194
+#: ../user/forum_forum.php:198
 msgid "sticky"
 msgstr "offensivo"
 
-#: ../user/forum_forum.php:198
+#: ../user/forum_forum.php:202
 msgid "This thread is locked"
 msgstr "Questo thread è bloccato"
 
-#: ../user/forum_forum.php:198
+#: ../user/forum_forum.php:202
 msgid "locked"
 msgstr "bloccato"
 
-#: ../user/forum_forum.php:200
+#: ../user/forum_forum.php:204
 msgid "You read this thread"
 msgstr "Hai letto questo thread"
 
-#: ../user/forum_forum.php:200
+#: ../user/forum_forum.php:204
 msgid "read"
 msgstr "leggi"
 
-# ########################################
-# Links from the main page
-#: ../user/forum_help_desk.php:27
+#: ../user/forum_help_desk.php:29
 msgid "Questions and answers"
 msgstr "Domande e risposte"
 
-#: ../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 ""
-"Parla dal vivo via Skype con un volontario, in una tra le diverse lingue. "
-"Vai all'%1Aiuto Online di BOINC%2."
+"Talk live via Skype with a volunteer, in any of several languages. Go to "
+"%1BOINC Online Help%2."
+msgstr "Parla dal vivo via Skype con un volontario, in una tra le diverse lingue. Vai all'%1Aiuto Online di 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 "Tema"
 
-#: ../user/forum_help_desk.php:45
+#: ../user/forum_help_desk.php:47
 msgid "Questions"
 msgstr "Domande"
 
-#: ../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 "Discussione tra i membri di %1"
 
-# ########################################<br />
-# Forum sample index page
-#: ../user/forum_index.php:69
+#: ../user/forum_index.php:74
 msgid "%1 Message boards"
 msgstr "Forum di %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 ""
-"Se hai delle domande o problemi usa la sezione %1Domande & Risposte%2 del "
-"forum."
+msgstr "Se hai delle domande o problemi usa la sezione %1Domande & Risposte%2 del forum."
 
-#: ../user/forum_index.php:123
+#: ../user/forum_index.php:128
 msgid "Subscribed threads"
 msgstr "Thread seguiti"
 
-#: ../user/forum_moderate_post.php:43
+#: ../user/forum_moderate_post.php:45
 msgid "Moderate post"
 msgstr "Modera post"
 
-#: ../user/forum_moderate_post.php:52
+#: ../user/forum_moderate_post.php:55
 msgid "Hide post"
 msgstr "Nascondi 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 commerciale"
 
-#: ../user/forum_moderate_post.php:58
+#: ../user/forum_moderate_post.php:61
 msgid "Doublepost"
 msgstr "Post doppio"
 
-#: ../user/forum_moderate_post.php:63
+#: ../user/forum_moderate_post.php:66
 msgid "Move post"
 msgstr "Muovi post"
 
-#: ../user/forum_moderate_post.php:65
+#: ../user/forum_moderate_post.php:68
 msgid "Destination thread ID:"
 msgstr "ID thread di destinazione:"
 
-#: ../user/forum_moderate_post.php:78
+#: ../user/forum_moderate_post.php:81
 msgid "Banish user"
 msgstr "Banna utente"
 
-#: ../user/forum_moderate_post.php:80
+#: ../user/forum_moderate_post.php:83
 msgid "Ban duration"
 msgstr "Durata del ban"
 
-#: ../user/forum_moderate_post.php:81
+#: ../user/forum_moderate_post.php:84
 msgid "4 hours"
 msgstr "4 ore"
 
-#: ../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 giorno"
 
-#: ../user/forum_moderate_post.php:83
+#: ../user/forum_moderate_post.php:86
 msgid "1 week"
 msgstr "1 settimana"
 
-#: ../user/forum_moderate_post.php:84
+#: ../user/forum_moderate_post.php:87
 msgid "2 weeks"
 msgstr "2 settimane"
 
-#: ../user/forum_moderate_post.php:85
+#: ../user/forum_moderate_post.php:88
 msgid "1 month"
 msgstr "1 mese"
 
-#: ../user/forum_moderate_post.php:86
+#: ../user/forum_moderate_post.php:89
 msgid "Forever"
 msgstr "Per sempre"
 
-#: ../user/forum_moderate_post.php:96
-msgid "Optional explanation %1 This is included in email to user.%2"
-msgstr ""
-"Spiegazione facoltativa %1 Questa sarà inclusa nell'e-mail inviata "
-"all'utente.%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 "Spiegazione facoltativa %1 Questa sarà inclusa nell'e-mail inviata all'utente.%2"
+
+#: ../user/forum_moderate_post_action.php:60
 msgid "You are not authorized to moderate this post."
 msgstr "Non sei autorizzato a moderare questo post."
 
-#: ../user/forum_moderate_post_action.php:85
+#: ../user/forum_moderate_post_action.php:105
 msgid "Can't move to different category type"
 msgstr "Non posso muoverlo in una categoria differente"
 
-#: ../user/forum_moderate_post_action.php:89
+#: ../user/forum_moderate_post_action.php:109
 msgid "Can't move to different category"
 msgstr "Non posso muoverlo in una categoria differente"
 
-#: ../user/forum_moderate_post_action.php:110
+#: ../user/forum_moderate_post_action.php:130
 msgid "Not authorized to banish users"
 msgstr "Non autorizzato a bandire gli utenti"
 
-#: ../user/forum_moderate_post_action.php:126
+#: ../user/forum_moderate_post_action.php:146
 msgid "Banishment"
 msgstr "Banna"
 
-#: ../user/forum_moderate_post_action.php:128
+#: ../user/forum_moderate_post_action.php:148
 msgid "User %1 has been banished."
 msgstr "L'utente %1 è stato bannato."
 
-#: ../user/forum_moderate_post_action.php:131
+#: ../user/forum_moderate_post_action.php:151
 msgid "Action failed: possible database problem"
 msgstr "Azione fallita: possibile problema al database"
 
-#: ../user/forum_moderate_thread.php:33
+#: ../user/forum_moderate_thread.php:38
 msgid "not authorized"
 msgstr "non autorizzato"
 
-#: ../user/forum_moderate_thread.php:36
+#: ../user/forum_moderate_thread.php:41
 msgid "Moderate thread '%1'"
 msgstr "Modera la discussione '%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 ""
-"Seleziona la categoria del motivo, o scrivi una descrizione più lunga sul "
-"perché stai nascondendo o bloccando la discussione; quindi premi OK."
+msgstr "Seleziona la categoria del motivo, o scrivi una descrizione più lunga sul perché stai nascondendo o bloccando la discussione; quindi premi OK."
 
-#: ../user/forum_moderate_thread.php:72
+#: ../user/forum_moderate_thread.php:78
 msgid "Current forum"
 msgstr "Forum corrente"
 
-#: ../user/forum_moderate_thread.php:73
+#: ../user/forum_moderate_thread.php:79
 msgid "Destination forum"
 msgstr "Forum destinazione"
 
-#: ../user/forum_moderate_thread.php:77
+#: ../user/forum_moderate_thread.php:83
 msgid "New title:"
 msgstr "Nuovo titolo:"
 
-#: ../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 ""
-"Solo gli amministratori di progetto possono creare un thread qui. Tuttavia, "
-"puoi rispondere a thread esistenti."
+msgstr "Solo gli amministratori di progetto possono creare un thread qui. Tuttavia, puoi rispondere a thread esistenti."
 
-#: ../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 ""
-"Le cose che hai scritto nel primo spazio sono state segnalate come spam dal "
-"sistema anti-spam Akismet. Modifica il testo e riprova."
+msgstr "Le cose che hai scritto nel primo spazio sono state segnalate come spam dal sistema anti-spam Akismet. Modifica il testo e riprova."
 
-#: ../user/forum_post.php:70
+#: ../user/forum_post.php:74
 msgid "Create new thread"
 msgstr "Crea un nuovo thread"
 
-#: ../user/forum_post.php:100
+#: ../user/forum_post.php:104
 msgid "Create a new thread"
 msgstr "Crea un nuovo argomento"
 
-#: ../user/forum_post.php:105
+#: ../user/forum_post.php:109
 msgid "Remember to add a title"
 msgstr "Ricordati di aggiungere un titolo"
 
-#: ../user/forum_post.php:127
+#: ../user/forum_post.php:131
 msgid "Show this item as a Notice in the BOINC Manager"
 msgstr "Mostra questo elemento come Notifica nel 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 ""
-"Fallo solo per gli elementi che siano verosimilmente di interesse per tutti "
-"i volontari."
+msgstr "Fallo solo per gli elementi che siano verosimilmente di interesse per tutti i volontari."
 
-#: ../user/forum_rate.php:26
+#: ../user/forum_rate.php:28
 msgid "Rating offline"
 msgstr "Votazione offline"
 
-#: ../user/forum_rate.php:27
+#: ../user/forum_rate.php:29
 msgid "This function is turned off by the project"
 msgstr "Questa funziona è disabilitata dal progetto"
 
-#: ../user/forum_rate.php:58
+#: ../user/forum_rate.php:60
 msgid "You need more average or total credit to rate a post."
 msgstr "Ti serve un credito medio o totale maggiore per votare un post."
 
-#: ../user/forum_rate.php:62
+#: ../user/forum_rate.php:64
 msgid "You have already rated this post."
 msgstr "Hai già votato questo 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 "Ritorna al thread"
 
-#: ../user/forum_rate.php:72
+#: ../user/forum_rate.php:74
 msgid "Input Recorded"
 msgstr "Input Registrato"
 
-#: ../user/forum_rate.php:73
+#: ../user/forum_rate.php:75
 msgid "Your input has been recorded. Thanks for your help."
 msgstr "Il tuo input è stato registrato. Grazie per il tuo aiuto."
 
-#: ../user/forum_rate.php:75
+#: ../user/forum_rate.php:77
 msgid "Vote Registered"
 msgstr "Il voto è stato registrato"
 
-#: ../user/forum_rate.php:76
+#: ../user/forum_rate.php:78
 msgid "Your rating has been recorded. Thanks for your input."
 msgstr "Il tuo voto è stato registrato. Grazie per il tuo contributo."
 
-#: ../user/forum_rate.php:80
+#: ../user/forum_rate.php:82
 msgid "Vote Submission Problem"
 msgstr "Problema nell'invio del 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 ""
-"Il tuo post è stato contrassegnato come spam dal sistema anti-spam Akismet. "
-"Per favore modifica il testo e riprova."
+msgstr "Il tuo post è stato contrassegnato come spam dal sistema anti-spam Akismet. Per favore modifica il testo e riprova."
 
-#: ../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 "Rispondi a questo argomento"
 
-#: ../user/forum_reply.php:137
+#: ../user/forum_reply.php:143
 msgid "Message:"
 msgstr "Messaggio:"
 
-#: ../user/forum_reply.php:140
+#: ../user/forum_reply.php:146
 msgid "reply to %1Message ID%2:"
 msgstr "rispondi a %1Message ID%2:"
 
-#: ../user/forum_reply.php:166
+#: ../user/forum_reply.php:172
 msgid "Post reply"
 msgstr "Rispondi al post"
 
-#: ../user/forum_reply.php:169
+#: ../user/forum_reply.php:175
 msgid "Add my signature to this reply"
 msgstr "Aggiungi la mia firma a questa risposta"
 
-# 90%
-#: ../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 "Ti serve più credito medio o totale per segnalare un post."
 
-#: ../user/forum_report_post.php:65
+#: ../user/forum_report_post.php:68
 msgid "Report Registered"
 msgstr "Segnalazione Registrata"
 
-# 92%
-#: ../user/forum_report_post.php:66
+#: ../user/forum_report_post.php:69
 msgid "Your report has been recorded. Thanks for your input."
 msgstr "La tua segnalazione è stata registrata. Grazie per il tuo aiuto."
 
-#: ../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 moderatore darà ora un'occhiata alla tua segnalazione e deciderà il da "
-"farsi - potrebbe volerci un po' di tempo, quindi sii paziente"
+msgstr "Un moderatore darà ora un'occhiata alla tua segnalazione e deciderà il da farsi - potrebbe volerci un po' di tempo, quindi sii paziente"
 
-#: ../user/forum_report_post.php:71
+#: ../user/forum_report_post.php:74
 msgid "Report a forum post"
 msgstr "Segnala un post del 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 "
+"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 ""
-"Prima di segnalare questo messaggio, considera invece l'uso del sistema di "
-"voto +/-. Se abbastanza utenti giudicano un post negativamente, esso sarà "
-"alla fine nascosto.<br />Puoi trovare il sistema di voto in fondo al "
-"messaggio."
+msgstr "Prima di segnalare questo messaggio, considera invece l'uso del sistema di voto +/-. Se abbastanza utenti giudicano un post negativamente, esso sarà alla fine nascosto.<br />Puoi trovare il sistema di voto in fondo al messaggio."
 
-#: ../user/forum_report_post.php:80
+#: ../user/forum_report_post.php:83
 msgid "Report post"
 msgstr "Segnala 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"
+"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 ""
-"Perché trovi il post offensivo: %1Per favore includi sufficienti "
-"informazioni affinché una persona che\n"
-"non ha ancora letto la discussione possa essere in grado di individuare "
-"rapidamente il problema.%2"
+msgstr "Perché trovi il post offensivo: %1Per favore includi sufficienti informazioni affinché una persona che\nnon ha ancora letto la discussione possa essere in grado di individuare rapidamente il problema.%2"
 
-#: ../user/forum_report_post.php:90
+#: ../user/forum_report_post.php:93
 msgid "Report not registered"
 msgstr "Segnalazione non registrata"
 
-#: ../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 ""
-"Non è stato possibile registrare la tua segnalazione. Per favore aspetta un "
-"po' e riprova."
+msgstr "Non è stato possibile registrare la tua segnalazione. Per favore aspetta un po' e riprova."
 
-#: ../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 questo non è un errore temporaneo, per favore segnalalo agli sviluppatori "
-"del progetto."
+"If this is not a temporary error, please report it to the project "
+"developers."
+msgstr "Se questo non è un errore temporaneo, per favore segnalalo agli sviluppatori del progetto."
 
-#: ../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 "Puoi ricevere le news con un feed RSS."
 
-# ########################################<br />
-# General stuff (create_account_form.php and others)
-#: ../user/forum_rss.php:43
+#: ../user/forum_rss.php:41
 msgid "Options:"
 msgstr "Opzioni:"
 
-#: ../user/forum_rss.php:47
+#: ../user/forum_rss.php:45
 msgid "Include only posts by user ID %1 (default: all users)."
-msgstr ""
-"Includi solamente i messaggi dell'utente con ID %1 (predefinito: tutti gli "
-"utenti)."
+msgstr "Includi solamente i messaggi dell'utente con ID %1 (predefinito: tutti gli utenti)."
 
-#: ../user/forum_rss.php:49
+#: ../user/forum_rss.php:47
 msgid "Include only posts from the last %1 days (default: 30)."
 msgstr "Includi solamente i messaggi degli ultimi %1 giorni (predefinito: 30)."
 
-#: ../user/forum_rss.php:51
-msgid "Truncate posts: %1 (Include only first 265 characters of each post)"
-msgstr ""
-"Tronca i messaggi: %1 (include solamente i primi 265 caratteri di ciascun "
-"messaggio)"
-
-#: ../user/forum_rss.php:53
+#: ../user/forum_rss.php:49
 msgid "Threads only: %1 (Include only the first post of every thread)"
-msgstr ""
-"Solo threads: %1 (include solamente i primi messaggi di ogni discussione)"
+msgstr "Solo threads: %1 (include solamente i primi messaggi di ogni discussione)"
 
-#: ../user/forum_search.php:27
+#: ../user/forum_search.php:29
 msgid "Forum search"
 msgstr "Cerca nel forum"
 
-#: ../user/forum_search.php:31
+#: ../user/forum_search.php:33
 msgid "Search query"
 msgstr "Tipo ricerca"
 
-#: ../user/forum_search.php:32
+#: ../user/forum_search.php:34
 msgid "Search for keywords:"
 msgstr "Cerca per parole chiave:"
 
-#: ../user/forum_search.php:33
+#: ../user/forum_search.php:35
 msgid "Posts that contain all the specified words will be displayed"
 msgstr "Saranno mostrati i messaggi contenenti tutte le parole specificate"
 
-#: ../user/forum_search.php:35
+#: ../user/forum_search.php:37
 msgid "For example: \"screensaver freeze\""
 msgstr "Per esempio:\"screensaver bloccato\""
 
-#: ../user/forum_search.php:36
+#: ../user/forum_search.php:38
 msgid "Search for author ID:"
 msgstr "Cerca per ID autore:"
 
-#: ../user/forum_search.php:37
+#: ../user/forum_search.php:39
 msgid "Only posts by this author will be displayed"
 msgstr "Saranno mostrati solo i messaggi di questo autore"
 
-#: ../user/forum_search.php:39
+#: ../user/forum_search.php:41
 msgid "For example: \"43214\""
 msgstr "Per esempio:\"43214\""
 
-#: ../user/forum_search.php:41
+#: ../user/forum_search.php:43
 msgid "Search options"
 msgstr "Opzioni di ricerca"
 
-#: ../user/forum_search.php:42
+#: ../user/forum_search.php:44
 msgid "Search limits"
 msgstr "Limita ricerca"
 
-#: ../user/forum_search.php:43
+#: ../user/forum_search.php:45
 msgid "Search at most this many days back in time"
 msgstr "Ricerca al massimo questo numero di giorni precedenti"
 
-#: ../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 mesi"
 
-#: ../user/forum_search.php:52
+#: ../user/forum_search.php:54
 msgid "1 year"
 msgstr "1 anno"
 
-#: ../user/forum_search.php:73
+#: ../user/forum_search.php:55
+msgid "no limit"
+msgstr "nessun limite"
+
+#: ../user/forum_search.php:75
 msgid "Only display posts from this forum"
 msgstr "Mostra solamente messaggi da questo forum"
 
-#: ../user/forum_search.php:84
+#: ../user/forum_search.php:86
 msgid "Sort by"
 msgstr "Ordina per"
 
-#: ../user/forum_search.php:88
+#: ../user/forum_search.php:90
 msgid "Start the search"
 msgstr "Inizia la ricerca"
 
-#: ../user/forum_search_action.php:141
+#: ../user/forum_search_action.php:143
 msgid "Forum search results"
 msgstr "Risultato della ricerca nel forum"
 
-#: ../user/forum_search_action.php:174
+#: ../user/forum_search_action.php:176
 msgid "Thread titles matching your query:"
 msgstr "Nessun titolo corrisponde alla tua ricerca:"
 
-#: ../user/forum_search_action.php:194
+#: ../user/forum_search_action.php:196
 msgid "Messages matching your query:"
 msgstr "Messaggi corrispondenti alla tua ricerca:"
 
-#: ../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 ""
-"Spiacente, impossibile trovare qualcosa che corrispondesse alla tua "
-"richiesta. Puoi provare ad ampliare la tua ricerca usando meno parole (o "
-"parole meno specifiche)."
+msgstr "Spiacente, impossibile trovare qualcosa che corrispondesse alla tua richiesta. Puoi provare ad ampliare la tua ricerca usando meno parole (o parole meno specifiche)."
 
-#: ../user/forum_search_action.php:219
+#: ../user/forum_search_action.php:221
 msgid "You can also %1try the same search on Google.%2"
 msgstr "Puoi anche %1tentare la stessa ricerca su Google.%2"
 
-#: ../user/forum_search_action.php:224
+#: ../user/forum_search_action.php:226
 msgid "Perform another search"
 msgstr "Eseguire un'altra ricerca"
 
-#: ../user/forum_subscribe.php:46
+#: ../user/forum_subscribe.php:48
 msgid "Subscription successful"
 msgstr "Sottoscrizione eseguita con successo"
 
-#: ../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 ""
-"Sei ora iscritto a %1. Ti verrà notificato quando ci sarà un nuovo "
-"messaggio."
+msgstr "Sei ora iscritto a %1. Ti verrà notificato quando ci sarà un nuovo messaggio."
 
-#: ../user/forum_subscribe.php:51
+#: ../user/forum_subscribe.php:53
 msgid "Subscription failed"
 msgstr "Sottoscrizione fallita"
 
-#: ../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 ""
-"Non è stato momentaneamente possibile sottoscriverti a %1. Per favore "
-"riprova più tardi."
+msgstr "Non è stato momentaneamente possibile sottoscriverti a %1. Per favore riprova più tardi."
 
-#: ../user/forum_subscribe.php:61
+#: ../user/forum_subscribe.php:63
 msgid "Unsubscription successful"
 msgstr "Rimozione sottoscrizione eseguita con successo"
 
-#: ../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 ""
-"Non sei più iscritto a %1. Non riceverai più notifiche per questo thread."
+"You are no longer subscribed to %1. You will no longer receive notifications"
+" for this thread."
+msgstr "Non sei più iscritto a %1. Non riceverai più notifiche per questo thread."
 
-#: ../user/forum_subscribe.php:66
+#: ../user/forum_subscribe.php:68
 msgid "Unsubscription failed"
 msgstr "Rimozione sottoscrizione fallita"
 
-#: ../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 ""
-"Non è momentaneamente possibile rimuovere la sottoscrizione da %1. Per "
-"favore riprova più tardi."
+msgstr "Non è momentaneamente possibile rimuovere la sottoscrizione da %1. Per favore riprova più tardi."
 
-#: ../user/forum_subscribe.php:74
+#: ../user/forum_subscribe.php:76
 msgid "Unknown subscription action"
 msgstr "Azione di sottoscrizione sconosciuta"
 
-#: ../user/forum_thread.php:61
+#: ../user/forum_thread.php:66
 msgid "This forum is not visible to you."
 msgstr "Non ti è concesso vedere questo forum."
 
-# ########################################
-# Forum thread
-#: ../user/forum_thread.php:69
+#: ../user/forum_thread.php:74
 msgid "This thread has been hidden by moderators."
 msgstr "Questo thread è stato nascosto dai moderatori."
 
-#: ../user/forum_thread.php:128
+#: ../user/forum_thread.php:129
 msgid "My question was answered"
 msgstr "E' stata data risposta alla mia domanda"
 
-#: ../user/forum_thread.php:129
+#: ../user/forum_thread.php:130
 msgid "Click here if your question has been adequately answered"
-msgstr ""
-"Se è stata data una adeguata risposta alla tua domanda, sei pregato di "
-"premere qui."
+msgstr "Se è stata data una adeguata risposta alla tua domanda, sei pregato di premere qui."
 
-#: ../user/forum_thread.php:137
+#: ../user/forum_thread.php:138
 msgid "I've also got this question"
 msgstr "Ho anche questa domanda da porre"
 
-#: ../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 "Aggiungi un nuovo messaggio a questo argomento"
 
-#: ../user/forum_thread.php:171
+#: ../user/forum_thread.php:172
 msgid "Unsubscribe"
 msgstr "Cancella l'iscrizione"
 
-#: ../user/forum_thread.php:172
+#: ../user/forum_thread.php:173
 msgid "You are subscribed to this thread.  Click here to unsubscribe."
-msgstr ""
-"Sei iscritto a questo argomento.  Clicca qui per cancellare l'iscrizione."
+msgstr "Sei iscritto a questo argomento.  Clicca qui per cancellare l'iscrizione."
 
-#: ../user/forum_thread.php:178
+#: ../user/forum_thread.php:179
 msgid "Subscribe"
 msgstr "Iscriviti"
 
-#: ../user/forum_thread.php:179
+#: ../user/forum_thread.php:180
 msgid "Click to get email when there are new posts in this thread"
-msgstr ""
-"Clicca per ricevere una email quando ci sono nuovi messaggi su questo "
-"argomento"
+msgstr "Clicca per ricevere una email quando ci sono nuovi messaggi su questo argomento"
 
-#: ../user/forum_thread.php:190
+#: ../user/forum_thread.php:191
 msgid "Unhide this thread"
 msgstr "Rendi visibile questo argomento"
 
-#: ../user/forum_thread.php:196
+#: ../user/forum_thread.php:197
 msgid "Hide this thread"
 msgstr "Nascondi questo argomento"
 
-#: ../user/forum_thread.php:202
+#: ../user/forum_thread.php:203
 msgid "Make unsticky"
 msgstr "Non evidenziare"
 
-#: ../user/forum_thread.php:203
+#: ../user/forum_thread.php:204
 msgid "Make this thread not sticky"
 msgstr "Fai in modo che questo thread non sia in evidenza"
 
-#: ../user/forum_thread.php:208
+#: ../user/forum_thread.php:209
 msgid "Make sticky"
 msgstr "Evidenzia"
 
-#: ../user/forum_thread.php:209
-msgid "Make this thread sticky"
-msgstr "Fai in modo che questo thread sia in evidenza"
+#: ../user/forum_thread.php:210
+msgid "Make this thread always appear at top of forum"
+msgstr "Metti questo thread sempre al primo posto nel forum"
 
-#: ../user/forum_thread.php:215
+#: ../user/forum_thread.php:216
 msgid "Unlock"
 msgstr "Sblocca"
 
-#: ../user/forum_thread.php:216
-msgid "Unlock this thread"
-msgstr "Sblocca questo argomento"
+#: ../user/forum_thread.php:217
+msgid "Allow new posts in this thread"
+msgstr "Permetti nuovi post in questo thread"
 
-#: ../user/forum_thread.php:221
+#: ../user/forum_thread.php:222
 msgid "Lock"
 msgstr "Blocca"
 
-#: ../user/forum_thread.php:222
-msgid "Lock this thread"
-msgstr "Blocca questo argomento"
+#: ../user/forum_thread.php:223
+msgid "Don't allow new posts in this thread"
+msgstr "Non permettere nuovi post in questo thread"
 
-#: ../user/forum_thread.php:229
+#: ../user/forum_thread.php:230
 msgid "Move this thread to a different forum"
 msgstr "Sposta questo argomento in un altro forum"
 
-#: ../user/forum_thread.php:234
+#: ../user/forum_thread.php:235
 msgid "Edit title"
 msgstr "Modifica il titolo"
 
-#: ../user/forum_thread.php:235
+#: ../user/forum_thread.php:236
 msgid "Edit thread title"
 msgstr "Modifica il titolo dell'argomento"
 
-#: ../user/forum_thread.php:245
+#: ../user/forum_thread.php:244
+msgid "Delete thread permanently"
+msgstr "Cancella thread permanentemente"
+
+#: ../user/forum_thread.php:254
 msgid "Export as Notice"
 msgstr "Esporta come Notizia"
 
-#: ../user/forum_thread.php:251
+#: ../user/forum_thread.php:260
 msgid "Don't export"
 msgstr "Non esportare"
 
-#: ../user/forum_thread.php:252
+#: ../user/forum_thread.php:261
 msgid "Don't export this news item as a Notice"
 msgstr "Non esportare questa notizia come Notizia"
 
-#: ../user/forum_thread.php:260 ../user/forum_thread.php:262
+#: ../user/forum_thread.php:270 ../user/forum_thread.php:272
 msgid "Sort"
 msgstr "Ordina"
 
-#: ../user/forum_thread_status.php:49
+#: ../user/forum_thread_status.php:54
 msgid "Thread status updated"
 msgstr "Stato del thread aggiornato"
 
-#: ../user/forum_thread_status.php:50
+#: ../user/forum_thread_status.php:55
 msgid "The status has been updated."
 msgstr "Lo stato è stato aggiornato."
 
-# ########################################
-# Forum
-#: ../user/forum_user_posts.php:73
+#: ../user/forum_user_posts.php:75
 msgid "Posts by %1"
 msgstr "Messaggi di %1"
 
-#: ../user/friend.php:33
+#: ../user/friend.php:35
 msgid "Already friends"
 msgstr "Siete già amici"
 
-#: ../user/friend.php:39
+#: ../user/friend.php:41
 msgid "You requested friendship with %1 on %2."
 msgstr "Hai fatto richiesta di amicizia con %1 su %2."
 
-#: ../user/friend.php:41
+#: ../user/friend.php:43
 msgid "This request is still pending confirmation."
 msgstr "Questa richiesta è ancora in attesa di accettazione."
 
-#: ../user/friend.php:52
+#: ../user/friend.php:54
 msgid "%1 is not accepting friendship requests from you"
 msgstr "%1 non accetta la tua richiesta di amicizia"
 
-#: ../user/friend.php:61
+#: ../user/friend.php:63
 msgid "You can't be friends with yourself"
 msgstr "Non puoi essere amico di te stesso"
 
-#: ../user/friend.php:69
+#: ../user/friend.php:71
 msgid "Add friend"
 msgstr "Aggiungi agli amici"
 
-#: ../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 ""
-"Hai richiesto di aggiungere %1 agli amici. Notificheremo la cosa a %1 e "
-"gli/le chiederemo di confermare che siete amici."
+"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 "Hai richiesto di aggiungere %1 agli amici. Notificheremo la cosa a %1 e gli/le chiederemo di confermare che siete amici."
 
-#: ../user/friend.php:77
+#: ../user/friend.php:79
 msgid "Add an optional message here:"
 msgstr "Aggiungi un messaggio (facoltativo):"
 
-#: ../user/friend.php:115
+#: ../user/friend.php:117
 msgid "Friend request sent"
 msgstr "Richiesta di amicizia inviata"
 
-#: ../user/friend.php:116
+#: ../user/friend.php:118
 msgid "We have notified %1 of your request."
 msgstr "Abbiamo notificato a %1 la tua richiesta."
 
-#: ../user/friend.php:126
+#: ../user/friend.php:128
 msgid "Please log in as %1"
 msgstr "Per favore esegui il log in come %1"
 
-#: ../user/friend.php:127
+#: ../user/friend.php:129
 msgid "You must log in as %1 to view this friend request"
 msgstr "Devi fare il login come %1 per vedere questa richiesta di amicizia"
 
-#: ../user/friend.php:138
+#: ../user/friend.php:140
 msgid "Friend request"
 msgstr "Richiesta di amicizia"
 
-#: ../user/friend.php:141
+#: ../user/friend.php:143
 msgid "%1 has requested friendship with you."
 msgstr "Hai ricevuto una richiesta di amicizia da %1."
 
-#: ../user/friend.php:143
+#: ../user/friend.php:145
 msgid "%1 says: %2"
 msgstr "%1 dice: %2"
 
-#: ../user/friend.php:146
+#: ../user/friend.php:148
 msgid "Accept friendship"
 msgstr "Accetto la richiesta di amicizia"
 
-#: ../user/friend.php:146
+#: ../user/friend.php:148
 msgid "Click accept if %1 is in fact a friend"
 msgstr "Clicca su Accetto se %1 è un tuo amico"
 
-#: ../user/friend.php:147
+#: ../user/friend.php:149
 msgid "Decline"
 msgstr "Rifiuto"
 
-#: ../user/friend.php:147
+#: ../user/friend.php:149
 msgid "Click decline if %1 is not a friend"
 msgstr "Clicca su Rifiuto se %1 non è un tuo amico"
 
-#: ../user/friend.php:186
+#: ../user/friend.php:188
 msgid "Friendship confirmed"
 msgstr "L'amicizia è stata accettata"
 
-#: ../user/friend.php:187
+#: ../user/friend.php:189
 msgid "Your friendship with %1 has been confirmed."
 msgstr "La tua amicizia con %1 è stata accettata."
 
-#: ../user/friend.php:205
+#: ../user/friend.php:207
 msgid "Friendship declined"
 msgstr "L'amicizia è stata rifiutata"
 
-#: ../user/friend.php:206
+#: ../user/friend.php:208
 msgid "You have declined friendship with %1"
 msgstr "Hai rifiutato l'amicizia con %1"
 
-#: ../user/friend.php:221
+#: ../user/friend.php:223
 msgid "Notification not found"
 msgstr "Notifica non trovata"
 
-#: ../user/friend.php:223
+#: ../user/friend.php:225
 msgid "Friend confirmed"
 msgstr "Conferma dell'amicizia"
 
-#: ../user/friend.php:224
+#: ../user/friend.php:226
 msgid "You are now friends with %1."
 msgstr "Tu ora sei amico/a di %1."
 
-#: ../user/friend.php:232
+#: ../user/friend.php:234
 msgid "Cancel friendship?"
 msgstr "Cancella l'amicizia"
 
-#: ../user/friend.php:234
+#: ../user/friend.php:236
 msgid "Are you sure you want to cancel your friendship with %1?"
 msgstr "Sei certo di voler cancellare la tua amicizia con %1?"
 
-#: ../user/friend.php:239
+#: ../user/friend.php:241
 msgid "Stay friends"
 msgstr "Rimani amico"
 
-#: ../user/friend.php:249
+#: ../user/friend.php:251
 msgid "Friendship cancelled"
 msgstr "L'amicizia è stata cancellata"
 
-#: ../user/friend.php:250
+#: ../user/friend.php:252
 msgid "Your friendship with %1 has been cancelled."
 msgstr "La tua amicizia con %1 è stata cancellata."
 
-#: ../user/get_passwd.php:25
-msgid "Forgot your account info?"
-msgstr "Hai dimenticato le tue informazioni account?"
-
-#: ../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 conosci l'indirizzo e-mail dell'account, e puoi ricevere mail su di "
-"esso:"
+"1) If you know your account's email address, and you can receive email "
+"there:"
+msgstr "1) Se conosci l'indirizzo e-mail dell'account, e puoi ricevere mail su di esso:"
 
-#: ../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."
-msgstr ""
-"Inserisci l'indirizzo e-mail qui sotto, e premi OK. Ti saranno inviate le "
-"istruzioni via mail per resettare la tua password."
+msgstr "Inserisci l'indirizzo e-mail qui sotto, e premi OK. Ti saranno inviate le istruzioni via mail per resettare la tua password."
 
 #: ../user/get_passwd.php:46
 msgid ""
 "2) If you forgot your account's email address, or you can't receive email "
 "there:"
-msgstr ""
-"2) Se hai dimenticato l'indirizzo e-mail dell'account, oppure non puoi "
-"ricevere mail su di esso:"
+msgstr "2) Se hai dimenticato l'indirizzo e-mail dell'account, oppure non puoi ricevere mail su di esso:"
 
 #: ../user/get_passwd.php:47
 msgid ""
 "If you have run BOINC under this account, you can still access it. Here's "
 "how:"
-msgstr ""
-"Se hai già utilizzato BOINC con questo account, puoi ancora accedere a lui. "
-"Ecco come:"
+msgstr "Se hai già utilizzato BOINC con questo account, puoi ancora accedere a lui. Ecco come:"
 
 #: ../user/get_passwd.php:50
 msgid ""
 "Go to the BOINC data directory on your computer (its location is written to "
 "the Event Log at startup)."
-msgstr ""
-"Vai nella directory dati di BOINC sul tuo computer (la sua locazione è "
-"scritta nel Log Eventi all'avvio)."
+msgstr "Vai nella directory dati di BOINC sul tuo computer (la sua locazione è scritta nel Log Eventi all'avvio)."
 
 #: ../user/get_passwd.php:51
 msgid "Find your account file for this project; it will be named <b>%1</b>."
-msgstr ""
-"Trova il file del tuo account per questo progetto; sarà chiamato <b>%1</b>."
+msgstr "Trova il file del tuo account per questo progetto; sarà chiamato <b>%1</b>."
 
 #: ../user/get_passwd.php:52
 msgid "Open the file in a text editor like Notepad. You'll see something like"
 msgstr "Apri il file in un editor di testo come Notepad. Vedrai qualcosa come"
 
 #: ../user/get_passwd.php:62
-msgid "Select and Copy the string between %1 and %2 (%3 in the above example)."
-msgstr ""
-"Selezione e Copia la stringa compresa tra %1 e %2 (%3 nell'esempio sopra)."
+msgid ""
+"Select and Copy the string between %1 and %2 (%3 in the above example)."
+msgstr "Selezione e Copia la stringa compresa tra %1 e %2 (%3 nell'esempio sopra)."
 
 #: ../user/get_passwd.php:64
 msgid "Paste the string into the field below, and click OK."
@@ -4763,25 +4448,30 @@ msgstr "Incolla la stringa nel campo sotto, e premi OK."
 msgid ""
 "You will now be logged in to your account; update the email and password of "
 "your account."
-msgstr ""
-"Farai ora il login con il tuo account; aggiorna la e-mail e la password del "
-"tuo account."
+msgstr "Farai ora il login con il tuo account; aggiorna la e-mail e la password del tuo account."
 
 #: ../user/get_passwd.php:71
 msgid "Log in with authenticator"
 msgstr "Fai il login come autenticatore"
 
-#: ../user/gpu_list.php:126 ../user/gpu_list.php:152
+#: ../user/get_passwd.php:81
+msgid "Forgot your account info?"
+msgstr "Hai dimenticato le tue informazioni account?"
+
+#: ../user/gpu_list.php:150 ../user/gpu_list.php:176
 msgid "No GPU tasks reported"
 msgstr "Nessun task GPU riportato"
 
-#: ../user/gpu_list.php:183
+#: ../user/gpu_list.php:206
+msgid "Top GPU models"
+msgstr "Top modelli 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 ""
-"La lista seguente visualizza i modelli GPU più produttivi su piattaforme "
-"differenti. Le velocità relative sono visualizzate tra parentesi."
+"platforms.  Relative speeds, measured by average elapsed time of tasks, are "
+"shown in parentheses."
+msgstr "La lista seguente visualizza i modelli GPU più performanti sulle diverse piattaforme. Le velocità relative, misurate dal tempo medio di esecuzione delle elaborazioni, sono visualizzati tra parentesi."
 
 #: ../user/home.php:42
 msgid "Welcome to %1"
@@ -4789,14 +4479,16 @@ msgstr "Benvenuto in %1"
 
 #: ../user/home.php:43
 msgid "View and edit your account preferences using the links below."
-msgstr ""
-"Visualizza e modifica le tue preferenze dell'account usando i link "
-"sottostanti."
+msgstr "Visualizza e modifica le tue preferenze dell'account usando i link sottostanti."
 
 #: ../user/home.php:46
 msgid "If you have not already done so, %1download BOINC client software%2."
 msgstr "Se non lo hai ancora fatto, %1scarica il client di BOINC%2."
 
+#: ../user/home.php:49 ../project.sample/project.inc:70
+msgid "Your account"
+msgstr "Il tuo account"
+
 #: ../user/host_app_versions.php:37
 msgid "Anonymous platform, missing app"
 msgstr "Piattaforma anonima, applicazione mancante"
@@ -4837,8 +4529,6 @@ msgstr "Lavori validi consecutivi"
 msgid "Average processing rate"
 msgstr "Velocità di processamento media"
 
-# ########################################
-# Apps page (apps.php)
 #: ../user/host_app_versions.php:72
 msgid "Application details for host %1"
 msgstr "Dettagli applicazione per l'host %1"
@@ -4852,10 +4542,7 @@ msgid ""
 "You can not delete our record of this computer because our database still "
 "contains work for it. You must wait a few days until the work for this "
 "computer has been deleted from the project database."
-msgstr ""
-"Non puoi cancellare il record di questo computer perché il nostro database "
-"contiene ancora lavoro per lui. Devi attendere qualche giorno fino a quando "
-"il lavoro per questo computer è stato cancellato dal database del progetto"
+msgstr "Non puoi cancellare il record di questo computer perché il nostro database contiene ancora lavoro per lui. Devi attendere qualche giorno fino a quando il lavoro per questo computer è stato cancellato dal database del progetto"
 
 #: ../user/host_delete.php:40
 msgid "Delete record of computer"
@@ -4879,11 +4566,9 @@ msgstr "Unisci i computer"
 
 #: ../user/host_edit_form.php:38
 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 ""
-"A volte BOINC assegna identità separate allo stesso computer per errore. "
-"Puoi correggere questo unendo le vecchie identità con le nuove"
+"Sometimes BOINC assigns separate identities to the same computer by mistake."
+" You can correct this by merging old identities with the newest one."
+msgstr "A volte BOINC assegna identità separate allo stesso computer per errore. Puoi correggere questo unendo le vecchie identità con le nuove"
 
 #: ../user/host_edit_form.php:56
 msgid "No hosts are eligible for merging with this one."
@@ -4918,10 +4603,14 @@ msgstr "nessun hostname"
 msgid "Merge hosts"
 msgstr "Unisci hosts"
 
-#: ../user/host_update_credit.php:28
+#: ../user/host_update_credit.php:27
 msgid "Updating computer credit"
 msgstr "Aggiornamento crediti del computer"
 
+#: ../user/host_update_credit.php:37
+msgid "Host credit updated"
+msgstr "Crediti Host aggiornati"
+
 #: ../user/host_venue_action.php:41
 msgid "Host venue updated"
 msgstr "Luogo di accoglienza aggiornato"
@@ -4938,9 +4627,7 @@ msgstr "La sede di questo host è stata impostata a %1."
 msgid ""
 "This change will take effect the next time the host communicates with this "
 "project."
-msgstr ""
-"Questa modifica avrà effetto la prossima volta che l'host comunicherà con "
-"questo progetto."
+msgstr "Questa modifica avrà effetto la prossima volta che l'host comunicherà con questo progetto."
 
 #: ../user/host_venue_action.php:50
 msgid "Return to host page"
@@ -4957,8 +4644,7 @@ msgstr "Computer nascosto"
 #: ../user/hosts_user.php:56
 msgid ""
 "This user has chosen not to show information about his or her computers."
-msgstr ""
-"Questo utente ha scelto di non mostrare le informazioni sui suoi computer."
+msgstr "Questo utente ha scelto di non mostrare le informazioni sui suoi computer."
 
 #: ../user/hosts_user.php:64
 msgid "Your computers"
@@ -4998,17 +4684,17 @@ msgstr "preformattato"
 
 #: ../user/html.php:33
 msgid ""
-"image; height cannot exceed 450 pixels. Please do not link to images without "
-"permission of the web site where the image is hosted."
-msgstr ""
-"immagine; l'altezza non può superare i 450 pixel. Per favore non mettere "
-"link ad immagini senza il permesso del sito web che le ospita."
+"image; height cannot exceed 450 pixels. Please do not link to images without"
+" permission of the web site where the image is hosted."
+msgstr "immagine; l'altezza non può superare i 450 pixel. Per favore non mettere link ad immagini senza il permesso del sito web che le ospita."
 
 #: ../user/html.php:35
 msgid "You can also use ampersand notation for special characters."
-msgstr ""
-"È anche possibile utilizzare la notazione con la e commerciale per caratteri "
-"speciali."
+msgstr "È anche possibile utilizzare la notazione con la e commerciale per caratteri speciali."
+
+#: ../user/info.php:24 ../user/sample_index.php:78
+msgid "Read our rules and policies"
+msgstr "Leggi le nostre regole e linee di condotta"
 
 #: ../user/info.php:35
 msgid "Run %1 only on authorized computers"
@@ -5019,10 +4705,7 @@ msgid ""
 "Run %1 only on computers that you own, or for which you have obtained the "
 "owner's permission. Some companies and schools have policies that prohibit "
 "using their computers for projects such as %1."
-msgstr ""
-"Avvia %1 solo sui tuoi computer o su quelli per cui hai ottenuto il permesso "
-"dal proprietario. Alcune aziende e scuole proibiscono l'uso di progetti "
-"come %1 sui propri computer."
+msgstr "Avvia %1 solo sui tuoi computer o su quelli per cui hai ottenuto il permesso dal proprietario. Alcune aziende e scuole proibiscono l'uso di progetti come %1 sui propri computer."
 
 #: ../user/info.php:38
 msgid "How %1 will use your computer"
@@ -5033,19 +4716,13 @@ msgid ""
 "When you run %1 on your computer, it will use part of the computer's CPU "
 "power, disk space, and network bandwidth. You can control how much of your "
 "resources are used by %1, and when it uses them."
-msgstr ""
-"Quando lo farai girare sul tuo computer, %1 utilizzerà una parte della CPU, "
-"del disco fisso e della connessione ad internet. Puoi sempre tenere sotto "
-"controllo l'entità delle risorse utilizzate da %1 e quando le usa."
+msgstr "Quando lo farai girare sul tuo computer, %1 utilizzerà una parte della CPU, del disco fisso e della connessione ad internet. Puoi sempre tenere sotto controllo l'entità delle risorse utilizzate da %1 e quando le usa."
 
 #: ../user/info.php:40
 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 ""
-"Il lavoro svolto dal tuo computer sarà un prezioso contributo per "
-"raggiungere gli obbiettivi di %1, come descritto sul sito web del progetto. "
-"Le applicazioni del programma possono variare di volta in volta."
+msgstr "Il lavoro svolto dal tuo computer sarà un prezioso contributo per raggiungere gli obbiettivi di %1, come descritto sul sito web del progetto. Le applicazioni del programma possono variare di volta in volta."
 
 #: ../user/info.php:42
 msgid "Privacy policy"
@@ -5053,15 +4730,11 @@ msgstr "Politiche sulla privacy"
 
 #: ../user/info.php:43
 msgid ""
-"Your account on %1 is identified by a name that you choose. This name may be "
-"shown on the %1 web site, along with a summary of the work your computer has "
-"done for %1. If you want to be anonymous, choose a name that doesn't reveal "
-"your identity."
-msgstr ""
-"Il tuo account su %1 è identificato con il nome che hai scelto. Questo nome "
-"sarà mostrato sul sito web di %1 assieme ad un sommario del lavoro svolto "
-"dal tuo computer per %1. Se vuoi rimanere anonimo, puoi sempre scegliere un "
-"nome che nasconda la tua vera identità."
+"Your account on %1 is identified by a name that you choose. This name may be"
+" shown on the %1 web site, along with a summary of the work your computer "
+"has done for %1. If you want to be anonymous, choose a name that doesn't "
+"reveal your identity."
+msgstr "Il tuo account su %1 è identificato con il nome che hai scelto. Questo nome sarà mostrato sul sito web di %1 assieme ad un sommario del lavoro svolto dal tuo computer per %1. Se vuoi rimanere anonimo, puoi sempre scegliere un nome che nasconda la tua vera identità."
 
 #: ../user/info.php:44
 msgid ""
@@ -5070,25 +4743,14 @@ 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 ""
-"Se partecipi a %1, le informazioni relative al tuo computer (tipo del "
-"processore, quantità di memoria, ecc...) saranno registrate da %1 e usate "
-"per decidere il tipo di lavoro da assegnare al tuo computer. Queste "
-"informazioni saranno inoltre mostrati sul sito web di %1. Non verrà mostrato "
-"niente che possa rivelare l'ubicazione del tuo computer (per esempio il "
-"nome del suo dominio o gli indirizzi di rete)."
+msgstr "Se partecipi a %1, le informazioni relative al tuo computer (tipo del processore, quantità di memoria, ecc...) saranno registrate da %1 e usate per decidere il tipo di lavoro da assegnare al tuo computer. Queste informazioni saranno inoltre mostrati sul sito web di %1. Non verrà mostrato niente che possa rivelare l'ubicazione del tuo computer (per esempio il nome del suo dominio o gli indirizzi di rete)."
 
 #: ../user/info.php:45
 msgid ""
-"To participate in %1, you must give an address where you receive email. This "
-"address will not be shown on the %1 web site or shared with organizations. %"
-"1 may send you periodic newsletters; however, you can opt out at any time."
-msgstr ""
-"Per partecipare a %1, devi fornire un indirizzo di posta elettronica per "
-"ricevere le email. Questo indirizzo non sarà mostrata sul sito web di %1 o "
-"condiviso con altre organizzazioni. %1 potrà inviarti periodicamente una "
-"email informativa; in ogni caso puoi sempre decidere di non partecipare più "
-"al progetto in qualsiasi momento."
+"To participate in %1, you must give an address where you receive email. This"
+" address will not be shown on the %1 web site or shared with organizations. "
+"%1 may send you periodic newsletters; however, you can opt out at any time."
+msgstr "Per partecipare a %1, devi fornire un indirizzo di posta elettronica per ricevere le email. Questo indirizzo non sarà mostrata sul sito web di %1 o condiviso con altre organizzazioni. %1 potrà inviarti periodicamente una email informativa; in ogni caso puoi sempre decidere di non partecipare più al progetto in qualsiasi momento."
 
 #: ../user/info.php:46
 msgid ""
@@ -5097,24 +4759,15 @@ 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 ""
-"I messaggi privati inviati sul sito web di %1 sono visibili solo al mittente "
-"e al ricevente.  %1 non controlla o censura il contenuto dei messaggi "
-"privati.  Se ricevi un messaggio privato non gradito da un altro utente di %"
-"1, puoi aggiungerlo al tuo %2filtro dei messaggi%3.  Questo ti evita di "
-"dover vedere altri messaggi publici o privati di quell'utente."
+msgstr "I messaggi privati inviati sul sito web di %1 sono visibili solo al mittente e al ricevente.  %1 non controlla o censura il contenuto dei messaggi privati.  Se ricevi un messaggio privato non gradito da un altro utente di %1, puoi aggiungerlo al tuo %2filtro dei messaggi%3.  Questo ti evita di dover vedere altri messaggi publici o privati di quell'utente."
 
 #: ../user/info.php:47
 msgid ""
 "If you use our web site forums you must follow the %2posting guidelines%3.  "
 "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 ""
-"Se usi i forum del nostro sito devi seguire le %2linee guida del forum%3.  I "
-"messaggi inseriti nei forum di %1 sono visibili a tutti, inclusi gli ospiti "
-"non registrati.  Scrivendo sul forum tu fornisci una licenza irrevocabile a "
-"chiunque di guardare e copiare i tuoi messaggi."
+"members.  By posting to the forums, you are granting irrevocable license for"
+" anyone to view and copy your posts."
+msgstr "Se usi i forum del nostro sito devi seguire le %2linee guida del forum%3.  I messaggi inseriti nei forum di %1 sono visibili a tutti, inclusi gli ospiti non registrati.  Scrivendo sul forum tu fornisci una licenza irrevocabile a chiunque di guardare e copiare i tuoi messaggi."
 
 #: ../user/info.php:48
 msgid "Is it safe to run %1?"
@@ -5124,35 +4777,23 @@ msgstr "E' sicuro elaborare su %1?"
 msgid ""
 "Any time you download a program through the Internet you are taking a "
 "chance: the program might have dangerous errors, or the download server "
-"might have been hacked. %1 has made efforts to minimize these risks. We have "
-"tested our applications carefully. Our servers are behind a firewall and 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 ""
-"Ogni volta che scarichi un programma attraverso Internet, puoi incontrare "
-"dei rischi: il programma potrebbe provocare degli errori pericolosi, o il "
-"server da cui stai scaricando potrebbe essere non sicuro. %1 si sforza "
-"continuamente per diminuire questi rischi. Testiamo molto accuratamente "
-"tutte le nostre applicazioni. I nostri server sono tutti coperti da un "
-"firewall configurato per una massima sicurezza. Per accertarci "
-"dell'integrità dei download, tutti i file eseguibili vengono contrassegnati "
-"digitalmente da un computer non connesso ad internet."
+"might have been hacked. %1 has made efforts to minimize these risks. We have"
+" tested our applications carefully. Our servers are behind a firewall and "
+"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 "Ogni volta che scarichi un programma attraverso Internet, puoi incontrare dei rischi: il programma potrebbe provocare degli errori pericolosi, o il server da cui stai scaricando potrebbe essere non sicuro. %1 si sforza continuamente per diminuire questi rischi. Testiamo molto accuratamente tutte le nostre applicazioni. I nostri server sono tutti coperti da un firewall configurato per una massima sicurezza. Per accertarci dell'integrità dei download, tutti i file eseguibili vengon [...]
 
 #: ../user/info.php:50
 msgid ""
 "The applications run by %1 may cause some computers to overheat. If this "
 "happens, stop running %1 or use a %2utility program%3 that limits CPU usage."
-msgstr ""
-"Le applicazioni avviate da %1 possono provocare surriscaldamento. Se ciò "
-"dovesse accadere, basta solo fermare %1 o usare un %2programma di utilità%3 "
-"che limiti l'uso della CPU."
+msgstr "Le applicazioni avviate da %1 possono provocare surriscaldamento. Se ciò dovesse accadere, basta solo fermare %1 o usare un %2programma di utilità%3 che limiti l'uso della CPU."
 
 #: ../user/info.php:51
 msgid ""
 "%1 was developed by %2. BOINC was developed at the University of California."
-msgstr ""
-"%1 è sviluppato da %2. BOINC è sviluppato dalla Università della California."
+msgstr "%1 è sviluppato da %2. BOINC è sviluppato dalla Università della California."
 
 #: ../user/info.php:53
 msgid "Liability"
@@ -5161,12 +4802,9 @@ msgstr "Responsabilità"
 #: ../user/info.php:54
 msgid ""
 "%1 and %2 assume no liability for damage to your computer, loss of data, or "
-"any other event or condition that may occur as a result of participating in %"
-"1."
-msgstr ""
-"%1 e %2 non si assumono alcuna responsabilità per eventuali danni causati al "
-"tuo computer, perdita di dati o altri eventi o circostanze che possono "
-"accadere come conseguenza della partecipazione a %1."
+"any other event or condition that may occur as a result of participating in "
+"%1."
+msgstr "%1 e %2 non si assumono alcuna responsabilità per eventuali danni causati al tuo computer, perdita di dati o altri eventi o circostanze che possono accadere come conseguenza della partecipazione a %1."
 
 #: ../user/info.php:56
 msgid "Other BOINC projects"
@@ -5174,24 +4812,17 @@ msgstr "Altri progetti BOINC"
 
 #: ../user/info.php:57
 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 "
+"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 ""
-"Altri progetti che usano la stessa piattaforma, BOINC, come %1. Prendi in "
-"considerazione la tua partecipazione a uno, o più, di questi progetti; così "
-"facendo, il tuo computer svolgerà un utilissimo lavoro anche quando %1 non "
-"ha lavoro disponibile."
+msgstr "Altri progetti che usano la stessa piattaforma, BOINC, come %1. Prendi in considerazione la tua partecipazione a uno, o più, di questi progetti; così facendo, il tuo computer svolgerà un utilissimo lavoro anche quando %1 non ha lavoro disponibile."
 
 #: ../user/info.php:58
 msgid ""
 "These other projects are not associated with %1, and we cannot vouch for "
 "their security practices or the nature of their research. Join them at your "
 "own risk."
-msgstr ""
-"Questi altri progetti non sono associati con %1, quindi non possiamo "
-"garantirne la sicurezza o la natura delle loro ricerche. L'adesione a tali "
-"progetti è sotto la vostra sola responsabilità."
+msgstr "Questi altri progetti non sono associati con %1, quindi non possiamo garantirne la sicurezza o la natura delle loro ricerche. L'adesione a tali progetti è sotto la vostra sola responsabilità."
 
 #: ../user/language_select.php:47
 msgid "Language selection"
@@ -5201,17 +4832,13 @@ msgstr "Selezione lingua"
 msgid ""
 "This web site is available in several languages. The currently selected "
 "language is %1."
-msgstr ""
-"Questo sito web è disponibile in molte lingue. La lingua correntemente "
-"selezionata è %1."
+msgstr "Questo sito web è disponibile in molte lingue. La lingua correntemente selezionata è %1."
 
 #: ../user/language_select.php:78
 msgid ""
 "Normally the choice of language is determined by your browser's language "
 "setting, which is: %1.  You can change this setting using:"
-msgstr ""
-"Normalmente la scelta della lingua è determinata dalle impostazioni di "
-"lingua del tuo browser, che è: %1. Puoi cambiare questa impostazione usando:"
+msgstr "Normalmente la scelta della lingua è determinata dalle impostazioni di lingua del tuo browser, che è: %1. Puoi cambiare questa impostazione usando:"
 
 #: ../user/language_select.php:83
 msgid "Firefox: Tools/Options/General"
@@ -5226,48 +4853,23 @@ 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 ""
-"Oppure puoi selezionare una lingua cliccando su uno dei link.  Questo "
-"manderà al tuo browser un cookie; assicurati che il tuo browser accetti i "
-"cookies dal nostro dominio."
+msgstr "Oppure puoi selezionare una lingua cliccando su uno dei link.  Questo manderà al tuo browser un cookie; assicurati che il tuo browser accetti i cookies dal nostro dominio."
 
 #: ../user/language_select.php:95
 msgid "Language name (click to select)"
 msgstr "Nome lingua (clicca per selezionare)"
 
-#: ../user/language_select.php:97
-msgid "Use browser language setting"
-msgstr "Usa impostazioni lingua del browser"
-
-#: ../user/language_select.php:113
-msgid ""
-"Translations are done by volunteers.  If your native language is not here, %"
-"1you can provide a translation%2."
-msgstr ""
-"Le traduzioni sono fatte da volontari.  Se la tua lingua madre non è qui, %"
-"1puoi tradurla tu%2."
-
-#: ../user/login_form.php:45
-msgid "Email address:"
-msgstr "Indirizzo E-mail:"
-
-#: ../user/login_form.php:45
-msgid "forgot email address?"
-msgstr "hai dimenticato l'indirizzo mail?"
-
-#: ../user/login_form.php:48
-msgid "Password:"
-msgstr "Chiave d'accesso"
-
-#: ../user/login_form.php:48
-msgid "forgot password?"
-msgstr "hai dimenticato la password?"
+#: ../user/language_select.php:97
+msgid "Use browser language setting"
+msgstr "Usa impostazioni lingua del browser"
 
-#: ../user/login_form.php:51
-msgid "Stay logged in"
-msgstr "Rimani autenticato"
+#: ../user/language_select.php:113
+msgid ""
+"Translations are done by volunteers.  If your native language is not here, "
+"%1you can provide a translation%2."
+msgstr "Le traduzioni sono fatte da volontari.  Se la tua lingua madre non è qui, %1puoi tradurla tu%2."
 
-#: ../user/login_form.php:62
+#: ../user/login_form.php:57
 msgid "or %1create an account%2."
 msgstr "oppure %1crea un account%2."
 
@@ -5291,13 +4893,7 @@ msgid ""
 "        having that name with the newest computer having that name.\n"
 "        Incompatible computers will not be merged.\n"
 "        <p>"
-msgstr ""
-"Questa operazione unisce i computer in base al loro nome di dominio.\n"
-"        <p>\n"
-"        Per ogni nome di dominio, unirà tutti i vecchi computer\n"
-"        con quel nome con quelli nuovi aventi lo stesso nome.\n"
-"        Computer non compatibili non saranno uniti.\n"
-"        <p>"
+msgstr "Questa operazione unisce i computer in base al loro nome di dominio.\n        <p>\n        Per ogni nome di dominio, unirà tutti i vecchi computer\n        con quel nome con quelli nuovi aventi lo stesso nome.\n        Computer non compatibili non saranno uniti.\n        <p>"
 
 #: ../user/merge_by_name.php:82
 msgid "Go ahead and do this"
@@ -5313,11 +4909,7 @@ msgid ""
 "To maximize discussion and flow of information,\n"
 "our message boards are moderated.\n"
 "Message board postings are subject to the following posting rules:\n"
-msgstr ""
-"\n"
-"Per massimizzare le discussioni e il flusso di informazioni,\n"
-"i nostri forum di messaggi sono moderati.\n"
-"I post nei forum sono soggetti alle seguenti regole:\n"
+msgstr "\nPer massimizzare le discussioni e il flusso di informazioni,\ni nostri forum di messaggi sono moderati.\nI post nei forum sono soggetti alle seguenti regole:\n"
 
 #: ../user/moderation.php:30
 msgid ""
@@ -5326,8 +4918,7 @@ msgid ""
 "Moderators may delete posts that violate any of these rules.\n"
 "The authors of deleted posts will be notified via email.\n"
 "Gross offenders may have their ability to post messages temporarily revoked\n"
-"(though to prevent abuse only project administrators have the ability to do "
-"so).\n"
+"(though to prevent abuse only project administrators have the ability to do so).\n"
 "Additional kinds of bad behavior (\"bugging\" posts to trap the\n"
 "IP addresses of other participants, excessive thread creation to spam\n"
 "the forums, etc.), while not listed in the formal rules, may still\n"
@@ -5356,47 +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>\n"
-"I moderatori possono cancellare post che violano una delle regole seguenti.\n"
-"Gli autori dei post cancellati riceveranno una notifica via e-mail.\n"
-"Chi offende potrebbe avere la sua capacità di scrivere revocata "
-"temporaneamente\n"
-"(per prevenire abusi solo gli amministratori dei progetti possono farlo).\n"
-"Tutti gli altri tipi di  comportamenti negativi (\"bugging\" post per scoprire\n"
-"l'indirizzo IP degli altri partecipanti, creazione di thread eccessiva per "
-"spammare\n"
-"i forum, etc.), anche se non scritti nelle regole formali, potrebbero "
-"incorrere\n"
-"in penalità simili.\n"
-"<p>\n"
-"Se pensi che un post violi una delle regole,\n"
-"clicca il bottone rosso X sul post e riempi il form;\n"
-"ai moderatori sarà notificata la tua richiesta.\n"
-"Per favore usa questo bottone solo per chiare violazioni - non\n"
-"per dispute personali.\n"
-"<p>\n"
-"Cerchiamo di essere equi quanto possiamo quando moderiamo,\n"
-"ma in una grande comunità di utenti, con molti punti di vista differenti,\n"
-"ci sono sempre alcune persone che non sono contente\n"
-"con le nostre decisioni di moderazione.\n"
-"Mentre ci dispiace che succeda,\n"
-"per favore capite che non possiamo seguire tutte le persone tutto il tempo\n"
-"e abbiamo da prendere decisioni basate sulle nostre risorse e\n"
-"soprattutto su cosa sia meglio per il forum.\n"
-"Per favore non discutere la nostra politica di moderazione nei forum. Non "
-"siamo\n"
-"un progetto di social engineering e non abbiamo tra i nostri interessi la "
-"creazione\n"
-"di un sistema perfettamente equo. Quindi queste discussioni tendono ad "
-"essere controproducenti\n"
-"e potenzialmente dannose. Se hai una richiesta legittima,\n"
-"manda una e-mail all'indirizzo sottostante.\n"
-"<p>\n"
-"Questa politica di moderazione è scritta dal progetto %1.\n"
-"Se hai commenti riguardanti questa politica, manda una e-mail a %2.\n"
-"\n"
+msgstr "\n<p>\nI moderatori possono cancellare post che violano una delle regole seguenti.\nGli autori dei post cancellati riceveranno una notifica via e-mail.\nChi offende potrebbe avere la sua capacità di scrivere revocata temporaneamente\n(per prevenire abusi solo gli amministratori dei progetti possono farlo).\nTutti gli altri tipi di  comportamenti negativi (\"bugging\" post per scoprire\nl'indirizzo IP degli altri partecipanti, creazione di thread eccessiva per spammare\ni forum, e [...]
 
 #: ../user/pending.php:66
 msgid "Pending credit"
@@ -5442,265 +4993,248 @@ msgstr "Non hai messaggi privati."
 msgid "Sender and date"
 msgstr "Mittente e data"
 
-#: ../user/pm.php:106
+#: ../user/pm.php:111
 msgid "Reply to this message"
 msgstr "Rispondi a questo messaggio"
 
-#: ../user/pm.php:107
+#: ../user/pm.php:112
 msgid "Delete this message"
 msgstr "Cancella questo messaggio"
 
-#: ../user/pm.php:112
+#: ../user/pm.php:117
 msgid "Select all"
 msgstr "Seleziona tutto"
 
-#: ../user/pm.php:114
+#: ../user/pm.php:119
 msgid "Unselect all"
 msgstr "Deseleziona tutto"
 
-#: ../user/pm.php:117
+#: ../user/pm.php:122
 msgid "Delete selected messages"
 msgstr "Cancella i messaggi selezionati"
 
-#: ../user/pm.php:140
+#: ../user/pm.php:145
 msgid "Sender"
 msgstr "Mittente"
 
-#: ../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 "Devi riempire tutti i campi per poter inviare un messaggio privato"
 
-#: ../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 ""
-"Il tuo messaggio è stato segnalato come spam\n"
-"                dal sistema anti-spam Akismet.\n"
-"                Per favore modifica il testo e riprova."
+msgstr "Il tuo messaggio è stato segnalato come spam\n                dal sistema anti-spam Akismet.\n                Per favore modifica il testo e riprova."
 
-#: ../user/pm.php:205
+#: ../user/pm.php:210
 msgid "Could not find user with id %1"
 msgstr "Non è stato trovato alcun utente con l'id %1"
 
-#: ../user/pm.php:210
+#: ../user/pm.php:215
 msgid "Could not find user with username %1"
 msgstr "Non è stato trovato alcun utente chiamato %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 è un nome che hanno più utenti, devi usare l'ID dell'utente"
 
-#: ../user/pm.php:217
+#: ../user/pm.php:222
 msgid "User %1 (ID: %2) is not accepting private messages from you."
 msgstr "L'utente %1 (ID: %2) non accetta messaggi privati da te."
 
-#: ../user/pm.php:240 ../user/view_profile.php:26
+#: ../user/pm.php:245 ../user/view_profile.php:28
 msgid "No such user"
 msgstr "Nessun utente"
 
-#: ../user/pm.php:242
+#: ../user/pm.php:247
 msgid "Really block %1?"
 msgstr "Vuoi realmente bloccare %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 ""
-"Sei veramente sicuro di voler bloccare l'utente %1 dal mandarti messaggi "
-"privati?"
+msgstr "Sei veramente sicuro di voler bloccare l'utente %1 dal mandarti messaggi privati?"
 
-#: ../user/pm.php:244
+#: ../user/pm.php:249
 msgid "Please note that you can only block a limited amount of users."
 msgstr "Ricordati che puoi bloccare solamente un numero limitato di utenti."
 
-#: ../user/pm.php:245
+#: ../user/pm.php:250
 msgid ""
 "Once the user has been blocked you can unblock it using forum preferences "
 "page."
-msgstr ""
-"Una volta bloccato un utente puoi sempre sbloccarlo tramite la pagina delle "
-"preferenze sul forum."
+msgstr "Una volta bloccato un utente puoi sempre sbloccarlo tramite la pagina delle preferenze sul forum."
 
-#: ../user/pm.php:252
+#: ../user/pm.php:257
 msgid "No, cancel"
 msgstr "No, annulla"
 
-#: ../user/pm.php:260 ../user/team_admins.php:98
+#: ../user/pm.php:265 ../user/team_admins.php:100
 msgid "no such user"
 msgstr "utente non trovato"
 
-#: ../user/pm.php:263
+#: ../user/pm.php:268
 msgid "User %1 blocked"
 msgstr "Utente %1 bloccato"
 
-#: ../user/pm.php:265
+#: ../user/pm.php:270
 msgid "User %1 has been blocked from sending you private messages."
 msgstr "Ora l'utente %1 non può più inviarti messaggi privati."
 
-#: ../user/pm.php:266
+#: ../user/pm.php:271
 msgid "To unblock, visit %1message board preferences%2"
 msgstr "Per sboccare un utente, visita la pagina %1preferenze del forum%2"
 
-#: ../user/pm.php:302
+#: ../user/pm.php:307
 msgid "Unknown action"
 msgstr "Azione sconosciuta"
 
-#: ../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 ""
-"Le tue preferenze sono state aggiornate e\n"
-"avranno effetto quando il tuo computer comunicherà con %1\n"
-"oppure quando lancerai  il comando %2Aggiorna%3 dal BOINC manager."
+msgstr "Le tue preferenze sono state aggiornate e\navranno effetto quando il tuo computer comunicherà con %1\noppure quando lancerai  il comando %2Aggiorna%3 dal 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 ""
-"Le tue preferenze sono state resettate al default, e\n"
-"          avranno effetto quando il tuo computer comunicherà con %1\n"
-"          oppure cliccherai sul comando %2Aggiorna%3 dal BOINC Manager"
+msgstr "Le tue preferenze sono state resettate al default, e\n          avranno effetto quando il tuo computer comunicherà con %1\n          oppure cliccherai sul comando %2Aggiorna%3 dal 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 per %2"
 
-#: ../user/prefs_edit.php:110
+#: ../user/prefs_edit.php:112
 msgid "Back to preferences"
 msgstr "Ritorna alle preferenze"
 
-#: ../user/prefs_remove.php:45
+#: ../user/prefs_remove.php:46
 msgid "Confirm delete preferences"
 msgstr "Conferma la cancellazione delle preferenze"
 
-#: ../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 "Sei sicuro di voler cancellare le tue preferenze separate %1 per %2?"
 
-#: ../user/prefs_remove.php:52
+#: ../user/prefs_remove.php:53
 msgid "Remove preferences"
 msgstr "Rimuovi preferenze"
 
-#: ../user/prefs_remove.php:54
+#: ../user/prefs_remove.php:55
 msgid "Cancel"
 msgstr "Cancella"
 
-#: ../user/profile_menu.php:35
+#: ../user/profile_menu.php:34 ../user/sample_index.php:119
+msgid "Profiles"
+msgstr "Profili"
+
+#: ../user/profile_menu.php:37
 msgid ""
 "%1Profiles%2 let individuals share backgrounds and opinions with the %3 "
 "community."
-msgstr ""
-"I %1profili%2 permettono agli utenti di condividere le proprie esperienze "
-"con la comunità di %3."
+msgstr "I %1profili%2 permettono agli utenti di condividere le proprie esperienze con la comunità di %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 ""
-"Guarda la diversità dei volontari tuoi compagni e contribuisci con le tue "
-"opinioni. "
+msgstr "Guarda la diversità dei volontari tuoi compagni e contribuisci con le tue opinioni. "
 
-#: ../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 non l'hai ancora fatto, puoi %1creare un tuo profilo%2 da far vedere agli "
-"altri!"
+msgstr "Se non l'hai ancora fatto, puoi %1creare un tuo profilo%2 da far vedere agli altri!"
 
-#: ../user/profile_menu.php:42
+#: ../user/profile_menu.php:44
 msgid "User of the Day"
 msgstr "Utente del giorno"
 
-#: ../user/profile_menu.php:57
+#: ../user/profile_menu.php:59
 msgid "User Profile Explorer"
 msgstr "Guarda i profili degli utenti"
 
-#: ../user/profile_menu.php:60
+#: ../user/profile_menu.php:62
 msgid "View the %1User Picture Gallery%2."
 msgstr "Guarda la %1Galleria delle Immagini degli utenti%2."
 
-#: ../user/profile_menu.php:61
+#: ../user/profile_menu.php:63
 msgid "Browse profiles %1by country%2."
 msgstr "Visualizza i profili %1per nazionalità%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 ""
-"Visualizza i profili %1casualmente%2, %3casualmente con immagine%2 o %"
-"4casualmente senza immagine%2."
+msgstr "Visualizza i profili %1casualmente%2, %3casualmente con immagine%2 o %4casualmente senza immagine%2."
 
-#: ../user/profile_menu.php:66
+#: ../user/profile_menu.php:68
 msgid "Alphabetical profile listings:"
 msgstr "Profili in ordine alfabetico:"
 
-#: ../user/profile_menu.php:72
+#: ../user/profile_menu.php:74
 msgid "Search profile text"
 msgstr "Ricerca profilo mediante testo"
 
-#: ../user/profile_menu.php:98
+#: ../user/profile_menu.php:100
 msgid "No profiles"
 msgstr "Nessun profilo"
 
-#: ../user/profile_menu.php:99
+#: ../user/profile_menu.php:101
 msgid "No profiles matched your query."
 msgstr "Nessun profilo corrisponde ai tuoi criteri di ricerca."
 
-#: ../user/profile_rate.php:29
+#: ../user/profile_rate.php:31
 msgid "Invalid vote type:"
 msgstr "Tipo di voto non valido:"
 
-#: ../user/profile_rate.php:34
+#: ../user/profile_rate.php:36
 msgid "Vote Recorded"
 msgstr "Il voto è stato registrato"
 
-#: ../user/profile_rate.php:38
+#: ../user/profile_rate.php:40
 msgid "Thank you"
 msgstr "Grazie"
 
-#: ../user/profile_rate.php:41
+#: ../user/profile_rate.php:43
 msgid "Your recommendation has been recorded."
 msgstr "La tua raccomandazione è stata registrata."
 
-#: ../user/profile_rate.php:43
+#: ../user/profile_rate.php:45
 msgid "Your vote to reject this profile has been recorded."
 msgstr "Il tuo voto per deferire questo profilo è stato registrato."
 
-#: ../user/profile_rate.php:46
+#: ../user/profile_rate.php:48
 msgid "Return to profile."
 msgstr "Ritorna al profilo."
 
-#: ../user/profile_search_action.php:36
+#: ../user/profile_search_action.php:38
 msgid "Profiles containing '%1'"
 msgstr "Profili contenenti '%1'"
 
-#: ../user/profile_search_action.php:40
+#: ../user/profile_search_action.php:42
 msgid "User name"
 msgstr "Nome utente"
 
-#: ../user/profile_search_action.php:41
+#: ../user/profile_search_action.php:43
 msgid "Joined project"
 msgstr "Entrato nel progetto"
 
-#: ../user/profile_search_action.php:44
+#: ../user/profile_search_action.php:46
 msgid "Recent credit"
 msgstr "Crediti recenti"
 
-#: ../user/profile_search_action.php:54
+#: ../user/profile_search_action.php:56
 msgid "No profiles found containing '%1'"
 msgstr "Nessun profilo contenente '%1' trovato"
 
@@ -5728,151 +5262,61 @@ msgstr "Manca l'ID dell'utente o l'ID del computer"
 msgid "No tasks to display"
 msgstr "Nessun lavoro da visualizzare"
 
-#: ../user/server_status.php:97
-msgid "Running"
-msgstr "In esecuzione"
+#: ../user/sample_index.php:195
+msgid "User of the day"
+msgstr "Utente del giorno"
 
-#: ../user/server_status.php:100
+#: ../user/server_status.php:59
 msgid "Not Running"
 msgstr "Non in esecuzione"
 
-#: ../user/server_status.php:103
+#: ../user/server_status.php:63
+msgid "Running"
+msgstr "In esecuzione"
+
+#: ../user/server_status.php:67
 msgid "Disabled"
 msgstr "Disabilitato"
 
-#: ../user/server_status.php:231
+#: ../user/server_status.php:105
 msgid "Project status"
 msgstr "Stato del progetto"
 
-#: ../user/server_status.php:233
-msgid "Server software version: %1"
-msgstr "Versione software del server: %1"
+#: ../user/server_status.php:110
+msgid "Server status"
+msgstr "Stato del server"
 
-#: ../user/server_status.php:241
+#: ../user/server_status.php:113
 msgid "Program"
 msgstr "Programma"
 
-#: ../user/server_status.php:241
+#: ../user/server_status.php:113
 msgid "Host"
 msgstr "Ospite"
 
-#: ../user/server_status.php:252
-msgid "data-driven web pages"
-msgstr "pagine web generate dal database"
-
-#: ../user/server_status.php:258
-msgid "upload/download server"
-msgstr "server di upload/download"
-
-#: ../user/server_status.php:261
-msgid "scheduler"
-msgstr "schedulatore"
-
-#: ../user/server_status.php:294
-msgid "Running:"
-msgstr "In esecuzione:"
-
-#: ../user/server_status.php:295
-msgid "Program is operating normally"
-msgstr "Il programma sta funzionando normalmente"
-
-#: ../user/server_status.php:296
-msgid "Not Running:"
-msgstr "Non in esecuzione:"
-
-#: ../user/server_status.php:297
-msgid "Program failed or the project is down"
-msgstr "Il programma non ha funzionato e il progetto è sospeso"
-
-#: ../user/server_status.php:298
-msgid "Disabled:"
-msgstr "Disabilitato: "
-
-#: ../user/server_status.php:299
-msgid "Program is disabled"
-msgstr "Il programma è disabilitato"
+#: ../user/server_status.php:125
+msgid "Database schema version: "
+msgstr "Versione schema Database:"
 
-#: ../user/server_status.php:303
+#: ../user/server_status.php:134
 msgid "Computing status"
 msgstr "Stato di elaborazione"
 
-#: ../user/server_status.php:309
-msgid "The database server is not accessible"
-msgstr "Il database del server è inaccessibile"
-
-#: ../user/server_status.php:326
-msgid "Tasks ready to send"
-msgstr "Attività pronte per essere spedite"
-
-#: ../user/server_status.php:331 ../user/workunit.php:55
-msgid "Tasks in progress"
-msgstr "Attività in corso"
-
-#: ../user/server_status.php:336
-msgid "Workunits waiting for validation"
-msgstr "Unità di lavoro in attesa di essere validate"
-
-#: ../user/server_status.php:341
-msgid "Workunits waiting for assimilation"
-msgstr "Workunits in attesa di essere recepite"
-
-#: ../user/server_status.php:346
-msgid "Workunits waiting for file deletion"
-msgstr "Unità di lavoro in attesa di cancellazione"
-
-#: ../user/server_status.php:351
-msgid "Tasks waiting for file deletion"
-msgstr "Attività in attesa di cancellazione"
-
-#: ../user/server_status.php:367
-msgid "Transitioner backlog (hours)"
-msgstr "Backlog del Transitioner (ore)"
-
-#: ../user/server_status.php:374
+#: ../user/server_status.php:149
 msgid "Users"
 msgstr "Utenti"
 
-#: ../user/server_status.php:377 ../user/server_status.php:395
-msgid "with recent credit"
-msgstr "con crediti recenti"
-
-#: ../user/server_status.php:382 ../user/server_status.php:400
-msgid "with credit"
-msgstr "con credito"
-
-#: ../user/server_status.php:387 ../user/server_status.php:405
-msgid "registered in past 24 hours"
-msgstr "registrati nelle scorse 24 ore"
-
-#: ../user/server_status.php:411
-msgid "current GigaFLOPs"
-msgstr "GigaFLOPs correnti"
-
-#: ../user/server_status.php:420
+#: ../user/server_status.php:161
 msgid "Tasks by application"
 msgstr "Attività dall'applicazione"
 
-# ########################################
-# Apps page (apps.php)
-#: ../user/server_status.php:423 ../user/workunit.php:40
-msgid "application"
-msgstr "applicazione"
-
-#: ../user/server_status.php:424
-msgid "unsent"
-msgstr "non inviato"
-
-#: ../user/server_status.php:425
-msgid "in progress"
-msgstr "in corso"
+#: ../user/server_status.php:164
+msgid "Runtime of last 100 tasks in hours: average, min, max"
+msgstr "Tempo di esecuzione delle ultime 100 elaborazioni in ore: medio, minimo, massimo"
 
-#: ../user/server_status.php:426
-msgid "avg runtime of last 100 results in h (min-max)"
-msgstr "Tempo medio di esecuzione degli ultimi 100 risultati in ore (min-max)"
-
-#: ../user/server_status.php:427
-msgid "users in last 24h"
-msgstr "utenti nelle ultime 24 ore"
+#: ../user/server_status.php:165
+msgid "Users in last 24 hours"
+msgstr "Utenti nelle ultime 24 ore"
 
 #: ../user/show_host_detail.php:40
 msgid "Computer %1"
@@ -5882,753 +5326,700 @@ msgstr "Computer %1"
 msgid "Statistics and leaderboards"
 msgstr "Statistiche e classifiche"
 
-#: ../user/stats.php:28
+#: ../user/stats.php:30
 msgid "Statistics for %1"
 msgstr "Statistiche di %1"
 
-#: ../user/stats.php:37
+#: ../user/stats.php:32 ../user/top_users.php:117
+msgid "Top participants"
+msgstr "I migliori utenti"
+
+#: ../user/stats.php:40 ../user/team.php:48
+msgid "Top teams"
+msgstr "I migliori team"
+
+#: ../user/stats.php:47
+msgid "Top computers"
+msgstr "I migliori computer"
+
+#: ../user/stats.php:48
+msgid "GPU models"
+msgstr "Modelli GPU"
+
+#: ../user/stats.php:49
+msgid "CPU models"
+msgstr "Modelli di CPU"
+
+#: ../user/stats.php:53
 msgid ""
-"More detailed statistics for %1 and other BOINC-based projects are available "
-"at several web sites:"
-msgstr ""
-"Altre dettagliate statistiche per %1 e per altri progetti basati su BOINC "
-"sono disponibili su diversi siti web:"
+"More detailed statistics for %1 and other BOINC-based projects are available"
+" at several web sites:"
+msgstr "Altre dettagliate statistiche per %1 e per altri progetti basati su BOINC sono disponibili su diversi siti 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 ""
-"Puoi anche ottenere le tue attuali statistiche in forma di immagine "
-"(\"firma\"):"
+"You can also get your current statistics in the form of a \"signature "
+"image\":"
+msgstr "Puoi anche ottenere le tue attuali statistiche in forma di immagine (\"firma\"):"
 
-#: ../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 ""
-"Inoltre puoi vedere le tue statistiche individuali per tutti i progetti "
-"BOINC su diversi siti; guarda la %1pagina del tuo account%2."
+msgstr "Inoltre puoi vedere le tue statistiche individuali per tutti i progetti BOINC su diversi siti; guarda la %1pagina del tuo account%2."
 
 #: ../user/team.php:27
+msgid "Teams"
+msgstr "Team"
+
+#: ../user/team.php:29
 msgid "%1 participants may form %2teams%3."
 msgstr "I partecipanti a %1 possono formare dei %2team%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 ""
-"Puoi appartenere solo ad un team. Puoi unirti o lasciare un team in "
-"qualsiasi momento."
+msgstr "Puoi appartenere solo ad un team. Puoi unirti o lasciare un team in qualsiasi momento."
 
-#: ../user/team.php:31
+#: ../user/team.php:33
 msgid "Each team has a %1founder%2 who may:"
 msgstr "Ogni team ha un %1fondatore%2 che può:"
 
-#: ../user/team.php:33
+#: ../user/team.php:35
 msgid "access team members' email addresses"
 msgstr "accedere alle informazioni sugli indirizzi email dei membri"
 
-#: ../user/team.php:34
+#: ../user/team.php:36
 msgid "edit the team's name and description"
 msgstr "modificare il nome e la descrizione del team"
 
-#: ../user/team.php:35
+#: ../user/team.php:37
 msgid "add or remove team admins"
 msgstr "aggiungi o rimuovi admin del team"
 
-#: ../user/team.php:36
+#: ../user/team.php:38
 msgid "remove members from the team"
 msgstr "rimuovere i membri dal team"
 
-#: ../user/team.php:37
+#: ../user/team.php:39
 msgid "disband a team if it has no members"
 msgstr "sciogliere il team, solo se non ha più membri"
 
-#: ../user/team.php:40
+#: ../user/team.php:42
 msgid "To join a team, visit its team page and click %1Join this team%2."
-msgstr ""
-"Per unirti ad un team visita la pagina del team e clicca su %1Unirsi a "
-"questo team%2."
+msgstr "Per unirti ad un team visita la pagina del team e clicca su %1Unirsi a questo team%2."
 
-#: ../user/team.php:41 ../user/team_search.php:180
+#: ../user/team.php:43 ../user/team_search.php:201
 msgid "Find a team"
 msgstr "Trova un team"
 
-#: ../user/team.php:48
+#: ../user/team.php:50
 msgid "All teams"
 msgstr "Tutti i team"
 
-#: ../user/team.php:52
+#: ../user/team.php:54
 msgid "%1 teams"
 msgstr "%1 team"
 
-#: ../user/team.php:58
+#: ../user/team.php:60
 msgid "Create a new team"
 msgstr "Crea un nuovo team"
 
-#: ../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 non riesci a trovare un team giusto per te, puoi sempre %1creare un team%"
-"2."
+msgstr "Se non riesci a trovare un team giusto per te, puoi sempre %1creare un team%2."
 
-#: ../user/team_admins.php:34
+#: ../user/team_admins.php:36
 msgid "Remove Team Admin status from this member"
 msgstr "Rimuovi lo stato di Amministratore del Team per questo 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 "Aggiungi o rimuovi Admin del team"
 
-#: ../user/team_admins.php:41
+#: ../user/team_admins.php:43
 msgid "You can select team members as 'Team Admins'. Team Admins can:"
-msgstr ""
-"Puoi selezionare membri del team cone 'Amministratori del Team'. Gli "
-"Amministratori del Team possono:"
+msgstr "Puoi selezionare membri del team cone 'Amministratori del Team'. Gli Amministratori del Team possono:"
 
-#: ../user/team_admins.php:43
+#: ../user/team_admins.php:45
 msgid "Edit team information (name, URL, description, country)"
 msgstr "Modifica le informazioni del team (nome, URL, descrizione, stato)"
 
-#: ../user/team_admins.php:44
+#: ../user/team_admins.php:46
 msgid "View the team's join/quit history"
 msgstr "Vedi il resoconto di iscritti/cancellati del team"
 
-#: ../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 ""
-"Moderate il forum del team, se esiste (gli amministratori ricevono email di "
-"notifica degli atti di moderazione e reports)"
+"Moderate the team forum, if any (admins get email notification of moderation"
+" events and red X reports)"
+msgstr "Moderate il forum del team, se esiste (gli amministratori ricevono email di notifica degli atti di moderazione e reports)"
 
-#: ../user/team_admins.php:47
+#: ../user/team_admins.php:49
 msgid "Team Admins cannot:"
 msgstr "Gli admin del team non possono:"
 
-#: ../user/team_admins.php:49
+#: ../user/team_admins.php:51
 msgid "Change the team founder"
 msgstr "Cambia il fondatore del team"
 
-#: ../user/team_admins.php:50 ../user/team_manage.php:54
+#: ../user/team_admins.php:52 ../user/team_manage.php:56
 msgid "Remove members"
 msgstr "Rimuovi membri"
 
-#: ../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 un Amministratore del Team chiude il team, loro smettono di essere "
-"Amministratori del Team."
+msgstr "Se un Amministratore del Team chiude il team, loro smettono di essere Amministratori del Team."
 
-#: ../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 ""
-"Ci raccomandiamo che tu scelga solo persone che conosci e di cui ti fidi "
-"molto come Amministratori del Team."
+msgstr "Ci raccomandiamo che tu scelga solo persone che conosci e di cui ti fidi molto come Amministratori del Team."
 
-#: ../user/team_admins.php:59
+#: ../user/team_admins.php:61
 msgid "There are currently no Team Admins"
 msgstr "Non ci sono attualmente Amministratori del Team"
 
-#: ../user/team_admins.php:61
+#: ../user/team_admins.php:63
 msgid "Current Team Admins"
 msgstr "Admin del team correnti"
 
-#: ../user/team_admins.php:62
+#: ../user/team_admins.php:64
 msgid "Became Team Admin on"
 msgstr "Diventa Amministratore del Team di"
 
-#: ../user/team_admins.php:77
+#: ../user/team_admins.php:79
 msgid "Add Team Admin"
 msgstr "Aggiungi l'Amministratore del Team"
 
-#: ../user/team_admins.php:78
+#: ../user/team_admins.php:80
 msgid "Email address of team member:"
 msgstr "Indirizzo email del membro del team:"
 
-#: ../user/team_admins.php:90
+#: ../user/team_admins.php:81
+msgid "Add"
+msgstr "Aggiungi"
+
+#: ../user/team_admins.php:92
 msgid "failed to remove admin"
 msgstr "errore nella rimozione dell'admin"
 
-#: ../user/team_admins.php:99
+#: ../user/team_admins.php:101
 msgid "User is not member of team"
 msgstr "L'utente non è membro di un team"
 
-#: ../user/team_admins.php:101
+#: ../user/team_admins.php:103
 msgid "%1 is already an admin of %2"
 msgstr "%1 è già un admin di %2"
 
-#: ../user/team_admins.php:105
+#: ../user/team_admins.php:107
 msgid "Couldn't add admin"
 msgstr "Impossibile aggiungere l'amministratore"
 
-#: ../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 "Nessun team"
 
-#: ../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 "nessun team"
 
-#: ../user/team_change_founder_action.php:38
+#: ../user/team_change_founder_action.php:40
 msgid "User is not a member of %1"
 msgstr "L'utente non è un membro di %1"
 
-#: ../user/team_change_founder_action.php:41
+#: ../user/team_change_founder_action.php:43
 msgid "Changing founder of %1"
 msgstr "Cambio fondatore di %1"
 
-#: ../user/team_change_founder_action.php:43
+#: ../user/team_change_founder_action.php:45
 msgid "%1 is now founder of %2"
 msgstr "%1 è ora il fondatore di %2"
 
-#: ../user/team_change_founder_form.php:37
+#: ../user/team_change_founder_form.php:39
 msgid "Change founder of %1"
 msgstr "Cambia il fondatore di %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 ""
-"Il membro del team %1 ha richiesto la carica di fondatore di questo team in "
-"%2, ma ha abbandonato il team, di conseguenza la richiesta è stata "
-"cancellata."
+msgstr "Il membro del team %1 ha richiesto la carica di fondatore di questo team in %2, ma ha abbandonato il team, di conseguenza la richiesta è stata cancellata."
 
-#: ../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 ""
-"Il membro %1 ha richiesto di essere il fondatore di questo team. Potrebbe "
-"essere perché hai abbandonato il team oppure non hai avuto contatti con il "
-"team per un lungo periodo."
+msgstr "Il membro %1 ha richiesto di essere il fondatore di questo team. Potrebbe essere perché hai abbandonato il team oppure non hai avuto contatti con il team per un lungo periodo."
 
-#: ../user/team_change_founder_form.php:55
+#: ../user/team_change_founder_form.php:57
 msgid "decline request"
 msgstr "rifiuta richiesta"
 
-#: ../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 non rifiuti la richiesta di %1. %2 avrà l'opzione di assumere la carica "
-"di fondatore del team.<br /><br />\n"
-" Per accettare la richiesta, assegna la fusione a %3, utilizzando lo schema "
-"sotto. "
+"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 non rifiuti la richiesta di %1. %2 avrà l'opzione di assumere la carica di fondatore del team.<br /><br />\n Per accettare la richiesta, assegna la fusione a %3, utilizzando lo schema sotto. "
 
-#: ../user/team_change_founder_form.php:66
+#: ../user/team_change_founder_form.php:68
 msgid "No transfer request is pending."
 msgstr "Nessuna richiesta di trasferimento in corso."
 
-#: ../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 ""
-"Per assegnare il ruolo di fondatore di questo team ad un altro membro, "
-"controlla il riquadro vicino al nome del membro e clicca su <strong> Cambia "
-"fondatore <strong> sotto."
+msgstr "Per assegnare il ruolo di fondatore di questo team ad un altro membro, controlla il riquadro vicino al nome del membro e clicca su <strong> Cambia fondatore <strong> sotto."
 
-#: ../user/team_change_founder_form.php:76
+#: ../user/team_change_founder_form.php:78
 msgid "New founder?"
 msgstr "Nuovo fondatore?"
 
-#: ../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 "Cambia fondatore"
 
-#: ../user/team_change_founder_form.php:108
+#: ../user/team_change_founder_form.php:110
 msgid "There are no users to transfer team to."
 msgstr "Non ci sono utenti su cui trasferire il team."
 
-#: ../user/team_create_action.php:29
+#: ../user/team_create_action.php:31
 msgid "You must choose a non-blank team name"
 msgstr "Non puoi lasciare in bianco il nome del team"
 
-#: ../user/team_create_action.php:34
+#: ../user/team_create_action.php:36
 msgid "A team named %1 already exists - try another name"
 msgstr "Un team chiamato %1 esiste già - prova con un altro nome"
 
-#: ../user/team_create_action.php:54
+#: ../user/team_create_action.php:56
 msgid "Could not create team - please try later."
 msgstr "Non è stato possibile creare il team - riprovare più tardi."
 
-#: ../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 "Crea un team"
 
-#: ../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 ""
-"Tu sei membro del team %1. Devi %2lasciare questo team%3 prima di crearne "
-"uno nuovo."
+msgstr "Tu sei membro del team %1. Devi %2lasciare questo team%3 prima di crearne uno nuovo."
 
-#: ../user/team_delta.php:65
+#: ../user/team_delta.php:66
 msgid "Not founder or admin"
 msgstr "Nessun fondatore o amministratore"
 
-#: ../user/team_delta.php:72
+#: ../user/team_delta.php:73
 msgid "Team history for %1"
 msgstr "Storia del team per %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 "Utente"
 
-#: ../user/team_delta.php:77
+#: ../user/team_delta.php:78
 msgid "Action"
 msgstr "Attività"
 
-#: ../user/team_delta.php:78
+#: ../user/team_delta.php:79
 msgid "Total credit at time of action"
 msgstr "Credito totale durante l'attività"
 
-#: ../user/team_edit_action.php:53
+#: ../user/team_edit_action.php:55
 msgid "bad country"
 msgstr "paese sbagliato"
 
-#: ../user/team_edit_action.php:59
+#: ../user/team_edit_action.php:61
 msgid "The name '%1' is being used by another team."
 msgstr "Il nome '%1' è usato da un altro team."
 
-#: ../user/team_edit_action.php:62
+#: ../user/team_edit_action.php:64
 msgid "Must specify team name"
 msgstr "Devi specificare un nome di un team"
 
-#: ../user/team_edit_action.php:90
+#: ../user/team_edit_action.php:92
 msgid "Could not update team - please try again later."
 msgstr "Non è stato possibile aggiornare il team - riprovare più tardi."
 
-#: ../user/team_edit_form.php:33
+#: ../user/team_edit_form.php:35
 msgid "Edit %1"
 msgstr "Modifica %1"
 
-#: ../user/team_edit_form.php:34
+#: ../user/team_edit_form.php:36
 msgid "Update team info"
 msgstr "Aggiorna informazioni team"
 
-#: ../user/team_email_list.php:61
+#: ../user/team_email_list.php:70
 msgid "%1 Email List"
 msgstr "%1 Mail list"
 
-#: ../user/team_email_list.php:63
+#: ../user/team_email_list.php:72
 msgid "Member list of %1"
 msgstr "Lista membri di %1"
 
-#: ../user/team_email_list.php:78
+#: ../user/team_email_list.php:87
 msgid "Show as plain text"
 msgstr "Mostra come testo normale"
 
-#: ../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 "Crea un forum di messaggi"
 
-#: ../user/team_forum.php:29
+#: ../user/team_forum.php:31
 msgid "You may create a message board for use by %1."
 msgstr "Tu puoi creare un forum du messaggio per l'uso da parte di %1"
 
-#: ../user/team_forum.php:31
+#: ../user/team_forum.php:33
 msgid "Only team members will be able to post."
 msgstr "Solo i membri del gruppo avranno la possibilità di scrivere."
 
-#: ../user/team_forum.php:32
+#: ../user/team_forum.php:34
 msgid "At your option, only members will be able to read."
 msgstr "Con una tua opzione, solo i membri potranno leggere."
 
-#: ../user/team_forum.php:33
+#: ../user/team_forum.php:35
 msgid "You and your Team Admins will have moderator privileges."
 msgstr "Tu ed i tuoi Amministratori del team avrete i privilegi di moderatori."
 
-#: ../user/team_forum.php:40
+#: ../user/team_forum.php:42
 msgid "Create a message board for %1"
 msgstr "Crea un forum di messaggi per %1"
 
-#: ../user/team_forum.php:48
+#: ../user/team_forum.php:50
 msgid "Team already has a message board"
 msgstr "Il team ha già un forum di messaggi."
 
-#: ../user/team_forum.php:59
+#: ../user/team_forum.php:61
 msgid "Team Message Board"
 msgstr "Forum di messaggi del team."
 
-#: ../user/team_forum.php:71
+#: ../user/team_forum.php:73
 msgid "Minimum time between posts (seconds)"
 msgstr "Tempo minimo tra i messaggi (secondi)"
 
-#: ../user/team_forum.php:74
+#: ../user/team_forum.php:76
 msgid "Minimum total credit to post"
 msgstr "Credito totale minimo per scrivere"
 
-#: ../user/team_forum.php:77
+#: ../user/team_forum.php:79
 msgid "Minimum average credit to post"
 msgstr "Credito medio minimo per scrivere"
 
-#: ../user/team_forum.php:80
+#: ../user/team_forum.php:82
 msgid "Submit"
 msgstr "Invia"
 
-#: ../user/team_forum.php:89
+#: ../user/team_forum.php:91
 msgid "Remove your team's message board."
 msgstr "Rimuovi il forum di messaggi del tuo team."
 
-#: ../user/team_forum.php:97
+#: ../user/team_forum.php:99
 msgid "Really remove message board?"
 msgstr "Veramente vuoi rimuovere il forum di messaggi?"
 
-#: ../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 ""
-"Sei sicuro di voler rimuovere il forum di messaggi del tuo tem? Tutte le "
-"discussioni ed i messaggi verranno permanentemente rimossi. (Tu puoi, "
-"comunque, creare un nuovo forum di messaggi successivamente)."
+msgstr "Sei sicuro di voler rimuovere il forum di messaggi del tuo tem? Tutte le discussioni ed i messaggi verranno permanentemente rimossi. (Tu puoi, comunque, creare un nuovo forum di messaggi successivamente)."
 
-#: ../user/team_forum.php:100
+#: ../user/team_forum.php:102
 msgid "Yes - remove message board"
 msgstr "Sì-rimuovi il forum di messaggi."
 
-#: ../user/team_forum.php:121
+#: ../user/team_forum.php:123
 msgid "Message board removed"
 msgstr "Forum di messaggi rimosso."
 
-#: ../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 ""
-"Il forum di messaggi del tuo team è stato rimosso. Tu puoi ora %1 crearne "
-"uno nuovo%2."
+"Your team's message board has been removed. You may now %1create a new "
+"one%2."
+msgstr "Il forum di messaggi del tuo team è stato rimosso. Tu puoi ora %1 crearne uno nuovo%2."
 
-#: ../user/team_forum.php:143
+#: ../user/team_forum.php:145
 msgid "Team Message Board Updated"
 msgstr "Forum di messaggi del team aggiornato."
 
-#: ../user/team_forum.php:144
+#: ../user/team_forum.php:146
 msgid "Update successful"
 msgstr "Aggiornamento eseguito"
 
-#: ../user/team_forum.php:147
+#: ../user/team_forum.php:149
 msgid "Update failed"
 msgstr "Aggiornamento fallito"
 
-#: ../user/team_forum.php:154
+#: ../user/team_forum.php:156
 msgid "Team has no forum"
 msgstr "Il team non ha 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 "Devi essere membro di un team per avere accesso a questa pagina."
 
-#: ../user/team_founder_transfer_action.php:90
+#: ../user/team_founder_transfer_action.php:92
 msgid "Requesting foundership of %1"
 msgstr "Richiedi cambio fondatore di %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 ""
-"Il fondatore corrente è stato informato della tua richiesta mediante email e "
-"messaggio privato.<br /><br />\n"
-" Se il fondatore non risponde in 60 giorni,  sarai autorizzato a diventare "
-"il nuovo fondatore."
+"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 "Il fondatore corrente è stato informato della tua richiesta mediante email e messaggio privato.<br /><br />\n Se il fondatore non risponde in 60 giorni,  sarai autorizzato a diventare il nuovo fondatore."
 
-#: ../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 "Richiesta di cambio fondatore non permessa in questo momento"
 
-#: ../user/team_founder_transfer_action.php:109
+#: ../user/team_founder_transfer_action.php:111
 msgid "Assumed foundership of %1"
 msgstr "Assumi carica di fondatore di %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 ""
-"Congratulazioni, sei ora il nuovo fondatore del team %1. Vai a %2La tua "
-"pagina Acoount%3 per trovare le opzioni dell'Ammnistratore di Team."
+msgstr "Congratulazioni, sei ora il nuovo fondatore del team %1. Vai a %2La tua pagina Acoount%3 per trovare le opzioni dell'Ammnistratore di Team."
 
-#: ../user/team_founder_transfer_action.php:120
+#: ../user/team_founder_transfer_action.php:122
 msgid "Decline founder change request"
 msgstr "Declina richiesta di cambio fondatore"
 
-#: ../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 richiesta di cambio fondatore di %1 è stata rifiutata."
 
-#: ../user/team_founder_transfer_action.php:130
+#: ../user/team_founder_transfer_action.php:132
 msgid "There were no foundership requests."
 msgstr "Non ci sono richieste di cambio fondatore."
 
-#: ../user/team_founder_transfer_action.php:134
+#: ../user/team_founder_transfer_action.php:136
 msgid "undefined action %1"
 msgstr "Azione non definita %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 "Ritorna alla pagina del team"
 
-#: ../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 "Devi essere membro del team per avere accesso a questa pagina"
 
-#: ../user/team_founder_transfer_form.php:31
+#: ../user/team_founder_transfer_form.php:33
 msgid "Request foundership of %1"
 msgstr "Richiedi cambio fondatore per %1"
 
-#: ../user/team_founder_transfer_form.php:38
+#: ../user/team_founder_transfer_form.php:40
 msgid "You are now founder of team %1."
 msgstr "Sei ora il fondatore del gruppo %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 "Hai richiesto la carica di fondatore di %1 su %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 giorni sono passati dalla tua richiesta, e il fondatore non ha risposto. "
-"Puoi assumere la carica di fondatore cliccando qui:"
+msgstr "60 giorni sono passati dalla tua richiesta, e il fondatore non ha risposto. Puoi assumere la carica di fondatore cliccando qui:"
 
-#: ../user/team_founder_transfer_form.php:50
+#: ../user/team_founder_transfer_form.php:52
 msgid "Assume foundership"
 msgstr "Assumi ruolo di fondatore"
 
-#: ../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 ""
-"Il fondatore è stato avvisato della tua richiesta. Se lui/lei non risponderà "
-"entro %1 ti sarà data la possibilità di diventare fondatore."
+msgstr "Il fondatore è stato avvisato della tua richiesta. Se lui/lei non risponderà entro %1 ti sarà data la possibilità di diventare fondatore."
 
-#: ../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"
+"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 il fondatore del team non è attivo e vuoi assumere il ruolo di fondatore, "
-"clicca il bottone qui sotto. Sarà mandata una e-mail al fondatore corrente "
-"con la tua richiesta, e sarà capace di trasferire il ruolo di fondatore a te "
-"o di declinare la tua richiesta. Se il fondatore non risponde in 60 giorni, "
-"ti sarà permesso di diventare il fondatore.<br /><br />\n"
-"                       Sei sicuro di voler richiedere il ruolo di fondatore?"
-
-#: ../user/team_founder_transfer_form.php:65
+msgstr "Se il fondatore del team non è attivo e vuoi assumere il ruolo di fondatore, clicca il bottone qui sotto. Sarà mandata una e-mail al fondatore corrente con la tua richiesta, e sarà capace di trasferire il ruolo di fondatore a te o di declinare la tua richiesta. Se il fondatore non risponde in 60 giorni, ti sarà permesso di diventare il fondatore.<br /><br />\n                       Sei sicuro di voler richiedere il ruolo di fondatore?"
+
+#: ../user/team_founder_transfer_form.php:67
 msgid "Request foundership"
 msgstr "Richiedi cambio fondatore"
 
-#: ../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 "Richiesta di cambio fondatore già fatta da %1 su %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 ""
-"Una richiesta di cambio fondatore è stata fatta negli ultimi 90 giorni, "
-"quindi ne nuove richieste non sono permesse. Per favore riprova più tardi."
+msgstr "Una richiesta di cambio fondatore è stata fatta negli ultimi 90 giorni, quindi ne nuove richieste non sono permesse. Per favore riprova più tardi."
 
-#: ../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 "Non si può entrare nel team %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 "Sei già 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 "Sei già membro di %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 "Non puoi entrare nel team - per favore riprova più tardi."
 
-#: ../user/team_join_action.php:40
+#: ../user/team_join_action.php:42
 msgid "Joined %1"
 msgstr "Entrato in %1"
 
-#: ../user/team_join_action.php:41
+#: ../user/team_join_action.php:43
 msgid "You have joined %1."
 msgstr "Sei entrato in %1."
 
-#: ../user/team_join_form.php:32
+#: ../user/team_join_form.php:34
 msgid "Join %1"
 msgstr "Entra in %1"
 
-#: ../user/team_join_form.php:33
+#: ../user/team_join_form.php:35
 msgid "Please note:"
 msgstr "Si prega di notare:"
 
-#: ../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 "Entrare in un team da al fondatore accesso al tuo indirizzo 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 "Entrare in un team non influisce sui crediti del tuo account."
 
-#: ../user/team_join_form.php:43
+#: ../user/team_join_form.php:45
 msgid "Join team"
 msgstr "Entra in un team"
 
-#: ../user/team_lookup.php:84
+#: ../user/team_lookup.php:86
 msgid "Search Results"
 msgstr "Risultati ricerca"
 
-#: ../user/team_lookup.php:86
+#: ../user/team_lookup.php:88
 msgid "Search results for '%1'"
 msgstr "Risultati ricerca per '%1'"
 
-#: ../user/team_lookup.php:88
+#: ../user/team_lookup.php:90
 msgid "You may view these teams' members, statistics, and information."
 msgstr "Puoi vedere i membri, statistiche, e informazioni di questi team."
 
-#: ../user/team_lookup.php:98
+#: ../user/team_lookup.php:100
 msgid "More than 100 teams match your search. The first 100 are shown."
-msgstr ""
-"Più di 100 team soddisfano la tua ricerca. Sono visualizzati i primi 100."
+msgstr "Più di 100 team soddisfano la tua ricerca. Sono visualizzati i primi 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 ""
-"Fine dei risultati. %1 Se non riesci a trovare un team giusto per te, puoi "
-"sempre %2creare un team%3."
+"End of results. %1 If you cannot find the team you are looking for, you may "
+"%2create a team%3 yourself."
+msgstr "Fine dei risultati. %1 Se non riesci a trovare un team giusto per te, puoi sempre %2creare un team%3."
 
-#: ../user/team_manage.php:26
+#: ../user/team_manage.php:28
 msgid "Team administration for %1"
 msgstr "Amministrazione del team per %1"
 
-#: ../user/team_manage.php:29
+#: ../user/team_manage.php:31
 msgid "Edit team info"
 msgstr "Modifica le informazioni del team"
 
-#: ../user/team_manage.php:30
+#: ../user/team_manage.php:32
 msgid "Change team name, URL, description, type, or country"
 msgstr "Cambia il nome del team, URL, descrizione, tipo o nazione"
 
-#: ../user/team_manage.php:32
+#: ../user/team_manage.php:34
 msgid "Member list:"
 msgstr "Lista membri:"
 
-#: ../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 "testo"
 
-#: ../user/team_manage.php:35
+#: ../user/team_manage.php:37
 msgid "View member names and email addresses"
 msgstr "Visualizza i nomi dei membri e gli indirizzi mail"
 
-#: ../user/team_manage.php:36
+#: ../user/team_manage.php:38
 msgid "View change history:"
 msgstr "Visualizza la cronologia dei cambiamenti:"
 
-#: ../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 "Mostra quando i membri si sono uniti o hanno abbandonato questo team"
 
-#: ../user/team_manage.php:50
+#: ../user/team_manage.php:52
 msgid "Respond to foundership request."
 msgstr "Rispondi alla richiesta di cambio fondatore."
 
-#: ../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 non rispondi a %1, %2 potrebe assumere il ruolo di fondatore del team."
+msgstr "Se non rispondi a %1, %2 potrebe assumere il ruolo di fondatore del team."
 
-#: ../user/team_manage.php:55
+#: ../user/team_manage.php:57
 msgid "Remove inactive or unwanted members from this team"
 msgstr "Rimuovi membri inattivi o indesiderati da questo team"
 
-#: ../user/team_manage.php:57
+#: ../user/team_manage.php:59
 msgid "Transfer foundership to another member"
 msgstr "Trasferisci carica di fondatore ad un altro membro"
 
-#: ../user/team_manage.php:58
+#: ../user/team_manage.php:60
 msgid "Add/remove Team Admins"
 msgstr "Aggiungi/Rimuovi Admin del team"
 
-#: ../user/team_manage.php:59
+#: ../user/team_manage.php:61
 msgid "Give selected team members Team Admin privileges"
 msgstr "Dai ai membri del team selezionati i privilegi di Admin del team"
 
-#: ../user/team_manage.php:61
+#: ../user/team_manage.php:63
 msgid "Remove team"
 msgstr "Rimuovi team"
 
-#: ../user/team_manage.php:62
+#: ../user/team_manage.php:64
 msgid "Allowed only if team has no members"
 msgstr "Permesso solo se il team non ha membri"
 
-#: ../user/team_manage.php:64
+#: ../user/team_manage.php:66
 msgid "Create or manage a team message board"
 msgstr "Crea o gestisci un forum del team"
 
-#: ../user/team_manage.php:71
-msgid ""
-"To have this team created on all BOINC projects (current and future) you can "
-"make it into a %1BOINC-wide team%2."
-msgstr ""
-"Per far si che questo team sia creato in tutti i progetti BOINC (correnti e "
-"futuri), puoi trasformarlo in un %1BOINC-wide team%2."
-
 #: ../user/team_manage.php:73
 msgid ""
-"Team admins are encouraged to join and participate in the Google %1boinc-"
-"team-founders%2 group."
-msgstr ""
-"Gli amministratori dei team sono pregati di unirsi e partecipare sul gruppo "
-"Google %1fondatori di team boinc%2."
+"To have this team created on all BOINC projects (current and future) you can"
+" make it into a %1BOINC-wide team%2."
+msgstr "Per far si che questo team sia creato in tutti i progetti BOINC (correnti e futuri), puoi trasformarlo in un %1BOINC-wide team%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 ""
-"Altre risorse per gli amministratori di team BOINC sono disponibili sul sito "
-"di terze parti %1www.boincteams.com%2."
+"Team admins are encouraged to join and participate in the Google %1boinc-"
+"team-founders%2 group."
+msgstr "Gli amministratori dei team sono pregati di unirsi e partecipare sul gruppo Google %1fondatori di team boinc%2."
 
 #: ../user/team_manage.php:91
 msgid "Can't delete non-empty team"
@@ -6638,128 +6029,114 @@ msgstr "Non posso cancellare i team non vuoti\""
 msgid "Team %1 deleted"
 msgstr "Team %1 cancellato"
 
-#: ../user/team_members.php:36
+#: ../user/team_members.php:38
 msgid "Limit exceeded:  Can only display the first 1000 members."
 msgstr "Limite superato: Puoi solo visualizzare i primi 1000 membri."
 
-#: ../user/team_members.php:49
+#: ../user/team_members.php:51
 msgid "Members of %1"
 msgstr "Membri di %1"
 
-#: ../user/team_quit_action.php:32
+#: ../user/team_quit_action.php:34
 msgid "Unable to quit team"
 msgstr "Impossibile uscire dal team"
 
-#: ../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 "Il team non esiste, oppure non gli appartieni"
 
-#: ../user/team_quit_form.php:31
+#: ../user/team_quit_form.php:33
 msgid "Quit %1"
 msgstr "Esci da %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"
-"         <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>Prima di uscire da un team nota che:</strong>\n"
-"         <ul>\n"
-"         <li>Se esci da un team, puoi rientrare successivamente, oppure "
-"entrare in un altro team tu desideri\n"
-"         <li>Uscire da un team non ha effetti sulle tue statistiche "
-"personali in nessun modo.\n"
+"         <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>Prima di uscire da un team nota che:</strong>\n         <ul>\n         <li>Se esci da un team, puoi rientrare successivamente, oppure entrare in un altro team tu desideri\n         <li>Uscire da un team non ha effetti sulle tue statistiche personali in nessun modo.\n         </ul>"
 
-#: ../user/team_quit_form.php:40
+#: ../user/team_quit_form.php:42
 msgid "Quit Team"
 msgstr "Abbandona il Team"
 
-#: ../user/team_remove_inactive_action.php:31
+#: ../user/team_remove_inactive_action.php:33
 msgid "Removing users from %1"
 msgstr "Rimozione utenti da %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 non è un membro di %2"
 
-#: ../user/team_remove_inactive_action.php:42
+#: ../user/team_remove_inactive_action.php:44
 msgid "%1 has been removed"
 msgstr "%1 è stato rimosso"
 
-#: ../user/team_remove_inactive_form.php:32
+#: ../user/team_remove_inactive_form.php:34
 msgid "Remove members from %1"
 msgstr "Rimuovi membri da %1"
 
-#: ../user/team_remove_inactive_form.php:39
+#: ../user/team_remove_inactive_form.php:41
 msgid "Remove?"
 msgstr "Rimuovi?"
 
-#: ../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 "Nessun membro può essere rimosso."
 
-#: ../user/team_remove_inactive_form.php:68
+#: ../user/team_remove_inactive_form.php:70
 msgid "Remove users"
 msgstr "Rimuovi utenti"
 
-#: ../user/team_search.php:68
+#: ../user/team_search.php:76
 msgid "Team name"
 msgstr "Nome team"
 
-#: ../user/team_search.php:92
+#: ../user/team_search.php:113
 msgid "Team search results"
 msgstr "Risultato della ricerca team"
 
-#: ../user/team_search.php:94
+#: ../user/team_search.php:115
 msgid "No teams were found matching your criteria. Try another search."
 msgstr "Nessun team trovato. Prova un'altra ricerca"
 
-#: ../user/team_search.php:96
+#: ../user/team_search.php:117
 msgid "Or you can %1create a new team%2."
 msgstr "Oppure, puoi %1creare un nuovo team%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 ""
-"I team seguenti soddisfano uno o più dei tuoi criteri di ricerca.\n"
-"            Per entrare in un team, clicca sul nome o vai sulla sua pagina,\n"
-"               poi clicca su %1Unisciti a questo team%2."
+msgstr "I team seguenti soddisfano uno o più dei tuoi criteri di ricerca.\n            Per entrare in un team, clicca sul nome o vai sulla sua pagina,\n               poi clicca su %1Unisciti a questo team%2."
 
-#: ../user/team_search.php:107
+#: ../user/team_search.php:128
 msgid "Change your search"
 msgstr "Cambia la ricerca"
 
-#: ../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 ""
-"Puoi entrare in un team con persone aventi interessi simili, provenienti "
-"dallo stesso paese, luogo di lavoro, o scuola."
+msgstr "Puoi entrare in un team con persone aventi interessi simili, provenienti dallo stesso paese, luogo di lavoro, o scuola."
 
-#: ../user/team_search.php:183
+#: ../user/team_search.php:204
 msgid "Use this form to find teams that might be right for you."
 msgstr "Usa questo form per trovare team che possono essere adeguati per te."
 
-#: ../user/team_search.php:188
+#: ../user/team_search.php:209
 msgid "%1I'm not interested%2 in joining a team right now."
 msgstr "%1Non sono interessanto%2 nell'entrare in un team adesso."
 
-#: ../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 massimo superato - Scusa, solo i primi %1 elementi"
 
@@ -6767,11 +6144,11 @@ msgstr "Limite massimo superato - Scusa, solo i primi %1 elementi"
 msgid "Top hosts"
 msgstr "I migliori computer"
 
-#: ../user/top_teams.php:105
+#: ../user/top_teams.php:107
 msgid "Top %1 teams"
 msgstr "I migliori team su %1"
 
-#: ../user/top_teams.php:108
+#: ../user/top_teams.php:110
 msgid "There are no %1 teams"
 msgstr "Non ci sono team %1"
 
@@ -6779,11 +6156,11 @@ msgstr "Non ci sono team %1"
 msgid "Participant since"
 msgstr "Partecipante dal"
 
-#: ../user/uotd.php:29
+#: ../user/uotd.php:31
 msgid "No user of the day has been chosen."
 msgstr "Nessun utente del giorno è stato scelto."
 
-#: ../user/uotd.php:33
+#: ../user/uotd.php:35
 msgid "User of the Day for %1: %2"
 msgstr "Utente del giorno per %1: %2"
 
@@ -6827,19 +6204,19 @@ msgstr "Decrescita del credito medio"
 msgid "Decreasing total credit"
 msgstr "Decrescita del credito totale"
 
-#: ../user/user_search.php:100
+#: ../user/user_search.php:84
 msgid "search string must be at least 3 characters"
 msgstr "la stringa deve essere di almeno 3 caratteri"
 
-#: ../user/user_search.php:133
+#: ../user/user_search.php:118
 msgid "User search results"
 msgstr "Risultato della ricerca utenti"
 
-#: ../user/user_search.php:140
+#: ../user/user_search.php:125
 msgid "Joined"
 msgstr "Entrato"
 
-#: ../user/user_search.php:148
+#: ../user/user_search.php:133
 msgid "No users match your search criteria."
 msgstr "Nessun utente corrisponde al criterio di ricerca."
 
@@ -6875,9 +6252,7 @@ msgstr "Convalida indirizzo email BOINC"
 msgid ""
 "Please visit the following link to validate the email address of your %1 "
 "account:"
-msgstr ""
-"Per favore visita il link seguente per convalidare l'indirizzo e-mail del "
-"tuo account %1:"
+msgstr "Per favore visita il link seguente per convalidare l'indirizzo e-mail del tuo account %1:"
 
 #: ../user/validate_email_addr.php:34
 msgid "Validate email sent"
@@ -6887,9 +6262,7 @@ msgstr "Email di convalida inviata"
 msgid ""
 "An email has been sent to %1. Visit the link it contains to validate your "
 "email address."
-msgstr ""
-"Una email è stata inviata a %1. Visita il link che contiene per convalidare "
-"il tuo indirizzo email."
+msgstr "Una email è stata inviata a %1. Visita il link che contiene per convalidare il tuo indirizzo email."
 
 #: ../user/validate_email_addr.php:44
 msgid "No such user."
@@ -6911,28 +6284,24 @@ msgstr "Convalida l'indirizzo email"
 msgid "The email address of your account has been validated."
 msgstr "L'indirizzo email del tuo account è stato convalidato."
 
-#: ../user/view_profile.php:36
+#: ../user/view_profile.php:38
 msgid "This user has no profile"
 msgstr "Questo utente non ha un profilo"
 
-#: ../user/view_profile.php:54
+#: ../user/view_profile.php:56
 msgid "Profile: %1"
 msgstr "Profilo: %1"
 
-#: ../user/view_profile.php:63
+#: ../user/view_profile.php:65
 msgid "Account data"
 msgstr "Dati dell'account"
 
 #: ../user/weak_auth.php:52
 msgid ""
-"You can access your account either by using your email address and "
-"password,\n"
+"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 ""
-"Puoi accedere al tuoi account sia utilizzando il tuo email e password,\n"
-"    oppure usando una 'chiave account' assegnata.\n"
-"    La tua chiave account è:"
+msgstr "Puoi accedere al tuoi account sia utilizzando il tuo email e password,\n    oppure usando una 'chiave account' assegnata.\n    La tua chiave account è:"
 
 #: ../user/weak_auth.php:57
 msgid "This key can be used to:"
@@ -6948,11 +6317,7 @@ msgid ""
 "       To do so, install BOINC,\n"
 "       create a file named %1 in the BOINC\n"
 "       data directory, and set its contents to:"
-msgstr ""
-"per aggiungere un computer al tuo account senza usare il BOINC Manager.\n"
-"       Per farlo, installa BOINC,\n"
-"       crea un file chiamato %1 nella cartella dati\n"
-"       di BOINC, e scrivi come contenuto:"
+msgstr "per aggiungere un computer al tuo account senza usare il BOINC Manager.\n       Per farlo, installa BOINC,\n       crea un file chiamato %1 nella cartella dati\n       di BOINC, e scrivi come contenuto:"
 
 #: ../user/weak_auth.php:73
 msgid "Weak account key"
@@ -6961,27 +6326,17 @@ msgstr "Chiave di accesso debole"
 #: ../user/weak_auth.php:74
 msgid ""
 "Your 'weak account key' can be used to attach computers to your account\n"
-"    as described above, but cannot be used to log in to your account or "
-"change it in any way.\n"
+"    as described above, but cannot be used to log in to your account or change it in any way.\n"
 "    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 ""
-"La tua 'chiave di accesso debole' può essere usata per aggiungere computer "
-"al tuo account\n"
-"    come descritto sopra, ma non può essere usata per fare il login al tuo "
-"account o per cambiarlo in nessun modo.\n"
-"    Se vuoi aggiungere computer non fidati o non sicuri al tuo account,\n"
-"    fallo usando la tua chiave di accesso debole.\n"
-"    La tua chiave di accesso debole è:"
+msgstr "La tua 'chiave di accesso debole' può essere usata per aggiungere computer al tuo account\n    come descritto sopra, ma non può essere usata per fare il login al tuo account o per cambiarlo in nessun modo.\n    Se vuoi aggiungere computer non fidati o non sicuri al tuo account,\n    fallo usando la tua chiave di accesso debole.\n    La tua chiave di accesso debole è:"
 
 #: ../user/weak_auth.php:81
 msgid ""
 "If you change your password, your weak account key changes, and your "
 "previous weak account key becomes invalid."
-msgstr ""
-"Se cambi la tua password, la tua chiave di accesso debole cambia, e quella "
-"precedente diventa non valida."
+msgstr "Se cambi la tua password, la tua chiave di accesso debole cambia, e quella precedente diventa non valida."
 
 #: ../user/workunit.php:32
 msgid "can't find workunit"
@@ -6991,6 +6346,10 @@ msgstr "impossibile trovare il lavoro"
 msgid "Workunit %1"
 msgstr "Lavoro %1"
 
+#: ../user/workunit.php:40
+msgid "application"
+msgstr "applicazione"
+
 #: ../user/workunit.php:43
 msgid "canonical result"
 msgstr "risultato canonico"
@@ -7000,6 +6359,10 @@ msgid "granted credit"
 msgstr "credito garantito"
 
 #: ../user/workunit.php:55
+msgid "Tasks in progress"
+msgstr "Attività in corso"
+
+#: ../user/workunit.php:55
 msgid "suppressed pending completion"
 msgstr "completamento in sospeso cancellato"
 
@@ -7027,312 +6390,70 @@ msgstr "convalida"
 msgid "Pending"
 msgstr "Non assegnato"
 
-#: ../project.sample/project.inc:43
+#: ../project.sample/project.inc:70
 msgid "Main page"
 msgstr "Pagina 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 "Generato"
 
-#: ../project.sample/project.inc:79
+#: ../project.sample/project.inc:106
 msgid "Your personal background."
 msgstr "Il tuo sfondo personale."
 
-#: ../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 ""
-"Parlaci di te. Puoi dirci da dove vieni, la tua età, occupazione, hobbies o "
-"qualsiasi altra cosa su di te."
+msgstr "Parlaci di te. Puoi dirci da dove vieni, la tua età, occupazione, hobbies o qualsiasi altra cosa su di te."
 
-#: ../project.sample/project.inc:87
+#: ../project.sample/project.inc:114
 msgid "Your opinions about %1"
 msgstr "Le tue opinioni riguardo %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 ""
-"Dicci i tuoi pensieri riguardo %1<ol>\n"
-"    <li>Perché utilizzi %1?\n"
-"    <li>Quali sono i tuoi punti di vista sul progetto?\n"
-"    <li>Suggerimenti?\n"
-"    </ol>"
+msgstr "Dicci i tuoi pensieri riguardo %1<ol>\n    <li>Perché utilizzi %1?\n    <li>Quali sono i tuoi punti di vista sul progetto?\n    <li>Suggerimenti?\n    </ol>"
 
-#: ../project.sample/project_specific_prefs.inc:47
+#: ../project.sample/project_specific_prefs.inc:53
 msgid "Color scheme for graphics"
 msgstr "Schema di colori per la grafica"
 
-#: ../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 "Massima CPU % per grafica%10 ... 100%2"
 
-#: ../project.sample/project_specific_prefs.inc:49
+#: ../project.sample/project_specific_prefs.inc:56
 msgid "Run only the selected applications"
 msgstr "Avvia solo le applicazioni selezionate"
 
-#: ../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 "Ottieni elaborazioni solo per alcune applicazioni. Utile per focalizzarsi su particolari applicazioni, o per escluderle."
+
+#: ../project.sample/project_specific_prefs.inc:58
 msgid ""
 "If no work for selected applications is available, accept work from other "
 "applications?"
-msgstr ""
-"Se non è disponibile lavoro per le applicazioni selezionate, accettarne "
-"dalle altre applicazioni?"
+msgstr "Se non è disponibile lavoro per le applicazioni selezionate, accettarne dalle altre applicazioni?"
+
+#: ../project.sample/project_specific_prefs.inc:59
+msgid "Use faster non-graphical applications if available?"
+msgstr "Utilizzare l'applicazione non-grafica, più veloce, se disponibile?"
 
-#: ../project.sample/project_specific_prefs.inc:91
+#: ../project.sample/project_specific_prefs.inc:90
 msgid "(all applications)"
 msgstr "(tutte le applicazioni)"
-
-#~ msgid "Use Intel GPU %1 Enforced by version 7.0+ %2"
-#~ msgstr "Usa la GPU Intel %1 Si applica dalla versione 7.0+ %2"
-
-#~ msgid "Error:"
-#~ msgstr "Errore:"
-
-#~ msgid "Account creation is disabled"
-#~ msgstr "La creazione degli account è disabilitata"
-
-#~ msgid ""
-#~ "Sorry, this project has disabled the creation of new accounts.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Spiacente, questo progetto ha disabilitato la creazione di nuovi account.\n"
-#~ "Per favore riprova più tardi."
-
-#~ msgid "Account creation is currently disabled. Please try again later."
-#~ msgstr ""
-#~ "La creazione degli account è stata momentaneamente disabilitata. Riprova più "
-#~ "tardi."
-
-#~ msgid ""
-#~ "This project hasn\\'t created an email message - please notify its "
-#~ "administrators"
-#~ msgstr ""
-#~ "Questo progetto non ha creato un messaggio e-mail - per favore segnalalo ai "
-#~ "suoi amministratori"
-
-#~ msgid "nvidia GPU"
-#~ msgstr "GPU nvidia"
-
-#~ msgid ""
-#~ "These apply to all BOINC projects in which you participate.<br>\n"
-#~ "             On computers participating in multiple projects, the most "
-#~ "recently modified preferences will be used."
-#~ msgstr ""
-#~ "Queste si applicano a tutti i progetti BOINC ai quali partecipi. <br>\n"
-#~ "                                                     Sui computer che "
-#~ "partecipano a progetti multipli, verranno utilizzate le preferenze "
-#~ "modificate più recentemente."
-
-#~ msgid "Export this news item as a Notice"
-#~ msgstr "Esporta questa notizia come Notizia"
-
-#~ msgid ""
-#~ "Go to the BOINC data directory on your computer (on Windows this is usually "
-#~ "<b>C:\\Documents and Settings\\All Users\\Application Data\\BOINC</b> or "
-#~ "<b>C:\\Program Files\\BOINC</b>."
-#~ msgstr ""
-#~ "Vai nella directory dati di BOINC sul tuo computer (su Windows è tipicamente "
-#~ "<b>C:\\Documents and Settings\\All Users\\Application Data\\BOINC</b> oppure "
-#~ "<b>C:\\Program Files\\BOINC</b>."
-
-#~ msgid "No such task"
-#~ msgstr "Lavoro non esistente"
-
-#~ msgid ""
-#~ "Computer is connected to the Internet about every %1 Leave blank or 0 if "
-#~ "always connected. %2 BOINC will try to maintain at least this much work "
-#~ "(max 10 days). %3"
-#~ msgstr ""
-#~ "Computer connesso a Internet ogni %1 Lascia in bianco o scrivi 0 se è "
-#~ "sempre connesso. %2 BOINC cercherà di mantenere abbastanza lavoro "
-#~ "(massimo 10 giorni). %3"
-
-#~ msgid "Maintain enough work for an additional"
-#~ msgstr "Mantieni abbastanza riserva di lavoro per"
-
-#~ msgid "Update failed: "
-#~ msgstr "Aggiornamento fallito"
-
-#~ msgid "Provides %1limited access%2 to your account"
-#~ msgstr "Consente un %1accesso limitato%2 al tuo account"
-
-#~ msgid ""
-#~ "Don't use this form. Just run BOINC, select Add Project, and enter an "
-#~ "email address and password."
-#~ msgstr ""
-#~ "Non usare questo modulo. Esegui BOINC, seleziona Aggiungi Progetto e "
-#~ "inserisci un indirizzo mail e una password."
-
-#~ msgid "Do not reorder sticky posts"
-#~ msgstr "Non riordinare i post offensivi"
-
-#~ msgid "If a thread contains more than this number of posts"
-#~ msgstr "Se un thread contiene più di questo numero di post"
-
-#~ msgid "only display the first one and this many of the last ones"
-#~ msgstr "visualizza solo il primo e questo numero di ultimi"
-
-#~ msgid "Your report has been recorded. Thanks you for your input."
-#~ msgstr "La tua segnalazione è stata registrata. Grazie per il tuo aiuto."
-
-#~ msgid "Search type"
-#~ msgstr "Tipo ricerca"
-
-#~ msgid "User names starting with"
-#~ msgstr "I nomi utente iniziano con"
-
-# ########################################<br /><br />
-# "Weak account key" page (weak_auth.php)
-#~ msgid ""
-#~ "Your 'weak account key' lets you link a computer to your account without "
-#~ "giving it the ability to log in to your account or to change it in any "
-#~ "way."
-#~ msgstr ""
-#~ "La tua 'chiave di accesso debole' ti permette di collegare un computer al "
-#~ "tuo account su questo progetto, senza però dargli la possibilità di "
-#~ "accedere al tuo account o di modificarlo in alcun modo."
-
-#~ msgid ""
-#~ "This mechanism works only with projects that have upgraded their server "
-#~ "software 7 Dec 2007 or later."
-#~ msgstr ""
-#~ "Questo meccanismo funziona solamente con i progetti che hanno aggiornato "
-#~ "il software dei loro server dopo il 7 dicembre 2007."
-
-#~ msgid "Your weak account key for this project is:"
-#~ msgstr "La tua chiave di accesso debole per questo progetto è:"
-
-#~ msgid ""
-#~ "To use your weak account key on a given host, find or create the 'account "
-#~ "file' for this project. This file has a name of the form "
-#~ "<b>account_PROJECT_URL.xml</b>. The account file for %1 is <b>%2</b>."
-#~ msgstr ""
-#~ "Per usare la tua chiave di accesso debole su un computer, trova o crea il "
-#~ "'file dell'account' per questo progetto. Il nome di questo file deve "
-#~ "essere del tipo: <b>account_URL_DEL_PROGETTO.xml</b>. Il file "
-#~ "dell'account per %1 è <b>%2</b>."
-
-#~ msgid "Create this file if needed. Set its contents to:"
-#~ msgstr "Crea questo file se è necessario. Inserisci i contenuti come segue:"
-
-#~ msgid ""
-#~ "Your weak account key is a function of your password. If you change your "
-#~ "password, your weak account key changes, and your previous weak account "
-#~ "key becomes invalid."
-#~ msgstr ""
-#~ "La tua chiave di accesso debole è funzione alla tua password. Se cambi la "
-#~ "password cambia anche la chiave di accesso debole invalidando quella "
-#~ "precedente."
-
-#~ msgid "Account key"
-#~ msgstr "Chiave di accesso"
-
-#~ msgid "Provides full access to your account"
-#~ msgstr "Consente un accesso completo al tuo account"
-
-#, fuzzy
-#~ msgid "Export"
-#~ msgstr "Ordina"
-
-# ########################################
-# Private messages
-#~ msgid "- private message"
-#~ msgstr "- messaggio privato"
-
-# ########################################
-# Private messages
-#~ msgid "Private message from"
-#~ msgstr "Messaggio privato da"
-
-#~ msgid "Email address verification pending"
-#~ msgstr "Verifica indirizzo email in attesa"
-
-#~ msgid "Logged in as %1."
-#~ msgstr "Autenticato come %1."
-
-#~ msgid "Log in as someone else."
-#~ msgstr "Autenticati come qualcun'altro."
-
-#~ msgid "No thread with id %1. Please check the link and try again."
-#~ msgstr "L'argomento con l'id %1 non esiste. Controlla il link e riprova."
-
-#~ msgid "Request not found"
-#~ msgstr "Richiesta non trovata"
-
-#~ msgid "%1 has added you as a friend."
-#~ msgstr "%1 ti ha aggiunto ai suoi amici."
-
-#~ msgid "Account data for %1"
-#~ msgstr "Dati dell'account di %1"
-
-#~ msgid "couldn't create message board"
-#~ msgstr "Non in grado di creare un forum di messaggi"
-
-#~ msgid "message board not found"
-#~ msgstr "Forum di messaggi non trovato."
-
-#~ msgid "no such forum"
-#~ msgstr "nessun forum"
-
-#~ msgid "unknown command %1"
-#~ msgstr "comando %1 sconosciuto"
-
-# <br> ????
-#~ msgid "ERROR: %1 does not exist!  Cannot create combo box.<br>"
-#~ msgstr "ERRORE: %1 non esiste!  La combo box non può essere creata.<br>"
-
-#~ msgid ""
-#~ "To protect the project's webpages from spam, we kindly ask you to type in "
-#~ "the two words shown in the image:<br>\n"
-#~ msgstr ""
-#~ "Per proteggere le pagine del progetto dallo spam, ti chiediamo di "
-#~ "scrivere le due parole che appaiono nell'immagine:<br>\n"
-
-#~ msgid "BOINC client version"
-#~ msgstr "versione client BOINC"
-
-#~ msgid "%1/day"
-#~ msgstr "%1/giorno"
-
-#~ msgid "(no restriction if equal)"
-#~ msgstr "(nessuna restrizione se sono uguali)"
-
-#~ msgid "percent of CPU time"
-#~ msgstr "percento del tempo CPU"
-
-#~ msgid "% of page file (swap space)"
-#~ msgstr "% del file di paging (spazio di swap)"
-
-#~ msgid "Use ATI GPU if present %1(enforced by 6.10+ clients)%2"
-#~ msgstr ""
-#~ "Usa la GPU ATI se presente %1(Si applica dalla versione 6.10+ dei "
-#~ "client)%2"
-
-#~ msgid "KB/s"
-#~ msgstr "KB/s"
-
-#~ msgid "GB disk space"
-#~ msgstr "GB di spazio su disco"
-
-#~ msgid "GB disk space free"
-#~ msgstr "GB di spazio libero su disco"
-
-#~ msgid "(no restriction)"
-#~ msgstr "(nessuna restrizione)"
-
-#~ msgid "Gbytes"
-#~ msgstr "Gbytes"
-
-#~ msgid "<p>"
-#~ msgstr "<p>"
diff --git a/locale/it_IT/BOINC-Setup.mo b/locale/it_IT/BOINC-Setup.mo
index 6044030..43ff88c 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
old mode 100755
new mode 100644
index 53868f7..92a8834
--- a/locale/it_IT/BOINC-Setup.po
+++ b/locale/it_IT/BOINC-Setup.po
@@ -1,40 +1,32 @@
 # 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: BOINC 7.4\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-11 00:19-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: it_IT\n"
+"PO-Revision-Date: 2015-02-08 21:34+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\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"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-Basepath: /Volumes/Cheer/BOINC_GIT/boinc_trunk\n"
-"X-POOTLE-MTIME: 1403880893.0\n"
-"X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: mac_installer\n"
+"Language: it_IT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: Installer.cpp:124
 #, c-format
 msgid "Sorry, this version of %s requires system 10.5 or higher."
 msgstr "Scusa, questa versione di %s richiede un sistema 10.5 o superiore."
 
-#: PostInstall.cpp:130
-#: PostInstall.cpp:1136
-#: uninstall.cpp:1618
+#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
 msgid "Yes"
 msgstr "Si"
 
-#: PostInstall.cpp:131
-#: PostInstall.cpp:1137
-#: uninstall.cpp:1619
+#: PostInstall.cpp:131 PostInstall.cpp:1137 uninstall.cpp:1619
 msgid "No"
 msgstr "No"
 
@@ -48,10 +40,7 @@ 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 ""
-"Gli utenti ai quali è permessa l'amministrazione di questo computer avranno automaticamente i permessi per avviare e controllare %s.\n"
-"\n"
-"Vuoi anche dare agli utenti non amministrativi i permessi per avviare e controllare %s in questo Mac?"
+msgstr "Gli utenti ai quali è permessa l'amministrazione di questo computer avranno automaticamente i permessi per avviare e controllare %s.\n\nVuoi anche dare agli utenti non amministrativi i permessi per avviare e controllare %s in questo Mac?"
 
 #: PostInstall.cpp:1444
 #, c-format
@@ -70,9 +59,7 @@ msgstr "Errore di permessi dopo il riavvio"
 msgid ""
 "Removal may take several minutes.\n"
 "Please be patient."
-msgstr ""
-"La rimozione può richiedere alcuni minuti.\n"
-"Si prega di attendere."
+msgstr "La rimozione può richiedere alcuni minuti.\nSi prega di attendere."
 
 #: uninstall.cpp:156
 #, c-format
@@ -80,10 +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 ""
-"Sei sicuro di voler rimuovere completamente %s dal tuo computer?\n"
-"\n"
-"Questo rimuoverà anche gli eseguibili ma non toccherà i file di dati di %s."
+msgstr "Sei sicuro di voler rimuovere completamente %s dal tuo computer?\n\nQuesto rimuoverà anche gli eseguibili ma non toccherà i file di dati di %s."
 
 #: uninstall.cpp:163
 #, c-format
@@ -103,9 +87,7 @@ msgstr "nome utente"
 msgid ""
 "Do you also want to remove VirtualBox from your computer?\n"
 "(VirtualBox was installed along with BOINC.)"
-msgstr ""
-"Vuoi anche rimuovere VirtualBox dal tuo computer?\n"
-"(VirtualBox è stato installato con BOINC.)"
+msgstr "Vuoi anche rimuovere VirtualBox dal tuo computer?\n(VirtualBox è stato installato con BOINC.)"
 
 #: uninstall.cpp:312
 #, c-format
@@ -117,23 +99,14 @@ msgid ""
 "\n"
 "for each user, the file\n"
 "\"%s\"."
-msgstr ""
-"Rimozione completata.\n"
-"\n"
-" Potresti voler rimuovere i seguenti elementi rimanenti utilizzando Finder: \n"
-"la directory \"%s\"\n"
-"\n"
-"per ogni utente, il file\n"
-"\"%s\"."
+msgstr "Rimozione completata.\n\n Potresti voler rimuovere i seguenti elementi rimanenti utilizzando Finder: \nla directory \"%s\"\n\nper ogni utente, il file\n\"%s\"."
 
 #: uninstall.cpp:840
 #, c-format
 msgid ""
 "Enter your administrator password to completely remove %s from you computer.\n"
 "\n"
-msgstr ""
-"Inserisci la tua password di amministratore per rimuovere completamente %s dal tuo computer.\n"
-"\n"
+msgstr "Inserisci la tua password di amministratore per rimuovere completamente %s dal tuo computer.\n\n"
 
 #: uninstall.cpp:1616
 msgid "Cancel"
@@ -142,24 +115,3 @@ msgstr "Annulla"
 #: uninstall.cpp:1617
 msgid "Continue..."
 msgstr "Continua..."
-
-#, c-format
-#~ msgid "Sorry, this version of %s requires system 10.4 or higher."
-#~ msgstr "Scusa, questa versione di %s richiede un sistema 10.4 o superiore."
-#~ msgid ""
-#~ "Removal completed.\n"
-#~ "\n"
-#~ " You may want to remove the following remaining items using the Finder: \n"
-#~ "\"/Library/Application Support/BOINC Data\" directory\n"
-#~ "\n"
-#~ "for each user, the file\n"
-#~ "\"/Users/[username]/Library/Preferences/BOINC Manager Preferences\"."
-#~ msgstr ""
-#~ "Rimozione completata.\n"
-#~ "\n"
-#~ "Puoi ora rimuovere i seguenti elementi rimanenti utilizzando Finder:\n"
-#~ "\"/Library/Application Support/BOINC Data\" directory\n"
-#~ "\n"
-#~ "e per ogni utente, il file\n"
-#~ "\"/Users/[username]/Library/Preferences/BOINC Manager Preferences\"."
-
diff --git a/locale/it_IT/BOINC-Web.mo b/locale/it_IT/BOINC-Web.mo
index 36b16b0..47861bd 100644
Binary files a/locale/it_IT/BOINC-Web.mo and b/locale/it_IT/BOINC-Web.mo differ
diff --git a/locale/it_IT/BOINC-Web.po b/locale/it_IT/BOINC-Web.po
old mode 100755
new mode 100644
index 15d1056..cb441d3
--- a/locale/it_IT/BOINC-Web.po
+++ b/locale/it_IT/BOINC-Web.po
@@ -1,26 +1,25 @@
 # BOINC web translation
 # Copyright (C) 2008-2009 University of California
+# 
 # This file is distributed under the same license as BOINC.
+# 
 # FileID  : $Id$
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\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-11 00:20-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: it_IT\n"
+"PO-Revision-Date: 2015-02-08 21:34+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\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"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
+"Language: it_IT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
-"X-POOTLE-MTIME: 1403881135.0\n"
-"X-Poedit-KeywordsList: tra\n"
-"X-Poedit-SearchPath-0: doc\n"
 
 #: docutil.php:21
 msgid "Search"
@@ -36,7 +35,9 @@ msgid "This page is %stranslatable%s."
 msgstr "Questa pagina %spuò essere tradotta%s."
 
 #: download.php:39
-msgid "We recommend that you also install VirtualBox, so your computer can work on science projects that require it."
+msgid ""
+"We recommend that you also install VirtualBox, so your computer can work on "
+"science projects that require it."
 msgstr "Raccomandiamo l'installazione di VirtualBox, cosicché il tuo computer possa elaborare su progetti scientifici che lo richiedono"
 
 #: download.php:41
@@ -47,14 +48,12 @@ msgstr "Leggi di più su VirtualBox."
 msgid "Download BOINC + VirtualBox"
 msgstr "Scarica BOINC + Virtualbox"
 
-#: download.php:54
-#: download.php:69
+#: download.php:54 download.php:69
 #, php-format
 msgid "for %s"
 msgstr "per %s"
 
-#: download.php:57
-#: download.php:72
+#: download.php:57 download.php:72
 #, php-format
 msgid "BOINC version %s"
 msgstr "versione BOINC %s"
@@ -64,29 +63,33 @@ msgstr "versione BOINC %s"
 msgid "VirtualBox version %s"
 msgstr "versione VirtualBox %s"
 
-# ######################################<br />
-# download.php<br />
-# ######################################<br /><br />
-# <br /><br />
-# download.php<br />
 #: download.php:67
 msgid "Download BOINC"
 msgstr "Scarica BOINC"
 
 #: download.php:123
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others."
+msgid ""
+"BOINC is a program that lets you donate your idle computer time to science "
+"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, and many others."
 msgstr "BOINC è un programma che ti permette di donare il tempo inutilizzato del tuo computer per progetti come SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, e molti altri."
 
 #: download.php:125
-msgid "After installing BOINC on your computer, you can connect it to as many of these projects as you like."
+msgid ""
+"After installing BOINC on your computer, you can connect it to as many of "
+"these projects as you like."
 msgstr "Dopo l'installazione di BOINC sul tuo computer, puoi connetterti a tutti i progetti che preferisci."
 
 #: download.php:127
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
+msgid ""
+"You may run this software on a computer only if you own the computer or have"
+" the permission of its owner."
 msgstr "Puoi eseguire questo software su un computer solo se possiedi il computer o se hai il permesso del suo padrone."
 
 #: download.php:132
-msgid "We recommend that you download BOINC from the Google Play Store or Amazon Appstore, not from here."
+msgid ""
+"We recommend that you download BOINC from the Google Play Store or Amazon "
+"Appstore, not from here."
 msgstr "Raccomandiamo che tu scarichi BOINC dal Google Play Store oppure dall'Amazon Appstore, non da qui."
 
 #: download.php:167
@@ -97,8 +100,7 @@ msgstr "Requisiti di sistema"
 msgid "Release notes"
 msgstr "Note di rilascio"
 
-#: download.php:169
-#: index.php:86
+#: download.php:169 index.php:86
 msgid "Help"
 msgstr "Aiuto"
 
@@ -120,20 +122,34 @@ msgstr "BOINC: elabora per la scienza"
 
 #: help.php:12
 #, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
+msgid ""
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who"
+" can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"through the process of installing and using BOINC; %s troubleshoot any "
+"problems you might have."
 msgstr "L'Aiuto Online di BOINC ti permette di parlare a tu per tu con utenti esperti di BOINC che possono: %s rispondere a domande su BOINC e sul calcolo distribuito volontario; %s assisterti nel processo di installazione e utilizzo di BOINC; %s risolvere eventuali problemi che tu possa avere."
 
 #: help.php:21
 #, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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."
+msgid ""
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system."
+" 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 "L'Aiuto Online BOINC si appoggia a %sSkype%s, un sistema di telefonia tramite Internet. Skype è gratis (sia il software che le chiamate).  Se non hai ancora Skype, %sscaricalo ed installalo ora%s.  Quando hai finito, ritorna su questa pagina."
 
 #: help.php:28
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
+msgid ""
+"The best way to get help is by voice, for which you need either built-in "
+"microphone and speakers or an external headset for your computer.  You can "
+"also use Skype's text-based chat system or regular email (if you don't have "
+"Skype) to communicate with Help Volunteers."
 msgstr "Il modo migliore di ricevere aiuto è via voce, e per ottenerlo è necessario che tu abbia collegati al tuo computer un microfono e delle casse, oppure delle cuffie.  Per comunicare con i Volontari dell'Aiuto Online puoi anche utilizzare la chat testuale di Skype o le email (se non hai Skype)."
 
 #: help.php:31
-msgid "Volunteers speaking several languages are available. Please select a language:"
+msgid ""
+"Volunteers speaking several languages are available. Please select a "
+"language:"
 msgstr "Sono disponibili volontari che parlano diverse lingue. Seleziona una lingua:"
 
 #: help.php:47
@@ -142,16 +158,22 @@ msgstr "Diventa un Volontario dell'Aiuto Online"
 
 #: help.php:50
 #, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
+msgid ""
+"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+"Volunteer%s.  It's a great way to help the cause of scientific research and "
+"volunteer computing - and it's fun!"
 msgstr "Se sei un utente esperto di BOINC, ti incoraggiamo a %sdiventare un Volontario dell'Aiuto Online%s.  E' molto importante per la causa della ricerca scientifica e del calcolo distribuito volontario - ed è anche divertente!"
 
 #: help.php:56
 #, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
+msgid ""
+"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
 msgstr "Se sei un Volontario dell'Aiuto Online: per modificare le tue opzioni, %sclicca qui%s."
 
 #: help_funcs.php:107
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
+msgid ""
+"BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
+"or the University of California."
 msgstr "Gli aiutanti di BOINC sono volontari non pagati. La loro consulenza non è approvata dal BOINC o dall'Università della California."
 
 #: help_funcs.php:110
@@ -186,7 +208,6 @@ msgstr "computer.\n"
 msgid "24-hour average:"
 msgstr "Media su 24 ore:"
 
-# 80%
 #: index.php:56
 msgid "PetaFLOPS."
 msgstr "PetaFLOPS."
@@ -203,9 +224,7 @@ msgstr "Utente volontario"
 msgid "Download"
 msgstr "Scarica"
 
-#: index.php:87
-#: index.php:120
-#: index.php:171
+#: index.php:87 index.php:120 index.php:171
 msgid "Documentation"
 msgstr "Documentazione"
 
@@ -218,7 +237,10 @@ msgid "Links"
 msgstr "Links"
 
 #: index.php:94
-msgid "Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:"
+msgid ""
+"Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure"
+" diseases, study global warming, discover pulsars, and do many other types "
+"of scientific research.  It's safe, secure, and easy:"
 msgstr "Usa il tempo libero del tuo computer( Windows, Mac, Linux, o Android) per curare malattie, studiare il riscaldamento globale, scoprire pulsar, e per molti altri tipi di ricerca scientifica.  È innocuo, sicuro, e facile:"
 
 #: index.php:96
@@ -235,7 +257,9 @@ msgstr "Inserisci un indirizzo email e una password."
 
 #: index.php:102
 #, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
+msgid ""
+"Or, if you run several projects, try an %saccount manager%s such as "
+"%sGridRepublic%s or %sBAM!%s. "
 msgstr "O, se supporti numerosi progetti, prova ad usare un %saccount manager%s come %sGridRepublic%s o %sBAM!%s. "
 
 #: index.php:118
@@ -247,11 +271,15 @@ msgid "Software updates"
 msgstr "Aggiornamenti del software"
 
 #: index.php:128
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving"
+" you the computing power of thousands of CPUs."
 msgstr "%1Scientifico%2: usa il BOINC per creare un %3progetto di calcolo distribuito%4 che ti da la potenza computazionale di centinaia di CPU."
 
 #: index.php:132
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
 msgstr "%1Università%2: usa il BOINC per creare un %3Centro di supercomputer virtuale del campus%4."
 
 #: index.php:137
@@ -324,7 +352,8 @@ msgstr "API per il software di terze parti (add-on)"
 
 #: index.php:217
 #, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
+msgid ""
+"Open-source software for %svolunteer computing%s and %sgrid computing%s."
 msgstr "Software open-source per il %scalcolo distribuito volontario%s e per il %sgrid computing%s."
 
 #: index.php:230
@@ -335,7 +364,6 @@ msgstr "BOINC è basato sul lavoro dell'università di Berkeley in California"
 msgid "Distributed sensing"
 msgstr "Rilevamento distribuito"
 
-# 78%
 #: projects.inc:19
 msgid "Stanford University"
 msgstr "Università di Stanford"
@@ -345,7 +373,10 @@ msgid "Seismology"
 msgstr "Sismologia"
 
 #: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
+msgid ""
+"The Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to Internet-connected computers.  You must buy a "
+"sensor to participate."
 msgstr "La Rete Quake-Catcher sviluppa la più grande rete di rilevazione sismica mondiale utilizzando sensori attaccati ai computer collegati ad internet.  Devi comprare un sensore per partecipare."
 
 #: projects.inc:27
@@ -357,23 +388,24 @@ msgid "Environmental research"
 msgstr "Ricerca ambientale"
 
 #: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
+msgid ""
+"This project is creating a free and continuously updated map of radiation "
+"levels by using sensors connected to volunteers' computers.  You must buy a "
+"sensor to participate."
 msgstr "Questo progetto crea una mappa gratuita e continuamente aggiornata dei livelli di radiazione utilizzando sensori collegati ai computer dei volontari.  Devi comprare un sensore per partecipare."
 
 #: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
+msgid ""
+"To participate in these projects you must buy a sensor and attach it to your"
+" computer."
 msgstr "Per partecipare a questi progetti devi comprare un sensore e connetterlo al tuo computer."
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
 msgstr "Scienze cognitive e intelligenza artificiale"
 
-#: projects.inc:60
-#: projects.inc:364
-#: projects.inc:408
-#: projects.inc:457
-#: projects.inc:464
-#: projects.inc:511
+#: projects.inc:60 projects.inc:364 projects.inc:408 projects.inc:457
+#: projects.inc:464 projects.inc:511
 msgid "Private"
 msgstr "Privato"
 
@@ -382,7 +414,11 @@ msgid "Artificial intelligence"
 msgstr "Intelligenza artificiale"
 
 #: projects.inc:62
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
+msgid ""
+"Parse and convert semantic nets for use in FreeHAL, an artificial "
+"intelligence that uses semantic networks, stemmers, part of speech "
+"databases, and part of speech taggers in order to imitate human behavior in "
+"conversations."
 msgstr "Analizzare e convertire reti semantiche da utilizzare in FreeHAL, un'intelligenza artificiale che utilizza reti semantiche, stemmers, parti di database linguistici, e parti di analizzatori grammaticali allo scopo di imitare il comportamento umano nelle conversazioni."
 
 #: projects.inc:69
@@ -398,7 +434,12 @@ msgid "Antimalarial drug discovery"
 msgstr "Scoperta di cure contro la malaria"
 
 #: projects.inc:84
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
+msgid ""
+"The parasite that causes malaria continues to evolve resistance to available"
+" medication. We therefore urgently need to discover new drugs to replace "
+"existing drugs. Importantly, these new drugs need to target NEW proteins in "
+"the parasite. The FightMalaria at Home project is aimed at finding these new "
+"targets."
 msgstr "Il parassita che causa la malaria continua a sviluppare resistenza alle cure disponibili. Abbiamo quindi urgenza di scoprire nuove cure che rimpiazzino quelle esistenti. Cosa importante, queste cure devono avere come destinazione le NUOVE proteine del parassita. Il progetto FightMalaria at Home serve a trovare queste nuove destinazioni."
 
 #: projects.inc:90
@@ -410,7 +451,12 @@ msgid "Protein structure prediction"
 msgstr "Predizione della struttura delle proteine"
 
 #: projects.inc:92
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
+msgid ""
+"POEM at HOME uses a computational approach to predict the biologically active "
+"structure of proteins, to understand the signal-processing mechanisms when "
+"the proteins interact with one another, to understand diseases related to "
+"protein malfunction or aggregation, and to develop new drugs on the basis of"
+" the three-dimensions structure of biologically important proteins."
 msgstr "POEM at HOME usa un approccio computazionale per prevedere la struttura biologicamente attiva delle proteine, per comprendere i meccanismi di elaborazione del segnale quando le proteine interagiscono le une con le altre, per comprendere le malattie relative al malfunzionamento o all'aggregazione delle proteine, e sviluppare nuovi farmaci sulla base della struttura tridimensionale delle proteine biologicamente importanti."
 
 #: projects.inc:98
@@ -422,7 +468,11 @@ msgid "Study of protein - ligand interactions"
 msgstr "Studio delle interazioni proteina - ligando"
 
 #: projects.inc:100
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
+msgid ""
+"Docking at Home has both bioscience and computer science goals. The project "
+"aims to further knowledge of the atomic details of protein-ligand "
+"interactions and, by doing so, will search for insights into the discovery "
+"of novel pharmaceuticals."
 msgstr "Docking at Home persegue obiettivi sia nell'ambito della biotecnologia che dell'informatica. Lo scopo del progetto è quello di incrementare la conoscenza delle interazioni proteina-ligando su scala atomica e, di conseguenza, ricercare intuizioni utili alla scoperta di nuovi farmaci."
 
 #: projects.inc:114
@@ -434,7 +484,11 @@ msgid "Molecular simulations of proteins"
 msgstr "Simulazioni molecolari di proteine"
 
 #: projects.inc:116
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
+msgid ""
+"GPUGrid.net opens novel computational scenarios by the first full-atom "
+"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
+"New biomedical applications suddenly become possible giving a new role to "
+"computational biology for biomedical research."
 msgstr "GPUGrid.net apre nuovi scenari computazionali grazie al primo codice di dinamica molecolare esteso a tutti gli atomi (CellMD) appositamente ottimizzato per girare sulle GPU NVIDIA. Di colpo diventano possibili nuove applicazioni biomediche le quali conferiscono un nuovo ruolo alla biologia computazionale per la ricerca biomedica."
 
 #: projects.inc:122
@@ -446,11 +500,15 @@ msgid "Genetic linkage analysis"
 msgstr "Analisi di connessioni genetiche"
 
 #: projects.inc:124
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
+msgid ""
+"Superlink at Technion helps geneticists all over the world find disease-"
+"provoking genes causing some types of diabetes, hypertension (high blood "
+"pressure), cancer, schizophrenia and many others."
 msgstr "Superlink at Technion aiuta i genetisti di tutto il mondo a trovare geni che provocano disfunzioni quali ipertensione (elevata pressione sangiugna), alcuni tipi di diabete, cancro, schizofrenia e molte altre."
 
 #: projects.inc:138
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
+msgid ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
 msgstr "Centro per la bioinformatica e la biologia computazionale dell'Università del Maryland"
 
 #: projects.inc:139
@@ -458,7 +516,11 @@ msgid "Life science research"
 msgstr "Scienze naturali"
 
 #: projects.inc:140
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
+msgid ""
+"The Lattice Project supplies computing power to scientists at the University"
+" of Maryland studying evolutionary relationships based on DNA sequence data;"
+" bacterial, plasmid, and virus protein sequences; and biological diversity "
+"in nature reserves. "
 msgstr "The Lattice Project fornisce potenza di calcolo agli scienziati dell'Università del Maryland che studiano relazioni evoluzionistiche basate su dati di sequenze di DNA, su sequenze proteiche di batteri, plasmidi e virus, e sulla diversità biologica nelle aree naturali protette."
 
 #: projects.inc:146
@@ -470,20 +532,32 @@ msgid "Epidemiology"
 msgstr "Epidemiologia"
 
 #: projects.inc:148
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
+msgid ""
+"Simulation models of the transmission dynamics and health effects of malaria"
+" are an important tool for malaria control. They can be used to determine "
+"optimal strategies for delivering mosquito nets, chemotherapy, or new "
+"vaccines which are currently under development and testing.  Such modeling "
+"is extremely computer intensive, requiring simulations of large human "
+"populations with a diverse set of parameters related to biological and "
+"social factors that influence the distribution of the disease. "
 msgstr "I modelli di simulazione delle dinamiche di trasmissione della malaria e dei suoi effetti sulla salute sono un importante strumento per il controllo della malaria. Essi possono essere usati per determinare le strategie ottimali nella distribuzione di zanzariere, chemioterapie o nuovi vaccini in via di sviluppo e sperimentazione. Tale modellazione è estremamente intensiva dal punto di vista computazionale, dato che richiede la simulazione di popolazioni umane con un diverso gruppo [...]
 
 #: projects.inc:170
 msgid "University of Washington"
 msgstr "Università di Washington"
 
-#: projects.inc:171
-#: projects.inc:179
+#: projects.inc:171 projects.inc:179
 msgid "Biology"
 msgstr "Biologia"
 
 #: projects.inc:172
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
+msgid ""
+"Determine the 3-dimensional shapes of proteins in research that may "
+"ultimately lead to finding cures for some major human diseases. By running "
+"Rosetta at home you will help us speed up and extend our research in ways we "
+"couldn't possibly attempt without your help. You will also be helping our "
+"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
+"Cancer, and Alzheimer's"
 msgstr "Determina la struttura tridimensionale delle proteine in una ricerca che potrebbe alla fine portare alla scoperta di cure per le maggiori malattie del genere umano. Lavorando per Rosetta at home aiuterai a velocizzare ed estendere la nostra ricerca in modi che senza il tuo aiuto non sarebbero possibili. Aiuterai anche i nostri sforzi nel progettare nuove proteine per combattere malattie come l'HIV, la malaria, il cancro, e l'Alzheimer."
 
 #: projects.inc:178
@@ -491,7 +565,10 @@ msgid "University of Vienna"
 msgstr "Università di Vienna"
 
 #: projects.inc:180
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
+msgid ""
+"Calculate similarities between proteins. SIMAP provides a public database of"
+" the resulting data, which plays a key role in many bioinformatics research "
+"projects."
 msgstr "Calcolare similitudini tra proteine. Il SIMAP fornisce un database pubblico dei dati risultanti, il quale gioca un ruolo chiave in molti progetti di ricerca bioinformatica. "
 
 #: projects.inc:186
@@ -507,7 +584,15 @@ msgid "Climate study"
 msgstr "Studi climatici"
 
 #: projects.inc:200
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
+msgid ""
+"Investigate the approximations that have to be made in state-of-the-art "
+"climate models. By running the model thousands of times we hope to find out "
+"how the model responds to slight tweaks to these approximations - slight "
+"enough to not make the approximations any less realistic. This will allow us"
+" to improve our understanding of how sensitive our models are to small "
+"changes and also to things like changes in carbon dioxide and the sulphur "
+"cycle. This will allow us to explore how climate may change in the next "
+"century under a wide range of different scenarios."
 msgstr "Investigare le approssimazioni che devono essere fatte allo stato dell'arte dei modelli climatici. Eseguendo l'elaborazione del modello migliaia di volte contiamo di scoprire in che modo esso risponda a piccole variazioni di queste approssimazioni - sufficientemente piccole da non far diventare le approssimazioni meno realistiche. Questo ci consentirà di migliorare la nostra comprensione di quanto sensibili siano i nostri modelli a piccoli cambiamenti, ed anche ad aspetti quali i [...]
 
 #: projects.inc:207
@@ -519,39 +604,56 @@ msgid "Mechanical engineering"
 msgstr "Ingegneria meccanica"
 
 #: projects.inc:214
-msgid "Currently we are calculating the optimum design of a structure call the 52 bar truss"
+msgid ""
+"Currently we are calculating the optimum design of a structure call the 52 "
+"bar truss"
 msgstr "Al momento stiamo calcolando il design migliore per una struttura con 52 barre di traliccio"
 
-#: projects.inc:224
-#: projects.inc:263
-#: projects.inc:271
+#: projects.inc:224 projects.inc:263 projects.inc:271
 msgid "Astronomy"
 msgstr "Astronomia"
 
 #: projects.inc:225
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
+msgid ""
+"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
+"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
+"Universe. We will measure physical parameters (such as stellar mass surface "
+"density, star formation rate surface density, attenuation, and first-order "
+"star formation history) on a resolved pixel-by-pixel basis using spectral "
+"energy distribution (SED) fitting techniques in a distributed computing "
+"mode."
 msgstr "Combineremo la copertura di spettro di GALEX, Pan-STARRS1, e WISE per generare un atlante dell'universo grazie ad un raggio ottico UV-NIR multi lunghezza. Misureremo i parametri fisici (come la densità della superficie della massa stellare, il tasso di formazione della densità di una stella, l'attenuazione, e il primo ordine di stelle formate nella storia) su una base risolta pixel per pixel utilizzando la distribuzione di energia spettrale (SED) con tecniche di calcolo distribuito."
 
 #: projects.inc:247
 msgid "University of Texas at Austin"
 msgstr "Università del Texas di Austin"
 
-#: projects.inc:248
-#: projects.inc:279
+#: projects.inc:248 projects.inc:279
 msgid "Chemistry"
 msgstr "Chimica"
 
 #: projects.inc:249
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
+msgid ""
+"A common problem in theoretical chemistry, condensed matter physics and "
+"materials science is the calculation of the time evolution of an atomic "
+"scale system where, for example, chemical reactions and/or diffusion occur. "
+"Generally the events of interest are quite rare (many orders of magnitude "
+"slower than the vibrational movements of the atoms), and therefore direct "
+"simulations, tracking every movement of the atoms, would take thousands of "
+"years of computer calculations on the fastest present day computer before a "
+"single event of interest can be expected to occur.  Our research group is "
+"interested in calculating the long time dynamics of systems."
 msgstr "Un problema comune nella chimica teorica, nella fisica della materia condensata e nella scienza dei materiali è il calcolo del tempo di evoluzione di un sistema su scala atomica dove, ad esempio, avvengano reazioni chimiche e/o di diffusione. Generalmente, gli eventi di interesse sono abbastanza rari (molti ordini di grandezza più lenti rispetto ai movimenti vibrazionali degli atomi), e quindi simulazioni dirette, che traccino ogni movimento degli atomi, richiederebbero migliaia  [...]
 
-# 95%
 #: projects.inc:262
 msgid "University of Illinois at Urbana-Champaign"
 msgstr "Università dell'Illinois di Urbana-Champaign"
 
 #: projects.inc:264
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
+msgid ""
+"The goal of Cosmology at Home is to search for the model that best describes "
+"our Universe and to find the range of models that agree with the available "
+"astronomical particle physics data."
 msgstr "L'obiettivo di Cosmology at Home è di cercare il modello che meglio descrive il nostro Universo e trovare l'intervallo di modelli che concordano con i dati disponibili dalla fisica delle particelle astronomiche."
 
 #: projects.inc:270
@@ -559,7 +661,10 @@ msgid "Rensselaer Polytechnic Institute"
 msgstr "Rensselaer Polytechnic Institute"
 
 #: projects.inc:272
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
+msgid ""
+"The goal of Milkyway at Home is to create a highly accurate three dimensional "
+"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
+"Survey."
 msgstr "L'obiettivo di Milkyway at Home è di creare un modello tridimensionale più accurato possibile della Via Lattea usando i dati raccolti dal Sloan Digital Sky Survey."
 
 #: projects.inc:278
@@ -567,7 +672,13 @@ msgid "Leiden University, The Netherlands"
 msgstr "Università di Leiden, Paesi Bassi"
 
 #: projects.inc:280
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
+msgid ""
+"Surface science calculations using Classical Dynamics.  Leiden Classical "
+"allows volunteers, students and other scientist to submit their personal "
+"calculations to the grid. Each user has his own personal queue for Classical"
+" Dynamics jobs. In this way students have used the grid to simulate liquid "
+"argon, or to test the validity of the ideal gas law by actually doing the "
+"simulations through the grid."
 msgstr "Calcoli relativi alla scienza delle superfici utilizzando la Dinamica Classica. Leiden Classical permette a volontari, studenti e altri scienziati di inserire le proprie elaborazioni nella grid. Ogni utente ha la sua coda personale per le attività di Dinamica Classica. In questo modo gli studenti hanno utilizzato la grid per simulare l'argon liquido, o per testare la validità della legge dei gas ideali (equazione di stato dei gas perfetti) effettuando le simulazioni tramite la grid."
 
 #: projects.inc:294
@@ -579,25 +690,36 @@ msgid "Astrophysics"
 msgstr "Astrofisica"
 
 #: projects.inc:296
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
+msgid ""
+"Search for spinning neutron stars (also called pulsars) using data from the "
+"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
+"observatory.  Einstein at Home is a World Year of Physics 2005 project "
+"supported by the American Physical Society (APS) and by a number of "
+"international organizations."
 msgstr "Cercare stelle di neutroni rotanti (dette anche pulsar) usando i dati dai rivelatori di onde gravitazionali LIGO e GEO, e dal radiotelescopio di Arecibo. Einstein at Home è un progetto dell'Anno Mondiale della Fisica 2005, supportato dall'American Physical Society (APS) e da un certo numero di organizzazioni internazionali."
 
-#: projects.inc:310
-#: projects.inc:318
+#: projects.inc:310 projects.inc:318
 msgid "CERN (European Organization for Nuclear Research)"
 msgstr "CERN (Organizzazione Europea per la Ricerca Nucleare)"
 
-#: projects.inc:311
-#: projects.inc:319
+#: projects.inc:311 projects.inc:319
 msgid "Physics"
 msgstr "Fisica"
 
 #: projects.inc:312
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
+msgid ""
+"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
+"European Organization for Nuclear Research, the world's largest particle "
+"physics laboratory.  It is the most powerful instrument ever built to "
+"investigate on particles proprieties. LHC at home runs simulations to improve "
+"the design of LHC and its detectors."
 msgstr "Il Large Hadron Collider (LHC) è un acceleratore di particelle sito al CERN, l'Organizzazione Europea per la Ricerca Nucleare, il più grande laboratorio di fisica delle particelle del mondo. Esso è il più potente strumento mai costruito per investigare le proprietà delle particelle. LHC at home elabora simulazioni per migliorare la progettazione di LHC e dei suoi rivelatori."
 
 #: projects.inc:320
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
+msgid ""
+"This project uses CERN-developed virtual machine technology for full-fledged"
+" LHC event physics simulation on volunteer computers.  Requires that you "
+"install VirtualBox on your computer"
 msgstr "Questo progetto usa la macchina virtual sviluppata dal CERN per simulare gli eventi fisici dell'LHC sui computer dei volontari.  Richiede che venga installato VirtualBox sul tuo computer"
 
 #: projects.inc:326
@@ -609,7 +731,12 @@ msgid "Astrophysics, astrobiology"
 msgstr "Astrofisica, astrobiologia"
 
 #: projects.inc:328
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
+msgid ""
+"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
+"goal is to detect intelligent life outside Earth. One approach, known as "
+"radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
+"signals from space. Such signals are not known to occur naturally, so a "
+"detection would provide evidence of extraterrestrial technology."
 msgstr "SETI (Search for Extraterrestrial Intelligence, ricerca di intelligenza extraterrestre) è un'area scientifica il cui obiettivo è rilevare vita intelligente al di fuori della Terra. Uno degli approcci, noto come SETI radio, utilizza radiotelescopi per ascoltare segnali radio a banda stretta provenienti dallo spazio. È noto che tali segnali non sono di origine naturale, quindi la loro rilevazione fornirebbe prova di tecnologia extraterrestre."
 
 #: projects.inc:342
@@ -621,7 +748,11 @@ msgid "Chemical engineering and nanotechnology"
 msgstr "Ingegneria chimica e nanotecnologia"
 
 #: projects.inc:344
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
+msgid ""
+"The study of molecular magnets and controlled nanoscale magnetism.  These "
+"magnetic molecules may be used to develop tiny magnetic switches, with "
+"applications in medicine (such as local tumor chemotherapy) and "
+"biotechnology."
 msgstr "Studio di magneti molecolari e del magnetismo controllato su scala nanometrica. Tali molecole magnetiche potrebbero essere usate per sviluppare minuscoli interruttori magnetici, con applicazioni in medicina (come chemioterapia locale) e biotecnologia."
 
 #: projects.inc:351
@@ -637,7 +768,10 @@ msgid "Physics, biochemistry, and others"
 msgstr "Fisica, biochimica, ed altre"
 
 #: projects.inc:358
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
+msgid ""
+"The objective of CAS at home is to encourage and assist scientists in China to "
+"adopt the technologies of volunteer computing and volunteer thinking for "
+"their research."
 msgstr "L'obiettivo di CAS at home è di incoraggiare ed assistere gli scienziati cinesi ad adottare le tecnologie del calcolo distribuito volontario pensando alle loro ricerche."
 
 #: projects.inc:365
@@ -645,11 +779,12 @@ msgid "Mathematics, physics, evolution"
 msgstr "Matematica, fisica, evoluzione"
 
 #: projects.inc:366
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
+msgid ""
+"Yoyo at home is an adapter between BOINC and several existing volunteer "
+"computing projects: ECM, Muon, Evolution at home, and distributed.net"
 msgstr "Yoyo at home è un adattatore tra BOINC e vari altri progetti di calcolo volontario esistenti: ECM, Muon, Evolution at home, e distributed.net"
 
-#: projects.inc:371
-#: projects.inc:527
+#: projects.inc:371 projects.inc:527
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 msgstr "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 
@@ -658,7 +793,11 @@ msgid "European research projects"
 msgstr "Progetti di ricerca europei"
 
 #: projects.inc:373
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
+msgid ""
+"The EDGeS at Home Beta project integrates volunteer computing into the service "
+"grid network of Europe by allowing service grids to send workunits to be "
+"processed by the volunteers of this project. The scientific projects covered"
+" by the project include math, physics, biology, etc."
 msgstr "Il progetto EDGeS at Home Beta integra il calcolo volontario nella network service grid europea permettendo ad essa di inviare unità di lavoro da far elaborare ai volontari di questo progetto. I progetti scientifici coperti dal progetto includono matematica, fisica, biologia, ecc."
 
 #: projects.inc:379
@@ -682,7 +821,11 @@ msgid "Medical, environmental and other humanitarian research"
 msgstr "Medica, dell'ambiente e altre ricerche umanitarie"
 
 #: projects.inc:389
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
+msgid ""
+"To further critical non-profit research on some of humanity's most pressing "
+"problems by creating the world's largest volunteer computing grid.  Research"
+" includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"clean water and many more."
 msgstr "Per ulteriori ricerche critiche non profit su alcuni dei problemi importanti dell'umanità creando la più grande rete mondiale di calcolo distribuito.  Le ricerche includono HIV-AIDS, cancro, malattie tropicali e dimenticate, energia solare, acqua pulita e molte altre."
 
 #: projects.inc:395
@@ -701,21 +844,18 @@ msgstr "Matematica, Fisica, Intelligenza Artificiale"
 msgid "Simulation of quantum computing; Goldbach's conjecture."
 msgstr "Simulazione dell'elaborazione quantica; congettura di Goldbach."
 
-#: projects.inc:450
-#: projects.inc:458
+#: projects.inc:450 projects.inc:458
 msgid "Cryptography"
 msgstr "Crittografia"
 
 #: projects.inc:459
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
+msgid ""
+"Attempt to decode 3 original Enigma messages. The signals were intercepted "
+"in the North Atlantic in 1942 and are believed to be unbroken."
 msgstr "Tentare di decodificare 3 messaggi Enigma originali. I segnali vennero intercettati nell'Atlantico del nord nel 1942 e si crede siano intatti."
 
-#: projects.inc:465
-#: projects.inc:504
-#: projects.inc:512
-#: projects.inc:520
-#: projects.inc:528
-#: projects.inc:568
+#: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
+#: projects.inc:528 projects.inc:568
 msgid "Mathematics"
 msgstr "Matematica"
 
@@ -732,11 +872,19 @@ msgid "Factorization of large integers"
 msgstr "Fattorizzazione di grandi numeri interi"
 
 #: projects.inc:473
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
+msgid ""
+"NFS at Home is a research project that uses Internet-connected computers to do "
+"the lattice sieving step in the Number Field Sieve factorization of large "
+"integers. As a young school student, you gained your first experience at "
+"breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
+"NFS at Home is a continuation of that experience, only with integers that are "
+"hundreds of digits long."
 msgstr "NFS at Home è un progetto di ricerca che utilizza computer connessi ad Internet per effettuare l'iterazione del crivello di reticoli (lattice sieving) nella fattorizzazione di grandi interi con il metodo del crivello dei campi di numeri. Da giovane studente, hai fatto la tua prima esperienza di scomporre un intero in fattori primi, ad esempio 15 = 3 * 5 oppure 35 = 5 * 7. NFS at Home è una continuazione di quell'esperienza, solo con interi lunghi centinaia di cifre."
 
 #: projects.inc:479
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
+msgid ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
 msgstr "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
 
 #: projects.inc:480
@@ -744,7 +892,11 @@ msgid "Software testing"
 msgstr "Testing del software"
 
 #: projects.inc:481
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
+msgid ""
+"The aim of this project is to provide a powerful distributed computing "
+"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
+"well as others Lithuanian academic institutions.  Current applications "
+"involve the study of Monte-Carlo based software testing."
 msgstr "Lo scopo di questo progetto è di dare una piattaforma di calcolo distribuito molto potente agli scienziati del Vilnius Gediminas Technical University (VGTU) e ad altre università della Lituania. Le applicazioni correnti riguardano lo studio delle applicazioni basate sul software Monte-Carlo."
 
 #: projects.inc:503
@@ -752,11 +904,20 @@ msgid "Mathematical Institute of Leiden University / Kennislink"
 msgstr "Mathematical Institute of Leiden University / Kennislink"
 
 #: projects.inc:505
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
+msgid ""
+"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
+"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
+"product of the distinct prime factors of n. The ABC conjecture says that "
+"there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for "
+"any real h > 1. The ABC conjecture is currently one of the greatest open "
+"problems in mathematics. If it is proven to be true, a lot of other open "
+"problems can be answered directly from it."
 msgstr "Cercare 'triplette abc': interi positivi a,b,c tali che a+b=c, a < b < c, a,b,c non abbiano divisori comuni e c > rad(abc), dove rad(n) è il prodotto dei fattori primi distinti di n. La congettura ABC afferma che esiste solamente un insieme finito a,b,c tale che log(c)/log(rad(abc)) > h per qualunque numero reale h > 1. La congettura ABC è attualmente uno dei più grandi problemi aperti della matematica. Se venisse provata, molti altri problemi aperti verrebbero risolti dire [...]
 
 #: projects.inc:513
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
+msgid ""
+"Primegrid has multiple projects searching for different forms of very large "
+"prime numbers, including searching for the largest known prime number."
 msgstr "Primegrid ha progetti multipli che cercano differenti forme di grandi numeri primi, inclusa la ricerca del più grande numero primo conosciuto."
 
 #: projects.inc:519
@@ -764,14 +925,17 @@ msgid "Hochschule RheinMain University of Applied Sciences"
 msgstr "Hochschule RheinMain University of Applied Sciences"
 
 #: projects.inc:521
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
+msgid ""
+"Search for counterexamples to two conjectures related to the identification "
+"of prime numbers"
 msgstr "Cercare controesempi a due congetture riguardanti l'identificazione di numeri primi"
 
 #: projects.inc:529
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
+msgid ""
+"Find all the generalized binary number systems (in which bases are matrices "
+"and digits are vectors) up to dimension 11."
 msgstr "Trovare tutti i sistemi generalizzati di numeri binari (nei quali le basi sono matrici e le cifre sono vettori) fino a dimensione 11."
 
-# 87%
 #: ../html/inc/news.inc:40
 msgid "Comment"
 msgstr "Commenta"
@@ -780,460 +944,3 @@ msgstr "Commenta"
 #, php-format
 msgid "News is available as an %sRSS feed%s"
 msgstr "Le news sono disponibili come %sRSS feed%s"
-
-#~ msgid "Download BOINC + Virtualbox"
-#~ msgstr "Scarica BOINC + Virtualbox"
-
-#, php-format
-#~ msgid "%s for %s (%s MB)"
-#~ msgstr "%s per %s (%s MB)"
-#~ msgid ""
-#~ "BOINC is a program that lets you donate your idle computer time to science "
-#~ "projects like SETI at home, Climateprediction.net, Rosetta at home, World "
-#~ "Community Grid, and many others. <p> After installing BOINC on your "
-#~ "computer, you can connect it to as many of these projects as you like."
-#~ msgstr ""
-#~ "BOINC è un programma che permette di donare il tempo in cui il computer non "
-#~ "lavora a progetti come SETI at home, Climateprediction.net, Rosetta at home, World "
-#~ "Community Grid, e molti altri. <p> Dopo l'installazione di BOINC sul tuo "
-#~ "computer, puoi connetterlo a quanti progetti vuoi."
-
-# 75%
-#~ msgid "Astronomy, Physics, and Chemistry"
-#~ msgstr "Astronomia, Fisica e Chimica"
-#~ msgid "Browser default"
-#~ msgstr "Pagina di default del browser"
-#, php-format
-#~ msgid ""
-#~ " Use the idle time on your computer (Windows, Mac, or Linux) to cure "
-#~ "diseases, study global warming, discover pulsars, and do many other types of "
-#~ "scientific research.  It's safe, secure, and easy:  %sChoose%s projects  "
-#~ "%sDownload%s and run BOINC software  %sEnter%s an email address and "
-#~ "password. "
-#~ msgstr ""
-#~ " Usa il tempo di inattività del tuo computer (Windows, Mac o Linux) per "
-#~ "curare malattie, studiare il riscaldamento globale, scoprire pulsar e fare "
-#~ "molti altri tipi di ricerche scientifiche.  E' sicuro, garantito e facile:  "
-#~ "%sScegli%s i progetti  %sScarica%s e lancia il software BOINC  %sInserisci%s "
-#~ "un indirizzo email e una password. "
-#~ msgid "FreeHAL"
-#~ msgstr "FreeHAL"
-#~ msgid "private"
-#~ msgstr "privato"
-#~ msgid "POEM at HOME"
-#~ msgstr "POEM at HOME"
-#~ msgid "Docking at Home"
-#~ msgstr "Docking at Home"
-#~ msgid "GPUGrid.net"
-#~ msgstr "GPUGrid.net"
-#~ msgid "Superlink at Technion"
-#~ msgstr "Superlink at Technion"
-#~ msgid "The Lattice Project"
-#~ msgstr "The Lattice Project"
-#~ msgid "Malariacontrol.net"
-#~ msgstr "Malariacontrol.net"
-#~ msgid "Rosetta at home"
-#~ msgstr "Rosetta at home"
-#~ msgid "SIMAP"
-#~ msgstr "SIMAP"
-#~ msgid "Virtual Prairie"
-#~ msgstr "Virtual Prairie"
-#~ msgid "University of Houston"
-#~ msgstr "Università di Houston"
-#~ msgid "Study of botanical ecosystems"
-#~ msgstr "Studio di ecosistemi botanici"
-#~ msgid ""
-#~ "Provide ecological guidelines on the design of prairies with the best "
-#~ "potential for water purification."
-#~ msgstr ""
-#~ "Fornire linee guida ecologiche nella progettazione di praterie con il "
-#~ "miglior potenziale di purificazione dell'acqua."
-#~ msgid "Climateprediction.net"
-#~ msgstr "Climateprediction.net"
-#~ msgid "Astronomy/Physics/Chemistry"
-#~ msgstr "Astronomia/Fisica/Chimica"
-#~ msgid "eOn"
-#~ msgstr "eOn"
-#~ msgid "Orbit at home"
-#~ msgstr "Orbit at home"
-#~ msgid "Planetary Science Institute"
-#~ msgstr "Istituto di Scienza Planetaria"
-#~ msgid "Monitor and study the hazard posed by near-Earth asteroids"
-#~ msgstr ""
-#~ "Monitorare e studiare il pericolo rappresentato da asteroidi vicini alla "
-#~ "Terra"
-#~ msgid "Cosmology at Home"
-#~ msgstr "Cosmology at Home"
-#~ msgid "University of Illinois at Urbana-Chamapign"
-#~ msgstr "Università dell'Illinois di Urbana-Champign"
-#~ msgid "Milkyway at home"
-#~ msgstr "Milkyway at home"
-#~ msgid "Leiden Classical"
-#~ msgstr "Leiden Classical"
-#~ msgid "uFluids at home"
-#~ msgstr "uFluids at home"
-#~ msgid "Purdue University"
-#~ msgstr "Università di Purdue"
-#~ msgid "Physics/Aeronautics"
-#~ msgstr "Fisica/Aeronautica"
-#~ msgid ""
-#~ "The uFluids project simulates two-phase fluid behavior in microgravity "
-#~ "and microfluidics problems. Our goal is to design better satellite "
-#~ "propellant management devices and address two-phase flow in microchannel "
-#~ "and MEMS devices."
-#~ msgstr ""
-#~ "Il progetto uFluids simula il comportamento di fluidi bifase in "
-#~ "condizioni di microgravità e in problemi di microfluidica. Il nostro "
-#~ "obiettivo è quello di progettare migliori sistemi di gestione del "
-#~ "propellente nei satelliti e di occuparsi dello studio del flusso bifase "
-#~ "nei microcanali e nei dispositivi MEMS."
-#~ msgid "Einstein at home"
-#~ msgstr "Einstein at home"
-#~ msgid "LHC at home"
-#~ msgstr "LHC at home"
-#~ msgid "SETI at home"
-#~ msgstr "SETI at home"
-#~ msgid "Quantum Monte Carlo at Home"
-#~ msgstr "Quantum Monte Carlo at Home"
-#~ msgid "University of Muenster (Germany)"
-#~ msgstr "Università di Münster (Germania)"
-#~ msgid ""
-#~ "Study the structure and reactivity of molecules using Quantum Chemistry."
-#~ msgstr ""
-#~ "Studiare la struttura e la reattività delle molecole usando la Chimica "
-#~ "Quantistica."
-#~ msgid "Spinhenge at home"
-#~ msgstr "Spinhenge at home"
-#~ msgid "CAS at home"
-#~ msgstr "CAS at home"
-#~ msgid "Yoyo at home"
-#~ msgstr "Yoyo at home"
-#~ msgid "EDGeS at Home"
-#~ msgstr "EDGeS at Home"
-#~ msgid "Ibercivis"
-#~ msgstr "Ibercivis"
-#~ msgid "World Community Grid"
-#~ msgstr "World Community Grid"
-#~ msgid "IBM Corporate Community Relations"
-#~ msgstr "IBM Corporate Community Relations"
-#~ msgid "Humanitarian research on disease, natural disasters and hunger."
-#~ msgstr "Ricerca umanitaria su malattie, disastri naturali e fame."
-#~ msgid ""
-#~ "To further critical non-profit research on some of humanity's most "
-#~ "pressing problems by creating the world's largest volunteer computing "
-#~ "grid.  Research includes HIV/AIDS, cancer, muscular dystrophy, dengue "
-#~ "fever, and many more."
-#~ msgstr ""
-#~ "Promuovere ricerca cruciale e non-profit su alcuni dei problemi più "
-#~ "pressanti dell'umanità, creando la più grande rete di calcolo volontario "
-#~ "del mondo. La ricerca include HIV/AIDS, cancro, distrofia muscolare, "
-#~ "dengue, e molto altro."
-#~ msgid "Enigma at Home"
-#~ msgstr "Enigma at Home"
-#~ msgid "Collatz Conjecture"
-#~ msgstr "Collatz Conjecture"
-#~ msgid "NFS at home"
-#~ msgstr "NFS at home"
-#~ msgid "VTU at home"
-#~ msgstr "VTU at home"
-#~ msgid "AQUA at home"
-#~ msgstr "AQUA at home"
-#~ msgid "D-Wave Systems, Inc."
-#~ msgstr "D-Wave Systems, Inc."
-#~ msgid "Quantum computing"
-#~ msgstr "Calcolo quantistico"
-#~ msgid ""
-#~ "D-Wave's AQUA (Adiabatic QUantum Algorithms) is a research project whose "
-#~ "goal is to predict the performance of superconducting adiabatic quantum "
-#~ "computers on a variety of hard problems arising in fields ranging from "
-#~ "materials science to machine learning. AQUA at home uses Internet-connected "
-#~ "computers to help design and analyze quantum computing algorithms, using "
-#~ "Quantum Monte Carlo techniques."
-#~ msgstr ""
-#~ "AQUA (Adiabatic QUantum Algorithms, algoritmi quantistici adiabatici) di "
-#~ "D-Wave è un progetto di ricerca il cui obiettivo è quello di predire le "
-#~ "prestazioni dei computer quantistici adiabatici superconduttivi su una "
-#~ "varietà di problemi difficili che emergono in settori che vanno dalla "
-#~ "scienza dei materiali all'apprendimento automatico (machine learning). "
-#~ "AQUA at home utilizza computer connessi ad Internet per aiutare nella "
-#~ "progettazione e nell'analisi di algoritmi di calcolo quantistico, "
-#~ "utilizzando tecniche di tipo Monte Carlo Quantistico."
-#~ msgid "ABC at home"
-#~ msgstr "ABC at home"
-#~ msgid "PrimeGrid"
-#~ msgstr "PrimeGrid"
-#~ msgid ""
-#~ "Primegrid is generating a public sequential prime number database, and is "
-#~ "searching for large twin primes of the form k*2<sup>n</sup>+1 and "
-#~ "k*2<sup>n</sup>-1"
-#~ msgstr ""
-#~ "Primegrid sta generando un database pubblico sequenziale di numeri primi, "
-#~ "e sta cercando coppie di primi molto grandi aventi la forma k*2<sup>n</"
-#~ "sup>+1 e k*2<sup>n</sup>-1"
-#~ msgid "primaboinca"
-#~ msgstr "primaboinca"
-#~ msgid "SZTAKI Desktop Grid"
-#~ msgstr "SZTAKI Desktop Grid"
-#~ msgid "Chess960 at home"
-#~ msgstr "Chess960 at home"
-#~ msgid "Chess-960.org"
-#~ msgstr "Chess-960.org"
-#~ msgid "Game-playing"
-#~ msgstr "Gioco"
-#~ msgid ""
-#~ "This project studies Chess 960, a variant of orthodox chess. In classical "
-#~ "chess the starting position of the game never changes.  In Chess 960, "
-#~ "just before the start of every game, the initial configuration of the "
-#~ "chess pieces is determined randomly."
-#~ msgstr ""
-#~ "Questo progetto studia Chess 960, una variante degli scacchi classici. "
-#~ "Negli scacchi classici la posizione di partenza del gioco non cambia mai. "
-#~ "In Chess 960, subito prima dell'inizio di ogni partita, la configurazione "
-#~ "iniziale delle pedine degli scacchi è determinata casualmente."
-#~ msgid "The current release is known to work with these Linux versions:"
-#~ msgstr "La versione corrente funziona con queste versioni di Linux:"
-#~ msgid ""
-#~ "For other Linux versions, check if a BOINC package is offered by your "
-#~ "Linux distribution."
-#~ msgstr ""
-#~ "Per altre versioni di Linux, controlla se il pacchetto del BOINC è "
-#~ "offerto dalla tua distribuzione di Linux."
-#~ msgid ""
-#~ "Alternatively, download the %1BOINC client for older Linux versions%2. "
-#~ "This doesn't have a graphical interface, but it should work on all Linux "
-#~ "systems, both x86 and x64."
-#~ msgstr ""
-#~ "In alternativa, scarica il client %1BOINC per versioni precedenti di Linux"
-#~ "%2. Questa versione non ha un'interfaccia grafica, ma dovrebbe funzionare "
-#~ "con tutti i sistemi Linux, sia x86 che x64."
-#~ msgid ""
-#~ "Note: if your computer is equipped with an Graphics Processing Unit "
-#~ "(GPU), you may be able to %suse it to compute faster%s"
-#~ msgstr ""
-#~ "Nota: se il tuo computer è equipaggiato con una scheda video (GPU), "
-#~ "potresti %susarla per elaborare più velocemente%s"
-#~ msgid "TeraFLOPS."
-#~ msgstr "TeraFLOPS."
-#~ msgid "Conferences"
-#~ msgstr "Conferenze"
-#~ msgid "[check all that apply]"
-#~ msgstr "[seleziona tutte le voci corrispondenti]"
-#~ msgid "Other:"
-#~ msgstr "Altro:"
-#~ msgid "Yes - I have been running BOINC on my computer for..."
-#~ msgstr "Sì - Ho usato BOINC sul mio computer per..."
-#~ msgid "less than a week"
-#~ msgstr "meno di una settimana"
-#~ msgid "less than a month"
-#~ msgstr "meno di un mese"
-#~ msgid "less than a year"
-#~ msgstr "meno di un anno"
-#~ msgid "more than a year"
-#~ msgstr "più di un anno"
-#~ msgid "No - I used to run BOINC, but..."
-#~ msgstr "No - Ho usato BOINC, ma..."
-#~ msgid "I lost interest"
-#~ msgstr "ho perso interesse"
-#~ msgid "it was too complicated"
-#~ msgstr "era troppo complicato"
-#~ msgid "I stopped it and forgot to start again"
-#~ msgstr "l'ho chiuso e mi sono dimenticato di farlo ripartire"
-#~ msgid "it caused problems on my computer"
-#~ msgstr "ha causato problemi al mio computer"
-#~ msgid "it used too much electricity"
-#~ msgstr "ha consumato troppa energia elettrica"
-#~ msgid "I switched to a non-BOINC computing project"
-#~ msgstr "sono passato ad un progetto di calcolo distribuito non-BOINC"
-#~ msgid "No - I tried running BOINC, but..."
-#~ msgstr "No - Ho provato a usare BOINC, ma..."
-#~ msgid "the software didn't install correctly"
-#~ msgstr "il software non si è installato correttamente"
-#~ msgid "I couldn't figure out how to use the software"
-#~ msgstr "non sono riuscito a capire come usare il software"
-#~ msgid "I had network communication problems"
-#~ msgstr "ho avuto problemi di comunicazione di rete"
-#~ msgid "I couldn't attach to a project"
-#~ msgstr "non sono riuscito a connettermi ad alcun progetto"
-#~ msgid "I attached to a project, but never got any work"
-#~ msgstr ""
-#~ "mi sono connesso ad un progetto, ma non ho ricevuto alcun lavoro da "
-#~ "elaborare"
-#~ msgid "No - I never tried running BOINC, because..."
-#~ msgstr "No - Non ho mai provato ad usare BOINC, perché..."
-#~ msgid "I was concerned about security"
-#~ msgstr "ero preoccupato per la sicurezza"
-#~ msgid "I wasn't interested in any of the projects"
-#~ msgstr "non ero interessato a nessun progetto"
-#~ msgid "I don't have permission to run it on my computer"
-#~ msgstr "non ho i privilegi per installarlo sul mio computer"
-#~ msgid "No version was available for my computer"
-#~ msgstr "non c'era una versione compatibile col mio computer"
-#~ msgid "What kind of computers do you have running BOINC?"
-#~ msgstr "Su quali tipi di computer stai usando BOINC?"
-#~ msgid "Where are they?"
-#~ msgstr "Dove si trovano?"
-#~ msgid "Work"
-#~ msgstr "Al lavoro"
-#~ msgid "School"
-#~ msgstr "A scuola"
-#~ msgid "How many computers?"
-#~ msgstr "Quanti computer?"
-#~ msgid "On average, how many hours per day are they powered on?"
-#~ msgstr "In media, quante ore al giorno sono accesi?"
-#~ msgid "Age"
-#~ msgstr "Età"
-#~ msgid "Sex"
-#~ msgstr "Sesso"
-#~ msgid "Male"
-#~ msgstr "Maschio"
-#~ msgid "Female"
-#~ msgstr "Femmina"
-#~ msgid "Your level of computer expertise"
-#~ msgstr "Il tuo livello di abilità al computer"
-#~ msgid "Beginner"
-#~ msgstr "Principiante"
-#~ msgid "Intermediate"
-#~ msgstr "Intermedio"
-#~ msgid "Advanced"
-#~ msgstr "Avanzato"
-#~ msgid "Where did you learn about BOINC projects?"
-#~ msgstr "Dove hai sentito parlare di BOINC?"
-#~ msgid "TV/radio/newspaper"
-#~ msgstr "TV/radio/giornali"
-#~ msgid "From friends, relatives, or coworkers"
-#~ msgstr "Da amici, parenti o colleghi di lavoro"
-#~ msgid "Team message boards or web sites"
-#~ msgstr "Nei forum o sui siti web dei gruppi"
-#~ msgid "The BOINC web site"
-#~ msgstr "Sul sito web di BOINC"
-#~ msgid "Other web sites"
-#~ msgstr "Su altri siti web"
-#~ msgid ""
-#~ "Which are the most important factors when you decide whether to "
-#~ "participate in a BOINC project?"
-#~ msgstr ""
-#~ "Quali sono i fattori più importanti quando decidi di partecipare ad un "
-#~ "progetto BOINC?"
-#~ msgid "Nice-looking screensaver graphics"
-#~ msgstr "Screensaver con una bella grafica"
-#~ msgid "Fair and quick granting of credit for work done"
-#~ msgstr "Riconoscimento corretto e veloce dei crediti per il lavoro fatto"
-#~ msgid "Getting more credit from this project than from others"
-#~ msgstr "Ricevere più crediti da questo progetto rispetto agli altri"
-#~ msgid "Helpful and friendly message boards"
-#~ msgstr "Forum utili e amichevoli"
-#~ msgid "Participation by project staff on the message boards"
-#~ msgstr "Partecipazione dello staff del progetto nei forum"
-#~ msgid "Informative project web site"
-#~ msgstr "Sito del progetto pieno di informazioni"
-#~ msgid "The science is important and beneficial"
-#~ msgstr "La ricerca scientifica effettuata è importante ed utile"
-#~ msgid "Non-profit, and results are public"
-#~ msgstr "Senza scopo di lucro e i risultati sono pubblici"
-#~ msgid "Personal recognition if my computer finds something"
-#~ msgstr "Riconoscimento personale se il mio computer trova qualcosa"
-#~ msgid "Publication by the project in scientific journals"
-#~ msgstr "Pubblicazioni da parte del progetto su riviste scientifiche"
-#~ msgid "Periodic email newsletters from the project"
-#~ msgstr "Newsletter periodiche dal progetto via email"
-#~ msgid "How many BOINC projects do you participate in?"
-#~ msgstr "A quanti progetti BOINC partecipi?"
-#~ msgid "Do you run BOINC as a screensaver?"
-#~ msgstr "Usi lo screensaver di BOINC?"
-#~ msgid "Yes"
-#~ msgstr "Sì"
-#~ msgid "No"
-#~ msgstr "No"
-#~ msgid "Your usage of project messages boards:"
-#~ msgstr "Che uso fai del forum del progetto:"
-#~ msgid "to read information"
-#~ msgstr "per leggere informazioni"
-#~ msgid "to read and post information"
-#~ msgstr "per leggere e inserire informazioni"
-#~ msgid "None"
-#~ msgstr "nessuno"
-#~ msgid ""
-#~ "Where do you get information to help resolve problems with BOINC and/or "
-#~ "BOINC projects?"
-#~ msgstr ""
-#~ "Dove prendi le informazioni per risolvere eventuali problemi con BOINC e/"
-#~ "o con i progetti BOINC?"
-#~ msgid "The project message boards"
-#~ msgstr "Dai forum del progetto"
-#~ msgid "The BOINC message boards"
-#~ msgstr "Dai forum di BOINC"
-#~ msgid "BOINC mailing lists"
-#~ msgstr "Dalle mailing list di BOINC"
-#~ msgid "The Unofficial BOINC Wiki"
-#~ msgstr "Dalla wiki non ufficiale di BOINC"
-#~ msgid "Team web sites"
-#~ msgstr "Dai siti web dei gruppi"
-#~ msgid "Google or other search engines"
-#~ msgstr "Da Google o altri motori di ricerca"
-#~ msgid "... more"
-#~ msgstr "... continua"
-#~ msgid "BOINC user survey"
-#~ msgstr "Sondaggio sugli utenti di BOINC"
-#~ msgid ""
-#~ "Several volunteer computing projects, including Climateprediction.net, "
-#~ "Einstein at home, and SETI at home, use software called BOINC.  If you "
-#~ "participate in projects like this, we request that you answer the "
-#~ "following questions.  This will help BOINC-based projects increase "
-#~ "participation and achieve greater scientific results. <p> Please answer "
-#~ "as many questions as you want, then go to the bottom and click OK. If you "
-#~ "previously completed the survey but your answers have changed, please "
-#~ "complete it again - your new answers will replace the old ones. <p> The "
-#~ "current results of the survey are <a href=poll_results.php>here</a>. "
-#~ msgstr ""
-#~ "Molti progetti di calcolo distribuito volontario, come Climateprediction."
-#~ "net, Einstein at home e SETI at home, utilizzano il software chiamato BOINC.  "
-#~ "Se partecipi a questo tipo di progetti ti chiediamo cortesemente di "
-#~ "rispondere alle domande seguenti.  Questo aiuterà i progetti basati su "
-#~ "BOINC ad aumentare la partecipazione degli utenti ed a raggiungere "
-#~ "migliori risultati scientifici. <p> Per cortesia rispondi a più domande "
-#~ "che puoi, poi vai in fondo e clicca su OK. Se hai già completato il "
-#~ "sondaggio in precedenza ma le tue risposte sono cambiate, per cortesia "
-#~ "completalo nuovamente - le tue nuove risposte sostiuiranno quelle "
-#~ "vecchie. <p> I risultati attuali del sondaggio si possono trovare <a "
-#~ "href=poll_results.php>qui</a>. "
-#~ msgid "Do you run BOINC?"
-#~ msgstr "Usi BOINC?"
-#~ msgid "Your participation"
-#~ msgstr "La tua partecipazione"
-#~ msgid "Your computers"
-#~ msgstr "I tuoi computer"
-#~ msgid "You"
-#~ msgstr "Tu"
-#~ msgid "Nationality"
-#~ msgstr "Nazionalità"
-#~ msgid "Comments"
-#~ msgstr "Commenti"
-#~ msgid ""
-#~ "Please suggest ways that BOINC, and the projects that use it, could be "
-#~ "improved:"
-#~ msgstr ""
-#~ "Suggerisci come BOINC, e i progetti che lo utilizzano, potrebbero essere "
-#~ "migliorati:"
-#~ msgid "When done click:"
-#~ msgstr "Quando hai terminato clicca:"
-#~ msgid "Error - results not recorded"
-#~ msgstr "Errore - i risultati non sono stati registrati"
-#~ msgid ""
-#~ "An internal error has prevented us from recording your survey response.  "
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Un errore interno ha impedito la registrazione delle tue risposte al "
-#~ "sondaggio.  Sei pregato di riprovare."
-#~ msgid "Survey response recorded"
-#~ msgstr "Le risposte al sondaggio sono state registrate"
-#~ msgid "Thank you for completing the BOINC user survey."
-#~ msgstr "Grazie per aver completato il sondaggio sugli utenti di BOINC."
-#~ msgid "Survey results"
-#~ msgstr "Risultati del sondaggio"
-#~ msgid ""
-#~ "These are the current results of the <a href=poll.php>BOINC user survey</"
-#~ "a>.  This page is updated every hour."
-#~ msgstr ""
-#~ "Questi sono i risultati attuali del <a href=poll.php>sondaggio sugli "
-#~ "utenti di BOINC</a>.  Questa pagina viene aggiornata ogni ora."
-
diff --git a/locale/ja/BOINC-Client.mo b/locale/ja/BOINC-Client.mo
index d723bc3..1460f88 100644
Binary files a/locale/ja/BOINC-Client.mo and b/locale/ja/BOINC-Client.mo differ
diff --git a/locale/ja/BOINC-Client.po b/locale/ja/BOINC-Client.po
old mode 100755
new mode 100644
index 8bc58f1..6c94559
--- a/locale/ja/BOINC-Client.po
+++ b/locale/ja/BOINC-Client.po
@@ -1,33 +1,36 @@
-# Translation po file for BOINC Client in Development.
-# Copyright (C) 2010 University of California.
-# This file is distributed under the same license as the BOINC package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, 2010.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2010
+# Masahiro Tagashira, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: boinc\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-10-15 22:25-0700\n"
-"PO-Revision-Date: 2015-02-11 16:38-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: ja\n"
+"PO-Revision-Date: 2015-02-23 16:16+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"
-"X-Generator: Pootle 2.1.6\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: acct_mgr.cpp:450
-#: acct_mgr.cpp:459
-#, fuzzy
+#: acct_mgr.cpp:450 acct_mgr.cpp:459
 msgid "Message from account manager"
-msgstr "プロジェクト・サーバからのメッセージ:"
+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."
+msgid ""
+"Some tasks need more memory than allowed by your preferences.  Please check "
+"the preferences."
 msgstr "あなたの設定したプレファレンス(好みの設定)を越えるメモリ量を必要とするタスクがあります。プレファレンスの内容を確認してください。"
 
 #: client_state.cpp:520
@@ -40,11 +43,12 @@ 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"
+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
+#: cs_statefile.cpp:828 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
 msgstr "app_info.xml の中に構文誤りがあります。"
 
@@ -54,31 +58,27 @@ msgstr "app_info.xml の中で参照されている次のファイルが存在
 
 #: current_version.cpp:91
 msgid "A new version of BOINC is available."
-msgstr "新しい版の BOINC が利用できます。"
+msgstr "新しいバージョンのBOINCが利用できます。"
 
-#: current_version.cpp:94
-#: current_version.cpp:102
+#: current_version.cpp:94 current_version.cpp:102
 msgid "Download"
-msgstr ""
+msgstr "ダウンロード"
 
-#: log_flags.cpp:269
-#: log_flags.cpp:449
+#: 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
+#: log_flags.cpp:423 log_flags.cpp:475
 msgid "Unrecognized tag in cc_config.xml"
-msgstr "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
-#, fuzzy
 msgid "Error in cc_config.xml options"
-msgstr "cc_config.xml の中に見知らぬタグが見つかりました"
+msgstr "cc_config.xml オプション内のエラー"
 
 #: log_flags.cpp:483
 msgid "Missing end tag in cc_config.xml"
@@ -93,54 +93,56 @@ 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."
+msgid ""
+"The project has changed its security key.  Please remove and add this "
+"project."
 msgstr "このプロジェクトはセキュリティ・キーを変更しました。このプロジェクトから一旦削除し、再び追加してください。"
 
-#  Poor translation because the implementation and the original text are English-dependent.
 #: ../sched/handle_request.cpp:943
 msgid "This project doesn't support operating system"
 msgstr "このプロジェクトは次に示す OS をサポートしていません: "
 
-#
 #: ../sched/handle_request.cpp:969
 msgid "This project doesn't support CPU type"
 msgstr "このプロジェクトは次に示す CPU をサポートしていません: "
 
 #: ../sched/handle_request.cpp:993
-msgid "Your BOINC client software is too old.  Please install the current version."
+msgid ""
+"Your BOINC client software is too old.  Please install the current version."
 msgstr "あなたのマシンに入っている BOINC クライアントソフトウェアは古過ぎます。現在の版にインストールしなおしてください。"
 
-#  Poor translation because the implementation and the original text are English-dependent.
 #: ../sched/handle_request.cpp:1259
 msgid "This project doesn't support computers of type"
-msgstr "このプロジェクトは次に示す プラットフォームをサポートしていません: "
+msgstr "このプロジェクトは次に示す プラットフォーム をサポートしていません: "
 
 #: ../sched/sched_send.cpp:1092
-msgid "Upgrade to the latest driver to process tasks using your computer's GPU"
-msgstr "あなたのコンピュータが持つ GPU を使ってタスクを処理したければ、ドライバーを最新のものにアップグレイドしてください。"
+msgid ""
+"Upgrade to the latest driver to process tasks using your computer's GPU"
+msgstr "あなたのコンピュータが持つ GPU を使ってタスクを処理したければ、ドライバーを最新のものにアップグレードしてください。"
 
 #: ../sched/sched_send.cpp:1099
-msgid "Upgrade to the latest driver to use all of this project's GPU applications"
+msgid ""
+"Upgrade to the latest driver to use all of this project's GPU applications"
 msgstr "このプロジェクトの GPU アプリケーションの全てを使いたければ、ドライバーを最新のものにアップグレードしてください。"
 
 #: ../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 GPU を使いたければ、より新しい版の BOINC が必要です。現在の版の BOINC へアップグレイドしてください。"
+msgid ""
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to"
+" the current version"
+msgstr "あなたのマシンの NVIDIA GPU を使いたければ、より新しい版の BOINC が必要です。現在の版の BOINC へアップグレードしてください。"
 
-# 94%
 #: ../sched/sched_send.cpp:1146
 #, c-format
 msgid "An %s GPU is required to run tasks for this project"
-msgstr ""
+msgstr "このプロジェクトの仕事を動作させるためには %s GPU が必要とされます"
 
 #: ../sched/sched_send.cpp:1262
-#, fuzzy
 msgid "No tasks are available for the applications you have selected."
-msgstr "あなたが選んだアプリケーションで処理できる仕事が手に入りません。該当のウェブサイトであなたのプロジェクト・プレファレンスを確かめてください。"
+msgstr "あなたが選択したアプリケーションで処理できるタスクがありません。"
 
 #: ../sched/sched_send.cpp:1288
 msgid "Your computer type is not supported by this project"
-msgstr "あなたのコンピュータはこのプロジェクトではサポート外です。"
+msgstr "あなたのコンピュータのプラットフォームはこのプロジェクトではサポートされていません。"
 
 #: ../sched/sched_send.cpp:1294
 msgid "Newer BOINC version required; please install current version"
@@ -148,40 +150,14 @@ 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 ""
+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 の中に不明なアプリケーション名があります"
 
-#  Poor translation because the implementation and the original text are English-dependent.
 #: ../sched/sched_version.cpp:214
 msgid "Your app_info.xml file doesn't have a usable version of"
-msgstr "あなたの app_info.xml ファイルには次のアプリケーションの使える版が記述されていません:"
-
-#~ msgid "Download it."
-#~ msgstr "ダウンロードしてください。"
-#~ msgid "An NVIDIA or ATI GPU is required to run tasks for this project"
-#~ msgstr "このプロジェクトの タスクを走らせるには NVIDIA または ATI の GPU が必要です"
-#~ msgid "An NVIDIA GPU is required to run tasks for this project"
-#~ msgstr "このプロジェクトの タスクを走らせるには NVIDIA の GPU が必要です"
-#~ msgid "An ATI GPU is required to run tasks for this project"
-#~ msgstr "このプロジェクトの タスクを走らせるには ATI の GPU が必要です"
-#~ msgid ""
-#~ "Tasks for NVIDIA GPU are available, but your preferences are set to not "
-#~ "accept them"
-#~ msgstr "NVIDIA GPU 用のタスクが手に入りますが、あなたが設定したプレファレンスではそれらを処理しないことになっています。"
-#~ msgid ""
-#~ "Tasks for ATI GPU are available, but your preferences are set to not accept "
-#~ "them"
-#~ msgstr "ATI GPU 用のタスクが手に入りますが、あなたが設定したプレファレンスではそれらを処理しないことになっています。"
-#~ msgid ""
-#~ "Tasks for CPU are available, but your preferences are set to not accept them"
-#~ msgstr "CPU 用のタスクが手に入りますが、あなたが設定したプレファレンスではそれらを処理しないことになっています。"
-#~ msgid "error"
-#~ msgstr "エラー"
-#~ msgid "Can't resolve hostname in remote_hosts.cfg"
-#~ msgstr ""
-#~ "remote_hosts.cfg ファイル内にあるホスト名をアドレス解決できませんでした"
-
+msgstr "あなたの app_info.xml ファイルには次のアプリケーションの利用可能な版が記述されていません:"
diff --git a/locale/ja/BOINC-Manager.mo b/locale/ja/BOINC-Manager.mo
index 1b2fa82..f0cc349 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
old mode 100755
new mode 100644
index 201272b..b6d0231
--- a/locale/ja/BOINC-Manager.po
+++ b/locale/ja/BOINC-Manager.po
@@ -1,62 +1,62 @@
 # 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:
+# Masahiro Tagashira, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-15 14:15-0500\n"
-"PO-Revision-Date: 2015-02-11 16:41-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: ja\n"
+"POT-Creation-Date: 2015-03-24 13:36-0500\n"
+"PO-Revision-Date: 2015-03-25 15:31+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"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc_7.4\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1382973625.0\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\n"
+"X-Poedit-Country: UNITED STATES\n"
+"X-Poedit-Language: English\n"
 "X-Poedit-SearchPath-0: clientgui\n"
-"X-Poedit-SearchPath-1: clientgui/msw\n"
-"X-Poedit-SearchPath-2: clientgui/gtk\n"
-"X-Poedit-SearchPath-3: clientgui/mac\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"
 
-#: clientgui/AccountInfoPage.cpp:387
+#: clientgui/AccountInfoPage.cpp:361
 #, c-format
 msgid "Identify your account at %s"
-msgstr ""
+msgstr "%sでのあなたのアカウントを特定"
 
-#: clientgui/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 ""
-"アカウント情報を入力してください\n"
-"(プロジェクトのウェブサイトに行って,アカウントを作成してください)"
+msgstr "アカウント情報を入力してください\n(アカウントを作成するには、プロジェクトのウェブサイトを訪問してください)"
 
-#: clientgui/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 ""
-"現在このプロジェクトは新規アカウントの登録を受け付けていません。\n"
-"既にアカウントを取得済みの場合だけは追加できます。"
+msgstr "現在このプロジェクトは新規アカウントの登録を受け入れていません。\n既にアカウントを取得済みの場合だけ追加できます。"
 
-#: clientgui/AccountInfoPage.cpp:401
+#: clientgui/AccountInfoPage.cpp:375
 msgid "Are you already running this project?"
-msgstr "このプロジェクトですでに稼動していますか?"
+msgstr "このプロジェクトにすでに参加していますか?"
 
-#: clientgui/AccountInfoPage.cpp:405
+#: clientgui/AccountInfoPage.cpp:379
 msgid "&No, new user"
 msgstr "いいえ(&N)、新しく参加します"
 
-#: clientgui/AccountInfoPage.cpp:408
+#: clientgui/AccountInfoPage.cpp:382
 msgid "&Yes, existing user"
 msgstr "はい(&Y)、すでにアカウントがあります"
 
-#: clientgui/AccountInfoPage.cpp:413
+#: clientgui/AccountInfoPage.cpp:387
 msgid ""
 "We were not able to set up your account information\n"
 "automatically.\n"
@@ -64,131 +64,116 @@ msgid ""
 "Please click on the 'Find login information' link\n"
 "below to find out what to put in the email address and\n"
 "password fields."
-msgstr ""
-"あなたのアカウント情報を自動的には設定できませんでした。\n"
-"\n"
-"次の 'ログイン情報を探す' のリンクをクリックして、\n"
-"Eメイルアドレスとパスワードのフィールドに入れる内容を\n"
-"見つけてください。"
+msgstr "あなたのアカウント情報を自動的には設定できませんでした。\n\n次の 'ログイン情報を探す' のリンクをクリックして、\nEメイルアドレスとパスワードのフィールドに入れる内容を\n見つけてください。"
 
-#: clientgui/AccountInfoPage.cpp:416
+#: clientgui/AccountInfoPage.cpp:390
 msgid "Find login information"
 msgstr "ログイン情報を探す"
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:649
+#: clientgui/AccountInfoPage.cpp:410 clientgui/AccountInfoPage.cpp:632
 msgid "&Password:"
-msgstr "パスワード(&P):"
+msgstr "パスワード(&P):"
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:673
+#: clientgui/AccountInfoPage.cpp:417 clientgui/AccountInfoPage.cpp:656
 msgid "Choose a &password:"
-msgstr "パスワードを決めて入力(&P):"
+msgstr "パスワードを決めて入力(&P):"
 
-#: clientgui/AccountInfoPage.cpp:446
+#: clientgui/AccountInfoPage.cpp:420
 msgid "C&onfirm password:"
-msgstr "確認のためパスワードをもう一度(&O):"
+msgstr "確認のためパスワードをもう一度(&O):"
 
-#: clientgui/AccountInfoPage.cpp:453
+#: clientgui/AccountInfoPage.cpp:427
 #, c-format
 msgid "Are you already running %s?"
-msgstr "既に %s に参加していますか?"
+msgstr "すでに %s に参加していますか?"
 
-#: clientgui/AccountInfoPage.cpp:482
+#: clientgui/AccountInfoPage.cpp:456
 msgid "&Username:"
-msgstr "参加者の名前(&U):"
+msgstr "ユーザー名(&U):"
 
-#: clientgui/AccountInfoPage.cpp:511
+#: clientgui/AccountInfoPage.cpp:485
 msgid "&Email address or LDAP ID:"
-msgstr ""
+msgstr "EメールアドレスあるいはLDAPのID(&E):"
 
-#: clientgui/AccountInfoPage.cpp:515
+#: clientgui/AccountInfoPage.cpp:489
 msgid "&Email address:"
-msgstr "電子メールアドレス(&E):"
+msgstr "電子メールアドレス(&E):"
 
-#: clientgui/AccountInfoPage.cpp:523
+#: clientgui/AccountInfoPage.cpp:497
 #, c-format
 msgid "minimum length %d"
 msgstr "%d文字以上"
 
-#: clientgui/AccountInfoPage.cpp:530
+#: clientgui/AccountInfoPage.cpp:504
 msgid "Forgot your password?"
 msgstr "パスワードをお忘れですか?"
 
-#: clientgui/AccountInfoPage.cpp:537
+#: 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 ""
-"このアカウントマネージャに未登録でしたら、処理を開始する\n"
-"前にぜひ登録をお願いします。次のリンクをクリックして登録に\n"
-"進んでください。忘れたパスワードを見つけることも可能です。"
+msgstr "このアカウントマネージャに未登録でしたら、処理を開始する前にぜひ登録をお願いします。登録するあるいは忘れたパスワードを見つけるには次のリンクをクリックしてください。"
 
-#: clientgui/AccountInfoPage.cpp:540
-#, fuzzy
+#: clientgui/AccountInfoPage.cpp:514
 msgid "Account manager web site"
 msgstr "アカウント・マネージャのウェブサイト"
 
-#: clientgui/AccountInfoPage.cpp:582
+#: clientgui/AccountInfoPage.cpp:556
 msgid "Add project"
 msgstr "プロジェクトを追加"
 
-#: clientgui/AccountInfoPage.cpp:584
+#: clientgui/AccountInfoPage.cpp:558
 msgid "Update account manager"
 msgstr "アカウント・マネージャを更新"
 
-#: clientgui/AccountInfoPage.cpp:586
+#: clientgui/AccountInfoPage.cpp:560
 msgid "Use account manager"
-msgstr "アカウント・マネージャを使用する"
+msgstr "アカウント・マネージャを使用"
 
-#: clientgui/AccountInfoPage.cpp:593
+#: clientgui/AccountInfoPage.cpp:567
 msgid "Please enter a user name."
-msgstr ""
+msgstr "ユーザー名を入力してください。"
 
-#: clientgui/AccountInfoPage.cpp:595
-#, fuzzy
+#: clientgui/AccountInfoPage.cpp:569
 msgid "Please enter an email address."
-msgstr "電子メールアドレスを指定してください"
+msgstr "Eメールアドレスを入力してください。"
 
-#: clientgui/AccountInfoPage.cpp:605
+#: clientgui/AccountInfoPage.cpp:579
 #, c-format
 msgid "Please enter a password of at least %d characters."
-msgstr ""
+msgstr "少なくとも%d文字のパスワードを入力してください。"
 
-#: clientgui/AccountInfoPage.cpp:615
-msgid "The password and confirmation password do not match. Please type them again."
-msgstr "確認のために二回入力していただいたパスワードが異なっています。 再度入力してください。"
+#: clientgui/AccountInfoPage.cpp:589
+msgid ""
+"The password and confirmation password do not match. Please type them again."
+msgstr "確認のために二回入力していただいたパスワードが一致しません。 再度入力してください。"
 
-#: clientgui/AccountManagerInfoPage.cpp:272
+#: clientgui/AccountManagerInfoPage.cpp:270
 msgid "Choose an account manager"
 msgstr "アカウント・マネージャを1つ選ぶ"
 
-#: clientgui/AccountManagerInfoPage.cpp:275
+#: clientgui/AccountManagerInfoPage.cpp:273
 msgid ""
 "To choose an account manager, click its name or \n"
 "type its URL below."
-msgstr ""
-"プロジェクトを選択するには、その名前をクリックするか、\n"
-"あるいは下の欄に URL を入力してください。"
+msgstr "プロジェクトを選択するには、その名前をクリックするか、\nあるいは下の欄にURLを入力してください。"
 
-#: clientgui/AccountManagerInfoPage.cpp:279
-#, fuzzy
+#: clientgui/AccountManagerInfoPage.cpp:277
 msgid "Account manager details:"
-msgstr "アカウント・マネージャのウェブサイト"
+msgstr "アカウント・マネージャの詳細情報:"
 
-#: clientgui/AccountManagerInfoPage.cpp:283
-#, fuzzy
+#: clientgui/AccountManagerInfoPage.cpp:281
 msgid "Account manager &URL:"
-msgstr "アカウント・マネージャー &URL:"
+msgstr "アカウント・マネージャーのURL(&U):"
 
-#: clientgui/AccountManagerInfoPage.cpp:287
+#: clientgui/AccountManagerInfoPage.cpp:285
 msgid "Open web page"
-msgstr ""
+msgstr "ウェブページを開く"
 
-#: clientgui/AccountManagerInfoPage.cpp:290
+#: clientgui/AccountManagerInfoPage.cpp:288
 msgid "Visit this account manager's web site"
-msgstr ""
+msgstr "アカウント・マネージャのウェブサイトを訪問"
 
 #: clientgui/AccountManagerProcessingPage.cpp:186
 #: clientgui/AccountManagerPropertiesPage.cpp:192
@@ -210,329 +195,341 @@ msgstr "お待ちください..."
 msgid "An internal server error has occurred.\n"
 msgstr "サーバ内部で異常が発生しました。\n"
 
-#: clientgui/AdvancedFrame.cpp:96
+#: clientgui/AdvancedFrame.cpp:99
 msgid "Connected"
 msgstr "接続しました"
 
-#: clientgui/AdvancedFrame.cpp:104
+#: clientgui/AdvancedFrame.cpp:107
 msgid "Disconnected"
 msgstr "接続を切りました"
 
-#: clientgui/AdvancedFrame.cpp:318
+#: clientgui/AdvancedFrame.cpp:325
 #, c-format
-msgid "Close the %s window"
-msgstr "この %s ウィンドーを閉じる"
+msgid "New %s window..."
+msgstr "新しい %s ウィンドウ…"
+
+#: clientgui/AdvancedFrame.cpp:329
+#, c-format
+msgid "Open another %s window"
+msgstr "もう一つ別の %s を開きます"
+
+#: clientgui/AdvancedFrame.cpp:340
+msgid "Select computer..."
+msgstr "コンピュータの選択..."
+
+#: clientgui/AdvancedFrame.cpp:341
+msgid "Connect to a BOINC client on another computer"
+msgstr "別のコンピュータの BOINC クライアントに接続"
 
-#: clientgui/AdvancedFrame.cpp:321
-msgid "&Close Window"
-msgstr "ウィンドーを閉じる(&C)"
+#: clientgui/AdvancedFrame.cpp:345
+msgid "Shut down connected client..."
+msgstr "接続しているクライアントをシャットダウン..."
 
-#: clientgui/AdvancedFrame.cpp:332
-#: clientgui/AdvancedFrame.cpp:339
 #: clientgui/AdvancedFrame.cpp:346
+msgid "Shut down the currently connected BOINC client"
+msgstr "現在接続している BOINC クライアントをシャットダウンさせます"
+
+#: clientgui/AdvancedFrame.cpp:351
+#, c-format
+msgid "Close the %s window"
+msgstr "この %s ウィンドウを閉じます"
+
+#: clientgui/AdvancedFrame.cpp:354
+msgid "&Close window"
+msgstr "ウィンドウを閉じる(&C)"
+
+#: clientgui/AdvancedFrame.cpp:363 clientgui/AdvancedFrame.cpp:368
+#: clientgui/AdvancedFrame.cpp:373
 #, c-format
 msgid "Exit %s"
-msgstr "%s を終了する"
+msgstr "%s を終了"
 
-#: clientgui/AdvancedFrame.cpp:359
-msgid "Preferences..."
-msgstr ""
+#: clientgui/AdvancedFrame.cpp:386
+msgid "Preferences…"
+msgstr "プレファレンス..."
 
-#: clientgui/AdvancedFrame.cpp:368
+#: clientgui/AdvancedFrame.cpp:395
 msgid "&Notices\tCtrl+Shift+N"
 msgstr "お知らせ(&N)\tCtrl+Shift+N"
 
-#: clientgui/AdvancedFrame.cpp:369
-msgid "Display notices"
-msgstr "お知らせを表示する"
+#: clientgui/AdvancedFrame.cpp:396
+msgid "Show notices"
+msgstr "お知らせを表示します"
 
-#: clientgui/AdvancedFrame.cpp:374
+#: clientgui/AdvancedFrame.cpp:401
 msgid "&Projects\tCtrl+Shift+P"
 msgstr "プロジェクト(&P)\tCtrl+Shift+P"
 
-#: clientgui/AdvancedFrame.cpp:375
-msgid "Display projects"
-msgstr "プロジェクトを表示"
+#: clientgui/AdvancedFrame.cpp:402
+msgid "Show projects"
+msgstr "プロジェクトを表示します"
 
-#: clientgui/AdvancedFrame.cpp:380
+#: clientgui/AdvancedFrame.cpp:407
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr "タスク(&T)\tCtrl+Shift+T"
 
-#: clientgui/AdvancedFrame.cpp:381
-msgid "Display tasks"
-msgstr "タスクを表示"
+#: clientgui/AdvancedFrame.cpp:408
+msgid "Show tasks"
+msgstr "タスクを表示します"
 
-#: clientgui/AdvancedFrame.cpp:386
+#: clientgui/AdvancedFrame.cpp:413
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr "転送(&F)\tCtrl+Shift+X"
 
-#: clientgui/AdvancedFrame.cpp:387
-msgid "Display transfers"
-msgstr "転送を表示"
+#: clientgui/AdvancedFrame.cpp:414
+msgid "Show file transfers"
+msgstr "ファイル転送を表示します"
 
-#: clientgui/AdvancedFrame.cpp:392
+#: clientgui/AdvancedFrame.cpp:419
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "統計(&S)\tCtrl+Shift+S"
 
-#: clientgui/AdvancedFrame.cpp:393
-msgid "Display statistics"
-msgstr "統計を表示"
+#: clientgui/AdvancedFrame.cpp:420
+msgid "Show statistics"
+msgstr "統計を表示します"
 
-#: clientgui/AdvancedFrame.cpp:398
-msgid "&Disk usage\tCtrl+Shift+D"
-msgstr "ディスク(&D)使用量\tCtrl+Shift+D"
+#: clientgui/AdvancedFrame.cpp:425
+msgid "&Disk\tCtrl+Shift+D"
+msgstr "ディスク(&D)\tCtrl+Shift+D"
 
-#: clientgui/AdvancedFrame.cpp:399
-msgid "Display disk usage"
-msgstr "ディスク使用量を表示"
+#: clientgui/AdvancedFrame.cpp:426
+msgid "Show disk usage"
+msgstr "ディスク使用量を表示します"
+
+#: clientgui/AdvancedFrame.cpp:432
+msgid "Event Log...\tCtrl+Shift+E"
+msgstr "イベント・ログ...\tCtrl+Shift+E"
 
-#: clientgui/AdvancedFrame.cpp:406
+#: clientgui/AdvancedFrame.cpp:433
+msgid "Show diagnostic messages"
+msgstr "診断メッセージを表示します"
+
+#: clientgui/AdvancedFrame.cpp:439
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr "簡易表示(&V)...\tCtrl+Shift+V"
 
-#: clientgui/AdvancedFrame.cpp:407
-msgid "Display the simple graphical interface."
-msgstr "簡易グラフィックインタフェースで表示します"
+#: clientgui/AdvancedFrame.cpp:440
+msgid "Switch to the Simple View"
+msgstr "簡易表示に切り替えます"
 
-#: clientgui/AdvancedFrame.cpp:421
+#: clientgui/AdvancedFrame.cpp:454
 msgid "&Add project or account manager..."
 msgstr "プロジェクトまたはアカウント・マネージャを追加(&A)..."
 
-#: clientgui/AdvancedFrame.cpp:422
-msgid "Volunteer for any or all of 30+ projects in many areas of science"
-msgstr "ボランティアで参加しましょう。科学の多分野に渡る30以上のプロジェクトにどれにでもいくつでも参加できます。"
+#: clientgui/AdvancedFrame.cpp:455
+msgid "Add a new science project, or use an account manager"
+msgstr "新しい科学プロジェクトを追加、あるいはアカウント・マネージャを利用"
 
-#: clientgui/AdvancedFrame.cpp:426
+#: clientgui/AdvancedFrame.cpp:459
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "%s に同期(&S)"
 
-#: clientgui/AdvancedFrame.cpp:430
+#: clientgui/AdvancedFrame.cpp:463
 #, c-format
 msgid "Get current settings from %s"
-msgstr "%s から現在の設定を取り出します"
+msgstr "%s から現在の設定を取得します"
 
-#: clientgui/AdvancedFrame.cpp:440
+#: clientgui/AdvancedFrame.cpp:473
 msgid "&Add project..."
 msgstr "プロジェクトを追加(&A)..."
 
-#: clientgui/AdvancedFrame.cpp:441
+#: clientgui/AdvancedFrame.cpp:474
 msgid "Add a project"
-msgstr "プロジェクトを追加する"
+msgstr "プロジェクトを追加します"
 
-#: clientgui/AdvancedFrame.cpp:444
+#: clientgui/AdvancedFrame.cpp:477
 #, c-format
 msgid "S&top using %s..."
 msgstr "%s を使うのを止める(&T)..."
 
-#: clientgui/AdvancedFrame.cpp:450
+#: clientgui/AdvancedFrame.cpp:483
 msgid "Remove this computer from account manager control."
-msgstr "このクライアントをアカウント・マネージャの制御からはずします"
+msgstr "このコンピュータをアカウント・マネージャの管理からはずします"
 
-#: clientgui/AdvancedFrame.cpp:455
-msgid "&Options..."
-msgstr ""
+#: clientgui/AdvancedFrame.cpp:489
+msgid "Run CPU &benchmarks"
+msgstr "CPU ベンチマークを実行(&B)"
 
-#: clientgui/AdvancedFrame.cpp:456
-msgid "Configure display options and proxy settings"
-msgstr "表示オプションとプロキシの設定をします"
+#: clientgui/AdvancedFrame.cpp:490
+msgid "Run tests that measure CPU speed"
+msgstr "CPU 速度を測定するテストを実行"
 
-#: clientgui/AdvancedFrame.cpp:460
-msgid "Computing &preferences..."
-msgstr "計算に関するプレファレンス(&P)..."
+#: clientgui/AdvancedFrame.cpp:494
+msgid "Retry pending transfers"
+msgstr "保留中の転送を再試行"
 
-#: clientgui/AdvancedFrame.cpp:461
-msgid "Configure computing preferences"
-msgstr "計算に関するプレファレンス (好みの設定)を指定する"
+#: clientgui/AdvancedFrame.cpp:495
+msgid "Retry deferred file transfers and task requests"
+msgstr "延期されたファイル転送とタスク要求を再試行します"
 
-#: clientgui/AdvancedFrame.cpp:469
+#: clientgui/AdvancedFrame.cpp:503
 msgid "&Run always"
 msgstr "常時稼働(&R)"
 
-#: clientgui/AdvancedFrame.cpp:470
+#: clientgui/AdvancedFrame.cpp:504
 msgid "Allow work regardless of preferences"
-msgstr "プレファレンス (好みの設定) に関わらず仕事をさせます"
+msgstr "プレファレンス(好みの設定)に関わらず仕事の実行を許可します"
 
-#: clientgui/AdvancedFrame.cpp:474
+#: clientgui/AdvancedFrame.cpp:508
 msgid "Run based on &preferences"
 msgstr "プレファレンスに従って稼働(&P)"
 
-#: clientgui/AdvancedFrame.cpp:475
+#: clientgui/AdvancedFrame.cpp:509
 msgid "Allow work according to preferences"
-msgstr "プレファレンス (好みの設定) に従って仕事をさせます"
+msgstr "プレファレンス(好みの設定)に従って仕事の実行を許可します。"
 
-#: clientgui/AdvancedFrame.cpp:479
+#: clientgui/AdvancedFrame.cpp:513
 msgid "&Suspend"
 msgstr "一時停止(&S)"
 
-#: clientgui/AdvancedFrame.cpp:480
+#: clientgui/AdvancedFrame.cpp:514
 msgid "Stop work regardless of preferences"
-msgstr "プレファレンス (好みの設定) に関わらず仕事を停止します"
+msgstr "プレファレンス(好みの設定)に関わらず仕事の実行を停止します"
 
-#: clientgui/AdvancedFrame.cpp:505
+#: clientgui/AdvancedFrame.cpp:539
 msgid "Use GPU always"
 msgstr "常時 GPU を使う"
 
-#: clientgui/AdvancedFrame.cpp:506
+#: clientgui/AdvancedFrame.cpp:540
 msgid "Allow GPU work regardless of preferences"
-msgstr "プレファレンス (好みの設定) に関わらず GPU に仕事をさせます"
+msgstr "プレファレンス(好みの設定)に関わらず GPU による仕事の実行を許可します"
 
-#: clientgui/AdvancedFrame.cpp:510
+#: clientgui/AdvancedFrame.cpp:544
 msgid "Use GPU based on preferences"
 msgstr "プレファレンスに従って GPUを使用"
 
-#: clientgui/AdvancedFrame.cpp:511
+#: clientgui/AdvancedFrame.cpp:545
 msgid "Allow GPU work according to preferences"
-msgstr "プレファレンス (好みの設定) に従って GPU に仕事をさせます"
+msgstr "プレファレンス(好みの設定)に従って GPU による仕事の実行を許可します"
 
-#: clientgui/AdvancedFrame.cpp:515
+#: clientgui/AdvancedFrame.cpp:549
 msgid "Suspend GPU"
 msgstr "GPU の使用を一時停止"
 
-#: clientgui/AdvancedFrame.cpp:516
+#: clientgui/AdvancedFrame.cpp:550
 msgid "Stop GPU work regardless of preferences"
-msgstr "プレファレンス (好みの設定) に関わらず GPU の仕事を停止します"
+msgstr "プレファレンス(好みの設定)に関わらず GPU による仕事の実行を停止します"
 
-#: clientgui/AdvancedFrame.cpp:540
-msgid "Network activity always available"
-msgstr "ネットワークをいつでも使用"
+#: clientgui/AdvancedFrame.cpp:574
+msgid "Network activity always allowed"
+msgstr "ネットワーク活動を常に許可"
 
-#: clientgui/AdvancedFrame.cpp:541
+#: clientgui/AdvancedFrame.cpp:575
 msgid "Allow network activity regardless of preferences"
-msgstr "プレファレンス (好みの設定) に関わらずネットワークアクセスを許します"
+msgstr "プレファレンス(好みの設定)に関わらずネットワークアクセスを許可します"
 
-#: clientgui/AdvancedFrame.cpp:545
+#: clientgui/AdvancedFrame.cpp:579
 msgid "Network activity based on preferences"
 msgstr "プレファレンスに従ってネットワークを使用"
 
-#: clientgui/AdvancedFrame.cpp:546
+#: clientgui/AdvancedFrame.cpp:580
 msgid "Allow network activity according to preferences"
-msgstr "プレファレンス (好みの設定) に従ってネットワークアクセスを許します"
+msgstr "プレファレンス(好みの設定)に従ってネットワークアクセスを許可します"
 
-#: clientgui/AdvancedFrame.cpp:550
+#: clientgui/AdvancedFrame.cpp:584
 msgid "Network activity suspended"
 msgstr "ネットワークの使用を一時停止"
 
-#: clientgui/AdvancedFrame.cpp:551
+#: clientgui/AdvancedFrame.cpp:585
 msgid "Stop BOINC network activity"
 msgstr "BOINC によるネットワークアクセスを停止します"
 
-#: clientgui/AdvancedFrame.cpp:561
-#, c-format
-msgid "Connect to another computer running %s"
-msgstr "%s が稼動している別のコンピュータに接続します"
+#: clientgui/AdvancedFrame.cpp:594
+msgid "Computing &preferences..."
+msgstr "計算に関するプレファレンス(&P)..."
 
-#: clientgui/AdvancedFrame.cpp:566
-msgid "Select computer..."
-msgstr "コンピュータの選択..."
+#: clientgui/AdvancedFrame.cpp:595
+msgid "Configure computing preferences"
+msgstr "計算に関するプレファレンス(好みの設定)を設定します"
 
-#: clientgui/AdvancedFrame.cpp:571
-msgid "Shut down connected client..."
-msgstr "接続しているクライアントをシャットダウン..."
+#: clientgui/AdvancedFrame.cpp:600
+msgid "Exclusive applications..."
+msgstr "排他的なアプリケーション..."
 
-#: clientgui/AdvancedFrame.cpp:572
-msgid "Shut down the currently connected client"
-msgstr "現在接続しているクライアントをシャットダウンさせます"
+#: clientgui/AdvancedFrame.cpp:601
+msgid "Configure exclusive applications"
+msgstr "排他的なアプリケーションの設定"
 
-#: clientgui/AdvancedFrame.cpp:576
-msgid "Run CPU &benchmarks"
-msgstr "CPU ベンチマークを実行(&B)"
+#: clientgui/AdvancedFrame.cpp:606
+msgid "Select columns..."
+msgstr "カラムの選択…"
 
-#: clientgui/AdvancedFrame.cpp:577
-msgid "Runs BOINC CPU benchmarks"
-msgstr "BOINC の CPU ベンチマークを実行します"
+#: clientgui/AdvancedFrame.cpp:607
+msgid "Select which columns to display"
+msgstr "どのカラムを表示するか選択します"
 
-#: clientgui/AdvancedFrame.cpp:581
-msgid "Do network communication"
-msgstr "通信を今すぐ実施"
+#: clientgui/AdvancedFrame.cpp:611
+msgid "Event Log options...\tCtrl+Shift+F"
+msgstr "イベント・ログのオプション...\tCtrl+Shift+F"
 
-#: clientgui/AdvancedFrame.cpp:582
-msgid "Do all pending network communication"
-msgstr "保留されているネットワーク通信を実行します"
+#: clientgui/AdvancedFrame.cpp:612
+msgid "Enable or disable various diagnostic messages"
+msgstr "さまざまな診断メッセージを有効または無効にする"
+
+#: clientgui/AdvancedFrame.cpp:616
+msgid "&Other options..."
+msgstr "その他のオプション(&O)..."
 
-# 94%
-#: clientgui/AdvancedFrame.cpp:586
-#, fuzzy
+#: clientgui/AdvancedFrame.cpp:617
+msgid "Configure display options and network settings"
+msgstr "表示オプションとネットワーク設定を構成します"
+
+#: clientgui/AdvancedFrame.cpp:622
 msgid "Read config files"
 msgstr "設定ファイルを読み込む"
 
-#: clientgui/AdvancedFrame.cpp:587
-msgid "Read configuration info from cc_config.xml and any app_config.xml files"
-msgstr ""
+#: clientgui/AdvancedFrame.cpp:623
+msgid ""
+"Read configuration info from cc_config.xml and any app_config.xml files"
+msgstr "cc_config.xml といずれかの app_config.xml ファイルから設定情報を読み込みます"
 
-#: clientgui/AdvancedFrame.cpp:591
+#: clientgui/AdvancedFrame.cpp:627
 msgid "Read local prefs file"
 msgstr "ローカル・プレファレンスファイルを読み込む"
 
-#: clientgui/AdvancedFrame.cpp:592
+#: clientgui/AdvancedFrame.cpp:628
 msgid "Read preferences from global_prefs_override.xml."
-msgstr "global_prefs_override.xml からプレファレンス (好みの設定) を読み込みます"
-
-#: clientgui/AdvancedFrame.cpp:597
-#, c-format
-msgid "Launch another instance of %s..."
-msgstr "もう一つ別の %s のインスタンスを走らせます..."
-
-#: clientgui/AdvancedFrame.cpp:601
-#, c-format
-msgid "Launch another %s"
-msgstr "もう一つ別の %s を走らせる"
-
-#: clientgui/AdvancedFrame.cpp:611
-msgid "Event Log...\tCtrl+Shift+E"
-msgstr "イベント・ログ...\tCtrl+Shift+E"
-
-#: clientgui/AdvancedFrame.cpp:612
-msgid "Display diagnostic messages."
-msgstr "診断メッセージを表示する"
-
-#: clientgui/AdvancedFrame.cpp:616
-msgid "Event Log Diagnostic Flags...\tCtrl+Shift+F"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:617
-msgid "Enable or disable various diagnostic messages"
-msgstr ""
+msgstr "global_prefs_override.xml からプレファレンス(好みの設定)を読み込みます"
 
-#: clientgui/AdvancedFrame.cpp:626
+#: clientgui/AdvancedFrame.cpp:636
 #, c-format
 msgid "%s &help"
 msgstr "%s のヘルプ(&H)"
 
-#: clientgui/AdvancedFrame.cpp:632
+#: clientgui/AdvancedFrame.cpp:640
 #, c-format
 msgid "Show information about %s"
-msgstr "%s の情報を表示します"
+msgstr "%s に関する情報を表示します"
 
-#: clientgui/AdvancedFrame.cpp:644
+#: clientgui/AdvancedFrame.cpp:650
 #, c-format
 msgid "&%s help"
 msgstr "&%s のヘルプ"
 
-#: clientgui/AdvancedFrame.cpp:650
+#: clientgui/AdvancedFrame.cpp:654
 #, c-format
 msgid "Show information about the %s"
-msgstr "%s の情報を表示します"
+msgstr "%s に関する情報を表示します"
 
-#: clientgui/AdvancedFrame.cpp:662
+#: clientgui/AdvancedFrame.cpp:665
 #, c-format
 msgid "%s &web site"
-msgstr "%s ウェブサイト(&W)"
+msgstr "%s のウェブサイト(&W)"
 
-#: clientgui/AdvancedFrame.cpp:668
+#: clientgui/AdvancedFrame.cpp:669
 #, c-format
 msgid "Show information about BOINC and %s"
-msgstr "BOINC および %s の情報を表示します"
+msgstr "BOINC および %s に関する情報を表示します"
 
-#: clientgui/AdvancedFrame.cpp:680
-#: clientgui/BOINCTaskBar.cpp:544
+#: clientgui/AdvancedFrame.cpp:680 clientgui/BOINCTaskBar.cpp:544
 #, c-format
 msgid "&About %s..."
 msgstr "%s について(&A)..."
 
 #: clientgui/AdvancedFrame.cpp:686
 msgid "Licensing and copyright information."
-msgstr "ライセンスと著作権情報"
+msgstr "ライセンスと著作権情報を表示します"
 
 #: clientgui/AdvancedFrame.cpp:693
 msgid "&File"
@@ -543,28 +540,27 @@ msgid "&View"
 msgstr "表示(&V)"
 
 #: clientgui/AdvancedFrame.cpp:701
-msgid "&Tools"
-msgstr "ツール(&T)"
-
-#: clientgui/AdvancedFrame.cpp:705
 msgid "&Activity"
 msgstr "アクティビティ(&A)"
 
+#: clientgui/AdvancedFrame.cpp:705
+msgid "&Options"
+msgstr "オプション(&O)"
+
 #: clientgui/AdvancedFrame.cpp:709
-msgid "A&dvanced"
-msgstr "高度な操作(&D)"
+msgid "&Tools"
+msgstr "ツール(&T)"
 
 #: clientgui/AdvancedFrame.cpp:713
 msgid "&Help"
 msgstr "ヘルプ(&H)"
 
-#: clientgui/AdvancedFrame.cpp:1185
+#: clientgui/AdvancedFrame.cpp:1188
 #, c-format
 msgid "%s - Stop using %s"
 msgstr "%s - %s の使用をやめる"
 
-# Case of Detaching from an account manager
-#: clientgui/AdvancedFrame.cpp:1190
+#: clientgui/AdvancedFrame.cpp:1193
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -572,49 +568,41 @@ msgid ""
 "but you'll have to manage projects manually.\n"
 "\n"
 "Do you want to stop using %s?"
-msgstr ""
-"%s を使うのをやめても、現在参加しているプロジェクト\n"
-"に影響はありませんが、プロジェクトをいちいち管理\n"
-"する手間をかけねばならなくなります。\n"
-"\n"
-"%s を使うのをやめますか?"
+msgstr "%s の利用を停止しても、現在参加しているプロジェクトに影響はありませんが、\nプロジェクトを手動で管理しなければならなくなります。\n本当に %s の利用を停止しますか?"
 
-#: clientgui/AdvancedFrame.cpp:1397
+#: clientgui/AdvancedFrame.cpp:1420
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s - 現在接続しているクライアントをシャットダウンします..."
 
-#: clientgui/AdvancedFrame.cpp:1406
+#: clientgui/AdvancedFrame.cpp:1429
 #, c-format
 msgid ""
 "%s will shut down the current client\n"
 "and prompt you for another host to connect to."
-msgstr ""
-"%s は、現在接続しているクライアントをシャットダウンし、\n"
-"別の計算機に接続するよう促します。"
+msgstr "%s は、現在接続しているクライアントをシャットダウンし、\n別の計算機に接続するよう促します。"
 
-#: clientgui/AdvancedFrame.cpp:1806
+#: clientgui/AdvancedFrame.cpp:1832
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-# Case for attaching to an account manager
-#: clientgui/AdvancedFrame.cpp:1815
+#: clientgui/AdvancedFrame.cpp:1841
 #, c-format
 msgid "%s has successfully added %s"
-msgstr "%s は %s を追加することに成功しました。"
+msgstr "%s は %s の追加に成功しました"
 
-#: clientgui/AdvancedFrame.cpp:1953
+#: clientgui/AdvancedFrame.cpp:1977
 #, c-format
 msgid "%s - (%s)"
 msgstr "%s - (%s)"
 
-#: clientgui/AdvancedFrame.cpp:1957
+#: clientgui/AdvancedFrame.cpp:1981
 #, c-format
 msgid "Connecting to %s"
-msgstr "%s に接続処理中"
+msgstr "%s に接続中"
 
-#: clientgui/AdvancedFrame.cpp:1960
+#: clientgui/AdvancedFrame.cpp:1984
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "%s (%s)に接続済み"
@@ -629,15 +617,11 @@ msgid ""
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"指定した名前のアカウントは既にあり、あなたが入力した\n"
-"ものとは異なるパスワードが設定されています。\n"
-"\n"
-"プロジェクトのウェブサイトに行って、そこにある指示に従ってください。"
+msgstr "指定した名前のアカウントは既にあり、あなたが入力した\nものとは異なるパスワードが設定されています。\n\nプロジェクトのウェブサイトを訪問し、そこにある指示に従ってください。"
 
 #: clientgui/AlreadyExistsPage.cpp:191
 msgid "Email address already in use"
-msgstr "指定した電子メールアドレスはすでに使われています。"
+msgstr "指定した電子メールアドレスはすでに使われています"
 
 #: clientgui/AlreadyExistsPage.cpp:194
 msgid ""
@@ -645,11 +629,7 @@ msgid ""
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"指定した電子メールアドレスのアカウントは既にあり、あなたが入力した\n"
-"ものとは異なるパスワードが設定されています。\n"
-"\n"
-"プロジェクトのウェブサイトに行って、そこにある指示に従ってください。"
+msgstr "指定した電子メールアドレスのアカウントは既にあり、\nあなたが入力したものとは異なるパスワードが設定されています。\n\nプロジェクトのウェブサイトを訪問し、そこにある指示に従ってください。"
 
 #: clientgui/AsyncRPC.cpp:1031
 msgid "Communicating with BOINC client.  Please wait ..."
@@ -658,12 +638,12 @@ msgstr "BOINC クライアントと通信中です。お待ちください ...."
 #: clientgui/AsyncRPC.cpp:1034
 #, c-format
 msgid "&Quit %s"
-msgstr "%s を終了する(&Q)"
+msgstr "%s を終了(&Q)"
 
 #: clientgui/AsyncRPC.cpp:1036
 #, c-format
 msgid "E&xit %s"
-msgstr "%s を終了する(&X)"
+msgstr "%s を終了(&X)"
 
 #: clientgui/AsyncRPC.cpp:1040
 #, c-format
@@ -674,108 +654,90 @@ msgstr "%s - 通信"
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: clientgui/BOINCBaseFrame.cpp:504
+#: clientgui/BOINCBaseFrame.cpp:512
 #, c-format
 msgid "%s - Connection Error"
-msgstr "%s - 接続に異常が発生しました"
+msgstr "%s - 接続エラー"
 
-#: clientgui/BOINCBaseFrame.cpp:513
+#: 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 ""
-"現在のところあなたにはこのクライアントを管理する権限がありません。\n"
-"管理者に連絡して、'boinc_users' ローカルユーザグループにあなたを\n"
-"加えてください。"
+msgstr "現在のところあなたにはこのクライアントを管理する権限がありません。\n管理者に連絡して、'boinc_users' ローカルユーザーグループにあなたを加えてください。"
 
-#: clientgui/BOINCBaseFrame.cpp:522
+#: 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 ""
-"稼動中のクライアントに接続する際に、認証に失敗しました。\n"
-"このプログラムを起動するとき、クライアントと同じディレクトリから起動したか確かめてください。"
+msgstr "稼動中のクライアントに接続する際に、認証に失敗しました。\nこのプログラムを起動するとき、クライアントと同じディレクトリから起動したか確かめてください。"
 
-#: clientgui/BOINCBaseFrame.cpp:524
+#: clientgui/BOINCBaseFrame.cpp:532
 msgid "Authorization failed connecting to running client."
-msgstr "実行中のクライアントと接続するときに、認証に失敗しました。"
+msgstr "稼働中のクライアントと接続するときに、認証に失敗しました。"
 
-#: clientgui/BOINCBaseFrame.cpp:532
+#: clientgui/BOINCBaseFrame.cpp:540
 msgid "The password you have provided is incorrect, please try again."
 msgstr "入力したパスワードに誤りがあります。もう一度試してください。"
 
-#: clientgui/BOINCBaseFrame.cpp:576
+#: clientgui/BOINCBaseFrame.cpp:584
 #, c-format
 msgid "%s - Connection Failed"
-msgstr "%s - 接続に失敗しました"
+msgstr "%s - 接続失敗"
 
-#: clientgui/BOINCBaseFrame.cpp:585
+#: 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 は %s クライアントに接続できませんでした。\n"
-"もう一度、接続を試みますか?"
+msgstr "%s は %s クライアントに接続できませんでした。\nもう一度、接続を試みますか?"
 
-#: clientgui/BOINCBaseFrame.cpp:621
+#: clientgui/BOINCBaseFrame.cpp:629
 #, c-format
 msgid "%s - Daemon Start Failed"
-msgstr "%s - デーモンの開始に失敗しました"
+msgstr "%s - デーモンの起動失敗"
 
-#: clientgui/BOINCBaseFrame.cpp:631
+#: 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 は %s クライアントを開始することができません。\n"
-"コントロールパネルから、管理ツールのサービスを開いて、\n"
-"BOINC サービスを開始してください。"
+msgstr "%s は %s クライアントを開始することができません。\nコントロールパネルから、管理ツールのサービスを開いて、\nBOINC サービスを開始してください。"
 
-#: clientgui/BOINCBaseFrame.cpp:637
+#: 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 は %s クライアントを開始することができません。\n"
-"このクライアント用のデーモンを開始してから、もう一度試してみてください。"
+msgstr "%s は %s クライアントを開始することができません。\nこのクライアント用のデーモンを開始してから、もう一度試してみてください。"
 
-#: clientgui/BOINCBaseFrame.cpp:688
+#: clientgui/BOINCBaseFrame.cpp:696
 #, c-format
 msgid "%s - Connection Status"
 msgstr "%s - 接続状態"
 
-#: clientgui/BOINCBaseFrame.cpp:699
+#: clientgui/BOINCBaseFrame.cpp:707
 #, 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"
 "To connect up to your local computer please use 'localhost' as the host name."
-msgstr ""
-"%s は現在 %s クライアントと繋がっていません。メニューの [高度な操作(D)] から\n"
-"[コンピュータの選択...] へ進み、接続する %s クライアントのコンピュータを選びます。\n"
-"あなたの操作しているコンピュータ自身に接続するには、「コンピュータ名 (ホスト名)」の欄に localhost と入力してください。"
+msgstr "%s は現在 %s クライアントと繋がっていません。メニューの [高度な操作(D)] から\n[コンピュータの選択...] へ進み、接続する %s クライアントのコンピュータを選びます。\nあなたの操作しているコンピュータ自身に接続するには、「コンピュータ名 (ホスト名)」の欄に localhost と入力してください。"
 
-#: clientgui/BOINCBaseView.cpp:752
-#, fuzzy
+#: clientgui/BOINCBaseView.cpp:790
 msgid "Project web pages"
-msgstr "プロジェクトのウェブサイト"
+msgstr "プロジェクトのウェブページ"
 
 #: clientgui/BOINCClientManager.cpp:573
 #, c-format
 msgid "%s - Unexpected Exit"
-msgstr "%s - 予期せぬ終了"
+msgstr "%s - 予期しない終了"
 
 #: 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 ""
-"%s クライアントが %d分間のうちに3回、予期せぬ終了をしました。\n"
-"もう一度再開しますか?"
+msgstr "%s クライアントが %d分間のうちに3回、予期せず終了しました。\nもう一度再開しますか?"
 
 #: clientgui/BOINCDialupManager.cpp:61
 #, c-format
@@ -787,9 +749,7 @@ msgstr "%s - ネットワーク状態"
 msgid ""
 "%s needs to connect to the Internet.\n"
 "May it do so now?"
-msgstr ""
-"%s はインターネットに接続する必要があります。\n"
-"今すぐ接続してよいですか?"
+msgstr "%s はインターネットに接続する必要があります。\n今すぐ接続してよいですか?"
 
 #: clientgui/BOINCDialupManager.cpp:254
 #, c-format
@@ -811,21 +771,19 @@ msgstr "%s はインターネットへの接続に失敗しました"
 msgid ""
 "%s has detected it is now connected to the Internet.\n"
 "Updating all projects and retrying all transfers."
-msgstr ""
-"%s はインターネットへの接続ができていることを今、検出しました。\n"
-"全プロジェクトの状況更新と全てのファイル転送の再開を行っています。"
+msgstr "%s はインターネットへの接続ができていることを今、検出しました。\n全プロジェクトの状況更新と全てのファイル転送の再開を行っています。"
 
 #: clientgui/BOINCDialupManager.cpp:417
 #, c-format
 msgid "%s has successfully disconnected from the Internet."
-msgstr "%s はインターネットとの接続を切ることに成功しました。"
+msgstr "%s はインターネットとの接続切断に成功しました。"
 
 #: clientgui/BOINCDialupManager.cpp:433
 #, c-format
 msgid "%s failed to disconnected from the Internet."
-msgstr "%s はインターネットとの接続を切ることにに失敗しました。"
+msgstr "%s はインターネットとの接続切断に失敗しました。"
 
-#: clientgui/BOINCGUIApp.cpp:595
+#: clientgui/BOINCGUIApp.cpp:597
 #, c-format
 msgid ""
 "You currently are not authorized to manage the client.\n"
@@ -836,96 +794,93 @@ msgid ""
 " or\n"
 "  - contact your administrator to add you to the 'boinc_master'\n"
 "     user group."
-msgstr ""
+msgstr "現在のところあなたにはこのクライアントを管理する権限がありません。\n%s をこのユーザーで動作させるには、 %s をインストールし直し、管理者権限のないユーザーについての質問に「はい」と答えてください。もしくは管理者に連絡して、'boinc_users' ローカルユーザーグループにあなたを加えてください。"
 
-#: clientgui/BOINCGUIApp.cpp:601
+#: clientgui/BOINCGUIApp.cpp:603
 #, c-format
 msgid ""
 "%s ownership or permissions are not set properly; please reinstall %s.\n"
 "(Error code %d"
-msgstr ""
+msgstr "%s に対する所有権あるいは許可情報が正しく設定されていません。%s をインストールし直してください。\n(エラーコード %d"
 
-#: clientgui/BOINCGUIApp.cpp:607
+#: clientgui/BOINCGUIApp.cpp:609
 msgid " at "
-msgstr ""
+msgstr "で"
 
-#: clientgui/BOINCGUIApp.cpp:610
+#: clientgui/BOINCGUIApp.cpp:612
 msgid ")"
 msgstr ")"
 
-#: clientgui/BOINCGUIApp.cpp:640
+#: 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 ""
-"BOINC を正常に実行するためには再起動が必要です。\n"
-"あなたのコンピュータを再起動してから、もう一度試してください。"
+msgstr "BOINC を正しく実行するためには再起動が必要です。\nあなたのコンピュータを再起動してから、もう一度試してください。"
 
-#: clientgui/BOINCGUIApp.cpp:641
+#: clientgui/BOINCGUIApp.cpp:643
 msgid "BOINC Manager"
 msgstr "BOINC マネージャ"
 
-#: clientgui/BOINCGUIApp.cpp:902
+#: clientgui/BOINCGUIApp.cpp:904
 msgid "BOINC Manager was started by the operating system automatically"
 msgstr "BOINC マネージャはオペレーティング・システムにより自動的に起動されました。"
 
-#: clientgui/BOINCGUIApp.cpp:904
+#: clientgui/BOINCGUIApp.cpp:906
 msgid "Startup BOINC so only the system tray icon is visible"
 msgstr "BOINC 起動時に、システムトレイのアイコンだけを表示します"
 
-#: clientgui/BOINCGUIApp.cpp:906
+#: clientgui/BOINCGUIApp.cpp:908
 msgid "Directory containing the BOINC Client executable"
 msgstr "BOINC クライアントの実行可能ファイルがあるディレクトリ"
 
-#: clientgui/BOINCGUIApp.cpp:907
+#: clientgui/BOINCGUIApp.cpp:909
 msgid "BOINC data directory"
 msgstr "BOINC 用データディレクトリ"
 
-#: clientgui/BOINCGUIApp.cpp:909
+#: clientgui/BOINCGUIApp.cpp:911
 msgid "Host name or IP address"
-msgstr "ホスト名 または IPアドレス"
+msgstr "ホスト名または IPアドレス"
 
-#: clientgui/BOINCGUIApp.cpp:910
+#: clientgui/BOINCGUIApp.cpp:912
 msgid "GUI RPC port number"
 msgstr "GUI用 RPC のポート番号"
 
-#: clientgui/BOINCGUIApp.cpp:911
+#: clientgui/BOINCGUIApp.cpp:913
 msgid "Password"
-msgstr "パスワード:"
+msgstr "パスワード:"
 
-#: clientgui/BOINCGUIApp.cpp:912
+#: clientgui/BOINCGUIApp.cpp:914
 msgid "Startup BOINC with these optional arguments"
 msgstr "これらのオプション引数を付けて BOINC を起動します"
 
-#: clientgui/BOINCGUIApp.cpp:913
+#: clientgui/BOINCGUIApp.cpp:915
 msgid "disable BOINC security users and permissions"
 msgstr "BOINC のユーザとアクセス許可についてのセキュリティを無効にします"
 
-#: clientgui/BOINCGUIApp.cpp:914
+#: clientgui/BOINCGUIApp.cpp:916
 msgid "set skin debugging mode to enable skin manager error messages"
 msgstr "skin マネージャのエラーメッセージを有効にするために、skin debugging モードにします"
 
-#: clientgui/BOINCGUIApp.cpp:915
+#: clientgui/BOINCGUIApp.cpp:917
 msgid "multiple instances of BOINC Manager allowed"
-msgstr "BOINC Manager の複数インスタンス起動を許す"
+msgstr "BOINC Manager の複数インスタンス起動を許可"
 
-#: clientgui/BOINCGUIApp.cpp:917
+#: clientgui/BOINCGUIApp.cpp:919
 msgid "Not used: workaround for bug in XCode 4.2"
-msgstr ""
+msgstr "未使用: XCode 4.2のバグ回避策"
 
-#: clientgui/BOINCGUIApp.cpp:1164
+#: clientgui/BOINCGUIApp.cpp:1166
 msgid "(Automatic Detection)"
 msgstr "(言語の自動判別)"
 
-#: clientgui/BOINCGUIApp.cpp:1165
+#: clientgui/BOINCGUIApp.cpp:1167
 msgid "(Unknown)"
-msgstr "(実装上のダミーエントリ1)"
+msgstr "(不明)"
 
-#: clientgui/BOINCGUIApp.cpp:1166
+#: clientgui/BOINCGUIApp.cpp:1168
 msgid "(User Defined)"
-msgstr "(実装上のダミーエントリ2)"
+msgstr "(ユーザー定義)"
 
-# For account managers
 #: clientgui/BOINCTaskBar.cpp:522
 #, c-format
 msgid "Open %s Web..."
@@ -936,14 +891,12 @@ msgstr "%s のウェブサイトを開く..."
 msgid "Open %s..."
 msgstr "%s を開く..."
 
-#: clientgui/BOINCTaskBar.cpp:536
-#: clientgui/BOINCTaskBar.cpp:633
+#: clientgui/BOINCTaskBar.cpp:536 clientgui/BOINCTaskBar.cpp:633
 #: clientgui/BOINCTaskBar.cpp:641
 msgid "Snooze"
 msgstr "休止"
 
-#: clientgui/BOINCTaskBar.cpp:538
-#: clientgui/BOINCTaskBar.cpp:660
+#: clientgui/BOINCTaskBar.cpp:538 clientgui/BOINCTaskBar.cpp:660
 #: clientgui/BOINCTaskBar.cpp:668
 msgid "Snooze GPU"
 msgstr "GPU を休止"
@@ -957,9 +910,8 @@ msgid "Resume"
 msgstr "再開"
 
 #: clientgui/BOINCTaskBar.cpp:653
-#, fuzzy
 msgid "Resume GPU"
-msgstr "再開"
+msgstr "GPUを再開"
 
 #: clientgui/BOINCTaskBar.cpp:727
 msgid "Computing is enabled"
@@ -1000,7 +952,7 @@ msgstr "%s からのお知らせ"
 
 #: clientgui/BOINCTaskBar.cpp:825
 msgid "There are new notices - click to view."
-msgstr "新しいお知らせがあります - クリックして見てください。"
+msgstr "新しいお知らせがあります - 確認するにはクリックします。"
 
 #: clientgui/CompletionErrorPage.cpp:199
 msgid "Failed to add project"
@@ -1008,7 +960,7 @@ msgstr "プロジェクトの追加に失敗"
 
 #: clientgui/CompletionErrorPage.cpp:204
 msgid "Failed to update account manager"
-msgstr "アカウント・マネージャとの最新状況の更新に失敗"
+msgstr "アカウント・マネージャの更新に失敗"
 
 #: clientgui/CompletionErrorPage.cpp:208
 msgid "Failed to remove account manager"
@@ -1016,25 +968,23 @@ msgstr "アカウント・マネージャの削除に失敗"
 
 #: clientgui/CompletionErrorPage.cpp:212
 msgid "Failed to add account manager"
-msgstr "アカウント・マネージャへの追加に失敗"
+msgstr "アカウント・マネージャの追加に失敗"
 
 #: clientgui/CompletionErrorPage.cpp:221
 msgid ""
 "Please try again later.\n"
 "\n"
 "Click Finish to close."
-msgstr ""
+msgstr "後でもう一度試してください。\n\n[終了]をクリックするとウィンドウを閉じます。"
 
-#: 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 "[終了] をクリックして閉じてください。"
+msgstr "ウィンドウを閉じるには[終了] をクリックします。"
 
 #: clientgui/CompletionErrorPage.cpp:234
 msgid "Messages from server:"
-msgstr "サーバからのメッセージ:"
+msgstr "サーバからのメッセージ:"
 
 #: clientgui/CompletionPage.cpp:207
 msgid "Project added"
@@ -1048,9 +998,7 @@ msgstr "このプロジェクトの追加に成功しました。"
 msgid ""
 "When you click Finish, your web browser will go to a page where\n"
 "you can set your account name and preferences."
-msgstr ""
-"[終了] をクリックすると、アカウント名とプレファレンス (好みの設定) を\n"
-"指定するためのウェブページが開きます。"
+msgstr "[終了] をクリックすると、アカウント名とプレファレンス(好みの設定)を\n指定するためのウェブページが開きます。"
 
 #: clientgui/CompletionPage.cpp:232
 #, c-format
@@ -1086,608 +1034,699 @@ msgstr "%s について"
 
 #: clientgui/DlgAbout.cpp:172
 msgid "Version:"
-msgstr "バージョン:"
+msgstr "バージョン:"
 
 #: clientgui/DlgAbout.cpp:180
 msgid "wxWidgets Version:"
-msgstr "wxWidgets Version:"
+msgstr "wxWidgets のバージョン:"
 
 #: clientgui/DlgAbout.cpp:188
 msgid "Copyright:"
-msgstr "Copyright:"
+msgstr "著作権表記:"
 
 #: clientgui/DlgAbout.cpp:192
 msgid ""
-"(C) 2003-2014 University of California, Berkeley.\n"
+"(C) 2003-2015 University of California, Berkeley.\n"
 "All Rights Reserved."
-msgstr ""
+msgstr "(C) 2003-2015 University of California, Berkeley.\nAll Rights Reserved."
 
 #: clientgui/DlgAbout.cpp:196
-msgid "Berkeley Open Infrastructure for Network Computing"
-msgstr "Berkeley Open Infrastructure for Network Computing"
+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:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:399
+#: clientgui/DlgAbout.cpp:203
+msgid "Visit "
+msgstr "訪問"
+
+#: clientgui/DlgAbout.cpp:211
+msgid "for more information."
+msgstr "詳細については。"
+
+#: clientgui/DlgAbout.cpp:219 clientgui/DlgExitMessage.cpp:173
+#: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:399
 #: clientgui/DlgSelectComputer.cpp:163
 msgid "&OK"
-msgstr "&OK"
+msgstr "OK(&O)"
 
-#: clientgui/DlgAdvPreferences.cpp:602
-msgid "invalid number"
-msgstr ""
+#: clientgui/DlgAdvPreferences.cpp:669
+msgid "Invalid number"
+msgstr "無効な数字"
 
-#: clientgui/DlgAdvPreferences.cpp:603
-msgid "invalid time, format is HH:MM"
-msgstr "時間が正しくありません。形式は「HH:MM」"
+#: clientgui/DlgAdvPreferences.cpp:670
+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:604
-msgid "invalid time interval, format is HH:MM-HH:MM"
-msgstr "時間帯が正しくありません。形式は「HH:MM-HH:MM」"
+#: clientgui/DlgAdvPreferences.cpp:671
+msgid "Number must be between 0 and 10"
+msgstr "数字は 0 から 10 の間でなければなりません"
 
-#: clientgui/DlgAdvPreferences.cpp:817
+#: clientgui/DlgAdvPreferences.cpp:672
+msgid "Number must be between 0 and 100"
+msgstr "数字は 0 から 100 の間でなければなりません"
+
+#: clientgui/DlgAdvPreferences.cpp:905
 msgid "invalid input value detected"
-msgstr "正しくない入力値があります"
+msgstr "無効な入力値が検出されました"
 
-#: clientgui/DlgAdvPreferences.cpp:819
+#: clientgui/DlgAdvPreferences.cpp:907
 msgid "Validation Error"
 msgstr "検証エラー"
 
-#: clientgui/DlgAdvPreferences.cpp:969
-#: clientgui/DlgAdvPreferences.cpp:975
-#: clientgui/DlgAdvPreferences.cpp:981
-msgid "Applications to add"
-msgstr ""
-
-#: clientgui/DlgAdvPreferences.cpp:998
-#, c-format
-msgid "'%s' is not an executable application."
-msgstr ""
+#: clientgui/DlgAdvPreferences.cpp:1119
+msgid "Discard local preferences and use web-based preferences?"
+msgstr "ローカル・プレファレンスを放棄してウェブ上のプレファレンスを使用しますか?"
 
-#: clientgui/DlgAdvPreferences.cpp:999
-#: clientgui/DlgAdvPreferences.cpp:1046
-#: clientgui/DlgAdvPreferences.cpp:1070
-msgid "Add Exclusive App"
-msgstr ""
-
-#: clientgui/DlgAdvPreferences.cpp:1011
-msgid "Name of application to add?"
-msgstr ""
-
-#: clientgui/DlgAdvPreferences.cpp:1011
-msgid "Add exclusive app"
-msgstr ""
-
-#: clientgui/DlgAdvPreferences.cpp:1045
-#, c-format
-msgid "Application names must end with '%s'"
-msgstr ""
+#: clientgui/DlgAdvPreferences.cpp:1120
+msgid "Confirmation"
+msgstr "確認"
 
-#: clientgui/DlgAdvPreferences.cpp:1069
+#: clientgui/DlgAdvPreferencesBase.cpp:54
 #, c-format
-msgid "'%s' is already in the list."
-msgstr ""
+msgid "%s - Computing preferences"
+msgstr "%s - 計算に関するプレファレンス(好みの設定)"
 
-#: clientgui/DlgAdvPreferences.cpp:1161
+#: clientgui/DlgAdvPreferencesBase.cpp:77
 msgid ""
-"Do you really want to clear all local preferences?\n"
-"(This will not affect exclusive applications.)"
-msgstr ""
+"Using local preferences.\n"
+"Click \"Use web prefs\" to use web-based preferences from"
+msgstr "ローカル・プレファレンスを使用しています。\n[ウェブのプレファレンスを使用する]をクリックすると下記のウェブ上のプレファレンスを使用します:"
 
-#: clientgui/DlgAdvPreferences.cpp:1162
-msgid "Confirmation"
-msgstr "確認"
+#: clientgui/DlgAdvPreferencesBase.cpp:85
+msgid "Using web-based preferences from"
+msgstr "下記のウェブ上のプレファレンスを使用しています:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:49
-#, c-format
-msgid "%s - Computing preferences"
-msgstr ""
+#: clientgui/DlgAdvPreferencesBase.cpp:102
+msgid "Set values and click OK to use local preferences instead."
+msgstr "代わりにローカル・プレファレンスを使用する場合、値を設定しOKをクリックします。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:66
-#, fuzzy
+#: clientgui/DlgAdvPreferencesBase.cpp:111
 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 ""
-"ここでは、このコンピュータだけに適用するプレファレンスを変更します。\n"
-"変更をするならば、OKをクリックしてください。\n"
-"プロジェクトウェブサイトで設定した値に戻すなら、[クリア]をクリックしてください。"
+"Click Clear to restore web-based settings."
+msgstr "このダイアログでは、このコンピュータだけに適用するプレファレンスを管理します。\n設定するにはOKをクリックしてください。\nプロジェクトのウェブサイトで設定した値に戻すなら、[クリア]をクリックしてください。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:69
+#: clientgui/DlgAdvPreferencesBase.cpp:114
 msgid "Clear"
 msgstr "クリア"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:70
-msgid "clear all local preferences and close the dialog"
-msgstr "このコンピュータだけに適用するプレファレンス(好みの設定)を全てクリアして、ダイアログを終了します。"
+#: clientgui/DlgAdvPreferencesBase.cpp:115
+msgid "Clear all local preferences and close the dialog."
+msgstr "このコンピュータだけに適用するプレファレンスを全てクリアして、ダイアログを終了します。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:85
-msgid "processor usage"
-msgstr "プロセッサ使用設定"
+#: clientgui/DlgAdvPreferencesBase.cpp:118
+msgid "Use web prefs"
+msgstr "ウェブのプレファレンスを使用する"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:88
-msgid "network usage"
-msgstr "ネットワーク使用"
+#: clientgui/DlgAdvPreferencesBase.cpp:119
+msgid "Restore web-based preferences and close the dialog."
+msgstr "ウェブ上のプレファレンスを復元しダイアログを終了します。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:91
-msgid "disk and memory usage"
-msgstr "ディスクおよびメモリ使用"
+#: clientgui/DlgAdvPreferencesBase.cpp:143
+#: clientgui/DlgAdvPreferencesBase.cpp:637
+msgid "Computing"
+msgstr "計算"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:94
-msgid "exclusive applications"
-msgstr ""
+#: clientgui/DlgAdvPreferencesBase.cpp:146
+#: clientgui/DlgAdvPreferencesBase.cpp:785
+msgid "Network"
+msgstr "ネットワーク"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:107
-#: clientgui/DlgDiagnosticLogFlags.cpp:104
+#: clientgui/DlgAdvPreferencesBase.cpp:149
+msgid "Disk and memory"
+msgstr "ディスクとメモリ"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:152
+msgid "Daily schedules"
+msgstr "日ごとのスケジュール"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:165
+#: clientgui/DlgDiagnosticLogFlags.cpp:119 clientgui/DlgExclusiveApps.cpp:146
+#: clientgui/DlgHiddenColumns.cpp:100
 msgid "OK"
 msgstr "OK"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:108
-msgid "save all values and close the dialog"
-msgstr "すべての値を保存して、ダイアログを終了します"
+#: clientgui/DlgAdvPreferencesBase.cpp:166
+msgid "Save all values and close the dialog."
+msgstr "すべての値を保存して、ダイアログを終了します。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:114
-msgid "close the dialog without saving"
-msgstr "保存をしないでダイアログを終了します"
+#: clientgui/DlgAdvPreferencesBase.cpp:172
+msgid "Close the dialog without saving."
+msgstr "保存せずにダイアログを終了します。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:118
-#: clientgui/Localization.cpp:35
-#: clientgui/Localization.cpp:121
-#: clientgui/Localization.cpp:139
+#: clientgui/DlgAdvPreferencesBase.cpp:176 clientgui/DlgExclusiveApps.cpp:157
 msgid "Help"
 msgstr "ヘルプ"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
-msgid "shows the preferences web page"
-msgstr "プレファレンス(好みの設定)のウェブページを開きます"
+#: clientgui/DlgAdvPreferencesBase.cpp:177
+msgid "Shows the preferences web page."
+msgstr "プレファレンス(好みの設定)のウェブページを開きます。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:141
-msgid "Computing allowed"
-msgstr "計算実行時間帯"
+#: clientgui/DlgAdvPreferencesBase.cpp:239
+#: clientgui/DlgAdvPreferencesBase.cpp:425
+msgid "Usage limits"
+msgstr "使用量の制限"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
-msgid "While computer is on batteries"
-msgstr "バッテリ駆動時の稼動"
+#: clientgui/DlgAdvPreferencesBase.cpp:244
+#, 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:149
-msgid "check this if you want this computer to do work while it runs on batteries"
-msgstr "バッテリ稼動時にも計算を実行する場合はチェックしてください"
+#: clientgui/DlgAdvPreferencesBase.cpp:246
+#: clientgui/DlgAdvPreferencesBase.cpp:258
+msgid "Use at most"
+msgstr "最大で"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:155
-msgid "While computer is in use"
-msgstr "コンピュータを使っている最中の稼動"
+#: clientgui/DlgAdvPreferencesBase.cpp:251
+#, no-c-format
+msgid "% of the CPUs"
+msgstr "% の CPUコアまで"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:158
-msgid "check this if you want this computer to do work even when you're using it"
-msgstr "あなたがコンピュータ利用中でも計算を実行する場合は、ここにチェックを入れます。"
+#: clientgui/DlgAdvPreferencesBase.cpp:256
+#, 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."
+msgstr "CPU温度とエネルギー使用量を抑制するために数秒ごとに計算を一時停止/再開する。例: 75%であれば、3秒計算・1秒一時停止を繰り返すということです。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:164
-msgid "Use GPU while computer is in use"
-msgstr "コンピュータ利用中に GPU を使う"
+#: clientgui/DlgAdvPreferencesBase.cpp:263
+#, no-c-format
+msgid "% of CPU time"
+msgstr "% の CPU 時間まで"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:167
-msgid "check this if you want your GPU to do work even when you're using the computer"
-msgstr "あなたがコンピュータを利用中でも、GPU を計算に使うならばここにチェックを入れます"
+#: clientgui/DlgAdvPreferencesBase.cpp:270
+msgid "When to suspend"
+msgstr "いつ一時停止するか"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:179
-msgid "Only after computer has been idle for"
-msgstr "アイドル時間が次の時間を超えた時のみ計算を実行します"
+#: clientgui/DlgAdvPreferencesBase.cpp:276
+msgid "Suspend when computer is on battery"
+msgstr "コンピュータがバッテリーで稼働している時一時停止"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:188
-msgid "do work only after you haven't used the computer for this number of minutes"
-msgstr "指定した時間(分)の間、コンピュータを操作しなかった場合のみ計算をします"
+#: clientgui/DlgAdvPreferencesBase.cpp:279
+msgid ""
+"Check this to suspend computing on portables when running on battery power."
+msgstr "携帯用機器でバッテリー電源で動作している時計算を一時停止するには、ここにチェックを入れてください。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:193
-#: clientgui/DlgAdvPreferencesBase.cpp:342
-msgid "minutes"
-msgstr "分"
+#: clientgui/DlgAdvPreferencesBase.cpp:285
+msgid "Suspend when computer is in use"
+msgstr "コンピュータを使用中は、計算を一時停止"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:212
-msgid "While processor usage is less than"
-msgstr "CPU使用率が右の値より低いときにだけ計算を実行します"
+#: clientgui/DlgAdvPreferencesBase.cpp:288
+msgid ""
+"Check this to suspend computing and file transfers when you're using the "
+"computer."
+msgstr "あなたがコンピュータを使用している時計算とファイル転送を一時停止するには、ここにチェックを入れます。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:221
-msgid "suspend work if processor usage exceeds this level"
-msgstr "プロセッサ使用率がこのレベルを超えると仕事を一時中断します"
+#: clientgui/DlgAdvPreferencesBase.cpp:294
+msgid "Suspend GPU computing when computer is in use"
+msgstr "コンピュータを使用中は、GPU による計算を一時停止"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:226
-msgid "percent (0 means no restriction)"
-msgstr "%(0を指定すれば制約なし)"
+#: clientgui/DlgAdvPreferencesBase.cpp:297
+msgid "Check this to suspend GPU computing when you're using the computer."
+msgstr "あなたがコンピュータを使用している時 GPU による計算を一時停止するには、ここにチェックを入れます。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:240
-#: clientgui/DlgAdvPreferencesBase.cpp:506
-msgid "Every day between hours of"
-msgstr "1日の動作時間帯"
+#: clientgui/DlgAdvPreferencesBase.cpp:302
+msgid "This determines when the computer is considered 'in use'."
+msgstr "ここではコンピュータがどんな場合に「使用中」とみなすか決定します。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
-msgid "start work at this time"
-msgstr "処理開始時刻"
+#: clientgui/DlgAdvPreferencesBase.cpp:306
+msgid "'In use' means mouse/keyboard input in last"
+msgstr "「使用中」とは、マウス・キーボード入力が右の時間内にあった場合のことです:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:248
-#: clientgui/DlgAdvPreferencesBase.cpp:514
-msgid "and"
-msgstr "~"
+#: clientgui/DlgAdvPreferencesBase.cpp:314
+#: clientgui/DlgAdvPreferencesBase.cpp:387
+msgid "minutes"
+msgstr "分"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:252
-msgid "stop work at this time"
-msgstr "処理終了時刻"
+#: clientgui/DlgAdvPreferencesBase.cpp:321
+#, c-format
+msgid "Suspend when non-%s CPU usage is above"
+msgstr "超えることで一時停止する場合の %s 以外のCPU使用量:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
-#: clientgui/DlgAdvPreferencesBase.cpp:522
-msgid "(no restriction if equal)"
-msgstr "(値が同じだと時間の制約なし)"
+#: clientgui/DlgAdvPreferencesBase.cpp:323
+msgid "Suspend computing when your computer is busy running other programs."
+msgstr "コンピュータが他のプログラムによってビジー状態にある時、計算を一時停止します。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:261
-#: clientgui/DlgAdvPreferencesBase.cpp:527
-msgid "Day-of-week override:"
-msgstr "曜日ごとの設定:"
+#: clientgui/DlgAdvPreferencesBase.cpp:344
+#: clientgui/DlgAdvPreferencesBase.cpp:474
+msgid "Other"
+msgstr "その他"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:266
-#: clientgui/DlgAdvPreferencesBase.cpp:532
-msgid "check box to specify hours for this day of week"
-msgstr "この曜日で時間帯を指定するにはチェックを入れてください"
+#: clientgui/DlgAdvPreferencesBase.cpp:349
+msgid "Store at least enough tasks to keep the computer busy for this long."
+msgstr "長期間コンピュータのビジー状態を保つために、最低に見積もっても十分なタスクを蓄えておきます。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:272
-#: clientgui/DlgAdvPreferencesBase.cpp:538
-msgid "Monday"
-msgstr "月曜日"
+#: clientgui/DlgAdvPreferencesBase.cpp:352
+msgid "Store at least"
+msgstr "最低限の備蓄量:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:279
-#: clientgui/DlgAdvPreferencesBase.cpp:545
-msgid "Tuesday"
-msgstr "火曜日"
+#: clientgui/DlgAdvPreferencesBase.cpp:360
+#: clientgui/DlgAdvPreferencesBase.cpp:376
+msgid "days of work"
+msgstr "日分の仕事"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:286
-#: clientgui/DlgAdvPreferencesBase.cpp:552
-msgid "Wednesday"
-msgstr "水曜日"
+#: clientgui/DlgAdvPreferencesBase.cpp:365
+msgid ""
+"Store additional tasks above the minimum level.  Determines how much work is"
+" requested when contacting a project."
+msgstr "最小レベル以上の追加タスクを備蓄してください。プロジェクトに連絡する際に要求される作業の量を決定します。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:293
-#: clientgui/DlgAdvPreferencesBase.cpp:559
-msgid "Thursday"
-msgstr "木曜日"
+#: clientgui/DlgAdvPreferencesBase.cpp:368
+msgid "Store up to an additional"
+msgstr "追加で下記の分まで備蓄:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:300
-#: clientgui/DlgAdvPreferencesBase.cpp:566
-msgid "Friday"
-msgstr "金曜日"
+#: clientgui/DlgAdvPreferencesBase.cpp:381
+#, c-format
+msgid "If you run several projects, %s may switch between them this often."
+msgstr "いくつかのプロジェクトを動作させる場合、%s はこの間隔でそれらプロジェクトを切り替えるでしょう"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:307
-#: clientgui/DlgAdvPreferencesBase.cpp:573
-msgid "Saturday"
-msgstr "土曜日"
+#: clientgui/DlgAdvPreferencesBase.cpp:383
+msgid "Switch between tasks every"
+msgstr "タスクの切り替え間隔"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:580
-msgid "Sunday"
-msgstr "日曜日"
+#: clientgui/DlgAdvPreferencesBase.cpp:391
+msgid ""
+"This controls how often tasks save their state to disk, so that they can be "
+"restarted later."
+msgstr "ここではタスクが後ほど再起動されることが出来るようにするために、ディスクにその状態を保存する間隔を設定します。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:328
-msgid "Other options"
-msgstr "その他のオプション"
+#: clientgui/DlgAdvPreferencesBase.cpp:392
+msgid "Request tasks to checkpoint at most every"
+msgstr "タスクにチェックポイント書き込みを要求する最大間隔"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:336
-msgid "Switch between applications every"
-msgstr "アプリケーションの切り替え間隔"
+#: clientgui/DlgAdvPreferencesBase.cpp:396
+msgid "seconds"
+msgstr "秒毎"
 
-# This entry is paired with "% of processors".
-#: clientgui/DlgAdvPreferencesBase.cpp:345
-msgid "On multiprocessor systems, use at most"
-msgstr "マルチプロセッサの場合、全プロセッサのうち使うのは"
+#: clientgui/DlgAdvPreferencesBase.cpp:431
+msgid "Limit the download rate of file transfers."
+msgstr "ファイル転送のダウンロード速度を制限します。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
-#, no-c-format
-msgid "% of the processors (0 means no restriction)"
-msgstr ""
+#: clientgui/DlgAdvPreferencesBase.cpp:432
+msgid "Limit download rate to"
+msgstr "ダウンロード速度を下記に制限"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:355
-#: clientgui/DlgAdvPreferencesBase.cpp:618
-#: clientgui/DlgAdvPreferencesBase.cpp:640
-#: clientgui/DlgAdvPreferencesBase.cpp:661
-#: clientgui/DlgAdvPreferencesBase.cpp:683
-#: clientgui/DlgAdvPreferencesBase.cpp:694
-msgid "Use at most"
-msgstr "最大で"
+#: clientgui/DlgAdvPreferencesBase.cpp:436
+#: clientgui/DlgAdvPreferencesBase.cpp:445
+msgid "KB/second"
+msgstr "KB/秒"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:362
-#, no-c-format
-msgid "% of CPU time (0 means no restriction)"
-msgstr ""
+#: clientgui/DlgAdvPreferencesBase.cpp:440
+msgid "Limit the upload rate of file transfers."
+msgstr "ファイル転送のアップロード速度を制限します。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:386
-msgid "General options"
-msgstr "一般的なオプション"
+#: clientgui/DlgAdvPreferencesBase.cpp:441
+msgid "Limit upload rate to"
+msgstr "アップロード速度を下記に制限"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:395
-msgid "Maximum download rate"
-msgstr "最大ダウンロード速度"
+#: clientgui/DlgAdvPreferencesBase.cpp:452
+#, c-format
+msgid "Example: %s should transfer at most 2000 MB of data every 30 days."
+msgstr "例: %s は多くとも30日ごとに2000MBのデータまで転送するはずです。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:401
-#: clientgui/DlgAdvPreferencesBase.cpp:410
-msgid "KBytes/second (0 means no restriction)"
-msgstr ""
+#: clientgui/DlgAdvPreferencesBase.cpp:454
+msgid "Limit usage to"
+msgstr "使用限度量"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:404
-msgid "Maximum upload rate"
-msgstr "最大アップロード速度"
+#: clientgui/DlgAdvPreferencesBase.cpp:458
+msgid "MB every"
+msgstr "MB/"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:417
-#, fuzzy
-msgid "Minimum work buffer"
-msgstr "仕事の備蓄"
+#: clientgui/DlgAdvPreferencesBase.cpp:462
+msgid "days"
+msgstr "日"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:425
-msgid "Try to maintain enough tasks to keep busy for this many days"
-msgstr ""
+#: clientgui/DlgAdvPreferencesBase.cpp:479
+#, 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:431
-#: clientgui/DlgAdvPreferencesBase.cpp:449
-msgid "days (maximum value: 10)"
-msgstr ""
+#: clientgui/DlgAdvPreferencesBase.cpp:481
+msgid "Skip data verification for image files"
+msgstr "画像ファイルのデータ検証をスキップする"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:437
-#, fuzzy
-msgid "Max additional work buffer"
-msgstr "仕事の備蓄"
+#: clientgui/DlgAdvPreferencesBase.cpp:485
+msgid "Confirm before connecting to Internet"
+msgstr "インターネットに接続する前に確認する"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:445
-msgid "In addition, maintain enough tasks for up to this many days"
-msgstr ""
+#: clientgui/DlgAdvPreferencesBase.cpp:486
+#: clientgui/DlgAdvPreferencesBase.cpp:490
+msgid "Useful only if you have a modem, ISDN or VPN connection."
+msgstr "モデム、ISDN または VPN 接続を使っているときのみ便利です。"
 
-# This sequence of texts and forms deeply depends on English. Hardly to be traslated into Japanese in normal manner.
-#: clientgui/DlgAdvPreferencesBase.cpp:454
-msgid "Transfer at most"
-msgstr "一定期間内の転送量上限:"
+#: clientgui/DlgAdvPreferencesBase.cpp:489
+msgid "Disconnect when done"
+msgstr "終わったら切断"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:462
-msgid "MBytes every"
-msgstr ""
+#: clientgui/DlgAdvPreferencesBase.cpp:516
+msgid "Disk"
+msgstr "ディスク"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:468
-msgid "days (0 means no restriction)"
-msgstr ""
+#: clientgui/DlgAdvPreferencesBase.cpp:521
+#, c-format
+msgid "%s will use the most restrictive of these settings:"
+msgstr "%sは、これら3つの設定のうち最も制限的なものを使用します:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:476
-msgid "Skip image file verification"
-msgstr "イメージファイルの検証をスキップする"
+#: clientgui/DlgAdvPreferencesBase.cpp:527
+#, c-format
+msgid "Limit the total amount of disk space used by %s."
+msgstr "%sによって使用されるディスク領域の合計を制限します。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:478
-msgid "check this if your Internet provider modifies image files"
-msgstr "インターネットプロバイダが画像ファイルを変更する場合はチェックを入れてください。"
+#: clientgui/DlgAdvPreferencesBase.cpp:530
+#: clientgui/DlgAdvPreferencesBase.cpp:554
+msgid "Use no more than"
+msgstr "使用上限:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:484
-msgid "Connect options"
-msgstr "接続オプション"
+#: clientgui/DlgAdvPreferencesBase.cpp:534
+msgid "GB"
+msgstr "GB"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:487
-msgid "Confirm before connecting to internet"
-msgstr "インターネットに接続する前に確認する"
+#: clientgui/DlgAdvPreferencesBase.cpp:539
+#, c-format
+msgid ""
+"Limit disk usage to leave this much free space on the volume where %s stores"
+" data."
+msgstr "%s のデータを格納するボリュームでこれだけの空きスペースを残してディスク使用量を制限します。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
-msgstr "チェックを入れると、インターネットに接続する前に確認ダイアログが表示されます。"
+#: clientgui/DlgAdvPreferencesBase.cpp:542
+msgid "Leave at least"
+msgstr "最低限の空き領域"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:493
-msgid "Disconnect when done"
-msgstr "終わったら切断"
+#: clientgui/DlgAdvPreferencesBase.cpp:546
+msgid "GB free"
+msgstr "GB の空き領域"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:495
+#: clientgui/DlgAdvPreferencesBase.cpp:551
+#, c-format
 msgid ""
-"if checked, BOINC hangs up when network usage is done\n"
-"(only relevant for dialup-connection)"
-msgstr ""
-"チェックを入れると、ネットワーク使用終了時に BOINC が電話を切ります\n"
-"(ダイアルアップ接続の場合のみ有意)"
+"Limit the percentage of disk space used by %s on the volume where it stores "
+"data."
+msgstr "データを格納するボリュームで %s が使用するディスク領域の割合を制限します。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:501
-msgid "Network usage allowed"
-msgstr "ネットワーク使用を許す時間帯"
+#: clientgui/DlgAdvPreferencesBase.cpp:559
+#, no-c-format
+msgid "% of total"
+msgstr "% まで(全体比)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:510
-msgid "network usage start hour"
-msgstr "ネットワーク使用開始時刻"
+#: clientgui/DlgAdvPreferencesBase.cpp:566
+msgid "Memory"
+msgstr "メモリ"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:518
-msgid "network usage stop hour"
-msgstr "ネットワーク使用終了時刻"
+#: clientgui/DlgAdvPreferencesBase.cpp:571
+#, c-format
+msgid "Limit the memory used by %s when you're using the computer."
+msgstr "あなたがコンピュータを使用している時 %s よって使用されるメモリを制限します。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:610
-#: clientgui/DlgItemProperties.cpp:257
-msgid "Disk usage"
-msgstr "ディスク領域"
+#: clientgui/DlgAdvPreferencesBase.cpp:573
+msgid "When computer is in use, use at most"
+msgstr "コンピュータを使用中、最大使用時でも"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:622
-msgid "the maximum disk space used by BOINC (in Gigabytes)"
-msgstr "BOINC使用最大ディスク使用量(ギガバイト)"
+#: clientgui/DlgAdvPreferencesBase.cpp:579
+#: clientgui/DlgAdvPreferencesBase.cpp:591
+#: clientgui/DlgAdvPreferencesBase.cpp:607
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:626
-msgid "Gigabytes disk space (0 means no restriction)"
-msgstr ""
+#: clientgui/DlgAdvPreferencesBase.cpp:584
+#, c-format
+msgid "Limit the memory used by %s when you're not using the computer."
+msgstr "あなたがコンピュータを使用していない時 %s によって使用されるメモリを制限します。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:629
-msgid "Leave at least"
-msgstr "最低限の未使用領域"
+#: clientgui/DlgAdvPreferencesBase.cpp:586
+msgid "When computer is not in use, use at most"
+msgstr "コンピュータが使用されていない時、最大使用時でも"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:633
-msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
-msgstr "BOINC は、ディスク空き容量がこの値を下まわるところまでは使いません(単位はギガバイト)"
+#: clientgui/DlgAdvPreferencesBase.cpp:595
+msgid "Leave non-GPU tasks in memory while suspended"
+msgstr "一時停止中に、GPU向けでないタスクをメモリ上に残す"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:637
-msgid "Gigabytes disk space free"
-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."
+msgstr "チェックを入れた場合、一時停止されたタスクはメモリにとどまり、仕事のロスなしで再開します。チェックを外した場合、一時停止されたタスクはメモリから取り除かれ、最後のチェックポイントから再開します。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
-msgid "BOINC uses at most this percentage of total disk space"
-msgstr "BOINC使用最大ディスク使用率(パーセント)"
+#: clientgui/DlgAdvPreferencesBase.cpp:600
+#, c-format
+msgid "Limit the swap space (page file) used by %s."
+msgstr "%s によって使用されるスワップ領域(ページファイル)を制限します。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:649
-#, no-c-format
-msgid "% of total disk space"
-msgstr "% (ディスク全体に対する使用率)"
+#: clientgui/DlgAdvPreferencesBase.cpp:602
+msgid "Page/swap file: use at most"
+msgstr "ページ/スワップファイル: 最大使用時でも"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:652
-msgid "Tasks checkpoint to disk at most every"
-msgstr "タスクがチェックポイントでディスクに書く最小間隔"
+#: clientgui/DlgAdvPreferencesBase.cpp:627
+msgid "and"
+msgstr "~"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
-msgid "seconds"
-msgstr "秒毎"
+#: clientgui/DlgAdvPreferencesBase.cpp:628
+msgid "to"
+msgstr "へ"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:668
-#, no-c-format
-msgid "% of page file (swap space)"
-msgstr "% (ページファイル/スワップ領域 の使用率)"
+#: clientgui/DlgAdvPreferencesBase.cpp:641
+msgid "Compute only during a particular period each day."
+msgstr "それぞれの日の特定範囲の時間帯だけ計算します。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:675
-msgid "Memory usage"
-msgstr "メモリ使用"
+#: clientgui/DlgAdvPreferencesBase.cpp:644
+msgid "Compute only between"
+msgstr "下記の間だけ計算:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
-#, no-c-format
-msgid "% when computer is in use"
-msgstr "% (コンピュータ利用中)"
+#: clientgui/DlgAdvPreferencesBase.cpp:654
+#: clientgui/DlgAdvPreferencesBase.cpp:801
+msgid "Day-of-week override"
+msgstr "曜日ごとの設定"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:701
-#, no-c-format
-msgid "% when computer is idle"
-msgstr "% (コンピュータ・アイドル時)"
+#: clientgui/DlgAdvPreferencesBase.cpp:658
+#: clientgui/DlgAdvPreferencesBase.cpp:805
+msgid "Override the times above on the selected days:"
+msgstr "選択した日には上記の時間を設定解除します:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:706
-msgid "Leave applications in memory while suspended"
-msgstr "一時停止時にアプリケーションをメモリ上に残す"
+#: clientgui/DlgAdvPreferencesBase.cpp:676
+#: clientgui/DlgAdvPreferencesBase.cpp:822
+msgid "Monday"
+msgstr "月曜日"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:708
-msgid "if checked, suspended work units are left in memory"
-msgstr "チェックをいれると、休止中のワークユニットはメモリに残ります"
+#: clientgui/DlgAdvPreferencesBase.cpp:691
+#: clientgui/DlgAdvPreferencesBase.cpp:837
+msgid "Friday"
+msgstr "金曜日"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:728
-msgid "Suspend processor and network usage when these applications are running:"
-msgstr ""
+#: clientgui/DlgAdvPreferencesBase.cpp:704
+#: clientgui/DlgAdvPreferencesBase.cpp:850
+msgid "Tuesday"
+msgstr "火曜日"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:738
-msgid "Add..."
-msgstr ""
+#: clientgui/DlgAdvPreferencesBase.cpp:719
+#: clientgui/DlgAdvPreferencesBase.cpp:865
+msgid "Saturday"
+msgstr "土曜日"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:739
-msgid "Add an application to this list"
-msgstr ""
+#: clientgui/DlgAdvPreferencesBase.cpp:732
+#: clientgui/DlgAdvPreferencesBase.cpp:878
+msgid "Wednesday"
+msgstr "水曜日"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:744
-msgid "Remove"
-msgstr "削除"
+#: clientgui/DlgAdvPreferencesBase.cpp:747
+#: clientgui/DlgAdvPreferencesBase.cpp:893
+msgid "Sunday"
+msgstr "日曜日"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:745
-msgid "Remove an application from this list"
-msgstr ""
+#: clientgui/DlgAdvPreferencesBase.cpp:760
+#: clientgui/DlgAdvPreferencesBase.cpp:906
+msgid "Thursday"
+msgstr "木曜日"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:754
-msgid "For advanced options, refer to "
-msgstr ""
+#: clientgui/DlgAdvPreferencesBase.cpp:789
+msgid "Transfer files only during a particular period each day."
+msgstr "それぞれの日の特定範囲の時間帯だけファイルを転送します。"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:791
+msgid "Transfer files only between"
+msgstr "下記の間だけファイルを転送"
 
 #: clientgui/DlgDiagnosticLogFlags.cpp:65
 #, c-format
 msgid "%s Diagnostic Log Flags"
-msgstr ""
+msgstr "%s の診断ログのフラグ"
 
 #: clientgui/DlgDiagnosticLogFlags.cpp:83
-msgid "These flags enable various types of diagnostic messages in the Event Log."
-msgstr ""
+msgid ""
+"These flags enable various types of diagnostic messages in the Event Log."
+msgstr "これらのフラグは、イベントログ内のさまざまな種類の診断メッセージを可能にします。"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:105
+#: clientgui/DlgDiagnosticLogFlags.cpp:99
+msgid "More info ..."
+msgstr "詳細情報…"
+
+#: clientgui/DlgDiagnosticLogFlags.cpp:120 clientgui/DlgHiddenColumns.cpp:101
 msgid "Save all values and close the dialog"
-msgstr ""
+msgstr "すべての値を保存して、ダイアログを終了する"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:108
+#: clientgui/DlgDiagnosticLogFlags.cpp:123 clientgui/DlgHiddenColumns.cpp:104
 msgid "Defaults"
-msgstr ""
+msgstr "初期値"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:109
+#: clientgui/DlgDiagnosticLogFlags.cpp:124 clientgui/DlgHiddenColumns.cpp:105
 msgid "Restore default settings"
-msgstr ""
+msgstr "初期値の設定を復元"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:113
+#: clientgui/DlgDiagnosticLogFlags.cpp:128 clientgui/DlgHiddenColumns.cpp:109
 msgid "Close the dialog without saving"
-msgstr ""
+msgstr "保存せずにダイアログを終了する"
 
-#: clientgui/DlgEventLog.cpp:226
+#: clientgui/DlgEventLog.cpp:227
 #, c-format
 msgid "%s - Event Log"
 msgstr "%s - イベント・ログ"
 
-#: clientgui/DlgEventLog.cpp:236
+#: clientgui/DlgEventLog.cpp:237
 msgid "Project"
 msgstr "プロジェクト"
 
-#: clientgui/DlgEventLog.cpp:237
+#: clientgui/DlgEventLog.cpp:238
 msgid "Time"
 msgstr "日時"
 
-#: clientgui/DlgEventLog.cpp:238
+#: clientgui/DlgEventLog.cpp:239
 msgid "Message"
 msgstr "メッセージ"
 
-#: clientgui/DlgEventLog.cpp:300
-#: clientgui/DlgEventLog.cpp:364
-#, fuzzy
+#: clientgui/DlgEventLog.cpp:301 clientgui/DlgEventLog.cpp:351
 msgid "&Show only this project"
-msgstr "このプロジェクトだけを表示"
+msgstr "およびこのプロジェクトだけを表示"
 
-#: clientgui/DlgEventLog.cpp:304
-#, fuzzy
+#: clientgui/DlgEventLog.cpp:305
 msgid "Copy &All"
-msgstr "すべてコピー"
+msgstr "すべてコピー(&A)"
 
-#: clientgui/DlgEventLog.cpp:306
-#: clientgui/DlgEventLog.cpp:310
+#: clientgui/DlgEventLog.cpp:307 clientgui/DlgEventLog.cpp:311
 msgid "Copy all the messages to the clipboard."
 msgstr "全メッセージをクリップボードにコピーします"
 
-#: clientgui/DlgEventLog.cpp:315
-#, fuzzy
+#: clientgui/DlgEventLog.cpp:316
 msgid "Copy &Selected"
-msgstr "選択部分をコピー"
+msgstr "選択部分をコピー(&S)"
 
-#: clientgui/DlgEventLog.cpp:318
-#: clientgui/DlgEventLog.cpp:326
-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
+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:320
-#: clientgui/DlgEventLog.cpp:328
-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: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."
+msgstr "選択したメッセージをクリップボードにコピーします。シフトまたはコントロールキーを押しながら、メッセージをクリックすれば複数のメッセージを選択できます。 "
 
-#: clientgui/DlgEventLog.cpp:335
-#: clientgui/DlgItemProperties.cpp:67
+#: clientgui/DlgEventLog.cpp:336 clientgui/DlgItemProperties.cpp:67
 msgid "&Close"
 msgstr "閉じる(&C)"
 
-#: clientgui/DlgEventLog.cpp:344
-#, c-format
-msgid "Get help with %s"
-msgstr "%s について助けを求める"
-
-#: clientgui/DlgEventLog.cpp:358
-#, fuzzy
+#: clientgui/DlgEventLog.cpp:345
 msgid "Show all &messages"
-msgstr "全メッセージを表示"
+msgstr "全メッセージを表示(&M)"
 
-#: clientgui/DlgEventLog.cpp:359
-#: clientgui/DlgEventLog.cpp:361
+#: clientgui/DlgEventLog.cpp:346 clientgui/DlgEventLog.cpp:348
 msgid "Show messages for all projects"
 msgstr "すべてのプロジェクトのメッセージを表示"
 
-#: clientgui/DlgEventLog.cpp:365
-#: clientgui/DlgEventLog.cpp:367
+#: clientgui/DlgEventLog.cpp:352 clientgui/DlgEventLog.cpp:354
 msgid "Show only the messages for the selected project"
 msgstr "選択したプロジェクトのメッセージだけを表示"
 
+#: clientgui/DlgExclusiveApps.cpp:60
+#, c-format
+msgid "%s - Exclusive Applications"
+msgstr "%s - 排他的なアプリケーション"
+
+#: clientgui/DlgExclusiveApps.cpp:72
+msgid ""
+"Suspend processor and network usage when these applications are running:"
+msgstr "これらのアプリケーションが動作中の場合プロセッサとネットワーク使用を一時停止:"
+
+#: clientgui/DlgExclusiveApps.cpp:80 clientgui/DlgExclusiveApps.cpp:104
+msgid "Add..."
+msgstr "追加…"
+
+#: clientgui/DlgExclusiveApps.cpp:81 clientgui/DlgExclusiveApps.cpp:105
+msgid "Add an application to this list"
+msgstr "このリストにアプリケーションを追加"
+
+#: clientgui/DlgExclusiveApps.cpp:86 clientgui/DlgExclusiveApps.cpp:110
+msgid "Remove"
+msgstr "削除"
+
+#: clientgui/DlgExclusiveApps.cpp:87 clientgui/DlgExclusiveApps.cpp:111
+msgid "Remove an application from this list"
+msgstr "このリストからアプリケーションを削除"
+
+#: clientgui/DlgExclusiveApps.cpp:96
+msgid "Suspend GPU usage when these applications are running:"
+msgstr "これらのアプリケーションが動作中の場合 GPU での計算を一時停止:"
+
+#: clientgui/DlgExclusiveApps.cpp:122
+msgid "For advanced options, refer to "
+msgstr "上級オプションについては右記を参照してください: "
+
+#: clientgui/DlgExclusiveApps.cpp:147
+msgid "save all values and close the dialog"
+msgstr "すべての値を保存して、ダイアログを終了します"
+
+#: clientgui/DlgExclusiveApps.cpp:153
+msgid "close the dialog without saving"
+msgstr "保存をしないでダイアログを終了します"
+
+#: clientgui/DlgExclusiveApps.cpp:158
+msgid "shows the preferences web page"
+msgstr "プレファレンス(好みの設定)のウェブページを開きます"
+
+#: clientgui/DlgExclusiveApps.cpp:303 clientgui/DlgExclusiveApps.cpp:309
+#: clientgui/DlgExclusiveApps.cpp:315
+msgid "Applications to add"
+msgstr "追加するアプリケーション"
+
+#: clientgui/DlgExclusiveApps.cpp:332
+#, c-format
+msgid "'%s' is not an executable application."
+msgstr "「 %s 」は実行可能なアプリケーションではありません。"
+
+#: clientgui/DlgExclusiveApps.cpp:333 clientgui/DlgExclusiveApps.cpp:380
+#: clientgui/DlgExclusiveApps.cpp:404
+msgid "Add Exclusive App"
+msgstr "排他的なアプリケーションを追加"
+
+#: clientgui/DlgExclusiveApps.cpp:345
+msgid "Name of application to add?"
+msgstr "追加するアプリケーションの名前は?"
+
+#: clientgui/DlgExclusiveApps.cpp:345
+msgid "Add exclusive app"
+msgstr "排他的なアプリケーションを追加"
+
+#: clientgui/DlgExclusiveApps.cpp:379
+#, c-format
+msgid "Application names must end with '%s'"
+msgstr "アプリケーション名は「 %s 」で終わる必要があります"
+
+#: clientgui/DlgExclusiveApps.cpp:403
+#, c-format
+msgid "'%s' is already in the list."
+msgstr "「 %s 」は既にリストの中にあります。"
+
 #: clientgui/DlgExitMessage.cpp:82
 #, c-format
 msgid "%s - Exit Confirmation"
-msgstr "%s - 終了の確認"
+msgstr "%s - 終了確認"
 
 #: clientgui/DlgExitMessage.cpp:130
 #, c-format
@@ -1698,7 +1737,7 @@ msgid ""
 "\n"
 "If you also want to stop running the tasks,\n"
 "choose from the following options:"
-msgstr ""
+msgstr "あなたはコンピュータ上で動作するタスクを閲覧し管理を可能とする %s を終了するよう要求しました。\n\nもしタスクの動作も停止する場合は、以下のオプションから選択します:"
 
 #: clientgui/DlgExitMessage.cpp:135
 #, c-format
@@ -1709,27 +1748,19 @@ msgid ""
 "In most cases, it is better just to close the %s window\n"
 "rather than to exit the application; that will allow %s to run its\n"
 "tasks at the times you selected in your preferences."
-msgstr ""
-"%s とそのタスクを完全に終了させます。 その後 %s アプリケーション\n"
-"または %s スクリーンセイバーが再起動されるまでは再開しません。\n"
-"\n"
-"多くの場合,アプリケーションを終了するよりも %s ウィンドウを閉じるだけ\n"
-"のほうが良いでしょう。そうすれば、プレファレンス (好みの設定) で\n"
-"あなたが設定した時間帯に %s タスクが走ります。"
+msgstr "%s とそのタスクを完全に終了させます。その後 %s アプリケーションまたは %s スクリーンセーバーは再起動されるまで再開しません。\n\n多くの場合,アプリケーションを終了するよりも %s ウィンドウを閉じるだけのほうが良いでしょう。そうすれば、プレファレンス(好みの設定)であなたが設定した時間帯に %s タスクが動作します。"
 
 #: clientgui/DlgExitMessage.cpp:153
 #, c-format
 msgid "Stop running tasks when exiting the %s"
-msgstr ""
+msgstr "%s を終了するときタスクの動作を停止する"
 
 #: clientgui/DlgExitMessage.cpp:165
 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
 msgid "&Cancel"
 msgstr "キャンセル(&C)"
 
@@ -1737,48 +1768,60 @@ msgstr "キャンセル(&C)"
 msgid "Don't show this dialog again."
 msgstr "再びこのダイアログを表示しない"
 
-#: clientgui/DlgItemProperties.cpp:194
-#: clientgui/DlgItemProperties.cpp:197
-#: clientgui/DlgItemProperties.cpp:200
-#: clientgui/DlgItemProperties.cpp:203
-#, fuzzy
+#: clientgui/DlgHiddenColumns.cpp:64
+#, c-format
+msgid "%s Column Selection"
+msgstr "%s カラムの選択"
+
+#: clientgui/DlgHiddenColumns.cpp:77
+#, c-format
+msgid "Select which columns %s should show."
+msgstr "%s がどのカラムを表示すべきか選択します。"
+
+#: clientgui/DlgHiddenColumns.cpp:314
+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
 msgid "Don't fetch tasks for "
-msgstr "CPU向けタスクを新たに取得しない"
+msgstr "このプロジェクトのタスクを取得しない: "
 
 #: clientgui/DlgItemProperties.cpp:194
 msgid "Project preference"
 msgstr "プロジェクトごとのプレファレンス"
 
 #: clientgui/DlgItemProperties.cpp:197
-#, fuzzy
 msgid "Account manager preference"
-msgstr "アカウント・マネージャのウェブサイト"
+msgstr "アカウント・マネージャのプレファレンス"
 
 #: clientgui/DlgItemProperties.cpp:200
-#, fuzzy
 msgid "Project has no apps for "
-msgstr "プロジェクトのウェブサイト"
+msgstr "プロジェクトには以下に適したアプリケーションがありません:"
 
 #: clientgui/DlgItemProperties.cpp:203
 msgid "Client configuration excludes "
-msgstr ""
+msgstr "クライアントの環境設定を除外する"
 
 #: clientgui/DlgItemProperties.cpp:207
-#, fuzzy
 msgid " work fetch deferred for"
-msgstr "CPU 向けの仕事を獲得する処理の保留時間"
+msgstr "仕事取得の保留時間:"
 
 #: clientgui/DlgItemProperties.cpp:208
-#, fuzzy
 msgid " work fetch deferral interval"
-msgstr "CPU 向けの仕事を獲得する処理の保留間隔"
+msgstr "仕事取得処理の保留時間の間隔:"
 
 #: clientgui/DlgItemProperties.cpp:239
 msgid "Properties of project "
 msgstr "プロジェクトのプロパティ  "
 
-#: clientgui/DlgItemProperties.cpp:243
-#: clientgui/DlgOptions.cpp:221
+#: clientgui/DlgItemProperties.cpp:243 clientgui/DlgOptions.cpp:221
 msgid "General"
 msgstr "一般"
 
@@ -1788,7 +1831,7 @@ msgstr "マスター URL"
 
 #: clientgui/DlgItemProperties.cpp:245
 msgid "User name"
-msgstr "参加者名(User name) "
+msgstr "参加者名(ユーザー名)"
 
 #: clientgui/DlgItemProperties.cpp:246
 msgid "Team name"
@@ -1800,15 +1843,19 @@ msgstr "リソース割り当て"
 
 #: clientgui/DlgItemProperties.cpp:249
 msgid "Scheduler RPC deferred for"
-msgstr "スケジューラ RPC の保留時間"
+msgstr "スケジューラ RPC の保留時間:"
 
 #: clientgui/DlgItemProperties.cpp:252
 msgid "File downloads deferred for"
-msgstr "ファイルダウンロード 待機"
+msgstr "ファイルダウンロード待機時間:"
 
 #: clientgui/DlgItemProperties.cpp:255
 msgid "File uploads deferred for"
-msgstr "ファイルアップロード 待機"
+msgstr "ファイルアップロード待機時間:"
+
+#: clientgui/DlgItemProperties.cpp:257
+msgid "Disk usage"
+msgstr "ディスク領域"
 
 #: clientgui/DlgItemProperties.cpp:258
 msgid "Computer ID"
@@ -1818,29 +1865,24 @@ msgstr "コンピュータ ID"
 msgid "Non CPU intensive"
 msgstr "CPU を集中的に使わない"
 
-#: 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 "はい"
 
 #: clientgui/DlgItemProperties.cpp:262
 msgid "Suspended via GUI"
-msgstr "GUI 経由で保留状態にされている"
+msgstr "GUI 経由で保留中"
 
-#: clientgui/DlgItemProperties.cpp:262
-#: clientgui/DlgItemProperties.cpp:263
+#: clientgui/DlgItemProperties.cpp:262 clientgui/DlgItemProperties.cpp:263
 msgid "no"
 msgstr "いいえ"
 
 #: clientgui/DlgItemProperties.cpp:263
 msgid "Don't request more work"
-msgstr "新しい仕事を取りに行かない"
+msgstr "新しい仕事を要請しない"
 
 #: clientgui/DlgItemProperties.cpp:265
 msgid "Scheduler call in progress"
@@ -1848,12 +1890,11 @@ msgstr "スケジューラへ要求中"
 
 #: clientgui/DlgItemProperties.cpp:268
 msgid "Trickle-up pending"
-msgstr ""
+msgstr "トリクルアップの送信保留あり"
 
-#: clientgui/DlgItemProperties.cpp:271
-#: clientgui/DlgItemProperties.cpp:273
+#: clientgui/DlgItemProperties.cpp:271 clientgui/DlgItemProperties.cpp:273
 msgid "Host location"
-msgstr "計算機の所在"
+msgstr "計算機の所在場所"
 
 #: clientgui/DlgItemProperties.cpp:273
 msgid "default"
@@ -1873,15 +1914,15 @@ msgstr "終了した"
 
 #: clientgui/DlgItemProperties.cpp:285
 msgid "Tasks completed"
-msgstr ""
+msgstr "タスク完了"
 
 #: clientgui/DlgItemProperties.cpp:286
 msgid "Tasks failed"
-msgstr ""
+msgstr "タスク失敗"
 
 #: clientgui/DlgItemProperties.cpp:288
 msgid "Credit"
-msgstr "功績(credit)の値"
+msgstr "功績値"
 
 #: clientgui/DlgItemProperties.cpp:289
 msgid "User"
@@ -1896,22 +1937,20 @@ msgid "Scheduling"
 msgstr "スケジューリング"
 
 #: clientgui/DlgItemProperties.cpp:306
-#, fuzzy
 msgid "Scheduling priority"
-msgstr "CPU 向けスケジューリングの優先度"
+msgstr "スケジューリングの優先度"
 
 #: clientgui/DlgItemProperties.cpp:307
 msgid "CPU"
-msgstr ""
+msgstr "CPU"
 
-# good translation not found
 #: clientgui/DlgItemProperties.cpp:331
 msgid "Duration correction factor"
-msgstr "Duration correction factor"
+msgstr "期間補正因子"
 
 #: clientgui/DlgItemProperties.cpp:345
 msgid "Properties of task "
-msgstr "タスクのプロパティ : "
+msgstr "タスクのプロパティ"
 
 #: clientgui/DlgItemProperties.cpp:357
 msgid "Application"
@@ -1939,25 +1978,23 @@ msgstr "リソース"
 
 #: clientgui/DlgItemProperties.cpp:370
 msgid "Estimated computation size"
-msgstr ""
+msgstr "推定計算量"
 
 #: clientgui/DlgItemProperties.cpp:373
 msgid "CPU time at last checkpoint"
-msgstr "最新のチェックポイントでの CPU 時間"
+msgstr "最新のチェックポイントでのCPU時間"
 
-#: clientgui/DlgItemProperties.cpp:374
-#: clientgui/DlgItemProperties.cpp:389
+#: clientgui/DlgItemProperties.cpp:374 clientgui/DlgItemProperties.cpp:389
 msgid "CPU time"
 msgstr "CPU時間"
 
-#: clientgui/DlgItemProperties.cpp:376
-#: clientgui/DlgItemProperties.cpp:390
+#: clientgui/DlgItemProperties.cpp:376 clientgui/DlgItemProperties.cpp:390
 msgid "Elapsed time"
 msgstr "経過時間"
 
 #: clientgui/DlgItemProperties.cpp:378
 msgid "Estimated time remaining"
-msgstr "処理完了までの想定時間"
+msgstr "推定される残り時間"
 
 #: clientgui/DlgItemProperties.cpp:379
 msgid "Fraction done"
@@ -1981,20 +2018,19 @@ msgstr "プロセスID"
 
 #: clientgui/DlgItemProperties.cpp:456
 msgid "Local: "
-msgstr "Local:"
+msgstr "ローカル:"
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: clientgui/DlgOptions.cpp:129 clientgui/DlgOptions.cpp:135
 msgid "Options"
-msgstr ""
+msgstr "オプション"
 
 #: clientgui/DlgOptions.cpp:178
 msgid "Language:"
-msgstr "言語:"
+msgstr "言語:"
 
 #: clientgui/DlgOptions.cpp:185
 msgid "What language should BOINC use?"
-msgstr "BOINC が表示に使う言語を何にするか"
+msgstr "BOINC が表示に使う言語を何にしますか?"
 
 #: clientgui/DlgOptions.cpp:189
 msgid "Notice reminder interval:"
@@ -2002,23 +2038,23 @@ msgstr "お知らせの通知間隔:"
 
 #: clientgui/DlgOptions.cpp:196
 msgid "How often should BOINC remind you of new notices?"
-msgstr "新規のお知らせがあることを BOINC があなたに伝える頻度"
+msgstr "どれくらいの間隔で BOINC はあなたに新しいお知らせを通知すべきですか?"
 
 #: clientgui/DlgOptions.cpp:201
 msgid "Run Manager at login?"
-msgstr "マネージャをログイン時に起動するか?"
+msgstr "マネージャをログオン時に起動しますか?"
 
 #: clientgui/DlgOptions.cpp:207
 msgid "Run the BOINC Manager when you log on."
-msgstr "BOINC マネージャをあなたがログインしたときに起動する。"
+msgstr "あなたがログオンしたときにBOINC マネージャを起動します。"
 
 #: clientgui/DlgOptions.cpp:212
 msgid "Enable Manager exit dialog?"
-msgstr "マネージャ停止時のダイアログを有効化"
+msgstr "マネージャ終了時のダイアログを有効化しますか?"
 
 #: clientgui/DlgOptions.cpp:218
 msgid "Display the exit dialog when shutting down the Manager."
-msgstr "このマネージャ・プログラムを停止させるときにダイアログを表示する"
+msgstr "このマネージャ・プログラムを停止させるときに終了ダイアログを表示します。"
 
 #: clientgui/DlgOptions.cpp:229
 msgid "Dial-up and Virtual Private Network settings"
@@ -2034,7 +2070,7 @@ msgstr "初期値をクリア(&C)"
 
 #: clientgui/DlgOptions.cpp:255
 msgid "Default Connection:"
-msgstr "通常の接続:"
+msgstr "初期値での接続:"
 
 #: clientgui/DlgOptions.cpp:262
 msgid "Connections"
@@ -2048,36 +2084,30 @@ msgstr "HTTP プロキシサーバ経由で接続する"
 msgid "HTTP Proxy Server Configuration"
 msgstr "HTTP プロキシサーバの設定"
 
-#: clientgui/DlgOptions.cpp:283
-#: clientgui/DlgOptions.cpp:347
+#: clientgui/DlgOptions.cpp:283 clientgui/DlgOptions.cpp:347
 msgid "Address:"
-msgstr "アドレス:"
+msgstr "アドレス:"
 
-#: clientgui/DlgOptions.cpp:291
-#: clientgui/DlgOptions.cpp:355
+#: clientgui/DlgOptions.cpp:291 clientgui/DlgOptions.cpp:355
 msgid "Port:"
-msgstr "ポート番号:"
+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
 msgid "User Name:"
-msgstr "プロキシのユーザ名:"
+msgstr "プロキシのユーザー名:"
 
-#: clientgui/DlgOptions.cpp:320
-#: clientgui/DlgOptions.cpp:384
+#: clientgui/DlgOptions.cpp:320 clientgui/DlgOptions.cpp:384
 #: clientgui/DlgSelectComputer.cpp:152
 msgid "Password:"
-msgstr "パスワード:"
+msgstr "パスワード:"
 
 #: clientgui/DlgOptions.cpp:327
 msgid "HTTP Proxy"
@@ -2107,7 +2137,6 @@ msgstr "1時間"
 msgid "6 hours"
 msgstr "6時間"
 
-# This sequence of texts and forms deeply depends on English. Hardly to be traslated into Japanese in normal manner.
 #: clientgui/DlgOptions.cpp:592
 msgid "1 day"
 msgstr "1日"
@@ -2116,7 +2145,6 @@ msgstr "1日"
 msgid "1 week"
 msgstr "1週間"
 
-# This sequence of texts and forms deeply depends on English. Hardly to be traslated into Japanese in normal manner.
 #: clientgui/DlgOptions.cpp:594
 msgid "never"
 msgstr "通知しない"
@@ -2128,8 +2156,10 @@ msgstr "%s - 言語の選択"
 
 #: 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 "%s の言語設定を切り換えました。切り換えの効果を出すためには、この %s を再起動しなければなりません。"
+msgid ""
+"The %s's language has been changed.  In order for this change to take "
+"effect, you must restart the %s."
+msgstr "%s の言語設定を切り換えました。効果の変更を適用するためには、この %s を再起動しなければなりません。"
 
 #: clientgui/DlgSelectComputer.cpp:91
 #, c-format
@@ -2141,16 +2171,13 @@ msgstr "%s - コンピュータの選択"
 msgid ""
 "Another instance of %s is already running \n"
 "on this computer.  Please select a client to monitor."
-msgstr ""
-"このコンピュータではすでに %s の別のインスタンスが\n"
-"走っています。監視するクライアントを選択してください。"
+msgstr "このコンピュータではすでに %s の別のインスタンスが走っています。監視するクライアントを選択してください。"
 
 #: clientgui/DlgSelectComputer.cpp:143
 msgid "Host name:"
-msgstr "計算機名 (ホスト名):"
+msgstr "計算機名(ホスト名):"
 
-#: clientgui/Localization.cpp:31
-#: clientgui/Localization.cpp:69
+#: clientgui/Localization.cpp:31 clientgui/Localization.cpp:69
 msgid "Message boards"
 msgstr "掲示板"
 
@@ -2160,20 +2187,17 @@ msgstr "SETI at home の掲示版で他の参加者と連絡をとる"
 
 #: clientgui/Localization.cpp:37
 msgid "Ask questions and report problems"
-msgstr "質問をしたり、問題の発生報告をする"
+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 "あなたのアカウント情報と功績 (credit) の総計を表示する"
+msgstr "あなたのアカウント情報と功績値の総計を表示する"
 
 #: clientgui/Localization.cpp:43
 msgid "Your preferences"
@@ -2181,34 +2205,29 @@ msgstr "あなたのプレファレンス"
 
 #: clientgui/Localization.cpp:45
 msgid "View and modify your SETI at home account profile and preferences"
-msgstr "あなたの SETI at home アカウントのプロファイルとプレファレンス (好みの設定) を表示・修正する"
+msgstr "あなたの SETI at home アカウントのプロフィールとプレファレンス(好みの設定)を表示・修正する"
 
-#: 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 "先週 (およびそれ以前)の計算について、リザルトと仕事を表示する"
+msgstr "先週およびそれ以前の計算結果と仕事を表示する"
 
-#: clientgui/Localization.cpp:51
-#: clientgui/Localization.cpp:93
+#: clientgui/Localization.cpp:51 clientgui/Localization.cpp:93
 msgid "Your computers"
 msgstr "あなたのコンピュータ"
 
 #: clientgui/Localization.cpp:53
 msgid "View a listing of all the computers on which you are running SETI at Home"
-msgstr "SETI at Home に参加させているコンピュータ全ての一覧を表示"
+msgstr "SETI at Home に参加させているあなたのコンピュータ全ての一覧を表示"
 
-#: 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 "あなたの所属するチームの情報を表示する"
 
@@ -2218,19 +2237,20 @@ msgstr "一般的な質問"
 
 #: clientgui/Localization.cpp:63
 msgid "Read the Einstein at Home Frequently Asked Question list"
-msgstr "Einstein at Home についてしばしば聞かれる質問 (FAQ) の一覧を表示"
+msgstr "Einstein at Home についてよくある質問(FAQ)の一覧を表示"
 
 #: clientgui/Localization.cpp:65
 msgid "Screensaver info"
-msgstr "スクリーンセイバー情報"
+msgstr "スクリーンセーバー情報"
 
 #: clientgui/Localization.cpp:67
 msgid "Read a detailed description of the Einstein at Home screensaver"
-msgstr "Einstein at Home スクリーンセイバーについての詳細を表示"
+msgstr "Einstein at Home スクリーンセーバーについての詳細説明を表示"
 
 #: clientgui/Localization.cpp:71
-msgid "Correspond with admins and other users on the Einstein at Home message boards"
-msgstr "Einstein at Home 掲示板で、管理者と参加者に連絡"
+msgid ""
+"Correspond with admins and other users on the Einstein at Home message boards"
+msgstr "Einstein at Home 掲示板で管理者と他の参加者と連絡をとる"
 
 #: clientgui/Localization.cpp:73
 msgid "Einstein status"
@@ -2250,23 +2270,26 @@ msgstr "Einstein at Home の 問題とバグ報告の掲示板へのリンク"
 
 #: clientgui/Localization.cpp:83
 msgid "View and modify your Einstein at Home account profile and preferences"
-msgstr "Einstein at Home のあなたのアカウントとプレファレンス (好みの設定) の表示・変更"
+msgstr "Einstein at Home のあなたのアカウントとプレファレンス(好みの設定)の表示・変更"
 
 #: clientgui/Localization.cpp:85
 msgid "Account summary"
 msgstr "アカウントの要約"
 
 #: clientgui/Localization.cpp:95
-msgid "View a listing of all the computers on which you are running Einstein at Home"
-msgstr "あなたが稼動させている Einstein at Home の全コンピュータの一覧"
+msgid ""
+"View a listing of all the computers on which you are running Einstein at Home"
+msgstr "あなたが Einstein at Home を稼動させている全てのコンピュータの一覧を表示"
 
 #: clientgui/Localization.cpp:101
 msgid "LIGO project"
 msgstr "LIGO プロジェクト"
 
 #: clientgui/Localization.cpp:103
-msgid "The home page of the Laser Interferometer Gravitational-wave Observatory (LIGO) project"
-msgstr "LIGO プロジェクトのホームページ(Laser Interferometer Gravitational-wave Observatory)"
+msgid ""
+"The home page of the Laser Interferometer Gravitational-wave Observatory "
+"(LIGO) project"
+msgstr "LIGO(Laser Interferometer Gravitational-wave Observatory)プロジェクトのホームページ"
 
 #: clientgui/Localization.cpp:105
 msgid "GEO-600 project"
@@ -2274,10 +2297,9 @@ msgstr "GEO-600 プロジェクト"
 
 #: clientgui/Localization.cpp:107
 msgid "The home page of the GEO-600 project"
-msgstr "GEO-600 プロジェクトの ホームページ"
+msgstr "GEO-600 プロジェクトのホームページ"
 
-#: clientgui/Localization.cpp:115
-#: clientgui/Localization.cpp:133
+#: clientgui/Localization.cpp:115 clientgui/Localization.cpp:133
 msgid "Team"
 msgstr "チーム"
 
@@ -2299,15 +2321,15 @@ msgstr "climateprediction.net のニュース"
 
 #: clientgui/Localization.cpp:131
 msgid "View your account information, credits, and trickles"
-msgstr "あなたのアカウントの情報、功績 (credit)、トリクルメッセージの表示"
+msgstr "あなたのアカウントの情報、功績値、トリクルメッセージの表示"
 
 #: clientgui/Localization.cpp:135
 msgid "Info about your team"
-msgstr "所属チームの情報"
+msgstr "所属チームに関する情報"
 
 #: clientgui/Localization.cpp:141
 msgid "Search for help in our help system"
-msgstr "我々のヘルプ・システムで検索"
+msgstr "私たちのヘルプ・システムでヘルプを検索"
 
 #: clientgui/Localization.cpp:143
 msgid "Global Statistics"
@@ -2315,11 +2337,11 @@ msgstr "グローバルな統計情報"
 
 #: clientgui/Localization.cpp:145
 msgid "Summary statistics for World Community Grid"
-msgstr "World Community Grid の統計情報のまとめ"
+msgstr "World Community Grid の要約統計"
 
 #: clientgui/Localization.cpp:147
 msgid "My Grid"
-msgstr "グリッド"
+msgstr "自分のグリッド"
 
 #: clientgui/Localization.cpp:149
 msgid "Your statistics and settings"
@@ -2327,11 +2349,11 @@ msgstr "あなたの統計情報と設定"
 
 #: clientgui/Localization.cpp:151
 msgid "Device Profiles"
-msgstr "装置のプロファイル"
+msgstr "デバイスのプロフィール"
 
 #: clientgui/Localization.cpp:153
 msgid "Update your device settings"
-msgstr "あなたの装置の設定を更新"
+msgstr "あなたのデバイス設定を更新"
 
 #: clientgui/Localization.cpp:155
 msgid "Research"
@@ -2339,36 +2361,37 @@ msgstr "研究"
 
 #: clientgui/Localization.cpp:157
 msgid "Learn about the projects hosted at World Community Grid"
-msgstr "World Community Grid で動作しているプロジェクトについての手引き"
+msgstr "World Community Grid で運営されるプロジェクトについて知る"
 
 #: clientgui/MainDocument.cpp:583
 msgid "Starting client"
-msgstr "クライアント起動中"
+msgstr "クライアントを起動中"
 
 #: clientgui/MainDocument.cpp:591
 msgid "Connecting to client"
-msgstr "クライアントに接続処理中。"
+msgstr "クライアントに接続中"
 
 #: clientgui/MainDocument.cpp:1205
 msgid "Retrieving system state; please wait..."
-msgstr "システムの状態を読み出しています。お待ちください..."
+msgstr "システムの状態を取得しています。お待ちください..."
 
 #: clientgui/MainDocument.cpp:1826
-#, fuzzy
 msgid "Missing application"
-msgstr "アプリケーション"
+msgstr "見つからないアプリケーション"
 
 #: clientgui/MainDocument.cpp:1827
-msgid "Please download and install the CoRD application from http://cord.sourceforge.net"
-msgstr ""
+msgid ""
+"Please download and install the CoRD application from "
+"http://cord.sourceforge.net"
+msgstr "http://cord.sourceforge.net から CoRD アプリケーションをダウンロードし、インストールしてください。"
 
 #: clientgui/MainDocument.cpp:2442
 msgid "on batteries"
-msgstr "バッテリで駆動中"
+msgstr "バッテリーで駆動中"
 
 #: clientgui/MainDocument.cpp:2443
 msgid "computer is in use"
-msgstr "コンピュータを別途利用中"
+msgstr "コンピュータを別途使用中"
 
 #: clientgui/MainDocument.cpp:2444
 msgid "user request"
@@ -2388,7 +2411,7 @@ msgstr "ディスク容量の不足 - 好みの設定(プレファレンス)を
 
 #: clientgui/MainDocument.cpp:2448
 msgid "computer is not in use"
-msgstr "コンピュータの利用者なし"
+msgstr "コンピュータ使用されていない"
 
 #: clientgui/MainDocument.cpp:2449
 msgid "starting up"
@@ -2400,23 +2423,23 @@ msgstr "排他的なアプリケーションを実行中"
 
 #: clientgui/MainDocument.cpp:2451
 msgid "CPU is busy"
-msgstr "CPU が別途利用中"
+msgstr "CPU を別途使用中"
 
 #: clientgui/MainDocument.cpp:2452
 msgid "network bandwidth limit exceeded"
-msgstr "ネットワーク帯域幅の制約超過"
+msgstr "ネットワーク帯域幅の使用制約超過"
 
 #: clientgui/MainDocument.cpp:2453
 msgid "requested by operating system"
-msgstr ""
+msgstr "オペレーティングシステムの指示による"
 
 #: clientgui/MainDocument.cpp:2455
 msgid "unknown reason"
-msgstr "理由不明"
+msgstr "不明な理由"
 
 #: clientgui/MainDocument.cpp:2477
 msgid "GPU missing, "
-msgstr "GPU がありません、"
+msgstr "GPU が見当たりません、"
 
 #: clientgui/MainDocument.cpp:2484
 msgid "New"
@@ -2428,10 +2451,9 @@ msgstr "ダウンロード失敗"
 
 #: clientgui/MainDocument.cpp:2490
 msgid "Downloading"
-msgstr "ダウンロード処理中"
+msgstr "ダウンロード中"
 
-#: clientgui/MainDocument.cpp:2492
-#: clientgui/MainDocument.cpp:2557
+#: clientgui/MainDocument.cpp:2492 clientgui/MainDocument.cpp:2551
 msgid " (suspended - "
 msgstr "(一時停止中 - "
 
@@ -2443,105 +2465,102 @@ msgstr "参加者によってプロジェクト一時停止"
 msgid "Task suspended by user"
 msgstr "参加者によってタスク一時停止"
 
-#: clientgui/MainDocument.cpp:2504
+#: clientgui/MainDocument.cpp:2507
 msgid "Suspended - "
 msgstr "一時停止中 - "
 
-# 75%
 #: clientgui/MainDocument.cpp:2510
-#, fuzzy
 msgid "GPU suspended - "
-msgstr "(一時停止中 - "
+msgstr "GPUは一時停止中 -"
 
-#: clientgui/MainDocument.cpp:2517
+#: clientgui/MainDocument.cpp:2514
 msgid "Waiting for memory"
 msgstr "メモリ不足のため待機"
 
-#: clientgui/MainDocument.cpp:2519
+#: clientgui/MainDocument.cpp:2516
 msgid "Waiting for shared memory"
 msgstr "共有メモリが空くまで待機中"
 
-#: clientgui/MainDocument.cpp:2521
+#: clientgui/MainDocument.cpp:2518
 msgid "Running"
 msgstr "実行中"
 
-#: clientgui/MainDocument.cpp:2523
+#: clientgui/MainDocument.cpp:2520
 msgid " (non-CPU-intensive)"
-msgstr "(常時 CPU を使用するわけではありません)"
+msgstr "(常時 CPU を使用するわけではありません)"
 
-#: clientgui/MainDocument.cpp:2526
+#: clientgui/MainDocument.cpp:2523
 msgid "Waiting to run"
 msgstr "実行待機"
 
-#: clientgui/MainDocument.cpp:2528
-#: clientgui/MainDocument.cpp:2534
+#: clientgui/MainDocument.cpp:2525 clientgui/MainDocument.cpp:2528
 msgid "Ready to start"
 msgstr "開始まで待機"
 
-#: clientgui/MainDocument.cpp:2538
+#: clientgui/MainDocument.cpp:2532
 msgid "Postponed: "
-msgstr ""
+msgstr "次まで延期:"
 
-#: clientgui/MainDocument.cpp:2541
+#: clientgui/MainDocument.cpp:2535
 msgid "Postponed"
-msgstr ""
+msgstr "延期"
 
-#: clientgui/MainDocument.cpp:2545
+#: clientgui/MainDocument.cpp:2539
 msgid "Waiting for network access"
-msgstr ""
+msgstr "ネットワーク接続の待機中"
 
-#: clientgui/MainDocument.cpp:2549
+#: clientgui/MainDocument.cpp:2543
 msgid "Computation error"
-msgstr "計算エラー"
+msgstr "計算中に異常発生"
 
-#: clientgui/MainDocument.cpp:2553
+#: clientgui/MainDocument.cpp:2547
 msgid "Upload failed"
 msgstr "アップロード失敗"
 
-#: clientgui/MainDocument.cpp:2555
+#: clientgui/MainDocument.cpp:2549
 msgid "Uploading"
-msgstr "アップロード処理中"
+msgstr "アップロード中"
 
-#: clientgui/MainDocument.cpp:2566
+#: clientgui/MainDocument.cpp:2560
 msgid "Aborted by user"
 msgstr "参加者によって中止"
 
-#: clientgui/MainDocument.cpp:2569
+#: clientgui/MainDocument.cpp:2563
 msgid "Aborted by project"
 msgstr "プロジェクトによって中止"
 
-#: clientgui/MainDocument.cpp:2572
+#: clientgui/MainDocument.cpp:2566
 msgid "Aborted: not started by deadline"
-msgstr "中止されました: 期限までに開始されませんでした"
+msgstr "中止: 報告期限までに開始されませんでした"
 
-#: clientgui/MainDocument.cpp:2575
+#: clientgui/MainDocument.cpp:2569
 msgid "Aborted: disk limit exceeded"
-msgstr ""
+msgstr "中止: ディスクの利用可能領域を超過しました"
 
-#: clientgui/MainDocument.cpp:2578
+#: clientgui/MainDocument.cpp:2572
 msgid "Aborted: run time limit exceeded"
-msgstr ""
+msgstr "中止: 報告期限を超過しました"
 
-#: clientgui/MainDocument.cpp:2581
+#: clientgui/MainDocument.cpp:2575
 msgid "Aborted: memory limit exceeded"
-msgstr ""
+msgstr "中止: メモリの利用可能領域を超過しました"
 
-#: clientgui/MainDocument.cpp:2584
+#: clientgui/MainDocument.cpp:2578
 msgid "Aborted"
 msgstr "中止"
 
-#: clientgui/MainDocument.cpp:2589
+#: clientgui/MainDocument.cpp:2583
 msgid "Acknowledged"
-msgstr "サーバ確認済み"
+msgstr "サーバ承認済み"
 
-#: clientgui/MainDocument.cpp:2591
+#: clientgui/MainDocument.cpp:2585
 msgid "Ready to report"
 msgstr "報告待機"
 
-#: clientgui/MainDocument.cpp:2593
+#: clientgui/MainDocument.cpp:2587
 #, c-format
 msgid "Error: invalid state '%d'"
-msgstr "エラー: 無効状態 '%d'"
+msgstr "エラー: 無効状態 '%d'"
 
 #: clientgui/NoInternetConnectionPage.cpp:179
 msgid "No Internet connection"
@@ -2560,10 +2579,7 @@ msgid ""
 "The URL you supplied is not that of a BOINC-based project.\n"
 "\n"
 "Please check the URL and try again."
-msgstr ""
-"指定した URL は BOINC ベースのプロジェクトのものではありません。\n"
-"\n"
-"URL を確認の上、もう一度試してください。"
+msgstr "指定した URL は BOINC ベースのプロジェクトのものではありません。\n\nURL を確認の上、もう一度試してください。"
 
 #: clientgui/NotDetectedPage.cpp:188
 msgid "Account manager not found"
@@ -2575,23 +2591,19 @@ msgid ""
 "manager.\n"
 "\n"
 "Please check the URL and try again."
-msgstr ""
-"指定した URL は BOINC ベースのアカウント・マネージャの\n"
-"ものではありません。\n"
-"\n"
-"URL を確認の上、もう一度試してください。"
+msgstr "指定した URL は BOINC ベースのアカウント・マネージャの\nものではありません。\n\nURL を確認の上、もう一度試してください。"
 
 #: clientgui/NotFoundPage.cpp:181
 msgid "Login Failed."
-msgstr "ログイン失敗。"
+msgstr "ログインに失敗しました。"
 
 #: clientgui/NotFoundPage.cpp:185
 msgid "Check the username and password, and try again."
-msgstr "名前とパスワードを確認の上、もう一度試してください。"
+msgstr "ユーザー名とパスワードを確認の上、もう一度試してください。"
 
 #: clientgui/NotFoundPage.cpp:189
 msgid "Check the email address and password, and try again."
-msgstr "電子メールアドレスとパスワードを確認の上、もう一度試してください。"
+msgstr "Eメールアドレスとパスワードを確認の上、もう一度試してください。"
 
 #: clientgui/NoticeListCtrl.cpp:229
 msgid "more..."
@@ -2599,58 +2611,56 @@ msgstr "つづく..."
 
 #: clientgui/ProjectInfoPage.cpp:221
 msgid "Choose a project"
-msgstr "プロジェクトを選んでください"
+msgstr "プロジェクトを選択してください"
 
-#: clientgui/ProjectInfoPage.cpp:228
+#: clientgui/ProjectInfoPage.cpp:226
 msgid "To choose a project, click its name or type its URL below."
 msgstr "プロジェクトを選択するには、その名前をクリックするか、あるいは下の欄に URL を入力してください。"
 
-#: clientgui/ProjectInfoPage.cpp:246
+#: clientgui/ProjectInfoPage.cpp:242
 msgid "Categories:"
-msgstr ""
+msgstr "種類:"
 
-#: clientgui/ProjectInfoPage.cpp:267
-#, fuzzy
+#: clientgui/ProjectInfoPage.cpp:262
 msgid "Projects:"
-msgstr "プロジェクト"
+msgstr "プロジェクト:"
 
-#: clientgui/ProjectInfoPage.cpp:279
+#: clientgui/ProjectInfoPage.cpp:274
 msgid "Project details"
-msgstr ""
+msgstr "プロジェクトの詳細情報"
 
-#: clientgui/ProjectInfoPage.cpp:291
+#: clientgui/ProjectInfoPage.cpp:284
 msgid "Research area:"
-msgstr ""
+msgstr "研究範囲:"
 
-#: clientgui/ProjectInfoPage.cpp:302
+#: clientgui/ProjectInfoPage.cpp:294
 msgid "Organization:"
-msgstr ""
+msgstr "組織:"
 
-#: clientgui/ProjectInfoPage.cpp:313
-#, fuzzy
+#: clientgui/ProjectInfoPage.cpp:304
 msgid "Web site:"
-msgstr "ウェブサイト"
+msgstr "ウェブサイト:"
 
-#: clientgui/ProjectInfoPage.cpp:325
+#: clientgui/ProjectInfoPage.cpp:315
 msgid "Supported systems:"
-msgstr ""
+msgstr "サポートされるプラットフォーム:"
 
-#: clientgui/ProjectInfoPage.cpp:363
-#, fuzzy
+#: clientgui/ProjectInfoPage.cpp:352
 msgid "Project URL:"
-msgstr "プロジェクトの &URL:"
+msgstr "プロジェクトのURL:"
 
-#: clientgui/ProjectInfoPage.cpp:499
-#: clientgui/ProjectInfoPage.cpp:754
-#: clientgui/ProjectInfoPage.cpp:758
+#: clientgui/ProjectInfoPage.cpp:486 clientgui/ProjectInfoPage.cpp:686
+#: clientgui/ProjectInfoPage.cpp:690
 msgid "All"
-msgstr ""
+msgstr "すべて"
 
-#: clientgui/ProjectInfoPage.cpp:802
-msgid "This project may not have work for your type of computer.  Do you want to add it anyway?"
-msgstr "このプロジェクトにはあなたのコンピュータに適合する仕事がないかもしれません。 それでも追加しますか?"
+#: clientgui/ProjectInfoPage.cpp:735
+msgid ""
+"This project may not have work for your type of computer.  Do you want to "
+"add it anyway?"
+msgstr "このプロジェクトにはあなたのコンピュータに適合する仕事がないかもしれません。それでも追加しますか?"
 
-#: clientgui/ProjectInfoPage.cpp:826
+#: clientgui/ProjectInfoPage.cpp:767
 msgid "You already added this project. Please choose a different project."
 msgstr "すでに指定したプロジェクトは追加済みです。別のプロジェクトを選んでください。"
 
@@ -2658,12 +2668,12 @@ msgstr "すでに指定したプロジェクトは追加済みです。別のプ
 msgid "Communicating with project."
 msgstr "サーバと通信中です。"
 
-#: clientgui/ProjectProcessingPage.cpp:510
+#: clientgui/ProjectProcessingPage.cpp:509
 msgid "Required files not found on the server."
-msgstr "このサーバには必要なファイル群が見つかりません。"
+msgstr "必要なファイルがサーバ上に見つかりません。"
 
-#: clientgui/ProjectProcessingPage.cpp:513
-#: clientgui/ProjectProcessingPage.cpp:586
+#: clientgui/ProjectProcessingPage.cpp:512
+#: clientgui/ProjectProcessingPage.cpp:585
 msgid "An internal server error has occurred."
 msgstr "サーバ内部で異常が発生しました。"
 
@@ -2671,46 +2681,46 @@ msgstr "サーバ内部で異常が発生しました。"
 msgid ""
 "Communicating with project\n"
 "Please wait..."
-msgstr ""
-"プロジェクトと通信中\n"
-"お待ちください..."
+msgstr "プロジェクトと通信中\nお待ちください..."
 
 #: clientgui/ProjectWelcomePage.cpp:251
 #, c-format
 msgid "Welcome to %s."
-msgstr ""
+msgstr "%s へようこそ。"
 
 #: clientgui/ProjectWelcomePage.cpp:254
 msgid "You have volunteered to compute for this project:"
-msgstr ""
+msgstr "あなたは、下記のプロジェクトのために計算することを進んで引き受けました:"
 
 #: clientgui/ProjectWelcomePage.cpp:255
 msgid "Name:"
-msgstr ""
+msgstr "名前: "
 
 #: clientgui/ProjectWelcomePage.cpp:258
 msgid "Home:"
-msgstr ""
+msgstr "ホーム: "
 
 #: clientgui/ProjectWelcomePage.cpp:262
 msgid "Description:"
-msgstr ""
+msgstr "説明: "
 
 #: clientgui/ProjectWelcomePage.cpp:265
 msgid "URL:"
-msgstr ""
+msgstr "URL:"
 
 #: clientgui/ProjectWelcomePage.cpp:268
 msgid "User:"
-msgstr ""
+msgstr "ユーザー名: "
 
 #: clientgui/ProjectWelcomePage.cpp:273
-msgid "WARNING: This project is not registered with BOINC.  Make sure you trust it before continuing."
-msgstr ""
+msgid ""
+"WARNING: This project is not registered with BOINC.  Make sure you trust it "
+"before continuing."
+msgstr "警告: このプロジェクトは BOINC に登録されていません。続行する前に、それを信頼していることを確認してください。"
 
 #: clientgui/ProjectWelcomePage.cpp:277
 msgid "To continue, click Next."
-msgstr "続けるには [次へ] をクリックしてください。"
+msgstr "続けるには[次へ]をクリックしてください。"
 
 #: clientgui/ProxyInfoPage.cpp:195
 msgid "Network communication failure"
@@ -2731,20 +2741,7 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"The World Community Grid -  BOINC ソフトウェアはインターネット上での\n"
-"通信に失敗しました。よくある原因は以下のとおりです。\n"
-"\n"
-"1) 接続に問題がある場合。 あなたのネットワークまたはモデムの接続を\n"
-"チェックし、[戻る] をクリックしてもう一度試してください。\n"
-"\n"
-"2) パーソナル・ファイアウォールが The World Community Grid - BOINC の\n"
-"通信をブロックしている場合。 BOINC および BOINC Manager が\n"
-"ポート番号 80 と 443で通信できるようにパーソナル・ファイアウォールを設定\n"
-"します。設定したら [戻る] をクリックしてもう一度試してください。\n"
-"\n"
-"3) プロキシ・サーバを使っている場合。\n"
-"[次へ] をクリックして BOINC のプロキシ設定を行ってください。"
+msgstr "The World Community Grid -  BOINC ソフトウェアはインターネット上での通信に失敗しました。よくある原因は以下のとおりです。\n\n1) 接続に問題がある場合。 \nあなたのネットワークまたはモデムの接続をチェックし、[戻る]をクリックしてもう一度試してください。\n\n2) パーソナル・ファイアウォール・ソフトウェアが The World Community Grid - BOINC ソフトウェアの通信をブロックしている場合。\nBOINC および BOINC Manager がポート番号 80 と 443で通信できるようにパーソナル・ファイアウォールを設定し、[戻る]をクリックしてもう一度試してください。\n\n3) プロキシ・サーバを使っている場合。\n[次へ]をクリックして BOINC のプロキシ設定を行ってください。"
 
 #: clientgui/ProxyInfoPage.cpp:203
 msgid ""
@@ -2761,20 +2758,7 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"BOINC はインターネット上での通信に失敗しました。\n"
-"よくある原因は以下のとおりです。\n"
-"\n"
-"1) 接続に問題がある場合。あなたのネットワークまたはモデムの接続を\n"
-"チェックし、[戻る] をクリックしてもう一度試してください。\n"
-"\n"
-"2) パーソナル・ファイアウォールが BOINC の通信をブロックしている場合。\n"
-"BOINC および  BOINC Manager がポート番号 80 で通信できるように\n"
-"パーソナル・ファイアウォールを設定します。設定したら [戻る] をクリック\n"
-"してもう一度試してください。\n"
-"\n"
-"3) プロキシ・サーバを使っている場合。\n"
-"[次へ] をクリックして BOINC のプロキシ設定を行ってください。"
+msgstr "BOINC はインターネット上での通信に失敗しました。\nよくある原因は以下のとおりです。\n\n1) 接続に問題がある場合。\nあなたのネットワークまたはモデムの接続をチェックし、[戻る]をクリックしてもう一度試してください。\n\n2) パーソナル・ファイアウォール・ソフトウェアが BOINC ソフトウェアの通信をブロックしている場合。\nBOINC および  BOINC Manager がポート番号 80 で通信できるように\nパーソナル・ファイアウォールを設定し、[戻る]をクリックしてもう一度試してください。\n\n3) プロキシ・サーバを使っている場合。\n[次へ]をクリックして BOINC のプロキシ設定を行ってください。"
 
 #: clientgui/ProxyPage.cpp:331
 msgid "Proxy configuration"
@@ -2784,10 +2768,9 @@ msgstr "プロキシ設定"
 msgid "HTTP proxy"
 msgstr "HTTP プロキシ"
 
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
+#: clientgui/ProxyPage.cpp:337 clientgui/ProxyPage.cpp:357
 msgid "Server:"
-msgstr "サーバ:"
+msgstr "サーバ:"
 
 #: clientgui/ProxyPage.cpp:350
 msgid "Autodetect"
@@ -2797,55 +2780,67 @@ msgstr "自動検出"
 msgid "SOCKS proxy"
 msgstr "SOCKS プロキシ"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:167
+#: clientgui/sg_BoincSimpleFrame.cpp:166
+msgid "Skin"
+msgstr "スキン"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:168
+msgid "Select the appearance of the user interface."
+msgstr "ユーザーインターフェースの外観を選択します。"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:179
+msgid "Display diagnostic messages."
+msgstr "診断メッセージを表示します"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:184
 msgid "Advanced View...\tCtrl+Shift+A"
 msgstr "詳細表示... \tCTRL+SHIFT+A"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:168
+#: clientgui/sg_BoincSimpleFrame.cpp:185
 msgid "Display the advanced graphical interface."
-msgstr "詳細版のグラフィカルインタフェースを表示する。"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:175
-msgid "Skin"
-msgstr "スキン"
+msgstr "詳細版のグラフィカルインタフェースを表示します。"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:177
-msgid "Select the appearance of the user interface."
-msgstr ""
+#: clientgui/sg_BoincSimpleFrame.cpp:201
+msgid "Configure display options and proxy settings"
+msgstr "表示オプションとプロキシ設定を構成します"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:224
+#: clientgui/sg_BoincSimpleFrame.cpp:222
 #, c-format
 msgid "&%s"
 msgstr "&%s"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:405
-#, fuzzy
+#: clientgui/sg_BoincSimpleFrame.cpp:396
 msgid "Default"
-msgstr "デフォルト"
+msgstr "初期値(指定省略時の扱い)"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:848
+#: clientgui/sg_BoincSimpleFrame.cpp:838
 msgid "Suspend"
 msgstr "一時停止"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:850
+#: clientgui/sg_BoincSimpleFrame.cpp:840
 msgid "Suspend Computing"
-msgstr ""
+msgstr "計算を一時停止"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:851
+#: clientgui/sg_BoincSimpleFrame.cpp:841
 msgid "Resume Computing"
-msgstr ""
+msgstr "計算を再開"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:867
+#: clientgui/sg_BoincSimpleFrame.cpp:857
 msgid "Notices"
 msgstr "お知らせ"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:868
+#: clientgui/sg_BoincSimpleFrame.cpp:858
 msgid "Open a window to view notices from projects or BOINC"
-msgstr "プロジェクトまたは BOINC からのお知らせを見るためのウィンドーを開く"
+msgstr "プロジェクトまたは BOINC からのお知らせを見るためウィンドウを開く"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:879
+#, c-format
+msgid "Get help with %s"
+msgstr "%s について助けを求める"
 
 #: clientgui/sg_DlgMessages.cpp:124
 msgid "Fetching notices; please wait..."
-msgstr ""
+msgstr "お知らせを取得中、お待ち下さい…"
 
 #: clientgui/sg_DlgMessages.cpp:132
 msgid "There are no notices at this time."
@@ -2860,237 +2855,106 @@ msgstr "閉じる"
 msgid "%s - Notices"
 msgstr "%s からのお知らせ"
 
-#: clientgui/sg_DlgPreferences.cpp:270
-msgid "This dialog controls preferences for this computer only."
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:275
-msgid "Click OK to set preferences."
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:280
-msgid "Click Clear to restore web-based settings for all preferences listed below."
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:287
-msgid "For additional settings, select Computing Preferences in the Advanced View."
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:315
-msgid "Do work only between:"
-msgstr "動作許容時間帯:"
-
-#: clientgui/sg_DlgPreferences.cpp:337
-msgid "Connect to internet only between:"
-msgstr "インターネット接続を許可する時間帯:"
-
-#: clientgui/sg_DlgPreferences.cpp:359
-#: clientgui/sg_DlgPreferences.cpp:376
-msgid "Use no more than:"
-msgstr "使用上限:"
-
-#: clientgui/sg_DlgPreferences.cpp:372
-msgid "of disk space"
-msgstr "まで(ディスク領域)"
-
-#: clientgui/sg_DlgPreferences.cpp:389
-msgid "of the processor"
-msgstr "まで(プロセッサ)"
-
-#: clientgui/sg_DlgPreferences.cpp:393
-msgid "Do work while on battery?"
-msgstr "バッテリー動作時に仕事をさせるか?"
-
-#: clientgui/sg_DlgPreferences.cpp:406
-msgid "Do work after idle for:"
-msgstr "アイドル時間が次の時間を超えたときのみ仕事をする:"
-
-#: clientgui/sg_DlgPreferences.cpp:431
-#, fuzzy
-msgid "Clear all local preferences listed above and close the dialog"
-msgstr "このコンピュータだけに適用するプレファレンス(好みの設定)を全てクリアして、ダイアログを終了します。"
-
-#: clientgui/sg_DlgPreferences.cpp:609
-#: clientgui/sg_DlgPreferences.cpp:612
-#: clientgui/sg_DlgPreferences.cpp:688
-#: clientgui/sg_DlgPreferences.cpp:692
-#: clientgui/sg_DlgPreferences.cpp:704
-#: clientgui/sg_DlgPreferences.cpp:708
-#: clientgui/sg_DlgPreferences.cpp:851
-#: clientgui/sg_DlgPreferences.cpp:862
-msgid "Anytime"
-msgstr "常時"
-
-#: clientgui/sg_DlgPreferences.cpp:645
-msgid "100 MB"
-msgstr "100 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:646
-msgid "200 MB"
-msgstr "200 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:647
-msgid "500 MB"
-msgstr "500 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:648
-msgid "1 GB"
-msgstr "1 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:649
-msgid "2 GB"
-msgstr "2 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:650
-msgid "5 GB"
-msgstr "5 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:651
-msgid "10 GB"
-msgstr "10 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:652
-msgid "20 GB"
-msgstr "20 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:653
-msgid "50 GB"
-msgstr "50 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:654
-msgid "100 GB"
-msgstr "100 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:724
-#, c-format
-msgid "%d MB"
-msgstr "%d MB"
-
-#: clientgui/sg_DlgPreferences.cpp:726
-#, c-format
-msgid "%4.2f GB"
-msgstr "%4.2f GB"
-
-#: clientgui/sg_DlgPreferences.cpp:767
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: clientgui/sg_DlgPreferences.cpp:803
-msgid "0 (Run Always)"
-msgstr "0 (常時稼動)"
+#: clientgui/sg_DlgPreferences.cpp:187
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
+msgstr "追加設定は、詳細表示から計算に関するプレファレンスを選択してください。"
 
-#: clientgui/sg_DlgPreferences.cpp:806
-#, c-format
-msgid "%d"
-msgstr "%d"
+#: clientgui/sg_DlgPreferences.cpp:289
+msgid "GB of disk space"
+msgstr "GB のディスク領域"
 
-#: clientgui/sg_DlgPreferences.cpp:953
+#: clientgui/sg_DlgPreferences.cpp:980
 #, c-format
 msgid "%s - Computing Preferences"
-msgstr ""
+msgstr "%s - 計算に関するプレファレンス"
 
-#: clientgui/sg_DlgPreferences.cpp:1033
-#, fuzzy
-msgid "Do you really want to clear all local preferences?\n"
-msgstr "本当にローカルなプレファレンス (好みの設定) を全てクリアしてもよいですか?"
+#: clientgui/sg_DlgPreferences.cpp:1061
+msgid "Discard all local preferences and use web-based preferences?"
+msgstr "すべてのローカル・プレファレンスを放棄してウェブ上のプレファレンスを使用しますか?"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:66
-#: clientgui/ViewProjects.cpp:179
 msgid "Update"
 msgstr "更新"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:67
-#: clientgui/ViewProjects.cpp:180
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
-msgstr "完了したタスクを報告し、最新の功績 (credit) とプレファレンス (好みの設定) を取得し、可能であれば更にタスクを取得します。"
+msgid ""
+"Report all completed tasks, get latest credit, get latest preferences, and "
+"possibly get more tasks."
+msgstr "完了した全タスクを報告し、最新の功績 (credit) とプレファレンス (好みの設定) を取得し、可能であれば更にタスクを取得します。"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:73
 #: clientgui/sg_ProjectCommandPopup.cpp:129
-#: clientgui/ViewProjects.cpp:187
-#: clientgui/ViewProjects.cpp:727
 msgid "Suspend tasks for this project."
 msgstr "このプロジェクトが実行しているタスクを一時的に停止します。"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:78
 #: clientgui/sg_ProjectCommandPopup.cpp:136
-#: clientgui/ViewProjects.cpp:193
-#: clientgui/ViewProjects.cpp:746
 msgid "No new tasks"
-msgstr "タスクの新規取得禁止"
+msgstr "新しいタスクを取得しない"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:79
-#: clientgui/ViewProjects.cpp:194
 msgid "Don't get new tasks for this project."
-msgstr "このプロジェクトのタスクを新たに取ってくることを禁止します。"
+msgstr "このプロジェクトのタスクを新たに取得しないようにします。"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:200
 msgid "Reset project"
 msgstr "プロジェクトをリセット"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:85
-#: clientgui/ViewProjects.cpp:201
-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 "このプロジェクトに関係するすべてのファイルとタスクを削除し新しいタスクを取得します。 完了した仕事を報告するには、先にプロジェクトを最新状態に「更新」してください。"
+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:208
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
-msgstr "このプロジェクトを削除します。作業中のタスクは消えてしまいます。 (完了したタスクを報告するため、削除する前にプロジェクトの「更新」を行ってください)"
+msgid ""
+"Remove this project.  Tasks in progress will be lost (use 'Update' first to "
+"report any completed tasks)."
+msgstr "このプロジェクトを削除します。進行中のタスクは消えてしまいます(完了したタスクを報告するため、削除する前にプロジェクトの「更新」を行ってください)。 "
 
 #: clientgui/sg_ProjectCommandPopup.cpp:96
 #: clientgui/sg_TaskCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:214
 msgid "Properties"
 msgstr "プロパティ"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:97
-#: clientgui/ViewProjects.cpp:215
 msgid "Show project details."
-msgstr "プロジェクトの詳細を表示"
+msgstr "プロジェクトの詳細を表示します。"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:126
-#: clientgui/ViewProjects.cpp:723
 msgid "Resume tasks for this project."
 msgstr "このプロジェクトのタスクを再開します"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:133
-#: clientgui/ViewProjects.cpp:742
 msgid "Allow new tasks"
 msgstr "新しいタスクを許可"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:134
-#: clientgui/ViewProjects.cpp:742
 msgid "Allow fetching new tasks for this project."
-msgstr "このプロジェクトについて新しいタスクの取得を許可します"
+msgstr "このプロジェクトについて新しいタスクの取得を許可します。"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:137
-#: clientgui/ViewProjects.cpp:746
 msgid "Don't fetch new tasks for this project."
-msgstr "このプロジェクトについて新しいタスクの取得を禁止します"
+msgstr "このプロジェクトについて新しいタスクの取得を禁止します。"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:229
-#: clientgui/ViewProjects.cpp:443
 #, c-format
 msgid "Are you sure you want to reset project '%s'?"
-msgstr "プロジェクト '%s' をリセットしてよろしいですか?"
+msgstr "本当にプロジェクト '%s' をリセットしてよろしいですか?"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:235
-#: clientgui/ViewProjects.cpp:449
 msgid "Reset Project"
 msgstr "プロジェクトをリセット"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:266
-#: clientgui/ViewProjects.cpp:501
 #, c-format
 msgid "Are you sure you want to remove project '%s'?"
-msgstr "プロジェクト '%s' を削除してよろしいですか?"
+msgstr "本当にプロジェクト '%s' を削除してよろしいですか?"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:272
-#: clientgui/ViewProjects.cpp:507
 msgid "Remove Project"
-msgstr "プロジェクト削除"
+msgstr "プロジェクトを削除"
 
 #: clientgui/sg_ProjectPanel.cpp:72
 msgid "Add Project"
@@ -3102,18 +2966,21 @@ msgstr "同期"
 
 #: clientgui/sg_ProjectPanel.cpp:74
 msgid "Work done for this project"
-msgstr ""
+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 "アカウント・マネージャでプロジェクトに同期"
+msgstr "アカウント・マネージャ・システムとプロジェクトを同期"
 
 #: clientgui/sg_ProjectPanel.cpp:124
 msgid "Select a project to access with the controls below"
-msgstr "下にあるコントロールでアクセスする先のプロジェクトを1つ選ぶ"
+msgstr "下にあるコントロールでアクセスするプロジェクトを1つ選択"
 
 #: clientgui/sg_ProjectPanel.cpp:145
-#, fuzzy
 msgid "Project Web Pages"
 msgstr "プロジェクトのウェブサイト"
 
@@ -3124,24 +2991,24 @@ msgstr "プロジェクトに関する操作"
 #: clientgui/sg_ProjectPanel.cpp:276
 #, c-format
 msgid "Pop up a menu of web sites for project %s"
-msgstr "プロジェクト %s 用のポップアップ・メニューを開く"
+msgstr "プロジェクト %s のポップアップ・メニューを開く"
 
 #: clientgui/sg_ProjectPanel.cpp:278
 #, c-format
 msgid "Pop up a menu of commands to apply to project %s"
-msgstr "プロジェクト %s を操作するポップアップ・メニューを開く"
+msgstr "プロジェクト %s に対する操作のポップアップ・メニューを開く"
 
 #: clientgui/sg_TaskCommandPopup.cpp:66
 msgid "Show graphics"
-msgstr "グラフィクスを表示"
+msgstr "グラフィックを表示"
 
 #: clientgui/sg_TaskCommandPopup.cpp:67
 msgid "Show application graphics in a window."
-msgstr "ウィンドウを開いてアプリケーションのグラフィクスを表示"
+msgstr "ウィンドウを開いてアプリケーションのグラフィックを表示します。"
 
 #: clientgui/sg_TaskCommandPopup.cpp:73
 msgid "Suspend this task."
-msgstr ""
+msgstr "このタスクを一時停止します。"
 
 #: clientgui/sg_TaskCommandPopup.cpp:78
 msgid "Abort"
@@ -3149,28 +3016,26 @@ msgstr "中止"
 
 #: clientgui/sg_TaskCommandPopup.cpp:79
 msgid "Abandon this task. You will get no credit for it."
-msgstr ""
+msgstr "このタスクを放棄します。これについて功績値)を受け取ることはできません。"
 
 #: clientgui/sg_TaskCommandPopup.cpp:85
 msgid "Show task details."
-msgstr "タスクの詳細を表示 : "
+msgstr "タスクの詳細を表示します。"
 
 #: clientgui/sg_TaskCommandPopup.cpp:119
 msgid "Resume work for this task."
-msgstr "このタスクを再開します"
+msgstr "このタスクを再開します。"
 
 #: clientgui/sg_TaskCommandPopup.cpp:123
 msgid "Suspend work for this task."
-msgstr "このタスクに対する仕事を一時停止します"
+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)"
+msgstr "このタスク '%s' を中止してよろしいですか?\n(進捗: %.1lf%%, 状態: %s)"
 
 #: clientgui/sg_TaskCommandPopup.cpp:272
 msgid "Abort task"
@@ -3185,9 +3050,8 @@ msgid "Not available"
 msgstr "表示できる情報がありません"
 
 #: clientgui/sg_TaskPanel.cpp:480
-#, fuzzy
 msgid "Tasks:"
-msgstr "タスク"
+msgstr "タスク:"
 
 #: clientgui/sg_TaskPanel.cpp:486
 msgid "Select a task to access"
@@ -3195,7 +3059,7 @@ msgstr "アクセスするタスクを選ぶ"
 
 #: clientgui/sg_TaskPanel.cpp:497
 msgid "From:"
-msgstr ""
+msgstr "送信元:"
 
 #: clientgui/sg_TaskPanel.cpp:551
 msgid "This task's progress"
@@ -3217,7 +3081,7 @@ msgstr "アプリケーション: %s"
 #: clientgui/sg_TaskPanel.cpp:728
 #, c-format
 msgid "%.3f%%"
-msgstr ""
+msgstr "%.3f%%"
 
 #: clientgui/sg_TaskPanel.cpp:736
 msgid "Application: Not available"
@@ -3230,83 +3094,81 @@ msgstr "表示できる情報がありません"
 #: clientgui/sg_TaskPanel.cpp:851
 #, c-format
 msgid "Elapsed: %s"
-msgstr ""
+msgstr "経過時間: %s"
 
 #: clientgui/sg_TaskPanel.cpp:865
 #, c-format
 msgid "Remaining (estimated): %s"
-msgstr "残り時間: %s"
+msgstr "残り時間(推定): %s"
 
 #: clientgui/sg_TaskPanel.cpp:880
 #, c-format
 msgid "Status: %s"
 msgstr "状態: %s"
 
-#: clientgui/sg_TaskPanel.cpp:1227
+#: clientgui/sg_TaskPanel.cpp:1228
 msgid "Retrieving current status."
-msgstr "現在の状態を読み出し中"
+msgstr "現在の状態を読み出しています。"
 
-#: clientgui/sg_TaskPanel.cpp:1233
+#: clientgui/sg_TaskPanel.cpp:1234
 msgid "Downloading work from the server."
-msgstr "仕事をサーバからダウンロード中"
+msgstr "仕事をサーバからダウンロードしています。"
 
-#: clientgui/sg_TaskPanel.cpp:1238
+#: clientgui/sg_TaskPanel.cpp:1239
 msgid "Processing Suspended:  Running On Batteries."
-msgstr "処理を一時停止: バッテリー動作中"
+msgstr "処理を一時停止: バッテリーで稼働中"
 
-#: clientgui/sg_TaskPanel.cpp:1240
+#: clientgui/sg_TaskPanel.cpp:1241
 msgid "Processing Suspended:  User Active."
-msgstr "処理を一時停止: 人がコンピュータを利用中"
+msgstr "処理を一時停止: 参加者がコンピュータを使用中"
 
-#: clientgui/sg_TaskPanel.cpp:1242
+#: clientgui/sg_TaskPanel.cpp:1243
 msgid "Processing Suspended:  User paused processing."
-msgstr "処理を一時停止: 参加者の指示による一時停止"
+msgstr "処理を一時停止: 参加者の指示による一時停止"
 
-#: clientgui/sg_TaskPanel.cpp:1244
+#: clientgui/sg_TaskPanel.cpp:1245
 msgid "Processing Suspended:  Time of Day."
-msgstr "処理を一時停止: 動作制限時間帯"
+msgstr "処理を一時停止: 動作制限時間帯"
 
-#: clientgui/sg_TaskPanel.cpp:1246
+#: clientgui/sg_TaskPanel.cpp:1247
 msgid "Processing Suspended:  Benchmarks Running."
-msgstr "処理を一時停止: ベンチマーク走行中"
+msgstr "処理を一時停止: ベンチマーク走行中"
 
-#: clientgui/sg_TaskPanel.cpp:1248
+#: clientgui/sg_TaskPanel.cpp:1249
 msgid "Processing Suspended."
-msgstr "処理を一時停止"
+msgstr "処理は一時停止されました。"
 
-#: clientgui/sg_TaskPanel.cpp:1252
+#: clientgui/sg_TaskPanel.cpp:1253
 msgid "Waiting to contact project servers."
-msgstr "プロジェクトのサーバに接続待機中"
+msgstr "プロジェクトのサーバに接続待機しています。"
 
-#: clientgui/sg_TaskPanel.cpp:1256
-#: clientgui/sg_TaskPanel.cpp:1265
+#: clientgui/sg_TaskPanel.cpp:1257 clientgui/sg_TaskPanel.cpp:1266
 msgid "Retrieving current status"
 msgstr "現在の状態を読み出し中"
 
-#: clientgui/sg_TaskPanel.cpp:1260
+#: clientgui/sg_TaskPanel.cpp:1261
 msgid "No work available to process"
-msgstr "処理する仕事が不足"
+msgstr "処理する仕事がありません"
 
-#: clientgui/sg_TaskPanel.cpp:1262
+#: clientgui/sg_TaskPanel.cpp:1263
 msgid "Unable to connect to the core client"
 msgstr "コア・クライアントに接続不可"
 
 #: clientgui/TermsOfUsePage.cpp:218
 msgid "Terms of Use"
-msgstr "使用規約"
+msgstr "利用規約"
 
 #: clientgui/TermsOfUsePage.cpp:222
 msgid "Please read the following terms of use:"
-msgstr "以下の使用条件をお読みください:"
+msgstr "以下の利用規約をお読みください:"
 
 #: clientgui/TermsOfUsePage.cpp:231
 msgid "I agree to the terms of use."
-msgstr "使用条件に合意する。"
+msgstr "利用規約に合意する。"
 
 #: clientgui/TermsOfUsePage.cpp:237
-#, fuzzy
 msgid "I do not agree to the terms of use."
-msgstr "使用条件に合意しない。"
+msgstr "利用規約に合意しない。"
 
 #: clientgui/UnavailablePage.cpp:183
 msgid "Project temporarily unavailable"
@@ -3317,10 +3179,7 @@ msgid ""
 "The project is temporarily unavailable.\n"
 "\n"
 "Please try again later."
-msgstr ""
-"プロジェクトは一時的に利用できません。\n"
-"\n"
-"少し待ってからもう一度試してください。"
+msgstr "プロジェクトは一時的に利用できません。\n\n少し待ってからもう一度試してください。"
 
 #: clientgui/UnavailablePage.cpp:190
 msgid "Account manager temporarily unavailable"
@@ -3331,31 +3190,27 @@ msgid ""
 "The account manager is temporarily unavailable.\n"
 "\n"
 "Please try again later."
-msgstr ""
-"アカウント・マネージャは一時的に利用できません。\n"
-"\n"
-"少し待ってからもう一度試してください。"
+msgstr "アカウント・マネージャは一時的に利用できません。\n\n少し待ってからもう一度試してください。"
 
 #: clientgui/ValidateAccountKey.cpp:68
 msgid "Please specify an account key to continue."
-msgstr "アカウント・キーを入力し、次に進んでください。"
+msgstr "続けるにはアカウント・キーを入力してください。"
 
 #: clientgui/ValidateAccountKey.cpp:71
 msgid "Invalid Account Key; please enter a valid Account Key"
-msgstr "アカウント・キーが正しくありません。正しいアカウント・キーを入力してください"
+msgstr "無効なアカウント・キーです。正しいアカウント・キーを入力してください"
 
-#: clientgui/ValidateAccountKey.cpp:82
-#: clientgui/ValidateEmailAddress.cpp:86
+#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
 msgid "Validation conflict"
-msgstr "無効な値を検出"
+msgstr "検証のコンフリクト"
 
 #: clientgui/ValidateEmailAddress.cpp:72
 msgid "Please specify an email address"
-msgstr "電子メールアドレスを指定してください"
+msgstr "Eメールアドレスを指定してください"
 
 #: clientgui/ValidateEmailAddress.cpp:75
 msgid "Invalid email address; please enter a valid email address"
-msgstr "電子メールアドレスが正しくありません。正しい電子メールアドレスを入力してください"
+msgstr "無効な電子メールアドレスです。正しい電子メールアドレスを入力してください"
 
 #: clientgui/ValidateURL.cpp:69
 msgid "Missing URL"
@@ -3366,45 +3221,33 @@ 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
+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"
+msgstr "無効なURL"
 
-#: clientgui/ValidateURL.cpp:84
-#: clientgui/ValidateURL.cpp:88
+#: clientgui/ValidateURL.cpp:84 clientgui/ValidateURL.cpp:88
 #: clientgui/ValidateURL.cpp:92
 msgid ""
 "Please specify a valid URL.\n"
 "For example:\n"
 "http://boincproject.example.com"
-msgstr ""
-"正しい URL を指定してください。\n"
-"例:\n"
-"\t http://boincproject.example.com"
+msgstr "正しい URL を指定してください。\n例:\n\t http://boincproject.example.com"
 
-#: clientgui/ValidateURL.cpp:104
-#: clientgui/ValidateURL.cpp:108
+#: clientgui/ValidateURL.cpp:104 clientgui/ValidateURL.cpp:108
 #, c-format
 msgid "'%s' does not contain a valid host name."
-msgstr "'%s' に、有効なホスト名が含まれていません。"
+msgstr "'%s' には有効なホスト名が含まれていません。"
 
 #: clientgui/ValidateURL.cpp:111
 #, c-format
 msgid "'%s' does not contain a valid path."
-msgstr "'%s' に有効なパス名が含まれていません。 "
+msgstr "'%s' には有効なパスが含まれていません。 "
 
 #: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:175
 msgid "Commands"
 msgstr "操作"
 
@@ -3416,13 +3259,11 @@ msgstr "全メッセージをコピー"
 msgid "Copy selected messages"
 msgstr "選択したメッセージをコピー"
 
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
+#: clientgui/ViewMessages.cpp:106 clientgui/ViewMessages.cpp:502
 msgid "Show only this project"
 msgstr "このプロジェクトだけを表示"
 
-#: clientgui/ViewMessages.cpp:107
-#: clientgui/ViewMessages.cpp:503
+#: clientgui/ViewMessages.cpp:107 clientgui/ViewMessages.cpp:503
 msgid "Show only the messages for the selected project."
 msgstr "選択したプロジェクトのメッセージだけを表示"
 
@@ -3440,7 +3281,7 @@ msgstr "選択したメッセージをクリップボードにコピーしてい
 
 #: clientgui/ViewMessages.cpp:286
 msgid "Filtering messages..."
-msgstr "メッセージを選択しています..."
+msgstr "メッセージをフィルターにかけています..."
 
 #: clientgui/ViewMessages.cpp:494
 msgid "Show all messages"
@@ -3450,119 +3291,120 @@ msgstr "全メッセージを表示"
 msgid "Show messages for all projects."
 msgstr "すべてのプロジェクトのメッセージを表示"
 
-#: clientgui/ViewProjects.cpp:225
+#: clientgui/ViewProjects.cpp:246 clientgui/ViewStatistics.cpp:426
 msgid "Account"
 msgstr "アカウント"
 
-#: clientgui/ViewProjects.cpp:227
+#: clientgui/ViewProjects.cpp:248
 msgid "Work done"
 msgstr "終了した仕事量"
 
-#: clientgui/ViewProjects.cpp:228
+#: clientgui/ViewProjects.cpp:249
 msgid "Avg. work done"
 msgstr "終了した仕事量の平均"
 
-#: clientgui/ViewProjects.cpp:230
+#: clientgui/ViewProjects.cpp:251 clientgui/ViewTransfers.cpp:215
+#: clientgui/ViewWork.cpp:262
 msgid "Status"
 msgstr "状態"
 
-#: clientgui/ViewProjects.cpp:255
+#: clientgui/ViewProjects.cpp:330
 msgid "Projects"
 msgstr "プロジェクト"
 
-#: clientgui/ViewProjects.cpp:307
+#: clientgui/ViewProjects.cpp:382
 msgid "Updating project..."
-msgstr "プロジェクト状態を更新しています..."
+msgstr "プロジェクトを更新しています..."
 
-#: clientgui/ViewProjects.cpp:349
+#: clientgui/ViewProjects.cpp:424
 msgid "Resuming project..."
-msgstr "プロジェクトの作業を再開させています..."
+msgstr "プロジェクトを再開させています..."
 
-#: clientgui/ViewProjects.cpp:353
+#: clientgui/ViewProjects.cpp:428
 msgid "Suspending project..."
-msgstr "プロジェクトの作業を一時停止させています..."
+msgstr "プロジェクトを一時停止させています..."
 
-#: clientgui/ViewProjects.cpp:390
+#: clientgui/ViewProjects.cpp:465
 msgid "Telling project to allow additional task downloads..."
 msgstr "タスクをさらにダウンロードしてよいことをプロジェクトに伝えています..."
 
-#: clientgui/ViewProjects.cpp:394
+#: clientgui/ViewProjects.cpp:469
 msgid "Telling project to not fetch any additional tasks..."
 msgstr "タスクを余分に取得しないようにプロジェクトに伝えています..."
 
-#: clientgui/ViewProjects.cpp:430
+#: clientgui/ViewProjects.cpp:505
 msgid "Resetting project..."
 msgstr "プロジェクトをリセットしています..."
 
-#: clientgui/ViewProjects.cpp:488
+#: clientgui/ViewProjects.cpp:563
 msgid "Removing project..."
 msgstr "プロジェクトを削除しています..."
 
-#: clientgui/ViewProjects.cpp:548
+#: clientgui/ViewProjects.cpp:623 clientgui/ViewWork.cpp:686
 msgid "Launching browser..."
 msgstr "ブラウザを起動中..."
 
-#: clientgui/ViewProjects.cpp:1063
+#: clientgui/ViewProjects.cpp:1140
 msgid "Requested by user"
 msgstr "参加者の指示による"
 
-#: clientgui/ViewProjects.cpp:1064
+#: clientgui/ViewProjects.cpp:1141
 msgid "To fetch work"
 msgstr "仕事を取りに行く"
 
-#: clientgui/ViewProjects.cpp:1065
+#: clientgui/ViewProjects.cpp:1142
 msgid "To report completed tasks"
 msgstr "完了したタスクを報告する"
 
-#: clientgui/ViewProjects.cpp:1066
+#: clientgui/ViewProjects.cpp:1143
 msgid "To send trickle-up message"
 msgstr "トリクルアップ・メッセージを送信する"
 
-#: clientgui/ViewProjects.cpp:1067
+#: clientgui/ViewProjects.cpp:1144
 msgid "Requested by account manager"
 msgstr "アカウント・マネージャの指示による"
 
-#: clientgui/ViewProjects.cpp:1068
+#: clientgui/ViewProjects.cpp:1145
 msgid "Project initialization"
 msgstr "プロジェクトの初期化"
 
-#: clientgui/ViewProjects.cpp:1069
+#: clientgui/ViewProjects.cpp:1146
 msgid "Requested by project"
 msgstr "プロジェクトの指示による"
 
-#: clientgui/ViewProjects.cpp:1070
+#: clientgui/ViewProjects.cpp:1147
 msgid "Unknown reason"
 msgstr "理由不明"
 
-#: clientgui/ViewProjects.cpp:1084
+#: clientgui/ViewProjects.cpp:1161
 msgid "Suspended by user"
-msgstr "参加者の指示により一時停止中"
+msgstr "参加者により一時停止中"
 
-#: clientgui/ViewProjects.cpp:1087
+#: clientgui/ViewProjects.cpp:1164
 msgid "Won't get new tasks"
 msgstr "新しいタスクを取得しない"
 
-#: clientgui/ViewProjects.cpp:1090
+#: clientgui/ViewProjects.cpp:1167
 msgid "Project ended - OK to remove"
-msgstr "プロジェクトは終了しました。 OKを押すと削除します。"
+msgstr "プロジェクトは終了しました - 削除するにはOKを押します。"
 
-#: clientgui/ViewProjects.cpp:1093
+#: clientgui/ViewProjects.cpp:1170
 msgid "Will remove when tasks done"
-msgstr "タスクが終了したら削除します"
+msgstr "タスクが完了したら削除します"
 
-#: clientgui/ViewProjects.cpp:1096
+#: clientgui/ViewProjects.cpp:1173
 msgid "Scheduler request pending"
 msgstr "スケジューラへの要求を保留"
 
-#: clientgui/ViewProjects.cpp:1102
+#: clientgui/ViewProjects.cpp:1179
 msgid "Scheduler request in progress"
 msgstr "スケジューラへ要求中"
 
-#: clientgui/ViewProjects.cpp:1105
+#: clientgui/ViewProjects.cpp:1182
 msgid "Trickle up message pending"
-msgstr "トリクルメッセージの送信保留あり"
+msgstr "トリクルアップ・メッセージの送信保留あり"
 
-#: clientgui/ViewProjects.cpp:1111
+#: clientgui/ViewProjects.cpp:1188
 msgid "Communication deferred "
 msgstr "通信を延期"
 
@@ -3574,41 +3416,37 @@ msgstr "ディスク使用量合計"
 msgid "Disk usage by BOINC projects"
 msgstr "BOINC プロジェクトによるディスク使用量"
 
-#: clientgui/ViewResources.cpp:116
-msgid "Disk"
-msgstr "ディスク"
-
 #: clientgui/ViewResources.cpp:225
 msgid "no projects: 0 bytes used"
 msgstr "プロジェクトなし: 使用量 0 バイト"
 
-#: clientgui/ViewResources.cpp:262
+#: clientgui/ViewResources.cpp:259
 msgid "used by BOINC: "
 msgstr "BOINC による使用領域: "
 
-#: clientgui/ViewResources.cpp:272
+#: clientgui/ViewResources.cpp:269
 msgid "free, available to BOINC: "
-msgstr "空き領域でかつ BOINC で利用でる部分 : "
+msgstr "空き領域でかつ BOINC で利用でる部分:"
 
-#: clientgui/ViewResources.cpp:282
+#: clientgui/ViewResources.cpp:279
 msgid "free, not available to BOINC: "
-msgstr "空き領域だがBOINC では利用できない部分 : "
+msgstr "空き領域だが BOINC では利用できない部分:"
 
-#: clientgui/ViewResources.cpp:292
+#: clientgui/ViewResources.cpp:289
 msgid "free: "
-msgstr "空き領域 : "
+msgstr "空き領域:"
 
-#: clientgui/ViewResources.cpp:302
+#: clientgui/ViewResources.cpp:299
 msgid "used by other programs: "
-msgstr "その他のプログラムによる使用領域 :"
+msgstr "その他のプログラムによる使用領域:"
 
 #: clientgui/ViewStatistics.cpp:1181
 msgid "User Total"
-msgstr "参加者ごとの合計功績"
+msgstr "参加者の合計功績"
 
 #: clientgui/ViewStatistics.cpp:1182
 msgid "User Average"
-msgstr "参加者の平均功績/日"
+msgstr "参加者の平均功績"
 
 #: clientgui/ViewStatistics.cpp:1183
 msgid "Host Total"
@@ -3616,12 +3454,12 @@ msgstr "計算機の合計功績"
 
 #: clientgui/ViewStatistics.cpp:1184
 msgid "Host Average"
-msgstr "計算機の平均功績/日"
+msgstr "計算機の平均功績"
 
 #: clientgui/ViewStatistics.cpp:1331
 #, c-format
 msgid "Last update: %.0f days ago"
-msgstr "最終更新: %.0f 日前"
+msgstr "最終更新: %.0f 日前"
 
 #: clientgui/ViewStatistics.cpp:1956
 msgid "Show user total"
@@ -3629,15 +3467,15 @@ msgstr "参加者の合計功績を表示"
 
 #: clientgui/ViewStatistics.cpp:1957
 msgid "Show total credit for user"
-msgstr "参加者の合計功績 (credit) を表示します"
+msgstr "参加者の合計功績(credit)を表示します"
 
 #: clientgui/ViewStatistics.cpp:1963
 msgid "Show user average"
-msgstr "参加者の平均功績/日を表示"
+msgstr "参加者の平均功績を表示"
 
 #: clientgui/ViewStatistics.cpp:1964
 msgid "Show average credit for user"
-msgstr "参加者の平均功績 (credit)/日を表示します"
+msgstr "参加者の平均功績(credit)/日を表示します"
 
 #: clientgui/ViewStatistics.cpp:1970
 msgid "Show host total"
@@ -3645,15 +3483,15 @@ msgstr "計算機の合計功績を表示"
 
 #: clientgui/ViewStatistics.cpp:1971
 msgid "Show total credit for host"
-msgstr "計算機の合計功績 (credit) を表示します"
+msgstr "計算機の合計功績(credit)を表示します"
 
 #: clientgui/ViewStatistics.cpp:1977
 msgid "Show host average"
-msgstr "計算機の平均功績/日を表示"
+msgstr "計算機の平均功績を表示"
 
 #: clientgui/ViewStatistics.cpp:1978
 msgid "Show average credit for host"
-msgstr "計算機の平均功績 (credit)/日を表示します"
+msgstr "計算機の平均功績(credit)/日を表示します"
 
 #: clientgui/ViewStatistics.cpp:1987
 msgid "< &Previous project"
@@ -3671,13 +3509,11 @@ msgstr "次のプロジェクト(&N) >"
 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 "グラフだけの表示にする"
 
@@ -3691,7 +3527,7 @@ msgstr "ひとつのプロジェクト"
 
 #: clientgui/ViewStatistics.cpp:2011
 msgid "Show one chart with selected project"
-msgstr "選択したプロジェクトの図を表示します"
+msgstr "選択したプロジェクトをひとつの図に表示します"
 
 #: clientgui/ViewStatistics.cpp:2017
 msgid "All projects (separate)"
@@ -3715,22 +3551,17 @@ msgstr "全てのプロジェクト(合計値)"
 
 #: clientgui/ViewStatistics.cpp:2032
 msgid "Show one chart with sum of projects"
-msgstr "全てのプロジェクトの合計を表示します"
+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
+#: 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 "図を更新しています..."
 
@@ -3742,208 +3573,187 @@ msgstr "プロジェクト一覧の表示"
 msgid "Uses smaller area for graphs"
 msgstr "グラフ表示を小さくする"
 
-#: clientgui/ViewTransfers.cpp:169
+#: clientgui/ViewTransfers.cpp:187
 msgid "Retry Now"
 msgstr "今すぐ再試行"
 
-#: clientgui/ViewTransfers.cpp:170
+#: clientgui/ViewTransfers.cpp:188
 msgid "Retry the file transfer now"
-msgstr ""
+msgstr "今すぐファイル転送を再試行します"
 
-#: clientgui/ViewTransfers.cpp:176
+#: clientgui/ViewTransfers.cpp:194
 msgid "Abort Transfer"
 msgstr "ファイル転送を中止"
 
-#: clientgui/ViewTransfers.cpp:177
+#: clientgui/ViewTransfers.cpp:195
 msgid "Abort this file transfer.  You won't get credit for the task."
-msgstr ""
+msgstr "このファイル転送を中止します。そのタスクの功績値を得ることができません。"
 
-#: clientgui/ViewTransfers.cpp:188
+#: clientgui/ViewTransfers.cpp:210
 msgid "File"
 msgstr "ファイル名"
 
-#: clientgui/ViewTransfers.cpp:189
-#: clientgui/ViewWork.cpp:238
+#: clientgui/ViewTransfers.cpp:211 clientgui/ViewWork.cpp:261
 msgid "Progress"
 msgstr "進捗状況"
 
-#: clientgui/ViewTransfers.cpp:190
+#: clientgui/ViewTransfers.cpp:212
 msgid "Size"
 msgstr "サイズ"
 
-#: clientgui/ViewTransfers.cpp:191
-msgid "Elapsed Time"
+#: clientgui/ViewTransfers.cpp:213 clientgui/ViewWork.cpp:263
+msgid "Elapsed"
 msgstr "経過時間"
 
-#: clientgui/ViewTransfers.cpp:192
+#: clientgui/ViewTransfers.cpp:214
 msgid "Speed"
 msgstr "転送速度"
 
-#: clientgui/ViewTransfers.cpp:218
+#: clientgui/ViewTransfers.cpp:295
 msgid "Transfers"
 msgstr "ファイル転送"
 
-#: clientgui/ViewTransfers.cpp:285
+#: clientgui/ViewTransfers.cpp:362
 msgid "Network activity is suspended - "
-msgstr "ネットワーク通信は一時停止しています。"
+msgstr "ネットワーク通信は一時停止しています -"
 
-#: clientgui/ViewTransfers.cpp:287
+#: clientgui/ViewTransfers.cpp:364
 msgid ""
 ".\n"
 "You can enable it using the Activity menu."
-msgstr ""
-".\n"
-"再開させるには、アクティビティのメニューから操作してください。"
+msgstr ".\n再開させるには、アクティビティのメニューから操作してください。"
 
-#: clientgui/ViewTransfers.cpp:290
+#: clientgui/ViewTransfers.cpp:367
 msgid "BOINC"
 msgstr "BOINC"
 
-#: clientgui/ViewTransfers.cpp:297
+#: clientgui/ViewTransfers.cpp:374
 msgid "Retrying transfer now..."
 msgstr "現在、転送を再試行しています..."
 
-#: clientgui/ViewTransfers.cpp:335
+#: clientgui/ViewTransfers.cpp:412
 msgid "Aborting transfer..."
-msgstr "ファイル転送の中止処理をしています..."
+msgstr "ファイル転送を中止しています..."
 
-#: clientgui/ViewTransfers.cpp:348
+#: 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"
-"功績(クレジット)は付与されなくなります。"
+msgstr "本当にこのファイル転送 '%s' を中止してよろしいですか?\n注意: 転送を中止するとタスクは無効となり功績値は付与されなくなります。"
 
-#: clientgui/ViewTransfers.cpp:354
+#: clientgui/ViewTransfers.cpp:431
 msgid "Abort File Transfer"
 msgstr "ファイル転送を中止"
 
-#: clientgui/ViewTransfers.cpp:785
+#: clientgui/ViewTransfers.cpp:864
 msgid "Upload"
-msgstr ""
+msgstr "アップロード"
 
-#: clientgui/ViewTransfers.cpp:785
+#: clientgui/ViewTransfers.cpp:864
 msgid "Download"
-msgstr ""
+msgstr "ダウンロード"
 
-#: clientgui/ViewTransfers.cpp:789
-#, fuzzy
+#: clientgui/ViewTransfers.cpp:868
 msgid "retry in "
-msgstr "右記の時間内に再試行:"
+msgstr "右記の時間内に再試行:"
 
-#: clientgui/ViewTransfers.cpp:791
+#: clientgui/ViewTransfers.cpp:870
 msgid "failed"
-msgstr ""
+msgstr "失敗"
 
-#: clientgui/ViewTransfers.cpp:794
+#: clientgui/ViewTransfers.cpp:873
 msgid "suspended"
-msgstr ""
+msgstr "一時停止中"
 
-#: clientgui/ViewTransfers.cpp:799
+#: clientgui/ViewTransfers.cpp:878
 msgid "active"
-msgstr ""
+msgstr "活動中"
 
-#: clientgui/ViewTransfers.cpp:801
+#: clientgui/ViewTransfers.cpp:880
 msgid "pending"
-msgstr ""
+msgstr "保留中"
 
-#: clientgui/ViewTransfers.cpp:808
+#: clientgui/ViewTransfers.cpp:887
 msgid " (project backoff: "
 msgstr " (プロジェクトとの通信待機: "
 
-#: clientgui/ViewWork.cpp:192
-#: clientgui/ViewWork.cpp:782
+#: clientgui/ViewWork.cpp:211 clientgui/ViewWork.cpp:864
 msgid "Show active tasks"
 msgstr "活動中のタスクを表示する"
 
-#: clientgui/ViewWork.cpp:193
-#: clientgui/ViewWork.cpp:783
+#: clientgui/ViewWork.cpp:212 clientgui/ViewWork.cpp:865
 msgid "Show only active tasks."
-msgstr "活動中のタスクだけを表示する。"
+msgstr "活動中のタスクだけを表示します。"
 
-#: clientgui/ViewWork.cpp:206
-#, fuzzy
+#: clientgui/ViewWork.cpp:225
 msgid "Show VM Console"
-msgstr "計算機の合計功績を表示"
+msgstr "VMのコンソールを表示"
 
-#: clientgui/ViewWork.cpp:207
-#, fuzzy
+#: clientgui/ViewWork.cpp:226
 msgid "Show VM Console in a window."
-msgstr "ウィンドウを開いてアプリケーションのグラフィクスを表示"
+msgstr "ウィンドウを開いてVMのコンソールを表示します。"
 
-#: clientgui/ViewWork.cpp:214
+#: clientgui/ViewWork.cpp:233
 msgid "Suspend work for this result."
-msgstr "このリザルトに対する仕事を一時停止"
-
-#: clientgui/ViewWork.cpp:221
-msgid "Abandon work on the result. You will get no credit for it."
-msgstr "このリザルトの仕事を放棄します。このリザルトについて功績 (credit) を受けとることはできません。"
+msgstr "このリザルトに対する仕事を一時停止します。"
 
 #: clientgui/ViewWork.cpp:240
-msgid "Elapsed"
-msgstr "経過時間"
+msgid "Abandon work on the result. You will get no credit for it."
+msgstr "このリザルトの仕事を放棄します。このリザルトについて功績値を受け取ることはできません。"
 
-#: clientgui/ViewWork.cpp:241
-#, fuzzy
+#: clientgui/ViewWork.cpp:264
 msgid "Remaining (estimated)"
-msgstr "終了までの予想時間"
+msgstr "残り時間(推定)"
 
-#: clientgui/ViewWork.cpp:242
+#: clientgui/ViewWork.cpp:265
 msgid "Deadline"
 msgstr "報告期限"
 
-#: clientgui/ViewWork.cpp:269
+#: clientgui/ViewWork.cpp:351
 msgid "Tasks"
 msgstr "タスク"
 
-#: clientgui/ViewWork.cpp:362
+#: clientgui/ViewWork.cpp:444
 msgid "Resuming task..."
 msgstr "タスクを再開しています..."
 
-#: clientgui/ViewWork.cpp:365
+#: clientgui/ViewWork.cpp:447
 msgid "Suspending task..."
 msgstr "タスクを一時停止しています..."
 
-#: clientgui/ViewWork.cpp:394
+#: clientgui/ViewWork.cpp:476
 msgid "Showing graphics for task..."
-msgstr "タスクについてのグラフィクスを表示しています..."
+msgstr "タスクについてのグラフィックを表示しています..."
 
-#: clientgui/ViewWork.cpp:431
-#, fuzzy
+#: clientgui/ViewWork.cpp:513
 msgid "Showing VM console for task..."
-msgstr "タスクについてのグラフィクスを表示しています..."
+msgstr "タスクについてのVMのコンソールを表示しています..."
 
-#: clientgui/ViewWork.cpp:484
+#: 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)"
+msgstr "本当にこのタスク '%s' を中止してよろしいですか?\n(進捗状況: %s, 状態: %s)"
 
-#: clientgui/ViewWork.cpp:490
+#: clientgui/ViewWork.cpp:572
 #, c-format
 msgid "Are you sure you want to abort these %d tasks?"
-msgstr "この %d 番のタスクを本当に中止したいですか?"
+msgstr "本当にこれら %d 個のタスクを中止しますか?"
 
-# 75%
-#: clientgui/ViewWork.cpp:504
-#, fuzzy
+#: clientgui/ViewWork.cpp:586
 msgid "Aborting task..."
-msgstr "ファイル転送の中止処理をしています..."
+msgstr "タスクを中止しています…"
 
-#: clientgui/ViewWork.cpp:776
+#: clientgui/ViewWork.cpp:858
 msgid "Show all tasks"
 msgstr "全てのタスクを表示"
 
-#: clientgui/ViewWork.cpp:777
+#: clientgui/ViewWork.cpp:859
 msgid "Show all tasks."
-msgstr "すべてのタスクを表示します"
+msgstr "全てのタスクを表示します。"
 
 #: clientgui/WelcomePage.cpp:284
 msgid "Add project or account manager"
@@ -3951,7 +3761,7 @@ msgstr "プロジェクトあるいはアカウント・マネージャを追加
 
 #: clientgui/WelcomePage.cpp:288
 msgid "Add project or use BOINC Account Manager"
-msgstr ""
+msgstr "プロジェクトを追加あるいはアカウント・マネージャを利用"
 
 #: clientgui/WelcomePage.cpp:297
 #, c-format
@@ -3961,12 +3771,7 @@ msgid ""
 "\n"
 "Projects added via this wizard will not be\n"
 "listed on or managed via %s."
-msgstr ""
-"可能ならば、%sウェブサイトで\n"
-"プロジェクトを追加してください。\n"
-"\n"
-"このウィザードでプロジェクトを追加すると\n"
-"%s 上で表示・管理できません。"
+msgstr "可能ならば、%s のウェブサイトで\nプロジェクトを追加してください。\n\nこのウィザード経由でプロジェクトを追加すると\n%s 上で表示・管理できません。"
 
 #: clientgui/WelcomePage.cpp:313
 msgid ""
@@ -3975,12 +3780,7 @@ msgid ""
 "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"
-"のウェブサイトでまとめて選んで追加します。"
+msgstr "BOINC を使っているプロジェクトは30以上あり、科学の多く\nの領域で研究をしています。どの研究にも好きなだけボラン\nティアとして参加できます。プロジェクトを参加範囲に入れ\nるには、直接プロジェクトを追加するか、アカウント・マネージャ\nのウェブサイトでまとめて選んで追加します。"
 
 #: clientgui/WelcomePage.cpp:325
 msgid ""
@@ -3995,30 +3795,29 @@ msgid ""
 "this to choose which projects to support.\n"
 "\n"
 "Please choose which type of change you would like to make:\n"
-msgstr ""
+msgstr "新しいボランティア・コンピューティング・プロジェクトの追加もしくは貢献するプロジェクトの変更を選択しました。\n\nこれらのプロジェクトのいくつかは World Community Grid によって実行・管理され、同時に他の研究者や組織によって実行・管理されます。BOINC ソフトウェアはプロジェクトの任意の組み合わせの中からあなたの予備の処理能力を振り分けることができます。\n\nあるいは、あなたが BOINC アカウント・マネージャ に登録している場合、支援するプロジェクトの選択のために利用することができます。\n\n変更したいタイプを選択してください:\n"
 
 #: clientgui/WelcomePage.cpp:339
 msgid "Use a BOINC Account Manager"
-msgstr ""
+msgstr "BOINC アカウント・マネージャを使用する"
 
 #: clientgui/WelcomePage.cpp:358
 msgid "Add or change your World Community Grid projects"
-msgstr ""
+msgstr "World Community Grid のプロジェクトを追加あるいは変更"
 
 #: clientgui/WelcomePage.cpp:361
 msgid "Add projects run by other researchers or organizations"
-msgstr ""
+msgstr "他の研究者あるいは組織が運営するプロジェクトを追加"
 
-#: clientgui/WizardAttach.cpp:673
+#: clientgui/WizardAttach.cpp:560
 msgid "Do you really want to cancel?"
 msgstr "本当にキャンセルしますか?"
 
-#: clientgui/WizardAttach.cpp:674
+#: clientgui/WizardAttach.cpp:561
 msgid "Question"
-msgstr "お答えください"
+msgstr "質問"
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
+#: clientgui/wizardex.cpp:377 clientgui/wizardex.cpp:553
 msgid "&Next >"
 msgstr "次へ(&N) >"
 
@@ -4032,7 +3831,7 @@ msgstr "終了(&F)"
 
 #: clientgui/common/wxPieCtrl.cpp:64
 msgid "Pie Ctrl"
-msgstr "Pie Ctrl"
+msgstr "Ctrlのパイ"
 
 #: clientgui/mac/Mac_GUI.cpp:35
 msgid "Services"
@@ -4056,563 +3855,10 @@ msgstr "全てを表示する"
 msgid "Quit %s"
 msgstr "%s を終了する"
 
-#: clientgui/DlgAdvPreferences.h:30
-msgid "specify work start and stop hours in format HH:MM-HH:MM"
-msgstr "仕事をする時間帯の始めと終わりを HH:MM-HH:MM の形式で記入してください"
-
-#: clientgui/DlgAdvPreferences.h:31
-msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
-msgstr "ネットワークを使う時間帯の始めと終わりを HH:MM-HH:MM の形式で記入してください"
-
-# 98%
-#, fuzzy
-#~ msgid ""
-#~ "(C) 2003-2013 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2010 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-
-#, c-format
-#~ msgid "%s - Preferences"
-#~ msgstr "%s - プレファレンス(好みの設定)"
-
-#, no-c-format
-#~ msgid "% CPU time"
-#~ msgstr "% のCPU 時間まで使用"
-#~ msgid "KBytes/sec."
-#~ msgstr "キロバイト/秒"
-
-# This sequence of texts and forms deeply depends on English. Hardly to be traslated into Japanese in normal manner.
-#~ msgid "Mbytes"
-#~ msgstr "M バイトまでを"
-# This sequence of texts and forms deeply depends on English. Hardly to be traslated into Japanese in normal manner.
-#~ msgid "every"
-#~ msgstr "右の期間内で許可"
-# This sequence of texts and forms deeply depends on English. Hardly to be traslated into Japanese in normal manner.
-#~ msgid "days"
-#~ msgstr "日"
-#~ msgid "Gigabytes disk space"
-#~ msgstr "ギガバイトのディスク領域"
-#~ msgid "Running, high priority"
-#~ msgstr "優先度高で処理中"
-#, fuzzy
-#~ msgid " (Waiting for network access)"
-#~ msgstr "メモリ不足のため待機"
-#~ msgid "Preferences…"
-#~ msgstr "プレファレンス..."
-#~ msgid "I do not agree with the terms of use."
-#~ msgstr "使用条件に合意しない。"
-#~ msgid "Workunit name"
-#~ msgstr "ワークユニットの名前"
-#~ msgid "invalid float"
-#~ msgstr "浮動小数点形式の数値が正しくありません"
-#~ msgid "Display the advanced (accessible) graphical interface."
-#~ msgstr "より使いやすい詳細グラフィカルインタフェースを表示する。"
-#~ msgid "Paused: Other work running"
-#~ msgstr "一時停止状態: 他の仕事の計算を実行中"
-#~ msgid "Paused: User initiated.  Click 'Resume' to continue"
-#~ msgstr "一時停止状態: 参加者にの指示による。 継続するには、「再開(Resume)」をクリック"
-#~ msgid "Paused: User active"
-#~ msgstr "一時停止状態: 人がコンピュータを利用中"
-#~ msgid "Paused: Computer on battery"
-#~ msgstr "一時停止状態: バッテリー駆動中"
-#~ msgid "Paused: Time of Day"
-#~ msgstr "一時停止状態: 時間帯による制約"
-#~ msgid "Paused: Benchmarks running"
-#~ msgstr "一時停止状態: ベンチマークプログラムを実行中"
-#~ msgid "Paused"
-#~ msgstr "一時停止状態"
-#~ msgid "Paused: Application start delayed"
-#~ msgstr "一時停止状態: アプリケーション開始が遅延"
-#~ msgid "Click to show project graphics"
-#~ msgstr "プロジェクトのグラフィクス表示はここをクリック"
-#~ msgid "Open a window to view messages"
-#~ msgstr "メッセージ・ウィンドウを開く"
-#~ msgid "Stop all activity"
-#~ msgstr "全ての活動を停止する"
-#~ msgid "Resume activity"
-#~ msgstr "活動を再開する"
-#~ msgid "Open a window to set your preferences"
-#~ msgstr "プレファレンスの設定ウィンドウを開く"
-#~ msgid "Switch to the BOINC advanced view"
-#~ msgstr "BOINC 詳細表示に切り替える"
-#~ msgid "My Projects:"
-#~ msgstr "あなたのプロジェクト:"
-
-#, c-format
-#~ msgid "%s. Work done by %s: %0.2f"
-#~ msgstr "%s - %s さんは 功績値 %0.2f の仕事をしました"
-
-#, c-format
-#~ msgid "%.1lf"
-#~ msgstr "%.1lf"
-
-#, c-format
-#~ msgid "%d hr %d min %d sec"
-#~ msgstr "%d 時間 %d 分 %d 秒"
-#~ msgid "Are you sure you want to display graphics on a remote machine?"
-#~ msgstr "グラフィクスを別の計算機に表示してよろしいですか?"
-#~ msgid "Application: "
-#~ msgstr "アプリケーション: "
-#~ msgid "Time Remaining: "
-#~ msgstr "残り時間: "
-#~ msgid "Elapsed Time: "
-#~ msgstr "経過時間:"
-#~ msgid "Account manager website"
-#~ msgstr "アカウント・マネージャのウェブサイト"
-#~ msgid "Account Manager &URL:"
-#~ msgstr "アカウント・マネージャー &URL:"
-
-#, c-format
-#~ msgid "%s &website"
-#~ msgstr "%s ウェブサイト(&W)"
-#~ msgid "Notice List"
-#~ msgstr "お知らせの一覧"
-
-#, c-format
-#~ msgid "%s; received on %s"
-#~ msgstr "%s; 受信時刻: %s"
-
-#, c-format
-#~ msgid "%s; received from %s; on %s"
-#~ msgstr "%s; プロジェクト %s より受信; 受信時刻: %s"
-
-# This string is the default action of objects specified for GetDefaultAction. I'm not sure it is meaningful to be translated, that is, is it a string to be read by human?
-#~ msgid "Click"
-#~ msgstr "クリック"
-#~ msgid "Project List"
-#~ msgstr "プロジェクトの一覧"
-#~ msgid "Nvidia GPU Supported"
-#~ msgstr "Nvidia GPU サポート済み"
-#~ msgid "ATI GPU Supported"
-#~ msgstr "ATI GPU サポート済み"
-#~ msgid "Project Website"
-#~ msgstr "プロジェクトのウェブサイト"
-# 88%
-#, fuzzy
-#~ msgid "Retry now"
-#~ msgstr "今すぐ再試行"
-#~ msgid "10%"
-#~ msgstr "10%"
-#~ msgid "20%"
-#~ msgstr "20%"
-#~ msgid "30%"
-#~ msgstr "30%"
-#~ msgid "40%"
-#~ msgstr "40%"
-#~ msgid "50%"
-#~ msgstr "50%"
-#~ msgid "60%"
-#~ msgstr "60%"
-#~ msgid "70%"
-#~ msgstr "70%"
-#~ msgid "80%"
-#~ msgstr "80%"
-#~ msgid "90%"
-#~ msgstr "90%"
-#~ msgid "100%"
-#~ msgstr "100%"
-#~ msgid "1"
-#~ msgstr "1"
-#~ msgid "3"
-#~ msgstr "3"
-#~ msgid "5"
-#~ msgstr "5"
-#~ msgid "10"
-#~ msgstr "10"
-#~ msgid "15"
-#~ msgstr "15"
-#~ msgid "30"
-#~ msgstr "30"
-#~ msgid "60"
-#~ msgstr "60"
-
-#, c-format
-#~ msgid "Pop up a menu of websites for project %s"
-#~ msgstr "プロジェクト %s 用のポップアップ・メニューを開く"
-#~ msgid ""
-#~ "for accessibility support, please select advanced from the view menu or type "
-#~ "command shift a"
-#~ msgstr ""
-#~ "アクセシビリティサポートは詳細表示で提供しています。詳細表示に切り替えるには表示メニューから操作するか、コマンド - シフト - a "
-#~ "とタイプしてください。"
-#~ msgid "This panel contains graphs showing user totals for projects"
-#~ msgstr "このパネルでは、参加者の累積値をプロジェクトごとにグラフに表示します"
-#~ msgid "list headers"
-#~ msgstr "一覧のヘッダー"
-#~ msgid "list of events"
-#~ msgstr "イベントの一覧"
-#~ msgid "list of events is empty"
-#~ msgstr "イベントの一覧は空です"
-
-#, c-format
-#~ msgid "list of %s"
-#~ msgstr "%s の一覧"
-
-#, c-format
-#~ msgid "list of %s is empty"
-#~ msgstr "%s の一覧は空です"
-
-#, c-format
-#~ msgid "; current sort column %d of %d; descending order; "
-#~ msgstr "; 現在の並べ替え列 %d(全 %d); 降順 ; "
-
-#, c-format
-#~ msgid "; current sort column %d of %d; ascending order; "
-#~ msgstr "; 現在の並べ替え列 %d(全 %d); 昇順 ; "
-
-#, c-format
-#~ msgid "; column %d of %d; "
-#~ msgstr "; 列 %d(全 %d); "
-#~ msgid "list is empty"
-#~ msgstr "一覧は空です"
-
-#, c-format
-#~ msgid "; row %d; "
-#~ msgstr "; 行 %d; "
-
-#, c-format
-#~ msgid "; selected row %d of %d; "
-#~ msgstr "; 選択した行 %d (全 %d); "
-
-#, c-format
-#~ msgid "; selected row %d ; "
-#~ msgstr "; 選択した行 %d ; "
-
-#, c-format
-#~ msgid "; row %d of %d; "
-#~ msgstr "; 行 %d(全 %d); "
-#~ msgid "blank"
-#~ msgstr "空白"
-#~ msgid "list of projects or account managers"
-#~ msgstr "プロジェクトあるいはアカウント・マネージャの一覧"
-
-#, c-format
-#~ msgid "selected row %d of %d; "
-#~ msgstr "選択した行 %d(全 %d); "
-
-#, c-format
-#~ msgid "row %d of %d; "
-#~ msgstr "行 %d(全 %d); "
-
-#, c-format
-#~ msgid "The minimum password length for this project is %d. Please enter a different password."
-#~ msgstr "このプロジェクトでは、パスワードの最短長は %d 文字です。 別のパスワードを入力してください。"
-
-#, c-format
-#~ msgid "The minimum password length for this account manager is %d. Please enter a different password."
-#~ msgstr "このアカウント・マネージャでは、パスワードの最短長は %d 文字です。別のパスワードを入力してください。"
-#~ msgid ""
-#~ "An error has occurred;\n"
-#~ "check the Event Log for details.\n"
-#~ "\n"
-#~ "Click Finish to close."
-#~ msgstr ""
-#~ "異常が発生しました。\n"
-#~ "詳細はイベント・ログを見て確かめてください。\n"
-#~ "\n"
-#~ "[終了] をクリックして閉じてください。"
-
-# This entry is paired with "On multiprocessor systems...."
-#, no-c-format
-#~ msgid "% of the processors"
-#~ msgstr "% まで"
-
-#, c-format
-#~ msgid "New page inserted. Index = %i"
-#~ msgstr "New page inserted. Index = %i"
-
-#, c-format
-#~ msgid "New page appended. Index = %i"
-#~ msgstr "New page appended. Index = %i"
-
-#, c-format
-#~ msgid "Old Page Index = %i"
-#~ msgstr "Old Page Index = %i"
-
-#, c-format
-#~ msgid "OnDropTarget: index by HitTest = %i"
-#~ msgstr "OnDropTarget: index by HitTest = %i"
-#~ msgid "Identify your account "
-#~ msgstr "アカウントを特定する"
-#~ msgid "Read config file"
-#~ msgstr "設定ファイルを読み込む"
-#~ msgid "Read configuration info from cc_config.xml"
-#~ msgstr "cc_config.xml から設定情報を読み込みます"
-#~ msgid ""
-#~ "(C) 2003-2011 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2010 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgid "Multicore CPU Supported"
-#~ msgstr "マルチコア CPU サポート済み"
-
-#, fuzzy
-#~ msgid "%s: %.0f"
-#~ msgstr "%s: %0.2f"
-#~ msgid "Click 'Retry now' to transfer the file now"
-#~ msgstr "ファイルを転送するには、「今すぐ再試行」をクリックします"
-#~ msgid ""
-#~ "Click 'Abort transfer' to delete the file from the transfer queue. This "
-#~ "will prevent you from being granted credit for this result."
-#~ msgstr ""
-#~ "ファイル転送の待ち行列からこのファイルを削除するには、「ファイル転送を中"
-#~ "止」をクリックします。 この場合、対応するリザルトについての功績 (credit) "
-#~ "は付与されなくなります。"
-#~ msgid "Aborting result..."
-#~ msgstr "リザルトの中止処理をしています..."
-#~ msgid ""
-#~ "You have chosen to add a new BOINC project.  Adding a new\n"
-#~ "project means that you will be connecting your computer to a new "
-#~ "organization.\n"
-#~ "If this is what you wanted to do, please click on\n"
-#~ "the 'Next' button below.\n"
-#~ "\n"
-#~ "Some projects like World Community Grid run multiple research "
-#~ "applications.\n"
-#~ "If you want to change which research applications are sent to your "
-#~ "computer\n"
-#~ "to run, visit the project's website and modify your\n"
-#~ "preferences there.\n"
-#~ "\n"
-#~ "To change which research applications are sent to you from\n"
-#~ "World Community Grid then please click on the following button:"
-#~ msgstr ""
-#~ "これから、新たな BOINC プロジェクトを参加範囲に追加しようとしています。 新"
-#~ "た\n"
-#~ "なプロジェクトに参加するということは、あなたのコンピュータを新たな組織に接"
-#~ "続\n"
-#~ "することを意味します。 これがあなたの望む事でしたら、以下にある「次へ"
-#~ "(Next)」\n"
-#~ "ボタンをクリックしてください。\n"
-#~ "\n"
-#~ "World Community Grid のようなプロジェクトでは、複数種類の研究アプリケー"
-#~ "ション\n"
-#~ "を実行します。あなたのコンピュータへもってきて動作させる研究アプリケーショ"
-#~ "ン\n"
-#~ "を変更したいときは、そのプロジェクトのウェブサイトへ行って、そこで選択して"
-#~ "あ\n"
-#~ "る内容を変更してください。\n"
-#~ "\n"
-#~ "World Community Grid から送られて来る研究アプリケーションを変更するには、"
-#~ "以下\n"
-#~ "のボタンをクリックします:"
-#~ msgid "Change Research Applications at World Community Grid"
-#~ msgstr "World Community Grid の研究アプリケーションを変更"
-#~ msgid "Don't fetch NVIDIA GPU tasks"
-#~ msgstr "NVIDIA GPU向けタスクを新たに取得しない"
-#~ msgid "NVIDIA GPU work fetch deferred for"
-#~ msgstr "NVIDIA GPU 向けの仕事を獲得する処理の保留時間"
-#~ msgid "NVIDIA GPU work fetch deferral interval"
-#~ msgstr "NVIDIA GPU 向けの仕事を獲得する処理の保留間隔"
-#~ msgid "Don't fetch ATI GPU tasks"
-#~ msgstr "ATI GPU向けタスクを新たに取得しない"
-#~ msgid "ATI GPU work fetch deferred for"
-#~ msgstr "ATI GPU 向けの仕事を獲得する処理の保留時間"
-#~ msgid "ATI GPU work fetch deferral interval"
-#~ msgstr "ATI GPU 向けの仕事を獲得する処理の保留間隔"
-#~ msgid "Web sites"
-#~ msgstr "ウェブサイト"
-#~ msgid "Connect about every"
-#~ msgstr "接続する間隔"
-#~ msgid ""
-#~ "this computer is connected to the Internet about every X days\n"
-#~ "(0 if it's always connected)"
-#~ msgstr ""
-#~ "このコンピュータは、X 日毎にインターネットに接続します。\n"
-#~ "(0は常時接続を意味します)"
-#~ msgid "days (max. 10)"
-#~ msgstr "日分(最大10日)"
-#~ msgid "%d.%d%%"
-#~ msgstr "%d.%d%%"
-#~ msgid "Display and network &options..."
-#~ msgstr "表示とネットワークのオプション(&O)..."
-#~ msgid ""
-#~ "You have requested to exit the %s,\n"
-#~ "which allows you to view and manage\n"
-#~ "the science applications running on your computer.\n"
-#~ "\n"
-#~ "If you also want to stop running the science applications when you\n"
-#~ "exit the Manager, then choose from the following options:"
-#~ msgstr ""
-#~ "今、停止しようとしている %s は、あなたのコンピュータ上で\n"
-#~ "実行中の科学計算アプリケーションの状態を表示し、管理する\n"
-#~ "ためのマネージャ・プログラムです。\n"
-#~ "\n"
-#~ "もし、科学計算アプリケーションの方もマネージャ・プログラムと\n"
-#~ "同時に停止させたいのなら、以下の選択肢から選んでください:"
-#~ msgid "Stop running science applications when exiting the Manager"
-#~ msgstr ""
-#~ "マネージャ・プログラムと同時に、今実行中の科学計算アプリケーションも終了す"
-#~ "る"
-#~ msgid "CPU work fetch priority"
-#~ msgstr "CPU 向けの仕事を獲得する処理の優先度"
-#~ msgid "NVIDIA GPU scheduling priority"
-#~ msgstr "NVIDIA GPU 向けスケジューリングの優先度"
-#~ msgid "NVIDIA GPU work fetch priority"
-#~ msgstr "NVIDIA GPU 向けスケジューリングの優先度"
-#~ msgid "ATI GPU scheduling priority"
-#~ msgstr "ATI GPU 向けスケジューリングの優先度"
-#~ msgid "ATI GPU work fetch priority"
-#~ msgstr "ATI GPU 向けスケジューリングの優先度"
-#~ msgid "Estimated app speed"
-#~ msgstr "アプリケーションの実行速度推定値"
-#~ msgid "Estimated task size"
-#~ msgstr "タスクの大きさの推定値"
-#~ msgid "Max RAM usage"
-#~ msgstr "RAM の最大利用量"
-#~ msgid "%s - Options"
-#~ msgstr "%s - オプション"
-#~ msgid "Retrieving host information; please wait..."
-#~ msgstr "計算機 (ホスト) の情報を読み出しています。お待ちください..."
-#~ msgid " (waiting for GPU memory)"
-#~ msgstr "(GPU メモリ不足のため待機)"
-#~ msgid "Manager Settings..."
-#~ msgstr "マネージャの設定..."
-#~ msgid "Pause"
-#~ msgstr "一時停止"
-#~ msgid "%s - Messages"
-#~ msgstr "%s - メッセージ"
-#~ msgid "Skin:"
-#~ msgstr "スキン:"
-#~ msgid "Preferences"
-#~ msgstr "プレファレンス"
-#~ msgid "I want to customize my preferences for this computer only."
-#~ msgstr ""
-#~ "このコンピュータについてだけ私のプレファレンス(好みの設定)を変更したい"
-#~ msgid "Customized Preferences"
-#~ msgstr "カスタマイズしたプレファレンス"
-#~ msgid "My total work done this Project"
-#~ msgstr "あなたがこのプロジェクトで実施した仕事の合計"
-#~ msgid "My Tasks:"
-#~ msgstr "あなたのタスク:"
-#~ msgid "From Project:"
-#~ msgstr "送付元のプロジェクト:"
-#~ msgid "Elapsed Time: %s"
-#~ msgstr "経過時間: %s"
-#~ msgid "Upload suspended - "
-#~ msgstr "アップロード保留中 - "
-#~ msgid "Download suspended - "
-#~ msgstr "ダウンロード保留中 - "
-#~ msgid "Upload pending"
-#~ msgstr "アップロード保留中"
-#~ msgid "Download pending"
-#~ msgstr "ダウンロード保留中"
-#~ msgid "Get help with BOINC"
-#~ msgstr "BOINC に関して手助けを求める"
-#~ msgid "Event Log..."
-#~ msgstr "イベント・ログ..."
-#~ msgid "error"
-#~ msgstr "エラー"
-#~ msgid "A new version of BOINC is available."
-#~ msgstr "新しい版の BOINC が使えるようになりました。"
-#~ msgid "Download it."
-#~ msgstr "ダウンロードする"
-#~ msgid "Couldn't write state file; check directory permissions"
-#~ msgstr ""
-#~ "状態ファイルを書き出すことができませんでした。ディレクトリのパーミッション"
-#~ "を調べてみてください。"
-#~ msgid "The HTTP_PROXY environment variable must specify an HTTP proxy"
-#~ msgstr "環境変数 HTTP_PROXY には HTTP プロキシを指定しなければなりません。"
-#~ msgid "Attach to project"
-#~ msgstr "プロジェクトに参加"
-#~ msgid "Attach to account manager"
-#~ msgstr "アカウント・マネージャに接続"
-#~ msgid "&Attach to project..."
-#~ msgstr "プロジェクトに参加(&A)..."
-#~ msgid "Attach to a project"
-#~ msgstr "プロジェクトに参加させる"
-#~ msgid "Attaching to project or account manager..."
-#~ msgstr ""
-#~ "プロジェクトあるいはアカウント・マネージャに接続しようとしています..."
-#~ msgid "%s - Detach from %s"
-#~ msgstr "%s - %s から離脱"
-#~ msgid "Retrying communications."
-#~ msgstr "通信を再試行しています。"
-#~ msgid "%s needs to connect to the Internet.  Please click to open %s."
-#~ msgstr ""
-#~ "%s はインターネットに接続する必要があります。クリックして %s を起動して下"
-#~ "さい。"
-#~ msgid ""
-#~ "%s is unable to communicate with a project and needs an Internet "
-#~ "connection.\n"
-#~ "Please connect to the Internet, then select the 'Do network "
-#~ "communications' item from the Advanced menu."
-#~ msgstr ""
-#~ "%s はプロジェクトと通信できません。インターネットに接続する必要がありま"
-#~ "す。\n"
-#~ "インターネットに接続して、メニューの「高度な操作」から「通信を今すぐ実施」"
-#~ "を選択してください。"
-#~ msgid ""
-#~ "%s couldn't do Internet communication, and no default connection is "
-#~ "selected.\n"
-#~ "Please connect to the Internet, or select a default connection\n"
-#~ "using Advanced/Options/Connections."
-#~ msgstr ""
-#~ "%s はプロジェクトと通信できません。また「通常の接続」も指定されていませ"
-#~ "ん。\n"
-#~ "手動でインターネット接続を行うか、メニューの [高度な操作] から [オプショ"
-#~ "ン] \n"
-#~ "ダイアログを開き、「接続」タブで「通常の接続」に何を使うか指定してくださ"
-#~ "い。"
-#~ msgid "One or more notices are now available for viewing."
-#~ msgstr "見ていただきたいお知らせがいくつかあります。"
-#~ msgid "Failed to attach to project"
-#~ msgstr "プロジェクト参加に失敗"
-#~ msgid "Failed to attach to account manager"
-#~ msgstr "アカウント・マネージャへの参加に失敗"
-#~ msgid "Attached to project"
-#~ msgstr "プロジェクトへ参加完了"
-#~ msgid "You are now successfully attached to this project."
-#~ msgstr "このプロジェクトへ参加することに成功しました。"
-#~ msgid "Attached to %s"
-#~ msgstr "%s に接続しました"
-#~ msgid "Attached to account manager"
-#~ msgstr "アカウント・マネージャへ参加完了"
-#~ msgid "You are now successfully attached to the %s system."
-#~ msgstr "%s システムへの参加に成功しました。"
-#~ msgid "You are now successfully attached to this account manager."
-#~ msgstr "このアカウント・マネージャへの参加に成功しました。"
-#~ msgid "Detach when done"
-#~ msgstr "仕事を終えたらプロジェクトから離脱"
-#~ msgid "News Feeds"
-#~ msgstr "ニュース・フィード"
-#~ msgid "Display the latest news about BOINC"
-#~ msgstr "BOINC の最新ニュースを表示"
-#~ msgid "Retrieving notices..."
-#~ msgstr "お知らせを読み出し中..."
-#~ msgid "Detach"
-#~ msgstr "離脱"
-#~ msgid "Detaching from project..."
-#~ msgstr "プロジェクトから離脱しています..."
-#~ msgid "Are you sure you want to detach from project '%s'?"
-#~ msgstr "プロジェクト '%s' から離脱してよろしいですか?"
-#~ msgid "Detach from Project"
-#~ msgstr "プロジェクトから離脱"
-#~ msgid "not attached to any BOINC project: 0 bytes"
-#~ msgstr "BOINC のプロジェクトのどれにも参加していません: 0 bytes"
-#~ msgid "Message from project server:"
-#~ msgstr "サーバからのメッセージ:"
-#~ msgid "XML syntax error in"
-#~ msgstr "右のファイルの中に XML の構文エラーがあります:"
-#~ msgid "Can't resolve hostname in"
-#~ msgstr "右のファイルの中に解決できないホスト名があります:"
-#~ msgid "Unexpected text in"
-#~ msgstr "右のファイルの中に予想外のテキストがあります:"
-#~ msgid "Unrecognized tag in"
-#~ msgstr "右のファイルの中に認識できないタグがあります:"
-#~ msgid "Missing start tag in"
-#~ msgstr "右のファイルの中に開始タグが足りません:"
-#~ msgid "Unparsed tag in"
-#~ msgstr "右のファイルの中に解析できないタグがあります:"
-#~ msgid "Missing end tag in"
-#~ msgstr "右のファイルの中に終了タグが足りません:"
-#~ msgid ""
-#~ "BOINC can't access Internet - check network connection or proxy "
-#~ "configuration."
-#~ msgstr ""
-#~ "BOINC はインターネットにアクセスできません。ネットワーク接続とプロキシの設"
-#~ "定を調べてください。"
+#: clientgui/DlgAdvPreferencesBase.h:45
+msgid "On this day of the week, compute only during these hours."
+msgstr "週のこの日には、この時間帯のみ計算します。"
 
+#: clientgui/DlgAdvPreferencesBase.h:46
+msgid "On this day of the week, transfer files only during these hours."
+msgstr "週のこの日には、この時間帯のみファイルを転送します。"
diff --git a/locale/ja/BOINC-Project-Generic.po b/locale/ja/BOINC-Project-Generic.po
old mode 100755
new mode 100644
index 962d68e..eb03b68
--- a/locale/ja/BOINC-Project-Generic.po
+++ b/locale/ja/BOINC-Project-Generic.po
@@ -1,396 +1,457 @@
 # BOINC web translation
 # Copyright (C) 2008 University of California
+# 
 # This file is distributed under the same license as BOINC.
+# 
 # FileID  : $Id$
+# 
+# Translators:
+# Masahiro Tagashira, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: \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: 2013-10-28 15:20+0000\n"
-"Last-Translator: Anonymous Pootle User\n"
-"Language-Team: \n"
-"Language: ja\n"
+"POT-Creation-Date: 2015-03-04 08:56 PST\n"
+"PO-Revision-Date: 2015-03-08 05:08+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"
-"X-Generator: Pootle 2.5.0\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-BOINC-UTF8-Marker: 日本語\n"
-"X-POOTLE-MTIME: 1382973625.0\n"
 
-# The name of this language in this language
 msgid "LANG_NAME_NATIVE"
 msgstr "日本語"
 
-# The name of this language in an international language (English)
 msgid "LANG_NAME_INTERNATIONAL"
 msgstr "Japanese"
 
+#: ../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 "Eメールアドレス"
+
+#: ../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 "郵便番号もしくは ZIP コード"
+
+#: ../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 "Eメールアドレス:"
+
+#: ../inc/account.inc:103
+msgid "forgot email address?"
+msgstr "Eメールアドレスをお忘れですか?"
+
+#: ../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 ""
+msgstr "太字にするテキスト: [b]テキスト[/b] (Alt+B)"
 
 #: ../inc/bbcode_html.inc:14
 msgid "Italic text: [i]text[/i]  (alt+i)"
-msgstr ""
+msgstr "斜体にするテキスト: [i]テキスト[/i] (Alt+I)"
 
 #: ../inc/bbcode_html.inc:17
 msgid "Underline text: [u]text[/u]  (alt+u)"
-msgstr ""
+msgstr "下線を引くテキスト [u]テキスト[/u] (Alt+U)"
 
 #: ../inc/bbcode_html.inc:20
-msgid "Quote text: [quote]text[/quote]  (alt+q)"
-msgstr ""
+msgid "Strikethrough text: [s]text[/s]  (alt+k)"
+msgstr "取り消し線を引くテキスト: [s]テキスト[/s] (Alt+K)"
 
 #: ../inc/bbcode_html.inc:23
-msgid "Code display: [code]code[/code]  (alt+c)"
-msgstr ""
+msgid "Quote text: [quote]text[/quote]  (alt+q)"
+msgstr "引用するテキスト: [quote]テキスト[/quote] (Alt+Q)"
 
 #: ../inc/bbcode_html.inc:26
-msgid "List: [list]text[/list] (alt+l)"
-msgstr ""
+msgid "Code display: [code]code[/code]  (alt+c)"
+msgstr "コードとして表示する: [code]コード[/code] (Alt+C)"
 
 #: ../inc/bbcode_html.inc:29
-msgid "Ordered list: [list=]text[/list]  (alt+o)"
-msgstr ""
+msgid "List: [list]text[/list] (alt+l)"
+msgstr "リストにする: [list]テキスト[/list] (Alt+L)"
 
 #: ../inc/bbcode_html.inc:32
-msgid "Insert image: [img]http://image_url[/img]  (alt+p)"
-msgstr ""
+msgid "Ordered list: [list=]text[/list]  (alt+o)"
+msgstr "番号付きリストにする: [list=]テキスト[/list] (Alt+O)"
 
 #: ../inc/bbcode_html.inc:35
+msgid "Insert image: [img]http://image_url[/img]  (alt+p)"
+msgstr "画像の挿入: [img]http://画像のURL[/img] (Alt+P)"
+
+#: ../inc/bbcode_html.inc:38
 msgid ""
 "Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url]  (alt+w)"
-msgstr ""
+msgstr "URLの挿入: [url]http://URL[/url] もしくはテキストにハイパーリンクをつける場合 [url=http://URL]テキスト[/url] (Alt+W)"
 
-#: ../inc/bbcode_html.inc:42
+#: ../inc/bbcode_html.inc:45
 msgid "Font color"
-msgstr ""
+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 ""
+msgstr "フォントの色を指定: [color=red]フォント[/color] ヒント: この場合あなたは #FF0000 (HTMLでの色名称でいうRed) の色もまた使うことができます。"
 
-#: ../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 "指定省略時の扱い"
+msgstr "指定省略時の標準設定"
 
-#: ../inc/bbcode_html.inc:45
+#: ../inc/bbcode_html.inc:48
 msgid "Dark Red"
-msgstr ""
+msgstr "暗赤色"
 
-#: ../inc/bbcode_html.inc:46
+#: ../inc/bbcode_html.inc:49
 msgid "Red"
-msgstr ""
+msgstr "赤色"
 
-#: ../inc/bbcode_html.inc:47
-#, fuzzy
+#: ../inc/bbcode_html.inc:50
 msgid "Orange"
-msgstr "変更"
+msgstr "オレンジ色"
 
-#: ../inc/bbcode_html.inc:48
+#: ../inc/bbcode_html.inc:51
 msgid "Brown"
-msgstr ""
+msgstr "茶色"
 
-#: ../inc/bbcode_html.inc:49
+#: ../inc/bbcode_html.inc:52
 msgid "Yellow"
-msgstr ""
+msgstr "黄色"
 
-#: ../inc/bbcode_html.inc:50
+#: ../inc/bbcode_html.inc:53
 msgid "Green"
-msgstr ""
+msgstr "緑色"
 
-#: ../inc/bbcode_html.inc:51
+#: ../inc/bbcode_html.inc:54
 msgid "Olive"
-msgstr ""
+msgstr "オリーブ色"
 
-#: ../inc/bbcode_html.inc:52
+#: ../inc/bbcode_html.inc:55
 msgid "Cyan"
-msgstr ""
+msgstr "シアン色"
 
-#: ../inc/bbcode_html.inc:53
+#: ../inc/bbcode_html.inc:56
 msgid "Blue"
-msgstr ""
+msgstr "青色"
 
-#: ../inc/bbcode_html.inc:54
+#: ../inc/bbcode_html.inc:57
 msgid "Dark Blue"
-msgstr ""
+msgstr "暗青色"
 
-#: ../inc/bbcode_html.inc:55
+#: ../inc/bbcode_html.inc:58
 msgid "Indigo"
-msgstr ""
+msgstr "藍色"
 
-#: ../inc/bbcode_html.inc:56
+#: ../inc/bbcode_html.inc:59
 msgid "Violet"
-msgstr ""
+msgstr "スミレ色"
 
-#: ../inc/bbcode_html.inc:57
+#: ../inc/bbcode_html.inc:60
 msgid "Font size"
-msgstr ""
+msgstr "フォントの大きさ"
 
-#: ../inc/bbcode_html.inc:58
+#: ../inc/bbcode_html.inc:61
 msgid "Font size: [size=x-small]small text[/size]"
-msgstr ""
+msgstr "フォントの大きさを指定する: [size=x-small]小さいフォントのテキスト[/size]"
 
-#: ../inc/bbcode_html.inc:60
+#: ../inc/bbcode_html.inc:63
 msgid "Small"
-msgstr ""
+msgstr "小さい"
 
-#: ../inc/bbcode_html.inc:61
+#: ../inc/bbcode_html.inc:64
 msgid "Normal"
-msgstr ""
+msgstr "標準"
 
-#: ../inc/bbcode_html.inc:62
+#: ../inc/bbcode_html.inc:65
 msgid "Large"
-msgstr ""
+msgstr "大きい"
 
-#: ../inc/bbcode_html.inc:65
+#: ../inc/bbcode_html.inc:68
 msgid "Close all open bbCode tags"
-msgstr ""
+msgstr "開いているBBコードの全てのタグを閉じる"
 
-#: ../inc/bbcode_html.inc:65
+#: ../inc/bbcode_html.inc:68
 msgid "Close Tags"
-msgstr ""
+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 "高度な検索"
 
-# #######################################
-# Private messages
-#: ../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 "非公開メッセージ"
 
-# #######################################
-# Links from the main page
-#: ../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 "質問と答(Q&A)"
 
-#: ../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 "掲示板"
 
-# #######################################
-# Forum sample index page
-#: ../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
-#, fuzzy
+#: ../inc/forum.inc:583
 msgid "Send message"
-msgstr "メッセージ送信"
+msgstr "メッセージを送信"
 
-#: ../inc/forum.inc:580
-#, fuzzy
+#: ../inc/forum.inc:583
 msgid "Send %1 a private message"
-msgstr "非公開メッセージを送信する"
+msgstr "%1 さんに非公開メッセージを送信する"
 
-#: ../inc/forum.inc:581
-#, fuzzy
+#: ../inc/forum.inc:584
 msgid "Joined: %1"
-msgstr "%1 に参加完了"
+msgstr "参加した日: %1"
 
-# #######################################
-# Forum
-#: ../inc/forum.inc:590
-#, fuzzy
+#: ../inc/forum.inc:593
 msgid "Posts: %1"
-msgstr "投稿:"
+msgstr "投稿数: %1"
 
-#: ../inc/forum.inc:596
-#, fuzzy
+#: ../inc/forum.inc:599
 msgid "Credit: %1"
-msgstr "功績値"
+msgstr "功績値: %1"
 
-#: ../inc/forum.inc:597
+#: ../inc/forum.inc:600
 msgid "RAC: %1"
-msgstr ""
+msgstr "最近の平均功績: %1"
 
-#: ../inc/forum.inc:620
-#, fuzzy
+#: ../inc/forum.inc:624
 msgid "You haven't read this message yet"
-msgstr "このスレッドをあなたはまだ読んでいません"
+msgstr "あなたはこのメッセージをまだ読んでいません"
 
-#: ../inc/forum.inc:620
-#, fuzzy
+#: ../inc/forum.inc:624
 msgid "Unread"
 msgstr "未読"
 
-#: ../inc/forum.inc:623 ../inc/forum.inc:628 ../inc/forum.inc:727
-#, fuzzy
+#: ../inc/forum.inc:627 ../inc/forum.inc:632 ../inc/forum.inc:731
 msgid "Message %1"
-msgstr "メッセージ"
+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 "非公開"
 
-# #######################################
-# Forum
-#: ../inc/forum.inc:625
-#, fuzzy
+#: ../inc/forum.inc:629
 msgid "Posted: %1"
-msgstr "%1 からの投稿"
+msgstr "投稿日時: %1"
 
-#: ../inc/forum.inc:628
-#, fuzzy
+#: ../inc/forum.inc:632
 msgid " - in response to "
-msgstr "タイムアウト - 応答なし"
+msgstr "- に対する返答"
 
-#: ../inc/forum.inc:631 ../inc/prefs.inc:705 ../inc/prefs.inc:707
+#: ../inc/forum.inc:635
 msgid "Edit"
 msgstr "編集"
 
-#: ../inc/forum.inc:631
-#, fuzzy
+#: ../inc/forum.inc:635
 msgid "Edit this message"
-msgstr "あなたのメッセージを編集する"
+msgstr "このメッセージを編集"
 
-#: ../inc/forum.inc:637
-#, fuzzy
+#: ../inc/forum.inc:641
 msgid "Last modified: %1"
-msgstr "最後に更新されたプレファレンス:"
+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 ""
+"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
-#, fuzzy
+#: ../inc/forum.inc:672 ../inc/forum.inc:683
 msgid "Report this post as offensive"
-msgstr "このニュースをお知らせとしてエクスポートする"
+msgstr "この投稿を攻撃的であるとして報告"
 
-#: ../inc/forum.inc:668 ../inc/forum.inc:679
-#, fuzzy
+#: ../inc/forum.inc:672 ../inc/forum.inc:683
 msgid "Report as offensive"
-msgstr "投稿に関する報告を提出する"
+msgstr "攻撃的であるとして報告"
 
-#: ../inc/forum.inc:672
+#: ../inc/forum.inc:676
 msgid "Rating: %1"
-msgstr ""
+msgstr "評価: %1"
 
-#: ../inc/forum.inc:672
+#: ../inc/forum.inc:676
 msgid "rate: "
-msgstr ""
+msgstr "評価する:"
 
-# 83%
-#: ../inc/forum.inc:675
-#, fuzzy
+#: ../inc/forum.inc:679
 msgid "Click if you like this message"
-msgstr "非公開メッセージを作成できませんでした"
+msgstr "このメッセージが好ましいと思う場合はクリック"
 
-#: ../inc/forum.inc:675
+#: ../inc/forum.inc:679
 msgid "Rate +"
-msgstr ""
+msgstr "+として評価"
 
-#: ../inc/forum.inc:677
-#, fuzzy
+#: ../inc/forum.inc:681
 msgid "Click if you don't like this message"
-msgstr "非公開メッセージを作成できませんでした"
+msgstr "このメッセージが好ましいと思わない場合はクリック"
 
-#: ../inc/forum.inc:677
+#: ../inc/forum.inc:681
 msgid "Rate -"
-msgstr ""
+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 ""
+msgstr "このメッセージへの返信を投稿"
 
-#: ../inc/forum.inc:687
-#, fuzzy
+#: ../inc/forum.inc:691
 msgid "Quote"
-msgstr "引用テキスト"
+msgstr "引用"
 
-#: ../inc/forum.inc:687
+#: ../inc/forum.inc:691
 msgid "Post a reply by quoting this message"
-msgstr ""
+msgstr "このメッセージを引用することによって返信を投稿"
 
-#: ../inc/forum.inc:708
+#: ../inc/forum.inc:712
 msgid "Hidden by a moderator"
-msgstr ""
+msgstr "モデレーターによって隠されています"
 
-# #######################################
-# Forum
-#: ../inc/forum.inc:729
-#, fuzzy
+#: ../inc/forum.inc:733
 msgid "Posted %1 by %2"
-msgstr "%1 からの投稿"
+msgstr "%2 さんによって %1 が投稿されました"
 
-#: ../inc/forum.inc:747
-#, fuzzy
+#: ../inc/forum.inc:751
 msgid "You may not post or rate messages until %1"
-msgstr "非公開メッセージは届いていません。"
+msgstr "あなたは %1 までメッセージを投稿もしくは評価してはいけません"
 
-#: ../inc/forum.inc:758
+#: ../inc/forum.inc:762
 msgid ""
 "\n"
 "        <ul>\n"
@@ -406,368 +467,352 @@ msgid ""
 "        <li> No abusive comments involving race, religion,\n"
 "            nationality, gender, class or sexuality.\n"
 "        "
-msgstr ""
+msgstr "\n<ul>\n<li> 投稿は「子供に無害」でなければなりません。わいせつであったり、憎悪関連、性的に露骨あるいは示唆的であってはなりません。\n<li> 商業広告は禁止です。\n<li> 性的な内容、ギャンブル、他人に不寛容であるものに関係するウェブサイトへのリンクの貼り付けは禁止です。\n<li> 故意に他の人を困らせるあるいは反感をもたせたり、掲示板を乗っ取るメッセージは禁止です。\n<li> 故意的な敵意のあるあるいは侮辱的なメッセージは禁止です。\n<li> 人種、宗教、国籍、性別、階級、性的関心に関連する罵倒は禁止です。"
 
-#: ../inc/forum.inc:780
+#: ../inc/forum.inc:784
 msgid "Rules:"
-msgstr ""
+msgstr "規約:"
 
-#: ../inc/forum.inc:781
-#, fuzzy
+#: ../inc/forum.inc:785
 msgid "More info"
-msgstr "チームの情報"
+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
-#, fuzzy
+#: ../inc/forum.inc:1082
 msgid "Unhide this post"
-msgstr "このスレッドを見えるようにします"
+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
-#, fuzzy
+#: ../inc/forum.inc:1084
 msgid "Hide this post"
-msgstr "投稿を隠す"
+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
-#, fuzzy
+#: ../inc/forum.inc:1089
 msgid "Move post to a different thread"
-msgstr "このスレッドを別の掲示板に移動します"
+msgstr "この投稿を別の掲示板に移動します"
 
-#: ../inc/forum.inc:1067
-#, fuzzy
+#: ../inc/forum.inc:1094
 msgid "Banish author"
-msgstr "参加者を投稿禁止にする"
+msgstr "投稿者を投稿禁止にする"
 
-#: ../inc/forum.inc:1074
-#, fuzzy
+#: ../inc/forum.inc:1101
 msgid "Vote to banish author"
-msgstr "参加者を投稿禁止にする権限がありません"
+msgstr "投稿者を投稿禁止にするよう投票"
 
-#: ../inc/forum.inc:1078
-#, fuzzy
+#: ../inc/forum.inc:1105
 msgid "Vote not to banish author"
-msgstr "参加者を投稿禁止にする権限がありません"
+msgstr "投稿者を投稿禁止にしないよう投票"
 
-#: ../inc/forum.inc:1083
-#, fuzzy
+#: ../inc/forum.inc:1110
 msgid "Start vote to banish author"
-msgstr "参加者を投稿禁止にする権限がありません"
+msgstr "投稿者を投稿禁止にするかどうかの採決を開始"
 
-#: ../inc/forum.inc:1116
-#, fuzzy
+#: ../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 "チームの掲示板を作成・管理する"
+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 の中に新しいスレッドを作るには、 "
-"一定の量の功績(credit)を獲得済みでなければなりません。これは、悪用を防いでこの掲示板システムを守るための制約です。"
+msgstr "%1 の中に新しいスレッドを作るには、 一定の量の功績値(credit)を獲得済みでなければなりません。これは、悪用を防いでこの掲示板システムを守るための制約です。"
 
-#: ../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 ""
-"現在、スレッドを新規作成することはできません。 "
-"しばらく待ってからもう一度お試しください。悪用防止のため、この掲示板では時間を置かず続けてスレッドを作成することはできません。"
+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 ""
+msgstr "この掲示板はロックされました。掲示板のモデレーターおよび管理者のみ投稿が許可されます。"
 
-#: ../inc/forum.inc:1145
+#: ../inc/forum.inc:1182
 msgid "Can't post to a hidden thread."
-msgstr ""
+msgstr "隠された掲示板には投稿できません。"
 
-#: ../inc/forum.inc:1173
+#: ../inc/forum.inc:1216
 msgid "Thread"
 msgstr "スレッド"
 
-# #######################################
-# Forum
-#: ../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
-#, fuzzy
+#: ../inc/forum.inc:1278
 msgid "New posts in the thread %1"
-msgstr "スレッドに投稿する"
+msgstr "スレッドへの新しい投稿: %1"
 
-# Better translation welcome.
-#: ../inc/forum.inc:1240
-#, fuzzy
+#: ../inc/forum.inc:1283
 msgid "New posts in subscribed thread"
-msgstr "参加しているスレッド"
+msgstr "参加しているスレッドへの新しい投稿"
 
-#: ../inc/forum.inc:1241
-#, fuzzy
+#: ../inc/forum.inc:1284
 msgid "There are new posts in the thread '%1'"
-msgstr "このスレッドに新しい投稿があったとき、その旨のメイルを受けとりたければここをクリック"
+msgstr "スレッドに新しい投稿があります:「 %1 」"
 
-#: ../inc/forum.inc:1251
+#: ../inc/forum.inc:1294
 msgid "Mark all threads as read"
 msgstr "全てのスレッドを既読にする"
 
-#: ../inc/forum.inc:1252
-#, fuzzy
+#: ../inc/forum.inc:1295
 msgid "Mark all threads in all message boards as read."
-msgstr "すべての掲示板のすべてのスレッドを「既読」状態に設定します。"
+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 ""
+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 "平均ターンアラウンドタイム"
+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 日"
 
-# #######################################
-# Apps page (apps.php)
-#: ../inc/host.inc:170
+#: ../inc/host.inc:169
 msgid "Application details"
-msgstr "アプリケーションの詳細"
+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
-#, fuzzy
+#: ../inc/host.inc:184 ../inc/host.inc:206
 msgid "Number of times client has contacted server"
 msgstr "BOINC クライアントがサーバーに接続した回数"
 
-#: ../inc/host.inc:186
+#: ../inc/host.inc:185
 msgid "Last time contacted server"
-msgstr "最後にサーバに接続した日時"
+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"
@@ -777,7 +822,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 "設置場所"
 
@@ -787,13 +832,13 @@ msgstr "このコンピュータを削除"
 
 #: ../inc/host.inc:204
 msgid "Merge duplicate records of this computer"
-msgstr "このコンピュータに関する重複データを合併させる"
+msgstr "このコンピュータに関する重複する記録をマージする"
 
 #: ../inc/host.inc:204
 msgid "Merge"
-msgstr "合併させる"
+msgstr "マージする"
 
-#: ../inc/host.inc:207 ../inc/host.inc:689
+#: ../inc/host.inc:207 ../inc/host.inc:694
 msgid "Last contact"
 msgstr "最後の接続日時"
 
@@ -801,30 +846,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 "最近の平均功績(credits/day)"
+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"
 
@@ -832,93 +877,85 @@ 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 には右の重複生存期間があります:"
+msgstr "計算機 %1 は右の重複する存続期間があります:"
 
-#: ../inc/host.inc:522
+#: ../inc/host.inc:527
 msgid "Host %1 has an incompatible OS:"
-msgstr "計算機 %1 の OS とは互換性がありません:"
+msgstr "計算機 %1 のOSとは互換性がありません:"
 
-#: ../inc/host.inc:528
+#: ../inc/host.inc:533
 msgid "Host %1 has an incompatible CPU:"
-msgstr "計算機 %1 の 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 にはマージできません - 両者に互換性がありません"
+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 "リザルトを更新できませんでした"
+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 "
+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 "ドメイン名でコンピュータを合併する"
+msgstr "ドメイン名でコンピュータをマージする"
 
-#: ../inc/language_names.inc:61
+#: ../inc/language_names.inc:62
 msgid "Browser default"
-msgstr ""
+msgstr "ブラウザのデフォルト"
 
 #: ../inc/news.inc:40
 msgid "Comment"
@@ -929,32 +966,31 @@ 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
-#, fuzzy
+#: ../inc/pm.inc:48 ../user/pm.php:136
 msgid "no such message"
-msgstr "該当する参加者はありません"
+msgstr "該当するメッセージはありません"
 
 #: ../inc/pm.inc:82
 msgid "To"
@@ -962,401 +998,509 @@ 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:139
+#: ../inc/pm.inc:85 ../user/pm.php:90 ../user/pm.php:144
 msgid "Subject"
 msgstr "件名"
 
 #: ../inc/pm.inc:89
 msgid "Send message"
-msgstr "メッセージ送信"
+msgstr "メッセージを送信"
 
-# English dependent message structure. Strongly Discouraged.
-#: ../inc/pm.inc:121
+#: ../inc/pm.inc:122
 msgid "sent you a private message; subject:"
-msgstr "さんが、あなたに非公開メッセージを送ってきました。件名:"
+msgstr "さんがあなたに非公開メッセージを送信しました。件名:"
 
-# English dependent message structure. Strongly Discouraged.
-#: ../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 "Eメイルでの通知を必要とする場合、%1コミュニティのプレファレンスを編集%2してください"
+msgstr "Eメールでの通知を必要とする場合、%1コミュニティのプレファレンスを編集%2してください"
 
-# #######################################
-# Private messages
-#: ../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 向けの計算を一時停止させますか? %1 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 "CPU温度とエネルギー使用量を抑制するために数秒ごとに計算を一時停止/再開する。例: 75%であれば、3秒計算・1秒一時停止を繰り返します。"
 
-# Suspicious of being English-dependent word sequence.
-#: ../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 "% の CPU 時間まで"
 
-#: ../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 使用率が 右の値を超えたら、計算を一時停止する%1 0 を指定すると制約なし<br>Version "
-"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つの時刻が等しければ制約なし %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( 'yes/はい' を指定すると、一時停止のためにそのタスクはスワップ領域を使用する)%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 "マルチプロセッサで動作する場合、全プロセッサのうち使うのは最大で %1 Version 6.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 "% の CPU 時間まで"
+#: ../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 ""
+#: ../inc/prefs.inc:114
+msgid ""
+"Store additional tasks above the minimum level.  Determines how much work is"
+" requested when contacting a project."
+msgstr "最小レベル以上の追加タスクを備蓄してください。プロジェクトに連絡する際に要求される作業の量を決定します。"
 
-#: ../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(モデム、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(モデム、ISDN または VPN 接続を使っているときだけ有意)%2"
+"This controls how often tasks save their state to disk, so that they can be "
+"restarted later."
+msgstr "ここではタスクが後ほど再起動されることが出来るようにするために、ディスクにその状態を保存する間隔を設定します。"
 
-#: ../inc/prefs.inc:249
-msgid "Maximum download rate:"
-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 "転送量の上限値。最大でも右の値まで %1 Version 6.10.46以降で有効 %2"
+#: ../inc/prefs.inc:139
+msgid "GB"
+msgstr "GB"
 
-#: ../inc/prefs.inc:269
-msgid "Mbytes every"
-msgstr "Mバイト/"
+#: ../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 インターネットプロバイダが画像ファイルを変更する場合だけ、チェックを入れてください(たとえば "
-"UMTSの場合)。%2 検証をスキップすると BOINC のセキュリティレベルは低下します。%3"
+"Limit disk usage to leave this much free space on the volume where BOINC "
+"stores data."
+msgstr "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このプロジェクトに割り当てるあなたのコンピュータの資源量を決める指標です。\n"
-" 例えば2つの BOINC プロジェクトに参加していたとしてリソース\n"
-"割り当てをそれぞれ 100、200 と指定したら、1つ目のプロジェクト\n"
-"に1/3が割り当てられ、2つ目には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 を計算に使うか %1 Version 6.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 を計算に使うか %1 Version 6.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 を計算に使うか %1 Version 6.10以降で有効 %2"
+#: ../inc/prefs.inc:162 ../inc/prefs.inc:169 ../inc/prefs.inc:182
+#, no-php-format
+msgid "%"
+msgstr "%"
 
-#: ../inc/prefs.inc:344
-#, fuzzy
-msgid "Use Intel GPU %1 Enforced by version 7.2+ %2"
-msgstr "ATI GPU を計算に使うか %1 Version 6.10以降で有効 %2"
+#: ../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:172
+msgid "Leave non-GPU tasks in memory while suspended"
+msgstr "一時停止中に、GPU向けでないタスクをメモリ上に残す"
 
-#: ../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メイルが %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 および(所属している場合)あなたのチームから、Eメイルを送信してもよろしいですか?"
+#: ../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日ごとに2000MBのデータまで転送するはずです。"
 
-#: ../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 "インターネットプロバイダが画像ファイルを変更する場合はチェックを入れてください。検証をスキップすると BOINC のセキュリティレベルは低下します。"
+
+#: ../inc/prefs.inc:222
+msgid "Confirm before connecting to Internet"
+msgstr "インターネットに接続する前に確認する"
 
-#: ../inc/prefs.inc:812 ../user/explain_state.php:94
+#: ../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: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 "初期(指定省略時)のプレファレンス"
+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:885
-msgid "These apply to all BOINC projects in which you participate."
-msgstr ""
-
-#: ../inc/prefs.inc:887
-msgid ""
-"On computers participating in multiple projects, the most recently modified "
-"preferences will be used."
-msgstr ""
-
-#: ../inc/prefs.inc:889
-msgid "These preferences do not apply to Android devices."
-msgstr ""
-
-#: ../inc/prefs.inc:892
+#: ../inc/prefs.inc:537
 msgid "Preferences last modified:"
-msgstr "最後に更新されたプレファレンス:"
+msgstr "最後に変更されたプレファレンス:"
 
-#: ../inc/prefs.inc:944
+#: ../inc/prefs.inc:553
 msgid "Add preferences"
 msgstr "プレファレンスを追加する"
 
-#: ../inc/prefs.inc:948
+#: ../inc/prefs.inc:557
 msgid "Update preferences"
 msgstr "プレファレンスを更新する"
 
-#: ../inc/prefs.inc:1036 ../inc/prefs.inc:1045
+#: ../inc/prefs.inc:628 ../project.sample/project_specific_prefs.inc:84
+#: ../project.sample/project_specific_prefs.inc:224
+msgid "yes"
+msgstr "はい"
+
+#: ../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 "指定省略時のコンピュータ設置場所"
+msgstr "初期(指定省略時)のコンピュータ設置場所"
+
+#: ../inc/prefs.inc:639
+msgid ""
+"New computers will use this location for computing and project preferences."
+msgstr "新しいコンピュータは計算とプロジェクトのプレファレンスのために、この場所のものを使用します。"
 
-#: ../inc/prefs_util.inc:305 ../inc/prefs_util.inc:315
+#: ../inc/prefs_project.inc:52
+msgid "Resource share"
+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 "このプロジェクトに割り当てるあなたのコンピュータの資源量の割合を決める指標です。例えば、2つの BOINC プロジェクトに参加していたとして、リソース割り当てをそれぞれ100・200と指定した場合、1つ目のプロジェクトに1/3が割り当てられ、2つ目には2/3の資源が割り当てられます。"
+
+#: ../inc/prefs_project.inc:61
+msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
+msgstr "CPU をそれぞれに専用に割り当てて、GPU タスクを高速化しますか?"
+
+#: ../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 "Eメールが %1 より送付されます。スパムフィルターがこのアドレスをブロックしないようにしてください。"
+
+#: ../inc/prefs_project.inc:123
+msgid "Is it OK for %1 and your team (if any) to email you?"
+msgstr "%1 および(所属している場合)あなたのチームから、Eメールを送信してもよろしいですか?"
+
+#: ../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_util.inc:33
+msgid "bad venue: %1"
+msgstr "不適切な場所: %1"
+
+#: ../inc/prefs_util.inc:39
+msgid "bad subset: %1"
+msgstr "不適切な適用範囲: %1"
+
+#: ../inc/prefs_util.inc:476 ../inc/prefs_util.inc:500
 msgid "and"
 msgstr "~"
 
@@ -1364,15 +1508,15 @@ msgstr "~"
 msgid ""
 "Your profile will be made visible to other people as soon as it has been "
 "approved by the project. This may take up to a few days."
-msgstr "あなたの自己紹介記事は、このプロジェクトから許可が出しだい他の方にも見えるようになります。それまで数日かかるかもしれません。"
+msgstr "あなたのプロフィールはこのプロジェクトから承認され次第、他の方にも見えるようになります。それまで数日かかるかもしれません。"
 
 #: ../inc/profile.inc:92
 msgid ""
 "Your profile has been marked as unacceptable. It is not visible to other "
 "people. Please change it."
-msgstr "あなたの自己紹介記事は受け入れられませんでした。他の方からは見えません。変更をお願いします。"
+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 "データベースで異常発生"
 
@@ -1380,41 +1524,39 @@ msgstr "データベースで異常発生"
 msgid ""
 "To prevent spam, profiles of users with an average credit of less than %1 "
 "are displayed only to logged-in users. We apologize for this inconvenience."
-msgstr ""
-"スパムを防ぐため、功績の平均増加量が %1 "
-"より少ない参加者の自己紹介記事は、ログイン済みの参加者からだけしか見ることができません。ご不便をおかけします。"
+msgstr "スパムを防ぐため、功績の平均増加量が %1 より少ない参加者のプロフィールはログイン済みのユーザーに対してしか表示されません。ご不便をおかけします。"
 
 #: ../inc/profile.inc:197
 msgid "User is banished"
-msgstr "参加者は書込み禁止状態になっています"
+msgstr "ユーザーは書き込み禁止状態になっています"
 
 #: ../inc/profile.inc:211
 msgid "No profile exists for that user ID."
-msgstr "その参加者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 "あなたの自己紹介記事(プロファイル)を編集する"
+msgstr "あなたのプロフィールを編集する"
 
 #: ../inc/profile.inc:262
 msgid "Your feedback on this profile"
-msgstr "この自己紹介記事(プロファイル)へのあなたのフィードバック"
+msgstr "このプロフィールへのあなたのフィードバック"
 
 #: ../inc/profile.inc:264
 msgid "Recommend this profile for User of the Day:"
-msgstr "「今日の参加者紹介」へこの自己紹介記事(プロファイル)を推薦する"
+msgstr "「今日の参加者紹介」へこのプロフィールを推薦する:"
 
 #: ../inc/profile.inc:265
 msgid "I %1like%2 this profile"
-msgstr "この自己紹介記事(プロファイル)が%1好き%2"
+msgstr "このプロフィールが %1 好き %2"
 
 #: ../inc/profile.inc:268
 msgid "Alert administrators to an offensive profile:"
-msgstr "不快感を与える自己紹介記事(プロファイル)であることを管理者に注意喚起する:"
+msgstr "不快感を与えるプロフィールであることを管理者に注意喚起する:"
 
 #: ../inc/profile.inc:269
 msgid "I %1do not like%2 this profile"
-msgstr "この自己紹介記事(プロファイル)は%1嫌い%2"
+msgstr "このプロフィールは %1 好ましくない %2"
 
 #: ../inc/result.inc:35
 msgid "Anonymous platform"
@@ -1430,7 +1572,7 @@ msgstr "ATI GPU"
 
 #: ../inc/result.inc:57 ../user/host_app_versions.php:28
 msgid "Intel GPU"
-msgstr ""
+msgstr "Intel GPU"
 
 #: ../inc/result.inc:65
 msgid "Not in DB"
@@ -1440,25 +1582,26 @@ 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 "計算中"
 
 #: ../inc/result.inc:116
 msgid "Validation pending"
-msgstr ""
+msgstr "検証を保留中"
 
 #: ../inc/result.inc:117
 msgid "Validation inconclusive"
-msgstr ""
+msgstr "検証したが未確定"
 
 #: ../inc/result.inc:118 ../inc/result.inc:268
 msgid "Valid"
-msgstr "検証済"
+msgstr "有効"
 
 #: ../inc/result.inc:119 ../inc/result.inc:271
 msgid "Invalid"
@@ -1470,9 +1613,10 @@ msgstr "異常発生"
 
 #: ../inc/result.inc:174 ../inc/result.inc:221 ../user/explain_state.php:34
 msgid "Inactive"
-msgstr "非活性"
+msgstr "活動していない"
 
 #: ../inc/result.inc:175 ../inc/result.inc:222 ../user/explain_state.php:37
+#: ../user/server_status.php:163
 msgid "Unsent"
 msgstr "未送出"
 
@@ -1494,7 +1638,7 @@ msgstr "計算済、検証不可"
 
 #: ../inc/result.inc:185
 msgid "Completed, validation inconclusive"
-msgstr "計算済、検証したが未決定"
+msgstr "計算済、検証したが未確定"
 
 #: ../inc/result.inc:186
 msgid "Completed, too late to validate"
@@ -1510,11 +1654,11 @@ msgstr "送出できず"
 
 #: ../inc/result.inc:194 ../inc/result.inc:257
 msgid "Cancelled by server"
-msgstr "サーバによりキャンセルされた"
+msgstr "サーバにより取り消し"
 
 #: ../inc/result.inc:199
 msgid "Not started by deadline - canceled"
-msgstr ""
+msgstr "報告期限までに開始されませんでした - 取り消されました"
 
 #: ../inc/result.inc:202
 msgid "Error while downloading"
@@ -1530,12 +1674,11 @@ msgstr "アップロード中に異常発生"
 
 #: ../inc/result.inc:206 ../inc/result.inc:259
 msgid "Aborted by user"
-msgstr "参加者により中止された"
+msgstr "参加者により中止"
 
 #: ../inc/result.inc:207 ../inc/result.inc:260
-#, fuzzy
 msgid "Upload failed"
-msgstr "更新失敗"
+msgstr "アップロード失敗"
 
 #: ../inc/result.inc:210
 msgid "Timed out - no response"
@@ -1543,7 +1686,7 @@ msgstr "タイムアウト - 応答なし"
 
 #: ../inc/result.inc:211 ../inc/result.inc:240 ../user/explain_state.php:71
 msgid "Didn't need"
-msgstr "計算不要となった"
+msgstr "不要となった"
 
 #: ../inc/result.inc:212 ../inc/result.inc:241 ../user/explain_state.php:74
 msgid "Validate error"
@@ -1563,15 +1706,15 @@ msgstr "成功"
 
 #: ../inc/result.inc:236
 msgid "Computation error"
-msgstr "計算中に異常発生"
+msgstr "計算エラー"
 
 #: ../inc/result.inc:238
 msgid "Redundant result"
-msgstr "重複したリザルト"
+msgstr "余分な結果"
 
 #: ../inc/result.inc:239 ../user/explain_state.php:68
 msgid "No reply"
-msgstr "返事なし"
+msgstr "応答なし"
 
 #: ../inc/result.inc:249 ../user/explain_state.php:85
 msgid "New"
@@ -1583,11 +1726,11 @@ msgstr "ダウンロード中"
 
 #: ../inc/result.inc:251
 msgid "Processing"
-msgstr "処理"
+msgstr "処理中"
 
 #: ../inc/result.inc:252
 msgid "Compute error"
-msgstr "計算中に異常発生"
+msgstr "計算エラー"
 
 #: ../inc/result.inc:253 ../user/explain_state.php:97
 msgid "Uploading"
@@ -1611,23 +1754,23 @@ msgstr "ワークユニットの異常 - 検証省略"
 
 #: ../inc/result.inc:275
 msgid "Checked, but no consensus yet"
-msgstr "検査したが、一致数がまだ基準に至らず"
+msgstr "検証したが、一致数がまだ基準に至らず"
 
 #: ../inc/result.inc:276
 msgid "Task was reported too late to validate"
-msgstr "検証するには結果の到着が遅すぎた"
+msgstr "検証するにはタスクの報告が遅すぎた"
 
 #: ../inc/result.inc:302
 msgid "Couldn't send result"
-msgstr "結果を送出できなかった"
+msgstr "結果を送出できず"
 
 #: ../inc/result.inc:306
 msgid "Too many errors (may have bug)"
-msgstr "異常過多(おそらくバグ)"
+msgstr "異常過多(おそらくバグ)"
 
 #: ../inc/result.inc:310
 msgid "Too many results (may be nondeterministic)"
-msgstr "計算結果過多(おそらく非決定的)"
+msgstr "計算結果過多(おそらく非決定的)"
 
 #: ../inc/result.inc:314
 msgid "Too many total results"
@@ -1635,139 +1778,144 @@ msgstr "結果の総数過多"
 
 #: ../inc/result.inc:318
 msgid "WU cancelled"
-msgstr "ワークユニットがキャンセルされました"
+msgstr "ワークユニットが取り消されました"
 
 #: ../inc/result.inc:322
+msgid "Canonical result is missing"
+msgstr "標準的結果が見つかりません"
+
+#: ../inc/result.inc:326
 msgid "Unrecognized Error: %1"
-msgstr "未確認の異常: %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 />または期限"
+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 />(秒)"
+msgstr "実行時間<br />(秒)"
 
-#: ../inc/result.inc:378
+#: ../inc/result.inc:382
 msgid "CPU time<br />(sec)"
-msgstr "CPU 時間<br />(秒)"
+msgstr "CPU時間<br />(秒)"
 
-#: ../inc/result.inc:379 ../inc/result.inc:642
+#: ../inc/result.inc:383 ../inc/result.inc:646
 msgid "Credit"
 msgstr "功績値"
 
-# #######################################
-# Apps page (apps.php)
-#: ../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 "終了ステイタス"
+msgstr "終了ステータス"
 
-#: ../inc/result.inc:638
-msgid "Report deadline"
-msgstr "報告期限"
-
-#: ../inc/result.inc:639
+#: ../inc/result.inc:643
 msgid "Run time"
-msgstr "経過時間"
+msgstr "実行時間"
 
-#: ../inc/result.inc:640
+#: ../inc/result.inc:644
 msgid "CPU time"
-msgstr "CPU 時間"
+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 "アプリケーションの版数"
+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 "標準エラー出力(stderr)"
 
-#: ../inc/result.inc:706
+#: ../inc/result.inc:728
 msgid "State"
 msgstr "状態"
 
-#: ../inc/result.inc:747
-#, fuzzy
+#: ../inc/result.inc:769
 msgid "Task name:"
-msgstr "タスク名"
+msgstr "タスク名:"
 
 #: ../inc/team.inc:40
 msgid "Search criteria (use one or more)"
-msgstr "検索条件(一つ以上指定要)"
+msgstr "検索条件(一つ以上要指定)"
 
 #: ../inc/team.inc:41
 msgid "Key words"
@@ -1777,17 +1925,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 "チームの種類"
 
@@ -1795,9 +1933,9 @@ 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 "検索する"
+msgstr "検索"
 
 #: ../inc/team.inc:61
 msgid "Requested by you, and founder response deadline has passed."
@@ -1805,7 +1943,7 @@ msgstr "あなたが要求しましたが、創設者は期限までに応答し
 
 #: ../inc/team.inc:63
 msgid "Complete foundership transfer"
-msgstr "創設者権利の移転を完了させるにはここをクリック"
+msgstr "創設者権利の移転を完了する"
 
 #: ../inc/team.inc:67
 msgid "Requested by you"
@@ -1813,10 +1951,10 @@ msgstr "あなたが要求中です"
 
 #: ../inc/team.inc:67
 msgid "founder response deadline is %1"
-msgstr "創設者の応答期限は、%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 "なし"
 
@@ -1826,568 +1964,530 @@ msgstr "要求を開始する"
 
 #: ../inc/team.inc:77
 msgid "Deferred"
-msgstr "変更手続き中"
+msgstr "延期された"
 
 #: ../inc/team.inc:87
 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 ""
-"注意:あなたがプロジェクト・プレファレンスの中で 「Eメイルを送っても良い」という意味の項目を選択した状態でチームへ参加すると、 "
-"そのチームの創設者はあなたのメイルアドレスを知ることになります。"
+msgstr "注意:あなたがプロジェクト・プレファレンスの中で「Eメールを送っても良い」と設定した状態でチームへ参加すると、 そのチームの創設者はあなたのメールアドレスを知ることになります。"
 
-#: ../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 "チームに昨日参加したメンバー"
+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 "功績(credit)を獲得済みのメンバーの数"
 
-#: ../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項目"
+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項目"
+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 BOINC ワイドのチーム %"
-"2を編集してください。"
+"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 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 ""
-"%1プライバシに関連する注意%2: チームを作成すると、あなたのプロジェクト・プレファレンス(資源割り当て、 "
-"グラフィクスについてのプレファレンス)が、公開されます。"
+msgstr "%1 プライバシーに関する注意 %2 : チームを作成すると、あなたのプロジェクト・プレファレンス(リソース割り当て、グラフィックについてのプレファレンス)が公開されます。"
 
-#: ../inc/team.inc:432
+#: ../inc/team.inc:447
 msgid "Team name, text version"
-msgstr "チーム名称、テキスト版"
+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版"
+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は使えます。"
+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 の使い方をご存知でなければ、この欄は空白にしてください。"
+msgstr "HTMLの使い方をご存知でなければ、この欄は空白にしてください。"
 
-#: ../inc/team.inc:442
+#: ../inc/team.inc:457
 msgid "URL of team web page, if any"
-msgstr "チームのウェブページのURL(もしあれば)"
+msgstr "チームのウェブページのURL(省略可)"
 
-#: ../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 "この URLへ は、このサイト内のチームのページからリンクが張られます。"
+msgstr "このURLへは、このサイト内のチームのページからリンクが張られます。"
 
-#: ../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 "新メンバーを受け入れますか?"
+msgstr "新しいメンバーを受け入れますか?"
 
-#: ../inc/uotd.inc:28
+#: ../inc/uotd.inc:30
 msgid "User profile"
-msgstr "参加者の自己紹介"
+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 "プロジェクト横断 ID"
 
-#: ../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 "Eメイルアドレス"
+msgstr "Eメールアドレス"
 
-#: ../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 "郵便番号"
 
-#: ../inc/user.inc:207 ../inc/user.inc:316
+#: ../inc/user.inc:214 ../inc/user.inc:394
 msgid "%1 member since"
-msgstr "%1 登録日"
+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 "Eメイルアドレス"
+msgstr "Eメールアドレス"
 
-#: ../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(User ID)"
+msgstr "参加者のID(ユーザーID)"
 
-#: ../inc/user.inc:213
+#: ../inc/user.inc:229
 msgid "Used in community functions"
-msgstr "コミュニティ機能の中で使われる ID です"
+msgstr "コミュニティ機能の中で使われるIDです"
 
-#: ../inc/user.inc:216 ../user/weak_auth.php:25
-#, fuzzy
+#: ../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に使わせるか。"
 
-# It maybe changed to "processing preferences" later.
-#: ../inc/user.inc:225
+#: ../inc/user.inc:241
 msgid "Computing preferences"
-msgstr "計算についての好みの設定(プレファレンス)"
+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 "コミュニティについての好みの設定(プレファレンス)"
+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 についての好みの設定(プレファレンス)"
+msgstr "%1 についての好みの設定(プレファレンス)"
+
+#: ../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:239 ../user/bs_sample_index.php:59
-#: ../user/sample_index.php:125
+#: ../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 "(創設者を変更する要求は保留中)"
+msgstr "(創設者権限の移譲要求は保留中)"
 
-#: ../inc/user.inc:279
+#: ../inc/user.inc:356
 msgid "Member of team"
-msgstr "所属チーム"
+msgstr "チームのメンバー"
 
-#: ../inc/user.inc:281
+#: ../inc/user.inc:358
 msgid "find a team"
-msgstr "チームを探す"
+msgstr "チームを検索"
 
-#: ../inc/user.inc:292
+#: ../inc/user.inc:369
 msgid "Founder but not member of"
-msgstr "設立したチーム(メンバーではない)"
+msgstr "下記のメンバーではない創設者:"
 
-#: ../inc/user.inc:298
+#: ../inc/user.inc:375
 msgid "Find friends"
-msgstr "友人を探す"
+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 ""
+msgstr "ユーザー名は、先頭もしくは末尾の空白を持つことはできません"
 
-#: ../inc/user.inc:450
+#: ../inc/user.inc:530
 msgid "user name must be nonempty"
-msgstr ""
+msgstr "ユーザー名は空であってはなりません"
 
-#: ../inc/user.inc:454
+#: ../inc/user.inc:534
 msgid "user name may not contain HTML tags"
-msgstr ""
+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 "ログインする"
-
-# #######################################
-# Create account form (create_account_form.php)
-#: ../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 "サーバー状態のページ"
+msgstr "サーバー側の状態のページ"
 
-#: ../inc/util.inc:248
+#: ../inc/util.inc:277
 msgid ""
 "A database error occurred while handling your request; please try again "
 "later."
-msgstr "あなたからの要求を処理中にデータベース・サーバで異常が起こりました。後ほどまた試してくださいませ。"
+msgstr "あなたからの要求を処理中にデータベース・サーバで異常が起こりました。後ほどまた試してください。"
 
-#: ../inc/util.inc:257
+#: ../inc/util.inc:286
 msgid "Unable to handle request"
-msgstr "要求を処理できませんでした"
+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
-msgid "Link has timed out. Please click Back, refresh the page, and try again."
-msgstr "セッションが時間超過しました。ブラウザの戻るボタンをクリックし、そこでページを再読み出し(リフレッシュ)してから、もう一度試してくださいませ。"
-
-# It seems that this msg has already been removed from the trunc. 20110828.
-#: ../inc/util.inc:513
-msgid "View the profile of %1"
-msgstr "%1 の自己紹介記事(プロファイル)を見る"
+#: ../inc/util.inc:473
+msgid ""
+"Link has timed out. Please click Back, refresh the page, and try again."
+msgstr "セッションがタイムアウトしました。ブラウザの戻るボタンをクリックし、そこでページを再読み込み(更新)してから、もう一度試してください。"
 
-#: ../inc/util.inc:569
+#: ../inc/util.inc:552
 msgid "Use BBCode tags to format your text"
-msgstr "テキストに書式を付けたいときは BBCode タグを使ってください"
+msgstr "テキストに書式を設定するときはBBコードタグを使ってください"
 
-#: ../inc/util.inc:796
+#: ../inc/util.inc:779
 msgid "Project down for maintenance"
-msgstr "保守作業のためプロジェクト停止中"
+msgstr "メンテナンスのためプロジェクト停止中"
 
-#: ../inc/util.inc:799
+#: ../inc/util.inc:782
 msgid "%1 is temporarily shut down for maintenance.  Please try again later."
-msgstr "%1 プロジェクトは保守のため一時的に停止しています。後ほどまた試してくださいませ。"
+msgstr "%1 プロジェクトはメンテナンスのため一時的に停止しています。後ほどまたお試しください。"
 
-#: ../inc/util.inc:817
+#: ../inc/util.inc:800
 msgid "Unable to connect to database - please try again later"
-msgstr "データベースに接続できません - 後ほど試してくださいませ"
+msgstr "データベースに接続できません - 後ほど試してください"
 
-#: ../inc/util.inc:821
+#: ../inc/util.inc:804
 msgid "Unable to select database - please try again later"
-msgstr "データベースの選択ができませんでした(mysql_select_dbに失敗) - 時間を置いてからまた試してください。"
+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 "現在のコンピュータからログインしたままにする"
+msgstr "このコンピュータからログインしたままにする"
 
 #: ../user/account_finish.php:34
 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 "郵便番号/ZIP コード"
-
-# #######################################
-# General stuff (create_account_form.php and others)
-#: ../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 "アカウントには名前をつけなければなりません。"
+msgstr "アカウントには名前をつけなければなりません"
 
 #: ../user/account_finish_action.php:30
 msgid "HTML tags not allowed in name"
-msgstr "アカウントの名前の中では、HTML タグは使えません。"
+msgstr "アカウントの名前の中では、HTML タグは使えません"
+
+#: ../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:81
+#: ../user/add_venue.php:82
 msgid "Add %1 preferences for %2"
-msgstr "%1 プレファレンスを %2 向けに追加"
+msgstr "%1 プレファレンスを %2 向けに追加"
 
-# #######################################
-# Apps page (apps.php)
-#: ../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 プロジェクトに参加すると、これらのアプリケーションのうち、 "
-"1つまたは複数のアプリケーションの仕事があなたのコンピュータに割り当てられます。 これらのアプリケーションの最新版がダウンロードされます。 "
-"これらは自動的に行われるので、ダウンロードについてあなたは何もする必要はありません。 "
+msgstr "%1 プロジェクトには、現在下記のアプリケーションがあります。 %1 プロジェクトに参加すると、これらのアプリケーションのうち、 1つまたは複数のアプリケーションのタスクがあなたのコンピュータに割り当てられます。これらのアプリケーションの最新版がダウンロードされます。これらは自動的に行われるので、何もする必要はありません。 "
 
-#: ../user/apps.php:50
+#: ../user/apps.php:54
 msgid "Platform"
 msgstr "プラットフォーム"
 
-#: ../user/apps.php:51
+#: ../user/apps.php:55
 msgid "Version"
-msgstr "版"
+msgstr "バージョン"
 
-#: ../user/apps.php:52
-msgid "Installation time"
-msgstr "登録日"
+#: ../user/apps.php:57
+msgid "Average computing"
+msgstr "平均的な計算"
 
 #: ../user/bbcode.php:23
 msgid "BBCode tags"
@@ -2399,11 +2499,7 @@ msgid ""
 "It's similar to HTML, but simpler. The tags start with a [ (where you would\n"
 "have used %1 in HTML) and end with ] (where you would have used %2 in\n"
 "HTML)."
-msgstr ""
-"BBコードのタグを使って、あなたの自己紹介の文章(プロファイル)や、掲示板へ投稿する\n"
-"文章に書式を付けることができます。それは HTML の流儀に似ていますが、より簡潔\n"
-"なものです。これらのタグは [ で始まり、] で終わります。 (HTMLでは %1 で始まり\n"
-"、%2 で終わる約束でした。)"
+msgstr "BBコードタグで、あなたのプロフィール・掲示板へ投稿するメッセージに書式を付けることができます。\nそれは HTML に似ていますが、よりわかりやすいものです。これらのタグは [ で始まり、] で終わります (HTMLでは %1 で始まり\n、%2 で終わる約束でした)。"
 
 #: ../user/bbcode.php:31
 msgid "Examples"
@@ -2422,162 +2518,78 @@ msgid "Underline"
 msgstr "下線"
 
 #: ../user/bbcode.php:35
-#, fuzzy
-msgid "Superscript"
-msgstr "説明"
+msgid "Strikethrough"
+msgstr "取り消し線"
 
 #: ../user/bbcode.php:36
+msgid "Superscript"
+msgstr "上付き文字"
+
+#: ../user/bbcode.php:37
 msgid "Big text"
 msgstr "大きな字"
 
-#: ../user/bbcode.php:37
+#: ../user/bbcode.php:38
 msgid "Red text"
-msgstr "赤字"
+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 "引用テキスト"
+msgstr "引用するテキスト"
 
-#: ../user/bbcode.php:39
+#: ../user/bbcode.php:40
 msgid "use for quoted blocks of text"
-msgstr "引用テキストをブロックに入れて表示します"
+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 "短いソースコードの表示"
+msgstr "コード・スニペットはここ"
 
-#: ../user/bbcode.php:41
+#: ../user/bbcode.php:42
 msgid "use to display some code"
-msgstr "ソースコードの断片を表示させるために使います"
+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 "フォーマット済み(通常固定幅の)テキストを表示するために使います"
+msgstr "フォーマット済み(通常は等幅の)テキストを表示させるために使います"
 
-#: ../user/bbcode.php:43
+#: ../user/bbcode.php:44
 msgid "Item 1"
-msgstr "項目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チケットへリンクするために使います"
+msgstr "BOINC ウェブサイト上の Trac チケットへリンクするために使います"
 
-#: ../user/bbcode.php:47
+#: ../user/bbcode.php:48
 msgid "use to link to Trac Wiki on BOINC website"
 msgstr "BOINC ウェブサイト上の Trac Wiki へリンクするために使います"
 
-#: ../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 ""
-
-# #######################################
-# "Your account" page (home.php)
-#: ../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 ""
-
-# #######################################
-# Various top table pages (top users, computers, teams)
-#: ../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 ""
-
-#: ../user/bs_sample_index.php:70
-#, fuzzy
-msgid "Languages"
-msgstr "言語"
-
-# #######################################
-# Rules and Policies page (info.php)
-#: ../user/bs_sample_index.php:149 ../user/info.php:24
-#: ../user/sample_index.php:79
-msgid "Read our rules and policies"
-msgstr "このプロジェクトの「規則と方針」を読んでください。"
+msgstr "開始タグだけで終了タグなしのまま放置したり、パラメータを正しく\n指定しないと、フォーマットされたテキストではなくタグがそのまま表示されます。"
 
 #: ../user/create_account_action.php:26
 msgid "Can't create account"
@@ -2585,213 +2597,162 @@ msgstr "アカウントを作成できません"
 
 #: ../user/create_account_action.php:29
 msgid "Click your browser's <b>Back</b> button to try again."
-msgstr "ブラウザの<b>戻る(back)</b>ボタンをクリックし、もう一度試してください。"
+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 "あなたが reCAPTCH へ打ち込んだ内容は正しくありませんでした。もう一度試してください。 "
 
-#: ../user/create_account_action.php:70
+#: ../user/create_account_action.php:69
 msgid "You must supply an invitation code to create an account."
-msgstr "アカウントを作るには、招待コードを入力してください。"
+msgstr "アカウントを作るには、招待コードを入力しなければなりません。"
 
-#: ../user/create_account_action.php:73
+#: ../user/create_account_action.php:72
 msgid "The invitation code you gave is not valid."
-msgstr "入力した招待コードの値は正しくありません。"
+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 "メイルアドレスが正しくありません:有効な name at domain の形式でアドレスを入力してください"
+"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 "その Eメイルアドレスを使っているアカウントがすでに存在しています。"
+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 "新パスワードの値として入力した2つの値が異なっています"
+msgstr "新しいパスワードとして入力した2つが一致しません"
 
-#: ../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 文字だけの長さが必要です。"
+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 ""
+msgstr "注意: BOINC マネージャを使用する場合、このフォームを使用しないでください。ともかくBOINCを起動し、「プロジェクトを追加」を選択し、Eメールアドレスとパスワードを入力してください。"
 
-#: ../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 "Eメイルアドレス"
-
-#: ../user/create_account_form.php:83
-msgid "Must be a valid address of the form 'name at domain'."
-msgstr "有効なメイルアドレスを、「 name at domain 」の形で記入してください。"
-
-#: ../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 "少なくとも %s 文字はなければなりません。"
-
-#: ../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 "アカウントを作成する"
+msgstr "このアカウントは、チーム %1 に加わります。さらに、そのアカウントの持つプロジェクト・プレファレンス(好みの設定)は、そのチームの創設者のものと同じになります。"
 
-#: ../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 自己紹介に載せるあなたの写真は左のとおりです。"
+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以下)を指定してください。"
+"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 "あなたの自己紹介記事から写真を削除するには、右のボックスにチェックを入れてください :"
+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 以下のものを選んでください。"
+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 "自己紹介が書かれている言語を選択します:"
+msgstr "プロフィールが書かれている言語を選択します: "
 
-#: ../user/create_profile.php:104
+#: ../user/create_profile.php:106
 msgid "Submit profile"
-msgstr "自己紹介の記事を提出する"
+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 "自己紹介の作成・編集"
+msgstr "プロフィールの作成・編集"
 
-#: ../user/create_profile.php:137
+#: ../user/create_profile.php:134
 msgid "The format of your uploaded image is not supported."
-msgstr "あなたがアップロードした画像の形式はサポートしておりません。"
+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 コミュニティで共有できます。"
+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 "あなたが ReCaptcha へ打ち込んだ内容は正しくありませんでした。もう一度試してください。 "
 
-#: ../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 anti-spam "
-"システムからスパムの疑いがあると判定されました。テキストを編集しなおしてから、もう一度試してみてください。"
+msgstr "あなたが書き込んだ最初の内容は Akismet anti-spam システムからスパムの疑いがあると判定されました。テキストを編集し、もう一度試してみてください。"
 
-#: ../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 ""
-"あなたが書き込んだ2度目の内容も Akismet anti-spam "
-"システムからスパムの疑いがあると判定されました。テキストを編集しなおしてから、もう一度試してみてください。"
+msgstr "あなたが書き込んだ2度目の内容も Akismet anti-spam システムからスパムの疑いがあると判定されました。テキストを編集し、もう一度試してみてください。"
 
-#: ../user/create_profile.php:246
+#: ../user/create_profile.php:242
 msgid "Your profile submission was empty."
-msgstr "あなたが提出した自己紹介の内容は空でした。"
+msgstr "あなたが提出したプロフィールの内容は空でした。"
 
-#: ../user/create_profile.php:285
+#: ../user/create_profile.php:281
 msgid "Could not update the profile: database error"
-msgstr "自己紹介の更新に失敗しました: データベースでエラーが発生"
+msgstr "プロフィールの更新に失敗しました: データベースでエラーが発生"
 
-#: ../user/create_profile.php:297
+#: ../user/create_profile.php:293
 msgid "Could not create the profile: database error"
-msgstr "自己紹介の作成に失敗しました: データベースでエラーが発生"
+msgstr "プロフィールの作成に失敗しました: データベースでエラーが発生"
 
-#: ../user/create_profile.php:302
+#: ../user/create_profile.php:298
 msgid "Profile saved"
-msgstr "自己紹介の内容を保存しました"
+msgstr "プロフィールを保存しました"
 
-#: ../user/create_profile.php:304
+#: ../user/create_profile.php:300
 msgid ""
 "Congratulations! Your profile was successfully entered into our database."
-msgstr "うまくいきました! あなたの自己紹介記事はこのプロジェクトのデータベースへ格納されました。"
+msgstr "おめでとうございます! あなたのプロフィールはこのプロジェクトのデータベースへ記録されました。"
 
-#: ../user/create_profile.php:306
+#: ../user/create_profile.php:302
 msgid "%1View your profile%2"
-msgstr "%1あなたの自己紹介記事を見る%2"
+msgstr "%1あなたのプロフィールを見る%2"
 
-#: ../user/create_profile.php:315
+#: ../user/create_profile.php:311
 msgid "Create a profile"
-msgstr "自己紹介記事を作成する"
+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."
-msgstr ""
-"自己紹介を作成または更新するには、スパム防止のため、功績の平均増加量(average credit)が %1 以上である必要があります。 "
-"不便ですがご容赦ください。"
+"To prevent spam, an average credit of %1 or greater is required to create or"
+" edit a profile.  We apologize for this inconvenience."
+msgstr "スパム防止のため、プロフィールを作成または編集するには、功績の平均増加量(average credit)が %1 以上である必要があります。ご不便をおかけし申し訳ありません。"
 
 #: ../user/delete_account.php:57
 msgid "Couldn't delete account"
-msgstr "古いコンピュータを削除できませんでした"
+msgstr "アカウントを削除できませんでした"
 
 #: ../user/delete_account.php:59
 msgid "Account deleted"
@@ -2812,28 +2773,21 @@ msgid ""
 "including your profile and message-board posts.\n"
 "No jobs will be issued to any computers attached\n"
 "to this account."
-msgstr ""
-"ご自分のアカウントを消すすると、あなたに関係するすべての\n"
-"情報がわれわれのサーバから削除されます。あなたの\n"
-"自己紹介記事と掲示板への投稿内容も消えてしまいます。\n"
-"このアカウントに結びついているどのコンピュータにも\n"
-"何も仕事は送られなくなります。"
+msgstr "ご自分のアカウントを削除すると、あなたに関係するすべての情報がわれわれのサーバから削除されます。\nあなたのプロフィールと掲示板への投稿内容も消えてしまいます。\nこのアカウントに追加されているどのコンピュータにも仕事が配布されなくなります。"
 
 #: ../user/delete_account.php:73
 msgid ""
 "This cannot be undone.\n"
 "Once your account has been deleted, you cannot get it back."
-msgstr ""
-"この操作は元に戻すことができません。\n"
-"いったんあなたのアカウントが消えれば、その内容を取り戻すことはできません。"
+msgstr "この操作は元に戻すことができません。\nいったんあなたのアカウントが削除されれば、その内容を取り戻すことはできません。"
 
 #: ../user/delete_account.php:76
 msgid "Are you sure you want to delete your account?"
-msgstr "あなたのアカウントを削除しますが、よろしいですか?"
+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 "はい"
@@ -2842,70 +2796,64 @@ 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 "いいえ"
 
 #: ../user/delete_account.php:80
 msgid "Do not delete this account"
-msgstr "このアカウントは削除しない"
+msgstr "このアカウントを削除しない"
 
-#: ../user/delete_profile.php:30
+#: ../user/delete_profile.php:32
 msgid "couldn't delete profile - please try again later"
-msgstr "自己紹介記事を削除できません - しばらくたってからもう一度試してください。"
+msgstr "プロフィールを削除できませんでした - しばらくたってからもう一度試してください。"
 
-#: ../user/delete_profile.php:33
+#: ../user/delete_profile.php:35
 msgid "Delete Confirmation"
-msgstr "削除完了"
+msgstr "削除確認"
 
-#: ../user/delete_profile.php:35
+#: ../user/delete_profile.php:37
 msgid "Your profile has been deleted."
-msgstr "あなたの自己紹介記事は削除されました。"
+msgstr "あなたのプロフィールは削除されました。"
 
-#: ../user/delete_profile.php:40
+#: ../user/delete_profile.php:42
 msgid "Profile delete confirmation"
-msgstr "自己紹介(プロファイル)削除のご確認"
+msgstr "プロフィール削除の確認"
 
-#: ../user/delete_profile.php:43
+#: ../user/delete_profile.php:45
 msgid "Are you sure?"
-msgstr "削除して本当によろしいですか?"
+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"
-"次にはまったく何もないところから\n"
-"やり直さなければならなくなります。"
+msgstr "いったんプロフィールを削除すると、回復できません。\n将来他のプロフィールを望む場合、まったく何もないところから始めなければならなくなります。"
 
-#: ../user/delete_profile.php:48
-#, fuzzy
+#: ../user/delete_profile.php:50
 msgid ""
 "If you're sure, click 'Yes'\n"
 "to remove your profile from our database."
-msgstr ""
-"ご了解のうえ、「削除(Delete)」を押してください。\n"
-"当プロジェクトのデータベースからあなたの自己紹介記事を消します。"
+msgstr "ご了解のうえ、「はい」をクリックしてください。\n当プロジェクトのデータベースからあなたのプロフィールを削除します。"
 
-#: ../user/delete_profile.php:52
+#: ../user/delete_profile.php:54
 msgid "Delete my profile"
-msgstr "自分の自己紹介記事を削除する"
+msgstr "自分のプロフィールを削除する"
 
-#: ../user/delete_profile.php:53
+#: ../user/delete_profile.php:55
 msgid "Do not delete my profile"
-msgstr "自分の自己紹介記事を削除しない"
+msgstr "自分のプロフィールを削除しない"
 
 #: ../user/donated.php:25
 msgid "PayPal - Transaction Completed"
-msgstr "PayPal - 寄付の支払い完了"
+msgstr "PayPal - 取引完了"
 
 #: ../user/donated.php:28
 msgid "Thank you for donating!"
-msgstr "寄付ありがとうございました!"
+msgstr "寄付ありがとうございます!"
 
 #: ../user/donated.php:29
 msgid "Your donation for has been completed."
@@ -2913,8 +2861,9 @@ msgstr "寄付の支払い処理が完了しました。"
 
 #: ../user/donated.php:30
 msgid ""
-"Your donation will be added to the progress bar after confirmation by PayPal."
-msgstr "PayPay からの確認の後、あなたの寄付額は進捗バーの表示に追加されます。"
+"Your donation will be added to the progress bar after confirmation by "
+"PayPal."
+msgstr "PayPay からの確認の後、あなたの寄付額はプログレスバーに加えられます。"
 
 #: ../user/donated.php:32
 msgid "You have canceled your donation."
@@ -2932,9 +2881,7 @@ msgstr "%1 への寄付"
 msgid ""
 "This project is accepting donations via\n"
 "%1."
-msgstr ""
-"このプロジェクトは、以下の仕組みを経由して寄付を頂いています。\n"
-"%1"
+msgstr "このプロジェクトは、以下の仕組みを経由して寄付を頂いています。\n%1"
 
 #: ../user/donations.php:42
 msgid ""
@@ -2949,17 +2896,7 @@ msgid ""
 "        to see the donation amount equivalent in different currencies\n"
 "        (please note that the rates are only estimates\n"
 "         and the actual amount may differ)."
-msgstr ""
-"寄付をしていただけるなら、下記の欄に寄付額を入力してくださいませ。\n"
-"        PayPal は複数の通貨からの入金を受付ます\n"
-"        (カナダドル、ユーロ、スターリング・ポンド(英)、米ドル、\n"
-"         円、オーストラリア・ドル、ニュージーランド・ドル、\n"
-"        スイス・フラン、香港ドル、シンガポール・ドル、スウェーデン・クローナ、\n"
-"        デンマーク・クローネ、ポーランド・ズォティ、ノルウェイ・クローネ、\n"
-"        ハンガリー・フォリント、チェコ・コルナ)。\n"
-"        このページに組み込まれた通貨換算機能を使って、異なる通貨での\n"
-"        相当額を調べることができます。(換算に使うレートは推定値ですので、\n"
-"        実際にやり取りされる額とはすこし異なるでしょう)"
+msgstr "寄付をいただける場合、下記の欄への寄付額の入力をお願い致します。\n        PayPal は複数の通貨からの入金を受け付けます\n        (カナダドル、ユーロ、イギリスポンド、アメリカドル、\n         日本円、オーストラリアドル、ニュージーランドドル、\n        スイスフラン、香港ドル、シンガポールドル、\n   スウェーデンクローナ、デンマーククローネ、\n        ポーランドズォティ、ノルウェークローネ、\n        ハンガリーフォリント、チェココルナ)。\nこのページに組み込まれた通貨換算機能を使って、異なる通貨での相当額を調べることができます。\n(換算に使うレートは推定値ですので、実際に取り引きされる額とは差異が生じる可能性があります)"
 
 #: ../user/donations.php:316
 msgid "Amount you would like to donate"
@@ -2967,31 +2904,29 @@ msgstr "寄付したい金額"
 
 #: ../user/donations.php:317
 msgid "Estimated value in"
-msgstr "右の通貨での相当額"
+msgstr "次の通貨での推定相当額"
 
 #: ../user/donations.php:320 ../user/donations.php:324
 msgid "Anonymous donation"
-msgstr "名前を出さない寄付"
+msgstr "匿名での寄付"
 
 #: ../user/donations.php:320
 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"
-msgstr "次に進む"
+msgstr "次へ進む"
 
 #: ../user/donations.php:329
 msgid "Donations are accepted through"
-msgstr "寄付は右の仕組みを通じて受け取ります:"
+msgstr "寄付は右の仕組みを通じて受け取ります:"
 
 #: ../user/download_network.php:25
 msgid "Download BOINC add-on software"
@@ -3004,76 +2939,72 @@ msgstr "いくつかの分類から選んでアプリケーションをダウン
 #: ../user/download_network.php:31
 msgid ""
 "These applications are not endorsed by %1 and you use them at your own risk."
-msgstr "これらのアプリケーションは、%1 が保証するものではないので、 使うときにはあなたのリスクにおいて使ってください"
+msgstr "これらのアプリケーションは %1 が推奨するものではないので、ご自身の責任で使用してください。"
 
 #: ../user/download_network.php:33
 msgid ""
 "We do not provide instructions for installing these applications.\n"
-"However, the author may have provided some help on installing or "
-"uninstalling the application. \n"
+"However, the author may have provided some help on installing or uninstalling the application. \n"
 "If this is not enough you should contact the author."
-msgstr ""
-"我々はこれらのアプリケーションのインストール方法を提供しません。 \n"
-"しかし、それぞれのアプリケーションの作者がイントールとアンインストールの方法について、ある程度ヘルプを提供しているかもしれません。\n"
-"それが充分でなければ、作者に連絡するべきです。"
+msgstr "我々はこれらのアプリケーションのインストール方法を提供しません。 \nしかし、それぞれのアプリケーションの作者がインストールもしくはアンインストール方法について、ある程度ヘルプを提供しているかもしれません。\nそれが十分でなければ、作者に連絡するべきです。"
 
 #: ../user/download_network.php:36
 msgid "Instructions for installing and running BOINC are %1here%2."
-msgstr "BOINC の インストールと走らせ方は、%1ここ%2 にあります。 "
+msgstr "BOINC のインストールと稼働の仕方は、%1ここ%2 にあります。 "
 
 #: ../user/download_network.php:38
 msgid "This list is managed centrally at %1the BOINC website%2."
-msgstr "この一覧は%1 BOINC のウェブサイト%2で一元管理されています。"
+msgstr "この一覧は %1 BOINC のウェブサイト %2 で集中管理されています。"
 
 #: ../user/edit_email_action.php:31
 msgid "Change email address of account"
-msgstr "あなたのアカウントのEメイルアドレスを変更します"
+msgstr "アカウントのEメールアドレスを変更します"
 
 #: ../user/edit_email_action.php:34 ../user/edit_email_action.php:36
 msgid "New email address '%1' is invalid."
-msgstr "新しい Eメイルアドレス '%1' の値が有効ではありせん。"
+msgstr "新しいEメールアドレス '%1' は無効です。"
 
 #: ../user/edit_email_action.php:38
 msgid "New email address is same as existing address. Nothing is changed."
-msgstr "新規に登録しようとしている Eメイルアドレスは従来のものと同じです。 "
+msgstr "新しいEメールアドレスは従来のものと同じです。変更はありません。"
 
 #: ../user/edit_email_action.php:42
 msgid "There's already an account with that email address"
-msgstr "その Eメイルアドレスをもつアカウントがすでに存在しています"
+msgstr "そのEメールアドレスをもつアカウントがすでにあります"
 
 #: ../user/edit_email_action.php:54
 msgid "Invalid password."
-msgstr "パスワードが正しくありません。"
+msgstr "無効なパスワードです。"
 
 #: ../user/edit_email_action.php:62
 msgid "The email address of your account is now %1."
-msgstr "あなたのアカウントの Eメイルアドレスは、%1 になりました。"
+msgstr "あなたのアカウントのEメールアドレスは、%1 になりました。"
 
 #: ../user/edit_email_action.php:64
 msgid "Please %1validate this email address%2."
-msgstr "%1この Eメイルアドレスの有効性を証拠だてる手続き%2を行ってください。"
+msgstr "%1 このEメールアドレスを認証 %2 してください。"
 
 #: ../user/edit_email_action.php:67
 msgid ""
 "We can't update your email address due to a database problem.  Please try "
 "again later."
-msgstr "データベースで問題が起こったため、あなたの Eメイルアドレスを更新できませんでした。時間を置いてからまた試してくださいませ。"
+msgstr "データベースでの問題が原因であなたのEメールアドレスを更新できませんでした。しばらくたってからもう一度試してください。"
 
 #: ../user/edit_email_form.php:27 ../user/edit_email_form.php:51
 msgid "Change email address"
-msgstr "Eメイルアドレスを変更する"
+msgstr "Eメールアドレスを変更する"
 
 #: ../user/edit_email_form.php:36
 msgid "Change the email address of your account"
-msgstr "あなたのアカウントの Eメイルアドレスを変更します"
+msgstr "あなたのアカウントのEメールアドレスを変更します"
 
 #: ../user/edit_email_form.php:37
 msgid "New email address"
-msgstr "新しい Eメイルアドレス"
+msgstr "新しいEメールアドレス"
 
 #: ../user/edit_email_form.php:38
 msgid "Must be a valid address of the form 'name at domain'"
-msgstr "有効な Eメイルアドレスを、name at domain の形で記入してください"
+msgstr "有効なEメールアドレスを、「ローカル部@ドメイン」の形で記入しなければなりません。"
 
 #: ../user/edit_email_form.php:48
 msgid "No password?"
@@ -3087,257 +3018,209 @@ msgstr "リセットの確認"
 msgid ""
 "This action will erase any changes you have made in your community "
 "preferences. To cancel, click your browser's Back button."
-msgstr ""
-"コミュニティでの好みの設定(プレファレンス)であなたが変更した内容は、このリセットを実施すると消えてしまいます。リセットを取りやめるには、ブラウザの戻る"
-"(Back)ボタンをクリックしてください。"
+msgstr "コミュニティでのプレファレンス(好みの設定)であなたが変更した内容は、この操作で消えてしまいます。キャンセルするには、ブラウザの戻るボタンをクリックしてください。"
 
 #: ../user/edit_forum_preferences_action.php:38
 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 のみが使えます。"
+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バイト未満にしてください。"
+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 ""
-"どうやってわれわれからの通知を受け取るか(通知とは、新着の非公開メッセージや、友人関係の要求、 参加しているスレッドへの投稿などについての通知)"
+msgstr "どのように非公開メッセージ、友達リクエスト、 参加しているスレッドへの投稿などの新着について通知すれば良いですか?"
 
-#: ../user/edit_forum_preferences_form.php:57
+#: ../user/edit_forum_preferences_form.php:46
 msgid "On my Account page (no email)"
-msgstr "あなたのアカウントページに表示(メイル通知なし)"
+msgstr "あなたのアカウントページに表示(メール通知なし)"
 
-#: ../user/edit_forum_preferences_form.php:58
+#: ../user/edit_forum_preferences_form.php:47
 msgid "Immediately, by email"
-msgstr "Eメイルで即座に通知"
+msgstr "Eメールで即座に通知"
 
-#: ../user/edit_forum_preferences_form.php:59
+#: ../user/edit_forum_preferences_form.php:48
 msgid "In a single daily email"
-msgstr "一日に一回の Eメイルで通知"
+msgstr "一日に一回Eメールで通知"
 
-#: ../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 "掲示板であなたを示す画像"
+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。サイズ: 最大 4 KB、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 によって提供され、グローバルに認識されるアバター"
+msgstr "%1 によって提供され、グローバルに認識されるアバターを使用する"
 
-#: ../user/edit_forum_preferences_form.php:84
+#: ../user/edit_forum_preferences_form.php:74
 msgid "Use this uploaded avatar:"
-msgstr "ここでアップロードするアバターの画像を使う"
+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 "アバターがどのように表示されるか"
+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 "バイトの残り"
+msgstr "%1 ここ %2 にシグネチャ用の様々な無料のサービスがあります。\n<br> あなたの最新の功績値(credit)や、プロジェクトの\n<br> ニュースなどを動的なシグネチャ画像で提供してくれます。"
 
-#: ../user/edit_forum_preferences_form.php:105
+#: ../user/edit_forum_preferences_form.php:93
 msgid "Attach signature by default"
-msgstr "特に指定しなければシグネチャを付加"
+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 "掲示板の中であなたのシグネチャがどのように表示されるか"
+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 "アバターの画像を隠す"
+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 "イメージの代わりにリンクを表示"
+msgstr "画像をリンクとして表示"
 
-#: ../user/edit_forum_preferences_form.php:133
+#: ../user/edit_forum_preferences_form.php:121
 msgid "Open links in new window/tab"
-msgstr "リンクを別ウィンドー/タブで開く"
+msgstr "リンクを別ウィンドウ/タブで開く"
 
-#: ../user/edit_forum_preferences_form.php:134
+#: ../user/edit_forum_preferences_form.php:122
 msgid "Highlight special users"
-msgstr "特別な参加者を強調表示する"
+msgstr "特定の参加者を強調表示する"
 
-#: ../user/edit_forum_preferences_form.php:135
+#: ../user/edit_forum_preferences_form.php:123
 msgid "Display this many messages per page"
-msgstr ""
+msgstr "ページあたりのこれくらい多数のメッセージを表示"
 
-#: ../user/edit_forum_preferences_form.php:139
+#: ../user/edit_forum_preferences_form.php:127
 msgid "How to sort"
-msgstr "並べ替えの指定"
+msgstr "並べ替え方法"
 
-#: ../user/edit_forum_preferences_form.php:140
+#: ../user/edit_forum_preferences_form.php:128
 msgid "Threads:"
 msgstr "スレッド:"
 
-# #######################################
-# Forum
-#: ../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 "スレッド内で最新の投稿に自動的にジャンプする"
+msgstr "スレッド内の最新の投稿に自動的にジャンプする"
 
-#: ../user/edit_forum_preferences_form.php:142
+#: ../user/edit_forum_preferences_form.php:130
 msgid "Don't move sticky posts to top"
-msgstr ""
+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 "これらの参加者による掲示板への投稿と非公開メッセージとを無視します。"
+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 "あるいはここをクリックしてプレファレンスを指定省略時の値に戻します"
+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 "この Eメイルアドレスをもつアカウントはありません"
-
-#: ../user/edit_passwd_action.php:59
-msgid "Invalid password"
-msgstr "無効なパスワード"
+msgid ""
+"We can't update your password due to a database problem. Please try again "
+"later."
+msgstr "データベースの問題が原因であなたのパスワードを変更できませんでした。後ほどまた試してください。"
 
-#: ../user/edit_passwd_action.php:63 ../user/edit_passwd_form.php:25
-#: ../user/edit_passwd_form.php:55
+#: ../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_action.php:67
+#: ../user/edit_passwd_action.php:54
 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 "Eメイルアドレスと現在のパスワード"
-
-#: ../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_form.php:49
-msgid "Get account key by email"
-msgstr "Eメイルでアカウント・キーを受け取るならこちらへ"
-
-#: ../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 "新しいパスワードをもう一回"
+msgstr "新しいパスワードをもう一度"
 
 #: ../user/edit_user_info_action.php:31
 msgid "HTML tags are not allowed in your name."
@@ -3357,15 +3240,15 @@ msgstr "アカウント情報を編集"
 
 #: ../user/edit_user_info_form.php:32
 msgid "Name %1 real name or nickname%2"
-msgstr "名前 %1 本名またはニックネーム%2"
+msgstr "名前 %1 本名またはニックネーム %2"
 
 #: ../user/edit_user_info_form.php:35
 msgid "URL %1 of your web page; optional%2"
-msgstr "URL %1 あなたのウェブページのURL、省略可%2"
+msgstr "URL %1 あなたのウェブページのURL、省略可 %2"
 
 #: ../user/edit_user_info_form.php:43
 msgid "Postal (ZIP) code %1 Optional%2"
-msgstr "郵便番号 %1 省略可%2"
+msgstr "郵便番号 %1 省略可 %2"
 
 #: ../user/edit_user_info_form.php:47
 msgid "Update info"
@@ -3380,15 +3263,13 @@ msgid ""
 "A tasks's <b>server state</b> indicates whether the task has been sent to a "
 "computer, and if so whether the computer has finished it. Possible values "
 "are:"
-msgstr ""
-"タスクの<b>サーバ側の状態</b>とは、そのタスクがいずれかのコンピュータへ送出済みであるかどうか、送出済みならば、そのコンピュータがそれを計算し終わ"
-"ったか否かという状態のことです。ありうる値は右のとおりです:"
+msgstr "タスクの<b>サーバ側の状態</b>とは、そのタスクがいずれかのコンピュータへ送出済みであるかどうか、送出済みならば、そのコンピュータがそれを計算し終わったかを示します。ありうる値は右のとおりです:"
 
 #: ../user/explain_state.php:35
 msgid ""
 "The task is not ready to send (for example, because its input files are "
 "unavailable)"
-msgstr "タスクは送出の準備ができていない。(たとえば、その入力ファイルが使えない)"
+msgstr "タスクは送出の準備ができていない(たとえば、その入力ファイルが使えないため)"
 
 #: ../user/explain_state.php:38
 msgid "The task is ready to send, but hasn't been sent yet."
@@ -3426,7 +3307,7 @@ msgstr "そのタスクはあるコンピュータに送出されたが、その
 
 #: ../user/explain_state.php:60
 msgid "A computer completed and reported the task successfully."
-msgstr "あるコンピュータがそのタスクの計算を完了し、成功を報告した。"
+msgstr "あるコンピュータがそのタスクの計算を完了し、成功裏にタスクを報告した。"
 
 #: ../user/explain_state.php:63
 msgid ""
@@ -3446,12 +3327,12 @@ msgstr "そのタスクはあるコンピュータに送出されたが、異常
 msgid ""
 "The task was sent to a computer and no reply was received within the time "
 "limit."
-msgstr "そのタスクはあるコンピュータに送出されたが、所定の時間内に返事がなかった。"
+msgstr "そのタスクはあるコンピュータに送出されたが、制限時間内に返事がなかった。"
 
 #: ../user/explain_state.php:72
 msgid ""
-"The task wasn't sent to a computer because enough other tasks were completed "
-"for this workunit."
+"The task wasn't sent to a computer because enough other tasks were completed"
+" for this workunit."
 msgstr "そのタスクはどのコンピュータにも送出されていない。なぜなら、十分な数のタスクが対応するワークユニットで完了しているから。"
 
 #: ../user/explain_state.php:75
@@ -3466,9 +3347,9 @@ msgstr "クライアント側の状態"
 
 #: ../user/explain_state.php:81
 msgid ""
-"A result's <b>client state</b> indicates the stage of processing at which an "
-"error occurred."
-msgstr "あるリザルトの<b>クライアント側の状態</b>とは、異常がどの処理段階で発生したかを意味します。"
+"A result's <b>client state</b> indicates the stage of processing at which an"
+" error occurred."
+msgstr "あるリザルトの<b>クライアント側の状態</b>とは、異常がどの処理段階で発生したかを示します。"
 
 #: ../user/explain_state.php:86
 msgid "The computer has not yet completed the task."
@@ -3476,7 +3357,7 @@ msgstr "そのコンピュータはまだそのタスクを完了していない
 
 #: ../user/explain_state.php:89
 msgid "The computer completed the task successfully."
-msgstr "そのコンピュータは、そのタスクを成功裏に計算し終えた。"
+msgstr "そのコンピュータは、そのタスクを成功裏に計算を完了した。"
 
 #: ../user/explain_state.php:92
 msgid "The computer couldn't download the application or input files."
@@ -3498,7 +3379,7 @@ msgstr "報告日時または期限"
 msgid ""
 "A task's <b>Time reported or deadline</b> field depends on whether the task "
 "has been reported yet:"
-msgstr "あるタスクの<b>報告日時または期限</b>の欄は、そのタスクが報告済みかどうかによって意味が右のように違う:"
+msgstr "あるタスクの<b>報告日時または期限</b>の欄は、そのタスクが報告済みかどうかによって意味が右のように決まります:"
 
 #: ../user/explain_state.php:110
 msgid "Already reported"
@@ -3506,7 +3387,7 @@ msgstr "既に報告済みの場合"
 
 #: ../user/explain_state.php:110
 msgid "The date/time it was reported"
-msgstr "その日時はタスクの報告がなされた日時"
+msgstr "その日時はタスクの報告がなされた時のもの"
 
 #: ../user/explain_state.php:111
 msgid "Not reported yet, deadline in the future"
@@ -3514,7 +3395,7 @@ msgstr "報告されていないが、期限がまだ先の場合"
 
 #: ../user/explain_state.php:112
 msgid "Deadline, shown in green."
-msgstr "期限の日時を緑色で示す"
+msgstr "期限の日時を緑色で示します。"
 
 #: ../user/explain_state.php:114
 msgid "Not reported yet, deadline in the past"
@@ -3522,16 +3403,15 @@ msgstr "報告されておらず、期限が過ぎている場合"
 
 #: ../user/explain_state.php:115
 msgid "Deadline, shown in red."
-msgstr "期限の日時を赤色で示す"
+msgstr "期限の日時を赤色で示します。"
 
-# It seems an unexpected case for programmers.
 #: ../user/explain_state.php:120
 msgid "Unknown field"
 msgstr "不明のフィールド"
 
 #: ../user/ffmail_action.php:47
 msgid "Email preview"
-msgstr "Eメイルのプレビュー"
+msgstr "Eメールのプレビュー"
 
 #: ../user/ffmail_action.php:48
 msgid "Your email will appear as follows:"
@@ -3539,39 +3419,39 @@ msgstr "あなたのEメイルは次のように見えるはずです:"
 
 #: ../user/ffmail_action.php:57
 msgid "Send email"
-msgstr "Eメイルの送信"
+msgstr "Eメールの送信"
 
 #: ../user/ffmail_action.php:59
 msgid "Use your browser's back button to return to message form"
-msgstr "メッセージの入力画面に戻るには、ブラウザの戻る(back)ボタンを使ってください"
+msgstr "メッセージの入力画面に戻るには、ブラウザの戻るボタンを使ってください"
 
 #: ../user/ffmail_action.php:63
 msgid "Sending emails"
-msgstr "Eメイルの送信処理"
+msgstr "Eメールを送信中"
 
-#: ../user/ffmail_action.php:84
+#: ../user/ffmail_action.php:82
 msgid "email sent successfully to %1"
-msgstr "%1 への Eメイル送信が成功しました"
+msgstr "%1 へのEメール送信が成功しました"
 
-#: ../user/ffmail_action.php:86
+#: ../user/ffmail_action.php:84
 msgid "failed to send email to %1: %2"
-msgstr "%1 への Eメイル送信が失敗しました: %2"
+msgstr "%1 へのEメール送信が失敗しました: %2"
 
-#: ../user/ffmail_action.php:92
+#: ../user/ffmail_action.php:90
 msgid "Thanks for telling your friends about %1"
-msgstr "%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."
-msgstr "お友達の名前やEメイルアドレスを入力するのをお忘れです。%1 入力画面に戻って %2 入れなおしてください。"
+"You forgot to enter your friends' names and/or email addresses; Please "
+"%1return to the form%2 and enter them."
+msgstr "お友達の名前やEメールアドレスを入力するのをお忘れです。%1 入力画面に戻って %2 入力してください。"
 
 #: ../user/ffmail_form.php:30
 msgid ""
 "This project hasn't created an email message - please notify its "
 "administrators"
-msgstr ""
+msgstr "このプロジェクトはEメール・メッセージを作成していません - 管理者に知らせてください"
 
 #: ../user/ffmail_form.php:33
 msgid "Tell your friends about %1"
@@ -3579,16 +3459,14 @@ msgstr "%1 についてあなたのお友達に伝えてください"
 
 #: ../user/ffmail_form.php:37
 msgid "Help us by telling your friends, family and coworkers about %1"
-msgstr "あなたのお友達や家族、同僚の方々に%1 についてメッセージを送るのを手伝ってください。"
+msgstr "あなたのお友達や家族、同僚の方々に %1 について伝えるのを手伝ってください"
 
 #: ../user/ffmail_form.php:39
 msgid ""
 "Fill in this form with the names and email addresses of people you think "
 "might be interested in %1. We'll send them an email in your name, and you "
 "can add your own message if you like."
-msgstr ""
-"%1 に興味をもちそうだとあなたが思う方々の名前と Eメイルアドレスを、この画面に入力してください。それらの方へ当プロジェクトからあなたの名前で "
-"Eメイルを送ります。あなたが追加したい文章を書き込むこともできます。"
+msgstr "%1 に興味をもちそうだとあなたが思う方々の名前とEメールアドレスを、このフォームに入力してください。それらの方へ当プロジェクトからあなたの名前でEメールを送ります。あなたが希望する場合ご自身のメッセージを追加することもできます。"
 
 #: ../user/ffmail_form.php:42
 msgid "Your name:"
@@ -3596,114 +3474,105 @@ msgstr "あなたの名前:"
 
 #: ../user/ffmail_form.php:42
 msgid "Your email address:"
-msgstr "あなたの Eメイルアドレス:"
+msgstr "あなたのEメールアドレス:"
 
 #: ../user/ffmail_form.php:48
 msgid "Friend's name:"
-msgstr "お友達のお名前"
+msgstr "お友達のお名前:"
 
 #: ../user/ffmail_form.php:48
 msgid "Friend's email address:"
-msgstr "お友達の Eメイルアドレス:"
+msgstr "お友達のEメールアドレス:"
 
 #: ../user/ffmail_form.php:56
 msgid "Additional message (optional)"
-msgstr "付記したいメッセージがあればどうぞ:"
+msgstr "付記したいメッセージ(任意)"
 
 #: ../user/ffmail_form.php:59
 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 "あなたには参加者を投稿禁止状態にする権限はありません"
+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 の参加者はいません。"
+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 "参加者はすでに投稿禁止状態になっています"
+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/>この処置は不快な投稿で議論を妨害する振る舞いが継続的になされた場合に限定されるべきです。"
+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 "理由を分類から選んでください。その参加者がなぜ投稿を禁止されるべきかを文章で書き加えることもできます。"
+"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 "感情に任せた/悪意あるメイル"
+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 "記入すればメイルで通知されます"
+msgstr "記入すればメールで通知されます"
 
-#: ../user/forum_banishment_vote.php:74
+#: ../user/forum_banishment_vote.php:77
 msgid "Proceed with vote"
 msgstr "採決へ進む"
 
-# It seems this is an error message for programmers.
-#: ../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 "You must specify an action..."
+msgstr "あなたは、行動を指定しなければなりません..."
 
 #: ../user/forum_edit.php:41
 msgid ""
 "You can no longer edit this post.<br/>Posts can only be edited at most %1 "
 "minutes after they have been created."
-msgstr "この投稿内容はすでに変更できなくなっています。<br/>最初に投稿してから %1 分までしか、編集は許されておりません。"
+msgstr "この投稿内容はもはや変更できません。<br/>投稿内容は最初に作成されてから %1 分に限って、編集が許可されます。"
 
 #: ../user/forum_edit.php:47
 msgid "You are not authorized to edit this post."
-msgstr "この投稿を編集する権限はあなたにはありません。"
+msgstr "あなたにはこの投稿を編集する権限がありません。"
 
-#: ../user/forum_edit.php:86 ../user/forum_search.php:72
+#: ../user/forum_edit.php:86 ../user/forum_search.php:74
 msgid "Forum"
 msgstr "掲示板"
 
@@ -3712,895 +3581,863 @@ 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 "題名"
+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 "自分の署名をこの投稿に付ける"
+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 "この掲示板は、%1RSSフィード%2 で読めます"
+msgstr "この掲示板は %1RSSフィード%2 として利用できます"
 
-#: ../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 "このスレッドは表示位置固定かつ書込み禁止状態です。あなたはまだ読んでいません"
+msgstr "このスレッドは表示位置固定かつ書き込み禁止状態で、あなたはまだ読んでいません"
 
-#: ../user/forum_forum.php:178
+#: ../user/forum_forum.php:182
 msgid "sticky/locked/unread"
-msgstr "位置固定/書込み禁止/未読"
+msgstr "位置固定/書き込み禁止/未読"
 
-#: ../user/forum_forum.php:180
+#: ../user/forum_forum.php:184
 msgid "This thread is sticky and you haven't read it yet"
-msgstr "このスレッドは表示位置固定状態です。あなたはまだ読んでいません"
+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 "このスレッドは書込み禁止状態です。あなたはまだ読んでいません"
+msgstr "あなたはこのスレッドをまだ読んでいません。そして書き込み禁止状態です"
 
-#: ../user/forum_forum.php:184
+#: ../user/forum_forum.php:188
 msgid "unread/locked"
-msgstr "未読/書込み禁止"
+msgstr "未読/書き込み禁止"
 
-#: ../user/forum_forum.php:186
+#: ../user/forum_forum.php:190
 msgid "You haven't read this thread yet"
-msgstr "このスレッドをあなたはまだ読んでいません"
+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 "位置固定/書込み禁止"
+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 "このスレッドは書込み禁止状態です"
+msgstr "このスレッドは書き込み禁止状態です"
 
-#: ../user/forum_forum.php:198
+#: ../user/forum_forum.php:202
 msgid "locked"
-msgstr "書込み禁止"
+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 "既読"
 
-# #######################################
-# Links from the main page
-#: ../user/forum_help_desk.php:27
+#: ../user/forum_help_desk.php:29
 msgid "Questions and answers"
 msgstr "質問と答(Q&A)"
 
-#: ../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 "ボランティアとスカイプで直接話しましょう。複数の言語で利用できます。 %1 BOINC オンライン・ヘルプ%2 へどうぞ。"
+"Talk live via Skype with a volunteer, in any of several languages. Go to "
+"%1BOINC Online Help%2."
+msgstr "ボランティアとSkypeで直接話しましょう。複数の言語で利用できます。 %1 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 "トピック"
 
-#: ../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 メンバー間での議論"
 
-# #######################################
-# Forum sample index page
-#: ../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質問と答(Q&A)%2 のセクションをご覧ください。"
+msgstr "疑問や問題をかかえているなら、掲示板の %1質問と答(Q&A)%2 セクションをご利用ください。"
 
-# Better translation welcome.
-#: ../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 "極端な投稿を制御する"
+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 "商売目的のスパム"
+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 "1週間"
 
-#: ../user/forum_moderate_post.php:84
+#: ../user/forum_moderate_post.php:87
 msgid "2 weeks"
 msgstr "2週間"
 
-#: ../user/forum_moderate_post.php:85
+#: ../user/forum_moderate_post.php:88
 msgid "1 month"
 msgstr "一ヶ月"
 
-#: ../user/forum_moderate_post.php:86
+#: ../user/forum_moderate_post.php:89
 msgid "Forever"
-msgstr "期限なし"
+msgstr "永久"
 
-#: ../user/forum_moderate_post.php:96
-msgid "Optional explanation %1 This is included in email to user.%2"
-msgstr "追加の説明 %1 この部分は参加者への Eメイルに挿入されます。%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 "追加の説明 %1 この部分は参加者への Eメールに挿入されます。 %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 "上位のタイプが異なるところへ移動はできません"
+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 は投稿禁止状態になりました。"
+msgstr "参加者 %1 は投稿禁止になりました。"
 
-#: ../user/forum_moderate_post_action.php:131
+#: ../user/forum_moderate_post_action.php:151
 msgid "Action failed: possible database problem"
-msgstr "処理失敗:データベースの問題かもしれません"
+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 "理由を分類から選ぶか、あるいは、なぜそのスレッドの表示を抑止したり書込み禁止にするのかを記述し、最後にOKボタンを押してください。"
+msgstr "理由を分類から選ぶか、あるいは、なぜそのスレッドの表示を抑止したり書き込み禁止にするのか説明を記述し、最後にOKボタンを押してください。"
 
-#: ../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 "新しい題名:"
+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 "ここではプロジェクト管理者しか新しいスレッドを作れません。それでも、すでにあるスレッドに返事を追加することはあなたにもできます。"
+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 anti-spam "
-"システムからスパムの疑いがあると判定されました。テキストを編集しなおしてから、もう一度試してみてください。"
+msgstr "あなたのメッセージは Akismet anti-spam システムからスパムの疑いがあると判定されました。テキストを編集し、もう一度試してみてください。"
 
-#: ../user/forum_post.php:70
+#: ../user/forum_post.php:74
 msgid "Create new thread"
-msgstr "新しくスレッドを作る"
+msgstr "新しいスレッドを作成"
 
-#: ../user/forum_post.php:100
+#: ../user/forum_post.php:104
 msgid "Create a new thread"
-msgstr "新しくスレッドを作る"
+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 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 "そうするのは、ボランティアの全ての方が興味を持つ場合に限ってください。"
+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 "このプロジェクトではこの機能は運用していません"
+msgstr "この機能はプロジェクトによって止められています"
 
-#: ../user/forum_rate.php:58
+#: ../user/forum_rate.php:60
 msgid "You need more average or total credit to rate a post."
-msgstr ""
-"投稿を評価するためには、あなたはより多くの平均功績(credits/day) "
-"をあげるか、より多くの総功績(credits)を持っていなければなりません。"
+msgstr "投稿を評価するためには、あなたはより多くの平均功績(credits/day) をあげるか、より多くの総功績(credits)を持っていなければなりません。"
 
-#: ../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 "入力していただいた内容は記録されました。ご協力に感謝します。"
+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 anti-spam "
-"システムからスパムの疑いがあると判定されました。テキストを編集しなおしてから、もう一度試してみてください。"
+msgstr "あなたの投稿内容は Akismet anti-spam システムからスパムの疑いがあると判定されました。テキストを編集し、もう一度試してみてください。"
 
-#: ../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に返答する:"
+msgstr "右の%1メッセージ ID%2に返信する:"
 
-#: ../user/forum_reply.php:166
+#: ../user/forum_reply.php:172
 msgid "Post reply"
-msgstr "返事を投稿する"
+msgstr "返信を投稿する"
 
-#: ../user/forum_reply.php:169
+#: ../user/forum_reply.php:175
 msgid "Add my signature to this reply"
-msgstr "自分の署名をこの返事に付ける"
+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 ""
-"投稿に関して報告を提出するためには、あなたはより多くの平均功績(credits/day) "
-"あるいは、より多くの総功績(credits)を持っていなければなりません。"
+msgstr "あなたはより多くの平均功績(credits/day) あるいは、より多くの総功績(credits)を持っていなければなりません。"
 
-#: ../user/forum_report_post.php:65
+#: ../user/forum_report_post.php:68
 msgid "Report Registered"
 msgstr "報告は登録されました"
 
-# 92%
-#: ../user/forum_report_post.php:66
-#, fuzzy
+#: ../user/forum_report_post.php:69
 msgid "Your report has been recorded. Thanks for your input."
-msgstr "あなたの報告は登録されました。入力していただきありがとうございます。"
+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 "司会者(モデレータ)はあなたの報告を拝見してからどうするべきか決めます。そのためには少々時間がかかります。辛抱強くお待ちください。"
+msgstr "モデレーターはあなたの報告を確認してからどうするべきか決めます - これには少々時間がかかります、辛抱強くお待ちください。"
 
-#: ../user/forum_report_post.php:71
-#, fuzzy
+#: ../user/forum_report_post.php:74
 msgid "Report a forum post"
-msgstr "投稿に関する報告を提出する"
+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 "
+"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 "
-"/>評価システムへの入り口はその投稿の末尾にあります。"
+msgstr "この投稿に関して報告を提出する前に、代わりに +/- を付ける評価システムを使うことをご検討願います。投稿に対して十分な数の参加者が否定的な評価をすれば、ゆくゆくはその投稿は表示されなくなります。<br />評価システムはその投稿の末尾にあります。"
 
-#: ../user/forum_report_post.php:80
+#: ../user/forum_report_post.php:83
 msgid "Report post"
-msgstr "投稿に関する報告を提出する"
+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"
+"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そのスレッドをまだ読んでいない人からみても、\n"
-"問題点がすぐにわかるよう、十分な情報を含めて書いてください。%2"
+msgstr "なぜその投稿が攻撃的であると考えるか: %1そのスレッドをまだ読んでいない人からみても、\n問題点がすぐにわかるよう、十分な情報を含めて書いてください。%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 "あなたの報告を記録することができませんでした。少々待ってからもう一度試してみてくださいませ。"
+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 "このエラーが一時的なものでないなら、このプロジェクトの開発者に報告してください。"
+"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 配信"
+msgstr "%1 の RSS フィード"
 
-#: ../user/forum_rss.php:42
+#: ../user/forum_rss.php:39
 msgid "This message board is available as an RSS feed."
-msgstr "この掲示板は RSSの配信で読めます"
+msgstr "この掲示板は RSS フィードで読めます。"
 
-# #######################################
-# General stuff (create_account_form.php and others)
-#: ../user/forum_rss.php:43
+#: ../user/forum_rss.php:41
 msgid "Options:"
-msgstr "選択肢:"
+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(指定なしの場合すべての参加者)からの投稿だけを含める。"
+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 "最新の %1 日間(指定省略時:30日)の投稿だけを含める。"
+msgstr "最新の %1 日間(デフォルト: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 (各スレッドの最初の投稿だけを含める)"
 
-# #######################################
-# Forum search features
-#: ../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 "検索問合せ"
+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 "たとえば、\"screensaver freeze\""
 
-#: ../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 "指定した ID の人が書いた投稿だけが表示されます"
 
-#: ../user/forum_search.php:39
+#: ../user/forum_search.php:41
 msgid "For example: \"43214\""
-msgstr "たとえば、: \"43214\""
+msgstr "たとえば、 \"43214\""
 
-#: ../user/forum_search.php:41
+#: ../user/forum_search.php:43
 msgid "Search options"
-msgstr "検索条件の追加指定"
+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 "1年"
 
-#: ../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 ""
-"残念ながら、ご指定の条件に合致するものは見つかりませんでした。指定する語を減らし(特定性の強い語を減らして)、検索条件を緩めてから再試行してはいかがでし"
-"ょう。"
+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 "掲示板への参加成功"
+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 に参加させることが現在できません。のちほどもう一度お試しください。"
+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."
+"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 への参加登録を削除することが現在できません。のちほどもう一度お試しください。"
+msgstr "あなたの %1 への参加登録を削除することが現在できません。後ほどもう一度お試しください…"
 
-# It seems to be an error message for programmers, Not translated.
-#: ../user/forum_subscribe.php:74
+#: ../user/forum_subscribe.php:76
 msgid "Unknown subscription action"
-msgstr "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 "司会者(モデレータ)によりこのスレッドは隠されています。"
+msgstr "モデレーターによりこのスレッドは隠されています。"
 
-#: ../user/forum_thread.php:128
+#: ../user/forum_thread.php:129
 msgid "My question was answered"
-msgstr "私の質問は回答されました"
+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 "このスレッドに新しいメッセージを投稿"
 
-# Better translation welcome.
-#: ../user/forum_thread.php:171
+#: ../user/forum_thread.php:172
 msgid "Unsubscribe"
 msgstr "スレッドへの参加をやめる"
 
-# Better translation welcome.
-#: ../user/forum_thread.php:172
+#: ../user/forum_thread.php:173
 msgid "You are subscribed to this thread.  Click here to unsubscribe."
-msgstr "あなたはこのスレッドに参加しています。 抜けるにはここをクリック。"
+msgstr "あなたはこのスレッドに参加しています。 参加をやめるにはここをクリックします。"
 
-# Better translation welcome.
-#: ../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 "このスレッドに新しい投稿があったとき、その旨のメイルを受けとりたければここをクリック"
+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 "このスレッドを非表示状態にします"
+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 "このスレッドの表示位置をいつも一覧の先頭に寄せることをやめます"
+msgstr "このスレッドを常に一覧の先頭に固定しないようにする"
 
-#: ../user/forum_thread.php:208
+#: ../user/forum_thread.php:209
 msgid "Make sticky"
-msgstr "表示位置を一覧の先頭へ固定"
+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
-#, fuzzy
+#: ../user/forum_thread.php:244
+msgid "Delete thread permanently"
+msgstr "スレッドを永久に削除する"
+
+#: ../user/forum_thread.php:254
 msgid "Export as Notice"
-msgstr "このニュースをお知らせとしてエクスポートする"
+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 "状態が更新されました。"
 
-# #######################################
-# Forum
-#: ../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 "あなたは%2に %1 さんへ友人関係の承認を求めています。"
+msgstr "あなたは %2 において %1 さんへ友人関係の承認をリクエストしました。"
 
-#: ../user/friend.php:41
+#: ../user/friend.php:43
 msgid "This request is still pending confirmation."
-msgstr "この要求はまだ承認待ち状態にあります。"
+msgstr "このリクエストはまだ承認待ち状態にあります。"
 
-#: ../user/friend.php:52
+#: ../user/friend.php:54
 msgid "%1 is not accepting friendship requests from you"
-msgstr "%1 さんはあなたの友人になることを受け入れていません"
+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 さんへあなたを友人と認めるか尋ねます。"
+"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 "付記したいメッセージがあればどうぞ:"
+msgstr "付記したいメッセージがあればどうぞ:"
 
-#: ../user/friend.php:115
+#: ../user/friend.php:117
 msgid "Friend request sent"
-msgstr "友人関係の勧誘を送信しました"
+msgstr "友人関係の承認リクエストを送信しました"
 
-#: ../user/friend.php:116
+#: ../user/friend.php:118
 msgid "We have notified %1 of your request."
-msgstr "%1 さんにあなたの要求を送りました。"
+msgstr "%1 さんにあなたの要求を通知しました。"
 
-#: ../user/friend.php:126
+#: ../user/friend.php:128
 msgid "Please log in as %1"
-msgstr "%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 としてログインする必要があります"
+msgstr "この友人関係の承認リクエストの内容を見るには、%1 としてログインしなければなりません"
 
-#: ../user/friend.php:138
+#: ../user/friend.php:140
 msgid "Friend request"
-msgstr "友人関係の要求"
+msgstr "友人関係の承認リクエスト"
 
-#: ../user/friend.php:141
+#: ../user/friend.php:143
 msgid "%1 has requested friendship with you."
-msgstr "%1 さんがあなたに友人関係の承認を求めています。"
+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 "確認済みの友人"
+msgstr "友人と確認されました"
 
-#: ../user/friend.php:224
+#: ../user/friend.php:226
 msgid "You are now friends with %1."
-msgstr "今回、友人となった方々は次のとおりです: %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 さんとの友人関係を取り消しますが、よろしいですか。"
+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 "アカウント関連情報を忘れてしまった場合"
+msgstr "あなたと %1 さんの友人関係は取り消されました。"
 
-#: ../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) アカウントに登録したあなたの Eメイルアドレスを憶えているなら、こちらから Eメイルをお送りできます:"
+"1) If you know your account's email address, and you can receive email "
+"there:"
+msgstr "1) アカウントに登録したあなたの Eメールアドレスを憶えているなら、こちらから Eメールをお送りできます:"
 
-#: ../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."
-msgstr "その Eメイルアドレスを以下に入力し OK を押してください。あなたのパスワードをリセットするための手順を書いた Eメイルをあなたに送ります。"
+msgstr "その Eメイルアドレスを以下に入力し OK をクリックしてください。あなたのパスワードをリセットするための手順を書いた Eメールをあなたに送ります。"
 
 #: ../user/get_passwd.php:46
 msgid ""
 "2) If you forgot your account's email address, or you can't receive email "
 "there:"
-msgstr "2) アカウントに登録したあなたの Eメイルアドレスを忘れてしまったか、 そのアドレスでは Eメイルの受信ができない場合:"
+msgstr "2) アカウントに登録したあなたの Eメールアドレスを忘れてしまったか、そのアドレスでは Eメールの受信ができない場合:"
 
 #: ../user/get_passwd.php:47
 msgid ""
 "If you have run BOINC under this account, you can still access it. Here's "
 "how:"
-msgstr "このアカウントで BOINC を走らせたことがあるなら、まだあなたのアカウントにアクセスする手立ては残っています。どうするかというと:"
+msgstr "このアカウントで BOINC を動作させたことがあるなら、まだあなたのアカウントにアクセスする手立ては残っています。どうするかというと:"
 
 #: ../user/get_passwd.php:50
 msgid ""
 "Go to the BOINC data directory on your computer (its location is written to "
 "the Event Log at startup)."
-msgstr ""
+msgstr "あなたのコンピュータの BOINC のデータディレクトリへ移動します(場所は起動時にイベント・ログへ書き込まれます)。"
 
 #: ../user/get_passwd.php:51
 msgid "Find your account file for this project; it will be named <b>%1</b>."
-msgstr "このプロジェクトであなたのアカウントを記録しているファイルを見つけてください。 その名前は<b>%1</b>のようになっています。"
+msgstr "このプロジェクトであなたのアカウントを記録しているファイルを見つけてください。その名前は<b>%1</b>のようになっています。"
 
 #: ../user/get_passwd.php:52
 msgid "Open the file in a text editor like Notepad. You'll see something like"
-msgstr "そのファイルをメモ帳(Notepad.exe)のようなテキスト・エディタ開いてください。次のようなテキストが見えるでしょう"
+msgstr "そのファイルをメモ帳(Notepad.exe)のようなテキスト・エディタで開いてください。次のようなテキストが見えるでしょう"
 
 #: ../user/get_passwd.php:62
-msgid "Select and Copy the string between %1 and %2 (%3 in the above example)."
-msgstr "%1と%2の間にある文字列(上記の例では %3 のところ)を選択してコピーします。"
+msgid ""
+"Select and Copy the string between %1 and %2 (%3 in the above example)."
+msgstr "%1 と %2 の間にある文字列(上記の例では %3 のところ)を選択してコピーします。"
 
 #: ../user/get_passwd.php:64
 msgid "Paste the string into the field below, and click OK."
@@ -4610,21 +4447,30 @@ msgstr "その文字列を以下の欄に貼り付けます。そして、OK を
 msgid ""
 "You will now be logged in to your account; update the email and password of "
 "your account."
-msgstr "するとあなたのアカウントにログインできるでしょう。そうしたら、アカウントの Eメイルアドレスとパスワードを適宜更新してください。"
+msgstr "するとあなたのアカウントにログインできるでしょう。そうしたら、アカウントの Eメールアドレスとパスワードを適宜更新してください。"
 
 #: ../user/get_passwd.php:71
 msgid "Log in with authenticator"
-msgstr "認証子(authenticator)を使いログインする"
+msgstr "認証子(authenticator)を使ってログインする"
+
+#: ../user/get_passwd.php:81
+msgid "Forgot your account info?"
+msgstr "アカウント関連情報をお忘れですか?"
 
-#: ../user/gpu_list.php:126 ../user/gpu_list.php:152
+#: ../user/gpu_list.php:150 ../user/gpu_list.php:176
 msgid "No GPU tasks reported"
-msgstr ""
+msgstr "GPU タスクが報告されていません"
+
+#: ../user/gpu_list.php:206
+msgid "Top GPU models"
+msgstr "上位の GPU モデル"
 
-#: ../user/gpu_list.php:183
+#: ../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 ""
+"platforms.  Relative speeds, measured by average elapsed time of tasks, are "
+"shown in parentheses."
+msgstr "下記のリストは異なるプラットフォーム上で最も生産性の高い GPU のモデルを示しています。タスクの平均経過時間によって計測された相対速度は、括弧の中に表示されています。"
 
 #: ../user/home.php:42
 msgid "Welcome to %1"
@@ -4632,11 +4478,15 @@ msgstr "%1 へようこそ!"
 
 #: ../user/home.php:43
 msgid "View and edit your account preferences using the links below."
-msgstr "アカウントのプレファレンス(好みの設定)を確認・変更するには以下のリンクを使ってください。"
+msgstr "以下のリンクを使ってアカウントのプレファレンス(好みの設定)を確認・変更してください。"
 
 #: ../user/home.php:46
 msgid "If you have not already done so, %1download BOINC client software%2."
-msgstr "まだダウンロードしていなければ、%1BOINC クライアント・ソフトウェアをダウンロード%2してください."
+msgstr "まだダウンロードしていなければ、%1BOINC クライアント・ソフトウェアをダウンロード%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"
@@ -4648,7 +4498,7 @@ msgstr "名前のないプラットフォーム"
 
 #: ../user/host_app_versions.php:43
 msgid "Missing app version"
-msgstr "アプリケーションの版はなし"
+msgstr "アプリケーションのバージョンなし"
 
 #: ../user/host_app_versions.php:45
 msgid "Missing app"
@@ -4678,8 +4528,6 @@ msgstr "連続して有効な結果を返したタスク数"
 msgid "Average processing rate"
 msgstr "平均処理速度"
 
-# #######################################
-# Apps page (apps.php)
 #: ../user/host_app_versions.php:72
 msgid "Application details for host %1"
 msgstr "計算機 %1 のアプリケーション詳細"
@@ -4693,9 +4541,7 @@ msgid ""
 "You can not delete our record of this computer because our database still "
 "contains work for it. You must wait a few days until the work for this "
 "computer has been deleted from the project database."
-msgstr ""
-"このコンピュータに関する記録を消すことはできません。それはわれわれのデータベースにこのコンピュータで処理した仕事がまだ残っているためです。その仕事がプロ"
-"ジェクトのデータベースから削除されるまで数日待つ必要があります。"
+msgstr "このコンピュータに関する記録を消すことはできません。それはわれわれのデータベースにこのコンピュータで処理した仕事がまだ残っているためです。その仕事がプロジェクトのデータベースから削除されるまで数日待たなければなりません。"
 
 #: ../user/host_delete.php:40
 msgid "Delete record of computer"
@@ -4711,22 +4557,21 @@ msgstr "あなたのコンピュータの一覧に戻る"
 
 #: ../user/host_edit_action.php:39
 msgid "Merge computer records"
-msgstr "コンピュータに関する記録を合併する"
+msgstr "コンピュータに関する記録をマージする"
 
 #: ../user/host_edit_form.php:35
 msgid "Merge computers"
-msgstr "コンピュータを合併する"
+msgstr "コンピュータをマージする"
 
 #: ../user/host_edit_form.php:38
 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 は誤って別々の識別子を同一のコンピュータに割り当ててしまうことがあります。古い識別子を最新の識別子へ合併することで、あなたはこれの"
+"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 は誤って別々の識別子を同一のコンピュータに割り当ててしまうことがあります。古い識別子を最新の識別子へ合併することで、訂正することができます。"
 
 #: ../user/host_edit_form.php:56
 msgid "No hosts are eligible for merging with this one."
-msgstr "この計算機と合併できるものはありませんでした。"
+msgstr "この計算機とマージできるものはありませんでした。"
 
 #: ../user/host_edit_form.php:58 ../user/host_edit_form.php:114
 msgid "Show details"
@@ -4735,7 +4580,7 @@ msgstr "詳細を表示"
 #: ../user/host_edit_form.php:66
 msgid ""
 "Check the computers that are the same as %1 (created %2, computer ID %3):"
-msgstr "%1 (生成日時 %2、コンピュータ ID %3)と同じコンピュータにチェックを入れてください。"
+msgstr "%1 (生成日時 %2、コンピュータ ID %3)と同じコンピュータにチェックを入れてください:"
 
 #: ../user/host_edit_form.php:70 ../user/workunit.php:39
 msgid "name"
@@ -4755,12 +4600,16 @@ msgstr "ホスト名なし"
 
 #: ../user/host_edit_form.php:109
 msgid "Merge hosts"
-msgstr "計算機を合併する"
+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 "計算機の所在地を更新しました"
@@ -4785,7 +4634,7 @@ msgstr "計算機のページへ戻る"
 
 #: ../user/hosts_user.php:53
 msgid "Computers belonging to %1"
-msgstr "%1さんのコンピュータ"
+msgstr "%1 さんのコンピュータ"
 
 #: ../user/hosts_user.php:55
 msgid "Computers hidden"
@@ -4802,11 +4651,11 @@ msgstr "あなたのコンピュータ"
 
 #: ../user/html.php:23
 msgid "Allowed HTML tags"
-msgstr "使用できる HTML タグの範囲"
+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"
@@ -4834,26 +4683,28 @@ msgstr "整形済みテキスト"
 
 #: ../user/html.php:33
 msgid ""
-"image; height cannot exceed 450 pixels. Please do not link to images without "
-"permission of the web site where the image is hosted."
+"image; height cannot exceed 450 pixels. Please do not link to images without"
+" permission of the web site where the image is hosted."
 msgstr "画像。 高さは 450ピクセル以下。画像が置かれているウェブサイトの許可なしにその画像にリンクを張ることはしないでください。"
 
 #: ../user/html.php:35
 msgid "You can also use ampersand notation for special characters."
-msgstr "さらに、アンパーサンド記法を特殊文字のために使うこともできます。"
+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 を実行するコンピュータは、あなたが権限を持っているものに限定してください。 "
+msgstr "%1 を実行するコンピュータは、あなたが権限を持っているものだけにしてください"
 
 #: ../user/info.php:36
 msgid ""
 "Run %1 only on computers that you own, or for which you have obtained the "
 "owner's permission. Some companies and schools have policies that prohibit "
 "using their computers for projects such as %1."
-msgstr ""
-"%1 を実行するコンピュータは、あなたの所有するものであるか、あるいは、あなたが所有者から許可を得たコンピュータに限定してください。 "
-"会社や学校の一部には、そのコンピュータを %1 のようなプロジェクトのために使うことを禁じる方針のところがあります。 "
+msgstr "%1 を実行するコンピュータは、あなたの所有するものであるか、あるいは、あなたが所有者から許可を得たコンピュータだけにしてください。 会社や学校の一部には、そのコンピュータを %1 のようなプロジェクトのために使うことを禁じる方針のところがあります。 "
 
 #: ../user/info.php:38
 msgid "How %1 will use your computer"
@@ -4864,32 +4715,25 @@ msgid ""
 "When you run %1 on your computer, it will use part of the computer's CPU "
 "power, disk space, and network bandwidth. You can control how much of your "
 "resources are used by %1, and when it uses them."
-msgstr ""
-"あなたのコンピュータで %1 を動かすと、そのコンピュータの CPU パワー、 ディスク領域、そしてネットワーク帯域幅の一部を使います。 "
-"あなたは、これらの資源をどれだけ、そして何時、 %1 に振り向けるかを制御できます。"
+msgstr "あなたのコンピュータで %1 を動かすと、そのコンピュータの CPU パワー、 ディスク領域、そしてネットワーク帯域幅の一部を使います。 あなたは、これらの資源をどれだけ、そして何時、%1 に振り向けるかを制御できます。"
 
 #: ../user/info.php:40
 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 ""
-"あなたのコンピュータがした仕事は、%1 プロジェクトの目標に貢献します。 その目標はプロジェクトのウェブサイトに書かれています。 "
-"そのアプリケーションプログラムは、時間がたつにつれ変更されるかもしれません。 "
+msgstr "あなたのコンピュータがした仕事は、%1 プロジェクトの目標に貢献します。その目標はプロジェクトのウェブサイトに書かれています。そのアプリケーションプログラムは、時間がたつにつれ変更されるかもしれません。 "
 
 #: ../user/info.php:42
 msgid "Privacy policy"
-msgstr "プライバシーに関する方針"
+msgstr "プライバシーポリシー"
 
 #: ../user/info.php:43
 msgid ""
-"Your account on %1 is identified by a name that you choose. This name may be "
-"shown on the %1 web site, along with a summary of the work your computer has "
-"done for %1. If you want to be anonymous, choose a name that doesn't reveal "
-"your identity."
-msgstr ""
-"%1 プロジェクトのあなたのアカウントは、あなたが選んだ名前で識別されます。 この名前は %1 プロジェクトのウェブサイト上で表示されるかもしれません。 "
-"そこでは、%1 プロジェクトであなたのコンピュータがやり終えた仕事の要約も表示されるかもしれません。 "
-"無名の人のままでいたかったら、あなたが誰なのか分かるような名前を選んではいけません。 "
+"Your account on %1 is identified by a name that you choose. This name may be"
+" shown on the %1 web site, along with a summary of the work your computer "
+"has done for %1. If you want to be anonymous, choose a name that doesn't "
+"reveal your identity."
+msgstr "%1 プロジェクトのあなたのアカウントは、あなたが選んだ名前で識別されます。この名前は %1 プロジェクトのウェブサイト上で表示されるかもしれません。そこでは、%1 プロジェクトであなたのコンピュータがやり終えた仕事の概略も表示されるかもしれません。無名の人のままでいたかったら、あなたが誰なのか分かるような名前を選んではいけません。 "
 
 #: ../user/info.php:44
 msgid ""
@@ -4898,21 +4742,14 @@ 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 ""
-"%1 に参加すると、あなたのコンピュータに関する情報 (プロセサのタイプや、メモリ量など)は、 %1 "
-"プロジェクトにより記録され、どのようなタイプの仕事をそのコンピュータに割り当てるかを判断するために使われます。 この情報も、 %1 "
-"のウェブサイト上で表示されます。 あなたのコンピュータの位置を明かしてしまうようなもの(たとえば、ドメイン名やネットワークアドレス) "
-"は表示されることはありません。"
+msgstr "%1 に参加すると、あなたのコンピュータに関する情報(プロセッサのタイプや、メモリの量など)は、%1 プロジェクトにより記録され、どのようなタイプの仕事をそのコンピュータに割り当てるかを判断するために使われます。この情報も、%1 のウェブサイト上で表示されます。 あなたのコンピュータの位置を明かしてしまうようなもの(たとえば、ドメイン名やネットワークアドレス)は表示されることはありません。"
 
 #: ../user/info.php:45
 msgid ""
-"To participate in %1, you must give an address where you receive email. This "
-"address will not be shown on the %1 web site or shared with organizations. %"
-"1 may send you periodic newsletters; however, you can opt out at any time."
-msgstr ""
-"%1 に参加するには、メイルを受信できるアドレスを提示しなければなりません。 このアドレスは、 %1 "
-"プロジェクトのウェブサイトで表示されることはなく、複数の組織間で共有されることもありません。 %1 "
-"プロジェクトは定期的なニュースレターをこのメイルアドレス向けに送信することがありますが、受信しないようにいつでも変更可能です。"
+"To participate in %1, you must give an address where you receive email. This"
+" address will not be shown on the %1 web site or shared with organizations. "
+"%1 may send you periodic newsletters; however, you can opt out at any time."
+msgstr "%1 に参加するには、メールを受信できるアドレスを提示しなければなりません。このアドレスは、%1 プロジェクトのウェブサイトで表示されることはなく、複数の組織間で共有されることもありません。%1 プロジェクトは定期的なニュースレターをこのメールアドレス向けに送信することがありますが、受信しないようにいつでも変更可能です。"
 
 #: ../user/info.php:46
 msgid ""
@@ -4921,57 +4758,41 @@ 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 ""
-"%1 ウェブサイトの中で送信された非公開メッセージは、送信者と受信者だけが見ることができます。 %1 "
-"プロジェクトは非公開メッセージの内容をチェックしたり取り締まったりすることはありません。 %1 "
-"プロジェクトの他の参加者から、望まぬ非公開メッセージを受信したら、あなたの %2メッセージ・フィルター%3 "
-"にその参加者を登録できます。こうすると、その参加者からのメッセージは、公開メッセージであろうと非公開メッセージであろうと、 "
-"あなたの目に触れることはなくなります。"
+msgstr "%1 ウェブサイトの中で送信された非公開メッセージは、送信者と受信者だけが見ることができます。%1 プロジェクトは非公開メッセージの内容をチェックしたり取り締まったりすることはありません。%1 プロジェクトの他の参加者から、望まぬ非公開メッセージを受信したら、あなたの %2メッセージ・フィルター%3 にその参加者を登録できます。こうすると、その参加者からのメッセージは、公開メッセージであろうと非公開メッセージであろうと、あなたの目に触れることはなくなります。"
 
 #: ../user/info.php:47
 msgid ""
 "If you use our web site forums you must follow the %2posting guidelines%3.  "
 "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 ""
-"このウェブサイトの掲示板をお使いになるのでしたら、%2投稿のガイドライン%3 に従っていただく必要があります。 この %1 "
-"掲示板に投稿されたメッセージは メンバー以外の方も含めて、誰でも読めます。 いったんメッセージを投稿すると、どのような人にもあなたの投稿内容を見る許可、 "
-"そしてそれをコピーする許可を永久に取り戻すことのできない形で与えることを 認めたことになります。 "
+"members.  By posting to the forums, you are granting irrevocable license for"
+" anyone to view and copy your posts."
+msgstr "このウェブサイトの掲示板をお使いになるのでしたら、%2投稿のガイドライン%3 に従わなければなりません。この %1 掲示板に投稿されたメッセージは、メンバー以外の方も含め誰でも読むことができます。いったんメッセージを投稿すると、どのような人にでもあなたの投稿内容を見たり、それをコピーする許可を永久に取り消すことのできない形で与えることを認めたことになります。 "
 
 #: ../user/info.php:48
 msgid "Is it safe to run %1?"
-msgstr "%1 を実行することは安全か?"
+msgstr "%1 を実行することは安全か?"
 
 #: ../user/info.php:49
 msgid ""
 "Any time you download a program through the Internet you are taking a "
 "chance: the program might have dangerous errors, or the download server "
-"might have been hacked. %1 has made efforts to minimize these risks. We have "
-"tested our applications carefully. Our servers are behind a firewall and 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 ""
-"インターネットからプログラムをダウンロードするときには、いつでも危険がついて "
-"回ります。つまり、そのプログラムが危険な異常を起こしたり、ダウンロードサーバ が侵入を受けていたということがあり得ます。 %1 "
-"プロジェクトでは、このようなリスクを極力減らす努力をしています。 私たちのアプリケーションは注意深くテストされています。 "
-"サーバはファイアウォールの背後に置かれていて、安全性の高い設定がなされています。 "
-"プログラム・ダウンロードの完全性を保証するため、インターネットから隔離した "
-"安全なコンピュータを使い、すべての実行可能ファイルにデジタル署名をつけています。"
+"might have been hacked. %1 has made efforts to minimize these risks. We have"
+" tested our applications carefully. Our servers are behind a firewall and "
+"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 "インターネットからプログラムをダウンロードするときには、いつでも危険がついて回ります。つまり、そのプログラムが危険な異常を起こしたり、ダウンロードサーバが侵入を受けていたということがあり得ます。%1 プロジェクトでは、このようなリスクを極力減らす努力をしています。私たちのアプリケーションは注意深くテストされています。サーバはファイアウォールの背後に置かれていて、安全性の高い設定がなされています。プログラム・ダウンロードの完全性を保証するため、インターネットから隔離した安全なコンピュータを使い、すべての実行可能ファイルにデジタル署名をつけています。"
 
 #: ../user/info.php:50
 msgid ""
 "The applications run by %1 may cause some computers to overheat. If this "
 "happens, stop running %1 or use a %2utility program%3 that limits CPU usage."
-msgstr ""
-"%1 プロジェクトで走るアプリケーションは、一部のコンピュータを過熱させるかもしれません。 もしそうなったら、%1 を走らせるのを止めるか、CPU "
-"使用量を制限する %2ユーティリティ・プログラム%3 を使ってください。 "
+msgstr "%1 プロジェクトで実行するアプリケーションは、一部のコンピュータを過熱させるかもしれません。もしそうなったら、%1 の実行を止めるか、CPU 使用量を制限する %2ユーティリティ・プログラム%3 を使ってください。 "
 
 #: ../user/info.php:51
 msgid ""
 "%1 was developed by %2. BOINC was developed at the University of California."
-msgstr "%1 は %2 で開発されました。 BOINC は、University of California で開発されました。 "
+msgstr "%1 は %2 で開発されました。 BOINC は、カリフォルニア大学(University of California)で開発されました。 "
 
 #: ../user/info.php:53
 msgid "Liability"
@@ -4980,11 +4801,9 @@ msgstr "責務"
 #: ../user/info.php:54
 msgid ""
 "%1 and %2 assume no liability for damage to your computer, loss of data, or "
-"any other event or condition that may occur as a result of participating in %"
-"1."
-msgstr ""
-"%1 に参加したことの結果として生じた、あなたのコンピュータの被害、データの消滅、 あるいはどんな事件や状況についても、 %1 と %2 "
-"は、なんら責任を負いません。"
+"any other event or condition that may occur as a result of participating in "
+"%1."
+msgstr "%1 に参加したことの結果として生じた、あなたのコンピュータの被害、データの損失、あるいはどんな事件や状況についても、%1 と %2 は、なんら責任を負いません。"
 
 #: ../user/info.php:56
 msgid "Other BOINC projects"
@@ -4992,22 +4811,17 @@ msgstr "その他の BOINC プロジェクト"
 
 #: ../user/info.php:57
 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 "
+"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 ""
-"他のプロジェクトも、 %1 と同様、BOINC という同じプラットフォームを使います。 "
-"あなたはこれらの他のプロジェクトにも参加したいと思うかもしれません。 もし他のプロジェクトにも参加していれば、たとえ 渡せる仕事が %1 "
-"になくなったときでも、 あなたのコンピュータは 意味ある仕事を実行することができます。 "
+msgstr "他のプロジェクトも、%1 と同様に、BOINC という同じプラットフォームを使います。あなたはこれらの他のプロジェクトにも参加したいと思うかもしれません。もし他のプロジェクトにも参加していれば、たとえ %1 に渡せる仕事がなくなったときでさえ、あなたのコンピュータは有用な仕事を実行することができます。 "
 
 #: ../user/info.php:58
 msgid ""
 "These other projects are not associated with %1, and we cannot vouch for "
 "their security practices or the nature of their research. Join them at your "
 "own risk."
-msgstr ""
-"これらの他のプロジェクトは、%1 と共同で運営されているわけではありません。 ですから、それらプロジェクトのセキュリティ管理の実施ぐあいや、 "
-"研究内容の性質については、なんら私たちが保証できるものではありません。 あなた自身のリスクで参加してください。"
+msgstr "これらの他のプロジェクトは、%1 と共同で運営されているわけではありません。ですから、それらプロジェクトのセキュリティ管理の実施具合や、研究内容の性質については、なんら私たちが保証できるものではありません。あなた自身のリスクで参加してください。"
 
 #: ../user/language_select.php:47
 msgid "Language selection"
@@ -5023,27 +4837,22 @@ msgstr "このウェブサイトは複数の言語で表示できます。現在
 msgid ""
 "Normally the choice of language is determined by your browser's language "
 "setting, which is: %1.  You can change this setting using:"
-msgstr ""
-"通常、このウェブサイトの表示に使う言語は あなたが使っているブラウザの言語設定から決まるようになっており、 それは現在 %1 です。 "
-"ブラウザの言語設定は、以下のようにして変更できます。"
+msgstr "通常、このウェブサイトの表示に使う言語はあなたが使っているブラウザの言語設定から決まるようになっており、それは現在 %1 です。 ブラウザの言語設定は、以下のようにして変更できます:"
 
 #: ../user/language_select.php:83
 msgid "Firefox: Tools/Options/General"
-msgstr "Firefox: ツール(T)/オプション(O)/一般"
+msgstr "Firefox: ツール(T)/オプション(O)/一般"
 
 #: ../user/language_select.php:85
 msgid "Microsoft IE: Tools/Internet Options/Languages"
-msgstr "Microsoft Internet Explorer: ツール(T)/インターネット・オプション(O)/全般/言語(L)"
+msgstr "Microsoft Internet Explorer: ツール(T)/インターネット・オプション(O)/全般/言語(L)"
 
 #: ../user/language_select.php:89
 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 ""
-"あるいは別のやり方として、下記のテーブルにあるリンクをクリックすることでも "
-"言語を選択できます。この方法では、あなたのブラウザに「クッキー」が送られますので、 このウェブページのドメインからクッキーを受け入れられるように "
-"ブラウザを設定しておいてください。"
+msgstr "あるいは別のやり方として、下記のテーブルにあるリンクをクリックすることでも言語を選択できます。この方法では、あなたのブラウザに「クッキー」が送られますので、このウェブページのドメインからクッキーを受け入れられるようにブラウザを設定しておいてください。"
 
 #: ../user/language_select.php:95
 msgid "Language name (click to select)"
@@ -5055,46 +4864,23 @@ msgstr "ブラウザの言語設定に従う"
 
 #: ../user/language_select.php:113
 msgid ""
-"Translations are done by volunteers.  If your native language is not here, %"
-"1you can provide a translation%2."
-msgstr "翻訳はボランティアの方々にしていただいています。 あなたの第一言語がここになければ、%1あなたも翻訳をすることができます%2。"
-
-#: ../user/login_form.php:45
-msgid "Email address:"
-msgstr "Eメイルアドレス"
-
-#: ../user/login_form.php:45
-msgid "forgot email address?"
-msgstr "Eメイルアドレスを忘れたときはこちらへ"
+"Translations are done by volunteers.  If your native language is not here, "
+"%1you can provide a translation%2."
+msgstr "翻訳はボランティアの方々にしていただいています。あなたの第一言語がここになければ、%1あなたも翻訳をすることができます%2。"
 
-#: ../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."
+msgstr "または %1アカウントを作成する%2 。"
 
 #: ../user/merge_by_name.php:31
-#, fuzzy
 msgid "Processing %1"
-msgstr "処理"
+msgstr "%1 を処理中"
 
 #: ../user/merge_by_name.php:43
-#, fuzzy
 msgid "Merged %1 into %2"
-msgstr "計算機 %1 を %2 にマージしています"
+msgstr "%1 を %2 にマージしました"
 
 #: ../user/merge_by_name.php:72
-#, fuzzy
 msgid "Return to the list of your computers"
 msgstr "あなたのコンピュータの一覧に戻る"
 
@@ -5106,16 +4892,15 @@ msgid ""
 "        having that name with the newest computer having that name.\n"
 "        Incompatible computers will not be merged.\n"
 "        <p>"
-msgstr ""
+msgstr "この操作では、そのドメイン名に基づいてコンピュータをマージします。\n<p>\nそれぞれ同じドメイン名の場合、すべての古いコンピュータを最新のコンピュータにマージします。\n互換性のないコンピュータはマージされません。\n<p>"
 
 #: ../user/merge_by_name.php:82
 msgid "Go ahead and do this"
-msgstr ""
+msgstr "先へ進んでこれを行う"
 
 #: ../user/merge_by_name.php:83
-#, fuzzy
 msgid "Return to the list of computers"
-msgstr "あなたのコンピュータの一覧に戻る"
+msgstr "コンピュータの一覧に戻る"
 
 #: ../user/moderation.php:26
 msgid ""
@@ -5123,7 +4908,7 @@ msgid ""
 "To maximize discussion and flow of information,\n"
 "our message boards are moderated.\n"
 "Message board postings are subject to the following posting rules:\n"
-msgstr ""
+msgstr "\n議論や情報の流れを最大化するため、私たちの掲示板は加減されています。\n掲示板への投稿は以下の投稿規約を条件とします:\n"
 
 #: ../user/moderation.php:30
 msgid ""
@@ -5132,8 +4917,7 @@ msgid ""
 "Moderators may delete posts that violate any of these rules.\n"
 "The authors of deleted posts will be notified via email.\n"
 "Gross offenders may have their ability to post messages temporarily revoked\n"
-"(though to prevent abuse only project administrators have the ability to do "
-"so).\n"
+"(though to prevent abuse only project administrators have the ability to do so).\n"
 "Additional kinds of bad behavior (\"bugging\" posts to trap the\n"
 "IP addresses of other participants, excessive thread creation to spam\n"
 "the forums, etc.), while not listed in the formal rules, may still\n"
@@ -5162,7 +4946,7 @@ msgid ""
 "This moderation policy is set by the %1 project.\n"
 "If you have comments about the policy, email %2.\n"
 "\n"
-msgstr ""
+msgstr "\n<p>\nモデレーターは、これらの規約のいずれかに違反する投稿を削除する場合があります。\n削除された投稿者には、Eメールで通知されます。\n悪質な違反者はメッセージを投稿する能力が一時的に無効にされている場合があります(悪用を防ぐためではありますが、唯一プロジェクト管理者がそうする能力を持っています)。\n正規のルールに記載されていないものの、さらなる種類の有害行動はそれでもやはり同じような罰則につながる可能性があります(他の参加者のIPアドレスをトラップする「盗聴」のような投稿、掲示板へのスパムのための過度のスレッドの作成など)。\n<p>\nある投稿が投稿規約のいずれかに違反すると思われる場合は、該当する投稿の赤いXをクリックし、フォームに必要事項を記入します。そうすることでモデレーターにあなたの苦情が通知されます。\n個人的異議以外・明確な違反についてのみこのボタンを使用してください。\n<p>\n私たちは調停するとき、できる限り公平にしようとしますが、多くの異なる観点をもつユーザーの大規模なコミュニティには、常に私たちの節度の決定に満足でき [...]
 
 #: ../user/pending.php:66
 msgid "Pending credit"
@@ -5170,36 +4954,31 @@ msgstr "保留中の功績"
 
 #: ../user/pending.php:68
 msgid "Result ID"
-msgstr ""
+msgstr "結果のID"
 
 #: ../user/pending.php:68
-#, fuzzy
 msgid "Workunit ID"
-msgstr "ワークユニット"
+msgstr "ワークユニットのID"
 
 #: ../user/pending.php:68
-#, fuzzy
 msgid "Host ID"
-msgstr "計算機"
+msgstr "計算機のID"
 
 #: ../user/pending.php:68
-#, fuzzy
 msgid "Claimed credit"
-msgstr "認められた功績値"
+msgstr "要求された功績値"
 
 #: ../user/pending.php:81
-#, fuzzy
 msgid "Pending credit: %1"
-msgstr "保留中の功績"
+msgstr "保留中の功績値: %1"
 
 #: ../user/pm.php:32
 msgid "Block messages from this user"
-msgstr ""
+msgstr "この参加者からのメッセージをブロックする"
 
 #: ../user/pm.php:32
-#, fuzzy
 msgid "Block user"
-msgstr "該当する参加者はありません"
+msgstr "参加者をブロックする"
 
 #: ../user/pm.php:73
 msgid "Your message has been sent."
@@ -5213,260 +4992,250 @@ msgstr "非公開メッセージは届いていません。"
 msgid "Sender and date"
 msgstr "送信者名と日付"
 
-#: ../user/pm.php:106
-#, fuzzy
+#: ../user/pm.php:111
 msgid "Reply to this message"
-msgstr "右の%1メッセージ ID%2に返答する:"
+msgstr "このメッセージへ返信する"
 
-#: ../user/pm.php:107
-#, fuzzy
+#: ../user/pm.php:112
 msgid "Delete this message"
-msgstr "選択したメッセージを削除する"
+msgstr "このメッセージを削除する"
 
-#: ../user/pm.php:112
+#: ../user/pm.php:117
 msgid "Select all"
-msgstr ""
+msgstr "すべて選択"
 
-#: ../user/pm.php:114
+#: ../user/pm.php:119
 msgid "Unselect all"
-msgstr ""
+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
-#, fuzzy
+#: ../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 anti-spam "
-"システムからスパムの疑いがあると判定されました。テキストを編集しなおしてから、もう一度試してみてください。"
+msgstr "あなたが書き込んだ初回の内容は Akismet anti-spam システムからスパムの疑いがあると判定されました。テキストを編集しなおしてから、もう一度試してみてください。"
 
-#: ../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 の参加者は見つかりませんでした"
+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を指定してください。"
+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) は、あなたからの非公開メッセージを受け付けていません。"
+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 "該当する参加者はありません"
+msgstr "該当する参加者はいません"
 
-#: ../user/pm.php:242
+#: ../user/pm.php:247
 msgid "Really block %1?"
-msgstr "本当に %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 から送信される非公開メッセージを遮断しますか?"
+msgstr "本当に %1 から送信される非公開メッセージをブロックしますか?"
 
-#: ../user/pm.php:244
+#: ../user/pm.php:249
 msgid "Please note that you can only block a limited amount of users."
-msgstr "遮断できる相手の数に限りがあります。ご注意ください。"
+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 "この利用者からのメッセージを一旦遮断しても、 掲示板のプレファレンス(好みの設定)で遮断状態は解除することができます。"
+msgstr "この利用者からのメッセージを一旦ブロックしても、掲示板のプレファレンス(好みの設定)でブロックを解除することができます。"
 
-#: ../user/pm.php:252
+#: ../user/pm.php:257
 msgid "No, cancel"
-msgstr "いいえ、やめます。"
+msgstr "いいえ、やめます"
 
-#: ../user/pm.php:260 ../user/team_admins.php:98
+#: ../user/pm.php:265 ../user/team_admins.php:100
 msgid "no such user"
-msgstr "該当する参加者はありません"
+msgstr "該当する参加者はいません"
 
-#: ../user/pm.php:263
+#: ../user/pm.php:268
 msgid "User %1 blocked"
-msgstr "参加者 %1 を遮断しました。"
+msgstr "参加者 %1 をブロックしました"
 
-#: ../user/pm.php:265
+#: ../user/pm.php:270
 msgid "User %1 has been blocked from sending you private messages."
-msgstr "参加者 %1 については、すでにあなたへ非公開メッセージを送れない遮断状態になっています。"
+msgstr "参加者 %1 については、すでにあなたへ非公開メッセージを送れないブロック状態になっています。"
 
-#: ../user/pm.php:266
+#: ../user/pm.php:271
 msgid "To unblock, visit %1message board preferences%2"
-msgstr "遮断状態を解除するには、%1掲示板のプレファレンス(好みの設定)%2 で設定を変更してください。"
+msgstr "ブロックを解除するには、%1掲示板のプレファレンス(好みの設定)%2 で設定を変更してください。"
 
-# It seems to be an error message for programmers, Not translated.
-#: ../user/pm.php:302
-#, fuzzy
+#: ../user/pm.php:307
 msgid "Unknown action"
-msgstr "Unknown subscription 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 または、あなたが %2更新%3 の指令を BOINC Manager から出したときです。"
+msgstr "あなたのプレファレンス(好みの設定)は更新されました。\nこの更新が効果を発揮するタイミングは、あなたのコンピュータが %1 と通信したとき、または、あなたが %2更新%3 の指令を 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 ""
+msgstr "あなたのプレファレンスは初期値にリセットされました。\nこの更新が効果を発揮するタイミングは、あなたのコンピュータが %1 と通信したとき、またはあなたが %2更新%3 の指令を 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 "%2用の %1"
+msgstr "%2 用の %1"
 
-#: ../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 "%2用の 個別 %1 プレファレンスを削除しようとしています。削除してもよろしいですか?"
+msgstr "本当に %2 用の 個別 %1 プレファレンスを削除してもよろしいですか?"
 
-#: ../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コミュニティとの間で、バックグラウンドや意見を共有することを可能にします。"
+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。"
+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 "参加者の自己紹介記事(プロファイル)のイクスプローラ"
+msgstr "参加者のプロフィールのエクスプローラ"
 
-#: ../user/profile_menu.php:60
+#: ../user/profile_menu.php:62
 msgid "View the %1User Picture Gallery%2."
-msgstr "%1参加者の写真ギャラリー%2 を見る"
+msgstr "%1参加者の写真ギャラリー%2 を見ます。"
 
-#: ../user/profile_menu.php:61
+#: ../user/profile_menu.php:63
 msgid "Browse profiles %1by country%2."
-msgstr "%1国ごと%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画像付きのものから無作為に選択%4、 %5画像なしのものから無作為に選択%6。"
+msgstr "プロフィールを見る:%1無作為に選択%2、%3画像付きのものから無作為に選択%4、 %5画像なしのものから無作為に選択%6。"
 
-#: ../user/profile_menu.php:66
+#: ../user/profile_menu.php:68
 msgid "Alphabetical profile listings:"
-msgstr "アルファベット順の自己紹介一覧:"
+msgstr "アルファベット順の自己紹介一覧:"
 
-#: ../user/profile_menu.php:72
+#: ../user/profile_menu.php:74
 msgid "Search profile text"
-msgstr "自己紹介のテキストを検索"
+msgstr "プロフィールのテキストを検索"
 
-#: ../user/profile_menu.php:98
+#: ../user/profile_menu.php:100
 msgid "No profiles"
-msgstr "該当する自己紹介なし"
+msgstr "該当するプロフィールはありません"
 
-#: ../user/profile_menu.php:99
+#: ../user/profile_menu.php:101
 msgid "No profiles matched your query."
-msgstr "検索条件に該当する自己紹介はありませんでした。"
+msgstr "検索条件に一致するプロフィールはありませんでした。"
 
-# It seems to be an error message for the implementors.
-#: ../user/profile_rate.php:29
+#: ../user/profile_rate.php:31
 msgid "Invalid vote type:"
-msgstr "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 "ご推薦を記録しました。"
+msgstr "あなたのご推薦を記録しました。"
 
-#: ../user/profile_rate.php:43
+#: ../user/profile_rate.php:45
 msgid "Your vote to reject this profile has been recorded."
-msgstr "この自己紹介に拒否投票したことを記録しました。"
+msgstr "このプロフィールに拒否投票したことを記録しました。"
 
-#: ../user/profile_rate.php:46
+#: ../user/profile_rate.php:48
 msgid "Return to profile."
-msgstr "自己紹介に戻る"
+msgstr "プロフィールに戻ります。"
 
-#: ../user/profile_search_action.php:36
+#: ../user/profile_search_action.php:38
 msgid "Profiles containing '%1'"
-msgstr "'%1' を含む自己紹介記事(プロファイル)"
+msgstr "'%1' を含むプロフィール"
 
-#: ../user/profile_search_action.php:40
+#: ../user/profile_search_action.php:42
 msgid "User name"
-msgstr "参加者名"
+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' を含む自己紹介記事(プロファイル)はありません。"
+msgstr "'%1' を含むプロフィールはありません"
 
 #: ../user/result.php:35
 msgid "Task %1"
@@ -5486,156 +5255,66 @@ 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"
 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 "現時点の GigaFLOPs"
-
-#: ../user/server_status.php:420
+#: ../user/server_status.php:161
 msgid "Tasks by application"
 msgstr "アプリケーションごとのタスク統計"
 
-# #######################################
-# Apps page (apps.php)
-#: ../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リザルトの平均計算所要時間/H、(最小値 - 最大値)"
+#: ../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"
+#: ../user/server_status.php:165
+msgid "Users in last 24 hours"
 msgstr "24時間内に計算結果を返した参加者数"
 
 #: ../user/show_host_detail.php:40
@@ -5646,707 +5325,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 プロジェクトについてのより詳しい統計データを、 下記のいくつかのウェブサイトで見ることができます。"
+"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 "ご自分の統計データを、シグネチャ用画像に埋め込んで使うことができます。下記をご覧ください。"
+"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 ""
-"さらに、すべての BOINC プロジェクトに渡って集計されたご自分の統計データを得ることが、 いくつかのサイトから可能です。 ご自分の%1ホームページ%"
-"2 をご覧ください。"
+msgstr "さらに、すべての BOINC プロジェクトに渡って集計されたご自分の統計データを得ることが、いくつかのサイトから可能です。ご自分の %1ホームページ%2 をご覧ください。"
 
 #: ../user/team.php:27
-msgid "%1 participants may form %2teams%3."
-msgstr "%1 の参加者は %2チーム%3 を作ることができます"
+msgid "Teams"
+msgstr "チーム"
 
 #: ../user/team.php:29
+msgid "%1 participants may form %2teams%3."
+msgstr "%1 の参加者は %2チーム%3 を作ることができます。"
+
+#: ../user/team.php:31
 msgid ""
 "You may belong to only one team. You can join or quit a team at any time."
 msgstr "所属できるチームは1つだけです。チームへの参加と離脱はいつでも可能です。"
 
-#: ../user/team.php:31
+#: ../user/team.php:33
 msgid "Each team has a %1founder%2 who may:"
-msgstr "それぞれのチームには、%1創設者%2 が1名います。創設者ができることは以下のとおりです。"
+msgstr "それぞれのチームには、%1創設者%2 が1名います。創設者ができることは以下のとおりです:"
 
-#: ../user/team.php:33
+#: ../user/team.php:35
 msgid "access team members' email addresses"
-msgstr "チームメンバーのメイルアドレスにアクセス"
+msgstr "チームメンバーのメールアドレスにアクセス"
 
-#: ../user/team.php:34
+#: ../user/team.php:36
 msgid "edit the team's name and description"
-msgstr "チームの名称と説明文を編集"
+msgstr "チームの名称と説明を編集"
 
-#: ../user/team.php:35
+#: ../user/team.php:37
 msgid "add or remove team admins"
-msgstr "チーム管理者を追加/削除する"
+msgstr "チーム管理者を追加/削除"
 
-#: ../user/team.php:36
+#: ../user/team.php:38
 msgid "remove members from the team"
-msgstr "メンバーをチームから削除"
+msgstr "チームからメンバーを削除"
 
-#: ../user/team.php:37
+#: ../user/team.php:39
 msgid "disband a team if it has no members"
-msgstr "メンバーがいなければチームを解散すること"
+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 こともできます。"
+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 "チーム管理者を追加/削除する"
+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 "チームの情報(名前、URL、説明文、国名)を編集する"
+msgstr "チームの情報(名前、URL、説明、国名)を編集する"
 
-#: ../user/team_admins.php:44
+#: ../user/team_admins.php:46
 msgid "View the team's join/quit history"
-msgstr "チームへの参加・脱退の履歴を見る"
+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 "必要に応じてチーム掲示板の司会役(モデレータ)をすること (司会が必要な状況を知らせるメイル、あるいは、Red X レポートを受信した場合)"
+"Moderate the team forum, if any (admins get email notification of moderation"
+" events and red X reports)"
+msgstr "必要に応じて(調停が必要な状態を知らせるメール、あるいは、Red X レポートを受信した場合)チーム掲示板の仲裁をする"
 
-#: ../user/team_admins.php:47
+#: ../user/team_admins.php:49
 msgid "Team Admins cannot:"
-msgstr "チーム管理者にはできないことは以下のとおり:"
+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 "チーム管理者がそのチームを脱退したら、チーム管理者ではなくなります。"
+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 "チーム管理者としては、あなたが知っていて十分信頼している人を選ぶことをお薦めします。"
+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 "チーム管理者になりました"
+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 "チームメンバーの Eメイルアドレス:"
+msgstr "チームメンバーのEメールアドレス:"
+
+#: ../user/team_admins.php:81
+msgid "Add"
+msgstr "追加"
 
-#: ../user/team_admins.php:90
+#: ../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の創設者の地位を要求していましたが、チームから脱退してしまったので、その要求を取り消します。"
+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 は、このチームの創設者の地位を要求しています。 "
-"それはあなたがそのチームを去ったか、あるいは長い間チームとの連絡を絶っていたからかもしれません。"
+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 に割り当ててください。"
+"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> をクリックします。"
+msgstr "他のメンバーにこのチームの創設者権限を割り当てるには、メンバー名の横にあるボックスにチェックを入れて、下にある <strong>創設者の変更</strong> をクリックします。"
 
-#: ../user/team_change_founder_form.php:76
+#: ../user/team_change_founder_form.php:78
 msgid "New founder?"
-msgstr "新しい創設者?"
+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 ""
+msgstr "チームを移動するユーザーはいません。"
 
-#: ../user/team_create_action.php:29
+#: ../user/team_create_action.php:31
 msgid "You must choose a non-blank team name"
-msgstr "チームの名前を決めます。その名前は空白であってはなりません。"
+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 という名前のチームは既に存在します。別の名前で試してください。"
+msgstr "%1 という名前のチームは既に存在します - 別の名前で試してください"
 
-#: ../user/team_create_action.php:54
+#: ../user/team_create_action.php:56
 msgid "Could not create team - please try later."
-msgstr "チームを作ることができませんでした。しばらくたってからもう一度試してください。"
+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 必要があります。"
+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 "チームの情報を更新できませんでした。しばらくたってからもう一度試してください。"
+msgstr "チームの情報を更新できませんでした - しばらくたってからもう一度試してください。"
 
-#: ../user/team_edit_form.php:33
+#: ../user/team_edit_form.php:35
 msgid "Edit %1"
-msgstr "% を編集"
+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 のメンバーの Eメイル一覧"
+msgstr "%1 のメンバーのEメール一覧"
 
-#: ../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 "プレインテキストで表示"
+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 によって使われる掲示板を作ることもできます。"
+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 "チームのメンバーだけが読めるようにすることも選べます。"
+msgstr "チームのメンバーだけが閲覧できるようにすることも選択できます。"
 
-#: ../user/team_forum.php:33
+#: ../user/team_forum.php:35
 msgid "You and your Team Admins will have moderator privileges."
-msgstr "あなたとチーム管理者に司会者(モデレータ)の権限が付きます。"
+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 "チームにはすでに掲示板が作られています"
+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 "連続投稿の間の最小時間間隔(秒)"
+msgstr "連続投稿の間隔の最小時間(秒)"
 
-#: ../user/team_forum.php:74
+#: ../user/team_forum.php:76
 msgid "Minimum total credit to post"
 msgstr "投稿するために必要な総功績(credit)の最小値"
 
-#: ../user/team_forum.php:77
+#: ../user/team_forum.php:79
 msgid "Minimum average credit to post"
 msgstr "投稿するために必要な平均功績(credits/day)の最小値"
 
-#: ../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 "チーム掲示板を削除する。"
+msgstr "チームの掲示板を削除します。"
 
-#: ../user/team_forum.php:97
+#: ../user/team_forum.php:99
 msgid "Really remove message board?"
-msgstr "本当に掲示板を削除しますか?"
+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 ""
-"あなたのチームの掲示板を削除しようとしていますが、よろしいですか? "
-"すべのスレッドと投稿内容が永久に失われます。(それでも、その後で新しい掲示板を作ることはできます。)"
+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."
+"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 ""
-"あなたの要求を現在の創設者に Eメイルと非公開メッセージの両方で通知しました。<br /><br />\n"
-"                       創設者が 60日以内に応答しなければ、あなたが創設者になることが許されます。"
+"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 "あなたの要求を現在の創設者にEメールと非公開メッセージの両方で通知しました。<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 "創設者権限の要求は現在許されません"
+msgstr "創設者権限の要求は現在許されていません"
 
-#: ../user/team_founder_transfer_action.php:109
+#: ../user/team_founder_transfer_action.php:111
 msgid "Assumed foundership of %1"
-msgstr "%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へ行って、チーム管理者の選択の部分を見てください。"
+msgstr "おめでとうございます。今、あなたはチーム %1 の創設者になりました。チーム管理者のオプションを見るには、%2あなたのアカウントのページ%3へ行ってください。"
 
-#: ../user/team_founder_transfer_action.php:120
+#: ../user/team_founder_transfer_action.php:122
 msgid "Decline founder change request"
-msgstr "創設者変更の要求を拒絶する"
+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 "創設者権限移譲の要求はありませんでした。"
+msgstr "創設者権限の要求はありませんでした。"
 
-# It seems to be an error message for the implementors.
-#: ../user/team_founder_transfer_action.php:134
+#: ../user/team_founder_transfer_action.php:136
 msgid "undefined action %1"
-msgstr "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 "あなたは %2に %1 の創設者権限を要求しました。"
+msgstr "あなたは %2 に %1 の創設者権限を要求しました。"
 
-#: ../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日が経過しましたが、創設者は応答しませんでした。 ここをクリックして創設者権限を引き継いでください:"
+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 までに創設者が応答しなければ、あなたが創設者になれます。"
+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"
+"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 ""
-"チームの創設者が活動しておらず、あなたがその役割を引き継ぎたい場合、 以下のボタンをクリックしてください。現在の創設者にEメイルが送信され、 "
-"あなたの要求が説明されます。創設者は権限をあなたに委譲するか、 委譲要求を拒否するかを選べます。創設者が60日以内に応答しなければ、 "
-"あなたが新しい創設者になります。<br /><br />\n"
-" 創設者の権限委譲を要求しますか?"
+msgstr "チームの創設者が活動しておらず、あなたがその役割を引き継ぎたい場合、以下のボタンをクリックしてください。現在の創設者にEメールが送信され、あなたの要求が説明されます。創設者は権限をあなたに委譲するか、委譲要求を拒否するかを選べます。創設者が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日内に創設者の権限委譲が要求されていましたので、 新規の要求は許されません。しばらくたってからもう一度試してください。"
+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 "チームに参加不可 - しばらくたってからもう一度試してください。"
+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 "チームに参加すると、その創設者にあなたの Eメイルアドレスが知らされます。"
+msgstr "チームに参加すると、その創設者にあなたの Eメールアドレスが知らされます。"
 
-#: ../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."
+"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 "チームの名前、URL、説明文、タイプ、国名を更新する"
 
-#: ../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 "メンバーの名前と Eメイルアドレスを表示する"
 
-#: ../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 ワイドのチーム%2 "
-"というものにすることも可能です。"
+"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 というものにすることも可能です。"
 
-#: ../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 "メンバーのいるチームは削除できません"
@@ -6355,124 +6028,114 @@ 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"
-"         <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"
+"         <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>"
 
-#: ../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 ""
-"以下のチームが検索条件のうち1つ以上に合致しました。\n"
-"            チームに参加するにはその名前をクリックしてそのチームのページ\n"
-"               に行き、%1このチームに参加%2をクリックしてください。"
+msgstr "以下のチームが検索条件のうち1つ以上に合致しました。\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項目のみ"
 
@@ -6480,11 +6143,11 @@ msgstr "制限値を超過 - 残念ですが、最初の %1項目のみ"
 msgid "Top hosts"
 msgstr "コンピュータのランキング"
 
-#: ../user/top_teams.php:105
+#: ../user/top_teams.php:107
 msgid "Top %1 teams"
 msgstr "%1 チームのランキング"
 
-#: ../user/top_teams.php:108
+#: ../user/top_teams.php:110
 msgid "There are no %1 teams"
 msgstr "%1 にチームがありません"
 
@@ -6492,11 +6155,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 さん"
 
@@ -6526,7 +6189,7 @@ msgstr "チームへの所属有無"
 
 #: ../user/user_search.php:66
 msgid "Ordering"
-msgstr ""
+msgstr "整理"
 
 #: ../user/user_search.php:67
 msgid "Decreasing sign-up time"
@@ -6540,25 +6203,25 @@ msgstr "平均功績(credits/day)の多い人から表示"
 msgid "Decreasing total credit"
 msgstr "総功績(credits)の多い人から表示"
 
-#: ../user/user_search.php:100
+#: ../user/user_search.php:84
 msgid "search string must be at least 3 characters"
 msgstr "検索条件の文字列は、少なくとも3文字必要です"
 
-#: ../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 "指定した条件に合う参加者はいませんでした。"
 
 #: ../user/userw.php:35
 msgid "User not found!"
-msgstr "該当する参加者はいません!"
+msgstr "該当する参加者が見つかりません!"
 
 #: ../user/userw.php:44
 msgid "Account Data<br/>for %1<br/>Time:"
@@ -6570,11 +6233,11 @@ msgstr "チーム:"
 
 #: ../user/userw.php:48
 msgid "Team TotCred:"
-msgstr "チームの総功績"
+msgstr "チームの総功績:"
 
 #: ../user/userw.php:49
 msgid "Team AvgCred:"
-msgstr "チームの平均功績"
+msgstr "チームの平均功績:"
 
 #: ../user/userw.php:51
 msgid "Team: None"
@@ -6620,33 +6283,32 @@ msgstr "Eメイルアドレスを確認する"
 msgid "The email address of your account has been validated."
 msgstr "あなたのアカウントの Eメイルアドレスは確認済みです。"
 
-#: ../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 "アカウントのデータ"
 
 #: ../user/weak_auth.php:52
 msgid ""
-"You can access your account either by using your email address and "
-"password,\n"
+"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 ""
+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 ""
@@ -6654,7 +6316,7 @@ msgid ""
 "       To do so, install BOINC,\n"
 "       create a file named %1 in the BOINC\n"
 "       data directory, and set its contents to:"
-msgstr ""
+msgstr "BOINC マネージャを使用せずに、アカウントにコンピュータを接続します。\nそのためには、BOINCをインストールし、BOINCのデータディレクトリに %1 という名前のファイルを作成し、以下の内容を設定します : "
 
 #: ../user/weak_auth.php:73
 msgid "Weak account key"
@@ -6663,18 +6325,17 @@ msgstr "「弱い」アカウント・キー"
 #: ../user/weak_auth.php:74
 msgid ""
 "Your 'weak account key' can be used to attach computers to your account\n"
-"    as described above, but cannot be used to log in to your account or "
-"change it in any way.\n"
+"    as described above, but cannot be used to log in to your account or change it in any way.\n"
 "    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 ""
+msgstr "あなたの「弱いアカウント・キー」は前述のように、あなたのアカウントにコンピュータを接続するために使用することができますが、あなたのアカウントにログインするか、どのような方法でもアカウントを変更するために使用することはできません。\nアカウントに信頼されていないあるいは安全でないコンピュータを接続したい場合は、弱いアカウント・キーを使用してください。\nあなたの弱いアカウント・キー : "
 
 #: ../user/weak_auth.php:81
 msgid ""
 "If you change your password, your weak account key changes, and your "
 "previous weak account key becomes invalid."
-msgstr ""
+msgstr "もしパスワードを変更するならば、あなたの弱いアカウント・キーは変更され、以前の弱いアカウントを・キーは無効になります。"
 
 #: ../user/workunit.php:32
 msgid "can't find workunit"
@@ -6684,6 +6345,10 @@ msgstr "ワークユニットが見つかりません"
 msgid "Workunit %1"
 msgstr "ワークユニット %1"
 
+#: ../user/workunit.php:40
+msgid "application"
+msgstr "アプリケーション"
+
 #: ../user/workunit.php:43
 msgid "canonical result"
 msgstr "標準的結果"
@@ -6693,6 +6358,10 @@ msgid "granted credit"
 msgstr "認められた功績値"
 
 #: ../user/workunit.php:55
+msgid "Tasks in progress"
+msgstr "タスク 実行中"
+
+#: ../user/workunit.php:55
 msgid "suppressed pending completion"
 msgstr "完了保留中のワークユニットは表示を省略"
 
@@ -6706,7 +6375,7 @@ msgstr "複製の初期量"
 
 #: ../user/workunit.php:60
 msgid "max # of error/total/success tasks"
-msgstr "タスク数の各種上限値(異常、総数、正常)"
+msgstr "タスク数の各種上限値(異常、総数、正常)"
 
 #: ../user/workunit.php:64
 msgid "errors"
@@ -6720,200 +6389,70 @@ msgstr "検証"
 msgid "Pending"
 msgstr "保留中"
 
-#: ../project.sample/project.inc:43
+#: ../project.sample/project.inc:70
 msgid "Main page"
-msgstr "入口のページ"
+msgstr "メインページ"
 
-#: ../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 "生成日時"
 
-#: ../project.sample/project.inc:79
+#: ../project.sample/project.inc:106
 msgid "Your personal background."
-msgstr "あなたの経歴"
+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 "(すべてのアプリケーション)"
-
-#~ msgid "Error:"
-#~ msgstr "異常:"
-
-#~ msgid "Account creation is disabled"
-#~ msgstr "アカウントの作成機能は停止しています。"
-
-#~ msgid ""
-#~ "Sorry, this project has disabled the creation of new accounts.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "申し訳ありません。このプロジェクトは新規アカウントの作成を停止しています。\n"
-#~ "後ほど試してみてください。"
-
-#~ msgid "Account creation is currently disabled. Please try again later."
-#~ msgstr "アカウントの作成を現在停止しています。 のちほどもう一度お試しください。"
-
-#~ msgid "nvidia GPU"
-#~ msgstr "nvidia GPU"
-
-#~ msgid ""
-#~ "This project hasn\\'t created an email message - please notify its "
-#~ "administrators"
-#~ msgstr "このプロジェクトではまだ Eメイルメッセージを作成しておりません。"
-
-#~ msgid ""
-#~ "These apply to all BOINC projects in which you participate.<br>\n"
-#~ "             On computers participating in multiple projects, the most "
-#~ "recently modified preferences will be used."
-#~ msgstr ""
-#~ "これらは、あなたが参加するすべての BOINC プロジェクトに適用されます。<br>\n"
-#~ "複数のプロジェクトに参加しているコンピュータでは、一番最後に更新されたプレファレンスが適用されます。"
-
-#~ msgid "Export this news item as a Notice"
-#~ msgstr "このニュースをお知らせとしてエクスポートする"
-
-#~ msgid ""
-#~ "Go to the BOINC data directory on your computer (on Windows this is usually "
-#~ "<b>C:\\Documents and Settings\\All Users\\Application Data\\BOINC</b> or "
-#~ "<b>C:\\Program Files\\BOINC</b>."
-#~ msgstr ""
-#~ "BOINC のデータディレクトリをあなたのコンピュータの中から見つけてください。(Windows なら普通、<b>C:\\Documents and "
-#~ "Settings\\All Users\\Application Data\\BOINC</b> あるいは、<b>C:\\Program "
-#~ "Files\\BOINC</b> です。"
-
-#~ msgid "No such task"
-#~ msgstr "該当するタスクがありません。"
-
-#~ msgid ""
-#~ "Computer is connected to the Internet about every %1 Leave blank or 0 if "
-#~ "always connected. %2 BOINC will try to maintain at least this much work (max "
-#~ "10 days). %3"
-#~ msgstr ""
-#~ "コンピュータをインターネットに接続する時間間隔 %1 常時接続の場合は、空白のままあるいは 0 を指定する。%2 BOINC "
-#~ "は少なくともこの期間以上の量の仕事を(最大10日分)保持しようとする。%3"
-
-#~ msgid "Maintain enough work for an additional"
-#~ msgstr "仕事の備蓄分(日数)"
-
-#~ msgid "Update failed: "
-#~ msgstr "更新の失敗:"
-
-#~ msgid "Provides %1limited access%2 to your account"
-#~ msgstr "あなたのアカウントに %1制限付きのアクセス%2 を可能にします"
-
-#, fuzzy
-#~ msgid ""
-#~ "Don't use this form. Just run BOINC, select Add Project, and enter an email "
-#~ "address and password."
-#~ msgstr ""
-#~ "ご注意:BOINC Manager を使う方はこの入力画面を使わないでください。代わりに、BOINC を起動して、[ツール] → "
-#~ "[プロジェクトまたはアカウントマネージャを追加] を選び、メイルアドレスとパスワードを入力してください。"
-
-#~ msgid "Do not reorder sticky posts"
-#~ msgstr "位置固定と指定された投稿は表示位置を変更しない"
-
-#~ msgid "If a thread contains more than this number of posts"
-#~ msgstr "この数より多い投稿が1つのスレッドにあった場合"
-
-#~ msgid "only display the first one and this many of the last ones"
-#~ msgstr "最初の投稿と最新から遡ってこの数の投稿までを表示します"
-
-#~ msgid "Your report has been recorded. Thanks you for your input."
-#~ msgstr "あなたの報告は登録されました。入力していただきありがとうございます。"
-
-#~ msgid "Search type"
-#~ msgstr "検索方法"
-
-#~ msgid "User names starting with"
-#~ msgstr "右の文字列で始まる参加者の名前一覧: "
-
-# #######################################
-# "Weak account key" page (weak_auth.php)
-#~ msgid ""
-#~ "Your 'weak account key' lets you link a computer to your account without "
-#~ "giving it the ability to log in to your account or to change it in any way."
-#~ msgstr ""
-#~ "「弱い」アカウント・キーはコンピュータをプロジェクトに参加させることができますが、 "
-#~ "アカウントページへのログインやアカウントに関する設定変更はできません。"
-
-#~ msgid ""
-#~ "This mechanism works only with projects that have upgraded their server "
-#~ "software 7 Dec 2007 or later."
-#~ msgstr "この仕組みは、2007年12月7日以降にサーバーソフトウェアをアップグレードしたプロジェクトでのみ作動します。"
-
-#~ msgid "Your weak account key for this project is:"
-#~ msgstr "あなたの、このプロジェクトでの「弱い」アカウント・キーは:"
-
-#~ msgid ""
-#~ "To use your weak account key on a given host, find or create the 'account "
-#~ "file' for this project. This file has a name of the form "
-#~ "<b>account_PROJECT_URL.xml</b>. The account file for %1 is <b>%2</b>."
-#~ msgstr ""
-#~ "この「弱い」アカウント・キーを使うには、このプロジェクトのアカウントファイルを探すか、 "
-#~ "作るかしてください。ファイルの名前の形式は<b>account_PROJECT_URL.xml</b> です。 %1 用のアカウントファイルは <b>%"
-#~ "2</b> です。"
-
-#~ msgid "Create this file if needed. Set its contents to:"
-#~ msgstr "必要であれば、このファイルを作成してください。中身は次のようにしてください :"
-
-#~ msgid ""
-#~ "Your weak account key is a function of your password. If you change your "
-#~ "password, your weak account key changes, and your previous weak account key "
-#~ "becomes invalid."
-#~ msgstr ""
-#~ "「弱い」アカウント・キーの値はパスワードの値によって決まります。 パスワードを変更すると、「弱い」アカウント・キーは変化し、 "
-#~ "以前の「弱い」アカウント・キーは無効になります。"
-
-#~ msgid "Account key"
-#~ msgstr "アカウント・キー"
-
-#~ msgid "Provides full access to your account"
-#~ msgstr "あなたのアカウントの全てにわたってアクセス可能にします"
-
-#~ msgid "Export"
-#~ msgstr "エクスポートする"
diff --git a/locale/ja/BOINC-Setup.mo b/locale/ja/BOINC-Setup.mo
index 0f3e7fa..39b2f20 100644
Binary files a/locale/ja/BOINC-Setup.mo and b/locale/ja/BOINC-Setup.mo differ
diff --git a/locale/ja/BOINC-Setup.po b/locale/ja/BOINC-Setup.po
old mode 100755
new mode 100644
index 8e30fbd..1da51ca
--- a/locale/ja/BOINC-Setup.po
+++ b/locale/ja/BOINC-Setup.po
@@ -1,45 +1,39 @@
 # 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:
+# Masahiro Tagashira, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\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-11 17:14-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: ja\n"
+"PO-Revision-Date: 2015-03-09 18:40+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"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-Basepath: /Volumes/Cheer/BOINC_GIT/boinc_trunk\n"
-"X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: mac_installer\n"
+"Language: ja\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 ""
+msgstr "申し訳ありません、このバージョンの %s には 10.5 以降のシステムが必要です。"
 
-#: PostInstall.cpp:130
-#: PostInstall.cpp:1136
-#: uninstall.cpp:1618
+#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
 msgid "Yes"
-msgstr ""
+msgstr "はい"
 
-#: PostInstall.cpp:131
-#: PostInstall.cpp:1137
-#: uninstall.cpp:1619
+#: PostInstall.cpp:131 PostInstall.cpp:1137 uninstall.cpp:1619
 msgid "No"
-msgstr ""
+msgstr "いいえ"
 
 #: PostInstall.cpp:133
 msgid "Should BOINC run even when no user is logged in?"
-msgstr ""
+msgstr "どのユーザーもログオンしていない時も BOINC を動作させますか?"
 
 #: PostInstall.cpp:1416
 #, c-format
@@ -47,26 +41,26 @@ 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 ""
+msgstr "このコンピュータの管理者権限を持つユーザーは自動的に %s の動作および制御が可能になります。\nこの Mac で管理者権限を持たないユーザーによる %s の動作および制御を同様に可能にしますか?"
 
 #: PostInstall.cpp:1444
 #, c-format
 msgid "Do you want to set %s as the screensaver for all %s users on this Mac?"
-msgstr ""
+msgstr "この Mac の全ての %s ユーザーに %s をスクリーンセーバーとして設定しますか?"
 
 #: uninstall.cpp:82
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: uninstall.cpp:136
 msgid "Permission error after relaunch"
-msgstr ""
+msgstr "再起動後の権限エラー"
 
 #: uninstall.cpp:141
 msgid ""
 "Removal may take several minutes.\n"
 "Please be patient."
-msgstr ""
+msgstr "削除には数分かかることがあります。\nどうかもうしばらくお待ち下さい。"
 
 #: uninstall.cpp:156
 #, c-format
@@ -74,27 +68,27 @@ 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 ""
+msgstr "本当にあなたのコンピュータから完全に %s を削除しますか?\nこれは実行可能ファイルを削除しますが %s のデータファイルに触れることはありません。"
 
 #: uninstall.cpp:163
 #, c-format
 msgid "Canceled: %s has not been touched."
-msgstr ""
+msgstr "キャンセルされました: %s は触れられていません"
 
 #: uninstall.cpp:174
 #, c-format
 msgid "An error occurred: error code %d"
-msgstr ""
+msgstr "エラーが発生しました: エラーコード %d"
 
 #: uninstall.cpp:230
 msgid "name  of user"
-msgstr ""
+msgstr "ユーザーの名前"
 
 #: uninstall.cpp:272
 msgid ""
 "Do you also want to remove VirtualBox from your computer?\n"
 "(VirtualBox was installed along with BOINC.)"
-msgstr ""
+msgstr "VirtualBox もあなたのコンピュータから削除しますか?\n( VirtualBox は BOINC と一緒にインストールされました。)"
 
 #: uninstall.cpp:312
 #, c-format
@@ -106,20 +100,19 @@ msgid ""
 "\n"
 "for each user, the file\n"
 "\"%s\"."
-msgstr ""
+msgstr "削除が完了しました。\n\n次に述べる残っているアイテムを削除したい場合はFinderを使います。ディレクトリ名は\" %s \"です。\nそれぞれのユーザーのファイル名は\" %s \"です。"
 
 #: uninstall.cpp:840
 #, c-format
 msgid ""
 "Enter your administrator password to completely remove %s from you computer.\n"
 "\n"
-msgstr ""
+msgstr "%s をあなたのコンピュータから完全に削除するため、あなたの管理者パスワードを入力してください。\n"
 
 #: uninstall.cpp:1616
 msgid "Cancel"
-msgstr ""
+msgstr "キャンセル"
 
 #: uninstall.cpp:1617
 msgid "Continue..."
-msgstr ""
-
+msgstr "続行…"
diff --git a/locale/ja/BOINC-Web.mo b/locale/ja/BOINC-Web.mo
index 5aa8eb4..a99399d 100644
Binary files a/locale/ja/BOINC-Web.mo and b/locale/ja/BOINC-Web.mo differ
diff --git a/locale/ja/BOINC-Web.po b/locale/ja/BOINC-Web.po
old mode 100755
new mode 100644
index 3f66084..e8afabc
--- a/locale/ja/BOINC-Web.po
+++ b/locale/ja/BOINC-Web.po
@@ -1,25 +1,26 @@
 # BOINC web translation
 # Copyright (C) 2008-2009 University of California
+# 
 # This file is distributed under the same license as BOINC.
+# 
 # FileID  : $Id$
+# 
+# Translators:
+# Masahiro Tagashira, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\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-11 17:15-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: ja\n"
+"PO-Revision-Date: 2015-03-09 12:08+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"
-"X-Generator: Pootle 2.1.6\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-BOINC-UTF8-Marker: 日本語\n"
-"X-Poedit-KeywordsList: tra\n"
-"X-Poedit-Basepath: .\n"
-"X-Poedit-SearchPath-0: doc\n"
 
 #: docutil.php:21
 msgid "Search"
@@ -27,61 +28,70 @@ msgstr "検索"
 
 #: docutil.php:103
 msgid "Return to BOINC main page"
-msgstr "BOINCホームページに戻る"
+msgstr "BOINC のホームページに戻る"
 
 #: docutil.php:114
 #, php-format
 msgid "This page is %stranslatable%s."
-msgstr "このページは%s翻訳可能です%s"
+msgstr "このページは %s翻訳可能です%s 。"
 
 #: download.php:39
-msgid "We recommend that you also install VirtualBox, so your computer can work on science projects that require it."
-msgstr ""
+msgid ""
+"We recommend that you also install VirtualBox, so your computer can work on "
+"science projects that require it."
+msgstr "私達はVirtualBoxも同様にインストールすることをおすすめします、そうすることであなたのコンピュータはVirtualBoxを必要とする科学プロジェクトを動作させることが出来ます。"
 
 #: download.php:41
 msgid "Learn more about VirtualBox."
-msgstr ""
+msgstr "VirtualBoxについてもっと詳しく。"
 
 #: download.php:51
 msgid "Download BOINC + VirtualBox"
-msgstr ""
+msgstr "BOINC+VirtualBoxをダウンロード"
 
-#: download.php:54
-#: download.php:69
+#: download.php:54 download.php:69
 #, php-format
 msgid "for %s"
-msgstr ""
+msgstr "%s のための"
 
-#: download.php:57
-#: download.php:72
+#: download.php:57 download.php:72
 #, php-format
 msgid "BOINC version %s"
-msgstr ""
+msgstr "BOINCのバージョン %s"
 
 #: download.php:59
 #, php-format
 msgid "VirtualBox version %s"
-msgstr ""
+msgstr "VirtualBoxのバージョン %s"
 
 #: download.php:67
 msgid "Download BOINC"
-msgstr "BOINC をダウンロードする"
+msgstr "BOINCをダウンロード"
 
 #: download.php:123
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others."
-msgstr ""
+msgid ""
+"BOINC is a program that lets you donate your idle computer time to science "
+"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, and many others."
+msgstr "BOINCはあなたのコンピュータのアイドル時間を SETI at home, Climateprediction.net, Rosetta at home, World Community Grid ほか多くの科学プロジェクトに提供するためのプログラムです。"
 
 #: download.php:125
-msgid "After installing BOINC on your computer, you can connect it to as many of these projects as you like."
-msgstr ""
+msgid ""
+"After installing BOINC on your computer, you can connect it to as many of "
+"these projects as you like."
+msgstr "BOINCをコンピュータにインストールした後、あなたは好きなようにこれらのプロジェクトの多くに接続することができます。"
 
 #: download.php:127
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
-msgstr "ご自身で所有しているコンピュータあるいは所有者に許可を得た場合のみそのコンピュータでこのソフトウェアを実行することを許します。"
+msgid ""
+"You may run this software on a computer only if you own the computer or have"
+" the permission of its owner."
+msgstr "ご自身で所有しているコンピュータあるいは所有者に許可を得た場合のみそのコンピュータでこのソフトウェアを実行できます。"
 
 #: download.php:132
-msgid "We recommend that you download BOINC from the Google Play Store or Amazon Appstore, not from here."
-msgstr ""
+msgid ""
+"We recommend that you download BOINC from the Google Play Store or Amazon "
+"Appstore, not from here."
+msgstr "私達はあなたがBOINCをこのページからではなく、Google PlayストアもしくはAmazonアプリストアからダウンロードすることをおすすめします。"
 
 #: download.php:167
 msgid "System requirements"
@@ -91,22 +101,21 @@ msgstr "コンピュータの条件"
 msgid "Release notes"
 msgstr "公開時の注意書き"
 
-#: download.php:169
-#: index.php:86
+#: download.php:169 index.php:86
 msgid "Help"
 msgstr "ヘルプ"
 
 #: download.php:170
 msgid "All versions"
-msgstr "ダウンロード一覧"
+msgstr "全バージョンの一覧"
 
 #: download.php:171
 msgid "Version history"
-msgstr "版数の履歴"
+msgstr "更新履歴"
 
 #: download.php:172
 msgid "GPU computing"
-msgstr ""
+msgstr "GPUによるコンピューティング"
 
 #: download.php:190
 msgid "BOINC: compute for science"
@@ -114,20 +123,34 @@ msgstr "BOINC: 科学のための計算をしよう"
 
 #: help.php:12
 #, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
-msgstr "BOINC のオンライン・ヘルプでは、経験ある BOINC 参加者と1対1で話ができます。話の相手となってくれる方は、%s BOINC とボランティア・コンピューティングについて質問に答えることができますし、%s BOINC をインストールして使うところまで、あなたをガイドできます。さらに%s あなたが遭遇するかもしれない問題も解決できるでしょう。"
+msgid ""
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who"
+" can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"through the process of installing and using BOINC; %s troubleshoot any "
+"problems you might have."
+msgstr "BOINC のオンライン・ヘルプでは、経験あるBOINC参加者と1対1で話ができます。話の相手となってくれる方は、 %s BOINCとボランティア・コンピューティングについて質問に答えることができますし、%s BOINCをインストールして使うところまで、あなたをガイドできます。さらに %s あなたが遭遇するかもしれない問題も解決できるでしょう。"
 
 #: help.php:21
 #, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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 オンライン・ヘルプは インターネット・ベースの電話システムの1つである %sSkype%s を使います。Skype は無料 (ソフトウェアも通話料も)です。まだ Skype をもっていなければ、どうぞ %s 今すぐダウンロードしてインストールしてください%s。それが済んだら、このページに戻ってください。"
+msgid ""
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system."
+" 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オンライン・ヘルプは インターネット・ベースの電話システムの1つである %s Skype %s を使います。Skypeは無料(ソフトウェアも通話も)です。まだSkypeをもっていなければ、どうぞ %s 今すぐダウンロードしてインストールしてください %s 。それが済んだら、このページに戻ってください。"
 
 #: help.php:28
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
-msgstr "助けを得る一番良いやり方は、口頭で相談することです。そのためには、あなたのコンピュータに組み込まれたマイクとスピーカ、あるいは、外部接続のヘッドセットが要ります。別の方法としては、Skype のテキストベースのチャットシステムを使って、ヘルプを担当してくれるボランティアとやりとりをすることもできます。 "
+msgid ""
+"The best way to get help is by voice, for which you need either built-in "
+"microphone and speakers or an external headset for your computer.  You can "
+"also use Skype's text-based chat system or regular email (if you don't have "
+"Skype) to communicate with Help Volunteers."
+msgstr "助けを得る一番良いやり方は、口頭で相談することです。そのためには、あなたのコンピュータに組み込まれたマイクとスピーカ、あるいは、外部接続のヘッドセットが要ります。別の方法としては、Skypeのテキストベースのチャットシステムを使って、ヘルプを担当してくれるボランティアとやりとりをすることもできます。 "
 
 #: help.php:31
-msgid "Volunteers speaking several languages are available. Please select a language:"
+msgid ""
+"Volunteers speaking several languages are available. Please select a "
+"language:"
 msgstr "数ヶ国語についてボランティアはヘルプを提供できます。使いたい言語を以下から選択してください:"
 
 #: help.php:47
@@ -136,21 +159,27 @@ msgstr "ヘルプ担当のボランティアになるには"
 
 #: help.php:50
 #, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
-msgstr "あなたが BOINC 参加者として経験がおありなら、是非、%s ヘルプ担当のボランティアをやって%s いただけませんか。科学研究とボランティア・コンピューティングの主旨を支援する、重要な活動の1つです。さらに、楽しい活動でもあります!"
+msgid ""
+"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+"Volunteer%s.  It's a great way to help the cause of scientific research and "
+"volunteer computing - and it's fun!"
+msgstr "あなたがBOINC参加者として経験がおありなら、是非、%s ヘルプ担当のボランティアをやって %s いただけませんか。科学研究とボランティア・コンピューティングの主旨を支援する、重要な活動の1つです。さらに、楽しい活動でもあります!"
 
 #: help.php:56
 #, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
-msgstr "既にヘルプ担当のボランティアをされている方へ:あなたの%s 設定を編集する%s には左のリンクをクリックしてください。"
+msgid ""
+"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
+msgstr "既にヘルプ担当のボランティアをされている方へ:あなたの %s設定を編集する%s には左のリンクをクリックしてください。"
 
 #: help_funcs.php:107
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
-msgstr "BOINC ヘルパーは無給のボランティアです。彼らのアドバイスは、BOINC あるいはthe University of California のいずれからも保証されるものではありません。"
+msgid ""
+"BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
+"or the University of California."
+msgstr "BOINC ヘルパーは無給のボランティアです。彼らのアドバイスは、BOINC あるいは the University of California のいずれからも保証されるものではありません。"
 
 #: help_funcs.php:110
 msgid "%1Never%2 give email address or password information to BOINC helpers."
-msgstr "%1決して%2 BOINC ヘルパーの方々に Eメイルアドレスやパスワードを知らせないでください。"
+msgstr "%1決して%2 BOINC ヘルパーの方々に Eメールアドレスやパスワードを知らせないでください。"
 
 #: index.php:24
 msgid "Computing power"
@@ -180,11 +209,9 @@ msgstr "コンピュータ。\n"
 msgid "24-hour average:"
 msgstr "24時間平均:"
 
-# 80%
 #: index.php:56
-#, fuzzy
 msgid "PetaFLOPS."
-msgstr "テラFLOPS。"
+msgstr "ペタフロップス(PFLOPS)"
 
 #: index.php:68
 msgid "News"
@@ -198,39 +225,42 @@ msgstr "ボランティアとして参加してくださる方へ"
 msgid "Download"
 msgstr "ダウンロード"
 
-#: index.php:87
-#: index.php:120
-#: index.php:171
+#: index.php:87 index.php:120 index.php:171
 msgid "Documentation"
 msgstr "説明資料"
 
 #: index.php:88
 msgid "Add-ons"
-msgstr ""
+msgstr "アドオン"
 
 #: index.php:89
 msgid "Links"
-msgstr ""
+msgstr "リンク"
 
 #: index.php:94
-msgid "Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:"
-msgstr ""
+msgid ""
+"Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure"
+" diseases, study global warming, discover pulsars, and do many other types "
+"of scientific research.  It's safe, secure, and easy:"
+msgstr "疾病の治癒、地球温暖化の研究、パルサーの発見、その他様々なタイプの科学的研究のためにあなたのコンピュータ(Windows, Mac, Linux, もしくはAndroid)のアイドル時間を利用しましょう。それは安全、安心、そして簡単です。"
 
 #: index.php:96
 msgid "Choose projects"
-msgstr ""
+msgstr "プロジェクトを選んでください"
 
 #: index.php:97
 msgid "Download BOINC software"
-msgstr ""
+msgstr "BOINCソフトウェアのダウンロード"
 
 #: index.php:98
 msgid "Enter an email address and password."
-msgstr ""
+msgstr "Eメールアドレスとパスワードを入力してください。"
 
 #: index.php:102
 #, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
+msgid ""
+"Or, if you run several projects, try an %saccount manager%s such as "
+"%sGridRepublic%s or %sBAM!%s. "
 msgstr "あるいは、もし複数のプロジェクトに参加したいなら、%3$s GridRepublic %4$s や %5$s BAM! %6$s のような %1$s アカウント・マネージャ%2$s を試してください。"
 
 #: index.php:118
@@ -242,11 +272,15 @@ msgid "Software updates"
 msgstr "ソフトウェアの更新"
 
 #: index.php:128
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving"
+" you the computing power of thousands of CPUs."
 msgstr "%1科学者%2: は BOINC を使って%3ボランティア・コンピューティング・プロジェクト%4 を作成することで、何千ものCPUの計算能力を手に入れることができます。"
 
 #: index.php:132
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
 msgstr "%1大学%2: BOINC を使って%3仮想キャンパス・スーパーコンピューティング・センタ%4を作ることができます。"
 
 #: index.php:137
@@ -263,7 +297,7 @@ msgstr "掲示板"
 
 #: index.php:156
 msgid "Email lists"
-msgstr "Eメイルリスト"
+msgstr "Eメールリスト"
 
 #: index.php:157
 msgid "Personnel and contributors"
@@ -319,7 +353,8 @@ msgstr "アドオン・ソフトウェアのための API"
 
 #: index.php:217
 #, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
+msgid ""
+"Open-source software for %svolunteer computing%s and %sgrid computing%s."
 msgstr "BOINC は %sボランティア・コンピューティング%s と %sグリッド・コンピューティング%sのためのオープンソース・ソフトウェアです。"
 
 #: index.php:230
@@ -328,48 +363,50 @@ msgstr "BOINC の本拠地は、カリフォルニア大学バークレー校に
 
 #: projects.inc:14
 msgid "Distributed sensing"
-msgstr ""
+msgstr "分散感知"
 
-# 78%
 #: projects.inc:19
-#, fuzzy
 msgid "Stanford University"
-msgstr "オックスフォード大学"
+msgstr "スタンフォード大学"
 
 #: projects.inc:20
 msgid "Seismology"
-msgstr ""
+msgstr "地震学"
 
 #: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
-msgstr ""
+msgid ""
+"The Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to Internet-connected computers.  You must buy a "
+"sensor to participate."
+msgstr "The Quake-Catcher Network はインターネットに接続されたコンピュータに繋がれたセンサーを使って世界最大の地震ネットワークを開発しています。参加するにはセンサーを購入しなければなりません。"
 
 #: projects.inc:27
 msgid "BOINC Poland Foundation"
-msgstr ""
+msgstr "BOINCポーランド財団"
 
 #: projects.inc:28
 msgid "Environmental research"
-msgstr ""
+msgstr "環境保護研究"
 
 #: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
-msgstr ""
+msgid ""
+"This project is creating a free and continuously updated map of radiation "
+"levels by using sensors connected to volunteers' computers.  You must buy a "
+"sensor to participate."
+msgstr "このプロジェクトはボランティアのコンピュータに接続されたセンサーを使うことによって無料で継続的に更新される放射線レベルの地図を作っています。参加するにはセンサーを購入しなければなりません。"
 
 #: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
-msgstr ""
+msgid ""
+"To participate in these projects you must buy a sensor and attach it to your"
+" computer."
+msgstr "これらのプロジェクトに参加するにはセンサーを購入しコンピュータに接続しなければなりません。"
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
 msgstr "認知科学と人工知能"
 
-#: projects.inc:60
-#: projects.inc:364
-#: projects.inc:408
-#: projects.inc:457
-#: projects.inc:464
-#: projects.inc:511
+#: projects.inc:60 projects.inc:364 projects.inc:408 projects.inc:457
+#: projects.inc:464 projects.inc:511
 msgid "Private"
 msgstr "非公開"
 
@@ -378,7 +415,11 @@ msgid "Artificial intelligence"
 msgstr "人工知能"
 
 #: projects.inc:62
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
+msgid ""
+"Parse and convert semantic nets for use in FreeHAL, an artificial "
+"intelligence that uses semantic networks, stemmers, part of speech "
+"databases, and part of speech taggers in order to imitate human behavior in "
+"conversations."
 msgstr "FreeHALで使うセマンティックネットを構文解析し変換すること。FreeHALは人工知能のひとつであり、セマンティックネットや語幹処理機能、音声データベースの一部、品詞タグ付け機能を使って人間の会話を模擬しようとするものです。"
 
 #: projects.inc:69
@@ -387,15 +428,20 @@ msgstr "生物学と医療"
 
 #: projects.inc:82
 msgid "University College Dublin"
-msgstr ""
+msgstr "ユニバーシティ・カレッジ・ダブリン"
 
 #: projects.inc:83
 msgid "Antimalarial drug discovery"
-msgstr ""
+msgstr "抗マラリア薬の発見"
 
 #: projects.inc:84
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
-msgstr ""
+msgid ""
+"The parasite that causes malaria continues to evolve resistance to available"
+" medication. We therefore urgently need to discover new drugs to replace "
+"existing drugs. Importantly, these new drugs need to target NEW proteins in "
+"the parasite. The FightMalaria at Home project is aimed at finding these new "
+"targets."
+msgstr "マラリアを引き起こす寄生虫は、利用できる抗マラリア薬からの耐性獲得で進化し続けています。私達はしたがって早急に既存の薬に置き換わる新薬を発見する必要があります。さらに重要なことに、これらの新薬は寄生虫の新しいたんぱく質を目標とする必要があります。この FightMalaria at Home プロジェクトではこれらの新しい目標の発見を目指します。"
 
 #: projects.inc:90
 msgid "University of Karlsruhe (Germany)"
@@ -406,7 +452,12 @@ msgid "Protein structure prediction"
 msgstr "蛋白質構造の予測"
 
 #: projects.inc:92
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
+msgid ""
+"POEM at HOME uses a computational approach to predict the biologically active "
+"structure of proteins, to understand the signal-processing mechanisms when "
+"the proteins interact with one another, to understand diseases related to "
+"protein malfunction or aggregation, and to develop new drugs on the basis of"
+" the three-dimensions structure of biologically important proteins."
 msgstr "POEM at HOME は、生物学的に活性をもつ種々の蛋白質の構造を予測するために、 計算指向のアプローチを使います。POEM at HOME はこれによって、 蛋白質どうしの間で信号処理が起こる場合の機構を理解したり、 蛋白質の誤動作や凝集に関係する疾病を理解する、あるいは、 生物学的に重要な蛋白質の三次元構造を基礎に新薬を開発します。"
 
 #: projects.inc:98
@@ -418,7 +469,11 @@ msgid "Study of protein - ligand interactions"
 msgstr "蛋白質-リガンド間の相互作用の研究"
 
 #: projects.inc:100
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
+msgid ""
+"Docking at Home has both bioscience and computer science goals. The project "
+"aims to further knowledge of the atomic details of protein-ligand "
+"interactions and, by doing so, will search for insights into the discovery "
+"of novel pharmaceuticals."
 msgstr "Docking at Home は、生物化学と計算機科学の両方の目標を持つプロジェクトです。 蛋白質とリガンド間の相互作用の原子的な詳細知識を深めることを目標とすると同時に、 その中で、革新的な薬品発見のための知見を探していきます。"
 
 #: projects.inc:114
@@ -430,64 +485,91 @@ msgid "Molecular simulations of proteins"
 msgstr "蛋白質の分子シミュレーション"
 
 #: projects.inc:116
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
-msgstr "NVIDAI GPU の上で走らせるように特に最適化した、 全原子を対象粒子として扱う初めての分子動力学のプログラムコード(CellMD )を使うことにより、GPUGrid.netは、革新的な計算シナリオを開拓します。 新しい生体医学的応用が突然可能になり、 生体医学を研究するにあたり計算生物学に新しい役割を与えます。"
+msgid ""
+"GPUGrid.net opens novel computational scenarios by the first full-atom "
+"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
+"New biomedical applications suddenly become possible giving a new role to "
+"computational biology for biomedical research."
+msgstr "NVIDAI GPU の上で走らせるように特別に最適化した、 全原子を対象粒子として扱う初めての分子動力学のプログラムコード(CellMD)を使うことにより、GPUGrid.netは、革新的な計算シナリオを開拓します。 新しい生体医学的応用が突然可能になり、 生体医学を研究するにあたり計算生物学に新しい役割を与えます。"
 
 #: projects.inc:122
 msgid "Technion, Israel"
-msgstr "Technion, Israel"
+msgstr "テクニオン - イスラエル工科大学"
 
 #: projects.inc:123
 msgid "Genetic linkage analysis"
 msgstr "遺伝的連鎖解析"
 
 #: projects.inc:124
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
-msgstr "Superlink at Technion は世界中の遺伝学者に、ある種の代謝異常や高血圧、ガン、 統合失調症など起こして疾病を誘発する遺伝子を探しやすくします。"
+msgid ""
+"Superlink at Technion helps geneticists all over the world find disease-"
+"provoking genes causing some types of diabetes, hypertension (high blood "
+"pressure), cancer, schizophrenia and many others."
+msgstr "Superlink at Technion は世界中の遺伝学者が、ある種の代謝異常や高血圧、ガン、 統合失調症などその他多くの疾病を誘発する遺伝子を探しやすくします。"
 
 #: projects.inc:138
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
-msgstr "メリーランド大学 バイオインフォマティックスと計算生物学のためのセンター"
+msgid ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
+msgstr "メリーランド大学 バイオインフォマティックス(生命情報学)と計算生物学のためのセンター"
 
 #: projects.inc:139
 msgid "Life science research"
 msgstr "生命科学の研究"
 
 #: projects.inc:140
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
-msgstr "Lattice プロジェクトは メリーランド大学の科学者の種々の研究に計算能力を、 提供しています。 たとえば、DNA配列データを基礎にした進化論的関係の研究、バクテリア、プラスミド、およびウィルスの蛋白質の配列の研究、そして、自然保護区における生物の多様性の研究などです。 "
+msgid ""
+"The Lattice Project supplies computing power to scientists at the University"
+" of Maryland studying evolutionary relationships based on DNA sequence data;"
+" bacterial, plasmid, and virus protein sequences; and biological diversity "
+"in nature reserves. "
+msgstr "The Lattice Project は、メリーランド大学の科学者の種々の研究に計算能力を提供しています。 たとえば、DNA配列データを基礎にした進化論的関係の研究、バクテリア、プラスミド、およびウィルスの蛋白質の配列の研究、そして、自然保護区における生物の多様性の研究などです。 "
 
 #: projects.inc:146
 msgid "The Swiss Tropical Institute"
-msgstr "The Swiss Tropical Institute"
+msgstr "スイス熱帯病研究所"
 
 #: projects.inc:147
 msgid "Epidemiology"
 msgstr "疫学"
 
 #: projects.inc:148
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
-msgstr "マラリア対策にとって、マラリアの動的な伝播と健康への影響をシミュレーションするためのモデルは重要な道具です。これらのモデルによっていろいろな対抗手段を提供していく最も良いやり方を決めることに使うことができます。たとえば、蚊帳や化学療法、現在開発・検証中の新ワクチンの使い方を最適化するのに使います。 これらのモデリングの手法は非常に大きな計算能力を必要とします。 多くの人口を対象にシミュレーションが必要ですし、 この病気の拡散に影響を与える生物学的因子と社会学的因子が、 数多くのパラメタに関係しているからです。"
+msgid ""
+"Simulation models of the transmission dynamics and health effects of malaria"
+" are an important tool for malaria control. They can be used to determine "
+"optimal strategies for delivering mosquito nets, chemotherapy, or new "
+"vaccines which are currently under development and testing.  Such modeling "
+"is extremely computer intensive, requiring simulations of large human "
+"populations with a diverse set of parameters related to biological and "
+"social factors that influence the distribution of the disease. "
+msgstr "マラリア対策にとって、マラリアの動的な伝播と健康への影響をシミュレーションするためのモデルは重要な道具です。これらのモデルによっていろいろな対抗手段を提供していく最も良いやり方を決めることに使うことができます。たとえば、蚊帳の配送方針、化学療法、現在開発・検証中の新ワクチンの使い方を最適化するのに使います。 これらのモデリングの手法は非常に大きな計算能力を必要とします。 多くの人口を対象にシミュレーションが必要ですし、 この病気の拡散に影響を与える生物学的因子と社会学的因子が、 数多くのパラメータに関係しているからです。"
 
 #: projects.inc:170
 msgid "University of Washington"
 msgstr "ワシントン大学"
 
-#: projects.inc:171
-#: projects.inc:179
+#: projects.inc:171 projects.inc:179
 msgid "Biology"
 msgstr "生物学"
 
 #: projects.inc:172
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
-msgstr "研究対象の蛋白質が3次元的にどのような形状であるかを決定します。 この仕事は究極的には人間のいくつかの主要な疾病の治療方法を見つけることになるかもしれません。 あなたが Rosetta at home を走らせると、私たちの研究を加速し拡大してくれます。 それはあなたの助力なしにはきっと達成できないものです。 さらに、HIVや、マラリア、癌、そしてアルツハイマー病のような疾病に対抗する、 新しい蛋白質を設計することにも力を貸していただけることになります。 "
+msgid ""
+"Determine the 3-dimensional shapes of proteins in research that may "
+"ultimately lead to finding cures for some major human diseases. By running "
+"Rosetta at home you will help us speed up and extend our research in ways we "
+"couldn't possibly attempt without your help. You will also be helping our "
+"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
+"Cancer, and Alzheimer's"
+msgstr "研究対象の蛋白質が3次元的にどのような形状であるかを決定します。 この仕事は最終的には人間のいくつかの主要な疾病の治療方法を見つけることになるかもしれません。 あなたが Rosetta at home を動作させることによって、私たちの研究を加速し拡大してくれます。 それはあなたの助力なしにはきっと達成できないものです。 さらに、HIVや、マラリア、癌、そしてアルツハイマー病のような疾病に対抗する、 新しい蛋白質を設計することにも力を貸していただけることになります。 "
 
 #: projects.inc:178
 msgid "University of Vienna"
 msgstr "ウィーン大学"
 
 #: projects.inc:180
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
+msgid ""
+"Calculate similarities between proteins. SIMAP provides a public database of"
+" the resulting data, which plays a key role in many bioinformatics research "
+"projects."
 msgstr "蛋白質の相互類似性を計算するプロジェクトです。 SIMAP は計算結果を公開データベースとして提供します。 このデータベースは多くの生命科学研究のプロジェクトで重要な役割を果たします。"
 
 #: projects.inc:186
@@ -503,69 +585,102 @@ msgid "Climate study"
 msgstr "気候の研究"
 
 #: projects.inc:200
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
-msgstr "最先端の気候モデルにおいて必須の近似技術を研究します。 モデルを何千回も実行することによって、近似方法を微調整したときに、 モデルがどのように反応するかを探り出そうとしています。  ここで微調整といっているのは、 近似が現実から離れてしまわないような小さなものです。 このような手法によって、 我々が使っているモデルが小さな変化にどのように敏感であるかという 知識を豊かにします。また、二酸化炭素や硫黄循環での変化についても同様です。 このようにして、次の世紀がどのような気候変化をするか、 いくつものシナリオを広く探求できるようになります。 "
+msgid ""
+"Investigate the approximations that have to be made in state-of-the-art "
+"climate models. By running the model thousands of times we hope to find out "
+"how the model responds to slight tweaks to these approximations - slight "
+"enough to not make the approximations any less realistic. This will allow us"
+" to improve our understanding of how sensitive our models are to small "
+"changes and also to things like changes in carbon dioxide and the sulphur "
+"cycle. This will allow us to explore how climate may change in the next "
+"century under a wide range of different scenarios."
+msgstr "最先端の気候モデルにおいて必須の近似技術を研究します。 モデルを何千回も実行することによって、近似技術を微調整したときに、モデルがどのように反応するかを探り出そうとしています。ここで微調整といっているのは、近似が現実から離れてしまわないような小さなものです。このような手法によって、我々が使っているモデルが小さな変化にどのように敏感であるかという知識を豊かにします。また、二酸化炭素や硫黄循環での変化についても同様です。このようにして、次の世紀がどのような気候変化をするか、いくつものシナリオを広く探求できるようになります。 "
 
 #: projects.inc:207
 msgid "Physical Science"
-msgstr ""
+msgstr "自然科学"
 
 #: projects.inc:213
 msgid "Mechanical engineering"
-msgstr ""
+msgstr "機械工学"
 
 #: projects.inc:214
-msgid "Currently we are calculating the optimum design of a structure call the 52 bar truss"
-msgstr ""
+msgid ""
+"Currently we are calculating the optimum design of a structure call the 52 "
+"bar truss"
+msgstr "現在のところ私達は52本のバートラスと呼ばれる建造物の最適な図案を計算しています。"
 
-#: projects.inc:224
-#: projects.inc:263
-#: projects.inc:271
+#: projects.inc:224 projects.inc:263 projects.inc:271
 msgid "Astronomy"
 msgstr "天文学"
 
 #: projects.inc:225
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
-msgstr ""
+msgid ""
+"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
+"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
+"Universe. We will measure physical parameters (such as stellar mass surface "
+"density, star formation rate surface density, attenuation, and first-order "
+"star formation history) on a resolved pixel-by-pixel basis using spectral "
+"energy distribution (SED) fitting techniques in a distributed computing "
+"mode."
+msgstr "私達は、近くの宇宙における多波長の、光学的には紫外線から近赤外線の銀河アトラスを生成するためにGALEX, Pan-STARRS1, そしてWISEのスペクトル範囲を結合しようとしています。私達は分散コンピューティング方式で、分光エネルギー分布(Spectral Energy Distribution, SED)適合技術を用いて分解された画素単位の基準で物理的パラメータ(星の質量面密度、星形成率の面密度、減衰、そして一次星形成史といったもの)を測定しようとしています。"
 
 #: projects.inc:247
 msgid "University of Texas at Austin"
-msgstr "University of Texas at Austin"
+msgstr "テキサス大学オースティン校"
 
-#: projects.inc:248
-#: projects.inc:279
+#: projects.inc:248 projects.inc:279
 msgid "Chemistry"
 msgstr "化学"
 
 #: projects.inc:249
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
-msgstr "理論化学、圧縮物質の物理学および材料科学の分野での共通問題は、原子スケールの系での時間経過を計算することです。そこでは、たとえば化学反応と拡散が起きています。一般に興味の対象となる事象はとてもまれにしか起きません(原子の振動という動きに比べ大幅に遅いオーダーでしか発生しません)。このため、原子の動きをそのまま追跡するような直接のシミュレーションをすると、興味ある動きがシミュレーションの中で起きるまでに、現状で最速のコンピュータによる計算でも何千年もの時間が掛かってしまうでしょう。われわれの研究グループは系の長期にわたる振る舞いを計算することに興味があります。"
+msgid ""
+"A common problem in theoretical chemistry, condensed matter physics and "
+"materials science is the calculation of the time evolution of an atomic "
+"scale system where, for example, chemical reactions and/or diffusion occur. "
+"Generally the events of interest are quite rare (many orders of magnitude "
+"slower than the vibrational movements of the atoms), and therefore direct "
+"simulations, tracking every movement of the atoms, would take thousands of "
+"years of computer calculations on the fastest present day computer before a "
+"single event of interest can be expected to occur.  Our research group is "
+"interested in calculating the long time dynamics of systems."
+msgstr "理論化学、凝縮系物理学(物性物理学)および物質科学の分野での共通問題は、原子スケールの体系での時間経過を計算することです。そこでは、たとえば化学反応と拡散が起きています。一般に興味の対象となる事象は非常にまれにしか起きません(原子の振動という動きに比べ大幅に遅いオーダーでしか発生しません)。このため、原子の動きをそのまま追跡するような直接のシミュレーションをすると、興味ある動きがシミュレーションの中で起きるまでに、現状で最速のコンピュータによる計算でも何千年もの時間が掛かってしまうでしょう。われわれの研究グループは体系の長期にわたる原動力を計算することに興味があります。"
 
-# 95%
 #: projects.inc:262
-#, fuzzy
 msgid "University of Illinois at Urbana-Champaign"
-msgstr "University of Illinois at Urbana-Chamapign"
+msgstr "イリノイ大学アーバナ・シャンペーン校"
 
 #: projects.inc:264
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
-msgstr "Cosmology at Home の目標は、われわれの宇宙を記述する最も良いモデルを探すこと、および、天文学的な粒子物理の入手可能なデータと整合性のあるモデルがどの範囲であるのかを調べることです。"
+msgid ""
+"The goal of Cosmology at Home is to search for the model that best describes "
+"our Universe and to find the range of models that agree with the available "
+"astronomical particle physics data."
+msgstr "Cosmology at Home の目標は、われわれの宇宙の状況を説明する最良のモデルを探すこと、および、天文学的素粒子物理学の入手可能なデータと一致するモデルの範囲を調べることです。"
 
 #: projects.inc:270
 msgid "Rensselaer Polytechnic Institute"
-msgstr "Rensselaer Polytechnic Institute"
+msgstr "レンセラー工科大学"
 
 #: projects.inc:272
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
-msgstr "Milkyway at Home の目標は、天の川銀河の高精度な三次元モデルを Sloan Digital Survey で収集したデータを使って作成することです。"
+msgid ""
+"The goal of Milkyway at Home is to create a highly accurate three dimensional "
+"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
+"Survey."
+msgstr "Milkyway at Home の目標は、スローン・デジタル・スカイサーベイ(SDSS)で収集したデータを使って、天の川銀河の高精度な三次元モデルを作成することです。"
 
 #: projects.inc:278
 msgid "Leiden University, The Netherlands"
 msgstr "ライデン大学、オランダ"
 
 #: projects.inc:280
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
-msgstr "Classical Dynamics を使い表面科学の計算をすること。 Leiden Classical はボランティアの方、学生の方、そして他の科学者が彼ら個人の計算をこのグリッドで実行することを許します。各利用者は、Classical Dynamics のジョブキューをおのおの持っています。このようにして、学生たちはこのグリッドを使い、実際にシミュレーションをすることにより、液体アルゴンを模擬してみたり、理想気体の法則の有効性をテストしたりしてきました。"
+msgid ""
+"Surface science calculations using Classical Dynamics.  Leiden Classical "
+"allows volunteers, students and other scientist to submit their personal "
+"calculations to the grid. Each user has his own personal queue for Classical"
+" Dynamics jobs. In this way students have used the grid to simulate liquid "
+"argon, or to test the validity of the ideal gas law by actually doing the "
+"simulations through the grid."
+msgstr "古典力学を使って表面科学の計算をすることです。Leiden Classical はボランティアの方、学生の方、そして他の科学者が彼ら個人の計算をこのグリッドで実行することを可能にします。各参加者は、古典力学のジョブキューをおのおの持っています。このようにして、学生たちはこのグリッドを使い、実際にシミュレーションをすることにより、液体アルゴンの模擬実験をしてみたり、理想気体の状態方程式の有効性をテストしたりしてきました。"
 
 #: projects.inc:294
 msgid "Univ. of Wisconsin - Milwaukee, Max Planck Institute"
@@ -573,29 +688,40 @@ msgstr "ウィスコンシン大学 - ミルウォーキー、マックスプラ
 
 #: projects.inc:295
 msgid "Astrophysics"
-msgstr "宇宙物理学"
+msgstr "天体物理学"
 
 #: projects.inc:296
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
-msgstr "自転する中性子星(パルサーとも呼ばれます)を探索するプログラムです。 この計算には、LIGO と GEO という重力波検出器が出力するデータと、Arecibo 電波観測所からのデータを使います。 Einstein at Home は、世界物理年 2005 プロジェクトの一つで、 米国物理学会(APS)を始めとする多くの国際組織によって支援されています。"
-
-#: projects.inc:310
-#: projects.inc:318
+msgid ""
+"Search for spinning neutron stars (also called pulsars) using data from the "
+"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
+"observatory.  Einstein at Home is a World Year of Physics 2005 project "
+"supported by the American Physical Society (APS) and by a number of "
+"international organizations."
+msgstr "回転する中性子星(パルサーとも呼ばれます)を探索します。この計算には、LIGO(ハンフォード天文台)とGEO600(ドイツ)という重力波検出器が出力するデータと、アレシボ天文台からのデータを使います。Einstein at Home は、世界物理年(2005年)プロジェクトの一つで、アメリカ物理学会(APS)を始めとする多くの国際組織によって支援されています。"
+
+#: projects.inc:310 projects.inc:318
 msgid "CERN (European Organization for Nuclear Research)"
 msgstr "CERN(欧州原子核研究機構)"
 
-#: projects.inc:311
-#: projects.inc:319
+#: projects.inc:311 projects.inc:319
 msgid "Physics"
 msgstr "物理学"
 
 #: projects.inc:312
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
-msgstr "LHC(Large Hadron Collider) は、CERN で建設中の素粒子加速器です。 CERN は原子核物理研究のためのヨーロッパの組織で、世界最大の素粒子科学の研究所です。 LHC は素粒子の性質を研究する装置として今までで最強のものです。 LHC at home は LHC とその検出器の設計を改良するためのシミュレーションを実行します。 "
+msgid ""
+"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
+"European Organization for Nuclear Research, the world's largest particle "
+"physics laboratory.  It is the most powerful instrument ever built to "
+"investigate on particles proprieties. LHC at home runs simulations to improve "
+"the design of LHC and its detectors."
+msgstr "大型ハドロン衝突型加速器(The Large Hadron Collider, LHC)は、CERN の加速器です。CERN は原子核研究のためのヨーロッパの組織で、世界最大の素粒子物理学の研究所です。LHC は素粒子の性質を研究する装置として今までで最も強力なものです。LHC at home では LHC とその検出器の設計を改良するためのシミュレーションを実行します。 "
 
 #: projects.inc:320
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
-msgstr ""
+msgid ""
+"This project uses CERN-developed virtual machine technology for full-fledged"
+" LHC event physics simulation on volunteer computers.  Requires that you "
+"install VirtualBox on your computer"
+msgstr "このプロジェクトは、CERNが開発した、ボランティアのコンピュータで大型ハドロン衝突型加速器(LHC)における本格的な事象の物理学シミュレーションのための仮想マシン技術を利用します。コンピュータへのVirtualBoxのインストールが必要とされます。"
 
 #: projects.inc:326
 msgid "University of California, Berkeley"
@@ -603,11 +729,16 @@ msgstr "カリフォルニア大学バークレー校"
 
 #: projects.inc:327
 msgid "Astrophysics, astrobiology"
-msgstr "宇宙物理、宇宙生物学"
+msgstr "天体物理学、天体生物学"
 
 #: projects.inc:328
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
-msgstr "SETI (Search for Extraterrestrial Intelligence) とは、地球外の知的生命を検出することを目的とする科学研究領域です。 Radio SETI として知られているその1つのアプローチでは、 電波望遠鏡を使って宇宙からの狭帯域の電波信号に耳を傾けます。 探している信号は自然に発生すると知られている種類のものではありません。 したがって、そのような信号を検出すれば、地球外生命が持つ技術の証拠となります。"
+msgid ""
+"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
+"goal is to detect intelligent life outside Earth. One approach, known as "
+"radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
+"signals from space. Such signals are not known to occur naturally, so a "
+"detection would provide evidence of extraterrestrial technology."
+msgstr "地球外知的生命体探査(Search for Extraterrestrial Intelligence, SETI)とは、地球外の知的生命を検出することを目的とする科学分野です。 Radio SETI として知られているその1つのアプローチでは、電波望遠鏡を使って宇宙からの狭帯域の電波信号に耳を傾けます。探している信号は自然に発生すると知られている種類のものではありません。したがって、そのような信号を検出すれば、地球外生物が持つ技術の証拠となります。"
 
 #: projects.inc:342
 msgid "Bielefeld University of Applied Sciences"
@@ -615,11 +746,15 @@ msgstr "Bielefeld University of Applied Sciences"
 
 #: projects.inc:343
 msgid "Chemical engineering and nanotechnology"
-msgstr "化学工業とナノテクノロジー"
+msgstr "化学工学とナノテクノロジー"
 
 #: projects.inc:344
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
-msgstr "分子磁石とナノスケール磁化の制御の研究。これらの磁化した分子は、小さい磁気スイッチを開発したり、医学応用(たとえば局所腫瘍化学療法)とバイオテクノロジーへの応用に使えるかもしれません。"
+msgid ""
+"The study of molecular magnets and controlled nanoscale magnetism.  These "
+"magnetic molecules may be used to develop tiny magnetic switches, with "
+"applications in medicine (such as local tumor chemotherapy) and "
+"biotechnology."
+msgstr "分子磁石とナノスケール磁化の制御の研究です。これらの磁化した分子は、医療(たとえば局所腫瘍化学療法)やバイオテクノロジーに応用できるごく小さい磁気スイッチを開発するために使用することができるかもしれません。"
 
 #: projects.inc:351
 msgid "Multiple applications"
@@ -631,32 +766,40 @@ msgstr "中国科学院(Chinese Academy of Sciences)"
 
 #: projects.inc:357
 msgid "Physics, biochemistry, and others"
-msgstr "物理学、生命化学、ほか"
+msgstr "物理学、生化学、およびその他"
 
 #: projects.inc:358
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
-msgstr "CAS at home の目的は、中国の科学者たちが自分らの研究に関するボランティアコンピューティングとボランティア考察活動へ向けて、鼓舞・支援されることです。"
+msgid ""
+"The objective of CAS at home is to encourage and assist scientists in China to "
+"adopt the technologies of volunteer computing and volunteer thinking for "
+"their research."
+msgstr "CAS at home の目的は、中国の科学者たちが自分らの研究のためにボランティア・コンピューティングの技術やボランティアの意見を採用することを促進・援助することです。"
 
 #: projects.inc:365
 msgid "Mathematics, physics, evolution"
-msgstr "数学、物理学、進化学"
+msgstr "数学、物理学、進化生物学"
 
 #: projects.inc:366
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
-msgstr "Yoyo at home は BOINC と数種の既存ボランティアプロジェクトの間に入るアダプタです。その既存プロジェクトとは、ECM、Muon、Evolution at home、および distributed.net です。"
+msgid ""
+"Yoyo at home is an adapter between BOINC and several existing volunteer "
+"computing projects: ECM, Muon, Evolution at home, and distributed.net"
+msgstr "Yoyo at home は BOINC と数種の既存ボランティアプロジェクトである ECM、Muon、Evolution at home、および distributed.net の間に入るアダプタです。"
 
-#: projects.inc:371
-#: projects.inc:527
+#: projects.inc:371 projects.inc:527
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 msgstr "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (ハンガリー)"
 
 #: projects.inc:372
 msgid "European research projects"
-msgstr "European research projects"
+msgstr "ヨーロッパの研究プロジェクト"
 
 #: projects.inc:373
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
-msgstr "ヨーロッパ・サービス・グリッドがそのワークユニットをこの EDGeS at Home ベータ・プロジェクトへ送ることができるようにしました。このプロジェクトは、ボランティアの方々へそれらのワークユニットを中継して計算してもらうことにより、ボランティア・コンピューティングをサービスグリッドのネットワークに統合しています。当プロジェクトが対応している科学プロジェクトは、数学、物理学、生物学などの分野のものがあります。"
+msgid ""
+"The EDGeS at Home Beta project integrates volunteer computing into the service "
+"grid network of Europe by allowing service grids to send workunits to be "
+"processed by the volunteers of this project. The scientific projects covered"
+" by the project include math, physics, biology, etc."
+msgstr "EDGeS at Home ベータ・プロジェクトは、サービスグリッドがこのプロジェクトのボランティアによって処理されるワークユニットを送信できるようにすることで、ヨーロッパ・サービス・グリッド・ネットワークへのボランティア・コンピューティングへ統合しています。当プロジェクトが対象とする科学プロジェクトは、数学、物理学、生物学などの分野を含みます。"
 
 #: projects.inc:379
 msgid "Spanish universities and research centers"
@@ -664,61 +807,62 @@ msgstr "スペインの大学と研究所群"
 
 #: projects.inc:380
 msgid "Various Spanish research projects"
-msgstr "スペインにおける種々の研究プロジェクト"
+msgstr "スペインにおける様々な研究プロジェクト"
 
 #: projects.inc:381
 msgid "Research in physics, material science, and biomedicine"
-msgstr "物理学、材料科学および生物医学における研究"
+msgstr "物理学、物質科学および生体臨床医学における研究"
 
 #: projects.inc:387
 msgid "IBM Corporate Citizenship"
-msgstr ""
+msgstr "IBMによる企業市民活動"
 
 #: projects.inc:388
 msgid "Medical, environmental and other humanitarian research"
-msgstr ""
+msgstr "医療、環境保護そのほか人類に影響するものの研究"
 
 #: projects.inc:389
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
-msgstr ""
+msgid ""
+"To further critical non-profit research on some of humanity's most pressing "
+"problems by creating the world's largest volunteer computing grid.  Research"
+" includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"clean water and many more."
+msgstr "世界最大のボランティア・コンピューティング・グリッドを作り出すことによって、人類の最も差し迫った問題のいくつかの重要な非営利研究を助成します。研究は HIV・エイズ、ガン、熱帯性の顧みられない疾病、太陽エネルギー、きれいな水その他多くを含みます。"
 
 #: projects.inc:395
 msgid "Mathematics, computing, and games"
-msgstr "Mathematics, computing, and games"
+msgstr "数学、コンピューティング、およびゲーム"
 
 #: projects.inc:401
 msgid "Computer Science"
-msgstr ""
+msgstr "計算機科学"
 
 #: projects.inc:409
 msgid "Mathematics, Physics, Artificial Intelligence"
-msgstr ""
+msgstr "数学、物理学、人工知能"
 
 #: projects.inc:410
 msgid "Simulation of quantum computing; Goldbach's conjecture."
-msgstr ""
+msgstr "量子コンピューティングのシミュレーション、ゴールドバッハの予想です。"
 
-#: projects.inc:450
-#: projects.inc:458
+#: projects.inc:450 projects.inc:458
 msgid "Cryptography"
-msgstr "暗号学"
+msgstr "暗号理論"
 
 #: projects.inc:459
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
-msgstr "本物のEnigmaメッセージ3つの解読を試みます。これらの信号文は1942年に北大西洋で傍受されましたが、まだ解読されていないと信じられています。"
-
-#: projects.inc:465
-#: projects.inc:504
-#: projects.inc:512
-#: projects.inc:520
-#: projects.inc:528
-#: projects.inc:568
+msgid ""
+"Attempt to decode 3 original Enigma messages. The signals were intercepted "
+"in the North Atlantic in 1942 and are believed to be unbroken."
+msgstr "3つの本物のエニグマ(Enigma)メッセージの解読を試みます。これらの信号文は1942年に北大西洋で傍受されましたが、まだ解読されていないと信じられています。"
+
+#: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
+#: projects.inc:528 projects.inc:568
 msgid "Mathematics"
 msgstr "数学"
 
 #: projects.inc:466
 msgid "Study the Collatz Conjecture, an unsolved conjecture in mathematics"
-msgstr "数学で未解決の予想として有名は、コラッツの予想の研究"
+msgstr "数学上の未解決予想である、コラッツの予想を研究します"
 
 #: projects.inc:471
 msgid "California State University Fullerton"
@@ -729,276 +873,75 @@ msgid "Factorization of large integers"
 msgstr "大きな整数の因数分解"
 
 #: projects.inc:473
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
-msgstr "NFS@Homeは、巨大整数を数体篩法(Number Field Sieve)で因数分解する処理のうち、格子篩(lattice sieving)の部分を計算するところにインターネットで相互接続されたコンピューターを使うという研究プロジェクトです。若い学生のころには、あなたもある整数値を素因数に分解したことがあるでしょう。たとえば、15 = 3 * 5 あるいは、35 = 5 * 7 のように。NFS at Home はその経験の延長上にあるものです。ただし、問題となる整数値は何百桁もの長さの整数ですが。"
+msgid ""
+"NFS at Home is a research project that uses Internet-connected computers to do "
+"the lattice sieving step in the Number Field Sieve factorization of large "
+"integers. As a young school student, you gained your first experience at "
+"breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
+"NFS at Home is a continuation of that experience, only with integers that are "
+"hundreds of digits long."
+msgstr "NFS@Home は、大きな整数を数体ふるい法(Number Field Sieve)で因数分解する処理のうち、格子ふるい(lattice sieving)の部分を計算する段階にインターネットに接続されたコンピュータを使うという研究プロジェクトです。若い学生のころには、あなたもある整数を素因数に分解したことがあるでしょう。たとえば、15 = 3 * 5 あるいは、35 = 5 * 7 のように。NFS at Home はその経験の延長上にあるものです。ただその整数が何百桁もの長さの整数であるというだけです。"
 
 #: projects.inc:479
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
-msgstr "Vilnius Gediminas Technical University and Kaunas University of Technology (リトアニア; Lithuania)"
+msgid ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
+msgstr "Vilnius Gediminas Technical University and Kaunas University of Technology (リトアニア)"
 
 #: projects.inc:480
 msgid "Software testing"
 msgstr "ソフトウェアのテスト"
 
 #: projects.inc:481
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
-msgstr "このプロジェクトの目的は、 Vilnius Gediminas Technical University (VGTU)及びその他リトアニアの学術組織へ、パワフルな分散コンピューティング・プラットフォームを提供することです。現在の応用分野には、モンテカルロ法によるソフトウェア試験の研究があります。"
+msgid ""
+"The aim of this project is to provide a powerful distributed computing "
+"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
+"well as others Lithuanian academic institutions.  Current applications "
+"involve the study of Monte-Carlo based software testing."
+msgstr "このプロジェクトの目的は、ヴィリニュス・ゲディミナス工科大学(VGTU)およびその他リトアニアの学術機関へ、強力な分散コンピューティング・プラットフォームを提供することです。現在の応用分野には、モンテカルロ法によるソフトウェア検査の研究が含まれます。"
 
 #: projects.inc:503
 msgid "Mathematical Institute of Leiden University / Kennislink"
 msgstr "ライデン大学数学研究所とKennislink"
 
 #: projects.inc:505
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
-msgstr "’abc-triples’ を探します。’abc-triples’ とは 3つの正整数 a b c で、a + b = c  かつ、a < b かつ、b < c  かつ、a b c が互いに素であり、c >  rad(abc) であるようなものです。ただしここで rad( n ) とは、n の互いに異なる個々の素因数の積です。ABC 予想とは、h > 1 のどのような実数 h についても、log( c ) / log( rad( abc ) ) > h  となるような a, b, c の組はたかだか有限個しかないという予想です。 これが正しいと証明されると、まだ解決をみていない多くの数学の問題に答えをここから直接に与えることができます。"
+msgid ""
+"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
+"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
+"product of the distinct prime factors of n. The ABC conjecture says that "
+"there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for "
+"any real h > 1. The ABC conjecture is currently one of the greatest open "
+"problems in mathematics. If it is proven to be true, a lot of other open "
+"problems can be answered directly from it."
+msgstr "「abc-triples」を探します。「abc-triples」とは、3つの正の整数を a, b, c とするとき、a + b = c  かつ、a < b < c  かつ、a, b, c が互いに素であり、c > rad(abc) であるようなものです。ただしここで rad( n) とは、n の互いに異なる個々の素因数の積です。ABC予想とは、h > 1 のどのような実数 h についても、log(c) / log(rad(abc)) > h となるような a, b, c の組はたかだか有限個しかないという予想です。ABC予想は現在多数ある数学の未解決問題のうちのひとつです。これが正しいと証明されると、まだ未解決の多くの数学の問題に答えをここから直接与えることができます。"
 
 #: projects.inc:513
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
-msgstr ""
+msgid ""
+"Primegrid has multiple projects searching for different forms of very large "
+"prime numbers, including searching for the largest known prime number."
+msgstr "Primegrid は違う形でとても大きな素数(既知の最大の素数を探すことも含まれます)の探索をしている複数のプロジェクトを有します。"
 
 #: projects.inc:519
 msgid "Hochschule RheinMain University of Applied Sciences"
 msgstr "Hochschule RheinMain University of Applied Sciences"
 
 #: projects.inc:521
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
+msgid ""
+"Search for counterexamples to two conjectures related to the identification "
+"of prime numbers"
 msgstr "素数判定法に関する2つの予想について反例を探します。"
 
 #: projects.inc:529
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
-msgstr "このプロジェクトは、一般化された 2進数系を11次元まですべて探すことを目的にしています。 "
+msgid ""
+"Find all the generalized binary number systems (in which bases are matrices "
+"and digits are vectors) up to dimension 11."
+msgstr "一般化された2進数系(この場合、ベースが配列で、桁がベクトル)を11次元まですべて探り出します。"
 
 #: ../html/inc/news.inc:40
 msgid "Comment"
-msgstr ""
+msgstr "コメント"
 
 #: ../html/inc/news.inc:111
 #, php-format
 msgid "News is available as an %sRSS feed%s"
-msgstr ""
-
-# 75%
-#, fuzzy
-#~ msgid "Astronomy, Physics, and Chemistry"
-#~ msgstr "天文学、物理学、化学"
-
-#, php-format
-#~ msgid "%s for %s (%s MB)"
-#~ msgstr "%s 版 %s 用 (%s MB)"
-#~ msgid ""
-#~ "BOINC is a program that lets you donate your idle computer time to science "
-#~ "projects like SETI at home, Climateprediction.net, Rosetta at home, World "
-#~ "Community Grid, and many others. <p> After installing BOINC on your "
-#~ "computer, you can connect it to as many of these projects as you like."
-#~ msgstr ""
-#~ " BOINC はあなたのコンピュータの空き時間を、色々な科学プロジェクトに寄付するために使えるプログラムです。 "
-#~ "それらの科学プロジェクトとしては、SETI at home、Climateprediction.net、Rosetta at home、World "
-#~ "Community Grid など、すでにたくさんのものがあります。 <p>あなたのコンピュータに BOINC  "
-#~ "のインストールが済めば、上記のプロジェクトのいくつにでも好きなだけつなげることができます。 "
-#~ msgid "Browser default"
-#~ msgstr "ブラウザのデフォルト"
-
-#, php-format
-#~ msgid ""
-#~ " Use the idle time on your computer (Windows, Mac, or Linux) to cure "
-#~ "diseases, study global warming, discover pulsars, and do many other types of "
-#~ "scientific research.  It's safe, secure, and easy:  %sChoose%s projects  "
-#~ "%sDownload%s and run BOINC software  %sEnter%s an email address and "
-#~ "password. "
-#~ msgstr ""
-#~ "あなたのコンピュータの空き時間を、病気を治すためや、地球温暖化を研究するため、 "
-#~ "パルサーを発見するため、そしてその他たくさんの種類の科学研究のために使ってください。 (コンピュータは、Windows、Mac、Linux "
-#~ "のどれでも大丈夫です)。  やり方は以下のように簡単で、安全かつ安心です。 %s プロジェクトを選択し%s、 %s BOINC ソフトウェアを "
-#~ "ダウンロード%s して走らせます。  %s その後、入力 %s する必要があるのは、あなたのメイルアドレスとパスワードです。"
-#~ msgid "IBM Corporate Community Relations"
-#~ msgstr "IBM Corporate Community Relations"
-#~ msgid "Humanitarian research on disease, natural disasters and hunger."
-#~ msgstr "病気、自然災害および飢餓に対する人道的研究"
-#~ msgid ""
-#~ "To further critical non-profit research on some of humanity's most "
-#~ "pressing problems by creating the world's largest volunteer computing "
-#~ "grid.  Research includes HIV/AIDS, cancer, muscular dystrophy, dengue "
-#~ "fever, and many more."
-#~ msgstr ""
-#~ "世界最大のボランティア・コンピューティング・グリッドを作りだすことにより、"
-#~ "人類にとって最も差し迫った諸問題のいくつかに対して、非営利の重要な研究をこ"
-#~ "のプロジェクトは推し進めます。研究には、HIV/AIDSや癌、筋ジストロフィー、デ"
-#~ "ング熱など多くのものを含みます。"
-#~ msgid ""
-#~ "Primegrid is generating a public sequential prime number database, and is "
-#~ "searching for large twin primes of the form k*2<sup>n</sup>+1 and "
-#~ "k*2<sup>n</sup>-1"
-#~ msgstr ""
-#~ "Primegrid は, 昇順に並んだ素数の公開データベースを生成しています。そして、"
-#~ "k*2<sup>n</sup>+1 と k*2<sup>n</sup> の形をした大きな双子素数を探していま"
-#~ "す。"
-#~ msgid "FreeHAL"
-#~ msgstr "FreeHAL"
-#~ msgid "private"
-#~ msgstr "非公開"
-#~ msgid "POEM at HOME"
-#~ msgstr "POEM at HOME"
-#~ msgid "Docking at Home"
-#~ msgstr "Docking at Home"
-#~ msgid "GPUGrid.net"
-#~ msgstr "GPUGrid.net"
-#~ msgid "Superlink at Technion"
-#~ msgstr "Superlink at Technion"
-#~ msgid "The Lattice Project"
-#~ msgstr "The Lattice Project"
-#~ msgid "Malariacontrol.net"
-#~ msgstr "Malariacontrol.net"
-#~ msgid "Rosetta at home"
-#~ msgstr "Rosetta at home"
-#~ msgid "SIMAP"
-#~ msgstr "SIMAP"
-#~ msgid "Virtual Prairie"
-#~ msgstr "Virtual Prairie"
-#~ msgid "University of Houston"
-#~ msgstr "ヒューストン大学"
-#~ msgid "Study of botanical ecosystems"
-#~ msgstr "植物圏エコシステムの研究"
-#~ msgid ""
-#~ "Provide ecological guidelines on the design of prairies with the best "
-#~ "potential for water purification."
-#~ msgstr ""
-#~ "水浄化のために最も有望となるようにプレーリー地帯を設計することについて、 "
-#~ "生態学的ガイドラインを提供します。"
-#~ msgid "Climateprediction.net"
-#~ msgstr "Climateprediction.net"
-#~ msgid "Astronomy/Physics/Chemistry"
-#~ msgstr "天文学、物理学、化学"
-#~ msgid "eOn"
-#~ msgstr "eOn"
-#~ msgid "Orbit at home"
-#~ msgstr "Orbit at home"
-#~ msgid "Planetary Science Institute"
-#~ msgstr "Planetary Science Institute"
-#~ msgid "Monitor and study the hazard posed by near-Earth asteroids"
-#~ msgstr "地球に近い小惑星が引き起こす危険を監視および研究する"
-#~ msgid "Cosmology at Home"
-#~ msgstr "Cosmology at Home"
-#~ msgid "University of Illinois at Urbana-Chamapign"
-#~ msgstr "University of Illinois at Urbana-Chamapign"
-#~ msgid "Milkyway at home"
-#~ msgstr "Milkyway at home"
-#~ msgid "Leiden Classical"
-#~ msgstr "Leiden Classical"
-#~ msgid "uFluids at home"
-#~ msgstr "uFluids at home"
-#~ msgid "Purdue University"
-#~ msgstr "パーデュー大学"
-#~ msgid "Physics/Aeronautics"
-#~ msgstr "物理学/宇宙航法学"
-#~ msgid ""
-#~ "The uFluids project simulates two-phase fluid behavior in microgravity "
-#~ "and microfluidics problems. Our goal is to design better satellite "
-#~ "propellant management devices and address two-phase flow in microchannel "
-#~ "and MEMS devices."
-#~ msgstr ""
-#~ "この uFluids プロジェクトは 微小重力およびマイクロフルイディクス(微小流体"
-#~ "を扱う先端技術)における 2相液体の振る舞いをシミュレートします。われわれの"
-#~ "目標は、人工衛星のより良い推進剤管理装置を設計すること、そして、マイクロ"
-#~ "チャネル(微小流体通路)とMEMSデバイスの中での 2相流の問題を解決することで"
-#~ "す。"
-#~ msgid "Einstein at home"
-#~ msgstr "Einstein at home"
-#~ msgid "LHC at home"
-#~ msgstr "LHC at home"
-#~ msgid "SETI at home"
-#~ msgstr "SETI at home"
-#~ msgid "Quantum Monte Carlo at Home"
-#~ msgstr "Quantum Monte Carlo at Home"
-#~ msgid "University of Muenster (Germany)"
-#~ msgstr "ミュンスター大学(ドイツ)"
-#~ msgid ""
-#~ "Study the structure and reactivity of molecules using Quantum Chemistry."
-#~ msgstr "量子化学を用いて分子の構造と反応性を研究します。"
-#~ msgid "Spinhenge at home"
-#~ msgstr "Spinhenge at home"
-#~ msgid "CAS at home"
-#~ msgstr "CAS at home"
-#~ msgid "Yoyo at home"
-#~ msgstr "Yoyo at home"
-#~ msgid "EDGeS at Home"
-#~ msgstr "EDGeS at Home"
-#~ msgid "Ibercivis"
-#~ msgstr "Ibercivis"
-#~ msgid "World Community Grid"
-#~ msgstr "World Community Grid"
-#~ msgid "Enigma at Home"
-#~ msgstr "Enigma at Home"
-#~ msgid "Collatz Conjecture"
-#~ msgstr "Collatz Conjecture(コラッツの予想)"
-#~ msgid "NFS at home"
-#~ msgstr "NFS at home"
-#~ msgid "VTU at home"
-#~ msgstr "VTU at home"
-#~ msgid "AQUA at home"
-#~ msgstr "AQUA at home"
-#~ msgid "D-Wave Systems, Inc."
-#~ msgstr "D-Wave Systems, Inc."
-#~ msgid "Quantum computing"
-#~ msgstr "量子計算"
-#~ msgid ""
-#~ "D-Wave's AQUA (Adiabatic QUantum Algorithms) is a research project whose "
-#~ "goal is to predict the performance of superconducting adiabatic quantum "
-#~ "computers on a variety of hard problems arising in fields ranging from "
-#~ "materials science to machine learning. AQUA at home uses Internet-connected "
-#~ "computers to help design and analyze quantum computing algorithms, using "
-#~ "Quantum Monte Carlo techniques."
-#~ msgstr ""
-#~ "D-Wave's AQUA (Adiabatic QUantum Algorithms)は、材料科学から機械学習にいた"
-#~ "る研究領域の種々の難問題に対して、超伝導-断熱-量子コンピュータが発揮する性"
-#~ "能を予測することを目標とする研究プロジェクトです。AQUA at home は、量子モンテ"
-#~ "カルロ法を使って、量子計算アルゴリズムを設計・分析することを支援するため"
-#~ "に、インターネットで接続されたコンピューターを使います。"
-#~ msgid "ABC at home"
-#~ msgstr "ABC at home"
-#~ msgid "PrimeGrid"
-#~ msgstr "PrimeGrid"
-#~ msgid "primaboinca"
-#~ msgstr "primaboinca"
-#~ msgid "SZTAKI Desktop Grid"
-#~ msgstr "SZTAKI デスクトップ・グリッド"
-#~ msgid "Chess960 at home"
-#~ msgstr "Chess960 at home"
-#~ msgid "Chess-960.org"
-#~ msgstr "Chess-960.org"
-#~ msgid "Game-playing"
-#~ msgstr "ゲーム"
-#~ msgid ""
-#~ "This project studies Chess 960, a variant of orthodox chess. In classical "
-#~ "chess the starting position of the game never changes.  In Chess 960, "
-#~ "just before the start of every game, the initial configuration of the "
-#~ "chess pieces is determined randomly."
-#~ msgstr ""
-#~ "このプロジェクトは Chess 960 というものを研究します。 これは伝統的なチェス"
-#~ "の変種です。従来のチェスは開始時のコマの配置はいつも同じで変わりません。 "
-#~ "Chess 960 ではゲーム開始直前にコマの配置が無作為に選ばれます。"
-#~ msgid "The current release is known to work with these Linux versions:"
-#~ msgstr "現在の版は右の版の Linux で動作することがわかっています:"
-#~ msgid ""
-#~ "For other Linux versions, check if a BOINC package is offered by your "
-#~ "Linux distribution."
-#~ msgstr ""
-#~ "その他の版の Linux については、対象の Linux ディストリビューションに "
-#~ "BOINC パッケージが入っていないか調べてみてください。"
-#~ msgid ""
-#~ "Alternatively, download the %1BOINC client for older Linux versions%2. "
-#~ "This doesn't have a graphical interface, but it should work on all Linux "
-#~ "systems, both x86 and x64."
-#~ msgstr ""
-#~ "その他の方法としては、%1古い Linux用の BOINC クライアント%2 をダウンロード"
-#~ "するという手があります。 この場合、グラフィカルインタフェースは使えないも"
-#~ "のの、おそらく x86 及び x64 の全ての Linux システムで動作するはずです。"
-#~ msgid ""
-#~ "Note: if your computer is equipped with an Graphics Processing Unit "
-#~ "(GPU), you may be able to %suse it to compute faster%s"
-#~ msgstr ""
-#~ "注: あなたのコンピュータに NVIDIA 社の GPU(Graphics Processing Unit) がつ"
-#~ "いているなら、%sそれを使ってより速く計算する%s ことができるかもしれませ"
-#~ "ん。"
-#~ msgid "TeraFLOPS."
-#~ msgstr "テラFLOPS。"
-
+msgstr "ニュースは、%sRSSフィード%s で読めます"
diff --git a/locale/ko/BOINC-Client.mo b/locale/ko/BOINC-Client.mo
index 3be6109..4973e44 100644
Binary files a/locale/ko/BOINC-Client.mo and b/locale/ko/BOINC-Client.mo differ
diff --git a/locale/ko/BOINC-Client.po b/locale/ko/BOINC-Client.po
old mode 100755
new mode 100644
index ab48797..f5a8dc0
--- a/locale/ko/BOINC-Client.po
+++ b/locale/ko/BOINC-Client.po
@@ -1,24 +1,23 @@
 # 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: BOINC 7.4\n"
+"Project-Id-Version: boinc\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-10-15 22:25-0700\n"
-"PO-Revision-Date: 2015-02-11 17:18-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: ko\n"
+"PO-Revision-Date: 2015-02-08 22:37+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\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"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: acct_mgr.cpp:450
-#: acct_mgr.cpp:459
+#: acct_mgr.cpp:450 acct_mgr.cpp:459
 msgid "Message from account manager"
 msgstr "계정 관리자에서 온 메세지"
 
@@ -27,7 +26,9 @@ msgid "Message from server"
 msgstr "서버에서 온 메세지"
 
 #: client_state.cpp:258
-msgid "Some tasks need more memory than allowed by your preferences.  Please check the preferences."
+msgid ""
+"Some tasks need more memory than allowed by your preferences.  Please check "
+"the preferences."
 msgstr "어떤 태스크는 환경설정 허용치보다 더 많은 메모리를 필요로 합니다. 환경설정을 확인하세요."
 
 #: client_state.cpp:520
@@ -40,11 +41,12 @@ 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"
+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
+#: cs_statefile.cpp:828 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
 msgstr "app_info.xml에서 구문 오류 발견"
 
@@ -56,18 +58,15 @@ msgstr "app_info.xml에 파일 참조 위치가 존재하지 않음: "
 msgid "A new version of BOINC is available."
 msgstr "BOINC 새 버전이 출시되었습니다."
 
-#: current_version.cpp:94
-#: current_version.cpp:102
+#: current_version.cpp:94 current_version.cpp:102
 msgid "Download"
 msgstr "다운로드"
 
-#: log_flags.cpp:269
-#: log_flags.cpp:449
+#: 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
+#: log_flags.cpp:423 log_flags.cpp:475
 msgid "Unrecognized tag in cc_config.xml"
 msgstr "cc_config.xml에 유효하지 않은 태그 발견"
 
@@ -92,7 +91,9 @@ 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."
+msgid ""
+"The project has changed its security key.  Please remove and add this "
+"project."
 msgstr "프로젝트 안전 키가 바꼈습니다. 프로젝트를 삭제하고 다시 추가하세요."
 
 #: ../sched/handle_request.cpp:943
@@ -104,7 +105,8 @@ msgid "This project doesn't support CPU type"
 msgstr "이 프로젝트는 해당 CPU를 지원하지 않습니다"
 
 #: ../sched/handle_request.cpp:993
-msgid "Your BOINC client software is too old.  Please install the current version."
+msgid ""
+"Your BOINC client software is too old.  Please install the current version."
 msgstr "BOINC 클라이언트 소프트웨어가 오래되었습니다. 최신 버전을 설치하세요."
 
 #: ../sched/handle_request.cpp:1259
@@ -112,15 +114,19 @@ 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"
+msgid ""
+"Upgrade to the latest driver to process tasks using your computer's GPU"
 msgstr "해당 컴퓨터의 GPU로 태스크를 처리하려면 최신 드라이버로 업그레이드하세요"
 
 #: ../sched/sched_send.cpp:1099
-msgid "Upgrade to the latest driver to use all of this project's GPU applications"
+msgid ""
+"Upgrade to the latest driver to use all of this project's GPU applications"
 msgstr "이 프로젝트의 GPU 응용 프로그램을 사용하려면 최신 드라이버로 업그레이드하세요"
 
 #: ../sched/sched_send.cpp:1118
-msgid "A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to the current version"
+msgid ""
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to"
+" the current version"
 msgstr "NVIDIA GPU를 사용하려면 더 높은 BOINC 버전이 필요합니다. 최신 버전으로 업그레이드하세요"
 
 #: ../sched/sched_send.cpp:1146
@@ -142,7 +148,8 @@ msgstr "더 높은 BOINC 버전이 필요합니다. 최신 버전을 설치하
 
 #: ../sched/sched_send.cpp:1305
 #, c-format
-msgid "Tasks for %s are available, but your preferences are set to not accept them"
+msgid ""
+"Tasks for %s are available, but your preferences are set to not accept them"
 msgstr "%s용 태스크가 있습니다. 그러나 환경 설정에서 사용이 허가되지 않았습니다"
 
 #: ../sched/sched_types.cpp:254
@@ -152,19 +159,3 @@ 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에 사용 가능한 버전이 없음 :"
-
-#~ msgid "An NVIDIA or ATI GPU is required to run tasks for this project"
-#~ msgstr "이 프로젝트의 태스크를 실행하려면 NVIDIA나 ATI GPU가 필요합니다"
-#~ msgid "An NVIDIA GPU is required to run tasks for this project"
-#~ msgstr "이 프로젝트의 태스크를 실행하려면 NVIDIA GPU가 필요합니다"
-#~ msgid ""
-#~ "Tasks for NVIDIA GPU are available, but your preferences are set to not "
-#~ "accept them"
-#~ msgstr ""
-#~ "NVIDIA GPU용 태스크가 있습니다. 그러나 환경 설정에서 승인되지 않았습니다"
-#~ msgid ""
-#~ "Tasks for ATI GPU are available, but your preferences are set to not "
-#~ "accept them"
-#~ msgstr ""
-#~ "ATI GPU용 태스크가 있습니다. 그러나 환경 설정에서 승인되지 않았습니다"
-
diff --git a/locale/ko/BOINC-Manager.mo b/locale/ko/BOINC-Manager.mo
index 137d4d4..42a9088 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 fdbced9..da127fa 100644
--- a/locale/ko/BOINC-Manager.po
+++ b/locale/ko/BOINC-Manager.po
@@ -1,60 +1,61 @@
 # 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: BOINC 7.4\n"
+"Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-15 14:15-0500\n"
-"PO-Revision-Date: 2015-02-11 17:20-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: ko\n"
+"POT-Creation-Date: 2015-03-24 13:36-0500\n"
+"PO-Revision-Date: 2015-04-01 11:10+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc_7.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-POOTLE-MTIME: 1418906230.0\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\n"
+"X-Poedit-Country: UNITED STATES\n"
+"X-Poedit-Language: English\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"
 
-#: clientgui/AccountInfoPage.cpp:387
+#: clientgui/AccountInfoPage.cpp:361
 #, c-format
 msgid "Identify your account at %s"
 msgstr "%s에서 계정을 확인합니다"
 
-#: clientgui/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 ""
-"계정 정보를 입력해주세요\n"
-"(계정을 만드시려면, 프로젝트 웹 사이트를 방문해 주세요)"
+msgstr "계정 정보를 입력해주세요\n(계정을 만드시려면, 프로젝트 웹 사이트를 방문해 주세요)"
 
-#: clientgui/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 ""
-"이 프로젝트는 현재 새로운 계정을 만들 수 없습니다.\n"
-"이미 계정을 갖고 계신 경우에 한해서 추가할 수 있습니다."
+msgstr "이 프로젝트는 현재 새로운 계정을 만들 수 없습니다.\n이미 계정을 갖고 계신 경우에 한해서 추가할 수 있습니다."
 
-#: clientgui/AccountInfoPage.cpp:401
+#: clientgui/AccountInfoPage.cpp:375
 msgid "Are you already running this project?"
 msgstr "이미 이 프로젝트를 수행하고 계십니까?"
 
-#: clientgui/AccountInfoPage.cpp:405
+#: clientgui/AccountInfoPage.cpp:379
 msgid "&No, new user"
 msgstr "아니오, 새로운 사용자 입니다"
 
-#: clientgui/AccountInfoPage.cpp:408
+#: clientgui/AccountInfoPage.cpp:382
 msgid "&Yes, existing user"
 msgstr "예, 기존 사용자 입니다"
 
-#: clientgui/AccountInfoPage.cpp:413
+#: clientgui/AccountInfoPage.cpp:387
 msgid ""
 "We were not able to set up your account information\n"
 "automatically.\n"
@@ -62,126 +63,114 @@ msgid ""
 "Please click on the 'Find login information' link\n"
 "below to find out what to put in the email address and\n"
 "password fields."
-msgstr ""
-"자동적으로 사용자 계정 정보를 설정할려고 했으나\n"
-"실패했습니다.\n"
-"\n"
-"'로그인 정보 찾기' 링크를 클릭하십시오\n"
-"그 후에 찾고자 하는 계정의 email 주소와 비밀번호 칸을\n"
-"채우신 후에 찾으십시오."
+msgstr "자동적으로 사용자 계정 정보를 설정할려고 했으나\n실패했습니다.\n\n'로그인 정보 찾기' 링크를 클릭하십시오\n그 후에 찾고자 하는 계정의 email 주소와 비밀번호 칸을\n채우신 후에 찾으십시오."
 
-#: clientgui/AccountInfoPage.cpp:416
+#: clientgui/AccountInfoPage.cpp:390
 msgid "Find login information"
 msgstr "로그인 정보 찾기"
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:649
+#: clientgui/AccountInfoPage.cpp:410 clientgui/AccountInfoPage.cpp:632
 msgid "&Password:"
 msgstr "비밀번호:"
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:673
+#: clientgui/AccountInfoPage.cpp:417 clientgui/AccountInfoPage.cpp:656
 msgid "Choose a &password:"
 msgstr "비밀번호를 입력하세요:"
 
-#: clientgui/AccountInfoPage.cpp:446
+#: clientgui/AccountInfoPage.cpp:420
 msgid "C&onfirm password:"
 msgstr "비밀번호 확인:"
 
-#: clientgui/AccountInfoPage.cpp:453
+#: clientgui/AccountInfoPage.cpp:427
 #, c-format
 msgid "Are you already running %s?"
 msgstr "여러분은 이미 %s를(을) 실행하고 있습니까?"
 
-#: clientgui/AccountInfoPage.cpp:482
+#: clientgui/AccountInfoPage.cpp:456
 msgid "&Username:"
 msgstr "사용자 이름:"
 
-#: clientgui/AccountInfoPage.cpp:511
+#: clientgui/AccountInfoPage.cpp:485
 msgid "&Email address or LDAP ID:"
-msgstr "이메일주소(&E) 또는 LDAP ID:"
+msgstr "&Email 주소 혹은 LDAP ID:"
 
-#: clientgui/AccountInfoPage.cpp:515
+#: clientgui/AccountInfoPage.cpp:489
 msgid "&Email address:"
 msgstr "&Email 주소:"
 
-#: clientgui/AccountInfoPage.cpp:523
+#: clientgui/AccountInfoPage.cpp:497
 #, c-format
 msgid "minimum length %d"
 msgstr "최소 %d 이상"
 
-#: clientgui/AccountInfoPage.cpp:530
+#: clientgui/AccountInfoPage.cpp:504
 msgid "Forgot your password?"
 msgstr "비밀번호를 잊어버렸습니까?"
 
-#: clientgui/AccountInfoPage.cpp:537
+#: 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 ""
-"아직 해당 계정 관리자에 등록하시지 않으셨다면 진행하기\n"
-"전에 등록해 주십시오. 아래 링크를 클릭해서 등록하시거나\n"
-"혹은 잊어버린 비밀번호를 다시 받으십시오."
+msgstr "아직 해당 계정 관리자에 등록하시지 않으셨다면 진행하기\n전에 등록해 주십시오. 아래 링크를 클릭해서 등록하시거나\n혹은 잊어버린 비밀번호를 다시 받으십시오."
 
-#: clientgui/AccountInfoPage.cpp:540
+#: clientgui/AccountInfoPage.cpp:514
 msgid "Account manager web site"
 msgstr "계정 관리자 웹 사이트"
 
-#: clientgui/AccountInfoPage.cpp:582
+#: clientgui/AccountInfoPage.cpp:556
 msgid "Add project"
 msgstr "프로젝트 추가"
 
-#: clientgui/AccountInfoPage.cpp:584
+#: clientgui/AccountInfoPage.cpp:558
 msgid "Update account manager"
 msgstr "계정 관리자 업데이트"
 
-#: clientgui/AccountInfoPage.cpp:586
+#: clientgui/AccountInfoPage.cpp:560
 msgid "Use account manager"
 msgstr "계정 관리자 사용"
 
-#: clientgui/AccountInfoPage.cpp:593
+#: clientgui/AccountInfoPage.cpp:567
 msgid "Please enter a user name."
 msgstr "사용자 이름을 입력해 주세요."
 
-#: clientgui/AccountInfoPage.cpp:595
+#: clientgui/AccountInfoPage.cpp:569
 msgid "Please enter an email address."
 msgstr "email 주소를 입력해 주세요."
 
-#: clientgui/AccountInfoPage.cpp:605
+#: clientgui/AccountInfoPage.cpp:579
 #, c-format
 msgid "Please enter a password of at least %d characters."
 msgstr "최소한 %d 글자로 된 비밀번호를 입력해 주세요."
 
-#: clientgui/AccountInfoPage.cpp:615
-msgid "The password and confirmation password do not match. Please type them again."
+#: clientgui/AccountInfoPage.cpp:589
+msgid ""
+"The password and confirmation password do not match. Please type them again."
 msgstr "처음 비밀번호와 재입력한 비밀번호가 일치하지 않습니다. 다시 입력해주세요."
 
-#: clientgui/AccountManagerInfoPage.cpp:272
+#: clientgui/AccountManagerInfoPage.cpp:270
 msgid "Choose an account manager"
 msgstr "계정 관리자 선택"
 
-#: clientgui/AccountManagerInfoPage.cpp:275
+#: clientgui/AccountManagerInfoPage.cpp:273
 msgid ""
 "To choose an account manager, click its name or \n"
 "type its URL below."
-msgstr ""
-"계정 관리자를 선택하려면 이를을 클릭하거나 \n"
-"하단에 URL을 입력하세요."
+msgstr "계정 관리자를 선택하려면 이를을 클릭하거나 \n하단에 URL을 입력하세요."
 
-#: clientgui/AccountManagerInfoPage.cpp:279
+#: clientgui/AccountManagerInfoPage.cpp:277
 msgid "Account manager details:"
 msgstr "계정 관리자 상세 정보:"
 
-#: clientgui/AccountManagerInfoPage.cpp:283
+#: clientgui/AccountManagerInfoPage.cpp:281
 msgid "Account manager &URL:"
 msgstr "계정 관리자 &URL:"
 
-#: clientgui/AccountManagerInfoPage.cpp:287
+#: clientgui/AccountManagerInfoPage.cpp:285
 msgid "Open web page"
 msgstr "웹 페이지 열기"
 
-#: clientgui/AccountManagerInfoPage.cpp:290
+#: clientgui/AccountManagerInfoPage.cpp:288
 msgid "Visit this account manager's web site"
 msgstr "해당 계정 관리자 웹사이트 방문하기"
 
@@ -205,320 +194,334 @@ msgstr "잠시 기다려 주세요..."
 msgid "An internal server error has occurred.\n"
 msgstr "내부 서버 오류가 발생했습니다.\n"
 
-#: clientgui/AdvancedFrame.cpp:96
+#: clientgui/AdvancedFrame.cpp:99
 msgid "Connected"
 msgstr "접속됨"
 
-#: clientgui/AdvancedFrame.cpp:104
+#: clientgui/AdvancedFrame.cpp:107
 msgid "Disconnected"
 msgstr "접속해제됨"
 
-#: clientgui/AdvancedFrame.cpp:318
+#: clientgui/AdvancedFrame.cpp:325
+#, c-format
+msgid "New %s window..."
+msgstr "새 %s 창..."
+
+#: clientgui/AdvancedFrame.cpp:329
+#, c-format
+msgid "Open another %s window"
+msgstr "다른 %s 창 열기"
+
+#: clientgui/AdvancedFrame.cpp:340
+msgid "Select computer..."
+msgstr "컴퓨터 선택(&S)..."
+
+#: clientgui/AdvancedFrame.cpp:341
+msgid "Connect to a BOINC client on another computer"
+msgstr "다른 컴퓨터의 BOINC 클라이언트로 접속"
+
+#: clientgui/AdvancedFrame.cpp:345
+msgid "Shut down connected client..."
+msgstr "연결된 클라이언트 종료..."
+
+#: clientgui/AdvancedFrame.cpp:346
+msgid "Shut down the currently connected BOINC client"
+msgstr "현재 연결된 BOINC  클라이언트를 종료합니다"
+
+#: clientgui/AdvancedFrame.cpp:351
 #, c-format
 msgid "Close the %s window"
 msgstr "%s 창 닫기"
 
-#: clientgui/AdvancedFrame.cpp:321
-msgid "&Close Window"
+#: clientgui/AdvancedFrame.cpp:354
+msgid "&Close window"
 msgstr "창 닫기(&C)"
 
-#: clientgui/AdvancedFrame.cpp:332
-#: clientgui/AdvancedFrame.cpp:339
-#: clientgui/AdvancedFrame.cpp:346
+#: clientgui/AdvancedFrame.cpp:363 clientgui/AdvancedFrame.cpp:368
+#: clientgui/AdvancedFrame.cpp:373
 #, c-format
 msgid "Exit %s"
 msgstr "%s 종료(&E) "
 
-#: clientgui/AdvancedFrame.cpp:359
-msgid "Preferences..."
+#: clientgui/AdvancedFrame.cpp:386
+msgid "Preferences…"
 msgstr "환경 설정..."
 
-#: clientgui/AdvancedFrame.cpp:368
+#: clientgui/AdvancedFrame.cpp:395
 msgid "&Notices\tCtrl+Shift+N"
 msgstr "공지 사항(&N)\tCtrl+Shift+N"
 
-#: clientgui/AdvancedFrame.cpp:369
-msgid "Display notices"
-msgstr "공지 사항을 보여줍니다"
+#: clientgui/AdvancedFrame.cpp:396
+msgid "Show notices"
+msgstr "공지 사항 보여주기"
 
-#: clientgui/AdvancedFrame.cpp:374
+#: clientgui/AdvancedFrame.cpp:401
 msgid "&Projects\tCtrl+Shift+P"
 msgstr "프로젝트(&P)\tCtrl+Shift+P"
 
-#: clientgui/AdvancedFrame.cpp:375
-msgid "Display projects"
-msgstr "프로젝트를 보여줍니다"
+#: clientgui/AdvancedFrame.cpp:402
+msgid "Show projects"
+msgstr "프로젝트 "
 
-#: clientgui/AdvancedFrame.cpp:380
+#: clientgui/AdvancedFrame.cpp:407
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr "태스크(&T)\tCtrl+Shift+T"
 
-#: clientgui/AdvancedFrame.cpp:381
-msgid "Display tasks"
-msgstr "태스크 현황을 보여줍니다"
+#: clientgui/AdvancedFrame.cpp:408
+msgid "Show tasks"
+msgstr "태스크 보여주기"
 
-#: clientgui/AdvancedFrame.cpp:386
+#: clientgui/AdvancedFrame.cpp:413
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr "전송(&F)\tCtrl+Shift+X"
 
-#: clientgui/AdvancedFrame.cpp:387
-msgid "Display transfers"
-msgstr "전송 현황을 보여줍니다"
+#: clientgui/AdvancedFrame.cpp:414
+msgid "Show file transfers"
+msgstr "파일 전송 현황 보여주기"
 
-#: clientgui/AdvancedFrame.cpp:392
+#: clientgui/AdvancedFrame.cpp:419
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "통계(&S)\tCtrl+Shift+S"
 
-#: clientgui/AdvancedFrame.cpp:393
-msgid "Display statistics"
-msgstr "통계를 보여줍니다"
+#: clientgui/AdvancedFrame.cpp:420
+msgid "Show statistics"
+msgstr "통계 보여주기"
+
+#: clientgui/AdvancedFrame.cpp:425
+msgid "&Disk\tCtrl+Shift+D"
+msgstr "디스크(&D)\tCtrl+Shift+D"
 
-#: clientgui/AdvancedFrame.cpp:398
-msgid "&Disk usage\tCtrl+Shift+D"
-msgstr "디스크 사용량(&D)\tCtrl+Shift+D"
+#: clientgui/AdvancedFrame.cpp:426
+msgid "Show disk usage"
+msgstr "디스크 사용량 보여주기"
 
-#: clientgui/AdvancedFrame.cpp:399
-msgid "Display 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:406
+#: clientgui/AdvancedFrame.cpp:439
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr "간단히 보기(&V)...\tCtrl+Shift+V"
 
-#: clientgui/AdvancedFrame.cpp:407
-msgid "Display the simple graphical interface."
-msgstr "간단한 형태의 그래픽 인터페이스로 표시합니다."
+#: clientgui/AdvancedFrame.cpp:440
+msgid "Switch to the Simple View"
+msgstr "단순 보기로 전환합니다"
 
-#: clientgui/AdvancedFrame.cpp:421
+#: clientgui/AdvancedFrame.cpp:454
 msgid "&Add project or account manager..."
 msgstr "프로젝트 혹은 계정 관리자 추가(&A)..."
 
-#: clientgui/AdvancedFrame.cpp:422
-msgid "Volunteer for any or all of 30+ projects in many areas of science"
-msgstr "많은 과학 분야의 30개 이상 프로젝트중에서 하나 혹은 전부 참여하는 기여자"
+#: clientgui/AdvancedFrame.cpp:455
+msgid "Add a new science project, or use an account manager"
+msgstr "새로운 과학 프로젝트를 추가하거나 계정 관리자를 사용합니다"
 
-#: clientgui/AdvancedFrame.cpp:426
+#: clientgui/AdvancedFrame.cpp:459
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "%s와 동기화(&S)"
 
-#: clientgui/AdvancedFrame.cpp:430
+#: clientgui/AdvancedFrame.cpp:463
 #, c-format
 msgid "Get current settings from %s"
 msgstr "%s 로부터 현재 설정을 가져옵니다"
 
-#: clientgui/AdvancedFrame.cpp:440
+#: clientgui/AdvancedFrame.cpp:473
 msgid "&Add project..."
 msgstr "프로젝트 추가(&A)..."
 
-#: clientgui/AdvancedFrame.cpp:441
+#: clientgui/AdvancedFrame.cpp:474
 msgid "Add a project"
 msgstr "프로젝트를 추가합니다"
 
-#: clientgui/AdvancedFrame.cpp:444
+#: clientgui/AdvancedFrame.cpp:477
 #, c-format
 msgid "S&top using %s..."
 msgstr "%s 사용 중지(&S)..."
 
-#: clientgui/AdvancedFrame.cpp:450
+#: clientgui/AdvancedFrame.cpp:483
 msgid "Remove this computer from account manager control."
 msgstr "계정 관리자 제어를 클라이언트에서 제거합니다."
 
-#: clientgui/AdvancedFrame.cpp:455
-msgid "&Options..."
-msgstr "선택 사항(&O)..."
+#: clientgui/AdvancedFrame.cpp:489
+msgid "Run CPU &benchmarks"
+msgstr "CPU 벤치마크 실행(&B)"
 
-#: clientgui/AdvancedFrame.cpp:456
-msgid "Configure display options and proxy settings"
-msgstr "화면 옵션과 프록시 환경을 설정합니다"
+#: clientgui/AdvancedFrame.cpp:490
+msgid "Run tests that measure CPU speed"
+msgstr "CPU 속도 측정 테스트 실행"
 
-#: clientgui/AdvancedFrame.cpp:460
-msgid "Computing &preferences..."
-msgstr "연산 환경 설정(&P)..."
+#: clientgui/AdvancedFrame.cpp:494
+msgid "Retry pending transfers"
+msgstr "유보된 전송 재시도 "
 
-#: clientgui/AdvancedFrame.cpp:461
-msgid "Configure computing preferences"
-msgstr "연산 환경을 설정합니다"
+#: clientgui/AdvancedFrame.cpp:495
+msgid "Retry deferred file transfers and task requests"
+msgstr "유예된 파일 전송을 시도하고 태스크를 요청합니다"
 
-#: clientgui/AdvancedFrame.cpp:469
+#: clientgui/AdvancedFrame.cpp:503
 msgid "&Run always"
 msgstr "항상 실행(&R)"
 
-#: clientgui/AdvancedFrame.cpp:470
+#: clientgui/AdvancedFrame.cpp:504
 msgid "Allow work regardless of preferences"
 msgstr "설정을 무시하고 작업을 허용합니다"
 
-#: clientgui/AdvancedFrame.cpp:474
+#: clientgui/AdvancedFrame.cpp:508
 msgid "Run based on &preferences"
 msgstr "설정한 대로 실행(&P)"
 
-#: clientgui/AdvancedFrame.cpp:475
+#: clientgui/AdvancedFrame.cpp:509
 msgid "Allow work according to preferences"
 msgstr "설정에 따라서 작업을 허용합니다"
 
-#: clientgui/AdvancedFrame.cpp:479
+#: clientgui/AdvancedFrame.cpp:513
 msgid "&Suspend"
 msgstr "일시 정지(&S)"
 
-#: clientgui/AdvancedFrame.cpp:480
+#: clientgui/AdvancedFrame.cpp:514
 msgid "Stop work regardless of preferences"
 msgstr "설정을 무시하고 작업을 정지시킵니다"
 
-#: clientgui/AdvancedFrame.cpp:505
+#: clientgui/AdvancedFrame.cpp:539
 msgid "Use GPU always"
 msgstr "항상 GPU 사용"
 
-#: clientgui/AdvancedFrame.cpp:506
+#: clientgui/AdvancedFrame.cpp:540
 msgid "Allow GPU work regardless of preferences"
 msgstr "설정을 무시하고 GPU 작업을 허용합니다"
 
-#: clientgui/AdvancedFrame.cpp:510
+#: clientgui/AdvancedFrame.cpp:544
 msgid "Use GPU based on preferences"
 msgstr "설정한 대로 GPU 사용"
 
-#: clientgui/AdvancedFrame.cpp:511
+#: clientgui/AdvancedFrame.cpp:545
 msgid "Allow GPU work according to preferences"
 msgstr "설정에 따라서 GPU 작업을 허용합니다"
 
-#: clientgui/AdvancedFrame.cpp:515
+#: clientgui/AdvancedFrame.cpp:549
 msgid "Suspend GPU"
 msgstr "GPU 일시 정지"
 
-#: clientgui/AdvancedFrame.cpp:516
+#: clientgui/AdvancedFrame.cpp:550
 msgid "Stop GPU work regardless of preferences"
 msgstr "설정을 무시하고 GPU 작업을 정지시킵니다"
 
-#: clientgui/AdvancedFrame.cpp:540
-msgid "Network activity always available"
-msgstr "네트워크 활동 항상 가능"
+#: clientgui/AdvancedFrame.cpp:574
+msgid "Network activity always allowed"
+msgstr "네트워크 활동 항상 허용"
 
-#: clientgui/AdvancedFrame.cpp:541
+#: clientgui/AdvancedFrame.cpp:575
 msgid "Allow network activity regardless of preferences"
 msgstr "설정을 무시하고 네트워크 활동을 허용합니다"
 
-#: clientgui/AdvancedFrame.cpp:545
+#: clientgui/AdvancedFrame.cpp:579
 msgid "Network activity based on preferences"
 msgstr "설정한 대로 네트워크 활동"
 
-#: clientgui/AdvancedFrame.cpp:546
+#: clientgui/AdvancedFrame.cpp:580
 msgid "Allow network activity according to preferences"
 msgstr "설정에 따라서 네트워크 활동을 허용합니다"
 
-#: clientgui/AdvancedFrame.cpp:550
+#: clientgui/AdvancedFrame.cpp:584
 msgid "Network activity suspended"
 msgstr "네트워크 활동 일시 정지됨"
 
-#: clientgui/AdvancedFrame.cpp:551
+#: clientgui/AdvancedFrame.cpp:585
 msgid "Stop BOINC network activity"
 msgstr "BOINC 네트워크 활동을 정지시킵니다"
 
-#: clientgui/AdvancedFrame.cpp:561
-#, c-format
-msgid "Connect to another computer running %s"
-msgstr "%s(이)가 실행중인 다른 컴퓨터로 접속"
+#: clientgui/AdvancedFrame.cpp:594
+msgid "Computing &preferences..."
+msgstr "연산 환경 설정(&P)..."
 
-#: clientgui/AdvancedFrame.cpp:566
-msgid "Select computer..."
-msgstr "컴퓨터 선택(&S)..."
+#: clientgui/AdvancedFrame.cpp:595
+msgid "Configure computing preferences"
+msgstr "연산 환경을 설정합니다"
 
-#: clientgui/AdvancedFrame.cpp:571
-msgid "Shut down connected client..."
-msgstr "연결된 클라이언트 종료..."
+#: clientgui/AdvancedFrame.cpp:600
+msgid "Exclusive applications..."
+msgstr "독점 프로그램 설정..."
 
-#: clientgui/AdvancedFrame.cpp:572
-msgid "Shut down the currently connected client"
-msgstr "현재 연결된 클라이언트를 종료합니다"
+#: clientgui/AdvancedFrame.cpp:601
+msgid "Configure exclusive applications"
+msgstr "독점 프로그램을 설정합니다"
 
-#: clientgui/AdvancedFrame.cpp:576
-msgid "Run CPU &benchmarks"
-msgstr "CPU 벤치마크 실행(&B)"
+#: clientgui/AdvancedFrame.cpp:606
+msgid "Select columns..."
+msgstr "칼럼 선택..."
 
-#: clientgui/AdvancedFrame.cpp:577
-msgid "Runs BOINC CPU benchmarks"
-msgstr "BOINC CPU 벤치마크를 실행합니다"
+#: clientgui/AdvancedFrame.cpp:607
+msgid "Select which columns to display"
+msgstr "표시할 칼럼을 선택해 주세요"
 
-#: clientgui/AdvancedFrame.cpp:581
-msgid "Do network communication"
-msgstr "네트워크 통신 실행"
+#: clientgui/AdvancedFrame.cpp:611
+msgid "Event Log options...\tCtrl+Shift+F"
+msgstr "이벤트 기록 옵션...\tCtrl+Shift+F"
+
+#: clientgui/AdvancedFrame.cpp:612
+msgid "Enable or disable various diagnostic messages"
+msgstr "다양한 진단 메세지를 활성화 또는 비활성화시킵니다"
+
+#: clientgui/AdvancedFrame.cpp:616
+msgid "&Other options..."
+msgstr "기타 선택 사항(&O)..."
 
-#: clientgui/AdvancedFrame.cpp:582
-msgid "Do all pending network communication"
-msgstr "유보된 모든 네트워크 통신을 실행합니다"
+#: clientgui/AdvancedFrame.cpp:617
+msgid "Configure display options and network settings"
+msgstr "화면 옵션과 네트워크 환경을 설정합니다"
 
-#: clientgui/AdvancedFrame.cpp:586
+#: clientgui/AdvancedFrame.cpp:622
 msgid "Read config files"
 msgstr "설정 파일 읽기"
 
-#: clientgui/AdvancedFrame.cpp:587
-msgid "Read configuration info from cc_config.xml and any app_config.xml files"
+#: clientgui/AdvancedFrame.cpp:623
+msgid ""
+"Read configuration info from cc_config.xml and any app_config.xml files"
 msgstr "cc_config.xml 및 app_config.xml로 부터 설정 정보를 읽어옵니다"
 
-#: clientgui/AdvancedFrame.cpp:591
+#: clientgui/AdvancedFrame.cpp:627
 msgid "Read local prefs file"
 msgstr "로컬 환경설정 파일 읽기"
 
-#: clientgui/AdvancedFrame.cpp:592
+#: clientgui/AdvancedFrame.cpp:628
 msgid "Read preferences from global_prefs_override.xml."
 msgstr "global_prefs_override.xml로 부터 환경 설정을 읽어옵니다."
 
-#: clientgui/AdvancedFrame.cpp:597
-#, c-format
-msgid "Launch another instance of %s..."
-msgstr "별도의 %s 객체 실행..."
-
-#: clientgui/AdvancedFrame.cpp:601
-#, c-format
-msgid "Launch another %s"
-msgstr "별도로 %s 실행"
-
-#: clientgui/AdvancedFrame.cpp:611
-msgid "Event Log...\tCtrl+Shift+E"
-msgstr "이벤트 기록...\tCtrl+Shift+E"
-
-#: clientgui/AdvancedFrame.cpp:612
-msgid "Display diagnostic messages."
-msgstr "진단 메세지를 보여줍니다."
-
-#: clientgui/AdvancedFrame.cpp:616
-msgid "Event Log Diagnostic Flags...\tCtrl+Shift+F"
-msgstr "이벤트 기록 진단 플래그...\tCtrl+Shift+F"
-
-#: clientgui/AdvancedFrame.cpp:617
-msgid "Enable or disable various diagnostic messages"
-msgstr "다양한 진단 메세지를 활성화 혹은 비활성화시킵니다"
-
-#: clientgui/AdvancedFrame.cpp:626
+#: clientgui/AdvancedFrame.cpp:636
 #, c-format
 msgid "%s &help"
 msgstr "%s 도움말(&H)"
 
-#: clientgui/AdvancedFrame.cpp:632
+#: clientgui/AdvancedFrame.cpp:640
 #, c-format
 msgid "Show information about %s"
 msgstr "%s에 대한 정보 보여주기"
 
-#: clientgui/AdvancedFrame.cpp:644
+#: clientgui/AdvancedFrame.cpp:650
 #, c-format
 msgid "&%s help"
 msgstr "&%s 도움말"
 
-#: clientgui/AdvancedFrame.cpp:650
+#: clientgui/AdvancedFrame.cpp:654
 #, c-format
 msgid "Show information about the %s"
 msgstr "%s에 대한 정보 보여주기"
 
-#: clientgui/AdvancedFrame.cpp:662
+#: clientgui/AdvancedFrame.cpp:665
 #, c-format
 msgid "%s &web site"
 msgstr "%s 웹 사이트(&W)"
 
-#: clientgui/AdvancedFrame.cpp:668
+#: clientgui/AdvancedFrame.cpp:669
 #, c-format
 msgid "Show information about BOINC and %s"
 msgstr "BOINC와 %s에 대한 정보 보여주기"
 
-#: clientgui/AdvancedFrame.cpp:680
-#: clientgui/BOINCTaskBar.cpp:544
+#: clientgui/AdvancedFrame.cpp:680 clientgui/BOINCTaskBar.cpp:544
 #, c-format
 msgid "&About %s..."
 msgstr "%s 정보(&A)..."
@@ -536,27 +539,27 @@ msgid "&View"
 msgstr "보기(&V)"
 
 #: clientgui/AdvancedFrame.cpp:701
-msgid "&Tools"
-msgstr "도구(&T)"
-
-#: clientgui/AdvancedFrame.cpp:705
 msgid "&Activity"
 msgstr "활동(&A)"
 
+#: clientgui/AdvancedFrame.cpp:705
+msgid "&Options"
+msgstr "선택 사항(&O)"
+
 #: clientgui/AdvancedFrame.cpp:709
-msgid "A&dvanced"
-msgstr "고급(&A)"
+msgid "&Tools"
+msgstr "도구(&T)"
 
 #: clientgui/AdvancedFrame.cpp:713
 msgid "&Help"
 msgstr "도움말(&H)"
 
-#: clientgui/AdvancedFrame.cpp:1185
+#: clientgui/AdvancedFrame.cpp:1188
 #, c-format
 msgid "%s - Stop using %s"
 msgstr "%s - %s 사용 중지"
 
-#: clientgui/AdvancedFrame.cpp:1190
+#: clientgui/AdvancedFrame.cpp:1193
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -564,48 +567,41 @@ msgid ""
 "but you'll have to manage projects manually.\n"
 "\n"
 "Do you want to stop using %s?"
-msgstr ""
-"%s 사용을 중지하면,\n"
-"현재 수행 중인 프로젝트는 유지되지만,\n"
-"해당 프로젝트를 직접 제어해야 합니다.\n"
-"\n"
-"정말로 %s 사용을 중지하겠습니까?"
+msgstr "%s 사용을 중지하면,\n현재 수행 중인 프로젝트는 유지되지만,\n해당 프로젝트를 직접 제어해야 합니다.\n\n정말로 %s 사용을 중지하겠습니까?"
 
-#: clientgui/AdvancedFrame.cpp:1397
+#: clientgui/AdvancedFrame.cpp:1420
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s - 현재 클라이언트 종료..."
 
-#: clientgui/AdvancedFrame.cpp:1406
+#: clientgui/AdvancedFrame.cpp:1429
 #, c-format
 msgid ""
 "%s will shut down the current client\n"
 "and prompt you for another host to connect to."
-msgstr ""
-"%s에 현재 연결된 클라이언트는 종료될 것이며,\n"
-"또다른 호스트로 연결해서 명령을 내릴 수 있습니다."
+msgstr "%s에 현재 연결된 클라이언트는 종료될 것이며,\n또다른 호스트로 연결해서 명령을 내릴 수 있습니다."
 
-#: clientgui/AdvancedFrame.cpp:1806
+#: clientgui/AdvancedFrame.cpp:1832
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: clientgui/AdvancedFrame.cpp:1815
+#: clientgui/AdvancedFrame.cpp:1841
 #, c-format
 msgid "%s has successfully added %s"
 msgstr "%s는 성공적으로 %s에 추가되었습니다"
 
-#: clientgui/AdvancedFrame.cpp:1953
+#: clientgui/AdvancedFrame.cpp:1977
 #, c-format
 msgid "%s - (%s)"
 msgstr "%s - (%s)"
 
-#: clientgui/AdvancedFrame.cpp:1957
+#: clientgui/AdvancedFrame.cpp:1981
 #, c-format
 msgid "Connecting to %s"
 msgstr "%s에 접속 중"
 
-#: clientgui/AdvancedFrame.cpp:1960
+#: clientgui/AdvancedFrame.cpp:1984
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "%s (%s)에 접속됨"
@@ -620,11 +616,7 @@ msgid ""
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"해당 사용자 이름을 가진 계정이 이미 존재하며\n"
-"입력한 것과 다른 비밀번호를 쓰고 있습니다.\n"
-"\n"
-"프로젝트 웹 사이트를 방문해서 그 곳의 지시대로 따라주십시오."
+msgstr "해당 사용자 이름을 가진 계정이 이미 존재하며\n입력한 것과 다른 비밀번호를 쓰고 있습니다.\n\n프로젝트 웹 사이트를 방문해서 그 곳의 지시대로 따라주십시오."
 
 #: clientgui/AlreadyExistsPage.cpp:191
 msgid "Email address already in use"
@@ -636,11 +628,7 @@ msgid ""
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"해당 Email 주소를 가진 계정이 이미 존재하며\n"
-"입력한 것과 다른 비밀번호를 쓰고 있습니다.\n"
-"\n"
-"프로젝트 웹 사이트를 방문해서 그 곳의 지시대로 따라주십시오."
+msgstr "해당 Email 주소를 가진 계정이 이미 존재하며\n입력한 것과 다른 비밀번호를 쓰고 있습니다.\n\n프로젝트 웹 사이트를 방문해서 그 곳의 지시대로 따라주십시오."
 
 #: clientgui/AsyncRPC.cpp:1031
 msgid "Communicating with BOINC client.  Please wait ..."
@@ -665,89 +653,76 @@ msgstr "%s - 통신 중"
 msgid "Cancel"
 msgstr "취소"
 
-#: clientgui/BOINCBaseFrame.cpp:504
+#: clientgui/BOINCBaseFrame.cpp:512
 #, c-format
 msgid "%s - Connection Error"
 msgstr "%s - 접속 오류"
 
-#: clientgui/BOINCBaseFrame.cpp:513
+#: 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 ""
-"현재 클라이언트 관리를 승인받지 못했습니다.\n"
-"관리자에게 문의해서 여러분을 'boinc_users' 로컬 사용자 그룹에 추가하십시오."
+msgstr "현재 클라이언트 관리를 승인받지 못했습니다.\n관리자에게 문의해서 여러분을 'boinc_users' 로컬 사용자 그룹에 추가하십시오."
 
-#: clientgui/BOINCBaseFrame.cpp:522
+#: 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 ""
-"실행 중인 클라이언트 접속 인증에 실패했습니다.\n"
-"클라이언트와 같은 디렉토리에서 이 프로그램이 실행되고 있는지 확인하십시오."
+msgstr "실행 중인 클라이언트 접속 인증에 실패했습니다.\n클라이언트와 같은 디렉토리에서 이 프로그램이 실행되고 있는지 확인하십시오."
 
-#: clientgui/BOINCBaseFrame.cpp:524
+#: clientgui/BOINCBaseFrame.cpp:532
 msgid "Authorization failed connecting to running client."
 msgstr "실행 중인 클라이언트 접속 인증에 실패했습니다."
 
-#: clientgui/BOINCBaseFrame.cpp:532
+#: clientgui/BOINCBaseFrame.cpp:540
 msgid "The password you have provided is incorrect, please try again."
 msgstr "입력하신 암호가 틀립니다. 다시 시도해 주세요."
 
-#: clientgui/BOINCBaseFrame.cpp:576
+#: clientgui/BOINCBaseFrame.cpp:584
 #, c-format
 msgid "%s - Connection Failed"
 msgstr "%s - 접속 실패"
 
-#: clientgui/BOINCBaseFrame.cpp:585
+#: 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는 %s 클라이언트에 연결이 불가능합니다.\n"
-"다시 연결하시겠습니까?"
+msgstr "%s는 %s 클라이언트에 연결이 불가능합니다.\n다시 연결하시겠습니까?"
 
-#: clientgui/BOINCBaseFrame.cpp:621
+#: clientgui/BOINCBaseFrame.cpp:629
 #, c-format
 msgid "%s - Daemon Start Failed"
 msgstr "%s - 데몬 시작 실패"
 
-#: clientgui/BOINCBaseFrame.cpp:631
+#: 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는 %s 클라이언트를 시작할 수 없습니다.\n"
-"제어판→관리 도구→서비스를 실행해서 BOINC 서비스를 시작하세요."
+msgstr "%s는 %s 클라이언트를 시작할 수 없습니다.\n제어판→관리 도구→서비스를 실행해서 BOINC 서비스를 시작하세요."
 
-#: clientgui/BOINCBaseFrame.cpp:637
+#: 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는 %s 클라이언트를 시작할 수 없습니다.\n"
-"데몬을 시작하고 다시 시도하세요."
+msgstr "%s는 %s 클라이언트를 시작할 수 없습니다.\n데몬을 시작하고 다시 시도하세요."
 
-#: clientgui/BOINCBaseFrame.cpp:688
+#: clientgui/BOINCBaseFrame.cpp:696
 #, c-format
 msgid "%s - Connection Status"
 msgstr "%s - 접속 상태"
 
-#: clientgui/BOINCBaseFrame.cpp:699
+#: clientgui/BOINCBaseFrame.cpp:707
 #, 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"
 "To connect up to your local computer please use 'localhost' as the host name."
-msgstr ""
-"%s는 현재 %s 클라이언트에 연결되어 있지 않습니다.\n"
-"'고급\\컴퓨터 선택...'메뉴 옵션을 이용해서 %s 클라이언트로 연결하십시오.\n"
-"로컬 컴퓨터로 연결되면 호스트 이름을 'localhost'로 바꿔주십시오."
+msgstr "%s는 현재 %s 클라이언트에 연결되어 있지 않습니다.\n'고급\\컴퓨터 선택...'메뉴 옵션을 이용해서 %s 클라이언트로 연결하십시오.\n로컬 컴퓨터로 연결되면 호스트 이름을 'localhost'로 바꿔주십시오."
 
-#: clientgui/BOINCBaseView.cpp:752
+#: clientgui/BOINCBaseView.cpp:790
 msgid "Project web pages"
 msgstr "프로젝트 웹 페이지"
 
@@ -761,9 +736,7 @@ msgstr "%s - 예상치 못한 종료"
 msgid ""
 "The %s client has exited unexpectedly 3 times within the last %d minutes.\n"
 "Would you like to restart it again?"
-msgstr ""
-"%s 클라이언트가 최근 %d분동안 3번 이상 예기치 못하게 종료되었습니다.\n"
-"다시 시작하시겠습니까?"
+msgstr "%s 클라이언트가 최근 %d분동안 3번 이상 예기치 못하게 종료되었습니다.\n다시 시작하시겠습니까?"
 
 #: clientgui/BOINCDialupManager.cpp:61
 #, c-format
@@ -775,9 +748,7 @@ msgstr "%s - 네트워크 상태"
 msgid ""
 "%s needs to connect to the Internet.\n"
 "May it do so now?"
-msgstr ""
-"%s(은)는 인터넷 연결이 필요합니다.\n"
-"지금 실행하시겠습니까?"
+msgstr "%s(은)는 인터넷 연결이 필요합니다.\n지금 실행하시겠습니까?"
 
 #: clientgui/BOINCDialupManager.cpp:254
 #, c-format
@@ -799,9 +770,7 @@ msgstr "%s가 인터넷 접속에 실패했습니다."
 msgid ""
 "%s has detected it is now connected to the Internet.\n"
 "Updating all projects and retrying all transfers."
-msgstr ""
-"%s(이)가 현재 인터넷에 연결된 것을 발견했습니다.\n"
-"모든 프로젝트를 업데이트하고 파일 전송을 다시 시도하는 중"
+msgstr "%s(이)가 현재 인터넷에 연결된 것을 발견했습니다.\n모든 프로젝트를 업데이트하고 파일 전송을 다시 시도하는 중"
 
 #: clientgui/BOINCDialupManager.cpp:417
 #, c-format
@@ -813,7 +782,7 @@ msgstr "%s가 성공적으로 인터넷 연결을 종료했습니다."
 msgid "%s failed to disconnected from the Internet."
 msgstr "%s가 인터넷 연결 종료에 실패했습니다."
 
-#: clientgui/BOINCGUIApp.cpp:595
+#: clientgui/BOINCGUIApp.cpp:597
 #, c-format
 msgid ""
 "You currently are not authorized to manage the client.\n"
@@ -824,94 +793,90 @@ msgid ""
 " or\n"
 "  - contact your administrator to add you to the 'boinc_master'\n"
 "     user group."
-msgstr ""
+msgstr "현재 클라이언트 관리 권한이 부여되지 않았습니다.\n\n해당 사용자가 %s를 실행하는 법:\n  - 비 관리자 사용자에게 권한 부여 옵션에 \"네\"라고 대답한 후\n    %s를 다시 설치하십시요\n 또는\n  - 관리자에게 문의해서 여러분을 'boinc_master' 사용자 그룹에\n    추가하십시오."
 
-#: clientgui/BOINCGUIApp.cpp:601
+#: clientgui/BOINCGUIApp.cpp:603
 #, c-format
 msgid ""
 "%s ownership or permissions are not set properly; please reinstall %s.\n"
 "(Error code %d"
-msgstr ""
-"%s 소유권이나 권한이 적절히 설정되지 않았습니다. %s를 재설치해주세요.\n"
-"(오류 code %d)"
+msgstr "%s 소유권이나 권한이 적절히 설정되지 않았습니다. %s를 재설치해주세요.\n(오류 code %d)"
 
-#: clientgui/BOINCGUIApp.cpp:607
+#: clientgui/BOINCGUIApp.cpp:609
 msgid " at "
 msgstr " 의"
 
-#: clientgui/BOINCGUIApp.cpp:610
+#: clientgui/BOINCGUIApp.cpp:612
 msgid ")"
 msgstr ")"
 
-#: clientgui/BOINCGUIApp.cpp:640
+#: 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 ""
-"BOINC를 정상적으로 실행하려면 재부팅이 필요합니다.\n"
-"컴퓨터를 다시 시작하고 재시도해 주세요."
+msgstr "BOINC를 정상적으로 실행하려면 재부팅이 필요합니다.\n컴퓨터를 다시 시작하고 재시도해 주세요."
 
-#: clientgui/BOINCGUIApp.cpp:641
+#: clientgui/BOINCGUIApp.cpp:643
 msgid "BOINC Manager"
 msgstr "BOINC 관리자"
 
-#: clientgui/BOINCGUIApp.cpp:902
+#: clientgui/BOINCGUIApp.cpp:904
 msgid "BOINC Manager was started by the operating system automatically"
 msgstr "BOINC 관리자를 운영 체제에서 자동적으로 시작시켰습니다"
 
-#: clientgui/BOINCGUIApp.cpp:904
+#: clientgui/BOINCGUIApp.cpp:906
 msgid "Startup BOINC so only the system tray icon is visible"
 msgstr "BOINC는 시스템 트레이 상태로 시작됨"
 
-#: clientgui/BOINCGUIApp.cpp:906
+#: clientgui/BOINCGUIApp.cpp:908
 msgid "Directory containing the BOINC Client executable"
 msgstr "실행 가능한 BOINC 클라이언트를 포함한 디렉토리"
 
-#: clientgui/BOINCGUIApp.cpp:907
+#: clientgui/BOINCGUIApp.cpp:909
 msgid "BOINC data directory"
 msgstr "BOINC 데이터 디렉토리"
 
-#: clientgui/BOINCGUIApp.cpp:909
+#: clientgui/BOINCGUIApp.cpp:911
 msgid "Host name or IP address"
 msgstr "호스트 이름 혹은 IP 주소"
 
-#: clientgui/BOINCGUIApp.cpp:910
+#: clientgui/BOINCGUIApp.cpp:912
 msgid "GUI RPC port number"
 msgstr "GUI RPC 포트 번호"
 
-#: clientgui/BOINCGUIApp.cpp:911
+#: clientgui/BOINCGUIApp.cpp:913
 msgid "Password"
 msgstr "비밀번호"
 
-#: clientgui/BOINCGUIApp.cpp:912
+#: clientgui/BOINCGUIApp.cpp:914
 msgid "Startup BOINC with these optional arguments"
 msgstr "BOINC는 해당 인수를 가지고 시작됨"
 
-#: clientgui/BOINCGUIApp.cpp:913
+#: clientgui/BOINCGUIApp.cpp:915
 msgid "disable BOINC security users and permissions"
 msgstr "BOINC 보안 사용자 및 권한 비활성화"
 
-#: clientgui/BOINCGUIApp.cpp:914
+#: clientgui/BOINCGUIApp.cpp:916
 msgid "set skin debugging mode to enable skin manager error messages"
 msgstr "스킨 관리자 오류 메세지 활성화를 위해 스킨 디버깅 모드 설정"
 
-#: clientgui/BOINCGUIApp.cpp:915
+#: clientgui/BOINCGUIApp.cpp:917
 msgid "multiple instances of BOINC Manager allowed"
 msgstr "BOINC 관리자 다중 실행이 허용됨"
 
-#: clientgui/BOINCGUIApp.cpp:917
+#: clientgui/BOINCGUIApp.cpp:919
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr "사용되지 않음: XCode 4.2 버그 회피책"
 
-#: clientgui/BOINCGUIApp.cpp:1164
+#: clientgui/BOINCGUIApp.cpp:1166
 msgid "(Automatic Detection)"
 msgstr "(자동 감지)"
 
-#: clientgui/BOINCGUIApp.cpp:1165
+#: clientgui/BOINCGUIApp.cpp:1167
 msgid "(Unknown)"
 msgstr "(알 수 없음)"
 
-#: clientgui/BOINCGUIApp.cpp:1166
+#: clientgui/BOINCGUIApp.cpp:1168
 msgid "(User Defined)"
 msgstr "(사용자 지정)"
 
@@ -925,14 +890,12 @@ msgstr "%s 웹 열기..."
 msgid "Open %s..."
 msgstr "%s 열기..."
 
-#: clientgui/BOINCTaskBar.cpp:536
-#: clientgui/BOINCTaskBar.cpp:633
+#: clientgui/BOINCTaskBar.cpp:536 clientgui/BOINCTaskBar.cpp:633
 #: clientgui/BOINCTaskBar.cpp:641
 msgid "Snooze"
 msgstr "꾸벅꾸벅 졸기"
 
-#: clientgui/BOINCTaskBar.cpp:538
-#: clientgui/BOINCTaskBar.cpp:660
+#: clientgui/BOINCTaskBar.cpp:538 clientgui/BOINCTaskBar.cpp:660
 #: clientgui/BOINCTaskBar.cpp:668
 msgid "Snooze GPU"
 msgstr "GPU 사용 중지"
@@ -1011,15 +974,10 @@ msgid ""
 "Please try again later.\n"
 "\n"
 "Click Finish to close."
-msgstr ""
-"다음에 다시 시도하세요.\n"
-"\n"
-"닫으려면 완료를 클릭하세요."
+msgstr "다음에 다시 시도하세요.\n\n닫으려면 완료를 클릭하세요."
 
-#: 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 "닫으려면 완료를 클릭하세요."
 
@@ -1039,9 +997,7 @@ msgstr "이 프로젝트가 성공적으로 추가되었습니다."
 msgid ""
 "When you click Finish, your web browser will go to a page where\n"
 "you can set your account name and preferences."
-msgstr ""
-"완료를 누르면, 브라우저가 계정 이름과 속성을\n"
-"설정할 수 있는 페이지로 갈 것입니다."
+msgstr "완료를 누르면, 브라우저가 계정 이름과 속성을\n설정할 수 있는 페이지로 갈 것입니다."
 
 #: clientgui/CompletionPage.cpp:232
 #, c-format
@@ -1089,587 +1045,683 @@ msgstr "저작권:"
 
 #: clientgui/DlgAbout.cpp:192
 msgid ""
-"(C) 2003-2014 University of California, Berkeley.\n"
-"All Rights Reserved."
-msgstr ""
-"(C) 2003-2014 University of California, Berkeley.\n"
+"(C) 2003-2015 University of California, Berkeley.\n"
 "All Rights Reserved."
+msgstr "(C) 2003-2015 University of California, Berkeley.\nAll Rights Reserved."
 
 #: clientgui/DlgAbout.cpp:196
-msgid "Berkeley Open Infrastructure for Network Computing"
-msgstr "네트워크 컴퓨팅을 위한 Berkeley 개방형 하부구조체"
+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 "방문하기"
+
+#: clientgui/DlgAbout.cpp:211
+msgid "for more information."
+msgstr "보다 자세한 정보."
 
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:399
+#: clientgui/DlgAbout.cpp:219 clientgui/DlgExitMessage.cpp:173
+#: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:399
 #: clientgui/DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "확인"
 
-#: clientgui/DlgAdvPreferences.cpp:602
-msgid "invalid number"
+#: clientgui/DlgAdvPreferences.cpp:669
+msgid "Invalid number"
 msgstr "유효하지 않은 숫자"
 
-#: clientgui/DlgAdvPreferences.cpp:603
-msgid "invalid time, format is HH:MM"
-msgstr "잘못된 시간, 올바른 형식은 HH:MM"
+#: clientgui/DlgAdvPreferences.cpp:670
+msgid "Invalid time, value must be between 0:00 and 24:00, format is HH:MM"
+msgstr "유효하지 않은 시간. 해당 값은 0:00과 24:00사이이며 시간:분 형식이어야 합니다"
 
-#: clientgui/DlgAdvPreferences.cpp:604
-msgid "invalid time interval, format is HH:MM-HH:MM"
-msgstr "잘못된 시간 간격, 올바른 형식은 HH:MM-HH:MM"
+#: clientgui/DlgAdvPreferences.cpp:671
+msgid "Number must be between 0 and 10"
+msgstr "숫자는 0과 10 사이여야 합니다"
 
-#: clientgui/DlgAdvPreferences.cpp:817
+#: clientgui/DlgAdvPreferences.cpp:672
+msgid "Number must be between 0 and 100"
+msgstr "숫자는 0과 100 사이여야 합니다"
+
+#: clientgui/DlgAdvPreferences.cpp:905
 msgid "invalid input value detected"
 msgstr "잘못된 입력값 발견"
 
-#: clientgui/DlgAdvPreferences.cpp:819
+#: clientgui/DlgAdvPreferences.cpp:907
 msgid "Validation Error"
 msgstr "인증 오류"
 
-#: clientgui/DlgAdvPreferences.cpp:969
-#: clientgui/DlgAdvPreferences.cpp:975
-#: clientgui/DlgAdvPreferences.cpp:981
-msgid "Applications to add"
-msgstr "응용 프로그램이 추가됨"
-
-#: clientgui/DlgAdvPreferences.cpp:998
-#, c-format
-msgid "'%s' is not an executable application."
-msgstr "'%s'은(는) 실행 가능한 응용 프로그램이 아닙니다."
-
-#: clientgui/DlgAdvPreferences.cpp:999
-#: clientgui/DlgAdvPreferences.cpp:1046
-#: clientgui/DlgAdvPreferences.cpp:1070
-msgid "Add Exclusive App"
-msgstr "독점 프로그램 추가"
-
-#: clientgui/DlgAdvPreferences.cpp:1011
-msgid "Name of application to add?"
-msgstr "추가할 응용 프로그램명?"
+#: clientgui/DlgAdvPreferences.cpp:1119
+msgid "Discard local preferences and use web-based preferences?"
+msgstr "로컬 환경설정을 취소하고 웹기반 환경설정을 사용하시겠습니까?"
 
-#: clientgui/DlgAdvPreferences.cpp:1011
-msgid "Add exclusive app"
-msgstr "독점 프로그램 추가"
-
-#: clientgui/DlgAdvPreferences.cpp:1045
-#, c-format
-msgid "Application names must end with '%s'"
-msgstr "응용 프로그램 이름은 반드시 '%s'로 끝나야 합니다"
-
-#: clientgui/DlgAdvPreferences.cpp:1069
-#, c-format
-msgid "'%s' is already in the list."
-msgstr "'%s'는 이미 목록에 있습니다."
-
-#: clientgui/DlgAdvPreferences.cpp:1161
-msgid ""
-"Do you really want to clear all local preferences?\n"
-"(This will not affect exclusive applications.)"
-msgstr ""
-"정말로 모든 로컬 환경설정을 지우겠습니까?\n"
-"(독점 프로그램에는 영향이 없습니다.)"
-
-#: clientgui/DlgAdvPreferences.cpp:1162
+#: clientgui/DlgAdvPreferences.cpp:1120
 msgid "Confirmation"
 msgstr "확인됨"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:49
+#: clientgui/DlgAdvPreferencesBase.cpp:54
 #, c-format
 msgid "%s - Computing preferences"
 msgstr "%s - 연산 환경 설정"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:66
+#: clientgui/DlgAdvPreferencesBase.cpp:77
 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 ""
-"이 다이얼로그에서 한 설정은 이 컴퓨터에만 적용됩니다.\n"
-"확인을 눌러서 설정값을 저장하세요.\n"
-"지우기를 눌러서 웹 기반 설정으로 복원할 수 있습니다.(독점 프로그램 제외)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:69
-msgid "Clear"
-msgstr "지우기"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:70
-msgid "clear all local preferences and close the dialog"
-msgstr "모든 로컬 환경 설정이 지워지며 다이얼로그를 닫습니다"
+"Using local preferences.\n"
+"Click \"Use web prefs\" to use web-based preferences from"
+msgstr "로컬 환경설정을 사용합니다.\n\"웹 환경설정 사용\"을 클릭하면 다음 웹기반 설정 사용:"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:85
-msgid "processor usage"
-msgstr "프로세서 사용률"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:88
-msgid "network usage"
-msgstr "네트워크 사용량"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:91
-msgid "disk and memory usage"
-msgstr "디스크와 메모리 사용량"
+msgid "Using web-based preferences from"
+msgstr "다음 웹 기반 환경설정 사용중:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:94
-msgid "exclusive applications"
-msgstr "독점 프로그램"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:107
-#: clientgui/DlgDiagnosticLogFlags.cpp:104
-msgid "OK"
-msgstr "확인"
+#: clientgui/DlgAdvPreferencesBase.cpp:102
+msgid "Set values and click OK to use local preferences instead."
+msgstr "값을 설정하고 로컬 환경설정  사용하려면 확인을 누르세요."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:108
-msgid "save all values and close the dialog"
-msgstr "모든 값을 저장하고 창을 닫습니다"
+#: clientgui/DlgAdvPreferencesBase.cpp:111
+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
-msgid "close the dialog without saving"
-msgstr "저장하지 않고 창을 닫습니다"
+msgid "Clear"
+msgstr "지우기"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:115
+msgid "Clear all local preferences and close the dialog."
+msgstr "모든 로컬 환경 설정이 지워지며 다이얼로그를 닫습니다."
 
 #: clientgui/DlgAdvPreferencesBase.cpp:118
-#: clientgui/Localization.cpp:35
-#: clientgui/Localization.cpp:121
-#: clientgui/Localization.cpp:139
-msgid "Help"
-msgstr "도움말"
+msgid "Use web prefs"
+msgstr "웹 환경설정 "
 
 #: clientgui/DlgAdvPreferencesBase.cpp:119
-msgid "shows the preferences web page"
-msgstr "환경 설정 웹 페이지를 보여줍니다"
+msgid "Restore web-based preferences and close the dialog."
+msgstr "웹기반 환경설정으로 복원시키고 다이얼로그를 닫습니다."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:141
-msgid "Computing allowed"
-msgstr "연산 허용 여부 설정"
+#: clientgui/DlgAdvPreferencesBase.cpp:143
+#: clientgui/DlgAdvPreferencesBase.cpp:637
+msgid "Computing"
+msgstr "연산"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:146
-msgid "While computer is on batteries"
-msgstr "배터리로 가동 시에도 실행"
+#: clientgui/DlgAdvPreferencesBase.cpp:785
+msgid "Network"
+msgstr "네트워크"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:149
-msgid "check this if you want this computer to do work while it runs on batteries"
-msgstr "배터리가 남은 동안에도 작업을 수행하려면 체크하시십시오"
+msgid "Disk and memory"
+msgstr "디스크 및 메모리"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:155
-msgid "While computer is in use"
-msgstr "컴퓨터가 사용중에도 작업함"
+#: clientgui/DlgAdvPreferencesBase.cpp:152
+msgid "Daily schedules"
+msgstr "날짜별 스케줄"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:158
-msgid "check this if you want this computer to do work even when you're using it"
-msgstr "컴퓨터가 사용하는 동안에도 작업을 수행하려면 체크하십시오"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:164
-msgid "Use GPU while computer is in use"
-msgstr "컴퓨터를 사용하는 동안 GPU 사용"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:167
-msgid "check this if you want your GPU to do work even when you're using the computer"
-msgstr "컴퓨터가 사용하는 동안에도 GPU로 작업을 수행하려면 체크하십시오"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:179
-msgid "Only after computer has been idle for"
-msgstr "컴퓨터 대기 시간 설정"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:188
-msgid "do work only after you haven't used the computer for this number of minutes"
-msgstr "이 시간(분) 이후로 컴퓨터를 사용하지 않을 때 작업을 수행합니다"
+#: clientgui/DlgAdvPreferencesBase.cpp:165
+#: clientgui/DlgDiagnosticLogFlags.cpp:119 clientgui/DlgExclusiveApps.cpp:146
+#: clientgui/DlgHiddenColumns.cpp:100
+msgid "OK"
+msgstr "확인"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:193
-#: clientgui/DlgAdvPreferencesBase.cpp:342
-msgid "minutes"
-msgstr "분"
+#: clientgui/DlgAdvPreferencesBase.cpp:166
+msgid "Save all values and close the dialog."
+msgstr "모든 값을 저장하고 창을 닫습니다."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:212
-msgid "While processor usage is less than"
-msgstr "이보다 적게 프로세서 사용"
+#: clientgui/DlgAdvPreferencesBase.cpp:172
+msgid "Close the dialog without saving."
+msgstr "저장하지 않고 창을 닫습니다."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:221
-msgid "suspend work if processor usage exceeds this level"
-msgstr "프로세서 사용량이 설정량 초과시 작업 일시 중지"
+#: clientgui/DlgAdvPreferencesBase.cpp:176 clientgui/DlgExclusiveApps.cpp:157
+msgid "Help"
+msgstr "도움말"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:226
-msgid "percent (0 means no restriction)"
-msgstr "퍼센트 (0은 제한 없음)"
+#: clientgui/DlgAdvPreferencesBase.cpp:177
+msgid "Shows the preferences web page."
+msgstr "환경 설정 웹 페이지를 보여줍니다."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:240
-#: clientgui/DlgAdvPreferencesBase.cpp:506
-msgid "Every day between hours of"
-msgstr "매일 이 시간 사이"
+#: clientgui/DlgAdvPreferencesBase.cpp:239
+#: clientgui/DlgAdvPreferencesBase.cpp:425
+msgid "Usage limits"
+msgstr "사용량 제한"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:244
-msgid "start work at this time"
-msgstr "이 시간에 작업을 시작"
+#, 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:248
-#: clientgui/DlgAdvPreferencesBase.cpp:514
-msgid "and"
-msgstr "부터"
+#: clientgui/DlgAdvPreferencesBase.cpp:246
+#: clientgui/DlgAdvPreferencesBase.cpp:258
+msgid "Use at most"
+msgstr "최대 사용량"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:252
-msgid "stop work at this time"
-msgstr "이 시간에 작업을 중지"
+#: clientgui/DlgAdvPreferencesBase.cpp:251
+#, no-c-format
+msgid "% of the CPUs"
+msgstr "% (프로세서)"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:256
-#: clientgui/DlgAdvPreferencesBase.cpp:522
-msgid "(no restriction if equal)"
-msgstr "(똑같으면 제한이 없음)"
+#, 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."
+msgstr "연산하는 동안 매 몇 초간 CPU 온도 및 에너지 사용량을 줄이기 위해 연산의 일시중지/재개를 반복합니다. 예시: 75%는 3초간 연산을 하고 1초간 대기하며 이 동작을 반복합니다."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:261
-#: clientgui/DlgAdvPreferencesBase.cpp:527
-msgid "Day-of-week override:"
-msgstr "일주일 중 작업할 날:"
+#: clientgui/DlgAdvPreferencesBase.cpp:263
+#, no-c-format
+msgid "% of CPU time"
+msgstr "% CPU 시간"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:266
-#: clientgui/DlgAdvPreferencesBase.cpp:532
-msgid "check box to specify hours for this day of week"
-msgstr "일주일 중 작업 일과 시간을 체크"
+#: clientgui/DlgAdvPreferencesBase.cpp:270
+msgid "When to suspend"
+msgstr "일시중지시"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:272
-#: clientgui/DlgAdvPreferencesBase.cpp:538
-msgid "Monday"
-msgstr "월요일"
+#: clientgui/DlgAdvPreferencesBase.cpp:276
+msgid "Suspend when computer is on battery"
+msgstr "컴퓨터가 배터리로 작동시 일시중지"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:279
-#: clientgui/DlgAdvPreferencesBase.cpp:545
-msgid "Tuesday"
-msgstr "화요일"
+msgid ""
+"Check this to suspend computing on portables when running on battery power."
+msgstr "배터리 전원으로 작동하는 상황일 때 연산을 일시중지시키려면 체크하세요."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:286
-#: clientgui/DlgAdvPreferencesBase.cpp:552
-msgid "Wednesday"
-msgstr "수요일"
+#: clientgui/DlgAdvPreferencesBase.cpp:285
+msgid "Suspend when computer is in use"
+msgstr "컴퓨터 사용시 연산을 일시중지"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:293
-#: clientgui/DlgAdvPreferencesBase.cpp:559
-msgid "Thursday"
-msgstr "목요일"
+#: clientgui/DlgAdvPreferencesBase.cpp:288
+msgid ""
+"Check this to suspend computing and file transfers when you're using the "
+"computer."
+msgstr "컴퓨터가 사용 중인 동안 연산 및 파일 전송을 일시중지시키려면 체크하세요."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:300
-#: clientgui/DlgAdvPreferencesBase.cpp:566
-msgid "Friday"
-msgstr "금요일"
+#: clientgui/DlgAdvPreferencesBase.cpp:294
+msgid "Suspend GPU computing when computer is in use"
+msgstr "컴퓨터가 사용 중일 동안 GPU 연산을 일시중지"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:307
-#: clientgui/DlgAdvPreferencesBase.cpp:573
-msgid "Saturday"
-msgstr "토요일"
+#: clientgui/DlgAdvPreferencesBase.cpp:297
+msgid "Check this to suspend GPU computing when you're using the computer."
+msgstr "컴퓨터 사용시 GPU 연산을 일시중지시키려면 체크하세요."
+
+#: clientgui/DlgAdvPreferencesBase.cpp:302
+msgid "This determines when the computer is considered 'in use'."
+msgstr "이 것은 컴퓨터가 '사용 중'인 상태인지 결정합니다."
+
+#: clientgui/DlgAdvPreferencesBase.cpp:306
+msgid "'In use' means mouse/keyboard input in last"
+msgstr "'사용 중'은 마우스/키보드 입력 시간을 뜻합니다"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:580
-msgid "Sunday"
-msgstr "일요일"
+#: clientgui/DlgAdvPreferencesBase.cpp:387
+msgid "minutes"
+msgstr "분"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:328
-msgid "Other options"
-msgstr "다른 선택 사항"
+#: clientgui/DlgAdvPreferencesBase.cpp:321
+#, c-format
+msgid "Suspend when non-%s CPU usage is above"
+msgstr "비%s CPU 사용량이 이 값 이상일 때 일시중지"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:336
-msgid "Switch between applications every"
-msgstr "이 시간 이후로 응용 프로그램을 바꿈"
+#: clientgui/DlgAdvPreferencesBase.cpp:323
+msgid "Suspend computing when your computer is busy running other programs."
+msgstr "컴퓨터가 다른 프로그램을 돌리느라 바쁠 때 연산을 일시중지시킵니다."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:345
-msgid "On multiprocessor systems, use at most"
-msgstr "다중 프로세서 시스템일 때 최대 사용량"
+#: clientgui/DlgAdvPreferencesBase.cpp:344
+#: clientgui/DlgAdvPreferencesBase.cpp:474
+msgid "Other"
+msgstr "기타"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:349
+msgid "Store at least enough tasks to keep the computer busy for this long."
+msgstr "컴퓨터를 부지런히 돌리기 위해 충분한 태스크를 저장합니다."
 
 #: clientgui/DlgAdvPreferencesBase.cpp:352
-#, no-c-format
-msgid "% of the processors (0 means no restriction)"
-msgstr "프로세서 사용량 %(0일 경우 무제한)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:355
-#: clientgui/DlgAdvPreferencesBase.cpp:618
-#: clientgui/DlgAdvPreferencesBase.cpp:640
-#: clientgui/DlgAdvPreferencesBase.cpp:661
-#: clientgui/DlgAdvPreferencesBase.cpp:683
-#: clientgui/DlgAdvPreferencesBase.cpp:694
-msgid "Use at most"
-msgstr "최대 사용량"
+msgid "Store at least"
+msgstr "최소한"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:362
-#, no-c-format
-msgid "% of CPU time (0 means no restriction)"
-msgstr "CPU 시간 할당 % (0일 경우 무제한)"
+#: clientgui/DlgAdvPreferencesBase.cpp:360
+#: clientgui/DlgAdvPreferencesBase.cpp:376
+msgid "days of work"
+msgstr "일치 작업량"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:386
-msgid "General options"
-msgstr "일반적인 선택 사항"
+#: clientgui/DlgAdvPreferencesBase.cpp:365
+msgid ""
+"Store additional tasks above the minimum level.  Determines how much work is"
+" requested when contacting a project."
+msgstr "최소 한도 이상으로 추가적인 태스크를 저장합니다. 또한 프로젝트 서버에 연락할 때 얼마나 많은 작업량을 요청할지 결정합니다."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:395
-msgid "Maximum download rate"
-msgstr "최대 다운로드 속도"
+#: clientgui/DlgAdvPreferencesBase.cpp:368
+msgid "Store up to an additional"
+msgstr "추가적으로 유지할"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:401
-#: clientgui/DlgAdvPreferencesBase.cpp:410
-msgid "KBytes/second (0 means no restriction)"
-msgstr "KBytes/초 (0일 경우 무제한)"
+#: clientgui/DlgAdvPreferencesBase.cpp:381
+#, c-format
+msgid "If you run several projects, %s may switch between them this often."
+msgstr "여러 프로젝트를 수행할 경우,%s 가 얼마나 자주 그것들을 교체할지 결정합니다."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:404
-msgid "Maximum upload rate"
-msgstr "최대 업로드 속도"
+#: clientgui/DlgAdvPreferencesBase.cpp:383
+msgid "Switch between tasks every"
+msgstr "태스크를 설정시간마다 전환"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:417
-msgid "Minimum work buffer"
-msgstr "최소 작업 저장량"
+#: clientgui/DlgAdvPreferencesBase.cpp:391
+msgid ""
+"This controls how often tasks save their state to disk, so that they can be "
+"restarted later."
+msgstr "태스크가 얼마나 자주 현재 상태를 디스크에 저장하는지 제어합니다. 이렇게 함으로써 태스크를 재시작할 수 있습니다."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:425
-msgid "Try to maintain enough tasks to keep busy for this many days"
-msgstr "지정한 날짜동안 충분한 작업을 수행하고 유지하도록 합니다"
+#: clientgui/DlgAdvPreferencesBase.cpp:392
+msgid "Request tasks to checkpoint at most every"
+msgstr "태스크 기록지점을 이 시간마다 기록"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:396
+msgid "seconds"
+msgstr "초"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:431
-#: clientgui/DlgAdvPreferencesBase.cpp:449
-msgid "days (maximum value: 10)"
-msgstr "일 (최대 값: 10)"
+msgid "Limit the download rate of file transfers."
+msgstr "파일 전송 중 다운로드 속도 제한합니다."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:437
-msgid "Max additional work buffer"
-msgstr "최고 추가 작업 저장량"
+#: clientgui/DlgAdvPreferencesBase.cpp:432
+msgid "Limit download rate to"
+msgstr "다운로드 속도 제한"
 
+#: clientgui/DlgAdvPreferencesBase.cpp:436
 #: clientgui/DlgAdvPreferencesBase.cpp:445
-msgid "In addition, maintain enough tasks for up to this many days"
-msgstr "추가로 지정한 날짜동안 충분한 태스크 이상을 유지합니다"
+msgid "KB/second"
+msgstr "KB/초"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:454
-msgid "Transfer at most"
-msgstr "최대 전송량"
+#: clientgui/DlgAdvPreferencesBase.cpp:440
+msgid "Limit the upload rate of file transfers."
+msgstr "파일 전송 중 최대 업로드  제한합니다."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:462
-msgid "MBytes every"
-msgstr "MB로 해당 "
+#: clientgui/DlgAdvPreferencesBase.cpp:441
+msgid "Limit upload rate to"
+msgstr "업로드 속도 "
 
-#: clientgui/DlgAdvPreferencesBase.cpp:468
-msgid "days (0 means no restriction)"
-msgstr "일동안 제한 (0은 제한 없음)"
+#: clientgui/DlgAdvPreferencesBase.cpp:452
+#, c-format
+msgid "Example: %s should transfer at most 2000 MB of data every 30 days."
+msgstr "예시: %s는 매 30일동안에는 최대 2000MB까지 전송하게 됩니다."
+
+#: clientgui/DlgAdvPreferencesBase.cpp:454
+msgid "Limit usage to"
+msgstr "사용량 제한"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:476
-msgid "Skip image file verification"
-msgstr "이미지 파일 검증 건너뛰기"
+#: clientgui/DlgAdvPreferencesBase.cpp:458
+msgid "MB every"
+msgstr "MB"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:462
+msgid "days"
+msgstr "일"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:478
-msgid "check this if your Internet provider modifies image files"
-msgstr "인터넷 제공자가 이미지 파일을 수정하면 체크하세요"
+#: clientgui/DlgAdvPreferencesBase.cpp:479
+#, 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:484
-msgid "Connect options"
-msgstr "접속 옵션"
+#: clientgui/DlgAdvPreferencesBase.cpp:481
+msgid "Skip data verification for image files"
+msgstr "이미지 파일 데이터 검증 건너뛰기"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:487
-msgid "Confirm before connecting to internet"
+#: clientgui/DlgAdvPreferencesBase.cpp:485
+msgid "Confirm before connecting to Internet"
 msgstr "인터넷 접속 전에 확인"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
-msgstr "체크되면, 인터넷 접속 시도 전에 확인 다이얼로그가 표시됩니다"
+#: clientgui/DlgAdvPreferencesBase.cpp:486
+#: clientgui/DlgAdvPreferencesBase.cpp:490
+msgid "Useful only if you have a modem, ISDN or VPN connection."
+msgstr "모뎀, ISDN, VPN 연결시에만 유용합니다."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:493
+#: clientgui/DlgAdvPreferencesBase.cpp:489
 msgid "Disconnect when done"
 msgstr "완료되면 접속 끊기"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:495
-msgid ""
-"if checked, BOINC hangs up when network usage is done\n"
-"(only relevant for dialup-connection)"
-msgstr ""
-"체크되면, BOINC는 완료시 네트워크 사용을 중단합니다\n"
-"(전화 접속에만 해당됨)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:501
-msgid "Network usage allowed"
-msgstr "네트워크 사용 허가"
+#: clientgui/DlgAdvPreferencesBase.cpp:516
+msgid "Disk"
+msgstr "디스크"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:510
-msgid "network usage start hour"
-msgstr "네트워크 사용 시작 시간"
+#: clientgui/DlgAdvPreferencesBase.cpp:521
+#, c-format
+msgid "%s will use the most restrictive of these settings:"
+msgstr "%s는 이러한 설정값들중 제한된 부분만 사용합니다:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:518
-msgid "network usage stop hour"
-msgstr "네트워크 사용 중단 시간"
+#: clientgui/DlgAdvPreferencesBase.cpp:527
+#, c-format
+msgid "Limit the total amount of disk space used by %s."
+msgstr "전체 디스크 공간 중 %s가 사용하는 용량을 제한합니다."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:610
-#: clientgui/DlgItemProperties.cpp:257
-msgid "Disk usage"
-msgstr "디스크 사용량"
+#: clientgui/DlgAdvPreferencesBase.cpp:530
+#: clientgui/DlgAdvPreferencesBase.cpp:554
+msgid "Use no more than"
+msgstr "최대 사용 한도"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:622
-msgid "the maximum disk space used by BOINC (in Gigabytes)"
-msgstr "BOINC가 사용하는 최대 디스크 용량 (단위 GB)"
+#: clientgui/DlgAdvPreferencesBase.cpp:534
+msgid "GB"
+msgstr "GB"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:626
-msgid "Gigabytes disk space (0 means no restriction)"
-msgstr "GB 디스크 여유 공간 사용 (0은 제한 없음)"
+#: clientgui/DlgAdvPreferencesBase.cpp:539
+#, c-format
+msgid ""
+"Limit disk usage to leave this much free space on the volume where %s stores"
+" data."
+msgstr "%s 데이터가 저장되는 볼륨중 여유 공간으로 남겨둘 디스크 용량을 설정합니다."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:629
+#: clientgui/DlgAdvPreferencesBase.cpp:542
 msgid "Leave at least"
 msgstr "최소한"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:633
-msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
-msgstr "BOINC는 최소한 이 만큼의 디스크 용량을 빈 공간으로 남겨둡니다 (단위 GB)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:637
-msgid "Gigabytes disk space free"
+#: clientgui/DlgAdvPreferencesBase.cpp:546
+msgid "GB free"
 msgstr "GB를 남겨둡니다"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
-msgid "BOINC uses at most this percentage of total disk space"
-msgstr "BOINC는 전체 디스크 중 최대 해당 퍼센트만큼 사용합니다"
+#: clientgui/DlgAdvPreferencesBase.cpp:551
+#, c-format
+msgid ""
+"Limit the percentage of disk space used by %s on the volume where it stores "
+"data."
+msgstr "%s 데이터가 저장되는 볼륨에서 사용하는 디스크 공간의 퍼센테이지를 제합니다."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:649
+#: clientgui/DlgAdvPreferencesBase.cpp:559
 #, no-c-format
-msgid "% of total disk space"
-msgstr "% (전체 디스크 공간 중)"
+msgid "% of total"
+msgstr "% (전체 용량 중)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:652
-msgid "Tasks checkpoint to disk at most every"
-msgstr "태스크 기록지점을 지정된 시간마다 기록"
+#: clientgui/DlgAdvPreferencesBase.cpp:566
+msgid "Memory"
+msgstr "메모리"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
-msgid "seconds"
-msgstr "초"
+#: clientgui/DlgAdvPreferencesBase.cpp:571
+#, c-format
+msgid "Limit the memory used by %s when you're using the computer."
+msgstr "컴퓨터 사용시 %s에서 사용하는 메모리를 제한합니다."
+
+#: clientgui/DlgAdvPreferencesBase.cpp:573
+msgid "When computer is in use, use at most"
+msgstr "컴퓨터 사용시 최대 사용량"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:668
+#: clientgui/DlgAdvPreferencesBase.cpp:579
+#: clientgui/DlgAdvPreferencesBase.cpp:591
+#: clientgui/DlgAdvPreferencesBase.cpp:607
 #, no-c-format
-msgid "% of page file (swap space)"
-msgstr "% of page file (스왑 영역)"
+msgid "%"
+msgstr "%"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:675
-msgid "Memory usage"
-msgstr "메모리 사용량"
+#: clientgui/DlgAdvPreferencesBase.cpp:584
+#, c-format
+msgid "Limit the memory used by %s when you're not using the computer."
+msgstr "컴퓨터 미사용시 %s에서 사용하는 메모리를 제한합니다."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
-#, no-c-format
-msgid "% when computer is in use"
-msgstr "%를 컴퓨터 사용 시 씁니다"
+#: clientgui/DlgAdvPreferencesBase.cpp:586
+msgid "When computer is not in use, use at most"
+msgstr "컴퓨터 미사용시 최대 사용량"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:701
-#, no-c-format
-msgid "% when computer is idle"
-msgstr "%를 컴퓨터가 대기 중일때 씁니다"
+#: clientgui/DlgAdvPreferencesBase.cpp:595
+msgid "Leave non-GPU tasks in memory while suspended"
+msgstr "일시중지되는 동안 비GPU 태스크를 메모리에 남겨두기"
+
+#: 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."
+msgstr "체크할 경우, 일시중지된 태스크는 메모리에 남으며 재개시 작업량이 줄지 않습니다. 체크하지 않을 경우, 일시중지된 태스크는 메모리에서 제거되며 재개시 마지막 기록지점에서 시작합니다."
+
+#: clientgui/DlgAdvPreferencesBase.cpp:600
+#, c-format
+msgid "Limit the swap space (page file) used by %s."
+msgstr "%s에서 사용하는 스왑 공간(페이지 파일)을 제한합니다."
+
+#: clientgui/DlgAdvPreferencesBase.cpp:602
+msgid "Page/swap file: use at most"
+msgstr "페이지/스왑 파일: 최대"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:627
+msgid "and"
+msgstr "부터"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:628
+msgid "to"
+msgstr "에서"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:641
+msgid "Compute only during a particular period each day."
+msgstr "각 날짜별로 특정 시간대에만 연산을 수행합니다."
+
+#: clientgui/DlgAdvPreferencesBase.cpp:644
+msgid "Compute only between"
+msgstr "이 시간 사이에만 연산:"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:654
+#: clientgui/DlgAdvPreferencesBase.cpp:801
+msgid "Day-of-week override"
+msgstr "일주일 중 시간 설정을 덮어쓸 날"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:658
+#: clientgui/DlgAdvPreferencesBase.cpp:805
+msgid "Override the times above on the selected days:"
+msgstr "선택한 요일에는 상기 시간 설정을 덮어쓰기:"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:676
+#: clientgui/DlgAdvPreferencesBase.cpp:822
+msgid "Monday"
+msgstr "월요일"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:706
-msgid "Leave applications in memory while suspended"
-msgstr "일시 정지시 응용 프로그램을 메모리에서 비웁니다"
+#: clientgui/DlgAdvPreferencesBase.cpp:691
+#: clientgui/DlgAdvPreferencesBase.cpp:837
+msgid "Friday"
+msgstr "금요일"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:708
-msgid "if checked, suspended work units are left in memory"
-msgstr "체크되면 일시 정지시 작업 유닛을 메모리에서 비웁니다"
+#: clientgui/DlgAdvPreferencesBase.cpp:704
+#: clientgui/DlgAdvPreferencesBase.cpp:850
+msgid "Tuesday"
+msgstr "화요일"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:728
-msgid "Suspend processor and network usage when these applications are running:"
-msgstr "이 응용 프로그램이 실행 중인 동안에 프로세서와 네트워크 사용을 일시중지:"
+#: clientgui/DlgAdvPreferencesBase.cpp:719
+#: clientgui/DlgAdvPreferencesBase.cpp:865
+msgid "Saturday"
+msgstr "토요일"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:738
-msgid "Add..."
-msgstr "추가..."
+#: clientgui/DlgAdvPreferencesBase.cpp:732
+#: clientgui/DlgAdvPreferencesBase.cpp:878
+msgid "Wednesday"
+msgstr "수요일"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:739
-msgid "Add an application to this list"
-msgstr "응용 프로그램을 이 목록에 추가"
+#: clientgui/DlgAdvPreferencesBase.cpp:747
+#: clientgui/DlgAdvPreferencesBase.cpp:893
+msgid "Sunday"
+msgstr "일요일"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:744
-msgid "Remove"
-msgstr "제거"
+#: clientgui/DlgAdvPreferencesBase.cpp:760
+#: clientgui/DlgAdvPreferencesBase.cpp:906
+msgid "Thursday"
+msgstr "목요일"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:745
-msgid "Remove an application from this list"
-msgstr "이 목록에서 응용 프로그램을 제거"
+#: clientgui/DlgAdvPreferencesBase.cpp:789
+msgid "Transfer files only during a particular period each day."
+msgstr "각 날짜별로 특정 기간에만 파일 전송이 이루어집니다."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:754
-msgid "For advanced options, refer to "
-msgstr "고급 옵션은 다음을 따릅니다"
+#: clientgui/DlgAdvPreferencesBase.cpp:791
+msgid "Transfer files only between"
+msgstr "이 시간 사이에만 전송:"
 
 #: clientgui/DlgDiagnosticLogFlags.cpp:65
 #, c-format
 msgid "%s Diagnostic Log Flags"
-msgstr "%s 진단 기록 플래그"
+msgstr "%s 진단 로그 플래그"
 
 #: clientgui/DlgDiagnosticLogFlags.cpp:83
-msgid "These flags enable various types of diagnostic messages in the Event Log."
-msgstr "이런 플래그들은 이벤트 기록에서 다양한 종류의 진단 메세지를 활성화시킵니다."
+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:105
+#: clientgui/DlgDiagnosticLogFlags.cpp:120 clientgui/DlgHiddenColumns.cpp:101
 msgid "Save all values and close the dialog"
 msgstr "모든 값을 저장하고 창을 닫습니다"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:108
+#: clientgui/DlgDiagnosticLogFlags.cpp:123 clientgui/DlgHiddenColumns.cpp:104
 msgid "Defaults"
 msgstr "기본값"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:109
+#: clientgui/DlgDiagnosticLogFlags.cpp:124 clientgui/DlgHiddenColumns.cpp:105
 msgid "Restore default settings"
-msgstr "기본 설정으로 복원합니다"
+msgstr "기본 설정값으로 복원"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:113
+#: clientgui/DlgDiagnosticLogFlags.cpp:128 clientgui/DlgHiddenColumns.cpp:109
 msgid "Close the dialog without saving"
 msgstr "저장하지 않고 창을 닫습니다"
 
-#: clientgui/DlgEventLog.cpp:226
+#: clientgui/DlgEventLog.cpp:227
 #, c-format
 msgid "%s - Event Log"
 msgstr "%s - 이벤트 로그"
 
-#: clientgui/DlgEventLog.cpp:236
+#: clientgui/DlgEventLog.cpp:237
 msgid "Project"
 msgstr "프로젝트"
 
-#: clientgui/DlgEventLog.cpp:237
+#: clientgui/DlgEventLog.cpp:238
 msgid "Time"
 msgstr "시간"
 
-#: clientgui/DlgEventLog.cpp:238
+#: clientgui/DlgEventLog.cpp:239
 msgid "Message"
 msgstr "메시지"
 
-#: clientgui/DlgEventLog.cpp:300
-#: clientgui/DlgEventLog.cpp:364
+#: clientgui/DlgEventLog.cpp:301 clientgui/DlgEventLog.cpp:351
 msgid "&Show only this project"
 msgstr "이 프로젝트만 보여주기(&S)"
 
-#: clientgui/DlgEventLog.cpp:304
+#: clientgui/DlgEventLog.cpp:305
 msgid "Copy &All"
 msgstr "모두 복사(&A)"
 
-#: clientgui/DlgEventLog.cpp:306
-#: clientgui/DlgEventLog.cpp:310
+#: clientgui/DlgEventLog.cpp:307 clientgui/DlgEventLog.cpp:311
 msgid "Copy all the messages to the clipboard."
 msgstr "모든 메시지를 클립보드에 복사"
 
-#: clientgui/DlgEventLog.cpp:315
+#: clientgui/DlgEventLog.cpp:316
 msgid "Copy &Selected"
 msgstr "선택한 항목 복사(&S)"
 
-#: clientgui/DlgEventLog.cpp:318
-#: clientgui/DlgEventLog.cpp:326
-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
+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 "선택한 메세지를 클립보드로 복사합니다. 메세지를 클릭하는 동안 shift 키나 control 키를 눌러 여러 메세지를 선택할 수 있습니다"
 
-#: clientgui/DlgEventLog.cpp:320
-#: clientgui/DlgEventLog.cpp:328
-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
+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 "클립보드에 선택한 메시지를 복사합니다. 메시지를 클릭하는 동안 Shift나 Control 키를 누른 상태에서 여러 메시지를 선택할 수 있습니다."
 
-#: clientgui/DlgEventLog.cpp:335
-#: clientgui/DlgItemProperties.cpp:67
+#: clientgui/DlgEventLog.cpp:336 clientgui/DlgItemProperties.cpp:67
 msgid "&Close"
 msgstr "닫기"
 
-#: clientgui/DlgEventLog.cpp:344
-#, c-format
-msgid "Get help with %s"
-msgstr "%s 도움말을 얻으세요"
-
-#: clientgui/DlgEventLog.cpp:358
+#: clientgui/DlgEventLog.cpp:345
 msgid "Show all &messages"
 msgstr "모든 메시지 보여주기(&m)"
 
-#: clientgui/DlgEventLog.cpp:359
-#: clientgui/DlgEventLog.cpp:361
+#: clientgui/DlgEventLog.cpp:346 clientgui/DlgEventLog.cpp:348
 msgid "Show messages for all projects"
 msgstr "모든 프로젝트의 메세지를 보여줍니다."
 
-#: clientgui/DlgEventLog.cpp:365
-#: clientgui/DlgEventLog.cpp:367
+#: clientgui/DlgEventLog.cpp:352 clientgui/DlgEventLog.cpp:354
 msgid "Show only the messages for the selected project"
 msgstr "선택한 프로젝의 메세지만 보여줍니다."
 
+#: clientgui/DlgExclusiveApps.cpp:60
+#, c-format
+msgid "%s - Exclusive Applications"
+msgstr "%s - 독점 프로그램"
+
+#: clientgui/DlgExclusiveApps.cpp:72
+msgid ""
+"Suspend processor and network usage when these applications are running:"
+msgstr "이 응용 프로그램이 실행 중인 동안에 프로세서와 네트워크 사용을 일시중지:"
+
+#: clientgui/DlgExclusiveApps.cpp:80 clientgui/DlgExclusiveApps.cpp:104
+msgid "Add..."
+msgstr "추가..."
+
+#: clientgui/DlgExclusiveApps.cpp:81 clientgui/DlgExclusiveApps.cpp:105
+msgid "Add an application to this list"
+msgstr "응용 프로그램을 이 목록에 추가"
+
+#: clientgui/DlgExclusiveApps.cpp:86 clientgui/DlgExclusiveApps.cpp:110
+msgid "Remove"
+msgstr "제거"
+
+#: clientgui/DlgExclusiveApps.cpp:87 clientgui/DlgExclusiveApps.cpp:111
+msgid "Remove an application from this list"
+msgstr "이 목록에서 응용 프로그램을 제거"
+
+#: clientgui/DlgExclusiveApps.cpp:96
+msgid "Suspend GPU usage when these applications are running:"
+msgstr "이 응용 프로그램이 실행 중인 동안에 GPU 사용을 일시중지:"
+
+#: clientgui/DlgExclusiveApps.cpp:122
+msgid "For advanced options, refer to "
+msgstr "고급 옵션은 다음을 따릅니다"
+
+#: clientgui/DlgExclusiveApps.cpp:147
+msgid "save all values and close the dialog"
+msgstr "모든 값을 저장하고 창을 닫습니다"
+
+#: clientgui/DlgExclusiveApps.cpp:153
+msgid "close the dialog without saving"
+msgstr "저장하지 않고 창을 닫습니다"
+
+#: clientgui/DlgExclusiveApps.cpp:158
+msgid "shows the preferences web page"
+msgstr "환경 설정 웹 페이지를 보여줍니다"
+
+#: clientgui/DlgExclusiveApps.cpp:303 clientgui/DlgExclusiveApps.cpp:309
+#: clientgui/DlgExclusiveApps.cpp:315
+msgid "Applications to add"
+msgstr "응용 프로그램이 추가됨"
+
+#: clientgui/DlgExclusiveApps.cpp:332
+#, c-format
+msgid "'%s' is not an executable application."
+msgstr "'%s'은(는) 실행 가능한 응용 프로그램이 아닙니다."
+
+#: clientgui/DlgExclusiveApps.cpp:333 clientgui/DlgExclusiveApps.cpp:380
+#: clientgui/DlgExclusiveApps.cpp:404
+msgid "Add Exclusive App"
+msgstr "독점 프로그램 추가"
+
+#: clientgui/DlgExclusiveApps.cpp:345
+msgid "Name of application to add?"
+msgstr "추가할 응용 프로그램명?"
+
+#: clientgui/DlgExclusiveApps.cpp:345
+msgid "Add exclusive app"
+msgstr "독점 프로그램 추가"
+
+#: clientgui/DlgExclusiveApps.cpp:379
+#, c-format
+msgid "Application names must end with '%s'"
+msgstr "응용 프로그램 이름은 반드시 '%s'로 끝나야 합니다"
+
+#: clientgui/DlgExclusiveApps.cpp:403
+#, c-format
+msgid "'%s' is already in the list."
+msgstr "'%s'는 이미 목록에 있습니다."
+
 #: clientgui/DlgExitMessage.cpp:82
 #, c-format
 msgid "%s - Exit Confirmation"
@@ -1684,13 +1736,7 @@ msgid ""
 "\n"
 "If you also want to stop running the tasks,\n"
 "choose from the following options:"
-msgstr ""
-"%s를 종료하도록 요청했습니다.\n"
-"여러분 컴퓨터에서 실행 중인 태스크는\n"
-"여러분이 보고 관리할 수 있게 허가됩니다.\n"
-"\n"
-"만약 실행 중인 태스크를 정지하도록 원한다면\n"
-"다음 선택사항을 선택하세요:"
+msgstr "%s를 종료하도록 요청했습니다.\n여러분 컴퓨터에서 실행 중인 태스크는\n여러분이 보고 관리할 수 있게 허가됩니다.\n\n만약 실행 중인 태스크를 정지하도록 원한다면\n다음 선택사항을 선택하세요:"
 
 #: clientgui/DlgExitMessage.cpp:135
 #, c-format
@@ -1701,13 +1747,7 @@ msgid ""
 "In most cases, it is better just to close the %s window\n"
 "rather than to exit the application; that will allow %s to run its\n"
 "tasks at the times you selected in your preferences."
-msgstr ""
-"이 후에 %s가 종료되고 나서 태스크 %s\n"
-" 또는 %s 화면 보호기가 다시 실행됩니다.\n"
-"\n"
-"대부분의 경우, 단지 %s 창을 닫는 것보다 오히려 응용\n"
-"프로그램을 종료하는게 낫습니다. 여러분이 환경 설정에서 선택한\n"
-"시간에 %s의 태스크 실행이 허용될 것입니다."
+msgstr "이 후에 %s가 종료되고 나서 태스크 %s\n 또는 %s 화면 보호기가 다시 실행됩니다.\n\n대부분의 경우, 단지 %s 창을 닫는 것보다 오히려 응용\n프로그램을 종료하는게 낫습니다. 여러분이 환경 설정에서 선택한\n시간에 %s의 태스크 실행이 허용될 것입니다."
 
 #: clientgui/DlgExitMessage.cpp:153
 #, c-format
@@ -1718,10 +1758,8 @@ msgstr "%s가 종료될 시 실행 중인 태스크 정지"
 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
 msgid "&Cancel"
 msgstr "취소(&C)"
 
@@ -1729,10 +1767,28 @@ msgstr "취소(&C)"
 msgid "Don't show this dialog again."
 msgstr "이 창을 다시 보여주지 않습니다."
 
-#: clientgui/DlgItemProperties.cpp:194
-#: clientgui/DlgItemProperties.cpp:197
-#: clientgui/DlgItemProperties.cpp:200
-#: clientgui/DlgItemProperties.cpp:203
+#: clientgui/DlgHiddenColumns.cpp:64
+#, c-format
+msgid "%s Column Selection"
+msgstr "%s 칼럼 선택"
+
+#: clientgui/DlgHiddenColumns.cpp:77
+#, c-format
+msgid "Select which columns %s should show."
+msgstr "%s가 보여줄 칼럼을 선택하세요."
+
+#: clientgui/DlgHiddenColumns.cpp:314
+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
 msgid "Don't fetch tasks for "
 msgstr "태스크를 반입 안 함: "
 
@@ -1764,8 +1820,7 @@ msgstr " 작업 반입 연기 간격"
 msgid "Properties of project "
 msgstr "프로젝트 속성"
 
-#: clientgui/DlgItemProperties.cpp:243
-#: clientgui/DlgOptions.cpp:221
+#: clientgui/DlgItemProperties.cpp:243 clientgui/DlgOptions.cpp:221
 msgid "General"
 msgstr "일반"
 
@@ -1797,6 +1852,10 @@ msgstr "파일 다운로드 지연"
 msgid "File uploads deferred for"
 msgstr "파일 업로드 지연"
 
+#: clientgui/DlgItemProperties.cpp:257
+msgid "Disk usage"
+msgstr "디스크 사용량"
+
 #: clientgui/DlgItemProperties.cpp:258
 msgid "Computer ID"
 msgstr "컴퓨터 ID"
@@ -1805,14 +1864,10 @@ msgstr "컴퓨터 ID"
 msgid "Non CPU intensive"
 msgstr "CPU 비 집약적"
 
-#: 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 "예"
 
@@ -1820,8 +1875,7 @@ msgstr "예"
 msgid "Suspended via GUI"
 msgstr "GUI를 통해서 일시정지"
 
-#: clientgui/DlgItemProperties.cpp:262
-#: clientgui/DlgItemProperties.cpp:263
+#: clientgui/DlgItemProperties.cpp:262 clientgui/DlgItemProperties.cpp:263
 msgid "no"
 msgstr "아니오"
 
@@ -1837,8 +1891,7 @@ msgstr "현재 진행중인 스케쥴러 부르기"
 msgid "Trickle-up pending"
 msgstr "Trickle up 메세지가 유보됨"
 
-#: clientgui/DlgItemProperties.cpp:271
-#: clientgui/DlgItemProperties.cpp:273
+#: clientgui/DlgItemProperties.cpp:271 clientgui/DlgItemProperties.cpp:273
 msgid "Host location"
 msgstr "호스트 위치"
 
@@ -1860,11 +1913,11 @@ msgstr "끝남"
 
 #: clientgui/DlgItemProperties.cpp:285
 msgid "Tasks completed"
-msgstr "태스크 완료됨"
+msgstr "태스크가 완료됨"
 
 #: clientgui/DlgItemProperties.cpp:286
 msgid "Tasks failed"
-msgstr "태스크 실패"
+msgstr "태스크 연산 실패"
 
 #: clientgui/DlgItemProperties.cpp:288
 msgid "Credit"
@@ -1930,13 +1983,11 @@ msgstr "추정된 연산 크기"
 msgid "CPU time at last checkpoint"
 msgstr "마지막 기록 지점의 CPU 시간"
 
-#: clientgui/DlgItemProperties.cpp:374
-#: clientgui/DlgItemProperties.cpp:389
+#: clientgui/DlgItemProperties.cpp:374 clientgui/DlgItemProperties.cpp:389
 msgid "CPU time"
 msgstr "CPU 시간"
 
-#: clientgui/DlgItemProperties.cpp:376
-#: clientgui/DlgItemProperties.cpp:390
+#: clientgui/DlgItemProperties.cpp:376 clientgui/DlgItemProperties.cpp:390
 msgid "Elapsed time"
 msgstr "경과 시간"
 
@@ -1968,8 +2019,7 @@ msgstr "프로세스 ID"
 msgid "Local: "
 msgstr "로컬: "
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: clientgui/DlgOptions.cpp:129 clientgui/DlgOptions.cpp:135
 msgid "Options"
 msgstr "선택 사항"
 
@@ -2033,33 +2083,27 @@ msgstr "HTTP 프록시 서버를 통해 접속"
 msgid "HTTP Proxy Server Configuration"
 msgstr "HTTP 프록시 서버 설정"
 
-#: 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
 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
 msgid "User Name:"
 msgstr "사용자 이름:"
 
-#: clientgui/DlgOptions.cpp:320
-#: clientgui/DlgOptions.cpp:384
+#: clientgui/DlgOptions.cpp:320 clientgui/DlgOptions.cpp:384
 #: clientgui/DlgSelectComputer.cpp:152
 msgid "Password:"
 msgstr "암호:"
@@ -2111,7 +2155,9 @@ msgstr "%s - 언어 선택"
 
 #: 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 "%s 언어가 변경되었습니다.  해당 변경 사항을 적용하기 위해서는 %s을(를) 재시작해야 됩니다."
 
 #: clientgui/DlgSelectComputer.cpp:91
@@ -2124,16 +2170,13 @@ msgstr "%s - 컴퓨터 선택"
 msgid ""
 "Another instance of %s is already running \n"
 "on this computer.  Please select a client to monitor."
-msgstr ""
-"다른 %s 객체가 이미 이 컴퓨터에서 \n"
-"실행중입니다. 모니터에서 클라이언트를 선택해 주세요."
+msgstr "다른 %s 객체가 이미 이 컴퓨터에서 \n실행중입니다. 모니터에서 클라이언트를 선택해 주세요."
 
 #: clientgui/DlgSelectComputer.cpp:143
 msgid "Host name:"
 msgstr "호스트 이름:"
 
-#: clientgui/Localization.cpp:31
-#: clientgui/Localization.cpp:69
+#: clientgui/Localization.cpp:31 clientgui/Localization.cpp:69
 msgid "Message boards"
 msgstr "게시판"
 
@@ -2145,15 +2188,12 @@ msgstr "SETI at home상의 다른 사용자와 게시판에서 이야기를 주고
 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 "계정 정보와 모든 크레딧을 볼 수 있습니다"
@@ -2166,18 +2206,15 @@ msgstr "설정"
 msgid "View and modify your SETI at home account profile and preferences"
 msgstr "SETI at home 계정 프로필과 환경 설정을 보고 수정할 수 있습니다"
 
-#: 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 "컴퓨터"
 
@@ -2185,13 +2222,11 @@ msgstr "컴퓨터"
 msgid "View a listing of all the computers on which you are running SETI at Home"
 msgstr "SETI at Home을 수행 중인 모든 컴퓨터 목록을 보여줍니다"
 
-#: 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 "여러분이 속한 팀 정보를 보여줍니다"
 
@@ -2212,7 +2247,8 @@ msgid "Read a detailed description of the Einstein at Home screensaver"
 msgstr "Einstein at Home 화면보호기에 대해서 보다 자세한 정보를 읽어봅니다"
 
 #: 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 "Einstein at Home 게시판에서 운영자 및 다른 사용자와 이야기를 주고 받으세요"
 
 #: clientgui/Localization.cpp:73
@@ -2240,7 +2276,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 "Einstein at Home을 수행 중인 모든 컴퓨터 목록을 보여줍니다"
 
 #: clientgui/Localization.cpp:101
@@ -2248,7 +2285,9 @@ msgid "LIGO project"
 msgstr "LIGO 프로젝트"
 
 #: 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 "레이저 간섭계 중력파 관측소 (LIGO) 프로젝트 홈 페이지"
 
 #: clientgui/Localization.cpp:105
@@ -2259,8 +2298,7 @@ msgstr "GEO-600 프로젝트"
 msgid "The home page of the GEO-600 project"
 msgstr "GEO-600 프로젝트의 홈 페이지"
 
-#: clientgui/Localization.cpp:115
-#: clientgui/Localization.cpp:133
+#: clientgui/Localization.cpp:115 clientgui/Localization.cpp:133
 msgid "Team"
 msgstr "팀"
 
@@ -2341,7 +2379,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 "http://cord.sourceforge.net에서 CoRD 어플리케이션을 다운로드하고 설치하세요"
 
 #: clientgui/MainDocument.cpp:2442
@@ -2412,8 +2452,7 @@ msgstr "다운로드 실패"
 msgid "Downloading"
 msgstr "다운로드 중"
 
-#: clientgui/MainDocument.cpp:2492
-#: clientgui/MainDocument.cpp:2557
+#: clientgui/MainDocument.cpp:2492 clientgui/MainDocument.cpp:2551
 msgid " (suspended - "
 msgstr " (일시 정지됨 - "
 
@@ -2425,7 +2464,7 @@ msgstr "사용자가 일시 정지시킨 프로젝트"
 msgid "Task suspended by user"
 msgstr "사용자가 일시 정지시킨 태스크"
 
-#: clientgui/MainDocument.cpp:2504
+#: clientgui/MainDocument.cpp:2507
 msgid "Suspended - "
 msgstr "일시 정지됨 - "
 
@@ -2433,92 +2472,91 @@ msgstr "일시 정지됨 - "
 msgid "GPU suspended - "
 msgstr "GPU 일시 정지됨 - "
 
-#: clientgui/MainDocument.cpp:2517
+#: clientgui/MainDocument.cpp:2514
 msgid "Waiting for memory"
 msgstr " - 디스크 공간이 부족합니다"
 
-#: clientgui/MainDocument.cpp:2519
+#: clientgui/MainDocument.cpp:2516
 msgid "Waiting for shared memory"
 msgstr "공유된 메모리가 비길 기다리고 있습니다"
 
-#: clientgui/MainDocument.cpp:2521
+#: clientgui/MainDocument.cpp:2518
 msgid "Running"
 msgstr "실행 중"
 
-#: clientgui/MainDocument.cpp:2523
+#: clientgui/MainDocument.cpp:2520
 msgid " (non-CPU-intensive)"
 msgstr "(CPU 비 집약적)"
 
-#: clientgui/MainDocument.cpp:2526
+#: clientgui/MainDocument.cpp:2523
 msgid "Waiting to run"
 msgstr "실행 대기 중"
 
-#: clientgui/MainDocument.cpp:2528
-#: clientgui/MainDocument.cpp:2534
+#: clientgui/MainDocument.cpp:2525 clientgui/MainDocument.cpp:2528
 msgid "Ready to start"
 msgstr "시작 대기"
 
-#: clientgui/MainDocument.cpp:2538
+#: clientgui/MainDocument.cpp:2532
 msgid "Postponed: "
-msgstr "지연: "
+msgstr "보류됨:"
 
-#: clientgui/MainDocument.cpp:2541
+#: clientgui/MainDocument.cpp:2535
 msgid "Postponed"
-msgstr "지연됨"
+msgstr "보류됨"
 
-#: clientgui/MainDocument.cpp:2545
+#: clientgui/MainDocument.cpp:2539
 msgid "Waiting for network access"
 msgstr "네트워크 액세스 대기중"
 
-#: clientgui/MainDocument.cpp:2549
+#: clientgui/MainDocument.cpp:2543
 msgid "Computation error"
 msgstr "계산 오류"
 
-#: clientgui/MainDocument.cpp:2553
+#: clientgui/MainDocument.cpp:2547
 msgid "Upload failed"
 msgstr "업로드 실패"
 
-#: clientgui/MainDocument.cpp:2555
+#: clientgui/MainDocument.cpp:2549
 msgid "Uploading"
 msgstr "업로드 중"
 
-#: clientgui/MainDocument.cpp:2566
+#: clientgui/MainDocument.cpp:2560
 msgid "Aborted by user"
 msgstr "사용자 요구로 중단됨"
 
-#: clientgui/MainDocument.cpp:2569
+#: clientgui/MainDocument.cpp:2563
 msgid "Aborted by project"
 msgstr "프로젝트가 중단됨"
 
-#: clientgui/MainDocument.cpp:2572
+#: clientgui/MainDocument.cpp:2566
 msgid "Aborted: not started by deadline"
 msgstr "취소됨: 마감 시각이 지났습니다"
 
-#: clientgui/MainDocument.cpp:2575
+#: clientgui/MainDocument.cpp:2569
 msgid "Aborted: disk limit exceeded"
 msgstr "중단됨: 디스크 사용량 제한치에 도달함"
 
-#: clientgui/MainDocument.cpp:2578
+#: clientgui/MainDocument.cpp:2572
 msgid "Aborted: run time limit exceeded"
 msgstr "중단됨: 실행 시간 제한치에 도달함"
 
-#: clientgui/MainDocument.cpp:2581
+#: clientgui/MainDocument.cpp:2575
 msgid "Aborted: memory limit exceeded"
 msgstr "중단됨: 메모리 제한치에 도달함"
 
-#: clientgui/MainDocument.cpp:2584
+#: clientgui/MainDocument.cpp:2578
 msgid "Aborted"
 msgstr "중단됨"
 
-#: clientgui/MainDocument.cpp:2589
+#: clientgui/MainDocument.cpp:2583
 msgid "Acknowledged"
 msgstr "다운로드 성공"
 
-#: clientgui/MainDocument.cpp:2591
+#: clientgui/MainDocument.cpp:2585
 msgid "Ready to report"
 msgstr "리포트 준비 됨"
 
-#: clientgui/MainDocument.cpp:2593
+#: clientgui/MainDocument.cpp:2587
 #, c-format
 msgid "Error: invalid state '%d'"
 msgstr "오류: 잘못된 상태 '%d'"
@@ -2540,10 +2578,7 @@ msgid ""
 "The URL you supplied is not that of a BOINC-based project.\n"
 "\n"
 "Please check the URL and try again."
-msgstr ""
-"입력하신 URL은 BOINC 기반 프로젝트가 아닙니다.\n"
-"\n"
-"URL을 확인하시고 다시 시도해 주세요."
+msgstr "입력하신 URL은 BOINC 기반 프로젝트가 아닙니다.\n\nURL을 확인하시고 다시 시도해 주세요."
 
 #: clientgui/NotDetectedPage.cpp:188
 msgid "Account manager not found"
@@ -2555,10 +2590,7 @@ msgid ""
 "manager.\n"
 "\n"
 "Please check the URL and try again."
-msgstr ""
-"입력하신 URL은 BOINC 기반 계정 관리자가 아닙니다.\n"
-"\n"
-"URL을 확인하시고 다시 시도해 주세요."
+msgstr "입력하신 URL은 BOINC 기반 계정 관리자가 아닙니다.\n\nURL을 확인하시고 다시 시도해 주세요."
 
 #: clientgui/NotFoundPage.cpp:181
 msgid "Login Failed."
@@ -2580,53 +2612,54 @@ msgstr "자세히..."
 msgid "Choose a project"
 msgstr "프로젝트를 선택하세요"
 
-#: clientgui/ProjectInfoPage.cpp:228
+#: clientgui/ProjectInfoPage.cpp:226
 msgid "To choose a project, click its name or type its URL below."
 msgstr "프로젝트를 선택하려면 이를을 클릭하거나 하단에 URL을 입력하세요."
 
-#: clientgui/ProjectInfoPage.cpp:246
+#: clientgui/ProjectInfoPage.cpp:242
 msgid "Categories:"
 msgstr "카테고리:"
 
-#: clientgui/ProjectInfoPage.cpp:267
+#: clientgui/ProjectInfoPage.cpp:262
 msgid "Projects:"
 msgstr "프로젝트:"
 
-#: clientgui/ProjectInfoPage.cpp:279
+#: clientgui/ProjectInfoPage.cpp:274
 msgid "Project details"
 msgstr "프로젝트 상세 정보"
 
-#: clientgui/ProjectInfoPage.cpp:291
+#: clientgui/ProjectInfoPage.cpp:284
 msgid "Research area:"
 msgstr "연구 분야:"
 
-#: clientgui/ProjectInfoPage.cpp:302
+#: clientgui/ProjectInfoPage.cpp:294
 msgid "Organization:"
 msgstr "소속:"
 
-#: clientgui/ProjectInfoPage.cpp:313
+#: clientgui/ProjectInfoPage.cpp:304
 msgid "Web site:"
 msgstr "웹 사이트:"
 
-#: clientgui/ProjectInfoPage.cpp:325
+#: clientgui/ProjectInfoPage.cpp:315
 msgid "Supported systems:"
 msgstr "지원되는 시스템:"
 
-#: clientgui/ProjectInfoPage.cpp:363
+#: clientgui/ProjectInfoPage.cpp:352
 msgid "Project URL:"
 msgstr "프로젝트 URL:"
 
-#: clientgui/ProjectInfoPage.cpp:499
-#: clientgui/ProjectInfoPage.cpp:754
-#: clientgui/ProjectInfoPage.cpp:758
+#: clientgui/ProjectInfoPage.cpp:486 clientgui/ProjectInfoPage.cpp:686
+#: clientgui/ProjectInfoPage.cpp:690
 msgid "All"
 msgstr "전체"
 
-#: clientgui/ProjectInfoPage.cpp:802
-msgid "This project may not have work for your type of computer.  Do you want to add it anyway?"
+#: clientgui/ProjectInfoPage.cpp:735
+msgid ""
+"This project may not have work for your type of computer.  Do you want to "
+"add it anyway?"
 msgstr "이 프로젝트는 해당 컴퓨터에서 동작하지 않을 수도 있습니다. 그래도 추가하시겠습니까?"
 
-#: clientgui/ProjectInfoPage.cpp:826
+#: clientgui/ProjectInfoPage.cpp:767
 msgid "You already added this project. Please choose a different project."
 msgstr "이미 이 프로젝트가 추가되어 있습니다. 다른 프로젝트를 선택해주세요."
 
@@ -2634,12 +2667,12 @@ msgstr "이미 이 프로젝트가 추가되어 있습니다. 다른 프로젝
 msgid "Communicating with project."
 msgstr "프로젝트 서버와 통신 중"
 
-#: clientgui/ProjectProcessingPage.cpp:510
+#: clientgui/ProjectProcessingPage.cpp:509
 msgid "Required files not found on the server."
 msgstr "서버에서 필요한 파일을 찾을 수 없습니다."
 
-#: clientgui/ProjectProcessingPage.cpp:513
-#: clientgui/ProjectProcessingPage.cpp:586
+#: clientgui/ProjectProcessingPage.cpp:512
+#: clientgui/ProjectProcessingPage.cpp:585
 msgid "An internal server error has occurred."
 msgstr "내부 서버 오류가 발생했습니다."
 
@@ -2647,9 +2680,7 @@ msgstr "내부 서버 오류가 발생했습니다."
 msgid ""
 "Communicating with project\n"
 "Please wait..."
-msgstr ""
-"프로젝트 서버와 통신하고 있습니다\n"
-"잠시 기다려 주세요..."
+msgstr "프로젝트 서버와 통신하고 있습니다\n잠시 기다려 주세요..."
 
 #: clientgui/ProjectWelcomePage.cpp:251
 #, c-format
@@ -2666,11 +2697,11 @@ msgstr "이름:"
 
 #: clientgui/ProjectWelcomePage.cpp:258
 msgid "Home:"
-msgstr "홈 페이지:"
+msgstr "홈페이지:"
 
 #: clientgui/ProjectWelcomePage.cpp:262
 msgid "Description:"
-msgstr "설명:"
+msgstr "개요:"
 
 #: clientgui/ProjectWelcomePage.cpp:265
 msgid "URL:"
@@ -2681,7 +2712,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 "경고: 이 프로젝트는 BOINC에 등록되지 않았습니다. 계속하기 전에 신뢰할 수 있는지 확인하세요."
 
 #: clientgui/ProjectWelcomePage.cpp:277
@@ -2707,20 +2740,7 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"The World Community Grid - BOINC 소프트웨어는 인터넷을 통한\n"
-"통신에 실패했습니다. 이유는 대부분 다음과 같습니다:\n"
-"\n"
-"1) 접속 문제. 네트워크 또는 모뎀 연결이 잘 되있나 점검하세요\n"
-"그리고나서 이전을 눌러서 다시 시도하세요.\n"
-"\n"
-"2) 개인 방화벽 소프트웨어가 World Community Grid\n"
-" - BOINC 소프트웨어를 막았습니다. 개인 방화벽을 설정해서\n"
-"BOINC와 BOINC 관리자가 80번과 443번 포트를 사용가능하게 한 후\n"
-"이전을 눌러 다시 시도하세요.\n"
-"\n"
-"3) 프록시 서버를 사용하고 계시다면\n"
-"다음을 눌러 BOINC 프록시 설정을 설정해주세요."
+msgstr "The World Community Grid - BOINC 소프트웨어는 인터넷을 통한\n통신에 실패했습니다. 이유는 대부분 다음과 같습니다:\n\n1) 접속 문제. 네트워크 또는 모뎀 연결이 잘 되있나 점검하세요\n그리고나서 이전을 눌러서 다시 시도하세요.\n\n2) 개인 방화벽 소프트웨어가 World Community Grid\n - BOINC 소프트웨어를 막았습니다. 개인 방화벽을 설정해서\nBOINC와 BOINC 관리자가 80번과 443번 포트를 사용가능하게 한 후\n이전을 눌러 다시 시도하세요.\n\n3) 프록시 서버를 사용하고 계시다면\n다음을 눌러 BOINC 프록시 설정을 설정해주세요."
 
 #: clientgui/ProxyInfoPage.cpp:203
 msgid ""
@@ -2737,18 +2757,7 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"BOINC는 인터넷 통신에 실패했습니다. 대부분\n"
-"이유는:\n"
-"\n"
-"1) 접속 문제. 네트워크를 점검하세요\n"
-"아니면 모뎀을 연결하고 다시 시도하세요.\n"
-"\n"
-"2) 개인 방화벽 소프트웨어가 BOINC를 막았습니다.\n"
-"개인 방화벽을 설정해서 BOINC가 80번 포트를 사용가능하게 한 후 다시 시도하세요.\n"
-"\n"
-"3) 프록시 서버를 사용하고 계시다면\n"
-"다음을 눌러 BOINC 프록시 설정을 설정해주세요."
+msgstr "BOINC는 인터넷 통신에 실패했습니다. 대부분\n이유는:\n\n1) 접속 문제. 네트워크를 점검하세요\n아니면 모뎀을 연결하고 다시 시도하세요.\n\n2) 개인 방화벽 소프트웨어가 BOINC를 막았습니다.\n개인 방화벽을 설정해서 BOINC가 80번 포트를 사용가능하게 한 후 다시 시도하세요.\n\n3) 프록시 서버를 사용하고 계시다면\n다음을 눌러 BOINC 프록시 설정을 설정해주세요."
 
 #: clientgui/ProxyPage.cpp:331
 msgid "Proxy configuration"
@@ -2758,8 +2767,7 @@ msgstr "프록시 설정"
 msgid "HTTP proxy"
 msgstr "HTTP 프록시"
 
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
+#: clientgui/ProxyPage.cpp:337 clientgui/ProxyPage.cpp:357
 msgid "Server:"
 msgstr "서버:"
 
@@ -2771,51 +2779,64 @@ msgstr "자동 감지"
 msgid "SOCKS proxy"
 msgstr "SOCKS 프록시"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:167
+#: clientgui/sg_BoincSimpleFrame.cpp:166
+msgid "Skin"
+msgstr "스킨"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:168
+msgid "Select the appearance of the user interface."
+msgstr "사용자 인터페이스의 외형을 선택하세요."
+
+#: clientgui/sg_BoincSimpleFrame.cpp:179
+msgid "Display diagnostic messages."
+msgstr "진단 메세지를 보여줍니다."
+
+#: clientgui/sg_BoincSimpleFrame.cpp:184
 msgid "Advanced View...\tCtrl+Shift+A"
 msgstr "고급 보기...\tCtrl+Shift+A"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:168
+#: clientgui/sg_BoincSimpleFrame.cpp:185
 msgid "Display the advanced graphical interface."
 msgstr "고급 사용자 그래픽 인터페이스를 표시합니다."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:175
-msgid "Skin"
-msgstr "스킨"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:177
-msgid "Select the appearance of the user interface."
-msgstr "사용자 인터페이스의 외형을 선택하세요."
+#: clientgui/sg_BoincSimpleFrame.cpp:201
+msgid "Configure display options and proxy settings"
+msgstr "화면 옵션과 프록시 환경을 설정합니다"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:224
+#: clientgui/sg_BoincSimpleFrame.cpp:222
 #, c-format
 msgid "&%s"
 msgstr "&%s"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:405
+#: clientgui/sg_BoincSimpleFrame.cpp:396
 msgid "Default"
 msgstr "기본값"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:848
+#: clientgui/sg_BoincSimpleFrame.cpp:838
 msgid "Suspend"
 msgstr "일시 정지"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:850
+#: clientgui/sg_BoincSimpleFrame.cpp:840
 msgid "Suspend Computing"
 msgstr "연산 일시중지"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:851
+#: clientgui/sg_BoincSimpleFrame.cpp:841
 msgid "Resume Computing"
 msgstr "연산 재개"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:867
+#: clientgui/sg_BoincSimpleFrame.cpp:857
 msgid "Notices"
 msgstr "공지 사항"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:868
+#: clientgui/sg_BoincSimpleFrame.cpp:858
 msgid "Open a window to view notices from projects or BOINC"
 msgstr "BOINC나 프로젝트에서 온 공지 사항을 보기 위해 창을 엽니다"
 
+#: clientgui/sg_BoincSimpleFrame.cpp:879
+#, c-format
+msgid "Get help with %s"
+msgstr "%s 도움말을 얻으세요"
+
 #: clientgui/sg_DlgMessages.cpp:124
 msgid "Fetching notices; please wait..."
 msgstr "공지사항 수신 중. 잠시만 기다려 주세요..."
@@ -2833,233 +2854,104 @@ msgstr "닫기"
 msgid "%s - Notices"
 msgstr "%s - 공지 사항"
 
-#: clientgui/sg_DlgPreferences.cpp:270
-msgid "This dialog controls preferences for this computer only."
-msgstr "이 다이얼로그는 이 컴퓨터의 환경 설정만 제어합니다."
-
-#: clientgui/sg_DlgPreferences.cpp:275
-msgid "Click OK to set preferences."
-msgstr "저장하려면 확인을 누르세요."
-
-#: clientgui/sg_DlgPreferences.cpp:280
-msgid "Click Clear to restore web-based settings for all preferences listed below."
-msgstr "아래 나열된 모든 환경설정을 웹기반 설정으로 복원하려면 지우기를 누르세요."
-
-#: clientgui/sg_DlgPreferences.cpp:287
-msgid "For additional settings, select Computing Preferences in the Advanced View."
+#: clientgui/sg_DlgPreferences.cpp:187
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
 msgstr "추가적인 설정은 고급 보기 상태로 변경 후 연산 환경 설정에서 선택하세요."
 
-#: clientgui/sg_DlgPreferences.cpp:315
-msgid "Do work only between:"
-msgstr "이 시간 사이에만 작업:"
-
-#: clientgui/sg_DlgPreferences.cpp:337
-msgid "Connect to internet only between:"
-msgstr "이 시간 사이에만 인터넷이 접속:"
-
-#: clientgui/sg_DlgPreferences.cpp:359
-#: clientgui/sg_DlgPreferences.cpp:376
-msgid "Use no more than:"
-msgstr "최대 사용 한도:"
-
-#: clientgui/sg_DlgPreferences.cpp:372
-msgid "of disk space"
-msgstr "디스크 공간"
-
-#: clientgui/sg_DlgPreferences.cpp:389
-msgid "of the processor"
-msgstr "프로세서"
-
-#: clientgui/sg_DlgPreferences.cpp:393
-msgid "Do work while on battery?"
-msgstr "배터리 가동 중에도 작업하시겠습니까?"
-
-#: clientgui/sg_DlgPreferences.cpp:406
-msgid "Do work after idle for:"
-msgstr "이 시간 이상 대기 후 작업:"
-
-#: clientgui/sg_DlgPreferences.cpp:431
-msgid "Clear all local preferences listed above and close the dialog"
-msgstr "위에 나열된 모든 로컬 환경 설정이 지우고 다이얼로그를 닫습니다"
-
-#: clientgui/sg_DlgPreferences.cpp:609
-#: clientgui/sg_DlgPreferences.cpp:612
-#: clientgui/sg_DlgPreferences.cpp:688
-#: clientgui/sg_DlgPreferences.cpp:692
-#: clientgui/sg_DlgPreferences.cpp:704
-#: clientgui/sg_DlgPreferences.cpp:708
-#: clientgui/sg_DlgPreferences.cpp:851
-#: clientgui/sg_DlgPreferences.cpp:862
-msgid "Anytime"
-msgstr "언제든"
-
-#: clientgui/sg_DlgPreferences.cpp:645
-msgid "100 MB"
-msgstr "100 MB"
+#: clientgui/sg_DlgPreferences.cpp:289
+msgid "GB of disk space"
+msgstr "GB 디스크 공간"
 
-#: clientgui/sg_DlgPreferences.cpp:646
-msgid "200 MB"
-msgstr "200 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:647
-msgid "500 MB"
-msgstr "500 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:648
-msgid "1 GB"
-msgstr "1 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:649
-msgid "2 GB"
-msgstr "2 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:650
-msgid "5 GB"
-msgstr "5 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:651
-msgid "10 GB"
-msgstr "10 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:652
-msgid "20 GB"
-msgstr "20 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:653
-msgid "50 GB"
-msgstr "50 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:654
-msgid "100 GB"
-msgstr "100 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:724
-#, c-format
-msgid "%d MB"
-msgstr "%d MB"
-
-#: clientgui/sg_DlgPreferences.cpp:726
-#, c-format
-msgid "%4.2f GB"
-msgstr "%4.2f GB"
-
-#: clientgui/sg_DlgPreferences.cpp:767
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: clientgui/sg_DlgPreferences.cpp:803
-msgid "0 (Run Always)"
-msgstr "0 (항상 실행)"
-
-#: clientgui/sg_DlgPreferences.cpp:806
-#, c-format
-msgid "%d"
-msgstr "%d"
-
-#: clientgui/sg_DlgPreferences.cpp:953
+#: clientgui/sg_DlgPreferences.cpp:980
 #, c-format
 msgid "%s - Computing Preferences"
 msgstr "%s - 연산 환경 설정"
 
-#: clientgui/sg_DlgPreferences.cpp:1033
-msgid "Do you really want to clear all local preferences?\n"
-msgstr "정말로 모든 로컬 환경설정을 지우겠습니까?\n"
+#: clientgui/sg_DlgPreferences.cpp:1061
+msgid "Discard all local preferences and use web-based preferences?"
+msgstr "모든 로컬 환경설정을 취소하고 웹기반 환경설정을 사용하겠습니까?"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:66
-#: clientgui/ViewProjects.cpp:179
 msgid "Update"
 msgstr "업데이트"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:67
-#: clientgui/ViewProjects.cpp:180
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
+msgid ""
+"Report all completed tasks, get latest credit, get latest preferences, and "
+"possibly get more tasks."
 msgstr "모든 완료된 태스크를 보고하고 마지막 크레딧과 환경 설정을 받아오며 가능하면 추가 태스크를 받아옵니다."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:73
 #: clientgui/sg_ProjectCommandPopup.cpp:129
-#: clientgui/ViewProjects.cpp:187
-#: clientgui/ViewProjects.cpp:727
 msgid "Suspend tasks for this project."
 msgstr "이 프로젝트 태스크를 일시 정지시킵니다."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:78
 #: clientgui/sg_ProjectCommandPopup.cpp:136
-#: clientgui/ViewProjects.cpp:193
-#: clientgui/ViewProjects.cpp:746
 msgid "No new tasks"
 msgstr "새 태스크 금지"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:79
-#: clientgui/ViewProjects.cpp:194
 msgid "Don't get new tasks for this project."
 msgstr "이 프로젝트의 새로운 태스크를 받지 않습니다."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:200
 msgid "Reset project"
 msgstr "프로젝트 다시 설정"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:85
-#: clientgui/ViewProjects.cpp:201
-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."
+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:208
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
+msgid ""
+"Remove this project.  Tasks in progress will be lost (use 'Update' first to "
+"report any completed tasks)."
 msgstr "이 프로젝트를 제거합니다. 진행 중인 태스크는 소실됩니다. (완료된 태스크를 보고하려면 '업데이트'를 사용하세요)"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:96
 #: clientgui/sg_TaskCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:214
 msgid "Properties"
 msgstr "속성"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:97
-#: clientgui/ViewProjects.cpp:215
 msgid "Show project details."
 msgstr "자세한 프로젝트 정보를 보여줍니다."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:126
-#: clientgui/ViewProjects.cpp:723
 msgid "Resume tasks for this project."
 msgstr "이 프로젝트의 태스크를 다시 시작합니다."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:133
-#: clientgui/ViewProjects.cpp:742
 msgid "Allow new tasks"
 msgstr "새 태스크 허용"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:134
-#: clientgui/ViewProjects.cpp:742
 msgid "Allow fetching new tasks for this project."
 msgstr "이 프로젝트의 새 태스크를 수용합니다."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:137
-#: clientgui/ViewProjects.cpp:746
 msgid "Don't fetch new tasks for this project."
 msgstr "이 프로젝트의 새 태스크를 수용하지 않습니다."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:229
-#: clientgui/ViewProjects.cpp:443
 #, c-format
 msgid "Are you sure you want to reset project '%s'?"
 msgstr "정말로 프로젝트 '%s' 다시 설정을 원하십니까?"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:235
-#: clientgui/ViewProjects.cpp:449
 msgid "Reset Project"
 msgstr "프로젝트 다시 설정"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:266
-#: clientgui/ViewProjects.cpp:501
 #, c-format
 msgid "Are you sure you want to remove project '%s'?"
 msgstr "정말로 프로젝트 '%s' 를(을) 제거하시겠습니까?"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:272
-#: clientgui/ViewProjects.cpp:507
 msgid "Remove Project"
 msgstr "프로젝트 제거"
 
@@ -3075,6 +2967,10 @@ msgstr "동기화"
 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 "계정 관리자 시스템과 프로젝트를 동기화"
@@ -3138,9 +3034,7 @@ msgstr "이 태스크를 일시 중지합니다."
 msgid ""
 "Are you sure you want to abort this task '%s'?\n"
 "(Progress: %.1lf%%, Status: %s)"
-msgstr ""
-"정말로 이 태스크 '%s'를 중단하시겠습니까?\n"
-"(진행률: %.1lf%%, 상태: %s)"
+msgstr "정말로 이 태스크 '%s'를 중단하시겠습니까?\n(진행률: %.1lf%%, 상태: %s)"
 
 #: clientgui/sg_TaskCommandPopup.cpp:272
 msgid "Abort task"
@@ -3211,52 +3105,51 @@ msgstr "남은 시간 (추정치): %s"
 msgid "Status: %s"
 msgstr "상태: %s"
 
-#: clientgui/sg_TaskPanel.cpp:1227
+#: clientgui/sg_TaskPanel.cpp:1228
 msgid "Retrieving current status."
 msgstr "현재 상태를 복구중."
 
-#: clientgui/sg_TaskPanel.cpp:1233
+#: clientgui/sg_TaskPanel.cpp:1234
 msgid "Downloading work from the server."
 msgstr "작업 유닛을 서버에서 다운로드하고 있습니다."
 
-#: clientgui/sg_TaskPanel.cpp:1238
+#: clientgui/sg_TaskPanel.cpp:1239
 msgid "Processing Suspended:  Running On Batteries."
 msgstr "작업 일시 정지: 컴퓨터가 배터리로 가동되고 있습니다."
 
-#: clientgui/sg_TaskPanel.cpp:1240
+#: clientgui/sg_TaskPanel.cpp:1241
 msgid "Processing Suspended:  User Active."
 msgstr "작업 일시 정지: 사용자가 활동을 시작했습니다."
 
-#: clientgui/sg_TaskPanel.cpp:1242
+#: clientgui/sg_TaskPanel.cpp:1243
 msgid "Processing Suspended:  User paused processing."
 msgstr "작업 일시 정지: 사용자가 작업을 중지시켰습니다."
 
-#: clientgui/sg_TaskPanel.cpp:1244
+#: clientgui/sg_TaskPanel.cpp:1245
 msgid "Processing Suspended:  Time of Day."
 msgstr "작업 일시 정지: 설정한 시간이 아닙니다."
 
-#: clientgui/sg_TaskPanel.cpp:1246
+#: clientgui/sg_TaskPanel.cpp:1247
 msgid "Processing Suspended:  Benchmarks Running."
 msgstr "작업 일시 정지: 벤치마크를 실행하고 있습니다."
 
-#: clientgui/sg_TaskPanel.cpp:1248
+#: clientgui/sg_TaskPanel.cpp:1249
 msgid "Processing Suspended."
 msgstr "작업이 일시 정지되었습니다."
 
-#: clientgui/sg_TaskPanel.cpp:1252
+#: clientgui/sg_TaskPanel.cpp:1253
 msgid "Waiting to contact project servers."
 msgstr "프로젝트 서버 접속을 기다리고 있습니다."
 
-#: clientgui/sg_TaskPanel.cpp:1256
-#: clientgui/sg_TaskPanel.cpp:1265
+#: clientgui/sg_TaskPanel.cpp:1257 clientgui/sg_TaskPanel.cpp:1266
 msgid "Retrieving current status"
 msgstr "현재 상태 복구중"
 
-#: clientgui/sg_TaskPanel.cpp:1260
+#: clientgui/sg_TaskPanel.cpp:1261
 msgid "No work available to process"
 msgstr "수행가능한 작업이 없습니다"
 
-#: clientgui/sg_TaskPanel.cpp:1262
+#: clientgui/sg_TaskPanel.cpp:1263
 msgid "Unable to connect to the core client"
 msgstr "코어 클라이언트와 연결이 불가능합니다"
 
@@ -3285,10 +3178,7 @@ msgid ""
 "The project is temporarily unavailable.\n"
 "\n"
 "Please try again later."
-msgstr ""
-"프로젝트가 일시적으로 불가능합니다.\n"
-"\n"
-"나중에 다시 시도해주세요."
+msgstr "프로젝트가 일시적으로 불가능합니다.\n\n나중에 다시 시도해주세요."
 
 #: clientgui/UnavailablePage.cpp:190
 msgid "Account manager temporarily unavailable"
@@ -3299,10 +3189,7 @@ msgid ""
 "The account manager is temporarily unavailable.\n"
 "\n"
 "Please try again later."
-msgstr ""
-"계정 관리자가 일시적으로 불가능합니다.\n"
-"\n"
-"나중에 다시 시도해주세요."
+msgstr "계정 관리자가 일시적으로 불가능합니다.\n\n나중에 다시 시도해주세요."
 
 #: clientgui/ValidateAccountKey.cpp:68
 msgid "Please specify an account key to continue."
@@ -3312,8 +3199,7 @@ msgstr "계속하려면 계정 키를 정의해 주세요."
 msgid "Invalid Account Key; please enter a valid Account Key"
 msgstr "잘못된 계정 키; 올바른 계정 키를 입력하세요"
 
-#: clientgui/ValidateAccountKey.cpp:82
-#: clientgui/ValidateEmailAddress.cpp:86
+#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
 msgid "Validation conflict"
 msgstr "확인 충돌"
 
@@ -3334,34 +3220,23 @@ msgid ""
 "Please specify a URL.\n"
 "For example:\n"
 "http://www.example.com/"
-msgstr ""
-"URL을 지정해주세요.\n"
-"예를 들어:\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
+#: 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: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"
-"http://boincproject.example.com"
+msgstr "올바른 URL을 지정해주세요.\n예를 들어:\nhttp://boincproject.example.com"
 
-#: clientgui/ValidateURL.cpp:104
-#: clientgui/ValidateURL.cpp:108
+#: clientgui/ValidateURL.cpp:104 clientgui/ValidateURL.cpp:108
 #, c-format
 msgid "'%s' does not contain a valid host name."
 msgstr "'%s'은(는) 유효한 호스트 이름을 포함하고 있지 않습니다."
@@ -3372,7 +3247,6 @@ msgid "'%s' does not contain a valid path."
 msgstr "'%s'은(는) 유효한 경로를 포함하고 있지 않습니다."
 
 #: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:175
 msgid "Commands"
 msgstr "명령"
 
@@ -3384,13 +3258,11 @@ msgstr "모든 메시지 복사"
 msgid "Copy selected messages"
 msgstr "선택한 메시지 복사"
 
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
+#: clientgui/ViewMessages.cpp:106 clientgui/ViewMessages.cpp:502
 msgid "Show only this project"
 msgstr "이 프로젝트만 보여주기"
 
-#: clientgui/ViewMessages.cpp:107
-#: clientgui/ViewMessages.cpp:503
+#: clientgui/ViewMessages.cpp:107 clientgui/ViewMessages.cpp:503
 msgid "Show only the messages for the selected project."
 msgstr "선택한 프로젝의 메세지만 보여줍니다."
 
@@ -3418,119 +3290,120 @@ msgstr "모든 메시지 보여주기"
 msgid "Show messages for all projects."
 msgstr "모든 프로젝트의 메세지를 보여줍니다."
 
-#: clientgui/ViewProjects.cpp:225
+#: clientgui/ViewProjects.cpp:246 clientgui/ViewStatistics.cpp:426
 msgid "Account"
 msgstr "계정"
 
-#: clientgui/ViewProjects.cpp:227
+#: clientgui/ViewProjects.cpp:248
 msgid "Work done"
 msgstr "완료된 작업"
 
-#: clientgui/ViewProjects.cpp:228
+#: clientgui/ViewProjects.cpp:249
 msgid "Avg. work done"
 msgstr "평균 완료된 작업"
 
-#: clientgui/ViewProjects.cpp:230
+#: clientgui/ViewProjects.cpp:251 clientgui/ViewTransfers.cpp:215
+#: clientgui/ViewWork.cpp:262
 msgid "Status"
 msgstr "상태"
 
-#: clientgui/ViewProjects.cpp:255
+#: clientgui/ViewProjects.cpp:330
 msgid "Projects"
 msgstr "프로젝트"
 
-#: clientgui/ViewProjects.cpp:307
+#: clientgui/ViewProjects.cpp:382
 msgid "Updating project..."
 msgstr "프로젝트 업데이트 중..."
 
-#: clientgui/ViewProjects.cpp:349
+#: clientgui/ViewProjects.cpp:424
 msgid "Resuming project..."
 msgstr "프로젝트 다시 시작 중..."
 
-#: clientgui/ViewProjects.cpp:353
+#: clientgui/ViewProjects.cpp:428
 msgid "Suspending project..."
 msgstr "프로젝트 일시 정지 중..."
 
-#: clientgui/ViewProjects.cpp:390
+#: clientgui/ViewProjects.cpp:465
 msgid "Telling project to allow additional task downloads..."
 msgstr "추가적인 태스크 다운로드를 허용하도록 프로젝트에 알리는 중..."
 
-#: clientgui/ViewProjects.cpp:394
+#: clientgui/ViewProjects.cpp:469
 msgid "Telling project to not fetch any additional tasks..."
 msgstr "프로젝트에게 추가 태스크 수용 금지를 통보하고 있습니다..."
 
-#: clientgui/ViewProjects.cpp:430
+#: clientgui/ViewProjects.cpp:505
 msgid "Resetting project..."
 msgstr "프로젝트 다시 설정 중..."
 
-#: clientgui/ViewProjects.cpp:488
+#: clientgui/ViewProjects.cpp:563
 msgid "Removing project..."
 msgstr "프로젝트 제거 중..."
 
-#: clientgui/ViewProjects.cpp:548
+#: clientgui/ViewProjects.cpp:623 clientgui/ViewWork.cpp:686
 msgid "Launching browser..."
 msgstr "브라우저 시작 중..."
 
-#: clientgui/ViewProjects.cpp:1063
+#: clientgui/ViewProjects.cpp:1140
 msgid "Requested by user"
 msgstr "사용자가 요청함"
 
-#: clientgui/ViewProjects.cpp:1064
+#: clientgui/ViewProjects.cpp:1141
 msgid "To fetch work"
 msgstr "작업 반입"
 
-#: clientgui/ViewProjects.cpp:1065
+#: clientgui/ViewProjects.cpp:1142
 msgid "To report completed tasks"
 msgstr "완료된 태스크 보고"
 
-#: clientgui/ViewProjects.cpp:1066
+#: clientgui/ViewProjects.cpp:1143
 msgid "To send trickle-up message"
 msgstr "Trickle up 메세지 보내기"
 
-#: clientgui/ViewProjects.cpp:1067
+#: clientgui/ViewProjects.cpp:1144
 msgid "Requested by account manager"
 msgstr "계정 관리자에서 요청함"
 
-#: clientgui/ViewProjects.cpp:1068
+#: clientgui/ViewProjects.cpp:1145
 msgid "Project initialization"
 msgstr "프로젝트 초기화"
 
-#: clientgui/ViewProjects.cpp:1069
+#: clientgui/ViewProjects.cpp:1146
 msgid "Requested by project"
 msgstr "프로젝트에서 요청함"
 
-#: clientgui/ViewProjects.cpp:1070
+#: clientgui/ViewProjects.cpp:1147
 msgid "Unknown reason"
 msgstr "알 수 없는 이유"
 
-#: clientgui/ViewProjects.cpp:1084
+#: clientgui/ViewProjects.cpp:1161
 msgid "Suspended by user"
 msgstr "사용자에 의한 일시 정지"
 
-#: clientgui/ViewProjects.cpp:1087
+#: clientgui/ViewProjects.cpp:1164
 msgid "Won't get new tasks"
 msgstr "새 태스크를 받지 않음"
 
-#: clientgui/ViewProjects.cpp:1090
+#: clientgui/ViewProjects.cpp:1167
 msgid "Project ended - OK to remove"
 msgstr "프로젝트가 끝남 - 확인을 누르면 제거됩니다"
 
-#: clientgui/ViewProjects.cpp:1093
+#: clientgui/ViewProjects.cpp:1170
 msgid "Will remove when tasks done"
 msgstr "태스크 완료시 제거하기"
 
-#: clientgui/ViewProjects.cpp:1096
+#: clientgui/ViewProjects.cpp:1173
 msgid "Scheduler request pending"
 msgstr "스케줄러 요청을 기다리고 있는 중"
 
-#: clientgui/ViewProjects.cpp:1102
+#: clientgui/ViewProjects.cpp:1179
 msgid "Scheduler request in progress"
 msgstr "스케쥴러 요청을 진행"
 
-#: clientgui/ViewProjects.cpp:1105
+#: clientgui/ViewProjects.cpp:1182
 msgid "Trickle up message pending"
 msgstr "Trickle up 메세지가 유보됨"
 
-#: clientgui/ViewProjects.cpp:1111
+#: clientgui/ViewProjects.cpp:1188
 msgid "Communication deferred "
 msgstr "통신 연기됨 "
 
@@ -3542,31 +3415,27 @@ msgstr "전체 디스크 사용량"
 msgid "Disk usage by BOINC projects"
 msgstr "BOINC 프로젝트가 사용하는 디스크 용량"
 
-#: clientgui/ViewResources.cpp:116
-msgid "Disk"
-msgstr "디스크"
-
 #: clientgui/ViewResources.cpp:225
 msgid "no projects: 0 bytes used"
 msgstr "프로젝트 없음: 0 바이트 사용"
 
-#: clientgui/ViewResources.cpp:262
+#: clientgui/ViewResources.cpp:259
 msgid "used by BOINC: "
 msgstr "BOINC가 사용함:"
 
-#: clientgui/ViewResources.cpp:272
+#: clientgui/ViewResources.cpp:269
 msgid "free, available to BOINC: "
 msgstr "빈, BOINC가 사용 가능:"
 
-#: clientgui/ViewResources.cpp:282
+#: clientgui/ViewResources.cpp:279
 msgid "free, not available to BOINC: "
 msgstr "빈, BOINC가 사용 불가능:"
 
-#: clientgui/ViewResources.cpp:292
+#: clientgui/ViewResources.cpp:289
 msgid "free: "
 msgstr "빈:"
 
-#: clientgui/ViewResources.cpp:302
+#: clientgui/ViewResources.cpp:299
 msgid "used by other programs: "
 msgstr "다른 프로그램이 사용 중:"
 
@@ -3639,13 +3508,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 "전체 영역 그래프 사용"
 
@@ -3689,16 +3556,11 @@ msgstr "프로젝트 합계를 하나의 차트로 보여줍니다"
 msgid "Statistics"
 msgstr "통계"
 
-#: clientgui/ViewStatistics.cpp:2077
-#: clientgui/ViewStatistics.cpp:2098
-#: clientgui/ViewStatistics.cpp:2119
-#: clientgui/ViewStatistics.cpp:2141
-#: clientgui/ViewStatistics.cpp:2162
-#: clientgui/ViewStatistics.cpp:2183
-#: clientgui/ViewStatistics.cpp:2204
-#: clientgui/ViewStatistics.cpp:2225
-#: clientgui/ViewStatistics.cpp:2246
-#: clientgui/ViewStatistics.cpp:2270
+#: clientgui/ViewStatistics.cpp:2077 clientgui/ViewStatistics.cpp:2098
+#: clientgui/ViewStatistics.cpp:2119 clientgui/ViewStatistics.cpp:2141
+#: clientgui/ViewStatistics.cpp:2162 clientgui/ViewStatistics.cpp:2183
+#: clientgui/ViewStatistics.cpp:2204 clientgui/ViewStatistics.cpp:2225
+#: clientgui/ViewStatistics.cpp:2246 clientgui/ViewStatistics.cpp:2270
 msgid "Updating charts..."
 msgstr "차트 업데이트 중..."
 
@@ -3710,199 +3572,185 @@ msgstr "프로젝트 목록 보여주기"
 msgid "Uses smaller area for graphs"
 msgstr "작은 그래프 사용"
 
-#: clientgui/ViewTransfers.cpp:169
+#: clientgui/ViewTransfers.cpp:187
 msgid "Retry Now"
 msgstr "지금 다시 시도"
 
-#: clientgui/ViewTransfers.cpp:170
+#: clientgui/ViewTransfers.cpp:188
 msgid "Retry the file transfer now"
 msgstr "파일 전송을 지금 다시 시도"
 
-#: clientgui/ViewTransfers.cpp:176
+#: clientgui/ViewTransfers.cpp:194
 msgid "Abort Transfer"
 msgstr "전송 중단"
 
-#: clientgui/ViewTransfers.cpp:177
+#: clientgui/ViewTransfers.cpp:195
 msgid "Abort this file transfer.  You won't get credit for the task."
 msgstr "해당 파일 전송을 포기합니다. 태스크 수행 크래딧을 얻을 수 없게 됩니다."
 
-#: clientgui/ViewTransfers.cpp:188
+#: clientgui/ViewTransfers.cpp:210
 msgid "File"
 msgstr "파일"
 
-#: clientgui/ViewTransfers.cpp:189
-#: clientgui/ViewWork.cpp:238
+#: clientgui/ViewTransfers.cpp:211 clientgui/ViewWork.cpp:261
 msgid "Progress"
 msgstr "진행률"
 
-#: clientgui/ViewTransfers.cpp:190
+#: clientgui/ViewTransfers.cpp:212
 msgid "Size"
 msgstr "크기"
 
-#: clientgui/ViewTransfers.cpp:191
-msgid "Elapsed Time"
+#: clientgui/ViewTransfers.cpp:213 clientgui/ViewWork.cpp:263
+msgid "Elapsed"
 msgstr "경과 시간"
 
-#: clientgui/ViewTransfers.cpp:192
+#: clientgui/ViewTransfers.cpp:214
 msgid "Speed"
 msgstr "속도"
 
-#: clientgui/ViewTransfers.cpp:218
+#: clientgui/ViewTransfers.cpp:295
 msgid "Transfers"
 msgstr "전송"
 
-#: clientgui/ViewTransfers.cpp:285
+#: clientgui/ViewTransfers.cpp:362
 msgid "Network activity is suspended - "
 msgstr "네트워크 활동이 일시 정지됨 - "
 
-#: clientgui/ViewTransfers.cpp:287
+#: clientgui/ViewTransfers.cpp:364
 msgid ""
 ".\n"
 "You can enable it using the Activity menu."
-msgstr ""
-".\n"
-"활동 메뉴에서 다시 활성화시킬 수 있습니다."
+msgstr ".\n활동 메뉴에서 다시 활성화시킬 수 있습니다."
 
-#: clientgui/ViewTransfers.cpp:290
+#: clientgui/ViewTransfers.cpp:367
 msgid "BOINC"
 msgstr "BOINC"
 
-#: clientgui/ViewTransfers.cpp:297
+#: clientgui/ViewTransfers.cpp:374
 msgid "Retrying transfer now..."
 msgstr "현재 전송을 다시 시도 중..."
 
-#: clientgui/ViewTransfers.cpp:335
+#: clientgui/ViewTransfers.cpp:412
 msgid "Aborting transfer..."
 msgstr "전송 중단 중..."
 
-#: clientgui/ViewTransfers.cpp:348
+#: 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"
-"대한 크레딧을 받지 못하게 됩니다."
+msgstr "정말로 현재 전송 중인 파일 '%s'을(를) 중단할까요?\n주의: 전송을 중단하면 태스크를 무효화하며, 해당 태스크에\n대한 크레딧을 받지 못하게 됩니다."
 
-#: clientgui/ViewTransfers.cpp:354
+#: clientgui/ViewTransfers.cpp:431
 msgid "Abort File Transfer"
 msgstr "파일 전송 중단"
 
-#: clientgui/ViewTransfers.cpp:785
+#: clientgui/ViewTransfers.cpp:864
 msgid "Upload"
 msgstr "업로드"
 
-#: clientgui/ViewTransfers.cpp:785
+#: clientgui/ViewTransfers.cpp:864
 msgid "Download"
 msgstr "다운로드"
 
-#: clientgui/ViewTransfers.cpp:789
+#: clientgui/ViewTransfers.cpp:868
 msgid "retry in "
 msgstr "다시 시도 "
 
-#: clientgui/ViewTransfers.cpp:791
+#: clientgui/ViewTransfers.cpp:870
 msgid "failed"
 msgstr "실패"
 
-#: clientgui/ViewTransfers.cpp:794
+#: clientgui/ViewTransfers.cpp:873
 msgid "suspended"
 msgstr "일시 정지됨"
 
-#: clientgui/ViewTransfers.cpp:799
+#: clientgui/ViewTransfers.cpp:878
 msgid "active"
 msgstr "활성"
 
-#: clientgui/ViewTransfers.cpp:801
+#: clientgui/ViewTransfers.cpp:880
 msgid "pending"
 msgstr "대기 중"
 
-#: clientgui/ViewTransfers.cpp:808
+#: clientgui/ViewTransfers.cpp:887
 msgid " (project backoff: "
 msgstr " (프로젝트 전송 지연: "
 
-#: clientgui/ViewWork.cpp:192
-#: clientgui/ViewWork.cpp:782
+#: clientgui/ViewWork.cpp:211 clientgui/ViewWork.cpp:864
 msgid "Show active tasks"
 msgstr "활성 태스크 보여주기"
 
-#: clientgui/ViewWork.cpp:193
-#: clientgui/ViewWork.cpp:783
+#: clientgui/ViewWork.cpp:212 clientgui/ViewWork.cpp:865
 msgid "Show only active tasks."
 msgstr "활성된 태스크만 보여줍니다."
 
-#: clientgui/ViewWork.cpp:206
+#: clientgui/ViewWork.cpp:225
 msgid "Show VM Console"
 msgstr "VM 콘솔 보여주기"
 
-#: clientgui/ViewWork.cpp:207
+#: clientgui/ViewWork.cpp:226
 msgid "Show VM Console in a window."
 msgstr "VM 콘솔 창을 보여줍니다."
 
-#: clientgui/ViewWork.cpp:214
+#: clientgui/ViewWork.cpp:233
 msgid "Suspend work for this result."
 msgstr "이 결과에 대하여 작업을 일시 정지 합니다."
 
-#: clientgui/ViewWork.cpp:221
+#: clientgui/ViewWork.cpp:240
 msgid "Abandon work on the result. You will get no credit for it."
 msgstr "이 결과에서 작업을 버립니다. 크래딧을 얻을 수 없게됩니다."
 
-#: clientgui/ViewWork.cpp:240
-msgid "Elapsed"
-msgstr "경과 시간"
-
-#: clientgui/ViewWork.cpp:241
+#: clientgui/ViewWork.cpp:264
 msgid "Remaining (estimated)"
 msgstr "남은 시간 (추정치)"
 
-#: clientgui/ViewWork.cpp:242
+#: clientgui/ViewWork.cpp:265
 msgid "Deadline"
 msgstr "리포트 마감 시각"
 
-#: clientgui/ViewWork.cpp:269
+#: clientgui/ViewWork.cpp:351
 msgid "Tasks"
 msgstr "태스크"
 
-#: clientgui/ViewWork.cpp:362
+#: clientgui/ViewWork.cpp:444
 msgid "Resuming task..."
 msgstr "태스크 다시 시작 중..."
 
-#: clientgui/ViewWork.cpp:365
+#: clientgui/ViewWork.cpp:447
 msgid "Suspending task..."
 msgstr "태스크 일시 정지 중..."
 
-#: clientgui/ViewWork.cpp:394
+#: clientgui/ViewWork.cpp:476
 msgid "Showing graphics for task..."
 msgstr "태스크 그래픽 보여주는 중..."
 
-#: clientgui/ViewWork.cpp:431
+#: clientgui/ViewWork.cpp:513
 msgid "Showing VM console for task..."
 msgstr "VM 콘솔용 태스크 보여주는 중..."
 
-#: clientgui/ViewWork.cpp:484
+#: 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)"
+msgstr "정말로 태스크 '%s'를(을) 중단할까요?\n(진행률: %s, 상태: %s)"
 
-#: clientgui/ViewWork.cpp:490
+#: clientgui/ViewWork.cpp:572
 #, c-format
 msgid "Are you sure you want to abort these %d tasks?"
 msgstr "정말로 태스크 '%d'를(을) 중단하겠습니까?"
 
-#: clientgui/ViewWork.cpp:504
+#: clientgui/ViewWork.cpp:586
 msgid "Aborting task..."
 msgstr "태스크 중단 중..."
 
-#: clientgui/ViewWork.cpp:776
+#: clientgui/ViewWork.cpp:858
 msgid "Show all tasks"
 msgstr "모든 태스크 보여주기"
 
-#: clientgui/ViewWork.cpp:777
+#: clientgui/ViewWork.cpp:859
 msgid "Show all tasks."
 msgstr "모든 태스크를 보여줍니다."
 
@@ -3922,12 +3770,7 @@ msgid ""
 "\n"
 "Projects added via this wizard will not be\n"
 "listed on or managed via %s."
-msgstr ""
-"가능하면 %s 웹 사이트에서\n"
-"프로젝트를 추가해 주세요\n"
-"\n"
-"이 마법사 목록에서 제공하지 않거나\n"
-"%s를 통해 관리되는 프로젝트가 추가되었습니다."
+msgstr "가능하면 %s 웹 사이트에서\n프로젝트를 추가해 주세요\n\n이 마법사 목록에서 제공하지 않거나\n%s를 통해 관리되는 프로젝트가 추가되었습니다."
 
 #: clientgui/WelcomePage.cpp:313
 msgid ""
@@ -3936,12 +3779,7 @@ msgid ""
 "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"
-"'계정 관리자' 웹 사이트를 사용해서 프로젝트를 선택할 수 있습니다."
+msgstr "30개 이상의 BOINC 기반 프로젝트가 여러\n과학 분야의 연구를 수행하고 있으며,\n여러분이 원하는 만큼 그 활동에 상당부분 기여할 수 있습니다.\n직접 프로젝트를 추가하거나\n'계정 관리자' 웹 사이트를 사용해서 프로젝트를 선택할 수 있습니다."
 
 #: clientgui/WelcomePage.cpp:325
 msgid ""
@@ -3956,18 +3794,7 @@ msgid ""
 "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"
+msgstr "여러분은 새 기여자 컴퓨팅 프로젝트를 추가하거나 아니면 여러분이 공헌할 프로젝트를\n변경할 수 있습니다.\n\n이러한 프로젝트들 중 일부는 World Community Grid에서 수행 및 관리되고 있으며, 그외는\n다른 연구자 혹은 기관에서 수행 및 관리되고 있습니다. BOINC 소프트웨어에서는\n프로젝트들을 통틀어서 소모되는 연산력을 분할해 줄 수 있습니다.\n\n대안으로서 만약 여러분이 BOINC 계정 관리자에 등록되어 있다면, 여러분이 지원할\n프로젝트를 선택하는데 있어 이것을 사용할 수 있습니다.\n\n여러분이 선호하는 관리 방식을 선택해 주십시오:\n"
 
 #: clientgui/WelcomePage.cpp:339
 msgid "Use a BOINC Account Manager"
@@ -3981,16 +3808,15 @@ msgstr "World Community Grid 프로젝트를 추가 혹은 변경"
 msgid "Add projects run by other researchers or organizations"
 msgstr "다른 연구자나 기관에서 수행 중인 프로젝트 추가"
 
-#: clientgui/WizardAttach.cpp:673
+#: clientgui/WizardAttach.cpp:560
 msgid "Do you really want to cancel?"
 msgstr "정말 취소할까요?"
 
-#: clientgui/WizardAttach.cpp:674
+#: clientgui/WizardAttach.cpp:561
 msgid "Question"
 msgstr "질문"
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
+#: clientgui/wizardex.cpp:377 clientgui/wizardex.cpp:553
 msgid "&Next >"
 msgstr "다음 >"
 
@@ -4004,7 +3830,7 @@ msgstr "완료"
 
 #: clientgui/common/wxPieCtrl.cpp:64
 msgid "Pie Ctrl"
-msgstr "Pie Ctrl"
+msgstr "원반 제어"
 
 #: clientgui/mac/Mac_GUI.cpp:35
 msgid "Services"
@@ -4028,56 +3854,10 @@ msgstr "모두 보여주기"
 msgid "Quit %s"
 msgstr "%s 종료"
 
-#: clientgui/DlgAdvPreferences.h:30
-msgid "specify work start and stop hours in format HH:MM-HH:MM"
-msgstr "작업 시작 및 중지 시각을 HH:MM-HH:MM 형식으로 지정하세요"
-
-#: clientgui/DlgAdvPreferences.h:31
-msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
-msgstr "네트워크 사용 시작 및 중지 시각을 HH:MM-HH:MM 형식으로 지정하세요"
-
-#~ msgid ""
-#~ "(C) 2003-2013 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2011 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-
-#, c-format
-#~ msgid "%s - Preferences"
-#~ msgstr "%s - 환경 설정"
-
-#, no-c-format
-#~ msgid "% of the processors (0 means ignore this setting)"
-#~ msgstr "프로세서 사용량 %(0일 경우 이 설정을 무시합니다)"
-
-#, no-c-format
-#~ msgid "% CPU time"
-#~ msgstr "% CPU 시간"
-#~ msgid "KBytes/sec."
-#~ msgstr "KB/s."
-#~ msgid "Mbytes"
-#~ msgstr "MB"
-#~ msgid "every"
-#~ msgstr "매"
-#~ msgid "days"
-#~ msgstr "일"
-#~ msgid "Gigabytes disk space"
-#~ msgstr "GB"
-#~ msgid "Running, high priority"
-#~ msgstr "높은 우선 순위로 실행 중"
-#~ msgid " (Scheduler wait: "
-#~ msgstr " (스케줄러 대기:"
-#~ msgid " (Scheduler wait)"
-#~ msgstr " (스케줄러 대기)"
-#~ msgid " (Waiting for network access)"
-#~ msgstr " (네트워크 액세스 대기중)"
-#~ msgid "Preferences…"
-#~ msgstr "환경 설정..."
-#~ msgid "invalid float"
-#~ msgstr "invalid float"
-#~ msgid "Workunit name"
-#~ msgstr "작업 유닛 이름"
-#~ msgid "the Advanced View."
-#~ msgstr "고급 보기."
+#: clientgui/DlgAdvPreferencesBase.h:45
+msgid "On this day of the week, compute only during these hours."
+msgstr "일주일 중 해당 요일, 특정 시간대에만 연산을 수행합니다."
 
+#: clientgui/DlgAdvPreferencesBase.h:46
+msgid "On this day of the week, transfer files only during these hours."
+msgstr "일주일 중 해당 요일, 특정 시간대에만 파일 전송이 이루어집니다."
diff --git a/locale/ko/BOINC-Project-Generic.po b/locale/ko/BOINC-Project-Generic.po
old mode 100755
new mode 100644
index 114f787..dcab6b3
--- a/locale/ko/BOINC-Project-Generic.po
+++ b/locale/ko/BOINC-Project-Generic.po
@@ -1,35 +1,124 @@
 # BOINC web translation
 # Copyright (C) 2008 University of California
+# 
 # This file is distributed under the same license as BOINC.
+# 
 # FileID  : $Id$
+# 
+# Translators:
+# Jun Seo <seo.galileo at gmail.com>, 2015
+# Kangsan Lee <treppolse at gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: 2013/12/3\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: 2014-07-27 06:45+0000\n"
+"POT-Creation-Date: 2015-03-04 08:56 PST\n"
+"PO-Revision-Date: 2015-04-01 11:22+0000\n"
 "Last-Translator: Kangsan Lee <treppolse at gmail.com>\n"
-"Language-Team: SETIKAH at KOREA\n"
-"Language: ko\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"
-"X-Generator: Pootle 2.5.0\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-SearchPath-0: html\\user\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
-"X-POOTLE-MTIME: 1406443547.0\n"
 
-# The name of this language in this language
 msgid "LANG_NAME_NATIVE"
 msgstr "한국어"
 
-# The name of this language in an international language (English)
 msgid "LANG_NAME_INTERNATIONAL"
 msgstr "Korean"
 
+#: ../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 "Email 주소"
+
+#: ../inc/account.inc:48
+msgid "Must be a valid address of the form 'name at domain'."
+msgstr "반드시 올바른 형식(name at domain)으로 입력해 주세요."
+
+#: ../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 "우편 번호 혹은 ZIP 코드"
+
+#: ../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 "Email 주소:"
+
+#: ../inc/account.inc:103
+msgid "forgot email address?"
+msgstr "email 주소를 잊어버렸습니까?"
+
+#: ../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]text[/b]  (alt+b)"
@@ -43,324 +132,327 @@ msgid "Underline text: [u]text[/u]  (alt+u)"
 msgstr "밑줄친 글씨: [u]text[/u]  (alt+u)"
 
 #: ../inc/bbcode_html.inc:20
+msgid "Strikethrough text: [s]text[/s]  (alt+k)"
+msgstr "취소선: [s]text[/s]  (alt+k)"
+
+#: ../inc/bbcode_html.inc:23
 msgid "Quote text: [quote]text[/quote]  (alt+q)"
 msgstr "인용된 글: [quote]text[/quote]  (alt+q)"
 
-#: ../inc/bbcode_html.inc:23
+#: ../inc/bbcode_html.inc:26
 msgid "Code display: [code]code[/code]  (alt+c)"
 msgstr "코드 표시: [code]code[/code]  (alt+c)"
 
-#: ../inc/bbcode_html.inc:26
+#: ../inc/bbcode_html.inc:29
 msgid "List: [list]text[/list] (alt+l)"
 msgstr "목록: [list]text[/list] (alt+l)"
 
-#: ../inc/bbcode_html.inc:29
+#: ../inc/bbcode_html.inc:32
 msgid "Ordered list: [list=]text[/list]  (alt+o)"
 msgstr "정렬된 목록: [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 "이미지 삽입: [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 ""
-"URL 삽입: [url]http://url[/url] 또는 [url=http://url]URL text[/url]  (alt+w)"
+msgstr "URL 삽입: [url]http://url[/url] 또는 [url=http://url]URL text[/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]text[/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]small text[/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 "RAC: %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"
+"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"
@@ -376,362 +468,352 @@ msgid ""
 "        <li> No abusive comments involving race, religion,\n"
 "            nationality, gender, class or sexuality.\n"
 "        "
-msgstr ""
-"\n"
-"        <ul>\n"
-"        <li> 포스트는 '전연령'적으로 게시할 것: 외설적이거나\n"
-"            혐오스런 내용, 직접적 혹은 간접적으로\n"
-"            성적인 내용은 포함되면 안 됩니다.\n"
-"        <li> 상업적 광고는 금지됩니다.\n"
-"        <li> 성적인 내용, 도박, 그 외 허용될 수 없는 컨텐츠와\n"
-"            관련한 웹 사이트 링크를 금지합니다.\n"
-"        <li> 타인을 괴롭히거나 도발하기 위한 메세지, 스레드와 관련없는\n"
-"            내용의 메세지는 금지됩니다.\n"
-"        <li> 고의적인 모욕이나 인신 공격성 메세지는 금지됩니다.\n"
-"        <li> 인종, 종교, 국적, 성별, 지위 등과 관련하여서\n"
-"            비난하는 코멘트를 금지합니다.\n"
-"        "
+msgstr "\n        <ul>\n        <li> 포스트는 '전연령'적으로 게시할 것: 외설적이거나\n            혐오스런 내용, 직접적 혹은 간접적으로\n            성적인 내용은 포함되면 안 됩니다.\n        <li> 상업적 광고는 금지됩니다.\n        <li> 성적인 내용, 도박, 그 외 허용될 수 없는 컨텐츠와\n            관련한 웹 사이트 링크를 금지합니다.\n        <li> 타인을 괴롭히거나 도발하기 위한 메세지, 스레드와 관련없는\n            내용의 메세지는 금지됩니다.\n        <li> 고의적인 모욕이나 인신 공격성 메세지는 금지됩니다.\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에 새로운 스레드를 만들려면 여러분은 크레딧을 어느 정도 가지고 있어야 합니다. 이 것은 시스템 남용을 막으면서 보호해줍니다. "
+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 ""
-"지금은 더 이상 새로운 스레드를 만들 수 없습니다. 다시 시도하시기 전에 잠시 기다려주십시오. 이러한 지연은 시스템을 남용으로부터 "
-"보호하기 위해서 시행하고 있습니다."
+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 "운영체제(OS)"
 
-#: ../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 백만 ops/초"
 
-#: ../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"
+#: ../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"
@@ -741,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 "위치"
 
@@ -757,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 "마지막 통신"
 
@@ -765,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"
 
@@ -796,91 +878,83 @@ msgstr "GPU"
 msgid "Operating system"
 msgstr "운영체제(OS)"
 
-#: ../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의 OS는 비호환됩니다:"
 
-#: ../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 "브라우저 기본값"
 
@@ -893,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 "해당 메세지가 없습니다"
 
@@ -927,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 "제목"
 
@@ -935,379 +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 "email 알림을 받으시려면 %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 "% (프로세서)"
 
-#: ../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 작업을 일시중지할까요? .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:60
+#, no-php-format
+msgid "% of CPU time"
+msgstr "% (CPU 시간)"
 
-#: ../inc/prefs.inc:99
-msgid "'In use' means mouse/keyboard activity in last"
+#: ../inc/prefs.inc:62 ../inc/prefs.inc:208
+msgid "When to suspend"
+msgstr "언재 정지하기"
+
+#: ../inc/prefs.inc:64
+msgid "Suspend when computer is on battery"
+msgstr "컴퓨터가 배터리로 작동시 일시중지"
+
+#: ../inc/prefs.inc:65
+msgid ""
+"Check this to suspend computing on portables when running on battery power."
+msgstr "배터리 전원으로 작동하는 상황일 때 연산을 일시중지시키려면 체크하세요."
+
+#: ../inc/prefs.inc:70
+msgid "Suspend when computer is in use"
+msgstr "컴퓨터가 사용 중일 동안 연산을 일시중지"
+
+#: ../inc/prefs.inc:71
+msgid ""
+"Check this to suspend computing and file transfers when you're using the "
+"computer."
+msgstr "컴퓨터 사용시 연산 및 파일 전송을 일시중지시키려면 체크하세요."
+
+#: ../inc/prefs.inc:76
+msgid "Suspend GPU computing when computer is in use"
+msgstr "컴퓨터가 사용 중일 동안 GPU 연산을 일시중지"
+
+#: ../inc/prefs.inc:77
+msgid "Check this to suspend GPU computing when you're using the computer."
+msgstr "컴퓨터 사용시 GPU 연산을 일시중지시키려면 체크하세요."
+
+#: ../inc/prefs.inc:82
+msgid "'In use' means mouse/keyboard input in last"
 msgstr "'사용 중'은 마우스/키보드 입력 시간을 뜻합니다"
 
-#: ../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 "이 것은 컴퓨터 '사용 중'인 것을 결정합니다."
+
+#: ../inc/prefs.inc:85 ../inc/prefs.inc:92 ../inc/prefs.inc:122
 msgid "minutes"
 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:89
+msgid "Suspend when no mouse/keyboard input in last"
+msgstr "마우스/키보드 입력이 이 시간 안에 있으면"
 
-#: ../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 "비 BOINC CPU 사용량이 다음보다 높으면 작업 일시중지 %1 0은 무제한을 뜻합니다<br>6.10.30이상 버전 필요 %2"
+#: ../inc/prefs.inc:90
+msgid "This allows some computers to enter low-power mode when not in use."
+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:95
+msgid "Suspend when non-BOINC CPU usage is above"
+msgstr "비BOINC CPU 사용량이 이 값 이상일 때 일시중지"
 
-#: ../inc/prefs.inc:130
-msgid ""
-"Leave tasks in memory while suspended? %1 Suspended tasks will consume swap "
-"space if 'yes' %2"
-msgstr "일시중지 시에도 태스크를 메모리에 남겨둘까요? %1 '네'일 경우 일시중지된 태스크는 스왑영역을 차지합니다 %2"
+#: ../inc/prefs.inc:96
+msgid "Suspend computing when your computer is busy running other programs."
+msgstr "컴퓨터가 다른 프로그램을 돌리느라 바쁠 때 연산을 일시중지시킵니다."
 
-#: ../inc/prefs.inc:139
-msgid "Switch between tasks every %1 Recommended: 60 minutes %2"
-msgstr "태스크를 설정시간마다 전환 %1 추천값: 60 분 %2"
+#: ../inc/prefs.inc:101
+msgid "Compute only between"
+msgstr "이 시간 사이에만 작업"
 
-#: ../inc/prefs.inc:147
-msgid "On multiprocessors, use at most"
-msgstr "다중 프로세서일 경우 최대한"
+#: ../inc/prefs.inc:102
+msgid "Compute only during a particular period each day."
+msgstr "각 날짜별로 특정 시간대에만 연산"
 
-#: ../inc/prefs.inc:149
-msgid "processors"
-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:153
-msgid "On multiprocessors, use at most %1 Enforced by version 6.1+ %2"
-msgstr "다중 프로세서일 경우 최대 사용량 %1 6.1 이상 버전에서 가능 %2"
+#: ../inc/prefs.inc:107
+msgid "Store at least"
+msgstr "최소한"
 
-#: ../inc/prefs.inc:158
-#, php-format
-msgid "% of the processors"
-msgstr "% (프로세서)"
+#: ../inc/prefs.inc:108
+msgid "Store at least enough tasks to keep the computer busy for this long."
+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:110 ../inc/prefs.inc:116
+msgid "days of work"
+msgstr "일치 작업량"
 
-#: ../inc/prefs.inc:167
-#, php-format
-msgid "% of CPU time"
-msgstr "% (CPU 시간)"
+#: ../inc/prefs.inc:113
+msgid "Store up to an additional"
+msgstr "추가적으로 유지할"
 
-#: ../inc/prefs.inc:175 ../inc/prefs.inc:189
-msgid "Disk: use at most"
-msgstr "디스크: 최대 사용량"
+#: ../inc/prefs.inc:114
+msgid ""
+"Store additional tasks above the minimum level.  Determines how much work is"
+" requested when contacting a project."
+msgstr "최소 한도 이상으로 추가적인 태스크를 저장합니다. 또한 프로젝트 서버에 연락할 때 얼마나 많은 작업량을 요청할지 결정합니다."
 
-#: ../inc/prefs.inc:177 ../inc/prefs.inc:186
-msgid "GB"
-msgstr "GB"
+#: ../inc/prefs.inc:119
+msgid "Switch between tasks about every"
+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:120
+msgid "If you run several projects, BOINC may switch between them this often."
+msgstr "여러 프로젝트를 수행할 경우, BOINC가 얼마나 자주 그것들을 교체할지 결정합니다."
 
-#: ../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:125
+msgid "Request tasks to checkpoint at most every"
+msgstr "태스크 기록지점을 매 시간마다 기록하도록 "
 
-#: ../inc/prefs.inc:194
-msgid "Tasks checkpoint to disk at most every"
-msgstr "태스크 기록 지점을 지정된 시간마다 기록"
+#: ../inc/prefs.inc:126
+msgid ""
+"This controls how often tasks save their state to disk, so that they can be "
+"restarted later."
+msgstr "태스크가 얼마나 자주 현재 상태를 디스크에 저장하는지 제어합니다. 이렇게 함으로써 태스크를 재시작할 수 있습니다."
 
-#: ../inc/prefs.inc:196
+#: ../inc/prefs.inc:128
 msgid "seconds"
 msgstr "초"
 
-#: ../inc/prefs.inc:199
-msgid "Swap space: use at most"
-msgstr "스왑 영역: 최대 사용량"
+#: ../inc/prefs.inc:136 ../inc/prefs.inc:148
+msgid "Use no more than"
+msgstr "최대한"
 
-#: ../inc/prefs.inc:204
-msgid "Memory: when computer is in use, use at most"
-msgstr "메모리: 컴퓨터 사용시 최대 사용량"
+#: ../inc/prefs.inc:137
+msgid "Limit the total amount of disk space used by BOINC."
+msgstr "전체 디스크 공간 중 BOINC가 사용하는 용량을 제한합니다."
 
-#: ../inc/prefs.inc:209
-msgid "Memory: when computer is not in use, use at most"
-msgstr "메모리: 컴퓨터 미사용시 최대 사용량"
+#: ../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 "작업 가능한 최소한의 태스크를 유지하기: %1(최대 10일)%2"
+#: ../inc/prefs.inc:142
+msgid "Leave at least"
+msgstr "최소한"
 
-#: ../inc/prefs.inc:223 ../inc/prefs.inc:228 ../inc/prefs.inc:270
-#: ../inc/util.inc:274
-msgid "days"
-msgstr "일"
+#: ../inc/prefs.inc:143
+msgid ""
+"Limit disk usage to leave this much free space on the volume where BOINC "
+"stores data."
+msgstr "BOINC 데이터가 저장되는 볼륨중 여유 공간으로 남겨둘 디스크 용량을 설정합니다."
 
-#: ../inc/prefs.inc:226
-msgid "... and up to an additional"
-msgstr "... 추가적으로 유지할 태스크"
+#: ../inc/prefs.inc:145
+msgid "GB free"
+msgstr "GB 남겨둡니다"
 
-#: ../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 "인터넷에 연결시 확인하시겠습니까? %1 모뎀, ISDN, VPN 연결에만 해당됩니다 %2"
+"Limit the percentage of disk space used by BOINC on the volume where it "
+"stores data."
+msgstr "BOINC 데이터가 저장되는 볼륨에서 사용하는 디스크 공간의 퍼센테이지를 제합니다."
 
-#: ../inc/prefs.inc:241
-msgid ""
-"Disconnect when done? %1 Matters only if you have a modem, ISDN or VPN "
-"connection %2"
-msgstr "완료시 접속을 끊을까요? %1 모뎀, ISDN, VPN 연결에만 해당됩니다 %2"
+#: ../inc/prefs.inc:152
+#, no-php-format
+msgid "% of total"
+msgstr "% (전체 용량 중)"
 
-#: ../inc/prefs.inc:249
-msgid "Maximum download rate:"
-msgstr "최대 다운로드 대역폭:"
+#: ../inc/prefs.inc:158
+msgid "When computer is in use, use at most"
+msgstr "컴퓨터 사용시 최대 사용량"
 
-#: ../inc/prefs.inc:251 ../inc/prefs.inc:256
-msgid "Kbytes/sec"
-msgstr "KB/초"
+#: ../inc/prefs.inc:159
+msgid "Limit the memory used by BOINC when you're using the computer."
+msgstr "컴퓨터 사용시 BOINC에서 사용하는 메모리를 제한합니다."
 
-#: ../inc/prefs.inc:254
-msgid "Maximum upload rate:"
-msgstr "최대 업로드 대역폭:"
+#: ../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 "이 시간 사이에만 네트워크 사용"
+#: ../inc/prefs.inc:165
+msgid "When computer is not in use, use at most"
+msgstr "컴퓨터 미사용시 최대 사용량"
 
-#: ../inc/prefs.inc:263
-msgid "Transfer at most %1 Enforced by version 6.10.46+ %2"
-msgstr "최대 전송량 %1 6.10.46 이상 버전이 필요 %2"
+#: ../inc/prefs.inc:166
+msgid "Limit the memory used by BOINC when you're not using the computer."
+msgstr "컴퓨터가 미사용시 BOINC에서 사용하는 메모리를 제한합니다."
 
-#: ../inc/prefs.inc:269
-msgid "Mbytes every"
-msgstr "MB 당"
+#: ../inc/prefs.inc:172
+msgid "Leave non-GPU tasks in memory while suspended"
+msgstr "일시중지되는 동안 비GPU 태스크를 메모리에 남겨두기"
 
-#: ../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 ""
-"이미지 파일 검증을 건너뛸까요? %1 인터넷 제공자가 이미지 파일을 변경할 경우에만 체크하세요 (대표적으로 UMTS). %2 검증을 "
-"건너뛰게 되면 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 "체크할 경우, 일시중지된 태스크는 메모리에 남으며 재개시 작업분을 잃지 않습니다. 체크하지 않을 경우, 일시중지된 태스크는 메모리에서 제거되며 재개시 마지막 기록지점에서 시작합니다."
 
-#: ../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 ""
-"자원 공유 %1 이 프로젝트에서 사용할 자원 배분치를 결정하세요. 예: 여러분이 각각 100과 200의 자원을 공유하기로 한 BOINC "
-"프로젝트에 참여하고 계시면 첫 번째는 1/3의 자원을 쓰게 되고, 두 번째는 2/3를 쓰게 됩니다. %2"
+#: ../inc/prefs.inc:178
+msgid "Page/swap file: use at most"
+msgstr "페이지/스왑 파일: 최대한"
 
-#: ../inc/prefs.inc:298
-msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
-msgstr "개별적으로 CPU를 할당해서 GPU 태스크를 가속할까요?"
+#: ../inc/prefs.inc:179
+msgid "Limit the swap space (page file) used by BOINC."
+msgstr "BOINC에서 사용하는 스왑 공간(페이지 파일)을 제한합니다."
 
-#: ../inc/prefs.inc:308
-msgid "Use CPU %1 Enforced by version 6.10+ %2"
-msgstr "CPU %1 사용 6.10 이상 버전이 필요 %2"
+#: ../inc/prefs.inc:189
+msgid "Limit download rate to"
+msgstr "제한된 다운로드 "
 
-#: ../inc/prefs.inc:320
-msgid "Use ATI GPU %1 Enforced by version 6.10+ %2"
-msgstr "ATI GPU 존재시 사용 %1 6.10 이상 버전이 필요 %2"
+#: ../inc/prefs.inc:190
+msgid "Limit the download rate of file transfers."
+msgstr "파일 전송 중 최대 로드 비율을 제한합니다."
 
-#: ../inc/prefs.inc:332
-msgid "Use NVIDIA GPU %1 Enforced by version 6.10+ %2"
-msgstr "NVIDIA GPU 존재시 사용 %1 6.10 이상 버전이 필요 %2"
+#: ../inc/prefs.inc:192 ../inc/prefs.inc:198
+msgid "KB/second"
+msgstr "KB/"
 
-#: ../inc/prefs.inc:344
-msgid "Use Intel GPU %1 Enforced by version 7.2+ %2"
-msgstr "Intel GPU 사용 %1 7.2 이상 버전이 필요 %2"
+#: ../inc/prefs.inc:195
+msgid "Limit upload rate to"
+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:196
+msgid "Limit the upload rate of file transfers."
+msgstr "파일 전송 중 최대 업로드 비율을 제한합니다."
 
-#: ../inc/prefs.inc:367
-msgid ""
-"Emails will be sent from %1; make sure your spam filter accepts this address."
-msgstr "email은 %1에서 보냅니다. 여러분의 스팸 필터에서 이 주소를 허용해 주세요."
+#: ../inc/prefs.inc:201
+msgid "Limit usage to"
+msgstr "제한 사용량"
 
-#: ../inc/prefs.inc:374
-msgid "Is it OK for %1 and your team (if any) to email you?"
-msgstr "%1과 소속 팀(전부)에서 email을 받도록 허용하시겠습니까?"
+#: ../inc/prefs.inc:202
+msgid "Example: BOINC should transfer at most 2000 MB of data every 30 days."
+msgstr "예시: BOINC는 매 30일동안 최대 2000MB를 전송합니다."
 
-#: ../inc/prefs.inc:380
-msgid "Should %1 show your computers on its web site?"
-msgstr "%1이 여러분 컴퓨터를 웹 사이트에 공개하도록 하시겠습니까?"
+#: ../inc/prefs.inc:205
+msgid "MB every"
+msgstr "MB"
 
-#: ../inc/prefs.inc:387
-msgid "Disk and memory usage"
-msgstr "디스크와 메모리 사용량"
+#: ../inc/prefs.inc:206 ../inc/util.inc:303
+msgid "days"
+msgstr "일"
 
-#: ../inc/prefs.inc:388
-msgid "Processor usage"
-msgstr "프로세서 사용량"
+#: ../inc/prefs.inc:210
+msgid "Transfer files only between"
+msgstr "이 시간 사이에만 전송"
 
-#: ../inc/prefs.inc:389
-msgid "Network usage"
-msgstr "네트워크 사용량"
+#: ../inc/prefs.inc:211
+msgid "Transfer files only during a particular period each day."
+msgstr "각 날짜별로 특정 시기에만 파일 전송이 이루어집니다."
 
-#: ../inc/prefs.inc:392
-msgid ""
-"These preferences apply to all the BOINC projects in which you participate."
-msgstr "이 환경 설정은 여러분이 참여하는 모든 BOINC 프로젝트에 적용됩니다."
+#: ../inc/prefs.inc:216
+msgid "Skip data verification for image files"
+msgstr "이미지 파일 검증 건너뛰기"
 
-#: ../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 "%1환경 설정을 업데이트할 수 없습니다.%2 빨간 색으로 표시된 곳이 범위를 넘어서거나 숫자가 아닙니다."
+"Check this only if your Internet provider modifies image files. Skipping "
+"verification reduces the security of BOINC."
+msgstr "인터넷 제공자가 이미지 파일을 변경할 경우에만 체크하세요. 검증을 건너 뛸 경우에는 BOINC의 보안성이 감소합니다. "
 
-#: ../inc/prefs.inc:445
-msgid "bad venue: %1"
-msgstr "잘못된 위치: %1"
+#: ../inc/prefs.inc:222
+msgid "Confirm before connecting to Internet"
+msgstr "인터넷 접속 전에 확인"
 
-#: ../inc/prefs.inc:451
-msgid "bad subset: %1"
-msgstr "잘못된 서브셋: %1"
+#: ../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: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:228
+msgid "Disconnect when done"
+msgstr "완료되면 접속 끊기"
 
-#: ../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:235 ../inc/prefs.inc:472 ../user/explain_state.php:94
+msgid "Computing"
+msgstr "컴퓨팅"
 
-#: ../inc/prefs.inc:679 ../user/forum_search.php:53
-msgid "no limit"
-msgstr "제한 없음"
+#: ../inc/prefs.inc:236
+msgid "Disk"
+msgstr "디스크"
 
-#: ../inc/prefs.inc:704 ../user/team_admins.php:79
-msgid "Add"
-msgstr "추가"
+#: ../inc/prefs.inc:238
+msgid "Network"
+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:241
+msgid ""
+"These preferences apply to all the BOINC projects in which you participate."
+msgstr "이 환경 설정은 여러분이 참여하는 모든 BOINC 프로젝트에 적용됩니다."
 
-#: ../inc/prefs.inc:812 ../user/explain_state.php:94
-msgid "Computing"
-msgstr "컴퓨팅"
+#: ../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:823
+#: ../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 "안드로이드 기기"
+
+#: ../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:885
-msgid "These apply to all BOINC projects in which you participate."
-msgstr "이 값들은 여러분이 참여하는 모든 BOINC 프로젝트에 적용됩니다."
-
-#: ../inc/prefs.inc:887
-msgid ""
-"On computers participating in multiple projects, the most recently modified "
-"preferences will be used."
-msgstr "여러 프로젝트에 참여하는 컴퓨터의 경우 가장 최근에 수정된 환경 설정을 사용하게 될 것입니다."
-
-#: ../inc/prefs.inc:889
-msgid "These preferences do not apply to Android devices."
-msgstr "이 환경설정은 안드로이드 장치에 적용되지 않습니다."
-
-#: ../inc/prefs.inc:892
+#: ../inc/prefs.inc:537
 msgid "Preferences last modified:"
 msgstr "최근 수정된 환경 설정:"
 
-#: ../inc/prefs.inc:944
+#: ../inc/prefs.inc:553
 msgid "Add preferences"
 msgstr "환경 설정 추가"
 
-#: ../inc/prefs.inc:948
+#: ../inc/prefs.inc:557
 msgid "Update preferences"
 msgstr "환경 설정 업데이트"
 
-#: ../inc/prefs.inc:1036 ../inc/prefs.inc:1045
+#: ../inc/prefs.inc:628 ../project.sample/project_specific_prefs.inc:84
+#: ../project.sample/project_specific_prefs.inc:224
+msgid "yes"
+msgstr "네"
+
+#: ../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_util.inc:305 ../inc/prefs_util.inc:315
+#: ../inc/prefs.inc:639
+msgid ""
+"New computers will use this location for computing and project preferences."
+msgstr "새로운 컴퓨터는 설정된 작업 위치와 프로젝트 환경설정을 사용하게 될 것입니다."
+
+#: ../inc/prefs_project.inc:52
+msgid "Resource share"
+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의 자원을 공유하기로 한 BOINC 프로젝트에 참여하고 계시면 첫 번째는 1/3의 자원을 쓰게 되고, 두 번째는 2/3를 쓰게 됩니다."
+
+#: ../inc/prefs_project.inc:61
+msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
+msgstr "개별적으로 CPU를 할당해서 GPU 태스크를 가속할까요?"
+
+#: ../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 "email은 %1에서 보냅니다. 여러분의 스팸 필터에서 이 주소를 허용해 주세요."
+
+#: ../inc/prefs_project.inc:123
+msgid "Is it OK for %1 and your team (if any) to email you?"
+msgstr "%1과 소속 팀(전부)에서 email을 받도록 허용하시겠습니까?"
+
+#: ../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_util.inc:33
+msgid "bad venue: %1"
+msgstr "잘못된 위치: %1"
+
+#: ../inc/prefs_util.inc:39
+msgid "bad subset: %1"
+msgstr "잘못된 서브셋: %1"
+
+#: ../inc/prefs_util.inc:476 ../inc/prefs_util.inc:500
 msgid "and"
 msgstr "와"
 
@@ -1323,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 "데이터베이스 오류"
 
@@ -1341,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 "프로필 수정하기"
 
@@ -1389,11 +1583,12 @@ msgstr "DB에 없습니다"
 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 "진행 중"
 
@@ -1422,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 "미전송"
 
@@ -1586,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 />(sec)"
 
-#: ../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 "Stderr 출력 값"
 
-#: ../inc/result.inc:706
+#: ../inc/result.inc:728
 msgid "State"
 msgstr "상태"
 
-#: ../inc/result.inc:747
+#: ../inc/result.inc:769
 msgid "Task name:"
 msgstr "태스크 이름:"
 
@@ -1722,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 "팀 종류"
 
@@ -1740,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 "검색"
 
@@ -1760,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 "없음"
 
@@ -1777,489 +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 ""
-"노트:만약 'OK to email\"이 프로젝트 환경설정에 설정되어 있으면, 가입한 팀의 창설자가 여러분의 email주소를 알 수 "
-"있습니다."
+msgstr "노트:만약 'OK to email\"이 프로젝트 환경설정에 설정되어 있으면, 가입한 팀의 창설자가 여러분의 email주소를 알 수 있습니다."
 
-#: ../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 광역 팀입니다. 만약 이 곳을 변경하게 되면 덮어쓰게 됩니다. 그 대신에 %1BOINC 광역 팀%2을 "
-"수정하세요."
+"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 광역 팀입니다. 만약 이 곳을 변경하게 되면 덮어쓰게 됩니다. 그 대신에 %1BOINC 광역 팀%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 "팀 웹 페이지 URL(있을 경우)"
 
-#: ../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 "이 URL은 이 사이트의 팀 페이지로 링크됩니다."
 
-#: ../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 "공유-프로젝트 ID"
 
-#: ../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 "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 "우편 번호"
 
-#: ../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 "email 주소"
 
-#: ../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
-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:473
+msgid ""
+"Link has timed out. Please click Back, refresh the page, and try again."
+msgstr "연결 시간 초과. '뒤로 가기'를 누르신 후 페이지를 새로 고치시고 다시 시도하세요."
 
-#: ../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 "이 컴퓨터에서 로그인 유지"
 
@@ -2267,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 "우편 번호 혹은 ZIP 코드"
-
-#: ../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 "계정명을 입력해야 합니다."
@@ -2291,37 +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 "%2용 %1 환경 설정 추가"
 
-#: ../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"
@@ -2333,10 +2500,7 @@ msgid ""
 "It's similar to HTML, but simpler. The tags start with a [ (where you would\n"
 "have used %1 in HTML) and end with ] (where you would have used %2 in\n"
 "HTML)."
-msgstr ""
-"BB코드 태그는 프로필과 게시판 포스트에서 사용할 수 있는 텍스트 규격입니다.\n"
-"이 것은 HTML과 유사하지만 보다 간단합니다. 태그는 [로 시작해서(HTML에서\n"
-"%1로 사용하던 곳) ]로 끝나야 합니다(HTML에서 %2로 사용하던 곳)."
+msgstr "BB코드 태그는 프로필과 게시판 포스트에서 사용할 수 있는 텍스트 규격입니다.\n이 것은 HTML과 유사하지만 보다 간단합니다. 태그는 [로 시작해서(HTML에서\n%1로 사용하던 곳) ]로 끝나야 합니다(HTML에서 %2로 사용하던 곳)."
 
 #: ../user/bbcode.php:31
 msgid "Examples"
@@ -2355,154 +2519,78 @@ 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 changeset 링크 사용"
-
-#: ../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 "규칙과 정책을 읽어주십시오"
+msgstr "만약 종료 태그나 인수가 제대로 지정되지 않았다면\n규정된 텍스트 대신 원 태그가 표시됩니다."
 
 #: ../user/create_account_action.php:26
 msgid "Can't create account"
@@ -2512,198 +2600,155 @@ 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 "ReCaptcha 응답이 틀렸습니다. 다시 시도해 주세요."
 
-#: ../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"
+"Invalid email address: you must enter a valid address of the form "
+"name at domain"
 msgstr "잘못된 이메일 주소: name at domain 형태의 올바른 주소를 입력해야 합니다"
 
-#: ../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 관리자를 사용할 경우, 이 양식을 사용하지 마십시오. BOINC를 실행하고, 프로젝트 추가를 선택한 후 이메일 주소와 "
-"비밀번호를 입력해주세요."
+msgstr "비고: BOINC 관리자를 사용할 경우, 이 양식을 사용하지 마십시오. BOINC를 실행하고, 프로젝트 추가를 선택한 후 이메일 주소와 비밀번호를 입력해주세요."
 
-#: ../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 "Email 주소"
-
-#: ../user/create_account_form.php:83
-msgid "Must be a valid address of the form 'name at domain'."
-msgstr "반드시 올바른 형식(name at domain)으로 입력해 주세요."
-
-#: ../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)."
+"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이하의 이미지를 "
-"선택해주세요."
+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 "ReCaptcha 응답이 틀렸습니다. 다시 시도해 주세요."
 
-#: ../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."
+"To prevent spam, an average credit of %1 or greater is required to create or"
+" edit a profile.  We apologize for this inconvenience."
 msgstr "스팸을 방지하기 위해서 프로필을 작성하거나 수정하려면 크레딧을 평균 %1 이상 가지고 있어야 합니다. 불편을 드려서 죄송합니다."
 
 #: ../user/delete_account.php:57
@@ -2729,28 +2774,21 @@ msgid ""
 "including your profile and message-board posts.\n"
 "No jobs will be issued to any computers attached\n"
 "to this account."
-msgstr ""
-"계정을 삭제하면 여러분의 프로필과 게시판\n"
-" 포스트를 포함한 모든 개인 정보가\n"
-"저희 서버에서 제거될 것입니다.\n"
-"이 계정에 연결된 모든 컴퓨터는 어떤 작업도\n"
-"요청할 수 없습니다."
+msgstr "계정을 삭제하면 여러분의 프로필과 게시판\n 포스트를 포함한 모든 개인 정보가\n저희 서버에서 제거될 것입니다.\n이 계정에 연결된 모든 컴퓨터는 어떤 작업도\n요청할 수 없습니다."
 
 #: ../user/delete_account.php:73
 msgid ""
 "This cannot be undone.\n"
 "Once your account has been deleted, you cannot get it back."
-msgstr ""
-"이 것은 되돌릴 수 없습니다.\n"
-"한 번 계정이 삭제되면 다시 복구할 수 없습니다."
+msgstr "이 것은 되돌릴 수 없습니다.\n한 번 계정이 삭제되면 다시 복구할 수 없습니다."
 
 #: ../user/delete_account.php:76
 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 "네"
@@ -2759,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 "아니오"
@@ -2769,49 +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"
-"추후에 다른 프로필을 원한다면\n"
-"여러분은 다시 작성해야 할 것입니다."
+msgstr "삭제된 프로필은 영원히 사라지며 복구가 불가능합니다 --\n추후에 다른 프로필을 원한다면\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"
-"데이터베이스에서 프로필이 삭제됩니다."
+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 "프로필을 삭제하지 않습니다"
 
@@ -2829,7 +2862,8 @@ msgstr "기부가 완료되었습니다."
 
 #: ../user/donated.php:30
 msgid ""
-"Your donation will be added to the progress bar after confirmation by PayPal."
+"Your donation will be added to the progress bar after confirmation by "
+"PayPal."
 msgstr "여러분이 하신 기부는 PayPal을 통해 승인되어서 내역에 추가될 것입니다."
 
 #: ../user/donated.php:32
@@ -2848,9 +2882,7 @@ msgstr "%1 기부하기"
 msgid ""
 "This project is accepting donations via\n"
 "%1."
-msgstr ""
-"이 프로젝트에서 수용하는 기부 수단\n"
-"%1"
+msgstr "이 프로젝트에서 수용하는 기부 수단\n%1"
 
 #: ../user/donations.php:42
 msgid ""
@@ -2865,18 +2897,7 @@ msgid ""
 "        to see the donation amount equivalent in different currencies\n"
 "        (please note that the rates are only estimates\n"
 "         and the actual amount may differ)."
-msgstr ""
-"기부하실려면 아래 항목 중에서 기부하시고자 하는 양만큼 채워주십시오.\n"
-"        PayPal은 다양한 화폐를 수용합니다.\n"
-"        (캐나다 달러, 유로, 영국 파운드, 미국 달러,\n"
-"        엔, 오스트레일리아 달러, 뉴질랜드 달러,\n"
-"        스위스 프랑, 홍콩 달러, 싱가포르 달러, 스웨덴 크로나,\n"
-"        덴마크 크로나, 폴란드 줄러티, 노르웨이 크로네,\n"
-"        헝가리 포린트, 체코 코루나)\n"
-"        여러분은 다른 화폐로 얼마에 해당되는지\n"
-"        알기 위해서 동봉된 화폐 변환기를 사용할 수 있습니다.\n"
-"        (참고: 변환율은 어디까지나 추정치이며 실제\n"
-"        금액은 다를 수도 있습니다.)"
+msgstr "기부하실려면 아래 항목 중에서 기부하시고자 하는 양만큼 채워주십시오.\n        PayPal은 다양한 화폐를 수용합니다.\n        (캐나다 달러, 유로, 영국 파운드, 미국 달러,\n        엔, 오스트레일리아 달러, 뉴질랜드 달러,\n        스위스 프랑, 홍콩 달러, 싱가포르 달러, 스웨덴 크로나,\n        덴마크 크로나, 폴란드 줄러티, 노르웨이 크로네,\n        헝가리 포린트, 체코 코루나)\n        여러분은 다른 화폐로 얼마에 해당되는지\n        알기 위해서 동봉된 화폐 변환기를 사용할 수 있습니다.\n        (참고: 변환율은 어디까지나 추정치이며 실제\n        금액은 다를 수도 있습니다.)"
 
 #: ../user/donations.php:316
 msgid "Amount you would like to donate"
@@ -2894,9 +2915,7 @@ 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."
@@ -2926,13 +2945,9 @@ msgstr "이들 응용 프로그램은 %1에서 승인받지 않았으며 여러
 #: ../user/download_network.php:33
 msgid ""
 "We do not provide instructions for installing these applications.\n"
-"However, the author may have provided some help on installing or "
-"uninstalling the application. \n"
+"However, the author may have provided some help on installing or uninstalling the application. \n"
 "If this is not enough you should contact the author."
-msgstr ""
-"저희는 이들 응용 프로그램을 설치하기 위한 설명서를 제공하지 않습니다.\n"
-"그러나 작성자는 응용 프로그램 설치나 삭제에 관해서 약간의 도움말을 제공할 수도 있습니다.\n"
-"그 것으로 충분하지 않다면 작성자에게 연락하세요."
+msgstr "저희는 이들 응용 프로그램을 설치하기 위한 설명서를 제공하지 않습니다.\n그러나 작성자는 응용 프로그램 설치나 삭제에 관해서 약간의 도움말을 제공할 수도 있습니다.\n그 것으로 충분하지 않다면 작성자에게 연락하세요."
 
 #: ../user/download_network.php:36
 msgid "Instructions for installing and running BOINC are %1here%2."
@@ -3010,244 +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. 크기: 최대 4 KB, 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 "사용 가능한 글자수"
+msgstr "%1다양한 무료 서비스%2를 확인하세요\n<br> 동적인 '서명 이미지'를 제공하며, \n<br> 최근 크레딧 정보, 프로젝트 뉴스 등을 보여줍니다."
 
-#: ../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 "email로 계정 키 받기"
+#: ../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 "새 비밀번호 재입력"
 
@@ -3292,9 +3264,7 @@ msgid ""
 "A tasks's <b>server state</b> indicates whether the task has been sent to a "
 "computer, and if so whether the computer has finished it. Possible values "
 "are:"
-msgstr ""
-"태스크 <b>서버 현황</b>은 태스크가 클라이언트로 보내졌는지, 만약 그렇다면 해당 클라이언트가 작업을 마쳤는지 카르켜 줍니다. 가능한 "
-"값:"
+msgstr "태스크 <b>서버 현황</b>은 태스크가 클라이언트로 보내졌는지, 만약 그렇다면 해당 클라이언트가 작업을 마쳤는지 카르켜 줍니다. 가능한 값:"
 
 #: ../user/explain_state.php:35
 msgid ""
@@ -3362,8 +3332,8 @@ msgstr "태스크가 클라이언트로 전송되었으나 마감 시각까지 
 
 #: ../user/explain_state.php:72
 msgid ""
-"The task wasn't sent to a computer because enough other tasks were completed "
-"for this workunit."
+"The task wasn't sent to a computer because enough other tasks were completed"
+" for this workunit."
 msgstr "해당 작업 유닛의 다른 태스크가 충분히 완료되었기에 클라이언트에게 태스크를 전송하지 않았습니다."
 
 #: ../user/explain_state.php:75
@@ -3378,8 +3348,8 @@ msgstr "클라이언트 상태"
 
 #: ../user/explain_state.php:81
 msgid ""
-"A result's <b>client state</b> indicates the stage of processing at which an "
-"error occurred."
+"A result's <b>client state</b> indicates the stage of processing at which an"
+" error occurred."
 msgstr "결과물의 <b>클라이언트 상황</b>은 오류가 발생한 연산 과정을 가르켜 줍니다."
 
 #: ../user/explain_state.php:86
@@ -3460,22 +3430,22 @@ 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."
+"You forgot to enter your friends' names and/or email addresses; Please "
+"%1return to the form%2 and enter them."
 msgstr "친구의 이름 혹은 이메일 주소를 입력하지 않았습니다. 빠진 부분을 %1입력 폼으로 돌아가서 입력%2해주시기 바랍니다."
 
 #: ../user/ffmail_form.php:30
@@ -3497,9 +3467,7 @@ msgid ""
 "Fill in this form with the names and email addresses of people you think "
 "might be interested in %1. We'll send them an email in your name, and you "
 "can add your own message if you like."
-msgstr ""
-"%1에 흥미를 가질 것 같은 사람들의 이름과 이메일 주소를 이 양식에 채워주세요. 여러분의 이름이 들어간 이메일(원한다면 메세지를 추가할 "
-"수도 있습니다.)을 저희가 그들에게 보낼 것입니다."
+msgstr "%1에 흥미를 가질 것 같은 사람들의 이름과 이메일 주소를 이 양식에 채워주세요. 여러분의 이름이 들어간 이메일(원한다면 메세지를 추가할 수도 있습니다.)을 저희가 그들에게 보낼 것입니다."
 
 #: ../user/ffmail_form.php:42
 msgid "Your name:"
@@ -3525,81 +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이 "
-"유해한 행동을 일관되게 저지를 경우에만 사용하십시오."
+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."
+"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 "행동을 지정해야 합니다..."
 
@@ -3613,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 "포럼"
 
@@ -3622,833 +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 "이 게시판은 %1RSS 피드%2로도 제공됩니다"
 
-#: ../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."
+"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 "2중 포스트"
 
-#: ../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 "하루"
 
-#: ../user/forum_moderate_post.php:83
+#: ../user/forum_moderate_post.php:86
 msgid "1 week"
 msgstr "1 주"
 
-#: ../user/forum_moderate_post.php:84
+#: ../user/forum_moderate_post.php:87
 msgid "2 weeks"
 msgstr "2 주"
 
-#: ../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 "
+"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 />포스트 하단부에서 등급 시스템을 찾을 수 있습니다."
+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"
+"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충분한 정보를 제공하세요. 그렇게 함으로써 사람들이 아직 읽지\n"
-"않은 스레드에서 신속하게 문제 사항을 식별할 수 있게 됩니다.%2"
+msgstr "왜 불쾌한 포스트를 찾습니까?: %1충분한 정보를 제공하세요. 그렇게 함으로써 사람들이 아직 읽지\n않은 스레드에서 신속하게 문제 사항을 식별할 수 있게 됩니다.%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."
+"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 "이 게시판은 RSS 피드로도 제공됩니다."
 
-#: ../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 "최근 %1 일간의 포스트만 표시합니다(기본값: 30)."
 
-#: ../user/forum_rss.php:51
-msgid "Truncate posts: %1 (Include only first 265 characters of each post)"
-msgstr "포스트 요약하기: %1 (각 포스트의 첫 265글자만 표시합니다)"
-
-#: ../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 "예시: \"screensaver freeze\""
 
-#: ../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 "1 년"
 
-#: ../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 ""
-"죄송합니다. 검색 큐와 일치하는 어떤 것도 찾을 수 없습니다. 더 적은 단어(또는 더 적은 특정 단어)를 사용해서 검색 범위를 넓힐 수 "
-"있습니다."
+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구글에서 같은 내용을 검색%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."
+"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 "잠금 해제"
 
-#: ../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 "잠그기"
 
-#: ../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 "%2를 통해 %1에게 친구 관계를 요청했습니다."
 
-#: ../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."
+"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:"
+"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."
@@ -4481,7 +4436,8 @@ msgid "Open the file in a text editor like Notepad. You'll see something like"
 msgstr "메모장같은 텍스트 편집기로 파일을 여세요. 다음과 같은 것들을"
 
 #: ../user/get_passwd.php:62
-msgid "Select and Copy the string between %1 and %2 (%3 in the above example)."
+msgid ""
+"Select and Copy the string between %1 and %2 (%3 in the above example)."
 msgstr "%1과 %2 사이에 있는 문자열을 선택하고 복사하세요.(상단의 %3은 예시)"
 
 #: ../user/get_passwd.php:64
@@ -4498,14 +4454,23 @@ msgstr "여러분 계정은 로그인 상태를 유지할 것입니다. 여러
 msgid "Log in with authenticator"
 msgstr "인증 부호로 로그인 하기"
 
-#: ../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."
+"platforms.  Relative speeds, measured by average elapsed time of tasks, are "
+"shown in parentheses."
 msgstr "다음 목록은 다른 플랫폼에서 가장 효율성이 높은 GPU 종류를 보여줍니다.  괄호 안 내용은 상대적인 속도를 나타냅니다."
 
 #: ../user/home.php:42
@@ -4520,6 +4485,10 @@ msgstr "하단에 표시된 링크를 사용해서 계정 환경 설정을 보
 msgid "If you have not already done so, %1download BOINC client software%2."
 msgstr "만약 아직 그렇지 않다면 %1BOINC 클라이언트 소프트웨어를 다운로드하세요%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 "불확실한 플랫폼, 어플이 빠짐"
@@ -4573,9 +4542,7 @@ msgid ""
 "You can not delete our record of this computer because our database still "
 "contains work for it. You must wait a few days until the work for this "
 "computer has been deleted from the project database."
-msgstr ""
-"이 컴퓨터의 저희 기록을 삭제할 수 없습니다. 왜냐하면 저희 DB는 여전히 그 것을 포함한 채 작동하기 때문입니다. 프로젝트 DB에서 "
-"해당 컴퓨터의 작업이 삭제되기 전까지 며칠간 기다려야 합니다."
+msgstr "이 컴퓨터의 저희 기록을 삭제할 수 없습니다. 왜냐하면 저희 DB는 여전히 그 것을 포함한 채 작동하기 때문입니다. 프로젝트 DB에서 해당 컴퓨터의 작업이 삭제되기 전까지 며칠간 기다려야 합니다."
 
 #: ../user/host_delete.php:40
 msgid "Delete record of computer"
@@ -4599,11 +4566,9 @@ msgstr "컴퓨터 병합"
 
 #: ../user/host_edit_form.php:38
 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는 실수로 같은 컴퓨터를 개별적인 존재로 인정합니다. 여러분은 오래된 것을 새로운 것으로 통합시켜서 바로잡을 수 "
-"있습니다."
+"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는 실수로 같은 컴퓨터를 개별적인 존재로 인정합니다. 여러분은 오래된 것을 새로운 것으로 통합시켜서 바로잡을 수 있습니다."
 
 #: ../user/host_edit_form.php:56
 msgid "No hosts are eligible for merging with this one."
@@ -4638,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 "호스트 위치가 업데이트됨"
@@ -4715,14 +4684,18 @@ msgstr "사전 정의됨"
 
 #: ../user/html.php:33
 msgid ""
-"image; height cannot exceed 450 pixels. Please do not link to images without "
-"permission of the web site where the image is hosted."
+"image; height cannot exceed 450 pixels. Please do not link to images without"
+" permission of the web site where the image is hosted."
 msgstr "이미지: 높이는 450 픽셀을 초과할 수 없습니다. 이미지가 올려진, 권한없는 웹 사이트에 이미지를 링크하지 마십시오."
 
 #: ../user/html.php:35
 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(은)는 검증된 컴퓨터로만 실행하십시오"
@@ -4732,9 +4705,7 @@ msgid ""
 "Run %1 only on computers that you own, or for which you have obtained the "
 "owner's permission. Some companies and schools have policies that prohibit "
 "using their computers for projects such as %1."
-msgstr ""
-"%1(은)는 여러분이 가진 컴퓨터 또는 소유자의 허락을 얻은 컴퓨터로 수행하십시오. 어떤 회사와 학교는 %1(과)와 같은 프로젝트를 "
-"수행하지 못하게 하려고 그들의 컴퓨터를 사용하지 못하게 하는 정책을 가지고 있습니다."
+msgstr "%1(은)는 여러분이 가진 컴퓨터 또는 소유자의 허락을 얻은 컴퓨터로 수행하십시오. 어떤 회사와 학교는 %1(과)와 같은 프로젝트를 수행하지 못하게 하려고 그들의 컴퓨터를 사용하지 못하게 하는 정책을 가지고 있습니다."
 
 #: ../user/info.php:38
 msgid "How %1 will use your computer"
@@ -4745,17 +4716,13 @@ msgid ""
 "When you run %1 on your computer, it will use part of the computer's CPU "
 "power, disk space, and network bandwidth. You can control how much of your "
 "resources are used by %1, and when it uses them."
-msgstr ""
-"%1(을)를 실행하실 경우 여러분 컴퓨터의 CPU, 디스크 공간, 네트워크 대역폭 중 일부를 사용하게 됩니다. 여러분은 언제, 얼마만큼 "
-"%1이 여러분의 컴퓨터 자원을 사용할지 제어할 수 있습니다."
+msgstr "%1(을)를 실행하실 경우 여러분 컴퓨터의 CPU, 디스크 공간, 네트워크 대역폭 중 일부를 사용하게 됩니다. 여러분은 언제, 얼마만큼 %1이 여러분의 컴퓨터 자원을 사용할지 제어할 수 있습니다."
 
 #: ../user/info.php:40
 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 ""
-"여러분이 가진 컴퓨터로 한 작업은 %1 웹 사이트에 설명된 목표에 도달하는데 공헌하고 있습니다. 응용 프로그램은 시간이 지나면 바뀔 수 "
-"있습니다."
+msgstr "여러분이 가진 컴퓨터로 한 작업은 %1 웹 사이트에 설명된 목표에 도달하는데 공헌하고 있습니다. 응용 프로그램은 시간이 지나면 바뀔 수 있습니다."
 
 #: ../user/info.php:42
 msgid "Privacy policy"
@@ -4763,13 +4730,11 @@ msgstr "사생활 보호 정책"
 
 #: ../user/info.php:43
 msgid ""
-"Your account on %1 is identified by a name that you choose. This name may be "
-"shown on the %1 web site, along with a summary of the work your computer has "
-"done for %1. If you want to be anonymous, choose a name that doesn't reveal "
-"your identity."
-msgstr ""
-"%1(은)는 여러분이 선택한 이름을 바탕으로 여러분을 식별합니다. 이 이름은 %1 웹 사이트에서 여러분의 컴퓨터로  %1(을)를 수행한 "
-"결과와 함께 보여질 것입니다. 만약 익명으로 남길 원한다면 여러분의 이름을 밝히지 않도록 선택하십시오."
+"Your account on %1 is identified by a name that you choose. This name may be"
+" shown on the %1 web site, along with a summary of the work your computer "
+"has done for %1. If you want to be anonymous, choose a name that doesn't "
+"reveal your identity."
+msgstr "%1(은)는 여러분이 선택한 이름을 바탕으로 여러분을 식별합니다. 이 이름은 %1 웹 사이트에서 여러분의 컴퓨터로  %1(을)를 수행한 결과와 함께 보여질 것입니다. 만약 익명으로 남길 원한다면 여러분의 이름을 밝히지 않도록 선택하십시오."
 
 #: ../user/info.php:44
 msgid ""
@@ -4778,20 +4743,14 @@ 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 ""
-"만약 여러분이 %1에 참여한다면 여러분의 컴퓨터 정보(프로세서 종류, 메모리 용량, 기타)가 %1 서버에 기록됩니다. 이 것은 여러분 "
-"컴퓨터로 어떤 작업을 할당할지 결정하기 위해 사용됩니다. 이 정보는 또한 %1 웹 사이트에 공개됩니다. 여러분 컴퓨터의 위치를 알 수 "
-"있는 정보(예를 들어 도메인 네임이나 네트워크 주소)는 아무 것도 공개되지 않습니다."
+msgstr "만약 여러분이 %1에 참여한다면 여러분의 컴퓨터 정보(프로세서 종류, 메모리 용량, 기타)가 %1 서버에 기록됩니다. 이 것은 여러분 컴퓨터로 어떤 작업을 할당할지 결정하기 위해 사용됩니다. 이 정보는 또한 %1 웹 사이트에 공개됩니다. 여러분 컴퓨터의 위치를 알 수 있는 정보(예를 들어 도메인 네임이나 네트워크 주소)는 아무 것도 공개되지 않습니다."
 
 #: ../user/info.php:45
 msgid ""
-"To participate in %1, you must give an address where you receive email. This "
-"address will not be shown on the %1 web site or shared with organizations. %"
-"1 may send you periodic newsletters; however, you can opt out at any time."
-msgstr ""
-"%1에 참여하려면 여러분이 실제로 받아볼 수 있는 email 주소를 제공해야 합니다. 이 주소는 %1 웹 사이트에 공개되지 않으며, 다른 "
-"기관과 공유하지도 않습니다. %1(은)는 여러분에게 주기적으로 소식지를 보낼 수도 있습니다. 그러나 이 것은 언제든지 거부할 수 "
-"있습니다."
+"To participate in %1, you must give an address where you receive email. This"
+" address will not be shown on the %1 web site or shared with organizations. "
+"%1 may send you periodic newsletters; however, you can opt out at any time."
+msgstr "%1에 참여하려면 여러분이 실제로 받아볼 수 있는 email 주소를 제공해야 합니다. 이 주소는 %1 웹 사이트에 공개되지 않으며, 다른 기관과 공유하지도 않습니다. %1(은)는 여러분에게 주기적으로 소식지를 보낼 수도 있습니다. 그러나 이 것은 언제든지 거부할 수 있습니다."
 
 #: ../user/info.php:46
 msgid ""
@@ -4800,20 +4759,15 @@ 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 ""
-"%1 웹 사이트를 통해 보낸 쪽지는 송신자와 수신자만 볼 수 있습니다. %1은 쪽지 내용을 검사하거나 감시하지 않습니다. 만약 여러분이 "
-"다른 %1 사용자에게서 쪽지를 받길 원하지 않는다면 그 것들을 %2메세지 필터%3에 추가할 수 있습니다. 이 것은 불특정 다수에게 "
-"보여지거나 혹은 다른 사용자에게서 온 쪽지로부터 원하지 않는 메세지를 막아줍니다."
+msgstr "%1 웹 사이트를 통해 보낸 쪽지는 송신자와 수신자만 볼 수 있습니다. %1은 쪽지 내용을 검사하거나 감시하지 않습니다. 만약 여러분이 다른 %1 사용자에게서 쪽지를 받길 원하지 않는다면 그 것들을 %2메세지 필터%3에 추가할 수 있습니다. 이 것은 불특정 다수에게 보여지거나 혹은 다른 사용자에게서 온 쪽지로부터 원하지 않는 메세지를 막아줍니다."
 
 #: ../user/info.php:47
 msgid ""
 "If you use our web site forums you must follow the %2posting guidelines%3.  "
 "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 ""
-"만약 우리 웹사이트 포럼을 이용하려면 %2글 쓰기 가이드라인%3을 따라야 합니다. %1 포럼에 작성된 게시물은 멤버가 아닌 사람을 포함한 "
-"누구나 볼 수 있습니다. 포럼에 글을 쓰면 여러분의 포스트들은 누구나 볼 수 있고 복사할 수 있는 권리를 부여받게 됩니다."
+"members.  By posting to the forums, you are granting irrevocable license for"
+" anyone to view and copy your posts."
+msgstr "만약 우리 웹사이트 포럼을 이용하려면 %2글 쓰기 가이드라인%3을 따라야 합니다. %1 포럼에 작성된 게시물은 멤버가 아닌 사람을 포함한 누구나 볼 수 있습니다. 포럼에 글을 쓰면 여러분의 포스트들은 누구나 볼 수 있고 복사할 수 있는 권리를 부여받게 됩니다."
 
 #: ../user/info.php:48
 msgid "Is it safe to run %1?"
@@ -4823,24 +4777,18 @@ msgstr "%1(을)를 실행해도 안전합니까?"
 msgid ""
 "Any time you download a program through the Internet you are taking a "
 "chance: the program might have dangerous errors, or the download server "
-"might have been hacked. %1 has made efforts to minimize these risks. We have "
-"tested our applications carefully. Our servers are behind a firewall and 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 ""
-"언제든지 여러분은 인터넷을 통해서 프로그램을 다운로드할 수 있습니다. 어떤 때는 프로그램이 위험한 오류를 가지고 있을 수 도 있고 "
-"다운로드 서버가 해킹당했을 수도 있습니다. %1(은)는 이러한 위험을 최소화하기 위해 노력합니다. 우리는 우리의 응용 프로그램을 조심히 "
-"테스트합니다. 우리 서버는 높은 보안성을 위해서 방화벽 뒤에 두고 있습니다. 프로그램 다운로드를 안전하게 하기 위해서 모든 실행가능한 "
-"파일은 인터넷에 연결되지 않은 안전한 컴퓨터로 디지털 서명을 하고 있습니다."
+"might have been hacked. %1 has made efforts to minimize these risks. We have"
+" tested our applications carefully. Our servers are behind a firewall and "
+"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 "언제든지 여러분은 인터넷을 통해서 프로그램을 다운로드할 수 있습니다. 어떤 때는 프로그램이 위험한 오류를 가지고 있을 수 도 있고 다운로드 서버가 해킹당했을 수도 있습니다. %1(은)는 이러한 위험을 최소화하기 위해 노력합니다. 우리는 우리의 응용 프로그램을 조심히 테스트합니다. 우리 서버는 높은 보안성을 위해서 방화벽 뒤에 두고 있습니다. 프로그램 다운로드를 안전하게 하기 위해서 모든 실행가능한 파일은 인터넷에 연결되지 않은 안전한 컴퓨터로 디지털 서명을 하고 있습니다."
 
 #: ../user/info.php:50
 msgid ""
 "The applications run by %1 may cause some computers to overheat. If this "
 "happens, stop running %1 or use a %2utility program%3 that limits CPU usage."
-msgstr ""
-"%1 응용을 수행 중에 어떤 컴퓨터는 과부하가 걸릴 수 있습니다. 만약 그렇게 되었다면 %1 수행을 중지하시거나 CPU사용량을 제한하기 "
-"위해 %2유틸리티 프로그램%3(을)를 사용하십시오."
+msgstr "%1 응용을 수행 중에 어떤 컴퓨터는 과부하가 걸릴 수 있습니다. 만약 그렇게 되었다면 %1 수행을 중지하시거나 CPU사용량을 제한하기 위해 %2유틸리티 프로그램%3(을)를 사용하십시오."
 
 #: ../user/info.php:51
 msgid ""
@@ -4854,11 +4802,9 @@ msgstr "책임"
 #: ../user/info.php:54
 msgid ""
 "%1 and %2 assume no liability for damage to your computer, loss of data, or "
-"any other event or condition that may occur as a result of participating in %"
-"1."
-msgstr ""
-"%1(과)와 %2(은)는 %1에 참여한 결과로 인해 발생할지도 모르는 컴퓨터가 입은 충격, 데이터 손실, 혹은 어떤 사건이나 손해도 "
-"책임지지 않습니다."
+"any other event or condition that may occur as a result of participating in "
+"%1."
+msgstr "%1(과)와 %2(은)는 %1에 참여한 결과로 인해 발생할지도 모르는 컴퓨터가 입은 충격, 데이터 손실, 혹은 어떤 사건이나 손해도 책임지지 않습니다."
 
 #: ../user/info.php:56
 msgid "Other BOINC projects"
@@ -4866,21 +4812,17 @@ msgstr "다른 BOINC 프로젝트들"
 
 #: ../user/info.php:57
 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 "
+"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 ""
-"다른 프로젝트도 %1처럼 BOINC 플랫폼을 사용합니다. 여러분이 이들 프로젝트에 하나 이상 참여할 생각이 들지도 모릅니다. 그렇게 "
-"함으로서 %1에서 수행할 작업이 없어도 여러분 컴퓨터는 유용한 작업을 수행할 수 있습니다. "
+msgstr "다른 프로젝트도 %1처럼 BOINC 플랫폼을 사용합니다. 여러분이 이들 프로젝트에 하나 이상 참여할 생각이 들지도 모릅니다. 그렇게 함으로서 %1에서 수행할 작업이 없어도 여러분 컴퓨터는 유용한 작업을 수행할 수 있습니다. "
 
 #: ../user/info.php:58
 msgid ""
 "These other projects are not associated with %1, and we cannot vouch for "
 "their security practices or the nature of their research. Join them at your "
 "own risk."
-msgstr ""
-"다른 프로젝트는 %1(과)와 아무 관련이 없으며, 그들의 보안 상태나 그들이 하는 연구의 성격을 보증할 수 없습니다. 여러분은 위험을 "
-"감수하고서 그 것에 참여하셔야 합니다."
+msgstr "다른 프로젝트는 %1(과)와 아무 관련이 없으며, 그들의 보안 상태나 그들이 하는 연구의 성격을 보증할 수 없습니다. 여러분은 위험을 감수하고서 그 것에 참여하셔야 합니다."
 
 #: ../user/language_select.php:47
 msgid "Language selection"
@@ -4911,9 +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 ""
-"또는 다음 링크 중 하나를 클릭해서 언어를 선택할 수 있습니다.  이 사항은 브라우저에 쿠키로 저장됩니다. 브라우저가 이 도메인의 쿠키를 "
-"허용하도록 해야 합니다"
+msgstr "또는 다음 링크 중 하나를 클릭해서 언어를 선택할 수 있습니다.  이 사항은 브라우저에 쿠키로 저장됩니다. 브라우저가 이 도메인의 쿠키를 허용하도록 해야 합니다"
 
 #: ../user/language_select.php:95
 msgid "Language name (click to select)"
@@ -4925,31 +4865,11 @@ msgstr "브라우저 언어 설정 사용"
 
 #: ../user/language_select.php:113
 msgid ""
-"Translations are done by volunteers.  If your native language is not here, %"
-"1you can provide a translation%2."
+"Translations are done by volunteers.  If your native language is not here, "
+"%1you can provide a translation%2."
 msgstr "번역은 자원봉사로 이루어 집니다. 만약 여러분의 언어가 여기에 없다면 %1번역을 할 수도 있습니다%2."
 
-#: ../user/login_form.php:45
-msgid "Email address:"
-msgstr "Email 주소:"
-
-#: ../user/login_form.php:45
-msgid "forgot email address?"
-msgstr "email 주소를 잊어버렸습니까?"
-
-#: ../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."
 
@@ -4973,13 +4893,7 @@ msgid ""
 "        having that name with the newest computer having that name.\n"
 "        Incompatible computers will not be merged.\n"
 "        <p>"
-msgstr ""
-"이 명령은 도메인 이름에 기반해서 컴퓨터를 병합니다.\n"
-"        <p>\n"
-"        개별 도메인 이름별로 동일한 이름을 가진 모든 이전 컴퓨터는\n"
-"        같은 이름을 가진 가장 최신 컴퓨터로 병합될 것입니다.\n"
-"        호환되지 않는 컴퓨터는 병합되지 않을 것입니다.\n"
-"        <p>"
+msgstr "이 명령은 도메인 이름에 기반해서 컴퓨터를 병합니다.\n        <p>\n        개별 도메인 이름별로 동일한 이름을 가진 모든 이전 컴퓨터는\n        같은 이름을 가진 가장 최신 컴퓨터로 병합될 것입니다.\n        호환되지 않는 컴퓨터는 병합되지 않을 것입니다.\n        <p>"
 
 #: ../user/merge_by_name.php:82
 msgid "Go ahead and do this"
@@ -4995,11 +4909,7 @@ msgid ""
 "To maximize discussion and flow of information,\n"
 "our message boards are moderated.\n"
 "Message board postings are subject to the following posting rules:\n"
-msgstr ""
-"\n"
-"논의를 활성화시키고 정보의 흐름을 촉진시키고자\n"
-"저희 게시판을 관리하고 있습니다.\n"
-"게시판 글쓰기는 다음 게시물 규칙을 따르고 있습니다.\n"
+msgstr "\n논의를 활성화시키고 정보의 흐름을 촉진시키고자\n저희 게시판을 관리하고 있습니다.\n게시판 글쓰기는 다음 게시물 규칙을 따르고 있습니다.\n"
 
 #: ../user/moderation.php:30
 msgid ""
@@ -5008,8 +4918,7 @@ msgid ""
 "Moderators may delete posts that violate any of these rules.\n"
 "The authors of deleted posts will be notified via email.\n"
 "Gross offenders may have their ability to post messages temporarily revoked\n"
-"(though to prevent abuse only project administrators have the ability to do "
-"so).\n"
+"(though to prevent abuse only project administrators have the ability to do so).\n"
 "Additional kinds of bad behavior (\"bugging\" posts to trap the\n"
 "IP addresses of other participants, excessive thread creation to spam\n"
 "the forums, etc.), while not listed in the formal rules, may still\n"
@@ -5038,41 +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>\n"
-"관리자는 이 규정을 위반한 포스트를 삭제할 것입니다.\n"
-"삭제된 포스트는 작성자에게 이메일로 통보됩니다.\n"
-"상습적인 위반자는 일시적으로 글을 쓸 권한을 잃게 될 것입니다.\n"
-"(그렇지만 남용을 방지하기 위해서 오직 프로젝트 운영자만 그럴 권한을 갖습니다.)\n"
-"추가적으로 안 좋은 행동(다른 참여자들의 IP 주소를 수집하기 위한 함정을\n"
-"놓는 \"도청\" 포스트, 포럼 내에 과도한 스레드를 생성해서 도배하는\n"
-"행위, 기타)은 공식 규정에 명시되지 않았지만 유사한 패널티를\n"
-"받을 가능성이 존재합니다.\n"
-"<p>\n"
-"만약 여러분이 생각하기에 게시판 규정을 포스트로 보이면\n"
-"포스트 상의 빨간 X 버튼을 클릭하고 양식을 작성해 주세요.\n"
-"여러분이 제기한 불만은 관리자에게 통보될 것입니다.\n"
-"이 버튼은 개인적인 관점인 아닌 명백한 위반일 경우에만\n"
-"사용해 주세요\n"
-"<p>\n"
-"저희는 관리시 최대한 공정하게 하려고 노력합니다.\n"
-"그렇지만 다른 관점을 가진 많은 사용자가 이용하는 대규모 커뮤니티에서\n"
-"저희들의 운영 원칙에 만족하지 않는 사용자들은 항상\n"
-"있을 것입니다.\n"
-"이러한 일로 저희가 후회하는 동안\n"
-"저희가 고려한 포럼 전체를 위한 우선 사항과 저희가 가진 자원에\n"
-"기반해서 내린 결정이 언제나 모든 사람들을 맞춰줄\n"
-" 수는 없다는 것을 깨닫기 바랍니다.\n"
-"포럼상에서 저희의 운영 정책을 논하지 말아주세요. 저희는 사회 공학\n"
-"프로젝트를 하는 것도 아니고 완벽하게 공정한 체계를 만드는\n"
-"사업자도 아닙니다. 이러한 토론은 비생산적인 경향이 있으며 잠재적으로\n"
-"선동적입니다. 만약 여러분이 마땅히 가질 만한 불만이 있으면\n"
-"아래 주소로 이메일을 보내 주세요.\n"
-"<p>\n"
-"이 운영 정책은 %1 프로젝트에서 정한 것입니다.\n"
-"만약 정책에 대한 요구가 있다면 %2로 메일을 보내 주세요.\n"
-"\n"
+msgstr "\n<p>\n관리자는 이 규정을 위반한 포스트를 삭제할 것입니다.\n삭제된 포스트는 작성자에게 이메일로 통보됩니다.\n상습적인 위반자는 일시적으로 글을 쓸 권한을 잃게 될 것입니다.\n(그렇지만 남용을 방지하기 위해서 오직 프로젝트 운영자만 그럴 권한을 갖습니다.)\n추가적으로 안 좋은 행동(다른 참여자들의 IP 주소를 수집하기 위한 함정을\n놓는 \"도청\" 포스트, 포럼 내에 과도한 스레드를 생성해서 도배하는\n행위, 기타)은 공식 규정에 명시되지 않았지만 유사한 패널티를\n받을 가능성이 존재합니다.\n<p>\n만약 여러분이 생각하기에 게시판 규정을 포스트로 보이면\n포스트 상의 빨간 X 버튼을 클릭하고 양식을 작성해 주세요.\n여러분이 제기한 불만은 관리자에게 통보될 것입니다.\n이 버튼은 개인적인 관점인 아닌 명백한 위반일 경우에만\n사용해 주세요\n<p>\n저희는 관리시 최대한 공정하게 하려고 노력합니다.\n그렇지만 다른 관점을 가진 많은 사용자 [...]
 
 #: ../user/pending.php:66
 msgid "Pending credit"
@@ -5118,253 +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 ""
-"여러분의 글이 스팸으로 분류되었습니다\n"
-"                이는 Akismet 시스템이 처리합니다.\n"
-"                텍스트를 수정하고 다시 시도해주세요."
+msgstr "여러분의 글이 스팸으로 분류되었습니다\n                이는 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"
-"          여러분 컴퓨터가 %1 서버와 통신을 한 후에 적용될 것이며\n"
-"          혹은 BOINC 관리자에게 %2업데이트%3 명령을 요청할 수 있습니다."
+msgstr "환경 설정이 업데이트되었습니다. 바뀐 설정은\n          여러분 컴퓨터가 %1 서버와 통신을 한 후에 적용될 것이며\n          혹은 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 명령을 요청할 수 있습니다."
+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 "%2 %1"
 
-#: ../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 "정말로 %2 전용 환경 설정%1을 삭제하시겠습니까?"
 
-#: ../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'을 포함한 프로필을 찾지 못했습니다"
 
@@ -5392,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:261
-msgid "scheduler"
-msgstr "스케쥴러"
-
-#: ../user/server_status.php:294
-msgid "Running:"
-msgstr "가동 중:"
+#: ../user/server_status.php:125
+msgid "Database schema version: "
+msgstr "Database schema version: "
 
-#: ../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 "DB 서버에 접근할 수 없습니다"
-
-#: ../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"
@@ -5544,700 +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:"
+"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"
-"\":"
+"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 ""
-"거기다 모든 BOINC 프로젝트들을 통틀어서 정리된 개인별 통계는 여러 사이트에서 얻을 수 있습니다. %1홈 페이지%2를 봅니다."
+msgstr "거기다 모든 BOINC 프로젝트들을 통틀어서 정리된 개인별 통계는 여러 사이트에서 얻을 수 있습니다. %1홈 페이지%2를 봅니다."
 
 #: ../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 "팀 정보 수정 (이름, URL, 개요, 국가)"
 
-#: ../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)"
+"Moderate the team forum, if any (admins get email notification of moderation"
+" events and red X reports)"
 msgstr "모든 팀 포럼 관리 (관리자는 관리 기록 사항 또는 빨간 X 보고서 등을 이메일로 받아볼 수 있습니다)"
 
-#: ../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 "팀 멤버 Email 주소:"
 
-#: ../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은 이 팀의 창설자로 요청되었습니다. 그 것은 당신이 팀을 떠났거나 오랜 시간동안 팀에 접촉하지 않았기 때문일 것입니다."
+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을 창설자로 임명하세요."
+"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>을 "
-"클릭하세요."
+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 Email 목록"
 
-#: ../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 ""
-"정말로 팀 게시판을 제거하시겠습니까? 모든 스레드와 포스트는 즉각 삭제됩니다. (그러나 이후에 새로 게시판을 만들 수도 있습니다)"
+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."
+"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 ""
-"현 창설자에게 당신의 요청 사항을 email과 쪽지로 알렸습니다.<br /><br />\n"
-"                       창설자가 60일 이내에 응답이 없으면 당신이 창설자가 되는 것이 허용됩니다."
+"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 "현 창설자에게 당신의 요청 사항을 email과 쪽지로 알렸습니다.<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 "%2의 %1에게 창설자 변경를 신청했습니다."
 
-#: ../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"
+"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"
-"                       정말로 창설권 요청을 하시겠습니까?"
+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 "%2의 %1가 창설자 교체 요청을 이미 했습니다."
 
-#: ../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 "팀에 가입하면 팀 창설자가 여러분의 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 "팀 가입은 여러분 계정의 크레딧에 어떤 영향도 끼치지 않습니다."
 
-#: ../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."
+"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 "팀 이름, URL, 개요, 유형, 국가 변경"
 
-#: ../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 광역 팀으로 만들 수 있습니다%2."
+"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."
 
-#: ../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 "팀 관리자들은 구글 %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 "빈 팀이 아니므로 해체할 수 없습니다"
@@ -6246,124 +6029,114 @@ 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"
-"         <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"
+"         <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>"
 
-#: ../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."
+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 항목만 표시됩니다"
 
@@ -6371,11 +6144,11 @@ msgstr "한계 도달 - 죄송합니다. 첫 %1 항목만 표시됩니다"
 msgid "Top hosts"
 msgstr "최고 호스트"
 
-#: ../user/top_teams.php:105
+#: ../user/top_teams.php:107
 msgid "Top %1 teams"
 msgstr "최고 %1 팀"
 
-#: ../user/top_teams.php:108
+#: ../user/top_teams.php:110
 msgid "There are no %1 teams"
 msgstr "%1 팀이 없습니다"
 
@@ -6383,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"
 
@@ -6431,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 "검색어는 최소한 3글자 이상이어야 합니다"
 
-#: ../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 "검색 조건과 일치하는 사용자가 없습니다."
 
@@ -6511,28 +6284,24 @@ msgstr "email 주소 인증"
 msgid "The email address of your account has been validated."
 msgstr "이 계정의 email 주소가 정상적으로 인증되었습니다."
 
-#: ../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 "계정 데이터"
 
 #: ../user/weak_auth.php:52
 msgid ""
-"You can access your account either by using your email address and "
-"password,\n"
+"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 ""
-"여러분은 여러분의 이메일 주소와 비밀번호를 사용해서 계정에 접근할 수도 있지만\n"
-"    한편으로 서명된 '계정 키'를 이용할 수도 있습니다.\n"
-"    여러분의 계정 키:"
+msgstr "여러분은 여러분의 이메일 주소와 비밀번호를 사용해서 계정에 접근할 수도 있지만\n    한편으로 서명된 '계정 키'를 이용할 수도 있습니다.\n    여러분의 계정 키:"
 
 #: ../user/weak_auth.php:57
 msgid "This key can be used to:"
@@ -6548,11 +6317,7 @@ 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를 설치하고\n"
-"       %1 이름을 가진 파일을 BOINC 데이터\n"
-"       디렉토리에 생성 후 내용을 다음과 같이 맞춥니다:"
+msgstr "BOINC 관리자를 사용하지 않고 여러분의 컴퓨터에 계정을 추가시킵니다.\n       그렇게 하려면 BOINC를 설치하고\n       %1 이름을 가진 파일을 BOINC 데이터\n       디렉토리에 생성 후 내용을 다음과 같이 맞춥니다:"
 
 #: ../user/weak_auth.php:73
 msgid "Weak account key"
@@ -6561,17 +6326,11 @@ msgstr "약한 계정 키"
 #: ../user/weak_auth.php:74
 msgid ""
 "Your 'weak account key' can be used to attach computers to your account\n"
-"    as described above, but cannot be used to log in to your account or "
-"change it in any way.\n"
+"    as described above, but cannot be used to log in to your account or change it in any way.\n"
 "    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"
-"    만약 신뢰할 수 없거나 안전하지 않은 컴퓨터에 계정을 추가하고 싶다면\n"
-"    약한 계정 키를 사용해 주시기 바랍니다.\n"
-"    여러분의 약한 계정 키:"
+msgstr "'약한 계정 키'는 위에서 설명한 대로 여러분이 가진 계정을 컴퓨터에 추가할 수 있게\n    해줍니다. 그러나 어떠한 방법으로든 계정에 로그인하거나 정보를 변경할 수는 없습니다.\n    만약 신뢰할 수 없거나 안전하지 않은 컴퓨터에 계정을 추가하고 싶다면\n    약한 계정 키를 사용해 주시기 바랍니다.\n    여러분의 약한 계정 키:"
 
 #: ../user/weak_auth.php:81
 msgid ""
@@ -6587,6 +6346,10 @@ msgstr "작업 유닛을 찾을 수 없습니다"
 msgid "Workunit %1"
 msgstr "작업 유닛 %1"
 
+#: ../user/workunit.php:40
+msgid "application"
+msgstr "응용 프로그램"
+
 #: ../user/workunit.php:43
 msgid "canonical result"
 msgstr "인증된 결과"
@@ -6596,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 "완료될 때까지 비공개로 보류됨"
 
@@ -6623,67 +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 "Copyright"
 
-#: ../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 "(모든 응용 프로그램)"
-
-#~ msgid "Error:"
-#~ msgstr "오류:"
diff --git a/locale/ko/BOINC-Setup.mo b/locale/ko/BOINC-Setup.mo
index 3ccf7d0..75776df 100644
Binary files a/locale/ko/BOINC-Setup.mo and b/locale/ko/BOINC-Setup.mo differ
diff --git a/locale/ko/BOINC-Setup.po b/locale/ko/BOINC-Setup.po
old mode 100755
new mode 100644
index 492b27e..3317afa
--- a/locale/ko/BOINC-Setup.po
+++ b/locale/ko/BOINC-Setup.po
@@ -1,36 +1,32 @@
 # 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: BOINC 7.4\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-11 17:21-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: ko\n"
+"PO-Revision-Date: 2015-02-08 22:34+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\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"
-"X-Generator: Poedit 1.6.3\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"Language: ko\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
+#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
 msgid "Yes"
 msgstr "네"
 
-#: PostInstall.cpp:131
-#: PostInstall.cpp:1137
-#: uninstall.cpp:1619
+#: PostInstall.cpp:131 PostInstall.cpp:1137 uninstall.cpp:1619
 msgid "No"
 msgstr "아니오"
 
@@ -44,10 +40,7 @@ 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"
-"이 Mac에서 비관리자 사용자들도 %s를(을) 실행하고 제어할 수 있게 하길 원하십니까?"
+msgstr "이 컴퓨터에서 관리하도록 허가받은 사용자들은 자동적으로 %s를(를) 실행하고 제어할 수 있도록 허용될 것입니다.\n\n이 Mac에서 비관리자 사용자들도 %s를(을) 실행하고 제어할 수 있게 하길 원하십니까?"
 
 #: PostInstall.cpp:1444
 #, c-format
@@ -66,9 +59,7 @@ msgstr "권한 오류 나중에 재실행하세요"
 msgid ""
 "Removal may take several minutes.\n"
 "Please be patient."
-msgstr ""
-"제거에는 몇 분정도 걸릴 것입니다.\n"
-"잠시 기다려 주세요."
+msgstr "제거에는 몇 분정도 걸릴 것입니다.\n잠시 기다려 주세요."
 
 #: uninstall.cpp:156
 #, c-format
@@ -76,10 +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 ""
-"정말로 이 컴퓨터에서 %s를(을) 완전히 제거하길 원하십니까?\n"
-"\n"
-"실행 파일은 제거되지만 %s 데이터 파일들은 건드리지 않습니다."
+msgstr "정말로 이 컴퓨터에서 %s를(을) 완전히 제거하길 원하십니까?\n\n실행 파일은 제거되지만 %s 데이터 파일들은 건드리지 않습니다."
 
 #: uninstall.cpp:163
 #, c-format
@@ -99,9 +87,7 @@ msgstr "사용자 이름"
 msgid ""
 "Do you also want to remove VirtualBox from your computer?\n"
 "(VirtualBox was installed along with BOINC.)"
-msgstr ""
-"이 컴퓨터에서 VirtualBox도 제거하길 원하십니까?\n"
-"(VirtualBox는 BOINC와 함께 설치되었습니다.)"
+msgstr "이 컴퓨터에서 VirtualBox도 제거하길 원하십니까?\n(VirtualBox는 BOINC와 함께 설치되었습니다.)"
 
 #: uninstall.cpp:312
 #, c-format
@@ -113,23 +99,14 @@ msgid ""
 "\n"
 "for each user, the file\n"
 "\"%s\"."
-msgstr ""
-"제거가 완료되었습니다.\n"
-"\n"
-" 여러분은 파인더를 사용해서 잔존하는 다음 항목을 삭제할 수 있습니다: \n"
-"\"%s\" 디렉토리\n"
-"\n"
-"개별 사용자의 경우\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"
+msgstr "여러분 컴퓨터에서 %s를(을) 완전히 제거하려면 관리자 비밀번호를 입력해 주세요.\n\n"
 
 #: uninstall.cpp:1616
 msgid "Cancel"
@@ -138,4 +115,3 @@ msgstr "취소"
 #: uninstall.cpp:1617
 msgid "Continue..."
 msgstr "계속..."
-
diff --git a/locale/ko/BOINC-Web.mo b/locale/ko/BOINC-Web.mo
index 056c76f..984f5d7 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
old mode 100755
new mode 100644
index 7ef42af..0fa43de
--- a/locale/ko/BOINC-Web.po
+++ b/locale/ko/BOINC-Web.po
@@ -1,25 +1,25 @@
 # BOINC web translation
 # Copyright (C) 2008-2009 University of California
+# 
 # This file is distributed under the same license as BOINC.
+# 
 # FileID  : $Id$
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\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-11 17:21-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: ko\n"
+"PO-Revision-Date: 2015-02-08 22:34+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\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"
-"X-Generator: Poedit 1.6.3\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-KeywordsList: tra\n"
-"X-Poedit-SearchPath-0: doc\n"
 
 #: docutil.php:21
 msgid "Search"
@@ -35,27 +35,25 @@ msgid "This page is %stranslatable%s."
 msgstr "이 페이지는 %s번역이 가능합니다%s."
 
 #: download.php:39
-msgid "We recommend that you also install VirtualBox, so your computer can work on science projects that require it."
+msgid ""
+"We recommend that you also install VirtualBox, so your computer can work on "
+"science projects that require it."
 msgstr "저희는 여러분이 VirtualBox도 같이 설치하길 권장합니다. 그렇게 하면 해당 기능을 요구하는 과학 프로젝트 작업도 수행할 수 있습니다."
 
 #: download.php:41
 msgid "Learn more about VirtualBox."
 msgstr "VirtualBox에 대해서 알아봅니다."
 
-# #######################################
-# download.php
 #: download.php:51
 msgid "Download BOINC + VirtualBox"
 msgstr "BOINC + VirtualBox 다운로드"
 
-#: download.php:54
-#: download.php:69
+#: download.php:54 download.php:69
 #, php-format
 msgid "for %s"
 msgstr "%s용"
 
-#: download.php:57
-#: download.php:72
+#: download.php:57 download.php:72
 #, php-format
 msgid "BOINC version %s"
 msgstr "BOINC 버전 %s"
@@ -65,26 +63,33 @@ msgstr "BOINC 버전 %s"
 msgid "VirtualBox version %s"
 msgstr "VirtualBox 버전 %s"
 
-# #######################################
-# download.php
 #: download.php:67
 msgid "Download BOINC"
 msgstr "BOINC 다운로드"
 
 #: download.php:123
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others."
+msgid ""
+"BOINC is a program that lets you donate your idle computer time to science "
+"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, and many others."
 msgstr "BOINC는 SETI at home, Climateprediction.net, Rosetta at home, World Community Grid 그 외 다른 많은 과학 프로젝트들에게 여러분의 컴퓨터 대기 시간을 기부하도록 하는 프로그램입니다."
 
 #: download.php:125
-msgid "After installing BOINC on your computer, you can connect it to as many of these projects as you like."
+msgid ""
+"After installing BOINC on your computer, you can connect it to as many of "
+"these projects as you like."
 msgstr "컴퓨터에 BOINC를 설치한 후에 여러분이 선호하는 수많은 프로젝트에 연결하실 수 있습니다."
 
 #: download.php:127
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
+msgid ""
+"You may run this software on a computer only if you own the computer or have"
+" the permission of its owner."
 msgstr "여러분은 이 소프트웨어를 여러분이 소유한 컴퓨터 혹은 소유자로부터 권한을 부여받은 컴퓨터에서만 실행해야 합니다."
 
 #: download.php:132
-msgid "We recommend that you download BOINC from the Google Play Store or Amazon Appstore, not from here."
+msgid ""
+"We recommend that you download BOINC from the Google Play Store or Amazon "
+"Appstore, not from here."
 msgstr "이곳보다는 Google Play Store 또는 Amazon Appstore에서 BOINC를 다운로드하시길 권장합니다."
 
 #: download.php:167
@@ -95,8 +100,7 @@ msgstr "시스템 요구 사항"
 msgid "Release notes"
 msgstr "릴리즈 노트"
 
-#: download.php:169
-#: index.php:86
+#: download.php:169 index.php:86
 msgid "Help"
 msgstr "도움말"
 
@@ -118,20 +122,34 @@ msgstr "BOINC: 과학을 위한 컴퓨팅"
 
 #: help.php:12
 #, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
+msgid ""
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who"
+" can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"through the process of installing and using BOINC; %s troubleshoot any "
+"problems you might have."
 msgstr "BOINC 온라인 도움말은 경험많은 BOINC 사용자와 1:1대화를 하도록 합니다 대상: %s는 BOINC와 기여자 컴퓨팅에 대해서 답합니다. %s는 BOINC 설치 진행 및 사용을 도와드릴 것입니다. %s는 여러분이 겪는 각종 문제를 해결해 드릴 것입니다."
 
 #: help.php:21
 #, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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."
+msgid ""
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system."
+" 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 온라인 도움말은 인터넷 전화인 %sSkype%s에 기반을 두고 있습니다. Skype는 소프트웨어와 전화 모두 무료입니다. 아직 Skype를 사용하고 계시지 않았다면, %s지금 다운로드하고 설치하십시오%s. 완료되면 이 페이지로 돌아오십시오."
 
 #: help.php:28
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
+msgid ""
+"The best way to get help is by voice, for which you need either built-in "
+"microphone and speakers or an external headset for your computer.  You can "
+"also use Skype's text-based chat system or regular email (if you don't have "
+"Skype) to communicate with Help Volunteers."
 msgstr "도움을 구하는 가장 좋은 방법은 목소리입니다. 이를 위해서 여러분 컴퓨터에는 마이크와 스피커 또는 외부 헤드셋이 필요합니다. 여러분은 또한 도우미 기여자들과 Skype 텍스트 기반 대화 시스템이나 일반적인 email (만약 Skype를 쓰지 않을 경우)로 대화를 주고받을 수 있습니다. "
 
 #: help.php:31
-msgid "Volunteers speaking several languages are available. Please select a language:"
+msgid ""
+"Volunteers speaking several languages are available. Please select a "
+"language:"
 msgstr "기여자들은 몇가지 언어로 얘기하는 것이 가능합니다. 언어를 선택해 주세요:"
 
 #: help.php:47
@@ -140,16 +158,22 @@ msgstr "도우미 기여자 되기"
 
 #: help.php:50
 #, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
+msgid ""
+"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+"Volunteer%s.  It's a great way to help the cause of scientific research and "
+"volunteer computing - and it's fun!"
 msgstr "만약 여러분이 경험많은 BOINC 사용자라면, 우리는 여러분이 %s도우미 기여자%s가 되길 장려합니다. 그 것은 과학적 연구와 기여자 컴퓨팅을 돕는 위대한 방법입니다 - 그리고 그 것을 즐기세요!"
 
 #: help.php:56
 #, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
+msgid ""
+"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
 msgstr "여러분이 이미 도우미 기여자일 경우: 설정을 바꾸실려면 %s여기를 누르십시오%s."
 
 #: help_funcs.php:107
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
+msgid ""
+"BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
+"or the University of California."
 msgstr "BOINC 도우미는 자원봉사자들입니다.  그들의 조언은 BOINC나 캘리포니아 대학교에서 보증하지 않습니다."
 
 #: help_funcs.php:110
@@ -196,15 +220,11 @@ msgstr "뉴스"
 msgid "Volunteer"
 msgstr "기여자"
 
-# #######################################
-# download.php
 #: index.php:85
 msgid "Download"
 msgstr "다운로드"
 
-#: index.php:87
-#: index.php:120
-#: index.php:171
+#: index.php:87 index.php:120 index.php:171
 msgid "Documentation"
 msgstr "문서"
 
@@ -217,15 +237,16 @@ msgid "Links"
 msgstr "링크"
 
 #: index.php:94
-msgid "Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:"
+msgid ""
+"Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure"
+" diseases, study global warming, discover pulsars, and do many other types "
+"of scientific research.  It's safe, secure, and easy:"
 msgstr "질병 치료, 지구 온난화 연구, 중성자별 발견 그 외에 또 많은 종류의 과학연구를 위해 여러분 컴퓨터(윈도우, 맥, 리눅스, 안드로이드)의 대기 시간을 사용하십시오. 이 것은 안전하고 보안이 철저하며 쉽습니다:"
 
 #: index.php:96
 msgid "Choose projects"
 msgstr "프로젝트를 선택하세요"
 
-# #######################################
-# download.php
 #: index.php:97
 msgid "Download BOINC software"
 msgstr "BOINC 소프트웨어를 다운로드하세요"
@@ -236,7 +257,9 @@ msgstr "이메일 주소와 비밀번호를 입력하세요."
 
 #: index.php:102
 #, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
+msgid ""
+"Or, if you run several projects, try an %saccount manager%s such as "
+"%sGridRepublic%s or %sBAM!%s. "
 msgstr "혹시 여러 개의 프로젝트를 수행하고 계시다면 %s계정 관리자%s(%sGridRepublic%s이나 %sBAM!%s등)를 사용해 보십시오."
 
 #: index.php:118
@@ -248,11 +271,15 @@ msgid "Software updates"
 msgstr "소프트웨어 업데이트"
 
 #: index.php:128
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving"
+" you the computing power of thousands of CPUs."
 msgstr "%1과학자%2: BOINC를 이용해서 %3기여자 컴퓨팅 프로젝트%4를 생성하고 CPU 수천 개분의 연산 능력을 제공받으세요."
 
 #: index.php:132
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
 msgstr "%1대학%2: %3가상 캠퍼스 슈퍼컴퓨터 센터%4를 생성해서 BOINC를 이용하세요."
 
 #: index.php:137
@@ -325,7 +352,8 @@ msgstr "add-on 소프트웨어를 위한 API"
 
 #: index.php:217
 #, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
+msgid ""
+"Open-source software for %svolunteer computing%s and %sgrid computing%s."
 msgstr "%s기여자 컴퓨팅%s과 %s그리드 컴퓨팅%s을 위한 오픈 소스 소프트웨어"
 
 #: index.php:230
@@ -345,7 +373,10 @@ msgid "Seismology"
 msgstr "지진학"
 
 #: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
+msgid ""
+"The Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to Internet-connected computers.  You must buy a "
+"sensor to participate."
 msgstr "Quake-Catcher Network는 인터넷에 연결된 컴퓨터에 연결된 센서를 사용한 세계에서 가장 큰 지진 감지망으로 개발되었습니다. 여러분이 참여하려면 반드시 센서를 사야 됩니다."
 
 #: projects.inc:27
@@ -357,23 +388,24 @@ msgid "Environmental research"
 msgstr "환경 연구"
 
 #: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
+msgid ""
+"This project is creating a free and continuously updated map of radiation "
+"levels by using sensors connected to volunteers' computers.  You must buy a "
+"sensor to participate."
 msgstr "이 프로젝트는 기여자들의 컴퓨터에 연결된 센서를 사용해서 지속적으로 업데이트되는 방사능 단계 지도를 대가없이 생성합니다. 여러분이 참여하려면 반드시 센서를 사야 됩니다."
 
 #: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
+msgid ""
+"To participate in these projects you must buy a sensor and attach it to your"
+" computer."
 msgstr "이러한 프로젝트에 참여하려면 여러분은 반드시 센서를 사서 컴퓨터에 연결시켜야 됩니다."
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
 msgstr "인지 과학과 인공 지능"
 
-#: projects.inc:60
-#: projects.inc:364
-#: projects.inc:408
-#: projects.inc:457
-#: projects.inc:464
-#: projects.inc:511
+#: projects.inc:60 projects.inc:364 projects.inc:408 projects.inc:457
+#: projects.inc:464 projects.inc:511
 msgid "Private"
 msgstr "개인"
 
@@ -382,7 +414,11 @@ msgid "Artificial intelligence"
 msgstr "인공 지능"
 
 #: projects.inc:62
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
+msgid ""
+"Parse and convert semantic nets for use in FreeHAL, an artificial "
+"intelligence that uses semantic networks, stemmers, part of speech "
+"databases, and part of speech taggers in order to imitate human behavior in "
+"conversations."
 msgstr "인공 지능은 회화에서 인간의 행동을 모방하기 위해서 의미망, 스테밍, 품사 데이터베이스, 품사 태거를 이용합니다. FreeHAL에서는 이런 인공 지능 개발을 위해서 의미망을 분석하고 FreeHAL에서 사용할 수 있게 변환합니다."
 
 #: projects.inc:69
@@ -398,7 +434,12 @@ msgid "Antimalarial drug discovery"
 msgstr "항말라리야성 약물 발견"
 
 #: projects.inc:84
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
+msgid ""
+"The parasite that causes malaria continues to evolve resistance to available"
+" medication. We therefore urgently need to discover new drugs to replace "
+"existing drugs. Importantly, these new drugs need to target NEW proteins in "
+"the parasite. The FightMalaria at Home project is aimed at finding these new "
+"targets."
 msgstr "말라리야를 유발하는 기생충은 사용가능한 약물에 대한 내성이 계속 진화하고 있습니다. 따라서 우리는 시급히 현존하는 약을 대체할 새로운 약을 발견할 필요가 있습니다. 중요한 점은 이런 새로운 약은 기생충 안에 있는 '새로운' 단백질을 대상으로 요구합니다. FightMalaria at Home 프로젝트는 이러한 새로운 대상을 찾는 것을 목표로 합니다."
 
 #: projects.inc:90
@@ -410,7 +451,12 @@ msgid "Protein structure prediction"
 msgstr "단백질 구조 예측"
 
 #: projects.inc:92
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
+msgid ""
+"POEM at HOME uses a computational approach to predict the biologically active "
+"structure of proteins, to understand the signal-processing mechanisms when "
+"the proteins interact with one another, to understand diseases related to "
+"protein malfunction or aggregation, and to develop new drugs on the basis of"
+" the three-dimensions structure of biologically important proteins."
 msgstr "POEM at HOME은 단백질의 활성 구조를 생물학적으로 예측하기 위해서 컴퓨터를 이용합니다. 또 단백질 간의 상호작용이 일어날 때의 신호처리 메커니즘을 이해하고자 합니다. 이외에 단백질의 기능 저하나 집적과 관련있는 질병을 이해하고 생물학적으로 중요한 단백질들의 3차원 구조에 기반해서 신약을 개발하는데 그 목적이 있습니다."
 
 #: projects.inc:98
@@ -422,7 +468,11 @@ msgid "Study of protein - ligand interactions"
 msgstr "단백질 이론 - 리간드 상호작용"
 
 #: projects.inc:100
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
+msgid ""
+"Docking at Home has both bioscience and computer science goals. The project "
+"aims to further knowledge of the atomic details of protein-ligand "
+"interactions and, by doing so, will search for insights into the discovery "
+"of novel pharmaceuticals."
 msgstr "Docking at Home은 생명과학과 컴퓨터 과학의 양면에 목표를 갖고 있습니다. 프로젝트는 단백질 리간드 상호작용의 원자적 세부사항을 이해하고 그렇게 함으로써 새로운 의약품을 개발하기 위한 식견을 넓히는 것을 목표로 합니다."
 
 #: projects.inc:114
@@ -434,7 +484,11 @@ msgid "Molecular simulations of proteins"
 msgstr "단백질 분자 시뮬레이션"
 
 #: projects.inc:116
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
+msgid ""
+"GPUGrid.net opens novel computational scenarios by the first full-atom "
+"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
+"New biomedical applications suddenly become possible giving a new role to "
+"computational biology for biomedical research."
 msgstr "GPUGrid.net은 NVIDIA GPU에서 실행시키기 위해 처음으로 분자 속 전체 원자 동적 분석 코드(CellMD)로 특별히 최적화되었습니다. 이로서 새로운 계산 시나리오가 개척되었습니다. 새로운 생물의학 어플리케이션은 생물의학 연구를 위한 전산 생물학에 새로운 역할을 부여할 가능성을 가지고 있습니다."
 
 #: projects.inc:122
@@ -446,11 +500,15 @@ msgid "Genetic linkage analysis"
 msgstr "유전학적 연관성 분석"
 
 #: projects.inc:124
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
+msgid ""
+"Superlink at Technion helps geneticists all over the world find disease-"
+"provoking genes causing some types of diabetes, hypertension (high blood "
+"pressure), cancer, schizophrenia and many others."
 msgstr "Superlink at Technion은 당뇨병, 고혈압, 암, 정신 분열증, 기타 질병 등을 유발하는 특정 종류의 질병 유발 유전자를 찾는 전세계 모든 유전학자를 지원합니다."
 
 #: projects.inc:138
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
+msgid ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
 msgstr "메릴랜드 대학교 생물정보학과 전산생물학 연구 센터(University of Maryland Center for Bioinformatics and Computational Biology)"
 
 #: projects.inc:139
@@ -458,7 +516,11 @@ msgid "Life science research"
 msgstr "생명 과학 연구"
 
 #: projects.inc:140
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
+msgid ""
+"The Lattice Project supplies computing power to scientists at the University"
+" of Maryland studying evolutionary relationships based on DNA sequence data;"
+" bacterial, plasmid, and virus protein sequences; and biological diversity "
+"in nature reserves. "
 msgstr "Lattice 프로젝트는 Maryland 대학교의 과학자들에게 컴퓨터 연산 능력을 제공합니다. 연구 분야: DNA 서열 데이터에 기반한 진화 관계, 박테리아, 플라스미드, 바이러스의 단백질 서열, 자연보호구역의 생물학적 다양성"
 
 #: projects.inc:146
@@ -470,20 +532,32 @@ msgid "Epidemiology"
 msgstr "전염병학"
 
 #: projects.inc:148
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
+msgid ""
+"Simulation models of the transmission dynamics and health effects of malaria"
+" are an important tool for malaria control. They can be used to determine "
+"optimal strategies for delivering mosquito nets, chemotherapy, or new "
+"vaccines which are currently under development and testing.  Such modeling "
+"is extremely computer intensive, requiring simulations of large human "
+"populations with a diverse set of parameters related to biological and "
+"social factors that influence the distribution of the disease. "
 msgstr "전염 개체들의 시뮬레이션과 말라리아가 건강에 끼치는 영향은 말라리아 통제를 위한 중요한 수단입니다. 이는 현재 개발되고 있거나 시험 중인 새로운 백신, 화학요법, 모기장을 제공하기 위한 최적화된 전략을 정하기 위해서 이용될 수 있습니다. 이러한 모델은 컴퓨터에 매우 의존해야 되며, 질병 분포에 영향을 미치는 생물학적, 사회적 요인들이 관련된 인자를 포함한 여러 종류의 조건을 갖춘 대규모 인구 집단의 시뮬레이션이 요구됩니다."
 
 #: projects.inc:170
 msgid "University of Washington"
 msgstr "워싱턴 대학교"
 
-#: projects.inc:171
-#: projects.inc:179
+#: projects.inc:171 projects.inc:179
 msgid "Biology"
 msgstr "생물학"
 
 #: projects.inc:172
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
+msgid ""
+"Determine the 3-dimensional shapes of proteins in research that may "
+"ultimately lead to finding cures for some major human diseases. By running "
+"Rosetta at home you will help us speed up and extend our research in ways we "
+"couldn't possibly attempt without your help. You will also be helping our "
+"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
+"Cancer, and Alzheimer's"
 msgstr "단백질의 3차원 형태를 파악하는 연구는 궁극적으로 특정 질병의 치료법을 이끌어낼 수 있을지도 모릅니다. Rosetta at home을 실행함으로써 여러분의 도움 없이는 시도할 수 없었던 방법으로 연구를 진행하고 있습니다. 따라서 여러분은 저희 연구의 속도를 높이고 확장하는 것을 도울 수 있습니다. 또한 HIV, 말라리아, 암, 알츠하이머 병과 같은 질환과 싸울 새로운 단백질의 설계를 도와줄 수 있습니다."
 
 #: projects.inc:178
@@ -491,7 +565,10 @@ msgid "University of Vienna"
 msgstr "비엔나 대학교"
 
 #: projects.inc:180
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
+msgid ""
+"Calculate similarities between proteins. SIMAP provides a public database of"
+" the resulting data, which plays a key role in many bioinformatics research "
+"projects."
 msgstr "단백질 사이의 유사성을 계산합니다. SIMAP는 많은 생명 정보학 연구 프로젝트에게 중요한 역할을 하는 결과 값들의 공공 데이터베이스를 제공합니다."
 
 #: projects.inc:186
@@ -507,7 +584,15 @@ msgid "Climate study"
 msgstr "기후 연구"
 
 #: projects.inc:200
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
+msgid ""
+"Investigate the approximations that have to be made in state-of-the-art "
+"climate models. By running the model thousands of times we hope to find out "
+"how the model responds to slight tweaks to these approximations - slight "
+"enough to not make the approximations any less realistic. This will allow us"
+" to improve our understanding of how sensitive our models are to small "
+"changes and also to things like changes in carbon dioxide and the sulphur "
+"cycle. This will allow us to explore how climate may change in the next "
+"century under a wide range of different scenarios."
 msgstr "최첨단 기후 모델로 만들어진 근사값을 추측합니다. 우리는 해당 모델을 여러 번 실행시켜서, 근사값을 조금씩 수정함에 따라 모델이 어떻게 반응하는지를 알아내려고 하고 있습니다.(근사값이 비현실적인 값이 되지 않을 만큼 조금씩만 변화시킵니다)  이 것은 우리의 모델이 작은 변화나 이산화탄소 및 유황순환의 변화에 얼마나 민감한지 이해할 수 있게 해줍니다. 또한 우리에게 기후가 다른 시나리오에서 넓은 지역에 걸쳐 다음 세기에 어떻게 변할 것인지 탐색할 수 있게 해줄 것입니다."
 
 #: projects.inc:207
@@ -519,30 +604,45 @@ msgid "Mechanical engineering"
 msgstr "기계 공학"
 
 #: projects.inc:214
-msgid "Currently we are calculating the optimum design of a structure call the 52 bar truss"
+msgid ""
+"Currently we are calculating the optimum design of a structure call the 52 "
+"bar truss"
 msgstr "현재 저희는 52 바 트로스라는 구조물의 최적 설계안을 계산하고 있습니다"
 
-#: projects.inc:224
-#: projects.inc:263
-#: projects.inc:271
+#: projects.inc:224 projects.inc:263 projects.inc:271
 msgid "Astronomy"
 msgstr "천문학"
 
 #: projects.inc:225
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
+msgid ""
+"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
+"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
+"Universe. We will measure physical parameters (such as stellar mass surface "
+"density, star formation rate surface density, attenuation, and first-order "
+"star formation history) on a resolved pixel-by-pixel basis using spectral "
+"energy distribution (SED) fitting techniques in a distributed computing "
+"mode."
 msgstr "저희는 근처 우주의 다파장 UV 광학 NIR 은하 지도를 생성하기 위해 GALEX, Pan-STARRS1, WISE의 스펙트럼 커버리지를 통합합니다. 저희는 분산 컴퓨팅 모드에서 스펙트럼 에너지 분포(SED) 피팅 기술을 사용한, 분해된 개별 픽셀 정보상의 물리적 파라메터들(예를 들어 항성의 질량 면밀도, 항성 생성률의 면밀도, 감쇠, 일차 항성의 형성 이력)을 측량합니다."
 
 #: projects.inc:247
 msgid "University of Texas at Austin"
 msgstr "텍사스 대학교 오스틴 캠퍼스(University of Texas at Austin)"
 
-#: projects.inc:248
-#: projects.inc:279
+#: projects.inc:248 projects.inc:279
 msgid "Chemistry"
 msgstr "화학"
 
 #: projects.inc:249
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
+msgid ""
+"A common problem in theoretical chemistry, condensed matter physics and "
+"materials science is the calculation of the time evolution of an atomic "
+"scale system where, for example, chemical reactions and/or diffusion occur. "
+"Generally the events of interest are quite rare (many orders of magnitude "
+"slower than the vibrational movements of the atoms), and therefore direct "
+"simulations, tracking every movement of the atoms, would take thousands of "
+"years of computer calculations on the fastest present day computer before a "
+"single event of interest can be expected to occur.  Our research group is "
+"interested in calculating the long time dynamics of systems."
 msgstr "이론화학, 응집물질물리학, 재료과학에서의 일반적인 문제는 화학 반응이나 확산이 발생할 때 원자 단위 체계에서 일어나는 시간 변화를 계산하는 것입니다. 일반적으로 우리가 관측하려는 사건은 훨씬 드물게 발생합니다.(원자의 진동속도보다 비교할 수 없을 정도로 느립니다) 즉 원자 각각의 운동을 직접 시뮬레이션다면, 관측하려는 사건을 단 한 번 발생시키려고 하는 데만도 현존하는 가장 빠른 컴퓨터로 수천 년이 걸릴 정도입니다. 저희 연구 단체에서는 체계의 장시간 역학을 계산하는 것에 흥미를 갖고 있습니다."
 
 #: projects.inc:262
@@ -550,7 +650,10 @@ msgid "University of Illinois at Urbana-Champaign"
 msgstr "일리노이 대학교 어바나-샴페인<br />(University of Illinois at Urbana-Chamapign)"
 
 #: projects.inc:264
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
+msgid ""
+"The goal of Cosmology at Home is to search for the model that best describes "
+"our Universe and to find the range of models that agree with the available "
+"astronomical particle physics data."
 msgstr "Cosmology at Home의 목표는 우리 우주를 가장 잘 기술할 수 있는 모델을 찾고 사용 가능한 천문학적 입자 물리학 데이터와 일치하는 모델의 범위를 찾습니다."
 
 #: projects.inc:270
@@ -558,7 +661,10 @@ msgid "Rensselaer Polytechnic Institute"
 msgstr "렌셀러 폴리테크닉 대학교(Rensselaer Polytechnic Institute)"
 
 #: projects.inc:272
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
+msgid ""
+"The goal of Milkyway at Home is to create a highly accurate three dimensional "
+"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
+"Survey."
 msgstr "Milkyway at Home의 목표는 슬론 디지털 스카이 탐사(Sloan Digital Sky Survey)에서 수집된 데이터를 사용해서 은하수 은하의 가장 정확한 3차원 모델을 만드는 것입니다."
 
 #: projects.inc:278
@@ -566,7 +672,13 @@ msgid "Leiden University, The Netherlands"
 msgstr "네덜란드 Leiden 대학교"
 
 #: projects.inc:280
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
+msgid ""
+"Surface science calculations using Classical Dynamics.  Leiden Classical "
+"allows volunteers, students and other scientist to submit their personal "
+"calculations to the grid. Each user has his own personal queue for Classical"
+" Dynamics jobs. In this way students have used the grid to simulate liquid "
+"argon, or to test the validity of the ideal gas law by actually doing the "
+"simulations through the grid."
 msgstr "표면 과학 계산은 고전 역학을 이용합니다. Leiden Classical은 기여자, 학생, 다른 과학자에게 가각 개인적으로 한 계산을 그리드로 제출할 수 있게 해줍니다. 각 유저는 고전 역학 작업을 위한 개인적인 대기열을 가지고 있습니다. 이런 방식으로 학생들은 액체 아르곤을 시뮬레이션하기 위해서 또는 실제로 그리드를 통해서 시뮬레이션을 실행함으로써 이상기체 법칙의 타당성을 시험하기 위해 그리드를 이용할 수 있습니다."
 
 #: projects.inc:294
@@ -578,25 +690,36 @@ msgid "Astrophysics"
 msgstr "천체물리학"
 
 #: projects.inc:296
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
+msgid ""
+"Search for spinning neutron stars (also called pulsars) using data from the "
+"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
+"observatory.  Einstein at Home is a World Year of Physics 2005 project "
+"supported by the American Physical Society (APS) and by a number of "
+"international organizations."
 msgstr "LIGO 및 GEO 중력파 감지기와 아레시보 전파 망원경에서 수집된 데이터를 사용해서 회전하는 중성자 별(펄서라고도 합니다)을 찾습니다.  Einstein at Home은 미국 물리학 협회(APS) 및 수많은 국제 단체로부터 지원을 받는 2005 세계 과학의 해 프로젝트입니다."
 
-#: projects.inc:310
-#: projects.inc:318
+#: projects.inc:310 projects.inc:318
 msgid "CERN (European Organization for Nuclear Research)"
 msgstr "CERN (유럽 입자 물리 연구소)"
 
-#: projects.inc:311
-#: projects.inc:319
+#: projects.inc:311 projects.inc:319
 msgid "Physics"
 msgstr "물리학"
 
 #: projects.inc:312
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
+msgid ""
+"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
+"European Organization for Nuclear Research, the world's largest particle "
+"physics laboratory.  It is the most powerful instrument ever built to "
+"investigate on particles proprieties. LHC at home runs simulations to improve "
+"the design of LHC and its detectors."
 msgstr "대형 강입자 가속기(LHC)는 CERN(유럽 입자 물리 연구소)에 위치한 소립자 가속기이며, 세계에서 가장 큰 입자 물리학 연구시설입니다. 이것은 입자의 속성을 조사하기 위해서 건설한 것 중 가장 강력한 장치입니다. LHC at home은 LHC 및 검출기의 설계를 향상시키기 위한 시뮬레이션을 수행합니다."
 
 #: projects.inc:320
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
+msgid ""
+"This project uses CERN-developed virtual machine technology for full-fledged"
+" LHC event physics simulation on volunteer computers.  Requires that you "
+"install VirtualBox on your computer"
 msgstr "이 프로젝트는 CERN이 개발한, 완전히 독립된 LHC 사건(event) 물리학 시뮬레이션용 가상 머신 기술을 기여자 컴퓨터 상에서 사용합니다. 따라서 여러분은 컴퓨터에 VirtualBox를 설치해야 됩니다."
 
 #: projects.inc:326
@@ -608,7 +731,12 @@ msgid "Astrophysics, astrobiology"
 msgstr "천체물리학, 우주생물학"
 
 #: projects.inc:328
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
+msgid ""
+"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
+"goal is to detect intelligent life outside Earth. One approach, known as "
+"radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
+"signals from space. Such signals are not known to occur naturally, so a "
+"detection would provide evidence of extraterrestrial technology."
 msgstr "SETI(Search for Extraterrestrial Intelligence, 외계 지성체 탐사)는 지구 밖에 존재하는 지성체를 감지하는 데 목표를 둔 과학 분야입니다. 라디오 SETI로 알려진 한가지 접근 방법은 우주에서 오는, 좁은 대역폭의 전파를 듣기 위해서 전파 망원경을 사용합니다. 어떤 신호는 자연적으로 발생하지 않는다고 알려져 있습니다. 따라서 이 것의 감지는 외계 기술의 증거를 제공해 줄 수도 있습니다."
 
 #: projects.inc:342
@@ -620,7 +748,11 @@ msgid "Chemical engineering and nanotechnology"
 msgstr "화학 공학과 나노 기술"
 
 #: projects.inc:344
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
+msgid ""
+"The study of molecular magnets and controlled nanoscale magnetism.  These "
+"magnetic molecules may be used to develop tiny magnetic switches, with "
+"applications in medicine (such as local tumor chemotherapy) and "
+"biotechnology."
 msgstr "분자 자석과 제어된 나노 단위의 자력을 연구합니다. 이런 자성을 가진 분자는 의약품(예를 들어 국소암 화학 요법)과 생물 공학에 적용할 수 있는 극소형 자성 스위치 개발에 사용될 수 있을지도 모릅니다."
 
 #: projects.inc:351
@@ -636,7 +768,10 @@ msgid "Physics, biochemistry, and others"
 msgstr "물리학, 생화학, 기타"
 
 #: projects.inc:358
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
+msgid ""
+"The objective of CAS at home is to encourage and assist scientists in China to "
+"adopt the technologies of volunteer computing and volunteer thinking for "
+"their research."
 msgstr "CAS at home의 목적은 기여자 컴퓨팅 기술과 연구에 대한 기여자들의 생각을 채택해서 중국에 있는 과학자들을 장려하고 지원하는 것입니다."
 
 #: projects.inc:365
@@ -644,11 +779,12 @@ msgid "Mathematics, physics, evolution"
 msgstr "수학, 물리학, 진화론"
 
 #: projects.inc:366
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
+msgid ""
+"Yoyo at home is an adapter between BOINC and several existing volunteer "
+"computing projects: ECM, Muon, Evolution at home, and distributed.net"
 msgstr "Yoyo at home은 BOINC와 기존 기여자 컴퓨팅 프로젝트(ECM, 뮤온, Evolution at home, distributed.net)를 중개합니다."
 
-#: projects.inc:371
-#: projects.inc:527
+#: projects.inc:371 projects.inc:527
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 msgstr "MTA-SZTAKI 병렬 및 분산 시스템 연구소 (헝가리, MTA-SZTAKI Laboratory of Parallel and Distributed Systems)"
 
@@ -657,7 +793,11 @@ msgid "European research projects"
 msgstr "유럽의 연구 프로젝트들"
 
 #: projects.inc:373
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
+msgid ""
+"The EDGeS at Home Beta project integrates volunteer computing into the service "
+"grid network of Europe by allowing service grids to send workunits to be "
+"processed by the volunteers of this project. The scientific projects covered"
+" by the project include math, physics, biology, etc."
 msgstr "EDGeS at Home 베타 프로젝트는 해당 프로젝트의 기여자가 처리해야할 작업 유닛을 전송하는 서비스 그리드를 허용함으로써 유럽 서비스 그리드 네트워크와 기여자 컴퓨팅을 통합합니다. 과학 프로젝트는 수학, 물리학, 생물학, 기타 등을 포함하고 있습니다."
 
 #: projects.inc:379
@@ -681,7 +821,11 @@ msgid "Medical, environmental and other humanitarian research"
 msgstr "의학, 환경 및 기타 인도주의적 연구"
 
 #: projects.inc:389
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
+msgid ""
+"To further critical non-profit research on some of humanity's most pressing "
+"problems by creating the world's largest volunteer computing grid.  Research"
+" includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"clean water and many more."
 msgstr "세계에서 가장 큰 기여자 컴퓨팅 그리드를 통해서 인류가 직면한 가장 심각한 문제를 비영리적으로 연구합니다.  연구에는 HIV 에이즈, 암, 열대 지방의 병 및 연구가 덜 된 질병, 태양 에너지, 깨끗한 물 이외에 많은 것들이 포함됩니다."
 
 #: projects.inc:395
@@ -700,21 +844,18 @@ msgstr "수학, 물리학, 인공 지능"
 msgid "Simulation of quantum computing; Goldbach's conjecture."
 msgstr "양자 컴퓨팅 시뮬레이션, 골드바흐 추측(Goldbach's conjecture)."
 
-#: projects.inc:450
-#: projects.inc:458
+#: projects.inc:450 projects.inc:458
 msgid "Cryptography"
 msgstr "암호학"
 
 #: projects.inc:459
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
+msgid ""
+"Attempt to decode 3 original Enigma messages. The signals were intercepted "
+"in the North Atlantic in 1942 and are believed to be unbroken."
 msgstr "3가지 에니그마 원문을 해독하고자 시도합니다. 이 신호는 1942년 북대서양에서 포착되었으며 깨지지 않은 것으로 여겨지고 있습니다."
 
-#: projects.inc:465
-#: projects.inc:504
-#: projects.inc:512
-#: projects.inc:520
-#: projects.inc:528
-#: projects.inc:568
+#: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
+#: projects.inc:528 projects.inc:568
 msgid "Mathematics"
 msgstr "수학"
 
@@ -731,11 +872,19 @@ msgid "Factorization of large integers"
 msgstr "큰 정수의 인수 분해"
 
 #: projects.inc:473
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
+msgid ""
+"NFS at Home is a research project that uses Internet-connected computers to do "
+"the lattice sieving step in the Number Field Sieve factorization of large "
+"integers. As a young school student, you gained your first experience at "
+"breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
+"NFS at Home is a continuation of that experience, only with integers that are "
+"hundreds of digits long."
 msgstr "NFS at Home은 큰 정수들을 수체선별법(Number Field Sieve)으로써 인수분해하는 래티스 시빙 절차를 시행하기 위해서, 인터넷에 연결된 컴퓨터를 사용하는 연구 프로젝트입니다. 초등학교 저학년 시절에 15 = 3 * 5 혹은 35 = 5 * 7처럼 정수를 소인수로 쪼개어 본 경험을 하셨을 것입니다. NFS at Home은 이러한 경험의 연장선입니다. 단지 정수가 백자리 정도의 길이를 갖을 뿐입니다."
 
 #: projects.inc:479
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
+msgid ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
 msgstr "빌니우스 게디미나스 공과대학교(Vilnius Gediminas Technical University)와 카우나스 기술 대학교(Kaunas University of Technology)(리투아니아)"
 
 #: projects.inc:480
@@ -743,7 +892,11 @@ msgid "Software testing"
 msgstr "소프트웨어 테스트"
 
 #: projects.inc:481
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
+msgid ""
+"The aim of this project is to provide a powerful distributed computing "
+"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
+"well as others Lithuanian academic institutions.  Current applications "
+"involve the study of Monte-Carlo based software testing."
 msgstr "이 프로젝트의 목표는 Vilnius Gediminas 공과대학교와 같은 다른 리투아니아 연구 기관들의 과학자에게 강력한 분산 컴퓨팅 플랫폼을 제공하는 것입니다. 현 응용 프로그램은 몬테 카를로 이론에 기반한 소프트웨어 테스트를 수반합니다."
 
 #: projects.inc:503
@@ -751,11 +904,20 @@ msgid "Mathematical Institute of Leiden University / Kennislink"
 msgstr "Leiden 대학교 수학 연구소(Mathematical Institute of Leiden University) / Kennislink"
 
 #: projects.inc:505
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
+msgid ""
+"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
+"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
+"product of the distinct prime factors of n. The ABC conjecture says that "
+"there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for "
+"any real h > 1. The ABC conjecture is currently one of the greatest open "
+"problems in mathematics. If it is proven to be true, a lot of other open "
+"problems can be answered directly from it."
 msgstr "'ABC 삼각형'을 찾습니다: 양의 정수 a, b, c는 다음과 같다. a+b=c, a < b < c, a, b, c는 공약수가 없으며 c > rad(abc)이다. 여기서 rad(n)은 n을 구성하는 소인수들의 곱을 나타냅니다. ABC 추측은 log(c)/log(rad(abc)) > h (h는 1보다 큰 임의의 실수)를 만족하는 a, b, c는 유한하다고 말하고 있습니다. ABC 추측은 현재 수학에서 가장 큰 미해결 문제 중 하나입니다. 만약 이 것이 사실로 증명되면 이 것에서 다른 수많은 미해결 문제들의 답을 직접적으로 찾을 수 있습니다."
 
 #: projects.inc:513
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
+msgid ""
+"Primegrid has multiple projects searching for different forms of very large "
+"prime numbers, including searching for the largest known prime number."
 msgstr "Primegrid는 다른 형태의 매우 큰 소수를 찾는 복수 프로젝트입니다. 그중에는 알려진 소수 중 가장 큰 소수를 찾는 프로젝트도 포함됩니다."
 
 #: projects.inc:519
@@ -763,11 +925,15 @@ msgid "Hochschule RheinMain University of Applied Sciences"
 msgstr "Hochschule RheinMain 응용 과학 대학교"
 
 #: projects.inc:521
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
+msgid ""
+"Search for counterexamples to two conjectures related to the identification "
+"of prime numbers"
 msgstr "소수 증명과 관련된 두가지 추측의 반례를 찾습니다"
 
 #: projects.inc:529
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
+msgid ""
+"Find all the generalized binary number systems (in which bases are matrices "
+"and digits are vectors) up to dimension 11."
 msgstr "11차원 이상에서 법칙화된 2진수 체계(행렬들로 이루어졌으며, 숫자는 벡터)를 모두 찾습니다."
 
 #: ../html/inc/news.inc:40
@@ -778,7 +944,3 @@ msgstr "코멘트"
 #, php-format
 msgid "News is available as an %sRSS feed%s"
 msgstr "공지 사항은 %sRSS 피드%s로도 제공됩니다"
-
-#~ msgid "Astronomy, Physics, and Chemistry"
-#~ msgstr "천문학, 물리학, 화학"
-
diff --git a/locale/lt/BOINC-Client.mo b/locale/lt/BOINC-Client.mo
index b022b54..dc416f9 100644
Binary files a/locale/lt/BOINC-Client.mo and b/locale/lt/BOINC-Client.mo differ
diff --git a/locale/lt/BOINC-Client.po b/locale/lt/BOINC-Client.po
old mode 100755
new mode 100644
index e594f41..a4bfe38
--- a/locale/lt/BOINC-Client.po
+++ b/locale/lt/BOINC-Client.po
@@ -1,24 +1,24 @@
 # 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:
+# Rytis Slatkevičius <rytis.s at gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-10-15 22:25-0700\n"
-"PO-Revision-Date: 2015-02-11 17:32-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: lt\n"
+"PO-Revision-Date: 2015-03-14 11:03+0000\n"
+"Last-Translator: Rytis Slatkevičius <rytis.s at gmail.com>\n"
+"Language-Team: Lithuanian (http://www.transifex.com/projects/p/boinc/language/lt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-POOTLE-MTIME: 1389445096.0\n"
+"Language: lt\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: acct_mgr.cpp:450
-#: acct_mgr.cpp:459
+#: acct_mgr.cpp:450 acct_mgr.cpp:459
 msgid "Message from account manager"
 msgstr "Žinutė iš paskyros valdytojo"
 
@@ -27,7 +27,9 @@ msgid "Message from server"
 msgstr "Žinutė iš serverio"
 
 #: client_state.cpp:258
-msgid "Some tasks need more memory than allowed by your preferences.  Please check the preferences."
+msgid ""
+"Some tasks need more memory than allowed by your preferences.  Please check "
+"the preferences."
 msgstr "Kai kurioms užduotims reikia daugiau atminties nei leidžia jūsų nustatymai. Patikrinkite nustatymus."
 
 #: client_state.cpp:520
@@ -40,11 +42,12 @@ msgstr "HTTP_PROXY sistemos kintamas turi nurodyti HTTP įgaliotąjį serverį"
 
 #: cs_scheduler.cpp:613
 #, c-format
-msgid "You used the wrong URL for this project.  When convenient, remove this project, then add %s"
+msgid ""
+"You used the wrong URL for this project.  When convenient, remove this "
+"project, then add %s"
 msgstr "Naudojate blogą interneto adresą šiam projektui. Kai bus patogu, pašalinkite šį projektą ir pridėkite %s"
 
-#: cs_statefile.cpp:828
-#: ../sched/sched_types.cpp:259
+#: cs_statefile.cpp:828 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
 msgstr "Sintaksės klaida byloje app_info.xml"
 
@@ -56,18 +59,15 @@ msgstr "Neegzistuoja rinkmena, nurodyta app_info.xml:"
 msgid "A new version of BOINC is available."
 msgstr "Yra nauja BOINC versija."
 
-#: current_version.cpp:94
-#: current_version.cpp:102
+#: current_version.cpp:94 current_version.cpp:102
 msgid "Download"
 msgstr "Atsisiųsti"
 
-#: log_flags.cpp:269
-#: log_flags.cpp:449
+#: log_flags.cpp:269 log_flags.cpp:449
 msgid "Unexpected text in cc_config.xml"
 msgstr "Netikėtas tekstas faile cc_config.xml"
 
-#: log_flags.cpp:423
-#: log_flags.cpp:475
+#: log_flags.cpp:423 log_flags.cpp:475
 msgid "Unrecognized tag in cc_config.xml"
 msgstr "Neatpažinta žymė cc_config.xml faile"
 
@@ -92,7 +92,9 @@ msgid "Invalid code signing key.  To fix, remove and add this project."
 msgstr "Neteisingas programų atpažinimo raktas. Problemai išspręsti, pašalinkite ir vėl pridėkite projektą."
 
 #: ../sched/handle_request.cpp:859
-msgid "The project has changed its security key.  Please remove and add this project."
+msgid ""
+"The project has changed its security key.  Please remove and add this "
+"project."
 msgstr "Projektas pakeitė saugumo raktą. Pašalinkite ir vėl pridėkite projektą."
 
 #: ../sched/handle_request.cpp:943
@@ -104,7 +106,8 @@ msgid "This project doesn't support CPU type"
 msgstr "Šis projektas nepalaiko procesoriaus tipo"
 
 #: ../sched/handle_request.cpp:993
-msgid "Your BOINC client software is too old.  Please install the current version."
+msgid ""
+"Your BOINC client software is too old.  Please install the current version."
 msgstr "Jūsų BOINC programinė įranga per sena. Įdiekite naują versiją."
 
 #: ../sched/handle_request.cpp:1259
@@ -112,18 +115,21 @@ msgid "This project doesn't support computers of type"
 msgstr "Šis projektas nepalaiko kompiuterių tipo"
 
 #: ../sched/sched_send.cpp:1092
-msgid "Upgrade to the latest driver to process tasks using your computer's GPU"
+msgid ""
+"Upgrade to the latest driver to process tasks using your computer's GPU"
 msgstr "Atnaujinkite tvarkykles, kad galėtumėte atlikti skaičiavimus grafikos procesoriumi"
 
 #: ../sched/sched_send.cpp:1099
-msgid "Upgrade to the latest driver to use all of this project's GPU applications"
+msgid ""
+"Upgrade to the latest driver to use all of this project's GPU applications"
 msgstr "Atnaujinkite tvarkykles, kad galėtumėte naudoti visas šio projekto grafikos procesoriaus programas"
 
 #: ../sched/sched_send.cpp:1118
-msgid "A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to the current version"
+msgid ""
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to"
+" the current version"
 msgstr "Naujesnė BOINC versija reikalinga NVIDIA vaizdo procesoriaus naudojimui; įdiekite naują versiją"
 
-# 94%
 #: ../sched/sched_send.cpp:1146
 #, c-format
 msgid "An %s GPU is required to run tasks for this project"
@@ -139,11 +145,12 @@ msgstr "Jūsų kompiuterio tipas nėra palaikomas šiame projekte"
 
 #: ../sched/sched_send.cpp:1294
 msgid "Newer BOINC version required; please install current version"
-msgstr "Reikalinga naujesnė BOINC versija; įdiekite naują versiją"
+msgstr "Reikalinga naujesnė BOINC versija; įdiekite naujausią versiją"
 
 #: ../sched/sched_send.cpp:1305
 #, c-format
-msgid "Tasks for %s are available, but your preferences are set to not accept them"
+msgid ""
+"Tasks for %s are available, but your preferences are set to not accept them"
 msgstr "Yra užduočių %s, bet jūsų nustatymai neleidžia jų priimti"
 
 #: ../sched/sched_types.cpp:254
@@ -153,40 +160,3 @@ msgstr "Nežinomas programos vardas byloje app_info.xml"
 #: ../sched/sched_version.cpp:214
 msgid "Your app_info.xml file doesn't have a usable version of"
 msgstr "Jūsų app_info.xml byla neturi tinkamos naudojimui versijos"
-
-#~ msgid "Download it."
-#~ msgstr "Parsisiųskite."
-#~ msgid "An NVIDIA or ATI GPU is required to run tasks for this project"
-#~ msgstr ""
-#~ "Reikalingas NVIDIA ar ATI vaizdo procesorius, kad būtų galima vykdyti šio "
-#~ "projekto užduotis"
-#~ msgid "An NVIDIA GPU is required to run tasks for this project"
-#~ msgstr ""
-#~ "Reikalingas NVIDIA vaizdo procesorius, kad būtų galima vykdyti šio projekto "
-#~ "užduotis"
-#~ msgid "An ATI GPU is required to run tasks for this project"
-#~ msgstr ""
-#~ "Reikalingas ATI vaizdo procesorius, kad būtų galima vykdyti šio projekto "
-#~ "užduotis"
-#~ msgid ""
-#~ "Tasks for NVIDIA GPU are available, but your preferences are set to not "
-#~ "accept them"
-#~ msgstr ""
-#~ "Užduotys NVIDIA grafikos procesoriui yra prieinamos, bet esate pasirinkęs jų "
-#~ "nepriimti"
-#~ msgid ""
-#~ "Tasks for ATI GPU are available, but your preferences are set to not accept "
-#~ "them"
-#~ msgstr ""
-#~ "Užduotys ATI grafikos procesoriui yra prieinamos, bet esate pasirinkęs jų "
-#~ "nepriimti"
-#~ msgid ""
-#~ "Tasks for CPU are available, but your preferences are set to not accept them"
-#~ msgstr "Užduotys procesoriui yra prieinamos, bet esate pasirinkęs jų nepriimti"
-#~ msgid "error"
-#~ msgstr "klaida"
-#~ msgid "Can't resolve hostname in remote_hosts.cfg"
-#~ msgstr "Nepavyko nustatyti mazgo vardo iš remote_hosts.cfg"
-#~ msgid "is not available for"
-#~ msgstr "nėra prieinama"
-
diff --git a/locale/lt/BOINC-Manager.mo b/locale/lt/BOINC-Manager.mo
index 32526dc..327060c 100644
Binary files a/locale/lt/BOINC-Manager.mo and b/locale/lt/BOINC-Manager.mo differ
diff --git a/locale/lt/BOINC-Manager.po b/locale/lt/BOINC-Manager.po
index a7cb319..f402d68 100755
--- a/locale/lt/BOINC-Manager.po
+++ b/locale/lt/BOINC-Manager.po
@@ -4,32 +4,36 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.x\n"
+"Project-Id-Version: BOINC Manager 4.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-15 14:15-0500\n"
-"PO-Revision-Date: 2015-02-11 17:49-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Development Team <boinc_loc at ssl.berkeley.edu>\n"
+"POT-Creation-Date: 2014-02-02 00:00-0800\n"
+"PO-Revision-Date: 2014-04-25 11:11+0000\n"
+"Last-Translator: Rytis Slatkevičius <rytis.s at gmail.com>\n"
+"Language-Team: BOINC Development Team <rwalton at ssl.berkeley.edu>\n"
 "Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
+"100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Pootle 2.5.0\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc_7.4\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1379674127.0\n"
 "X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-SearchPath-0: clientgui\n"
 "X-Poedit-SearchPath-1: clientgui/msw\n"
 "X-Poedit-SearchPath-2: clientgui/gtk\n"
 "X-Poedit-SearchPath-3: clientgui/mac\n"
+"X-Poedit-SearchPath-0: clientgui\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\n"
+"X-POOTLE-MTIME: 1398424289.0\n"
 
-#: clientgui/AccountInfoPage.cpp:387
+# 81%
+#: AccountInfoPage.cpp:387
 #, c-format
+#, fuzzy, c-format
 msgid "Identify your account at %s"
-msgstr ""
+msgstr "Nustatykite savo sąskaitą "
 
-#: clientgui/AccountInfoPage.cpp:393
+#: AccountInfoPage.cpp:393
 msgid ""
 "Please enter your account information\n"
 "(to create an account, visit the project's web site)"
@@ -37,7 +41,7 @@ msgstr ""
 "Įveskite vartotojo informaciją\n"
 "(norėdami prisiregistruoti, apsilankykite projekto tinklapyje)"
 
-#: clientgui/AccountInfoPage.cpp:397
+#: AccountInfoPage.cpp:397
 msgid ""
 "This project is not currently accepting new accounts.\n"
 "You can add it only if you already have an account."
@@ -45,19 +49,19 @@ msgstr ""
 "Šis projektas neleidžia registruotis naujiems dalyviams.\n"
 "Galite prisijungti tik jei jau esate užsiregistravęs."
 
-#: clientgui/AccountInfoPage.cpp:401
+#: AccountInfoPage.cpp:401
 msgid "Are you already running this project?"
 msgstr "Ar jau dalyvaujate šiame projekte?"
 
-#: clientgui/AccountInfoPage.cpp:405
+#: AccountInfoPage.cpp:405
 msgid "&No, new user"
 msgstr "&Ne, naujas dalyvis"
 
-#: clientgui/AccountInfoPage.cpp:408
+#: AccountInfoPage.cpp:408
 msgid "&Yes, existing user"
 msgstr "&Taip, esu dalyvis"
 
-#: clientgui/AccountInfoPage.cpp:413
+#: AccountInfoPage.cpp:413
 msgid ""
 "We were not able to set up your account information\n"
 "automatically.\n"
@@ -67,96 +71,93 @@ msgid ""
 "password fields."
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:416
+#: AccountInfoPage.cpp:416
 #, fuzzy
 msgid "Find login information"
 msgstr "Rasti prisijungimo informaciją"
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:649
+#: AccountInfoPage.cpp:436 AccountInfoPage.cpp:641
 msgid "&Password:"
 msgstr "Slaptažodis:"
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:673
+#: AccountInfoPage.cpp:443 AccountInfoPage.cpp:665
 msgid "Choose a &password:"
 msgstr "Pasirinkite slaptažodį:"
 
-#: clientgui/AccountInfoPage.cpp:446
+#: AccountInfoPage.cpp:446
 msgid "C&onfirm password:"
 msgstr "Pakartokite slaptažodį:"
 
-#: clientgui/AccountInfoPage.cpp:453
+#: AccountInfoPage.cpp:453
 #, c-format
 msgid "Are you already running %s?"
 msgstr "Ar jau dalyvaujate %s?"
 
-#: clientgui/AccountInfoPage.cpp:482
+#: AccountInfoPage.cpp:482
 msgid "&Username:"
 msgstr "&Vartotojo vardas:"
 
-#: clientgui/AccountInfoPage.cpp:511
-msgid "&Email address or LDAP ID:"
-msgstr ""
-
-#: clientgui/AccountInfoPage.cpp:515
+#: AccountInfoPage.cpp:508
 msgid "&Email address:"
 msgstr "El. pašto adresas:"
 
-#: clientgui/AccountInfoPage.cpp:523
+#: AccountInfoPage.cpp:515
 #, c-format
 msgid "minimum length %d"
 msgstr "minimalus ilgis %d"
 
-#: clientgui/AccountInfoPage.cpp:530
+#: AccountInfoPage.cpp:522
 msgid "Forgot your password?"
 msgstr "Pamiršote slaptažodį?"
 
-#: clientgui/AccountInfoPage.cpp:537
+#: AccountInfoPage.cpp:529
 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 ""
 
-#: clientgui/AccountInfoPage.cpp:540
+#: AccountInfoPage.cpp:532
+#, fuzzy
 msgid "Account manager web site"
-msgstr ""
+msgstr "Abonento valdiklio tinklapis"
 
-#: clientgui/AccountInfoPage.cpp:582
+#: AccountInfoPage.cpp:574 WelcomePage.cpp:348
 msgid "Add project"
 msgstr "Prisijungti prie projekto"
 
-#: clientgui/AccountInfoPage.cpp:584
+#: AccountInfoPage.cpp:576
 msgid "Update account manager"
 msgstr "Susisiekti su abonemento valdikliu"
 
-#: clientgui/AccountInfoPage.cpp:586
+#: AccountInfoPage.cpp:578 WelcomePage.cpp:307 WelcomePage.cpp:321
 msgid "Use account manager"
 msgstr "Naudoti abonemento valdiklį"
 
-#: clientgui/AccountInfoPage.cpp:593
+#: AccountInfoPage.cpp:585
 msgid "Please enter a user name."
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:595
+#: AccountInfoPage.cpp:587
+#, fuzzy
 msgid "Please enter an email address."
-msgstr ""
+msgstr "Įveskite elektroninio pašto adresą"
 
-#: clientgui/AccountInfoPage.cpp:605
+#: AccountInfoPage.cpp:597
 #, c-format
 msgid "Please enter a password of at least %d characters."
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:615
-msgid "The password and confirmation password do not match. Please type them again."
+#: AccountInfoPage.cpp:607
+msgid ""
+"The password and confirmation password do not match. Please type them again."
 msgstr "Nesutampa įvesti slaptažodžiai. Prašome juos įvesti dar kartą."
 
-#: clientgui/AccountManagerInfoPage.cpp:272
+#: AccountManagerInfoPage.cpp:272
 msgid "Choose an account manager"
 msgstr "Pasirinkite abonento valdiklį"
 
-#: clientgui/AccountManagerInfoPage.cpp:275
+#: AccountManagerInfoPage.cpp:275
 msgid ""
 "To choose an account manager, click its name or \n"
 "type its URL below."
@@ -164,397 +165,386 @@ msgstr ""
 "Kad pasirinktumėte abonento valdiklį, spragtelėkite jo vardą\n"
 "arba įveskite jo internetinį adresą žemiau."
 
-#: clientgui/AccountManagerInfoPage.cpp:279
+#: AccountManagerInfoPage.cpp:279
+#, fuzzy
 msgid "Account manager details:"
-msgstr ""
+msgstr "Abonento valdiklio tinklapis"
 
-#: clientgui/AccountManagerInfoPage.cpp:283
+#: AccountManagerInfoPage.cpp:283
+#, fuzzy
 msgid "Account manager &URL:"
-msgstr ""
+msgstr "Abonemento valdiklio tinklapio adresas:"
 
-#: clientgui/AccountManagerInfoPage.cpp:287
+#: AccountManagerInfoPage.cpp:287
 msgid "Open web page"
 msgstr ""
 
-#: clientgui/AccountManagerInfoPage.cpp:290
+#: AccountManagerInfoPage.cpp:290
 msgid "Visit this account manager's web site"
 msgstr ""
 
-#: clientgui/AccountManagerProcessingPage.cpp:186
-#: clientgui/AccountManagerPropertiesPage.cpp:192
+#: AccountManagerProcessingPage.cpp:187 AccountManagerPropertiesPage.cpp:193
 #, c-format
 msgid "Communicating with %s."
 msgstr "Jungiamasi prie %s."
 
-#: clientgui/AccountManagerProcessingPage.cpp:193
-#: clientgui/AccountManagerPropertiesPage.cpp:199
+#: AccountManagerProcessingPage.cpp:194 AccountManagerPropertiesPage.cpp:200
 msgid "Communicating with server."
 msgstr "Jungiamasi prie serverio."
 
-#: clientgui/AccountManagerProcessingPage.cpp:198
-#: clientgui/AccountManagerPropertiesPage.cpp:204
+#: AccountManagerProcessingPage.cpp:199 AccountManagerPropertiesPage.cpp:205
 msgid "Please wait..."
 msgstr "Prašome palaukti..."
 
-#: clientgui/AccountManagerProcessingPage.cpp:325
+#: AccountManagerProcessingPage.cpp:326
 msgid "An internal server error has occurred.\n"
 msgstr "Vidinė serverio klaida.\n"
 
-#: clientgui/AdvancedFrame.cpp:96
+#: AdvancedFrame.cpp:95
 msgid "Connected"
 msgstr "Prisijungta"
 
-#: clientgui/AdvancedFrame.cpp:104
+#: AdvancedFrame.cpp:103
 msgid "Disconnected"
 msgstr "Atsijungta"
 
-#: clientgui/AdvancedFrame.cpp:318
+#: AdvancedFrame.cpp:322 sg_BoincSimpleFrame.cpp:119
 #, c-format
 msgid "Close the %s window"
 msgstr "Uždaryti %s langą"
 
-#: clientgui/AdvancedFrame.cpp:321
+#: AdvancedFrame.cpp:325 sg_BoincSimpleFrame.cpp:122
 msgid "&Close Window"
 msgstr "&Uždaryti langą"
 
-#: clientgui/AdvancedFrame.cpp:332
-#: clientgui/AdvancedFrame.cpp:339
-#: clientgui/AdvancedFrame.cpp:346
+#: AdvancedFrame.cpp:336 AdvancedFrame.cpp:343 AdvancedFrame.cpp:350
 #, c-format
 msgid "Exit %s"
 msgstr "Išeiti iš %s"
 
-#: clientgui/AdvancedFrame.cpp:359
-msgid "Preferences..."
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:368
+#: AdvancedFrame.cpp:371
 msgid "&Notices\tCtrl+Shift+N"
 msgstr "Pra&nešimai\t Ctrl+Shift+N"
 
-#: clientgui/AdvancedFrame.cpp:369
+#: AdvancedFrame.cpp:372
 msgid "Display notices"
 msgstr "Rodyti pranešimus"
 
-#: clientgui/AdvancedFrame.cpp:374
+#: AdvancedFrame.cpp:377
 msgid "&Projects\tCtrl+Shift+P"
 msgstr "&Projektai\tCtrl+Shift+P"
 
-#: clientgui/AdvancedFrame.cpp:375
+#: AdvancedFrame.cpp:378
 msgid "Display projects"
 msgstr "Rodyti projektus"
 
-#: clientgui/AdvancedFrame.cpp:380
+#: AdvancedFrame.cpp:383
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr "Užduo&tys\tCtrl+Shift+T"
 
-#: clientgui/AdvancedFrame.cpp:381
+#: AdvancedFrame.cpp:384
 msgid "Display tasks"
 msgstr "Rodyti užduotis"
 
-#: clientgui/AdvancedFrame.cpp:386
+#: AdvancedFrame.cpp:389
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr "P&erdavimai\tCtrl+Shift+X"
 
-#: clientgui/AdvancedFrame.cpp:387
+#: AdvancedFrame.cpp:390
 msgid "Display transfers"
 msgstr "Rodyti perdavimus"
 
-#: clientgui/AdvancedFrame.cpp:392
+#: AdvancedFrame.cpp:395
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "&Statistika\tCtrl+Shift+S"
 
-#: clientgui/AdvancedFrame.cpp:393
+#: AdvancedFrame.cpp:396
 msgid "Display statistics"
 msgstr "Rodyti statistiką"
 
-#: clientgui/AdvancedFrame.cpp:398
+#: AdvancedFrame.cpp:401
 msgid "&Disk usage\tCtrl+Shift+D"
 msgstr "&Disko naudojimas\t Ctrl+Shift+D"
 
-#: clientgui/AdvancedFrame.cpp:399
+#: AdvancedFrame.cpp:402
 msgid "Display disk usage"
 msgstr "Rodyti disko naudojimą"
 
-#: clientgui/AdvancedFrame.cpp:406
+#: AdvancedFrame.cpp:409
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr "S&upaprastintas režimas...\tCTRL+SHIFT+V"
 
-#: clientgui/AdvancedFrame.cpp:407
+#: AdvancedFrame.cpp:410
 msgid "Display the simple graphical interface."
 msgstr "Rodyti supaprastintą vartotojo sąsają."
 
-#: clientgui/AdvancedFrame.cpp:421
+#: AdvancedFrame.cpp:424
 msgid "&Add project or account manager..."
 msgstr "&Prisijungti prie projekto ar paskyros valdytojo..."
 
-#: clientgui/AdvancedFrame.cpp:422
+#: AdvancedFrame.cpp:425 sg_ProjectPanel.cpp:76
 msgid "Volunteer for any or all of 30+ projects in many areas of science"
-msgstr "Būkite savanoriu viename ar keliuose iš daugiau kaip 30 projektų įvairiose mokslo srityse"
+msgstr ""
+"Būkite savanoriu viename ar keliuose iš daugiau kaip 30 projektų įvairiose "
+"mokslo srityse"
 
-#: clientgui/AdvancedFrame.cpp:426
+#: AdvancedFrame.cpp:429
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "&Sinchronizuoti su %s"
 
-#: clientgui/AdvancedFrame.cpp:430
+#: AdvancedFrame.cpp:433
 #, c-format
 msgid "Get current settings from %s"
 msgstr "Gauti dabartinius nustatymus iš %s"
 
-#: clientgui/AdvancedFrame.cpp:440
+#: AdvancedFrame.cpp:443
 msgid "&Add project..."
 msgstr "&Prisijungti prie projekto..."
 
-#: clientgui/AdvancedFrame.cpp:441
+#: AdvancedFrame.cpp:444
 msgid "Add a project"
 msgstr "Prisijungti prie projekto"
 
-#: clientgui/AdvancedFrame.cpp:444
+#: AdvancedFrame.cpp:447
 #, c-format
 msgid "S&top using %s..."
 msgstr "Nus&toti naudoti %s..."
 
-#: clientgui/AdvancedFrame.cpp:450
+#: AdvancedFrame.cpp:453
 msgid "Remove this computer from account manager control."
 msgstr "Nebenaudoti abonemento valdiklio šio kompiuterio valdymui."
 
-#: clientgui/AdvancedFrame.cpp:455
+#: AdvancedFrame.cpp:458 sg_BoincSimpleFrame.cpp:178
 msgid "&Options..."
 msgstr "&Nustatymai..."
 
-#: clientgui/AdvancedFrame.cpp:456
+#: AdvancedFrame.cpp:459 sg_BoincSimpleFrame.cpp:179
 msgid "Configure display options and proxy settings"
 msgstr "Vartotojo sąsajos ir įgaliotojo serverio nustatymai"
 
-#: clientgui/AdvancedFrame.cpp:460
+#: AdvancedFrame.cpp:463 sg_BoincSimpleFrame.cpp:172
 msgid "Computing &preferences..."
 msgstr "Skaičiavimų nustatymai..."
 
-#: clientgui/AdvancedFrame.cpp:461
+#: AdvancedFrame.cpp:464 sg_BoincSimpleFrame.cpp:173
 msgid "Configure computing preferences"
 msgstr "Pakeisti skaičiavimų nustatymus"
 
-#: clientgui/AdvancedFrame.cpp:469
+#: AdvancedFrame.cpp:472
 msgid "&Run always"
 msgstr "Veikti visada"
 
-#: clientgui/AdvancedFrame.cpp:470
+#: AdvancedFrame.cpp:473
 msgid "Allow work regardless of preferences"
 msgstr "Darbas vykdomas nepaisant nustatymų"
 
-#: clientgui/AdvancedFrame.cpp:474
+#: AdvancedFrame.cpp:477
 msgid "Run based on &preferences"
 msgstr "Veikti pagal nustatymus"
 
-#: clientgui/AdvancedFrame.cpp:475
+#: AdvancedFrame.cpp:478
 msgid "Allow work according to preferences"
 msgstr "Leisti veikti pagal nustatymus"
 
-#: clientgui/AdvancedFrame.cpp:479
+#: AdvancedFrame.cpp:482
 msgid "&Suspend"
 msgstr "&Sustabdyti"
 
-#: clientgui/AdvancedFrame.cpp:480
+#: AdvancedFrame.cpp:483
 msgid "Stop work regardless of preferences"
 msgstr "Darbas sustabdomas nepaisant nustatymų"
 
-#: clientgui/AdvancedFrame.cpp:505
+#: AdvancedFrame.cpp:508
 msgid "Use GPU always"
 msgstr "Visada naudoti grafikos procesorių"
 
-#: clientgui/AdvancedFrame.cpp:506
+#: AdvancedFrame.cpp:509
 msgid "Allow GPU work regardless of preferences"
 msgstr "Leisti GPU darbą nepaisant nustatymų"
 
-#: clientgui/AdvancedFrame.cpp:510
+#: AdvancedFrame.cpp:513
 msgid "Use GPU based on preferences"
 msgstr "Naudoti GPU pagal nustatymus"
 
-#: clientgui/AdvancedFrame.cpp:511
+#: AdvancedFrame.cpp:514
 msgid "Allow GPU work according to preferences"
 msgstr "Leisti GPU darbą pagal nustatymus"
 
-#: clientgui/AdvancedFrame.cpp:515
+#: AdvancedFrame.cpp:518
 msgid "Suspend GPU"
 msgstr "Sustabdyti GPU"
 
-#: clientgui/AdvancedFrame.cpp:516
+#: AdvancedFrame.cpp:519
 msgid "Stop GPU work regardless of preferences"
 msgstr "Sustabdyti GPU darbą nepaisant nustatymų"
 
-#: clientgui/AdvancedFrame.cpp:540
+#: AdvancedFrame.cpp:543
 msgid "Network activity always available"
 msgstr "Veiksmai tinkle leidžiami bet kada"
 
-#: clientgui/AdvancedFrame.cpp:541
+#: AdvancedFrame.cpp:544
 msgid "Allow network activity regardless of preferences"
 msgstr "Veiksmai tinkle galimi nepaisant nustatymų"
 
-#: clientgui/AdvancedFrame.cpp:545
+#: AdvancedFrame.cpp:548
 msgid "Network activity based on preferences"
 msgstr "Veiksmai tinkle pagal nustatymus"
 
-#: clientgui/AdvancedFrame.cpp:546
+#: AdvancedFrame.cpp:549
 msgid "Allow network activity according to preferences"
 msgstr "Leisti veiksmus tinkle pagal nustatymus"
 
-#: clientgui/AdvancedFrame.cpp:550
+#: AdvancedFrame.cpp:553
 msgid "Network activity suspended"
 msgstr "Veiksmai tinkle sustabdyti"
 
-#: clientgui/AdvancedFrame.cpp:551
+#: AdvancedFrame.cpp:554
 msgid "Stop BOINC network activity"
 msgstr "Veiksmai tinkle negalimi"
 
-#: clientgui/AdvancedFrame.cpp:561
+#: AdvancedFrame.cpp:564
 #, c-format
 msgid "Connect to another computer running %s"
 msgstr "Prisijungti prie kito kompiuterio, kuriame veikia %s"
 
-#: clientgui/AdvancedFrame.cpp:566
+#: AdvancedFrame.cpp:569
 msgid "Select computer..."
 msgstr "Pasirinkti kompiuterį..."
 
-#: clientgui/AdvancedFrame.cpp:571
+#: AdvancedFrame.cpp:574
 msgid "Shut down connected client..."
 msgstr "Išjungti prisijungusį klientą..."
 
-#: clientgui/AdvancedFrame.cpp:572
+#: AdvancedFrame.cpp:575
 msgid "Shut down the currently connected client"
 msgstr "Išjungti šiuo metu prisijungusį pagrindinį klientą"
 
-#: clientgui/AdvancedFrame.cpp:576
+#: AdvancedFrame.cpp:579
 msgid "Run CPU &benchmarks"
 msgstr "Matuoti sistemos greitį"
 
-#: clientgui/AdvancedFrame.cpp:577
+#: AdvancedFrame.cpp:580
 msgid "Runs BOINC CPU benchmarks"
 msgstr "Matuoja sistemos procesoraus darbo našumą"
 
-#: clientgui/AdvancedFrame.cpp:581
+#: AdvancedFrame.cpp:584
 msgid "Do network communication"
 msgstr "Atlikti susijungimus tinkle"
 
-#: clientgui/AdvancedFrame.cpp:582
+#: AdvancedFrame.cpp:585
 msgid "Do all pending network communication"
 msgstr "Atlikti visus laukiančius susijungimus tinkle"
 
 # 94%
-#: clientgui/AdvancedFrame.cpp:586
+#: AdvancedFrame.cpp:589
 #, fuzzy
 msgid "Read config files"
 msgstr "Nuskaityti nustatymų bylą"
 
-#: clientgui/AdvancedFrame.cpp:587
+#: AdvancedFrame.cpp:590
 msgid "Read configuration info from cc_config.xml and any app_config.xml files"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:591
+#: AdvancedFrame.cpp:594
 msgid "Read local prefs file"
 msgstr "Nuskaityti vietinių nustatymų bylą"
 
-#: clientgui/AdvancedFrame.cpp:592
+#: AdvancedFrame.cpp:595
 msgid "Read preferences from global_prefs_override.xml."
 msgstr "Nuskaityti nustatymus iš global_prefs_override.xml."
 
-#: clientgui/AdvancedFrame.cpp:597
+#: AdvancedFrame.cpp:600
 #, c-format
 msgid "Launch another instance of %s..."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:601
+#: AdvancedFrame.cpp:604
 #, c-format
 msgid "Launch another %s"
 msgstr "Vykdyti kitą %s"
 
-#: clientgui/AdvancedFrame.cpp:611
+#: AdvancedFrame.cpp:614
 msgid "Event Log...\tCtrl+Shift+E"
 msgstr "Įvykių žurnalas...\tCtrl+Shift+E"
 
-#: clientgui/AdvancedFrame.cpp:612
+#: AdvancedFrame.cpp:615
 msgid "Display diagnostic messages."
 msgstr "Rodyti diagnostikos žinutes."
 
-#: clientgui/AdvancedFrame.cpp:616
-msgid "Event Log Diagnostic Flags...\tCtrl+Shift+F"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:617
-msgid "Enable or disable various diagnostic messages"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:626
+#: AdvancedFrame.cpp:625 sg_BoincSimpleFrame.cpp:188
 #, c-format
 msgid "%s &help"
 msgstr "%s &pagalba"
 
-#: clientgui/AdvancedFrame.cpp:632
+#: AdvancedFrame.cpp:631 sg_BoincSimpleFrame.cpp:194
 #, c-format
 msgid "Show information about %s"
 msgstr "Rodyti informaciją apie %s"
 
-#: clientgui/AdvancedFrame.cpp:644
+#: AdvancedFrame.cpp:643
 #, c-format
 msgid "&%s help"
 msgstr "&%s pagalba"
 
-#: clientgui/AdvancedFrame.cpp:650
+#: AdvancedFrame.cpp:649 sg_BoincSimpleFrame.cpp:212
 #, c-format
 msgid "Show information about the %s"
 msgstr "Rodyti informaciją apie %s"
 
-#: clientgui/AdvancedFrame.cpp:662
+#: AdvancedFrame.cpp:661 sg_BoincSimpleFrame.cpp:224
 #, c-format
+#, c-format, fuzzy
 msgid "%s &web site"
-msgstr ""
+msgstr "%s &tinklapis"
 
-#: clientgui/AdvancedFrame.cpp:668
+#: AdvancedFrame.cpp:667 sg_BoincSimpleFrame.cpp:230
 #, c-format
 msgid "Show information about BOINC and %s"
 msgstr "Rodyti informaciją apie BOINC ir %s"
 
-#: clientgui/AdvancedFrame.cpp:680
-#: clientgui/BOINCTaskBar.cpp:544
+#: AdvancedFrame.cpp:679 BOINCTaskBar.cpp:530 sg_BoincSimpleFrame.cpp:242
 #, c-format
 msgid "&About %s..."
 msgstr "&Apie %s..."
 
-#: clientgui/AdvancedFrame.cpp:686
+#: AdvancedFrame.cpp:685 sg_BoincSimpleFrame.cpp:248
 msgid "Licensing and copyright information."
 msgstr "Licensijų ir autorinių teisių informacija."
 
-#: clientgui/AdvancedFrame.cpp:693
+#: AdvancedFrame.cpp:692 sg_BoincSimpleFrame.cpp:255
 msgid "&File"
 msgstr "&Byla"
 
-#: clientgui/AdvancedFrame.cpp:697
+#: AdvancedFrame.cpp:696 sg_BoincSimpleFrame.cpp:259
 msgid "&View"
 msgstr "&Peržiūra"
 
-#: clientgui/AdvancedFrame.cpp:701
+#: AdvancedFrame.cpp:700 sg_BoincSimpleFrame.cpp:263
 msgid "&Tools"
 msgstr "&Įrankiai"
 
-#: clientgui/AdvancedFrame.cpp:705
+#: AdvancedFrame.cpp:704
 msgid "&Activity"
 msgstr "&Veikimas"
 
-#: clientgui/AdvancedFrame.cpp:709
+#: AdvancedFrame.cpp:708
 msgid "A&dvanced"
 msgstr "&Papildomi"
 
-#: clientgui/AdvancedFrame.cpp:713
+#: AdvancedFrame.cpp:712 DlgEventLog.cpp:332 sg_BoincSimpleFrame.cpp:267
+#: wizardex.cpp:374 wizardex.cpp:381
 msgid "&Help"
 msgstr "&Pagalba"
 
-#: clientgui/AdvancedFrame.cpp:1185
+#: AdvancedFrame.cpp:1199
 #, c-format
 msgid "%s - Stop using %s"
 msgstr "%s - Sustabdyti %s"
 
-#: clientgui/AdvancedFrame.cpp:1190
+#: AdvancedFrame.cpp:1204
 #, c-format
+#, fuzzy, c-format
 msgid ""
 "If you stop using %s,\n"
 "you'll keep all your current projects,\n"
@@ -568,12 +558,12 @@ msgstr ""
 "\n"
 "Ar tikrai norite atsijungti nuo %s?"
 
-#: clientgui/AdvancedFrame.cpp:1397
+#: AdvancedFrame.cpp:1401
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s - Išjungti dabartinį klientą..."
 
-#: clientgui/AdvancedFrame.cpp:1406
+#: AdvancedFrame.cpp:1410
 #, c-format
 msgid ""
 "%s will shut down the current client\n"
@@ -582,36 +572,37 @@ msgstr ""
 "%s išjungs šiuo metu prisijungusį klientą\n"
 "ir pasiūlys prisijungti prie kito kompiuterio."
 
-#: clientgui/AdvancedFrame.cpp:1806
+#: AdvancedFrame.cpp:1745 DlgAbout.cpp:119
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: clientgui/AdvancedFrame.cpp:1815
+#: AdvancedFrame.cpp:1754
 #, c-format
+#, fuzzy, c-format
 msgid "%s has successfully added %s"
 msgstr "%s sėkmingai prisijungė prie %s"
 
-#: clientgui/AdvancedFrame.cpp:1953
+#: AdvancedFrame.cpp:1893
 #, c-format
 msgid "%s - (%s)"
 msgstr "%s - (%s)"
 
-#: clientgui/AdvancedFrame.cpp:1957
+#: AdvancedFrame.cpp:1897
 #, c-format
 msgid "Connecting to %s"
 msgstr "Jungiamasi prie %s"
 
-#: clientgui/AdvancedFrame.cpp:1960
+#: AdvancedFrame.cpp:1900
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "Prisijungta prie %s (%s)"
 
-#: clientgui/AlreadyExistsPage.cpp:184
+#: AlreadyExistsPage.cpp:184
 msgid "Username already in use"
 msgstr "Šis vartotojo vardas jau naudojamas"
 
-#: clientgui/AlreadyExistsPage.cpp:187
+#: AlreadyExistsPage.cpp:187
 msgid ""
 "An account with that username already exists and has a\n"
 "different password than the one you entered.\n"
@@ -624,11 +615,11 @@ msgstr ""
 "Prašome apsilankyti projekto tinklapyje ir veikti pagal ten\n"
 "nurodytas instrukcijas."
 
-#: clientgui/AlreadyExistsPage.cpp:191
+#: AlreadyExistsPage.cpp:191
 msgid "Email address already in use"
 msgstr "Šis el. pašto adresas jau yra naudojamas"
 
-#: clientgui/AlreadyExistsPage.cpp:194
+#: AlreadyExistsPage.cpp:194
 msgid ""
 "An account with that email address already exists and has a\n"
 "different password than the one you entered.\n"
@@ -641,64 +632,67 @@ msgstr ""
 "Prašome apsilankyti projekto tinklapyje ir veikti pagal ten\n"
 "nurodytas instrukcijas."
 
-#: clientgui/AsyncRPC.cpp:1031
+#: AsyncRPC.cpp:1031
 msgid "Communicating with BOINC client.  Please wait ..."
 msgstr "Jungiamasi prie BOINC kliento. Prašome palaukti..."
 
-#: clientgui/AsyncRPC.cpp:1034
+#: AsyncRPC.cpp:1034
 #, c-format
 msgid "&Quit %s"
 msgstr ""
 
-#: clientgui/AsyncRPC.cpp:1036
+#: AsyncRPC.cpp:1036
 #, c-format
 msgid "E&xit %s"
 msgstr "Išeiti iš %s"
 
-#: clientgui/AsyncRPC.cpp:1040
+#: AsyncRPC.cpp:1040
 #, c-format
 msgid "%s - Communication"
 msgstr ""
 
-#: clientgui/AsyncRPC.cpp:1056
+#: AsyncRPC.cpp:1056 DlgAdvPreferencesBase.cpp:107 sg_DlgPreferences.cpp:433
 msgid "Cancel"
 msgstr "Atšaukti"
 
-#: clientgui/BOINCBaseFrame.cpp:504
+#: BOINCBaseFrame.cpp:505
 #, c-format
 msgid "%s - Connection Error"
 msgstr "%s - ryšio klaida"
 
-#: clientgui/BOINCBaseFrame.cpp:513
+#: BOINCBaseFrame.cpp:514
 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 ""
 "Jums nėra leidžiama valdyti kliento.\n"
-"Susisiekite su savo administratoriumi, kad jis pridėtų jus į \"boinc_users\" vartotojų grupę."
+"Susisiekite su savo administratoriumi, kad jis pridėtų jus į \"boinc_users\" "
+"vartotojų grupę."
 
-#: clientgui/BOINCBaseFrame.cpp:522
+#: BOINCBaseFrame.cpp:523
 msgid ""
 "Authorization failed connecting to running client.\n"
 "Make sure you start this program in the same directory as the client."
 msgstr ""
 "Nepavyko prisijungti prie veikiančio kliento.\n"
-"Įsitikinkite, kad bandote paleisti šią programą tame pačiame kataloge, kaip ir klientas."
+"Įsitikinkite, kad bandote paleisti šią programą tame pačiame kataloge, kaip "
+"ir klientas."
 
-#: clientgui/BOINCBaseFrame.cpp:524
+#: BOINCBaseFrame.cpp:525
 msgid "Authorization failed connecting to running client."
 msgstr "Nepavyko prisijungti prie veikiančio kliento."
 
-#: clientgui/BOINCBaseFrame.cpp:532
+#: BOINCBaseFrame.cpp:533
 msgid "The password you have provided is incorrect, please try again."
 msgstr "Slaptažodis yra neteisingas, bandykite dar kartą."
 
-#: clientgui/BOINCBaseFrame.cpp:576
+#: BOINCBaseFrame.cpp:577
 #, c-format
 msgid "%s - Connection Failed"
 msgstr "%s - susijungimas nepavyko"
 
-#: clientgui/BOINCBaseFrame.cpp:585
+#: BOINCBaseFrame.cpp:586
 #, c-format
 msgid ""
 "%s is not able to connect to a %s client.\n"
@@ -707,64 +701,71 @@ msgstr ""
 "%s negali prisijungti prie %s kliento.\n"
 "Ar norite dar kartą bandyti prisijungti?"
 
-#: clientgui/BOINCBaseFrame.cpp:621
+#: BOINCBaseFrame.cpp:622
 #, c-format
 msgid "%s - Daemon Start Failed"
 msgstr ""
 
-#: clientgui/BOINCBaseFrame.cpp:631
+#: BOINCBaseFrame.cpp:632
 #, 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:637
+#: BOINCBaseFrame.cpp:638
 #, c-format
 msgid ""
 "%s is not able to start a %s client.\n"
 "Please start the daemon and try again."
 msgstr ""
 
-#: clientgui/BOINCBaseFrame.cpp:688
+#: BOINCBaseFrame.cpp:689
 #, c-format
 msgid "%s - Connection Status"
 msgstr "%s - susijungimo būklė"
 
-#: clientgui/BOINCBaseFrame.cpp:699
+#: BOINCBaseFrame.cpp:700
 #, 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 ""
 "%s šiuo metu nėra prisijungęs prie %s kliento.\n"
-"Prašome pasinaudoti \"Byla->Pasirinkti kompiuterį\" meniu punktu, jei norite prisijungti prie %s kliento.\n"
-"Norėdami prisijungti prie vietinio kompiuterio, kaip kompiuterio vardą įrašykite \"localhost\"."
+"Prašome pasinaudoti \"Byla->Pasirinkti kompiuterį\" meniu punktu, jei norite "
+"prisijungti prie %s kliento.\n"
+"Norėdami prisijungti prie vietinio kompiuterio, kaip kompiuterio vardą "
+"įrašykite \"localhost\"."
 
-#: clientgui/BOINCBaseView.cpp:752
+#: BOINCBaseView.cpp:779
 #, fuzzy
 msgid "Project web pages"
 msgstr "Prisijungta prie projekto"
 
-#: clientgui/BOINCClientManager.cpp:573
+#: BOINCClientManager.cpp:575
 #, c-format
 msgid "%s - Unexpected Exit"
 msgstr ""
 
-#: clientgui/BOINCClientManager.cpp:583
+#: BOINCClientManager.cpp:585
 #, c-format
+#, fuzzy, 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 ""
+"%s negali prisijungti prie %s kliento.\n"
+"Ar norite dar kartą bandyti prisijungti?"
 
-#: clientgui/BOINCDialupManager.cpp:61
+#: BOINCDialupManager.cpp:61
 #, c-format
 msgid "%s - Network Status"
 msgstr "%s - tinklo būsena"
 
-#: clientgui/BOINCDialupManager.cpp:241
+#: BOINCDialupManager.cpp:241
 #, c-format
 msgid ""
 "%s needs to connect to the Internet.\n"
@@ -773,22 +774,22 @@ msgstr ""
 "%s reikia prisijungti prie interneto.\n"
 "Ar galima tai daryti dabar?"
 
-#: clientgui/BOINCDialupManager.cpp:254
+#: BOINCDialupManager.cpp:254
 #, c-format
 msgid "%s is connecting to the Internet."
 msgstr "%s jungiasi prie interneto."
 
-#: clientgui/BOINCDialupManager.cpp:303
+#: BOINCDialupManager.cpp:303
 #, c-format
 msgid "%s has successfully connected to the Internet."
 msgstr "%s sėkmingai prisijungė prie interneto."
 
-#: clientgui/BOINCDialupManager.cpp:331
+#: BOINCDialupManager.cpp:331
 #, c-format
 msgid "%s failed to connect to the Internet."
 msgstr "%s negali prisijungti prie interneto."
 
-#: clientgui/BOINCDialupManager.cpp:372
+#: BOINCDialupManager.cpp:372
 #, c-format
 msgid ""
 "%s has detected it is now connected to the Internet.\n"
@@ -797,18 +798,19 @@ msgstr ""
 "%s aptiko prisijungimą prie interneto.\n"
 "Atnaujinami projektai ir duomenų siuntimas."
 
-#: clientgui/BOINCDialupManager.cpp:417
+#: BOINCDialupManager.cpp:417
 #, c-format
 msgid "%s has successfully disconnected from the Internet."
 msgstr "%s sėkmingai atsijungė nuo interneto."
 
-#: clientgui/BOINCDialupManager.cpp:433
+#: BOINCDialupManager.cpp:433
 #, c-format
 msgid "%s failed to disconnected from the Internet."
 msgstr "%s nepavyko atsijungti nuo interneto."
 
-#: clientgui/BOINCGUIApp.cpp:595
+#: BOINCGUIApp.cpp:339
 #, c-format
+#, fuzzy, c-format
 msgid ""
 "You currently are not authorized to manage the client.\n"
 "\n"
@@ -819,23 +821,27 @@ msgid ""
 "  - contact your administrator to add you to the 'boinc_master'\n"
 "     user group."
 msgstr ""
+"Jums nėra leidžiama valdyti kliento.\n"
+"Susisiekite su savo administratoriumi, kad jis pridėtų jus į \"boinc_users\" "
+"vartotojų grupę."
 
-#: clientgui/BOINCGUIApp.cpp:601
+#: BOINCGUIApp.cpp:345
 #, c-format
 msgid ""
 "%s ownership or permissions are not set properly; please reinstall %s.\n"
 "(Error code %d"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:607
+#: BOINCGUIApp.cpp:351
 msgid " at "
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:610
+#: BOINCGUIApp.cpp:354 MainDocument.cpp:2484 MainDocument.cpp:2534
+#: MainDocument.cpp:2554 ViewTransfers.cpp:803
 msgid ")"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:640
+#: BOINCGUIApp.cpp:384
 msgid ""
 "A reboot is required in order for BOINC to run properly.\n"
 "Please reboot your computer and try again."
@@ -843,191 +849,189 @@ msgstr ""
 "Kad BOINC veiktų teisingai, būtina perkrauti sistemą.\n"
 "Perkraukite kompiuterį ir pamėginkite dar kartą."
 
-#: clientgui/BOINCGUIApp.cpp:641
+#: BOINCGUIApp.cpp:385 DlgAbout.cpp:153
 msgid "BOINC Manager"
 msgstr "BOINC valdiklis"
 
-#: clientgui/BOINCGUIApp.cpp:902
+#: BOINCGUIApp.cpp:572
 msgid "BOINC Manager was started by the operating system automatically"
 msgstr "BOINC valdiklis buvo automatiškai paleistas operacinės sistemos"
 
-#: clientgui/BOINCGUIApp.cpp:904
+#: BOINCGUIApp.cpp:574
 msgid "Startup BOINC so only the system tray icon is visible"
 msgstr "Paleisti BOINC tik su matoma piktograma sistemos dėkle"
 
-#: clientgui/BOINCGUIApp.cpp:906
+#: BOINCGUIApp.cpp:576
 msgid "Directory containing the BOINC Client executable"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:907
+#: BOINCGUIApp.cpp:577
 msgid "BOINC data directory"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:909
+#: BOINCGUIApp.cpp:579
 msgid "Host name or IP address"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:910
+#: BOINCGUIApp.cpp:580
 msgid "GUI RPC port number"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:911
+#: BOINCGUIApp.cpp:581
 #, fuzzy
 msgid "Password"
 msgstr "Slaptažodis:"
 
-#: clientgui/BOINCGUIApp.cpp:912
+#: BOINCGUIApp.cpp:582
 msgid "Startup BOINC with these optional arguments"
 msgstr "Paleisti BOINC su šiais parametrais"
 
-#: clientgui/BOINCGUIApp.cpp:913
+#: BOINCGUIApp.cpp:583
 msgid "disable BOINC security users and permissions"
 msgstr "atjungti BOINC saugumo vartotojus ir įgaliojimus"
 
-#: clientgui/BOINCGUIApp.cpp:914
+#: BOINCGUIApp.cpp:584
 msgid "set skin debugging mode to enable skin manager error messages"
-msgstr "įjungti apvalkalų derinimo režimą, kad būtų įjungti apvalkalų valdiklio klaidų pranešimai"
+msgstr ""
+"įjungti apvalkalų derinimo režimą, kad būtų įjungti apvalkalų valdiklio "
+"klaidų pranešimai"
 
-#: clientgui/BOINCGUIApp.cpp:915
+#: BOINCGUIApp.cpp:585
 msgid "multiple instances of BOINC Manager allowed"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:917
+#: BOINCGUIApp.cpp:587
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:1164
+#: BOINCGUIApp.cpp:814
 msgid "(Automatic Detection)"
 msgstr "(Automatinis aptikimas)"
 
-#: clientgui/BOINCGUIApp.cpp:1165
+#: BOINCGUIApp.cpp:815
 msgid "(Unknown)"
 msgstr "(Nežinoma)"
 
-#: clientgui/BOINCGUIApp.cpp:1166
+#: BOINCGUIApp.cpp:816
 msgid "(User Defined)"
 msgstr "(Vartotojo nustatyta)"
 
-#: clientgui/BOINCTaskBar.cpp:522
+#: BOINCTaskBar.cpp:508
 #, c-format
 msgid "Open %s Web..."
 msgstr "Atidaryti %s tinklapį..."
 
-#: clientgui/BOINCTaskBar.cpp:529
+#: BOINCTaskBar.cpp:515
 #, c-format
 msgid "Open %s..."
 msgstr "Atidaryti %s..."
 
-#: clientgui/BOINCTaskBar.cpp:536
-#: clientgui/BOINCTaskBar.cpp:633
-#: clientgui/BOINCTaskBar.cpp:641
+#: BOINCTaskBar.cpp:522 BOINCTaskBar.cpp:619 BOINCTaskBar.cpp:627
 msgid "Snooze"
 msgstr "Laikinai sustabdyti"
 
-#: clientgui/BOINCTaskBar.cpp:538
-#: clientgui/BOINCTaskBar.cpp:660
-#: clientgui/BOINCTaskBar.cpp:668
+#: BOINCTaskBar.cpp:524 BOINCTaskBar.cpp:646 BOINCTaskBar.cpp:654
 msgid "Snooze GPU"
 msgstr ""
 
-#: clientgui/BOINCTaskBar.cpp:556
+#: BOINCTaskBar.cpp:542
 msgid "E&xit"
 msgstr "Išeiti"
 
-#: clientgui/BOINCTaskBar.cpp:626
+#: BOINCTaskBar.cpp:612 ViewProjects.cpp:718 ViewWork.cpp:795
+#: sg_BoincSimpleFrame.cpp:758 sg_ProjectCommandPopup.cpp:110
+#: sg_TaskCommandPopup.cpp:102
 msgid "Resume"
 msgstr "Tęsti"
 
-#: clientgui/BOINCTaskBar.cpp:653
+#: BOINCTaskBar.cpp:639
 #, fuzzy
 msgid "Resume GPU"
 msgstr "Tęsti"
 
-#: clientgui/BOINCTaskBar.cpp:727
+#: BOINCTaskBar.cpp:713
 msgid "Computing is enabled"
 msgstr "Skaičiavimai leidžiami"
 
-#: clientgui/BOINCTaskBar.cpp:731
+#: BOINCTaskBar.cpp:717
 msgid "Computing is suspended - "
 msgstr "Skaičiavimai sustabdyti - "
 
-#: clientgui/BOINCTaskBar.cpp:741
+#: BOINCTaskBar.cpp:727
 msgid "GPU computing is enabled"
 msgstr "Skaičiavimai vaizdo procesoriumi leidžiami"
 
-#: clientgui/BOINCTaskBar.cpp:744
+#: BOINCTaskBar.cpp:730
 msgid "GPU computing is suspended - "
 msgstr "Skaičiavimai vaizdo procesoriumi sustabdyti - "
 
-#: clientgui/BOINCTaskBar.cpp:753
+#: BOINCTaskBar.cpp:739
 msgid "Network is enabled"
 msgstr "Tinklo naudojimas leidžiamas"
 
-#: clientgui/BOINCTaskBar.cpp:756
+#: BOINCTaskBar.cpp:742
 msgid "Network is suspended - "
 msgstr "Tinklo naudojimas sustabdytas - "
 
-#: clientgui/BOINCTaskBar.cpp:764
+#: BOINCTaskBar.cpp:750
 msgid "Reconnecting to client."
 msgstr "Iš naujo prisijungiama prie kliento."
 
-#: clientgui/BOINCTaskBar.cpp:766
+#: BOINCTaskBar.cpp:752
 msgid "Not connected to a client."
 msgstr "Neprisijungta prie kliento."
 
-#: clientgui/BOINCTaskBar.cpp:819
+#: BOINCTaskBar.cpp:805
 #, c-format
 msgid "%s Notices"
 msgstr ""
 
-#: clientgui/BOINCTaskBar.cpp:825
+#: BOINCTaskBar.cpp:811
 msgid "There are new notices - click to view."
 msgstr ""
 
-#: clientgui/CompletionErrorPage.cpp:199
+#: CompletionErrorPage.cpp:199
 msgid "Failed to add project"
 msgstr ""
 
-#: clientgui/CompletionErrorPage.cpp:204
+#: CompletionErrorPage.cpp:204
 msgid "Failed to update account manager"
 msgstr "Nepavyko atnaujinti abonemento valdiklio"
 
-#: clientgui/CompletionErrorPage.cpp:208
+#: CompletionErrorPage.cpp:208
 msgid "Failed to remove account manager"
 msgstr "Nepavyko atsijungti nuo abonemento valdiklio"
 
-#: clientgui/CompletionErrorPage.cpp:212
+#: CompletionErrorPage.cpp:212
 #, fuzzy
 msgid "Failed to add account manager"
 msgstr "Nepavyko atnaujinti abonemento valdiklio"
 
-#: clientgui/CompletionErrorPage.cpp:221
+#: CompletionErrorPage.cpp:221
 msgid ""
 "Please try again later.\n"
 "\n"
 "Click Finish to close."
 msgstr ""
 
-#: clientgui/CompletionErrorPage.cpp:225
-#: clientgui/CompletionPage.cpp:222
-#: clientgui/CompletionPage.cpp:242
-#: clientgui/CompletionPage.cpp:273
+#: CompletionErrorPage.cpp:225 CompletionPage.cpp:222 CompletionPage.cpp:242
+#: CompletionPage.cpp:273
 msgid "Click Finish to close."
 msgstr "Norėdami uždaryti spauskite \"Baigti\"."
 
-#: clientgui/CompletionErrorPage.cpp:234
+#: CompletionErrorPage.cpp:234
 msgid "Messages from server:"
 msgstr "Pranešimai iš serverio:"
 
-#: clientgui/CompletionPage.cpp:207
+#: CompletionPage.cpp:207
 msgid "Project added"
 msgstr "Prisijungta prie projekto"
 
-#: clientgui/CompletionPage.cpp:213
+#: CompletionPage.cpp:213
 msgid "This project has been successfully added."
 msgstr ""
 
-#: clientgui/CompletionPage.cpp:218
+#: 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."
@@ -1035,139 +1039,138 @@ msgstr ""
 "Kai paspausite \"Baigti\", interneto naršyklė atvers tinklapį, kuriame\n"
 "galėsite nustatyti abonemento pavadinimą ir nustatymus."
 
-#: clientgui/CompletionPage.cpp:232
+#: CompletionPage.cpp:232
 #, c-format
 msgid "Update from %s completed."
 msgstr "Atnaujinimas iš %s baigas."
 
-#: clientgui/CompletionPage.cpp:236
+#: CompletionPage.cpp:236
 msgid "Update completed."
 msgstr "Atnaujinimas baigtas."
 
-#: clientgui/CompletionPage.cpp:247
+#: CompletionPage.cpp:247
 msgid "Now using account manager"
 msgstr ""
 
-#: clientgui/CompletionPage.cpp:252
+#: CompletionPage.cpp:252
 #, c-format
 msgid "Welcome to %s!"
 msgstr "Prisijungta prie %s!"
 
-#: clientgui/CompletionPage.cpp:263
+#: CompletionPage.cpp:263
 #, c-format
 msgid "You are now using %s to manage accounts."
 msgstr ""
 
-#: clientgui/CompletionPage.cpp:267
+#: CompletionPage.cpp:267
 msgid "You are now using this account manager."
 msgstr ""
 
-#: clientgui/DlgAbout.cpp:113
+#: DlgAbout.cpp:113 mac/Mac_GUI.cpp:96
 #, c-format
 msgid "About %s"
 msgstr "Apie %s"
 
-#: clientgui/DlgAbout.cpp:172
+#: DlgAbout.cpp:172
 msgid "Version:"
 msgstr "Versija:"
 
-#: clientgui/DlgAbout.cpp:180
+#: DlgAbout.cpp:180
 msgid "wxWidgets Version:"
 msgstr "wxWidgets versija:"
 
-#: clientgui/DlgAbout.cpp:188
+#: DlgAbout.cpp:188
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: clientgui/DlgAbout.cpp:192
+# 98%
+#: DlgAbout.cpp:192
+#, fuzzy
 msgid ""
-"(C) 2003-2014 University of California, Berkeley.\n"
+"(C) 2003-2013 University of California, Berkeley.\n"
 "All Rights Reserved."
 msgstr ""
+"(C) 2003-2010 University of California, Berkeley.\n"
+"Visos teisės saugomos."
 
-#: clientgui/DlgAbout.cpp:196
+#: DlgAbout.cpp:196
 msgid "Berkeley Open Infrastructure for Network Computing"
 msgstr "Berkeley Open Infrastructure for Network Computing"
 
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:399
-#: clientgui/DlgSelectComputer.cpp:163
+#: DlgAbout.cpp:208 DlgExitMessage.cpp:173 DlgGenericMessage.cpp:120
+#: DlgOptions.cpp:396 DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "&Gerai"
 
-#: clientgui/DlgAdvPreferences.cpp:602
+#: DlgAdvPreferences.cpp:544
 msgid "invalid number"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:603
+#: DlgAdvPreferences.cpp:545
 msgid "invalid time, format is HH:MM"
 msgstr "neteisingas laikas, formatas yra VV:MM"
 
-#: clientgui/DlgAdvPreferences.cpp:604
+#: DlgAdvPreferences.cpp:546
 msgid "invalid time interval, format is HH:MM-HH:MM"
 msgstr "neteisingas laiko intervalas, formatas yra VV:MM-VV:MM"
 
-#: clientgui/DlgAdvPreferences.cpp:817
+#: DlgAdvPreferences.cpp:751
 msgid "invalid input value detected"
 msgstr "įvesta negalima reikšmė"
 
-#: clientgui/DlgAdvPreferences.cpp:819
+#: DlgAdvPreferences.cpp:753
 msgid "Validation Error"
 msgstr "Patikrinimo klaida"
 
-#: clientgui/DlgAdvPreferences.cpp:969
-#: clientgui/DlgAdvPreferences.cpp:975
-#: clientgui/DlgAdvPreferences.cpp:981
+#: DlgAdvPreferences.cpp:885 DlgAdvPreferences.cpp:891
+#: DlgAdvPreferences.cpp:897
 msgid "Applications to add"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:998
+#: DlgAdvPreferences.cpp:914
 #, c-format
 msgid "'%s' is not an executable application."
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:999
-#: clientgui/DlgAdvPreferences.cpp:1046
-#: clientgui/DlgAdvPreferences.cpp:1070
+#: DlgAdvPreferences.cpp:915 DlgAdvPreferences.cpp:962
+#: DlgAdvPreferences.cpp:986
 msgid "Add Exclusive App"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Name of application to add?"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Add exclusive app"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1045
+#: DlgAdvPreferences.cpp:961
 #, c-format
 msgid "Application names must end with '%s'"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1069
+#: DlgAdvPreferences.cpp:985
 #, c-format
 msgid "'%s' is already in the list."
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1161
+#: DlgAdvPreferences.cpp:1077
 msgid ""
 "Do you really want to clear all local preferences?\n"
 "(This will not affect exclusive applications.)"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1162
+#: DlgAdvPreferences.cpp:1078 sg_DlgPreferences.cpp:1030
 msgid "Confirmation"
 msgstr "Patvirtinimas"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:49
+#: DlgAdvPreferencesBase.cpp:46 sg_DlgPreferences.cpp:946
 #, c-format
-msgid "%s - Computing preferences"
-msgstr ""
+msgid "%s - Preferences"
+msgstr "%s - nustatymai"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:66
+#: DlgAdvPreferencesBase.cpp:62
 #, fuzzy
 msgid ""
 "This dialog controls preferences for this computer only.\n"
@@ -1176,495 +1179,470 @@ msgid ""
 msgstr ""
 "Šiame lange nustatymai keičiami tik šiam kompiuteriui.\n"
 "Spauskite OK, kad įrašytumėte nustatymus.\n"
-"Spauskite Pašalinti, kad vėl pradėtumėte naudoti internete pasirinktus nustatymus."
+"Spauskite Pašalinti, kad vėl pradėtumėte naudoti internete pasirinktus "
+"nustatymus."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:69
+#: DlgAdvPreferencesBase.cpp:65 sg_DlgPreferences.cpp:428
 msgid "Clear"
 msgstr "Pašalinti"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:70
+#: DlgAdvPreferencesBase.cpp:66
 msgid "clear all local preferences and close the dialog"
 msgstr "išvalyti vietinius nustatymus ir uždaryti šį langą"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:85
+#: DlgAdvPreferencesBase.cpp:81
 msgid "processor usage"
 msgstr "procesoriaus naudojimas"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:88
+#: DlgAdvPreferencesBase.cpp:84
 msgid "network usage"
 msgstr "tinklo naudojimas"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:91
+#: DlgAdvPreferencesBase.cpp:87
 msgid "disk and memory usage"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:94
+#: DlgAdvPreferencesBase.cpp:90
 msgid "exclusive applications"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:107
-#: clientgui/DlgDiagnosticLogFlags.cpp:104
+#: DlgAdvPreferencesBase.cpp:102 sg_DlgPreferences.cpp:424
 msgid "OK"
 msgstr "Gerai"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:108
+#: DlgAdvPreferencesBase.cpp:103
 msgid "save all values and close the dialog"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:114
+#: DlgAdvPreferencesBase.cpp:108
 msgid "close the dialog without saving"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:118
-#: clientgui/Localization.cpp:35
-#: clientgui/Localization.cpp:121
-#: clientgui/Localization.cpp:139
+#: DlgAdvPreferencesBase.cpp:112 Localization.cpp:35 Localization.cpp:121
+#: Localization.cpp:139 sg_BoincSimpleFrame.cpp:794 sg_DlgPreferences.cpp:439
 msgid "Help"
 msgstr "Pagalba"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
+#: DlgAdvPreferencesBase.cpp:113
 msgid "shows the preferences web page"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:141
+#: DlgAdvPreferencesBase.cpp:135
 msgid "Computing allowed"
 msgstr "Skaičiavimai leidžiami"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
+#: DlgAdvPreferencesBase.cpp:139
 msgid "While computer is on batteries"
 msgstr "Kai kompiuteris veikia iš baterijų"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:149
-msgid "check this if you want this computer to do work while it runs on batteries"
-msgstr "pažymėkite, jei norite vykdyti skaičiavimus kai kompiuteris veikia iš baterijų"
+#: DlgAdvPreferencesBase.cpp:142
+msgid ""
+"check this if you want this computer to do work while it runs on batteries"
+msgstr ""
+"pažymėkite, jei norite vykdyti skaičiavimus kai kompiuteris veikia iš "
+"baterijų"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:155
+#: DlgAdvPreferencesBase.cpp:148
 msgid "While computer is in use"
 msgstr "Kai kompiuteris naudojamas"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:158
-msgid "check this if you want this computer to do work even when you're using it"
+#: DlgAdvPreferencesBase.cpp:151
+msgid ""
+"check this if you want this computer to do work even when you're using it"
 msgstr "pažymėkite, jei norite vykdyti skaičiavimus kai naudojatės kompiuteriu"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:164
+#: DlgAdvPreferencesBase.cpp:157
 msgid "Use GPU while computer is in use"
 msgstr "Naudoti vaizdo procesorių kai kompiuteris naudojamas"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:167
-msgid "check this if you want your GPU to do work even when you're using the computer"
-msgstr "pažymėkite, jei norite skaičiavimams naudoti grafikos plokštę kai naudojatės kompiuteriu"
+#: DlgAdvPreferencesBase.cpp:160
+msgid ""
+"check this if you want your GPU to do work even when you're using the "
+"computer"
+msgstr ""
+"pažymėkite, jei norite skaičiavimams naudoti grafikos plokštę kai naudojatės "
+"kompiuteriu"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:179
+#: DlgAdvPreferencesBase.cpp:172
 msgid "Only after computer has been idle for"
 msgstr "Tik kai kompiuteris buvo nenaudojamas"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:188
-msgid "do work only after you haven't used the computer for this number of minutes"
-msgstr "vykdyti skaičiavimus tik kai kompiuteris nenaudojamas nurodytą minučių skaičių"
+#: DlgAdvPreferencesBase.cpp:182
+msgid ""
+"do work only after you haven't used the computer for this number of minutes"
+msgstr ""
+"vykdyti skaičiavimus tik kai kompiuteris nenaudojamas nurodytą minučių "
+"skaičių"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:193
-#: clientgui/DlgAdvPreferencesBase.cpp:342
+#: DlgAdvPreferencesBase.cpp:187 DlgAdvPreferencesBase.cpp:336
+#: sg_DlgPreferences.cpp:417
 msgid "minutes"
 msgstr "minutes"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:212
+#: DlgAdvPreferencesBase.cpp:206
 msgid "While processor usage is less than"
 msgstr "Kai procesoriaus naudojimas mažesnis nei"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:221
+#: DlgAdvPreferencesBase.cpp:216
 msgid "suspend work if processor usage exceeds this level"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:226
+#: DlgAdvPreferencesBase.cpp:221
 msgid "percent (0 means no restriction)"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:240
-#: clientgui/DlgAdvPreferencesBase.cpp:506
+#: DlgAdvPreferencesBase.cpp:235 DlgAdvPreferencesBase.cpp:496
 msgid "Every day between hours of"
 msgstr "Kiekvieną dieną tarp"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: DlgAdvPreferencesBase.cpp:239
 msgid "start work at this time"
 msgstr "pradėti vykdyti"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:248
-#: clientgui/DlgAdvPreferencesBase.cpp:514
+#: DlgAdvPreferencesBase.cpp:243 DlgAdvPreferencesBase.cpp:504
+#: sg_DlgPreferences.cpp:326 sg_DlgPreferences.cpp:348
 msgid "and"
 msgstr "ir"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:252
+#: DlgAdvPreferencesBase.cpp:247
 msgid "stop work at this time"
 msgstr "baigti vykdyti"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
-#: clientgui/DlgAdvPreferencesBase.cpp:522
+#: DlgAdvPreferencesBase.cpp:251 DlgAdvPreferencesBase.cpp:512
 msgid "(no restriction if equal)"
 msgstr "(be apribojimų jei vienodi)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:261
-#: clientgui/DlgAdvPreferencesBase.cpp:527
+#: DlgAdvPreferencesBase.cpp:256 DlgAdvPreferencesBase.cpp:517
 msgid "Day-of-week override:"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:266
-#: clientgui/DlgAdvPreferencesBase.cpp:532
+#: DlgAdvPreferencesBase.cpp:261 DlgAdvPreferencesBase.cpp:522
 msgid "check box to specify hours for this day of week"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:272
-#: clientgui/DlgAdvPreferencesBase.cpp:538
+#: DlgAdvPreferencesBase.cpp:267 DlgAdvPreferencesBase.cpp:528
 msgid "Monday"
 msgstr "Pirmadienis"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:279
-#: clientgui/DlgAdvPreferencesBase.cpp:545
+#: DlgAdvPreferencesBase.cpp:274 DlgAdvPreferencesBase.cpp:535
 msgid "Tuesday"
 msgstr "Antradienis"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:286
-#: clientgui/DlgAdvPreferencesBase.cpp:552
+#: DlgAdvPreferencesBase.cpp:281 DlgAdvPreferencesBase.cpp:542
 msgid "Wednesday"
 msgstr "Trečiadienis"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:293
-#: clientgui/DlgAdvPreferencesBase.cpp:559
+#: DlgAdvPreferencesBase.cpp:288 DlgAdvPreferencesBase.cpp:549
 msgid "Thursday"
 msgstr "Ketvirtadienis"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:300
-#: clientgui/DlgAdvPreferencesBase.cpp:566
+#: DlgAdvPreferencesBase.cpp:295 DlgAdvPreferencesBase.cpp:556
 msgid "Friday"
 msgstr "Penktadienis"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:307
-#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: DlgAdvPreferencesBase.cpp:302 DlgAdvPreferencesBase.cpp:563
 msgid "Saturday"
 msgstr "Šeštadienis"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:580
+#: DlgAdvPreferencesBase.cpp:309 DlgAdvPreferencesBase.cpp:570
 msgid "Sunday"
 msgstr "Sekmadienis"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:328
+#: DlgAdvPreferencesBase.cpp:323
 msgid "Other options"
 msgstr "Kiti pasirinkimai"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:336
+#: DlgAdvPreferencesBase.cpp:330
 msgid "Switch between applications every"
 msgstr "Keisti programas kas"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:345
+#: DlgAdvPreferencesBase.cpp:339
 msgid "On multiprocessor systems, use at most"
 msgstr "Sistemose su keletu procesorių naudoti daugiausiai"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
+#: DlgAdvPreferencesBase.cpp:346
 #, no-c-format
-msgid "% of the processors (0 means no restriction)"
+msgid "% of the processors (0 means ignore this setting)"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:355
-#: clientgui/DlgAdvPreferencesBase.cpp:618
-#: clientgui/DlgAdvPreferencesBase.cpp:640
-#: clientgui/DlgAdvPreferencesBase.cpp:661
-#: clientgui/DlgAdvPreferencesBase.cpp:683
-#: clientgui/DlgAdvPreferencesBase.cpp:694
+#: DlgAdvPreferencesBase.cpp:349 DlgAdvPreferencesBase.cpp:605
+#: DlgAdvPreferencesBase.cpp:627 DlgAdvPreferencesBase.cpp:648
+#: DlgAdvPreferencesBase.cpp:669 DlgAdvPreferencesBase.cpp:679
 msgid "Use at most"
 msgstr "Naudoti daugiausiai"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:362
+#: DlgAdvPreferencesBase.cpp:356
 #, no-c-format
-msgid "% of CPU time (0 means no restriction)"
-msgstr ""
+msgid "% CPU time"
+msgstr "% procesoriaus laiko"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:386
+#: DlgAdvPreferencesBase.cpp:378
 msgid "General options"
 msgstr "Bendri nustatymai"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:395
+#: DlgAdvPreferencesBase.cpp:386
 msgid "Maximum download rate"
 msgstr "Didžiausia parsiuntimo sparta"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:401
-#: clientgui/DlgAdvPreferencesBase.cpp:410
-msgid "KBytes/second (0 means no restriction)"
-msgstr ""
+#: DlgAdvPreferencesBase.cpp:392 DlgAdvPreferencesBase.cpp:401
+msgid "KBytes/sec."
+msgstr "KB/s"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:404
+#: DlgAdvPreferencesBase.cpp:395
 msgid "Maximum upload rate"
 msgstr "Didžiausia išsiuntimo sparta"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:417
-msgid "Minimum work buffer"
+#: DlgAdvPreferencesBase.cpp:406
+msgid "Transfer at most"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:425
-msgid "Try to maintain enough tasks to keep busy for this many days"
+#: DlgAdvPreferencesBase.cpp:412
+msgid "Mbytes"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:431
-#: clientgui/DlgAdvPreferencesBase.cpp:449
-msgid "days (maximum value: 10)"
+#: DlgAdvPreferencesBase.cpp:415
+msgid "every"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:437
-msgid "Max additional work buffer"
+#: DlgAdvPreferencesBase.cpp:421 DlgAdvPreferencesBase.cpp:444
+#: DlgAdvPreferencesBase.cpp:463
+msgid "days"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:445
-msgid "In addition, maintain enough tasks for up to this many days"
+#: DlgAdvPreferencesBase.cpp:429
+msgid "Minimum work buffer"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:454
-msgid "Transfer at most"
+#: DlgAdvPreferencesBase.cpp:438
+msgid "Try to maintain enough tasks to keep busy for this many days"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:462
-msgid "MBytes every"
+#: DlgAdvPreferencesBase.cpp:450
+msgid "Max additional work buffer"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:468
-msgid "days (0 means no restriction)"
+#: DlgAdvPreferencesBase.cpp:459
+msgid "In addition, maintain enough tasks for up to this many days"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:476
+#: DlgAdvPreferencesBase.cpp:466
 msgid "Skip image file verification"
 msgstr "Praleisti bylų tikrinimą"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:478
+#: DlgAdvPreferencesBase.cpp:468
 msgid "check this if your Internet provider modifies image files"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:484
+#: DlgAdvPreferencesBase.cpp:476
 msgid "Connect options"
 msgstr "Susijungimo nustatymai"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:487
+#: DlgAdvPreferencesBase.cpp:478
 msgid "Confirm before connecting to internet"
 msgstr "Klausti prieš jungiantis prie interneto"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
+#: DlgAdvPreferencesBase.cpp:480
+msgid ""
+"if checked, a confirmation dialog will be displayed before trying to connect "
+"to the Internet"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:493
+#: DlgAdvPreferencesBase.cpp:484
 msgid "Disconnect when done"
 msgstr "Atsijungti pabaigus"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:495
+#: DlgAdvPreferencesBase.cpp:486
 msgid ""
 "if checked, BOINC hangs up when network usage is done\n"
 "(only relevant for dialup-connection)"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:501
+#: DlgAdvPreferencesBase.cpp:492
 msgid "Network usage allowed"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:510
+#: DlgAdvPreferencesBase.cpp:500
 msgid "network usage start hour"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:518
+#: DlgAdvPreferencesBase.cpp:508
 msgid "network usage stop hour"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:610
-#: clientgui/DlgItemProperties.cpp:257
+#: DlgAdvPreferencesBase.cpp:598 DlgItemProperties.cpp:231
 msgid "Disk usage"
 msgstr "Disko naudojimas"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:622
+#: DlgAdvPreferencesBase.cpp:609
 msgid "the maximum disk space used by BOINC (in Gigabytes)"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:626
-msgid "Gigabytes disk space (0 means no restriction)"
+#: DlgAdvPreferencesBase.cpp:613
+msgid "Gigabytes disk space"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:629
+#: DlgAdvPreferencesBase.cpp:616
 msgid "Leave at least"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:633
+#: DlgAdvPreferencesBase.cpp:620
 msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:637
+#: DlgAdvPreferencesBase.cpp:624
 msgid "Gigabytes disk space free"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
+#: DlgAdvPreferencesBase.cpp:631
 msgid "BOINC uses at most this percentage of total disk space"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:649
+#: DlgAdvPreferencesBase.cpp:636
 #, no-c-format
 msgid "% of total disk space"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:652
+#: DlgAdvPreferencesBase.cpp:639
 msgid "Tasks checkpoint to disk at most every"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
+#: DlgAdvPreferencesBase.cpp:645
 msgid "seconds"
 msgstr "sekundžių"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:668
+#: DlgAdvPreferencesBase.cpp:655
 #, no-c-format
 msgid "% of page file (swap space)"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:675
+#: DlgAdvPreferencesBase.cpp:662
 msgid "Memory usage"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
+#: DlgAdvPreferencesBase.cpp:676
 #, no-c-format
 msgid "% when computer is in use"
 msgstr "% kai kompiuteris naudojamas"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:701
+#: DlgAdvPreferencesBase.cpp:686
 #, no-c-format
 msgid "% when computer is idle"
 msgstr "% kai kompiuteris nenaudojamas"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:706
+#: DlgAdvPreferencesBase.cpp:691
 msgid "Leave applications in memory while suspended"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:708
+#: DlgAdvPreferencesBase.cpp:693
 msgid "if checked, suspended work units are left in memory"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:728
-msgid "Suspend processor and network usage when these applications are running:"
+#: DlgAdvPreferencesBase.cpp:713
+msgid ""
+"Suspend processor and network usage when these applications are running:"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:738
+#: DlgAdvPreferencesBase.cpp:722
 msgid "Add..."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:739
+#: DlgAdvPreferencesBase.cpp:723
 msgid "Add an application to this list"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:744
+#: DlgAdvPreferencesBase.cpp:728 ViewProjects.cpp:202
+#: sg_ProjectCommandPopup.cpp:85
 msgid "Remove"
 msgstr "Pašalinti"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:745
+#: DlgAdvPreferencesBase.cpp:729
 msgid "Remove an application from this list"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:754
+#: DlgAdvPreferencesBase.cpp:738
 msgid "For advanced options, refer to "
 msgstr ""
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:65
-#, c-format
-msgid "%s Diagnostic Log Flags"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:83
-msgid "These flags enable various types of diagnostic messages in the Event Log."
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:105
-msgid "Save all values and close the dialog"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:108
-msgid "Defaults"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:109
-msgid "Restore default settings"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:113
-msgid "Close the dialog without saving"
-msgstr ""
-
-#: clientgui/DlgEventLog.cpp:226
+#: DlgEventLog.cpp:219
 #, c-format
 msgid "%s - Event Log"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:236
+#: DlgEventLog.cpp:232 ViewMessages.cpp:117 ViewProjects.cpp:219
+#: ViewStatistics.cpp:435 ViewStatistics.cpp:2009 ViewTransfers.cpp:182
+#: ViewWork.cpp:232
 msgid "Project"
 msgstr "Projektas"
 
-#: clientgui/DlgEventLog.cpp:237
+#: DlgEventLog.cpp:233 ViewMessages.cpp:118
 msgid "Time"
 msgstr "Laikas"
 
-#: clientgui/DlgEventLog.cpp:238
+#: DlgEventLog.cpp:234 ViewMessages.cpp:119
 msgid "Message"
 msgstr "Pranešimas"
 
-#: clientgui/DlgEventLog.cpp:300
-#: clientgui/DlgEventLog.cpp:364
+#: DlgEventLog.cpp:290 DlgEventLog.cpp:354
 msgid "&Show only this project"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:304
+#: DlgEventLog.cpp:294
 msgid "Copy &All"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:306
-#: clientgui/DlgEventLog.cpp:310
+#: DlgEventLog.cpp:296 DlgEventLog.cpp:300 ViewMessages.cpp:89
 msgid "Copy all the messages to the clipboard."
 msgstr "Kopijuoti visas žinutes į laikinąją saugyklą."
 
-#: clientgui/DlgEventLog.cpp:315
+#: DlgEventLog.cpp:305
 #, fuzzy
 msgid "Copy &Selected"
 msgstr "Kopijuoti pasirinktas"
 
-#: clientgui/DlgEventLog.cpp:318
-#: clientgui/DlgEventLog.cpp:326
-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 "Kopijuoti pasirinktas žinutes į laikinąją saugyklą. Keletą žinučių galite pažymėti spausdami Shift arba Command klavišus žymėjimo metu."
+#: DlgEventLog.cpp:308 DlgEventLog.cpp:316 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 ""
+"Kopijuoti pasirinktas žinutes į laikinąją saugyklą. Keletą žinučių galite "
+"pažymėti spausdami Shift arba Command klavišus žymėjimo metu."
 
-#: clientgui/DlgEventLog.cpp:320
-#: clientgui/DlgEventLog.cpp:328
-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 "Kopijuoti pasirinktas žinutes į laikinąją saugyklą. Keletą žinučių galite pažymėti spausdami Shift arba Control klavišus žymėjimo metu."
+#: DlgEventLog.cpp:310 DlgEventLog.cpp:318 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 ""
+"Kopijuoti pasirinktas žinutes į laikinąją saugyklą. Keletą žinučių galite "
+"pažymėti spausdami Shift arba Control klavišus žymėjimo metu."
 
-#: clientgui/DlgEventLog.cpp:335
-#: clientgui/DlgItemProperties.cpp:67
+#: DlgEventLog.cpp:325 DlgItemProperties.cpp:67
 msgid "&Close"
 msgstr "Uždaryti"
 
-#: clientgui/DlgEventLog.cpp:344
+#: DlgEventLog.cpp:334 sg_BoincSimpleFrame.cpp:798 sg_DlgPreferences.cpp:442
 #, c-format
 msgid "Get help with %s"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:358
+#: DlgEventLog.cpp:348
 #, fuzzy
 msgid "Show all &messages"
 msgstr "Rodyti visus pranešimus"
 
-#: clientgui/DlgEventLog.cpp:359
-#: clientgui/DlgEventLog.cpp:361
+#: DlgEventLog.cpp:349 DlgEventLog.cpp:351
 msgid "Show messages for all projects"
 msgstr "Rodyti visų projektų žinutes"
 
-#: clientgui/DlgEventLog.cpp:365
-#: clientgui/DlgEventLog.cpp:367
+#: DlgEventLog.cpp:355 DlgEventLog.cpp:357
 msgid "Show only the messages for the selected project"
 msgstr "Rodyti tik pasirinkto projekto žinutes"
 
-#: clientgui/DlgExitMessage.cpp:82
+#: DlgExitMessage.cpp:82
 #, c-format
 msgid "%s - Exit Confirmation"
 msgstr "%s - išėjimo patvirtinimas"
 
-#: clientgui/DlgExitMessage.cpp:130
+#: DlgExitMessage.cpp:130
 #, c-format
 msgid ""
 "You have requested to exit the %s,\n"
@@ -1675,7 +1653,7 @@ msgid ""
 "choose from the following options:"
 msgstr ""
 
-#: clientgui/DlgExitMessage.cpp:135
+#: DlgExitMessage.cpp:135
 #, c-format
 msgid ""
 "This will shut down %s and its tasks until either the\n"
@@ -1686,844 +1664,828 @@ msgid ""
 "tasks at the times you selected in your preferences."
 msgstr ""
 
-#: clientgui/DlgExitMessage.cpp:153
+#: DlgExitMessage.cpp:153
 #, c-format
 msgid "Stop running tasks when exiting the %s"
 msgstr ""
 
-#: clientgui/DlgExitMessage.cpp:165
+#: DlgExitMessage.cpp:165
 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
+#: DlgExitMessage.cpp:178 DlgGenericMessage.cpp:125 DlgOptions.cpp:401
+#: DlgSelectComputer.cpp:168 wizardex.cpp:378
 msgid "&Cancel"
 msgstr "&Atšaukti"
 
-#: clientgui/DlgGenericMessage.cpp:112
+#: DlgGenericMessage.cpp:112
 msgid "Don't show this dialog again."
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:194
-#: clientgui/DlgItemProperties.cpp:197
-#: clientgui/DlgItemProperties.cpp:200
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:168 DlgItemProperties.cpp:171
+#: DlgItemProperties.cpp:174 DlgItemProperties.cpp:177
 #, fuzzy
 msgid "Don't fetch tasks for "
 msgstr "Negauti užduočių procesoriui"
 
-#: clientgui/DlgItemProperties.cpp:194
+#: DlgItemProperties.cpp:168
 msgid "Project preference"
 msgstr "Projekto nustatymai"
 
-#: clientgui/DlgItemProperties.cpp:197
+#: DlgItemProperties.cpp:171
 #, fuzzy
 msgid "Account manager preference"
 msgstr "Abonento valdiklio tinklapis"
 
-#: clientgui/DlgItemProperties.cpp:200
+#: DlgItemProperties.cpp:174
 #, fuzzy
 msgid "Project has no apps for "
 msgstr "Projektas nerastas"
 
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:177
 #, fuzzy
 msgid "Client configuration excludes "
 msgstr "Vartotojo abonementų kūrimas yra išjungtas"
 
-#: clientgui/DlgItemProperties.cpp:207
+#: DlgItemProperties.cpp:181
 msgid " work fetch deferred for"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:208
+#: DlgItemProperties.cpp:182
 msgid " work fetch deferral interval"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:213
 msgid "Properties of project "
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:243
-#: clientgui/DlgOptions.cpp:221
+#: DlgItemProperties.cpp:217 DlgOptions.cpp:218
 msgid "General"
 msgstr "Bendri"
 
-#: clientgui/DlgItemProperties.cpp:244
+#: DlgItemProperties.cpp:218
 msgid "Master URL"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:245
+#: DlgItemProperties.cpp:219
 msgid "User name"
 msgstr "Vartotojo vardas"
 
-#: clientgui/DlgItemProperties.cpp:246
+#: DlgItemProperties.cpp:220
 msgid "Team name"
 msgstr "Komanda"
 
-#: clientgui/DlgItemProperties.cpp:247
+#: DlgItemProperties.cpp:221 ViewProjects.cpp:224
 msgid "Resource share"
 msgstr "Resursų padalijimas"
 
-#: clientgui/DlgItemProperties.cpp:249
+#: DlgItemProperties.cpp:223
 msgid "Scheduler RPC deferred for"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:252
+#: DlgItemProperties.cpp:226
 msgid "File downloads deferred for"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:255
+#: DlgItemProperties.cpp:229
 msgid "File uploads deferred for"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:258
+#: DlgItemProperties.cpp:232
 msgid "Computer ID"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:260
+#: DlgItemProperties.cpp:234
 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
+#: DlgItemProperties.cpp:234 DlgItemProperties.cpp:236
+#: DlgItemProperties.cpp:237 DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:242 DlgItemProperties.cpp:251
+#: DlgItemProperties.cpp:254 DlgItemProperties.cpp:257
 msgid "yes"
 msgstr "taip"
 
-#: clientgui/DlgItemProperties.cpp:262
+#: DlgItemProperties.cpp:236
 msgid "Suspended via GUI"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:262
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:236 DlgItemProperties.cpp:237
 msgid "no"
 msgstr "ne"
 
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:237
 msgid "Don't request more work"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:265
+#: DlgItemProperties.cpp:239
 msgid "Scheduler call in progress"
 msgstr "Jungiamasi prie projekto serverio"
 
-#: clientgui/DlgItemProperties.cpp:268
+#: DlgItemProperties.cpp:242
 msgid "Trickle-up pending"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:271
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:245 DlgItemProperties.cpp:247
 #, fuzzy
 msgid "Host location"
 msgstr "Kompiuterio suminiai rodikliai"
 
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:247
 #, fuzzy
 msgid "default"
 msgstr "&Nustatyti numatytus nustatymus"
 
-#: clientgui/DlgItemProperties.cpp:277
+#: DlgItemProperties.cpp:251
 msgid "Added via account manager"
 msgstr "Prisijungta naudojant abonemento valdiklį"
 
-#: clientgui/DlgItemProperties.cpp:280
+#: DlgItemProperties.cpp:254
 msgid "Remove when tasks done"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:283
+#: DlgItemProperties.cpp:257
 msgid "Ended"
 msgstr "Užbaigtas"
 
-#: clientgui/DlgItemProperties.cpp:285
-msgid "Tasks completed"
-msgstr ""
-
-#: clientgui/DlgItemProperties.cpp:286
-msgid "Tasks failed"
-msgstr ""
-
-#: clientgui/DlgItemProperties.cpp:288
+#: DlgItemProperties.cpp:259
 msgid "Credit"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:289
+#: DlgItemProperties.cpp:260
 msgid "User"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:296
+#: DlgItemProperties.cpp:267
 msgid "Host"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:305
+#: DlgItemProperties.cpp:276
 msgid "Scheduling"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:306
+#: DlgItemProperties.cpp:277
 msgid "Scheduling priority"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:307
+#: DlgItemProperties.cpp:278
 msgid "CPU"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:331
+#: DlgItemProperties.cpp:302
 msgid "Duration correction factor"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:345
+#: DlgItemProperties.cpp:316
 msgid "Properties of task "
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:357
+#: DlgItemProperties.cpp:328 ViewWork.cpp:238
 msgid "Application"
 msgstr "Programa"
 
-#: clientgui/DlgItemProperties.cpp:358
+#: DlgItemProperties.cpp:329 ViewWork.cpp:239
 msgid "Name"
 msgstr "Pavadinimas"
 
-#: clientgui/DlgItemProperties.cpp:359
+#: DlgItemProperties.cpp:330
 msgid "State"
 msgstr "Būsena"
 
-#: clientgui/DlgItemProperties.cpp:362
+#: DlgItemProperties.cpp:333
 msgid "Received"
 msgstr "Gauta"
 
-#: clientgui/DlgItemProperties.cpp:365
+#: DlgItemProperties.cpp:336
 msgid "Report deadline"
 msgstr "Atlikti iki"
 
-#: clientgui/DlgItemProperties.cpp:367
+#: DlgItemProperties.cpp:338
 msgid "Resources"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:370
+#: DlgItemProperties.cpp:341
 msgid "Estimated computation size"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:373
+#: DlgItemProperties.cpp:344
 msgid "CPU time at last checkpoint"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:374
-#: clientgui/DlgItemProperties.cpp:389
+#: DlgItemProperties.cpp:345 DlgItemProperties.cpp:360
 msgid "CPU time"
 msgstr "Procesoriaus laikas"
 
-#: clientgui/DlgItemProperties.cpp:376
-#: clientgui/DlgItemProperties.cpp:390
+#: DlgItemProperties.cpp:347 DlgItemProperties.cpp:361
 msgid "Elapsed time"
 msgstr "Praėjęs laikas"
 
-#: clientgui/DlgItemProperties.cpp:378
+#: DlgItemProperties.cpp:349
 msgid "Estimated time remaining"
 msgstr "Numanomas likęs laikas"
 
-#: clientgui/DlgItemProperties.cpp:379
+#: DlgItemProperties.cpp:350
 msgid "Fraction done"
 msgstr "Atlikta dalis"
 
-#: clientgui/DlgItemProperties.cpp:380
+#: DlgItemProperties.cpp:351
 msgid "Virtual memory size"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:381
+#: DlgItemProperties.cpp:352
 msgid "Working set size"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:383
+#: DlgItemProperties.cpp:354
 msgid "Directory"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:386
+#: DlgItemProperties.cpp:357
 msgid "Process ID"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:456
+#: DlgItemProperties.cpp:427 ViewWork.cpp:1032 sg_TaskPanel.cpp:823
 msgid "Local: "
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: DlgOptions.cpp:129 DlgOptions.cpp:135
 msgid "Options"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:178
+#: DlgOptions.cpp:175
 msgid "Language:"
 msgstr "Kalba:"
 
-#: clientgui/DlgOptions.cpp:185
+#: DlgOptions.cpp:182
 msgid "What language should BOINC use?"
 msgstr "Kokią kalbą turėtų naudoti BOINC?"
 
-#: clientgui/DlgOptions.cpp:189
+#: DlgOptions.cpp:186
 msgid "Notice reminder interval:"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:196
+#: DlgOptions.cpp:193
 msgid "How often should BOINC remind you of new notices?"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:201
+#: DlgOptions.cpp:198
 msgid "Run Manager at login?"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:207
+#: DlgOptions.cpp:204
 msgid "Run the BOINC Manager when you log on."
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:212
+#: DlgOptions.cpp:209
 msgid "Enable Manager exit dialog?"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:218
+#: DlgOptions.cpp:215
 msgid "Display the exit dialog when shutting down the Manager."
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:229
+#: DlgOptions.cpp:226
 msgid "Dial-up and Virtual Private Network settings"
 msgstr "Jungimosi telefono linija ir virtualiu privačiu tinklu (VPN) nustatymai"
 
-#: clientgui/DlgOptions.cpp:243
+#: DlgOptions.cpp:240
 msgid "&Set Default"
 msgstr "&Nustatyti numatytus nustatymus"
 
-#: clientgui/DlgOptions.cpp:248
+#: DlgOptions.cpp:245
 msgid "&Clear Default"
 msgstr "&Išvalyti numatytus nustatymus"
 
-#: clientgui/DlgOptions.cpp:255
+#: DlgOptions.cpp:252
 msgid "Default Connection:"
 msgstr "Numatyta jungtis:"
 
-#: clientgui/DlgOptions.cpp:262
+#: DlgOptions.cpp:259
 msgid "Connections"
 msgstr "Susijungimai"
 
-#: clientgui/DlgOptions.cpp:271
+#: DlgOptions.cpp:268
 msgid "Connect via HTTP proxy server"
 msgstr "Jungtis per HTTP proxy serverį"
 
-#: clientgui/DlgOptions.cpp:275
+#: DlgOptions.cpp:272
 msgid "HTTP Proxy Server Configuration"
 msgstr "HTTP proxy serverio nustatymai"
 
-#: clientgui/DlgOptions.cpp:283
-#: clientgui/DlgOptions.cpp:347
+#: DlgOptions.cpp:280 DlgOptions.cpp:344
 msgid "Address:"
 msgstr "Adresas:"
 
-#: clientgui/DlgOptions.cpp:291
-#: clientgui/DlgOptions.cpp:355
+#: DlgOptions.cpp:288 DlgOptions.cpp:352 ProxyPage.cpp:340 ProxyPage.cpp:360
 msgid "Port:"
 msgstr "Jungtis:"
 
-#: clientgui/DlgOptions.cpp:299
-#: clientgui/DlgOptions.cpp:363
+#: DlgOptions.cpp:296 DlgOptions.cpp:360
 msgid "Don't use proxy for:"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:306
-#: clientgui/DlgOptions.cpp:370
+#: DlgOptions.cpp:303 DlgOptions.cpp:367
 msgid "Leave these blank if not needed"
 msgstr "Jei nereikalingi, palikite tuščius"
 
-#: clientgui/DlgOptions.cpp:312
-#: clientgui/DlgOptions.cpp:376
+#: DlgOptions.cpp:309 DlgOptions.cpp:373 ProxyPage.cpp:343 ProxyPage.cpp:363
 msgid "User Name:"
 msgstr "Vartotojo vardas:"
 
-#: clientgui/DlgOptions.cpp:320
-#: clientgui/DlgOptions.cpp:384
-#: clientgui/DlgSelectComputer.cpp:152
+#: DlgOptions.cpp:317 DlgOptions.cpp:381 DlgSelectComputer.cpp:152
+#: ProxyPage.cpp:346 ProxyPage.cpp:366
 msgid "Password:"
 msgstr "Slaptažodis:"
 
-#: clientgui/DlgOptions.cpp:327
+#: DlgOptions.cpp:324
 msgid "HTTP Proxy"
 msgstr "HTTP Proxy"
 
-#: clientgui/DlgOptions.cpp:335
+#: DlgOptions.cpp:332
 msgid "Connect via SOCKS proxy server"
 msgstr "Jungtis per SOCKS proxy serverį"
 
-#: clientgui/DlgOptions.cpp:339
+#: DlgOptions.cpp:336
 msgid "SOCKS Proxy Server Configuration"
 msgstr "SOCKS Proxy serverio nustatymai"
 
-#: clientgui/DlgOptions.cpp:391
+#: DlgOptions.cpp:388
 msgid "SOCKS Proxy"
 msgstr "SOCKS Proxy"
 
-#: clientgui/DlgOptions.cpp:589
+#: DlgOptions.cpp:586
 #, fuzzy
 msgid "always"
 msgstr "Veikti visada"
 
-#: clientgui/DlgOptions.cpp:590
+#: DlgOptions.cpp:587
 msgid "1 hour"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:591
+#: DlgOptions.cpp:588
 msgid "6 hours"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:592
+#: DlgOptions.cpp:589
 msgid "1 day"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:593
+#: DlgOptions.cpp:590
 msgid "1 week"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:594
+#: DlgOptions.cpp:591
 #, fuzzy
 msgid "never"
 msgstr "Serveris:"
 
-#: clientgui/DlgOptions.cpp:691
+#: DlgOptions.cpp:688
 #, c-format
 msgid "%s - Language Selection"
 msgstr "%s - kalbos pasirinkimas"
 
-#: clientgui/DlgOptions.cpp:698
+#: DlgOptions.cpp:695
 #, c-format
-msgid "The %s's language has been changed.  In order for this change to take effect, you must restart the %s."
-msgstr "%s aptiko pasirinktos kalbos pakeitimą. %s turi būti paleistas iš naujo, kad įsigaliotų kalbos pakeitimas."
+#, fuzzy, c-format
+msgid ""
+"The %s's language has been changed.  In order for this change to take "
+"effect, you must restart the %s."
+msgstr ""
+"%s aptiko pasirinktos kalbos pakeitimą. %s turi būti paleistas iš naujo, kad "
+"įsigaliotų kalbos pakeitimas."
 
-#: clientgui/DlgSelectComputer.cpp:91
+#: DlgSelectComputer.cpp:91
 #, c-format
 msgid "%s - Select Computer"
 msgstr "%s - kompiuterio pasirinkimas"
 
-#: clientgui/DlgSelectComputer.cpp:125
+#: DlgSelectComputer.cpp:125
 #, c-format
 msgid ""
 "Another instance of %s is already running \n"
 "on this computer.  Please select a client to monitor."
 msgstr ""
 
-#: clientgui/DlgSelectComputer.cpp:143
+#: DlgSelectComputer.cpp:143
 msgid "Host name:"
 msgstr "Kompiuterio pavadinimas:"
 
-#: clientgui/Localization.cpp:31
-#: clientgui/Localization.cpp:69
+#: Localization.cpp:31 Localization.cpp:69
 msgid "Message boards"
 msgstr "Pranešimų lentos"
 
-#: clientgui/Localization.cpp:33
+#: Localization.cpp:33
 msgid "Correspond with other users on the SETI at home message boards"
 msgstr "Susirašinėkite su kitais SETI at HOME vartotojais pranešimų lentose"
 
-#: clientgui/Localization.cpp:37
+#: Localization.cpp:37
 msgid "Ask questions and report problems"
 msgstr "Klauskite klausimus ir praneškite apie problemas"
 
-#: clientgui/Localization.cpp:39
-#: clientgui/Localization.cpp:81
-#: clientgui/Localization.cpp:111
-#: clientgui/Localization.cpp:129
+#: Localization.cpp:39 Localization.cpp:81 Localization.cpp:111
+#: Localization.cpp:129
 msgid "Your account"
 msgstr "Jūsų abonementas"
 
-#: clientgui/Localization.cpp:41
-#: clientgui/Localization.cpp:87
-#: clientgui/Localization.cpp:113
+#: Localization.cpp:41 Localization.cpp:87 Localization.cpp:113
 msgid "View your account information and credit totals"
 msgstr "Peržiūrėkite abonemento informaciją ir kreditų sumas"
 
-#: clientgui/Localization.cpp:43
+#: Localization.cpp:43
 msgid "Your preferences"
 msgstr "Jūsų nustatymai"
 
-#: clientgui/Localization.cpp:45
+#: Localization.cpp:45
 msgid "View and modify your SETI at home account profile and preferences"
-msgstr "Peržiūrėkite ir keiskite savo SETI at Home vartotojo abonemento aprašymą ir nustatymus"
+msgstr ""
+"Peržiūrėkite ir keiskite savo SETI at Home vartotojo abonemento aprašymą ir "
+"nustatymus"
 
-#: clientgui/Localization.cpp:47
-#: clientgui/Localization.cpp:89
+#: Localization.cpp:47 Localization.cpp:89
 msgid "Your results"
 msgstr "Jūsų rezultatai"
 
-#: clientgui/Localization.cpp:49
-#: clientgui/Localization.cpp:91
+#: Localization.cpp:49 Localization.cpp:91
 msgid "View your last week (or more) of computational results and work"
 msgstr "Peržiūrėkite neseniai atliktų skaičiavimų rezultatus ir užduotis"
 
-#: clientgui/Localization.cpp:51
-#: clientgui/Localization.cpp:93
+#: Localization.cpp:51 Localization.cpp:93
 msgid "Your computers"
 msgstr "Jūsų kompiuteriai"
 
-#: clientgui/Localization.cpp:53
+#: Localization.cpp:53
 msgid "View a listing of all the computers on which you are running SETI at Home"
 msgstr "Peržiūrėkite visų kompiuterių, kurie vykdo SETI at Home, sąrašą"
 
-#: clientgui/Localization.cpp:55
-#: clientgui/Localization.cpp:97
+#: Localization.cpp:55 Localization.cpp:97
 msgid "Your team"
 msgstr "Jūsų komanda"
 
-#: clientgui/Localization.cpp:57
-#: clientgui/Localization.cpp:99
+#: Localization.cpp:57 Localization.cpp:99
 msgid "View information about your team"
 msgstr "Peržiūrėkite informaciją apie savo komandą"
 
-#: clientgui/Localization.cpp:61
+#: Localization.cpp:61
 msgid "Common questions"
 msgstr "Dažniausi klausimai"
 
-#: clientgui/Localization.cpp:63
+#: Localization.cpp:63
 msgid "Read the Einstein at Home Frequently Asked Question list"
 msgstr "Perskaitykite Einstein at Home dažniausiai užduodamų klausimų sąrašą"
 
-#: clientgui/Localization.cpp:65
+#: Localization.cpp:65
 msgid "Screensaver info"
 msgstr "Ekrano užsklandos informacija"
 
-#: clientgui/Localization.cpp:67
+#: Localization.cpp:67
 msgid "Read a detailed description of the Einstein at Home screensaver"
 msgstr "Perskaitykite detalų Einstein at Home ekrano užsklandos aprašymą"
 
-#: clientgui/Localization.cpp:71
-msgid "Correspond with admins and other users on the Einstein at Home message boards"
-msgstr "Susirašinėkite su administratoriais ar kitais Einstein at Home vartotojais pranešimų lentose"
+#: Localization.cpp:71
+msgid ""
+"Correspond with admins and other users on the Einstein at Home message boards"
+msgstr ""
+"Susirašinėkite su administratoriais ar kitais Einstein at Home vartotojais "
+"pranešimų lentose"
 
-#: clientgui/Localization.cpp:73
+#: Localization.cpp:73
 msgid "Einstein status"
 msgstr "Einstein būklė"
 
-#: clientgui/Localization.cpp:75
+#: Localization.cpp:75
 msgid "Current status of the Einstein at Home server"
 msgstr "Einstein at Home serverių būklė"
 
-#: clientgui/Localization.cpp:77
+#: Localization.cpp:77
 msgid "Report problems"
 msgstr "Praneškite apie problemas"
 
-#: clientgui/Localization.cpp:79
+#: Localization.cpp:79
 msgid "A link to the Einstein at Home problems and bug reports message board"
 msgstr "Nuoroda į Einstein at Home problemų pranešimų lentas"
 
-#: clientgui/Localization.cpp:83
+#: Localization.cpp:83
 msgid "View and modify your Einstein at Home account profile and preferences"
-msgstr "Peržiūrėkite ir keiskite savo Einstein at Home vartotojo abonemento aprašymą ir nustatymus"
+msgstr ""
+"Peržiūrėkite ir keiskite savo Einstein at Home vartotojo abonemento aprašymą ir "
+"nustatymus"
 
-#: clientgui/Localization.cpp:85
+#: Localization.cpp:85
 msgid "Account summary"
 msgstr "Vartotojo abonento apibendrinimas"
 
-#: clientgui/Localization.cpp:95
-msgid "View a listing of all the computers on which you are running Einstein at Home"
+#: Localization.cpp:95
+msgid ""
+"View a listing of all the computers on which you are running Einstein at Home"
 msgstr "Peržiūrėkite visų kompiuterių, kurie vykdo Einstein at Home, sąrašą"
 
-#: clientgui/Localization.cpp:101
+#: Localization.cpp:101
 msgid "LIGO project"
 msgstr "LIGO projektas"
 
-#: clientgui/Localization.cpp:103
-msgid "The home page of the Laser Interferometer Gravitational-wave Observatory (LIGO) project"
-msgstr "Laser Interferometer Gravitational-wave Observatory (LIGO) projekto tinklapis"
+#: Localization.cpp:103
+msgid ""
+"The home page of the Laser Interferometer Gravitational-wave Observatory "
+"(LIGO) project"
+msgstr ""
+"Laser Interferometer Gravitational-wave Observatory (LIGO) projekto "
+"tinklapis"
 
-#: clientgui/Localization.cpp:105
+#: Localization.cpp:105
 msgid "GEO-600 project"
 msgstr "GEO-600 projektas"
 
-#: clientgui/Localization.cpp:107
+#: Localization.cpp:107
 msgid "The home page of the GEO-600 project"
 msgstr "GEO-600 projekto tinklapis"
 
-#: clientgui/Localization.cpp:115
-#: clientgui/Localization.cpp:133
+#: Localization.cpp:115 Localization.cpp:133 ViewProjects.cpp:221
+#: ViewStatistics.cpp:465
 msgid "Team"
 msgstr "Komanda"
 
-#: clientgui/Localization.cpp:117
+#: Localization.cpp:117
 msgid "Info about your Team"
 msgstr "Informacija apie jūsų komandą"
 
-#: clientgui/Localization.cpp:123
+#: Localization.cpp:123
 msgid "Get help for climateprediction.net"
 msgstr "Pagalba climateprediction.net"
 
-#: clientgui/Localization.cpp:125
+#: Localization.cpp:125
 msgid "News"
 msgstr "Naujienos"
 
-#: clientgui/Localization.cpp:127
+#: Localization.cpp:127
 msgid "climateprediction.net News"
 msgstr "climateprediction.net naujienos"
 
-#: clientgui/Localization.cpp:131
+#: Localization.cpp:131
 msgid "View your account information, credits, and trickles"
 msgstr "Peržiūrėkite abonemento informaciją, kreditų sumas, atliktas užduotis"
 
-#: clientgui/Localization.cpp:135
+#: Localization.cpp:135
 msgid "Info about your team"
 msgstr "Informacija apie jūsų komandą"
 
-#: clientgui/Localization.cpp:141
+#: Localization.cpp:141
 msgid "Search for help in our help system"
 msgstr "Ieškokite pagalbos mūsų pagalbos sistemoje"
 
-#: clientgui/Localization.cpp:143
+#: Localization.cpp:143
 msgid "Global Statistics"
 msgstr "Globali statistika"
 
-#: clientgui/Localization.cpp:145
+#: Localization.cpp:145
 msgid "Summary statistics for World Community Grid"
 msgstr "Apibendrinta World Community Grid statistika"
 
-#: clientgui/Localization.cpp:147
+#: Localization.cpp:147
 msgid "My Grid"
 msgstr "Mano skaičiavimai"
 
-#: clientgui/Localization.cpp:149
+#: Localization.cpp:149
 msgid "Your statistics and settings"
 msgstr "Jūsų statistika ir nustatymai"
 
-#: clientgui/Localization.cpp:151
+#: Localization.cpp:151
 msgid "Device Profiles"
 msgstr "Kompiuterių grupės"
 
-#: clientgui/Localization.cpp:153
+#: Localization.cpp:153
 msgid "Update your device settings"
 msgstr "Keiskite kompiuterių nustatymus"
 
-#: clientgui/Localization.cpp:155
+#: Localization.cpp:155
 msgid "Research"
 msgstr "Tyrimai"
 
-#: clientgui/Localization.cpp:157
+#: Localization.cpp:157
 msgid "Learn about the projects hosted at World Community Grid"
 msgstr "Sužinokite daugiau apie World Community Grid projektus"
 
-#: clientgui/MainDocument.cpp:583
+#: MainDocument.cpp:583
 msgid "Starting client"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:591
+#: MainDocument.cpp:591
 #, fuzzy
 msgid "Connecting to client"
 msgstr "Iš naujo prisijungiama prie kliento."
 
-#: clientgui/MainDocument.cpp:1205
+#: MainDocument.cpp:1195
 msgid "Retrieving system state; please wait..."
 msgstr "Gaunama sistemos būklė; prašome palaukti..."
 
-#: clientgui/MainDocument.cpp:1826
+#: MainDocument.cpp:1816
 #, fuzzy
 msgid "Missing application"
 msgstr "Programa"
 
-#: clientgui/MainDocument.cpp:1827
-msgid "Please download and install the CoRD application from http://cord.sourceforge.net"
+#: MainDocument.cpp:1817
+msgid ""
+"Please download and install the CoRD application from http://cord."
+"sourceforge.net"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2442
+#: MainDocument.cpp:2432
 msgid "on batteries"
 msgstr "veikia iš baterijų"
 
-#: clientgui/MainDocument.cpp:2443
+#: MainDocument.cpp:2433
 msgid "computer is in use"
 msgstr "kompiuteris naudojamas"
 
-#: clientgui/MainDocument.cpp:2444
+#: MainDocument.cpp:2434
 msgid "user request"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2445
+#: MainDocument.cpp:2435
 msgid "time of day"
 msgstr "paros metas"
 
-#: clientgui/MainDocument.cpp:2446
+#: MainDocument.cpp:2436
 msgid "CPU benchmarks in progress"
 msgstr "Matuojamas procesoriaus greitis"
 
-#: clientgui/MainDocument.cpp:2447
+#: MainDocument.cpp:2437
 msgid "need disk space - check preferences"
 msgstr "reikalinga vieta diske - patikrinkite nustatymus"
 
-#: clientgui/MainDocument.cpp:2448
+#: MainDocument.cpp:2438
 msgid "computer is not in use"
 msgstr "kompiuteris nėra naudojamas"
 
-#: clientgui/MainDocument.cpp:2449
+#: MainDocument.cpp:2439
 msgid "starting up"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2450
+#: MainDocument.cpp:2440
 msgid "an exclusive app is running"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2451
+#: MainDocument.cpp:2441
 msgid "CPU is busy"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2452
+#: MainDocument.cpp:2442
 msgid "network bandwidth limit exceeded"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2453
+#: MainDocument.cpp:2443
 msgid "requested by operating system"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2455
+#: MainDocument.cpp:2445
 #, fuzzy
 msgid "unknown reason"
 msgstr "(Nežinoma)"
 
-#: clientgui/MainDocument.cpp:2477
+#: MainDocument.cpp:2467
 msgid "GPU missing, "
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2484
+#: MainDocument.cpp:2474
 msgid "New"
 msgstr "Nauja"
 
-#: clientgui/MainDocument.cpp:2488
+#: MainDocument.cpp:2478
 msgid "Download failed"
 msgstr "Parsiuntimas nepavyko"
 
-#: clientgui/MainDocument.cpp:2490
+#: MainDocument.cpp:2480
 msgid "Downloading"
 msgstr "Parsiunčiama"
 
-#: clientgui/MainDocument.cpp:2492
-#: clientgui/MainDocument.cpp:2557
+#: MainDocument.cpp:2482 MainDocument.cpp:2552
 msgid " (suspended - "
 msgstr " (sustabdyta - "
 
-#: clientgui/MainDocument.cpp:2500
+#: MainDocument.cpp:2490
 msgid "Project suspended by user"
 msgstr "Projektą sustabdė vartotojas"
 
-#: clientgui/MainDocument.cpp:2502
+#: MainDocument.cpp:2492
 msgid "Task suspended by user"
 msgstr "Sustabdė vartotojas"
 
-#: clientgui/MainDocument.cpp:2504
+#: MainDocument.cpp:2494
 msgid "Suspended - "
 msgstr "Sustabdyta - "
 
 # 75%
-#: clientgui/MainDocument.cpp:2510
+#: MainDocument.cpp:2500
 #, fuzzy
 msgid "GPU suspended - "
 msgstr " (sustabdyta - "
 
-#: clientgui/MainDocument.cpp:2517
+#: MainDocument.cpp:2507
 msgid "Waiting for memory"
 msgstr "Laukiama atminties"
 
-#: clientgui/MainDocument.cpp:2519
+#: MainDocument.cpp:2509
 msgid "Waiting for shared memory"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2521
+#: MainDocument.cpp:2512
+msgid "Running, high priority"
+msgstr ""
+
+#: MainDocument.cpp:2514
 msgid "Running"
 msgstr "Vykdoma"
 
-#: clientgui/MainDocument.cpp:2523
+#: MainDocument.cpp:2517
 msgid " (non-CPU-intensive)"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2526
+#: MainDocument.cpp:2520
 msgid "Waiting to run"
 msgstr "Paruoštas vykdymui"
 
-#: clientgui/MainDocument.cpp:2528
-#: clientgui/MainDocument.cpp:2534
+#: MainDocument.cpp:2522 MainDocument.cpp:2528
 msgid "Ready to start"
 msgstr "Paruoštas vykdymui"
 
-#: clientgui/MainDocument.cpp:2538
-msgid "Postponed: "
+#: MainDocument.cpp:2532
+msgid " (Scheduler wait: "
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2541
-msgid "Postponed"
+#: MainDocument.cpp:2536
+msgid " (Scheduler wait)"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2545
-msgid "Waiting for network access"
-msgstr ""
+#: MainDocument.cpp:2540
+#, fuzzy
+msgid " (Waiting for network access)"
+msgstr "Laukiama atminties"
 
-#: clientgui/MainDocument.cpp:2549
+#: MainDocument.cpp:2544
 msgid "Computation error"
 msgstr "Skaičiavimo klaida"
 
-#: clientgui/MainDocument.cpp:2553
+#: MainDocument.cpp:2548
 msgid "Upload failed"
 msgstr "Išsiuntimas nepavyko"
 
-#: clientgui/MainDocument.cpp:2555
+#: MainDocument.cpp:2550
 msgid "Uploading"
 msgstr "Išsiunčiama"
 
-#: clientgui/MainDocument.cpp:2566
+#: MainDocument.cpp:2561
 msgid "Aborted by user"
 msgstr "Atšaukė vartotojas"
 
-#: clientgui/MainDocument.cpp:2569
+#: MainDocument.cpp:2564
 msgid "Aborted by project"
 msgstr "Atšaukė projektas"
 
-#: clientgui/MainDocument.cpp:2572
+#: MainDocument.cpp:2567
 msgid "Aborted: not started by deadline"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2575
+#: MainDocument.cpp:2570
 msgid "Aborted: disk limit exceeded"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2578
+#: MainDocument.cpp:2573
 msgid "Aborted: run time limit exceeded"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2581
+#: MainDocument.cpp:2576
 msgid "Aborted: memory limit exceeded"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2584
+#: MainDocument.cpp:2579
 msgid "Aborted"
 msgstr "Nutrauktas"
 
-#: clientgui/MainDocument.cpp:2589
+#: MainDocument.cpp:2584
 msgid "Acknowledged"
 msgstr "Patvirtinta"
 
-#: clientgui/MainDocument.cpp:2591
+#: MainDocument.cpp:2586
 msgid "Ready to report"
 msgstr "Paruoštas perdavimui"
 
-#: clientgui/MainDocument.cpp:2593
+#: MainDocument.cpp:2588
 #, c-format
 msgid "Error: invalid state '%d'"
 msgstr "Klaida: neteisinga būsena \"%d\""
 
-#: clientgui/NoInternetConnectionPage.cpp:179
+#: NoInternetConnectionPage.cpp:179
 msgid "No Internet connection"
 msgstr "Nėra ryšio su internetu"
 
-#: clientgui/NoInternetConnectionPage.cpp:182
+#: NoInternetConnectionPage.cpp:182
 msgid "Please connect to the Internet and try again."
 msgstr "Prisijunkite prie interneto ir pabandykite dar kartą."
 
-#: clientgui/NotDetectedPage.cpp:181
+#: NotDetectedPage.cpp:181
 msgid "Project not found"
 msgstr "Projektas nerastas"
 
-#: clientgui/NotDetectedPage.cpp:184
+#: NotDetectedPage.cpp:184
 msgid ""
 "The URL you supplied is not that of a BOINC-based project.\n"
 "\n"
@@ -2533,11 +2495,11 @@ msgstr ""
 "\n"
 "Patikrinkite adresą ir pabandykite dar kartą."
 
-#: clientgui/NotDetectedPage.cpp:188
+#: NotDetectedPage.cpp:188
 msgid "Account manager not found"
 msgstr "Abonemento valdiklis nerastas"
 
-#: clientgui/NotDetectedPage.cpp:191
+#: NotDetectedPage.cpp:191
 msgid ""
 "The URL you supplied is not that of a BOINC-based account\n"
 "manager.\n"
@@ -2549,94 +2511,95 @@ msgstr ""
 "\n"
 "Patikrinkite adresą ir pabandykite dar kartą."
 
-#: clientgui/NotFoundPage.cpp:181
+#: NotFoundPage.cpp:181
 msgid "Login Failed."
 msgstr "Prisijungimas nepavyko."
 
-#: clientgui/NotFoundPage.cpp:185
+#: NotFoundPage.cpp:185
 msgid "Check the username and password, and try again."
 msgstr "Patikrinkite vartotojo vardą ir slaptažodį ir pabandykite dar kartą."
 
-#: clientgui/NotFoundPage.cpp:189
+#: NotFoundPage.cpp:189
 msgid "Check the email address and password, and try again."
 msgstr "Patikrinkite el. pašto adresą ir slaptažodį ir pabandykite dar kartą."
 
-#: clientgui/NoticeListCtrl.cpp:229
+#: NoticeListCtrl.cpp:222
 msgid "more..."
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:221
+#: ProjectInfoPage.cpp:477 ProjectInfoPage.cpp:778 ProjectInfoPage.cpp:782
+msgid "All"
+msgstr ""
+
+#: ProjectInfoPage.cpp:615
 msgid "Choose a project"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:228
+#: ProjectInfoPage.cpp:619
 msgid "To choose a project, click its name or type its URL below."
-msgstr "Kad pasirinktumėte projektą, spragtelėkite jo vardą arba žemiau įveskite jo tinklapio adresą."
+msgstr ""
+"Kad pasirinktumėte projektą, spragtelėkite jo vardą arba žemiau įveskite jo "
+"tinklapio adresą."
 
-#: clientgui/ProjectInfoPage.cpp:246
+#: ProjectInfoPage.cpp:623
 msgid "Categories:"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:267
+#: ProjectInfoPage.cpp:627 sg_ProjectPanel.cpp:89
 #, fuzzy
 msgid "Projects:"
 msgstr "Projektai"
 
-#: clientgui/ProjectInfoPage.cpp:279
+#: ProjectInfoPage.cpp:631
 msgid "Project details"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:291
+#: ProjectInfoPage.cpp:635
 msgid "Research area:"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:302
+#: ProjectInfoPage.cpp:639
 msgid "Organization:"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:313
+#: ProjectInfoPage.cpp:643
 #, fuzzy
 msgid "Web site:"
 msgstr "Tinklapiai"
 
-#: clientgui/ProjectInfoPage.cpp:325
+#: ProjectInfoPage.cpp:647
 msgid "Supported systems:"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:363
+#: ProjectInfoPage.cpp:651
 #, fuzzy
 msgid "Project URL:"
 msgstr "Projekto tinklapis:"
 
-#: clientgui/ProjectInfoPage.cpp:499
-#: clientgui/ProjectInfoPage.cpp:754
-#: clientgui/ProjectInfoPage.cpp:758
-msgid "All"
-msgstr ""
-
-#: clientgui/ProjectInfoPage.cpp:802
-msgid "This project may not have work for your type of computer.  Do you want to add it anyway?"
+#: ProjectInfoPage.cpp:826
+msgid ""
+"This project may not have work for your type of computer.  Do you want to "
+"add it anyway?"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:826
+#: ProjectInfoPage.cpp:850
 msgid "You already added this project. Please choose a different project."
 msgstr ""
 
-#: clientgui/ProjectProcessingPage.cpp:321
+#: ProjectProcessingPage.cpp:321
 #, fuzzy
 msgid "Communicating with project."
 msgstr "Jungiamasi prie serverio."
 
-#: clientgui/ProjectProcessingPage.cpp:510
+#: ProjectProcessingPage.cpp:509
 msgid "Required files not found on the server."
 msgstr ""
 
-#: clientgui/ProjectProcessingPage.cpp:513
-#: clientgui/ProjectProcessingPage.cpp:586
+#: ProjectProcessingPage.cpp:512 ProjectProcessingPage.cpp:574
 msgid "An internal server error has occurred."
 msgstr "Vidinė serverio klaida."
 
-#: clientgui/ProjectPropertiesPage.cpp:334
+#: ProjectPropertiesPage.cpp:334
 msgid ""
 "Communicating with project\n"
 "Please wait..."
@@ -2644,48 +2607,11 @@ msgstr ""
 "Jungiamasi su projektu\n"
 "Prašome palaukti..."
 
-#: clientgui/ProjectWelcomePage.cpp:251
-#, c-format
-msgid "Welcome to %s."
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:254
-msgid "You have volunteered to compute for this project:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:255
-msgid "Name:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:258
-msgid "Home:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:262
-msgid "Description:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:265
-msgid "URL:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:268
-msgid "User:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:273
-msgid "WARNING: This project is not registered with BOINC.  Make sure you trust it before continuing."
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:277
-msgid "To continue, click Next."
-msgstr "Norėdami tęsti, spauskite Toliau."
-
-#: clientgui/ProxyInfoPage.cpp:195
+#: ProxyInfoPage.cpp:195
 msgid "Network communication failure"
 msgstr "Tinklo klaida"
 
-#: clientgui/ProxyInfoPage.cpp:199
+#: ProxyInfoPage.cpp:199
 #, fuzzy
 msgid ""
 "The World Community Grid - BOINC software failed to communicate\n"
@@ -2715,7 +2641,7 @@ msgstr ""
 "3) Jūs naudojate tarpinį serverį. Spauskite \"Pirmyn\", kad\n"
 "nustatytumėte BOINC tarpinio serverio nustatymus."
 
-#: clientgui/ProxyInfoPage.cpp:203
+#: ProxyInfoPage.cpp:203
 msgid ""
 "BOINC failed to communicate on the Internet.\n"
 "The most likely reasons are:\n"
@@ -2744,1361 +2670,1324 @@ msgstr ""
 "3) Jūs naudojate tarpinį serverį. Spauskite \"Pirmyn\", kad\n"
 "nustatytumėte BOINC tarpinio serverio nustatymus."
 
-#: clientgui/ProxyPage.cpp:331
+#: ProxyPage.cpp:331
 msgid "Proxy configuration"
 msgstr "Tarpinio serverio nustatymai"
 
-#: clientgui/ProxyPage.cpp:334
+#: ProxyPage.cpp:334
 msgid "HTTP proxy"
 msgstr "HTTP tarpinis serveris"
 
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
+#: ProxyPage.cpp:337 ProxyPage.cpp:357
 msgid "Server:"
 msgstr "Serveris:"
 
-#: clientgui/ProxyPage.cpp:350
+#: ProxyPage.cpp:350
 msgid "Autodetect"
 msgstr "Automatinis aptikimas"
 
-#: clientgui/ProxyPage.cpp:354
+#: ProxyPage.cpp:354
 msgid "SOCKS proxy"
 msgstr "SOCKS tarpinis serveris"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:167
-msgid "Advanced View...\tCtrl+Shift+A"
+#: TermsOfUsePage.cpp:218
+msgid "Terms of Use"
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:168
-#, fuzzy
-msgid "Display the advanced graphical interface."
-msgstr "Rodyti supaprastintą vartotojo sąsają."
+#: TermsOfUsePage.cpp:222
+msgid "Please read the following terms of use:"
+msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:175
-msgid "Skin"
+#: TermsOfUsePage.cpp:231
+msgid "I agree to the terms of use."
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:177
-msgid "Select the appearance of the user interface."
+#: TermsOfUsePage.cpp:237
+msgid "I do not agree to the terms of use."
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:224
-#, c-format
-msgid "&%s"
-msgstr "%s"
+#: UnavailablePage.cpp:183
+msgid "Project temporarily unavailable"
+msgstr "Projektas laikinai nepasiekiamas"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:405
-#, fuzzy
-msgid "Default"
-msgstr "&Nustatyti numatytus nustatymus"
+#: UnavailablePage.cpp:186
+msgid ""
+"The project is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr ""
+"Projektas laikinai nepasiekiamas.\n"
+"\n"
+"Prašome pabandyti vėliau."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:848
-msgid "Suspend"
-msgstr "Sustabdyti"
+#: UnavailablePage.cpp:190
+msgid "Account manager temporarily unavailable"
+msgstr "Abonemento valdiklis laikinai nepasiekiamas"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:850
-msgid "Suspend Computing"
+#: UnavailablePage.cpp:193
+msgid ""
+"The account manager is temporarily unavailable.\n"
+"\n"
+"Please try again later."
 msgstr ""
+"Abonemento valdiklis laikinai nepasiekiamas.\n"
+"\n"
+"Prašome pabandyti vėliau."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:851
-msgid "Resume Computing"
-msgstr ""
+#: ValidateAccountKey.cpp:68
+msgid "Please specify an account key to continue."
+msgstr "Nurodykite abonemento raktą."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:867
-msgid "Notices"
-msgstr ""
+#: ValidateAccountKey.cpp:71
+msgid "Invalid Account Key; please enter a valid Account Key"
+msgstr "Neteisingas abonemento raktas; įveskite teisingą abonemento raktą"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:868
-msgid "Open a window to view notices from projects or BOINC"
-msgstr ""
+#: ValidateAccountKey.cpp:82 ValidateEmailAddress.cpp:86
+msgid "Validation conflict"
+msgstr "Tikrinimo klaida"
 
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
-msgstr ""
+#: ValidateEmailAddress.cpp:72
+msgid "Please specify an email address"
+msgstr "Įveskite elektroninio pašto adresą"
 
-#: clientgui/sg_DlgMessages.cpp:132
-msgid "There are no notices at this time."
-msgstr ""
+#: ValidateEmailAddress.cpp:75
+msgid "Invalid email address; please enter a valid email address"
+msgstr "Neteisingas el. pašto adresas; įveskite teisingą el. pašto adresą"
 
-#: clientgui/sg_DlgMessages.cpp:146
-msgid "Close"
-msgstr "Uždaryti"
+#: ValidateURL.cpp:69
+msgid "Missing URL"
+msgstr "Neįvestas tinklapis"
 
-#: clientgui/sg_DlgMessages.cpp:394
-#, c-format
-msgid "%s - Notices"
+#: ValidateURL.cpp:70
+msgid ""
+"Please specify a URL.\n"
+"For example:\n"
+"http://www.example.com/"
 msgstr ""
+"Nurodykite tinklapį, pavyzdžiui:\n"
+"http://www.example.com/"
 
-#: clientgui/sg_DlgPreferences.cpp:270
-msgid "This dialog controls preferences for this computer only."
-msgstr ""
+#: ValidateURL.cpp:83 ValidateURL.cpp:87 ValidateURL.cpp:91
+#: ValidateURL.cpp:103 ValidateURL.cpp:107 ValidateURL.cpp:110
+msgid "Invalid URL"
+msgstr "Neteisingas tinklapis"
 
-#: clientgui/sg_DlgPreferences.cpp:275
-msgid "Click OK to set preferences."
+#: ValidateURL.cpp:84 ValidateURL.cpp:88 ValidateURL.cpp:92
+msgid ""
+"Please specify a valid URL.\n"
+"For example:\n"
+"http://boincproject.example.com"
 msgstr ""
+"Nurodykite galiojantį tinklapį, pavyzdžiui:\n"
+"http://boincproject.example.com"
 
-#: clientgui/sg_DlgPreferences.cpp:280
-msgid "Click Clear to restore web-based settings for all preferences listed below."
-msgstr ""
+#: ValidateURL.cpp:104 ValidateURL.cpp:108
+#, c-format
+msgid "'%s' does not contain a valid host name."
+msgstr "\"%s\" nėra teisingas kompiuterio pavadinimas."
 
-#: clientgui/sg_DlgPreferences.cpp:287
-msgid "For additional settings, select Computing Preferences in the Advanced View."
-msgstr ""
+#: ValidateURL.cpp:111
+#, c-format
+msgid "'%s' does not contain a valid path."
+msgstr "\"%s\" nėra teisingai nurodytas kelias."
 
-#: clientgui/sg_DlgPreferences.cpp:315
-msgid "Do work only between:"
-msgstr "Vykdyti užduotis tik tarp:"
+#: ViewMessages.cpp:84 ViewProjects.cpp:170 ViewStatistics.cpp:1978
+#: ViewTransfers.cpp:160 ViewWork.cpp:183
+msgid "Commands"
+msgstr "Komandos"
 
-#: clientgui/sg_DlgPreferences.cpp:337
-msgid "Connect to internet only between:"
-msgstr "Jungtis prie interneto tik tarp:"
+#: ViewMessages.cpp:88
+msgid "Copy all messages"
+msgstr "Kopijuoti visus pranešimus"
 
-#: clientgui/sg_DlgPreferences.cpp:359
-#: clientgui/sg_DlgPreferences.cpp:376
-msgid "Use no more than:"
+#: ViewMessages.cpp:95
+msgid "Copy selected messages"
+msgstr "Kopijuoti pasirinktus pranešimus"
+
+#: ViewMessages.cpp:106 ViewMessages.cpp:502
+msgid "Show only this project"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:372
-msgid "of disk space"
-msgstr "disko vietos"
+#: ViewMessages.cpp:107 ViewMessages.cpp:503
+msgid "Show only the messages for the selected project."
+msgstr "Rodyti tik pasirinkto projekto žinutes."
 
-#: clientgui/sg_DlgPreferences.cpp:389
-msgid "of the processor"
-msgstr "procesoriaus"
+#: ViewMessages.cpp:164
+msgid "Messages"
+msgstr "Pranešimai"
 
-#: clientgui/sg_DlgPreferences.cpp:393
-msgid "Do work while on battery?"
-msgstr ""
+#: ViewMessages.cpp:187
+msgid "Copying all messages to the clipboard..."
+msgstr "Visi pranešimai kopijuojami į atmintį..."
 
-#: clientgui/sg_DlgPreferences.cpp:406
-msgid "Do work after idle for:"
-msgstr ""
+#: ViewMessages.cpp:223
+msgid "Copying selected messages to the clipboard..."
+msgstr "Pasirinkti pranešimai kopijuojami į atmintį..."
 
-#: clientgui/sg_DlgPreferences.cpp:431
-msgid "Clear all local preferences listed above and close the dialog"
+#: ViewMessages.cpp:286
+msgid "Filtering messages..."
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:609
-#: clientgui/sg_DlgPreferences.cpp:612
-#: clientgui/sg_DlgPreferences.cpp:688
-#: clientgui/sg_DlgPreferences.cpp:692
-#: clientgui/sg_DlgPreferences.cpp:704
-#: clientgui/sg_DlgPreferences.cpp:708
-#: clientgui/sg_DlgPreferences.cpp:851
-#: clientgui/sg_DlgPreferences.cpp:862
-msgid "Anytime"
-msgstr ""
+#: ViewMessages.cpp:494
+msgid "Show all messages"
+msgstr "Rodyti visus pranešimus"
 
-#: clientgui/sg_DlgPreferences.cpp:645
-msgid "100 MB"
-msgstr "100 MB"
+#: ViewMessages.cpp:495
+msgid "Show messages for all projects."
+msgstr "Rodyti visų projektų žinutes."
 
-#: clientgui/sg_DlgPreferences.cpp:646
-msgid "200 MB"
-msgstr "200 MB"
+#: ViewNotices.cpp:58 sg_DlgMessages.cpp:124
+msgid "Fetching notices; please wait..."
+msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:647
-msgid "500 MB"
+#: ViewNotices.cpp:65 sg_DlgMessages.cpp:132
+msgid "There are no notices at this time."
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:648
-msgid "1 GB"
+#: ViewNotices.cpp:99 sg_BoincSimpleFrame.cpp:776
+msgid "Notices"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:649
-msgid "2 GB"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:650
-msgid "5 GB"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:651
-msgid "10 GB"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:652
-msgid "20 GB"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:653
-msgid "50 GB"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:654
-msgid "100 GB"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:724
-#, c-format
-msgid "%d MB"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:726
-#, c-format
-msgid "%4.2f GB"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:767
-#, c-format
-msgid "%d%%"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:803
-msgid "0 (Run Always)"
-msgstr "0 (veikti visada)"
-
-#: clientgui/sg_DlgPreferences.cpp:806
-#, c-format
-msgid "%d"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:953
-#, c-format
-msgid "%s - Computing Preferences"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:1033
-#, fuzzy
-msgid "Do you really want to clear all local preferences?\n"
-msgstr "Ar norite pašalinti visus vietinius nustatymus?"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:66
-#: clientgui/ViewProjects.cpp:179
+#: ViewProjects.cpp:174 sg_ProjectCommandPopup.cpp:61
 msgid "Update"
 msgstr "Atnaujinti"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:67
-#: clientgui/ViewProjects.cpp:180
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
-msgstr "Pranešti apie atliktą darbą, gauti duomenis apie kreditą, naujausius nustatymus ir galbūt daugiau darbo."
+#: ViewProjects.cpp:175 sg_ProjectCommandPopup.cpp:62
+msgid ""
+"Report all completed tasks, get latest credit, get latest preferences, and "
+"possibly get more tasks."
+msgstr ""
+"Pranešti apie atliktą darbą, gauti duomenis apie kreditą, naujausius "
+"nustatymus ir galbūt daugiau darbo."
+
+#: 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
+msgid "Suspend"
+msgstr "Sustabdyti"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:73
-#: clientgui/sg_ProjectCommandPopup.cpp:129
-#: clientgui/ViewProjects.cpp:187
-#: clientgui/ViewProjects.cpp:727
+#: ViewProjects.cpp:182 ViewProjects.cpp:722 sg_ProjectCommandPopup.cpp:68
+#: sg_ProjectCommandPopup.cpp:114
 msgid "Suspend tasks for this project."
 msgstr "Sustabdyti šio projekto darbus."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:78
-#: clientgui/sg_ProjectCommandPopup.cpp:136
-#: clientgui/ViewProjects.cpp:193
-#: clientgui/ViewProjects.cpp:746
+#: ViewProjects.cpp:188 ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:73
+#: sg_ProjectCommandPopup.cpp:121
 msgid "No new tasks"
 msgstr "Negauti naujo darbo"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:79
-#: clientgui/ViewProjects.cpp:194
+#: ViewProjects.cpp:189 sg_ProjectCommandPopup.cpp:74
 msgid "Don't get new tasks for this project."
 msgstr "Negauti naujo darbo šiam projektui."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:200
+#: ViewProjects.cpp:195 sg_ProjectCommandPopup.cpp:79
 msgid "Reset project"
 msgstr "Perkrauti projektą"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:85
-#: clientgui/ViewProjects.cpp:201
-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 "Ištrinti visas projekto bylas ir gauti naujo darbo. Priš tai galite atnaujinti projekto duomenis ir nusiųsti atliktą darbą."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:91
-#: clientgui/ViewProjects.cpp:208
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
-msgstr "Pašalinti šį projektą. Visos atliekamos užduotys bus prarastos (spauskite \"Atnaujinti\" tam, kad prieš tai būtų nusiųstos atliktos užduotys)."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:96
-#: clientgui/sg_TaskCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:214
-msgid "Properties"
-msgstr "Savybės"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:97
-#: clientgui/ViewProjects.cpp:215
-msgid "Show project details."
-msgstr ""
-
-#: clientgui/sg_ProjectCommandPopup.cpp:126
-#: clientgui/ViewProjects.cpp:723
-msgid "Resume tasks for this project."
-msgstr "Tęsti šio projekto darbą."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:133
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow new tasks"
-msgstr "Leisti naują darbą"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:134
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow fetching new tasks for this project."
-msgstr "Leisti projektui gauti naujo darbo."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:137
-#: clientgui/ViewProjects.cpp:746
-msgid "Don't fetch new tasks for this project."
-msgstr "Negauti naujo darbo iš šio projekto."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:229
-#: clientgui/ViewProjects.cpp:443
-#, c-format
-msgid "Are you sure you want to reset project '%s'?"
-msgstr "Ar tikrai norite perkrauti projektą \"%s\"?"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:235
-#: clientgui/ViewProjects.cpp:449
-msgid "Reset Project"
-msgstr "Perkrauti projektą"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:266
-#: clientgui/ViewProjects.cpp:501
-#, c-format
-msgid "Are you sure you want to remove project '%s'?"
-msgstr "Ar tikrai norite pašalinti projektą \"%s\"?"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:272
-#: clientgui/ViewProjects.cpp:507
-msgid "Remove Project"
-msgstr ""
-
-#: clientgui/sg_ProjectPanel.cpp:72
-#, fuzzy
-msgid "Add Project"
-msgstr "Prisijungti prie projekto"
-
-#: clientgui/sg_ProjectPanel.cpp:73
-msgid "Synchronize"
-msgstr ""
-
-#: clientgui/sg_ProjectPanel.cpp:74
-msgid "Work done for this project"
-msgstr ""
-
-#: clientgui/sg_ProjectPanel.cpp:77
-msgid "Synchronize projects with account manager system"
-msgstr "Sinchronizuoti projektus su abonento valdiklio sistema"
-
-#: clientgui/sg_ProjectPanel.cpp:124
-msgid "Select a project to access with the controls below"
-msgstr ""
-
-# 88%
-#: clientgui/sg_ProjectPanel.cpp:145
-#, fuzzy
-msgid "Project Web Pages"
-msgstr "Prisijungta prie projekto"
-
-#: 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 "Rodyti grafiką"
-
-#: clientgui/sg_TaskCommandPopup.cpp:67
-msgid "Show application graphics in a window."
-msgstr "Rodyti programos grafiką lange."
-
-#: clientgui/sg_TaskCommandPopup.cpp:73
-msgid "Suspend this task."
-msgstr ""
-
-#: clientgui/sg_TaskCommandPopup.cpp:78
-msgid "Abort"
-msgstr "Nutraukti"
-
-#: 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 "Tęsti šį skaičiavimo darbą."
-
-#: clientgui/sg_TaskCommandPopup.cpp:123
-msgid "Suspend work for this task."
-msgstr "Sustabdyti šį skaičiavimo darbą."
-
-#: 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 "Nutraukti užduotį"
-
-#: clientgui/sg_TaskPanel.cpp:468
-msgid "You don't have any projects.  Please Add a Project."
-msgstr "Jūs neprisijungęs prie nė vieno projekto. Prisijunkite."
-
-#: clientgui/sg_TaskPanel.cpp:469
-msgid "Not available"
-msgstr ""
-
-#: clientgui/sg_TaskPanel.cpp:480
-#, fuzzy
-msgid "Tasks:"
-msgstr "Užduotys"
-
-#: 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 "Programa: %s"
-
-#: 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 ""
-
-# 84%
-#: 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:1227
-msgid "Retrieving current status."
-msgstr "Gaunama dabartinė būsena."
-
-#: clientgui/sg_TaskPanel.cpp:1233
-msgid "Downloading work from the server."
-msgstr "Gaunamos užduotys iš serverio."
-
-#: clientgui/sg_TaskPanel.cpp:1238
-msgid "Processing Suspended:  Running On Batteries."
-msgstr "Skaičiavimai sustabdyti: veikiama iš baterijų."
-
-#: clientgui/sg_TaskPanel.cpp:1240
-msgid "Processing Suspended:  User Active."
-msgstr "Skaičiavimai sustabdyti: vartotojas aktyvus."
-
-#: clientgui/sg_TaskPanel.cpp:1242
-msgid "Processing Suspended:  User paused processing."
-msgstr "Skaičiavimai sustabdyti: sustabdė vartotojas."
-
-#: clientgui/sg_TaskPanel.cpp:1244
-msgid "Processing Suspended:  Time of Day."
-msgstr "Skaičiavimai sustabdyti: dienos laikas."
-
-#: clientgui/sg_TaskPanel.cpp:1246
-msgid "Processing Suspended:  Benchmarks Running."
-msgstr "Skaičiavimai sustabdyti: matuojamas greitis."
-
-#: clientgui/sg_TaskPanel.cpp:1248
-msgid "Processing Suspended."
-msgstr "Skaičiavimai sustabdyti."
-
-#: clientgui/sg_TaskPanel.cpp:1252
-msgid "Waiting to contact project servers."
-msgstr "Laukiama susijungimo su projekto serveriais."
-
-#: clientgui/sg_TaskPanel.cpp:1256
-#: clientgui/sg_TaskPanel.cpp:1265
-msgid "Retrieving current status"
-msgstr "Gaunama dabartinė būsena"
-
-#: clientgui/sg_TaskPanel.cpp:1260
-msgid "No work available to process"
-msgstr "Nėra vykdymui paruoštų užduočių"
-
-#: clientgui/sg_TaskPanel.cpp:1262
-msgid "Unable to connect to the core client"
-msgstr "Nepavyksta prisijungti prie kliento"
-
-#: 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 "Projektas laikinai nepasiekiamas"
-
-#: clientgui/UnavailablePage.cpp:186
-msgid ""
-"The project is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-"Projektas laikinai nepasiekiamas.\n"
-"\n"
-"Prašome pabandyti vėliau."
-
-#: clientgui/UnavailablePage.cpp:190
-msgid "Account manager temporarily unavailable"
-msgstr "Abonemento valdiklis laikinai nepasiekiamas"
-
-#: clientgui/UnavailablePage.cpp:193
+#: ViewProjects.cpp:196 sg_ProjectCommandPopup.cpp:80
 msgid ""
-"The account manager is temporarily unavailable.\n"
-"\n"
-"Please try again later."
+"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 ""
-"Abonemento valdiklis laikinai nepasiekiamas.\n"
-"\n"
-"Prašome pabandyti vėliau."
-
-#: clientgui/ValidateAccountKey.cpp:68
-msgid "Please specify an account key to continue."
-msgstr "Nurodykite abonemento raktą."
-
-#: clientgui/ValidateAccountKey.cpp:71
-msgid "Invalid Account Key; please enter a valid Account Key"
-msgstr "Neteisingas abonemento raktas; įveskite teisingą abonemento raktą"
-
-#: clientgui/ValidateAccountKey.cpp:82
-#: clientgui/ValidateEmailAddress.cpp:86
-msgid "Validation conflict"
-msgstr "Tikrinimo klaida"
+"Ištrinti visas projekto bylas ir gauti naujo darbo. Priš tai galite "
+"atnaujinti projekto duomenis ir nusiųsti atliktą darbą."
 
-#: clientgui/ValidateEmailAddress.cpp:72
-msgid "Please specify an email address"
-msgstr "Įveskite elektroninio pašto adresą"
-
-#: clientgui/ValidateEmailAddress.cpp:75
-msgid "Invalid email address; please enter a valid email address"
-msgstr "Neteisingas el. pašto adresas; įveskite teisingą el. pašto adresą"
-
-#: clientgui/ValidateURL.cpp:69
-msgid "Missing URL"
-msgstr "Neįvestas tinklapis"
-
-#: clientgui/ValidateURL.cpp:70
+#: ViewProjects.cpp:203 sg_ProjectCommandPopup.cpp:86
 msgid ""
-"Please specify a URL.\n"
-"For example:\n"
-"http://www.example.com/"
+"Remove this project.  Tasks in progress will be lost (use 'Update' first to "
+"report any completed tasks)."
 msgstr ""
-"Nurodykite tinklapį, pavyzdžiui:\n"
-"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 "Neteisingas tinklapis"
+"Pašalinti šį projektą. Visos atliekamos užduotys bus prarastos (spauskite "
+"\"Atnaujinti\" tam, kad prieš tai būtų nusiųstos atliktos užduotys)."
 
-#: 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 ""
-"Nurodykite galiojantį tinklapį, pavyzdžiui:\n"
-"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\" nėra teisingas kompiuterio pavadinimas."
-
-#: clientgui/ValidateURL.cpp:111
-#, c-format
-msgid "'%s' does not contain a valid path."
-msgstr "\"%s\" nėra teisingai nurodytas kelias."
-
-#: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:175
-msgid "Commands"
-msgstr "Komandos"
-
-#: clientgui/ViewMessages.cpp:88
-msgid "Copy all messages"
-msgstr "Kopijuoti visus pranešimus"
-
-#: clientgui/ViewMessages.cpp:95
-msgid "Copy selected messages"
-msgstr "Kopijuoti pasirinktus pranešimus"
-
-#: 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 "Rodyti tik pasirinkto projekto žinutes."
-
-#: clientgui/ViewMessages.cpp:164
-msgid "Messages"
-msgstr "Pranešimai"
-
-#: clientgui/ViewMessages.cpp:187
-msgid "Copying all messages to the clipboard..."
-msgstr "Visi pranešimai kopijuojami į atmintį..."
-
-#: clientgui/ViewMessages.cpp:223
-msgid "Copying selected messages to the clipboard..."
-msgstr "Pasirinkti pranešimai kopijuojami į atmintį..."
-
-#: clientgui/ViewMessages.cpp:286
-msgid "Filtering messages..."
-msgstr ""
-
-#: clientgui/ViewMessages.cpp:494
-msgid "Show all messages"
-msgstr "Rodyti visus pranešimus"
+#: ViewProjects.cpp:209 ViewWork.cpp:222 sg_ProjectCommandPopup.cpp:91
+#: sg_TaskCommandPopup.cpp:78
+msgid "Properties"
+msgstr "Savybės"
 
-#: clientgui/ViewMessages.cpp:495
-msgid "Show messages for all projects."
-msgstr "Rodyti visų projektų žinutes."
+#: ViewProjects.cpp:210 sg_ProjectCommandPopup.cpp:92
+msgid "Show project details."
+msgstr ""
 
-#: clientgui/ViewProjects.cpp:225
+#: ViewProjects.cpp:220 ViewStatistics.cpp:450
 msgid "Account"
 msgstr "Vartotojas"
 
-#: clientgui/ViewProjects.cpp:227
+#: ViewProjects.cpp:222
 msgid "Work done"
 msgstr "Atliktas darbas"
 
-#: clientgui/ViewProjects.cpp:228
+#: ViewProjects.cpp:223
 msgid "Avg. work done"
 msgstr "Vid. atliekamas darbas"
 
-#: clientgui/ViewProjects.cpp:230
+#: ViewProjects.cpp:225 ViewTransfers.cpp:188 ViewWork.cpp:234
 msgid "Status"
 msgstr "Būklė"
 
-#: clientgui/ViewProjects.cpp:255
+#: ViewProjects.cpp:250
 msgid "Projects"
 msgstr "Projektai"
 
-#: clientgui/ViewProjects.cpp:307
+#: ViewProjects.cpp:302
 msgid "Updating project..."
 msgstr "Atnaujinamas projektas..."
 
-#: clientgui/ViewProjects.cpp:349
+#: ViewProjects.cpp:344
 msgid "Resuming project..."
 msgstr "Pratęsiamas darbas su projektu..."
 
-#: clientgui/ViewProjects.cpp:353
+#: ViewProjects.cpp:348
 msgid "Suspending project..."
 msgstr "Stabdomas projektas..."
 
-#: clientgui/ViewProjects.cpp:390
+#: ViewProjects.cpp:385
 msgid "Telling project to allow additional task downloads..."
 msgstr "Leidžiama projektui parsisiųsti papildomo darbo..."
 
-#: clientgui/ViewProjects.cpp:394
+#: ViewProjects.cpp:389
 msgid "Telling project to not fetch any additional tasks..."
 msgstr "Liepiama projektui nesiųsti naujų užduočių..."
 
-#: clientgui/ViewProjects.cpp:430
+#: ViewProjects.cpp:425
 msgid "Resetting project..."
 msgstr "Perkraunamas projektas..."
 
-#: clientgui/ViewProjects.cpp:488
+#: ViewProjects.cpp:438 sg_ProjectCommandPopup.cpp:214
+#, c-format
+msgid "Are you sure you want to reset project '%s'?"
+msgstr "Ar tikrai norite perkrauti projektą \"%s\"?"
+
+#: ViewProjects.cpp:444 sg_ProjectCommandPopup.cpp:220
+msgid "Reset Project"
+msgstr "Perkrauti projektą"
+
+#: ViewProjects.cpp:483
 msgid "Removing project..."
 msgstr "Šalinamas projektas..."
 
-#: clientgui/ViewProjects.cpp:548
+#: ViewProjects.cpp:496 sg_ProjectCommandPopup.cpp:251
+#, c-format
+msgid "Are you sure you want to remove project '%s'?"
+msgstr "Ar tikrai norite pašalinti projektą \"%s\"?"
+
+#: ViewProjects.cpp:502 sg_ProjectCommandPopup.cpp:257
+msgid "Remove Project"
+msgstr ""
+
+#: ViewProjects.cpp:543 ViewWork.cpp:599
 msgid "Launching browser..."
 msgstr "Paleidžiama naršyklė..."
 
-#: clientgui/ViewProjects.cpp:1063
+#: ViewProjects.cpp:718 sg_ProjectCommandPopup.cpp:111
+msgid "Resume tasks for this project."
+msgstr "Tęsti šio projekto darbą."
+
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:118
+msgid "Allow new tasks"
+msgstr "Leisti naują darbą"
+
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:119
+msgid "Allow fetching new tasks for this project."
+msgstr "Leisti projektui gauti naujo darbo."
+
+#: ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:122
+msgid "Don't fetch new tasks for this project."
+msgstr "Negauti naujo darbo iš šio projekto."
+
+#: ViewProjects.cpp:1058
 #, fuzzy
 msgid "Requested by user"
 msgstr "Sustabdė vartotojas"
 
-#: clientgui/ViewProjects.cpp:1064
+#: ViewProjects.cpp:1059
 #, fuzzy
 msgid "To fetch work"
 msgstr "atlikti darbą"
 
-#: clientgui/ViewProjects.cpp:1065
+#: ViewProjects.cpp:1060
 msgid "To report completed tasks"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1066
+#: ViewProjects.cpp:1061
 msgid "To send trickle-up message"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1067
+#: ViewProjects.cpp:1062
 #, fuzzy
 msgid "Requested by account manager"
 msgstr "Prisijungti prie abonemento valdiklio"
 
-#: clientgui/ViewProjects.cpp:1068
+#: ViewProjects.cpp:1063
 #, fuzzy
 msgid "Project initialization"
 msgstr "Projektų pasirinkimas"
 
-#: clientgui/ViewProjects.cpp:1069
+#: ViewProjects.cpp:1064
 #, fuzzy
 msgid "Requested by project"
 msgstr "Atšaukė projektas"
 
-#: clientgui/ViewProjects.cpp:1070
+#: ViewProjects.cpp:1065
 #, fuzzy
 msgid "Unknown reason"
 msgstr "(Nežinoma)"
 
-#: clientgui/ViewProjects.cpp:1084
+#: ViewProjects.cpp:1079
 msgid "Suspended by user"
 msgstr "Sustabdė vartotojas"
 
-#: clientgui/ViewProjects.cpp:1087
+#: ViewProjects.cpp:1082
 msgid "Won't get new tasks"
 msgstr "Negaus naujo darbo"
 
-#: clientgui/ViewProjects.cpp:1090
+#: ViewProjects.cpp:1085
 msgid "Project ended - OK to remove"
 msgstr "Projektas pabaigtas - galima pašalinti"
 
-#: clientgui/ViewProjects.cpp:1093
+#: ViewProjects.cpp:1088
 msgid "Will remove when tasks done"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1096
+#: ViewProjects.cpp:1091
 msgid "Scheduler request pending"
 msgstr "Laukiama jungimosi prie projekto serverio"
 
-#: clientgui/ViewProjects.cpp:1102
+#: ViewProjects.cpp:1097
 msgid "Scheduler request in progress"
 msgstr "Jungiamasi prie projekto serverio"
 
-#: clientgui/ViewProjects.cpp:1105
+#: ViewProjects.cpp:1100
 msgid "Trickle up message pending"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1111
+#: ViewProjects.cpp:1106
 msgid "Communication deferred "
 msgstr "Jungimasis atidėtas "
 
-#: clientgui/ViewResources.cpp:62
+#: ViewResources.cpp:62
 msgid "Total disk usage"
 msgstr "Naudojama disko vieta"
 
-#: clientgui/ViewResources.cpp:83
+#: ViewResources.cpp:83
 msgid "Disk usage by BOINC projects"
 msgstr "BOINC projektų naudojama disko vieta"
 
-#: clientgui/ViewResources.cpp:116
+#: ViewResources.cpp:116
 msgid "Disk"
 msgstr "Diskas"
 
-#: clientgui/ViewResources.cpp:225
+#: ViewResources.cpp:249
 msgid "no projects: 0 bytes used"
 msgstr ""
 
-#: clientgui/ViewResources.cpp:262
+#: ViewResources.cpp:286
 msgid "used by BOINC: "
 msgstr "naudojama BOINC: "
 
-#: clientgui/ViewResources.cpp:272
+#: ViewResources.cpp:296
 msgid "free, available to BOINC: "
 msgstr ""
 
-#: clientgui/ViewResources.cpp:282
+#: ViewResources.cpp:306
 msgid "free, not available to BOINC: "
 msgstr ""
 
-#: clientgui/ViewResources.cpp:292
+#: ViewResources.cpp:316
 msgid "free: "
 msgstr ""
 
-#: clientgui/ViewResources.cpp:302
+#: ViewResources.cpp:326
 msgid "used by other programs: "
 msgstr "naudojama kitų programų: "
 
-#: clientgui/ViewStatistics.cpp:1181
+#: ViewStatistics.cpp:1205
 msgid "User Total"
 msgstr "Vartotojo suminiai rodikliai"
 
-#: clientgui/ViewStatistics.cpp:1182
+#: ViewStatistics.cpp:1206
 msgid "User Average"
 msgstr "Vartotojo vidurkiai"
 
-#: clientgui/ViewStatistics.cpp:1183
+#: ViewStatistics.cpp:1207
 msgid "Host Total"
 msgstr "Kompiuterio suminiai rodikliai"
 
-#: clientgui/ViewStatistics.cpp:1184
+#: ViewStatistics.cpp:1208
 msgid "Host Average"
 msgstr "Kompiuterio vidurkiai"
 
-#: clientgui/ViewStatistics.cpp:1331
+#: ViewStatistics.cpp:1355
 #, c-format
 msgid "Last update: %.0f days ago"
 msgstr "Paskutinis atnaujinimas: prieš %.0f dienų"
 
-#: clientgui/ViewStatistics.cpp:1956
+#: ViewStatistics.cpp:1982
 msgid "Show user total"
 msgstr "Vartotojo suminiai rodikliai"
 
-#: clientgui/ViewStatistics.cpp:1957
+#: ViewStatistics.cpp:1983
 msgid "Show total credit for user"
 msgstr "Rodyti bendrą vartotojo kreditų kiekį"
 
-#: clientgui/ViewStatistics.cpp:1963
+#: ViewStatistics.cpp:1989
 msgid "Show user average"
 msgstr "Vartotojo vidurkiai"
 
-#: clientgui/ViewStatistics.cpp:1964
+#: ViewStatistics.cpp:1990
 msgid "Show average credit for user"
 msgstr "Rodyti vidutinį vartotojo kreditų kiekį"
 
-#: clientgui/ViewStatistics.cpp:1970
+#: ViewStatistics.cpp:1996
 msgid "Show host total"
 msgstr "Kompiuterio suminiai rodikliai"
 
-#: clientgui/ViewStatistics.cpp:1971
+#: ViewStatistics.cpp:1997
 msgid "Show total credit for host"
 msgstr "Rodyti bendrą kompiuterio kreditų kiekį"
 
-#: clientgui/ViewStatistics.cpp:1977
+#: ViewStatistics.cpp:2003
 msgid "Show host average"
 msgstr "Kompiuterio vidurkiai"
 
-#: clientgui/ViewStatistics.cpp:1978
+#: ViewStatistics.cpp:2004
 msgid "Show average credit for host"
 msgstr "Rodyti vidutinį kompiuterio kreditų kiekį"
 
-#: clientgui/ViewStatistics.cpp:1987
+#: ViewStatistics.cpp:2013
 msgid "< &Previous project"
 msgstr "< &Ankstesnis projektas"
 
-#: clientgui/ViewStatistics.cpp:1988
+#: ViewStatistics.cpp:2014
 msgid "Show chart for previous project"
 msgstr "Rodyti ankstesnio projekto diagramą"
 
-#: clientgui/ViewStatistics.cpp:1993
+#: ViewStatistics.cpp:2019
 msgid "&Next project >"
 msgstr "&Kitas projektas >"
 
-#: clientgui/ViewStatistics.cpp:1994
-msgid "Show chart for next project"
-msgstr "Rodyti kito projekto diagramą"
+#: ViewStatistics.cpp:2020
+msgid "Show chart for next project"
+msgstr "Rodyti kito projekto diagramą"
+
+#: ViewStatistics.cpp:2026 ViewStatistics.cpp:2416
+msgid "Hide project list"
+msgstr ""
+
+#: ViewStatistics.cpp:2027 ViewStatistics.cpp:2416
+msgid "Use entire area for graphs"
+msgstr ""
+
+#: ViewStatistics.cpp:2032
+msgid "Mode view"
+msgstr "Peržiūros režimas"
+
+#: ViewStatistics.cpp:2036
+msgid "One project"
+msgstr "Vienas projektas"
+
+#: ViewStatistics.cpp:2037
+msgid "Show one chart with selected project"
+msgstr ""
+
+#: ViewStatistics.cpp:2043
+msgid "All projects (separate)"
+msgstr ""
+
+#: ViewStatistics.cpp:2044
+msgid "Show all projects, one chart per project"
+msgstr ""
+
+#: ViewStatistics.cpp:2050
+msgid "All projects (together)"
+msgstr ""
+
+#: ViewStatistics.cpp:2051
+msgid "Show one chart with all projects"
+msgstr ""
+
+#: ViewStatistics.cpp:2057
+#, fuzzy
+msgid "All projects (sum)"
+msgstr "Visi projektai(apibendrinta)"
+
+#: ViewStatistics.cpp:2058
+msgid "Show one chart with sum of projects"
+msgstr ""
+
+#: ViewStatistics.cpp:2079
+msgid "Statistics"
+msgstr "Statistika"
+
+#: 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
+msgid "Updating charts..."
+msgstr "Atnaujinami grafikai..."
+
+#: ViewStatistics.cpp:2420
+msgid "Show project list"
+msgstr ""
+
+#: ViewStatistics.cpp:2420
+msgid "Uses smaller area for graphs"
+msgstr ""
+
+#: ViewTransfers.cpp:164
+msgid "Retry Now"
+msgstr "Kartoti dabar"
+
+#: ViewTransfers.cpp:165
+msgid "Retry the file transfer now"
+msgstr ""
+
+#: ViewTransfers.cpp:171
+msgid "Abort Transfer"
+msgstr "Nutraukti perdavimą"
+
+#: ViewTransfers.cpp:172
+msgid "Abort this file transfer.  You won't get credit for the task."
+msgstr ""
+
+#: ViewTransfers.cpp:183
+msgid "File"
+msgstr "Byla"
+
+#: ViewTransfers.cpp:184 ViewWork.cpp:233
+msgid "Progress"
+msgstr "Progresas"
+
+#: ViewTransfers.cpp:185
+msgid "Size"
+msgstr "Dydis"
+
+#: ViewTransfers.cpp:186
+msgid "Elapsed Time"
+msgstr "Trukmė"
+
+#: ViewTransfers.cpp:187
+msgid "Speed"
+msgstr "Greitis"
+
+#: ViewTransfers.cpp:213
+msgid "Transfers"
+msgstr "Perdavimai"
+
+#: ViewTransfers.cpp:280
+msgid "Network activity is suspended - "
+msgstr "Veiksmai tinkle sustabdyti - "
+
+#: ViewTransfers.cpp:282
+msgid ""
+".\n"
+"You can enable it using the Activity menu."
+msgstr ""
+
+#: ViewTransfers.cpp:285
+msgid "BOINC"
+msgstr ""
+
+#: ViewTransfers.cpp:292
+msgid "Retrying transfer now..."
+msgstr "Bandoma perduoti dabar..."
+
+#: ViewTransfers.cpp:330
+msgid "Aborting transfer..."
+msgstr "Nutraukiamas perdavimas..."
+
+#: ViewTransfers.cpp:343
+#, 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 ""
+"Ar tikrai norite nutraukti šios bylos '%s' perdavimą?\n"
+"PASTABA: Perdavimo nutraukimas panaikins užduotį ir jūs\n"
+"negausite kredito už atliktą darbą."
+
+#: ViewTransfers.cpp:349
+msgid "Abort File Transfer"
+msgstr "Nutraukti bylos perdavimą"
+
+#: ViewTransfers.cpp:780
+msgid "Upload"
+msgstr ""
+
+#: ViewTransfers.cpp:780
+msgid "Download"
+msgstr ""
+
+#: ViewTransfers.cpp:784
+#, fuzzy
+msgid "retry in "
+msgstr "Bandymas po "
+
+#: ViewTransfers.cpp:786
+msgid "failed"
+msgstr ""
+
+#: ViewTransfers.cpp:789
+msgid "suspended"
+msgstr ""
+
+#: ViewTransfers.cpp:794
+msgid "active"
+msgstr ""
+
+#: ViewTransfers.cpp:796
+msgid "pending"
+msgstr ""
+
+#: ViewTransfers.cpp:803
+msgid " (project backoff: "
+msgstr ""
+
+#: ViewWork.cpp:187 ViewWork.cpp:777
+msgid "Show active tasks"
+msgstr ""
+
+#: ViewWork.cpp:188 ViewWork.cpp:778
+msgid "Show only active tasks."
+msgstr ""
+
+#: ViewWork.cpp:194 sg_TaskCommandPopup.cpp:60
+msgid "Show graphics"
+msgstr "Rodyti grafiką"
+
+#: ViewWork.cpp:195 sg_TaskCommandPopup.cpp:61
+msgid "Show application graphics in a window."
+msgstr "Rodyti programos grafiką lange."
+
+#: ViewWork.cpp:201
+#, fuzzy
+msgid "Show VM Console"
+msgstr "Kompiuterio suminiai rodikliai"
+
+#: ViewWork.cpp:202
+#, fuzzy
+msgid "Show VM Console in a window."
+msgstr "Rodyti programos grafiką lange."
+
+#: ViewWork.cpp:209
+msgid "Suspend work for this result."
+msgstr "Sustabdyti šį skaičiavimo darbą."
+
+#: ViewWork.cpp:215 sg_TaskCommandPopup.cpp:72
+msgid "Abort"
+msgstr "Nutraukti"
+
+#: ViewWork.cpp:216
+msgid "Abandon work on the result. You will get no credit for it."
+msgstr "Atsisakyti darbo. Jūs negausite jokio kredito."
+
+#: ViewWork.cpp:223 sg_TaskCommandPopup.cpp:79
+msgid "Show task details."
+msgstr ""
+
+#: ViewWork.cpp:235
+msgid "Elapsed"
+msgstr ""
+
+#: ViewWork.cpp:236
+#, fuzzy
+msgid "Remaining (estimated)"
+msgstr "Likęs laikas"
+
+#: ViewWork.cpp:237
+#, fuzzy
+msgid "Deadline"
+msgstr "Atlikti iki"
+
+#: ViewWork.cpp:264
+msgid "Tasks"
+msgstr "Užduotys"
+
+#: ViewWork.cpp:357
+msgid "Resuming task..."
+msgstr "Tęsiamas darbas..."
+
+#: ViewWork.cpp:360
+msgid "Suspending task..."
+msgstr "Stabdomas darbas..."
+
+#: ViewWork.cpp:389
+msgid "Showing graphics for task..."
+msgstr "Rodoma grafika šiam darbui..."
+
+#: ViewWork.cpp:426
+#, fuzzy
+msgid "Showing VM console for task..."
+msgstr "Rodoma grafika šiam darbui..."
+
+#: ViewWork.cpp:479
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %s, Status: %s)"
+msgstr ""
+"Ar tikrai norite nutraukti šią užduotį '%s'?\n"
+"(Pažanga: %s, Būklė: %s)"
+
+#: ViewWork.cpp:485
+#, c-format
+msgid "Are you sure you want to abort these %d tasks?"
+msgstr ""
+
+#: ViewWork.cpp:490 sg_TaskCommandPopup.cpp:256
+msgid "Abort task"
+msgstr "Nutraukti užduotį"
+
+# 75%
+#: ViewWork.cpp:499
+#, fuzzy
+msgid "Aborting task..."
+msgstr "Nutraukiamas perdavimas..."
+
+#: ViewWork.cpp:771
+msgid "Show all tasks"
+msgstr ""
+
+#: ViewWork.cpp:772
+msgid "Show all tasks."
+msgstr ""
+
+#: ViewWork.cpp:796 sg_TaskCommandPopup.cpp:103
+msgid "Resume work for this task."
+msgstr "Tęsti šį skaičiavimo darbą."
+
+#: ViewWork.cpp:802 sg_TaskCommandPopup.cpp:107
+msgid "Suspend work for this task."
+msgstr "Sustabdyti šį skaičiavimo darbą."
+
+#: WelcomePage.cpp:284
+msgid "Add project or account manager"
+msgstr "Prisijungti prie projekto ar abonemento valdiklio"
 
-#: clientgui/ViewStatistics.cpp:2000
-#: clientgui/ViewStatistics.cpp:2390
-msgid "Hide project list"
+#: WelcomePage.cpp:288
+msgid "Add project or use BOINC Account Manager"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2001
-#: clientgui/ViewStatistics.cpp:2390
-msgid "Use entire area for graphs"
+#: 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 ""
 
-#: clientgui/ViewStatistics.cpp:2006
-msgid "Mode view"
-msgstr "Peržiūros režimas"
-
-#: clientgui/ViewStatistics.cpp:2010
-msgid "One project"
-msgstr "Vienas projektas"
+#: 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 ""
 
-#: clientgui/ViewStatistics.cpp:2011
-msgid "Show one chart with selected project"
+#: 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 ""
 
-#: clientgui/ViewStatistics.cpp:2017
-msgid "All projects (separate)"
+#: WelcomePage.cpp:339
+msgid "Use a BOINC Account Manager"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2018
-msgid "Show all projects, one chart per project"
+#: WelcomePage.cpp:352
+msgid "To continue, click Next."
+msgstr "Norėdami tęsti, spauskite Toliau."
+
+#: WelcomePage.cpp:358
+msgid "Add or change your World Community Grid projects"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2024
-msgid "All projects (together)"
+#: WelcomePage.cpp:361
+msgid "Add projects run by other researchers or organizations"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2025
-msgid "Show one chart with all projects"
+#: WizardAttach.cpp:634
+msgid "Do you really want to cancel?"
+msgstr "Ar norite atšaukti?"
+
+#: WizardAttach.cpp:635
+msgid "Question"
+msgstr "Klausimas"
+
+#: sg_BoincSimpleFrame.cpp:149
+msgid "Advanced View...\tCtrl+Shift+A"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2031
+#: sg_BoincSimpleFrame.cpp:150
 #, fuzzy
-msgid "All projects (sum)"
-msgstr "Visi projektai(apibendrinta)"
+msgid "Display the advanced graphical interface."
+msgstr "Rodyti supaprastintą vartotojo sąsają."
 
-#: clientgui/ViewStatistics.cpp:2032
-msgid "Show one chart with sum of projects"
+#: sg_BoincSimpleFrame.cpp:157
+msgid "Skin"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2053
-msgid "Statistics"
-msgstr "Statistika"
+#: sg_BoincSimpleFrame.cpp:159
+msgid "Select the appearance of the user interface."
+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 "Atnaujinami grafikai..."
+#: sg_BoincSimpleFrame.cpp:206
+#, c-format
+msgid "&%s"
+msgstr "%s"
 
-#: clientgui/ViewStatistics.cpp:2394
-msgid "Show project list"
+#: sg_BoincSimpleFrame.cpp:390
+#, fuzzy
+msgid "Default"
+msgstr "&Nustatyti numatytus nustatymus"
+
+#: sg_BoincSimpleFrame.cpp:759
+msgid "Suspend Computing"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2394
-msgid "Uses smaller area for graphs"
+#: sg_BoincSimpleFrame.cpp:760
+msgid "Resume Computing"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:169
-msgid "Retry Now"
-msgstr "Kartoti dabar"
+#: sg_BoincSimpleFrame.cpp:777
+msgid "Open a window to view notices from projects or BOINC"
+msgstr ""
 
-#: clientgui/ViewTransfers.cpp:170
-msgid "Retry the file transfer now"
+#: sg_DlgMessages.cpp:146
+msgid "Close"
+msgstr "Uždaryti"
+
+#: sg_DlgMessages.cpp:389
+#, c-format
+msgid "%s - Notices"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:176
-msgid "Abort Transfer"
-msgstr "Nutraukti perdavimą"
+#: sg_DlgPreferences.cpp:268
+msgid "This dialog controls preferences for this computer only."
+msgstr ""
 
-#: clientgui/ViewTransfers.cpp:177
-msgid "Abort this file transfer.  You won't get credit for the task."
+#: sg_DlgPreferences.cpp:273
+msgid "Click OK to set preferences."
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:188
-msgid "File"
-msgstr "Byla"
+#: sg_DlgPreferences.cpp:278
+msgid ""
+"Click Clear to restore web-based settings for all preferences listed below."
+msgstr ""
 
-#: clientgui/ViewTransfers.cpp:189
-#: clientgui/ViewWork.cpp:238
-msgid "Progress"
-msgstr "Progresas"
+#: sg_DlgPreferences.cpp:285
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
+msgstr ""
 
-#: clientgui/ViewTransfers.cpp:190
-msgid "Size"
-msgstr "Dydis"
+#: sg_DlgPreferences.cpp:313
+msgid "Do work only between:"
+msgstr "Vykdyti užduotis tik tarp:"
 
-#: clientgui/ViewTransfers.cpp:191
-msgid "Elapsed Time"
-msgstr "Trukmė"
+#: sg_DlgPreferences.cpp:335
+msgid "Connect to internet only between:"
+msgstr "Jungtis prie interneto tik tarp:"
 
-#: clientgui/ViewTransfers.cpp:192
-msgid "Speed"
-msgstr "Greitis"
+#: sg_DlgPreferences.cpp:357 sg_DlgPreferences.cpp:374
+msgid "Use no more than:"
+msgstr ""
 
-#: clientgui/ViewTransfers.cpp:218
-msgid "Transfers"
-msgstr "Perdavimai"
+#: sg_DlgPreferences.cpp:370
+msgid "of disk space"
+msgstr "disko vietos"
 
-#: clientgui/ViewTransfers.cpp:285
-msgid "Network activity is suspended - "
-msgstr "Veiksmai tinkle sustabdyti - "
+#: sg_DlgPreferences.cpp:387
+msgid "of the processor"
+msgstr "procesoriaus"
 
-#: clientgui/ViewTransfers.cpp:287
-msgid ""
-".\n"
-"You can enable it using the Activity menu."
+#: sg_DlgPreferences.cpp:391
+msgid "Do work while on battery?"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:290
-msgid "BOINC"
+#: sg_DlgPreferences.cpp:404
+msgid "Do work after idle for:"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:297
-msgid "Retrying transfer now..."
-msgstr "Bandoma perduoti dabar..."
-
-#: clientgui/ViewTransfers.cpp:335
-msgid "Aborting transfer..."
-msgstr "Nutraukiamas perdavimas..."
+#: sg_DlgPreferences.cpp:429
+#, fuzzy
+msgid "Clear all local preferences listed above and close the dialog"
+msgstr "išvalyti vietinius nustatymus ir uždaryti šį langą"
 
-#: clientgui/ViewTransfers.cpp:348
-#, 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."
+#: 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 ""
-"Ar tikrai norite nutraukti šios bylos '%s' perdavimą?\n"
-"PASTABA: Perdavimo nutraukimas panaikins užduotį ir jūs\n"
-"negausite kredito už atliktą darbą."
 
-#: clientgui/ViewTransfers.cpp:354
-msgid "Abort File Transfer"
-msgstr "Nutraukti bylos perdavimą"
+#: sg_DlgPreferences.cpp:638
+msgid "100 MB"
+msgstr "100 MB"
 
-#: clientgui/ViewTransfers.cpp:785
-msgid "Upload"
+#: sg_DlgPreferences.cpp:639
+msgid "200 MB"
+msgstr "200 MB"
+
+#: sg_DlgPreferences.cpp:640
+#, fuzzy
+msgid "500 MB"
+msgstr "100 MB"
+
+#: sg_DlgPreferences.cpp:641
+msgid "1 GB"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:785
-msgid "Download"
+#: sg_DlgPreferences.cpp:642
+msgid "2 GB"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:789
-#, fuzzy
-msgid "retry in "
-msgstr "Bandymas po "
+#: sg_DlgPreferences.cpp:643
+msgid "5 GB"
+msgstr ""
 
-#: clientgui/ViewTransfers.cpp:791
-msgid "failed"
+#: sg_DlgPreferences.cpp:644
+msgid "10 GB"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:794
-msgid "suspended"
+#: sg_DlgPreferences.cpp:645
+msgid "20 GB"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:799
-msgid "active"
+#: sg_DlgPreferences.cpp:646
+msgid "50 GB"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:801
-msgid "pending"
+#: sg_DlgPreferences.cpp:647
+#, fuzzy
+msgid "100 GB"
+msgstr "100 MB"
+
+#: sg_DlgPreferences.cpp:717
+#, c-format
+msgid "%d MB"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:808
-msgid " (project backoff: "
+#: sg_DlgPreferences.cpp:719
+#, c-format
+msgid "%4.2f GB"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:192
-#: clientgui/ViewWork.cpp:782
-msgid "Show active tasks"
+#: sg_DlgPreferences.cpp:760
+#, c-format
+msgid "%d%%"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:193
-#: clientgui/ViewWork.cpp:783
-msgid "Show only active tasks."
+#: sg_DlgPreferences.cpp:796
+msgid "0 (Run Always)"
+msgstr "0 (veikti visada)"
+
+#: sg_DlgPreferences.cpp:799
+#, c-format
+msgid "%d"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:206
+#: sg_DlgPreferences.cpp:1029
 #, fuzzy
-msgid "Show VM Console"
-msgstr "Kompiuterio suminiai rodikliai"
+msgid "Do you really want to clear all local preferences?\n"
+msgstr "Ar norite pašalinti visus vietinius nustatymus?"
 
-#: clientgui/ViewWork.cpp:207
+#: sg_ProjectPanel.cpp:72
 #, fuzzy
-msgid "Show VM Console in a window."
-msgstr "Rodyti programos grafiką lange."
-
-#: clientgui/ViewWork.cpp:214
-msgid "Suspend work for this result."
-msgstr "Sustabdyti šį skaičiavimo darbą."
+msgid "Add Project"
+msgstr "Prisijungti prie projekto"
 
-#: clientgui/ViewWork.cpp:221
-msgid "Abandon work on the result. You will get no credit for it."
-msgstr "Atsisakyti darbo. Jūs negausite jokio kredito."
+#: sg_ProjectPanel.cpp:73
+msgid "Synchronize"
+msgstr ""
 
-#: clientgui/ViewWork.cpp:240
-msgid "Elapsed"
+#: sg_ProjectPanel.cpp:74
+msgid "Work done for this project"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:241
-#, fuzzy
-msgid "Remaining (estimated)"
-msgstr "Likęs laikas"
+#: sg_ProjectPanel.cpp:77
+msgid "Synchronize projects with account manager system"
+msgstr "Sinchronizuoti projektus su abonento valdiklio sistema"
+
+#: sg_ProjectPanel.cpp:124
+msgid "Select a project to access with the controls below"
+msgstr ""
 
-#: clientgui/ViewWork.cpp:242
+# 88%
+#: sg_ProjectPanel.cpp:145
 #, fuzzy
-msgid "Deadline"
-msgstr "Atlikti iki"
+msgid "Project Web Pages"
+msgstr "Prisijungta prie projekto"
 
-#: clientgui/ViewWork.cpp:269
-msgid "Tasks"
-msgstr "Užduotys"
+#: sg_ProjectPanel.cpp:149
+msgid "Project Commands"
+msgstr ""
 
-#: clientgui/ViewWork.cpp:362
-msgid "Resuming task..."
-msgstr "Tęsiamas darbas..."
+#: sg_ProjectPanel.cpp:267
+#, c-format
+msgid "Pop up a menu of web sites for project %s"
+msgstr ""
 
-#: clientgui/ViewWork.cpp:365
-msgid "Suspending task..."
-msgstr "Stabdomas darbas..."
+#: sg_ProjectPanel.cpp:269
+#, c-format
+msgid "Pop up a menu of commands to apply to project %s"
+msgstr ""
 
-#: clientgui/ViewWork.cpp:394
-msgid "Showing graphics for task..."
-msgstr "Rodoma grafika šiam darbui..."
+#: sg_TaskCommandPopup.cpp:67
+msgid "Suspend this task."
+msgstr ""
 
-#: clientgui/ViewWork.cpp:431
-#, fuzzy
-msgid "Showing VM console for task..."
-msgstr "Rodoma grafika šiam darbui..."
+#: sg_TaskCommandPopup.cpp:73
+msgid "Abandon this task. You will get no credit for it."
+msgstr ""
 
-#: clientgui/ViewWork.cpp:484
+#: sg_TaskCommandPopup.cpp:251
 #, c-format
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to abort this task '%s'?\n"
-"(Progress: %s, Status: %s)"
+"(Progress: %.1lf%%, Status: %s)"
 msgstr ""
 "Ar tikrai norite nutraukti šią užduotį '%s'?\n"
 "(Pažanga: %s, Būklė: %s)"
 
-#: clientgui/ViewWork.cpp:490
-#, c-format
-msgid "Are you sure you want to abort these %d tasks?"
+#: sg_TaskPanel.cpp:464
+msgid "You don't have any projects.  Please Add a Project."
+msgstr "Jūs neprisijungęs prie nė vieno projekto. Prisijunkite."
+
+#: sg_TaskPanel.cpp:465
+msgid "Not available"
 msgstr ""
 
-# 75%
-#: clientgui/ViewWork.cpp:504
+#: sg_TaskPanel.cpp:476
 #, fuzzy
-msgid "Aborting task..."
-msgstr "Nutraukiamas perdavimas..."
+msgid "Tasks:"
+msgstr "Užduotys"
+
+#: sg_TaskPanel.cpp:482
+msgid "Select a task to access"
+msgstr ""
 
-#: clientgui/ViewWork.cpp:776
-msgid "Show all tasks"
+#: sg_TaskPanel.cpp:493
+msgid "From:"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:777
-msgid "Show all tasks."
+#: sg_TaskPanel.cpp:547
+msgid "This task's progress"
 msgstr ""
 
-#: clientgui/WelcomePage.cpp:284
-msgid "Add project or account manager"
-msgstr "Prisijungti prie projekto ar abonemento valdiklio"
+#: sg_TaskPanel.cpp:565
+msgid "Task Commands"
+msgstr ""
 
-#: clientgui/WelcomePage.cpp:288
-msgid "Add project or use BOINC Account Manager"
+#: sg_TaskPanel.cpp:566
+msgid "Pop up a menu of commands to apply to this task"
 msgstr ""
 
-#: clientgui/WelcomePage.cpp:297
+#: sg_TaskPanel.cpp:701
 #, 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 ""
+#, fuzzy, c-format
+msgid "Application: %s"
+msgstr "Programa:"
 
-#: 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."
+#: sg_TaskPanel.cpp:724
+#, c-format
+msgid "%.3f%%"
 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"
+#: sg_TaskPanel.cpp:732
+msgid "Application: Not available"
 msgstr ""
 
-#: clientgui/WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
+#: sg_TaskPanel.cpp:832
+msgid "Not Available"
 msgstr ""
 
-#: clientgui/WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
+#: sg_TaskPanel.cpp:847
+#, c-format
+msgid "Elapsed: %s"
 msgstr ""
 
-#: clientgui/WelcomePage.cpp:361
-msgid "Add projects run by other researchers or organizations"
+# 84%
+#: sg_TaskPanel.cpp:861
+#, c-format
+#, fuzzy, c-format
+msgid "Remaining (estimated): %s"
+msgstr "Likęs laikas"
+
+#: sg_TaskPanel.cpp:876
+#, c-format
+msgid "Status: %s"
 msgstr ""
 
-#: clientgui/WizardAttach.cpp:673
-msgid "Do you really want to cancel?"
-msgstr "Ar norite atšaukti?"
+#: sg_TaskPanel.cpp:1223
+msgid "Retrieving current status."
+msgstr "Gaunama dabartinė būsena."
 
-#: clientgui/WizardAttach.cpp:674
-msgid "Question"
-msgstr "Klausimas"
+#: sg_TaskPanel.cpp:1229
+msgid "Downloading work from the server."
+msgstr "Gaunamos užduotys iš serverio."
+
+#: sg_TaskPanel.cpp:1234
+msgid "Processing Suspended:  Running On Batteries."
+msgstr "Skaičiavimai sustabdyti: veikiama iš baterijų."
+
+#: sg_TaskPanel.cpp:1236
+msgid "Processing Suspended:  User Active."
+msgstr "Skaičiavimai sustabdyti: vartotojas aktyvus."
+
+#: sg_TaskPanel.cpp:1238
+msgid "Processing Suspended:  User paused processing."
+msgstr "Skaičiavimai sustabdyti: sustabdė vartotojas."
+
+#: sg_TaskPanel.cpp:1240
+msgid "Processing Suspended:  Time of Day."
+msgstr "Skaičiavimai sustabdyti: dienos laikas."
+
+#: sg_TaskPanel.cpp:1242
+msgid "Processing Suspended:  Benchmarks Running."
+msgstr "Skaičiavimai sustabdyti: matuojamas greitis."
+
+#: sg_TaskPanel.cpp:1244
+msgid "Processing Suspended."
+msgstr "Skaičiavimai sustabdyti."
+
+#: sg_TaskPanel.cpp:1248
+msgid "Waiting to contact project servers."
+msgstr "Laukiama susijungimo su projekto serveriais."
+
+#: sg_TaskPanel.cpp:1252 sg_TaskPanel.cpp:1261
+msgid "Retrieving current status"
+msgstr "Gaunama dabartinė būsena"
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
+#: sg_TaskPanel.cpp:1256
+msgid "No work available to process"
+msgstr "Nėra vykdymui paruoštų užduočių"
+
+#: sg_TaskPanel.cpp:1258
+msgid "Unable to connect to the core client"
+msgstr "Nepavyksta prisijungti prie kliento"
+
+#: wizardex.cpp:377 wizardex.cpp:553
 msgid "&Next >"
 msgstr "Toliau >"
 
-#: clientgui/wizardex.cpp:383
+#: wizardex.cpp:383
 msgid "< &Back"
 msgstr "< &Atgal"
 
-#: clientgui/wizardex.cpp:553
+#: wizardex.cpp:553
 msgid "&Finish"
 msgstr "Baigti"
 
-#: clientgui/common/wxPieCtrl.cpp:64
-msgid "Pie Ctrl"
-msgstr ""
+#: mac/Mac_GUI.cpp:110
+#, fuzzy
+msgid "Preferences…"
+msgstr "Vietiniai nustatymai"
 
-#: clientgui/mac/Mac_GUI.cpp:35
+#: mac/Mac_GUI.cpp:122
 msgid "Services"
 msgstr ""
 
-#: clientgui/mac/Mac_GUI.cpp:36
+#: mac/Mac_GUI.cpp:144
 #, c-format
 msgid "Hide %s"
 msgstr ""
 
-#: clientgui/mac/Mac_GUI.cpp:37
+#: mac/Mac_GUI.cpp:158
 msgid "Hide Others"
 msgstr ""
 
-#: clientgui/mac/Mac_GUI.cpp:38
+#: mac/Mac_GUI.cpp:172
 msgid "Show All"
 msgstr ""
 
-#: clientgui/mac/Mac_GUI.cpp:39
+#: mac/Mac_GUI.cpp:186
 #, c-format
 msgid "Quit %s"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.h:30
-msgid "specify work start and stop hours in format HH:MM-HH:MM"
-msgstr ""
-
-#: clientgui/DlgAdvPreferences.h:31
-msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
-msgstr ""
-
-# 98%
-#, fuzzy
-#~ msgid ""
-#~ "(C) 2003-2013 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2010 University of California, Berkeley.\n"
-#~ "Visos teisės saugomos."
-
-#, c-format
-#~ msgid "%s - Preferences"
-#~ msgstr "%s - nustatymai"
-
-#, no-c-format
-#~ msgid "% CPU time"
-#~ msgstr "% procesoriaus laiko"
-#~ msgid "KBytes/sec."
-#~ msgstr "KB/s"
-
-#, fuzzy
-#~ msgid " (Waiting for network access)"
-#~ msgstr "Laukiama atminties"
-
-#, fuzzy
-#~ msgid "Preferences…"
-#~ msgstr "Vietiniai nustatymai"
 #~ msgid "invalid float"
 #~ msgstr "neteisingas skaičius su kableliu"
 
 #, fuzzy
 #~ msgid "Display the advanced (accessible) graphical interface."
 #~ msgstr "Rodyti supaprastintą vartotojo sąsają."
+
 #~ msgid "Paused: Other work running"
 #~ msgstr "Skaičiavimai sustabdyti: veikia kitos užduotys"
+
 #~ msgid "Paused: User initiated.  Click 'Resume' to continue"
 #~ msgstr ""
 #~ "Skaičiavimai sustabdyti: vartotojo prašymas. Spauskite \"Tęsti\" pratęsimui"
+
 #~ msgid "Paused: User active"
 #~ msgstr "Skaičiavimai sustabdyti: vartotojas aktyvus"
+
 #~ msgid "Paused: Computer on battery"
 #~ msgstr "Skaičiavimai sustabdyti: kompiuteris veikia iš baterijų"
+
 #~ msgid "Paused: Time of Day"
 #~ msgstr "Skaičiavimai sustabdyti: paros metas"
+
 #~ msgid "Paused"
 #~ msgstr "Skaičiavimai sustabdyti"
+
 #~ msgid "Open a window to view messages"
 #~ msgstr "Atverti langą žinučių peržiūrai"
+
 #~ msgid "Stop all activity"
 #~ msgstr "Sustabdyti visus veiksmus"
+
 #~ msgid "Open a window to set your preferences"
 #~ msgstr "Atverti langą nustatymų keitimui"
+
 #~ msgid "My Projects:"
 #~ msgstr "Mano projektai:"
 
 #, c-format
 #~ msgid "%s. Work done by %s: %0.2f"
 #~ msgstr "%s. %s atliktas darbas: %0.2f"
+
 #~ msgid "Are you sure you want to display graphics on a remote machine?"
 #~ msgstr "Ar tikrai norite rodyti grafiką nutolusiame kompiuteryje?"
+
 #~ msgid "Application: "
 #~ msgstr "Programa:"
+
 #~ msgid "Time Remaining: "
 #~ msgstr "Likęs laikas:"
+
 #~ msgid "Elapsed Time: "
 #~ msgstr "Praėjęs laikas:"
+
 #~ msgid "Account manager website"
 #~ msgstr "Abonento valdiklio tinklapis"
+
 #~ msgid "Account Manager &URL:"
 #~ msgstr "Abonemento valdiklio tinklapio adresas:"
 
 #, c-format
 #~ msgid "%s &website"
 #~ msgstr "%s &tinklapis"
+
 #~ msgid "Project List"
 #~ msgstr "Projektų sąrašas"
 
@@ -4106,38 +3995,55 @@ msgstr ""
 #, fuzzy
 #~ msgid "Retry now"
 #~ msgstr "Kartoti dabar"
+
 #~ msgid "10%"
 #~ msgstr "10%"
+
 #~ msgid "20%"
 #~ msgstr "20%"
+
 #~ msgid "30%"
 #~ msgstr "30%"
+
 #~ msgid "40%"
 #~ msgstr "40%"
+
 #~ msgid "50%"
 #~ msgstr "50%"
+
 #~ msgid "60%"
 #~ msgstr "60%"
+
 #~ msgid "70%"
 #~ msgstr "70%"
+
 #~ msgid "80%"
 #~ msgstr "80%"
+
 #~ msgid "90%"
 #~ msgstr "90%"
+
 #~ msgid "1"
 #~ msgstr "1"
+
 #~ msgid "3"
 #~ msgstr "3"
+
 #~ msgid "5"
 #~ msgstr "5"
+
 #~ msgid "10"
 #~ msgstr "10"
+
 #~ msgid "15"
 #~ msgstr "15"
+
 #~ msgid "30"
 #~ msgstr "30"
+
 #~ msgid "60"
 #~ msgstr "60"
+
 #~ msgid "list of projects or account managers"
 #~ msgstr "projektų ir abonementų valdiklių sąrašas"
 
@@ -4167,10 +4073,13 @@ msgstr ""
 #, no-c-format
 #~ msgid "% of the processors"
 #~ msgstr "% procesorių"
+
 #~ msgid "Identify your account "
 #~ msgstr "Nustatykite savo sąskaitą "
+
 #~ msgid "Read config file"
 #~ msgstr "Nuskaityti nustatymų bylą"
+
 #~ msgid "Read configuration info from cc_config.xml"
 #~ msgstr "Nuskaityti nustatymus iš cc_config.xml"
 
@@ -4181,71 +4090,102 @@ msgstr ""
 #~ msgstr ""
 #~ "(C) 2003-2010 University of California, Berkeley.\n"
 #~ "Visos teisės saugomos."
+
 #~ msgid "Click 'Retry now' to transfer the file now"
 #~ msgstr "Spauskite \"Kartoti vėl\" norėdami perduoti bylą dabar"
+
 #~ msgid ""
 #~ "Click 'Abort transfer' to delete the file from the transfer queue. This "
 #~ "will prevent you from being granted credit for this result."
 #~ msgstr ""
 #~ "Spauskite \"Nutraukti perdavimą\" tam, kad būtų pašalinta byla iš "
 #~ "perdavimų sąrašo. Dėl šio veiksmo jūs negausite kreditų už šį darbą."
+
 #~ msgid "Aborting result..."
 #~ msgstr "Nutraukiamas darbas..."
+
 #~ msgid "Don't fetch NVIDIA GPU tasks"
 #~ msgstr "Negauti užduočių NVIDIA vaizdo procesoriui"
+
 #~ msgid "Don't fetch ATI GPU tasks"
 #~ msgstr "Negauti užduočių ATI vaizdo procesoriui"
+
 #~ msgid "Web sites"
 #~ msgstr "Tinklapiai"
+
 #~ msgid "Display and network &options..."
 #~ msgstr "Vartotojo sąsaj&os ir tinklo nustatymai..."
+
 #~ msgid "Retrieving host information; please wait..."
 #~ msgstr "Gaunama kompiuterio informacija; prašome palaukti..."
+
 #~ msgid " (waiting for GPU memory)"
 #~ msgstr " (laukiama vaizdo procesoriaus atminties)"
+
 #~ msgid "%s - Messages"
 #~ msgstr "%s - žinutės"
+
 #~ msgid "Preferences"
 #~ msgstr "Vietiniai nustatymai"
+
 #~ msgid "Customized Preferences"
 #~ msgstr "Pritaikyti nustatymai"
+
 #~ msgid "Upload suspended - "
 #~ msgstr "Duomenų išsiuntimas sustabdytas - "
+
 #~ msgid "Download suspended - "
 #~ msgstr "Duomenų atsiuntimas sustabdytas - "
+
 #~ msgid "Upload pending"
 #~ msgstr "Laukiama išsiuntimo"
+
 #~ msgid "Download pending"
 #~ msgstr "Laukiama parsiuntimo"
+
 #~ msgid "Get help with BOINC"
 #~ msgstr "Gauti pagalbą dėl BOINC naudojimo"
+
 #~ msgid "Attaching to project or account manager..."
 #~ msgstr "Prisijungiama prie projekto ar abonemento valdiklio..."
+
 #~ msgid "%s - Detach from %s"
 #~ msgstr "%s - atsijungti nuo %s"
+
 #~ msgid "Retrying communications."
 #~ msgstr "Kartojamas susijungimas"
+
 #~ msgid "Failed to attach to project"
 #~ msgstr "Nepavyko prisijungti prie projekto"
+
 #~ msgid "Failed to attach to account manager"
 #~ msgstr "Nepavyko prisijungti prie abonemento valdiklio"
+
 #~ msgid "Attached to account manager"
 #~ msgstr "Prisijungta prie abonemento valdiklio"
+
 #~ msgid "You are now successfully attached to the %s system."
 #~ msgstr "Sėkmingai prisijungėte prie %s sistemos."
+
 #~ msgid "You are now successfully attached to this account manager."
 #~ msgstr "Sėkmingai prisijungėte prie abonemento valdiklio."
+
 #~ msgid "All projects"
 #~ msgstr "Visi projektai"
+
 #~ msgid "Attach to project"
 #~ msgstr "Prisijungti prie projekto"
+
 #~ msgid "Attach to account manager"
 #~ msgstr "Prisijungti prie abonemento valdiklio"
+
 #~ msgid "Attach to a project"
 #~ msgstr "Prisijungti prie projekto"
+
 #~ msgid "%s needs to connect to the Internet.  Please click to open %s."
 #~ msgstr ""
 #~ "%s reikia prisijungti prie interneto. Spustelėkite, kad atidaryti %s."
+
 #~ msgid ""
 #~ "%s is unable to communicate with a project and needs an Internet "
 #~ "connection.\n"
@@ -4255,6 +4195,7 @@ msgstr ""
 #~ "%s negali susisiekti su projektu ir jam reikalingas interneto ryšys.\n"
 #~ "Prisijunkite prie interneto ir paspauskite \"Atlikti susijungimus tinkle"
 #~ "\" meniu punkte \"Papildomi\"."
+
 #~ msgid ""
 #~ "%s couldn't do Internet communication, and no default connection is "
 #~ "selected.\n"
@@ -4266,44 +4207,64 @@ msgstr ""
 #~ "Prašome prisijungti prie interneto arba pasirinkti numatytą interneto "
 #~ "jungtį\n"
 #~ "meniu Papildomi->Parinktys->Susijungimai."
+
 #~ msgid "Attached to project"
 #~ msgstr "Prisijungta prie projekto"
+
 #~ msgid "You are now successfully attached to this project."
 #~ msgstr "Jūs sėkmingai prisijungėte prie šio projekto."
+
 #~ msgid "Attached to %s"
 #~ msgstr "Prisijungta prie %s"
+
 #~ msgid "Detach when done"
 #~ msgstr "Atsijungti pabaigus"
+
 #~ msgid "Detach"
 #~ msgstr "Atjungti"
+
 #~ msgid "Detaching from project..."
 #~ msgstr "Atsijungiama nuo projekto..."
+
 #~ msgid "Are you sure you want to detach from project '%s'?"
 #~ msgstr "Ar tikrai norite atsijungti nuo projekto \"%s\"?"
+
 #~ msgid "Detach from Project"
 #~ msgstr "Atsijungti nuo projekto"
+
 #~ msgid "Attach this computer to a project or account manager"
 #~ msgstr "Prijungti kompiuterį prie projekto ar abonemento valdiklio"
+
 #~ msgid " - user active"
 #~ msgstr " - vartotojas aktyvus"
+
 #~ msgid " - computation suspended"
 #~ msgstr " - skaičiavimai sustabdyti"
+
 #~ msgid " - need disk space"
 #~ msgstr " - trūksta disko vietos"
+
 #~ msgid "Attach to an additional project"
 #~ msgstr "Prisijungti prie kito projekto"
+
 #~ msgid "To completion"
 #~ msgstr "Iki atlikimo"
+
 #~ msgid "Attach to a project to begin processing work"
 #~ msgstr "Prisijungite prie projekto ir pradėkite apdoroti darbą"
+
 #~ msgid "%s: %.2f%% completed."
 #~ msgstr "%s: %.2f%% atlikta."
+
 #~ msgid "%d tasks running."
 #~ msgstr "Vykdoma užduočių: %d."
+
 #~ msgid "&Close Window\tCtrl+W"
 #~ msgstr "&Uždaryti langą\tCtrl+W"
+
 #~ msgid "%s - Can't find web browser"
 #~ msgstr "%s - nepavyksta rasti interneto naršyklės"
+
 #~ msgid ""
 #~ "%s tried to display the web page\n"
 #~ "\t%s\n"
@@ -4318,76 +4279,106 @@ msgstr ""
 #~ "Norėdami išspręsti šią problemą, aplinkos kintamąjį\n"
 #~ "\"BROWSER\" nustatykite į interneto naršyklės vietą\n"
 #~ "ir iš naujo paleiskite %s."
+
 #~ msgid "Retrying communications for project(s)..."
 #~ msgstr "Bandoma susisiekti su projektu(-ais)..."
+
 #~ msgid ""
 #~ "Required wizard file(s) are missing from the target server.\n"
 #~ "(lookup_account.php/create_account.php)\n"
 #~ msgstr ""
 #~ "Vedliui reikalingos bylos serveryje nerastos.\n"
 #~ "(lookup_account.php/create_account.php)\n"
+
 #~ msgid "User information"
 #~ msgstr "Vartotojo informacija"
+
 #~ msgid "Account Manager URL"
 #~ msgstr "Abonemento valdiklio tinklapis"
+
 #~ msgid "Enter the URL of the account manager's web site."
 #~ msgstr "Įveskite abonemento valdiklio tinklapio adresą."
+
 #~ msgid "Close BOINC Manager Window."
 #~ msgstr "Uždaryti BOINC valdiklio langą."
+
 #~ msgid "Exit the %s"
 #~ msgstr "Išeiti iš %s"
+
 #~ msgid ""
 #~ "Advanced views allow you to sort various columns and displays graphical "
 #~ "progress bars."
 #~ msgstr ""
 #~ "Pažengusiųjų režime galima rūšiuoti informaciją pagal įvairius stulpelius "
 #~ "ir matomas grafinis būsenos atvaizdavimas."
+
 #~ msgid "Attach to &project"
 #~ msgstr "Prisijungti prie &projekto"
+
 #~ msgid "Attaching to project..."
 #~ msgstr "Prisijungiama prie projekto..."
+
 #~ msgid "Removal from %s completed."
 #~ msgstr "Pašalinimas iš %s baigtas."
+
 #~ msgid "Removal succeeded!"
 #~ msgstr "Pašalinimas pavyko!"
+
 #~ msgid "Priority"
 #~ msgstr "Svarbumas"
+
 #~ msgid "Copying selected messages to Clipboard..."
 #~ msgstr "Pasirinkti pranešimai kopijuojami į atmintį..."
+
 #~ msgid "Info"
 #~ msgstr "Informacija"
+
 #~ msgid "Warning"
 #~ msgstr "Perspėjimas"
+
 #~ msgid "Debug Flags"
 #~ msgstr "Programos klaidų žymės"
+
 #~ msgid "Project Properties Failure"
 #~ msgstr "Projekto nustatymu klaida"
+
 #~ msgid "Project Properties URL Failure"
 #~ msgstr "Projekto nustatymų URL klaida"
+
 #~ msgid "Account Creation Disabled"
 #~ msgstr "Abonementų kūrimas yra išjungtas"
+
 #~ msgid "Account Already Exists"
 #~ msgstr "Toks abonementas jau yra"
+
 #~ msgid "Project Already Attached"
 #~ msgstr "Projektas jau prijungtas"
+
 #~ msgid "Project Attach Failure"
 #~ msgstr "Nepavyko prisijungti prie projekto"
+
 #~ msgid "Net Detection Failure"
 #~ msgstr "Tinklo aptikimo klaida"
+
 #~ msgid ""
 #~ "You can copy and paste the URL from your browser's\n"
 #~ "address bar."
 #~ msgstr ""
 #~ "Galite nukopijuoti adresą iš interneto naršyklės\n"
 #~ "adreso laukelio."
+
 #~ msgid "For a list of account managers go to:"
 #~ msgstr "Abonemento valdiklių sąrašą rasite čia:"
+
 #~ msgid "&Advanced View"
 #~ msgstr "Pažengusiųjų režimas"
+
 #~ msgid "You are already attached to this project."
 #~ msgstr "Jūs jau esate prisijungęs prie šio projekto."
+
 #~ msgid "Enter account key"
 #~ msgstr "Įveskite abonento slaptažodį"
+
 #~ msgid ""
 #~ "This project uses an \"account key\" to identify you.\n"
 #~ "\n"
@@ -4398,26 +4389,37 @@ msgstr ""
 #~ "\n"
 #~ "Eikite į projekto interneto svetainę ir susikurkite abonementą.\n"
 #~ "Jūsų abonemento raktas bus atsiųstas elektroniniu paštu."
+
 #~ msgid "An account key looks like:"
 #~ msgstr "Abonemento slaptažodis panašus į šį:"
+
 #~ msgid "82412313ac88e9a3638f66ea82186948"
 #~ msgstr "82412313ac88e9a3638f66ea82186948"
+
 #~ msgid "Account key:"
 #~ msgstr "Abonemento slaptažodis:"
+
 #~ msgid "&Accessible View"
 #~ msgstr "Neįg&aliesiems pritaikytas režimas"
+
 #~ msgid "Retry all deferred network communication."
 #~ msgstr "Kartoti visus atidėtus susijungimus."
+
 #~ msgid "BOINC Manager - Detach from %s"
 #~ msgstr "BOINC valdiklis - Atsijungti nuo %s"
+
 #~ msgid "%s is currently suspended...\n"
 #~ msgstr "%s šiuo metu sustabdytas...\n"
+
 #~ msgid "%s networking is currently suspended...\n"
 #~ msgstr "%s veikla tinkle šiuo metu yra sustabdyta...\n"
+
 #~ msgid "%s is currently reconnecting to a %s client...\n"
 #~ msgstr "%s šiuo metu pakartotinai jungiasi prie %s kliento...\n"
+
 #~ msgid "%s is not currently connected to a %s client...\n"
 #~ msgstr "%s šiuo metu nėra prisijungęs prie %s kliento...\n"
+
 #~ msgid ""
 #~ "This dialog controls preferences on this computer only.\n"
 #~ "On Save - preferences will be stored locally.\n"
@@ -4427,42 +4429,58 @@ msgstr ""
 #~ "Paspaudus \"Išsaugoti\" nustatymai bus išsaugoti lokaliai.\n"
 #~ "Jei nori grįžti prie internete pasirinktų nustatymų, spauskite \"Pašalinti"
 #~ "\"."
+
 #~ msgid "only if computer is idle for"
 #~ msgstr "tik jei kompiuteris nenaudojamas ilgiau kaip"
+
 #~ msgid "work time restrictions"
 #~ msgstr "darbo laiko apribojimai"
+
 #~ msgid "additional restrictions:"
 #~ msgstr "papildomi apribojimai"
+
 #~ msgid "processors"
 #~ msgstr "procesoriai"
+
 #~ msgid "Click here to disable displaying this message in the future."
 #~ msgstr "Spauskite čia, jei nenorite, kad ši žinutė būtų rodoma ateityje."
+
 #~ msgid "Language Selection:"
 #~ msgstr "Kalbos pasirinkimas:"
+
 #~ msgid "What language should the manager display by default."
 #~ msgstr "Kokią kalbą naudoti kaip numatytą."
+
 #~ msgid "Reminder Frequency:"
 #~ msgstr "Priminimo dažnumas:"
+
 #~ msgid ""
 #~ "How often, in minutes, should the manager remind you of possible "
 #~ "connection events."
 #~ msgstr ""
 #~ "Kaip dažnai (minutėmis) valdiklis turėtų jums priminti apie galimus "
 #~ "prisijungimus prie tinklo."
+
 #~ msgid "BOINC Manager - Messages"
 #~ msgstr "BOINC valdiklis - žinutės"
+
 #~ msgid "BOINC Manager - Preferences"
 #~ msgstr "BOINC valdiklis - vietiniai nustatymai"
+
 #~ msgid "Project Comm Failure"
 #~ msgstr "Ryšio su projektu klaida"
+
 #~ msgid "Google Comm Failure"
 #~ msgstr "Prisijungimo prie Google klaida"
+
 #~ msgid "Yahoo Comm Failure"
 #~ msgstr "Prisijungimo prie Yahoo klaida"
+
 #~ msgid "About BOINC Manager"
 #~ msgstr "Apie BOINC valdiklį"
+
 #~ msgid "BOINC Manager - Options"
 #~ msgstr "BOINC valdiklis - nustatymai"
+
 #~ msgid "BOINC Manager - Select Computer"
 #~ msgstr "BOINC valdiklis - pasirinkti kompiuterį"
-
diff --git a/locale/lt/BOINC-Setup.mo b/locale/lt/BOINC-Setup.mo
index 15dfc64..b077e9b 100644
Binary files a/locale/lt/BOINC-Setup.mo and b/locale/lt/BOINC-Setup.mo differ
diff --git a/locale/lt/BOINC-Setup.po b/locale/lt/BOINC-Setup.po
index c77dd51..c515384 100755
--- a/locale/lt/BOINC-Setup.po
+++ b/locale/lt/BOINC-Setup.po
@@ -4,37 +4,35 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-01-26 00:00-0800\n"
-"PO-Revision-Date: 2015-02-11 17:50-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: 2014-01-11 13:01+0000\n"
+"Last-Translator: Rytis Slatkevičius <rytis.s at gmail.com>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
+"100<10 || n%100>=20) ? 1 : 2);\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: 1389445286.0\n"
 "X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: mac_installer\n"
 
 #: Installer.cpp:124
 #, c-format
 msgid "Sorry, this version of %s requires system 10.5 or higher."
 msgstr "Atsiprašome, šiai %s versijai reikia sistemos 10.5 ar naujesnės."
 
-#: PostInstall.cpp:130
-#: PostInstall.cpp:1136
-#: uninstall.cpp:1618
+#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
 msgid "Yes"
 msgstr "Taip"
 
-#: PostInstall.cpp:131
-#: PostInstall.cpp:1137
-#: uninstall.cpp:1619
+#: PostInstall.cpp:131 PostInstall.cpp:1137 uninstall.cpp:1619
 msgid "No"
 msgstr "Ne"
 
@@ -45,9 +43,11 @@ msgstr "Ar BOINC turėtų veikti kai nėra prisijungęs joks vartotojas?"
 #: PostInstall.cpp:1416
 #, c-format
 msgid ""
-"Users who are permitted to administer this computer will automatically be allowed to run and control %s.\n"
+"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?"
+"Do you also want non-administrative users to be able to run and control %s "
+"on this Mac?"
 msgstr ""
 
 #: PostInstall.cpp:1444
@@ -117,7 +117,8 @@ msgstr ""
 #: uninstall.cpp:840
 #, c-format
 msgid ""
-"Enter your administrator password to completely remove %s from you computer.\n"
+"Enter your administrator password to completely remove %s from you "
+"computer.\n"
 "\n"
 msgstr ""
 
@@ -128,4 +129,3 @@ msgstr "Atšaukti"
 #: uninstall.cpp:1617
 msgid "Continue..."
 msgstr "Tęsti..."
-
diff --git a/locale/lt/BOINC-Web.mo b/locale/lt/BOINC-Web.mo
index a3c47a2..efb588c 100644
Binary files a/locale/lt/BOINC-Web.mo and b/locale/lt/BOINC-Web.mo differ
diff --git a/locale/lt/BOINC-Web.po b/locale/lt/BOINC-Web.po
index 75be6bb..2bd7639 100755
--- a/locale/lt/BOINC-Web.po
+++ b/locale/lt/BOINC-Web.po
@@ -4,16 +4,18 @@
 # FileID  : $Id$
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\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-11 17:51-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: 2012-03-10 18:30+0200\n"
+"Last-Translator: Rytis Slatkevičius <rytis.s at gmail.com>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
+"100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Pootle 2.1.6\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
@@ -31,7 +33,9 @@ msgid "This page is %stranslatable%s."
 msgstr "Šis puslapis %sgali būti išverstas%s."
 
 #: download.php:39
-msgid "We recommend that you also install VirtualBox, so your computer can work on science projects that require it."
+msgid ""
+"We recommend that you also install VirtualBox, so your computer can work on "
+"science projects that require it."
 msgstr ""
 
 #: download.php:41
@@ -42,14 +46,12 @@ msgstr ""
 msgid "Download BOINC + VirtualBox"
 msgstr ""
 
-#: download.php:54
-#: download.php:69
+#: download.php:54 download.php:69
 #, php-format
 msgid "for %s"
 msgstr ""
 
-#: download.php:57
-#: download.php:72
+#: download.php:57 download.php:72
 #, php-format
 msgid "BOINC version %s"
 msgstr ""
@@ -64,19 +66,30 @@ msgid "Download BOINC"
 msgstr "Parsisiųsti BOINC"
 
 #: download.php:123
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others."
+msgid ""
+"BOINC is a program that lets you donate your idle computer time to science "
+"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, and many others."
 msgstr ""
 
 #: download.php:125
-msgid "After installing BOINC on your computer, you can connect it to as many of these projects as you like."
+msgid ""
+"After installing BOINC on your computer, you can connect it to as many of "
+"these projects as you like."
 msgstr ""
 
 #: download.php:127
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
-msgstr "Galite naudoti šią programinę įrangą tik jei esate kompiuterio savininkas ar turite leidimą iš jo savininko."
+msgid ""
+"You may run this software on a computer only if you own the computer or have "
+"the permission of its owner."
+msgstr ""
+"Galite naudoti šią programinę įrangą tik jei esate kompiuterio savininkas ar "
+"turite leidimą iš jo savininko."
 
 #: download.php:132
-msgid "We recommend that you download BOINC from the Google Play Store or Amazon Appstore, not from here."
+msgid ""
+"We recommend that you download BOINC from the Google Play Store or Amazon "
+"Appstore, not from here."
 msgstr ""
 
 #: download.php:167
@@ -87,8 +100,7 @@ msgstr "Reikalavimai sistemai"
 msgid "Release notes"
 msgstr "Išleidimo pastabos"
 
-#: download.php:169
-#: index.php:86
+#: download.php:169 index.php:86
 msgid "Help"
 msgstr "Pagalba"
 
@@ -110,21 +122,46 @@ msgstr "BOINC: skaičiavimai mokslui"
 
 #: help.php:12
 #, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
-msgstr "BOINC pagalba leidžia asmeniškai pabendrauti su patyrusiais BOINC dalyviais, kurie gali: %s atsakyti klausimus apie BOINC ir savanoriškus skaičiavimus; %s padėti įdiegti ir naudoti BOINC; %s padėti spręsti problemas, su kuriomis galite susidurti."
+msgid ""
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who "
+"can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"through the process of installing and using BOINC; %s troubleshoot any "
+"problems you might have."
+msgstr ""
+"BOINC pagalba leidžia asmeniškai pabendrauti su patyrusiais BOINC dalyviais, "
+"kurie gali: %s atsakyti klausimus apie BOINC ir savanoriškus skaičiavimus; "
+"%s padėti įdiegti ir naudoti BOINC; %s padėti spręsti problemas, su kuriomis "
+"galite susidurti."
 
 #: help.php:21
 #, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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 pagalba paremta %sSkype%s, internetinės telefonijos sistema. Skype yra nemokama (tiek programinė įranga, tiek skambučiai). Jei dar neturite Skype, %sparsisiųskite ir įsidiekite%s. Kai baigsite, grįžkite į šį puslapį."
+msgid ""
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. "
+"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 pagalba paremta %sSkype%s, internetinės telefonijos sistema. Skype yra "
+"nemokama (tiek programinė įranga, tiek skambučiai). Jei dar neturite Skype, "
+"%sparsisiųskite ir įsidiekite%s. Kai baigsite, grįžkite į šį puslapį."
 
 #: help.php:28
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
-msgstr "Geriausias būdas pagalbai gauti yra balsu. Tam reikalingas mikrofonas ir garsiakalbiai arba ausinės. Taip pat galite naudotis Skype tekstinių žinučių sistema arba įprastiniu elektroniniu paštu, jei neturite Skype."
+msgid ""
+"The best way to get help is by voice, for which you need either built-in "
+"microphone and speakers or an external headset for your computer.  You can "
+"also use Skype's text-based chat system or regular email (if you don't have "
+"Skype) to communicate with Help Volunteers."
+msgstr ""
+"Geriausias būdas pagalbai gauti yra balsu. Tam reikalingas mikrofonas ir "
+"garsiakalbiai arba ausinės. Taip pat galite naudotis Skype tekstinių žinučių "
+"sistema arba įprastiniu elektroniniu paštu, jei neturite Skype."
 
 #: help.php:31
-msgid "Volunteers speaking several languages are available. Please select a language:"
-msgstr "Yra prieinamų savanorių, kalbančių įvairiomis kalbomis. Pasirinkite kalbą:"
+msgid ""
+"Volunteers speaking several languages are available. Please select a "
+"language:"
+msgstr ""
+"Yra prieinamų savanorių, kalbančių įvairiomis kalbomis. Pasirinkite kalbą:"
 
 #: help.php:47
 msgid "Be a Help Volunteer"
@@ -132,21 +169,36 @@ msgstr "Tapti savanoriu pagalbininku"
 
 #: help.php:50
 #, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
-msgstr "Jei esate patyręs BOINC dalyvis, siūlome %stapti pagalbininku%s. Tai yra geras būdas padėti moksliniams tyrimams ir savanoriškiems skaičiavimams - be to, tai yra smagu!"
+msgid ""
+"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+"Volunteer%s.  It's a great way to help the cause of scientific research and "
+"volunteer computing - and it's fun!"
+msgstr ""
+"Jei esate patyręs BOINC dalyvis, siūlome %stapti pagalbininku%s. Tai yra "
+"geras būdas padėti moksliniams tyrimams ir savanoriškiems skaičiavimams - be "
+"to, tai yra smagu!"
 
 #: help.php:56
 #, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
-msgstr "Jei jau esate pagalbininku: norėdami pakeisti savo nustatymus, %sspauskite čia%s."
+msgid ""
+"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
+msgstr ""
+"Jei jau esate pagalbininku: norėdami pakeisti savo nustatymus, %sspauskite "
+"čia%s."
 
 #: help_funcs.php:107
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
-msgstr "BOINC pagalbininkai yra neapmokami savanoriai. Jų patarimai nėra palaikomi BOINC ar University of California."
+msgid ""
+"BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
+"or the University of California."
+msgstr ""
+"BOINC pagalbininkai yra neapmokami savanoriai. Jų patarimai nėra palaikomi "
+"BOINC ar University of California."
 
 #: help_funcs.php:110
 msgid "%1Never%2 give email address or password information to BOINC helpers."
-msgstr "%1Niekada%2 neatskleiskite elektroninio pašto adreso ar slaptažodžių informacijos BOINC pagalbininkams."
+msgstr ""
+"%1Niekada%2 neatskleiskite elektroninio pašto adreso ar slaptažodžių "
+"informacijos BOINC pagalbininkams."
 
 #: index.php:24
 msgid "Computing power"
@@ -170,7 +222,7 @@ msgstr "dalyviai,"
 
 #: index.php:55
 msgid "computers.\n"
-msgstr "kompiuteriai.\n"
+msgstr "kompiuteriai."
 
 #: index.php:56
 msgid "24-hour average:"
@@ -194,9 +246,7 @@ msgstr "Tapkite dalyviu"
 msgid "Download"
 msgstr "Parsisiuntimas"
 
-#: index.php:87
-#: index.php:120
-#: index.php:171
+#: index.php:87 index.php:120 index.php:171
 msgid "Documentation"
 msgstr "Dokumentacija"
 
@@ -209,7 +259,10 @@ msgid "Links"
 msgstr ""
 
 #: index.php:94
-msgid "Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:"
+msgid ""
+"Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure "
+"diseases, study global warming, discover pulsars, and do many other types of "
+"scientific research.  It's safe, secure, and easy:"
 msgstr ""
 
 #: index.php:96
@@ -226,8 +279,12 @@ msgstr ""
 
 #: index.php:102
 #, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
-msgstr "Arba, jei dalyvaujate kelete projektų, išbandykite %sabonemento valdiklį%s, tokį kaip %sGridRepublic%s arba %sBAM!%s."
+msgid ""
+"Or, if you run several projects, try an %saccount manager%s such as %"
+"sGridRepublic%s or %sBAM!%s. "
+msgstr ""
+"Arba, jei dalyvaujate kelete projektų, išbandykite %sabonemento valdiklį%s, "
+"tokį kaip %sGridRepublic%s arba %sBAM!%s."
 
 #: index.php:118
 msgid "Compute with BOINC"
@@ -238,12 +295,20 @@ msgid "Software updates"
 msgstr "Programinės įrangos atnaujinimai"
 
 #: index.php:128
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
-msgstr "%1Mokslininkai%2: naudokite BOINC %3skaičiavimų projekto%4 sukūrimui, kuris suteiks jums tūkstančių procesorių resursus."
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving "
+"you the computing power of thousands of CPUs."
+msgstr ""
+"%1Mokslininkai%2: naudokite BOINC %3skaičiavimų projekto%4 sukūrimui, kuris "
+"suteiks jums tūkstančių procesorių resursus."
 
 #: index.php:132
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
-msgstr "%1Universitetai%2: naudokite BOINC %3virtualaus universiteto superkompiuterių centro%4 sukūrimui."
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
+msgstr ""
+"%1Universitetai%2: naudokite BOINC %3virtualaus universiteto "
+"superkompiuterių centro%4 sukūrimui."
 
 #: index.php:137
 msgid "%1Companies%2: use BOINC for %3desktop Grid computing%4."
@@ -315,8 +380,11 @@ msgstr "API papildomai programinei įrangai"
 
 #: index.php:217
 #, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
-msgstr "Atviro kodo programinė įranga %ssavanoriškiems skaičiavimams%s ir %sskaičiavimams tinkle%s."
+msgid ""
+"Open-source software for %svolunteer computing%s and %sgrid computing%s."
+msgstr ""
+"Atviro kodo programinė įranga %ssavanoriškiems skaičiavimams%s ir %"
+"sskaičiavimams tinkle%s."
 
 #: index.php:230
 msgid "BOINC is based at The University of California, Berkeley"
@@ -335,7 +403,10 @@ msgid "Seismology"
 msgstr ""
 
 #: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
+msgid ""
+"The Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to Internet-connected computers.  You must buy a "
+"sensor to participate."
 msgstr ""
 
 #: projects.inc:27
@@ -347,23 +418,24 @@ msgid "Environmental research"
 msgstr ""
 
 #: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
+msgid ""
+"This project is creating a free and continuously updated map of radiation "
+"levels by using sensors connected to volunteers' computers.  You must buy a "
+"sensor to participate."
 msgstr ""
 
 #: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
+msgid ""
+"To participate in these projects you must buy a sensor and attach it to your "
+"computer."
 msgstr ""
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
 msgstr "Kognityvinis mokslas ir dirbtinis intelektas"
 
-#: projects.inc:60
-#: projects.inc:364
-#: projects.inc:408
-#: projects.inc:457
-#: projects.inc:464
-#: projects.inc:511
+#: projects.inc:60 projects.inc:364 projects.inc:408 projects.inc:457
+#: projects.inc:464 projects.inc:511
 #, fuzzy
 msgid "Private"
 msgstr "privatus"
@@ -373,7 +445,11 @@ msgid "Artificial intelligence"
 msgstr "Dirbtinis intelektas"
 
 #: projects.inc:62
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
+msgid ""
+"Parse and convert semantic nets for use in FreeHAL, an artificial "
+"intelligence that uses semantic networks, stemmers, part of speech "
+"databases, and part of speech taggers in order to imitate human behavior in "
+"conversations."
 msgstr ""
 
 #: projects.inc:69
@@ -389,7 +465,12 @@ msgid "Antimalarial drug discovery"
 msgstr ""
 
 #: projects.inc:84
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
+msgid ""
+"The parasite that causes malaria continues to evolve resistance to available "
+"medication. We therefore urgently need to discover new drugs to replace "
+"existing drugs. Importantly, these new drugs need to target NEW proteins in "
+"the parasite. The FightMalaria at Home project is aimed at finding these new "
+"targets."
 msgstr ""
 
 #: projects.inc:90
@@ -401,7 +482,12 @@ msgid "Protein structure prediction"
 msgstr ""
 
 #: projects.inc:92
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
+msgid ""
+"POEM at HOME uses a computational approach to predict the biologically active "
+"structure of proteins, to understand the signal-processing mechanisms when "
+"the proteins interact with one another, to understand diseases related to "
+"protein malfunction or aggregation, and to develop new drugs on the basis of "
+"the three-dimensions structure of biologically important proteins."
 msgstr ""
 
 #: projects.inc:98
@@ -413,7 +499,11 @@ msgid "Study of protein - ligand interactions"
 msgstr ""
 
 #: projects.inc:100
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
+msgid ""
+"Docking at Home has both bioscience and computer science goals. The project "
+"aims to further knowledge of the atomic details of protein-ligand "
+"interactions and, by doing so, will search for insights into the discovery "
+"of novel pharmaceuticals."
 msgstr ""
 
 #: projects.inc:114
@@ -425,7 +515,11 @@ msgid "Molecular simulations of proteins"
 msgstr "Molekulinės baltymų simuliacijos"
 
 #: projects.inc:116
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
+msgid ""
+"GPUGrid.net opens novel computational scenarios by the first full-atom "
+"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
+"New biomedical applications suddenly become possible giving a new role to "
+"computational biology for biomedical research."
 msgstr ""
 
 #: projects.inc:122
@@ -437,11 +531,15 @@ msgid "Genetic linkage analysis"
 msgstr "Genetinių sąsajų analizė"
 
 #: projects.inc:124
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
+msgid ""
+"Superlink at Technion helps geneticists all over the world find disease-"
+"provoking genes causing some types of diabetes, hypertension (high blood "
+"pressure), cancer, schizophrenia and many others."
 msgstr ""
 
 #: projects.inc:138
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
+msgid ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
 msgstr ""
 
 #: projects.inc:139
@@ -449,7 +547,11 @@ msgid "Life science research"
 msgstr "Gamtos mokslų tyrimai"
 
 #: projects.inc:140
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
+msgid ""
+"The Lattice Project supplies computing power to scientists at the University "
+"of Maryland studying evolutionary relationships based on DNA sequence data; "
+"bacterial, plasmid, and virus protein sequences; and biological diversity in "
+"nature reserves. "
 msgstr ""
 
 #: projects.inc:146
@@ -461,20 +563,32 @@ msgid "Epidemiology"
 msgstr "Epidemiologija"
 
 #: projects.inc:148
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
+msgid ""
+"Simulation models of the transmission dynamics and health effects of malaria "
+"are an important tool for malaria control. They can be used to determine "
+"optimal strategies for delivering mosquito nets, chemotherapy, or new "
+"vaccines which are currently under development and testing.  Such modeling "
+"is extremely computer intensive, requiring simulations of large human "
+"populations with a diverse set of parameters related to biological and "
+"social factors that influence the distribution of the disease. "
 msgstr ""
 
 #: projects.inc:170
 msgid "University of Washington"
 msgstr ""
 
-#: projects.inc:171
-#: projects.inc:179
+#: projects.inc:171 projects.inc:179
 msgid "Biology"
 msgstr "Biologija"
 
 #: projects.inc:172
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
+msgid ""
+"Determine the 3-dimensional shapes of proteins in research that may "
+"ultimately lead to finding cures for some major human diseases. By running "
+"Rosetta at home you will help us speed up and extend our research in ways we "
+"couldn't possibly attempt without your help. You will also be helping our "
+"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
+"Cancer, and Alzheimer's"
 msgstr ""
 
 #: projects.inc:178
@@ -482,8 +596,14 @@ msgid "University of Vienna"
 msgstr ""
 
 #: projects.inc:180
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
-msgstr "Skaičiuoja panašumus tarp baltymų. SIMAP pateikia viešai prieinamą rezultatų duomenų bazę, kuri yra svarbus aspektas daugelyje bioinformatikos tyrimų projektų."
+msgid ""
+"Calculate similarities between proteins. SIMAP provides a public database of "
+"the resulting data, which plays a key role in many bioinformatics research "
+"projects."
+msgstr ""
+"Skaičiuoja panašumus tarp baltymų. SIMAP pateikia viešai prieinamą rezultatų "
+"duomenų bazę, kuri yra svarbus aspektas daugelyje bioinformatikos tyrimų "
+"projektų."
 
 #: projects.inc:186
 msgid "Earth Sciences"
@@ -498,7 +618,15 @@ msgid "Climate study"
 msgstr "Klimato studijos"
 
 #: projects.inc:200
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
+msgid ""
+"Investigate the approximations that have to be made in state-of-the-art "
+"climate models. By running the model thousands of times we hope to find out "
+"how the model responds to slight tweaks to these approximations - slight "
+"enough to not make the approximations any less realistic. This will allow us "
+"to improve our understanding of how sensitive our models are to small "
+"changes and also to things like changes in carbon dioxide and the sulphur "
+"cycle. This will allow us to explore how climate may change in the next "
+"century under a wide range of different scenarios."
 msgstr ""
 
 #: projects.inc:207
@@ -510,30 +638,44 @@ msgid "Mechanical engineering"
 msgstr ""
 
 #: projects.inc:214
-msgid "Currently we are calculating the optimum design of a structure call the 52 bar truss"
+msgid ""
+"Currently we are calculating the optimum design of a structure call the 52 "
+"bar truss"
 msgstr ""
 
-#: projects.inc:224
-#: projects.inc:263
-#: projects.inc:271
+#: projects.inc:224 projects.inc:263 projects.inc:271
 msgid "Astronomy"
 msgstr ""
 
 #: projects.inc:225
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
+msgid ""
+"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
+"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
+"Universe. We will measure physical parameters (such as stellar mass surface "
+"density, star formation rate surface density, attenuation, and first-order "
+"star formation history) on a resolved pixel-by-pixel basis using spectral "
+"energy distribution (SED) fitting techniques in a distributed computing mode."
 msgstr ""
 
 #: projects.inc:247
 msgid "University of Texas at Austin"
 msgstr ""
 
-#: projects.inc:248
-#: projects.inc:279
+#: projects.inc:248 projects.inc:279
 msgid "Chemistry"
 msgstr "Chemija"
 
 #: projects.inc:249
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
+msgid ""
+"A common problem in theoretical chemistry, condensed matter physics and "
+"materials science is the calculation of the time evolution of an atomic "
+"scale system where, for example, chemical reactions and/or diffusion occur. "
+"Generally the events of interest are quite rare (many orders of magnitude "
+"slower than the vibrational movements of the atoms), and therefore direct "
+"simulations, tracking every movement of the atoms, would take thousands of "
+"years of computer calculations on the fastest present day computer before a "
+"single event of interest can be expected to occur.  Our research group is "
+"interested in calculating the long time dynamics of systems."
 msgstr ""
 
 #: projects.inc:262
@@ -541,7 +683,10 @@ msgid "University of Illinois at Urbana-Champaign"
 msgstr ""
 
 #: projects.inc:264
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
+msgid ""
+"The goal of Cosmology at Home is to search for the model that best describes "
+"our Universe and to find the range of models that agree with the available "
+"astronomical particle physics data."
 msgstr ""
 
 #: projects.inc:270
@@ -549,7 +694,10 @@ msgid "Rensselaer Polytechnic Institute"
 msgstr ""
 
 #: projects.inc:272
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
+msgid ""
+"The goal of Milkyway at Home is to create a highly accurate three dimensional "
+"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
+"Survey."
 msgstr ""
 
 #: projects.inc:278
@@ -557,7 +705,13 @@ msgid "Leiden University, The Netherlands"
 msgstr ""
 
 #: projects.inc:280
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
+msgid ""
+"Surface science calculations using Classical Dynamics.  Leiden Classical "
+"allows volunteers, students and other scientist to submit their personal "
+"calculations to the grid. Each user has his own personal queue for Classical "
+"Dynamics jobs. In this way students have used the grid to simulate liquid "
+"argon, or to test the validity of the ideal gas law by actually doing the "
+"simulations through the grid."
 msgstr ""
 
 #: projects.inc:294
@@ -569,25 +723,36 @@ msgid "Astrophysics"
 msgstr ""
 
 #: projects.inc:296
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
+msgid ""
+"Search for spinning neutron stars (also called pulsars) using data from the "
+"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
+"observatory.  Einstein at Home is a World Year of Physics 2005 project "
+"supported by the American Physical Society (APS) and by a number of "
+"international organizations."
 msgstr ""
 
-#: projects.inc:310
-#: projects.inc:318
+#: projects.inc:310 projects.inc:318
 msgid "CERN (European Organization for Nuclear Research)"
 msgstr ""
 
-#: projects.inc:311
-#: projects.inc:319
+#: projects.inc:311 projects.inc:319
 msgid "Physics"
 msgstr ""
 
 #: projects.inc:312
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
+msgid ""
+"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
+"European Organization for Nuclear Research, the world's largest particle "
+"physics laboratory.  It is the most powerful instrument ever built to "
+"investigate on particles proprieties. LHC at home runs simulations to improve "
+"the design of LHC and its detectors."
 msgstr ""
 
 #: projects.inc:320
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
+msgid ""
+"This project uses CERN-developed virtual machine technology for full-fledged "
+"LHC event physics simulation on volunteer computers.  Requires that you "
+"install VirtualBox on your computer"
 msgstr ""
 
 #: projects.inc:326
@@ -599,7 +764,12 @@ msgid "Astrophysics, astrobiology"
 msgstr ""
 
 #: projects.inc:328
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
+msgid ""
+"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
+"goal is to detect intelligent life outside Earth. One approach, known as "
+"radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
+"signals from space. Such signals are not known to occur naturally, so a "
+"detection would provide evidence of extraterrestrial technology."
 msgstr ""
 
 #: projects.inc:342
@@ -611,7 +781,11 @@ msgid "Chemical engineering and nanotechnology"
 msgstr ""
 
 #: projects.inc:344
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
+msgid ""
+"The study of molecular magnets and controlled nanoscale magnetism.  These "
+"magnetic molecules may be used to develop tiny magnetic switches, with "
+"applications in medicine (such as local tumor chemotherapy) and "
+"biotechnology."
 msgstr ""
 
 #: projects.inc:351
@@ -627,7 +801,10 @@ msgid "Physics, biochemistry, and others"
 msgstr ""
 
 #: projects.inc:358
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
+msgid ""
+"The objective of CAS at home is to encourage and assist scientists in China to "
+"adopt the technologies of volunteer computing and volunteer thinking for "
+"their research."
 msgstr ""
 
 #: projects.inc:365
@@ -635,11 +812,12 @@ msgid "Mathematics, physics, evolution"
 msgstr ""
 
 #: projects.inc:366
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
+msgid ""
+"Yoyo at home is an adapter between BOINC and several existing volunteer "
+"computing projects: ECM, Muon, Evolution at home, and distributed.net"
 msgstr ""
 
-#: projects.inc:371
-#: projects.inc:527
+#: projects.inc:371 projects.inc:527
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 msgstr ""
 
@@ -648,7 +826,11 @@ msgid "European research projects"
 msgstr "Europos tyrimų projektai"
 
 #: projects.inc:373
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
+msgid ""
+"The EDGeS at Home Beta project integrates volunteer computing into the service "
+"grid network of Europe by allowing service grids to send workunits to be "
+"processed by the volunteers of this project. The scientific projects covered "
+"by the project include math, physics, biology, etc."
 msgstr ""
 
 #: projects.inc:379
@@ -673,7 +855,11 @@ msgid "Medical, environmental and other humanitarian research"
 msgstr ""
 
 #: projects.inc:389
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
+msgid ""
+"To further critical non-profit research on some of humanity's most pressing "
+"problems by creating the world's largest volunteer computing grid.  Research "
+"includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"clean water and many more."
 msgstr ""
 
 #: projects.inc:395
@@ -692,21 +878,18 @@ msgstr ""
 msgid "Simulation of quantum computing; Goldbach's conjecture."
 msgstr ""
 
-#: projects.inc:450
-#: projects.inc:458
+#: projects.inc:450 projects.inc:458
 msgid "Cryptography"
 msgstr ""
 
 #: projects.inc:459
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
+msgid ""
+"Attempt to decode 3 original Enigma messages. The signals were intercepted "
+"in the North Atlantic in 1942 and are believed to be unbroken."
 msgstr ""
 
-#: projects.inc:465
-#: projects.inc:504
-#: projects.inc:512
-#: projects.inc:520
-#: projects.inc:528
-#: projects.inc:568
+#: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
+#: projects.inc:528 projects.inc:568
 msgid "Mathematics"
 msgstr ""
 
@@ -723,11 +906,19 @@ msgid "Factorization of large integers"
 msgstr ""
 
 #: projects.inc:473
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
+msgid ""
+"NFS at Home is a research project that uses Internet-connected computers to do "
+"the lattice sieving step in the Number Field Sieve factorization of large "
+"integers. As a young school student, you gained your first experience at "
+"breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
+"NFS at Home is a continuation of that experience, only with integers that are "
+"hundreds of digits long."
 msgstr ""
 
 #: projects.inc:479
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
+msgid ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
 msgstr ""
 
 #: projects.inc:480
@@ -736,7 +927,11 @@ msgid "Software testing"
 msgstr "Programinės įrangos atnaujinimai"
 
 #: projects.inc:481
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
+msgid ""
+"The aim of this project is to provide a powerful distributed computing "
+"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
+"well as others Lithuanian academic institutions.  Current applications "
+"involve the study of Monte-Carlo based software testing."
 msgstr ""
 
 #: projects.inc:503
@@ -744,11 +939,20 @@ msgid "Mathematical Institute of Leiden University / Kennislink"
 msgstr ""
 
 #: projects.inc:505
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
+msgid ""
+"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
+"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
+"product of the distinct prime factors of n. The ABC conjecture says that "
+"there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for "
+"any real h > 1. The ABC conjecture is currently one of the greatest open "
+"problems in mathematics. If it is proven to be true, a lot of other open "
+"problems can be answered directly from it."
 msgstr ""
 
 #: projects.inc:513
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
+msgid ""
+"Primegrid has multiple projects searching for different forms of very large "
+"prime numbers, including searching for the largest known prime number."
 msgstr ""
 
 #: projects.inc:519
@@ -756,11 +960,15 @@ msgid "Hochschule RheinMain University of Applied Sciences"
 msgstr ""
 
 #: projects.inc:521
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
+msgid ""
+"Search for counterexamples to two conjectures related to the identification "
+"of prime numbers"
 msgstr ""
 
 #: projects.inc:529
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
+msgid ""
+"Find all the generalized binary number systems (in which bases are matrices "
+"and digits are vectors) up to dimension 11."
 msgstr ""
 
 #: ../html/inc/news.inc:40
@@ -780,6 +988,7 @@ msgstr ""
 #, php-format
 #~ msgid "%s for %s (%s MB)"
 #~ msgstr "%s, skirta %s (%s MB)"
+
 #~ msgid ""
 #~ "BOINC is a program that lets you donate your idle computer time to science "
 #~ "projects like SETI at home, Climateprediction.net, Rosetta at home, World "
@@ -790,6 +999,7 @@ msgstr ""
 #~ "moksliniams projektams kaip SETI at home, Climateprediction.net, Rosetta at home, "
 #~ "World Community Grid ir kitiems. <p> Įdiegę BOINC į savo kompiuterį, galite "
 #~ "prisijungti prie tiek projektų, kiek tik panorėsite."
+
 #~ msgid "Browser default"
 #~ msgstr "Standartinė naršyklės"
 
@@ -806,46 +1016,65 @@ msgstr ""
 #~ "kitų mokslinių tyrimų sričių. Tai saugu ir paprasta: %sPasirinkite%s "
 #~ "projektus %sParsisiųskite%s ir vykdykite BOINC programinę įrangą %sĮveskite%"
 #~ "s elektroninio pašto adresą ir slaptažodį."
+
 #~ msgid "FreeHAL"
 #~ msgstr "FreeHAL"
+
 #~ msgid "private"
 #~ msgstr "privatus"
+
 #~ msgid "POEM at HOME"
 #~ msgstr "POEM at HOME"
+
 #~ msgid "Docking at Home"
 #~ msgstr "Docking at Home"
+
 #~ msgid "GPUGrid.net"
 #~ msgstr "GPUGrid.net"
+
 #~ msgid "Superlink at Technion"
 #~ msgstr "Superlink at Technion"
+
 #~ msgid "The Lattice Project"
 #~ msgstr "The Lattice Project"
+
 #~ msgid "Malariacontrol.net"
 #~ msgstr "Malariacontrol.net"
+
 #~ msgid "Rosetta at home"
 #~ msgstr "Rosetta at home"
+
 #~ msgid "SIMAP"
 #~ msgstr "SIMAP"
+
 #~ msgid "Virtual Prairie"
 #~ msgstr "Virtual Prairie"
+
 #~ msgid "Study of botanical ecosystems"
 #~ msgstr "Botanikos ekosistemų studijos"
+
 #~ msgid "Climateprediction.net"
 #~ msgstr "Climateprediction.net"
+
 #~ msgid "Astronomy/Physics/Chemistry"
 #~ msgstr "Astronomija, fizika, chemija"
+
 #~ msgid "eOn"
 #~ msgstr "eOn"
+
 #~ msgid "Orbit at home"
 #~ msgstr "Orbit at home"
+
 #~ msgid "The current release is known to work with these Linux versions:"
 #~ msgstr "Žinoma, kad dabartinis leidimas veikia su šiomis Linux versijomis:"
+
 #~ msgid ""
 #~ "For other Linux versions, check if a BOINC package is offered by your "
 #~ "Linux distribution."
 #~ msgstr ""
 #~ "Kitoms Linux versijoms ieškokite paketų, kuriuos teikia jūsų Linux "
 #~ "distribucija."
+
 #~ msgid ""
 #~ "Alternatively, download the %1BOINC client for older Linux versions%2. "
 #~ "This doesn't have a graphical interface, but it should work on all Linux "
@@ -854,12 +1083,13 @@ msgstr ""
 #~ "Taip pat galite parsisiųsti %1BOINC senesnėms Linux versijoms%2. Ši "
 #~ "versija neturi grafinės vartotojo sąsajos, tačiau turėtų veikti visose "
 #~ "Linux sistemose, įskaitant x86 ir x64."
+
 #~ msgid ""
 #~ "Note: if your computer is equipped with an Graphics Processing Unit "
 #~ "(GPU), you may be able to %suse it to compute faster%s"
 #~ msgstr ""
 #~ "Pastaba: jei jūsų kompiuteryje yra vaizdo procesorius, galite jį "
 #~ "%snaudoti skaičiavimams paspartinti%s"
+
 #~ msgid "TeraFLOPS."
 #~ msgstr "TeraFLOPS."
-
diff --git a/locale/lv/BOINC-Client.mo b/locale/lv/BOINC-Client.mo
index 96681fe..1df03c4 100644
Binary files a/locale/lv/BOINC-Client.mo and b/locale/lv/BOINC-Client.mo differ
diff --git a/locale/lv/BOINC-Client.po b/locale/lv/BOINC-Client.po
old mode 100755
new mode 100644
index 80dd594..6425a81
--- a/locale/lv/BOINC-Client.po
+++ b/locale/lv/BOINC-Client.po
@@ -1,24 +1,23 @@
 # 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: BOINC 7.4\n"
+"Project-Id-Version: boinc\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-10-15 22:25-0700\n"
-"PO-Revision-Date: 2015-02-11 22:45-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: lv\n"
+"PO-Revision-Date: 2015-02-08 23:05+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/boinc/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-POOTLE-MTIME: 1395003997.0\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: acct_mgr.cpp:450
-#: acct_mgr.cpp:459
+#: acct_mgr.cpp:450 acct_mgr.cpp:459
 msgid "Message from account manager"
 msgstr "Ziņojums no konta pārvaldnieka"
 
@@ -27,7 +26,9 @@ msgid "Message from server"
 msgstr "Ziņojums no servera"
 
 #: client_state.cpp:258
-msgid "Some tasks need more memory than allowed by your preferences.  Please check the preferences."
+msgid ""
+"Some tasks need more memory than allowed by your preferences.  Please check "
+"the preferences."
 msgstr "Daži uzdevumi prasa vairāk atmiņas, nekā atļauj Jūsu iestatījumi. Lūdzu, pārbaudiet iestatījumus."
 
 #: client_state.cpp:520
@@ -40,11 +41,12 @@ msgstr "HTTP_PROXY vides mainīgajam jādefinē HTTP starpniekserveris"
 
 #: cs_scheduler.cpp:613
 #, c-format
-msgid "You used the wrong URL for this project.  When convenient, remove this project, then add %s"
+msgid ""
+"You used the wrong URL for this project.  When convenient, remove this "
+"project, then add %s"
 msgstr "Jūs lietojāt nepareizu URL šim projektam. Kad ērtāk, noņemiet šo projektu un pievienojiet %s"
 
-#: cs_statefile.cpp:828
-#: ../sched/sched_types.cpp:259
+#: cs_statefile.cpp:828 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
 msgstr "Sintakses kļūda failā app_info.xml"
 
@@ -56,18 +58,15 @@ msgstr "Fails, uz kuru atsaucas app_info.xml failā, neeksistē: "
 msgid "A new version of BOINC is available."
 msgstr "Ir pieejama jauna BOINC versija."
 
-#: current_version.cpp:94
-#: current_version.cpp:102
+#: current_version.cpp:94 current_version.cpp:102
 msgid "Download"
 msgstr "Lejupielādēt"
 
-#: log_flags.cpp:269
-#: log_flags.cpp:449
+#: log_flags.cpp:269 log_flags.cpp:449
 msgid "Unexpected text in cc_config.xml"
 msgstr "Neparedzēts teksts failā cc_config.xml"
 
-#: log_flags.cpp:423
-#: log_flags.cpp:475
+#: log_flags.cpp:423 log_flags.cpp:475
 msgid "Unrecognized tag in cc_config.xml"
 msgstr "Neatpazīts tags failā cc_config.xml"
 
@@ -92,7 +91,9 @@ msgid "Invalid code signing key.  To fix, remove and add this project."
 msgstr "Nepareiza koda parakstīšanas atslēga.  Lai labotu, noņemiet un pievienojiet šo projektu."
 
 #: ../sched/handle_request.cpp:859
-msgid "The project has changed its security key.  Please remove and add this project."
+msgid ""
+"The project has changed its security key.  Please remove and add this "
+"project."
 msgstr "Šim projektam ir mainīta drošības atslēga.  Lūdzu, noņemiet un pievienojiet šo projektu."
 
 #: ../sched/handle_request.cpp:943
@@ -104,7 +105,8 @@ msgid "This project doesn't support CPU type"
 msgstr "Šis projekts neatbalsta procesora (CPU) tipu"
 
 #: ../sched/handle_request.cpp:993
-msgid "Your BOINC client software is too old.  Please install the current version."
+msgid ""
+"Your BOINC client software is too old.  Please install the current version."
 msgstr "Jūsu BOINC klienta programmatūra ir par vecu. Lūdzu, uzstādiet aktuālo versiju."
 
 #: ../sched/handle_request.cpp:1259
@@ -112,15 +114,19 @@ msgid "This project doesn't support computers of type"
 msgstr "Šis projekts neatbalsta datora tipu"
 
 #: ../sched/sched_send.cpp:1092
-msgid "Upgrade to the latest driver to process tasks using your computer's GPU"
+msgid ""
+"Upgrade to the latest driver to process tasks using your computer's GPU"
 msgstr "Uzstādiet draivera jaunāko versiju, lai veiktu uzdevumus, izmantojot Jūsu datora GPU"
 
 #: ../sched/sched_send.cpp:1099
-msgid "Upgrade to the latest driver to use all of this project's GPU applications"
+msgid ""
+"Upgrade to the latest driver to use all of this project's GPU applications"
 msgstr "Uzstādiet draivera jaunāko versiju, lai lietotu visus šī projekta GPU lietojumus"
 
 #: ../sched/sched_send.cpp:1118
-msgid "A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to the current version"
+msgid ""
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to"
+" the current version"
 msgstr "Lai lietotu Jūsu NVIDIA GPU nepieciešama jaunāka BOINC versija; lūdzu, atjauniniet uz aktuālo versiju"
 
 #: ../sched/sched_send.cpp:1146
@@ -142,7 +148,8 @@ msgstr "Nepieciešama jaunāka BOINC versija; lūdzu, uzstādiet aktuālo versij
 
 #: ../sched/sched_send.cpp:1305
 #, c-format
-msgid "Tasks for %s are available, but your preferences are set to not accept them"
+msgid ""
+"Tasks for %s are available, but your preferences are set to not accept them"
 msgstr "Ir pieejami uzdevumi %s, bet Jūsu preferences iestatītas tos nepieņemt"
 
 #: ../sched/sched_types.cpp:254
@@ -152,4 +159,3 @@ msgstr "Nezināms lietojuma vārds app_info.xml failā"
 #: ../sched/sched_version.cpp:214
 msgid "Your app_info.xml file doesn't have a usable version of"
 msgstr "Jūsu app_info.xml fails nesatur lietojamu versiju"
-
diff --git a/locale/lv/BOINC-Manager.mo b/locale/lv/BOINC-Manager.mo
index 227033a..905f355 100644
Binary files a/locale/lv/BOINC-Manager.mo and b/locale/lv/BOINC-Manager.mo differ
diff --git a/locale/lv/BOINC-Manager.po b/locale/lv/BOINC-Manager.po
old mode 100755
new mode 100644
index d818833..35c9c6a
--- a/locale/lv/BOINC-Manager.po
+++ b/locale/lv/BOINC-Manager.po
@@ -1,64 +1,52 @@
 # 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: BOINC 7.4\n"
+"Project-Id-Version: boinc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-15 14:15-0500\n"
-"PO-Revision-Date: 2015-02-11 22:45-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC at Latvia <boinc_at_latvia at mac.com>\n"
-"Language: lv\n"
+"POT-Creation-Date: 2014-02-02 00:00-0800\n"
+"PO-Revision-Date: 2015-02-23 23:14+0000\n"
+"Last-Translator: Rom Walton\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/boinc/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc_7.4\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1394399823.0\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-SearchPath-0: clientgui\n"
-"X-Poedit-SearchPath-1: clientgui/msw\n"
-"X-Poedit-SearchPath-2: clientgui/gtk\n"
-"X-Poedit-SearchPath-3: clientgui/mac\n"
-
-# 81%
-#: clientgui/AccountInfoPage.cpp:387
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+
+#: AccountInfoPage.cpp:387
 #, c-format
 msgid "Identify your account at %s"
 msgstr "Identificējiet jūsu kontu %s"
 
-#: clientgui/AccountInfoPage.cpp:393
+#: AccountInfoPage.cpp:393
 msgid ""
 "Please enter your account information\n"
 "(to create an account, visit the project's web site)"
-msgstr ""
-"Lūdzu, ievadiet jūsu konta informāciju\n"
-"(lai izveidotu kontu, apmeklējiet projekta web lapu)"
+msgstr "Lūdzu, ievadiet jūsu konta informāciju\n(lai izveidotu kontu, apmeklējiet projekta web lapu)"
 
-#: clientgui/AccountInfoPage.cpp:397
+#: AccountInfoPage.cpp:397
 msgid ""
 "This project is not currently accepting new accounts.\n"
 "You can add it only if you already have an account."
-msgstr ""
-"Šis projekts šobrīd nepieņem jaunus kontus.\n"
-"Jūs varat tam pievienoties tikai tad, ja jums jau ir konts."
+msgstr "Šis projekts šobrīd nepieņem jaunus kontus.\nJūs varat tam pievienoties tikai tad, ja jums jau ir konts."
 
-#: clientgui/AccountInfoPage.cpp:401
+#: AccountInfoPage.cpp:401
 msgid "Are you already running this project?"
 msgstr "Vai jūs jau lietojat šo projektu?"
 
-#: clientgui/AccountInfoPage.cpp:405
+#: AccountInfoPage.cpp:405
 msgid "&No, new user"
 msgstr "&Nē, jauns lietotājs"
 
-#: clientgui/AccountInfoPage.cpp:408
+#: AccountInfoPage.cpp:408
 msgid "&Yes, existing user"
 msgstr "&Jā, esošs lietotājs"
 
-#: clientgui/AccountInfoPage.cpp:413
+#: AccountInfoPage.cpp:413
 msgid ""
 "We were not able to set up your account information\n"
 "automatically.\n"
@@ -66,502 +54,469 @@ msgid ""
 "Please click on the 'Find login information' link\n"
 "below to find out what to put in the email address and\n"
 "password fields."
-msgstr ""
-"Mums neizdevās automātiski uzstādīt jūsu konta\n"
-"informāciju.\n"
-"\n"
-"Lūdzu, uzklikšķiniet uz 'Atrast pieteikšanās informāciju'\n"
-"saites, lai atrastu, ko rakstīt e-pasta adreses un paroles\n"
-"laukos."
+msgstr "Mums neizdevās automātiski uzstādīt jūsu konta\ninformāciju.\n\nLūdzu, uzklikšķiniet uz 'Atrast pieteikšanās informāciju'\nsaites, lai atrastu, ko rakstīt e-pasta adreses un paroles\nlaukos."
 
-#: clientgui/AccountInfoPage.cpp:416
+#: AccountInfoPage.cpp:416
 msgid "Find login information"
 msgstr "Atrast pieteikšanās informāciju"
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:649
+#: AccountInfoPage.cpp:436 AccountInfoPage.cpp:641
 msgid "&Password:"
 msgstr "&Parole:"
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:673
+#: AccountInfoPage.cpp:443 AccountInfoPage.cpp:665
 msgid "Choose a &password:"
 msgstr "Izvēlieties &paroli:"
 
-#: clientgui/AccountInfoPage.cpp:446
+#: AccountInfoPage.cpp:446
 msgid "C&onfirm password:"
 msgstr "Par&ole atkārtoti:"
 
-#: clientgui/AccountInfoPage.cpp:453
+#: AccountInfoPage.cpp:453
 #, c-format
 msgid "Are you already running %s?"
 msgstr "Vai jūs jau lietojat %s?"
 
-#: clientgui/AccountInfoPage.cpp:482
+#: AccountInfoPage.cpp:482
 msgid "&Username:"
 msgstr "L&ietotājvārds:"
 
-#: clientgui/AccountInfoPage.cpp:511
-msgid "&Email address or LDAP ID:"
-msgstr ""
-
-#: clientgui/AccountInfoPage.cpp:515
+#: AccountInfoPage.cpp:508
 msgid "&Email address:"
 msgstr "&E-pasta adrese:"
 
-#: clientgui/AccountInfoPage.cpp:523
+#: AccountInfoPage.cpp:515
 #, c-format
 msgid "minimum length %d"
 msgstr "minimālais garums %d"
 
-#: clientgui/AccountInfoPage.cpp:530
+#: AccountInfoPage.cpp:522
 msgid "Forgot your password?"
 msgstr "Aizmirsāt jūsu paroli?"
 
-#: clientgui/AccountInfoPage.cpp:537
+#: AccountInfoPage.cpp:529
 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 ""
-"Ja jūs vēl neesat reģistrēti ar šo konta menedžeri,\n"
-"lūdzu, izdariet to pirms turpināt.  Noklikšķiniet uz zemāk\n"
-"redzamo saiti, lai reģistrētos vai lai atgūtu aizmirsto paroli."
+msgstr "Ja jūs vēl neesat reģistrēti ar šo konta menedžeri,\nlūdzu, izdariet to pirms turpināt.  Noklikšķiniet uz zemāk\nredzamo saiti, lai reģistrētos vai lai atgūtu aizmirsto paroli."
 
-#: clientgui/AccountInfoPage.cpp:540
+#: AccountInfoPage.cpp:532
 msgid "Account manager web site"
 msgstr "Konta menedžera mājas lapa"
 
-#: clientgui/AccountInfoPage.cpp:582
+#: AccountInfoPage.cpp:574 WelcomePage.cpp:348
 msgid "Add project"
 msgstr "Pievienot projektu"
 
-#: clientgui/AccountInfoPage.cpp:584
+#: AccountInfoPage.cpp:576
 msgid "Update account manager"
 msgstr "Atjaunot konta menedžeri"
 
-#: clientgui/AccountInfoPage.cpp:586
+#: AccountInfoPage.cpp:578 WelcomePage.cpp:307 WelcomePage.cpp:321
 msgid "Use account manager"
 msgstr "Lietot konta menedžeri"
 
-#: clientgui/AccountInfoPage.cpp:593
+#: AccountInfoPage.cpp:585
 msgid "Please enter a user name."
 msgstr "Lūdzu, ievadiet lietotājvārdu."
 
-#: clientgui/AccountInfoPage.cpp:595
+#: AccountInfoPage.cpp:587
 msgid "Please enter an email address."
 msgstr "Lūdzu, ievadiet e-pasta adresi."
 
-#: clientgui/AccountInfoPage.cpp:605
+#: AccountInfoPage.cpp:597
 #, c-format
 msgid "Please enter a password of at least %d characters."
 msgstr "Lūdzu, ievadiet paroli, kura ir vismaz %d simbolu gara."
 
-#: clientgui/AccountInfoPage.cpp:615
-msgid "The password and confirmation password do not match. Please type them again."
+#: AccountInfoPage.cpp:607
+msgid ""
+"The password and confirmation password do not match. Please type them again."
 msgstr "Abas ievadītās paroles nesakrīt. Lūdzu, ievadiet tās no jauna."
 
-#: clientgui/AccountManagerInfoPage.cpp:272
+#: AccountManagerInfoPage.cpp:272
 msgid "Choose an account manager"
 msgstr "Izvēlieties konta menedžeri"
 
-#: clientgui/AccountManagerInfoPage.cpp:275
+#: AccountManagerInfoPage.cpp:275
 msgid ""
 "To choose an account manager, click its name or \n"
 "type its URL below."
-msgstr ""
-"Lai izvēlētos konta menedžeri, noklikšķiniet uz tā \n"
-"vārda vai rakstiet tā URL zemāk."
+msgstr "Lai izvēlētos konta menedžeri, noklikšķiniet uz tā \nvārda vai rakstiet tā URL zemāk."
 
-#: clientgui/AccountManagerInfoPage.cpp:279
+#: AccountManagerInfoPage.cpp:279
 msgid "Account manager details:"
 msgstr "Konta menedžera informācija:"
 
-#: clientgui/AccountManagerInfoPage.cpp:283
+#: AccountManagerInfoPage.cpp:283
 msgid "Account manager &URL:"
 msgstr "Konta menedžera &URL:"
 
-#: clientgui/AccountManagerInfoPage.cpp:287
+#: AccountManagerInfoPage.cpp:287
 msgid "Open web page"
 msgstr "Atvērt mājas lapu"
 
-#: clientgui/AccountManagerInfoPage.cpp:290
+#: AccountManagerInfoPage.cpp:290
 msgid "Visit this account manager's web site"
 msgstr "Apmeklēt šī konta menedžera mājas lapu"
 
-#: clientgui/AccountManagerProcessingPage.cpp:186
-#: clientgui/AccountManagerPropertiesPage.cpp:192
+#: AccountManagerProcessingPage.cpp:187 AccountManagerPropertiesPage.cpp:193
 #, c-format
 msgid "Communicating with %s."
 msgstr "Notiek sazināšanās ar %s."
 
-#: clientgui/AccountManagerProcessingPage.cpp:193
-#: clientgui/AccountManagerPropertiesPage.cpp:199
+#: AccountManagerProcessingPage.cpp:194 AccountManagerPropertiesPage.cpp:200
 msgid "Communicating with server."
 msgstr "Notiek sazināšanās ar serveri."
 
-#: clientgui/AccountManagerProcessingPage.cpp:198
-#: clientgui/AccountManagerPropertiesPage.cpp:204
+#: AccountManagerProcessingPage.cpp:199 AccountManagerPropertiesPage.cpp:205
 msgid "Please wait..."
 msgstr "Lūdzu, uzgaidiet..."
 
-#: clientgui/AccountManagerProcessingPage.cpp:325
+#: AccountManagerProcessingPage.cpp:326
 msgid "An internal server error has occurred.\n"
 msgstr "Notika iekšēja servera kļūda.\n"
 
-#: clientgui/AdvancedFrame.cpp:96
+#: AdvancedFrame.cpp:95
 msgid "Connected"
 msgstr "Savienots"
 
-#: clientgui/AdvancedFrame.cpp:104
+#: AdvancedFrame.cpp:103
 msgid "Disconnected"
 msgstr "Atvienots"
 
-#: clientgui/AdvancedFrame.cpp:318
+#: AdvancedFrame.cpp:322 sg_BoincSimpleFrame.cpp:119
 #, c-format
 msgid "Close the %s window"
 msgstr "Aizvērt %s logu"
 
-#: clientgui/AdvancedFrame.cpp:321
+#: AdvancedFrame.cpp:325 sg_BoincSimpleFrame.cpp:122
 msgid "&Close Window"
 msgstr "&Aizvērt logu"
 
-#: clientgui/AdvancedFrame.cpp:332
-#: clientgui/AdvancedFrame.cpp:339
-#: clientgui/AdvancedFrame.cpp:346
+#: AdvancedFrame.cpp:336 AdvancedFrame.cpp:343 AdvancedFrame.cpp:350
 #, c-format
 msgid "Exit %s"
 msgstr "Iziet %s"
 
-#: clientgui/AdvancedFrame.cpp:359
-msgid "Preferences..."
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:368
+#: AdvancedFrame.cpp:371
 msgid "&Notices\tCtrl+Shift+N"
 msgstr "P&aziņojumi\t Ctrl+Shift+N"
 
-#: clientgui/AdvancedFrame.cpp:369
+#: AdvancedFrame.cpp:372
 msgid "Display notices"
 msgstr "Parādīt paziņojumus"
 
-#: clientgui/AdvancedFrame.cpp:374
+#: AdvancedFrame.cpp:377
 msgid "&Projects\tCtrl+Shift+P"
 msgstr "&Projekti\t Ctrl+Shift+P"
 
-#: clientgui/AdvancedFrame.cpp:375
+#: AdvancedFrame.cpp:378
 msgid "Display projects"
 msgstr "Parādīt projektus"
 
-#: clientgui/AdvancedFrame.cpp:380
+#: AdvancedFrame.cpp:383
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr "&Uzdevumi\t Ctrl+Shift+T"
 
-#: clientgui/AdvancedFrame.cpp:381
+#: AdvancedFrame.cpp:384
 msgid "Display tasks"
 msgstr "Parādīt uzdevumus"
 
-#: clientgui/AdvancedFrame.cpp:386
+#: AdvancedFrame.cpp:389
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr "Pārsūtīša&na\t Ctrl+Shift+X"
 
-#: clientgui/AdvancedFrame.cpp:387
+#: AdvancedFrame.cpp:390
 msgid "Display transfers"
 msgstr "Parādīt pārsūtīšanu"
 
-#: clientgui/AdvancedFrame.cpp:392
+#: AdvancedFrame.cpp:395
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "&Statistika\t Ctrl+Shift+S"
 
-#: clientgui/AdvancedFrame.cpp:393
+#: AdvancedFrame.cpp:396
 msgid "Display statistics"
 msgstr "Parādīt statistiku"
 
-#: clientgui/AdvancedFrame.cpp:398
+#: AdvancedFrame.cpp:401
 msgid "&Disk usage\tCtrl+Shift+D"
 msgstr "&Diska lietojums\t Ctrl+Shift+D"
 
-#: clientgui/AdvancedFrame.cpp:399
+#: AdvancedFrame.cpp:402
 msgid "Display disk usage"
 msgstr "Parādīt diska lietojumu"
 
-#: clientgui/AdvancedFrame.cpp:406
+#: AdvancedFrame.cpp:409
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr "&Vienāršais skats...\t Ctrl+Shift+V"
 
-#: clientgui/AdvancedFrame.cpp:407
+#: AdvancedFrame.cpp:410
 msgid "Display the simple graphical interface."
 msgstr "Parādīt vienkāršu grafisko interfeisu."
 
-#: clientgui/AdvancedFrame.cpp:421
+#: AdvancedFrame.cpp:424
 msgid "&Add project or account manager..."
 msgstr "&Pievienot projektu vai konta menedžeri..."
 
-#: clientgui/AdvancedFrame.cpp:422
+#: AdvancedFrame.cpp:425 sg_ProjectPanel.cpp:76
 msgid "Volunteer for any or all of 30+ projects in many areas of science"
 msgstr "Brīvprātīgi pieteikties jebkuram vai visiem 30+ projektiem daudzās zinātnes sfērās"
 
-#: clientgui/AdvancedFrame.cpp:426
+#: AdvancedFrame.cpp:429
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "&Sinhronizēties ar %s"
 
-#: clientgui/AdvancedFrame.cpp:430
+#: AdvancedFrame.cpp:433
 #, c-format
 msgid "Get current settings from %s"
 msgstr "Iegūt pašreizējos iestatījumus no %s"
 
-#: clientgui/AdvancedFrame.cpp:440
+#: AdvancedFrame.cpp:443
 msgid "&Add project..."
 msgstr "P&ievienot projektu..."
 
-#: clientgui/AdvancedFrame.cpp:441
+#: AdvancedFrame.cpp:444
 msgid "Add a project"
 msgstr "Pievienot projektu"
 
-#: clientgui/AdvancedFrame.cpp:444
+#: AdvancedFrame.cpp:447
 #, c-format
 msgid "S&top using %s..."
 msgstr "Nelie&tot %s..."
 
-#: clientgui/AdvancedFrame.cpp:450
+#: AdvancedFrame.cpp:453
 msgid "Remove this computer from account manager control."
 msgstr "Noņemt šo datoru no konta menedžera kontroles."
 
-#: clientgui/AdvancedFrame.cpp:455
+#: AdvancedFrame.cpp:458 sg_BoincSimpleFrame.cpp:178
 msgid "&Options..."
 msgstr "&Opcijas..."
 
-#: clientgui/AdvancedFrame.cpp:456
+#: AdvancedFrame.cpp:459 sg_BoincSimpleFrame.cpp:179
 msgid "Configure display options and proxy settings"
 msgstr "Konfigurēt attēlošanas opcijas un proxy iestatījumus"
 
-#: clientgui/AdvancedFrame.cpp:460
+#: AdvancedFrame.cpp:463 sg_BoincSimpleFrame.cpp:172
 msgid "Computing &preferences..."
 msgstr "Skaitļošanas &preferences..."
 
-#: clientgui/AdvancedFrame.cpp:461
+#: AdvancedFrame.cpp:464 sg_BoincSimpleFrame.cpp:173
 msgid "Configure computing preferences"
 msgstr "Konfigurēt skaitļošanas preferences"
 
-#: clientgui/AdvancedFrame.cpp:469
+#: AdvancedFrame.cpp:472
 msgid "&Run always"
 msgstr "&Izpildīt vienmēr"
 
-#: clientgui/AdvancedFrame.cpp:470
+#: AdvancedFrame.cpp:473
 msgid "Allow work regardless of preferences"
 msgstr "Atļaut darbu neskatoties uz preferencēm"
 
-#: clientgui/AdvancedFrame.cpp:474
+#: AdvancedFrame.cpp:477
 msgid "Run based on &preferences"
 msgstr "Izpildīt balstoties uz &preferencēm"
 
-#: clientgui/AdvancedFrame.cpp:475
+#: AdvancedFrame.cpp:478
 msgid "Allow work according to preferences"
 msgstr "Atļaut darbu saskaņā ar jūsu preferencēm"
 
-#: clientgui/AdvancedFrame.cpp:479
+#: AdvancedFrame.cpp:482
 msgid "&Suspend"
 msgstr "&Atlikt"
 
-#: clientgui/AdvancedFrame.cpp:480
+#: AdvancedFrame.cpp:483
 msgid "Stop work regardless of preferences"
 msgstr "Aptur darbu neskatoties uz preferencēm"
 
-#: clientgui/AdvancedFrame.cpp:505
+#: AdvancedFrame.cpp:508
 msgid "Use GPU always"
 msgstr "Vienmēr lietot GPU"
 
-#: clientgui/AdvancedFrame.cpp:506
+#: AdvancedFrame.cpp:509
 msgid "Allow GPU work regardless of preferences"
 msgstr "Atļaut GPU darbu neskatoties uz preferencēm"
 
-#: clientgui/AdvancedFrame.cpp:510
+#: AdvancedFrame.cpp:513
 msgid "Use GPU based on preferences"
 msgstr "&Lietot GPU balstoties uz preferencēm"
 
-#: clientgui/AdvancedFrame.cpp:511
+#: AdvancedFrame.cpp:514
 msgid "Allow GPU work according to preferences"
 msgstr "Atļaut GPU darbu saskaņā ar jūsu preferencēm"
 
-#: clientgui/AdvancedFrame.cpp:515
+#: AdvancedFrame.cpp:518
 msgid "Suspend GPU"
 msgstr "Atlikt GPU"
 
-#: clientgui/AdvancedFrame.cpp:516
+#: AdvancedFrame.cpp:519
 msgid "Stop GPU work regardless of preferences"
 msgstr "Pārstāt izpildīt GPU darbu neskatoties uz preferencēm"
 
-#: clientgui/AdvancedFrame.cpp:540
+#: AdvancedFrame.cpp:543
 msgid "Network activity always available"
 msgstr "&Tīkls vienmēr pieejams"
 
-#: clientgui/AdvancedFrame.cpp:541
+#: AdvancedFrame.cpp:544
 msgid "Allow network activity regardless of preferences"
 msgstr "Atļaut lietot tīklu neskatoties uz preferencēm"
 
-#: clientgui/AdvancedFrame.cpp:545
+#: AdvancedFrame.cpp:548
 msgid "Network activity based on preferences"
 msgstr "&Pieslēgties tīklam balstoties uz preferencēm"
 
-#: clientgui/AdvancedFrame.cpp:546
+#: AdvancedFrame.cpp:549
 msgid "Allow network activity according to preferences"
 msgstr "Lietot tīklu saskaņā ar jūsu preferencēm"
 
-#: clientgui/AdvancedFrame.cpp:550
+#: AdvancedFrame.cpp:553
 msgid "Network activity suspended"
 msgstr "Pi&eslēgums tīklam atlikts"
 
-#: clientgui/AdvancedFrame.cpp:551
+#: AdvancedFrame.cpp:554
 msgid "Stop BOINC network activity"
 msgstr "Aptur BOINC tīkla aktivitātes"
 
-#: clientgui/AdvancedFrame.cpp:561
+#: AdvancedFrame.cpp:564
 #, c-format
 msgid "Connect to another computer running %s"
 msgstr "Pieslēgties citam datoram, kas izpilda %s"
 
-#: clientgui/AdvancedFrame.cpp:566
+#: AdvancedFrame.cpp:569
 msgid "Select computer..."
 msgstr "&Izvēlieties datoru..."
 
-#: clientgui/AdvancedFrame.cpp:571
+#: AdvancedFrame.cpp:574
 msgid "Shut down connected client..."
 msgstr "Slēgt pievienoto klientu..."
 
-#: clientgui/AdvancedFrame.cpp:572
+#: AdvancedFrame.cpp:575
 msgid "Shut down the currently connected client"
 msgstr "Slēgt pašlaik pievienoto klientu"
 
-#: clientgui/AdvancedFrame.cpp:576
+#: AdvancedFrame.cpp:579
 msgid "Run CPU &benchmarks"
 msgstr "Palaist CPU veiktspējas te&stu"
 
-#: clientgui/AdvancedFrame.cpp:577
+#: AdvancedFrame.cpp:580
 msgid "Runs BOINC CPU benchmarks"
 msgstr "Palaiž etalonuzdevumu, lai noteiktu procesora veiktspēju"
 
-#: clientgui/AdvancedFrame.cpp:581
+#: AdvancedFrame.cpp:584
 msgid "Do network communication"
 msgstr "Iniciēt tīkla sakarus"
 
-#: clientgui/AdvancedFrame.cpp:582
+#: AdvancedFrame.cpp:585
 msgid "Do all pending network communication"
 msgstr "Iniciēt visus nenokārtotos tīkla sakarus"
 
-# 94%
-#: clientgui/AdvancedFrame.cpp:586
+#: AdvancedFrame.cpp:589
 msgid "Read config files"
 msgstr "Lasīt konfigurācijas failus"
 
-#: clientgui/AdvancedFrame.cpp:587
-msgid "Read configuration info from cc_config.xml and any app_config.xml files"
+#: AdvancedFrame.cpp:590
+msgid ""
+"Read configuration info from cc_config.xml and any app_config.xml files"
 msgstr "Lasīt konfigurācijas informāciju no cc_config.xml un jebkuriem app_config.xml failiem"
 
-#: clientgui/AdvancedFrame.cpp:591
+#: AdvancedFrame.cpp:594
 msgid "Read local prefs file"
 msgstr "Lasīt vietējo preferenču failu"
 
-#: clientgui/AdvancedFrame.cpp:592
+#: AdvancedFrame.cpp:595
 msgid "Read preferences from global_prefs_override.xml."
 msgstr "Lasīt preferences no global_prefs_override.xml"
 
-#: clientgui/AdvancedFrame.cpp:597
+#: AdvancedFrame.cpp:600
 #, c-format
 msgid "Launch another instance of %s..."
 msgstr "Palaist citu %s instanci..."
 
-#: clientgui/AdvancedFrame.cpp:601
+#: AdvancedFrame.cpp:604
 #, c-format
 msgid "Launch another %s"
 msgstr "Palaist citu %s"
 
-#: clientgui/AdvancedFrame.cpp:611
+#: AdvancedFrame.cpp:614
 msgid "Event Log...\tCtrl+Shift+E"
 msgstr "Žurnāls...\t Ctrl+Shift+E"
 
-#: clientgui/AdvancedFrame.cpp:612
+#: AdvancedFrame.cpp:615
 msgid "Display diagnostic messages."
 msgstr "Parādīt diagnostikas ziņojumus."
 
-#: clientgui/AdvancedFrame.cpp:616
-msgid "Event Log Diagnostic Flags...\tCtrl+Shift+F"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:617
-msgid "Enable or disable various diagnostic messages"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:626
+#: AdvancedFrame.cpp:625 sg_BoincSimpleFrame.cpp:188
 #, c-format
 msgid "%s &help"
 msgstr "%s &palīdzība"
 
-#: clientgui/AdvancedFrame.cpp:632
+#: AdvancedFrame.cpp:631 sg_BoincSimpleFrame.cpp:194
 #, c-format
 msgid "Show information about %s"
 msgstr "Parādīt informāciju par %s"
 
-#: clientgui/AdvancedFrame.cpp:644
+#: AdvancedFrame.cpp:643
 #, c-format
 msgid "&%s help"
 msgstr "&%s palīdzība"
 
-#: clientgui/AdvancedFrame.cpp:650
+#: AdvancedFrame.cpp:649 sg_BoincSimpleFrame.cpp:212
 #, c-format
 msgid "Show information about the %s"
 msgstr "Parādīt informāciju par %s"
 
-#: clientgui/AdvancedFrame.cpp:662
+#: AdvancedFrame.cpp:661 sg_BoincSimpleFrame.cpp:224
 #, c-format
 msgid "%s &web site"
 msgstr "%s &mājas lapa"
 
-#: clientgui/AdvancedFrame.cpp:668
+#: AdvancedFrame.cpp:667 sg_BoincSimpleFrame.cpp:230
 #, c-format
 msgid "Show information about BOINC and %s"
 msgstr "Parādīt informāciju par BOINC un %s"
 
-#: clientgui/AdvancedFrame.cpp:680
-#: clientgui/BOINCTaskBar.cpp:544
+#: AdvancedFrame.cpp:679 BOINCTaskBar.cpp:530 sg_BoincSimpleFrame.cpp:242
 #, c-format
 msgid "&About %s..."
 msgstr "&Par %s..."
 
-#: clientgui/AdvancedFrame.cpp:686
+#: AdvancedFrame.cpp:685 sg_BoincSimpleFrame.cpp:248
 msgid "Licensing and copyright information."
 msgstr "Licencēšanas un autortiesību informācija."
 
-#: clientgui/AdvancedFrame.cpp:693
+#: AdvancedFrame.cpp:692 sg_BoincSimpleFrame.cpp:255
 msgid "&File"
 msgstr "&Fails"
 
-#: clientgui/AdvancedFrame.cpp:697
+#: AdvancedFrame.cpp:696 sg_BoincSimpleFrame.cpp:259
 msgid "&View"
 msgstr "&Skats"
 
-#: clientgui/AdvancedFrame.cpp:701
+#: AdvancedFrame.cpp:700 sg_BoincSimpleFrame.cpp:263
 msgid "&Tools"
 msgstr "&Rīki"
 
-#: clientgui/AdvancedFrame.cpp:705
+#: AdvancedFrame.cpp:704
 msgid "&Activity"
 msgstr "&Aktivitāte"
 
-#: clientgui/AdvancedFrame.cpp:709
+#: AdvancedFrame.cpp:708
 msgid "A&dvanced"
 msgstr "Pap&ildu"
 
-#: clientgui/AdvancedFrame.cpp:713
+#: AdvancedFrame.cpp:712 DlgEventLog.cpp:332 sg_BoincSimpleFrame.cpp:267
+#: wizardex.cpp:374 wizardex.cpp:381
 msgid "&Help"
 msgstr "&Palīdzība"
 
-#: clientgui/AdvancedFrame.cpp:1185
+#: AdvancedFrame.cpp:1199
 #, c-format
 msgid "%s - Stop using %s"
 msgstr "%s - Pārtraukt lietot %s"
 
-#: clientgui/AdvancedFrame.cpp:1190
+#: AdvancedFrame.cpp:1204
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -569,256 +524,222 @@ msgid ""
 "but you'll have to manage projects manually.\n"
 "\n"
 "Do you want to stop using %s?"
-msgstr ""
-"Ja jūs pārtrauksiet lietot %s,\n"
-"Jūs paturēsiet visus jūsu esošos projektus,\n"
-"bet jums būs jāpārvalda projektus manuāli.\n"
-"\n"
-"Vai jūs vēlaties pārtraukt lietot %s?"
+msgstr "Ja jūs pārtrauksiet lietot %s,\nJūs paturēsiet visus jūsu esošos projektus,\nbet jums būs jāpārvalda projektus manuāli.\n\nVai jūs vēlaties pārtraukt lietot %s?"
 
-#: clientgui/AdvancedFrame.cpp:1397
+#: AdvancedFrame.cpp:1401
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s - Slēgt pašreizējo klientu..."
 
-#: clientgui/AdvancedFrame.cpp:1406
+#: AdvancedFrame.cpp:1410
 #, c-format
 msgid ""
 "%s will shut down the current client\n"
 "and prompt you for another host to connect to."
-msgstr ""
-"%s slēgs pašreizējo klientu\n"
-"un prasīs jums citu hostu kam pievienoties."
+msgstr "%s slēgs pašreizējo klientu\nun prasīs jums citu hostu kam pievienoties."
 
-#: clientgui/AdvancedFrame.cpp:1806
+#: AdvancedFrame.cpp:1745 DlgAbout.cpp:119
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: clientgui/AdvancedFrame.cpp:1815
+#: AdvancedFrame.cpp:1754
 #, c-format
 msgid "%s has successfully added %s"
 msgstr "%s veiksmīgi pievienoja %s"
 
-#: clientgui/AdvancedFrame.cpp:1953
+#: AdvancedFrame.cpp:1893
 #, c-format
 msgid "%s - (%s)"
 msgstr "%s - (%s)"
 
-#: clientgui/AdvancedFrame.cpp:1957
+#: AdvancedFrame.cpp:1897
 #, c-format
 msgid "Connecting to %s"
 msgstr "Pieslēdzas pie %s"
 
-#: clientgui/AdvancedFrame.cpp:1960
+#: AdvancedFrame.cpp:1900
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "Pieslēdzās pie %s (%s)"
 
-#: clientgui/AlreadyExistsPage.cpp:184
+#: AlreadyExistsPage.cpp:184
 msgid "Username already in use"
 msgstr "Lietotājvārds jau tiek lietots"
 
-#: clientgui/AlreadyExistsPage.cpp:187
+#: AlreadyExistsPage.cpp:187
 msgid ""
 "An account with that username already exists and has a\n"
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"Konts ar norādīto e-pasta adresi jau eksistē un tam ir savādāka\n"
-"parole nekā jūs ievadījāt.\n"
-"\n"
-"Lūdzu, apmeklējiet projekta tīmekļa vietni un sekojiet tur norādītajām instrukcijām."
+msgstr "Konts ar norādīto e-pasta adresi jau eksistē un tam ir savādāka\nparole nekā jūs ievadījāt.\n\nLūdzu, apmeklējiet projekta tīmekļa vietni un sekojiet tur norādītajām instrukcijām."
 
-#: clientgui/AlreadyExistsPage.cpp:191
+#: AlreadyExistsPage.cpp:191
 msgid "Email address already in use"
 msgstr "E-pasta adrese jau ir lietošanā"
 
-#: clientgui/AlreadyExistsPage.cpp:194
+#: AlreadyExistsPage.cpp:194
 msgid ""
 "An account with that email address already exists and has a\n"
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"Konts ar norādīto e-pasta adresi jau eksistē un tam ir savādāka\n"
-"parole nekā jūs ievadījāt.\n"
-"\n"
-"Lūdzu, apmeklējiet projekta tīmekļa vietni un sekojiet tur norādītajām instrukcijām."
+msgstr "Konts ar norādīto e-pasta adresi jau eksistē un tam ir savādāka\nparole nekā jūs ievadījāt.\n\nLūdzu, apmeklējiet projekta tīmekļa vietni un sekojiet tur norādītajām instrukcijām."
 
-#: clientgui/AsyncRPC.cpp:1031
+#: AsyncRPC.cpp:1031
 msgid "Communicating with BOINC client.  Please wait ..."
 msgstr "Sazināšanās ar BOINC klientu.  Lūdzu, uzgaidiet ..."
 
-#: clientgui/AsyncRPC.cpp:1034
+#: AsyncRPC.cpp:1034
 #, c-format
 msgid "&Quit %s"
 msgstr "&Beigt %s"
 
-#: clientgui/AsyncRPC.cpp:1036
+#: AsyncRPC.cpp:1036
 #, c-format
 msgid "E&xit %s"
 msgstr "I&ziet %s"
 
-#: clientgui/AsyncRPC.cpp:1040
+#: AsyncRPC.cpp:1040
 #, c-format
 msgid "%s - Communication"
 msgstr "%s - Sazināšanās"
 
-#: clientgui/AsyncRPC.cpp:1056
+#: AsyncRPC.cpp:1056 DlgAdvPreferencesBase.cpp:107 sg_DlgPreferences.cpp:433
 msgid "Cancel"
 msgstr "Atcelt"
 
-#: clientgui/BOINCBaseFrame.cpp:504
+#: BOINCBaseFrame.cpp:505
 #, c-format
 msgid "%s - Connection Error"
 msgstr "%s - Savienojuma kļūda"
 
-#: clientgui/BOINCBaseFrame.cpp:513
+#: BOINCBaseFrame.cpp:514
 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 ""
-"Pašlaik jūs neesat autorizēts pārvaldīt klientu.\n"
-"Lūdzu, sazinieties ar jūsu administratoru, lai pievieno jūs 'boinc_users' lokālai lietotāju grupai."
+msgstr "Pašlaik jūs neesat autorizēts pārvaldīt klientu.\nLūdzu, sazinieties ar jūsu administratoru, lai pievieno jūs 'boinc_users' lokālai lietotāju grupai."
 
-#: clientgui/BOINCBaseFrame.cpp:522
+#: BOINCBaseFrame.cpp:523
 msgid ""
 "Authorization failed connecting to running client.\n"
 "Make sure you start this program in the same directory as the client."
-msgstr ""
-"Autorizācija neizdevās pievienojoties strādājošam klientam.\n"
-"Pārliecinieties, ka startējat šo programmu un klientu no viena kataloga."
+msgstr "Autorizācija neizdevās pievienojoties strādājošam klientam.\nPārliecinieties, ka startējat šo programmu un klientu no viena kataloga."
 
-#: clientgui/BOINCBaseFrame.cpp:524
+#: BOINCBaseFrame.cpp:525
 msgid "Authorization failed connecting to running client."
 msgstr "Autorizācija neizdevās pievienojoties strādājošam klientam."
 
-#: clientgui/BOINCBaseFrame.cpp:532
+#: BOINCBaseFrame.cpp:533
 msgid "The password you have provided is incorrect, please try again."
 msgstr "Jūsu norādītā parole ir nepareiza, lūdzu, mēģiniet vēlreiz."
 
-#: clientgui/BOINCBaseFrame.cpp:576
+#: BOINCBaseFrame.cpp:577
 #, c-format
 msgid "%s - Connection Failed"
 msgstr "%s - Savienojums neizdevās"
 
-#: clientgui/BOINCBaseFrame.cpp:585
+#: BOINCBaseFrame.cpp:586
 #, c-format
 msgid ""
 "%s is not able to connect to a %s client.\n"
 "Would you like to try to connect again?"
-msgstr ""
-"%s nespēja pieslēgties pie %s klienta.\n"
-"Vai vēlētos mēģināt pieslēgties vēlreiz?"
+msgstr "%s nespēja pieslēgties pie %s klienta.\nVai vēlētos mēģināt pieslēgties vēlreiz?"
 
-#: clientgui/BOINCBaseFrame.cpp:621
+#: BOINCBaseFrame.cpp:622
 #, c-format
 msgid "%s - Daemon Start Failed"
 msgstr "%s - Dēmona startēšana neizdevās"
 
-#: clientgui/BOINCBaseFrame.cpp:631
+#: BOINCBaseFrame.cpp:632
 #, 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 nespēja startēt %s klientu.\n"
-"Lūdzu palaidiet Vadības panelis->Administratīvie rīki->Services un startējiet BOINC servisu."
+msgstr "%s nespēja startēt %s klientu.\nLūdzu palaidiet Vadības panelis->Administratīvie rīki->Services un startējiet BOINC servisu."
 
-#: clientgui/BOINCBaseFrame.cpp:637
+#: BOINCBaseFrame.cpp:638
 #, c-format
 msgid ""
 "%s is not able to start a %s client.\n"
 "Please start the daemon and try again."
-msgstr ""
-"%s nespēja startēt %s klientu.\n"
-"Lūdzu, startējiet dēmonu un mēģiniet vēlreiz."
+msgstr "%s nespēja startēt %s klientu.\nLūdzu, startējiet dēmonu un mēģiniet vēlreiz."
 
-#: clientgui/BOINCBaseFrame.cpp:688
+#: BOINCBaseFrame.cpp:689
 #, c-format
 msgid "%s - Connection Status"
 msgstr "%s - Savienojuma statuss"
 
-#: clientgui/BOINCBaseFrame.cpp:699
+#: BOINCBaseFrame.cpp:700
 #, 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"
 "To connect up to your local computer please use 'localhost' as the host name."
-msgstr ""
-"%s pašlaik nav savienots ar %s klientu.\n"
-"Lūdzu lietojiet 'Papildu\\Izvēlēties datoru...' izvēlni, lai savienotos ar %s klientu.\n"
-"Lai savienotos ar pašreizējo datoru izmantojiet vārdu 'localhost'."
+msgstr "%s pašlaik nav savienots ar %s klientu.\nLūdzu lietojiet 'Papildu\\Izvēlēties datoru...' izvēlni, lai savienotos ar %s klientu.\nLai savienotos ar pašreizējo datoru izmantojiet vārdu 'localhost'."
 
-#: clientgui/BOINCBaseView.cpp:752
+#: BOINCBaseView.cpp:779
 msgid "Project web pages"
 msgstr "Projekta web lapas"
 
-#: clientgui/BOINCClientManager.cpp:573
+#: BOINCClientManager.cpp:575
 #, c-format
 msgid "%s - Unexpected Exit"
 msgstr "%s - Neparedzēta iziešana"
 
-#: clientgui/BOINCClientManager.cpp:583
+#: BOINCClientManager.cpp:585
 #, 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 ""
-"%s klients neparedzēti izgāja 3 reizes pēdējo %d minūšu laikā.\n"
-"Vai vēlētos to restartēt vēlreiz?"
+msgstr "%s klients neparedzēti izgāja 3 reizes pēdējo %d minūšu laikā.\nVai vēlētos to restartēt vēlreiz?"
 
-#: clientgui/BOINCDialupManager.cpp:61
+#: BOINCDialupManager.cpp:61
 #, c-format
 msgid "%s - Network Status"
 msgstr "%s - Tīkla statuss"
 
-#: clientgui/BOINCDialupManager.cpp:241
+#: BOINCDialupManager.cpp:241
 #, c-format
 msgid ""
 "%s needs to connect to the Internet.\n"
 "May it do so now?"
-msgstr ""
-"%s nepieciešams pieslēgties pie Internet.\n"
-"Vai drīkst to darīt tagad?"
+msgstr "%s nepieciešams pieslēgties pie Internet.\nVai drīkst to darīt tagad?"
 
-#: clientgui/BOINCDialupManager.cpp:254
+#: BOINCDialupManager.cpp:254
 #, c-format
 msgid "%s is connecting to the Internet."
 msgstr "%s savienojas ar Internet."
 
-#: clientgui/BOINCDialupManager.cpp:303
+#: BOINCDialupManager.cpp:303
 #, c-format
 msgid "%s has successfully connected to the Internet."
 msgstr "%s veiksmīgi savienojās ar Internet."
 
-#: clientgui/BOINCDialupManager.cpp:331
+#: BOINCDialupManager.cpp:331
 #, c-format
 msgid "%s failed to connect to the Internet."
 msgstr "%s neizdevās savienoties ar Internet."
 
-#: clientgui/BOINCDialupManager.cpp:372
+#: 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 noteica, ka ir savienojies ar Internet.\n"
-"Aktualizē visus projektus un atjauno datu pārsūtīšanu."
+msgstr "%s noteica, ka ir savienojies ar Internet.\nAktualizē visus projektus un atjauno datu pārsūtīšanu."
 
-#: clientgui/BOINCDialupManager.cpp:417
+#: BOINCDialupManager.cpp:417
 #, c-format
 msgid "%s has successfully disconnected from the Internet."
 msgstr "%s veiksmīgi atvienojās no Internet."
 
-#: clientgui/BOINCDialupManager.cpp:433
+#: BOINCDialupManager.cpp:433
 #, c-format
 msgid "%s failed to disconnected from the Internet."
 msgstr "%s neizdevās atvienoties no Internet."
 
-#: clientgui/BOINCGUIApp.cpp:595
+#: BOINCGUIApp.cpp:339
 #, c-format
 msgid ""
 "You currently are not authorized to manage the client.\n"
@@ -829,864 +750,798 @@ msgid ""
 " or\n"
 "  - contact your administrator to add you to the 'boinc_master'\n"
 "     user group."
-msgstr ""
-"Pašlaik jūs neesat autorizēti pārvaldīt klientu.\n"
-"\n"
-"Lai palaistu %s kā šis lietotājs, lūdzu:\n"
-"  - atkārtoti uzstādiet %s atbildot 'Jā' uz jautājumu par\n"
-"     ne-administratīviem lietotājiem\n"
-" vai\n"
-"  - sazinieties ar jūsu administratoru, lai pieliek jūs 'boinc_master'\n"
-"     lietotāju grupai."
-
-#: clientgui/BOINCGUIApp.cpp:601
+msgstr "Pašlaik jūs neesat autorizēti pārvaldīt klientu.\n\nLai palaistu %s kā šis lietotājs, lūdzu:\n  - atkārtoti uzstādiet %s atbildot 'Jā' uz jautājumu par\n     ne-administratīviem lietotājiem\n vai\n  - sazinieties ar jūsu administratoru, lai pieliek jūs 'boinc_master'\n     lietotāju grupai."
+
+#: BOINCGUIApp.cpp:345
 #, c-format
 msgid ""
 "%s ownership or permissions are not set properly; please reinstall %s.\n"
 "(Error code %d"
-msgstr ""
-"%s īpašumtiesības vai atļaujas nav uzstādītas pareizi; lūdzu, atkārtoti uzstādiet %s.\n"
-"(Kļūdas kods %d"
+msgstr "%s īpašumtiesības vai atļaujas nav uzstādītas pareizi; lūdzu, atkārtoti uzstādiet %s.\n(Kļūdas kods %d"
 
-#: clientgui/BOINCGUIApp.cpp:607
+#: BOINCGUIApp.cpp:351
 msgid " at "
 msgstr " iekš "
 
-#: clientgui/BOINCGUIApp.cpp:610
+#: BOINCGUIApp.cpp:354 MainDocument.cpp:2484 MainDocument.cpp:2534
+#: MainDocument.cpp:2554 ViewTransfers.cpp:803
 msgid ")"
 msgstr ")"
 
-#: clientgui/BOINCGUIApp.cpp:640
+#: BOINCGUIApp.cpp:384
 msgid ""
 "A reboot is required in order for BOINC to run properly.\n"
 "Please reboot your computer and try again."
-msgstr ""
-"Nepieciešama restartēšana, lai pareizi palaistu BOINC.\n"
-"Lūdzu, restartējiet datoru un mēģiniet vēlreiz."
+msgstr "Nepieciešama restartēšana, lai pareizi palaistu BOINC.\nLūdzu, restartējiet datoru un mēģiniet vēlreiz."
 
-#: clientgui/BOINCGUIApp.cpp:641
+#: BOINCGUIApp.cpp:385 DlgAbout.cpp:153
 msgid "BOINC Manager"
 msgstr "BOINC pārvaldnieks"
 
-#: clientgui/BOINCGUIApp.cpp:902
+#: BOINCGUIApp.cpp:572
 msgid "BOINC Manager was started by the operating system automatically"
 msgstr "Operētājsistēma automātiski startēja BOINC pārvaldnieku"
 
-#: clientgui/BOINCGUIApp.cpp:904
+#: BOINCGUIApp.cpp:574
 msgid "Startup BOINC so only the system tray icon is visible"
 msgstr "Startēt BOINC tā, lai rīkjoslas paziņojumu laukā būtu redzama tikai ikona"
 
-#: clientgui/BOINCGUIApp.cpp:906
+#: BOINCGUIApp.cpp:576
 msgid "Directory containing the BOINC Client executable"
 msgstr "Katalogs, kas satur BOINC klienta izpildāmos failus"
 
-#: clientgui/BOINCGUIApp.cpp:907
+#: BOINCGUIApp.cpp:577
 msgid "BOINC data directory"
 msgstr "BOINC datu katalogs"
 
-#: clientgui/BOINCGUIApp.cpp:909
+#: BOINCGUIApp.cpp:579
 msgid "Host name or IP address"
 msgstr "Hosta vārds vai IP adrese"
 
-#: clientgui/BOINCGUIApp.cpp:910
+#: BOINCGUIApp.cpp:580
 msgid "GUI RPC port number"
 msgstr "Grafiskā lietotāja intefeisa RPC porta numurs"
 
-#: clientgui/BOINCGUIApp.cpp:911
+#: BOINCGUIApp.cpp:581
 msgid "Password"
 msgstr "Parole"
 
-#: clientgui/BOINCGUIApp.cpp:912
+#: BOINCGUIApp.cpp:582
 msgid "Startup BOINC with these optional arguments"
 msgstr "Startē BOINC ar šiem izvēles argumentiem"
 
-#: clientgui/BOINCGUIApp.cpp:913
+#: BOINCGUIApp.cpp:583
 msgid "disable BOINC security users and permissions"
 msgstr "Atslēgt BOINC drošības lietotāju un atļauju lietošanu"
 
-#: clientgui/BOINCGUIApp.cpp:914
+#: BOINCGUIApp.cpp:584
 msgid "set skin debugging mode to enable skin manager error messages"
 msgstr "iestatīt ādiņu atkļūdošanas režīmā, lai atļautu ādiņu pārvaldnieka kļūdu paziņojumus"
 
-#: clientgui/BOINCGUIApp.cpp:915
+#: BOINCGUIApp.cpp:585
 msgid "multiple instances of BOINC Manager allowed"
 msgstr "atļautas vairākas BOINC pārvaldnieka instances"
 
-#: clientgui/BOINCGUIApp.cpp:917
+#: BOINCGUIApp.cpp:587
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr "Netiek lietots: XCode 4.2 kļūdas apiešanai"
 
-#: clientgui/BOINCGUIApp.cpp:1164
+#: BOINCGUIApp.cpp:814
 msgid "(Automatic Detection)"
 msgstr "(Automātiska noteikšana)"
 
-#: clientgui/BOINCGUIApp.cpp:1165
+#: BOINCGUIApp.cpp:815
 msgid "(Unknown)"
 msgstr "(Nezināms)"
 
-#: clientgui/BOINCGUIApp.cpp:1166
+#: BOINCGUIApp.cpp:816
 msgid "(User Defined)"
 msgstr "(Lietotāja definēts)"
 
-#: clientgui/BOINCTaskBar.cpp:522
+#: BOINCTaskBar.cpp:508
 #, c-format
 msgid "Open %s Web..."
 msgstr "Atvērt %s tīmekli..."
 
-#: clientgui/BOINCTaskBar.cpp:529
+#: BOINCTaskBar.cpp:515
 #, c-format
 msgid "Open %s..."
 msgstr "Atvērt %s..."
 
-#: clientgui/BOINCTaskBar.cpp:536
-#: clientgui/BOINCTaskBar.cpp:633
-#: clientgui/BOINCTaskBar.cpp:641
+#: BOINCTaskBar.cpp:522 BOINCTaskBar.cpp:619 BOINCTaskBar.cpp:627
 msgid "Snooze"
 msgstr "Iesnaust"
 
-#: clientgui/BOINCTaskBar.cpp:538
-#: clientgui/BOINCTaskBar.cpp:660
-#: clientgui/BOINCTaskBar.cpp:668
+#: BOINCTaskBar.cpp:524 BOINCTaskBar.cpp:646 BOINCTaskBar.cpp:654
 msgid "Snooze GPU"
 msgstr "Iesnaust GPU"
 
-#: clientgui/BOINCTaskBar.cpp:556
+#: BOINCTaskBar.cpp:542
 msgid "E&xit"
 msgstr "I&ziet"
 
-#: clientgui/BOINCTaskBar.cpp:626
+#: BOINCTaskBar.cpp:612 ViewProjects.cpp:718 ViewWork.cpp:795
+#: sg_BoincSimpleFrame.cpp:758 sg_ProjectCommandPopup.cpp:110
+#: sg_TaskCommandPopup.cpp:102
 msgid "Resume"
 msgstr "Atsākt"
 
-#: clientgui/BOINCTaskBar.cpp:653
+#: BOINCTaskBar.cpp:639
 msgid "Resume GPU"
 msgstr "Atsākt GPU"
 
-#: clientgui/BOINCTaskBar.cpp:727
+#: BOINCTaskBar.cpp:713
 msgid "Computing is enabled"
 msgstr "Skaitļošana atļauta"
 
-#: clientgui/BOINCTaskBar.cpp:731
+#: BOINCTaskBar.cpp:717
 msgid "Computing is suspended - "
 msgstr "Skaitļošana atlikta - "
 
-#: clientgui/BOINCTaskBar.cpp:741
+#: BOINCTaskBar.cpp:727
 msgid "GPU computing is enabled"
 msgstr "GPU skaitļošana atļauta"
 
-#: clientgui/BOINCTaskBar.cpp:744
+#: BOINCTaskBar.cpp:730
 msgid "GPU computing is suspended - "
 msgstr "GPU skaitļošana atlikta - "
 
-#: clientgui/BOINCTaskBar.cpp:753
+#: BOINCTaskBar.cpp:739
 msgid "Network is enabled"
 msgstr "Pi&eslēgums tīklam atļauts"
 
-#: clientgui/BOINCTaskBar.cpp:756
+#: BOINCTaskBar.cpp:742
 msgid "Network is suspended - "
 msgstr "P&ieslēgums tīklam atlikts - "
 
-#: clientgui/BOINCTaskBar.cpp:764
+#: BOINCTaskBar.cpp:750
 msgid "Reconnecting to client."
 msgstr "Atjauno saikni ar klientu."
 
-#: clientgui/BOINCTaskBar.cpp:766
+#: BOINCTaskBar.cpp:752
 msgid "Not connected to a client."
 msgstr "Nav savienots ar klientu."
 
-#: clientgui/BOINCTaskBar.cpp:819
+#: BOINCTaskBar.cpp:805
 #, c-format
 msgid "%s Notices"
 msgstr "%s Paziņojumi"
 
-#: clientgui/BOINCTaskBar.cpp:825
+#: BOINCTaskBar.cpp:811
 msgid "There are new notices - click to view."
 msgstr "Ir jauni paziņojumi - klikšķināt, lai skatītu."
 
-#: clientgui/CompletionErrorPage.cpp:199
+#: CompletionErrorPage.cpp:199
 msgid "Failed to add project"
 msgstr "Neizdevās pievienot projektu"
 
-#: clientgui/CompletionErrorPage.cpp:204
+#: CompletionErrorPage.cpp:204
 msgid "Failed to update account manager"
 msgstr "Neizdevās atjaunināt konta pārvaldnieku"
 
-#: clientgui/CompletionErrorPage.cpp:208
+#: CompletionErrorPage.cpp:208
 msgid "Failed to remove account manager"
 msgstr "Neizdevās noņemt konta pārvaldnieku"
 
-#: clientgui/CompletionErrorPage.cpp:212
+#: CompletionErrorPage.cpp:212
 msgid "Failed to add account manager"
 msgstr "Neizdevās pievienot konta pārvaldnieku"
 
-#: clientgui/CompletionErrorPage.cpp:221
+#: CompletionErrorPage.cpp:221
 msgid ""
 "Please try again later.\n"
 "\n"
 "Click Finish to close."
-msgstr ""
-"Lūdzu, vēlāk mēģiniet vēlreiz.\n"
-"\n"
-"Noklikšķiniet uz Beigt, lai aizvērtu."
+msgstr "Lūdzu, vēlāk mēģiniet vēlreiz.\n\nNoklikšķiniet uz Beigt, lai aizvērtu."
 
-#: clientgui/CompletionErrorPage.cpp:225
-#: clientgui/CompletionPage.cpp:222
-#: clientgui/CompletionPage.cpp:242
-#: clientgui/CompletionPage.cpp:273
+#: CompletionErrorPage.cpp:225 CompletionPage.cpp:222 CompletionPage.cpp:242
+#: CompletionPage.cpp:273
 msgid "Click Finish to close."
 msgstr "Noklikšķiniet Beigt, lai aizvērtu."
 
-#: clientgui/CompletionErrorPage.cpp:234
+#: CompletionErrorPage.cpp:234
 msgid "Messages from server:"
 msgstr "Ziņas no servera:"
 
-#: clientgui/CompletionPage.cpp:207
+#: CompletionPage.cpp:207
 msgid "Project added"
 msgstr "Projekts pievienots"
 
-#: clientgui/CompletionPage.cpp:213
+#: CompletionPage.cpp:213
 msgid "This project has been successfully added."
 msgstr "Šis projekts tapa veiksmīgi pievienots."
 
-#: clientgui/CompletionPage.cpp:218
+#: 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 ""
-"Kad jūs noklikšķināsiet Beigt jūsu pārlūkprogramma ies uz lapu,\n"
-"kur varēsiet norādīt jūsu konta vārdu un preferences."
+msgstr "Kad jūs noklikšķināsiet Beigt jūsu pārlūkprogramma ies uz lapu,\nkur varēsiet norādīt jūsu konta vārdu un preferences."
 
-#: clientgui/CompletionPage.cpp:232
+#: CompletionPage.cpp:232
 #, c-format
 msgid "Update from %s completed."
 msgstr "Atjaunošana no %s pabeigta."
 
-#: clientgui/CompletionPage.cpp:236
+#: CompletionPage.cpp:236
 msgid "Update completed."
 msgstr "Atjaunošana pabeigta."
 
-#: clientgui/CompletionPage.cpp:247
+#: CompletionPage.cpp:247
 msgid "Now using account manager"
 msgstr "Tagad lieto kontu pārvaldnieku"
 
-#: clientgui/CompletionPage.cpp:252
+#: CompletionPage.cpp:252
 #, c-format
 msgid "Welcome to %s!"
 msgstr "Laipni lūgti %s!"
 
-#: clientgui/CompletionPage.cpp:263
+#: CompletionPage.cpp:263
 #, c-format
 msgid "You are now using %s to manage accounts."
 msgstr "Tagad jūs lietojat %s, lai pārvaldītu kontus."
 
-#: clientgui/CompletionPage.cpp:267
+#: CompletionPage.cpp:267
 msgid "You are now using this account manager."
 msgstr "Tagad jūs lietojat šo kontu pārvaldnieku."
 
-#: clientgui/DlgAbout.cpp:113
+#: DlgAbout.cpp:113 mac/Mac_GUI.cpp:96
 #, c-format
 msgid "About %s"
 msgstr "Par %s"
 
-#: clientgui/DlgAbout.cpp:172
+#: DlgAbout.cpp:172
 msgid "Version:"
 msgstr "Versija:"
 
-#: clientgui/DlgAbout.cpp:180
+#: DlgAbout.cpp:180
 msgid "wxWidgets Version:"
 msgstr "wxWidgets versija:"
 
-#: clientgui/DlgAbout.cpp:188
+#: DlgAbout.cpp:188
 msgid "Copyright:"
 msgstr "Autortiesības:"
 
-#: clientgui/DlgAbout.cpp:192
+#: DlgAbout.cpp:192
 msgid ""
-"(C) 2003-2014 University of California, Berkeley.\n"
+"(C) 2003-2013 University of California, Berkeley.\n"
 "All Rights Reserved."
-msgstr ""
+msgstr "(C) 2003-2013 Kalifornijas Universitāte Berklijā.\nVisas tiesības aizsargātas."
 
-#: clientgui/DlgAbout.cpp:196
+#: DlgAbout.cpp:196
 msgid "Berkeley Open Infrastructure for Network Computing"
 msgstr "Berklijas atvērtā infrastruktūra tīklskaitļošanai"
 
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:399
-#: clientgui/DlgSelectComputer.cpp:163
+#: DlgAbout.cpp:208 DlgExitMessage.cpp:173 DlgGenericMessage.cpp:120
+#: DlgOptions.cpp:396 DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "&Labi"
 
-#: clientgui/DlgAdvPreferences.cpp:602
+#: DlgAdvPreferences.cpp:544
 msgid "invalid number"
 msgstr "nederīgs skaitlis"
 
-#: clientgui/DlgAdvPreferences.cpp:603
+#: DlgAdvPreferences.cpp:545
 msgid "invalid time, format is HH:MM"
 msgstr "nederīgs laiks, formāts ir SS:MM"
 
-#: clientgui/DlgAdvPreferences.cpp:604
+#: DlgAdvPreferences.cpp:546
 msgid "invalid time interval, format is HH:MM-HH:MM"
 msgstr "nederīgs laika intervāls, formāts ir SS:MM-SS:MM"
 
-#: clientgui/DlgAdvPreferences.cpp:817
+#: DlgAdvPreferences.cpp:751
 msgid "invalid input value detected"
 msgstr "noteikta nederīga ievadītā vērtība"
 
-#: clientgui/DlgAdvPreferences.cpp:819
+#: DlgAdvPreferences.cpp:753
 msgid "Validation Error"
 msgstr "Validācijas kļūda"
 
-#: clientgui/DlgAdvPreferences.cpp:969
-#: clientgui/DlgAdvPreferences.cpp:975
-#: clientgui/DlgAdvPreferences.cpp:981
+#: DlgAdvPreferences.cpp:885 DlgAdvPreferences.cpp:891
+#: DlgAdvPreferences.cpp:897
 msgid "Applications to add"
 msgstr "Pievienojamie lietojumi"
 
-#: clientgui/DlgAdvPreferences.cpp:998
+#: DlgAdvPreferences.cpp:914
 #, c-format
 msgid "'%s' is not an executable application."
 msgstr "'%s' nav izpildāma lietojumprogramma."
 
-#: clientgui/DlgAdvPreferences.cpp:999
-#: clientgui/DlgAdvPreferences.cpp:1046
-#: clientgui/DlgAdvPreferences.cpp:1070
+#: DlgAdvPreferences.cpp:915 DlgAdvPreferences.cpp:962
+#: DlgAdvPreferences.cpp:986
 msgid "Add Exclusive App"
 msgstr "Pievienot īpašu lietojumu"
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Name of application to add?"
 msgstr "Pievienojamā lietojuma vārds?"
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Add exclusive app"
 msgstr "Pievienot īpašu lietojumu"
 
-#: clientgui/DlgAdvPreferences.cpp:1045
+#: DlgAdvPreferences.cpp:961
 #, c-format
 msgid "Application names must end with '%s'"
 msgstr "Lietojumu vārdiem jābeidas ar '%s'"
 
-#: clientgui/DlgAdvPreferences.cpp:1069
+#: DlgAdvPreferences.cpp:985
 #, c-format
 msgid "'%s' is already in the list."
 msgstr "'%s' jau ir sarakstā."
 
-#: clientgui/DlgAdvPreferences.cpp:1161
+#: DlgAdvPreferences.cpp:1077
 msgid ""
 "Do you really want to clear all local preferences?\n"
 "(This will not affect exclusive applications.)"
-msgstr ""
-"Vai tiešām vēlaties notīrīt visas lokālās preferences?\n"
-"(Tas neietekmēs īpašos lietojumus.)"
+msgstr "Vai tiešām vēlaties notīrīt visas lokālās preferences?\n(Tas neietekmēs īpašos lietojumus.)"
 
-#: clientgui/DlgAdvPreferences.cpp:1162
+#: DlgAdvPreferences.cpp:1078 sg_DlgPreferences.cpp:1030
 msgid "Confirmation"
 msgstr "Apstiprināšana"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:49
+#: DlgAdvPreferencesBase.cpp:46 sg_DlgPreferences.cpp:946
 #, c-format
-msgid "%s - Computing preferences"
-msgstr ""
+msgid "%s - Preferences"
+msgstr "%s - Preferences"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:66
+#: DlgAdvPreferencesBase.cpp:62
 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 ""
-"Šis dialogs kontrolē preferences tikai šim datoram.\n"
-"Noklikšķiniet Labi, lai iestatītu preferences.\n"
-"Noklikšķināt Notīrīt, lai atjaunotu web-bāzētus iestatījumus (izņemot īpašos lietojumus)."
+msgstr "Šis dialogs kontrolē preferences tikai šim datoram.\nNoklikšķiniet Labi, lai iestatītu preferences.\nNoklikšķināt Notīrīt, lai atjaunotu web-bāzētus iestatījumus (izņemot īpašos lietojumus)."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:69
+#: DlgAdvPreferencesBase.cpp:65 sg_DlgPreferences.cpp:428
 msgid "Clear"
 msgstr "Notīrīt"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:70
+#: DlgAdvPreferencesBase.cpp:66
 msgid "clear all local preferences and close the dialog"
 msgstr "notīrīt visas lokālās preferences un aizvērt dialoga logu"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:85
+#: DlgAdvPreferencesBase.cpp:81
 msgid "processor usage"
 msgstr "precesora lietojums"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:88
+#: DlgAdvPreferencesBase.cpp:84
 msgid "network usage"
 msgstr "tīkla lietojums"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:91
+#: DlgAdvPreferencesBase.cpp:87
 msgid "disk and memory usage"
 msgstr "diska un atmiņas izlietojums"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:94
+#: DlgAdvPreferencesBase.cpp:90
 msgid "exclusive applications"
 msgstr "īpašās lietojumprogrammas"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:107
-#: clientgui/DlgDiagnosticLogFlags.cpp:104
+#: DlgAdvPreferencesBase.cpp:102 sg_DlgPreferences.cpp:424
 msgid "OK"
 msgstr "Labi"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:108
+#: DlgAdvPreferencesBase.cpp:103
 msgid "save all values and close the dialog"
 msgstr "saglabāt visas vērtības un aizvērt dialoga logu"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:114
+#: DlgAdvPreferencesBase.cpp:108
 msgid "close the dialog without saving"
 msgstr "aizvērt dialoga logu nesaglabājot"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:118
-#: clientgui/Localization.cpp:35
-#: clientgui/Localization.cpp:121
-#: clientgui/Localization.cpp:139
+#: DlgAdvPreferencesBase.cpp:112 Localization.cpp:35 Localization.cpp:121
+#: Localization.cpp:139 sg_BoincSimpleFrame.cpp:794 sg_DlgPreferences.cpp:439
 msgid "Help"
 msgstr "Palīdzība"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
+#: DlgAdvPreferencesBase.cpp:113
 msgid "shows the preferences web page"
 msgstr "rāda preferenču web lapu"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:141
+#: DlgAdvPreferencesBase.cpp:135
 msgid "Computing allowed"
 msgstr "Skaitļošana atļauta"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
+#: DlgAdvPreferencesBase.cpp:139
 msgid "While computer is on batteries"
 msgstr "Kamēr dators lieto akumulatoru"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:149
-msgid "check this if you want this computer to do work while it runs on batteries"
+#: DlgAdvPreferencesBase.cpp:142
+msgid ""
+"check this if you want this computer to do work while it runs on batteries"
 msgstr "atzīmējiet šo, ja vēlaties, ka šis dators izpilda darbu, kamēr strādā no akumulatora"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:155
+#: DlgAdvPreferencesBase.cpp:148
 msgid "While computer is in use"
 msgstr "Kamēr dators tiek lietots"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:158
-msgid "check this if you want this computer to do work even when you're using it"
+#: DlgAdvPreferencesBase.cpp:151
+msgid ""
+"check this if you want this computer to do work even when you're using it"
 msgstr "atzīmējiet šo, ja vēlaties, ka šis dators izpilda darbu, kamēr jūs to lietojat"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:164
+#: DlgAdvPreferencesBase.cpp:157
 msgid "Use GPU while computer is in use"
 msgstr "Lietot GPU kamēr dators ir lietošanā"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:167
-msgid "check this if you want your GPU to do work even when you're using the computer"
+#: DlgAdvPreferencesBase.cpp:160
+msgid ""
+"check this if you want your GPU to do work even when you're using the "
+"computer"
 msgstr "atzīmējiet šo, ja vēlaties, ka GPU veic darbu, pat tad, ja jūs lietojat datoru"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:179
+#: DlgAdvPreferencesBase.cpp:172
 msgid "Only after computer has been idle for"
 msgstr "Tikai pēc tam, kad dators bijis dīkstāvē"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:188
-msgid "do work only after you haven't used the computer for this number of minutes"
+#: DlgAdvPreferencesBase.cpp:182
+msgid ""
+"do work only after you haven't used the computer for this number of minutes"
 msgstr "veikt darbu tikai, ja neesat lietojis datoru norādīto minūšu skaitu"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:193
-#: clientgui/DlgAdvPreferencesBase.cpp:342
+#: DlgAdvPreferencesBase.cpp:187 DlgAdvPreferencesBase.cpp:336
+#: sg_DlgPreferences.cpp:417
 msgid "minutes"
 msgstr "minūtes"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:212
+#: DlgAdvPreferencesBase.cpp:206
 msgid "While processor usage is less than"
 msgstr "Kamēr procesora lietojums ir mazāks par"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:221
+#: DlgAdvPreferencesBase.cpp:216
 msgid "suspend work if processor usage exceeds this level"
 msgstr "atlikt darbu, ja procesora lietojums pārsniedz šo līmeni"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:226
+#: DlgAdvPreferencesBase.cpp:221
 msgid "percent (0 means no restriction)"
 msgstr "procenti (0 nozīmē bez ierobežojumiem)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:240
-#: clientgui/DlgAdvPreferencesBase.cpp:506
+#: DlgAdvPreferencesBase.cpp:235 DlgAdvPreferencesBase.cpp:496
 msgid "Every day between hours of"
 msgstr "Katru dienu starp stundām"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: DlgAdvPreferencesBase.cpp:239
 msgid "start work at this time"
 msgstr "startēt darbu šajā laikā"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:248
-#: clientgui/DlgAdvPreferencesBase.cpp:514
+#: DlgAdvPreferencesBase.cpp:243 DlgAdvPreferencesBase.cpp:504
+#: sg_DlgPreferences.cpp:326 sg_DlgPreferences.cpp:348
 msgid "and"
 msgstr "un"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:252
+#: DlgAdvPreferencesBase.cpp:247
 msgid "stop work at this time"
 msgstr "apstādināt darbu šajā laikā"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
-#: clientgui/DlgAdvPreferencesBase.cpp:522
+#: DlgAdvPreferencesBase.cpp:251 DlgAdvPreferencesBase.cpp:512
 msgid "(no restriction if equal)"
 msgstr "(bez ierobežojumiem, ja vienāds)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:261
-#: clientgui/DlgAdvPreferencesBase.cpp:527
+#: DlgAdvPreferencesBase.cpp:256 DlgAdvPreferencesBase.cpp:517
 msgid "Day-of-week override:"
 msgstr "Nedēļas dienās savādāk:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:266
-#: clientgui/DlgAdvPreferencesBase.cpp:532
+#: DlgAdvPreferencesBase.cpp:261 DlgAdvPreferencesBase.cpp:522
 msgid "check box to specify hours for this day of week"
 msgstr "atzīmējiet, lai norādītu stundas šai nedēļas dienai"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:272
-#: clientgui/DlgAdvPreferencesBase.cpp:538
+#: DlgAdvPreferencesBase.cpp:267 DlgAdvPreferencesBase.cpp:528
 msgid "Monday"
 msgstr "Pirmdiena"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:279
-#: clientgui/DlgAdvPreferencesBase.cpp:545
+#: DlgAdvPreferencesBase.cpp:274 DlgAdvPreferencesBase.cpp:535
 msgid "Tuesday"
 msgstr "Otrdiena"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:286
-#: clientgui/DlgAdvPreferencesBase.cpp:552
+#: DlgAdvPreferencesBase.cpp:281 DlgAdvPreferencesBase.cpp:542
 msgid "Wednesday"
 msgstr "Trešdiena"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:293
-#: clientgui/DlgAdvPreferencesBase.cpp:559
+#: DlgAdvPreferencesBase.cpp:288 DlgAdvPreferencesBase.cpp:549
 msgid "Thursday"
 msgstr "Ceturtdiena"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:300
-#: clientgui/DlgAdvPreferencesBase.cpp:566
+#: DlgAdvPreferencesBase.cpp:295 DlgAdvPreferencesBase.cpp:556
 msgid "Friday"
 msgstr "Piektdiena"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:307
-#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: DlgAdvPreferencesBase.cpp:302 DlgAdvPreferencesBase.cpp:563
 msgid "Saturday"
 msgstr "Sestdiena"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:580
+#: DlgAdvPreferencesBase.cpp:309 DlgAdvPreferencesBase.cpp:570
 msgid "Sunday"
 msgstr "Svētdiena"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:328
+#: DlgAdvPreferencesBase.cpp:323
 msgid "Other options"
 msgstr "Citas opcijas"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:336
+#: DlgAdvPreferencesBase.cpp:330
 msgid "Switch between applications every"
 msgstr "Pārslēgties starp lietojumiem katru"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:345
+#: DlgAdvPreferencesBase.cpp:339
 msgid "On multiprocessor systems, use at most"
 msgstr "Multiprocesoru sistēmās lietot ne vairāk kā"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
+#: DlgAdvPreferencesBase.cpp:346
 #, no-c-format
-msgid "% of the processors (0 means no restriction)"
-msgstr ""
+msgid "% of the processors (0 means ignore this setting)"
+msgstr "% no procesoriem (0 nozīmē ignorēt šo iestatījumu)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:355
-#: clientgui/DlgAdvPreferencesBase.cpp:618
-#: clientgui/DlgAdvPreferencesBase.cpp:640
-#: clientgui/DlgAdvPreferencesBase.cpp:661
-#: clientgui/DlgAdvPreferencesBase.cpp:683
-#: clientgui/DlgAdvPreferencesBase.cpp:694
+#: DlgAdvPreferencesBase.cpp:349 DlgAdvPreferencesBase.cpp:605
+#: DlgAdvPreferencesBase.cpp:627 DlgAdvPreferencesBase.cpp:648
+#: DlgAdvPreferencesBase.cpp:669 DlgAdvPreferencesBase.cpp:679
 msgid "Use at most"
 msgstr "Lietot ne vairāk kā"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:362
+#: DlgAdvPreferencesBase.cpp:356
 #, no-c-format
-msgid "% of CPU time (0 means no restriction)"
-msgstr ""
+msgid "% CPU time"
+msgstr "% CPU laiks"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:386
+#: DlgAdvPreferencesBase.cpp:378
 msgid "General options"
 msgstr "Vispārējas opcijas"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:395
+#: DlgAdvPreferencesBase.cpp:386
 msgid "Maximum download rate"
 msgstr "Maksimālais lejupielādes ātrums"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:401
-#: clientgui/DlgAdvPreferencesBase.cpp:410
-msgid "KBytes/second (0 means no restriction)"
-msgstr ""
+#: DlgAdvPreferencesBase.cpp:392 DlgAdvPreferencesBase.cpp:401
+msgid "KBytes/sec."
+msgstr "KBaiti/sek."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:404
+#: DlgAdvPreferencesBase.cpp:395
 msgid "Maximum upload rate"
 msgstr "Maksimālais augšupielādes ātrums"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:417
+#: DlgAdvPreferencesBase.cpp:406
+msgid "Transfer at most"
+msgstr "Pārsūtīt ne vairāk kā"
+
+#: DlgAdvPreferencesBase.cpp:412
+msgid "Mbytes"
+msgstr "MBaiti"
+
+#: DlgAdvPreferencesBase.cpp:415
+msgid "every"
+msgstr "katras"
+
+#: DlgAdvPreferencesBase.cpp:421 DlgAdvPreferencesBase.cpp:444
+#: DlgAdvPreferencesBase.cpp:463
+msgid "days"
+msgstr "dienas"
+
+#: DlgAdvPreferencesBase.cpp:429
 msgid "Minimum work buffer"
 msgstr "Minimālais darbu buferis"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:425
+#: DlgAdvPreferencesBase.cpp:438
 msgid "Try to maintain enough tasks to keep busy for this many days"
 msgstr "Dienu skaits uz cik censties nodrošināt ar darbu"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:431
-#: clientgui/DlgAdvPreferencesBase.cpp:449
-msgid "days (maximum value: 10)"
-msgstr ""
-
-#: clientgui/DlgAdvPreferencesBase.cpp:437
+#: DlgAdvPreferencesBase.cpp:450
 msgid "Max additional work buffer"
 msgstr "Maks. papildu darba buferis"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:445
+#: DlgAdvPreferencesBase.cpp:459
 msgid "In addition, maintain enough tasks for up to this many days"
 msgstr "Papildus, līdz pat cik dienām nodrošināt ar darbu "
 
-#: clientgui/DlgAdvPreferencesBase.cpp:454
-msgid "Transfer at most"
-msgstr "Pārsūtīt ne vairāk kā"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:462
-msgid "MBytes every"
-msgstr ""
-
-#: clientgui/DlgAdvPreferencesBase.cpp:468
-msgid "days (0 means no restriction)"
-msgstr ""
-
-#: clientgui/DlgAdvPreferencesBase.cpp:476
+#: DlgAdvPreferencesBase.cpp:466
 msgid "Skip image file verification"
 msgstr "Izlaist attēla faila pārbaudi"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:478
+#: DlgAdvPreferencesBase.cpp:468
 msgid "check this if your Internet provider modifies image files"
 msgstr "atzīmējiet, ja jūsu Internet pakalpojumu sniedzējs modificē attēlu failus"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:484
+#: DlgAdvPreferencesBase.cpp:476
 msgid "Connect options"
 msgstr "Savienojuma opcijas"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:487
+#: DlgAdvPreferencesBase.cpp:478
 msgid "Confirm before connecting to internet"
 msgstr "Apstiprināt pirms pievienoties Internet"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
+#: DlgAdvPreferencesBase.cpp:480
+msgid ""
+"if checked, a confirmation dialog will be displayed before trying to connect"
+" to the Internet"
 msgstr "ja atzīmēts, pirms pieslēgties Internet tiks parādīts apstiprināšanas dialoga logs"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:493
+#: DlgAdvPreferencesBase.cpp:484
 msgid "Disconnect when done"
 msgstr "Atvienoties, kad pabeigs"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:495
+#: DlgAdvPreferencesBase.cpp:486
 msgid ""
 "if checked, BOINC hangs up when network usage is done\n"
 "(only relevant for dialup-connection)"
-msgstr ""
-"ja atzīmēts, BOINC beigs sarunu, kad beigsies tīkla lietošana\n"
-"(saistošs tikai iezvanpieejas savienojumam)"
+msgstr "ja atzīmēts, BOINC beigs sarunu, kad beigsies tīkla lietošana\n(saistošs tikai iezvanpieejas savienojumam)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:501
+#: DlgAdvPreferencesBase.cpp:492
 msgid "Network usage allowed"
 msgstr "Tīkla lietošana atļauta"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:510
+#: DlgAdvPreferencesBase.cpp:500
 msgid "network usage start hour"
 msgstr "tīkla lietošanas sākumstunda"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:518
+#: DlgAdvPreferencesBase.cpp:508
 msgid "network usage stop hour"
 msgstr "tīkla lietošanas beigu stunda"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:610
-#: clientgui/DlgItemProperties.cpp:257
+#: DlgAdvPreferencesBase.cpp:598 DlgItemProperties.cpp:231
 msgid "Disk usage"
 msgstr "Diska izlietojums"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:622
+#: DlgAdvPreferencesBase.cpp:609
 msgid "the maximum disk space used by BOINC (in Gigabytes)"
 msgstr "maksimālais diska vietas apjoms, ko aizņem BOINC (Gigabaitos)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:626
-msgid "Gigabytes disk space (0 means no restriction)"
-msgstr ""
+#: DlgAdvPreferencesBase.cpp:613
+msgid "Gigabytes disk space"
+msgstr "Gigabaitu diska vietas"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:629
+#: DlgAdvPreferencesBase.cpp:616
 msgid "Leave at least"
 msgstr "Atstāt vismaz"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:633
+#: DlgAdvPreferencesBase.cpp:620
 msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
 msgstr "BOINC atstāj brīvu vietu diskā (Gigabaitos), vismaz"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:637
+#: DlgAdvPreferencesBase.cpp:624
 msgid "Gigabytes disk space free"
 msgstr "Brīva diska vieta gigabaitos"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
+#: DlgAdvPreferencesBase.cpp:631
 msgid "BOINC uses at most this percentage of total disk space"
 msgstr "Procentuāli no kopējas diska vietas BOINC lietos ne vairāk kā"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:649
+#: DlgAdvPreferencesBase.cpp:636
 #, no-c-format
 msgid "% of total disk space"
 msgstr "% no kopējās diska vietas"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:652
+#: DlgAdvPreferencesBase.cpp:639
 msgid "Tasks checkpoint to disk at most every"
 msgstr "Uzdevumi raksta kontropunktus uz diska ne vairāk kā katras"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
+#: DlgAdvPreferencesBase.cpp:645
 msgid "seconds"
 msgstr "sekundes"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:668
+#: DlgAdvPreferencesBase.cpp:655
 #, no-c-format
 msgid "% of page file (swap space)"
 msgstr "% no lapošanas faila (virtuālā atmiņa)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:675
+#: DlgAdvPreferencesBase.cpp:662
 msgid "Memory usage"
 msgstr "Atmiņas izlietojums"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
+#: DlgAdvPreferencesBase.cpp:676
 #, no-c-format
 msgid "% when computer is in use"
 msgstr "%, kad dators ir lietošanā"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:701
+#: DlgAdvPreferencesBase.cpp:686
 #, no-c-format
 msgid "% when computer is idle"
 msgstr "%, kad dators ir dīkstāvē"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:706
+#: DlgAdvPreferencesBase.cpp:691
 msgid "Leave applications in memory while suspended"
 msgstr "Atstāt lietojumus atmiņā, kamēr darbība atlikta"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:708
+#: DlgAdvPreferencesBase.cpp:693
 msgid "if checked, suspended work units are left in memory"
 msgstr "ja atzīmēts, atliktie darbi tiek paturēti atmiņā"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:728
-msgid "Suspend processor and network usage when these applications are running:"
+#: DlgAdvPreferencesBase.cpp:713
+msgid ""
+"Suspend processor and network usage when these applications are running:"
 msgstr "Pārtraukt procesora un tīkla lietošanu, ja tiek lietotas šīs lietojumprogrammas:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:738
+#: DlgAdvPreferencesBase.cpp:722
 msgid "Add..."
 msgstr "Pievienot..."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:739
+#: DlgAdvPreferencesBase.cpp:723
 msgid "Add an application to this list"
 msgstr "Pievienot lietojumu šim sarakstam"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:744
+#: DlgAdvPreferencesBase.cpp:728 ViewProjects.cpp:202
+#: sg_ProjectCommandPopup.cpp:85
 msgid "Remove"
 msgstr "Izņemt"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:745
+#: DlgAdvPreferencesBase.cpp:729
 msgid "Remove an application from this list"
 msgstr "Izņemt lietojumu no šī saraksta"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:754
+#: DlgAdvPreferencesBase.cpp:738
 msgid "For advanced options, refer to "
 msgstr "Pēc papildu opcijām, skatīt "
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:65
-#, c-format
-msgid "%s Diagnostic Log Flags"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:83
-msgid "These flags enable various types of diagnostic messages in the Event Log."
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:105
-msgid "Save all values and close the dialog"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:108
-msgid "Defaults"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:109
-msgid "Restore default settings"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:113
-msgid "Close the dialog without saving"
-msgstr ""
-
-#: clientgui/DlgEventLog.cpp:226
+#: DlgEventLog.cpp:219
 #, c-format
 msgid "%s - Event Log"
 msgstr "%s - Žurnāls"
 
-#: clientgui/DlgEventLog.cpp:236
+#: DlgEventLog.cpp:232 ViewMessages.cpp:117 ViewProjects.cpp:219
+#: ViewStatistics.cpp:435 ViewStatistics.cpp:2009 ViewTransfers.cpp:182
+#: ViewWork.cpp:232
 msgid "Project"
 msgstr "Projekts"
 
-#: clientgui/DlgEventLog.cpp:237
+#: DlgEventLog.cpp:233 ViewMessages.cpp:118
 msgid "Time"
 msgstr "Laiks"
 
-#: clientgui/DlgEventLog.cpp:238
+#: DlgEventLog.cpp:234 ViewMessages.cpp:119
 msgid "Message"
 msgstr "Ziņojums"
 
-#: clientgui/DlgEventLog.cpp:300
-#: clientgui/DlgEventLog.cpp:364
+#: DlgEventLog.cpp:290 DlgEventLog.cpp:354
 msgid "&Show only this project"
 msgstr "&Rādīt tikai šo projektu"
 
-#: clientgui/DlgEventLog.cpp:304
+#: DlgEventLog.cpp:294
 msgid "Copy &All"
 msgstr "Kopēt &visu"
 
-#: clientgui/DlgEventLog.cpp:306
-#: clientgui/DlgEventLog.cpp:310
+#: DlgEventLog.cpp:296 DlgEventLog.cpp:300 ViewMessages.cpp:89
 msgid "Copy all the messages to the clipboard."
 msgstr "Kopēt visus ziņojumus starpliktuvē."
 
-#: clientgui/DlgEventLog.cpp:315
+#: DlgEventLog.cpp:305
 msgid "Copy &Selected"
 msgstr "Kopēt &atlasīto"
 
-#: clientgui/DlgEventLog.cpp:318
-#: clientgui/DlgEventLog.cpp:326
-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."
+#: DlgEventLog.cpp:308 DlgEventLog.cpp:316 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 "Kopēt atlasītos ziņojumus starpliktuvē. Jūs varat atlasīt vairākas ziņas pieturot Shift vai komandas taustiņus, kamēr spiežat uz ziņojumiem."
 
-#: clientgui/DlgEventLog.cpp:320
-#: clientgui/DlgEventLog.cpp:328
-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."
+#: DlgEventLog.cpp:310 DlgEventLog.cpp:318 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 "Kopēt atlasītos ziņojumus starpliktuvē. Jūs varat atlasīt vairākas ziņas pieturot Shift vai Ctrl taustiņus, kamēr spiežat uz ziņojuma."
 
-#: clientgui/DlgEventLog.cpp:335
-#: clientgui/DlgItemProperties.cpp:67
+#: DlgEventLog.cpp:325 DlgItemProperties.cpp:67
 msgid "&Close"
 msgstr "&Aizvērt"
 
-#: clientgui/DlgEventLog.cpp:344
+#: DlgEventLog.cpp:334 sg_BoincSimpleFrame.cpp:798 sg_DlgPreferences.cpp:442
 #, c-format
 msgid "Get help with %s"
 msgstr "Saņemt palīdzību par %s"
 
-#: clientgui/DlgEventLog.cpp:358
+#: DlgEventLog.cpp:348
 msgid "Show all &messages"
 msgstr "Rādīt visus &ziņojumus"
 
-#: clientgui/DlgEventLog.cpp:359
-#: clientgui/DlgEventLog.cpp:361
+#: DlgEventLog.cpp:349 DlgEventLog.cpp:351
 msgid "Show messages for all projects"
 msgstr "Rādīt ziņojumus visiem projektiem"
 
-#: clientgui/DlgEventLog.cpp:365
-#: clientgui/DlgEventLog.cpp:367
+#: DlgEventLog.cpp:355 DlgEventLog.cpp:357
 msgid "Show only the messages for the selected project"
 msgstr "Rādīt ziņojumus tikai atlasītajiem projektiem"
 
-#: clientgui/DlgExitMessage.cpp:82
+#: DlgExitMessage.cpp:82
 #, c-format
 msgid "%s - Exit Confirmation"
 msgstr "%s - Iziešanas apstiprinājums"
 
-#: clientgui/DlgExitMessage.cpp:130
+#: DlgExitMessage.cpp:130
 #, c-format
 msgid ""
 "You have requested to exit the %s,\n"
@@ -1695,15 +1550,9 @@ msgid ""
 "\n"
 "If you also want to stop running the tasks,\n"
 "choose from the following options:"
-msgstr ""
-"Jūs pieprasījāt iziet no %s,\n"
-"kas atļauj redzēt un pārvaldīt\n"
-"uzdevumus, kas izpildās uz jūsu datora.\n"
-"\n"
-"Ja jūs vēlaties arī apturēt šos uzdevumus,\n"
-"tad izvēlieties no sekojošām opcijām:"
+msgstr "Jūs pieprasījāt iziet no %s,\nkas atļauj redzēt un pārvaldīt\nuzdevumus, kas izpildās uz jūsu datora.\n\nJa jūs vēlaties arī apturēt šos uzdevumus,\ntad izvēlieties no sekojošām opcijām:"
 
-#: clientgui/DlgExitMessage.cpp:135
+#: DlgExitMessage.cpp:135
 #, c-format
 msgid ""
 "This will shut down %s and its tasks until either the\n"
@@ -1712,1000 +1561,916 @@ msgid ""
 "In most cases, it is better just to close the %s window\n"
 "rather than to exit the application; that will allow %s to run its\n"
 "tasks at the times you selected in your preferences."
-msgstr ""
-"Tas izslēgs %s un tā uzdevumus līdz vai nu\n"
-"%s vai %s ekrānsaudzētājs tiks nostartēti no jauna.\n"
-"\n"
-"Vairākumā gadījumu labāk ir vienkārši aizvērt %s logu,\n"
-"nekā iziet no lietojumprogrammas; tas ļaus %s izpildīt\n"
-"uzdevumus laikos, kurus izvēlējāties jūsu preferencēs."
+msgstr "Tas izslēgs %s un tā uzdevumus līdz vai nu\n%s vai %s ekrānsaudzētājs tiks nostartēti no jauna.\n\nVairākumā gadījumu labāk ir vienkārši aizvērt %s logu,\nnekā iziet no lietojumprogrammas; tas ļaus %s izpildīt\nuzdevumus laikos, kurus izvēlējāties jūsu preferencēs."
 
-#: clientgui/DlgExitMessage.cpp:153
+#: DlgExitMessage.cpp:153
 #, c-format
 msgid "Stop running tasks when exiting the %s"
 msgstr "Apturēt izpildāmos uzdevumus, kad iziet no %s"
 
-#: clientgui/DlgExitMessage.cpp:165
+#: DlgExitMessage.cpp:165
 msgid "Remember this decision and do not show this dialog."
 msgstr "Atcerēties šo lēmumu un nerādīt vairs dialoga logu."
 
-#: clientgui/DlgExitMessage.cpp:178
-#: clientgui/DlgGenericMessage.cpp:125
-#: clientgui/DlgOptions.cpp:404
-#: clientgui/DlgSelectComputer.cpp:168
+#: DlgExitMessage.cpp:178 DlgGenericMessage.cpp:125 DlgOptions.cpp:401
+#: DlgSelectComputer.cpp:168 wizardex.cpp:378
 msgid "&Cancel"
 msgstr "&Atcelt"
 
-#: clientgui/DlgGenericMessage.cpp:112
+#: DlgGenericMessage.cpp:112
 msgid "Don't show this dialog again."
 msgstr "Vairs nerādīt šo dialoga logu."
 
-#: clientgui/DlgItemProperties.cpp:194
-#: clientgui/DlgItemProperties.cpp:197
-#: clientgui/DlgItemProperties.cpp:200
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:168 DlgItemProperties.cpp:171
+#: DlgItemProperties.cpp:174 DlgItemProperties.cpp:177
 msgid "Don't fetch tasks for "
 msgstr "Neņemt uzdevumus priekš"
 
-#: clientgui/DlgItemProperties.cpp:194
+#: DlgItemProperties.cpp:168
 msgid "Project preference"
 msgstr "Projekta preferences"
 
-#: clientgui/DlgItemProperties.cpp:197
+#: DlgItemProperties.cpp:171
 msgid "Account manager preference"
 msgstr "Konta pārvaldnieka preferences"
 
-#: clientgui/DlgItemProperties.cpp:200
+#: DlgItemProperties.cpp:174
 msgid "Project has no apps for "
 msgstr "Projektam nav lietojumu priekš"
 
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:177
 msgid "Client configuration excludes "
 msgstr "Klienta konfigurācija izslēdz "
 
-#: clientgui/DlgItemProperties.cpp:207
+#: DlgItemProperties.cpp:181
 msgid " work fetch deferred for"
 msgstr "darba ņemšana atlikta uz"
 
-#: clientgui/DlgItemProperties.cpp:208
+#: DlgItemProperties.cpp:182
 msgid " work fetch deferral interval"
 msgstr "darba ņemšanas atlikšanas intervāls"
 
-#: clientgui/DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:213
 msgid "Properties of project "
 msgstr "Projekta īpašības "
 
-#: clientgui/DlgItemProperties.cpp:243
-#: clientgui/DlgOptions.cpp:221
+#: DlgItemProperties.cpp:217 DlgOptions.cpp:218
 msgid "General"
 msgstr "Vispārējais"
 
-#: clientgui/DlgItemProperties.cpp:244
+#: DlgItemProperties.cpp:218
 msgid "Master URL"
 msgstr "Centrālais URL"
 
-#: clientgui/DlgItemProperties.cpp:245
+#: DlgItemProperties.cpp:219
 msgid "User name"
 msgstr "Lietotāja vārds"
 
-#: clientgui/DlgItemProperties.cpp:246
+#: DlgItemProperties.cpp:220
 msgid "Team name"
 msgstr "Komandas vārds"
 
-#: clientgui/DlgItemProperties.cpp:247
+#: DlgItemProperties.cpp:221 ViewProjects.cpp:224
 msgid "Resource share"
 msgstr "Resursu daļa"
 
-#: clientgui/DlgItemProperties.cpp:249
+#: DlgItemProperties.cpp:223
 msgid "Scheduler RPC deferred for"
 msgstr "Plānotāja RPC atlikts uz"
 
-#: clientgui/DlgItemProperties.cpp:252
+#: DlgItemProperties.cpp:226
 msgid "File downloads deferred for"
 msgstr "Faila lejupielāde atlikta uz"
 
-#: clientgui/DlgItemProperties.cpp:255
+#: DlgItemProperties.cpp:229
 msgid "File uploads deferred for"
 msgstr "Failu augšupielāde atlikta uz"
 
-#: clientgui/DlgItemProperties.cpp:258
+#: DlgItemProperties.cpp:232
 msgid "Computer ID"
 msgstr "Datora ID"
 
-#: clientgui/DlgItemProperties.cpp:260
+#: DlgItemProperties.cpp:234
 msgid "Non CPU intensive"
 msgstr "CPU neintensitīvs"
 
-#: 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
+#: DlgItemProperties.cpp:234 DlgItemProperties.cpp:236
+#: DlgItemProperties.cpp:237 DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:242 DlgItemProperties.cpp:251
+#: DlgItemProperties.cpp:254 DlgItemProperties.cpp:257
 msgid "yes"
 msgstr "jā"
 
-#: clientgui/DlgItemProperties.cpp:262
+#: DlgItemProperties.cpp:236
 msgid "Suspended via GUI"
 msgstr "Atlikts caur GUI"
 
-#: clientgui/DlgItemProperties.cpp:262
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:236 DlgItemProperties.cpp:237
 msgid "no"
 msgstr "nē"
 
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:237
 msgid "Don't request more work"
 msgstr "Nepieprasīt vairāk darbu"
 
-#: clientgui/DlgItemProperties.cpp:265
+#: DlgItemProperties.cpp:239
 msgid "Scheduler call in progress"
 msgstr "Izveic plānotāja pieprasījumu"
 
-#: clientgui/DlgItemProperties.cpp:268
+#: DlgItemProperties.cpp:242
 msgid "Trickle-up pending"
 msgstr "Sūkties līdz"
 
-#: clientgui/DlgItemProperties.cpp:271
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:245 DlgItemProperties.cpp:247
 msgid "Host location"
 msgstr "Hosta atrašanās vieta"
 
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:247
 msgid "default"
 msgstr "noklusētais"
 
-#: clientgui/DlgItemProperties.cpp:277
+#: DlgItemProperties.cpp:251
 msgid "Added via account manager"
 msgstr "Pievienots caur konta pārvaldnieku"
 
-#: clientgui/DlgItemProperties.cpp:280
+#: DlgItemProperties.cpp:254
 msgid "Remove when tasks done"
 msgstr "Noņemt, kad uzdevums pabeigts"
 
-#: clientgui/DlgItemProperties.cpp:283
+#: DlgItemProperties.cpp:257
 msgid "Ended"
 msgstr "Pabeigts"
 
-#: clientgui/DlgItemProperties.cpp:285
-msgid "Tasks completed"
-msgstr ""
-
-#: clientgui/DlgItemProperties.cpp:286
-msgid "Tasks failed"
-msgstr ""
-
-#: clientgui/DlgItemProperties.cpp:288
+#: DlgItemProperties.cpp:259
 msgid "Credit"
 msgstr "Kredīts"
 
-#: clientgui/DlgItemProperties.cpp:289
+#: DlgItemProperties.cpp:260
 msgid "User"
 msgstr "Lietotājs"
 
-#: clientgui/DlgItemProperties.cpp:296
+#: DlgItemProperties.cpp:267
 msgid "Host"
 msgstr "Hosts"
 
-#: clientgui/DlgItemProperties.cpp:305
+#: DlgItemProperties.cpp:276
 msgid "Scheduling"
 msgstr "Plānošana"
 
-#: clientgui/DlgItemProperties.cpp:306
+#: DlgItemProperties.cpp:277
 msgid "Scheduling priority"
 msgstr "Plānošanas prioritāte"
 
-#: clientgui/DlgItemProperties.cpp:307
+#: DlgItemProperties.cpp:278
 msgid "CPU"
 msgstr "CPU"
 
-#: clientgui/DlgItemProperties.cpp:331
+#: DlgItemProperties.cpp:302
 msgid "Duration correction factor"
 msgstr "Ilguma korekcijas faktors"
 
-#: clientgui/DlgItemProperties.cpp:345
+#: DlgItemProperties.cpp:316
 msgid "Properties of task "
 msgstr "Īpašības uzdevumam "
 
-#: clientgui/DlgItemProperties.cpp:357
+#: DlgItemProperties.cpp:328 ViewWork.cpp:238
 msgid "Application"
 msgstr "Lietojums"
 
-#: clientgui/DlgItemProperties.cpp:358
+#: DlgItemProperties.cpp:329 ViewWork.cpp:239
 msgid "Name"
 msgstr "Uzdevums"
 
-#: clientgui/DlgItemProperties.cpp:359
+#: DlgItemProperties.cpp:330
 msgid "State"
 msgstr "Stāvoklis"
 
-#: clientgui/DlgItemProperties.cpp:362
+#: DlgItemProperties.cpp:333
 msgid "Received"
 msgstr "Saņemts"
 
-#: clientgui/DlgItemProperties.cpp:365
+#: DlgItemProperties.cpp:336
 msgid "Report deadline"
 msgstr "Termiņš"
 
-#: clientgui/DlgItemProperties.cpp:367
+#: DlgItemProperties.cpp:338
 msgid "Resources"
 msgstr "Resursi"
 
-#: clientgui/DlgItemProperties.cpp:370
+#: DlgItemProperties.cpp:341
 msgid "Estimated computation size"
 msgstr "Plānotais skaitļošanas izmērs"
 
-#: clientgui/DlgItemProperties.cpp:373
+#: DlgItemProperties.cpp:344
 msgid "CPU time at last checkpoint"
 msgstr "CPU laiks kopš pēdējā kontrolpunkta"
 
-#: clientgui/DlgItemProperties.cpp:374
-#: clientgui/DlgItemProperties.cpp:389
+#: DlgItemProperties.cpp:345 DlgItemProperties.cpp:360
 msgid "CPU time"
 msgstr "CPU laiks"
 
-#: clientgui/DlgItemProperties.cpp:376
-#: clientgui/DlgItemProperties.cpp:390
+#: DlgItemProperties.cpp:347 DlgItemProperties.cpp:361
 msgid "Elapsed time"
 msgstr "Pavadītais laiks"
 
-#: clientgui/DlgItemProperties.cpp:378
+#: DlgItemProperties.cpp:349
 msgid "Estimated time remaining"
 msgstr "Plānotais atlikušais laiks"
 
-#: clientgui/DlgItemProperties.cpp:379
+#: DlgItemProperties.cpp:350
 msgid "Fraction done"
 msgstr "Daļa pabeigta"
 
-#: clientgui/DlgItemProperties.cpp:380
+#: DlgItemProperties.cpp:351
 msgid "Virtual memory size"
 msgstr "Virtuālās atmiņas izmērs"
 
-#: clientgui/DlgItemProperties.cpp:381
+#: DlgItemProperties.cpp:352
 msgid "Working set size"
 msgstr "Darba kopuma izmērs"
 
-#: clientgui/DlgItemProperties.cpp:383
+#: DlgItemProperties.cpp:354
 msgid "Directory"
 msgstr "Katalogs"
 
-#: clientgui/DlgItemProperties.cpp:386
+#: DlgItemProperties.cpp:357
 msgid "Process ID"
 msgstr "Precesa ID"
 
-#: clientgui/DlgItemProperties.cpp:456
+#: DlgItemProperties.cpp:427 ViewWork.cpp:1032 sg_TaskPanel.cpp:823
 msgid "Local: "
 msgstr "Lokāls: "
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: DlgOptions.cpp:129 DlgOptions.cpp:135
 msgid "Options"
 msgstr "Opcijas"
 
-#: clientgui/DlgOptions.cpp:178
+#: DlgOptions.cpp:175
 msgid "Language:"
 msgstr "Valoda:"
 
-#: clientgui/DlgOptions.cpp:185
+#: DlgOptions.cpp:182
 msgid "What language should BOINC use?"
 msgstr "Kādu valodu lai lieto BOINC?"
 
-#: clientgui/DlgOptions.cpp:189
+#: DlgOptions.cpp:186
 msgid "Notice reminder interval:"
 msgstr "Paziņojuma atgādinājuma intervāls:"
 
-#: clientgui/DlgOptions.cpp:196
+#: DlgOptions.cpp:193
 msgid "How often should BOINC remind you of new notices?"
 msgstr "Cik bieži lai BOINC jums atgādina par jauniem paziņojumiem?"
 
-#: clientgui/DlgOptions.cpp:201
+#: DlgOptions.cpp:198
 msgid "Run Manager at login?"
 msgstr "Vai palast pārvaldnieku pie pieteikšanās?"
 
-#: clientgui/DlgOptions.cpp:207
+#: DlgOptions.cpp:204
 msgid "Run the BOINC Manager when you log on."
 msgstr "Palaist BOINC pārvaldnieku, kad piesakaties sistēmā."
 
-#: clientgui/DlgOptions.cpp:212
+#: DlgOptions.cpp:209
 msgid "Enable Manager exit dialog?"
 msgstr "Vai iespējot pārvaldnieka iziešanas dialogu?"
 
-#: clientgui/DlgOptions.cpp:218
+#: DlgOptions.cpp:215
 msgid "Display the exit dialog when shutting down the Manager."
 msgstr "Parāda iziešanas dialoga logu, kad tiek izslēgts pārvaldnieks."
 
-#: clientgui/DlgOptions.cpp:229
+#: DlgOptions.cpp:226
 msgid "Dial-up and Virtual Private Network settings"
 msgstr "Iezvanpieejas un virtuālā privātā tīkla iestatījumi"
 
-#: clientgui/DlgOptions.cpp:243
+#: DlgOptions.cpp:240
 msgid "&Set Default"
 msgstr "Ie&statīt kā noklusēto"
 
-#: clientgui/DlgOptions.cpp:248
+#: DlgOptions.cpp:245
 msgid "&Clear Default"
 msgstr "Noņemt no&klusēto"
 
-#: clientgui/DlgOptions.cpp:255
+#: DlgOptions.cpp:252
 msgid "Default Connection:"
 msgstr "Noklusētais pieslēgums:"
 
-#: clientgui/DlgOptions.cpp:262
+#: DlgOptions.cpp:259
 msgid "Connections"
 msgstr "Pieslēgumi"
 
-#: clientgui/DlgOptions.cpp:271
+#: DlgOptions.cpp:268
 msgid "Connect via HTTP proxy server"
 msgstr "Pieslēgties caur HTTP proxy serveri"
 
-#: clientgui/DlgOptions.cpp:275
+#: DlgOptions.cpp:272
 msgid "HTTP Proxy Server Configuration"
 msgstr "HTTP proxy servera konfigurācija"
 
-#: clientgui/DlgOptions.cpp:283
-#: clientgui/DlgOptions.cpp:347
+#: DlgOptions.cpp:280 DlgOptions.cpp:344
 msgid "Address:"
 msgstr "Adrese:"
 
-#: clientgui/DlgOptions.cpp:291
-#: clientgui/DlgOptions.cpp:355
+#: DlgOptions.cpp:288 DlgOptions.cpp:352 ProxyPage.cpp:340 ProxyPage.cpp:360
 msgid "Port:"
 msgstr "Ports:"
 
-#: clientgui/DlgOptions.cpp:299
-#: clientgui/DlgOptions.cpp:363
+#: DlgOptions.cpp:296 DlgOptions.cpp:360
 msgid "Don't use proxy for:"
 msgstr "Nelietot proxy priekš:"
 
-#: clientgui/DlgOptions.cpp:306
-#: clientgui/DlgOptions.cpp:370
+#: DlgOptions.cpp:303 DlgOptions.cpp:367
 msgid "Leave these blank if not needed"
 msgstr "Atstājiet laukus tukšus, ja nevajag"
 
-#: clientgui/DlgOptions.cpp:312
-#: clientgui/DlgOptions.cpp:376
+#: DlgOptions.cpp:309 DlgOptions.cpp:373 ProxyPage.cpp:343 ProxyPage.cpp:363
 msgid "User Name:"
 msgstr "Lietotāja vārds:"
 
-#: clientgui/DlgOptions.cpp:320
-#: clientgui/DlgOptions.cpp:384
-#: clientgui/DlgSelectComputer.cpp:152
+#: DlgOptions.cpp:317 DlgOptions.cpp:381 DlgSelectComputer.cpp:152
+#: ProxyPage.cpp:346 ProxyPage.cpp:366
 msgid "Password:"
 msgstr "Parole:"
 
-#: clientgui/DlgOptions.cpp:327
+#: DlgOptions.cpp:324
 msgid "HTTP Proxy"
 msgstr "HTTP proxy"
 
-#: clientgui/DlgOptions.cpp:335
+#: DlgOptions.cpp:332
 msgid "Connect via SOCKS proxy server"
 msgstr "Pieslēgties caur SOCKS proxy serveri"
 
-#: clientgui/DlgOptions.cpp:339
+#: DlgOptions.cpp:336
 msgid "SOCKS Proxy Server Configuration"
 msgstr "SOCKS proxy servera konfigurācija"
 
-#: clientgui/DlgOptions.cpp:391
+#: DlgOptions.cpp:388
 msgid "SOCKS Proxy"
 msgstr "SOCKS proxy"
 
-#: clientgui/DlgOptions.cpp:589
+#: DlgOptions.cpp:586
 msgid "always"
 msgstr "vienmēr"
 
-#: clientgui/DlgOptions.cpp:590
+#: DlgOptions.cpp:587
 msgid "1 hour"
 msgstr "1 stundu"
 
-#: clientgui/DlgOptions.cpp:591
+#: DlgOptions.cpp:588
 msgid "6 hours"
 msgstr "6 stundas"
 
-#: clientgui/DlgOptions.cpp:592
+#: DlgOptions.cpp:589
 msgid "1 day"
 msgstr "1 dienu"
 
-#: clientgui/DlgOptions.cpp:593
+#: DlgOptions.cpp:590
 msgid "1 week"
 msgstr "1 nedēļu"
 
-#: clientgui/DlgOptions.cpp:594
+#: DlgOptions.cpp:591
 msgid "never"
 msgstr "nekad"
 
-#: clientgui/DlgOptions.cpp:691
+#: DlgOptions.cpp:688
 #, c-format
 msgid "%s - Language Selection"
 msgstr "%s - valodas atlase"
 
-#: clientgui/DlgOptions.cpp:698
+#: DlgOptions.cpp:695
 #, 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 "%s noklusētā valoda tika izmainīta. Lai tā stātos spēkā ir jāpārstartē %s."
 
-#: clientgui/DlgSelectComputer.cpp:91
+#: DlgSelectComputer.cpp:91
 #, c-format
 msgid "%s - Select Computer"
 msgstr "%s - Izvēlieties datoru"
 
-#: clientgui/DlgSelectComputer.cpp:125
+#: DlgSelectComputer.cpp:125
 #, c-format
 msgid ""
 "Another instance of %s is already running \n"
 "on this computer.  Please select a client to monitor."
-msgstr ""
-"Cita %s instance jau ir startēta uz \n"
-"šī datora.  Lūdzu, izvēlieties klientu, ko monitorēt."
+msgstr "Cita %s instance jau ir startēta uz \nšī datora.  Lūdzu, izvēlieties klientu, ko monitorēt."
 
-#: clientgui/DlgSelectComputer.cpp:143
+#: DlgSelectComputer.cpp:143
 msgid "Host name:"
 msgstr "Hosta vārds:"
 
-#: clientgui/Localization.cpp:31
-#: clientgui/Localization.cpp:69
+#: Localization.cpp:31 Localization.cpp:69
 msgid "Message boards"
 msgstr "Ziņojumu dēļi"
 
-#: clientgui/Localization.cpp:33
+#: Localization.cpp:33
 msgid "Correspond with other users on the SETI at home message boards"
 msgstr "Sarakstīties ar citiem lietotājiem SETI at home ziņojumu dēļos"
 
-#: clientgui/Localization.cpp:37
+#: Localization.cpp:37
 msgid "Ask questions and report problems"
 msgstr "Jautājiet un nosūtiet problēmas"
 
-#: clientgui/Localization.cpp:39
-#: clientgui/Localization.cpp:81
-#: clientgui/Localization.cpp:111
-#: clientgui/Localization.cpp:129
+#: Localization.cpp:39 Localization.cpp:81 Localization.cpp:111
+#: Localization.cpp:129
 msgid "Your account"
 msgstr "Jūsu konts"
 
-#: clientgui/Localization.cpp:41
-#: clientgui/Localization.cpp:87
-#: clientgui/Localization.cpp:113
+#: Localization.cpp:41 Localization.cpp:87 Localization.cpp:113
 msgid "View your account information and credit totals"
 msgstr "Skatīt informāciju par jūsu kontu un kredītpunktiem"
 
-#: clientgui/Localization.cpp:43
+#: Localization.cpp:43
 msgid "Your preferences"
 msgstr "Jūsu preferences"
 
-#: clientgui/Localization.cpp:45
+#: Localization.cpp:45
 msgid "View and modify your SETI at home account profile and preferences"
 msgstr "Skatīt un modificēt jūsu SETI at home konta profilu un preferences"
 
-#: clientgui/Localization.cpp:47
-#: clientgui/Localization.cpp:89
+#: Localization.cpp:47 Localization.cpp:89
 msgid "Your results"
 msgstr "Jūsu rezultāti"
 
-#: clientgui/Localization.cpp:49
-#: clientgui/Localization.cpp:91
+#: Localization.cpp:49 Localization.cpp:91
 msgid "View your last week (or more) of computational results and work"
 msgstr "Apskatīt (vismaz) pēdējās nedēļas skaitļošanas rezultātus un darbus"
 
-#: clientgui/Localization.cpp:51
-#: clientgui/Localization.cpp:93
+#: Localization.cpp:51 Localization.cpp:93
 msgid "Your computers"
 msgstr "Jūsu datori"
 
-#: clientgui/Localization.cpp:53
+#: Localization.cpp:53
 msgid "View a listing of all the computers on which you are running SETI at Home"
 msgstr "Apskatīt visu datoru sarakstu uz kuriem jūs izpildāt SETI at Home"
 
-#: clientgui/Localization.cpp:55
-#: clientgui/Localization.cpp:97
+#: Localization.cpp:55 Localization.cpp:97
 msgid "Your team"
 msgstr "Jūsu komanda"
 
-#: clientgui/Localization.cpp:57
-#: clientgui/Localization.cpp:99
+#: Localization.cpp:57 Localization.cpp:99
 msgid "View information about your team"
 msgstr "Apskatīt informāciju par jūsu komandu"
 
-#: clientgui/Localization.cpp:61
+#: Localization.cpp:61
 msgid "Common questions"
 msgstr "Biežāk uzdotie jautājumi"
 
-#: clientgui/Localization.cpp:63
+#: Localization.cpp:63
 msgid "Read the Einstein at Home Frequently Asked Question list"
 msgstr "Skatīt Einstein at Home biežāk uzdoto jautājumu sarakstu"
 
-#: clientgui/Localization.cpp:65
+#: Localization.cpp:65
 msgid "Screensaver info"
 msgstr "Ekrānsaudzētāja informācija"
 
-#: clientgui/Localization.cpp:67
+#: Localization.cpp:67
 msgid "Read a detailed description of the Einstein at Home screensaver"
 msgstr "Lasīt detalizētu aprakstu par Einstein at Home ekrānsaudzētāju"
 
-#: clientgui/Localization.cpp:71
-msgid "Correspond with admins and other users on the Einstein at Home message boards"
+#: Localization.cpp:71
+msgid ""
+"Correspond with admins and other users on the Einstein at Home message boards"
 msgstr "Sarakstīties ar administratoriem un citiem lietotājiem Einstein at Home ziņojumu dēļos"
 
-#: clientgui/Localization.cpp:73
+#: Localization.cpp:73
 msgid "Einstein status"
 msgstr "Einstein statuss"
 
-#: clientgui/Localization.cpp:75
+#: Localization.cpp:75
 msgid "Current status of the Einstein at Home server"
 msgstr "Einstein at Home servera pašreizējais statuss"
 
-#: clientgui/Localization.cpp:77
+#: Localization.cpp:77
 msgid "Report problems"
 msgstr "Ziņot par problēmām"
 
-#: clientgui/Localization.cpp:79
+#: Localization.cpp:79
 msgid "A link to the Einstein at Home problems and bug reports message board"
 msgstr "Saite uz Einstein at Home problēmu un kļūdu ziņojumu dēli"
 
-#: clientgui/Localization.cpp:83
+#: Localization.cpp:83
 msgid "View and modify your Einstein at Home account profile and preferences"
 msgstr "Skatīt un modificēt jūsu Einstein at Home konta profilu un preferences"
 
-#: clientgui/Localization.cpp:85
+#: Localization.cpp:85
 msgid "Account summary"
 msgstr "Konta kopsavilkums"
 
-#: clientgui/Localization.cpp:95
-msgid "View a listing of all the computers on which you are running Einstein at Home"
+#: Localization.cpp:95
+msgid ""
+"View a listing of all the computers on which you are running Einstein at Home"
 msgstr "Apskatīt visu datoru sarakstu uz kuriem jūs izpildāt Einstein at Home"
 
-#: clientgui/Localization.cpp:101
+#: Localization.cpp:101
 msgid "LIGO project"
 msgstr "LIGO projekts"
 
-#: clientgui/Localization.cpp:103
-msgid "The home page of the Laser Interferometer Gravitational-wave Observatory (LIGO) project"
+#: Localization.cpp:103
+msgid ""
+"The home page of the Laser Interferometer Gravitational-wave Observatory "
+"(LIGO) project"
 msgstr "Gravitācijas viļņu lāzerinterferometrijas observatorijas (LIGO projekta) mājas lapa"
 
-#: clientgui/Localization.cpp:105
+#: Localization.cpp:105
 msgid "GEO-600 project"
 msgstr "GEO-600 projekts"
 
-#: clientgui/Localization.cpp:107
+#: Localization.cpp:107
 msgid "The home page of the GEO-600 project"
 msgstr "GEO-600 projekta mājas lapa"
 
-#: clientgui/Localization.cpp:115
-#: clientgui/Localization.cpp:133
+#: Localization.cpp:115 Localization.cpp:133 ViewProjects.cpp:221
+#: ViewStatistics.cpp:465
 msgid "Team"
 msgstr "Komanda"
 
-#: clientgui/Localization.cpp:117
+#: Localization.cpp:117
 msgid "Info about your Team"
 msgstr "Apskatīt informāciju par jūsu komandu"
 
-#: clientgui/Localization.cpp:123
+#: Localization.cpp:123
 msgid "Get help for climateprediction.net"
 msgstr "Iegūt palīdzību par climateprediction.net"
 
-#: clientgui/Localization.cpp:125
+#: Localization.cpp:125
 msgid "News"
 msgstr "Jaunumi"
 
-#: clientgui/Localization.cpp:127
+#: Localization.cpp:127
 msgid "climateprediction.net News"
 msgstr "climateprediction.net jaunumi"
 
-#: clientgui/Localization.cpp:131
+#: Localization.cpp:131
 msgid "View your account information, credits, and trickles"
 msgstr "Skatīt informāciju par jūsu kontu, kredītpunktiem un starprezultātiem"
 
-#: clientgui/Localization.cpp:135
+#: Localization.cpp:135
 msgid "Info about your team"
 msgstr "Apskatīt informāciju par jūsu komandu"
 
-#: clientgui/Localization.cpp:141
+#: Localization.cpp:141
 msgid "Search for help in our help system"
 msgstr "Meklēt palīdzību mūsu palīdzības sistēmā"
 
-#: clientgui/Localization.cpp:143
+#: Localization.cpp:143
 msgid "Global Statistics"
 msgstr "Globālā statistika"
 
-#: clientgui/Localization.cpp:145
+#: Localization.cpp:145
 msgid "Summary statistics for World Community Grid"
 msgstr "Kopsavilkuma statistika par World Community Grid"
 
-#: clientgui/Localization.cpp:147
+#: Localization.cpp:147
 msgid "My Grid"
 msgstr "Mans režģis"
 
-#: clientgui/Localization.cpp:149
+#: Localization.cpp:149
 msgid "Your statistics and settings"
 msgstr "Jūsu statistika un iestatījumi"
 
-#: clientgui/Localization.cpp:151
+#: Localization.cpp:151
 msgid "Device Profiles"
 msgstr "Iekārtu profili"
 
-#: clientgui/Localization.cpp:153
+#: Localization.cpp:153
 msgid "Update your device settings"
 msgstr "Atjaunināt jūsu iekārtu iestatījumus"
 
-#: clientgui/Localization.cpp:155
+#: Localization.cpp:155
 msgid "Research"
 msgstr "Pētniecība"
 
-#: clientgui/Localization.cpp:157
+#: Localization.cpp:157
 msgid "Learn about the projects hosted at World Community Grid"
 msgstr "Uzzināt par projektiem izvietotiem World Community Grid"
 
-#: clientgui/MainDocument.cpp:583
+#: MainDocument.cpp:583
 msgid "Starting client"
 msgstr "Startē klientu"
 
-#: clientgui/MainDocument.cpp:591
+#: MainDocument.cpp:591
 msgid "Connecting to client"
 msgstr "Savienojas ar klientu"
 
-#: clientgui/MainDocument.cpp:1205
+#: MainDocument.cpp:1195
 msgid "Retrieving system state; please wait..."
 msgstr "Atjauno sistēmas stāvokli, lūdzu, uzgaidiet..."
 
-#: clientgui/MainDocument.cpp:1826
+#: MainDocument.cpp:1816
 msgid "Missing application"
 msgstr "Trūkstošs lietojums"
 
-#: clientgui/MainDocument.cpp:1827
-msgid "Please download and install the CoRD application from http://cord.sourceforge.net"
+#: MainDocument.cpp:1817
+msgid ""
+"Please download and install the CoRD application from "
+"http://cord.sourceforge.net"
 msgstr "Lūdzu, lejupielādējiet un instalējiet CoRD lietojumu no http://cord.sourceforge.net"
 
-#: clientgui/MainDocument.cpp:2442
+#: MainDocument.cpp:2432
 msgid "on batteries"
 msgstr "uz akumulatoriem"
 
-#: clientgui/MainDocument.cpp:2443
+#: MainDocument.cpp:2433
 msgid "computer is in use"
 msgstr "dators ir lietošanā"
 
-#: clientgui/MainDocument.cpp:2444
+#: MainDocument.cpp:2434
 msgid "user request"
 msgstr "lietotāja pieprasījums"
 
-#: clientgui/MainDocument.cpp:2445
+#: MainDocument.cpp:2435
 msgid "time of day"
 msgstr "dienas laiks"
 
-#: clientgui/MainDocument.cpp:2446
+#: MainDocument.cpp:2436
 msgid "CPU benchmarks in progress"
 msgstr "Izpilda CPU veiktspējas testu"
 
-#: clientgui/MainDocument.cpp:2447
+#: MainDocument.cpp:2437
 msgid "need disk space - check preferences"
 msgstr "vajag diska vietu - pārbaudīt preferences"
 
-#: clientgui/MainDocument.cpp:2448
+#: MainDocument.cpp:2438
 msgid "computer is not in use"
 msgstr "dators nav ielietots"
 
-#: clientgui/MainDocument.cpp:2449
+#: MainDocument.cpp:2439
 msgid "starting up"
 msgstr "startējas"
 
-#: clientgui/MainDocument.cpp:2450
+#: MainDocument.cpp:2440
 msgid "an exclusive app is running"
 msgstr "strādā īpašais lietojums"
 
-#: clientgui/MainDocument.cpp:2451
+#: MainDocument.cpp:2441
 msgid "CPU is busy"
 msgstr "CPU ir aizņemts"
 
-#: clientgui/MainDocument.cpp:2452
+#: MainDocument.cpp:2442
 msgid "network bandwidth limit exceeded"
 msgstr "pārsniegts tīkla joslas platuma limits"
 
-#: clientgui/MainDocument.cpp:2453
+#: MainDocument.cpp:2443
 msgid "requested by operating system"
 msgstr "pieprasījums no operētājsistēmas"
 
-#: clientgui/MainDocument.cpp:2455
+#: MainDocument.cpp:2445
 msgid "unknown reason"
 msgstr "nezināms iemesls"
 
-#: clientgui/MainDocument.cpp:2477
+#: MainDocument.cpp:2467
 msgid "GPU missing, "
 msgstr "trūkst GPU, "
 
-#: clientgui/MainDocument.cpp:2484
+#: MainDocument.cpp:2474
 msgid "New"
 msgstr "Jauns"
 
-#: clientgui/MainDocument.cpp:2488
+#: MainDocument.cpp:2478
 msgid "Download failed"
 msgstr "Lejupielāde neizdevās"
 
-#: clientgui/MainDocument.cpp:2490
+#: MainDocument.cpp:2480
 msgid "Downloading"
 msgstr "Lejupielādē"
 
-#: clientgui/MainDocument.cpp:2492
-#: clientgui/MainDocument.cpp:2557
+#: MainDocument.cpp:2482 MainDocument.cpp:2552
 msgid " (suspended - "
 msgstr " (atlikts - "
 
-#: clientgui/MainDocument.cpp:2500
+#: MainDocument.cpp:2490
 msgid "Project suspended by user"
 msgstr "Lietotājs atlika projektu"
 
-#: clientgui/MainDocument.cpp:2502
+#: MainDocument.cpp:2492
 msgid "Task suspended by user"
 msgstr "Lietotājs atlika uzdevumu"
 
-#: clientgui/MainDocument.cpp:2504
+#: MainDocument.cpp:2494
 msgid "Suspended - "
 msgstr "Atlikts - "
 
-# 75%
-#: clientgui/MainDocument.cpp:2510
+#: MainDocument.cpp:2500
 msgid "GPU suspended - "
 msgstr "GPU atlikts - "
 
-#: clientgui/MainDocument.cpp:2517
+#: MainDocument.cpp:2507
 msgid "Waiting for memory"
 msgstr "Gaida atmiņu"
 
-#: clientgui/MainDocument.cpp:2519
+#: MainDocument.cpp:2509
 msgid "Waiting for shared memory"
 msgstr "Gaida koplietojamo atmiņu"
 
-#: clientgui/MainDocument.cpp:2521
+#: MainDocument.cpp:2512
+msgid "Running, high priority"
+msgstr "Izpildās, augsta prioritāte"
+
+#: MainDocument.cpp:2514
 msgid "Running"
 msgstr "Izpildās"
 
-#: clientgui/MainDocument.cpp:2523
+#: MainDocument.cpp:2517
 msgid " (non-CPU-intensive)"
 msgstr " (CPU neintensīvs)"
 
-#: clientgui/MainDocument.cpp:2526
+#: MainDocument.cpp:2520
 msgid "Waiting to run"
 msgstr "Gaida uz izpildi"
 
-#: clientgui/MainDocument.cpp:2528
-#: clientgui/MainDocument.cpp:2534
+#: MainDocument.cpp:2522 MainDocument.cpp:2528
 msgid "Ready to start"
 msgstr "Gatavs sākt"
 
-#: clientgui/MainDocument.cpp:2538
-msgid "Postponed: "
-msgstr ""
+#: MainDocument.cpp:2532
+msgid " (Scheduler wait: "
+msgstr " (Plānotājs gaida: "
 
-#: clientgui/MainDocument.cpp:2541
-msgid "Postponed"
-msgstr ""
+#: MainDocument.cpp:2536
+msgid " (Scheduler wait)"
+msgstr " (Plānotāja gaidišana)"
 
-#: clientgui/MainDocument.cpp:2545
-msgid "Waiting for network access"
-msgstr ""
+#: MainDocument.cpp:2540
+msgid " (Waiting for network access)"
+msgstr " (Gaida uz pieeju tīklam)"
 
-#: clientgui/MainDocument.cpp:2549
+#: MainDocument.cpp:2544
 msgid "Computation error"
 msgstr "Aprēķinu kļūda"
 
-#: clientgui/MainDocument.cpp:2553
+#: MainDocument.cpp:2548
 msgid "Upload failed"
 msgstr "Augšupielāde neizdevās"
 
-#: clientgui/MainDocument.cpp:2555
+#: MainDocument.cpp:2550
 msgid "Uploading"
 msgstr "Augšupielādē"
 
-#: clientgui/MainDocument.cpp:2566
+#: MainDocument.cpp:2561
 msgid "Aborted by user"
 msgstr "Lietotāja pārtraukts"
 
-#: clientgui/MainDocument.cpp:2569
+#: MainDocument.cpp:2564
 msgid "Aborted by project"
 msgstr "Projekta pārtraukts"
 
-#: clientgui/MainDocument.cpp:2572
+#: MainDocument.cpp:2567
 msgid "Aborted: not started by deadline"
 msgstr "Pārtraukts: nav termiņa startēts"
 
-#: clientgui/MainDocument.cpp:2575
+#: MainDocument.cpp:2570
 msgid "Aborted: disk limit exceeded"
 msgstr "Pārtraukts: sasniegts diska vietas limits"
 
-#: clientgui/MainDocument.cpp:2578
+#: MainDocument.cpp:2573
 msgid "Aborted: run time limit exceeded"
 msgstr "Pārtraukts: pārsniegta izpildes laika robeža"
 
-#: clientgui/MainDocument.cpp:2581
+#: MainDocument.cpp:2576
 msgid "Aborted: memory limit exceeded"
 msgstr "Pārtraukts: pārsniegta operatīvās atmiņas robeža"
 
-#: clientgui/MainDocument.cpp:2584
+#: MainDocument.cpp:2579
 msgid "Aborted"
 msgstr "Pārtraukts"
 
-#: clientgui/MainDocument.cpp:2589
+#: MainDocument.cpp:2584
 msgid "Acknowledged"
 msgstr "Atzīts"
 
-#: clientgui/MainDocument.cpp:2591
+#: MainDocument.cpp:2586
 msgid "Ready to report"
 msgstr "Gatavs ziņošanai"
 
-#: clientgui/MainDocument.cpp:2593
+#: MainDocument.cpp:2588
 #, c-format
 msgid "Error: invalid state '%d'"
 msgstr "Kļūda: nederīgs stāvoklis '%d'"
 
-#: clientgui/NoInternetConnectionPage.cpp:179
+#: NoInternetConnectionPage.cpp:179
 msgid "No Internet connection"
 msgstr "Nav savienojuma ar Internet"
 
-#: clientgui/NoInternetConnectionPage.cpp:182
+#: NoInternetConnectionPage.cpp:182
 msgid "Please connect to the Internet and try again."
 msgstr "Lūdzu, pieslēdzieties pie Internet un mēģiniet vēlreiz."
 
-#: clientgui/NotDetectedPage.cpp:181
+#: NotDetectedPage.cpp:181
 msgid "Project not found"
 msgstr "Projekts nav atrasts"
 
-#: clientgui/NotDetectedPage.cpp:184
+#: 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 ""
-"Jūsu norādītais URL nepieder BOINC-bāzētam projektam.\n"
-"\n"
-"Lūdzu, pārbaudiet URL un mēģiniet vēlreiz."
+msgstr "Jūsu norādītais URL nepieder BOINC-bāzētam projektam.\n\nLūdzu, pārbaudiet URL un mēģiniet vēlreiz."
 
-#: clientgui/NotDetectedPage.cpp:188
+#: NotDetectedPage.cpp:188
 msgid "Account manager not found"
 msgstr "Konta pārvaldnieks nav atrasts"
 
-#: clientgui/NotDetectedPage.cpp:191
+#: NotDetectedPage.cpp:191
 msgid ""
 "The URL you supplied is not that of a BOINC-based account\n"
 "manager.\n"
 "\n"
 "Please check the URL and try again."
-msgstr ""
-"Jūsu norādītais URL nepieder BOINC-bāzētam konta\n"
-"pārvaldniekam.\n"
-"\n"
-"Lūdzu, pārbaudiet URL un mēģiniet vēlreiz."
+msgstr "Jūsu norādītais URL nepieder BOINC-bāzētam konta\npārvaldniekam.\n\nLūdzu, pārbaudiet URL un mēģiniet vēlreiz."
 
-#: clientgui/NotFoundPage.cpp:181
+#: NotFoundPage.cpp:181
 msgid "Login Failed."
 msgstr "Pieteikšanās neizdevās."
 
-#: clientgui/NotFoundPage.cpp:185
+#: NotFoundPage.cpp:185
 msgid "Check the username and password, and try again."
 msgstr "Pārbaudiet lietotāja vārdu un paroli, un mēģiniet vēlreiz."
 
-#: clientgui/NotFoundPage.cpp:189
+#: NotFoundPage.cpp:189
 msgid "Check the email address and password, and try again."
 msgstr "Pārbaudiet e-pasta adresi un paroli, un mēģiniet vēlreiz."
 
-#: clientgui/NoticeListCtrl.cpp:229
+#: NoticeListCtrl.cpp:222
 msgid "more..."
 msgstr "vairāk..."
 
-#: clientgui/ProjectInfoPage.cpp:221
+#: ProjectInfoPage.cpp:477 ProjectInfoPage.cpp:778 ProjectInfoPage.cpp:782
+msgid "All"
+msgstr "Viss"
+
+#: ProjectInfoPage.cpp:615
 msgid "Choose a project"
 msgstr "Izvēlieties projektu"
 
-#: clientgui/ProjectInfoPage.cpp:228
+#: ProjectInfoPage.cpp:619
 msgid "To choose a project, click its name or type its URL below."
 msgstr "Lai izvēlētos projektu noklikšķiniet uz tā vārda vai ierakstiet tā URL."
 
-#: clientgui/ProjectInfoPage.cpp:246
+#: ProjectInfoPage.cpp:623
 msgid "Categories:"
 msgstr "Kategorijas:"
 
-#: clientgui/ProjectInfoPage.cpp:267
+#: ProjectInfoPage.cpp:627 sg_ProjectPanel.cpp:89
 msgid "Projects:"
 msgstr "Projekti:"
 
-#: clientgui/ProjectInfoPage.cpp:279
+#: ProjectInfoPage.cpp:631
 msgid "Project details"
 msgstr "Projekta detaļas"
 
-#: clientgui/ProjectInfoPage.cpp:291
+#: ProjectInfoPage.cpp:635
 msgid "Research area:"
 msgstr "Pētniecības zona:"
 
-#: clientgui/ProjectInfoPage.cpp:302
+#: ProjectInfoPage.cpp:639
 msgid "Organization:"
 msgstr "Organizācija:"
 
-#: clientgui/ProjectInfoPage.cpp:313
+#: ProjectInfoPage.cpp:643
 msgid "Web site:"
 msgstr "Tīmekļa vietne:"
 
-#: clientgui/ProjectInfoPage.cpp:325
+#: ProjectInfoPage.cpp:647
 msgid "Supported systems:"
 msgstr "Atbalstītās sistēmas:"
 
-#: clientgui/ProjectInfoPage.cpp:363
+#: ProjectInfoPage.cpp:651
 msgid "Project URL:"
 msgstr "Projekta URL:"
 
-#: clientgui/ProjectInfoPage.cpp:499
-#: clientgui/ProjectInfoPage.cpp:754
-#: clientgui/ProjectInfoPage.cpp:758
-msgid "All"
-msgstr "Viss"
-
-#: clientgui/ProjectInfoPage.cpp:802
-msgid "This project may not have work for your type of computer.  Do you want to add it anyway?"
+#: ProjectInfoPage.cpp:826
+msgid ""
+"This project may not have work for your type of computer.  Do you want to "
+"add it anyway?"
 msgstr "Šim projektam var nebūt darba priekš jūsu tipa datora.  Vai jūs vēlaties to pievienot tik un tā? "
 
-#: clientgui/ProjectInfoPage.cpp:826
+#: ProjectInfoPage.cpp:850
 msgid "You already added this project. Please choose a different project."
 msgstr "Jūs jau esat pievienojuši šo projektu. Lūdzu, izvēlieties citu projektu."
 
-#: clientgui/ProjectProcessingPage.cpp:321
+#: ProjectProcessingPage.cpp:321
 msgid "Communicating with project."
 msgstr "Sazinās ar projektu."
 
-#: clientgui/ProjectProcessingPage.cpp:510
+#: ProjectProcessingPage.cpp:509
 msgid "Required files not found on the server."
 msgstr "Uz servera nepieciešamie faili nav atrasti."
 
-#: clientgui/ProjectProcessingPage.cpp:513
-#: clientgui/ProjectProcessingPage.cpp:586
+#: ProjectProcessingPage.cpp:512 ProjectProcessingPage.cpp:574
 msgid "An internal server error has occurred."
 msgstr "Atgadījās iekšēja servera kļūda."
 
-#: clientgui/ProjectPropertiesPage.cpp:334
+#: ProjectPropertiesPage.cpp:334
 msgid ""
 "Communicating with project\n"
 "Please wait..."
-msgstr ""
-"Sazinās ar projektu\n"
-"Lūdzu, uzgaidiet..."
-
-#: clientgui/ProjectWelcomePage.cpp:251
-#, c-format
-msgid "Welcome to %s."
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:254
-msgid "You have volunteered to compute for this project:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:255
-msgid "Name:"
-msgstr "Vārds:"
-
-#: clientgui/ProjectWelcomePage.cpp:258
-msgid "Home:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:262
-msgid "Description:"
-msgstr ""
+msgstr "Sazinās ar projektu\nLūdzu, uzgaidiet..."
 
-#: clientgui/ProjectWelcomePage.cpp:265
-msgid "URL:"
-msgstr "URL:"
-
-#: clientgui/ProjectWelcomePage.cpp:268
-msgid "User:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:273
-msgid "WARNING: This project is not registered with BOINC.  Make sure you trust it before continuing."
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:277
-msgid "To continue, click Next."
-msgstr "Lai turpinātu nospiediet Nākamais."
-
-#: clientgui/ProxyInfoPage.cpp:195
+#: ProxyInfoPage.cpp:195
 msgid "Network communication failure"
 msgstr "Tīkla komunikāciju kļūda"
 
-#: clientgui/ProxyInfoPage.cpp:199
+#: ProxyInfoPage.cpp:199
 msgid ""
 "The World Community Grid - BOINC software failed to communicate\n"
 "over the Internet. The most likely reasons are:\n"
@@ -2720,22 +2485,9 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"World Community Grid - BOINC programmatūrai neizdevās sazināties\n"
-"caur Internet. Iespējams, ka tam par iemeslu ir:\n"
-"\n"
-"1) Savienojuma problēma. Pārbaudiet Jūsu tīkla vai modema pieslēgumu\n"
-"un tad nospiediet Atpakaļ, lai mēģinātu vēlreiz.\n"
-"\n"
-"2) Jūsu ugunsmūra programmatūra bloķē World Community Grid - \n"
-"BOINC programmatūru. Konfigurējiet ugunsmūri, lai tas ļauj BOINC\n"
-"un BOINC menedžerim sazināties caur 80. un 443. portu un tad\n"
-"noklikšķiniet Atpakaļ, lai mēģinātu vēlreiz.\n"
-"\n"
-"3) Jūs lietojat proxy serveri.\n"
-"Noklikšķiniet Nākamais, lai konfigurētu BOINC proxy parametrus."
+msgstr "World Community Grid - BOINC programmatūrai neizdevās sazināties\ncaur Internet. Iespējams, ka tam par iemeslu ir:\n\n1) Savienojuma problēma. Pārbaudiet Jūsu tīkla vai modema pieslēgumu\nun tad nospiediet Atpakaļ, lai mēģinātu vēlreiz.\n\n2) Jūsu ugunsmūra programmatūra bloķē World Community Grid - \nBOINC programmatūru. Konfigurējiet ugunsmūri, lai tas ļauj BOINC\nun BOINC menedžerim sazināties caur 80. un 443. portu un tad\nnoklikšķiniet Atpakaļ, lai mēģinātu vēlreiz.\n\n3) Jū [...]
 
-#: clientgui/ProxyInfoPage.cpp:203
+#: ProxyInfoPage.cpp:203
 msgid ""
 "BOINC failed to communicate on the Internet.\n"
 "The most likely reasons are:\n"
@@ -2750,1722 +2502,1201 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"BOINC neizdevās sazināties caur Internet.\n"
-"Iespējams, ka tam par iemeslu ir:\n"
-"\n"
-"1) Savienojuma problēma. Pārbaudiet Jūsu tīkla vai modema\n"
-"pieslēgumu un tad nospiediet Atpakaļ, lai mēģinātu vēlreiz.\n"
-"\n"
-"2) Jūsu ugunsmūra programmatūra bloķē BOINC.\n"
-"Konfigurējiet ugunsmūri, lai tas ļauj BOINC un BOINC\n"
-"menedžerim sazināties caur 80. portu.\n"
-"Tad noklikšķiniet Atpakaļ, lai mēģinātu vēlreiz.\n"
-"\n"
-"3) Jūs lietojat proxy serveri.\n"
-"Noklikšķiniet Nākamais, lai konfigurētu BOINC proxy parametrus."
+msgstr "BOINC neizdevās sazināties caur Internet.\nIespējams, ka tam par iemeslu ir:\n\n1) Savienojuma problēma. Pārbaudiet Jūsu tīkla vai modema\npieslēgumu un tad nospiediet Atpakaļ, lai mēģinātu vēlreiz.\n\n2) Jūsu ugunsmūra programmatūra bloķē BOINC.\nKonfigurējiet ugunsmūri, lai tas ļauj BOINC un BOINC\nmenedžerim sazināties caur 80. portu.\nTad noklikšķiniet Atpakaļ, lai mēģinātu vēlreiz.\n\n3) Jūs lietojat proxy serveri.\nNoklikšķiniet Nākamais, lai konfigurētu BOINC proxy parametrus."
 
-#: clientgui/ProxyPage.cpp:331
+#: ProxyPage.cpp:331
 msgid "Proxy configuration"
 msgstr "Proxy konfigurācija"
 
-#: clientgui/ProxyPage.cpp:334
+#: ProxyPage.cpp:334
 msgid "HTTP proxy"
 msgstr "HTTP proxy"
 
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
+#: ProxyPage.cpp:337 ProxyPage.cpp:357
 msgid "Server:"
 msgstr "Serveris:"
 
-#: clientgui/ProxyPage.cpp:350
+#: ProxyPage.cpp:350
 msgid "Autodetect"
 msgstr "Noteikt automātiski"
 
-#: clientgui/ProxyPage.cpp:354
+#: ProxyPage.cpp:354
 msgid "SOCKS proxy"
 msgstr "SOCKS proxy"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:167
-msgid "Advanced View...\tCtrl+Shift+A"
-msgstr "Detalizētais skats...\tCtrl+Shift+A"
+#: TermsOfUsePage.cpp:218
+msgid "Terms of Use"
+msgstr "Lietošanas noteikumi"
 
-# 82%
-#: clientgui/sg_BoincSimpleFrame.cpp:168
-msgid "Display the advanced graphical interface."
-msgstr "Parādīt papildu grafisko interfeisu."
+#: TermsOfUsePage.cpp:222
+msgid "Please read the following terms of use:"
+msgstr "Lūdzu, izlasiet šos lietošanas noteikumus:"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:175
-msgid "Skin"
-msgstr "Ādiņa"
+#: TermsOfUsePage.cpp:231
+msgid "I agree to the terms of use."
+msgstr "Es piekrītu lietošanas noteikumiem."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:177
-msgid "Select the appearance of the user interface."
-msgstr "Izvēlieties lietotāja saskarnes izskatu."
+#: TermsOfUsePage.cpp:237
+msgid "I do not agree to the terms of use."
+msgstr "Es nepiekrītu lietošanas noteikumiem."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:224
-#, c-format
-msgid "&%s"
-msgstr "&%s"
+#: UnavailablePage.cpp:183
+msgid "Project temporarily unavailable"
+msgstr "Projekts īslaicīgi nav pieejams"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:405
-msgid "Default"
-msgstr "Noklusētais"
+#: UnavailablePage.cpp:186
+msgid ""
+"The project is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "Projekts īslaicīgi nav pieejams.\n\nLūdzu vēlāk mēģiniet vēlreiz."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:848
-msgid "Suspend"
-msgstr "Atlikt"
+#: UnavailablePage.cpp:190
+msgid "Account manager temporarily unavailable"
+msgstr "Konta menedžeris īslaicīgi nav pieejams"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:850
-msgid "Suspend Computing"
-msgstr "Apturēt skaitļošanu"
+#: UnavailablePage.cpp:193
+msgid ""
+"The account manager is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "Konta menedžeris īslaicīgi nav pieejams.\n\nLūdzu vēlāk mēģiniet vēlreiz."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:851
-msgid "Resume Computing"
-msgstr "Atsākt skaitļošanu"
+#: ValidateAccountKey.cpp:68
+msgid "Please specify an account key to continue."
+msgstr "Lūdzu, norādiet konta atslēgu, lai turpinātu."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:867
-msgid "Notices"
-msgstr "Paziņojumi"
+#: ValidateAccountKey.cpp:71
+msgid "Invalid Account Key; please enter a valid Account Key"
+msgstr "Nederīga konta atslēga. Lūdzu, ievadiet derīgu konta atslēgu"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:868
-msgid "Open a window to view notices from projects or BOINC"
-msgstr "Atvērt logu, lai redzētu paziņojumus no projektiem vai BOINC"
+#: ValidateAccountKey.cpp:82 ValidateEmailAddress.cpp:86
+msgid "Validation conflict"
+msgstr "Validācijas konflikts"
 
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
-msgstr "Iegūst paziņojumus; lūdzu, uzgaidiet..."
+#: ValidateEmailAddress.cpp:72
+msgid "Please specify an email address"
+msgstr "Lūdzu, norādiet e-pasta adresi"
 
-#: clientgui/sg_DlgMessages.cpp:132
-msgid "There are no notices at this time."
-msgstr "Pašlaik nav jaunu paziņojumu"
+#: ValidateEmailAddress.cpp:75
+msgid "Invalid email address; please enter a valid email address"
+msgstr "Nederīga e-pasta adrese; lūdzu, ievadiet derīgu e-pasta adresi"
 
-# 83%
-#: clientgui/sg_DlgMessages.cpp:146
-msgid "Close"
-msgstr "Aizvērt"
+#: ValidateURL.cpp:69
+msgid "Missing URL"
+msgstr "Iztrūkst URL"
 
-# 83%
-#: clientgui/sg_DlgMessages.cpp:394
-#, c-format
-msgid "%s - Notices"
-msgstr "%s - Paziņojumi"
+#: ValidateURL.cpp:70
+msgid ""
+"Please specify a URL.\n"
+"For example:\n"
+"http://www.example.com/"
+msgstr "Lūdzu, norādiet URL.\nPiemēram:\nhttp://www.example.com/"
 
-#: clientgui/sg_DlgPreferences.cpp:270
-msgid "This dialog controls preferences for this computer only."
-msgstr "Šis dialoglogs kontrolē preferences tikai šim datoram."
+#: ValidateURL.cpp:83 ValidateURL.cpp:87 ValidateURL.cpp:91
+#: ValidateURL.cpp:103 ValidateURL.cpp:107 ValidateURL.cpp:110
+msgid "Invalid URL"
+msgstr "Nederīgs URL"
 
-#: clientgui/sg_DlgPreferences.cpp:275
-msgid "Click OK to set preferences."
-msgstr "Noklišķiniet Labi, lai iestatītu preferences."
+#: ValidateURL.cpp:84 ValidateURL.cpp:88 ValidateURL.cpp:92
+msgid ""
+"Please specify a valid URL.\n"
+"For example:\n"
+"http://boincproject.example.com"
+msgstr "Lūdzu, norādiet derīgu URL.\nPiemēram:\nhttp://boincprojekts.example.com"
 
-#: clientgui/sg_DlgPreferences.cpp:280
-msgid "Click Clear to restore web-based settings for all preferences listed below."
-msgstr "Noklišķiniet Notīrīt, lai atjaunotu tīmekļa-bāzētus iestatījumus visām zemāk minētām preferencēm."
+#: ValidateURL.cpp:104 ValidateURL.cpp:108
+#, c-format
+msgid "'%s' does not contain a valid host name."
+msgstr "'%s' nesatur derīgu datora vārdu."
 
-#: clientgui/sg_DlgPreferences.cpp:287
-msgid "For additional settings, select Computing Preferences in the Advanced View."
-msgstr "Papildu iestatījumiem izvēlieties Skaitļošanas preferences Detalizētajā skatā."
+#: ValidateURL.cpp:111
+#, c-format
+msgid "'%s' does not contain a valid path."
+msgstr "'%s' nesatur derīgu ceļu."
 
-#: clientgui/sg_DlgPreferences.cpp:315
-msgid "Do work only between:"
-msgstr "Veikt darbu tikai starp:"
+#: ViewMessages.cpp:84 ViewProjects.cpp:170 ViewStatistics.cpp:1978
+#: ViewTransfers.cpp:160 ViewWork.cpp:183
+msgid "Commands"
+msgstr "Komandas"
 
-#: clientgui/sg_DlgPreferences.cpp:337
-msgid "Connect to internet only between:"
-msgstr "Savienoties ar Internet tikai starp:"
+#: ViewMessages.cpp:88
+msgid "Copy all messages"
+msgstr "Kopēt visus ziņojumus"
 
-#: clientgui/sg_DlgPreferences.cpp:359
-#: clientgui/sg_DlgPreferences.cpp:376
-msgid "Use no more than:"
-msgstr "Nelietot vairāk par:"
+#: ViewMessages.cpp:95
+msgid "Copy selected messages"
+msgstr "Kopēt atzīmētos ziņojumus"
 
-#: clientgui/sg_DlgPreferences.cpp:372
-msgid "of disk space"
-msgstr "diska vietas"
+#: ViewMessages.cpp:106 ViewMessages.cpp:502
+msgid "Show only this project"
+msgstr "Rādīt tikai šo projektu"
 
-# 84%
-#: clientgui/sg_DlgPreferences.cpp:389
-msgid "of the processor"
-msgstr "procesora"
+#: ViewMessages.cpp:107 ViewMessages.cpp:503
+msgid "Show only the messages for the selected project."
+msgstr "Rādīt ziņojumus tikai izvēlētajam projektam."
 
-#: clientgui/sg_DlgPreferences.cpp:393
-msgid "Do work while on battery?"
-msgstr "Vai strādāt, kad lieto akumulatoru?"
+#: ViewMessages.cpp:164
+msgid "Messages"
+msgstr "Ziņojumi"
 
-#: clientgui/sg_DlgPreferences.cpp:406
-msgid "Do work after idle for:"
-msgstr "Strādāt, ja dīkstāvē:"
-
-#: clientgui/sg_DlgPreferences.cpp:431
-msgid "Clear all local preferences listed above and close the dialog"
-msgstr "Notīrīt visas augstāk minētās lokālās preferences un aizvērt dialoglogu"
-
-#: clientgui/sg_DlgPreferences.cpp:609
-#: clientgui/sg_DlgPreferences.cpp:612
-#: clientgui/sg_DlgPreferences.cpp:688
-#: clientgui/sg_DlgPreferences.cpp:692
-#: clientgui/sg_DlgPreferences.cpp:704
-#: clientgui/sg_DlgPreferences.cpp:708
-#: clientgui/sg_DlgPreferences.cpp:851
-#: clientgui/sg_DlgPreferences.cpp:862
-msgid "Anytime"
-msgstr "Jebkurā laikā"
-
-#: clientgui/sg_DlgPreferences.cpp:645
-msgid "100 MB"
-msgstr "100 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:646
-msgid "200 MB"
-msgstr "200 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:647
-msgid "500 MB"
-msgstr "500 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:648
-msgid "1 GB"
-msgstr "1 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:649
-msgid "2 GB"
-msgstr "2 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:650
-msgid "5 GB"
-msgstr "5 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:651
-msgid "10 GB"
-msgstr "10 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:652
-msgid "20 GB"
-msgstr "20 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:653
-msgid "50 GB"
-msgstr "50 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:654
-msgid "100 GB"
-msgstr "100 GB"
+#: ViewMessages.cpp:187
+msgid "Copying all messages to the clipboard..."
+msgstr "Kopē visus ziņojumus starpliktuvē..."
 
-#: clientgui/sg_DlgPreferences.cpp:724
-#, c-format
-msgid "%d MB"
-msgstr "%d MB"
+#: ViewMessages.cpp:223
+msgid "Copying selected messages to the clipboard..."
+msgstr "Kopē izvēlētos ziņojumus starpliktuvē..."
 
-#: clientgui/sg_DlgPreferences.cpp:726
-#, c-format
-msgid "%4.2f GB"
-msgstr "%4.2f GB"
+#: ViewMessages.cpp:286
+msgid "Filtering messages..."
+msgstr "Ziņu filtrēšana..."
 
-#: clientgui/sg_DlgPreferences.cpp:767
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
+#: ViewMessages.cpp:494
+msgid "Show all messages"
+msgstr "Rādīt visus ziņojumus"
 
-#: clientgui/sg_DlgPreferences.cpp:803
-msgid "0 (Run Always)"
-msgstr "0 (izpildīt vienmēr)"
+#: ViewMessages.cpp:495
+msgid "Show messages for all projects."
+msgstr "Rādīt ziņojumus visiem projektiem."
 
-#: clientgui/sg_DlgPreferences.cpp:806
-#, c-format
-msgid "%d"
-msgstr "%d"
+#: ViewNotices.cpp:58 sg_DlgMessages.cpp:124
+msgid "Fetching notices; please wait..."
+msgstr "Iegūst paziņojumus; lūdzu, uzgaidiet..."
 
-#: clientgui/sg_DlgPreferences.cpp:953
-#, c-format
-msgid "%s - Computing Preferences"
-msgstr ""
+#: ViewNotices.cpp:65 sg_DlgMessages.cpp:132
+msgid "There are no notices at this time."
+msgstr "Pašlaik nav jaunu paziņojumu"
 
-#: clientgui/sg_DlgPreferences.cpp:1033
-msgid "Do you really want to clear all local preferences?\n"
-msgstr "Vai tiešām vēlaties notīrīt visas lokālās preferences?\n"
+#: ViewNotices.cpp:99 sg_BoincSimpleFrame.cpp:776
+msgid "Notices"
+msgstr "Paziņojumi"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:66
-#: clientgui/ViewProjects.cpp:179
+#: ViewProjects.cpp:174 sg_ProjectCommandPopup.cpp:61
 msgid "Update"
 msgstr "Aktualizēt"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:67
-#: clientgui/ViewProjects.cpp:180
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
+#: ViewProjects.cpp:175 sg_ProjectCommandPopup.cpp:62
+msgid ""
+"Report all completed tasks, get latest credit, get latest preferences, and "
+"possibly get more tasks."
 msgstr "Ziņot par paveikto, iegūt pēdējos kredītpunktus un preferences, kā arī, iespējams, iegūt vairāk uzdevumus."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:73
-#: clientgui/sg_ProjectCommandPopup.cpp:129
-#: clientgui/ViewProjects.cpp:187
-#: clientgui/ViewProjects.cpp:727
+#: 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
+msgid "Suspend"
+msgstr "Atlikt"
+
+#: ViewProjects.cpp:182 ViewProjects.cpp:722 sg_ProjectCommandPopup.cpp:68
+#: sg_ProjectCommandPopup.cpp:114
 msgid "Suspend tasks for this project."
 msgstr "Atlikt uzdevumu izpildi šim projektam."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:78
-#: clientgui/sg_ProjectCommandPopup.cpp:136
-#: clientgui/ViewProjects.cpp:193
-#: clientgui/ViewProjects.cpp:746
+#: ViewProjects.cpp:188 ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:73
+#: sg_ProjectCommandPopup.cpp:121
 msgid "No new tasks"
 msgstr "Neņemt jaunus uzdevumus"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:79
-#: clientgui/ViewProjects.cpp:194
+#: ViewProjects.cpp:189 sg_ProjectCommandPopup.cpp:74
 msgid "Don't get new tasks for this project."
 msgstr "Neņemt jaunus uzdevumus šim projektam."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:200
+#: ViewProjects.cpp:195 sg_ProjectCommandPopup.cpp:79
 msgid "Reset project"
 msgstr "Atjaunināt projektu"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:85
-#: clientgui/ViewProjects.cpp:201
-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."
+#: ViewProjects.cpp:196 sg_ProjectCommandPopup.cpp:80
+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 "Izdzēst visus failus un uzdevumus, kas saistīti ar šo projektu un iegūt jaunus. Pirms tam jūs varat aktualizēt projektu, lai ziņotu par izpildītiem uzdevumiem."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:91
-#: clientgui/ViewProjects.cpp:208
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
+#: ViewProjects.cpp:203 sg_ProjectCommandPopup.cpp:86
+msgid ""
+"Remove this project.  Tasks in progress will be lost (use 'Update' first to "
+"report any completed tasks)."
 msgstr "Noņemt šo projektu. Nepabeigtie uzdevumi tiks zaudēti (lietojiet vispirms 'Aktualizēt', lai ziņotu par jau izpildītajiem)."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:96
-#: clientgui/sg_TaskCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:214
+#: ViewProjects.cpp:209 ViewWork.cpp:222 sg_ProjectCommandPopup.cpp:91
+#: sg_TaskCommandPopup.cpp:78
 msgid "Properties"
 msgstr "Īpašības"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:97
-#: clientgui/ViewProjects.cpp:215
+#: ViewProjects.cpp:210 sg_ProjectCommandPopup.cpp:92
 msgid "Show project details."
 msgstr "Rādīt projekta informāciju."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:126
-#: clientgui/ViewProjects.cpp:723
-msgid "Resume tasks for this project."
-msgstr "Atsākt uzdevumu apstrādi šim projektam."
+#: ViewProjects.cpp:220 ViewStatistics.cpp:450
+msgid "Account"
+msgstr "Konts"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:133
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow new tasks"
-msgstr "Atļaut pieprasīt uzdevumus"
+#: ViewProjects.cpp:222
+msgid "Work done"
+msgstr "Paveikts"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:134
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow fetching new tasks for this project."
-msgstr "Atļauj saņemt jaunus uzdevumus šim projektam."
+#: ViewProjects.cpp:223
+msgid "Avg. work done"
+msgstr "Vidēji"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:137
-#: clientgui/ViewProjects.cpp:746
-msgid "Don't fetch new tasks for this project."
-msgstr "Nepieprasīt jaunus uzdevumus šim projektam."
+#: ViewProjects.cpp:225 ViewTransfers.cpp:188 ViewWork.cpp:234
+msgid "Status"
+msgstr "Statuss"
+
+#: ViewProjects.cpp:250
+msgid "Projects"
+msgstr "Projekti"
+
+#: ViewProjects.cpp:302
+msgid "Updating project..."
+msgstr "Aktualizē projektu..."
+
+#: ViewProjects.cpp:344
+msgid "Resuming project..."
+msgstr "Atsāk projektu..."
+
+#: ViewProjects.cpp:348
+msgid "Suspending project..."
+msgstr "Atliek projektu..."
+
+#: ViewProjects.cpp:385
+msgid "Telling project to allow additional task downloads..."
+msgstr "Ziņo projektam par atļauju lejupielādēt jaunus uzdevumus..."
+
+#: ViewProjects.cpp:389
+msgid "Telling project to not fetch any additional tasks..."
+msgstr "Ziņo projektam par nevēlēšanos saņemt papildus uzdevumus..."
+
+#: ViewProjects.cpp:425
+msgid "Resetting project..."
+msgstr "Atjaunina projektu..."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:229
-#: clientgui/ViewProjects.cpp:443
+#: ViewProjects.cpp:438 sg_ProjectCommandPopup.cpp:214
 #, c-format
 msgid "Are you sure you want to reset project '%s'?"
 msgstr "Vai tiešām vēlaties atjaunināt projektu '%s'?"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:235
-#: clientgui/ViewProjects.cpp:449
+#: ViewProjects.cpp:444 sg_ProjectCommandPopup.cpp:220
 msgid "Reset Project"
 msgstr "Atjaunināt projektu"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:266
-#: clientgui/ViewProjects.cpp:501
+#: ViewProjects.cpp:483
+msgid "Removing project..."
+msgstr "Noņem projektu..."
+
+#: ViewProjects.cpp:496 sg_ProjectCommandPopup.cpp:251
 #, c-format
 msgid "Are you sure you want to remove project '%s'?"
 msgstr "Vai tiešām vēlaties atjaunināt projektu '%s'?"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:272
-#: clientgui/ViewProjects.cpp:507
+#: ViewProjects.cpp:502 sg_ProjectCommandPopup.cpp:257
 msgid "Remove Project"
 msgstr "Noņemt projektu"
 
-#: clientgui/sg_ProjectPanel.cpp:72
-msgid "Add Project"
-msgstr "Pievienot projektu"
-
-#: clientgui/sg_ProjectPanel.cpp:73
-msgid "Synchronize"
-msgstr "Sinhronizēt"
+#: ViewProjects.cpp:543 ViewWork.cpp:599
+msgid "Launching browser..."
+msgstr "Palaiž pārlūkprogrammu..."
 
-#: clientgui/sg_ProjectPanel.cpp:74
-msgid "Work done for this project"
-msgstr "Paveiktais šim projektam"
+#: ViewProjects.cpp:718 sg_ProjectCommandPopup.cpp:111
+msgid "Resume tasks for this project."
+msgstr "Atsākt uzdevumu apstrādi šim projektam."
 
-#: clientgui/sg_ProjectPanel.cpp:77
-msgid "Synchronize projects with account manager system"
-msgstr "Sinhronizēt projektus ar konta menedžera sistēmu"
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:118
+msgid "Allow new tasks"
+msgstr "Atļaut pieprasīt uzdevumus"
 
-#: clientgui/sg_ProjectPanel.cpp:124
-msgid "Select a project to access with the controls below"
-msgstr "Izvēlieties projektu kam piekļūt ar zemāk izvietotām vadīklām"
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:119
+msgid "Allow fetching new tasks for this project."
+msgstr "Atļauj saņemt jaunus uzdevumus šim projektam."
 
-# 88%
-#: clientgui/sg_ProjectPanel.cpp:145
-msgid "Project Web Pages"
-msgstr "Projekta web lapas"
+#: ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:122
+msgid "Don't fetch new tasks for this project."
+msgstr "Nepieprasīt jaunus uzdevumus šim projektam."
 
-#: clientgui/sg_ProjectPanel.cpp:149
-msgid "Project Commands"
-msgstr "Projekta komandas"
+#: ViewProjects.cpp:1058
+msgid "Requested by user"
+msgstr "Lietotāja pieprasīts"
 
-#: clientgui/sg_ProjectPanel.cpp:276
-#, c-format
-msgid "Pop up a menu of web sites for project %s"
-msgstr "Rādīt uznirstošo izvēlni ar mājas lapām projektam %s"
+#: ViewProjects.cpp:1059
+msgid "To fetch work"
+msgstr "Saņemt jaunus uzdevumus"
 
-#: clientgui/sg_ProjectPanel.cpp:278
-#, c-format
-msgid "Pop up a menu of commands to apply to project %s"
-msgstr "Rādīt uznirstošo izvēlni ar komandām, ko pielietot projektam %s"
+#: ViewProjects.cpp:1060
+msgid "To report completed tasks"
+msgstr "Ziņot par pabeigtiem uzdevumiem"
 
-#: clientgui/sg_TaskCommandPopup.cpp:66
-msgid "Show graphics"
-msgstr "Rādīt grafisko informāciju"
+#: ViewProjects.cpp:1061
+msgid "To send trickle-up message"
+msgstr "Sūtīt uzsūkšanās ziņu"
 
-#: clientgui/sg_TaskCommandPopup.cpp:67
-msgid "Show application graphics in a window."
-msgstr "Rādīt lietojuma grafisko informāciju logā"
+#: ViewProjects.cpp:1062
+msgid "Requested by account manager"
+msgstr "Konta menedžera pieprasīts"
 
-#: clientgui/sg_TaskCommandPopup.cpp:73
-msgid "Suspend this task."
-msgstr "Apturēt šo uzdevumu."
+#: ViewProjects.cpp:1063
+msgid "Project initialization"
+msgstr "Projekta inicializēšana"
 
-#: clientgui/sg_TaskCommandPopup.cpp:78
-msgid "Abort"
-msgstr "Pārtraukt"
+#: ViewProjects.cpp:1064
+msgid "Requested by project"
+msgstr "Projekta pieprasīts"
 
-#: clientgui/sg_TaskCommandPopup.cpp:79
-msgid "Abandon this task. You will get no credit for it."
-msgstr "Pārtraukt šo uzdevumu. Jūs neiegūsiet kredītu par to."
+#: ViewProjects.cpp:1065
+msgid "Unknown reason"
+msgstr "Nezināms iemesls"
 
-#: clientgui/sg_TaskCommandPopup.cpp:85
-msgid "Show task details."
-msgstr "Rādīt uzdevuma informāciju."
+#: ViewProjects.cpp:1079
+msgid "Suspended by user"
+msgstr "Lietotāja atlikts"
 
-#: clientgui/sg_TaskCommandPopup.cpp:119
-msgid "Resume work for this task."
-msgstr "Atsākt darbu pie šī uzdevuma."
+#: ViewProjects.cpp:1082
+msgid "Won't get new tasks"
+msgstr "Nesaņems jaunus uzdevumus"
 
-#: clientgui/sg_TaskCommandPopup.cpp:123
-msgid "Suspend work for this task."
-msgstr "Atlikt darbu pie šī uzdevuma."
+#: ViewProjects.cpp:1085
+msgid "Project ended - OK to remove"
+msgstr "Projekts beidzies - var noņemt"
 
-#: clientgui/sg_TaskCommandPopup.cpp:267
-#, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %.1lf%%, Status: %s)"
-msgstr ""
-"Vai esat pārliecināti, ka vēlaties pārtraukt šo uzdevumu '%s'?\n"
-"(Progress: %.1lf%%, Statuss: %s)"
+#: ViewProjects.cpp:1088
+msgid "Will remove when tasks done"
+msgstr "Noņems, kad uzdevumi tiks pabeigti"
 
-#: clientgui/sg_TaskCommandPopup.cpp:272
-msgid "Abort task"
-msgstr "Pārtraukt uzdevumu"
+#: ViewProjects.cpp:1091
+msgid "Scheduler request pending"
+msgstr "Gaida plānotāja pieprasījuma rezultātu"
 
-#: clientgui/sg_TaskPanel.cpp:468
-msgid "You don't have any projects.  Please Add a Project."
-msgstr "Jums nav neviena projekta. Lūdzu, pievienojiet projektu."
+#: ViewProjects.cpp:1097
+msgid "Scheduler request in progress"
+msgstr "Izveic plānotāja pieprasījumu"
 
-#: clientgui/sg_TaskPanel.cpp:469
-msgid "Not available"
-msgstr "Nav pieejams"
+#: ViewProjects.cpp:1100
+msgid "Trickle up message pending"
+msgstr "Gaida uzsūkšanās ziņu"
 
-#: clientgui/sg_TaskPanel.cpp:480
-msgid "Tasks:"
-msgstr "Uzdevumi:"
+#: ViewProjects.cpp:1106
+msgid "Communication deferred "
+msgstr "Komunikācija atlikta uz "
 
-#: clientgui/sg_TaskPanel.cpp:486
-msgid "Select a task to access"
-msgstr "Izvēlieties uzdevumu, lai piekļūtu"
+#: ViewResources.cpp:62
+msgid "Total disk usage"
+msgstr "Kopējais diska izlietojums"
 
-#: clientgui/sg_TaskPanel.cpp:497
-msgid "From:"
-msgstr "No:"
+#: ViewResources.cpp:83
+msgid "Disk usage by BOINC projects"
+msgstr "BOINC projektiem izlietotā diska vieta"
 
-#: clientgui/sg_TaskPanel.cpp:551
-msgid "This task's progress"
-msgstr "Šī uzdevuma progress"
+#: ViewResources.cpp:116
+msgid "Disk"
+msgstr "Disks"
 
-#: clientgui/sg_TaskPanel.cpp:569
-msgid "Task Commands"
-msgstr "Uzdevuma komandas"
+#: ViewResources.cpp:249
+msgid "no projects: 0 bytes used"
+msgstr "nav projektu: izlietoti 0 baiti"
 
-#: clientgui/sg_TaskPanel.cpp:570
-msgid "Pop up a menu of commands to apply to this task"
-msgstr "Rādīt uznirstošo izvēlni ar komandām, ko pielietot šim uzdevumam"
+#: ViewResources.cpp:286
+msgid "used by BOINC: "
+msgstr "BOINC lietošanā"
 
-#: clientgui/sg_TaskPanel.cpp:705
-#, c-format
-msgid "Application: %s"
-msgstr "Lietojums: %s"
+#: ViewResources.cpp:296
+msgid "free, available to BOINC: "
+msgstr "brīvs, pieejams BOINC"
 
-#: clientgui/sg_TaskPanel.cpp:728
-#, c-format
-msgid "%.3f%%"
-msgstr "%.3f%%"
+#: ViewResources.cpp:306
+msgid "free, not available to BOINC: "
+msgstr "brīvs, nav pieejams BOINC"
 
-#: clientgui/sg_TaskPanel.cpp:736
-msgid "Application: Not available"
-msgstr "Lietojums: Nav pieejams"
+#: ViewResources.cpp:316
+msgid "free: "
+msgstr "brīvs:"
 
-#: clientgui/sg_TaskPanel.cpp:836
-msgid "Not Available"
-msgstr "Nav pieejams"
+#: ViewResources.cpp:326
+msgid "used by other programs: "
+msgstr "izmanto citas programmas:"
 
-#: clientgui/sg_TaskPanel.cpp:851
-#, c-format
-msgid "Elapsed: %s"
-msgstr "Pagājis: %s"
+#: ViewStatistics.cpp:1205
+msgid "User Total"
+msgstr "Lietotāja kopā iegūtie kredītpunkti"
 
-# 84%
-#: clientgui/sg_TaskPanel.cpp:865
-#, c-format
-msgid "Remaining (estimated): %s"
-msgstr "Atlicis (paredzams): %s"
+#: ViewStatistics.cpp:1206
+msgid "User Average"
+msgstr "Lietotāja vidēji iegūtie kredītpunkti"
 
-#: clientgui/sg_TaskPanel.cpp:880
+#: ViewStatistics.cpp:1207
+msgid "Host Total"
+msgstr "Datora kopējie kredītpunkti"
+
+#: ViewStatistics.cpp:1208
+msgid "Host Average"
+msgstr "Datora vidēji iegūtie kredītpunkti"
+
+#: ViewStatistics.cpp:1355
 #, c-format
-msgid "Status: %s"
-msgstr "Statuss: %s"
+msgid "Last update: %.0f days ago"
+msgstr "Atjaunināts: %.0f dienas atpakaļ"
 
-#: clientgui/sg_TaskPanel.cpp:1227
-msgid "Retrieving current status."
-msgstr "Iegūst pašreizējo statusu."
+#: ViewStatistics.cpp:1982
+msgid "Show user total"
+msgstr "Rādīt lietotāja kopējo"
 
-#: clientgui/sg_TaskPanel.cpp:1233
-msgid "Downloading work from the server."
-msgstr "Lejupielādē darbu no servera."
+#: ViewStatistics.cpp:1983
+msgid "Show total credit for user"
+msgstr "Rādīt kopējo lietotāja kredītu"
 
-#: clientgui/sg_TaskPanel.cpp:1238
-msgid "Processing Suspended:  Running On Batteries."
-msgstr "Apstrāde apturēta: Strādā no akumulatora."
+#: ViewStatistics.cpp:1989
+msgid "Show user average"
+msgstr "Rādīt lietotāja vidējo"
 
-#: clientgui/sg_TaskPanel.cpp:1240
-msgid "Processing Suspended:  User Active."
-msgstr "Apstrāde apturēta: Lietotājs aktīvs."
+#: ViewStatistics.cpp:1990
+msgid "Show average credit for user"
+msgstr "Rādīt vidējo lietotāja kredītu"
 
-#: clientgui/sg_TaskPanel.cpp:1242
-msgid "Processing Suspended:  User paused processing."
-msgstr "Apstrāde apturēta: Lietotājs apturēja apstrādi."
+#: ViewStatistics.cpp:1996
+msgid "Show host total"
+msgstr "Rādīt datora kopējo"
 
-#: clientgui/sg_TaskPanel.cpp:1244
-msgid "Processing Suspended:  Time of Day."
-msgstr "Apstrāde apturēta: Diennakts laiks."
+#: ViewStatistics.cpp:1997
+msgid "Show total credit for host"
+msgstr "Rādīt datora kopējo kredītu "
 
-#: clientgui/sg_TaskPanel.cpp:1246
-msgid "Processing Suspended:  Benchmarks Running."
-msgstr "Apstrāde apturēta: Veic veiktspējas testu."
+#: ViewStatistics.cpp:2003
+msgid "Show host average"
+msgstr "Rādīt datora vidējo"
 
-#: clientgui/sg_TaskPanel.cpp:1248
-msgid "Processing Suspended."
-msgstr "Apstrāde apturēta."
+#: ViewStatistics.cpp:2004
+msgid "Show average credit for host"
+msgstr "Rādīt datora vidējo kredītu"
 
-#: clientgui/sg_TaskPanel.cpp:1252
-msgid "Waiting to contact project servers."
-msgstr "Gaida, lai savienotos ar projekta serveriem."
+#: ViewStatistics.cpp:2013
+msgid "< &Previous project"
+msgstr "< &Iepriekšējais projekts"
 
-#: clientgui/sg_TaskPanel.cpp:1256
-#: clientgui/sg_TaskPanel.cpp:1265
-msgid "Retrieving current status"
-msgstr "Iegūst pašreizējo statusu."
+#: ViewStatistics.cpp:2014
+msgid "Show chart for previous project"
+msgstr "Rādīt grafiku iepriekšējam projektam"
 
-#: clientgui/sg_TaskPanel.cpp:1260
-msgid "No work available to process"
-msgstr "Nav pieejams darbs, ko apstrādāt"
+#: ViewStatistics.cpp:2019
+msgid "&Next project >"
+msgstr "&Nākamais projekts >"
 
-#: clientgui/sg_TaskPanel.cpp:1262
-msgid "Unable to connect to the core client"
-msgstr "Nevar izveidot savienojumu ar galveno klientu"
+#: ViewStatistics.cpp:2020
+msgid "Show chart for next project"
+msgstr "Rādīt grafiku nākamajam projektam"
 
-#: clientgui/TermsOfUsePage.cpp:218
-msgid "Terms of Use"
-msgstr "Lietošanas noteikumi"
+#: ViewStatistics.cpp:2026 ViewStatistics.cpp:2416
+msgid "Hide project list"
+msgstr "Noslēpt projektu sarakstu"
 
-#: clientgui/TermsOfUsePage.cpp:222
-msgid "Please read the following terms of use:"
-msgstr "Lūdzu, izlasiet šos lietošanas noteikumus:"
+#: ViewStatistics.cpp:2027 ViewStatistics.cpp:2416
+msgid "Use entire area for graphs"
+msgstr "Izmantot visu laukumu grafikiem"
 
-#: clientgui/TermsOfUsePage.cpp:231
-msgid "I agree to the terms of use."
-msgstr "Es piekrītu lietošanas noteikumiem."
+#: ViewStatistics.cpp:2032
+msgid "Mode view"
+msgstr "Režīma skats"
 
-#: clientgui/TermsOfUsePage.cpp:237
-msgid "I do not agree to the terms of use."
-msgstr "Es nepiekrītu lietošanas noteikumiem."
+#: ViewStatistics.cpp:2036
+msgid "One project"
+msgstr "Viens projekts"
 
-#: clientgui/UnavailablePage.cpp:183
-msgid "Project temporarily unavailable"
-msgstr "Projekts īslaicīgi nav pieejams"
+#: ViewStatistics.cpp:2037
+msgid "Show one chart with selected project"
+msgstr "Rādīt vienu grafiku ar izvēlēto projektu"
 
-#: clientgui/UnavailablePage.cpp:186
-msgid ""
-"The project is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-"Projekts īslaicīgi nav pieejams.\n"
-"\n"
-"Lūdzu vēlāk mēģiniet vēlreiz."
+#: ViewStatistics.cpp:2043
+msgid "All projects (separate)"
+msgstr "Visi projekti (atsevišķi)"
 
-#: clientgui/UnavailablePage.cpp:190
-msgid "Account manager temporarily unavailable"
-msgstr "Konta menedžeris īslaicīgi nav pieejams"
+#: ViewStatistics.cpp:2044
+msgid "Show all projects, one chart per project"
+msgstr "Rādīt visus projektus, katru savā grafikā"
 
-#: clientgui/UnavailablePage.cpp:193
-msgid ""
-"The account manager is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-"Konta menedžeris īslaicīgi nav pieejams.\n"
-"\n"
-"Lūdzu vēlāk mēģiniet vēlreiz."
+#: ViewStatistics.cpp:2050
+msgid "All projects (together)"
+msgstr "Visi projekti (kopā)"
 
-#: clientgui/ValidateAccountKey.cpp:68
-msgid "Please specify an account key to continue."
-msgstr "Lūdzu, norādiet konta atslēgu, lai turpinātu."
+#: ViewStatistics.cpp:2051
+msgid "Show one chart with all projects"
+msgstr "Rādīt vienu grafiku ar visiem projektiem"
 
-#: clientgui/ValidateAccountKey.cpp:71
-msgid "Invalid Account Key; please enter a valid Account Key"
-msgstr "Nederīga konta atslēga. Lūdzu, ievadiet derīgu konta atslēgu"
+#: ViewStatistics.cpp:2057
+msgid "All projects (sum)"
+msgstr "Visi projekti (summa)"
 
-#: clientgui/ValidateAccountKey.cpp:82
-#: clientgui/ValidateEmailAddress.cpp:86
-msgid "Validation conflict"
-msgstr "Validācijas konflikts"
+#: ViewStatistics.cpp:2058
+msgid "Show one chart with sum of projects"
+msgstr "Rādīt vienu grafiku ar projektu kopsummu"
 
-#: clientgui/ValidateEmailAddress.cpp:72
-msgid "Please specify an email address"
-msgstr "Lūdzu, norādiet e-pasta adresi"
+#: ViewStatistics.cpp:2079
+msgid "Statistics"
+msgstr "Statistika"
 
-#: clientgui/ValidateEmailAddress.cpp:75
-msgid "Invalid email address; please enter a valid email address"
-msgstr "Nederīga e-pasta adrese; lūdzu, ievadiet derīgu e-pasta adresi"
+#: 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
+msgid "Updating charts..."
+msgstr "Aktualizē diagrammas..."
 
-#: clientgui/ValidateURL.cpp:69
-msgid "Missing URL"
-msgstr "Iztrūkst URL"
+#: ViewStatistics.cpp:2420
+msgid "Show project list"
+msgstr "Rādīt projektu sarakstu"
 
-#: clientgui/ValidateURL.cpp:70
-msgid ""
-"Please specify a URL.\n"
-"For example:\n"
-"http://www.example.com/"
-msgstr ""
-"Lūdzu, norādiet URL.\n"
-"Piemēram:\n"
-"http://www.example.com/"
+#: ViewStatistics.cpp:2420
+msgid "Uses smaller area for graphs"
+msgstr "Lieto mazāku laukumu grafikiem"
 
-#: 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 "Nederīgs URL"
+#: ViewTransfers.cpp:164
+msgid "Retry Now"
+msgstr "Mēģināt tagad"
 
-#: 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 ""
-"Lūdzu, norādiet derīgu URL.\n"
-"Piemēram:\n"
-"http://boincprojekts.example.com"
+#: ViewTransfers.cpp:165
+msgid "Retry the file transfer now"
+msgstr "Atkārtot faila pārsūtīšanu tagad"
 
-#: clientgui/ValidateURL.cpp:104
-#: clientgui/ValidateURL.cpp:108
-#, c-format
-msgid "'%s' does not contain a valid host name."
-msgstr "'%s' nesatur derīgu datora vārdu."
+#: ViewTransfers.cpp:171
+msgid "Abort Transfer"
+msgstr "Pārtraukt pārsūtīšanu"
 
-#: clientgui/ValidateURL.cpp:111
-#, c-format
-msgid "'%s' does not contain a valid path."
-msgstr "'%s' nesatur derīgu ceļu."
+#: ViewTransfers.cpp:172
+msgid "Abort this file transfer.  You won't get credit for the task."
+msgstr "Pārtraukt šī faila pārsūtīšanu. Jūs neiegūsiet kredītu par šo uzdevumu."
 
-#: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:175
-msgid "Commands"
-msgstr "Komandas"
+#: ViewTransfers.cpp:183
+msgid "File"
+msgstr "Fails"
 
-#: clientgui/ViewMessages.cpp:88
-msgid "Copy all messages"
-msgstr "Kopēt visus ziņojumus"
+#: ViewTransfers.cpp:184 ViewWork.cpp:233
+msgid "Progress"
+msgstr "Progress"
 
-#: clientgui/ViewMessages.cpp:95
-msgid "Copy selected messages"
-msgstr "Kopēt atzīmētos ziņojumus"
+#: ViewTransfers.cpp:185
+msgid "Size"
+msgstr "Izmērs"
 
-# 95%
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
-msgid "Show only this project"
-msgstr "Rādīt tikai šo projektu"
+#: ViewTransfers.cpp:186
+msgid "Elapsed Time"
+msgstr "Pavadītais laiks"
 
-#: clientgui/ViewMessages.cpp:107
-#: clientgui/ViewMessages.cpp:503
-msgid "Show only the messages for the selected project."
-msgstr "Rādīt ziņojumus tikai izvēlētajam projektam."
+#: ViewTransfers.cpp:187
+msgid "Speed"
+msgstr "Ātrums"
 
-#: clientgui/ViewMessages.cpp:164
-msgid "Messages"
-msgstr "Ziņojumi"
+#: ViewTransfers.cpp:213
+msgid "Transfers"
+msgstr "Pārsūtīšana"
 
-#: clientgui/ViewMessages.cpp:187
-msgid "Copying all messages to the clipboard..."
-msgstr "Kopē visus ziņojumus starpliktuvē..."
+#: ViewTransfers.cpp:280
+msgid "Network activity is suspended - "
+msgstr "Tīkla aktivitāte atlikta - "
 
-#: clientgui/ViewMessages.cpp:223
-msgid "Copying selected messages to the clipboard..."
-msgstr "Kopē izvēlētos ziņojumus starpliktuvē..."
+#: ViewTransfers.cpp:282
+msgid ""
+".\n"
+"You can enable it using the Activity menu."
+msgstr ".\nJūs varat iespējot to izmantojot Aktivitātes izvēlni."
 
-#: clientgui/ViewMessages.cpp:286
-msgid "Filtering messages..."
-msgstr "Ziņu filtrēšana..."
+#: ViewTransfers.cpp:285
+msgid "BOINC"
+msgstr "BOINC"
 
-#: clientgui/ViewMessages.cpp:494
-msgid "Show all messages"
-msgstr "Rādīt visus ziņojumus"
+#: ViewTransfers.cpp:292
+msgid "Retrying transfer now..."
+msgstr "Mēģina pārsūtīt vēlreiz..."
 
-# 96%
-#: clientgui/ViewMessages.cpp:495
-msgid "Show messages for all projects."
-msgstr "Rādīt ziņojumus visiem projektiem."
+#: ViewTransfers.cpp:330
+msgid "Aborting transfer..."
+msgstr "Pārtrauc pārsūtīšanu..."
 
-#: clientgui/ViewProjects.cpp:225
-msgid "Account"
-msgstr "Konts"
+#: ViewTransfers.cpp:343
+#, 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 "Vai esat pārliecināti, ka vēlaties pārtraukt šī faila pārsūtīšanu '%s'?\nPIEZĪME: Pārsūtīšanas pārtraukšana padarīs uzdevumu par nederīgu\nun Jūs nesaņemsiet par to kredītu."
 
-#: clientgui/ViewProjects.cpp:227
-msgid "Work done"
-msgstr "Paveikts"
+#: ViewTransfers.cpp:349
+msgid "Abort File Transfer"
+msgstr "Pārtraukt faila pārsūtīšanu"
 
-#: clientgui/ViewProjects.cpp:228
-msgid "Avg. work done"
-msgstr "Vidēji"
+#: ViewTransfers.cpp:780
+msgid "Upload"
+msgstr "Augšupielāde"
 
-#: clientgui/ViewProjects.cpp:230
-msgid "Status"
-msgstr "Statuss"
+#: ViewTransfers.cpp:780
+msgid "Download"
+msgstr "Lejupielāde"
 
-#: clientgui/ViewProjects.cpp:255
-msgid "Projects"
-msgstr "Projekti"
+#: ViewTransfers.cpp:784
+msgid "retry in "
+msgstr "atkārtot pēc "
 
-#: clientgui/ViewProjects.cpp:307
-msgid "Updating project..."
-msgstr "Aktualizē projektu..."
+#: ViewTransfers.cpp:786
+msgid "failed"
+msgstr "neizdevās"
 
-#: clientgui/ViewProjects.cpp:349
-msgid "Resuming project..."
-msgstr "Atsāk projektu..."
+#: ViewTransfers.cpp:789
+msgid "suspended"
+msgstr "atlikts"
 
-#: clientgui/ViewProjects.cpp:353
-msgid "Suspending project..."
-msgstr "Atliek projektu..."
+#: ViewTransfers.cpp:794
+msgid "active"
+msgstr "aktīvs"
 
-#: clientgui/ViewProjects.cpp:390
-msgid "Telling project to allow additional task downloads..."
-msgstr "Ziņo projektam par atļauju lejupielādēt jaunus uzdevumus..."
+#: ViewTransfers.cpp:796
+msgid "pending"
+msgstr "gaida"
 
-#: clientgui/ViewProjects.cpp:394
-msgid "Telling project to not fetch any additional tasks..."
-msgstr "Ziņo projektam par nevēlēšanos saņemt papildus uzdevumus..."
+#: ViewTransfers.cpp:803
+msgid " (project backoff: "
+msgstr "(projekts liek uzgaidīt:"
 
-#: clientgui/ViewProjects.cpp:430
-msgid "Resetting project..."
-msgstr "Atjaunina projektu..."
+#: ViewWork.cpp:187 ViewWork.cpp:777
+msgid "Show active tasks"
+msgstr "Rādīt aktīvos uzdevumus"
 
-#: clientgui/ViewProjects.cpp:488
-msgid "Removing project..."
-msgstr "Noņem projektu..."
+#: ViewWork.cpp:188 ViewWork.cpp:778
+msgid "Show only active tasks."
+msgstr "Rādīt tikai aktīvos uzdevumus."
 
-#: clientgui/ViewProjects.cpp:548
-msgid "Launching browser..."
-msgstr "Palaiž pārlūkprogrammu..."
+#: ViewWork.cpp:194 sg_TaskCommandPopup.cpp:60
+msgid "Show graphics"
+msgstr "Rādīt grafisko informāciju"
 
-#: clientgui/ViewProjects.cpp:1063
-msgid "Requested by user"
-msgstr "Lietotāja pieprasīts"
+#: ViewWork.cpp:195 sg_TaskCommandPopup.cpp:61
+msgid "Show application graphics in a window."
+msgstr "Rādīt lietojuma grafisko informāciju logā"
 
-#: clientgui/ViewProjects.cpp:1064
-msgid "To fetch work"
-msgstr "Saņemt jaunus uzdevumus"
+#: ViewWork.cpp:201
+msgid "Show VM Console"
+msgstr "Rādīt VM konsoli"
 
-#: clientgui/ViewProjects.cpp:1065
-msgid "To report completed tasks"
-msgstr "Ziņot par pabeigtiem uzdevumiem"
+#: ViewWork.cpp:202
+msgid "Show VM Console in a window."
+msgstr "Rādīt VM konsoli logā."
 
-#: clientgui/ViewProjects.cpp:1066
-msgid "To send trickle-up message"
-msgstr "Sūtīt uzsūkšanās ziņu"
+#: ViewWork.cpp:209
+msgid "Suspend work for this result."
+msgstr "Atlikt šī uzdevuma izpildi"
 
-#: clientgui/ViewProjects.cpp:1067
-msgid "Requested by account manager"
-msgstr "Konta menedžera pieprasīts"
+#: ViewWork.cpp:215 sg_TaskCommandPopup.cpp:72
+msgid "Abort"
+msgstr "Pārtraukt"
 
-#: clientgui/ViewProjects.cpp:1068
-msgid "Project initialization"
-msgstr "Projekta inicializēšana"
+#: ViewWork.cpp:216
+msgid "Abandon work on the result. You will get no credit for it."
+msgstr "Atteikties no darba pie šī uzdevuma. Jūs neiegūsiet kredītpunktus par nepabeigtu darbu."
 
-#: clientgui/ViewProjects.cpp:1069
-msgid "Requested by project"
-msgstr "Projekta pieprasīts"
+#: ViewWork.cpp:223 sg_TaskCommandPopup.cpp:79
+msgid "Show task details."
+msgstr "Rādīt uzdevuma informāciju."
 
-#: clientgui/ViewProjects.cpp:1070
-msgid "Unknown reason"
-msgstr "Nezināms iemesls"
+#: ViewWork.cpp:235
+msgid "Elapsed"
+msgstr "Aizritējis"
 
-#: clientgui/ViewProjects.cpp:1084
-msgid "Suspended by user"
-msgstr "Lietotāja atlikts"
+#: ViewWork.cpp:236
+msgid "Remaining (estimated)"
+msgstr "Atlicis (paredzams)"
 
-#: clientgui/ViewProjects.cpp:1087
-msgid "Won't get new tasks"
-msgstr "Nesaņems jaunus uzdevumus"
+#: ViewWork.cpp:237
+msgid "Deadline"
+msgstr "Termiņš"
 
-#: clientgui/ViewProjects.cpp:1090
-msgid "Project ended - OK to remove"
-msgstr "Projekts beidzies - var noņemt"
+#: ViewWork.cpp:264
+msgid "Tasks"
+msgstr "Uzdevumi"
 
-# 77%
-#: clientgui/ViewProjects.cpp:1093
-msgid "Will remove when tasks done"
-msgstr "Noņems, kad uzdevumi tiks pabeigti"
+#: ViewWork.cpp:357
+msgid "Resuming task..."
+msgstr "Atsāk uzdevumu..."
 
-#: clientgui/ViewProjects.cpp:1096
-msgid "Scheduler request pending"
-msgstr "Gaida plānotāja pieprasījuma rezultātu"
+#: ViewWork.cpp:360
+msgid "Suspending task..."
+msgstr "Atliek uzdevumu..."
 
-# 75%
-#: clientgui/ViewProjects.cpp:1102
-msgid "Scheduler request in progress"
-msgstr "Izveic plānotāja pieprasījumu"
+#: ViewWork.cpp:389
+msgid "Showing graphics for task..."
+msgstr "Rāda uzdevuma grafisko informāciju..."
 
-#: clientgui/ViewProjects.cpp:1105
-msgid "Trickle up message pending"
-msgstr "Gaida uzsūkšanās ziņu"
+#: ViewWork.cpp:426
+msgid "Showing VM console for task..."
+msgstr "Rāda VM konsoli uzdevumam..."
 
-#: clientgui/ViewProjects.cpp:1111
-msgid "Communication deferred "
-msgstr "Komunikācija atlikta uz "
+#: ViewWork.cpp:479
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %s, Status: %s)"
+msgstr "Vai esat pārliecināti, ka vēlaties pārtraukt šo uzdevumu '%s'?\n(Progress: %s, Statuss: %s)"
 
-#: clientgui/ViewResources.cpp:62
-msgid "Total disk usage"
-msgstr "Kopējais diska izlietojums"
+#: ViewWork.cpp:485
+#, c-format
+msgid "Are you sure you want to abort these %d tasks?"
+msgstr "Vai tiešām vēlaties pārtaukt apstrādāt šos %d uzdevums?"
 
-#: clientgui/ViewResources.cpp:83
-msgid "Disk usage by BOINC projects"
-msgstr "BOINC projektiem izlietotā diska vieta"
+#: ViewWork.cpp:490 sg_TaskCommandPopup.cpp:256
+msgid "Abort task"
+msgstr "Pārtraukt uzdevumu"
 
-#: clientgui/ViewResources.cpp:116
-msgid "Disk"
-msgstr "Disks"
+#: ViewWork.cpp:499
+msgid "Aborting task..."
+msgstr "Pārtrauc uzdevumu..."
 
-#: clientgui/ViewResources.cpp:225
-msgid "no projects: 0 bytes used"
-msgstr "nav projektu: izlietoti 0 baiti"
+#: ViewWork.cpp:771
+msgid "Show all tasks"
+msgstr "Rādīt visus uzdevumus"
 
-#: clientgui/ViewResources.cpp:262
-msgid "used by BOINC: "
-msgstr "BOINC lietošanā"
+#: ViewWork.cpp:772
+msgid "Show all tasks."
+msgstr "Rādīt visus uzdevumus."
 
-#: clientgui/ViewResources.cpp:272
-msgid "free, available to BOINC: "
-msgstr "brīvs, pieejams BOINC"
+#: ViewWork.cpp:796 sg_TaskCommandPopup.cpp:103
+msgid "Resume work for this task."
+msgstr "Atsākt darbu pie šī uzdevuma."
 
-#: clientgui/ViewResources.cpp:282
-msgid "free, not available to BOINC: "
-msgstr "brīvs, nav pieejams BOINC"
+#: ViewWork.cpp:802 sg_TaskCommandPopup.cpp:107
+msgid "Suspend work for this task."
+msgstr "Atlikt darbu pie šī uzdevuma."
 
-#: clientgui/ViewResources.cpp:292
-msgid "free: "
-msgstr "brīvs:"
+#: WelcomePage.cpp:284
+msgid "Add project or account manager"
+msgstr "Pievienot projektu vai konta menedžeri"
 
-#: clientgui/ViewResources.cpp:302
-msgid "used by other programs: "
-msgstr "izmanto citas programmas:"
+#: WelcomePage.cpp:288
+msgid "Add project or use BOINC Account Manager"
+msgstr "Pievienojiet projektu vai izmantojiet BOINC konta menedžeri"
 
-#: clientgui/ViewStatistics.cpp:1181
-msgid "User Total"
-msgstr "Lietotāja kopā iegūtie kredītpunkti"
+#: 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 "Ja iespējams, pievienojiet projektus\n%s mājas lapā.\n\nProjekti, kuri pievienoti caur šo vedni nebūs\nuzskaitīti vai vadāmi no %s."
 
-#: clientgui/ViewStatistics.cpp:1182
-msgid "User Average"
-msgstr "Lietotāja vidēji iegūtie kredītpunkti"
+#: 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 "Ir pieejami vairāk nekā 30 BOINC-bāzētu projektu,\nkuri veic pētījumus daudzās zinātņu jomās\nun Jūs varat pieteikties kaut katrā no tiem.\nJūs varat pievienot projektu tieši vai arī lietot\n'Konta menedžera' mājas lapu, lai izvēlētos projektus."
 
-#: clientgui/ViewStatistics.cpp:1183
-msgid "Host Total"
-msgstr "Datora kopējie kredītpunkti"
+#: 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 "Jūs esat izvēlējušies pievienot jaunu brīvprātīgo skaitļošanas projektu vai arī mainīt,\nkurus projektus veicināt.\n\nDažus no šiem projektiem vada un pārvalda World Community Grid, kamēr citus\nvada un pārvalda citi pētnieki vai organizācijas. BOINC programmatūra\nsadalīt Jūsu brīvo skaitļošanas jaudu star projektiem jebkurā kombinācijā.\n\nAlternatīvi, ja esat reģistrējušies BOINC konta menedžerī, Jūs varat lietot to,\nlai izvēlētos, kurus projektus atbalstīt.\n\nLūdzu, izvēlie [...]
 
-#: clientgui/ViewStatistics.cpp:1184
-msgid "Host Average"
-msgstr "Datora vidēji iegūtie kredītpunkti"
+#: WelcomePage.cpp:339
+msgid "Use a BOINC Account Manager"
+msgstr "Lietot BOINC konta menedžeri"
 
-#: clientgui/ViewStatistics.cpp:1331
-#, c-format
-msgid "Last update: %.0f days ago"
-msgstr "Atjaunināts: %.0f dienas atpakaļ"
+#: WelcomePage.cpp:352
+msgid "To continue, click Next."
+msgstr "Lai turpinātu nospiediet Nākamais."
 
-#: clientgui/ViewStatistics.cpp:1956
-msgid "Show user total"
-msgstr "Rādīt lietotāja kopējo"
+#: WelcomePage.cpp:358
+msgid "Add or change your World Community Grid projects"
+msgstr "Pievienot vai mainīt savus World Community Grid projektus"
 
-#: clientgui/ViewStatistics.cpp:1957
-msgid "Show total credit for user"
-msgstr "Rādīt kopējo lietotāja kredītu"
+#: WelcomePage.cpp:361
+msgid "Add projects run by other researchers or organizations"
+msgstr "Pievienot projektus, kurus vada citi pētnieki vai organizācijas"
 
-#: clientgui/ViewStatistics.cpp:1963
-msgid "Show user average"
-msgstr "Rādīt lietotāja vidējo"
+#: WizardAttach.cpp:634
+msgid "Do you really want to cancel?"
+msgstr "Vai tiešām vēlaties atcelt?"
 
-#: clientgui/ViewStatistics.cpp:1964
-msgid "Show average credit for user"
-msgstr "Rādīt vidējo lietotāja kredītu"
+#: WizardAttach.cpp:635
+msgid "Question"
+msgstr "Jautājums"
 
-#: clientgui/ViewStatistics.cpp:1970
-msgid "Show host total"
-msgstr "Rādīt datora kopējo"
+#: sg_BoincSimpleFrame.cpp:149
+msgid "Advanced View...\tCtrl+Shift+A"
+msgstr "Detalizētais skats...\tCtrl+Shift+A"
 
-#: clientgui/ViewStatistics.cpp:1971
-msgid "Show total credit for host"
-msgstr "Rādīt datora kopējo kredītu "
+#: sg_BoincSimpleFrame.cpp:150
+msgid "Display the advanced graphical interface."
+msgstr "Parādīt papildu grafisko interfeisu."
 
-#: clientgui/ViewStatistics.cpp:1977
-msgid "Show host average"
-msgstr "Rādīt datora vidējo"
+#: sg_BoincSimpleFrame.cpp:157
+msgid "Skin"
+msgstr "Ādiņa"
 
-#: clientgui/ViewStatistics.cpp:1978
-msgid "Show average credit for host"
-msgstr "Rādīt datora vidējo kredītu"
+#: sg_BoincSimpleFrame.cpp:159
+msgid "Select the appearance of the user interface."
+msgstr "Izvēlieties lietotāja saskarnes izskatu."
 
-#: clientgui/ViewStatistics.cpp:1987
-msgid "< &Previous project"
-msgstr "< &Iepriekšējais projekts"
+#: sg_BoincSimpleFrame.cpp:206
+#, c-format
+msgid "&%s"
+msgstr "&%s"
 
-#: clientgui/ViewStatistics.cpp:1988
-msgid "Show chart for previous project"
-msgstr "Rādīt grafiku iepriekšējam projektam"
+#: sg_BoincSimpleFrame.cpp:390
+msgid "Default"
+msgstr "Noklusētais"
 
-#: clientgui/ViewStatistics.cpp:1993
-msgid "&Next project >"
-msgstr "&Nākamais projekts >"
+#: sg_BoincSimpleFrame.cpp:759
+msgid "Suspend Computing"
+msgstr "Apturēt skaitļošanu"
 
-#: clientgui/ViewStatistics.cpp:1994
-msgid "Show chart for next project"
-msgstr "Rādīt grafiku nākamajam projektam"
+#: sg_BoincSimpleFrame.cpp:760
+msgid "Resume Computing"
+msgstr "Atsākt skaitļošanu"
 
-#: clientgui/ViewStatistics.cpp:2000
-#: clientgui/ViewStatistics.cpp:2390
-msgid "Hide project list"
-msgstr "Noslēpt projektu sarakstu"
+#: sg_BoincSimpleFrame.cpp:777
+msgid "Open a window to view notices from projects or BOINC"
+msgstr "Atvērt logu, lai redzētu paziņojumus no projektiem vai BOINC"
 
-#: clientgui/ViewStatistics.cpp:2001
-#: clientgui/ViewStatistics.cpp:2390
-msgid "Use entire area for graphs"
-msgstr "Izmantot visu laukumu grafikiem"
+#: sg_DlgMessages.cpp:146
+msgid "Close"
+msgstr "Aizvērt"
 
-#: clientgui/ViewStatistics.cpp:2006
-msgid "Mode view"
-msgstr "Režīma skats"
+#: sg_DlgMessages.cpp:389
+#, c-format
+msgid "%s - Notices"
+msgstr "%s - Paziņojumi"
 
-#: clientgui/ViewStatistics.cpp:2010
-msgid "One project"
-msgstr "Viens projekts"
+#: sg_DlgPreferences.cpp:268
+msgid "This dialog controls preferences for this computer only."
+msgstr "Šis dialoglogs kontrolē preferences tikai šim datoram."
 
-#: clientgui/ViewStatistics.cpp:2011
-msgid "Show one chart with selected project"
-msgstr "Rādīt vienu grafiku ar izvēlēto projektu"
+#: sg_DlgPreferences.cpp:273
+msgid "Click OK to set preferences."
+msgstr "Noklišķiniet Labi, lai iestatītu preferences."
 
-#: clientgui/ViewStatistics.cpp:2017
-msgid "All projects (separate)"
-msgstr "Visi projekti (atsevišķi)"
+#: sg_DlgPreferences.cpp:278
+msgid ""
+"Click Clear to restore web-based settings for all preferences listed below."
+msgstr "Noklišķiniet Notīrīt, lai atjaunotu tīmekļa-bāzētus iestatījumus visām zemāk minētām preferencēm."
 
-#: clientgui/ViewStatistics.cpp:2018
-msgid "Show all projects, one chart per project"
-msgstr "Rādīt visus projektus, katru savā grafikā"
+#: sg_DlgPreferences.cpp:285
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
+msgstr "Papildu iestatījumiem izvēlieties Skaitļošanas preferences Detalizētajā skatā."
 
-#: clientgui/ViewStatistics.cpp:2024
-msgid "All projects (together)"
-msgstr "Visi projekti (kopā)"
+#: sg_DlgPreferences.cpp:313
+msgid "Do work only between:"
+msgstr "Veikt darbu tikai starp:"
 
-#: clientgui/ViewStatistics.cpp:2025
-msgid "Show one chart with all projects"
-msgstr "Rādīt vienu grafiku ar visiem projektiem"
+#: sg_DlgPreferences.cpp:335
+msgid "Connect to internet only between:"
+msgstr "Savienoties ar Internet tikai starp:"
 
-#: clientgui/ViewStatistics.cpp:2031
-msgid "All projects (sum)"
-msgstr "Visi projekti (summa)"
+#: sg_DlgPreferences.cpp:357 sg_DlgPreferences.cpp:374
+msgid "Use no more than:"
+msgstr "Nelietot vairāk par:"
 
-#: clientgui/ViewStatistics.cpp:2032
-msgid "Show one chart with sum of projects"
-msgstr "Rādīt vienu grafiku ar projektu kopsummu"
+#: sg_DlgPreferences.cpp:370
+msgid "of disk space"
+msgstr "diska vietas"
 
-#: clientgui/ViewStatistics.cpp:2053
-msgid "Statistics"
-msgstr "Statistika"
+#: sg_DlgPreferences.cpp:387
+msgid "of the processor"
+msgstr "procesora"
 
-#: 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 "Aktualizē diagrammas..."
+#: sg_DlgPreferences.cpp:391
+msgid "Do work while on battery?"
+msgstr "Vai strādāt, kad lieto akumulatoru?"
 
-#: clientgui/ViewStatistics.cpp:2394
-msgid "Show project list"
-msgstr "Rādīt projektu sarakstu"
+#: sg_DlgPreferences.cpp:404
+msgid "Do work after idle for:"
+msgstr "Strādāt, ja dīkstāvē:"
 
-#: clientgui/ViewStatistics.cpp:2394
-msgid "Uses smaller area for graphs"
-msgstr "Lieto mazāku laukumu grafikiem"
+#: sg_DlgPreferences.cpp:429
+msgid "Clear all local preferences listed above and close the dialog"
+msgstr "Notīrīt visas augstāk minētās lokālās preferences un aizvērt dialoglogu"
 
-#: clientgui/ViewTransfers.cpp:169
-msgid "Retry Now"
-msgstr "Mēģināt tagad"
+#: 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 "Jebkurā laikā"
 
-#: clientgui/ViewTransfers.cpp:170
-msgid "Retry the file transfer now"
-msgstr "Atkārtot faila pārsūtīšanu tagad"
+#: sg_DlgPreferences.cpp:638
+msgid "100 MB"
+msgstr "100 MB"
 
-#: clientgui/ViewTransfers.cpp:176
-msgid "Abort Transfer"
-msgstr "Pārtraukt pārsūtīšanu"
+#: sg_DlgPreferences.cpp:639
+msgid "200 MB"
+msgstr "200 MB"
 
-#: clientgui/ViewTransfers.cpp:177
-msgid "Abort this file transfer.  You won't get credit for the task."
-msgstr "Pārtraukt šī faila pārsūtīšanu. Jūs neiegūsiet kredītu par šo uzdevumu."
+#: sg_DlgPreferences.cpp:640
+msgid "500 MB"
+msgstr "500 MB"
 
-#: clientgui/ViewTransfers.cpp:188
-msgid "File"
-msgstr "Fails"
+#: sg_DlgPreferences.cpp:641
+msgid "1 GB"
+msgstr "1 GB"
 
-#: clientgui/ViewTransfers.cpp:189
-#: clientgui/ViewWork.cpp:238
-msgid "Progress"
-msgstr "Progress"
+#: sg_DlgPreferences.cpp:642
+msgid "2 GB"
+msgstr "2 GB"
 
-#: clientgui/ViewTransfers.cpp:190
-msgid "Size"
-msgstr "Izmērs"
+#: sg_DlgPreferences.cpp:643
+msgid "5 GB"
+msgstr "5 GB"
 
-#: clientgui/ViewTransfers.cpp:191
-msgid "Elapsed Time"
-msgstr "Pavadītais laiks"
+#: sg_DlgPreferences.cpp:644
+msgid "10 GB"
+msgstr "10 GB"
 
-#: clientgui/ViewTransfers.cpp:192
-msgid "Speed"
-msgstr "Ātrums"
+#: sg_DlgPreferences.cpp:645
+msgid "20 GB"
+msgstr "20 GB"
 
-#: clientgui/ViewTransfers.cpp:218
-msgid "Transfers"
-msgstr "Pārsūtīšana"
+#: sg_DlgPreferences.cpp:646
+msgid "50 GB"
+msgstr "50 GB"
 
-#: clientgui/ViewTransfers.cpp:285
-msgid "Network activity is suspended - "
-msgstr "Tīkla aktivitāte atlikta - "
+#: sg_DlgPreferences.cpp:647
+msgid "100 GB"
+msgstr "100 GB"
 
-#: clientgui/ViewTransfers.cpp:287
-msgid ""
-".\n"
-"You can enable it using the Activity menu."
-msgstr ""
-".\n"
-"Jūs varat iespējot to izmantojot Aktivitātes izvēlni."
+#: sg_DlgPreferences.cpp:717
+#, c-format
+msgid "%d MB"
+msgstr "%d MB"
 
-#: clientgui/ViewTransfers.cpp:290
-msgid "BOINC"
-msgstr "BOINC"
+#: sg_DlgPreferences.cpp:719
+#, c-format
+msgid "%4.2f GB"
+msgstr "%4.2f GB"
 
-#: clientgui/ViewTransfers.cpp:297
-msgid "Retrying transfer now..."
-msgstr "Mēģina pārsūtīt vēlreiz..."
+#: sg_DlgPreferences.cpp:760
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
 
-#: clientgui/ViewTransfers.cpp:335
-msgid "Aborting transfer..."
-msgstr "Pārtrauc pārsūtīšanu..."
+#: sg_DlgPreferences.cpp:796
+msgid "0 (Run Always)"
+msgstr "0 (izpildīt vienmēr)"
 
-#: clientgui/ViewTransfers.cpp:348
+#: sg_DlgPreferences.cpp:799
 #, 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 ""
-"Vai esat pārliecināti, ka vēlaties pārtraukt šī faila pārsūtīšanu '%s'?\n"
-"PIEZĪME: Pārsūtīšanas pārtraukšana padarīs uzdevumu par nederīgu\n"
-"un Jūs nesaņemsiet par to kredītu."
+msgid "%d"
+msgstr "%d"
 
-#: clientgui/ViewTransfers.cpp:354
-msgid "Abort File Transfer"
-msgstr "Pārtraukt faila pārsūtīšanu"
+#: sg_DlgPreferences.cpp:1029
+msgid "Do you really want to clear all local preferences?\n"
+msgstr "Vai tiešām vēlaties notīrīt visas lokālās preferences?\n"
 
-#: clientgui/ViewTransfers.cpp:785
-msgid "Upload"
-msgstr "Augšupielāde"
+#: sg_ProjectPanel.cpp:72
+msgid "Add Project"
+msgstr "Pievienot projektu"
 
-#: clientgui/ViewTransfers.cpp:785
-msgid "Download"
-msgstr "Lejupielāde"
+#: sg_ProjectPanel.cpp:73
+msgid "Synchronize"
+msgstr "Sinhronizēt"
 
-#: clientgui/ViewTransfers.cpp:789
-msgid "retry in "
-msgstr "atkārtot pēc "
+#: sg_ProjectPanel.cpp:74
+msgid "Work done for this project"
+msgstr "Paveiktais šim projektam"
 
-#: clientgui/ViewTransfers.cpp:791
-msgid "failed"
-msgstr "neizdevās"
+#: sg_ProjectPanel.cpp:77
+msgid "Synchronize projects with account manager system"
+msgstr "Sinhronizēt projektus ar konta menedžera sistēmu"
 
-#: clientgui/ViewTransfers.cpp:794
-msgid "suspended"
-msgstr "atlikts"
+#: sg_ProjectPanel.cpp:124
+msgid "Select a project to access with the controls below"
+msgstr "Izvēlieties projektu kam piekļūt ar zemāk izvietotām vadīklām"
 
-#: clientgui/ViewTransfers.cpp:799
-msgid "active"
-msgstr "aktīvs"
+#: sg_ProjectPanel.cpp:145
+msgid "Project Web Pages"
+msgstr "Projekta web lapas"
 
-#: clientgui/ViewTransfers.cpp:801
-msgid "pending"
-msgstr "gaida"
+#: sg_ProjectPanel.cpp:149
+msgid "Project Commands"
+msgstr "Projekta komandas"
 
-#: clientgui/ViewTransfers.cpp:808
-msgid " (project backoff: "
-msgstr "(projekts liek uzgaidīt:"
+#: sg_ProjectPanel.cpp:267
+#, c-format
+msgid "Pop up a menu of web sites for project %s"
+msgstr "Rādīt uznirstošo izvēlni ar mājas lapām projektam %s"
 
-#: clientgui/ViewWork.cpp:192
-#: clientgui/ViewWork.cpp:782
-msgid "Show active tasks"
-msgstr "Rādīt aktīvos uzdevumus"
+#: sg_ProjectPanel.cpp:269
+#, c-format
+msgid "Pop up a menu of commands to apply to project %s"
+msgstr "Rādīt uznirstošo izvēlni ar komandām, ko pielietot projektam %s"
 
-#: clientgui/ViewWork.cpp:193
-#: clientgui/ViewWork.cpp:783
-msgid "Show only active tasks."
-msgstr "Rādīt tikai aktīvos uzdevumus."
+#: sg_TaskCommandPopup.cpp:67
+msgid "Suspend this task."
+msgstr "Apturēt šo uzdevumu."
 
-#: clientgui/ViewWork.cpp:206
-msgid "Show VM Console"
-msgstr "Rādīt VM konsoli"
+#: sg_TaskCommandPopup.cpp:73
+msgid "Abandon this task. You will get no credit for it."
+msgstr "Pārtraukt šo uzdevumu. Jūs neiegūsiet kredītu par to."
 
-#: clientgui/ViewWork.cpp:207
-msgid "Show VM Console in a window."
-msgstr "Rādīt VM konsoli logā."
+#: sg_TaskCommandPopup.cpp:251
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %.1lf%%, Status: %s)"
+msgstr "Vai esat pārliecināti, ka vēlaties pārtraukt šo uzdevumu '%s'?\n(Progress: %.1lf%%, Statuss: %s)"
 
-#: clientgui/ViewWork.cpp:214
-msgid "Suspend work for this result."
-msgstr "Atlikt šī uzdevuma izpildi"
+#: sg_TaskPanel.cpp:464
+msgid "You don't have any projects.  Please Add a Project."
+msgstr "Jums nav neviena projekta. Lūdzu, pievienojiet projektu."
 
-#: clientgui/ViewWork.cpp:221
-msgid "Abandon work on the result. You will get no credit for it."
-msgstr "Atteikties no darba pie šī uzdevuma. Jūs neiegūsiet kredītpunktus par nepabeigtu darbu."
+#: sg_TaskPanel.cpp:465
+msgid "Not available"
+msgstr "Nav pieejams"
 
-#: clientgui/ViewWork.cpp:240
-msgid "Elapsed"
-msgstr "Aizritējis"
+#: sg_TaskPanel.cpp:476
+msgid "Tasks:"
+msgstr "Uzdevumi:"
 
-#: clientgui/ViewWork.cpp:241
-msgid "Remaining (estimated)"
-msgstr "Atlicis (paredzams)"
+#: sg_TaskPanel.cpp:482
+msgid "Select a task to access"
+msgstr "Izvēlieties uzdevumu, lai piekļūtu"
 
-#: clientgui/ViewWork.cpp:242
-msgid "Deadline"
-msgstr "Termiņš"
+#: sg_TaskPanel.cpp:493
+msgid "From:"
+msgstr "No:"
 
-#: clientgui/ViewWork.cpp:269
-msgid "Tasks"
-msgstr "Uzdevumi"
+#: sg_TaskPanel.cpp:547
+msgid "This task's progress"
+msgstr "Šī uzdevuma progress"
 
-#: clientgui/ViewWork.cpp:362
-msgid "Resuming task..."
-msgstr "Atsāk uzdevumu..."
+#: sg_TaskPanel.cpp:565
+msgid "Task Commands"
+msgstr "Uzdevuma komandas"
 
-#: clientgui/ViewWork.cpp:365
-msgid "Suspending task..."
-msgstr "Atliek uzdevumu..."
+#: sg_TaskPanel.cpp:566
+msgid "Pop up a menu of commands to apply to this task"
+msgstr "Rādīt uznirstošo izvēlni ar komandām, ko pielietot šim uzdevumam"
 
-#: clientgui/ViewWork.cpp:394
-msgid "Showing graphics for task..."
-msgstr "Rāda uzdevuma grafisko informāciju..."
+#: sg_TaskPanel.cpp:701
+#, c-format
+msgid "Application: %s"
+msgstr "Lietojums: %s"
 
-#: clientgui/ViewWork.cpp:431
-msgid "Showing VM console for task..."
-msgstr "Rāda VM konsoli uzdevumam..."
+#: sg_TaskPanel.cpp:724
+#, c-format
+msgid "%.3f%%"
+msgstr "%.3f%%"
+
+#: sg_TaskPanel.cpp:732
+msgid "Application: Not available"
+msgstr "Lietojums: Nav pieejams"
 
-#: clientgui/ViewWork.cpp:484
+#: sg_TaskPanel.cpp:832
+msgid "Not Available"
+msgstr "Nav pieejams"
+
+#: sg_TaskPanel.cpp:847
 #, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %s, Status: %s)"
-msgstr ""
-"Vai esat pārliecināti, ka vēlaties pārtraukt šo uzdevumu '%s'?\n"
-"(Progress: %s, Statuss: %s)"
+msgid "Elapsed: %s"
+msgstr "Pagājis: %s"
 
-#: clientgui/ViewWork.cpp:490
+#: sg_TaskPanel.cpp:861
 #, c-format
-msgid "Are you sure you want to abort these %d tasks?"
-msgstr "Vai tiešām vēlaties pārtaukt apstrādāt šos %d uzdevums?"
+msgid "Remaining (estimated): %s"
+msgstr "Atlicis (paredzams): %s"
 
-# 75%
-#: clientgui/ViewWork.cpp:504
-msgid "Aborting task..."
-msgstr "Pārtrauc uzdevumu..."
+#: sg_TaskPanel.cpp:876
+#, c-format
+msgid "Status: %s"
+msgstr "Statuss: %s"
 
-#: clientgui/ViewWork.cpp:776
-msgid "Show all tasks"
-msgstr "Rādīt visus uzdevumus"
+#: sg_TaskPanel.cpp:1223
+msgid "Retrieving current status."
+msgstr "Iegūst pašreizējo statusu."
 
-#: clientgui/ViewWork.cpp:777
-msgid "Show all tasks."
-msgstr "Rādīt visus uzdevumus."
+#: sg_TaskPanel.cpp:1229
+msgid "Downloading work from the server."
+msgstr "Lejupielādē darbu no servera."
 
-#: clientgui/WelcomePage.cpp:284
-msgid "Add project or account manager"
-msgstr "Pievienot projektu vai konta menedžeri"
+#: sg_TaskPanel.cpp:1234
+msgid "Processing Suspended:  Running On Batteries."
+msgstr "Apstrāde apturēta: Strādā no akumulatora."
 
-#: clientgui/WelcomePage.cpp:288
-msgid "Add project or use BOINC Account Manager"
-msgstr "Pievienojiet projektu vai izmantojiet BOINC konta menedžeri"
+#: sg_TaskPanel.cpp:1236
+msgid "Processing Suspended:  User Active."
+msgstr "Apstrāde apturēta: Lietotājs aktīvs."
 
-#: 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 ""
-"Ja iespējams, pievienojiet projektus\n"
-"%s mājas lapā.\n"
-"\n"
-"Projekti, kuri pievienoti caur šo vedni nebūs\n"
-"uzskaitīti vai vadāmi no %s."
+#: sg_TaskPanel.cpp:1238
+msgid "Processing Suspended:  User paused processing."
+msgstr "Apstrāde apturēta: Lietotājs apturēja apstrādi."
 
-#: 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 ""
-"Ir pieejami vairāk nekā 30 BOINC-bāzētu projektu,\n"
-"kuri veic pētījumus daudzās zinātņu jomās\n"
-"un Jūs varat pieteikties kaut katrā no tiem.\n"
-"Jūs varat pievienot projektu tieši vai arī lietot\n"
-"'Konta menedžera' mājas lapu, lai izvēlētos projektus."
+#: sg_TaskPanel.cpp:1240
+msgid "Processing Suspended:  Time of Day."
+msgstr "Apstrāde apturēta: Diennakts laiks."
 
-#: 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 ""
-"Jūs esat izvēlējušies pievienot jaunu brīvprātīgo skaitļošanas projektu vai arī mainīt,\n"
-"kurus projektus veicināt.\n"
-"\n"
-"Dažus no šiem projektiem vada un pārvalda World Community Grid, kamēr citus\n"
-"vada un pārvalda citi pētnieki vai organizācijas. BOINC programmatūra\n"
-"sadalīt Jūsu brīvo skaitļošanas jaudu star projektiem jebkurā kombinācijā.\n"
-"\n"
-"Alternatīvi, ja esat reģistrējušies BOINC konta menedžerī, Jūs varat lietot to,\n"
-"lai izvēlētos, kurus projektus atbalstīt.\n"
-"\n"
-"Lūdzu, izvēlieties, kāda tipa izmaiņas vēlaties veikt :\n"
+#: sg_TaskPanel.cpp:1242
+msgid "Processing Suspended:  Benchmarks Running."
+msgstr "Apstrāde apturēta: Veic veiktspējas testu."
 
-#: clientgui/WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
-msgstr "Lietot BOINC konta menedžeri"
+#: sg_TaskPanel.cpp:1244
+msgid "Processing Suspended."
+msgstr "Apstrāde apturēta."
 
-#: clientgui/WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
-msgstr "Pievienot vai mainīt savus World Community Grid projektus"
+#: sg_TaskPanel.cpp:1248
+msgid "Waiting to contact project servers."
+msgstr "Gaida, lai savienotos ar projekta serveriem."
 
-#: clientgui/WelcomePage.cpp:361
-msgid "Add projects run by other researchers or organizations"
-msgstr "Pievienot projektus, kurus vada citi pētnieki vai organizācijas"
+#: sg_TaskPanel.cpp:1252 sg_TaskPanel.cpp:1261
+msgid "Retrieving current status"
+msgstr "Iegūst pašreizējo statusu."
 
-#: clientgui/WizardAttach.cpp:673
-msgid "Do you really want to cancel?"
-msgstr "Vai tiešām vēlaties atcelt?"
+#: sg_TaskPanel.cpp:1256
+msgid "No work available to process"
+msgstr "Nav pieejams darbs, ko apstrādāt"
 
-#: clientgui/WizardAttach.cpp:674
-msgid "Question"
-msgstr "Jautājums"
+#: sg_TaskPanel.cpp:1258
+msgid "Unable to connect to the core client"
+msgstr "Nevar izveidot savienojumu ar galveno klientu"
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
+#: wizardex.cpp:377 wizardex.cpp:553
 msgid "&Next >"
 msgstr "&Nākamais >"
 
-#: clientgui/wizardex.cpp:383
+#: wizardex.cpp:383
 msgid "< &Back"
 msgstr "< &Atpakaļ"
 
-#: clientgui/wizardex.cpp:553
+#: wizardex.cpp:553
 msgid "&Finish"
 msgstr "&Beigt"
 
-#: clientgui/common/wxPieCtrl.cpp:64
-msgid "Pie Ctrl"
-msgstr ""
+#: mac/Mac_GUI.cpp:110
+msgid "Preferences…"
+msgstr "Preferences..."
 
-#: clientgui/mac/Mac_GUI.cpp:35
+#: mac/Mac_GUI.cpp:122
 msgid "Services"
 msgstr "Servisi"
 
-#: clientgui/mac/Mac_GUI.cpp:36
+#: mac/Mac_GUI.cpp:144
 #, c-format
 msgid "Hide %s"
 msgstr "Paslēpt %s"
 
-#: clientgui/mac/Mac_GUI.cpp:37
+#: mac/Mac_GUI.cpp:158
 msgid "Hide Others"
 msgstr "Paslēpt citus"
 
-#: clientgui/mac/Mac_GUI.cpp:38
+#: mac/Mac_GUI.cpp:172
 msgid "Show All"
 msgstr "Rādīt visu"
 
-# 87%
-#: clientgui/mac/Mac_GUI.cpp:39
+#: mac/Mac_GUI.cpp:186
 #, c-format
 msgid "Quit %s"
 msgstr "Iziet %s"
-
-#: clientgui/DlgAdvPreferences.h:30
-msgid "specify work start and stop hours in format HH:MM-HH:MM"
-msgstr ""
-
-#: clientgui/DlgAdvPreferences.h:31
-msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
-msgstr ""
-
-# 98%
-#~ msgid ""
-#~ "(C) 2003-2013 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2013 Kalifornijas Universitāte Berklijā.\n"
-#~ "Visas tiesības aizsargātas."
-#, c-format
-#~ msgid "%s - Preferences"
-#~ msgstr "%s - Preferences"
-
-#, no-c-format
-#~ msgid "% of the processors (0 means ignore this setting)"
-#~ msgstr "% no procesoriem (0 nozīmē ignorēt šo iestatījumu)"
-
-#, no-c-format
-#~ msgid "% CPU time"
-#~ msgstr "% CPU laiks"
-#~ msgid "KBytes/sec."
-#~ msgstr "KBaiti/sek."
-#~ msgid "Mbytes"
-#~ msgstr "MBaiti"
-#~ msgid "every"
-#~ msgstr "katras"
-#~ msgid "days"
-#~ msgstr "dienas"
-#~ msgid "Gigabytes disk space"
-#~ msgstr "Gigabaitu diska vietas"
-#~ msgid "Running, high priority"
-#~ msgstr "Izpildās, augsta prioritāte"
-#~ msgid " (Scheduler wait: "
-#~ msgstr " (Plānotājs gaida: "
-#~ msgid " (Scheduler wait)"
-#~ msgstr " (Plānotāja gaidišana)"
-#~ msgid " (Waiting for network access)"
-#~ msgstr " (Gaida uz pieeju tīklam)"
-#~ msgid "Preferences…"
-#~ msgstr "Preferences..."
-#~ msgid "Workunit name"
-#~ msgstr "Darba vienības vārds"
-#~ msgid "invalid float"
-#~ msgstr "nederīgs peldošais"
-
-# 82%
-# 75%
-#, fuzzy
-#~ msgid "Display the advanced (accessible) graphical interface."
-#~ msgstr "Parādīt vienkāršu grafisko interfeisu."
-
-# 75%
-#, fuzzy
-#~ msgid "My Projects:"
-#~ msgstr "Projekti"
-#~ msgid "Are you sure you want to display graphics on a remote machine?"
-#~ msgstr "Vai tiešām vēlaties rādīt grafiku uz attālinātā datora?"
-
-#, fuzzy
-#~ msgid "Application: "
-#~ msgstr "Lietojums"
-
-#, fuzzy
-#~ msgid "Elapsed Time: "
-#~ msgstr "Pavadītais laiks"
-#~ msgid "Account manager website"
-#~ msgstr "Konta menedžera tīmekļa vietne"
-#~ msgid "Account Manager &URL:"
-#~ msgstr "Konta menedžera &URL:"
-
-#, c-format
-#~ msgid "%s &website"
-#~ msgstr "%s &tīmekļa vietne"
-#~ msgid "Notice List"
-#~ msgstr "Paziņojumu saraksts"
-
-#, c-format
-#~ msgid "%s; received on %s"
-#~ msgstr "%s; saņemts uz %s"
-
-#, c-format
-#~ msgid "%s; received from %s; on %s"
-#~ msgstr "%s; saņemts no %s; uz %s"
-#~ msgid "Click"
-#~ msgstr "Noklišķināt"
-#~ msgid "Project List"
-#~ msgstr "Projektu saraksts"
-#~ msgid "Nvidia GPU Supported"
-#~ msgstr "Nvidia GPU ir atbalstīts"
-#~ msgid "ATI GPU Supported"
-#~ msgstr "ATI GPU ir atbalstīts"
-#~ msgid "Project Website"
-#~ msgstr "Projekta tīmekļa vietne"
-
-# 88%
-#, fuzzy
-#~ msgid "Retry now"
-#~ msgstr "Mēģināt tagad"
-
-#, fuzzy
-#~ msgid "list of projects or account managers"
-#~ msgstr "Pievienoties konta menedžerim"
-
-#, c-format
-#~ msgid "The minimum password length for this project is %d. Please enter a different password."
-#~ msgstr ""
-#~ "Minimālais paroles garums šim projektam ir %d. Lūdzu, izvēlieties citu "
-#~ "paroli."
-
-#, c-format
-#~ msgid "The minimum password length for this account manager is %d. Please enter a different password."
-#~ msgstr ""
-#~ "Minimālais paroles garums šim konta menedžerim ir %d. Lūdzu, izvēlieties "
-#~ "citu paroli."
-#~ msgid ""
-#~ "An error has occurred;\n"
-#~ "check the Event Log for details.\n"
-#~ "\n"
-#~ "Click Finish to close."
-#~ msgstr ""
-#~ "Notika kļūda;\n"
-#~ "detaļas skatiet žurnālā.\n"
-#~ "\n"
-#~ "Noklikšķiniet Beigt, lai aizvērtu."
-
-#, no-c-format
-#~ msgid "% of the processors"
-#~ msgstr "% procesoru"
-#~ msgid "Identify your account "
-#~ msgstr "Identificējiet jūsu kontu "
-#~ msgid "Read config file"
-#~ msgstr "Lasīt konfigurācijas failu"
-#~ msgid "Read configuration info from cc_config.xml"
-#~ msgstr "Lasīt konfigurācijas informāciju no cc_config.xml"
-#~ msgid ""
-#~ "(C) 2003-2011 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2011 Kalifornijas Universitāte Berklijā.\n"
-#~ "Visas tiesības aizsargātas."
-#~ msgid "Multicore CPU Supported"
-#~ msgstr "Daudzkodolu CPU ir atbalstīts"
-#~ msgid "Click 'Retry now' to transfer the file now"
-#~ msgstr "Klikšķiniet uz 'Mēģināt tagad', lai pārsūtītu failu"
-#~ msgid ""
-#~ "Click 'Abort transfer' to delete the file from the transfer queue. This "
-#~ "will prevent you from being granted credit for this result."
-#~ msgstr ""
-#~ "Klikšķiniet uz 'Pārtraukt pārsūtīšanu', lai dzēstu failu no pārsūtīšanas "
-#~ "rindas. Tas arī neļaus jums saņemt kredītpunktus par šo uzdevumu."
-#~ msgid "Aborting result..."
-#~ msgstr "Pārtrauc uzdevumu..."
-#~ msgid "Don't fetch NVIDIA GPU tasks"
-#~ msgstr "Neņemt NVIDIA GPU uzdevumus"
-#~ msgid "NVIDIA GPU work fetch deferred for"
-#~ msgstr "NVIDIA GPU darbu ņemšana atlikta uz"
-#~ msgid "NVIDIA GPU work fetch deferral interval"
-#~ msgstr "NVIDIA GPU darbu ņemšanas atlikšanas intervāls"
-#~ msgid "Don't fetch ATI GPU tasks"
-#~ msgstr "Neņemt ATI GPU uzdevumus"
-#~ msgid "ATI GPU work fetch deferred for"
-#~ msgstr "ATI GPU darbu ņemšana atlikta uz"
-#~ msgid "ATI GPU work fetch deferral interval"
-#~ msgstr "ATI GPU darbu ņemšanas atlikšanas intevāls"
-#~ msgid "Web sites"
-#~ msgstr "Tīmekļa vietnes"
-#~ msgid "Retrieving host information; please wait..."
-#~ msgstr "Atjauno datora informāciju, lūdzu, uzgaidiet..."
-#~ msgid "Failed to attach to project"
-#~ msgstr "Neizdevās pieslēgties projektam"
-#~ msgid "Failed to attach to account manager"
-#~ msgstr "Neizdevās pieslēgties konta menedžerim"
-#~ msgid "Attached to account manager"
-#~ msgstr "Pievienots konta menedžerim"
-#~ msgid "You are now successfully attached to this account manager."
-#~ msgstr "Jūs veiksmīgi pievienojāties šim konta menedžerim."
-#~ msgid "Attach to project"
-#~ msgstr "Pievienoties projektam"
-#~ msgid "Attach to account manager"
-#~ msgstr "Pievienoties konta menedžerim"
-#~ msgid "Attached to project"
-#~ msgstr "Pievienots projektam"
-#~ msgid "You are now successfully attached to this project."
-#~ msgstr "Jūs veiksmīgi pieslēdzāties projektam."
-#~ msgid "Detach"
-#~ msgstr "Atvienoties no projekta"
-#~ msgid "Detaching from project..."
-#~ msgstr "Atvienojas no projekta..."
-#~ msgid "Are you sure you want to detach from project '%s'?"
-#~ msgstr "Vai tiešām vēlaties atvienoties no '%s' projekta?"
-#~ msgid "Detach from Project"
-#~ msgstr "Atvienoties no projekta"
-#~ msgid "To completion"
-#~ msgstr "Līdz pabaigšanai"
-#~ msgid "Attach to a project to begin processing work"
-#~ msgstr "Pievienoties projektam, lai uzsāktu uzdevumu izpildi"
-#~ msgid "Retrying communications for project(s)..."
-#~ msgstr "Atkārtot komunikācijas ar projektu(-iem)..."
-#~ msgid "Account Manager URL"
-#~ msgstr "Konta menedžera URL"
-#~ msgid "Enter the URL of the account manager's web site."
-#~ msgstr "Ievadiet konta menedžera tīmekļa vietnes URL."
-#~ msgid "Attach to &project"
-#~ msgstr "P&ievienoties projektam"
-#~ msgid "Attaching to project..."
-#~ msgstr "Pievienojas projektam..."
-#~ msgid "Debug Flags"
-#~ msgstr "Atkļūdošanas karodziņi"
-#~ msgid "Project Properties Failure"
-#~ msgstr "Projekta īpašību kļūda"
-#~ msgid "Project Properties URL Failure"
-#~ msgstr "Projekta īpašību URL kļūda"
-#~ msgid "Account Creation Disabled"
-#~ msgstr "Konta izveidošana nav iespējama"
-#~ msgid "Account Already Exists"
-#~ msgstr "Konts jau eksistē"
-#~ msgid "Project Already Attached"
-#~ msgstr "Projekts jau ir pievienots"
-#~ msgid "Project Attach Failure"
-#~ msgstr "Projekta pievienošanas kļūda"
-#~ msgid "Net Detection Failure"
-#~ msgstr "Tīkla noteikšanas kļūda"
-#~ msgid "You are already attached to this project."
-#~ msgstr "Jūs jau esat pievienojies šim projektam."
-#~ msgid "Account information"
-#~ msgstr "Informācija par kontu"
-#~ msgid "Do you want to use an existing account or create a new one?"
-#~ msgstr "Vai vēlaties izmantot esošo kontu, vai izveidosiet jaunu?"
-#~ msgid "Create new &account"
-#~ msgstr "Izveidot jaunu &kontu"
-#~ msgid "&Use existing account"
-#~ msgstr "&Lietot esošo kontu"
-#~ msgid ""
-#~ "If you haven't set a password, copy and paste your account\n"
-#~ "key into the Password box."
-#~ msgstr ""
-#~ "Ja jums nav uzstādīta parole, tad pārkopējiet konta atslēgu paroles laukā."
-#~ msgid "Email address:"
-#~ msgstr "E-pasta adrese:"
-#~ msgid "Enter account key"
-#~ msgstr "Ievadiet konta atslēgu"
-#~ msgid "This project uses an \"account key\" to identify you."
-#~ msgstr ""
-#~ "Šis projekts izmanto konta atslēgu (account key), lai jūs identificētu."
-#~ msgid ""
-#~ "Go to the project's web site to create an account. Your account\n"
-#~ "key will be emailed to you."
-#~ msgstr ""
-#~ "Ejiet uz projekta tīmekļa vietni, lai izveidotu kontu. Jūsu konta\n"
-#~ "atslēga tiks nosūtīta caur e-pastu."
-#~ msgid "An account key looks like:"
-#~ msgstr "Konta atslēga ir līdzīga šai te:"
-#~ msgid "82412313ac88e9a3638f66ea82186948"
-#~ msgstr "82412313ac88e9a3638f66ea82186948"
-#~ msgid "Account key:"
-#~ msgstr "Konta atslēga:"
-#~ msgid ""
-#~ "Communicating with account manager\n"
-#~ "Please wait..."
-#~ msgstr ""
-#~ "Komunicējas ar konta menedžeri\n"
-#~ "Lūdzu, uzgaidiet..."
-#~ msgid "BOINC is currently suspended...\n"
-#~ msgstr "BOINC darbība pašlaik ir atlikta...\n"
-#~ msgid "BOINC networking is currently suspended...\n"
-#~ msgstr "BOINC pieslēgums tīklam pašlaik ir atlikts...\n"
-#~ msgid "BOINC Manager is currently reconnecting to a BOINC client...\n"
-#~ msgstr ""
-#~ "BOINC menedžeris pašlaik mēģina atkārtoti pieslēgties pie BOINC "
-#~ "klienta...\n"
-#~ msgid "&Open BOINC Manager..."
-#~ msgstr "Atvērt &BOINC menedžeri..."
-#~ msgid "&About BOINC Manager..."
-#~ msgstr "Pa&r BOINC menedžeri..."
-#~ msgid ""
-#~ "A software platform for distributed computing using volunteered computer "
-#~ "resources"
-#~ msgstr ""
-#~ "Programmatūras platforma dalītai skaitļošanai, lietojot brīvprātīgi "
-#~ "ziedotos datora resursus"
-#~ msgid "Your current account manager is:"
-#~ msgstr "Jūsu pašreizējais konta menedžeris ir:"
-#~ msgid "foo"
-#~ msgstr "jebkas"
-#~ msgid "&Update"
-#~ msgstr "A&ktualizēt"
-#~ msgid "Change"
-#~ msgstr "Mainīt"
-#~ msgid "Language Selection:"
-#~ msgstr "Valodas izvēle:"
-#~ msgid "What language should the manager display by default."
-#~ msgstr "Kādu valodu menedžerim būtu jālieto pēc noklusējuma"
-#~ msgid "Reminder Frequency:"
-#~ msgstr "Atgādinājumu biežums:"
-#~ msgid ""
-#~ "How often, in minutes, should the manager remind you of possible "
-#~ "connection events."
-#~ msgstr ""
-#~ "Cik bieži (minūtēs) menedžerim vajadzētu jums atgādināt par iespējamiem "
-#~ "pieslēguma notikumiem"
-#~ msgid "&Automatically detect network connection settings"
-#~ msgstr "&Automātiski noteikt tīkla pieslēguma parametrus"
-#~ msgid "Use my &Local Area Network(LAN) connection"
-#~ msgstr "Lietot mana l&okālā tīkla (LAN) pieslēgumu"
-#~ msgid "Use my &Dial-up and Virtual Private Network connection"
-#~ msgstr "Lietot manu iezvanpieejas un &virtuālā privātā tīkla pieslēgumu"
-#~ msgid "&Prompt for username and password"
-#~ msgstr "&Pieprasīt lietotāja vārdu un paroli"
-#~ msgid "Failed to create wxStaticText, needed by wxHyperLink!"
-#~ msgstr "Neizdevās izveidot wxStaticText, kas nepieciešams wxHyperLink!"
-#~ msgid "BOINC Manager - Can't find web browser"
-#~ msgstr "BOINC menedžeris - nevar atrast pārlūkprogrammu"
-#~ msgid "BOINC Manager - Connection Error"
-#~ msgstr "BOINC menedžeris - pieslēgšanās kļūda"
-#~ msgid "Exit the BOINC Manager"
-#~ msgstr "Iziet no BOINC menedžera"
-#~ msgid ""
-#~ "Report completed work, get latest credit, get latest preferences, and "
-#~ "possibly get more work."
-#~ msgstr ""
-#~ "Ziņot par paveikto, aktualizēt kredītpunktus un preferences, kā arī, "
-#~ "iespējams, iegūt jaunus uzdevumus"
-#~ msgid "&Options"
-#~ msgstr "&Opcijas"
-#~ msgid "&BOINC Manager\tF1"
-#~ msgstr "&BOINC menedžeris\tF1"
-#~ msgid "Show information about BOINC and BOINC Manager"
-#~ msgstr "Parādīt informāciju par BOINC un BOINC menedžeri"
-#~ msgid "&Projects"
-#~ msgstr "&Projekti"
-#~ msgid "Language Selection..."
-#~ msgstr "Valodas izvēle..."
-#~ msgid "BOINC Manager - Network Status"
-#~ msgstr "BOINC menedžeris - tīkla statuss"
-#~ msgid ""
-#~ "BOINC needs a connection to the Internet to perform some maintenance, "
-#~ "open the BOINC Manager to connect up and perform the needed work."
-#~ msgstr ""
-#~ "BOINC ir nepieciešams pieslēgties pie Interneta, lai veiktu apkopes "
-#~ "darbus. Atveriet BOINC menedžeri, lai pieslēgtos un izpildītu "
-#~ "nepieciešamo darbu."
-#~ msgid "BOINC Manager - Connection Failed"
-#~ msgstr "BOINC menedžeris - pieslēgties neizdevās"
-#~ msgid "BOINC Manager - Connection Status"
-#~ msgstr "BOINC menedžeris - pieslēguma statuss"
-#~ msgid "The URL you supplied is not that of a BOINC-based project."
-#~ msgstr "Jūsu norādītais URL nenorāda uz BOINC-bāzētu projektu."
-#~ msgid "Please check the URL and try again."
-#~ msgstr "Lūdzu, pārbaudiet URL un mēģiniet vēlreiz."
-#~ msgid ""
-#~ "The URL you supplied is not that of a BOINC-based account\n"
-#~ "manager."
-#~ msgstr ""
-#~ "Jūsu norādītais URL nenorāda uz BOINC-bāzētu konta\n"
-#~ "menedžeri."
-#~ msgid "Account not found"
-#~ msgstr "Konts nav atrasts"
-#~ msgid "Project URL"
-#~ msgstr "Projekta URL"
-#~ msgid "Enter the URL of the project's web site."
-#~ msgstr "Ievadiet projekta tīmekļa vietnes URL."
-#~ msgid "For a list of BOINC-based projects go to:"
-#~ msgstr "Lai iegūtu BOINC-bāzēto projektu sarakstu ejiet uz:"
-#~ msgid "Total credit"
-#~ msgstr "Kopā kredītpunktu"
-#~ msgid "Avg. credit"
-#~ msgstr "Vidēji kredītpunktu"
-#~ msgid "Allow new work"
-#~ msgstr "Saņemt jaunus uzdevumus"
-#~ msgid "Disk Space"
-#~ msgstr "Aizņemtā diska vieta"
-#~ msgid "Are you sure you want to abort this file transfer '%s'?"
-#~ msgstr "Vai tiešām vēlaties pārtraukt šī faila pārsūtīšanu '%s'?"
-#~ msgid "Work"
-#~ msgstr "Uzdevumi"
-#~ msgid "Resuming result..."
-#~ msgstr "Atsāk izpildīt uzdevumu..."
-#~ msgid "Abort result"
-#~ msgstr "Pārtraukt uzdevumu"
-#~ msgid "Preempted"
-#~ msgstr "Uz brīdi atlikts"
-#~ msgid "Ready to run"
-#~ msgstr "Gatavs palaišanai"
-#~ msgid "Activities suspended by user"
-#~ msgstr "Aktivitātes ir lietotāja atliktas"
-#~ msgid ""
-#~ "We'll now guide you through the process of \n"
-#~ "adding/updating/removing an account manager."
-#~ msgstr ""
-#~ "Tagad jūs vadīs caur konta menedžera \n"
-#~ "pievienošanas/aktualizēšanas/noņemšanas procesu."
-#~ msgid "Project Comm Failure"
-#~ msgstr "Projekta kom. kļūda"
-#~ msgid "Google Comm Failure"
-#~ msgstr "Google kom. kļūda"
-#~ msgid "Yahoo Comm Failure"
-#~ msgstr "Yahoo kom. kļūda"
-#~ msgid "Attach to Account Manager"
-#~ msgstr "Pievienoties konta menedžerim"
-#~ msgid "Attach to Project"
-#~ msgstr "Pievienoties projektam"
-#~ msgid "About BOINC Manager"
-#~ msgstr "Par BOINC menedžeri"
-#~ msgid "Account Manager"
-#~ msgstr "Konta menedžeris"
-#~ msgid "Dialup Logon"
-#~ msgstr "Iezvanpieejas pieteikšanās"
-
diff --git a/locale/lv/BOINC-Setup.mo b/locale/lv/BOINC-Setup.mo
index 7477378..61cc818 100644
Binary files a/locale/lv/BOINC-Setup.mo and b/locale/lv/BOINC-Setup.mo differ
diff --git a/locale/lv/BOINC-Setup.po b/locale/lv/BOINC-Setup.po
index 7404dc8..e200155 100755
--- a/locale/lv/BOINC-Setup.po
+++ b/locale/lv/BOINC-Setup.po
@@ -4,36 +4,32 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-01-26 00:00-0800\n"
-"PO-Revision-Date: 2015-02-11 22:46-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\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-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: mac_installer\n"
 
 #: Installer.cpp:124
 #, c-format
 msgid "Sorry, this version of %s requires system 10.5 or higher."
 msgstr ""
 
-#: PostInstall.cpp:130
-#: PostInstall.cpp:1136
-#: uninstall.cpp:1618
+#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
 msgid "Yes"
 msgstr ""
 
-#: PostInstall.cpp:131
-#: PostInstall.cpp:1137
-#: uninstall.cpp:1619
+#: PostInstall.cpp:131 PostInstall.cpp:1137 uninstall.cpp:1619
 msgid "No"
 msgstr ""
 
@@ -44,9 +40,11 @@ msgstr ""
 #: PostInstall.cpp:1416
 #, c-format
 msgid ""
-"Users who are permitted to administer this computer will automatically be allowed to run and control %s.\n"
+"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?"
+"Do you also want non-administrative users to be able to run and control %s "
+"on this Mac?"
 msgstr ""
 
 #: PostInstall.cpp:1444
@@ -111,7 +109,8 @@ msgstr ""
 #: uninstall.cpp:840
 #, c-format
 msgid ""
-"Enter your administrator password to completely remove %s from you computer.\n"
+"Enter your administrator password to completely remove %s from you "
+"computer.\n"
 "\n"
 msgstr ""
 
@@ -122,4 +121,3 @@ msgstr ""
 #: uninstall.cpp:1617
 msgid "Continue..."
 msgstr ""
-
diff --git a/locale/lv/BOINC-Web.mo b/locale/lv/BOINC-Web.mo
index 8c5c862..69c8148 100644
Binary files a/locale/lv/BOINC-Web.mo and b/locale/lv/BOINC-Web.mo differ
diff --git a/locale/lv/BOINC-Web.po b/locale/lv/BOINC-Web.po
index 139ef95..7cd89c3 100755
--- a/locale/lv/BOINC-Web.po
+++ b/locale/lv/BOINC-Web.po
@@ -4,22 +4,22 @@
 # FileID  : $Id$
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\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-11 22:46-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.2.1\n"
 "X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-SearchPath-0: doc\n"
 "X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
 "X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
 "X-Poedit-KeywordsList: tra\n"
-"X-Poedit-SearchPath-0: doc\n"
 
 #: docutil.php:21
 msgid "Search"
@@ -35,7 +35,9 @@ msgid "This page is %stranslatable%s."
 msgstr ""
 
 #: download.php:39
-msgid "We recommend that you also install VirtualBox, so your computer can work on science projects that require it."
+msgid ""
+"We recommend that you also install VirtualBox, so your computer can work on "
+"science projects that require it."
 msgstr ""
 
 #: download.php:41
@@ -46,14 +48,12 @@ msgstr ""
 msgid "Download BOINC + VirtualBox"
 msgstr ""
 
-#: download.php:54
-#: download.php:69
+#: download.php:54 download.php:69
 #, php-format
 msgid "for %s"
 msgstr ""
 
-#: download.php:57
-#: download.php:72
+#: download.php:57 download.php:72
 #, php-format
 msgid "BOINC version %s"
 msgstr ""
@@ -68,19 +68,28 @@ msgid "Download BOINC"
 msgstr ""
 
 #: download.php:123
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others."
+msgid ""
+"BOINC is a program that lets you donate your idle computer time to science "
+"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, and many others."
 msgstr ""
 
 #: download.php:125
-msgid "After installing BOINC on your computer, you can connect it to as many of these projects as you like."
+msgid ""
+"After installing BOINC on your computer, you can connect it to as many of "
+"these projects as you like."
 msgstr ""
 
 #: download.php:127
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
+msgid ""
+"You may run this software on a computer only if you own the computer or have "
+"the permission of its owner."
 msgstr ""
 
 #: download.php:132
-msgid "We recommend that you download BOINC from the Google Play Store or Amazon Appstore, not from here."
+msgid ""
+"We recommend that you download BOINC from the Google Play Store or Amazon "
+"Appstore, not from here."
 msgstr ""
 
 #: download.php:167
@@ -91,8 +100,7 @@ msgstr ""
 msgid "Release notes"
 msgstr ""
 
-#: download.php:169
-#: index.php:86
+#: download.php:169 index.php:86
 msgid "Help"
 msgstr ""
 
@@ -114,20 +122,34 @@ msgstr ""
 
 #: help.php:12
 #, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
+msgid ""
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who "
+"can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"through the process of installing and using BOINC; %s troubleshoot any "
+"problems you might have."
 msgstr ""
 
 #: help.php:21
 #, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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."
+msgid ""
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. "
+"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 ""
 
 #: help.php:28
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
+msgid ""
+"The best way to get help is by voice, for which you need either built-in "
+"microphone and speakers or an external headset for your computer.  You can "
+"also use Skype's text-based chat system or regular email (if you don't have "
+"Skype) to communicate with Help Volunteers."
 msgstr ""
 
 #: help.php:31
-msgid "Volunteers speaking several languages are available. Please select a language:"
+msgid ""
+"Volunteers speaking several languages are available. Please select a "
+"language:"
 msgstr ""
 
 #: help.php:47
@@ -136,16 +158,22 @@ msgstr ""
 
 #: help.php:50
 #, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
+msgid ""
+"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+"Volunteer%s.  It's a great way to help the cause of scientific research and "
+"volunteer computing - and it's fun!"
 msgstr ""
 
 #: help.php:56
 #, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
+msgid ""
+"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
 msgstr ""
 
 #: help_funcs.php:107
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
+msgid ""
+"BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
+"or the University of California."
 msgstr ""
 
 #: help_funcs.php:110
@@ -196,9 +224,7 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: index.php:87
-#: index.php:120
-#: index.php:171
+#: index.php:87 index.php:120 index.php:171
 msgid "Documentation"
 msgstr ""
 
@@ -211,7 +237,10 @@ msgid "Links"
 msgstr ""
 
 #: index.php:94
-msgid "Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:"
+msgid ""
+"Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure "
+"diseases, study global warming, discover pulsars, and do many other types of "
+"scientific research.  It's safe, secure, and easy:"
 msgstr ""
 
 #: index.php:96
@@ -228,7 +257,9 @@ msgstr ""
 
 #: index.php:102
 #, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
+msgid ""
+"Or, if you run several projects, try an %saccount manager%s such as %"
+"sGridRepublic%s or %sBAM!%s. "
 msgstr ""
 
 #: index.php:118
@@ -240,11 +271,15 @@ msgid "Software updates"
 msgstr ""
 
 #: index.php:128
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving "
+"you the computing power of thousands of CPUs."
 msgstr ""
 
 #: index.php:132
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
 msgstr ""
 
 #: index.php:137
@@ -317,7 +352,8 @@ msgstr ""
 
 #: index.php:217
 #, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
+msgid ""
+"Open-source software for %svolunteer computing%s and %sgrid computing%s."
 msgstr ""
 
 #: index.php:230
@@ -337,7 +373,10 @@ msgid "Seismology"
 msgstr ""
 
 #: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
+msgid ""
+"The Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to Internet-connected computers.  You must buy a "
+"sensor to participate."
 msgstr ""
 
 #: projects.inc:27
@@ -349,23 +388,24 @@ msgid "Environmental research"
 msgstr ""
 
 #: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
+msgid ""
+"This project is creating a free and continuously updated map of radiation "
+"levels by using sensors connected to volunteers' computers.  You must buy a "
+"sensor to participate."
 msgstr ""
 
 #: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
+msgid ""
+"To participate in these projects you must buy a sensor and attach it to your "
+"computer."
 msgstr ""
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
 msgstr ""
 
-#: projects.inc:60
-#: projects.inc:364
-#: projects.inc:408
-#: projects.inc:457
-#: projects.inc:464
-#: projects.inc:511
+#: projects.inc:60 projects.inc:364 projects.inc:408 projects.inc:457
+#: projects.inc:464 projects.inc:511
 msgid "Private"
 msgstr ""
 
@@ -374,7 +414,11 @@ msgid "Artificial intelligence"
 msgstr ""
 
 #: projects.inc:62
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
+msgid ""
+"Parse and convert semantic nets for use in FreeHAL, an artificial "
+"intelligence that uses semantic networks, stemmers, part of speech "
+"databases, and part of speech taggers in order to imitate human behavior in "
+"conversations."
 msgstr ""
 
 #: projects.inc:69
@@ -390,7 +434,12 @@ msgid "Antimalarial drug discovery"
 msgstr ""
 
 #: projects.inc:84
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
+msgid ""
+"The parasite that causes malaria continues to evolve resistance to available "
+"medication. We therefore urgently need to discover new drugs to replace "
+"existing drugs. Importantly, these new drugs need to target NEW proteins in "
+"the parasite. The FightMalaria at Home project is aimed at finding these new "
+"targets."
 msgstr ""
 
 #: projects.inc:90
@@ -402,7 +451,12 @@ msgid "Protein structure prediction"
 msgstr ""
 
 #: projects.inc:92
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
+msgid ""
+"POEM at HOME uses a computational approach to predict the biologically active "
+"structure of proteins, to understand the signal-processing mechanisms when "
+"the proteins interact with one another, to understand diseases related to "
+"protein malfunction or aggregation, and to develop new drugs on the basis of "
+"the three-dimensions structure of biologically important proteins."
 msgstr ""
 
 #: projects.inc:98
@@ -414,7 +468,11 @@ msgid "Study of protein - ligand interactions"
 msgstr ""
 
 #: projects.inc:100
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
+msgid ""
+"Docking at Home has both bioscience and computer science goals. The project "
+"aims to further knowledge of the atomic details of protein-ligand "
+"interactions and, by doing so, will search for insights into the discovery "
+"of novel pharmaceuticals."
 msgstr ""
 
 #: projects.inc:114
@@ -426,7 +484,11 @@ msgid "Molecular simulations of proteins"
 msgstr ""
 
 #: projects.inc:116
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
+msgid ""
+"GPUGrid.net opens novel computational scenarios by the first full-atom "
+"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
+"New biomedical applications suddenly become possible giving a new role to "
+"computational biology for biomedical research."
 msgstr ""
 
 #: projects.inc:122
@@ -438,11 +500,15 @@ msgid "Genetic linkage analysis"
 msgstr ""
 
 #: projects.inc:124
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
+msgid ""
+"Superlink at Technion helps geneticists all over the world find disease-"
+"provoking genes causing some types of diabetes, hypertension (high blood "
+"pressure), cancer, schizophrenia and many others."
 msgstr ""
 
 #: projects.inc:138
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
+msgid ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
 msgstr ""
 
 #: projects.inc:139
@@ -450,7 +516,11 @@ msgid "Life science research"
 msgstr ""
 
 #: projects.inc:140
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
+msgid ""
+"The Lattice Project supplies computing power to scientists at the University "
+"of Maryland studying evolutionary relationships based on DNA sequence data; "
+"bacterial, plasmid, and virus protein sequences; and biological diversity in "
+"nature reserves. "
 msgstr ""
 
 #: projects.inc:146
@@ -462,20 +532,32 @@ msgid "Epidemiology"
 msgstr ""
 
 #: projects.inc:148
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
+msgid ""
+"Simulation models of the transmission dynamics and health effects of malaria "
+"are an important tool for malaria control. They can be used to determine "
+"optimal strategies for delivering mosquito nets, chemotherapy, or new "
+"vaccines which are currently under development and testing.  Such modeling "
+"is extremely computer intensive, requiring simulations of large human "
+"populations with a diverse set of parameters related to biological and "
+"social factors that influence the distribution of the disease. "
 msgstr ""
 
 #: projects.inc:170
 msgid "University of Washington"
 msgstr ""
 
-#: projects.inc:171
-#: projects.inc:179
+#: projects.inc:171 projects.inc:179
 msgid "Biology"
 msgstr ""
 
 #: projects.inc:172
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
+msgid ""
+"Determine the 3-dimensional shapes of proteins in research that may "
+"ultimately lead to finding cures for some major human diseases. By running "
+"Rosetta at home you will help us speed up and extend our research in ways we "
+"couldn't possibly attempt without your help. You will also be helping our "
+"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
+"Cancer, and Alzheimer's"
 msgstr ""
 
 #: projects.inc:178
@@ -483,7 +565,10 @@ msgid "University of Vienna"
 msgstr ""
 
 #: projects.inc:180
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
+msgid ""
+"Calculate similarities between proteins. SIMAP provides a public database of "
+"the resulting data, which plays a key role in many bioinformatics research "
+"projects."
 msgstr ""
 
 #: projects.inc:186
@@ -499,7 +584,15 @@ msgid "Climate study"
 msgstr ""
 
 #: projects.inc:200
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
+msgid ""
+"Investigate the approximations that have to be made in state-of-the-art "
+"climate models. By running the model thousands of times we hope to find out "
+"how the model responds to slight tweaks to these approximations - slight "
+"enough to not make the approximations any less realistic. This will allow us "
+"to improve our understanding of how sensitive our models are to small "
+"changes and also to things like changes in carbon dioxide and the sulphur "
+"cycle. This will allow us to explore how climate may change in the next "
+"century under a wide range of different scenarios."
 msgstr ""
 
 #: projects.inc:207
@@ -511,30 +604,44 @@ msgid "Mechanical engineering"
 msgstr ""
 
 #: projects.inc:214
-msgid "Currently we are calculating the optimum design of a structure call the 52 bar truss"
+msgid ""
+"Currently we are calculating the optimum design of a structure call the 52 "
+"bar truss"
 msgstr ""
 
-#: projects.inc:224
-#: projects.inc:263
-#: projects.inc:271
+#: projects.inc:224 projects.inc:263 projects.inc:271
 msgid "Astronomy"
 msgstr ""
 
 #: projects.inc:225
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
+msgid ""
+"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
+"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
+"Universe. We will measure physical parameters (such as stellar mass surface "
+"density, star formation rate surface density, attenuation, and first-order "
+"star formation history) on a resolved pixel-by-pixel basis using spectral "
+"energy distribution (SED) fitting techniques in a distributed computing mode."
 msgstr ""
 
 #: projects.inc:247
 msgid "University of Texas at Austin"
 msgstr ""
 
-#: projects.inc:248
-#: projects.inc:279
+#: projects.inc:248 projects.inc:279
 msgid "Chemistry"
 msgstr ""
 
 #: projects.inc:249
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
+msgid ""
+"A common problem in theoretical chemistry, condensed matter physics and "
+"materials science is the calculation of the time evolution of an atomic "
+"scale system where, for example, chemical reactions and/or diffusion occur. "
+"Generally the events of interest are quite rare (many orders of magnitude "
+"slower than the vibrational movements of the atoms), and therefore direct "
+"simulations, tracking every movement of the atoms, would take thousands of "
+"years of computer calculations on the fastest present day computer before a "
+"single event of interest can be expected to occur.  Our research group is "
+"interested in calculating the long time dynamics of systems."
 msgstr ""
 
 #: projects.inc:262
@@ -542,7 +649,10 @@ msgid "University of Illinois at Urbana-Champaign"
 msgstr ""
 
 #: projects.inc:264
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
+msgid ""
+"The goal of Cosmology at Home is to search for the model that best describes "
+"our Universe and to find the range of models that agree with the available "
+"astronomical particle physics data."
 msgstr ""
 
 #: projects.inc:270
@@ -550,7 +660,10 @@ msgid "Rensselaer Polytechnic Institute"
 msgstr ""
 
 #: projects.inc:272
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
+msgid ""
+"The goal of Milkyway at Home is to create a highly accurate three dimensional "
+"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
+"Survey."
 msgstr ""
 
 #: projects.inc:278
@@ -558,7 +671,13 @@ msgid "Leiden University, The Netherlands"
 msgstr ""
 
 #: projects.inc:280
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
+msgid ""
+"Surface science calculations using Classical Dynamics.  Leiden Classical "
+"allows volunteers, students and other scientist to submit their personal "
+"calculations to the grid. Each user has his own personal queue for Classical "
+"Dynamics jobs. In this way students have used the grid to simulate liquid "
+"argon, or to test the validity of the ideal gas law by actually doing the "
+"simulations through the grid."
 msgstr ""
 
 #: projects.inc:294
@@ -570,25 +689,36 @@ msgid "Astrophysics"
 msgstr ""
 
 #: projects.inc:296
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
+msgid ""
+"Search for spinning neutron stars (also called pulsars) using data from the "
+"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
+"observatory.  Einstein at Home is a World Year of Physics 2005 project "
+"supported by the American Physical Society (APS) and by a number of "
+"international organizations."
 msgstr ""
 
-#: projects.inc:310
-#: projects.inc:318
+#: projects.inc:310 projects.inc:318
 msgid "CERN (European Organization for Nuclear Research)"
 msgstr ""
 
-#: projects.inc:311
-#: projects.inc:319
+#: projects.inc:311 projects.inc:319
 msgid "Physics"
 msgstr ""
 
 #: projects.inc:312
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
+msgid ""
+"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
+"European Organization for Nuclear Research, the world's largest particle "
+"physics laboratory.  It is the most powerful instrument ever built to "
+"investigate on particles proprieties. LHC at home runs simulations to improve "
+"the design of LHC and its detectors."
 msgstr ""
 
 #: projects.inc:320
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
+msgid ""
+"This project uses CERN-developed virtual machine technology for full-fledged "
+"LHC event physics simulation on volunteer computers.  Requires that you "
+"install VirtualBox on your computer"
 msgstr ""
 
 #: projects.inc:326
@@ -600,7 +730,12 @@ msgid "Astrophysics, astrobiology"
 msgstr ""
 
 #: projects.inc:328
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
+msgid ""
+"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
+"goal is to detect intelligent life outside Earth. One approach, known as "
+"radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
+"signals from space. Such signals are not known to occur naturally, so a "
+"detection would provide evidence of extraterrestrial technology."
 msgstr ""
 
 #: projects.inc:342
@@ -612,7 +747,11 @@ msgid "Chemical engineering and nanotechnology"
 msgstr ""
 
 #: projects.inc:344
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
+msgid ""
+"The study of molecular magnets and controlled nanoscale magnetism.  These "
+"magnetic molecules may be used to develop tiny magnetic switches, with "
+"applications in medicine (such as local tumor chemotherapy) and "
+"biotechnology."
 msgstr ""
 
 #: projects.inc:351
@@ -628,7 +767,10 @@ msgid "Physics, biochemistry, and others"
 msgstr ""
 
 #: projects.inc:358
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
+msgid ""
+"The objective of CAS at home is to encourage and assist scientists in China to "
+"adopt the technologies of volunteer computing and volunteer thinking for "
+"their research."
 msgstr ""
 
 #: projects.inc:365
@@ -636,11 +778,12 @@ msgid "Mathematics, physics, evolution"
 msgstr ""
 
 #: projects.inc:366
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
+msgid ""
+"Yoyo at home is an adapter between BOINC and several existing volunteer "
+"computing projects: ECM, Muon, Evolution at home, and distributed.net"
 msgstr ""
 
-#: projects.inc:371
-#: projects.inc:527
+#: projects.inc:371 projects.inc:527
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 msgstr ""
 
@@ -649,7 +792,11 @@ msgid "European research projects"
 msgstr ""
 
 #: projects.inc:373
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
+msgid ""
+"The EDGeS at Home Beta project integrates volunteer computing into the service "
+"grid network of Europe by allowing service grids to send workunits to be "
+"processed by the volunteers of this project. The scientific projects covered "
+"by the project include math, physics, biology, etc."
 msgstr ""
 
 #: projects.inc:379
@@ -673,7 +820,11 @@ msgid "Medical, environmental and other humanitarian research"
 msgstr ""
 
 #: projects.inc:389
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
+msgid ""
+"To further critical non-profit research on some of humanity's most pressing "
+"problems by creating the world's largest volunteer computing grid.  Research "
+"includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"clean water and many more."
 msgstr ""
 
 #: projects.inc:395
@@ -692,21 +843,18 @@ msgstr ""
 msgid "Simulation of quantum computing; Goldbach's conjecture."
 msgstr ""
 
-#: projects.inc:450
-#: projects.inc:458
+#: projects.inc:450 projects.inc:458
 msgid "Cryptography"
 msgstr ""
 
 #: projects.inc:459
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
+msgid ""
+"Attempt to decode 3 original Enigma messages. The signals were intercepted "
+"in the North Atlantic in 1942 and are believed to be unbroken."
 msgstr ""
 
-#: projects.inc:465
-#: projects.inc:504
-#: projects.inc:512
-#: projects.inc:520
-#: projects.inc:528
-#: projects.inc:568
+#: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
+#: projects.inc:528 projects.inc:568
 msgid "Mathematics"
 msgstr ""
 
@@ -723,11 +871,19 @@ msgid "Factorization of large integers"
 msgstr ""
 
 #: projects.inc:473
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
+msgid ""
+"NFS at Home is a research project that uses Internet-connected computers to do "
+"the lattice sieving step in the Number Field Sieve factorization of large "
+"integers. As a young school student, you gained your first experience at "
+"breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
+"NFS at Home is a continuation of that experience, only with integers that are "
+"hundreds of digits long."
 msgstr ""
 
 #: projects.inc:479
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
+msgid ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
 msgstr ""
 
 #: projects.inc:480
@@ -735,7 +891,11 @@ msgid "Software testing"
 msgstr ""
 
 #: projects.inc:481
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
+msgid ""
+"The aim of this project is to provide a powerful distributed computing "
+"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
+"well as others Lithuanian academic institutions.  Current applications "
+"involve the study of Monte-Carlo based software testing."
 msgstr ""
 
 #: projects.inc:503
@@ -743,11 +903,20 @@ msgid "Mathematical Institute of Leiden University / Kennislink"
 msgstr ""
 
 #: projects.inc:505
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
+msgid ""
+"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
+"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
+"product of the distinct prime factors of n. The ABC conjecture says that "
+"there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for "
+"any real h > 1. The ABC conjecture is currently one of the greatest open "
+"problems in mathematics. If it is proven to be true, a lot of other open "
+"problems can be answered directly from it."
 msgstr ""
 
 #: projects.inc:513
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
+msgid ""
+"Primegrid has multiple projects searching for different forms of very large "
+"prime numbers, including searching for the largest known prime number."
 msgstr ""
 
 #: projects.inc:519
@@ -755,11 +924,15 @@ msgid "Hochschule RheinMain University of Applied Sciences"
 msgstr ""
 
 #: projects.inc:521
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
+msgid ""
+"Search for counterexamples to two conjectures related to the identification "
+"of prime numbers"
 msgstr ""
 
 #: projects.inc:529
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
+msgid ""
+"Find all the generalized binary number systems (in which bases are matrices "
+"and digits are vectors) up to dimension 11."
 msgstr ""
 
 #: ../html/inc/news.inc:40
@@ -775,3 +948,423 @@ msgstr ""
 #~ msgid "POEM at HOME"
 #~ msgstr "Home"
 
+# The charset used for the text in this file (please try to use UTF-8 if possible)
+#~ msgid "CHARSET"
+#~ msgstr "UTF-8"
+
+# The name of this language in this language
+#~ msgid "LANG_NAME_NATIVE"
+#~ msgstr "English"
+
+# The name of this language in an international language (English)
+#~ msgid "LANG_NAME_INTERNATIONAL"
+#~ msgstr "English"
+
+# #######################################
+# poll-related stuff
+# #######################################
+# poll-related stuff
+# #######################################
+#~ msgid "POLL_TITLE"
+#~ msgstr "BOINC user survey"
+
+#~ msgid "POLL_INTRO"
+#~ msgstr ""
+#~ "Several volunteer computing projects, including Climateprediction.net, "
+#~ "Einstein at home, and SETI at home, use software called BOINC. If you "
+#~ "participate in projects like this, we request that you answer the "
+#~ "following questions. This will help BOINC-based projects increase "
+#~ "participation and achieve greater scientific results. <p> Please answer "
+#~ "as many questions as you want, then go to the bottom and click OK. If you "
+#~ "previously completed the survey but your answers have changed, please "
+#~ "complete it again - your new answers will replace the old ones. <p> The "
+#~ "current results of the survey are <a href=poll_results.php>here</a>. "
+
+#~ msgid "POLL_RUN"
+#~ msgstr "Do you run BOINC?"
+
+#~ msgid "POLL_PARTICIPATION"
+#~ msgstr "Your participation"
+
+#~ msgid "POLL_COMPUTERS"
+#~ msgstr "Your computers"
+
+#~ msgid "POLL_YOU"
+#~ msgstr "You"
+
+#~ msgid "POLL_NATIONALITY"
+#~ msgstr "Nationality"
+
+#~ msgid "POLL_COMMENTS"
+#~ msgstr "Comments"
+
+#~ msgid "POLL_COMMENTS_QUESTION"
+#~ msgstr ""
+#~ "Please suggest ways that BOINC, and the projects that use it, could be "
+#~ "improved:"
+
+#~ msgid "POLL_OTHER"
+#~ msgstr "Other:"
+
+#~ msgid "POLL_CHECK_ALL"
+#~ msgstr "[check all that apply]"
+
+#~ msgid "POLL_DONE"
+#~ msgstr "When done click:"
+
+#~ msgid "POLL_CURRENT"
+#~ msgstr "Yes - I have been running BOINC on my computer for..."
+
+#~ msgid "POLL_TWEEK"
+#~ msgstr "less than a week"
+
+#~ msgid "POLL_TMONTH"
+#~ msgstr "less than a month"
+
+#~ msgid "POLL_TYEAR"
+#~ msgstr "less than a year"
+
+#~ msgid "POLL_TMOREYEAR"
+#~ msgstr "more than a year"
+
+#~ msgid "POLL_LAPSED"
+#~ msgstr "No - I was running BOINC, but stopped because..."
+
+#~ msgid "POLL_LINTEREST"
+#~ msgstr "I lost interest"
+
+#~ msgid "POLL_LCOMPLICATED"
+#~ msgstr "it was too complicated"
+
+#~ msgid "POLL_LSTOPPED"
+#~ msgstr "I stopped it and forgot to start again"
+
+#~ msgid "POLL_LPROBLEMS"
+#~ msgstr "it caused problems on my computer"
+
+#~ msgid "POLL_LPOWER"
+#~ msgstr "it used too much electricity"
+
+#~ msgid "POLL_LNONBOINC"
+#~ msgstr "I switched to a non-BOINC computing project"
+
+#~ msgid "POLL_FAILED"
+#~ msgstr "No - I tried running BOINC, but..."
+
+#~ msgid "POLL_FINSTALL"
+#~ msgstr "the software didn't install correctly"
+
+#~ msgid "POLL_FFIGURE"
+#~ msgstr "I couldn't figure out how to use the software"
+
+#~ msgid "POLL_FNETWORK"
+#~ msgstr "I had network communication problems"
+
+#~ msgid "POLL_FATTACH"
+#~ msgstr "I couldn't attach to a project"
+
+#~ msgid "POLL_FWORK"
+#~ msgstr "I attached to a project, but never got any work"
+
+#~ msgid "POLL_NEVER"
+#~ msgstr "No - I never tried running BOINC, because..."
+
+#~ msgid "POLL_NSECURITY"
+#~ msgstr "I was concerned about security"
+
+#~ msgid "POLL_NPROJECT"
+#~ msgstr "I wasn't interested in any of the projects"
+
+#~ msgid "POLL_NPERMISSION"
+#~ msgstr "I don't have permission to run it on my computer"
+
+#~ msgid "POLL_NVERSION"
+#~ msgstr "No version was available for my computer"
+
+#~ msgid "POLL_KIND"
+#~ msgstr "What kind of computers do you have running BOINC?"
+
+#~ msgid "POLL_WHERE"
+#~ msgstr "Where are they?"
+
+#~ msgid "POLL_WORK"
+#~ msgstr "Work"
+
+#~ msgid "POLL_SCHOOL"
+#~ msgstr "School"
+
+#~ msgid "POLL_HOW_MANY"
+#~ msgstr "How many computers?"
+
+#~ msgid "POLL_TURNED_ON"
+#~ msgstr "On average, how many hours per day are they powered on?"
+
+#~ msgid "POLL_AGE"
+#~ msgstr "Age"
+
+#~ msgid "POLL_SEX"
+#~ msgstr "Sex"
+
+#~ msgid "POLL_MALE"
+#~ msgstr "Male"
+
+#~ msgid "POLL_FEMALE"
+#~ msgstr "Female"
+
+#~ msgid "POLL_EXPERTISE"
+#~ msgstr "Your level of computer expertise"
+
+#~ msgid "POLL_LEVB"
+#~ msgstr "Beginner"
+
+#~ msgid "POLL_LEVI"
+#~ msgstr "Intermediate"
+
+#~ msgid "POLL_LEVA"
+#~ msgstr "Advanced"
+
+#~ msgid "POLL_LEARN_WHERE"
+#~ msgstr "Where did you learn about BOINC projects?"
+
+#~ msgid "POLL_WTV"
+#~ msgstr "TV/radio/newspaper"
+
+#~ msgid "POLL_WPERS"
+#~ msgstr "From friends, relatives, or coworkers"
+
+#~ msgid "POLL_WTEAM"
+#~ msgstr "Team message boards or web sites"
+
+#~ msgid "POLL_WBOINC"
+#~ msgstr "The BOINC web site"
+
+#~ msgid "POLL_WWEB"
+#~ msgstr "Other web sites"
+
+#~ msgid "POLL_FACTOR"
+#~ msgstr ""
+#~ "Which are the most important factors when you decide whether to "
+#~ "participate in a BOINC project?"
+
+#~ msgid "POLL_GRAPHICS"
+#~ msgstr "Nice-looking screensaver graphics"
+
+#~ msgid "POLL_CREDIT_FAIR"
+#~ msgstr "Fair and quick granting of credit for work done"
+
+#~ msgid "POLL_CREDIT_MORE"
+#~ msgstr "Getting more credit from this project than from others"
+
+#~ msgid "POLL_MB_FRIENDLY"
+#~ msgstr "Helpful and friendly message boards"
+
+#~ msgid "POLL_MB_STAFF"
+#~ msgstr "Participation by project staff on the message boards"
+
+#~ msgid "POLL_WEB_SITE"
+#~ msgstr "Informative project web site"
+
+#~ msgid "POLL_SCIENCE_IMPORTANT"
+#~ msgstr "The science is important and beneficial"
+
+#~ msgid "POLL_SCIENCE_PUBLIC"
+#~ msgstr "Non-profit, and results are public"
+
+#~ msgid "POLL_RECOGNIZE"
+#~ msgstr "Personal recognition if my computer finds something"
+
+#~ msgid "POLL_PUBLISH"
+#~ msgstr "Publication by the project in scientific journals"
+
+#~ msgid "POLL_EMAIL"
+#~ msgstr "Periodic email newsletters from the project"
+
+#~ msgid "POLL_NPROJECTS"
+#~ msgstr "How many BOINC projects do you participate in?"
+
+#~ msgid "POLL_SSAVER"
+#~ msgstr "Do you run BOINC as a screensaver?"
+
+#~ msgid "POLL_YES"
+#~ msgstr "Yes"
+
+#~ msgid "POLL_NO"
+#~ msgstr "No"
+
+#~ msgid "POLL_MBOARDS"
+#~ msgstr "Your usage of project messages boards:"
+
+#~ msgid "POLL_MBR"
+#~ msgstr "to read information"
+
+#~ msgid "POLL_MBRW"
+#~ msgstr "to read and post information"
+
+#~ msgid "POLL_NONE"
+#~ msgstr "None"
+
+#~ msgid "POLL_HELP"
+#~ msgstr ""
+#~ "Where do you get information to help resolve problems with BOINC and/or "
+#~ "BOINC projects?"
+
+#~ msgid "POLL_HELP_PMB"
+#~ msgstr "The project message boards"
+
+#~ msgid "POLL_HELP_BMB"
+#~ msgstr "The BOINC message boards"
+
+#~ msgid "POLL_HELP_BDOC"
+#~ msgstr "The BOINC web site"
+
+#~ msgid "POLL_HELP_BMLIST"
+#~ msgstr "BOINC mailing lists"
+
+#~ msgid "POLL_HELP_WIKI"
+#~ msgstr "The Unofficial BOINC Wiki"
+
+#~ msgid "POLL_HELP_TEAM"
+#~ msgstr "Team web sites"
+
+#~ msgid "POLL_HELP_GOOGLE"
+#~ msgstr "Google or other search engines"
+
+#~ msgid "POLL_ERROR_TITLE"
+#~ msgstr "Error - results not recorded"
+
+#~ msgid "POLL_ERROR_TEXT"
+#~ msgstr ""
+#~ "An internal error has prevented us from recording your survey response.  "
+#~ "Please try again later."
+
+#~ msgid "POLL_RECORDED"
+#~ msgstr "Survey response recorded"
+
+#~ msgid "POLL_THANKS"
+#~ msgstr "Thank you for completing the BOINC user survey."
+
+#~ msgid "POLL_RESULTS_TITLE"
+#~ msgstr "Survey results"
+
+#~ msgid "POLL_RESULTS_TEXT"
+#~ msgstr ""
+#~ "These are the current results of the <a href=poll.php>BOINC user survey</"
+#~ "a>.  This page is updated every hour."
+
+#~ msgid "DL_MIRRORS"
+#~ msgstr ""
+#~ "Note: files are downloaded from mirror servers at boinc.berkeley.edu, "
+#~ "morel.mit.edu, einstein.aei.mpg.de, einstein.astro.gla.ac.uk, einstein."
+#~ "ligo.caltech.edu, and einstein.aset.psu.edu (thanks to these "
+#~ "institutions). The server is chosen randomly - if a download fails, "
+#~ "reload this page and try again. "
+
+# #############################################
+# help.php
+# #############################################
+#~ msgid "HELP_TITLE"
+#~ msgstr "Getting help with BOINC"
+
+#~ msgid "HELP_HEADING1"
+#~ msgstr "Online Help"
+
+#~ msgid "HELP_P1_1"
+#~ msgstr ""
+#~ "BOINC Online Help lets you talk one-on-one with experienced BOINC users, "
+#~ "who can: %s answer questions about BOINC and volunteer computing; %s walk "
+#~ "you through the process of installing and using BOINC; %s troubleshoot "
+#~ "any problems you might have. "
+
+#~ msgid "HELP_P1_2"
+#~ msgstr ""
+#~ "BOINC Online Help is based on %sSkype%s, an Internet-based telephone "
+#~ "system. 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. "
+
+#~ msgid "HELP_P1_3"
+#~ msgstr ""
+#~ "The best way to get help is by voice, for which you need either built-in "
+#~ "microphone and speakers or an external headset for your computer. You can "
+#~ "also use Skype's text-based chat system or regular email (if you don't "
+#~ "have Skype) to communicate with Help Volunteers."
+
+#~ msgid "HELP_P1_4"
+#~ msgstr ""
+#~ "Volunteers speaking several languages are available. Please select a "
+#~ "language: "
+
+#~ msgid "HELP_HEADING2"
+#~ msgstr "BOINC help on the web"
+
+#~ msgid "HELP_P2_ITEM1"
+#~ msgstr "BOINC user's manual"
+
+#~ msgid "HELP_P2_ITEM2"
+#~ msgstr "Troubleshooting BOINC "
+
+#~ msgid "HELP_P2_ITEM3"
+#~ msgstr "BOINC-related web sites "
+
+#~ msgid "HELP_P2_ITEM4"
+#~ msgstr "The BOINC message boards "
+
+#~ msgid "HELP_P2_ITEM5"
+#~ msgstr "The message boards on any BOINC-based project "
+
+#~ msgid "HELP_HEADING3"
+#~ msgstr "Be a Help Volunteer"
+
+#~ msgid "HELP_P3_1"
+#~ msgstr ""
+#~ "If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+#~ "Volunteer%s. It's a great way to help the cause of scientific research "
+#~ "and volunteer computing - and it's fun!  "
+
+#~ msgid "HELP_P3_2"
+#~ msgstr ""
+#~ "If you're already a Help Volunteer: to edit your settings, %sclick here"
+#~ "%s. "
+
+# #############################################
+# index.php
+# #############################################
+#~ msgid "HOME_HEADING1"
+#~ msgstr "Volunteer"
+
+#~ msgid "HOME_P1"
+#~ msgstr ""
+#~ " Use the idle time on your computer  (Windows, Mac, or Linux)  to cure "
+#~ "diseases, study global warming,  discover pulsars, and do many other "
+#~ "types of scientific research.  It's safe, secure, and easy:  %sChoose%s "
+#~ "projects  %sDownload%s and run BOINC software  %sEnter%s an email address "
+#~ "and password. "
+
+#~ msgid "HOME_P2"
+#~ msgstr ""
+#~ "Or, if you run several projects, try an %saccount manager%s such as "
+#~ "%sGridRepublic%s or %sBAM!%s. "
+
+#~ msgid "HOME_P3"
+#~ msgstr ""
+#~ "If you have any questions, or need help getting started, you can %stalk "
+#~ "to a Volunteer Helper%s. "
+
+#~ msgid "HOME_DOWNLOAD"
+#~ msgstr "Download"
+
+#~ msgid "HOME_WEB_SITES"
+#~ msgstr "Web"
+
+#~ msgid "HOME_ADD_ONS"
+#~ msgstr "Add-ons"
+
+#~ msgid "HOME_SURVEY"
+#~ msgstr "Survey"
+
+#~ msgid "HOME_BOINC"
+#~ msgstr "Berkeley Open Infrastructure for Network Computing"
+
+#~ msgid "HOME_BOINC_DESC"
+#~ msgstr ""
+#~ "Open-source software for %svolunteer computing%s and %sgrid computing%s"
diff --git a/locale/ms/BOINC-Client.mo b/locale/ms/BOINC-Client.mo
index b027dc4..00cc482 100644
Binary files a/locale/ms/BOINC-Client.mo and b/locale/ms/BOINC-Client.mo differ
diff --git a/locale/ms/BOINC-Client.po b/locale/ms/BOINC-Client.po
index c0b90db..d3326a3 100755
--- a/locale/ms/BOINC-Client.po
+++ b/locale/ms/BOINC-Client.po
@@ -4,20 +4,19 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-10-15 22:25-0700\n"
-"PO-Revision-Date: 2015-02-11 23:27-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: ms\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.10.0\n"
 
-#: acct_mgr.cpp:450
-#: acct_mgr.cpp:459
+#: acct_mgr.cpp:450 acct_mgr.cpp:459
 msgid "Message from account manager"
 msgstr ""
 
@@ -26,7 +25,9 @@ msgid "Message from server"
 msgstr ""
 
 #: client_state.cpp:258
-msgid "Some tasks need more memory than allowed by your preferences.  Please check the preferences."
+msgid ""
+"Some tasks need more memory than allowed by your preferences.  Please check "
+"the preferences."
 msgstr ""
 
 #: client_state.cpp:520
@@ -39,11 +40,12 @@ msgstr ""
 
 #: cs_scheduler.cpp:613
 #, c-format
-msgid "You used the wrong URL for this project.  When convenient, remove this project, then add %s"
+msgid ""
+"You used the wrong URL for this project.  When convenient, remove this "
+"project, then add %s"
 msgstr ""
 
-#: cs_statefile.cpp:828
-#: ../sched/sched_types.cpp:259
+#: cs_statefile.cpp:828 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
 msgstr ""
 
@@ -55,18 +57,15 @@ msgstr ""
 msgid "A new version of BOINC is available."
 msgstr ""
 
-#: current_version.cpp:94
-#: current_version.cpp:102
+#: current_version.cpp:94 current_version.cpp:102
 msgid "Download"
 msgstr ""
 
-#: log_flags.cpp:269
-#: log_flags.cpp:449
+#: log_flags.cpp:269 log_flags.cpp:449
 msgid "Unexpected text in cc_config.xml"
 msgstr ""
 
-#: log_flags.cpp:423
-#: log_flags.cpp:475
+#: log_flags.cpp:423 log_flags.cpp:475
 msgid "Unrecognized tag in cc_config.xml"
 msgstr ""
 
@@ -91,7 +90,9 @@ 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."
+msgid ""
+"The project has changed its security key.  Please remove and add this "
+"project."
 msgstr ""
 
 #: ../sched/handle_request.cpp:943
@@ -103,7 +104,8 @@ 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."
+msgid ""
+"Your BOINC client software is too old.  Please install the current version."
 msgstr ""
 
 #: ../sched/handle_request.cpp:1259
@@ -115,11 +117,14 @@ 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"
+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"
+msgid ""
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to "
+"the current version"
 msgstr ""
 
 #: ../sched/sched_send.cpp:1146
@@ -141,7 +146,8 @@ msgstr ""
 
 #: ../sched/sched_send.cpp:1305
 #, c-format
-msgid "Tasks for %s are available, but your preferences are set to not accept them"
+msgid ""
+"Tasks for %s are available, but your preferences are set to not accept them"
 msgstr ""
 
 #: ../sched/sched_types.cpp:254
@@ -151,4 +157,3 @@ msgstr ""
 #: ../sched/sched_version.cpp:214
 msgid "Your app_info.xml file doesn't have a usable version of"
 msgstr ""
-
diff --git a/locale/ms/BOINC-Manager.mo b/locale/ms/BOINC-Manager.mo
index 754c172..c1217e7 100644
Binary files a/locale/ms/BOINC-Manager.mo and b/locale/ms/BOINC-Manager.mo differ
diff --git a/locale/ms/BOINC-Manager.po b/locale/ms/BOINC-Manager.po
index 777aec7..8e3f67b 100755
--- a/locale/ms/BOINC-Manager.po
+++ b/locale/ms/BOINC-Manager.po
@@ -4,50 +4,48 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-15 14:15-0500\n"
-"PO-Revision-Date: 2015-02-11 23:28-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"POT-Creation-Date: 2014-02-02 00:00-0800\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: ms\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.10.0\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc_7.4\n"
-"X-Poedit-SearchPath-0: clientgui\n"
 
-#: clientgui/AccountInfoPage.cpp:387
+#: AccountInfoPage.cpp:387
 #, c-format
 msgid "Identify your account at %s"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:393
+#: AccountInfoPage.cpp:393
 msgid ""
 "Please enter your account information\n"
 "(to create an account, visit the project's web site)"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:397
+#: AccountInfoPage.cpp:397
 msgid ""
 "This project is not currently accepting new accounts.\n"
 "You can add it only if you already have an account."
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:401
+#: AccountInfoPage.cpp:401
 msgid "Are you already running this project?"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:405
+#: AccountInfoPage.cpp:405
 msgid "&No, new user"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:408
+#: AccountInfoPage.cpp:408
 msgid "&Yes, existing user"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:413
+#: AccountInfoPage.cpp:413
 msgid ""
 "We were not able to set up your account information\n"
 "automatically.\n"
@@ -57,488 +55,466 @@ msgid ""
 "password fields."
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:416
+#: AccountInfoPage.cpp:416
 msgid "Find login information"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:649
+#: AccountInfoPage.cpp:436 AccountInfoPage.cpp:641
 msgid "&Password:"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:673
+#: AccountInfoPage.cpp:443 AccountInfoPage.cpp:665
 msgid "Choose a &password:"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:446
+#: AccountInfoPage.cpp:446
 msgid "C&onfirm password:"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:453
+#: AccountInfoPage.cpp:453
 #, c-format
 msgid "Are you already running %s?"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:482
+#: AccountInfoPage.cpp:482
 msgid "&Username:"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:511
-msgid "&Email address or LDAP ID:"
-msgstr ""
-
-#: clientgui/AccountInfoPage.cpp:515
+#: AccountInfoPage.cpp:508
 msgid "&Email address:"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:523
+#: AccountInfoPage.cpp:515
 #, c-format
 msgid "minimum length %d"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:530
+#: AccountInfoPage.cpp:522
 msgid "Forgot your password?"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:537
+#: AccountInfoPage.cpp:529
 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 ""
 
-#: clientgui/AccountInfoPage.cpp:540
+#: AccountInfoPage.cpp:532
 msgid "Account manager web site"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:582
+#: AccountInfoPage.cpp:574 WelcomePage.cpp:348
 msgid "Add project"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:584
+#: AccountInfoPage.cpp:576
 msgid "Update account manager"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:586
+#: AccountInfoPage.cpp:578 WelcomePage.cpp:307 WelcomePage.cpp:321
 msgid "Use account manager"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:593
+#: AccountInfoPage.cpp:585
 msgid "Please enter a user name."
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:595
+#: AccountInfoPage.cpp:587
 msgid "Please enter an email address."
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:605
+#: AccountInfoPage.cpp:597
 #, c-format
 msgid "Please enter a password of at least %d characters."
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:615
-msgid "The password and confirmation password do not match. Please type them again."
+#: AccountInfoPage.cpp:607
+msgid ""
+"The password and confirmation password do not match. Please type them again."
 msgstr ""
 
-#: clientgui/AccountManagerInfoPage.cpp:272
+#: AccountManagerInfoPage.cpp:272
 msgid "Choose an account manager"
 msgstr ""
 
-#: clientgui/AccountManagerInfoPage.cpp:275
+#: AccountManagerInfoPage.cpp:275
 msgid ""
 "To choose an account manager, click its name or \n"
 "type its URL below."
 msgstr ""
 
-#: clientgui/AccountManagerInfoPage.cpp:279
+#: AccountManagerInfoPage.cpp:279
 msgid "Account manager details:"
 msgstr ""
 
-#: clientgui/AccountManagerInfoPage.cpp:283
+#: AccountManagerInfoPage.cpp:283
 msgid "Account manager &URL:"
 msgstr ""
 
-#: clientgui/AccountManagerInfoPage.cpp:287
+#: AccountManagerInfoPage.cpp:287
 msgid "Open web page"
 msgstr ""
 
-#: clientgui/AccountManagerInfoPage.cpp:290
+#: AccountManagerInfoPage.cpp:290
 msgid "Visit this account manager's web site"
 msgstr ""
 
-#: clientgui/AccountManagerProcessingPage.cpp:186
-#: clientgui/AccountManagerPropertiesPage.cpp:192
+#: AccountManagerProcessingPage.cpp:187 AccountManagerPropertiesPage.cpp:193
 #, c-format
 msgid "Communicating with %s."
 msgstr ""
 
-#: clientgui/AccountManagerProcessingPage.cpp:193
-#: clientgui/AccountManagerPropertiesPage.cpp:199
+#: AccountManagerProcessingPage.cpp:194 AccountManagerPropertiesPage.cpp:200
 msgid "Communicating with server."
 msgstr ""
 
-#: clientgui/AccountManagerProcessingPage.cpp:198
-#: clientgui/AccountManagerPropertiesPage.cpp:204
+#: AccountManagerProcessingPage.cpp:199 AccountManagerPropertiesPage.cpp:205
 msgid "Please wait..."
 msgstr ""
 
-#: clientgui/AccountManagerProcessingPage.cpp:325
+#: AccountManagerProcessingPage.cpp:326
 msgid "An internal server error has occurred.\n"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:96
+#: AdvancedFrame.cpp:95
 msgid "Connected"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:104
+#: AdvancedFrame.cpp:103
 msgid "Disconnected"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:318
+#: AdvancedFrame.cpp:322 sg_BoincSimpleFrame.cpp:119
 #, c-format
 msgid "Close the %s window"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:321
+#: AdvancedFrame.cpp:325 sg_BoincSimpleFrame.cpp:122
 msgid "&Close Window"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:332
-#: clientgui/AdvancedFrame.cpp:339
-#: clientgui/AdvancedFrame.cpp:346
+#: AdvancedFrame.cpp:336 AdvancedFrame.cpp:343 AdvancedFrame.cpp:350
 #, c-format
 msgid "Exit %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:359
-msgid "Preferences..."
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:368
+#: AdvancedFrame.cpp:371
 msgid "&Notices\tCtrl+Shift+N"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:369
+#: AdvancedFrame.cpp:372
 msgid "Display notices"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:374
+#: AdvancedFrame.cpp:377
 msgid "&Projects\tCtrl+Shift+P"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:375
+#: AdvancedFrame.cpp:378
 msgid "Display projects"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:380
+#: AdvancedFrame.cpp:383
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:381
+#: AdvancedFrame.cpp:384
 msgid "Display tasks"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:386
+#: AdvancedFrame.cpp:389
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:387
+#: AdvancedFrame.cpp:390
 msgid "Display transfers"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:392
+#: AdvancedFrame.cpp:395
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:393
+#: AdvancedFrame.cpp:396
 msgid "Display statistics"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:398
+#: AdvancedFrame.cpp:401
 msgid "&Disk usage\tCtrl+Shift+D"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:399
+#: AdvancedFrame.cpp:402
 msgid "Display disk usage"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:406
+#: AdvancedFrame.cpp:409
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:407
+#: AdvancedFrame.cpp:410
 msgid "Display the simple graphical interface."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:421
+#: AdvancedFrame.cpp:424
 msgid "&Add project or account manager..."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:422
+#: AdvancedFrame.cpp:425 sg_ProjectPanel.cpp:76
 msgid "Volunteer for any or all of 30+ projects in many areas of science"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:426
+#: AdvancedFrame.cpp:429
 #, c-format
 msgid "&Synchronize with %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:430
+#: AdvancedFrame.cpp:433
 #, c-format
 msgid "Get current settings from %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:440
+#: AdvancedFrame.cpp:443
 msgid "&Add project..."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:441
+#: AdvancedFrame.cpp:444
 msgid "Add a project"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:444
+#: AdvancedFrame.cpp:447
 #, c-format
 msgid "S&top using %s..."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:450
+#: AdvancedFrame.cpp:453
 msgid "Remove this computer from account manager control."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:455
+#: AdvancedFrame.cpp:458 sg_BoincSimpleFrame.cpp:178
 msgid "&Options..."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:456
+#: AdvancedFrame.cpp:459 sg_BoincSimpleFrame.cpp:179
 msgid "Configure display options and proxy settings"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:460
+#: AdvancedFrame.cpp:463 sg_BoincSimpleFrame.cpp:172
 msgid "Computing &preferences..."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:461
+#: AdvancedFrame.cpp:464 sg_BoincSimpleFrame.cpp:173
 msgid "Configure computing preferences"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:469
+#: AdvancedFrame.cpp:472
 msgid "&Run always"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:470
+#: AdvancedFrame.cpp:473
 msgid "Allow work regardless of preferences"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:474
+#: AdvancedFrame.cpp:477
 msgid "Run based on &preferences"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:475
+#: AdvancedFrame.cpp:478
 msgid "Allow work according to preferences"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:479
+#: AdvancedFrame.cpp:482
 msgid "&Suspend"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:480
+#: AdvancedFrame.cpp:483
 msgid "Stop work regardless of preferences"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:505
+#: AdvancedFrame.cpp:508
 msgid "Use GPU always"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:506
+#: AdvancedFrame.cpp:509
 msgid "Allow GPU work regardless of preferences"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:510
+#: AdvancedFrame.cpp:513
 msgid "Use GPU based on preferences"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:511
+#: AdvancedFrame.cpp:514
 msgid "Allow GPU work according to preferences"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:515
+#: AdvancedFrame.cpp:518
 msgid "Suspend GPU"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:516
+#: AdvancedFrame.cpp:519
 msgid "Stop GPU work regardless of preferences"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:540
+#: AdvancedFrame.cpp:543
 msgid "Network activity always available"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:541
+#: AdvancedFrame.cpp:544
 msgid "Allow network activity regardless of preferences"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:545
+#: AdvancedFrame.cpp:548
 msgid "Network activity based on preferences"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:546
+#: AdvancedFrame.cpp:549
 msgid "Allow network activity according to preferences"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:550
+#: AdvancedFrame.cpp:553
 msgid "Network activity suspended"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:551
+#: AdvancedFrame.cpp:554
 msgid "Stop BOINC network activity"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:561
+#: AdvancedFrame.cpp:564
 #, c-format
 msgid "Connect to another computer running %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:566
+#: AdvancedFrame.cpp:569
 msgid "Select computer..."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:571
+#: AdvancedFrame.cpp:574
 msgid "Shut down connected client..."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:572
+#: AdvancedFrame.cpp:575
 msgid "Shut down the currently connected client"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:576
+#: AdvancedFrame.cpp:579
 msgid "Run CPU &benchmarks"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:577
+#: AdvancedFrame.cpp:580
 msgid "Runs BOINC CPU benchmarks"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:581
+#: AdvancedFrame.cpp:584
 msgid "Do network communication"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:582
+#: AdvancedFrame.cpp:585
 msgid "Do all pending network communication"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:586
+#: AdvancedFrame.cpp:589
 msgid "Read config files"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:587
+#: AdvancedFrame.cpp:590
 msgid "Read configuration info from cc_config.xml and any app_config.xml files"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:591
+#: AdvancedFrame.cpp:594
 msgid "Read local prefs file"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:592
+#: AdvancedFrame.cpp:595
 msgid "Read preferences from global_prefs_override.xml."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:597
+#: AdvancedFrame.cpp:600
 #, c-format
 msgid "Launch another instance of %s..."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:601
+#: AdvancedFrame.cpp:604
 #, c-format
 msgid "Launch another %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:611
+#: AdvancedFrame.cpp:614
 msgid "Event Log...\tCtrl+Shift+E"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:612
+#: AdvancedFrame.cpp:615
 msgid "Display diagnostic messages."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:616
-msgid "Event Log Diagnostic Flags...\tCtrl+Shift+F"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:617
-msgid "Enable or disable various diagnostic messages"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:626
+#: AdvancedFrame.cpp:625 sg_BoincSimpleFrame.cpp:188
 #, c-format
 msgid "%s &help"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:632
+#: AdvancedFrame.cpp:631 sg_BoincSimpleFrame.cpp:194
 #, c-format
 msgid "Show information about %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:644
+#: AdvancedFrame.cpp:643
 #, c-format
 msgid "&%s help"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:650
+#: AdvancedFrame.cpp:649 sg_BoincSimpleFrame.cpp:212
 #, c-format
 msgid "Show information about the %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:662
+#: AdvancedFrame.cpp:661 sg_BoincSimpleFrame.cpp:224
 #, c-format
 msgid "%s &web site"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:668
+#: AdvancedFrame.cpp:667 sg_BoincSimpleFrame.cpp:230
 #, c-format
 msgid "Show information about BOINC and %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:680
-#: clientgui/BOINCTaskBar.cpp:544
+#: AdvancedFrame.cpp:679 BOINCTaskBar.cpp:530 sg_BoincSimpleFrame.cpp:242
 #, c-format
 msgid "&About %s..."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:686
+#: AdvancedFrame.cpp:685 sg_BoincSimpleFrame.cpp:248
 msgid "Licensing and copyright information."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:693
+#: AdvancedFrame.cpp:692 sg_BoincSimpleFrame.cpp:255
 msgid "&File"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:697
+#: AdvancedFrame.cpp:696 sg_BoincSimpleFrame.cpp:259
 msgid "&View"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:701
+#: AdvancedFrame.cpp:700 sg_BoincSimpleFrame.cpp:263
 msgid "&Tools"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:705
+#: AdvancedFrame.cpp:704
 msgid "&Activity"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:709
+#: AdvancedFrame.cpp:708
 msgid "A&dvanced"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:713
+#: AdvancedFrame.cpp:712 DlgEventLog.cpp:332 sg_BoincSimpleFrame.cpp:267
+#: wizardex.cpp:374 wizardex.cpp:381
 msgid "&Help"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:1185
+#: AdvancedFrame.cpp:1199
 #, c-format
 msgid "%s - Stop using %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:1190
+#: AdvancedFrame.cpp:1204
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -548,48 +524,48 @@ msgid ""
 "Do you want to stop using %s?"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:1397
+#: AdvancedFrame.cpp:1401
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:1406
+#: AdvancedFrame.cpp:1410
 #, c-format
 msgid ""
 "%s will shut down the current client\n"
 "and prompt you for another host to connect to."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:1806
+#: AdvancedFrame.cpp:1745 DlgAbout.cpp:119
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:1815
+#: AdvancedFrame.cpp:1754
 #, c-format
 msgid "%s has successfully added %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:1953
+#: AdvancedFrame.cpp:1893
 #, c-format
 msgid "%s - (%s)"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:1957
+#: AdvancedFrame.cpp:1897
 #, c-format
 msgid "Connecting to %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:1960
+#: AdvancedFrame.cpp:1900
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr ""
 
-#: clientgui/AlreadyExistsPage.cpp:184
+#: AlreadyExistsPage.cpp:184
 msgid "Username already in use"
 msgstr ""
 
-#: clientgui/AlreadyExistsPage.cpp:187
+#: AlreadyExistsPage.cpp:187
 msgid ""
 "An account with that username already exists and has a\n"
 "different password than the one you entered.\n"
@@ -597,11 +573,11 @@ msgid ""
 "Please visit the project's web site and follow the instructions there."
 msgstr ""
 
-#: clientgui/AlreadyExistsPage.cpp:191
+#: AlreadyExistsPage.cpp:191
 msgid "Email address already in use"
 msgstr ""
 
-#: clientgui/AlreadyExistsPage.cpp:194
+#: AlreadyExistsPage.cpp:194
 msgid ""
 "An account with that email address already exists and has a\n"
 "different password than the one you entered.\n"
@@ -609,159 +585,162 @@ msgid ""
 "Please visit the project's web site and follow the instructions there."
 msgstr ""
 
-#: clientgui/AsyncRPC.cpp:1031
+#: AsyncRPC.cpp:1031
 msgid "Communicating with BOINC client.  Please wait ..."
 msgstr ""
 
-#: clientgui/AsyncRPC.cpp:1034
+#: AsyncRPC.cpp:1034
 #, c-format
 msgid "&Quit %s"
 msgstr ""
 
-#: clientgui/AsyncRPC.cpp:1036
+#: AsyncRPC.cpp:1036
 #, c-format
 msgid "E&xit %s"
 msgstr ""
 
-#: clientgui/AsyncRPC.cpp:1040
+#: AsyncRPC.cpp:1040
 #, c-format
 msgid "%s - Communication"
 msgstr ""
 
-#: clientgui/AsyncRPC.cpp:1056
+#: AsyncRPC.cpp:1056 DlgAdvPreferencesBase.cpp:107 sg_DlgPreferences.cpp:433
 msgid "Cancel"
 msgstr ""
 
-#: clientgui/BOINCBaseFrame.cpp:504
+#: BOINCBaseFrame.cpp:505
 #, c-format
 msgid "%s - Connection Error"
 msgstr ""
 
-#: clientgui/BOINCBaseFrame.cpp:513
+#: BOINCBaseFrame.cpp:514
 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:522
+#: BOINCBaseFrame.cpp:523
 msgid ""
 "Authorization failed connecting to running client.\n"
 "Make sure you start this program in the same directory as the client."
 msgstr ""
 
-#: clientgui/BOINCBaseFrame.cpp:524
+#: BOINCBaseFrame.cpp:525
 msgid "Authorization failed connecting to running client."
 msgstr ""
 
-#: clientgui/BOINCBaseFrame.cpp:532
+#: BOINCBaseFrame.cpp:533
 msgid "The password you have provided is incorrect, please try again."
 msgstr ""
 
-#: clientgui/BOINCBaseFrame.cpp:576
+#: BOINCBaseFrame.cpp:577
 #, c-format
 msgid "%s - Connection Failed"
 msgstr ""
 
-#: clientgui/BOINCBaseFrame.cpp:585
+#: BOINCBaseFrame.cpp:586
 #, c-format
 msgid ""
 "%s is not able to connect to a %s client.\n"
 "Would you like to try to connect again?"
 msgstr ""
 
-#: clientgui/BOINCBaseFrame.cpp:621
+#: BOINCBaseFrame.cpp:622
 #, c-format
 msgid "%s - Daemon Start Failed"
 msgstr ""
 
-#: clientgui/BOINCBaseFrame.cpp:631
+#: BOINCBaseFrame.cpp:632
 #, 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:637
+#: BOINCBaseFrame.cpp:638
 #, c-format
 msgid ""
 "%s is not able to start a %s client.\n"
 "Please start the daemon and try again."
 msgstr ""
 
-#: clientgui/BOINCBaseFrame.cpp:688
+#: BOINCBaseFrame.cpp:689
 #, c-format
 msgid "%s - Connection Status"
 msgstr ""
 
-#: clientgui/BOINCBaseFrame.cpp:699
+#: BOINCBaseFrame.cpp:700
 #, 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 ""
 
-#: clientgui/BOINCBaseView.cpp:752
+#: BOINCBaseView.cpp:779
 msgid "Project web pages"
 msgstr ""
 
-#: clientgui/BOINCClientManager.cpp:573
+#: BOINCClientManager.cpp:575
 #, c-format
 msgid "%s - Unexpected Exit"
 msgstr ""
 
-#: clientgui/BOINCClientManager.cpp:583
+#: BOINCClientManager.cpp:585
 #, 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 ""
 
-#: clientgui/BOINCDialupManager.cpp:61
+#: BOINCDialupManager.cpp:61
 #, c-format
 msgid "%s - Network Status"
 msgstr ""
 
-#: clientgui/BOINCDialupManager.cpp:241
+#: BOINCDialupManager.cpp:241
 #, c-format
 msgid ""
 "%s needs to connect to the Internet.\n"
 "May it do so now?"
 msgstr ""
 
-#: clientgui/BOINCDialupManager.cpp:254
+#: BOINCDialupManager.cpp:254
 #, c-format
 msgid "%s is connecting to the Internet."
 msgstr ""
 
-#: clientgui/BOINCDialupManager.cpp:303
+#: BOINCDialupManager.cpp:303
 #, c-format
 msgid "%s has successfully connected to the Internet."
 msgstr ""
 
-#: clientgui/BOINCDialupManager.cpp:331
+#: BOINCDialupManager.cpp:331
 #, c-format
 msgid "%s failed to connect to the Internet."
 msgstr ""
 
-#: clientgui/BOINCDialupManager.cpp:372
+#: 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 ""
 
-#: clientgui/BOINCDialupManager.cpp:417
+#: BOINCDialupManager.cpp:417
 #, c-format
 msgid "%s has successfully disconnected from the Internet."
 msgstr ""
 
-#: clientgui/BOINCDialupManager.cpp:433
+#: BOINCDialupManager.cpp:433
 #, c-format
 msgid "%s failed to disconnected from the Internet."
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:595
+#: BOINCGUIApp.cpp:339
 #, c-format
 msgid ""
 "You currently are not authorized to manage the client.\n"
@@ -774,838 +753,794 @@ msgid ""
 "     user group."
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:601
+#: BOINCGUIApp.cpp:345
 #, c-format
 msgid ""
 "%s ownership or permissions are not set properly; please reinstall %s.\n"
 "(Error code %d"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:607
+#: BOINCGUIApp.cpp:351
 msgid " at "
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:610
+#: BOINCGUIApp.cpp:354 MainDocument.cpp:2484 MainDocument.cpp:2534
+#: MainDocument.cpp:2554 ViewTransfers.cpp:803
 msgid ")"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:640
+#: BOINCGUIApp.cpp:384
 msgid ""
 "A reboot is required in order for BOINC to run properly.\n"
 "Please reboot your computer and try again."
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:641
+#: BOINCGUIApp.cpp:385 DlgAbout.cpp:153
 msgid "BOINC Manager"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:902
+#: BOINCGUIApp.cpp:572
 msgid "BOINC Manager was started by the operating system automatically"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:904
+#: BOINCGUIApp.cpp:574
 msgid "Startup BOINC so only the system tray icon is visible"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:906
+#: BOINCGUIApp.cpp:576
 msgid "Directory containing the BOINC Client executable"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:907
+#: BOINCGUIApp.cpp:577
 msgid "BOINC data directory"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:909
+#: BOINCGUIApp.cpp:579
 msgid "Host name or IP address"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:910
+#: BOINCGUIApp.cpp:580
 msgid "GUI RPC port number"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:911
+#: BOINCGUIApp.cpp:581
 msgid "Password"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:912
+#: BOINCGUIApp.cpp:582
 msgid "Startup BOINC with these optional arguments"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:913
+#: BOINCGUIApp.cpp:583
 msgid "disable BOINC security users and permissions"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:914
+#: BOINCGUIApp.cpp:584
 msgid "set skin debugging mode to enable skin manager error messages"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:915
+#: BOINCGUIApp.cpp:585
 msgid "multiple instances of BOINC Manager allowed"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:917
+#: BOINCGUIApp.cpp:587
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:1164
+#: BOINCGUIApp.cpp:814
 msgid "(Automatic Detection)"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:1165
+#: BOINCGUIApp.cpp:815
 msgid "(Unknown)"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:1166
+#: BOINCGUIApp.cpp:816
 msgid "(User Defined)"
 msgstr ""
 
-#: clientgui/BOINCTaskBar.cpp:522
+#: BOINCTaskBar.cpp:508
 #, c-format
 msgid "Open %s Web..."
 msgstr ""
 
-#: clientgui/BOINCTaskBar.cpp:529
+#: BOINCTaskBar.cpp:515
 #, c-format
 msgid "Open %s..."
 msgstr ""
 
-#: clientgui/BOINCTaskBar.cpp:536
-#: clientgui/BOINCTaskBar.cpp:633
-#: clientgui/BOINCTaskBar.cpp:641
+#: BOINCTaskBar.cpp:522 BOINCTaskBar.cpp:619 BOINCTaskBar.cpp:627
 msgid "Snooze"
 msgstr ""
 
-#: clientgui/BOINCTaskBar.cpp:538
-#: clientgui/BOINCTaskBar.cpp:660
-#: clientgui/BOINCTaskBar.cpp:668
+#: BOINCTaskBar.cpp:524 BOINCTaskBar.cpp:646 BOINCTaskBar.cpp:654
 msgid "Snooze GPU"
 msgstr ""
 
-#: clientgui/BOINCTaskBar.cpp:556
+#: BOINCTaskBar.cpp:542
 msgid "E&xit"
 msgstr ""
 
-#: clientgui/BOINCTaskBar.cpp:626
+#: BOINCTaskBar.cpp:612 ViewProjects.cpp:718 ViewWork.cpp:795
+#: sg_BoincSimpleFrame.cpp:758 sg_ProjectCommandPopup.cpp:110
+#: sg_TaskCommandPopup.cpp:102
 msgid "Resume"
 msgstr ""
 
-#: clientgui/BOINCTaskBar.cpp:653
+#: BOINCTaskBar.cpp:639
 msgid "Resume GPU"
 msgstr ""
 
-#: clientgui/BOINCTaskBar.cpp:727
+#: BOINCTaskBar.cpp:713
 msgid "Computing is enabled"
 msgstr ""
 
-#: clientgui/BOINCTaskBar.cpp:731
+#: BOINCTaskBar.cpp:717
 msgid "Computing is suspended - "
 msgstr ""
 
-#: clientgui/BOINCTaskBar.cpp:741
+#: BOINCTaskBar.cpp:727
 msgid "GPU computing is enabled"
 msgstr ""
 
-#: clientgui/BOINCTaskBar.cpp:744
+#: BOINCTaskBar.cpp:730
 msgid "GPU computing is suspended - "
 msgstr ""
 
-#: clientgui/BOINCTaskBar.cpp:753
+#: BOINCTaskBar.cpp:739
 msgid "Network is enabled"
 msgstr ""
 
-#: clientgui/BOINCTaskBar.cpp:756
+#: BOINCTaskBar.cpp:742
 msgid "Network is suspended - "
 msgstr ""
 
-#: clientgui/BOINCTaskBar.cpp:764
+#: BOINCTaskBar.cpp:750
 msgid "Reconnecting to client."
 msgstr ""
 
-#: clientgui/BOINCTaskBar.cpp:766
+#: BOINCTaskBar.cpp:752
 msgid "Not connected to a client."
 msgstr ""
 
-#: clientgui/BOINCTaskBar.cpp:819
+#: BOINCTaskBar.cpp:805
 #, c-format
 msgid "%s Notices"
 msgstr ""
 
-#: clientgui/BOINCTaskBar.cpp:825
+#: BOINCTaskBar.cpp:811
 msgid "There are new notices - click to view."
 msgstr ""
 
-#: clientgui/CompletionErrorPage.cpp:199
+#: CompletionErrorPage.cpp:199
 msgid "Failed to add project"
 msgstr ""
 
-#: clientgui/CompletionErrorPage.cpp:204
+#: CompletionErrorPage.cpp:204
 msgid "Failed to update account manager"
 msgstr ""
 
-#: clientgui/CompletionErrorPage.cpp:208
+#: CompletionErrorPage.cpp:208
 msgid "Failed to remove account manager"
 msgstr ""
 
-#: clientgui/CompletionErrorPage.cpp:212
+#: CompletionErrorPage.cpp:212
 msgid "Failed to add account manager"
 msgstr ""
 
-#: clientgui/CompletionErrorPage.cpp:221
+#: CompletionErrorPage.cpp:221
 msgid ""
 "Please try again later.\n"
 "\n"
 "Click Finish to close."
 msgstr ""
 
-#: clientgui/CompletionErrorPage.cpp:225
-#: clientgui/CompletionPage.cpp:222
-#: clientgui/CompletionPage.cpp:242
-#: clientgui/CompletionPage.cpp:273
+#: CompletionErrorPage.cpp:225 CompletionPage.cpp:222 CompletionPage.cpp:242
+#: CompletionPage.cpp:273
 msgid "Click Finish to close."
 msgstr ""
 
-#: clientgui/CompletionErrorPage.cpp:234
+#: CompletionErrorPage.cpp:234
 msgid "Messages from server:"
 msgstr ""
 
-#: clientgui/CompletionPage.cpp:207
+#: CompletionPage.cpp:207
 msgid "Project added"
 msgstr ""
 
-#: clientgui/CompletionPage.cpp:213
+#: CompletionPage.cpp:213
 msgid "This project has been successfully added."
 msgstr ""
 
-#: clientgui/CompletionPage.cpp:218
+#: 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 ""
 
-#: clientgui/CompletionPage.cpp:232
+#: CompletionPage.cpp:232
 #, c-format
 msgid "Update from %s completed."
 msgstr ""
 
-#: clientgui/CompletionPage.cpp:236
+#: CompletionPage.cpp:236
 msgid "Update completed."
 msgstr ""
 
-#: clientgui/CompletionPage.cpp:247
+#: CompletionPage.cpp:247
 msgid "Now using account manager"
 msgstr ""
 
-#: clientgui/CompletionPage.cpp:252
+#: CompletionPage.cpp:252
 #, c-format
 msgid "Welcome to %s!"
 msgstr ""
 
-#: clientgui/CompletionPage.cpp:263
+#: CompletionPage.cpp:263
 #, c-format
 msgid "You are now using %s to manage accounts."
 msgstr ""
 
-#: clientgui/CompletionPage.cpp:267
+#: CompletionPage.cpp:267
 msgid "You are now using this account manager."
 msgstr ""
 
-#: clientgui/DlgAbout.cpp:113
+#: DlgAbout.cpp:113 mac/Mac_GUI.cpp:96
 #, c-format
 msgid "About %s"
 msgstr ""
 
-#: clientgui/DlgAbout.cpp:172
+#: DlgAbout.cpp:172
 msgid "Version:"
 msgstr ""
 
-#: clientgui/DlgAbout.cpp:180
+#: DlgAbout.cpp:180
 msgid "wxWidgets Version:"
 msgstr ""
 
-#: clientgui/DlgAbout.cpp:188
+#: DlgAbout.cpp:188
 msgid "Copyright:"
 msgstr ""
 
-#: clientgui/DlgAbout.cpp:192
+#: DlgAbout.cpp:192
 msgid ""
-"(C) 2003-2014 University of California, Berkeley.\n"
+"(C) 2003-2013 University of California, Berkeley.\n"
 "All Rights Reserved."
 msgstr ""
 
-#: clientgui/DlgAbout.cpp:196
+#: DlgAbout.cpp:196
 msgid "Berkeley Open Infrastructure for Network Computing"
 msgstr ""
 
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:399
-#: clientgui/DlgSelectComputer.cpp:163
+#: DlgAbout.cpp:208 DlgExitMessage.cpp:173 DlgGenericMessage.cpp:120
+#: DlgOptions.cpp:396 DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:602
+#: DlgAdvPreferences.cpp:544
 msgid "invalid number"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:603
+#: DlgAdvPreferences.cpp:545
 msgid "invalid time, format is HH:MM"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:604
+#: DlgAdvPreferences.cpp:546
 msgid "invalid time interval, format is HH:MM-HH:MM"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:817
+#: DlgAdvPreferences.cpp:751
 msgid "invalid input value detected"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:819
+#: DlgAdvPreferences.cpp:753
 msgid "Validation Error"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:969
-#: clientgui/DlgAdvPreferences.cpp:975
-#: clientgui/DlgAdvPreferences.cpp:981
+#: DlgAdvPreferences.cpp:885 DlgAdvPreferences.cpp:891
+#: DlgAdvPreferences.cpp:897
 msgid "Applications to add"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:998
+#: DlgAdvPreferences.cpp:914
 #, c-format
 msgid "'%s' is not an executable application."
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:999
-#: clientgui/DlgAdvPreferences.cpp:1046
-#: clientgui/DlgAdvPreferences.cpp:1070
+#: DlgAdvPreferences.cpp:915 DlgAdvPreferences.cpp:962
+#: DlgAdvPreferences.cpp:986
 msgid "Add Exclusive App"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Name of application to add?"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Add exclusive app"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1045
+#: DlgAdvPreferences.cpp:961
 #, c-format
 msgid "Application names must end with '%s'"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1069
+#: DlgAdvPreferences.cpp:985
 #, c-format
 msgid "'%s' is already in the list."
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1161
+#: DlgAdvPreferences.cpp:1077
 msgid ""
 "Do you really want to clear all local preferences?\n"
 "(This will not affect exclusive applications.)"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1162
+#: DlgAdvPreferences.cpp:1078 sg_DlgPreferences.cpp:1030
 msgid "Confirmation"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:49
+#: DlgAdvPreferencesBase.cpp:46 sg_DlgPreferences.cpp:946
 #, c-format
-msgid "%s - Computing preferences"
+msgid "%s - Preferences"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:66
+#: DlgAdvPreferencesBase.cpp:62
 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 ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:69
+#: DlgAdvPreferencesBase.cpp:65 sg_DlgPreferences.cpp:428
 msgid "Clear"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:70
+#: DlgAdvPreferencesBase.cpp:66
 msgid "clear all local preferences and close the dialog"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:85
+#: DlgAdvPreferencesBase.cpp:81
 msgid "processor usage"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:88
+#: DlgAdvPreferencesBase.cpp:84
 msgid "network usage"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:91
+#: DlgAdvPreferencesBase.cpp:87
 msgid "disk and memory usage"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:94
+#: DlgAdvPreferencesBase.cpp:90
 msgid "exclusive applications"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:107
-#: clientgui/DlgDiagnosticLogFlags.cpp:104
+#: DlgAdvPreferencesBase.cpp:102 sg_DlgPreferences.cpp:424
 msgid "OK"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:108
+#: DlgAdvPreferencesBase.cpp:103
 msgid "save all values and close the dialog"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:114
+#: DlgAdvPreferencesBase.cpp:108
 msgid "close the dialog without saving"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:118
-#: clientgui/Localization.cpp:35
-#: clientgui/Localization.cpp:121
-#: clientgui/Localization.cpp:139
+#: DlgAdvPreferencesBase.cpp:112 Localization.cpp:35 Localization.cpp:121
+#: Localization.cpp:139 sg_BoincSimpleFrame.cpp:794 sg_DlgPreferences.cpp:439
 msgid "Help"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
+#: DlgAdvPreferencesBase.cpp:113
 msgid "shows the preferences web page"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:141
+#: DlgAdvPreferencesBase.cpp:135
 msgid "Computing allowed"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
+#: DlgAdvPreferencesBase.cpp:139
 msgid "While computer is on batteries"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:149
-msgid "check this if you want this computer to do work while it runs on batteries"
+#: DlgAdvPreferencesBase.cpp:142
+msgid ""
+"check this if you want this computer to do work while it runs on batteries"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:155
+#: DlgAdvPreferencesBase.cpp:148
 msgid "While computer is in use"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:158
-msgid "check this if you want this computer to do work even when you're using it"
+#: DlgAdvPreferencesBase.cpp:151
+msgid ""
+"check this if you want this computer to do work even when you're using it"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:164
+#: DlgAdvPreferencesBase.cpp:157
 msgid "Use GPU while computer is in use"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:167
-msgid "check this if you want your GPU to do work even when you're using the computer"
+#: DlgAdvPreferencesBase.cpp:160
+msgid ""
+"check this if you want your GPU to do work even when you're using the "
+"computer"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:179
+#: DlgAdvPreferencesBase.cpp:172
 msgid "Only after computer has been idle for"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:188
-msgid "do work only after you haven't used the computer for this number of minutes"
+#: DlgAdvPreferencesBase.cpp:182
+msgid ""
+"do work only after you haven't used the computer for this number of minutes"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:193
-#: clientgui/DlgAdvPreferencesBase.cpp:342
+#: DlgAdvPreferencesBase.cpp:187 DlgAdvPreferencesBase.cpp:336
+#: sg_DlgPreferences.cpp:417
 msgid "minutes"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:212
+#: DlgAdvPreferencesBase.cpp:206
 msgid "While processor usage is less than"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:221
+#: DlgAdvPreferencesBase.cpp:216
 msgid "suspend work if processor usage exceeds this level"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:226
+#: DlgAdvPreferencesBase.cpp:221
 msgid "percent (0 means no restriction)"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:240
-#: clientgui/DlgAdvPreferencesBase.cpp:506
+#: DlgAdvPreferencesBase.cpp:235 DlgAdvPreferencesBase.cpp:496
 msgid "Every day between hours of"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: DlgAdvPreferencesBase.cpp:239
 msgid "start work at this time"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:248
-#: clientgui/DlgAdvPreferencesBase.cpp:514
+#: DlgAdvPreferencesBase.cpp:243 DlgAdvPreferencesBase.cpp:504
+#: sg_DlgPreferences.cpp:326 sg_DlgPreferences.cpp:348
 msgid "and"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:252
+#: DlgAdvPreferencesBase.cpp:247
 msgid "stop work at this time"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
-#: clientgui/DlgAdvPreferencesBase.cpp:522
+#: DlgAdvPreferencesBase.cpp:251 DlgAdvPreferencesBase.cpp:512
 msgid "(no restriction if equal)"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:261
-#: clientgui/DlgAdvPreferencesBase.cpp:527
+#: DlgAdvPreferencesBase.cpp:256 DlgAdvPreferencesBase.cpp:517
 msgid "Day-of-week override:"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:266
-#: clientgui/DlgAdvPreferencesBase.cpp:532
+#: DlgAdvPreferencesBase.cpp:261 DlgAdvPreferencesBase.cpp:522
 msgid "check box to specify hours for this day of week"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:272
-#: clientgui/DlgAdvPreferencesBase.cpp:538
+#: DlgAdvPreferencesBase.cpp:267 DlgAdvPreferencesBase.cpp:528
 msgid "Monday"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:279
-#: clientgui/DlgAdvPreferencesBase.cpp:545
+#: DlgAdvPreferencesBase.cpp:274 DlgAdvPreferencesBase.cpp:535
 msgid "Tuesday"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:286
-#: clientgui/DlgAdvPreferencesBase.cpp:552
+#: DlgAdvPreferencesBase.cpp:281 DlgAdvPreferencesBase.cpp:542
 msgid "Wednesday"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:293
-#: clientgui/DlgAdvPreferencesBase.cpp:559
+#: DlgAdvPreferencesBase.cpp:288 DlgAdvPreferencesBase.cpp:549
 msgid "Thursday"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:300
-#: clientgui/DlgAdvPreferencesBase.cpp:566
+#: DlgAdvPreferencesBase.cpp:295 DlgAdvPreferencesBase.cpp:556
 msgid "Friday"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:307
-#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: DlgAdvPreferencesBase.cpp:302 DlgAdvPreferencesBase.cpp:563
 msgid "Saturday"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:580
+#: DlgAdvPreferencesBase.cpp:309 DlgAdvPreferencesBase.cpp:570
 msgid "Sunday"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:328
+#: DlgAdvPreferencesBase.cpp:323
 msgid "Other options"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:336
+#: DlgAdvPreferencesBase.cpp:330
 msgid "Switch between applications every"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:345
+#: DlgAdvPreferencesBase.cpp:339
 msgid "On multiprocessor systems, use at most"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
+#: DlgAdvPreferencesBase.cpp:346
 #, no-c-format
-msgid "% of the processors (0 means no restriction)"
+msgid "% of the processors (0 means ignore this setting)"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:355
-#: clientgui/DlgAdvPreferencesBase.cpp:618
-#: clientgui/DlgAdvPreferencesBase.cpp:640
-#: clientgui/DlgAdvPreferencesBase.cpp:661
-#: clientgui/DlgAdvPreferencesBase.cpp:683
-#: clientgui/DlgAdvPreferencesBase.cpp:694
+#: DlgAdvPreferencesBase.cpp:349 DlgAdvPreferencesBase.cpp:605
+#: DlgAdvPreferencesBase.cpp:627 DlgAdvPreferencesBase.cpp:648
+#: DlgAdvPreferencesBase.cpp:669 DlgAdvPreferencesBase.cpp:679
 msgid "Use at most"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:362
+#: DlgAdvPreferencesBase.cpp:356
 #, no-c-format
-msgid "% of CPU time (0 means no restriction)"
+msgid "% CPU time"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:386
+#: DlgAdvPreferencesBase.cpp:378
 msgid "General options"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:395
+#: DlgAdvPreferencesBase.cpp:386
 msgid "Maximum download rate"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:401
-#: clientgui/DlgAdvPreferencesBase.cpp:410
-msgid "KBytes/second (0 means no restriction)"
+#: DlgAdvPreferencesBase.cpp:392 DlgAdvPreferencesBase.cpp:401
+msgid "KBytes/sec."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:404
+#: DlgAdvPreferencesBase.cpp:395
 msgid "Maximum upload rate"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:417
-msgid "Minimum work buffer"
+#: DlgAdvPreferencesBase.cpp:406
+msgid "Transfer at most"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:425
-msgid "Try to maintain enough tasks to keep busy for this many days"
+#: DlgAdvPreferencesBase.cpp:412
+msgid "Mbytes"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:431
-#: clientgui/DlgAdvPreferencesBase.cpp:449
-msgid "days (maximum value: 10)"
+#: DlgAdvPreferencesBase.cpp:415
+msgid "every"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:437
-msgid "Max additional work buffer"
+#: DlgAdvPreferencesBase.cpp:421 DlgAdvPreferencesBase.cpp:444
+#: DlgAdvPreferencesBase.cpp:463
+msgid "days"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:445
-msgid "In addition, maintain enough tasks for up to this many days"
+#: DlgAdvPreferencesBase.cpp:429
+msgid "Minimum work buffer"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:454
-msgid "Transfer at most"
+#: DlgAdvPreferencesBase.cpp:438
+msgid "Try to maintain enough tasks to keep busy for this many days"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:462
-msgid "MBytes every"
+#: DlgAdvPreferencesBase.cpp:450
+msgid "Max additional work buffer"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:468
-msgid "days (0 means no restriction)"
+#: DlgAdvPreferencesBase.cpp:459
+msgid "In addition, maintain enough tasks for up to this many days"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:476
+#: DlgAdvPreferencesBase.cpp:466
 msgid "Skip image file verification"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:478
+#: DlgAdvPreferencesBase.cpp:468
 msgid "check this if your Internet provider modifies image files"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:484
+#: DlgAdvPreferencesBase.cpp:476
 msgid "Connect options"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:487
+#: DlgAdvPreferencesBase.cpp:478
 msgid "Confirm before connecting to internet"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
+#: DlgAdvPreferencesBase.cpp:480
+msgid ""
+"if checked, a confirmation dialog will be displayed before trying to connect "
+"to the Internet"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:493
+#: DlgAdvPreferencesBase.cpp:484
 msgid "Disconnect when done"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:495
+#: DlgAdvPreferencesBase.cpp:486
 msgid ""
 "if checked, BOINC hangs up when network usage is done\n"
 "(only relevant for dialup-connection)"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:501
+#: DlgAdvPreferencesBase.cpp:492
 msgid "Network usage allowed"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:510
+#: DlgAdvPreferencesBase.cpp:500
 msgid "network usage start hour"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:518
+#: DlgAdvPreferencesBase.cpp:508
 msgid "network usage stop hour"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:610
-#: clientgui/DlgItemProperties.cpp:257
+#: DlgAdvPreferencesBase.cpp:598 DlgItemProperties.cpp:231
 msgid "Disk usage"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:622
+#: DlgAdvPreferencesBase.cpp:609
 msgid "the maximum disk space used by BOINC (in Gigabytes)"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:626
-msgid "Gigabytes disk space (0 means no restriction)"
+#: DlgAdvPreferencesBase.cpp:613
+msgid "Gigabytes disk space"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:629
+#: DlgAdvPreferencesBase.cpp:616
 msgid "Leave at least"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:633
+#: DlgAdvPreferencesBase.cpp:620
 msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:637
+#: DlgAdvPreferencesBase.cpp:624
 msgid "Gigabytes disk space free"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
+#: DlgAdvPreferencesBase.cpp:631
 msgid "BOINC uses at most this percentage of total disk space"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:649
+#: DlgAdvPreferencesBase.cpp:636
 #, no-c-format
 msgid "% of total disk space"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:652
+#: DlgAdvPreferencesBase.cpp:639
 msgid "Tasks checkpoint to disk at most every"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
+#: DlgAdvPreferencesBase.cpp:645
 msgid "seconds"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:668
+#: DlgAdvPreferencesBase.cpp:655
 #, no-c-format
 msgid "% of page file (swap space)"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:675
+#: DlgAdvPreferencesBase.cpp:662
 msgid "Memory usage"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
+#: DlgAdvPreferencesBase.cpp:676
 #, no-c-format
 msgid "% when computer is in use"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:701
+#: DlgAdvPreferencesBase.cpp:686
 #, no-c-format
 msgid "% when computer is idle"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:706
+#: DlgAdvPreferencesBase.cpp:691
 msgid "Leave applications in memory while suspended"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:708
+#: DlgAdvPreferencesBase.cpp:693
 msgid "if checked, suspended work units are left in memory"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:728
-msgid "Suspend processor and network usage when these applications are running:"
+#: DlgAdvPreferencesBase.cpp:713
+msgid ""
+"Suspend processor and network usage when these applications are running:"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:738
+#: DlgAdvPreferencesBase.cpp:722
 msgid "Add..."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:739
+#: DlgAdvPreferencesBase.cpp:723
 msgid "Add an application to this list"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:744
+#: DlgAdvPreferencesBase.cpp:728 ViewProjects.cpp:202
+#: sg_ProjectCommandPopup.cpp:85
 msgid "Remove"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:745
+#: DlgAdvPreferencesBase.cpp:729
 msgid "Remove an application from this list"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:754
+#: DlgAdvPreferencesBase.cpp:738
 msgid "For advanced options, refer to "
 msgstr ""
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:65
-#, c-format
-msgid "%s Diagnostic Log Flags"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:83
-msgid "These flags enable various types of diagnostic messages in the Event Log."
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:105
-msgid "Save all values and close the dialog"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:108
-msgid "Defaults"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:109
-msgid "Restore default settings"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:113
-msgid "Close the dialog without saving"
-msgstr ""
-
-#: clientgui/DlgEventLog.cpp:226
+#: DlgEventLog.cpp:219
 #, c-format
 msgid "%s - Event Log"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:236
+#: DlgEventLog.cpp:232 ViewMessages.cpp:117 ViewProjects.cpp:219
+#: ViewStatistics.cpp:435 ViewStatistics.cpp:2009 ViewTransfers.cpp:182
+#: ViewWork.cpp:232
 msgid "Project"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:237
+#: DlgEventLog.cpp:233 ViewMessages.cpp:118
 msgid "Time"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:238
+#: DlgEventLog.cpp:234 ViewMessages.cpp:119
 msgid "Message"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:300
-#: clientgui/DlgEventLog.cpp:364
+#: DlgEventLog.cpp:290 DlgEventLog.cpp:354
 msgid "&Show only this project"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:304
+#: DlgEventLog.cpp:294
 msgid "Copy &All"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:306
-#: clientgui/DlgEventLog.cpp:310
+#: DlgEventLog.cpp:296 DlgEventLog.cpp:300 ViewMessages.cpp:89
 msgid "Copy all the messages to the clipboard."
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:315
+#: DlgEventLog.cpp:305
 msgid "Copy &Selected"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:318
-#: clientgui/DlgEventLog.cpp:326
-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."
+#: DlgEventLog.cpp:308 DlgEventLog.cpp:316 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:320
-#: clientgui/DlgEventLog.cpp:328
-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."
+#: DlgEventLog.cpp:310 DlgEventLog.cpp:318 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:335
-#: clientgui/DlgItemProperties.cpp:67
+#: DlgEventLog.cpp:325 DlgItemProperties.cpp:67
 msgid "&Close"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:344
+#: DlgEventLog.cpp:334 sg_BoincSimpleFrame.cpp:798 sg_DlgPreferences.cpp:442
 #, c-format
 msgid "Get help with %s"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:358
+#: DlgEventLog.cpp:348
 msgid "Show all &messages"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:359
-#: clientgui/DlgEventLog.cpp:361
+#: DlgEventLog.cpp:349 DlgEventLog.cpp:351
 msgid "Show messages for all projects"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:365
-#: clientgui/DlgEventLog.cpp:367
+#: DlgEventLog.cpp:355 DlgEventLog.cpp:357
 msgid "Show only the messages for the selected project"
 msgstr ""
 
-#: clientgui/DlgExitMessage.cpp:82
+#: DlgExitMessage.cpp:82
 #, c-format
 msgid "%s - Exit Confirmation"
 msgstr ""
 
-#: clientgui/DlgExitMessage.cpp:130
+#: DlgExitMessage.cpp:130
 #, c-format
 msgid ""
 "You have requested to exit the %s,\n"
@@ -1616,7 +1551,7 @@ msgid ""
 "choose from the following options:"
 msgstr ""
 
-#: clientgui/DlgExitMessage.cpp:135
+#: DlgExitMessage.cpp:135
 #, c-format
 msgid ""
 "This will shut down %s and its tasks until either the\n"
@@ -1627,842 +1562,814 @@ msgid ""
 "tasks at the times you selected in your preferences."
 msgstr ""
 
-#: clientgui/DlgExitMessage.cpp:153
+#: DlgExitMessage.cpp:153
 #, c-format
 msgid "Stop running tasks when exiting the %s"
 msgstr ""
 
-#: clientgui/DlgExitMessage.cpp:165
+#: DlgExitMessage.cpp:165
 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
+#: DlgExitMessage.cpp:178 DlgGenericMessage.cpp:125 DlgOptions.cpp:401
+#: DlgSelectComputer.cpp:168 wizardex.cpp:378
 msgid "&Cancel"
 msgstr ""
 
-#: clientgui/DlgGenericMessage.cpp:112
+#: DlgGenericMessage.cpp:112
 msgid "Don't show this dialog again."
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:194
-#: clientgui/DlgItemProperties.cpp:197
-#: clientgui/DlgItemProperties.cpp:200
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:168 DlgItemProperties.cpp:171
+#: DlgItemProperties.cpp:174 DlgItemProperties.cpp:177
 msgid "Don't fetch tasks for "
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:194
+#: DlgItemProperties.cpp:168
 msgid "Project preference"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:197
+#: DlgItemProperties.cpp:171
 msgid "Account manager preference"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:200
+#: DlgItemProperties.cpp:174
 msgid "Project has no apps for "
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:177
 msgid "Client configuration excludes "
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:207
+#: DlgItemProperties.cpp:181
 msgid " work fetch deferred for"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:208
+#: DlgItemProperties.cpp:182
 msgid " work fetch deferral interval"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:213
 msgid "Properties of project "
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:243
-#: clientgui/DlgOptions.cpp:221
+#: DlgItemProperties.cpp:217 DlgOptions.cpp:218
 msgid "General"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:244
+#: DlgItemProperties.cpp:218
 msgid "Master URL"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:245
+#: DlgItemProperties.cpp:219
 msgid "User name"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:246
+#: DlgItemProperties.cpp:220
 msgid "Team name"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:247
+#: DlgItemProperties.cpp:221 ViewProjects.cpp:224
 msgid "Resource share"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:249
+#: DlgItemProperties.cpp:223
 msgid "Scheduler RPC deferred for"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:252
+#: DlgItemProperties.cpp:226
 msgid "File downloads deferred for"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:255
+#: DlgItemProperties.cpp:229
 msgid "File uploads deferred for"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:258
+#: DlgItemProperties.cpp:232
 msgid "Computer ID"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:260
+#: DlgItemProperties.cpp:234
 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
+#: DlgItemProperties.cpp:234 DlgItemProperties.cpp:236
+#: DlgItemProperties.cpp:237 DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:242 DlgItemProperties.cpp:251
+#: DlgItemProperties.cpp:254 DlgItemProperties.cpp:257
 msgid "yes"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:262
+#: DlgItemProperties.cpp:236
 msgid "Suspended via GUI"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:262
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:236 DlgItemProperties.cpp:237
 msgid "no"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:237
 msgid "Don't request more work"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:265
+#: DlgItemProperties.cpp:239
 msgid "Scheduler call in progress"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:268
+#: DlgItemProperties.cpp:242
 msgid "Trickle-up pending"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:271
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:245 DlgItemProperties.cpp:247
 msgid "Host location"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:247
 msgid "default"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:277
+#: DlgItemProperties.cpp:251
 msgid "Added via account manager"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:280
+#: DlgItemProperties.cpp:254
 msgid "Remove when tasks done"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:283
+#: DlgItemProperties.cpp:257
 msgid "Ended"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:285
-msgid "Tasks completed"
-msgstr ""
-
-#: clientgui/DlgItemProperties.cpp:286
-msgid "Tasks failed"
-msgstr ""
-
-#: clientgui/DlgItemProperties.cpp:288
+#: DlgItemProperties.cpp:259
 msgid "Credit"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:289
+#: DlgItemProperties.cpp:260
 msgid "User"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:296
+#: DlgItemProperties.cpp:267
 msgid "Host"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:305
+#: DlgItemProperties.cpp:276
 msgid "Scheduling"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:306
+#: DlgItemProperties.cpp:277
 msgid "Scheduling priority"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:307
+#: DlgItemProperties.cpp:278
 msgid "CPU"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:331
+#: DlgItemProperties.cpp:302
 msgid "Duration correction factor"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:345
+#: DlgItemProperties.cpp:316
 msgid "Properties of task "
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:357
+#: DlgItemProperties.cpp:328 ViewWork.cpp:238
 msgid "Application"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:358
+#: DlgItemProperties.cpp:329 ViewWork.cpp:239
 msgid "Name"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:359
+#: DlgItemProperties.cpp:330
 msgid "State"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:362
+#: DlgItemProperties.cpp:333
 msgid "Received"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:365
+#: DlgItemProperties.cpp:336
 msgid "Report deadline"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:367
+#: DlgItemProperties.cpp:338
 msgid "Resources"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:370
+#: DlgItemProperties.cpp:341
 msgid "Estimated computation size"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:373
+#: DlgItemProperties.cpp:344
 msgid "CPU time at last checkpoint"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:374
-#: clientgui/DlgItemProperties.cpp:389
+#: DlgItemProperties.cpp:345 DlgItemProperties.cpp:360
 msgid "CPU time"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:376
-#: clientgui/DlgItemProperties.cpp:390
+#: DlgItemProperties.cpp:347 DlgItemProperties.cpp:361
 msgid "Elapsed time"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:378
+#: DlgItemProperties.cpp:349
 msgid "Estimated time remaining"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:379
+#: DlgItemProperties.cpp:350
 msgid "Fraction done"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:380
+#: DlgItemProperties.cpp:351
 msgid "Virtual memory size"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:381
+#: DlgItemProperties.cpp:352
 msgid "Working set size"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:383
+#: DlgItemProperties.cpp:354
 msgid "Directory"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:386
+#: DlgItemProperties.cpp:357
 msgid "Process ID"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:456
+#: DlgItemProperties.cpp:427 ViewWork.cpp:1032 sg_TaskPanel.cpp:823
 msgid "Local: "
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: DlgOptions.cpp:129 DlgOptions.cpp:135
 msgid "Options"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:178
+#: DlgOptions.cpp:175
 msgid "Language:"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:185
+#: DlgOptions.cpp:182
 msgid "What language should BOINC use?"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:189
+#: DlgOptions.cpp:186
 msgid "Notice reminder interval:"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:196
+#: DlgOptions.cpp:193
 msgid "How often should BOINC remind you of new notices?"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:201
+#: DlgOptions.cpp:198
 msgid "Run Manager at login?"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:207
+#: DlgOptions.cpp:204
 msgid "Run the BOINC Manager when you log on."
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:212
+#: DlgOptions.cpp:209
 msgid "Enable Manager exit dialog?"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:218
+#: DlgOptions.cpp:215
 msgid "Display the exit dialog when shutting down the Manager."
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:229
+#: DlgOptions.cpp:226
 msgid "Dial-up and Virtual Private Network settings"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:243
+#: DlgOptions.cpp:240
 msgid "&Set Default"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:248
+#: DlgOptions.cpp:245
 msgid "&Clear Default"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:255
+#: DlgOptions.cpp:252
 msgid "Default Connection:"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:262
+#: DlgOptions.cpp:259
 msgid "Connections"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:271
+#: DlgOptions.cpp:268
 msgid "Connect via HTTP proxy server"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:275
+#: DlgOptions.cpp:272
 msgid "HTTP Proxy Server Configuration"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:283
-#: clientgui/DlgOptions.cpp:347
+#: DlgOptions.cpp:280 DlgOptions.cpp:344
 msgid "Address:"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:291
-#: clientgui/DlgOptions.cpp:355
+#: DlgOptions.cpp:288 DlgOptions.cpp:352 ProxyPage.cpp:340 ProxyPage.cpp:360
 msgid "Port:"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:299
-#: clientgui/DlgOptions.cpp:363
+#: DlgOptions.cpp:296 DlgOptions.cpp:360
 msgid "Don't use proxy for:"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:306
-#: clientgui/DlgOptions.cpp:370
+#: DlgOptions.cpp:303 DlgOptions.cpp:367
 msgid "Leave these blank if not needed"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:312
-#: clientgui/DlgOptions.cpp:376
+#: DlgOptions.cpp:309 DlgOptions.cpp:373 ProxyPage.cpp:343 ProxyPage.cpp:363
 msgid "User Name:"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:320
-#: clientgui/DlgOptions.cpp:384
-#: clientgui/DlgSelectComputer.cpp:152
+#: DlgOptions.cpp:317 DlgOptions.cpp:381 DlgSelectComputer.cpp:152
+#: ProxyPage.cpp:346 ProxyPage.cpp:366
 msgid "Password:"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:327
+#: DlgOptions.cpp:324
 msgid "HTTP Proxy"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:335
+#: DlgOptions.cpp:332
 msgid "Connect via SOCKS proxy server"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:339
+#: DlgOptions.cpp:336
 msgid "SOCKS Proxy Server Configuration"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:391
+#: DlgOptions.cpp:388
 msgid "SOCKS Proxy"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:589
+#: DlgOptions.cpp:586
 msgid "always"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:590
+#: DlgOptions.cpp:587
 msgid "1 hour"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:591
+#: DlgOptions.cpp:588
 msgid "6 hours"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:592
+#: DlgOptions.cpp:589
 msgid "1 day"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:593
+#: DlgOptions.cpp:590
 msgid "1 week"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:594
+#: DlgOptions.cpp:591
 msgid "never"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:691
+#: DlgOptions.cpp:688
 #, c-format
 msgid "%s - Language Selection"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:698
+#: DlgOptions.cpp:695
 #, 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
+#: DlgSelectComputer.cpp:91
 #, c-format
 msgid "%s - Select Computer"
 msgstr ""
 
-#: clientgui/DlgSelectComputer.cpp:125
+#: DlgSelectComputer.cpp:125
 #, c-format
 msgid ""
 "Another instance of %s is already running \n"
 "on this computer.  Please select a client to monitor."
 msgstr ""
 
-#: clientgui/DlgSelectComputer.cpp:143
+#: DlgSelectComputer.cpp:143
 msgid "Host name:"
 msgstr ""
 
-#: clientgui/Localization.cpp:31
-#: clientgui/Localization.cpp:69
+#: Localization.cpp:31 Localization.cpp:69
 msgid "Message boards"
 msgstr ""
 
-#: clientgui/Localization.cpp:33
+#: Localization.cpp:33
 msgid "Correspond with other users on the SETI at home message boards"
 msgstr ""
 
-#: clientgui/Localization.cpp:37
+#: Localization.cpp:37
 msgid "Ask questions and report problems"
 msgstr ""
 
-#: clientgui/Localization.cpp:39
-#: clientgui/Localization.cpp:81
-#: clientgui/Localization.cpp:111
-#: clientgui/Localization.cpp:129
+#: Localization.cpp:39 Localization.cpp:81 Localization.cpp:111
+#: Localization.cpp:129
 msgid "Your account"
 msgstr ""
 
-#: clientgui/Localization.cpp:41
-#: clientgui/Localization.cpp:87
-#: clientgui/Localization.cpp:113
+#: Localization.cpp:41 Localization.cpp:87 Localization.cpp:113
 msgid "View your account information and credit totals"
 msgstr ""
 
-#: clientgui/Localization.cpp:43
+#: Localization.cpp:43
 msgid "Your preferences"
 msgstr ""
 
-#: clientgui/Localization.cpp:45
+#: Localization.cpp:45
 msgid "View and modify your SETI at home account profile and preferences"
 msgstr ""
 
-#: clientgui/Localization.cpp:47
-#: clientgui/Localization.cpp:89
+#: Localization.cpp:47 Localization.cpp:89
 msgid "Your results"
 msgstr ""
 
-#: clientgui/Localization.cpp:49
-#: clientgui/Localization.cpp:91
+#: Localization.cpp:49 Localization.cpp:91
 msgid "View your last week (or more) of computational results and work"
 msgstr ""
 
-#: clientgui/Localization.cpp:51
-#: clientgui/Localization.cpp:93
+#: Localization.cpp:51 Localization.cpp:93
 msgid "Your computers"
 msgstr ""
 
-#: clientgui/Localization.cpp:53
+#: Localization.cpp:53
 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
+#: Localization.cpp:55 Localization.cpp:97
 msgid "Your team"
 msgstr ""
 
-#: clientgui/Localization.cpp:57
-#: clientgui/Localization.cpp:99
+#: Localization.cpp:57 Localization.cpp:99
 msgid "View information about your team"
 msgstr ""
 
-#: clientgui/Localization.cpp:61
+#: Localization.cpp:61
 msgid "Common questions"
 msgstr ""
 
-#: clientgui/Localization.cpp:63
+#: Localization.cpp:63
 msgid "Read the Einstein at Home Frequently Asked Question list"
 msgstr ""
 
-#: clientgui/Localization.cpp:65
+#: Localization.cpp:65
 msgid "Screensaver info"
 msgstr ""
 
-#: clientgui/Localization.cpp:67
+#: Localization.cpp:67
 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"
+#: Localization.cpp:71
+msgid ""
+"Correspond with admins and other users on the Einstein at Home message boards"
 msgstr ""
 
-#: clientgui/Localization.cpp:73
+#: Localization.cpp:73
 msgid "Einstein status"
 msgstr ""
 
-#: clientgui/Localization.cpp:75
+#: Localization.cpp:75
 msgid "Current status of the Einstein at Home server"
 msgstr ""
 
-#: clientgui/Localization.cpp:77
+#: Localization.cpp:77
 msgid "Report problems"
 msgstr ""
 
-#: clientgui/Localization.cpp:79
+#: Localization.cpp:79
 msgid "A link to the Einstein at Home problems and bug reports message board"
 msgstr ""
 
-#: clientgui/Localization.cpp:83
+#: Localization.cpp:83
 msgid "View and modify your Einstein at Home account profile and preferences"
 msgstr ""
 
-#: clientgui/Localization.cpp:85
+#: Localization.cpp:85
 msgid "Account summary"
 msgstr ""
 
-#: clientgui/Localization.cpp:95
-msgid "View a listing of all the computers on which you are running Einstein at Home"
+#: Localization.cpp:95
+msgid ""
+"View a listing of all the computers on which you are running Einstein at Home"
 msgstr ""
 
-#: clientgui/Localization.cpp:101
+#: Localization.cpp:101
 msgid "LIGO project"
 msgstr ""
 
-#: clientgui/Localization.cpp:103
-msgid "The home page of the Laser Interferometer Gravitational-wave Observatory (LIGO) project"
+#: Localization.cpp:103
+msgid ""
+"The home page of the Laser Interferometer Gravitational-wave Observatory "
+"(LIGO) project"
 msgstr ""
 
-#: clientgui/Localization.cpp:105
+#: Localization.cpp:105
 msgid "GEO-600 project"
 msgstr ""
 
-#: clientgui/Localization.cpp:107
+#: Localization.cpp:107
 msgid "The home page of the GEO-600 project"
 msgstr ""
 
-#: clientgui/Localization.cpp:115
-#: clientgui/Localization.cpp:133
+#: Localization.cpp:115 Localization.cpp:133 ViewProjects.cpp:221
+#: ViewStatistics.cpp:465
 msgid "Team"
 msgstr ""
 
-#: clientgui/Localization.cpp:117
+#: Localization.cpp:117
 msgid "Info about your Team"
 msgstr ""
 
-#: clientgui/Localization.cpp:123
+#: Localization.cpp:123
 msgid "Get help for climateprediction.net"
 msgstr ""
 
-#: clientgui/Localization.cpp:125
+#: Localization.cpp:125
 msgid "News"
 msgstr ""
 
-#: clientgui/Localization.cpp:127
+#: Localization.cpp:127
 msgid "climateprediction.net News"
 msgstr ""
 
-#: clientgui/Localization.cpp:131
+#: Localization.cpp:131
 msgid "View your account information, credits, and trickles"
 msgstr ""
 
-#: clientgui/Localization.cpp:135
+#: Localization.cpp:135
 msgid "Info about your team"
 msgstr ""
 
-#: clientgui/Localization.cpp:141
+#: Localization.cpp:141
 msgid "Search for help in our help system"
 msgstr ""
 
-#: clientgui/Localization.cpp:143
+#: Localization.cpp:143
 msgid "Global Statistics"
 msgstr ""
 
-#: clientgui/Localization.cpp:145
+#: Localization.cpp:145
 msgid "Summary statistics for World Community Grid"
 msgstr ""
 
-#: clientgui/Localization.cpp:147
+#: Localization.cpp:147
 msgid "My Grid"
 msgstr ""
 
-#: clientgui/Localization.cpp:149
+#: Localization.cpp:149
 msgid "Your statistics and settings"
 msgstr ""
 
-#: clientgui/Localization.cpp:151
+#: Localization.cpp:151
 msgid "Device Profiles"
 msgstr ""
 
-#: clientgui/Localization.cpp:153
+#: Localization.cpp:153
 msgid "Update your device settings"
 msgstr ""
 
-#: clientgui/Localization.cpp:155
+#: Localization.cpp:155
 msgid "Research"
 msgstr ""
 
-#: clientgui/Localization.cpp:157
+#: Localization.cpp:157
 msgid "Learn about the projects hosted at World Community Grid"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:583
+#: MainDocument.cpp:583
 msgid "Starting client"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:591
+#: MainDocument.cpp:591
 msgid "Connecting to client"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:1205
+#: MainDocument.cpp:1195
 msgid "Retrieving system state; please wait..."
 msgstr ""
 
-#: clientgui/MainDocument.cpp:1826
+#: MainDocument.cpp:1816
 msgid "Missing application"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:1827
-msgid "Please download and install the CoRD application from http://cord.sourceforge.net"
+#: MainDocument.cpp:1817
+msgid ""
+"Please download and install the CoRD application from http://cord."
+"sourceforge.net"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2442
+#: MainDocument.cpp:2432
 msgid "on batteries"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2443
+#: MainDocument.cpp:2433
 msgid "computer is in use"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2444
+#: MainDocument.cpp:2434
 msgid "user request"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2445
+#: MainDocument.cpp:2435
 msgid "time of day"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2446
+#: MainDocument.cpp:2436
 msgid "CPU benchmarks in progress"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2447
+#: MainDocument.cpp:2437
 msgid "need disk space - check preferences"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2448
+#: MainDocument.cpp:2438
 msgid "computer is not in use"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2449
+#: MainDocument.cpp:2439
 msgid "starting up"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2450
+#: MainDocument.cpp:2440
 msgid "an exclusive app is running"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2451
+#: MainDocument.cpp:2441
 msgid "CPU is busy"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2452
+#: MainDocument.cpp:2442
 msgid "network bandwidth limit exceeded"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2453
+#: MainDocument.cpp:2443
 msgid "requested by operating system"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2455
+#: MainDocument.cpp:2445
 msgid "unknown reason"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2477
+#: MainDocument.cpp:2467
 msgid "GPU missing, "
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2484
+#: MainDocument.cpp:2474
 msgid "New"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2488
+#: MainDocument.cpp:2478
 msgid "Download failed"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2490
+#: MainDocument.cpp:2480
 msgid "Downloading"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2492
-#: clientgui/MainDocument.cpp:2557
+#: MainDocument.cpp:2482 MainDocument.cpp:2552
 msgid " (suspended - "
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2500
+#: MainDocument.cpp:2490
 msgid "Project suspended by user"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2502
+#: MainDocument.cpp:2492
 msgid "Task suspended by user"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2504
+#: MainDocument.cpp:2494
 msgid "Suspended - "
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2510
+#: MainDocument.cpp:2500
 msgid "GPU suspended - "
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2517
+#: MainDocument.cpp:2507
 msgid "Waiting for memory"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2519
+#: MainDocument.cpp:2509
 msgid "Waiting for shared memory"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2521
+#: MainDocument.cpp:2512
+msgid "Running, high priority"
+msgstr ""
+
+#: MainDocument.cpp:2514
 msgid "Running"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2523
+#: MainDocument.cpp:2517
 msgid " (non-CPU-intensive)"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2526
+#: MainDocument.cpp:2520
 msgid "Waiting to run"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2528
-#: clientgui/MainDocument.cpp:2534
+#: MainDocument.cpp:2522 MainDocument.cpp:2528
 msgid "Ready to start"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2538
-msgid "Postponed: "
+#: MainDocument.cpp:2532
+msgid " (Scheduler wait: "
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2541
-msgid "Postponed"
+#: MainDocument.cpp:2536
+msgid " (Scheduler wait)"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2545
-msgid "Waiting for network access"
+#: MainDocument.cpp:2540
+msgid " (Waiting for network access)"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2549
+#: MainDocument.cpp:2544
 msgid "Computation error"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2553
+#: MainDocument.cpp:2548
 msgid "Upload failed"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2555
+#: MainDocument.cpp:2550
 msgid "Uploading"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2566
+#: MainDocument.cpp:2561
 msgid "Aborted by user"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2569
+#: MainDocument.cpp:2564
 msgid "Aborted by project"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2572
+#: MainDocument.cpp:2567
 msgid "Aborted: not started by deadline"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2575
+#: MainDocument.cpp:2570
 msgid "Aborted: disk limit exceeded"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2578
+#: MainDocument.cpp:2573
 msgid "Aborted: run time limit exceeded"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2581
+#: MainDocument.cpp:2576
 msgid "Aborted: memory limit exceeded"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2584
+#: MainDocument.cpp:2579
 msgid "Aborted"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2589
+#: MainDocument.cpp:2584
 msgid "Acknowledged"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2591
+#: MainDocument.cpp:2586
 msgid "Ready to report"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2593
+#: MainDocument.cpp:2588
 #, c-format
 msgid "Error: invalid state '%d'"
 msgstr ""
 
-#: clientgui/NoInternetConnectionPage.cpp:179
+#: NoInternetConnectionPage.cpp:179
 msgid "No Internet connection"
 msgstr ""
 
-#: clientgui/NoInternetConnectionPage.cpp:182
+#: NoInternetConnectionPage.cpp:182
 msgid "Please connect to the Internet and try again."
 msgstr ""
 
-#: clientgui/NotDetectedPage.cpp:181
+#: NotDetectedPage.cpp:181
 msgid "Project not found"
 msgstr ""
 
-#: clientgui/NotDetectedPage.cpp:184
+#: 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 ""
 
-#: clientgui/NotDetectedPage.cpp:188
+#: NotDetectedPage.cpp:188
 msgid "Account manager not found"
 msgstr ""
 
-#: clientgui/NotDetectedPage.cpp:191
+#: NotDetectedPage.cpp:191
 msgid ""
 "The URL you supplied is not that of a BOINC-based account\n"
 "manager.\n"
@@ -2470,137 +2377,99 @@ msgid ""
 "Please check the URL and try again."
 msgstr ""
 
-#: clientgui/NotFoundPage.cpp:181
+#: NotFoundPage.cpp:181
 msgid "Login Failed."
 msgstr ""
 
-#: clientgui/NotFoundPage.cpp:185
+#: NotFoundPage.cpp:185
 msgid "Check the username and password, and try again."
 msgstr ""
 
-#: clientgui/NotFoundPage.cpp:189
+#: NotFoundPage.cpp:189
 msgid "Check the email address and password, and try again."
 msgstr ""
 
-#: clientgui/NoticeListCtrl.cpp:229
+#: NoticeListCtrl.cpp:222
 msgid "more..."
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:221
+#: ProjectInfoPage.cpp:477 ProjectInfoPage.cpp:778 ProjectInfoPage.cpp:782
+msgid "All"
+msgstr ""
+
+#: ProjectInfoPage.cpp:615
 msgid "Choose a project"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:228
+#: ProjectInfoPage.cpp:619
 msgid "To choose a project, click its name or type its URL below."
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:246
+#: ProjectInfoPage.cpp:623
 msgid "Categories:"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:267
+#: ProjectInfoPage.cpp:627 sg_ProjectPanel.cpp:89
 msgid "Projects:"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:279
+#: ProjectInfoPage.cpp:631
 msgid "Project details"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:291
+#: ProjectInfoPage.cpp:635
 msgid "Research area:"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:302
+#: ProjectInfoPage.cpp:639
 msgid "Organization:"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:313
+#: ProjectInfoPage.cpp:643
 msgid "Web site:"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:325
+#: ProjectInfoPage.cpp:647
 msgid "Supported systems:"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:363
+#: ProjectInfoPage.cpp:651
 msgid "Project URL:"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:499
-#: clientgui/ProjectInfoPage.cpp:754
-#: clientgui/ProjectInfoPage.cpp:758
-msgid "All"
-msgstr ""
-
-#: clientgui/ProjectInfoPage.cpp:802
-msgid "This project may not have work for your type of computer.  Do you want to add it anyway?"
+#: ProjectInfoPage.cpp:826
+msgid ""
+"This project may not have work for your type of computer.  Do you want to "
+"add it anyway?"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:826
+#: ProjectInfoPage.cpp:850
 msgid "You already added this project. Please choose a different project."
 msgstr ""
 
-#: clientgui/ProjectProcessingPage.cpp:321
+#: ProjectProcessingPage.cpp:321
 msgid "Communicating with project."
 msgstr ""
 
-#: clientgui/ProjectProcessingPage.cpp:510
+#: ProjectProcessingPage.cpp:509
 msgid "Required files not found on the server."
 msgstr ""
 
-#: clientgui/ProjectProcessingPage.cpp:513
-#: clientgui/ProjectProcessingPage.cpp:586
+#: ProjectProcessingPage.cpp:512 ProjectProcessingPage.cpp:574
 msgid "An internal server error has occurred."
 msgstr ""
 
-#: clientgui/ProjectPropertiesPage.cpp:334
+#: ProjectPropertiesPage.cpp:334
 msgid ""
 "Communicating with project\n"
 "Please wait..."
 msgstr ""
 
-#: clientgui/ProjectWelcomePage.cpp:251
-#, c-format
-msgid "Welcome to %s."
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:254
-msgid "You have volunteered to compute for this project:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:255
-msgid "Name:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:258
-msgid "Home:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:262
-msgid "Description:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:265
-msgid "URL:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:268
-msgid "User:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:273
-msgid "WARNING: This project is not registered with BOINC.  Make sure you trust it before continuing."
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:277
-msgid "To continue, click Next."
-msgstr ""
-
-#: clientgui/ProxyInfoPage.cpp:195
+#: ProxyInfoPage.cpp:195
 msgid "Network communication failure"
 msgstr ""
 
-#: clientgui/ProxyInfoPage.cpp:199
+#: ProxyInfoPage.cpp:199
 msgid ""
 "The World Community Grid - BOINC software failed to communicate\n"
 "over the Internet. The most likely reasons are:\n"
@@ -2617,7 +2486,7 @@ msgid ""
 "Click Next to configure BOINC's proxy settings."
 msgstr ""
 
-#: clientgui/ProxyInfoPage.cpp:203
+#: ProxyInfoPage.cpp:203
 msgid ""
 "BOINC failed to communicate on the Internet.\n"
 "The most likely reasons are:\n"
@@ -2634,1247 +2503,1203 @@ msgid ""
 "Click Next to configure BOINC's proxy settings."
 msgstr ""
 
-#: clientgui/ProxyPage.cpp:331
+#: ProxyPage.cpp:331
 msgid "Proxy configuration"
 msgstr ""
 
-#: clientgui/ProxyPage.cpp:334
+#: ProxyPage.cpp:334
 msgid "HTTP proxy"
 msgstr ""
 
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
+#: ProxyPage.cpp:337 ProxyPage.cpp:357
 msgid "Server:"
 msgstr ""
 
-#: clientgui/ProxyPage.cpp:350
+#: ProxyPage.cpp:350
 msgid "Autodetect"
 msgstr ""
 
-#: clientgui/ProxyPage.cpp:354
+#: ProxyPage.cpp:354
 msgid "SOCKS proxy"
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:167
-msgid "Advanced View...\tCtrl+Shift+A"
-msgstr ""
-
-#: clientgui/sg_BoincSimpleFrame.cpp:168
-msgid "Display the advanced graphical interface."
-msgstr ""
-
-#: clientgui/sg_BoincSimpleFrame.cpp:175
-msgid "Skin"
-msgstr ""
-
-#: clientgui/sg_BoincSimpleFrame.cpp:177
-msgid "Select the appearance of the user interface."
-msgstr ""
-
-#: clientgui/sg_BoincSimpleFrame.cpp:224
-#, c-format
-msgid "&%s"
+#: TermsOfUsePage.cpp:218
+msgid "Terms of Use"
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:405
-msgid "Default"
+#: TermsOfUsePage.cpp:222
+msgid "Please read the following terms of use:"
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:848
-msgid "Suspend"
+#: TermsOfUsePage.cpp:231
+msgid "I agree to the terms of use."
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:850
-msgid "Suspend Computing"
+#: TermsOfUsePage.cpp:237
+msgid "I do not agree to the terms of use."
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:851
-msgid "Resume Computing"
+#: UnavailablePage.cpp:183
+msgid "Project temporarily unavailable"
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:867
-msgid "Notices"
+#: UnavailablePage.cpp:186
+msgid ""
+"The project is temporarily unavailable.\n"
+"\n"
+"Please try again later."
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:868
-msgid "Open a window to view notices from projects or BOINC"
+#: UnavailablePage.cpp:190
+msgid "Account manager temporarily unavailable"
 msgstr ""
 
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
+#: UnavailablePage.cpp:193
+msgid ""
+"The account manager is temporarily unavailable.\n"
+"\n"
+"Please try again later."
 msgstr ""
 
-#: clientgui/sg_DlgMessages.cpp:132
-msgid "There are no notices at this time."
+#: ValidateAccountKey.cpp:68
+msgid "Please specify an account key to continue."
 msgstr ""
 
-#: clientgui/sg_DlgMessages.cpp:146
-msgid "Close"
+#: ValidateAccountKey.cpp:71
+msgid "Invalid Account Key; please enter a valid Account Key"
 msgstr ""
 
-#: clientgui/sg_DlgMessages.cpp:394
-#, c-format
-msgid "%s - Notices"
+#: ValidateAccountKey.cpp:82 ValidateEmailAddress.cpp:86
+msgid "Validation conflict"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:270
-msgid "This dialog controls preferences for this computer only."
+#: ValidateEmailAddress.cpp:72
+msgid "Please specify an email address"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:275
-msgid "Click OK to set preferences."
+#: ValidateEmailAddress.cpp:75
+msgid "Invalid email address; please enter a valid email address"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:280
-msgid "Click Clear to restore web-based settings for all preferences listed below."
+#: ValidateURL.cpp:69
+msgid "Missing URL"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:287
-msgid "For additional settings, select Computing Preferences in the Advanced View."
+#: ValidateURL.cpp:70
+msgid ""
+"Please specify a URL.\n"
+"For example:\n"
+"http://www.example.com/"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:315
-msgid "Do work only between:"
+#: ValidateURL.cpp:83 ValidateURL.cpp:87 ValidateURL.cpp:91
+#: ValidateURL.cpp:103 ValidateURL.cpp:107 ValidateURL.cpp:110
+msgid "Invalid URL"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:337
-msgid "Connect to internet only between:"
+#: ValidateURL.cpp:84 ValidateURL.cpp:88 ValidateURL.cpp:92
+msgid ""
+"Please specify a valid URL.\n"
+"For example:\n"
+"http://boincproject.example.com"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:359
-#: clientgui/sg_DlgPreferences.cpp:376
-msgid "Use no more than:"
+#: ValidateURL.cpp:104 ValidateURL.cpp:108
+#, c-format
+msgid "'%s' does not contain a valid host name."
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:372
-msgid "of disk space"
+#: ValidateURL.cpp:111
+#, c-format
+msgid "'%s' does not contain a valid path."
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:389
-msgid "of the processor"
+#: ViewMessages.cpp:84 ViewProjects.cpp:170 ViewStatistics.cpp:1978
+#: ViewTransfers.cpp:160 ViewWork.cpp:183
+msgid "Commands"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:393
-msgid "Do work while on battery?"
+#: ViewMessages.cpp:88
+msgid "Copy all messages"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:406
-msgid "Do work after idle for:"
+#: ViewMessages.cpp:95
+msgid "Copy selected messages"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:431
-msgid "Clear all local preferences listed above and close the dialog"
+#: ViewMessages.cpp:106 ViewMessages.cpp:502
+msgid "Show only this project"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:609
-#: clientgui/sg_DlgPreferences.cpp:612
-#: clientgui/sg_DlgPreferences.cpp:688
-#: clientgui/sg_DlgPreferences.cpp:692
-#: clientgui/sg_DlgPreferences.cpp:704
-#: clientgui/sg_DlgPreferences.cpp:708
-#: clientgui/sg_DlgPreferences.cpp:851
-#: clientgui/sg_DlgPreferences.cpp:862
-msgid "Anytime"
+#: ViewMessages.cpp:107 ViewMessages.cpp:503
+msgid "Show only the messages for the selected project."
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:645
-msgid "100 MB"
+#: ViewMessages.cpp:164
+msgid "Messages"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:646
-msgid "200 MB"
+#: ViewMessages.cpp:187
+msgid "Copying all messages to the clipboard..."
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:647
-msgid "500 MB"
+#: ViewMessages.cpp:223
+msgid "Copying selected messages to the clipboard..."
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:648
-msgid "1 GB"
+#: ViewMessages.cpp:286
+msgid "Filtering messages..."
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:649
-msgid "2 GB"
+#: ViewMessages.cpp:494
+msgid "Show all messages"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:650
-msgid "5 GB"
+#: ViewMessages.cpp:495
+msgid "Show messages for all projects."
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:651
-msgid "10 GB"
+#: ViewNotices.cpp:58 sg_DlgMessages.cpp:124
+msgid "Fetching notices; please wait..."
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:652
-msgid "20 GB"
+#: ViewNotices.cpp:65 sg_DlgMessages.cpp:132
+msgid "There are no notices at this time."
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:653
-msgid "50 GB"
+#: ViewNotices.cpp:99 sg_BoincSimpleFrame.cpp:776
+msgid "Notices"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:654
-msgid "100 GB"
+#: ViewProjects.cpp:174 sg_ProjectCommandPopup.cpp:61
+msgid "Update"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:724
-#, c-format
-msgid "%d MB"
+#: ViewProjects.cpp:175 sg_ProjectCommandPopup.cpp:62
+msgid ""
+"Report all completed tasks, get latest credit, get latest preferences, and "
+"possibly get more tasks."
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:726
-#, c-format
-msgid "%4.2f GB"
+#: 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
+msgid "Suspend"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:767
-#, c-format
-msgid "%d%%"
+#: ViewProjects.cpp:182 ViewProjects.cpp:722 sg_ProjectCommandPopup.cpp:68
+#: sg_ProjectCommandPopup.cpp:114
+msgid "Suspend tasks for this project."
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:803
-msgid "0 (Run Always)"
+#: ViewProjects.cpp:188 ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:73
+#: sg_ProjectCommandPopup.cpp:121
+msgid "No new tasks"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:806
-#, c-format
-msgid "%d"
+#: ViewProjects.cpp:189 sg_ProjectCommandPopup.cpp:74
+msgid "Don't get new tasks for this project."
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:953
-#, c-format
-msgid "%s - Computing Preferences"
+#: ViewProjects.cpp:195 sg_ProjectCommandPopup.cpp:79
+msgid "Reset project"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:1033
-msgid "Do you really want to clear all local preferences?\n"
+#: ViewProjects.cpp:196 sg_ProjectCommandPopup.cpp:80
+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:66
-#: clientgui/ViewProjects.cpp:179
-msgid "Update"
+#: ViewProjects.cpp:203 sg_ProjectCommandPopup.cpp:86
+msgid ""
+"Remove this project.  Tasks in progress will be lost (use 'Update' first to "
+"report any completed tasks)."
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:67
-#: clientgui/ViewProjects.cpp:180
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
+#: ViewProjects.cpp:209 ViewWork.cpp:222 sg_ProjectCommandPopup.cpp:91
+#: sg_TaskCommandPopup.cpp:78
+msgid "Properties"
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:73
-#: clientgui/sg_ProjectCommandPopup.cpp:129
-#: clientgui/ViewProjects.cpp:187
-#: clientgui/ViewProjects.cpp:727
-msgid "Suspend tasks for this project."
+#: ViewProjects.cpp:210 sg_ProjectCommandPopup.cpp:92
+msgid "Show project details."
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:78
-#: clientgui/sg_ProjectCommandPopup.cpp:136
-#: clientgui/ViewProjects.cpp:193
-#: clientgui/ViewProjects.cpp:746
-msgid "No new tasks"
+#: ViewProjects.cpp:220 ViewStatistics.cpp:450
+msgid "Account"
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:79
-#: clientgui/ViewProjects.cpp:194
-msgid "Don't get new tasks for this project."
+#: ViewProjects.cpp:222
+msgid "Work done"
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:200
-msgid "Reset project"
+#: ViewProjects.cpp:223
+msgid "Avg. work done"
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:85
-#: clientgui/ViewProjects.cpp:201
-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."
+#: ViewProjects.cpp:225 ViewTransfers.cpp:188 ViewWork.cpp:234
+msgid "Status"
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:91
-#: clientgui/ViewProjects.cpp:208
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
+#: ViewProjects.cpp:250
+msgid "Projects"
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:96
-#: clientgui/sg_TaskCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:214
-msgid "Properties"
+#: ViewProjects.cpp:302
+msgid "Updating project..."
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:97
-#: clientgui/ViewProjects.cpp:215
-msgid "Show project details."
+#: ViewProjects.cpp:344
+msgid "Resuming project..."
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:126
-#: clientgui/ViewProjects.cpp:723
-msgid "Resume tasks for this project."
+#: ViewProjects.cpp:348
+msgid "Suspending project..."
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:133
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow new tasks"
+#: ViewProjects.cpp:385
+msgid "Telling project to allow additional task downloads..."
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:134
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow fetching new tasks for this project."
+#: ViewProjects.cpp:389
+msgid "Telling project to not fetch any additional tasks..."
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:137
-#: clientgui/ViewProjects.cpp:746
-msgid "Don't fetch new tasks for this project."
+#: ViewProjects.cpp:425
+msgid "Resetting project..."
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:229
-#: clientgui/ViewProjects.cpp:443
+#: ViewProjects.cpp:438 sg_ProjectCommandPopup.cpp:214
 #, c-format
 msgid "Are you sure you want to reset project '%s'?"
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:235
-#: clientgui/ViewProjects.cpp:449
+#: ViewProjects.cpp:444 sg_ProjectCommandPopup.cpp:220
 msgid "Reset Project"
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:266
-#: clientgui/ViewProjects.cpp:501
+#: ViewProjects.cpp:483
+msgid "Removing project..."
+msgstr ""
+
+#: ViewProjects.cpp:496 sg_ProjectCommandPopup.cpp:251
 #, c-format
 msgid "Are you sure you want to remove project '%s'?"
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:272
-#: clientgui/ViewProjects.cpp:507
+#: ViewProjects.cpp:502 sg_ProjectCommandPopup.cpp:257
 msgid "Remove Project"
 msgstr ""
 
-#: clientgui/sg_ProjectPanel.cpp:72
-msgid "Add Project"
+#: ViewProjects.cpp:543 ViewWork.cpp:599
+msgid "Launching browser..."
 msgstr ""
 
-#: clientgui/sg_ProjectPanel.cpp:73
-msgid "Synchronize"
+#: ViewProjects.cpp:718 sg_ProjectCommandPopup.cpp:111
+msgid "Resume tasks for this project."
 msgstr ""
 
-#: clientgui/sg_ProjectPanel.cpp:74
-msgid "Work done for this project"
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:118
+msgid "Allow new tasks"
 msgstr ""
 
-#: clientgui/sg_ProjectPanel.cpp:77
-msgid "Synchronize projects with account manager system"
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:119
+msgid "Allow fetching new tasks for this project."
 msgstr ""
 
-#: clientgui/sg_ProjectPanel.cpp:124
-msgid "Select a project to access with the controls below"
+#: ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:122
+msgid "Don't fetch new tasks for this project."
 msgstr ""
 
-#: clientgui/sg_ProjectPanel.cpp:145
-msgid "Project Web Pages"
+#: ViewProjects.cpp:1058
+msgid "Requested by user"
 msgstr ""
 
-#: clientgui/sg_ProjectPanel.cpp:149
-msgid "Project Commands"
+#: ViewProjects.cpp:1059
+msgid "To fetch work"
 msgstr ""
 
-#: clientgui/sg_ProjectPanel.cpp:276
-#, c-format
-msgid "Pop up a menu of web sites for project %s"
+#: ViewProjects.cpp:1060
+msgid "To report completed tasks"
 msgstr ""
 
-#: clientgui/sg_ProjectPanel.cpp:278
-#, c-format
-msgid "Pop up a menu of commands to apply to project %s"
+#: ViewProjects.cpp:1061
+msgid "To send trickle-up message"
 msgstr ""
 
-#: clientgui/sg_TaskCommandPopup.cpp:66
-msgid "Show graphics"
+#: ViewProjects.cpp:1062
+msgid "Requested by account manager"
 msgstr ""
 
-#: clientgui/sg_TaskCommandPopup.cpp:67
-msgid "Show application graphics in a window."
+#: ViewProjects.cpp:1063
+msgid "Project initialization"
 msgstr ""
 
-#: clientgui/sg_TaskCommandPopup.cpp:73
-msgid "Suspend this task."
+#: ViewProjects.cpp:1064
+msgid "Requested by project"
 msgstr ""
 
-#: clientgui/sg_TaskCommandPopup.cpp:78
-msgid "Abort"
+#: ViewProjects.cpp:1065
+msgid "Unknown reason"
 msgstr ""
 
-#: clientgui/sg_TaskCommandPopup.cpp:79
-msgid "Abandon this task. You will get no credit for it."
+#: ViewProjects.cpp:1079
+msgid "Suspended by user"
 msgstr ""
 
-#: clientgui/sg_TaskCommandPopup.cpp:85
-msgid "Show task details."
+#: ViewProjects.cpp:1082
+msgid "Won't get new tasks"
 msgstr ""
 
-#: clientgui/sg_TaskCommandPopup.cpp:119
-msgid "Resume work for this task."
+#: ViewProjects.cpp:1085
+msgid "Project ended - OK to remove"
 msgstr ""
 
-#: clientgui/sg_TaskCommandPopup.cpp:123
-msgid "Suspend work for this task."
+#: ViewProjects.cpp:1088
+msgid "Will remove when tasks done"
 msgstr ""
 
-#: clientgui/sg_TaskCommandPopup.cpp:267
-#, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %.1lf%%, Status: %s)"
+#: ViewProjects.cpp:1091
+msgid "Scheduler request pending"
 msgstr ""
 
-#: clientgui/sg_TaskCommandPopup.cpp:272
-msgid "Abort task"
+#: ViewProjects.cpp:1097
+msgid "Scheduler request in progress"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:468
-msgid "You don't have any projects.  Please Add a Project."
+#: ViewProjects.cpp:1100
+msgid "Trickle up message pending"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:469
-msgid "Not available"
+#: ViewProjects.cpp:1106
+msgid "Communication deferred "
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:480
-msgid "Tasks:"
+#: ViewResources.cpp:62
+msgid "Total disk usage"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:486
-msgid "Select a task to access"
+#: ViewResources.cpp:83
+msgid "Disk usage by BOINC projects"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:497
-msgid "From:"
+#: ViewResources.cpp:116
+msgid "Disk"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:551
-msgid "This task's progress"
+#: ViewResources.cpp:249
+msgid "no projects: 0 bytes used"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:569
-msgid "Task Commands"
+#: ViewResources.cpp:286
+msgid "used by BOINC: "
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:570
-msgid "Pop up a menu of commands to apply to this task"
+#: ViewResources.cpp:296
+msgid "free, available to BOINC: "
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:705
-#, c-format
-msgid "Application: %s"
+#: ViewResources.cpp:306
+msgid "free, not available to BOINC: "
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:728
-#, c-format
-msgid "%.3f%%"
+#: ViewResources.cpp:316
+msgid "free: "
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:736
-msgid "Application: Not available"
+#: ViewResources.cpp:326
+msgid "used by other programs: "
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:836
-msgid "Not Available"
+#: ViewStatistics.cpp:1205
+msgid "User Total"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:851
-#, c-format
-msgid "Elapsed: %s"
+#: ViewStatistics.cpp:1206
+msgid "User Average"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:865
-#, c-format
-msgid "Remaining (estimated): %s"
+#: ViewStatistics.cpp:1207
+msgid "Host Total"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:880
+#: ViewStatistics.cpp:1208
+msgid "Host Average"
+msgstr ""
+
+#: ViewStatistics.cpp:1355
 #, c-format
-msgid "Status: %s"
+msgid "Last update: %.0f days ago"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1227
-msgid "Retrieving current status."
+#: ViewStatistics.cpp:1982
+msgid "Show user total"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1233
-msgid "Downloading work from the server."
+#: ViewStatistics.cpp:1983
+msgid "Show total credit for user"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1238
-msgid "Processing Suspended:  Running On Batteries."
+#: ViewStatistics.cpp:1989
+msgid "Show user average"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1240
-msgid "Processing Suspended:  User Active."
+#: ViewStatistics.cpp:1990
+msgid "Show average credit for user"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1242
-msgid "Processing Suspended:  User paused processing."
+#: ViewStatistics.cpp:1996
+msgid "Show host total"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1244
-msgid "Processing Suspended:  Time of Day."
+#: ViewStatistics.cpp:1997
+msgid "Show total credit for host"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1246
-msgid "Processing Suspended:  Benchmarks Running."
+#: ViewStatistics.cpp:2003
+msgid "Show host average"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1248
-msgid "Processing Suspended."
+#: ViewStatistics.cpp:2004
+msgid "Show average credit for host"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1252
-msgid "Waiting to contact project servers."
+#: ViewStatistics.cpp:2013
+msgid "< &Previous project"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1256
-#: clientgui/sg_TaskPanel.cpp:1265
-msgid "Retrieving current status"
+#: ViewStatistics.cpp:2014
+msgid "Show chart for previous project"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1260
-msgid "No work available to process"
+#: ViewStatistics.cpp:2019
+msgid "&Next project >"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1262
-msgid "Unable to connect to the core client"
+#: ViewStatistics.cpp:2020
+msgid "Show chart for next project"
 msgstr ""
 
-#: clientgui/TermsOfUsePage.cpp:218
-msgid "Terms of Use"
+#: ViewStatistics.cpp:2026 ViewStatistics.cpp:2416
+msgid "Hide project list"
 msgstr ""
 
-#: clientgui/TermsOfUsePage.cpp:222
-msgid "Please read the following terms of use:"
+#: ViewStatistics.cpp:2027 ViewStatistics.cpp:2416
+msgid "Use entire area for graphs"
 msgstr ""
 
-#: clientgui/TermsOfUsePage.cpp:231
-msgid "I agree to the terms of use."
+#: ViewStatistics.cpp:2032
+msgid "Mode view"
 msgstr ""
 
-#: clientgui/TermsOfUsePage.cpp:237
-msgid "I do not agree to the terms of use."
+#: ViewStatistics.cpp:2036
+msgid "One project"
 msgstr ""
 
-#: clientgui/UnavailablePage.cpp:183
-msgid "Project temporarily unavailable"
+#: ViewStatistics.cpp:2037
+msgid "Show one chart with selected project"
 msgstr ""
 
-#: clientgui/UnavailablePage.cpp:186
-msgid ""
-"The project is temporarily unavailable.\n"
-"\n"
-"Please try again later."
+#: ViewStatistics.cpp:2043
+msgid "All projects (separate)"
 msgstr ""
 
-#: clientgui/UnavailablePage.cpp:190
-msgid "Account manager temporarily unavailable"
+#: ViewStatistics.cpp:2044
+msgid "Show all projects, one chart per project"
 msgstr ""
 
-#: clientgui/UnavailablePage.cpp:193
-msgid ""
-"The account manager is temporarily unavailable.\n"
-"\n"
-"Please try again later."
+#: ViewStatistics.cpp:2050
+msgid "All projects (together)"
 msgstr ""
 
-#: clientgui/ValidateAccountKey.cpp:68
-msgid "Please specify an account key to continue."
+#: ViewStatistics.cpp:2051
+msgid "Show one chart with all projects"
 msgstr ""
 
-#: clientgui/ValidateAccountKey.cpp:71
-msgid "Invalid Account Key; please enter a valid Account Key"
+#: ViewStatistics.cpp:2057
+msgid "All projects (sum)"
 msgstr ""
 
-#: clientgui/ValidateAccountKey.cpp:82
-#: clientgui/ValidateEmailAddress.cpp:86
-msgid "Validation conflict"
+#: ViewStatistics.cpp:2058
+msgid "Show one chart with sum of projects"
 msgstr ""
 
-#: clientgui/ValidateEmailAddress.cpp:72
-msgid "Please specify an email address"
+#: ViewStatistics.cpp:2079
+msgid "Statistics"
 msgstr ""
 
-#: clientgui/ValidateEmailAddress.cpp:75
-msgid "Invalid email address; please enter a valid email address"
+#: 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
+msgid "Updating charts..."
 msgstr ""
 
-#: clientgui/ValidateURL.cpp:69
-msgid "Missing URL"
+#: ViewStatistics.cpp:2420
+msgid "Show project list"
 msgstr ""
 
-#: clientgui/ValidateURL.cpp:70
-msgid ""
-"Please specify a URL.\n"
-"For example:\n"
-"http://www.example.com/"
+#: ViewStatistics.cpp:2420
+msgid "Uses smaller area for graphs"
 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"
+#: ViewTransfers.cpp:164
+msgid "Retry Now"
 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"
+#: ViewTransfers.cpp:165
+msgid "Retry the file transfer now"
 msgstr ""
 
-#: clientgui/ValidateURL.cpp:104
-#: clientgui/ValidateURL.cpp:108
-#, c-format
-msgid "'%s' does not contain a valid host name."
+#: ViewTransfers.cpp:171
+msgid "Abort Transfer"
 msgstr ""
 
-#: clientgui/ValidateURL.cpp:111
-#, c-format
-msgid "'%s' does not contain a valid path."
+#: ViewTransfers.cpp:172
+msgid "Abort this file transfer.  You won't get credit for the task."
 msgstr ""
 
-#: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:175
-msgid "Commands"
+#: ViewTransfers.cpp:183
+msgid "File"
 msgstr ""
 
-#: clientgui/ViewMessages.cpp:88
-msgid "Copy all messages"
+#: ViewTransfers.cpp:184 ViewWork.cpp:233
+msgid "Progress"
 msgstr ""
 
-#: clientgui/ViewMessages.cpp:95
-msgid "Copy selected messages"
+#: ViewTransfers.cpp:185
+msgid "Size"
 msgstr ""
 
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
-msgid "Show only this project"
+#: ViewTransfers.cpp:186
+msgid "Elapsed Time"
 msgstr ""
 
-#: clientgui/ViewMessages.cpp:107
-#: clientgui/ViewMessages.cpp:503
-msgid "Show only the messages for the selected project."
+#: ViewTransfers.cpp:187
+msgid "Speed"
 msgstr ""
 
-#: clientgui/ViewMessages.cpp:164
-msgid "Messages"
+#: ViewTransfers.cpp:213
+msgid "Transfers"
 msgstr ""
 
-#: clientgui/ViewMessages.cpp:187
-msgid "Copying all messages to the clipboard..."
+#: ViewTransfers.cpp:280
+msgid "Network activity is suspended - "
 msgstr ""
 
-#: clientgui/ViewMessages.cpp:223
-msgid "Copying selected messages to the clipboard..."
+#: ViewTransfers.cpp:282
+msgid ""
+".\n"
+"You can enable it using the Activity menu."
 msgstr ""
 
-#: clientgui/ViewMessages.cpp:286
-msgid "Filtering messages..."
+#: ViewTransfers.cpp:285
+msgid "BOINC"
 msgstr ""
 
-#: clientgui/ViewMessages.cpp:494
-msgid "Show all messages"
+#: ViewTransfers.cpp:292
+msgid "Retrying transfer now..."
 msgstr ""
 
-#: clientgui/ViewMessages.cpp:495
-msgid "Show messages for all projects."
+#: ViewTransfers.cpp:330
+msgid "Aborting transfer..."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:225
-msgid "Account"
+#: ViewTransfers.cpp:343
+#, 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/ViewProjects.cpp:227
-msgid "Work done"
+#: ViewTransfers.cpp:349
+msgid "Abort File Transfer"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:228
-msgid "Avg. work done"
+#: ViewTransfers.cpp:780
+msgid "Upload"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:230
-msgid "Status"
+#: ViewTransfers.cpp:780
+msgid "Download"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:255
-msgid "Projects"
+#: ViewTransfers.cpp:784
+msgid "retry in "
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:307
-msgid "Updating project..."
+#: ViewTransfers.cpp:786
+msgid "failed"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:349
-msgid "Resuming project..."
+#: ViewTransfers.cpp:789
+msgid "suspended"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:353
-msgid "Suspending project..."
+#: ViewTransfers.cpp:794
+msgid "active"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:390
-msgid "Telling project to allow additional task downloads..."
+#: ViewTransfers.cpp:796
+msgid "pending"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:394
-msgid "Telling project to not fetch any additional tasks..."
+#: ViewTransfers.cpp:803
+msgid " (project backoff: "
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:430
-msgid "Resetting project..."
+#: ViewWork.cpp:187 ViewWork.cpp:777
+msgid "Show active tasks"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:488
-msgid "Removing project..."
+#: ViewWork.cpp:188 ViewWork.cpp:778
+msgid "Show only active tasks."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:548
-msgid "Launching browser..."
+#: ViewWork.cpp:194 sg_TaskCommandPopup.cpp:60
+msgid "Show graphics"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1063
-msgid "Requested by user"
+#: ViewWork.cpp:195 sg_TaskCommandPopup.cpp:61
+msgid "Show application graphics in a window."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1064
-msgid "To fetch work"
+#: ViewWork.cpp:201
+msgid "Show VM Console"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1065
-msgid "To report completed tasks"
+#: ViewWork.cpp:202
+msgid "Show VM Console in a window."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1066
-msgid "To send trickle-up message"
+#: ViewWork.cpp:209
+msgid "Suspend work for this result."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1067
-msgid "Requested by account manager"
+#: ViewWork.cpp:215 sg_TaskCommandPopup.cpp:72
+msgid "Abort"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1068
-msgid "Project initialization"
+#: ViewWork.cpp:216
+msgid "Abandon work on the result. You will get no credit for it."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1069
-msgid "Requested by project"
+#: ViewWork.cpp:223 sg_TaskCommandPopup.cpp:79
+msgid "Show task details."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1070
-msgid "Unknown reason"
+#: ViewWork.cpp:235
+msgid "Elapsed"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1084
-msgid "Suspended by user"
+#: ViewWork.cpp:236
+msgid "Remaining (estimated)"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1087
-msgid "Won't get new tasks"
+#: ViewWork.cpp:237
+msgid "Deadline"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1090
-msgid "Project ended - OK to remove"
+#: ViewWork.cpp:264
+msgid "Tasks"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1093
-msgid "Will remove when tasks done"
+#: ViewWork.cpp:357
+msgid "Resuming task..."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1096
-msgid "Scheduler request pending"
+#: ViewWork.cpp:360
+msgid "Suspending task..."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1102
-msgid "Scheduler request in progress"
+#: ViewWork.cpp:389
+msgid "Showing graphics for task..."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1105
-msgid "Trickle up message pending"
+#: ViewWork.cpp:426
+msgid "Showing VM console for task..."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1111
-msgid "Communication deferred "
+#: ViewWork.cpp:479
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %s, Status: %s)"
 msgstr ""
 
-#: clientgui/ViewResources.cpp:62
-msgid "Total disk usage"
+#: ViewWork.cpp:485
+#, c-format
+msgid "Are you sure you want to abort these %d tasks?"
 msgstr ""
 
-#: clientgui/ViewResources.cpp:83
-msgid "Disk usage by BOINC projects"
+#: ViewWork.cpp:490 sg_TaskCommandPopup.cpp:256
+msgid "Abort task"
 msgstr ""
 
-#: clientgui/ViewResources.cpp:116
-msgid "Disk"
+#: ViewWork.cpp:499
+msgid "Aborting task..."
 msgstr ""
 
-#: clientgui/ViewResources.cpp:225
-msgid "no projects: 0 bytes used"
+#: ViewWork.cpp:771
+msgid "Show all tasks"
 msgstr ""
 
-#: clientgui/ViewResources.cpp:262
-msgid "used by BOINC: "
+#: ViewWork.cpp:772
+msgid "Show all tasks."
 msgstr ""
 
-#: clientgui/ViewResources.cpp:272
-msgid "free, available to BOINC: "
+#: ViewWork.cpp:796 sg_TaskCommandPopup.cpp:103
+msgid "Resume work for this task."
 msgstr ""
 
-#: clientgui/ViewResources.cpp:282
-msgid "free, not available to BOINC: "
+#: ViewWork.cpp:802 sg_TaskCommandPopup.cpp:107
+msgid "Suspend work for this task."
 msgstr ""
 
-#: clientgui/ViewResources.cpp:292
-msgid "free: "
+#: WelcomePage.cpp:284
+msgid "Add project or account manager"
 msgstr ""
 
-#: clientgui/ViewResources.cpp:302
-msgid "used by other programs: "
+#: WelcomePage.cpp:288
+msgid "Add project or use BOINC Account Manager"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1181
-msgid "User Total"
+#: 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 ""
 
-#: clientgui/ViewStatistics.cpp:1182
-msgid "User Average"
+#: 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 ""
 
-#: clientgui/ViewStatistics.cpp:1183
-msgid "Host Total"
+#: 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 ""
 
-#: clientgui/ViewStatistics.cpp:1184
-msgid "Host Average"
+#: WelcomePage.cpp:339
+msgid "Use a BOINC Account Manager"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1331
-#, c-format
-msgid "Last update: %.0f days ago"
+#: WelcomePage.cpp:352
+msgid "To continue, click Next."
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1956
-msgid "Show user total"
+#: WelcomePage.cpp:358
+msgid "Add or change your World Community Grid projects"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1957
-msgid "Show total credit for user"
+#: WelcomePage.cpp:361
+msgid "Add projects run by other researchers or organizations"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1963
-msgid "Show user average"
+#: WizardAttach.cpp:634
+msgid "Do you really want to cancel?"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1964
-msgid "Show average credit for user"
+#: WizardAttach.cpp:635
+msgid "Question"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1970
-msgid "Show host total"
+#: sg_BoincSimpleFrame.cpp:149
+msgid "Advanced View...\tCtrl+Shift+A"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1971
-msgid "Show total credit for host"
+#: sg_BoincSimpleFrame.cpp:150
+msgid "Display the advanced graphical interface."
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1977
-msgid "Show host average"
+#: sg_BoincSimpleFrame.cpp:157
+msgid "Skin"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1978
-msgid "Show average credit for host"
+#: sg_BoincSimpleFrame.cpp:159
+msgid "Select the appearance of the user interface."
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1987
-msgid "< &Previous project"
+#: sg_BoincSimpleFrame.cpp:206
+#, c-format
+msgid "&%s"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1988
-msgid "Show chart for previous project"
+#: sg_BoincSimpleFrame.cpp:390
+msgid "Default"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1993
-msgid "&Next project >"
+#: sg_BoincSimpleFrame.cpp:759
+msgid "Suspend Computing"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1994
-msgid "Show chart for next project"
+#: sg_BoincSimpleFrame.cpp:760
+msgid "Resume Computing"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2000
-#: clientgui/ViewStatistics.cpp:2390
-msgid "Hide project list"
+#: sg_BoincSimpleFrame.cpp:777
+msgid "Open a window to view notices from projects or BOINC"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2001
-#: clientgui/ViewStatistics.cpp:2390
-msgid "Use entire area for graphs"
+#: sg_DlgMessages.cpp:146
+msgid "Close"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2006
-msgid "Mode view"
+#: sg_DlgMessages.cpp:389
+#, c-format
+msgid "%s - Notices"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2010
-msgid "One project"
+#: sg_DlgPreferences.cpp:268
+msgid "This dialog controls preferences for this computer only."
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2011
-msgid "Show one chart with selected project"
+#: sg_DlgPreferences.cpp:273
+msgid "Click OK to set preferences."
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2017
-msgid "All projects (separate)"
+#: sg_DlgPreferences.cpp:278
+msgid ""
+"Click Clear to restore web-based settings for all preferences listed below."
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2018
-msgid "Show all projects, one chart per project"
+#: sg_DlgPreferences.cpp:285
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2024
-msgid "All projects (together)"
+#: sg_DlgPreferences.cpp:313
+msgid "Do work only between:"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2025
-msgid "Show one chart with all projects"
+#: sg_DlgPreferences.cpp:335
+msgid "Connect to internet only between:"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2031
-msgid "All projects (sum)"
+#: sg_DlgPreferences.cpp:357 sg_DlgPreferences.cpp:374
+msgid "Use no more than:"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2032
-msgid "Show one chart with sum of projects"
+#: sg_DlgPreferences.cpp:370
+msgid "of disk space"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2053
-msgid "Statistics"
+#: sg_DlgPreferences.cpp:387
+msgid "of the processor"
 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..."
+#: sg_DlgPreferences.cpp:391
+msgid "Do work while on battery?"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2394
-msgid "Show project list"
+#: sg_DlgPreferences.cpp:404
+msgid "Do work after idle for:"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2394
-msgid "Uses smaller area for graphs"
+#: sg_DlgPreferences.cpp:429
+msgid "Clear all local preferences listed above and close the dialog"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:169
-msgid "Retry Now"
+#: 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 ""
 
-#: clientgui/ViewTransfers.cpp:170
-msgid "Retry the file transfer now"
+#: sg_DlgPreferences.cpp:638
+msgid "100 MB"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:176
-msgid "Abort Transfer"
+#: sg_DlgPreferences.cpp:639
+msgid "200 MB"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:177
-msgid "Abort this file transfer.  You won't get credit for the task."
+#: sg_DlgPreferences.cpp:640
+msgid "500 MB"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:188
-msgid "File"
+#: sg_DlgPreferences.cpp:641
+msgid "1 GB"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:189
-#: clientgui/ViewWork.cpp:238
-msgid "Progress"
+#: sg_DlgPreferences.cpp:642
+msgid "2 GB"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:190
-msgid "Size"
+#: sg_DlgPreferences.cpp:643
+msgid "5 GB"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:191
-msgid "Elapsed Time"
+#: sg_DlgPreferences.cpp:644
+msgid "10 GB"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:192
-msgid "Speed"
+#: sg_DlgPreferences.cpp:645
+msgid "20 GB"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:218
-msgid "Transfers"
+#: sg_DlgPreferences.cpp:646
+msgid "50 GB"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:285
-msgid "Network activity is suspended - "
+#: sg_DlgPreferences.cpp:647
+msgid "100 GB"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:287
-msgid ""
-".\n"
-"You can enable it using the Activity menu."
+#: sg_DlgPreferences.cpp:717
+#, c-format
+msgid "%d MB"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:290
-msgid "BOINC"
+#: sg_DlgPreferences.cpp:719
+#, c-format
+msgid "%4.2f GB"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:297
-msgid "Retrying transfer now..."
+#: sg_DlgPreferences.cpp:760
+#, c-format
+msgid "%d%%"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:335
-msgid "Aborting transfer..."
+#: sg_DlgPreferences.cpp:796
+msgid "0 (Run Always)"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:348
+#: sg_DlgPreferences.cpp:799
 #, 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."
+msgid "%d"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:354
-msgid "Abort File Transfer"
+#: sg_DlgPreferences.cpp:1029
+msgid "Do you really want to clear all local preferences?\n"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:785
-msgid "Upload"
+#: sg_ProjectPanel.cpp:72
+msgid "Add Project"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:785
-msgid "Download"
+#: sg_ProjectPanel.cpp:73
+msgid "Synchronize"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:789
-msgid "retry in "
+#: sg_ProjectPanel.cpp:74
+msgid "Work done for this project"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:791
-msgid "failed"
+#: sg_ProjectPanel.cpp:77
+msgid "Synchronize projects with account manager system"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:794
-msgid "suspended"
+#: sg_ProjectPanel.cpp:124
+msgid "Select a project to access with the controls below"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:799
-msgid "active"
+#: sg_ProjectPanel.cpp:145
+msgid "Project Web Pages"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:801
-msgid "pending"
+#: sg_ProjectPanel.cpp:149
+msgid "Project Commands"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:808
-msgid " (project backoff: "
+#: sg_ProjectPanel.cpp:267
+#, c-format
+msgid "Pop up a menu of web sites for project %s"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:192
-#: clientgui/ViewWork.cpp:782
-msgid "Show active tasks"
+#: sg_ProjectPanel.cpp:269
+#, c-format
+msgid "Pop up a menu of commands to apply to project %s"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:193
-#: clientgui/ViewWork.cpp:783
-msgid "Show only active tasks."
+#: sg_TaskCommandPopup.cpp:67
+msgid "Suspend this task."
 msgstr ""
 
-#: clientgui/ViewWork.cpp:206
-msgid "Show VM Console"
+#: sg_TaskCommandPopup.cpp:73
+msgid "Abandon this task. You will get no credit for it."
 msgstr ""
 
-#: clientgui/ViewWork.cpp:207
-msgid "Show VM Console in a window."
+#: sg_TaskCommandPopup.cpp:251
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %.1lf%%, Status: %s)"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:214
-msgid "Suspend work for this result."
+#: sg_TaskPanel.cpp:464
+msgid "You don't have any projects.  Please Add a Project."
 msgstr ""
 
-#: clientgui/ViewWork.cpp:221
-msgid "Abandon work on the result. You will get no credit for it."
+#: sg_TaskPanel.cpp:465
+msgid "Not available"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:240
-msgid "Elapsed"
+#: sg_TaskPanel.cpp:476
+msgid "Tasks:"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:241
-msgid "Remaining (estimated)"
+#: sg_TaskPanel.cpp:482
+msgid "Select a task to access"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:242
-msgid "Deadline"
+#: sg_TaskPanel.cpp:493
+msgid "From:"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:269
-msgid "Tasks"
+#: sg_TaskPanel.cpp:547
+msgid "This task's progress"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:362
-msgid "Resuming task..."
+#: sg_TaskPanel.cpp:565
+msgid "Task Commands"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:365
-msgid "Suspending task..."
+#: sg_TaskPanel.cpp:566
+msgid "Pop up a menu of commands to apply to this task"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:394
-msgid "Showing graphics for task..."
+#: sg_TaskPanel.cpp:701
+#, c-format
+msgid "Application: %s"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:431
-msgid "Showing VM console for task..."
+#: sg_TaskPanel.cpp:724
+#, c-format
+msgid "%.3f%%"
+msgstr ""
+
+#: sg_TaskPanel.cpp:732
+msgid "Application: Not available"
+msgstr ""
+
+#: sg_TaskPanel.cpp:832
+msgid "Not Available"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:484
+#: sg_TaskPanel.cpp:847
 #, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %s, Status: %s)"
+msgid "Elapsed: %s"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:490
+#: sg_TaskPanel.cpp:861
 #, c-format
-msgid "Are you sure you want to abort these %d tasks?"
+msgid "Remaining (estimated): %s"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:504
-msgid "Aborting task..."
+#: sg_TaskPanel.cpp:876
+#, c-format
+msgid "Status: %s"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:776
-msgid "Show all tasks"
+#: sg_TaskPanel.cpp:1223
+msgid "Retrieving current status."
 msgstr ""
 
-#: clientgui/ViewWork.cpp:777
-msgid "Show all tasks."
+#: sg_TaskPanel.cpp:1229
+msgid "Downloading work from the server."
 msgstr ""
 
-#: clientgui/WelcomePage.cpp:284
-msgid "Add project or account manager"
+#: sg_TaskPanel.cpp:1234
+msgid "Processing Suspended:  Running On Batteries."
 msgstr ""
 
-#: clientgui/WelcomePage.cpp:288
-msgid "Add project or use BOINC Account Manager"
+#: sg_TaskPanel.cpp:1236
+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."
+#: sg_TaskPanel.cpp:1238
+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."
+#: sg_TaskPanel.cpp:1240
+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"
+#: sg_TaskPanel.cpp:1242
+msgid "Processing Suspended:  Benchmarks Running."
 msgstr ""
 
-#: clientgui/WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
+#: sg_TaskPanel.cpp:1244
+msgid "Processing Suspended."
 msgstr ""
 
-#: clientgui/WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
+#: sg_TaskPanel.cpp:1248
+msgid "Waiting to contact project servers."
 msgstr ""
 
-#: clientgui/WelcomePage.cpp:361
-msgid "Add projects run by other researchers or organizations"
+#: sg_TaskPanel.cpp:1252 sg_TaskPanel.cpp:1261
+msgid "Retrieving current status"
 msgstr ""
 
-#: clientgui/WizardAttach.cpp:673
-msgid "Do you really want to cancel?"
+#: sg_TaskPanel.cpp:1256
+msgid "No work available to process"
 msgstr ""
 
-#: clientgui/WizardAttach.cpp:674
-msgid "Question"
+#: sg_TaskPanel.cpp:1258
+msgid "Unable to connect to the core client"
 msgstr ""
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
+#: wizardex.cpp:377 wizardex.cpp:553
 msgid "&Next >"
 msgstr ""
 
-#: clientgui/wizardex.cpp:383
+#: wizardex.cpp:383
 msgid "< &Back"
 msgstr ""
 
-#: clientgui/wizardex.cpp:553
+#: wizardex.cpp:553
 msgid "&Finish"
 msgstr ""
 
-#: clientgui/common/wxPieCtrl.cpp:64
-msgid "Pie Ctrl"
+#: mac/Mac_GUI.cpp:110
+msgid "Preferences…"
 msgstr ""
 
-#: clientgui/mac/Mac_GUI.cpp:35
+#: mac/Mac_GUI.cpp:122
 msgid "Services"
 msgstr ""
 
-#: clientgui/mac/Mac_GUI.cpp:36
+#: mac/Mac_GUI.cpp:144
 #, c-format
 msgid "Hide %s"
 msgstr ""
 
-#: clientgui/mac/Mac_GUI.cpp:37
+#: mac/Mac_GUI.cpp:158
 msgid "Hide Others"
 msgstr ""
 
-#: clientgui/mac/Mac_GUI.cpp:38
+#: mac/Mac_GUI.cpp:172
 msgid "Show All"
 msgstr ""
 
-#: clientgui/mac/Mac_GUI.cpp:39
+#: mac/Mac_GUI.cpp:186
 #, c-format
 msgid "Quit %s"
 msgstr ""
-
-#: clientgui/DlgAdvPreferences.h:30
-msgid "specify work start and stop hours in format HH:MM-HH:MM"
-msgstr ""
-
-#: clientgui/DlgAdvPreferences.h:31
-msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
-msgstr ""
-
diff --git a/locale/ms/BOINC-Setup.mo b/locale/ms/BOINC-Setup.mo
index a044777..6b90fe4 100644
Binary files a/locale/ms/BOINC-Setup.mo and b/locale/ms/BOINC-Setup.mo differ
diff --git a/locale/ms/BOINC-Setup.po b/locale/ms/BOINC-Setup.po
index 32de72f..701d86a 100755
--- a/locale/ms/BOINC-Setup.po
+++ b/locale/ms/BOINC-Setup.po
@@ -4,12 +4,12 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-01-26 00:00-0800\n"
-"PO-Revision-Date: 2015-02-11 23:28-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: ms\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,15 +21,11 @@ msgstr ""
 msgid "Sorry, this version of %s requires system 10.5 or higher."
 msgstr ""
 
-#: PostInstall.cpp:130
-#: PostInstall.cpp:1136
-#: uninstall.cpp:1618
+#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
 msgid "Yes"
 msgstr ""
 
-#: PostInstall.cpp:131
-#: PostInstall.cpp:1137
-#: uninstall.cpp:1619
+#: PostInstall.cpp:131 PostInstall.cpp:1137 uninstall.cpp:1619
 msgid "No"
 msgstr ""
 
@@ -40,9 +36,11 @@ msgstr ""
 #: PostInstall.cpp:1416
 #, c-format
 msgid ""
-"Users who are permitted to administer this computer will automatically be allowed to run and control %s.\n"
+"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?"
+"Do you also want non-administrative users to be able to run and control %s "
+"on this Mac?"
 msgstr ""
 
 #: PostInstall.cpp:1444
@@ -107,7 +105,8 @@ msgstr ""
 #: uninstall.cpp:840
 #, c-format
 msgid ""
-"Enter your administrator password to completely remove %s from you computer.\n"
+"Enter your administrator password to completely remove %s from you "
+"computer.\n"
 "\n"
 msgstr ""
 
@@ -118,4 +117,3 @@ msgstr ""
 #: uninstall.cpp:1617
 msgid "Continue..."
 msgstr ""
-
diff --git a/locale/ms/BOINC-Web.mo b/locale/ms/BOINC-Web.mo
index 634472c..032b02f 100644
Binary files a/locale/ms/BOINC-Web.mo and b/locale/ms/BOINC-Web.mo differ
diff --git a/locale/ms/BOINC-Web.po b/locale/ms/BOINC-Web.po
index 291627b..9430f5a 100755
--- a/locale/ms/BOINC-Web.po
+++ b/locale/ms/BOINC-Web.po
@@ -5,16 +5,17 @@
 # Lee Hanxue <leehanxue at gmail.com>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\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-11 23:31-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: 2014-04-30 00:14+0800\n"
+"Last-Translator: Lee Hanxue <leehanxue at gmail.com>\n"
+"Language-Team: None\n"
 "Language: ms\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
@@ -32,8 +33,12 @@ msgid "This page is %stranslatable%s."
 msgstr "Laman ini %sboleh diterjemah%s."
 
 #: download.php:39
-msgid "We recommend that you also install VirtualBox, so your computer can work on science projects that require it."
-msgstr "Kami mengesyor anda untuk memasang VirtualBox supaya komputer anda boleh digunakan oleh projek-projek sains yang memerlukannya."
+msgid ""
+"We recommend that you also install VirtualBox, so your computer can work on "
+"science projects that require it."
+msgstr ""
+"Kami mengesyor anda untuk memasang VirtualBox supaya komputer anda boleh "
+"digunakan oleh projek-projek sains yang memerlukannya."
 
 #: download.php:41
 msgid "Learn more about VirtualBox."
@@ -43,14 +48,12 @@ msgstr "Mengetahui lebih lanjut tentang VirtualBox."
 msgid "Download BOINC + VirtualBox"
 msgstr "Muat turun BOINC + VirtualBox"
 
-#: download.php:54
-#: download.php:69
+#: download.php:54 download.php:69
 #, php-format
 msgid "for %s"
 msgstr "untuk %s"
 
-#: download.php:57
-#: download.php:72
+#: download.php:57 download.php:72
 #, php-format
 msgid "BOINC version %s"
 msgstr "BOINC versi %s"
@@ -65,20 +68,38 @@ msgid "Download BOINC"
 msgstr "Muat turun BOINC"
 
 #: download.php:123
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others."
-msgstr "BOINC adalah perisian yang membolehkan anda menderma masa melahu (lapang) komputer kepada projek-projek sains seperti SETI at home, Climateprediction.net, Rosetta at home, World Community Grid dan lain-lain."
+msgid ""
+"BOINC is a program that lets you donate your idle computer time to science "
+"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, and many others."
+msgstr ""
+"BOINC adalah perisian yang membolehkan anda menderma masa melahu (lapang) "
+"komputer kepada projek-projek sains seperti SETI at home, "
+"Climateprediction.net, Rosetta at home, World Community Grid dan lain-lain."
 
 #: download.php:125
-msgid "After installing BOINC on your computer, you can connect it to as many of these projects as you like."
-msgstr "Selepas memasang BOINC di komputer, anda boleh menghubungkannya kepada seberapa projek berikut yang anda mahu."
+msgid ""
+"After installing BOINC on your computer, you can connect it to as many of "
+"these projects as you like."
+msgstr ""
+"Selepas memasang BOINC di komputer, anda boleh menghubungkannya kepada "
+"seberapa projek berikut yang anda mahu."
 
 #: download.php:127
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
-msgstr "Anda hanya boleh beroperasi perisian ini di komputer hanya jika anda memilikinya, atau mempunyai kebenaran daripada pemilik komputer."
+msgid ""
+"You may run this software on a computer only if you own the computer or have "
+"the permission of its owner."
+msgstr ""
+"Anda hanya boleh beroperasi perisian ini di komputer hanya jika anda "
+"memilikinya, atau mempunyai kebenaran daripada pemilik komputer."
 
 #: download.php:132
-msgid "We recommend that you download BOINC from the Google Play Store or Amazon Appstore, not from here."
-msgstr "Kami mengesyor anda muat turun BOINC daripada Google Play Store atau Amazon Appstore, bukannya daripada sini."
+msgid ""
+"We recommend that you download BOINC from the Google Play Store or Amazon "
+"Appstore, not from here."
+msgstr ""
+"Kami mengesyor anda muat turun BOINC daripada Google Play Store atau Amazon "
+"Appstore, bukannya daripada sini."
 
 #: download.php:167
 msgid "System requirements"
@@ -88,8 +109,7 @@ msgstr "Keperluan sistem"
 msgid "Release notes"
 msgstr "Nota keluaran"
 
-#: download.php:169
-#: index.php:86
+#: download.php:169 index.php:86
 msgid "Help"
 msgstr "Bantuan"
 
@@ -111,21 +131,49 @@ msgstr "BOINC: perkiraan untuk sains"
 
 #: help.php:12
 #, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
-msgstr "Bantuan online BOINC membolehkan anda bercakap satu-persatu dengan pengguna BOINC berpengalaman, yang boleh: %s menjawab soalan-soalan tentang BOINC dan pengkomputeran sukarelawan; %s membimbing anda melalui proses pemasangan serta penggunaan BOINC; %s menyelesaikan sebarang masalah yang anda mungkin hadapi."
+msgid ""
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who "
+"can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"through the process of installing and using BOINC; %s troubleshoot any "
+"problems you might have."
+msgstr ""
+"Bantuan online BOINC membolehkan anda bercakap satu-persatu dengan pengguna "
+"BOINC berpengalaman, yang boleh: %s menjawab soalan-soalan tentang BOINC dan "
+"pengkomputeran sukarelawan; %s membimbing anda melalui proses pemasangan "
+"serta penggunaan BOINC; %s menyelesaikan sebarang masalah yang anda mungkin "
+"hadapi."
 
 #: help.php:21
 #, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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 "Bantuan online BOINC berdasarkan %sSkype%s, satu sistem telefon berinternet. Skype adalah percuma (perisian serta panggilan). Jika anda belum ada Skype, sila %smuat turun dan pasangkannya sekarang%s. Setelah selesai, kembali ke laman ini."
+msgid ""
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. "
+"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 ""
+"Bantuan online BOINC berdasarkan %sSkype%s, satu sistem telefon berinternet. "
+"Skype adalah percuma (perisian serta panggilan). Jika anda belum ada Skype, "
+"sila %smuat turun dan pasangkannya sekarang%s. Setelah selesai, kembali ke "
+"laman ini."
 
 #: help.php:28
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
-msgstr "Cara terbaik mendapat pertolongan adalah melalui panggilan, dimana anda memerlukan mikrofon bina dalam dan speaker ataupun headset luaran untuk komputer anda. Anda juga boleh menggunakan sistem chat berasaskan teks atau emel (jika anda tiada Skype) untuk berhubung dengan Sukarelawan Bantuan."
+msgid ""
+"The best way to get help is by voice, for which you need either built-in "
+"microphone and speakers or an external headset for your computer.  You can "
+"also use Skype's text-based chat system or regular email (if you don't have "
+"Skype) to communicate with Help Volunteers."
+msgstr ""
+"Cara terbaik mendapat pertolongan adalah melalui panggilan, dimana anda "
+"memerlukan mikrofon bina dalam dan speaker ataupun headset luaran untuk "
+"komputer anda. Anda juga boleh menggunakan sistem chat berasaskan teks atau "
+"emel (jika anda tiada Skype) untuk berhubung dengan Sukarelawan Bantuan."
 
 #: help.php:31
-msgid "Volunteers speaking several languages are available. Please select a language:"
-msgstr "Sukarelawan yang bertutur pelbagai bahasa boleh didapati. Sila pilih bahasa:"
+msgid ""
+"Volunteers speaking several languages are available. Please select a "
+"language:"
+msgstr ""
+"Sukarelawan yang bertutur pelbagai bahasa boleh didapati. Sila pilih bahasa:"
 
 #: help.php:47
 msgid "Be a Help Volunteer"
@@ -133,21 +181,36 @@ msgstr "Jadilah Bantuan Sukarelawan"
 
 #: help.php:50
 #, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
-msgstr "Jika anda pengguna BOINC yang berpengalaman, kami menggalakkan anda %smenjadi Sukarelawan Bantuan%s. Ini merupakan cara baik untuk mendorong penyelidikan saintifik dan perkomputeran sukarelawan - lagipun ia menyeronokkan!"
+msgid ""
+"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+"Volunteer%s.  It's a great way to help the cause of scientific research and "
+"volunteer computing - and it's fun!"
+msgstr ""
+"Jika anda pengguna BOINC yang berpengalaman, kami menggalakkan anda %menjadi "
+"Sukarelawan Bantuan%s. Ini merupakan cara baik untuk mendorong penyelidikan "
+"saintifik dan perkomputeran sukarelawan - lagipun ia menyeronokkan!"
 
 #: help.php:56
 #, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
-msgstr "Jika anda adalah Sukarelawan Bantuan: %sklik disini%s untuk kemas kini tetapan anda."
+msgid ""
+"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
+msgstr ""
+"Jika anda adalah Sukarelawan Bantuan: %sklik disini%s untuk kemas kini "
+"tetapan anda."
 
 #: help_funcs.php:107
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
-msgstr "Pembantu BOINC merupakan sukarelawan tanpa gaji. Nasihat mereka tidak disahkan oleh BOINC ataupun University of California."
+msgid ""
+"BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
+"or the University of California."
+msgstr ""
+"Pembantu BOINC merupakan sukarelawan tanpa gaji. Nasihat mereka tidak "
+"disahkan oleh BOINC ataupun University of California."
 
 #: help_funcs.php:110
 msgid "%1Never%2 give email address or password information to BOINC helpers."
-msgstr "%1Jangan sesekali%2 memberi alamat emel atau kata laluan kepada pembantu BOINC."
+msgstr ""
+"%1Jangan sesekali%2 memberi alamat emel atau kata laluan kepada pembantu "
+"BOINC."
 
 #: index.php:24
 msgid "Computing power"
@@ -193,9 +256,7 @@ msgstr "Sukarelawan"
 msgid "Download"
 msgstr "Muat Turun"
 
-#: index.php:87
-#: index.php:120
-#: index.php:171
+#: index.php:87 index.php:120 index.php:171
 msgid "Documentation"
 msgstr "Dokumentasi"
 
@@ -208,8 +269,14 @@ msgid "Links"
 msgstr "Pautan"
 
 #: index.php:94
-msgid "Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:"
-msgstr "Guna masa melahu komputer anda (Windows, Mac, Linux atau Android) untuk menyembuhkan penyakit, mendalami global warming, meneroka pulsar, dan penyelidikan sains yang lain. Ia selamat, dan senang:"
+msgid ""
+"Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure "
+"diseases, study global warming, discover pulsars, and do many other types of "
+"scientific research.  It's safe, secure, and easy:"
+msgstr ""
+"Guna masa melahu komputer anda (Windows, Mac, Linux atau Android) untuk "
+"menyembuhkan penyakit, mendalami global warming, meneroka pulsar, dan "
+"penyelidikan sains yang lain. Ia selamat, dan senang:"
 
 #: index.php:96
 msgid "Choose projects"
@@ -225,8 +292,12 @@ msgstr "Sila isi alamat emel dan kata laluan."
 
 #: index.php:102
 #, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
-msgstr "Ataupun, jika anda beroperasi beberapa projek, cuba satu %spengurus akaun%s seperti %sGridRepublic%s atau %sBAM!%s."
+msgid ""
+"Or, if you run several projects, try an %saccount manager%s such as %"
+"sGridRepublic%s or %sBAM!%s. "
+msgstr ""
+"Ataupun, jika anda beroperasi beberapa projek, cuba satu %spengurus akaun%s "
+"seperti %sGridRepublic%s atau %sBAM!%s."
 
 #: index.php:118
 msgid "Compute with BOINC"
@@ -237,16 +308,25 @@ msgid "Software updates"
 msgstr "Kemaskini Perisian"
 
 #: index.php:128
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
-msgstr "%1Para saintis%2: gunakan BOINC untuk mewujudkan %3projek perkomputeran sukarelawan%4 memberikan anda kuasa perkomputeran beribu-ribu CPU."
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving "
+"you the computing power of thousands of CPUs."
+msgstr ""
+"%1Para saintis%2: gunakan BOINC untuk mewujudkan %3projek perkomputeran "
+"sukarelawan%4 memberikan anda kuasa perkomputeran beribu-ribu CPU."
 
 #: index.php:132
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
-msgstr "%1Universiti-universiti%2: gunakan BOINC untuk mewujudkan %3Virtual Campus Supercomputing Center%4."
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
+msgstr ""
+"%1Universiti-universiti%2: gunakan BOINC untuk mewujudkan %3Virtual Campus "
+"Supercomputing Center%4."
 
 #: index.php:137
 msgid "%1Companies%2: use BOINC for %3desktop Grid computing%4."
-msgstr "%1Syarikat-syarikat%2: gunakan BOINC untuk %3Perkomputeran Grid desktop%4."
+msgstr ""
+"%1Syarikat-syarikat%2: gunakan BOINC untuk %3Perkomputeran Grid desktop%4."
 
 #: index.php:149
 msgid "The BOINC project"
@@ -314,8 +394,11 @@ msgstr "API untuk perisian tambahan"
 
 #: index.php:217
 #, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
-msgstr "Perisian sumber terbuka untuk %sperkomputeran sukarelawan%s dan %sperkomputeran grid%s."
+msgid ""
+"Open-source software for %svolunteer computing%s and %sgrid computing%s."
+msgstr ""
+"Perisian sumber terbuka untuk %sperkomputeran sukarelawan%s dan %"
+"sperkomputeran grid%s."
 
 #: index.php:230
 msgid "BOINC is based at The University of California, Berkeley"
@@ -334,8 +417,14 @@ msgid "Seismology"
 msgstr "Bidang seismologi"
 
 #: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
-msgstr "The Quake-Catcher Network sedang membina rangkaian seismik terbesar sedunia menggunakan sensor yang dilampirkan kepada komputer berinternet. Anda mesti membeli sensor untuk menyerta."
+msgid ""
+"The Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to Internet-connected computers.  You must buy a "
+"sensor to participate."
+msgstr ""
+"The Quake-Catcher Network sedang membina rangkaian seismik terbesar sedunia "
+"menggunakan sensor yang dilampirkan kepada komputer berinternet. Anda mesti "
+"membeli sensor untuk menyerta."
 
 #: projects.inc:27
 msgid "BOINC Poland Foundation"
@@ -346,23 +435,29 @@ msgid "Environmental research"
 msgstr "Penyelidikan alam sekitar"
 
 #: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
-msgstr "Projek ini mewujudkan peta tahap radiasi sentiasa kemas kini dengan menggunakan sensor yang disambungkan kepada komputer sukarelawan. Anda mesti membeli sensor untuk menyerta."
+msgid ""
+"This project is creating a free and continuously updated map of radiation "
+"levels by using sensors connected to volunteers' computers.  You must buy a "
+"sensor to participate."
+msgstr ""
+"Projek ini mewujudkan peta tahap radiasi sentiasa kemas kini dengan "
+"menggunakan sensor yang disambungkan kepada komputer sukarelawan. Anda mesti "
+"membeli sensor untuk menyerta."
 
 #: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
-msgstr "Anda mesti membeli sensor dan menyambungkannya kepada komputer anda jikalau anda ingin meyertai projek-projek ini."
+msgid ""
+"To participate in these projects you must buy a sensor and attach it to your "
+"computer."
+msgstr ""
+"Anda mesti membeli sensor dan menyambungkannya kepada komputer anda jikalau "
+"anda ingin meyertai projek-projek ini."
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
 msgstr "Sains kognitif artificial intelligence"
 
-#: projects.inc:60
-#: projects.inc:364
-#: projects.inc:408
-#: projects.inc:457
-#: projects.inc:464
-#: projects.inc:511
+#: projects.inc:60 projects.inc:364 projects.inc:408 projects.inc:457
+#: projects.inc:464 projects.inc:511
 msgid "Private"
 msgstr "Peribadi"
 
@@ -371,8 +466,16 @@ msgid "Artificial intelligence"
 msgstr ""
 
 #: projects.inc:62
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
-msgstr "Rangkaian semantik penghuraian dan pengubahan untuk digunakan di FreeHAL, artificial intelligence yang menggunakan rangkaian semantik, stemmers, sebahagian daripada pangkalan data pertuturan, dan sebahagian daripada speech taggers untuk meniru tingkah laku perbualan manusia."
+msgid ""
+"Parse and convert semantic nets for use in FreeHAL, an artificial "
+"intelligence that uses semantic networks, stemmers, part of speech "
+"databases, and part of speech taggers in order to imitate human behavior in "
+"conversations."
+msgstr ""
+"Rangkaian semantik penghuraian dan pengubahan untuk digunakan di FreeHAL, "
+"artificial intelligence yang menggunakan rangkaian semantik, stemmers, "
+"sebahagian daripada pangkalan data pertuturan, dan sebahagian daripada "
+"speech taggers untuk meniru tingkah laku perbualan manusia."
 
 #: projects.inc:69
 msgid "Biology and Medicine"
@@ -387,8 +490,19 @@ msgid "Antimalarial drug discovery"
 msgstr "Penyelidikan ubat anti malaria"
 
 #: projects.inc:84
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
-msgstr "Parasit yang menyebabkan malaria berevolusi rintangan ke atas ubat-ubat sedia ada. Kami perlu segera meneroka ubat-ubat baru untuk menggantikan ubat-ubat sedia ada. Lebih penting lagi, ubat-ubat baru mesti ada sasaran protein-protein baru di dalam parasit. Projek FightMalaria at Home bertujuan mencari sasaran-sasaran baru ini. "
+msgid ""
+"The parasite that causes malaria continues to evolve resistance to available "
+"medication. We therefore urgently need to discover new drugs to replace "
+"existing drugs. Importantly, these new drugs need to target NEW proteins in "
+"the parasite. The FightMalaria at Home project is aimed at finding these new "
+"targets."
+msgstr ""
+"\n"
+"Parasit yang menyebabkan malaria berevolusi rintangan ke atas ubat-ubat "
+"sedia ada. Kami perlu segera meneroka ubat-ubat baru untuk menggantikan "
+"ubat-ubat sedia ada. Lebih penting lagi, ubat-ubat baru mesti ada sasaran "
+"protein-protein baru di dalam parasit. Projek FightMalaria at Home bertujuan "
+"mencari sasaran-sasaran baru ini. "
 
 #: projects.inc:90
 msgid "University of Karlsruhe (Germany)"
@@ -399,8 +513,19 @@ msgid "Protein structure prediction"
 msgstr "Ramalan struktur protein"
 
 #: projects.inc:92
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
-msgstr "POEM at HOME menggunakan kaedah perkomputeran untuk meramal struktur aktif biologi protein, memahami mekanisme isyarat pemprosesan ketika protein berinteraksi antara satu sama lain, memahami penyakit-penyakit yang berkaitan dengan kerosakan atau pengumpulan protein, dan untuk menyelidiki uabat-ubat baru berdasarkan struktur tiga dimensi protein-protein yang penting daripada segi biologi."
+msgid ""
+"POEM at HOME uses a computational approach to predict the biologically active "
+"structure of proteins, to understand the signal-processing mechanisms when "
+"the proteins interact with one another, to understand diseases related to "
+"protein malfunction or aggregation, and to develop new drugs on the basis of "
+"the three-dimensions structure of biologically important proteins."
+msgstr ""
+"POEM at HOME menggunakan kaedah perkomputeran untuk meramal struktur aktif "
+"biologi protein, memahami mekanisme isyarat pemprosesan ketika protein "
+"berinteraksi antara satu sama lain, memahami penyakit-penyakit yang "
+"berkaitan dengan kerosakan atau pengumpulan protein, dan untuk menyelidiki "
+"uabat-ubat baru berdasarkan struktur tiga dimensi protein-protein yang "
+"penting daripada segi biologi."
 
 #: projects.inc:98
 msgid "University of Delaware"
@@ -411,8 +536,15 @@ msgid "Study of protein - ligand interactions"
 msgstr "Pemahaman protein - interaksi ligand"
 
 #: projects.inc:100
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
-msgstr "Docking at Home mempunyai matlamat biosains dan sains komputer. Projek ini bertujuan mendalami butiran atom interaksi protein-ligand, dengan berbuat demikian dapat mendapat pengertian untuk penemuan baru farmaseutikal."
+msgid ""
+"Docking at Home has both bioscience and computer science goals. The project "
+"aims to further knowledge of the atomic details of protein-ligand "
+"interactions and, by doing so, will search for insights into the discovery "
+"of novel pharmaceuticals."
+msgstr ""
+"Docking at Home mempunyai matlamat biosains dan sains komputer. Projek ini "
+"bertujuan mendalami butiran atom interaksi protein-ligand, dengan berbuat "
+"demikian dapat mendapat pengertian untuk penemuan baru farmaseutikal."
 
 #: projects.inc:114
 msgid "Barcelona Biomedical Research Park (PRBB)"
@@ -423,8 +555,16 @@ msgid "Molecular simulations of proteins"
 msgstr "Simulasi molekul protein"
 
 #: projects.inc:116
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
-msgstr "GPUGrid.net mewujudkan senario perkomputeran baru oleh kod full-atom molecular dinamik pertama (CellMD) yang dioptimum khas untuk GPU NVIDIA. Perisian bioperubatan baru menjadi nyata, mewujudkan peranan baru kepada perkomputeran biologi untuk penyelidikan bioperubatan."
+msgid ""
+"GPUGrid.net opens novel computational scenarios by the first full-atom "
+"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
+"New biomedical applications suddenly become possible giving a new role to "
+"computational biology for biomedical research."
+msgstr ""
+"GPUGrid.net mewujudkan senario perkomputeran baru oleh kod full-atom "
+"molecular dinamik pertama (CellMD) yang dioptimum khas untuk GPU NVIDIA. "
+"Perisian bioperubatan baru menjadi nyata, mewujudkan peranan baru kepada "
+"perkomputeran biologi untuk penyelidikan bioperubatan."
 
 #: projects.inc:122
 msgid "Technion, Israel"
@@ -435,20 +575,35 @@ msgid "Genetic linkage analysis"
 msgstr "Analisis hubungan genetik"
 
 #: projects.inc:124
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
-msgstr "Superlink at Technion membantu pakar genetik di seluruh dunia mencari gen penimbul penyakit yang menyebabkan sesetengah kencing manis, tekanan darah tinggi, kanser, skizofrenia dan lain-lain."
+msgid ""
+"Superlink at Technion helps geneticists all over the world find disease-"
+"provoking genes causing some types of diabetes, hypertension (high blood "
+"pressure), cancer, schizophrenia and many others."
+msgstr ""
+"Superlink at Technion membantu pakar genetik di seluruh dunia mencari gen "
+"penimbul penyakit yang menyebabkan sesetengah kencing manis, tekanan darah "
+"tinggi, kanser, skizofrenia dan lain-lain."
 
 #: projects.inc:138
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
-msgstr "University of Maryland Center for Bioinformatics and Computational Biology"
+msgid ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
+msgstr ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
 
 #: projects.inc:139
 msgid "Life science research"
 msgstr "Penyelidikan sains kehidupan"
 
 #: projects.inc:140
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
-msgstr "Projek Lattice menyumbangkan kuasa perkomputeran kepada ahli-ahli sains di University of Maryland yang mengaji hubungan evolusi berdasarkan pada data jujukan DNA; keragaman flora dan fauna di simpanan alam semula jadi."
+msgid ""
+"The Lattice Project supplies computing power to scientists at the University "
+"of Maryland studying evolutionary relationships based on DNA sequence data; "
+"bacterial, plasmid, and virus protein sequences; and biological diversity in "
+"nature reserves. "
+msgstr ""
+"Projek Lattice menyumbangkan kuasa perkomputeran kepada ahli-ahli sains di "
+"University of Maryland yang mengaji hubungan evolusi berdasarkan pada data "
+"jujukan DNA; keragaman flora dan fauna di simpanan alam semula jadi."
 
 #: projects.inc:146
 msgid "The Swiss Tropical Institute"
@@ -459,29 +614,60 @@ msgid "Epidemiology"
 msgstr "Epidemiologi"
 
 #: projects.inc:148
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
-msgstr "Model simulasi dinamik jangkitan dan kesan kesihatan malaria adalah kaedah penting untuk mengawal malaria. Model simulasi boleh digunakan untuk menentukan strategi yang optimum untuk menghantar kelambu, kemoterapi, atau vaksin baru yang sedang diselidiki dan diuji. Pemodelan begini menggunakan komputer secara intensif, memerlukan simulasi populasi manusia yang besar dengan pelbagai set parameter yang berkaitan dengan faktor-faktor biologi dan sosial yang mempengaruhi taburan peny [...]
+msgid ""
+"Simulation models of the transmission dynamics and health effects of malaria "
+"are an important tool for malaria control. They can be used to determine "
+"optimal strategies for delivering mosquito nets, chemotherapy, or new "
+"vaccines which are currently under development and testing.  Such modeling "
+"is extremely computer intensive, requiring simulations of large human "
+"populations with a diverse set of parameters related to biological and "
+"social factors that influence the distribution of the disease. "
+msgstr ""
+"Model simulasi dinamik jangkitan dan kesan kesihatan malaria adalah kaedah "
+"penting untuk mengawal malaria. Model simulasi boleh digunakan untuk "
+"menentukan strategi yang optimum untuk menghantar kelambu, kemoterapi, atau "
+"vaksin baru yang sedang diselidiki dan diuji. Pemodelan begini menggunakan "
+"komputer secara intensif, memerlukan simulasi populasi manusia yang besar "
+"dengan pelbagai set parameter yang berkaitan dengan faktor-faktor biologi "
+"dan sosial yang mempengaruhi taburan penyakit ini. "
 
 #: projects.inc:170
 msgid "University of Washington"
 msgstr "University of Washington"
 
-#: projects.inc:171
-#: projects.inc:179
+#: projects.inc:171 projects.inc:179
 msgid "Biology"
 msgstr "Biologi"
 
 #: projects.inc:172
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
-msgstr "Tentukan bentuk-bentuk protein 3-dimensi yang diselidiki, yang boleh akhirnya berhasil mencari penawar untuk beberapa penyakit serius. Dengan beroperasi Rosetta at home, anda membantu mempercepatkan dan melanjutkan penyelidikan kami dengan kaedah yang kami tidak mungkin cuba tanpa sumbangan anda. Anda juga membantu kami mereka bentuk protein-protein baru untuk melawan penyakit seperti HIV, Malaria, Kanser dan penyakit Alzheimer"
+msgid ""
+"Determine the 3-dimensional shapes of proteins in research that may "
+"ultimately lead to finding cures for some major human diseases. By running "
+"Rosetta at home you will help us speed up and extend our research in ways we "
+"couldn't possibly attempt without your help. You will also be helping our "
+"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
+"Cancer, and Alzheimer's"
+msgstr ""
+"Tentukan bentuk-bentuk protein 3-dimensi yang diselidiki, yang boleh "
+"akhirnya berhasil mencari penawar untuk beberapa penyakit serius. Dengan "
+"beroperasi Rosetta at home, anda membantu mempercepatkan dan melanjutkan "
+"penyelidikan kami dengan kaedah yang kami tidak mungkin cuba tanpa sumbangan "
+"anda. Anda juga membantu kami mereka bentuk protein-protein baru untuk "
+"melawan penyakit seperti HIV, Malaria, Kanser dan penyakit Alzheimer"
 
 #: projects.inc:178
 msgid "University of Vienna"
 msgstr "University of Vienna"
 
 #: projects.inc:180
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
-msgstr "Kira persamaan di antara protein. SIMAP memaparkan pangkalan data awam hasil data, yang memainkan peranan penting dalam projek-projek penyelidikan bioinformatik."
+msgid ""
+"Calculate similarities between proteins. SIMAP provides a public database of "
+"the resulting data, which plays a key role in many bioinformatics research "
+"projects."
+msgstr ""
+"Kira persamaan di antara protein. SIMAP memaparkan pangkalan data awam hasil "
+"data, yang memainkan peranan penting dalam projek-projek penyelidikan "
+"bioinformatik."
 
 #: projects.inc:186
 msgid "Earth Sciences"
@@ -496,7 +682,15 @@ msgid "Climate study"
 msgstr "Kajian iklim"
 
 #: projects.inc:200
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
+msgid ""
+"Investigate the approximations that have to be made in state-of-the-art "
+"climate models. By running the model thousands of times we hope to find out "
+"how the model responds to slight tweaks to these approximations - slight "
+"enough to not make the approximations any less realistic. This will allow us "
+"to improve our understanding of how sensitive our models are to small "
+"changes and also to things like changes in carbon dioxide and the sulphur "
+"cycle. This will allow us to explore how climate may change in the next "
+"century under a wide range of different scenarios."
 msgstr ""
 
 #: projects.inc:207
@@ -508,30 +702,46 @@ msgid "Mechanical engineering"
 msgstr ""
 
 #: projects.inc:214
-msgid "Currently we are calculating the optimum design of a structure call the 52 bar truss"
-msgstr "Pada masa ini kami sedang mengira reka bentuk optimum suatu struktur yang dipanggil 52 bar truss"
+msgid ""
+"Currently we are calculating the optimum design of a structure call the 52 "
+"bar truss"
+msgstr ""
+"Pada masa ini kami sedang mengira reka bentuk optimum suatu struktur yang "
+"dipanggil 52 bar truss"
 
-#: projects.inc:224
-#: projects.inc:263
-#: projects.inc:271
+#: projects.inc:224 projects.inc:263 projects.inc:271
 msgid "Astronomy"
 msgstr "Astronomi"
 
 #: projects.inc:225
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
+msgid ""
+"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
+"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
+"Universe. We will measure physical parameters (such as stellar mass surface "
+"density, star formation rate surface density, attenuation, and first-order "
+"star formation history) on a resolved pixel-by-pixel basis using spectral "
+"energy distribution (SED) fitting techniques in a distributed computing mode."
 msgstr ""
 
 #: projects.inc:247
 msgid "University of Texas at Austin"
 msgstr "University of Texas at Austin"
 
-#: projects.inc:248
-#: projects.inc:279
+#: projects.inc:248 projects.inc:279
 msgid "Chemistry"
 msgstr "Kimia"
 
 #: projects.inc:249
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
+msgid ""
+"A common problem in theoretical chemistry, condensed matter physics and "
+"materials science is the calculation of the time evolution of an atomic "
+"scale system where, for example, chemical reactions and/or diffusion occur. "
+"Generally the events of interest are quite rare (many orders of magnitude "
+"slower than the vibrational movements of the atoms), and therefore direct "
+"simulations, tracking every movement of the atoms, would take thousands of "
+"years of computer calculations on the fastest present day computer before a "
+"single event of interest can be expected to occur.  Our research group is "
+"interested in calculating the long time dynamics of systems."
 msgstr ""
 
 #: projects.inc:262
@@ -539,23 +749,41 @@ msgid "University of Illinois at Urbana-Champaign"
 msgstr "University of Illinois at Urbana-Champaign"
 
 #: projects.inc:264
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
-msgstr "Cosmology at Home bertujuan mencari model terbaik yang menggambarkan Alam Semesta kita, dan mencari lingkungan model yang bersetuju degan data fizik partikel astronomi sedia ada."
+msgid ""
+"The goal of Cosmology at Home is to search for the model that best describes "
+"our Universe and to find the range of models that agree with the available "
+"astronomical particle physics data."
+msgstr ""
+"Cosmology at Home bertujuan mencari model terbaik yang menggambarkan Alam "
+"Semesta kita, dan mencari lingkungan model yang bersetuju degan data fizik "
+"partikel astronomi sedia ada."
 
 #: projects.inc:270
 msgid "Rensselaer Polytechnic Institute"
 msgstr "Rensselaer Polytechnic Institute"
 
 #: projects.inc:272
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
-msgstr "Matlamat Milkyway at Home adalah untuk mewujudkan model tiga dimensi galaksi Bima Sakti yang sangat tepat dengan menggunakan data yang dikumpul oleh Kajian Sloan Digital Sky."
+msgid ""
+"The goal of Milkyway at Home is to create a highly accurate three dimensional "
+"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
+"Survey."
+msgstr ""
+"Matlamat Milkyway at Home adalah untuk mewujudkan model tiga dimensi galaksi "
+"Bima Sakti yang sangat tepat dengan menggunakan data yang dikumpul oleh "
+"Kajian Sloan Digital Sky."
 
 #: projects.inc:278
 msgid "Leiden University, The Netherlands"
 msgstr "Leiden University, The Netherlands"
 
 #: projects.inc:280
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
+msgid ""
+"Surface science calculations using Classical Dynamics.  Leiden Classical "
+"allows volunteers, students and other scientist to submit their personal "
+"calculations to the grid. Each user has his own personal queue for Classical "
+"Dynamics jobs. In this way students have used the grid to simulate liquid "
+"argon, or to test the validity of the ideal gas law by actually doing the "
+"simulations through the grid."
 msgstr ""
 
 #: projects.inc:294
@@ -567,26 +795,40 @@ msgid "Astrophysics"
 msgstr "Astrofizik"
 
 #: projects.inc:296
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
+msgid ""
+"Search for spinning neutron stars (also called pulsars) using data from the "
+"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
+"observatory.  Einstein at Home is a World Year of Physics 2005 project "
+"supported by the American Physical Society (APS) and by a number of "
+"international organizations."
 msgstr ""
 
-#: projects.inc:310
-#: projects.inc:318
+#: projects.inc:310 projects.inc:318
 msgid "CERN (European Organization for Nuclear Research)"
 msgstr "CERN (European Organization for Nuclear Research)"
 
-#: projects.inc:311
-#: projects.inc:319
+#: projects.inc:311 projects.inc:319
 msgid "Physics"
 msgstr "Fizik"
 
 #: projects.inc:312
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
+msgid ""
+"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
+"European Organization for Nuclear Research, the world's largest particle "
+"physics laboratory.  It is the most powerful instrument ever built to "
+"investigate on particles proprieties. LHC at home runs simulations to improve "
+"the design of LHC and its detectors."
 msgstr ""
 
 #: projects.inc:320
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
-msgstr "Projek ini menggunakan teknologi alam maya yang dimajukan oleh CERN untuk simulasi fizik peristiwa LHC sepenuhnya di komputer sukarelawan. Anda perlu memasang VirtualBox di komputer anda"
+msgid ""
+"This project uses CERN-developed virtual machine technology for full-fledged "
+"LHC event physics simulation on volunteer computers.  Requires that you "
+"install VirtualBox on your computer"
+msgstr ""
+"Projek ini menggunakan teknologi alam maya yang dimajukan oleh CERN untuk "
+"simulasi fizik peristiwa LHC sepenuhnya di komputer sukarelawan. Anda perlu "
+"memasang VirtualBox di komputer anda"
 
 #: projects.inc:326
 msgid "University of California, Berkeley"
@@ -597,7 +839,12 @@ msgid "Astrophysics, astrobiology"
 msgstr "Astrofizik, astrobiologi"
 
 #: projects.inc:328
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
+msgid ""
+"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
+"goal is to detect intelligent life outside Earth. One approach, known as "
+"radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
+"signals from space. Such signals are not known to occur naturally, so a "
+"detection would provide evidence of extraterrestrial technology."
 msgstr ""
 
 #: projects.inc:342
@@ -609,7 +856,11 @@ msgid "Chemical engineering and nanotechnology"
 msgstr "Kejuruteraan kimia dan nanoteknologi"
 
 #: projects.inc:344
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
+msgid ""
+"The study of molecular magnets and controlled nanoscale magnetism.  These "
+"magnetic molecules may be used to develop tiny magnetic switches, with "
+"applications in medicine (such as local tumor chemotherapy) and "
+"biotechnology."
 msgstr ""
 
 #: projects.inc:351
@@ -625,7 +876,10 @@ msgid "Physics, biochemistry, and others"
 msgstr "Fizik, biokimi dan lain-lain"
 
 #: projects.inc:358
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
+msgid ""
+"The objective of CAS at home is to encourage and assist scientists in China to "
+"adopt the technologies of volunteer computing and volunteer thinking for "
+"their research."
 msgstr ""
 
 #: projects.inc:365
@@ -633,11 +887,14 @@ msgid "Mathematics, physics, evolution"
 msgstr "Matematik, fizik, evolusi"
 
 #: projects.inc:366
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
-msgstr "Yoyo at home adalah penyesuai di antara BOINC dan beberapa projek perkomputeran sukarelawan sedia ada: ECM, Muon, Evolution at home, dan distributed.net"
+msgid ""
+"Yoyo at home is an adapter between BOINC and several existing volunteer "
+"computing projects: ECM, Muon, Evolution at home, and distributed.net"
+msgstr ""
+"Yoyo at home adalah penyesuai di antara BOINC dan beberapa projek perkomputeran "
+"sukarelawan sedia ada: ECM, Muon, Evolution at home, dan distributed.net"
 
-#: projects.inc:371
-#: projects.inc:527
+#: projects.inc:371 projects.inc:527
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 msgstr "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 
@@ -646,7 +903,11 @@ msgid "European research projects"
 msgstr "Projek-projek penyelidikan Eropah"
 
 #: projects.inc:373
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
+msgid ""
+"The EDGeS at Home Beta project integrates volunteer computing into the service "
+"grid network of Europe by allowing service grids to send workunits to be "
+"processed by the volunteers of this project. The scientific projects covered "
+"by the project include math, physics, biology, etc."
 msgstr ""
 
 #: projects.inc:379
@@ -670,7 +931,11 @@ msgid "Medical, environmental and other humanitarian research"
 msgstr "Penyelidikan perubatan, alam sekitar dan kemanusiaan"
 
 #: projects.inc:389
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
+msgid ""
+"To further critical non-profit research on some of humanity's most pressing "
+"problems by creating the world's largest volunteer computing grid.  Research "
+"includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"clean water and many more."
 msgstr ""
 
 #: projects.inc:395
@@ -689,27 +954,28 @@ msgstr "Matematik, Fizik, Kercerdesan Buatan"
 msgid "Simulation of quantum computing; Goldbach's conjecture."
 msgstr "Simulasi perkomputeran kuantum; Konjektur Goldbach."
 
-#: projects.inc:450
-#: projects.inc:458
+#: projects.inc:450 projects.inc:458
 msgid "Cryptography"
 msgstr "Kriptografi"
 
 #: projects.inc:459
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
-msgstr "Percubaan untuk memecah kod 3 mesej Enigma asal. Isyarat dipintas di Atlantik Utara di 1942 dan dipercayai belum dipecah."
-
-#: projects.inc:465
-#: projects.inc:504
-#: projects.inc:512
-#: projects.inc:520
-#: projects.inc:528
-#: projects.inc:568
+msgid ""
+"Attempt to decode 3 original Enigma messages. The signals were intercepted "
+"in the North Atlantic in 1942 and are believed to be unbroken."
+msgstr ""
+"Percubaan untuk memecah kod 3 mesej Enigma asal. Isyarat dipintas di "
+"Atlantik Utara di 1942 dan dipercayai belum dipecah."
+
+#: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
+#: projects.inc:528 projects.inc:568
 msgid "Mathematics"
 msgstr "Matematik"
 
 #: projects.inc:466
 msgid "Study the Collatz Conjecture, an unsolved conjecture in mathematics"
-msgstr "Mendakami Konjektur Collatz, satu konjektur matematik yang belum dapat diselesaikan"
+msgstr ""
+"Mendakami Konjektur Collatz, satu konjektur matematik yang belum dapat "
+"diselesaikan"
 
 #: projects.inc:471
 msgid "California State University Fullerton"
@@ -717,22 +983,40 @@ msgstr "California State University Fullerton"
 
 #: projects.inc:472
 msgid "Factorization of large integers"
-msgstr "Pemfaktoran integer besar"
+msgstr ""
+"\n"
+"Pemfaktoran integer besar"
 
 #: projects.inc:473
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
+msgid ""
+"NFS at Home is a research project that uses Internet-connected computers to do "
+"the lattice sieving step in the Number Field Sieve factorization of large "
+"integers. As a young school student, you gained your first experience at "
+"breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
+"NFS at Home is a continuation of that experience, only with integers that are "
+"hundreds of digits long."
 msgstr ""
 
 #: projects.inc:479
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
-msgstr "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
+msgid ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
+msgstr ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
 
 #: projects.inc:480
 msgid "Software testing"
-msgstr "Pengujian perisian"
+msgstr ""
+"\n"
+"Pengujian perisian"
 
 #: projects.inc:481
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
+msgid ""
+"The aim of this project is to provide a powerful distributed computing "
+"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
+"well as others Lithuanian academic institutions.  Current applications "
+"involve the study of Monte-Carlo based software testing."
 msgstr ""
 
 #: projects.inc:503
@@ -740,24 +1024,44 @@ msgid "Mathematical Institute of Leiden University / Kennislink"
 msgstr "Mathematical Institute of Leiden University / Kennislink"
 
 #: projects.inc:505
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
+msgid ""
+"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
+"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
+"product of the distinct prime factors of n. The ABC conjecture says that "
+"there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for "
+"any real h > 1. The ABC conjecture is currently one of the greatest open "
+"problems in mathematics. If it is proven to be true, a lot of other open "
+"problems can be answered directly from it."
 msgstr ""
 
 #: projects.inc:513
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
-msgstr "Primegrid mempunyai pelbagai projek yang mencari pelbagai bentuk nombor perdana yang sangat besar, termasuk mencari nombor perdana paling besar yang diketahui."
+msgid ""
+"Primegrid has multiple projects searching for different forms of very large "
+"prime numbers, including searching for the largest known prime number."
+msgstr ""
+"Primegrid mempunyai pelbagai projek yang mencari pelbagai bentuk nombor "
+"perdana yang sangat besar, termasuk mencari nombor perdana paling besar yang "
+"diketahui."
 
 #: projects.inc:519
 msgid "Hochschule RheinMain University of Applied Sciences"
 msgstr "Hochschule RheinMain University of Applied Sciences"
 
 #: projects.inc:521
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
-msgstr "Mencari contoh balas dua konjektur yang berkenaan dengan pengenalpastian nombor perdana"
+msgid ""
+"Search for counterexamples to two conjectures related to the identification "
+"of prime numbers"
+msgstr ""
+"Mencari contoh balas dua konjektur yang berkenaan dengan pengenalpastian "
+"nombor perdana"
 
 #: projects.inc:529
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
-msgstr "Cari semua sistem nombor binari umum (di mana nombor asas adalah matriks dan digit adalah vektor) sehingga 11 dimensi."
+msgid ""
+"Find all the generalized binary number systems (in which bases are matrices "
+"and digits are vectors) up to dimension 11."
+msgstr ""
+"Cari semua sistem nombor binari umum (di mana nombor asas adalah matriks dan "
+"digit adalah vektor) sehingga 11 dimensi."
 
 #: ../html/inc/news.inc:40
 msgid "Comment"
@@ -767,4 +1071,3 @@ msgstr "Komen"
 #, php-format
 msgid "News is available as an %sRSS feed%s"
 msgstr "Berita boleh didapati sebagai %ssuapan RSS%s"
-
diff --git a/locale/nb/BOINC-Client.mo b/locale/nb/BOINC-Client.mo
index ae0b364..5025586 100644
Binary files a/locale/nb/BOINC-Client.mo and b/locale/nb/BOINC-Client.mo differ
diff --git a/locale/nb/BOINC-Client.po b/locale/nb/BOINC-Client.po
old mode 100755
new mode 100644
index 88e457b..243ff6e
--- a/locale/nb/BOINC-Client.po
+++ b/locale/nb/BOINC-Client.po
@@ -1,24 +1,23 @@
 # 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: BOINC 7.4\n"
+"Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-10-15 22:25-0700\n"
-"PO-Revision-Date: 2015-02-11 23:50-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: nb\n"
+"PO-Revision-Date: 2015-02-23 23:14+0000\n"
+"Last-Translator: Rom Walton\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/boinc/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-POOTLE-MTIME: 1409630049.0\n"
+"Language: nb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: acct_mgr.cpp:450
-#: acct_mgr.cpp:459
+#: acct_mgr.cpp:450 acct_mgr.cpp:459
 msgid "Message from account manager"
 msgstr "Melding fra kontobehandler"
 
@@ -27,7 +26,9 @@ msgid "Message from server"
 msgstr "Melding fra tjener"
 
 #: client_state.cpp:258
-msgid "Some tasks need more memory than allowed by your preferences.  Please check the preferences."
+msgid ""
+"Some tasks need more memory than allowed by your preferences.  Please check "
+"the preferences."
 msgstr "Noen oppgaver trenger mer minne enn tillatt utfra dine innstillinger.  Vennligst kontroller innstillinger."
 
 #: client_state.cpp:520
@@ -40,11 +41,12 @@ msgstr "HTTP_PROXY variabelen må spesifisere en HTTP mellomtjener"
 
 #: cs_scheduler.cpp:613
 #, c-format
-msgid "You used the wrong URL for this project.  When convenient, remove this project, then add %s"
+msgid ""
+"You used the wrong URL for this project.  When convenient, remove this "
+"project, then add %s"
 msgstr "Du brukte en gal nettadresse for dette prosjektet, fjern dette prosjektet og legg til %s"
 
-#: cs_statefile.cpp:828
-#: ../sched/sched_types.cpp:259
+#: cs_statefile.cpp:828 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
 msgstr "Syntaksfeil i app_info.xml"
 
@@ -56,18 +58,15 @@ msgstr "Filen det vises til i app_info.xml eksisterer ikke:"
 msgid "A new version of BOINC is available."
 msgstr "En ny versjon av BOINC er tilgjengelig."
 
-#: current_version.cpp:94
-#: current_version.cpp:102
+#: current_version.cpp:94 current_version.cpp:102
 msgid "Download"
 msgstr "Last ned"
 
-#: log_flags.cpp:269
-#: log_flags.cpp:449
+#: log_flags.cpp:269 log_flags.cpp:449
 msgid "Unexpected text in cc_config.xml"
 msgstr "Uventet tekst i cc_config.xml"
 
-#: log_flags.cpp:423
-#: log_flags.cpp:475
+#: log_flags.cpp:423 log_flags.cpp:475
 msgid "Unrecognized tag in cc_config.xml"
 msgstr "Ukjent tagg i cc_config.xml"
 
@@ -92,7 +91,9 @@ msgid "Invalid code signing key.  To fix, remove and add this project."
 msgstr "Ugyldig signeringskodenøkkel.  For å fikse, fjern og legg til dette prosjektet på nytt."
 
 #: ../sched/handle_request.cpp:859
-msgid "The project has changed its security key.  Please remove and add this project."
+msgid ""
+"The project has changed its security key.  Please remove and add this "
+"project."
 msgstr "Sikkerhetsnøkkelen til prosjektet er endret.  Fjern og legg til dette prosjektet på nytt."
 
 #: ../sched/handle_request.cpp:943
@@ -104,7 +105,8 @@ msgid "This project doesn't support CPU type"
 msgstr "Dette prosjektet støtter ikke prosessortype"
 
 #: ../sched/handle_request.cpp:993
-msgid "Your BOINC client software is too old.  Please install the current version."
+msgid ""
+"Your BOINC client software is too old.  Please install the current version."
 msgstr "Du bruker en for gammel versjon av BOINC klienten.  Vær vennlig å installere den siste versjonen."
 
 #: ../sched/handle_request.cpp:1259
@@ -112,18 +114,21 @@ msgid "This project doesn't support computers of type"
 msgstr "Dette prosjektet støtter ikke datamaskiner av type"
 
 #: ../sched/sched_send.cpp:1092
-msgid "Upgrade to the latest driver to process tasks using your computer's GPU"
+msgid ""
+"Upgrade to the latest driver to process tasks using your computer's GPU"
 msgstr "Oppgradere til den siste versjon av grafikkdriver for å bruke PCens grafikkkort (GPU) til å gjøre beregninger"
 
 #: ../sched/sched_send.cpp:1099
-msgid "Upgrade to the latest driver to use all of this project's GPU applications"
+msgid ""
+"Upgrade to the latest driver to use all of this project's GPU applications"
 msgstr "Oppgradere til siste versjon av grafikkdriver (GPU) for bruke dette prosjektets applikasjoner for grafikkprosessorer"
 
 #: ../sched/sched_send.cpp:1118
-msgid "A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to the current version"
+msgid ""
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to"
+" the current version"
 msgstr "For å bruke din NVIDIA grafikkprosessor (GPU) trenger du en nyere versjon av BOINC, vennligst oppgrader til nyeste versjon"
 
-# 94%
 #: ../sched/sched_send.cpp:1146
 #, c-format
 msgid "An %s GPU is required to run tasks for this project"
@@ -143,7 +148,8 @@ msgstr "Krav om nyere versjon av BOINC; Installer siste versjon"
 
 #: ../sched/sched_send.cpp:1305
 #, c-format
-msgid "Tasks for %s are available, but your preferences are set to not accept them"
+msgid ""
+"Tasks for %s are available, but your preferences are set to not accept them"
 msgstr "Oppgaver til %s er tilgjengelig, men dine alternativer er satt opp til å ikke godkjenne disse"
 
 #: ../sched/sched_types.cpp:254
@@ -153,42 +159,3 @@ msgstr "Ukjent applikasjonsnavn i app_info.xml"
 #: ../sched/sched_version.cpp:214
 msgid "Your app_info.xml file doesn't have a usable version of"
 msgstr "Din app_info.xml fil har ikke en brukbar versjon av"
-
-#~ msgid "Download it."
-#~ msgstr "Last ned."
-#~ msgid "An NVIDIA or ATI GPU is required to run tasks for this project"
-#~ msgstr ""
-#~ "For å utføre oppgaver til dette prosjektet trenger du en NVIDIA eller ATI "
-#~ "grafikkprosessor (GPU)"
-#~ msgid "An NVIDIA GPU is required to run tasks for this project"
-#~ msgstr ""
-#~ "For å utføre oppgaver til dette prosjektet trenger du en NVIDIA "
-#~ "grafikkprosessor (GPU)"
-#~ msgid "An ATI GPU is required to run tasks for this project"
-#~ msgstr ""
-#~ "For å utføre oppgaver til dette prosjektet trenger du en ATI "
-#~ "grafikkprosessor (GPU)"
-#~ msgid ""
-#~ "Tasks for NVIDIA GPU are available, but your preferences are set to not "
-#~ "accept them"
-#~ msgstr ""
-#~ "Oppgaver for NVIDIA grafikkprosessor er tilgjengelig, men dine innstillinger "
-#~ "er satt til å ikke akseptere dem"
-#~ msgid ""
-#~ "Tasks for ATI GPU are available, but your preferences are set to not accept "
-#~ "them"
-#~ msgstr ""
-#~ "Oppgaver for ATI grafikkprosessor er tilgjengelig, men dine innstillinger er "
-#~ "satt til å ikke akseptere dem"
-#~ msgid ""
-#~ "Tasks for CPU are available, but your preferences are set to not accept them"
-#~ msgstr ""
-#~ "Oppgaver for prosessor er tilgjengelig, men dine innstillinger er satt til å "
-#~ "ikke akseptere dem"
-#~ msgid "error"
-#~ msgstr "feil"
-#~ msgid "Can't resolve hostname in remote_hosts.cfg"
-#~ msgstr "Kan ikke løse vertsnavnet det vises til i remote_hosts.cfg"
-#~ msgid "is not available for"
-#~ msgstr "er ikke tilgjengelig for"
-
diff --git a/locale/nb/BOINC-Manager.mo b/locale/nb/BOINC-Manager.mo
index 91fcc07..8308441 100644
Binary files a/locale/nb/BOINC-Manager.mo and b/locale/nb/BOINC-Manager.mo differ
diff --git a/locale/nb/BOINC-Manager.po b/locale/nb/BOINC-Manager.po
old mode 100755
new mode 100644
index d97adb0..8e03ad0
--- a/locale/nb/BOINC-Manager.po
+++ b/locale/nb/BOINC-Manager.po
@@ -1,64 +1,52 @@
 # 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: BOINC 7.4\n"
+"Project-Id-Version: boinc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-15 14:15-0500\n"
-"PO-Revision-Date: 2015-02-11 23:51-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: nb\n"
+"POT-Creation-Date: 2014-02-02 00:00-0800\n"
+"PO-Revision-Date: 2015-02-08 23:26+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/boinc/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc_7.4\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1409714660.0\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-SearchPath-0: clientgui\n"
-"X-Poedit-SearchPath-1: clientgui/msw\n"
-"X-Poedit-SearchPath-2: clientgui/gtk\n"
-"X-Poedit-SearchPath-3: clientgui/mac\n"
-
-# 81%
-#: clientgui/AccountInfoPage.cpp:387
+"Language: nb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: AccountInfoPage.cpp:387
 #, c-format
 msgid "Identify your account at %s"
 msgstr "Identifiser din konto hos %s"
 
-#: clientgui/AccountInfoPage.cpp:393
+#: AccountInfoPage.cpp:393
 msgid ""
 "Please enter your account information\n"
 "(to create an account, visit the project's web site)"
-msgstr ""
-"Skriv inn din kontoinformasjon\n"
-"(for å lage en konto, besøk prosjektets nettside)"
+msgstr "Skriv inn din kontoinformasjon\n(for å lage en konto, besøk prosjektets nettside)"
 
-#: clientgui/AccountInfoPage.cpp:397
+#: AccountInfoPage.cpp:397
 msgid ""
 "This project is not currently accepting new accounts.\n"
 "You can add it only if you already have an account."
-msgstr ""
-"Dette prosjektet aksepterer ikke nye kontoer.\n"
-"Du kan kun legge til dette vis du allerede har en konto."
+msgstr "Dette prosjektet aksepterer ikke nye kontoer.\nDu kan kun legge til dette vis du allerede har en konto."
 
-#: clientgui/AccountInfoPage.cpp:401
+#: AccountInfoPage.cpp:401
 msgid "Are you already running this project?"
 msgstr "Kjører du allerede dette prosjektet?"
 
-#: clientgui/AccountInfoPage.cpp:405
+#: AccountInfoPage.cpp:405
 msgid "&No, new user"
 msgstr "&Nei, ny bruker"
 
-#: clientgui/AccountInfoPage.cpp:408
+#: AccountInfoPage.cpp:408
 msgid "&Yes, existing user"
 msgstr "&Ja, eksisterende bruker"
 
-#: clientgui/AccountInfoPage.cpp:413
+#: AccountInfoPage.cpp:413
 msgid ""
 "We were not able to set up your account information\n"
 "automatically.\n"
@@ -66,501 +54,469 @@ msgid ""
 "Please click on the 'Find login information' link\n"
 "below to find out what to put in the email address and\n"
 "password fields."
-msgstr ""
-"Vi kunne ikke sette opp kontoinformasjonen din automatisk.\n"
-"\n"
-"Klikk på lenken `Finn innloggingsinformasjon`\n"
-"under for å finne ut hva du skal skrive i feltene E-post adresse og\n"
-"passord."
+msgstr "Vi kunne ikke sette opp din kontoinformasjonen\nautomatisk.\n\nKlikk på lenken 'Finn innloggingsinformasjon'\nunder for å finne ut hva du skal skrive i feltene\nepostadresse og passord."
 
-#: clientgui/AccountInfoPage.cpp:416
+#: AccountInfoPage.cpp:416
 msgid "Find login information"
 msgstr "Finn innloggingsinformasjon"
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:649
+#: AccountInfoPage.cpp:436 AccountInfoPage.cpp:641
 msgid "&Password:"
 msgstr "&Passord:"
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:673
+#: AccountInfoPage.cpp:443 AccountInfoPage.cpp:665
 msgid "Choose a &password:"
 msgstr "Velg et &passord:"
 
-#: clientgui/AccountInfoPage.cpp:446
+#: AccountInfoPage.cpp:446
 msgid "C&onfirm password:"
 msgstr "B&ekreft passord:"
 
-#: clientgui/AccountInfoPage.cpp:453
+#: AccountInfoPage.cpp:453
 #, c-format
 msgid "Are you already running %s?"
 msgstr "Kjører du allerede %s?"
 
-#: clientgui/AccountInfoPage.cpp:482
+#: AccountInfoPage.cpp:482
 msgid "&Username:"
 msgstr "&Brukernavn:"
 
-#: clientgui/AccountInfoPage.cpp:511
-msgid "&Email address or LDAP ID:"
-msgstr ""
-
-#: clientgui/AccountInfoPage.cpp:515
+#: AccountInfoPage.cpp:508
 msgid "&Email address:"
 msgstr "&Epostadresse:"
 
-#: clientgui/AccountInfoPage.cpp:523
+#: AccountInfoPage.cpp:515
 #, c-format
 msgid "minimum length %d"
 msgstr "minimumslengde %d"
 
-#: clientgui/AccountInfoPage.cpp:530
+#: AccountInfoPage.cpp:522
 msgid "Forgot your password?"
 msgstr "Glemt passordet ditt?"
 
-#: clientgui/AccountInfoPage.cpp:537
+#: AccountInfoPage.cpp:529
 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 ""
-"Har du ennå ikke registert hos denne kontobehandleren,\n"
-"gjør det før du fortsetter. Klikk på linken under\n"
-"for å registrere eller hente et glemt passord"
+msgstr "Har du ennå ikke registert hos denne kontobehandleren,\ngjør det før du fortsetter.  Klikk på linken under\nfor å registrere eller hente et glemt passord."
 
-#: clientgui/AccountInfoPage.cpp:540
+#: AccountInfoPage.cpp:532
 msgid "Account manager web site"
 msgstr "Nettside for kontobehandler"
 
-#: clientgui/AccountInfoPage.cpp:582
+#: AccountInfoPage.cpp:574 WelcomePage.cpp:348
 msgid "Add project"
 msgstr "Legg til prosjekt"
 
-#: clientgui/AccountInfoPage.cpp:584
+#: AccountInfoPage.cpp:576
 msgid "Update account manager"
 msgstr "Oppdater kontobehandler"
 
-#: clientgui/AccountInfoPage.cpp:586
+#: AccountInfoPage.cpp:578 WelcomePage.cpp:307 WelcomePage.cpp:321
 msgid "Use account manager"
 msgstr "Bruk kontobehandler"
 
-#: clientgui/AccountInfoPage.cpp:593
+#: AccountInfoPage.cpp:585
 msgid "Please enter a user name."
 msgstr "Vennligst tast inn et brukernavn."
 
-#: clientgui/AccountInfoPage.cpp:595
+#: AccountInfoPage.cpp:587
 msgid "Please enter an email address."
 msgstr "Vennligst tast inn en epostadresse."
 
-#: clientgui/AccountInfoPage.cpp:605
+#: AccountInfoPage.cpp:597
 #, c-format
 msgid "Please enter a password of at least %d characters."
 msgstr "Vennligst tast inn et passord som inneholder minimum %d tegn."
 
-#: clientgui/AccountInfoPage.cpp:615
-msgid "The password and confirmation password do not match. Please type them again."
+#: AccountInfoPage.cpp:607
+msgid ""
+"The password and confirmation password do not match. Please type them again."
 msgstr "Passordene samsvarer ikke. Vennligst tast inn på nytt."
 
-#: clientgui/AccountManagerInfoPage.cpp:272
+#: AccountManagerInfoPage.cpp:272
 msgid "Choose an account manager"
 msgstr "Velg en kontobehandler"
 
-#: clientgui/AccountManagerInfoPage.cpp:275
+#: AccountManagerInfoPage.cpp:275
 msgid ""
 "To choose an account manager, click its name or \n"
 "type its URL below."
-msgstr ""
-"For å velge en kontobehandler, klikk på navnet eller \n"
-"angi nettadressen under."
+msgstr "For å velge en kontobehandler, klikk på navnet eller \ntast inn URL under."
 
-#: clientgui/AccountManagerInfoPage.cpp:279
+#: AccountManagerInfoPage.cpp:279
 msgid "Account manager details:"
 msgstr "Detaljer for kontobehandler:"
 
-#: clientgui/AccountManagerInfoPage.cpp:283
+#: AccountManagerInfoPage.cpp:283
 msgid "Account manager &URL:"
-msgstr "&URL kontobehandler:"
+msgstr "Kontobehandler &URL:"
 
-#: clientgui/AccountManagerInfoPage.cpp:287
+#: AccountManagerInfoPage.cpp:287
 msgid "Open web page"
 msgstr "Åpne nettside"
 
-#: clientgui/AccountManagerInfoPage.cpp:290
+#: AccountManagerInfoPage.cpp:290
 msgid "Visit this account manager's web site"
 msgstr "Besøk nettsiden til denne kontobehandleren"
 
-#: clientgui/AccountManagerProcessingPage.cpp:186
-#: clientgui/AccountManagerPropertiesPage.cpp:192
+#: AccountManagerProcessingPage.cpp:187 AccountManagerPropertiesPage.cpp:193
 #, c-format
 msgid "Communicating with %s."
 msgstr "Kommuniserer med %s."
 
-#: clientgui/AccountManagerProcessingPage.cpp:193
-#: clientgui/AccountManagerPropertiesPage.cpp:199
+#: AccountManagerProcessingPage.cpp:194 AccountManagerPropertiesPage.cpp:200
 msgid "Communicating with server."
 msgstr "Kommuniserer med tjener."
 
-#: clientgui/AccountManagerProcessingPage.cpp:198
-#: clientgui/AccountManagerPropertiesPage.cpp:204
+#: AccountManagerProcessingPage.cpp:199 AccountManagerPropertiesPage.cpp:205
 msgid "Please wait..."
 msgstr "Vennligst vent..."
 
-#: clientgui/AccountManagerProcessingPage.cpp:325
+#: AccountManagerProcessingPage.cpp:326
 msgid "An internal server error has occurred.\n"
 msgstr "Det har oppstått en intern tjenerfeil.\n"
 
-#: clientgui/AdvancedFrame.cpp:96
+#: AdvancedFrame.cpp:95
 msgid "Connected"
 msgstr "Tilkoblet"
 
-#: clientgui/AdvancedFrame.cpp:104
+#: AdvancedFrame.cpp:103
 msgid "Disconnected"
 msgstr "Frakoblet"
 
-#: clientgui/AdvancedFrame.cpp:318
+#: AdvancedFrame.cpp:322 sg_BoincSimpleFrame.cpp:119
 #, c-format
 msgid "Close the %s window"
 msgstr "Steng %s vinduet"
 
-#: clientgui/AdvancedFrame.cpp:321
+#: AdvancedFrame.cpp:325 sg_BoincSimpleFrame.cpp:122
 msgid "&Close Window"
 msgstr "&Steng vindu"
 
-#: clientgui/AdvancedFrame.cpp:332
-#: clientgui/AdvancedFrame.cpp:339
-#: clientgui/AdvancedFrame.cpp:346
+#: AdvancedFrame.cpp:336 AdvancedFrame.cpp:343 AdvancedFrame.cpp:350
 #, c-format
 msgid "Exit %s"
 msgstr "Avslutt %s"
 
-#: clientgui/AdvancedFrame.cpp:359
-msgid "Preferences..."
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:368
+#: AdvancedFrame.cpp:371
 msgid "&Notices\tCtrl+Shift+N"
 msgstr "&Varslinger\t Ctrl+Shift+N"
 
-#: clientgui/AdvancedFrame.cpp:369
+#: AdvancedFrame.cpp:372
 msgid "Display notices"
 msgstr "Vis varslinger"
 
-#: clientgui/AdvancedFrame.cpp:374
+#: AdvancedFrame.cpp:377
 msgid "&Projects\tCtrl+Shift+P"
-msgstr "&Prosjekter\t Ctrl+Shift+P"
+msgstr "&Prosjekter\tCtrl+Shift+P"
 
-#: clientgui/AdvancedFrame.cpp:375
+#: AdvancedFrame.cpp:378
 msgid "Display projects"
 msgstr "Vis prosjekter"
 
-#: clientgui/AdvancedFrame.cpp:380
+#: AdvancedFrame.cpp:383
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr "&Oppgaver\t Ctrl+Shift+T"
 
-#: clientgui/AdvancedFrame.cpp:381
+#: AdvancedFrame.cpp:384
 msgid "Display tasks"
 msgstr "Vis oppgaver"
 
-#: clientgui/AdvancedFrame.cpp:386
+#: AdvancedFrame.cpp:389
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr "Over&føringer\t Ctrl+Shift+X"
 
-#: clientgui/AdvancedFrame.cpp:387
+#: AdvancedFrame.cpp:390
 msgid "Display transfers"
 msgstr "Vis overføringer"
 
-#: clientgui/AdvancedFrame.cpp:392
+#: AdvancedFrame.cpp:395
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "&Statistikk\t Ctrl+Shift+S"
 
-#: clientgui/AdvancedFrame.cpp:393
+#: AdvancedFrame.cpp:396
 msgid "Display statistics"
 msgstr "Vis statistikk"
 
-#: clientgui/AdvancedFrame.cpp:398
+#: AdvancedFrame.cpp:401
 msgid "&Disk usage\tCtrl+Shift+D"
 msgstr "&Diskbruk\t Ctrl+Shift+D"
 
-#: clientgui/AdvancedFrame.cpp:399
+#: AdvancedFrame.cpp:402
 msgid "Display disk usage"
 msgstr "Vis diskbruk"
 
-#: clientgui/AdvancedFrame.cpp:406
+#: AdvancedFrame.cpp:409
 msgid "Simple &View...\tCtrl+Shift+V"
-msgstr "Enkel &visning\t Ctrl+Shift+V"
+msgstr "Enkel &Visning...\tCtrl+Shift+V"
 
-#: clientgui/AdvancedFrame.cpp:407
+#: AdvancedFrame.cpp:410
 msgid "Display the simple graphical interface."
 msgstr "Vis det enkle grafiske grensesnittet."
 
-#: clientgui/AdvancedFrame.cpp:421
+#: AdvancedFrame.cpp:424
 msgid "&Add project or account manager..."
 msgstr "&Legg til prosjekt eller kontobehandler..."
 
-#: clientgui/AdvancedFrame.cpp:422
+#: AdvancedFrame.cpp:425 sg_ProjectPanel.cpp:76
 msgid "Volunteer for any or all of 30+ projects in many areas of science"
 msgstr "Meld deg på noen eller alle 30+ prosjektene i mange forskningsområder"
 
-#: clientgui/AdvancedFrame.cpp:426
+#: AdvancedFrame.cpp:429
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "&Synkroniser med %s"
 
-#: clientgui/AdvancedFrame.cpp:430
+#: AdvancedFrame.cpp:433
 #, c-format
 msgid "Get current settings from %s"
 msgstr "Hent gjeldende innstillinger fra %s"
 
-#: clientgui/AdvancedFrame.cpp:440
+#: AdvancedFrame.cpp:443
 msgid "&Add project..."
 msgstr "&Legg til et prosjekt..."
 
-#: clientgui/AdvancedFrame.cpp:441
+#: AdvancedFrame.cpp:444
 msgid "Add a project"
 msgstr "Legg til et prosjekt"
 
-#: clientgui/AdvancedFrame.cpp:444
+#: AdvancedFrame.cpp:447
 #, c-format
 msgid "S&top using %s..."
-msgstr "S&topp bruken av %s"
+msgstr "S&topp bruken av %s..."
 
-#: clientgui/AdvancedFrame.cpp:450
+#: AdvancedFrame.cpp:453
 msgid "Remove this computer from account manager control."
 msgstr "Fjern denne datamaskinen fra kontrollen til kontobehandler."
 
-#: clientgui/AdvancedFrame.cpp:455
+#: AdvancedFrame.cpp:458 sg_BoincSimpleFrame.cpp:178
 msgid "&Options..."
 msgstr "&Alternativer..."
 
-#: clientgui/AdvancedFrame.cpp:456
+#: AdvancedFrame.cpp:459 sg_BoincSimpleFrame.cpp:179
 msgid "Configure display options and proxy settings"
 msgstr "Konfigurer visningsvalg og mellomtjenerinnstillinger"
 
-#: clientgui/AdvancedFrame.cpp:460
+#: AdvancedFrame.cpp:463 sg_BoincSimpleFrame.cpp:172
 msgid "Computing &preferences..."
-msgstr "&Beregningsinnstillinger..."
+msgstr "Beregnings &innstillinger..."
 
-#: clientgui/AdvancedFrame.cpp:461
+#: AdvancedFrame.cpp:464 sg_BoincSimpleFrame.cpp:173
 msgid "Configure computing preferences"
 msgstr "Konfigurer beregningsinnstillinger"
 
-#: clientgui/AdvancedFrame.cpp:469
+#: AdvancedFrame.cpp:472
 msgid "&Run always"
-msgstr "Alltid &kjør"
+msgstr "&Alltid kjør"
 
-#: clientgui/AdvancedFrame.cpp:470
+#: AdvancedFrame.cpp:473
 msgid "Allow work regardless of preferences"
 msgstr "Tillat arbeid uavhengig av innstillinger"
 
-#: clientgui/AdvancedFrame.cpp:474
+#: AdvancedFrame.cpp:477
 msgid "Run based on &preferences"
 msgstr "Kjør basert på &innstillinger"
 
-#: clientgui/AdvancedFrame.cpp:475
+#: AdvancedFrame.cpp:478
 msgid "Allow work according to preferences"
 msgstr "Tillat arbeid ifølge innstillinger"
 
-#: clientgui/AdvancedFrame.cpp:479
+#: AdvancedFrame.cpp:482
 msgid "&Suspend"
 msgstr "&Suspender"
 
-#: clientgui/AdvancedFrame.cpp:480
+#: AdvancedFrame.cpp:483
 msgid "Stop work regardless of preferences"
 msgstr "Stopp arbeid uansett innstillinger"
 
-#: clientgui/AdvancedFrame.cpp:505
+#: AdvancedFrame.cpp:508
 msgid "Use GPU always"
-msgstr "Alltid bruk grafikkprosessor"
+msgstr "Bruk alltid GPU"
 
-#: clientgui/AdvancedFrame.cpp:506
+#: AdvancedFrame.cpp:509
 msgid "Allow GPU work regardless of preferences"
-msgstr "Tillat arbeid med grafikkprosessor uavhengig av innstillinger"
+msgstr "Tillat arbeid med GPU uavhengig av innstillinger"
 
-#: clientgui/AdvancedFrame.cpp:510
+#: AdvancedFrame.cpp:513
 msgid "Use GPU based on preferences"
-msgstr "Bruk grafikkprosessor basert på innstillinger"
+msgstr "Bruk GPU basert på innstillinger"
 
-#: clientgui/AdvancedFrame.cpp:511
+#: AdvancedFrame.cpp:514
 msgid "Allow GPU work according to preferences"
-msgstr "Tillat arbeid med grafikkprosessor ifølge innstillinger"
+msgstr "Tillat arbeid med GPU ifølge innstillinger"
 
-#: clientgui/AdvancedFrame.cpp:515
+#: AdvancedFrame.cpp:518
 msgid "Suspend GPU"
-msgstr "Sett grafikkprosessor i hvilemodus"
+msgstr "Suspender GPU"
 
-#: clientgui/AdvancedFrame.cpp:516
+#: AdvancedFrame.cpp:519
 msgid "Stop GPU work regardless of preferences"
-msgstr "Stopp arbeid med grafikkprosessor uavhengig av innstillinger"
+msgstr "Stopp GPU arbeid uavhengig av innstillinger"
 
-#: clientgui/AdvancedFrame.cpp:540
+#: AdvancedFrame.cpp:543
 msgid "Network activity always available"
 msgstr "Nettverksaktivitet alltid tilgjengelig"
 
-#: clientgui/AdvancedFrame.cpp:541
+#: AdvancedFrame.cpp:544
 msgid "Allow network activity regardless of preferences"
 msgstr "Tillat nettverksaktivitet uavhengig av innstillinger"
 
-#: clientgui/AdvancedFrame.cpp:545
+#: AdvancedFrame.cpp:548
 msgid "Network activity based on preferences"
 msgstr "Nettverkaktivitet basert på innstillinger"
 
-#: clientgui/AdvancedFrame.cpp:546
+#: AdvancedFrame.cpp:549
 msgid "Allow network activity according to preferences"
 msgstr "Tillat nettverksaktivitet ifølge innstillinger"
 
-#: clientgui/AdvancedFrame.cpp:550
+#: AdvancedFrame.cpp:553
 msgid "Network activity suspended"
 msgstr "Nettverksaktivitet suspendert"
 
-#: clientgui/AdvancedFrame.cpp:551
+#: AdvancedFrame.cpp:554
 msgid "Stop BOINC network activity"
 msgstr "Stopp nettverksaktiviteten til BOINC"
 
-#: clientgui/AdvancedFrame.cpp:561
+#: AdvancedFrame.cpp:564
 #, c-format
 msgid "Connect to another computer running %s"
 msgstr "Koble til en annen datamaskin som kjører %s"
 
-#: clientgui/AdvancedFrame.cpp:566
+#: AdvancedFrame.cpp:569
 msgid "Select computer..."
 msgstr "Velg datamaskin..."
 
-#: clientgui/AdvancedFrame.cpp:571
+#: AdvancedFrame.cpp:574
 msgid "Shut down connected client..."
 msgstr "Slå av tilkoblet klient..."
 
-#: clientgui/AdvancedFrame.cpp:572
+#: AdvancedFrame.cpp:575
 msgid "Shut down the currently connected client"
 msgstr "Slå av klienten som er tilkoblet nå"
 
-#: clientgui/AdvancedFrame.cpp:576
+#: AdvancedFrame.cpp:579
 msgid "Run CPU &benchmarks"
-msgstr "Kjør &ytelsestest for prosessoren"
+msgstr "Kjør CPU &ytelsestest"
 
-#: clientgui/AdvancedFrame.cpp:577
+#: AdvancedFrame.cpp:580
 msgid "Runs BOINC CPU benchmarks"
-msgstr "Kjører BOINCs ytelsestest for prosessoren"
+msgstr "Kjører BOINC CPU ytelsestest"
 
-#: clientgui/AdvancedFrame.cpp:581
+#: AdvancedFrame.cpp:584
 msgid "Do network communication"
 msgstr "Gjør nettverkskommunikasjon"
 
-#: clientgui/AdvancedFrame.cpp:582
+#: AdvancedFrame.cpp:585
 msgid "Do all pending network communication"
 msgstr "Gjør alle ventende nettverkskommunikasjoner"
 
-# 94%
-#: clientgui/AdvancedFrame.cpp:586
+#: AdvancedFrame.cpp:589
 msgid "Read config files"
-msgstr "Les konfigurasjonsfiler"
+msgstr "Les konfigurasjons filer"
 
-#: clientgui/AdvancedFrame.cpp:587
-msgid "Read configuration info from cc_config.xml and any app_config.xml files"
+#: AdvancedFrame.cpp:590
+msgid ""
+"Read configuration info from cc_config.xml and any app_config.xml files"
 msgstr "Les konfigurasjonsinformasjon fra cc_config.xml og app_config.xml filer"
 
-#: clientgui/AdvancedFrame.cpp:591
+#: AdvancedFrame.cpp:594
 msgid "Read local prefs file"
 msgstr "Les lokal preferansefil"
 
-#: clientgui/AdvancedFrame.cpp:592
+#: AdvancedFrame.cpp:595
 msgid "Read preferences from global_prefs_override.xml."
-msgstr "Les preferanser fra global_prefs_override.xml"
+msgstr "Les preferanser fra global_prefs_override.xml."
 
-#: clientgui/AdvancedFrame.cpp:597
+#: AdvancedFrame.cpp:600
 #, c-format
 msgid "Launch another instance of %s..."
-msgstr "Start et annet eksempel av %s"
+msgstr "Start et annet eksempel av %s..."
 
-#: clientgui/AdvancedFrame.cpp:601
+#: AdvancedFrame.cpp:604
 #, c-format
 msgid "Launch another %s"
 msgstr "Start en annen %s"
 
-#: clientgui/AdvancedFrame.cpp:611
+#: AdvancedFrame.cpp:614
 msgid "Event Log...\tCtrl+Shift+E"
 msgstr "Hendelseslogg...\t Ctrl+Shift+E"
 
-#: clientgui/AdvancedFrame.cpp:612
+#: AdvancedFrame.cpp:615
 msgid "Display diagnostic messages."
 msgstr "Vis diagnosebeskjeder."
 
-#: clientgui/AdvancedFrame.cpp:616
-msgid "Event Log Diagnostic Flags...\tCtrl+Shift+F"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:617
-msgid "Enable or disable various diagnostic messages"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:626
+#: AdvancedFrame.cpp:625 sg_BoincSimpleFrame.cpp:188
 #, c-format
 msgid "%s &help"
 msgstr "%s &hjelp"
 
-#: clientgui/AdvancedFrame.cpp:632
+#: AdvancedFrame.cpp:631 sg_BoincSimpleFrame.cpp:194
 #, c-format
 msgid "Show information about %s"
 msgstr "Vis informasjon om %s"
 
-#: clientgui/AdvancedFrame.cpp:644
+#: AdvancedFrame.cpp:643
 #, c-format
 msgid "&%s help"
 msgstr "&%s hjelp"
 
-#: clientgui/AdvancedFrame.cpp:650
+#: AdvancedFrame.cpp:649 sg_BoincSimpleFrame.cpp:212
 #, c-format
 msgid "Show information about the %s"
 msgstr "Vis informasjon om %s"
 
-#: clientgui/AdvancedFrame.cpp:662
+#: AdvancedFrame.cpp:661 sg_BoincSimpleFrame.cpp:224
 #, c-format
 msgid "%s &web site"
 msgstr "%s &nettside"
 
-#: clientgui/AdvancedFrame.cpp:668
+#: AdvancedFrame.cpp:667 sg_BoincSimpleFrame.cpp:230
 #, c-format
 msgid "Show information about BOINC and %s"
 msgstr "Vis informasjon om BOINC og %s"
 
-#: clientgui/AdvancedFrame.cpp:680
-#: clientgui/BOINCTaskBar.cpp:544
+#: AdvancedFrame.cpp:679 BOINCTaskBar.cpp:530 sg_BoincSimpleFrame.cpp:242
 #, c-format
 msgid "&About %s..."
-msgstr "&Om %s"
+msgstr "&Om %s..."
 
-#: clientgui/AdvancedFrame.cpp:686
+#: AdvancedFrame.cpp:685 sg_BoincSimpleFrame.cpp:248
 msgid "Licensing and copyright information."
 msgstr "Informasjon om lisenser og opphavsrett."
 
-#: clientgui/AdvancedFrame.cpp:693
+#: AdvancedFrame.cpp:692 sg_BoincSimpleFrame.cpp:255
 msgid "&File"
 msgstr "&Fil"
 
-#: clientgui/AdvancedFrame.cpp:697
+#: AdvancedFrame.cpp:696 sg_BoincSimpleFrame.cpp:259
 msgid "&View"
 msgstr "&Vis"
 
-#: clientgui/AdvancedFrame.cpp:701
+#: AdvancedFrame.cpp:700 sg_BoincSimpleFrame.cpp:263
 msgid "&Tools"
 msgstr "&Verktøy"
 
-#: clientgui/AdvancedFrame.cpp:705
+#: AdvancedFrame.cpp:704
 msgid "&Activity"
 msgstr "&Aktivitet"
 
-#: clientgui/AdvancedFrame.cpp:709
+#: AdvancedFrame.cpp:708
 msgid "A&dvanced"
 msgstr "A&vansert"
 
-#: clientgui/AdvancedFrame.cpp:713
+#: AdvancedFrame.cpp:712 DlgEventLog.cpp:332 sg_BoincSimpleFrame.cpp:267
+#: wizardex.cpp:374 wizardex.cpp:381
 msgid "&Help"
 msgstr "&Hjelp"
 
-#: clientgui/AdvancedFrame.cpp:1185
+#: AdvancedFrame.cpp:1199
 #, c-format
 msgid "%s - Stop using %s"
 msgstr "%s - Stopp bruken av %s"
 
-#: clientgui/AdvancedFrame.cpp:1190
+#: AdvancedFrame.cpp:1204
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -568,254 +524,222 @@ msgid ""
 "but you'll have to manage projects manually.\n"
 "\n"
 "Do you want to stop using %s?"
-msgstr ""
-"Hvis du slutter å bruke %s\n"
-"vil du beholde alle nåværende prosjekter,\n"
-"men du må behandle prosjektene manuelt.\n"
-"\n"
-"Vil du stoppe å bruke %s?"
+msgstr "Hvis du slutter å bruke %s\nvil du beholde alle nåværende prosjekter,\nmen du må behandle prosjektene manuelt.\n\nVil du stoppe å bruke %s?"
 
-#: clientgui/AdvancedFrame.cpp:1397
+#: AdvancedFrame.cpp:1401
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s - Steng nåværende klient..."
 
-#: clientgui/AdvancedFrame.cpp:1406
+#: AdvancedFrame.cpp:1410
 #, c-format
 msgid ""
 "%s will shut down the current client\n"
 "and prompt you for another host to connect to."
-msgstr ""
-"%s vil stenge nåværende klient\n"
-"og spørre deg om en annen tjener å koble til."
+msgstr "%s vil stenge nåværende klient\nog spørre deg om en annen tjener å koble til."
 
-#: clientgui/AdvancedFrame.cpp:1806
+#: AdvancedFrame.cpp:1745 DlgAbout.cpp:119
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: clientgui/AdvancedFrame.cpp:1815
+#: AdvancedFrame.cpp:1754
 #, c-format
 msgid "%s has successfully added %s"
 msgstr "%s har lagt til %s"
 
-#: clientgui/AdvancedFrame.cpp:1953
+#: AdvancedFrame.cpp:1893
 #, c-format
 msgid "%s - (%s)"
 msgstr "%s - (%s)"
 
-#: clientgui/AdvancedFrame.cpp:1957
+#: AdvancedFrame.cpp:1897
 #, c-format
 msgid "Connecting to %s"
 msgstr "Kobler til %s"
 
-#: clientgui/AdvancedFrame.cpp:1960
+#: AdvancedFrame.cpp:1900
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "Koblet til %s (%s)"
 
-#: clientgui/AlreadyExistsPage.cpp:184
+#: AlreadyExistsPage.cpp:184
 msgid "Username already in use"
 msgstr "Brukernavn allerede i bruk"
 
-#: clientgui/AlreadyExistsPage.cpp:187
+#: AlreadyExistsPage.cpp:187
 msgid ""
 "An account with that username already exists and has a\n"
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"En konto med det brukernavnet eksisterer og har et\n"
-"annet passord enn det du skrev.\n"
-"Besøk prosjektets nettside og følg instruksjonene."
+msgstr "En konto med det brukernavnet eksisterer og har et\nannet passord enn det du tastet inn.\n\nBesøk prosjektets nettside og følg instruksjonene."
 
-#: clientgui/AlreadyExistsPage.cpp:191
+#: AlreadyExistsPage.cpp:191
 msgid "Email address already in use"
 msgstr "Epostadressen allerede i bruk"
 
-#: clientgui/AlreadyExistsPage.cpp:194
+#: AlreadyExistsPage.cpp:194
 msgid ""
 "An account with that email address already exists and has a\n"
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"En konto med den E-postadressen eksisterer og har et\n"
-"annet passord enn det du skrev.\n"
-"Besøk prosjektets nettside og følg instruksjonene."
+msgstr "En konto med den epostadressen eksisterer og har et\nannet passord enn det du tastet inn.\n\nBesøk prosjektets nettside og følg instruksjonene."
 
-#: clientgui/AsyncRPC.cpp:1031
+#: AsyncRPC.cpp:1031
 msgid "Communicating with BOINC client.  Please wait ..."
 msgstr "Kommuniserer med BOINC klienten.  Vennligst vent ..."
 
-#: clientgui/AsyncRPC.cpp:1034
+#: AsyncRPC.cpp:1034
 #, c-format
 msgid "&Quit %s"
 msgstr "&Avslutt %s"
 
-#: clientgui/AsyncRPC.cpp:1036
+#: AsyncRPC.cpp:1036
 #, c-format
 msgid "E&xit %s"
 msgstr "A&vslutt %s"
 
-#: clientgui/AsyncRPC.cpp:1040
+#: AsyncRPC.cpp:1040
 #, c-format
 msgid "%s - Communication"
 msgstr "%s - Kommuniserer"
 
-#: clientgui/AsyncRPC.cpp:1056
+#: AsyncRPC.cpp:1056 DlgAdvPreferencesBase.cpp:107 sg_DlgPreferences.cpp:433
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: clientgui/BOINCBaseFrame.cpp:504
+#: BOINCBaseFrame.cpp:505
 #, c-format
 msgid "%s - Connection Error"
 msgstr "%s - Tilkoblingsfeil"
 
-#: clientgui/BOINCBaseFrame.cpp:513
+#: BOINCBaseFrame.cpp:514
 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 ""
-"Du er ikke autorisert til å behandle klienten.\n"
-"Kontakt administrator for å bli lagt til i lokalgruppen `boinc_users`"
+msgstr "Du er ikke autorisert til å behandle klienten.\nKontakt administrator for å bli lagt til i lokalgruppen 'boinc_users'."
 
-#: clientgui/BOINCBaseFrame.cpp:522
+#: BOINCBaseFrame.cpp:523
 msgid ""
 "Authorization failed connecting to running client.\n"
 "Make sure you start this program in the same directory as the client."
-msgstr ""
-"Autoriseringen kunne ikke koble til klienten som kjører.\n"
-"Vær sikker på at programmet er startet fra samme mappe som klienten."
+msgstr "Autoriseringen kunne ikke koble til klienten som kjører.\nVær sikker på at programmet er startet fra samme mappe som klienten."
 
-#: clientgui/BOINCBaseFrame.cpp:524
+#: BOINCBaseFrame.cpp:525
 msgid "Authorization failed connecting to running client."
 msgstr "Autoriseringen kunne ikke koble til klienten som kjører."
 
-#: clientgui/BOINCBaseFrame.cpp:532
+#: BOINCBaseFrame.cpp:533
 msgid "The password you have provided is incorrect, please try again."
 msgstr "Passordet du har oppgitt er feil, vennligst prøv igjen."
 
-#: clientgui/BOINCBaseFrame.cpp:576
+#: BOINCBaseFrame.cpp:577
 #, c-format
 msgid "%s - Connection Failed"
 msgstr "%s - Tilkobling mislykkes"
 
-#: clientgui/BOINCBaseFrame.cpp:585
+#: BOINCBaseFrame.cpp:586
 #, c-format
 msgid ""
 "%s is not able to connect to a %s client.\n"
 "Would you like to try to connect again?"
-msgstr ""
-"%s kan ikke koble til klienten %s.\n"
-"Vil du prøve å koble til igjen?"
+msgstr "%s kan ikke koble til klienten %s.\nVil du prøve å koble til igjen?"
 
-#: clientgui/BOINCBaseFrame.cpp:621
+#: BOINCBaseFrame.cpp:622
 #, c-format
 msgid "%s - Daemon Start Failed"
 msgstr "%s - Bakgrunnsprosessens oppstart feilet"
 
-#: clientgui/BOINCBaseFrame.cpp:631
+#: BOINCBaseFrame.cpp:632
 #, 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 kan ikke starte %s klienten.\n"
-"Start panelprogrammet Kontrollpanel->Administrative verktøy->Tjenester og start BOINC tjenesten."
+msgstr "%s kan ikke starte %s klienten.\nStart panelprogrammet Kontrollpanel->Administrative verktøy->Tjenester og start BOINC tjenesten."
 
-#: clientgui/BOINCBaseFrame.cpp:637
+#: BOINCBaseFrame.cpp:638
 #, c-format
 msgid ""
 "%s is not able to start a %s client.\n"
 "Please start the daemon and try again."
-msgstr ""
-"%s kan ikke starte %s klienten.\n"
-"Start bakgrunnsprogrammet og prøv igjen."
+msgstr "%s kan ikke starte %s klienten.\nStart bakgrunnsprogrammet og prøv igjen."
 
-#: clientgui/BOINCBaseFrame.cpp:688
+#: BOINCBaseFrame.cpp:689
 #, c-format
 msgid "%s - Connection Status"
 msgstr "%s - Status for tilkobling"
 
-#: clientgui/BOINCBaseFrame.cpp:699
+#: BOINCBaseFrame.cpp:700
 #, 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"
 "To connect up to your local computer please use 'localhost' as the host name."
-msgstr ""
-"%s er ikke tilkoblet til en %s klient.\n"
-"Bruk 'Avansert\\Velg datamaskin...' menyvalg for å koble til en %s klient.\n"
-"For å koble til din lokale datamaskin vennligst bruk 'localhost' som vertsnavn."
+msgstr "%s er ikke tilkoblet til en %s klient.\nBruk 'Avansert\\Velg datamaskin...' menyvalg for å koble til en %s klient.\nFor å koble til din lokale datamaskin vennligst bruk 'localhost' som vertsnavn."
 
-#: clientgui/BOINCBaseView.cpp:752
+#: BOINCBaseView.cpp:779
 msgid "Project web pages"
 msgstr "Prosjekt nettsider"
 
-#: clientgui/BOINCClientManager.cpp:573
+#: BOINCClientManager.cpp:575
 #, c-format
 msgid "%s - Unexpected Exit"
 msgstr "%s- Uventet avslutning"
 
-#: clientgui/BOINCClientManager.cpp:583
+#: BOINCClientManager.cpp:585
 #, 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 ""
-"Klienten %s har uventet avsluttet 3 ganger i løpet av de siste %d minuttene.\n"
-"Vil du starte den igjen?"
+msgstr "Klienten %s har uventet avsluttet 3 ganger i løpet av de siste %d minuttene.\nVil du starte den igjen?"
 
-#: clientgui/BOINCDialupManager.cpp:61
+#: BOINCDialupManager.cpp:61
 #, c-format
 msgid "%s - Network Status"
 msgstr "%s Nettverksstatus"
 
-#: clientgui/BOINCDialupManager.cpp:241
+#: BOINCDialupManager.cpp:241
 #, c-format
 msgid ""
 "%s needs to connect to the Internet.\n"
 "May it do so now?"
-msgstr ""
-"%s trenger å koble til internett.\n"
-"Kan den gjøre det nå?"
+msgstr "%s trenger å koble til internett.\nKan den gjøre det nå?"
 
-#: clientgui/BOINCDialupManager.cpp:254
+#: BOINCDialupManager.cpp:254
 #, c-format
 msgid "%s is connecting to the Internet."
-msgstr "%s er koblet til internett."
+msgstr "%s er koblet til Internett."
 
-#: clientgui/BOINCDialupManager.cpp:303
+#: BOINCDialupManager.cpp:303
 #, c-format
 msgid "%s has successfully connected to the Internet."
-msgstr "%s har koblet seg til internett."
+msgstr "%s har koblet seg til Internett."
 
-#: clientgui/BOINCDialupManager.cpp:331
+#: BOINCDialupManager.cpp:331
 #, c-format
 msgid "%s failed to connect to the Internet."
-msgstr "%s kunne ikke koble seg til internett."
+msgstr "%s kunne ikke koble til internett."
 
-#: clientgui/BOINCDialupManager.cpp:372
+#: 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 er nå koblet til internett.\n"
-"Oppdaterer alle prosjekter og prøver alle overføringene igjen."
+msgstr "%s er nå koblet til internett.\nOppdaterer alle prosjekter og prøver alle overføringene igjen."
 
-#: clientgui/BOINCDialupManager.cpp:417
+#: BOINCDialupManager.cpp:417
 #, c-format
 msgid "%s has successfully disconnected from the Internet."
-msgstr "%s er koblet fra internett."
+msgstr "%s er frakoblet Internett."
 
-#: clientgui/BOINCDialupManager.cpp:433
+#: BOINCDialupManager.cpp:433
 #, c-format
 msgid "%s failed to disconnected from the Internet."
-msgstr "%s kunne ikke koble fra internett."
+msgstr "%s kunne ikke koble fra Internett."
 
-#: clientgui/BOINCGUIApp.cpp:595
+#: BOINCGUIApp.cpp:339
 #, c-format
 msgid ""
 "You currently are not authorized to manage the client.\n"
@@ -826,866 +750,798 @@ msgid ""
 " or\n"
 "  - contact your administrator to add you to the 'boinc_master'\n"
 "     user group."
-msgstr ""
-"Du er ikke autorisert til å behandle denne klienten.\n"
-"\n"
-"For å kjøre %s som denne brukeren,\n"
-"  - installer %s på nytt og svar \"Ja\" til spørsmålet om\n"
-"   ikke administrativ brukere\n"
-" eller\n"
-"  - kontakt administratoren for å legge deg til 'boinc_master'\n"
-"     brukergruppe."
-
-#: clientgui/BOINCGUIApp.cpp:601
+msgstr "Du er ikke autorisert til å behandle denne klienten.\n\nFor å kjøre %s som denne brukeren,\n  - installer %s på nytt og svar \"Ja\" til spørsmålet om\n     ikke administrativ brukere\n eller\n  - kontakt administratoren for å legge deg til 'boinc_master'\n     brukergruppe."
+
+#: BOINCGUIApp.cpp:345
 #, c-format
 msgid ""
 "%s ownership or permissions are not set properly; please reinstall %s.\n"
 "(Error code %d"
-msgstr ""
-"%s eieskap eller rettigheter er ikke satt ordentlig, installer %s på nytt.\n"
-"(Feilkode %d"
+msgstr "%s eieskap eller rettigheter er ikke satt ordentlig, installer %s på nytt.\n(Feilkode %d"
 
-#: clientgui/BOINCGUIApp.cpp:607
+#: BOINCGUIApp.cpp:351
 msgid " at "
 msgstr " ved "
 
-#: clientgui/BOINCGUIApp.cpp:610
+#: BOINCGUIApp.cpp:354 MainDocument.cpp:2484 MainDocument.cpp:2534
+#: MainDocument.cpp:2554 ViewTransfers.cpp:803
 msgid ")"
 msgstr ")"
 
-#: clientgui/BOINCGUIApp.cpp:640
+#: BOINCGUIApp.cpp:384
 msgid ""
 "A reboot is required in order for BOINC to run properly.\n"
 "Please reboot your computer and try again."
-msgstr ""
-"Omstart kreves for å kjøre BOINC ordentlig.\n"
-"Vennligst start datamaskinen om igjen."
+msgstr "Omstart kreves for å kjøre BOINC ordentlig.\nVennligst start datamaskinen om igjen."
 
-#: clientgui/BOINCGUIApp.cpp:641
+#: BOINCGUIApp.cpp:385 DlgAbout.cpp:153
 msgid "BOINC Manager"
 msgstr "BOINC behandler"
 
-#: clientgui/BOINCGUIApp.cpp:902
+#: BOINCGUIApp.cpp:572
 msgid "BOINC Manager was started by the operating system automatically"
 msgstr "BOINCbehandleren var automatisk startet av operativsystemet"
 
-#: clientgui/BOINCGUIApp.cpp:904
+#: BOINCGUIApp.cpp:574
 msgid "Startup BOINC so only the system tray icon is visible"
 msgstr "Start BOINC så bare systemkurvikonet er synlig"
 
-#: clientgui/BOINCGUIApp.cpp:906
+#: BOINCGUIApp.cpp:576
 msgid "Directory containing the BOINC Client executable"
 msgstr "Mappe som inneholder BOINCklientens programfil"
 
-#: clientgui/BOINCGUIApp.cpp:907
+#: BOINCGUIApp.cpp:577
 msgid "BOINC data directory"
 msgstr "BOINCs datamappe"
 
-#: clientgui/BOINCGUIApp.cpp:909
+#: BOINCGUIApp.cpp:579
 msgid "Host name or IP address"
 msgstr "Vertsnavn eller IP adresse"
 
-#: clientgui/BOINCGUIApp.cpp:910
+#: BOINCGUIApp.cpp:580
 msgid "GUI RPC port number"
 msgstr "GUI RPC portnummer"
 
-#: clientgui/BOINCGUIApp.cpp:911
+#: BOINCGUIApp.cpp:581
 msgid "Password"
 msgstr "Passord"
 
-#: clientgui/BOINCGUIApp.cpp:912
+#: BOINCGUIApp.cpp:582
 msgid "Startup BOINC with these optional arguments"
 msgstr "Start BOINC med disse valgfrie argumentene"
 
-#: clientgui/BOINCGUIApp.cpp:913
+#: BOINCGUIApp.cpp:583
 msgid "disable BOINC security users and permissions"
-msgstr "Deaktiver BOINC sikkerhet brukere og rettigheter"
+msgstr "deaktiver BOINC sikkerhet brukere og rettigheter"
 
-#: clientgui/BOINCGUIApp.cpp:914
+#: BOINCGUIApp.cpp:584
 msgid "set skin debugging mode to enable skin manager error messages"
 msgstr "sett skallmodus for feilsøking for å aktivere feilmeldinger fra skallbehandleren"
 
-#: clientgui/BOINCGUIApp.cpp:915
+#: BOINCGUIApp.cpp:585
 msgid "multiple instances of BOINC Manager allowed"
 msgstr "flere forekomster av BOINC behandleren er tillatt"
 
-#: clientgui/BOINCGUIApp.cpp:917
+#: BOINCGUIApp.cpp:587
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr "Ikke brukt: løsning for bug i XCode 4.2"
 
-#: clientgui/BOINCGUIApp.cpp:1164
+#: BOINCGUIApp.cpp:814
 msgid "(Automatic Detection)"
 msgstr "(Automatisk gjenkjenning)"
 
-#: clientgui/BOINCGUIApp.cpp:1165
+#: BOINCGUIApp.cpp:815
 msgid "(Unknown)"
 msgstr "(Ukjent)"
 
-#: clientgui/BOINCGUIApp.cpp:1166
+#: BOINCGUIApp.cpp:816
 msgid "(User Defined)"
 msgstr "(Brukerdefinert)"
 
-#: clientgui/BOINCTaskBar.cpp:522
+#: BOINCTaskBar.cpp:508
 #, c-format
 msgid "Open %s Web..."
 msgstr "Åpne %s nett..."
 
-#: clientgui/BOINCTaskBar.cpp:529
+#: BOINCTaskBar.cpp:515
 #, c-format
 msgid "Open %s..."
 msgstr "Åpne %s..."
 
-#: clientgui/BOINCTaskBar.cpp:536
-#: clientgui/BOINCTaskBar.cpp:633
-#: clientgui/BOINCTaskBar.cpp:641
+#: BOINCTaskBar.cpp:522 BOINCTaskBar.cpp:619 BOINCTaskBar.cpp:627
 msgid "Snooze"
 msgstr "Utsett"
 
-#: clientgui/BOINCTaskBar.cpp:538
-#: clientgui/BOINCTaskBar.cpp:660
-#: clientgui/BOINCTaskBar.cpp:668
+#: BOINCTaskBar.cpp:524 BOINCTaskBar.cpp:646 BOINCTaskBar.cpp:654
 msgid "Snooze GPU"
 msgstr "Utsett GPU"
 
-#: clientgui/BOINCTaskBar.cpp:556
+#: BOINCTaskBar.cpp:542
 msgid "E&xit"
-msgstr "Av%slutt"
+msgstr "A&vslutt"
 
-#: clientgui/BOINCTaskBar.cpp:626
+#: BOINCTaskBar.cpp:612 ViewProjects.cpp:718 ViewWork.cpp:795
+#: sg_BoincSimpleFrame.cpp:758 sg_ProjectCommandPopup.cpp:110
+#: sg_TaskCommandPopup.cpp:102
 msgid "Resume"
 msgstr "Gjennoppta"
 
-#: clientgui/BOINCTaskBar.cpp:653
+#: BOINCTaskBar.cpp:639
 msgid "Resume GPU"
 msgstr "Gjennoppta GPU"
 
-#: clientgui/BOINCTaskBar.cpp:727
+#: BOINCTaskBar.cpp:713
 msgid "Computing is enabled"
 msgstr "Databehandling er slått på"
 
-#: clientgui/BOINCTaskBar.cpp:731
+#: BOINCTaskBar.cpp:717
 msgid "Computing is suspended - "
 msgstr "Beregning er suspendert - "
 
-#: clientgui/BOINCTaskBar.cpp:741
+#: BOINCTaskBar.cpp:727
 msgid "GPU computing is enabled"
 msgstr "GPU beregning er aktivert"
 
-#: clientgui/BOINCTaskBar.cpp:744
+#: BOINCTaskBar.cpp:730
 msgid "GPU computing is suspended - "
 msgstr "GPU databehandling er suspendert - "
 
-#: clientgui/BOINCTaskBar.cpp:753
+#: BOINCTaskBar.cpp:739
 msgid "Network is enabled"
 msgstr "Nettverk er aktivert"
 
-#: clientgui/BOINCTaskBar.cpp:756
+#: BOINCTaskBar.cpp:742
 msgid "Network is suspended - "
 msgstr "Nettverk er suspendert - "
 
-#: clientgui/BOINCTaskBar.cpp:764
+#: BOINCTaskBar.cpp:750
 msgid "Reconnecting to client."
 msgstr "Kobler til klient på nytt."
 
-#: clientgui/BOINCTaskBar.cpp:766
+#: BOINCTaskBar.cpp:752
 msgid "Not connected to a client."
-msgstr "Ikke tilkoblet til en klient"
+msgstr "Ikke tilkoblet til en klient."
 
-#: clientgui/BOINCTaskBar.cpp:819
+#: BOINCTaskBar.cpp:805
 #, c-format
 msgid "%s Notices"
 msgstr "%s Varsler"
 
-#: clientgui/BOINCTaskBar.cpp:825
+#: BOINCTaskBar.cpp:811
 msgid "There are new notices - click to view."
 msgstr "Det er nye varsler - klikk for å vise."
 
-#: clientgui/CompletionErrorPage.cpp:199
+#: CompletionErrorPage.cpp:199
 msgid "Failed to add project"
 msgstr "Kunne ikke legge til prosjekt"
 
-#: clientgui/CompletionErrorPage.cpp:204
+#: CompletionErrorPage.cpp:204
 msgid "Failed to update account manager"
 msgstr "Kunne ikke oppdatere kontobehandler"
 
-# 84%
-#: clientgui/CompletionErrorPage.cpp:208
+#: CompletionErrorPage.cpp:208
 msgid "Failed to remove account manager"
 msgstr "Kunne ikke fjerne kontobehandler"
 
-# 84%
-#: clientgui/CompletionErrorPage.cpp:212
+#: CompletionErrorPage.cpp:212
 msgid "Failed to add account manager"
 msgstr "Kunne ikke legge til kontobehandler"
 
-#: clientgui/CompletionErrorPage.cpp:221
+#: CompletionErrorPage.cpp:221
 msgid ""
 "Please try again later.\n"
 "\n"
 "Click Finish to close."
-msgstr ""
-"Vennligst prøv igjen senere.\n"
-"\n"
-"Klikk Ferdig for å lukke."
+msgstr "Vennligst prøv igjen senere.\n\nKlikk Ferdig for å lukke."
 
-#: clientgui/CompletionErrorPage.cpp:225
-#: clientgui/CompletionPage.cpp:222
-#: clientgui/CompletionPage.cpp:242
-#: clientgui/CompletionPage.cpp:273
+#: CompletionErrorPage.cpp:225 CompletionPage.cpp:222 CompletionPage.cpp:242
+#: CompletionPage.cpp:273
 msgid "Click Finish to close."
 msgstr "Klikk Ferdig for å lukke."
 
-#: clientgui/CompletionErrorPage.cpp:234
+#: CompletionErrorPage.cpp:234
 msgid "Messages from server:"
 msgstr "Meldinger fra tjener:"
 
-#: clientgui/CompletionPage.cpp:207
+#: CompletionPage.cpp:207
 msgid "Project added"
 msgstr "Prosjekt lagt til"
 
-#: clientgui/CompletionPage.cpp:213
+#: CompletionPage.cpp:213
 msgid "This project has been successfully added."
 msgstr "Dette prosjektet har blitt lagt til korrekt."
 
-#: clientgui/CompletionPage.cpp:218
+#: 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 ""
-"Når du klikker Ferdig, vil nettleseren din gå til en side der\n"
-"du kan oppgi ditt kontonavn og innstillinger."
+msgstr "Når du klikker Ferdig, vil nettleseren din gå til en side der\ndu kan oppgi ditt kontonavn og innstillinger."
 
-#: clientgui/CompletionPage.cpp:232
+#: CompletionPage.cpp:232
 #, c-format
 msgid "Update from %s completed."
 msgstr "Oppdatering fra %s ferdig."
 
-#: clientgui/CompletionPage.cpp:236
+#: CompletionPage.cpp:236
 msgid "Update completed."
 msgstr "Oppdatering ferdig."
 
-#: clientgui/CompletionPage.cpp:247
+#: CompletionPage.cpp:247
 msgid "Now using account manager"
 msgstr "Bruker kontobehandler nå"
 
-#: clientgui/CompletionPage.cpp:252
+#: CompletionPage.cpp:252
 #, c-format
 msgid "Welcome to %s!"
 msgstr "Velkommen til %s!"
 
-#: clientgui/CompletionPage.cpp:263
+#: CompletionPage.cpp:263
 #, c-format
 msgid "You are now using %s to manage accounts."
 msgstr "Du bruker nå %s for å håndtere kontoer."
 
-#: clientgui/CompletionPage.cpp:267
+#: CompletionPage.cpp:267
 msgid "You are now using this account manager."
 msgstr "Du bruker nå denne kontobehandleren."
 
-#: clientgui/DlgAbout.cpp:113
+#: DlgAbout.cpp:113 mac/Mac_GUI.cpp:96
 #, c-format
 msgid "About %s"
 msgstr "Om %s"
 
-#: clientgui/DlgAbout.cpp:172
+#: DlgAbout.cpp:172
 msgid "Version:"
 msgstr "Versjon:"
 
-#: clientgui/DlgAbout.cpp:180
+#: DlgAbout.cpp:180
 msgid "wxWidgets Version:"
 msgstr "wxWidgets Versjon:"
 
-#: clientgui/DlgAbout.cpp:188
+#: DlgAbout.cpp:188
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: clientgui/DlgAbout.cpp:192
+#: DlgAbout.cpp:192
 msgid ""
-"(C) 2003-2014 University of California, Berkeley.\n"
+"(C) 2003-2013 University of California, Berkeley.\n"
 "All Rights Reserved."
-msgstr ""
+msgstr "(C) 2003-2013 University of California, Berkeley.\nAll Rights Reserved."
 
-#: clientgui/DlgAbout.cpp:196
+#: DlgAbout.cpp:196
 msgid "Berkeley Open Infrastructure for Network Computing"
 msgstr "Berkeley Open Infrastructure for Network Computing"
 
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:399
-#: clientgui/DlgSelectComputer.cpp:163
+#: DlgAbout.cpp:208 DlgExitMessage.cpp:173 DlgGenericMessage.cpp:120
+#: DlgOptions.cpp:396 DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "&OK"
 
-#: clientgui/DlgAdvPreferences.cpp:602
+#: DlgAdvPreferences.cpp:544
 msgid "invalid number"
 msgstr "ugyldig nummer"
 
-#: clientgui/DlgAdvPreferences.cpp:603
+#: DlgAdvPreferences.cpp:545
 msgid "invalid time, format is HH:MM"
-msgstr "Ugyldig tid, formatet er TT:MM"
+msgstr "ugyldig tid, formatet er HH:MM"
 
-#: clientgui/DlgAdvPreferences.cpp:604
+#: DlgAdvPreferences.cpp:546
 msgid "invalid time interval, format is HH:MM-HH:MM"
-msgstr "Ugyldig tids intervall, formatet er TT:MM-TT:MM"
+msgstr "ugyldig tids intervall, formatet er HH:MM-HH:MM"
 
-#: clientgui/DlgAdvPreferences.cpp:817
+#: DlgAdvPreferences.cpp:751
 msgid "invalid input value detected"
 msgstr "ugyldig inndata verdi oppdaget"
 
-#: clientgui/DlgAdvPreferences.cpp:819
+#: DlgAdvPreferences.cpp:753
 msgid "Validation Error"
 msgstr "Valideringsfeil"
 
-#: clientgui/DlgAdvPreferences.cpp:969
-#: clientgui/DlgAdvPreferences.cpp:975
-#: clientgui/DlgAdvPreferences.cpp:981
+#: DlgAdvPreferences.cpp:885 DlgAdvPreferences.cpp:891
+#: DlgAdvPreferences.cpp:897
 msgid "Applications to add"
 msgstr "Legg til programmer"
 
-#: clientgui/DlgAdvPreferences.cpp:998
+#: DlgAdvPreferences.cpp:914
 #, c-format
 msgid "'%s' is not an executable application."
 msgstr "'%s' er ikke en kjørbar applikasjon."
 
-#: clientgui/DlgAdvPreferences.cpp:999
-#: clientgui/DlgAdvPreferences.cpp:1046
-#: clientgui/DlgAdvPreferences.cpp:1070
+#: DlgAdvPreferences.cpp:915 DlgAdvPreferences.cpp:962
+#: DlgAdvPreferences.cpp:986
 msgid "Add Exclusive App"
 msgstr "Legg til app med enerett"
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Name of application to add?"
 msgstr "Navn på program å legge til?"
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Add exclusive app"
 msgstr "Legg til app med enerett"
 
-#: clientgui/DlgAdvPreferences.cpp:1045
+#: DlgAdvPreferences.cpp:961
 #, c-format
 msgid "Application names must end with '%s'"
-msgstr "Applikasjon navn må slutte med \"%s\""
+msgstr "Applikasjon navn må slutte med '%s'"
 
-#: clientgui/DlgAdvPreferences.cpp:1069
+#: DlgAdvPreferences.cpp:985
 #, c-format
 msgid "'%s' is already in the list."
 msgstr "'%s' er allerede i listen."
 
-#: clientgui/DlgAdvPreferences.cpp:1161
+#: DlgAdvPreferences.cpp:1077
 msgid ""
 "Do you really want to clear all local preferences?\n"
 "(This will not affect exclusive applications.)"
-msgstr ""
-"Ønsker du virkelig å fjerne alle lokale instillinger?\n"
-"(Dette vil ikke påvirke ekslusive applikasjoner.)"
+msgstr "Ønsker du virkelig å fjerne alle lokale instillinger?\n(Dette vil ikke påvirke ekslusive applikasjoner.)"
 
-#: clientgui/DlgAdvPreferences.cpp:1162
+#: DlgAdvPreferences.cpp:1078 sg_DlgPreferences.cpp:1030
 msgid "Confirmation"
 msgstr "Bekreftelse"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:49
+#: DlgAdvPreferencesBase.cpp:46 sg_DlgPreferences.cpp:946
 #, c-format
-msgid "%s - Computing preferences"
-msgstr ""
+msgid "%s - Preferences"
+msgstr "%s - Innstillinger"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:66
+#: DlgAdvPreferencesBase.cpp:62
 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 ""
-"Denne dialogboksen kontrollerer utelukkende innstillinger for denne datamaskinen.\n"
-"Klikk OK for lagre innstillingene.\n"
-"Klikk Fjern for å gjenopprette nettbaserte innstillinger (endrer ikke programinnstillinger)."
+msgstr "Denne dialogboksen kontrollerer utelukkende innstillinger for denne datamaskinen.\nKlikk OK for lagre innstillingene.\nKlikk Fjern for å gjenopprette nettbaserte innstillinger (endrer ikke programinnstillinger)."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:69
+#: DlgAdvPreferencesBase.cpp:65 sg_DlgPreferences.cpp:428
 msgid "Clear"
 msgstr "Fjern"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:70
+#: DlgAdvPreferencesBase.cpp:66
 msgid "clear all local preferences and close the dialog"
 msgstr "fjern alle lokale innstillinger og lukk dialogboksen"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:85
+#: DlgAdvPreferencesBase.cpp:81
 msgid "processor usage"
 msgstr "prosessorbruk"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:88
+#: DlgAdvPreferencesBase.cpp:84
 msgid "network usage"
 msgstr "nettverk bruk"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:91
+#: DlgAdvPreferencesBase.cpp:87
 msgid "disk and memory usage"
 msgstr "disk og minne bruk"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:94
+#: DlgAdvPreferencesBase.cpp:90
 msgid "exclusive applications"
-msgstr "Applikasjoner med enerett"
+msgstr "applikasjoner med enerett"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:107
-#: clientgui/DlgDiagnosticLogFlags.cpp:104
+#: DlgAdvPreferencesBase.cpp:102 sg_DlgPreferences.cpp:424
 msgid "OK"
 msgstr "OK"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:108
+#: DlgAdvPreferencesBase.cpp:103
 msgid "save all values and close the dialog"
 msgstr "lagre alle verdier og lukk dialogboksen"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:114
+#: DlgAdvPreferencesBase.cpp:108
 msgid "close the dialog without saving"
 msgstr "lukk dialogboksen uten å lagre"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:118
-#: clientgui/Localization.cpp:35
-#: clientgui/Localization.cpp:121
-#: clientgui/Localization.cpp:139
+#: DlgAdvPreferencesBase.cpp:112 Localization.cpp:35 Localization.cpp:121
+#: Localization.cpp:139 sg_BoincSimpleFrame.cpp:794 sg_DlgPreferences.cpp:439
 msgid "Help"
 msgstr "Hjelp"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
+#: DlgAdvPreferencesBase.cpp:113
 msgid "shows the preferences web page"
 msgstr "viser nettsiden for preferanser"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:141
+#: DlgAdvPreferencesBase.cpp:135
 msgid "Computing allowed"
 msgstr "Beregning tillatt"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
+#: DlgAdvPreferencesBase.cpp:139
 msgid "While computer is on batteries"
 msgstr "Når datamaskinen går på batterier"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:149
-msgid "check this if you want this computer to do work while it runs on batteries"
+#: DlgAdvPreferencesBase.cpp:142
+msgid ""
+"check this if you want this computer to do work while it runs on batteries"
 msgstr "sett kryss om du ønsker at denne datamaskinen skal utføre arbeid når den kjører på batterier"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:155
+#: DlgAdvPreferencesBase.cpp:148
 msgid "While computer is in use"
 msgstr "Når datamaskinen er i bruk"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:158
-msgid "check this if you want this computer to do work even when you're using it"
+#: DlgAdvPreferencesBase.cpp:151
+msgid ""
+"check this if you want this computer to do work even when you're using it"
 msgstr "sett kryss om du ønsker at denne datamaskinen skal utføre arbeid, selv når du bruker den"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:164
+#: DlgAdvPreferencesBase.cpp:157
 msgid "Use GPU while computer is in use"
 msgstr "Bruk GPU mens datamaskinen er i bruk"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:167
-msgid "check this if you want your GPU to do work even when you're using the computer"
-msgstr "sett kryss om du ønsker at grafikkprosessoren skal utføre arbeid, selv når du bruker datamaskinen"
+#: DlgAdvPreferencesBase.cpp:160
+msgid ""
+"check this if you want your GPU to do work even when you're using the "
+"computer"
+msgstr "sett kryss om du ønsker at GPU skal utføre arbeid, selv når du bruker datamaskinen"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:179
+#: DlgAdvPreferencesBase.cpp:172
 msgid "Only after computer has been idle for"
 msgstr "Bare etter at datamaskinen har vært inaktiv i"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:188
-msgid "do work only after you haven't used the computer for this number of minutes"
+#: DlgAdvPreferencesBase.cpp:182
+msgid ""
+"do work only after you haven't used the computer for this number of minutes"
 msgstr "bare utfør arbeid etter at du ikke har brukt datamaskinen i dette antall minutter"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:193
-#: clientgui/DlgAdvPreferencesBase.cpp:342
+#: DlgAdvPreferencesBase.cpp:187 DlgAdvPreferencesBase.cpp:336
+#: sg_DlgPreferences.cpp:417
 msgid "minutes"
 msgstr "minutter"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:212
+#: DlgAdvPreferencesBase.cpp:206
 msgid "While processor usage is less than"
 msgstr "Når prosessorbruken er mindre enn"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:221
+#: DlgAdvPreferencesBase.cpp:216
 msgid "suspend work if processor usage exceeds this level"
 msgstr "suspender arbeid hvis prosessor bruken overstiger dette nivået"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:226
+#: DlgAdvPreferencesBase.cpp:221
 msgid "percent (0 means no restriction)"
 msgstr "prosent (0 betyr ingen begrensning)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:240
-#: clientgui/DlgAdvPreferencesBase.cpp:506
+#: DlgAdvPreferencesBase.cpp:235 DlgAdvPreferencesBase.cpp:496
 msgid "Every day between hours of"
 msgstr "Hver dag mellom"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: DlgAdvPreferencesBase.cpp:239
 msgid "start work at this time"
 msgstr "start arbeid klokken"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:248
-#: clientgui/DlgAdvPreferencesBase.cpp:514
+#: DlgAdvPreferencesBase.cpp:243 DlgAdvPreferencesBase.cpp:504
+#: sg_DlgPreferences.cpp:326 sg_DlgPreferences.cpp:348
 msgid "and"
 msgstr "og"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:252
+#: DlgAdvPreferencesBase.cpp:247
 msgid "stop work at this time"
 msgstr "stopp arbeid klokken"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
-#: clientgui/DlgAdvPreferencesBase.cpp:522
+#: DlgAdvPreferencesBase.cpp:251 DlgAdvPreferencesBase.cpp:512
 msgid "(no restriction if equal)"
 msgstr "(ingen begrensning hvis lik)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:261
-#: clientgui/DlgAdvPreferencesBase.cpp:527
+#: DlgAdvPreferencesBase.cpp:256 DlgAdvPreferencesBase.cpp:517
 msgid "Day-of-week override:"
 msgstr "Overstyr ukedag:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:266
-#: clientgui/DlgAdvPreferencesBase.cpp:532
+#: DlgAdvPreferencesBase.cpp:261 DlgAdvPreferencesBase.cpp:522
 msgid "check box to specify hours for this day of week"
 msgstr "sett kryss for å spesifisere tidsintervall for denne ukedagen"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:272
-#: clientgui/DlgAdvPreferencesBase.cpp:538
+#: DlgAdvPreferencesBase.cpp:267 DlgAdvPreferencesBase.cpp:528
 msgid "Monday"
 msgstr "Mandag"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:279
-#: clientgui/DlgAdvPreferencesBase.cpp:545
+#: DlgAdvPreferencesBase.cpp:274 DlgAdvPreferencesBase.cpp:535
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:286
-#: clientgui/DlgAdvPreferencesBase.cpp:552
+#: DlgAdvPreferencesBase.cpp:281 DlgAdvPreferencesBase.cpp:542
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:293
-#: clientgui/DlgAdvPreferencesBase.cpp:559
+#: DlgAdvPreferencesBase.cpp:288 DlgAdvPreferencesBase.cpp:549
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:300
-#: clientgui/DlgAdvPreferencesBase.cpp:566
+#: DlgAdvPreferencesBase.cpp:295 DlgAdvPreferencesBase.cpp:556
 msgid "Friday"
 msgstr "Fredag"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:307
-#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: DlgAdvPreferencesBase.cpp:302 DlgAdvPreferencesBase.cpp:563
 msgid "Saturday"
 msgstr "Lørdag"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:580
+#: DlgAdvPreferencesBase.cpp:309 DlgAdvPreferencesBase.cpp:570
 msgid "Sunday"
 msgstr "Søndag"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:328
+#: DlgAdvPreferencesBase.cpp:323
 msgid "Other options"
 msgstr "Andre alternativer"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:336
+#: DlgAdvPreferencesBase.cpp:330
 msgid "Switch between applications every"
 msgstr "Bytt mellom applikasjon hver"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:345
+#: DlgAdvPreferencesBase.cpp:339
 msgid "On multiprocessor systems, use at most"
 msgstr "På multiprosessorsystemer, bruk maks"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
+#: DlgAdvPreferencesBase.cpp:346
 #, no-c-format
-msgid "% of the processors (0 means no restriction)"
-msgstr ""
+msgid "% of the processors (0 means ignore this setting)"
+msgstr "% av prosessorene (0 betyr ignorer denne innstillingen)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:355
-#: clientgui/DlgAdvPreferencesBase.cpp:618
-#: clientgui/DlgAdvPreferencesBase.cpp:640
-#: clientgui/DlgAdvPreferencesBase.cpp:661
-#: clientgui/DlgAdvPreferencesBase.cpp:683
-#: clientgui/DlgAdvPreferencesBase.cpp:694
+#: DlgAdvPreferencesBase.cpp:349 DlgAdvPreferencesBase.cpp:605
+#: DlgAdvPreferencesBase.cpp:627 DlgAdvPreferencesBase.cpp:648
+#: DlgAdvPreferencesBase.cpp:669 DlgAdvPreferencesBase.cpp:679
 msgid "Use at most"
 msgstr "Bruk på det meste"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:362
+#: DlgAdvPreferencesBase.cpp:356
 #, no-c-format
-msgid "% of CPU time (0 means no restriction)"
-msgstr ""
+msgid "% CPU time"
+msgstr "% CPU tid"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:386
+#: DlgAdvPreferencesBase.cpp:378
 msgid "General options"
 msgstr "Generelle alternativer"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:395
+#: DlgAdvPreferencesBase.cpp:386
 msgid "Maximum download rate"
 msgstr "Maksimum nedlastingshastighet"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:401
-#: clientgui/DlgAdvPreferencesBase.cpp:410
-msgid "KBytes/second (0 means no restriction)"
-msgstr ""
+#: DlgAdvPreferencesBase.cpp:392 DlgAdvPreferencesBase.cpp:401
+msgid "KBytes/sec."
+msgstr "KBytes/sek."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:404
+#: DlgAdvPreferencesBase.cpp:395
 msgid "Maximum upload rate"
 msgstr "Maksimum opplastingshastighet"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:417
+#: DlgAdvPreferencesBase.cpp:406
+msgid "Transfer at most"
+msgstr "Overfør på det meste"
+
+#: DlgAdvPreferencesBase.cpp:412
+msgid "Mbytes"
+msgstr "Mbytes"
+
+#: DlgAdvPreferencesBase.cpp:415
+msgid "every"
+msgstr "hver"
+
+#: DlgAdvPreferencesBase.cpp:421 DlgAdvPreferencesBase.cpp:444
+#: DlgAdvPreferencesBase.cpp:463
+msgid "days"
+msgstr "dager"
+
+#: DlgAdvPreferencesBase.cpp:429
 msgid "Minimum work buffer"
 msgstr "Minimum arbeidsbuffer"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:425
+#: DlgAdvPreferencesBase.cpp:438
 msgid "Try to maintain enough tasks to keep busy for this many days"
 msgstr "Prøv å opprettholde nok oppgaver til å være opptatt i følgende antall dager"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:431
-#: clientgui/DlgAdvPreferencesBase.cpp:449
-msgid "days (maximum value: 10)"
-msgstr ""
-
-#: clientgui/DlgAdvPreferencesBase.cpp:437
+#: DlgAdvPreferencesBase.cpp:450
 msgid "Max additional work buffer"
 msgstr "Maks ekstra arbeidsbuffer"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:445
+#: DlgAdvPreferencesBase.cpp:459
 msgid "In addition, maintain enough tasks for up to this many days"
 msgstr "I tillegg, oppretthold nok oppgaver opp til dette antall dager"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:454
-msgid "Transfer at most"
-msgstr "Overfør på det meste"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:462
-msgid "MBytes every"
-msgstr ""
-
-#: clientgui/DlgAdvPreferencesBase.cpp:468
-msgid "days (0 means no restriction)"
-msgstr ""
-
-#: clientgui/DlgAdvPreferencesBase.cpp:476
+#: DlgAdvPreferencesBase.cpp:466
 msgid "Skip image file verification"
 msgstr "Hopp over verifisering av avbildningsfil"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:478
+#: DlgAdvPreferencesBase.cpp:468
 msgid "check this if your Internet provider modifies image files"
 msgstr "merk denne hvis din Internettleverandør modifiserer avbildingsfilene"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:484
+#: DlgAdvPreferencesBase.cpp:476
 msgid "Connect options"
 msgstr "Tilkoblings alternativer"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:487
+#: DlgAdvPreferencesBase.cpp:478
 msgid "Confirm before connecting to internet"
 msgstr "Bekreft før det kobles til Internet"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
+#: DlgAdvPreferencesBase.cpp:480
+msgid ""
+"if checked, a confirmation dialog will be displayed before trying to connect"
+" to the Internet"
 msgstr "hvis merket, vil en dialogboks vises før det forsøkes å koble til Internet"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:493
+#: DlgAdvPreferencesBase.cpp:484
 msgid "Disconnect when done"
 msgstr "Koble fra når ferdig"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:495
+#: DlgAdvPreferencesBase.cpp:486
 msgid ""
 "if checked, BOINC hangs up when network usage is done\n"
 "(only relevant for dialup-connection)"
-msgstr ""
-"hvis merket, vil BOINC koble fra når overføring er ferdig\n"
-"(kun relevant for oppringte tilkoblinger)"
+msgstr "hvis merket, vil BOINC koble fra når overføring er ferdig\n(kun relevant for oppringte tilkoblinger)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:501
+#: DlgAdvPreferencesBase.cpp:492
 msgid "Network usage allowed"
 msgstr "Nettverksbruk tillatt"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:510
+#: DlgAdvPreferencesBase.cpp:500
 msgid "network usage start hour"
 msgstr "bruk av nettverk starter klokken"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:518
+#: DlgAdvPreferencesBase.cpp:508
 msgid "network usage stop hour"
 msgstr "bruk av nettverk stopper klokken"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:610
-#: clientgui/DlgItemProperties.cpp:257
+#: DlgAdvPreferencesBase.cpp:598 DlgItemProperties.cpp:231
 msgid "Disk usage"
 msgstr "Disk bruk"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:622
+#: DlgAdvPreferencesBase.cpp:609
 msgid "the maximum disk space used by BOINC (in Gigabytes)"
 msgstr "maksimal diskplass brukt av BOINC (i Gigabytes)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:626
-msgid "Gigabytes disk space (0 means no restriction)"
-msgstr ""
+#: DlgAdvPreferencesBase.cpp:613
+msgid "Gigabytes disk space"
+msgstr "Gigabytes diskplass"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:629
+#: DlgAdvPreferencesBase.cpp:616
 msgid "Leave at least"
 msgstr "La det minst være"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:633
+#: DlgAdvPreferencesBase.cpp:620
 msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
 msgstr "BOINC lar det minimum være så mye diskplass ledig (i Gigabytes)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:637
+#: DlgAdvPreferencesBase.cpp:624
 msgid "Gigabytes disk space free"
 msgstr "Gigabytes diskplass ledig"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
+#: DlgAdvPreferencesBase.cpp:631
 msgid "BOINC uses at most this percentage of total disk space"
 msgstr "BOINC bruker på det meste denne prosentandelen av total diskplass"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:649
+#: DlgAdvPreferencesBase.cpp:636
 #, no-c-format
 msgid "% of total disk space"
 msgstr "% av total diskplass"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:652
+#: DlgAdvPreferencesBase.cpp:639
 msgid "Tasks checkpoint to disk at most every"
 msgstr "Kontrollpunkt for oppgaver skrives til disk på det meste hver"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
+#: DlgAdvPreferencesBase.cpp:645
 msgid "seconds"
 msgstr "sekunder"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:668
+#: DlgAdvPreferencesBase.cpp:655
 #, no-c-format
 msgid "% of page file (swap space)"
 msgstr "% av sidevekslingsfil (veksleområde)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:675
+#: DlgAdvPreferencesBase.cpp:662
 msgid "Memory usage"
 msgstr "Minnebruk"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
+#: DlgAdvPreferencesBase.cpp:676
 #, no-c-format
 msgid "% when computer is in use"
 msgstr "% når datamaskinen er i bruk"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:701
+#: DlgAdvPreferencesBase.cpp:686
 #, no-c-format
 msgid "% when computer is idle"
 msgstr "% når datamaskinen er inaktiv"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:706
+#: DlgAdvPreferencesBase.cpp:691
 msgid "Leave applications in memory while suspended"
 msgstr "La applikasjonene bli værende i minnet når suspendert"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:708
+#: DlgAdvPreferencesBase.cpp:693
 msgid "if checked, suspended work units are left in memory"
 msgstr "hvis merket, vil suspenderte arbeidsenheter bli værende i minnet"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:728
-msgid "Suspend processor and network usage when these applications are running:"
+#: DlgAdvPreferencesBase.cpp:713
+msgid ""
+"Suspend processor and network usage when these applications are running:"
 msgstr "Suspender bruk av prosessor og nettverk når disse programmene kjører:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:738
+#: DlgAdvPreferencesBase.cpp:722
 msgid "Add..."
 msgstr "Legg til..."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:739
+#: DlgAdvPreferencesBase.cpp:723
 msgid "Add an application to this list"
 msgstr "Legg til en applikasjon i denne listen"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:744
+#: DlgAdvPreferencesBase.cpp:728 ViewProjects.cpp:202
+#: sg_ProjectCommandPopup.cpp:85
 msgid "Remove"
 msgstr "Fjern"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:745
+#: DlgAdvPreferencesBase.cpp:729
 msgid "Remove an application from this list"
 msgstr "Fjern en applikasjon fra denne listen"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:754
+#: DlgAdvPreferencesBase.cpp:738
 msgid "For advanced options, refer to "
-msgstr "For avanserte alternativer, henvis til"
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:65
-#, c-format
-msgid "%s Diagnostic Log Flags"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:83
-msgid "These flags enable various types of diagnostic messages in the Event Log."
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:105
-msgid "Save all values and close the dialog"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:108
-msgid "Defaults"
-msgstr ""
+msgstr "For avanserte alternativer, henvis til "
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:109
-msgid "Restore default settings"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:113
-msgid "Close the dialog without saving"
-msgstr ""
-
-#: clientgui/DlgEventLog.cpp:226
+#: DlgEventLog.cpp:219
 #, c-format
 msgid "%s - Event Log"
 msgstr "%s - Hendelseslogg"
 
-#: clientgui/DlgEventLog.cpp:236
+#: DlgEventLog.cpp:232 ViewMessages.cpp:117 ViewProjects.cpp:219
+#: ViewStatistics.cpp:435 ViewStatistics.cpp:2009 ViewTransfers.cpp:182
+#: ViewWork.cpp:232
 msgid "Project"
 msgstr "Prosjekt"
 
-#: clientgui/DlgEventLog.cpp:237
+#: DlgEventLog.cpp:233 ViewMessages.cpp:118
 msgid "Time"
 msgstr "Tid"
 
-#: clientgui/DlgEventLog.cpp:238
+#: DlgEventLog.cpp:234 ViewMessages.cpp:119
 msgid "Message"
 msgstr "Melding"
 
-#: clientgui/DlgEventLog.cpp:300
-#: clientgui/DlgEventLog.cpp:364
+#: DlgEventLog.cpp:290 DlgEventLog.cpp:354
 msgid "&Show only this project"
 msgstr "&Vis bare dette prosjektet"
 
-#: clientgui/DlgEventLog.cpp:304
+#: DlgEventLog.cpp:294
 msgid "Copy &All"
 msgstr "Kopier &alt"
 
-#: clientgui/DlgEventLog.cpp:306
-#: clientgui/DlgEventLog.cpp:310
+#: DlgEventLog.cpp:296 DlgEventLog.cpp:300 ViewMessages.cpp:89
 msgid "Copy all the messages to the clipboard."
 msgstr "Kopier alle meldinger til utklippstavlen."
 
-#: clientgui/DlgEventLog.cpp:315
+#: DlgEventLog.cpp:305
 msgid "Copy &Selected"
 msgstr "Kopier &valgte"
 
-#: clientgui/DlgEventLog.cpp:318
-#: clientgui/DlgEventLog.cpp:326
-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."
+#: DlgEventLog.cpp:308 DlgEventLog.cpp:316 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 "Kopier valgte meldinger til utklippstavlen. Du kan velge flere meldinger ved å holde Shift eller Command tasten inne mens du klikker på meldingene."
 
-#: clientgui/DlgEventLog.cpp:320
-#: clientgui/DlgEventLog.cpp:328
-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."
+#: DlgEventLog.cpp:310 DlgEventLog.cpp:318 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 "Kopier valgte meldinger til utklippstavlen. Du kan velge flere meldinger ved å trykke Shift eller Control tasten inne mens du klikker på meldingene."
 
-#: clientgui/DlgEventLog.cpp:335
-#: clientgui/DlgItemProperties.cpp:67
+#: DlgEventLog.cpp:325 DlgItemProperties.cpp:67
 msgid "&Close"
 msgstr "&Lukk"
 
-#: clientgui/DlgEventLog.cpp:344
+#: DlgEventLog.cpp:334 sg_BoincSimpleFrame.cpp:798 sg_DlgPreferences.cpp:442
 #, c-format
 msgid "Get help with %s"
 msgstr "Få hjelp med %s"
 
-#: clientgui/DlgEventLog.cpp:358
+#: DlgEventLog.cpp:348
 msgid "Show all &messages"
 msgstr "Vis alle &meldinger"
 
-#: clientgui/DlgEventLog.cpp:359
-#: clientgui/DlgEventLog.cpp:361
+#: DlgEventLog.cpp:349 DlgEventLog.cpp:351
 msgid "Show messages for all projects"
 msgstr "Vis meldinger for alle prosjekter"
 
-#: clientgui/DlgEventLog.cpp:365
-#: clientgui/DlgEventLog.cpp:367
+#: DlgEventLog.cpp:355 DlgEventLog.cpp:357
 msgid "Show only the messages for the selected project"
 msgstr "Bare vis meldinger for valgte prosjekt"
 
-#: clientgui/DlgExitMessage.cpp:82
+#: DlgExitMessage.cpp:82
 #, c-format
 msgid "%s - Exit Confirmation"
 msgstr "%s - Avslutt bekreftelse"
 
-#: clientgui/DlgExitMessage.cpp:130
+#: DlgExitMessage.cpp:130
 #, c-format
 msgid ""
 "You have requested to exit the %s,\n"
@@ -1694,15 +1550,9 @@ msgid ""
 "\n"
 "If you also want to stop running the tasks,\n"
 "choose from the following options:"
-msgstr ""
-"Du har valgt å avslutte %s,\n"
-"som lar det vise og administrere\n"
-"oppgavene som kjører på din arbeidsstasjon.\n"
-"\n"
-"Hvis du også ønsker å stoppe kjøring av oppgavene,\n"
-"velg fra følgende alternativer:"
+msgstr "Du har valgt å avslutte %s,\nsom lar det vise og administrere\noppgavene som kjører på din arbeidsstasjon.\n\nHvis du også ønsker å stoppe kjøring av oppgavene,\nvelg fra følgende alternativer:"
 
-#: clientgui/DlgExitMessage.cpp:135
+#: DlgExitMessage.cpp:135
 #, c-format
 msgid ""
 "This will shut down %s and its tasks until either the\n"
@@ -1711,999 +1561,916 @@ msgid ""
 "In most cases, it is better just to close the %s window\n"
 "rather than to exit the application; that will allow %s to run its\n"
 "tasks at the times you selected in your preferences."
-msgstr ""
-"Dette vil stenge ned %s og dens oppgaver inntil enten\n"
-"%s eller skjermspareren til %s kjører igjen.\n"
-"\n"
-"I de fleste tilfeller, er det bedre å lukke %s vinduet\n"
-"istedenfor å avslutte applikasjonen; som tillater %s å kjøre dens\n"
-"oppgaver på tidspunktene du har valgt i dine innstillinger."
+msgstr "Dette vil stenge ned %s og dens oppgaver inntil enten\n%s eller skjermspareren til %s kjører igjen.\n\nI de fleste tilfeller, er det bedre å lukke %s vinduet\nistedenfor å avslutte applikasjonen; som tillater %s å kjøre dens\noppgaver på tidspunktene du har valgt i dine innstillinger."
 
-#: clientgui/DlgExitMessage.cpp:153
+#: DlgExitMessage.cpp:153
 #, c-format
 msgid "Stop running tasks when exiting the %s"
 msgstr "Stopp kjøring av oppgaver ved avsluttning av %s"
 
-#: clientgui/DlgExitMessage.cpp:165
+#: DlgExitMessage.cpp:165
 msgid "Remember this decision and do not show this dialog."
 msgstr "Husk dette valget og ikke vis denne dialogboksen."
 
-#: clientgui/DlgExitMessage.cpp:178
-#: clientgui/DlgGenericMessage.cpp:125
-#: clientgui/DlgOptions.cpp:404
-#: clientgui/DlgSelectComputer.cpp:168
+#: DlgExitMessage.cpp:178 DlgGenericMessage.cpp:125 DlgOptions.cpp:401
+#: DlgSelectComputer.cpp:168 wizardex.cpp:378
 msgid "&Cancel"
 msgstr "&Avbryt"
 
-#: clientgui/DlgGenericMessage.cpp:112
+#: DlgGenericMessage.cpp:112
 msgid "Don't show this dialog again."
 msgstr "Ikke vis denne dialogboksen igjen."
 
-#: clientgui/DlgItemProperties.cpp:194
-#: clientgui/DlgItemProperties.cpp:197
-#: clientgui/DlgItemProperties.cpp:200
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:168 DlgItemProperties.cpp:171
+#: DlgItemProperties.cpp:174 DlgItemProperties.cpp:177
 msgid "Don't fetch tasks for "
 msgstr "Ikke hent oppgaver for "
 
-#: clientgui/DlgItemProperties.cpp:194
+#: DlgItemProperties.cpp:168
 msgid "Project preference"
-msgstr "Prosjekt innstilling "
+msgstr "Prosjekt innstilling"
 
-#: clientgui/DlgItemProperties.cpp:197
+#: DlgItemProperties.cpp:171
 msgid "Account manager preference"
 msgstr "Kontobehandlerinnstilling"
 
-#: clientgui/DlgItemProperties.cpp:200
+#: DlgItemProperties.cpp:174
 msgid "Project has no apps for "
 msgstr "Prosjektet har ingen apps til "
 
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:177
 msgid "Client configuration excludes "
 msgstr "Klientkonfigurasjonen ekskluderer "
 
-#: clientgui/DlgItemProperties.cpp:207
+#: DlgItemProperties.cpp:181
 msgid " work fetch deferred for"
 msgstr " arbeidsfangst utsatt for"
 
-#: clientgui/DlgItemProperties.cpp:208
+#: DlgItemProperties.cpp:182
 msgid " work fetch deferral interval"
 msgstr " intervall for utsettelse av arbeidsfangst"
 
-#: clientgui/DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:213
 msgid "Properties of project "
 msgstr "Egenskaper for prosjekt "
 
-#: clientgui/DlgItemProperties.cpp:243
-#: clientgui/DlgOptions.cpp:221
+#: DlgItemProperties.cpp:217 DlgOptions.cpp:218
 msgid "General"
 msgstr "Generelle"
 
-#: clientgui/DlgItemProperties.cpp:244
+#: DlgItemProperties.cpp:218
 msgid "Master URL"
 msgstr "Hoved URL"
 
-#: clientgui/DlgItemProperties.cpp:245
+#: DlgItemProperties.cpp:219
 msgid "User name"
 msgstr "Brukernavn"
 
-#: clientgui/DlgItemProperties.cpp:246
+#: DlgItemProperties.cpp:220
 msgid "Team name"
 msgstr "Team navn"
 
-#: clientgui/DlgItemProperties.cpp:247
+#: DlgItemProperties.cpp:221 ViewProjects.cpp:224
 msgid "Resource share"
-msgstr "Ressursandel"
+msgstr "Ressurs fordeling"
 
-#: clientgui/DlgItemProperties.cpp:249
+#: DlgItemProperties.cpp:223
 msgid "Scheduler RPC deferred for"
 msgstr "RPC planlegger utsatt for"
 
-#: clientgui/DlgItemProperties.cpp:252
+#: DlgItemProperties.cpp:226
 msgid "File downloads deferred for"
 msgstr "Nedlastning av filer utsatt for"
 
-#: clientgui/DlgItemProperties.cpp:255
+#: DlgItemProperties.cpp:229
 msgid "File uploads deferred for"
 msgstr "Opplasting av filer utsatt for"
 
-#: clientgui/DlgItemProperties.cpp:258
+#: DlgItemProperties.cpp:232
 msgid "Computer ID"
 msgstr "Datamaskin ID"
 
-#: clientgui/DlgItemProperties.cpp:260
+#: DlgItemProperties.cpp:234
 msgid "Non CPU intensive"
 msgstr "Ikke CPU intensiv"
 
-#: 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
+#: DlgItemProperties.cpp:234 DlgItemProperties.cpp:236
+#: DlgItemProperties.cpp:237 DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:242 DlgItemProperties.cpp:251
+#: DlgItemProperties.cpp:254 DlgItemProperties.cpp:257
 msgid "yes"
 msgstr "ja"
 
-#: clientgui/DlgItemProperties.cpp:262
+#: DlgItemProperties.cpp:236
 msgid "Suspended via GUI"
 msgstr "Suspendert via GUI"
 
-#: clientgui/DlgItemProperties.cpp:262
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:236 DlgItemProperties.cpp:237
 msgid "no"
 msgstr "nei"
 
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:237
 msgid "Don't request more work"
 msgstr "Ikke anmod mer arbeid"
 
-#: clientgui/DlgItemProperties.cpp:265
+#: DlgItemProperties.cpp:239
 msgid "Scheduler call in progress"
 msgstr "Samtaleplanlegging pågår"
 
-#: clientgui/DlgItemProperties.cpp:268
+#: DlgItemProperties.cpp:242
 msgid "Trickle-up pending"
 msgstr "Godskriv andel venter"
 
-#: clientgui/DlgItemProperties.cpp:271
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:245 DlgItemProperties.cpp:247
 msgid "Host location"
 msgstr "Vertslokasjon"
 
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:247
 msgid "default"
 msgstr "forvalg"
 
-#: clientgui/DlgItemProperties.cpp:277
+#: DlgItemProperties.cpp:251
 msgid "Added via account manager"
 msgstr "Lagt til via kontobehandler"
 
-#: clientgui/DlgItemProperties.cpp:280
+#: DlgItemProperties.cpp:254
 msgid "Remove when tasks done"
 msgstr "Fjern når oppgavene er utført"
 
-#: clientgui/DlgItemProperties.cpp:283
+#: DlgItemProperties.cpp:257
 msgid "Ended"
 msgstr "Ferdig"
 
-#: clientgui/DlgItemProperties.cpp:285
-msgid "Tasks completed"
-msgstr ""
-
-#: clientgui/DlgItemProperties.cpp:286
-msgid "Tasks failed"
-msgstr ""
-
-#: clientgui/DlgItemProperties.cpp:288
+#: DlgItemProperties.cpp:259
 msgid "Credit"
 msgstr "Arbeid utført"
 
-#: clientgui/DlgItemProperties.cpp:289
+#: DlgItemProperties.cpp:260
 msgid "User"
 msgstr "Bruker"
 
-#: clientgui/DlgItemProperties.cpp:296
+#: DlgItemProperties.cpp:267
 msgid "Host"
 msgstr "Vert"
 
-#: clientgui/DlgItemProperties.cpp:305
+#: DlgItemProperties.cpp:276
 msgid "Scheduling"
 msgstr "Planlegging"
 
-#: clientgui/DlgItemProperties.cpp:306
+#: DlgItemProperties.cpp:277
 msgid "Scheduling priority"
 msgstr "Planleggingsprioritet"
 
-#: clientgui/DlgItemProperties.cpp:307
+#: DlgItemProperties.cpp:278
 msgid "CPU"
-msgstr "Prosessor"
+msgstr "CPU"
 
-#: clientgui/DlgItemProperties.cpp:331
+#: DlgItemProperties.cpp:302
 msgid "Duration correction factor"
 msgstr "Korrigeringsfaktor varighet"
 
-#: clientgui/DlgItemProperties.cpp:345
+#: DlgItemProperties.cpp:316
 msgid "Properties of task "
 msgstr "Egenskaper for oppgave "
 
-#: clientgui/DlgItemProperties.cpp:357
+#: DlgItemProperties.cpp:328 ViewWork.cpp:238
 msgid "Application"
 msgstr "Applikasjon"
 
-#: clientgui/DlgItemProperties.cpp:358
+#: DlgItemProperties.cpp:329 ViewWork.cpp:239
 msgid "Name"
 msgstr "Navn"
 
-#: clientgui/DlgItemProperties.cpp:359
+#: DlgItemProperties.cpp:330
 msgid "State"
 msgstr "Tilstand"
 
-#: clientgui/DlgItemProperties.cpp:362
+#: DlgItemProperties.cpp:333
 msgid "Received"
 msgstr "Mottatt"
 
-#: clientgui/DlgItemProperties.cpp:365
+#: DlgItemProperties.cpp:336
 msgid "Report deadline"
 msgstr "Rapporter frist"
 
-#: clientgui/DlgItemProperties.cpp:367
+#: DlgItemProperties.cpp:338
 msgid "Resources"
 msgstr "Resurser"
 
-#: clientgui/DlgItemProperties.cpp:370
+#: DlgItemProperties.cpp:341
 msgid "Estimated computation size"
 msgstr "Estimert beregningsstørrelse"
 
-#: clientgui/DlgItemProperties.cpp:373
+#: DlgItemProperties.cpp:344
 msgid "CPU time at last checkpoint"
 msgstr "CPU tid ved siste sjekkpunkt"
 
-#: clientgui/DlgItemProperties.cpp:374
-#: clientgui/DlgItemProperties.cpp:389
+#: DlgItemProperties.cpp:345 DlgItemProperties.cpp:360
 msgid "CPU time"
 msgstr "CPU tid"
 
-#: clientgui/DlgItemProperties.cpp:376
-#: clientgui/DlgItemProperties.cpp:390
+#: DlgItemProperties.cpp:347 DlgItemProperties.cpp:361
 msgid "Elapsed time"
 msgstr "Tid brukt"
 
-#: clientgui/DlgItemProperties.cpp:378
+#: DlgItemProperties.cpp:349
 msgid "Estimated time remaining"
 msgstr "Forventet tid igjen"
 
-#: clientgui/DlgItemProperties.cpp:379
+#: DlgItemProperties.cpp:350
 msgid "Fraction done"
 msgstr "Fraksjon ferdig"
 
-#: clientgui/DlgItemProperties.cpp:380
+#: DlgItemProperties.cpp:351
 msgid "Virtual memory size"
 msgstr "Virtuell minne størrelse"
 
-#: clientgui/DlgItemProperties.cpp:381
+#: DlgItemProperties.cpp:352
 msgid "Working set size"
 msgstr "Arbeidssettstørrelse"
 
-#: clientgui/DlgItemProperties.cpp:383
+#: DlgItemProperties.cpp:354
 msgid "Directory"
 msgstr "Katalog"
 
-#: clientgui/DlgItemProperties.cpp:386
+#: DlgItemProperties.cpp:357
 msgid "Process ID"
 msgstr "Prosess ID"
 
-#: clientgui/DlgItemProperties.cpp:456
+#: DlgItemProperties.cpp:427 ViewWork.cpp:1032 sg_TaskPanel.cpp:823
 msgid "Local: "
 msgstr "Lokal: "
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: DlgOptions.cpp:129 DlgOptions.cpp:135
 msgid "Options"
 msgstr "Alternativer"
 
-#: clientgui/DlgOptions.cpp:178
+#: DlgOptions.cpp:175
 msgid "Language:"
 msgstr "Språk:"
 
-#: clientgui/DlgOptions.cpp:185
+#: DlgOptions.cpp:182
 msgid "What language should BOINC use?"
 msgstr "Hvilket språk skal BOINC bruke?"
 
-#: clientgui/DlgOptions.cpp:189
+#: DlgOptions.cpp:186
 msgid "Notice reminder interval:"
 msgstr "Varselintervall for påminnelser:"
 
-#: clientgui/DlgOptions.cpp:196
+#: DlgOptions.cpp:193
 msgid "How often should BOINC remind you of new notices?"
 msgstr "Hvor ofte skal BOINC gi deg påminnelse om nye varsler?"
 
-#: clientgui/DlgOptions.cpp:201
+#: DlgOptions.cpp:198
 msgid "Run Manager at login?"
 msgstr "Kjør kontobehandler ved innlogging?"
 
-#: clientgui/DlgOptions.cpp:207
+#: DlgOptions.cpp:204
 msgid "Run the BOINC Manager when you log on."
 msgstr "Kjør BOINC kontobehandler når du logger på."
 
-#: clientgui/DlgOptions.cpp:212
+#: DlgOptions.cpp:209
 msgid "Enable Manager exit dialog?"
 msgstr "Aktivere avsluttningsdialogboksen for behandleren?"
 
-#: clientgui/DlgOptions.cpp:218
+#: DlgOptions.cpp:215
 msgid "Display the exit dialog when shutting down the Manager."
 msgstr "Vis dialogboks for avsluttning når behandleren stenges ned."
 
-#: clientgui/DlgOptions.cpp:229
+#: DlgOptions.cpp:226
 msgid "Dial-up and Virtual Private Network settings"
-msgstr "Innstillinger for oppringte- og virtuelle private nettverk"
+msgstr "Innstillinger for oppringte og virtuelle private nettverk"
 
-#: clientgui/DlgOptions.cpp:243
+#: DlgOptions.cpp:240
 msgid "&Set Default"
-msgstr "%Angi forvalg"
+msgstr "&Angi forvalg"
 
-#: clientgui/DlgOptions.cpp:248
+#: DlgOptions.cpp:245
 msgid "&Clear Default"
-msgstr "%Fjern forvalg"
+msgstr "&Fjern forvalg"
 
-#: clientgui/DlgOptions.cpp:255
+#: DlgOptions.cpp:252
 msgid "Default Connection:"
 msgstr "Standard tilkobling:"
 
-#: clientgui/DlgOptions.cpp:262
+#: DlgOptions.cpp:259
 msgid "Connections"
 msgstr "Tilkoblinger"
 
-#: clientgui/DlgOptions.cpp:271
+#: DlgOptions.cpp:268
 msgid "Connect via HTTP proxy server"
 msgstr "Tilkoblet via HTTP proxy-tjener"
 
-#: clientgui/DlgOptions.cpp:275
+#: DlgOptions.cpp:272
 msgid "HTTP Proxy Server Configuration"
 msgstr "HTTP Proxy-tjener konfigurasjon"
 
-#: clientgui/DlgOptions.cpp:283
-#: clientgui/DlgOptions.cpp:347
+#: DlgOptions.cpp:280 DlgOptions.cpp:344
 msgid "Address:"
 msgstr "Adresse:"
 
-#: clientgui/DlgOptions.cpp:291
-#: clientgui/DlgOptions.cpp:355
+#: DlgOptions.cpp:288 DlgOptions.cpp:352 ProxyPage.cpp:340 ProxyPage.cpp:360
 msgid "Port:"
 msgstr "Port:"
 
-#: clientgui/DlgOptions.cpp:299
-#: clientgui/DlgOptions.cpp:363
+#: DlgOptions.cpp:296 DlgOptions.cpp:360
 msgid "Don't use proxy for:"
 msgstr "Ikke bruk mellomtjener for:"
 
-#: clientgui/DlgOptions.cpp:306
-#: clientgui/DlgOptions.cpp:370
+#: DlgOptions.cpp:303 DlgOptions.cpp:367
 msgid "Leave these blank if not needed"
-msgstr "La disse være blanke hvis de ikke behøves."
+msgstr "La disse være blanke hvis de ikke behøves"
 
-#: clientgui/DlgOptions.cpp:312
-#: clientgui/DlgOptions.cpp:376
+#: DlgOptions.cpp:309 DlgOptions.cpp:373 ProxyPage.cpp:343 ProxyPage.cpp:363
 msgid "User Name:"
 msgstr "Brukernavn:"
 
-#: clientgui/DlgOptions.cpp:320
-#: clientgui/DlgOptions.cpp:384
-#: clientgui/DlgSelectComputer.cpp:152
+#: DlgOptions.cpp:317 DlgOptions.cpp:381 DlgSelectComputer.cpp:152
+#: ProxyPage.cpp:346 ProxyPage.cpp:366
 msgid "Password:"
 msgstr "Passord:"
 
-#: clientgui/DlgOptions.cpp:327
+#: DlgOptions.cpp:324
 msgid "HTTP Proxy"
 msgstr "HTTP mellomtjener"
 
-#: clientgui/DlgOptions.cpp:335
+#: DlgOptions.cpp:332
 msgid "Connect via SOCKS proxy server"
 msgstr "Koble til via SOCKS mellomtjener"
 
-#: clientgui/DlgOptions.cpp:339
+#: DlgOptions.cpp:336
 msgid "SOCKS Proxy Server Configuration"
 msgstr "SOCKS mellomtjener konfigurasjon"
 
-#: clientgui/DlgOptions.cpp:391
+#: DlgOptions.cpp:388
 msgid "SOCKS Proxy"
 msgstr "SOCKS mellomtjener"
 
-#: clientgui/DlgOptions.cpp:589
+#: DlgOptions.cpp:586
 msgid "always"
 msgstr "alltid"
 
-#: clientgui/DlgOptions.cpp:590
+#: DlgOptions.cpp:587
 msgid "1 hour"
 msgstr "1 time"
 
-#: clientgui/DlgOptions.cpp:591
+#: DlgOptions.cpp:588
 msgid "6 hours"
 msgstr "6 timer"
 
-#: clientgui/DlgOptions.cpp:592
+#: DlgOptions.cpp:589
 msgid "1 day"
 msgstr "1 dag"
 
-#: clientgui/DlgOptions.cpp:593
+#: DlgOptions.cpp:590
 msgid "1 week"
 msgstr "1 uke"
 
-#: clientgui/DlgOptions.cpp:594
+#: DlgOptions.cpp:591
 msgid "never"
 msgstr "aldri"
 
-#: clientgui/DlgOptions.cpp:691
+#: DlgOptions.cpp:688
 #, c-format
 msgid "%s - Language Selection"
 msgstr "%s - Språkvalg"
 
-#: clientgui/DlgOptions.cpp:698
+#: DlgOptions.cpp:695
 #, 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 "Standardspråk for %s er endret.  For å ta i bruk endringene må du starte %s på nytt."
 
-#: clientgui/DlgSelectComputer.cpp:91
+#: DlgSelectComputer.cpp:91
 #, c-format
 msgid "%s - Select Computer"
 msgstr "%s - Velg datamaskin"
 
-#: clientgui/DlgSelectComputer.cpp:125
+#: DlgSelectComputer.cpp:125
 #, c-format
 msgid ""
 "Another instance of %s is already running \n"
 "on this computer.  Please select a client to monitor."
-msgstr ""
-"En annen forekomst av %s kjører allerede \n"
-"på denne datamaskinen.  Vennligst velg en klient å monitorere."
+msgstr "En annen forekomst av %s kjører allerede \npå denne datamaskinen.  Vennligst velg en klient å monitorere."
 
-#: clientgui/DlgSelectComputer.cpp:143
+#: DlgSelectComputer.cpp:143
 msgid "Host name:"
 msgstr "Vertsnavn:"
 
-#: clientgui/Localization.cpp:31
-#: clientgui/Localization.cpp:69
+#: Localization.cpp:31 Localization.cpp:69
 msgid "Message boards"
 msgstr "Diskusjonsfora"
 
-#: clientgui/Localization.cpp:33
+#: Localization.cpp:33
 msgid "Correspond with other users on the SETI at home message boards"
 msgstr "Utveksle meldinger med andre brukere på SETI at home diskusjonsforum"
 
-#: clientgui/Localization.cpp:37
+#: Localization.cpp:37
 msgid "Ask questions and report problems"
 msgstr "Still spørsmål og rapporter problemer"
 
-#: clientgui/Localization.cpp:39
-#: clientgui/Localization.cpp:81
-#: clientgui/Localization.cpp:111
-#: clientgui/Localization.cpp:129
+#: Localization.cpp:39 Localization.cpp:81 Localization.cpp:111
+#: Localization.cpp:129
 msgid "Your account"
 msgstr "Din konto"
 
-#: clientgui/Localization.cpp:41
-#: clientgui/Localization.cpp:87
-#: clientgui/Localization.cpp:113
+#: Localization.cpp:41 Localization.cpp:87 Localization.cpp:113
 msgid "View your account information and credit totals"
 msgstr "Vis din kontoinformasjon og dine totaler"
 
-#: clientgui/Localization.cpp:43
+#: Localization.cpp:43
 msgid "Your preferences"
 msgstr "Dine innstillinger"
 
-#: clientgui/Localization.cpp:45
+#: Localization.cpp:45
 msgid "View and modify your SETI at home account profile and preferences"
 msgstr "Vis og endre din SETI at home kontoprofil og innstillinger"
 
-#: clientgui/Localization.cpp:47
-#: clientgui/Localization.cpp:89
+#: Localization.cpp:47 Localization.cpp:89
 msgid "Your results"
 msgstr "Dine resultat"
 
-#: clientgui/Localization.cpp:49
-#: clientgui/Localization.cpp:91
+#: Localization.cpp:49 Localization.cpp:91
 msgid "View your last week (or more) of computational results and work"
 msgstr "Vis din siste ukes (eller mer) beregningsresultater og arbeid"
 
-#: clientgui/Localization.cpp:51
-#: clientgui/Localization.cpp:93
+#: Localization.cpp:51 Localization.cpp:93
 msgid "Your computers"
 msgstr "Dine datamaskiner"
 
-#: clientgui/Localization.cpp:53
+#: Localization.cpp:53
 msgid "View a listing of all the computers on which you are running SETI at Home"
 msgstr "Vis liste med alle dine datamaskiner som kjører SETI at Home"
 
-#: clientgui/Localization.cpp:55
-#: clientgui/Localization.cpp:97
+#: Localization.cpp:55 Localization.cpp:97
 msgid "Your team"
 msgstr "Ditt team"
 
-#: clientgui/Localization.cpp:57
-#: clientgui/Localization.cpp:99
+#: Localization.cpp:57 Localization.cpp:99
 msgid "View information about your team"
 msgstr "Vis informasjon om ditt team"
 
-#: clientgui/Localization.cpp:61
+#: Localization.cpp:61
 msgid "Common questions"
 msgstr "Vanlige spørsmål"
 
-#: clientgui/Localization.cpp:63
+#: Localization.cpp:63
 msgid "Read the Einstein at Home Frequently Asked Question list"
 msgstr "Les Einstein at Home's ofte stilte spørsmålslisten"
 
-#: clientgui/Localization.cpp:65
+#: Localization.cpp:65
 msgid "Screensaver info"
 msgstr "Skjermsparer info"
 
-#: clientgui/Localization.cpp:67
+#: Localization.cpp:67
 msgid "Read a detailed description of the Einstein at Home screensaver"
 msgstr "Les en detaljert beskrivelse av Einstein at Home's skjermsparer"
 
-#: clientgui/Localization.cpp:71
-msgid "Correspond with admins and other users on the Einstein at Home message boards"
+#: Localization.cpp:71
+msgid ""
+"Correspond with admins and other users on the Einstein at Home message boards"
 msgstr "Utveksle meldinger med administratorer og andre brukere på Einstein at Home diskusjonsforum"
 
-#: clientgui/Localization.cpp:73
+#: Localization.cpp:73
 msgid "Einstein status"
 msgstr "Einstein status"
 
-#: clientgui/Localization.cpp:75
+#: Localization.cpp:75
 msgid "Current status of the Einstein at Home server"
 msgstr "Nåværende status for Einstein at Home tjeneren"
 
-#: clientgui/Localization.cpp:77
+#: Localization.cpp:77
 msgid "Report problems"
 msgstr "Rapporter problemer"
 
-#: clientgui/Localization.cpp:79
+#: Localization.cpp:79
 msgid "A link to the Einstein at Home problems and bug reports message board"
 msgstr "Link til Einstein at Home diskusjonsforumet for problemer og feilrapporter"
 
-#: clientgui/Localization.cpp:83
+#: Localization.cpp:83
 msgid "View and modify your Einstein at Home account profile and preferences"
 msgstr "Vis og modifiser din Einstein at Home kontoprofil og innstillinger"
 
-#: clientgui/Localization.cpp:85
+#: Localization.cpp:85
 msgid "Account summary"
 msgstr "Konto sammendrag"
 
-#: clientgui/Localization.cpp:95
-msgid "View a listing of all the computers on which you are running Einstein at Home"
+#: Localization.cpp:95
+msgid ""
+"View a listing of all the computers on which you are running Einstein at Home"
 msgstr "Vis en oversikt over alle dine datamaskiner som kjører Einstein at Home"
 
-#: clientgui/Localization.cpp:101
+#: Localization.cpp:101
 msgid "LIGO project"
 msgstr "LIGO prosjekt"
 
-#: clientgui/Localization.cpp:103
-msgid "The home page of the Laser Interferometer Gravitational-wave Observatory (LIGO) project"
+#: Localization.cpp:103
+msgid ""
+"The home page of the Laser Interferometer Gravitational-wave Observatory "
+"(LIGO) project"
 msgstr "Hjemmesiden til Laser Interferometer Gravitional-wave Observatory (LIGO) prosjektet"
 
-#: clientgui/Localization.cpp:105
+#: Localization.cpp:105
 msgid "GEO-600 project"
 msgstr "GEO-600 prosjekt"
 
-#: clientgui/Localization.cpp:107
+#: Localization.cpp:107
 msgid "The home page of the GEO-600 project"
 msgstr "Hjemmesiden til GEO-600 prosjektet"
 
-#: clientgui/Localization.cpp:115
-#: clientgui/Localization.cpp:133
+#: Localization.cpp:115 Localization.cpp:133 ViewProjects.cpp:221
+#: ViewStatistics.cpp:465
 msgid "Team"
 msgstr "Team"
 
-#: clientgui/Localization.cpp:117
+#: Localization.cpp:117
 msgid "Info about your Team"
 msgstr "Informasjon om ditt Team"
 
-#: clientgui/Localization.cpp:123
+#: Localization.cpp:123
 msgid "Get help for climateprediction.net"
 msgstr "Få hjelp til climateprediction.net"
 
-#: clientgui/Localization.cpp:125
+#: Localization.cpp:125
 msgid "News"
 msgstr "Nyheter"
 
-#: clientgui/Localization.cpp:127
+#: Localization.cpp:127
 msgid "climateprediction.net News"
 msgstr "climateprediction.net Nyheter"
 
-#: clientgui/Localization.cpp:131
+#: Localization.cpp:131
 msgid "View your account information, credits, and trickles"
 msgstr "Vis din kontoinformasjon, poeng og andeler"
 
-#: clientgui/Localization.cpp:135
+#: Localization.cpp:135
 msgid "Info about your team"
-msgstr "Informasjon om ditt Team"
+msgstr "Informasjon om ditt team"
 
-#: clientgui/Localization.cpp:141
+#: Localization.cpp:141
 msgid "Search for help in our help system"
 msgstr "Søk etter hjelp i vårt hjelpesystem"
 
-#: clientgui/Localization.cpp:143
+#: Localization.cpp:143
 msgid "Global Statistics"
 msgstr "Global statestikk"
 
-#: clientgui/Localization.cpp:145
+#: Localization.cpp:145
 msgid "Summary statistics for World Community Grid"
 msgstr "Statistikksammendrag for World Community Grid"
 
-#: clientgui/Localization.cpp:147
+#: Localization.cpp:147
 msgid "My Grid"
 msgstr "Min grid"
 
-#: clientgui/Localization.cpp:149
+#: Localization.cpp:149
 msgid "Your statistics and settings"
 msgstr "Din statistikk og innstillinger"
 
-#: clientgui/Localization.cpp:151
+#: Localization.cpp:151
 msgid "Device Profiles"
 msgstr "Enhetsprofiler"
 
-#: clientgui/Localization.cpp:153
+#: Localization.cpp:153
 msgid "Update your device settings"
 msgstr "Oppdater din enhets innstillinger"
 
-#: clientgui/Localization.cpp:155
+#: Localization.cpp:155
 msgid "Research"
 msgstr "Forskning"
 
-#: clientgui/Localization.cpp:157
+#: Localization.cpp:157
 msgid "Learn about the projects hosted at World Community Grid"
 msgstr "Lær om prosjektene driftet av World Community Grid"
 
-#: clientgui/MainDocument.cpp:583
+#: MainDocument.cpp:583
 msgid "Starting client"
 msgstr "Starter klient"
 
-#: clientgui/MainDocument.cpp:591
+#: MainDocument.cpp:591
 msgid "Connecting to client"
 msgstr "Kobler til klient"
 
-#: clientgui/MainDocument.cpp:1205
+#: MainDocument.cpp:1195
 msgid "Retrieving system state; please wait..."
 msgstr "Henter systemstatus; vennligst vent..."
 
-#: clientgui/MainDocument.cpp:1826
+#: MainDocument.cpp:1816
 msgid "Missing application"
 msgstr "Applikasjon mangler"
 
-#: clientgui/MainDocument.cpp:1827
-msgid "Please download and install the CoRD application from http://cord.sourceforge.net"
+#: MainDocument.cpp:1817
+msgid ""
+"Please download and install the CoRD application from "
+"http://cord.sourceforge.net"
 msgstr "Vennligst last ned og installer CoRD applikasjonen fra http://cord.sourceforge.net"
 
-#: clientgui/MainDocument.cpp:2442
+#: MainDocument.cpp:2432
 msgid "on batteries"
 msgstr "på batterier"
 
-#: clientgui/MainDocument.cpp:2443
+#: MainDocument.cpp:2433
 msgid "computer is in use"
 msgstr "datamaskinen er i bruk"
 
-#: clientgui/MainDocument.cpp:2444
+#: MainDocument.cpp:2434
 msgid "user request"
 msgstr "bruker anmodning"
 
-#: clientgui/MainDocument.cpp:2445
+#: MainDocument.cpp:2435
 msgid "time of day"
 msgstr "tid på dag"
 
-#: clientgui/MainDocument.cpp:2446
+#: MainDocument.cpp:2436
 msgid "CPU benchmarks in progress"
 msgstr "CPU ytelsestest er startet"
 
-#: clientgui/MainDocument.cpp:2447
+#: MainDocument.cpp:2437
 msgid "need disk space - check preferences"
 msgstr "trenger diskplass - sjekk innstillinger"
 
-#: clientgui/MainDocument.cpp:2448
+#: MainDocument.cpp:2438
 msgid "computer is not in use"
 msgstr "datamaskinen er ikke i bruk"
 
-#: clientgui/MainDocument.cpp:2449
+#: MainDocument.cpp:2439
 msgid "starting up"
 msgstr "starter opp"
 
-#: clientgui/MainDocument.cpp:2450
+#: MainDocument.cpp:2440
 msgid "an exclusive app is running"
 msgstr "en app med enerett kjører"
 
-#: clientgui/MainDocument.cpp:2451
+#: MainDocument.cpp:2441
 msgid "CPU is busy"
 msgstr "CPU er opptatt"
 
-#: clientgui/MainDocument.cpp:2452
+#: MainDocument.cpp:2442
 msgid "network bandwidth limit exceeded"
 msgstr "grense for bruk av båndbredde er overskredet"
 
-#: clientgui/MainDocument.cpp:2453
+#: MainDocument.cpp:2443
 msgid "requested by operating system"
 msgstr "anmodet av operativsystemet"
 
-#: clientgui/MainDocument.cpp:2455
+#: MainDocument.cpp:2445
 msgid "unknown reason"
 msgstr "ukjent grunn"
 
-#: clientgui/MainDocument.cpp:2477
+#: MainDocument.cpp:2467
 msgid "GPU missing, "
 msgstr "GPU mangler, "
 
-#: clientgui/MainDocument.cpp:2484
+#: MainDocument.cpp:2474
 msgid "New"
 msgstr "Ny"
 
-#: clientgui/MainDocument.cpp:2488
+#: MainDocument.cpp:2478
 msgid "Download failed"
 msgstr "Nedlasting feilet"
 
-#: clientgui/MainDocument.cpp:2490
+#: MainDocument.cpp:2480
 msgid "Downloading"
 msgstr "Laster ned"
 
-#: clientgui/MainDocument.cpp:2492
-#: clientgui/MainDocument.cpp:2557
+#: MainDocument.cpp:2482 MainDocument.cpp:2552
 msgid " (suspended - "
 msgstr " (suspendert - "
 
-#: clientgui/MainDocument.cpp:2500
+#: MainDocument.cpp:2490
 msgid "Project suspended by user"
 msgstr "Prosjektet suspendert av bruker"
 
-#: clientgui/MainDocument.cpp:2502
+#: MainDocument.cpp:2492
 msgid "Task suspended by user"
 msgstr "Oppgave suspendert av bruker"
 
-#: clientgui/MainDocument.cpp:2504
+#: MainDocument.cpp:2494
 msgid "Suspended - "
 msgstr "Suspendert - "
 
-# 75%
-#: clientgui/MainDocument.cpp:2510
+#: MainDocument.cpp:2500
 msgid "GPU suspended - "
 msgstr "GPU suspendert - "
 
-#: clientgui/MainDocument.cpp:2517
+#: MainDocument.cpp:2507
 msgid "Waiting for memory"
 msgstr "Venter på minne"
 
-#: clientgui/MainDocument.cpp:2519
+#: MainDocument.cpp:2509
 msgid "Waiting for shared memory"
 msgstr "Venter på delt minne"
 
-#: clientgui/MainDocument.cpp:2521
+#: MainDocument.cpp:2512
+msgid "Running, high priority"
+msgstr "Kjører, høy prioritet"
+
+#: MainDocument.cpp:2514
 msgid "Running"
 msgstr "Kjører"
 
-#: clientgui/MainDocument.cpp:2523
+#: MainDocument.cpp:2517
 msgid " (non-CPU-intensive)"
 msgstr " (ikke-CPU-intensiv)"
 
-#: clientgui/MainDocument.cpp:2526
+#: MainDocument.cpp:2520
 msgid "Waiting to run"
 msgstr "Venter på å kjøre"
 
-#: clientgui/MainDocument.cpp:2528
-#: clientgui/MainDocument.cpp:2534
+#: MainDocument.cpp:2522 MainDocument.cpp:2528
 msgid "Ready to start"
 msgstr "Klar til å starte"
 
-#: clientgui/MainDocument.cpp:2538
-msgid "Postponed: "
-msgstr ""
+#: MainDocument.cpp:2532
+msgid " (Scheduler wait: "
+msgstr " (Planleggeren venter: "
 
-#: clientgui/MainDocument.cpp:2541
-msgid "Postponed"
-msgstr ""
+#: MainDocument.cpp:2536
+msgid " (Scheduler wait)"
+msgstr " (Planleggeren venter)"
 
-#: clientgui/MainDocument.cpp:2545
-msgid "Waiting for network access"
-msgstr ""
+#: MainDocument.cpp:2540
+msgid " (Waiting for network access)"
+msgstr " (Venter på nettverkstilgang)"
 
-#: clientgui/MainDocument.cpp:2549
+#: MainDocument.cpp:2544
 msgid "Computation error"
 msgstr "Beregningsfeil"
 
-#: clientgui/MainDocument.cpp:2553
+#: MainDocument.cpp:2548
 msgid "Upload failed"
 msgstr "Opplasting feilet"
 
-#: clientgui/MainDocument.cpp:2555
+#: MainDocument.cpp:2550
 msgid "Uploading"
 msgstr "Laster opp"
 
-#: clientgui/MainDocument.cpp:2566
+#: MainDocument.cpp:2561
 msgid "Aborted by user"
 msgstr "Avbrutt av bruker"
 
-#: clientgui/MainDocument.cpp:2569
+#: MainDocument.cpp:2564
 msgid "Aborted by project"
 msgstr "Avbrutt av prosjektet"
 
-#: clientgui/MainDocument.cpp:2572
+#: MainDocument.cpp:2567
 msgid "Aborted: not started by deadline"
-msgstr "Avbrutt: ikke startet innen tidsfristen"
+msgstr "Avbrutt: ikke startet innen fristen"
 
-#: clientgui/MainDocument.cpp:2575
+#: MainDocument.cpp:2570
 msgid "Aborted: disk limit exceeded"
 msgstr "Avbrutt: Plassbegrensning oversteget"
 
-#: clientgui/MainDocument.cpp:2578
+#: MainDocument.cpp:2573
 msgid "Aborted: run time limit exceeded"
 msgstr "Avbrutt: Grense for kjøretid oversteget"
 
-#: clientgui/MainDocument.cpp:2581
+#: MainDocument.cpp:2576
 msgid "Aborted: memory limit exceeded"
 msgstr "Avbrutt: Minneterskel overskredet"
 
-#: clientgui/MainDocument.cpp:2584
+#: MainDocument.cpp:2579
 msgid "Aborted"
 msgstr "Avbrutt"
 
-#: clientgui/MainDocument.cpp:2589
+#: MainDocument.cpp:2584
 msgid "Acknowledged"
 msgstr "Bekreftet"
 
-#: clientgui/MainDocument.cpp:2591
+#: MainDocument.cpp:2586
 msgid "Ready to report"
 msgstr "Klar til å rapportere"
 
-#: clientgui/MainDocument.cpp:2593
+#: MainDocument.cpp:2588
 #, c-format
 msgid "Error: invalid state '%d'"
 msgstr "Feil: ugyldig tilstand '%d'"
 
-#: clientgui/NoInternetConnectionPage.cpp:179
+#: NoInternetConnectionPage.cpp:179
 msgid "No Internet connection"
 msgstr "Ingen Internett tilgang"
 
-#: clientgui/NoInternetConnectionPage.cpp:182
+#: NoInternetConnectionPage.cpp:182
 msgid "Please connect to the Internet and try again."
 msgstr "Vennligst koble til Internett og prøv igjen."
 
-#: clientgui/NotDetectedPage.cpp:181
+#: NotDetectedPage.cpp:181
 msgid "Project not found"
 msgstr "Prosjekt ikke funnet"
 
-#: clientgui/NotDetectedPage.cpp:184
+#: 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 ""
-"URL'en du skrev inn er ikke et BOINC basert prosjekt.\n"
-"\n"
-"Vennligst sjekk URL'en og prøv igjen."
+msgstr "URL'en du skrev inn er ikke et BOINC basert prosjekt.\n\nVennligst sjekk URL'en og prøv igjen."
 
-#: clientgui/NotDetectedPage.cpp:188
+#: NotDetectedPage.cpp:188
 msgid "Account manager not found"
 msgstr "Kontobehandler ikke funnet"
 
-#: clientgui/NotDetectedPage.cpp:191
+#: NotDetectedPage.cpp:191
 msgid ""
 "The URL you supplied is not that of a BOINC-based account\n"
 "manager.\n"
 "\n"
 "Please check the URL and try again."
-msgstr ""
-"URL'en du tastet inn er ikke den til en BOINC basert konto\n"
-"behandler.\n"
-"Vennligst kontroller URL'en og prøv igjen."
+msgstr "URL'en du tastet inn er ikke den til en BOINC basert konto\nbehandler.\n\nVennligst kontroller URL'en og prøv igjen."
 
-#: clientgui/NotFoundPage.cpp:181
+#: NotFoundPage.cpp:181
 msgid "Login Failed."
 msgstr "Innlogging feilet."
 
-#: clientgui/NotFoundPage.cpp:185
+#: NotFoundPage.cpp:185
 msgid "Check the username and password, and try again."
 msgstr "Sjekk brukernavn og passord, og prøv igjen."
 
-#: clientgui/NotFoundPage.cpp:189
+#: NotFoundPage.cpp:189
 msgid "Check the email address and password, and try again."
 msgstr "Sjekk epostadressen og passordet, og prøv igjen."
 
-#: clientgui/NoticeListCtrl.cpp:229
+#: NoticeListCtrl.cpp:222
 msgid "more..."
 msgstr "mer..."
 
-#: clientgui/ProjectInfoPage.cpp:221
+#: ProjectInfoPage.cpp:477 ProjectInfoPage.cpp:778 ProjectInfoPage.cpp:782
+msgid "All"
+msgstr "Alle"
+
+#: ProjectInfoPage.cpp:615
 msgid "Choose a project"
 msgstr "Velg et prosjekt"
 
-#: clientgui/ProjectInfoPage.cpp:228
+#: ProjectInfoPage.cpp:619
 msgid "To choose a project, click its name or type its URL below."
 msgstr "For å velge et prosjekt, klikk på navnet eller skriv inn URL nedenfor."
 
-#: clientgui/ProjectInfoPage.cpp:246
+#: ProjectInfoPage.cpp:623
 msgid "Categories:"
 msgstr "Kategorier:"
 
-#: clientgui/ProjectInfoPage.cpp:267
+#: ProjectInfoPage.cpp:627 sg_ProjectPanel.cpp:89
 msgid "Projects:"
 msgstr "Prosjekter:"
 
-#: clientgui/ProjectInfoPage.cpp:279
+#: ProjectInfoPage.cpp:631
 msgid "Project details"
 msgstr "Prosjektdetaljer"
 
-#: clientgui/ProjectInfoPage.cpp:291
+#: ProjectInfoPage.cpp:635
 msgid "Research area:"
 msgstr "Forskningsområde:"
 
-#: clientgui/ProjectInfoPage.cpp:302
+#: ProjectInfoPage.cpp:639
 msgid "Organization:"
 msgstr "Organisasjon:"
 
-#: clientgui/ProjectInfoPage.cpp:313
+#: ProjectInfoPage.cpp:643
 msgid "Web site:"
 msgstr "Nettsted:"
 
-#: clientgui/ProjectInfoPage.cpp:325
+#: ProjectInfoPage.cpp:647
 msgid "Supported systems:"
 msgstr "Supporterte systemer:"
 
-#: clientgui/ProjectInfoPage.cpp:363
+#: ProjectInfoPage.cpp:651
 msgid "Project URL:"
 msgstr "Prosjekt &URL:"
 
-#: clientgui/ProjectInfoPage.cpp:499
-#: clientgui/ProjectInfoPage.cpp:754
-#: clientgui/ProjectInfoPage.cpp:758
-msgid "All"
-msgstr "Alle"
-
-#: clientgui/ProjectInfoPage.cpp:802
-msgid "This project may not have work for your type of computer.  Do you want to add it anyway?"
+#: ProjectInfoPage.cpp:826
+msgid ""
+"This project may not have work for your type of computer.  Do you want to "
+"add it anyway?"
 msgstr "Dette prosjektet har muligens ikke arbeid for din type arbeidsstasjon.  Ønsker du å legge til det allikevel?"
 
-#: clientgui/ProjectInfoPage.cpp:826
+#: ProjectInfoPage.cpp:850
 msgid "You already added this project. Please choose a different project."
 msgstr "Du har allerede lagt til dette prosjektet. Vennligst velg et annet prosjekt."
 
-#: clientgui/ProjectProcessingPage.cpp:321
+#: ProjectProcessingPage.cpp:321
 msgid "Communicating with project."
 msgstr "Kommuniserer med prosjektet."
 
-#: clientgui/ProjectProcessingPage.cpp:510
+#: ProjectProcessingPage.cpp:509
 msgid "Required files not found on the server."
 msgstr "Obligatoriske filer ikke funnet på tjeneren."
 
-#: clientgui/ProjectProcessingPage.cpp:513
-#: clientgui/ProjectProcessingPage.cpp:586
+#: ProjectProcessingPage.cpp:512 ProjectProcessingPage.cpp:574
 msgid "An internal server error has occurred."
 msgstr "En intern tjenerfeil har oppstått."
 
-#: clientgui/ProjectPropertiesPage.cpp:334
+#: ProjectPropertiesPage.cpp:334
 msgid ""
 "Communicating with project\n"
 "Please wait..."
-msgstr ""
-"Kommuniserer med prosjektet\n"
-"Vennligst vent..."
-
-#: clientgui/ProjectWelcomePage.cpp:251
-#, c-format
-msgid "Welcome to %s."
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:254
-msgid "You have volunteered to compute for this project:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:255
-msgid "Name:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:258
-msgid "Home:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:262
-msgid "Description:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:265
-msgid "URL:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:268
-msgid "User:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:273
-msgid "WARNING: This project is not registered with BOINC.  Make sure you trust it before continuing."
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:277
-msgid "To continue, click Next."
-msgstr "For å fortsette, klikk Neste."
+msgstr "Kommuniserer med prosjektet\nVennligst vent..."
 
-#: clientgui/ProxyInfoPage.cpp:195
+#: ProxyInfoPage.cpp:195
 msgid "Network communication failure"
 msgstr "Nettverk kommunikasjons feil"
 
-#: clientgui/ProxyInfoPage.cpp:199
+#: ProxyInfoPage.cpp:199
 msgid ""
 "The World Community Grid - BOINC software failed to communicate\n"
 "over the Internet. The most likely reasons are:\n"
@@ -2718,22 +2485,9 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"World Community Grid - BOINC programvaren kunne ikke kommunisere\n"
-"med Internett. De mest sannsynlige grunnene er:\n"
-"\n"
-"1)Tilkoblingsproblem. Sjekk din Internett eller modem tilkobling\n"
-"og klikk tilbake for å prøve igjen.\n"
-"\n"
-"2) Brannmuren din blokkerer World Community\n"
-"Grid - BOINC programvaren. Konfigurer brannmuren din for å la\n"
-"BOINC og BOINC Manager kommunisere på port 80 og port 443,\n"
-"klikk tilbake og prøv igjen.\n"
-"\n"
-"3)Du bruker en proxy tjener.\n"
-"Klikk neste for å konfigurere BOINC's proxy innstillinger.  "
+msgstr "World Community Grid - BOINC programvaren kunne ikke kommunisere\nmed Internett. De mest sannsynlige grunnene er:\n\n1)Tilkoblingsproblem.  Sjekk din Internett eller modem tilkobling\nog klikk tilbake for å prøve igjen.\n\n2) Brannmuren din blokkerer World Community\nGrid - BOINC programvaren.  Konfigurer brannmuren din for å la\nBOINC og BOINC Manager kommunisere på port 80 og port 443,\nklikk tilbake og prøv igjen.\n\n3)Du bruker en proxy tjener.\nKlikk neste for å konfigurere  [...]
 
-#: clientgui/ProxyInfoPage.cpp:203
+#: ProxyInfoPage.cpp:203
 msgid ""
 "BOINC failed to communicate on the Internet.\n"
 "The most likely reasons are:\n"
@@ -2748,1557 +2502,1201 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"BOINC kunne ikke kommunisere på Internett\n"
-"De mest sannsynlige grunnene er:\n"
-"\n"
-"1)Tilkoblingsproblem. Sjekk din Internett\n"
-"eller modem tilkobling og klikk tilbake for å prøve igjen.\n"
-"\n"
-"2) Brannmuren din blokkerer BOINC\n"
-" Konfigurer brannmuren din for å la BOINC og\n"
-"BOINC Manager kommunisere på port 80,\n"
-"klikk tilbake og prøv igjen.\n"
-"\n"
-"3)Du bruker en proxy tjener.\n"
-"Klikk neste for å konfigurere BOINC's proxy innstillinger. "
+msgstr "BOINC kunne ikke kommunisere på Internett\nDe mest sannsynlige grunnene er:\n\n1)Tilkoblingsproblem.  Sjekk din Internett\neller modem tilkobling og klikk tilbake for å prøve igjen.\n\n2) Brannmuren din blokkerer BOINC.\nKonfigurer brannmuren din for å la BOINC og\nBOINC Manager kommunisere på port 80,\nklikk tilbake og prøv igjen.\n\n3)Du bruker en proxy tjener.\nKlikk neste for å konfigurere BOINC's proxy innstillinger. "
 
-#: clientgui/ProxyPage.cpp:331
+#: ProxyPage.cpp:331
 msgid "Proxy configuration"
 msgstr "Mellomtjener konfigurasjon"
 
-#: clientgui/ProxyPage.cpp:334
+#: ProxyPage.cpp:334
 msgid "HTTP proxy"
 msgstr "HTTP mellomtjener"
 
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
+#: ProxyPage.cpp:337 ProxyPage.cpp:357
 msgid "Server:"
 msgstr "Tjener:"
 
-#: clientgui/ProxyPage.cpp:350
+#: ProxyPage.cpp:350
 msgid "Autodetect"
 msgstr "Oppdag automatisk"
 
-#: clientgui/ProxyPage.cpp:354
+#: ProxyPage.cpp:354
 msgid "SOCKS proxy"
 msgstr "SOCKS mellomtjener"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:167
-msgid "Advanced View...\tCtrl+Shift+A"
-msgstr "Avansert visning...\t Ctrl+Shift+A"
+#: TermsOfUsePage.cpp:218
+msgid "Terms of Use"
+msgstr "Vilkår for Bruk"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:168
-msgid "Display the advanced graphical interface."
-msgstr "Vis det grafisk avanserte brukergrensesnittet."
+#: TermsOfUsePage.cpp:222
+msgid "Please read the following terms of use:"
+msgstr "Vennligst les følgende vilkår for bruk:"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:175
-msgid "Skin"
-msgstr "Skall"
+#: TermsOfUsePage.cpp:231
+msgid "I agree to the terms of use."
+msgstr "Jeg aksepterer vilkårene for bruk."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:177
-msgid "Select the appearance of the user interface."
-msgstr "Velg utseende på brukergrensesnittet."
+#: TermsOfUsePage.cpp:237
+msgid "I do not agree to the terms of use."
+msgstr "Jeg aksepterer ikke vilkårene for bruk."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:224
-#, c-format
-msgid "&%s"
-msgstr "&%s"
+#: UnavailablePage.cpp:183
+msgid "Project temporarily unavailable"
+msgstr "Prosjektet er midlertidig utilgjengelig"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:405
-msgid "Default"
-msgstr "Standard"
+#: UnavailablePage.cpp:186
+msgid ""
+"The project is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "Prosjektet er midlertidig utilgjengelig.\n\nVennligst prøv igjen senere."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:848
-msgid "Suspend"
-msgstr "Suspender"
+#: UnavailablePage.cpp:190
+msgid "Account manager temporarily unavailable"
+msgstr "Kontobehandler midlertidig utilgjengelig"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:850
-msgid "Suspend Computing"
-msgstr "Suspender beregning"
+#: UnavailablePage.cpp:193
+msgid ""
+"The account manager is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "Kontobehandler er midlertidig utilgjengelig.\n\nVennligst prøv igjen senere."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:851
-msgid "Resume Computing"
-msgstr "Gjenoppta beregning"
+#: ValidateAccountKey.cpp:68
+msgid "Please specify an account key to continue."
+msgstr "Vennligst oppgi kontonøkkel for å fortsette."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:867
-msgid "Notices"
-msgstr "Varsler"
+#: ValidateAccountKey.cpp:71
+msgid "Invalid Account Key; please enter a valid Account Key"
+msgstr "Ugyldig kontonøkkel; vennligst tast inn en gyldig kontonøkkel"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:868
-msgid "Open a window to view notices from projects or BOINC"
-msgstr "Åpne et vindu for å vise varsler fra prosjekter eller BOINC"
+#: ValidateAccountKey.cpp:82 ValidateEmailAddress.cpp:86
+msgid "Validation conflict"
+msgstr "Valideringskonflikt"
 
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
-msgstr "Henter varsler; vennligst vent..."
+#: ValidateEmailAddress.cpp:72
+msgid "Please specify an email address"
+msgstr "Vennligst spesifiser en e-post adresse"
 
-#: clientgui/sg_DlgMessages.cpp:132
-msgid "There are no notices at this time."
-msgstr "Det er ingen meldinger."
+#: ValidateEmailAddress.cpp:75
+msgid "Invalid email address; please enter a valid email address"
+msgstr "Ugyldig e-post adresse; vennligst skriv inn en gyldig e-post adresse"
 
-#: clientgui/sg_DlgMessages.cpp:146
-msgid "Close"
-msgstr "Lukk"
+#: ValidateURL.cpp:69
+msgid "Missing URL"
+msgstr "Manglende URL"
 
-#: clientgui/sg_DlgMessages.cpp:394
-#, c-format
-msgid "%s - Notices"
-msgstr "%s - Varsler"
+#: ValidateURL.cpp:70
+msgid ""
+"Please specify a URL.\n"
+"For example:\n"
+"http://www.example.com/"
+msgstr "Vennligst spesifiser en URL.\nFor eksempel:\nhttp://www.example.com/"
 
-#: clientgui/sg_DlgPreferences.cpp:270
-msgid "This dialog controls preferences for this computer only."
-msgstr "Denne dialogboksen kontrollerer innstillinger kun for denne datamaskinen."
+#: ValidateURL.cpp:83 ValidateURL.cpp:87 ValidateURL.cpp:91
+#: ValidateURL.cpp:103 ValidateURL.cpp:107 ValidateURL.cpp:110
+msgid "Invalid URL"
+msgstr "Ugyldig URL"
 
-#: clientgui/sg_DlgPreferences.cpp:275
-msgid "Click OK to set preferences."
-msgstr "Klikk OK for å fastsette innstillinger."
+#: ValidateURL.cpp:84 ValidateURL.cpp:88 ValidateURL.cpp:92
+msgid ""
+"Please specify a valid URL.\n"
+"For example:\n"
+"http://boincproject.example.com"
+msgstr "Vennligst spesifiser en gyldig URL.\nFor eksempel:\nhttp://boincproject.example.com"
 
-#: clientgui/sg_DlgPreferences.cpp:280
-msgid "Click Clear to restore web-based settings for all preferences listed below."
-msgstr "Klikk Fjern for å gjenopprette webbaserte innstillinger for alle preferanser listet nedenfor."
+#: ValidateURL.cpp:104 ValidateURL.cpp:108
+#, c-format
+msgid "'%s' does not contain a valid host name."
+msgstr "'%s' inneholder ikke et gyldig vert navn."
 
-#: clientgui/sg_DlgPreferences.cpp:287
-msgid "For additional settings, select Computing Preferences in the Advanced View."
-msgstr "For ekstra innstillinger, velg Beregningsinnstillinger i Avansert visning."
+#: ValidateURL.cpp:111
+#, c-format
+msgid "'%s' does not contain a valid path."
+msgstr "'%s' inneholder ikke en gyldig sti."
 
-#: clientgui/sg_DlgPreferences.cpp:315
-msgid "Do work only between:"
-msgstr "Utfør arbeid bare mellom:"
+#: ViewMessages.cpp:84 ViewProjects.cpp:170 ViewStatistics.cpp:1978
+#: ViewTransfers.cpp:160 ViewWork.cpp:183
+msgid "Commands"
+msgstr "Kommandoer"
 
-#: clientgui/sg_DlgPreferences.cpp:337
-msgid "Connect to internet only between:"
-msgstr "Bare koble til Internet mellom:"
+#: ViewMessages.cpp:88
+msgid "Copy all messages"
+msgstr "Kopier alle meldinger"
 
-#: clientgui/sg_DlgPreferences.cpp:359
-#: clientgui/sg_DlgPreferences.cpp:376
-msgid "Use no more than:"
-msgstr "Ikke bruk mer enn:"
+#: ViewMessages.cpp:95
+msgid "Copy selected messages"
+msgstr "Kopier valgte meldinger"
 
-#: clientgui/sg_DlgPreferences.cpp:372
-msgid "of disk space"
-msgstr "av diskplass"
+#: ViewMessages.cpp:106 ViewMessages.cpp:502
+msgid "Show only this project"
+msgstr "Vis bare dette prosjektet"
 
-#: clientgui/sg_DlgPreferences.cpp:389
-msgid "of the processor"
-msgstr "av prosessoren"
+#: ViewMessages.cpp:107 ViewMessages.cpp:503
+msgid "Show only the messages for the selected project."
+msgstr "Vis bare meldinger for valgte prosjekt."
 
-#: clientgui/sg_DlgPreferences.cpp:393
-msgid "Do work while on battery?"
-msgstr "Utfør arbeid på batteridrift?"
+#: ViewMessages.cpp:164
+msgid "Messages"
+msgstr "Meldinger"
 
-#: clientgui/sg_DlgPreferences.cpp:406
-msgid "Do work after idle for:"
-msgstr "Utfør arbeid etter inaktiv i:"
-
-#: clientgui/sg_DlgPreferences.cpp:431
-msgid "Clear all local preferences listed above and close the dialog"
-msgstr "Fjern alle lokale innstillinger som vist over og lukk dialogboksen"
-
-#: clientgui/sg_DlgPreferences.cpp:609
-#: clientgui/sg_DlgPreferences.cpp:612
-#: clientgui/sg_DlgPreferences.cpp:688
-#: clientgui/sg_DlgPreferences.cpp:692
-#: clientgui/sg_DlgPreferences.cpp:704
-#: clientgui/sg_DlgPreferences.cpp:708
-#: clientgui/sg_DlgPreferences.cpp:851
-#: clientgui/sg_DlgPreferences.cpp:862
-msgid "Anytime"
-msgstr "Når som helst"
-
-#: clientgui/sg_DlgPreferences.cpp:645
-msgid "100 MB"
-msgstr "100 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:646
-msgid "200 MB"
-msgstr "200 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:647
-msgid "500 MB"
-msgstr "500 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:648
-msgid "1 GB"
-msgstr "1 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:649
-msgid "2 GB"
-msgstr "2 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:650
-msgid "5 GB"
-msgstr "5 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:651
-msgid "10 GB"
-msgstr "10 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:652
-msgid "20 GB"
-msgstr "20 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:653
-msgid "50 GB"
-msgstr "50 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:654
-msgid "100 GB"
-msgstr "100 GB"
+#: ViewMessages.cpp:187
+msgid "Copying all messages to the clipboard..."
+msgstr "Kopier alle meldinger til utklippstavle..."
 
-#: clientgui/sg_DlgPreferences.cpp:724
-#, c-format
-msgid "%d MB"
-msgstr "%d MB"
+#: ViewMessages.cpp:223
+msgid "Copying selected messages to the clipboard..."
+msgstr "Kopier valgte meldinger til utklippstavle..."
 
-#: clientgui/sg_DlgPreferences.cpp:726
-#, c-format
-msgid "%4.2f GB"
-msgstr "%4.2f GB"
+#: ViewMessages.cpp:286
+msgid "Filtering messages..."
+msgstr "Filtrer meldinger..."
 
-#: clientgui/sg_DlgPreferences.cpp:767
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
+#: ViewMessages.cpp:494
+msgid "Show all messages"
+msgstr "Vis alle meldinger"
 
-#: clientgui/sg_DlgPreferences.cpp:803
-msgid "0 (Run Always)"
-msgstr "0 (Kjør alltid)"
+#: ViewMessages.cpp:495
+msgid "Show messages for all projects."
+msgstr "Vis meldinger fra alle prosjekter."
 
-#: clientgui/sg_DlgPreferences.cpp:806
-#, c-format
-msgid "%d"
-msgstr "%d"
+#: ViewNotices.cpp:58 sg_DlgMessages.cpp:124
+msgid "Fetching notices; please wait..."
+msgstr "Henter varsler; vennligst vent..."
 
-#: clientgui/sg_DlgPreferences.cpp:953
-#, c-format
-msgid "%s - Computing Preferences"
-msgstr ""
+#: ViewNotices.cpp:65 sg_DlgMessages.cpp:132
+msgid "There are no notices at this time."
+msgstr "Det er ingen meldinger."
 
-#: clientgui/sg_DlgPreferences.cpp:1033
-msgid "Do you really want to clear all local preferences?\n"
-msgstr "Vil du virkelig fjerne alle lokale innstillinger?\n"
+#: ViewNotices.cpp:99 sg_BoincSimpleFrame.cpp:776
+msgid "Notices"
+msgstr "Varsler"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:66
-#: clientgui/ViewProjects.cpp:179
+#: ViewProjects.cpp:174 sg_ProjectCommandPopup.cpp:61
 msgid "Update"
 msgstr "Oppdater"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:67
-#: clientgui/ViewProjects.cpp:180
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
+#: ViewProjects.cpp:175 sg_ProjectCommandPopup.cpp:62
+msgid ""
+"Report all completed tasks, get latest credit, get latest preferences, and "
+"possibly get more tasks."
 msgstr "Rapporter alle utførte oppgaver, hent oversikt over arbeid utført, hent oppdaterte innstillinger, og last ned flere oppgaver hvis tilgjengelig."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:73
-#: clientgui/sg_ProjectCommandPopup.cpp:129
-#: clientgui/ViewProjects.cpp:187
-#: clientgui/ViewProjects.cpp:727
+#: 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
+msgid "Suspend"
+msgstr "Suspender"
+
+#: ViewProjects.cpp:182 ViewProjects.cpp:722 sg_ProjectCommandPopup.cpp:68
+#: sg_ProjectCommandPopup.cpp:114
 msgid "Suspend tasks for this project."
 msgstr "Suspender oppgaver fra dette prosjektet."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:78
-#: clientgui/sg_ProjectCommandPopup.cpp:136
-#: clientgui/ViewProjects.cpp:193
-#: clientgui/ViewProjects.cpp:746
+#: ViewProjects.cpp:188 ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:73
+#: sg_ProjectCommandPopup.cpp:121
 msgid "No new tasks"
 msgstr "Ingen nye oppgaver"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:79
-#: clientgui/ViewProjects.cpp:194
+#: ViewProjects.cpp:189 sg_ProjectCommandPopup.cpp:74
 msgid "Don't get new tasks for this project."
 msgstr "Ikke hent nye oppgaver for dette prosjektet."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:200
+#: ViewProjects.cpp:195 sg_ProjectCommandPopup.cpp:79
 msgid "Reset project"
 msgstr "Nullstill prosjekt"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:85
-#: clientgui/ViewProjects.cpp:201
-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."
+#: ViewProjects.cpp:196 sg_ProjectCommandPopup.cpp:80
+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 "Slett alle filer og oppgaver assosiert med dette prosjektet, og hent nye oppgaver.   Du kan oppdatere prosjektet først for å rapportere fullførte oppgaver."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:91
-#: clientgui/ViewProjects.cpp:208
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
+#: ViewProjects.cpp:203 sg_ProjectCommandPopup.cpp:86
+msgid ""
+"Remove this project.  Tasks in progress will be lost (use 'Update' first to "
+"report any completed tasks)."
 msgstr "Fjern dette prosjektet.  Oppgaver i arbeidskøen vil bli slettet (klikk 'Oppdater' først for å rapportere fullførte oppgaver)."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:96
-#: clientgui/sg_TaskCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:214
+#: ViewProjects.cpp:209 ViewWork.cpp:222 sg_ProjectCommandPopup.cpp:91
+#: sg_TaskCommandPopup.cpp:78
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:97
-#: clientgui/ViewProjects.cpp:215
+#: ViewProjects.cpp:210 sg_ProjectCommandPopup.cpp:92
 msgid "Show project details."
 msgstr "Vis prosjekt detaljer."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:126
-#: clientgui/ViewProjects.cpp:723
-msgid "Resume tasks for this project."
-msgstr "Gjenoppta oppgaver for dette prosjektet."
+#: ViewProjects.cpp:220 ViewStatistics.cpp:450
+msgid "Account"
+msgstr "Konto"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:133
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow new tasks"
-msgstr "Tillat nye oppgaver"
+#: ViewProjects.cpp:222
+msgid "Work done"
+msgstr "Arbeid ferdig"
 
-# 80%
-#: clientgui/sg_ProjectCommandPopup.cpp:134
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow fetching new tasks for this project."
-msgstr "Tillat henting av nye oppgaver for dette prosjektet."
+#: ViewProjects.cpp:223
+msgid "Avg. work done"
+msgstr "Gjennomsnittlig arbeid ferdig"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:137
-#: clientgui/ViewProjects.cpp:746
-msgid "Don't fetch new tasks for this project."
-msgstr "Ikke hent nye oppgaver for dette prosjektet."
+#: ViewProjects.cpp:225 ViewTransfers.cpp:188 ViewWork.cpp:234
+msgid "Status"
+msgstr "Status"
+
+#: ViewProjects.cpp:250
+msgid "Projects"
+msgstr "Prosjekter"
+
+#: ViewProjects.cpp:302
+msgid "Updating project..."
+msgstr "Oppdaterer prosjekt..."
+
+#: ViewProjects.cpp:344
+msgid "Resuming project..."
+msgstr "Gjenopptar prosjekt..."
+
+#: ViewProjects.cpp:348
+msgid "Suspending project..."
+msgstr "Suspender prosjekt..."
+
+#: ViewProjects.cpp:385
+msgid "Telling project to allow additional task downloads..."
+msgstr "Instruerer prosjektet om å tillate nedlastning av ekstra oppgaver..."
+
+#: ViewProjects.cpp:389
+msgid "Telling project to not fetch any additional tasks..."
+msgstr "Ber prosjektet om ikke å hente ekstra oppgaver..."
+
+#: ViewProjects.cpp:425
+msgid "Resetting project..."
+msgstr "Nullstiller prosjektet..."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:229
-#: clientgui/ViewProjects.cpp:443
+#: ViewProjects.cpp:438 sg_ProjectCommandPopup.cpp:214
 #, c-format
 msgid "Are you sure you want to reset project '%s'?"
 msgstr "Er du sikker på at du vil nullstille prosjektet '%s'?"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:235
-#: clientgui/ViewProjects.cpp:449
+#: ViewProjects.cpp:444 sg_ProjectCommandPopup.cpp:220
 msgid "Reset Project"
 msgstr "Nullstill prosjekt"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:266
-#: clientgui/ViewProjects.cpp:501
+#: ViewProjects.cpp:483
+msgid "Removing project..."
+msgstr "Fjerner prosjekt..."
+
+#: ViewProjects.cpp:496 sg_ProjectCommandPopup.cpp:251
 #, c-format
 msgid "Are you sure you want to remove project '%s'?"
 msgstr "Er du sikker på at du vil fjerne prosjekt '%s'?"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:272
-#: clientgui/ViewProjects.cpp:507
+#: ViewProjects.cpp:502 sg_ProjectCommandPopup.cpp:257
 msgid "Remove Project"
 msgstr "Fjern prosjekt"
 
-#: clientgui/sg_ProjectPanel.cpp:72
-msgid "Add Project"
-msgstr "Legg til prosjekt"
+#: ViewProjects.cpp:543 ViewWork.cpp:599
+msgid "Launching browser..."
+msgstr "Starter nettleser..."
 
-#: clientgui/sg_ProjectPanel.cpp:73
-msgid "Synchronize"
-msgstr "Synkroniser"
+#: ViewProjects.cpp:718 sg_ProjectCommandPopup.cpp:111
+msgid "Resume tasks for this project."
+msgstr "Gjenoppta oppgaver for dette prosjektet."
 
-#: clientgui/sg_ProjectPanel.cpp:74
-msgid "Work done for this project"
-msgstr "Arbeid avsluttet for dette prosjektet"
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:118
+msgid "Allow new tasks"
+msgstr "Tillat nye oppgaver"
 
-#: clientgui/sg_ProjectPanel.cpp:77
-msgid "Synchronize projects with account manager system"
-msgstr "Synkroniser prosjekter med kontobehandlersystemet"
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:119
+msgid "Allow fetching new tasks for this project."
+msgstr "Tillat henting av nye oppgaver for dette prosjektet."
 
-#: clientgui/sg_ProjectPanel.cpp:124
-msgid "Select a project to access with the controls below"
-msgstr "Velg et prosjekt å aksessere med kontrolltavlen nedenfor"
+#: ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:122
+msgid "Don't fetch new tasks for this project."
+msgstr "Ikke hent nye oppgaver for dette prosjektet."
 
-#: clientgui/sg_ProjectPanel.cpp:145
-msgid "Project Web Pages"
-msgstr "Prosjektets nettsider"
+#: ViewProjects.cpp:1058
+msgid "Requested by user"
+msgstr "Anmodet av bruker"
 
-#: clientgui/sg_ProjectPanel.cpp:149
-msgid "Project Commands"
-msgstr "Prosjektkommandoer"
+#: ViewProjects.cpp:1059
+msgid "To fetch work"
+msgstr "Å hente arbeid"
 
-#: clientgui/sg_ProjectPanel.cpp:276
-#, c-format
-msgid "Pop up a menu of web sites for project %s"
-msgstr "Vis en meny med nettsider for prosjektet %s"
+#: ViewProjects.cpp:1060
+msgid "To report completed tasks"
+msgstr "Å rapportere fullførte oppgaver"
 
-#: clientgui/sg_ProjectPanel.cpp:278
-#, c-format
-msgid "Pop up a menu of commands to apply to project %s"
-msgstr "Vis meny med kommandoer som skal gjelde for %s prosjektet"
+#: ViewProjects.cpp:1061
+msgid "To send trickle-up message"
+msgstr "Å sende godskriv andelsmelding"
 
-#: clientgui/sg_TaskCommandPopup.cpp:66
-msgid "Show graphics"
-msgstr "Vis grafikk"
+#: ViewProjects.cpp:1062
+msgid "Requested by account manager"
+msgstr "Forespurt av kontobehandler"
 
-#: clientgui/sg_TaskCommandPopup.cpp:67
-msgid "Show application graphics in a window."
-msgstr "Vis grafikk for applikasjonen i et vindu."
+#: ViewProjects.cpp:1063
+msgid "Project initialization"
+msgstr "Initialisering av prosjekt"
 
-#: clientgui/sg_TaskCommandPopup.cpp:73
-msgid "Suspend this task."
-msgstr "Suspender denne oppgaven."
+#: ViewProjects.cpp:1064
+msgid "Requested by project"
+msgstr "Anmodet av prosjektet"
 
-#: clientgui/sg_TaskCommandPopup.cpp:78
-msgid "Abort"
-msgstr "Avbryt"
+#: ViewProjects.cpp:1065
+msgid "Unknown reason"
+msgstr "Ukjent grunn"
 
-#: clientgui/sg_TaskCommandPopup.cpp:79
-msgid "Abandon this task. You will get no credit for it."
-msgstr "Gi opp denne oppgaven. Du vil ikke få poeng for den."
+#: ViewProjects.cpp:1079
+msgid "Suspended by user"
+msgstr "Suspendert av bruker"
 
-#: clientgui/sg_TaskCommandPopup.cpp:85
-msgid "Show task details."
-msgstr "Vis oppgave detaljer."
+#: ViewProjects.cpp:1082
+msgid "Won't get new tasks"
+msgstr "Vil ikke hente nye oppgaver"
 
-#: clientgui/sg_TaskCommandPopup.cpp:119
-msgid "Resume work for this task."
-msgstr "Gjenoppta arbeid for denne oppgaven."
+#: ViewProjects.cpp:1085
+msgid "Project ended - OK to remove"
+msgstr "Prosjekt avsluttet - OK å fjerne"
 
-#: clientgui/sg_TaskCommandPopup.cpp:123
-msgid "Suspend work for this task."
-msgstr "Suspender arbeid for denne oppgaven."
+#: ViewProjects.cpp:1088
+msgid "Will remove when tasks done"
+msgstr "Vil fjerne når oppgaver er ferdige"
 
-#: clientgui/sg_TaskCommandPopup.cpp:267
-#, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %.1lf%%, Status: %s)"
-msgstr ""
-"Er du sikker på at du vil avbryte denne oppgaven '%s'?\n"
-"(Fremgang: %.1lf%%, Status: %s)"
+#: ViewProjects.cpp:1091
+msgid "Scheduler request pending"
+msgstr "Forespørsel fra planleggeren venter"
 
-#: clientgui/sg_TaskCommandPopup.cpp:272
-msgid "Abort task"
-msgstr "Avbryt oppgave"
+#: ViewProjects.cpp:1097
+msgid "Scheduler request in progress"
+msgstr "Forespørsel fra planleggeren pågår"
 
-#: clientgui/sg_TaskPanel.cpp:468
-msgid "You don't have any projects.  Please Add a Project."
-msgstr "Du har ingen prosjekt.  Vennligst legg til et prosjekt."
+#: ViewProjects.cpp:1100
+msgid "Trickle up message pending"
+msgstr "Godskriv andelsmelding venter"
 
-#: clientgui/sg_TaskPanel.cpp:469
-msgid "Not available"
-msgstr "Ikke tilgjengelig"
+#: ViewProjects.cpp:1106
+msgid "Communication deferred "
+msgstr "Kommunikasjon utsatt "
 
-#: clientgui/sg_TaskPanel.cpp:480
-msgid "Tasks:"
-msgstr "Oppgaver:"
+#: ViewResources.cpp:62
+msgid "Total disk usage"
+msgstr "Totalt diskbruk"
 
-#: clientgui/sg_TaskPanel.cpp:486
-msgid "Select a task to access"
-msgstr "Velg en oppgave for granskning"
+#: ViewResources.cpp:83
+msgid "Disk usage by BOINC projects"
+msgstr "Diskbruk av BOINC prosjekter"
 
-#: clientgui/sg_TaskPanel.cpp:497
-msgid "From:"
-msgstr "Fra:"
+#: ViewResources.cpp:116
+msgid "Disk"
+msgstr "Disk"
 
-#: clientgui/sg_TaskPanel.cpp:551
-msgid "This task's progress"
-msgstr "Denne oppgavens fremgang"
+#: ViewResources.cpp:249
+msgid "no projects: 0 bytes used"
+msgstr "ingen prosjekt: 0 bytes brukt"
 
-#: clientgui/sg_TaskPanel.cpp:569
-msgid "Task Commands"
-msgstr "Oppgavekommandoer"
+#: ViewResources.cpp:286
+msgid "used by BOINC: "
+msgstr "i bruk av BOINC: "
 
-#: clientgui/sg_TaskPanel.cpp:570
-msgid "Pop up a menu of commands to apply to this task"
-msgstr "Vis meny med kommandoer som skal gjelde for denne oppgaven"
+#: ViewResources.cpp:296
+msgid "free, available to BOINC: "
+msgstr "ledig, tilgjengelig for BOINC: "
 
-#: clientgui/sg_TaskPanel.cpp:705
-#, c-format
-msgid "Application: %s"
-msgstr "Applikasjon: %s"
+#: ViewResources.cpp:306
+msgid "free, not available to BOINC: "
+msgstr "ledig, ikke tilgjengelig for BOINC: "
 
-#: clientgui/sg_TaskPanel.cpp:728
-#, c-format
-msgid "%.3f%%"
-msgstr "%.3f%%"
+#: ViewResources.cpp:316
+msgid "free: "
+msgstr "ledig: "
 
-#: clientgui/sg_TaskPanel.cpp:736
-msgid "Application: Not available"
-msgstr "Applikasjon: Ikke tilgjengelig"
+#: ViewResources.cpp:326
+msgid "used by other programs: "
+msgstr "i bruk av ande progrmmer: "
 
-#: clientgui/sg_TaskPanel.cpp:836
-msgid "Not Available"
-msgstr "Ikke tilgjengelig"
+#: ViewStatistics.cpp:1205
+msgid "User Total"
+msgstr "Total for bruker"
 
-#: clientgui/sg_TaskPanel.cpp:851
-#, c-format
-msgid "Elapsed: %s"
-msgstr "Tid brukt: %s"
+#: ViewStatistics.cpp:1206
+msgid "User Average"
+msgstr "Gjennomsnitt for bruker"
 
-#: clientgui/sg_TaskPanel.cpp:865
-#, c-format
-msgid "Remaining (estimated): %s"
-msgstr "Gjenstår (estimert): %s"
+#: ViewStatistics.cpp:1207
+msgid "Host Total"
+msgstr "Total for vert"
 
-#: clientgui/sg_TaskPanel.cpp:880
-#, c-format
-msgid "Status: %s"
-msgstr "Status: %s"
+#: ViewStatistics.cpp:1208
+msgid "Host Average"
+msgstr "Gjennomsnitt for vert"
 
-#: clientgui/sg_TaskPanel.cpp:1227
-msgid "Retrieving current status."
-msgstr "Henter gjeldende status."
+#: ViewStatistics.cpp:1355
+#, c-format
+msgid "Last update: %.0f days ago"
+msgstr "Siste oppdatering: %.0f dager siden"
 
-#: clientgui/sg_TaskPanel.cpp:1233
-msgid "Downloading work from the server."
-msgstr "Laster ned arbeid fra tjeneren."
+#: ViewStatistics.cpp:1982
+msgid "Show user total"
+msgstr "Vis total for bruker"
 
-#: clientgui/sg_TaskPanel.cpp:1238
-msgid "Processing Suspended:  Running On Batteries."
-msgstr "Prosessering suspendert:  Kjører på batterier."
+#: ViewStatistics.cpp:1983
+msgid "Show total credit for user"
+msgstr "Vis totalt arbeid utført for bruker"
 
-#: clientgui/sg_TaskPanel.cpp:1240
-msgid "Processing Suspended:  User Active."
-msgstr "Prosessering suspendert:  Bruker aktiv."
+#: ViewStatistics.cpp:1989
+msgid "Show user average"
+msgstr "Vis gjennomsnitt for bruker"
 
-#: clientgui/sg_TaskPanel.cpp:1242
-msgid "Processing Suspended:  User paused processing."
-msgstr "Prosessering suspendert:  Bruker har pauset prosessering."
+#: ViewStatistics.cpp:1990
+msgid "Show average credit for user"
+msgstr "Vis gjennomsnittlig arbeid utført for bruker"
 
-#: clientgui/sg_TaskPanel.cpp:1244
-msgid "Processing Suspended:  Time of Day."
-msgstr "Prosessering suspendert:  Tid på dag."
+#: ViewStatistics.cpp:1996
+msgid "Show host total"
+msgstr "Vis total for vert"
 
-#: clientgui/sg_TaskPanel.cpp:1246
-msgid "Processing Suspended:  Benchmarks Running."
-msgstr "Prosessering suspendert:  Ytelsestest kjører."
+#: ViewStatistics.cpp:1997
+msgid "Show total credit for host"
+msgstr "Vis totalt arbeid utført for vert"
 
-#: clientgui/sg_TaskPanel.cpp:1248
-msgid "Processing Suspended."
-msgstr "Prosessering suspendert."
+#: ViewStatistics.cpp:2003
+msgid "Show host average"
+msgstr "Vis gjennomsnitt for vert"
 
-#: clientgui/sg_TaskPanel.cpp:1252
-msgid "Waiting to contact project servers."
-msgstr "Venter på kontakt med prosjekt tjener."
+#: ViewStatistics.cpp:2004
+msgid "Show average credit for host"
+msgstr "Vis gjennomsnittlig arbeid utført for vert"
 
-#: clientgui/sg_TaskPanel.cpp:1256
-#: clientgui/sg_TaskPanel.cpp:1265
-msgid "Retrieving current status"
-msgstr "Henter gjeldende status"
+#: ViewStatistics.cpp:2013
+msgid "< &Previous project"
+msgstr "< &Forrige prosjekt"
 
-#: clientgui/sg_TaskPanel.cpp:1260
-msgid "No work available to process"
-msgstr "Ingen arbeid tilgjengelig for prosessering"
+#: ViewStatistics.cpp:2014
+msgid "Show chart for previous project"
+msgstr "Vis diagram for forrige prosjekt"
 
-#: clientgui/sg_TaskPanel.cpp:1262
-msgid "Unable to connect to the core client"
-msgstr "Kan ikke koble til kjerneklienten"
+#: ViewStatistics.cpp:2019
+msgid "&Next project >"
+msgstr "&Neste prosjekt >"
 
-#: clientgui/TermsOfUsePage.cpp:218
-msgid "Terms of Use"
-msgstr "Vilkår for Bruk"
+#: ViewStatistics.cpp:2020
+msgid "Show chart for next project"
+msgstr "Vis diagram for neste prosjekt"
 
-#: clientgui/TermsOfUsePage.cpp:222
-msgid "Please read the following terms of use:"
-msgstr "Vennligst les følgende vilkår for bruk:"
+#: ViewStatistics.cpp:2026 ViewStatistics.cpp:2416
+msgid "Hide project list"
+msgstr "Skjul prosjektliste"
 
-#: clientgui/TermsOfUsePage.cpp:231
-msgid "I agree to the terms of use."
-msgstr "Jeg aksepterer vilkårene for bruk."
+#: ViewStatistics.cpp:2027 ViewStatistics.cpp:2416
+msgid "Use entire area for graphs"
+msgstr "Benytt hele området for grafer"
 
-#: clientgui/TermsOfUsePage.cpp:237
-msgid "I do not agree to the terms of use."
-msgstr "Jeg aksepterer ikke vilkårene for bruk."
+#: ViewStatistics.cpp:2032
+msgid "Mode view"
+msgstr "Modusvisning"
 
-#: clientgui/UnavailablePage.cpp:183
-msgid "Project temporarily unavailable"
-msgstr "Prosjektet er midlertidig utilgjengelig"
+#: ViewStatistics.cpp:2036
+msgid "One project"
+msgstr "Et prosjekt"
 
-#: clientgui/UnavailablePage.cpp:186
-msgid ""
-"The project is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-"Prosjektet er midlertidig utilgjengelig.\n"
-"\n"
-"Vennligst prøv igjen senere."
+#: ViewStatistics.cpp:2037
+msgid "Show one chart with selected project"
+msgstr "Vis et diagram for valgt prosjekt"
 
-#: clientgui/UnavailablePage.cpp:190
-msgid "Account manager temporarily unavailable"
-msgstr "Kontobehandler midlertidig utilgjengelig"
+#: ViewStatistics.cpp:2043
+msgid "All projects (separate)"
+msgstr "Alle prosjekt (separat)"
 
-#: clientgui/UnavailablePage.cpp:193
-msgid ""
-"The account manager is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-"Kontobehandler er midlertidig utilgjengelig.\n"
-"\n"
-"Vennligst prøv igjen senere."
+#: ViewStatistics.cpp:2044
+msgid "Show all projects, one chart per project"
+msgstr "Vis alle prosjekter, et diagram per prosjekt"
 
-#: clientgui/ValidateAccountKey.cpp:68
-msgid "Please specify an account key to continue."
-msgstr "Vennligst oppgi kontonøkkel for å fortsette."
+#: ViewStatistics.cpp:2050
+msgid "All projects (together)"
+msgstr "Alle prosjekt (sammen)"
 
-#: clientgui/ValidateAccountKey.cpp:71
-msgid "Invalid Account Key; please enter a valid Account Key"
-msgstr "Ugyldig kontonøkkel; vennligst tast inn en gyldig kontonøkkel"
+#: ViewStatistics.cpp:2051
+msgid "Show one chart with all projects"
+msgstr "Vis et diagram med alle prosjekter"
 
-#: clientgui/ValidateAccountKey.cpp:82
-#: clientgui/ValidateEmailAddress.cpp:86
-msgid "Validation conflict"
-msgstr "Valideringskonflikt"
+#: ViewStatistics.cpp:2057
+msgid "All projects (sum)"
+msgstr "Alle prosjekt (sum)"
 
-#: clientgui/ValidateEmailAddress.cpp:72
-msgid "Please specify an email address"
-msgstr "Vennligst spesifiser en e-post adresse"
+#: ViewStatistics.cpp:2058
+msgid "Show one chart with sum of projects"
+msgstr "Vis et diagram med summen av alle prosjekter"
 
-#: clientgui/ValidateEmailAddress.cpp:75
-msgid "Invalid email address; please enter a valid email address"
-msgstr "Ugyldig e-post adresse; vennligst skriv inn en gyldig e-post adresse"
+#: ViewStatistics.cpp:2079
+msgid "Statistics"
+msgstr "Statistikk"
 
-#: clientgui/ValidateURL.cpp:69
-msgid "Missing URL"
-msgstr "Manglende URL"
+#: 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
+msgid "Updating charts..."
+msgstr "Oppdaterer diagrammer..."
 
-#: clientgui/ValidateURL.cpp:70
-msgid ""
-"Please specify a URL.\n"
-"For example:\n"
-"http://www.example.com/"
-msgstr ""
-"Vennligst spesifiser en URL.\n"
-"For eksempel:\n"
-"http://www.eksempel.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 "Ugyldig URL"
+#: ViewStatistics.cpp:2420
+msgid "Show project list"
+msgstr "Vis prosjektliste"
 
-#: 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 ""
-"Vennligst spesifiser en gyldig URL.\n"
-"For eksempel:\n"
-"http://boincproject.example.com"
+#: ViewStatistics.cpp:2420
+msgid "Uses smaller area for graphs"
+msgstr "Bruker mindre område for grafer"
 
-#: clientgui/ValidateURL.cpp:104
-#: clientgui/ValidateURL.cpp:108
-#, c-format
-msgid "'%s' does not contain a valid host name."
-msgstr "'%s' inneholder ikke et gyldig vert navn."
+#: ViewTransfers.cpp:164
+msgid "Retry Now"
+msgstr "Prøv igjen nå"
 
-#: clientgui/ValidateURL.cpp:111
-#, c-format
-msgid "'%s' does not contain a valid path."
-msgstr "'%s' inneholder ikke en gyldig sti."
+#: ViewTransfers.cpp:165
+msgid "Retry the file transfer now"
+msgstr "Prøv filoverføring på nytt nå"
 
-#: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:175
-msgid "Commands"
-msgstr "Kommandoer"
+#: ViewTransfers.cpp:171
+msgid "Abort Transfer"
+msgstr "Avbryt overføring"
 
-#: clientgui/ViewMessages.cpp:88
-msgid "Copy all messages"
-msgstr "Kopier alle meldinger"
+#: ViewTransfers.cpp:172
+msgid "Abort this file transfer.  You won't get credit for the task."
+msgstr "Avbryt filoverføring. Du vil ikke få poeng for oppgaven."
 
-#: clientgui/ViewMessages.cpp:95
-msgid "Copy selected messages"
-msgstr "Kopier valgte meldinger"
+#: ViewTransfers.cpp:183
+msgid "File"
+msgstr "Fil"
 
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
-msgid "Show only this project"
-msgstr "Vis bare dette prosjektet"
+#: ViewTransfers.cpp:184 ViewWork.cpp:233
+msgid "Progress"
+msgstr "Progresjon"
 
-#: clientgui/ViewMessages.cpp:107
-#: clientgui/ViewMessages.cpp:503
-msgid "Show only the messages for the selected project."
-msgstr "Vis bare meldinger for valgte prosjekt."
+#: ViewTransfers.cpp:185
+msgid "Size"
+msgstr "Størrelse"
 
-#: clientgui/ViewMessages.cpp:164
-msgid "Messages"
-msgstr "Meldinger"
+#: ViewTransfers.cpp:186
+msgid "Elapsed Time"
+msgstr "Tid brukt"
 
-#: clientgui/ViewMessages.cpp:187
-msgid "Copying all messages to the clipboard..."
-msgstr "Kopier alle meldinger til utklippstavle..."
+#: ViewTransfers.cpp:187
+msgid "Speed"
+msgstr "Hastighet"
 
-#: clientgui/ViewMessages.cpp:223
-msgid "Copying selected messages to the clipboard..."
-msgstr "Kopier valgte meldinger til utklippstavle..."
+#: ViewTransfers.cpp:213
+msgid "Transfers"
+msgstr "Overføringer"
 
-#: clientgui/ViewMessages.cpp:286
-msgid "Filtering messages..."
-msgstr "Filtrer meldinger..."
+#: ViewTransfers.cpp:280
+msgid "Network activity is suspended - "
+msgstr "Nettverks aktivitet er suspendert - "
 
-#: clientgui/ViewMessages.cpp:494
-msgid "Show all messages"
-msgstr "Vis alle meldinger"
+#: ViewTransfers.cpp:282
+msgid ""
+".\n"
+"You can enable it using the Activity menu."
+msgstr ".\nDu kan aktivere denne ved å benytte menyen for aktiviteter."
 
-#: clientgui/ViewMessages.cpp:495
-msgid "Show messages for all projects."
-msgstr "Vis meldinger fra alle prosjekter."
+#: ViewTransfers.cpp:285
+msgid "BOINC"
+msgstr "BOINC"
 
-#: clientgui/ViewProjects.cpp:225
-msgid "Account"
-msgstr "Konto"
+#: ViewTransfers.cpp:292
+msgid "Retrying transfer now..."
+msgstr "Prøv overføring igjen nå..."
 
-#: clientgui/ViewProjects.cpp:227
-msgid "Work done"
-msgstr "Arbeid ferdig"
+#: ViewTransfers.cpp:330
+msgid "Aborting transfer..."
+msgstr "Avbryter overføring..."
 
-#: clientgui/ViewProjects.cpp:228
-msgid "Avg. work done"
-msgstr "Gjennomsnittlig arbeid ferdig"
+#: ViewTransfers.cpp:343
+#, 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 "Er du sikker på at du vil avbryte denne filoverføringen '%s'?\nMERK: Å avbryte en overføring vil ugyldiggjøre en oppgave\nog du vil ikke motta poeng for den."
 
-#: clientgui/ViewProjects.cpp:230
-msgid "Status"
-msgstr "Status"
+#: ViewTransfers.cpp:349
+msgid "Abort File Transfer"
+msgstr "Avbryt fil overføring"
 
-#: clientgui/ViewProjects.cpp:255
-msgid "Projects"
-msgstr "Prosjekter"
+#: ViewTransfers.cpp:780
+msgid "Upload"
+msgstr "Last opp"
 
-#: clientgui/ViewProjects.cpp:307
-msgid "Updating project..."
-msgstr "Oppdaterer prosjekt..."
+#: ViewTransfers.cpp:780
+msgid "Download"
+msgstr "Nedlasting"
 
-# 85%
-#: clientgui/ViewProjects.cpp:349
-msgid "Resuming project..."
-msgstr "Gjenopptar prosjekt..."
+#: ViewTransfers.cpp:784
+msgid "retry in "
+msgstr "prøver igjen om "
 
-#: clientgui/ViewProjects.cpp:353
-msgid "Suspending project..."
-msgstr "Suspender prosjekt..."
+#: ViewTransfers.cpp:786
+msgid "failed"
+msgstr "mislyktes"
 
-#: clientgui/ViewProjects.cpp:390
-msgid "Telling project to allow additional task downloads..."
-msgstr "Instruerer prosjektet om å tillate nedlastning av ekstra oppgaver..."
+#: ViewTransfers.cpp:789
+msgid "suspended"
+msgstr "suspendert"
 
-#: clientgui/ViewProjects.cpp:394
-msgid "Telling project to not fetch any additional tasks..."
-msgstr "Ber prosjektet om ikke å hente ekstra oppgaver..."
+#: ViewTransfers.cpp:794
+msgid "active"
+msgstr "aktiv"
 
-#: clientgui/ViewProjects.cpp:430
-msgid "Resetting project..."
-msgstr "Nullstiller prosjektet..."
+#: ViewTransfers.cpp:796
+msgid "pending"
+msgstr "venter"
 
-# 80%
-#: clientgui/ViewProjects.cpp:488
-msgid "Removing project..."
-msgstr "Fjerner prosjekt..."
+#: ViewTransfers.cpp:803
+msgid " (project backoff: "
+msgstr " (prosjekt holder igjen: "
 
-#: clientgui/ViewProjects.cpp:548
-msgid "Launching browser..."
-msgstr "Starter nettleser..."
+#: ViewWork.cpp:187 ViewWork.cpp:777
+msgid "Show active tasks"
+msgstr "Vis aktive oppgaver"
 
-#: clientgui/ViewProjects.cpp:1063
-msgid "Requested by user"
-msgstr "Anmodet av bruker"
+#: ViewWork.cpp:188 ViewWork.cpp:778
+msgid "Show only active tasks."
+msgstr "Vis bare aktive oppgaver."
 
-#: clientgui/ViewProjects.cpp:1064
-msgid "To fetch work"
-msgstr "Å hente arbeid"
+#: ViewWork.cpp:194 sg_TaskCommandPopup.cpp:60
+msgid "Show graphics"
+msgstr "Vis grafikk"
 
-#: clientgui/ViewProjects.cpp:1065
-msgid "To report completed tasks"
-msgstr "Å rapportere fullførte oppgaver"
+#: ViewWork.cpp:195 sg_TaskCommandPopup.cpp:61
+msgid "Show application graphics in a window."
+msgstr "Vis grafikk for applikasjonen i et vindu."
 
-#: clientgui/ViewProjects.cpp:1066
-msgid "To send trickle-up message"
-msgstr "Å sende godskriv andelsmelding"
+#: ViewWork.cpp:201
+msgid "Show VM Console"
+msgstr "Vis VM konsollen"
 
-#: clientgui/ViewProjects.cpp:1067
-msgid "Requested by account manager"
-msgstr "Forespurt av kontobehandler"
+#: ViewWork.cpp:202
+msgid "Show VM Console in a window."
+msgstr "Vis VM konsollen i et vindu."
 
-#: clientgui/ViewProjects.cpp:1068
-msgid "Project initialization"
-msgstr "Initialisering av prosjekt"
+#: ViewWork.cpp:209
+msgid "Suspend work for this result."
+msgstr "Suspender arbeid for dette resultatet."
 
-#: clientgui/ViewProjects.cpp:1069
-msgid "Requested by project"
-msgstr "Anmodet av prosjektet"
+#: ViewWork.cpp:215 sg_TaskCommandPopup.cpp:72
+msgid "Abort"
+msgstr "Avbryt"
 
-#: clientgui/ViewProjects.cpp:1070
-msgid "Unknown reason"
-msgstr "Ukjent grunn"
+#: ViewWork.cpp:216
+msgid "Abandon work on the result. You will get no credit for it."
+msgstr "Gi opp arbeid på grunn av resultatet. Du vil ikke få poeng for det."
 
-#: clientgui/ViewProjects.cpp:1084
-msgid "Suspended by user"
-msgstr "Suspendert av bruker"
+#: ViewWork.cpp:223 sg_TaskCommandPopup.cpp:79
+msgid "Show task details."
+msgstr "Vis oppgave detaljer."
 
-#: clientgui/ViewProjects.cpp:1087
-msgid "Won't get new tasks"
-msgstr "Vil ikke hente nye oppgaver"
+#: ViewWork.cpp:235
+msgid "Elapsed"
+msgstr "Tid brukt"
+
+#: ViewWork.cpp:236
+msgid "Remaining (estimated)"
+msgstr "Gjenstår (estimert)"
 
-#: clientgui/ViewProjects.cpp:1090
-msgid "Project ended - OK to remove"
-msgstr "Prosjekt avsluttet - OK å fjerne"
+#: ViewWork.cpp:237
+msgid "Deadline"
+msgstr "Frist"
 
-#: clientgui/ViewProjects.cpp:1093
-msgid "Will remove when tasks done"
-msgstr "Vil fjerne når oppgaver er ferdige"
+#: ViewWork.cpp:264
+msgid "Tasks"
+msgstr "Oppgaver"
 
-#: clientgui/ViewProjects.cpp:1096
-msgid "Scheduler request pending"
-msgstr "Forespørsel fra planleggeren venter"
+#: ViewWork.cpp:357
+msgid "Resuming task..."
+msgstr "Gjenopptar oppgave..."
 
-#: clientgui/ViewProjects.cpp:1102
-msgid "Scheduler request in progress"
-msgstr "Forespørsel fra planleggeren pågår"
+#: ViewWork.cpp:360
+msgid "Suspending task..."
+msgstr "Suspenderer oppgave..."
 
-#: clientgui/ViewProjects.cpp:1105
-msgid "Trickle up message pending"
-msgstr "Godskriv andelsmelding venter"
+#: ViewWork.cpp:389
+msgid "Showing graphics for task..."
+msgstr "Viser grafikk for oppgave..."
 
-#: clientgui/ViewProjects.cpp:1111
-msgid "Communication deferred "
-msgstr "Kommunikasjon utsatt "
+#: ViewWork.cpp:426
+msgid "Showing VM console for task..."
+msgstr "Viser VM konsollen for oppgave..."
 
-#: clientgui/ViewResources.cpp:62
-msgid "Total disk usage"
-msgstr "Totalt diskbruk"
+#: ViewWork.cpp:479
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %s, Status: %s)"
+msgstr "Er du sikker på at du ønsker å avbryte denne oppgaven '%s'?\n(Progresjon: %s, Status: %s)"
 
-#: clientgui/ViewResources.cpp:83
-msgid "Disk usage by BOINC projects"
-msgstr "Diskbruk av BOINC prosjekter"
+#: ViewWork.cpp:485
+#, c-format
+msgid "Are you sure you want to abort these %d tasks?"
+msgstr "Er du sikker på at du ønsker å avbryte disse %d oppgavene?"
 
-#: clientgui/ViewResources.cpp:116
-msgid "Disk"
-msgstr "Disk"
+#: ViewWork.cpp:490 sg_TaskCommandPopup.cpp:256
+msgid "Abort task"
+msgstr "Avbryt oppgave"
 
-#: clientgui/ViewResources.cpp:225
-msgid "no projects: 0 bytes used"
-msgstr "ingen prosjekt: 0 bytes brukt"
+#: ViewWork.cpp:499
+msgid "Aborting task..."
+msgstr "Avbryter oppgave..."
 
-#: clientgui/ViewResources.cpp:262
-msgid "used by BOINC: "
-msgstr "i bruk av BOINC:"
+#: ViewWork.cpp:771
+msgid "Show all tasks"
+msgstr "Vis alle oppgavene"
 
-#: clientgui/ViewResources.cpp:272
-msgid "free, available to BOINC: "
-msgstr "ledig, tilgjengelig for BOINC:"
+#: ViewWork.cpp:772
+msgid "Show all tasks."
+msgstr "Vis alle oppgavene."
 
-#: clientgui/ViewResources.cpp:282
-msgid "free, not available to BOINC: "
-msgstr "ledig, ikke tilgjengelig for BOINC:"
+#: ViewWork.cpp:796 sg_TaskCommandPopup.cpp:103
+msgid "Resume work for this task."
+msgstr "Gjenoppta arbeid for denne oppgaven."
 
-#: clientgui/ViewResources.cpp:292
-msgid "free: "
-msgstr "ledig:"
+#: ViewWork.cpp:802 sg_TaskCommandPopup.cpp:107
+msgid "Suspend work for this task."
+msgstr "Suspender arbeid for denne oppgaven."
 
-#: clientgui/ViewResources.cpp:302
-msgid "used by other programs: "
-msgstr "i bruk av ande progrmmer:"
+#: WelcomePage.cpp:284
+msgid "Add project or account manager"
+msgstr "Legg til prosjekt eller kontobehandler"
 
-#: clientgui/ViewStatistics.cpp:1181
-msgid "User Total"
-msgstr "Total for bruker"
+#: WelcomePage.cpp:288
+msgid "Add project or use BOINC Account Manager"
+msgstr "Legg til prosjekt eller bruk BOINC kontobehandler"
 
-#: clientgui/ViewStatistics.cpp:1182
-msgid "User Average"
-msgstr "Gjennomsnitt for bruker"
+#: 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 "Hvis mulig, legg til prosjekter fra\n%s nettside.\n\nProsjekter lagt til via denne veilederen vil ikke bli\nlistet i eller administrert via %s."
 
-#: clientgui/ViewStatistics.cpp:1183
-msgid "Host Total"
-msgstr "Total for vert"
+#: 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 "Det er mer enn 30 BOINC baserte prosjekter\nsom utfører forskning innenfor mange vitenskapelige områder,\nog du kan delta i så mange av disse du måtte ønske.\nDu kan legge til et prosjekt direkte,\neller bruke en 'Kontobehandler' nettside for å velge prosjekter."
 
-#: clientgui/ViewStatistics.cpp:1184
-msgid "Host Average"
-msgstr "Gjennomsnitt for vert"
+#: 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 "Du have valgt å legge til et nytt frivillig beregningsprosjekt eller endre hvilke prosjekter\ndu bidrar til.\n\nNoen av disse prosjektene kjøres og administreres av World Community Grid, mens andre\nkjøres og administreres av andre forskere eller organisasjoner. BOINC programvaren\nkan dele din gjenværende prosessorkraft blant hvilken som helst kombinasjon av prosjekter.\n\nAlternativt, hvis du har registrert deg hos en BOINC kontobehandler kan du bruke\ndenne til å velge hvilke  [...]
 
-#: clientgui/ViewStatistics.cpp:1331
-#, c-format
-msgid "Last update: %.0f days ago"
-msgstr "Siste oppdatering: %.0f dager siden"
+#: WelcomePage.cpp:339
+msgid "Use a BOINC Account Manager"
+msgstr "Bruk en BOINC kontobehandler"
 
-#: clientgui/ViewStatistics.cpp:1956
-msgid "Show user total"
-msgstr "Vis total for bruker"
+#: WelcomePage.cpp:352
+msgid "To continue, click Next."
+msgstr "For å fortsette, klikk Neste."
 
-#: clientgui/ViewStatistics.cpp:1957
-msgid "Show total credit for user"
-msgstr "Vis totalt arbeid utført for bruker"
+#: WelcomePage.cpp:358
+msgid "Add or change your World Community Grid projects"
+msgstr "Legg til eller endre dine World Community Grid prosjekter"
 
-#: clientgui/ViewStatistics.cpp:1963
-msgid "Show user average"
-msgstr "Vis gjennomsnitt for bruker"
+#: WelcomePage.cpp:361
+msgid "Add projects run by other researchers or organizations"
+msgstr "Legg til prosjekter som driftes av andre forskere eller organisasjoner"
 
-#: clientgui/ViewStatistics.cpp:1964
-msgid "Show average credit for user"
-msgstr "Vis gjennomsnittlig arbeid utført for bruker"
+#: WizardAttach.cpp:634
+msgid "Do you really want to cancel?"
+msgstr "Ønsker du virkelig å avbryte?"
 
-#: clientgui/ViewStatistics.cpp:1970
-msgid "Show host total"
-msgstr "Vis total for vert"
+#: WizardAttach.cpp:635
+msgid "Question"
+msgstr "Spørsmål"
 
-#: clientgui/ViewStatistics.cpp:1971
-msgid "Show total credit for host"
-msgstr "Vis totalt arbeid utført for vert"
+#: sg_BoincSimpleFrame.cpp:149
+msgid "Advanced View...\tCtrl+Shift+A"
+msgstr "Avansert visning...\t Ctrl+Shift+A"
 
-#: clientgui/ViewStatistics.cpp:1977
-msgid "Show host average"
-msgstr "Vis gjennomsnitt for vert"
+#: sg_BoincSimpleFrame.cpp:150
+msgid "Display the advanced graphical interface."
+msgstr "Vis det grafisk avanserte brukergrensesnittet."
 
-#: clientgui/ViewStatistics.cpp:1978
-msgid "Show average credit for host"
-msgstr "Vis gjennomsnittlig arbeid utført for vert"
+#: sg_BoincSimpleFrame.cpp:157
+msgid "Skin"
+msgstr "Skall"
 
-#: clientgui/ViewStatistics.cpp:1987
-msgid "< &Previous project"
-msgstr "< &Forrige prosjekt"
+#: sg_BoincSimpleFrame.cpp:159
+msgid "Select the appearance of the user interface."
+msgstr "Velg utseende på brukergrensesnittet."
 
-#: clientgui/ViewStatistics.cpp:1988
-msgid "Show chart for previous project"
-msgstr "Vis diagram for forrige prosjekt"
+#: sg_BoincSimpleFrame.cpp:206
+#, c-format
+msgid "&%s"
+msgstr "&%s"
 
-#: clientgui/ViewStatistics.cpp:1993
-msgid "&Next project >"
-msgstr "&Neste prosjekt >"
+#: sg_BoincSimpleFrame.cpp:390
+msgid "Default"
+msgstr "Standard"
 
-#: clientgui/ViewStatistics.cpp:1994
-msgid "Show chart for next project"
-msgstr "Vis diagram for neste prosjekt"
+#: sg_BoincSimpleFrame.cpp:759
+msgid "Suspend Computing"
+msgstr "Suspender beregning"
 
-#: clientgui/ViewStatistics.cpp:2000
-#: clientgui/ViewStatistics.cpp:2390
-msgid "Hide project list"
-msgstr "Skjul prosjektliste"
+#: sg_BoincSimpleFrame.cpp:760
+msgid "Resume Computing"
+msgstr "Gjenoppta beregning"
 
-#: clientgui/ViewStatistics.cpp:2001
-#: clientgui/ViewStatistics.cpp:2390
-msgid "Use entire area for graphs"
-msgstr "Benytt hele området for grafer"
+#: sg_BoincSimpleFrame.cpp:777
+msgid "Open a window to view notices from projects or BOINC"
+msgstr "Åpne et vindu for å vise varsler fra prosjekter eller BOINC"
 
-#: clientgui/ViewStatistics.cpp:2006
-msgid "Mode view"
-msgstr "Modusvisning"
+#: sg_DlgMessages.cpp:146
+msgid "Close"
+msgstr "Lukk"
 
-#: clientgui/ViewStatistics.cpp:2010
-msgid "One project"
-msgstr "Et prosjekt"
+#: sg_DlgMessages.cpp:389
+#, c-format
+msgid "%s - Notices"
+msgstr "%s - Varsler"
 
-#: clientgui/ViewStatistics.cpp:2011
-msgid "Show one chart with selected project"
-msgstr "Vis et diagram for valgt prosjekt"
+#: sg_DlgPreferences.cpp:268
+msgid "This dialog controls preferences for this computer only."
+msgstr "Denne dialogboksen kontrollerer innstillinger kun for denne datamaskinen."
 
-#: clientgui/ViewStatistics.cpp:2017
-msgid "All projects (separate)"
-msgstr "Alle prosjekt (separat)"
+#: sg_DlgPreferences.cpp:273
+msgid "Click OK to set preferences."
+msgstr "Klikk OK for å fastsette innstillinger."
 
-#: clientgui/ViewStatistics.cpp:2018
-msgid "Show all projects, one chart per project"
-msgstr "Vis alle prosjekter, et diagram per prosjekt"
+#: sg_DlgPreferences.cpp:278
+msgid ""
+"Click Clear to restore web-based settings for all preferences listed below."
+msgstr "Klikk Fjern for å gjenopprette webbaserte innstillinger for alle preferanser listet nedenfor."
 
-#: clientgui/ViewStatistics.cpp:2024
-msgid "All projects (together)"
-msgstr "Alle prosjekt (sammen)"
+#: sg_DlgPreferences.cpp:285
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
+msgstr "For ekstra innstillinger, velg Beregningsinnstillinger i Avansert visning."
 
-#: clientgui/ViewStatistics.cpp:2025
-msgid "Show one chart with all projects"
-msgstr "Vis et diagram med alle prosjekter"
+#: sg_DlgPreferences.cpp:313
+msgid "Do work only between:"
+msgstr "Utfør arbeid bare mellom:"
 
-#: clientgui/ViewStatistics.cpp:2031
-msgid "All projects (sum)"
-msgstr "Alle prosjekt (sum)"
+#: sg_DlgPreferences.cpp:335
+msgid "Connect to internet only between:"
+msgstr "Bare koble til Internet mellom:"
 
-#: clientgui/ViewStatistics.cpp:2032
-msgid "Show one chart with sum of projects"
-msgstr "Vis et diagram med summen av alle prosjekter"
+#: sg_DlgPreferences.cpp:357 sg_DlgPreferences.cpp:374
+msgid "Use no more than:"
+msgstr "Ikke bruk mer enn:"
 
-#: clientgui/ViewStatistics.cpp:2053
-msgid "Statistics"
-msgstr "Statistikk"
+#: sg_DlgPreferences.cpp:370
+msgid "of disk space"
+msgstr "av diskplass"
 
-#: 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 "Oppdaterer diagrammer..."
+#: sg_DlgPreferences.cpp:387
+msgid "of the processor"
+msgstr "av prosessoren"
 
-#: clientgui/ViewStatistics.cpp:2394
-msgid "Show project list"
-msgstr "Vis prosjektliste"
+#: sg_DlgPreferences.cpp:391
+msgid "Do work while on battery?"
+msgstr "Utfør arbeid på batteridrift?"
 
-#: clientgui/ViewStatistics.cpp:2394
-msgid "Uses smaller area for graphs"
-msgstr "Bruker mindre område for grafer"
+#: sg_DlgPreferences.cpp:404
+msgid "Do work after idle for:"
+msgstr "Utfør arbeid etter inaktiv i:"
 
-#: clientgui/ViewTransfers.cpp:169
-msgid "Retry Now"
-msgstr "Prøv igjen nå"
+#: sg_DlgPreferences.cpp:429
+msgid "Clear all local preferences listed above and close the dialog"
+msgstr "Fjern alle lokale innstillinger som vist over og lukk dialogboksen"
 
-#: clientgui/ViewTransfers.cpp:170
-msgid "Retry the file transfer now"
-msgstr "Prøv filoverføring på nytt nå"
+#: 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 "Når som helst"
 
-#: clientgui/ViewTransfers.cpp:176
-msgid "Abort Transfer"
-msgstr "Avbryt overføring"
+#: sg_DlgPreferences.cpp:638
+msgid "100 MB"
+msgstr "100 MB"
 
-#: clientgui/ViewTransfers.cpp:177
-msgid "Abort this file transfer.  You won't get credit for the task."
-msgstr "Avbryt filoverføring. Du vil ikke få poeng for oppgaven."
+#: sg_DlgPreferences.cpp:639
+msgid "200 MB"
+msgstr "200 MB"
 
-#: clientgui/ViewTransfers.cpp:188
-msgid "File"
-msgstr "Fil"
+#: sg_DlgPreferences.cpp:640
+msgid "500 MB"
+msgstr "500 MB"
 
-#: clientgui/ViewTransfers.cpp:189
-#: clientgui/ViewWork.cpp:238
-msgid "Progress"
-msgstr "Fremgang"
+#: sg_DlgPreferences.cpp:641
+msgid "1 GB"
+msgstr "1 GB"
 
-#: clientgui/ViewTransfers.cpp:190
-msgid "Size"
-msgstr "Størrelse"
+#: sg_DlgPreferences.cpp:642
+msgid "2 GB"
+msgstr "2 GB"
 
-#: clientgui/ViewTransfers.cpp:191
-msgid "Elapsed Time"
-msgstr "Tid brukt"
+#: sg_DlgPreferences.cpp:643
+msgid "5 GB"
+msgstr "5 GB"
 
-#: clientgui/ViewTransfers.cpp:192
-msgid "Speed"
-msgstr "Hastighet"
+#: sg_DlgPreferences.cpp:644
+msgid "10 GB"
+msgstr "10 GB"
 
-#: clientgui/ViewTransfers.cpp:218
-msgid "Transfers"
-msgstr "Overføringer"
+#: sg_DlgPreferences.cpp:645
+msgid "20 GB"
+msgstr "20 GB"
 
-#: clientgui/ViewTransfers.cpp:285
-msgid "Network activity is suspended - "
-msgstr "Nettverks aktivitet er suspendert - "
+#: sg_DlgPreferences.cpp:646
+msgid "50 GB"
+msgstr "50 GB"
 
-#: clientgui/ViewTransfers.cpp:287
-msgid ""
-".\n"
-"You can enable it using the Activity menu."
-msgstr ""
-".\n"
-"Du kan aktivere denne ved å benytte menyen for aktiviteter."
+#: sg_DlgPreferences.cpp:647
+msgid "100 GB"
+msgstr "100 GB"
 
-#: clientgui/ViewTransfers.cpp:290
-msgid "BOINC"
-msgstr "BOINC"
+#: sg_DlgPreferences.cpp:717
+#, c-format
+msgid "%d MB"
+msgstr "%d MB"
 
-#: clientgui/ViewTransfers.cpp:297
-msgid "Retrying transfer now..."
-msgstr "Prøv overføring igjen nå..."
+#: sg_DlgPreferences.cpp:719
+#, c-format
+msgid "%4.2f GB"
+msgstr "%4.2f GB"
 
-#: clientgui/ViewTransfers.cpp:335
-msgid "Aborting transfer..."
-msgstr "Avbryter overføring..."
+#: sg_DlgPreferences.cpp:760
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
+
+#: sg_DlgPreferences.cpp:796
+msgid "0 (Run Always)"
+msgstr "0 (Kjør alltid)"
 
-#: clientgui/ViewTransfers.cpp:348
+#: sg_DlgPreferences.cpp:799
 #, 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 ""
-"Er du sikker på at du vil avbryte denne filoverføringen '%s'?\n"
-"MERK: Å avbryte en overføring vil ugyldiggjøre en oppgave\n"
-"og du vil ikke motta poeng for den."
+msgid "%d"
+msgstr "%d"
 
-#: clientgui/ViewTransfers.cpp:354
-msgid "Abort File Transfer"
-msgstr "Avbryt fil overføring"
+#: sg_DlgPreferences.cpp:1029
+msgid "Do you really want to clear all local preferences?\n"
+msgstr "Vil du virkelig fjerne alle lokale innstillinger?\n"
 
-#: clientgui/ViewTransfers.cpp:785
-msgid "Upload"
-msgstr "Last opp"
+#: sg_ProjectPanel.cpp:72
+msgid "Add Project"
+msgstr "Legg til prosjekt"
 
-#: clientgui/ViewTransfers.cpp:785
-msgid "Download"
-msgstr "Last ned"
+#: sg_ProjectPanel.cpp:73
+msgid "Synchronize"
+msgstr "Synkroniser"
 
-#: clientgui/ViewTransfers.cpp:789
-msgid "retry in "
-msgstr "prøver igjen om "
+#: sg_ProjectPanel.cpp:74
+msgid "Work done for this project"
+msgstr "Arbeid avsluttet for dette prosjektet"
 
-#: clientgui/ViewTransfers.cpp:791
-msgid "failed"
-msgstr "mislyktes"
+#: sg_ProjectPanel.cpp:77
+msgid "Synchronize projects with account manager system"
+msgstr "Synkroniser prosjekter med kontobehandlersystemet"
 
-#: clientgui/ViewTransfers.cpp:794
-msgid "suspended"
-msgstr "suspendert"
+#: sg_ProjectPanel.cpp:124
+msgid "Select a project to access with the controls below"
+msgstr "Velg et prosjekt å aksessere med kontrolltavlen nedenfor"
 
-#: clientgui/ViewTransfers.cpp:799
-msgid "active"
-msgstr "aktiv"
+#: sg_ProjectPanel.cpp:145
+msgid "Project Web Pages"
+msgstr "Prosjektets nettsider"
 
-#: clientgui/ViewTransfers.cpp:801
-msgid "pending"
-msgstr "venter"
+#: sg_ProjectPanel.cpp:149
+msgid "Project Commands"
+msgstr "Prosjektkommandoer"
 
-#: clientgui/ViewTransfers.cpp:808
-msgid " (project backoff: "
-msgstr " (prosjekt holder igjen: "
+#: sg_ProjectPanel.cpp:267
+#, c-format
+msgid "Pop up a menu of web sites for project %s"
+msgstr "Vis en meny med nettsider for prosjektet %s"
 
-#: clientgui/ViewWork.cpp:192
-#: clientgui/ViewWork.cpp:782
-msgid "Show active tasks"
-msgstr "Vis aktive oppgaver"
+#: sg_ProjectPanel.cpp:269
+#, c-format
+msgid "Pop up a menu of commands to apply to project %s"
+msgstr "Vis meny med kommandoer som skal gjelde for %s prosjektet"
 
-#: clientgui/ViewWork.cpp:193
-#: clientgui/ViewWork.cpp:783
-msgid "Show only active tasks."
-msgstr "Vis bare aktive oppgaver."
+#: sg_TaskCommandPopup.cpp:67
+msgid "Suspend this task."
+msgstr "Suspender denne oppgaven."
 
-#: clientgui/ViewWork.cpp:206
-msgid "Show VM Console"
-msgstr "Vis VM konsollen"
+#: sg_TaskCommandPopup.cpp:73
+msgid "Abandon this task. You will get no credit for it."
+msgstr "Gi opp denne oppgaven. Du vil ikke få poeng for den."
 
-#: clientgui/ViewWork.cpp:207
-msgid "Show VM Console in a window."
-msgstr "Vis VM konsollen i et vindu."
+#: sg_TaskCommandPopup.cpp:251
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %.1lf%%, Status: %s)"
+msgstr "Er du sikker på at du vil avbryte denne oppgaven '%s'?\n(Progresjon: %.1lf%%, Status: %s)"
 
-#: clientgui/ViewWork.cpp:214
-msgid "Suspend work for this result."
-msgstr "Suspender arbeid for dette resultatet."
+#: sg_TaskPanel.cpp:464
+msgid "You don't have any projects.  Please Add a Project."
+msgstr "Du har ingen prosjekt.  Vennligst legg til et prosjekt."
 
-#: clientgui/ViewWork.cpp:221
-msgid "Abandon work on the result. You will get no credit for it."
-msgstr "Gi opp arbeid på grunn av resultatet. Du vil ikke få poeng for det."
+#: sg_TaskPanel.cpp:465
+msgid "Not available"
+msgstr "Ikke tilgjengelig"
 
-#: clientgui/ViewWork.cpp:240
-msgid "Elapsed"
-msgstr "Tid brukt"
+#: sg_TaskPanel.cpp:476
+msgid "Tasks:"
+msgstr "Oppgaver:"
 
-#: clientgui/ViewWork.cpp:241
-msgid "Remaining (estimated)"
-msgstr "Gjenstår (estimert)"
+#: sg_TaskPanel.cpp:482
+msgid "Select a task to access"
+msgstr "Velg en oppgave for granskning"
 
-#: clientgui/ViewWork.cpp:242
-msgid "Deadline"
-msgstr "Frist"
+#: sg_TaskPanel.cpp:493
+msgid "From:"
+msgstr "Fra:"
 
-#: clientgui/ViewWork.cpp:269
-msgid "Tasks"
-msgstr "Oppgaver"
+#: sg_TaskPanel.cpp:547
+msgid "This task's progress"
+msgstr "Denne oppgavens progresjon"
 
-#: clientgui/ViewWork.cpp:362
-msgid "Resuming task..."
-msgstr "Gjenopptar oppgave..."
+#: sg_TaskPanel.cpp:565
+msgid "Task Commands"
+msgstr "Oppgavekommandoer"
 
-#: clientgui/ViewWork.cpp:365
-msgid "Suspending task..."
-msgstr "Suspenderer oppgave..."
+#: sg_TaskPanel.cpp:566
+msgid "Pop up a menu of commands to apply to this task"
+msgstr "Vis meny med kommandoer som skal gjelde for denne oppgaven"
 
-#: clientgui/ViewWork.cpp:394
-msgid "Showing graphics for task..."
-msgstr "Viser grafikk for oppgave..."
+#: sg_TaskPanel.cpp:701
+#, c-format
+msgid "Application: %s"
+msgstr "Applikasjon: %s"
 
-#: clientgui/ViewWork.cpp:431
-msgid "Showing VM console for task..."
-msgstr "Viser VM konsollen for oppgave..."
+#: sg_TaskPanel.cpp:724
+#, c-format
+msgid "%.3f%%"
+msgstr "%.3f%%"
+
+#: sg_TaskPanel.cpp:732
+msgid "Application: Not available"
+msgstr "Applikasjon: Ikke tilgjengelig"
+
+#: sg_TaskPanel.cpp:832
+msgid "Not Available"
+msgstr "Ikke tilgjengelig"
 
-#: clientgui/ViewWork.cpp:484
+#: sg_TaskPanel.cpp:847
 #, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %s, Status: %s)"
-msgstr ""
-"Er du sikker på at du ønsker å avbryte denne oppgaven '%s'?\n"
-"(Fremgang: %s, Status: %s)"
+msgid "Elapsed: %s"
+msgstr "Tid brukt: %s"
 
-#: clientgui/ViewWork.cpp:490
+#: sg_TaskPanel.cpp:861
 #, c-format
-msgid "Are you sure you want to abort these %d tasks?"
-msgstr "Er du sikker på at du ønsker å avbryte disse %d oppgavene?"
+msgid "Remaining (estimated): %s"
+msgstr "Gjenstår (estimert): %s"
 
-# 75%
-#: clientgui/ViewWork.cpp:504
-msgid "Aborting task..."
-msgstr "Avbryter oppgave..."
+#: sg_TaskPanel.cpp:876
+#, c-format
+msgid "Status: %s"
+msgstr "Status: %s"
 
-#: clientgui/ViewWork.cpp:776
-msgid "Show all tasks"
-msgstr "Vis alle oppgavene"
+#: sg_TaskPanel.cpp:1223
+msgid "Retrieving current status."
+msgstr "Henter gjeldende status."
 
-#: clientgui/ViewWork.cpp:777
-msgid "Show all tasks."
-msgstr "Vis alle oppgavene."
+#: sg_TaskPanel.cpp:1229
+msgid "Downloading work from the server."
+msgstr "Laster ned arbeid fra tjeneren."
 
-#: clientgui/WelcomePage.cpp:284
-msgid "Add project or account manager"
-msgstr "Legg til prosjekt eller kontobehandler"
+#: sg_TaskPanel.cpp:1234
+msgid "Processing Suspended:  Running On Batteries."
+msgstr "Prosessering suspendert:  Kjører på batterier."
 
-#: clientgui/WelcomePage.cpp:288
-msgid "Add project or use BOINC Account Manager"
-msgstr "Legg til prosjekt eller bruk BOINC kontobehandler"
+#: sg_TaskPanel.cpp:1236
+msgid "Processing Suspended:  User Active."
+msgstr "Prosessering suspendert:  Bruker aktiv."
 
-#: 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 ""
-"Hvis mulig, legg til prosjekter fra\n"
-"%s nettside.\n"
-"\n"
-"Prosjekter lagt til via denne veilederen vil ikke bli\n"
-"listet i eller administrert via %s."
+#: sg_TaskPanel.cpp:1238
+msgid "Processing Suspended:  User paused processing."
+msgstr "Prosessering suspendert:  Bruker har pauset prosessering."
 
-#: 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 ""
-"Det er mer enn 30 BOINC baserte prosjekter\n"
-"som utfører forskning innenfor mange vitenskapelige områder,\n"
-"og du kan delta i så mange av disse du måtte ønske.\n"
-"Du kan legge til et prosjekt med en gang,\n"
-"eller bruke en 'Kontobehandler' nettside for å velge prosjekter."
+#: sg_TaskPanel.cpp:1240
+msgid "Processing Suspended:  Time of Day."
+msgstr "Prosessering suspendert:  Tid på dag."
 
-#: 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 ""
-"Du have valgt å legge til et nytt frivillig beregningsprosjekt eller endre hvilke prosjekter\n"
-"du bidrar til.\n"
-"\n"
-"Noen av disse prosjektene kjøres og administreres av World Community Grid, mens andre\n"
-"kjøres og administreres av andre forskere eller organisasjoner. BOINC programvaren\n"
-"kan dele din gjenværende prosessorkraft blant hvilken som helst kombinasjon av prosjekter.\\Alternativt, hvis du har registrert deg hos en BOINC kontobehandler kan du bruke\n"
-"denne til å velge hvilke prosjekter du vil støtte.\n"
-"\n"
-"Vennligst velg hvilken type av endringer du ønsker å gjøre:\n"
+#: sg_TaskPanel.cpp:1242
+msgid "Processing Suspended:  Benchmarks Running."
+msgstr "Prosessering suspendert:  Ytelsestest kjører."
 
-#: clientgui/WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
-msgstr "Bruk en BOINC kontobehandler"
+#: sg_TaskPanel.cpp:1244
+msgid "Processing Suspended."
+msgstr "Prosessering suspendert."
 
-#: clientgui/WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
-msgstr "Legg til eller endre dine World Community Grid prosjekter"
+#: sg_TaskPanel.cpp:1248
+msgid "Waiting to contact project servers."
+msgstr "Venter på kontakt med prosjekt tjener."
 
-#: clientgui/WelcomePage.cpp:361
-msgid "Add projects run by other researchers or organizations"
-msgstr "Legg til prosjekter som driftes av andre forskere eller organisasjoner"
+#: sg_TaskPanel.cpp:1252 sg_TaskPanel.cpp:1261
+msgid "Retrieving current status"
+msgstr "Henter gjeldende status"
 
-#: clientgui/WizardAttach.cpp:673
-msgid "Do you really want to cancel?"
-msgstr "Ønsker du virkelig å avbryte?"
+#: sg_TaskPanel.cpp:1256
+msgid "No work available to process"
+msgstr "Ingen arbeid tilgjengelig for prosessering"
 
-#: clientgui/WizardAttach.cpp:674
-msgid "Question"
-msgstr "Spørsmål"
+#: sg_TaskPanel.cpp:1258
+msgid "Unable to connect to the core client"
+msgstr "Kan ikke koble til kjerneklienten"
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
+#: wizardex.cpp:377 wizardex.cpp:553
 msgid "&Next >"
 msgstr "&Neste >"
 
-#: clientgui/wizardex.cpp:383
+#: wizardex.cpp:383
 msgid "< &Back"
 msgstr "< &Tilbake"
 
-#: clientgui/wizardex.cpp:553
+#: wizardex.cpp:553
 msgid "&Finish"
 msgstr "&Ferdig"
 
-#: clientgui/common/wxPieCtrl.cpp:64
-msgid "Pie Ctrl"
-msgstr ""
+#: mac/Mac_GUI.cpp:110
+msgid "Preferences…"
+msgstr "Innstillinger…"
 
-#: clientgui/mac/Mac_GUI.cpp:35
+#: mac/Mac_GUI.cpp:122
 msgid "Services"
 msgstr "Tjenester"
 
-#: clientgui/mac/Mac_GUI.cpp:36
+#: mac/Mac_GUI.cpp:144
 #, c-format
 msgid "Hide %s"
 msgstr "Skjul %s"
 
-#: clientgui/mac/Mac_GUI.cpp:37
+#: mac/Mac_GUI.cpp:158
 msgid "Hide Others"
 msgstr "Skjul andre"
 
-#: clientgui/mac/Mac_GUI.cpp:38
+#: mac/Mac_GUI.cpp:172
 msgid "Show All"
 msgstr "Vis alle"
 
-#: clientgui/mac/Mac_GUI.cpp:39
+#: mac/Mac_GUI.cpp:186
 #, c-format
 msgid "Quit %s"
 msgstr "Avslutt %s"
-
-#: clientgui/DlgAdvPreferences.h:30
-msgid "specify work start and stop hours in format HH:MM-HH:MM"
-msgstr ""
-
-#: clientgui/DlgAdvPreferences.h:31
-msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
-msgstr ""
-
-# 98%
-#~ msgid ""
-#~ "(C) 2003-2013 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2013 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#, c-format
-#~ msgid "%s - Preferences"
-#~ msgstr "%s - Innstillinger"
-
-#, no-c-format
-#~ msgid "% of the processors (0 means ignore this setting)"
-#~ msgstr "% av prosessorene (0 betyr ignorer denne innstillingen)"
-
-#, no-c-format
-#~ msgid "% CPU time"
-#~ msgstr "% CPU tid"
-#~ msgid "KBytes/sec."
-#~ msgstr "KBytes/sek."
-#~ msgid "Mbytes"
-#~ msgstr "Mbytes"
-#~ msgid "every"
-#~ msgstr "hver"
-#~ msgid "days"
-#~ msgstr "dager"
-#~ msgid "Gigabytes disk space"
-#~ msgstr "Gigabytes diskplass"
-#~ msgid "Running, high priority"
-#~ msgstr "Kjører, høy prioritet"
-#~ msgid " (Scheduler wait: "
-#~ msgstr " (Planleggeren venter: "
-#~ msgid " (Scheduler wait)"
-#~ msgstr " (Planleggeren venter)"
-#~ msgid " (Waiting for network access)"
-#~ msgstr " (Venter på nettverkstilgang)"
-#~ msgid "Preferences…"
-#~ msgstr "Instillinger..."
-#~ msgid "Workunit name"
-#~ msgstr "Arbeidsenhet navn"
-#~ msgid "invalid float"
-#~ msgstr "ugyldig flyttall "
-
-#, fuzzy
-#~ msgid "Display the advanced (accessible) graphical interface."
-#~ msgstr "Vis det grafisk avanserte brukergrensesnittet."
-#~ msgid "Paused: Other work running"
-#~ msgstr "Pause: Annet arbeid kjører"
-#~ msgid "Paused: User active"
-#~ msgstr "Pause: Bruker aktiv"
-#~ msgid "Paused: Computer on battery"
-#~ msgstr "Pause: Datamaskinen er på batteri"
-#~ msgid "Paused: Time of Day"
-#~ msgstr "Pause: Tid på dag"
-#~ msgid "Paused: Benchmarks running"
-#~ msgstr "Pause: Ytelsestest kjører"
-#~ msgid "Paused"
-#~ msgstr "Pause"
-#~ msgid "Click to show project graphics"
-#~ msgstr "Klikk for å vise prosjekt grafikk"
-#~ msgid "Stop all activity"
-#~ msgstr "Stopp all aktivitet"
-#~ msgid "Resume activity"
-#~ msgstr "Gjenoppta aktivitet"
-#~ msgid "Switch to the BOINC advanced view"
-#~ msgstr "Bytt til BOINC avansert visning"
-#~ msgid "My Projects:"
-#~ msgstr "Mine prosjekt:"
-
-#, c-format
-#~ msgid "%s. Work done by %s: %0.2f"
-#~ msgstr "%s. Arbeid gjort av %s: %0.2f"
-
-#, c-format
-#~ msgid "%.1lf"
-#~ msgstr "%.1hvis"
-
-#, c-format
-#~ msgid "%d hr %d min %d sec"
-#~ msgstr "%d t %d min %d sek"
-#~ msgid "Application: "
-#~ msgstr "Applikasjon: "
-#~ msgid "Account manager website"
-#~ msgstr "Kontostyring nettside"
-#~ msgid "Account Manager &URL:"
-#~ msgstr "&Nettadresse til kontobehandler:"
-
-#, c-format
-#~ msgid "%s &website"
-#~ msgstr "%s &nettside"
-
-#, c-format
-#~ msgid "%s; received on %s"
-#~ msgstr "%s; mottatt på %s"
-
-#, c-format
-#~ msgid "%s; received from %s; on %s"
-#~ msgstr "%s; mottatt fra %s; på %s"
-#~ msgid "Click"
-#~ msgstr "Klikk"
-#~ msgid "Project List"
-#~ msgstr "Prosjekt liste"
-#~ msgid "Nvidia GPU Supported"
-#~ msgstr "Nvidia GPU støttet"
-#~ msgid "ATI GPU Supported"
-#~ msgstr "ATI GPU støttet"
-#~ msgid "Project Website"
-#~ msgstr "Prosjektets nettside"
-
-# 88%
-#, fuzzy
-#~ msgid "Retry now"
-#~ msgstr "Prøv igjen nå"
-#~ msgid "10%"
-#~ msgstr "10%"
-#~ msgid "20%"
-#~ msgstr "20%"
-#~ msgid "30%"
-#~ msgstr "30%"
-#~ msgid "40%"
-#~ msgstr "40%"
-#~ msgid "50%"
-#~ msgstr "50%"
-#~ msgid "60%"
-#~ msgstr "60%"
-#~ msgid "70%"
-#~ msgstr "70%"
-#~ msgid "80%"
-#~ msgstr "80%"
-#~ msgid "90%"
-#~ msgstr "90%"
-#~ msgid "100%"
-#~ msgstr "100%"
-#~ msgid "1"
-#~ msgstr "1"
-#~ msgid "3"
-#~ msgstr "3"
-#~ msgid "5"
-#~ msgstr "5"
-#~ msgid "10"
-#~ msgstr "10"
-#~ msgid "15"
-#~ msgstr "15"
-#~ msgid "30"
-#~ msgstr "30"
-#~ msgid "60"
-#~ msgstr "60"
-
-#, c-format
-#~ msgid "; column %d of %d; "
-#~ msgstr "; kolonne %d av %d;"
-#~ msgid "list is empty"
-#~ msgstr "listen er tom"
-
-#, c-format
-#~ msgid "; row %d; "
-#~ msgstr "; rad %d;"
-
-#, c-format
-#~ msgid "; row %d of %d; "
-#~ msgstr "; rad %d av %d; "
-#~ msgid "blank"
-#~ msgstr "tom"
-
-# 75%
-#, fuzzy
-#~ msgid "list of projects or account managers"
-#~ msgstr "&Legg til prosjekt eller kontobehandler..."
-
-#, c-format
-#~ msgid "row %d of %d; "
-#~ msgstr "rad %d av %d; "
-
-#, c-format
-#~ msgid "The minimum password length for this project is %d. Please enter a different password."
-#~ msgstr "Minste passordlengde for dette prosjektet er %d. Angi et annet passord."
-
-#, c-format
-#~ msgid "The minimum password length for this account manager is %d. Please enter a different password."
-#~ msgstr ""
-#~ "Minste passordlengde for denne kontobehandleren er %d. Angi et annet "
-#~ "passord."
-#~ msgid ""
-#~ "An error has occurred;\n"
-#~ "check the Event Log for details.\n"
-#~ "\n"
-#~ "Click Finish to close."
-#~ msgstr ""
-#~ "En feil har oppstått;\n"
-#~ "sjekk hendelse loggen for detaljer.\n"
-#~ "\n"
-#~ "Klikk Ferdig for å lukke."
-
-#, no-c-format
-#~ msgid "% of the processors"
-#~ msgstr "av prosessoren"
-#~ msgid "Identify your account "
-#~ msgstr "Identifiser kontoen din"
-#~ msgid "Read config file"
-#~ msgstr "Les konfigurasjonsfil"
-#~ msgid "Read configuration info from cc_config.xml"
-#~ msgstr "Les konfigurasjoninformasjon fra cc_config.xml"
-#~ msgid ""
-#~ "(C) 2003-2011 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2011 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-
-#, fuzzy
-#~ msgid "%s: %.0f"
-#~ msgstr "%s: %0.2f"
-#~ msgid "Click 'Retry now' to transfer the file now"
-#~ msgstr "Klikk 'Prøv igjen nå' for å overføre filen nå"
-
-#, fuzzy
-#~ msgid "Don't fetch ATI GPU tasks"
-#~ msgstr "Ikke hent CPU oppgaver"
-#~ msgid "Web sites"
-#~ msgstr "Nettsted"
-#~ msgid "days (max. 10)"
-#~ msgstr "dager (maks 10)"
-#~ msgid "%d.%d%%"
-#~ msgstr "%d.%d%%"
-#~ msgid "Display and network &options..."
-#~ msgstr "Visnings og nettverks &valg..."
-#~ msgid "Estimated task size"
-#~ msgstr "Estimert oppgave størrelse"
-#~ msgid "Max RAM usage"
-#~ msgstr "Maks minnebruk"
-#~ msgid "%s - Options"
-#~ msgstr "%s - Alternativer"
-#~ msgid "Retrieving host information; please wait..."
-#~ msgstr "Henter vertsinformasjon; vennligst vent..."
-#~ msgid " (waiting for GPU memory)"
-#~ msgstr " (venter på GPU minne)"
-#~ msgid "Pause"
-#~ msgstr "Pause"
-#~ msgid "%s - Messages"
-#~ msgstr "%s - Meldinger"
-#~ msgid "Preferences"
-#~ msgstr "Instillinger"
-#~ msgid "My Tasks:"
-#~ msgstr "Mine oppgaver:"
-#~ msgid "From Project:"
-#~ msgstr "Fra prosjekt:"
-#~ msgid "Upload suspended - "
-#~ msgstr "Opplasting suspendert - "
-#~ msgid "Download suspended - "
-#~ msgstr "Nedlasting suspendert - "
-
diff --git a/locale/nb/BOINC-Project-Generic.po b/locale/nb/BOINC-Project-Generic.po
index 4e144ac..728e881 100755
--- a/locale/nb/BOINC-Project-Generic.po
+++ b/locale/nb/BOINC-Project-Generic.po
@@ -7,8 +7,8 @@ msgstr ""
 "Project-Id-Version: BOINC-prject-generic\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: 2014-12-15 21:27+0000\n"
-"Last-Translator: Anonymous Pootle User\n"
+"PO-Revision-Date: 2014-09-13 04:05+0000\n"
+"Last-Translator: Jan <jan at sherdahl.com>\n"
 "Language-Team: Hjelp andre <kenneth at skjold.biz>\n"
 "Language: nb\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.5.0\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1418678840.0\n"
+"X-POOTLE-MTIME: 1410581127.0\n"
 
 msgid "LANG_NAME_NATIVE"
 msgstr "English"
@@ -6548,8 +6548,9 @@ msgid "Decreasing average credit"
 msgstr "Gjennomsnitt nylig arbeid utført"
 
 #: ../user/user_search.php:69
+#, fuzzy
 msgid "Decreasing total credit"
-msgstr ""
+msgstr "Gjennomsnitt nylig arbeid utført"
 
 #: ../user/user_search.php:100
 msgid "search string must be at least 3 characters"
diff --git a/locale/nb/BOINC-Setup.mo b/locale/nb/BOINC-Setup.mo
index 6d738f5..65a79b2 100644
Binary files a/locale/nb/BOINC-Setup.mo and b/locale/nb/BOINC-Setup.mo differ
diff --git a/locale/nb/BOINC-Setup.po b/locale/nb/BOINC-Setup.po
old mode 100755
new mode 100644
index 9a47cfd..e38a1a2
--- a/locale/nb/BOINC-Setup.po
+++ b/locale/nb/BOINC-Setup.po
@@ -1,52 +1,38 @@
 # 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: BOINC 7.4\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-11 23:51-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: nb\n"
+"PO-Revision-Date: 2015-02-23 23:14+0000\n"
+"Last-Translator: Rom Walton\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/boinc/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-Basepath: /Volumes/Cheer/BOINC_GIT/boinc_trunk\n"
-"X-POOTLE-MTIME: 1409495864.0\n"
-"X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: mac_installer\n"
+"Language: nb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: Installer.cpp:124
 #, c-format
 msgid "Sorry, this version of %s requires system 10.5 or higher."
 msgstr "Beklager, denne versjonen av %s krever system 10.5 eller høyere."
 
-#: PostInstall.cpp:130
-#: PostInstall.cpp:1136
-#: uninstall.cpp:1618
+#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
 msgid "Yes"
 msgstr "Ja"
 
-#: PostInstall.cpp:131
-#: PostInstall.cpp:1137
-#: uninstall.cpp:1619
+#: PostInstall.cpp:131 PostInstall.cpp:1137 uninstall.cpp:1619
 msgid "No"
-msgstr ""
-"Brukere med tillatelse til å administrere denne datamaskinen vil automatisk få tilgang til å kjøre og kontrollere %s.\n"
-"\n"
-"Ønsker du også at brukere uten administratorrettigheter skal kunne kjøre og kontrollere %s på denne Mac'en?"
+msgstr "Brukere med tillatelse til å administrere denne datamaskinen vil automatisk få tilgang til å kjøre og kontrollere %s.\n\nØnsker du også at brukere uten administratorrettigheter skal kunne kjøre og kontrollere %s på denne Mac'en?"
 
 #: PostInstall.cpp:133
 msgid "Should BOINC run even when no user is logged in?"
-msgstr ""
-"Brukere som har tillatelse til å administrere denne datamaskinen vil automatisk få tilgang til å kjøre og kontrollere %s.\n"
-"\n"
-"Ønsker du at brukere uten administratorrettigheter skal kunne kjøre og kontrollere %s på denne Mac'en?"
+msgstr "Brukere som har tillatelse til å administrere denne datamaskinen vil automatisk få tilgang til å kjøre og kontrollere %s.\n\nØnsker du at brukere uten administratorrettigheter skal kunne kjøre og kontrollere %s på denne Mac'en?"
 
 #: PostInstall.cpp:1416
 #, c-format
@@ -54,10 +40,7 @@ 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 ""
-"Brukere med tillatelse til å administrere denne datamaskinen vil automatisk få tilgang til å kjøre og kontrollere %s.\n"
-"\n"
-"Ønsker du også at brukere uten administratorrettigheter skal kunne kjøre og kontrollere %s på denne Mac'en?"
+msgstr "Brukere med tillatelse til å administrere denne datamaskinen vil automatisk få tilgang til å kjøre og kontrollere %s.\n\nØnsker du også at brukere uten administratorrettigheter skal kunne kjøre og kontrollere %s på denne Mac'en?"
 
 #: PostInstall.cpp:1444
 #, c-format
@@ -76,9 +59,7 @@ msgstr "Tilgangsfeilmelding etter omstart"
 msgid ""
 "Removal may take several minutes.\n"
 "Please be patient."
-msgstr ""
-"Avinstallering vil ta flere minutter.\n"
-"Vennligst vent."
+msgstr "Avinstallering vil ta flere minutter.\nVennligst vent."
 
 #: uninstall.cpp:156
 #, c-format
@@ -86,10 +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 ""
-"Er du sikker på at du ønsker å fullstendig fjerne %s fra din datamaskin?\n"
-"\n"
-"Dette vil fjerne programfiler, men ikke slette %s data filer."
+msgstr "Er du sikker på at du ønsker å fullstendig fjerne %s fra din datamaskin?\n\nDette vil fjerne programfiler, men ikke slette %s data filer."
 
 #: uninstall.cpp:163
 #, c-format
@@ -109,9 +87,7 @@ msgstr "navn  på bruker"
 msgid ""
 "Do you also want to remove VirtualBox from your computer?\n"
 "(VirtualBox was installed along with BOINC.)"
-msgstr ""
-"Vil du også avinstallere VirtualBox fra din datamaskin?\n"
-" (VirtualBox ble installert sammen med BOINC.)"
+msgstr "Vil du også avinstallere VirtualBox fra din datamaskin?\n (VirtualBox ble installert sammen med BOINC.)"
 
 #: uninstall.cpp:312
 #, c-format
@@ -123,23 +99,14 @@ msgid ""
 "\n"
 "for each user, the file\n"
 "\"%s\"."
-msgstr ""
-"Avinnstallasjon ferdig.\n"
-"\n"
-" Det kan hende du ønsker å fjerne resterende elementer ved å benytte Finder:\n"
-"mappen \"%s\"\n"
-"\n"
-"for hver bruker, filen\n"
-"\"%s\"."
+msgstr "Avinnstallasjon ferdig.\n\n Det kan hende du ønsker å fjerne resterende elementer ved å benytte Finder:\nmappen \"%s\"\n\nfor hver bruker, filen\n\"%s\"."
 
 #: uninstall.cpp:840
 #, c-format
 msgid ""
 "Enter your administrator password to completely remove %s from you computer.\n"
 "\n"
-msgstr ""
-"Tast inn ditt administrator passord for å fullstendig fjerne %s fra din datamaskin.\n"
-"\n"
+msgstr "Tast inn ditt administrator passord for å fullstendig fjerne %s fra din datamaskin.\n\n"
 
 #: uninstall.cpp:1616
 msgid "Cancel"
@@ -148,4 +115,3 @@ msgstr "Avbryt"
 #: uninstall.cpp:1617
 msgid "Continue..."
 msgstr "Fortsett...                "
-
diff --git a/locale/nb/BOINC-Web.mo b/locale/nb/BOINC-Web.mo
index 396a8b3..2eda995 100644
Binary files a/locale/nb/BOINC-Web.mo and b/locale/nb/BOINC-Web.mo differ
diff --git a/locale/nb/BOINC-Web.po b/locale/nb/BOINC-Web.po
index 6f1fb27..79ec8dc 100755
--- a/locale/nb/BOINC-Web.po
+++ b/locale/nb/BOINC-Web.po
@@ -4,16 +4,17 @@
 # FileID  : $Id$
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\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-11 23:53-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: 2014-09-03 03:41+0000\n"
+"Last-Translator: Jan <jan at sherdahl.com>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.5.0\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-POOTLE-MTIME: 1409715674.0\n"
@@ -28,12 +29,17 @@ msgstr "Tilbake til BOINC hovedsiden"
 
 #: docutil.php:114
 #, php-format
+#, php-format, php-format
 msgid "This page is %stranslatable%s."
 msgstr "Denne siden er %soversettbar%s."
 
 #: download.php:39
-msgid "We recommend that you also install VirtualBox, so your computer can work on science projects that require it."
-msgstr "Vi anbefaler at du også installerer VirtualBox, så din datamaskin kan arbeide med vitenskapelige prosjekter som er avhengig av denne."
+msgid ""
+"We recommend that you also install VirtualBox, so your computer can work on "
+"science projects that require it."
+msgstr ""
+"Vi anbefaler at du også installerer VirtualBox, så din datamaskin kan "
+"arbeide med vitenskapelige prosjekter som er avhengig av denne."
 
 #: download.php:41
 msgid "Learn more about VirtualBox."
@@ -43,14 +49,12 @@ msgstr "Lær mer om VirutalBox."
 msgid "Download BOINC + VirtualBox"
 msgstr "Last ned BOINC + VirtualBox"
 
-#: download.php:54
-#: download.php:69
+#: download.php:54 download.php:69
 #, php-format
 msgid "for %s"
 msgstr "for %s"
 
-#: download.php:57
-#: download.php:72
+#: download.php:57 download.php:72
 #, php-format
 msgid "BOINC version %s"
 msgstr "BOINC versjon %s"
@@ -65,20 +69,38 @@ msgid "Download BOINC"
 msgstr "Last ned BOINC"
 
 #: download.php:123
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others."
-msgstr "BOINC er et program som lar deg donere inaktiv datamaskintid til vitenskapelige prosjekter som SETI at home, Climateprediction.net, Rosetta at home, World Community Grid og mange flere."
+msgid ""
+"BOINC is a program that lets you donate your idle computer time to science "
+"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, and many others."
+msgstr ""
+"BOINC er et program som lar deg donere inaktiv datamaskintid til "
+"vitenskapelige prosjekter som SETI at home, Climateprediction.net, "
+"Rosetta at home, World Community Grid og mange flere."
 
 #: download.php:125
-msgid "After installing BOINC on your computer, you can connect it to as many of these projects as you like."
-msgstr "Etter å ha installert BOINC på din datamaskin, kan du knytte den opp til så mange av disse prosjektene du ønsker."
+msgid ""
+"After installing BOINC on your computer, you can connect it to as many of "
+"these projects as you like."
+msgstr ""
+"Etter å ha installert BOINC på din datamaskin, kan du knytte den opp til så "
+"mange av disse prosjektene du ønsker."
 
 #: download.php:127
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
-msgstr "Du kan kjøre denne programvaren på en datamaskin bare hvis du er eier av den eller har tillatelse fra dens eier."
+msgid ""
+"You may run this software on a computer only if you own the computer or have "
+"the permission of its owner."
+msgstr ""
+"Du kan kjøre denne programvaren på en datamaskin bare hvis du er eier av den "
+"eller har tillatelse fra dens eier."
 
 #: download.php:132
-msgid "We recommend that you download BOINC from the Google Play Store or Amazon Appstore, not from here."
-msgstr "Vi anbefaler deg å laste ned BOINC fra Google Play Store eller Amazon Appstore, og ikke fra denne siden."
+msgid ""
+"We recommend that you download BOINC from the Google Play Store or Amazon "
+"Appstore, not from here."
+msgstr ""
+"Vi anbefaler deg å laste ned BOINC fra Google Play Store eller Amazon "
+"Appstore, og ikke fra denne siden."
 
 #: download.php:167
 msgid "System requirements"
@@ -88,8 +110,7 @@ msgstr "Systemkrav"
 msgid "Release notes"
 msgstr "Utgivelsesmerknader"
 
-#: download.php:169
-#: index.php:86
+#: download.php:169 index.php:86
 msgid "Help"
 msgstr "Hjelp"
 
@@ -111,23 +132,53 @@ msgstr "BOINC: beregne for vitenskap"
 
 #: help.php:12
 #, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
-msgstr "BOINC online hjelp lar deg snakke med erfarne BOINC brukere som kan: %s svare på spørsmål angående BOINC og frivillig beregning; %s veilede deg gjennom installasjonsprosessen og bruk av BOINC; %s feilsøke eventuelle problemer du måtte ha."
+#, php-format, php-format
+msgid ""
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who "
+"can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"through the process of installing and using BOINC; %s troubleshoot any "
+"problems you might have."
+msgstr ""
+"BOINC online hjelp lar deg snakke med erfarne BOINC brukere som kan: %s "
+"svare på spørsmål angående BOINC og frivillig beregning; %s veilede deg "
+"gjennom installasjonsprosessen og bruk av BOINC; %s feilsøke eventuelle "
+"problemer du måtte ha."
 
 #: help.php:21
 #, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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 hjelp er basert på %sSkype%s, et telefonsystem via Internet. Skype er gratis (både programvaren og samtalene).  Hvis du ikke allerede har Skype installert, vennligst %slast ned og installer det nå%s.  Når du er ferdig, kom tilbake til denne siden."
+msgid ""
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. "
+"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 hjelp er basert på Skype, et telefonsystem via Internet. Skype "
+"er gratis (både programvaren og samtalene).  Hvis du ikke allerede har Skype "
+"installert, vennligst %slast ned og installer det nå%s.  Når du er ferdig, "
+"kom tilbake til denne siden."
 
 #: help.php:28
 #, fuzzy
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
-msgstr "Den beste måten å få hjelp på er via en samtale. Til dette trenger du enten en innebygd mikrofon og høyttalere, eller et eksternt headset tilkoblet din datamaskin.  Du kan også benytte Skype sitt tekstbaserte chat system eller vanlig epost (hvis du ikke har Skype installert) for å kommunisere med våre frivillige supportmedarbeidere."
+msgid ""
+"The best way to get help is by voice, for which you need either built-in "
+"microphone and speakers or an external headset for your computer.  You can "
+"also use Skype's text-based chat system or regular email (if you don't have "
+"Skype) to communicate with Help Volunteers."
+msgstr ""
+"Den beste måten å få hjelp på er via en samtale. Til dette trenger du enten "
+"en innebygd mikrofon og høyttalere, eller et eksternt headset tilkoblet din "
+"datamaskin.  Du kan også benytte Skype sitt tekstbaserte chat system eller "
+"vanlig epost (hvis du ikke har Skype installert) for å kommunisere med våre "
+"frivillige supportmedarbeidere."
 
 #: help.php:31
 #, fuzzy
-msgid "Volunteers speaking several languages are available. Please select a language:"
-msgstr "Våre supportmedarbeidere snakker flere språk og er tilgjengelige. Vennligst velg et språk:"
+msgid ""
+"Volunteers speaking several languages are available. Please select a "
+"language:"
+msgstr ""
+"Våre supportmedarbeidere snakker flere språk og er tilgjengelige. Vennligst "
+"velg et språk:"
 
 #: help.php:47
 #, fuzzy
@@ -136,22 +187,39 @@ msgstr "Bli frivillig supportmedarbeider"
 
 #: help.php:50
 #, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
-msgstr "Hvis du er en erfaren BOINC bruker, oppfordrer vi deg til å %sbli en supportmedarbeider%s.  Det er en fin måte å bidra til vitenskapelig forskning og frivillig databehandling - og det er morsomt!"
+#, fuzzy, php-format
+msgid ""
+"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+"Volunteer%s.  It's a great way to help the cause of scientific research and "
+"volunteer computing - and it's fun!"
+msgstr ""
+"Hvis du er en erfaren BOINC bruker, oppfordrer vi deg til å %sbli en "
+"supportmedarbeider%s.  Det er en fin måte å bidra til vitenskapelig "
+"forskning og frivillig databehandling - og det er morsomt!"
 
 #: help.php:56
 #, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
-msgstr "Hvis du allerede er en frivillig supportmedarbeider: For å endre dine innstillinger, %sklikk her%s."
+#, fuzzy, php-format
+msgid ""
+"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
+msgstr ""
+"Hvis du allerede er en frivillig supportmedarbeider: For å endre dine "
+"innstillinger, %sklikk her%s."
 
 #: help_funcs.php:107
 #, fuzzy
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
-msgstr "BOINC supportmedarbeidere får ikke betalt for sitt frivillige arbeid. Deres råd bifalles ikke av BOINC eller University of California."
+msgid ""
+"BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
+"or the University of California."
+msgstr ""
+"BOINC supportmedarbeidere får ikke betalt for sitt frivillige arbeid. Deres "
+"råd bifalles ikke av BOINC eller University of California."
 
 #: help_funcs.php:110
 msgid "%1Never%2 give email address or password information to BOINC helpers."
-msgstr "Oppgi %1aldri%2 informasjon angående din epostadresse eller ditt passord til BOINC supportmedarbeidere."
+msgstr ""
+"Oppgi %1aldri%2 informasjon angående din epostadresse eller ditt passord til "
+"BOINC supportmedarbeidere."
 
 #: index.php:24
 msgid "Computing power"
@@ -175,7 +243,9 @@ msgstr "frivillige,"
 
 #: index.php:55
 msgid "computers.\n"
-msgstr "datamaskiner.\n"
+msgstr ""
+"datamaskiner.\n"
+" "
 
 #: index.php:56
 msgid "24-hour average:"
@@ -197,9 +267,7 @@ msgstr "Frivillig"
 msgid "Download"
 msgstr "Last ned"
 
-#: index.php:87
-#: index.php:120
-#: index.php:171
+#: index.php:87 index.php:120 index.php:171
 msgid "Documentation"
 msgstr "Dokumentasjon"
 
@@ -212,8 +280,15 @@ msgid "Links"
 msgstr "Lenker     "
 
 #: index.php:94
-msgid "Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:"
-msgstr "Bruk inaktiv tid på din datamaskin (Windows, Mac, Linux eller Android) for å kurere sykdommer, studere global oppvarming, oppdage pulsarer, og hjelp til med mange andre typer av vitenskapelig forskning.  Det er trygt, sikkert og enkelt:"
+msgid ""
+"Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure "
+"diseases, study global warming, discover pulsars, and do many other types of "
+"scientific research.  It's safe, secure, and easy:"
+msgstr ""
+"Bruk inaktiv tid på din datamaskin (Windows, Mac, Linux eller Android) for å "
+"kurere sykdommer, studere global oppvarming, oppdage pulsarer, og hjelp til "
+"med mange andre typer av vitenskapelig forskning.  Det er trygt, sikkert og "
+"enkelt:"
 
 #: index.php:96
 msgid "Choose projects"
@@ -229,8 +304,13 @@ msgstr "Tast inn en epostadresse og et passord."
 
 #: index.php:102
 #, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
-msgstr "Eller hvis du kjører flere prosjekter, prøv en %skontobehandler%s som for eksempel %sGridRepublic%s eller %sBAM!%s. "
+#, fuzzy, php-format
+msgid ""
+"Or, if you run several projects, try an %saccount manager%s such as %"
+"sGridRepublic%s or %sBAM!%s. "
+msgstr ""
+"Eller hvis du kjører flere prosjekter, prøv en %skontobehandler%s som for "
+"eksempel %sGridRepublic%s eller %sBAM!%s. "
 
 #: index.php:118
 #, fuzzy
@@ -243,13 +323,21 @@ msgstr "Programvareoppdateringer"
 
 #: index.php:128
 #, fuzzy
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
-msgstr "%1Forskere%2: Bruk BOINC for å opprette et %3frivillig beregningsprosjekt%4 som gir deg datakraften tiltusenvis av prosessorer."
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving "
+"you the computing power of thousands of CPUs."
+msgstr ""
+"%1Forskere%2: Bruk BOINC for å opprette et %3frivillig beregningsprosjekt%4 "
+"som gir deg datakraften tiltusenvis av prosessorer."
 
 #: index.php:132
 #, fuzzy
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
-msgstr "%1Universiteter%2: Bruk BOINC til å opprette et %3virtuelt tungregnesenter på deres universitetsområde%4."
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
+msgstr ""
+"%1Universiteter%2: Bruk BOINC til å opprette et %3virtuelt tungregnesenter "
+"på deres universitetsområde%4."
 
 #: index.php:137
 msgid "%1Companies%2: use BOINC for %3desktop Grid computing%4."
@@ -321,8 +409,12 @@ msgstr "API'er for tilleggsprogramvare"
 
 #: index.php:217
 #, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
-msgstr "Åpen kildekode programvare for %sfrivillig beregning%s og %sdistribuert beregning%s."
+#, fuzzy, php-format
+msgid ""
+"Open-source software for %svolunteer computing%s and %sgrid computing%s."
+msgstr ""
+"Åpen kildekode programvare for %sfrivillig beregning%s og %sdistribuert "
+"beregning%s."
 
 #: index.php:230
 msgid "BOINC is based at The University of California, Berkeley"
@@ -343,7 +435,10 @@ msgid "Seismology"
 msgstr "Seismologi"
 
 #: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
+msgid ""
+"The Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to Internet-connected computers.  You must buy a "
+"sensor to participate."
 msgstr ""
 
 #: projects.inc:27
@@ -356,23 +451,24 @@ msgid "Environmental research"
 msgstr "Miljøforskning"
 
 #: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
+msgid ""
+"This project is creating a free and continuously updated map of radiation "
+"levels by using sensors connected to volunteers' computers.  You must buy a "
+"sensor to participate."
 msgstr ""
 
 #: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
+msgid ""
+"To participate in these projects you must buy a sensor and attach it to your "
+"computer."
 msgstr ""
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
 msgstr "Kognitiv vitenskap og kunstig intelligens"
 
-#: projects.inc:60
-#: projects.inc:364
-#: projects.inc:408
-#: projects.inc:457
-#: projects.inc:464
-#: projects.inc:511
+#: projects.inc:60 projects.inc:364 projects.inc:408 projects.inc:457
+#: projects.inc:464 projects.inc:511
 msgid "Private"
 msgstr "Privat"
 
@@ -381,7 +477,11 @@ msgid "Artificial intelligence"
 msgstr "Kunstig intelligens "
 
 #: projects.inc:62
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
+msgid ""
+"Parse and convert semantic nets for use in FreeHAL, an artificial "
+"intelligence that uses semantic networks, stemmers, part of speech "
+"databases, and part of speech taggers in order to imitate human behavior in "
+"conversations."
 msgstr ""
 
 #: projects.inc:69
@@ -397,7 +497,12 @@ msgid "Antimalarial drug discovery"
 msgstr ""
 
 #: projects.inc:84
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
+msgid ""
+"The parasite that causes malaria continues to evolve resistance to available "
+"medication. We therefore urgently need to discover new drugs to replace "
+"existing drugs. Importantly, these new drugs need to target NEW proteins in "
+"the parasite. The FightMalaria at Home project is aimed at finding these new "
+"targets."
 msgstr ""
 
 #: projects.inc:90
@@ -409,7 +514,12 @@ msgid "Protein structure prediction"
 msgstr ""
 
 #: projects.inc:92
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
+msgid ""
+"POEM at HOME uses a computational approach to predict the biologically active "
+"structure of proteins, to understand the signal-processing mechanisms when "
+"the proteins interact with one another, to understand diseases related to "
+"protein malfunction or aggregation, and to develop new drugs on the basis of "
+"the three-dimensions structure of biologically important proteins."
 msgstr ""
 
 #: projects.inc:98
@@ -421,7 +531,11 @@ msgid "Study of protein - ligand interactions"
 msgstr ""
 
 #: projects.inc:100
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
+msgid ""
+"Docking at Home has both bioscience and computer science goals. The project "
+"aims to further knowledge of the atomic details of protein-ligand "
+"interactions and, by doing so, will search for insights into the discovery "
+"of novel pharmaceuticals."
 msgstr ""
 
 #: projects.inc:114
@@ -433,7 +547,11 @@ msgid "Molecular simulations of proteins"
 msgstr ""
 
 #: projects.inc:116
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
+msgid ""
+"GPUGrid.net opens novel computational scenarios by the first full-atom "
+"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
+"New biomedical applications suddenly become possible giving a new role to "
+"computational biology for biomedical research."
 msgstr ""
 
 #: projects.inc:122
@@ -445,11 +563,15 @@ msgid "Genetic linkage analysis"
 msgstr ""
 
 #: projects.inc:124
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
+msgid ""
+"Superlink at Technion helps geneticists all over the world find disease-"
+"provoking genes causing some types of diabetes, hypertension (high blood "
+"pressure), cancer, schizophrenia and many others."
 msgstr ""
 
 #: projects.inc:138
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
+msgid ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
 msgstr ""
 
 #: projects.inc:139
@@ -457,7 +579,11 @@ msgid "Life science research"
 msgstr ""
 
 #: projects.inc:140
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
+msgid ""
+"The Lattice Project supplies computing power to scientists at the University "
+"of Maryland studying evolutionary relationships based on DNA sequence data; "
+"bacterial, plasmid, and virus protein sequences; and biological diversity in "
+"nature reserves. "
 msgstr ""
 
 #: projects.inc:146
@@ -470,22 +596,40 @@ msgid "Epidemiology"
 msgstr ""
 
 #: projects.inc:148
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
+msgid ""
+"Simulation models of the transmission dynamics and health effects of malaria "
+"are an important tool for malaria control. They can be used to determine "
+"optimal strategies for delivering mosquito nets, chemotherapy, or new "
+"vaccines which are currently under development and testing.  Such modeling "
+"is extremely computer intensive, requiring simulations of large human "
+"populations with a diverse set of parameters related to biological and "
+"social factors that influence the distribution of the disease. "
 msgstr ""
 
 #: projects.inc:170
 msgid "University of Washington"
 msgstr "University of Washington"
 
-#: projects.inc:171
-#: projects.inc:179
+#: projects.inc:171 projects.inc:179
 msgid "Biology"
 msgstr "Biologi"
 
 #: projects.inc:172
 #, fuzzy
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
-msgstr "Fastsett den 3-dinemsjonale formen til proteiner i forskningen som til sist leder til å kurere noen viktige menneskelige sykommer. Ved å kjøre Rosetta at home vil du hjelpe oss å få fart på og utvide vår forskning på måter vi ikke kunne forsøkt uten din hjelp. Du vil også hjelpe vår innsats i å designe nye proteiner for å bekjempe sykdommer som HIV, Malaria, Kref og Alzheimer"
+msgid ""
+"Determine the 3-dimensional shapes of proteins in research that may "
+"ultimately lead to finding cures for some major human diseases. By running "
+"Rosetta at home you will help us speed up and extend our research in ways we "
+"couldn't possibly attempt without your help. You will also be helping our "
+"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
+"Cancer, and Alzheimer's"
+msgstr ""
+"Fastsett den 3-dinemsjonale formen til proteiner i forskningen som til sist "
+"leder til å kurere noen viktige menneskelige sykommer. Ved å kjøre "
+"Rosetta at home vil du hjelpe oss å få fart på og utvide vår forskning på måter "
+"vi ikke kunne forsøkt uten din hjelp. Du vil også hjelpe vår innsats i å "
+"designe nye proteiner for å bekjempe sykdommer som HIV, Malaria, Kref og "
+"Alzheimer"
 
 #: projects.inc:178
 msgid "University of Vienna"
@@ -493,8 +637,14 @@ msgstr "University of Vienna"
 
 #: projects.inc:180
 #, fuzzy
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
-msgstr "Beregne likheter mellom proteiner. SIMAP sørger for en offentlig database med resulterende data, som spiller en nøkkelrolle imange forskningsprosjekter angående bioinformatikk"
+msgid ""
+"Calculate similarities between proteins. SIMAP provides a public database of "
+"the resulting data, which plays a key role in many bioinformatics research "
+"projects."
+msgstr ""
+"Beregne likheter mellom proteiner. SIMAP sørger for en offentlig database "
+"med resulterende data, som spiller en nøkkelrolle imange "
+"forskningsprosjekter angående bioinformatikk"
 
 #: projects.inc:186
 msgid "Earth Sciences"
@@ -509,7 +659,15 @@ msgid "Climate study"
 msgstr "Klima studie"
 
 #: projects.inc:200
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
+msgid ""
+"Investigate the approximations that have to be made in state-of-the-art "
+"climate models. By running the model thousands of times we hope to find out "
+"how the model responds to slight tweaks to these approximations - slight "
+"enough to not make the approximations any less realistic. This will allow us "
+"to improve our understanding of how sensitive our models are to small "
+"changes and also to things like changes in carbon dioxide and the sulphur "
+"cycle. This will allow us to explore how climate may change in the next "
+"century under a wide range of different scenarios."
 msgstr ""
 
 #: projects.inc:207
@@ -521,30 +679,44 @@ msgid "Mechanical engineering"
 msgstr "Mekanisk ingeniørvitenskap"
 
 #: projects.inc:214
-msgid "Currently we are calculating the optimum design of a structure call the 52 bar truss"
+msgid ""
+"Currently we are calculating the optimum design of a structure call the 52 "
+"bar truss"
 msgstr ""
 
-#: projects.inc:224
-#: projects.inc:263
-#: projects.inc:271
+#: projects.inc:224 projects.inc:263 projects.inc:271
 msgid "Astronomy"
 msgstr "Astronomi"
 
 #: projects.inc:225
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
+msgid ""
+"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
+"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
+"Universe. We will measure physical parameters (such as stellar mass surface "
+"density, star formation rate surface density, attenuation, and first-order "
+"star formation history) on a resolved pixel-by-pixel basis using spectral "
+"energy distribution (SED) fitting techniques in a distributed computing mode."
 msgstr ""
 
 #: projects.inc:247
 msgid "University of Texas at Austin"
 msgstr "University of Texas at Austin"
 
-#: projects.inc:248
-#: projects.inc:279
+#: projects.inc:248 projects.inc:279
 msgid "Chemistry"
 msgstr "Kjemi"
 
 #: projects.inc:249
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
+msgid ""
+"A common problem in theoretical chemistry, condensed matter physics and "
+"materials science is the calculation of the time evolution of an atomic "
+"scale system where, for example, chemical reactions and/or diffusion occur. "
+"Generally the events of interest are quite rare (many orders of magnitude "
+"slower than the vibrational movements of the atoms), and therefore direct "
+"simulations, tracking every movement of the atoms, would take thousands of "
+"years of computer calculations on the fastest present day computer before a "
+"single event of interest can be expected to occur.  Our research group is "
+"interested in calculating the long time dynamics of systems."
 msgstr ""
 
 #: projects.inc:262
@@ -553,8 +725,14 @@ msgstr ""
 
 #: projects.inc:264
 #, fuzzy
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
-msgstr "Målsettingen til Cosmology at Home er å søke etter modellen som best beskriver vår univers og å finne områder medmodeller som stemmer overens med tilgjengelige astronomiske partikkelfysikkdata."
+msgid ""
+"The goal of Cosmology at Home is to search for the model that best describes "
+"our Universe and to find the range of models that agree with the available "
+"astronomical particle physics data."
+msgstr ""
+"Målsettingen til Cosmology at Home er å søke etter modellen som best beskriver "
+"vår univers og å finne områder medmodeller som stemmer overens med "
+"tilgjengelige astronomiske partikkelfysikkdata."
 
 #: projects.inc:270
 msgid "Rensselaer Polytechnic Institute"
@@ -562,15 +740,26 @@ msgstr ""
 
 #: projects.inc:272
 #, fuzzy
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
-msgstr "Målsetting til Milkyway at Home er å lage en nøyaktig tredimensjonal modell av Melkeveien ved å bruke datasanket av Sloan Digital Sky Survey."
+msgid ""
+"The goal of Milkyway at Home is to create a highly accurate three dimensional "
+"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
+"Survey."
+msgstr ""
+"Målsetting til Milkyway at Home er å lage en nøyaktig tredimensjonal modell av "
+"Melkeveien ved å bruke datasanket av Sloan Digital Sky Survey."
 
 #: projects.inc:278
 msgid "Leiden University, The Netherlands"
 msgstr "Universitetet i Leiden, Nederland"
 
 #: projects.inc:280
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
+msgid ""
+"Surface science calculations using Classical Dynamics.  Leiden Classical "
+"allows volunteers, students and other scientist to submit their personal "
+"calculations to the grid. Each user has his own personal queue for Classical "
+"Dynamics jobs. In this way students have used the grid to simulate liquid "
+"argon, or to test the validity of the ideal gas law by actually doing the "
+"simulations through the grid."
 msgstr ""
 
 #: projects.inc:294
@@ -583,25 +772,36 @@ msgid "Astrophysics"
 msgstr "Astrofysikk"
 
 #: projects.inc:296
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
+msgid ""
+"Search for spinning neutron stars (also called pulsars) using data from the "
+"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
+"observatory.  Einstein at Home is a World Year of Physics 2005 project "
+"supported by the American Physical Society (APS) and by a number of "
+"international organizations."
 msgstr ""
 
-#: projects.inc:310
-#: projects.inc:318
+#: projects.inc:310 projects.inc:318
 msgid "CERN (European Organization for Nuclear Research)"
 msgstr "CERN (European Organization for Nuclear Research)"
 
-#: projects.inc:311
-#: projects.inc:319
+#: projects.inc:311 projects.inc:319
 msgid "Physics"
 msgstr "Fysikk"
 
 #: projects.inc:312
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
+msgid ""
+"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
+"European Organization for Nuclear Research, the world's largest particle "
+"physics laboratory.  It is the most powerful instrument ever built to "
+"investigate on particles proprieties. LHC at home runs simulations to improve "
+"the design of LHC and its detectors."
 msgstr ""
 
 #: projects.inc:320
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
+msgid ""
+"This project uses CERN-developed virtual machine technology for full-fledged "
+"LHC event physics simulation on volunteer computers.  Requires that you "
+"install VirtualBox on your computer"
 msgstr ""
 
 #: projects.inc:326
@@ -614,8 +814,18 @@ msgstr ""
 
 #: projects.inc:328
 #, fuzzy
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
-msgstr "SETI (søk etter utenomjordisk intelligens) er et vitenskapelig område hvis målsetting er å detektere intelligent liv i verdensrommet. En instilling, kjent som radio SETI, bruker radioteleskop for å lytte etter smal båndbredde radiosignaler fra verdensrommet. Slike signaler er ikke kjent at oppstår naturlig, så detektering ville sørge for bevis for utenomjordisk teknologi."
+msgid ""
+"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
+"goal is to detect intelligent life outside Earth. One approach, known as "
+"radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
+"signals from space. Such signals are not known to occur naturally, so a "
+"detection would provide evidence of extraterrestrial technology."
+msgstr ""
+"SETI (søk etter utenomjordisk intelligens) er et vitenskapelig område hvis "
+"målsetting er å detektere intelligent liv i verdensrommet. En instilling, "
+"kjent som radio SETI, bruker radioteleskop for å lytte etter smal båndbredde "
+"radiosignaler fra verdensrommet. Slike signaler er ikke kjent at oppstår "
+"naturlig, så detektering ville sørge for bevis for utenomjordisk teknologi."
 
 #: projects.inc:342
 msgid "Bielefeld University of Applied Sciences"
@@ -626,7 +836,11 @@ msgid "Chemical engineering and nanotechnology"
 msgstr ""
 
 #: projects.inc:344
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
+msgid ""
+"The study of molecular magnets and controlled nanoscale magnetism.  These "
+"magnetic molecules may be used to develop tiny magnetic switches, with "
+"applications in medicine (such as local tumor chemotherapy) and "
+"biotechnology."
 msgstr ""
 
 #: projects.inc:351
@@ -642,7 +856,10 @@ msgid "Physics, biochemistry, and others"
 msgstr ""
 
 #: projects.inc:358
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
+msgid ""
+"The objective of CAS at home is to encourage and assist scientists in China to "
+"adopt the technologies of volunteer computing and volunteer thinking for "
+"their research."
 msgstr ""
 
 #: projects.inc:365
@@ -650,11 +867,12 @@ msgid "Mathematics, physics, evolution"
 msgstr ""
 
 #: projects.inc:366
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
+msgid ""
+"Yoyo at home is an adapter between BOINC and several existing volunteer "
+"computing projects: ECM, Muon, Evolution at home, and distributed.net"
 msgstr ""
 
-#: projects.inc:371
-#: projects.inc:527
+#: projects.inc:371 projects.inc:527
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 msgstr ""
 
@@ -663,7 +881,11 @@ msgid "European research projects"
 msgstr ""
 
 #: projects.inc:373
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
+msgid ""
+"The EDGeS at Home Beta project integrates volunteer computing into the service "
+"grid network of Europe by allowing service grids to send workunits to be "
+"processed by the volunteers of this project. The scientific projects covered "
+"by the project include math, physics, biology, etc."
 msgstr ""
 
 #: projects.inc:379
@@ -687,7 +909,11 @@ msgid "Medical, environmental and other humanitarian research"
 msgstr ""
 
 #: projects.inc:389
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
+msgid ""
+"To further critical non-profit research on some of humanity's most pressing "
+"problems by creating the world's largest volunteer computing grid.  Research "
+"includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"clean water and many more."
 msgstr ""
 
 #: projects.inc:395
@@ -706,21 +932,18 @@ msgstr ""
 msgid "Simulation of quantum computing; Goldbach's conjecture."
 msgstr ""
 
-#: projects.inc:450
-#: projects.inc:458
+#: projects.inc:450 projects.inc:458
 msgid "Cryptography"
 msgstr ""
 
 #: projects.inc:459
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
+msgid ""
+"Attempt to decode 3 original Enigma messages. The signals were intercepted "
+"in the North Atlantic in 1942 and are believed to be unbroken."
 msgstr ""
 
-#: projects.inc:465
-#: projects.inc:504
-#: projects.inc:512
-#: projects.inc:520
-#: projects.inc:528
-#: projects.inc:568
+#: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
+#: projects.inc:528 projects.inc:568
 msgid "Mathematics"
 msgstr ""
 
@@ -737,11 +960,19 @@ msgid "Factorization of large integers"
 msgstr ""
 
 #: projects.inc:473
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
+msgid ""
+"NFS at Home is a research project that uses Internet-connected computers to do "
+"the lattice sieving step in the Number Field Sieve factorization of large "
+"integers. As a young school student, you gained your first experience at "
+"breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
+"NFS at Home is a continuation of that experience, only with integers that are "
+"hundreds of digits long."
 msgstr ""
 
 #: projects.inc:479
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
+msgid ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
 msgstr ""
 
 #: projects.inc:480
@@ -749,7 +980,11 @@ msgid "Software testing"
 msgstr ""
 
 #: projects.inc:481
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
+msgid ""
+"The aim of this project is to provide a powerful distributed computing "
+"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
+"well as others Lithuanian academic institutions.  Current applications "
+"involve the study of Monte-Carlo based software testing."
 msgstr ""
 
 #: projects.inc:503
@@ -757,11 +992,20 @@ msgid "Mathematical Institute of Leiden University / Kennislink"
 msgstr ""
 
 #: projects.inc:505
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
+msgid ""
+"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
+"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
+"product of the distinct prime factors of n. The ABC conjecture says that "
+"there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for "
+"any real h > 1. The ABC conjecture is currently one of the greatest open "
+"problems in mathematics. If it is proven to be true, a lot of other open "
+"problems can be answered directly from it."
 msgstr ""
 
 #: projects.inc:513
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
+msgid ""
+"Primegrid has multiple projects searching for different forms of very large "
+"prime numbers, including searching for the largest known prime number."
 msgstr ""
 
 #: projects.inc:519
@@ -769,11 +1013,15 @@ msgid "Hochschule RheinMain University of Applied Sciences"
 msgstr ""
 
 #: projects.inc:521
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
+msgid ""
+"Search for counterexamples to two conjectures related to the identification "
+"of prime numbers"
 msgstr ""
 
 #: projects.inc:529
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
+msgid ""
+"Find all the generalized binary number systems (in which bases are matrices "
+"and digits are vectors) up to dimension 11."
 msgstr ""
 
 #: ../html/inc/news.inc:40
@@ -789,40 +1037,58 @@ msgstr ""
 #, fuzzy
 #~ msgid "Astronomy, Physics, and Chemistry"
 #~ msgstr "Astronomi/Fysikk/Kjemi"
+
 #~ msgid "private"
 #~ msgstr "privat"
+
 #~ msgid "POEM at HOME"
 #~ msgstr "POEM at HOME"
+
 #~ msgid "Docking at Home"
 #~ msgstr "Docking at Home"
+
 #~ msgid "GPUGrid.net"
 #~ msgstr "GPUGrid.net"
+
 #~ msgid "Superlink at Technion"
 #~ msgstr "Superlink at Technion"
+
 #~ msgid "Malariacontrol.net"
 #~ msgstr "Malariacontrol.net"
+
 #~ msgid "Rosetta at home"
 #~ msgstr "Rosetta at home"
+
 #~ msgid "SIMAP"
 #~ msgstr "SIMAP"
+
 #~ msgid "University of Houston"
 #~ msgstr "University of Houston"
+
 #~ msgid "Climateprediction.net"
 #~ msgstr "Climateprediction.net"
+
 #~ msgid "Astronomy/Physics/Chemistry"
 #~ msgstr "Astronomi/Fysikk/Kjemi"
+
 #~ msgid "Orbit at home"
 #~ msgstr "Orbit at home"
+
 #~ msgid "Cosmology at Home"
 #~ msgstr "Cosmology at Home"
+
 #~ msgid "Milkyway at home"
 #~ msgstr "Milkyway at home"
+
 #~ msgid "uFluids at home"
 #~ msgstr "uFluids at home"
+
 #~ msgid "Einstein at home"
 #~ msgstr "Einstein at home"
+
 #~ msgid "LHC at home"
 #~ msgstr "LHC at home"
+
 #~ msgid "SETI at home"
 #~ msgstr "SETI at home"
 
@@ -833,38 +1099,54 @@ msgstr ""
 #, fuzzy
 #~ msgid "ABC at home"
 #~ msgstr "LHC at home"
+
 #~ msgid "Other:"
 #~ msgstr "Andre:"
+
 #~ msgid "Yes - I have been running BOINC on my computer for..."
 #~ msgstr "Ja - Jeg har kjørt BOINC på datamaskinen min i..."
+
 #~ msgid "less than a week"
 #~ msgstr "mindre enn en uke"
+
 #~ msgid "less than a month"
 #~ msgstr "mindre enn en måned"
+
 #~ msgid "less than a year"
 #~ msgstr "mindre enn et år"
+
 #~ msgid "more than a year"
 #~ msgstr "mer enn et år"
+
 #~ msgid "No - I used to run BOINC, but..."
 #~ msgstr "Nei - Jeg pleide å kjøre BOINC, men..."
+
 #~ msgid "I lost interest"
 #~ msgstr "Jeg mistet interessen"
+
 #~ msgid "it was too complicated"
 #~ msgstr "det var for komplisert"
+
 #~ msgid "I stopped it and forgot to start again"
 #~ msgstr "jeg stoppet og glemte å starte igjen"
+
 #~ msgid "it caused problems on my computer"
 #~ msgstr "det skapte problemer på datamaskinen min"
+
 #~ msgid "it used too much electricity"
 #~ msgstr "det brukte for mye strøm"
+
 #~ msgid "I switched to a non-BOINC computing project"
 #~ msgstr "jeg byttet til et ikke-BOINC databehandlings prosjekt"
+
 #~ msgid "No - I tried running BOINC, but..."
 #~ msgstr "Nei - jeg prøvde å kjøre BOINC, men"
+
 #~ msgid "the software didn't install correctly"
 #~ msgstr "programvaren ble ikke installert korrekt"
+
 #~ msgid "I couldn't figure out how to use the software"
 #~ msgstr "jeg klarte ikke å finne ut hvordan jeg skulle bruke programvaren"
+
 #~ msgid "I had network communication problems"
 #~ msgstr "jeg hadde nettverk kommunikasjons problemer"
-
diff --git a/locale/nl/BOINC-Client.mo b/locale/nl/BOINC-Client.mo
index d129320..3738d6b 100644
Binary files a/locale/nl/BOINC-Client.mo and b/locale/nl/BOINC-Client.mo differ
diff --git a/locale/nl/BOINC-Client.po b/locale/nl/BOINC-Client.po
old mode 100755
new mode 100644
index cfcdeb0..9609e68
--- a/locale/nl/BOINC-Client.po
+++ b/locale/nl/BOINC-Client.po
@@ -1,23 +1,23 @@
 # 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: BOINC 7.4\n"
+"Project-Id-Version: boinc\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-10-15 22:25-0700\n"
-"PO-Revision-Date: 2015-02-12 00:05-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: nl\n"
+"PO-Revision-Date: 2015-02-08 23:34+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\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"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.1.6\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: acct_mgr.cpp:450
-#: acct_mgr.cpp:459
+#: acct_mgr.cpp:450 acct_mgr.cpp:459
 msgid "Message from account manager"
 msgstr "Bericht van de account manager"
 
@@ -26,7 +26,9 @@ msgid "Message from server"
 msgstr "Bericht van de server"
 
 #: client_state.cpp:258
-msgid "Some tasks need more memory than allowed by your preferences.  Please check the preferences."
+msgid ""
+"Some tasks need more memory than allowed by your preferences.  Please check "
+"the preferences."
 msgstr "Sommige taken hebben meer geheugen nodig dan toegestaan door uw voorkeuren.  Controleer alstublieft de voorkeuren."
 
 #: client_state.cpp:520
@@ -39,11 +41,12 @@ msgstr "De HTTP_PROXY omgevings-variabele verwijst niet naar een HTTP proxy"
 
 #: cs_scheduler.cpp:613
 #, c-format
-msgid "You used the wrong URL for this project.  When convenient, remove this project, then add %s"
+msgid ""
+"You used the wrong URL for this project.  When convenient, remove this "
+"project, then add %s"
 msgstr "Het door u gebruikte URL is voor dit project niet geldig.  U wordt geadviseerd dit project te verwijderen en vervolgens %s toe te voegen"
 
-#: cs_statefile.cpp:828
-#: ../sched/sched_types.cpp:259
+#: cs_statefile.cpp:828 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
 msgstr "Syntaxis fout in app_info.xml"
 
@@ -55,18 +58,15 @@ msgstr "Volgend bestand vermeld in app_info.xml bestaat niet: "
 msgid "A new version of BOINC is available."
 msgstr "Er is een nieuwe BOINC versie beschikbaar."
 
-#: current_version.cpp:94
-#: current_version.cpp:102
+#: current_version.cpp:94 current_version.cpp:102
 msgid "Download"
 msgstr "Download"
 
-#: log_flags.cpp:269
-#: log_flags.cpp:449
+#: log_flags.cpp:269 log_flags.cpp:449
 msgid "Unexpected text in cc_config.xml"
 msgstr "Onverwachte tekst in cc_config.xml"
 
-#: log_flags.cpp:423
-#: log_flags.cpp:475
+#: log_flags.cpp:423 log_flags.cpp:475
 msgid "Unrecognized tag in cc_config.xml"
 msgstr "Niet herkende instructie in cc_config.xml"
 
@@ -91,7 +91,9 @@ msgid "Invalid code signing key.  To fix, remove and add this project."
 msgstr "Ongeldige code signing-key.  Oplossing: verwijder het project en voeg het vervolgens opnieuw toe."
 
 #: ../sched/handle_request.cpp:859
-msgid "The project has changed its security key.  Please remove and add this project."
+msgid ""
+"The project has changed its security key.  Please remove and add this "
+"project."
 msgstr "De beveiligingssleutel van het project is gewijzigd.  Verwijder dit project en voeg het vervolgens opnieuw toe."
 
 #: ../sched/handle_request.cpp:943
@@ -103,7 +105,8 @@ msgid "This project doesn't support CPU type"
 msgstr "Dit project ondersteunt deze CPU niet"
 
 #: ../sched/handle_request.cpp:993
-msgid "Your BOINC client software is too old.  Please install the current version."
+msgid ""
+"Your BOINC client software is too old.  Please install the current version."
 msgstr "Nieuwere versie van BOINC vereist.  Installeer a.u.b de meest recente."
 
 #: ../sched/handle_request.cpp:1259
@@ -111,18 +114,21 @@ msgid "This project doesn't support computers of type"
 msgstr "Dit project ondersteund geen computers van het type"
 
 #: ../sched/sched_send.cpp:1092
-msgid "Upgrade to the latest driver to process tasks using your computer's GPU"
+msgid ""
+"Upgrade to the latest driver to process tasks using your computer's GPU"
 msgstr "Om taken te kunnen verwerken met de aanwezige GPU, is het nodig om het stuurprogramma bij te werken"
 
 #: ../sched/sched_send.cpp:1099
-msgid "Upgrade to the latest driver to use all of this project's GPU applications"
+msgid ""
+"Upgrade to the latest driver to use all of this project's GPU applications"
 msgstr "Om alle GPU-afhankelijke functies van dit project te benutten, is het nodig om het stuurprogramma bij te werken"
 
 #: ../sched/sched_send.cpp:1118
-msgid "A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to the current version"
+msgid ""
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to"
+" the current version"
 msgstr "Nieuwere versie van BOINC vereist voor de aanwezige NVIDIA GPU; instaleer a.u.b de meest recente"
 
-# 94%
 #: ../sched/sched_send.cpp:1146
 #, c-format
 msgid "An %s GPU is required to run tasks for this project"
@@ -142,7 +148,8 @@ msgstr "Nieuwere versie van BOINC vereist; installeer a.u.b de meest recente"
 
 #: ../sched/sched_send.cpp:1305
 #, c-format
-msgid "Tasks for %s are available, but your preferences are set to not accept them"
+msgid ""
+"Tasks for %s are available, but your preferences are set to not accept them"
 msgstr "Er zijn taken voor %s beschikbaar, maar deze zijn bij de instellingen uitgesloten"
 
 #: ../sched/sched_types.cpp:254
@@ -152,48 +159,3 @@ msgstr "Onbekende applicatie naam in app_info.xml"
 #: ../sched/sched_version.cpp:214
 msgid "Your app_info.xml file doesn't have a usable version of"
 msgstr "Het app_info.xml bestand vermeldt geen bruikbare versie van"
-
-#~ msgid "Download it."
-#~ msgstr "Download deze."
-#~ msgid "An NVIDIA or ATI GPU is required to run tasks for this project"
-#~ msgstr "Dit project vereist een NVIDIA of ATI GPU"
-#~ msgid "An NVIDIA GPU is required to run tasks for this project"
-#~ msgstr "Dit project vereist een NVIDIA GPU"
-#~ msgid "An ATI GPU is required to run tasks for this project"
-#~ msgstr "Dit project vereist een ATI GPU"
-#~ msgid ""
-#~ "Tasks for NVIDIA GPU are available, but your preferences are set to not "
-#~ "accept them"
-#~ msgstr ""
-#~ "Er zijn taken beschikbaar voor een NVIDIA GPU, maar worden geblokkeerd door "
-#~ "uw voorkeursinstellingen"
-#~ msgid ""
-#~ "Tasks for ATI GPU are available, but your preferences are set to not accept "
-#~ "them"
-#~ msgstr ""
-#~ "Er zijn taken beschikbaar voor een ATI GPU, maar worden geblokkeerd door uw "
-#~ "voorkeursinstellingen"
-#~ msgid ""
-#~ "Tasks for CPU are available, but your preferences are set to not accept them"
-#~ msgstr ""
-#~ "Er zijn taken beschikbaar voor de CPU, maar worden geblokkeerd door uw "
-#~ "voorkeursinstellingen"
-#~ msgid "error"
-#~ msgstr "fout"
-#~ msgid "Can't resolve hostname in remote_hosts.cfg"
-#~ msgstr "Identificatie van hostcomputer in remote_hosts.cfg is mislukt"
-#~ msgid "is not available for"
-#~ msgstr "is niet beschikbaar voor"
-#~ msgid "Notice from BOINC"
-#~ msgstr "Mededeling van BOINC"
-#~ msgid "Message from"
-#~ msgstr "Bericht van"
-#~ msgid ""
-#~ "You may have an outdated code signing key.  Try attaching and reattaching "
-#~ "this project."
-#~ msgstr ""
-#~ "U heeft misschien een verlopen code signing-key.  Verwijder het project "
-#~ "en voeg het opnieuw toe om dit op te lossen."
-#~ msgid "XML syntax error in"
-#~ msgstr "XML syntaxis fout in"
-
diff --git a/locale/nl/BOINC-Manager.mo b/locale/nl/BOINC-Manager.mo
index 05362aa..d0a0c18 100644
Binary files a/locale/nl/BOINC-Manager.mo and b/locale/nl/BOINC-Manager.mo differ
diff --git a/locale/nl/BOINC-Manager.po b/locale/nl/BOINC-Manager.po
index 55263ff..d5a9e66 100644
--- a/locale/nl/BOINC-Manager.po
+++ b/locale/nl/BOINC-Manager.po
@@ -1,64 +1,52 @@
 # 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: BOINC 7.4\n"
+"Project-Id-Version: boinc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-15 14:15-0500\n"
-"PO-Revision-Date: 2015-02-12 00:05-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: nl\n"
+"POT-Creation-Date: 2014-02-02 00:00-0800\n"
+"PO-Revision-Date: 2015-02-08 23:39+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\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"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc_7.4\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1419169470.0\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-SearchPath-0: clientgui\n"
-"X-Poedit-SearchPath-1: clientgui/msw\n"
-"X-Poedit-SearchPath-2: clientgui/gtk\n"
-"X-Poedit-SearchPath-3: clientgui/mac\n"
-
-# 81%
-#: clientgui/AccountInfoPage.cpp:387
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: AccountInfoPage.cpp:387
 #, c-format
 msgid "Identify your account at %s"
 msgstr "Je account gegevens bij %s"
 
-#: clientgui/AccountInfoPage.cpp:393
+#: AccountInfoPage.cpp:393
 msgid ""
 "Please enter your account information\n"
 "(to create an account, visit the project's web site)"
-msgstr ""
-"Vul a.u.b. je account gegevens in\n"
-"(een account aanmaken kan op de project website)"
+msgstr "Vul a.u.b. je account gegevens in\n(een account aanmaken kan op de project website)"
 
-#: clientgui/AccountInfoPage.cpp:397
+#: AccountInfoPage.cpp:397
 msgid ""
 "This project is not currently accepting new accounts.\n"
 "You can add it only if you already have an account."
-msgstr ""
-"Dit project is momenteel gesloten voor nieuwe accounts.\n"
-"Toevoegen is alleen mogelijk met een bestaand account."
+msgstr "Dit project is momenteel gesloten voor nieuwe accounts.\nToevoegen is alleen mogelijk met een bestaand account."
 
-#: clientgui/AccountInfoPage.cpp:401
+#: AccountInfoPage.cpp:401
 msgid "Are you already running this project?"
 msgstr "Heb je al een account bij dit project?"
 
-#: clientgui/AccountInfoPage.cpp:405
+#: AccountInfoPage.cpp:405
 msgid "&No, new user"
 msgstr "&Nee, nieuwe gebruiker"
 
-#: clientgui/AccountInfoPage.cpp:408
+#: AccountInfoPage.cpp:408
 msgid "&Yes, existing user"
 msgstr "&Ja, geregistreerde deelnemer"
 
-#: clientgui/AccountInfoPage.cpp:413
+#: AccountInfoPage.cpp:413
 msgid ""
 "We were not able to set up your account information\n"
 "automatically.\n"
@@ -66,502 +54,469 @@ msgid ""
 "Please click on the 'Find login information' link\n"
 "below to find out what to put in the email address and\n"
 "password fields."
-msgstr ""
-"Het was helaas niet mogelijk om je account gegevens\n"
-"automatisch in te stellen.\n"
-"\n"
-"Klik a.u.b. op de 'zoek inlog informatie' link\n"
-"hieronder om te bepalen wat er moet worden ingevuld\n"
-"in het email- en wachtwoord vak."
+msgstr "Het was helaas niet mogelijk om je account gegevens\nautomatisch in te stellen.\n\nKlik a.u.b. op de 'zoek inlog informatie' link\nhieronder om te bepalen wat er moet worden ingevuld\nin het email- en wachtwoord vak."
 
-#: clientgui/AccountInfoPage.cpp:416
+#: AccountInfoPage.cpp:416
 msgid "Find login information"
 msgstr "Zoek inlog informatie"
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:649
+#: AccountInfoPage.cpp:436 AccountInfoPage.cpp:641
 msgid "&Password:"
 msgstr "&Wachtwoord:"
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:673
+#: AccountInfoPage.cpp:443 AccountInfoPage.cpp:665
 msgid "Choose a &password:"
 msgstr "Kie&s een wachtwoord:"
 
-#: clientgui/AccountInfoPage.cpp:446
+#: AccountInfoPage.cpp:446
 msgid "C&onfirm password:"
 msgstr "Bevestig het wachtw&oord:"
 
-#: clientgui/AccountInfoPage.cpp:453
+#: AccountInfoPage.cpp:453
 #, c-format
 msgid "Are you already running %s?"
 msgstr "Heb je al een account bij %s?"
 
-#: clientgui/AccountInfoPage.cpp:482
+#: AccountInfoPage.cpp:482
 msgid "&Username:"
 msgstr "Gebr&uikersnaam:"
 
-#: clientgui/AccountInfoPage.cpp:511
-msgid "&Email address or LDAP ID:"
-msgstr "&E-mail adres of LDAP ID:"
-
-#: clientgui/AccountInfoPage.cpp:515
+#: AccountInfoPage.cpp:508
 msgid "&Email address:"
 msgstr "&E-mail adres:"
 
-#: clientgui/AccountInfoPage.cpp:523
+#: AccountInfoPage.cpp:515
 #, c-format
 msgid "minimum length %d"
 msgstr "minimale lengte %d"
 
-#: clientgui/AccountInfoPage.cpp:530
+#: AccountInfoPage.cpp:522
 msgid "Forgot your password?"
 msgstr "Wachtwoord vergeten?"
 
-#: clientgui/AccountInfoPage.cpp:537
+#: AccountInfoPage.cpp:529
 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 ""
-"Indien je je nog niet hebt geregistreerd bij deze accountmanager,\n"
-"doe dit dan voor je verder gaat.  Klik op de link hieronder\n"
-"om dit nu te doen of een vergeten wachtwoord op te halen."
+msgstr "Indien je je nog niet hebt geregistreerd bij deze accountmanager,\ndoe dit dan voor je verder gaat.  Klik op de link hieronder\nom dit nu te doen of een vergeten wachtwoord op te halen."
 
-#: clientgui/AccountInfoPage.cpp:540
+#: AccountInfoPage.cpp:532
 msgid "Account manager web site"
 msgstr "Accountmanager website"
 
-#: clientgui/AccountInfoPage.cpp:582
+#: AccountInfoPage.cpp:574 WelcomePage.cpp:348
 msgid "Add project"
 msgstr "Project toevoegen"
 
-#: clientgui/AccountInfoPage.cpp:584
+#: AccountInfoPage.cpp:576
 msgid "Update account manager"
 msgstr "Accountmanager bijwerken"
 
-#: clientgui/AccountInfoPage.cpp:586
+#: AccountInfoPage.cpp:578 WelcomePage.cpp:307 WelcomePage.cpp:321
 msgid "Use account manager"
 msgstr "Account manager gebruiken"
 
-#: clientgui/AccountInfoPage.cpp:593
+#: AccountInfoPage.cpp:585
 msgid "Please enter a user name."
 msgstr "Vul a.u.b. een gebruikersnaam in."
 
-#: clientgui/AccountInfoPage.cpp:595
+#: AccountInfoPage.cpp:587
 msgid "Please enter an email address."
 msgstr "Vul a.u.b. een email adres in."
 
-#: clientgui/AccountInfoPage.cpp:605
+#: AccountInfoPage.cpp:597
 #, c-format
 msgid "Please enter a password of at least %d characters."
 msgstr "Vul a.u.b. een wachtwoord in van tenminste %d karakters."
 
-#: clientgui/AccountInfoPage.cpp:615
-msgid "The password and confirmation password do not match. Please type them again."
+#: AccountInfoPage.cpp:607
+msgid ""
+"The password and confirmation password do not match. Please type them again."
 msgstr "Het wachtwoord en het bevestigde wachtwoord komen niet overeen. Vul ze a.u.b. opnieuw in."
 
-#: clientgui/AccountManagerInfoPage.cpp:272
+#: AccountManagerInfoPage.cpp:272
 msgid "Choose an account manager"
 msgstr "Kies een accountmanager"
 
-#: clientgui/AccountManagerInfoPage.cpp:275
+#: AccountManagerInfoPage.cpp:275
 msgid ""
 "To choose an account manager, click its name or \n"
 "type its URL below."
-msgstr ""
-"Klik op de naam om een accountmanager te kiezen of \n"
-"vul hieronder het URL in."
+msgstr "Klik op de naam om een accountmanager te kiezen of \nvul hieronder het URL in."
 
-#: clientgui/AccountManagerInfoPage.cpp:279
+#: AccountManagerInfoPage.cpp:279
 msgid "Account manager details:"
 msgstr "Accountmanager details:"
 
-#: clientgui/AccountManagerInfoPage.cpp:283
+#: AccountManagerInfoPage.cpp:283
 msgid "Account manager &URL:"
 msgstr "Accountmanager &URL:"
 
-#: clientgui/AccountManagerInfoPage.cpp:287
+#: AccountManagerInfoPage.cpp:287
 msgid "Open web page"
 msgstr "Open webpagina"
 
-#: clientgui/AccountManagerInfoPage.cpp:290
+#: AccountManagerInfoPage.cpp:290
 msgid "Visit this account manager's web site"
 msgstr "Bezoek de website van deze accountmanager"
 
-#: clientgui/AccountManagerProcessingPage.cpp:186
-#: clientgui/AccountManagerPropertiesPage.cpp:192
+#: AccountManagerProcessingPage.cpp:187 AccountManagerPropertiesPage.cpp:193
 #, c-format
 msgid "Communicating with %s."
 msgstr "Aan het communiceren met %s."
 
-#: clientgui/AccountManagerProcessingPage.cpp:193
-#: clientgui/AccountManagerPropertiesPage.cpp:199
+#: AccountManagerProcessingPage.cpp:194 AccountManagerPropertiesPage.cpp:200
 msgid "Communicating with server."
 msgstr "Aan het communiceren met de server."
 
-#: clientgui/AccountManagerProcessingPage.cpp:198
-#: clientgui/AccountManagerPropertiesPage.cpp:204
+#: AccountManagerProcessingPage.cpp:199 AccountManagerPropertiesPage.cpp:205
 msgid "Please wait..."
 msgstr "Even geduld..."
 
-#: clientgui/AccountManagerProcessingPage.cpp:325
+#: AccountManagerProcessingPage.cpp:326
 msgid "An internal server error has occurred.\n"
 msgstr "Er is een server fout opgetreden.\n"
 
-#: clientgui/AdvancedFrame.cpp:96
+#: AdvancedFrame.cpp:95
 msgid "Connected"
 msgstr "Verbonden"
 
-#: clientgui/AdvancedFrame.cpp:104
+#: AdvancedFrame.cpp:103
 msgid "Disconnected"
 msgstr "Verbinding verbroken"
 
-#: clientgui/AdvancedFrame.cpp:318
+#: AdvancedFrame.cpp:322 sg_BoincSimpleFrame.cpp:119
 #, c-format
 msgid "Close the %s window"
 msgstr "Sluit het %s venster"
 
-#: clientgui/AdvancedFrame.cpp:321
+#: AdvancedFrame.cpp:325 sg_BoincSimpleFrame.cpp:122
 msgid "&Close Window"
 msgstr "&Sluit Venster"
 
-#: clientgui/AdvancedFrame.cpp:332
-#: clientgui/AdvancedFrame.cpp:339
-#: clientgui/AdvancedFrame.cpp:346
+#: AdvancedFrame.cpp:336 AdvancedFrame.cpp:343 AdvancedFrame.cpp:350
 #, c-format
 msgid "Exit %s"
 msgstr "%s afsluiten"
 
-#: clientgui/AdvancedFrame.cpp:359
-msgid "Preferences..."
-msgstr "Voorkeuren…"
-
-#: clientgui/AdvancedFrame.cpp:368
+#: AdvancedFrame.cpp:371
 msgid "&Notices\tCtrl+Shift+N"
 msgstr "&Berichten\tCtrl+Shift+N"
 
-#: clientgui/AdvancedFrame.cpp:369
+#: AdvancedFrame.cpp:372
 msgid "Display notices"
 msgstr "Berichten weergeven"
 
-#: clientgui/AdvancedFrame.cpp:374
+#: AdvancedFrame.cpp:377
 msgid "&Projects\tCtrl+Shift+P"
 msgstr "&Projecten\tCtrl+Shift+P"
 
-#: clientgui/AdvancedFrame.cpp:375
+#: AdvancedFrame.cpp:378
 msgid "Display projects"
 msgstr "Projecten weergeven"
 
-#: clientgui/AdvancedFrame.cpp:380
+#: AdvancedFrame.cpp:383
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr "&Werk\tCtrl+Shift+T"
 
-#: clientgui/AdvancedFrame.cpp:381
+#: AdvancedFrame.cpp:384
 msgid "Display tasks"
 msgstr "Werk weergeven"
 
-#: clientgui/AdvancedFrame.cpp:386
+#: AdvancedFrame.cpp:389
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr "Over&dracht\tCtrl+Shift+X"
 
-#: clientgui/AdvancedFrame.cpp:387
+#: AdvancedFrame.cpp:390
 msgid "Display transfers"
 msgstr "Overdracht weergeven"
 
-#: clientgui/AdvancedFrame.cpp:392
+#: AdvancedFrame.cpp:395
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "&Statistieken\tCtrl+Shift+S"
 
-#: clientgui/AdvancedFrame.cpp:393
+#: AdvancedFrame.cpp:396
 msgid "Display statistics"
 msgstr "Statistieken weergeven"
 
-#: clientgui/AdvancedFrame.cpp:398
+#: AdvancedFrame.cpp:401
 msgid "&Disk usage\tCtrl+Shift+D"
 msgstr "Schijf&gebruik\tCtrl+Shift+D"
 
-#: clientgui/AdvancedFrame.cpp:399
+#: AdvancedFrame.cpp:402
 msgid "Display disk usage"
 msgstr "Schijfgebruik weergeven"
 
-#: clientgui/AdvancedFrame.cpp:406
+#: AdvancedFrame.cpp:409
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr "Een&voudige weergave...\tCtrl+Shift+V"
 
-#: clientgui/AdvancedFrame.cpp:407
+#: AdvancedFrame.cpp:410
 msgid "Display the simple graphical interface."
 msgstr "Overschakelen naar de eenvoudige BOINC weergave."
 
-#: clientgui/AdvancedFrame.cpp:421
+#: AdvancedFrame.cpp:424
 msgid "&Add project or account manager..."
 msgstr "&Project of account manager toevoegen..."
 
-#: clientgui/AdvancedFrame.cpp:422
+#: AdvancedFrame.cpp:425 sg_ProjectPanel.cpp:76
 msgid "Volunteer for any or all of 30+ projects in many areas of science"
 msgstr "Doe mee met één of meerdere verschillende wetenschappelijke projecten"
 
-#: clientgui/AdvancedFrame.cpp:426
+#: AdvancedFrame.cpp:429
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "%s Bijwerken"
 
-#: clientgui/AdvancedFrame.cpp:430
+#: AdvancedFrame.cpp:433
 #, c-format
 msgid "Get current settings from %s"
 msgstr "Haal de huidige instellingen op van %s"
 
-#: clientgui/AdvancedFrame.cpp:440
+#: AdvancedFrame.cpp:443
 msgid "&Add project..."
 msgstr "Project toevoegen..."
 
-#: clientgui/AdvancedFrame.cpp:441
+#: AdvancedFrame.cpp:444
 msgid "Add a project"
 msgstr "Een project toevoegen"
 
-#: clientgui/AdvancedFrame.cpp:444
+#: AdvancedFrame.cpp:447
 #, c-format
 msgid "S&top using %s..."
 msgstr "&Stop gebruik van %s..."
 
-#: clientgui/AdvancedFrame.cpp:450
+#: AdvancedFrame.cpp:453
 msgid "Remove this computer from account manager control."
 msgstr "Stopt het beheer van deze computer m.b.v. een accountmanager."
 
-#: clientgui/AdvancedFrame.cpp:455
+#: AdvancedFrame.cpp:458 sg_BoincSimpleFrame.cpp:178
 msgid "&Options..."
 msgstr "&Opties..."
 
-#: clientgui/AdvancedFrame.cpp:456
+#: AdvancedFrame.cpp:459 sg_BoincSimpleFrame.cpp:179
 msgid "Configure display options and proxy settings"
 msgstr "Configureer weergave opties en proxy instellingen"
 
-#: clientgui/AdvancedFrame.cpp:460
+#: AdvancedFrame.cpp:463 sg_BoincSimpleFrame.cpp:172
 msgid "Computing &preferences..."
 msgstr "Verwerkings voorkeuren..."
 
-#: clientgui/AdvancedFrame.cpp:461
+#: AdvancedFrame.cpp:464 sg_BoincSimpleFrame.cpp:173
 msgid "Configure computing preferences"
 msgstr "Configureer de verwerkings voorkeuren"
 
-#: clientgui/AdvancedFrame.cpp:469
+#: AdvancedFrame.cpp:472
 msgid "&Run always"
 msgstr "We&rk altijd actief"
 
-#: clientgui/AdvancedFrame.cpp:470
+#: AdvancedFrame.cpp:473
 msgid "Allow work regardless of preferences"
 msgstr "Werk actief ongeacht de persoonlijke voorkeuren"
 
-#: clientgui/AdvancedFrame.cpp:474
+#: AdvancedFrame.cpp:477
 msgid "Run based on &preferences"
 msgstr "Werk actief o&p basis van voorkeuren"
 
-#: clientgui/AdvancedFrame.cpp:475
+#: AdvancedFrame.cpp:478
 msgid "Allow work according to preferences"
 msgstr "Werk actief op basis van de persoonlijke voorkeuren"
 
-#: clientgui/AdvancedFrame.cpp:479
+#: AdvancedFrame.cpp:482
 msgid "&Suspend"
 msgstr "Werk onderbreken"
 
-#: clientgui/AdvancedFrame.cpp:480
+#: AdvancedFrame.cpp:483
 msgid "Stop work regardless of preferences"
 msgstr "Stop al het werk ongeacht de persoonlijke voorkeuren"
 
-#: clientgui/AdvancedFrame.cpp:505
+#: AdvancedFrame.cpp:508
 msgid "Use GPU always"
 msgstr "GPU altijd gebruiken"
 
-#: clientgui/AdvancedFrame.cpp:506
+#: AdvancedFrame.cpp:509
 msgid "Allow GPU work regardless of preferences"
 msgstr "GPU actief ongeacht de persoonlijke voorkeuren"
 
-#: clientgui/AdvancedFrame.cpp:510
+#: AdvancedFrame.cpp:513
 msgid "Use GPU based on preferences"
 msgstr "GPU actief o&p basis van voorkeuren"
 
-#: clientgui/AdvancedFrame.cpp:511
+#: AdvancedFrame.cpp:514
 msgid "Allow GPU work according to preferences"
 msgstr "GPU actief op basis van de persoonlijke voorkeuren"
 
-#: clientgui/AdvancedFrame.cpp:515
+#: AdvancedFrame.cpp:518
 msgid "Suspend GPU"
 msgstr "Onderbreek GPU"
 
-#: clientgui/AdvancedFrame.cpp:516
+#: AdvancedFrame.cpp:519
 msgid "Stop GPU work regardless of preferences"
 msgstr "GPU inactief ongeacht de persoonlijke voorkeuren"
 
-#: clientgui/AdvancedFrame.cpp:540
+#: AdvancedFrame.cpp:543
 msgid "Network activity always available"
 msgstr "&Netwerkverbinding altijd beschikbaar"
 
-#: clientgui/AdvancedFrame.cpp:541
+#: AdvancedFrame.cpp:544
 msgid "Allow network activity regardless of preferences"
 msgstr "Netwerkverbinding actief ongeacht de persoonlijke voorkeuren"
 
-#: clientgui/AdvancedFrame.cpp:545
+#: AdvancedFrame.cpp:548
 msgid "Network activity based on preferences"
 msgstr "Netwerkverbinding &op basis van voorkeuren"
 
-#: clientgui/AdvancedFrame.cpp:546
+#: AdvancedFrame.cpp:549
 msgid "Allow network activity according to preferences"
 msgstr "Netwerkverbinding actief op basis van de persoonlijke voorkeuren"
 
-#: clientgui/AdvancedFrame.cpp:550
+#: AdvancedFrame.cpp:553
 msgid "Network activity suspended"
 msgstr "Netwerkverbinding opgeschort"
 
-#: clientgui/AdvancedFrame.cpp:551
+#: AdvancedFrame.cpp:554
 msgid "Stop BOINC network activity"
 msgstr "Stop de netwerk activiteiten van BOINC"
 
-#: clientgui/AdvancedFrame.cpp:561
+#: AdvancedFrame.cpp:564
 #, c-format
 msgid "Connect to another computer running %s"
 msgstr "Maak een verbinding met een andere %s computer"
 
-#: clientgui/AdvancedFrame.cpp:566
+#: AdvancedFrame.cpp:569
 msgid "Select computer..."
 msgstr "Selecteer computer..."
 
-#: clientgui/AdvancedFrame.cpp:571
+#: AdvancedFrame.cpp:574
 msgid "Shut down connected client..."
 msgstr "Huidige client afsluiten..."
 
-#: clientgui/AdvancedFrame.cpp:572
+#: AdvancedFrame.cpp:575
 msgid "Shut down the currently connected client"
 msgstr "Sluit de huidig verbonden client af"
 
-#: clientgui/AdvancedFrame.cpp:576
+#: AdvancedFrame.cpp:579
 msgid "Run CPU &benchmarks"
 msgstr "CPU &benchmark starten"
 
-#: clientgui/AdvancedFrame.cpp:577
+#: AdvancedFrame.cpp:580
 msgid "Runs BOINC CPU benchmarks"
 msgstr "Voert de BOINC CPU benchmark uit"
 
-#: clientgui/AdvancedFrame.cpp:581
+#: AdvancedFrame.cpp:584
 msgid "Do network communication"
 msgstr "Opnieuw verbinden"
 
-#: clientgui/AdvancedFrame.cpp:582
+#: AdvancedFrame.cpp:585
 msgid "Do all pending network communication"
 msgstr "Werk de projecten bij, rapporteer gereed werk, etc"
 
-# 94%
-#: clientgui/AdvancedFrame.cpp:586
+#: AdvancedFrame.cpp:589
 msgid "Read config files"
 msgstr "Configuratie inlezen"
 
-#: clientgui/AdvancedFrame.cpp:587
-msgid "Read configuration info from cc_config.xml and any app_config.xml files"
+#: AdvancedFrame.cpp:590
+msgid ""
+"Read configuration info from cc_config.xml and any app_config.xml files"
 msgstr "Configuratie inlezen vanuit de cc_config.xml en app_config.xml bestanden"
 
-#: clientgui/AdvancedFrame.cpp:591
+#: AdvancedFrame.cpp:594
 msgid "Read local prefs file"
 msgstr "Lokale voorkeur inlezen"
 
-#: clientgui/AdvancedFrame.cpp:592
+#: AdvancedFrame.cpp:595
 msgid "Read preferences from global_prefs_override.xml."
 msgstr "Lokale voorkeur inlezen vanuit global_prefs_override.xml."
 
-#: clientgui/AdvancedFrame.cpp:597
+#: AdvancedFrame.cpp:600
 #, c-format
 msgid "Launch another instance of %s..."
 msgstr "Start nog een sessie van %s..."
 
-#: clientgui/AdvancedFrame.cpp:601
+#: AdvancedFrame.cpp:604
 #, c-format
 msgid "Launch another %s"
 msgstr "Een extra %s opstarten"
 
-#: clientgui/AdvancedFrame.cpp:611
+#: AdvancedFrame.cpp:614
 msgid "Event Log...\tCtrl+Shift+E"
 msgstr "Logboek...\tCtrl+Shift+E"
 
-#: clientgui/AdvancedFrame.cpp:612
+#: AdvancedFrame.cpp:615
 msgid "Display diagnostic messages."
 msgstr "Diagnostische berichten van de cliënt weergeven."
 
-#: clientgui/AdvancedFrame.cpp:616
-msgid "Event Log Diagnostic Flags...\tCtrl+Shift+F"
-msgstr "Event Log Diagnostische Markeringen...\tCtrl+Shift+F"
-
-#: clientgui/AdvancedFrame.cpp:617
-msgid "Enable or disable various diagnostic messages"
-msgstr "Aan- of uitzetten van diagnostische berichten"
-
-#: clientgui/AdvancedFrame.cpp:626
+#: AdvancedFrame.cpp:625 sg_BoincSimpleFrame.cpp:188
 #, c-format
 msgid "%s &help"
 msgstr "%s &help"
 
-#: clientgui/AdvancedFrame.cpp:632
+#: AdvancedFrame.cpp:631 sg_BoincSimpleFrame.cpp:194
 #, c-format
 msgid "Show information about %s"
 msgstr "Bekijk informatie over het gebruik van de %s"
 
-#: clientgui/AdvancedFrame.cpp:644
+#: AdvancedFrame.cpp:643
 #, c-format
 msgid "&%s help"
 msgstr "&%s help"
 
-#: clientgui/AdvancedFrame.cpp:650
+#: AdvancedFrame.cpp:649 sg_BoincSimpleFrame.cpp:212
 #, c-format
 msgid "Show information about the %s"
 msgstr "Bekijk informatie over het gebruik van de %s"
 
-#: clientgui/AdvancedFrame.cpp:662
+#: AdvancedFrame.cpp:661 sg_BoincSimpleFrame.cpp:224
 #, c-format
 msgid "%s &web site"
 msgstr "%s &website"
 
-#: clientgui/AdvancedFrame.cpp:668
+#: AdvancedFrame.cpp:667 sg_BoincSimpleFrame.cpp:230
 #, c-format
 msgid "Show information about BOINC and %s"
 msgstr "Bekijk informatie over BOINC en de %s"
 
-#: clientgui/AdvancedFrame.cpp:680
-#: clientgui/BOINCTaskBar.cpp:544
+#: AdvancedFrame.cpp:679 BOINCTaskBar.cpp:530 sg_BoincSimpleFrame.cpp:242
 #, c-format
 msgid "&About %s..."
 msgstr "Over de %s..."
 
-#: clientgui/AdvancedFrame.cpp:686
+#: AdvancedFrame.cpp:685 sg_BoincSimpleFrame.cpp:248
 msgid "Licensing and copyright information."
 msgstr "Informatie inzake licentieverlening en auteursrecht."
 
-#: clientgui/AdvancedFrame.cpp:693
+#: AdvancedFrame.cpp:692 sg_BoincSimpleFrame.cpp:255
 msgid "&File"
 msgstr "&Bestand"
 
-#: clientgui/AdvancedFrame.cpp:697
+#: AdvancedFrame.cpp:696 sg_BoincSimpleFrame.cpp:259
 msgid "&View"
 msgstr "&Weergave"
 
-#: clientgui/AdvancedFrame.cpp:701
+#: AdvancedFrame.cpp:700 sg_BoincSimpleFrame.cpp:263
 msgid "&Tools"
 msgstr "&Projectbeheer"
 
-#: clientgui/AdvancedFrame.cpp:705
+#: AdvancedFrame.cpp:704
 msgid "&Activity"
 msgstr "P&restaties"
 
-#: clientgui/AdvancedFrame.cpp:709
+#: AdvancedFrame.cpp:708
 msgid "A&dvanced"
 msgstr "&Geavanceerd"
 
-#: clientgui/AdvancedFrame.cpp:713
+#: AdvancedFrame.cpp:712 DlgEventLog.cpp:332 sg_BoincSimpleFrame.cpp:267
+#: wizardex.cpp:374 wizardex.cpp:381
 msgid "&Help"
 msgstr "&Help"
 
-#: clientgui/AdvancedFrame.cpp:1185
+#: AdvancedFrame.cpp:1199
 #, c-format
 msgid "%s - Stop using %s"
 msgstr "%s - Stop het gebruik van %s"
 
-#: clientgui/AdvancedFrame.cpp:1190
+#: AdvancedFrame.cpp:1204
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -569,252 +524,222 @@ msgid ""
 "but you'll have to manage projects manually.\n"
 "\n"
 "Do you want to stop using %s?"
-msgstr ""
-"Indien je %s verwijderd\n"
-"blijven je huidige projecten in tact,\n"
-"maar je zal ze handmatig moeten onderhouden.\n"
-"\n"
-"Wil je %s verwijderen?"
+msgstr "Indien je %s verwijderd\nblijven je huidige projecten in tact,\nmaar je zal ze handmatig moeten onderhouden.\n\nWil je %s verwijderen?"
 
-#: clientgui/AdvancedFrame.cpp:1397
+#: AdvancedFrame.cpp:1401
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s - De huidige client afsluiten..."
 
-#: clientgui/AdvancedFrame.cpp:1406
+#: AdvancedFrame.cpp:1410
 #, c-format
 msgid ""
 "%s will shut down the current client\n"
 "and prompt you for another host to connect to."
-msgstr ""
-"%s gaat de huidige client afsluiten en je vragen\n"
-"naar een 'host' om een andere verbinding te maken."
+msgstr "%s gaat de huidige client afsluiten en je vragen\nnaar een 'host' om een andere verbinding te maken."
 
-#: clientgui/AdvancedFrame.cpp:1806
+#: AdvancedFrame.cpp:1745 DlgAbout.cpp:119
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: clientgui/AdvancedFrame.cpp:1815
+#: AdvancedFrame.cpp:1754
 #, c-format
 msgid "%s has successfully added %s"
 msgstr "%s heeft met succes %s toegevoegd"
 
-#: clientgui/AdvancedFrame.cpp:1953
+#: AdvancedFrame.cpp:1893
 #, c-format
 msgid "%s - (%s)"
 msgstr "%s - (%s)"
 
-#: clientgui/AdvancedFrame.cpp:1957
+#: AdvancedFrame.cpp:1897
 #, c-format
 msgid "Connecting to %s"
 msgstr "Bezig te verbinden met %s"
 
-#: clientgui/AdvancedFrame.cpp:1960
+#: AdvancedFrame.cpp:1900
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "Verbonden met %s (%s)"
 
-#: clientgui/AlreadyExistsPage.cpp:184
+#: AlreadyExistsPage.cpp:184
 msgid "Username already in use"
 msgstr "Gebruikersnaam reeds in gebruik"
 
-#: clientgui/AlreadyExistsPage.cpp:187
+#: AlreadyExistsPage.cpp:187
 msgid ""
 "An account with that username already exists and has a\n"
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"Er bestaat al een account met deze gebruikersnaam, maar\n"
-"met een ander wachtwoord dan het hier ingevulde.\n"
-"\n"
-"Bezoek a.u.b. de website van het project en volg de instructies."
+msgstr "Er bestaat al een account met deze gebruikersnaam, maar\nmet een ander wachtwoord dan het hier ingevulde.\n\nBezoek a.u.b. de website van het project en volg de instructies."
 
-#: clientgui/AlreadyExistsPage.cpp:191
+#: AlreadyExistsPage.cpp:191
 msgid "Email address already in use"
 msgstr "Email adres reeds in gebruik"
 
-#: clientgui/AlreadyExistsPage.cpp:194
+#: AlreadyExistsPage.cpp:194
 msgid ""
 "An account with that email address already exists and has a\n"
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"Er bestaat al een account met dit email adres, maar met een\n"
-"ander wachtwoord dan het hier ingevulde.\n"
-"\n"
-"Bezoek a.u.b. de website van het project en volg de instructies."
+msgstr "Er bestaat al een account met dit email adres, maar met een\nander wachtwoord dan het hier ingevulde.\n\nBezoek a.u.b. de website van het project en volg de instructies."
 
-#: clientgui/AsyncRPC.cpp:1031
+#: AsyncRPC.cpp:1031
 msgid "Communicating with BOINC client.  Please wait ..."
 msgstr "Aan het communiceren met de BOINC client.  Even geduld ..."
 
-#: clientgui/AsyncRPC.cpp:1034
+#: AsyncRPC.cpp:1034
 #, c-format
 msgid "&Quit %s"
 msgstr "%s &Sluiten"
 
-#: clientgui/AsyncRPC.cpp:1036
+#: AsyncRPC.cpp:1036
 #, c-format
 msgid "E&xit %s"
 msgstr "%s &Afsluiten"
 
-#: clientgui/AsyncRPC.cpp:1040
+#: AsyncRPC.cpp:1040
 #, c-format
 msgid "%s - Communication"
 msgstr "%s - Communicatie"
 
-#: clientgui/AsyncRPC.cpp:1056
+#: AsyncRPC.cpp:1056 DlgAdvPreferencesBase.cpp:107 sg_DlgPreferences.cpp:433
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: clientgui/BOINCBaseFrame.cpp:504
+#: BOINCBaseFrame.cpp:505
 #, c-format
 msgid "%s - Connection Error"
 msgstr "%s - Verbindings Fout"
 
-#: clientgui/BOINCBaseFrame.cpp:513
+#: BOINCBaseFrame.cpp:514
 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 ""
-"Je hebt momenteel niet de benodigde rechten om de client te kunnen\n"
-"onderhouden. Neem contact op met de systeembeheerder."
+msgstr "Je hebt momenteel niet de benodigde rechten om de client te kunnen\nonderhouden. Neem contact op met de systeembeheerder."
 
-#: clientgui/BOINCBaseFrame.cpp:522
+#: BOINCBaseFrame.cpp:523
 msgid ""
 "Authorization failed connecting to running client.\n"
 "Make sure you start this program in the same directory as the client."
-msgstr ""
-"Er is een fout ontstaan tijdens het verbinden met de client.\n"
-"Controleer of het programma en de client in de zelfde map zitten."
+msgstr "Er is een fout ontstaan tijdens het verbinden met de client.\nControleer of het programma en de client in de zelfde map zitten."
 
-#: clientgui/BOINCBaseFrame.cpp:524
+#: BOINCBaseFrame.cpp:525
 msgid "Authorization failed connecting to running client."
 msgstr "Autorisatie mislukt tijdens het verbinden met de client."
 
-#: clientgui/BOINCBaseFrame.cpp:532
+#: BOINCBaseFrame.cpp:533
 msgid "The password you have provided is incorrect, please try again."
 msgstr "Het ingevulde wachtwoord in niet correct, probeer het a.u.b. opnieuw."
 
-#: clientgui/BOINCBaseFrame.cpp:576
+#: BOINCBaseFrame.cpp:577
 #, c-format
 msgid "%s - Connection Failed"
 msgstr "%s - Verbinding Mislukt"
 
-#: clientgui/BOINCBaseFrame.cpp:585
+#: BOINCBaseFrame.cpp:586
 #, c-format
 msgid ""
 "%s is not able to connect to a %s client.\n"
 "Would you like to try to connect again?"
-msgstr ""
-"%s kan geen verbinding maken met een\n"
-"%s client. Wil je het opnieuw proberen?"
+msgstr "%s kan geen verbinding maken met een\n%s client. Wil je het opnieuw proberen?"
 
-#: clientgui/BOINCBaseFrame.cpp:621
+#: BOINCBaseFrame.cpp:622
 #, c-format
 msgid "%s - Daemon Start Failed"
 msgstr "%s - Opstarten Deamon Mislukt"
 
-#: clientgui/BOINCBaseFrame.cpp:631
+#: BOINCBaseFrame.cpp:632
 #, 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 kan de %s client niet opstarten.Ga a.u.b. naar het Configuratiescherm ->Systeembeheer->Services en start hier de BOINC service."
 
-#: clientgui/BOINCBaseFrame.cpp:637
+#: BOINCBaseFrame.cpp:638
 #, c-format
 msgid ""
 "%s is not able to start a %s client.\n"
 "Please start the daemon and try again."
 msgstr "%s kan de %s client niet opstarten.Herstart a.u.b. de deamon om opnieuw te proberen."
 
-#: clientgui/BOINCBaseFrame.cpp:688
+#: BOINCBaseFrame.cpp:689
 #, c-format
 msgid "%s - Connection Status"
 msgstr "%s - Verbindings Status"
 
-#: clientgui/BOINCBaseFrame.cpp:699
+#: BOINCBaseFrame.cpp:700
 #, 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"
 "To connect up to your local computer please use 'localhost' as the host name."
-msgstr ""
-"%s heeft momenteel geen %s client verbinding.\n"
-"Gebruik a.u.b de 'Geavanceerd/Selecteer computer' menu optie om een verbinding\n"
-"met een %s client te maken. Vul hier 'localhost' in als host naam."
+msgstr "%s heeft momenteel geen %s client verbinding.\nGebruik a.u.b de 'Geavanceerd/Selecteer computer' menu optie om een verbinding\nmet een %s client te maken. Vul hier 'localhost' in als host naam."
 
-#: clientgui/BOINCBaseView.cpp:752
+#: BOINCBaseView.cpp:779
 msgid "Project web pages"
 msgstr "Project websites"
 
-#: clientgui/BOINCClientManager.cpp:573
+#: BOINCClientManager.cpp:575
 #, c-format
 msgid "%s - Unexpected Exit"
 msgstr "%s - Onverwachte Afsluiting"
 
-#: clientgui/BOINCClientManager.cpp:583
+#: BOINCClientManager.cpp:585
 #, 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 ""
-"De %s cliënt heeft zich 3 keer onverwacht afgesloten in de laatste %d minuten.\n"
-"Wil je deze opnieuw opstarten?"
+msgstr "De %s cliënt heeft zich 3 keer onverwacht afgesloten in de laatste %d minuten.\nWil je deze opnieuw opstarten?"
 
-#: clientgui/BOINCDialupManager.cpp:61
+#: BOINCDialupManager.cpp:61
 #, c-format
 msgid "%s - Network Status"
 msgstr "%s - Netwerk Status"
 
-#: clientgui/BOINCDialupManager.cpp:241
+#: BOINCDialupManager.cpp:241
 #, c-format
 msgid ""
 "%s needs to connect to the Internet.\n"
 "May it do so now?"
-msgstr ""
-"%s heeft een verbinding met het internet\n"
-"nodig, mag dit nu?"
+msgstr "%s heeft een verbinding met het internet\nnodig, mag dit nu?"
 
-#: clientgui/BOINCDialupManager.cpp:254
+#: BOINCDialupManager.cpp:254
 #, c-format
 msgid "%s is connecting to the Internet."
 msgstr "%s is bezig met verbinden."
 
-#: clientgui/BOINCDialupManager.cpp:303
+#: BOINCDialupManager.cpp:303
 #, c-format
 msgid "%s has successfully connected to the Internet."
 msgstr "%s heeft een internet verbinding gemaakt."
 
-#: clientgui/BOINCDialupManager.cpp:331
+#: BOINCDialupManager.cpp:331
 #, c-format
 msgid "%s failed to connect to the Internet."
 msgstr "%s kon geen internet verbinding maken."
 
-#: clientgui/BOINCDialupManager.cpp:372
+#: 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 heeft de internet verbinding gedetecteerd en probeert\n"
-"alle projecten bij te werken."
+msgstr "%s heeft de internet verbinding gedetecteerd en probeert\nalle projecten bij te werken."
 
-#: clientgui/BOINCDialupManager.cpp:417
+#: BOINCDialupManager.cpp:417
 #, c-format
 msgid "%s has successfully disconnected from the Internet."
 msgstr "%s heeft de internet verbinding verbroken."
 
-#: clientgui/BOINCDialupManager.cpp:433
+#: BOINCDialupManager.cpp:433
 #, c-format
 msgid "%s failed to disconnected from the Internet."
 msgstr "%s kon de internet verbinding niet verbreken."
 
-#: clientgui/BOINCGUIApp.cpp:595
+#: BOINCGUIApp.cpp:339
 #, c-format
 msgid ""
 "You currently are not authorized to manage the client.\n"
@@ -825,865 +750,798 @@ msgid ""
 " or\n"
 "  - contact your administrator to add you to the 'boinc_master'\n"
 "     user group."
-msgstr ""
-"Momenteel heb je niet de rechten om de client te onderhouden.\n"
-"\n"
-"Om als deze gebruiker %s uit te voeren:\n"
-"  - herinstalleer %s met de optie om alle gebruikers\n"
-"     toestemming te geven\n"
-" of\n"
-"  - neem contact op met de beheerder om je aan de 'boinc_master'\n"
-"     gebruikersgroep toe te voegen."
-
-#: clientgui/BOINCGUIApp.cpp:601
+msgstr "Momenteel heb je niet de rechten om de client te onderhouden.\n\nOm als deze gebruiker %s uit te voeren:\n  - herinstalleer %s met de optie om alle gebruikers\n     toestemming te geven\n of\n  - neem contact op met de beheerder om je aan de 'boinc_master'\n     gebruikersgroep toe te voegen."
+
+#: BOINCGUIApp.cpp:345
 #, c-format
 msgid ""
 "%s ownership or permissions are not set properly; please reinstall %s.\n"
 "(Error code %d"
-msgstr ""
-"%s gebruiker en/of rechten zijn niet goed ingesteld; herinstalleer a.u.b. %s.\n"
-"(Foutcode: %d"
+msgstr "%s gebruiker en/of rechten zijn niet goed ingesteld; herinstalleer a.u.b. %s.\n(Foutcode: %d"
 
-#: clientgui/BOINCGUIApp.cpp:607
+#: BOINCGUIApp.cpp:351
 msgid " at "
 msgstr " op "
 
-#: clientgui/BOINCGUIApp.cpp:610
+#: BOINCGUIApp.cpp:354 MainDocument.cpp:2484 MainDocument.cpp:2534
+#: MainDocument.cpp:2554 ViewTransfers.cpp:803
 msgid ")"
 msgstr ")"
 
-#: clientgui/BOINCGUIApp.cpp:640
+#: BOINCGUIApp.cpp:384
 msgid ""
 "A reboot is required in order for BOINC to run properly.\n"
 "Please reboot your computer and try again."
 msgstr "Er is een herstart nodig om BOINC goed te kunnen uitvoeren.Herstart a.u.b. je computer om het opnieuw te proberen."
 
-#: clientgui/BOINCGUIApp.cpp:641
+#: BOINCGUIApp.cpp:385 DlgAbout.cpp:153
 msgid "BOINC Manager"
 msgstr "BOINC Manager"
 
-#: clientgui/BOINCGUIApp.cpp:902
+#: BOINCGUIApp.cpp:572
 msgid "BOINC Manager was started by the operating system automatically"
 msgstr "BOINC Manager is automatisch opgestart door het besturingssysteem"
 
-#: clientgui/BOINCGUIApp.cpp:904
+#: BOINCGUIApp.cpp:574
 msgid "Startup BOINC so only the system tray icon is visible"
 msgstr "Start BOINC zodat deze alleen zichtbaar is in het systeemvak"
 
-#: clientgui/BOINCGUIApp.cpp:906
+#: BOINCGUIApp.cpp:576
 msgid "Directory containing the BOINC Client executable"
 msgstr "Map waar de BOINC client zich bevindt"
 
-#: clientgui/BOINCGUIApp.cpp:907
+#: BOINCGUIApp.cpp:577
 msgid "BOINC data directory"
 msgstr "BOINC data map"
 
-#: clientgui/BOINCGUIApp.cpp:909
+#: BOINCGUIApp.cpp:579
 msgid "Host name or IP address"
 msgstr "Computer naam of IP adres"
 
-#: clientgui/BOINCGUIApp.cpp:910
+#: BOINCGUIApp.cpp:580
 msgid "GUI RPC port number"
 msgstr "GUI RPC poortnummer"
 
-#: clientgui/BOINCGUIApp.cpp:911
+#: BOINCGUIApp.cpp:581
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: clientgui/BOINCGUIApp.cpp:912
+#: BOINCGUIApp.cpp:582
 msgid "Startup BOINC with these optional arguments"
 msgstr "Start BOINC op met deze opties"
 
-#: clientgui/BOINCGUIApp.cpp:913
+#: BOINCGUIApp.cpp:583
 msgid "disable BOINC security users and permissions"
 msgstr "schakel de BOINC toegangs- en gebruikersrechten uit"
 
-#: clientgui/BOINCGUIApp.cpp:914
+#: BOINCGUIApp.cpp:584
 msgid "set skin debugging mode to enable skin manager error messages"
 msgstr "schakel de skin-debugger modus in om fout berichten mogelijk te maken van de skin-manager"
 
-#: clientgui/BOINCGUIApp.cpp:915
+#: BOINCGUIApp.cpp:585
 msgid "multiple instances of BOINC Manager allowed"
 msgstr "meerdere gelijktijdige sessies van BOINC-Manager mogelijk"
 
-#: clientgui/BOINCGUIApp.cpp:917
+#: BOINCGUIApp.cpp:587
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr "Niet gebruikt: vanwege fout in Xcode 4.2"
 
-#: clientgui/BOINCGUIApp.cpp:1164
+#: BOINCGUIApp.cpp:814
 msgid "(Automatic Detection)"
 msgstr "(Automatische Detectie)"
 
-#: clientgui/BOINCGUIApp.cpp:1165
+#: BOINCGUIApp.cpp:815
 msgid "(Unknown)"
 msgstr "(Onbekend)"
 
-#: clientgui/BOINCGUIApp.cpp:1166
+#: BOINCGUIApp.cpp:816
 msgid "(User Defined)"
 msgstr "(Gedefineerd door gebruiker)"
 
-#: clientgui/BOINCTaskBar.cpp:522
+#: BOINCTaskBar.cpp:508
 #, c-format
 msgid "Open %s Web..."
 msgstr "Open de %s Pagina..."
 
-#: clientgui/BOINCTaskBar.cpp:529
+#: BOINCTaskBar.cpp:515
 #, c-format
 msgid "Open %s..."
 msgstr "Open de %s..."
 
-#: clientgui/BOINCTaskBar.cpp:536
-#: clientgui/BOINCTaskBar.cpp:633
-#: clientgui/BOINCTaskBar.cpp:641
+#: BOINCTaskBar.cpp:522 BOINCTaskBar.cpp:619 BOINCTaskBar.cpp:627
 msgid "Snooze"
 msgstr "Sluimer"
 
-#: clientgui/BOINCTaskBar.cpp:538
-#: clientgui/BOINCTaskBar.cpp:660
-#: clientgui/BOINCTaskBar.cpp:668
+#: BOINCTaskBar.cpp:524 BOINCTaskBar.cpp:646 BOINCTaskBar.cpp:654
 msgid "Snooze GPU"
 msgstr "Sluimer GPU"
 
-#: clientgui/BOINCTaskBar.cpp:556
+#: BOINCTaskBar.cpp:542
 msgid "E&xit"
 msgstr "Afsluiten"
 
-#: clientgui/BOINCTaskBar.cpp:626
+#: BOINCTaskBar.cpp:612 ViewProjects.cpp:718 ViewWork.cpp:795
+#: sg_BoincSimpleFrame.cpp:758 sg_ProjectCommandPopup.cpp:110
+#: sg_TaskCommandPopup.cpp:102
 msgid "Resume"
 msgstr "Hervatten"
 
-#: clientgui/BOINCTaskBar.cpp:653
+#: BOINCTaskBar.cpp:639
 msgid "Resume GPU"
 msgstr "GPU hervatten"
 
-#: clientgui/BOINCTaskBar.cpp:727
+#: BOINCTaskBar.cpp:713
 msgid "Computing is enabled"
 msgstr "Werk mag uitgevoerd worden"
 
-#: clientgui/BOINCTaskBar.cpp:731
+#: BOINCTaskBar.cpp:717
 msgid "Computing is suspended - "
 msgstr "Werk is momenteel opgeschort - "
 
-#: clientgui/BOINCTaskBar.cpp:741
+#: BOINCTaskBar.cpp:727
 msgid "GPU computing is enabled"
 msgstr "GPU werk mag uitgevoerd worden"
 
-#: clientgui/BOINCTaskBar.cpp:744
+#: BOINCTaskBar.cpp:730
 msgid "GPU computing is suspended - "
 msgstr "GPU werk is momenteel opgeschort - "
 
-#: clientgui/BOINCTaskBar.cpp:753
+#: BOINCTaskBar.cpp:739
 msgid "Network is enabled"
 msgstr "Netwerk is actief"
 
-#: clientgui/BOINCTaskBar.cpp:756
+#: BOINCTaskBar.cpp:742
 msgid "Network is suspended - "
 msgstr "Netwerkverbinding opgeschort - "
 
-#: clientgui/BOINCTaskBar.cpp:764
+#: BOINCTaskBar.cpp:750
 msgid "Reconnecting to client."
 msgstr "Client wordt verbonden."
 
-#: clientgui/BOINCTaskBar.cpp:766
+#: BOINCTaskBar.cpp:752
 msgid "Not connected to a client."
 msgstr "Niet verbonden met een client."
 
-#: clientgui/BOINCTaskBar.cpp:819
+#: BOINCTaskBar.cpp:805
 #, c-format
 msgid "%s Notices"
 msgstr "%s Berichten"
 
-#: clientgui/BOINCTaskBar.cpp:825
+#: BOINCTaskBar.cpp:811
 msgid "There are new notices - click to view."
 msgstr "Er zijn nieuwe berichten - klik om ze te bekijken."
 
-#: clientgui/CompletionErrorPage.cpp:199
+#: CompletionErrorPage.cpp:199
 msgid "Failed to add project"
 msgstr "Project toevoegen mislukt"
 
-#: clientgui/CompletionErrorPage.cpp:204
+#: CompletionErrorPage.cpp:204
 msgid "Failed to update account manager"
 msgstr "Account manager bijwerken mislukt"
 
-#: clientgui/CompletionErrorPage.cpp:208
+#: CompletionErrorPage.cpp:208
 msgid "Failed to remove account manager"
 msgstr "Account manager verwijderen mislukt"
 
-#: clientgui/CompletionErrorPage.cpp:212
+#: CompletionErrorPage.cpp:212
 msgid "Failed to add account manager"
 msgstr "Account manager bijwerken mislukt"
 
-#: clientgui/CompletionErrorPage.cpp:221
+#: CompletionErrorPage.cpp:221
 msgid ""
 "Please try again later.\n"
 "\n"
 "Click Finish to close."
-msgstr ""
-"Probeer het later nog een keer.\n"
-"\n"
-"Klik op Voltooien om af te sluiten."
+msgstr "Probeer het later nog een keer.\n\nKlik op Voltooien om af te sluiten."
 
-#: clientgui/CompletionErrorPage.cpp:225
-#: clientgui/CompletionPage.cpp:222
-#: clientgui/CompletionPage.cpp:242
-#: clientgui/CompletionPage.cpp:273
+#: CompletionErrorPage.cpp:225 CompletionPage.cpp:222 CompletionPage.cpp:242
+#: CompletionPage.cpp:273
 msgid "Click Finish to close."
 msgstr "Klik op Voltooien om af te sluiten."
 
-#: clientgui/CompletionErrorPage.cpp:234
+#: CompletionErrorPage.cpp:234
 msgid "Messages from server:"
 msgstr "Berichten van server:"
 
-#: clientgui/CompletionPage.cpp:207
+#: CompletionPage.cpp:207
 msgid "Project added"
 msgstr "Project toegevoegd"
 
-#: clientgui/CompletionPage.cpp:213
+#: CompletionPage.cpp:213
 msgid "This project has been successfully added."
 msgstr "Het project is met succes toegevoegd."
 
-#: clientgui/CompletionPage.cpp:218
+#: 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 ""
-"Na het klikken op Voltooien, gaat je webbrowser naar de project\n"
-"pagina, om ook de instellingen hier eventueel te doen."
+msgstr "Na het klikken op Voltooien, gaat je webbrowser naar de project\npagina, om ook de instellingen hier eventueel te doen."
 
-#: clientgui/CompletionPage.cpp:232
+#: CompletionPage.cpp:232
 #, c-format
 msgid "Update from %s completed."
 msgstr "Bijwerken van %s voltooid."
 
-#: clientgui/CompletionPage.cpp:236
+#: CompletionPage.cpp:236
 msgid "Update completed."
 msgstr "Bijwerken voltooid."
 
-#: clientgui/CompletionPage.cpp:247
+#: CompletionPage.cpp:247
 msgid "Now using account manager"
 msgstr "Account Manager in gebruik"
 
-#: clientgui/CompletionPage.cpp:252
+#: CompletionPage.cpp:252
 #, c-format
 msgid "Welcome to %s!"
 msgstr "Welkom bij %s!"
 
-#: clientgui/CompletionPage.cpp:263
+#: CompletionPage.cpp:263
 #, c-format
 msgid "You are now using %s to manage accounts."
 msgstr "Je gebruikt nu %s om je accounts te onderhouden."
 
-#: clientgui/CompletionPage.cpp:267
+#: CompletionPage.cpp:267
 msgid "You are now using this account manager."
 msgstr "Je gebruikt nu deze Account Manager."
 
-#: clientgui/DlgAbout.cpp:113
+#: DlgAbout.cpp:113 mac/Mac_GUI.cpp:96
 #, c-format
 msgid "About %s"
 msgstr "Over %s"
 
-#: clientgui/DlgAbout.cpp:172
+#: DlgAbout.cpp:172
 msgid "Version:"
 msgstr "Versie:"
 
-#: clientgui/DlgAbout.cpp:180
+#: DlgAbout.cpp:180
 msgid "wxWidgets Version:"
 msgstr "wxWidgets Versie:"
 
-#: clientgui/DlgAbout.cpp:188
+#: DlgAbout.cpp:188
 msgid "Copyright:"
 msgstr "Copyright:"
 
-# 98%
-#: clientgui/DlgAbout.cpp:192
+#: DlgAbout.cpp:192
 msgid ""
-"(C) 2003-2014 University of California, Berkeley.\n"
+"(C) 2003-2013 University of California, Berkeley.\n"
 "All Rights Reserved."
-msgstr ""
-"(C) 2003-2014 University of California, Berkeley.\n"
-"Alle rechten voorbehouden."
+msgstr "(C) 2003-2011 University of California, Berkeley.\nAlle rechten voorbehouden."
 
-#: clientgui/DlgAbout.cpp:196
+#: DlgAbout.cpp:196
 msgid "Berkeley Open Infrastructure for Network Computing"
 msgstr "Berkeley Open Infrastructure for Network Computing"
 
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:399
-#: clientgui/DlgSelectComputer.cpp:163
+#: DlgAbout.cpp:208 DlgExitMessage.cpp:173 DlgGenericMessage.cpp:120
+#: DlgOptions.cpp:396 DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "&OK"
 
-#: clientgui/DlgAdvPreferences.cpp:602
+#: DlgAdvPreferences.cpp:544
 msgid "invalid number"
 msgstr "ongeldig nummer"
 
-#: clientgui/DlgAdvPreferences.cpp:603
+#: DlgAdvPreferences.cpp:545
 msgid "invalid time, format is HH:MM"
 msgstr "ongeldige tijd, opbouw moet zijn UU:MM"
 
-#: clientgui/DlgAdvPreferences.cpp:604
+#: DlgAdvPreferences.cpp:546
 msgid "invalid time interval, format is HH:MM-HH:MM"
 msgstr "ongeldige tijds interval, opbouw moet zijn UU:MM-UU:MM"
 
-#: clientgui/DlgAdvPreferences.cpp:817
+#: DlgAdvPreferences.cpp:751
 msgid "invalid input value detected"
 msgstr "ongeldige waarde gevonden"
 
-#: clientgui/DlgAdvPreferences.cpp:819
+#: DlgAdvPreferences.cpp:753
 msgid "Validation Error"
 msgstr "Geldigheids Fout"
 
-#: clientgui/DlgAdvPreferences.cpp:969
-#: clientgui/DlgAdvPreferences.cpp:975
-#: clientgui/DlgAdvPreferences.cpp:981
+#: DlgAdvPreferences.cpp:885 DlgAdvPreferences.cpp:891
+#: DlgAdvPreferences.cpp:897
 msgid "Applications to add"
 msgstr "Toe te voegen programma"
 
-#: clientgui/DlgAdvPreferences.cpp:998
+#: DlgAdvPreferences.cpp:914
 #, c-format
 msgid "'%s' is not an executable application."
 msgstr "'%s' is geen uitvoerbaar bestand."
 
-#: clientgui/DlgAdvPreferences.cpp:999
-#: clientgui/DlgAdvPreferences.cpp:1046
-#: clientgui/DlgAdvPreferences.cpp:1070
+#: DlgAdvPreferences.cpp:915 DlgAdvPreferences.cpp:962
+#: DlgAdvPreferences.cpp:986
 msgid "Add Exclusive App"
 msgstr "Exclusief Programma Toevoegen"
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Name of application to add?"
 msgstr "Programma naam?"
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Add exclusive app"
 msgstr "Voeg exclusief programma toe"
 
-#: clientgui/DlgAdvPreferences.cpp:1045
+#: DlgAdvPreferences.cpp:961
 #, c-format
 msgid "Application names must end with '%s'"
 msgstr "Programma naam moet eindigen op '%s'"
 
-#: clientgui/DlgAdvPreferences.cpp:1069
+#: DlgAdvPreferences.cpp:985
 #, c-format
 msgid "'%s' is already in the list."
 msgstr "'%s' staat al in de lijst."
 
-#: clientgui/DlgAdvPreferences.cpp:1161
+#: DlgAdvPreferences.cpp:1077
 msgid ""
 "Do you really want to clear all local preferences?\n"
 "(This will not affect exclusive applications.)"
-msgstr ""
-"Weet je zeker dat je de lokale voorkeuren wilt wissen?\n"
-"(Dit heeft geen gevolgen voor de exclusieve programma's)"
+msgstr "Weet je zeker dat je de lokale voorkeuren wilt wissen?\n(Dit heeft geen gevolgen voor de exclusieve programma's)"
 
-#: clientgui/DlgAdvPreferences.cpp:1162
+#: DlgAdvPreferences.cpp:1078 sg_DlgPreferences.cpp:1030
 msgid "Confirmation"
 msgstr "Bevestiging"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:49
+#: DlgAdvPreferencesBase.cpp:46 sg_DlgPreferences.cpp:946
 #, c-format
-msgid "%s - Computing preferences"
-msgstr "%s - Berekeningsvoorkeuren"
+msgid "%s - Preferences"
+msgstr "%s - Voorkeuren"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:66
+#: DlgAdvPreferencesBase.cpp:62
 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 ""
-"Gebruik dit venster voor instellingen voor deze computer.\n"
-"Klik op 'OK' om ze op te slaan of op 'Wissen' om terug te gaan\n"
-"naar online instellingen (exclusieve programma's blijven intact)."
+msgstr "Gebruik dit venster voor instellingen voor deze computer.\nKlik op 'OK' om ze op te slaan of op 'Wissen' om terug te gaan\nnaar online instellingen (exclusieve programma's blijven intact)."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:69
+#: DlgAdvPreferencesBase.cpp:65 sg_DlgPreferences.cpp:428
 msgid "Clear"
 msgstr "Wissen"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:70
+#: DlgAdvPreferencesBase.cpp:66
 msgid "clear all local preferences and close the dialog"
 msgstr "Wis alle lokale voorkeuren en sluit het venster"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:85
+#: DlgAdvPreferencesBase.cpp:81
 msgid "processor usage"
 msgstr "processorgebruik"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:88
+#: DlgAdvPreferencesBase.cpp:84
 msgid "network usage"
 msgstr "netwerkgebruik"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:91
+#: DlgAdvPreferencesBase.cpp:87
 msgid "disk and memory usage"
 msgstr "schijf- en geheugengebruik"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:94
+#: DlgAdvPreferencesBase.cpp:90
 msgid "exclusive applications"
 msgstr "exclusieve programma's"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:107
-#: clientgui/DlgDiagnosticLogFlags.cpp:104
+#: DlgAdvPreferencesBase.cpp:102 sg_DlgPreferences.cpp:424
 msgid "OK"
 msgstr "OK"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:108
+#: DlgAdvPreferencesBase.cpp:103
 msgid "save all values and close the dialog"
 msgstr "sla alle waarden op en sluit het venster"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:114
+#: DlgAdvPreferencesBase.cpp:108
 msgid "close the dialog without saving"
 msgstr "sluit het venster zonder op te slaan"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:118
-#: clientgui/Localization.cpp:35
-#: clientgui/Localization.cpp:121
-#: clientgui/Localization.cpp:139
+#: DlgAdvPreferencesBase.cpp:112 Localization.cpp:35 Localization.cpp:121
+#: Localization.cpp:139 sg_BoincSimpleFrame.cpp:794 sg_DlgPreferences.cpp:439
 msgid "Help"
 msgstr "Help"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
+#: DlgAdvPreferencesBase.cpp:113
 msgid "shows the preferences web page"
 msgstr "laat de voorkeuren website zien"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:141
+#: DlgAdvPreferencesBase.cpp:135
 msgid "Computing allowed"
 msgstr "Werk mag uitgevoerd worden"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
+#: DlgAdvPreferencesBase.cpp:139
 msgid "While computer is on batteries"
 msgstr "terwijl de computer op een accu werkt"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:149
-msgid "check this if you want this computer to do work while it runs on batteries"
+#: DlgAdvPreferencesBase.cpp:142
+msgid ""
+"check this if you want this computer to do work while it runs on batteries"
 msgstr "vink dit aan als werk uitgevoerd mag worden als de computer op een accu werkt"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:155
+#: DlgAdvPreferencesBase.cpp:148
 msgid "While computer is in use"
 msgstr "terwijl de computer in gebruik is"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:158
-msgid "check this if you want this computer to do work even when you're using it"
+#: DlgAdvPreferencesBase.cpp:151
+msgid ""
+"check this if you want this computer to do work even when you're using it"
 msgstr "vink dit aan als werk uitgevoerd mag worden als de computer actief is"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:164
+#: DlgAdvPreferencesBase.cpp:157
 msgid "Use GPU while computer is in use"
 msgstr "Gebruik de GPU terwijl de computer in gebruik is"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:167
-msgid "check this if you want your GPU to do work even when you're using the computer"
+#: DlgAdvPreferencesBase.cpp:160
+msgid ""
+"check this if you want your GPU to do work even when you're using the "
+"computer"
 msgstr "vink dit aan als de GPU werk mag uitvoeren als de computer actief is"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:179
+#: DlgAdvPreferencesBase.cpp:172
 msgid "Only after computer has been idle for"
 msgstr "Alleen als de computer inactief is na"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:188
-msgid "do work only after you haven't used the computer for this number of minutes"
+#: DlgAdvPreferencesBase.cpp:182
+msgid ""
+"do work only after you haven't used the computer for this number of minutes"
 msgstr "alleen werk toestaan als de computer niet actief is geweest in de aangegeven aantal minuten"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:193
-#: clientgui/DlgAdvPreferencesBase.cpp:342
+#: DlgAdvPreferencesBase.cpp:187 DlgAdvPreferencesBase.cpp:336
+#: sg_DlgPreferences.cpp:417
 msgid "minutes"
 msgstr "minuten"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:212
+#: DlgAdvPreferencesBase.cpp:206
 msgid "While processor usage is less than"
 msgstr "Als het processor gebruik minder is dan"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:221
+#: DlgAdvPreferencesBase.cpp:216
 msgid "suspend work if processor usage exceeds this level"
 msgstr "onderbreek het werk als het processor gebruik boven deze waarde komt"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:226
+#: DlgAdvPreferencesBase.cpp:221
 msgid "percent (0 means no restriction)"
 msgstr "procent (geen beperking indien 0)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:240
-#: clientgui/DlgAdvPreferencesBase.cpp:506
+#: DlgAdvPreferencesBase.cpp:235 DlgAdvPreferencesBase.cpp:496
 msgid "Every day between hours of"
 msgstr "Elke dag tussen"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: DlgAdvPreferencesBase.cpp:239
 msgid "start work at this time"
 msgstr "start het werk op dit tijdstip"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:248
-#: clientgui/DlgAdvPreferencesBase.cpp:514
+#: DlgAdvPreferencesBase.cpp:243 DlgAdvPreferencesBase.cpp:504
+#: sg_DlgPreferences.cpp:326 sg_DlgPreferences.cpp:348
 msgid "and"
 msgstr "en"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:252
+#: DlgAdvPreferencesBase.cpp:247
 msgid "stop work at this time"
 msgstr "stop het werk op dit tijdstip"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
-#: clientgui/DlgAdvPreferencesBase.cpp:522
+#: DlgAdvPreferencesBase.cpp:251 DlgAdvPreferencesBase.cpp:512
 msgid "(no restriction if equal)"
 msgstr "(geen beperkingen indien gelijk)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:261
-#: clientgui/DlgAdvPreferencesBase.cpp:527
+#: DlgAdvPreferencesBase.cpp:256 DlgAdvPreferencesBase.cpp:517
 msgid "Day-of-week override:"
 msgstr "Alleen op deze dag(en):"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:266
-#: clientgui/DlgAdvPreferencesBase.cpp:532
+#: DlgAdvPreferencesBase.cpp:261 DlgAdvPreferencesBase.cpp:522
 msgid "check box to specify hours for this day of week"
 msgstr "vink aan om de tijdlimiet voor deze dag in te stellen"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:272
-#: clientgui/DlgAdvPreferencesBase.cpp:538
+#: DlgAdvPreferencesBase.cpp:267 DlgAdvPreferencesBase.cpp:528
 msgid "Monday"
 msgstr "Maandag"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:279
-#: clientgui/DlgAdvPreferencesBase.cpp:545
+#: DlgAdvPreferencesBase.cpp:274 DlgAdvPreferencesBase.cpp:535
 msgid "Tuesday"
 msgstr "Dinsdag"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:286
-#: clientgui/DlgAdvPreferencesBase.cpp:552
+#: DlgAdvPreferencesBase.cpp:281 DlgAdvPreferencesBase.cpp:542
 msgid "Wednesday"
 msgstr "Woensdag"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:293
-#: clientgui/DlgAdvPreferencesBase.cpp:559
+#: DlgAdvPreferencesBase.cpp:288 DlgAdvPreferencesBase.cpp:549
 msgid "Thursday"
 msgstr "Donderdag"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:300
-#: clientgui/DlgAdvPreferencesBase.cpp:566
+#: DlgAdvPreferencesBase.cpp:295 DlgAdvPreferencesBase.cpp:556
 msgid "Friday"
 msgstr "Vrijdag"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:307
-#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: DlgAdvPreferencesBase.cpp:302 DlgAdvPreferencesBase.cpp:563
 msgid "Saturday"
 msgstr "Zaterdag"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:580
+#: DlgAdvPreferencesBase.cpp:309 DlgAdvPreferencesBase.cpp:570
 msgid "Sunday"
 msgstr "Zondag"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:328
+#: DlgAdvPreferencesBase.cpp:323
 msgid "Other options"
 msgstr "Extra opties"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:336
+#: DlgAdvPreferencesBase.cpp:330
 msgid "Switch between applications every"
 msgstr "Schakel tussen programma's elke"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:345
+#: DlgAdvPreferencesBase.cpp:339
 msgid "On multiprocessor systems, use at most"
 msgstr "Gebruik maximaal"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
+#: DlgAdvPreferencesBase.cpp:346
 #, no-c-format
-msgid "% of the processors (0 means no restriction)"
+msgid "% of the processors (0 means ignore this setting)"
 msgstr "% van de processoren (0 betekent geen beperking)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:355
-#: clientgui/DlgAdvPreferencesBase.cpp:618
-#: clientgui/DlgAdvPreferencesBase.cpp:640
-#: clientgui/DlgAdvPreferencesBase.cpp:661
-#: clientgui/DlgAdvPreferencesBase.cpp:683
-#: clientgui/DlgAdvPreferencesBase.cpp:694
+#: DlgAdvPreferencesBase.cpp:349 DlgAdvPreferencesBase.cpp:605
+#: DlgAdvPreferencesBase.cpp:627 DlgAdvPreferencesBase.cpp:648
+#: DlgAdvPreferencesBase.cpp:669 DlgAdvPreferencesBase.cpp:679
 msgid "Use at most"
 msgstr "gebruik maximaal"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:362
+#: DlgAdvPreferencesBase.cpp:356
 #, no-c-format
-msgid "% of CPU time (0 means no restriction)"
-msgstr "% van CPU tijd (0 betekent geen beperkingen)"
+msgid "% CPU time"
+msgstr "% CPU tijd"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:386
+#: DlgAdvPreferencesBase.cpp:378
 msgid "General options"
 msgstr "Algemene opties"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:395
+#: DlgAdvPreferencesBase.cpp:386
 msgid "Maximum download rate"
 msgstr "Maximale download waarde"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:401
-#: clientgui/DlgAdvPreferencesBase.cpp:410
-msgid "KBytes/second (0 means no restriction)"
-msgstr "KBytes/seconde (0 betekent geen beperkingen)"
+#: DlgAdvPreferencesBase.cpp:392 DlgAdvPreferencesBase.cpp:401
+msgid "KBytes/sec."
+msgstr "KBytes/sec."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:404
+#: DlgAdvPreferencesBase.cpp:395
 msgid "Maximum upload rate"
 msgstr "Maximale upload waarde"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:417
+#: DlgAdvPreferencesBase.cpp:406
+msgid "Transfer at most"
+msgstr "Maximale overdacht"
+
+#: DlgAdvPreferencesBase.cpp:412
+msgid "Mbytes"
+msgstr "Mbytes"
+
+#: DlgAdvPreferencesBase.cpp:415
+msgid "every"
+msgstr "elke"
+
+#: DlgAdvPreferencesBase.cpp:421 DlgAdvPreferencesBase.cpp:444
+#: DlgAdvPreferencesBase.cpp:463
+msgid "days"
+msgstr "dagen"
+
+#: DlgAdvPreferencesBase.cpp:429
 msgid "Minimum work buffer"
 msgstr "Minimale werk buffer"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:425
+#: DlgAdvPreferencesBase.cpp:438
 msgid "Try to maintain enough tasks to keep busy for this many days"
 msgstr "Probeer genoeg taken binnen te halen om deze hoeveelheid dagen te overbruggen"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:431
-#: clientgui/DlgAdvPreferencesBase.cpp:449
-msgid "days (maximum value: 10)"
-msgstr "dagen (maximale waarde: 10)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:437
+#: DlgAdvPreferencesBase.cpp:450
 msgid "Max additional work buffer"
 msgstr "Maximale aanvullende werk buffer"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:445
+#: DlgAdvPreferencesBase.cpp:459
 msgid "In addition, maintain enough tasks for up to this many days"
 msgstr "In aanvulling, maximaal taken voor deze hoeveelheid dagen"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:454
-msgid "Transfer at most"
-msgstr "Maximale overdacht"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:462
-msgid "MBytes every"
-msgstr "MBytes elke"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:468
-msgid "days (0 means no restriction)"
-msgstr "dagen (0 betekent geen beperkingen)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:476
+#: DlgAdvPreferencesBase.cpp:466
 msgid "Skip image file verification"
 msgstr "Sla bestands verificatie over"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:478
+#: DlgAdvPreferencesBase.cpp:468
 msgid "check this if your Internet provider modifies image files"
 msgstr "vink dit aan als je provider bestands indelingen aanpast"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:484
+#: DlgAdvPreferencesBase.cpp:476
 msgid "Connect options"
 msgstr "Verbindings opties"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:487
+#: DlgAdvPreferencesBase.cpp:478
 msgid "Confirm before connecting to internet"
 msgstr "Bevestiging bij het openen van de internet verbinding"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
+#: DlgAdvPreferencesBase.cpp:480
+msgid ""
+"if checked, a confirmation dialog will be displayed before trying to connect"
+" to the Internet"
 msgstr "indien aangevinkt verschijnt er een bevestigings venster voor de verbinding gemaakt wordt"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:493
+#: DlgAdvPreferencesBase.cpp:484
 msgid "Disconnect when done"
 msgstr "Verbinding verbreken indien gereed"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:495
+#: DlgAdvPreferencesBase.cpp:486
 msgid ""
 "if checked, BOINC hangs up when network usage is done\n"
 "(only relevant for dialup-connection)"
-msgstr ""
-"indien aangevinkt wordt de verbinding verbroken als BOINC\n"
-"gereed is met bijwerken (van toepassing bij inbel verbinding)"
+msgstr "indien aangevinkt wordt de verbinding verbroken als BOINC\ngereed is met bijwerken (van toepassing bij inbel verbinding)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:501
+#: DlgAdvPreferencesBase.cpp:492
 msgid "Network usage allowed"
 msgstr "Netwerk beperkingen"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:510
+#: DlgAdvPreferencesBase.cpp:500
 msgid "network usage start hour"
 msgstr "begintijd netwerk gebruik"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:518
+#: DlgAdvPreferencesBase.cpp:508
 msgid "network usage stop hour"
 msgstr "eindtijd netwerk gebruik"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:610
-#: clientgui/DlgItemProperties.cpp:257
+#: DlgAdvPreferencesBase.cpp:598 DlgItemProperties.cpp:231
 msgid "Disk usage"
 msgstr "Schijfgebruik"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:622
+#: DlgAdvPreferencesBase.cpp:609
 msgid "the maximum disk space used by BOINC (in Gigabytes)"
 msgstr "maximaal schijfgebruik door BOINC (in Gigabytes)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:626
-msgid "Gigabytes disk space (0 means no restriction)"
-msgstr "Gigabytes schijfruimte (0 betekent geen beperkingen)"
+#: DlgAdvPreferencesBase.cpp:613
+msgid "Gigabytes disk space"
+msgstr "Gigabytes schijfruimte"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:629
+#: DlgAdvPreferencesBase.cpp:616
 msgid "Leave at least"
 msgstr "Laat minstens"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:633
+#: DlgAdvPreferencesBase.cpp:620
 msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
 msgstr "BOINC moet minimaal deze hoeveelheid ruimte vrij laten (in Gigabytes)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:637
+#: DlgAdvPreferencesBase.cpp:624
 msgid "Gigabytes disk space free"
 msgstr "Gigabytes aan schijfruimte vrij"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
+#: DlgAdvPreferencesBase.cpp:631
 msgid "BOINC uses at most this percentage of total disk space"
 msgstr "BOINC mag maximaal dit percentage van de schijf gebruiken"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:649
+#: DlgAdvPreferencesBase.cpp:636
 #, no-c-format
 msgid "% of total disk space"
 msgstr "% van totaal schijfgebuik"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:652
+#: DlgAdvPreferencesBase.cpp:639
 msgid "Tasks checkpoint to disk at most every"
 msgstr "Controlepunt van werk op schijf opslaan elke"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
+#: DlgAdvPreferencesBase.cpp:645
 msgid "seconds"
 msgstr "seconden"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:668
+#: DlgAdvPreferencesBase.cpp:655
 #, no-c-format
 msgid "% of page file (swap space)"
 msgstr "% van virtueel geheugen"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:675
+#: DlgAdvPreferencesBase.cpp:662
 msgid "Memory usage"
 msgstr "Geheugengebruik"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
+#: DlgAdvPreferencesBase.cpp:676
 #, no-c-format
 msgid "% when computer is in use"
 msgstr "% als de computer in gebruik is"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:701
+#: DlgAdvPreferencesBase.cpp:686
 #, no-c-format
 msgid "% when computer is idle"
 msgstr "% als de computer niet in gebruik is"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:706
+#: DlgAdvPreferencesBase.cpp:691
 msgid "Leave applications in memory while suspended"
 msgstr "Programma's in het geheugen houden indien gepauzeerd"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:708
+#: DlgAdvPreferencesBase.cpp:693
 msgid "if checked, suspended work units are left in memory"
 msgstr "indien aangevinkt worden programma's in het geheugen gehouden"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:728
-msgid "Suspend processor and network usage when these applications are running:"
+#: DlgAdvPreferencesBase.cpp:713
+msgid ""
+"Suspend processor and network usage when these applications are running:"
 msgstr "Pauzeer de processor en het netwerkgebruik als de volgende programma's actief zijn:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:738
+#: DlgAdvPreferencesBase.cpp:722
 msgid "Add..."
 msgstr "Toevoegen..."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:739
+#: DlgAdvPreferencesBase.cpp:723
 msgid "Add an application to this list"
 msgstr "Voeg een programma toe aan de lijst"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:744
+#: DlgAdvPreferencesBase.cpp:728 ViewProjects.cpp:202
+#: sg_ProjectCommandPopup.cpp:85
 msgid "Remove"
 msgstr "Verwijderen"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:745
+#: DlgAdvPreferencesBase.cpp:729
 msgid "Remove an application from this list"
 msgstr "Verwijder een programma van de lijst"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:754
+#: DlgAdvPreferencesBase.cpp:738
 msgid "For advanced options, refer to "
 msgstr "Voor geavanceerde opties, raadpleeg het "
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:65
-#, c-format
-msgid "%s Diagnostic Log Flags"
-msgstr "%s Diagnostische Logboek Markeringen"
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:83
-msgid "These flags enable various types of diagnostic messages in the Event Log."
-msgstr "Deze markeringen zetten bepaalde diagnostische berichten aan in het Gebeurtenissen logboek."
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:105
-msgid "Save all values and close the dialog"
-msgstr "Sla alle waarden op en sluit het venster"
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:108
-msgid "Defaults"
-msgstr "Standaardwaarden"
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:109
-msgid "Restore default settings"
-msgstr "Standaardwaarden herstellen"
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:113
-msgid "Close the dialog without saving"
-msgstr "Sluit het venster zonder op te slaan"
-
-#: clientgui/DlgEventLog.cpp:226
+#: DlgEventLog.cpp:219
 #, c-format
 msgid "%s - Event Log"
 msgstr "%s - Gebeurtenissen Logboek"
 
-#: clientgui/DlgEventLog.cpp:236
+#: DlgEventLog.cpp:232 ViewMessages.cpp:117 ViewProjects.cpp:219
+#: ViewStatistics.cpp:435 ViewStatistics.cpp:2009 ViewTransfers.cpp:182
+#: ViewWork.cpp:232
 msgid "Project"
 msgstr "Project"
 
-#: clientgui/DlgEventLog.cpp:237
+#: DlgEventLog.cpp:233 ViewMessages.cpp:118
 msgid "Time"
 msgstr "Tijd"
 
-#: clientgui/DlgEventLog.cpp:238
+#: DlgEventLog.cpp:234 ViewMessages.cpp:119
 msgid "Message"
 msgstr "Bericht"
 
-#: clientgui/DlgEventLog.cpp:300
-#: clientgui/DlgEventLog.cpp:364
+#: DlgEventLog.cpp:290 DlgEventLog.cpp:354
 msgid "&Show only this project"
 msgstr "Alleen dit project laten zien"
 
-#: clientgui/DlgEventLog.cpp:304
+#: DlgEventLog.cpp:294
 msgid "Copy &All"
 msgstr "&Alles kopiëren"
 
-#: clientgui/DlgEventLog.cpp:306
-#: clientgui/DlgEventLog.cpp:310
+#: DlgEventLog.cpp:296 DlgEventLog.cpp:300 ViewMessages.cpp:89
 msgid "Copy all the messages to the clipboard."
 msgstr "Alle berichten kopiëren naar het klembord."
 
-#: clientgui/DlgEventLog.cpp:315
+#: DlgEventLog.cpp:305
 msgid "Copy &Selected"
 msgstr "&Selectie kopiëren"
 
-#: clientgui/DlgEventLog.cpp:318
-#: clientgui/DlgEventLog.cpp:326
-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."
+#: DlgEventLog.cpp:308 DlgEventLog.cpp:316 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 "De geselecteerde berichten naar het klembord kopiëren. Je kan meerdere berichten selecteren door met behulp van de Shift of Command toets op de bestanden te klikken."
 
-#: clientgui/DlgEventLog.cpp:320
-#: clientgui/DlgEventLog.cpp:328
-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."
+#: DlgEventLog.cpp:310 DlgEventLog.cpp:318 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 "De geselecteerde berichten naar het klembord kopiëren. Je kan meerdere berichten selecteren door met behulp van de Shift of Ctrl toets op de bestanden te klikken."
 
-#: clientgui/DlgEventLog.cpp:335
-#: clientgui/DlgItemProperties.cpp:67
+#: DlgEventLog.cpp:325 DlgItemProperties.cpp:67
 msgid "&Close"
 msgstr "Sluiten"
 
-#: clientgui/DlgEventLog.cpp:344
+#: DlgEventLog.cpp:334 sg_BoincSimpleFrame.cpp:798 sg_DlgPreferences.cpp:442
 #, c-format
 msgid "Get help with %s"
 msgstr "Hulp krijgen bij %s"
 
-#: clientgui/DlgEventLog.cpp:358
+#: DlgEventLog.cpp:348
 msgid "Show all &messages"
 msgstr "Toon alle berichten"
 
-#: clientgui/DlgEventLog.cpp:359
-#: clientgui/DlgEventLog.cpp:361
+#: DlgEventLog.cpp:349 DlgEventLog.cpp:351
 msgid "Show messages for all projects"
 msgstr "Laat berichten zien van alle projecten"
 
-#: clientgui/DlgEventLog.cpp:365
-#: clientgui/DlgEventLog.cpp:367
+#: DlgEventLog.cpp:355 DlgEventLog.cpp:357
 msgid "Show only the messages for the selected project"
 msgstr "Laat alleen berichten zien van het geselecteerde project"
 
-#: clientgui/DlgExitMessage.cpp:82
+#: DlgExitMessage.cpp:82
 #, c-format
 msgid "%s - Exit Confirmation"
 msgstr "%s - Afsluit Bevestiging"
 
-#: clientgui/DlgExitMessage.cpp:130
+#: DlgExitMessage.cpp:130
 #, c-format
 msgid ""
 "You have requested to exit the %s,\n"
@@ -1692,15 +1550,9 @@ msgid ""
 "\n"
 "If you also want to stop running the tasks,\n"
 "choose from the following options:"
-msgstr ""
-"Je hebt er voor gekozen de %s te sluiten,\n"
-"welke je de optie geeft om de lopende taken\n"
-"te zien en te beheren op je computer.\n"
-"\n"
-"Als je ook de lopende taken wilt stoppen,\n"
-"kies dan één van de volgende opties:"
+msgstr "Je hebt er voor gekozen de %s te sluiten,\nwelke je de optie geeft om de lopende taken\nte zien en te beheren op je computer.\n\nAls je ook de lopende taken wilt stoppen,\nkies dan één van de volgende opties:"
 
-#: clientgui/DlgExitMessage.cpp:135
+#: DlgExitMessage.cpp:135
 #, c-format
 msgid ""
 "This will shut down %s and its tasks until either the\n"
@@ -1709,1000 +1561,916 @@ msgid ""
 "In most cases, it is better just to close the %s window\n"
 "rather than to exit the application; that will allow %s to run its\n"
 "tasks at the times you selected in your preferences."
-msgstr ""
-"Dit zal %s en het werk stop zetten, de voortgang zal pas worden\n"
-"hervat als de %s of de %s screensaver opnieuw gestart wordt.\n"
-"\n"
-"In de meeste gevallen, is het aan te raden om het %s venster\n"
-"te sluiten. Op deze manier blijft %s actief en kan het werk\n"
-"worden voort gezet op basis van de opgegeven voorkeuren."
+msgstr "Dit zal %s en het werk stop zetten, de voortgang zal pas worden\nhervat als de %s of de %s screensaver opnieuw gestart wordt.\n\nIn de meeste gevallen, is het aan te raden om het %s venster\nte sluiten. Op deze manier blijft %s actief en kan het werk\nworden voort gezet op basis van de opgegeven voorkeuren."
 
-#: clientgui/DlgExitMessage.cpp:153
+#: DlgExitMessage.cpp:153
 #, c-format
 msgid "Stop running tasks when exiting the %s"
 msgstr "Stop de actieve taken bij het afsluiten van de %s"
 
-#: clientgui/DlgExitMessage.cpp:165
+#: DlgExitMessage.cpp:165
 msgid "Remember this decision and do not show this dialog."
 msgstr "Onthoud deze keuze en laat dit venster niet meer zien."
 
-#: clientgui/DlgExitMessage.cpp:178
-#: clientgui/DlgGenericMessage.cpp:125
-#: clientgui/DlgOptions.cpp:404
-#: clientgui/DlgSelectComputer.cpp:168
+#: DlgExitMessage.cpp:178 DlgGenericMessage.cpp:125 DlgOptions.cpp:401
+#: DlgSelectComputer.cpp:168 wizardex.cpp:378
 msgid "&Cancel"
 msgstr "&Annuleren"
 
-#: clientgui/DlgGenericMessage.cpp:112
+#: DlgGenericMessage.cpp:112
 msgid "Don't show this dialog again."
 msgstr "Laat dit venster niet meer zien."
 
-#: clientgui/DlgItemProperties.cpp:194
-#: clientgui/DlgItemProperties.cpp:197
-#: clientgui/DlgItemProperties.cpp:200
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:168 DlgItemProperties.cpp:171
+#: DlgItemProperties.cpp:174 DlgItemProperties.cpp:177
 msgid "Don't fetch tasks for "
 msgstr "Download geen taken voor "
 
-#: clientgui/DlgItemProperties.cpp:194
+#: DlgItemProperties.cpp:168
 msgid "Project preference"
 msgstr "Project voorkeuren"
 
-#: clientgui/DlgItemProperties.cpp:197
+#: DlgItemProperties.cpp:171
 msgid "Account manager preference"
 msgstr "Accountmanager voorkeuren"
 
-#: clientgui/DlgItemProperties.cpp:200
+#: DlgItemProperties.cpp:174
 msgid "Project has no apps for "
 msgstr "Projectapplicaties niet beschikbaar voor "
 
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:177
 msgid "Client configuration excludes "
 msgstr "Clientspecifieke configuratie omvat geen "
 
-#: clientgui/DlgItemProperties.cpp:207
+#: DlgItemProperties.cpp:181
 msgid " work fetch deferred for"
 msgstr " werkverzoek uitgesteld voor"
 
-#: clientgui/DlgItemProperties.cpp:208
+#: DlgItemProperties.cpp:182
 msgid " work fetch deferral interval"
 msgstr " werkverzoek interval"
 
-#: clientgui/DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:213
 msgid "Properties of project "
 msgstr "Project eigenschappen van "
 
-#: clientgui/DlgItemProperties.cpp:243
-#: clientgui/DlgOptions.cpp:221
+#: DlgItemProperties.cpp:217 DlgOptions.cpp:218
 msgid "General"
 msgstr "Algemeen"
 
-#: clientgui/DlgItemProperties.cpp:244
+#: DlgItemProperties.cpp:218
 msgid "Master URL"
 msgstr "URL"
 
-#: clientgui/DlgItemProperties.cpp:245
+#: DlgItemProperties.cpp:219
 msgid "User name"
 msgstr "Gebruikersnaam"
 
-#: clientgui/DlgItemProperties.cpp:246
+#: DlgItemProperties.cpp:220
 msgid "Team name"
 msgstr "Team naam"
 
-#: clientgui/DlgItemProperties.cpp:247
+#: DlgItemProperties.cpp:221 ViewProjects.cpp:224
 msgid "Resource share"
 msgstr "Gedeelde bronnen"
 
-#: clientgui/DlgItemProperties.cpp:249
+#: DlgItemProperties.cpp:223
 msgid "Scheduler RPC deferred for"
 msgstr "Taakverdeling uitgesteld voor"
 
-#: clientgui/DlgItemProperties.cpp:252
+#: DlgItemProperties.cpp:226
 msgid "File downloads deferred for"
 msgstr "Bestand downloaden uitgesteld voor"
 
-#: clientgui/DlgItemProperties.cpp:255
+#: DlgItemProperties.cpp:229
 msgid "File uploads deferred for"
 msgstr "Bestand uploaden uitgesteld voor"
 
-#: clientgui/DlgItemProperties.cpp:258
+#: DlgItemProperties.cpp:232
 msgid "Computer ID"
 msgstr "Computer ID"
 
-#: clientgui/DlgItemProperties.cpp:260
+#: DlgItemProperties.cpp:234
 msgid "Non CPU intensive"
 msgstr "Niet CPU intensief"
 
-#: 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
+#: DlgItemProperties.cpp:234 DlgItemProperties.cpp:236
+#: DlgItemProperties.cpp:237 DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:242 DlgItemProperties.cpp:251
+#: DlgItemProperties.cpp:254 DlgItemProperties.cpp:257
 msgid "yes"
 msgstr "Ja"
 
-#: clientgui/DlgItemProperties.cpp:262
+#: DlgItemProperties.cpp:236
 msgid "Suspended via GUI"
 msgstr "Opgeschort via GUI"
 
-#: clientgui/DlgItemProperties.cpp:262
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:236 DlgItemProperties.cpp:237
 msgid "no"
 msgstr "Nee"
 
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:237
 msgid "Don't request more work"
 msgstr "Niet om nieuw werk vragen"
 
-#: clientgui/DlgItemProperties.cpp:265
+#: DlgItemProperties.cpp:239
 msgid "Scheduler call in progress"
 msgstr "Bijwerk verzoek wordt uitgevoerd"
 
-#: clientgui/DlgItemProperties.cpp:268
+#: DlgItemProperties.cpp:242
 msgid "Trickle-up pending"
 msgstr "Trickle-up in behandeling"
 
-#: clientgui/DlgItemProperties.cpp:271
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:245 DlgItemProperties.cpp:247
 msgid "Host location"
 msgstr "Locatie hostcomputer"
 
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:247
 msgid "default"
 msgstr "standaardwaarde"
 
-#: clientgui/DlgItemProperties.cpp:277
+#: DlgItemProperties.cpp:251
 msgid "Added via account manager"
 msgstr "Toegevoegd d.m.v. account manager"
 
-#: clientgui/DlgItemProperties.cpp:280
+#: DlgItemProperties.cpp:254
 msgid "Remove when tasks done"
 msgstr "Verwijderen als werk gereed is"
 
-#: clientgui/DlgItemProperties.cpp:283
+#: DlgItemProperties.cpp:257
 msgid "Ended"
 msgstr "Beeindigd"
 
-#: clientgui/DlgItemProperties.cpp:285
-msgid "Tasks completed"
-msgstr "Taken voltooid"
-
-#: clientgui/DlgItemProperties.cpp:286
-msgid "Tasks failed"
-msgstr "Taken mislukt"
-
-#: clientgui/DlgItemProperties.cpp:288
+#: DlgItemProperties.cpp:259
 msgid "Credit"
 msgstr "Punten"
 
-#: clientgui/DlgItemProperties.cpp:289
+#: DlgItemProperties.cpp:260
 msgid "User"
 msgstr "Gebruiker"
 
-#: clientgui/DlgItemProperties.cpp:296
+#: DlgItemProperties.cpp:267
 msgid "Host"
 msgstr "Host"
 
-#: clientgui/DlgItemProperties.cpp:305
+#: DlgItemProperties.cpp:276
 msgid "Scheduling"
 msgstr "Taakverdeling"
 
-#: clientgui/DlgItemProperties.cpp:306
+#: DlgItemProperties.cpp:277
 msgid "Scheduling priority"
 msgstr "Prioriteit voor taakverdeling"
 
-#: clientgui/DlgItemProperties.cpp:307
+#: DlgItemProperties.cpp:278
 msgid "CPU"
 msgstr "CPU"
 
-#: clientgui/DlgItemProperties.cpp:331
+#: DlgItemProperties.cpp:302
 msgid "Duration correction factor"
 msgstr "Factor voor tijdscorrectie"
 
-#: clientgui/DlgItemProperties.cpp:345
+#: DlgItemProperties.cpp:316
 msgid "Properties of task "
 msgstr "Eigenschappen van taak "
 
-#: clientgui/DlgItemProperties.cpp:357
+#: DlgItemProperties.cpp:328 ViewWork.cpp:238
 msgid "Application"
 msgstr "Programma"
 
-#: clientgui/DlgItemProperties.cpp:358
+#: DlgItemProperties.cpp:329 ViewWork.cpp:239
 msgid "Name"
 msgstr "Bestandsnaam"
 
-#: clientgui/DlgItemProperties.cpp:359
+#: DlgItemProperties.cpp:330
 msgid "State"
 msgstr "Status"
 
-#: clientgui/DlgItemProperties.cpp:362
+#: DlgItemProperties.cpp:333
 msgid "Received"
 msgstr "Ontvangen"
 
-#: clientgui/DlgItemProperties.cpp:365
+#: DlgItemProperties.cpp:336
 msgid "Report deadline"
 msgstr "Rapporteren voor"
 
-#: clientgui/DlgItemProperties.cpp:367
+#: DlgItemProperties.cpp:338
 msgid "Resources"
 msgstr "Bronnen"
 
-#: clientgui/DlgItemProperties.cpp:370
+#: DlgItemProperties.cpp:341
 msgid "Estimated computation size"
 msgstr "Geschatte berekenings-grootte"
 
-#: clientgui/DlgItemProperties.cpp:373
+#: DlgItemProperties.cpp:344
 msgid "CPU time at last checkpoint"
 msgstr "Processortijd tijdens laatste checkpoint"
 
-#: clientgui/DlgItemProperties.cpp:374
-#: clientgui/DlgItemProperties.cpp:389
+#: DlgItemProperties.cpp:345 DlgItemProperties.cpp:360
 msgid "CPU time"
 msgstr "Processor tijd"
 
-#: clientgui/DlgItemProperties.cpp:376
-#: clientgui/DlgItemProperties.cpp:390
+#: DlgItemProperties.cpp:347 DlgItemProperties.cpp:361
 msgid "Elapsed time"
 msgstr "Verstreken tijd"
 
-#: clientgui/DlgItemProperties.cpp:378
+#: DlgItemProperties.cpp:349
 msgid "Estimated time remaining"
 msgstr "Geschatte resterende tijd"
 
-#: clientgui/DlgItemProperties.cpp:379
+#: DlgItemProperties.cpp:350
 msgid "Fraction done"
 msgstr "Voortgang"
 
-#: clientgui/DlgItemProperties.cpp:380
+#: DlgItemProperties.cpp:351
 msgid "Virtual memory size"
 msgstr "Grootte virtueel geheugen"
 
-#: clientgui/DlgItemProperties.cpp:381
+#: DlgItemProperties.cpp:352
 msgid "Working set size"
 msgstr "Grootte van taak"
 
-#: clientgui/DlgItemProperties.cpp:383
+#: DlgItemProperties.cpp:354
 msgid "Directory"
 msgstr "Map"
 
-#: clientgui/DlgItemProperties.cpp:386
+#: DlgItemProperties.cpp:357
 msgid "Process ID"
 msgstr "Proces ID"
 
-#: clientgui/DlgItemProperties.cpp:456
+#: DlgItemProperties.cpp:427 ViewWork.cpp:1032 sg_TaskPanel.cpp:823
 msgid "Local: "
 msgstr "Lokaal: "
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: DlgOptions.cpp:129 DlgOptions.cpp:135
 msgid "Options"
 msgstr "Opties"
 
-#: clientgui/DlgOptions.cpp:178
+#: DlgOptions.cpp:175
 msgid "Language:"
 msgstr "Taal:"
 
-#: clientgui/DlgOptions.cpp:185
+#: DlgOptions.cpp:182
 msgid "What language should BOINC use?"
 msgstr "Welke taal moet BOINC gebruiken?"
 
-#: clientgui/DlgOptions.cpp:189
+#: DlgOptions.cpp:186
 msgid "Notice reminder interval:"
 msgstr "Notificatie-interval:"
 
-#: clientgui/DlgOptions.cpp:196
+#: DlgOptions.cpp:193
 msgid "How often should BOINC remind you of new notices?"
 msgstr "Hoe vaak moet BOINC je herinneren aan nieuwe berichten?"
 
-#: clientgui/DlgOptions.cpp:201
+#: DlgOptions.cpp:198
 msgid "Run Manager at login?"
 msgstr "Manager starten bij inloggen?"
 
-#: clientgui/DlgOptions.cpp:207
+#: DlgOptions.cpp:204
 msgid "Run the BOINC Manager when you log on."
 msgstr "De BOINC manager opstarten bij het inloggen."
 
-#: clientgui/DlgOptions.cpp:212
+#: DlgOptions.cpp:209
 msgid "Enable Manager exit dialog?"
 msgstr "Afsluitbevestiging weergeven?"
 
-#: clientgui/DlgOptions.cpp:218
+#: DlgOptions.cpp:215
 msgid "Display the exit dialog when shutting down the Manager."
 msgstr "Laat de afsluitbevestiging zien bij het afsluiten van de manager."
 
-#: clientgui/DlgOptions.cpp:229
+#: DlgOptions.cpp:226
 msgid "Dial-up and Virtual Private Network settings"
 msgstr "Inbel en VPN (Virtual Private Network) instellingen"
 
-#: clientgui/DlgOptions.cpp:243
+#: DlgOptions.cpp:240
 msgid "&Set Default"
 msgstr "&Stel in als Standaard"
 
-#: clientgui/DlgOptions.cpp:248
+#: DlgOptions.cpp:245
 msgid "&Clear Default"
 msgstr "Verwijder Standaard Instelling"
 
-#: clientgui/DlgOptions.cpp:255
+#: DlgOptions.cpp:252
 msgid "Default Connection:"
 msgstr "Standaard Verbinding:"
 
-#: clientgui/DlgOptions.cpp:262
+#: DlgOptions.cpp:259
 msgid "Connections"
 msgstr "Verbindingen"
 
-#: clientgui/DlgOptions.cpp:271
+#: DlgOptions.cpp:268
 msgid "Connect via HTTP proxy server"
 msgstr "Verbind via HTTP proxy server"
 
-#: clientgui/DlgOptions.cpp:275
+#: DlgOptions.cpp:272
 msgid "HTTP Proxy Server Configuration"
 msgstr "HTTP Proxy Server Configuratie"
 
-#: clientgui/DlgOptions.cpp:283
-#: clientgui/DlgOptions.cpp:347
+#: DlgOptions.cpp:280 DlgOptions.cpp:344
 msgid "Address:"
 msgstr "IP adres:"
 
-#: clientgui/DlgOptions.cpp:291
-#: clientgui/DlgOptions.cpp:355
+#: DlgOptions.cpp:288 DlgOptions.cpp:352 ProxyPage.cpp:340 ProxyPage.cpp:360
 msgid "Port:"
 msgstr "Poort:"
 
-#: clientgui/DlgOptions.cpp:299
-#: clientgui/DlgOptions.cpp:363
+#: DlgOptions.cpp:296 DlgOptions.cpp:360
 msgid "Don't use proxy for:"
 msgstr "Geen proxy gebruiken voor:"
 
-#: clientgui/DlgOptions.cpp:306
-#: clientgui/DlgOptions.cpp:370
+#: DlgOptions.cpp:303 DlgOptions.cpp:367
 msgid "Leave these blank if not needed"
 msgstr "Laat dit gedeelte leeg indien niet vereist"
 
-#: clientgui/DlgOptions.cpp:312
-#: clientgui/DlgOptions.cpp:376
+#: DlgOptions.cpp:309 DlgOptions.cpp:373 ProxyPage.cpp:343 ProxyPage.cpp:363
 msgid "User Name:"
 msgstr "Gebruikersnaam:"
 
-#: clientgui/DlgOptions.cpp:320
-#: clientgui/DlgOptions.cpp:384
-#: clientgui/DlgSelectComputer.cpp:152
+#: DlgOptions.cpp:317 DlgOptions.cpp:381 DlgSelectComputer.cpp:152
+#: ProxyPage.cpp:346 ProxyPage.cpp:366
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: clientgui/DlgOptions.cpp:327
+#: DlgOptions.cpp:324
 msgid "HTTP Proxy"
 msgstr "HTTP Proxy"
 
-#: clientgui/DlgOptions.cpp:335
+#: DlgOptions.cpp:332
 msgid "Connect via SOCKS proxy server"
 msgstr "Verbind via SOCKS proxy server"
 
-#: clientgui/DlgOptions.cpp:339
+#: DlgOptions.cpp:336
 msgid "SOCKS Proxy Server Configuration"
 msgstr "SOCKS Proxy Server Configuratie"
 
-#: clientgui/DlgOptions.cpp:391
+#: DlgOptions.cpp:388
 msgid "SOCKS Proxy"
 msgstr "SOCKS Proxy"
 
-#: clientgui/DlgOptions.cpp:589
+#: DlgOptions.cpp:586
 msgid "always"
 msgstr "altijd"
 
-#: clientgui/DlgOptions.cpp:590
+#: DlgOptions.cpp:587
 msgid "1 hour"
 msgstr "1 uur"
 
-#: clientgui/DlgOptions.cpp:591
+#: DlgOptions.cpp:588
 msgid "6 hours"
 msgstr "6 uur"
 
-#: clientgui/DlgOptions.cpp:592
+#: DlgOptions.cpp:589
 msgid "1 day"
 msgstr "1 dag"
 
-#: clientgui/DlgOptions.cpp:593
+#: DlgOptions.cpp:590
 msgid "1 week"
 msgstr "1 week"
 
-#: clientgui/DlgOptions.cpp:594
+#: DlgOptions.cpp:591
 msgid "never"
 msgstr "nooit"
 
-#: clientgui/DlgOptions.cpp:691
+#: DlgOptions.cpp:688
 #, c-format
 msgid "%s - Language Selection"
 msgstr "%s - Taalselectie"
 
-#: clientgui/DlgOptions.cpp:698
+#: DlgOptions.cpp:695
 #, 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 "De standaard taal van de %s is gewijzigd.  Om dit te activeren dien je de %s te herstarten."
 
-#: clientgui/DlgSelectComputer.cpp:91
+#: DlgSelectComputer.cpp:91
 #, c-format
 msgid "%s - Select Computer"
 msgstr "%s - Selecteer computer"
 
-#: clientgui/DlgSelectComputer.cpp:125
+#: DlgSelectComputer.cpp:125
 #, c-format
 msgid ""
 "Another instance of %s is already running \n"
 "on this computer.  Please select a client to monitor."
-msgstr ""
-"%s wordt al een keer uitgevoerd op deze \n"
-"computer.  Kies de client die u wilt controleren."
+msgstr "%s wordt al een keer uitgevoerd op deze \ncomputer.  Kies de client die u wilt controleren."
 
-#: clientgui/DlgSelectComputer.cpp:143
+#: DlgSelectComputer.cpp:143
 msgid "Host name:"
 msgstr "Host naam:"
 
-#: clientgui/Localization.cpp:31
-#: clientgui/Localization.cpp:69
+#: Localization.cpp:31 Localization.cpp:69
 msgid "Message boards"
 msgstr "Forum"
 
-#: clientgui/Localization.cpp:33
+#: Localization.cpp:33
 msgid "Correspond with other users on the SETI at home message boards"
 msgstr "Correspondeer met andere gebruikers op het SETI at home forum"
 
-#: clientgui/Localization.cpp:37
+#: Localization.cpp:37
 msgid "Ask questions and report problems"
 msgstr "Stel vragen en rapporteer problemen"
 
-#: clientgui/Localization.cpp:39
-#: clientgui/Localization.cpp:81
-#: clientgui/Localization.cpp:111
-#: clientgui/Localization.cpp:129
+#: Localization.cpp:39 Localization.cpp:81 Localization.cpp:111
+#: Localization.cpp:129
 msgid "Your account"
 msgstr "Mijn account"
 
-#: clientgui/Localization.cpp:41
-#: clientgui/Localization.cpp:87
-#: clientgui/Localization.cpp:113
+#: Localization.cpp:41 Localization.cpp:87 Localization.cpp:113
 msgid "View your account information and credit totals"
 msgstr "Bekijk informatie over en het punten totaal van je eigen account"
 
-#: clientgui/Localization.cpp:43
+#: Localization.cpp:43
 msgid "Your preferences"
 msgstr "Mijn voorkeuren"
 
-#: clientgui/Localization.cpp:45
+#: Localization.cpp:45
 msgid "View and modify your SETI at home account profile and preferences"
 msgstr "Bekijk en verander je SETI at home profiel en account voorkeuren"
 
-#: clientgui/Localization.cpp:47
-#: clientgui/Localization.cpp:89
+#: Localization.cpp:47 Localization.cpp:89
 msgid "Your results"
 msgstr "Mijn resultaten"
 
-#: clientgui/Localization.cpp:49
-#: clientgui/Localization.cpp:91
+#: Localization.cpp:49 Localization.cpp:91
 msgid "View your last week (or more) of computational results and work"
 msgstr "Bekijk de behaalde resultaten van de afgelopen periode"
 
-#: clientgui/Localization.cpp:51
-#: clientgui/Localization.cpp:93
+#: Localization.cpp:51 Localization.cpp:93
 msgid "Your computers"
 msgstr "Mijn computer(s)"
 
-#: clientgui/Localization.cpp:53
+#: Localization.cpp:53
 msgid "View a listing of all the computers on which you are running SETI at Home"
 msgstr "Bekijk de lijst van je computer(s) die SETI at home uitvoeren"
 
-#: clientgui/Localization.cpp:55
-#: clientgui/Localization.cpp:97
+#: Localization.cpp:55 Localization.cpp:97
 msgid "Your team"
 msgstr "Mijn Team"
 
-#: clientgui/Localization.cpp:57
-#: clientgui/Localization.cpp:99
+#: Localization.cpp:57 Localization.cpp:99
 msgid "View information about your team"
 msgstr "Bekijk informatie over je eigen team"
 
-#: clientgui/Localization.cpp:61
+#: Localization.cpp:61
 msgid "Common questions"
 msgstr "Veel gestelde vragen"
 
-#: clientgui/Localization.cpp:63
+#: Localization.cpp:63
 msgid "Read the Einstein at Home Frequently Asked Question list"
 msgstr "Bekijk de Einstein at Home veel gestelde vragen lijst"
 
-#: clientgui/Localization.cpp:65
+#: Localization.cpp:65
 msgid "Screensaver info"
 msgstr "Screensaver info"
 
-#: clientgui/Localization.cpp:67
+#: Localization.cpp:67
 msgid "Read a detailed description of the Einstein at Home screensaver"
 msgstr "Bekijk de gedetailleerde beschijving over de Einstein at home screensaver"
 
-#: clientgui/Localization.cpp:71
-msgid "Correspond with admins and other users on the Einstein at Home message boards"
+#: Localization.cpp:71
+msgid ""
+"Correspond with admins and other users on the Einstein at Home message boards"
 msgstr "Correspondeer met andere gebruikers op het Einstein at home forum"
 
-#: clientgui/Localization.cpp:73
+#: Localization.cpp:73
 msgid "Einstein status"
 msgstr "Einstein status"
 
-#: clientgui/Localization.cpp:75
+#: Localization.cpp:75
 msgid "Current status of the Einstein at Home server"
 msgstr "Huidige Einstein at home server status"
 
-#: clientgui/Localization.cpp:77
+#: Localization.cpp:77
 msgid "Report problems"
 msgstr "Rapporteer problemen"
 
-#: clientgui/Localization.cpp:79
+#: Localization.cpp:79
 msgid "A link to the Einstein at Home problems and bug reports message board"
 msgstr "Bekijk het Einstein at Home forum over problemen en fout rapportages"
 
-#: clientgui/Localization.cpp:83
+#: Localization.cpp:83
 msgid "View and modify your Einstein at Home account profile and preferences"
 msgstr "Bekijk en verander je Einstein at home profiel en account voorkeuren"
 
-#: clientgui/Localization.cpp:85
+#: Localization.cpp:85
 msgid "Account summary"
 msgstr "Account samenvatting"
 
-#: clientgui/Localization.cpp:95
-msgid "View a listing of all the computers on which you are running Einstein at Home"
+#: Localization.cpp:95
+msgid ""
+"View a listing of all the computers on which you are running Einstein at Home"
 msgstr "Bekijk de lijst van je computer(s) die Einstein at home uitvoeren"
 
-#: clientgui/Localization.cpp:101
+#: Localization.cpp:101
 msgid "LIGO project"
 msgstr "LIGO project"
 
-#: clientgui/Localization.cpp:103
-msgid "The home page of the Laser Interferometer Gravitational-wave Observatory (LIGO) project"
+#: Localization.cpp:103
+msgid ""
+"The home page of the Laser Interferometer Gravitational-wave Observatory "
+"(LIGO) project"
 msgstr "Bekijk de webpagina van het 'Laser Interferometer Gravitational-wave Observatory' (LIGO) project"
 
-#: clientgui/Localization.cpp:105
+#: Localization.cpp:105
 msgid "GEO-600 project"
 msgstr "GEO-600 project"
 
-#: clientgui/Localization.cpp:107
+#: Localization.cpp:107
 msgid "The home page of the GEO-600 project"
 msgstr "Bekijk de webpagina van het GEO-600 project"
 
-#: clientgui/Localization.cpp:115
-#: clientgui/Localization.cpp:133
+#: Localization.cpp:115 Localization.cpp:133 ViewProjects.cpp:221
+#: ViewStatistics.cpp:465
 msgid "Team"
 msgstr "Mijn Team"
 
-#: clientgui/Localization.cpp:117
+#: Localization.cpp:117
 msgid "Info about your Team"
 msgstr "Bekijk informatie over je eigen team"
 
-#: clientgui/Localization.cpp:123
+#: Localization.cpp:123
 msgid "Get help for climateprediction.net"
 msgstr "Bekijk de climateprediction.net help pagina"
 
-#: clientgui/Localization.cpp:125
+#: Localization.cpp:125
 msgid "News"
 msgstr "Nieuws"
 
-#: clientgui/Localization.cpp:127
+#: Localization.cpp:127
 msgid "climateprediction.net News"
 msgstr "Bekijk het climateprediction.net nieuws"
 
-#: clientgui/Localization.cpp:131
+#: Localization.cpp:131
 msgid "View your account information, credits, and trickles"
 msgstr "Bekijk je account informatie en de behaalde resultaten van de afgelopen periode"
 
-#: clientgui/Localization.cpp:135
+#: Localization.cpp:135
 msgid "Info about your team"
 msgstr "Bekijk informatie over je eigen team"
 
-#: clientgui/Localization.cpp:141
+#: Localization.cpp:141
 msgid "Search for help in our help system"
 msgstr "Bekijk onze help pagina's"
 
-#: clientgui/Localization.cpp:143
+#: Localization.cpp:143
 msgid "Global Statistics"
 msgstr "Statistieken"
 
-#: clientgui/Localization.cpp:145
+#: Localization.cpp:145
 msgid "Summary statistics for World Community Grid"
 msgstr "Statistieken van 'World Community Grid'"
 
-#: clientgui/Localization.cpp:147
+#: Localization.cpp:147
 msgid "My Grid"
 msgstr "Mijn 'Grid'"
 
-#: clientgui/Localization.cpp:149
+#: Localization.cpp:149
 msgid "Your statistics and settings"
 msgstr "Mijn statistieken en instellingen"
 
-#: clientgui/Localization.cpp:151
+#: Localization.cpp:151
 msgid "Device Profiles"
 msgstr "Mijn profielen"
 
-#: clientgui/Localization.cpp:153
+#: Localization.cpp:153
 msgid "Update your device settings"
 msgstr "Bekijk en werk je instellingen bij"
 
-#: clientgui/Localization.cpp:155
+#: Localization.cpp:155
 msgid "Research"
 msgstr "Onderzoek"
 
-#: clientgui/Localization.cpp:157
+#: Localization.cpp:157
 msgid "Learn about the projects hosted at World Community Grid"
 msgstr "Bekijk de projecten die door 'World Community Grid' ondersteund worden"
 
-#: clientgui/MainDocument.cpp:583
+#: MainDocument.cpp:583
 msgid "Starting client"
 msgstr "Cliënt opstarten"
 
-#: clientgui/MainDocument.cpp:591
+#: MainDocument.cpp:591
 msgid "Connecting to client"
 msgstr "Cliënt wordt verbonden"
 
-#: clientgui/MainDocument.cpp:1205
+#: MainDocument.cpp:1195
 msgid "Retrieving system state; please wait..."
 msgstr "Systeem gegevens aan het opvragen; even geduld a.u.b..."
 
-#: clientgui/MainDocument.cpp:1826
+#: MainDocument.cpp:1816
 msgid "Missing application"
 msgstr "Missende applicatie"
 
-#: clientgui/MainDocument.cpp:1827
-msgid "Please download and install the CoRD application from http://cord.sourceforge.net"
+#: MainDocument.cpp:1817
+msgid ""
+"Please download and install the CoRD application from "
+"http://cord.sourceforge.net"
 msgstr "Download en installeer a.u.b. de CoRD applicatie van http://cord.sourceforge.net"
 
-#: clientgui/MainDocument.cpp:2442
+#: MainDocument.cpp:2432
 msgid "on batteries"
 msgstr "op accu"
 
-#: clientgui/MainDocument.cpp:2443
+#: MainDocument.cpp:2433
 msgid "computer is in use"
 msgstr "computer is in gebruik"
 
-#: clientgui/MainDocument.cpp:2444
+#: MainDocument.cpp:2434
 msgid "user request"
 msgstr "op verzoek van gebruiker"
 
-#: clientgui/MainDocument.cpp:2445
+#: MainDocument.cpp:2435
 msgid "time of day"
 msgstr "tijdstip"
 
-#: clientgui/MainDocument.cpp:2446
+#: MainDocument.cpp:2436
 msgid "CPU benchmarks in progress"
 msgstr "CPU benchmark loopt"
 
-#: clientgui/MainDocument.cpp:2447
+#: MainDocument.cpp:2437
 msgid "need disk space - check preferences"
 msgstr "schijfruimte nodig - controleer voorkeuren"
 
-#: clientgui/MainDocument.cpp:2448
+#: MainDocument.cpp:2438
 msgid "computer is not in use"
 msgstr "computer is niet in gebruik"
 
-#: clientgui/MainDocument.cpp:2449
+#: MainDocument.cpp:2439
 msgid "starting up"
 msgstr "bezig met opstarten"
 
-#: clientgui/MainDocument.cpp:2450
+#: MainDocument.cpp:2440
 msgid "an exclusive app is running"
 msgstr "een exclusieve taak loopt"
 
-#: clientgui/MainDocument.cpp:2451
+#: MainDocument.cpp:2441
 msgid "CPU is busy"
 msgstr "CPU is bezet"
 
-#: clientgui/MainDocument.cpp:2452
+#: MainDocument.cpp:2442
 msgid "network bandwidth limit exceeded"
 msgstr "bandbreedte netwerk overschreden"
 
-#: clientgui/MainDocument.cpp:2453
+#: MainDocument.cpp:2443
 msgid "requested by operating system"
 msgstr "op verzoek van het besturings-systeem"
 
-#: clientgui/MainDocument.cpp:2455
+#: MainDocument.cpp:2445
 msgid "unknown reason"
 msgstr "reden onbekend"
 
-#: clientgui/MainDocument.cpp:2477
+#: MainDocument.cpp:2467
 msgid "GPU missing, "
 msgstr "Ontbrekende GPU, "
 
-#: clientgui/MainDocument.cpp:2484
+#: MainDocument.cpp:2474
 msgid "New"
 msgstr "Nieuw"
 
-#: clientgui/MainDocument.cpp:2488
+#: MainDocument.cpp:2478
 msgid "Download failed"
 msgstr "Downloaden mislukt"
 
-#: clientgui/MainDocument.cpp:2490
+#: MainDocument.cpp:2480
 msgid "Downloading"
 msgstr "Bezig met downloaden"
 
-#: clientgui/MainDocument.cpp:2492
-#: clientgui/MainDocument.cpp:2557
+#: MainDocument.cpp:2482 MainDocument.cpp:2552
 msgid " (suspended - "
 msgstr " (opgeschort - "
 
-#: clientgui/MainDocument.cpp:2500
+#: MainDocument.cpp:2490
 msgid "Project suspended by user"
 msgstr "Project opgeschort door gebruiker"
 
-#: clientgui/MainDocument.cpp:2502
+#: MainDocument.cpp:2492
 msgid "Task suspended by user"
 msgstr "Werk opgeschort door gebruiker"
 
-#: clientgui/MainDocument.cpp:2504
+#: MainDocument.cpp:2494
 msgid "Suspended - "
 msgstr "Opgeschort - "
 
-# 75%
-#: clientgui/MainDocument.cpp:2510
+#: MainDocument.cpp:2500
 msgid "GPU suspended - "
 msgstr "GPU opgeschort - "
 
-#: clientgui/MainDocument.cpp:2517
+#: MainDocument.cpp:2507
 msgid "Waiting for memory"
 msgstr "Wacht op het geheugen"
 
-#: clientgui/MainDocument.cpp:2519
+#: MainDocument.cpp:2509
 msgid "Waiting for shared memory"
 msgstr "Wacht op gedeeld geheugen"
 
-#: clientgui/MainDocument.cpp:2521
+#: MainDocument.cpp:2512
+msgid "Running, high priority"
+msgstr "Bezig met uitvoeren, hoge prioriteit"
+
+#: MainDocument.cpp:2514
 msgid "Running"
 msgstr "Bezig met uitvoeren"
 
-#: clientgui/MainDocument.cpp:2523
+#: MainDocument.cpp:2517
 msgid " (non-CPU-intensive)"
 msgstr " (niet CPU intensief)"
 
-#: clientgui/MainDocument.cpp:2526
+#: MainDocument.cpp:2520
 msgid "Waiting to run"
 msgstr "Gepauzeerd"
 
-#: clientgui/MainDocument.cpp:2528
-#: clientgui/MainDocument.cpp:2534
+#: MainDocument.cpp:2522 MainDocument.cpp:2528
 msgid "Ready to start"
 msgstr "Staat in de wacht"
 
-#: clientgui/MainDocument.cpp:2538
-msgid "Postponed: "
-msgstr "Uitgesteld: "
+#: MainDocument.cpp:2532
+msgid " (Scheduler wait: "
+msgstr " (Taakverdeling wacht: "
 
-#: clientgui/MainDocument.cpp:2541
-msgid "Postponed"
-msgstr "Uitgesteld"
+#: MainDocument.cpp:2536
+msgid " (Scheduler wait)"
+msgstr " (Taakverdeling wacht)"
 
-#: clientgui/MainDocument.cpp:2545
-msgid "Waiting for network access"
-msgstr "Wacht op netwerk toegang"
+#: MainDocument.cpp:2540
+msgid " (Waiting for network access)"
+msgstr " (Wacht op netwerk toegang)"
 
-#: clientgui/MainDocument.cpp:2549
+#: MainDocument.cpp:2544
 msgid "Computation error"
 msgstr "Berekenings fout"
 
-#: clientgui/MainDocument.cpp:2553
+#: MainDocument.cpp:2548
 msgid "Upload failed"
 msgstr "Uploaden mislukt"
 
-#: clientgui/MainDocument.cpp:2555
+#: MainDocument.cpp:2550
 msgid "Uploading"
 msgstr "Bezig met uploaden"
 
-#: clientgui/MainDocument.cpp:2566
+#: MainDocument.cpp:2561
 msgid "Aborted by user"
 msgstr "Afgebroken door gebruiker"
 
-#: clientgui/MainDocument.cpp:2569
+#: MainDocument.cpp:2564
 msgid "Aborted by project"
 msgstr "Afgebroken door project"
 
-#: clientgui/MainDocument.cpp:2572
+#: MainDocument.cpp:2567
 msgid "Aborted: not started by deadline"
 msgstr "Afgebroken: niet gestart voor deadline"
 
-#: clientgui/MainDocument.cpp:2575
+#: MainDocument.cpp:2570
 msgid "Aborted: disk limit exceeded"
 msgstr "Afgebroken: schijf limiet bereikt"
 
-#: clientgui/MainDocument.cpp:2578
+#: MainDocument.cpp:2573
 msgid "Aborted: run time limit exceeded"
 msgstr "Afgebroken: tijd limiet bereikt"
 
-#: clientgui/MainDocument.cpp:2581
+#: MainDocument.cpp:2576
 msgid "Aborted: memory limit exceeded"
 msgstr "Afgebroken: geheugen limiet bereikt"
 
-#: clientgui/MainDocument.cpp:2584
+#: MainDocument.cpp:2579
 msgid "Aborted"
 msgstr "Afgebroken"
 
-#: clientgui/MainDocument.cpp:2589
+#: MainDocument.cpp:2584
 msgid "Acknowledged"
 msgstr "Bevestigd"
 
-#: clientgui/MainDocument.cpp:2591
+#: MainDocument.cpp:2586
 msgid "Ready to report"
 msgstr "Staat klaar om te rapporteren"
 
-#: clientgui/MainDocument.cpp:2593
+#: MainDocument.cpp:2588
 #, c-format
 msgid "Error: invalid state '%d'"
 msgstr "Fout: ongeldige status '%d'"
 
-#: clientgui/NoInternetConnectionPage.cpp:179
+#: NoInternetConnectionPage.cpp:179
 msgid "No Internet connection"
 msgstr "Geen internet verbinding"
 
-#: clientgui/NoInternetConnectionPage.cpp:182
+#: NoInternetConnectionPage.cpp:182
 msgid "Please connect to the Internet and try again."
 msgstr "Maak a.u.b. een internet verbinding en probeer opnieuw."
 
-#: clientgui/NotDetectedPage.cpp:181
+#: NotDetectedPage.cpp:181
 msgid "Project not found"
 msgstr "Project niet gevonden"
 
-#: clientgui/NotDetectedPage.cpp:184
+#: 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 ""
-"Het ingevulde URL is niet van een bestaand BOINC project.\n"
-"\n"
-"Controleer a.u.b. het URL en probeer opnieuw."
+msgstr "Het ingevulde URL is niet van een bestaand BOINC project.\n\nControleer a.u.b. het URL en probeer opnieuw."
 
-#: clientgui/NotDetectedPage.cpp:188
+#: NotDetectedPage.cpp:188
 msgid "Account manager not found"
 msgstr "Account manager niet gevonden"
 
-#: clientgui/NotDetectedPage.cpp:191
+#: NotDetectedPage.cpp:191
 msgid ""
 "The URL you supplied is not that of a BOINC-based account\n"
 "manager.\n"
 "\n"
 "Please check the URL and try again."
-msgstr ""
-"Het ingevulde URL is niet van een bestaande BOINC account\n"
-"manager.\n"
-"\n"
-"Controleer a.u.b. het URL en probeer opnieuw."
+msgstr "Het ingevulde URL is niet van een bestaande BOINC account\nmanager.\n\nControleer a.u.b. het URL en probeer opnieuw."
 
-#: clientgui/NotFoundPage.cpp:181
+#: NotFoundPage.cpp:181
 msgid "Login Failed."
 msgstr "Inloggen Mislukt."
 
-#: clientgui/NotFoundPage.cpp:185
+#: NotFoundPage.cpp:185
 msgid "Check the username and password, and try again."
 msgstr "Controleer de gebruikersnaam en het wachtwoord en probeer opnieuw."
 
-#: clientgui/NotFoundPage.cpp:189
+#: NotFoundPage.cpp:189
 msgid "Check the email address and password, and try again."
 msgstr "Controleer het email adres en het wachtwoord en probeer opnieuw."
 
-#: clientgui/NoticeListCtrl.cpp:229
+#: NoticeListCtrl.cpp:222
 msgid "more..."
 msgstr "meer..."
 
-#: clientgui/ProjectInfoPage.cpp:221
+#: ProjectInfoPage.cpp:477 ProjectInfoPage.cpp:778 ProjectInfoPage.cpp:782
+msgid "All"
+msgstr "Alles"
+
+#: ProjectInfoPage.cpp:615
 msgid "Choose a project"
 msgstr "Kies een project"
 
-#: clientgui/ProjectInfoPage.cpp:228
+#: ProjectInfoPage.cpp:619
 msgid "To choose a project, click its name or type its URL below."
 msgstr "Klik op de naam om een project te kiezen of vul onder het URL in."
 
-#: clientgui/ProjectInfoPage.cpp:246
+#: ProjectInfoPage.cpp:623
 msgid "Categories:"
 msgstr "Categorie:"
 
-#: clientgui/ProjectInfoPage.cpp:267
+#: ProjectInfoPage.cpp:627 sg_ProjectPanel.cpp:89
 msgid "Projects:"
 msgstr "Projecten:"
 
-#: clientgui/ProjectInfoPage.cpp:279
+#: ProjectInfoPage.cpp:631
 msgid "Project details"
 msgstr "Project details"
 
-#: clientgui/ProjectInfoPage.cpp:291
+#: ProjectInfoPage.cpp:635
 msgid "Research area:"
 msgstr "Onderzoeks-gebied:"
 
-#: clientgui/ProjectInfoPage.cpp:302
+#: ProjectInfoPage.cpp:639
 msgid "Organization:"
 msgstr "Organisatie:"
 
-#: clientgui/ProjectInfoPage.cpp:313
+#: ProjectInfoPage.cpp:643
 msgid "Web site:"
 msgstr "Website:"
 
-#: clientgui/ProjectInfoPage.cpp:325
+#: ProjectInfoPage.cpp:647
 msgid "Supported systems:"
 msgstr "Ondersteunde systemen:"
 
-#: clientgui/ProjectInfoPage.cpp:363
+#: ProjectInfoPage.cpp:651
 msgid "Project URL:"
 msgstr "Project URL:"
 
-#: clientgui/ProjectInfoPage.cpp:499
-#: clientgui/ProjectInfoPage.cpp:754
-#: clientgui/ProjectInfoPage.cpp:758
-msgid "All"
-msgstr "Alles"
-
-#: clientgui/ProjectInfoPage.cpp:802
-msgid "This project may not have work for your type of computer.  Do you want to add it anyway?"
+#: ProjectInfoPage.cpp:826
+msgid ""
+"This project may not have work for your type of computer.  Do you want to "
+"add it anyway?"
 msgstr "Dit project heeft mogelijk geen werk voor jouw type computer.  Weet je zeker dat je verder wilt gaan?"
 
-#: clientgui/ProjectInfoPage.cpp:826
+#: ProjectInfoPage.cpp:850
 msgid "You already added this project. Please choose a different project."
 msgstr "Je hebt dit project reeds toegevoegd. Kies a.u.b. een ander project."
 
-#: clientgui/ProjectProcessingPage.cpp:321
+#: ProjectProcessingPage.cpp:321
 msgid "Communicating with project."
 msgstr "Aan het communiceren met het project."
 
-#: clientgui/ProjectProcessingPage.cpp:510
+#: ProjectProcessingPage.cpp:509
 msgid "Required files not found on the server."
 msgstr "Benodigde bestanden niet gevonden op de server."
 
-#: clientgui/ProjectProcessingPage.cpp:513
-#: clientgui/ProjectProcessingPage.cpp:586
+#: ProjectProcessingPage.cpp:512 ProjectProcessingPage.cpp:574
 msgid "An internal server error has occurred."
 msgstr "Er is een server fout opgetreden."
 
-#: clientgui/ProjectPropertiesPage.cpp:334
+#: ProjectPropertiesPage.cpp:334
 msgid ""
 "Communicating with project\n"
 "Please wait..."
-msgstr ""
-"Aan het communiceren met\n"
-"het project. Even geduld..."
-
-#: clientgui/ProjectWelcomePage.cpp:251
-#, c-format
-msgid "Welcome to %s."
-msgstr "Welkom bij %s."
-
-#: clientgui/ProjectWelcomePage.cpp:254
-msgid "You have volunteered to compute for this project:"
-msgstr "Je hebt aangegeven berekeningen te willen doen voor dit project:"
+msgstr "Aan het communiceren met\nhet project. Even geduld..."
 
-#: clientgui/ProjectWelcomePage.cpp:255
-msgid "Name:"
-msgstr "Naam:"
-
-#: clientgui/ProjectWelcomePage.cpp:258
-msgid "Home:"
-msgstr "Home:"
-
-#: clientgui/ProjectWelcomePage.cpp:262
-msgid "Description:"
-msgstr "Omschrijving:"
-
-#: clientgui/ProjectWelcomePage.cpp:265
-msgid "URL:"
-msgstr "URL:"
-
-#: clientgui/ProjectWelcomePage.cpp:268
-msgid "User:"
-msgstr "Gebruiker:"
-
-#: clientgui/ProjectWelcomePage.cpp:273
-msgid "WARNING: This project is not registered with BOINC.  Make sure you trust it before continuing."
-msgstr "WAARSCHUWING: Dit project is niet bij BOINC geregistreerd.  Controleer de betrouwbaarheid voor je verder gaat."
-
-#: clientgui/ProjectWelcomePage.cpp:277
-msgid "To continue, click Next."
-msgstr "Klik op Volgende om verder te gaan."
-
-#: clientgui/ProxyInfoPage.cpp:195
+#: ProxyInfoPage.cpp:195
 msgid "Network communication failure"
 msgstr "Netwerk communicatie fout"
 
-#: clientgui/ProxyInfoPage.cpp:199
+#: ProxyInfoPage.cpp:199
 msgid ""
 "The World Community Grid - BOINC software failed to communicate\n"
 "over the Internet. The most likely reasons are:\n"
@@ -2717,22 +2485,9 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"De World Community Grid - BOINC software kon geen verbinding\n"
-"met het internet maken. Mogelijke oorzaken zijn:\n"
-"\n"
-"1) Verbindings probleem.  Controleer de netwerk- of modemverbinding\n"
-"en klik op Vorige om opnieuw te proberen.\n"
-"\n"
-"2) Een firewall blokkeerd de World Community Grid - BOINC software.\n"
-"  Configureer je firewall om BOINC en de BOINC Manager toegang te\n"
-"verlenen tot poort 80 en poort 443, klik daarna op\n"
-"Vorige om opnieuw te proberen.\n"
-"\n"
-"3) Je maakt gebruik van een proxy server.\n"
-"Klik op Volgende op om de proxy instellingen te maken."
+msgstr "De World Community Grid - BOINC software kon geen verbinding\nmet het internet maken. Mogelijke oorzaken zijn:\n\n1) Verbindings probleem.  Controleer de netwerk- of modemverbinding\nen klik op Vorige om opnieuw te proberen.\n\n2) Een firewall blokkeerd de World Community Grid - BOINC software.\n  Configureer je firewall om BOINC en de BOINC Manager toegang te\nverlenen tot poort 80 en poort 443, klik daarna op\nVorige om opnieuw te proberen.\n\n3) Je maakt gebruik van een proxy  [...]
 
-#: clientgui/ProxyInfoPage.cpp:203
+#: ProxyInfoPage.cpp:203
 msgid ""
 "BOINC failed to communicate on the Internet.\n"
 "The most likely reasons are:\n"
@@ -2747,2260 +2502,1201 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"De BOINC software kon geen verbinding\n"
-"met het internet maken. Mogelijke oorzaken zijn:\n"
-"\n"
-"1) Verbindings probleem.  Controleer de netwerk- of modemverbinding\n"
-"en klik op Vorige om opnieuw te proberen.\n"
-"\n"
-"2) Een firewall blokkeerd de BOINC software.\n"
-"Configureer je firewall om BOINC en de BOINC Manager toegang te\n"
-"verlenen tot poort 80 en poort 443, klik daarna op\n"
-"Vorige om opnieuw te proberen.\n"
-"\n"
-"3) Je maakt gebruik van een proxy server.\n"
-"Klik op Volgende op om de proxy instellingen te maken."
+msgstr "De BOINC software kon geen verbinding\nmet het internet maken. Mogelijke oorzaken zijn:\n\n1) Verbindings probleem.  Controleer de netwerk- of modemverbinding\nen klik op Vorige om opnieuw te proberen.\n\n2) Een firewall blokkeerd de BOINC software.\nConfigureer je firewall om BOINC en de BOINC Manager toegang te\nverlenen tot poort 80 en poort 443, klik daarna op\nVorige om opnieuw te proberen.\n\n3) Je maakt gebruik van een proxy server.\nKlik op Volgende op om de proxy instell [...]
 
-#: clientgui/ProxyPage.cpp:331
+#: ProxyPage.cpp:331
 msgid "Proxy configuration"
 msgstr "Proxy configuratie"
 
-#: clientgui/ProxyPage.cpp:334
+#: ProxyPage.cpp:334
 msgid "HTTP proxy"
 msgstr "HTTP proxy"
 
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
+#: ProxyPage.cpp:337 ProxyPage.cpp:357
 msgid "Server:"
 msgstr "Server:"
 
-#: clientgui/ProxyPage.cpp:350
+#: ProxyPage.cpp:350
 msgid "Autodetect"
 msgstr "Automatisch detecteren"
 
-#: clientgui/ProxyPage.cpp:354
+#: ProxyPage.cpp:354
 msgid "SOCKS proxy"
 msgstr "SOCKS proxy"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:167
-msgid "Advanced View...\tCtrl+Shift+A"
-msgstr "Geavanceerd...\tCtrl+Shift+A"
+#: TermsOfUsePage.cpp:218
+msgid "Terms of Use"
+msgstr "Gebruiksovereenkomst"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:168
-msgid "Display the advanced graphical interface."
-msgstr "Overschakelen naar de geavanceerde weergave."
+#: TermsOfUsePage.cpp:222
+msgid "Please read the following terms of use:"
+msgstr "Lees a.u.b. de volgende gebruiksovereenkomst:"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:175
-msgid "Skin"
-msgstr "Skin"
+#: TermsOfUsePage.cpp:231
+msgid "I agree to the terms of use."
+msgstr "Ik ga akkoord met de voorwaarden."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:177
-msgid "Select the appearance of the user interface."
-msgstr "Selecteer de wijze van weergave."
+#: TermsOfUsePage.cpp:237
+msgid "I do not agree to the terms of use."
+msgstr "Ik ga niet akkoord met de voorwaarden."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:224
-#, c-format
-msgid "&%s"
-msgstr "&%s"
+#: UnavailablePage.cpp:183
+msgid "Project temporarily unavailable"
+msgstr "Project tijdelijk niet bereikbaar"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:405
-msgid "Default"
-msgstr "Standaardwaarde"
+#: UnavailablePage.cpp:186
+msgid ""
+"The project is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "Het project is tijdelijk niet bereikbaar.\n\nProbeer het later a.u.b. opnieuw."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:848
-msgid "Suspend"
-msgstr "Onderbreken"
+#: UnavailablePage.cpp:190
+msgid "Account manager temporarily unavailable"
+msgstr "Account manager tijdelijk niet bereikbaar"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:850
-msgid "Suspend Computing"
-msgstr "Berekeningen pauzeren"
+#: UnavailablePage.cpp:193
+msgid ""
+"The account manager is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "Account manager tijdelijk niet bereikbaar.\n\nProbeer het later a.u.b. opnieuw."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:851
-msgid "Resume Computing"
-msgstr "Berekeningen hervatten"
+#: ValidateAccountKey.cpp:68
+msgid "Please specify an account key to continue."
+msgstr "Vul a.u.b. een Account Key in om verder te gaan."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:867
-msgid "Notices"
-msgstr "Berichten"
+#: ValidateAccountKey.cpp:71
+msgid "Invalid Account Key; please enter a valid Account Key"
+msgstr "Ongeldige Account Key; vul a.u.b een geldige in"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:868
-msgid "Open a window to view notices from projects or BOINC"
-msgstr "Open een venster om berichten van BOINC projecten te bekijken"
+#: ValidateAccountKey.cpp:82 ValidateEmailAddress.cpp:86
+msgid "Validation conflict"
+msgstr "Geldigheids conflict"
 
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
-msgstr "Berichten ophalen; even geduld..."
+#: ValidateEmailAddress.cpp:72
+msgid "Please specify an email address"
+msgstr "Vul a.u.b. een email adres in"
 
-#: clientgui/sg_DlgMessages.cpp:132
-msgid "There are no notices at this time."
-msgstr "Op dit moment zijn er geen mededelingen."
+#: ValidateEmailAddress.cpp:75
+msgid "Invalid email address; please enter a valid email address"
+msgstr "Ongeldig email adres; vul a.u.b een geldige in"
 
-#: clientgui/sg_DlgMessages.cpp:146
-msgid "Close"
-msgstr "Sluiten"
+#: ValidateURL.cpp:69
+msgid "Missing URL"
+msgstr "Geen URL ingevuld"
 
-#: clientgui/sg_DlgMessages.cpp:394
-#, c-format
-msgid "%s - Notices"
-msgstr "%s - Berichten"
+#: ValidateURL.cpp:70
+msgid ""
+"Please specify a URL.\n"
+"For example:\n"
+"http://www.example.com/"
+msgstr "Vul a.u.b. een URL in.\nBijvoorbeeld:\nhttp://www.voorbeeld.com/"
 
-#: clientgui/sg_DlgPreferences.cpp:270
-msgid "This dialog controls preferences for this computer only."
-msgstr "In dit venster kan je de voorkeuren van deze computer instellen."
+#: ValidateURL.cpp:83 ValidateURL.cpp:87 ValidateURL.cpp:91
+#: ValidateURL.cpp:103 ValidateURL.cpp:107 ValidateURL.cpp:110
+msgid "Invalid URL"
+msgstr "Ongeldig URL ingevuld"
 
-#: clientgui/sg_DlgPreferences.cpp:275
-msgid "Click OK to set preferences."
-msgstr "Klik op 'OK' om instellingen vast te leggen."
+#: ValidateURL.cpp:84 ValidateURL.cpp:88 ValidateURL.cpp:92
+msgid ""
+"Please specify a valid URL.\n"
+"For example:\n"
+"http://boincproject.example.com"
+msgstr "Vul a.u.b. een geldig URL in.\nBijvoorbeeld:\nhttp://boincproject.voorbeeld.com"
 
-#: clientgui/sg_DlgPreferences.cpp:280
-msgid "Click Clear to restore web-based settings for all preferences listed below."
-msgstr "Klik op Wissen om de online instellingen te herstellen voor onderstaande voorkeuren."
+#: ValidateURL.cpp:104 ValidateURL.cpp:108
+#, c-format
+msgid "'%s' does not contain a valid host name."
+msgstr "'%s' bezit geen geldige host naam."
 
-#: clientgui/sg_DlgPreferences.cpp:287
-msgid "For additional settings, select Computing Preferences in the Advanced View."
-msgstr "Voor aanvullende opties klik je op 'Verwerkings voorkeuren' in de geavanceerde weergave."
+#: ValidateURL.cpp:111
+#, c-format
+msgid "'%s' does not contain a valid path."
+msgstr "'%s' bezit geen geldige bestands lokatie."
 
-#: clientgui/sg_DlgPreferences.cpp:315
-msgid "Do work only between:"
-msgstr "Werk actief tussen:"
+#: ViewMessages.cpp:84 ViewProjects.cpp:170 ViewStatistics.cpp:1978
+#: ViewTransfers.cpp:160 ViewWork.cpp:183
+msgid "Commands"
+msgstr "Opdrachten"
 
-#: clientgui/sg_DlgPreferences.cpp:337
-msgid "Connect to internet only between:"
-msgstr "Internet verbinding tussen:"
+#: ViewMessages.cpp:88
+msgid "Copy all messages"
+msgstr "Alle berichten kopiëren"
 
-#: clientgui/sg_DlgPreferences.cpp:359
-#: clientgui/sg_DlgPreferences.cpp:376
-msgid "Use no more than:"
-msgstr "Gebruik maximaal:"
+#: ViewMessages.cpp:95
+msgid "Copy selected messages"
+msgstr "Selectie kopiëren"
 
-#: clientgui/sg_DlgPreferences.cpp:372
-msgid "of disk space"
-msgstr "schijfruimte"
+#: ViewMessages.cpp:106 ViewMessages.cpp:502
+msgid "Show only this project"
+msgstr "Alleen dit project laten zien"
 
-#: clientgui/sg_DlgPreferences.cpp:389
-msgid "of the processor"
-msgstr "van processor"
+#: ViewMessages.cpp:107 ViewMessages.cpp:503
+msgid "Show only the messages for the selected project."
+msgstr "Laat alleen berichten zien van het gelecteerde project."
 
-#: clientgui/sg_DlgPreferences.cpp:393
-msgid "Do work while on battery?"
-msgstr "Actief indien op accu?"
+#: ViewMessages.cpp:164
+msgid "Messages"
+msgstr "Berichten"
 
-#: clientgui/sg_DlgPreferences.cpp:406
-msgid "Do work after idle for:"
-msgstr "Indien inactief starten na:"
+#: ViewMessages.cpp:187
+msgid "Copying all messages to the clipboard..."
+msgstr "Bezig met kopiëren van de berichten naar het klembord..."
 
-#: clientgui/sg_DlgPreferences.cpp:431
-msgid "Clear all local preferences listed above and close the dialog"
-msgstr "Wis alle bovenstaande lokale voorkeuren en sluit het venster"
-
-#: clientgui/sg_DlgPreferences.cpp:609
-#: clientgui/sg_DlgPreferences.cpp:612
-#: clientgui/sg_DlgPreferences.cpp:688
-#: clientgui/sg_DlgPreferences.cpp:692
-#: clientgui/sg_DlgPreferences.cpp:704
-#: clientgui/sg_DlgPreferences.cpp:708
-#: clientgui/sg_DlgPreferences.cpp:851
-#: clientgui/sg_DlgPreferences.cpp:862
-msgid "Anytime"
-msgstr "Altijd"
+#: ViewMessages.cpp:223
+msgid "Copying selected messages to the clipboard..."
+msgstr "Geselecteerde berichten aan het kopiëren..."
 
-#: clientgui/sg_DlgPreferences.cpp:645
-msgid "100 MB"
-msgstr "100 MB"
+#: ViewMessages.cpp:286
+msgid "Filtering messages..."
+msgstr "Berichten aan het filteren..."
 
-#: clientgui/sg_DlgPreferences.cpp:646
-msgid "200 MB"
-msgstr "200 MB"
+#: ViewMessages.cpp:494
+msgid "Show all messages"
+msgstr "Toon alle berichten"
 
-#: clientgui/sg_DlgPreferences.cpp:647
-msgid "500 MB"
-msgstr "500 MB"
+#: ViewMessages.cpp:495
+msgid "Show messages for all projects."
+msgstr "Laat berichten zien van alle projecten."
 
-#: clientgui/sg_DlgPreferences.cpp:648
-msgid "1 GB"
-msgstr "1 GB"
+#: ViewNotices.cpp:58 sg_DlgMessages.cpp:124
+msgid "Fetching notices; please wait..."
+msgstr "Berichten ophalen; even geduld..."
 
-#: clientgui/sg_DlgPreferences.cpp:649
-msgid "2 GB"
-msgstr "2 GB"
+#: ViewNotices.cpp:65 sg_DlgMessages.cpp:132
+msgid "There are no notices at this time."
+msgstr "Op dit moment zijn er geen mededelingen."
 
-#: clientgui/sg_DlgPreferences.cpp:650
-msgid "5 GB"
-msgstr "5 GB"
+#: ViewNotices.cpp:99 sg_BoincSimpleFrame.cpp:776
+msgid "Notices"
+msgstr "Berichten"
 
-#: clientgui/sg_DlgPreferences.cpp:651
-msgid "10 GB"
-msgstr "10 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:652
-msgid "20 GB"
-msgstr "20 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:653
-msgid "50 GB"
-msgstr "50 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:654
-msgid "100 GB"
-msgstr "100 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:724
-#, c-format
-msgid "%d MB"
-msgstr "%d MB"
-
-#: clientgui/sg_DlgPreferences.cpp:726
-#, c-format
-msgid "%4.2f GB"
-msgstr "%4.2f GB"
-
-#: clientgui/sg_DlgPreferences.cpp:767
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: clientgui/sg_DlgPreferences.cpp:803
-msgid "0 (Run Always)"
-msgstr "0 (Altijd actief)"
-
-#: clientgui/sg_DlgPreferences.cpp:806
-#, c-format
-msgid "%d"
-msgstr "%d"
-
-#: clientgui/sg_DlgPreferences.cpp:953
-#, c-format
-msgid "%s - Computing Preferences"
-msgstr "%s - Berekeningsvoorkeuren"
-
-#: clientgui/sg_DlgPreferences.cpp:1033
-msgid "Do you really want to clear all local preferences?\n"
-msgstr "Weet je zeker dat je de lokale voorkeuren wilt wissen?\n"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:66
-#: clientgui/ViewProjects.cpp:179
+#: ViewProjects.cpp:174 sg_ProjectCommandPopup.cpp:61
 msgid "Update"
 msgstr "Project bijwerken"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:67
-#: clientgui/ViewProjects.cpp:180
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
+#: ViewProjects.cpp:175 sg_ProjectCommandPopup.cpp:62
+msgid ""
+"Report all completed tasks, get latest credit, get latest preferences, and "
+"possibly get more tasks."
 msgstr "Rapporteer het voltooide werk, werk de punten en voorkeuren bij en verkrijg mogelijk nieuw werk."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:73
-#: clientgui/sg_ProjectCommandPopup.cpp:129
-#: clientgui/ViewProjects.cpp:187
-#: clientgui/ViewProjects.cpp:727
+#: 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
+msgid "Suspend"
+msgstr "Onderbreken"
+
+#: ViewProjects.cpp:182 ViewProjects.cpp:722 sg_ProjectCommandPopup.cpp:68
+#: sg_ProjectCommandPopup.cpp:114
 msgid "Suspend tasks for this project."
 msgstr "Het werk aan dit project onderbreken."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:78
-#: clientgui/sg_ProjectCommandPopup.cpp:136
-#: clientgui/ViewProjects.cpp:193
-#: clientgui/ViewProjects.cpp:746
+#: ViewProjects.cpp:188 ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:73
+#: sg_ProjectCommandPopup.cpp:121
 msgid "No new tasks"
 msgstr "Geen nieuw werk"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:79
-#: clientgui/ViewProjects.cpp:194
+#: ViewProjects.cpp:189 sg_ProjectCommandPopup.cpp:74
 msgid "Don't get new tasks for this project."
 msgstr "Nieuw werk opschorten voor dit project."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:200
+#: ViewProjects.cpp:195 sg_ProjectCommandPopup.cpp:79
 msgid "Reset project"
 msgstr "Project resetten"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:85
-#: clientgui/ViewProjects.cpp:201
-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."
+#: ViewProjects.cpp:196 sg_ProjectCommandPopup.cpp:80
+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 "Verwijder alle bestanden die met dit project te maken hebben en vraag nieuw werk.  Het is aan te raden het project eerst bij te werken om het voltooide werk te rapporteren."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:91
-#: clientgui/ViewProjects.cpp:208
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
+#: ViewProjects.cpp:203 sg_ProjectCommandPopup.cpp:86
+msgid ""
+"Remove this project.  Tasks in progress will be lost (use 'Update' first to "
+"report any completed tasks)."
 msgstr "Verwijder dit project.  Lopend werk zal verloren gaan (het is aan te raden het voltooide werk eerst te rapporteren)."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:96
-#: clientgui/sg_TaskCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:214
+#: ViewProjects.cpp:209 ViewWork.cpp:222 sg_ProjectCommandPopup.cpp:91
+#: sg_TaskCommandPopup.cpp:78
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:97
-#: clientgui/ViewProjects.cpp:215
+#: ViewProjects.cpp:210 sg_ProjectCommandPopup.cpp:92
 msgid "Show project details."
 msgstr "Toon project details."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:126
-#: clientgui/ViewProjects.cpp:723
-msgid "Resume tasks for this project."
-msgstr "Hervat het werk aan dit project."
+#: ViewProjects.cpp:220 ViewStatistics.cpp:450
+msgid "Account"
+msgstr "Account"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:133
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow new tasks"
-msgstr "Nieuw werk toestaan"
+#: ViewProjects.cpp:222
+msgid "Work done"
+msgstr "Punten totaal"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:134
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow fetching new tasks for this project."
-msgstr "Sta nieuw werk toe voor dit project."
+#: ViewProjects.cpp:223
+msgid "Avg. work done"
+msgstr "Punten gemiddelde"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:137
-#: clientgui/ViewProjects.cpp:746
-msgid "Don't fetch new tasks for this project."
-msgstr "Nieuw werk opschorten voor dit project."
+#: ViewProjects.cpp:225 ViewTransfers.cpp:188 ViewWork.cpp:234
+msgid "Status"
+msgstr "Status"
+
+#: ViewProjects.cpp:250
+msgid "Projects"
+msgstr "Projecten"
+
+#: ViewProjects.cpp:302
+msgid "Updating project..."
+msgstr "Bezig met bijwerken..."
+
+#: ViewProjects.cpp:344
+msgid "Resuming project..."
+msgstr "Bezig met hervatten..."
+
+#: ViewProjects.cpp:348
+msgid "Suspending project..."
+msgstr "Bezig met opschorten..."
+
+#: ViewProjects.cpp:385
+msgid "Telling project to allow additional task downloads..."
+msgstr "Bezig met het toestaan van aanvullende downloads..."
+
+#: ViewProjects.cpp:389
+msgid "Telling project to not fetch any additional tasks..."
+msgstr "Geen nieuw werk verzoek aan het doorgeven..."
+
+#: ViewProjects.cpp:425
+msgid "Resetting project..."
+msgstr "Bezig project te resetten..."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:229
-#: clientgui/ViewProjects.cpp:443
+#: ViewProjects.cpp:438 sg_ProjectCommandPopup.cpp:214
 #, c-format
 msgid "Are you sure you want to reset project '%s'?"
 msgstr "Weet je zeker dat je het project '%s' wilt resetten?"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:235
-#: clientgui/ViewProjects.cpp:449
+#: ViewProjects.cpp:444 sg_ProjectCommandPopup.cpp:220
 msgid "Reset Project"
 msgstr "Project Resetten"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:266
-#: clientgui/ViewProjects.cpp:501
+#: ViewProjects.cpp:483
+msgid "Removing project..."
+msgstr "Bezig met verwijderen..."
+
+#: ViewProjects.cpp:496 sg_ProjectCommandPopup.cpp:251
 #, c-format
 msgid "Are you sure you want to remove project '%s'?"
 msgstr "Weet je zeker dat je het project '%s' wilt verwijderen?"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:272
-#: clientgui/ViewProjects.cpp:507
+#: ViewProjects.cpp:502 sg_ProjectCommandPopup.cpp:257
 msgid "Remove Project"
 msgstr "Verwijder Project"
 
-#: clientgui/sg_ProjectPanel.cpp:72
-msgid "Add Project"
-msgstr "Project toevoegen"
+#: ViewProjects.cpp:543 ViewWork.cpp:599
+msgid "Launching browser..."
+msgstr "Browser wordt geopend..."
 
-#: clientgui/sg_ProjectPanel.cpp:73
-msgid "Synchronize"
-msgstr "Bijwerken"
+#: ViewProjects.cpp:718 sg_ProjectCommandPopup.cpp:111
+msgid "Resume tasks for this project."
+msgstr "Hervat het werk aan dit project."
 
-#: clientgui/sg_ProjectPanel.cpp:74
-msgid "Work done for this project"
-msgstr "Voltooid werk bij dit project"
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:118
+msgid "Allow new tasks"
+msgstr "Nieuw werk toestaan"
 
-#: clientgui/sg_ProjectPanel.cpp:77
-msgid "Synchronize projects with account manager system"
-msgstr "Projecten bijwerken met behulp van de account manager"
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:119
+msgid "Allow fetching new tasks for this project."
+msgstr "Sta nieuw werk toe voor dit project."
 
-#: clientgui/sg_ProjectPanel.cpp:124
-msgid "Select a project to access with the controls below"
-msgstr "Selecteer het gewenste project middels onderstaande bediening"
+#: ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:122
+msgid "Don't fetch new tasks for this project."
+msgstr "Nieuw werk opschorten voor dit project."
 
-#: clientgui/sg_ProjectPanel.cpp:145
-msgid "Project Web Pages"
-msgstr "Project Websites"
+#: ViewProjects.cpp:1058
+msgid "Requested by user"
+msgstr "Op verzoek van gebruiker"
 
-#: clientgui/sg_ProjectPanel.cpp:149
-msgid "Project Commands"
-msgstr "Project specifieke instructies"
+#: ViewProjects.cpp:1059
+msgid "To fetch work"
+msgstr "Om werk te gaan uitvoeren"
 
-#: clientgui/sg_ProjectPanel.cpp:276
-#, c-format
-msgid "Pop up a menu of web sites for project %s"
-msgstr "Toon pop-up menu met websites voor %s"
+#: ViewProjects.cpp:1060
+msgid "To report completed tasks"
+msgstr "Om voltooide taken te rapporteren"
 
-#: clientgui/sg_ProjectPanel.cpp:278
-#, c-format
-msgid "Pop up a menu of commands to apply to project %s"
-msgstr "Toon toepassings instructies voor %s in een pop-up menu"
+#: ViewProjects.cpp:1061
+msgid "To send trickle-up message"
+msgstr "Om een voortgangsrapport in te dienen"
 
-#: clientgui/sg_TaskCommandPopup.cpp:66
-msgid "Show graphics"
-msgstr "Grafische weergave"
+#: ViewProjects.cpp:1062
+msgid "Requested by account manager"
+msgstr "Op verzoek van accountmanager"
 
-#: clientgui/sg_TaskCommandPopup.cpp:67
-msgid "Show application graphics in a window."
-msgstr "Bekijk de grafische weergave van dit project."
+#: ViewProjects.cpp:1063
+msgid "Project initialization"
+msgstr "Project initialisatie"
 
-#: clientgui/sg_TaskCommandPopup.cpp:73
-msgid "Suspend this task."
-msgstr "Werk onderbreken."
+#: ViewProjects.cpp:1064
+msgid "Requested by project"
+msgstr "Op verzoek van project"
 
-#: clientgui/sg_TaskCommandPopup.cpp:78
-msgid "Abort"
-msgstr "Werk afbreken"
+#: ViewProjects.cpp:1065
+msgid "Unknown reason"
+msgstr "Onbekende oorzaak"
 
-#: clientgui/sg_TaskCommandPopup.cpp:79
-msgid "Abandon this task. You will get no credit for it."
-msgstr "Deze taak afbreken. Er worden geen punten toegekend."
+#: ViewProjects.cpp:1079
+msgid "Suspended by user"
+msgstr "Opgeschort door gebruiker"
 
-#: clientgui/sg_TaskCommandPopup.cpp:85
-msgid "Show task details."
-msgstr "Toon taak details."
+#: ViewProjects.cpp:1082
+msgid "Won't get new tasks"
+msgstr "Geen nieuw werk gevraagd"
 
-#: clientgui/sg_TaskCommandPopup.cpp:119
-msgid "Resume work for this task."
-msgstr "Hervat werk voor deze taak."
+#: ViewProjects.cpp:1085
+msgid "Project ended - OK to remove"
+msgstr "Project gestopt - OK om te verwijderen"
 
-#: clientgui/sg_TaskCommandPopup.cpp:123
-msgid "Suspend work for this task."
-msgstr "Onderbreek werk voor deze taak."
+#: ViewProjects.cpp:1088
+msgid "Will remove when tasks done"
+msgstr "Wordt verwijderd als werk gereed is"
 
-#: clientgui/sg_TaskCommandPopup.cpp:267
-#, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %.1lf%%, Status: %s)"
-msgstr ""
-"Weet je zeker dat je de taak '%s' wilt annuleren?\n"
-"(Voortgang: %.1lf%%s, Status: %s)"
+#: ViewProjects.cpp:1091
+msgid "Scheduler request pending"
+msgstr "Bijwerk verzoek aan het afwachten"
 
-#: clientgui/sg_TaskCommandPopup.cpp:272
-msgid "Abort task"
-msgstr "Annuleer taak"
+#: ViewProjects.cpp:1097
+msgid "Scheduler request in progress"
+msgstr "Bijwerk verzoek wordt uitgevoerd"
 
-#: clientgui/sg_TaskPanel.cpp:468
-msgid "You don't have any projects.  Please Add a Project."
-msgstr "Geen projecten aanwezig. Voeg  a.u.b. een project toe."
+#: ViewProjects.cpp:1100
+msgid "Trickle up message pending"
+msgstr "Trickle up bericht aan het afwachten"
 
-#: clientgui/sg_TaskPanel.cpp:469
-msgid "Not available"
-msgstr "Niet beschikbaar"
+#: ViewProjects.cpp:1106
+msgid "Communication deferred "
+msgstr "Communicatie uitgesteld "
 
-#: clientgui/sg_TaskPanel.cpp:480
-msgid "Tasks:"
-msgstr "Taken:"
+#: ViewResources.cpp:62
+msgid "Total disk usage"
+msgstr "Totaal schijfgebruik"
 
-#: clientgui/sg_TaskPanel.cpp:486
-msgid "Select a task to access"
-msgstr "Kies de te beheren taak"
+#: ViewResources.cpp:83
+msgid "Disk usage by BOINC projects"
+msgstr "Schijfgebruik door BOINC projecten"
 
-#: clientgui/sg_TaskPanel.cpp:497
-msgid "From:"
-msgstr "Van:"
+#: ViewResources.cpp:116
+msgid "Disk"
+msgstr "Schijfgebruik"
 
-#: clientgui/sg_TaskPanel.cpp:551
-msgid "This task's progress"
-msgstr "Voortgang van deze taak"
+#: ViewResources.cpp:249
+msgid "no projects: 0 bytes used"
+msgstr "geen projecten: 0 bytes in gebruik"
 
-#: clientgui/sg_TaskPanel.cpp:569
-msgid "Task Commands"
-msgstr "Taak specifieke instructies"
+#: ViewResources.cpp:286
+msgid "used by BOINC: "
+msgstr "gebruikt door BOINC: "
 
-#: clientgui/sg_TaskPanel.cpp:570
-msgid "Pop up a menu of commands to apply to this task"
-msgstr "Toon toepassings instructies voor deze taak in een pop-up menu"
+#: ViewResources.cpp:296
+msgid "free, available to BOINC: "
+msgstr "vrij, beschikbaar voor BOINC: "
 
-#: clientgui/sg_TaskPanel.cpp:705
-#, c-format
-msgid "Application: %s"
-msgstr "Programma: %s"
+#: ViewResources.cpp:306
+msgid "free, not available to BOINC: "
+msgstr "vrij, niet beschikbaar voor BOINC: "
 
-#: clientgui/sg_TaskPanel.cpp:728
-#, c-format
-msgid "%.3f%%"
-msgstr "%.3f%%"
+#: ViewResources.cpp:316
+msgid "free: "
+msgstr "vrij: "
 
-#: clientgui/sg_TaskPanel.cpp:736
-msgid "Application: Not available"
-msgstr "Programma: Niet beschikbaar"
+#: ViewResources.cpp:326
+msgid "used by other programs: "
+msgstr "gebruikt door anderen: "
 
-#: clientgui/sg_TaskPanel.cpp:836
-msgid "Not Available"
-msgstr "Niet beschikbaar"
+#: ViewStatistics.cpp:1205
+msgid "User Total"
+msgstr "Gebruikers Totaal"
 
-#: clientgui/sg_TaskPanel.cpp:851
-#, c-format
-msgid "Elapsed: %s"
-msgstr "Verstreken: %s"
+#: ViewStatistics.cpp:1206
+msgid "User Average"
+msgstr "Gebruikers Gemiddelde"
 
-#: clientgui/sg_TaskPanel.cpp:865
-#, c-format
-msgid "Remaining (estimated): %s"
-msgstr "Nog te gaan (geschat): %s"
+#: ViewStatistics.cpp:1207
+msgid "Host Total"
+msgstr "Computer Totaal"
+
+#: ViewStatistics.cpp:1208
+msgid "Host Average"
+msgstr "Computer Gemiddelde"
 
-#: clientgui/sg_TaskPanel.cpp:880
+#: ViewStatistics.cpp:1355
 #, c-format
-msgid "Status: %s"
-msgstr "Status: %s"
+msgid "Last update: %.0f days ago"
+msgstr "Laatste update: %.0f dagen geleden"
 
-#: clientgui/sg_TaskPanel.cpp:1227
-msgid "Retrieving current status."
-msgstr "Status aan het opvragen."
+#: ViewStatistics.cpp:1982
+msgid "Show user total"
+msgstr "Gebruikers totaal"
 
-#: clientgui/sg_TaskPanel.cpp:1233
-msgid "Downloading work from the server."
-msgstr "Werk wordt gedownload."
+#: ViewStatistics.cpp:1983
+msgid "Show total credit for user"
+msgstr "Gebruikers totaal bekijken"
 
-#: clientgui/sg_TaskPanel.cpp:1238
-msgid "Processing Suspended:  Running On Batteries."
-msgstr "Werk opgeschort:  Computer op accu."
+#: ViewStatistics.cpp:1989
+msgid "Show user average"
+msgstr "Gebruikers gemiddelde"
 
-#: clientgui/sg_TaskPanel.cpp:1240
-msgid "Processing Suspended:  User Active."
-msgstr "Werk opgeschort:  Gebruiker actief."
+#: ViewStatistics.cpp:1990
+msgid "Show average credit for user"
+msgstr "Gebruikers gemiddelde bekijken"
 
-#: clientgui/sg_TaskPanel.cpp:1242
-msgid "Processing Suspended:  User paused processing."
-msgstr "Werk opgeschort:  Gepauzeerd door gebruiker."
+#: ViewStatistics.cpp:1996
+msgid "Show host total"
+msgstr "Computer totaal"
 
-#: clientgui/sg_TaskPanel.cpp:1244
-msgid "Processing Suspended:  Time of Day."
-msgstr "Werk opgeschort:  Tijds-instellingen."
+#: ViewStatistics.cpp:1997
+msgid "Show total credit for host"
+msgstr "Computer totaal bekijken"
 
-#: clientgui/sg_TaskPanel.cpp:1246
-msgid "Processing Suspended:  Benchmarks Running."
-msgstr "Werk opgeschort:  Benchmark loopt."
+#: ViewStatistics.cpp:2003
+msgid "Show host average"
+msgstr "Computer gemiddelde"
 
-#: clientgui/sg_TaskPanel.cpp:1248
-msgid "Processing Suspended."
-msgstr "Werk opgeschort."
-
-#: clientgui/sg_TaskPanel.cpp:1252
-msgid "Waiting to contact project servers."
-msgstr "Wacht op project server verbinding."
-
-#: clientgui/sg_TaskPanel.cpp:1256
-#: clientgui/sg_TaskPanel.cpp:1265
-msgid "Retrieving current status"
-msgstr "Status aan het opvragen"
-
-#: clientgui/sg_TaskPanel.cpp:1260
-msgid "No work available to process"
-msgstr "Geen werk aanwezig"
-
-#: clientgui/sg_TaskPanel.cpp:1262
-msgid "Unable to connect to the core client"
-msgstr "Client verbinding niet aanwezig"
-
-#: clientgui/TermsOfUsePage.cpp:218
-msgid "Terms of Use"
-msgstr "Gebruiksovereenkomst"
-
-#: clientgui/TermsOfUsePage.cpp:222
-msgid "Please read the following terms of use:"
-msgstr "Lees a.u.b. de volgende gebruiksovereenkomst:"
-
-#: clientgui/TermsOfUsePage.cpp:231
-msgid "I agree to the terms of use."
-msgstr "Ik ga akkoord met de voorwaarden."
-
-#: clientgui/TermsOfUsePage.cpp:237
-msgid "I do not agree to the terms of use."
-msgstr "Ik ga niet akkoord met de voorwaarden."
-
-#: clientgui/UnavailablePage.cpp:183
-msgid "Project temporarily unavailable"
-msgstr "Project tijdelijk niet bereikbaar"
-
-#: clientgui/UnavailablePage.cpp:186
-msgid ""
-"The project is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-"Het project is tijdelijk niet bereikbaar.\n"
-"\n"
-"Probeer het later a.u.b. opnieuw."
-
-#: clientgui/UnavailablePage.cpp:190
-msgid "Account manager temporarily unavailable"
-msgstr "Account manager tijdelijk niet bereikbaar"
-
-#: clientgui/UnavailablePage.cpp:193
-msgid ""
-"The account manager is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-"Account manager tijdelijk niet bereikbaar.\n"
-"\n"
-"Probeer het later a.u.b. opnieuw."
-
-#: clientgui/ValidateAccountKey.cpp:68
-msgid "Please specify an account key to continue."
-msgstr "Vul a.u.b. een Account Key in om verder te gaan."
-
-#: clientgui/ValidateAccountKey.cpp:71
-msgid "Invalid Account Key; please enter a valid Account Key"
-msgstr "Ongeldige Account Key; vul a.u.b een geldige in"
-
-#: clientgui/ValidateAccountKey.cpp:82
-#: clientgui/ValidateEmailAddress.cpp:86
-msgid "Validation conflict"
-msgstr "Geldigheids conflict"
-
-#: clientgui/ValidateEmailAddress.cpp:72
-msgid "Please specify an email address"
-msgstr "Vul a.u.b. een email adres in"
-
-#: clientgui/ValidateEmailAddress.cpp:75
-msgid "Invalid email address; please enter a valid email address"
-msgstr "Ongeldig email adres; vul a.u.b een geldige in"
-
-#: clientgui/ValidateURL.cpp:69
-msgid "Missing URL"
-msgstr "Geen URL ingevuld"
-
-#: clientgui/ValidateURL.cpp:70
-msgid ""
-"Please specify a URL.\n"
-"For example:\n"
-"http://www.example.com/"
-msgstr ""
-"Vul a.u.b. een URL in.\n"
-"Bijvoorbeeld:\n"
-"http://www.voorbeeld.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 "Ongeldig URL ingevuld"
-
-#: 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 ""
-"Vul a.u.b. een geldig URL in.\n"
-"Bijvoorbeeld:\n"
-"http://boincproject.voorbeeld.com"
-
-#: clientgui/ValidateURL.cpp:104
-#: clientgui/ValidateURL.cpp:108
-#, c-format
-msgid "'%s' does not contain a valid host name."
-msgstr "'%s' bezit geen geldige host naam."
-
-#: clientgui/ValidateURL.cpp:111
-#, c-format
-msgid "'%s' does not contain a valid path."
-msgstr "'%s' bezit geen geldige bestands lokatie."
-
-#: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:175
-msgid "Commands"
-msgstr "Opdrachten"
-
-#: clientgui/ViewMessages.cpp:88
-msgid "Copy all messages"
-msgstr "Alle berichten kopiëren"
-
-#: clientgui/ViewMessages.cpp:95
-msgid "Copy selected messages"
-msgstr "Selectie kopiëren"
-
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
-msgid "Show only this project"
-msgstr "Alleen dit project laten zien"
-
-#: clientgui/ViewMessages.cpp:107
-#: clientgui/ViewMessages.cpp:503
-msgid "Show only the messages for the selected project."
-msgstr "Laat alleen berichten zien van het gelecteerde project."
-
-#: clientgui/ViewMessages.cpp:164
-msgid "Messages"
-msgstr "Berichten"
-
-#: clientgui/ViewMessages.cpp:187
-msgid "Copying all messages to the clipboard..."
-msgstr "Bezig met kopiëren van de berichten naar het klembord..."
-
-#: clientgui/ViewMessages.cpp:223
-msgid "Copying selected messages to the clipboard..."
-msgstr "Geselecteerde berichten aan het kopiëren..."
-
-#: clientgui/ViewMessages.cpp:286
-msgid "Filtering messages..."
-msgstr "Berichten aan het filteren..."
-
-#: clientgui/ViewMessages.cpp:494
-msgid "Show all messages"
-msgstr "Toon alle berichten"
-
-#: clientgui/ViewMessages.cpp:495
-msgid "Show messages for all projects."
-msgstr "Laat berichten zien van alle projecten."
-
-#: clientgui/ViewProjects.cpp:225
-msgid "Account"
-msgstr "Account"
-
-#: clientgui/ViewProjects.cpp:227
-msgid "Work done"
-msgstr "Punten totaal"
-
-#: clientgui/ViewProjects.cpp:228
-msgid "Avg. work done"
-msgstr "Punten gemiddelde"
-
-#: clientgui/ViewProjects.cpp:230
-msgid "Status"
-msgstr "Status"
-
-#: clientgui/ViewProjects.cpp:255
-msgid "Projects"
-msgstr "Projecten"
-
-#: clientgui/ViewProjects.cpp:307
-msgid "Updating project..."
-msgstr "Bezig met bijwerken..."
-
-#: clientgui/ViewProjects.cpp:349
-msgid "Resuming project..."
-msgstr "Bezig met hervatten..."
-
-#: clientgui/ViewProjects.cpp:353
-msgid "Suspending project..."
-msgstr "Bezig met opschorten..."
-
-#: clientgui/ViewProjects.cpp:390
-msgid "Telling project to allow additional task downloads..."
-msgstr "Bezig met het toestaan van aanvullende downloads..."
-
-#: clientgui/ViewProjects.cpp:394
-msgid "Telling project to not fetch any additional tasks..."
-msgstr "Geen nieuw werk verzoek aan het doorgeven..."
-
-#: clientgui/ViewProjects.cpp:430
-msgid "Resetting project..."
-msgstr "Bezig project te resetten..."
-
-#: clientgui/ViewProjects.cpp:488
-msgid "Removing project..."
-msgstr "Bezig met verwijderen..."
-
-#: clientgui/ViewProjects.cpp:548
-msgid "Launching browser..."
-msgstr "Browser wordt geopend..."
-
-#: clientgui/ViewProjects.cpp:1063
-msgid "Requested by user"
-msgstr "Op verzoek van gebruiker"
-
-#: clientgui/ViewProjects.cpp:1064
-msgid "To fetch work"
-msgstr "Om werk te gaan uitvoeren"
-
-#: clientgui/ViewProjects.cpp:1065
-msgid "To report completed tasks"
-msgstr "Om voltooide taken te rapporteren"
-
-#: clientgui/ViewProjects.cpp:1066
-msgid "To send trickle-up message"
-msgstr "Om een voortgangsrapport in te dienen"
-
-#: clientgui/ViewProjects.cpp:1067
-msgid "Requested by account manager"
-msgstr "Op verzoek van accountmanager"
-
-#: clientgui/ViewProjects.cpp:1068
-msgid "Project initialization"
-msgstr "Project initialisatie"
-
-#: clientgui/ViewProjects.cpp:1069
-msgid "Requested by project"
-msgstr "Op verzoek van project"
-
-#: clientgui/ViewProjects.cpp:1070
-msgid "Unknown reason"
-msgstr "Onbekende oorzaak"
-
-#: clientgui/ViewProjects.cpp:1084
-msgid "Suspended by user"
-msgstr "Opgeschort door gebruiker"
-
-#: clientgui/ViewProjects.cpp:1087
-msgid "Won't get new tasks"
-msgstr "Geen nieuw werk gevraagd"
-
-#: clientgui/ViewProjects.cpp:1090
-msgid "Project ended - OK to remove"
-msgstr "Project gestopt - OK om te verwijderen"
-
-#: clientgui/ViewProjects.cpp:1093
-msgid "Will remove when tasks done"
-msgstr "Wordt verwijderd als werk gereed is"
-
-#: clientgui/ViewProjects.cpp:1096
-msgid "Scheduler request pending"
-msgstr "Bijwerk verzoek aan het afwachten"
-
-#: clientgui/ViewProjects.cpp:1102
-msgid "Scheduler request in progress"
-msgstr "Bijwerk verzoek wordt uitgevoerd"
-
-#: clientgui/ViewProjects.cpp:1105
-msgid "Trickle up message pending"
-msgstr "Trickle up bericht aan het afwachten"
-
-#: clientgui/ViewProjects.cpp:1111
-msgid "Communication deferred "
-msgstr "Communicatie uitgesteld "
-
-#: clientgui/ViewResources.cpp:62
-msgid "Total disk usage"
-msgstr "Totaal schijfgebruik"
-
-#: clientgui/ViewResources.cpp:83
-msgid "Disk usage by BOINC projects"
-msgstr "Schijfgebruik door BOINC projecten"
-
-#: clientgui/ViewResources.cpp:116
-msgid "Disk"
-msgstr "Schijfgebruik"
-
-#: clientgui/ViewResources.cpp:225
-msgid "no projects: 0 bytes used"
-msgstr "geen projecten: 0 bytes in gebruik"
-
-#: clientgui/ViewResources.cpp:262
-msgid "used by BOINC: "
-msgstr "gebruikt door BOINC: "
-
-#: clientgui/ViewResources.cpp:272
-msgid "free, available to BOINC: "
-msgstr "vrij, beschikbaar voor BOINC: "
-
-#: clientgui/ViewResources.cpp:282
-msgid "free, not available to BOINC: "
-msgstr "vrij, niet beschikbaar voor BOINC: "
-
-#: clientgui/ViewResources.cpp:292
-msgid "free: "
-msgstr "vrij: "
-
-#: clientgui/ViewResources.cpp:302
-msgid "used by other programs: "
-msgstr "gebruikt door anderen: "
-
-#: clientgui/ViewStatistics.cpp:1181
-msgid "User Total"
-msgstr "Gebruikers Totaal"
-
-#: clientgui/ViewStatistics.cpp:1182
-msgid "User Average"
-msgstr "Gebruikers Gemiddelde"
-
-#: clientgui/ViewStatistics.cpp:1183
-msgid "Host Total"
-msgstr "Computer Totaal"
-
-#: clientgui/ViewStatistics.cpp:1184
-msgid "Host Average"
-msgstr "Computer Gemiddelde"
-
-#: clientgui/ViewStatistics.cpp:1331
-#, c-format
-msgid "Last update: %.0f days ago"
-msgstr "Laatste update: %.0f dagen geleden"
-
-#: clientgui/ViewStatistics.cpp:1956
-msgid "Show user total"
-msgstr "Gebruikers totaal"
-
-#: clientgui/ViewStatistics.cpp:1957
-msgid "Show total credit for user"
-msgstr "Gebruikers totaal bekijken"
-
-#: clientgui/ViewStatistics.cpp:1963
-msgid "Show user average"
-msgstr "Gebruikers gemiddelde"
-
-#: clientgui/ViewStatistics.cpp:1964
-msgid "Show average credit for user"
-msgstr "Gebruikers gemiddelde bekijken"
-
-#: clientgui/ViewStatistics.cpp:1970
-msgid "Show host total"
-msgstr "Computer totaal"
-
-#: clientgui/ViewStatistics.cpp:1971
-msgid "Show total credit for host"
-msgstr "Computer totaal bekijken"
-
-#: clientgui/ViewStatistics.cpp:1977
-msgid "Show host average"
-msgstr "Computer gemiddelde"
-
-#: clientgui/ViewStatistics.cpp:1978
+#: ViewStatistics.cpp:2004
 msgid "Show average credit for host"
 msgstr "Computer gemiddelde bekijken"
 
-#: clientgui/ViewStatistics.cpp:1987
+#: ViewStatistics.cpp:2013
 msgid "< &Previous project"
 msgstr "< Vorige &project"
 
-#: clientgui/ViewStatistics.cpp:1988
+#: ViewStatistics.cpp:2014
 msgid "Show chart for previous project"
 msgstr "Bekijk de statistieken van het vorige project"
 
-#: clientgui/ViewStatistics.cpp:1993
+#: ViewStatistics.cpp:2019
 msgid "&Next project >"
 msgstr "Volge&nde project >"
 
-#: clientgui/ViewStatistics.cpp:1994
+#: ViewStatistics.cpp:2020
 msgid "Show chart for next project"
 msgstr "Bekijk de statistieken van het volgende project"
 
-#: clientgui/ViewStatistics.cpp:2000
-#: clientgui/ViewStatistics.cpp:2390
+#: ViewStatistics.cpp:2026 ViewStatistics.cpp:2416
 msgid "Hide project list"
 msgstr "Verberg project lijst"
 
-#: clientgui/ViewStatistics.cpp:2001
-#: clientgui/ViewStatistics.cpp:2390
+#: ViewStatistics.cpp:2027 ViewStatistics.cpp:2416
 msgid "Use entire area for graphs"
 msgstr "Gebruik volledige ruimte voor grafieken"
 
-#: clientgui/ViewStatistics.cpp:2006
+#: ViewStatistics.cpp:2032
 msgid "Mode view"
 msgstr "Weergave modus"
 
-#: clientgui/ViewStatistics.cpp:2010
+#: ViewStatistics.cpp:2036
 msgid "One project"
 msgstr "Enkel project"
 
-#: clientgui/ViewStatistics.cpp:2011
+#: ViewStatistics.cpp:2037
 msgid "Show one chart with selected project"
 msgstr "Bekijk de grafiek van het geselecteerde project"
 
-#: clientgui/ViewStatistics.cpp:2017
+#: ViewStatistics.cpp:2043
 msgid "All projects (separate)"
 msgstr "Alle projecten (apart)"
 
-#: clientgui/ViewStatistics.cpp:2018
+#: ViewStatistics.cpp:2044
 msgid "Show all projects, one chart per project"
 msgstr "Bekijk alle projecten, per project een aparte grafiek"
 
-#: clientgui/ViewStatistics.cpp:2024
+#: ViewStatistics.cpp:2050
 msgid "All projects (together)"
 msgstr "Alle projecten (samen)"
 
-#: clientgui/ViewStatistics.cpp:2025
+#: ViewStatistics.cpp:2051
 msgid "Show one chart with all projects"
 msgstr "Bekijk alle projecten samen gebracht in één grafiek"
 
-#: clientgui/ViewStatistics.cpp:2031
+#: ViewStatistics.cpp:2057
 msgid "All projects (sum)"
 msgstr "Alle projecten (som)"
 
-#: clientgui/ViewStatistics.cpp:2032
+#: ViewStatistics.cpp:2058
 msgid "Show one chart with sum of projects"
 msgstr "Bekijk alle projecten opgeteld in één grafiek"
 
-#: clientgui/ViewStatistics.cpp:2053
+#: ViewStatistics.cpp:2079
 msgid "Statistics"
 msgstr "Statistieken"
 
-#: 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
+#: 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
 msgid "Updating charts..."
 msgstr "Grafieken aan het bijwerken..."
 
-#: clientgui/ViewStatistics.cpp:2394
+#: ViewStatistics.cpp:2420
 msgid "Show project list"
 msgstr "Laat project lijst zien"
 
-#: clientgui/ViewStatistics.cpp:2394
+#: ViewStatistics.cpp:2420
 msgid "Uses smaller area for graphs"
 msgstr "Beperk ruimte voor grafieken"
 
-#: clientgui/ViewTransfers.cpp:169
+#: ViewTransfers.cpp:164
 msgid "Retry Now"
 msgstr "Probeer opnieuw"
 
-#: clientgui/ViewTransfers.cpp:170
+#: ViewTransfers.cpp:165
 msgid "Retry the file transfer now"
 msgstr "Overdracht opnieuw proberen"
 
-#: clientgui/ViewTransfers.cpp:176
+#: ViewTransfers.cpp:171
 msgid "Abort Transfer"
 msgstr "Overdracht afbreken"
 
-#: clientgui/ViewTransfers.cpp:177
+#: ViewTransfers.cpp:172
 msgid "Abort this file transfer.  You won't get credit for the task."
 msgstr "Overdracht afbreken.   Er worden geen punten toegekend."
 
-#: clientgui/ViewTransfers.cpp:188
+#: ViewTransfers.cpp:183
 msgid "File"
 msgstr "Bestand"
 
-#: clientgui/ViewTransfers.cpp:189
-#: clientgui/ViewWork.cpp:238
+#: ViewTransfers.cpp:184 ViewWork.cpp:233
 msgid "Progress"
 msgstr "Voortgang"
 
-#: clientgui/ViewTransfers.cpp:190
+#: ViewTransfers.cpp:185
 msgid "Size"
 msgstr "Grootte"
 
-#: clientgui/ViewTransfers.cpp:191
+#: ViewTransfers.cpp:186
 msgid "Elapsed Time"
 msgstr "Verstreken tijd"
 
-#: clientgui/ViewTransfers.cpp:192
+#: ViewTransfers.cpp:187
 msgid "Speed"
 msgstr "Snelheid"
 
-#: clientgui/ViewTransfers.cpp:218
+#: ViewTransfers.cpp:213
 msgid "Transfers"
 msgstr "Overdracht"
 
-#: clientgui/ViewTransfers.cpp:285
+#: ViewTransfers.cpp:280
 msgid "Network activity is suspended - "
 msgstr "Netwerk gebruik opgeschort - "
 
-#: clientgui/ViewTransfers.cpp:287
+#: ViewTransfers.cpp:282
 msgid ""
 ".\n"
 "You can enable it using the Activity menu."
-msgstr ""
-".\n"
-"Activeren is mogelijk via het \"Prestaties\" menu."
+msgstr ".\nActiveren is mogelijk via het \"Prestaties\" menu."
 
-#: clientgui/ViewTransfers.cpp:290
+#: ViewTransfers.cpp:285
 msgid "BOINC"
 msgstr "BOINC"
 
-#: clientgui/ViewTransfers.cpp:297
+#: ViewTransfers.cpp:292
 msgid "Retrying transfer now..."
 msgstr "Bezig met overdracht..."
 
-#: clientgui/ViewTransfers.cpp:335
+#: ViewTransfers.cpp:330
 msgid "Aborting transfer..."
 msgstr "Bezig met afbreken overdracht..."
 
-#: clientgui/ViewTransfers.cpp:348
+#: ViewTransfers.cpp:343
 #, 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 ""
-"Weet je zeker dat je de overdracht van '%s' wilt annuleren?\n"
-"Een overdracht annuleren heeft tot gevolg dat het werk niet\n"
-"meer geldig is en er zullen geen punten worden gegeven."
+msgstr "Weet je zeker dat je de overdracht van '%s' wilt annuleren?\nEen overdracht annuleren heeft tot gevolg dat het werk niet\nmeer geldig is en er zullen geen punten worden gegeven."
 
-#: clientgui/ViewTransfers.cpp:354
+#: ViewTransfers.cpp:349
 msgid "Abort File Transfer"
 msgstr "Annuleer Bestands Overdracht"
 
-#: clientgui/ViewTransfers.cpp:785
+#: ViewTransfers.cpp:780
 msgid "Upload"
 msgstr "Upload"
 
-#: clientgui/ViewTransfers.cpp:785
+#: ViewTransfers.cpp:780
 msgid "Download"
 msgstr "Download"
 
-#: clientgui/ViewTransfers.cpp:789
+#: ViewTransfers.cpp:784
 msgid "retry in "
 msgstr "opnieuw proberen over "
 
-#: clientgui/ViewTransfers.cpp:791
+#: ViewTransfers.cpp:786
 msgid "failed"
 msgstr "mislukt"
 
-#: clientgui/ViewTransfers.cpp:794
+#: ViewTransfers.cpp:789
 msgid "suspended"
 msgstr "opgeschort"
 
-#: clientgui/ViewTransfers.cpp:799
+#: ViewTransfers.cpp:794
 msgid "active"
 msgstr "actief"
 
-#: clientgui/ViewTransfers.cpp:801
+#: ViewTransfers.cpp:796
 msgid "pending"
 msgstr "in behandeling"
 
-#: clientgui/ViewTransfers.cpp:808
+#: ViewTransfers.cpp:803
 msgid " (project backoff: "
 msgstr " (project uitgesteld: "
 
-#: clientgui/ViewWork.cpp:192
-#: clientgui/ViewWork.cpp:782
+#: ViewWork.cpp:187 ViewWork.cpp:777
 msgid "Show active tasks"
 msgstr "Actieve taken weergeven"
 
-#: clientgui/ViewWork.cpp:193
-#: clientgui/ViewWork.cpp:783
+#: ViewWork.cpp:188 ViewWork.cpp:778
 msgid "Show only active tasks."
 msgstr "Alleen actieve taken weergeven."
 
-#: clientgui/ViewWork.cpp:206
-msgid "Show VM Console"
-msgstr "Laat VM Console zien"
+#: ViewWork.cpp:194 sg_TaskCommandPopup.cpp:60
+msgid "Show graphics"
+msgstr "Grafische weergave"
+
+#: ViewWork.cpp:195 sg_TaskCommandPopup.cpp:61
+msgid "Show application graphics in a window."
+msgstr "Bekijk de grafische weergave van dit project."
+
+#: ViewWork.cpp:201
+msgid "Show VM Console"
+msgstr "Laat VM Console zien"
+
+#: ViewWork.cpp:202
+msgid "Show VM Console in a window."
+msgstr "Laat de VM Console zien in een venster."
+
+#: ViewWork.cpp:209
+msgid "Suspend work for this result."
+msgstr "Het werk aan dit project handmatig onderbreken."
+
+#: ViewWork.cpp:215 sg_TaskCommandPopup.cpp:72
+msgid "Abort"
+msgstr "Werk afbreken"
+
+#: ViewWork.cpp:216
+msgid "Abandon work on the result. You will get no credit for it."
+msgstr "Annuleer het werk aan dit resultaat. Er zullen geen punten worden toegekend."
+
+#: ViewWork.cpp:223 sg_TaskCommandPopup.cpp:79
+msgid "Show task details."
+msgstr "Toon taak details."
+
+#: ViewWork.cpp:235
+msgid "Elapsed"
+msgstr "Verstreken tijd"
+
+#: ViewWork.cpp:236
+msgid "Remaining (estimated)"
+msgstr "Nog te gaan (geschat)"
+
+#: ViewWork.cpp:237
+msgid "Deadline"
+msgstr "Rapporteren voor"
+
+#: ViewWork.cpp:264
+msgid "Tasks"
+msgstr "Werk"
+
+#: ViewWork.cpp:357
+msgid "Resuming task..."
+msgstr "Werk word hervat..."
+
+#: ViewWork.cpp:360
+msgid "Suspending task..."
+msgstr "Bezig met opschorten..."
+
+#: ViewWork.cpp:389
+msgid "Showing graphics for task..."
+msgstr "Grafische weergave wordt getoond..."
+
+#: ViewWork.cpp:426
+msgid "Showing VM console for task..."
+msgstr "VM console wordt getoond voor taak..."
+
+#: ViewWork.cpp:479
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %s, Status: %s)"
+msgstr "Weet je zeker dat je het resultaat '%s' wilt annuleren?\n(Voortgang: %s, Status: %s)"
+
+#: ViewWork.cpp:485
+#, c-format
+msgid "Are you sure you want to abort these %d tasks?"
+msgstr "Weet je zeker dat je deze %d taken wilt afbreken?"
+
+#: ViewWork.cpp:490 sg_TaskCommandPopup.cpp:256
+msgid "Abort task"
+msgstr "Annuleer taak"
+
+#: ViewWork.cpp:499
+msgid "Aborting task..."
+msgstr "Bezig met afbreken taak..."
+
+#: ViewWork.cpp:771
+msgid "Show all tasks"
+msgstr "Alle taken weergeven"
+
+#: ViewWork.cpp:772
+msgid "Show all tasks."
+msgstr "Alle taken weergeven."
+
+#: ViewWork.cpp:796 sg_TaskCommandPopup.cpp:103
+msgid "Resume work for this task."
+msgstr "Hervat werk voor deze taak."
+
+#: ViewWork.cpp:802 sg_TaskCommandPopup.cpp:107
+msgid "Suspend work for this task."
+msgstr "Onderbreek werk voor deze taak."
+
+#: WelcomePage.cpp:284
+msgid "Add project or account manager"
+msgstr "Project of Account Manager toevoegen"
+
+#: WelcomePage.cpp:288
+msgid "Add project or use BOINC Account Manager"
+msgstr "Een project of BOINC Account Manager toevoegen"
+
+#: 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 "Indien mogelijk, voeg project(en) toe\nvia de %s website.\n\nToegevoegde projecten via deze wizard\nzijn niet te onderhouden m.b.v. %s."
+
+#: 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 "Er zijn meer dan 30 op BOINC gebaseerde projecten\nin verschillende wetenschappelijke richtingen en het is mogelijk\nom deel te nemen aan net zo veel projecten als je zelf wilt.\nJe kan een project direct toevoegen\nof gebruik maken van een \"Account manager\" website."
+
+#: 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 "Je hebt er voor gekozen om een project toe te voegen of te veranderen aan welke\nprojecten je mee doet.\n\nSommige van deze projecten worden onderhouden door World Community Grid,\nmaar er zijn ook projecten van andere organisaties voor handen. De BOINC software\nmaakt het mogelijk je computertijd te verdelen over elke combinatie van projecten.\n\nAanvullend hierop is het mogelijk om je te registreren bij een BOINC Account Manager\nen deze te gebruiken om je projecten te beheren. [...]
+
+#: WelcomePage.cpp:339
+msgid "Use a BOINC Account Manager"
+msgstr "Gebruik een BOINC Account Manager"
+
+#: WelcomePage.cpp:352
+msgid "To continue, click Next."
+msgstr "Klik op Volgende om verder te gaan."
+
+#: WelcomePage.cpp:358
+msgid "Add or change your World Community Grid projects"
+msgstr "Je World Community Grid projecten aanpassen"
+
+#: WelcomePage.cpp:361
+msgid "Add projects run by other researchers or organizations"
+msgstr "Projecten van andere organisaties aanpassen"
+
+#: WizardAttach.cpp:634
+msgid "Do you really want to cancel?"
+msgstr "Weet je zeker dat je wilt annuleren?"
+
+#: WizardAttach.cpp:635
+msgid "Question"
+msgstr "Vraag"
+
+#: sg_BoincSimpleFrame.cpp:149
+msgid "Advanced View...\tCtrl+Shift+A"
+msgstr "Geavanceerd...\tCtrl+Shift+A"
+
+#: sg_BoincSimpleFrame.cpp:150
+msgid "Display the advanced graphical interface."
+msgstr "Overschakelen naar de geavanceerde weergave."
+
+#: sg_BoincSimpleFrame.cpp:157
+msgid "Skin"
+msgstr "Skin"
+
+#: sg_BoincSimpleFrame.cpp:159
+msgid "Select the appearance of the user interface."
+msgstr "Selecteer de wijze van weergave."
+
+#: sg_BoincSimpleFrame.cpp:206
+#, c-format
+msgid "&%s"
+msgstr "&%s"
+
+#: sg_BoincSimpleFrame.cpp:390
+msgid "Default"
+msgstr "Standaardwaarde"
+
+#: sg_BoincSimpleFrame.cpp:759
+msgid "Suspend Computing"
+msgstr "Berekeningen pauzeren"
+
+#: sg_BoincSimpleFrame.cpp:760
+msgid "Resume Computing"
+msgstr "Berekeningen hervatten"
+
+#: sg_BoincSimpleFrame.cpp:777
+msgid "Open a window to view notices from projects or BOINC"
+msgstr "Open een venster om berichten van BOINC projecten te bekijken"
+
+#: sg_DlgMessages.cpp:146
+msgid "Close"
+msgstr "Sluiten"
+
+#: sg_DlgMessages.cpp:389
+#, c-format
+msgid "%s - Notices"
+msgstr "%s - Berichten"
+
+#: sg_DlgPreferences.cpp:268
+msgid "This dialog controls preferences for this computer only."
+msgstr "In dit venster kan je de voorkeuren van deze computer instellen."
+
+#: sg_DlgPreferences.cpp:273
+msgid "Click OK to set preferences."
+msgstr "Klik op 'OK' om instellingen vast te leggen."
+
+#: sg_DlgPreferences.cpp:278
+msgid ""
+"Click Clear to restore web-based settings for all preferences listed below."
+msgstr "Klik 'Wissen' om de online waarden te herstellen voor onderstaande instellingen."
+
+#: sg_DlgPreferences.cpp:285
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
+msgstr "Voor aanvullende opties, klik op 'Verwerkings voorkeuren' in de geavanceerde weergave."
+
+#: sg_DlgPreferences.cpp:313
+msgid "Do work only between:"
+msgstr "Werk actief tussen:"
+
+#: sg_DlgPreferences.cpp:335
+msgid "Connect to internet only between:"
+msgstr "Internet verbinding tussen:"
+
+#: sg_DlgPreferences.cpp:357 sg_DlgPreferences.cpp:374
+msgid "Use no more than:"
+msgstr "Gebruik maximaal:"
+
+#: sg_DlgPreferences.cpp:370
+msgid "of disk space"
+msgstr "schijfruimte"
+
+#: sg_DlgPreferences.cpp:387
+msgid "of the processor"
+msgstr "van processor"
+
+#: sg_DlgPreferences.cpp:391
+msgid "Do work while on battery?"
+msgstr "Actief indien op accu?"
+
+#: sg_DlgPreferences.cpp:404
+msgid "Do work after idle for:"
+msgstr "Indien inactief starten na:"
+
+#: sg_DlgPreferences.cpp:429
+msgid "Clear all local preferences listed above and close the dialog"
+msgstr "Wis alle boven vermelde lokale voorkeuren en sluit het venster"
+
+#: 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 "Altijd"
+
+#: sg_DlgPreferences.cpp:638
+msgid "100 MB"
+msgstr "100 MB"
 
-#: clientgui/ViewWork.cpp:207
-msgid "Show VM Console in a window."
-msgstr "Laat de VM Console zien in een venster."
+#: sg_DlgPreferences.cpp:639
+msgid "200 MB"
+msgstr "200 MB"
 
-#: clientgui/ViewWork.cpp:214
-msgid "Suspend work for this result."
-msgstr "Het werk aan dit project handmatig onderbreken."
+#: sg_DlgPreferences.cpp:640
+msgid "500 MB"
+msgstr "500 MB"
 
-#: clientgui/ViewWork.cpp:221
-msgid "Abandon work on the result. You will get no credit for it."
-msgstr "Annuleer het werk aan dit resultaat. Er zullen geen punten worden toegekend."
+#: sg_DlgPreferences.cpp:641
+msgid "1 GB"
+msgstr "1 GB"
 
-#: clientgui/ViewWork.cpp:240
-msgid "Elapsed"
-msgstr "Verstreken tijd"
+#: sg_DlgPreferences.cpp:642
+msgid "2 GB"
+msgstr "2 GB"
 
-#: clientgui/ViewWork.cpp:241
-msgid "Remaining (estimated)"
-msgstr "Nog te gaan (geschat)"
+#: sg_DlgPreferences.cpp:643
+msgid "5 GB"
+msgstr "5 GB"
 
-#: clientgui/ViewWork.cpp:242
-msgid "Deadline"
-msgstr "Rapporteren voor"
+#: sg_DlgPreferences.cpp:644
+msgid "10 GB"
+msgstr "10 GB"
 
-#: clientgui/ViewWork.cpp:269
-msgid "Tasks"
-msgstr "Werk"
+#: sg_DlgPreferences.cpp:645
+msgid "20 GB"
+msgstr "20 GB"
 
-#: clientgui/ViewWork.cpp:362
-msgid "Resuming task..."
-msgstr "Werk word hervat..."
+#: sg_DlgPreferences.cpp:646
+msgid "50 GB"
+msgstr "50 GB"
 
-#: clientgui/ViewWork.cpp:365
-msgid "Suspending task..."
-msgstr "Bezig met opschorten..."
+#: sg_DlgPreferences.cpp:647
+msgid "100 GB"
+msgstr "100 GB"
 
-#: clientgui/ViewWork.cpp:394
-msgid "Showing graphics for task..."
-msgstr "Grafische weergave wordt getoond..."
+#: sg_DlgPreferences.cpp:717
+#, c-format
+msgid "%d MB"
+msgstr "%d MB"
 
-#: clientgui/ViewWork.cpp:431
-msgid "Showing VM console for task..."
-msgstr "VM console wordt getoond voor taak..."
+#: sg_DlgPreferences.cpp:719
+#, c-format
+msgid "%4.2f GB"
+msgstr "%4.2f GB"
 
-#: clientgui/ViewWork.cpp:484
+#: sg_DlgPreferences.cpp:760
 #, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %s, Status: %s)"
-msgstr ""
-"Weet je zeker dat je het resultaat '%s' wilt annuleren?\n"
-"(Voortgang: %s, Status: %s)"
+msgid "%d%%"
+msgstr "%d%%"
+
+#: sg_DlgPreferences.cpp:796
+msgid "0 (Run Always)"
+msgstr "0 (Altijd actief)"
 
-#: clientgui/ViewWork.cpp:490
+#: sg_DlgPreferences.cpp:799
 #, c-format
-msgid "Are you sure you want to abort these %d tasks?"
-msgstr "Weet je zeker dat je deze %d taken wilt afbreken?"
+msgid "%d"
+msgstr "%d"
 
-# 75%
-#: clientgui/ViewWork.cpp:504
-msgid "Aborting task..."
-msgstr "Bezig met afbreken taak..."
+#: sg_DlgPreferences.cpp:1029
+msgid "Do you really want to clear all local preferences?\n"
+msgstr "Weet je zeker dat je de lokale voorkeuren wilt wissen?\n"
 
-#: clientgui/ViewWork.cpp:776
-msgid "Show all tasks"
-msgstr "Alle taken weergeven"
+#: sg_ProjectPanel.cpp:72
+msgid "Add Project"
+msgstr "Project toevoegen"
 
-#: clientgui/ViewWork.cpp:777
-msgid "Show all tasks."
-msgstr "Alle taken weergeven."
+#: sg_ProjectPanel.cpp:73
+msgid "Synchronize"
+msgstr "Bijwerken"
 
-#: clientgui/WelcomePage.cpp:284
-msgid "Add project or account manager"
-msgstr "Project of Account Manager toevoegen"
+#: sg_ProjectPanel.cpp:74
+msgid "Work done for this project"
+msgstr "Voltooid werk bij dit project"
 
-#: clientgui/WelcomePage.cpp:288
-msgid "Add project or use BOINC Account Manager"
-msgstr "Een project of BOINC Account Manager toevoegen"
+#: sg_ProjectPanel.cpp:77
+msgid "Synchronize projects with account manager system"
+msgstr "Projecten bijwerken met behulp van de account manager"
 
-#: 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 ""
-"Indien mogelijk, voeg project(en) toe\n"
-"via de %s website.\n"
-"\n"
-"Toegevoegde projecten via deze wizard\n"
-"zijn niet te onderhouden m.b.v. %s."
+#: sg_ProjectPanel.cpp:124
+msgid "Select a project to access with the controls below"
+msgstr "Selecteer het gewenste project middels onderstaande bediening"
 
-#: 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 ""
-"Er zijn meer dan 30 op BOINC gebaseerde projecten\n"
-"in verschillende wetenschappelijke richtingen en het is mogelijk\n"
-"om deel te nemen aan net zo veel projecten als je zelf wilt.\n"
-"Je kan een project direct toevoegen\n"
-"of gebruik maken van een \"Account manager\" website."
+#: sg_ProjectPanel.cpp:145
+msgid "Project Web Pages"
+msgstr "Project Websites"
 
-#: 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 ""
-"Je hebt er voor gekozen om een project toe te voegen of te veranderen aan welke\n"
-"projecten je mee doet.\n"
-"\n"
-"Sommige van deze projecten worden onderhouden door World Community Grid,\n"
-"maar er zijn ook projecten van andere organisaties voor handen. De BOINC software\n"
-"maakt het mogelijk je computertijd te verdelen over elke combinatie van projecten.\n"
-"\n"
-"Aanvullend hierop is het mogelijk om je te registreren bij een BOINC Account Manager\n"
-"en deze te gebruiken om je projecten te beheren.\n"
-"\n"
-"Kies a.u.b. welke wijziging je door wilt voeren:\n"
+#: sg_ProjectPanel.cpp:149
+msgid "Project Commands"
+msgstr "Project specifieke instructies"
 
-#: clientgui/WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
-msgstr "Gebruik een BOINC Account Manager"
+#: sg_ProjectPanel.cpp:267
+#, c-format
+msgid "Pop up a menu of web sites for project %s"
+msgstr "Toon pop-up menu met websites voor %s"
 
-#: clientgui/WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
-msgstr "Je World Community Grid projecten aanpassen"
+#: sg_ProjectPanel.cpp:269
+#, c-format
+msgid "Pop up a menu of commands to apply to project %s"
+msgstr "Toon toepassings instructies voor %s in een pop-up menu"
 
-#: clientgui/WelcomePage.cpp:361
-msgid "Add projects run by other researchers or organizations"
-msgstr "Projecten van andere organisaties aanpassen"
+#: sg_TaskCommandPopup.cpp:67
+msgid "Suspend this task."
+msgstr "Werk onderbreken."
 
-#: clientgui/WizardAttach.cpp:673
-msgid "Do you really want to cancel?"
-msgstr "Weet je zeker dat je wilt annuleren?"
+#: sg_TaskCommandPopup.cpp:73
+msgid "Abandon this task. You will get no credit for it."
+msgstr "Deze taak afbreken. Er worden geen punten toegekend."
 
-#: clientgui/WizardAttach.cpp:674
-msgid "Question"
-msgstr "Vraag"
+#: sg_TaskCommandPopup.cpp:251
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %.1lf%%, Status: %s)"
+msgstr "Weet je zeker dat je de taak '%s' wilt annuleren?\n(Voortgang: %.1lf%%s, Status: %s)"
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
-msgid "&Next >"
-msgstr "Volgende >"
+#: sg_TaskPanel.cpp:464
+msgid "You don't have any projects.  Please Add a Project."
+msgstr "Geen projecten aanwezig. Voeg  a.u.b. een project toe."
 
-#: clientgui/wizardex.cpp:383
-msgid "< &Back"
-msgstr "< Vorige"
+#: sg_TaskPanel.cpp:465
+msgid "Not available"
+msgstr "Niet beschikbaar"
 
-#: clientgui/wizardex.cpp:553
-msgid "&Finish"
-msgstr "Voltooien"
+#: sg_TaskPanel.cpp:476
+msgid "Tasks:"
+msgstr "Taken:"
 
-#: clientgui/common/wxPieCtrl.cpp:64
-msgid "Pie Ctrl"
-msgstr "Diagram besturing"
+#: sg_TaskPanel.cpp:482
+msgid "Select a task to access"
+msgstr "Kies de te beheren taak"
 
-#: clientgui/mac/Mac_GUI.cpp:35
-msgid "Services"
-msgstr "Services"
+#: sg_TaskPanel.cpp:493
+msgid "From:"
+msgstr "Van:"
 
-#: clientgui/mac/Mac_GUI.cpp:36
-#, c-format
-msgid "Hide %s"
-msgstr "Verberg %s"
+#: sg_TaskPanel.cpp:547
+msgid "This task's progress"
+msgstr "Voortgang van deze taak"
 
-#: clientgui/mac/Mac_GUI.cpp:37
-msgid "Hide Others"
-msgstr "Verberg Andere"
+#: sg_TaskPanel.cpp:565
+msgid "Task Commands"
+msgstr "Taak specifieke instructies"
 
-#: clientgui/mac/Mac_GUI.cpp:38
-msgid "Show All"
-msgstr "Alles Weergeven"
+#: sg_TaskPanel.cpp:566
+msgid "Pop up a menu of commands to apply to this task"
+msgstr "Toon toepassings instructies voor deze taak in een pop-up menu"
 
-#: clientgui/mac/Mac_GUI.cpp:39
+#: sg_TaskPanel.cpp:701
 #, c-format
-msgid "Quit %s"
-msgstr "%s Sluiten"
+msgid "Application: %s"
+msgstr "Programma: %s"
 
-#: clientgui/DlgAdvPreferences.h:30
-msgid "specify work start and stop hours in format HH:MM-HH:MM"
-msgstr "geef de werk start- en stoptijd aan in UU:MM-UU:MM"
-
-#: clientgui/DlgAdvPreferences.h:31
-msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
-msgstr "geef de netwerk start- en stoptijd aan in UU:MM-UU:MM"
-
-# 98%
-#~ msgid ""
-#~ "(C) 2003-2013 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2011 University of California, Berkeley.\n"
-#~ "Alle rechten voorbehouden."
+#: sg_TaskPanel.cpp:724
 #, c-format
-#~ msgid "%s - Preferences"
-#~ msgstr "%s - Voorkeuren"
+msgid "%.3f%%"
+msgstr "%.3f%%"
 
-#, no-c-format
-#~ msgid "% of the processors (0 means ignore this setting)"
-#~ msgstr "% van de processoren (0 betekent geen beperking)"
+#: sg_TaskPanel.cpp:732
+msgid "Application: Not available"
+msgstr "Programma: Niet beschikbaar"
 
-#, no-c-format
-#~ msgid "% CPU time"
-#~ msgstr "% CPU tijd"
-#~ msgid "KBytes/sec."
-#~ msgstr "KBytes/sec."
-#~ msgid "Mbytes"
-#~ msgstr "Mbytes"
-#~ msgid "every"
-#~ msgstr "elke"
-#~ msgid "days"
-#~ msgstr "dagen"
-#~ msgid "Gigabytes disk space"
-#~ msgstr "Gigabytes schijfruimte"
-#~ msgid "Running, high priority"
-#~ msgstr "Bezig met uitvoeren, hoge prioriteit"
-#~ msgid " (Scheduler wait: "
-#~ msgstr " (Taakverdeling wacht: "
-#~ msgid " (Scheduler wait)"
-#~ msgstr " (Taakverdeling wacht)"
-#~ msgid " (Waiting for network access)"
-#~ msgstr " (Wacht op netwerk toegang)"
-#~ msgid "Preferences…"
-#~ msgstr "Voorkeuren..."
-#~ msgid "Workunit name"
-#~ msgstr "Bestandsnaam"
-#~ msgid "I do not agree with the terms of use."
-#~ msgstr "Ik ga NIET akkoord met de voorwaarden."
-#~ msgid "Click Clear to restore web-based settings."
-#~ msgstr "Klik op 'Wissen' om terug te keren naar online instellingen."
-#~ msgid "For additional settings, select Computing Preferences in "
-#~ msgstr "Voor aanvullende opties klik je op 'Verwerkings voorkeuren' in "
-#~ msgid "the Advanced View."
-#~ msgstr "de Geavanceerde Weergave."
-#~ msgid "invalid float"
-#~ msgstr "ongeldige waarde gevonden"
-#~ msgid "Display the advanced (accessible) graphical interface."
-#~ msgstr "Overschakelen naar de geavanceerde (toegankelijke) weergave."
-#~ msgid "Paused: Other work running"
-#~ msgstr "Opgeschort: Ander werk actief"
-#~ msgid "Paused: User initiated.  Click 'Resume' to continue"
-#~ msgstr "Opgeschort: Door gebruiker.  Klik op 'Hervatten' om te starten"
-#~ msgid "Paused: User active"
-#~ msgstr "Werk opgeschort: Gebruiker actief"
-#~ msgid "Paused: Computer on battery"
-#~ msgstr "Opgeschort: Computer op accu"
-#~ msgid "Paused: Time of Day"
-#~ msgstr "Werk opgeschort: Tijds-instellingen"
-#~ msgid "Paused: Benchmarks running"
-#~ msgstr "Werk opgeschort: Benchmark loopt"
-#~ msgid "Paused"
-#~ msgstr "Opgeschort"
-#~ msgid "Paused: Application start delayed"
-#~ msgstr "Gepauzeerd: start applicatie uitgesteld"
-#~ msgid "Click to show project graphics"
-#~ msgstr "Klik om grafische weergave te starten"
-#~ msgid "Open a window to view messages"
-#~ msgstr "Berichten venster openen"
-#~ msgid "Stop all activity"
-#~ msgstr "Werk onderbreken"
-#~ msgid "Resume activity"
-#~ msgstr "Werk hervatten"
-#~ msgid "Open a window to set your preferences"
-#~ msgstr "Voorkeuren venster openen"
-#~ msgid "Switch to the BOINC advanced view"
-#~ msgstr "Schakel over naar de geavanceerde weergave"
-#~ msgid "My Projects:"
-#~ msgstr "Mijn projecten:"
+#: sg_TaskPanel.cpp:832
+msgid "Not Available"
+msgstr "Niet beschikbaar"
 
+#: sg_TaskPanel.cpp:847
 #, c-format
-#~ msgid "%s. Work done by %s: %0.2f"
-#~ msgstr "%s. Punten behaald door %s: %0.2f"
+msgid "Elapsed: %s"
+msgstr "Verstreken: %s"
 
+#: sg_TaskPanel.cpp:861
 #, c-format
-#~ msgid "%.1lf"
-#~ msgstr "%.1lf"
+msgid "Remaining (estimated): %s"
+msgstr "Nog te gaan (geschat): %s"
 
+#: sg_TaskPanel.cpp:876
 #, c-format
-#~ msgid "%d hr %d min %d sec"
-#~ msgstr "%d Uur %d Min %d Sec"
-#~ msgid "Are you sure you want to display graphics on a remote machine?"
-#~ msgstr ""
-#~ "Weet je zeker dat je de grafische weergave wilt laten zien op een andere "
-#~ "computer?"
-#~ msgid "Application: "
-#~ msgstr "Programma: "
-#~ msgid "Time Remaining: "
-#~ msgstr "Resterende tijd: "
-#~ msgid "Elapsed Time: "
-#~ msgstr "Verstreken tijd: "
-#~ msgid "Account manager website"
-#~ msgstr "Accountmanager website"
-#~ msgid "Account Manager &URL:"
-#~ msgstr "Accountmanager &URL:"
+msgid "Status: %s"
+msgstr "Status: %s"
 
-#, c-format
-#~ msgid "%s &website"
-#~ msgstr "%s &website"
-#~ msgid "Notice List"
-#~ msgstr "Berichten Lijst"
+#: sg_TaskPanel.cpp:1223
+msgid "Retrieving current status."
+msgstr "Status aan het opvragen."
 
-#, c-format
-#~ msgid "%s; received on %s"
-#~ msgstr "%s; ontvangen op %s"
+#: sg_TaskPanel.cpp:1229
+msgid "Downloading work from the server."
+msgstr "Werk wordt gedownload."
 
-#, c-format
-#~ msgid "%s; received from %s; on %s"
-#~ msgstr "%s; ontvangen van %s; op %s"
-#~ msgid "Click"
-#~ msgstr "Klik"
-#~ msgid "Project List"
-#~ msgstr "Projecten"
-#~ msgid "Nvidia GPU Supported"
-#~ msgstr "NVIDIA GPU Ondersteund"
-#~ msgid "ATI GPU Supported"
-#~ msgstr "ATI GPU Ondersteund"
-#~ msgid "Project Website"
-#~ msgstr "Project Website"
-#~ msgid "One or more items failed to load from the Internet."
-#~ msgstr "Enkele onderdelen zijn niet geladen vanaf het internet."
-
-# 88%
-#~ msgid "Retry now"
-#~ msgstr "Probeer opnieuw"
-#~ msgid "10%"
-#~ msgstr "10%"
-#~ msgid "20%"
-#~ msgstr "20%"
-#~ msgid "30%"
-#~ msgstr "30%"
-#~ msgid "40%"
-#~ msgstr "40%"
-#~ msgid "50%"
-#~ msgstr "50%"
-#~ msgid "60%"
-#~ msgstr "60%"
-#~ msgid "70%"
-#~ msgstr "70%"
-#~ msgid "80%"
-#~ msgstr "80%"
-#~ msgid "90%"
-#~ msgstr "90%"
-#~ msgid "100%"
-#~ msgstr "100%"
-#~ msgid "1"
-#~ msgstr "1"
-#~ msgid "3"
-#~ msgstr "3"
-#~ msgid "5"
-#~ msgstr "5"
-#~ msgid "10"
-#~ msgstr "10"
-#~ msgid "15"
-#~ msgstr "15"
-#~ msgid "30"
-#~ msgstr "30"
-#~ msgid "60"
-#~ msgstr "60"
-#, c-format
-#~ msgid "Pop up a menu of websites for project %s"
-#~ msgstr "Toon pop-up menu met websites voor %s"
-#~ msgid ""
-#~ "for accessibility support, please select advanced from the view menu or type "
-#~ "command shift a"
-#~ msgstr ""
-#~ "voor de toegankelijkheid optie; kies geavanceerd in het weergave menu of "
-#~ "gebruik Command+Shift+A"
-#~ msgid "This panel contains graphs showing user totals for projects"
-#~ msgstr "Dit paneel bevat grafieken met gebruikers totalen per project"
-#~ msgid "list headers"
-#~ msgstr "lijst koppen"
-#~ msgid "list of events"
-#~ msgstr "lijst van gebeurtenissen"
-#~ msgid "list of events is empty"
-#~ msgstr "lijst van gebeurtenissen is leeg"
+#: sg_TaskPanel.cpp:1234
+msgid "Processing Suspended:  Running On Batteries."
+msgstr "Werk opgeschort:  Computer op accu."
 
-#, c-format
-#~ msgid "list of %s"
-#~ msgstr "lijst van %s"
+#: sg_TaskPanel.cpp:1236
+msgid "Processing Suspended:  User Active."
+msgstr "Werk opgeschort:  Gebruiker actief."
 
-#, c-format
-#~ msgid "list of %s is empty"
-#~ msgstr "lijst van %s is leeg"
+#: sg_TaskPanel.cpp:1238
+msgid "Processing Suspended:  User paused processing."
+msgstr "Werk opgeschort:  Gepauzeerd door gebruiker."
 
-#, c-format
-#~ msgid "; current sort column %d of %d; descending order; "
-#~ msgstr "; huidige kolom sortering %d van %d; aflopende volgorde; "
+#: sg_TaskPanel.cpp:1240
+msgid "Processing Suspended:  Time of Day."
+msgstr "Werk opgeschort:  Tijds-instellingen."
 
-#, c-format
-#~ msgid "; current sort column %d of %d; ascending order; "
-#~ msgstr "; huidige kolom sortering %d van %d; oplopende volgorde; "
+#: sg_TaskPanel.cpp:1242
+msgid "Processing Suspended:  Benchmarks Running."
+msgstr "Werk opgeschort:  Benchmark loopt."
 
-#, c-format
-#~ msgid "; column %d of %d; "
-#~ msgstr "; kolom %d van %d; "
-#~ msgid "list is empty"
-#~ msgstr "lijst is leeg"
+#: sg_TaskPanel.cpp:1244
+msgid "Processing Suspended."
+msgstr "Werk opgeschort."
 
-#, c-format
-#~ msgid "; row %d; "
-#~ msgstr "; rij %d; "
+#: sg_TaskPanel.cpp:1248
+msgid "Waiting to contact project servers."
+msgstr "Wacht op project server verbinding."
 
-#, c-format
-#~ msgid "; selected row %d of %d; "
-#~ msgstr "; geselecteerde rij %d van %d; "
+#: sg_TaskPanel.cpp:1252 sg_TaskPanel.cpp:1261
+msgid "Retrieving current status"
+msgstr "Status aan het opvragen"
 
-#, c-format
-#~ msgid "; selected row %d ; "
-#~ msgstr "; geselecteerde rij %d ; "
+#: sg_TaskPanel.cpp:1256
+msgid "No work available to process"
+msgstr "Geen werk aanwezig"
 
-#, c-format
-#~ msgid "; row %d of %d; "
-#~ msgstr "; rij %d van %d; "
-#~ msgid "blank"
-#~ msgstr "leeg"
-#~ msgid "list of projects or account managers"
-#~ msgstr "lijst van projecten of account managers"
+#: sg_TaskPanel.cpp:1258
+msgid "Unable to connect to the core client"
+msgstr "Client verbinding niet aanwezig"
 
-#, c-format
-#~ msgid "selected row %d of %d; "
-#~ msgstr "geselecteerde rij %d van %d; "
+#: wizardex.cpp:377 wizardex.cpp:553
+msgid "&Next >"
+msgstr "Volgende >"
 
-#, c-format
-#~ msgid "row %d of %d; "
-#~ msgstr "rij %d van %d; "
-#~ msgid "The minimum username length for this project is 1. Please enter a different username."
-#~ msgstr ""
-#~ "Het minimale aantal karakters voor een gebruikersnaam is 1. Vul a.u.b. een "
-#~ "andere in."
-#~ msgid "The minimum username length for this account manager is 1. Please enter a different username."
-#~ msgstr ""
-#~ "Het minimale aantal karakters voor een gebruikersnaam is 1. Vul a.u.b. een "
-#~ "andere in."
-#~ msgid "The minimum email address length for this project is 1. Please enter a different email address."
-#~ msgstr ""
-#~ "Het minimale aantal karakters voor een e-mail adres is 1. Vul a.u.b. een "
-#~ "andere in."
-#~ msgid "The minimum email address length for this account manager is 1. Please enter a different email address."
-#~ msgstr ""
-#~ "Het minimale aantal karakters voor een e-mail adres is 1. Vul a.u.b. een "
-#~ "andere in."
+#: wizardex.cpp:383
+msgid "< &Back"
+msgstr "< Vorige"
 
-#, c-format
-#~ msgid "The minimum password length for this project is %d. Please enter a different password."
-#~ msgstr ""
-#~ "De minimum lengte van het wachtwoord voor dit project is %d. Kies a.u.b. een "
-#~ "ander wachtwoord."
+#: wizardex.cpp:553
+msgid "&Finish"
+msgstr "Voltooien"
 
-#, c-format
-#~ msgid "The minimum password length for this account manager is %d. Please enter a different password."
-#~ msgstr ""
-#~ "De minimum lengte van het wachtwoord voor deze accountmanager is %d. Kies "
-#~ "a.u.b. een ander wachtwoord."
-#~ msgid ""
-#~ "An error has occurred;\n"
-#~ "check the Event Log for details.\n"
-#~ "\n"
-#~ "Click Finish to close."
-#~ msgstr ""
-#~ "Er is een fout opgetreden, controleer\n"
-#~ "het gebeurtenissen logboek voor details.\n"
-#~ "\n"
-#~ "Klik op Voltooien om af te sluiten."
+#: mac/Mac_GUI.cpp:110
+msgid "Preferences…"
+msgstr "Voorkeuren..."
 
-#, no-c-format
-#~ msgid "% of the processors"
-#~ msgstr "% van de processoren"
+#: mac/Mac_GUI.cpp:122
+msgid "Services"
+msgstr "Services"
 
+#: mac/Mac_GUI.cpp:144
 #, c-format
-#~ msgid "New page inserted. Index = %i"
-#~ msgstr "Nieuwe pagina ingevoegd. Index = %i"
+msgid "Hide %s"
+msgstr "Verberg %s"
 
-#, c-format
-#~ msgid "New page appended. Index = %i"
-#~ msgstr "Nieuwe pagina bijgevoegd. Index = %i"
+#: mac/Mac_GUI.cpp:158
+msgid "Hide Others"
+msgstr "Verberg Andere"
 
-#, c-format
-#~ msgid "Old Page Index = %i"
-#~ msgstr "Oude Pagina Index = %i"
+#: mac/Mac_GUI.cpp:172
+msgid "Show All"
+msgstr "Alles Weergeven"
 
+#: mac/Mac_GUI.cpp:186
 #, c-format
-#~ msgid "OnDropTarget: index by HitTest = %i"
-#~ msgstr "OnDropTarget: index by HitTest = %i"
-#~ msgid "Identify your account "
-#~ msgstr "Je account gegevens "
-#~ msgid "Read config file"
-#~ msgstr "Configuratie inlezen"
-#~ msgid "Read configuration info from cc_config.xml"
-#~ msgstr "Configuratie inlezen vanuit cc_config.xml"
-#~ msgid ""
-#~ "(C) 2003-2011 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2011 University of California, Berkeley.\n"
-#~ "Alle rechten voorbehouden."
-#~ msgid "NVIDIA GPU"
-#~ msgstr "NVIDIA GPU"
-#~ msgid "ATI GPU"
-#~ msgstr "ATI GPU"
-#~ msgid "Multicore CPU Supported"
-#~ msgstr "Multicore CPU Ondersteund"
-#~ msgid "%s: %.0f"
-#~ msgstr "%s: %.0f"
-#~ msgid "Click 'Retry now' to transfer the file now"
-#~ msgstr "Klik op 'Probeer opnieuw' voor overdracht van het bestand"
-#~ msgid ""
-#~ "Click 'Abort transfer' to delete the file from the transfer queue. This "
-#~ "will prevent you from being granted credit for this result."
-#~ msgstr ""
-#~ "Klik op 'Overdracht afbreken' om dit bestand uit de wachtrij te "
-#~ "verwijderen. Er zullen in dit geval geen punten voor dit resultaat worden "
-#~ "toegekend."
-#~ msgid "Aborting result..."
-#~ msgstr "Resultaat word geannuleerd..."
-#~ msgid ""
-#~ "You have chosen to add a new BOINC project.  Adding a new\n"
-#~ "project means that you will be connecting your computer to a new "
-#~ "organization.\n"
-#~ "If this is what you wanted to do, please click on\n"
-#~ "the 'Next' button below.\n"
-#~ "\n"
-#~ "Some projects like World Community Grid run multiple research "
-#~ "applications.\n"
-#~ "If you want to change which research applications are sent to your "
-#~ "computer\n"
-#~ "to run, visit the project's website and modify your\n"
-#~ "preferences there.\n"
-#~ "\n"
-#~ "To change which research applications are sent to you from\n"
-#~ "World Community Grid then please click on the following button:"
-#~ msgstr ""
-#~ "Je hebt ervoor gekozen om een nieuw BOINC project toe te voegen.\n"
-#~ "Dit houdt in dat BOINC verbinding gaat maken met een andere website en "
-#~ "organisatie.\n"
-#~ "Als je dit inderdaad wilt doen, klik je op 'Volgende'\n"
-#~ "om verder te gaan.\n"
-#~ "\n"
-#~ "Projecten zoals World Community Grid hebben de mogelijkheid om\n"
-#~ "te kiezen uit verschillende onderzoeks applicaties. Op de website kan je "
-#~ "je\n"
-#~ "instellingen hiervoor aanpassen, de BOINC Manager zal hiervoor dan\n"
-#~ "passend werk binnen halen.\n"
-#~ "\n"
-#~ "Om een keuze te maken uit de applicaties die beschikbaar zijn\n"
-#~ "via World Community Grid klik je op de onderstaande knop:"
-#~ msgid "Change Research Applications at World Community Grid"
-#~ msgstr "Verander Onderzoeks Applicaties bij World Community Grid"
-#~ msgid "Don't fetch NVIDIA GPU tasks"
-#~ msgstr "Vraag geen nieuwe NVIDIA GPU taken"
-#~ msgid "NVIDIA GPU work fetch deferred for"
-#~ msgstr "NVIDIA GPU werkverzoek uitgesteld voor"
-#~ msgid "NVIDIA GPU work fetch deferral interval"
-#~ msgstr "Interval voor NVIDIA GPU werkverzoek"
-#~ msgid "Don't fetch ATI GPU tasks"
-#~ msgstr "Vraag geen nieuwe ATI GPU taken"
-#~ msgid "ATI GPU work fetch deferred for"
-#~ msgstr "ATI GPU werkverzoek uitgesteld voor"
-#~ msgid "ATI GPU work fetch deferral interval"
-#~ msgstr "Interval voor ATI GPU werkverzoek"
-#~ msgid "Remaining"
-#~ msgstr "Resterende tijd: "
-#~ msgid "Web sites"
-#~ msgstr "Websites"
-#~ msgid "Connect about every"
-#~ msgstr "Verbind elke"
-#~ msgid ""
-#~ "this computer is connected to the Internet about every X days\n"
-#~ "(0 if it's always connected)"
-#~ msgstr ""
-#~ "deze computer is om de 'X' dagen verbonden met het internet\n"
-#~ "(vul 0 in indien altijd verbonden)"
-#~ msgid "days (max. 10)"
-#~ msgstr "dagen (max.10)"
-#~ msgid "%d.%d%%"
-#~ msgstr "%d.%d%%"
-#~ msgid "Display and network &options..."
-#~ msgstr "Weergave en netwerk opties..."
-#~ msgid ""
-#~ "You have requested to exit the %s,\n"
-#~ "which allows you to view and manage\n"
-#~ "the science applications running on your computer.\n"
-#~ "\n"
-#~ "If you also want to stop running the science applications when you\n"
-#~ "exit the Manager, then choose from the following options:"
-#~ msgstr ""
-#~ "Je hebt gevraagd om het afsluiten van de %s.\n"
-#~ "Hiermee is het mogelijk om de lopende wetenschappelijke\n"
-#~ "apllicaties te bekijken en te beheren.\n"
-#~ "\n"
-#~ "Als je ook de lopende apllicaties wilt afsluiten als de Manager\n"
-#~ "wordt gestopt, vink deze keuze dan aan bij de ondestaande opties."
-#~ msgid "Stop running science applications when exiting the Manager"
-#~ msgstr "Stop de lopende applicatie(s) bij het afsluiten van de manager."
-#~ msgid "CPU work fetch priority"
-#~ msgstr "Prioriteit voor CPU werkverzoek"
-#~ msgid "NVIDIA GPU scheduling priority"
-#~ msgstr "Prioriteit voor NVIDIA GPU taakverdeling"
-#~ msgid "NVIDIA GPU work fetch priority"
-#~ msgstr "Prioriteit voor NVIDIA GPU werkverzoek"
-#~ msgid "ATI GPU scheduling priority"
-#~ msgstr "Prioriteit voor ATI GPU taakverdeling"
-#~ msgid "ATI GPU work fetch priority"
-#~ msgstr "Prioriteit voor ATI GPU werkverzoek"
-#~ msgid "Estimated app speed"
-#~ msgstr "Geschatte applicatie snelheid"
-#~ msgid "Estimated task size"
-#~ msgstr "Geschatte grootte van de taak"
-#~ msgid "Max RAM usage"
-#~ msgstr "Maximaal RAM gebruik"
-#~ msgid "%s - Options"
-#~ msgstr "%s - Opties"
-#~ msgid "Retrieving host information; please wait..."
-#~ msgstr "Host gegevens aan het opvragen; even geduld a.u.b..."
-#~ msgid " (waiting for GPU memory)"
-#~ msgstr " (wacht op het GPU geheugen)"
-#~ msgid "Manager Settings..."
-#~ msgstr "Manager instellingen..."
-#~ msgid "Pause"
-#~ msgstr "Pauzeer"
-#~ msgid "%s - Messages"
-#~ msgstr "%s - Berichten"
-#~ msgid "Skin:"
-#~ msgstr "Skin:"
-#~ msgid "Preferences"
-#~ msgstr "Voorkeuren"
-#~ msgid "I want to customize my preferences for this computer only."
-#~ msgstr "Ik wil alleen de voorkeuren wijzigen van deze computer."
-#~ msgid "Customized Preferences"
-#~ msgstr "Aangepaste voorkeuren"
-#~ msgid "My total work done this Project"
-#~ msgstr "Mijn totaal voltooide werk voor dit project"
-#~ msgid "My Tasks:"
-#~ msgstr "Mijn Taken:"
-#~ msgid "From Project:"
-#~ msgstr "Van Project:"
-#~ msgid "Elapsed Time: %s"
-#~ msgstr "Verstreken tijd: %s"
-#~ msgid "Time Remaining: %s"
-#~ msgstr "Resterende tijd: %s"
-#~ msgid "Upload suspended - "
-#~ msgstr "Uploaden opgeschort - "
-#~ msgid "Download suspended - "
-#~ msgstr "Downloaden opgeschort - "
-#~ msgid "Upload pending"
-#~ msgstr "Uploaden in behandeling"
-#~ msgid "Download pending"
-#~ msgstr "Downloaden in behandeling"
-#~ msgid "New Simple View..."
-#~ msgstr "Nieuwe eenvoudig weergave..."
-#~ msgid "Display the new simple graphical interface."
-#~ msgstr "Overschakelen naar de nieuwe eenvoudige BOINC weergave."
-#~ msgid "Old Simple View..."
-#~ msgstr "Oude eenvoudige weergave..."
-#~ msgid "Display the old simple graphical interface."
-#~ msgstr "Overschakelen naar de oude eenvoudige BOINC weergave."
-#~ msgid "Get help with BOINC"
-#~ msgstr "BOINC hulp opvragen"
-#~ msgid "Event Log..."
-#~ msgstr "Gebeurtenissen Logboek..."
-#~ msgid "error"
-#~ msgstr "fout"
-#~ msgid "A new version of BOINC is available."
-#~ msgstr "Er is een nieuwe versie van BOINC beschikbaar."
-#~ msgid "Download it."
-#~ msgstr "Download deze."
-#~ msgid "Notice from BOINC"
-#~ msgstr "Mededeling van BOINC"
-#~ msgid "Couldn't write state file; check directory permissions"
-#~ msgstr "Kon het status bestand niet opslaan, controleer gebruikersrechten."
-#~ msgid "The HTTP_PROXY environment variable must specify an HTTP proxy"
-#~ msgstr "De HTTP_PROXY omgevingsvariabele mist een specifieke HTTP proxy"
-#~ msgid ""
-#~ "You used the wrong URL for this project.  When convenient, remove this "
-#~ "project, then add %s"
-#~ msgstr ""
-#~ "Het door u gebruikte URL is het verkeerde. Zodra mogelijk graag het "
-#~ "project verwijderen en voeg vervolgens %s toe"
-#~ msgid "Message from"
-#~ msgstr "Bericht van"
-#~ msgid "Syntax error in app_info.xml"
-#~ msgstr "Syntaxis fout in bestand app_info.xml"
-#~ msgid "File referenced in app_info.xml does not exist: "
-#~ msgstr "Volgend bestand vermeld in app_info.xml bestaat niet: "
-#~ msgid "Can't resolve hostname in remote_hosts.cfg"
-#~ msgstr "Identificatie van hostcomputer in remote_hosts.cfg is mislukt"
-#~ msgid "Unexpected text in cc_config.xml"
-#~ msgstr "Onverwachte tekst in bestand cc_config.xml"
-#~ msgid "Unrecognized tag in cc_config.xml"
-#~ msgstr "Niet herkende instructie in bestand cc_config.xml"
-#~ msgid "Missing start tag in cc_config.xml"
-#~ msgstr "Ontbrekende start instructie in bestand cc_config.xml"
-#~ msgid "Missing end tag in cc_config.xml"
-#~ msgstr "Ontbrekende eind instructie in bestand cc_config.xml"
-#~ msgid "Attaching to project or account manager..."
-#~ msgstr "Project of account manager toevoegen..."
-#~ msgid "%s - Detach from %s"
-#~ msgstr "%s - Verwijder %s"
-#~ msgid "Retrying communications."
-#~ msgstr "Opnieuw verbinding aan het maken."
-#~ msgid "Failed to attach to project"
-#~ msgstr "Project toevoegen niet gelukt"
-#~ msgid "Failed to attach to account manager"
-#~ msgstr "Account manager toevoegen niet gelukt"
-#~ msgid "Attached to account manager"
-#~ msgstr "Account manager is toegevoegd"
-#~ msgid "You are now successfully attached to the %s system."
-#~ msgstr "Je hebt nu met succes %s toegevoegd."
-#~ msgid "You are now successfully attached to this account manager."
-#~ msgstr "Je hebt nu met succes deze account manager toegevoegd."
-#~ msgid "News Feeds"
-#~ msgstr "Nieuws feeds"
-#~ msgid "Display the latest news about BOINC"
-#~ msgstr "Bekijk het laatste BOINC nieuws"
-#~ msgid "not attached to any BOINC project: 0 bytes"
-#~ msgstr "geen BOINC projecten toegevoegd - 0 Bytes"
-#~ msgid "All projects"
-#~ msgstr "Alle projecten"
-#~ msgid "Attach to project"
-#~ msgstr "Project toevoegen"
-#~ msgid "Attach to account manager"
-#~ msgstr "Accountmanager toevoegen"
-#~ msgid "Attach to a project"
-#~ msgstr "Een project toevoegen"
-#~ msgid "%s needs to connect to the Internet.  Please click to open %s."
-#~ msgstr "%s heeft een internet verbinding nodig. Klik om de %s te openen."
-#~ msgid ""
-#~ "%s is unable to communicate with a project and needs an Internet "
-#~ "connection.\n"
-#~ "Please connect to the Internet, then select the 'Do network "
-#~ "communications' item from the Advanced menu."
-#~ msgstr ""
-#~ "%s kan geen verbinding maken met het project en heeft een internet "
-#~ "verbinding\n"
-#~ "nodig. Maak a.u.b. een internet verbinding en kies 'Opnieuw verbinden' in "
-#~ "het 'Geavanceerd' menu."
-#~ msgid ""
-#~ "%s couldn't do Internet communication, and no default connection is "
-#~ "selected.\n"
-#~ "Please connect to the Internet, or select a default connection\n"
-#~ "using Advanced/Options/Connections."
-#~ msgstr ""
-#~ "%s heeft momenteel geen internet verbinding en er is geen standaard "
-#~ "verbinding\n"
-#~ "ingesteld. Gebruik a.u.b de 'Geavanceerd/Opties/Verbindingen' menu optie "
-#~ "om\n"
-#~ "een verbinding in te stellen of maak handmatig een verbinding. "
-#~ msgid "One or more notices are now available for viewing."
-#~ msgstr "Eén of meer berichten beschikbaar voor weergave."
-#~ msgid "Attached to project"
-#~ msgstr "Project toegevoegd"
-#~ msgid "You are now successfully attached to this project."
-#~ msgstr "Je hebt zojuist met succes een project toegevoegd."
-#~ msgid "Attached to %s"
-#~ msgstr "%s is toegevoegd"
-#~ msgid "Detach when done"
-#~ msgstr "Wordt verwijderd als werk gereed is"
-#~ msgid "Retrieving notices..."
-#~ msgstr "Berichten binnenhalen..."
-#~ msgid "Detach"
-#~ msgstr "Project verwijderen"
-#~ msgid "Detaching from project..."
-#~ msgstr "Bezig met verwijderen van het project..."
-#~ msgid "Are you sure you want to detach from project '%s'?"
-#~ msgstr "Weet je zeker dat je het project '%s' wilt verwijderen?"
-#~ msgid "Detach from Project"
-#~ msgstr "Project Verwijderen"
-#~ msgid "Message from project server:"
-#~ msgstr "Berichten van project server:"
-#~ msgid "XML syntax error in"
-#~ msgstr "XML syntaxis fout in"
-#~ msgid "Can't resolve hostname in"
-#~ msgstr "Kan hostnaam niet vinden in"
-#~ msgid "Unrecognized tag in"
-#~ msgstr "Onbekend label in"
-#~ msgid "Missing start tag in"
-#~ msgstr "Missend start label in"
-#~ msgid "Unparsed tag in"
-#~ msgstr "Foutief label in"
-#~ msgid "Missing end tag in"
-#~ msgstr "Missend eind label in"
-#~ msgid ""
-#~ "BOINC can't access Internet - check network connection or proxy "
-#~ "configuration."
-#~ msgstr ""
-#~ "BOINC kan het internet niet benaderen - controleer de netwerk of proxy "
-#~ "configuratie."
-#~ msgid "Attach this computer to a project or account manager"
-#~ msgstr "Wat wil je toevoegen?"
-#~ msgid "Client is processing results."
-#~ msgstr "Resultaten worden door client verwerkt."
-#~ msgid " - user active"
-#~ msgstr "- gebruiker actief"
-#~ msgid " - computation suspended"
-#~ msgstr "- werk opgeschort"
-#~ msgid " - need disk space"
-#~ msgstr "- schijfruimte nodig"
-#~ msgid "Attach to an additional project"
-#~ msgstr "Een project toevoegen"
-#~ msgid "To completion"
-#~ msgstr "Resterende tijd"
-#~ msgid ""
-#~ "We'll guide you through the process of attaching\n"
-#~ "to a project or account manager."
-#~ msgstr ""
-#~ "Met behulp van deze wizard is het mogelijk om een\n"
-#~ "project of een account manager toe te voegen."
-#~ msgid "events"
-#~ msgstr "gebeurtenissen"
-#~ msgid " is empty"
-#~ msgstr " is leeg"
-#~ msgid "%d of %d; "
-#~ msgstr "%d van %d; "
-#~ msgid "current sort column "
-#~ msgstr "huidig gesorteerde kolom "
-#~ msgid " descending order "
-#~ msgstr " aflopende volgorde "
-#~ msgid " ascending order "
-#~ msgstr " oplopende volgorde "
-#~ msgid "column "
-#~ msgstr "kolom "
-#~ msgid "of %d; "
-#~ msgstr "van %d; "
-#~ msgid "Attach to a project or account manager to begin processing work"
-#~ msgstr ""
-#~ "Een project of accountmanager toevoegen om werk binnen te kunnen halen"
-#~ msgid "Attach to a project to begin processing work"
-#~ msgstr "Voeg een project toe om werk binnen te halen en te verwerken"
-#~ msgid "Use GPU never"
-#~ msgstr "GPU nooit gebruiken"
-#~ msgid "BOINC Notification"
-#~ msgstr "BOINC Bericht"
-#~ msgid ""
-#~ "TEST: Fluffy at Home just found out that the Fluffy project has been "
-#~ "published in Nature"
-#~ msgstr ""
-#~ "TEST: Fluffy at Home heeft zojuist ontdekt dat het project in de krant heeft "
-#~ "gestaan"
-#~ msgid "%s: %.2f%% completed."
-#~ msgstr "%s: %.2f%% voltooid."
-#~ msgid "%d tasks running."
-#~ msgstr "%d lopende taken."
-#~ msgid "&Close Window\tCtrl+W"
-#~ msgstr "Sluit &Venster\tCtrl+W"
-#~ msgid "&Messages\tCtrl+Shift+M"
-#~ msgstr "&Berichten\tCtrl+Shift+M"
-#~ msgid "Display messages"
-#~ msgstr "Berichten weergeven"
-#~ msgid "Display news"
-#~ msgstr "Nieuws weergeven"
-#~ msgid "%s - Can't find web browser"
-#~ msgstr "%s - Web browser niet gevonden"
-#~ msgid ""
-#~ "%s tried to display the web page\n"
-#~ "\t%s\n"
-#~ "but couldn't find a web browser.\n"
-#~ "To fix this, set the environment variable\n"
-#~ "BROWSER to the path of your web browser,\n"
-#~ "then restart the %s."
-#~ msgstr ""
-#~ "%s probeerde de web pagina\n"
-#~ "\t%s\n"
-#~ "weer te geven, maar kon geen\n"
-#~ "web browser vinden. Geef je standaard\n"
-#~ "browser op door het pad hier naar toe aan te\n"
-#~ "geven en herstart hierna %s."
-#~ msgid "Starting client services; please wait..."
-#~ msgstr "Client service opstarten; even geduld..."
-#~ msgid "BOINC Website"
-#~ msgstr "BOINC website"
-#~ msgid "Display the latest news about BOINC from the BOINC website"
-#~ msgstr "Bekijk het laatste BOINC nieuws op de BOINC website"
-#~ msgid "&Projects\tCTRL+SHIFT+P"
-#~ msgstr "&Projecten\tCTRL+SHIFT+P"
-#~ msgid "&Tasks\tCTRL+SHIFT+T"
-#~ msgstr "&Werk\tCTRL+SHIFT+T"
-#~ msgid "Trans&fers\tCTRL+SHIFT+X"
-#~ msgstr "&Overdracht\tCTRL+SHIFT+X"
-#~ msgid "&Messages\tCTRL+SHIFT+M"
-#~ msgstr "&Berichten\tCTRL+SHIFT+M"
-#~ msgid "&Statistics\tCTRL+SHIFT+S"
-#~ msgstr "&Statistieken\tCTRL+SHIFT+S"
-#~ msgid "&Disk usage\tCTRL+SHIFT+D"
-#~ msgstr "&Schijfgebruik\tCTRL+SHIFT+D"
-#~ msgid "&News\tCTRL+SHIFT+N"
-#~ msgstr "&Nieuws\tCTRL+SHIFT+N"
-#~ msgid "Retrying communications for project(s)..."
-#~ msgstr "Project(en) opnieuw aan het verbinden..."
-#~ msgid ""
-#~ "You currently are not authorized to manage the client.\n"
-#~ "Please contact your administrator to add you to the 'boinc_master' user "
-#~ "group."
-#~ msgstr ""
-#~ "Je hebt momenteel niet de benodigde rechten om de client\n"
-#~ "te kunnen onderhouden. Neem contact op met de systeembeheerder."
-#~ msgid ""
-#~ "Required wizard file(s) are missing from the target server.\n"
-#~ "(lookup_account.php/create_account.php)\n"
-#~ msgstr ""
-#~ "Benodigde bestanden zijn niet gevonden op de server.\n"
-#~ "(lookup_account.php/create_account.php)\n"
-#~ msgid "User information"
-#~ msgstr "Gebruikers informatie"
-#~ msgid "Account Manager URL"
-#~ msgstr "Account Manager URL"
-#~ msgid "Enter the URL of the account manager's web site."
-#~ msgstr "Vul het URL in van de account manager website."
-#~ msgid "Close BOINC Manager Window."
-#~ msgstr "Sluit het BOINC Manager venster."
-#~ msgid "Exit the %s"
-#~ msgstr "%s Afsluiten"
-#~ msgid ""
-#~ "Advanced views allow you to sort various columns and displays graphical "
-#~ "progress bars."
-#~ msgstr ""
-#~ "De sorteerbare weergave geeft de mogelijkheid om de kolommen te sorteren "
-#~ msgid "Attach to &account manager..."
-#~ msgstr "Account manager toevoegen"
-#~ msgid "Attach to an account manager"
-#~ msgstr "Een account manager toevoegen"
-#~ msgid "Attach to &project"
-#~ msgstr "&Project toevoegen"
-#~ msgid "Attaching to project..."
-#~ msgstr "Project wordt toegevoegd..."
-#~ msgid "Removal from %s completed."
-#~ msgstr "Verwijderen van %s voltooid."
-#~ msgid "Removal succeeded!"
-#~ msgstr "Verwijderen voltooid."
-#~ msgid "Write to disk at most every"
-#~ msgstr "schrijf naar schijf minstens elke"
-#~ msgid "Slot"
-#~ msgstr "Slot"
-#~ msgid "Already Attached to Project"
-#~ msgstr "Project reeds toegevoegd"
-#~ msgid "This project may not have work for your type of computer."
-#~ msgstr "Dit project heeft mogelijk geen werk voor jouw type computer."
-#~ msgid "Click here to go to %s's website."
-#~ msgstr "Klik hier om naar de %s's website te gaan"
-#~ msgid "ID"
-#~ msgstr "ID"
-#~ msgid "Priority"
-#~ msgstr "Prioriteit"
-#~ msgid "MessagesGrid"
-#~ msgstr "Berichten"
-#~ msgid "Copying selected messages to Clipboard..."
-#~ msgstr "Geselecteerde berichten aan het kopiëren..."
-#~ msgid "Info"
-#~ msgstr "Informatie"
-#~ msgid "Warning"
-#~ msgstr "Waarschuwing"
-#~ msgid "ProjectsGrid"
-#~ msgstr "Projecten"
-#~ msgid "TransfersGrid"
-#~ msgstr "Overdracht"
-#~ msgid "Aborting transfer(s)..."
-#~ msgstr "Overdracht aan het afbreken..."
-#~ msgid ""
-#~ "Are you sure you want to abort this file(s) transfer ?\n"
-#~ "NOTE: Aborting a transfer will invalidate a task and you\n"
-#~ "will not receive credit for it."
-#~ msgstr ""
-#~ "Weet je zeker dat je de overdracht wilt afbreken?\n"
-#~ "WAARSCHUWING: Hierdoor wordt het werk ongeldig en\n"
-#~ "worden er geen punten toegekend."
-#~ msgid "Abort File Transfer(s)"
-#~ msgstr "Bestands Overdracht Afbreken"
-#~ msgid "TasksGrid"
-#~ msgstr "Werk"
-#~ msgid ""
-#~ "We'll now guide you through the process of attaching\n"
-#~ "to a project."
-#~ msgstr ""
-#~ "Met behulp van deze wizard kan een project worden\n"
-#~ "toegevoegd."
-#~ msgid "&Stop using%s"
-#~ msgstr "&Stop gebruik van%s"
-#~ msgid ""
-#~ "We'll now remove this computer from %s.  From now on,\n"
-#~ "attach and detach projects directly from this computer.\n"
-#~ msgstr ""
-#~ "Deze computer zal worden verwijderd uit %s. Vanaf nu\n"
-#~ "zal je zelf het onderhoud moeten uitvoeren.\n"
-#~ msgid ""
-#~ "We'll now guide you through the process of attaching\n"
-#~ "to an account manager.\n"
-#~ "\n"
-#~ "If you want to attach to a single project, click Cancel,\n"
-#~ "then select the 'Attach to project' menu item instead."
-#~ msgstr ""
-#~ "Met behulp van deze wizard kan een account manager\n"
-#~ "worden toegevoegd.\n"
-#~ "\n"
-#~ "Indien je alleen een project wilt toevoegen, klik dan\n"
-#~ "op annuleren en kies dan voor 'Project toevoegen'."
-#~ msgid "Debug Flags"
-#~ msgstr "Debug Punten"
-#~ msgid "Project Properties Failure"
-#~ msgstr "Project Instellings Fout"
-#~ msgid "Project Communication Failure"
-#~ msgstr "Netwerk communicatie fout"
-#~ msgid "Project Properties URL Failure"
-#~ msgstr "Project URL Instellings Fout"
-#~ msgid "Account Creation Disabled"
-#~ msgstr "Account Aanmaak Gesloten"
-#~ msgid "Account Already Exists"
-#~ msgstr "Account Bestaat Reeds"
-#~ msgid "Project Already Attached"
-#~ msgstr "Project Reeds Toegevoegd"
-#~ msgid "Project Attach Failure"
-#~ msgstr "Project Toevoeg Fout"
-#~ msgid "Failure Communicating with Reference Site"
-#~ msgstr "Fout tijdens Verbinding met Referentie Pagina"
-#~ msgid "Net Detection Failure"
-#~ msgstr "Netwerk Detectie Fout"
-#~ msgid ""
-#~ "You can copy and paste the URL from your browser's\n"
-#~ "address bar."
-#~ msgstr ""
-#~ "Het is mogelijk dit URL te kopiëren uit je browser's\n"
-#~ "adresbalk."
-#~ msgid "For a list of account managers go to:"
-#~ msgstr "Voor een lijst met 'account managers' ga naar:"
-#~ msgid "&Advanced View"
-#~ msgstr "Sorteerbaar"
-#~ msgid "You are already attached to this project."
-#~ msgstr "Je hebt dit project reeds toegevoegd."
-#~ msgid "Static text"
-#~ msgstr "Statische tekst"
-#~ msgid "Radiobutton"
-#~ msgstr "Keuzeknop"
-#~ msgid "Short term debt"
-#~ msgstr "Korte termijn eis"
-#~ msgid "Long term debt"
-#~ msgstr "Lange termijn eis"
-#~ msgid "Test"
-#~ msgstr "Test"
-#~ msgid "Enter account key"
-#~ msgstr "Vul account key in"
-#~ msgid ""
-#~ "This project uses an \"account key\" to identify you.\n"
-#~ "\n"
-#~ "Go to the project's web site to create an account. Your account\n"
-#~ "key will be emailed to you."
-#~ msgstr ""
-#~ "Dit project gebruikt een \"account key\" voor indentificatie.\n"
-#~ "\n"
-#~ "Ga naar de website van het project om een account te maken.\n"
-#~ "De Account Key wordt per email toe gestuurd."
-#~ msgid "An account key looks like:"
-#~ msgstr "Een Account Key lijkt op:"
-#~ msgid "82412313ac88e9a3638f66ea82186948"
-#~ msgstr "82412313ac88e9a3638f66ea82186948"
-#~ msgid "Account key:"
-#~ msgstr "Account key:"
-#~ msgid "For a list of BOINC-based account managers go to:"
-#~ msgstr "Voor een lijst van BOINC gebaseerde account managers ga naar:"
-#~ msgid "&Accessible View"
-#~ msgstr "Toegankelijk"
-#~ msgid ""
-#~ "Accessible views are compatible with accessibility aids such as screen "
-#~ "readers."
-#~ msgstr ""
-#~ "De toegankelijkheids weergave is bruikbaar in combinatie met o.a. een "
-#~ "\"verteller\"."
-#~ msgid "&Grid View"
-#~ msgstr "Sorteerbaar"
-#~ msgid ""
-#~ "Grid views allow you to sort various columns and displays graphical "
-#~ "progress bars."
-#~ msgstr ""
-#~ "De sorteerbare weergave geeft de mogelijkheid om de kolommen te sorteren "
-#~ msgid ":"
-#~ msgstr ":"
-#~ msgid ""
-#~ "%s is going to shutdown the core client it is currently connected to.\n"
-#~ "NOTE: Choosing 'OK' will cause the select new computer dialog to appear \n"
-#~ "so you can attach to a different core client."
-#~ msgstr ""
-#~ "%s zal de client, die op dit moment verbonden is, afsluiten.\n"
-#~ "LET OP: Op 'OK' klikken opent een venster om een andere client te\n"
-#~ "kiezen, kies 'Annuleer' indien dit niet de bedoeling is."
-#~ msgid "BOINC leaves at least this amount of disk space free (in Gigagytes)"
-#~ msgstr ""
-#~ "BOINC moet minimaal deze hoeveelheid ruimte vrij laten (in Gigabyte)"
-#~ msgid "Click here to disable displaying this message in the future."
-#~ msgstr "Klik hier om deze boodschap in het vervolg niet meer te tonen."
-#~ msgid "Language Selection:"
-#~ msgstr "Taalselectie:"
-#~ msgid "What language should the manager display by default."
-#~ msgstr "Welke standaard taal moet de manager gebruiken."
-#~ msgid "Reminder Frequency:"
-#~ msgstr "Herinnerings interval:"
-#~ msgid ""
-#~ "How often, in minutes, should the manager remind you of possible "
-#~ "connection events."
-#~ msgstr ""
-#~ "Hoe vaak, in minuten, moet de manager een herinnering weergeven over "
-#~ "mogelijke verbindings handelingen."
-#~ msgid ""
-#~ "BOINC failed to communicate on the Internet. The most likely\n"
-#~ "reasons are:\n"
-#~ "\n"
-#~ "1) Connectivity problem.  Check your network\n"
-#~ "or modem connection and click Back to try again.\n"
-#~ "\n"
-#~ "2) Personal firewall software is blocking BOINC.\n"
-#~ "Configure your personal firewall to let BOINC\n"
-#~ "communicate on port 80, then click Back to try again.\n"
-#~ "\n"
-#~ "3) You are using a proxy server.\n"
-#~ "Click Next to configure BOINC's proxy settings."
-#~ msgstr ""
-#~ "BOINC kon geen internet verbinding maken. De meest\n"
-#~ "voorkomende redenen zijn:\n"
-#~ "\n"
-#~ "1) Verbindings probleem. Controleer a.u.b. of je verbinding\n"
-#~ "met het internet actief is. Klik daarna op de Vorige knop om\n"
-#~ "het nogmaals te proberen.\n"
-#~ "\n"
-#~ "2) Een persoonlijke firewall blokkeert BOINC. Stel de\n"
-#~ "aanwezige firewall zo in dat BOINC via poort 80 kan\n"
-#~ "communiceren. Klik vervolgens op Vorige.\n"
-#~ "\n"
-#~ "3) Je gebruikt een Proxy server.\n"
-#~ "Klik op Volgende om de proxy correct in te stellen."
-#~ msgid "total disk usage"
-#~ msgstr "totaal schijfgebruik"
-#~ msgid "disk usage by BOINC projects"
-#~ msgstr "schijfgebruik door BOINC projecten"
-#~ msgid "not attached to any BOINC project - 0 bytes"
-#~ msgstr "Geen BOINC projecten toegevoegd - 0 Bytes"
-#~ msgid "used by BOINC - "
-#~ msgstr "gebruikt door BOINC projecten - "
-#~ msgid "used by other programs - "
-#~ msgstr "gebruikt door anderen - "
-#~ msgid "Project Comm Failure"
-#~ msgstr "Project Comm. Fout"
-#~ msgid "Google Comm Failure"
-#~ msgstr "Google Comm. Fout"
-#~ msgid "Yahoo Comm Failure"
-#~ msgstr "Yahoo Comm. Fout"
-
+msgid "Quit %s"
+msgstr "%s Sluiten"
diff --git a/locale/nl/BOINC-Project-Generic.po b/locale/nl/BOINC-Project-Generic.po
old mode 100755
new mode 100644
index 7ae8384..f4bc65b
--- a/locale/nl/BOINC-Project-Generic.po
+++ b/locale/nl/BOINC-Project-Generic.po
@@ -1,26 +1,25 @@
 # BOINC web translation
 # Copyright (C) 2008 University of California
+# 
 # This file is distributed under the same license as BOINC.
+# 
 # FileID  : $Id$
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\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: 2014-01-17 18:18+0000\n"
-"Last-Translator: Rene <oskamjr at ziggo.nl>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: nl\n"
+"PO-Revision-Date: 2015-02-08 23:38+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\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"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.5.0\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-SearchPath-0: html\\user\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
-"X-POOTLE-MTIME: 1389982727.0\n"
 
 msgid "LANG_NAME_NATIVE"
 msgstr "Nederlands"
@@ -63,9 +62,7 @@ msgstr "Afbeelding invoegen: [img]http://url_van_afbeelding[/img]  (alt+p)"
 #: ../inc/bbcode_html.inc:35
 msgid ""
 "Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url]  (alt+w)"
-msgstr ""
-"URL invoegen: [url]http://url[/url] or [url=http://url]URL tekst[/url]  "
-"(alt+w)"
+msgstr "URL invoegen: [url]http://url[/url] or [url=http://url]URL tekst[/url]  (alt+w)"
 
 #: ../inc/bbcode_html.inc:42
 msgid "Font color"
@@ -74,9 +71,7 @@ msgstr "Teken kleur"
 #: ../inc/bbcode_html.inc:43
 msgid ""
 "Font color: [color=red]text[/color]  Tip: you can also use color=#FF0000"
-msgstr ""
-"Teken kleur: [color=red]tekst[/color]  Tip: color=#FF0000 mag ook worden "
-"gebruikt"
+msgstr "Teken kleur: [color=red]tekst[/color]  Tip: color=#FF0000 mag ook worden gebruikt"
 
 #: ../inc/bbcode_html.inc:44 ../inc/bbcode_html.inc:59 ../inc/prefs.inc:638
 msgid "Default"
@@ -297,11 +292,9 @@ msgstr "Aangepast op: %1"
 
 #: ../inc/forum.inc:640
 msgid ""
-"This post is not shown because the sender is on your 'ignore' list.  Click %"
-"1here%2 to view this post"
-msgstr ""
-"Dit bericht wordt niet getoond, omdat de gebruiker op de 'negeer' lijst "
-"staat.  Klik %1hier%2 om weer te geven"
+"This post is not shown because the sender is on your 'ignore' list.  Click "
+"%1here%2 to view this post"
+msgstr "Dit bericht wordt niet getoond, omdat de gebruiker op de 'negeer' lijst staat.  Klik %1hier%2 om weer te geven"
 
 #: ../inc/forum.inc:668 ../inc/forum.inc:679
 msgid "Report this post as offensive"
@@ -379,23 +372,7 @@ msgid ""
 "        <li> No abusive comments involving race, religion,\n"
 "            nationality, gender, class or sexuality.\n"
 "        "
-msgstr ""
-"\n"
-"        <ul>\n"
-"        <li> Hou berichten 'kind vriendelijk': vermijd woorden die\n"
-"            obsceen zijn, haat-gerelateerd,\n"
-"            seksueel getint of suggestief.\n"
-"        <li> Plaats geen commerciële advertenties.\n"
-"        <li> Plaats geen links naar websites met seksuele inhoud,\n"
-"            gokken of intolerantie naar anderen.\n"
-"        <li> Plaats geen berichten met de intentie om andere mensen te "
-"kwetsen,\n"
-"            te beledigen of om het onderwerp over te nemen.\n"
-"        <li> Plaats geen berichten die kunnen worden evaren als een "
-"persoonlijke aanval.\n"
-"        <li> Gebruik geen tekst gericht tegen ras, religie,\n"
-"            nationaliteit, geslacht, klasse of seksuele geaardheid.\n"
-"        "
+msgstr "\n        <ul>\n        <li> Hou berichten 'kind vriendelijk': vermijd woorden die\n            obsceen zijn, haat-gerelateerd,\n            seksueel getint of suggestief.\n        <li> Plaats geen commerciële advertenties.\n        <li> Plaats geen links naar websites met seksuele inhoud,\n            gokken of intolerantie naar anderen.\n        <li> Plaats geen berichten met de intentie om andere mensen te kwetsen,\n            te beledigen of om het onderwerp over te nemen.\n [...]
 
 #: ../inc/forum.inc:780
 msgid "Rules:"
@@ -453,26 +430,20 @@ msgstr "Alleen team leden mogen berichten plaatsen op dit forum"
 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 ""
-"Om een nieuw onderwerp te plaatsen in %1 is het nodig om een minimaal aantal "
-"punten te hebben. Dit is nodig om misbruik te voorkomen."
+msgstr "Om een nieuw onderwerp te plaatsen in %1 is het nodig om een minimaal aantal punten te hebben. Dit is nodig om misbruik te voorkomen."
 
 #: ../inc/forum.inc:1133
 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 ""
-"Op dit moment kan je geen nieuwe onderwerpen plaatsen. Probeer dit later "
-"a.u.b overnieuw. Deze vertraging is ingebouwd om misbruik te voorkomen."
+msgstr "Op dit moment kan je geen nieuwe onderwerpen plaatsen. Probeer dit later a.u.b overnieuw. Deze vertraging is ingebouwd om misbruik te voorkomen."
 
 #: ../inc/forum.inc:1140
 msgid ""
 "This thread is locked. Only forum moderators and administrators are allowed "
 "to post there."
-msgstr ""
-"Dit onderwerp is gesloten. Alleen forum moderators en admins mogen hier "
-"berichten plaatsen."
+msgstr "Dit onderwerp is gesloten. Alleen forum moderators en admins mogen hier berichten plaatsen."
 
 #: ../inc/forum.inc:1145
 msgid "Can't post to a hidden thread."
@@ -734,9 +705,7 @@ msgstr "% van de tijd dat de BOINC cliënt actief is"
 #: ../inc/host.inc:189
 #, php-format
 msgid "While BOINC running, % of time host has an Internet connection"
-msgstr ""
-"% van de tijd dat de computer verbinding heeft met het internet terwijl "
-"BOINC loopt."
+msgstr "% van de tijd dat de computer verbinding heeft met het internet terwijl BOINC loopt."
 
 #: ../inc/host.inc:191
 #, php-format
@@ -961,9 +930,7 @@ msgstr "kon geen bericht aanmaken"
 msgid ""
 "You are not allowed to send privates messages so often. Please wait some "
 "time before sending more messages."
-msgstr ""
-"Het is niet toegestaan om snel achter elkaar veel berichten te versturen. "
-"Wacht a.u.b. even met versturen andere berichten."
+msgstr "Het is niet toegestaan om snel achter elkaar veel berichten te versturen. Wacht a.u.b. even met versturen andere berichten."
 
 #: ../inc/pm.inc:176 ../user/forum_forum.php:186
 msgid "unread"
@@ -981,9 +948,7 @@ msgstr "Privé berichten"
 msgid ""
 "Suspend work while computer is on battery power? %1 Matters only for "
 "portable computers %2"
-msgstr ""
-"Werk onderbreken indien computer op accu werkt? %1(van toepassing bij "
-"laptops e.d.)%2"
+msgstr "Werk onderbreken indien computer op accu werkt? %1(van toepassing bij laptops e.d.)%2"
 
 #: ../inc/prefs.inc:85
 msgid "Suspend work while computer is in use?"
@@ -992,9 +957,7 @@ msgstr "Werk onderbreken indien computer in gebruik is?"
 #: ../inc/prefs.inc:91
 msgid ""
 "Suspend GPU work while computer is in use? %1 Enforced by version 6.6.21+ %2"
-msgstr ""
-"Werk voor GPU onderbreken indien computer in gebruik is? %1 Instelbaar vanaf "
-"versie 6.6.21+ %2"
+msgstr "Werk voor GPU onderbreken indien computer in gebruik is? %1 Instelbaar vanaf versie 6.6.21+ %2"
 
 #: ../inc/prefs.inc:99
 msgid "'In use' means mouse/keyboard activity in last"
@@ -1008,17 +971,13 @@ msgstr "minuten"
 msgid ""
 "Suspend work if no mouse/keyboard activity in last %1 Needed to enter low-"
 "power mode on some computers %2"
-msgstr ""
-"Werk onderbreken indien er geen muis/toetsenbord gebruik is geweest in "
-"laatste %1 Nodig op sommige computers om sluimer-modus te activeren %2"
+msgstr "Werk onderbreken indien er geen muis/toetsenbord gebruik is geweest in laatste %1 Nodig op sommige computers om sluimer-modus te activeren %2"
 
 #: ../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 ""
-"Werk onderbreken indien CPU gebruik hoger is dan %1 0 betekend geen "
-"beperking<br>Instelbaar vanaf versie 6.10.30+ %2"
+msgstr "Werk onderbreken indien CPU gebruik hoger is dan %1 0 betekend geen beperking<br>Instelbaar vanaf versie 6.10.30+ %2"
 
 #: ../inc/prefs.inc:122
 msgid "Do work only between the hours of %1 No restriction if equal %2"
@@ -1028,9 +987,7 @@ msgstr "Alleen werk uitvoeren tussen %1 Geen beperking indien gelijk %2"
 msgid ""
 "Leave tasks in memory while suspended? %1 Suspended tasks will consume swap "
 "space if 'yes' %2"
-msgstr ""
-"Gepauzeerde taken in het geheugen houden? %1 Kan ten kosten gaan van de "
-"hoeveelheid vrij geheugen %2"
+msgstr "Gepauzeerde taken in het geheugen houden? %1 Kan ten kosten gaan van de hoeveelheid vrij geheugen %2"
 
 #: ../inc/prefs.inc:139
 msgid "Switch between tasks every %1 Recommended: 60 minutes %2"
@@ -1046,9 +1003,7 @@ msgstr "processoren"
 
 #: ../inc/prefs.inc:153
 msgid "On multiprocessors, use at most %1 Enforced by version 6.1+ %2"
-msgstr ""
-"Bij meerdere processoren, gebruik maximaal %1 Instelbaar vanaf versie 6.1+ %"
-"2"
+msgstr "Bij meerdere processoren, gebruik maximaal %1 Instelbaar vanaf versie 6.1+ %2"
 
 #: ../inc/prefs.inc:158
 #, php-format
@@ -1074,8 +1029,7 @@ msgstr "GB"
 
 #: ../inc/prefs.inc:180
 msgid "Disk: leave free at least %1 Values smaller than %2 are ignored %3"
-msgstr ""
-"Schijf: laat minstens vrij %1 Waarden kleiner dan %2 worden genegeerd %3"
+msgstr "Schijf: laat minstens vrij %1 Waarden kleiner dan %2 worden genegeerd %3"
 
 #: ../inc/prefs.inc:191 ../inc/prefs.inc:201 ../inc/prefs.inc:206
 #: ../inc/prefs.inc:211
@@ -1120,17 +1074,13 @@ msgstr "... en aangevuld tot maximaal"
 msgid ""
 "Confirm before connecting to Internet? %1 Matters only if you have a modem, "
 "ISDN or VPN connection %2"
-msgstr ""
-"Bevestiging bij het openen van de internet verbinding? %1 Alleen van belang "
-"bij een modem, ISDN of VPN verbinding %2"
+msgstr "Bevestiging bij het openen van de internet verbinding? %1 Alleen van belang bij een modem, ISDN of VPN verbinding %2"
 
 #: ../inc/prefs.inc:241
 msgid ""
 "Disconnect when done? %1 Matters only if you have a modem, ISDN or VPN "
 "connection %2"
-msgstr ""
-"Verbinding verbreken indien gereed? %1 Alleen van belang bij een modem, ISDN "
-"of VPN verbinding %2"
+msgstr "Verbinding verbreken indien gereed? %1 Alleen van belang bij een modem, ISDN of VPN verbinding %2"
 
 #: ../inc/prefs.inc:249
 msgid "Maximum download rate:"
@@ -1159,24 +1109,17 @@ msgstr "Megabyte elke"
 #: ../inc/prefs.inc:274
 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 ""
-"Verificatie van bestand overslaan? %1 Vink dit alleen aan als je provider de "
-"indeling van bestanden aanpast (UMTS doet dit bijvoorbeeld). %2 Verificatie "
-"overslaan verlaagt de veiligheid van BOINC.%3"
+"modifies image files (UMTS does this, for example). %2 Skipping verification"
+" reduces the security of BOINC. %3"
+msgstr "Verificatie van bestand overslaan? %1 Vink dit alleen aan als je provider de indeling van bestanden aanpast (UMTS doet dit bijvoorbeeld). %2 Verificatie overslaan verlaagt de veiligheid van BOINC.%3"
 
 #: ../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 "
+"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 ""
-"Gedeelde bronnen %1 Bepaalt de hoeveelheid gedeelde bronnen van computers "
-"verbonden met dit project. Voorbeeld: Als je computer deelneemt aan 2 BOINC "
-"projecten met gedeelde bronnen van 100 en 200, zal het eerste project 1/3 en "
-"het tweede project 2/3 van de beschikbare bronnen krijgen. %2"
+msgstr "Gedeelde bronnen %1 Bepaalt de hoeveelheid gedeelde bronnen van computers verbonden met dit project. Voorbeeld: Als je computer deelneemt aan 2 BOINC projecten met gedeelde bronnen van 100 en 200, zal het eerste project 1/3 en het tweede project 2/3 van de beschikbare bronnen krijgen. %2"
 
 #: ../inc/prefs.inc:298
 msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
@@ -1202,16 +1145,13 @@ msgstr "Gebruik Intel GPU %1 Instelbaar vanaf 7.2+ %2"
 msgid ""
 "Run test applications? %1 This helps us develop applications, but may cause "
 "jobs to fail on your computer %2"
-msgstr ""
-"Test applicaties uitvoeren? %1 Dit helpt ons bij het ontwikkelen van "
-"applicaties, maar kan fouten veroorzaken tijdens het uitvoeren %2"
+msgstr "Test applicaties uitvoeren? %1 Dit helpt ons bij het ontwikkelen van applicaties, maar kan fouten veroorzaken tijdens het uitvoeren %2"
 
 #: ../inc/prefs.inc:367
 msgid ""
-"Emails will be sent from %1; make sure your spam filter accepts this address."
-msgstr ""
-"Er worden door %1 e-mails naar je verzonden; zorg ervoor dat een eventueel "
-"spamfilter ze niet blokkeert."
+"Emails will be sent from %1; make sure your spam filter accepts this "
+"address."
+msgstr "Er worden door %1 e-mails naar je verzonden; zorg ervoor dat een eventueel spamfilter ze niet blokkeert."
 
 #: ../inc/prefs.inc:374
 msgid "Is it OK for %1 and your team (if any) to email you?"
@@ -1236,16 +1176,13 @@ msgstr "Netwerkgebruik"
 #: ../inc/prefs.inc:392
 msgid ""
 "These preferences apply to all the BOINC projects in which you participate."
-msgstr ""
-"Deze voorkeuren hebben betrekking op alle projecten waar je aan deelneemt."
+msgstr "Deze voorkeuren hebben betrekking op alle projecten waar je aan deelneemt."
 
 #: ../inc/prefs.inc:395
 msgid ""
-"%1Unable to update preferences.%2 The values marked in red below were out of "
-"range or not numeric."
-msgstr ""
-"%1Voorkeuren bijwerken niet gelukt.%2 De waarden gemarkeerd in rood zijn "
-"niet correct ingevuld."
+"%1Unable to update preferences.%2 The values marked in red below were out of"
+" range or not numeric."
+msgstr "%1Voorkeuren bijwerken niet gelukt.%2 De waarden gemarkeerd in rood zijn niet correct ingevuld."
 
 #: ../inc/prefs.inc:445
 msgid "bad venue: %1"
@@ -1324,9 +1261,7 @@ msgstr "Dit heeft betrekking op alle projecten waar je aan mee doet."
 msgid ""
 "On computers participating in multiple projects, the most recently modified "
 "preferences will be used."
-msgstr ""
-"Op computers met meerdere projecten, worden de meest recent aangepaste "
-"voorkeuren gebruikt."
+msgstr "Op computers met meerdere projecten, worden de meest recent aangepaste voorkeuren gebruikt."
 
 #: ../inc/prefs.inc:889
 msgid "These preferences do not apply to Android devices."
@@ -1356,17 +1291,13 @@ msgstr "en"
 msgid ""
 "Your profile will be made visible to other people as soon as it has been "
 "approved by the project. This may take up to a few days."
-msgstr ""
-"Je profiel wordt zichtbaar voor anderen, zodra deze is goedgekeurd door het "
-"project. Dit kan mogelijk enkele dagen duren."
+msgstr "Je profiel wordt zichtbaar voor anderen, zodra deze is goedgekeurd door het project. Dit kan mogelijk enkele dagen duren."
 
 #: ../inc/profile.inc:92
 msgid ""
 "Your profile has been marked as unacceptable. It is not visible to other "
 "people. Please change it."
-msgstr ""
-"Je profiel is gemarkeerd als onaanvaardbaar en niet zichtbaar voor anderen. "
-"Pas het a.u.b. aan."
+msgstr "Je profiel is gemarkeerd als onaanvaardbaar en niet zichtbaar voor anderen. Pas het a.u.b. aan."
 
 #: ../inc/profile.inc:172 ../user/friend.php:105 ../user/friend.php:172
 msgid "Database error"
@@ -1376,10 +1307,7 @@ msgstr "Database fout"
 msgid ""
 "To prevent spam, profiles of users with an average credit of less than %1 "
 "are displayed only to logged-in users. We apologize for this inconvenience."
-msgstr ""
-"Om spam te voorkomen, worden profielen met een gemiddeld aantal punten van "
-"minder dan %1 alleen getoond aan ingelogde gebruikers. Onze excuses voor dit "
-"ongemak."
+msgstr "Om spam te voorkomen, worden profielen met een gemiddeld aantal punten van minder dan %1 alleen getoond aan ingelogde gebruikers. Onze excuses voor dit ongemak."
 
 #: ../inc/profile.inc:197
 msgid "User is banished"
@@ -1794,8 +1722,7 @@ msgstr "Zoek"
 
 #: ../inc/team.inc:61
 msgid "Requested by you, and founder response deadline has passed."
-msgstr ""
-"Op eigen verzoek, deadline voor de oprichter om te reageren is verlopen."
+msgstr "Op eigen verzoek, deadline voor de oprichter om te reageren is verlopen."
 
 #: ../inc/team.inc:63
 msgid "Complete foundership transfer"
@@ -1858,10 +1785,7 @@ msgstr "Sluit je aan bij dit team"
 msgid ""
 "Note: if 'OK to email' is set in your project preferences, joining a team "
 "gives its founder access to your email address."
-msgstr ""
-"NB: als je \"email toestaan\" hebt ingevuld bij je project voorkeuren, zal je "
-"email adres bekend worden bij de team oprichter, indien je jezelf bij een "
-"team opgeeft."
+msgstr "NB: als je \"email toestaan\" hebt ingevuld bij je project voorkeuren, zal je email adres bekend worden bij de team oprichter, indien je jezelf bij een team opgeeft."
 
 #: ../inc/team.inc:140
 msgid "Not accepting new members"
@@ -1941,20 +1865,15 @@ msgstr "Deze actie vereist administrator rechten"
 
 #: ../inc/team.inc:422
 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 ""
-"WAARSCHUWING: dit is een BOINC-wide team. Indien je hier wijzigingen "
-"aanbrengt, worden ze snel overschreven. Pas daarom het %1BOINC-wide team%2 "
-"zelf aan."
+"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 "WAARSCHUWING: dit is een BOINC-wide team. Indien je hier wijzigingen aanbrengt, worden ze snel overschreven. Pas daarom het %1BOINC-wide team%2 zelf aan."
 
 #: ../inc/team.inc:428
 msgid ""
 "%1Privacy note%2: if you create a team, your project preferences (resource "
 "share, graphics preferences) will be visible to the public."
-msgstr ""
-"%1Let op%2: Als je een team opricht worden je project voorkeuren (gedeelde "
-"bronnen, grafische voorkeuren) zichtbaar voor iedereen."
+msgstr "%1Let op%2: Als je een team opricht worden je project voorkeuren (gedeelde bronnen, grafische voorkeuren) zichtbaar voor iedereen."
 
 #: ../inc/team.inc:432
 msgid "Team name, text version"
@@ -2266,9 +2185,7 @@ msgstr "Server status"
 msgid ""
 "A database error occurred while handling your request; please try again "
 "later."
-msgstr ""
-"De database genereerde een foutmelding bij de behandeling van uw verzoek, "
-"probeer het later nog eens alstublieft."
+msgstr "De database genereerde een foutmelding bij de behandeling van uw verzoek, probeer het later nog eens alstublieft."
 
 #: ../inc/util.inc:257
 msgid "Unable to handle request"
@@ -2287,9 +2204,9 @@ msgid "sec"
 msgstr "seconden"
 
 #: ../inc/util.inc:444
-msgid "Link has timed out. Please click Back, refresh the page, and try again."
-msgstr ""
-"Wachttijd voor deze link is verlopen. Klik op 'terug' en vernieuw de pagina."
+msgid ""
+"Link has timed out. Please click Back, refresh the page, and try again."
+msgstr "Wachttijd voor deze link is verlopen. Klik op 'terug' en vernieuw de pagina."
 
 #: ../inc/util.inc:513
 msgid "View the profile of %1"
@@ -2305,9 +2222,7 @@ msgstr "Project wegens onderhoud gesloten"
 
 #: ../inc/util.inc:799
 msgid "%1 is temporarily shut down for maintenance.  Please try again later."
-msgstr ""
-"%1 is tijdelijk gesloten wegens onderhoud.  Probeer het later a.u.b. "
-"opnieuw."
+msgstr "%1 is tijdelijk gesloten wegens onderhoud.  Probeer het later a.u.b. opnieuw."
 
 #: ../inc/util.inc:817
 msgid "Unable to connect to database - please try again later"
@@ -2364,11 +2279,7 @@ msgid ""
 "work 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 heeft op dit moment de volgende applicaties. Als je deelneemt aan %1, is "
-"het mogelijk dat er werk voor één of meerdere van deze applicaties wordt "
-"toegedeeld. De meest recente versie zal worden gebruikt en gedownload. Dit "
-"gebeurd automatisch; hier hoef je zelf niets voor te doen."
+msgstr "%1 heeft op dit moment de volgende applicaties. Als je deelneemt aan %1, is het mogelijk dat er werk voor één of meerdere van deze applicaties wordt toegedeeld. De meest recente versie zal worden gebruikt en gedownload. Dit gebeurd automatisch; hier hoef je zelf niets voor te doen."
 
 #: ../user/apps.php:50
 msgid "Platform"
@@ -2392,12 +2303,7 @@ msgid ""
 "It's similar to HTML, but simpler. The tags start with a [ (where you would\n"
 "have used %1 in HTML) and end with ] (where you would have used %2 in\n"
 "HTML)."
-msgstr ""
-"BBCode tags laten je toe om opmaak mee te geven aan je tekst in je profiel "
-"of op je message-board berichten. \n"
-"Het is vergelijkbaar met HTML maar eenvoudiger. De tags starten met een [ "
-"(waar je een %1 zou gebruiken in HTML) en eindigen met een ] (waar je %2 zou "
-"gebruiken in HTML)."
+msgstr "BBCode tags laten je toe om opmaak mee te geven aan je tekst in je profiel of op je message-board berichten. \nHet is vergelijkbaar met HTML maar eenvoudiger. De tags starten met een [ (waar je een %1 zou gebruiken in HTML) en eindigen met een ] (waar je %2 zou gebruiken in HTML)."
 
 #: ../user/bbcode.php:31
 msgid "Examples"
@@ -2487,10 +2393,7 @@ msgstr "gebruikt om een link te maken naar de SVN changeset op de BOINC website"
 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 ""
-"Indien je een tag niet correct afsluit of een parameter incorrect "
-"specificeert,\n"
-"dan zal de ruwe tag zichzelf tonen in plaats van de geformatteerde tekst."
+msgstr "Indien je een tag niet correct afsluit of een parameter incorrect specificeert,\ndan zal de ruwe tag zichzelf tonen in plaats van de geformatteerde tekst."
 
 #: ../user/bs_sample_index.php:44
 msgid "Participants"
@@ -2588,10 +2491,9 @@ msgstr "De ingevulde uitnodigings code is ongeldig."
 
 #: ../user/create_account_action.php:84
 msgid ""
-"Invalid email address: you must enter a valid address of the form name at domain"
-msgstr ""
-"Ongeldig e-mail adres; gebruik een geldig email adres in de vorm "
-"'naam at domein'"
+"Invalid email address: you must enter a valid address of the form "
+"name at domain"
+msgstr "Ongeldig e-mail adres; gebruik een geldig email adres in de vorm 'naam at domein'"
 
 #: ../user/create_account_action.php:88
 msgid "There's already an account with that email address."
@@ -2607,8 +2509,7 @@ msgstr "Wachtwoord kan enkel ASCII karakters bevatten."
 
 #: ../user/create_account_action.php:106 ../user/edit_passwd_action.php:45
 msgid "New password is too short: minimum password length is %1 characters."
-msgstr ""
-"Het nieuwe wachtwoord is te kort. Minimum wachtwoord lengte is %1 karakters."
+msgstr "Het nieuwe wachtwoord is te kort. Minimum wachtwoord lengte is %1 karakters."
 
 #: ../user/create_account_action.php:127
 msgid "Couldn't create account"
@@ -2618,18 +2519,13 @@ msgstr "Account aanmaken niet gelukt"
 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 ""
-"LET OP: gebruik dit formulier niet als je de BOINC Manager gebruikt. Start "
-"BOINC, selecteer 'Project Toevoegen' en vul een e-mail adres en wachtwoord "
-"in."
+msgstr "LET OP: gebruik dit formulier niet als je de BOINC Manager gebruikt. Start BOINC, selecteer 'Project Toevoegen' en vul een e-mail adres en wachtwoord in."
 
 #: ../user/create_account_form.php:61
 msgid ""
 "This account will belong to the team %1 and will have the project "
 "preferences of its founder."
-msgstr ""
-"Dit account zal tot het %1 team behoren en zal de project voorkeuren van de "
-"oprichter hebben."
+msgstr "Dit account zal tot het %1 team behoren en zal de project voorkeuren van de oprichter hebben."
 
 #: ../user/create_account_form.php:73
 msgid "Invitation Code"
@@ -2637,8 +2533,7 @@ msgstr "Uitnodigings Code"
 
 #: ../user/create_account_form.php:73
 msgid "A valid invitation code is required to create an account."
-msgstr ""
-"Er is een geldige uitnodigings code vereist om een account aan te maken."
+msgstr "Er is een geldige uitnodigings code vereist om een account aan te maken."
 
 #: ../user/create_account_form.php:83
 msgid "Email Address"
@@ -2678,11 +2573,9 @@ msgstr "%1 Deze profiel afbeelding wordt links getoond."
 
 #: ../user/create_profile.php:66
 msgid ""
-"To replace it, click the \"Browse\" button and select a JPEG or PNG file (%1 "
-"or less)."
-msgstr ""
-"Om deze te vervangen, klik op \"Bladeren\" en selecteer een JPEG of PNG "
-"afbeelding (%1 of kleiner)."
+"To replace it, click the \"Browse\" button and select a JPEG or PNG file (%1"
+" or less)."
+msgstr "Om deze te vervangen, klik op \"Bladeren\" en selecteer een JPEG of PNG afbeelding (%1 of kleiner)."
 
 #: ../user/create_profile.php:69
 msgid "To remove it from your profile, check this box:"
@@ -2692,10 +2585,7 @@ msgstr "Om de afbeelding te verwijderen, dit vakje aanvinken:"
 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 ""
-"Als je een afbeelding wilt toevoegen aan je profiel, klik dan op \"Bladeren\" "
-"en selecteer een JPEG of PNG afbeelding. Kies a.u.b. afbeeldingen van %1 of "
-"minder."
+msgstr "Als je een afbeelding wilt toevoegen aan je profiel, klik dan op \"Bladeren\" en selecteer een JPEG of PNG afbeelding. Kies a.u.b. afbeeldingen van %1 of minder."
 
 #: ../user/create_profile.php:89
 msgid "Language"
@@ -2725,9 +2615,7 @@ msgstr "De indeling van de geüploade afbeelding wordt niet ondersteund."
 msgid ""
 "Your %1profile%2 lets you share your opinions and background with the %3 "
 "community."
-msgstr ""
-"Je %1profiel%2 geeft je de mogelijkheid om je mening en achtergrond te delen "
-"met de %3 gemeenschap."
+msgstr "Je %1profiel%2 geeft je de mogelijkheid om je mening en achtergrond te delen met de %3 gemeenschap."
 
 #: ../user/create_profile.php:213
 msgid "Your ReCaptcha response was not correct.  Please try again."
@@ -2737,17 +2625,13 @@ msgstr "Je ReCaptcha antwoord was niet correct.  Probeer het a.u.b. opnieuw."
 msgid ""
 "Your first response was flagged as spam by the Akismet anti-spam system.  "
 "Please modify your text and try again."
-msgstr ""
-"Je eerste reactie wordt gezien als spam door het Akismet anti-spam systeem. "
-" Pas a.u.b. je tekst aan en probeer het opnieuw."
+msgstr "Je eerste reactie wordt gezien als spam door het Akismet anti-spam systeem.  Pas a.u.b. je tekst aan en probeer het opnieuw."
 
 #: ../user/create_profile.php:230
 msgid ""
 "Your second response was flagged as spam by the Akismet anti-spam system.  "
 "Please modify your text and try again."
-msgstr ""
-"Je tweede reactie wordt gezien als spam door het Akismet anti-spam systeem. "
-" Pas a.u.b. je tekst aan en probeer het opnieuw."
+msgstr "Je tweede reactie wordt gezien als spam door het Akismet anti-spam systeem.  Pas a.u.b. je tekst aan en probeer het opnieuw."
 
 #: ../user/create_profile.php:246
 msgid "Your profile submission was empty."
@@ -2780,11 +2664,9 @@ msgstr "Een profiel aanmaken"
 
 #: ../user/create_profile.php:343
 msgid ""
-"To prevent spam, an average credit of %1 or greater is required to create or "
-"edit a profile.  We apologize for this inconvenience."
-msgstr ""
-"Om spam te voorkomen, moet je een gemiddeld aantal punten hebben van %1 of "
-"groter om een profiel te maken of aan te passen.  Excuses voor het ongemak."
+"To prevent spam, an average credit of %1 or greater is required to create or"
+" edit a profile.  We apologize for this inconvenience."
+msgstr "Om spam te voorkomen, moet je een gemiddeld aantal punten hebben van %1 of groter om een profiel te maken of aan te passen.  Excuses voor het ongemak."
 
 #: ../user/delete_account.php:57
 msgid "Couldn't delete account"
@@ -2809,20 +2691,13 @@ msgid ""
 "including your profile and message-board posts.\n"
 "No jobs will be issued to any computers attached\n"
 "to this account."
-msgstr ""
-"Het verwijderen van je gebruikersaccount zal al je\n"
-"persoonlijke informatie verwijderen van onze servers,\n"
-"inclusief je profiel en forum berichten.\n"
-"Er zullen geen taken worden toegewezen aan de computers\n"
-"welke gelinkt staan met deze account."
+msgstr "Het verwijderen van je gebruikersaccount zal al je\npersoonlijke informatie verwijderen van onze servers,\ninclusief je profiel en forum berichten.\nEr zullen geen taken worden toegewezen aan de computers\nwelke gelinkt staan met deze account."
 
 #: ../user/delete_account.php:73
 msgid ""
 "This cannot be undone.\n"
 "Once your account has been deleted, you cannot get it back."
-msgstr ""
-"Deze actie kan niet ongedaan gemaakt worden.\n"
-"Wanneer deze account is verwijdert, kan je hem niet meer terug oproepen."
+msgstr "Deze actie kan niet ongedaan gemaakt worden.\nWanneer deze account is verwijdert, kan je hem niet meer terug oproepen."
 
 #: ../user/delete_account.php:76
 msgid "Are you sure you want to delete your account?"
@@ -2851,8 +2726,7 @@ msgstr "Verwijder deze account niet"
 
 #: ../user/delete_profile.php:30
 msgid "couldn't delete profile - please try again later"
-msgstr ""
-"verwijderen van dit profiel is mislukt - probeer het a.u.b. later nog eens"
+msgstr "verwijderen van dit profiel is mislukt - probeer het a.u.b. later nog eens"
 
 #: ../user/delete_profile.php:33
 msgid "Delete Confirmation"
@@ -2875,19 +2749,13 @@ 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 ""
-"Verwijderde profielen zijn permanent verwijderd en kunnen niet meer "
-"opgeroepen worden --\n"
-"Je zal een nieuw profiel moeten aanmaken\n"
-"als je in de toekomst een profiel wenst te gebruiken."
+msgstr "Verwijderde profielen zijn permanent verwijderd en kunnen niet meer opgeroepen worden --\nJe zal een nieuw profiel moeten aanmaken\nals je in de toekomst een profiel wenst te gebruiken."
 
 #: ../user/delete_profile.php:48
 msgid ""
 "If you're sure, click 'Yes'\n"
 "to remove your profile from our database."
-msgstr ""
-"Als je zeker bent, klik dan op 'Ja'\n"
-"om je profiel te verwijderen uit onze database."
+msgstr "Als je zeker bent, klik dan op 'Ja'\nom je profiel te verwijderen uit onze database."
 
 #: ../user/delete_profile.php:52
 msgid "Delete my profile"
@@ -2911,10 +2779,9 @@ msgstr "Je donatie is afgerond."
 
 #: ../user/donated.php:30
 msgid ""
-"Your donation will be added to the progress bar after confirmation by PayPal."
-msgstr ""
-"Uw donatie wordt verwerkt in de voortgangsbalk na de ontvangstbevestiging "
-"van Paypal."
+"Your donation will be added to the progress bar after confirmation by "
+"PayPal."
+msgstr "Uw donatie wordt verwerkt in de voortgangsbalk na de ontvangstbevestiging van Paypal."
 
 #: ../user/donated.php:32
 msgid "You have canceled your donation."
@@ -2932,9 +2799,7 @@ msgstr "%1 donaties"
 msgid ""
 "This project is accepting donations via\n"
 "%1."
-msgstr ""
-"Dit project neemt donaties aan d.m.v.\n"
-"%1."
+msgstr "Dit project neemt donaties aan d.m.v.\n%1."
 
 #: ../user/donations.php:42
 msgid ""
@@ -2949,19 +2814,7 @@ msgid ""
 "        to see the donation amount equivalent in different currencies\n"
 "        (please note that the rates are only estimates\n"
 "         and the actual amount may differ)."
-msgstr ""
-"Voor donaties vult u in het onderstaande veld het gewenste bedrag in.\n"
-"        PayPal accepteert transacties in diverse valuta\n"
-"        (Canadese dollar, euro, Britse pond, Amerikaanse dollar,\n"
-"         Yen, Australische dollar, Nieuw-Zeelandse dollar,\n"
-"        Zwitserse frank, Hong Kong dollar, Singapore dollar, Zweedse kroon,\n"
-"        Deense Kroon, Poolse zloty, Noorse Kroon,\n"
-"        Hongaarse forint, Tsjechische Koruna).\n"
-"        De bijgevoegde valuta converter kunt u gebruiken\n"
-"        om het equivalent van het bedrag te berekenen in diverse valuta.\n"
-"        (Attentie: de conversie is slechts een benadering,\n"
-"         het uiteindelijke bedrag kan afwijken van het oorspronkelijke "
-"bedrag)."
+msgstr "Voor donaties vult u in het onderstaande veld het gewenste bedrag in.\n        PayPal accepteert transacties in diverse valuta\n        (Canadese dollar, euro, Britse pond, Amerikaanse dollar,\n         Yen, Australische dollar, Nieuw-Zeelandse dollar,\n        Zwitserse frank, Hong Kong dollar, Singapore dollar, Zweedse kroon,\n        Deense Kroon, Poolse zloty, Noorse Kroon,\n        Hongaarse forint, Tsjechische Koruna).\n        De bijgevoegde valuta converter kunt u gebruik [...]
 
 #: ../user/donations.php:316
 msgid "Amount you would like to donate"
@@ -2979,17 +2832,11 @@ msgstr "Anonieme donatie"
 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 ""
-"U dient dit aan te vinken als u niet wilt dat uw naam en accountnummer "
-"voorkomt op\n"
-"de lijst van donateurs.<br>Indien niet aangevinkt, wordt uw deelnemers-"
-"identiteit als volgt geregistreerd %1"
+msgstr "U dient dit aan te vinken als u niet wilt dat uw naam en accountnummer voorkomt op\nde lijst van donateurs.<br>Indien niet aangevinkt, wordt uw deelnemers-identiteit als volgt geregistreerd %1"
 
 #: ../user/donations.php:324
 msgid "To assign the donation with your user ID, please log in."
-msgstr ""
-"Om de donatie aan u toe te wijzen, dient u zich eerst aan te melden met uw "
-"gebruikersnaam."
+msgstr "Om de donatie aan u toe te wijzen, dient u zich eerst aan te melden met uw gebruikersnaam."
 
 #: ../user/donations.php:328
 msgid "Proceed"
@@ -3010,26 +2857,18 @@ msgstr "Het is mogelijk software te downloaden in verschillende categorieën."
 #: ../user/download_network.php:31
 msgid ""
 "These applications are not endorsed by %1 and you use them at your own risk."
-msgstr ""
-"Deze programma's worden niet ondersteund door %1 en gebruik ervan is op "
-"eigen risico."
+msgstr "Deze programma's worden niet ondersteund door %1 en gebruik ervan is op eigen risico."
 
 #: ../user/download_network.php:33
 msgid ""
 "We do not provide instructions for installing these applications.\n"
-"However, the author may have provided some help on installing or "
-"uninstalling the application. \n"
+"However, the author may have provided some help on installing or uninstalling the application. \n"
 "If this is not enough you should contact the author."
-msgstr ""
-"Wij geven geen installatie instructies voor deze programma's.\n"
-"Het is evengoed mogelijk dat de maker instructies heeft toegevoegd bij het "
-"programma zelf. \n"
-"Als dit niet het geval is raden we aan contact op te nemen met de maker."
+msgstr "Wij geven geen installatie instructies voor deze programma's.\nHet is evengoed mogelijk dat de maker instructies heeft toegevoegd bij het programma zelf. \nAls dit niet het geval is raden we aan contact op te nemen met de maker."
 
 #: ../user/download_network.php:36
 msgid "Instructions for installing and running BOINC are %1here%2."
-msgstr ""
-"Instructies voor het installeren en uitvoeren van BOINC vind je %1hier%2."
+msgstr "Instructies voor het installeren en uitvoeren van BOINC vind je %1hier%2."
 
 #: ../user/download_network.php:38
 msgid "This list is managed centrally at %1the BOINC website%2."
@@ -3097,10 +2936,7 @@ msgstr "Herstellen bevestigen"
 msgid ""
 "This action will erase any changes you have made in your community "
 "preferences. To cancel, click your browser's Back button."
-msgstr ""
-"Deze opdracht maakt alle wijzigingen die u in uw voorkeursinstellingen hebt "
-"aangebracht, ongedaan. Dit kunt u annuleren door In uw browser op de knop "
-"'vorige pagina' te klikken."
+msgstr "Deze opdracht maakt alle wijzigingen die u in uw voorkeursinstellingen hebt aangebracht, ongedaan. Dit kunt u annuleren door In uw browser op de knop 'vorige pagina' te klikken."
 
 #: ../user/edit_forum_preferences_action.php:38
 msgid "Reset preferences"
@@ -3123,10 +2959,7 @@ msgstr "Geen deelnemer met gebruikersnaam: %1 gevonden"
 msgid ""
 "How should we notify you of new private messages, friend requests, posts in "
 "subscribed threads, and other events?"
-msgstr ""
-"Hoe wilt u op hoogte worden gesteld van nieuwe persoonlijke berichten, "
-"verzoeken van vrienden, berichten in persoonlijke nieuwsgroepen en andere "
-"notificaties?"
+msgstr "Hoe wilt u op hoogte worden gesteld van nieuwe persoonlijke berichten, verzoeken van vrienden, berichten in persoonlijke nieuwsgroepen en andere notificaties?"
 
 #: ../user/edit_forum_preferences_form.php:57
 msgid "On my Account page (no email)"
@@ -3185,11 +3018,7 @@ msgid ""
 "Check out %1various free services%2\n"
 "<br> providing dynamic 'signature images'\n"
 "<br> showing your latest credit info, project news, etc."
-msgstr ""
-"Ga eens kijken bij de %1diverse aanbieders%2\n"
-"<br> van gratis dynamische 'onderschrift-afbeeldingen'\n"
-"<br> voor de weergave van uw huidige puntentotaal, de nieuwste projectinfo, "
-"enz."
+msgstr "Ga eens kijken bij de %1diverse aanbieders%2\n<br> van gratis dynamische 'onderschrift-afbeeldingen'\n<br> voor de weergave van uw huidige puntentotaal, de nieuwste projectinfo, enz."
 
 #: ../user/edit_forum_preferences_form.php:104
 msgid "characters remaining"
@@ -3317,9 +3146,7 @@ msgstr "Je wachtwoord is veranderd."
 msgid ""
 "We can't update your password due to a database problem. Please try again "
 "later."
-msgstr ""
-"Vanwege een probleem in de database is het bijwerken mislukt. Probeer het "
-"later a.u.b. opnieuw."
+msgstr "Vanwege een probleem in de database is het bijwerken mislukt. Probeer het later a.u.b. opnieuw."
 
 #: ../user/edit_passwd_form.php:39
 msgid "You can identify yourself using either"
@@ -3394,18 +3221,13 @@ msgid ""
 "A tasks's <b>server state</b> indicates whether the task has been sent to a "
 "computer, and if so whether the computer has finished it. Possible values "
 "are:"
-msgstr ""
-"Een taakspecifieke <b>statusindicator</b> geeft aan of de taak naar een "
-"computer is verstuurd, en de verwerking ervan al dan niet is voltooid. "
-"Geldige waarden zijn:"
+msgstr "Een taakspecifieke <b>statusindicator</b> geeft aan of de taak naar een computer is verstuurd, en de verwerking ervan al dan niet is voltooid. Geldige waarden zijn:"
 
 #: ../user/explain_state.php:35
 msgid ""
 "The task is not ready to send (for example, because its input files are "
 "unavailable)"
-msgstr ""
-"De taak kan nog niet worden verstuurd (bv. omdat de invoerbestanden niet "
-"beschikbaar zijn)"
+msgstr "De taak kan nog niet worden verstuurd (bv. omdat de invoerbestanden niet beschikbaar zijn)"
 
 #: ../user/explain_state.php:38
 msgid "The task is ready to send, but hasn't been sent yet."
@@ -3423,9 +3245,7 @@ msgstr "De taak werd verstuurd; afwachtend op voltooiing."
 msgid ""
 "The task has been sent to a computer and either it has timed out or the "
 "computer has reported its completion."
-msgstr ""
-"De taak is naar een computer verstuurd; ofwel de verwerkingstijd is "
-"overschreden of de verwerking is voltooid."
+msgstr "De taak is naar een computer verstuurd; ofwel de verwerkingstijd is overschreden of de verwerking is voltooid."
 
 #: ../user/explain_state.php:49
 msgid "Outcomes"
@@ -3435,17 +3255,13 @@ msgstr "Uitkomst"
 msgid ""
 "A tasks's <b>outcome</b> is defined if its server state is <b>over</b>. "
 "Possible values are:"
-msgstr ""
-"De <b>uitslag</b> is bekend als de serverstatus de indicatie <b>over "
-"(beëindigd)</b> aangeeft. Geldige waarden zijn:"
+msgstr "De <b>uitslag</b> is bekend als de serverstatus de indicatie <b>over (beëindigd)</b> aangeeft. Geldige waarden zijn:"
 
 #: ../user/explain_state.php:57
 msgid ""
 "The task was sent to a computer, but the computer has not yet completed the "
 "work and reported the outcome."
-msgstr ""
-"De taak is naar een computer verstuurd, maar de verwerking ervan is nog niet "
-"voltooid en de uitslag nog niet bekend."
+msgstr "De taak is naar een computer verstuurd, maar de verwerking ervan is nog niet voltooid en de uitslag nog niet bekend."
 
 #: ../user/explain_state.php:60
 msgid "A computer completed and reported the task successfully."
@@ -3455,9 +3271,7 @@ msgstr "Een computer heeft de taak voltooid en deze succesvol verzonden."
 msgid ""
 "The server wasn't able to send the task to a computer (perhaps because its "
 "resource requirements were too large)"
-msgstr ""
-"De server kon de taak niet naar een computer versturen (mogelijk omdat de "
-"doelcomputer niet over de benodigde capaciteit beschikt)"
+msgstr "De server kon de taak niet naar een computer versturen (mogelijk omdat de doelcomputer niet over de benodigde capaciteit beschikt)"
 
 #: ../user/explain_state.php:65
 msgid "Client error"
@@ -3465,33 +3279,25 @@ msgstr "Client fout"
 
 #: ../user/explain_state.php:66
 msgid "The task was sent to a computer and an error occurred."
-msgstr ""
-"De taak is naar een computer verzonden en er heeft zich een fout voorgedaan."
+msgstr "De taak is naar een computer verzonden en er heeft zich een fout voorgedaan."
 
 #: ../user/explain_state.php:69
 msgid ""
 "The task was sent to a computer and no reply was received within the time "
 "limit."
-msgstr ""
-"De taak werd naar een computer verzonden, maar er werd geen antwoord "
-"ontvangen binnen de gestelde tijdslimiet."
+msgstr "De taak werd naar een computer verzonden, maar er werd geen antwoord ontvangen binnen de gestelde tijdslimiet."
 
 #: ../user/explain_state.php:72
 msgid ""
-"The task wasn't sent to a computer because enough other tasks were completed "
-"for this workunit."
-msgstr ""
-"De taak werd niet naar een computer gestuurd, omdat er genoeg andere taken "
-"werden voltooid voor deze werkeenheid."
+"The task wasn't sent to a computer because enough other tasks were completed"
+" for this workunit."
+msgstr "De taak werd niet naar een computer gestuurd, omdat er genoeg andere taken werden voltooid voor deze werkeenheid."
 
 #: ../user/explain_state.php:75
 msgid ""
 "The task was reported but could not be validated, typically because the "
 "output files were lost on the server."
-msgstr ""
-"De taak werd gerapporteerd maar kon niet gevalideerd worden. Dit gebeurt "
-"meestal doordat de output uitvoerbestanden verloren zijn gegaan op de "
-"server."
+msgstr "De taak werd gerapporteerd maar kon niet gevalideerd worden. Dit gebeurt meestal doordat de output uitvoerbestanden verloren zijn gegaan op de server."
 
 #: ../user/explain_state.php:80
 msgid "Client states"
@@ -3499,11 +3305,9 @@ msgstr "Client status"
 
 #: ../user/explain_state.php:81
 msgid ""
-"A result's <b>client state</b> indicates the stage of processing at which an "
-"error occurred."
-msgstr ""
-"Een clientspecifieke <b>statusindicator</b> geeft de fase aan waarin een "
-"fout in de verwerking optrad."
+"A result's <b>client state</b> indicates the stage of processing at which an"
+" error occurred."
+msgstr "Een clientspecifieke <b>statusindicator</b> geeft de fase aan waarin een fout in de verwerking optrad."
 
 #: ../user/explain_state.php:86
 msgid "The computer has not yet completed the task."
@@ -3533,9 +3337,7 @@ msgstr "Rapportage tijd en deadline"
 msgid ""
 "A task's <b>Time reported or deadline</b> field depends on whether the task "
 "has been reported yet:"
-msgstr ""
-"De verwerkingsstatus in het veld <b>rapportagetijd of tijdslimiet</b> is "
-"afhankelijk van de terugmelding van de taak:"
+msgstr "De verwerkingsstatus in het veld <b>rapportagetijd of tijdslimiet</b> is afhankelijk van de terugmelding van de taak:"
 
 #: ../user/explain_state.php:110
 msgid "Already reported"
@@ -3579,9 +3381,7 @@ msgstr "Verstuur e-mail"
 
 #: ../user/ffmail_action.php:59
 msgid "Use your browser's back button to return to message form"
-msgstr ""
-"Klik in uw browser op de knop 'vorige pagina' om terug te keren naar het "
-"berichtenformulier"
+msgstr "Klik in uw browser op de knop 'vorige pagina' om terug te keren naar het berichtenformulier"
 
 #: ../user/ffmail_action.php:63
 msgid "Sending emails"
@@ -3601,19 +3401,15 @@ msgstr "Bedankt dat u uw vrienden hebt verteld over %1"
 
 #: ../user/ffmail_action.php:94
 msgid ""
-"You forgot to enter your friends' names and/or email addresses; Please %"
-"1return to the form%2 and enter them."
-msgstr ""
-"U hebt geen namen en/of e-mailadressen van uw vrienden ingevuld: ga %1terug "
-"naar het formulier%2 en vul deze in."
+"You forgot to enter your friends' names and/or email addresses; Please "
+"%1return to the form%2 and enter them."
+msgstr "U hebt geen namen en/of e-mailadressen van uw vrienden ingevuld: ga %1terug naar het formulier%2 en vul deze in."
 
 #: ../user/ffmail_form.php:30
 msgid ""
 "This project hasn't created an email message - please notify its "
 "administrators"
-msgstr ""
-"Het project heeft geen e-mail aangemaakt - neem a.u.b. contact op met een "
-"admin"
+msgstr "Het project heeft geen e-mail aangemaakt - neem a.u.b. contact op met een admin"
 
 #: ../user/ffmail_form.php:33
 msgid "Tell your friends about %1"
@@ -3621,19 +3417,14 @@ msgstr "Vertel je vrienden over %1"
 
 #: ../user/ffmail_form.php:37
 msgid "Help us by telling your friends, family and coworkers about %1"
-msgstr ""
-"U helpt ons door uw vrienden, familieleden en collega's te vertellen over %1"
+msgstr "U helpt ons door uw vrienden, familieleden en collega's te vertellen over %1"
 
 #: ../user/ffmail_form.php:39
 msgid ""
 "Fill in this form with the names and email addresses of people you think "
 "might be interested in %1. We'll send them an email in your name, and you "
 "can add your own message if you like."
-msgstr ""
-"Op dit formulier vult u de namen en e-mailadressen in van de mensen die "
-"wellicht geïnteresseerd zijn in %1. Wij sturen hen dan namens u een "
-"e-mailbericht en - indien u dat wenst- kunt u een persoonlijk bericht "
-"bijvoegen."
+msgstr "Op dit formulier vult u de namen en e-mailadressen in van de mensen die wellicht geïnteresseerd zijn in %1. Wij sturen hen dan namens u een e-mailbericht en - indien u dat wenst- kunt u een persoonlijk bericht bijvoegen."
 
 #: ../user/ffmail_form.php:42
 msgid "Your name:"
@@ -3681,18 +3472,13 @@ 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 ""
-"Wilt u %1 echt uitsluiten?<br/>Het is %1 dan niet toegestaan om gedurende de "
-"geselecteerde periode berichten te plaatsen.<br/>Dit is alleen acceptabel "
-"indien %1 zich herhaaldelijk onbehoorlijk heeft gedragen."
+msgstr "Wilt u %1 echt uitsluiten?<br/>Het is %1 dan niet toegestaan om gedurende de geselecteerde periode berichten te plaatsen.<br/>Dit is alleen acceptabel indien %1 zich herhaaldelijk onbehoorlijk heeft gedragen."
 
 #: ../user/forum_banishment_vote.php:61
 msgid ""
-"Select the reason category, optionally write a longer description of why the "
-"user should be banished."
-msgstr ""
-"Kies een van de redenen, of geef zelf een uitgebreidere motivatie waarom de "
-"deelnemer moet worden uitgesloten."
+"Select the reason category, optionally write a longer description of why the"
+" user should be banished."
+msgstr "Kies een van de redenen, of geef zelf een uitgebreidere motivatie waarom de deelnemer moet worden uitgesloten."
 
 #: ../user/forum_banishment_vote.php:62 ../user/forum_moderate_thread.php:50
 msgid "Category"
@@ -3744,9 +3530,7 @@ msgstr "U dient een actie te specificeren..."
 msgid ""
 "You can no longer edit this post.<br/>Posts can only be edited at most %1 "
 "minutes after they have been created."
-msgstr ""
-"Dit bericht kan niet meer worden bewerkt.<br/>Berichten kunnen nog worden "
-"bewerkt binnen %1 minuten nadat deze zijn aangemaakt."
+msgstr "Dit bericht kan niet meer worden bewerkt.<br/>Berichten kunnen nog worden bewerkt binnen %1 minuten nadat deze zijn aangemaakt."
 
 #: ../user/forum_edit.php:47
 msgid "You are not authorized to edit this post."
@@ -3796,8 +3580,7 @@ msgstr "Dit onderwerp is verborgen"
 
 #: ../user/forum_forum.php:178
 msgid "This thread is sticky and locked, and you haven't read it yet"
-msgstr ""
-"Dit onderwerp is gemarkeerd en vergrendeld en u hebt het nog niet gelezen"
+msgstr "Dit onderwerp is gemarkeerd en vergrendeld en u hebt het nog niet gelezen"
 
 #: ../user/forum_forum.php:178
 msgid "sticky/locked/unread"
@@ -3861,11 +3644,9 @@ msgstr "Vraag en antwoord"
 
 #: ../user/forum_help_desk.php:30
 msgid ""
-"Talk live via Skype with a volunteer, in any of several languages. Go to %"
-"1BOINC Online Help%2."
-msgstr ""
-"Gebruik Skype om in diverse talen een rechtreeks gesprek te voeren met een "
-"vrijwilliger. Klik op %1BOINC Online Help%2."
+"Talk live via Skype with a volunteer, in any of several languages. Go to "
+"%1BOINC Online Help%2."
+msgstr "Gebruik Skype om in diverse talen een rechtreeks gesprek te voeren met een vrijwilliger. Klik op %1BOINC Online Help%2."
 
 #: ../user/forum_help_desk.php:44 ../user/forum_index.php:92
 msgid "Topic"
@@ -3887,9 +3668,7 @@ msgstr "%1 Forum"
 msgid ""
 "If you have a question or problem, please use the %1Questions & Answers%2 "
 "section of the message boards."
-msgstr ""
-"Als je een vraag of probleem hebt, gebruik dan a.u.b. de %1Vraag & Antwoord%"
-"2 sectie van het forum."
+msgstr "Als je een vraag of probleem hebt, gebruik dan a.u.b. de %1Vraag & Antwoord%2 sectie van het forum."
 
 #: ../user/forum_index.php:123
 msgid "Subscribed threads"
@@ -3953,9 +3732,7 @@ msgstr "Altijd"
 
 #: ../user/forum_moderate_post.php:96
 msgid "Optional explanation %1 This is included in email to user.%2"
-msgstr ""
-"Optionele eigen motivatie %1 Deze wordt bijgevoegd in het e-mailbericht aan "
-"de betreffende deelnemer.%2"
+msgstr "Optionele eigen motivatie %1 Deze wordt bijgevoegd in het e-mailbericht aan de betreffende deelnemer.%2"
 
 #: ../user/forum_moderate_post.php:101 ../user/forum_moderate_thread.php:91
 #: ../user/forum_post.php:130 ../user/forum_report_post.php:85
@@ -4004,9 +3781,7 @@ msgstr "Onderwerp '%1' aanpassen"
 msgid ""
 "Select the reason category, or write a longer description of why you're "
 "hiding or locking the thread; then press OK."
-msgstr ""
-"Selecteer een reden categorie, of omschrijf de reden voor verbergen of "
-"sluiten van het onderwerp; klik daarna op OK."
+msgstr "Selecteer een reden categorie, of omschrijf de reden voor verbergen of sluiten van het onderwerp; klik daarna op OK."
 
 #: ../user/forum_moderate_thread.php:72
 msgid "Current forum"
@@ -4024,17 +3799,13 @@ msgstr "Nieuwe titel:"
 msgid ""
 "Only project admins may create a thread here. However, you may reply to "
 "existing threads."
-msgstr ""
-"Uitsluitend projectadministrators mogen hier een onderwerp aanmaken. U kunt "
-"echter wel op een onderwerp reageren."
+msgstr "Uitsluitend projectadministrators mogen hier een onderwerp aanmaken. U kunt echter wel op een onderwerp reageren."
 
 #: ../user/forum_post.php:60
 msgid ""
 "Your message was flagged as spam by the Akismet anti-spam system. Please "
 "modify your text and try again."
-msgstr ""
-"Je reactie wordt gezien als spam door het Akismet anti-spam systeem. Pas "
-"a.u.b. je tekst aan en probeer opnieuw."
+msgstr "Je reactie wordt gezien als spam door het Akismet anti-spam systeem. Pas a.u.b. je tekst aan en probeer opnieuw."
 
 #: ../user/forum_post.php:70
 msgid "Create new thread"
@@ -4054,9 +3825,7 @@ msgstr "Dit item weergeven op het berichten-tabblad van de BOINC Manager"
 
 #: ../user/forum_post.php:127
 msgid "Do so only for items likely to be of interest to all volunteers."
-msgstr ""
-"Dit geldt uitsluitend voor items die voor alle vrijwilligers van belang "
-"kunnen zijn."
+msgstr "Dit geldt uitsluitend voor items die voor alle vrijwilligers van belang kunnen zijn."
 
 #: ../user/forum_rate.php:26
 msgid "Rating offline"
@@ -4068,9 +3837,7 @@ msgstr "Deze optie is tijdelijk uit gezet door het project"
 
 #: ../user/forum_rate.php:58
 msgid "You need more average or total credit to rate a post."
-msgstr ""
-"Uw gemiddelde of huidige puntentotaal is onvoldoende om een bericht te "
-"beoordelen."
+msgstr "Uw gemiddelde of huidige puntentotaal is onvoldoende om een bericht te beoordelen."
 
 #: ../user/forum_rate.php:62
 msgid "You have already rated this post."
@@ -4107,9 +3874,7 @@ msgstr "Probleem Bij Indienen Stem"
 msgid ""
 "Your post has been flagged as spam by the Akismet anti-spam system. Please "
 "modify your text and try again."
-msgstr ""
-"Je reactie wordt gezien als spam door het Akismet anti-spam systeem. Pas "
-"a.u.b. je tekst aan en probeer opnieuw."
+msgstr "Je reactie wordt gezien als spam door het Akismet anti-spam systeem. Pas a.u.b. je tekst aan en probeer opnieuw."
 
 #: ../user/forum_reply.php:88 ../user/forum_thread.php:158
 #: ../user/forum_thread.php:274
@@ -4134,15 +3899,12 @@ msgstr "Onderschrift invoegen bij deze post"
 
 #: ../user/forum_report_post.php:45
 msgid "You need more average or total credit to report a post."
-msgstr ""
-"Uw gemiddelde of huidige puntentotaal is onvoldoende om een bericht te "
-"rapporteren."
+msgstr "Uw gemiddelde of huidige puntentotaal is onvoldoende om een bericht te rapporteren."
 
 #: ../user/forum_report_post.php:65
 msgid "Report Registered"
 msgstr "Rapportage geregistreerd"
 
-# 92%
 #: ../user/forum_report_post.php:66
 msgid "Your report has been recorded. Thanks for your input."
 msgstr "Uw rapportage is geregistreerd. Hartelijk dank voor uw bijdrage."
@@ -4151,9 +3913,7 @@ msgstr "Uw rapportage is geregistreerd. Hartelijk dank voor uw bijdrage."
 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 ""
-"Een moderator zal na beoordeling van uw rapportage een beslissing nemen - in "
-"afwachting daarvan vragen wij u enig geduld te hebben"
+msgstr "Een moderator zal na beoordeling van uw rapportage een beslissing nemen - in afwachting daarvan vragen wij u enig geduld te hebben"
 
 #: ../user/forum_report_post.php:71
 msgid "Report a forum post"
@@ -4161,14 +3921,10 @@ msgstr "Bericht rapporteren"
 
 #: ../user/forum_report_post.php:73
 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 "
+"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 ""
-"Voordat u dit bericht definitief rapporteert, hebt u de mogelijkheid om het "
-"te beoordelen via het +/- systeem. Indien voldoende deelnemers het bericht "
-"negatief beoordelen, zal het uiteindelijk worden verborgen.<br />Dit "
-"beoordelingssysteem bevindt zich aan het einde van het bericht."
+msgstr "Voordat u dit bericht definitief rapporteert, hebt u de mogelijkheid om het te beoordelen via het +/- systeem. Indien voldoende deelnemers het bericht negatief beoordelen, zal het uiteindelijk worden verborgen.<br />Dit beoordelingssysteem bevindt zich aan het einde van het bericht."
 
 #: ../user/forum_report_post.php:80
 msgid "Report post"
@@ -4176,13 +3932,9 @@ msgstr "Bericht rapporteren"
 
 #: ../user/forum_report_post.php:81
 msgid ""
-"Why do you find the post offensive: %1Please include enough information so "
-"that a person that\n"
+"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 ""
-"Geef aan waarom u dit bericht kwetsend vindt: %1U dient het probleem "
-"duidelijk te omschrijven zodat iemand die\n"
-"het bericht nog niet heeft gelezen, snel weet waar het om gaat.%2"
+msgstr "Geef aan waarom u dit bericht kwetsend vindt: %1U dient het probleem duidelijk te omschrijven zodat iemand die\nhet bericht nog niet heeft gelezen, snel weet waar het om gaat.%2"
 
 #: ../user/forum_report_post.php:90
 msgid "Report not registered"
@@ -4190,16 +3942,13 @@ msgstr "Rapportage niet geregistreerd"
 
 #: ../user/forum_report_post.php:91
 msgid "Your report could not be recorded. Please wait a while and try again."
-msgstr ""
-"Uw rapportage kon niet worden geregistreerd. Probeer het later nog eens "
-"alstublieft."
+msgstr "Uw rapportage kon niet worden geregistreerd. Probeer het later nog eens alstublieft."
 
 #: ../user/forum_report_post.php:92
 msgid ""
-"If this is not a temporary error, please report it to the project developers."
-msgstr ""
-"Indien dit geen eenmalige foutmelding is, wordt u verzocht dat bij de "
-"projectontwikkelaars te melden."
+"If this is not a temporary error, please report it to the project "
+"developers."
+msgstr "Indien dit geen eenmalige foutmelding is, wordt u verzocht dat bij de projectontwikkelaars te melden."
 
 #: ../user/forum_rss.php:41
 msgid "%1 RSS feed"
@@ -4215,8 +3964,7 @@ msgstr "Opties:"
 
 #: ../user/forum_rss.php:47
 msgid "Include only posts by user ID %1 (default: all users)."
-msgstr ""
-"Neem alleen berichten van gebruikers ID %1 (standaard: alle gebruikers)."
+msgstr "Neem alleen berichten van gebruikers ID %1 (standaard: alle gebruikers)."
 
 #: ../user/forum_rss.php:49
 msgid "Include only posts from the last %1 days (default: 30)."
@@ -4224,14 +3972,11 @@ msgstr "Neem alleen berichten van de afgelopen %1 dagen (standaard: 30)."
 
 #: ../user/forum_rss.php:51
 msgid "Truncate posts: %1 (Include only first 265 characters of each post)"
-msgstr ""
-"Berichten inkorten: %1 (laat alleen de eerste 265 tekens van elke post zien)"
+msgstr "Berichten inkorten: %1 (laat alleen de eerste 265 tekens van elke post zien)"
 
 #: ../user/forum_rss.php:53
 msgid "Threads only: %1 (Include only the first post of every thread)"
-msgstr ""
-"Alleen discussies: %1 (Inclusief alleen het eerste bericht van elk "
-"onderwerp)"
+msgstr "Alleen discussies: %1 (Inclusief alleen het eerste bericht van elk onderwerp)"
 
 #: ../user/forum_search.php:27
 msgid "Forum search"
@@ -4313,9 +4058,7 @@ msgstr "Treffers overeenkomstig uw zoekopdracht in berichten:"
 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 ""
-"Helaas geen resultaten gevonden die aan uw zoekopdracht voldoen. U kunt het "
-"aantal treffers vergroten door minder (specifieke) woorden te gebruiken."
+msgstr "Helaas geen resultaten gevonden die aan uw zoekopdracht voldoen. U kunt het aantal treffers vergroten door minder (specifieke) woorden te gebruiken."
 
 #: ../user/forum_search_action.php:219
 msgid "You can also %1try the same search on Google.%2"
@@ -4333,9 +4076,7 @@ msgstr "Aanmelding geslaagd"
 msgid ""
 "You are now subscribed to %1. You will be notified whenever there is a new "
 "post."
-msgstr ""
-"U bent nu aangemeld bij %1. U wordt op de hoogte gesteld van nieuwe "
-"berichten."
+msgstr "U bent nu aangemeld bij %1. U wordt op de hoogte gesteld van nieuwe berichten."
 
 #: ../user/forum_subscribe.php:51
 msgid "Subscription failed"
@@ -4344,9 +4085,7 @@ msgstr "Aanmelding mislukt"
 #: ../user/forum_subscribe.php:52
 msgid ""
 "We are currently unable to subscribe you to %1. Please try again later.."
-msgstr ""
-"Aanmelden bij %1 is op dit moment niet mogelijk. Probeer het later nog "
-"eens..."
+msgstr "Aanmelden bij %1 is op dit moment niet mogelijk. Probeer het later nog eens..."
 
 #: ../user/forum_subscribe.php:61
 msgid "Unsubscription successful"
@@ -4354,11 +4093,9 @@ msgstr "Uitschrijven geslaagd"
 
 #: ../user/forum_subscribe.php:64
 msgid ""
-"You are no longer subscribed to %1. You will no longer receive notifications "
-"for this thread."
-msgstr ""
-"U bent niet meer aangemeld bij %1. U ontvangt geen mededelingen meer over "
-"dit onderwerp."
+"You are no longer subscribed to %1. You will no longer receive notifications"
+" for this thread."
+msgstr "U bent niet meer aangemeld bij %1. U ontvangt geen mededelingen meer over dit onderwerp."
 
 #: ../user/forum_subscribe.php:66
 msgid "Unsubscription failed"
@@ -4367,9 +4104,7 @@ msgstr "Uitschrijven mislukt"
 #: ../user/forum_subscribe.php:67
 msgid ""
 "We are currently unable to unsubscribe you from %1. Please try again later.."
-msgstr ""
-"Uitschrijven bij %1 is op dit moment niet mogelijk. Probeer het later nog "
-"eens..."
+msgstr "Uitschrijven bij %1 is op dit moment niet mogelijk. Probeer het later nog eens..."
 
 #: ../user/forum_subscribe.php:74
 msgid "Unknown subscription action"
@@ -4413,8 +4148,7 @@ msgstr "Abonneren"
 
 #: ../user/forum_thread.php:179
 msgid "Click to get email when there are new posts in this thread"
-msgstr ""
-"Klik hier om een email te ontvangen als er een nieuw bericht is geplaatst"
+msgstr "Klik hier om een email te ontvangen als er een nieuw bericht is geplaatst"
 
 #: ../user/forum_thread.php:190
 msgid "Unhide this thread"
@@ -4522,11 +4256,9 @@ msgstr "Voeg toe als vriend(in)"
 
 #: ../user/friend.php:74
 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 ""
-"Je hebt %1 om een vriendschap gevraagd. We versturen een bericht naar %1 om "
-"je verzoek te bevestigen."
+"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 "Je hebt %1 om een vriendschap gevraagd. We versturen een bericht naar %1 om je verzoek te bevestigen."
 
 #: ../user/friend.php:77
 msgid "Add an optional message here:"
@@ -4546,9 +4278,7 @@ msgstr "Log a.u.b. in als %1"
 
 #: ../user/friend.php:127
 msgid "You must log in as %1 to view this friend request"
-msgstr ""
-"U dient zich aan te melden als %1 om het verzoek van deze vriend te kunnen "
-"lezen"
+msgstr "U dient zich aan te melden als %1 om het verzoek van deze vriend te kunnen lezen"
 
 #: ../user/friend.php:138
 msgid "Friend request"
@@ -4632,60 +4362,46 @@ msgstr "Account gegevens vergeten?"
 
 #: ../user/get_passwd.php:28
 msgid ""
-"1) If you know your account's email address, and you can receive email there:"
-msgstr ""
-"1) Als u het e-mailadres van uw account weet, en als u daar e-mail kunt "
-"ontvangen:"
+"1) If you know your account's email address, and you can receive email "
+"there:"
+msgstr "1) Als u het e-mailadres van uw account weet, en als u daar e-mail kunt ontvangen:"
 
 #: ../user/get_passwd.php:29
 msgid ""
 "Enter the email address below, and click OK. You will be sent email "
 "instructions for resetting your password."
-msgstr ""
-"Vul dan hieronder het e-mailadres in en klik op OK. Vervolgens ontvangt u "
-"per e-mail de instructies om uw wachtwoord opnieuw in te stellen."
+msgstr "Vul dan hieronder het e-mailadres in en klik op OK. Vervolgens ontvangt u per e-mail de instructies om uw wachtwoord opnieuw in te stellen."
 
 #: ../user/get_passwd.php:46
 msgid ""
 "2) If you forgot your account's email address, or you can't receive email "
 "there:"
-msgstr ""
-"2) Als u het e-mailadres van uw account bent vergeten, of als u daar geen "
-"e-mail kunt ontvangen:"
+msgstr "2) Als u het e-mailadres van uw account bent vergeten, of als u daar geen e-mail kunt ontvangen:"
 
 #: ../user/get_passwd.php:47
 msgid ""
 "If you have run BOINC under this account, you can still access it. Here's "
 "how:"
-msgstr ""
-"Om met deze gegevens toch toegang te krijgen tot uw BOINC-account, gaat u "
-"als volgt te werk:"
+msgstr "Om met deze gegevens toch toegang te krijgen tot uw BOINC-account, gaat u als volgt te werk:"
 
 #: ../user/get_passwd.php:50
 msgid ""
 "Go to the BOINC data directory on your computer (its location is written to "
 "the Event Log at startup)."
-msgstr ""
-"Ga naar de data map van BOINC (de locatie staat beschreven in de opstart "
-"berichten)."
+msgstr "Ga naar de data map van BOINC (de locatie staat beschreven in de opstart berichten)."
 
 #: ../user/get_passwd.php:51
 msgid "Find your account file for this project; it will be named <b>%1</b>."
-msgstr ""
-"Zoek het betreffende projectbestand met uw accountgegevens, genaamd <b>%"
-"1</b>."
+msgstr "Zoek het betreffende projectbestand met uw accountgegevens, genaamd <b>%1</b>."
 
 #: ../user/get_passwd.php:52
 msgid "Open the file in a text editor like Notepad. You'll see something like"
-msgstr ""
-"Open het bestand met een tekstverwerker, bv. met Kladblok. U ziet nu "
-"ongeveer het volgende"
+msgstr "Open het bestand met een tekstverwerker, bv. met Kladblok. U ziet nu ongeveer het volgende"
 
 #: ../user/get_passwd.php:62
-msgid "Select and Copy the string between %1 and %2 (%3 in the above example)."
-msgstr ""
-"Selecteer en kopieer de tekenreeks tussen %1 en %2 (%3 in bovenstaand "
-"voorbeeld)."
+msgid ""
+"Select and Copy the string between %1 and %2 (%3 in the above example)."
+msgstr "Selecteer en kopieer de tekenreeks tussen %1 en %2 (%3 in bovenstaand voorbeeld)."
 
 #: ../user/get_passwd.php:64
 msgid "Paste the string into the field below, and click OK."
@@ -4695,9 +4411,7 @@ msgstr "Plak deze tekenreeks in het onderstaande veld en klik op OK."
 msgid ""
 "You will now be logged in to your account; update the email and password of "
 "your account."
-msgstr ""
-"U wordt nu aangemeld bij uw account; wijzig de betreffende e-mail- en "
-"wachtwoordgegevens."
+msgstr "U wordt nu aangemeld bij uw account; wijzig de betreffende e-mail- en wachtwoordgegevens."
 
 #: ../user/get_passwd.php:71
 msgid "Log in with authenticator"
@@ -4711,9 +4425,7 @@ msgstr "Geen GPU taken gerapporteerd"
 msgid ""
 "The following lists show the most productive GPU models on different "
 "platforms.  Relative speeds are shown in parentheses."
-msgstr ""
-"De volgende lijst toont de meest productieve GPU modellen op verschillende "
-"platforms.  Relatieve snelheid wordt getoond tussen ronde haakjes."
+msgstr "De volgende lijst toont de meest productieve GPU modellen op verschillende platforms.  Relatieve snelheid wordt getoond tussen ronde haakjes."
 
 #: ../user/home.php:42
 msgid "Welcome to %1"
@@ -4780,10 +4492,7 @@ msgid ""
 "You can not delete our record of this computer because our database still "
 "contains work for it. You must wait a few days until the work for this "
 "computer has been deleted from the project database."
-msgstr ""
-"U kunt de betreffende gegevens niet verwijderen omdat onze databank nog werk "
-"bevat voor deze computer. U dient enkele dagen te wachten totdat het werk "
-"voor deze computer uit de projectspecifieke databank is verwijderd."
+msgstr "U kunt de betreffende gegevens niet verwijderen omdat onze databank nog werk bevat voor deze computer. U dient enkele dagen te wachten totdat het werk voor deze computer uit de projectspecifieke databank is verwijderd."
 
 #: ../user/host_delete.php:40
 msgid "Delete record of computer"
@@ -4807,18 +4516,13 @@ msgstr "Computers samenvoegen"
 
 #: ../user/host_edit_form.php:38
 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 ""
-"Soms krijgt een computer per ongeluk meer dan één identiteit door BOINC "
-"toegewezen. U kunt dit verhelpen door vorige identiteiten met de laatste "
-"samen te voegen."
+"Sometimes BOINC assigns separate identities to the same computer by mistake."
+" You can correct this by merging old identities with the newest one."
+msgstr "Soms krijgt een computer per ongeluk meer dan één identiteit door BOINC toegewezen. U kunt dit verhelpen door vorige identiteiten met de laatste samen te voegen."
 
 #: ../user/host_edit_form.php:56
 msgid "No hosts are eligible for merging with this one."
-msgstr ""
-"Geen hostcomputers die in aanmerking komen voor samenvoeging met deze "
-"computer."
+msgstr "Geen hostcomputers die in aanmerking komen voor samenvoeging met deze computer."
 
 #: ../user/host_edit_form.php:58 ../user/host_edit_form.php:114
 msgid "Show details"
@@ -4827,9 +4531,7 @@ msgstr "Toon details"
 #: ../user/host_edit_form.php:66
 msgid ""
 "Check the computers that are the same as %1 (created %2, computer ID %3):"
-msgstr ""
-"Controleer de computers die identiek zijn aan %1 (aangemaakt %2, computer ID "
-"%3):"
+msgstr "Controleer de computers die identiek zijn aan %1 (aangemaakt %2, computer ID %3):"
 
 #: ../user/host_edit_form.php:70 ../user/workunit.php:39
 msgid "name"
@@ -4871,9 +4573,7 @@ msgstr "Deze hostcomputer is nu bekend als %1."
 msgid ""
 "This change will take effect the next time the host communicates with this "
 "project."
-msgstr ""
-"Deze wijziging wordt van kracht bij de volgende communicatiesessie van de "
-"hostcomputer met dit project."
+msgstr "Deze wijziging wordt van kracht bij de volgende communicatiesessie van de hostcomputer met dit project."
 
 #: ../user/host_venue_action.php:50
 msgid "Return to host page"
@@ -4930,12 +4630,9 @@ msgstr "opgemaakt"
 
 #: ../user/html.php:33
 msgid ""
-"image; height cannot exceed 450 pixels. Please do not link to images without "
-"permission of the web site where the image is hosted."
-msgstr ""
-"afbeelding; hoogte mag niet meer zijn dan 450 pixels. Voeg alstublieft geen "
-"koppelingen naar afbeeldingen toe zonder toestemming van de website waar de "
-"afbeelding zich bevindt."
+"image; height cannot exceed 450 pixels. Please do not link to images without"
+" permission of the web site where the image is hosted."
+msgstr "afbeelding; hoogte mag niet meer zijn dan 450 pixels. Voeg alstublieft geen koppelingen naar afbeeldingen toe zonder toestemming van de website waar de afbeelding zich bevindt."
 
 #: ../user/html.php:35
 msgid "You can also use ampersand notation for special characters."
@@ -4950,10 +4647,7 @@ msgid ""
 "Run %1 only on computers that you own, or for which you have obtained the "
 "owner's permission. Some companies and schools have policies that prohibit "
 "using their computers for projects such as %1."
-msgstr ""
-"Voer %1 alleen uit op computers die je eigendom zijn, of waar de eigenaar "
-"ervan je toestemming voor heeft gegeven. Sommige scholen en bedrijven hebben "
-"regels opgesteld waarin het gebruik van %1 niet toegestaan is."
+msgstr "Voer %1 alleen uit op computers die je eigendom zijn, of waar de eigenaar ervan je toestemming voor heeft gegeven. Sommige scholen en bedrijven hebben regels opgesteld waarin het gebruik van %1 niet toegestaan is."
 
 #: ../user/info.php:38
 msgid "How %1 will use your computer"
@@ -4964,18 +4658,13 @@ msgid ""
 "When you run %1 on your computer, it will use part of the computer's CPU "
 "power, disk space, and network bandwidth. You can control how much of your "
 "resources are used by %1, and when it uses them."
-msgstr ""
-"Wanneer je %1 gebruikt op je computer zal deze een gedeelte gebruiken van de "
-"processortijd, het geheugen, de harde schijf en de bandbreedte van het "
-"netwerk. Gebruik hiervan is in te stellen met %1."
+msgstr "Wanneer je %1 gebruikt op je computer zal deze een gedeelte gebruiken van de processortijd, het geheugen, de harde schijf en de bandbreedte van het netwerk. Gebruik hiervan is in te stellen met %1."
 
 #: ../user/info.php:40
 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 ""
-"De uitgevoerde taken worden gebruikt om de doelstellingen te halen van %1, "
-"zoals beschreven op de website. De gebruikte applicatie kan wisselen."
+msgstr "De uitgevoerde taken worden gebruikt om de doelstellingen te halen van %1, zoals beschreven op de website. De gebruikte applicatie kan wisselen."
 
 #: ../user/info.php:42
 msgid "Privacy policy"
@@ -4983,15 +4672,11 @@ msgstr "Privacy beleid"
 
 #: ../user/info.php:43
 msgid ""
-"Your account on %1 is identified by a name that you choose. This name may be "
-"shown on the %1 web site, along with a summary of the work your computer has "
-"done for %1. If you want to be anonymous, choose a name that doesn't reveal "
-"your identity."
-msgstr ""
-"Je account bij %1 wordt bepaald door je gekozen naam. Deze naam kan getoond "
-"worden op de website van %1 samen met een opsomming van je computer(s) en "
-"het gedane werk voor %1. Als je anoniem wilt blijven kies dan een afwijkende "
-"naam voor je account."
+"Your account on %1 is identified by a name that you choose. This name may be"
+" shown on the %1 web site, along with a summary of the work your computer "
+"has done for %1. If you want to be anonymous, choose a name that doesn't "
+"reveal your identity."
+msgstr "Je account bij %1 wordt bepaald door je gekozen naam. Deze naam kan getoond worden op de website van %1 samen met een opsomming van je computer(s) en het gedane werk voor %1. Als je anoniem wilt blijven kies dan een afwijkende naam voor je account."
 
 #: ../user/info.php:44
 msgid ""
@@ -5000,23 +4685,14 @@ 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 ""
-"Wanneer je deelneemt aan %1, wordt er informatie over je computer (type "
-"processor, hoeveelheid geheugen, etc.) opgeslagen door %1 en gebruikt om te "
-"kunnen bepalen welk soort werk er aan je computer wordt verzonden. Deze "
-"informatie wordt ook getoond op de website van %1. Je werkelijke locatie "
-"(b.v. je IP-adres) blijft verborgen."
+msgstr "Wanneer je deelneemt aan %1, wordt er informatie over je computer (type processor, hoeveelheid geheugen, etc.) opgeslagen door %1 en gebruikt om te kunnen bepalen welk soort werk er aan je computer wordt verzonden. Deze informatie wordt ook getoond op de website van %1. Je werkelijke locatie (b.v. je IP-adres) blijft verborgen."
 
 #: ../user/info.php:45
 msgid ""
-"To participate in %1, you must give an address where you receive email. This "
-"address will not be shown on the %1 web site or shared with organizations. %"
-"1 may send you periodic newsletters; however, you can opt out at any time."
-msgstr ""
-"Om aan %1 te kunnen deelnemen, moet je een e-mailadres opgeven waar je email "
-"op kan ontvangen. Dit adres zal niet op de website van %1 worden getoond of "
-"aan derden worden doorgegeven. %1 kan je informatie toezenden, maar dit kan "
-"je ook in je voorkeuren uitzetten."
+"To participate in %1, you must give an address where you receive email. This"
+" address will not be shown on the %1 web site or shared with organizations. "
+"%1 may send you periodic newsletters; however, you can opt out at any time."
+msgstr "Om aan %1 te kunnen deelnemen, moet je een e-mailadres opgeven waar je email op kan ontvangen. Dit adres zal niet op de website van %1 worden getoond of aan derden worden doorgegeven. %1 kan je informatie toezenden, maar dit kan je ook in je voorkeuren uitzetten."
 
 #: ../user/info.php:46
 msgid ""
@@ -5025,24 +4701,15 @@ 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 ""
-"Privé berichten die verzonden zijn op de website van %1 zijn alleen "
-"zichtbaar voor de afzender en ontvanger.  %1 bekijkt en veranderd de inhoud "
-"niet.  Als je een ongewenst bericht ontvangt van een andere %1 gebruiker, is "
-"het mogelijk deze toe te voegen aan een %2berichten filter%3.  Dit "
-"blokkeert zowel privé als forum berichten van deze gebruiker."
+msgstr "Privé berichten die verzonden zijn op de website van %1 zijn alleen zichtbaar voor de afzender en ontvanger.  %1 bekijkt en veranderd de inhoud niet.  Als je een ongewenst bericht ontvangt van een andere %1 gebruiker, is het mogelijk deze toe te voegen aan een %2berichten filter%3.  Dit blokkeert zowel privé als forum berichten van deze gebruiker."
 
 #: ../user/info.php:47
 msgid ""
 "If you use our web site forums you must follow the %2posting guidelines%3.  "
 "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 ""
-"Indien je onze website gebruikt moet je je houden aan de %2richtlijnen voor "
-"berichten%3.  Geplaatste berichten op het forum van %1 zijn zichtbaar voor "
-"leden en niet-leden.  Door hier een bericht te plaatsen geef je iedereen de "
-"volledige rechten om ze te bekijken en te kopiëren."
+"members.  By posting to the forums, you are granting irrevocable license for"
+" anyone to view and copy your posts."
+msgstr "Indien je onze website gebruikt moet je je houden aan de %2richtlijnen voor berichten%3.  Geplaatste berichten op het forum van %1 zijn zichtbaar voor leden en niet-leden.  Door hier een bericht te plaatsen geef je iedereen de volledige rechten om ze te bekijken en te kopiëren."
 
 #: ../user/info.php:48
 msgid "Is it safe to run %1?"
@@ -5052,35 +4719,23 @@ msgstr "Is het veilig om %1 uit te voeren?"
 msgid ""
 "Any time you download a program through the Internet you are taking a "
 "chance: the program might have dangerous errors, or the download server "
-"might have been hacked. %1 has made efforts to minimize these risks. We have "
-"tested our applications carefully. Our servers are behind a firewall and 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 ""
-"Elke keer als je een programma via het internet download neem je een risico; "
-"het programma kan fatale fouten hebben, of de download server is niet "
-"veilig genoeg. %1 heeft zijn best gedaan om deze risico's tot een minimum te "
-"beperken. Ons programma is uitvoerig getest. Onze servers zijn zo veel als "
-"mogelijk is beveiligd tegen misbruik. Om de integriteit van de programma's "
-"te garanderen zijn ze digitaal ondertekend op een computer die niet met het "
-"internet is verbonden."
+"might have been hacked. %1 has made efforts to minimize these risks. We have"
+" tested our applications carefully. Our servers are behind a firewall and "
+"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 "Elke keer als je een programma via het internet download neem je een risico; het programma kan fatale fouten hebben, of de download server is niet veilig genoeg. %1 heeft zijn best gedaan om deze risico's tot een minimum te beperken. Ons programma is uitvoerig getest. Onze servers zijn zo veel als mogelijk is beveiligd tegen misbruik. Om de integriteit van de programma's te garanderen zijn ze digitaal ondertekend op een computer die niet met het internet is verbonden."
 
 #: ../user/info.php:50
 msgid ""
 "The applications run by %1 may cause some computers to overheat. If this "
 "happens, stop running %1 or use a %2utility program%3 that limits CPU usage."
-msgstr ""
-"De door %1 gebruikte applicaties kunnen een verhoging opleveren van de "
-"temperatuur van de processor. Als dit aan de orde is, sluit %1 af en gebruik "
-"een %2programma%3 om het gebruik van de processor te regelen."
+msgstr "De door %1 gebruikte applicaties kunnen een verhoging opleveren van de temperatuur van de processor. Als dit aan de orde is, sluit %1 af en gebruik een %2programma%3 om het gebruik van de processor te regelen."
 
 #: ../user/info.php:51
 msgid ""
 "%1 was developed by %2. BOINC was developed at the University of California."
-msgstr ""
-"%1 is ontwikkeld door %2. BOINC is ontwikkeld door de University of "
-"California."
+msgstr "%1 is ontwikkeld door %2. BOINC is ontwikkeld door de University of California."
 
 #: ../user/info.php:53
 msgid "Liability"
@@ -5089,11 +4744,9 @@ msgstr "Aansprakelijkheid"
 #: ../user/info.php:54
 msgid ""
 "%1 and %2 assume no liability for damage to your computer, loss of data, or "
-"any other event or condition that may occur as a result of participating in %"
-"1."
-msgstr ""
-"%1 en %2 aanvaarden geen aansprakelijkheid voor schade aangebracht aan je "
-"computer of welke schade dan ook voortgekomen door deelname aan %1."
+"any other event or condition that may occur as a result of participating in "
+"%1."
+msgstr "%1 en %2 aanvaarden geen aansprakelijkheid voor schade aangebracht aan je computer of welke schade dan ook voortgekomen door deelname aan %1."
 
 #: ../user/info.php:56
 msgid "Other BOINC projects"
@@ -5101,23 +4754,17 @@ msgstr "Andere BOINC projecten"
 
 #: ../user/info.php:57
 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 "
+"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 ""
-"Andere projecten gebruiken, net als %1, BOINC als platform. Het is het "
-"overwegen waard om andere projecten toe te voegen. Mocht %1 dan geen werk "
-"hebben, blijft je computer bezig met nuttig werk."
+msgstr "Andere projecten gebruiken, net als %1, BOINC als platform. Het is het overwegen waard om andere projecten toe te voegen. Mocht %1 dan geen werk hebben, blijft je computer bezig met nuttig werk."
 
 #: ../user/info.php:58
 msgid ""
 "These other projects are not associated with %1, and we cannot vouch for "
 "their security practices or the nature of their research. Join them at your "
 "own risk."
-msgstr ""
-"Deze projecten zijn niet verbonden met %1, mede daarom kunnen we geen "
-"garanties geven over hun doelstellingen en de mate van veiligheid. Deelname "
-"is daarom op eigen risico."
+msgstr "Deze projecten zijn niet verbonden met %1, mede daarom kunnen we geen garanties geven over hun doelstellingen en de mate van veiligheid. Deelname is daarom op eigen risico."
 
 #: ../user/language_select.php:47
 msgid "Language selection"
@@ -5127,17 +4774,13 @@ msgstr "Taal selectie"
 msgid ""
 "This web site is available in several languages. The currently selected "
 "language is %1."
-msgstr ""
-"Deze website is beschikbaar in verschillende talen. De geselecteerde taal is "
-"nu: %1."
+msgstr "Deze website is beschikbaar in verschillende talen. De geselecteerde taal is nu: %1."
 
 #: ../user/language_select.php:78
 msgid ""
 "Normally the choice of language is determined by your browser's language "
 "setting, which is: %1.  You can change this setting using:"
-msgstr ""
-"Normaal wordt de taal geselecteerd op basis van de taal instellingen van je "
-"browser, nu ingesteld: %1  Als volgt aan te passen bij:"
+msgstr "Normaal wordt de taal geselecteerd op basis van de taal instellingen van je browser, nu ingesteld: %1  Als volgt aan te passen bij:"
 
 #: ../user/language_select.php:83
 msgid "Firefox: Tools/Options/General"
@@ -5152,10 +4795,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 ""
-"Ook is het mogelijk een taal te selecteren door op een van de links te "
-"klikken.  Er wordt dan een cookie naar je browser verstuurd indien deze dit "
-"accepteert."
+msgstr "Ook is het mogelijk een taal te selecteren door op een van de links te klikken.  Er wordt dan een cookie naar je browser verstuurd indien deze dit accepteert."
 
 #: ../user/language_select.php:95
 msgid "Language name (click to select)"
@@ -5167,11 +4807,9 @@ msgstr "Gebruik taal instelling van browser"
 
 #: ../user/language_select.php:113
 msgid ""
-"Translations are done by volunteers.  If your native language is not here, %"
-"1you can provide a translation%2."
-msgstr ""
-"Vertalingen worden door vrijwilligers gemaakt.  Indien jouw taal niet "
-"voorkomt kan je %1een nieuwe vertaling aanmaken%2."
+"Translations are done by volunteers.  If your native language is not here, "
+"%1you can provide a translation%2."
+msgstr "Vertalingen worden door vrijwilligers gemaakt.  Indien jouw taal niet voorkomt kan je %1een nieuwe vertaling aanmaken%2."
 
 #: ../user/login_form.php:45
 msgid "Email address:"
@@ -5217,13 +4855,7 @@ msgid ""
 "        having that name with the newest computer having that name.\n"
 "        Incompatible computers will not be merged.\n"
 "        <p>"
-msgstr ""
-"Deze actie voegt computers samen op basis van de domeinnaam.\n"
-"        <p>\n"
-"        Voor elke domeinnaam, worden alle oude computers met dezelfde\n"
-"        naam als de nieuwste computer met deze naam samengevoegd.\n"
-"        Indien een computer hier niet aan voldoet, gebeurd dit niet.\n"
-"        <p>"
+msgstr "Deze actie voegt computers samen op basis van de domeinnaam.\n        <p>\n        Voor elke domeinnaam, worden alle oude computers met dezelfde\n        naam als de nieuwste computer met deze naam samengevoegd.\n        Indien een computer hier niet aan voldoet, gebeurd dit niet.\n        <p>"
 
 #: ../user/merge_by_name.php:82
 msgid "Go ahead and do this"
@@ -5239,11 +4871,7 @@ msgid ""
 "To maximize discussion and flow of information,\n"
 "our message boards are moderated.\n"
 "Message board postings are subject to the following posting rules:\n"
-msgstr ""
-"\n"
-"Om de discussie en berichtenstroom te maximaliseren,\n"
-"wordt ons forum gemodereerd.\n"
-"Berichten zijn onderworpen aan de volgende regels en richtlijnen:\n"
+msgstr "\nOm de discussie en berichtenstroom te maximaliseren,\nwordt ons forum gemodereerd.\nBerichten zijn onderworpen aan de volgende regels en richtlijnen:\n"
 
 #: ../user/moderation.php:30
 msgid ""
@@ -5252,8 +4880,7 @@ msgid ""
 "Moderators may delete posts that violate any of these rules.\n"
 "The authors of deleted posts will be notified via email.\n"
 "Gross offenders may have their ability to post messages temporarily revoked\n"
-"(though to prevent abuse only project administrators have the ability to do "
-"so).\n"
+"(though to prevent abuse only project administrators have the ability to do so).\n"
 "Additional kinds of bad behavior (\"bugging\" posts to trap the\n"
 "IP addresses of other participants, excessive thread creation to spam\n"
 "the forums, etc.), while not listed in the formal rules, may still\n"
@@ -5282,41 +4909,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>\n"
-"Moderators mogen berichten verwijderen die deze regels overtreden.\n"
-"De auteurs van verwijderde berichten worden per e-mail ingelicht.\n"
-"Regelmatige overtreders kunnen tijdelijk het recht om berichten te plaatsen\n"
-"verliezen (deze straf wordt alleen opgelegd door project administrators).\n"
-"Aanvullende vormen van ongepast gedrag (berichten \"coderen\" om\n"
-"IP adressen af te vangen, overmatige aanmaak van onderwerpen om\n"
-"de forums te vervuilen, etc.), kan ook, ondanks niet vermeld in de regels,\n"
-"leiden tot vergelijkbare maatregelen.\n"
-"<p>\n"
-"Indien je van mening bent dat een bericht een bepaalde regel overtreedt,\n"
-"kan je op de rode X bij het bericht klikken en de reden hiervoor invullen;\n"
-"de moderators worden dan van je klacht op de hoogte gesteld.\n"
-"Gebruik deze knop ALLEEN voor overtredingen - NIET voor\n"
-"persoonlijke meningsverschillen.\n"
-"<p>\n"
-"We doen, zoals altijd, ons best om fair te modereren, maar in\n"
-"in een grote gemeenschap van gebruikers, met veel standpunten,\n"
-"is het natuurlijk altijd mogelijk dat gebruikers het niet eens zijn\n"
-"met onze beslissingen.\n"
-"Ondanks dat we het betreuren als dit gebeurd,\n"
-"moet men zich ook realiseren dat het niet mogelijk is om het\n"
-"iedereen naar de zin te maken. We nemen onze beslissingen\n"
-"alleen in het belang van het forum.\n"
-"Plaats a.u.b. geen discussies om deze regels te bespreken. Dit is\n"
-"alles behalve een project voor bestudering van sociale vaardigheden,\n"
-"noch zijn we in staat het perfect eerlijke systeem te maken.\n"
-"Mocht je, dit in acht nemende, denken een terechte klacht te\n"
-"hebben, stuur dan een e-mail naar onderstaand adres.\n"
-"<p>\n"
-"Bovenstaande moderatie regels zijn opgesteld door %1.\n"
-"In het geval van opmerkingen hierover, e-mail naar %2.\n"
-"\n"
+msgstr "\n<p>\nModerators mogen berichten verwijderen die deze regels overtreden.\nDe auteurs van verwijderde berichten worden per e-mail ingelicht.\nRegelmatige overtreders kunnen tijdelijk het recht om berichten te plaatsen\nverliezen (deze straf wordt alleen opgelegd door project administrators).\nAanvullende vormen van ongepast gedrag (berichten \"coderen\" om\nIP adressen af te vangen, overmatige aanmaak van onderwerpen om\nde forums te vervuilen, etc.), kan ook, ondanks niet vermel [...]
 
 #: ../user/pending.php:66
 msgid "Pending credit"
@@ -5399,10 +4992,7 @@ msgid ""
 "Your message was flagged as spam\n"
 "                by the Akismet anti-spam system.\n"
 "                Please modify your text and try again."
-msgstr ""
-"Je reactie wordt gezien als spam\n"
-"                door het Akismet anti-spam systeem.\n"
-"                Pas tekst aan en probeer opnieuw."
+msgstr "Je reactie wordt gezien als spam\n                door het Akismet anti-spam systeem.\n                Pas tekst aan en probeer opnieuw."
 
 #: ../user/pm.php:205
 msgid "Could not find user with id %1"
@@ -5432,23 +5022,17 @@ msgstr "Echt %1 blokkeren?"
 msgid ""
 "Are you really sure you want to block user %1 from sending you private "
 "messages?"
-msgstr ""
-"Weet u zeker dat u gebruiker %1 wilt blokkeren om u privé berichten te "
-"sturen?"
+msgstr "Weet u zeker dat u gebruiker %1 wilt blokkeren om u privé berichten te sturen?"
 
 #: ../user/pm.php:244
 msgid "Please note that you can only block a limited amount of users."
-msgstr ""
-"Houdt u er rekening mee dat u slechts een beperkt aantal gebruikers kan "
-"blokkeren."
+msgstr "Houdt u er rekening mee dat u slechts een beperkt aantal gebruikers kan blokkeren."
 
 #: ../user/pm.php:245
 msgid ""
 "Once the user has been blocked you can unblock it using forum preferences "
 "page."
-msgstr ""
-"Zodra de gebruiker is geblokkeerd kunt u hem deblokkering op bij forum "
-"voorkeuren."
+msgstr "Zodra de gebruiker is geblokkeerd kunt u hem deblokkering op bij forum voorkeuren."
 
 #: ../user/pm.php:252
 msgid "No, cancel"
@@ -5479,20 +5063,14 @@ 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 ""
-"Uw voorkeursinstellingen zijn bijgewerkt, en\n"
-"          worden van kracht zodra uw computer communiceert met %1\n"
-"          of als u de %2Update%3 functie van de BOINC Manager gebruikt."
+msgstr "Uw voorkeursinstellingen zijn bijgewerkt, en\n          worden van kracht zodra uw computer communiceert met %1\n          of als u de %2Update%3 functie van de BOINC Manager gebruikt."
 
 #: ../user/prefs.php:41
 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 ""
-"Uw voorkeursinstellingen zijn bijgewerkt naar de standaard instellingen en\n"
-"          worden van kracht zodra uw computer communiceert met %1\n"
-"          of als u de %2Update%3 functie van de BOINC Manager gebruikt."
+msgstr "Uw voorkeursinstellingen zijn bijgewerkt naar de standaard instellingen en\n          worden van kracht zodra uw computer communiceert met %1\n          of als u de %2Update%3 functie van de BOINC Manager gebruikt."
 
 #: ../user/prefs_edit.php:65 ../user/prefs_edit.php:93
 msgid "%1 for %2"
@@ -5522,25 +5100,19 @@ msgstr "Annuleer"
 msgid ""
 "%1Profiles%2 let individuals share backgrounds and opinions with the %3 "
 "community."
-msgstr ""
-"%1Profielen%2 geven de mogelijkheid achtergronden en meningen te delen met "
-"de %3 gemeenschap."
+msgstr "%1Profielen%2 geven de mogelijkheid achtergronden en meningen te delen met de %3 gemeenschap."
 
 #: ../user/profile_menu.php:36
 msgid ""
 "Explore the diversity of your fellow volunteers, and contribute your own "
 "views for others to enjoy."
-msgstr ""
-"Doorzoek de diversiteit van je mede vrijwilligers en laat ze meegenieten van "
-"je eigen mening."
+msgstr "Doorzoek de diversiteit van je mede vrijwilligers en laat ze meegenieten van je eigen mening."
 
 #: ../user/profile_menu.php:37
 msgid ""
 "If you haven't already, you can %1create your own user profile%2 for others "
 "to see!"
-msgstr ""
-"Als je dit nog niet hebt gedaan, kan je %1je eigen profiel aanmaken%2, zodat "
-"anderen dit kunnen zien!"
+msgstr "Als je dit nog niet hebt gedaan, kan je %1je eigen profiel aanmaken%2, zodat anderen dit kunnen zien!"
 
 #: ../user/profile_menu.php:42
 msgid "User of the Day"
@@ -5562,9 +5134,7 @@ msgstr "Doerzoek profielen %1op land%2."
 msgid ""
 "Browse profiles %1at random%2, %3at random with pictures%2, or %4at random "
 "without pictures%2."
-msgstr ""
-"Doorzoek profielen; %1willekeurig%2, %3willekeurig met foto%2 of %"
-"4willekeurig zonder foto%2."
+msgstr "Doorzoek profielen; %1willekeurig%2, %3willekeurig met foto%2 of %4willekeurig zonder foto%2."
 
 #: ../user/profile_menu.php:66
 msgid "Alphabetical profile listings:"
@@ -5808,27 +5378,21 @@ msgstr "Statistieken voor %1"
 
 #: ../user/stats.php:37
 msgid ""
-"More detailed statistics for %1 and other BOINC-based projects are available "
-"at several web sites:"
-msgstr ""
-"Meer gedetailleerde statistieken voor %1 en ander op BOINC gebaseerde "
-"projecten zijn op diverse websites beschikbaar:"
+"More detailed statistics for %1 and other BOINC-based projects are available"
+" at several web sites:"
+msgstr "Meer gedetailleerde statistieken voor %1 en ander op BOINC gebaseerde projecten zijn op diverse websites beschikbaar:"
 
 #: ../user/stats.php:40
 msgid ""
-"You can also get your current statistics in the form of a \"signature image"
-"\":"
-msgstr ""
-"Het is ook mogelijk je huidige statistieken te ontvangen in de vorm van een "
-"\"afbeelding voor handtekeningen\":"
+"You can also get your current statistics in the form of a \"signature "
+"image\":"
+msgstr "Het is ook mogelijk je huidige statistieken te ontvangen in de vorm van een \"afbeelding voor handtekeningen\":"
 
 #: ../user/stats.php:43
 msgid ""
 "Additionally you can get your individual statistics summed across all BOINC "
 "projects from several sites; see your %1home page%2."
-msgstr ""
-"Als toevoeging kan je ook je individuele statistieken krijgen van alle BOINC "
-"projecten vanaf diverse sites; zoals op je %1persoonlijke pagina%2."
+msgstr "Als toevoeging kan je ook je individuele statistieken krijgen van alle BOINC projecten vanaf diverse sites; zoals op je %1persoonlijke pagina%2."
 
 #: ../user/team.php:27
 msgid "%1 participants may form %2teams%3."
@@ -5837,9 +5401,7 @@ msgstr "%1 deelnemers mogen %2teams%3 vormen."
 #: ../user/team.php:29
 msgid ""
 "You may belong to only one team. You can join or quit a team at any time."
-msgstr ""
-"Je mag maar aan één team tegelijk deelnemen. Je kan op elk moment jezelf "
-"toevoegen of het team verlaten."
+msgstr "Je mag maar aan één team tegelijk deelnemen. Je kan op elk moment jezelf toevoegen of het team verlaten."
 
 #: ../user/team.php:31
 msgid "Each team has a %1founder%2 who may:"
@@ -5867,9 +5429,7 @@ msgstr "het team kan ontbinden als het geen leden heeft"
 
 #: ../user/team.php:40
 msgid "To join a team, visit its team page and click %1Join this team%2."
-msgstr ""
-"Om je bij een team te voegen, ga je naar de team pagina en klik je op %1Lid "
-"worden van dit team%2."
+msgstr "Om je bij een team te voegen, ga je naar de team pagina en klik je op %1Lid worden van dit team%2."
 
 #: ../user/team.php:41 ../user/team_search.php:180
 msgid "Find a team"
@@ -5890,9 +5450,7 @@ msgstr "Start nieuw team"
 #: ../user/team.php:59
 msgid ""
 "If you cannot find a team that is right for you, you can %1create a team%2."
-msgstr ""
-"Als je geen team vinden kan die voldoet aan jou eisen, kan je ook je eigen %"
-"1team maken%2."
+msgstr "Als je geen team vinden kan die voldoet aan jou eisen, kan je ook je eigen %1team maken%2."
 
 #: ../user/team_admins.php:34
 msgid "Remove Team Admin status from this member"
@@ -5904,9 +5462,7 @@ msgstr "Een teamlid als administrator toevoegen of verwijderen"
 
 #: ../user/team_admins.php:41
 msgid "You can select team members as 'Team Admins'. Team Admins can:"
-msgstr ""
-"Het is mogelijk teamleden te verkiezen als team-administrator. Een team-"
-"administrator mag:"
+msgstr "Het is mogelijk teamleden te verkiezen als team-administrator. Een team-administrator mag:"
 
 #: ../user/team_admins.php:43
 msgid "Edit team information (name, URL, description, country)"
@@ -5918,11 +5474,9 @@ msgstr "Toon voor dit team het verloop van de aan en afmeld gegevens"
 
 #: ../user/team_admins.php:45
 msgid ""
-"Moderate the team forum, if any (admins get email notification of moderation "
-"events and red X reports)"
-msgstr ""
-"Beheer het team forum, indien aanwezig (Admins krijgen een email notificatie "
-"over het beheren van evenementen en het lezen van X rapporten)"
+"Moderate the team forum, if any (admins get email notification of moderation"
+" events and red X reports)"
+msgstr "Beheer het team forum, indien aanwezig (Admins krijgen een email notificatie over het beheren van evenementen en het lezen van X rapporten)"
 
 #: ../user/team_admins.php:47
 msgid "Team Admins cannot:"
@@ -5938,17 +5492,13 @@ msgstr "Leden verwijderen niet toegestaan"
 
 #: ../user/team_admins.php:53
 msgid "If a Team Admin quits the team, they cease to be a Team Admin."
-msgstr ""
-"Als een team administrator het team verlaat, verliest deze de administrator "
-"rechten."
+msgstr "Als een team administrator het team verlaat, verliest deze de administrator rechten."
 
 #: ../user/team_admins.php:54
 msgid ""
 "We recommend that you select only people you know and trust very well as "
 "Team Admins."
-msgstr ""
-"Wij raden aan dat de keuze van een betrouwbare team administrator "
-"weloverwogen wordt genomen."
+msgstr "Wij raden aan dat de keuze van een betrouwbare team administrator weloverwogen wordt genomen."
 
 #: ../user/team_admins.php:59
 msgid "There are currently no Team Admins"
@@ -6018,18 +5568,13 @@ msgstr "Oprichter van %1 wijzigen"
 msgid ""
 "Team member %1 requested this team's foundership on %2, but left the team, "
 "thus canceling the request."
-msgstr ""
-"Team lid %1 heeft het oprichterschap van dit team gevraagd op %2, maar heeft "
-"het team verlaten, hierdoor wordt zijn verzoek geannuleerd."
+msgstr "Team lid %1 heeft het oprichterschap van dit team gevraagd op %2, maar heeft het team verlaten, hierdoor wordt zijn verzoek geannuleerd."
 
 #: ../user/team_change_founder_form.php:49
 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 ""
-"Team lid %1 heeft het oprichterschap van dit team aangevraagd. Dit kan zijn "
-"omdat u het team heeft verlaten, of lange tijd geen contact hebt gehad met "
-"het team."
+msgstr "Team lid %1 heeft het oprichterschap van dit team aangevraagd. Dit kan zijn omdat u het team heeft verlaten, of lange tijd geen contact hebt gehad met het team."
 
 #: ../user/team_change_founder_form.php:55
 msgid "decline request"
@@ -6037,15 +5582,9 @@ msgstr "verzoek afwijzen"
 
 #: ../user/team_change_founder_form.php:58
 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 ""
-"Al u het verzoek niet voor %1 afwijst, zal %2 de optie krijgen om het "
-"oprichterschap van het team op te eissen.<br /><br />\n"
-"                  Om het verzoek te accepteren kunt het het oprichterschap "
-"overdragen aan %3 middels het onderstaande formulier."
+"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 "Al u het verzoek niet voor %1 afwijst, zal %2 de optie krijgen om het oprichterschap van het team op te eissen.<br /><br />\n                  Om het verzoek te accepteren kunt het het oprichterschap overdragen aan %3 middels het onderstaande formulier."
 
 #: ../user/team_change_founder_form.php:66
 msgid "No transfer request is pending."
@@ -6055,10 +5594,7 @@ msgstr "Geen overplaatsings verzoeken in behandeling."
 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 ""
-"Om oprichterschap van dit team over te dragen naar een ander lid, vinkt u "
-"het vakje naast de naam van het lid aan en klikt u hieronder "
-"op<strong>Oprichter wijzigen</strong>."
+msgstr "Om oprichterschap van dit team over te dragen naar een ander lid, vinkt u het vakje naast de naam van het lid aan en klikt u hieronder op<strong>Oprichter wijzigen</strong>."
 
 #: ../user/team_change_founder_form.php:76
 msgid "New founder?"
@@ -6091,9 +5627,7 @@ msgstr "Een team aanmaken"
 #: ../user/team_create_form.php:30
 msgid ""
 "You belong to %1. You must %2quit this team%3 before creating a new one."
-msgstr ""
-"Je bent al lid van %1. Je moet eerst %2dit team verlaten%3 voordat je een "
-"nieuw team kan beginnen."
+msgstr "Je bent al lid van %1. Je moet eerst %2dit team verlaten%3 voordat je een nieuw team kan beginnen."
 
 #: ../user/team_delta.php:65
 msgid "Not founder or admin"
@@ -6216,10 +5750,7 @@ 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 ""
-"Weet u zeker dat u uw team forum wilt verwijderen? Alle discussies en "
-"berichten worden permanent verwijderd. (U kunt later altijd opnieuw een "
-"forum aanmaken)."
+msgstr "Weet u zeker dat u uw team forum wilt verwijderen? Alle discussies en berichten worden permanent verwijderd. (U kunt later altijd opnieuw een forum aanmaken)."
 
 #: ../user/team_forum.php:100
 msgid "Yes - remove message board"
@@ -6231,7 +5762,8 @@ msgstr "Forum verwijderd"
 
 #: ../user/team_forum.php:124
 msgid ""
-"Your team's message board has been removed. You may now %1create a new one%2."
+"Your team's message board has been removed. You may now %1create a new "
+"one%2."
 msgstr "Uw team forum is verwijderd. U kunt nu %1een nieuwe aanmaken%2."
 
 #: ../user/team_forum.php:143
@@ -6260,15 +5792,9 @@ msgstr "Verzoek oprichterschap van %1"
 
 #: ../user/team_founder_transfer_action.php:98
 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 ""
-"De huidige oprichter is per e-mail en privé bericht op de hoogte gesteld van "
-"je verzoek.<br /><br />\n"
-"                       Als deze oprichter niet binnen 60 dagen reageert word "
-"jij automatisch de nieuwe oprichter."
+"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 "De huidige oprichter is per e-mail en privé bericht op de hoogte gesteld van je verzoek.<br /><br />\n                       Als deze oprichter niet binnen 60 dagen reageert word jij automatisch de nieuwe oprichter."
 
 #: ../user/team_founder_transfer_action.php:102
 #: ../user/team_founder_transfer_action.php:113
@@ -6283,9 +5809,7 @@ msgstr "Heeft het oprichterschap verkregen van %1"
 msgid ""
 "Congratulations, you are now the founder of team %1. Go to %2Your Account "
 "page%3 to find the Team Admin options."
-msgstr ""
-"Gefeliciteerd, u bent nu de nieuwe oprichter van team %1. Ga naar %2Uw "
-"Account pagina%3 om de Team Admin opties te vinden."
+msgstr "Gefeliciteerd, u bent nu de nieuwe oprichter van team %1. Ga naar %2Uw Account pagina%3 om de Team Admin opties te vinden."
 
 #: ../user/team_founder_transfer_action.php:120
 msgid "Decline founder change request"
@@ -6328,9 +5852,7 @@ msgstr "Je hebt een verzoek gedaan om oprichter te worden van %1 op %2."
 msgid ""
 "60 days have elapsed since your request, and the founder has not responded. "
 "You may now assume foundership by clicking here:"
-msgstr ""
-"Er zijn 60 dagen verstreken sinds je verzoek, en de huidige oprichter heeft "
-"niet gereageerd. Jij kunt nu oprichter worden door hier te klikken:"
+msgstr "Er zijn 60 dagen verstreken sinds je verzoek, en de huidige oprichter heeft niet gereageerd. Jij kunt nu oprichter worden door hier te klikken:"
 
 #: ../user/team_founder_transfer_form.php:50
 msgid "Assume foundership"
@@ -6340,25 +5862,13 @@ msgstr "Oprichterschap aannemen"
 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 ""
-"De oprichter is op de hoogte gesteld van uw verzoek. Als hij/zij niet voor %"
-"1 reageert, kunt u de status van oprichter toegewezen krijgen."
+msgstr "De oprichter is op de hoogte gesteld van uw verzoek. Als hij/zij niet voor %1 reageert, kunt u de status van oprichter toegewezen krijgen."
 
 #: ../user/team_founder_transfer_form.php:60
 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"
+"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 ""
-"Indien de oprichter van het team niet actief deelneemt en u de status van "
-"oprichter wilt overnemen, klikt u op de onderstaande knop. De huidige "
-"oprichter ontvangt uw verzoek tot overname per e-mail en kan dit vervolgens "
-"inwilligen of afwijzen. Als de oprichter niet binnen 60 dagen reageert, "
-"wordt de status van oprichter aan u toegewezen.<br /><br />\n"
-"                       Wilt u een verzoek tot statusovername indienen?"
+msgstr "Indien de oprichter van het team niet actief deelneemt en u de status van oprichter wilt overnemen, klikt u op de onderstaande knop. De huidige oprichter ontvangt uw verzoek tot overname per e-mail en kan dit vervolgens inwilligen of afwijzen. Als de oprichter niet binnen 60 dagen reageert, wordt de status van oprichter aan u toegewezen.<br /><br />\n                       Wilt u een verzoek tot statusovername indienen?"
 
 #: ../user/team_founder_transfer_form.php:65
 msgid "Request foundership"
@@ -6372,10 +5882,7 @@ msgstr "Er is al een verzoek gedaan om oprichter te worden door %1 op %2."
 msgid ""
 "A foundership change was requested during the last 90 days, so new requests "
 "are not allowed. Please try again later."
-msgstr ""
-"Omdat er in de afgelopen 90 dagen al een verzoek tot overname van de "
-"oprichterstatus is ingediend, worden recentere verzoeken niet in behandeling "
-"genomen. Probeer het later nog eens alstublieft."
+msgstr "Omdat er in de afgelopen 90 dagen al een verzoek tot overname van de oprichterstatus is ingediend, worden recentere verzoeken niet in behandeling genomen. Probeer het later nog eens alstublieft."
 
 #: ../user/team_join.php:32 ../user/team_join_action.php:32
 #: ../user/team_join_form.php:29
@@ -6432,22 +5939,17 @@ msgstr "Zoek resultaten voor '%1'"
 
 #: ../user/team_lookup.php:88
 msgid "You may view these teams' members, statistics, and information."
-msgstr ""
-"U hebt toegang tot informatie over de leden en statistieken van dit team."
+msgstr "U hebt toegang tot informatie over de leden en statistieken van dit team."
 
 #: ../user/team_lookup.php:98
 msgid "More than 100 teams match your search. The first 100 are shown."
-msgstr ""
-"Meer dan 100 teams voldoen aan uw zoekopdracht. De eerste 100 worden "
-"getoond."
+msgstr "Meer dan 100 teams voldoen aan uw zoekopdracht. De eerste 100 worden getoond."
 
 #: ../user/team_lookup.php:104
 msgid ""
-"End of results. %1 If you cannot find the team you are looking for, you may %"
-"2create a team%3 yourself."
-msgstr ""
-"Einde van zoekresultaten. %1 Als u het team dat u zoekt niet hebt gevonden, "
-"kunt u %2zelf een team oprichten%3."
+"End of results. %1 If you cannot find the team you are looking for, you may "
+"%2create a team%3 yourself."
+msgstr "Einde van zoekresultaten. %1 Als u het team dat u zoekt niet hebt gevonden, kunt u %2zelf een team oprichten%3."
 
 #: ../user/team_manage.php:26
 msgid "Team administration for %1"
@@ -6495,9 +5997,7 @@ msgstr "Reageer op verzoek tot veranderen oprichter."
 
 #: ../user/team_manage.php:50
 msgid "If you don't respond by %1, %2 may assume foundership of this team."
-msgstr ""
-"Indien je niet voor %1 reageert, kan %2 het oprichterschap van dit team "
-"aannemen."
+msgstr "Indien je niet voor %1 reageert, kan %2 het oprichterschap van dit team aannemen."
 
 #: ../user/team_manage.php:55
 msgid "Remove inactive or unwanted members from this team"
@@ -6529,27 +6029,21 @@ msgstr "Een team forum aanmaken of beheren"
 
 #: ../user/team_manage.php:71
 msgid ""
-"To have this team created on all BOINC projects (current and future) you can "
-"make it into a %1BOINC-wide team%2."
-msgstr ""
-"Om dit team aan te maken bij alle BOINC projecten (huidige en toekomstige), "
-"maak je het team aan als een %1BOINC-wide team%2."
+"To have this team created on all BOINC projects (current and future) you can"
+" make it into a %1BOINC-wide team%2."
+msgstr "Om dit team aan te maken bij alle BOINC projecten (huidige en toekomstige), maak je het team aan als een %1BOINC-wide team%2."
 
 #: ../user/team_manage.php:73
 msgid ""
 "Team admins are encouraged to join and participate in the Google %1boinc-"
 "team-founders%2 group."
-msgstr ""
-"Het wordt Team administrators aangeraden zich aan te sluiten bij, c.q. een "
-"bijdrage te leveren aan de Google %1boinc-team-founders%2 groep."
+msgstr "Het wordt Team administrators aangeraden zich aan te sluiten bij, c.q. een bijdrage te leveren aan de Google %1boinc-team-founders%2 groep."
 
 #: ../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 opties voor BOINC team admins zijn beschikbaar op de volgende site, %"
-"1www.boincteams.com%2."
+"Other resources for BOINC team admins are available from a third-party site,"
+" %1www.boincteams.com%2."
+msgstr "Andere opties voor BOINC team admins zijn beschikbaar op de volgende site, %1www.boincteams.com%2."
 
 #: ../user/team_manage.php:91
 msgid "Can't delete non-empty team"
@@ -6583,19 +6077,10 @@ msgstr "Verlaat %1"
 msgid ""
 "<strong>Please note before quitting a team:</strong>\n"
 "         <ul>\n"
-"         <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>Let op voordat je een team verlaat:</strong>\n"
-"         <ul>\n"
-"         <li>Je mag altijd opnieuw lid worden of lid worden van een ander "
-"team indien je dit wenst.\n"
-"         <li>Een team verlaten heeft op geen enkele wijze gevolgen voor je "
-"persoonlijke punten statistiek.\n"
+"         <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>Let op voordat je een team verlaat:</strong>\n         <ul>\n         <li>Je mag altijd opnieuw lid worden of lid worden van een ander team indien je dit wenst.\n         <li>Een team verlaten heeft op geen enkele wijze gevolgen voor je persoonlijke punten statistiek.\n         </ul>"
 
 #: ../user/team_quit_form.php:40
 msgid "Quit Team"
@@ -6643,9 +6128,7 @@ msgstr "Team resultaten"
 
 #: ../user/team_search.php:94
 msgid "No teams were found matching your criteria. Try another search."
-msgstr ""
-"Er zijn geen teams gevonden die voldoen aan jouw criteria. Probeer een "
-"andere zoekopdracht."
+msgstr "Er zijn geen teams gevonden die voldoen aan jouw criteria. Probeer een andere zoekopdracht."
 
 #: ../user/team_search.php:96
 msgid "Or you can %1create a new team%2."
@@ -6656,12 +6139,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 ""
-"The following teams match one or more of your search criteria.\n"
-"\n"
-"            To join a team, click its name to go to the team page,\n"
-"\n"
-"               then click %1Join this team%2."
+msgstr "The following teams match one or more of your search criteria.\n\n            To join a team, click its name to go to the team page,\n\n               then click %1Join this team%2."
 
 #: ../user/team_search.php:107
 msgid "Change your search"
@@ -6671,15 +6149,11 @@ msgstr "Verander je zoekopdracht"
 msgid ""
 "You can team up with other people with similar interests, or from the same "
 "country, company, or school."
-msgstr ""
-"U kunt zich aansluiten bij deelnemers met dezelfde interesses, bij "
-"landgenoten, collega's of uw schoolteam."
+msgstr "U kunt zich aansluiten bij deelnemers met dezelfde interesses, bij landgenoten, collega's of uw schoolteam."
 
 #: ../user/team_search.php:183
 msgid "Use this form to find teams that might be right for you."
-msgstr ""
-"Middels dit formulier kunt u wellicht een keuze maken uit de voor u "
-"geschikte teams."
+msgstr "Middels dit formulier kunt u wellicht een keuze maken uit de voor u geschikte teams."
 
 #: ../user/team_search.php:188
 msgid "%1I'm not interested%2 in joining a team right now."
@@ -6802,9 +6276,7 @@ msgstr "Controleer BOINC e-mail adres"
 msgid ""
 "Please visit the following link to validate the email address of your %1 "
 "account:"
-msgstr ""
-"Klik a.u.b. op de volgende link om het e-mail adres van je %1 account te "
-"controleren:"
+msgstr "Klik a.u.b. op de volgende link om het e-mail adres van je %1 account te controleren:"
 
 #: ../user/validate_email_addr.php:34
 msgid "Validate email sent"
@@ -6814,9 +6286,7 @@ msgstr "Controle e-mail verzonden"
 msgid ""
 "An email has been sent to %1. Visit the link it contains to validate your "
 "email address."
-msgstr ""
-"Er is een e-mail verzonden naar %1. Een bevestigings link is hierin "
-"opgenomen."
+msgstr "Er is een e-mail verzonden naar %1. Een bevestigings link is hierin opgenomen."
 
 #: ../user/validate_email_addr.php:44
 msgid "No such user."
@@ -6852,15 +6322,10 @@ msgstr "Account gegevens"
 
 #: ../user/weak_auth.php:52
 msgid ""
-"You can access your account either by using your email address and "
-"password,\n"
+"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 ""
-"Je kan toegang krijgen tot je account d.m.v. een je e-mail adres en "
-"wachtwoord\n"
-"    of door gebruik te maken van een 'account key'.\n"
-"    Jouw account key is:"
+msgstr "Je kan toegang krijgen tot je account d.m.v. een je e-mail adres en wachtwoord\n    of door gebruik te maken van een 'account key'.\n    Jouw account key is:"
 
 #: ../user/weak_auth.php:57
 msgid "This key can be used to:"
@@ -6876,12 +6341,7 @@ msgid ""
 "       To do so, install BOINC,\n"
 "       create a file named %1 in the BOINC\n"
 "       data directory, and set its contents to:"
-msgstr ""
-"je computer aan je account toe te voegen zonder gebruik van de BOINC "
-"Manager.\n"
-"       Om dit te doen installeer je BOINC,\n"
-"       maak je een bestand met de naam %1 in de\n"
-"       BOINC data map en vul je het volgende in:"
+msgstr "je computer aan je account toe te voegen zonder gebruik van de BOINC Manager.\n       Om dit te doen installeer je BOINC,\n       maak je een bestand met de naam %1 in de\n       BOINC data map en vul je het volgende in:"
 
 #: ../user/weak_auth.php:73
 msgid "Weak account key"
@@ -6890,26 +6350,17 @@ msgstr "Zwakke account key"
 #: ../user/weak_auth.php:74
 msgid ""
 "Your 'weak account key' can be used to attach computers to your account\n"
-"    as described above, but cannot be used to log in to your account or "
-"change it in any way.\n"
+"    as described above, but cannot be used to log in to your account or change it in any way.\n"
 "    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 ""
-"Een 'zwakke account key' kan worden gebruikt om computers aan je account\n"
-"    toe te voegen met bovenstaande methode, maar kan niet worden gebruikt om "
-"in te loggen\n"
-"    op je account. Gebruik alleen je zwakke account key om vertrouwde\n"
-"    computers toe te voegen.\n"
-"    Jouw zwakke account key is:"
+msgstr "Een 'zwakke account key' kan worden gebruikt om computers aan je account\n    toe te voegen met bovenstaande methode, maar kan niet worden gebruikt om in te loggen\n    op je account. Gebruik alleen je zwakke account key om vertrouwde\n    computers toe te voegen.\n    Jouw zwakke account key is:"
 
 #: ../user/weak_auth.php:81
 msgid ""
 "If you change your password, your weak account key changes, and your "
 "previous weak account key becomes invalid."
-msgstr ""
-"Zodra je je wachtwoord wijzigt veranderd ook je zwakke account key en wordt "
-"de vorige ongeldig."
+msgstr "Zodra je je wachtwoord wijzigt veranderd ook je zwakke account key en wordt de vorige ongeldig."
 
 #: ../user/workunit.php:32
 msgid "can't find workunit"
@@ -6975,9 +6426,7 @@ msgstr "Je persoonlijke achtergrond."
 msgid ""
 "Tell us about yourself. You could tell us where you're from, your age, "
 "occupation, hobbies, or anything else about yourself."
-msgstr ""
-"Vertel ons over jezelf. Vertel bijvoorbeeld waar je vandaan komt, je "
-"leeftijd, beroep, hobbies of andere zaken over jezelf."
+msgstr "Vertel ons over jezelf. Vertel bijvoorbeeld waar je vandaan komt, je leeftijd, beroep, hobbies of andere zaken over jezelf."
 
 #: ../project.sample/project.inc:87
 msgid "Your opinions about %1"
@@ -6990,12 +6439,7 @@ msgid ""
 "    <li>What are your views about the project?\n"
 "    <li>Any suggestions?\n"
 "    </ol>"
-msgstr ""
-"Vertel ons jouw gedachten over %1<ol>\n"
-"    <li>Waarom draai je %1?\n"
-"    <li>Wat zijn jouw visies op het project?\n"
-"    <li>Heb je suggesties?\n"
-"    </ol>"
+msgstr "Vertel ons jouw gedachten over %1<ol>\n    <li>Waarom draai je %1?\n    <li>Wat zijn jouw visies op het project?\n    <li>Heb je suggesties?\n    </ol>"
 
 #: ../project.sample/project_specific_prefs.inc:47
 msgid "Color scheme for graphics"
@@ -7013,411 +6457,8 @@ msgstr "Alleen geselecteerde applicaties uitvoeren"
 msgid ""
 "If no work for selected applications is available, accept work from other "
 "applications?"
-msgstr ""
-"Andere applicaties accepteren als er geen werk voor de geselecteerde "
-"applicaties is?"
+msgstr "Andere applicaties accepteren als er geen werk voor de geselecteerde applicaties is?"
 
 #: ../project.sample/project_specific_prefs.inc:91
 msgid "(all applications)"
 msgstr "(alle applicaties)"
-
-#~ msgid "Error:"
-#~ msgstr "Fout:"
-
-#~ msgid "Account creation is disabled"
-#~ msgstr "Aanmaken van account gesloten"
-
-#~ msgid ""
-#~ "Sorry, this project has disabled the creation of new accounts.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Sorry, voor dit project is het momenteel niet mogelijk om een nieuwe account "
-#~ "aan te maken.\n"
-#~ "Probeer het later opnieuw a.u.b."
-
-#~ msgid "Account creation is currently disabled. Please try again later."
-#~ msgstr ""
-#~ "Aanmaken van account is tijdelijk niet mogelijk. Probeer het a.u.b. later "
-#~ "nog eens."
-
-#~ msgid "nvidia GPU"
-#~ msgstr "nvidia GPU"
-
-#~ msgid ""
-#~ "This project hasn\\'t created an email message - please notify its "
-#~ "administrators"
-#~ msgstr ""
-#~ "Dit project heeft geen e-mailbericht gegenereerd. Neem a.u.b. contact op met "
-#~ "de projectadministrators"
-
-#~ msgid "Use Intel GPU %1 Enforced by version 7.0+ %2"
-#~ msgstr "Gebruik Intel GPU %1 Instelbaar vanaf 7.0+ %2"
-
-#~ msgid ""
-#~ "These apply to all BOINC projects in which you participate.<br>\n"
-#~ "             On computers participating in multiple projects, the most "
-#~ "recently modified preferences will be used."
-#~ msgstr ""
-#~ "Dit is van toepassing op alle projecten waar je aan deelneemt.<br>\n"
-#~ "             Op computers met meerdere projecten worden de meest recente "
-#~ "voorkeursinstellingen toegepast."
-
-#~ msgid "Export this news item as a Notice"
-#~ msgstr "Dit nieuws artikel exporteren als mededeling"
-
-#~ msgid ""
-#~ "Go to the BOINC data directory on your computer (on Windows this is usually "
-#~ "<b>C:\\Documents and Settings\\All Users\\Application Data\\BOINC</b> or "
-#~ "<b>C:\\Program Files\\BOINC</b>."
-#~ msgstr ""
-#~ "Ga naar de BOINC-gegevensmap (in Windows is dat doorgaans <b>C:\\Documents "
-#~ "and Settings\\All Users\\Application Data\\BOINC</b> of <b>C:\\Program "
-#~ "Files\\BOINC</b>."
-
-#~ msgid "No such task"
-#~ msgstr "Taak niet gevonden"
-
-#~ msgid ""
-#~ "Computer is connected to the Internet about every %1 Leave blank or 0 if "
-#~ "always connected. %2 BOINC will try to maintain at least this much work (max "
-#~ "10 days). %3"
-#~ msgstr ""
-#~ "Computer is verbonden met het internet elke %1 Laat leeg of vul 0 in indien "
-#~ "altijd verbonden. %2 BOINC haalt minimaal de aangegeven hoeveelheid aan werk "
-#~ "binnen (max 10 dagen). %3"
-
-#~ msgid "Maintain enough work for an additional"
-#~ msgstr "Extra werk binnen halen voor tenminste"
-
-#~ msgid "Update failed: "
-#~ msgstr "Bijwerken mislukt: "
-
-#~ msgid "Provides %1limited access%2 to your account"
-#~ msgstr "Geeft %1beperkte toegang%2 tot je account"
-
-#~ msgid ""
-#~ "Don't use this form. Just run BOINC, select Add Project, and enter an email "
-#~ "address and password."
-#~ msgstr ""
-#~ "Hier geen gegevens invullen. Start BOINC, selecteer 'Project toevoegen' en "
-#~ "vul daar een email adres en wachtwoord in."
-
-#~ msgid "Do not reorder sticky posts"
-#~ msgstr "Volgorde van gemarkeerde berichten niet wijzigen"
-
-#~ msgid "If a thread contains more than this number of posts"
-#~ msgstr "Indien het aantal reacties op een onderwerp groter is dan"
-
-#~ msgid "only display the first one and this many of the last ones"
-#~ msgstr ""
-#~ "alleen de nieuwste en het volgende aantal eerder geplaatste reacties "
-#~ "weergeven"
-
-#~ msgid "Your report has been recorded. Thanks you for your input."
-#~ msgstr "Uw rapportage is geregistreerd. Hartelijk dank voor uw bijdrage."
-
-#~ msgid "Search type"
-#~ msgstr "Zoek type"
-
-#~ msgid "User names starting with"
-#~ msgstr "Gebruikersnamen beginnend met"
-
-#~ msgid ""
-#~ "Your 'weak account key' lets you link a computer to your account without "
-#~ "giving it the ability to log in to your account or to change it in any way."
-#~ msgstr ""
-#~ "Een 'beperkte account key' geeft de mogelijkheid computers toe te voegen aan "
-#~ "dit project, je account aanpassen of hierop inloggen is hiermee niet "
-#~ "mogelijk."
-
-#~ msgid ""
-#~ "This mechanism works only with projects that have upgraded their server "
-#~ "software 7 Dec 2007 or later."
-#~ msgstr ""
-#~ "Deze optie werkt alleen met projecten die een server software versie hebben "
-#~ "van 7 december 2007 of later."
-
-#~ msgid "Your weak account key for this project is:"
-#~ msgstr "Je 'beperkte account key' voor dit project is:"
-
-#~ msgid ""
-#~ "To use your weak account key on a given host, find or create the 'account "
-#~ "file' for this project. This file has a name of the form "
-#~ "<b>account_PROJECT_URL.xml</b>. The account file for %1 is <b>%2</b>."
-#~ msgstr ""
-#~ "Om je 'beperkte account key' te kunnen gebruiken, zoek je naar (of maak je) "
-#~ "een 'account bestand' op de bedoelde computer. Dit bestand heeft de "
-#~ "bestandsopbouw; <b>account_PROJECT_URL.xml</b>. Het bestand voor %1 is <b>%"
-#~ "2</b>."
-
-#~ msgid "Create this file if needed. Set its contents to:"
-#~ msgstr "Maak dit bestand aan indien nodig. Zet de indeling op:"
-
-#~ msgid ""
-#~ "Your weak account key is a function of your password. If you change your "
-#~ "password, your weak account key changes, and your previous weak account key "
-#~ "becomes invalid."
-#~ msgstr ""
-#~ "Je 'beperkte account key' is afhankelijk van je wachtwoord. Indien je je "
-#~ "wachtwoord veranderd, zal ook je 'beperkte account key' aangepast worden en "
-#~ "is de vorige niet meer geldig."
-
-#~ msgid "Account key"
-#~ msgstr "Account key"
-
-#~ msgid "Provides full access to your account"
-#~ msgstr "Geeft volledige toegang tot je account"
-
-#~ msgid "Export"
-#~ msgstr "Exporteren"
-
-#~ msgid "- private message"
-#~ msgstr "- persoonlijk bericht"
-
-#~ msgid "Private message from"
-#~ msgstr "Persoonlijk bericht van"
-
-#~ msgid "Email address verification pending"
-#~ msgstr "Verificatie van e-mail adres in behandeling"
-
-#~ msgid "Logged in as %1."
-#~ msgstr "Ingelogd als %1"
-
-#~ msgid "Log in as someone else."
-#~ msgstr "Ingelogd als iemand anders."
-
-#~ msgid "No thread with id %1. Please check the link and try again."
-#~ msgstr ""
-#~ "Geen onderwerp met id %1. Controleer de link en probeer het opnieuw."
-
-#~ msgid "Request not found"
-#~ msgstr "Verzoek niet gevonden"
-
-#~ msgid "%1 has added you as a friend."
-#~ msgstr "%1 heeft jou als vriend(in) toegevoegd."
-
-#~ msgid "Account data for %1"
-#~ msgstr "Account gegevens voor %1"
-
-#~ msgid "couldn't create message board"
-#~ msgstr "forum aanmaken mislukt"
-
-#~ msgid "message board not found"
-#~ msgstr "forum niet gevonden"
-
-#~ msgid "no such forum"
-#~ msgstr "forum niet gevonden"
-
-#~ msgid "unknown command %1"
-#~ msgstr "onbekende opdracht %1"
-
-#~ msgid "ERROR: %1 does not exist!  Cannot create combo box.<br>"
-#~ msgstr "FOUT: %1 bestaat niet!  Combo box kon niet worden gemaakt.<br>"
-
-#~ msgid ""
-#~ "To protect the project's webpages from spam, we kindly ask you to type in "
-#~ "the two words shown in the image:<br>\n"
-#~ msgstr ""
-#~ "Om de website van dit project tegen spam te beschermen, vragen we je "
-#~ "vriendelijk om de twee getoonde worden in de afbeelding in te typen:<br>\n"
-
-#~ msgid "BOINC client version"
-#~ msgstr "BOINC cliënt versie"
-
-#~ msgid "Client detached"
-#~ msgstr "Client teruggetrokken"
-
-#~ msgid "Maximum daily WU quota per CPU"
-#~ msgstr "Maximum dagelijkse WU quota per CPU"
-
-#~ msgid "%1/day"
-#~ msgstr "%1/dag"
-
-#~ msgid "Anonymous platform - CPU"
-#~ msgstr "Anoniem platform - CPU"
-
-#~ msgid "Anonymous platform - NVIDIA GPU"
-#~ msgstr "Anoniem platform - NVIDIA GPU"
-
-#~ msgid "Anonymous platform - ATI GPU"
-#~ msgstr "Anoniem platform - ATI GPU"
-
-#~ msgid "Task ID"
-#~ msgstr "Taak ID"
-
-#~ msgid "Granted credit"
-#~ msgstr "Toegekende punten"
-
-#~ msgid "Click to"
-#~ msgstr "Klik om"
-
-#~ msgid "(no restriction if equal)"
-#~ msgstr "(geen beperkingen indien gelijk)"
-
-#~ msgid "Leave at least"
-#~ msgstr "Laat minstens"
-
-#~ msgid "% of page file (swap space)"
-#~ msgstr "% vrij van het virtuele geheugen"
-
-#~ msgid "Use ATI GPU if present %1(enforced by 6.10+ clients)%2"
-#~ msgstr "Indien aanwezig gebruik ATI GPU %1(instelbaar vanaf 6.10+)%2"
-
-#~ msgid "KB/s"
-#~ msgstr "KB/s"
-
-#~ msgid "GB disk space"
-#~ msgstr "Gb schijfruimte"
-
-#~ msgid "GB disk space free"
-#~ msgstr "Gb schijfruimte vrij"
-
-#~ msgid "(no restriction)"
-#~ msgstr "(geen beperking)"
-
-#~ msgid "%1 GB disk space"
-#~ msgstr "%1 Gb schijfruimte"
-
-#~ msgid "%1 GB disk space free"
-#~ msgstr "%1 Gb schijfruimte vrij"
-
-#~ msgid ""
-#~ "Resource share %1If you participate in multiple BOINC projects, this is "
-#~ "the proportion of your resources used by %2%3"
-#~ msgstr ""
-#~ "Gedeelde bronnen %1Indien je meedoet aan meerdere BOINC projecten is dit "
-#~ "het gebruikte gedeelte van %2%3"
-
-#~ msgid "Gbytes"
-#~ msgstr "Gbytes"
-
-#~ msgid "Resource share"
-#~ msgstr "Gedeelde bronnen"
-
-#~ msgid "Last %1"
-#~ msgstr "Laatste %1"
-
-# The charset used for the text in this file (please try to use UTF-8 if possible)
-#~ msgid "CHARSET"
-#~ msgstr "UTF-8"
-
-#~ msgid "Language symbol"
-#~ msgstr "Taal symbool"
-
-#~ msgid "Resource share and graphics"
-#~ msgstr "Gedeelde bronnen en grafische weergave"
-
-#~ msgid "fll"
-#~ msgstr "fll"
-
-#~ msgid "Tasks for computer %1"
-#~ msgstr "Taken voor computer %1"
-
-#~ msgid "Provides"
-#~ msgstr "Geeft"
-
-#~ msgid "limited access"
-#~ msgstr "gedeeltelijke toegang"
-
-#~ msgid "to your account"
-#~ msgstr "tot je account"
-
-#~ msgid "Current version"
-#~ msgstr "Huidige versie"
-
-#~ msgid "Mark as unread"
-#~ msgstr "Markeer als 'ongelezen'"
-
-#~ msgid "With selected"
-#~ msgstr "Met het volgende"
-
-#~ msgid ""
-#~ "Are you sure you want to delete the message with subject "%1" "
-#~ "(sent by %2 on %3)?"
-#~ msgstr ""
-#~ "Weet je zeker dat je het bericht met het onderwerp "%1&quot wilt "
-#~ "verwijderen; (verzonden door %2 op %3)?"
-
-#~ msgid "Yes, delete"
-#~ msgstr "Ja, verwijder"
-
-#~ msgid "No such message."
-#~ msgstr "Geen bericht gevonden."
-
-# Apps page (apps.php)
-# ########################################
-#~ msgid "APPS_TITLE"
-#~ msgstr "Applicaties"
-
-# Rules and Policies page (info.php)
-# ########################################
-#~ msgid "RULES_TITLE"
-#~ msgstr "Lees onze regels en beleid"
-
-# Create account form (create_account_form.php)
-# ########################################
-#~ msgid "CREATE_AC_TITLE"
-#~ msgstr "Maak een an account"
-
-#~ msgid "FORUM_TITLE"
-#~ msgstr "$PROJECT Forums"
-
-#~ msgid "FORUM_TITLE_SHORT"
-#~ msgstr "Forums"
-
-# ########################################
-# General stuff (create_account_form.php and others)
-# ########################################
-#~ msgid "OPTIONAL"
-#~ msgstr "Optioneel"
-
-#~ msgid "TOP_PARTICIPANT_TITLE"
-#~ msgstr "Beste deelnemers"
-
-#~ msgid "USER_TABLE_RANK"
-#~ msgstr "Positie"
-
-#~ msgid "USER_TABLE_NAME"
-#~ msgstr "Naam"
-
-#~ msgid "TOTAL_CREDIT"
-#~ msgstr "Punten totaal"
-
-#~ msgid "EXPAVG_CREDIT"
-#~ msgstr "Punten gemiddeld"
-
-#~ msgid "USER_TABLE_COUNTRY"
-#~ msgstr "Land"
-
-#~ msgid "USER_TABLE_PTIME"
-#~ msgstr "Deelnemer sinds"
-
-#~ msgid "TOP_TEAMS_TITLE"
-#~ msgstr "Beste %s teams"
-
-#~ msgid "TEAM_TABLE_MEMBERS"
-#~ msgstr "Leden"
-
-# ########################################
-# Forum
-# ########################################
-#~ msgid "FORUM_POSTS"
-#~ msgstr "Berichten"
-
-# Forum thread
-# ########################################
-#~ msgid "FORUM_THREAD_HIDDEN"
-#~ msgstr "Deze discussie is verborgen voor administratieve doeleinden"
-
-# Forum search features
-# ########################################
-# Apps page (apps.php)
-# ########################################
-# Rules and Policies page (info.php)
-# Create account form (create_account_form.php)
-# General stuff (create_account_form.php and others)
-# Forum
-# Forum thread
-# Forum search features
-#~ msgid "FORUM_SEARCH"
-#~ msgstr "Zoek forums"
diff --git a/locale/nl/BOINC-Setup.mo b/locale/nl/BOINC-Setup.mo
index 008ef57..c4bebb1 100644
Binary files a/locale/nl/BOINC-Setup.mo and b/locale/nl/BOINC-Setup.mo differ
diff --git a/locale/nl/BOINC-Setup.po b/locale/nl/BOINC-Setup.po
index b8d0060..25ec445 100644
--- a/locale/nl/BOINC-Setup.po
+++ b/locale/nl/BOINC-Setup.po
@@ -1,40 +1,32 @@
 # 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: BOINC 7.4\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-12 00:06-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: nl\n"
+"PO-Revision-Date: 2015-02-08 23:36+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\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"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-Basepath: /Volumes/Cheer/BOINC_GIT/boinc_trunk\n"
-"X-POOTLE-MTIME: 1419166048.0\n"
-"X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: mac_installer\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: Installer.cpp:124
 #, c-format
 msgid "Sorry, this version of %s requires system 10.5 or higher."
 msgstr "Sorry, deze versie van %s vereist systeem 10.5 of hoger."
 
-#: PostInstall.cpp:130
-#: PostInstall.cpp:1136
-#: uninstall.cpp:1618
+#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
 msgid "Yes"
 msgstr "Ja"
 
-#: PostInstall.cpp:131
-#: PostInstall.cpp:1137
-#: uninstall.cpp:1619
+#: PostInstall.cpp:131 PostInstall.cpp:1137 uninstall.cpp:1619
 msgid "No"
 msgstr "Nee"
 
@@ -48,10 +40,7 @@ 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 ""
-"Gebruikers die wijzigingen mogen aanbrengen op deze computer zijn gerechtigd om %s te onderhouden.\n"
-"\n"
-"Wil je ook dat gebruikers zonder deze rechten %s op deze Mac mogen onderhouden?"
+msgstr "Gebruikers die wijzigingen mogen aanbrengen op deze computer zijn gerechtigd om %s te onderhouden.\n\nWil je ook dat gebruikers zonder deze rechten %s op deze Mac mogen onderhouden?"
 
 #: PostInstall.cpp:1444
 #, c-format
@@ -70,9 +59,7 @@ msgstr "Permissie fout na herstart"
 msgid ""
 "Removal may take several minutes.\n"
 "Please be patient."
-msgstr ""
-"Verwijderen kan enkele minuten duren.\n"
-"Even geduld a.u.b."
+msgstr "Verwijderen kan enkele minuten duren.\nEven geduld a.u.b."
 
 #: uninstall.cpp:156
 #, c-format
@@ -80,10 +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 ""
-"Weet je zeker dat je %s volledig wilt verwijderen van je computer?\n"
-"\n"
-"De uitvoerbare bestanden van %s worden verwijderd, niet de data bestanden."
+msgstr "Weet je zeker dat je %s volledig wilt verwijderen van je computer?\n\nDe uitvoerbare bestanden van %s worden verwijderd, niet de data bestanden."
 
 #: uninstall.cpp:163
 #, c-format
@@ -103,9 +87,7 @@ msgstr "naam  van gebruiker"
 msgid ""
 "Do you also want to remove VirtualBox from your computer?\n"
 "(VirtualBox was installed along with BOINC.)"
-msgstr ""
-"Wil je ook VirtualBox verwijderen van je computer?\n"
-"(VirtualBox is samen met BOINC geïnstalleerd.)"
+msgstr "Wilt uw ook VirtualBox van uw computer verwijderen?\n(VirtualBox is samen met BOINC geïnstalleerd.)"
 
 #: uninstall.cpp:312
 #, c-format
@@ -117,23 +99,14 @@ msgid ""
 "\n"
 "for each user, the file\n"
 "\"%s\"."
-msgstr ""
-"Verwijderen voltooid.\n"
-"\n"
-" Misschien wil je nog de volgende bestanden met behulp van de Finder verwijderen:\n"
-"de map \"%s\"\n"
-"\n"
-"voor elke gebruiker, het bestand\n"
-"\"%s\"."
+msgstr "Verwijderen voltooid.\n\n Misschien wil je nog de volgende bestanden met behulp van de Finder verwijderen:\nde map \"%s\"\n\nvoor elke gebruiker, het bestand\n\"%s\"."
 
 #: uninstall.cpp:840
 #, c-format
 msgid ""
 "Enter your administrator password to completely remove %s from you computer.\n"
 "\n"
-msgstr ""
-"Vul je beheerders wachtwoord in om %s volledig van je computer te verwijderen.\n"
-"\n"
+msgstr "Vul je beheerders wachtwoord in om %s volledig van je computer te verwijderen.\n\n"
 
 #: uninstall.cpp:1616
 msgid "Cancel"
@@ -142,25 +115,3 @@ msgstr "Annuleer"
 #: uninstall.cpp:1617
 msgid "Continue..."
 msgstr "Ga verder..."
-
-#, c-format
-#~ msgid "Sorry, this version of %s requires system 10.4 or higher."
-#~ msgstr "Sorry, deze versie van %s vereist systeem 10.4 of hoger."
-#~ msgid ""
-#~ "Removal completed.\n"
-#~ "\n"
-#~ " You may want to remove the following remaining items using the Finder: \n"
-#~ "\"/Library/Application Support/BOINC Data\" directory\n"
-#~ "\n"
-#~ "for each user, the file\n"
-#~ "\"/Users/[username]/Library/Preferences/BOINC Manager Preferences\"."
-#~ msgstr ""
-#~ "Verwijderen voltooid.\n"
-#~ "\n"
-#~ " Misschien wil je nog de resterende items verwijderen m.b.v. de Finder "
-#~ "uit:\n"
-#~ "\"/Bibliotheek/Application Support/BOINC Data\"\n"
-#~ "\n"
-#~ "Voor elke gebruiker, de bestanden uit:\n"
-#~ "\"/Gebruikers/[naam]/Library/Preferences/BOINC Manager Preferences\"."
-
diff --git a/locale/nl/BOINC-Web.mo b/locale/nl/BOINC-Web.mo
index 5dc98d2..9d272d7 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 52e3a41..9bcb512 100644
--- a/locale/nl/BOINC-Web.po
+++ b/locale/nl/BOINC-Web.po
@@ -1,26 +1,25 @@
 # BOINC web translation
 # Copyright (C) 2008-2009 University of California
+# 
 # This file is distributed under the same license as BOINC.
+# 
 # FileID  : $Id$
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\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-12 00:07-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: nl\n"
+"PO-Revision-Date: 2015-02-08 23:35+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\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"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
-"X-POOTLE-MTIME: 1419166345.0\n"
-"X-Poedit-KeywordsList: tra\n"
-"X-Poedit-SearchPath-0: doc\n"
 
 #: docutil.php:21
 msgid "Search"
@@ -36,7 +35,9 @@ msgid "This page is %stranslatable%s."
 msgstr "Deze pagina is %svertaalbaar%s."
 
 #: download.php:39
-msgid "We recommend that you also install VirtualBox, so your computer can work on science projects that require it."
+msgid ""
+"We recommend that you also install VirtualBox, so your computer can work on "
+"science projects that require it."
 msgstr "We raden aan dat u ook VirtualBox installeert, zodat uw computer ook kan werken aan projecten die dit nodig hebben."
 
 #: download.php:41
@@ -47,14 +48,12 @@ msgstr "Kom meer te weten over VirtualBox."
 msgid "Download BOINC + VirtualBox"
 msgstr "Download BOINC + Virtualbox"
 
-#: download.php:54
-#: download.php:69
+#: download.php:54 download.php:69
 #, php-format
 msgid "for %s"
 msgstr "voor %s"
 
-#: download.php:57
-#: download.php:72
+#: download.php:57 download.php:72
 #, php-format
 msgid "BOINC version %s"
 msgstr "BOINC versie %s"
@@ -69,19 +68,28 @@ msgid "Download BOINC"
 msgstr "Download BOINC"
 
 #: download.php:123
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others."
+msgid ""
+"BOINC is a program that lets you donate your idle computer time to science "
+"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, and many others."
 msgstr "BOINC is een programma dat u toelaat om uw vrije computertijd te doneren aan wetenschappelijke projecten zoals  SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, en vele anderen."
 
 #: download.php:125
-msgid "After installing BOINC on your computer, you can connect it to as many of these projects as you like."
+msgid ""
+"After installing BOINC on your computer, you can connect it to as many of "
+"these projects as you like."
 msgstr "Na het installeren van BOINC op uw computer, kan u deze koppelen met zoveel van deze projecten als u wilt."
 
 #: download.php:127
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
+msgid ""
+"You may run this software on a computer only if you own the computer or have"
+" the permission of its owner."
 msgstr "Je mag deze software alleen gebruiken op een computer van jezelf, of als de eigenaar toestemming heeft gegeven."
 
 #: download.php:132
-msgid "We recommend that you download BOINC from the Google Play Store or Amazon Appstore, not from here."
+msgid ""
+"We recommend that you download BOINC from the Google Play Store or Amazon "
+"Appstore, not from here."
 msgstr "We raden aan dat u BOINC niet hier download, maar wel van Google Play of de Amazon Appstore."
 
 #: download.php:167
@@ -92,8 +100,7 @@ msgstr "Systeemvereisten"
 msgid "Release notes"
 msgstr "Versie opmerkingen"
 
-#: download.php:169
-#: index.php:86
+#: download.php:169 index.php:86
 msgid "Help"
 msgstr "Help"
 
@@ -115,20 +122,34 @@ msgstr "BOINC: voor wetenschappelijke berekeningen"
 
 #: help.php:12
 #, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
+msgid ""
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who"
+" can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"through the process of installing and using BOINC; %s troubleshoot any "
+"problems you might have."
 msgstr "BOINC Online Hulp geeft je de mogelijkheid om direct te praten met ervaren BOINC gebruikers, die: %s je vragen kunnen beantwoorden over BOINC en \"volunteer computing\"; %s je stap voor stap kunnen helpen met de installatie en het gebruik van BOINC; %s je eventuele problemen kunnen oplossen."
 
 #: help.php:21
 #, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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."
+msgid ""
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system."
+" 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 Hulp maakt gebruik van %sSkype%s, een op internet gebaseerd telefoon systeem. Skype is gratis (zowel de software als de gesprekken).  Indien je Skype nog niet hebt, %sdownload en installeer het dan nu%s.  Zodra je klaar bent, keer je terug naar deze pagina."
 
 #: help.php:28
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
+msgid ""
+"The best way to get help is by voice, for which you need either built-in "
+"microphone and speakers or an external headset for your computer.  You can "
+"also use Skype's text-based chat system or regular email (if you don't have "
+"Skype) to communicate with Help Volunteers."
 msgstr "De beste manier om hulp te krijgen is met spraak, waarvoor je een ingebouwde microfoon en luidsprekers nodig hebt of een externe headset voor je computer.  Ook kan je gebruikmaken van een tekstgeoriënteerd chatsysteem of gewone email (als je Skype niet hebt) om met de vrijwilligers te communiceren."
 
 #: help.php:31
-msgid "Volunteers speaking several languages are available. Please select a language:"
+msgid ""
+"Volunteers speaking several languages are available. Please select a "
+"language:"
 msgstr "De vrijwilligers spreken diverse talen. Selecteer een taal:"
 
 #: help.php:47
@@ -137,16 +158,22 @@ msgstr "Wordt een vrijwilliger"
 
 #: help.php:50
 #, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
+msgid ""
+"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+"Volunteer%s.  It's a great way to help the cause of scientific research and "
+"volunteer computing - and it's fun!"
 msgstr "Indien je zelf een ervaren BOINC gebruiker bent, nodigen we je uit om een %sBOINC OnlineHulp vrijwilliger%s te worden.  Het is een fantastische manier om andere bebruikers te helpen - en het is leuk!"
 
 #: help.php:56
 #, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
+msgid ""
+"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
 msgstr "Indien je al een Online Hulp vrijwilliger bent: om je instellingen aan te passen, %sklik hier%s."
 
 #: help_funcs.php:107
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
+msgid ""
+"BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
+"or the University of California."
 msgstr "BOINC helpers zijn onbetaalde vrijwilligers.  Het gegeven advies wordt niet onderschreven door BOINC of de Universiteit van Californië."
 
 #: help_funcs.php:110
@@ -181,7 +208,6 @@ msgstr "computers.\n"
 msgid "24-hour average:"
 msgstr "24 uurs gemiddelde:"
 
-# 80%
 #: index.php:56
 msgid "PetaFLOPS."
 msgstr "PetaFLOPS."
@@ -198,9 +224,7 @@ msgstr "Vrijwilliger"
 msgid "Download"
 msgstr "Download"
 
-#: index.php:87
-#: index.php:120
-#: index.php:171
+#: index.php:87 index.php:120 index.php:171
 msgid "Documentation"
 msgstr "Documentatie"
 
@@ -213,7 +237,10 @@ msgid "Links"
 msgstr "Links"
 
 #: index.php:94
-msgid "Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:"
+msgid ""
+"Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure"
+" diseases, study global warming, discover pulsars, and do many other types "
+"of scientific research.  It's safe, secure, and easy:"
 msgstr "Gebruik de ongebruikte tijd van je computer (Windows, Mac, Linux of Android) om ziektes te genezen, de opwarming van de aarde te onderzoeken en voor andere wetenschappelijk projecten.  Het is veilig en makkelijk:"
 
 #: index.php:96
@@ -230,7 +257,9 @@ msgstr "Vul een e-mail adres en wachtwoord in."
 
 #: index.php:102
 #, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
+msgid ""
+"Or, if you run several projects, try an %saccount manager%s such as "
+"%sGridRepublic%s or %sBAM!%s. "
 msgstr "Of, als je meerdere projecten gebruikt, probeer dan eens een %saccountmanager%s zoals %sGridRepublic%s of %sBAM!%s. "
 
 #: index.php:118
@@ -242,11 +271,15 @@ msgid "Software updates"
 msgstr "Software updates"
 
 #: index.php:128
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving"
+" you the computing power of thousands of CPUs."
 msgstr "%1Wetenschappers%2: gebruik BOINC voor een %3vrijwillig reken project%4 gebruik makend van de kracht van duizenden processoren."
 
 #: index.php:132
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
 msgstr "%1Universiteiten%2: gebruik BOINC als een %3virtuele supercomputer%4."
 
 #: index.php:137
@@ -319,7 +352,8 @@ msgstr "APIs voor add-on software"
 
 #: index.php:217
 #, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
+msgid ""
+"Open-source software for %svolunteer computing%s and %sgrid computing%s."
 msgstr "Open-source software voor %s\"volunteer computing\"%s en %s\"grid computing\"%s."
 
 #: index.php:230
@@ -330,7 +364,6 @@ msgstr "BOINC is gevestigd op de Universiteit van Californië, Berkeley"
 msgid "Distributed sensing"
 msgstr "Gedistribueerde waarneming"
 
-# 78%
 #: projects.inc:19
 msgid "Stanford University"
 msgstr "Universiteit van Stanford"
@@ -340,7 +373,10 @@ msgid "Seismology"
 msgstr "Seismologie"
 
 #: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
+msgid ""
+"The Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to Internet-connected computers.  You must buy a "
+"sensor to participate."
 msgstr "Het Quake-Catcher netwerk is 's werelds grootse seismologische netwerk aan het ontwikkelen door middel van sensoren verbonden met het internet.  De aanschaf van een sensor is vereist."
 
 #: projects.inc:27
@@ -352,23 +388,24 @@ msgid "Environmental research"
 msgstr "Milieu onderzoek"
 
 #: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
+msgid ""
+"This project is creating a free and continuously updated map of radiation "
+"levels by using sensors connected to volunteers' computers.  You must buy a "
+"sensor to participate."
 msgstr "Dit project creëert een gratis en constant bijgewerkte kaart met straling niveaus door middel van sensoren verbonden met het internet.  De aanschaf van een sensor is vereist."
 
 #: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
+msgid ""
+"To participate in these projects you must buy a sensor and attach it to your"
+" computer."
 msgstr "Om aan dit project mee te doen is de aanschaf van een sensor een voorwaarde."
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
 msgstr "Cognitieve wetenschappen en kunstmatige intelligentie"
 
-#: projects.inc:60
-#: projects.inc:364
-#: projects.inc:408
-#: projects.inc:457
-#: projects.inc:464
-#: projects.inc:511
+#: projects.inc:60 projects.inc:364 projects.inc:408 projects.inc:457
+#: projects.inc:464 projects.inc:511
 msgid "Private"
 msgstr "Particulier project"
 
@@ -377,7 +414,11 @@ msgid "Artificial intelligence"
 msgstr "Kunstmatige intelligentie"
 
 #: projects.inc:62
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
+msgid ""
+"Parse and convert semantic nets for use in FreeHAL, an artificial "
+"intelligence that uses semantic networks, stemmers, part of speech "
+"databases, and part of speech taggers in order to imitate human behavior in "
+"conversations."
 msgstr "Analyseren en converteren van semantische netwerken ten behoeve van FreeHAL dat middels kunstmatige intelligentie gebruik maakt van semantische netwerken, vervoegingsgeneratoren, part-of-speech databanken en part-of-speech tagging om menselijke eigenschappen in een gesprek te na te bootsen."
 
 #: projects.inc:69
@@ -393,7 +434,12 @@ msgid "Antimalarial drug discovery"
 msgstr "Onderzoek naar malaria medicijnen"
 
 #: projects.inc:84
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
+msgid ""
+"The parasite that causes malaria continues to evolve resistance to available"
+" medication. We therefore urgently need to discover new drugs to replace "
+"existing drugs. Importantly, these new drugs need to target NEW proteins in "
+"the parasite. The FightMalaria at Home project is aimed at finding these new "
+"targets."
 msgstr "De malaria veroorzakende parasiet blijft zich ontwikkelen en wordt daardoor resistent voor de huidige medicijnen. Onderzoek naar nieuwe medicijnen is daarom van belang en vooral gericht op de aanval van specifiek nieuwe proteïnen in de parasiet. Het FightMalaria at Home project is gericht op het vinden hiervan."
 
 #: projects.inc:90
@@ -405,7 +451,12 @@ msgid "Protein structure prediction"
 msgstr "Voorspelling van proteïne-structuren"
 
 #: projects.inc:92
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
+msgid ""
+"POEM at HOME uses a computational approach to predict the biologically active "
+"structure of proteins, to understand the signal-processing mechanisms when "
+"the proteins interact with one another, to understand diseases related to "
+"protein malfunction or aggregation, and to develop new drugs on the basis of"
+" the three-dimensions structure of biologically important proteins."
 msgstr "POEM at HOME past een rekenkundige benadering toe om de biologisch actieve proteïnestructuren te voorspellen, het signaalverwerkingsmechanisme van onderlinge proteïne-interactie te doorgronden, het verband tussen ziektes en proteïnedisfunctie of -aggregatie te begrijpen, alsmede de ontwikkeling te bewerkstelligen van nieuwe medicijnen op basis van de driedimensionale structuur van biologisch belangrijke proteïnen."
 
 #: projects.inc:98
@@ -417,7 +468,11 @@ msgid "Study of protein - ligand interactions"
 msgstr "Studie over proteïnen - ligland interactie"
 
 #: projects.inc:100
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
+msgid ""
+"Docking at Home has both bioscience and computer science goals. The project "
+"aims to further knowledge of the atomic details of protein-ligand "
+"interactions and, by doing so, will search for insights into the discovery "
+"of novel pharmaceuticals."
 msgstr "Het doel van Docking at Home betreft zowel biologische wetenschappen als informatica. Het project richt zich op het vergaren van gedetailleerde kennis over atomische proteïne-ligand interacties, om aldus inzicht te verschaffen omtrent de ontwikkeling van nieuwe geneesmiddelen."
 
 #: projects.inc:114
@@ -429,7 +484,11 @@ msgid "Molecular simulations of proteins"
 msgstr "Moleculaire simulatie van proteïnen"
 
 #: projects.inc:116
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
+msgid ""
+"GPUGrid.net opens novel computational scenarios by the first full-atom "
+"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
+"New biomedical applications suddenly become possible giving a new role to "
+"computational biology for biomedical research."
 msgstr "GPUGrid.net geeft middels speciaal voor dit doel geoptimaliseerde NVIDIA-GPU's toegang tot nieuwe rekenkundige scenarios conform de first full-atom molecular dynamics code (CellMD), waardoor nieuwe toepassingen t.b.v. biomedisch onderzoek opeens mogelijk worden en computationele biologie een nieuwe taak krijgt toebedeeld."
 
 #: projects.inc:122
@@ -441,11 +500,15 @@ msgid "Genetic linkage analysis"
 msgstr "Genetische koppelingsanalyse"
 
 #: projects.inc:124
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
+msgid ""
+"Superlink at Technion helps geneticists all over the world find disease-"
+"provoking genes causing some types of diabetes, hypertension (high blood "
+"pressure), cancer, schizophrenia and many others."
 msgstr "Superlink at Technion helpt wereldwijd genetici bij het opsporen van ziekte veroorzakende genen die betrokken zijn bij sommige soorten diabetes, hypertensie (hoge bloeddruk), kanker, schizofrenie, en vele andere ziektes."
 
 #: projects.inc:138
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
+msgid ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
 msgstr "Universiteit van Maryland Centrum voor bio-informatica en computationele biologie"
 
 #: projects.inc:139
@@ -453,7 +516,11 @@ msgid "Life science research"
 msgstr "Wetenschappelijk onderzoek inzake Life science"
 
 #: projects.inc:140
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
+msgid ""
+"The Lattice Project supplies computing power to scientists at the University"
+" of Maryland studying evolutionary relationships based on DNA sequence data;"
+" bacterial, plasmid, and virus protein sequences; and biological diversity "
+"in nature reserves. "
 msgstr "Het Lattice Project voorziet wetenschappers van de Universiteit van Maryland van rekenkracht voor onderzoek naar op DNA-sequentieanalyse gebaseerde evolutionaire relaties, waaronder bacteriële, plasmide, en virusproteïnesequenties, evenals voor onderzoek naar biodiversiteit in natuurgebieden. "
 
 #: projects.inc:146
@@ -465,20 +532,32 @@ msgid "Epidemiology"
 msgstr "Epidemiologie"
 
 #: projects.inc:148
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
+msgid ""
+"Simulation models of the transmission dynamics and health effects of malaria"
+" are an important tool for malaria control. They can be used to determine "
+"optimal strategies for delivering mosquito nets, chemotherapy, or new "
+"vaccines which are currently under development and testing.  Such modeling "
+"is extremely computer intensive, requiring simulations of large human "
+"populations with a diverse set of parameters related to biological and "
+"social factors that influence the distribution of the disease. "
 msgstr "Simulatiemodellen die de verspreiding en gezondheidseffecten van malaria voorspellen, zijn een belangrijk hulpmiddel bij de bestrijding ervan. Ze kunnen worden ingezet om de optimale strategie te bepalen voor de distributie van muskietennetten, chemotherapeutische behandeling of nieuwe, in ontwikkeling zijnde en in een testfase verkerende vaccins.  De ontwikkeling van dergelijke simulatiemodellen voor omvangrijke menselijke populaties is uiterst computerintensief omdat de benodig [...]
 
 #: projects.inc:170
 msgid "University of Washington"
 msgstr "Universiteit van Washington"
 
-#: projects.inc:171
-#: projects.inc:179
+#: projects.inc:171 projects.inc:179
 msgid "Biology"
 msgstr "Biologie"
 
 #: projects.inc:172
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
+msgid ""
+"Determine the 3-dimensional shapes of proteins in research that may "
+"ultimately lead to finding cures for some major human diseases. By running "
+"Rosetta at home you will help us speed up and extend our research in ways we "
+"couldn't possibly attempt without your help. You will also be helping our "
+"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
+"Cancer, and Alzheimer's"
 msgstr "Bereken de 3-dimensionale proteïnestructuren t.b.v wetenschappelijk onderzoek dat mogelijk resulteert in de ontdekking van een remedie tegen enkele ernstige ziektes. Door uw deelname aan Rosetta at home kunnen wij het onderzoekingswerk sneller en uitgebreider uitvoeren dan ooit mogelijk zou zijn zonder uw hulp. U helpt eveneens bij ons streven om nieuwe proteïnen te ontwerpen ter bestrijding van hiv en ziektes zoals malaria, kanker en alzheimer"
 
 #: projects.inc:178
@@ -486,7 +565,10 @@ msgid "University of Vienna"
 msgstr "Universiteit van Wenen"
 
 #: projects.inc:180
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
+msgid ""
+"Calculate similarities between proteins. SIMAP provides a public database of"
+" the resulting data, which plays a key role in many bioinformatics research "
+"projects."
 msgstr "Bereken de gelijksoortigheid van proteïnen. SIMAP voorziet in een openbare databank van gegevens die een sleutelrol spelen bij menig onderzoeksproject inzake bio-informatica."
 
 #: projects.inc:186
@@ -502,7 +584,15 @@ msgid "Climate study"
 msgstr "Klimaat studie"
 
 #: projects.inc:200
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
+msgid ""
+"Investigate the approximations that have to be made in state-of-the-art "
+"climate models. By running the model thousands of times we hope to find out "
+"how the model responds to slight tweaks to these approximations - slight "
+"enough to not make the approximations any less realistic. This will allow us"
+" to improve our understanding of how sensitive our models are to small "
+"changes and also to things like changes in carbon dioxide and the sulphur "
+"cycle. This will allow us to explore how climate may change in the next "
+"century under a wide range of different scenarios."
 msgstr "Doe onderzoek naar het benaderen van waarden voor invoer in de nieuwste klimaatmodellen. Door het model duizenden keren uit te voeren, hopen wij inzicht te krijgen in de reactie van het model indien deze waarden enigszins worden gewijzigd - waarbij de afwijkingen dermate klein zijn dat een realistische benadering standhoudt. Dit geeft ons een beter inzicht in de nauwkeurigheid van de modellen bij kleine wijzigingen in de invoer, alsmede veranderingen in het verloop van de kooldio [...]
 
 #: projects.inc:207
@@ -514,39 +604,56 @@ msgid "Mechanical engineering"
 msgstr "Mechanische engineering"
 
 #: projects.inc:214
-msgid "Currently we are calculating the optimum design of a structure call the 52 bar truss"
-msgstr "Momenteel berekenen wij het optimale ontwerp van een constructie genaamd de '52 bar truss'"
+msgid ""
+"Currently we are calculating the optimum design of a structure call the 52 "
+"bar truss"
+msgstr "Momenteel berekenen wij het het optimale ontwerp van een constructie genaamd 'the 52 bar truss'"
 
-#: projects.inc:224
-#: projects.inc:263
-#: projects.inc:271
+#: projects.inc:224 projects.inc:263 projects.inc:271
 msgid "Astronomy"
 msgstr "Astronomie"
 
 #: projects.inc:225
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
+msgid ""
+"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
+"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
+"Universe. We will measure physical parameters (such as stellar mass surface "
+"density, star formation rate surface density, attenuation, and first-order "
+"star formation history) on a resolved pixel-by-pixel basis using spectral "
+"energy distribution (SED) fitting techniques in a distributed computing "
+"mode."
 msgstr "Door het spectraal bereik van GALEX, Pan-STARRS1, en WISE te combineren, gaan wij een multi-frequentieel, uv-optische-NIR sterrenstelsel-atlas voor het nabije universum genereren. Wij meten fysische waarden (zoals de stermassa-afhankelijke oppervlaktedichtheid, stervormingsnelheidsafhankelijke oppervlaktedichtheid, attenuatie, en het verloop van stervorming in het vroege heelal) met een resolutie van 1 pixel x 1 pixel middels specifieke spectrale energie-distributietechnieken (SE [...]
 
 #: projects.inc:247
 msgid "University of Texas at Austin"
 msgstr "Universiteit van Texas te Austin"
 
-#: projects.inc:248
-#: projects.inc:279
+#: projects.inc:248 projects.inc:279
 msgid "Chemistry"
 msgstr "Chemie"
 
 #: projects.inc:249
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
+msgid ""
+"A common problem in theoretical chemistry, condensed matter physics and "
+"materials science is the calculation of the time evolution of an atomic "
+"scale system where, for example, chemical reactions and/or diffusion occur. "
+"Generally the events of interest are quite rare (many orders of magnitude "
+"slower than the vibrational movements of the atoms), and therefore direct "
+"simulations, tracking every movement of the atoms, would take thousands of "
+"years of computer calculations on the fastest present day computer before a "
+"single event of interest can be expected to occur.  Our research group is "
+"interested in calculating the long time dynamics of systems."
 msgstr "Een algemeen probleem binnen de theoretische chemie, de fysica van de gecondenseerde materie en materiaalkunde is het berekenen van het tijdsverloop binnen een systeem op atomaire schaal voor processen als chemische reacties en/of diffusie. Doorgaans gebeurt er nauwelijks iets opmerkelijks (vele factoren 10 trager dan de frequentie van atoom trillingen), waardoor exacte simulaties van alle atoombewegingen met de meest geavanceerde computers, duizenden jaren aan rekentijd in besla [...]
 
-# 95%
 #: projects.inc:262
 msgid "University of Illinois at Urbana-Champaign"
 msgstr "Universiteit van Illinois te Urbana-Chamapign"
 
 #: projects.inc:264
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
+msgid ""
+"The goal of Cosmology at Home is to search for the model that best describes "
+"our Universe and to find the range of models that agree with the available "
+"astronomical particle physics data."
 msgstr "De doelstelling van Cosmology at Home betreft het model te vinden dat ons universum het best omschrijft, alsmede het spectrum van modellen die met de beschikbare data inzake deeltjes astrofysica overweg kunnen."
 
 #: projects.inc:270
@@ -554,7 +661,10 @@ msgid "Rensselaer Polytechnic Institute"
 msgstr "Rensselaer Polytechnisch Instituut"
 
 #: projects.inc:272
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
+msgid ""
+"The goal of Milkyway at Home is to create a highly accurate three dimensional "
+"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
+"Survey."
 msgstr "De doelstelling van Milkyway at home betreft de ontwikkeling van een zeer accuraat drie-dimensionaal model van het melkwegstelsel middels de gegevens van het Sloan Digital Sky Survey."
 
 #: projects.inc:278
@@ -562,7 +672,13 @@ msgid "Leiden University, The Netherlands"
 msgstr "Universiteit Leiden, Nederland"
 
 #: projects.inc:280
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
+msgid ""
+"Surface science calculations using Classical Dynamics.  Leiden Classical "
+"allows volunteers, students and other scientist to submit their personal "
+"calculations to the grid. Each user has his own personal queue for Classical"
+" Dynamics jobs. In this way students have used the grid to simulate liquid "
+"argon, or to test the validity of the ideal gas law by actually doing the "
+"simulations through the grid."
 msgstr "Voer wetenschappelijke berekeningen uit, gewijd aan klassieke dynamica.  Leiden Classical maakt het voor vrijwilligers, studenten en wetenschappers mogelijk om hun eigen berekeningen middels het computercluster uit te voeren. Elke deelnemer heeft zijn eigen reeks van specifieke taken die moeten worden uitgevoerd. Op deze manier hebben studenten het cumputercluster gebruikt om vloeibaar argon te simuleren of de geldigheid van de algemene gaswet te testen en aldus de simulaties daa [...]
 
 #: projects.inc:294
@@ -574,25 +690,36 @@ msgid "Astrophysics"
 msgstr "Astrofysica"
 
 #: projects.inc:296
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
+msgid ""
+"Search for spinning neutron stars (also called pulsars) using data from the "
+"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
+"observatory.  Einstein at Home is a World Year of Physics 2005 project "
+"supported by the American Physical Society (APS) and by a number of "
+"international organizations."
 msgstr "Ontdek roterende neutronensterren (ook wel pulsars genoemd) middels gegevens van de LIGO en GEO gravitatiegolf detectors en de Arecibo radiotelescoop.  Einstein at Home maakt deel uit van het 'World Year of Physics 2005' dat wordt gesponsord door 'the American Physical Society' (APS) en enkele internationale organisaties."
 
-#: projects.inc:310
-#: projects.inc:318
+#: projects.inc:310 projects.inc:318
 msgid "CERN (European Organization for Nuclear Research)"
 msgstr "CERN (Europese organisatie voor nucleair onderzoek)"
 
-#: projects.inc:311
-#: projects.inc:319
+#: projects.inc:311 projects.inc:319
 msgid "Physics"
 msgstr "Natuurkunde"
 
 #: projects.inc:312
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
+msgid ""
+"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
+"European Organization for Nuclear Research, the world's largest particle "
+"physics laboratory.  It is the most powerful instrument ever built to "
+"investigate on particles proprieties. LHC at home runs simulations to improve "
+"the design of LHC and its detectors."
 msgstr "De Large Hadron Collider (LHC) is een deeltjesversneller bij CERN, de Europese organisatie voor kernonderzoek, 's werelds grootste laboratorium voor deeltjesfysica.  Het is het krachtigste apparaat dat er bestaat voor onderzoek naar de eigenschappen van elementaire deeltjes. LHC at home voert simulaties uit ter verbetering van het ontwerp van de LHC en diens detectors."
 
 #: projects.inc:320
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
+msgid ""
+"This project uses CERN-developed virtual machine technology for full-fledged"
+" LHC event physics simulation on volunteer computers.  Requires that you "
+"install VirtualBox on your computer"
 msgstr "Dit project gebruikt een door CERN ontwikkelde virtuele machine voor een volwaardige LHC natuurkundige simulatie op je computer.  Het is vereist om VirtualBox op je computer te installeren"
 
 #: projects.inc:326
@@ -604,7 +731,12 @@ msgid "Astrophysics, astrobiology"
 msgstr "Astrofysica, astrobiologie"
 
 #: projects.inc:328
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
+msgid ""
+"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
+"goal is to detect intelligent life outside Earth. One approach, known as "
+"radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
+"signals from space. Such signals are not known to occur naturally, so a "
+"detection would provide evidence of extraterrestrial technology."
 msgstr "SETI (Search for Extraterrestrial Intelligence) is een wetenschappelijke project wiens doel het is om intelligent leven te detecteren buiten de aarde. Een van de manieren, bekend als radio SETI, gebruikt radiotelescopen om te luisteren naar radiosignalen met een smalle bandbreedte komende uit de ruimte. Dergelijke signalen kunnen niet spontaan ontstaan, dus een detectie zou een mogelijk bewijs van buitenaardse technologie kunnen zijn."
 
 #: projects.inc:342
@@ -616,7 +748,11 @@ msgid "Chemical engineering and nanotechnology"
 msgstr "Chemische technologie en nanotechnologie"
 
 #: projects.inc:344
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
+msgid ""
+"The study of molecular magnets and controlled nanoscale magnetism.  These "
+"magnetic molecules may be used to develop tiny magnetic switches, with "
+"applications in medicine (such as local tumor chemotherapy) and "
+"biotechnology."
 msgstr "De studie naar moleculaire magneten en het op nanoschaal gereguleerd magnetisme.  Deze magnetische moleculen kunnen worden gebruikt bij de ontwikkeling van minuscule magnetische schakelingen die een toegepassing vinden in de geneeskunde (zoals chemotherapeutische behandeling van een plaatselijke kanker) en biotechnologie."
 
 #: projects.inc:351
@@ -632,7 +768,10 @@ msgid "Physics, biochemistry, and others"
 msgstr "Natuurkunde, biochemie en diverse andere wetenschappen"
 
 #: projects.inc:358
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
+msgid ""
+"The objective of CAS at home is to encourage and assist scientists in China to "
+"adopt the technologies of volunteer computing and volunteer thinking for "
+"their research."
 msgstr "De doelstelling van CAS at home betreft het aanmoedigen en helpen van wetenschappers in China om technologieën als volunteer computing en volunteer thinking in te zetten bij hun wetenschappelijk onderzoek."
 
 #: projects.inc:365
@@ -640,11 +779,12 @@ msgid "Mathematics, physics, evolution"
 msgstr "Wiskunde, natuurkunde en evolutie studie"
 
 #: projects.inc:366
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
+msgid ""
+"Yoyo at home is an adapter between BOINC and several existing volunteer "
+"computing projects: ECM, Muon, Evolution at home, and distributed.net"
 msgstr "Yoyo at home is een verbinding tussen BOINC en diverse bestaande volunteer computing projecten: ECM, Muon, Evolution at home, en distributed.net"
 
-#: projects.inc:371
-#: projects.inc:527
+#: projects.inc:371 projects.inc:527
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 msgstr "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 
@@ -653,7 +793,11 @@ msgid "European research projects"
 msgstr "Europees wetenschappelijk onderzoek"
 
 #: projects.inc:373
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
+msgid ""
+"The EDGeS at Home Beta project integrates volunteer computing into the service "
+"grid network of Europe by allowing service grids to send workunits to be "
+"processed by the volunteers of this project. The scientific projects covered"
+" by the project include math, physics, biology, etc."
 msgstr "Het EDGeS at Home Beta project integreert volunteer computing in hun netwerk van computerclusters in Europa door via deze clusters de taken te verdelen en te laten verwerken door de vrijwilligers bij dit project. De wetenschappelijke projecten omvatten o.a. wiskunde, natuurkunde en biologie."
 
 #: projects.inc:379
@@ -677,7 +821,11 @@ msgid "Medical, environmental and other humanitarian research"
 msgstr "Medisch, omgeving en ander menselijk onderzoek"
 
 #: projects.inc:389
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
+msgid ""
+"To further critical non-profit research on some of humanity's most pressing "
+"problems by creating the world's largest volunteer computing grid.  Research"
+" includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"clean water and many more."
 msgstr "Om kritische non-profit onderzoek op een aantal voor de mensheid meest urgente problemen mogelijk te maken, door het creëren van 's werelds grootste vrijwilligers netwerk. Onderzoek omvat HIV-AIDS, kanker, tropische en verwaarloosde ziektes, zonne-energie, schoon water en nog veel meer"
 
 #: projects.inc:395
@@ -696,21 +844,18 @@ msgstr "Wiskunde, natuurkunde, kunstmatige intelligentie"
 msgid "Simulation of quantum computing; Goldbach's conjecture."
 msgstr "Simulatie van een quantum computer; Goldbach's conjecture."
 
-#: projects.inc:450
-#: projects.inc:458
+#: projects.inc:450 projects.inc:458
 msgid "Cryptography"
 msgstr "Cryptografie"
 
 #: projects.inc:459
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
+msgid ""
+"Attempt to decode 3 original Enigma messages. The signals were intercepted "
+"in the North Atlantic in 1942 and are believed to be unbroken."
 msgstr "Doe een poging om 3 authentieke Enigma-gecodeerde berichten te ontcijferen. Deze werden in 1942 op de Noord-Atlantische Oceaan onderschept en er wordt aangenomen dat de codering nog niet is gekraakt."
 
-#: projects.inc:465
-#: projects.inc:504
-#: projects.inc:512
-#: projects.inc:520
-#: projects.inc:528
-#: projects.inc:568
+#: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
+#: projects.inc:528 projects.inc:568
 msgid "Mathematics"
 msgstr "Wiskunde"
 
@@ -727,11 +872,19 @@ msgid "Factorization of large integers"
 msgstr "Factorisatie van grote getallen"
 
 #: projects.inc:473
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
+msgid ""
+"NFS at Home is a research project that uses Internet-connected computers to do "
+"the lattice sieving step in the Number Field Sieve factorization of large "
+"integers. As a young school student, you gained your first experience at "
+"breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
+"NFS at Home is a continuation of that experience, only with integers that are "
+"hundreds of digits long."
 msgstr "NFS at Home betreft een wetenschappelijk project dat via het internet gebruikt maakt van computers die ingezet worden om de ordeningsrelatie te bepalen bij de ontbinding van grote getallen in priemfactoren met behulp van de getallenlichamenzeef. Op school kwam je hiermee voor het eerst in aanraking bij het ontbinden van een geheel getal in priemgetallen, zoals 15 = 3 * 5 of 35 = 5 * 7. NFS at Home zet dit principe voort, echter met getallen die uit honderden cijfers bestaan."
 
 #: projects.inc:479
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
+msgid ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
 msgstr "Vilnius Gediminas Technische Universiteit en Kaunas Technische Universiteit (Litouwen)"
 
 #: projects.inc:480
@@ -739,7 +892,11 @@ msgid "Software testing"
 msgstr "Software testen"
 
 #: projects.inc:481
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
+msgid ""
+"The aim of this project is to provide a powerful distributed computing "
+"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
+"well as others Lithuanian academic institutions.  Current applications "
+"involve the study of Monte-Carlo based software testing."
 msgstr "De doelstelling van dit project betreft de wetenschappers van de 'Vilnius Gediminas Technische Universiteit (VGTU) evenals andere Litouwse academische instituten te voorzien van een effectief platform voor gedistribueerde rekenkracht.  De huidige applicaties zijn gewijd aan het onderzoek naar software die op de Monte-Carlo simulatie is gebaseerd."
 
 #: projects.inc:503
@@ -747,11 +904,20 @@ msgid "Mathematical Institute of Leiden University / Kennislink"
 msgstr "Mathematisch Instituut Universiteit Leiden / Kennislink"
 
 #: projects.inc:505
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
+msgid ""
+"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
+"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
+"product of the distinct prime factors of n. The ABC conjecture says that "
+"there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for "
+"any real h > 1. The ABC conjecture is currently one of the greatest open "
+"problems in mathematics. If it is proven to be true, a lot of other open "
+"problems can be answered directly from it."
 msgstr "Doe onderzoek naar abc-tripels: positieve gehele getallen a,b,c zodanig dat a+b=c, a < b < c, a,b,c geen grootste gemene deler hebben en c > rad(abc), waarbij rad(n) het product is van de verschillende priemfactoren van n. Het ABC-vermoeden zegt dat er slechts eindig veel getallen a,b en c zijn zodanig dat log(c)/log(rad(abc)) > h voor enig reëel getal h > 1. Het ABC-vermoeden omvat tot op heden een van de grootste onopgeloste problemen in de wiskunde. Als dit vermoeden wor [...]
 
 #: projects.inc:513
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
+msgid ""
+"Primegrid has multiple projects searching for different forms of very large "
+"prime numbers, including searching for the largest known prime number."
 msgstr "Primegrid heeft diverse projecten die onderzoek doen naar grote priemgetallen, inclusief een zoektocht naar het grootste priemgetal."
 
 #: projects.inc:519
@@ -759,11 +925,15 @@ msgid "Hochschule RheinMain University of Applied Sciences"
 msgstr "Hogeschool RheinMain Universiteit voor toegepaste wetenschappen"
 
 #: projects.inc:521
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
+msgid ""
+"Search for counterexamples to two conjectures related to the identification "
+"of prime numbers"
 msgstr "Ga op zoek naar tegenvoorbeelden van twee vermoedens omtrent de identificatie van priemgetallen"
 
 #: projects.inc:529
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
+msgid ""
+"Find all the generalized binary number systems (in which bases are matrices "
+"and digits are vectors) up to dimension 11."
 msgstr "Zoek alle algemene binaire getalsystemen (met matrices als basis en cijfers als vectoren) tot in de 11e dimensie."
 
 #: ../html/inc/news.inc:40
@@ -774,468 +944,3 @@ msgstr "Opmerking"
 #, php-format
 msgid "News is available as an %sRSS feed%s"
 msgstr "Het nieuws is beschikbaar als %sRSS feed%s"
-
-# 75%
-#~ msgid "Astronomy, Physics, and Chemistry"
-#~ msgstr "Astronomie/Fysica/Chemie"
-#~ msgid "Download BOINC + Virtualbox"
-#~ msgstr "Download BOINC + Virtualbox"
-#, php-format
-#~ msgid "%s for %s (%s MB)"
-#~ msgstr "%s voor %s (%s MB)"
-#~ msgid ""
-#~ "BOINC is a program that lets you donate your idle computer time to science "
-#~ "projects like SETI at home, Climateprediction.net, Rosetta at home, World "
-#~ "Community Grid, and many others. <p> After installing BOINC on your "
-#~ "computer, you can connect it to as many of these projects as you like."
-#~ msgstr ""
-#~ "BOINC is een programma dat de onbenutte processorcapaciteit van uw pc inzet "
-#~ "voor wetenschappelijk doeleinden zoals SETI at home, Climateprediction.net, "
-#~ "Rosetta at home, World Community Grid en vele andere projecten. <p> Als u BOINC "
-#~ "op uw computer installeert, kunt u aan elk van deze projecten deelnemen."
-
-#, php-format
-#~ msgid ""
-#~ " Use the idle time on your computer (Windows, Mac, Linux, or Android) to "
-#~ "cure diseases, study global warming, discover pulsars, and do many other "
-#~ "types of scientific research.  It's safe, secure, and easy:  %sChoose%s "
-#~ "projects  %sDownload%s and run BOINC software  %sEnter%s an email address "
-#~ "and password. "
-#~ msgstr ""
-#~ " Gebruik de niet gebruikte tijd van je computer (Windows, Mac, Linux of "
-#~ "Android) om ziektes te genezen, de opwarming van de aarde te onderzoeken, "
-#~ "pulsars te vinden en voor andere wetenschappelijke onderzoeken.  Het is "
-#~ "veilig, zonder risico en eenvoudig:  %sKies%s een project.  %sDownload%s en "
-#~ "gebruik BOINC software  %sVul%s een e-mail adres en wachtwoord in. "
-#~ msgid "Browser default"
-#~ msgstr "Standaard browser"
-
-#, php-format
-#~ msgid ""
-#~ " Use the idle time on your computer (Windows, Mac, or Linux) to cure "
-#~ "diseases, study global warming, discover pulsars, and do many other types of "
-#~ "scientific research.  It's safe, secure, and easy:  %sChoose%s projects  "
-#~ "%sDownload%s and run BOINC software  %sEnter%s an email address and "
-#~ "password. "
-#~ msgstr ""
-#~ " Gebruik uw computer's onbenutte processorcapaciteit (Windows, Mac, of "
-#~ "Linux) om ziektes te genezen, de opwarming van de aarde te bestuderen, "
-#~ "pulsars te ontdekken, evenals voor vele andere vormen van onderzoek.  Het is "
-#~ "veilig en makkelijk:  %sKies%s een project  %sDownload%s en gebruik BOINC "
-#~ "software  %sVul%s een e-mailadres en wachtwoord in. "
-#~ msgid "IBM Corporate Community Relations"
-#~ msgstr "IBM & de maatschappij"
-#~ msgid "Humanitarian research on disease, natural disasters and hunger."
-#~ msgstr "Humanitair onderzoek naar ziektes, natuurrampen en hongersnood."
-#~ msgid ""
-#~ "To further critical non-profit research on some of humanity's most "
-#~ "pressing problems by creating the world's largest volunteer computing "
-#~ "grid.  Research includes HIV/AIDS, cancer, muscular dystrophy, dengue "
-#~ "fever, and many more."
-#~ msgstr ""
-#~ "Om het verrichten van essentieel wetenschappelijk onderzoek naar enkele "
-#~ "van de meest urgente problemen der mensheid belangeloos te stimuleren, "
-#~ "door als vrijwilliger deel te nemen aan ’s werelds meest omvangrijke "
-#~ "computercluster.  Het onderzoek betreft HIV/AIDS, kanker, musculaire "
-#~ "dystrofie, knokkelkoorts en vele andere ziektes."
-#~ msgid ""
-#~ "Primegrid is generating a public sequential prime number database, and is "
-#~ "searching for large twin primes of the form k*2<sup>n</sup>+1 and "
-#~ "k*2<sup>n</sup>-1"
-#~ msgstr ""
-#~ "Primegrid genereert een openbare databank van een reeks opeenvolgende "
-#~ "priemgetallen, en is op zoek naar grote priemtweelingen van de vorm "
-#~ "k*2<sup>n</sup>+1 en k*2<sup>n</sup>-1"
-#~ msgid "FreeHAL"
-#~ msgstr "FreeHAL"
-#~ msgid "private"
-#~ msgstr "particulier project"
-#~ msgid "POEM at HOME"
-#~ msgstr "POEM at HOME"
-#~ msgid "Docking at Home"
-#~ msgstr "Docking at Home"
-#~ msgid "GPUGrid.net"
-#~ msgstr "GPUGrid.net"
-#~ msgid "Superlink at Technion"
-#~ msgstr "Superlink at Technion"
-#~ msgid "The Lattice Project"
-#~ msgstr "The Lattice Project"
-#~ msgid "Malariacontrol.net"
-#~ msgstr "Malariacontrol.net"
-#~ msgid "Rosetta at home"
-#~ msgstr "Rosetta at home"
-#~ msgid "SIMAP"
-#~ msgstr "SIMAP"
-#~ msgid "Virtual Prairie"
-#~ msgstr "Virtual Prairie"
-#~ msgid "University of Houston"
-#~ msgstr "Universiteit van Houston"
-#~ msgid "Study of botanical ecosystems"
-#~ msgstr "Studie van botanische ecosystemen"
-#~ msgid ""
-#~ "Provide ecological guidelines on the design of prairies with the best "
-#~ "potential for water purification."
-#~ msgstr ""
-#~ "Bepaal de ecologische richtlijnen die een optimale waterzuivering "
-#~ "opleveren voor de ontwikkeling van prairielandschappen."
-#~ msgid "Climateprediction.net"
-#~ msgstr "Climateprediction.net"
-#~ msgid "Astronomy/Physics/Chemistry"
-#~ msgstr "Astronomie/Fysica/Chemie"
-#~ msgid "eOn"
-#~ msgstr "eOn"
-#~ msgid "Orbit at home"
-#~ msgstr "Orbit at home"
-#~ msgid "Planetary Science Institute"
-#~ msgstr "Instituut voor Planeetkunde"
-#~ msgid "Monitor and study the hazard posed by near-Earth asteroids"
-#~ msgstr ""
-#~ "Controleer en bestudeer de dreiging van meteorieten in de directe "
-#~ "omgeving van de aarde"
-#~ msgid "Cosmology at Home"
-#~ msgstr "Cosmology at Home"
-#~ msgid "University of Illinois at Urbana-Chamapign"
-#~ msgstr "Universiteit van Illinois te Urbana-Chamapign"
-#~ msgid "Milkyway at home"
-#~ msgstr "Milkyway at home"
-#~ msgid "Leiden Classical"
-#~ msgstr "Leiden Classical"
-#~ msgid "uFluids at home"
-#~ msgstr "uFluids at home"
-#~ msgid "Purdue University"
-#~ msgstr "Universiteit van Purdue"
-#~ msgid "Physics/Aeronautics"
-#~ msgstr "Fysica/Luchtvaartkunde"
-#~ msgid ""
-#~ "The uFluids project simulates two-phase fluid behavior in microgravity "
-#~ "and microfluidics problems. Our goal is to design better satellite "
-#~ "propellant management devices and address two-phase flow in microchannel "
-#~ "and MEMS devices."
-#~ msgstr ""
-#~ "Het uFluids project simuleert het tweefasen vloeistofgedrag inzake de "
-#~ "problematiek die zich voordoet bij micrograviteit en microfluïdische "
-#~ "systemen. Onze doelstelling betreft de ontwikkeling van betere "
-#~ "stuwstofmanagementsystemen voor satelieten en richt zich op "
-#~ "tweefasenstroming in microchannel- en micro-elektromechanische systemen"
-#~ "(MEMS)."
-#~ msgid "Einstein at home"
-#~ msgstr "Einstein at home"
-#~ msgid "LHC at home"
-#~ msgstr "LHC at home"
-#~ msgid "SETI at home"
-#~ msgstr "SETI at home"
-#~ msgid "Quantum Monte Carlo at Home"
-#~ msgstr "Quantum Monte Carlo at Home"
-#~ msgid "University of Muenster (Germany)"
-#~ msgstr "Universiteit van Muenster (Duitsland)"
-#~ msgid ""
-#~ "Study the structure and reactivity of molecules using Quantum Chemistry."
-#~ msgstr ""
-#~ "Bestudeer de structuur en reactiviteit van moleculen volgens kwantum-"
-#~ "chemische methoden."
-#~ msgid "Spinhenge at home"
-#~ msgstr "Spinhenge at home"
-#~ msgid "CAS at home"
-#~ msgstr "CAS at home"
-#~ msgid "Yoyo at home"
-#~ msgstr "Yoyo at home"
-#~ msgid "EDGeS at Home"
-#~ msgstr "EDGeS at Home"
-#~ msgid "Ibercivis"
-#~ msgstr "Ibercivis"
-#~ msgid "World Community Grid"
-#~ msgstr "World Community Grid"
-#~ msgid "Enigma at Home"
-#~ msgstr "Enigma at Home"
-#~ msgid "Collatz Conjecture"
-#~ msgstr "Collatz Conjecture"
-#~ msgid "NFS at home"
-#~ msgstr "NFS at home"
-#~ msgid "VTU at home"
-#~ msgstr "VTU at home"
-#~ msgid "AQUA at home"
-#~ msgstr "AQUA at home"
-#~ msgid "D-Wave Systems, Inc."
-#~ msgstr "D-Wave Systems, Inc."
-#~ msgid "Quantum computing"
-#~ msgstr "Kwantuminformatica"
-#~ msgid ""
-#~ "D-Wave's AQUA (Adiabatic QUantum Algorithms) is a research project whose "
-#~ "goal is to predict the performance of superconducting adiabatic quantum "
-#~ "computers on a variety of hard problems arising in fields ranging from "
-#~ "materials science to machine learning. AQUA at home uses Internet-connected "
-#~ "computers to help design and analyze quantum computing algorithms, using "
-#~ "Quantum Monte Carlo techniques."
-#~ msgstr ""
-#~ "D-Wave's AQUA (Adiabatic QUantum Algorithms) betreft een wetenschappelijk "
-#~ "project met als doelstelling het voorspellen van de prestaties van "
-#~ "supergeleidende adiabatische kwantumcomputers inzake de problematiek die "
-#~ "zich voordoet op het gebied van o.a. materiaalkunde en machinaal leren. "
-#~ "AQUA at home maakt via het internet gebruik van computers die ingezet worden "
-#~ "bij de ontwikkeling en analyse van kwantumalgoritmen conform de kwantum "
-#~ "Monte-Carlo simulatietechniek."
-#~ msgid "ABC at home"
-#~ msgstr "ABC at home"
-#~ msgid "PrimeGrid"
-#~ msgstr "PrimeGrid"
-#~ msgid "primaboinca"
-#~ msgstr "primaboinca"
-#~ msgid "SZTAKI Desktop Grid"
-#~ msgstr "SZTAKI Desktop Grid"
-#~ msgid "Chess960 at home"
-#~ msgstr "Chess960 at home"
-#~ msgid "Chess-960.org"
-#~ msgstr "Chess-960.org"
-#~ msgid "Game-playing"
-#~ msgstr "Game-playing"
-#~ msgid ""
-#~ "This project studies Chess 960, a variant of orthodox chess. In classical "
-#~ "chess the starting position of the game never changes.  In Chess 960, "
-#~ "just before the start of every game, the initial configuration of the "
-#~ "chess pieces is determined randomly."
-#~ msgstr ""
-#~ "Dit project onderzoekt Chess 960; een variant op het gewone schaakspel. "
-#~ "Bij het conventionele schaakspel is de beginsituatie bij elk spel "
-#~ "identiek. Bij Chess 960 wordt bij aanvang van elk spel de opstelling van "
-#~ "de schaakstukken willekeurig bepaald."
-#~ msgid "The current release is known to work with these Linux versions:"
-#~ msgstr "De huidige versie werkt met de volgende Linux versie:"
-#~ msgid ""
-#~ "For other Linux versions, check if a BOINC package is offered by your "
-#~ "Linux distribution."
-#~ msgstr ""
-#~ "Voor andere Linux versies; controleer of er een BOINC versie aangeboden "
-#~ "wordt door de distributie zelf."
-#~ msgid ""
-#~ "Alternatively, download the %1BOINC client for older Linux versions%2. "
-#~ "This doesn't have a graphical interface, but it should work on all Linux "
-#~ "systems, both x86 and x64."
-#~ msgstr ""
-#~ "Alternatief; download de %1BOINC client voor oudere Linux versies%2. Deze "
-#~ "heeft geen grafische interface, maar zou moeten werken met alle x86 en "
-#~ "x64 Linux systemen."
-#~ msgid ""
-#~ "Note: if your computer is equipped with an Graphics Processing Unit "
-#~ "(GPU), you may be able to %suse it to compute faster%s"
-#~ msgstr ""
-#~ "Opmerking: Indien je computer over een grafische processor (GPU) "
-#~ "beschikt, kan deze misschien worden ingezet om %s taken sneller uit te "
-#~ "voeren%s"
-#~ msgid "TeraFLOPS."
-#~ msgstr "TeraFLOPS."
-#~ msgid "Conferences"
-#~ msgstr "Conferenties"
-#~ msgid "[check all that apply]"
-#~ msgstr "[aanvinken indien van toepassing]"
-#~ msgid "Other:"
-#~ msgstr "Anders:"
-#~ msgid "Yes - I have been running BOINC on my computer for..."
-#~ msgstr "Ja, ik gebruik BOINC op mijn computer..."
-#~ msgid "less than a week"
-#~ msgstr "minder dan een week"
-#~ msgid "less than a month"
-#~ msgstr "minder dan een maand"
-#~ msgid "less than a year"
-#~ msgstr "minder dan een jaar"
-#~ msgid "more than a year"
-#~ msgstr "meer dan een jaar"
-#~ msgid "No - I used to run BOINC, but..."
-#~ msgstr "Nee - Ik heb BOINC gebruikt, maar ben gestopt omdat..."
-#~ msgid "I lost interest"
-#~ msgstr "ik de interesse verloor"
-#~ msgid "it was too complicated"
-#~ msgstr "het te ingewikkeld was"
-#~ msgid "I stopped it and forgot to start again"
-#~ msgstr "nadat ik het had gebruikt, ik vergeten ben het weer aan te zetten"
-#~ msgid "it caused problems on my computer"
-#~ msgstr "het problemen op mijn computer veroorzaakte"
-#~ msgid "it used too much electricity"
-#~ msgstr "het te veel elektriciteit gebruikt"
-#~ msgid "I switched to a non-BOINC computing project"
-#~ msgstr "ik ben overgestapt op een 'niet-BOINC' project"
-#~ msgid "No - I tried running BOINC, but..."
-#~ msgstr "Nee - ik heb geprobeerd BOINC te gebruiken maar..."
-#~ msgid "the software didn't install correctly"
-#~ msgstr "de software installeerde niet goed"
-#~ msgid "I couldn't figure out how to use the software"
-#~ msgstr "ik wist niet goed hoe de software werkte"
-#~ msgid "I had network communication problems"
-#~ msgstr "ik had problemen met de netwerk-communicatie"
-#~ msgid "I couldn't attach to a project"
-#~ msgstr "ik kon geen project toevoegen"
-#~ msgid "I attached to a project, but never got any work"
-#~ msgstr "nadat ik een project had toegevoegd, kreeg ik geen werk"
-#~ msgid "No - I never tried running BOINC, because..."
-#~ msgstr "Nee - Ik heb nooit geprobeerd BOINC te gebruiken, omdat..."
-#~ msgid "I was concerned about security"
-#~ msgstr "ik me zorgen maakte over de veiligheid"
-#~ msgid "I wasn't interested in any of the projects"
-#~ msgstr "ik in geen enkel project geïnteresseerd was"
-#~ msgid "I don't have permission to run it on my computer"
-#~ msgstr "ik geen toestemming heb om het te installeren"
-#~ msgid "No version was available for my computer"
-#~ msgstr "er geen versie beschikbaar was voor mijn computer"
-#~ msgid "What kind of computers do you have running BOINC?"
-#~ msgstr "Wat voor soort computers gebruik je voor BOINC?"
-#~ msgid "Where are they?"
-#~ msgstr "Waar staan ze?"
-#~ msgid "Work"
-#~ msgstr "Op het werk"
-#~ msgid "School"
-#~ msgstr "Op school"
-#~ msgid "How many computers?"
-#~ msgstr "Hoeveel computers?"
-#~ msgid "On average, how many hours per day are they powered on?"
-#~ msgstr "Hoe lang staan ze gemiddeld aan per dag?"
-#~ msgid "Age"
-#~ msgstr "Leeftijd"
-#~ msgid "Sex"
-#~ msgstr "Geslacht"
-#~ msgid "Male"
-#~ msgstr "Man"
-#~ msgid "Female"
-#~ msgstr "Vrouw"
-#~ msgid "Your level of computer expertise"
-#~ msgstr "Jouw computer ervaring"
-#~ msgid "Beginner"
-#~ msgstr "Beginner"
-#~ msgid "Intermediate"
-#~ msgstr "Gemiddeld"
-#~ msgid "Advanced"
-#~ msgstr "Expert"
-#~ msgid "Where did you learn about BOINC projects?"
-#~ msgstr "Hoe kwam je achter het bestaan van de BOINC projecten?"
-#~ msgid "TV/radio/newspaper"
-#~ msgstr "TV/radio/krant"
-#~ msgid "From friends, relatives, or coworkers"
-#~ msgstr "Door vrienden, kennissen of collega's"
-#~ msgid "Team message boards or web sites"
-#~ msgstr "Team forum of websites"
-#~ msgid "The BOINC web site"
-#~ msgstr "De BOINC website"
-#~ msgid "Other web sites"
-#~ msgstr "Andere websites"
-#~ msgid ""
-#~ "Which are the most important factors when you decide whether to "
-#~ "participate in a BOINC project?"
-#~ msgstr "Waar let je het meest op als je je aanmeldt bij een BOINC project?"
-#~ msgid "Nice-looking screensaver graphics"
-#~ msgstr "Een mooie screensaver"
-#~ msgid "Fair and quick granting of credit for work done"
-#~ msgstr "Eerlijk en snel krijgen van punten"
-#~ msgid "Getting more credit from this project than from others"
-#~ msgstr "Meer punten voor het project krijgen dan voor andere projecten"
-#~ msgid "Helpful and friendly message boards"
-#~ msgstr "Behulpzame en vriendelijke forum gebruikers"
-#~ msgid "Participation by project staff on the message boards"
-#~ msgstr "Deelname van project-medewerkers op het forum"
-#~ msgid "Informative project web site"
-#~ msgstr "Informatieve project website"
-#~ msgid "The science is important and beneficial"
-#~ msgstr "Belangrijke en nuttige wetenschap"
-#~ msgid "Non-profit, and results are public"
-#~ msgstr "Non-profit, en resultaten zijn publiekelijk beschikbaar"
-#~ msgid "Personal recognition if my computer finds something"
-#~ msgstr "Persoonlijke erkenning als mijn computer iets vindt"
-#~ msgid "Publication by the project in scientific journals"
-#~ msgstr "Publicaties van het project in wetenschappelijke tijdschriften"
-#~ msgid "Periodic email newsletters from the project"
-#~ msgstr "Periodieke nieuwsbrieven per email over het project"
-#~ msgid "How many BOINC projects do you participate in?"
-#~ msgstr "Aan hoeveel projecten doe je mee?"
-#~ msgid "Do you run BOINC as a screensaver?"
-#~ msgstr "Gebruik je BOINC als screensaver?"
-#~ msgid "Yes"
-#~ msgstr "Ja"
-#~ msgid "No"
-#~ msgstr "Nee"
-#~ msgid "Your usage of project messages boards:"
-#~ msgstr "Jouw forum gebruik bij de projecten:"
-#~ msgid "to read information"
-#~ msgstr "om informatie te lezen"
-#~ msgid "to read and post information"
-#~ msgstr "om informatie te lezen en te posten"
-#~ msgid "None"
-#~ msgstr "ik maak geen gebruik van het forum"
-#~ msgid ""
-#~ "Where do you get information to help resolve problems with BOINC and/or "
-#~ "BOINC projects?"
-#~ msgstr "Hoe kom je aan informatie om problemen met BOINC op te lossen?"
-#~ msgid "The project message boards"
-#~ msgstr "Forum van het project"
-#~ msgid "The BOINC message boards"
-#~ msgstr "Het BOINC forum"
-#~ msgid "BOINC mailing lists"
-#~ msgstr "BOINC mailing list"
-#~ msgid "The Unofficial BOINC Wiki"
-#~ msgstr "De 'Unofficial BOINC Wiki'"
-#~ msgid "Team web sites"
-#~ msgstr "Team websites"
-#~ msgid "Google or other search engines"
-#~ msgstr "Google of andere zoekmachines"
-#~ msgid "... more"
-#~ msgstr "... meer"
-#~ msgid "BOINC user survey"
-#~ msgstr "BOINC gebruikers enquête"
-#~ msgid ""
-#~ "Several volunteer computing projects, including Climateprediction.net, "
-#~ "Einstein at home, and SETI at home, use software called BOINC.  If you "
-#~ "participate in projects like this, we request that you answer the "
-#~ "following questions.  This will help BOINC-based projects increase "
-#~ "participation and achieve greater scientific results. <p> Please answer "
-#~ "as many questions as you want, then go to the bottom and click OK. If you "
-#~ "previously completed the survey but your answers have changed, please "
-#~ "complete it again - your new answers will replace the old ones. <p> The "
-#~ "current results of the survey are <a href=poll_results.php>here</a>. "
-#~ msgstr ""
-#~ "Diverse projecten, waaronder Climateprediction.net, Einstein at home, en "
-#~ "SETI at home maken gebruik van software genaamd BOINC.  Als je aan een van "
-#~ "deze projecten deelneemt, vragen we je de volgende vragen te "
-#~ "beantwoorden.  Hierdoor kunnen de projecten mogelijk meer deelnemers "
-#~ "krijgen en betere wetenschappelijke resultaten bereiken. <p> Beantwoord a."
-#~ "u.b de vragen zo veel mogelijk, ga daarna naar de onderkant van de pagina "
-#~ "en klik op OK. Als je de enquete al een keer hebt ingevuld en je "
-#~ "antwoorden zijn veranderd, vul hem dan opnieuw in - je nieuwe antwoorden "
-#~ "zullen de oudere vervangen. <p> De huidige resultaten vind je <a "
-#~ "href=poll_results.php>hier</a>. "
-#~ msgid "Do you run BOINC?"
-#~ msgstr "Maak je gebruik van BOINC?"
-#~ msgid "Your participation"
-#~ msgstr "Jouw deelname"
-#~ msgid "Your computers"
-#~ msgstr "Jouw computers"
-#~ msgid "You"
-#~ msgstr "Over jezelf"
-#~ msgid "Nationality"
-#~ msgstr "Nationaliteit"
-#~ msgid "Comments"
-#~ msgstr "Suggesties"
-#~ msgid ""
-#~ "Please suggest ways that BOINC, and the projects that use it, could be "
-#~ "improved:"
-#~ msgstr ""
-#~ "Stel manieren voor om BOINC, en de projecten die er gebruik van maken, te "
-#~ "verbeteren:"
-#~ msgid "When done click:"
-#~ msgstr "Als je klaar bent klik:"
-#~ msgid "Error - results not recorded"
-#~ msgstr "Fout - resultaten niet opgeslagen"
-#~ msgid ""
-#~ "An internal error has prevented us from recording your survey response.  "
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Door een interne fout kon je enquête resultaten niet worden opgeslagen.  "
-#~ "Probeer het a.u.b. later nog eens. "
-#~ msgid "Survey response recorded"
-#~ msgstr "Enquête resultaten zijn opgeslagen"
-#~ msgid "Thank you for completing the BOINC user survey."
-#~ msgstr "Bedankt voor het voltooien van de BOINC gebruikers enquête."
-#~ msgid "Survey results"
-#~ msgstr "Enquête resultaten"
-#~ msgid ""
-#~ "These are the current results of the <a href=poll.php>BOINC user survey</"
-#~ "a>.  This page is updated every hour."
-#~ msgstr ""
-#~ "Dit zijn de resultaten van de <a href=poll.php>BOINC gebruikers enquête</"
-#~ "a>.  De pagina wordt elk uur bijgewerkt."
-
diff --git a/locale/nn/BOINC-Client.mo b/locale/nn/BOINC-Client.mo
index c4f4dfc..1d76b97 100644
Binary files a/locale/nn/BOINC-Client.mo and b/locale/nn/BOINC-Client.mo differ
diff --git a/locale/nn/BOINC-Client.po b/locale/nn/BOINC-Client.po
index d58f21c..a2425c8 100644
--- a/locale/nn/BOINC-Client.po
+++ b/locale/nn/BOINC-Client.po
@@ -4,20 +4,19 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-06-05 10:24-0700\n"
-"PO-Revision-Date: 2015-02-12 00:07-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.2.1\n"
 
-#: acct_mgr.cpp:448
-#: acct_mgr.cpp:457
+#: acct_mgr.cpp:448 acct_mgr.cpp:457
 msgid "Message from account manager"
 msgstr ""
 
@@ -26,7 +25,9 @@ msgid "Message from server"
 msgstr ""
 
 #: client_state.cpp:246
-msgid "Some tasks need more memory than allowed by your preferences.  Please check the preferences."
+msgid ""
+"Some tasks need more memory than allowed by your preferences.  Please check "
+"the preferences."
 msgstr ""
 
 #: client_state.cpp:501
@@ -39,11 +40,12 @@ msgstr ""
 
 #: cs_scheduler.cpp:575
 #, c-format
-msgid "You used the wrong URL for this project.  When convenient, remove this project, then add %s"
+msgid ""
+"You used the wrong URL for this project.  When convenient, remove this "
+"project, then add %s"
 msgstr ""
 
-#: cs_statefile.cpp:829
-#: ../sched/sched_types.cpp:259
+#: cs_statefile.cpp:829 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
 msgstr ""
 
@@ -59,13 +61,11 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: log_flags.cpp:259
-#: log_flags.cpp:436
+#: log_flags.cpp:259 log_flags.cpp:436
 msgid "Unexpected text in cc_config.xml"
 msgstr ""
 
-#: log_flags.cpp:410
-#: log_flags.cpp:462
+#: log_flags.cpp:410 log_flags.cpp:462
 msgid "Unrecognized tag in cc_config.xml"
 msgstr ""
 
@@ -90,7 +90,9 @@ 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."
+msgid ""
+"The project has changed its security key.  Please remove and add this "
+"project."
 msgstr ""
 
 #: ../sched/handle_request.cpp:943
@@ -102,7 +104,8 @@ 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."
+msgid ""
+"Your BOINC client software is too old.  Please install the current version."
 msgstr ""
 
 #: ../sched/handle_request.cpp:1259
@@ -114,11 +117,14 @@ 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"
+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"
+msgid ""
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to "
+"the current version"
 msgstr ""
 
 #: ../sched/sched_send.cpp:1146
@@ -140,7 +146,8 @@ msgstr ""
 
 #: ../sched/sched_send.cpp:1305
 #, c-format
-msgid "Tasks for %s are available, but your preferences are set to not accept them"
+msgid ""
+"Tasks for %s are available, but your preferences are set to not accept them"
 msgstr ""
 
 #: ../sched/sched_types.cpp:254
@@ -150,4 +157,3 @@ msgstr ""
 #: ../sched/sched_version.cpp:214
 msgid "Your app_info.xml file doesn't have a usable version of"
 msgstr ""
-
diff --git a/locale/nn/BOINC-Manager.mo b/locale/nn/BOINC-Manager.mo
index 622e406..8cc2b2a 100644
Binary files a/locale/nn/BOINC-Manager.mo and b/locale/nn/BOINC-Manager.mo differ
diff --git a/locale/nn/BOINC-Manager.po b/locale/nn/BOINC-Manager.po
index cf8cdb3..4b76a10 100644
--- a/locale/nn/BOINC-Manager.po
+++ b/locale/nn/BOINC-Manager.po
@@ -4,12 +4,12 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-06-18 11:32-0500\n"
-"PO-Revision-Date: 2015-02-12 00:08-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,11 +17,11 @@ msgstr ""
 "X-Generator: Translate Toolkit 1.2.1\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
 "X-Poedit-SearchPath-0: clientgui\n"
 "X-Poedit-SearchPath-1: clientgui/msw\n"
 "X-Poedit-SearchPath-2: clientgui/gtk\n"
 "X-Poedit-SearchPath-3: clientgui/mac\n"
+"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
 
 #: clientgui/AccountInfoPage.cpp:387
 #, c-format
@@ -66,13 +66,11 @@ msgstr ""
 msgid "Find login information"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:668
+#: clientgui/AccountInfoPage.cpp:436 clientgui/AccountInfoPage.cpp:668
 msgid "&Password:"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:692
+#: clientgui/AccountInfoPage.cpp:443 clientgui/AccountInfoPage.cpp:692
 msgid "Choose a &password:"
 msgstr ""
 
@@ -126,33 +124,46 @@ msgid "Use account manager"
 msgstr ""
 
 #: clientgui/AccountInfoPage.cpp:587
-msgid "The minimum username length for this project is 1. Please enter a different username."
+msgid ""
+"The minimum username length for this project is 1. Please enter a different "
+"username."
 msgstr ""
 
 #: clientgui/AccountInfoPage.cpp:592
-msgid "The minimum username length for this account manager is 1. Please enter a different username."
+msgid ""
+"The minimum username length for this account manager is 1. Please enter a "
+"different username."
 msgstr ""
 
 #: clientgui/AccountInfoPage.cpp:598
-msgid "The minimum email address length for this project is 1. Please enter a different email address."
+msgid ""
+"The minimum email address length for this project is 1. Please enter a "
+"different email address."
 msgstr ""
 
 #: clientgui/AccountInfoPage.cpp:603
-msgid "The minimum email address length for this account manager is 1. Please enter a different email address."
+msgid ""
+"The minimum email address length for this account manager is 1. Please enter "
+"a different email address."
 msgstr ""
 
 #: clientgui/AccountInfoPage.cpp:616
 #, c-format
-msgid "The minimum password length for this project is %d. Please enter a different password."
+msgid ""
+"The minimum password length for this project is %d. Please enter a different "
+"password."
 msgstr ""
 
 #: clientgui/AccountInfoPage.cpp:622
 #, c-format
-msgid "The minimum password length for this account manager is %d. Please enter a different password."
+msgid ""
+"The minimum password length for this account manager is %d. Please enter a "
+"different password."
 msgstr ""
 
 #: clientgui/AccountInfoPage.cpp:634
-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:248
@@ -206,8 +217,7 @@ msgstr ""
 msgid "&Close Window"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:329
-#: clientgui/AdvancedFrame.cpp:336
+#: clientgui/AdvancedFrame.cpp:329 clientgui/AdvancedFrame.cpp:336
 #: clientgui/AdvancedFrame.cpp:343
 #, c-format
 msgid "Exit %s"
@@ -629,7 +639,8 @@ msgstr ""
 #: clientgui/BOINCBaseFrame.cpp:514
 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:523
@@ -667,7 +678,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:638
@@ -686,7 +698,8 @@ 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 ""
 
@@ -858,14 +871,12 @@ msgstr ""
 msgid "Open %s..."
 msgstr ""
 
-#: clientgui/BOINCTaskBar.cpp:525
-#: clientgui/BOINCTaskBar.cpp:621
+#: clientgui/BOINCTaskBar.cpp:525 clientgui/BOINCTaskBar.cpp:621
 #: clientgui/BOINCTaskBar.cpp:629
 msgid "Snooze"
 msgstr ""
 
-#: clientgui/BOINCTaskBar.cpp:527
-#: clientgui/BOINCTaskBar.cpp:648
+#: clientgui/BOINCTaskBar.cpp:527 clientgui/BOINCTaskBar.cpp:648
 #: clientgui/BOINCTaskBar.cpp:656
 msgid "Snooze GPU"
 msgstr ""
@@ -947,10 +958,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 ""
 
@@ -1026,10 +1035,8 @@ msgstr ""
 msgid "Berkeley Open Infrastructure for Network Computing"
 msgstr ""
 
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:396
+#: clientgui/DlgAbout.cpp:208 clientgui/DlgExitMessage.cpp:173
+#: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:396
 #: clientgui/DlgSelectComputer.cpp:162
 msgid "&OK"
 msgstr ""
@@ -1054,8 +1061,7 @@ msgstr ""
 msgid "Validation Error"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:797
-#: clientgui/DlgAdvPreferences.cpp:803
+#: clientgui/DlgAdvPreferences.cpp:797 clientgui/DlgAdvPreferences.cpp:803
 #: clientgui/DlgAdvPreferences.cpp:809
 msgid "Applications to add"
 msgstr ""
@@ -1065,8 +1071,7 @@ msgstr ""
 msgid "'%s' is not an executable application."
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:827
-#: clientgui/DlgAdvPreferences.cpp:874
+#: clientgui/DlgAdvPreferences.cpp:827 clientgui/DlgAdvPreferences.cpp:874
 #: clientgui/DlgAdvPreferences.cpp:898
 msgid "Add Exclusive App"
 msgstr ""
@@ -1164,7 +1169,8 @@ msgid "While computer is on batteries"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:142
-msgid "check this if you want this computer to do work while it runs on batteries"
+msgid ""
+"check this if you want this computer to do work while it runs on batteries"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:148
@@ -1172,7 +1178,8 @@ msgid "While computer is in use"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:151
-msgid "check this if you want this computer to do work even when you're using it"
+msgid ""
+"check this if you want this computer to do work even when you're using it"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:157
@@ -1180,7 +1187,9 @@ msgid "Use GPU while computer is in use"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:160
-msgid "check this if you want your GPU to do work even when you're using the computer"
+msgid ""
+"check this if you want your GPU to do work even when you're using the "
+"computer"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:172
@@ -1188,7 +1197,8 @@ msgid "Only after computer has been idle for"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:182
-msgid "do work only after you haven't used the computer for this number of minutes"
+msgid ""
+"do work only after you haven't used the computer for this number of minutes"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:187
@@ -1375,7 +1385,9 @@ msgid "Confirm before connecting to internet"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:479
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
+msgid ""
+"if checked, a confirmation dialog will be displayed before trying to connect "
+"to the Internet"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:483
@@ -1400,8 +1412,7 @@ msgstr ""
 msgid "network usage stop hour"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:597
-#: clientgui/DlgItemProperties.cpp:226
+#: clientgui/DlgAdvPreferencesBase.cpp:597 clientgui/DlgItemProperties.cpp:226
 msgid "Disk usage"
 msgstr ""
 
@@ -1470,7 +1481,8 @@ msgid "if checked, suspended work units are left in memory"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:712
-msgid "Suspend processor and network usage when these applications are running:"
+msgid ""
+"Suspend processor and network usage when these applications are running:"
 msgstr ""
 
 #: clientgui/DlgAdvPreferencesBase.cpp:721
@@ -1510,8 +1522,7 @@ msgstr ""
 msgid "Message"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:287
-#: clientgui/DlgEventLog.cpp:351
+#: clientgui/DlgEventLog.cpp:287 clientgui/DlgEventLog.cpp:351
 msgid "&Show only this project"
 msgstr ""
 
@@ -1519,8 +1530,7 @@ msgstr ""
 msgid "Copy &All"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:293
-#: clientgui/DlgEventLog.cpp:297
+#: clientgui/DlgEventLog.cpp:293 clientgui/DlgEventLog.cpp:297
 msgid "Copy all the messages to the clipboard."
 msgstr ""
 
@@ -1528,18 +1538,19 @@ msgstr ""
 msgid "Copy &Selected"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:305
-#: clientgui/DlgEventLog.cpp:313
-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:305 clientgui/DlgEventLog.cpp:313
+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:307
-#: clientgui/DlgEventLog.cpp:315
-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:307 clientgui/DlgEventLog.cpp:315
+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:322
-#: clientgui/DlgItemProperties.cpp:66
+#: clientgui/DlgEventLog.cpp:322 clientgui/DlgItemProperties.cpp:66
 msgid "&Close"
 msgstr ""
 
@@ -1552,13 +1563,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 ""
 
@@ -1598,10 +1607,8 @@ msgstr ""
 msgid "Remember this decision and do not show this dialog."
 msgstr ""
 
-#: clientgui/DlgExitMessage.cpp:178
-#: clientgui/DlgGenericMessage.cpp:125
-#: clientgui/DlgOptions.cpp:401
-#: clientgui/DlgSelectComputer.cpp:167
+#: clientgui/DlgExitMessage.cpp:178 clientgui/DlgGenericMessage.cpp:125
+#: clientgui/DlgOptions.cpp:401 clientgui/DlgSelectComputer.cpp:167
 msgid "&Cancel"
 msgstr ""
 
@@ -1609,10 +1616,8 @@ msgstr ""
 msgid "Don't show this dialog again."
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:163
-#: clientgui/DlgItemProperties.cpp:166
-#: clientgui/DlgItemProperties.cpp:169
-#: clientgui/DlgItemProperties.cpp:172
+#: clientgui/DlgItemProperties.cpp:163 clientgui/DlgItemProperties.cpp:166
+#: clientgui/DlgItemProperties.cpp:169 clientgui/DlgItemProperties.cpp:172
 msgid "Don't fetch tasks for "
 msgstr ""
 
@@ -1644,8 +1649,7 @@ msgstr ""
 msgid "Properties of project "
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:212
-#: clientgui/DlgOptions.cpp:218
+#: clientgui/DlgItemProperties.cpp:212 clientgui/DlgOptions.cpp:218
 msgid "General"
 msgstr ""
 
@@ -1685,14 +1689,10 @@ msgstr ""
 msgid "Non CPU intensive"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:229
-#: clientgui/DlgItemProperties.cpp:231
-#: clientgui/DlgItemProperties.cpp:232
-#: clientgui/DlgItemProperties.cpp:234
-#: clientgui/DlgItemProperties.cpp:237
-#: clientgui/DlgItemProperties.cpp:246
-#: clientgui/DlgItemProperties.cpp:249
-#: clientgui/DlgItemProperties.cpp:252
+#: clientgui/DlgItemProperties.cpp:229 clientgui/DlgItemProperties.cpp:231
+#: clientgui/DlgItemProperties.cpp:232 clientgui/DlgItemProperties.cpp:234
+#: clientgui/DlgItemProperties.cpp:237 clientgui/DlgItemProperties.cpp:246
+#: clientgui/DlgItemProperties.cpp:249 clientgui/DlgItemProperties.cpp:252
 msgid "yes"
 msgstr ""
 
@@ -1700,8 +1700,7 @@ msgstr ""
 msgid "Suspended via GUI"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:231
-#: clientgui/DlgItemProperties.cpp:232
+#: clientgui/DlgItemProperties.cpp:231 clientgui/DlgItemProperties.cpp:232
 msgid "no"
 msgstr ""
 
@@ -1717,8 +1716,7 @@ msgstr ""
 msgid "Trickle-up pending"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:240
-#: clientgui/DlgItemProperties.cpp:242
+#: clientgui/DlgItemProperties.cpp:240 clientgui/DlgItemProperties.cpp:242
 msgid "Host location"
 msgstr ""
 
@@ -1802,13 +1800,11 @@ msgstr ""
 msgid "CPU time at last checkpoint"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:340
-#: clientgui/DlgItemProperties.cpp:355
+#: clientgui/DlgItemProperties.cpp:340 clientgui/DlgItemProperties.cpp:355
 msgid "CPU time"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:342
-#: clientgui/DlgItemProperties.cpp:356
+#: clientgui/DlgItemProperties.cpp:342 clientgui/DlgItemProperties.cpp:356
 msgid "Elapsed time"
 msgstr ""
 
@@ -1840,8 +1836,7 @@ msgstr ""
 msgid "Local: "
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: clientgui/DlgOptions.cpp:129 clientgui/DlgOptions.cpp:135
 msgid "Options"
 msgstr ""
 
@@ -1905,33 +1900,27 @@ msgstr ""
 msgid "HTTP Proxy Server Configuration"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:280
-#: clientgui/DlgOptions.cpp:344
+#: clientgui/DlgOptions.cpp:280 clientgui/DlgOptions.cpp:344
 msgid "Address:"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:288
-#: clientgui/DlgOptions.cpp:352
+#: clientgui/DlgOptions.cpp:288 clientgui/DlgOptions.cpp:352
 msgid "Port:"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:296
-#: clientgui/DlgOptions.cpp:360
+#: clientgui/DlgOptions.cpp:296 clientgui/DlgOptions.cpp:360
 msgid "Don't use proxy for:"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:303
-#: clientgui/DlgOptions.cpp:367
+#: clientgui/DlgOptions.cpp:303 clientgui/DlgOptions.cpp:367
 msgid "Leave these blank if not needed"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:309
-#: clientgui/DlgOptions.cpp:373
+#: clientgui/DlgOptions.cpp:309 clientgui/DlgOptions.cpp:373
 msgid "User Name:"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:317
-#: clientgui/DlgOptions.cpp:381
+#: clientgui/DlgOptions.cpp:317 clientgui/DlgOptions.cpp:381
 #: clientgui/DlgSelectComputer.cpp:151
 msgid "Password:"
 msgstr ""
@@ -1983,7 +1972,9 @@ msgstr ""
 
 #: clientgui/DlgOptions.cpp:695
 #, 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:90
@@ -2002,8 +1993,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 ""
 
@@ -2015,15 +2005,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 ""
@@ -2036,18 +2023,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 ""
 
@@ -2055,13 +2039,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 ""
 
@@ -2082,7 +2064,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
@@ -2110,7 +2093,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
@@ -2118,7 +2102,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
@@ -2129,8 +2115,7 @@ 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
 msgid "Team"
 msgstr ""
 
@@ -2211,7 +2196,9 @@ msgid "Missing application"
 msgstr ""
 
 #: clientgui/MainDocument.cpp:1805
-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:2418
@@ -2282,8 +2269,7 @@ msgstr ""
 msgid "Downloading"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2468
-#: clientgui/MainDocument.cpp:2538
+#: clientgui/MainDocument.cpp:2468 clientgui/MainDocument.cpp:2538
 msgid " (suspended - "
 msgstr ""
 
@@ -2327,8 +2313,7 @@ msgstr ""
 msgid "Waiting to run"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2508
-#: clientgui/MainDocument.cpp:2514
+#: clientgui/MainDocument.cpp:2508 clientgui/MainDocument.cpp:2514
 msgid "Ready to start"
 msgstr ""
 
@@ -2454,8 +2439,7 @@ msgstr ""
 msgid "%s; received from %s; on %s"
 msgstr ""
 
-#: clientgui/NoticeListCtrl.cpp:282
-#: clientgui/ProjectListCtrl.cpp:282
+#: clientgui/NoticeListCtrl.cpp:282 clientgui/ProjectListCtrl.cpp:282
 msgid "Click"
 msgstr ""
 
@@ -2463,8 +2447,7 @@ msgstr ""
 msgid "more..."
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:451
-#: clientgui/ProjectInfoPage.cpp:739
+#: clientgui/ProjectInfoPage.cpp:451 clientgui/ProjectInfoPage.cpp:739
 #: clientgui/ProjectInfoPage.cpp:743
 msgid "All"
 msgstr ""
@@ -2510,7 +2493,9 @@ msgid "Project URL:"
 msgstr ""
 
 #: clientgui/ProjectInfoPage.cpp:787
-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:811
@@ -2598,8 +2583,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 ""
 
@@ -2611,8 +2595,7 @@ msgstr ""
 msgid "SOCKS proxy"
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:136
-#: clientgui/sg_BoincSimpleGUI.cpp:119
+#: clientgui/sg_BoincSimpleFrame.cpp:136 clientgui/sg_BoincSimpleGUI.cpp:119
 msgid "Advanced View...\tCtrl+Shift+A"
 msgstr ""
 
@@ -2628,8 +2611,7 @@ msgstr ""
 msgid "Select the appearance of the user interface."
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:193
-#: clientgui/sg_BoincSimpleGUI.cpp:147
+#: clientgui/sg_BoincSimpleFrame.cpp:193 clientgui/sg_BoincSimpleGUI.cpp:147
 #, c-format
 msgid "&%s"
 msgstr ""
@@ -2876,8 +2858,7 @@ msgstr ""
 msgid "Connect to internet only between:"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:376
-#: clientgui/sg_DlgPreferences.cpp:393
+#: clientgui/sg_DlgPreferences.cpp:376 clientgui/sg_DlgPreferences.cpp:393
 msgid "Use no more than:"
 msgstr ""
 
@@ -2897,14 +2878,10 @@ msgstr ""
 msgid "Do work after idle for:"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:621
-#: clientgui/sg_DlgPreferences.cpp:624
-#: clientgui/sg_DlgPreferences.cpp:683
-#: clientgui/sg_DlgPreferences.cpp:687
-#: clientgui/sg_DlgPreferences.cpp:699
-#: clientgui/sg_DlgPreferences.cpp:703
-#: clientgui/sg_DlgPreferences.cpp:846
-#: clientgui/sg_DlgPreferences.cpp:857
+#: clientgui/sg_DlgPreferences.cpp:621 clientgui/sg_DlgPreferences.cpp:624
+#: clientgui/sg_DlgPreferences.cpp:683 clientgui/sg_DlgPreferences.cpp:687
+#: clientgui/sg_DlgPreferences.cpp:699 clientgui/sg_DlgPreferences.cpp:703
+#: clientgui/sg_DlgPreferences.cpp:846 clientgui/sg_DlgPreferences.cpp:857
 msgid "Anytime"
 msgstr ""
 
@@ -2977,7 +2954,9 @@ msgid "Update"
 msgstr ""
 
 #: clientgui/sg_ProjectCommandPopup.cpp:62
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
+msgid ""
+"Report all completed tasks, get latest credit, get latest preferences, and "
+"possibly get more tasks."
 msgstr ""
 
 #: clientgui/sg_ProjectCommandPopup.cpp:68
@@ -2999,11 +2978,15 @@ msgid "Reset project"
 msgstr ""
 
 #: clientgui/sg_ProjectCommandPopup.cpp:80
-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."
+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:86
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
+msgid ""
+"Remove this project.  Tasks in progress will be lost (use 'Update' first to "
+"report any completed tasks)."
 msgstr ""
 
 #: clientgui/sg_ProjectCommandPopup.cpp:91
@@ -3047,8 +3030,7 @@ msgid "Are you sure you want to remove project '%s'?"
 msgstr ""
 
 #: clientgui/sg_ProjectCommandPopup.cpp:257
-#: clientgui/sg_StatImageLoader.cpp:138
-#: clientgui/sg_StatImageLoader.cpp:198
+#: clientgui/sg_StatImageLoader.cpp:138 clientgui/sg_StatImageLoader.cpp:198
 msgid "Remove Project"
 msgstr ""
 
@@ -3064,8 +3046,7 @@ msgstr ""
 msgid "Work done for this project"
 msgstr ""
 
-#: clientgui/sg_ProjectPanel.cpp:77
-#: clientgui/sg_ProjectsComponent.cpp:123
+#: clientgui/sg_ProjectPanel.cpp:77 clientgui/sg_ProjectsComponent.cpp:123
 msgid "Synchronize projects with account manager system"
 msgstr ""
 
@@ -3121,8 +3102,7 @@ msgstr ""
 msgid "%s. Work done by %s: %0.2f"
 msgstr ""
 
-#: clientgui/sg_TaskCommandPopup.cpp:60
-#: clientgui/sg_ViewTabPage.cpp:424
+#: clientgui/sg_TaskCommandPopup.cpp:60 clientgui/sg_ViewTabPage.cpp:424
 msgid "Show graphics"
 msgstr ""
 
@@ -3226,8 +3206,7 @@ msgstr ""
 msgid "Status: %s"
 msgstr ""
 
-#: clientgui/sg_ViewTabPage.cpp:140
-#: clientgui/sg_ViewTabPage.cpp:280
+#: clientgui/sg_ViewTabPage.cpp:140 clientgui/sg_ViewTabPage.cpp:280
 #, c-format
 msgid "%.1lf"
 msgstr ""
@@ -3245,8 +3224,7 @@ msgstr ""
 msgid "Application: "
 msgstr ""
 
-#: clientgui/sg_ViewTabPage.cpp:449
-#: clientgui/sg_ViewTabPage.cpp:453
+#: clientgui/sg_ViewTabPage.cpp:449 clientgui/sg_ViewTabPage.cpp:453
 msgid "Time Remaining: "
 msgstr ""
 
@@ -3300,8 +3278,7 @@ msgstr ""
 msgid "Invalid Account Key; please enter a valid Account Key"
 msgstr ""
 
-#: clientgui/ValidateAccountKey.cpp:82
-#: clientgui/ValidateEmailAddress.cpp:86
+#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
 msgid "Validation conflict"
 msgstr ""
 
@@ -3324,17 +3301,13 @@ msgid ""
 "http://www.example.com/"
 msgstr ""
 
-#: clientgui/ValidateURL.cpp:83
-#: clientgui/ValidateURL.cpp:87
-#: clientgui/ValidateURL.cpp:91
-#: clientgui/ValidateURL.cpp:103
-#: clientgui/ValidateURL.cpp:107
-#: clientgui/ValidateURL.cpp:110
+#: clientgui/ValidateURL.cpp:83 clientgui/ValidateURL.cpp:87
+#: clientgui/ValidateURL.cpp:91 clientgui/ValidateURL.cpp:103
+#: clientgui/ValidateURL.cpp:107 clientgui/ValidateURL.cpp:110
 msgid "Invalid URL"
 msgstr ""
 
-#: clientgui/ValidateURL.cpp:84
-#: clientgui/ValidateURL.cpp:88
+#: clientgui/ValidateURL.cpp:84 clientgui/ValidateURL.cpp:88
 #: clientgui/ValidateURL.cpp:92
 msgid ""
 "Please specify a valid URL.\n"
@@ -3342,8 +3315,7 @@ msgid ""
 "http://boincproject.example.com"
 msgstr ""
 
-#: clientgui/ValidateURL.cpp:104
-#: clientgui/ValidateURL.cpp:108
+#: clientgui/ValidateURL.cpp:104 clientgui/ValidateURL.cpp:108
 #, c-format
 msgid "'%s' does not contain a valid host name."
 msgstr ""
@@ -3353,10 +3325,8 @@ msgstr ""
 msgid "'%s' does not contain a valid path."
 msgstr ""
 
-#: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:169
-#: clientgui/ViewStatistics.cpp:1965
-#: clientgui/ViewTransfers.cpp:159
+#: clientgui/ViewMessages.cpp:84 clientgui/ViewProjects.cpp:169
+#: clientgui/ViewStatistics.cpp:1965 clientgui/ViewTransfers.cpp:159
 #: clientgui/ViewWork.cpp:182
 msgid "Commands"
 msgstr ""
@@ -3369,13 +3339,11 @@ msgstr ""
 msgid "Copy selected messages"
 msgstr ""
 
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
+#: clientgui/ViewMessages.cpp:106 clientgui/ViewMessages.cpp:502
 msgid "Show only this project"
 msgstr ""
 
-#: clientgui/ViewMessages.cpp:107
-#: clientgui/ViewMessages.cpp:503
+#: clientgui/ViewMessages.cpp:107 clientgui/ViewMessages.cpp:503
 msgid "Show only the messages for the selected project."
 msgstr ""
 
@@ -3403,8 +3371,7 @@ msgstr ""
 msgid "Show messages for all projects."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:219
-#: clientgui/ViewStatistics.cpp:442
+#: clientgui/ViewProjects.cpp:219 clientgui/ViewStatistics.cpp:442
 msgid "Account"
 msgstr ""
 
@@ -3416,8 +3383,7 @@ msgstr ""
 msgid "Avg. work done"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:224
-#: clientgui/ViewTransfers.cpp:187
+#: clientgui/ViewProjects.cpp:224 clientgui/ViewTransfers.cpp:187
 #: clientgui/ViewWork.cpp:233
 msgid "Status"
 msgstr ""
@@ -3454,8 +3420,7 @@ msgstr ""
 msgid "Removing project..."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:542
-#: clientgui/ViewWork.cpp:598
+#: clientgui/ViewProjects.cpp:542 clientgui/ViewWork.cpp:598
 msgid "Launching browser..."
 msgstr ""
 
@@ -3628,13 +3593,11 @@ msgstr ""
 msgid "Show chart for next project"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2013
-#: clientgui/ViewStatistics.cpp:2410
+#: clientgui/ViewStatistics.cpp:2013 clientgui/ViewStatistics.cpp:2410
 msgid "Hide project list"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2014
-#: clientgui/ViewStatistics.cpp:2410
+#: clientgui/ViewStatistics.cpp:2014 clientgui/ViewStatistics.cpp:2410
 msgid "Use entire area for graphs"
 msgstr ""
 
@@ -3678,16 +3641,11 @@ msgstr ""
 msgid "Statistics"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2097
-#: clientgui/ViewStatistics.cpp:2118
-#: clientgui/ViewStatistics.cpp:2139
-#: clientgui/ViewStatistics.cpp:2161
-#: clientgui/ViewStatistics.cpp:2182
-#: clientgui/ViewStatistics.cpp:2203
-#: clientgui/ViewStatistics.cpp:2224
-#: clientgui/ViewStatistics.cpp:2245
-#: clientgui/ViewStatistics.cpp:2266
-#: clientgui/ViewStatistics.cpp:2290
+#: clientgui/ViewStatistics.cpp:2097 clientgui/ViewStatistics.cpp:2118
+#: clientgui/ViewStatistics.cpp:2139 clientgui/ViewStatistics.cpp:2161
+#: clientgui/ViewStatistics.cpp:2182 clientgui/ViewStatistics.cpp:2203
+#: clientgui/ViewStatistics.cpp:2224 clientgui/ViewStatistics.cpp:2245
+#: clientgui/ViewStatistics.cpp:2266 clientgui/ViewStatistics.cpp:2290
 msgid "Updating charts..."
 msgstr ""
 
@@ -3719,8 +3677,7 @@ msgstr ""
 msgid "File"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:183
-#: clientgui/ViewWork.cpp:232
+#: clientgui/ViewTransfers.cpp:183 clientgui/ViewWork.cpp:232
 msgid "Progress"
 msgstr ""
 
@@ -3806,13 +3763,11 @@ msgstr ""
 msgid " (project backoff: "
 msgstr ""
 
-#: clientgui/ViewWork.cpp:186
-#: clientgui/ViewWork.cpp:766
+#: clientgui/ViewWork.cpp:186 clientgui/ViewWork.cpp:766
 msgid "Show active tasks"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:187
-#: clientgui/ViewWork.cpp:767
+#: clientgui/ViewWork.cpp:187 clientgui/ViewWork.cpp:767
 msgid "Show only active tasks."
 msgstr ""
 
@@ -3921,14 +3876,18 @@ msgstr ""
 
 #: clientgui/WelcomePage.cpp:325
 msgid ""
-"You have chosen to add a new volunteer computing project or change which projects\n"
+"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"
+"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"
+"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"
@@ -3958,8 +3917,7 @@ msgstr ""
 msgid "Question"
 msgstr ""
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
+#: clientgui/wizardex.cpp:377 clientgui/wizardex.cpp:553
 msgid "&Next >"
 msgstr ""
 
@@ -3996,7 +3954,9 @@ msgid "Pie Ctrl"
 msgstr ""
 
 #: clientgui/mac/MacAccessiblity.cpp:257
-msgid "for accessibility support, please select advanced from the view menu or type command shift a"
+msgid ""
+"for accessibility support, please select advanced from the view menu or type "
+"command shift a"
 msgstr ""
 
 #: clientgui/mac/MacAccessiblity.cpp:302
@@ -4044,8 +4004,7 @@ msgstr ""
 msgid "list is empty"
 msgstr ""
 
-#: clientgui/mac/MacAccessiblity.cpp:858
-#: clientgui/mac/MacAccessiblity.cpp:870
+#: clientgui/mac/MacAccessiblity.cpp:858 clientgui/mac/MacAccessiblity.cpp:870
 #, c-format
 msgid "; row %d; "
 msgstr ""
@@ -4116,4 +4075,3 @@ msgstr ""
 #: clientgui/DlgAdvPreferences.h:31
 msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
 msgstr ""
-
diff --git a/locale/nn/BOINC-Setup.mo b/locale/nn/BOINC-Setup.mo
index b964b05..f1ccf7b 100644
Binary files a/locale/nn/BOINC-Setup.mo and b/locale/nn/BOINC-Setup.mo differ
diff --git a/locale/nn/BOINC-Setup.po b/locale/nn/BOINC-Setup.po
index 1117a10..caaa48b 100644
--- a/locale/nn/BOINC-Setup.po
+++ b/locale/nn/BOINC-Setup.po
@@ -4,12 +4,12 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-08-06 16:50-0800\n"
-"PO-Revision-Date: 2015-02-12 00: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"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,13 +22,11 @@ msgstr ""
 msgid "Sorry, this version of %s requires system 10.4 or higher."
 msgstr ""
 
-#: mac_installer/PostInstall.cpp:131
-#: mac_installer/PostInstall.cpp:1211
+#: mac_installer/PostInstall.cpp:131 mac_installer/PostInstall.cpp:1211
 msgid "Yes"
 msgstr ""
 
-#: mac_installer/PostInstall.cpp:132
-#: mac_installer/PostInstall.cpp:1212
+#: mac_installer/PostInstall.cpp:132 mac_installer/PostInstall.cpp:1212
 msgid "No"
 msgstr ""
 
@@ -39,9 +37,11 @@ msgstr ""
 #: mac_installer/PostInstall.cpp:1491
 #, c-format
 msgid ""
-"Users who are permitted to administer this computer will automatically be allowed to run and control %s.\n"
+"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?"
+"Do you also want non-administrative users to be able to run and control %s "
+"on this Mac?"
 msgstr ""
 
 #: mac_installer/PostInstall.cpp:1519
@@ -100,7 +100,8 @@ msgstr ""
 #: mac_installer/uninstall.cpp:796
 #, c-format
 msgid ""
-"Enter your administrator password to completely remove %s from you computer.\n"
+"Enter your administrator password to completely remove %s from you "
+"computer.\n"
 "\n"
 msgstr ""
 
@@ -111,4 +112,3 @@ msgstr ""
 #: mac_installer/uninstall.cpp:1544
 msgid "Continue..."
 msgstr ""
-
diff --git a/locale/nn/BOINC-Web.mo b/locale/nn/BOINC-Web.mo
index 1f4f8e3..6e6fea5 100644
Binary files a/locale/nn/BOINC-Web.mo and b/locale/nn/BOINC-Web.mo differ
diff --git a/locale/nn/BOINC-Web.po b/locale/nn/BOINC-Web.po
index 9067ac7..4e4ed01 100644
--- a/locale/nn/BOINC-Web.po
+++ b/locale/nn/BOINC-Web.po
@@ -4,12 +4,12 @@
 # FileID  : $Id$
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at ssl.berkeley.edu>\n"
 "POT-Creation-Date: 2013-08-22 16:22 PDT\n"
-"PO-Revision-Date: 2015-02-12 00: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"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,7 +30,10 @@ msgid "Seismology"
 msgstr ""
 
 #: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
+msgid ""
+"The Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to Internet-connected computers.  You must buy a "
+"sensor to participate."
 msgstr ""
 
 #: projects.inc:27
@@ -42,23 +45,24 @@ msgid "Environmental research"
 msgstr ""
 
 #: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
+msgid ""
+"This project is creating a free and continuously updated map of radiation "
+"levels by using sensors connected to volunteers' computers.  You must buy a "
+"sensor to participate."
 msgstr ""
 
 #: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
+msgid ""
+"To participate in these projects you must buy a sensor and attach it to your "
+"computer."
 msgstr ""
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
 msgstr ""
 
-#: projects.inc:50
-#: projects.inc:342
-#: projects.inc:386
-#: projects.inc:435
-#: projects.inc:442
-#: projects.inc:489
+#: projects.inc:50 projects.inc:342 projects.inc:386 projects.inc:435
+#: projects.inc:442 projects.inc:489
 msgid "Private"
 msgstr ""
 
@@ -67,7 +71,11 @@ msgid "Artificial intelligence"
 msgstr ""
 
 #: projects.inc:52
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
+msgid ""
+"Parse and convert semantic nets for use in FreeHAL, an artificial "
+"intelligence that uses semantic networks, stemmers, part of speech "
+"databases, and part of speech taggers in order to imitate human behavior in "
+"conversations."
 msgstr ""
 
 #: projects.inc:58
@@ -83,7 +91,12 @@ msgid "Antimalarial drug discovery"
 msgstr ""
 
 #: projects.inc:73
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
+msgid ""
+"The parasite that causes malaria continues to evolve resistance to available "
+"medication. We therefore urgently need to discover new drugs to replace "
+"existing drugs. Importantly, these new drugs need to target NEW proteins in "
+"the parasite. The FightMalaria at Home project is aimed at finding these new "
+"targets."
 msgstr ""
 
 #: projects.inc:79
@@ -95,7 +108,12 @@ msgid "Protein structure prediction"
 msgstr ""
 
 #: projects.inc:81
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
+msgid ""
+"POEM at HOME uses a computational approach to predict the biologically active "
+"structure of proteins, to understand the signal-processing mechanisms when "
+"the proteins interact with one another, to understand diseases related to "
+"protein malfunction or aggregation, and to develop new drugs on the basis of "
+"the three-dimensions structure of biologically important proteins."
 msgstr ""
 
 #: projects.inc:87
@@ -107,7 +125,11 @@ msgid "Study of protein - ligand interactions"
 msgstr ""
 
 #: projects.inc:89
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
+msgid ""
+"Docking at Home has both bioscience and computer science goals. The project "
+"aims to further knowledge of the atomic details of protein-ligand "
+"interactions and, by doing so, will search for insights into the discovery "
+"of novel pharmaceuticals."
 msgstr ""
 
 #: projects.inc:103
@@ -119,7 +141,11 @@ msgid "Molecular simulations of proteins"
 msgstr ""
 
 #: projects.inc:105
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
+msgid ""
+"GPUGrid.net opens novel computational scenarios by the first full-atom "
+"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
+"New biomedical applications suddenly become possible giving a new role to "
+"computational biology for biomedical research."
 msgstr ""
 
 #: projects.inc:111
@@ -131,11 +157,15 @@ msgid "Genetic linkage analysis"
 msgstr ""
 
 #: projects.inc:113
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
+msgid ""
+"Superlink at Technion helps geneticists all over the world find disease-"
+"provoking genes causing some types of diabetes, hypertension (high blood "
+"pressure), cancer, schizophrenia and many others."
 msgstr ""
 
 #: projects.inc:127
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
+msgid ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
 msgstr ""
 
 #: projects.inc:128
@@ -143,7 +173,11 @@ msgid "Life science research"
 msgstr ""
 
 #: projects.inc:129
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
+msgid ""
+"The Lattice Project supplies computing power to scientists at the University "
+"of Maryland studying evolutionary relationships based on DNA sequence data; "
+"bacterial, plasmid, and virus protein sequences; and biological diversity in "
+"nature reserves. "
 msgstr ""
 
 #: projects.inc:135
@@ -155,20 +189,32 @@ msgid "Epidemiology"
 msgstr ""
 
 #: projects.inc:137
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
+msgid ""
+"Simulation models of the transmission dynamics and health effects of malaria "
+"are an important tool for malaria control. They can be used to determine "
+"optimal strategies for delivering mosquito nets, chemotherapy, or new "
+"vaccines which are currently under development and testing.  Such modeling "
+"is extremely computer intensive, requiring simulations of large human "
+"populations with a diverse set of parameters related to biological and "
+"social factors that influence the distribution of the disease. "
 msgstr ""
 
 #: projects.inc:159
 msgid "University of Washington"
 msgstr ""
 
-#: projects.inc:160
-#: projects.inc:168
+#: projects.inc:160 projects.inc:168
 msgid "Biology"
 msgstr ""
 
 #: projects.inc:161
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
+msgid ""
+"Determine the 3-dimensional shapes of proteins in research that may "
+"ultimately lead to finding cures for some major human diseases. By running "
+"Rosetta at home you will help us speed up and extend our research in ways we "
+"couldn't possibly attempt without your help. You will also be helping our "
+"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
+"Cancer, and Alzheimer's"
 msgstr ""
 
 #: projects.inc:167
@@ -176,7 +222,10 @@ msgid "University of Vienna"
 msgstr ""
 
 #: projects.inc:169
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
+msgid ""
+"Calculate similarities between proteins. SIMAP provides a public database of "
+"the resulting data, which plays a key role in many bioinformatics research "
+"projects."
 msgstr ""
 
 #: projects.inc:175
@@ -192,34 +241,54 @@ msgid "Climate study"
 msgstr ""
 
 #: projects.inc:189
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
+msgid ""
+"Investigate the approximations that have to be made in state-of-the-art "
+"climate models. By running the model thousands of times we hope to find out "
+"how the model responds to slight tweaks to these approximations - slight "
+"enough to not make the approximations any less realistic. This will allow us "
+"to improve our understanding of how sensitive our models are to small "
+"changes and also to things like changes in carbon dioxide and the sulphur "
+"cycle. This will allow us to explore how climate may change in the next "
+"century under a wide range of different scenarios."
 msgstr ""
 
 #: projects.inc:196
 msgid "Astronomy, Physics, and Chemistry"
 msgstr ""
 
-#: projects.inc:202
-#: projects.inc:241
-#: projects.inc:249
+#: projects.inc:202 projects.inc:241 projects.inc:249
 msgid "Astronomy"
 msgstr ""
 
 #: projects.inc:203
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
+msgid ""
+"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
+"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
+"Universe. We will measure physical parameters (such as stellar mass surface "
+"density, star formation rate surface density, attenuation, and first-order "
+"star formation history) on a resolved pixel-by-pixel basis using spectral "
+"energy distribution (SED) fitting techniques in a distributed computing mode."
 msgstr ""
 
 #: projects.inc:225
 msgid "University of Texas at Austin"
 msgstr ""
 
-#: projects.inc:226
-#: projects.inc:257
+#: projects.inc:226 projects.inc:257
 msgid "Chemistry"
 msgstr ""
 
 #: projects.inc:227
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
+msgid ""
+"A common problem in theoretical chemistry, condensed matter physics and "
+"materials science is the calculation of the time evolution of an atomic "
+"scale system where, for example, chemical reactions and/or diffusion occur. "
+"Generally the events of interest are quite rare (many orders of magnitude "
+"slower than the vibrational movements of the atoms), and therefore direct "
+"simulations, tracking every movement of the atoms, would take thousands of "
+"years of computer calculations on the fastest present day computer before a "
+"single event of interest can be expected to occur.  Our research group is "
+"interested in calculating the long time dynamics of systems."
 msgstr ""
 
 #: projects.inc:240
@@ -227,7 +296,10 @@ msgid "University of Illinois at Urbana-Champaign"
 msgstr ""
 
 #: projects.inc:242
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
+msgid ""
+"The goal of Cosmology at Home is to search for the model that best describes "
+"our Universe and to find the range of models that agree with the available "
+"astronomical particle physics data."
 msgstr ""
 
 #: projects.inc:248
@@ -235,7 +307,10 @@ msgid "Rensselaer Polytechnic Institute"
 msgstr ""
 
 #: projects.inc:250
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
+msgid ""
+"The goal of Milkyway at Home is to create a highly accurate three dimensional "
+"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
+"Survey."
 msgstr ""
 
 #: projects.inc:256
@@ -243,7 +318,13 @@ msgid "Leiden University, The Netherlands"
 msgstr ""
 
 #: projects.inc:258
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
+msgid ""
+"Surface science calculations using Classical Dynamics.  Leiden Classical "
+"allows volunteers, students and other scientist to submit their personal "
+"calculations to the grid. Each user has his own personal queue for Classical "
+"Dynamics jobs. In this way students have used the grid to simulate liquid "
+"argon, or to test the validity of the ideal gas law by actually doing the "
+"simulations through the grid."
 msgstr ""
 
 #: projects.inc:272
@@ -255,25 +336,36 @@ msgid "Astrophysics"
 msgstr ""
 
 #: projects.inc:274
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
+msgid ""
+"Search for spinning neutron stars (also called pulsars) using data from the "
+"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
+"observatory.  Einstein at Home is a World Year of Physics 2005 project "
+"supported by the American Physical Society (APS) and by a number of "
+"international organizations."
 msgstr ""
 
-#: projects.inc:288
-#: projects.inc:296
+#: projects.inc:288 projects.inc:296
 msgid "CERN (European Organization for Nuclear Research)"
 msgstr ""
 
-#: projects.inc:289
-#: projects.inc:297
+#: projects.inc:289 projects.inc:297
 msgid "Physics"
 msgstr ""
 
 #: projects.inc:290
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
+msgid ""
+"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
+"European Organization for Nuclear Research, the world's largest particle "
+"physics laboratory.  It is the most powerful instrument ever built to "
+"investigate on particles proprieties. LHC at home runs simulations to improve "
+"the design of LHC and its detectors."
 msgstr ""
 
 #: projects.inc:298
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
+msgid ""
+"This project uses CERN-developed virtual machine technology for full-fledged "
+"LHC event physics simulation on volunteer computers.  Requires that you "
+"install VirtualBox on your computer"
 msgstr ""
 
 #: projects.inc:304
@@ -285,7 +377,12 @@ msgid "Astrophysics, astrobiology"
 msgstr ""
 
 #: projects.inc:306
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
+msgid ""
+"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
+"goal is to detect intelligent life outside Earth. One approach, known as "
+"radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
+"signals from space. Such signals are not known to occur naturally, so a "
+"detection would provide evidence of extraterrestrial technology."
 msgstr ""
 
 #: projects.inc:320
@@ -297,7 +394,11 @@ msgid "Chemical engineering and nanotechnology"
 msgstr ""
 
 #: projects.inc:322
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
+msgid ""
+"The study of molecular magnets and controlled nanoscale magnetism.  These "
+"magnetic molecules may be used to develop tiny magnetic switches, with "
+"applications in medicine (such as local tumor chemotherapy) and "
+"biotechnology."
 msgstr ""
 
 #: projects.inc:329
@@ -313,7 +414,10 @@ msgid "Physics, biochemistry, and others"
 msgstr ""
 
 #: projects.inc:336
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
+msgid ""
+"The objective of CAS at home is to encourage and assist scientists in China to "
+"adopt the technologies of volunteer computing and volunteer thinking for "
+"their research."
 msgstr ""
 
 #: projects.inc:343
@@ -321,11 +425,12 @@ msgid "Mathematics, physics, evolution"
 msgstr ""
 
 #: projects.inc:344
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
+msgid ""
+"Yoyo at home is an adapter between BOINC and several existing volunteer "
+"computing projects: ECM, Muon, Evolution at home, and distributed.net"
 msgstr ""
 
-#: projects.inc:349
-#: projects.inc:505
+#: projects.inc:349 projects.inc:505
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 msgstr ""
 
@@ -334,7 +439,11 @@ msgid "European research projects"
 msgstr ""
 
 #: projects.inc:351
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
+msgid ""
+"The EDGeS at Home Beta project integrates volunteer computing into the service "
+"grid network of Europe by allowing service grids to send workunits to be "
+"processed by the volunteers of this project. The scientific projects covered "
+"by the project include math, physics, biology, etc."
 msgstr ""
 
 #: projects.inc:357
@@ -358,7 +467,11 @@ msgid "Medical, environmental and other humanitarian research"
 msgstr ""
 
 #: projects.inc:367
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
+msgid ""
+"To further critical non-profit research on some of humanity's most pressing "
+"problems by creating the world's largest volunteer computing grid.  Research "
+"includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"clean water and many more."
 msgstr ""
 
 #: projects.inc:373
@@ -377,21 +490,18 @@ msgstr ""
 msgid "Simulation of quantum computing; Goldbach's conjecture."
 msgstr ""
 
-#: projects.inc:428
-#: projects.inc:436
+#: projects.inc:428 projects.inc:436
 msgid "Cryptography"
 msgstr ""
 
 #: projects.inc:437
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
+msgid ""
+"Attempt to decode 3 original Enigma messages. The signals were intercepted "
+"in the North Atlantic in 1942 and are believed to be unbroken."
 msgstr ""
 
-#: projects.inc:443
-#: projects.inc:482
-#: projects.inc:490
-#: projects.inc:498
-#: projects.inc:506
-#: projects.inc:546
+#: projects.inc:443 projects.inc:482 projects.inc:490 projects.inc:498
+#: projects.inc:506 projects.inc:546
 msgid "Mathematics"
 msgstr ""
 
@@ -408,11 +518,19 @@ msgid "Factorization of large integers"
 msgstr ""
 
 #: projects.inc:451
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
+msgid ""
+"NFS at Home is a research project that uses Internet-connected computers to do "
+"the lattice sieving step in the Number Field Sieve factorization of large "
+"integers. As a young school student, you gained your first experience at "
+"breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
+"NFS at Home is a continuation of that experience, only with integers that are "
+"hundreds of digits long."
 msgstr ""
 
 #: projects.inc:457
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
+msgid ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
 msgstr ""
 
 #: projects.inc:458
@@ -420,7 +538,11 @@ msgid "Software testing"
 msgstr ""
 
 #: projects.inc:459
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
+msgid ""
+"The aim of this project is to provide a powerful distributed computing "
+"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
+"well as others Lithuanian academic institutions.  Current applications "
+"involve the study of Monte-Carlo based software testing."
 msgstr ""
 
 #: projects.inc:481
@@ -428,11 +550,20 @@ msgid "Mathematical Institute of Leiden University / Kennislink"
 msgstr ""
 
 #: projects.inc:483
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
+msgid ""
+"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
+"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
+"product of the distinct prime factors of n. The ABC conjecture says that "
+"there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for "
+"any real h > 1. The ABC conjecture is currently one of the greatest open "
+"problems in mathematics. If it is proven to be true, a lot of other open "
+"problems can be answered directly from it."
 msgstr ""
 
 #: projects.inc:491
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
+msgid ""
+"Primegrid has multiple projects searching for different forms of very large "
+"prime numbers, including searching for the largest known prime number."
 msgstr ""
 
 #: projects.inc:497
@@ -440,11 +571,15 @@ msgid "Hochschule RheinMain University of Applied Sciences"
 msgstr ""
 
 #: projects.inc:499
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
+msgid ""
+"Search for counterexamples to two conjectures related to the identification "
+"of prime numbers"
 msgstr ""
 
 #: projects.inc:507
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
+msgid ""
+"Find all the generalized binary number systems (in which bases are matrices "
+"and digits are vectors) up to dimension 11."
 msgstr ""
 
 #: docutil.php:21
@@ -470,11 +605,17 @@ msgid "%s for %s (%s MB)"
 msgstr ""
 
 #: download.php:87
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others. <p> After installing BOINC on your computer, you can connect it to as many of these projects as you like."
+msgid ""
+"BOINC is a program that lets you donate your idle computer time to science "
+"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, and many others. <p> After installing BOINC on your "
+"computer, you can connect it to as many of these projects as you like."
 msgstr ""
 
 #: download.php:89
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
+msgid ""
+"You may run this software on a computer only if you own the computer or have "
+"the permission of its owner."
 msgstr ""
 
 #: download.php:131
@@ -485,8 +626,7 @@ msgstr ""
 msgid "Release notes"
 msgstr ""
 
-#: download.php:133
-#: index.php:85
+#: download.php:133 index.php:85
 msgid "Help"
 msgstr ""
 
@@ -508,20 +648,34 @@ msgstr ""
 
 #: help.php:12
 #, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
+msgid ""
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who "
+"can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"through the process of installing and using BOINC; %s troubleshoot any "
+"problems you might have."
 msgstr ""
 
 #: help.php:21
 #, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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."
+msgid ""
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. "
+"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 ""
 
 #: help.php:28
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
+msgid ""
+"The best way to get help is by voice, for which you need either built-in "
+"microphone and speakers or an external headset for your computer.  You can "
+"also use Skype's text-based chat system or regular email (if you don't have "
+"Skype) to communicate with Help Volunteers."
 msgstr ""
 
 #: help.php:31
-msgid "Volunteers speaking several languages are available. Please select a language:"
+msgid ""
+"Volunteers speaking several languages are available. Please select a "
+"language:"
 msgstr ""
 
 #: help.php:47
@@ -530,16 +684,22 @@ msgstr ""
 
 #: help.php:50
 #, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
+msgid ""
+"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+"Volunteer%s.  It's a great way to help the cause of scientific research and "
+"volunteer computing - and it's fun!"
 msgstr ""
 
 #: help.php:56
 #, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
+msgid ""
+"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
 msgstr ""
 
 #: help_funcs.php:107
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
+msgid ""
+"BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
+"or the University of California."
 msgstr ""
 
 #: help_funcs.php:110
@@ -590,9 +750,7 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: index.php:86
-#: index.php:123
-#: index.php:174
+#: index.php:86 index.php:123 index.php:174
 msgid "Documentation"
 msgstr ""
 
@@ -606,12 +764,19 @@ msgstr ""
 
 #: index.php:94
 #, php-format
-msgid " Use the idle time on your computer (Windows, Mac, or Linux) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:  %sChoose%s projects  %sDownload%s and run BOINC software  %sEnter%s an email address and password. "
+msgid ""
+" Use the idle time on your computer (Windows, Mac, or Linux) to cure "
+"diseases, study global warming, discover pulsars, and do many other types of "
+"scientific research.  It's safe, secure, and easy:  %sChoose%s projects  "
+"%sDownload%s and run BOINC software  %sEnter%s an email address and "
+"password. "
 msgstr ""
 
 #: index.php:105
 #, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
+msgid ""
+"Or, if you run several projects, try an %saccount manager%s such as "
+"%sGridRepublic%s or %sBAM!%s. "
 msgstr ""
 
 #: index.php:121
@@ -623,11 +788,15 @@ msgid "Software updates"
 msgstr ""
 
 #: index.php:131
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving "
+"you the computing power of thousands of CPUs."
 msgstr ""
 
 #: index.php:135
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
 msgstr ""
 
 #: index.php:140
@@ -704,7 +873,8 @@ msgstr ""
 
 #: index.php:265
 #, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
+msgid ""
+"Open-source software for %svolunteer computing%s and %sgrid computing%s."
 msgstr ""
 
 #: index.php:278
@@ -719,4 +889,3 @@ msgstr ""
 #, php-format
 msgid "News is available as an %sRSS feed%s"
 msgstr ""
-
diff --git a/locale/pl/BOINC-Client.mo b/locale/pl/BOINC-Client.mo
index 222092d..6f47cb1 100644
Binary files a/locale/pl/BOINC-Client.mo and b/locale/pl/BOINC-Client.mo differ
diff --git a/locale/pl/BOINC-Client.po b/locale/pl/BOINC-Client.po
index 08acae3..e411a11 100755
--- a/locale/pl/BOINC-Client.po
+++ b/locale/pl/BOINC-Client.po
@@ -1,23 +1,24 @@
 # 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:
+# Michal Jablonski <jablonski.michal at gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-10-15 22:25-0700\n"
-"PO-Revision-Date: 2015-02-12 00:14-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Taem <boinc_loc at ssl.berkeley.edu>\n"
-"Language: pl\n"
+"PO-Revision-Date: 2015-03-28 09:12+0000\n"
+"Last-Translator: Michal Jablonski <jablonski.michal at gmail.com>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/boinc/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.1.6\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: acct_mgr.cpp:450
-#: acct_mgr.cpp:459
+#: acct_mgr.cpp:450 acct_mgr.cpp:459
 msgid "Message from account manager"
 msgstr "Wiadomość z menedżera kont"
 
@@ -26,7 +27,9 @@ msgid "Message from server"
 msgstr "Wiadomość z serwera"
 
 #: client_state.cpp:258
-msgid "Some tasks need more memory than allowed by your preferences.  Please check the preferences."
+msgid ""
+"Some tasks need more memory than allowed by your preferences.  Please check "
+"the preferences."
 msgstr "Niektóre zadania wymagają więcej pamięci niż ustawiono w preferencjach. Sprawdź preferencje."
 
 #: client_state.cpp:520
@@ -39,11 +42,12 @@ msgstr "Zmienna środowiskowa HTTP_PROXY powinna zawierać 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"
+msgid ""
+"You used the wrong URL for this project.  When convenient, remove this "
+"project, then add %s"
 msgstr "Użyłeś złego adresu URL dla tego projektu. Usuń projekt, a następnie dodaj %s"
 
-#: cs_statefile.cpp:828
-#: ../sched/sched_types.cpp:259
+#: cs_statefile.cpp:828 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
 msgstr "Błąd składni w app_info.xml"
 
@@ -55,18 +59,15 @@ msgstr "Plik, do którego odwołuje się app_info.xml nie istnieje:"
 msgid "A new version of BOINC is available."
 msgstr "Dostępna jest nowa wersja BOINC."
 
-#: current_version.cpp:94
-#: current_version.cpp:102
+#: current_version.cpp:94 current_version.cpp:102
 msgid "Download"
-msgstr ""
+msgstr "Pobieranie"
 
-#: log_flags.cpp:269
-#: log_flags.cpp:449
+#: log_flags.cpp:269 log_flags.cpp:449
 msgid "Unexpected text in cc_config.xml"
 msgstr "Nieoczekiwany tekst w cc_config.xml"
 
-#: log_flags.cpp:423
-#: log_flags.cpp:475
+#: log_flags.cpp:423 log_flags.cpp:475
 msgid "Unrecognized tag in cc_config.xml"
 msgstr "Nierozpoznany znacznik w cc_config.xml"
 
@@ -91,7 +92,9 @@ msgid "Invalid code signing key.  To fix, remove and add this project."
 msgstr "Nieprawidłowy klucz podpisujący kod. Aby rozwiązać problem, usuń a następnie dodaj ten projekt."
 
 #: ../sched/handle_request.cpp:859
-msgid "The project has changed its security key.  Please remove and add this project."
+msgid ""
+"The project has changed its security key.  Please remove and add this "
+"project."
 msgstr "Projekt zmienił swój klucz zabezpieczeń. Usuń a następnie dodaj ten projekt."
 
 #: ../sched/handle_request.cpp:943
@@ -103,7 +106,8 @@ msgid "This project doesn't support CPU type"
 msgstr "Ten projekt nie wspiera typu procesora"
 
 #: ../sched/handle_request.cpp:993
-msgid "Your BOINC client software is too old.  Please install the current version."
+msgid ""
+"Your BOINC client software is too old.  Please install the current version."
 msgstr "Zainstalowany klient BOINC jest zbyt stary. Zainstaluj najnowszą wersję."
 
 #: ../sched/handle_request.cpp:1259
@@ -111,22 +115,25 @@ msgid "This project doesn't support computers of type"
 msgstr "Ten projekt nie wspiera komputerów typu"
 
 #: ../sched/sched_send.cpp:1092
-msgid "Upgrade to the latest driver to process tasks using your computer's GPU"
+msgid ""
+"Upgrade to the latest driver to process tasks using your computer's GPU"
 msgstr "Zaktualizuj sterowniki do najnowszych, aby użyć do obliczeń GPU"
 
 #: ../sched/sched_send.cpp:1099
-msgid "Upgrade to the latest driver to use all of this project's GPU applications"
+msgid ""
+"Upgrade to the latest driver to use all of this project's GPU applications"
 msgstr "Zainstaluj najnowsze sterowniki do karty graficznej, aby uruchomić wszystkie aplikacje GPU tego projektu"
 
 #: ../sched/sched_send.cpp:1118
-msgid "A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to the current version"
+msgid ""
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to"
+" the current version"
 msgstr "Nowsza wersja klienta BOINC jest potrzebna, aby wykorzystać twoją kartę NVIDIA. Uaktualnij program do najnowszej wersji."
 
-# 94%
 #: ../sched/sched_send.cpp:1146
 #, c-format
 msgid "An %s GPU is required to run tasks for this project"
-msgstr ""
+msgstr "%s GPU jest wymagane do obliczeń w tym projekcie"
 
 #: ../sched/sched_send.cpp:1262
 msgid "No tasks are available for the applications you have selected."
@@ -142,8 +149,9 @@ msgstr "Wymagana jest nowsza wersja klienta BOINC. Zainstaluj najnowszą wersję
 
 #: ../sched/sched_send.cpp:1305
 #, c-format
-msgid "Tasks for %s are available, but your preferences are set to not accept them"
-msgstr ""
+msgid ""
+"Tasks for %s are available, but your preferences are set to not accept them"
+msgstr "Zadania dla %s są dostępne, ale nie są akceptowane z powodu Twoich ustawień"
 
 #: ../sched/sched_types.cpp:254
 msgid "Unknown app name in app_info.xml"
@@ -152,38 +160,3 @@ msgstr "Nieznana nazwa aplikacji w app_info.xml"
 #: ../sched/sched_version.cpp:214
 msgid "Your app_info.xml file doesn't have a usable version of"
 msgstr "Twój plik app_info.xml nie posiada użytecznej wersji"
-
-#~ msgid "Download it."
-#~ msgstr "Pobierz."
-#~ msgid "An NVIDIA or ATI GPU is required to run tasks for this project"
-#~ msgstr ""
-#~ "Karta graficzna NVIDIA lub ATI jest wymagana aby uruchamiać zadania z tego "
-#~ "projektu"
-#~ msgid "An NVIDIA GPU is required to run tasks for this project"
-#~ msgstr ""
-#~ "Karta graficzna NVIDIA jest wymagana aby uruchamiać zadania z tego projektu"
-#~ msgid "An ATI GPU is required to run tasks for this project"
-#~ msgstr ""
-#~ "Karta graficzna ATI jest wymagana aby uruchamiać zadania z tego projektu"
-#~ msgid ""
-#~ "Tasks for NVIDIA GPU are available, but your preferences are set to not "
-#~ "accept them"
-#~ msgstr ""
-#~ "Dostępne są zadania dla karty NVIDIA, ale w preferencjach ustawiłeś, aby nie "
-#~ "były uruchamiane"
-#~ msgid ""
-#~ "Tasks for ATI GPU are available, but your preferences are set to not accept "
-#~ "them"
-#~ msgstr ""
-#~ "Dostępne są zadania dla karty ATI, ale w preferencjach ustawiłeś, aby nie "
-#~ "były uruchamiane"
-#~ msgid ""
-#~ "Tasks for CPU are available, but your preferences are set to not accept them"
-#~ msgstr ""
-#~ "Dostępne są zadania dla procesora, ale w preferencjach ustawiłeś, aby nie "
-#~ "były uruchamiane"
-#~ msgid "error"
-#~ msgstr "błąd"
-#~ msgid "XML syntax error in"
-#~ msgstr "Błąd składni XML w "
-
diff --git a/locale/pl/BOINC-Manager.mo b/locale/pl/BOINC-Manager.mo
index daf4e8e..35289f7 100644
Binary files a/locale/pl/BOINC-Manager.mo and b/locale/pl/BOINC-Manager.mo differ
diff --git a/locale/pl/BOINC-Manager.po b/locale/pl/BOINC-Manager.po
index 1ce2e65..5447db0 100755
--- a/locale/pl/BOINC-Manager.po
+++ b/locale/pl/BOINC-Manager.po
@@ -4,33 +4,36 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: BOINC Manager 6.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-15 14:15-0500\n"
-"PO-Revision-Date: 2015-02-12 00:17-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
+"POT-Creation-Date: 2014-02-02 00:00-0800\n"
+"PO-Revision-Date: 2013-01-20 16:11+0000\n"
+"Last-Translator: Pawel <pawel.pbm at gmail.com>\n"
 "Language-Team: Ruch Oporu Sekcja Badawcza <marekz at irc.pl>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Pootle 2.5.0\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc_7.4\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1358698319.0\n"
 "X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-SearchPath-0: clientgui\n"
 "X-Poedit-SearchPath-1: clientgui/msw\n"
 "X-Poedit-SearchPath-2: clientgui/gtk\n"
 "X-Poedit-SearchPath-3: clientgui/mac\n"
+"X-Poedit-SearchPath-0: clientgui\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\n"
+"X-POOTLE-MTIME: 1358698319.0\n"
 
 # 81%
-#: clientgui/AccountInfoPage.cpp:387
+#: AccountInfoPage.cpp:387
 #, c-format
+#, c-format, fuzzy
 msgid "Identify your account at %s"
-msgstr ""
+msgstr "Zidentyfikuj swoje konto"
 
-#: clientgui/AccountInfoPage.cpp:393
+#: AccountInfoPage.cpp:393
 msgid ""
 "Please enter your account information\n"
 "(to create an account, visit the project's web site)"
@@ -38,7 +41,7 @@ msgstr ""
 "Wprowadź informacje dotyczące twojego konta.\n"
 "(aby utworzyć konto odwiedź stronę internetową projektu)"
 
-#: clientgui/AccountInfoPage.cpp:397
+#: AccountInfoPage.cpp:397
 msgid ""
 "This project is not currently accepting new accounts.\n"
 "You can add it only if you already have an account."
@@ -46,19 +49,19 @@ msgstr ""
 "W projekcie nie można w tej chwili tworzyć nowych kont.\n"
 "Możesz go dodać tylko jeśli posiadasz już w nim konto."
 
-#: clientgui/AccountInfoPage.cpp:401
+#: AccountInfoPage.cpp:401
 msgid "Are you already running this project?"
 msgstr "Czy uczestniczysz już w tym projekcie?"
 
-#: clientgui/AccountInfoPage.cpp:405
+#: AccountInfoPage.cpp:405
 msgid "&No, new user"
 msgstr "&Nie, nowy uczestnik"
 
-#: clientgui/AccountInfoPage.cpp:408
+#: AccountInfoPage.cpp:408
 msgid "&Yes, existing user"
 msgstr "&Tak, istniejący uczestnik"
 
-#: clientgui/AccountInfoPage.cpp:413
+#: AccountInfoPage.cpp:413
 msgid ""
 "We were not able to set up your account information\n"
 "automatically.\n"
@@ -74,51 +77,45 @@ msgstr ""
 "aby ustalić co należy wpisać\n"
 "w pola adresu e-mail oraz hasła."
 
-#: clientgui/AccountInfoPage.cpp:416
+#: AccountInfoPage.cpp:416
 msgid "Find login information"
 msgstr "Znajdź informacje logowania"
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:649
+#: AccountInfoPage.cpp:436 AccountInfoPage.cpp:641
 msgid "&Password:"
 msgstr "&Hasło:"
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:673
+#: AccountInfoPage.cpp:443 AccountInfoPage.cpp:665
 msgid "Choose a &password:"
 msgstr "Podaj &hasło:"
 
-#: clientgui/AccountInfoPage.cpp:446
+#: AccountInfoPage.cpp:446
 msgid "C&onfirm password:"
 msgstr "P&otwierdź hasło:"
 
-#: clientgui/AccountInfoPage.cpp:453
+#: AccountInfoPage.cpp:453
 #, c-format
 msgid "Are you already running %s?"
 msgstr "Czy uczestniczysz już w %s?"
 
-#: clientgui/AccountInfoPage.cpp:482
+#: AccountInfoPage.cpp:482
 msgid "&Username:"
 msgstr "&Nazwa użytkownika:"
 
-#: clientgui/AccountInfoPage.cpp:511
-msgid "&Email address or LDAP ID:"
-msgstr ""
-
-#: clientgui/AccountInfoPage.cpp:515
+#: AccountInfoPage.cpp:508
 msgid "&Email address:"
 msgstr "Adres &e-mail:"
 
-#: clientgui/AccountInfoPage.cpp:523
+#: AccountInfoPage.cpp:515
 #, c-format
 msgid "minimum length %d"
 msgstr "minimalna długość %d"
 
-#: clientgui/AccountInfoPage.cpp:530
+#: AccountInfoPage.cpp:522
 msgid "Forgot your password?"
 msgstr "Zapomniałeś hasła?"
 
-#: clientgui/AccountInfoPage.cpp:537
+#: AccountInfoPage.cpp:529
 msgid ""
 "If you have not yet registered with this account manager,\n"
 "please do so before proceeding.  Click on the link below\n"
@@ -128,46 +125,47 @@ msgstr ""
 " zrób to przed przejściem dalej. Kliknij poniższy link\n"
 " aby się zarejestrować albo odzyskać zapomniane hasło."
 
-#: clientgui/AccountInfoPage.cpp:540
+#: AccountInfoPage.cpp:532
 #, fuzzy
 msgid "Account manager web site"
 msgstr "Strona internetowa menadżera kont"
 
-#: clientgui/AccountInfoPage.cpp:582
+#: AccountInfoPage.cpp:574 WelcomePage.cpp:348
 msgid "Add project"
 msgstr "Dodaj projekt"
 
-#: clientgui/AccountInfoPage.cpp:584
+#: AccountInfoPage.cpp:576
 msgid "Update account manager"
 msgstr "Uaktualnij menadżera kont"
 
-#: clientgui/AccountInfoPage.cpp:586
+#: AccountInfoPage.cpp:578 WelcomePage.cpp:307 WelcomePage.cpp:321
 msgid "Use account manager"
 msgstr "Użyj menadżera kont"
 
-#: clientgui/AccountInfoPage.cpp:593
+#: AccountInfoPage.cpp:585
 msgid "Please enter a user name."
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:595
+#: AccountInfoPage.cpp:587
 #, fuzzy
 msgid "Please enter an email address."
 msgstr "Podaj adres e-mail"
 
-#: clientgui/AccountInfoPage.cpp:605
+#: AccountInfoPage.cpp:597
 #, c-format
 msgid "Please enter a password of at least %d characters."
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:615
-msgid "The password and confirmation password do not match. Please type them again."
+#: AccountInfoPage.cpp:607
+msgid ""
+"The password and confirmation password do not match. Please type them again."
 msgstr "Wprowadzone hasła nie są identyczne. Wprowadź je ponownie."
 
-#: clientgui/AccountManagerInfoPage.cpp:272
+#: AccountManagerInfoPage.cpp:272
 msgid "Choose an account manager"
 msgstr "Wybierz menedżera kont"
 
-#: clientgui/AccountManagerInfoPage.cpp:275
+#: AccountManagerInfoPage.cpp:275
 msgid ""
 "To choose an account manager, click its name or \n"
 "type its URL below."
@@ -175,398 +173,393 @@ msgstr ""
 "Aby wybrać menedżera kont kliknij jego nazwę, albo \n"
 " wpisz jego adres URL poniżej."
 
-#: clientgui/AccountManagerInfoPage.cpp:279
+#: AccountManagerInfoPage.cpp:279
 #, fuzzy
 msgid "Account manager details:"
 msgstr "Strona internetowa menadżera kont"
 
-#: clientgui/AccountManagerInfoPage.cpp:283
+#: AccountManagerInfoPage.cpp:283
 #, fuzzy
 msgid "Account manager &URL:"
 msgstr "Adres &URL menadżera kont:"
 
-#: clientgui/AccountManagerInfoPage.cpp:287
+#: AccountManagerInfoPage.cpp:287
 msgid "Open web page"
 msgstr ""
 
-#: clientgui/AccountManagerInfoPage.cpp:290
+#: AccountManagerInfoPage.cpp:290
 msgid "Visit this account manager's web site"
 msgstr ""
 
-#: clientgui/AccountManagerProcessingPage.cpp:186
-#: clientgui/AccountManagerPropertiesPage.cpp:192
+#: AccountManagerProcessingPage.cpp:187 AccountManagerPropertiesPage.cpp:193
 #, c-format
 msgid "Communicating with %s."
 msgstr "Trwa łączenie z %s."
 
-#: clientgui/AccountManagerProcessingPage.cpp:193
-#: clientgui/AccountManagerPropertiesPage.cpp:199
+#: AccountManagerProcessingPage.cpp:194 AccountManagerPropertiesPage.cpp:200
 msgid "Communicating with server."
 msgstr "Trwa wymiana informacji z serwerem."
 
-#: clientgui/AccountManagerProcessingPage.cpp:198
-#: clientgui/AccountManagerPropertiesPage.cpp:204
+#: AccountManagerProcessingPage.cpp:199 AccountManagerPropertiesPage.cpp:205
 msgid "Please wait..."
 msgstr "Czekaj..."
 
-#: clientgui/AccountManagerProcessingPage.cpp:325
+#: AccountManagerProcessingPage.cpp:326
 msgid "An internal server error has occurred.\n"
 msgstr "Nastąpił wewnętrzny błąd serwera.\n"
 
-#: clientgui/AdvancedFrame.cpp:96
+#: AdvancedFrame.cpp:95
 msgid "Connected"
 msgstr "Połączony"
 
-#: clientgui/AdvancedFrame.cpp:104
+#: AdvancedFrame.cpp:103
 msgid "Disconnected"
 msgstr "Rozłączony"
 
-#: clientgui/AdvancedFrame.cpp:318
+#: AdvancedFrame.cpp:322 sg_BoincSimpleFrame.cpp:119
 #, c-format
 msgid "Close the %s window"
 msgstr "Zamknij okno %s"
 
-#: clientgui/AdvancedFrame.cpp:321
+#: AdvancedFrame.cpp:325 sg_BoincSimpleFrame.cpp:122
 msgid "&Close Window"
 msgstr "&Zamknij okno"
 
-#: clientgui/AdvancedFrame.cpp:332
-#: clientgui/AdvancedFrame.cpp:339
-#: clientgui/AdvancedFrame.cpp:346
+#: AdvancedFrame.cpp:336 AdvancedFrame.cpp:343 AdvancedFrame.cpp:350
 #, c-format
 msgid "Exit %s"
 msgstr "Zamknij %s"
 
-#: clientgui/AdvancedFrame.cpp:359
-msgid "Preferences..."
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:368
+#: AdvancedFrame.cpp:371
 msgid "&Notices\tCtrl+Shift+N"
 msgstr "&Powiadomienia\tCtrl+Shift+N"
 
-#: clientgui/AdvancedFrame.cpp:369
+#: AdvancedFrame.cpp:372
 msgid "Display notices"
 msgstr "Pokaż powiadomienia"
 
-#: clientgui/AdvancedFrame.cpp:374
+#: AdvancedFrame.cpp:377
 msgid "&Projects\tCtrl+Shift+P"
 msgstr "&Projekty\tCtrl+Shift+P"
 
-#: clientgui/AdvancedFrame.cpp:375
+#: AdvancedFrame.cpp:378
 msgid "Display projects"
 msgstr "Pokaż projekty"
 
-#: clientgui/AdvancedFrame.cpp:380
+#: AdvancedFrame.cpp:383
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr "&Zadania\tCtrl+Shift+T"
 
-#: clientgui/AdvancedFrame.cpp:381
+#: AdvancedFrame.cpp:384
 msgid "Display tasks"
 msgstr "Pokaż zadania"
 
-#: clientgui/AdvancedFrame.cpp:386
+#: AdvancedFrame.cpp:389
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr "Przesyła&nie\tCtrl+Shift+X"
 
-#: clientgui/AdvancedFrame.cpp:387
+#: AdvancedFrame.cpp:390
 msgid "Display transfers"
 msgstr "Pokaż przesyłane dane"
 
-#: clientgui/AdvancedFrame.cpp:392
+#: AdvancedFrame.cpp:395
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "&Statystyki\tCtrl+Shift+S"
 
-#: clientgui/AdvancedFrame.cpp:393
+#: AdvancedFrame.cpp:396
 msgid "Display statistics"
 msgstr "Pokaż statystyki"
 
-#: clientgui/AdvancedFrame.cpp:398
+#: AdvancedFrame.cpp:401
 msgid "&Disk usage\tCtrl+Shift+D"
 msgstr "&Użycie dysku\tCtrl+Shift+D"
 
-#: clientgui/AdvancedFrame.cpp:399
+#: AdvancedFrame.cpp:402
 msgid "Display disk usage"
 msgstr "Pokaż użycie dysku"
 
-#: clientgui/AdvancedFrame.cpp:406
+#: AdvancedFrame.cpp:409
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr "Widok uproszczony...\tCtrl+Shift+V"
 
-#: clientgui/AdvancedFrame.cpp:407
+#: AdvancedFrame.cpp:410
 msgid "Display the simple graphical interface."
 msgstr "Przełącz do widoku uproszczonego."
 
-#: clientgui/AdvancedFrame.cpp:421
+#: AdvancedFrame.cpp:424
 msgid "&Add project or account manager..."
 msgstr "&Dodaj projekt lub menadżera kont..."
 
-#: clientgui/AdvancedFrame.cpp:422
+#: AdvancedFrame.cpp:425 sg_ProjectPanel.cpp:76
 msgid "Volunteer for any or all of 30+ projects in many areas of science"
 msgstr "Uczestnicz w którymś z ponad 30 projektów w wielu dziedzinach nauki"
 
-#: clientgui/AdvancedFrame.cpp:426
+#: AdvancedFrame.cpp:429
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "&Zsynchronizuj z %s"
 
-#: clientgui/AdvancedFrame.cpp:430
+#: AdvancedFrame.cpp:433
 #, c-format
 msgid "Get current settings from %s"
 msgstr "Pobierz aktualne ustawienia z %s"
 
-#: clientgui/AdvancedFrame.cpp:440
+#: AdvancedFrame.cpp:443
 msgid "&Add project..."
 msgstr "&Dodaj projekt..."
 
-#: clientgui/AdvancedFrame.cpp:441
+#: AdvancedFrame.cpp:444
 msgid "Add a project"
 msgstr "Dodaj projekt"
 
-#: clientgui/AdvancedFrame.cpp:444
+#: AdvancedFrame.cpp:447
 #, c-format
 msgid "S&top using %s..."
 msgstr "&Przestań używać %s..."
 
-#: clientgui/AdvancedFrame.cpp:450
+#: AdvancedFrame.cpp:453
 msgid "Remove this computer from account manager control."
 msgstr "Usuń ten komputer z menadżera kont."
 
-#: clientgui/AdvancedFrame.cpp:455
+#: AdvancedFrame.cpp:458 sg_BoincSimpleFrame.cpp:178
 msgid "&Options..."
 msgstr "&Ustawienia..."
 
-#: clientgui/AdvancedFrame.cpp:456
+#: AdvancedFrame.cpp:459 sg_BoincSimpleFrame.cpp:179
 msgid "Configure display options and proxy settings"
 msgstr "Konfiguracja opcji wyglądu i ustawień serwera proxy"
 
-#: clientgui/AdvancedFrame.cpp:460
+#: AdvancedFrame.cpp:463 sg_BoincSimpleFrame.cpp:172
 msgid "Computing &preferences..."
 msgstr "&Preferencje przetwarzania..."
 
-#: clientgui/AdvancedFrame.cpp:461
+#: AdvancedFrame.cpp:464 sg_BoincSimpleFrame.cpp:173
 msgid "Configure computing preferences"
 msgstr "Konfiguracja opcji przetwarzania"
 
-#: clientgui/AdvancedFrame.cpp:469
+#: AdvancedFrame.cpp:472
 msgid "&Run always"
 msgstr "&Uruchamiaj zawsze"
 
-#: clientgui/AdvancedFrame.cpp:470
+#: AdvancedFrame.cpp:473
 msgid "Allow work regardless of preferences"
-msgstr "Przetwarzanie danych bez względu na ograniczenia wynikające z preferencji"
+msgstr ""
+"Przetwarzanie danych bez względu na ograniczenia wynikające z preferencji"
 
-#: clientgui/AdvancedFrame.cpp:474
+#: AdvancedFrame.cpp:477
 msgid "Run based on &preferences"
 msgstr "Uruchamiaj zgodnie z &preferencjami"
 
-#: clientgui/AdvancedFrame.cpp:475
+#: AdvancedFrame.cpp:478
 msgid "Allow work according to preferences"
-msgstr "Przetwarzanie danych zgodnie z ograniczeniami wynikającymi z preferencji"
+msgstr ""
+"Przetwarzanie danych zgodnie z ograniczeniami wynikającymi z preferencji"
 
-#: clientgui/AdvancedFrame.cpp:479
+#: AdvancedFrame.cpp:482
 msgid "&Suspend"
 msgstr "&Wstrzymaj"
 
-#: clientgui/AdvancedFrame.cpp:480
+#: AdvancedFrame.cpp:483
 msgid "Stop work regardless of preferences"
 msgstr "Wstrzymanie przetwarzania danych"
 
-#: clientgui/AdvancedFrame.cpp:505
+#: AdvancedFrame.cpp:508
 msgid "Use GPU always"
 msgstr "Zawsze używaj karty graficznej"
 
-#: clientgui/AdvancedFrame.cpp:506
+#: AdvancedFrame.cpp:509
 msgid "Allow GPU work regardless of preferences"
-msgstr "Przetwarzanie danych przy użyciu karty graficznej bez względu na ograniczenia wynikające z preferencji"
+msgstr ""
+"Przetwarzanie danych przy użyciu karty graficznej bez względu na "
+"ograniczenia wynikające z preferencji"
 
-#: clientgui/AdvancedFrame.cpp:510
+#: AdvancedFrame.cpp:513
 msgid "Use GPU based on preferences"
 msgstr "Używaj karty graficznej zgodnie z preferencjami"
 
-#: clientgui/AdvancedFrame.cpp:511
+#: AdvancedFrame.cpp:514
 msgid "Allow GPU work according to preferences"
-msgstr "Przetwarzanie danych z użyciem karty graficznej zgodnie z ograniczeniami wynikającymi z preferencji"
+msgstr ""
+"Przetwarzanie danych z użyciem karty graficznej zgodnie z ograniczeniami "
+"wynikającymi z preferencji"
 
-#: clientgui/AdvancedFrame.cpp:515
+#: AdvancedFrame.cpp:518
 msgid "Suspend GPU"
 msgstr "Wstrzymaj używanie karty graficznej"
 
-#: clientgui/AdvancedFrame.cpp:516
+#: AdvancedFrame.cpp:519
 msgid "Stop GPU work regardless of preferences"
-msgstr "Wstrzymanie przetwarzania danych przez kartę graficzną bez względu na ustawienia preferencji"
+msgstr ""
+"Wstrzymanie przetwarzania danych przez kartę graficzną bez względu na "
+"ustawienia preferencji"
 
-#: clientgui/AdvancedFrame.cpp:540
+#: AdvancedFrame.cpp:543
 msgid "Network activity always available"
 msgstr "&Sieć zawsze dostępna"
 
-#: clientgui/AdvancedFrame.cpp:541
+#: AdvancedFrame.cpp:544
 msgid "Allow network activity regardless of preferences"
-msgstr "Sieć zawsze dostępna bez względu na ograniczenia wynikające z preferencji"
+msgstr ""
+"Sieć zawsze dostępna bez względu na ograniczenia wynikające z preferencji"
 
-#: clientgui/AdvancedFrame.cpp:545
+#: AdvancedFrame.cpp:548
 msgid "Network activity based on preferences"
 msgstr "Dostęp do sieci zgodnie z &preferencjami"
 
-#: clientgui/AdvancedFrame.cpp:546
+#: AdvancedFrame.cpp:549
 msgid "Allow network activity according to preferences"
 msgstr "Sieć dostępna zgodnie z ograniczeniami wynikającymi z preferencji."
 
-#: clientgui/AdvancedFrame.cpp:550
+#: AdvancedFrame.cpp:553
 msgid "Network activity suspended"
 msgstr "Zablokuj dostęp do sieci"
 
-#: clientgui/AdvancedFrame.cpp:551
+#: AdvancedFrame.cpp:554
 msgid "Stop BOINC network activity"
 msgstr "Wstrzymaj wykorzystanie sieci przez BOINC"
 
-#: clientgui/AdvancedFrame.cpp:561
+#: AdvancedFrame.cpp:564
 #, c-format
 msgid "Connect to another computer running %s"
 msgstr "Połącz z innym komputerem używającym %s"
 
-#: clientgui/AdvancedFrame.cpp:566
+#: AdvancedFrame.cpp:569
 msgid "Select computer..."
 msgstr "Wybierz komputer..."
 
-#: clientgui/AdvancedFrame.cpp:571
+#: AdvancedFrame.cpp:574
 msgid "Shut down connected client..."
 msgstr "Zamknij podłączonego klienta..."
 
-#: clientgui/AdvancedFrame.cpp:572
+#: AdvancedFrame.cpp:575
 msgid "Shut down the currently connected client"
 msgstr "Zamyka obecnie podłączonego klienta BOINC"
 
-#: clientgui/AdvancedFrame.cpp:576
+#: AdvancedFrame.cpp:579
 msgid "Run CPU &benchmarks"
 msgstr "Uruchom miernik &wydajności procesora"
 
-#: clientgui/AdvancedFrame.cpp:577
+#: AdvancedFrame.cpp:580
 msgid "Runs BOINC CPU benchmarks"
 msgstr "Uruchomienie miernika wydajności procesora"
 
-#: clientgui/AdvancedFrame.cpp:581
+#: AdvancedFrame.cpp:584
 msgid "Do network communication"
 msgstr "Ponów próby połączeń"
 
-#: clientgui/AdvancedFrame.cpp:582
+#: AdvancedFrame.cpp:585
 msgid "Do all pending network communication"
 msgstr "Ponów komunikację sieciową"
 
 # 94%
-#: clientgui/AdvancedFrame.cpp:586
+#: AdvancedFrame.cpp:589
 #, fuzzy
 msgid "Read config files"
 msgstr "Wczytaj plik konfiguracyjny"
 
-#: clientgui/AdvancedFrame.cpp:587
+#: AdvancedFrame.cpp:590
 msgid "Read configuration info from cc_config.xml and any app_config.xml files"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:591
+#: AdvancedFrame.cpp:594
 msgid "Read local prefs file"
 msgstr "Wczytaj plik preferencji lokalnych"
 
-#: clientgui/AdvancedFrame.cpp:592
+#: AdvancedFrame.cpp:595
 msgid "Read preferences from global_prefs_override.xml."
-msgstr "Wczytywanie konfiguracji zawartej w pliku preferencji lokalnych global_prefs_override.xml."
+msgstr ""
+"Wczytywanie konfiguracji zawartej w pliku preferencji lokalnych "
+"global_prefs_override.xml."
 
-#: clientgui/AdvancedFrame.cpp:597
+#: AdvancedFrame.cpp:600
 #, c-format
 msgid "Launch another instance of %s..."
 msgstr "Uruchom kolejną instancję %s..."
 
-#: clientgui/AdvancedFrame.cpp:601
+#: AdvancedFrame.cpp:604
 #, c-format
 msgid "Launch another %s"
 msgstr "Uruchom kolejnego %s"
 
-#: clientgui/AdvancedFrame.cpp:611
+#: AdvancedFrame.cpp:614
 msgid "Event Log...\tCtrl+Shift+E"
 msgstr "Dziennik zdarzeń...\t Ctrl+Shift+E"
 
-#: clientgui/AdvancedFrame.cpp:612
+#: AdvancedFrame.cpp:615
 msgid "Display diagnostic messages."
 msgstr "Pokaż informacje diagnostyczne."
 
-#: clientgui/AdvancedFrame.cpp:616
-msgid "Event Log Diagnostic Flags...\tCtrl+Shift+F"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:617
-msgid "Enable or disable various diagnostic messages"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:626
+#: AdvancedFrame.cpp:625 sg_BoincSimpleFrame.cpp:188
 #, c-format
 msgid "%s &help"
 msgstr "%s - pomoc on-line"
 
-#: clientgui/AdvancedFrame.cpp:632
+#: AdvancedFrame.cpp:631 sg_BoincSimpleFrame.cpp:194
 #, c-format
 msgid "Show information about %s"
 msgstr "Pokaż informacje on-line na temat %s"
 
-#: clientgui/AdvancedFrame.cpp:644
+#: AdvancedFrame.cpp:643
 #, c-format
 msgid "&%s help"
 msgstr "&%s - pomoc on-line"
 
-#: clientgui/AdvancedFrame.cpp:650
+#: AdvancedFrame.cpp:649 sg_BoincSimpleFrame.cpp:212
 #, c-format
 msgid "Show information about the %s"
 msgstr "Pokaż informacje on-line na temat %s"
 
-#: clientgui/AdvancedFrame.cpp:662
+#: AdvancedFrame.cpp:661 sg_BoincSimpleFrame.cpp:224
 #, c-format
+#, c-format, fuzzy
 msgid "%s &web site"
 msgstr "&Strona główna projektu %s"
 
-#: clientgui/AdvancedFrame.cpp:668
+#: AdvancedFrame.cpp:667 sg_BoincSimpleFrame.cpp:230
 #, c-format
 msgid "Show information about BOINC and %s"
 msgstr "Pokaż informacje o BOINC oraz %s"
 
-#: clientgui/AdvancedFrame.cpp:680
-#: clientgui/BOINCTaskBar.cpp:544
+#: AdvancedFrame.cpp:679 BOINCTaskBar.cpp:530 sg_BoincSimpleFrame.cpp:242
 #, c-format
 msgid "&About %s..."
 msgstr "&O %s..."
 
-#: clientgui/AdvancedFrame.cpp:686
+#: AdvancedFrame.cpp:685 sg_BoincSimpleFrame.cpp:248
 msgid "Licensing and copyright information."
 msgstr "Informacje dotyczące licencji oraz praw autorskich."
 
-#: clientgui/AdvancedFrame.cpp:693
+#: AdvancedFrame.cpp:692 sg_BoincSimpleFrame.cpp:255
 msgid "&File"
 msgstr "&Plik"
 
-#: clientgui/AdvancedFrame.cpp:697
+#: AdvancedFrame.cpp:696 sg_BoincSimpleFrame.cpp:259
 msgid "&View"
 msgstr "&Widok"
 
-#: clientgui/AdvancedFrame.cpp:701
+#: AdvancedFrame.cpp:700 sg_BoincSimpleFrame.cpp:263
 msgid "&Tools"
 msgstr "&Opcje"
 
-#: clientgui/AdvancedFrame.cpp:705
+#: AdvancedFrame.cpp:704
 msgid "&Activity"
 msgstr "&Aktywność"
 
-#: clientgui/AdvancedFrame.cpp:709
+#: AdvancedFrame.cpp:708
 msgid "A&dvanced"
 msgstr "&Zaawansowane"
 
-#: clientgui/AdvancedFrame.cpp:713
+#: AdvancedFrame.cpp:712 DlgEventLog.cpp:332 sg_BoincSimpleFrame.cpp:267
+#: wizardex.cpp:374 wizardex.cpp:381
 msgid "&Help"
 msgstr "&Pomoc"
 
-#: clientgui/AdvancedFrame.cpp:1185
+#: AdvancedFrame.cpp:1199
 #, c-format
 msgid "%s - Stop using %s"
 msgstr "%s - Przestań używać %s"
 
-#: clientgui/AdvancedFrame.cpp:1190
+#: AdvancedFrame.cpp:1204
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -581,12 +574,12 @@ msgstr ""
 "\n"
 "Czy chcesz przestać używać %s?"
 
-#: clientgui/AdvancedFrame.cpp:1397
+#: AdvancedFrame.cpp:1401
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s - Zamknij obecnie używanego klienta..."
 
-#: clientgui/AdvancedFrame.cpp:1406
+#: AdvancedFrame.cpp:1410
 #, c-format
 msgid ""
 "%s will shut down the current client\n"
@@ -595,36 +588,37 @@ msgstr ""
 "%s zamknie obecnie podłączonego klienta,\n"
 "i zapyta o nowego hosta do którego ma się podłączyć."
 
-#: clientgui/AdvancedFrame.cpp:1806
+#: AdvancedFrame.cpp:1745 DlgAbout.cpp:119
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: clientgui/AdvancedFrame.cpp:1815
+#: AdvancedFrame.cpp:1754
 #, c-format
+#, c-format, c-format
 msgid "%s has successfully added %s"
 msgstr "%s został pomyślnie dołączony do %s"
 
-#: clientgui/AdvancedFrame.cpp:1953
+#: AdvancedFrame.cpp:1893
 #, c-format
 msgid "%s - (%s)"
 msgstr "%s - (%s)"
 
-#: clientgui/AdvancedFrame.cpp:1957
+#: AdvancedFrame.cpp:1897
 #, c-format
 msgid "Connecting to %s"
 msgstr "Łączenie z %s"
 
-#: clientgui/AdvancedFrame.cpp:1960
+#: AdvancedFrame.cpp:1900
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "Połączony z %s (%s)"
 
-#: clientgui/AlreadyExistsPage.cpp:184
+#: AlreadyExistsPage.cpp:184
 msgid "Username already in use"
 msgstr "Wybrana nazwa użytkownika jest już zajęta"
 
-#: clientgui/AlreadyExistsPage.cpp:187
+#: AlreadyExistsPage.cpp:187
 msgid ""
 "An account with that username already exists and has a\n"
 "different password than the one you entered.\n"
@@ -636,11 +630,11 @@ msgstr ""
 "\n"
 "Odwiedź stronę projektu i postepuj zgodnie z podanymi tam instrukcjami."
 
-#: clientgui/AlreadyExistsPage.cpp:191
+#: AlreadyExistsPage.cpp:191
 msgid "Email address already in use"
 msgstr "Podany adres e-mail jest już używany"
 
-#: clientgui/AlreadyExistsPage.cpp:194
+#: AlreadyExistsPage.cpp:194
 msgid ""
 "An account with that email address already exists and has a\n"
 "different password than the one you entered.\n"
@@ -652,64 +646,68 @@ msgstr ""
 "\n"
 "Odwiedź stronę projektu i postępuj zgodnie z podanymi tam instrukcjami."
 
-#: clientgui/AsyncRPC.cpp:1031
+#: AsyncRPC.cpp:1031
 msgid "Communicating with BOINC client.  Please wait ..."
 msgstr "Nawiązywanie połączenia z klientem BOINC. Proszę czekać..."
 
-#: clientgui/AsyncRPC.cpp:1034
+#: AsyncRPC.cpp:1034
 #, c-format
 msgid "&Quit %s"
 msgstr "Opuść %s"
 
-#: clientgui/AsyncRPC.cpp:1036
+#: AsyncRPC.cpp:1036
 #, c-format
 msgid "E&xit %s"
 msgstr "Zamknij %s"
 
-#: clientgui/AsyncRPC.cpp:1040
+#: AsyncRPC.cpp:1040
 #, c-format
 msgid "%s - Communication"
 msgstr "%s - Komunikacja"
 
-#: clientgui/AsyncRPC.cpp:1056
+#: AsyncRPC.cpp:1056 DlgAdvPreferencesBase.cpp:107 sg_DlgPreferences.cpp:433
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: clientgui/BOINCBaseFrame.cpp:504
+#: BOINCBaseFrame.cpp:505
 #, c-format
 msgid "%s - Connection Error"
 msgstr "%s - Błąd połączenia"
 
-#: clientgui/BOINCBaseFrame.cpp:513
+#: BOINCBaseFrame.cpp:514
 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 ""
 "Obecnie nie masz uprawnień do zarządzania klientem BOINC.\n"
-"Skontaktuj się z administratorem, aby dołączył cię do grupy użytkowników 'boinc_users' na tym komputerze."
+"Skontaktuj się z administratorem, aby dołączył cię do grupy użytkowników "
+"'boinc_users' na tym komputerze."
 
-#: clientgui/BOINCBaseFrame.cpp:522
+#: BOINCBaseFrame.cpp:523
 msgid ""
 "Authorization failed connecting to running client.\n"
 "Make sure you start this program in the same directory as the client."
 msgstr ""
 "Autoryzacja w trakcie podłączanie do uruchomionego klienta nie powiodła się.\n"
-"Upewnij się czy uruchamiasz ten program w tym samym katalogu, w którym znajduje się klient."
+"Upewnij się czy uruchamiasz ten program w tym samym katalogu, w którym "
+"znajduje się klient."
 
-#: clientgui/BOINCBaseFrame.cpp:524
+#: BOINCBaseFrame.cpp:525
 msgid "Authorization failed connecting to running client."
-msgstr "Autoryzacja w trakcie podłączanie do uruchomionego klienta nie powiodła się."
+msgstr ""
+"Autoryzacja w trakcie podłączanie do uruchomionego klienta nie powiodła się."
 
-#: clientgui/BOINCBaseFrame.cpp:532
+#: BOINCBaseFrame.cpp:533
 msgid "The password you have provided is incorrect, please try again."
 msgstr "Wprowadzone hasło jest nieprawidłowe, spróbuj ponownie."
 
-#: clientgui/BOINCBaseFrame.cpp:576
+#: BOINCBaseFrame.cpp:577
 #, c-format
 msgid "%s - Connection Failed"
 msgstr "%s - Połączenie nie powiodło się"
 
-#: clientgui/BOINCBaseFrame.cpp:585
+#: BOINCBaseFrame.cpp:586
 #, c-format
 msgid ""
 "%s is not able to connect to a %s client.\n"
@@ -718,21 +716,23 @@ msgstr ""
 "%s nie może połączyć się z klientem %s.\n"
 "Czy chcesz spróbować połączyć się ponownie?"
 
-#: clientgui/BOINCBaseFrame.cpp:621
+#: BOINCBaseFrame.cpp:622
 #, c-format
 msgid "%s - Daemon Start Failed"
 msgstr "%s - usługa nie została uruchomiona"
 
-#: clientgui/BOINCBaseFrame.cpp:631
+#: BOINCBaseFrame.cpp:632
 #, 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 ""
 "%s nie jest w stanie uruchomić usługi klienta %s.\n"
-"Otwórz Panel Sterowania -> Narzędzia Administracyjne -> Usługi i uruchom usługę BOINC."
+"Otwórz Panel Sterowania -> Narzędzia Administracyjne -> Usługi i uruchom "
+"usługę BOINC."
 
-#: clientgui/BOINCBaseFrame.cpp:637
+#: BOINCBaseFrame.cpp:638
 #, c-format
 msgid ""
 "%s is not able to start a %s client.\n"
@@ -741,46 +741,52 @@ msgstr ""
 "%s nie jest w stanie uruchomić klienta %s.\n"
 "Uruchom usługę i spróbuj ponownie."
 
-#: clientgui/BOINCBaseFrame.cpp:688
+#: BOINCBaseFrame.cpp:689
 #, c-format
 msgid "%s - Connection Status"
 msgstr "%s - Status połączenia"
 
-#: clientgui/BOINCBaseFrame.cpp:699
+#: BOINCBaseFrame.cpp:700
 #, 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 ""
 "%s nie jest obecnie podłączony do klienta %s.\n"
-"Użyj opcji 'Zaawansowane\\Wybierz komputer...' aby połączyć się z klientem %s.\n"
-"Aby podłączyć się do komputera lokalnego użyj nazwy 'localhost' jako nazwy komputera."
+"Użyj opcji 'Zaawansowane\\Wybierz komputer...' aby połączyć się z klientem %"
+"s.\n"
+"Aby podłączyć się do komputera lokalnego użyj nazwy 'localhost' jako nazwy "
+"komputera."
 
 # 88%
 # 100%
-#: clientgui/BOINCBaseView.cpp:752
+#: BOINCBaseView.cpp:779
 msgid "Project web pages"
 msgstr "Strony projektu"
 
-#: clientgui/BOINCClientManager.cpp:573
+#: BOINCClientManager.cpp:575
 #, c-format
 msgid "%s - Unexpected Exit"
 msgstr "%s - Nieoczekiwane zakończenie"
 
-#: clientgui/BOINCClientManager.cpp:583
+#: BOINCClientManager.cpp:585
 #, 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 ""
+"Klient został trzykrotnie niespodziewanie zamknięty w ciągu ostatnich %d "
+"minut.\n"
+"Czy chcesz go zrestartować?"
 
-#: clientgui/BOINCDialupManager.cpp:61
+#: BOINCDialupManager.cpp:61
 #, c-format
 msgid "%s - Network Status"
 msgstr "%s - Stan połączenia internetowego"
 
-#: clientgui/BOINCDialupManager.cpp:241
+#: BOINCDialupManager.cpp:241
 #, c-format
 msgid ""
 "%s needs to connect to the Internet.\n"
@@ -789,22 +795,22 @@ msgstr ""
 "%s chce nawiązać połączenie z internetem.\n"
 "Czy może to zrobić teraz?"
 
-#: clientgui/BOINCDialupManager.cpp:254
+#: BOINCDialupManager.cpp:254
 #, c-format
 msgid "%s is connecting to the Internet."
 msgstr "%s łączy się z internetem."
 
-#: clientgui/BOINCDialupManager.cpp:303
+#: BOINCDialupManager.cpp:303
 #, c-format
 msgid "%s has successfully connected to the Internet."
 msgstr "%s połączył się z internetem."
 
-#: clientgui/BOINCDialupManager.cpp:331
+#: BOINCDialupManager.cpp:331
 #, c-format
 msgid "%s failed to connect to the Internet."
 msgstr "%s nie mógł nawiązać połączenia z internetem."
 
-#: clientgui/BOINCDialupManager.cpp:372
+#: BOINCDialupManager.cpp:372
 #, c-format
 msgid ""
 "%s has detected it is now connected to the Internet.\n"
@@ -814,17 +820,17 @@ msgstr ""
 "Nastąpi próba aktualizacji wszystkich projektów\n"
 "oraz ponowienie wszystkich transferów plików."
 
-#: clientgui/BOINCDialupManager.cpp:417
+#: BOINCDialupManager.cpp:417
 #, c-format
 msgid "%s has successfully disconnected from the Internet."
 msgstr "%s rozłączył się z internetem."
 
-#: clientgui/BOINCDialupManager.cpp:433
+#: BOINCDialupManager.cpp:433
 #, c-format
 msgid "%s failed to disconnected from the Internet."
 msgstr "%s nie mógł rozłączyć się z internetem."
 
-#: clientgui/BOINCGUIApp.cpp:595
+#: BOINCGUIApp.cpp:339
 #, c-format
 msgid ""
 "You currently are not authorized to manage the client.\n"
@@ -845,24 +851,26 @@ msgstr ""
 "- skontaktuj się z administratorem aby dodał cię do\n"
 "użytkowników grupy 'boinc_master'."
 
-#: clientgui/BOINCGUIApp.cpp:601
+#: BOINCGUIApp.cpp:345
 #, c-format
 msgid ""
 "%s ownership or permissions are not set properly; please reinstall %s.\n"
 "(Error code %d"
 msgstr ""
-"%s - właściciel lub uprawnienia nie są ustawione prawidłowo; należy przeinstalować %s.\n"
+"%s - właściciel lub uprawnienia nie są ustawione prawidłowo; należy "
+"przeinstalować %s.\n"
 "(Kod błędu %d"
 
-#: clientgui/BOINCGUIApp.cpp:607
+#: BOINCGUIApp.cpp:351
 msgid " at "
 msgstr " w "
 
-#: clientgui/BOINCGUIApp.cpp:610
+#: BOINCGUIApp.cpp:354 MainDocument.cpp:2484 MainDocument.cpp:2534
+#: MainDocument.cpp:2554 ViewTransfers.cpp:803
 msgid ")"
 msgstr ")"
 
-#: clientgui/BOINCGUIApp.cpp:640
+#: BOINCGUIApp.cpp:384
 msgid ""
 "A reboot is required in order for BOINC to run properly.\n"
 "Please reboot your computer and try again."
@@ -870,315 +878,313 @@ msgstr ""
 "Aby BOINC działał poprawnie wymagane jest ponowne uruchomienie komputera.\n"
 "Wykonaj restart i spróbuj ponownie."
 
-#: clientgui/BOINCGUIApp.cpp:641
+#: BOINCGUIApp.cpp:385 DlgAbout.cpp:153
 msgid "BOINC Manager"
 msgstr "Menadżer BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:902
+#: BOINCGUIApp.cpp:572
 msgid "BOINC Manager was started by the operating system automatically"
 msgstr "Menadżer BOINC został uruchomiony automatycznie przez system operacyjny"
 
-#: clientgui/BOINCGUIApp.cpp:904
+#: BOINCGUIApp.cpp:574
 msgid "Startup BOINC so only the system tray icon is visible"
 msgstr "Uruchom BOINC tak, aby widoczna była tylko ikona w zasobniku systemowym"
 
-#: clientgui/BOINCGUIApp.cpp:906
+#: BOINCGUIApp.cpp:576
 msgid "Directory containing the BOINC Client executable"
 msgstr "Katalog zawierający plik wykonywalny klienta BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:907
+#: BOINCGUIApp.cpp:577
 msgid "BOINC data directory"
 msgstr "Katalog danych BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:909
+#: BOINCGUIApp.cpp:579
 msgid "Host name or IP address"
 msgstr "Nazwa hosta lub adres IP"
 
-#: clientgui/BOINCGUIApp.cpp:910
+#: BOINCGUIApp.cpp:580
 msgid "GUI RPC port number"
 msgstr "Numer portu RPC GUI"
 
-#: clientgui/BOINCGUIApp.cpp:911
+#: BOINCGUIApp.cpp:581
 msgid "Password"
 msgstr "Hasło"
 
-#: clientgui/BOINCGUIApp.cpp:912
+#: BOINCGUIApp.cpp:582
 msgid "Startup BOINC with these optional arguments"
 msgstr "Uruchom BOINC z dodatkowymi argumentami"
 
-#: clientgui/BOINCGUIApp.cpp:913
+#: BOINCGUIApp.cpp:583
 msgid "disable BOINC security users and permissions"
 msgstr "zablokuj użytkowników oraz uprawnienia BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:914
+#: BOINCGUIApp.cpp:584
 msgid "set skin debugging mode to enable skin manager error messages"
-msgstr "ustaw tryb debugowania skórek aby odblokować komunikaty błędów menadżera skórek"
+msgstr ""
+"ustaw tryb debugowania skórek aby odblokować komunikaty błędów menadżera "
+"skórek"
 
-#: clientgui/BOINCGUIApp.cpp:915
+#: BOINCGUIApp.cpp:585
 msgid "multiple instances of BOINC Manager allowed"
 msgstr "zezwolono na wiele instancji Menedżera BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:917
+#: BOINCGUIApp.cpp:587
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr "Nie wykorzystywane: workaround dla błędu w XCode 4.2"
 
-#: clientgui/BOINCGUIApp.cpp:1164
+#: BOINCGUIApp.cpp:814
 msgid "(Automatic Detection)"
 msgstr "(Wykrywanie automatyczne)"
 
-#: clientgui/BOINCGUIApp.cpp:1165
+#: BOINCGUIApp.cpp:815
 msgid "(Unknown)"
 msgstr "(Nieznany)"
 
-#: clientgui/BOINCGUIApp.cpp:1166
+#: BOINCGUIApp.cpp:816
 msgid "(User Defined)"
 msgstr "(Użytkownika)"
 
-#: clientgui/BOINCTaskBar.cpp:522
+#: BOINCTaskBar.cpp:508
 #, c-format
 msgid "Open %s Web..."
 msgstr "Otwiera stronę %s..."
 
-#: clientgui/BOINCTaskBar.cpp:529
+#: BOINCTaskBar.cpp:515
 #, c-format
 msgid "Open %s..."
 msgstr "Otwórz %s'a..."
 
-#: clientgui/BOINCTaskBar.cpp:536
-#: clientgui/BOINCTaskBar.cpp:633
-#: clientgui/BOINCTaskBar.cpp:641
+#: BOINCTaskBar.cpp:522 BOINCTaskBar.cpp:619 BOINCTaskBar.cpp:627
 msgid "Snooze"
 msgstr "Wstrzymaj aktywność na 1 godzinę"
 
-#: clientgui/BOINCTaskBar.cpp:538
-#: clientgui/BOINCTaskBar.cpp:660
-#: clientgui/BOINCTaskBar.cpp:668
+#: BOINCTaskBar.cpp:524 BOINCTaskBar.cpp:646 BOINCTaskBar.cpp:654
 msgid "Snooze GPU"
 msgstr "Wstrzymaj aktywność karty graficznej na 1 godzinę"
 
-#: clientgui/BOINCTaskBar.cpp:556
+#: BOINCTaskBar.cpp:542
 msgid "E&xit"
 msgstr "&Zamknij"
 
-#: clientgui/BOINCTaskBar.cpp:626
+#: BOINCTaskBar.cpp:612 ViewProjects.cpp:718 ViewWork.cpp:795
+#: sg_BoincSimpleFrame.cpp:758 sg_ProjectCommandPopup.cpp:110
+#: sg_TaskCommandPopup.cpp:102
 msgid "Resume"
 msgstr "Wznów"
 
-#: clientgui/BOINCTaskBar.cpp:653
+#: BOINCTaskBar.cpp:639
 msgid "Resume GPU"
 msgstr "Wznów aktywność karty graficznej"
 
-#: clientgui/BOINCTaskBar.cpp:727
+#: BOINCTaskBar.cpp:713
 msgid "Computing is enabled"
 msgstr "Przetwarzanie jest włączone"
 
-#: clientgui/BOINCTaskBar.cpp:731
+#: BOINCTaskBar.cpp:717
 msgid "Computing is suspended - "
 msgstr "Przetwarzanie jest wstrzymane - "
 
-#: clientgui/BOINCTaskBar.cpp:741
+#: BOINCTaskBar.cpp:727
 msgid "GPU computing is enabled"
 msgstr "Przetwarzanie GPU jest włączone"
 
-#: clientgui/BOINCTaskBar.cpp:744
+#: BOINCTaskBar.cpp:730
 msgid "GPU computing is suspended - "
 msgstr "Przetwarzanie GPU jest wstrzymane -"
 
-#: clientgui/BOINCTaskBar.cpp:753
+#: BOINCTaskBar.cpp:739
 msgid "Network is enabled"
 msgstr "Dostęp do sieci jest włączony"
 
-#: clientgui/BOINCTaskBar.cpp:756
+#: BOINCTaskBar.cpp:742
 msgid "Network is suspended - "
 msgstr "Dostęp do sieci jest wstrzymany - "
 
-#: clientgui/BOINCTaskBar.cpp:764
+#: BOINCTaskBar.cpp:750
 msgid "Reconnecting to client."
 msgstr "Ponowne łączenie z klientem."
 
-#: clientgui/BOINCTaskBar.cpp:766
+#: BOINCTaskBar.cpp:752
 msgid "Not connected to a client."
 msgstr "Niepołączony z klientem."
 
-#: clientgui/BOINCTaskBar.cpp:819
+#: BOINCTaskBar.cpp:805
 #, c-format
 msgid "%s Notices"
 msgstr "%s Powiadomienia"
 
-#: clientgui/BOINCTaskBar.cpp:825
+#: BOINCTaskBar.cpp:811
 msgid "There are new notices - click to view."
 msgstr "Są nowe powiadomienia - kliknij aby zobaczyć."
 
-#: clientgui/CompletionErrorPage.cpp:199
+#: CompletionErrorPage.cpp:199
 msgid "Failed to add project"
 msgstr "Niepowodzenie podczas dodawania projektu"
 
-#: clientgui/CompletionErrorPage.cpp:204
+#: CompletionErrorPage.cpp:204
 msgid "Failed to update account manager"
 msgstr "Niepowodzenie podczas aktualizacji menadżera kont"
 
-#: clientgui/CompletionErrorPage.cpp:208
+#: CompletionErrorPage.cpp:208
 msgid "Failed to remove account manager"
 msgstr "Niepowodzenie podczas usuwania menadżera kont"
 
-#: clientgui/CompletionErrorPage.cpp:212
+#: CompletionErrorPage.cpp:212
 msgid "Failed to add account manager"
 msgstr "Niepowodzenie podczas dodawania menadżera kont"
 
-#: clientgui/CompletionErrorPage.cpp:221
+#: CompletionErrorPage.cpp:221
 msgid ""
 "Please try again later.\n"
 "\n"
 "Click Finish to close."
 msgstr ""
 
-#: clientgui/CompletionErrorPage.cpp:225
-#: clientgui/CompletionPage.cpp:222
-#: clientgui/CompletionPage.cpp:242
-#: clientgui/CompletionPage.cpp:273
+#: CompletionErrorPage.cpp:225 CompletionPage.cpp:222 CompletionPage.cpp:242
+#: CompletionPage.cpp:273
 msgid "Click Finish to close."
 msgstr "Naciśnij Zakończ aby zamknąć okno."
 
-#: clientgui/CompletionErrorPage.cpp:234
+#: CompletionErrorPage.cpp:234
 msgid "Messages from server:"
 msgstr "Wiadomości z serwera:"
 
-#: clientgui/CompletionPage.cpp:207
+#: CompletionPage.cpp:207
 msgid "Project added"
 msgstr "Projekt został dodany"
 
-#: clientgui/CompletionPage.cpp:213
+#: CompletionPage.cpp:213
 msgid "This project has been successfully added."
 msgstr "Projekt został pomyślnie dodany."
 
-#: clientgui/CompletionPage.cpp:218
+#: 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 ""
 "Kiedy naciśniesz Zakończ, twoja przeglądarka otworzy stronę,\n"
-"na której będziesz mógł wybrać nazwę swojego konta oraz ustawienia preferencji."
+"na której będziesz mógł wybrać nazwę swojego konta oraz ustawienia "
+"preferencji."
 
-#: clientgui/CompletionPage.cpp:232
+#: CompletionPage.cpp:232
 #, c-format
 msgid "Update from %s completed."
 msgstr "Aktualizacja z %s zakończona."
 
-#: clientgui/CompletionPage.cpp:236
+#: CompletionPage.cpp:236
 msgid "Update completed."
 msgstr "Aktualizacja zakończona."
 
-#: clientgui/CompletionPage.cpp:247
+#: CompletionPage.cpp:247
 msgid "Now using account manager"
 msgstr "Teraz korzystasz z menadżera kont"
 
-#: clientgui/CompletionPage.cpp:252
+#: CompletionPage.cpp:252
 #, c-format
 msgid "Welcome to %s!"
 msgstr "Witamy w %s!"
 
-#: clientgui/CompletionPage.cpp:263
+#: CompletionPage.cpp:263
 #, c-format
 msgid "You are now using %s to manage accounts."
 msgstr "Teraz korzystasz z %s do zarządzania kontami."
 
-#: clientgui/CompletionPage.cpp:267
+#: CompletionPage.cpp:267
 msgid "You are now using this account manager."
 msgstr "Teraz korzystasz z tego menadżera kont."
 
-#: clientgui/DlgAbout.cpp:113
+#: DlgAbout.cpp:113 mac/Mac_GUI.cpp:96
 #, c-format
 msgid "About %s"
 msgstr "O %s"
 
-#: clientgui/DlgAbout.cpp:172
+#: DlgAbout.cpp:172
 msgid "Version:"
 msgstr "Wersja:"
 
-#: clientgui/DlgAbout.cpp:180
+#: DlgAbout.cpp:180
 msgid "wxWidgets Version:"
 msgstr "Wersja wxWidgets:"
 
-#: clientgui/DlgAbout.cpp:188
+#: DlgAbout.cpp:188
 msgid "Copyright:"
 msgstr "Prawa autorskie:"
 
-#: clientgui/DlgAbout.cpp:192
+# 98%
+#: DlgAbout.cpp:192
+#, fuzzy
 msgid ""
-"(C) 2003-2014 University of California, Berkeley.\n"
+"(C) 2003-2013 University of California, Berkeley.\n"
 "All Rights Reserved."
 msgstr ""
+"(C) 2003-2011 Uniwersytet Kalifornijski w Berkeley.\n"
+"Wszystkie prawa zastrzeżone."
 
-#: clientgui/DlgAbout.cpp:196
+#: DlgAbout.cpp:196
 msgid "Berkeley Open Infrastructure for Network Computing"
 msgstr ""
 "Berkeley Open Infrastructure for Network Computing\n"
 "Otwarta Platforma Obliczeń Rozproszonych BOINC"
 
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:399
-#: clientgui/DlgSelectComputer.cpp:163
+#: DlgAbout.cpp:208 DlgExitMessage.cpp:173 DlgGenericMessage.cpp:120
+#: DlgOptions.cpp:396 DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "&OK"
 
-#: clientgui/DlgAdvPreferences.cpp:602
+#: DlgAdvPreferences.cpp:544
 msgid "invalid number"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:603
+#: DlgAdvPreferences.cpp:545
 msgid "invalid time, format is HH:MM"
 msgstr "nieprawidłowy czas, prawidłowy format to HH:MM"
 
-#: clientgui/DlgAdvPreferences.cpp:604
+#: DlgAdvPreferences.cpp:546
 msgid "invalid time interval, format is HH:MM-HH:MM"
 msgstr "nieprawidłowy zakres czasu, prawidłowy format to HH:MM-HH:MM"
 
-#: clientgui/DlgAdvPreferences.cpp:817
+#: DlgAdvPreferences.cpp:751
 msgid "invalid input value detected"
 msgstr "wykryto wprowadzenie nieprawidłowej wartości"
 
-#: clientgui/DlgAdvPreferences.cpp:819
+#: DlgAdvPreferences.cpp:753
 msgid "Validation Error"
 msgstr "Błąd walidacji"
 
-#: clientgui/DlgAdvPreferences.cpp:969
-#: clientgui/DlgAdvPreferences.cpp:975
-#: clientgui/DlgAdvPreferences.cpp:981
+#: DlgAdvPreferences.cpp:885 DlgAdvPreferences.cpp:891
+#: DlgAdvPreferences.cpp:897
 msgid "Applications to add"
 msgstr "Aplikacje do dodania"
 
-#: clientgui/DlgAdvPreferences.cpp:998
+#: DlgAdvPreferences.cpp:914
 #, c-format
 msgid "'%s' is not an executable application."
 msgstr "'%s' nie jest aplikacją wykonywalną."
 
-#: clientgui/DlgAdvPreferences.cpp:999
-#: clientgui/DlgAdvPreferences.cpp:1046
-#: clientgui/DlgAdvPreferences.cpp:1070
+#: DlgAdvPreferences.cpp:915 DlgAdvPreferences.cpp:962
+#: DlgAdvPreferences.cpp:986
 msgid "Add Exclusive App"
 msgstr "Dodaj aplikację z wyłącznością"
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Name of application to add?"
 msgstr "Nazwa aplikacji do dodania"
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Add exclusive app"
 msgstr "Dodaj aplikację z wyłącznością"
 
-#: clientgui/DlgAdvPreferences.cpp:1045
+#: DlgAdvPreferences.cpp:961
 #, c-format
 msgid "Application names must end with '%s'"
 msgstr "Nazwa aplikacji musi kończyć się '%s'"
 
-#: clientgui/DlgAdvPreferences.cpp:1069
+#: DlgAdvPreferences.cpp:985
 #, c-format
 msgid "'%s' is already in the list."
 msgstr "'%s' jest już na liście."
 
-#: clientgui/DlgAdvPreferences.cpp:1161
+#: DlgAdvPreferences.cpp:1077
 msgid ""
 "Do you really want to clear all local preferences?\n"
 "(This will not affect exclusive applications.)"
@@ -1186,16 +1192,16 @@ msgstr ""
 "Czy na pewno chcesz wyczyścić lokalne preferencje?\n"
 "(Nie będzie to miało wpływu na aplikacje z wyłącznością.)"
 
-#: clientgui/DlgAdvPreferences.cpp:1162
+#: DlgAdvPreferences.cpp:1078 sg_DlgPreferences.cpp:1030
 msgid "Confirmation"
 msgstr "Potwierdzenie"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:49
+#: DlgAdvPreferencesBase.cpp:46 sg_DlgPreferences.cpp:946
 #, c-format
-msgid "%s - Computing preferences"
-msgstr ""
+msgid "%s - Preferences"
+msgstr "%s - Preferencje"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:66
+#: DlgAdvPreferencesBase.cpp:62
 msgid ""
 "This dialog controls preferences for this computer only.\n"
 "Click OK to set preferences.\n"
@@ -1203,497 +1209,485 @@ msgid ""
 msgstr ""
 "Poniższe ustawienia dotyczą wyłącznie tego komputera.\n"
 "Naciśnij OK aby zapisać preferencje.\n"
-"Naciśnij Wyczyść aby przywrócić preferencje z serwera (z wyjątkiem aplikacji z wyłącznością)."
+"Naciśnij Wyczyść aby przywrócić preferencje z serwera (z wyjątkiem aplikacji "
+"z wyłącznością)."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:69
+#: DlgAdvPreferencesBase.cpp:65 sg_DlgPreferences.cpp:428
 msgid "Clear"
 msgstr "Wyczyść"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:70
+#: DlgAdvPreferencesBase.cpp:66
 msgid "clear all local preferences and close the dialog"
 msgstr "Wyczyść lokalne preferencje i zamknij okno"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:85
+#: DlgAdvPreferencesBase.cpp:81
 msgid "processor usage"
 msgstr "Użycie procesora"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:88
+#: DlgAdvPreferencesBase.cpp:84
 msgid "network usage"
 msgstr "Użycie sieci"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:91
+#: DlgAdvPreferencesBase.cpp:87
 msgid "disk and memory usage"
 msgstr "Użycie dysku oraz pamięci"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:94
+#: DlgAdvPreferencesBase.cpp:90
 msgid "exclusive applications"
 msgstr "Aplikacje z wyłącznością"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:107
-#: clientgui/DlgDiagnosticLogFlags.cpp:104
+#: DlgAdvPreferencesBase.cpp:102 sg_DlgPreferences.cpp:424
 msgid "OK"
 msgstr "OK"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:108
+#: DlgAdvPreferencesBase.cpp:103
 msgid "save all values and close the dialog"
 msgstr "Zapisz wszystkie wartości i zamknij okno"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:114
+#: DlgAdvPreferencesBase.cpp:108
 msgid "close the dialog without saving"
 msgstr "Zamknij okno bez zapisywania wartości"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:118
-#: clientgui/Localization.cpp:35
-#: clientgui/Localization.cpp:121
-#: clientgui/Localization.cpp:139
+#: DlgAdvPreferencesBase.cpp:112 Localization.cpp:35 Localization.cpp:121
+#: Localization.cpp:139 sg_BoincSimpleFrame.cpp:794 sg_DlgPreferences.cpp:439
 msgid "Help"
 msgstr "Pomoc"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
+#: DlgAdvPreferencesBase.cpp:113
 msgid "shows the preferences web page"
 msgstr "Pokaż stronę internetową z opisem preferencji"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:141
+#: DlgAdvPreferencesBase.cpp:135
 msgid "Computing allowed"
 msgstr "Przetwarzanie dozwolone"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
+#: DlgAdvPreferencesBase.cpp:139
 msgid "While computer is on batteries"
 msgstr "Gdy komputer jest zasilany z baterii"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:149
-msgid "check this if you want this computer to do work while it runs on batteries"
-msgstr "Zaznacz jeśli chcesz aby komputer przetwarzał zadania podczas zasilania z baterii"
+#: DlgAdvPreferencesBase.cpp:142
+msgid ""
+"check this if you want this computer to do work while it runs on batteries"
+msgstr ""
+"Zaznacz jeśli chcesz aby komputer przetwarzał zadania podczas zasilania z "
+"baterii"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:155
+#: DlgAdvPreferencesBase.cpp:148
 msgid "While computer is in use"
 msgstr "Gdy komputer jest używany"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:158
-msgid "check this if you want this computer to do work even when you're using it"
+#: DlgAdvPreferencesBase.cpp:151
+msgid ""
+"check this if you want this computer to do work even when you're using it"
 msgstr "Zaznacz jeśli chcesz aby komputer przetwarzał zadania gdy jest używany"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:164
+#: DlgAdvPreferencesBase.cpp:157
 msgid "Use GPU while computer is in use"
 msgstr "Używaj karty graficznej, gdy komputer jest używany"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:167
-msgid "check this if you want your GPU to do work even when you're using the computer"
-msgstr "Zaznacz tą opcje jeśli chcesz, aby karta graficzna wykonywała zadania kiedy komputer jest używany"
+#: DlgAdvPreferencesBase.cpp:160
+msgid ""
+"check this if you want your GPU to do work even when you're using the "
+"computer"
+msgstr ""
+"Zaznacz tą opcje jeśli chcesz, aby karta graficzna wykonywała zadania kiedy "
+"komputer jest używany"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:179
+#: DlgAdvPreferencesBase.cpp:172
 msgid "Only after computer has been idle for"
 msgstr "Tylko gdy komputer pozostaje nieużywany przez co najmniej"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:188
-msgid "do work only after you haven't used the computer for this number of minutes"
-msgstr "Przetwarzaj dane tylko gdy komputer nie jest używany co najmniej od podanej ilości minut"
+#: DlgAdvPreferencesBase.cpp:182
+msgid ""
+"do work only after you haven't used the computer for this number of minutes"
+msgstr ""
+"Przetwarzaj dane tylko gdy komputer nie jest używany co najmniej od podanej "
+"ilości minut"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:193
-#: clientgui/DlgAdvPreferencesBase.cpp:342
+#: DlgAdvPreferencesBase.cpp:187 DlgAdvPreferencesBase.cpp:336
+#: sg_DlgPreferences.cpp:417
 msgid "minutes"
 msgstr "minut(y)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:212
+#: DlgAdvPreferencesBase.cpp:206
 msgid "While processor usage is less than"
 msgstr "Gdy użycie procesora jest mniejsze niż"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:221
+#: DlgAdvPreferencesBase.cpp:216
 msgid "suspend work if processor usage exceeds this level"
-msgstr "Wstrzymaj przetwarzanie gdy wykorzystanie procesora przekracza ten poziom"
+msgstr ""
+"Wstrzymaj przetwarzanie gdy wykorzystanie procesora przekracza ten poziom"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:226
+#: DlgAdvPreferencesBase.cpp:221
 msgid "percent (0 means no restriction)"
 msgstr "procent (0 oznacza brak ograniczeń)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:240
-#: clientgui/DlgAdvPreferencesBase.cpp:506
+#: DlgAdvPreferencesBase.cpp:235 DlgAdvPreferencesBase.cpp:496
 msgid "Every day between hours of"
 msgstr "Każdego dnia pomiędzy godzinami"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: DlgAdvPreferencesBase.cpp:239
 msgid "start work at this time"
 msgstr "początek przetwarzania"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:248
-#: clientgui/DlgAdvPreferencesBase.cpp:514
+#: DlgAdvPreferencesBase.cpp:243 DlgAdvPreferencesBase.cpp:504
+#: sg_DlgPreferences.cpp:326 sg_DlgPreferences.cpp:348
 msgid "and"
 msgstr "a"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:252
+#: DlgAdvPreferencesBase.cpp:247
 msgid "stop work at this time"
 msgstr "koniec przetwarzania"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
-#: clientgui/DlgAdvPreferencesBase.cpp:522
+#: DlgAdvPreferencesBase.cpp:251 DlgAdvPreferencesBase.cpp:512
 msgid "(no restriction if equal)"
 msgstr "(równe wartości oznaczają brak ograniczeń)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:261
-#: clientgui/DlgAdvPreferencesBase.cpp:527
+#: DlgAdvPreferencesBase.cpp:256 DlgAdvPreferencesBase.cpp:517
 msgid "Day-of-week override:"
 msgstr "Dodatkowe warunki dla dni tygodnia:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:266
-#: clientgui/DlgAdvPreferencesBase.cpp:532
+#: DlgAdvPreferencesBase.cpp:261 DlgAdvPreferencesBase.cpp:522
 msgid "check box to specify hours for this day of week"
 msgstr "Zaznacz aby podać godziny dla tego dnia tygodnia"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:272
-#: clientgui/DlgAdvPreferencesBase.cpp:538
+#: DlgAdvPreferencesBase.cpp:267 DlgAdvPreferencesBase.cpp:528
 msgid "Monday"
 msgstr "Poniedziałek"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:279
-#: clientgui/DlgAdvPreferencesBase.cpp:545
+#: DlgAdvPreferencesBase.cpp:274 DlgAdvPreferencesBase.cpp:535
 msgid "Tuesday"
 msgstr "Wtorek"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:286
-#: clientgui/DlgAdvPreferencesBase.cpp:552
+#: DlgAdvPreferencesBase.cpp:281 DlgAdvPreferencesBase.cpp:542
 msgid "Wednesday"
 msgstr "Środa"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:293
-#: clientgui/DlgAdvPreferencesBase.cpp:559
+#: DlgAdvPreferencesBase.cpp:288 DlgAdvPreferencesBase.cpp:549
 msgid "Thursday"
 msgstr "Czwartek"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:300
-#: clientgui/DlgAdvPreferencesBase.cpp:566
+#: DlgAdvPreferencesBase.cpp:295 DlgAdvPreferencesBase.cpp:556
 msgid "Friday"
 msgstr "Piątek"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:307
-#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: DlgAdvPreferencesBase.cpp:302 DlgAdvPreferencesBase.cpp:563
 msgid "Saturday"
 msgstr "Sobota"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:580
+#: DlgAdvPreferencesBase.cpp:309 DlgAdvPreferencesBase.cpp:570
 msgid "Sunday"
 msgstr "Niedziela"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:328
+#: DlgAdvPreferencesBase.cpp:323
 msgid "Other options"
 msgstr "Inne opcje"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:336
+#: DlgAdvPreferencesBase.cpp:330
 msgid "Switch between applications every"
 msgstr "Przełączaj się pomiędzy aplikacjami co"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:345
+#: DlgAdvPreferencesBase.cpp:339
 msgid "On multiprocessor systems, use at most"
 msgstr "W systemach wieloprocesorowych, używaj nie więcej niż"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
+#: DlgAdvPreferencesBase.cpp:346
 #, no-c-format
-msgid "% of the processors (0 means no restriction)"
+msgid "% of the processors (0 means ignore this setting)"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:355
-#: clientgui/DlgAdvPreferencesBase.cpp:618
-#: clientgui/DlgAdvPreferencesBase.cpp:640
-#: clientgui/DlgAdvPreferencesBase.cpp:661
-#: clientgui/DlgAdvPreferencesBase.cpp:683
-#: clientgui/DlgAdvPreferencesBase.cpp:694
+#: DlgAdvPreferencesBase.cpp:349 DlgAdvPreferencesBase.cpp:605
+#: DlgAdvPreferencesBase.cpp:627 DlgAdvPreferencesBase.cpp:648
+#: DlgAdvPreferencesBase.cpp:669 DlgAdvPreferencesBase.cpp:679
 msgid "Use at most"
 msgstr "Używaj nie więcej niż"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:362
+#: DlgAdvPreferencesBase.cpp:356
 #, no-c-format
-msgid "% of CPU time (0 means no restriction)"
-msgstr ""
+msgid "% CPU time"
+msgstr "% mocy obliczeniowej procesora"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:386
+#: DlgAdvPreferencesBase.cpp:378
 msgid "General options"
 msgstr "Opcje ogólne"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:395
+#: DlgAdvPreferencesBase.cpp:386
 msgid "Maximum download rate"
 msgstr "Maks. szybkość pobierania"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:401
-#: clientgui/DlgAdvPreferencesBase.cpp:410
-msgid "KBytes/second (0 means no restriction)"
-msgstr ""
+#: DlgAdvPreferencesBase.cpp:392 DlgAdvPreferencesBase.cpp:401
+msgid "KBytes/sec."
+msgstr "KB/s"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:404
+#: DlgAdvPreferencesBase.cpp:395
 msgid "Maximum upload rate"
 msgstr "Maks. szybkość wysyłania"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:417
+#: DlgAdvPreferencesBase.cpp:406
+msgid "Transfer at most"
+msgstr "Przesyłaj maksymalnie"
+
+#: DlgAdvPreferencesBase.cpp:412
+msgid "Mbytes"
+msgstr "MB"
+
+#: DlgAdvPreferencesBase.cpp:415
+msgid "every"
+msgstr "co"
+
+#: DlgAdvPreferencesBase.cpp:421 DlgAdvPreferencesBase.cpp:444
+#: DlgAdvPreferencesBase.cpp:463
+msgid "days"
+msgstr "dni"
+
+#: DlgAdvPreferencesBase.cpp:429
 msgid "Minimum work buffer"
 msgstr "Minimalny zapas zadań na"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:425
+#: DlgAdvPreferencesBase.cpp:438
 msgid "Try to maintain enough tasks to keep busy for this many days"
-msgstr "Spróbuj zapewnić odpowiednią ilość zadań aby pracować przez wskazaną liczbę dni"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:431
-#: clientgui/DlgAdvPreferencesBase.cpp:449
-msgid "days (maximum value: 10)"
 msgstr ""
+"Spróbuj zapewnić odpowiednią ilość zadań aby pracować przez wskazaną liczbę "
+"dni"
 
 # 80%
 # 100%
-#: clientgui/DlgAdvPreferencesBase.cpp:437
+#: DlgAdvPreferencesBase.cpp:450
 msgid "Max additional work buffer"
 msgstr "Maksymalny zapas zadań na"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:445
+#: DlgAdvPreferencesBase.cpp:459
 msgid "In addition, maintain enough tasks for up to this many days"
 msgstr "Zapewnij odpowiednią ilość zadań maksymalnie na wskazaną liczbę dni"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:454
-msgid "Transfer at most"
-msgstr "Przesyłaj maksymalnie"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:462
-msgid "MBytes every"
-msgstr ""
-
-#: clientgui/DlgAdvPreferencesBase.cpp:468
-msgid "days (0 means no restriction)"
-msgstr ""
-
-#: clientgui/DlgAdvPreferencesBase.cpp:476
+#: DlgAdvPreferencesBase.cpp:466
 msgid "Skip image file verification"
 msgstr "Pomiń weryfikację za pomocą obrazka"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:478
+#: DlgAdvPreferencesBase.cpp:468
 msgid "check this if your Internet provider modifies image files"
-msgstr "Zaznacz jeżeli twój dostawca internetu może modyfikować pliki graficzne w trakcie transferu"
+msgstr ""
+"Zaznacz jeżeli twój dostawca internetu może modyfikować pliki graficzne w "
+"trakcie transferu"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:484
+#: DlgAdvPreferencesBase.cpp:476
 msgid "Connect options"
 msgstr "Opcje połączenia"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:487
+#: DlgAdvPreferencesBase.cpp:478
 msgid "Confirm before connecting to internet"
 msgstr "Potwierdź przed połączeniem z internetem"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
-msgstr "W przypadku zaznaczenia, przed każdorazowym połączeniem z internetem, będzie wyświetlane zapytanie"
+#: DlgAdvPreferencesBase.cpp:480
+msgid ""
+"if checked, a confirmation dialog will be displayed before trying to connect "
+"to the Internet"
+msgstr ""
+"W przypadku zaznaczenia, przed każdorazowym połączeniem z internetem, będzie "
+"wyświetlane zapytanie"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:493
+#: DlgAdvPreferencesBase.cpp:484
 msgid "Disconnect when done"
 msgstr "Rozłącz z siecią po zakończeniu"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:495
+#: DlgAdvPreferencesBase.cpp:486
 msgid ""
 "if checked, BOINC hangs up when network usage is done\n"
 "(only relevant for dialup-connection)"
 msgstr ""
-"W przypadku zaznaczenia, BOINC rozłączy się z siecią po zakończeniu jej używania\n"
+"W przypadku zaznaczenia, BOINC rozłączy się z siecią po zakończeniu jej "
+"używania\n"
 "(opcja użyteczna tylko dla połączeń modemowych)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:501
+#: DlgAdvPreferencesBase.cpp:492
 msgid "Network usage allowed"
 msgstr "Dostęp do sieci dozwolony"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:510
+#: DlgAdvPreferencesBase.cpp:500
 msgid "network usage start hour"
 msgstr "początek dostępności sieci"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:518
+#: DlgAdvPreferencesBase.cpp:508
 msgid "network usage stop hour"
 msgstr "koniec dostępności sieci"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:610
-#: clientgui/DlgItemProperties.cpp:257
+#: DlgAdvPreferencesBase.cpp:598 DlgItemProperties.cpp:231
 msgid "Disk usage"
 msgstr "Użycie dysku"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:622
+#: DlgAdvPreferencesBase.cpp:609
 msgid "the maximum disk space used by BOINC (in Gigabytes)"
 msgstr "Maksymalny obszar dysku dostępny dla BOINC (w GB)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:626
-msgid "Gigabytes disk space (0 means no restriction)"
-msgstr ""
+#: DlgAdvPreferencesBase.cpp:613
+msgid "Gigabytes disk space"
+msgstr "gigabajtów dysku"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:629
+#: DlgAdvPreferencesBase.cpp:616
 msgid "Leave at least"
 msgstr "Pozostaw co najmniej"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:633
+#: DlgAdvPreferencesBase.cpp:620
 msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
-msgstr "BOINC pozostawi co najmniej wskazaną wolną ilość miejsca na dysku (w gigabajtach)"
+msgstr ""
+"BOINC pozostawi co najmniej wskazaną wolną ilość miejsca na dysku (w "
+"gigabajtach)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:637
+#: DlgAdvPreferencesBase.cpp:624
 msgid "Gigabytes disk space free"
 msgstr "gigabajtów wolnego obszaru dysku"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
+#: DlgAdvPreferencesBase.cpp:631
 msgid "BOINC uses at most this percentage of total disk space"
 msgstr "Maksymalny procent obszaru dysku, dostępny dla BOINC"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:649
+#: DlgAdvPreferencesBase.cpp:636
 #, no-c-format
 msgid "% of total disk space"
 msgstr "% obszaru całego dysku"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:652
+#: DlgAdvPreferencesBase.cpp:639
 msgid "Tasks checkpoint to disk at most every"
 msgstr "Zapisywanie na dysku co "
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
+#: DlgAdvPreferencesBase.cpp:645
 msgid "seconds"
 msgstr "sekund"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:668
+#: DlgAdvPreferencesBase.cpp:655
 #, no-c-format
 msgid "% of page file (swap space)"
 msgstr "% pliku wymiany (partycji swap)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:675
+#: DlgAdvPreferencesBase.cpp:662
 msgid "Memory usage"
 msgstr "Użycie pamięci"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
+#: DlgAdvPreferencesBase.cpp:676
 #, no-c-format
 msgid "% when computer is in use"
 msgstr "% kiedy komputer jest w użyciu"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:701
+#: DlgAdvPreferencesBase.cpp:686
 #, no-c-format
 msgid "% when computer is idle"
 msgstr "% kiedy komputer nie jest w użyciu"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:706
+#: DlgAdvPreferencesBase.cpp:691
 msgid "Leave applications in memory while suspended"
 msgstr "Pozostaw aplikacje w pamięci, kiedy są zatrzymane"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:708
+#: DlgAdvPreferencesBase.cpp:693
 msgid "if checked, suspended work units are left in memory"
-msgstr "W przypadku zaznaczenia, dane zatrzymanych aplikacji pozostaną w pamięci"
+msgstr ""
+"W przypadku zaznaczenia, dane zatrzymanych aplikacji pozostaną w pamięci"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:728
-msgid "Suspend processor and network usage when these applications are running:"
-msgstr "Zatrzymaj wykorzystanie procesora i sieci, kiedy uruchomione są poniższe aplikacje:"
+#: DlgAdvPreferencesBase.cpp:713
+msgid ""
+"Suspend processor and network usage when these applications are running:"
+msgstr ""
+"Zatrzymaj wykorzystanie procesora i sieci, kiedy uruchomione są poniższe "
+"aplikacje:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:738
+#: DlgAdvPreferencesBase.cpp:722
 msgid "Add..."
 msgstr "Dodaj..."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:739
+#: DlgAdvPreferencesBase.cpp:723
 msgid "Add an application to this list"
 msgstr "Dodaj aplikację do listy"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:744
+#: DlgAdvPreferencesBase.cpp:728 ViewProjects.cpp:202
+#: sg_ProjectCommandPopup.cpp:85
 msgid "Remove"
 msgstr "Usuń"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:745
+#: DlgAdvPreferencesBase.cpp:729
 msgid "Remove an application from this list"
 msgstr "Usuń aplikację z listy"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:754
+#: DlgAdvPreferencesBase.cpp:738
 msgid "For advanced options, refer to "
 msgstr "Dla zaawansowanych opcji zapoznaj się z"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:65
-#, c-format
-msgid "%s Diagnostic Log Flags"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:83
-msgid "These flags enable various types of diagnostic messages in the Event Log."
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:105
-msgid "Save all values and close the dialog"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:108
-msgid "Defaults"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:109
-msgid "Restore default settings"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:113
-msgid "Close the dialog without saving"
-msgstr ""
-
-#: clientgui/DlgEventLog.cpp:226
+#: DlgEventLog.cpp:219
 #, c-format
 msgid "%s - Event Log"
 msgstr "%s - Dziennik zdarzeń"
 
-#: clientgui/DlgEventLog.cpp:236
+#: DlgEventLog.cpp:232 ViewMessages.cpp:117 ViewProjects.cpp:219
+#: ViewStatistics.cpp:435 ViewStatistics.cpp:2009 ViewTransfers.cpp:182
+#: ViewWork.cpp:232
 msgid "Project"
 msgstr "Projekt"
 
-#: clientgui/DlgEventLog.cpp:237
+#: DlgEventLog.cpp:233 ViewMessages.cpp:118
 msgid "Time"
 msgstr "Czas"
 
-#: clientgui/DlgEventLog.cpp:238
+#: DlgEventLog.cpp:234 ViewMessages.cpp:119
 msgid "Message"
 msgstr "Wiadomość"
 
-#: clientgui/DlgEventLog.cpp:300
-#: clientgui/DlgEventLog.cpp:364
+#: DlgEventLog.cpp:290 DlgEventLog.cpp:354
 msgid "&Show only this project"
 msgstr "&Pokaż tylko ten projekt"
 
-#: clientgui/DlgEventLog.cpp:304
+#: DlgEventLog.cpp:294
 msgid "Copy &All"
 msgstr "Kopiuj &wszystko"
 
-#: clientgui/DlgEventLog.cpp:306
-#: clientgui/DlgEventLog.cpp:310
+#: DlgEventLog.cpp:296 DlgEventLog.cpp:300 ViewMessages.cpp:89
 msgid "Copy all the messages to the clipboard."
 msgstr "Kopiuje wszystkie wiadomości do schowka."
 
-#: clientgui/DlgEventLog.cpp:315
+#: DlgEventLog.cpp:305
 msgid "Copy &Selected"
 msgstr "&Kopiuj wybrane"
 
-#: clientgui/DlgEventLog.cpp:318
-#: clientgui/DlgEventLog.cpp:326
-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 "Kopiuje wybrane wiadomości do schowka. Możesz wybrać kilka wiadomości, używając klawiszy Shift lub Command podczas klikania na wiadomości."
+#: DlgEventLog.cpp:308 DlgEventLog.cpp:316 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 ""
+"Kopiuje wybrane wiadomości do schowka. Możesz wybrać kilka wiadomości, "
+"używając klawiszy Shift lub Command podczas klikania na wiadomości."
 
-#: clientgui/DlgEventLog.cpp:320
-#: clientgui/DlgEventLog.cpp:328
-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 "Kopiuje wybrane wiadomości do schowka. Możesz wybrać kilka wiadomości, używając klawiszy Shift lub Ctrl podczas klikania na wiadomości."
+#: DlgEventLog.cpp:310 DlgEventLog.cpp:318 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 ""
+"Kopiuje wybrane wiadomości do schowka. Możesz wybrać kilka wiadomości, "
+"używając klawiszy Shift lub Ctrl podczas klikania na wiadomości."
 
-#: clientgui/DlgEventLog.cpp:335
-#: clientgui/DlgItemProperties.cpp:67
+#: DlgEventLog.cpp:325 DlgItemProperties.cpp:67
 msgid "&Close"
 msgstr "&Zamknij"
 
-#: clientgui/DlgEventLog.cpp:344
+#: DlgEventLog.cpp:334 sg_BoincSimpleFrame.cpp:798 sg_DlgPreferences.cpp:442
 #, c-format
 msgid "Get help with %s"
 msgstr "Uzyskaj pomoc dla %s"
 
-#: clientgui/DlgEventLog.cpp:358
+#: DlgEventLog.cpp:348
 msgid "Show all &messages"
 msgstr "&Pokaż wszystkie wiadomości"
 
-#: clientgui/DlgEventLog.cpp:359
-#: clientgui/DlgEventLog.cpp:361
+#: DlgEventLog.cpp:349 DlgEventLog.cpp:351
 msgid "Show messages for all projects"
 msgstr "Pokazuje wiadomości dotyczące wszystkich projektów"
 
-#: clientgui/DlgEventLog.cpp:365
-#: clientgui/DlgEventLog.cpp:367
+#: DlgEventLog.cpp:355 DlgEventLog.cpp:357
 msgid "Show only the messages for the selected project"
 msgstr "Pokazuje wiadomości związane tylko z wybranym projektem"
 
-#: clientgui/DlgExitMessage.cpp:82
+#: DlgExitMessage.cpp:82
 #, c-format
 msgid "%s - Exit Confirmation"
 msgstr "%s - Potwierdzenie zamknięcia aplikacji"
 
-#: clientgui/DlgExitMessage.cpp:130
+#: DlgExitMessage.cpp:130
 #, c-format
 msgid ""
 "You have requested to exit the %s,\n"
@@ -1710,8 +1704,9 @@ msgstr ""
 "Jeśli chcesz także zatrzymać działające zadania,\n"
 "użyj poniższych opcji:"
 
-#: clientgui/DlgExitMessage.cpp:135
+#: DlgExitMessage.cpp:135
 #, c-format
+#, c-format, c-format
 msgid ""
 "This will shut down %s and its tasks until either the\n"
 "%s or the %s screen saver is run again.\n"
@@ -1728,419 +1723,393 @@ msgstr ""
 "niż całkowicie zamykać aplikację. Pozwoli to %s uruchamiać\n"
 "zadania zgodnie z zasadami wybranymi w preferencjach."
 
-#: clientgui/DlgExitMessage.cpp:153
+#: DlgExitMessage.cpp:153
 #, c-format
 msgid "Stop running tasks when exiting the %s"
 msgstr "Zakończ działające zadania podczas wychodzenia z %s"
 
-#: clientgui/DlgExitMessage.cpp:165
+#: DlgExitMessage.cpp:165
 msgid "Remember this decision and do not show this dialog."
 msgstr "Zapamiętaj tę decyzję i nie pokazuj tego okna w przyszłości."
 
-#: clientgui/DlgExitMessage.cpp:178
-#: clientgui/DlgGenericMessage.cpp:125
-#: clientgui/DlgOptions.cpp:404
-#: clientgui/DlgSelectComputer.cpp:168
+#: DlgExitMessage.cpp:178 DlgGenericMessage.cpp:125 DlgOptions.cpp:401
+#: DlgSelectComputer.cpp:168 wizardex.cpp:378
 msgid "&Cancel"
 msgstr "&Anuluj"
 
-#: clientgui/DlgGenericMessage.cpp:112
+#: DlgGenericMessage.cpp:112
 msgid "Don't show this dialog again."
 msgstr "Nie pokazuj tego okna w przyszłości."
 
-#: clientgui/DlgItemProperties.cpp:194
-#: clientgui/DlgItemProperties.cpp:197
-#: clientgui/DlgItemProperties.cpp:200
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:168 DlgItemProperties.cpp:171
+#: DlgItemProperties.cpp:174 DlgItemProperties.cpp:177
 msgid "Don't fetch tasks for "
 msgstr "Nie pobieraj zadań przez "
 
-#: clientgui/DlgItemProperties.cpp:194
+#: DlgItemProperties.cpp:168
 msgid "Project preference"
 msgstr "Preferencje projektu"
 
-#: clientgui/DlgItemProperties.cpp:197
+#: DlgItemProperties.cpp:171
 msgid "Account manager preference"
 msgstr "Preferencje menadżera kont"
 
-#: clientgui/DlgItemProperties.cpp:200
+#: DlgItemProperties.cpp:174
 msgid "Project has no apps for "
 msgstr "Projekt nie posiada aplikacji dla "
 
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:177
 msgid "Client configuration excludes "
 msgstr "Konfiguracja klienta wyklucza"
 
 # 88%
-#: clientgui/DlgItemProperties.cpp:207
+#: DlgItemProperties.cpp:181
 msgid " work fetch deferred for"
 msgstr "pobieranie zadań opóźnione o "
 
 # 90%
-#: clientgui/DlgItemProperties.cpp:208
+#: DlgItemProperties.cpp:182
 msgid " work fetch deferral interval"
 msgstr "odstęp opóźnienia pobierania zadań"
 
-#: clientgui/DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:213
 msgid "Properties of project "
 msgstr "Właściwości projektu "
 
-#: clientgui/DlgItemProperties.cpp:243
-#: clientgui/DlgOptions.cpp:221
+#: DlgItemProperties.cpp:217 DlgOptions.cpp:218
 msgid "General"
 msgstr "Ogólne"
 
-#: clientgui/DlgItemProperties.cpp:244
+#: DlgItemProperties.cpp:218
 msgid "Master URL"
 msgstr "Główny adres URL"
 
-#: clientgui/DlgItemProperties.cpp:245
+#: DlgItemProperties.cpp:219
 msgid "User name"
 msgstr "Nazwa użytkownika"
 
-#: clientgui/DlgItemProperties.cpp:246
+#: DlgItemProperties.cpp:220
 msgid "Team name"
 msgstr "Nazwa zespołu"
 
-#: clientgui/DlgItemProperties.cpp:247
+#: DlgItemProperties.cpp:221 ViewProjects.cpp:224
 msgid "Resource share"
 msgstr "Przydział zasobów"
 
-#: clientgui/DlgItemProperties.cpp:249
+#: DlgItemProperties.cpp:223
 msgid "Scheduler RPC deferred for"
 msgstr "Wywołanie serwera projektu opóźnione o "
 
-#: clientgui/DlgItemProperties.cpp:252
+#: DlgItemProperties.cpp:226
 msgid "File downloads deferred for"
 msgstr "Pobieranie pliku wstrzymane na"
 
-#: clientgui/DlgItemProperties.cpp:255
+#: DlgItemProperties.cpp:229
 msgid "File uploads deferred for"
 msgstr "Wysyłanie pliku wstrzymane na"
 
-#: clientgui/DlgItemProperties.cpp:258
+#: DlgItemProperties.cpp:232
 msgid "Computer ID"
 msgstr "Identyfikator komputera"
 
-#: clientgui/DlgItemProperties.cpp:260
+#: DlgItemProperties.cpp:234
 msgid "Non CPU intensive"
 msgstr "Niewykorzystujący aktywnie procesora"
 
-#: 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
+#: DlgItemProperties.cpp:234 DlgItemProperties.cpp:236
+#: DlgItemProperties.cpp:237 DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:242 DlgItemProperties.cpp:251
+#: DlgItemProperties.cpp:254 DlgItemProperties.cpp:257
 msgid "yes"
 msgstr "tak"
 
-#: clientgui/DlgItemProperties.cpp:262
+#: DlgItemProperties.cpp:236
 msgid "Suspended via GUI"
 msgstr "Wstrzymany za pośrednictwem interfejsu graficznego"
 
-#: clientgui/DlgItemProperties.cpp:262
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:236 DlgItemProperties.cpp:237
 msgid "no"
 msgstr "nie"
 
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:237
 msgid "Don't request more work"
 msgstr "Nie pobieraj nowych zadań"
 
-#: clientgui/DlgItemProperties.cpp:265
+#: DlgItemProperties.cpp:239
 msgid "Scheduler call in progress"
 msgstr "Trwa nawiązywanie połączenia z serwerem projektu"
 
-#: clientgui/DlgItemProperties.cpp:268
+#: DlgItemProperties.cpp:242
 msgid "Trickle-up pending"
 msgstr "Wysłane miniwiadomości"
 
-#: clientgui/DlgItemProperties.cpp:271
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:245 DlgItemProperties.cpp:247
 msgid "Host location"
 msgstr "Lokalizacja komputera"
 
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:247
 msgid "default"
 msgstr "domyślna"
 
-#: clientgui/DlgItemProperties.cpp:277
+#: DlgItemProperties.cpp:251
 msgid "Added via account manager"
 msgstr "Dodane przez mendażera kont"
 
-#: clientgui/DlgItemProperties.cpp:280
+#: DlgItemProperties.cpp:254
 msgid "Remove when tasks done"
 msgstr "Usuwa po zakończeniu zadania"
 
-#: clientgui/DlgItemProperties.cpp:283
+#: DlgItemProperties.cpp:257
 msgid "Ended"
 msgstr "Zakończony"
 
-#: clientgui/DlgItemProperties.cpp:285
-msgid "Tasks completed"
-msgstr ""
-
-#: clientgui/DlgItemProperties.cpp:286
-msgid "Tasks failed"
-msgstr ""
-
-#: clientgui/DlgItemProperties.cpp:288
+#: DlgItemProperties.cpp:259
 msgid "Credit"
 msgstr "Punktacja"
 
-#: clientgui/DlgItemProperties.cpp:289
+#: DlgItemProperties.cpp:260
 msgid "User"
 msgstr "Użytkownik"
 
-#: clientgui/DlgItemProperties.cpp:296
+#: DlgItemProperties.cpp:267
 msgid "Host"
 msgstr "Komputer"
 
-#: clientgui/DlgItemProperties.cpp:305
+#: DlgItemProperties.cpp:276
 msgid "Scheduling"
 msgstr "Planowanie"
 
-#: clientgui/DlgItemProperties.cpp:306
+#: DlgItemProperties.cpp:277
 msgid "Scheduling priority"
 msgstr "Planowanie priorytetu"
 
-#: clientgui/DlgItemProperties.cpp:307
+#: DlgItemProperties.cpp:278
 msgid "CPU"
 msgstr "CPU"
 
-#: clientgui/DlgItemProperties.cpp:331
+#: DlgItemProperties.cpp:302
 msgid "Duration correction factor"
 msgstr "Korekcja czasu przetwarzania"
 
-#: clientgui/DlgItemProperties.cpp:345
+#: DlgItemProperties.cpp:316
 msgid "Properties of task "
 msgstr "Właściwości zadania "
 
-#: clientgui/DlgItemProperties.cpp:357
+#: DlgItemProperties.cpp:328 ViewWork.cpp:238
 msgid "Application"
 msgstr "Aplikacja"
 
-#: clientgui/DlgItemProperties.cpp:358
+#: DlgItemProperties.cpp:329 ViewWork.cpp:239
 msgid "Name"
 msgstr "Nazwa"
 
-#: clientgui/DlgItemProperties.cpp:359
+#: DlgItemProperties.cpp:330
 msgid "State"
 msgstr "Stan"
 
-#: clientgui/DlgItemProperties.cpp:362
+#: DlgItemProperties.cpp:333
 msgid "Received"
 msgstr "Odebrane"
 
-#: clientgui/DlgItemProperties.cpp:365
+#: DlgItemProperties.cpp:336
 msgid "Report deadline"
 msgstr "Termin zaraportowania"
 
-#: clientgui/DlgItemProperties.cpp:367
+#: DlgItemProperties.cpp:338
 msgid "Resources"
 msgstr "Zasoby"
 
-#: clientgui/DlgItemProperties.cpp:370
+#: DlgItemProperties.cpp:341
 msgid "Estimated computation size"
 msgstr "Szacowany czas przetwarzania"
 
-#: clientgui/DlgItemProperties.cpp:373
+#: DlgItemProperties.cpp:344
 msgid "CPU time at last checkpoint"
 msgstr "Czas przetwarzania dla ostatniego punktu kontrolnego"
 
-#: clientgui/DlgItemProperties.cpp:374
-#: clientgui/DlgItemProperties.cpp:389
+#: DlgItemProperties.cpp:345 DlgItemProperties.cpp:360
 msgid "CPU time"
 msgstr "Czas pracy"
 
-#: clientgui/DlgItemProperties.cpp:376
-#: clientgui/DlgItemProperties.cpp:390
+#: DlgItemProperties.cpp:347 DlgItemProperties.cpp:361
 msgid "Elapsed time"
 msgstr "Czas pracy"
 
-#: clientgui/DlgItemProperties.cpp:378
+#: DlgItemProperties.cpp:349
 msgid "Estimated time remaining"
 msgstr "Szacowany pozostały czas"
 
-#: clientgui/DlgItemProperties.cpp:379
+#: DlgItemProperties.cpp:350
 msgid "Fraction done"
 msgstr "Część wykonana"
 
-#: clientgui/DlgItemProperties.cpp:380
+#: DlgItemProperties.cpp:351
 msgid "Virtual memory size"
 msgstr "Rozmiar pamięci wirtualnej"
 
-#: clientgui/DlgItemProperties.cpp:381
+#: DlgItemProperties.cpp:352
 msgid "Working set size"
 msgstr "Rozmiar zestawu"
 
-#: clientgui/DlgItemProperties.cpp:383
+#: DlgItemProperties.cpp:354
 msgid "Directory"
 msgstr "Katalog"
 
-#: clientgui/DlgItemProperties.cpp:386
+#: DlgItemProperties.cpp:357
 msgid "Process ID"
 msgstr "Identyfikator procesu"
 
-#: clientgui/DlgItemProperties.cpp:456
+#: DlgItemProperties.cpp:427 ViewWork.cpp:1032 sg_TaskPanel.cpp:823
 msgid "Local: "
 msgstr "Lokalny: "
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: DlgOptions.cpp:129 DlgOptions.cpp:135
 msgid "Options"
 msgstr "Opcje"
 
-#: clientgui/DlgOptions.cpp:178
+#: DlgOptions.cpp:175
 msgid "Language:"
 msgstr "Język:"
 
-#: clientgui/DlgOptions.cpp:185
+#: DlgOptions.cpp:182
 msgid "What language should BOINC use?"
 msgstr "Jakiego języka powinien używać Menadżer BOINC?"
 
-#: clientgui/DlgOptions.cpp:189
+#: DlgOptions.cpp:186
 msgid "Notice reminder interval:"
 msgstr "Interwał przypominania o powiadomieniach"
 
-#: clientgui/DlgOptions.cpp:196
+#: DlgOptions.cpp:193
 msgid "How often should BOINC remind you of new notices?"
 msgstr "Jak często BOINC powinnien przypominać o nowych powiadomieniach?"
 
-#: clientgui/DlgOptions.cpp:201
+#: DlgOptions.cpp:198
 msgid "Run Manager at login?"
 msgstr "Uruchamiać Menadżera BOINC przy logowaniu?"
 
-#: clientgui/DlgOptions.cpp:207
+#: DlgOptions.cpp:204
 msgid "Run the BOINC Manager when you log on."
 msgstr "Uruchamianie Menadżera BOINC podczas logowania."
 
-#: clientgui/DlgOptions.cpp:212
+#: DlgOptions.cpp:209
 msgid "Enable Manager exit dialog?"
 msgstr "Wyświetlać okno dialogowe przy zamykaniu Menadżera BOINC?"
 
-#: clientgui/DlgOptions.cpp:218
+#: DlgOptions.cpp:215
 msgid "Display the exit dialog when shutting down the Manager."
 msgstr "Pokazuje okno dialogowe podczas zamykania Menadżera BOINC."
 
-#: clientgui/DlgOptions.cpp:229
+#: DlgOptions.cpp:226
 msgid "Dial-up and Virtual Private Network settings"
 msgstr "Ustawienia połączenia modemowego oraz VPN"
 
-#: clientgui/DlgOptions.cpp:243
+#: DlgOptions.cpp:240
 msgid "&Set Default"
 msgstr "Ustaw połączenie &domyślne"
 
-#: clientgui/DlgOptions.cpp:248
+#: DlgOptions.cpp:245
 msgid "&Clear Default"
 msgstr "&Usuń połączenie domyślne"
 
-#: clientgui/DlgOptions.cpp:255
+#: DlgOptions.cpp:252
 msgid "Default Connection:"
 msgstr "Domyślne połączenie:"
 
-#: clientgui/DlgOptions.cpp:262
+#: DlgOptions.cpp:259
 msgid "Connections"
 msgstr "Połączenia"
 
-#: clientgui/DlgOptions.cpp:271
+#: DlgOptions.cpp:268
 msgid "Connect via HTTP proxy server"
 msgstr "Połącz za pośrednictwem serwera HTTP Proxy"
 
-#: clientgui/DlgOptions.cpp:275
+#: DlgOptions.cpp:272
 msgid "HTTP Proxy Server Configuration"
 msgstr "Konfiguracja serwera HTTP Proxy"
 
-#: clientgui/DlgOptions.cpp:283
-#: clientgui/DlgOptions.cpp:347
+#: DlgOptions.cpp:280 DlgOptions.cpp:344
 msgid "Address:"
 msgstr "Adres:"
 
-#: clientgui/DlgOptions.cpp:291
-#: clientgui/DlgOptions.cpp:355
+#: DlgOptions.cpp:288 DlgOptions.cpp:352 ProxyPage.cpp:340 ProxyPage.cpp:360
 msgid "Port:"
 msgstr "Port:"
 
-#: clientgui/DlgOptions.cpp:299
-#: clientgui/DlgOptions.cpp:363
+#: DlgOptions.cpp:296 DlgOptions.cpp:360
 msgid "Don't use proxy for:"
 msgstr "Nie używaj serwera proxy dla:"
 
-#: clientgui/DlgOptions.cpp:306
-#: clientgui/DlgOptions.cpp:370
+#: DlgOptions.cpp:303 DlgOptions.cpp:367
 msgid "Leave these blank if not needed"
 msgstr "Pozostaw puste jeśli nie wymagane"
 
-#: clientgui/DlgOptions.cpp:312
-#: clientgui/DlgOptions.cpp:376
+#: DlgOptions.cpp:309 DlgOptions.cpp:373 ProxyPage.cpp:343 ProxyPage.cpp:363
 msgid "User Name:"
 msgstr "Login:"
 
-#: clientgui/DlgOptions.cpp:320
-#: clientgui/DlgOptions.cpp:384
-#: clientgui/DlgSelectComputer.cpp:152
+#: DlgOptions.cpp:317 DlgOptions.cpp:381 DlgSelectComputer.cpp:152
+#: ProxyPage.cpp:346 ProxyPage.cpp:366
 msgid "Password:"
 msgstr "Hasło:"
 
-#: clientgui/DlgOptions.cpp:327
+#: DlgOptions.cpp:324
 msgid "HTTP Proxy"
 msgstr "Serwer HTTP Proxy"
 
-#: clientgui/DlgOptions.cpp:335
+#: DlgOptions.cpp:332
 msgid "Connect via SOCKS proxy server"
 msgstr "Połącz za pośrednictwem serwera SOCKS Proxy"
 
-#: clientgui/DlgOptions.cpp:339
+#: DlgOptions.cpp:336
 msgid "SOCKS Proxy Server Configuration"
 msgstr "Konfiguracja serwera SOCKS Proxy"
 
-#: clientgui/DlgOptions.cpp:391
+#: DlgOptions.cpp:388
 msgid "SOCKS Proxy"
 msgstr "Serwer SOCKS Proxy"
 
-#: clientgui/DlgOptions.cpp:589
+#: DlgOptions.cpp:586
 msgid "always"
 msgstr "zawsze"
 
-#: clientgui/DlgOptions.cpp:590
+#: DlgOptions.cpp:587
 msgid "1 hour"
 msgstr "1 godzina"
 
-#: clientgui/DlgOptions.cpp:591
+#: DlgOptions.cpp:588
 msgid "6 hours"
 msgstr "6 godzin"
 
-#: clientgui/DlgOptions.cpp:592
+#: DlgOptions.cpp:589
 msgid "1 day"
 msgstr "1 dzień"
 
-#: clientgui/DlgOptions.cpp:593
+#: DlgOptions.cpp:590
 msgid "1 week"
 msgstr "1 tydzień"
 
-#: clientgui/DlgOptions.cpp:594
+#: DlgOptions.cpp:591
 msgid "never"
 msgstr "nigdy"
 
-#: clientgui/DlgOptions.cpp:691
+#: DlgOptions.cpp:688
 #, c-format
 msgid "%s - Language Selection"
 msgstr "%s - Wybór języka"
 
-#: clientgui/DlgOptions.cpp:698
+#: DlgOptions.cpp:695
 #, 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
+#: DlgSelectComputer.cpp:91
 #, c-format
 msgid "%s - Select Computer"
 msgstr "%s - Wybierz komputer"
 
-#: clientgui/DlgSelectComputer.cpp:125
+#: DlgSelectComputer.cpp:125
 #, c-format
 msgid ""
 "Another instance of %s is already running \n"
@@ -2149,416 +2118,417 @@ msgstr ""
 "Inna instancja %s już działa na tym komputerze.\n"
 "Wybierz klienta do monitorowania."
 
-#: clientgui/DlgSelectComputer.cpp:143
+#: DlgSelectComputer.cpp:143
 msgid "Host name:"
 msgstr "Nazwa komputera:"
 
-#: clientgui/Localization.cpp:31
-#: clientgui/Localization.cpp:69
+#: Localization.cpp:31 Localization.cpp:69
 msgid "Message boards"
 msgstr "Forum"
 
-#: clientgui/Localization.cpp:33
+#: Localization.cpp:33
 msgid "Correspond with other users on the SETI at home message boards"
 msgstr "Wymieniaj informacje z innymi użytkownikami SETI at home"
 
-#: clientgui/Localization.cpp:37
+#: Localization.cpp:37
 msgid "Ask questions and report problems"
 msgstr "Zadaj pytanie lub zgłoś problem"
 
-#: clientgui/Localization.cpp:39
-#: clientgui/Localization.cpp:81
-#: clientgui/Localization.cpp:111
-#: clientgui/Localization.cpp:129
+#: Localization.cpp:39 Localization.cpp:81 Localization.cpp:111
+#: Localization.cpp:129
 msgid "Your account"
 msgstr "Twoje konto"
 
-#: clientgui/Localization.cpp:41
-#: clientgui/Localization.cpp:87
-#: clientgui/Localization.cpp:113
+#: Localization.cpp:41 Localization.cpp:87 Localization.cpp:113
 msgid "View your account information and credit totals"
 msgstr "Zobacz informacje o koncie oraz liczbę punktów"
 
-#: clientgui/Localization.cpp:43
+#: Localization.cpp:43
 msgid "Your preferences"
 msgstr "Preferencje"
 
-#: clientgui/Localization.cpp:45
+#: Localization.cpp:45
 msgid "View and modify your SETI at home account profile and preferences"
 msgstr "Sprawdź lub zmodyfikuj swój profil i preferencje dla projektu SETI at home"
 
-#: clientgui/Localization.cpp:47
-#: clientgui/Localization.cpp:89
+#: Localization.cpp:47 Localization.cpp:89
 msgid "Your results"
 msgstr "Wyniki"
 
-#: clientgui/Localization.cpp:49
-#: clientgui/Localization.cpp:91
+#: Localization.cpp:49 Localization.cpp:91
 msgid "View your last week (or more) of computational results and work"
 msgstr "Sprawdź ostatnie wyniki swoich obliczeń"
 
-#: clientgui/Localization.cpp:51
-#: clientgui/Localization.cpp:93
+#: Localization.cpp:51 Localization.cpp:93
 msgid "Your computers"
 msgstr "Komputery"
 
-#: clientgui/Localization.cpp:53
+#: Localization.cpp:53
 msgid "View a listing of all the computers on which you are running SETI at Home"
 msgstr "Obejrzyj listę twoich komputerów, na których uruchamiasz SETI at Home"
 
-#: clientgui/Localization.cpp:55
-#: clientgui/Localization.cpp:97
+#: Localization.cpp:55 Localization.cpp:97
 msgid "Your team"
 msgstr "Zespół"
 
-#: clientgui/Localization.cpp:57
-#: clientgui/Localization.cpp:99
+#: Localization.cpp:57 Localization.cpp:99
 msgid "View information about your team"
 msgstr "Obejrzyj informacje dotyczące twojego zespołu"
 
-#: clientgui/Localization.cpp:61
+#: Localization.cpp:61
 msgid "Common questions"
 msgstr "Najczęściej zadawane pytania"
 
-#: clientgui/Localization.cpp:63
+#: Localization.cpp:63
 msgid "Read the Einstein at Home Frequently Asked Question list"
 msgstr "Przeczytaj najczęściej zadawane pytania projektu Einstein at Home"
 
-#: clientgui/Localization.cpp:65
+#: Localization.cpp:65
 msgid "Screensaver info"
 msgstr "Informacje o wygaszaczu"
 
-#: clientgui/Localization.cpp:67
+#: Localization.cpp:67
 msgid "Read a detailed description of the Einstein at Home screensaver"
 msgstr "Przeczytaj dokładną instrukcję dotyczącą wygaszacza Einstein at Home"
 
-#: clientgui/Localization.cpp:71
-msgid "Correspond with admins and other users on the Einstein at Home message boards"
+#: Localization.cpp:71
+msgid ""
+"Correspond with admins and other users on the Einstein at Home message boards"
 msgstr "Porozmawiaj z innymi uczestnikami projektu Einstein at Home"
 
-#: clientgui/Localization.cpp:73
+#: Localization.cpp:73
 msgid "Einstein status"
 msgstr "Status Einstein at Home"
 
-#: clientgui/Localization.cpp:75
+#: Localization.cpp:75
 msgid "Current status of the Einstein at Home server"
 msgstr "Aktualny status serwerów Einstein at Home"
 
-#: clientgui/Localization.cpp:77
+#: Localization.cpp:77
 msgid "Report problems"
 msgstr "Zgłoś problem"
 
-#: clientgui/Localization.cpp:79
+#: Localization.cpp:79
 msgid "A link to the Einstein at Home problems and bug reports message board"
-msgstr "Link służący do zgłaszania problemów związanych z projektem Einstein at Home"
+msgstr ""
+"Link służący do zgłaszania problemów związanych z projektem Einstein at Home"
 
-#: clientgui/Localization.cpp:83
+#: Localization.cpp:83
 msgid "View and modify your Einstein at Home account profile and preferences"
-msgstr "Sprawdź lub zmodyfikuj swój profil i preferencje dla projektu Einstein at Home"
+msgstr ""
+"Sprawdź lub zmodyfikuj swój profil i preferencje dla projektu Einstein at Home"
 
-#: clientgui/Localization.cpp:85
+#: Localization.cpp:85
 msgid "Account summary"
 msgstr "Dane konta"
 
-#: clientgui/Localization.cpp:95
-msgid "View a listing of all the computers on which you are running Einstein at Home"
+#: Localization.cpp:95
+msgid ""
+"View a listing of all the computers on which you are running Einstein at Home"
 msgstr "Obejrzyj listę twoich komputerów, na których uruchamiasz Einstein at Home"
 
-#: clientgui/Localization.cpp:101
+#: Localization.cpp:101
 msgid "LIGO project"
 msgstr "Projekt LIGO"
 
-#: clientgui/Localization.cpp:103
-msgid "The home page of the Laser Interferometer Gravitational-wave Observatory (LIGO) project"
+#: Localization.cpp:103
+msgid ""
+"The home page of the Laser Interferometer Gravitational-wave Observatory "
+"(LIGO) project"
 msgstr "Strona domowa projektu LIGO"
 
-#: clientgui/Localization.cpp:105
+#: Localization.cpp:105
 msgid "GEO-600 project"
 msgstr "Projekt GEO-600"
 
-#: clientgui/Localization.cpp:107
+#: Localization.cpp:107
 msgid "The home page of the GEO-600 project"
 msgstr "Strona domowa projektu GEO-600"
 
-#: clientgui/Localization.cpp:115
-#: clientgui/Localization.cpp:133
+#: Localization.cpp:115 Localization.cpp:133 ViewProjects.cpp:221
+#: ViewStatistics.cpp:465
 msgid "Team"
 msgstr "Zespół"
 
-#: clientgui/Localization.cpp:117
+#: Localization.cpp:117
 msgid "Info about your Team"
 msgstr "Informacje o twoim zespole"
 
-#: clientgui/Localization.cpp:123
+#: Localization.cpp:123
 msgid "Get help for climateprediction.net"
 msgstr "Pomoc dla projektu climeteprediction.net"
 
-#: clientgui/Localization.cpp:125
+#: Localization.cpp:125
 msgid "News"
 msgstr "Aktualności"
 
-#: clientgui/Localization.cpp:127
+#: Localization.cpp:127
 msgid "climateprediction.net News"
 msgstr "Aktualności projektu climeteprediction.net"
 
-#: clientgui/Localization.cpp:131
+#: Localization.cpp:131
 msgid "View your account information, credits, and trickles"
 msgstr "Zobacz informacje dotyczące twojego konta"
 
-#: clientgui/Localization.cpp:135
+#: Localization.cpp:135
 msgid "Info about your team"
 msgstr "Informacje o twoim zespole"
 
-#: clientgui/Localization.cpp:141
+#: Localization.cpp:141
 msgid "Search for help in our help system"
 msgstr "Szukaj informacji w naszym systemie pomocy"
 
-#: clientgui/Localization.cpp:143
+#: Localization.cpp:143
 msgid "Global Statistics"
 msgstr "Statystyki globalne"
 
-#: clientgui/Localization.cpp:145
+#: Localization.cpp:145
 msgid "Summary statistics for World Community Grid"
 msgstr "Sumaryczne statystyki dla World Community Grid"
 
-#: clientgui/Localization.cpp:147
+#: Localization.cpp:147
 msgid "My Grid"
 msgstr "Moje WCG"
 
-#: clientgui/Localization.cpp:149
+#: Localization.cpp:149
 msgid "Your statistics and settings"
 msgstr "Twoje statystyki i ustawienia"
 
-#: clientgui/Localization.cpp:151
+#: Localization.cpp:151
 msgid "Device Profiles"
 msgstr "Profile sprzętowe"
 
-#: clientgui/Localization.cpp:153
+#: Localization.cpp:153
 msgid "Update your device settings"
 msgstr "Zaktualizuj swoje ustawienia urządzeń"
 
-#: clientgui/Localization.cpp:155
+#: Localization.cpp:155
 msgid "Research"
 msgstr "Badania"
 
-#: clientgui/Localization.cpp:157
+#: Localization.cpp:157
 msgid "Learn about the projects hosted at World Community Grid"
 msgstr "Dowiedz się więcej o projektach funkcjonujących na World Community Grid"
 
-#: clientgui/MainDocument.cpp:583
+#: MainDocument.cpp:583
 msgid "Starting client"
 msgstr "Uruchamianie klienta"
 
-#: clientgui/MainDocument.cpp:591
+#: MainDocument.cpp:591
 msgid "Connecting to client"
 msgstr "Łączenie z klientem"
 
-#: clientgui/MainDocument.cpp:1205
+#: MainDocument.cpp:1195
 msgid "Retrieving system state; please wait..."
 msgstr "Sprawdzanie stan systemu; proszę czekać..."
 
-#: clientgui/MainDocument.cpp:1826
+#: MainDocument.cpp:1816
 msgid "Missing application"
 msgstr "Brakująca aplikacja"
 
-#: clientgui/MainDocument.cpp:1827
-msgid "Please download and install the CoRD application from http://cord.sourceforge.net"
-msgstr "Pobierz i zainstaluj aplikację CoRD ze strony http://cord.sourceforge.net"
+#: MainDocument.cpp:1817
+msgid ""
+"Please download and install the CoRD application from http://cord."
+"sourceforge.net"
+msgstr ""
+"Pobierz i zainstaluj aplikację CoRD ze strony http://cord.sourceforge.net"
 
-#: clientgui/MainDocument.cpp:2442
+#: MainDocument.cpp:2432
 msgid "on batteries"
 msgstr "zasilanie z baterii"
 
-#: clientgui/MainDocument.cpp:2443
+#: MainDocument.cpp:2433
 msgid "computer is in use"
 msgstr "komputer jest w użyciu"
 
-#: clientgui/MainDocument.cpp:2444
+#: MainDocument.cpp:2434
 msgid "user request"
 msgstr "żądanie użytkownika"
 
-#: clientgui/MainDocument.cpp:2445
+#: MainDocument.cpp:2435
 msgid "time of day"
 msgstr "pora dnia"
 
-#: clientgui/MainDocument.cpp:2446
+#: MainDocument.cpp:2436
 msgid "CPU benchmarks in progress"
 msgstr "Testowanie procesora w trakcie"
 
-#: clientgui/MainDocument.cpp:2447
+#: MainDocument.cpp:2437
 msgid "need disk space - check preferences"
 msgstr "potrzeba przestrzeni dyskowej - sprawdź preferencje"
 
-#: clientgui/MainDocument.cpp:2448
+#: MainDocument.cpp:2438
 msgid "computer is not in use"
 msgstr "komputer nie jest w użyciu"
 
-#: clientgui/MainDocument.cpp:2449
+#: MainDocument.cpp:2439
 msgid "starting up"
 msgstr "uruchamianie"
 
-#: clientgui/MainDocument.cpp:2450
+#: MainDocument.cpp:2440
 msgid "an exclusive app is running"
 msgstr "uruchomiona jest aplikacja z priorytetem wyłączności"
 
-#: clientgui/MainDocument.cpp:2451
+#: MainDocument.cpp:2441
 msgid "CPU is busy"
 msgstr "procesor jest zajęty"
 
-#: clientgui/MainDocument.cpp:2452
+#: MainDocument.cpp:2442
 msgid "network bandwidth limit exceeded"
 msgstr "przekroczono limit przesyłanych danych"
 
-#: clientgui/MainDocument.cpp:2453
+#: MainDocument.cpp:2443
 msgid "requested by operating system"
 msgstr "na żądanie systemu operacyjnego"
 
-#: clientgui/MainDocument.cpp:2455
+#: MainDocument.cpp:2445
 msgid "unknown reason"
 msgstr "przyczyna nieznana"
 
-#: clientgui/MainDocument.cpp:2477
+#: MainDocument.cpp:2467
 msgid "GPU missing, "
 msgstr "Brak dostępnego GPU, "
 
-#: clientgui/MainDocument.cpp:2484
+#: MainDocument.cpp:2474
 msgid "New"
 msgstr "Nowy"
 
-#: clientgui/MainDocument.cpp:2488
+#: MainDocument.cpp:2478
 msgid "Download failed"
 msgstr "Pobieranie nie powiodło się"
 
-#: clientgui/MainDocument.cpp:2490
+#: MainDocument.cpp:2480
 msgid "Downloading"
 msgstr "Pobieranie"
 
-#: clientgui/MainDocument.cpp:2492
-#: clientgui/MainDocument.cpp:2557
+#: MainDocument.cpp:2482 MainDocument.cpp:2552
 msgid " (suspended - "
 msgstr " (wstrzymany - "
 
-#: clientgui/MainDocument.cpp:2500
+#: MainDocument.cpp:2490
 msgid "Project suspended by user"
 msgstr "Projekt wstrzymany przez użytkownika"
 
-#: clientgui/MainDocument.cpp:2502
+#: MainDocument.cpp:2492
 msgid "Task suspended by user"
 msgstr "Zadanie wstrzymane przez użytkownika"
 
-#: clientgui/MainDocument.cpp:2504
+#: MainDocument.cpp:2494
 msgid "Suspended - "
 msgstr "Wstrzymany - "
 
 # 75%
-#: clientgui/MainDocument.cpp:2510
+#: MainDocument.cpp:2500
 #, fuzzy
 msgid "GPU suspended - "
 msgstr " (wstrzymany - "
 
-#: clientgui/MainDocument.cpp:2517
+#: MainDocument.cpp:2507
 msgid "Waiting for memory"
 msgstr "Brak dostępnej pamięci RAM"
 
-#: clientgui/MainDocument.cpp:2519
+#: MainDocument.cpp:2509
 msgid "Waiting for shared memory"
 msgstr "Oczekiwanie na zwolnienie współdzielonej pamięci RAM"
 
-#: clientgui/MainDocument.cpp:2521
+#: MainDocument.cpp:2512
+msgid "Running, high priority"
+msgstr "Przetwarzany, wysoki priorytet"
+
+#: MainDocument.cpp:2514
 msgid "Running"
 msgstr "Przetwarzany"
 
-#: clientgui/MainDocument.cpp:2523
+#: MainDocument.cpp:2517
 msgid " (non-CPU-intensive)"
 msgstr " (nie wykorzystujący intensywnie CPU)"
 
-#: clientgui/MainDocument.cpp:2526
+#: MainDocument.cpp:2520
 msgid "Waiting to run"
 msgstr "Oczekujący na uruchomienie"
 
-#: clientgui/MainDocument.cpp:2528
-#: clientgui/MainDocument.cpp:2534
+#: MainDocument.cpp:2522 MainDocument.cpp:2528
 msgid "Ready to start"
 msgstr "Gotowy do uruchomienia"
 
-#: clientgui/MainDocument.cpp:2538
-msgid "Postponed: "
-msgstr ""
+#: MainDocument.cpp:2532
+msgid " (Scheduler wait: "
+msgstr "(Oczekiwanie: "
 
-#: clientgui/MainDocument.cpp:2541
-msgid "Postponed"
-msgstr ""
+#: MainDocument.cpp:2536
+msgid " (Scheduler wait)"
+msgstr "(Oczekiwanie)"
 
-#: clientgui/MainDocument.cpp:2545
-msgid "Waiting for network access"
-msgstr ""
+#: MainDocument.cpp:2540
+msgid " (Waiting for network access)"
+msgstr "(Oczekiwanie na dostęp do sieci)"
 
-#: clientgui/MainDocument.cpp:2549
+#: MainDocument.cpp:2544
 msgid "Computation error"
 msgstr "Błąd przetwarzania"
 
-#: clientgui/MainDocument.cpp:2553
+#: MainDocument.cpp:2548
 msgid "Upload failed"
 msgstr "Wysyłanie nie powiodło się"
 
-#: clientgui/MainDocument.cpp:2555
+#: MainDocument.cpp:2550
 msgid "Uploading"
 msgstr "Wysyłanie"
 
-#: clientgui/MainDocument.cpp:2566
+#: MainDocument.cpp:2561
 msgid "Aborted by user"
 msgstr "Przerwany przez użytkownika"
 
-#: clientgui/MainDocument.cpp:2569
+#: MainDocument.cpp:2564
 msgid "Aborted by project"
 msgstr "Przerwany przez serwer projektu"
 
-#: clientgui/MainDocument.cpp:2572
+#: MainDocument.cpp:2567
 msgid "Aborted: not started by deadline"
 msgstr "Przerwany: nie uruchomiono przed terminem"
 
-#: clientgui/MainDocument.cpp:2575
+#: MainDocument.cpp:2570
 msgid "Aborted: disk limit exceeded"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2578
+#: MainDocument.cpp:2573
 msgid "Aborted: run time limit exceeded"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2581
+#: MainDocument.cpp:2576
 msgid "Aborted: memory limit exceeded"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2584
+#: MainDocument.cpp:2579
 msgid "Aborted"
 msgstr "Przerwany"
 
-#: clientgui/MainDocument.cpp:2589
+#: MainDocument.cpp:2584
 msgid "Acknowledged"
 msgstr "Zaraportowany"
 
-#: clientgui/MainDocument.cpp:2591
+#: MainDocument.cpp:2586
 msgid "Ready to report"
 msgstr "Gotowy do zaraportowania"
 
-#: clientgui/MainDocument.cpp:2593
+#: MainDocument.cpp:2588
 #, c-format
 msgid "Error: invalid state '%d'"
 msgstr "Błąd: niepoprawny status '%d'"
 
-#: clientgui/NoInternetConnectionPage.cpp:179
+#: NoInternetConnectionPage.cpp:179
 msgid "No Internet connection"
 msgstr "Brak dostępnego połączenia sieciowego"
 
-#: clientgui/NoInternetConnectionPage.cpp:182
+#: NoInternetConnectionPage.cpp:182
 msgid "Please connect to the Internet and try again."
 msgstr "Połącz się z internetem i spróbuj ponownie."
 
-#: clientgui/NotDetectedPage.cpp:181
+#: NotDetectedPage.cpp:181
 msgid "Project not found"
 msgstr "Projekt nie został odnaleziony"
 
-#: clientgui/NotDetectedPage.cpp:184
+#: NotDetectedPage.cpp:184
 msgid ""
 "The URL you supplied is not that of a BOINC-based project.\n"
 "\n"
@@ -2568,11 +2538,11 @@ msgstr ""
 "\n"
 "Sprawdź adres i spróbuj ponownie."
 
-#: clientgui/NotDetectedPage.cpp:188
+#: NotDetectedPage.cpp:188
 msgid "Account manager not found"
 msgstr "Menadżer kont nie został znaleziony"
 
-#: clientgui/NotDetectedPage.cpp:191
+#: NotDetectedPage.cpp:191
 msgid ""
 "The URL you supplied is not that of a BOINC-based account\n"
 "manager.\n"
@@ -2583,90 +2553,92 @@ msgstr ""
 "\n"
 "Sprawdź adres i spróbuj ponownie."
 
-#: clientgui/NotFoundPage.cpp:181
+#: NotFoundPage.cpp:181
 msgid "Login Failed."
 msgstr "Logowanie nie powiodło się."
 
-#: clientgui/NotFoundPage.cpp:185
+#: NotFoundPage.cpp:185
 msgid "Check the username and password, and try again."
 msgstr "Sprawdź login oraz hasło i spróbuj ponownie."
 
-#: clientgui/NotFoundPage.cpp:189
+#: NotFoundPage.cpp:189
 msgid "Check the email address and password, and try again."
 msgstr "Sprawdź adres e-mail oraz hasło i spróbuj ponownie."
 
-#: clientgui/NoticeListCtrl.cpp:229
+#: NoticeListCtrl.cpp:222
 msgid "more..."
 msgstr "więcej..."
 
-#: clientgui/ProjectInfoPage.cpp:221
+#: ProjectInfoPage.cpp:477 ProjectInfoPage.cpp:778 ProjectInfoPage.cpp:782
+msgid "All"
+msgstr "Wszystkie"
+
+#: ProjectInfoPage.cpp:615
 msgid "Choose a project"
 msgstr "Wybierz projekt"
 
-#: clientgui/ProjectInfoPage.cpp:228
+#: ProjectInfoPage.cpp:619
 msgid "To choose a project, click its name or type its URL below."
-msgstr "Aby wybrać projekt kliknij jego nazwę albo wpisz jego adres URL poniżej."
+msgstr ""
+"Aby wybrać projekt kliknij jego nazwę albo wpisz jego adres URL poniżej."
 
-#: clientgui/ProjectInfoPage.cpp:246
+#: ProjectInfoPage.cpp:623
 msgid "Categories:"
 msgstr "Kategorie:"
 
-#: clientgui/ProjectInfoPage.cpp:267
+#: ProjectInfoPage.cpp:627 sg_ProjectPanel.cpp:89
 msgid "Projects:"
 msgstr "Projekty:"
 
-#: clientgui/ProjectInfoPage.cpp:279
+#: ProjectInfoPage.cpp:631
 msgid "Project details"
 msgstr "Szczegóły projektu"
 
-#: clientgui/ProjectInfoPage.cpp:291
+#: ProjectInfoPage.cpp:635
 msgid "Research area:"
 msgstr "Obszar badań:"
 
-#: clientgui/ProjectInfoPage.cpp:302
+#: ProjectInfoPage.cpp:639
 msgid "Organization:"
 msgstr "Organizacja:"
 
-#: clientgui/ProjectInfoPage.cpp:313
+#: ProjectInfoPage.cpp:643
 msgid "Web site:"
 msgstr "Strona:"
 
-#: clientgui/ProjectInfoPage.cpp:325
+#: ProjectInfoPage.cpp:647
 msgid "Supported systems:"
 msgstr "Obsługiwane systemy:"
 
-#: clientgui/ProjectInfoPage.cpp:363
+#: ProjectInfoPage.cpp:651
 msgid "Project URL:"
 msgstr "Adres projektu:"
 
-#: clientgui/ProjectInfoPage.cpp:499
-#: clientgui/ProjectInfoPage.cpp:754
-#: clientgui/ProjectInfoPage.cpp:758
-msgid "All"
-msgstr "Wszystkie"
-
-#: clientgui/ProjectInfoPage.cpp:802
-msgid "This project may not have work for your type of computer.  Do you want to add it anyway?"
-msgstr "Projekt może nie dysponować zadaniami odpowiednimi dla twojego komputera. Czy na pewno chcesz kontynuować?"
+#: ProjectInfoPage.cpp:826
+msgid ""
+"This project may not have work for your type of computer.  Do you want to "
+"add it anyway?"
+msgstr ""
+"Projekt może nie dysponować zadaniami odpowiednimi dla twojego komputera. "
+"Czy na pewno chcesz kontynuować?"
 
-#: clientgui/ProjectInfoPage.cpp:826
+#: ProjectInfoPage.cpp:850
 msgid "You already added this project. Please choose a different project."
 msgstr "Jesteś już przyłączony do tego projektu. Wybierz inny projekt."
 
-#: clientgui/ProjectProcessingPage.cpp:321
+#: ProjectProcessingPage.cpp:321
 msgid "Communicating with project."
 msgstr "Trwa wymiana informacji z serwerem."
 
-#: clientgui/ProjectProcessingPage.cpp:510
+#: ProjectProcessingPage.cpp:509
 msgid "Required files not found on the server."
 msgstr "Wymagane pliki nie zostały odnalezione na serwerze."
 
-#: clientgui/ProjectProcessingPage.cpp:513
-#: clientgui/ProjectProcessingPage.cpp:586
+#: ProjectProcessingPage.cpp:512 ProjectProcessingPage.cpp:574
 msgid "An internal server error has occurred."
 msgstr "Wystąpił wewnętrzny błąd serwera."
 
-#: clientgui/ProjectPropertiesPage.cpp:334
+#: ProjectPropertiesPage.cpp:334
 msgid ""
 "Communicating with project\n"
 "Please wait..."
@@ -2674,48 +2646,11 @@ msgstr ""
 "Łączenie z serwerem projektu\n"
 "Proszę czekać..."
 
-#: clientgui/ProjectWelcomePage.cpp:251
-#, c-format
-msgid "Welcome to %s."
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:254
-msgid "You have volunteered to compute for this project:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:255
-msgid "Name:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:258
-msgid "Home:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:262
-msgid "Description:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:265
-msgid "URL:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:268
-msgid "User:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:273
-msgid "WARNING: This project is not registered with BOINC.  Make sure you trust it before continuing."
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:277
-msgid "To continue, click Next."
-msgstr "Aby kontynuować naciśnij Dalej."
-
-#: clientgui/ProxyInfoPage.cpp:195
+#: ProxyInfoPage.cpp:195
 msgid "Network communication failure"
 msgstr "Błąd komunikacji sieciowej"
 
-#: clientgui/ProxyInfoPage.cpp:199
+#: ProxyInfoPage.cpp:199
 msgid ""
 "The World Community Grid - BOINC software failed to communicate\n"
 "over the Internet. The most likely reasons are:\n"
@@ -2745,7 +2680,7 @@ msgstr ""
 "3) Używasz serwera proxy.\n"
 "Kliknij Dalej, aby skonfigurować ustawienia proxy."
 
-#: clientgui/ProxyInfoPage.cpp:203
+#: ProxyInfoPage.cpp:203
 msgid ""
 "BOINC failed to communicate on the Internet.\n"
 "The most likely reasons are:\n"
@@ -2775,393 +2710,1098 @@ msgstr ""
 "3) Używasz serwera proxy.\n"
 "Kliknij Dalej, aby skonfigurować ustawienia proxy."
 
-#: clientgui/ProxyPage.cpp:331
+#: ProxyPage.cpp:331
 msgid "Proxy configuration"
 msgstr "Konfiguracja proxy"
 
-#: clientgui/ProxyPage.cpp:334
+#: ProxyPage.cpp:334
 msgid "HTTP proxy"
 msgstr "Serwer HTTP Proxy"
 
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
+#: ProxyPage.cpp:337 ProxyPage.cpp:357
 msgid "Server:"
 msgstr "Serwer:"
 
-#: clientgui/ProxyPage.cpp:350
+#: ProxyPage.cpp:350
 msgid "Autodetect"
 msgstr "Autodetekcja"
 
-#: clientgui/ProxyPage.cpp:354
+#: ProxyPage.cpp:354
 msgid "SOCKS proxy"
 msgstr "Serwer SOCKS Proxy"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:167
-msgid "Advanced View...\tCtrl+Shift+A"
-msgstr "Widok zaawansowany...\tCtrl+Shift+A"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:168
-msgid "Display the advanced graphical interface."
-msgstr "Przełącza do widoku zaawansowanego."
+#: TermsOfUsePage.cpp:218
+msgid "Terms of Use"
+msgstr "Zasady użytkowania"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:175
-msgid "Skin"
-msgstr "Skórka"
+#: TermsOfUsePage.cpp:222
+msgid "Please read the following terms of use:"
+msgstr "Zapoznaj się z następującymi zasadami użytkowania:"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:177
-msgid "Select the appearance of the user interface."
-msgstr "Wybierz wygląd interfejsu."
+#: TermsOfUsePage.cpp:231
+msgid "I agree to the terms of use."
+msgstr "Zgadzam się z zasadami użytkowania."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:224
-#, c-format
-msgid "&%s"
-msgstr "&%s"
+#: TermsOfUsePage.cpp:237
+#, fuzzy
+msgid "I do not agree to the terms of use."
+msgstr "Nie zgadzam się z zasadami użytkowania."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:405
-msgid "Default"
-msgstr "Domyślna"
+#: UnavailablePage.cpp:183
+msgid "Project temporarily unavailable"
+msgstr "Projekt tymczasowo niedostępny"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:848
-msgid "Suspend"
-msgstr "Wstrzymaj"
+#: UnavailablePage.cpp:186
+msgid ""
+"The project is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr ""
+"Ten projekt jest tymczasowo niedostepny.\n"
+"\n"
+"Spróbuj ponownie później."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:850
-msgid "Suspend Computing"
-msgstr "Wstrzymaj przetwarzanie"
+#: UnavailablePage.cpp:190
+msgid "Account manager temporarily unavailable"
+msgstr "Menadżer kont jest czasowo niedostępny"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:851
-msgid "Resume Computing"
-msgstr "Wznów przetwarzanie"
+#: UnavailablePage.cpp:193
+msgid ""
+"The account manager is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr ""
+"Ten menadżer kont jest tymczasowo niedostępny.\n"
+"\n"
+"Spróbuj ponownie później."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:867
-msgid "Notices"
-msgstr "Powiadomienia"
+#: ValidateAccountKey.cpp:68
+msgid "Please specify an account key to continue."
+msgstr "Podaj klucz konta aby kontynuować."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:868
-msgid "Open a window to view notices from projects or BOINC"
-msgstr "Otwiera okno z powiadomieniami z serwera lub z BOINC"
+#: ValidateAccountKey.cpp:71
+msgid "Invalid Account Key; please enter a valid Account Key"
+msgstr "Nieprawidłowy klucz kona. Podaj prawidłowy klucz."
 
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
-msgstr ""
+#: ValidateAccountKey.cpp:82 ValidateEmailAddress.cpp:86
+msgid "Validation conflict"
+msgstr "Błąd uwierzytelniania"
 
-#: clientgui/sg_DlgMessages.cpp:132
-msgid "There are no notices at this time."
-msgstr "Aktualnie nie ma żadnych powiadomień."
+#: ValidateEmailAddress.cpp:72
+msgid "Please specify an email address"
+msgstr "Podaj adres e-mail"
 
-#: clientgui/sg_DlgMessages.cpp:146
-msgid "Close"
-msgstr "Zamknij"
+#: ValidateEmailAddress.cpp:75
+msgid "Invalid email address; please enter a valid email address"
+msgstr "Nieprawidłowy adres e-mail. Wprowadź prawidłowy adres."
 
-#: clientgui/sg_DlgMessages.cpp:394
-#, c-format
-msgid "%s - Notices"
-msgstr "%s - Powiadomienia"
+#: ValidateURL.cpp:69
+msgid "Missing URL"
+msgstr "Brak adresu URL"
 
-#: clientgui/sg_DlgPreferences.cpp:270
-msgid "This dialog controls preferences for this computer only."
-msgstr "To okno kontroluje jedynie preferencje dla tego komputera."
+#: ValidateURL.cpp:70
+msgid ""
+"Please specify a URL.\n"
+"For example:\n"
+"http://www.example.com/"
+msgstr ""
+"Podaj adres URL.\n"
+"Na przykład:\n"
+"http://www.example.com/"
 
-#: clientgui/sg_DlgPreferences.cpp:275
-msgid "Click OK to set preferences."
-msgstr "Naciśnij OK aby zapisać preferencje."
+#: ValidateURL.cpp:83 ValidateURL.cpp:87 ValidateURL.cpp:91
+#: ValidateURL.cpp:103 ValidateURL.cpp:107 ValidateURL.cpp:110
+msgid "Invalid URL"
+msgstr "Nieprawidłowy adres URL"
 
-#: clientgui/sg_DlgPreferences.cpp:280
-msgid "Click Clear to restore web-based settings for all preferences listed below."
+#: ValidateURL.cpp:84 ValidateURL.cpp:88 ValidateURL.cpp:92
+msgid ""
+"Please specify a valid URL.\n"
+"For example:\n"
+"http://boincproject.example.com"
 msgstr ""
+"Podaj prawidłowy adres URL.\n"
+"Na przykład:\n"
+"http://boincproject.example.com"
 
-#: clientgui/sg_DlgPreferences.cpp:287
-#, fuzzy
-msgid "For additional settings, select Computing Preferences in the Advanced View."
-msgstr "Dla dodatkowych ustawień wybierze preferencje przetwarzania w "
+#: ValidateURL.cpp:104 ValidateURL.cpp:108
+#, c-format
+msgid "'%s' does not contain a valid host name."
+msgstr "'%s' nie zawiera poprawnej nazwy hosta."
 
-#: clientgui/sg_DlgPreferences.cpp:315
-msgid "Do work only between:"
-msgstr "Przetwarzaj dane tylko pomiędzy:"
+#: ValidateURL.cpp:111
+#, c-format
+msgid "'%s' does not contain a valid path."
+msgstr "'%s' nie zawiera poprawnej ścieżki."
 
-#: clientgui/sg_DlgPreferences.cpp:337
-msgid "Connect to internet only between:"
-msgstr "Łącz się z internetem tylko pomiędzy:"
+#: ViewMessages.cpp:84 ViewProjects.cpp:170 ViewStatistics.cpp:1978
+#: ViewTransfers.cpp:160 ViewWork.cpp:183
+msgid "Commands"
+msgstr "Polecenia"
 
-#: clientgui/sg_DlgPreferences.cpp:359
-#: clientgui/sg_DlgPreferences.cpp:376
-msgid "Use no more than:"
-msgstr "Używaj nie więcej niż:"
+#: ViewMessages.cpp:88
+msgid "Copy all messages"
+msgstr "Kopiuj wszystkie wiadomości"
 
-#: clientgui/sg_DlgPreferences.cpp:372
-msgid "of disk space"
-msgstr "przestrzeni dysku"
+#: ViewMessages.cpp:95
+msgid "Copy selected messages"
+msgstr "Kopiuj wybrane wiadomości"
 
-#: clientgui/sg_DlgPreferences.cpp:389
-msgid "of the processor"
-msgstr "mocy obliczeniowej procesora"
+#: ViewMessages.cpp:106 ViewMessages.cpp:502
+msgid "Show only this project"
+msgstr "Pokaż tylko ten projekt"
 
-#: clientgui/sg_DlgPreferences.cpp:393
-msgid "Do work while on battery?"
-msgstr "Przetwarzanie danych podczas zasilania z baterii?"
+#: ViewMessages.cpp:107 ViewMessages.cpp:503
+msgid "Show only the messages for the selected project."
+msgstr "Pokazuje wiadomości związane tylko z wybranym projektem."
 
-#: clientgui/sg_DlgPreferences.cpp:406
-msgid "Do work after idle for:"
-msgstr "Przetwarzanie danych tylko po bezczynności przez:"
+#: ViewMessages.cpp:164
+msgid "Messages"
+msgstr "Wiadomości"
 
-#: clientgui/sg_DlgPreferences.cpp:431
-#, fuzzy
-msgid "Clear all local preferences listed above and close the dialog"
-msgstr "Wyczyść lokalne preferencje i zamknij okno"
+#: ViewMessages.cpp:187
+msgid "Copying all messages to the clipboard..."
+msgstr "Kopiowanie wszystkich wiadomości do schowka..."
 
-#: clientgui/sg_DlgPreferences.cpp:609
-#: clientgui/sg_DlgPreferences.cpp:612
-#: clientgui/sg_DlgPreferences.cpp:688
-#: clientgui/sg_DlgPreferences.cpp:692
-#: clientgui/sg_DlgPreferences.cpp:704
-#: clientgui/sg_DlgPreferences.cpp:708
-#: clientgui/sg_DlgPreferences.cpp:851
-#: clientgui/sg_DlgPreferences.cpp:862
-msgid "Anytime"
+#: ViewMessages.cpp:223
+msgid "Copying selected messages to the clipboard..."
+msgstr "Kopiowanie wybranych wiadomości do schowka..."
+
+#: ViewMessages.cpp:286
+msgid "Filtering messages..."
+msgstr "Filtrowanie wiadomości..."
+
+#: ViewMessages.cpp:494
+msgid "Show all messages"
+msgstr "Pokaż wszystkie wiadomości"
+
+#: ViewMessages.cpp:495
+msgid "Show messages for all projects."
+msgstr "Pokazuje wiadomości dotyczące wszystkich projektów."
+
+#: ViewNotices.cpp:58 sg_DlgMessages.cpp:124
+msgid "Fetching notices; please wait..."
+msgstr ""
+
+#: ViewNotices.cpp:65 sg_DlgMessages.cpp:132
+msgid "There are no notices at this time."
+msgstr "Aktualnie nie ma żadnych powiadomień."
+
+#: ViewNotices.cpp:99 sg_BoincSimpleFrame.cpp:776
+msgid "Notices"
+msgstr "Powiadomienia"
+
+#: ViewProjects.cpp:174 sg_ProjectCommandPopup.cpp:61
+msgid "Update"
+msgstr "Zaktualizuj projekt"
+
+#: ViewProjects.cpp:175 sg_ProjectCommandPopup.cpp:62
+msgid ""
+"Report all completed tasks, get latest credit, get latest preferences, and "
+"possibly get more tasks."
+msgstr ""
+"Przesyła informacje o zakończonych obliczeniach oraz aktualizuje preferencje "
+"i wyniki dla danego projektu."
+
+#: 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
+msgid "Suspend"
+msgstr "Wstrzymaj"
+
+#: ViewProjects.cpp:182 ViewProjects.cpp:722 sg_ProjectCommandPopup.cpp:68
+#: sg_ProjectCommandPopup.cpp:114
+msgid "Suspend tasks for this project."
+msgstr "Wstrzymuje przetwarzanie zadań dla danego projektu."
+
+#: ViewProjects.cpp:188 ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:73
+#: sg_ProjectCommandPopup.cpp:121
+msgid "No new tasks"
+msgstr "Nie pobieraj danych"
+
+#: ViewProjects.cpp:189 sg_ProjectCommandPopup.cpp:74
+msgid "Don't get new tasks for this project."
+msgstr "Nie pobieraj nowych zadań do przetwarzania w tym projekcie."
+
+#: ViewProjects.cpp:195 sg_ProjectCommandPopup.cpp:79
+msgid "Reset project"
+msgstr "Zresetuj projekt"
+
+#: ViewProjects.cpp:196 sg_ProjectCommandPopup.cpp:80
+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 ""
+"Usuwa wszystkie pliki związane z danym projektem i pobiera nową porcję "
+"danych do przetwarzania. Przed użyciem możesz skorzystać z funkcji "
+"aktualizacji aby zaraportować zakończone zadania."
+
+#: ViewProjects.cpp:203 sg_ProjectCommandPopup.cpp:86
+msgid ""
+"Remove this project.  Tasks in progress will be lost (use 'Update' first to "
+"report any completed tasks)."
+msgstr ""
+"Odłącza ten komputer od wybranego projektu. Dane będące aktualnie w toku "
+"przetwarzania zostaną utracone. Użyj wczesniej funkcji aktualizacji aby "
+"zaraportować zakończone zadania."
+
+#: ViewProjects.cpp:209 ViewWork.cpp:222 sg_ProjectCommandPopup.cpp:91
+#: sg_TaskCommandPopup.cpp:78
+msgid "Properties"
+msgstr "Właściwości"
+
+#: ViewProjects.cpp:210 sg_ProjectCommandPopup.cpp:92
+msgid "Show project details."
+msgstr "Pokazuje szczegóły projektu."
+
+#: ViewProjects.cpp:220 ViewStatistics.cpp:450
+msgid "Account"
+msgstr "Konto"
+
+#: ViewProjects.cpp:222
+msgid "Work done"
+msgstr "Wynik całkowity"
+
+#: ViewProjects.cpp:223
+msgid "Avg. work done"
+msgstr "Średni wynik"
+
+#: ViewProjects.cpp:225 ViewTransfers.cpp:188 ViewWork.cpp:234
+msgid "Status"
+msgstr "Status"
+
+#: ViewProjects.cpp:250
+msgid "Projects"
+msgstr "Projekty"
+
+#: ViewProjects.cpp:302
+msgid "Updating project..."
+msgstr "Aktualizowanie projektu..."
+
+#: ViewProjects.cpp:344
+msgid "Resuming project..."
+msgstr "Wznawianie projektu..."
+
+#: ViewProjects.cpp:348
+msgid "Suspending project..."
+msgstr "Wstrzymywanie projektu..."
+
+#: ViewProjects.cpp:385
+msgid "Telling project to allow additional task downloads..."
+msgstr "Przekazywanie projektowi aby wznowił przydzielanie dodatkowych zadań..."
+
+#: ViewProjects.cpp:389
+msgid "Telling project to not fetch any additional tasks..."
+msgstr "Przekazywanie projektowi aby wstrzymał przydzielanie nowych zadań..."
+
+#: ViewProjects.cpp:425
+msgid "Resetting project..."
+msgstr "Resetowanie projektu..."
+
+#: ViewProjects.cpp:438 sg_ProjectCommandPopup.cpp:214
+#, c-format
+msgid "Are you sure you want to reset project '%s'?"
+msgstr "Czy jesteś pewien, że chcesz zresetować projekt '%s'?"
+
+#: ViewProjects.cpp:444 sg_ProjectCommandPopup.cpp:220
+msgid "Reset Project"
+msgstr "Zresetuj projekt"
+
+#: ViewProjects.cpp:483
+msgid "Removing project..."
+msgstr "Usuwanie projektu..."
+
+#: ViewProjects.cpp:496 sg_ProjectCommandPopup.cpp:251
+#, c-format
+#, c-format, c-format
+msgid "Are you sure you want to remove project '%s'?"
+msgstr "Czy jesteś pewien, że chcesz usunąć projekt '%s'?"
+
+#: ViewProjects.cpp:502 sg_ProjectCommandPopup.cpp:257
+msgid "Remove Project"
+msgstr "Usuń projekt"
+
+#: ViewProjects.cpp:543 ViewWork.cpp:599
+msgid "Launching browser..."
+msgstr "Otwieranie okna przeglądarki..."
+
+#: ViewProjects.cpp:718 sg_ProjectCommandPopup.cpp:111
+msgid "Resume tasks for this project."
+msgstr "Wznów zadania przetwarzane w tym projekcie."
+
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:118
+msgid "Allow new tasks"
+msgstr "Pobieraj nowe dane"
+
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:119
+msgid "Allow fetching new tasks for this project."
+msgstr "Wznawia pobieranie nowych danych dla tego projektu."
+
+#: ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:122
+msgid "Don't fetch new tasks for this project."
+msgstr "Wstrzymuje pobieranie nowych danych dla tego projektu."
+
+#: ViewProjects.cpp:1058
+msgid "Requested by user"
+msgstr "Zażądane przez użytkownika"
+
+#: ViewProjects.cpp:1059
+msgid "To fetch work"
+msgstr "Aby pobrać zadania"
+
+#: ViewProjects.cpp:1060
+msgid "To report completed tasks"
+msgstr "Aby zaraportować zakończone zadania"
+
+#: ViewProjects.cpp:1061
+msgid "To send trickle-up message"
+msgstr "Aby wysłać miniwiadomość"
+
+#: ViewProjects.cpp:1062
+msgid "Requested by account manager"
+msgstr "Zażądane przez menadżera kont"
+
+#: ViewProjects.cpp:1063
+msgid "Project initialization"
+msgstr "Inicjalizacja projektu"
+
+#: ViewProjects.cpp:1064
+msgid "Requested by project"
+msgstr "Zażądane przez projekt"
+
+#: ViewProjects.cpp:1065
+msgid "Unknown reason"
+msgstr "Przyczyna nieznana"
+
+#: ViewProjects.cpp:1079
+msgid "Suspended by user"
+msgstr "Wstrzymany przez użytkownika"
+
+#: ViewProjects.cpp:1082
+msgid "Won't get new tasks"
+msgstr "Nie pobieraj nowych danych"
+
+#: ViewProjects.cpp:1085
+msgid "Project ended - OK to remove"
+msgstr "Projekt zakończony - naciśnij OK aby go usunąć"
+
+#: ViewProjects.cpp:1088
+msgid "Will remove when tasks done"
+msgstr "Usuwa po zakończeniu zadań"
+
+#: ViewProjects.cpp:1091
+msgid "Scheduler request pending"
+msgstr "Oczekiwanie na połączenie z serwerem projektu"
+
+#: ViewProjects.cpp:1097
+msgid "Scheduler request in progress"
+msgstr "Trwa nawiązywanie połączenia z serwerem projektu"
+
+#: ViewProjects.cpp:1100
+msgid "Trickle up message pending"
+msgstr "Wysyłanie miniwiadomości"
+
+#: ViewProjects.cpp:1106
+msgid "Communication deferred "
+msgstr "Komunikacja opóźniona"
+
+#: ViewResources.cpp:62
+msgid "Total disk usage"
+msgstr "Całkowite użycie dysku twardego"
+
+#: ViewResources.cpp:83
+msgid "Disk usage by BOINC projects"
+msgstr "Użycie dysku przez projekty BOINC"
+
+#: ViewResources.cpp:116
+msgid "Disk"
+msgstr "Dysk twardy"
+
+#: ViewResources.cpp:249
+msgid "no projects: 0 bytes used"
+msgstr "brak projektów: 0 bajtów zajętych"
+
+#: ViewResources.cpp:286
+msgid "used by BOINC: "
+msgstr "przestrzeń używana przez BOINC: "
+
+#: ViewResources.cpp:296
+msgid "free, available to BOINC: "
+msgstr "wolna przestrzeń, dostępna dla BOINC: "
+
+#: ViewResources.cpp:306
+msgid "free, not available to BOINC: "
+msgstr "wolna przestrzeń, niedostępna dla BOINC: "
+
+#: ViewResources.cpp:316
+msgid "free: "
+msgstr "wolna przestrzeń: "
+
+#: ViewResources.cpp:326
+msgid "used by other programs: "
+msgstr "przestrzeń używana przez inne aplikacje: "
+
+#: ViewStatistics.cpp:1205
+msgid "User Total"
+msgstr "Całkowite statystyki uczestnika"
+
+#: ViewStatistics.cpp:1206
+msgid "User Average"
+msgstr "Średnie statystyki uczestnika"
+
+#: ViewStatistics.cpp:1207
+msgid "Host Total"
+msgstr "Całkowite statystyki komputera"
+
+#: ViewStatistics.cpp:1208
+msgid "Host Average"
+msgstr "Średnie statystyki komputera"
+
+#: ViewStatistics.cpp:1355
+#, c-format
+msgid "Last update: %.0f days ago"
+msgstr "Ostatnia aktualizacja: %.0f dni temu"
+
+#: ViewStatistics.cpp:1982
+msgid "Show user total"
+msgstr "Całkowite wyniki uczestnika"
+
+#: ViewStatistics.cpp:1983
+msgid "Show total credit for user"
+msgstr "Pokazuje całkowite statystyki uczestnika"
+
+#: ViewStatistics.cpp:1989
+msgid "Show user average"
+msgstr "Pokazuje średnie wyniki uczestnika"
+
+#: ViewStatistics.cpp:1990
+msgid "Show average credit for user"
+msgstr "Pokazuje bieżące statystyki uczestnika"
+
+#: ViewStatistics.cpp:1996
+msgid "Show host total"
+msgstr "Pokazuje całkowite wyniki komputera"
+
+#: ViewStatistics.cpp:1997
+msgid "Show total credit for host"
+msgstr "Pokazuje całkowite statystyki komputera."
+
+#: ViewStatistics.cpp:2003
+msgid "Show host average"
+msgstr "Pokazuje średnie wyniki komputera"
+
+#: ViewStatistics.cpp:2004
+msgid "Show average credit for host"
+msgstr "Pokazuje średnie statystyki komputera"
+
+#: ViewStatistics.cpp:2013
+msgid "< &Previous project"
+msgstr "< &Poprzedni projekt"
+
+#: ViewStatistics.cpp:2014
+msgid "Show chart for previous project"
+msgstr "Pokazuje wykres dla poprzedniego projektu"
+
+#: ViewStatistics.cpp:2019
+msgid "&Next project >"
+msgstr "&Następny projekt >"
+
+#: ViewStatistics.cpp:2020
+msgid "Show chart for next project"
+msgstr "Pokazuje wykres dla następnego projektu"
+
+#: ViewStatistics.cpp:2026 ViewStatistics.cpp:2416
+msgid "Hide project list"
+msgstr "Ukryj listę projektów"
+
+#: ViewStatistics.cpp:2027 ViewStatistics.cpp:2416
+msgid "Use entire area for graphs"
+msgstr "Wykorzystuje całą powierzchnię na wykres"
+
+#: ViewStatistics.cpp:2032
+msgid "Mode view"
+msgstr "Rodzaj widoku"
+
+#: ViewStatistics.cpp:2036
+msgid "One project"
+msgstr "Pojedynczy projekt"
+
+#: ViewStatistics.cpp:2037
+msgid "Show one chart with selected project"
+msgstr "Pokazuje wykres dla wybranego projektu"
+
+#: ViewStatistics.cpp:2043
+msgid "All projects (separate)"
+msgstr "Wszystkie projekty (osobno)"
+
+#: ViewStatistics.cpp:2044
+msgid "Show all projects, one chart per project"
+msgstr "Pokazuje wykresy dla wszystkich projektów, jeden wykres na projekt"
+
+#: ViewStatistics.cpp:2050
+msgid "All projects (together)"
+msgstr "Wszystkie projekty (razem)"
+
+#: ViewStatistics.cpp:2051
+msgid "Show one chart with all projects"
+msgstr "Pokazuje wspólny wykres dla wszystkich projektów"
+
+#: ViewStatistics.cpp:2057
+msgid "All projects (sum)"
+msgstr "Wszystkie projekty (łącznie)"
+
+#: ViewStatistics.cpp:2058
+msgid "Show one chart with sum of projects"
+msgstr "Pokazuje wspólny z sumą wszystkich projektów"
+
+#: ViewStatistics.cpp:2079
+msgid "Statistics"
+msgstr "Statystyki"
+
+#: 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
+msgid "Updating charts..."
+msgstr "Aktualizacja wykresów..."
+
+#: ViewStatistics.cpp:2420
+msgid "Show project list"
+msgstr "Pokaż listę projeków"
+
+#: ViewStatistics.cpp:2420
+msgid "Uses smaller area for graphs"
+msgstr "Wykorzystuje mniejszą przestrzeń dla projektów"
+
+#: ViewTransfers.cpp:164
+msgid "Retry Now"
+msgstr "Próbuj ponownie"
+
+#: ViewTransfers.cpp:165
+msgid "Retry the file transfer now"
+msgstr ""
+
+#: ViewTransfers.cpp:171
+msgid "Abort Transfer"
+msgstr "Przerwij przesyłanie pliku"
+
+#: ViewTransfers.cpp:172
+msgid "Abort this file transfer.  You won't get credit for the task."
+msgstr ""
+
+#: ViewTransfers.cpp:183
+msgid "File"
+msgstr "Plik"
+
+#: ViewTransfers.cpp:184 ViewWork.cpp:233
+msgid "Progress"
+msgstr "Postęp"
+
+#: ViewTransfers.cpp:185
+msgid "Size"
+msgstr "Rozmiar"
+
+#: ViewTransfers.cpp:186
+msgid "Elapsed Time"
+msgstr "Czas trwania"
+
+#: ViewTransfers.cpp:187
+msgid "Speed"
+msgstr "Szybkość"
+
+#: ViewTransfers.cpp:213
+msgid "Transfers"
+msgstr "Przesyłanie"
+
+#: ViewTransfers.cpp:280
+msgid "Network activity is suspended - "
+msgstr "Aktywność sieciowa jest wstrzymana - "
+
+#: ViewTransfers.cpp:282
+msgid ""
+".\n"
+"You can enable it using the Activity menu."
+msgstr ""
+".\n"
+"Możesz ją włączyć używając menu Aktywność."
+
+#: ViewTransfers.cpp:285
+msgid "BOINC"
+msgstr "BOINC"
+
+#: ViewTransfers.cpp:292
+msgid "Retrying transfer now..."
+msgstr "Ponawianie próby przesłania..."
+
+#: ViewTransfers.cpp:330
+msgid "Aborting transfer..."
+msgstr "Przerywanie przesyłania..."
+
+#: ViewTransfers.cpp:343
+#, 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 ""
+"Czy jesteś pewien, że chcesz przerwać przesyłanie pliku '%s'?\n"
+"UWAGA: Przerwanie przesyłania spowoduje skasowanie pliku lub jego już "
+"pobranej części.\n"
+"Jeśli jest to plik z wynikami obliczeń, nie otrzymasz punktów za to zadanie."
+
+#: ViewTransfers.cpp:349
+msgid "Abort File Transfer"
+msgstr "Przerwij przesyłanie pliku"
+
+#: ViewTransfers.cpp:780
+msgid "Upload"
+msgstr "Wysyłanie"
+
+#: ViewTransfers.cpp:780
+msgid "Download"
+msgstr "Pobieranie"
+
+#: ViewTransfers.cpp:784
+msgid "retry in "
+msgstr "ponowna próba za "
+
+#: ViewTransfers.cpp:786
+msgid "failed"
+msgstr "niepowodzenie"
+
+#: ViewTransfers.cpp:789
+msgid "suspended"
+msgstr "zatrzymane"
+
+#: ViewTransfers.cpp:794
+msgid "active"
+msgstr "aktywne"
+
+#: ViewTransfers.cpp:796
+msgid "pending"
+msgstr "trwające"
+
+#: ViewTransfers.cpp:803
+msgid " (project backoff: "
+msgstr " (oczekiwanie: "
+
+#: ViewWork.cpp:187 ViewWork.cpp:777
+msgid "Show active tasks"
+msgstr "Pokaż aktywne zadania"
+
+#: ViewWork.cpp:188 ViewWork.cpp:778
+msgid "Show only active tasks."
+msgstr "Wyświetla wyłącznie aktywne zadania."
+
+#: ViewWork.cpp:194 sg_TaskCommandPopup.cpp:60
+msgid "Show graphics"
+msgstr "Pokaż grafikę"
+
+#: ViewWork.cpp:195 sg_TaskCommandPopup.cpp:61
+msgid "Show application graphics in a window."
+msgstr "Pokaż grafikę aplikacji w oknie."
+
+#: ViewWork.cpp:201
+msgid "Show VM Console"
+msgstr "Pokaż konsolę VM"
+
+#: ViewWork.cpp:202
+msgid "Show VM Console in a window."
+msgstr "Pokazuje okno konsoli VM"
+
+#: ViewWork.cpp:209
+msgid "Suspend work for this result."
+msgstr "Wstrzymuje przetwarzanie tego zadania."
+
+#: ViewWork.cpp:215 sg_TaskCommandPopup.cpp:72
+msgid "Abort"
+msgstr "Przerwij"
+
+#: ViewWork.cpp:216
+msgid "Abandon work on the result. You will get no credit for it."
+msgstr "Przerwij przetwarzanie tego zadania. Nie otrzymasz za nie punktów."
+
+#: ViewWork.cpp:223 sg_TaskCommandPopup.cpp:79
+msgid "Show task details."
+msgstr "Pokaż szczegóły zadania."
+
+#: ViewWork.cpp:235
+msgid "Elapsed"
+msgstr "Upłynęło"
+
+#: ViewWork.cpp:236
+msgid "Remaining (estimated)"
+msgstr "Pozostało (szacowane)"
+
+#: ViewWork.cpp:237
+msgid "Deadline"
+msgstr "Termin"
+
+#: ViewWork.cpp:264
+msgid "Tasks"
+msgstr "Zadania"
+
+#: ViewWork.cpp:357
+msgid "Resuming task..."
+msgstr "Wznawianie zadania..."
+
+#: ViewWork.cpp:360
+msgid "Suspending task..."
+msgstr "Wstrzymywanie zadania..."
+
+#: ViewWork.cpp:389
+msgid "Showing graphics for task..."
+msgstr "Wyświetlanie grafiki dla zadania..."
+
+#: ViewWork.cpp:426
+msgid "Showing VM console for task..."
+msgstr "Pokazywanie konsoli VM dla zadania..."
+
+#: ViewWork.cpp:479
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %s, Status: %s)"
+msgstr ""
+"Czy jesteś pewien, że chcesz przerwać zadanie: '%s'?\n"
+"(Postęp: %s, Status: %s)"
+
+#: ViewWork.cpp:485
+#, c-format
+msgid "Are you sure you want to abort these %d tasks?"
+msgstr "Czy jesteś pewien, że chcesz przerwać te zadania %d?"
+
+#: ViewWork.cpp:490 sg_TaskCommandPopup.cpp:256
+msgid "Abort task"
+msgstr "Przerwij zadanie"
+
+# 75%
+#: ViewWork.cpp:499
+#, fuzzy
+msgid "Aborting task..."
+msgstr "Przerywanie przesyłania..."
+
+#: ViewWork.cpp:771
+msgid "Show all tasks"
+msgstr "Pokaż wszystkie zadania"
+
+#: ViewWork.cpp:772
+msgid "Show all tasks."
+msgstr "Pokaż wszystkie zadania."
+
+#: ViewWork.cpp:796 sg_TaskCommandPopup.cpp:103
+msgid "Resume work for this task."
+msgstr "Wznów to zadanie."
+
+#: ViewWork.cpp:802 sg_TaskCommandPopup.cpp:107
+msgid "Suspend work for this task."
+msgstr "Wstrzymaj to zadanie."
+
+#: WelcomePage.cpp:284
+msgid "Add project or account manager"
+msgstr "Dodaj projekt lub menadżer kont"
+
+#: WelcomePage.cpp:288
+msgid "Add project or use BOINC Account Manager"
+msgstr ""
+
+#: 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 ""
+"Jeśli jest to możliwe, dodawaj projekty przy użyciu\n"
+"strony %s.\n"
+"\n"
+"Projekty dodane przy użyciu tego kreatora\n"
+"nie będą widoczne oraz zarządzane przez %s."
+
+#: 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 ""
+"Aktualnie jest ponad 30 projektów BOINC\n"
+"wykonujących badania w różnych obszarach nauki.\n"
+"Możesz uczestniczyć w dowolnej liczbie projektów.Możesz dodać projekt "
+"bezpośrednio\n"
+"lub skorzystać do wybierania projektów z menadżera kont."
+
+#: 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 ""
+
+#: WelcomePage.cpp:339
+msgid "Use a BOINC Account Manager"
+msgstr ""
+
+#: WelcomePage.cpp:352
+msgid "To continue, click Next."
+msgstr "Aby kontynuować naciśnij Dalej."
+
+#: WelcomePage.cpp:358
+msgid "Add or change your World Community Grid projects"
+msgstr ""
+
+#: WelcomePage.cpp:361
+msgid "Add projects run by other researchers or organizations"
+msgstr ""
+
+#: WizardAttach.cpp:634
+msgid "Do you really want to cancel?"
+msgstr "Czy na pewno chcesz anulować?"
+
+#: WizardAttach.cpp:635
+msgid "Question"
+msgstr "Pytanie"
+
+#: sg_BoincSimpleFrame.cpp:149
+msgid "Advanced View...\tCtrl+Shift+A"
+msgstr "Widok zaawansowany...\tCtrl+Shift+A"
+
+#: sg_BoincSimpleFrame.cpp:150
+msgid "Display the advanced graphical interface."
+msgstr "Przełącza do widoku zaawansowanego."
+
+#: sg_BoincSimpleFrame.cpp:157
+msgid "Skin"
+msgstr "Skórka"
+
+#: sg_BoincSimpleFrame.cpp:159
+msgid "Select the appearance of the user interface."
+msgstr "Wybierz wygląd interfejsu."
+
+#: sg_BoincSimpleFrame.cpp:206
+#, c-format
+msgid "&%s"
+msgstr "&%s"
+
+#: sg_BoincSimpleFrame.cpp:390
+msgid "Default"
+msgstr "Domyślna"
+
+#: sg_BoincSimpleFrame.cpp:759
+msgid "Suspend Computing"
+msgstr "Wstrzymaj przetwarzanie"
+
+#: sg_BoincSimpleFrame.cpp:760
+msgid "Resume Computing"
+msgstr "Wznów przetwarzanie"
+
+#: sg_BoincSimpleFrame.cpp:777
+msgid "Open a window to view notices from projects or BOINC"
+msgstr "Otwiera okno z powiadomieniami z serwera lub z BOINC"
+
+#: sg_DlgMessages.cpp:146
+msgid "Close"
+msgstr "Zamknij"
+
+#: sg_DlgMessages.cpp:389
+#, c-format
+#, c-format, c-format
+msgid "%s - Notices"
+msgstr "%s - Powiadomienia"
+
+#: sg_DlgPreferences.cpp:268
+msgid "This dialog controls preferences for this computer only."
+msgstr "To okno kontroluje jedynie preferencje dla tego komputera."
+
+#: sg_DlgPreferences.cpp:273
+msgid "Click OK to set preferences."
+msgstr "Naciśnij OK aby zapisać preferencje."
+
+#: sg_DlgPreferences.cpp:278
+msgid ""
+"Click Clear to restore web-based settings for all preferences listed below."
+msgstr ""
+
+#: sg_DlgPreferences.cpp:285
+#, fuzzy
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
+msgstr "Dla dodatkowych ustawień wybierze preferencje przetwarzania w "
+
+#: sg_DlgPreferences.cpp:313
+msgid "Do work only between:"
+msgstr "Przetwarzaj dane tylko pomiędzy:"
+
+#: sg_DlgPreferences.cpp:335
+msgid "Connect to internet only between:"
+msgstr "Łącz się z internetem tylko pomiędzy:"
+
+#: sg_DlgPreferences.cpp:357 sg_DlgPreferences.cpp:374
+msgid "Use no more than:"
+msgstr "Używaj nie więcej niż:"
+
+#: sg_DlgPreferences.cpp:370
+msgid "of disk space"
+msgstr "przestrzeni dysku"
+
+#: sg_DlgPreferences.cpp:387
+msgid "of the processor"
+msgstr "mocy obliczeniowej procesora"
+
+#: sg_DlgPreferences.cpp:391
+msgid "Do work while on battery?"
+msgstr "Przetwarzanie danych podczas zasilania z baterii?"
+
+#: sg_DlgPreferences.cpp:404
+msgid "Do work after idle for:"
+msgstr "Przetwarzanie danych tylko po bezczynności przez:"
+
+#: sg_DlgPreferences.cpp:429
+#, fuzzy
+msgid "Clear all local preferences listed above and close the dialog"
+msgstr "Wyczyść lokalne preferencje i zamknij okno"
+
+#: 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 "Zawsze"
 
-#: clientgui/sg_DlgPreferences.cpp:645
+#: sg_DlgPreferences.cpp:638
 msgid "100 MB"
 msgstr "100 MB"
 
-#: clientgui/sg_DlgPreferences.cpp:646
+#: sg_DlgPreferences.cpp:639
 msgid "200 MB"
 msgstr "200 MB"
 
-#: clientgui/sg_DlgPreferences.cpp:647
+#: sg_DlgPreferences.cpp:640
 msgid "500 MB"
 msgstr "500 MB"
 
-#: clientgui/sg_DlgPreferences.cpp:648
+#: sg_DlgPreferences.cpp:641
 msgid "1 GB"
 msgstr "1 GB"
 
-#: clientgui/sg_DlgPreferences.cpp:649
+#: sg_DlgPreferences.cpp:642
 msgid "2 GB"
 msgstr "2 GB"
 
-#: clientgui/sg_DlgPreferences.cpp:650
+#: sg_DlgPreferences.cpp:643
 msgid "5 GB"
 msgstr "5 GB"
 
-#: clientgui/sg_DlgPreferences.cpp:651
+#: sg_DlgPreferences.cpp:644
 msgid "10 GB"
 msgstr "10 GB"
 
-#: clientgui/sg_DlgPreferences.cpp:652
+#: sg_DlgPreferences.cpp:645
 msgid "20 GB"
 msgstr "20 GB"
 
-#: clientgui/sg_DlgPreferences.cpp:653
+#: sg_DlgPreferences.cpp:646
 msgid "50 GB"
 msgstr "50 GB"
 
-#: clientgui/sg_DlgPreferences.cpp:654
+#: sg_DlgPreferences.cpp:647
 msgid "100 GB"
 msgstr "100 GB"
 
-#: clientgui/sg_DlgPreferences.cpp:724
+#: sg_DlgPreferences.cpp:717
 #, c-format
 msgid "%d MB"
 msgstr "%d MB"
 
-#: clientgui/sg_DlgPreferences.cpp:726
+#: sg_DlgPreferences.cpp:719
 #, c-format
 msgid "%4.2f GB"
 msgstr "%4.2f GB"
 
-#: clientgui/sg_DlgPreferences.cpp:767
+#: sg_DlgPreferences.cpp:760
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: clientgui/sg_DlgPreferences.cpp:803
+#: sg_DlgPreferences.cpp:796
 msgid "0 (Run Always)"
 msgstr "0 (uruchamiaj zawsze)"
 
-#: clientgui/sg_DlgPreferences.cpp:806
+#: sg_DlgPreferences.cpp:799
 #, c-format
 msgid "%d"
 msgstr "%d"
 
-#: clientgui/sg_DlgPreferences.cpp:953
-#, c-format
-msgid "%s - Computing Preferences"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:1033
+#: sg_DlgPreferences.cpp:1029
 msgid "Do you really want to clear all local preferences?\n"
 msgstr "Czy na pewno chcesz usunąć wszystkie preferencje lokalne?\n"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:66
-#: clientgui/ViewProjects.cpp:179
-msgid "Update"
-msgstr "Zaktualizuj projekt"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:67
-#: clientgui/ViewProjects.cpp:180
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
-msgstr "Przesyła informacje o zakończonych obliczeniach oraz aktualizuje preferencje i wyniki dla danego projektu."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:73
-#: clientgui/sg_ProjectCommandPopup.cpp:129
-#: clientgui/ViewProjects.cpp:187
-#: clientgui/ViewProjects.cpp:727
-msgid "Suspend tasks for this project."
-msgstr "Wstrzymuje przetwarzanie zadań dla danego projektu."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:78
-#: clientgui/sg_ProjectCommandPopup.cpp:136
-#: clientgui/ViewProjects.cpp:193
-#: clientgui/ViewProjects.cpp:746
-msgid "No new tasks"
-msgstr "Nie pobieraj danych"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:79
-#: clientgui/ViewProjects.cpp:194
-msgid "Don't get new tasks for this project."
-msgstr "Nie pobieraj nowych zadań do przetwarzania w tym projekcie."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:200
-msgid "Reset project"
-msgstr "Zresetuj projekt"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:85
-#: clientgui/ViewProjects.cpp:201
-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 "Usuwa wszystkie pliki związane z danym projektem i pobiera nową porcję danych do przetwarzania. Przed użyciem możesz skorzystać z funkcji aktualizacji aby zaraportować zakończone zadania."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:91
-#: clientgui/ViewProjects.cpp:208
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
-msgstr "Odłącza ten komputer od wybranego projektu. Dane będące aktualnie w toku przetwarzania zostaną utracone. Użyj wczesniej funkcji aktualizacji aby zaraportować zakończone zadania."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:96
-#: clientgui/sg_TaskCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:214
-msgid "Properties"
-msgstr "Właściwości"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:97
-#: clientgui/ViewProjects.cpp:215
-msgid "Show project details."
-msgstr "Pokazuje szczegóły projektu."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:126
-#: clientgui/ViewProjects.cpp:723
-msgid "Resume tasks for this project."
-msgstr "Wznów zadania przetwarzane w tym projekcie."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:133
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow new tasks"
-msgstr "Pobieraj nowe dane"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:134
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow fetching new tasks for this project."
-msgstr "Wznawia pobieranie nowych danych dla tego projektu."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:137
-#: clientgui/ViewProjects.cpp:746
-msgid "Don't fetch new tasks for this project."
-msgstr "Wstrzymuje pobieranie nowych danych dla tego projektu."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:229
-#: clientgui/ViewProjects.cpp:443
-#, c-format
-msgid "Are you sure you want to reset project '%s'?"
-msgstr "Czy jesteś pewien, że chcesz zresetować projekt '%s'?"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:235
-#: clientgui/ViewProjects.cpp:449
-msgid "Reset Project"
-msgstr "Zresetuj projekt"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:266
-#: clientgui/ViewProjects.cpp:501
-#, c-format
-msgid "Are you sure you want to remove project '%s'?"
-msgstr "Czy jesteś pewien, że chcesz usunąć projekt '%s'?"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:272
-#: clientgui/ViewProjects.cpp:507
-msgid "Remove Project"
-msgstr "Usuń projekt"
-
-#: clientgui/sg_ProjectPanel.cpp:72
+#: sg_ProjectPanel.cpp:72
 msgid "Add Project"
 msgstr "Dodaj projekt"
 
-#: clientgui/sg_ProjectPanel.cpp:73
+#: sg_ProjectPanel.cpp:73
 msgid "Synchronize"
 msgstr "Synchronizuj"
 
-#: clientgui/sg_ProjectPanel.cpp:74
+#: sg_ProjectPanel.cpp:74
 msgid "Work done for this project"
 msgstr "Przetwarzanie dla tego projektu zakończone"
 
-#: clientgui/sg_ProjectPanel.cpp:77
+#: sg_ProjectPanel.cpp:77
 msgid "Synchronize projects with account manager system"
 msgstr "Zsynchronizuj projekty z menadżerem kont"
 
-#: clientgui/sg_ProjectPanel.cpp:124
+#: sg_ProjectPanel.cpp:124
 msgid "Select a project to access with the controls below"
 msgstr "Wybierz projekt aby uzyskać dostęp do poniższych opcji"
 
-#: clientgui/sg_ProjectPanel.cpp:145
+#: sg_ProjectPanel.cpp:145
 msgid "Project Web Pages"
 msgstr "Strony projektu"
 
-#: clientgui/sg_ProjectPanel.cpp:149
+#: sg_ProjectPanel.cpp:149
 msgid "Project Commands"
 msgstr "Polecenia projektu"
 
-#: clientgui/sg_ProjectPanel.cpp:276
+#: sg_ProjectPanel.cpp:267
 #, c-format
+#, c-format, fuzzy
 msgid "Pop up a menu of web sites for project %s"
 msgstr "Pokazuje menu stron projektu %s"
 
-#: clientgui/sg_ProjectPanel.cpp:278
-#, c-format
-msgid "Pop up a menu of commands to apply to project %s"
-msgstr "Pokazuje menu opcji dla projektu %s"
-
-#: clientgui/sg_TaskCommandPopup.cpp:66
-msgid "Show graphics"
-msgstr "Pokaż grafikę"
-
-#: clientgui/sg_TaskCommandPopup.cpp:67
-msgid "Show application graphics in a window."
-msgstr "Pokaż grafikę aplikacji w oknie."
+#: sg_ProjectPanel.cpp:269
+#, c-format
+msgid "Pop up a menu of commands to apply to project %s"
+msgstr "Pokazuje menu opcji dla projektu %s"
 
-#: clientgui/sg_TaskCommandPopup.cpp:73
+#: sg_TaskCommandPopup.cpp:67
 msgid "Suspend this task."
 msgstr ""
 
-#: clientgui/sg_TaskCommandPopup.cpp:78
-msgid "Abort"
-msgstr "Przerwij"
-
-#: clientgui/sg_TaskCommandPopup.cpp:79
+#: sg_TaskCommandPopup.cpp:73
 msgid "Abandon this task. You will get no credit for it."
 msgstr ""
 
-#: clientgui/sg_TaskCommandPopup.cpp:85
-msgid "Show task details."
-msgstr "Pokaż szczegóły zadania."
-
-#: clientgui/sg_TaskCommandPopup.cpp:119
-msgid "Resume work for this task."
-msgstr "Wznów to zadanie."
-
-#: clientgui/sg_TaskCommandPopup.cpp:123
-msgid "Suspend work for this task."
-msgstr "Wstrzymaj to zadanie."
-
-#: clientgui/sg_TaskCommandPopup.cpp:267
+#: sg_TaskCommandPopup.cpp:251
 #, c-format
+#, c-format, c-format
 msgid ""
 "Are you sure you want to abort this task '%s'?\n"
 "(Progress: %.1lf%%, Status: %s)"
@@ -3169,888 +3809,1097 @@ msgstr ""
 "Czy jesteś pewien, że chcesz przerwać zadanie '%s'?\n"
 "(Postęp: %.1lf%%, Status: %s)"
 
-#: clientgui/sg_TaskCommandPopup.cpp:272
-msgid "Abort task"
-msgstr "Przerwij zadanie"
-
-#: clientgui/sg_TaskPanel.cpp:468
+#: sg_TaskPanel.cpp:464
 msgid "You don't have any projects.  Please Add a Project."
 msgstr "Nie uczestniczysz w żadnym projekcie. Przyłącz się do któregoś z nich."
 
-#: clientgui/sg_TaskPanel.cpp:469
+#: sg_TaskPanel.cpp:465
 msgid "Not available"
 msgstr "Niedostępne"
 
-#: clientgui/sg_TaskPanel.cpp:480
+#: sg_TaskPanel.cpp:476
 msgid "Tasks:"
 msgstr "Zadania:"
 
-#: clientgui/sg_TaskPanel.cpp:486
+#: sg_TaskPanel.cpp:482
 msgid "Select a task to access"
 msgstr "Wybierz zadanie"
 
-#: clientgui/sg_TaskPanel.cpp:497
+#: sg_TaskPanel.cpp:493
 msgid "From:"
 msgstr "Z:"
 
-#: clientgui/sg_TaskPanel.cpp:551
+#: sg_TaskPanel.cpp:547
 msgid "This task's progress"
 msgstr "Postęp tego zadania"
 
-#: clientgui/sg_TaskPanel.cpp:569
+#: sg_TaskPanel.cpp:565
 msgid "Task Commands"
 msgstr "Polecenia zadania"
 
-#: clientgui/sg_TaskPanel.cpp:570
+#: sg_TaskPanel.cpp:566
 msgid "Pop up a menu of commands to apply to this task"
 msgstr "Pokazuje menu z poleceniami dla tego zadania"
 
-#: clientgui/sg_TaskPanel.cpp:705
+#: sg_TaskPanel.cpp:701
 #, c-format
+#, c-format, c-format
 msgid "Application: %s"
 msgstr "Aplikacja: %s"
 
-#: clientgui/sg_TaskPanel.cpp:728
+#: sg_TaskPanel.cpp:724
 #, c-format
 msgid "%.3f%%"
 msgstr "%.3f%%"
 
-#: clientgui/sg_TaskPanel.cpp:736
+#: sg_TaskPanel.cpp:732
 msgid "Application: Not available"
 msgstr "Aplikacja: niedostępne"
 
-#: clientgui/sg_TaskPanel.cpp:836
+#: sg_TaskPanel.cpp:832
 msgid "Not Available"
 msgstr "Niedostępne"
 
-#: clientgui/sg_TaskPanel.cpp:851
+#: sg_TaskPanel.cpp:847
 #, c-format
 msgid "Elapsed: %s"
 msgstr "Upłynęło: %s"
 
-#: clientgui/sg_TaskPanel.cpp:865
+#: sg_TaskPanel.cpp:861
 #, c-format
 msgid "Remaining (estimated): %s"
 msgstr "Pozostało (szacowane): %s"
 
-#: clientgui/sg_TaskPanel.cpp:880
+#: sg_TaskPanel.cpp:876
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: clientgui/sg_TaskPanel.cpp:1227
+#: sg_TaskPanel.cpp:1223
 msgid "Retrieving current status."
 msgstr "Sprawdzanie bieżącego statusu."
 
-#: clientgui/sg_TaskPanel.cpp:1233
+#: sg_TaskPanel.cpp:1229
 msgid "Downloading work from the server."
 msgstr "Pobieranie danych z serwera."
 
-#: clientgui/sg_TaskPanel.cpp:1238
+#: sg_TaskPanel.cpp:1234
 msgid "Processing Suspended:  Running On Batteries."
 msgstr "Przetwarzanie wstrzymane: zasilanie z baterii."
 
-#: clientgui/sg_TaskPanel.cpp:1240
+#: sg_TaskPanel.cpp:1236
 msgid "Processing Suspended:  User Active."
 msgstr "Przetwarzanie wstrzymane: komputer w użyciu."
 
-#: clientgui/sg_TaskPanel.cpp:1242
+#: sg_TaskPanel.cpp:1238
 msgid "Processing Suspended:  User paused processing."
 msgstr "Przetwarzanie wstrzymane: użytkownik wstrzymał zadanie."
 
-#: clientgui/sg_TaskPanel.cpp:1244
+#: sg_TaskPanel.cpp:1240
 msgid "Processing Suspended:  Time of Day."
 msgstr "Przetwarzanie wstrzymane: warunek dla pory dnia."
 
-#: clientgui/sg_TaskPanel.cpp:1246
+#: sg_TaskPanel.cpp:1242
 msgid "Processing Suspended:  Benchmarks Running."
 msgstr "Przetwarzanie wstrzymane: pomiar wydajności komputera."
 
-#: clientgui/sg_TaskPanel.cpp:1248
+#: sg_TaskPanel.cpp:1244
 msgid "Processing Suspended."
 msgstr "Przetwarzanie wstrzymane."
 
-#: clientgui/sg_TaskPanel.cpp:1252
+#: sg_TaskPanel.cpp:1248
 msgid "Waiting to contact project servers."
 msgstr "Oczekiwanie na połączenie z serwerem projektu."
 
-#: clientgui/sg_TaskPanel.cpp:1256
-#: clientgui/sg_TaskPanel.cpp:1265
+#: sg_TaskPanel.cpp:1252 sg_TaskPanel.cpp:1261
 msgid "Retrieving current status"
 msgstr "Sprawdzanie bieżącego statusu"
 
-#: clientgui/sg_TaskPanel.cpp:1260
+#: sg_TaskPanel.cpp:1256
 msgid "No work available to process"
 msgstr "Brak dostępnych danych do przetwarzania"
 
-#: clientgui/sg_TaskPanel.cpp:1262
+#: sg_TaskPanel.cpp:1258
 msgid "Unable to connect to the core client"
 msgstr "Nie można się połączyć z klientem BOINC"
 
-#: clientgui/TermsOfUsePage.cpp:218
-msgid "Terms of Use"
-msgstr "Zasady użytkowania"
+#: wizardex.cpp:377 wizardex.cpp:553
+msgid "&Next >"
+msgstr "&Dalej >"
 
-#: clientgui/TermsOfUsePage.cpp:222
-msgid "Please read the following terms of use:"
-msgstr "Zapoznaj się z następującymi zasadami użytkowania:"
+#: wizardex.cpp:383
+msgid "< &Back"
+msgstr "< &Wstecz"
 
-#: clientgui/TermsOfUsePage.cpp:231
-msgid "I agree to the terms of use."
-msgstr "Zgadzam się z zasadami użytkowania."
+#: wizardex.cpp:553
+msgid "&Finish"
+msgstr "&Zakończ"
 
-#: clientgui/TermsOfUsePage.cpp:237
-#, fuzzy
-msgid "I do not agree to the terms of use."
-msgstr "Nie zgadzam się z zasadami użytkowania."
+#: mac/Mac_GUI.cpp:110
+msgid "Preferences…"
+msgstr "Preferencje..."
 
-#: clientgui/UnavailablePage.cpp:183
-msgid "Project temporarily unavailable"
-msgstr "Projekt tymczasowo niedostępny"
+#: mac/Mac_GUI.cpp:122
+msgid "Services"
+msgstr "Usługi"
 
-#: clientgui/UnavailablePage.cpp:186
-msgid ""
-"The project is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-"Ten projekt jest tymczasowo niedostepny.\n"
-"\n"
-"Spróbuj ponownie później."
+#: mac/Mac_GUI.cpp:144
+#, c-format
+msgid "Hide %s"
+msgstr "Ukryj %s"
 
-#: clientgui/UnavailablePage.cpp:190
-msgid "Account manager temporarily unavailable"
-msgstr "Menadżer kont jest czasowo niedostępny"
+#: mac/Mac_GUI.cpp:158
+msgid "Hide Others"
+msgstr "Ukryj pozostałe"
 
-#: clientgui/UnavailablePage.cpp:193
-msgid ""
-"The account manager is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-"Ten menadżer kont jest tymczasowo niedostępny.\n"
-"\n"
-"Spróbuj ponownie później."
+#: mac/Mac_GUI.cpp:172
+msgid "Show All"
+msgstr "Pokaż wszystkie"
 
-#: clientgui/ValidateAccountKey.cpp:68
-msgid "Please specify an account key to continue."
-msgstr "Podaj klucz konta aby kontynuować."
+#: mac/Mac_GUI.cpp:186
+#, c-format
+#, c-format, c-format
+msgid "Quit %s"
+msgstr "Zakończ %s"
 
-#: clientgui/ValidateAccountKey.cpp:71
-msgid "Invalid Account Key; please enter a valid Account Key"
-msgstr "Nieprawidłowy klucz kona. Podaj prawidłowy klucz."
+#~ msgid "I do not agree with the terms of use."
+#~ msgstr "Nie zgadzam się z zasadami użytkowania."
 
-#: clientgui/ValidateAccountKey.cpp:82
-#: clientgui/ValidateEmailAddress.cpp:86
-msgid "Validation conflict"
-msgstr "Błąd uwierzytelniania"
+#~ msgid "Click Clear to restore web-based settings."
+#~ msgstr "Naciśnij Wyczyść aby przywrócić preferencje z serwera."
 
-#: clientgui/ValidateEmailAddress.cpp:72
-msgid "Please specify an email address"
-msgstr "Podaj adres e-mail"
+#~ msgid "For additional settings, select Computing Preferences in "
+#~ msgstr "Dla dodatkowych ustawień wybierze preferencje przetwarzania w "
 
-#: clientgui/ValidateEmailAddress.cpp:75
-msgid "Invalid email address; please enter a valid email address"
-msgstr "Nieprawidłowy adres e-mail. Wprowadź prawidłowy adres."
+#~ msgid "the Advanced View."
+#~ msgstr "widoku zaawansowanym."
 
-#: clientgui/ValidateURL.cpp:69
-msgid "Missing URL"
-msgstr "Brak adresu URL"
+#~ msgid "Workunit name"
+#~ msgstr "Nazwa pliku z danymi"
 
-#: clientgui/ValidateURL.cpp:70
-msgid ""
-"Please specify a URL.\n"
-"For example:\n"
-"http://www.example.com/"
-msgstr ""
-"Podaj adres URL.\n"
-"Na przykład:\n"
-"http://www.example.com/"
+#~ msgid "invalid float"
+#~ msgstr "nieprawidłowa wartość float"
 
-#: 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 "Nieprawidłowy adres URL"
+#~ msgid "Display the advanced (accessible) graphical interface."
+#~ msgstr "Pokaż zaawansowany interfejs graficzny."
 
-#: 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 ""
-"Podaj prawidłowy adres URL.\n"
-"Na przykład:\n"
-"http://boincproject.example.com"
+#~ msgid "Paused: Other work running"
+#~ msgstr "Wstrzymany: przetwarzanie innego zadania"
+
+#~ msgid "Paused: User initiated.  Click 'Resume' to continue"
+#~ msgstr ""
+#~ "Wstrzymany: wymuszone przez użytkownika. Kliknij 'Wznów' aby kontynuować "
+#~ "przetwarzanie tego zadania."
+
+#~ msgid "Paused: User active"
+#~ msgstr "Wstrzymany: użytkownik jest aktywny"
+
+#~ msgid "Paused: Computer on battery"
+#~ msgstr "Wstrzymany: zasilanie z baterii"
+
+#~ msgid "Paused: Time of Day"
+#~ msgstr "Wstrzymany: określona pora dnia"
+
+#~ msgid "Paused: Benchmarks running"
+#~ msgstr "Wstrzymany: pomiar wydajności"
+
+#~ msgid "Paused"
+#~ msgstr "Wstrzymany"
+
+#~ msgid "Paused: Application start delayed"
+#~ msgstr "Wstrzymany: opóźnione uruchomienie aplikacji"
+
+#~ msgid "Click to show project graphics"
+#~ msgstr "Kliknij aby pokazać grafikę projektu"
+
+#~ msgid "Open a window to view messages"
+#~ msgstr "Otwiera okno powiadomień"
+
+#~ msgid "Stop all activity"
+#~ msgstr "Wstrzymaj całą aktywność"
+
+#~ msgid "Resume activity"
+#~ msgstr "Wznów aktywność"
+
+#~ msgid "Open a window to set your preferences"
+#~ msgstr "Otwórz okno Preferencji"
+
+#~ msgid "Switch to the BOINC advanced view"
+#~ msgstr "Przełącz do widoku zaawansowanego Menadżera BOINC"
+
+#~ msgid "My Projects:"
+#~ msgstr "Moje Projekty:"
 
-#: clientgui/ValidateURL.cpp:104
-#: clientgui/ValidateURL.cpp:108
 #, c-format
-msgid "'%s' does not contain a valid host name."
-msgstr "'%s' nie zawiera poprawnej nazwy hosta."
+#~ msgid "%s. Work done by %s: %0.2f"
+#~ msgstr "%s. Wynik całkowity uczestnika %s: %0.2f"
 
-#: clientgui/ValidateURL.cpp:111
 #, c-format
-msgid "'%s' does not contain a valid path."
-msgstr "'%s' nie zawiera poprawnej ścieżki."
+#~ msgid "%.1lf"
+#~ msgstr "%.1lf"
 
-#: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:175
-msgid "Commands"
-msgstr "Polecenia"
+#, c-format
+#~ msgid "%d hr %d min %d sec"
+#~ msgstr "%d godz %d min %d sek"
 
-#: clientgui/ViewMessages.cpp:88
-msgid "Copy all messages"
-msgstr "Kopiuj wszystkie wiadomości"
+#~ msgid "Are you sure you want to display graphics on a remote machine?"
+#~ msgstr "Czy jesteś pewien, że chcesz pokazać grafike na zdalnym komputerze?"
 
-#: clientgui/ViewMessages.cpp:95
-msgid "Copy selected messages"
-msgstr "Kopiuj wybrane wiadomości"
+#~ msgid "Application: "
+#~ msgstr "Aplikacja: "
 
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
-msgid "Show only this project"
-msgstr "Pokaż tylko ten projekt"
+#~ msgid "Time Remaining: "
+#~ msgstr "Pozostało: "
 
-#: clientgui/ViewMessages.cpp:107
-#: clientgui/ViewMessages.cpp:503
-msgid "Show only the messages for the selected project."
-msgstr "Pokazuje wiadomości związane tylko z wybranym projektem."
+#~ msgid "Elapsed Time: "
+#~ msgstr "Upłynęło: "
 
-#: clientgui/ViewMessages.cpp:164
-msgid "Messages"
-msgstr "Wiadomości"
+#~ msgid "Account manager website"
+#~ msgstr "Strona internetowa menadżera kont"
 
-#: clientgui/ViewMessages.cpp:187
-msgid "Copying all messages to the clipboard..."
-msgstr "Kopiowanie wszystkich wiadomości do schowka..."
+#~ msgid "Account Manager &URL:"
+#~ msgstr "Adres &URL menadżera kont:"
 
-#: clientgui/ViewMessages.cpp:223
-msgid "Copying selected messages to the clipboard..."
-msgstr "Kopiowanie wybranych wiadomości do schowka..."
+#, c-format
+#~ msgid "%s &website"
+#~ msgstr "&Strona główna projektu %s"
 
-#: clientgui/ViewMessages.cpp:286
-msgid "Filtering messages..."
-msgstr "Filtrowanie wiadomości..."
+#~ msgid "Notice List"
+#~ msgstr "Lista powiadomień"
 
-#: clientgui/ViewMessages.cpp:494
-msgid "Show all messages"
-msgstr "Pokaż wszystkie wiadomości"
+#, c-format
+#~ msgid "%s; received on %s"
+#~ msgstr "%s; odebrane %s"
 
-#: clientgui/ViewMessages.cpp:495
-msgid "Show messages for all projects."
-msgstr "Pokazuje wiadomości dotyczące wszystkich projektów."
+#, c-format
+#~ msgid "%s; received from %s; on %s"
+#~ msgstr "%s; odebrane z %s; %s"
 
-#: clientgui/ViewProjects.cpp:225
-msgid "Account"
-msgstr "Konto"
+#~ msgid "Click"
+#~ msgstr "Kliknij"
 
-#: clientgui/ViewProjects.cpp:227
-msgid "Work done"
-msgstr "Wynik całkowity"
+#~ msgid "Project List"
+#~ msgstr "Lista projektów"
 
-#: clientgui/ViewProjects.cpp:228
-msgid "Avg. work done"
-msgstr "Średni wynik"
+#~ msgid "Nvidia GPU Supported"
+#~ msgstr "Obsługa GPU nVidia"
 
-#: clientgui/ViewProjects.cpp:230
-msgid "Status"
-msgstr "Status"
+#~ msgid "ATI GPU Supported"
+#~ msgstr "Obsługa GPU ATI"
 
-#: clientgui/ViewProjects.cpp:255
-msgid "Projects"
-msgstr "Projekty"
+#~ msgid "Project Website"
+#~ msgstr "Strona projektu"
 
-#: clientgui/ViewProjects.cpp:307
-msgid "Updating project..."
-msgstr "Aktualizowanie projektu..."
+# 88%
+#, fuzzy
+#~ msgid "Retry now"
+#~ msgstr "Próbuj ponownie"
 
-#: clientgui/ViewProjects.cpp:349
-msgid "Resuming project..."
-msgstr "Wznawianie projektu..."
+#~ msgid "10%"
+#~ msgstr "10%"
 
-#: clientgui/ViewProjects.cpp:353
-msgid "Suspending project..."
-msgstr "Wstrzymywanie projektu..."
+#~ msgid "20%"
+#~ msgstr "20%"
 
-#: clientgui/ViewProjects.cpp:390
-msgid "Telling project to allow additional task downloads..."
-msgstr "Przekazywanie projektowi aby wznowił przydzielanie dodatkowych zadań..."
+#~ msgid "30%"
+#~ msgstr "30%"
 
-#: clientgui/ViewProjects.cpp:394
-msgid "Telling project to not fetch any additional tasks..."
-msgstr "Przekazywanie projektowi aby wstrzymał przydzielanie nowych zadań..."
+#~ msgid "40%"
+#~ msgstr "40%"
 
-#: clientgui/ViewProjects.cpp:430
-msgid "Resetting project..."
-msgstr "Resetowanie projektu..."
+#~ msgid "50%"
+#~ msgstr "50%"
 
-#: clientgui/ViewProjects.cpp:488
-msgid "Removing project..."
-msgstr "Usuwanie projektu..."
+#~ msgid "60%"
+#~ msgstr "60%"
 
-#: clientgui/ViewProjects.cpp:548
-msgid "Launching browser..."
-msgstr "Otwieranie okna przeglądarki..."
+#~ msgid "70%"
+#~ msgstr "70%"
 
-#: clientgui/ViewProjects.cpp:1063
-msgid "Requested by user"
-msgstr "Zażądane przez użytkownika"
+#~ msgid "80%"
+#~ msgstr "80%"
 
-#: clientgui/ViewProjects.cpp:1064
-msgid "To fetch work"
-msgstr "Aby pobrać zadania"
+#~ msgid "90%"
+#~ msgstr "90%"
 
-#: clientgui/ViewProjects.cpp:1065
-msgid "To report completed tasks"
-msgstr "Aby zaraportować zakończone zadania"
+#~ msgid "100%"
+#~ msgstr "100%"
 
-#: clientgui/ViewProjects.cpp:1066
-msgid "To send trickle-up message"
-msgstr "Aby wysłać miniwiadomość"
+#~ msgid "1"
+#~ msgstr "1"
 
-#: clientgui/ViewProjects.cpp:1067
-msgid "Requested by account manager"
-msgstr "Zażądane przez menadżera kont"
+#~ msgid "3"
+#~ msgstr "3"
 
-#: clientgui/ViewProjects.cpp:1068
-msgid "Project initialization"
-msgstr "Inicjalizacja projektu"
+#~ msgid "5"
+#~ msgstr "5"
 
-#: clientgui/ViewProjects.cpp:1069
-msgid "Requested by project"
-msgstr "Zażądane przez projekt"
+#~ msgid "10"
+#~ msgstr "10"
 
-#: clientgui/ViewProjects.cpp:1070
-msgid "Unknown reason"
-msgstr "Przyczyna nieznana"
+#~ msgid "15"
+#~ msgstr "15"
 
-#: clientgui/ViewProjects.cpp:1084
-msgid "Suspended by user"
-msgstr "Wstrzymany przez użytkownika"
+#~ msgid "30"
+#~ msgstr "30"
 
-#: clientgui/ViewProjects.cpp:1087
-msgid "Won't get new tasks"
-msgstr "Nie pobieraj nowych danych"
+#~ msgid "60"
+#~ msgstr "60"
 
-#: clientgui/ViewProjects.cpp:1090
-msgid "Project ended - OK to remove"
-msgstr "Projekt zakończony - naciśnij OK aby go usunąć"
+#, c-format
+#~ msgid "Pop up a menu of websites for project %s"
+#~ msgstr "Pokazuje menu stron projektu %s"
 
-#: clientgui/ViewProjects.cpp:1093
-msgid "Will remove when tasks done"
-msgstr "Usuwa po zakończeniu zadań"
+#~ msgid ""
+#~ "for accessibility support, please select advanced from the view menu or type "
+#~ "command shift a"
+#~ msgstr ""
+#~ "Aby skorzystać z ułatwień dostępu wybierz Zaawansowane z menu Widok albo "
+#~ "użyj klawiszy Command-Shift-A"
 
-#: clientgui/ViewProjects.cpp:1096
-msgid "Scheduler request pending"
-msgstr "Oczekiwanie na połączenie z serwerem projektu"
+#~ msgid "This panel contains graphs showing user totals for projects"
+#~ msgstr ""
+#~ "Ten panel zawiera wykresy pokazujące całkowite wyniki uczestnika w "
+#~ "projektach"
 
-#: clientgui/ViewProjects.cpp:1102
-msgid "Scheduler request in progress"
-msgstr "Trwa nawiązywanie połączenia z serwerem projektu"
+#~ msgid "list headers"
+#~ msgstr "lista nagłówków"
 
-#: clientgui/ViewProjects.cpp:1105
-msgid "Trickle up message pending"
-msgstr "Wysyłanie miniwiadomości"
+#~ msgid "list of events"
+#~ msgstr "lista zdarzeń"
 
-#: clientgui/ViewProjects.cpp:1111
-msgid "Communication deferred "
-msgstr "Komunikacja opóźniona"
+#~ msgid "list of events is empty"
+#~ msgstr "lista zdarzeń jest pusta"
 
-#: clientgui/ViewResources.cpp:62
-msgid "Total disk usage"
-msgstr "Całkowite użycie dysku twardego"
+#, c-format
+#, c-format, c-format
+#~ msgid "list of %s"
+#~ msgstr "lista %s"
 
-#: clientgui/ViewResources.cpp:83
-msgid "Disk usage by BOINC projects"
-msgstr "Użycie dysku przez projekty BOINC"
+#, c-format
+#~ msgid "list of %s is empty"
+#~ msgstr "lista %s jest pusta"
 
-#: clientgui/ViewResources.cpp:116
-msgid "Disk"
-msgstr "Dysk twardy"
+#, c-format
+#~ msgid "; current sort column %d of %d; descending order; "
+#~ msgstr "; aktualne sortowanie kolumny %d z %d; kolejność malejąca; "
 
-#: clientgui/ViewResources.cpp:225
-msgid "no projects: 0 bytes used"
-msgstr "brak projektów: 0 bajtów zajętych"
+#, c-format
+#~ msgid "; current sort column %d of %d; ascending order; "
+#~ msgstr "; aktualne sortowanie kolumny %d z %d; kolejność rosnąca;"
 
-#: clientgui/ViewResources.cpp:262
-msgid "used by BOINC: "
-msgstr "przestrzeń używana przez BOINC: "
+#, c-format
+#~ msgid "; column %d of %d; "
+#~ msgstr "; kolumna %d z %d; "
 
-#: clientgui/ViewResources.cpp:272
-msgid "free, available to BOINC: "
-msgstr "wolna przestrzeń, dostępna dla BOINC: "
+#~ msgid "list is empty"
+#~ msgstr "lista jest pusta"
 
-#: clientgui/ViewResources.cpp:282
-msgid "free, not available to BOINC: "
-msgstr "wolna przestrzeń, niedostępna dla BOINC: "
+#, c-format
+#~ msgid "; row %d; "
+#~ msgstr "; wiersz %d; "
 
-#: clientgui/ViewResources.cpp:292
-msgid "free: "
-msgstr "wolna przestrzeń: "
+#, c-format
+#~ msgid "; selected row %d of %d; "
+#~ msgstr "; zaznaczony wiersz %d z %d; "
 
-#: clientgui/ViewResources.cpp:302
-msgid "used by other programs: "
-msgstr "przestrzeń używana przez inne aplikacje: "
+#, c-format
+#~ msgid "; selected row %d ; "
+#~ msgstr "; zaznaczony wiersz %d ; "
+
+#, c-format
+#, c-format, c-format
+#~ msgid "; row %d of %d; "
+#~ msgstr "; wiersz %d z %d; "
+
+#~ msgid "blank"
+#~ msgstr "pusty"
+
+#~ msgid "list of projects or account managers"
+#~ msgstr "lista projektów albo menadżerów kont"
+
+#, c-format
+#~ msgid "selected row %d of %d; "
+#~ msgstr "zaznaczony wiersz %d z %d; "
+
+#, c-format
+#~ msgid "row %d of %d; "
+#~ msgstr "wiersz %d z %d; "
+
+#, c-format
+#~ msgid "The minimum password length for this project is %d. Please enter a different password."
+#~ msgstr "Minimalna długość hasła dla tego projektu to %d. Wprowadź inne hasło."
+
+#, c-format
+#~ msgid "The minimum password length for this account manager is %d. Please enter a different password."
+#~ msgstr ""
+#~ "Minimalna długość hasła dla tego menadżera kont to %d. Wprowadź inne hasło."
+
+#~ msgid ""
+#~ "An error has occurred;\n"
+#~ "check the Event Log for details.\n"
+#~ "\n"
+#~ "Click Finish to close."
+#~ msgstr ""
+#~ "Wystapił błąd.\n"
+#~ "Aby zapoznać się ze szczegółami sprawdź Dziennik zdarzeń.\n"
+#~ "\n"
+#~ "Naciśnij Zakończ aby zakończyć."
+
+#, no-c-format
+#~ msgid "% of the processors"
+#~ msgstr "% ogólnej liczby procesorów"
+
+#, c-format
+#~ msgid "New page inserted. Index = %i"
+#~ msgstr "Nowa strona wprowadzona. Indeks = %i"
+
+#, c-format
+#~ msgid "New page appended. Index = %i"
+#~ msgstr "Nowa strona dodana. Indeks = %i"
+
+#, c-format
+#~ msgid "Old Page Index = %i"
+#~ msgstr "Indeks starej strony = %i"
+
+#, c-format
+#~ msgid "OnDropTarget: index by HitTest = %i"
+#~ msgstr "OnDropTarget: index by HitTest = %i"
+
+#~ msgid "Pie Ctrl"
+#~ msgstr "Legenda"
+
+#~ msgid "specify work start and stop hours in format HH:MM-HH:MM"
+#~ msgstr "Podaj godziny rozpoczęcia i zakończenia pracy w formacie HH:MM-HH:MM"
+
+#~ msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
+#~ msgstr ""
+#~ "Podaj godziny rozpoczęcia i zakończenia dostępności sieci w formacie HH:MM-"
+#~ "HH:MM"
+
+#, c-format
+#~ msgid "The %s's default language has been changed, in order for this change to take affect you must restart the %s."
+#~ msgstr ""
+#~ "Domyślny język dla %s został zmieniony. Aby zmiany odniosły skutek "
+#~ "zrestartuj %s."
+
+#~ msgid "Identify your account "
+#~ msgstr "Zidentyfikuj swoje konto"
+
+#~ msgid "Read config file"
+#~ msgstr "Wczytaj plik konfiguracyjny"
+
+#~ msgid "Read configuration info from cc_config.xml"
+#~ msgstr "Wczytywanie konfiguracji zawartej w pliku cc_config.xml"
 
-#: clientgui/ViewStatistics.cpp:1181
-msgid "User Total"
-msgstr "Całkowite statystyki uczestnika"
+#~ msgid ""
+#~ "(C) 2003-2011 University of California, Berkeley.\n"
+#~ "All Rights Reserved."
+#~ msgstr ""
+#~ "(C) 2003-2011 Uniwersytet Kalifornijski w Berkeley.\n"
+#~ "Wszystkie prawa zastrzeżone."
 
-#: clientgui/ViewStatistics.cpp:1182
-msgid "User Average"
-msgstr "Średnie statystyki uczestnika"
+#~ msgid "NVIDIA GPU"
+#~ msgstr "NVIDIA GPU"
 
-#: clientgui/ViewStatistics.cpp:1183
-msgid "Host Total"
-msgstr "Całkowite statystyki komputera"
+#~ msgid "ATI GPU"
+#~ msgstr "ATI GPU"
 
-#: clientgui/ViewStatistics.cpp:1184
-msgid "Host Average"
-msgstr "Średnie statystyki komputera"
+#~ msgid "Multicore CPU Supported"
+#~ msgstr "Obsługa wielordzeniowych procesorów"
 
-#: clientgui/ViewStatistics.cpp:1331
 #, c-format
-msgid "Last update: %.0f days ago"
-msgstr "Ostatnia aktualizacja: %.0f dni temu"
+#~ msgid "%s: %.0f"
+#~ msgstr "%s: %.0f"
+
+#~ msgid "Click 'Retry now' to transfer the file now"
+#~ msgstr ""
+#~ "Naciśnięcie przycisku 'Próbuj ponownie' spowoduje podjęcie próby ponownego "
+#~ "transferu pliku"
+
+#~ msgid "Click 'Abort transfer' to delete the file from the transfer queue. This will prevent you from being granted credit for this result."
+#~ msgstr ""
+#~ "Naciśnięcie przycisku 'Przerwij przesyłanie pliku' spowoduje usunięcie go z "
+#~ "kolejki transferu. Nie otrzymasz punktów za to zadanie."
+
+#~ msgid "Aborting result..."
+#~ msgstr "Przerywanie zadania..."
+
+#~ msgid ""
+#~ "You have chosen to add a new BOINC project.  Adding a new\n"
+#~ "project means that you will be connecting your computer to a new organization.\n"
+#~ "If this is what you wanted to do, please click on\n"
+#~ "the 'Next' button below.\n"
+#~ "\n"
+#~ "Some projects like World Community Grid run multiple research applications.\n"
+#~ "If you want to change which research applications are sent to your computer\n"
+#~ "to run, visit the project's website and modify your\n"
+#~ "preferences there.\n"
+#~ "\n"
+#~ "To change which research applications are sent to you from\n"
+#~ "World Community Grid then please click on the following button:"
+#~ msgstr ""
+#~ "Wybrałeś przyłączenie się do nowego projektu. Przyłączenie się do nowego\n"
+#~ "projektu oznacza, że twój komputer będzie się łączył z nową organizacją.\n"
+#~ "Jeżeli właśnie to chciałeś osiągnąć, naciśnij przycisk 'Dalej'.\n"
+#~ "\n"
+#~ "Niektóre projekty, takie jak World Community Grid używają kilku różnych "
+#~ "aplikacji.\n"
+#~ "Jeżeli chcesz wybrać, które z aplikacji mają być pobierane i uruchamiane "
+#~ "przez twój komputer\n"
+#~ "zmodyfikuj Preferencje na stronie danego projektu.\n"
+#~ "\n"
+#~ "Aby wybrać aplikacje World Community Grid, których będziesz używał na swoim "
+#~ "komputerze\n"
+#~ "naciśnij poniższy przycisk:"
+
+#~ msgid "Change Research Applications at World Community Grid"
+#~ msgstr "Zmień pobierane aplikacje World Commmunity Grid"
+
+#~ msgid "Don't fetch CPU tasks"
+#~ msgstr "Nie pobieraj nowych danych"
+
+#~ msgid "CPU work fetch deferred for"
+#~ msgstr "Przyporządkowanie zadań dla procesora opóźnione o "
+
+#~ msgid "CPU work fetch deferral interval"
+#~ msgstr "Odstęp pomiędzy opóźnieniami przyporządkowania zadań dla procesora"
+
+#~ msgid "Don't fetch NVIDIA GPU tasks"
+#~ msgstr "Nie pobieraj danych dla GPU NVIDIA"
+
+#~ msgid "NVIDIA GPU work fetch deferred for"
+#~ msgstr ""
+#~ "Przyporządkowanie zadań dla procesora karty graficznej nVidia opóźnione o "
+
+#~ msgid "NVIDIA GPU work fetch deferral interval"
+#~ msgstr ""
+#~ "Odstęp pomiędzy opóźnieniami przyporządkowania zadań dla procesora karty "
+#~ "graficznej nVidia"
+
+#~ msgid "Don't fetch ATI GPU tasks"
+#~ msgstr "Nie pobieraj nowych danych dla GPU ATI"
+
+#~ msgid "ATI GPU work fetch deferred for"
+#~ msgstr "Przyporządkowanie zadań dla procesora karty graficznej ATI opóźnione o "
+
+#~ msgid "ATI GPU work fetch deferral interval"
+#~ msgstr ""
+#~ "Odstęp pomiędzy opóźnieniami przyporządkowania zadań dla procesora karty "
+#~ "graficznej ATI"
+
+#~ msgid "Web sites"
+#~ msgstr "Strony projektu"
+
+#~ msgid ""
+#~ "You currently are not authorized to manage the client.\n"
+#~ "\n"
+#~ "To run BOINC as this user, please:\n"
+#~ "  - reinstall BOINC answering \"Yes\" to the question about\n"
+#~ "     non-administrative users\n"
+#~ " or\n"
+#~ "  - contact your administrator to add you to the 'boinc_master'\n"
+#~ "     user group."
+#~ msgstr ""
+#~ "Nie posiadasz autoryzacji do zarządzania klientem.\n"
+#~ "\n"
+#~ "Aby uruchomić BOINC z konta tego użytkownika:\n"
+#~ "- wykonaj reinstalację BOINC odpowiadając \"Tak\" na pytanie\n"
+#~ "o użytkowników nie mających uprawnień do zarządzania\n"
+#~ "albo\n"
+#~ "- skontaktuj się z administratorem tego komputera\n"
+#~ "aby dodał cię do grupy użytkowników 'boinc_master'."
 
-#: clientgui/ViewStatistics.cpp:1956
-msgid "Show user total"
-msgstr "Całkowite wyniki uczestnika"
+#, c-format
+#~ msgid ""
+#~ "BOINC ownership or permissions are not set properly; please reinstall BOINC.\n"
+#~ "(Error code %d)"
+#~ msgstr ""
+#~ "Ustawienia zabezpieczeń lub uprawnień dla BOINC są nieprawidłowe; zainstaluj "
+#~ "ponownie BOINC.\n"
+#~ "(Kod błędu %d)"
 
-#: clientgui/ViewStatistics.cpp:1957
-msgid "Show total credit for user"
-msgstr "Pokazuje całkowite statystyki uczestnika"
+#~ msgid "Connect about every"
+#~ msgstr "łącz się z siecią co"
 
-#: clientgui/ViewStatistics.cpp:1963
-msgid "Show user average"
-msgstr "Pokazuje średnie wyniki uczestnika"
+#~ msgid ""
+#~ "this computer is connected to the Internet about every X days\n"
+#~ "(0 if it's always connected)"
+#~ msgstr ""
+#~ "Ten komputer łączy się z siecią co około X dni\n"
+#~ "(0 jeżeli jest ciągle połączony)"
 
-#: clientgui/ViewStatistics.cpp:1964
-msgid "Show average credit for user"
-msgstr "Pokazuje bieżące statystyki uczestnika"
+#~ msgid "Additional work buffer"
+#~ msgstr "dodatkowy zapas danych na"
 
-#: clientgui/ViewStatistics.cpp:1970
-msgid "Show host total"
-msgstr "Pokazuje całkowite wyniki komputera"
+#~ msgid "days (max. 10)"
+#~ msgstr "dni (maks. 10)"
 
-#: clientgui/ViewStatistics.cpp:1971
-msgid "Show total credit for host"
-msgstr "Pokazuje całkowite statystyki komputera."
+#~ msgid "Display and network &options..."
+#~ msgstr "Opcje wyświetlania oraz sieci..."
 
-#: clientgui/ViewStatistics.cpp:1977
-msgid "Show host average"
-msgstr "Pokazuje średnie wyniki komputera"
+#, c-format
+#~ msgid ""
+#~ "You have requested to exit the %s,\n"
+#~ "which allows you to view and manage\n"
+#~ "the science applications running on your computer.\n"
+#~ "\n"
+#~ "If you also want to stop running the science applications when you\n"
+#~ "exit the Manager, then choose from the following options:"
+#~ msgstr ""
+#~ "Wybrałeś zamknięcie %s'a,\n"
+#~ "który umożliwia ci zarządzanie aplikacjami projektów\n"
+#~ "uruchomionymi na twoim komputerze.\n"
+#~ "\n"
+#~ "Jeżeli chcesz także po zamknięciu Menadżera BOINC\n"
+#~ "zakończyć pracę aplikacji projektów, wybierz z poniższych opcji"
+
+#~ msgid "Stop running science applications when exiting the Manager"
+#~ msgstr "Zamknij aplikacje projektów gdy zamykasz Menadżera BOINC"
+
+#~ msgid "CPU work fetch priority"
+#~ msgstr "Priorytet przyporządkowania zadań dla procesora"
+
+#~ msgid "NVIDIA GPU scheduling priority"
+#~ msgstr "Priorytety dla GPU nVidia"
+
+#~ msgid "NVIDIA GPU work fetch priority"
+#~ msgstr ""
+#~ "Priorytety przyporządkowania zadań dla procesora karty graficznej nVidia"
+
+#~ msgid "ATI GPU scheduling priority"
+#~ msgstr "Planowanie priorytetu przetwarzania dla GPU ATI"
+
+#~ msgid "ATI GPU work fetch priority"
+#~ msgstr "Priorytety przyporządkowania zadań dla procesora karty graficznej ATI"
 
-#: clientgui/ViewStatistics.cpp:1978
-msgid "Show average credit for host"
-msgstr "Pokazuje średnie statystyki komputera"
+#, c-format
+#~ msgid "%s - Options"
+#~ msgstr "%s - Opcje"
 
-#: clientgui/ViewStatistics.cpp:1987
-msgid "< &Previous project"
-msgstr "< &Poprzedni projekt"
+#~ msgid "Retrieving host information; please wait..."
+#~ msgstr "Sprawdzam informacje o komputerze; proszę czekać..."
 
-#: clientgui/ViewStatistics.cpp:1988
-msgid "Show chart for previous project"
-msgstr "Pokazuje wykres dla poprzedniego projektu"
+#, c-format
+#~ msgid "%s - Messages"
+#~ msgstr "%s - Wiadomości"
 
-#: clientgui/ViewStatistics.cpp:1993
-msgid "&Next project >"
-msgstr "&Następny projekt >"
+#~ msgid "Skin:"
+#~ msgstr "Skórka:"
 
-#: clientgui/ViewStatistics.cpp:1994
-msgid "Show chart for next project"
-msgstr "Pokazuje wykres dla następnego projektu"
+#~ msgid "Preferences"
+#~ msgstr "Preferencje"
 
-#: clientgui/ViewStatistics.cpp:2000
-#: clientgui/ViewStatistics.cpp:2390
-msgid "Hide project list"
-msgstr "Ukryj listę projektów"
+#~ msgid "I want to customize my preferences for this computer only."
+#~ msgstr "Chcę ustalić lub zmienić preferencje tylko dla tego komputera."
 
-#: clientgui/ViewStatistics.cpp:2001
-#: clientgui/ViewStatistics.cpp:2390
-msgid "Use entire area for graphs"
-msgstr "Wykorzystuje całą powierzchnię na wykres"
+#~ msgid "Customized Preferences"
+#~ msgstr "Wybrane ustawienia preferencji"
 
-#: clientgui/ViewStatistics.cpp:2006
-msgid "Mode view"
-msgstr "Rodzaj widoku"
+#~ msgid "Upload pending"
+#~ msgstr "Kolejka odsyłania"
 
-#: clientgui/ViewStatistics.cpp:2010
-msgid "One project"
-msgstr "Pojedynczy projekt"
+#~ msgid "Download pending"
+#~ msgstr "Kolejka pobierania"
 
-#: clientgui/ViewStatistics.cpp:2011
-msgid "Show one chart with selected project"
-msgstr "Pokazuje wykres dla wybranego projektu"
+#~ msgid ""
+#~ "Notice reminder interval:\n"
+#~ "(minutes; 0 means no reminders)"
+#~ msgstr ""
+#~ "Częstotliwość wyświetlania informacji:\n"
+#~ "(w minutach)"
 
-#: clientgui/ViewStatistics.cpp:2017
-msgid "All projects (separate)"
-msgstr "Wszystkie projekty (osobno)"
+#~ msgid "Get help with BOINC"
+#~ msgstr "Strona pomocy BOINC"
 
-#: clientgui/ViewStatistics.cpp:2018
-msgid "Show all projects, one chart per project"
-msgstr "Pokazuje wykresy dla wszystkich projektów, jeden wykres na projekt"
+#~ msgid "Event Log..."
+#~ msgstr "Historia zdarzeń..."
 
-#: clientgui/ViewStatistics.cpp:2024
-msgid "All projects (together)"
-msgstr "Wszystkie projekty (razem)"
+#~ msgid "Attach to project"
+#~ msgstr "Przyłącz się do projektu"
 
-#: clientgui/ViewStatistics.cpp:2025
-msgid "Show one chart with all projects"
-msgstr "Pokazuje wspólny wykres dla wszystkich projektów"
+#~ msgid "Attach to account manager"
+#~ msgstr "Połącz się z menadżerem kont"
 
-#: clientgui/ViewStatistics.cpp:2031
-msgid "All projects (sum)"
-msgstr "Wszystkie projekty (łącznie)"
+#~ msgid "&Attach to project..."
+#~ msgstr "Przyłącz się do &projektu..."
 
-#: clientgui/ViewStatistics.cpp:2032
-msgid "Show one chart with sum of projects"
-msgstr "Pokazuje wspólny z sumą wszystkich projektów"
+#~ msgid "Attach to a project"
+#~ msgstr "Przyłącz się do projektu"
 
-#: clientgui/ViewStatistics.cpp:2053
-msgid "Statistics"
-msgstr "Statystyki"
+#~ msgid "Attaching to project or account manager..."
+#~ msgstr "Przyłączanie do projektu lub menadżera kont..."
 
-#: 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 "Aktualizacja wykresów..."
+#, c-format
+#~ msgid "%s - Detach from %s"
+#~ msgstr "%s - Odłącz od %s"
 
-#: clientgui/ViewStatistics.cpp:2394
-msgid "Show project list"
-msgstr "Pokaż listę projeków"
+#~ msgid "Retrying communications."
+#~ msgstr "Ponawiam próbę komunikacji."
 
-#: clientgui/ViewStatistics.cpp:2394
-msgid "Uses smaller area for graphs"
-msgstr "Wykorzystuje mniejszą przestrzeń dla projektów"
+#, c-format
+#~ msgid "%s needs to connect to the Internet.  Please click to open %s."
+#~ msgstr "%s chce nawiązać połączenie z internetem. Kliknij aby otworzyć %s."
 
-#: clientgui/ViewTransfers.cpp:169
-msgid "Retry Now"
-msgstr "Próbuj ponownie"
+#, c-format
+#~ msgid ""
+#~ "%s is unable to communicate with a project and needs an Internet "
+#~ "connection.\n"
+#~ "Please connect to the Internet, then select the 'Do network communications' "
+#~ "item from the Advanced menu."
+#~ msgstr ""
+#~ "%s nie jest w stanie połączyć się z serwerem projektu i potrzebuje\n"
+#~ "aktywnego połączenie internetowego.\n"
+#~ "Połącz się z internetem a następnie wybierz 'Ponów próby połączeń' z menu "
+#~ "Zaawansowane."
 
-#: clientgui/ViewTransfers.cpp:170
-msgid "Retry the file transfer now"
-msgstr ""
+#, c-format
+#~ msgid ""
+#~ "%s couldn't do Internet communication, and no default connection is "
+#~ "selected.\n"
+#~ "Please connect to the Internet, or select a default connection\n"
+#~ "using Advanced/Options/Connections."
+#~ msgstr ""
+#~ "%s nie mógł nawiązać połączenia internetowego oraz nie ma\n"
+#~ "zdefiniowanego domyślnego połączenia. Połącz się z internetem\n"
+#~ "albo zdefiniuj połączenie domyślne używając opcji z menu\n"
+#~ "Zaawansowane/Ustawienia/Połączenia."
 
-#: clientgui/ViewTransfers.cpp:176
-msgid "Abort Transfer"
-msgstr "Przerwij przesyłanie pliku"
+#~ msgid "One or more notices are now available for viewing."
+#~ msgstr "Jedna lub więcej notatek jest dostępna do obejrzenia."
 
-#: clientgui/ViewTransfers.cpp:177
-msgid "Abort this file transfer.  You won't get credit for the task."
-msgstr ""
+#~ msgid "Failed to attach to project"
+#~ msgstr "Nie udało się przyłączyć do projektu"
 
-#: clientgui/ViewTransfers.cpp:188
-msgid "File"
-msgstr "Plik"
+#~ msgid "Failed to attach to account manager"
+#~ msgstr "Połączenie z menadżerem kont nie powiodło się"
 
-#: clientgui/ViewTransfers.cpp:189
-#: clientgui/ViewWork.cpp:238
-msgid "Progress"
-msgstr "Postęp"
+#~ msgid "Attached to project"
+#~ msgstr "Przyłączony do projektu"
 
-#: clientgui/ViewTransfers.cpp:190
-msgid "Size"
-msgstr "Rozmiar"
+#~ msgid "You are now successfully attached to this project."
+#~ msgstr "Przyłączyłeś się do tego projektu."
 
-#: clientgui/ViewTransfers.cpp:191
-msgid "Elapsed Time"
-msgstr "Czas trwania"
+#, c-format
+#~ msgid "Attached to %s"
+#~ msgstr "Podłączony do %s"
 
-#: clientgui/ViewTransfers.cpp:192
-msgid "Speed"
-msgstr "Szybkość"
+#~ msgid "Attached to account manager"
+#~ msgstr "Podłączony do menadżera kont"
 
-#: clientgui/ViewTransfers.cpp:218
-msgid "Transfers"
-msgstr "Przesyłanie"
+#, c-format
+#~ msgid "You are now successfully attached to the %s system."
+#~ msgstr "Jesteś podłączony do %s."
 
-#: clientgui/ViewTransfers.cpp:285
-msgid "Network activity is suspended - "
-msgstr "Aktywność sieciowa jest wstrzymana - "
+#~ msgid "You are now successfully attached to this account manager."
+#~ msgstr "Jesteś podłączony do menadżera kont."
 
-#: clientgui/ViewTransfers.cpp:287
-msgid ""
-".\n"
-"You can enable it using the Activity menu."
-msgstr ""
-".\n"
-"Możesz ją włączyć używając menu Aktywność."
+#~ msgid "Detach when done"
+#~ msgstr "Odłącz po zakończeniu"
 
-#: clientgui/ViewTransfers.cpp:290
-msgid "BOINC"
-msgstr "BOINC"
+#~ msgid "News Feeds"
+#~ msgstr "Wiadomości"
 
-#: clientgui/ViewTransfers.cpp:297
-msgid "Retrying transfer now..."
-msgstr "Ponawianie próby przesłania..."
+#~ msgid "Display the latest news about BOINC"
+#~ msgstr "Wyświetl ostatnie nowinki o BOINC"
 
-#: clientgui/ViewTransfers.cpp:335
-msgid "Aborting transfer..."
-msgstr "Przerywanie przesyłania..."
+#~ msgid "Retrieving notices..."
+#~ msgstr "Pobieranie notatek..."
+
+#~ msgid "Detach"
+#~ msgstr "Opuść projekt"
+
+#~ msgid "Detaching from project..."
+#~ msgstr "Opuszczanie projektu..."
 
-#: clientgui/ViewTransfers.cpp:348
 #, 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 ""
-"Czy jesteś pewien, że chcesz przerwać przesyłanie pliku '%s'?\n"
-"UWAGA: Przerwanie przesyłania spowoduje skasowanie pliku lub jego już pobranej części.\n"
-"Jeśli jest to plik z wynikami obliczeń, nie otrzymasz punktów za to zadanie."
+#~ msgid "Are you sure you want to detach from project '%s'?"
+#~ msgstr "Czy jesteś pewny, że chcesz opuścić projekt '%s'?"
 
-#: clientgui/ViewTransfers.cpp:354
-msgid "Abort File Transfer"
-msgstr "Przerwij przesyłanie pliku"
+#~ msgid "Detach from Project"
+#~ msgstr "Opuść projekt"
 
-#: clientgui/ViewTransfers.cpp:785
-msgid "Upload"
-msgstr "Wysyłanie"
+#~ msgid "not attached to any BOINC project: 0 bytes"
+#~ msgstr "Nie przypisane do żadnego z projektów BOINC - 0 bajtów"
 
-#: clientgui/ViewTransfers.cpp:785
-msgid "Download"
-msgstr "Pobieranie"
+#~ msgid ""
+#~ "BOINC can't access Internet - check network connection or proxy "
+#~ "configuration."
+#~ msgstr ""
+#~ "BOINC nie może uzyskać dostępu do internetu - sprawdź połączenie sieciowe "
+#~ "albo konfigurację proxy."
 
-#: clientgui/ViewTransfers.cpp:789
-msgid "retry in "
-msgstr "ponowna próba za "
+#~ msgid "Attach this computer to a project or account manager"
+#~ msgstr "Podłączony do menadżera kont"
 
-#: clientgui/ViewTransfers.cpp:791
-msgid "failed"
-msgstr "niepowodzenie"
+#~ msgid "Computation is suspended."
+#~ msgstr "Przetwarzanie danych jest wstrzymane."
 
-#: clientgui/ViewTransfers.cpp:794
-msgid "suspended"
-msgstr "zatrzymane"
+#~ msgid "Client is processing results."
+#~ msgstr "Klient przetwarza wyniki."
 
-#: clientgui/ViewTransfers.cpp:799
-msgid "active"
-msgstr "aktywne"
+#~ msgid " - user active"
+#~ msgstr " - użytkownik jest aktywny"
 
-#: clientgui/ViewTransfers.cpp:801
-msgid "pending"
-msgstr "trwające"
+#~ msgid " - computation suspended"
+#~ msgstr " - aktywność wstrzymana"
 
-#: clientgui/ViewTransfers.cpp:808
-msgid " (project backoff: "
-msgstr " (oczekiwanie: "
+#~ msgid " - CPU benchmarks"
+#~ msgstr " - pomiar wydajności"
 
-#: clientgui/ViewWork.cpp:192
-#: clientgui/ViewWork.cpp:782
-msgid "Show active tasks"
-msgstr "Pokaż aktywne zadania"
+#~ msgid " - need disk space"
+#~ msgstr " - brak dostatecznej ilości wolnej przestrzeni na dysku"
 
-#: clientgui/ViewWork.cpp:193
-#: clientgui/ViewWork.cpp:783
-msgid "Show only active tasks."
-msgstr "Wyświetla wyłącznie aktywne zadania."
+#~ msgid "Attach to an additional project"
+#~ msgstr "Przyłącz się do kolejnego projektu"
 
-#: clientgui/ViewWork.cpp:206
-msgid "Show VM Console"
-msgstr "Pokaż konsolę VM"
+#~ msgid "To completion"
+#~ msgstr "Pozostało"
 
-#: clientgui/ViewWork.cpp:207
-msgid "Show VM Console in a window."
-msgstr "Pokazuje okno konsoli VM"
+#~ msgid ""
+#~ "We'll guide you through the process of attaching\n"
+#~ "to a project or account manager."
+#~ msgstr ""
+#~ "Zostaniesz przeprowadzony przez proces przyłączania się\n"
+#~ "do projektu albo łączenia się z menadżerem kont."
 
-#: clientgui/ViewWork.cpp:214
-msgid "Suspend work for this result."
-msgstr "Wstrzymuje przetwarzanie tego zadania."
+#~ msgid "events"
+#~ msgstr "wydarzenia"
 
-#: clientgui/ViewWork.cpp:221
-msgid "Abandon work on the result. You will get no credit for it."
-msgstr "Przerwij przetwarzanie tego zadania. Nie otrzymasz za nie punktów."
+#~ msgid " is empty"
+#~ msgstr "jest pusta"
 
-#: clientgui/ViewWork.cpp:240
-msgid "Elapsed"
-msgstr "Upłynęło"
+#, c-format
+#~ msgid "%d of %d; "
+#~ msgstr "%d of %d; "
 
-#: clientgui/ViewWork.cpp:241
-msgid "Remaining (estimated)"
-msgstr "Pozostało (szacowane)"
+#~ msgid "current sort column "
+#~ msgstr "włączone sortowanie po "
 
-#: clientgui/ViewWork.cpp:242
-msgid "Deadline"
-msgstr "Termin"
+#~ msgid " descending order "
+#~ msgstr "porządek malejący "
 
-#: clientgui/ViewWork.cpp:269
-msgid "Tasks"
-msgstr "Zadania"
+#~ msgid " ascending order "
+#~ msgstr "porządek rosnący "
 
-#: clientgui/ViewWork.cpp:362
-msgid "Resuming task..."
-msgstr "Wznawianie zadania..."
+#~ msgid "column "
+#~ msgstr "kolumna "
 
-#: clientgui/ViewWork.cpp:365
-msgid "Suspending task..."
-msgstr "Wstrzymywanie zadania..."
+#~ msgid "selected "
+#~ msgstr "wybrany/a "
 
-#: clientgui/ViewWork.cpp:394
-msgid "Showing graphics for task..."
-msgstr "Wyświetlanie grafiki dla zadania..."
+#, c-format
+#~ msgid "row %d "
+#~ msgstr "wiersz %d "
 
-#: clientgui/ViewWork.cpp:431
-msgid "Showing VM console for task..."
-msgstr "Pokazywanie konsoli VM dla zadania..."
+#, c-format
+#~ msgid "of %d; "
+#~ msgstr " %d; "
 
-#: clientgui/ViewWork.cpp:484
 #, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %s, Status: %s)"
-msgstr ""
-"Czy jesteś pewien, że chcesz przerwać zadanie: '%s'?\n"
-"(Postęp: %s, Status: %s)"
+#~ msgid "column %d; "
+#~ msgstr "kolumna %d; "
 
-#: clientgui/ViewWork.cpp:490
+#~ msgid "Attach to a project to begin processing work"
+#~ msgstr ""
+#~ "Przyłączanie do projektu i rozpoczęcie przetwarzania danych w tym "
+#~ "projekcie"
+
+#~ msgid "%s: %.2f%% completed."
+#~ msgstr "%s: w %.2f%% ukończone."
+
+# A to co za dziwo? Gdzie się pokazuje? Przecież jako "szczelina" tego nie przetłumaczymy do diabła, ani jako "trop".
 #, c-format
-msgid "Are you sure you want to abort these %d tasks?"
-msgstr "Czy jesteś pewien, że chcesz przerwać te zadania %d?"
+#~ msgid "%d tasks running."
+#~ msgstr "%d zadania uruchomione."
 
-# 75%
-#: clientgui/ViewWork.cpp:504
-#, fuzzy
-msgid "Aborting task..."
-msgstr "Przerywanie przesyłania..."
+#~ msgid "&Messages\tCtrl+Shift+M"
+#~ msgstr "Wiado&mości\tCtrl+Shift+M"
 
-#: clientgui/ViewWork.cpp:776
-msgid "Show all tasks"
-msgstr "Pokaż wszystkie zadania"
+#~ msgid "Display messages"
+#~ msgstr "Pokaż kartę wiadomości"
 
-#: clientgui/ViewWork.cpp:777
-msgid "Show all tasks."
-msgstr "Pokaż wszystkie zadania."
+#~ msgid "Attach to &project or account manager..."
+#~ msgstr "Przyłącz się do &projektu albo menadżera kont..."
 
-#: clientgui/WelcomePage.cpp:284
-msgid "Add project or account manager"
-msgstr "Dodaj projekt lub menadżer kont"
+#~ msgid "Attach to a project or account manager to begin processing work"
+#~ msgstr "Przyłącz się"
 
-#: clientgui/WelcomePage.cpp:288
-msgid "Add project or use BOINC Account Manager"
-msgstr ""
+#~ msgid "Attach to &project..."
+#~ msgstr "Przyłącz się do &projektu..."
+
+#~ msgid "Attach to a project to begin processing work"
+#~ msgstr ""
+#~ "Przyłączanie do projektu i rozpoczęcie przetwarzania danych w tym projekcie"
 
-#: 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 ""
-"Jeśli jest to możliwe, dodawaj projekty przy użyciu\n"
-"strony %s.\n"
-"\n"
-"Projekty dodane przy użyciu tego kreatora\n"
-"nie będą widoczne oraz zarządzane przez %s."
+#~ msgid "&Stop using %s..."
+#~ msgstr "&Zatrzymaj używanie %s"
 
-#: clientgui/WelcomePage.cpp:313
-msgid ""
-"There are over 30 BOINC-based projects\n"
-"doing research in many areas of science,\n"
-"and you can volunteer for as many of them as you like.\n"
-"You can add a project directly,\n"
-"or use an 'Account Manager' web site to select projects."
-msgstr ""
-"Aktualnie jest ponad 30 projektów BOINC\n"
-"wykonujących badania w różnych obszarach nauki.\n"
-"Możesz uczestniczyć w dowolnej liczbie projektów.Możesz dodać projekt bezpośrednio\n"
-"lub skorzystać do wybierania projektów z menadżera kont."
+#~ msgid "Remove client from account manager control."
+#~ msgstr "Odłącz klienta od menadżera kont."
 
-#: 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 ""
+#~ msgid "Allow work according to your preferences"
+#~ msgstr ""
+#~ "Przetwarzanie danych zgodnie z ograniczeniami wynikającymi z preferencji."
 
-#: clientgui/WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
-msgstr ""
+#~ msgid "Use GPU based on &preferences"
+#~ msgstr "Używaj procesora karty graficznej zgodnie z &preferencjami"
 
-#: clientgui/WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
-msgstr ""
+#~ msgid "Allow GPU work according to your preferences"
+#~ msgstr ""
+#~ "Przetwarzanie danych przy użyciu GPU zgodnie z ograniczeniami wynikającymi z "
+#~ "preferencji."
 
-#: clientgui/WelcomePage.cpp:361
-msgid "Add projects run by other researchers or organizations"
-msgstr ""
+#~ msgid "Use GPU never"
+#~ msgstr "Nigdy nie używaj procesora karty graficznej"
 
-#: clientgui/WizardAttach.cpp:673
-msgid "Do you really want to cancel?"
-msgstr "Czy na pewno chcesz anulować?"
+#~ msgid "&Network activity always available"
+#~ msgstr "&Sieć zawsze dostępna"
 
-#: clientgui/WizardAttach.cpp:674
-msgid "Question"
-msgstr "Pytanie"
+#~ msgid "Network activity based on pre&ferences"
+#~ msgstr "Dostęp do sieci zgodnie z pre&ferencjami"
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
-msgid "&Next >"
-msgstr "&Dalej >"
+#~ msgid "Allow network activity according to your preferences"
+#~ msgstr "Sieć dostępna zgodnie z ograniczeniami wynikającymi z preferencji."
 
-#: clientgui/wizardex.cpp:383
-msgid "< &Back"
-msgstr "< &Wstecz"
+#~ msgid "Network activity s&uspended"
+#~ msgstr "Zablok&uj dostęp do sieci"
 
-#: clientgui/wizardex.cpp:553
-msgid "&Finish"
-msgstr "&Zakończ"
+#~ msgid "&Preferences..."
+#~ msgstr "&Preferencje lokalne..."
 
-#: clientgui/common/wxPieCtrl.cpp:64
-msgid "Pie Ctrl"
-msgstr "Legenda"
+#~ msgid "Configure local preferences"
+#~ msgstr "Konfiguracja preferencji lokalnych"
 
-#: clientgui/mac/Mac_GUI.cpp:35
-msgid "Services"
-msgstr "Usługi"
+#~ msgid "Shut down the currently connected core client"
+#~ msgstr "Zamyka obecnie podłączonego klienta BOINC."
+
+#~ msgid "Do network &communication"
+#~ msgstr "&Ponów próby połączeń"
+
+#~ msgid "Do all pending network communication."
+#~ msgstr ""
+#~ "Odsyłanie zakończonych zadań, pobieranie aktualnych stanów punktów i "
+#~ "ewentualnie pobieranie kolejnych zadań do przetwarzania."
+
+#~ msgid "Read configuration info from cc_config.xml."
+#~ msgstr ""
+#~ "Wczytywanie informacji zawartych w pliku konfiguracyjnym: cc_config.xml."
 
-#: clientgui/mac/Mac_GUI.cpp:36
 #, c-format
-msgid "Hide %s"
-msgstr "Ukryj %s"
+#~ msgid "%s - Shutdown the current client..."
+#~ msgstr "%s - Zamknij obecnie używanego klienta..."
 
-#: clientgui/mac/Mac_GUI.cpp:37
-msgid "Hide Others"
-msgstr "Ukryj pozostałe"
+#, c-format
+#~ msgid ""
+#~ "%s will shut down the currently connected client,\n"
+#~ "and prompt you for another host to connect to.\n"
+#~ msgstr ""
+#~ "%s zamknie obecnie podłączonego klienta,\n"
+#~ "i poprosi o wprowadzenie nazwy komputera, do którego ma się teraz podłączyć.\n"
 
-#: clientgui/mac/Mac_GUI.cpp:38
-msgid "Show All"
-msgstr "Pokaż wszystkie"
+#~ msgid "Retrying communications for project(s)..."
+#~ msgstr "Probuję nawiązać połączenie z serwerami projektów..."
 
-#: clientgui/mac/Mac_GUI.cpp:39
 #, c-format
-msgid "Quit %s"
-msgstr "Zakończ %s"
+#~ msgid "%s: %.2f%% completed."
+#~ msgstr "%s: w %.2f%% ukończone."
+
+#, c-format
+#~ msgid "%d tasks running."
+#~ msgstr "%d zadania uruchomione."
 
-#: clientgui/DlgAdvPreferences.h:30
-msgid "specify work start and stop hours in format HH:MM-HH:MM"
-msgstr "Podaj godziny rozpoczęcia i zakończenia pracy w formacie HH:MM-HH:MM"
+#~ msgid "What language should the manager use?"
+#~ msgstr "Jakiego języka powinien używać Menadżer BOINC?"
 
-#: clientgui/DlgAdvPreferences.h:31
-msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
-msgstr "Podaj godziny rozpoczęcia i zakończenia dostępności sieci w formacie HH:MM-HH:MM"
+#~ msgid ""
+#~ "Network reminder interval:\n"
+#~ "(minutes)"
+#~ msgstr ""
+#~ "Częstotliwość wyświetlania informacji:\n"
+#~ "(w minutach)"
 
+#~ msgid "How often should the Manager remind you when a network connection is needed?"
+#~ msgstr ""
+#~ "Jak często Menadżer BOINC powinnien przypominać o konieczności nawiązania "
+#~ "połączenia z siecią?"
+
+#, c-format
+#~ msgid "%s - Can't find web browser"
+#~ msgstr "%s =- Nie mogę odnaleźć przeglądarki internetowej"
+
+#, c-format
+#~ msgid ""
+#~ "%s tried to display the web page\n"
+#~ "\t%s\n"
+#~ "but couldn't find a web browser.\n"
+#~ "To fix this, set the environment variable\n"
+#~ "BROWSER to the path of your web browser,\n"
+#~ "then restart the %s."
+#~ msgstr ""
+#~ "%s próbował pokazać stronę sieci web\n"
+#~ "\t%s\n"
+#~ "ale nie mógł odnaleźć przeglądarki internetowej.\n"
+#~ "Aby usunąć ten błąd, ustaw zmienną środowiskową\n"
+#~ "BROWSER jako ścieżkę dostępu do przeglądarki internetowej,\n"
+#~ "a nastepnie zrestartuj %s."
+
+#~ msgid "Starting client services; please wait..."
+#~ msgstr "Uruchamianie usług; proszę czekać..."
+
+#~ msgid ""
+#~ "Required wizard file(s) are missing from the target server.\n"
+#~ "(lookup_account.php/create_account.php)\n"
+#~ msgstr ""
+#~ "Brak wymaganych plików kreatora na docelowym serwerze.\n"
+#~ "(lookup_account.php/create_account.php)\n"
+
+#~ msgid "ID"
+#~ msgstr "Identyfikator"
+
+#~ msgid "Priority"
+#~ msgstr "Priorytet"
+
+#~ msgid "MessagesGrid"
+#~ msgstr "Wiadomości - lista"
+
+#~ msgid "Copying selected messages to Clipboard..."
+#~ msgstr "Kopiuję wybrane wiadomości do schowka..."
+
+#~ msgid "Info"
+#~ msgstr "Informacja"
+
+#~ msgid "Warning"
+#~ msgstr "Ostrzeżenie"
+
+#~ msgid "BOINC Website"
+#~ msgstr "Strona główna Projektu BOINC"
+
+#~ msgid "Display the latest news about BOINC from the BOINC website"
+#~ msgstr ""
+#~ "Pokaż najnowsze wiadomości dotyczące BOINC ze strony głównej Projektu BOINC"
+
+#~ msgid "ProjectsGrid"
+#~ msgstr "Projekty - lista"
+
+#~ msgid "TransfersGrid"
+#~ msgstr "Przesyłanie - lista"
+
+#~ msgid "Aborting transfer(s)..."
+#~ msgstr "Przerywanie przesyłania plików..."
+
+#~ msgid ""
+#~ "Are you sure you want to abort this file(s) transfer ?\n"
+#~ "NOTE: Aborting a transfer will invalidate a task and you\n"
+#~ "will not receive credit for it."
+#~ msgstr ""
+#~ "Czy jesteś pewny, że chcesz przerwać przesyłanie tego pliku?\n"
+#~ "UWAGA: Przerwanie przesyłania pliku spowoduje, że to zadanie zostanie\n"
+#~ "unieważnione i nie otrzymasz za nie punktów."
+
+#~ msgid "Abort File Transfer(s)"
+#~ msgstr "Przerywanie przesyłania plików"
+
+#~ msgid "TasksGrid"
+#~ msgstr "Zadania - lista"
diff --git a/locale/pl/BOINC-Setup.mo b/locale/pl/BOINC-Setup.mo
index 79fca43..6cb10a2 100644
Binary files a/locale/pl/BOINC-Setup.mo and b/locale/pl/BOINC-Setup.mo differ
diff --git a/locale/pl/BOINC-Setup.po b/locale/pl/BOINC-Setup.po
old mode 100755
new mode 100644
index b9f6b3a..0c84959
--- a/locale/pl/BOINC-Setup.po
+++ b/locale/pl/BOINC-Setup.po
@@ -1,45 +1,39 @@
 # 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:
+# Rafał Kaźmierczak <prometh.dragu at gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\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-12 00:18-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: pl\n"
+"PO-Revision-Date: 2015-03-24 19:31+0000\n"
+"Last-Translator: Rafał Kaźmierczak <prometh.dragu at gmail.com>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/boinc/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-Basepath: /Volumes/Cheer/BOINC_GIT/boinc_trunk\n"
-"X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: mac_installer\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: Installer.cpp:124
 #, c-format
 msgid "Sorry, this version of %s requires system 10.5 or higher."
-msgstr ""
+msgstr "Niestety, ta wersja %s wymaga systemu w wersji 10.5 lub wyższej."
 
-#: PostInstall.cpp:130
-#: PostInstall.cpp:1136
-#: uninstall.cpp:1618
+#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
 msgid "Yes"
-msgstr ""
+msgstr "Tak"
 
-#: PostInstall.cpp:131
-#: PostInstall.cpp:1137
-#: uninstall.cpp:1619
+#: PostInstall.cpp:131 PostInstall.cpp:1137 uninstall.cpp:1619
 msgid "No"
-msgstr ""
+msgstr "Nie"
 
 #: PostInstall.cpp:133
 msgid "Should BOINC run even when no user is logged in?"
-msgstr ""
+msgstr "Czy BOINC ma działać nawet kiedy żaden użytkownik nie jest zalogowany?"
 
 #: PostInstall.cpp:1416
 #, c-format
@@ -47,26 +41,26 @@ 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 ""
+msgstr "Użytkownicy, którzy mają uprawnienia administratora na tym komputerze będą automatycznie mogli uruchomić i kontrolować %s.\n\nCzy chcesz, żeby użytkownicy bez uprawnień administratora także mogli uruchamiać i kontrolować %s na tym Macu?"
 
 #: PostInstall.cpp:1444
 #, c-format
 msgid "Do you want to set %s as the screensaver for all %s users on this Mac?"
-msgstr ""
+msgstr "Czy chcesz ustawić %s jako wygaszacz ekranu dla wszystkich użytkowników %s na tym Macu?"
 
 #: uninstall.cpp:82
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: uninstall.cpp:136
 msgid "Permission error after relaunch"
-msgstr ""
+msgstr "Błąd pozwolenia po ponownym uruchomieniu"
 
 #: uninstall.cpp:141
 msgid ""
 "Removal may take several minutes.\n"
 "Please be patient."
-msgstr ""
+msgstr "Usunięcie może potrwać kilka minut.\nProsimy o cierpliwość."
 
 #: uninstall.cpp:156
 #, c-format
@@ -74,27 +68,27 @@ 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 ""
+msgstr "Czy na pewno chcesz całkowicie usunąć %s ze swojego komputera?\n\nSpowoduje to usunięcie plików wykonywalnych, ale nie naruszy plików danych %s."
 
 #: uninstall.cpp:163
 #, c-format
 msgid "Canceled: %s has not been touched."
-msgstr ""
+msgstr "Anulowano: nie naruszono %s."
 
 #: uninstall.cpp:174
 #, c-format
 msgid "An error occurred: error code %d"
-msgstr ""
+msgstr "Wystąpił błąd: kod błędu %d"
 
 #: uninstall.cpp:230
 msgid "name  of user"
-msgstr ""
+msgstr "nazwa użytkownika"
 
 #: uninstall.cpp:272
 msgid ""
 "Do you also want to remove VirtualBox from your computer?\n"
 "(VirtualBox was installed along with BOINC.)"
-msgstr ""
+msgstr "Czy chcesz również usunąć VirtualBox ze swojego komputera?\n(VirtualBox został zainstalowany wraz z BOINC.)"
 
 #: uninstall.cpp:312
 #, c-format
@@ -106,20 +100,19 @@ msgid ""
 "\n"
 "for each user, the file\n"
 "\"%s\"."
-msgstr ""
+msgstr "Usuwanie zakończone.\n\nAby usunąć następujące pozostałe pliki użyj Wyszukiwania:\nkatalog \"%s\"\n\ndla każdego użytkownika, plik\n\"%s\""
 
 #: uninstall.cpp:840
 #, c-format
 msgid ""
 "Enter your administrator password to completely remove %s from you computer.\n"
 "\n"
-msgstr ""
+msgstr "Wprowadź swoje hasło administratora żeby całkowicie usunąć %s z twojego komputera.\n\n"
 
 #: uninstall.cpp:1616
 msgid "Cancel"
-msgstr ""
+msgstr "Anuluj"
 
 #: uninstall.cpp:1617
 msgid "Continue..."
-msgstr ""
-
+msgstr "Kontynuuj..."
diff --git a/locale/pl/BOINC-Web.mo b/locale/pl/BOINC-Web.mo
index 24c3134..44d08eb 100644
Binary files a/locale/pl/BOINC-Web.mo and b/locale/pl/BOINC-Web.mo differ
diff --git a/locale/pl/BOINC-Web.po b/locale/pl/BOINC-Web.po
index 3319360..09c52a2 100755
--- a/locale/pl/BOINC-Web.po
+++ b/locale/pl/BOINC-Web.po
@@ -4,22 +4,24 @@
 # FileID  : $Id$
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\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-12 00:19-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: 2013-01-20 16:11+0200\n"
+"Last-Translator: Pawel <pawel.pbm at gmail.com>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Pootle 2.1.6\n"
 "X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-SearchPath-0: doc\n"
 "X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
 "X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
 "X-Poedit-KeywordsList: tra\n"
-"X-Poedit-SearchPath-0: doc\n"
 
 #: docutil.php:21
 msgid "Search"
@@ -35,7 +37,9 @@ msgid "This page is %stranslatable%s."
 msgstr "Tę stronę %smożna przetłumaczyć%s."
 
 #: download.php:39
-msgid "We recommend that you also install VirtualBox, so your computer can work on science projects that require it."
+msgid ""
+"We recommend that you also install VirtualBox, so your computer can work on "
+"science projects that require it."
 msgstr ""
 
 #: download.php:41
@@ -46,14 +50,12 @@ msgstr ""
 msgid "Download BOINC + VirtualBox"
 msgstr ""
 
-#: download.php:54
-#: download.php:69
+#: download.php:54 download.php:69
 #, php-format
 msgid "for %s"
 msgstr ""
 
-#: download.php:57
-#: download.php:72
+#: download.php:57 download.php:72
 #, php-format
 msgid "BOINC version %s"
 msgstr ""
@@ -70,19 +72,30 @@ msgid "Download BOINC"
 msgstr "Pobierz BOINC"
 
 #: download.php:123
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others."
+msgid ""
+"BOINC is a program that lets you donate your idle computer time to science "
+"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, and many others."
 msgstr ""
 
 #: download.php:125
-msgid "After installing BOINC on your computer, you can connect it to as many of these projects as you like."
+msgid ""
+"After installing BOINC on your computer, you can connect it to as many of "
+"these projects as you like."
 msgstr ""
 
 #: download.php:127
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
-msgstr "Możesz uruchamiać to oprogramowanie jedynie na swoim własnym komputerze, lub na innym komputerze o ile masz zgodę jego właściciela."
+msgid ""
+"You may run this software on a computer only if you own the computer or have "
+"the permission of its owner."
+msgstr ""
+"Możesz uruchamiać to oprogramowanie jedynie na swoim własnym komputerze, lub "
+"na innym komputerze o ile masz zgodę jego właściciela."
 
 #: download.php:132
-msgid "We recommend that you download BOINC from the Google Play Store or Amazon Appstore, not from here."
+msgid ""
+"We recommend that you download BOINC from the Google Play Store or Amazon "
+"Appstore, not from here."
 msgstr ""
 
 #: download.php:167
@@ -93,8 +106,7 @@ msgstr "Wymagania sprzętowe"
 msgid "Release notes"
 msgstr "Informacje o wydaniu"
 
-#: download.php:169
-#: index.php:86
+#: download.php:169 index.php:86
 msgid "Help"
 msgstr "Pomoc"
 
@@ -116,21 +128,50 @@ msgstr "BOINC: licz dla nauki"
 
 #: help.php:12
 #, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
-msgstr "Pomoc On-Line BOINC pozwala Ci porozumieć się bezpośrednio z doświadczonymi użytkownikami BOINC, którzy mogą %s odpowiedzieć na Twoje pytania na temat wolontariatu; %s omówić z Tobą proces instalacji i używania BOINC; %s pomóc Ci rozwiązać problemy."
+msgid ""
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who "
+"can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"through the process of installing and using BOINC; %s troubleshoot any "
+"problems you might have."
+msgstr ""
+"Pomoc On-Line BOINC pozwala Ci porozumieć się bezpośrednio z doświadczonymi "
+"użytkownikami BOINC, którzy mogą %s odpowiedzieć na Twoje pytania na temat "
+"wolontariatu; %s omówić z Tobą proces instalacji i używania BOINC; %s pomóc "
+"Ci rozwiązać problemy."
 
 #: help.php:21
 #, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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 "Pomoc On-Line BOINC bazuje na komunikatorze internetowym %sSkype%s. Skype jest darmowy (zarówno oprogramowanie jak i połączenia). Jeżeli jeszcze nie masz Skype'a, proszę %sściągnij go teraz%s. Kiedy skończysz instalację, powróć na tą stronę."
+msgid ""
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. "
+"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 ""
+"Pomoc On-Line BOINC bazuje na komunikatorze internetowym %sSkype%s. Skype "
+"jest darmowy (zarówno oprogramowanie jak i połączenia). Jeżeli jeszcze nie "
+"masz Skype'a, proszę %sściągnij go teraz%s. Kiedy skończysz instalację, "
+"powróć na tą stronę."
 
 #: help.php:28
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
-msgstr "Najlepszą metodą uzyskania pomocy jest rozmowa głosowa do przeprowadzenia której potrzebujesz wbudowanego mikrofonu oraz głośników lub zewnętrznego zestawu słuchawkowego z mikrofonem. Możesz także użyć rozmowy tekstowej lub zwykłego e-mail'a (jeżeli nie posiadasz Skype'a) do komunikacji z wolontariuszami pomocy."
+msgid ""
+"The best way to get help is by voice, for which you need either built-in "
+"microphone and speakers or an external headset for your computer.  You can "
+"also use Skype's text-based chat system or regular email (if you don't have "
+"Skype) to communicate with Help Volunteers."
+msgstr ""
+"Najlepszą metodą uzyskania pomocy jest rozmowa głosowa do przeprowadzenia "
+"której potrzebujesz wbudowanego mikrofonu oraz głośników lub zewnętrznego "
+"zestawu słuchawkowego z mikrofonem. Możesz także użyć rozmowy tekstowej lub "
+"zwykłego e-mail'a (jeżeli nie posiadasz Skype'a) do komunikacji z "
+"wolontariuszami pomocy."
 
 #: help.php:31
-msgid "Volunteers speaking several languages are available. Please select a language:"
-msgstr "Dostępni są wolontariusze porozumiewający się w kilku językach. Wybierz swój język:"
+msgid ""
+"Volunteers speaking several languages are available. Please select a "
+"language:"
+msgstr ""
+"Dostępni są wolontariusze porozumiewający się w kilku językach. Wybierz swój "
+"język:"
 
 #: help.php:47
 msgid "Be a Help Volunteer"
@@ -138,17 +179,30 @@ msgstr "Zostań wolontariuszem pomocy"
 
 #: help.php:50
 #, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
-msgstr "Jeżeli jesteś doświadczonym użytkownikiem BOINC'a, pragniemy zaprosić Cię do %szostania wolontariuszem pomocy%s. To dobry sposób aby wspomóc badania naukowe i wolontariat obliczeń - przy okazji to niezła zabawa!"
+msgid ""
+"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+"Volunteer%s.  It's a great way to help the cause of scientific research and "
+"volunteer computing - and it's fun!"
+msgstr ""
+"Jeżeli jesteś doświadczonym użytkownikiem BOINC'a, pragniemy zaprosić Cię do "
+"%szostania wolontariuszem pomocy%s. To dobry sposób aby wspomóc badania "
+"naukowe i wolontariat obliczeń - przy okazji to niezła zabawa!"
 
 #: help.php:56
 #, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
-msgstr "Jeżeli już jesteś wolontariuszem pomocy: aby edytować swoje ustawienia, %skliknij tutaj%s."
+msgid ""
+"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
+msgstr ""
+"Jeżeli już jesteś wolontariuszem pomocy: aby edytować swoje ustawienia, %"
+"skliknij tutaj%s."
 
 #: help_funcs.php:107
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
-msgstr "Pomocnicy BOINC są wolontariuszami. Ich opinie nie są zatwierdzone przez BOINC lub Uniwersytet Kalifornijski."
+msgid ""
+"BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
+"or the University of California."
+msgstr ""
+"Pomocnicy BOINC są wolontariuszami. Ich opinie nie są zatwierdzone przez "
+"BOINC lub Uniwersytet Kalifornijski."
 
 #: help_funcs.php:110
 msgid "%1Never%2 give email address or password information to BOINC helpers."
@@ -200,9 +254,7 @@ msgstr "Uczestnicz"
 msgid "Download"
 msgstr "Pobierz"
 
-#: index.php:87
-#: index.php:120
-#: index.php:171
+#: index.php:87 index.php:120 index.php:171
 msgid "Documentation"
 msgstr "Dokumentacja"
 
@@ -215,7 +267,10 @@ msgid "Links"
 msgstr ""
 
 #: index.php:94
-msgid "Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:"
+msgid ""
+"Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure "
+"diseases, study global warming, discover pulsars, and do many other types of "
+"scientific research.  It's safe, secure, and easy:"
 msgstr ""
 
 #: index.php:96
@@ -232,8 +287,12 @@ msgstr ""
 
 #: index.php:102
 #, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
-msgstr "Jeżeli uczestniczysz w kilku projektach, wypróbuj %smenadżera kont%s takiego jak %sGridRepublic%s lub %sBAM%s. "
+msgid ""
+"Or, if you run several projects, try an %saccount manager%s such as %"
+"sGridRepublic%s or %sBAM!%s. "
+msgstr ""
+"Jeżeli uczestniczysz w kilku projektach, wypróbuj %smenadżera kont%s takiego "
+"jak %sGridRepublic%s lub %sBAM%s. "
 
 #: index.php:118
 msgid "Compute with BOINC"
@@ -244,12 +303,21 @@ msgid "Software updates"
 msgstr "Aktualizacje oprogramowania"
 
 #: index.php:128
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
-msgstr "%1Naukowcy%2: wykorzystajcie BOINC, aby stworzyć %3projekt naukowy%4, w którym dzięki komputerom uczestników będziecie mogli przetwarzać dane przy pomocy tysięcy procesorów."
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving "
+"you the computing power of thousands of CPUs."
+msgstr ""
+"%1Naukowcy%2: wykorzystajcie BOINC, aby stworzyć %3projekt naukowy%4, w "
+"którym dzięki komputerom uczestników będziecie mogli przetwarzać dane przy "
+"pomocy tysięcy procesorów."
 
 #: index.php:132
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
-msgstr "%1Uczelnie%2: użyjcie BOINC aby stworzyć %3Wirtualne Akademickie Centra Obliczeniowe%4."
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
+msgstr ""
+"%1Uczelnie%2: użyjcie BOINC aby stworzyć %3Wirtualne Akademickie Centra "
+"Obliczeniowe%4."
 
 #: index.php:137
 msgid "%1Companies%2: use BOINC for %3desktop Grid computing%4."
@@ -321,8 +389,11 @@ msgstr "API dla oprogramowania dodatkowego"
 
 #: index.php:217
 #, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
-msgstr "Otwarte oprogramowanie dla %skomputerów wolontariuszy%s i %ssieci przetwarzania rozproszonego%s."
+msgid ""
+"Open-source software for %svolunteer computing%s and %sgrid computing%s."
+msgstr ""
+"Otwarte oprogramowanie dla %skomputerów wolontariuszy%s i %ssieci "
+"przetwarzania rozproszonego%s."
 
 #: index.php:230
 msgid "BOINC is based at The University of California, Berkeley"
@@ -343,7 +414,10 @@ msgid "Seismology"
 msgstr ""
 
 #: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
+msgid ""
+"The Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to Internet-connected computers.  You must buy a "
+"sensor to participate."
 msgstr ""
 
 #: projects.inc:27
@@ -355,23 +429,24 @@ msgid "Environmental research"
 msgstr ""
 
 #: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
+msgid ""
+"This project is creating a free and continuously updated map of radiation "
+"levels by using sensors connected to volunteers' computers.  You must buy a "
+"sensor to participate."
 msgstr ""
 
 #: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
+msgid ""
+"To participate in these projects you must buy a sensor and attach it to your "
+"computer."
 msgstr ""
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
 msgstr "Kognitywistyka i sztuczna inteligencja"
 
-#: projects.inc:60
-#: projects.inc:364
-#: projects.inc:408
-#: projects.inc:457
-#: projects.inc:464
-#: projects.inc:511
+#: projects.inc:60 projects.inc:364 projects.inc:408 projects.inc:457
+#: projects.inc:464 projects.inc:511
 msgid "Private"
 msgstr "Prywatny"
 
@@ -380,8 +455,15 @@ msgid "Artificial intelligence"
 msgstr "Sztuczna inteligencja"
 
 #: projects.inc:62
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
-msgstr "Przetwarza i konwertuje sieci semantyczne do użytku w FreeHAL, sztuczna inteligencja, która używa sieci semantycznych, przeszukuje bazy części mowy i tagi części mowy w celu naśladowania ludzkich zachowań w rozmowach."
+msgid ""
+"Parse and convert semantic nets for use in FreeHAL, an artificial "
+"intelligence that uses semantic networks, stemmers, part of speech "
+"databases, and part of speech taggers in order to imitate human behavior in "
+"conversations."
+msgstr ""
+"Przetwarza i konwertuje sieci semantyczne do użytku w FreeHAL, sztuczna "
+"inteligencja, która używa sieci semantycznych, przeszukuje bazy części mowy "
+"i tagi części mowy w celu naśladowania ludzkich zachowań w rozmowach."
 
 #: projects.inc:69
 msgid "Biology and Medicine"
@@ -396,7 +478,12 @@ msgid "Antimalarial drug discovery"
 msgstr ""
 
 #: projects.inc:84
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
+msgid ""
+"The parasite that causes malaria continues to evolve resistance to available "
+"medication. We therefore urgently need to discover new drugs to replace "
+"existing drugs. Importantly, these new drugs need to target NEW proteins in "
+"the parasite. The FightMalaria at Home project is aimed at finding these new "
+"targets."
 msgstr ""
 
 #: projects.inc:90
@@ -408,8 +495,19 @@ msgid "Protein structure prediction"
 msgstr "Przewidywanie struktury białek"
 
 #: projects.inc:92
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
-msgstr "POEM at HOME używa podejścia obliczeniowego do przewidywania struktury biologicznie aktywnych białek, aby zrozumieć mechanizmy przetwarzania sygnału, gdy białka współdziałają ze sobą, aby zrozumieć, choroby związane z nieprawidłowym działaniem białka lub jego łączenia się oraz do opracowania nowych leków na podstawie trójwymiarowej struktury białek biologicznie ważnych."
+msgid ""
+"POEM at HOME uses a computational approach to predict the biologically active "
+"structure of proteins, to understand the signal-processing mechanisms when "
+"the proteins interact with one another, to understand diseases related to "
+"protein malfunction or aggregation, and to develop new drugs on the basis of "
+"the three-dimensions structure of biologically important proteins."
+msgstr ""
+"POEM at HOME używa podejścia obliczeniowego do przewidywania struktury "
+"biologicznie aktywnych białek, aby zrozumieć mechanizmy przetwarzania "
+"sygnału, gdy białka współdziałają ze sobą, aby zrozumieć, choroby związane z "
+"nieprawidłowym działaniem białka lub jego łączenia się oraz do opracowania "
+"nowych leków na podstawie trójwymiarowej struktury białek biologicznie "
+"ważnych."
 
 #: projects.inc:98
 msgid "University of Delaware"
@@ -420,8 +518,15 @@ msgid "Study of protein - ligand interactions"
 msgstr "Badanie białek - oddziaływanie cząsteczek"
 
 #: projects.inc:100
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
-msgstr "Docking at Home ma zarówno biologiczne i informatyczne cele. Celem projektu jest pogłębienie wiedzy na temat atomowych szczegółów oddziaływania białko-cząstka, a przez to świeżego spojrzenia na odkrywanie nowych leków."
+msgid ""
+"Docking at Home has both bioscience and computer science goals. The project "
+"aims to further knowledge of the atomic details of protein-ligand "
+"interactions and, by doing so, will search for insights into the discovery "
+"of novel pharmaceuticals."
+msgstr ""
+"Docking at Home ma zarówno biologiczne i informatyczne cele. Celem projektu "
+"jest pogłębienie wiedzy na temat atomowych szczegółów oddziaływania białko-"
+"cząstka, a przez to świeżego spojrzenia na odkrywanie nowych leków."
 
 #: projects.inc:114
 msgid "Barcelona Biomedical Research Park (PRBB)"
@@ -432,8 +537,16 @@ msgid "Molecular simulations of proteins"
 msgstr "Symulacje molekularne białek"
 
 #: projects.inc:116
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
-msgstr "GPUGrid.net otwiera nowe możliwości obliczeń dynamiki molekularnej w pełnym wymiarze atomowym (CellMD) specjalnie zoptymalizowany do pracy na procesorach graficznych NVIDIA. Nowe aplikacje biomedyczne, dają możliwość nadania nowej roli biologii obliczeniowej dla badań biomedycznych."
+msgid ""
+"GPUGrid.net opens novel computational scenarios by the first full-atom "
+"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
+"New biomedical applications suddenly become possible giving a new role to "
+"computational biology for biomedical research."
+msgstr ""
+"GPUGrid.net otwiera nowe możliwości obliczeń dynamiki molekularnej w pełnym "
+"wymiarze atomowym (CellMD) specjalnie zoptymalizowany do pracy na "
+"procesorach graficznych NVIDIA. Nowe aplikacje biomedyczne, dają możliwość "
+"nadania nowej roli biologii obliczeniowej dla badań biomedycznych."
 
 #: projects.inc:122
 msgid "Technion, Israel"
@@ -444,11 +557,18 @@ msgid "Genetic linkage analysis"
 msgstr "Analiza połączeń genetycznych"
 
 #: projects.inc:124
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
-msgstr "Superlink at Technion pomaga genetykom z całego świata znaleźć chorobotwórcze geny powodujące pewne typy cukrzycy, nadciśnienie (wysokie ciśnienie krwi), raka, schizofrenii i wielu innych."
+msgid ""
+"Superlink at Technion helps geneticists all over the world find disease-"
+"provoking genes causing some types of diabetes, hypertension (high blood "
+"pressure), cancer, schizophrenia and many others."
+msgstr ""
+"Superlink at Technion pomaga genetykom z całego świata znaleźć chorobotwórcze "
+"geny powodujące pewne typy cukrzycy, nadciśnienie (wysokie ciśnienie krwi), "
+"raka, schizofrenii i wielu innych."
 
 #: projects.inc:138
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
+msgid ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
 msgstr "Centrum Bioinformatyki i Biologii Obliczeniowej Uniwersytetu w Maryland"
 
 #: projects.inc:139
@@ -456,8 +576,16 @@ msgid "Life science research"
 msgstr "Badania związane z naukami przyrodniczymi"
 
 #: projects.inc:140
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
-msgstr "Projekt Lattice dostarcza mocy obliczeniowej dla naukowców z Uniwersytetu w Maryland prowadzących badania pokrewieństwa ewolucyjnego na podstawie sekwencji DNA; sekwencji białek bakterii, plazmidu i wirusów, a także różnorodności biologicznej w rezerwatach przyrody."
+msgid ""
+"The Lattice Project supplies computing power to scientists at the University "
+"of Maryland studying evolutionary relationships based on DNA sequence data; "
+"bacterial, plasmid, and virus protein sequences; and biological diversity in "
+"nature reserves. "
+msgstr ""
+"Projekt Lattice dostarcza mocy obliczeniowej dla naukowców z Uniwersytetu w "
+"Maryland prowadzących badania pokrewieństwa ewolucyjnego na podstawie "
+"sekwencji DNA; sekwencji białek bakterii, plazmidu i wirusów, a także "
+"różnorodności biologicznej w rezerwatach przyrody."
 
 #: projects.inc:146
 msgid "The Swiss Tropical Institute"
@@ -468,29 +596,61 @@ msgid "Epidemiology"
 msgstr "Epidemiologia"
 
 #: projects.inc:148
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
-msgstr "Symulacje modeli dynamiki przekazywania oraz efektów zdrowotnych malarii są ważnym narzędziem kontroli malarii. Mogą zostać użyte do odnalezienia optymalnych strategii dostarczania moskitier, chemioterapii lub nowych szczepionek nad którymi aktualnie trwają prace. Modelowanie takie jest szczególnie wymagające pod względem zasobów obliczeniowych ze względu na symulację dużych populacji ludzi z różnymi parametrami dotyczącymi czynników biologicznych i społecznych, które mają wpływ  [...]
+msgid ""
+"Simulation models of the transmission dynamics and health effects of malaria "
+"are an important tool for malaria control. They can be used to determine "
+"optimal strategies for delivering mosquito nets, chemotherapy, or new "
+"vaccines which are currently under development and testing.  Such modeling "
+"is extremely computer intensive, requiring simulations of large human "
+"populations with a diverse set of parameters related to biological and "
+"social factors that influence the distribution of the disease. "
+msgstr ""
+"Symulacje modeli dynamiki przekazywania oraz efektów zdrowotnych malarii są "
+"ważnym narzędziem kontroli malarii. Mogą zostać użyte do odnalezienia "
+"optymalnych strategii dostarczania moskitier, chemioterapii lub nowych "
+"szczepionek nad którymi aktualnie trwają prace. Modelowanie takie jest "
+"szczególnie wymagające pod względem zasobów obliczeniowych ze względu na "
+"symulację dużych populacji ludzi z różnymi parametrami dotyczącymi czynników "
+"biologicznych i społecznych, które mają wpływ na rozprzestrzenianie się "
+"choroby."
 
 #: projects.inc:170
 msgid "University of Washington"
 msgstr "University of Washington"
 
-#: projects.inc:171
-#: projects.inc:179
+#: projects.inc:171 projects.inc:179
 msgid "Biology"
 msgstr "Biologia"
 
 #: projects.inc:172
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
-msgstr "Określenie trójwymiarowego kształtu białek może doprowadzić do odnalezienia leków na wiele chorób. Uruchamiając projekt Rosetta at home pomagasz nam przyspieszyć badania oraz rozszerzyć ich zakres w sposób, który nie mógł by być możliwy bez twojego udziału. Wspomagasz także nasze wysiłki w zaprojektowaniu nowych białek, które pomogą walczyć z chorobami takimi jak HIV, Malaria, rak i Alzheimer."
+msgid ""
+"Determine the 3-dimensional shapes of proteins in research that may "
+"ultimately lead to finding cures for some major human diseases. By running "
+"Rosetta at home you will help us speed up and extend our research in ways we "
+"couldn't possibly attempt without your help. You will also be helping our "
+"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
+"Cancer, and Alzheimer's"
+msgstr ""
+"Określenie trójwymiarowego kształtu białek może doprowadzić do odnalezienia "
+"leków na wiele chorób. Uruchamiając projekt Rosetta at home pomagasz nam "
+"przyspieszyć badania oraz rozszerzyć ich zakres w sposób, który nie mógł by "
+"być możliwy bez twojego udziału. Wspomagasz także nasze wysiłki w "
+"zaprojektowaniu nowych białek, które pomogą walczyć z chorobami takimi jak "
+"HIV, Malaria, rak i Alzheimer."
 
 #: projects.inc:178
 msgid "University of Vienna"
 msgstr "Uniwersytet Wiedeński"
 
 #: projects.inc:180
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
-msgstr "Obliczanie podobieństw między białkami. SIMAP zapewnia publiczną bazę danych otrzymanych wyników, która odgrywa kluczową rolę w wielu projektach badawczych bioinformatyki."
+msgid ""
+"Calculate similarities between proteins. SIMAP provides a public database of "
+"the resulting data, which plays a key role in many bioinformatics research "
+"projects."
+msgstr ""
+"Obliczanie podobieństw między białkami. SIMAP zapewnia publiczną bazę danych "
+"otrzymanych wyników, która odgrywa kluczową rolę w wielu projektach "
+"badawczych bioinformatyki."
 
 #: projects.inc:186
 msgid "Earth Sciences"
@@ -505,7 +665,15 @@ msgid "Climate study"
 msgstr "Badania klimatu"
 
 #: projects.inc:200
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
+msgid ""
+"Investigate the approximations that have to be made in state-of-the-art "
+"climate models. By running the model thousands of times we hope to find out "
+"how the model responds to slight tweaks to these approximations - slight "
+"enough to not make the approximations any less realistic. This will allow us "
+"to improve our understanding of how sensitive our models are to small "
+"changes and also to things like changes in carbon dioxide and the sulphur "
+"cycle. This will allow us to explore how climate may change in the next "
+"century under a wide range of different scenarios."
 msgstr ""
 
 #: projects.inc:207
@@ -517,31 +685,53 @@ msgid "Mechanical engineering"
 msgstr ""
 
 #: projects.inc:214
-msgid "Currently we are calculating the optimum design of a structure call the 52 bar truss"
+msgid ""
+"Currently we are calculating the optimum design of a structure call the 52 "
+"bar truss"
 msgstr ""
 
-#: projects.inc:224
-#: projects.inc:263
-#: projects.inc:271
+#: projects.inc:224 projects.inc:263 projects.inc:271
 msgid "Astronomy"
 msgstr "Astronomia"
 
 #: projects.inc:225
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
+msgid ""
+"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
+"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
+"Universe. We will measure physical parameters (such as stellar mass surface "
+"density, star formation rate surface density, attenuation, and first-order "
+"star formation history) on a resolved pixel-by-pixel basis using spectral "
+"energy distribution (SED) fitting techniques in a distributed computing mode."
 msgstr ""
 
 #: projects.inc:247
 msgid "University of Texas at Austin"
 msgstr "Uniwersytet Teksański w Austin"
 
-#: projects.inc:248
-#: projects.inc:279
+#: projects.inc:248 projects.inc:279
 msgid "Chemistry"
 msgstr "Chemia"
 
 #: projects.inc:249
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
-msgstr "Powszechnym problemem w chemii teoretycznej, fizyce materii skondensowanej oraz w badaniach materiałowych jest obliczenie czasu ewolucji systemów skali atomowej jak na przykład reakcji chemicznych czy dyfuzji. Zdarzenia takie występują rzadko (są wiele razy wolniejsze niż ruchy wibracyjne atomów) i ze względu na to symulacje bezpośrednie, śledzenie każdego ruchu atomów, zajęłoby tysiące lat najszybszych komputerów zanim zdarzenie takie mogłoby zaistnieć. Nasza grupa badawcza zajm [...]
+msgid ""
+"A common problem in theoretical chemistry, condensed matter physics and "
+"materials science is the calculation of the time evolution of an atomic "
+"scale system where, for example, chemical reactions and/or diffusion occur. "
+"Generally the events of interest are quite rare (many orders of magnitude "
+"slower than the vibrational movements of the atoms), and therefore direct "
+"simulations, tracking every movement of the atoms, would take thousands of "
+"years of computer calculations on the fastest present day computer before a "
+"single event of interest can be expected to occur.  Our research group is "
+"interested in calculating the long time dynamics of systems."
+msgstr ""
+"Powszechnym problemem w chemii teoretycznej, fizyce materii skondensowanej "
+"oraz w badaniach materiałowych jest obliczenie czasu ewolucji systemów skali "
+"atomowej jak na przykład reakcji chemicznych czy dyfuzji. Zdarzenia takie "
+"występują rzadko (są wiele razy wolniejsze niż ruchy wibracyjne atomów) i ze "
+"względu na to symulacje bezpośrednie, śledzenie każdego ruchu atomów, "
+"zajęłoby tysiące lat najszybszych komputerów zanim zdarzenie takie mogłoby "
+"zaistnieć. Nasza grupa badawcza zajmuje się obliczaniem długotrwałej "
+"dynamiki systemów."
 
 # 95%
 #: projects.inc:262
@@ -550,23 +740,41 @@ msgid "University of Illinois at Urbana-Champaign"
 msgstr "Uniwersytet Illinois w Urbana-Champaign"
 
 #: projects.inc:264
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
-msgstr "Celem Cosmology at Home jest poszukiwanie modelu, który najlepiej opisuje nasz Wszechświat oraz znalezienie gamy modeli, które zgadzają się z dostępnymi danymi astronomicznymi fizyki cząstek."
+msgid ""
+"The goal of Cosmology at Home is to search for the model that best describes "
+"our Universe and to find the range of models that agree with the available "
+"astronomical particle physics data."
+msgstr ""
+"Celem Cosmology at Home jest poszukiwanie modelu, który najlepiej opisuje nasz "
+"Wszechświat oraz znalezienie gamy modeli, które zgadzają się z dostępnymi "
+"danymi astronomicznymi fizyki cząstek."
 
 #: projects.inc:270
 msgid "Rensselaer Polytechnic Institute"
 msgstr "Rensselaer Polytechnic Institute"
 
 #: projects.inc:272
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
-msgstr "Celem Milkyway at Home jest stworzenie bardzo dokładnego trójwymiarowego modelu Drogi Mlecznej korzystając z danych zebranych przez Sloan Digital Sky Survey."
+msgid ""
+"The goal of Milkyway at Home is to create a highly accurate three dimensional "
+"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
+"Survey."
+msgstr ""
+"Celem Milkyway at Home jest stworzenie bardzo dokładnego trójwymiarowego modelu "
+"Drogi Mlecznej korzystając z danych zebranych przez Sloan Digital Sky "
+"Survey."
 
 #: projects.inc:278
 msgid "Leiden University, The Netherlands"
 msgstr "Uniwersytet w Lejdzie, Holandia"
 
 #: projects.inc:280
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
+msgid ""
+"Surface science calculations using Classical Dynamics.  Leiden Classical "
+"allows volunteers, students and other scientist to submit their personal "
+"calculations to the grid. Each user has his own personal queue for Classical "
+"Dynamics jobs. In this way students have used the grid to simulate liquid "
+"argon, or to test the validity of the ideal gas law by actually doing the "
+"simulations through the grid."
 msgstr ""
 
 #: projects.inc:294
@@ -578,25 +786,46 @@ msgid "Astrophysics"
 msgstr "Astrofizyka"
 
 #: projects.inc:296
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
-msgstr "Poszukiwania wirujących gwiazd neutronowych (zwanych również pulsarami) przy wykorzystaniu danych z LIGO, wykrywaczy fal grawitacyjnych GEO i z radioobserwatorium Arecibo. Einstein at Home jest projektem Światowego Roku Fizyki 2005 wspieranym przez American Physical Society (APS) oraz przez wiele organizacji międzynarodowych."
+msgid ""
+"Search for spinning neutron stars (also called pulsars) using data from the "
+"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
+"observatory.  Einstein at Home is a World Year of Physics 2005 project "
+"supported by the American Physical Society (APS) and by a number of "
+"international organizations."
+msgstr ""
+"Poszukiwania wirujących gwiazd neutronowych (zwanych również pulsarami) przy "
+"wykorzystaniu danych z LIGO, wykrywaczy fal grawitacyjnych GEO i z "
+"radioobserwatorium Arecibo. Einstein at Home jest projektem Światowego Roku "
+"Fizyki 2005 wspieranym przez American Physical Society (APS) oraz przez "
+"wiele organizacji międzynarodowych."
 
-#: projects.inc:310
-#: projects.inc:318
+#: projects.inc:310 projects.inc:318
 msgid "CERN (European Organization for Nuclear Research)"
 msgstr "CERN (Europejska Organizacja Badań Jądrowych)"
 
-#: projects.inc:311
-#: projects.inc:319
+#: projects.inc:311 projects.inc:319
 msgid "Physics"
 msgstr "Fizyka"
 
 #: projects.inc:312
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
-msgstr "Wielki Zderzacz Hadronów (LHC) jest to akcelerator cząstek w CERN, Europejskiej Organizacji Badań Jądrowych, największym na świecie laboratorium cząstek elementarnych. Jest to najpotężniejsze narzędzie, jakie kiedykolwiek zbudowano w celu badania właściwości cząstek. LHC at home prowadzi symulacje w celu poprawienia konstrukcji LHC i jego detektorów."
+msgid ""
+"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
+"European Organization for Nuclear Research, the world's largest particle "
+"physics laboratory.  It is the most powerful instrument ever built to "
+"investigate on particles proprieties. LHC at home runs simulations to improve "
+"the design of LHC and its detectors."
+msgstr ""
+"Wielki Zderzacz Hadronów (LHC) jest to akcelerator cząstek w CERN, "
+"Europejskiej Organizacji Badań Jądrowych, największym na świecie "
+"laboratorium cząstek elementarnych. Jest to najpotężniejsze narzędzie, jakie "
+"kiedykolwiek zbudowano w celu badania właściwości cząstek. LHC at home "
+"prowadzi symulacje w celu poprawienia konstrukcji LHC i jego detektorów."
 
 #: projects.inc:320
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
+msgid ""
+"This project uses CERN-developed virtual machine technology for full-fledged "
+"LHC event physics simulation on volunteer computers.  Requires that you "
+"install VirtualBox on your computer"
 msgstr ""
 
 #: projects.inc:326
@@ -608,8 +837,19 @@ msgid "Astrophysics, astrobiology"
 msgstr "Astrofizyka, astrobiologia"
 
 #: projects.inc:328
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
-msgstr "SETI (poszukiwania inteligencji pozaziemskiej) jest zbiorem projektów naukowych, których celem jest wykrycie inteligentnego życia poza Ziemią. Jeden z nich, znany jako radio SETI, wykorzystuje radioteleskopy do nasłuchiwania wąskich pasm sygnałów radiowych z kosmosu. Takie sygnały nie występują naturalnie, tak więc wykrycie ich dostarczy dowodu istnienia pozaziemskich technologii."
+msgid ""
+"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
+"goal is to detect intelligent life outside Earth. One approach, known as "
+"radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
+"signals from space. Such signals are not known to occur naturally, so a "
+"detection would provide evidence of extraterrestrial technology."
+msgstr ""
+"SETI (poszukiwania inteligencji pozaziemskiej) jest zbiorem projektów "
+"naukowych, których celem jest wykrycie inteligentnego życia poza Ziemią. "
+"Jeden z nich, znany jako radio SETI, wykorzystuje radioteleskopy do "
+"nasłuchiwania wąskich pasm sygnałów radiowych z kosmosu. Takie sygnały nie "
+"występują naturalnie, tak więc wykrycie ich dostarczy dowodu istnienia "
+"pozaziemskich technologii."
 
 #: projects.inc:342
 msgid "Bielefeld University of Applied Sciences"
@@ -620,7 +860,11 @@ msgid "Chemical engineering and nanotechnology"
 msgstr "Inżynieria chemiczna i nanotechnologia"
 
 #: projects.inc:344
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
+msgid ""
+"The study of molecular magnets and controlled nanoscale magnetism.  These "
+"magnetic molecules may be used to develop tiny magnetic switches, with "
+"applications in medicine (such as local tumor chemotherapy) and "
+"biotechnology."
 msgstr ""
 
 #: projects.inc:351
@@ -636,19 +880,28 @@ msgid "Physics, biochemistry, and others"
 msgstr "Fizyka, biochemia i inne"
 
 #: projects.inc:358
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
-msgstr "Celem CAS at home jest zachęcanie i wspieranie naukowców w Chinach do stosowania technologii obliczeń komputerowych i ochotników naukowych w swoich badaniach."
+msgid ""
+"The objective of CAS at home is to encourage and assist scientists in China to "
+"adopt the technologies of volunteer computing and volunteer thinking for "
+"their research."
+msgstr ""
+"Celem CAS at home jest zachęcanie i wspieranie naukowców w Chinach do "
+"stosowania technologii obliczeń komputerowych i ochotników naukowych w "
+"swoich badaniach."
 
 #: projects.inc:365
 msgid "Mathematics, physics, evolution"
 msgstr "Matematyka, fizyka, ewolucja"
 
 #: projects.inc:366
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
-msgstr "Yoyo at home jest łącznikiem między BOINC i kilkoma istniejącymi projektami komputerowymi wolontariuszy: ECM, Muon, Evolution at home, and distributed.net"
+msgid ""
+"Yoyo at home is an adapter between BOINC and several existing volunteer "
+"computing projects: ECM, Muon, Evolution at home, and distributed.net"
+msgstr ""
+"Yoyo at home jest łącznikiem między BOINC i kilkoma istniejącymi projektami "
+"komputerowymi wolontariuszy: ECM, Muon, Evolution at home, and distributed.net"
 
-#: projects.inc:371
-#: projects.inc:527
+#: projects.inc:371 projects.inc:527
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 msgstr "MTA-SZTAKI Laboratorium Równoległych i Rozproszonych Systemów (Węgry)"
 
@@ -657,7 +910,11 @@ msgid "European research projects"
 msgstr "Europejskie projekty badawcze"
 
 #: projects.inc:373
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
+msgid ""
+"The EDGeS at Home Beta project integrates volunteer computing into the service "
+"grid network of Europe by allowing service grids to send workunits to be "
+"processed by the volunteers of this project. The scientific projects covered "
+"by the project include math, physics, biology, etc."
 msgstr ""
 
 #: projects.inc:379
@@ -681,7 +938,11 @@ msgid "Medical, environmental and other humanitarian research"
 msgstr ""
 
 #: projects.inc:389
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
+msgid ""
+"To further critical non-profit research on some of humanity's most pressing "
+"problems by creating the world's largest volunteer computing grid.  Research "
+"includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"clean water and many more."
 msgstr ""
 
 #: projects.inc:395
@@ -700,21 +961,21 @@ msgstr ""
 msgid "Simulation of quantum computing; Goldbach's conjecture."
 msgstr ""
 
-#: projects.inc:450
-#: projects.inc:458
+#: projects.inc:450 projects.inc:458
 msgid "Cryptography"
 msgstr "Kryptografia"
 
 #: projects.inc:459
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
-msgstr "Próba rozkodowania trzech oryginalnych wiadomości Enigmy. Ich sygnały zostały przechwycone w na północnym Atlantyku w 1942 roku i nie zostały jeszcze złamane."
-
-#: projects.inc:465
-#: projects.inc:504
-#: projects.inc:512
-#: projects.inc:520
-#: projects.inc:528
-#: projects.inc:568
+msgid ""
+"Attempt to decode 3 original Enigma messages. The signals were intercepted "
+"in the North Atlantic in 1942 and are believed to be unbroken."
+msgstr ""
+"Próba rozkodowania trzech oryginalnych wiadomości Enigmy. Ich sygnały "
+"zostały przechwycone w na północnym Atlantyku w 1942 roku i nie zostały "
+"jeszcze złamane."
+
+#: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
+#: projects.inc:528 projects.inc:568
 msgid "Mathematics"
 msgstr "Matematyka"
 
@@ -731,19 +992,39 @@ msgid "Factorization of large integers"
 msgstr "Rozkład na czynniki dużych liczb całkowitych"
 
 #: projects.inc:473
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
-msgstr "NFS at Home to projekt badawczy który wykorzystuje komputery podłączone do Internetu do rozkładania dużych liczb przez sito ciała liczbowego - Number Field Sieve. Po raz pierwszy rozbijania liczb na czynniki pierwsze, jak na przykład 15 = 3 * 5 lub 35 = 5 * 7, doświadczyłeś jako początkujący uczeń. NFS at Home to kontynuacja tego doświadczenia przeprowadzana na liczbach składających się z setek cyfr."
+msgid ""
+"NFS at Home is a research project that uses Internet-connected computers to do "
+"the lattice sieving step in the Number Field Sieve factorization of large "
+"integers. As a young school student, you gained your first experience at "
+"breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
+"NFS at Home is a continuation of that experience, only with integers that are "
+"hundreds of digits long."
+msgstr ""
+"NFS at Home to projekt badawczy który wykorzystuje komputery podłączone do "
+"Internetu do rozkładania dużych liczb przez sito ciała liczbowego - Number "
+"Field Sieve. Po raz pierwszy rozbijania liczb na czynniki pierwsze, jak na "
+"przykład 15 = 3 * 5 lub 35 = 5 * 7, doświadczyłeś jako początkujący uczeń. "
+"NFS at Home to kontynuacja tego doświadczenia przeprowadzana na liczbach "
+"składających się z setek cyfr."
 
 #: projects.inc:479
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
-msgstr "Wileński Uniwersytet Techniczny im. Giedymina i Uniwersytet Techniczny w Kownie (Litwa)"
+msgid ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
+msgstr ""
+"Wileński Uniwersytet Techniczny im. Giedymina i Uniwersytet Techniczny w "
+"Kownie (Litwa)"
 
 #: projects.inc:480
 msgid "Software testing"
 msgstr "Testowanie oprogramowania"
 
 #: projects.inc:481
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
+msgid ""
+"The aim of this project is to provide a powerful distributed computing "
+"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
+"well as others Lithuanian academic institutions.  Current applications "
+"involve the study of Monte-Carlo based software testing."
 msgstr ""
 
 #: projects.inc:503
@@ -751,11 +1032,20 @@ msgid "Mathematical Institute of Leiden University / Kennislink"
 msgstr "Instytut Matematyki Uniwersytetu w Lejdzie / Kennislink"
 
 #: projects.inc:505
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
+msgid ""
+"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
+"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
+"product of the distinct prime factors of n. The ABC conjecture says that "
+"there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for "
+"any real h > 1. The ABC conjecture is currently one of the greatest open "
+"problems in mathematics. If it is proven to be true, a lot of other open "
+"problems can be answered directly from it."
 msgstr ""
 
 #: projects.inc:513
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
+msgid ""
+"Primegrid has multiple projects searching for different forms of very large "
+"prime numbers, including searching for the largest known prime number."
 msgstr ""
 
 #: projects.inc:519
@@ -763,11 +1053,17 @@ msgid "Hochschule RheinMain University of Applied Sciences"
 msgstr "Hochschule RheinMain University of Applied Sciences"
 
 #: projects.inc:521
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
-msgstr "Szukanie kontrprzykładów do dwóch hipotez dotyczących identyfikacji liczb pierwszych"
+msgid ""
+"Search for counterexamples to two conjectures related to the identification "
+"of prime numbers"
+msgstr ""
+"Szukanie kontrprzykładów do dwóch hipotez dotyczących identyfikacji liczb "
+"pierwszych"
 
 #: projects.inc:529
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
+msgid ""
+"Find all the generalized binary number systems (in which bases are matrices "
+"and digits are vectors) up to dimension 11."
 msgstr ""
 
 #: ../html/inc/news.inc:40
@@ -787,6 +1083,7 @@ msgstr ""
 #, php-format
 #~ msgid "%s for %s (%s MB)"
 #~ msgstr "%s dla %s (%s MB)"
+
 #~ msgid ""
 #~ "BOINC is a program that lets you donate your idle computer time to science "
 #~ "projects like SETI at home, Climateprediction.net, Rosetta at home, World "
@@ -798,6 +1095,7 @@ msgstr ""
 #~ "Climateprediction.net, Rosetta at home, World Community Grid i wielu innych. "
 #~ "<p> Po zainstalowaniu BOINC na twoim komputerze możesz przyłączyć się do "
 #~ "dowolnie wybranych przez Ciebie projektów."
+
 #~ msgid "Browser default"
 #~ msgstr "Domyślny przeglądarki"
 
@@ -814,10 +1112,13 @@ msgstr ""
 #~ "wspomagać wiele innych rodzajów badań naukowych. Jest to bezpieczne i "
 #~ "proste: %sWybierz%s projekty, %sŚciągnij%s i uruchom oprogramowanie BOINC, %"
 #~ "sWprowadź%s adres e-mail i hasło. "
+
 #~ msgid "IBM Corporate Community Relations"
 #~ msgstr "IBM Corporate Community Relations"
+
 #~ msgid "Humanitarian research on disease, natural disasters and hunger."
 #~ msgstr "Badania nad chorobami, klęskami żywiołowymi i głodem."
+
 #~ msgid ""
 #~ "Primegrid is generating a public sequential prime number database, and is "
 #~ "searching for large twin primes of the form k*2<sup>n</sup>+1 and "
@@ -826,66 +1127,94 @@ msgstr ""
 #~ "Primegrid generuje publiczną bazę danych kolejnych liczb pierwszych i "
 #~ "szuka dużych liczb bliźniaczych liczb pierwszych w postaci k*2<sup>n</sup>"
 #~ "+1 and k*2<sup>n</sup>-1"
+
 #~ msgid "FreeHAL"
 #~ msgstr "FreeHAL"
+
 #~ msgid "private"
 #~ msgstr "prywatny"
+
 #~ msgid "POEM at HOME"
 #~ msgstr "POEM at HOME"
+
 #~ msgid "Docking at Home"
 #~ msgstr "Docking at Home"
+
 #~ msgid "GPUGrid.net"
 #~ msgstr "GPUGrid.net"
+
 #~ msgid "Superlink at Technion"
 #~ msgstr "Superlink at Technion"
+
 #~ msgid "The Lattice Project"
 #~ msgstr "Projekt Lattice"
+
 #~ msgid "Malariacontrol.net"
 #~ msgstr "Malariacontrol.net"
+
 #~ msgid "Rosetta at home"
 #~ msgstr "Rosetta at home"
+
 #~ msgid "SIMAP"
 #~ msgstr "SIMAP"
+
 #~ msgid "Virtual Prairie"
 #~ msgstr "Wirtualna preria"
+
 #~ msgid "University of Houston"
 #~ msgstr "Uniwersytet Houston"
+
 #~ msgid "Study of botanical ecosystems"
 #~ msgstr "Badania ekosystemów botanicznych"
+
 #~ msgid ""
 #~ "Provide ecological guidelines on the design of prairies with the best "
 #~ "potential for water purification."
 #~ msgstr ""
 #~ "Opracowanie ekologicznych wytycznych dotyczących projektowania łąk z "
 #~ "największym potencjałem do oczyszczania wody."
+
 #~ msgid "Climateprediction.net"
 #~ msgstr "Climateprediction.net"
+
 #~ msgid "Astronomy/Physics/Chemistry"
 #~ msgstr "Astronomia/Fizyka/Chemia"
+
 #~ msgid "eOn"
 #~ msgstr "eOn"
+
 #~ msgid "Orbit at home"
 #~ msgstr "Orbit at home"
+
 #~ msgid "Planetary Science Institute"
 #~ msgstr "Planetary Science Institute"
+
 #~ msgid "Monitor and study the hazard posed by near-Earth asteroids"
 #~ msgstr ""
 #~ "Monitorowanie i badanie zagrożeń, jakie stwarzają asteroidy w pobliżu "
 #~ "Ziemi"
+
 #~ msgid "Cosmology at Home"
 #~ msgstr "Cosmology at Home"
+
 #~ msgid "University of Illinois at Urbana-Chamapign"
 #~ msgstr "Uniwersytet Illinois w Urbana-Champaign"
+
 #~ msgid "Milkyway at home"
 #~ msgstr "Milkyway at home"
+
 #~ msgid "Leiden Classical"
 #~ msgstr "Leiden Classical"
+
 #~ msgid "uFluids at home"
 #~ msgstr "uFluids at home"
+
 #~ msgid "Purdue University"
 #~ msgstr "Purdue University"
+
 #~ msgid "Physics/Aeronautics"
 #~ msgstr "Fizyka/Astronautyka"
+
 #~ msgid ""
 #~ "The uFluids project simulates two-phase fluid behavior in microgravity "
 #~ "and microfluidics problems. Our goal is to design better satellite "
@@ -897,72 +1226,413 @@ msgstr ""
 #~ "zaprojektowanie lepszych urządzeń zarządzających materiałem pędnym dla "
 #~ "silników rakietowych oraz kierowanie przepływem dwufazowym w układach "
 #~ "mikrokanalikowych i w urządzeniach MEMS."
+
 #~ msgid "Einstein at home"
 #~ msgstr "Einstein at home"
+
 #~ msgid "LHC at home"
 #~ msgstr "LHC at home"
+
 #~ msgid "SETI at home"
 #~ msgstr "SETI at home"
+
 #~ msgid "Quantum Monte Carlo at Home"
 #~ msgstr "Quantum Monte Carlo at Home"
+
 #~ msgid "University of Muenster (Germany)"
 #~ msgstr "Uniwersytet w Münsterze (Niemcy)"
+
 #~ msgid ""
 #~ "Study the structure and reactivity of molecules using Quantum Chemistry."
 #~ msgstr ""
 #~ "Badanie struktury i reaktywności cząsteczek za pomocą chemii kwantowej."
+
 #~ msgid "Spinhenge at home"
 #~ msgstr "Spinhenge at home"
+
 #~ msgid "CAS at home"
 #~ msgstr "CAS at home"
+
 #~ msgid "Yoyo at home"
 #~ msgstr "Yoyo at home"
+
 #~ msgid "EDGeS at Home"
 #~ msgstr "EDGeS at Home"
+
 #~ msgid "Ibercivis"
 #~ msgstr "Ibercivis"
+
 #~ msgid "World Community Grid"
 #~ msgstr "World Community Grid"
+
 #~ msgid "Enigma at Home"
 #~ msgstr "Enigma at Home"
+
 #~ msgid "Collatz Conjecture"
 #~ msgstr "Collatz Conjecture"
+
 #~ msgid "NFS at home"
 #~ msgstr "NFS at home"
+
 #~ msgid "VTU at home"
 #~ msgstr "VTU at home"
+
 #~ msgid "AQUA at home"
 #~ msgstr "AQUA at home"
+
 #~ msgid "D-Wave Systems, Inc."
 #~ msgstr "D-Wave Systems, Inc."
+
 #~ msgid "Quantum computing"
 #~ msgstr "Obliczenia kwantowe"
+
 #~ msgid "ABC at home"
 #~ msgstr "ABC at home"
+
 #~ msgid "PrimeGrid"
 #~ msgstr "PrimeGrid"
+
 #~ msgid "primaboinca"
 #~ msgstr "primaboinca"
+
 #~ msgid "SZTAKI Desktop Grid"
 #~ msgstr "SZTAKI Desktop Grid"
+
 #~ msgid "Chess960 at home"
 #~ msgstr "Chess960 at home"
+
 #~ msgid "Chess-960.org"
 #~ msgstr "Chess-960.org"
+
 #~ msgid "The current release is known to work with these Linux versions:"
 #~ msgstr "Aktualne wydanie współpracuje z następującymi wersjami Linuksa:"
+
 #~ msgid ""
 #~ "For other Linux versions, check if a BOINC package is offered by your "
 #~ "Linux distribution."
 #~ msgstr ""
 #~ "W przypadku pozostałych wersji Linuksa sprawdź czy BOINC nie jest "
 #~ "dostarczany repozytorium pakietów twojej dystrybucji."
+
 #~ msgid ""
 #~ "Note: if your computer is equipped with an Graphics Processing Unit "
 #~ "(GPU), you may be able to %suse it to compute faster%s"
 #~ msgstr ""
 #~ "Uwaga: Jeżeli Twój komputer jest wyposażony w kartę graficzną (GPU), "
 #~ "możesz jej użyć aby %sliczyć wydajniej%s."
+
 #~ msgid "TeraFLOPS."
 #~ msgstr "TeraFLOPS."
 
+# The charset used for the text in this file (please try to use UTF-8 if possible)
+#~ msgid "CHARSET"
+#~ msgstr "UTF-8"
+
+#~ msgid "POLL_INTRO"
+#~ msgstr ""
+#~ "Several volunteer computing projects, including Climateprediction.net, "
+#~ "Einstein at home, and SETI at home, use software called BOINC. If you "
+#~ "participate in projects like this, we request that you answer the "
+#~ "following questions. This will help BOINC-based projects increase "
+#~ "participation and achieve greater scientific results. <p> Please answer "
+#~ "as many questions as you want, then go to the bottom and click OK. If you "
+#~ "previously completed the survey but your answers have changed, please "
+#~ "complete it again - your new answers will replace the old ones. <p> The "
+#~ "current results of the survey are <a href=poll_results.php>here</a>. "
+
+#~ msgid "POLL_RUN"
+#~ msgstr "Do you run BOINC?"
+
+#~ msgid "POLL_PARTICIPATION"
+#~ msgstr "Your participation"
+
+#~ msgid "POLL_COMPUTERS"
+#~ msgstr "Your computers"
+
+#~ msgid "POLL_YOU"
+#~ msgstr "You"
+
+#~ msgid "POLL_NATIONALITY"
+#~ msgstr "Nationality"
+
+#~ msgid "POLL_COMMENTS"
+#~ msgstr "Comments"
+
+#~ msgid "POLL_COMMENTS_QUESTION"
+#~ msgstr ""
+#~ "Please suggest ways that BOINC, and the projects that use it, could be "
+#~ "improved:"
+
+#~ msgid "POLL_OTHER"
+#~ msgstr "Other:"
+
+#~ msgid "POLL_CHECK_ALL"
+#~ msgstr "[check all that apply]"
+
+#~ msgid "POLL_DONE"
+#~ msgstr "When done click:"
+
+#~ msgid "POLL_CURRENT"
+#~ msgstr "Yes - I have been running BOINC on my computer for..."
+
+#~ msgid "POLL_TWEEK"
+#~ msgstr "less than a week"
+
+#~ msgid "POLL_TMONTH"
+#~ msgstr "less than a month"
+
+#~ msgid "POLL_TYEAR"
+#~ msgstr "less than a year"
+
+#~ msgid "POLL_TMOREYEAR"
+#~ msgstr "more than a year"
+
+#~ msgid "POLL_LAPSED"
+#~ msgstr "No - I was running BOINC, but stopped because..."
+
+#~ msgid "POLL_LINTEREST"
+#~ msgstr "I lost interest"
+
+#~ msgid "POLL_LCOMPLICATED"
+#~ msgstr "it was too complicated"
+
+#~ msgid "POLL_LSTOPPED"
+#~ msgstr "I stopped it and forgot to start again"
+
+#~ msgid "POLL_LPROBLEMS"
+#~ msgstr "it caused problems on my computer"
+
+#~ msgid "POLL_LPOWER"
+#~ msgstr "it used too much electricity"
+
+#~ msgid "POLL_LNONBOINC"
+#~ msgstr "I switched to a non-BOINC computing project"
+
+#~ msgid "POLL_FAILED"
+#~ msgstr "No - I tried running BOINC, but..."
+
+#~ msgid "POLL_FINSTALL"
+#~ msgstr "the software didn't install correctly"
+
+#~ msgid "POLL_FFIGURE"
+#~ msgstr "I couldn't figure out how to use the software"
+
+#~ msgid "POLL_FNETWORK"
+#~ msgstr "I had network communication problems"
+
+#~ msgid "POLL_FATTACH"
+#~ msgstr "I couldn't attach to a project"
+
+#~ msgid "POLL_FWORK"
+#~ msgstr "I attached to a project, but never got any work"
+
+#~ msgid "POLL_NEVER"
+#~ msgstr "No - I never tried running BOINC, because..."
+
+#~ msgid "POLL_NSECURITY"
+#~ msgstr "I was concerned about security"
+
+#~ msgid "POLL_NPROJECT"
+#~ msgstr "I wasn't interested in any of the projects"
+
+#~ msgid "POLL_NPERMISSION"
+#~ msgstr "I don't have permission to run it on my computer"
+
+#~ msgid "POLL_NVERSION"
+#~ msgstr "No version was available for my computer"
+
+#~ msgid "POLL_KIND"
+#~ msgstr "What kind of computers do you have running BOINC?"
+
+#~ msgid "POLL_WHERE"
+#~ msgstr "Where are they?"
+
+#~ msgid "POLL_WORK"
+#~ msgstr "Work"
+
+#~ msgid "POLL_SCHOOL"
+#~ msgstr "School"
+
+#~ msgid "POLL_HOW_MANY"
+#~ msgstr "How many computers?"
+
+#~ msgid "POLL_TURNED_ON"
+#~ msgstr "On average, how many hours per day are they powered on?"
+
+#~ msgid "POLL_AGE"
+#~ msgstr "Age"
+
+#~ msgid "POLL_SEX"
+#~ msgstr "Sex"
+
+#~ msgid "POLL_MALE"
+#~ msgstr "Male"
+
+#~ msgid "POLL_FEMALE"
+#~ msgstr "Female"
+
+#~ msgid "POLL_EXPERTISE"
+#~ msgstr "Your level of computer expertise"
+
+#~ msgid "POLL_LEVB"
+#~ msgstr "Beginner"
+
+#~ msgid "POLL_LEVI"
+#~ msgstr "Intermediate"
+
+#~ msgid "POLL_LEVA"
+#~ msgstr "Advanced"
+
+#~ msgid "POLL_LEARN_WHERE"
+#~ msgstr "Where did you learn about BOINC projects?"
+
+#~ msgid "POLL_WTV"
+#~ msgstr "TV/radio/newspaper"
+
+#~ msgid "POLL_WPERS"
+#~ msgstr "From friends, relatives, or coworkers"
+
+#~ msgid "POLL_WTEAM"
+#~ msgstr "Team message boards or web sites"
+
+#~ msgid "POLL_WBOINC"
+#~ msgstr "The BOINC web site"
+
+#~ msgid "POLL_WWEB"
+#~ msgstr "Other web sites"
+
+#~ msgid "POLL_FACTOR"
+#~ msgstr ""
+#~ "Which are the most important factors when you decide whether to "
+#~ "participate in a BOINC project?"
+
+#~ msgid "POLL_GRAPHICS"
+#~ msgstr "Nice-looking screensaver graphics"
+
+#~ msgid "POLL_CREDIT_FAIR"
+#~ msgstr "Fair and quick granting of credit for work done"
+
+#~ msgid "POLL_CREDIT_MORE"
+#~ msgstr "Getting more credit from this project than from others"
+
+#~ msgid "POLL_MB_FRIENDLY"
+#~ msgstr "Helpful and friendly message boards"
+
+#~ msgid "POLL_MB_STAFF"
+#~ msgstr "Participation by project staff on the message boards"
+
+#~ msgid "POLL_WEB_SITE"
+#~ msgstr "Informative project web site"
+
+#~ msgid "POLL_SCIENCE_IMPORTANT"
+#~ msgstr "The science is important and beneficial"
+
+#~ msgid "POLL_SCIENCE_PUBLIC"
+#~ msgstr "Non-profit, and results are public"
+
+#~ msgid "POLL_RECOGNIZE"
+#~ msgstr "Personal recognition if my computer finds something"
+
+#~ msgid "POLL_PUBLISH"
+#~ msgstr "Publication by the project in scientific journals"
+
+#~ msgid "POLL_EMAIL"
+#~ msgstr "Periodic email newsletters from the project"
+
+#~ msgid "POLL_NPROJECTS"
+#~ msgstr "How many BOINC projects do you participate in?"
+
+#~ msgid "POLL_SSAVER"
+#~ msgstr "Do you run BOINC as a screensaver?"
+
+#~ msgid "POLL_YES"
+#~ msgstr "Yes"
+
+#~ msgid "POLL_NO"
+#~ msgstr "No"
+
+#~ msgid "POLL_MBOARDS"
+#~ msgstr "Your usage of project messages boards:"
+
+#~ msgid "POLL_MBR"
+#~ msgstr "to read information"
+
+#~ msgid "POLL_MBRW"
+#~ msgstr "to read and post information"
+
+#~ msgid "POLL_NONE"
+#~ msgstr "None"
+
+#~ msgid "POLL_HELP"
+#~ msgstr ""
+#~ "Where do you get information to help resolve problems with BOINC and/or "
+#~ "BOINC projects?"
+
+#~ msgid "POLL_HELP_PMB"
+#~ msgstr "The project message boards"
+
+#~ msgid "POLL_HELP_BMB"
+#~ msgstr "The BOINC message boards"
+
+#~ msgid "POLL_HELP_BDOC"
+#~ msgstr "The BOINC web site"
+
+#~ msgid "POLL_HELP_BMLIST"
+#~ msgstr "BOINC mailing lists"
+
+#~ msgid "POLL_HELP_WIKI"
+#~ msgstr "The Unofficial BOINC Wiki"
+
+#~ msgid "POLL_HELP_TEAM"
+#~ msgstr "Team web sites"
+
+#~ msgid "POLL_HELP_GOOGLE"
+#~ msgstr "Google or other search engines"
+
+#~ msgid "POLL_ERROR_TITLE"
+#~ msgstr "Error - results not recorded"
+
+#~ msgid "POLL_ERROR_TEXT"
+#~ msgstr ""
+#~ "An internal error has prevented us from recording your survey response.  "
+#~ "Please try again later."
+
+#~ msgid "POLL_RECORDED"
+#~ msgstr "Survey response recorded"
+
+#~ msgid "POLL_THANKS"
+#~ msgstr "Thank you for completing the BOINC user survey."
+
+#~ msgid "POLL_RESULTS_TITLE"
+#~ msgstr "Survey results"
+
+#~ msgid "POLL_RESULTS_TEXT"
+#~ msgstr ""
+#~ "These are the current results of the <a href=poll.php>BOINC user survey</"
+#~ "a>.  This page is updated every hour."
+
+#~ msgid "Other systems"
+#~ msgstr "Inne systemy"
+
+#~ msgid "If your computer is not of one of the above types, you can"
+#~ msgstr ""
+#~ "Jeżeli twój komputer korzysta z innego systemu operacyjnego lub jest "
+#~ "innego typy możesz"
+
+#~ msgid "%s make your own client software %s or"
+#~ msgstr "%s stworzyć własny program obsługujący platformę BOINC %s lub"
+
+#~ msgid ""
+#~ "%s download executables from a third-party site %s (available for Solaris/"
+#~ "Opteron, Linux/Opteron, Linux/PPC, HP-UX, and FreeBSD, and others)."
+#~ msgstr ""
+#~ "%s pobrać gotowe programy stworzone przez innych użytkowników %s "
+#~ "(dostępne dla platform Solaris/Opteron, Linux/Opteron, Linux/PPC, HP-UX, "
+#~ "i FreeBSD oraz innych)."
+
+#~ msgid "HOME_BOINC"
+#~ msgstr "Berkeley Open Infrastructure for Network Computing"
+
+#~ msgid "HOME_BOINC_DESC"
+#~ msgstr ""
+#~ "Open-source software for %svolunteer computing%s and %sgrid computing%s"
diff --git a/locale/pt_BR/BOINC-Client.mo b/locale/pt_BR/BOINC-Client.mo
index feaec12..06c6a5a 100644
Binary files a/locale/pt_BR/BOINC-Client.mo and b/locale/pt_BR/BOINC-Client.mo differ
diff --git a/locale/pt_BR/BOINC-Client.po b/locale/pt_BR/BOINC-Client.po
index f0a754c..d0fc273 100755
--- a/locale/pt_BR/BOINC-Client.po
+++ b/locale/pt_BR/BOINC-Client.po
@@ -4,20 +4,20 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-10-15 22:25-0700\n"
-"PO-Revision-Date: 2015-02-12 00:32-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: 2012-12-10 19:50+0200\n"
+"Last-Translator: Anonymous Pootle User\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Pootle 2.1.6\n"
 
-#: acct_mgr.cpp:450
-#: acct_mgr.cpp:459
+#: acct_mgr.cpp:450 acct_mgr.cpp:459
 #, fuzzy
 msgid "Message from account manager"
 msgstr "Mensagem do servidor de projetos:"
@@ -28,7 +28,9 @@ msgid "Message from server"
 msgstr "Mensagem do servidor de projetos:"
 
 #: client_state.cpp:258
-msgid "Some tasks need more memory than allowed by your preferences.  Please check the preferences."
+msgid ""
+"Some tasks need more memory than allowed by your preferences.  Please check "
+"the preferences."
 msgstr ""
 
 #: client_state.cpp:520
@@ -42,11 +44,12 @@ msgstr "A variável de ambiente HTTP_PROXY deve especificar um 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"
+msgid ""
+"You used the wrong URL for this project.  When convenient, remove this "
+"project, then add %s"
 msgstr ""
 
-#: cs_statefile.cpp:828
-#: ../sched/sched_types.cpp:259
+#: cs_statefile.cpp:828 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
 msgstr "Erro de sintaxe em app_info.xml"
 
@@ -58,18 +61,15 @@ msgstr ""
 msgid "A new version of BOINC is available."
 msgstr "Uma nova versão do BOINC está disponível."
 
-#: current_version.cpp:94
-#: current_version.cpp:102
+#: current_version.cpp:94 current_version.cpp:102
 msgid "Download"
 msgstr ""
 
-#: log_flags.cpp:269
-#: log_flags.cpp:449
+#: log_flags.cpp:269 log_flags.cpp:449
 msgid "Unexpected text in cc_config.xml"
 msgstr "Texto inesperado em cc_config.xml"
 
-#: log_flags.cpp:423
-#: log_flags.cpp:475
+#: log_flags.cpp:423 log_flags.cpp:475
 msgid "Unrecognized tag in cc_config.xml"
 msgstr "Rótulo não reconhecido em cc_config.xml"
 
@@ -89,15 +89,21 @@ msgstr "Rótulo final inexistente em cc_config.xml"
 #: ../sched/handle_request.cpp:307
 #, fuzzy
 msgid "Invalid or missing account key.  To fix, remove and add this project."
-msgstr "Chave de conta inválida ou inexistente. Para corrigir, desligue-se do projeto e vincule-se novamente."
+msgstr ""
+"Chave de conta inválida ou inexistente. Para corrigir, desligue-se do "
+"projeto e vincule-se novamente."
 
 #: ../sched/handle_request.cpp:849
 #, fuzzy
 msgid "Invalid code signing key.  To fix, remove and add this project."
-msgstr "Código de chave de acesso inválido. Para corrigir, desligue-se do projeto e vincule-se novamente."
+msgstr ""
+"Código de chave de acesso inválido. Para corrigir, desligue-se do projeto e "
+"vincule-se novamente."
 
 #: ../sched/handle_request.cpp:859
-msgid "The project has changed its security key.  Please remove and add this project."
+msgid ""
+"The project has changed its security key.  Please remove and add this "
+"project."
 msgstr ""
 
 # Wouldn't be "This project doesn't support this operating system" or "This project doesn't support current operating system" ?. I wrote the translation for the phrase just given, but I guess it doesn't make much sense.
@@ -111,8 +117,11 @@ msgid "This project doesn't support CPU type"
 msgstr "Este projeto não suporta o tipo de CPU"
 
 #: ../sched/handle_request.cpp:993
-msgid "Your BOINC client software is too old.  Please install the current version."
-msgstr "Seu software cliente BOINC é muito antigo. Por favor, instale a versão atual."
+msgid ""
+"Your BOINC client software is too old.  Please install the current version."
+msgstr ""
+"Seu software cliente BOINC é muito antigo. Por favor, instale a versão "
+"atual."
 
 #: ../sched/handle_request.cpp:1259
 msgid "This project doesn't support computers of type"
@@ -121,26 +130,38 @@ msgstr "Este projeto não suporta computadores do tipo"
 # "driver" is a known and very used word among computer users on Brazil. There is no translation for it.
 #: ../sched/sched_send.cpp:1092
 msgid "Upgrade to the latest driver to process tasks using your computer's GPU"
-msgstr "Atualize para o driver mais recente para processar tarefas utilizando o GPU de seu computador"
+msgstr ""
+"Atualize para o driver mais recente para processar tarefas utilizando o GPU "
+"de seu computador"
 
 #: ../sched/sched_send.cpp:1099
-msgid "Upgrade to the latest driver to use all of this project's GPU applications"
-msgstr "Atualize para o driver mais recente para utilizar todos os aplicativos deste projeto para GPU"
+msgid ""
+"Upgrade to the latest driver to use all of this project's GPU applications"
+msgstr ""
+"Atualize para o driver mais recente para utilizar todos os aplicativos deste "
+"projeto para GPU"
 
 #: ../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 "É necessário uma versão mais recente do BOINC para utilizar seu GPU NVIDIA; por favor, atualize para a versão atual."
+msgid ""
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to "
+"the current version"
+msgstr ""
+"É necessário uma versão mais recente do BOINC para utilizar seu GPU NVIDIA; "
+"por favor, atualize para a versão atual."
 
 # 94%
 #: ../sched/sched_send.cpp:1146
 #, c-format
+#, c-format, fuzzy
 msgid "An %s GPU is required to run tasks for this project"
-msgstr ""
+msgstr "É necessário GPU ATI para executar tarefas deste projeto"
 
 #: ../sched/sched_send.cpp:1262
 #, fuzzy
 msgid "No tasks are available for the applications you have selected."
-msgstr "Não há trabalho disponível para as aplicações selecionadas. Por favor, verifique suas preferências na página do projeto na internet."
+msgstr ""
+"Não há trabalho disponível para as aplicações selecionadas. Por favor, "
+"verifique suas preferências na página do projeto na internet."
 
 #: ../sched/sched_send.cpp:1288
 msgid "Your computer type is not supported by this project"
@@ -148,11 +169,14 @@ msgstr "Seu computador não é suportado por este projeto"
 
 #: ../sched/sched_send.cpp:1294
 msgid "Newer BOINC version required; please install current version"
-msgstr "É necessário uma versão mais recente do BOINC; por favor, instale a versão atual"
+msgstr ""
+"É necessário uma versão mais recente do BOINC; por favor, instale a versão "
+"atual"
 
 #: ../sched/sched_send.cpp:1305
 #, c-format
-msgid "Tasks for %s are available, but your preferences are set to not accept them"
+msgid ""
+"Tasks for %s are available, but your preferences are set to not accept them"
 msgstr ""
 
 # I did not abbreviate "application" word in portuguese.
@@ -166,41 +190,49 @@ msgstr "Seu arquivo app_info.xml não tem uma versão utilizável de"
 
 #~ msgid "Download it."
 #~ msgstr "Baixe-o."
+
 #~ msgid "An NVIDIA or ATI GPU is required to run tasks for this project"
 #~ msgstr "É necessário GPU NVIDIA ou ATI para executar tarefas deste projeto"
+
 #~ msgid "An NVIDIA GPU is required to run tasks for this project"
 #~ msgstr "É necessário GPU NVIDIA para executar tarefas deste projeto"
+
 #~ msgid "An ATI GPU is required to run tasks for this project"
 #~ msgstr "É necessário GPU ATI para executar tarefas deste projeto"
+
 #~ msgid ""
 #~ "Tasks for NVIDIA GPU are available, but your preferences are set to not "
 #~ "accept them"
 #~ msgstr ""
 #~ "Estão disponíveis tarefas para GPU NVIDIA, mas suas preferências estão "
 #~ "configuradas para não aceitá-las"
+
 #~ msgid ""
 #~ "Tasks for ATI GPU are available, but your preferences are set to not accept "
 #~ "them"
 #~ msgstr ""
 #~ "Estão disponíveis tarefas para GPU ATI, mas suas preferências estão "
 #~ "configuradas para não aceitá-las"
+
 #~ msgid ""
 #~ "Tasks for CPU are available, but your preferences are set to not accept them"
 #~ msgstr ""
 #~ "Estão disponíveis tarefas para CPU, mas suas preferências estão configuradas "
 #~ "para não aceitá-las"
+
 #~ msgid "error"
 #~ msgstr "Erro"
+
 #~ msgid "Can't resolve hostname in remote_hosts.cfg"
 #~ msgstr "Impossível determinar nome de máquina em remote_hosts.cfg"
 
 #, fuzzy
 #~ msgid "is not available for"
 #~ msgstr "não está disponível para seu computador"
+
 #~ msgid ""
 #~ "You may have an outdated code signing key.  Try attaching and reattaching "
 #~ "this project."
 #~ msgstr ""
 #~ "Você pode estar com um código de chave de acesso desatualizado. "
 #~ "Experimente ligar-se e religar-se novamente a este projeto."
-
diff --git a/locale/pt_BR/BOINC-Manager.mo b/locale/pt_BR/BOINC-Manager.mo
index a8b270f..b9195e0 100644
Binary files a/locale/pt_BR/BOINC-Manager.mo and b/locale/pt_BR/BOINC-Manager.mo differ
diff --git a/locale/pt_BR/BOINC-Manager.po b/locale/pt_BR/BOINC-Manager.po
index bd603d1..d465ea7 100755
--- a/locale/pt_BR/BOINC-Manager.po
+++ b/locale/pt_BR/BOINC-Manager.po
@@ -4,32 +4,35 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-15 14:15-0500\n"
-"PO-Revision-Date: 2015-02-12 00:35-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"POT-Creation-Date: 2014-02-02 00:00-0800\n"
+"PO-Revision-Date: 2013-10-23 02:42+0000\n"
+"Last-Translator: paladini <fnpaladini at gmail.com>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.1.6\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc_7.4\n"
-"X-Poedit-SourceCharset: utf-8\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.5.0\n"
 "X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-SearchPath-0: clientgui\n"
 "X-Poedit-SearchPath-1: clientgui/msw\n"
 "X-Poedit-SearchPath-2: clientgui/gtk\n"
 "X-Poedit-SearchPath-3: clientgui/mac\n"
+"X-Poedit-SearchPath-0: clientgui\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\n"
+"X-POOTLE-MTIME: 1382496175.0\n"
 
 # 81%
-#: clientgui/AccountInfoPage.cpp:387
+#: AccountInfoPage.cpp:387
 #, c-format
+#, fuzzy, c-format
 msgid "Identify your account at %s"
-msgstr ""
+msgstr "Identifique sua conta"
 
-#: clientgui/AccountInfoPage.cpp:393
+#: AccountInfoPage.cpp:393
 msgid ""
 "Please enter your account information\n"
 "(to create an account, visit the project's web site)"
@@ -37,7 +40,7 @@ msgstr ""
 "Por favor, entre com suas informações de conta\n"
 "(para criar uma conta, visite a página do projeto na internet)"
 
-#: clientgui/AccountInfoPage.cpp:397
+#: AccountInfoPage.cpp:397
 #, fuzzy
 msgid ""
 "This project is not currently accepting new accounts.\n"
@@ -46,19 +49,19 @@ msgstr ""
 "Este projeto não está aceitando novas contas no momento.\n"
 "Você pode participar somente se já possuir uma conta."
 
-#: clientgui/AccountInfoPage.cpp:401
+#: AccountInfoPage.cpp:401
 msgid "Are you already running this project?"
 msgstr "Você já executa este projeto?"
 
-#: clientgui/AccountInfoPage.cpp:405
+#: AccountInfoPage.cpp:405
 msgid "&No, new user"
 msgstr "&Não, novo usuário"
 
-#: clientgui/AccountInfoPage.cpp:408
+#: AccountInfoPage.cpp:408
 msgid "&Yes, existing user"
 msgstr "&Sim, usuário existente"
 
-#: clientgui/AccountInfoPage.cpp:413
+#: AccountInfoPage.cpp:413
 #, fuzzy
 msgid ""
 "We were not able to set up your account information\n"
@@ -75,52 +78,46 @@ msgstr ""
 "abaixo para descobrir o que colocar nos campos de endereço de email\n"
 "e senha."
 
-#: clientgui/AccountInfoPage.cpp:416
+#: AccountInfoPage.cpp:416
 #, fuzzy
 msgid "Find login information"
 msgstr "Procurar informações de acesso"
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:649
+#: AccountInfoPage.cpp:436 AccountInfoPage.cpp:641
 msgid "&Password:"
 msgstr "&Senha:"
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:673
+#: AccountInfoPage.cpp:443 AccountInfoPage.cpp:665
 msgid "Choose a &password:"
 msgstr "Selecione uma &senha:"
 
-#: clientgui/AccountInfoPage.cpp:446
+#: AccountInfoPage.cpp:446
 msgid "C&onfirm password:"
 msgstr "C&onfirme a senha:"
 
-#: clientgui/AccountInfoPage.cpp:453
+#: AccountInfoPage.cpp:453
 #, c-format
 msgid "Are you already running %s?"
 msgstr "Você já executa %s?"
 
-#: clientgui/AccountInfoPage.cpp:482
+#: AccountInfoPage.cpp:482
 msgid "&Username:"
 msgstr "&Nome de usuário:"
 
-#: clientgui/AccountInfoPage.cpp:511
-msgid "&Email address or LDAP ID:"
-msgstr ""
-
-#: clientgui/AccountInfoPage.cpp:515
+#: AccountInfoPage.cpp:508
 msgid "&Email address:"
 msgstr "&Endereço de E-mail:"
 
-#: clientgui/AccountInfoPage.cpp:523
+#: AccountInfoPage.cpp:515
 #, c-format
 msgid "minimum length %d"
 msgstr "comprimento mínimo %d"
 
-#: clientgui/AccountInfoPage.cpp:530
+#: AccountInfoPage.cpp:522
 msgid "Forgot your password?"
 msgstr "Esqueceu sua senha?"
 
-#: clientgui/AccountInfoPage.cpp:537
+#: AccountInfoPage.cpp:529
 msgid ""
 "If you have not yet registered with this account manager,\n"
 "please do so before proceeding.  Click on the link below\n"
@@ -130,45 +127,47 @@ msgstr ""
 "por favor, faça isso antes de prosseguir. Clique no link abaixo\n"
 "para registrar-se ou reaver uma senha perdida."
 
-#: clientgui/AccountInfoPage.cpp:540
+#: AccountInfoPage.cpp:532
+#, fuzzy
 msgid "Account manager web site"
-msgstr ""
+msgstr "Página do gerenciador de contas na internet"
 
-#: clientgui/AccountInfoPage.cpp:582
+#: AccountInfoPage.cpp:574 WelcomePage.cpp:348
 msgid "Add project"
 msgstr "Adicionar projeto"
 
-#: clientgui/AccountInfoPage.cpp:584
+#: AccountInfoPage.cpp:576
 msgid "Update account manager"
 msgstr "Atualizar gerenciador de contas"
 
-#: clientgui/AccountInfoPage.cpp:586
+#: AccountInfoPage.cpp:578 WelcomePage.cpp:307 WelcomePage.cpp:321
 #, fuzzy
 msgid "Use account manager"
 msgstr "Adicionar gerenciador de contas"
 
-#: clientgui/AccountInfoPage.cpp:593
+#: AccountInfoPage.cpp:585
 msgid "Please enter a user name."
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:595
+#: AccountInfoPage.cpp:587
 msgid "Please enter an email address."
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:605
+#: AccountInfoPage.cpp:597
 #, c-format
 msgid "Please enter a password of at least %d characters."
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:615
-msgid "The password and confirmation password do not match. Please type them again."
+#: AccountInfoPage.cpp:607
+msgid ""
+"The password and confirmation password do not match. Please type them again."
 msgstr "A senha e sua confirmação não parelham. Por favor, digite-as novamente."
 
-#: clientgui/AccountManagerInfoPage.cpp:272
+#: AccountManagerInfoPage.cpp:272
 msgid "Choose an account manager"
 msgstr "Selecione um gerenciador de contas"
 
-#: clientgui/AccountManagerInfoPage.cpp:275
+#: AccountManagerInfoPage.cpp:275
 msgid ""
 "To choose an account manager, click its name or \n"
 "type its URL below."
@@ -176,401 +175,388 @@ msgstr ""
 "Para selecionar um gerenciador de contas, clique em seu nome ou \n"
 "digite seu URL abaixo."
 
-#: clientgui/AccountManagerInfoPage.cpp:279
+#: AccountManagerInfoPage.cpp:279
+#, fuzzy
 msgid "Account manager details:"
-msgstr ""
+msgstr "Página do gerenciador de contas na internet"
 
-#: clientgui/AccountManagerInfoPage.cpp:283
+#: AccountManagerInfoPage.cpp:283
+#, fuzzy
 msgid "Account manager &URL:"
-msgstr ""
+msgstr "Gerenciador de Contas &URL:"
 
-#: clientgui/AccountManagerInfoPage.cpp:287
+#: AccountManagerInfoPage.cpp:287
 msgid "Open web page"
 msgstr ""
 
-#: clientgui/AccountManagerInfoPage.cpp:290
+#: AccountManagerInfoPage.cpp:290
 msgid "Visit this account manager's web site"
 msgstr ""
 
-#: clientgui/AccountManagerProcessingPage.cpp:186
-#: clientgui/AccountManagerPropertiesPage.cpp:192
+#: AccountManagerProcessingPage.cpp:187 AccountManagerPropertiesPage.cpp:193
 #, c-format
 msgid "Communicating with %s."
 msgstr "Comunicando-se com %s."
 
-#: clientgui/AccountManagerProcessingPage.cpp:193
-#: clientgui/AccountManagerPropertiesPage.cpp:199
+#: AccountManagerProcessingPage.cpp:194 AccountManagerPropertiesPage.cpp:200
 msgid "Communicating with server."
 msgstr "Comunicando-se com servidor."
 
-#: clientgui/AccountManagerProcessingPage.cpp:198
-#: clientgui/AccountManagerPropertiesPage.cpp:204
+#: AccountManagerProcessingPage.cpp:199 AccountManagerPropertiesPage.cpp:205
 msgid "Please wait..."
 msgstr "Por favor, aguarde..."
 
-#: clientgui/AccountManagerProcessingPage.cpp:325
+#: AccountManagerProcessingPage.cpp:326
 msgid "An internal server error has occurred.\n"
 msgstr "Ocorreu um erro interno no servidor.\n"
 
-#: clientgui/AdvancedFrame.cpp:96
+#: AdvancedFrame.cpp:95
 msgid "Connected"
 msgstr "Conectado"
 
-#: clientgui/AdvancedFrame.cpp:104
+#: AdvancedFrame.cpp:103
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: clientgui/AdvancedFrame.cpp:318
+#: AdvancedFrame.cpp:322 sg_BoincSimpleFrame.cpp:119
 #, c-format
 msgid "Close the %s window"
 msgstr "Fechar a janela %s"
 
-#: clientgui/AdvancedFrame.cpp:321
+#: AdvancedFrame.cpp:325 sg_BoincSimpleFrame.cpp:122
 msgid "&Close Window"
 msgstr "&Fechar Janela"
 
-#: clientgui/AdvancedFrame.cpp:332
-#: clientgui/AdvancedFrame.cpp:339
-#: clientgui/AdvancedFrame.cpp:346
+#: AdvancedFrame.cpp:336 AdvancedFrame.cpp:343 AdvancedFrame.cpp:350
 #, c-format
 msgid "Exit %s"
 msgstr "Sair %s"
 
-#: clientgui/AdvancedFrame.cpp:359
-msgid "Preferences..."
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:368
+#: AdvancedFrame.cpp:371
 msgid "&Notices\tCtrl+Shift+N"
 msgstr "&Avisos\t Ctrl+Shift+N"
 
-#: clientgui/AdvancedFrame.cpp:369
+#: AdvancedFrame.cpp:372
 msgid "Display notices"
 msgstr "Exibir avisos"
 
-#: clientgui/AdvancedFrame.cpp:374
+#: AdvancedFrame.cpp:377
 msgid "&Projects\tCtrl+Shift+P"
 msgstr "&Projetos\t Ctrl+Shift+P"
 
-#: clientgui/AdvancedFrame.cpp:375
+#: AdvancedFrame.cpp:378
 msgid "Display projects"
 msgstr "Exibir projetos"
 
-#: clientgui/AdvancedFrame.cpp:380
+#: AdvancedFrame.cpp:383
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr "&Tarefas\t Ctrl+Shift+T"
 
-#: clientgui/AdvancedFrame.cpp:381
+#: AdvancedFrame.cpp:384
 msgid "Display tasks"
 msgstr "Exibir tarefas"
 
-#: clientgui/AdvancedFrame.cpp:386
+#: AdvancedFrame.cpp:389
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr "Trans&ferências\t Ctrl+Shift+X"
 
-#: clientgui/AdvancedFrame.cpp:387
+#: AdvancedFrame.cpp:390
 msgid "Display transfers"
 msgstr "Exibir transferências"
 
-#: clientgui/AdvancedFrame.cpp:392
+#: AdvancedFrame.cpp:395
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "&Estatísticas\t Ctrl+Shift+S"
 
-#: clientgui/AdvancedFrame.cpp:393
+#: AdvancedFrame.cpp:396
 msgid "Display statistics"
 msgstr "Exibir estatísticas"
 
-#: clientgui/AdvancedFrame.cpp:398
+#: AdvancedFrame.cpp:401
 msgid "&Disk usage\tCtrl+Shift+D"
 msgstr "&Utilização de disco\t Ctrl+Shift+D"
 
-#: clientgui/AdvancedFrame.cpp:399
+#: AdvancedFrame.cpp:402
 msgid "Display disk usage"
 msgstr "Exibir utilização de disco"
 
-#: clientgui/AdvancedFrame.cpp:406
+#: AdvancedFrame.cpp:409
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr "&Visão Simples...\t Ctrl+Shift+V"
 
-#: clientgui/AdvancedFrame.cpp:407
+#: AdvancedFrame.cpp:410
 msgid "Display the simple graphical interface."
 msgstr "Exibir a interface gráfica simples."
 
-#: clientgui/AdvancedFrame.cpp:421
+#: AdvancedFrame.cpp:424
 msgid "&Add project or account manager..."
 msgstr "&Adicionar projeto ou gerenciador de contas..."
 
-#: clientgui/AdvancedFrame.cpp:422
+#: AdvancedFrame.cpp:425 sg_ProjectPanel.cpp:76
 msgid "Volunteer for any or all of 30+ projects in many areas of science"
 msgstr "Voluntários para um ou todos os 30+ projetos em muitas áreas da ciência"
 
-#: clientgui/AdvancedFrame.cpp:426
+#: AdvancedFrame.cpp:429
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "&Sincronizar com %s"
 
-#: clientgui/AdvancedFrame.cpp:430
+#: AdvancedFrame.cpp:433
 #, c-format
 msgid "Get current settings from %s"
 msgstr "Obter configurações atuais de %s"
 
-#: clientgui/AdvancedFrame.cpp:440
+#: AdvancedFrame.cpp:443
 msgid "&Add project..."
 msgstr "&Adicionar projeto..."
 
-#: clientgui/AdvancedFrame.cpp:441
+#: AdvancedFrame.cpp:444
 msgid "Add a project"
 msgstr "Adicionar projeto"
 
-#: clientgui/AdvancedFrame.cpp:444
+#: AdvancedFrame.cpp:447
 #, c-format
 msgid "S&top using %s..."
 msgstr "In&terromper uso de %s..."
 
-#: clientgui/AdvancedFrame.cpp:450
+#: AdvancedFrame.cpp:453
 msgid "Remove this computer from account manager control."
 msgstr "Remover este computador do controle do gerenciador de contas."
 
-#: clientgui/AdvancedFrame.cpp:455
+#: AdvancedFrame.cpp:458 sg_BoincSimpleFrame.cpp:178
 msgid "&Options..."
 msgstr ""
 
 # "proxy" is a known and very used word among computer users on Brazil. I believe translating it will be unbecome and may even confuse users.
-#: clientgui/AdvancedFrame.cpp:456
+#: AdvancedFrame.cpp:459 sg_BoincSimpleFrame.cpp:179
 #, fuzzy
 msgid "Configure display options and proxy settings"
 msgstr "Configurar opções GUI e de proxy"
 
-#: clientgui/AdvancedFrame.cpp:460
+#: AdvancedFrame.cpp:463 sg_BoincSimpleFrame.cpp:172
 msgid "Computing &preferences..."
 msgstr "&Preferências de computação..."
 
-#: clientgui/AdvancedFrame.cpp:461
+#: AdvancedFrame.cpp:464 sg_BoincSimpleFrame.cpp:173
 msgid "Configure computing preferences"
 msgstr "Configurar preferências de computação"
 
-#: clientgui/AdvancedFrame.cpp:469
+#: AdvancedFrame.cpp:472
 msgid "&Run always"
 msgstr "&Executar sempre"
 
-#: clientgui/AdvancedFrame.cpp:470
+#: AdvancedFrame.cpp:473
 msgid "Allow work regardless of preferences"
 msgstr "Permitir trabalho não obstante preferências"
 
-#: clientgui/AdvancedFrame.cpp:474
+#: AdvancedFrame.cpp:477
 msgid "Run based on &preferences"
 msgstr "Executar baseado em &preferências"
 
-#: clientgui/AdvancedFrame.cpp:475
+#: AdvancedFrame.cpp:478
 msgid "Allow work according to preferences"
 msgstr "Permitir trabalho conforme preferências"
 
-#: clientgui/AdvancedFrame.cpp:479
+#: AdvancedFrame.cpp:482
 msgid "&Suspend"
 msgstr "&Suspender"
 
-#: clientgui/AdvancedFrame.cpp:480
+#: AdvancedFrame.cpp:483
 msgid "Stop work regardless of preferences"
 msgstr "Interromper trabalho não obstante preferências"
 
-#: clientgui/AdvancedFrame.cpp:505
+#: AdvancedFrame.cpp:508
 msgid "Use GPU always"
 msgstr "Usar GPU sempre"
 
-#: clientgui/AdvancedFrame.cpp:506
+#: AdvancedFrame.cpp:509
 msgid "Allow GPU work regardless of preferences"
 msgstr "Permitir trabalho de GPU não obstante preferências"
 
-#: clientgui/AdvancedFrame.cpp:510
+#: AdvancedFrame.cpp:513
 msgid "Use GPU based on preferences"
 msgstr "Usar GPU baseado em preferências"
 
-#: clientgui/AdvancedFrame.cpp:511
+#: AdvancedFrame.cpp:514
 msgid "Allow GPU work according to preferences"
 msgstr "Permitir trabalho de GPU conforme preferências"
 
-#: clientgui/AdvancedFrame.cpp:515
+#: AdvancedFrame.cpp:518
 msgid "Suspend GPU"
 msgstr "Suspender GPU"
 
-#: clientgui/AdvancedFrame.cpp:516
+#: AdvancedFrame.cpp:519
 msgid "Stop GPU work regardless of preferences"
 msgstr "Interromper trabalho de GPU não obstante preferências"
 
-#: clientgui/AdvancedFrame.cpp:540
+#: AdvancedFrame.cpp:543
 msgid "Network activity always available"
 msgstr "Atividade de rede sempre disponível"
 
-#: clientgui/AdvancedFrame.cpp:541
+#: AdvancedFrame.cpp:544
 msgid "Allow network activity regardless of preferences"
 msgstr "Permitir atividade de rede não obstante preferências"
 
-#: clientgui/AdvancedFrame.cpp:545
+#: AdvancedFrame.cpp:548
 msgid "Network activity based on preferences"
 msgstr "Atividade de rede baseada em preferências"
 
-#: clientgui/AdvancedFrame.cpp:546
+#: AdvancedFrame.cpp:549
 msgid "Allow network activity according to preferences"
 msgstr "Permitir atividade de rede conforme preferências"
 
-#: clientgui/AdvancedFrame.cpp:550
+#: AdvancedFrame.cpp:553
 msgid "Network activity suspended"
 msgstr "Atividade de rede suspensa"
 
-#: clientgui/AdvancedFrame.cpp:551
+#: AdvancedFrame.cpp:554
 msgid "Stop BOINC network activity"
 msgstr "Interromper atividade de rede do BOINC"
 
-#: clientgui/AdvancedFrame.cpp:561
+#: AdvancedFrame.cpp:564
 #, c-format
 msgid "Connect to another computer running %s"
 msgstr "Conectar a outro computador executando %s"
 
-#: clientgui/AdvancedFrame.cpp:566
+#: AdvancedFrame.cpp:569
 msgid "Select computer..."
 msgstr "Selecionar computador..."
 
-#: clientgui/AdvancedFrame.cpp:571
+#: AdvancedFrame.cpp:574
 msgid "Shut down connected client..."
 msgstr "Finalizar cliente conectado..."
 
-#: clientgui/AdvancedFrame.cpp:572
+#: AdvancedFrame.cpp:575
 msgid "Shut down the currently connected client"
 msgstr "Finalizar o cliente conectado atual"
 
 # "benchmark" is a known and very used word among computer users on Brazil. It can be translated as "avaliação de desempenho", but I preferred leaving "benchmarks" just for using the same letter &b...
-#: clientgui/AdvancedFrame.cpp:576
+#: AdvancedFrame.cpp:579
 msgid "Run CPU &benchmarks"
 msgstr "Executar &benchmarks de CPU"
 
 # "benchmarks" is a known and very used word among computer users on Brazil. It can be translated as "avaliação de desempenho", but I preferred not translating it for convention.
-#: clientgui/AdvancedFrame.cpp:577
+#: AdvancedFrame.cpp:580
 msgid "Runs BOINC CPU benchmarks"
 msgstr "Executa benchmarks de CPU do BOINC"
 
-#: clientgui/AdvancedFrame.cpp:581
+#: AdvancedFrame.cpp:584
 msgid "Do network communication"
 msgstr "Efetuar comunicação de rede"
 
-#: clientgui/AdvancedFrame.cpp:582
+#: AdvancedFrame.cpp:585
 msgid "Do all pending network communication"
 msgstr "Efetuar todas as comunicações de rede pendentes"
 
 # 94%
-#: clientgui/AdvancedFrame.cpp:586
+#: AdvancedFrame.cpp:589
 #, fuzzy
 msgid "Read config files"
 msgstr "Ler arquivo de configuração"
 
-#: clientgui/AdvancedFrame.cpp:587
+#: AdvancedFrame.cpp:590
 msgid "Read configuration info from cc_config.xml and any app_config.xml files"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:591
+#: AdvancedFrame.cpp:594
 msgid "Read local prefs file"
 msgstr "Ler arquivo de preferências locais"
 
-#: clientgui/AdvancedFrame.cpp:592
+#: AdvancedFrame.cpp:595
 msgid "Read preferences from global_prefs_override.xml."
 msgstr "Ler preferências de global_prefs_override.xml."
 
-#: clientgui/AdvancedFrame.cpp:597
+#: AdvancedFrame.cpp:600
 #, c-format
 msgid "Launch another instance of %s..."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:601
+#: AdvancedFrame.cpp:604
 #, c-format
 msgid "Launch another %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:611
+#: AdvancedFrame.cpp:614
 msgid "Event Log...\tCtrl+Shift+E"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:612
+#: AdvancedFrame.cpp:615
 msgid "Display diagnostic messages."
 msgstr "Exibir mensagens de diagnóstico."
 
-#: clientgui/AdvancedFrame.cpp:616
-msgid "Event Log Diagnostic Flags...\tCtrl+Shift+F"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:617
-msgid "Enable or disable various diagnostic messages"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:626
+#: AdvancedFrame.cpp:625 sg_BoincSimpleFrame.cpp:188
 #, c-format
 msgid "%s &help"
 msgstr "%s &ajuda"
 
-#: clientgui/AdvancedFrame.cpp:632
+#: AdvancedFrame.cpp:631 sg_BoincSimpleFrame.cpp:194
 #, c-format
 msgid "Show information about %s"
 msgstr "Mostrar informações sobre %s"
 
-#: clientgui/AdvancedFrame.cpp:644
+#: AdvancedFrame.cpp:643
 #, c-format
 msgid "&%s help"
 msgstr "&%s ajuda"
 
-#: clientgui/AdvancedFrame.cpp:650
+#: AdvancedFrame.cpp:649 sg_BoincSimpleFrame.cpp:212
 #, c-format
 msgid "Show information about the %s"
 msgstr "Mostrar informações sobre o %s"
 
-#: clientgui/AdvancedFrame.cpp:662
+#: AdvancedFrame.cpp:661 sg_BoincSimpleFrame.cpp:224
 #, c-format
+#, c-format, fuzzy
 msgid "%s &web site"
-msgstr ""
+msgstr "%s &página de internet"
 
-#: clientgui/AdvancedFrame.cpp:668
+#: AdvancedFrame.cpp:667 sg_BoincSimpleFrame.cpp:230
 #, c-format
 msgid "Show information about BOINC and %s"
 msgstr "Mostrar informações sobre BOINC e %s"
 
-#: clientgui/AdvancedFrame.cpp:680
-#: clientgui/BOINCTaskBar.cpp:544
+#: AdvancedFrame.cpp:679 BOINCTaskBar.cpp:530 sg_BoincSimpleFrame.cpp:242
 #, c-format
 msgid "&About %s..."
 msgstr "&Sobre %s..."
 
-#: clientgui/AdvancedFrame.cpp:686
+#: AdvancedFrame.cpp:685 sg_BoincSimpleFrame.cpp:248
 msgid "Licensing and copyright information."
 msgstr "Informações de licenciamento e direitos autorais."
 
-#: clientgui/AdvancedFrame.cpp:693
+#: AdvancedFrame.cpp:692 sg_BoincSimpleFrame.cpp:255
 msgid "&File"
 msgstr "&Arquivo"
 
-#: clientgui/AdvancedFrame.cpp:697
+#: AdvancedFrame.cpp:696 sg_BoincSimpleFrame.cpp:259
 msgid "&View"
 msgstr "&Ver"
 
-#: clientgui/AdvancedFrame.cpp:701
+#: AdvancedFrame.cpp:700 sg_BoincSimpleFrame.cpp:263
 msgid "&Tools"
 msgstr "&Ferramentas"
 
-#: clientgui/AdvancedFrame.cpp:705
+#: AdvancedFrame.cpp:704
 msgid "&Activity"
 msgstr "&Atividade"
 
-#: clientgui/AdvancedFrame.cpp:709
+#: AdvancedFrame.cpp:708
 msgid "A&dvanced"
 msgstr "A&vançado"
 
-#: clientgui/AdvancedFrame.cpp:713
+#: AdvancedFrame.cpp:712 DlgEventLog.cpp:332 sg_BoincSimpleFrame.cpp:267
+#: wizardex.cpp:374 wizardex.cpp:381
 msgid "&Help"
 msgstr "&Ajuda"
 
-#: clientgui/AdvancedFrame.cpp:1185
+#: AdvancedFrame.cpp:1199
 #, c-format
 msgid "%s - Stop using %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:1190
+#: AdvancedFrame.cpp:1204
 #, c-format
+#, fuzzy, c-format
 msgid ""
 "If you stop using %s,\n"
 "you'll keep all your current projects,\n"
@@ -584,12 +570,12 @@ msgstr ""
 "\n"
 "Deseja desligar-se de %s ?"
 
-#: clientgui/AdvancedFrame.cpp:1397
+#: AdvancedFrame.cpp:1401
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s - Finalizar o cliente atual..."
 
-#: clientgui/AdvancedFrame.cpp:1406
+#: AdvancedFrame.cpp:1410
 #, c-format
 msgid ""
 "%s will shut down the current client\n"
@@ -598,36 +584,37 @@ msgstr ""
 "%s finalizará o cliente atual\n"
 "e o indagará para outra máquina a se conectar."
 
-#: clientgui/AdvancedFrame.cpp:1806
+#: AdvancedFrame.cpp:1745 DlgAbout.cpp:119
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: clientgui/AdvancedFrame.cpp:1815
+#: AdvancedFrame.cpp:1754
 #, c-format
+#, fuzzy, c-format
 msgid "%s has successfully added %s"
 msgstr "%s foi incorporado com sucesso a %s"
 
-#: clientgui/AdvancedFrame.cpp:1953
+#: AdvancedFrame.cpp:1893
 #, c-format
 msgid "%s - (%s)"
 msgstr "%s - (%s)"
 
-#: clientgui/AdvancedFrame.cpp:1957
+#: AdvancedFrame.cpp:1897
 #, c-format
 msgid "Connecting to %s"
 msgstr "Conectando a %s"
 
-#: clientgui/AdvancedFrame.cpp:1960
+#: AdvancedFrame.cpp:1900
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "Conectado a %s (%s)"
 
-#: clientgui/AlreadyExistsPage.cpp:184
+#: AlreadyExistsPage.cpp:184
 msgid "Username already in use"
 msgstr "Nome de usuário já em uso"
 
-#: clientgui/AlreadyExistsPage.cpp:187
+#: AlreadyExistsPage.cpp:187
 msgid ""
 "An account with that username already exists and has a\n"
 "different password than the one you entered.\n"
@@ -639,11 +626,11 @@ msgstr ""
 "\n"
 "Por favor, visite a página do projeto na internet e siga as instruções."
 
-#: clientgui/AlreadyExistsPage.cpp:191
+#: AlreadyExistsPage.cpp:191
 msgid "Email address already in use"
 msgstr "Endereço de E-mail já em uso"
 
-#: clientgui/AlreadyExistsPage.cpp:194
+#: AlreadyExistsPage.cpp:194
 msgid ""
 "An account with that email address already exists and has a\n"
 "different password than the one you entered.\n"
@@ -655,43 +642,45 @@ msgstr ""
 "\n"
 "Por favor, visite a página do projeto na internet e siga as instruções."
 
-#: clientgui/AsyncRPC.cpp:1031
+#: AsyncRPC.cpp:1031
 msgid "Communicating with BOINC client.  Please wait ..."
 msgstr "Comunicando-se com o cliente BOINC. Por favor, aguarde..."
 
-#: clientgui/AsyncRPC.cpp:1034
+#: AsyncRPC.cpp:1034
 #, c-format
 msgid "&Quit %s"
 msgstr "&Sair %s"
 
-#: clientgui/AsyncRPC.cpp:1036
+#: AsyncRPC.cpp:1036
 #, c-format
 msgid "E&xit %s"
 msgstr "S&air %s"
 
-#: clientgui/AsyncRPC.cpp:1040
+#: AsyncRPC.cpp:1040
 #, c-format
 msgid "%s - Communication"
 msgstr "%s - Comunicação"
 
-#: clientgui/AsyncRPC.cpp:1056
+#: AsyncRPC.cpp:1056 DlgAdvPreferencesBase.cpp:107 sg_DlgPreferences.cpp:433
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: clientgui/BOINCBaseFrame.cpp:504
+#: BOINCBaseFrame.cpp:505
 #, c-format
 msgid "%s - Connection Error"
 msgstr "%s - Erro de Conexão"
 
-#: clientgui/BOINCBaseFrame.cpp:513
+#: BOINCBaseFrame.cpp:514
 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 ""
 "Você não está autorizado no momento a gerenciar o cliente.\n"
-"Por favor, contate seu administrador para adicioná-lo ao grupo de usuários local 'usuários_boinc'."
+"Por favor, contate seu administrador para adicioná-lo ao grupo de usuários "
+"local 'usuários_boinc'."
 
-#: clientgui/BOINCBaseFrame.cpp:522
+#: BOINCBaseFrame.cpp:523
 msgid ""
 "Authorization failed connecting to running client.\n"
 "Make sure you start this program in the same directory as the client."
@@ -699,20 +688,20 @@ msgstr ""
 "Falha em autorização na conexão com cliente em execução.\n"
 "Certifique-se de que iniciou este programa no mesmo diretório que o cliente."
 
-#: clientgui/BOINCBaseFrame.cpp:524
+#: BOINCBaseFrame.cpp:525
 msgid "Authorization failed connecting to running client."
 msgstr "Falha em autorização na conexão com cliente em execução."
 
-#: clientgui/BOINCBaseFrame.cpp:532
+#: BOINCBaseFrame.cpp:533
 msgid "The password you have provided is incorrect, please try again."
 msgstr "A senha fornecida é incorreta. Por favor, tente novamente."
 
-#: clientgui/BOINCBaseFrame.cpp:576
+#: BOINCBaseFrame.cpp:577
 #, c-format
 msgid "%s - Connection Failed"
 msgstr "%s - Conexão Falhou"
 
-#: clientgui/BOINCBaseFrame.cpp:585
+#: BOINCBaseFrame.cpp:586
 #, c-format
 msgid ""
 "%s is not able to connect to a %s client.\n"
@@ -722,23 +711,25 @@ msgstr ""
 "Deseja tentar conexão novamente?"
 
 # "daemon" is a known and very used word among computer users on Brazil. There is no good translation for it.
-#: clientgui/BOINCBaseFrame.cpp:621
+#: BOINCBaseFrame.cpp:622
 #, c-format
 msgid "%s - Daemon Start Failed"
 msgstr "%s - Falha na Inicialização do Daemon"
 
 # "applet" is a known and very used word among computers users on Brazil. There is no good translation for it.
-#: clientgui/BOINCBaseFrame.cpp:631
+#: BOINCBaseFrame.cpp:632
 #, 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 ""
 "%s não consegue inicializar cliente %s.\n"
-"Por favor, execute a applet Painel de Controle->Ferramentas Administrativas->Serviços e inicie o serviço BOINC."
+"Por favor, execute a applet Painel de Controle->Ferramentas "
+"Administrativas->Serviços e inicie o serviço BOINC."
 
 # "daemon" is a known and very used word among computer users on Brazil. There is no good translation for it.
-#: clientgui/BOINCBaseFrame.cpp:637
+#: BOINCBaseFrame.cpp:638
 #, c-format
 msgid ""
 "%s is not able to start a %s client.\n"
@@ -747,33 +738,36 @@ msgstr ""
 "%s não consegue iniciar cliente %s.\n"
 "Por favor, inicie o daemon e tente novamente."
 
-#: clientgui/BOINCBaseFrame.cpp:688
+#: BOINCBaseFrame.cpp:689
 #, c-format
 msgid "%s - Connection Status"
 msgstr "%s - Status de Conexão"
 
-#: clientgui/BOINCBaseFrame.cpp:699
+#: BOINCBaseFrame.cpp:700
 #, 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 ""
 "%s não está conectado ao cliente %s no momento.\n"
-"Por favor, use a opção do menu 'Avançado\\Selecionar Computador...' para conectar-se ao cliente %s.\n"
-"Para conectar-se ao seu computador local, use 'localhost' como nome de máquina."
+"Por favor, use a opção do menu 'Avançado\\Selecionar Computador...' para "
+"conectar-se ao cliente %s.\n"
+"Para conectar-se ao seu computador local, use 'localhost' como nome de "
+"máquina."
 
-#: clientgui/BOINCBaseView.cpp:752
+#: BOINCBaseView.cpp:779
 #, fuzzy
 msgid "Project web pages"
 msgstr "Projeto adicionado"
 
-#: clientgui/BOINCClientManager.cpp:573
+#: BOINCClientManager.cpp:575
 #, c-format
 msgid "%s - Unexpected Exit"
 msgstr "%s - Saída Inesperada"
 
-#: clientgui/BOINCClientManager.cpp:583
+#: BOINCClientManager.cpp:585
 #, c-format
 msgid ""
 "The %s client has exited unexpectedly 3 times within the last %d minutes.\n"
@@ -782,12 +776,12 @@ msgstr ""
 "O cliente %s fechou inesperadamente 3 vezes nos últimos %d minutos.\n"
 "Deseja reiniciá-lo novamente?"
 
-#: clientgui/BOINCDialupManager.cpp:61
+#: BOINCDialupManager.cpp:61
 #, c-format
 msgid "%s - Network Status"
 msgstr "%s - Status de Rede"
 
-#: clientgui/BOINCDialupManager.cpp:241
+#: BOINCDialupManager.cpp:241
 #, c-format
 msgid ""
 "%s needs to connect to the Internet.\n"
@@ -796,22 +790,22 @@ msgstr ""
 "%s necessita conexão com a Internet.\n"
 "Ele pode fazê-lo agora?"
 
-#: clientgui/BOINCDialupManager.cpp:254
+#: BOINCDialupManager.cpp:254
 #, c-format
 msgid "%s is connecting to the Internet."
 msgstr "%s está conectando-se com a Internet."
 
-#: clientgui/BOINCDialupManager.cpp:303
+#: BOINCDialupManager.cpp:303
 #, c-format
 msgid "%s has successfully connected to the Internet."
 msgstr "%s conectou-se com a Internet com sucesso."
 
-#: clientgui/BOINCDialupManager.cpp:331
+#: BOINCDialupManager.cpp:331
 #, c-format
 msgid "%s failed to connect to the Internet."
 msgstr "%s falhou ao conectar-se com a Internet."
 
-#: clientgui/BOINCDialupManager.cpp:372
+#: BOINCDialupManager.cpp:372
 #, c-format
 msgid ""
 "%s has detected it is now connected to the Internet.\n"
@@ -820,18 +814,19 @@ msgstr ""
 "%s detectou que está conectado com a Internet.\n"
 "Atualizando todos os projetos e tentando novamente todas as transferências."
 
-#: clientgui/BOINCDialupManager.cpp:417
+#: BOINCDialupManager.cpp:417
 #, c-format
 msgid "%s has successfully disconnected from the Internet."
 msgstr "%s desconectou-se da Internet com sucesso."
 
-#: clientgui/BOINCDialupManager.cpp:433
+#: BOINCDialupManager.cpp:433
 #, c-format
 msgid "%s failed to disconnected from the Internet."
 msgstr "%s falhou ao desconectar-se da Internet."
 
-#: clientgui/BOINCGUIApp.cpp:595
+#: BOINCGUIApp.cpp:339
 #, c-format
+#, fuzzy, c-format
 msgid ""
 "You currently are not authorized to manage the client.\n"
 "\n"
@@ -842,23 +837,36 @@ msgid ""
 "  - contact your administrator to add you to the 'boinc_master'\n"
 "     user group."
 msgstr ""
-
-#: clientgui/BOINCGUIApp.cpp:601
+"Você não está autorizado no momento a gerenciar o cliente.\n"
+"\n"
+"Para executar BOINC com este usuário, por favor:\n"
+"- reinstale o BOINC respondendo \"Sim\" à questão sobre\n"
+"usuários não-administrativos\n"
+"ou\n"
+"- contate seu administrador para adicioná-lo ao grupo de usuários\n"
+"'mestre_boinc'."
+
+#: BOINCGUIApp.cpp:345
 #, c-format
+#, fuzzy, c-format
 msgid ""
 "%s ownership or permissions are not set properly; please reinstall %s.\n"
 "(Error code %d"
 msgstr ""
+"Proprietário ou permissões do BOINC não estão configurados corretamente; por "
+"favor, reinstale o BOINC.\n"
+"(Código do erro %d)"
 
-#: clientgui/BOINCGUIApp.cpp:607
+#: BOINCGUIApp.cpp:351
 msgid " at "
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:610
+#: BOINCGUIApp.cpp:354 MainDocument.cpp:2484 MainDocument.cpp:2534
+#: MainDocument.cpp:2554 ViewTransfers.cpp:803
 msgid ")"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:640
+#: BOINCGUIApp.cpp:384
 msgid ""
 "A reboot is required in order for BOINC to run properly.\n"
 "Please reboot your computer and try again."
@@ -866,190 +874,190 @@ msgstr ""
 "É necessário reiniciar para execução correta do BOINC.\n"
 "Por favor, reinicie seu computador e tente novamente."
 
-#: clientgui/BOINCGUIApp.cpp:641
+#: BOINCGUIApp.cpp:385 DlgAbout.cpp:153
 msgid "BOINC Manager"
 msgstr "Gerenciador BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:902
+#: BOINCGUIApp.cpp:572
 msgid "BOINC Manager was started by the operating system automatically"
-msgstr "Gerenciador BOINC foi inicializado pelo sistema operacional automaticamente"
+msgstr ""
+"Gerenciador BOINC foi inicializado pelo sistema operacional automaticamente"
 
-#: clientgui/BOINCGUIApp.cpp:904
+#: BOINCGUIApp.cpp:574
 msgid "Startup BOINC so only the system tray icon is visible"
-msgstr "Inicializa o BOINC tão somente o ícone na bandeja do sistema seja visível"
+msgstr ""
+"Inicializa o BOINC tão somente o ícone na bandeja do sistema seja visível"
 
-#: clientgui/BOINCGUIApp.cpp:906
+#: BOINCGUIApp.cpp:576
 msgid "Directory containing the BOINC Client executable"
 msgstr "Diretório contendo o executável do Cliente BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:907
+#: BOINCGUIApp.cpp:577
 msgid "BOINC data directory"
 msgstr "diretório de dados do BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:909
+#: BOINCGUIApp.cpp:579
 msgid "Host name or IP address"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:910
+#: BOINCGUIApp.cpp:580
 msgid "GUI RPC port number"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:911
+#: BOINCGUIApp.cpp:581
 #, fuzzy
 msgid "Password"
 msgstr "Senha:"
 
-#: clientgui/BOINCGUIApp.cpp:912
+#: BOINCGUIApp.cpp:582
 msgid "Startup BOINC with these optional arguments"
 msgstr "Inicie o BOINC com esses argumentos opcionais"
 
-#: clientgui/BOINCGUIApp.cpp:913
+#: BOINCGUIApp.cpp:583
 msgid "disable BOINC security users and permissions"
 msgstr "desativar usuários e permissões de segurança do BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:914
+#: BOINCGUIApp.cpp:584
 msgid "set skin debugging mode to enable skin manager error messages"
-msgstr "definir modo depuração de aparência para ativar mensagens de erro do gerenciador de aparência"
+msgstr ""
+"definir modo depuração de aparência para ativar mensagens de erro do "
+"gerenciador de aparência"
 
-#: clientgui/BOINCGUIApp.cpp:915
+#: BOINCGUIApp.cpp:585
 msgid "multiple instances of BOINC Manager allowed"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:917
+#: BOINCGUIApp.cpp:587
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:1164
+#: BOINCGUIApp.cpp:814
 msgid "(Automatic Detection)"
 msgstr "(Detecção Automática)"
 
-#: clientgui/BOINCGUIApp.cpp:1165
+#: BOINCGUIApp.cpp:815
 msgid "(Unknown)"
 msgstr "(Desconhecido)"
 
-#: clientgui/BOINCGUIApp.cpp:1166
+#: BOINCGUIApp.cpp:816
 msgid "(User Defined)"
 msgstr "(Definido pelo Usuário)"
 
-#: clientgui/BOINCTaskBar.cpp:522
+#: BOINCTaskBar.cpp:508
 #, c-format
 msgid "Open %s Web..."
 msgstr "Abrir Página %s..."
 
-#: clientgui/BOINCTaskBar.cpp:529
+#: BOINCTaskBar.cpp:515
 #, c-format
 msgid "Open %s..."
 msgstr "Abrir %s..."
 
-#: clientgui/BOINCTaskBar.cpp:536
-#: clientgui/BOINCTaskBar.cpp:633
-#: clientgui/BOINCTaskBar.cpp:641
+#: BOINCTaskBar.cpp:522 BOINCTaskBar.cpp:619 BOINCTaskBar.cpp:627
 msgid "Snooze"
 msgstr "Cochilar"
 
-#: clientgui/BOINCTaskBar.cpp:538
-#: clientgui/BOINCTaskBar.cpp:660
-#: clientgui/BOINCTaskBar.cpp:668
+#: BOINCTaskBar.cpp:524 BOINCTaskBar.cpp:646 BOINCTaskBar.cpp:654
 msgid "Snooze GPU"
 msgstr "Cochilar GPU"
 
-#: clientgui/BOINCTaskBar.cpp:556
+#: BOINCTaskBar.cpp:542
 msgid "E&xit"
 msgstr "S&air"
 
-#: clientgui/BOINCTaskBar.cpp:626
+#: BOINCTaskBar.cpp:612 ViewProjects.cpp:718 ViewWork.cpp:795
+#: sg_BoincSimpleFrame.cpp:758 sg_ProjectCommandPopup.cpp:110
+#: sg_TaskCommandPopup.cpp:102
 msgid "Resume"
 msgstr ""
 
-#: clientgui/BOINCTaskBar.cpp:653
+#: BOINCTaskBar.cpp:639
 msgid "Resume GPU"
 msgstr ""
 
-#: clientgui/BOINCTaskBar.cpp:727
+#: BOINCTaskBar.cpp:713
 msgid "Computing is enabled"
 msgstr "Computação está ativada"
 
-#: clientgui/BOINCTaskBar.cpp:731
+#: BOINCTaskBar.cpp:717
 msgid "Computing is suspended - "
 msgstr "Computação está suspensa -"
 
-#: clientgui/BOINCTaskBar.cpp:741
+#: BOINCTaskBar.cpp:727
 msgid "GPU computing is enabled"
 msgstr "Computação com GPU está ativada"
 
-#: clientgui/BOINCTaskBar.cpp:744
+#: BOINCTaskBar.cpp:730
 msgid "GPU computing is suspended - "
 msgstr "Computação com GPU está suspensa -"
 
-#: clientgui/BOINCTaskBar.cpp:753
+#: BOINCTaskBar.cpp:739
 msgid "Network is enabled"
 msgstr "Rede está ativada"
 
-#: clientgui/BOINCTaskBar.cpp:756
+#: BOINCTaskBar.cpp:742
 msgid "Network is suspended - "
 msgstr "Rede está suspensa -"
 
-#: clientgui/BOINCTaskBar.cpp:764
+#: BOINCTaskBar.cpp:750
 msgid "Reconnecting to client."
 msgstr "Reconectando ao cliente."
 
-#: clientgui/BOINCTaskBar.cpp:766
+#: BOINCTaskBar.cpp:752
 msgid "Not connected to a client."
 msgstr "Não conectado a um cliente."
 
-#: clientgui/BOINCTaskBar.cpp:819
+#: BOINCTaskBar.cpp:805
 #, c-format
 msgid "%s Notices"
 msgstr "%s Avisos"
 
-#: clientgui/BOINCTaskBar.cpp:825
+#: BOINCTaskBar.cpp:811
 msgid "There are new notices - click to view."
 msgstr "Existem novos avisos - clique para visualizar."
 
-#: clientgui/CompletionErrorPage.cpp:199
+#: CompletionErrorPage.cpp:199
 msgid "Failed to add project"
 msgstr ""
 
-#: clientgui/CompletionErrorPage.cpp:204
+#: CompletionErrorPage.cpp:204
 msgid "Failed to update account manager"
 msgstr "Falha ao atualizar gerenciador de contas"
 
-#: clientgui/CompletionErrorPage.cpp:208
+#: CompletionErrorPage.cpp:208
 msgid "Failed to remove account manager"
 msgstr "Falha ao remover gerenciador de contas"
 
-#: clientgui/CompletionErrorPage.cpp:212
+#: CompletionErrorPage.cpp:212
 #, fuzzy
 msgid "Failed to add account manager"
 msgstr "Falha ao atualizar gerenciador de contas"
 
-#: clientgui/CompletionErrorPage.cpp:221
+#: CompletionErrorPage.cpp:221
 msgid ""
 "Please try again later.\n"
 "\n"
 "Click Finish to close."
 msgstr ""
 
-#: clientgui/CompletionErrorPage.cpp:225
-#: clientgui/CompletionPage.cpp:222
-#: clientgui/CompletionPage.cpp:242
-#: clientgui/CompletionPage.cpp:273
+#: CompletionErrorPage.cpp:225 CompletionPage.cpp:222 CompletionPage.cpp:242
+#: CompletionPage.cpp:273
 msgid "Click Finish to close."
 msgstr "Clique em Finalizar para fechar."
 
-#: clientgui/CompletionErrorPage.cpp:234
+#: CompletionErrorPage.cpp:234
 msgid "Messages from server:"
 msgstr "Mensagens do servidor:"
 
-#: clientgui/CompletionPage.cpp:207
+#: CompletionPage.cpp:207
 msgid "Project added"
 msgstr "Projeto adicionado"
 
-#: clientgui/CompletionPage.cpp:213
+#: CompletionPage.cpp:213
 msgid "This project has been successfully added."
 msgstr "Este projeto foi adicionado com sucesso."
 
-#: clientgui/CompletionPage.cpp:218
+#: 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."
@@ -1057,139 +1065,138 @@ msgstr ""
 "Quando você clicar em Finalizar, seu navegador irá a uma página onde\n"
 "você poderá definir o nome de sua conta e preferências."
 
-#: clientgui/CompletionPage.cpp:232
+#: CompletionPage.cpp:232
 #, c-format
 msgid "Update from %s completed."
 msgstr "Atualização de %s concluída."
 
-#: clientgui/CompletionPage.cpp:236
+#: CompletionPage.cpp:236
 msgid "Update completed."
 msgstr "Atualização concluída."
 
-#: clientgui/CompletionPage.cpp:247
+#: CompletionPage.cpp:247
 msgid "Now using account manager"
 msgstr ""
 
-#: clientgui/CompletionPage.cpp:252
+#: CompletionPage.cpp:252
 #, c-format
 msgid "Welcome to %s!"
 msgstr "Bem Vindo a %s!"
 
-#: clientgui/CompletionPage.cpp:263
+#: CompletionPage.cpp:263
 #, c-format
 msgid "You are now using %s to manage accounts."
 msgstr ""
 
-#: clientgui/CompletionPage.cpp:267
+#: CompletionPage.cpp:267
 msgid "You are now using this account manager."
 msgstr ""
 
-#: clientgui/DlgAbout.cpp:113
+#: DlgAbout.cpp:113 mac/Mac_GUI.cpp:96
 #, c-format
 msgid "About %s"
 msgstr "Sobre %s"
 
-#: clientgui/DlgAbout.cpp:172
+#: DlgAbout.cpp:172
 msgid "Version:"
 msgstr "Versão:"
 
-#: clientgui/DlgAbout.cpp:180
+#: DlgAbout.cpp:180
 msgid "wxWidgets Version:"
 msgstr "Versão do wxWidgets:"
 
-#: clientgui/DlgAbout.cpp:188
+#: DlgAbout.cpp:188
 msgid "Copyright:"
 msgstr "Direitos autorais:"
 
-#: clientgui/DlgAbout.cpp:192
+# 98%
+#: DlgAbout.cpp:192
+#, fuzzy
 msgid ""
-"(C) 2003-2014 University of California, Berkeley.\n"
+"(C) 2003-2013 University of California, Berkeley.\n"
 "All Rights Reserved."
 msgstr ""
+"(C) 2003-2010 Universidade da Califórnia, Berkeley.\n"
+"Todos os Direitos Reservados."
 
-#: clientgui/DlgAbout.cpp:196
+#: DlgAbout.cpp:196
 msgid "Berkeley Open Infrastructure for Network Computing"
 msgstr "Infraestrutura Aberta para Computação em Rede Berkeley"
 
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:399
-#: clientgui/DlgSelectComputer.cpp:163
+#: DlgAbout.cpp:208 DlgExitMessage.cpp:173 DlgGenericMessage.cpp:120
+#: DlgOptions.cpp:396 DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "%OK"
 
-#: clientgui/DlgAdvPreferences.cpp:602
+#: DlgAdvPreferences.cpp:544
 msgid "invalid number"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:603
+#: DlgAdvPreferences.cpp:545
 msgid "invalid time, format is HH:MM"
 msgstr "tempo inválido, o formato é HH:MM"
 
-#: clientgui/DlgAdvPreferences.cpp:604
+#: DlgAdvPreferences.cpp:546
 msgid "invalid time interval, format is HH:MM-HH:MM"
 msgstr "intervalo de tempo inválido, o formato é HH:MM-HH:MM"
 
-#: clientgui/DlgAdvPreferences.cpp:817
+#: DlgAdvPreferences.cpp:751
 msgid "invalid input value detected"
 msgstr "detectado valor de entrada inválido"
 
-#: clientgui/DlgAdvPreferences.cpp:819
+#: DlgAdvPreferences.cpp:753
 msgid "Validation Error"
 msgstr "Erro de Validação"
 
-#: clientgui/DlgAdvPreferences.cpp:969
-#: clientgui/DlgAdvPreferences.cpp:975
-#: clientgui/DlgAdvPreferences.cpp:981
+#: DlgAdvPreferences.cpp:885 DlgAdvPreferences.cpp:891
+#: DlgAdvPreferences.cpp:897
 msgid "Applications to add"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:998
+#: DlgAdvPreferences.cpp:914
 #, c-format
 msgid "'%s' is not an executable application."
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:999
-#: clientgui/DlgAdvPreferences.cpp:1046
-#: clientgui/DlgAdvPreferences.cpp:1070
+#: DlgAdvPreferences.cpp:915 DlgAdvPreferences.cpp:962
+#: DlgAdvPreferences.cpp:986
 msgid "Add Exclusive App"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Name of application to add?"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Add exclusive app"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1045
+#: DlgAdvPreferences.cpp:961
 #, c-format
 msgid "Application names must end with '%s'"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1069
+#: DlgAdvPreferences.cpp:985
 #, c-format
 msgid "'%s' is already in the list."
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1161
+#: DlgAdvPreferences.cpp:1077
 msgid ""
 "Do you really want to clear all local preferences?\n"
 "(This will not affect exclusive applications.)"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1162
+#: DlgAdvPreferences.cpp:1078 sg_DlgPreferences.cpp:1030
 msgid "Confirmation"
 msgstr "Confirmação"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:49
+#: DlgAdvPreferencesBase.cpp:46 sg_DlgPreferences.cpp:946
 #, c-format
-msgid "%s - Computing preferences"
-msgstr ""
+msgid "%s - Preferences"
+msgstr "%s - Preferências"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:66
+#: DlgAdvPreferencesBase.cpp:62
 #, fuzzy
 msgid ""
 "This dialog controls preferences for this computer only.\n"
@@ -1201,287 +1208,286 @@ msgstr ""
 "Clique em Limpar para restaurar configurações baseadas na internet."
 
 # "Clear" can be translated into "Limpar" or "Apagar". Both terms have almost the same meaning. In some contexts "Apagar" fits better, and in other contexts "Limpar" fits better. Since I do not know what context the word will be used, I translated "Clear" as "Limpar".
-#: clientgui/DlgAdvPreferencesBase.cpp:69
+#: DlgAdvPreferencesBase.cpp:65 sg_DlgPreferences.cpp:428
 msgid "Clear"
 msgstr "Limpar"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:70
+#: DlgAdvPreferencesBase.cpp:66
 msgid "clear all local preferences and close the dialog"
 msgstr "limpar todas as preferências locais e fechar caixa de diálogo"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:85
+#: DlgAdvPreferencesBase.cpp:81
 msgid "processor usage"
 msgstr "utilização do processador"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:88
+#: DlgAdvPreferencesBase.cpp:84
 msgid "network usage"
 msgstr "utilização de rede"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:91
+#: DlgAdvPreferencesBase.cpp:87
 msgid "disk and memory usage"
 msgstr "utilização de memória e disco"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:94
+#: DlgAdvPreferencesBase.cpp:90
 msgid "exclusive applications"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:107
-#: clientgui/DlgDiagnosticLogFlags.cpp:104
+#: DlgAdvPreferencesBase.cpp:102 sg_DlgPreferences.cpp:424
 msgid "OK"
 msgstr "OK"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:108
+#: DlgAdvPreferencesBase.cpp:103
 msgid "save all values and close the dialog"
 msgstr "salvar todos os valores e fechar caixa de diálogo"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:114
+#: DlgAdvPreferencesBase.cpp:108
 msgid "close the dialog without saving"
 msgstr "fechar caixa de diálogo sem salvar"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:118
-#: clientgui/Localization.cpp:35
-#: clientgui/Localization.cpp:121
-#: clientgui/Localization.cpp:139
+#: DlgAdvPreferencesBase.cpp:112 Localization.cpp:35 Localization.cpp:121
+#: Localization.cpp:139 sg_BoincSimpleFrame.cpp:794 sg_DlgPreferences.cpp:439
 msgid "Help"
 msgstr "Ajuda"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
+#: DlgAdvPreferencesBase.cpp:113
 msgid "shows the preferences web page"
 msgstr "exibe a página de preferências na internet"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:141
+#: DlgAdvPreferencesBase.cpp:135
 msgid "Computing allowed"
 msgstr "Processamento permitido"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
+#: DlgAdvPreferencesBase.cpp:139
 msgid "While computer is on batteries"
 msgstr "Enquanto o computador estiver em baterias"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:149
-msgid "check this if you want this computer to do work while it runs on batteries"
-msgstr "selecione isso se deseja que este computador execute trabalho enquanto estiver em baterias"
+#: DlgAdvPreferencesBase.cpp:142
+msgid ""
+"check this if you want this computer to do work while it runs on batteries"
+msgstr ""
+"selecione isso se deseja que este computador execute trabalho enquanto "
+"estiver em baterias"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:155
+#: DlgAdvPreferencesBase.cpp:148
 msgid "While computer is in use"
 msgstr "Enquanto o computador estiver em uso"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:158
-msgid "check this if you want this computer to do work even when you're using it"
-msgstr "selecione isso se deseja que este computador execute trabalho enquanto você usa-o"
+#: DlgAdvPreferencesBase.cpp:151
+msgid ""
+"check this if you want this computer to do work even when you're using it"
+msgstr ""
+"selecione isso se deseja que este computador execute trabalho enquanto você "
+"usa-o"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:164
+#: DlgAdvPreferencesBase.cpp:157
 msgid "Use GPU while computer is in use"
 msgstr "Usar GPU enquanto o computador estiver em uso"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:167
-msgid "check this if you want your GPU to do work even when you're using the computer"
-msgstr "selecione isso se deseja que sua GPU execute trabalho enquanto você usa o computador"
+#: DlgAdvPreferencesBase.cpp:160
+msgid ""
+"check this if you want your GPU to do work even when you're using the "
+"computer"
+msgstr ""
+"selecione isso se deseja que sua GPU execute trabalho enquanto você usa o "
+"computador"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:179
+#: DlgAdvPreferencesBase.cpp:172
 msgid "Only after computer has been idle for"
 msgstr "Apenas quando o computador estiver ocioso por"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:188
-msgid "do work only after you haven't used the computer for this number of minutes"
-msgstr "executa trabalho somente depois de você não usar o computador por este número de minutos"
+#: DlgAdvPreferencesBase.cpp:182
+msgid ""
+"do work only after you haven't used the computer for this number of minutes"
+msgstr ""
+"executa trabalho somente depois de você não usar o computador por este "
+"número de minutos"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:193
-#: clientgui/DlgAdvPreferencesBase.cpp:342
+#: DlgAdvPreferencesBase.cpp:187 DlgAdvPreferencesBase.cpp:336
+#: sg_DlgPreferences.cpp:417
 msgid "minutes"
 msgstr "minutos"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:212
+#: DlgAdvPreferencesBase.cpp:206
 msgid "While processor usage is less than"
 msgstr "Enquanto a utilização do processador for menor que"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:221
+#: DlgAdvPreferencesBase.cpp:216
 msgid "suspend work if processor usage exceeds this level"
 msgstr "suspende o trabalho se a utilização do processador exceder este nível"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:226
+#: DlgAdvPreferencesBase.cpp:221
 msgid "percent (0 means no restriction)"
 msgstr "porcento (0 significa nenhuma restrição)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:240
-#: clientgui/DlgAdvPreferencesBase.cpp:506
+#: DlgAdvPreferencesBase.cpp:235 DlgAdvPreferencesBase.cpp:496
 msgid "Every day between hours of"
 msgstr "Todos os dias entre os horários de"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: DlgAdvPreferencesBase.cpp:239
 msgid "start work at this time"
 msgstr "inicia o trabalho neste horário"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:248
-#: clientgui/DlgAdvPreferencesBase.cpp:514
+#: DlgAdvPreferencesBase.cpp:243 DlgAdvPreferencesBase.cpp:504
+#: sg_DlgPreferences.cpp:326 sg_DlgPreferences.cpp:348
 msgid "and"
 msgstr "e"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:252
+#: DlgAdvPreferencesBase.cpp:247
 msgid "stop work at this time"
 msgstr "interrompe o trabalho neste horário"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
-#: clientgui/DlgAdvPreferencesBase.cpp:522
+#: DlgAdvPreferencesBase.cpp:251 DlgAdvPreferencesBase.cpp:512
 msgid "(no restriction if equal)"
 msgstr "(sem restrição se iguais)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:261
-#: clientgui/DlgAdvPreferencesBase.cpp:527
+#: DlgAdvPreferencesBase.cpp:256 DlgAdvPreferencesBase.cpp:517
 msgid "Day-of-week override:"
 msgstr "Dia semanal dominante:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:266
-#: clientgui/DlgAdvPreferencesBase.cpp:532
+#: DlgAdvPreferencesBase.cpp:261 DlgAdvPreferencesBase.cpp:522
 msgid "check box to specify hours for this day of week"
 msgstr "selecione esta caixa para especificar horário para este dia da semana"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:272
-#: clientgui/DlgAdvPreferencesBase.cpp:538
+#: DlgAdvPreferencesBase.cpp:267 DlgAdvPreferencesBase.cpp:528
 msgid "Monday"
 msgstr "Segunda-feira"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:279
-#: clientgui/DlgAdvPreferencesBase.cpp:545
+#: DlgAdvPreferencesBase.cpp:274 DlgAdvPreferencesBase.cpp:535
 msgid "Tuesday"
 msgstr "Terça-feira"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:286
-#: clientgui/DlgAdvPreferencesBase.cpp:552
+#: DlgAdvPreferencesBase.cpp:281 DlgAdvPreferencesBase.cpp:542
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:293
-#: clientgui/DlgAdvPreferencesBase.cpp:559
+#: DlgAdvPreferencesBase.cpp:288 DlgAdvPreferencesBase.cpp:549
 msgid "Thursday"
 msgstr "Quinta-feira"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:300
-#: clientgui/DlgAdvPreferencesBase.cpp:566
+#: DlgAdvPreferencesBase.cpp:295 DlgAdvPreferencesBase.cpp:556
 msgid "Friday"
 msgstr "Sexta-feira"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:307
-#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: DlgAdvPreferencesBase.cpp:302 DlgAdvPreferencesBase.cpp:563
 msgid "Saturday"
 msgstr "Sábado"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:580
+#: DlgAdvPreferencesBase.cpp:309 DlgAdvPreferencesBase.cpp:570
 msgid "Sunday"
 msgstr "Domingo"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:328
+#: DlgAdvPreferencesBase.cpp:323
 msgid "Other options"
 msgstr "Outras opções"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:336
+#: DlgAdvPreferencesBase.cpp:330
 msgid "Switch between applications every"
 msgstr "Alternar entre aplicações a cada"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:345
+#: DlgAdvPreferencesBase.cpp:339
 msgid "On multiprocessor systems, use at most"
 msgstr "Em sistemas multiprocessados, usar ao máximo"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
+#: DlgAdvPreferencesBase.cpp:346
 #, no-c-format
-msgid "% of the processors (0 means no restriction)"
+msgid "% of the processors (0 means ignore this setting)"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:355
-#: clientgui/DlgAdvPreferencesBase.cpp:618
-#: clientgui/DlgAdvPreferencesBase.cpp:640
-#: clientgui/DlgAdvPreferencesBase.cpp:661
-#: clientgui/DlgAdvPreferencesBase.cpp:683
-#: clientgui/DlgAdvPreferencesBase.cpp:694
+#: DlgAdvPreferencesBase.cpp:349 DlgAdvPreferencesBase.cpp:605
+#: DlgAdvPreferencesBase.cpp:627 DlgAdvPreferencesBase.cpp:648
+#: DlgAdvPreferencesBase.cpp:669 DlgAdvPreferencesBase.cpp:679
 msgid "Use at most"
 msgstr "Usar ao máximo"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:362
+#: DlgAdvPreferencesBase.cpp:356
 #, no-c-format
-msgid "% of CPU time (0 means no restriction)"
-msgstr ""
+msgid "% CPU time"
+msgstr "% de tempo da CPU"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:386
+#: DlgAdvPreferencesBase.cpp:378
 msgid "General options"
 msgstr "Opções gerais"
 
 # "download" is a known and very used word among computer users on Brazil, and has no good translation in this context. Translating it may be unbecoming.
-#: clientgui/DlgAdvPreferencesBase.cpp:395
+#: DlgAdvPreferencesBase.cpp:386
 msgid "Maximum download rate"
 msgstr "Taxa máxima de download"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:401
-#: clientgui/DlgAdvPreferencesBase.cpp:410
-msgid "KBytes/second (0 means no restriction)"
-msgstr ""
+#: DlgAdvPreferencesBase.cpp:392 DlgAdvPreferencesBase.cpp:401
+msgid "KBytes/sec."
+msgstr "KBytes/s."
 
 # "upload" is a known and very used term among computer users on Brazil. There is no good translation for it on this context.
-#: clientgui/DlgAdvPreferencesBase.cpp:404
+#: DlgAdvPreferencesBase.cpp:395
 msgid "Maximum upload rate"
 msgstr "Taxa máxima de upload"
 
+#: DlgAdvPreferencesBase.cpp:406
+msgid "Transfer at most"
+msgstr "Transferir ao máximo"
+
+#: DlgAdvPreferencesBase.cpp:412
+msgid "Mbytes"
+msgstr "Mbytes"
+
+#: DlgAdvPreferencesBase.cpp:415
+msgid "every"
+msgstr "a cada"
+
+#: DlgAdvPreferencesBase.cpp:421 DlgAdvPreferencesBase.cpp:444
+#: DlgAdvPreferencesBase.cpp:463
+msgid "days"
+msgstr "dias"
+
 # "buffer" is a known and very used word among computer users on Brazil. There is no good translation for it.
-#: clientgui/DlgAdvPreferencesBase.cpp:417
+#: DlgAdvPreferencesBase.cpp:429
 #, fuzzy
 msgid "Minimum work buffer"
 msgstr "Buffer de trabalho adicional"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:425
+#: DlgAdvPreferencesBase.cpp:438
 msgid "Try to maintain enough tasks to keep busy for this many days"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:431
-#: clientgui/DlgAdvPreferencesBase.cpp:449
-msgid "days (maximum value: 10)"
-msgstr ""
-
 # "buffer" is a known and very used word among computer users on Brazil. There is no good translation for it.
-#: clientgui/DlgAdvPreferencesBase.cpp:437
+#: DlgAdvPreferencesBase.cpp:450
 #, fuzzy
 msgid "Max additional work buffer"
 msgstr "Buffer de trabalho adicional"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:445
+#: DlgAdvPreferencesBase.cpp:459
 msgid "In addition, maintain enough tasks for up to this many days"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:454
-msgid "Transfer at most"
-msgstr "Transferir ao máximo"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:462
-msgid "MBytes every"
-msgstr ""
-
-#: clientgui/DlgAdvPreferencesBase.cpp:468
-msgid "days (0 means no restriction)"
-msgstr ""
-
-#: clientgui/DlgAdvPreferencesBase.cpp:476
+#: DlgAdvPreferencesBase.cpp:466
 msgid "Skip image file verification"
 msgstr "Omitir verificação de arquivos de imagens"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:478
+#: DlgAdvPreferencesBase.cpp:468
 msgid "check this if your Internet provider modifies image files"
 msgstr "selecione isso se seu provedor de Internet modifica arquivos de imagens"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:484
+#: DlgAdvPreferencesBase.cpp:476
 msgid "Connect options"
 msgstr "Opções de conexão"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:487
+#: DlgAdvPreferencesBase.cpp:478
 msgid "Confirm before connecting to internet"
 msgstr "Confirmar antes de conectar-se à internet"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
-msgstr "se selecionado, uma caixa de texto de confirmação será exibida antes de tentar conectar-se à Internet"
+#: DlgAdvPreferencesBase.cpp:480
+msgid ""
+"if checked, a confirmation dialog will be displayed before trying to connect "
+"to the Internet"
+msgstr ""
+"se selecionado, uma caixa de texto de confirmação será exibida antes de "
+"tentar conectar-se à Internet"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:493
+#: DlgAdvPreferencesBase.cpp:484
 msgid "Disconnect when done"
 msgstr "Desconectar quando pronto"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:495
+#: DlgAdvPreferencesBase.cpp:486
 msgid ""
 "if checked, BOINC hangs up when network usage is done\n"
 "(only relevant for dialup-connection)"
@@ -1489,217 +1495,199 @@ msgstr ""
 "se selecionado, o BOINC irá desligar quando finalizar o uso de rede\n"
 "(relevante somente para conexão discada)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:501
+#: DlgAdvPreferencesBase.cpp:492
 msgid "Network usage allowed"
 msgstr "Uso de rede permitido"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:510
+#: DlgAdvPreferencesBase.cpp:500
 msgid "network usage start hour"
 msgstr "horário de início do uso de rede"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:518
+#: DlgAdvPreferencesBase.cpp:508
 msgid "network usage stop hour"
 msgstr "horário de término do uso de rede"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:610
-#: clientgui/DlgItemProperties.cpp:257
+#: DlgAdvPreferencesBase.cpp:598 DlgItemProperties.cpp:231
 msgid "Disk usage"
 msgstr "Utilização de disco"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:622
+#: DlgAdvPreferencesBase.cpp:609
 msgid "the maximum disk space used by BOINC (in Gigabytes)"
 msgstr "o máximo uso de disco pelo BOINC (em Gigabytes)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:626
-msgid "Gigabytes disk space (0 means no restriction)"
-msgstr ""
+#: DlgAdvPreferencesBase.cpp:613
+msgid "Gigabytes disk space"
+msgstr "Gigabytes de espaço em disco"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:629
+#: DlgAdvPreferencesBase.cpp:616
 msgid "Leave at least"
 msgstr "Deixar ao menos"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:633
+#: DlgAdvPreferencesBase.cpp:620
 msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
-msgstr "BOINC deixa ao menos esta quantidade de espaço livre em disco (em Gibabytes)"
+msgstr ""
+"BOINC deixa ao menos esta quantidade de espaço livre em disco (em Gibabytes)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:637
+#: DlgAdvPreferencesBase.cpp:624
 msgid "Gigabytes disk space free"
 msgstr "Gigabytes de espaço livre em disco"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
+#: DlgAdvPreferencesBase.cpp:631
 msgid "BOINC uses at most this percentage of total disk space"
 msgstr "BOINC usa ao máximo esta porcentagem do espaço total em disco"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:649
+#: DlgAdvPreferencesBase.cpp:636
 #, no-c-format
 msgid "% of total disk space"
 msgstr "% do espaço total em disco"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:652
+#: DlgAdvPreferencesBase.cpp:639
 #, fuzzy
 msgid "Tasks checkpoint to disk at most every"
 msgstr "Tarefas verificam disco ao máximo a cada"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
+#: DlgAdvPreferencesBase.cpp:645
 msgid "seconds"
 msgstr "segundos"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:668
+#: DlgAdvPreferencesBase.cpp:655
 #, no-c-format
 msgid "% of page file (swap space)"
 msgstr "% do arquivo de página (espaço de troca)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:675
+#: DlgAdvPreferencesBase.cpp:662
 msgid "Memory usage"
 msgstr "Utilização de memória"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
+#: DlgAdvPreferencesBase.cpp:676
 #, no-c-format
 msgid "% when computer is in use"
 msgstr "% quando o computador está em uso"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:701
+#: DlgAdvPreferencesBase.cpp:686
 #, no-c-format
 msgid "% when computer is idle"
 msgstr "% quando o computador está ocioso"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:706
+#: DlgAdvPreferencesBase.cpp:691
 msgid "Leave applications in memory while suspended"
 msgstr "Deixar aplicações em memória enquanto suspensas"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:708
+#: DlgAdvPreferencesBase.cpp:693
 msgid "if checked, suspended work units are left in memory"
 msgstr "se selecionado, unidades de trabalho suspensas são deixadas em memória"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:728
-msgid "Suspend processor and network usage when these applications are running:"
+#: DlgAdvPreferencesBase.cpp:713
+msgid ""
+"Suspend processor and network usage when these applications are running:"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:738
+#: DlgAdvPreferencesBase.cpp:722
 msgid "Add..."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:739
+#: DlgAdvPreferencesBase.cpp:723
 msgid "Add an application to this list"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:744
+#: DlgAdvPreferencesBase.cpp:728 ViewProjects.cpp:202
+#: sg_ProjectCommandPopup.cpp:85
 msgid "Remove"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:745
+#: DlgAdvPreferencesBase.cpp:729
 msgid "Remove an application from this list"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:754
+#: DlgAdvPreferencesBase.cpp:738
 msgid "For advanced options, refer to "
 msgstr ""
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:65
-#, c-format
-msgid "%s Diagnostic Log Flags"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:83
-msgid "These flags enable various types of diagnostic messages in the Event Log."
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:105
-msgid "Save all values and close the dialog"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:108
-msgid "Defaults"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:109
-msgid "Restore default settings"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:113
-msgid "Close the dialog without saving"
-msgstr ""
-
-#: clientgui/DlgEventLog.cpp:226
+#: DlgEventLog.cpp:219
 #, c-format
 msgid "%s - Event Log"
 msgstr "%s - Registro de Eventos"
 
-#: clientgui/DlgEventLog.cpp:236
+#: DlgEventLog.cpp:232 ViewMessages.cpp:117 ViewProjects.cpp:219
+#: ViewStatistics.cpp:435 ViewStatistics.cpp:2009 ViewTransfers.cpp:182
+#: ViewWork.cpp:232
 msgid "Project"
 msgstr "Projeto"
 
 # "Time" can be translated in several ways. At this context (I know where it will be placed), "Momento" fits very well.
-#: clientgui/DlgEventLog.cpp:237
+#: DlgEventLog.cpp:233 ViewMessages.cpp:118
 msgid "Time"
 msgstr "Momento"
 
-#: clientgui/DlgEventLog.cpp:238
+#: DlgEventLog.cpp:234 ViewMessages.cpp:119
 msgid "Message"
 msgstr "Mensagem"
 
-#: clientgui/DlgEventLog.cpp:300
-#: clientgui/DlgEventLog.cpp:364
+#: DlgEventLog.cpp:290 DlgEventLog.cpp:354
 #, fuzzy
 msgid "&Show only this project"
 msgstr "Mostrar somente este projeto"
 
-#: clientgui/DlgEventLog.cpp:304
+#: DlgEventLog.cpp:294
 #, fuzzy
 msgid "Copy &All"
 msgstr "Copiar Tudo"
 
-#: clientgui/DlgEventLog.cpp:306
-#: clientgui/DlgEventLog.cpp:310
+#: DlgEventLog.cpp:296 DlgEventLog.cpp:300 ViewMessages.cpp:89
 msgid "Copy all the messages to the clipboard."
 msgstr "Copiar todas as mensagens para a área de transferência."
 
-#: clientgui/DlgEventLog.cpp:315
+#: DlgEventLog.cpp:305
 #, fuzzy
 msgid "Copy &Selected"
 msgstr "Copiar Seleção"
 
-#: clientgui/DlgEventLog.cpp:318
-#: clientgui/DlgEventLog.cpp:326
-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 "Copia as mensagens selecionadas para a área de transferência. Você pode selecionar múltiplas mensagens mantendo shift pressionado ou tecla de comando enquanto clica nas mensagens."
+#: DlgEventLog.cpp:308 DlgEventLog.cpp:316 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 ""
+"Copia as mensagens selecionadas para a área de transferência. Você pode "
+"selecionar múltiplas mensagens mantendo shift pressionado ou tecla de "
+"comando enquanto clica nas mensagens."
 
-#: clientgui/DlgEventLog.cpp:320
-#: clientgui/DlgEventLog.cpp:328
-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 "Copia as mensagens selecionadas para a área de transferência. Você pode selecionar múltiplas mensagens mantendo pressionado shift ou tecla de controle enquanto clica nas mensagens."
+#: DlgEventLog.cpp:310 DlgEventLog.cpp:318 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 ""
+"Copia as mensagens selecionadas para a área de transferência. Você pode "
+"selecionar múltiplas mensagens mantendo pressionado shift ou tecla de "
+"controle enquanto clica nas mensagens."
 
-#: clientgui/DlgEventLog.cpp:335
-#: clientgui/DlgItemProperties.cpp:67
+#: DlgEventLog.cpp:325 DlgItemProperties.cpp:67
 msgid "&Close"
 msgstr "&Fechar"
 
-#: clientgui/DlgEventLog.cpp:344
+#: DlgEventLog.cpp:334 sg_BoincSimpleFrame.cpp:798 sg_DlgPreferences.cpp:442
 #, c-format
 msgid "Get help with %s"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:358
+#: DlgEventLog.cpp:348
 #, fuzzy
 msgid "Show all &messages"
 msgstr "Mostrar todas as mensagens"
 
-#: clientgui/DlgEventLog.cpp:359
-#: clientgui/DlgEventLog.cpp:361
+#: DlgEventLog.cpp:349 DlgEventLog.cpp:351
 msgid "Show messages for all projects"
 msgstr "Mostrar mensagens de todos os projetos"
 
-#: clientgui/DlgEventLog.cpp:365
-#: clientgui/DlgEventLog.cpp:367
+#: DlgEventLog.cpp:355 DlgEventLog.cpp:357
 msgid "Show only the messages for the selected project"
 msgstr "Mostrar somente mensagens do projeto selecionado"
 
-#: clientgui/DlgExitMessage.cpp:82
+#: DlgExitMessage.cpp:82
 #, c-format
 msgid "%s - Exit Confirmation"
 msgstr "%s - Confirmação de Saída"
 
-#: clientgui/DlgExitMessage.cpp:130
+#: DlgExitMessage.cpp:130
 #, c-format
 msgid ""
 "You have requested to exit the %s,\n"
@@ -1710,8 +1698,9 @@ msgid ""
 "choose from the following options:"
 msgstr ""
 
-#: clientgui/DlgExitMessage.cpp:135
+#: DlgExitMessage.cpp:135
 #, c-format
+#, fuzzy, c-format
 msgid ""
 "This will shut down %s and its tasks until either the\n"
 "%s or the %s screen saver is run again.\n"
@@ -1727,866 +1716,852 @@ msgstr ""
 "ao invés de sair da aplicação; aquela permitirá %s a executar suas\n"
 "tarefas nos momentos que selecionou em suas preferências."
 
-#: clientgui/DlgExitMessage.cpp:153
+#: DlgExitMessage.cpp:153
 #, c-format
 msgid "Stop running tasks when exiting the %s"
 msgstr ""
 
-#: clientgui/DlgExitMessage.cpp:165
+#: DlgExitMessage.cpp:165
 msgid "Remember this decision and do not show this dialog."
 msgstr "Lembrar esta 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
+#: DlgExitMessage.cpp:178 DlgGenericMessage.cpp:125 DlgOptions.cpp:401
+#: DlgSelectComputer.cpp:168 wizardex.cpp:378
 msgid "&Cancel"
 msgstr "&Cancelar"
 
-#: clientgui/DlgGenericMessage.cpp:112
+#: DlgGenericMessage.cpp:112
 msgid "Don't show this dialog again."
 msgstr "Não mostrar esta caixa de diálogo novamente."
 
-#: clientgui/DlgItemProperties.cpp:194
-#: clientgui/DlgItemProperties.cpp:197
-#: clientgui/DlgItemProperties.cpp:200
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:168 DlgItemProperties.cpp:171
+#: DlgItemProperties.cpp:174 DlgItemProperties.cpp:177
 #, fuzzy
 msgid "Don't fetch tasks for "
 msgstr "Não buscar tarefas de CPU"
 
-#: clientgui/DlgItemProperties.cpp:194
+#: DlgItemProperties.cpp:168
 msgid "Project preference"
 msgstr "Preferência do projeto"
 
-#: clientgui/DlgItemProperties.cpp:197
+#: DlgItemProperties.cpp:171
 #, fuzzy
 msgid "Account manager preference"
 msgstr "Página do gerenciador de contas na internet"
 
-#: clientgui/DlgItemProperties.cpp:200
+#: DlgItemProperties.cpp:174
 msgid "Project has no apps for "
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:177
 msgid "Client configuration excludes "
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:207
+#: DlgItemProperties.cpp:181
 #, fuzzy
 msgid " work fetch deferred for"
 msgstr "Busca de trabalho de CPU diferido por"
 
-#: clientgui/DlgItemProperties.cpp:208
+#: DlgItemProperties.cpp:182
 #, fuzzy
 msgid " work fetch deferral interval"
 msgstr "Intervalo de diferimento de busca de trabalho de CPU"
 
-#: clientgui/DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:213
 msgid "Properties of project "
 msgstr "Propriedades do projeto"
 
-#: clientgui/DlgItemProperties.cpp:243
-#: clientgui/DlgOptions.cpp:221
+#: DlgItemProperties.cpp:217 DlgOptions.cpp:218
 msgid "General"
 msgstr "Geral"
 
-#: clientgui/DlgItemProperties.cpp:244
+#: DlgItemProperties.cpp:218
 msgid "Master URL"
 msgstr "URL mestre"
 
-#: clientgui/DlgItemProperties.cpp:245
+#: DlgItemProperties.cpp:219
 msgid "User name"
 msgstr "Nome do usuário"
 
-#: clientgui/DlgItemProperties.cpp:246
+#: DlgItemProperties.cpp:220
 msgid "Team name"
 msgstr "Nome do time"
 
-#: clientgui/DlgItemProperties.cpp:247
+#: DlgItemProperties.cpp:221 ViewProjects.cpp:224
 msgid "Resource share"
 msgstr "Compartilhamento de recursos"
 
-#: clientgui/DlgItemProperties.cpp:249
+#: DlgItemProperties.cpp:223
 msgid "Scheduler RPC deferred for"
 msgstr "Escalonador RPC diferido para"
 
-#: clientgui/DlgItemProperties.cpp:252
+#: DlgItemProperties.cpp:226
 msgid "File downloads deferred for"
 msgstr "Download de arquivos diferido para"
 
-#: clientgui/DlgItemProperties.cpp:255
+#: DlgItemProperties.cpp:229
 msgid "File uploads deferred for"
 msgstr "Upload de arquivos diferido para"
 
-#: clientgui/DlgItemProperties.cpp:258
+#: DlgItemProperties.cpp:232
 msgid "Computer ID"
 msgstr "ID do computador"
 
-#: clientgui/DlgItemProperties.cpp:260
+#: DlgItemProperties.cpp:234
 msgid "Non CPU intensive"
 msgstr "Não-intensivo de CPU"
 
-#: 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
+#: DlgItemProperties.cpp:234 DlgItemProperties.cpp:236
+#: DlgItemProperties.cpp:237 DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:242 DlgItemProperties.cpp:251
+#: DlgItemProperties.cpp:254 DlgItemProperties.cpp:257
 msgid "yes"
 msgstr "sim"
 
-#: clientgui/DlgItemProperties.cpp:262
+#: DlgItemProperties.cpp:236
 msgid "Suspended via GUI"
 msgstr "Suspenso via GUI"
 
-#: clientgui/DlgItemProperties.cpp:262
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:236 DlgItemProperties.cpp:237
 msgid "no"
 msgstr "não"
 
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:237
 msgid "Don't request more work"
 msgstr "Não solicitar mais trabalho"
 
-#: clientgui/DlgItemProperties.cpp:265
+#: DlgItemProperties.cpp:239
 msgid "Scheduler call in progress"
 msgstr "Chamada do escalonador em progresso"
 
-#: clientgui/DlgItemProperties.cpp:268
+#: DlgItemProperties.cpp:242
 msgid "Trickle-up pending"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:271
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:245 DlgItemProperties.cpp:247
 msgid "Host location"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:247
 #, fuzzy
 msgid "default"
 msgstr "&Definir Padrão"
 
-#: clientgui/DlgItemProperties.cpp:277
+#: DlgItemProperties.cpp:251
 msgid "Added via account manager"
 msgstr "Adicionado via gerenciador de contas"
 
-#: clientgui/DlgItemProperties.cpp:280
+#: DlgItemProperties.cpp:254
 msgid "Remove when tasks done"
 msgstr "Remover quando tarefas concluídas"
 
-#: clientgui/DlgItemProperties.cpp:283
+#: DlgItemProperties.cpp:257
 msgid "Ended"
 msgstr "Finalizado"
 
-#: clientgui/DlgItemProperties.cpp:285
-msgid "Tasks completed"
-msgstr ""
-
-#: clientgui/DlgItemProperties.cpp:286
-msgid "Tasks failed"
-msgstr ""
-
-#: clientgui/DlgItemProperties.cpp:288
+#: DlgItemProperties.cpp:259
 msgid "Credit"
 msgstr "Crédito"
 
-#: clientgui/DlgItemProperties.cpp:289
+#: DlgItemProperties.cpp:260
 msgid "User"
 msgstr "Usuário"
 
-#: clientgui/DlgItemProperties.cpp:296
+#: DlgItemProperties.cpp:267
 msgid "Host"
 msgstr "Máquina"
 
-#: clientgui/DlgItemProperties.cpp:305
+#: DlgItemProperties.cpp:276
 msgid "Scheduling"
 msgstr "Escalonamento"
 
-#: clientgui/DlgItemProperties.cpp:306
+#: DlgItemProperties.cpp:277
 #, fuzzy
 msgid "Scheduling priority"
 msgstr "Prioridade de escalonamento da CPU"
 
-#: clientgui/DlgItemProperties.cpp:307
+#: DlgItemProperties.cpp:278
 msgid "CPU"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:331
+#: DlgItemProperties.cpp:302
 msgid "Duration correction factor"
 msgstr "Fator de correção de duração"
 
-#: clientgui/DlgItemProperties.cpp:345
+#: DlgItemProperties.cpp:316
 msgid "Properties of task "
 msgstr "Propriedades da tarefa"
 
-#: clientgui/DlgItemProperties.cpp:357
+#: DlgItemProperties.cpp:328 ViewWork.cpp:238
 msgid "Application"
 msgstr "Aplicação"
 
-#: clientgui/DlgItemProperties.cpp:358
+#: DlgItemProperties.cpp:329 ViewWork.cpp:239
 msgid "Name"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:359
+#: DlgItemProperties.cpp:330
 msgid "State"
 msgstr "Estado"
 
-#: clientgui/DlgItemProperties.cpp:362
+#: DlgItemProperties.cpp:333
 msgid "Received"
 msgstr "Recebido(s)"
 
-#: clientgui/DlgItemProperties.cpp:365
+#: DlgItemProperties.cpp:336
 msgid "Report deadline"
 msgstr "Prazo de relatório"
 
-#: clientgui/DlgItemProperties.cpp:367
+#: DlgItemProperties.cpp:338
 msgid "Resources"
 msgstr "Recursos"
 
-#: clientgui/DlgItemProperties.cpp:370
+#: DlgItemProperties.cpp:341
 msgid "Estimated computation size"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:373
+#: DlgItemProperties.cpp:344
 msgid "CPU time at last checkpoint"
 msgstr "Tempo de CPU no último ponto de verificação"
 
-#: clientgui/DlgItemProperties.cpp:374
-#: clientgui/DlgItemProperties.cpp:389
+#: DlgItemProperties.cpp:345 DlgItemProperties.cpp:360
 msgid "CPU time"
 msgstr "Tempo de CPU"
 
-#: clientgui/DlgItemProperties.cpp:376
-#: clientgui/DlgItemProperties.cpp:390
+#: DlgItemProperties.cpp:347 DlgItemProperties.cpp:361
 msgid "Elapsed time"
 msgstr "Tempo decorrido"
 
-#: clientgui/DlgItemProperties.cpp:378
+#: DlgItemProperties.cpp:349
 msgid "Estimated time remaining"
 msgstr "Tempo restante estimado"
 
-#: clientgui/DlgItemProperties.cpp:379
+#: DlgItemProperties.cpp:350
 msgid "Fraction done"
 msgstr "Fração concluída"
 
-#: clientgui/DlgItemProperties.cpp:380
+#: DlgItemProperties.cpp:351
 msgid "Virtual memory size"
 msgstr "Tamanho de memória virtual"
 
-#: clientgui/DlgItemProperties.cpp:381
+#: DlgItemProperties.cpp:352
 msgid "Working set size"
 msgstr "Tamanho do conjunto de trabalho"
 
-#: clientgui/DlgItemProperties.cpp:383
+#: DlgItemProperties.cpp:354
 msgid "Directory"
 msgstr "Diretório"
 
-#: clientgui/DlgItemProperties.cpp:386
+#: DlgItemProperties.cpp:357
 msgid "Process ID"
 msgstr "ID do processo"
 
-#: clientgui/DlgItemProperties.cpp:456
+#: DlgItemProperties.cpp:427 ViewWork.cpp:1032 sg_TaskPanel.cpp:823
 msgid "Local: "
 msgstr "Local:"
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: DlgOptions.cpp:129 DlgOptions.cpp:135
 msgid "Options"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:178
+#: DlgOptions.cpp:175
 msgid "Language:"
 msgstr "Idioma:"
 
-#: clientgui/DlgOptions.cpp:185
+#: DlgOptions.cpp:182
 msgid "What language should BOINC use?"
 msgstr "Que idioma o BOINC deve usar?"
 
-#: clientgui/DlgOptions.cpp:189
+#: DlgOptions.cpp:186
 #, fuzzy
 msgid "Notice reminder interval:"
 msgstr ""
 "Intervalo de aviso:\n"
 "(minutos; 0 significa nenhum lembrete)"
 
-#: clientgui/DlgOptions.cpp:196
+#: DlgOptions.cpp:193
 msgid "How often should BOINC remind you of new notices?"
 msgstr "Com que frequência o BOINC deve lembrá-lo de novos avisos?"
 
 # "login" is a known and very used word among computer users on Brazil. There is no good translation for it.
-#: clientgui/DlgOptions.cpp:201
+#: DlgOptions.cpp:198
 msgid "Run Manager at login?"
 msgstr "Executar Gerenciador ao entrar no sistema?"
 
-#: clientgui/DlgOptions.cpp:207
+#: DlgOptions.cpp:204
 msgid "Run the BOINC Manager when you log on."
 msgstr "Executa o Gerenciador BOINC quando você entra no sistema."
 
-#: clientgui/DlgOptions.cpp:212
+#: DlgOptions.cpp:209
 msgid "Enable Manager exit dialog?"
 msgstr "Ativar caixa de diálogo de saída do Gerenciador ?"
 
-#: clientgui/DlgOptions.cpp:218
+#: DlgOptions.cpp:215
 msgid "Display the exit dialog when shutting down the Manager."
 msgstr "Exibir caixa de diálogo de saída quando encerrar o Gerenciador."
 
-#: clientgui/DlgOptions.cpp:229
+#: DlgOptions.cpp:226
 msgid "Dial-up and Virtual Private Network settings"
 msgstr "Configurações de Rede Privada Virtual e Conexão Discada"
 
-#: clientgui/DlgOptions.cpp:243
+#: DlgOptions.cpp:240
 msgid "&Set Default"
 msgstr "&Definir Padrão"
 
-#: clientgui/DlgOptions.cpp:248
+#: DlgOptions.cpp:245
 msgid "&Clear Default"
 msgstr "&Limpar Padrão"
 
-#: clientgui/DlgOptions.cpp:255
+#: DlgOptions.cpp:252
 msgid "Default Connection:"
 msgstr "Conexão Padrão:"
 
-#: clientgui/DlgOptions.cpp:262
+#: DlgOptions.cpp:259
 msgid "Connections"
 msgstr "Conexões"
 
 # "proxy" is a known and very used word among computer users on Brazil. There is no good translation for it.
-#: clientgui/DlgOptions.cpp:271
+#: DlgOptions.cpp:268
 msgid "Connect via HTTP proxy server"
 msgstr "Conectar via servidor proxy HTTP"
 
 # "proxy" is a known and very used word among computer users on Brazil. There is no good translation for it.
-#: clientgui/DlgOptions.cpp:275
+#: DlgOptions.cpp:272
 msgid "HTTP Proxy Server Configuration"
 msgstr "Configuração de Servidor Proxy HTTP"
 
-#: clientgui/DlgOptions.cpp:283
-#: clientgui/DlgOptions.cpp:347
+#: DlgOptions.cpp:280 DlgOptions.cpp:344
 msgid "Address:"
 msgstr "Endereço:"
 
-#: clientgui/DlgOptions.cpp:291
-#: clientgui/DlgOptions.cpp:355
+#: DlgOptions.cpp:288 DlgOptions.cpp:352 ProxyPage.cpp:340 ProxyPage.cpp:360
 msgid "Port:"
 msgstr "Porta:"
 
-#: clientgui/DlgOptions.cpp:299
-#: clientgui/DlgOptions.cpp:363
+#: DlgOptions.cpp:296 DlgOptions.cpp:360
 msgid "Don't use proxy for:"
 msgstr "Não usar proxy para:"
 
-#: clientgui/DlgOptions.cpp:306
-#: clientgui/DlgOptions.cpp:370
+#: DlgOptions.cpp:303 DlgOptions.cpp:367
 msgid "Leave these blank if not needed"
 msgstr "Deixar estes em branco se desnecessários"
 
-#: clientgui/DlgOptions.cpp:312
-#: clientgui/DlgOptions.cpp:376
+#: DlgOptions.cpp:309 DlgOptions.cpp:373 ProxyPage.cpp:343 ProxyPage.cpp:363
 msgid "User Name:"
 msgstr "Nome do Usuário:"
 
-#: clientgui/DlgOptions.cpp:320
-#: clientgui/DlgOptions.cpp:384
-#: clientgui/DlgSelectComputer.cpp:152
+#: DlgOptions.cpp:317 DlgOptions.cpp:381 DlgSelectComputer.cpp:152
+#: ProxyPage.cpp:346 ProxyPage.cpp:366
 msgid "Password:"
 msgstr "Senha:"
 
 # "proxy" is a known and very used word among computer users on Brazil. I believe translating it may be unbecoming.
-#: clientgui/DlgOptions.cpp:327
+#: DlgOptions.cpp:324
 msgid "HTTP Proxy"
 msgstr "Proxy HTTP"
 
 # "proxy" is a known and very used word among computer users on Brazil. I believe translating it may be unbecoming.
-#: clientgui/DlgOptions.cpp:335
+#: DlgOptions.cpp:332
 msgid "Connect via SOCKS proxy server"
 msgstr "Conectar via servidor proxy SOCKS"
 
 # "proxy" is a known and very used word among computer users on Brazil. I believe translating it may be unbecoming.
-#: clientgui/DlgOptions.cpp:339
+#: DlgOptions.cpp:336
 msgid "SOCKS Proxy Server Configuration"
 msgstr "Configuração do Servidor Proxy SOCKS"
 
 # "proxy" is a known and very used word among computer users on Brazil. I believe translating it may be unbecoming.
-#: clientgui/DlgOptions.cpp:391
+#: DlgOptions.cpp:388
 msgid "SOCKS Proxy"
 msgstr "Proxy SOCKS"
 
-#: clientgui/DlgOptions.cpp:589
+#: DlgOptions.cpp:586
 #, fuzzy
 msgid "always"
 msgstr "&Executar sempre"
 
-#: clientgui/DlgOptions.cpp:590
+#: DlgOptions.cpp:587
 msgid "1 hour"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:591
+#: DlgOptions.cpp:588
 msgid "6 hours"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:592
+#: DlgOptions.cpp:589
 #, fuzzy
 msgid "1 day"
 msgstr "dias"
 
-#: clientgui/DlgOptions.cpp:593
+#: DlgOptions.cpp:590
 msgid "1 week"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:594
+#: DlgOptions.cpp:591
 #, fuzzy
 msgid "never"
 msgstr "a cada"
 
-#: clientgui/DlgOptions.cpp:691
+#: DlgOptions.cpp:688
 #, c-format
 msgid "%s - Language Selection"
 msgstr "%s - Seleção de Idioma"
 
-#: clientgui/DlgOptions.cpp:698
+#: DlgOptions.cpp:695
 #, c-format
-msgid "The %s's language has been changed.  In order for this change to take effect, you must restart the %s."
-msgstr "O idioma padrão de %s foi alterado. Você deve reinicializar o %s para que esta alteração tenha efeito."
+#, fuzzy, c-format
+msgid ""
+"The %s's language has been changed.  In order for this change to take "
+"effect, you must restart the %s."
+msgstr ""
+"O idioma padrão de %s foi alterado. Você deve reinicializar o %s para que "
+"esta alteração tenha efeito."
 
-#: clientgui/DlgSelectComputer.cpp:91
+#: DlgSelectComputer.cpp:91
 #, c-format
 msgid "%s - Select Computer"
 msgstr "%s - Selecione o Computador"
 
-#: clientgui/DlgSelectComputer.cpp:125
+#: DlgSelectComputer.cpp:125
 #, c-format
 msgid ""
 "Another instance of %s is already running \n"
 "on this computer.  Please select a client to monitor."
 msgstr ""
 
-#: clientgui/DlgSelectComputer.cpp:143
+#: DlgSelectComputer.cpp:143
 msgid "Host name:"
 msgstr "Nome de máquina:"
 
-#: clientgui/Localization.cpp:31
-#: clientgui/Localization.cpp:69
+#: Localization.cpp:31 Localization.cpp:69
 msgid "Message boards"
 msgstr "Quadros de mensagens"
 
-#: clientgui/Localization.cpp:33
+#: Localization.cpp:33
 msgid "Correspond with other users on the SETI at home message boards"
 msgstr "Correspondem com outros usuários nos quadros de mensagens do SETI at home"
 
-#: clientgui/Localization.cpp:37
+#: Localization.cpp:37
 msgid "Ask questions and report problems"
 msgstr "Faça perguntas e relate problemas"
 
-#: clientgui/Localization.cpp:39
-#: clientgui/Localization.cpp:81
-#: clientgui/Localization.cpp:111
-#: clientgui/Localization.cpp:129
+#: Localization.cpp:39 Localization.cpp:81 Localization.cpp:111
+#: Localization.cpp:129
 msgid "Your account"
 msgstr "Sua conta"
 
-#: clientgui/Localization.cpp:41
-#: clientgui/Localization.cpp:87
-#: clientgui/Localization.cpp:113
+#: Localization.cpp:41 Localization.cpp:87 Localization.cpp:113
 msgid "View your account information and credit totals"
 msgstr "Visualize suas informações de conta e créditos totais"
 
-#: clientgui/Localization.cpp:43
+#: Localization.cpp:43
 msgid "Your preferences"
 msgstr "Suas preferências"
 
-#: clientgui/Localization.cpp:45
+#: Localization.cpp:45
 msgid "View and modify your SETI at home account profile and preferences"
 msgstr "Visualize e modifique seu perfil de conta e preferências do SETI at home"
 
-#: clientgui/Localization.cpp:47
-#: clientgui/Localization.cpp:89
+#: Localization.cpp:47 Localization.cpp:89
 msgid "Your results"
 msgstr "Seus resultados"
 
-#: clientgui/Localization.cpp:49
-#: clientgui/Localization.cpp:91
+#: Localization.cpp:49 Localization.cpp:91
 msgid "View your last week (or more) of computational results and work"
-msgstr "Visualize seus resultados de trabalho computacional da última semana (ou mais)"
+msgstr ""
+"Visualize seus resultados de trabalho computacional da última semana (ou "
+"mais)"
 
-#: clientgui/Localization.cpp:51
-#: clientgui/Localization.cpp:93
+#: Localization.cpp:51 Localization.cpp:93
 msgid "Your computers"
 msgstr "Seus computadores"
 
-#: clientgui/Localization.cpp:53
+#: Localization.cpp:53
 msgid "View a listing of all the computers on which you are running SETI at Home"
-msgstr "Visualize uma listagem de todos os computadores nos quais você executa SETI at home"
+msgstr ""
+"Visualize uma listagem de todos os computadores nos quais você executa "
+"SETI at home"
 
-#: clientgui/Localization.cpp:55
-#: clientgui/Localization.cpp:97
+#: Localization.cpp:55 Localization.cpp:97
 msgid "Your team"
 msgstr "Seu time"
 
-#: clientgui/Localization.cpp:57
-#: clientgui/Localization.cpp:99
+#: Localization.cpp:57 Localization.cpp:99
 msgid "View information about your team"
 msgstr "Visualize informações sobre seu time"
 
-#: clientgui/Localization.cpp:61
+#: Localization.cpp:61
 msgid "Common questions"
 msgstr "Questões comuns"
 
-#: clientgui/Localization.cpp:63
+#: Localization.cpp:63
 msgid "Read the Einstein at Home Frequently Asked Question list"
 msgstr "Leia a lista de Perguntas Mais Frequentes do Einstein at Home"
 
-#: clientgui/Localization.cpp:65
+#: Localization.cpp:65
 msgid "Screensaver info"
 msgstr "Informações da proteção de tela"
 
-#: clientgui/Localization.cpp:67
+#: Localization.cpp:67
 msgid "Read a detailed description of the Einstein at Home screensaver"
 msgstr "Leia uma descrição detalhada da proteção de tela do Einstein at Home"
 
-#: clientgui/Localization.cpp:71
-msgid "Correspond with admins and other users on the Einstein at Home message boards"
-msgstr "Correspondem com administradores e outros usuários dos quadros de mensagens do Einstein at Home"
+#: Localization.cpp:71
+msgid ""
+"Correspond with admins and other users on the Einstein at Home message boards"
+msgstr ""
+"Correspondem com administradores e outros usuários dos quadros de mensagens "
+"do Einstein at Home"
 
-#: clientgui/Localization.cpp:73
+#: Localization.cpp:73
 msgid "Einstein status"
 msgstr "Status do Einstein"
 
-#: clientgui/Localization.cpp:75
+#: Localization.cpp:75
 msgid "Current status of the Einstein at Home server"
 msgstr "Status atual do servidor de Einstein at Home"
 
-#: clientgui/Localization.cpp:77
+#: Localization.cpp:77
 msgid "Report problems"
 msgstr "Relatar problemas"
 
-#: clientgui/Localization.cpp:79
+#: Localization.cpp:79
 msgid "A link to the Einstein at Home problems and bug reports message board"
-msgstr "Um link ao quadro de mensagens de relatórios de problemas e defeitos do Einstein at Home"
+msgstr ""
+"Um link ao quadro de mensagens de relatórios de problemas e defeitos do "
+"Einstein at Home"
 
-#: clientgui/Localization.cpp:83
+#: Localization.cpp:83
 msgid "View and modify your Einstein at Home account profile and preferences"
-msgstr "Visualize e modifique seu perfil de conta e preferências do Einstein at Home"
+msgstr ""
+"Visualize e modifique seu perfil de conta e preferências do Einstein at Home"
 
-#: clientgui/Localization.cpp:85
+#: Localization.cpp:85
 msgid "Account summary"
 msgstr "Resumo de conta"
 
-#: clientgui/Localization.cpp:95
-msgid "View a listing of all the computers on which you are running Einstein at Home"
-msgstr "Visualize uma listagem de todos os computadores nos quais você executa Einstein at Home"
+#: Localization.cpp:95
+msgid ""
+"View a listing of all the computers on which you are running Einstein at Home"
+msgstr ""
+"Visualize uma listagem de todos os computadores nos quais você executa "
+"Einstein at Home"
 
-#: clientgui/Localization.cpp:101
+#: Localization.cpp:101
 msgid "LIGO project"
 msgstr "Projeto LIGO"
 
-#: clientgui/Localization.cpp:103
-msgid "The home page of the Laser Interferometer Gravitational-wave Observatory (LIGO) project"
+#: Localization.cpp:103
+msgid ""
+"The home page of the Laser Interferometer Gravitational-wave Observatory "
+"(LIGO) project"
 msgstr ""
 
-#: clientgui/Localization.cpp:105
+#: Localization.cpp:105
 msgid "GEO-600 project"
 msgstr ""
 
-#: clientgui/Localization.cpp:107
+#: Localization.cpp:107
 msgid "The home page of the GEO-600 project"
 msgstr ""
 
-#: clientgui/Localization.cpp:115
-#: clientgui/Localization.cpp:133
+#: Localization.cpp:115 Localization.cpp:133 ViewProjects.cpp:221
+#: ViewStatistics.cpp:465
 msgid "Team"
 msgstr ""
 
-#: clientgui/Localization.cpp:117
+#: Localization.cpp:117
 msgid "Info about your Team"
 msgstr ""
 
-#: clientgui/Localization.cpp:123
+#: Localization.cpp:123
 msgid "Get help for climateprediction.net"
 msgstr ""
 
-#: clientgui/Localization.cpp:125
+#: Localization.cpp:125
 msgid "News"
 msgstr ""
 
-#: clientgui/Localization.cpp:127
+#: Localization.cpp:127
 msgid "climateprediction.net News"
 msgstr ""
 
-#: clientgui/Localization.cpp:131
+#: Localization.cpp:131
 msgid "View your account information, credits, and trickles"
 msgstr ""
 
-#: clientgui/Localization.cpp:135
+#: Localization.cpp:135
 msgid "Info about your team"
 msgstr ""
 
-#: clientgui/Localization.cpp:141
+#: Localization.cpp:141
 msgid "Search for help in our help system"
 msgstr ""
 
-#: clientgui/Localization.cpp:143
+#: Localization.cpp:143
 msgid "Global Statistics"
 msgstr ""
 
-#: clientgui/Localization.cpp:145
+#: Localization.cpp:145
 msgid "Summary statistics for World Community Grid"
 msgstr ""
 
-#: clientgui/Localization.cpp:147
+#: Localization.cpp:147
 msgid "My Grid"
 msgstr ""
 
-#: clientgui/Localization.cpp:149
+#: Localization.cpp:149
 msgid "Your statistics and settings"
 msgstr ""
 
-#: clientgui/Localization.cpp:151
+#: Localization.cpp:151
 msgid "Device Profiles"
 msgstr ""
 
-#: clientgui/Localization.cpp:153
+#: Localization.cpp:153
 msgid "Update your device settings"
 msgstr ""
 
-#: clientgui/Localization.cpp:155
+#: Localization.cpp:155
 msgid "Research"
 msgstr ""
 
-#: clientgui/Localization.cpp:157
+#: Localization.cpp:157
 msgid "Learn about the projects hosted at World Community Grid"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:583
+#: MainDocument.cpp:583
 msgid "Starting client"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:591
+#: MainDocument.cpp:591
 #, fuzzy
 msgid "Connecting to client"
 msgstr "Reconectando ao cliente."
 
-#: clientgui/MainDocument.cpp:1205
+#: MainDocument.cpp:1195
 msgid "Retrieving system state; please wait..."
 msgstr ""
 
-#: clientgui/MainDocument.cpp:1826
+#: MainDocument.cpp:1816
 #, fuzzy
 msgid "Missing application"
 msgstr "Aplicação"
 
-#: clientgui/MainDocument.cpp:1827
-msgid "Please download and install the CoRD application from http://cord.sourceforge.net"
+#: MainDocument.cpp:1817
+msgid ""
+"Please download and install the CoRD application from http://cord."
+"sourceforge.net"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2442
+#: MainDocument.cpp:2432
 msgid "on batteries"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2443
+#: MainDocument.cpp:2433
 #, fuzzy
 msgid "computer is in use"
 msgstr "Enquanto o computador estiver em uso"
 
-#: clientgui/MainDocument.cpp:2444
+#: MainDocument.cpp:2434
 msgid "user request"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2445
+#: MainDocument.cpp:2435
 msgid "time of day"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2446
+#: MainDocument.cpp:2436
 msgid "CPU benchmarks in progress"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2447
+#: MainDocument.cpp:2437
 msgid "need disk space - check preferences"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2448
+#: MainDocument.cpp:2438
 #, fuzzy
 msgid "computer is not in use"
 msgstr "Enquanto o computador estiver em uso"
 
-#: clientgui/MainDocument.cpp:2449
+#: MainDocument.cpp:2439
 msgid "starting up"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2450
+#: MainDocument.cpp:2440
 msgid "an exclusive app is running"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2451
+#: MainDocument.cpp:2441
 msgid "CPU is busy"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2452
+#: MainDocument.cpp:2442
 msgid "network bandwidth limit exceeded"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2453
+#: MainDocument.cpp:2443
 msgid "requested by operating system"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2455
+#: MainDocument.cpp:2445
 #, fuzzy
 msgid "unknown reason"
 msgstr "(Desconhecido)"
 
-#: clientgui/MainDocument.cpp:2477
+#: MainDocument.cpp:2467
 msgid "GPU missing, "
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2484
+#: MainDocument.cpp:2474
 msgid "New"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2488
+#: MainDocument.cpp:2478
 msgid "Download failed"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2490
+#: MainDocument.cpp:2480
 msgid "Downloading"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2492
-#: clientgui/MainDocument.cpp:2557
+#: MainDocument.cpp:2482 MainDocument.cpp:2552
 msgid " (suspended - "
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2500
+#: MainDocument.cpp:2490
 msgid "Project suspended by user"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2502
+#: MainDocument.cpp:2492
 msgid "Task suspended by user"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2504
+#: MainDocument.cpp:2494
 msgid "Suspended - "
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2510
+#: MainDocument.cpp:2500
 msgid "GPU suspended - "
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2517
+#: MainDocument.cpp:2507
 msgid "Waiting for memory"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2519
+#: MainDocument.cpp:2509
 msgid "Waiting for shared memory"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2521
+#: MainDocument.cpp:2512
+msgid "Running, high priority"
+msgstr ""
+
+#: MainDocument.cpp:2514
 msgid "Running"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2523
+#: MainDocument.cpp:2517
 msgid " (non-CPU-intensive)"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2526
+#: MainDocument.cpp:2520
 msgid "Waiting to run"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2528
-#: clientgui/MainDocument.cpp:2534
+#: MainDocument.cpp:2522 MainDocument.cpp:2528
 msgid "Ready to start"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2538
-msgid "Postponed: "
+#: MainDocument.cpp:2532
+msgid " (Scheduler wait: "
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2541
-msgid "Postponed"
+#: MainDocument.cpp:2536
+msgid " (Scheduler wait)"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2545
-msgid "Waiting for network access"
+#: MainDocument.cpp:2540
+msgid " (Waiting for network access)"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2549
+#: MainDocument.cpp:2544
 msgid "Computation error"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2553
+#: MainDocument.cpp:2548
 msgid "Upload failed"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2555
+#: MainDocument.cpp:2550
 msgid "Uploading"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2566
+#: MainDocument.cpp:2561
 msgid "Aborted by user"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2569
+#: MainDocument.cpp:2564
 msgid "Aborted by project"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2572
+#: MainDocument.cpp:2567
 msgid "Aborted: not started by deadline"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2575
+#: MainDocument.cpp:2570
 msgid "Aborted: disk limit exceeded"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2578
+#: MainDocument.cpp:2573
 msgid "Aborted: run time limit exceeded"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2581
+#: MainDocument.cpp:2576
 msgid "Aborted: memory limit exceeded"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2584
+#: MainDocument.cpp:2579
 msgid "Aborted"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2589
+#: MainDocument.cpp:2584
 msgid "Acknowledged"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2591
+#: MainDocument.cpp:2586
 msgid "Ready to report"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2593
+#: MainDocument.cpp:2588
 #, c-format
 msgid "Error: invalid state '%d'"
 msgstr ""
 
-#: clientgui/NoInternetConnectionPage.cpp:179
+#: NoInternetConnectionPage.cpp:179
 msgid "No Internet connection"
 msgstr ""
 
-#: clientgui/NoInternetConnectionPage.cpp:182
+#: NoInternetConnectionPage.cpp:182
 msgid "Please connect to the Internet and try again."
 msgstr ""
 
-#: clientgui/NotDetectedPage.cpp:181
+#: NotDetectedPage.cpp:181
 msgid "Project not found"
 msgstr ""
 
-#: clientgui/NotDetectedPage.cpp:184
+#: 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 ""
 
-#: clientgui/NotDetectedPage.cpp:188
+#: NotDetectedPage.cpp:188
 msgid "Account manager not found"
 msgstr ""
 
-#: clientgui/NotDetectedPage.cpp:191
+#: NotDetectedPage.cpp:191
 msgid ""
 "The URL you supplied is not that of a BOINC-based account\n"
 "manager.\n"
@@ -2594,144 +2569,106 @@ msgid ""
 "Please check the URL and try again."
 msgstr ""
 
-#: clientgui/NotFoundPage.cpp:181
+#: NotFoundPage.cpp:181
 msgid "Login Failed."
 msgstr ""
 
-#: clientgui/NotFoundPage.cpp:185
+#: NotFoundPage.cpp:185
 msgid "Check the username and password, and try again."
 msgstr ""
 
-#: clientgui/NotFoundPage.cpp:189
+#: NotFoundPage.cpp:189
 msgid "Check the email address and password, and try again."
 msgstr ""
 
-#: clientgui/NoticeListCtrl.cpp:229
+#: NoticeListCtrl.cpp:222
 msgid "more..."
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:221
+#: ProjectInfoPage.cpp:477 ProjectInfoPage.cpp:778 ProjectInfoPage.cpp:782
+msgid "All"
+msgstr ""
+
+#: ProjectInfoPage.cpp:615
 msgid "Choose a project"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:228
+#: ProjectInfoPage.cpp:619
 #, fuzzy
 msgid "To choose a project, click its name or type its URL below."
 msgstr ""
 "Para selecionar um gerenciador de contas, clique em seu nome ou \n"
 "digite seu URL abaixo."
 
-#: clientgui/ProjectInfoPage.cpp:246
+#: ProjectInfoPage.cpp:623
 msgid "Categories:"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:267
+#: ProjectInfoPage.cpp:627 sg_ProjectPanel.cpp:89
 #, fuzzy
 msgid "Projects:"
 msgstr "Projeto"
 
-#: clientgui/ProjectInfoPage.cpp:279
+#: ProjectInfoPage.cpp:631
 msgid "Project details"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:291
+#: ProjectInfoPage.cpp:635
 msgid "Research area:"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:302
+#: ProjectInfoPage.cpp:639
 msgid "Organization:"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:313
+#: ProjectInfoPage.cpp:643
 #, fuzzy
 msgid "Web site:"
 msgstr "Páginas de internet"
 
-#: clientgui/ProjectInfoPage.cpp:325
+#: ProjectInfoPage.cpp:647
 msgid "Supported systems:"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:363
+#: ProjectInfoPage.cpp:651
 msgid "Project URL:"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:499
-#: clientgui/ProjectInfoPage.cpp:754
-#: clientgui/ProjectInfoPage.cpp:758
-msgid "All"
-msgstr ""
-
-#: clientgui/ProjectInfoPage.cpp:802
-msgid "This project may not have work for your type of computer.  Do you want to add it anyway?"
+#: ProjectInfoPage.cpp:826
+msgid ""
+"This project may not have work for your type of computer.  Do you want to "
+"add it anyway?"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:826
+#: ProjectInfoPage.cpp:850
 msgid "You already added this project. Please choose a different project."
 msgstr ""
 
-#: clientgui/ProjectProcessingPage.cpp:321
+#: ProjectProcessingPage.cpp:321
 #, fuzzy
 msgid "Communicating with project."
 msgstr "Comunicando-se com servidor."
 
-#: clientgui/ProjectProcessingPage.cpp:510
+#: ProjectProcessingPage.cpp:509
 msgid "Required files not found on the server."
 msgstr ""
 
-#: clientgui/ProjectProcessingPage.cpp:513
-#: clientgui/ProjectProcessingPage.cpp:586
+#: ProjectProcessingPage.cpp:512 ProjectProcessingPage.cpp:574
 #, fuzzy
 msgid "An internal server error has occurred."
 msgstr "Ocorreu um erro interno no servidor.\n"
 
-#: clientgui/ProjectPropertiesPage.cpp:334
+#: ProjectPropertiesPage.cpp:334
 msgid ""
 "Communicating with project\n"
 "Please wait..."
 msgstr ""
 
-#: clientgui/ProjectWelcomePage.cpp:251
-#, c-format
-msgid "Welcome to %s."
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:254
-msgid "You have volunteered to compute for this project:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:255
-msgid "Name:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:258
-msgid "Home:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:262
-msgid "Description:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:265
-msgid "URL:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:268
-msgid "User:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:273
-msgid "WARNING: This project is not registered with BOINC.  Make sure you trust it before continuing."
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:277
-msgid "To continue, click Next."
-msgstr ""
-
-#: clientgui/ProxyInfoPage.cpp:195
+#: ProxyInfoPage.cpp:195
 msgid "Network communication failure"
 msgstr ""
 
-#: clientgui/ProxyInfoPage.cpp:199
+#: ProxyInfoPage.cpp:199
 msgid ""
 "The World Community Grid - BOINC software failed to communicate\n"
 "over the Internet. The most likely reasons are:\n"
@@ -2748,7 +2685,7 @@ msgid ""
 "Click Next to configure BOINC's proxy settings."
 msgstr ""
 
-#: clientgui/ProxyInfoPage.cpp:203
+#: ProxyInfoPage.cpp:203
 msgid ""
 "BOINC failed to communicate on the Internet.\n"
 "The most likely reasons are:\n"
@@ -2765,1311 +2702,1247 @@ msgid ""
 "Click Next to configure BOINC's proxy settings."
 msgstr ""
 
-#: clientgui/ProxyPage.cpp:331
+#: ProxyPage.cpp:331
 msgid "Proxy configuration"
 msgstr ""
 
 # "proxy" is a known and very used word among computer users on Brazil. I believe translating it may be unbecoming.
-#: clientgui/ProxyPage.cpp:334
+#: ProxyPage.cpp:334
 #, fuzzy
 msgid "HTTP proxy"
 msgstr "Proxy HTTP"
 
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
+#: ProxyPage.cpp:337 ProxyPage.cpp:357
 msgid "Server:"
 msgstr ""
 
-#: clientgui/ProxyPage.cpp:350
+#: ProxyPage.cpp:350
 msgid "Autodetect"
 msgstr ""
 
 # "proxy" is a known and very used word among computer users on Brazil. I believe translating it may be unbecoming.
-#: clientgui/ProxyPage.cpp:354
+#: ProxyPage.cpp:354
 #, fuzzy
 msgid "SOCKS proxy"
 msgstr "Proxy SOCKS"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:167
-msgid "Advanced View...\tCtrl+Shift+A"
+#: TermsOfUsePage.cpp:218
+msgid "Terms of Use"
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:168
-#, fuzzy
-msgid "Display the advanced graphical interface."
-msgstr "Exibir a interface gráfica simples."
-
-#: clientgui/sg_BoincSimpleFrame.cpp:175
-msgid "Skin"
+#: TermsOfUsePage.cpp:222
+msgid "Please read the following terms of use:"
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:177
-msgid "Select the appearance of the user interface."
+#: TermsOfUsePage.cpp:231
+msgid "I agree to the terms of use."
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:224
-#, c-format
-msgid "&%s"
+#: TermsOfUsePage.cpp:237
+msgid "I do not agree to the terms of use."
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:405
-#, fuzzy
-msgid "Default"
-msgstr "&Definir Padrão"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:848
-#, fuzzy
-msgid "Suspend"
-msgstr "&Suspender"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:850
-msgid "Suspend Computing"
+#: UnavailablePage.cpp:183
+msgid "Project temporarily unavailable"
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:851
-msgid "Resume Computing"
+#: UnavailablePage.cpp:186
+msgid ""
+"The project is temporarily unavailable.\n"
+"\n"
+"Please try again later."
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:867
-msgid "Notices"
+#: UnavailablePage.cpp:190
+msgid "Account manager temporarily unavailable"
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:868
-msgid "Open a window to view notices from projects or BOINC"
+#: UnavailablePage.cpp:193
+msgid ""
+"The account manager is temporarily unavailable.\n"
+"\n"
+"Please try again later."
 msgstr ""
 
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
+#: ValidateAccountKey.cpp:68
+msgid "Please specify an account key to continue."
 msgstr ""
 
-#: clientgui/sg_DlgMessages.cpp:132
-#, fuzzy
-msgid "There are no notices at this time."
-msgstr "Existem novos avisos - clique para visualizar."
+#: ValidateAccountKey.cpp:71
+msgid "Invalid Account Key; please enter a valid Account Key"
+msgstr ""
 
-#: clientgui/sg_DlgMessages.cpp:146
-msgid "Close"
-msgstr "Fechar"
+#: ValidateAccountKey.cpp:82 ValidateEmailAddress.cpp:86
+msgid "Validation conflict"
+msgstr ""
 
-#: clientgui/sg_DlgMessages.cpp:394
-#, c-format
-msgid "%s - Notices"
-msgstr "%s Avisos"
+#: ValidateEmailAddress.cpp:72
+msgid "Please specify an email address"
+msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:270
-msgid "This dialog controls preferences for this computer only."
+#: ValidateEmailAddress.cpp:75
+msgid "Invalid email address; please enter a valid email address"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:275
-msgid "Click OK to set preferences."
+#: ValidateURL.cpp:69
+msgid "Missing URL"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:280
-msgid "Click Clear to restore web-based settings for all preferences listed below."
+#: ValidateURL.cpp:70
+msgid ""
+"Please specify a URL.\n"
+"For example:\n"
+"http://www.example.com/"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:287
-msgid "For additional settings, select Computing Preferences in the Advanced View."
+#: ValidateURL.cpp:83 ValidateURL.cpp:87 ValidateURL.cpp:91
+#: ValidateURL.cpp:103 ValidateURL.cpp:107 ValidateURL.cpp:110
+msgid "Invalid URL"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:315
-msgid "Do work only between:"
+#: ValidateURL.cpp:84 ValidateURL.cpp:88 ValidateURL.cpp:92
+msgid ""
+"Please specify a valid URL.\n"
+"For example:\n"
+"http://boincproject.example.com"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:337
-msgid "Connect to internet only between:"
+#: ValidateURL.cpp:104 ValidateURL.cpp:108
+#, c-format
+msgid "'%s' does not contain a valid host name."
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:359
-#: clientgui/sg_DlgPreferences.cpp:376
-msgid "Use no more than:"
+#: ValidateURL.cpp:111
+#, c-format
+msgid "'%s' does not contain a valid path."
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:372
-msgid "of disk space"
+#: ViewMessages.cpp:84 ViewProjects.cpp:170 ViewStatistics.cpp:1978
+#: ViewTransfers.cpp:160 ViewWork.cpp:183
+msgid "Commands"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:389
+#: ViewMessages.cpp:88
 #, fuzzy
-msgid "of the processor"
-msgstr "% de processadores"
+msgid "Copy all messages"
+msgstr "Mostrar todas as mensagens"
 
-#: clientgui/sg_DlgPreferences.cpp:393
-msgid "Do work while on battery?"
+#: ViewMessages.cpp:95
+msgid "Copy selected messages"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:406
-msgid "Do work after idle for:"
-msgstr ""
+#: ViewMessages.cpp:106 ViewMessages.cpp:502
+msgid "Show only this project"
+msgstr "Mostrar somente este projeto"
 
-#: clientgui/sg_DlgPreferences.cpp:431
-msgid "Clear all local preferences listed above and close the dialog"
-msgstr ""
+#: ViewMessages.cpp:107 ViewMessages.cpp:503
+#, fuzzy
+msgid "Show only the messages for the selected project."
+msgstr "Mostrar somente mensagens do projeto selecionado"
 
-#: clientgui/sg_DlgPreferences.cpp:609
-#: clientgui/sg_DlgPreferences.cpp:612
-#: clientgui/sg_DlgPreferences.cpp:688
-#: clientgui/sg_DlgPreferences.cpp:692
-#: clientgui/sg_DlgPreferences.cpp:704
-#: clientgui/sg_DlgPreferences.cpp:708
-#: clientgui/sg_DlgPreferences.cpp:851
-#: clientgui/sg_DlgPreferences.cpp:862
-msgid "Anytime"
-msgstr ""
+#: ViewMessages.cpp:164
+#, fuzzy
+msgid "Messages"
+msgstr "Mensagem"
 
-#: clientgui/sg_DlgPreferences.cpp:645
-msgid "100 MB"
-msgstr ""
+#: ViewMessages.cpp:187
+#, fuzzy
+msgid "Copying all messages to the clipboard..."
+msgstr "Copiar todas as mensagens para a área de transferência."
 
-#: clientgui/sg_DlgPreferences.cpp:646
-msgid "200 MB"
-msgstr ""
+#: ViewMessages.cpp:223
+#, fuzzy
+msgid "Copying selected messages to the clipboard..."
+msgstr "Copiar todas as mensagens para a área de transferência."
 
-#: clientgui/sg_DlgPreferences.cpp:647
-msgid "500 MB"
+#: ViewMessages.cpp:286
+msgid "Filtering messages..."
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:648
-msgid "1 GB"
-msgstr ""
+#: ViewMessages.cpp:494
+msgid "Show all messages"
+msgstr "Mostrar todas as mensagens"
 
-#: clientgui/sg_DlgPreferences.cpp:649
-msgid "2 GB"
-msgstr ""
+#: ViewMessages.cpp:495
+#, fuzzy
+msgid "Show messages for all projects."
+msgstr "Mostrar mensagens de todos os projetos"
 
-#: clientgui/sg_DlgPreferences.cpp:650
-msgid "5 GB"
+#: ViewNotices.cpp:58 sg_DlgMessages.cpp:124
+msgid "Fetching notices; please wait..."
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:651
-msgid "10 GB"
-msgstr ""
+#: ViewNotices.cpp:65 sg_DlgMessages.cpp:132
+#, fuzzy
+msgid "There are no notices at this time."
+msgstr "Existem novos avisos - clique para visualizar."
 
-#: clientgui/sg_DlgPreferences.cpp:652
-msgid "20 GB"
+#: ViewNotices.cpp:99 sg_BoincSimpleFrame.cpp:776
+msgid "Notices"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:653
-msgid "50 GB"
+#: ViewProjects.cpp:174 sg_ProjectCommandPopup.cpp:61
+msgid "Update"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:654
-msgid "100 GB"
+#: ViewProjects.cpp:175 sg_ProjectCommandPopup.cpp:62
+msgid ""
+"Report all completed tasks, get latest credit, get latest preferences, and "
+"possibly get more tasks."
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:724
-#, c-format
-msgid "%d MB"
-msgstr ""
+#: 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
+#, fuzzy
+msgid "Suspend"
+msgstr "&Suspender"
 
-#: clientgui/sg_DlgPreferences.cpp:726
-#, c-format
-msgid "%4.2f GB"
+#: ViewProjects.cpp:182 ViewProjects.cpp:722 sg_ProjectCommandPopup.cpp:68
+#: sg_ProjectCommandPopup.cpp:114
+msgid "Suspend tasks for this project."
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:767
-#, c-format
-msgid "%d%%"
+#: ViewProjects.cpp:188 ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:73
+#: sg_ProjectCommandPopup.cpp:121
+msgid "No new tasks"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:803
-msgid "0 (Run Always)"
+#: ViewProjects.cpp:189 sg_ProjectCommandPopup.cpp:74
+msgid "Don't get new tasks for this project."
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:806
-#, c-format
-msgid "%d"
+#: ViewProjects.cpp:195 sg_ProjectCommandPopup.cpp:79
+msgid "Reset project"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:953
-#, c-format
-msgid "%s - Computing Preferences"
+#: ViewProjects.cpp:196 sg_ProjectCommandPopup.cpp:80
+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_DlgPreferences.cpp:1033
-#, fuzzy
-msgid "Do you really want to clear all local preferences?\n"
-msgstr "Deseja realmente apagar todas as preferências locais ?"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:66
-#: clientgui/ViewProjects.cpp:179
-msgid "Update"
+#: ViewProjects.cpp:203 sg_ProjectCommandPopup.cpp:86
+msgid ""
+"Remove this project.  Tasks in progress will be lost (use 'Update' first to "
+"report any completed tasks)."
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:67
-#: clientgui/ViewProjects.cpp:180
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
+#: ViewProjects.cpp:209 ViewWork.cpp:222 sg_ProjectCommandPopup.cpp:91
+#: sg_TaskCommandPopup.cpp:78
+msgid "Properties"
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:73
-#: clientgui/sg_ProjectCommandPopup.cpp:129
-#: clientgui/ViewProjects.cpp:187
-#: clientgui/ViewProjects.cpp:727
-msgid "Suspend tasks for this project."
+#: ViewProjects.cpp:210 sg_ProjectCommandPopup.cpp:92
+msgid "Show project details."
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:78
-#: clientgui/sg_ProjectCommandPopup.cpp:136
-#: clientgui/ViewProjects.cpp:193
-#: clientgui/ViewProjects.cpp:746
-msgid "No new tasks"
+#: ViewProjects.cpp:220 ViewStatistics.cpp:450
+msgid "Account"
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:79
-#: clientgui/ViewProjects.cpp:194
-msgid "Don't get new tasks for this project."
+#: ViewProjects.cpp:222
+msgid "Work done"
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:200
-msgid "Reset project"
+#: ViewProjects.cpp:223
+msgid "Avg. work done"
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:85
-#: clientgui/ViewProjects.cpp:201
-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."
+#: ViewProjects.cpp:225 ViewTransfers.cpp:188 ViewWork.cpp:234
+msgid "Status"
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:91
-#: clientgui/ViewProjects.cpp:208
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
-msgstr ""
+#: ViewProjects.cpp:250
+#, fuzzy
+msgid "Projects"
+msgstr "Projeto"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:96
-#: clientgui/sg_TaskCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:214
-msgid "Properties"
+#: ViewProjects.cpp:302
+msgid "Updating project..."
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:97
-#: clientgui/ViewProjects.cpp:215
-msgid "Show project details."
+#: ViewProjects.cpp:344
+msgid "Resuming project..."
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:126
-#: clientgui/ViewProjects.cpp:723
-msgid "Resume tasks for this project."
+#: ViewProjects.cpp:348
+msgid "Suspending project..."
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:133
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow new tasks"
+#: ViewProjects.cpp:385
+msgid "Telling project to allow additional task downloads..."
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:134
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow fetching new tasks for this project."
+#: ViewProjects.cpp:389
+msgid "Telling project to not fetch any additional tasks..."
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:137
-#: clientgui/ViewProjects.cpp:746
-msgid "Don't fetch new tasks for this project."
+#: ViewProjects.cpp:425
+msgid "Resetting project..."
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:229
-#: clientgui/ViewProjects.cpp:443
+#: ViewProjects.cpp:438 sg_ProjectCommandPopup.cpp:214
 #, c-format
 msgid "Are you sure you want to reset project '%s'?"
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:235
-#: clientgui/ViewProjects.cpp:449
+#: ViewProjects.cpp:444 sg_ProjectCommandPopup.cpp:220
 msgid "Reset Project"
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:266
-#: clientgui/ViewProjects.cpp:501
+#: ViewProjects.cpp:483
+msgid "Removing project..."
+msgstr ""
+
+#: ViewProjects.cpp:496 sg_ProjectCommandPopup.cpp:251
 #, c-format
 msgid "Are you sure you want to remove project '%s'?"
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:272
-#: clientgui/ViewProjects.cpp:507
+#: ViewProjects.cpp:502 sg_ProjectCommandPopup.cpp:257
 msgid "Remove Project"
 msgstr ""
 
-#: clientgui/sg_ProjectPanel.cpp:72
-#, fuzzy
-msgid "Add Project"
-msgstr "Adicionar projeto"
-
-#: clientgui/sg_ProjectPanel.cpp:73
-msgid "Synchronize"
+#: ViewProjects.cpp:543 ViewWork.cpp:599
+msgid "Launching browser..."
 msgstr ""
 
-#: clientgui/sg_ProjectPanel.cpp:74
-msgid "Work done for this project"
+#: ViewProjects.cpp:718 sg_ProjectCommandPopup.cpp:111
+msgid "Resume tasks for this project."
 msgstr ""
 
-#: clientgui/sg_ProjectPanel.cpp:77
-msgid "Synchronize projects with account manager system"
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:118
+msgid "Allow new tasks"
 msgstr ""
 
-#: clientgui/sg_ProjectPanel.cpp:124
-msgid "Select a project to access with the controls below"
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:119
+msgid "Allow fetching new tasks for this project."
 msgstr ""
 
-# 88%
-#: clientgui/sg_ProjectPanel.cpp:145
-#, fuzzy
-msgid "Project Web Pages"
-msgstr "Projeto adicionado"
-
-#: clientgui/sg_ProjectPanel.cpp:149
-msgid "Project Commands"
+#: ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:122
+msgid "Don't fetch new tasks for this project."
 msgstr ""
 
-#: clientgui/sg_ProjectPanel.cpp:276
-#, c-format
-msgid "Pop up a menu of web sites for project %s"
+#: ViewProjects.cpp:1058
+msgid "Requested by user"
 msgstr ""
 
-#: clientgui/sg_ProjectPanel.cpp:278
-#, c-format
-msgid "Pop up a menu of commands to apply to project %s"
+#: ViewProjects.cpp:1059
+msgid "To fetch work"
 msgstr ""
 
-#: clientgui/sg_TaskCommandPopup.cpp:66
-msgid "Show graphics"
+#: ViewProjects.cpp:1060
+msgid "To report completed tasks"
 msgstr ""
 
-#: clientgui/sg_TaskCommandPopup.cpp:67
-msgid "Show application graphics in a window."
+#: ViewProjects.cpp:1061
+msgid "To send trickle-up message"
 msgstr ""
 
-#: clientgui/sg_TaskCommandPopup.cpp:73
-msgid "Suspend this task."
-msgstr ""
+#: ViewProjects.cpp:1062
+#, fuzzy
+msgid "Requested by account manager"
+msgstr "Adicionar gerenciador de contas"
 
-#: clientgui/sg_TaskCommandPopup.cpp:78
-msgid "Abort"
+#: ViewProjects.cpp:1063
+msgid "Project initialization"
 msgstr ""
 
-#: clientgui/sg_TaskCommandPopup.cpp:79
-msgid "Abandon this task. You will get no credit for it."
-msgstr ""
+#: ViewProjects.cpp:1064
+#, fuzzy
+msgid "Requested by project"
+msgstr "Adicionar projeto"
 
-#: clientgui/sg_TaskCommandPopup.cpp:85
-msgid "Show task details."
-msgstr ""
+#: ViewProjects.cpp:1065
+#, fuzzy
+msgid "Unknown reason"
+msgstr "(Desconhecido)"
 
-#: clientgui/sg_TaskCommandPopup.cpp:119
-msgid "Resume work for this task."
+#: ViewProjects.cpp:1079
+msgid "Suspended by user"
 msgstr ""
 
-#: clientgui/sg_TaskCommandPopup.cpp:123
-msgid "Suspend work for this task."
+#: ViewProjects.cpp:1082
+msgid "Won't get new 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)"
+#: ViewProjects.cpp:1085
+msgid "Project ended - OK to remove"
 msgstr ""
 
-#: clientgui/sg_TaskCommandPopup.cpp:272
-msgid "Abort task"
+#: ViewProjects.cpp:1088
+#, fuzzy
+msgid "Will remove when tasks done"
+msgstr "Remover quando tarefas concluídas"
+
+#: ViewProjects.cpp:1091
+msgid "Scheduler request pending"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:468
-msgid "You don't have any projects.  Please Add a Project."
+#: ViewProjects.cpp:1097
+#, fuzzy
+msgid "Scheduler request in progress"
+msgstr "Chamada do escalonador em progresso"
+
+#: ViewProjects.cpp:1100
+msgid "Trickle up message pending"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:469
-msgid "Not available"
+#: ViewProjects.cpp:1106
+msgid "Communication deferred "
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:480
-msgid "Tasks:"
+#: ViewResources.cpp:62
+msgid "Total disk usage"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:486
-msgid "Select a task to access"
+#: ViewResources.cpp:83
+msgid "Disk usage by BOINC projects"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:497
-msgid "From:"
+#: ViewResources.cpp:116
+msgid "Disk"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:551
-msgid "This task's progress"
+#: ViewResources.cpp:249
+msgid "no projects: 0 bytes used"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:569
-msgid "Task Commands"
+#: ViewResources.cpp:286
+msgid "used by BOINC: "
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:570
-msgid "Pop up a menu of commands to apply to this task"
+#: ViewResources.cpp:296
+msgid "free, available to BOINC: "
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:705
-#, c-format
-msgid "Application: %s"
+#: ViewResources.cpp:306
+msgid "free, not available to BOINC: "
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:728
-#, c-format
-msgid "%.3f%%"
+#: ViewResources.cpp:316
+msgid "free: "
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:736
-msgid "Application: Not available"
+#: ViewResources.cpp:326
+msgid "used by other programs: "
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:836
-msgid "Not Available"
+#: ViewStatistics.cpp:1205
+msgid "User Total"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:851
-#, c-format
-msgid "Elapsed: %s"
+#: ViewStatistics.cpp:1206
+msgid "User Average"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:865
-#, c-format
-msgid "Remaining (estimated): %s"
+#: ViewStatistics.cpp:1207
+msgid "Host Total"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:880
-#, c-format
-msgid "Status: %s"
+#: ViewStatistics.cpp:1208
+msgid "Host Average"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1227
-msgid "Retrieving current status."
+#: ViewStatistics.cpp:1355
+#, c-format
+msgid "Last update: %.0f days ago"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1233
-msgid "Downloading work from the server."
+#: ViewStatistics.cpp:1982
+msgid "Show user total"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1238
-msgid "Processing Suspended:  Running On Batteries."
+#: ViewStatistics.cpp:1983
+msgid "Show total credit for user"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1240
-msgid "Processing Suspended:  User Active."
+#: ViewStatistics.cpp:1989
+msgid "Show user average"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1242
-msgid "Processing Suspended:  User paused processing."
+#: ViewStatistics.cpp:1990
+msgid "Show average credit for user"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1244
-msgid "Processing Suspended:  Time of Day."
+#: ViewStatistics.cpp:1996
+msgid "Show host total"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1246
-msgid "Processing Suspended:  Benchmarks Running."
+#: ViewStatistics.cpp:1997
+msgid "Show total credit for host"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1248
-msgid "Processing Suspended."
+#: ViewStatistics.cpp:2003
+msgid "Show host average"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1252
-msgid "Waiting to contact project servers."
+#: ViewStatistics.cpp:2004
+msgid "Show average credit for host"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1256
-#: clientgui/sg_TaskPanel.cpp:1265
-msgid "Retrieving current status"
+#: ViewStatistics.cpp:2013
+msgid "< &Previous project"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1260
-msgid "No work available to process"
+#: ViewStatistics.cpp:2014
+msgid "Show chart for previous project"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1262
-msgid "Unable to connect to the core client"
+#: ViewStatistics.cpp:2019
+msgid "&Next project >"
 msgstr ""
 
-#: clientgui/TermsOfUsePage.cpp:218
-msgid "Terms of Use"
+#: ViewStatistics.cpp:2020
+msgid "Show chart for next project"
 msgstr ""
 
-#: clientgui/TermsOfUsePage.cpp:222
-msgid "Please read the following terms of use:"
+#: ViewStatistics.cpp:2026 ViewStatistics.cpp:2416
+msgid "Hide project list"
 msgstr ""
 
-#: clientgui/TermsOfUsePage.cpp:231
-msgid "I agree to the terms of use."
+#: ViewStatistics.cpp:2027 ViewStatistics.cpp:2416
+msgid "Use entire area for graphs"
 msgstr ""
 
-#: clientgui/TermsOfUsePage.cpp:237
-msgid "I do not agree to the terms of use."
+#: ViewStatistics.cpp:2032
+msgid "Mode view"
 msgstr ""
 
-#: clientgui/UnavailablePage.cpp:183
-msgid "Project temporarily unavailable"
+#: ViewStatistics.cpp:2036
+msgid "One project"
 msgstr ""
 
-#: clientgui/UnavailablePage.cpp:186
-msgid ""
-"The project is temporarily unavailable.\n"
-"\n"
-"Please try again later."
+#: ViewStatistics.cpp:2037
+msgid "Show one chart with selected project"
 msgstr ""
 
-#: clientgui/UnavailablePage.cpp:190
-msgid "Account manager temporarily unavailable"
+#: ViewStatistics.cpp:2043
+msgid "All projects (separate)"
 msgstr ""
 
-#: clientgui/UnavailablePage.cpp:193
-msgid ""
-"The account manager is temporarily unavailable.\n"
-"\n"
-"Please try again later."
+#: ViewStatistics.cpp:2044
+msgid "Show all projects, one chart per project"
 msgstr ""
 
-#: clientgui/ValidateAccountKey.cpp:68
-msgid "Please specify an account key to continue."
+#: ViewStatistics.cpp:2050
+msgid "All projects (together)"
 msgstr ""
 
-#: clientgui/ValidateAccountKey.cpp:71
-msgid "Invalid Account Key; please enter a valid Account Key"
+#: ViewStatistics.cpp:2051
+msgid "Show one chart with all projects"
 msgstr ""
 
-#: clientgui/ValidateAccountKey.cpp:82
-#: clientgui/ValidateEmailAddress.cpp:86
-msgid "Validation conflict"
+#: ViewStatistics.cpp:2057
+msgid "All projects (sum)"
 msgstr ""
 
-#: clientgui/ValidateEmailAddress.cpp:72
-msgid "Please specify an email address"
+#: ViewStatistics.cpp:2058
+msgid "Show one chart with sum of projects"
 msgstr ""
 
-#: clientgui/ValidateEmailAddress.cpp:75
-msgid "Invalid email address; please enter a valid email address"
+#: ViewStatistics.cpp:2079
+msgid "Statistics"
 msgstr ""
 
-#: clientgui/ValidateURL.cpp:69
-msgid "Missing URL"
+#: 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
+msgid "Updating charts..."
 msgstr ""
 
-#: clientgui/ValidateURL.cpp:70
-msgid ""
-"Please specify a URL.\n"
-"For example:\n"
-"http://www.example.com/"
+#: ViewStatistics.cpp:2420
+msgid "Show project list"
 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"
+#: ViewStatistics.cpp:2420
+msgid "Uses smaller area for graphs"
 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"
+#: ViewTransfers.cpp:164
+msgid "Retry Now"
 msgstr ""
 
-#: clientgui/ValidateURL.cpp:104
-#: clientgui/ValidateURL.cpp:108
-#, c-format
-msgid "'%s' does not contain a valid host name."
+#: ViewTransfers.cpp:165
+msgid "Retry the file transfer now"
 msgstr ""
 
-#: clientgui/ValidateURL.cpp:111
-#, c-format
-msgid "'%s' does not contain a valid path."
+#: ViewTransfers.cpp:171
+msgid "Abort Transfer"
 msgstr ""
 
-#: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:175
-msgid "Commands"
+#: ViewTransfers.cpp:172
+msgid "Abort this file transfer.  You won't get credit for the task."
 msgstr ""
 
-#: clientgui/ViewMessages.cpp:88
+#: ViewTransfers.cpp:183
 #, fuzzy
-msgid "Copy all messages"
-msgstr "Mostrar todas as mensagens"
+msgid "File"
+msgstr "&Arquivo"
 
-#: clientgui/ViewMessages.cpp:95
-msgid "Copy selected messages"
+#: ViewTransfers.cpp:184 ViewWork.cpp:233
+msgid "Progress"
 msgstr ""
 
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
-msgid "Show only this project"
-msgstr "Mostrar somente este projeto"
+#: ViewTransfers.cpp:185
+msgid "Size"
+msgstr ""
 
-#: clientgui/ViewMessages.cpp:107
-#: clientgui/ViewMessages.cpp:503
+#: ViewTransfers.cpp:186
 #, fuzzy
-msgid "Show only the messages for the selected project."
-msgstr "Mostrar somente mensagens do projeto selecionado"
+msgid "Elapsed Time"
+msgstr "Tempo decorrido"
 
-#: clientgui/ViewMessages.cpp:164
-#, fuzzy
-msgid "Messages"
-msgstr "Mensagem"
+#: ViewTransfers.cpp:187
+msgid "Speed"
+msgstr ""
 
-#: clientgui/ViewMessages.cpp:187
-#, fuzzy
-msgid "Copying all messages to the clipboard..."
-msgstr "Copiar todas as mensagens para a área de transferência."
+#: ViewTransfers.cpp:213
+msgid "Transfers"
+msgstr ""
 
-#: clientgui/ViewMessages.cpp:223
+#: ViewTransfers.cpp:280
 #, fuzzy
-msgid "Copying selected messages to the clipboard..."
-msgstr "Copiar todas as mensagens para a área de transferência."
+msgid "Network activity is suspended - "
+msgstr "Atividade de rede suspensa"
 
-#: clientgui/ViewMessages.cpp:286
-msgid "Filtering messages..."
+#: ViewTransfers.cpp:282
+msgid ""
+".\n"
+"You can enable it using the Activity menu."
 msgstr ""
 
-#: clientgui/ViewMessages.cpp:494
-msgid "Show all messages"
-msgstr "Mostrar todas as mensagens"
-
-#: clientgui/ViewMessages.cpp:495
-#, fuzzy
-msgid "Show messages for all projects."
-msgstr "Mostrar mensagens de todos os projetos"
+#: ViewTransfers.cpp:285
+msgid "BOINC"
+msgstr ""
 
-#: clientgui/ViewProjects.cpp:225
-msgid "Account"
+#: ViewTransfers.cpp:292
+msgid "Retrying transfer now..."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:227
-msgid "Work done"
+#: ViewTransfers.cpp:330
+msgid "Aborting transfer..."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:228
-msgid "Avg. work done"
+#: ViewTransfers.cpp:343
+#, 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/ViewProjects.cpp:230
-msgid "Status"
+#: ViewTransfers.cpp:349
+msgid "Abort File Transfer"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:255
-#, fuzzy
-msgid "Projects"
-msgstr "Projeto"
+#: ViewTransfers.cpp:780
+msgid "Upload"
+msgstr ""
 
-#: clientgui/ViewProjects.cpp:307
-msgid "Updating project..."
+#: ViewTransfers.cpp:780
+msgid "Download"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:349
-msgid "Resuming project..."
+#: ViewTransfers.cpp:784
+msgid "retry in "
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:353
-msgid "Suspending project..."
+#: ViewTransfers.cpp:786
+msgid "failed"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:390
-msgid "Telling project to allow additional task downloads..."
+#: ViewTransfers.cpp:789
+msgid "suspended"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:394
-msgid "Telling project to not fetch any additional tasks..."
+#: ViewTransfers.cpp:794
+msgid "active"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:430
-msgid "Resetting project..."
+#: ViewTransfers.cpp:796
+msgid "pending"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:488
-msgid "Removing project..."
+#: ViewTransfers.cpp:803
+msgid " (project backoff: "
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:548
-msgid "Launching browser..."
+#: ViewWork.cpp:187 ViewWork.cpp:777
+msgid "Show active tasks"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1063
-msgid "Requested by user"
+#: ViewWork.cpp:188 ViewWork.cpp:778
+msgid "Show only active tasks."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1064
-msgid "To fetch work"
+#: ViewWork.cpp:194 sg_TaskCommandPopup.cpp:60
+msgid "Show graphics"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1065
-msgid "To report completed tasks"
+#: ViewWork.cpp:195 sg_TaskCommandPopup.cpp:61
+msgid "Show application graphics in a window."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1066
-msgid "To send trickle-up message"
+#: ViewWork.cpp:201
+msgid "Show VM Console"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1067
-#, fuzzy
-msgid "Requested by account manager"
-msgstr "Adicionar gerenciador de contas"
+#: ViewWork.cpp:202
+msgid "Show VM Console in a window."
+msgstr ""
 
-#: clientgui/ViewProjects.cpp:1068
-msgid "Project initialization"
+#: ViewWork.cpp:209
+msgid "Suspend work for this result."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1069
-#, fuzzy
-msgid "Requested by project"
-msgstr "Adicionar projeto"
+#: ViewWork.cpp:215 sg_TaskCommandPopup.cpp:72
+msgid "Abort"
+msgstr ""
 
-#: clientgui/ViewProjects.cpp:1070
-#, fuzzy
-msgid "Unknown reason"
-msgstr "(Desconhecido)"
+#: ViewWork.cpp:216
+msgid "Abandon work on the result. You will get no credit for it."
+msgstr ""
 
-#: clientgui/ViewProjects.cpp:1084
-msgid "Suspended by user"
+#: ViewWork.cpp:223 sg_TaskCommandPopup.cpp:79
+msgid "Show task details."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1087
-msgid "Won't get new tasks"
+#: ViewWork.cpp:235
+msgid "Elapsed"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1090
-msgid "Project ended - OK to remove"
+#: ViewWork.cpp:236
+msgid "Remaining (estimated)"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1093
-#, fuzzy
-msgid "Will remove when tasks done"
-msgstr "Remover quando tarefas concluídas"
+#: ViewWork.cpp:237
+msgid "Deadline"
+msgstr ""
 
-#: clientgui/ViewProjects.cpp:1096
-msgid "Scheduler request pending"
+#: ViewWork.cpp:264
+msgid "Tasks"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1102
-#, fuzzy
-msgid "Scheduler request in progress"
-msgstr "Chamada do escalonador em progresso"
+#: ViewWork.cpp:357
+msgid "Resuming task..."
+msgstr ""
 
-#: clientgui/ViewProjects.cpp:1105
-msgid "Trickle up message pending"
+#: ViewWork.cpp:360
+msgid "Suspending task..."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1111
-msgid "Communication deferred "
+#: ViewWork.cpp:389
+msgid "Showing graphics for task..."
 msgstr ""
 
-#: clientgui/ViewResources.cpp:62
-msgid "Total disk usage"
+#: ViewWork.cpp:426
+msgid "Showing VM console for task..."
 msgstr ""
 
-#: clientgui/ViewResources.cpp:83
-msgid "Disk usage by BOINC projects"
+#: ViewWork.cpp:479
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %s, Status: %s)"
 msgstr ""
 
-#: clientgui/ViewResources.cpp:116
-msgid "Disk"
+#: ViewWork.cpp:485
+#, c-format
+msgid "Are you sure you want to abort these %d tasks?"
 msgstr ""
 
-#: clientgui/ViewResources.cpp:225
-msgid "no projects: 0 bytes used"
+#: ViewWork.cpp:490 sg_TaskCommandPopup.cpp:256
+msgid "Abort task"
 msgstr ""
 
-#: clientgui/ViewResources.cpp:262
-msgid "used by BOINC: "
+#: ViewWork.cpp:499
+msgid "Aborting task..."
 msgstr ""
 
-#: clientgui/ViewResources.cpp:272
-msgid "free, available to BOINC: "
+#: ViewWork.cpp:771
+msgid "Show all tasks"
 msgstr ""
 
-#: clientgui/ViewResources.cpp:282
-msgid "free, not available to BOINC: "
+#: ViewWork.cpp:772
+msgid "Show all tasks."
 msgstr ""
 
-#: clientgui/ViewResources.cpp:292
-msgid "free: "
+#: ViewWork.cpp:796 sg_TaskCommandPopup.cpp:103
+msgid "Resume work for this task."
 msgstr ""
 
-#: clientgui/ViewResources.cpp:302
-msgid "used by other programs: "
+#: ViewWork.cpp:802 sg_TaskCommandPopup.cpp:107
+msgid "Suspend work for this task."
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1181
-msgid "User Total"
+#: WelcomePage.cpp:284
+#, fuzzy
+msgid "Add project or account manager"
+msgstr "&Adicionar projeto ou gerenciador de contas..."
+
+#: WelcomePage.cpp:288
+msgid "Add project or use BOINC Account Manager"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1182
-msgid "User Average"
+#: 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 ""
 
-#: clientgui/ViewStatistics.cpp:1183
-msgid "Host Total"
+#: 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 ""
 
-#: clientgui/ViewStatistics.cpp:1184
-msgid "Host Average"
+#: 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 ""
 
-#: clientgui/ViewStatistics.cpp:1331
-#, c-format
-msgid "Last update: %.0f days ago"
+#: WelcomePage.cpp:339
+msgid "Use a BOINC Account Manager"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1956
-msgid "Show user total"
+#: WelcomePage.cpp:352
+msgid "To continue, click Next."
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1957
-msgid "Show total credit for user"
+#: WelcomePage.cpp:358
+msgid "Add or change your World Community Grid projects"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1963
-msgid "Show user average"
+#: WelcomePage.cpp:361
+msgid "Add projects run by other researchers or organizations"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1964
-msgid "Show average credit for user"
+#: WizardAttach.cpp:634
+msgid "Do you really want to cancel?"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1970
-msgid "Show host total"
+#: WizardAttach.cpp:635
+msgid "Question"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1971
-msgid "Show total credit for host"
+#: sg_BoincSimpleFrame.cpp:149
+msgid "Advanced View...\tCtrl+Shift+A"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1977
-msgid "Show host average"
+#: sg_BoincSimpleFrame.cpp:150
+#, fuzzy
+msgid "Display the advanced graphical interface."
+msgstr "Exibir a interface gráfica simples."
+
+#: sg_BoincSimpleFrame.cpp:157
+msgid "Skin"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1978
-msgid "Show average credit for host"
+#: sg_BoincSimpleFrame.cpp:159
+msgid "Select the appearance of the user interface."
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1987
-msgid "< &Previous project"
+#: sg_BoincSimpleFrame.cpp:206
+#, c-format
+msgid "&%s"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1988
-msgid "Show chart for previous project"
+#: sg_BoincSimpleFrame.cpp:390
+#, fuzzy
+msgid "Default"
+msgstr "&Definir Padrão"
+
+#: sg_BoincSimpleFrame.cpp:759
+msgid "Suspend Computing"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1993
-msgid "&Next project >"
+#: sg_BoincSimpleFrame.cpp:760
+msgid "Resume Computing"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:1994
-msgid "Show chart for next project"
+#: sg_BoincSimpleFrame.cpp:777
+msgid "Open a window to view notices from projects or BOINC"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2000
-#: clientgui/ViewStatistics.cpp:2390
-msgid "Hide project list"
+#: sg_DlgMessages.cpp:146
+msgid "Close"
+msgstr "Fechar"
+
+#: sg_DlgMessages.cpp:389
+#, c-format
+#, fuzzy, c-format
+msgid "%s - Notices"
+msgstr "%s Avisos"
+
+#: sg_DlgPreferences.cpp:268
+msgid "This dialog controls preferences for this computer only."
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2001
-#: clientgui/ViewStatistics.cpp:2390
-msgid "Use entire area for graphs"
+#: sg_DlgPreferences.cpp:273
+msgid "Click OK to set preferences."
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2006
-msgid "Mode view"
+#: sg_DlgPreferences.cpp:278
+msgid ""
+"Click Clear to restore web-based settings for all preferences listed below."
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2010
-msgid "One project"
+#: sg_DlgPreferences.cpp:285
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2011
-msgid "Show one chart with selected project"
+#: sg_DlgPreferences.cpp:313
+msgid "Do work only between:"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2017
-msgid "All projects (separate)"
+#: sg_DlgPreferences.cpp:335
+msgid "Connect to internet only between:"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2018
-msgid "Show all projects, one chart per project"
+#: sg_DlgPreferences.cpp:357 sg_DlgPreferences.cpp:374
+msgid "Use no more than:"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2024
-msgid "All projects (together)"
+#: sg_DlgPreferences.cpp:370
+msgid "of disk space"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2025
-msgid "Show one chart with all projects"
-msgstr ""
+#: sg_DlgPreferences.cpp:387
+#, fuzzy
+msgid "of the processor"
+msgstr "% de processadores"
 
-#: clientgui/ViewStatistics.cpp:2031
-msgid "All projects (sum)"
+#: sg_DlgPreferences.cpp:391
+msgid "Do work while on battery?"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2032
-msgid "Show one chart with sum of projects"
+#: sg_DlgPreferences.cpp:404
+msgid "Do work after idle for:"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2053
-msgid "Statistics"
-msgstr ""
+#: sg_DlgPreferences.cpp:429
+#, fuzzy
+msgid "Clear all local preferences listed above and close the dialog"
+msgstr "limpar todas as preferências locais e fechar caixa de diálogo"
 
-#: 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..."
+#: 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 ""
 
-#: clientgui/ViewStatistics.cpp:2394
-msgid "Show project list"
+#: sg_DlgPreferences.cpp:638
+msgid "100 MB"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2394
-msgid "Uses smaller area for graphs"
+#: sg_DlgPreferences.cpp:639
+msgid "200 MB"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:169
-msgid "Retry Now"
+#: sg_DlgPreferences.cpp:640
+msgid "500 MB"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:170
-msgid "Retry the file transfer now"
+#: sg_DlgPreferences.cpp:641
+msgid "1 GB"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:176
-msgid "Abort Transfer"
+#: sg_DlgPreferences.cpp:642
+msgid "2 GB"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:177
-msgid "Abort this file transfer.  You won't get credit for the task."
+#: sg_DlgPreferences.cpp:643
+msgid "5 GB"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:188
-#, fuzzy
-msgid "File"
-msgstr "&Arquivo"
-
-#: clientgui/ViewTransfers.cpp:189
-#: clientgui/ViewWork.cpp:238
-msgid "Progress"
+#: sg_DlgPreferences.cpp:644
+msgid "10 GB"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:190
-msgid "Size"
+#: sg_DlgPreferences.cpp:645
+msgid "20 GB"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:191
-#, fuzzy
-msgid "Elapsed Time"
-msgstr "Tempo decorrido"
-
-#: clientgui/ViewTransfers.cpp:192
-msgid "Speed"
+#: sg_DlgPreferences.cpp:646
+msgid "50 GB"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:218
-msgid "Transfers"
+#: sg_DlgPreferences.cpp:647
+msgid "100 GB"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:285
-#, fuzzy
-msgid "Network activity is suspended - "
-msgstr "Atividade de rede suspensa"
-
-#: clientgui/ViewTransfers.cpp:287
-msgid ""
-".\n"
-"You can enable it using the Activity menu."
+#: sg_DlgPreferences.cpp:717
+#, c-format
+msgid "%d MB"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:290
-msgid "BOINC"
+#: sg_DlgPreferences.cpp:719
+#, c-format
+msgid "%4.2f GB"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:297
-msgid "Retrying transfer now..."
+#: sg_DlgPreferences.cpp:760
+#, c-format
+msgid "%d%%"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:335
-msgid "Aborting transfer..."
+#: sg_DlgPreferences.cpp:796
+msgid "0 (Run Always)"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:348
+#: sg_DlgPreferences.cpp:799
 #, 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."
+msgid "%d"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:354
-msgid "Abort File Transfer"
-msgstr ""
+#: sg_DlgPreferences.cpp:1029
+#, fuzzy
+msgid "Do you really want to clear all local preferences?\n"
+msgstr "Deseja realmente apagar todas as preferências locais ?"
 
-#: clientgui/ViewTransfers.cpp:785
-msgid "Upload"
-msgstr ""
+#: sg_ProjectPanel.cpp:72
+#, fuzzy
+msgid "Add Project"
+msgstr "Adicionar projeto"
 
-#: clientgui/ViewTransfers.cpp:785
-msgid "Download"
+#: sg_ProjectPanel.cpp:73
+msgid "Synchronize"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:789
-msgid "retry in "
+#: sg_ProjectPanel.cpp:74
+msgid "Work done for this project"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:791
-msgid "failed"
+#: sg_ProjectPanel.cpp:77
+msgid "Synchronize projects with account manager system"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:794
-msgid "suspended"
+#: sg_ProjectPanel.cpp:124
+msgid "Select a project to access with the controls below"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:799
-msgid "active"
+# 88%
+#: sg_ProjectPanel.cpp:145
+#, fuzzy
+msgid "Project Web Pages"
+msgstr "Projeto adicionado"
+
+#: sg_ProjectPanel.cpp:149
+msgid "Project Commands"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:801
-msgid "pending"
+#: sg_ProjectPanel.cpp:267
+#, c-format
+msgid "Pop up a menu of web sites for project %s"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:808
-msgid " (project backoff: "
+#: sg_ProjectPanel.cpp:269
+#, c-format
+msgid "Pop up a menu of commands to apply to project %s"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:192
-#: clientgui/ViewWork.cpp:782
-msgid "Show active tasks"
+#: sg_TaskCommandPopup.cpp:67
+msgid "Suspend this task."
 msgstr ""
 
-#: clientgui/ViewWork.cpp:193
-#: clientgui/ViewWork.cpp:783
-msgid "Show only active tasks."
+#: sg_TaskCommandPopup.cpp:73
+msgid "Abandon this task. You will get no credit for it."
 msgstr ""
 
-#: clientgui/ViewWork.cpp:206
-msgid "Show VM Console"
+#: sg_TaskCommandPopup.cpp:251
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %.1lf%%, Status: %s)"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:207
-msgid "Show VM Console in a window."
+#: sg_TaskPanel.cpp:464
+msgid "You don't have any projects.  Please Add a Project."
 msgstr ""
 
-#: clientgui/ViewWork.cpp:214
-msgid "Suspend work for this result."
+#: sg_TaskPanel.cpp:465
+msgid "Not available"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:221
-msgid "Abandon work on the result. You will get no credit for it."
+#: sg_TaskPanel.cpp:476
+msgid "Tasks:"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:240
-msgid "Elapsed"
+#: sg_TaskPanel.cpp:482
+msgid "Select a task to access"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:241
-msgid "Remaining (estimated)"
+#: sg_TaskPanel.cpp:493
+msgid "From:"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:242
-msgid "Deadline"
+#: sg_TaskPanel.cpp:547
+msgid "This task's progress"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:269
-msgid "Tasks"
+#: sg_TaskPanel.cpp:565
+msgid "Task Commands"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:362
-msgid "Resuming task..."
+#: sg_TaskPanel.cpp:566
+msgid "Pop up a menu of commands to apply to this task"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:365
-msgid "Suspending task..."
+#: sg_TaskPanel.cpp:701
+#, c-format
+#, fuzzy, c-format
+msgid "Application: %s"
+msgstr "Aplicação"
+
+#: sg_TaskPanel.cpp:724
+#, c-format
+msgid "%.3f%%"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:394
-msgid "Showing graphics for task..."
+#: sg_TaskPanel.cpp:732
+msgid "Application: Not available"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:431
-msgid "Showing VM console for task..."
+#: sg_TaskPanel.cpp:832
+msgid "Not Available"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:484
+#: sg_TaskPanel.cpp:847
 #, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %s, Status: %s)"
+msgid "Elapsed: %s"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:490
+#: sg_TaskPanel.cpp:861
 #, c-format
-msgid "Are you sure you want to abort these %d tasks?"
+msgid "Remaining (estimated): %s"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:504
-msgid "Aborting task..."
+#: sg_TaskPanel.cpp:876
+#, c-format
+msgid "Status: %s"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:776
-msgid "Show all tasks"
+#: sg_TaskPanel.cpp:1223
+msgid "Retrieving current status."
 msgstr ""
 
-#: clientgui/ViewWork.cpp:777
-msgid "Show all tasks."
+#: sg_TaskPanel.cpp:1229
+msgid "Downloading work from the server."
 msgstr ""
 
-#: clientgui/WelcomePage.cpp:284
-#, fuzzy
-msgid "Add project or account manager"
-msgstr "&Adicionar projeto ou gerenciador de contas..."
+#: sg_TaskPanel.cpp:1234
+msgid "Processing Suspended:  Running On Batteries."
+msgstr ""
 
-#: clientgui/WelcomePage.cpp:288
-msgid "Add project or use BOINC Account Manager"
+#: sg_TaskPanel.cpp:1236
+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."
+#: sg_TaskPanel.cpp:1238
+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."
+#: sg_TaskPanel.cpp:1240
+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"
+#: sg_TaskPanel.cpp:1242
+msgid "Processing Suspended:  Benchmarks Running."
 msgstr ""
 
-#: clientgui/WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
+#: sg_TaskPanel.cpp:1244
+msgid "Processing Suspended."
 msgstr ""
 
-#: clientgui/WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
+#: sg_TaskPanel.cpp:1248
+msgid "Waiting to contact project servers."
 msgstr ""
 
-#: clientgui/WelcomePage.cpp:361
-msgid "Add projects run by other researchers or organizations"
+#: sg_TaskPanel.cpp:1252 sg_TaskPanel.cpp:1261
+msgid "Retrieving current status"
 msgstr ""
 
-#: clientgui/WizardAttach.cpp:673
-msgid "Do you really want to cancel?"
+#: sg_TaskPanel.cpp:1256
+msgid "No work available to process"
 msgstr ""
 
-#: clientgui/WizardAttach.cpp:674
-msgid "Question"
+#: sg_TaskPanel.cpp:1258
+msgid "Unable to connect to the core client"
 msgstr ""
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
+#: wizardex.cpp:377 wizardex.cpp:553
 msgid "&Next >"
 msgstr ""
 
-#: clientgui/wizardex.cpp:383
+#: wizardex.cpp:383
 msgid "< &Back"
 msgstr ""
 
-#: clientgui/wizardex.cpp:553
+#: wizardex.cpp:553
 msgid "&Finish"
 msgstr ""
 
-#: clientgui/common/wxPieCtrl.cpp:64
-msgid "Pie Ctrl"
+#: mac/Mac_GUI.cpp:110
+msgid "Preferences…"
 msgstr ""
 
-#: clientgui/mac/Mac_GUI.cpp:35
+#: mac/Mac_GUI.cpp:122
 msgid "Services"
 msgstr ""
 
-#: clientgui/mac/Mac_GUI.cpp:36
+#: mac/Mac_GUI.cpp:144
 #, c-format
 msgid "Hide %s"
 msgstr ""
 
-#: clientgui/mac/Mac_GUI.cpp:37
+#: mac/Mac_GUI.cpp:158
 msgid "Hide Others"
 msgstr ""
 
-#: clientgui/mac/Mac_GUI.cpp:38
+#: mac/Mac_GUI.cpp:172
 msgid "Show All"
 msgstr ""
 
-#: clientgui/mac/Mac_GUI.cpp:39
+#: mac/Mac_GUI.cpp:186
 #, c-format
+#, fuzzy, c-format
 msgid "Quit %s"
 msgstr "&Sair %s"
 
-#: clientgui/DlgAdvPreferences.h:30
-msgid "specify work start and stop hours in format HH:MM-HH:MM"
-msgstr ""
-
-#: clientgui/DlgAdvPreferences.h:31
-msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
-msgstr ""
-
-# 98%
-#, fuzzy
-#~ msgid ""
-#~ "(C) 2003-2013 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2010 Universidade da Califórnia, Berkeley.\n"
-#~ "Todos os Direitos Reservados."
-
-#, c-format
-#~ msgid "%s - Preferences"
-#~ msgstr "%s - Preferências"
-
-#, no-c-format
-#~ msgid "% CPU time"
-#~ msgstr "% de tempo da CPU"
-#~ msgid "KBytes/sec."
-#~ msgstr "KBytes/s."
-#~ msgid "Mbytes"
-#~ msgstr "Mbytes"
-#~ msgid "every"
-#~ msgstr "a cada"
-#~ msgid "days"
-#~ msgstr "dias"
-#~ msgid "Gigabytes disk space"
-#~ msgstr "Gigabytes de espaço em disco"
 #~ msgid "Workunit name"
 #~ msgstr "Nome da unidade de trabalho"
 
 # float is a variable type in computer programming. It is a known and very used word among computer programmers on Brazil. I believe nobody or only a few people uses it in its translated form; there is no good translation for it in this context. Therefore, translating it may be unbecoming.
 #~ msgid "invalid float"
 #~ msgstr "float inválido"
+
 #, fuzzy
 #~ msgid "Display the advanced (accessible) graphical interface."
 #~ msgstr "Exibir a interface gráfica simples."
@@ -4086,8 +3959,10 @@ msgstr ""
 #, fuzzy
 #~ msgid "Elapsed Time: "
 #~ msgstr "Tempo decorrido"
+
 #~ msgid "Account manager website"
 #~ msgstr "Página do gerenciador de contas na internet"
+
 #~ msgid "Account Manager &URL:"
 #~ msgstr "Gerenciador de Contas &URL:"
 
@@ -4126,10 +4001,13 @@ msgstr ""
 #, no-c-format
 #~ msgid "% of the processors"
 #~ msgstr "% de processadores"
+
 #~ msgid "Identify your account "
 #~ msgstr "Identifique sua conta"
+
 #~ msgid "Read config file"
 #~ msgstr "Ler arquivo de configuração"
+
 #~ msgid "Read configuration info from cc_config.xml"
 #~ msgstr "Ler informações de configuração de cc_config.xml"
 
@@ -4140,32 +4018,44 @@ msgstr ""
 #~ msgstr ""
 #~ "(C) 2003-2010 Universidade da Califórnia, Berkeley.\n"
 #~ "Todos os Direitos Reservados."
+
 #~ msgid "Don't fetch NVIDIA GPU tasks"
 #~ msgstr "Não buscar tarefas de GPU NVIDIA"
+
 #~ msgid "NVIDIA GPU work fetch deferred for"
 #~ msgstr "Busca de trabalho de GPU NVIDIA diferido por"
+
 #~ msgid "NVIDIA GPU work fetch deferral interval"
 #~ msgstr "Intervalo de diferimento de busca de trabalho de GPU NVIDIA"
+
 #~ msgid "Don't fetch ATI GPU tasks"
 #~ msgstr "Não buscar tarefas de GPU ATI"
+
 #~ msgid "ATI GPU work fetch deferred for"
 #~ msgstr "Busca de trabalho de GPU ATI diferido por"
+
 #~ msgid "ATI GPU work fetch deferral interval"
 #~ msgstr "Intervalo de diferimento de busca de trabalho de GPU ATI"
+
 #~ msgid "Web sites"
 #~ msgstr "Páginas de internet"
+
 #~ msgid "Connect about every"
 #~ msgstr "Conectar a cada"
+
 #~ msgid ""
 #~ "this computer is connected to the Internet about every X days\n"
 #~ "(0 if it's always connected)"
 #~ msgstr ""
 #~ "este computador é conectado à Internet a cada X dias\n"
 #~ "(0 se está sempre conectado)"
+
 #~ msgid "days (max. 10)"
 #~ msgstr "dias (máximo 10)"
+
 #~ msgid "Display and network &options..."
 #~ msgstr "&Opções de exibição e rede..."
+
 #~ msgid ""
 #~ "You have requested to exit the %s,\n"
 #~ "which allows you to view and manage\n"
@@ -4180,39 +4070,55 @@ msgstr ""
 #~ "\n"
 #~ "Se também deseja interromper execução das aplicações científicas quando\n"
 #~ "sair do Gerenciador, então selecione das seguintes opções:"
+
 #~ msgid "Stop running science applications when exiting the Manager"
 #~ msgstr ""
 #~ "Interromper execução das aplicações científicas quando sair do Gerenciador"
+
 #~ msgid "CPU work fetch priority"
 #~ msgstr "Prioridade de busca de trabalhos de CPU"
+
 #~ msgid "NVIDIA GPU scheduling priority"
 #~ msgstr "Prioridade de escalonamento de GPU NVIDIA"
+
 #~ msgid "NVIDIA GPU work fetch priority"
 #~ msgstr "Prioridade de busca de trabalho de GPU NVIDIA"
+
 #~ msgid "ATI GPU scheduling priority"
 #~ msgstr "Prioridade de escalonamento de GPU ATI"
+
 #~ msgid "ATI GPU work fetch priority"
 #~ msgstr "Prioridade de busca de trabalho de GPU ATI"
+
 #~ msgid "%s - Options"
 #~ msgstr "%s - Opções"
+
 #~ msgid "Get help with BOINC"
 #~ msgstr "Obter ajuda com BOINC"
+
 #~ msgid "Event Log..."
 #~ msgstr "Registro de Eventos..."
+
 #~ msgid "Attaching to project or account manager..."
 #~ msgstr "Vinculando-se a projeto ou gerenciador de contas..."
+
 #~ msgid "%s - Detach from %s"
 #~ msgstr "%s - Desligar-se de %s"
+
 #~ msgid "Retrying communications."
 #~ msgstr "Tentando comunicações novamente."
+
 #~ msgid "Failed to attach to project"
 #~ msgstr "Falha ao vincular-se ao projeto"
+
 #~ msgid "Failed to attach to account manager"
 #~ msgstr "Falha ao vincular-se ao gerenciador de contas"
+
 #~ msgid "Attached to account manager"
 #~ msgstr "Vinculado ao gerenciador de contas"
+
 #~ msgid "You are now successfully attached to the %s system."
 #~ msgstr "Você está agora vinculado com sucesso ao sistema %s."
+
 #~ msgid "You are now successfully attached to this account manager."
 #~ msgstr "Você está agora vinculado com sucesso a este gerenciador de contas."
-
diff --git a/locale/pt_BR/BOINC-Setup.mo b/locale/pt_BR/BOINC-Setup.mo
index b2154f7..f37004e 100644
Binary files a/locale/pt_BR/BOINC-Setup.mo and b/locale/pt_BR/BOINC-Setup.mo differ
diff --git a/locale/pt_BR/BOINC-Setup.po b/locale/pt_BR/BOINC-Setup.po
index a36f45b..39f68e6 100755
--- a/locale/pt_BR/BOINC-Setup.po
+++ b/locale/pt_BR/BOINC-Setup.po
@@ -4,36 +4,32 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-01-26 00:00-0800\n"
-"PO-Revision-Date: 2015-02-12 00:36-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\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-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: mac_installer\n"
 
 #: Installer.cpp:124
 #, c-format
 msgid "Sorry, this version of %s requires system 10.5 or higher."
 msgstr ""
 
-#: PostInstall.cpp:130
-#: PostInstall.cpp:1136
-#: uninstall.cpp:1618
+#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
 msgid "Yes"
 msgstr ""
 
-#: PostInstall.cpp:131
-#: PostInstall.cpp:1137
-#: uninstall.cpp:1619
+#: PostInstall.cpp:131 PostInstall.cpp:1137 uninstall.cpp:1619
 msgid "No"
 msgstr ""
 
@@ -44,9 +40,11 @@ msgstr ""
 #: PostInstall.cpp:1416
 #, c-format
 msgid ""
-"Users who are permitted to administer this computer will automatically be allowed to run and control %s.\n"
+"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?"
+"Do you also want non-administrative users to be able to run and control %s "
+"on this Mac?"
 msgstr ""
 
 #: PostInstall.cpp:1444
@@ -111,7 +109,8 @@ msgstr ""
 #: uninstall.cpp:840
 #, c-format
 msgid ""
-"Enter your administrator password to completely remove %s from you computer.\n"
+"Enter your administrator password to completely remove %s from you "
+"computer.\n"
 "\n"
 msgstr ""
 
@@ -122,4 +121,3 @@ msgstr ""
 #: uninstall.cpp:1617
 msgid "Continue..."
 msgstr ""
-
diff --git a/locale/pt_BR/BOINC-Web.mo b/locale/pt_BR/BOINC-Web.mo
index b7b44e3..9ada32f 100644
Binary files a/locale/pt_BR/BOINC-Web.mo and b/locale/pt_BR/BOINC-Web.mo differ
diff --git a/locale/pt_BR/BOINC-Web.po b/locale/pt_BR/BOINC-Web.po
index 1da5ee2..9815050 100755
--- a/locale/pt_BR/BOINC-Web.po
+++ b/locale/pt_BR/BOINC-Web.po
@@ -4,22 +4,22 @@
 # FileID  : $Id$
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: \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-12 00:36-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: 2006-09-18 17:43-0300\n"
+"Last-Translator: alcirsp <alcirsp at user.com.br>\n"
+"Language-Team: \n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.2.1\n"
 "X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-SearchPath-0: doc\n"
 "X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
 "X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
 "X-Poedit-KeywordsList: tra\n"
-"X-Poedit-SearchPath-0: doc\n"
 
 #: docutil.php:21
 msgid "Search"
@@ -35,7 +35,9 @@ msgid "This page is %stranslatable%s."
 msgstr ""
 
 #: download.php:39
-msgid "We recommend that you also install VirtualBox, so your computer can work on science projects that require it."
+msgid ""
+"We recommend that you also install VirtualBox, so your computer can work on "
+"science projects that require it."
 msgstr ""
 
 #: download.php:41
@@ -46,14 +48,12 @@ msgstr ""
 msgid "Download BOINC + VirtualBox"
 msgstr ""
 
-#: download.php:54
-#: download.php:69
+#: download.php:54 download.php:69
 #, php-format
 msgid "for %s"
 msgstr ""
 
-#: download.php:57
-#: download.php:72
+#: download.php:57 download.php:72
 #, php-format
 msgid "BOINC version %s"
 msgstr ""
@@ -68,19 +68,28 @@ msgid "Download BOINC"
 msgstr ""
 
 #: download.php:123
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others."
+msgid ""
+"BOINC is a program that lets you donate your idle computer time to science "
+"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, and many others."
 msgstr ""
 
 #: download.php:125
-msgid "After installing BOINC on your computer, you can connect it to as many of these projects as you like."
+msgid ""
+"After installing BOINC on your computer, you can connect it to as many of "
+"these projects as you like."
 msgstr ""
 
 #: download.php:127
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
+msgid ""
+"You may run this software on a computer only if you own the computer or have "
+"the permission of its owner."
 msgstr ""
 
 #: download.php:132
-msgid "We recommend that you download BOINC from the Google Play Store or Amazon Appstore, not from here."
+msgid ""
+"We recommend that you download BOINC from the Google Play Store or Amazon "
+"Appstore, not from here."
 msgstr ""
 
 #: download.php:167
@@ -91,8 +100,7 @@ msgstr ""
 msgid "Release notes"
 msgstr ""
 
-#: download.php:169
-#: index.php:86
+#: download.php:169 index.php:86
 msgid "Help"
 msgstr ""
 
@@ -114,20 +122,34 @@ msgstr ""
 
 #: help.php:12
 #, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
+msgid ""
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who "
+"can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"through the process of installing and using BOINC; %s troubleshoot any "
+"problems you might have."
 msgstr ""
 
 #: help.php:21
 #, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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."
+msgid ""
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. "
+"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 ""
 
 #: help.php:28
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
+msgid ""
+"The best way to get help is by voice, for which you need either built-in "
+"microphone and speakers or an external headset for your computer.  You can "
+"also use Skype's text-based chat system or regular email (if you don't have "
+"Skype) to communicate with Help Volunteers."
 msgstr ""
 
 #: help.php:31
-msgid "Volunteers speaking several languages are available. Please select a language:"
+msgid ""
+"Volunteers speaking several languages are available. Please select a "
+"language:"
 msgstr ""
 
 #: help.php:47
@@ -136,16 +158,22 @@ msgstr ""
 
 #: help.php:50
 #, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
+msgid ""
+"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+"Volunteer%s.  It's a great way to help the cause of scientific research and "
+"volunteer computing - and it's fun!"
 msgstr ""
 
 #: help.php:56
 #, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
+msgid ""
+"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
 msgstr ""
 
 #: help_funcs.php:107
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
+msgid ""
+"BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
+"or the University of California."
 msgstr ""
 
 #: help_funcs.php:110
@@ -196,9 +224,7 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: index.php:87
-#: index.php:120
-#: index.php:171
+#: index.php:87 index.php:120 index.php:171
 msgid "Documentation"
 msgstr ""
 
@@ -211,7 +237,10 @@ msgid "Links"
 msgstr ""
 
 #: index.php:94
-msgid "Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:"
+msgid ""
+"Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure "
+"diseases, study global warming, discover pulsars, and do many other types of "
+"scientific research.  It's safe, secure, and easy:"
 msgstr ""
 
 #: index.php:96
@@ -228,7 +257,9 @@ msgstr ""
 
 #: index.php:102
 #, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
+msgid ""
+"Or, if you run several projects, try an %saccount manager%s such as %"
+"sGridRepublic%s or %sBAM!%s. "
 msgstr ""
 
 #: index.php:118
@@ -240,11 +271,15 @@ msgid "Software updates"
 msgstr ""
 
 #: index.php:128
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving "
+"you the computing power of thousands of CPUs."
 msgstr ""
 
 #: index.php:132
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
 msgstr ""
 
 #: index.php:137
@@ -317,7 +352,8 @@ msgstr ""
 
 #: index.php:217
 #, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
+msgid ""
+"Open-source software for %svolunteer computing%s and %sgrid computing%s."
 msgstr ""
 
 #: index.php:230
@@ -337,7 +373,10 @@ msgid "Seismology"
 msgstr ""
 
 #: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
+msgid ""
+"The Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to Internet-connected computers.  You must buy a "
+"sensor to participate."
 msgstr ""
 
 #: projects.inc:27
@@ -349,23 +388,24 @@ msgid "Environmental research"
 msgstr ""
 
 #: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
+msgid ""
+"This project is creating a free and continuously updated map of radiation "
+"levels by using sensors connected to volunteers' computers.  You must buy a "
+"sensor to participate."
 msgstr ""
 
 #: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
+msgid ""
+"To participate in these projects you must buy a sensor and attach it to your "
+"computer."
 msgstr ""
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
 msgstr ""
 
-#: projects.inc:60
-#: projects.inc:364
-#: projects.inc:408
-#: projects.inc:457
-#: projects.inc:464
-#: projects.inc:511
+#: projects.inc:60 projects.inc:364 projects.inc:408 projects.inc:457
+#: projects.inc:464 projects.inc:511
 msgid "Private"
 msgstr ""
 
@@ -374,7 +414,11 @@ msgid "Artificial intelligence"
 msgstr ""
 
 #: projects.inc:62
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
+msgid ""
+"Parse and convert semantic nets for use in FreeHAL, an artificial "
+"intelligence that uses semantic networks, stemmers, part of speech "
+"databases, and part of speech taggers in order to imitate human behavior in "
+"conversations."
 msgstr ""
 
 #: projects.inc:69
@@ -390,7 +434,12 @@ msgid "Antimalarial drug discovery"
 msgstr ""
 
 #: projects.inc:84
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
+msgid ""
+"The parasite that causes malaria continues to evolve resistance to available "
+"medication. We therefore urgently need to discover new drugs to replace "
+"existing drugs. Importantly, these new drugs need to target NEW proteins in "
+"the parasite. The FightMalaria at Home project is aimed at finding these new "
+"targets."
 msgstr ""
 
 #: projects.inc:90
@@ -402,7 +451,12 @@ msgid "Protein structure prediction"
 msgstr ""
 
 #: projects.inc:92
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
+msgid ""
+"POEM at HOME uses a computational approach to predict the biologically active "
+"structure of proteins, to understand the signal-processing mechanisms when "
+"the proteins interact with one another, to understand diseases related to "
+"protein malfunction or aggregation, and to develop new drugs on the basis of "
+"the three-dimensions structure of biologically important proteins."
 msgstr ""
 
 #: projects.inc:98
@@ -414,7 +468,11 @@ msgid "Study of protein - ligand interactions"
 msgstr ""
 
 #: projects.inc:100
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
+msgid ""
+"Docking at Home has both bioscience and computer science goals. The project "
+"aims to further knowledge of the atomic details of protein-ligand "
+"interactions and, by doing so, will search for insights into the discovery "
+"of novel pharmaceuticals."
 msgstr ""
 
 #: projects.inc:114
@@ -426,7 +484,11 @@ msgid "Molecular simulations of proteins"
 msgstr ""
 
 #: projects.inc:116
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
+msgid ""
+"GPUGrid.net opens novel computational scenarios by the first full-atom "
+"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
+"New biomedical applications suddenly become possible giving a new role to "
+"computational biology for biomedical research."
 msgstr ""
 
 #: projects.inc:122
@@ -438,11 +500,15 @@ msgid "Genetic linkage analysis"
 msgstr ""
 
 #: projects.inc:124
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
+msgid ""
+"Superlink at Technion helps geneticists all over the world find disease-"
+"provoking genes causing some types of diabetes, hypertension (high blood "
+"pressure), cancer, schizophrenia and many others."
 msgstr ""
 
 #: projects.inc:138
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
+msgid ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
 msgstr ""
 
 #: projects.inc:139
@@ -450,7 +516,11 @@ msgid "Life science research"
 msgstr ""
 
 #: projects.inc:140
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
+msgid ""
+"The Lattice Project supplies computing power to scientists at the University "
+"of Maryland studying evolutionary relationships based on DNA sequence data; "
+"bacterial, plasmid, and virus protein sequences; and biological diversity in "
+"nature reserves. "
 msgstr ""
 
 #: projects.inc:146
@@ -462,20 +532,32 @@ msgid "Epidemiology"
 msgstr ""
 
 #: projects.inc:148
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
+msgid ""
+"Simulation models of the transmission dynamics and health effects of malaria "
+"are an important tool for malaria control. They can be used to determine "
+"optimal strategies for delivering mosquito nets, chemotherapy, or new "
+"vaccines which are currently under development and testing.  Such modeling "
+"is extremely computer intensive, requiring simulations of large human "
+"populations with a diverse set of parameters related to biological and "
+"social factors that influence the distribution of the disease. "
 msgstr ""
 
 #: projects.inc:170
 msgid "University of Washington"
 msgstr ""
 
-#: projects.inc:171
-#: projects.inc:179
+#: projects.inc:171 projects.inc:179
 msgid "Biology"
 msgstr ""
 
 #: projects.inc:172
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
+msgid ""
+"Determine the 3-dimensional shapes of proteins in research that may "
+"ultimately lead to finding cures for some major human diseases. By running "
+"Rosetta at home you will help us speed up and extend our research in ways we "
+"couldn't possibly attempt without your help. You will also be helping our "
+"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
+"Cancer, and Alzheimer's"
 msgstr ""
 
 #: projects.inc:178
@@ -483,7 +565,10 @@ msgid "University of Vienna"
 msgstr ""
 
 #: projects.inc:180
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
+msgid ""
+"Calculate similarities between proteins. SIMAP provides a public database of "
+"the resulting data, which plays a key role in many bioinformatics research "
+"projects."
 msgstr ""
 
 #: projects.inc:186
@@ -499,7 +584,15 @@ msgid "Climate study"
 msgstr ""
 
 #: projects.inc:200
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
+msgid ""
+"Investigate the approximations that have to be made in state-of-the-art "
+"climate models. By running the model thousands of times we hope to find out "
+"how the model responds to slight tweaks to these approximations - slight "
+"enough to not make the approximations any less realistic. This will allow us "
+"to improve our understanding of how sensitive our models are to small "
+"changes and also to things like changes in carbon dioxide and the sulphur "
+"cycle. This will allow us to explore how climate may change in the next "
+"century under a wide range of different scenarios."
 msgstr ""
 
 #: projects.inc:207
@@ -511,30 +604,44 @@ msgid "Mechanical engineering"
 msgstr ""
 
 #: projects.inc:214
-msgid "Currently we are calculating the optimum design of a structure call the 52 bar truss"
+msgid ""
+"Currently we are calculating the optimum design of a structure call the 52 "
+"bar truss"
 msgstr ""
 
-#: projects.inc:224
-#: projects.inc:263
-#: projects.inc:271
+#: projects.inc:224 projects.inc:263 projects.inc:271
 msgid "Astronomy"
 msgstr ""
 
 #: projects.inc:225
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
+msgid ""
+"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
+"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
+"Universe. We will measure physical parameters (such as stellar mass surface "
+"density, star formation rate surface density, attenuation, and first-order "
+"star formation history) on a resolved pixel-by-pixel basis using spectral "
+"energy distribution (SED) fitting techniques in a distributed computing mode."
 msgstr ""
 
 #: projects.inc:247
 msgid "University of Texas at Austin"
 msgstr ""
 
-#: projects.inc:248
-#: projects.inc:279
+#: projects.inc:248 projects.inc:279
 msgid "Chemistry"
 msgstr ""
 
 #: projects.inc:249
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
+msgid ""
+"A common problem in theoretical chemistry, condensed matter physics and "
+"materials science is the calculation of the time evolution of an atomic "
+"scale system where, for example, chemical reactions and/or diffusion occur. "
+"Generally the events of interest are quite rare (many orders of magnitude "
+"slower than the vibrational movements of the atoms), and therefore direct "
+"simulations, tracking every movement of the atoms, would take thousands of "
+"years of computer calculations on the fastest present day computer before a "
+"single event of interest can be expected to occur.  Our research group is "
+"interested in calculating the long time dynamics of systems."
 msgstr ""
 
 #: projects.inc:262
@@ -542,7 +649,10 @@ msgid "University of Illinois at Urbana-Champaign"
 msgstr ""
 
 #: projects.inc:264
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
+msgid ""
+"The goal of Cosmology at Home is to search for the model that best describes "
+"our Universe and to find the range of models that agree with the available "
+"astronomical particle physics data."
 msgstr ""
 
 #: projects.inc:270
@@ -550,7 +660,10 @@ msgid "Rensselaer Polytechnic Institute"
 msgstr ""
 
 #: projects.inc:272
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
+msgid ""
+"The goal of Milkyway at Home is to create a highly accurate three dimensional "
+"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
+"Survey."
 msgstr ""
 
 #: projects.inc:278
@@ -558,7 +671,13 @@ msgid "Leiden University, The Netherlands"
 msgstr ""
 
 #: projects.inc:280
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
+msgid ""
+"Surface science calculations using Classical Dynamics.  Leiden Classical "
+"allows volunteers, students and other scientist to submit their personal "
+"calculations to the grid. Each user has his own personal queue for Classical "
+"Dynamics jobs. In this way students have used the grid to simulate liquid "
+"argon, or to test the validity of the ideal gas law by actually doing the "
+"simulations through the grid."
 msgstr ""
 
 #: projects.inc:294
@@ -570,25 +689,36 @@ msgid "Astrophysics"
 msgstr ""
 
 #: projects.inc:296
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
+msgid ""
+"Search for spinning neutron stars (also called pulsars) using data from the "
+"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
+"observatory.  Einstein at Home is a World Year of Physics 2005 project "
+"supported by the American Physical Society (APS) and by a number of "
+"international organizations."
 msgstr ""
 
-#: projects.inc:310
-#: projects.inc:318
+#: projects.inc:310 projects.inc:318
 msgid "CERN (European Organization for Nuclear Research)"
 msgstr ""
 
-#: projects.inc:311
-#: projects.inc:319
+#: projects.inc:311 projects.inc:319
 msgid "Physics"
 msgstr ""
 
 #: projects.inc:312
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
+msgid ""
+"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
+"European Organization for Nuclear Research, the world's largest particle "
+"physics laboratory.  It is the most powerful instrument ever built to "
+"investigate on particles proprieties. LHC at home runs simulations to improve "
+"the design of LHC and its detectors."
 msgstr ""
 
 #: projects.inc:320
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
+msgid ""
+"This project uses CERN-developed virtual machine technology for full-fledged "
+"LHC event physics simulation on volunteer computers.  Requires that you "
+"install VirtualBox on your computer"
 msgstr ""
 
 #: projects.inc:326
@@ -600,7 +730,12 @@ msgid "Astrophysics, astrobiology"
 msgstr ""
 
 #: projects.inc:328
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
+msgid ""
+"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
+"goal is to detect intelligent life outside Earth. One approach, known as "
+"radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
+"signals from space. Such signals are not known to occur naturally, so a "
+"detection would provide evidence of extraterrestrial technology."
 msgstr ""
 
 #: projects.inc:342
@@ -612,7 +747,11 @@ msgid "Chemical engineering and nanotechnology"
 msgstr ""
 
 #: projects.inc:344
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
+msgid ""
+"The study of molecular magnets and controlled nanoscale magnetism.  These "
+"magnetic molecules may be used to develop tiny magnetic switches, with "
+"applications in medicine (such as local tumor chemotherapy) and "
+"biotechnology."
 msgstr ""
 
 #: projects.inc:351
@@ -628,7 +767,10 @@ msgid "Physics, biochemistry, and others"
 msgstr ""
 
 #: projects.inc:358
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
+msgid ""
+"The objective of CAS at home is to encourage and assist scientists in China to "
+"adopt the technologies of volunteer computing and volunteer thinking for "
+"their research."
 msgstr ""
 
 #: projects.inc:365
@@ -636,11 +778,12 @@ msgid "Mathematics, physics, evolution"
 msgstr ""
 
 #: projects.inc:366
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
+msgid ""
+"Yoyo at home is an adapter between BOINC and several existing volunteer "
+"computing projects: ECM, Muon, Evolution at home, and distributed.net"
 msgstr ""
 
-#: projects.inc:371
-#: projects.inc:527
+#: projects.inc:371 projects.inc:527
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 msgstr ""
 
@@ -649,7 +792,11 @@ msgid "European research projects"
 msgstr ""
 
 #: projects.inc:373
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
+msgid ""
+"The EDGeS at Home Beta project integrates volunteer computing into the service "
+"grid network of Europe by allowing service grids to send workunits to be "
+"processed by the volunteers of this project. The scientific projects covered "
+"by the project include math, physics, biology, etc."
 msgstr ""
 
 #: projects.inc:379
@@ -673,7 +820,11 @@ msgid "Medical, environmental and other humanitarian research"
 msgstr ""
 
 #: projects.inc:389
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
+msgid ""
+"To further critical non-profit research on some of humanity's most pressing "
+"problems by creating the world's largest volunteer computing grid.  Research "
+"includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"clean water and many more."
 msgstr ""
 
 #: projects.inc:395
@@ -692,21 +843,18 @@ msgstr ""
 msgid "Simulation of quantum computing; Goldbach's conjecture."
 msgstr ""
 
-#: projects.inc:450
-#: projects.inc:458
+#: projects.inc:450 projects.inc:458
 msgid "Cryptography"
 msgstr ""
 
 #: projects.inc:459
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
+msgid ""
+"Attempt to decode 3 original Enigma messages. The signals were intercepted "
+"in the North Atlantic in 1942 and are believed to be unbroken."
 msgstr ""
 
-#: projects.inc:465
-#: projects.inc:504
-#: projects.inc:512
-#: projects.inc:520
-#: projects.inc:528
-#: projects.inc:568
+#: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
+#: projects.inc:528 projects.inc:568
 msgid "Mathematics"
 msgstr ""
 
@@ -723,11 +871,19 @@ msgid "Factorization of large integers"
 msgstr ""
 
 #: projects.inc:473
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
+msgid ""
+"NFS at Home is a research project that uses Internet-connected computers to do "
+"the lattice sieving step in the Number Field Sieve factorization of large "
+"integers. As a young school student, you gained your first experience at "
+"breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
+"NFS at Home is a continuation of that experience, only with integers that are "
+"hundreds of digits long."
 msgstr ""
 
 #: projects.inc:479
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
+msgid ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
 msgstr ""
 
 #: projects.inc:480
@@ -735,7 +891,11 @@ msgid "Software testing"
 msgstr ""
 
 #: projects.inc:481
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
+msgid ""
+"The aim of this project is to provide a powerful distributed computing "
+"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
+"well as others Lithuanian academic institutions.  Current applications "
+"involve the study of Monte-Carlo based software testing."
 msgstr ""
 
 #: projects.inc:503
@@ -743,11 +903,20 @@ msgid "Mathematical Institute of Leiden University / Kennislink"
 msgstr ""
 
 #: projects.inc:505
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
+msgid ""
+"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
+"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
+"product of the distinct prime factors of n. The ABC conjecture says that "
+"there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for "
+"any real h > 1. The ABC conjecture is currently one of the greatest open "
+"problems in mathematics. If it is proven to be true, a lot of other open "
+"problems can be answered directly from it."
 msgstr ""
 
 #: projects.inc:513
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
+msgid ""
+"Primegrid has multiple projects searching for different forms of very large "
+"prime numbers, including searching for the largest known prime number."
 msgstr ""
 
 #: projects.inc:519
@@ -755,11 +924,15 @@ msgid "Hochschule RheinMain University of Applied Sciences"
 msgstr ""
 
 #: projects.inc:521
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
+msgid ""
+"Search for counterexamples to two conjectures related to the identification "
+"of prime numbers"
 msgstr ""
 
 #: projects.inc:529
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
+msgid ""
+"Find all the generalized binary number systems (in which bases are matrices "
+"and digits are vectors) up to dimension 11."
 msgstr ""
 
 #: ../html/inc/news.inc:40
@@ -771,3 +944,423 @@ msgstr ""
 msgid "News is available as an %sRSS feed%s"
 msgstr ""
 
+# The charset used for the text in this file (please try to use UTF-8 if possible)
+# The charset used for the text in this file (please try to use UTF-8 if possible)
+# #########################################
+# Language: English (International)
+# FileID  : $Id: pt_BR.po 13097 2007-07-04 15:28:28Z Rytis $
+# For more information please see:
+# http://boinc.berkeley.edu/web_translation.php
+#~ msgid "CHARSET"
+#~ msgstr "UTF-8"
+
+#~ msgid "DL_MIRRORS"
+#~ msgstr ""
+#~ "Note: files are downloaded from mirror servers at boinc.berkeley.edu, "
+#~ "morel.mit.edu, einstein.aei.mpg.de, einstein.astro.gla.ac.uk, einstein."
+#~ "ligo.caltech.edu, and einstein.aset.psu.edu (thanks to these "
+#~ "institutions). The server is chosen randomly - if a download fails, "
+#~ "reload this page and try again. "
+
+# #############################################
+# help.php
+# #############################################
+#~ msgid "HELP_TITLE"
+#~ msgstr "Getting help with BOINC"
+
+#~ msgid "HELP_HEADING1"
+#~ msgstr "Online Help"
+
+#~ msgid "HELP_P1_1"
+#~ msgstr ""
+#~ "BOINC Online Help lets you talk one-on-one with experienced BOINC users, "
+#~ "who can: %s answer questions about BOINC and volunteer computing; %s walk "
+#~ "you through the process of installing and using BOINC; %s troubleshoot "
+#~ "any problems you might have. "
+
+#~ msgid "HELP_P1_2"
+#~ msgstr ""
+#~ "BOINC Online Help is based on %sSkype%s, an Internet-based telephone "
+#~ "system. 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. "
+
+#~ msgid "HELP_P1_3"
+#~ msgstr ""
+#~ "The best way to get help is by voice, for which you need either built-in "
+#~ "microphone and speakers or an external headset for your computer. You can "
+#~ "also use Skype's text-based chat system or regular email (if you don't "
+#~ "have Skype) to communicate with Help Volunteers."
+
+#~ msgid "HELP_P1_4"
+#~ msgstr ""
+#~ "Volunteers speaking several languages are available. Please select a "
+#~ "language: "
+
+#~ msgid "HELP_HEADING2"
+#~ msgstr "BOINC help on the web"
+
+#~ msgid "HELP_P2_ITEM1"
+#~ msgstr "BOINC user's manual"
+
+#~ msgid "HELP_P2_ITEM2"
+#~ msgstr "Troubleshooting BOINC "
+
+#~ msgid "HELP_P2_ITEM3"
+#~ msgstr "BOINC-related web sites "
+
+#~ msgid "HELP_P2_ITEM4"
+#~ msgstr "The BOINC message boards "
+
+#~ msgid "HELP_P2_ITEM5"
+#~ msgstr "The message boards on any BOINC-based project "
+
+#~ msgid "HELP_HEADING3"
+#~ msgstr "Be a Help Volunteer"
+
+#~ msgid "HELP_P3_1"
+#~ msgstr ""
+#~ "If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+#~ "Volunteer%s. It's a great way to help the cause of scientific research "
+#~ "and volunteer computing - and it's fun!  "
+
+#~ msgid "HELP_P3_2"
+#~ msgstr ""
+#~ "If you're already a Help Volunteer: to edit your settings, %sclick here"
+#~ "%s. "
+
+# #############################################
+# index.php
+# #############################################
+#~ msgid "HOME_HEADING1"
+#~ msgstr "Volunteer"
+
+#~ msgid "HOME_P1"
+#~ msgstr ""
+#~ " Use the idle time on your computer  (Windows, Mac, or Linux)  to cure "
+#~ "diseases, study global warming,  discover pulsars, and do many other "
+#~ "types of scientific research.  It's safe, secure, and easy:  %sChoose%s "
+#~ "projects  %sDownload%s and run BOINC software  %sEnter%s an email address "
+#~ "and password. "
+
+#~ msgid "HOME_P2"
+#~ msgstr ""
+#~ "Or, if you run several projects, try an %saccount manager%s such as "
+#~ "%sGridRepublic%s or %sBAM!%s. "
+
+#~ msgid "HOME_P3"
+#~ msgstr ""
+#~ "If you have any questions, or need help getting started, you can %stalk "
+#~ "to a Volunteer Helper%s. "
+
+#~ msgid "HOME_DOWNLOAD"
+#~ msgstr "Download"
+
+#~ msgid "HOME_WEB_SITES"
+#~ msgstr "Web"
+
+#~ msgid "HOME_ADD_ONS"
+#~ msgstr "Add-ons"
+
+#~ msgid "HOME_SURVEY"
+#~ msgstr "Survey"
+
+#~ msgid "HOME_BOINC"
+#~ msgstr "Berkeley Open Infrastructure for Network Computing"
+
+#~ msgid "HOME_BOINC_DESC"
+#~ msgstr ""
+#~ "Open-source software for %svolunteer computing%s and %sgrid computing%s"
+
+# #######################################
+# download.php 2006/08/03 by je2bwm
+# #######################################
+#~ msgid "DL_DOWNLOAD"
+#~ msgstr "Baixe o BOINC"
+
+#~ msgid "DL_VERSION_LNAME_SIZE"
+#~ msgstr "%s de %s (%s MB)"
+
+#~ msgid "DL_WHATS_BOINC"
+#~ msgstr ""
+#~ " BOINC é um programa que permite a você doar o tempo ocioso de seu micro "
+#~ "para projetos científicos como o...        SETI at home, Climateprediction."
+#~ "net, Rosetta at home,        World Community Grid, e muitos outros.        "
+#~ "<p>       Depois de instalar o BOINC em seu micro,     você poderá "
+#~ "conectar a vários desses projetos, como você desejar.<p>"
+
+#~ msgid "DL_SYSTEMREQ"
+#~ msgstr "Requisitos do sistema"
+
+#~ msgid "DL_RELNOTES"
+#~ msgstr "Notas da versão"
+
+#~ msgid "DL_OTHERSYS"
+#~ msgstr "Outros sistemas"
+
+#~ msgid "DL_ALLVERSIONS"
+#~ msgstr "Todas as versões"
+
+#~ msgid "DL_IF_OTHERTYPES"
+#~ msgstr "Se seu micro não for de nenhum dos tipos acima, você poderá"
+
+#~ msgid "DL_MAKEYOUROWN"
+#~ msgstr "%s desenvolver seu próprio software %s ou"
+
+#~ msgid "DL_DL_FROM3RDP"
+#~ msgstr ""
+#~ "%s baixar programas de terceiros %s (disponível para Solaris/Opteron, "
+#~ "Linux/Opteron, Linux/PPC, HP-UX, e FreeBSD, e outros)."
+
+#~ msgid "DL_DOWNLOAD_TITLE"
+#~ msgstr "BOINC: computação para a ciência"
+
+# #############################################
+# system_requirements.php by je2bwm 2006/08/07
+# #############################################
+#~ msgid "SRQ_PAGE_TITLE"
+#~ msgstr "Requisitos do sistema"
+
+#~ msgid "SRQ_INTRO"
+#~ msgstr ""
+#~ "Seu micro precisa satisfazer os seguintes requisitos para rodar o BOINC. "
+#~ "Os projetos baseados no BOINC podem ter requisitos adicionais."
+
+#~ msgid "SRQ_MSWIN"
+#~ msgstr "Windows"
+
+#~ msgid "SRQ_OS"
+#~ msgstr "Sistemas operacionais"
+
+#~ msgid "SRQ_MSWIN_REQ_OS"
+#~ msgstr "Windows 98 ou posterior"
+
+#~ msgid "SRQ_MIN_HARDWARE"
+#~ msgstr "Hardware mínimo"
+
+#~ msgid "SRQ_MSWIN_REQ_CPU"
+#~ msgstr "Pentium 233 MHz (Recomendado: Pentium 500 MHz ou superior)"
+
+#~ msgid "SRQ_MSWIN_REQ_RAM"
+#~ msgstr "64 MB RAM (Recomendado: 128 MB RAM ou superior)"
+
+#~ msgid "SRQ_MSWIN_REQ_DISK"
+#~ msgstr "20 MB de espaço em disco"
+
+#~ msgid "SRQ_APPLMAC"
+#~ msgstr "Macintosh"
+
+#~ msgid "SRQ_APPLMAC_REQ_OS"
+#~ msgstr "Mac OS X 10.3 e posteriores"
+
+#~ msgid "SRQ_APPLMAC_REQ_CPU"
+#~ msgstr "Macintosh com processador Intel x86or PowerPC G3, G4, ou G5"
+
+#~ msgid "SRQ_APPLMAC_REQ_RAM"
+#~ msgstr "128 MB RAM (Recomendado: 256 MB RAM ou superior)"
+
+#~ msgid "SRQ_APPLMAC_REQ_DISK"
+#~ msgstr "200 MB de espaço em disco"
+
+#~ msgid "SRQ_LINUX"
+#~ msgstr "Linux"
+
+#~ msgid "SRQ_LINUX_REQ_KERNEL"
+#~ msgstr "Linux kernel 2.2.14 ou posterior"
+
+#~ msgid "SRQ_LINUX_REQ_GLIBC"
+#~ msgstr "glibc 2.3.2  ou posterior"
+
+#~ msgid "SRQ_LINUX_REQ_XFREE86"
+#~ msgstr "XFree86-3.3.6 ou posterior"
+
+#~ msgid "SRQ_LINUX_REQ_GTKPLUS"
+#~ msgstr "gtk+2.0 ou posterior"
+
+#~ msgid "SRQ_LINUX_REQ_CPU"
+#~ msgstr "Pentium 500 MHz  ou superior"
+
+#~ msgid "SRQ_LINUX_REQ_RAM"
+#~ msgstr "64 MB RAM"
+
+#~ msgid "SRQ_LINUX_REQ_DISK"
+#~ msgstr "50 MB de espaço em disco"
+
+# #############################################
+# release notes by je2bwm 2006/08/09
+# #############################################
+#~ msgid "RLN_PAGE_TITLE"
+#~ msgstr "Notas da versão"
+
+#~ msgid "RLN_WHATS_NEW"
+#~ msgstr "Novidades %s"
+
+#~ msgid "RLN_INSTALLING"
+#~ msgstr "Instalando"
+
+#~ msgid "RLN_UNINSTALLING"
+#~ msgstr "Desinstalando"
+
+#~ msgid "RLN_KNOWN_ISSUES"
+#~ msgstr "Emissão conhecida"
+
+#~ msgid "RLN_TROUBLESHOOT"
+#~ msgstr "Eliminando problemas"
+
+#~ msgid "RLN_NEWF_5_4_AM"
+#~ msgstr ""
+#~ "Suporte para  'Gerenciadores de contas' - sites que permitem a você "
+#~ "navegar nos projetos BOINC, conectar/desconectar, mudar configurações e "
+#~ "partilhar recursos, tudo de maneira simples, com um único clique. Os "
+#~ "Gerenciadores de contas também são úteis caso você tiver vários micros - "
+#~ "você faz alterações em um micro, e todos os outros micros serão "
+#~ "alterados. "
+
+#~ msgid "RLN_NEWF_5_4_PREF_OVERRIDE"
+#~ msgstr ""
+#~ "As preferências gerais podem ser sobre-escritas por um arquivo local; os "
+#~ "detalhes estão  %s aqui %s."
+
+#~ msgid "RLN_NEWF_5_4_ALERTS_CONNECT"
+#~ msgstr ""
+#~ "O BOINC alertará você sempre que necessário para criar uma conexão com a "
+#~ "internet."
+
+#~ msgid "RLN_RECOMMEND_LATEST_VERSION"
+#~ msgstr "Recomendamos que todos os usuários do BOINC atualizem para a %s."
+
+#~ msgid "RLN_LINK2_VERSION_HISTORY"
+#~ msgstr "Um histórico detalhado da revisão está %s aqui %s."
+
+#~ msgid "RLN_MSWIN"
+#~ msgstr "Windows"
+
+#~ msgid "RLN_APPLMAC"
+#~ msgstr "Macintosh"
+
+#~ msgid "RLN_LINUX"
+#~ msgstr "Linux"
+
+#~ msgid "RLN_MSWIN_INSTALL_MODES"
+#~ msgstr "O BOINC pode ser instalado de vários modos:"
+
+#~ msgid "RLN_SINGLE_USER_INSTALL"
+#~ msgstr "Instalação tipo Simples-usuário"
+
+#~ msgid "RLN_MSWIN_INSTALL_SINGLE_USER_DESC"
+#~ msgstr ""
+#~ "Este é o modo recomendado. O BOINC rodará somente quando você (o usuário "
+#~ "instalador) estiver \"logado\" no micro. O BOINC ficará na lista do menu "
+#~ "Iniciar para seu perfil, mas não estará disponível em outros perfis. A "
+#~ "opção \"Exibir gráficos\" do gerenciador de tarefas do BOINC funcionará "
+#~ "somente em seu perfil. O protetor de telas do BOINC será exibido somente "
+#~ "em seu perfil (os outros perfis poderão rodar o protetor de telas, mas "
+#~ "somente com textos)."
+
+#~ msgid "RLN_SHARED_INSTALL"
+#~ msgstr "Instalação compartilhada"
+
+#~ msgid "RLN_MSWIN_INSTALL_SHARED_DESC"
+#~ msgstr ""
+#~ "O BOINC rodará sempre, em qualquer perfil. Também será exibido no menu "
+#~ "Iniciar de todos os usuários. Quando o BOINC estiver rodando, ele rodará "
+#~ "como um usuário em particular (sempre será o primeiro usuário instalou o "
+#~ "BOINC pela primeira vez). O comando \"Exibir gráficos\" no gerenciador do "
+#~ "BOINC funcionará somente no perfil do instalador. O protetor de telas do "
+#~ "BOINC funcionará somente no perfil do instalador (outros perfis poderão "
+#~ "rodar o protetor de telas, mas verão somente textos)."
+
+#~ msgid "RLN_WIN_SERVICE_INSTALL"
+#~ msgstr "Instalação tipo serviço"
+
+#~ msgid "RLN_MSWIN_INSTALL_WINSERVICE_DESC"
+#~ msgstr ""
+#~ "O BOINC funcionará o tempo todo (mesmo que nenhum perfil estiver "
+#~ "selecionado). O BOINC aparecerá no menu Iniciar do perfil do instalador, "
+#~ "mas não nos outros perfis. O comando \"Exibir gráficos\" no gerenciador "
+#~ "BOINC não funcionará para nenhum usuário. O protetor de telas do BOINC "
+#~ "exibirá somente textos. "
+
+#~ msgid "RLN_LINUX_INSTALL_SEA_DESC"
+#~ msgstr ""
+#~ "O BOINC para Linux é distribuído como um arquivo auto-extrator. Esse tipo "
+#~ "de instalação requer que voc~e esteja familiarizado com o modo linha-de-"
+#~ "comando do UNIX "
+
+#~ msgid "RLN_LINUX_DL_FILENAME"
+#~ msgstr "Os arquivos recebidos tem nomes como <code>%s</code>."
+
+#~ msgid "RLN_LINUX_RUN_SEA"
+#~ msgstr "Após baixar o arquivo, escreva<pre>%s</pre>"
+
+#~ msgid "RLN_LINUX_RESULTOF_SEA"
+#~ msgstr "Isso criará uma pasta BOINC/ com os seguintes arquivos:"
+
+#~ msgid "RLN_BOINC_CORE_CL"
+#~ msgstr "O programa principal do BOINC"
+
+#~ msgid "RLN_BOINC_MANAGER"
+#~ msgstr "O gerenciador do BOINC"
+
+#~ msgid "RLN_SCRIPT_RUN_CLIENT_DESC"
+#~ msgstr ""
+#~ "Um \"script\" que entrará na pasta BOINC e rodará o programa principal."
+
+#~ msgid "RLN_SCRIPT_RUN_MANAGER_DESC"
+#~ msgstr "Um \"script\" que entrará na pasta BOINC e rodará o gerenciador."
+
+#~ msgid "RLN_LINUX_AUTOSTART"
+#~ msgstr ""
+#~ "Talves você terá que%s ativar automaticamente o programa principal %sao "
+#~ "iniciar o micro."
+
+#~ msgid "RLN_MSWIN_UNINSTALL_DESC"
+#~ msgstr ""
+#~ "No menu Iniciar, selecione Programas / BOINC / Desinstalar. Ou no menu "
+#~ "Iniciar, selecione Configurações / Adicionar ou remover programas."
+
+#~ msgid "RLN_ISSUE_PROXY_NTLMAUTH"
+#~ msgstr ""
+#~ "Caso você usar um servidor proxy, por favor desative as atualizações por "
+#~ "um momento. Nos temos dificuldades em funcionar com proxies que usam "
+#~ "autenticação NTLM. "
+
+#~ msgid "RLN_ISSUE_MSWIN_LATEST_DIRECTX"
+#~ msgstr ""
+#~ "Se as aplicações BOINC estiverem travando repetidamente seu micro, é "
+#~ "possível que você tenha que %atualizar para a última versão do DirectX %s."
+
+#~ msgid "RLN_ISSUE_MSWIN_SCREENSAVER_XP3D"
+#~ msgstr ""
+#~ "Caso o BOINC rodar ao mesmo tempo que um protetor de telas 3-D no Windows "
+#~ "XP, o sistema se tornará lento e  suscetível. "
+
+#~ msgid "RLN_ISSUE_MSWIN_NO_SCREENSAVER"
+#~ msgstr ""
+#~ "Versões feitas antes de Outubro de 2004 não exibem gráficos protetores de "
+#~ "tela com as opções de instalação tipo Serviço ou Compartilhada, nem "
+#~ "instalado como Simples usuáriom se a proteção de tela estiver protegida "
+#~ "com senha em micros com sistema baseado em NT."
+
+#~ msgid "RLN_TROUBLESHOOT_INTRO"
+#~ msgstr ""
+#~ "Case tiver problemas com o BOINC, aqui estão alguns passos que você "
+#~ "poderá tentar:"
+
+#~ msgid "RLN_TROUBLESHOOT_PRJ_SPECIFIC"
+#~ msgstr ""
+#~ "Caso o problema for em um projeto em particular, vá na área de 'Questions "
+#~ "and Answers' no site do projeto. Você encontrará soluções para seu "
+#~ "problema. Caso contrário, deixe uma mensagem aqui, e você receberá ajuda "
+#~ "de outros usuários."
+
+#~ msgid "RLN_TROUBLESHOOT_PROBLEM_PERSIST"
+#~ msgstr ""
+#~ "Caso o problema específico do projeto persistir, use o Gerenciador BOINC "
+#~ "para \"Resetar\" o projeto. Isso apagará todos os trabalhos em andamento "
+#~ "e reiniciará o projeto."
+
+#~ msgid "RLN_TROUBLESHOOT_BOINC_ITSELF"
+#~ msgstr ""
+#~ "Caso tiver problemas com o próprio BOINC, obtenha ajuda nos  %s Fóruns do "
+#~ "BOINC %s."
diff --git a/locale/pt_PT/BOINC-Client.mo b/locale/pt_PT/BOINC-Client.mo
index b3bfd7a..83e1a30 100644
Binary files a/locale/pt_PT/BOINC-Client.mo and b/locale/pt_PT/BOINC-Client.mo differ
diff --git a/locale/pt_PT/BOINC-Client.po b/locale/pt_PT/BOINC-Client.po
old mode 100755
new mode 100644
index d72d43f..a6ed37c
--- a/locale/pt_PT/BOINC-Client.po
+++ b/locale/pt_PT/BOINC-Client.po
@@ -1,24 +1,24 @@
 # 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:
+# Miguel Filipe Paulino de Sousa Veiga <Miguel.veig at gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-10-15 22:25-0700\n"
-"PO-Revision-Date: 2015-02-12 00:38-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: pt_PT\n"
+"PO-Revision-Date: 2015-03-26 01:20+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"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-POOTLE-MTIME: 1384863433.0\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: acct_mgr.cpp:450
-#: acct_mgr.cpp:459
+#: acct_mgr.cpp:450 acct_mgr.cpp:459
 msgid "Message from account manager"
 msgstr "Mensagem do gestor de conta"
 
@@ -27,7 +27,9 @@ msgid "Message from server"
 msgstr "Mensagem do servidor "
 
 #: client_state.cpp:258
-msgid "Some tasks need more memory than allowed by your preferences.  Please check the preferences."
+msgid ""
+"Some tasks need more memory than allowed by your preferences.  Please check "
+"the preferences."
 msgstr "Algumas tarefas precisam de mais memória do que a definida nas suas preferências. Por favor, verifique as preferências."
 
 #: client_state.cpp:520
@@ -40,11 +42,12 @@ msgstr "A variável HTTP_PROXY tem que especificar uma 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"
+msgid ""
+"You used the wrong URL for this project.  When convenient, remove this "
+"project, then add %s"
 msgstr "Usou o URL errado para este projecto. Assim que possível, remova este projecto e depois adicione %s"
 
-#: cs_statefile.cpp:828
-#: ../sched/sched_types.cpp:259
+#: cs_statefile.cpp:828 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
 msgstr "Erro de sintaxe em app_info.xml"
 
@@ -56,18 +59,15 @@ msgstr "Não existe o ficheiro referenciado em app_info.xml:"
 msgid "A new version of BOINC is available."
 msgstr "Está disponível uma versão mais recente do BOINC."
 
-#: current_version.cpp:94
-#: current_version.cpp:102
+#: current_version.cpp:94 current_version.cpp:102
 msgid "Download"
 msgstr "Transferir"
 
-#: log_flags.cpp:269
-#: log_flags.cpp:449
+#: log_flags.cpp:269 log_flags.cpp:449
 msgid "Unexpected text in cc_config.xml"
 msgstr "Texto inesperado em cc_config.xml"
 
-#: log_flags.cpp:423
-#: log_flags.cpp:475
+#: log_flags.cpp:423 log_flags.cpp:475
 msgid "Unrecognized tag in cc_config.xml"
 msgstr "Tag não reconhecida em cc_config.xml"
 
@@ -85,14 +85,16 @@ msgstr "Tag final em falta em cc_config.xml"
 
 #: ../sched/handle_request.cpp:307
 msgid "Invalid or missing account key.  To fix, remove and add this project."
-msgstr "O código da conta é inválido ou está em falta. Para corrigir, remova e volte a adicionar este projecto."
+msgstr "A chave da conta é inválida ou está em falta. Para corrigir, remova e volte a adicionar este projecto."
 
 #: ../sched/handle_request.cpp:849
 msgid "Invalid code signing key.  To fix, remove and add this project."
 msgstr "Chave de assinatura do código inválida. Para corrigir, remova e adicione este projecto."
 
 #: ../sched/handle_request.cpp:859
-msgid "The project has changed its security key.  Please remove and add this project."
+msgid ""
+"The project has changed its security key.  Please remove and add this "
+"project."
 msgstr "O projecto alterou o seu código de segurança. Por favor, remova-o e adicione este projecto."
 
 #: ../sched/handle_request.cpp:943
@@ -104,7 +106,8 @@ msgid "This project doesn't support CPU type"
 msgstr "Este projecto não suporta o tipo de CPU"
 
 #: ../sched/handle_request.cpp:993
-msgid "Your BOINC client software is too old.  Please install the current version."
+msgid ""
+"Your BOINC client software is too old.  Please install the current version."
 msgstr "A sua versão do BOINC está bastante desactualizada. Por favor instale a versão mais recente."
 
 #: ../sched/handle_request.cpp:1259
@@ -112,15 +115,19 @@ msgid "This project doesn't support computers of type"
 msgstr "Este projecto não suporta computadores do tipo"
 
 #: ../sched/sched_send.cpp:1092
-msgid "Upgrade to the latest driver to process tasks using your computer's GPU"
+msgid ""
+"Upgrade to the latest driver to process tasks using your computer's GPU"
 msgstr "Actualize os seus drivers para processar as tarefas, utilizando a GPU do seu computador"
 
 #: ../sched/sched_send.cpp:1099
-msgid "Upgrade to the latest driver to use all of this project's GPU applications"
+msgid ""
+"Upgrade to the latest driver to use all of this project's GPU applications"
 msgstr "Actualize os seus drivers para utilizar todas as aplicações GPU deste projecto"
 
 #: ../sched/sched_send.cpp:1118
-msgid "A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to the current version"
+msgid ""
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to"
+" the current version"
 msgstr "É necessária uma versão mais recente do BOINC para utilizador a GPU da NVIDIA; por favor actualize para a versão mais recente"
 
 #: ../sched/sched_send.cpp:1146
@@ -142,7 +149,8 @@ msgstr "É necessária uma versão mais recente do BOINC; por favor instale a ve
 
 #: ../sched/sched_send.cpp:1305
 #, c-format
-msgid "Tasks for %s are available, but your preferences are set to not accept them"
+msgid ""
+"Tasks for %s are available, but your preferences are set to not accept them"
 msgstr "Tarefas para %s estão disponíveis mas, as suas preferências estão definidas para não as aceitar"
 
 #: ../sched/sched_types.cpp:254
@@ -152,60 +160,3 @@ msgstr "Nome de aplicação desconhecida em app_info.xml"
 #: ../sched/sched_version.cpp:214
 msgid "Your app_info.xml file doesn't have a usable version of"
 msgstr "O seu ficheiro app_info.xml não tem uma versão utilizável de"
-
-#~ msgid "Download it."
-#~ msgstr "Faça o Download."
-#~ msgid "An NVIDIA or ATI GPU is required to run tasks for this project"
-#~ msgstr ""
-#~ "Uma GPU NVIDIA ou ATI é necessária para executar tarefas para este "
-#~ "projecto"
-#~ msgid "An NVIDIA GPU is required to run tasks for this project"
-#~ msgstr ""
-#~ "Uma GPU NVIDIA é necessária para executar tarefas para este projecto"
-#~ msgid "An ATI GPU is required to run tasks for this project"
-#~ msgstr "Uma GPU ATI é necessária para executar tarefas para este projecto"
-#~ msgid ""
-#~ "Tasks for NVIDIA GPU are available, but your preferences are set to not "
-#~ "accept them"
-#~ msgstr ""
-#~ "Tarefas para a GPU NVIDIA estão disponíveis, mas as suas preferências "
-#~ "estão definidas para não as aceitar"
-#~ msgid ""
-#~ "Tasks for ATI GPU are available, but your preferences are set to not "
-#~ "accept them"
-#~ msgstr ""
-#~ "Tarefas para a GPU ATI estão disponíveis, mas as suas preferências estão "
-#~ "definidas para não as aceitar"
-#~ msgid ""
-#~ "Tasks for CPU are available, but your preferences are set to not accept "
-#~ "them"
-#~ msgstr ""
-#~ "Tarefas para o CPU estão disponíveis, mas as suas preferências estão "
-#~ "definidas para não as aceitar"
-#~ msgid "error"
-#~ msgstr "erro"
-#~ msgid "Can't resolve hostname in remote_hosts.cfg"
-#~ msgstr "Não foi possivel resolver o nome do anfitrião em remote_hosts.cfg"
-#~ msgid "is not available for"
-#~ msgstr "não está disponível para "
-#~ msgid "Notice from BOINC"
-#~ msgstr "Notícias do BOINC"
-#~ msgid "Message from"
-#~ msgstr "Mensagem de"
-#~ msgid ""
-#~ "You may have an outdated code signing key.  Try attaching and reattaching "
-#~ "this project."
-#~ msgstr ""
-#~ "O seu código de assinatura poderá estar desactualizado. Tente anexar e "
-#~ "reanexar a este projecto."
-#~ msgid "XML syntax error in"
-#~ msgstr "Erro de sintaxe XML em"
-#~ msgid "Unparsed tag in"
-#~ msgstr "Tag não analisada em"
-#~ msgid ""
-#~ "Your preference for network connection interval is too high for this "
-#~ "project"
-#~ msgstr ""
-#~ "A sua preferência de intervalo de conexão à rede é demasiado alta para "
-#~ "este projecto"
-
diff --git a/locale/pt_PT/BOINC-Manager.mo b/locale/pt_PT/BOINC-Manager.mo
index e17346c..831dd1c 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
old mode 100755
new mode 100644
index 9c5484d..c8a1199
--- a/locale/pt_PT/BOINC-Manager.po
+++ b/locale/pt_PT/BOINC-Manager.po
@@ -1,63 +1,62 @@
 # 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:
+# Miguel Filipe Paulino de Sousa Veiga <Miguel.veig at gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-15 14:15-0500\n"
-"PO-Revision-Date: 2015-02-12 00:41-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: pt_PT\n"
+"POT-Creation-Date: 2015-03-24 13:36-0500\n"
+"PO-Revision-Date: 2015-03-26 00:34+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"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.7.1\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc_7.4\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1391705981.0\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\n"
+"X-Poedit-Country: UNITED STATES\n"
+"X-Poedit-Language: English\n"
 "X-Poedit-SearchPath-0: clientgui\n"
-"X-Poedit-SearchPath-1: clientgui/msw\n"
-"X-Poedit-SearchPath-2: clientgui/gtk\n"
-"X-Poedit-SearchPath-3: clientgui/mac\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"
 
-#: clientgui/AccountInfoPage.cpp:387
+#: clientgui/AccountInfoPage.cpp:361
 #, c-format
 msgid "Identify your account at %s"
 msgstr "Identifique a sua conta em %s"
 
-#: clientgui/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 ""
-"Por favor, insira os dados da sua conta\n"
-"(para criar uma conta, visite o website do projecto)"
+msgstr "Por favor, insira os dados da sua conta\n(para criar uma conta, visite o website do projecto)"
 
-#: clientgui/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 ""
-"Este projecto não está de momento a aceitar novas contas.\n"
-"Só o pode adicionar se já possuir uma conta."
+msgstr "Este projecto não está de momento a aceitar novas contas.\nSó o pode adicionar se já possuir uma conta."
 
-#: clientgui/AccountInfoPage.cpp:401
+#: clientgui/AccountInfoPage.cpp:375
 msgid "Are you already running this project?"
 msgstr "Já está a executar este projecto?"
 
-#: clientgui/AccountInfoPage.cpp:405
+#: clientgui/AccountInfoPage.cpp:379
 msgid "&No, new user"
 msgstr "&Não, novo utilizador"
 
-#: clientgui/AccountInfoPage.cpp:408
+#: clientgui/AccountInfoPage.cpp:382
 msgid "&Yes, existing user"
 msgstr "&Sim, utilizador existente"
 
-#: clientgui/AccountInfoPage.cpp:413
+#: clientgui/AccountInfoPage.cpp:387
 msgid ""
 "We were not able to set up your account information\n"
 "automatically.\n"
@@ -65,126 +64,114 @@ msgid ""
 "Please click on the 'Find login information' link\n"
 "below to find out what to put in the email address and\n"
 "password fields."
-msgstr ""
-"Não nos foi possivel encontrar as informações da sua conta\n"
-"automaticamente.\n"
-"\n"
-"Por favor carregue no link 'Encontrar informações de login\n"
-"em baixo para descobrir o que inserir nos campos de endereço de e-mail e\n"
-"palavra-passe."
+msgstr "Não nos foi possível encontrar as informações da sua conta\nautomaticamente.\n\nPor favor clique no link 'Encontrar informações de login\nabaixo para descobrir o que inserir nos campos de endereço de e-mail e\npalavra-passe."
 
-#: clientgui/AccountInfoPage.cpp:416
+#: clientgui/AccountInfoPage.cpp:390
 msgid "Find login information"
 msgstr "Encontrar informações de login"
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:649
+#: clientgui/AccountInfoPage.cpp:410 clientgui/AccountInfoPage.cpp:632
 msgid "&Password:"
 msgstr "&Palavra-passe:"
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:673
+#: clientgui/AccountInfoPage.cpp:417 clientgui/AccountInfoPage.cpp:656
 msgid "Choose a &password:"
 msgstr "Escolha uma &palavra-passe:"
 
-#: clientgui/AccountInfoPage.cpp:446
+#: clientgui/AccountInfoPage.cpp:420
 msgid "C&onfirm password:"
 msgstr "C&onfirme a palavra-passe:"
 
-#: clientgui/AccountInfoPage.cpp:453
+#: clientgui/AccountInfoPage.cpp:427
 #, c-format
 msgid "Are you already running %s?"
 msgstr "Já está a executar o %s?"
 
-#: clientgui/AccountInfoPage.cpp:482
+#: clientgui/AccountInfoPage.cpp:456
 msgid "&Username:"
 msgstr "&Nome de Utilizador:"
 
-#: clientgui/AccountInfoPage.cpp:511
+#: clientgui/AccountInfoPage.cpp:485
 msgid "&Email address or LDAP ID:"
-msgstr "&Endereço de E-mail ou ID LDAP:"
+msgstr "&Endereço de e-mail ou ID LDAP:"
 
-#: clientgui/AccountInfoPage.cpp:515
+#: clientgui/AccountInfoPage.cpp:489
 msgid "&Email address:"
 msgstr "&Endereço de e-mail:"
 
-#: clientgui/AccountInfoPage.cpp:523
+#: clientgui/AccountInfoPage.cpp:497
 #, c-format
 msgid "minimum length %d"
 msgstr "comprimento minimo %d"
 
-#: clientgui/AccountInfoPage.cpp:530
+#: clientgui/AccountInfoPage.cpp:504
 msgid "Forgot your password?"
 msgstr "Esqueceu-se da palavra-passe?"
 
-#: clientgui/AccountInfoPage.cpp:537
+#: 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 ""
-"Se ainda não se registou neste gestor de conta,\n"
-"por favor faça-o antes de prosseguir. Clique no link em baixo\n"
-"para se registar ou recuperar a palavra-passe esquecida."
+msgstr "Se ainda não se registou neste gestor de conta,\npor favor faça-o antes de prosseguir. Clique no link em baixo\npara se registar ou recuperar a palavra-passe esquecida."
 
-#: clientgui/AccountInfoPage.cpp:540
+#: clientgui/AccountInfoPage.cpp:514
 msgid "Account manager web site"
 msgstr "Website do gestor de conta"
 
-#: clientgui/AccountInfoPage.cpp:582
+#: clientgui/AccountInfoPage.cpp:556
 msgid "Add project"
 msgstr "Adicionar Projecto"
 
-#: clientgui/AccountInfoPage.cpp:584
+#: clientgui/AccountInfoPage.cpp:558
 msgid "Update account manager"
 msgstr "Actualizar o gestor de conta"
 
-#: clientgui/AccountInfoPage.cpp:586
+#: clientgui/AccountInfoPage.cpp:560
 msgid "Use account manager"
 msgstr "Usar gestor de conta"
 
-#: clientgui/AccountInfoPage.cpp:593
+#: clientgui/AccountInfoPage.cpp:567
 msgid "Please enter a user name."
 msgstr "Por favor, insira um nome de utilizador."
 
-#: clientgui/AccountInfoPage.cpp:595
+#: clientgui/AccountInfoPage.cpp:569
 msgid "Please enter an email address."
 msgstr "Por favor, insira um endereço de e-mail."
 
-#: clientgui/AccountInfoPage.cpp:605
+#: clientgui/AccountInfoPage.cpp:579
 #, c-format
 msgid "Please enter a password of at least %d characters."
-msgstr "Por favor, insira uma palavra-passe de pelo menos %d caracteres."
+msgstr "Por favor, insira uma palavra-passe com pelo menos %d caracteres."
 
-#: clientgui/AccountInfoPage.cpp:615
-msgid "The password and confirmation password do not match. Please type them again."
+#: clientgui/AccountInfoPage.cpp:589
+msgid ""
+"The password and confirmation password do not match. Please type them again."
 msgstr "A palavra-passe original e a de confirmação não condizem. Por favor, insira-as novamente."
 
-#: clientgui/AccountManagerInfoPage.cpp:272
+#: clientgui/AccountManagerInfoPage.cpp:270
 msgid "Choose an account manager"
 msgstr "Escolha um gestor de conta"
 
-#: clientgui/AccountManagerInfoPage.cpp:275
+#: clientgui/AccountManagerInfoPage.cpp:273
 msgid ""
 "To choose an account manager, click its name or \n"
 "type its URL below."
-msgstr ""
-"Para escolher um gestor de conta, clique no nome \n"
-"ou digite o seu URL em baixo."
+msgstr "Para escolher um gestor de conta, clique no nome \nou digite o seu URL em baixo."
 
-#: clientgui/AccountManagerInfoPage.cpp:279
+#: clientgui/AccountManagerInfoPage.cpp:277
 msgid "Account manager details:"
 msgstr "Detalhes do gestor de conta:"
 
-#: clientgui/AccountManagerInfoPage.cpp:283
+#: clientgui/AccountManagerInfoPage.cpp:281
 msgid "Account manager &URL:"
 msgstr "Gestor de conta &URL:"
 
-#: clientgui/AccountManagerInfoPage.cpp:287
+#: clientgui/AccountManagerInfoPage.cpp:285
 msgid "Open web page"
 msgstr "Abrir página web"
 
-#: clientgui/AccountManagerInfoPage.cpp:290
+#: clientgui/AccountManagerInfoPage.cpp:288
 msgid "Visit this account manager's web site"
 msgstr "Visitar o website deste gestor de conta"
 
@@ -208,320 +195,334 @@ msgstr "Por favor aguarde..."
 msgid "An internal server error has occurred.\n"
 msgstr "Ocorreu um erro interno no servidor.\n"
 
-#: clientgui/AdvancedFrame.cpp:96
+#: clientgui/AdvancedFrame.cpp:99
 msgid "Connected"
 msgstr "Conectado"
 
-#: clientgui/AdvancedFrame.cpp:104
+#: clientgui/AdvancedFrame.cpp:107
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: clientgui/AdvancedFrame.cpp:318
+#: clientgui/AdvancedFrame.cpp:325
+#, c-format
+msgid "New %s window..."
+msgstr "Nova %s janela..."
+
+#: clientgui/AdvancedFrame.cpp:329
+#, c-format
+msgid "Open another %s window"
+msgstr "Abrir outra %s janela"
+
+#: clientgui/AdvancedFrame.cpp:340
+msgid "Select computer..."
+msgstr "Seleccionar computador..."
+
+#: clientgui/AdvancedFrame.cpp:341
+msgid "Connect to a BOINC client on another computer"
+msgstr "Conectar-se a um cliente BOINC noutro computador"
+
+#: clientgui/AdvancedFrame.cpp:345
+msgid "Shut down connected client..."
+msgstr "Desligar cliente ligado..."
+
+#: clientgui/AdvancedFrame.cpp:346
+msgid "Shut down the currently connected BOINC client"
+msgstr "Desligar o cliente BOINC actualmente ligado"
+
+#: clientgui/AdvancedFrame.cpp:351
 #, c-format
 msgid "Close the %s window"
 msgstr "Fechar a janela do %s"
 
-#: clientgui/AdvancedFrame.cpp:321
-msgid "&Close Window"
-msgstr "&Fechar a Janela"
+#: clientgui/AdvancedFrame.cpp:354
+msgid "&Close window"
+msgstr "&Fechar janela"
 
-#: clientgui/AdvancedFrame.cpp:332
-#: clientgui/AdvancedFrame.cpp:339
-#: clientgui/AdvancedFrame.cpp:346
+#: clientgui/AdvancedFrame.cpp:363 clientgui/AdvancedFrame.cpp:368
+#: clientgui/AdvancedFrame.cpp:373
 #, c-format
 msgid "Exit %s"
 msgstr "Sair do %s"
 
-#: clientgui/AdvancedFrame.cpp:359
-msgid "Preferences..."
+#: clientgui/AdvancedFrame.cpp:386
+msgid "Preferences…"
 msgstr "Preferências..."
 
-#: clientgui/AdvancedFrame.cpp:368
+#: clientgui/AdvancedFrame.cpp:395
 msgid "&Notices\tCtrl+Shift+N"
 msgstr "&Notícias\tCtrl+Shift+N"
 
-#: clientgui/AdvancedFrame.cpp:369
-msgid "Display notices"
-msgstr "Mostra as notícias"
+#: clientgui/AdvancedFrame.cpp:396
+msgid "Show notices"
+msgstr "Mostrar notícias"
 
-#: clientgui/AdvancedFrame.cpp:374
+#: clientgui/AdvancedFrame.cpp:401
 msgid "&Projects\tCtrl+Shift+P"
 msgstr "&Projectos\tCtrl+Shift+P"
 
-#: clientgui/AdvancedFrame.cpp:375
-msgid "Display projects"
-msgstr "Mostra os projectos"
+#: clientgui/AdvancedFrame.cpp:402
+msgid "Show projects"
+msgstr "Mostrar projectos"
 
-#: clientgui/AdvancedFrame.cpp:380
+#: clientgui/AdvancedFrame.cpp:407
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr "&Tarefas\tCtrl+Shift+T"
 
-#: clientgui/AdvancedFrame.cpp:381
-msgid "Display tasks"
-msgstr "Mostra as tarefas"
+#: clientgui/AdvancedFrame.cpp:408
+msgid "Show tasks"
+msgstr "Mostrar tarefas"
 
-#: clientgui/AdvancedFrame.cpp:386
+#: clientgui/AdvancedFrame.cpp:413
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr "Trans&ferências\tCtrl+Shift+X"
 
-#: clientgui/AdvancedFrame.cpp:387
-msgid "Display transfers"
-msgstr "Mostra as transferências"
+#: clientgui/AdvancedFrame.cpp:414
+msgid "Show file transfers"
+msgstr "Mostrar transferências de ficheiros"
 
-#: clientgui/AdvancedFrame.cpp:392
+#: clientgui/AdvancedFrame.cpp:419
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "&Estatísticas\tCtrl+Shift+S"
 
-#: clientgui/AdvancedFrame.cpp:393
-msgid "Display statistics"
-msgstr "Mostra as estatísticas"
+#: clientgui/AdvancedFrame.cpp:420
+msgid "Show statistics"
+msgstr "Mostrar estatísticas"
+
+#: clientgui/AdvancedFrame.cpp:425
+msgid "&Disk\tCtrl+Shift+D"
+msgstr "&Disco⇥Ctrl+Shift+D"
+
+#: clientgui/AdvancedFrame.cpp:426
+msgid "Show disk usage"
+msgstr "Mostrar utilização do disco"
 
-#: clientgui/AdvancedFrame.cpp:398
-msgid "&Disk usage\tCtrl+Shift+D"
-msgstr "&Utilização do disco\tCtrl+Shift+D"
+#: clientgui/AdvancedFrame.cpp:432
+msgid "Event Log...\tCtrl+Shift+E"
+msgstr "Registo de Eventos...\tCtrl+Shift+E"
 
-#: clientgui/AdvancedFrame.cpp:399
-msgid "Display disk usage"
-msgstr "Mostra a utilização em disco"
+#: clientgui/AdvancedFrame.cpp:433
+msgid "Show diagnostic messages"
+msgstr "Mostrar mensagens de diagnóstico"
 
-#: clientgui/AdvancedFrame.cpp:406
+#: clientgui/AdvancedFrame.cpp:439
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr "&Vista Simplificada ...\tCtrl+Shift+V"
 
-#: clientgui/AdvancedFrame.cpp:407
-msgid "Display the simple graphical interface."
-msgstr "Mostra a interface gráfica simplificada."
+#: clientgui/AdvancedFrame.cpp:440
+msgid "Switch to the Simple View"
+msgstr "Trocar para a Vista Simples"
 
-#: clientgui/AdvancedFrame.cpp:421
+#: clientgui/AdvancedFrame.cpp:454
 msgid "&Add project or account manager..."
 msgstr "&Adicionar projecto ou gestor de conta..."
 
-#: clientgui/AdvancedFrame.cpp:422
-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/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:426
+#: clientgui/AdvancedFrame.cpp:459
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "&Sincronizar com o %s"
 
-#: clientgui/AdvancedFrame.cpp:430
+#: clientgui/AdvancedFrame.cpp:463
 #, c-format
 msgid "Get current settings from %s"
 msgstr "Obter as configurações actuais a partir de %s"
 
-#: clientgui/AdvancedFrame.cpp:440
+#: clientgui/AdvancedFrame.cpp:473
 msgid "&Add project..."
 msgstr "&Adicionar projecto..."
 
-#: clientgui/AdvancedFrame.cpp:441
+#: clientgui/AdvancedFrame.cpp:474
 msgid "Add a project"
 msgstr "Adicionar um projecto"
 
-#: clientgui/AdvancedFrame.cpp:444
+#: clientgui/AdvancedFrame.cpp:477
 #, c-format
 msgid "S&top using %s..."
 msgstr "&Parar de utilizar o %s..."
 
-#: clientgui/AdvancedFrame.cpp:450
+#: clientgui/AdvancedFrame.cpp:483
 msgid "Remove this computer from account manager control."
 msgstr "Remover este computador do controlo do gestor de conta."
 
-#: clientgui/AdvancedFrame.cpp:455
-msgid "&Options..."
-msgstr "&Opções..."
+#: clientgui/AdvancedFrame.cpp:489
+msgid "Run CPU &benchmarks"
+msgstr "Executar &testes de perfomance do CPU"
 
-#: clientgui/AdvancedFrame.cpp:456
-msgid "Configure display options and proxy settings"
-msgstr "Configurar opções de visualização e configurações de proxy"
+#: clientgui/AdvancedFrame.cpp:490
+msgid "Run tests that measure CPU speed"
+msgstr "Executar testes que avaliem a velocidade do CPU"
 
-#: clientgui/AdvancedFrame.cpp:460
-msgid "Computing &preferences..."
-msgstr "&Preferências de computação..."
+#: clientgui/AdvancedFrame.cpp:494
+msgid "Retry pending transfers"
+msgstr "Tentar novamente transferências pendentes"
 
-#: clientgui/AdvancedFrame.cpp:461
-msgid "Configure computing preferences"
-msgstr "Configurar preferências de computação"
+#: clientgui/AdvancedFrame.cpp:495
+msgid "Retry deferred file transfers and task requests"
+msgstr "Tentar novamente transferências de ficheiros deferidos e pedidos de tarefas"
 
-#: clientgui/AdvancedFrame.cpp:469
+#: clientgui/AdvancedFrame.cpp:503
 msgid "&Run always"
 msgstr "&Executar sempre"
 
-#: clientgui/AdvancedFrame.cpp:470
+#: clientgui/AdvancedFrame.cpp:504
 msgid "Allow work regardless of preferences"
 msgstr "Permitir execução de trabalho, independentemente das preferências"
 
-#: clientgui/AdvancedFrame.cpp:474
+#: clientgui/AdvancedFrame.cpp:508
 msgid "Run based on &preferences"
 msgstr "Executar com base nas &preferências"
 
-#: clientgui/AdvancedFrame.cpp:475
+#: clientgui/AdvancedFrame.cpp:509
 msgid "Allow work according to preferences"
 msgstr "Permitir execução de trabalho de acordo com as preferências"
 
-#: clientgui/AdvancedFrame.cpp:479
+#: clientgui/AdvancedFrame.cpp:513
 msgid "&Suspend"
 msgstr "&Suspender"
 
-#: clientgui/AdvancedFrame.cpp:480
+#: clientgui/AdvancedFrame.cpp:514
 msgid "Stop work regardless of preferences"
 msgstr "Parar execução de trabalho independentemente das preferências"
 
-#: clientgui/AdvancedFrame.cpp:505
+#: clientgui/AdvancedFrame.cpp:539
 msgid "Use GPU always"
 msgstr "Utilizar a GPU sempre"
 
-#: clientgui/AdvancedFrame.cpp:506
+#: clientgui/AdvancedFrame.cpp:540
 msgid "Allow GPU work regardless of preferences"
 msgstr "Permitir a execução da GPU, independentemente das preferências"
 
-#: clientgui/AdvancedFrame.cpp:510
+#: clientgui/AdvancedFrame.cpp:544
 msgid "Use GPU based on preferences"
 msgstr "Utilizar a GPU com base nas preferências"
 
-#: clientgui/AdvancedFrame.cpp:511
+#: clientgui/AdvancedFrame.cpp:545
 msgid "Allow GPU work according to preferences"
 msgstr "Permitir a execução da GPU de acordo com as preferências"
 
-#: clientgui/AdvancedFrame.cpp:515
+#: clientgui/AdvancedFrame.cpp:549
 msgid "Suspend GPU"
 msgstr "Suspender a GPU"
 
-#: clientgui/AdvancedFrame.cpp:516
+#: clientgui/AdvancedFrame.cpp:550
 msgid "Stop GPU work regardless of preferences"
 msgstr "Parar a execução da GPU, independentemente das preferências"
 
-#: clientgui/AdvancedFrame.cpp:540
-msgid "Network activity always available"
-msgstr "Actividade de rede sempre disponível"
+#: clientgui/AdvancedFrame.cpp:574
+msgid "Network activity always allowed"
+msgstr "Actividade de rede sempre permitida"
 
-#: clientgui/AdvancedFrame.cpp:541
+#: clientgui/AdvancedFrame.cpp:575
 msgid "Allow network activity regardless of preferences"
 msgstr "Permitir actividade de rede, independentemente das preferências"
 
-#: clientgui/AdvancedFrame.cpp:545
+#: clientgui/AdvancedFrame.cpp:579
 msgid "Network activity based on preferences"
 msgstr "Actividade de rede com base nas preferências"
 
-#: clientgui/AdvancedFrame.cpp:546
+#: clientgui/AdvancedFrame.cpp:580
 msgid "Allow network activity according to preferences"
 msgstr "Permitir actividade de rede de acordo com as preferências"
 
-#: clientgui/AdvancedFrame.cpp:550
+#: clientgui/AdvancedFrame.cpp:584
 msgid "Network activity suspended"
 msgstr "Actividade de rede suspensa"
 
-#: clientgui/AdvancedFrame.cpp:551
+#: clientgui/AdvancedFrame.cpp:585
 msgid "Stop BOINC network activity"
 msgstr "Parar actividade de rede do BOINC"
 
-#: clientgui/AdvancedFrame.cpp:561
-#, c-format
-msgid "Connect to another computer running %s"
-msgstr "Liga-se a outro computador que esteja a executar o %s"
+#: clientgui/AdvancedFrame.cpp:594
+msgid "Computing &preferences..."
+msgstr "&Preferências de computação..."
 
-#: clientgui/AdvancedFrame.cpp:566
-msgid "Select computer..."
-msgstr "Seleccionar computador..."
+#: clientgui/AdvancedFrame.cpp:595
+msgid "Configure computing preferences"
+msgstr "Configurar preferências de computação"
 
-#: clientgui/AdvancedFrame.cpp:571
-msgid "Shut down connected client..."
-msgstr "Desligar cliente ligado..."
+#: clientgui/AdvancedFrame.cpp:600
+msgid "Exclusive applications..."
+msgstr "Aplicações exclusivas..."
 
-#: clientgui/AdvancedFrame.cpp:572
-msgid "Shut down the currently connected client"
-msgstr "Desliga o cliente que está actualmente ligado"
+#: clientgui/AdvancedFrame.cpp:601
+msgid "Configure exclusive applications"
+msgstr "Configurar aplicações exclusivas"
 
-#: clientgui/AdvancedFrame.cpp:576
-msgid "Run CPU &benchmarks"
-msgstr "Executar &testes de perfomance do CPU"
+#: clientgui/AdvancedFrame.cpp:606
+msgid "Select columns..."
+msgstr "Seleccionar colunas..."
 
-#: clientgui/AdvancedFrame.cpp:577
-msgid "Runs BOINC CPU benchmarks"
-msgstr "Executa testes de perfomance do BOINC para o CPU"
+#: clientgui/AdvancedFrame.cpp:607
+msgid "Select which columns to display"
+msgstr "Seleccionar colunas a visualizar"
+
+#: clientgui/AdvancedFrame.cpp:611
+msgid "Event Log options...\tCtrl+Shift+F"
+msgstr "Opções do Log de Eventos...⇥Ctrl+Shift+F"
 
-#: clientgui/AdvancedFrame.cpp:581
-msgid "Do network communication"
-msgstr "Realizar comunicação com a rede"
+#: clientgui/AdvancedFrame.cpp:612
+msgid "Enable or disable various diagnostic messages"
+msgstr "Habilita ou desabilita várias mensagens de diagnóstico"
+
+#: clientgui/AdvancedFrame.cpp:616
+msgid "&Other options..."
+msgstr "&Outras opções..."
 
-#: clientgui/AdvancedFrame.cpp:582
-msgid "Do all pending network communication"
-msgstr "Realiza toda a comunicação pendente com a rede"
+#: clientgui/AdvancedFrame.cpp:617
+msgid "Configure display options and network settings"
+msgstr "Configurar opções de exibição e definições de rede"
 
-#: clientgui/AdvancedFrame.cpp:586
+#: clientgui/AdvancedFrame.cpp:622
 msgid "Read config files"
 msgstr "Ler ficheiros de configuração"
 
-#: clientgui/AdvancedFrame.cpp:587
-msgid "Read configuration info from cc_config.xml and any app_config.xml files"
+#: clientgui/AdvancedFrame.cpp:623
+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:591
+#: clientgui/AdvancedFrame.cpp:627
 msgid "Read local prefs file"
 msgstr "Ler ficheiro de preferências locais"
 
-#: clientgui/AdvancedFrame.cpp:592
+#: clientgui/AdvancedFrame.cpp:628
 msgid "Read preferences from global_prefs_override.xml."
 msgstr "Ler preferências em global_prefs_override.xml"
 
-#: clientgui/AdvancedFrame.cpp:597
-#, c-format
-msgid "Launch another instance of %s..."
-msgstr "Iniciar outra instância do %s..."
-
-#: clientgui/AdvancedFrame.cpp:601
-#, c-format
-msgid "Launch another %s"
-msgstr "Inicia outro %s"
-
-#: clientgui/AdvancedFrame.cpp:611
-msgid "Event Log...\tCtrl+Shift+E"
-msgstr "Registo de Eventos...\tCtrl+Shift+E"
-
-#: clientgui/AdvancedFrame.cpp:612
-msgid "Display diagnostic messages."
-msgstr "Mostra as mensagens de diagnóstico."
-
-#: clientgui/AdvancedFrame.cpp:616
-msgid "Event Log Diagnostic Flags...\tCtrl+Shift+F"
-msgstr "Log de Eventos das Flags de Diagnóstico...\tCtrl+Shift+F"
-
-#: clientgui/AdvancedFrame.cpp:617
-msgid "Enable or disable various diagnostic messages"
-msgstr "Habilitar ou desabilitar mensagens de diagnóstico variadas"
-
-#: clientgui/AdvancedFrame.cpp:626
+#: clientgui/AdvancedFrame.cpp:636
 #, c-format
 msgid "%s &help"
 msgstr "%s &ajuda"
 
-#: clientgui/AdvancedFrame.cpp:632
+#: clientgui/AdvancedFrame.cpp:640
 #, c-format
 msgid "Show information about %s"
 msgstr "Mostra informações sobre o %s"
 
-#: clientgui/AdvancedFrame.cpp:644
+#: clientgui/AdvancedFrame.cpp:650
 #, c-format
 msgid "&%s help"
 msgstr "&%s ajuda"
 
-#: clientgui/AdvancedFrame.cpp:650
+#: clientgui/AdvancedFrame.cpp:654
 #, c-format
 msgid "Show information about the %s"
 msgstr "Mostra informações sobre o %s"
 
-#: clientgui/AdvancedFrame.cpp:662
+#: clientgui/AdvancedFrame.cpp:665
 #, c-format
 msgid "%s &web site"
 msgstr "%s &Website"
 
-#: clientgui/AdvancedFrame.cpp:668
+#: clientgui/AdvancedFrame.cpp:669
 #, 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:680 clientgui/BOINCTaskBar.cpp:544
 #, c-format
 msgid "&About %s..."
 msgstr "&Acerca de %s..."
@@ -539,27 +540,27 @@ msgid "&View"
 msgstr "&Visualizar"
 
 #: clientgui/AdvancedFrame.cpp:701
-msgid "&Tools"
-msgstr "&Ferramentas"
-
-#: clientgui/AdvancedFrame.cpp:705
 msgid "&Activity"
 msgstr "&Actividade"
 
+#: clientgui/AdvancedFrame.cpp:705
+msgid "&Options"
+msgstr "&Opções"
+
 #: clientgui/AdvancedFrame.cpp:709
-msgid "A&dvanced"
-msgstr "A&vançado"
+msgid "&Tools"
+msgstr "&Ferramentas"
 
 #: clientgui/AdvancedFrame.cpp:713
 msgid "&Help"
 msgstr "&Ajuda"
 
-#: clientgui/AdvancedFrame.cpp:1185
+#: clientgui/AdvancedFrame.cpp:1188
 #, c-format
 msgid "%s - Stop using %s"
 msgstr "%s - Para de usar %s"
 
-#: clientgui/AdvancedFrame.cpp:1190
+#: clientgui/AdvancedFrame.cpp:1193
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -567,48 +568,41 @@ msgid ""
 "but you'll have to manage projects manually.\n"
 "\n"
 "Do you want to stop using %s?"
-msgstr ""
-"Se parar de utilizar o %s,\n"
-"manterá todos os projectos actuais,\n"
-"mas terá que gerir os projectos manualmente.\n"
-"\n"
-"Quer parar de utilizar o %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:1397
+#: clientgui/AdvancedFrame.cpp:1420
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s - Desligar o cliente actual..."
 
-#: clientgui/AdvancedFrame.cpp:1406
+#: clientgui/AdvancedFrame.cpp:1429
 #, 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\n"
-"e ser-lhe-á solicitado para que se ligue a outro anfitrião."
+msgstr "%s vai desligar o cliente ligado actualmente\ne ser-lhe-á solicitado para que se ligue a outro anfitrião."
 
-#: clientgui/AdvancedFrame.cpp:1806
+#: clientgui/AdvancedFrame.cpp:1832
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: clientgui/AdvancedFrame.cpp:1815
+#: clientgui/AdvancedFrame.cpp:1841
 #, c-format
 msgid "%s has successfully added %s"
 msgstr "%s foi adicionado com sucesso %s"
 
-#: clientgui/AdvancedFrame.cpp:1953
+#: clientgui/AdvancedFrame.cpp:1977
 #, c-format
 msgid "%s - (%s)"
 msgstr "%s - (%s)"
 
-#: clientgui/AdvancedFrame.cpp:1957
+#: clientgui/AdvancedFrame.cpp:1981
 #, c-format
 msgid "Connecting to %s"
 msgstr "A ligar a %s"
 
-#: clientgui/AdvancedFrame.cpp:1960
+#: clientgui/AdvancedFrame.cpp:1984
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "Ligado a %s (%s)"
@@ -623,11 +617,7 @@ msgid ""
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"Uma conta com esse nome de utilizador já existe e tem uma\n"
-"palavra-passe diferente daquela que inseriu.\n"
-"\n"
-"Por favor, visite o website do projecto e siga as instruções lá indicadas."
+msgstr "Uma conta com esse nome de utilizador já existe e tem uma\npalavra-passe diferente daquela que inseriu.\n\nPor favor, visite o website do projecto e siga as instruções lá indicadas."
 
 #: clientgui/AlreadyExistsPage.cpp:191
 msgid "Email address already in use"
@@ -639,11 +629,7 @@ msgid ""
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"Uma conta com esse endereço de e-mail já existe e tem uma\n"
-"palavra-passe diferente daquela que inseriu.\n"
-"\n"
-"Por favor, visite o website do projecto e siga as instruções lá indicadas."
+msgstr "Uma conta com esse endereço de e-mail já existe e tem uma\npalavra-passe diferente daquela que inseriu.\n\nPor favor, visite o website do projecto e siga as instruções lá indicadas."
 
 #: clientgui/AsyncRPC.cpp:1031
 msgid "Communicating with BOINC client.  Please wait ..."
@@ -668,89 +654,76 @@ msgstr "%s - Comunicação"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: clientgui/BOINCBaseFrame.cpp:504
+#: clientgui/BOINCBaseFrame.cpp:512
 #, c-format
 msgid "%s - Connection Error"
 msgstr "%s - Erro de Conexão"
 
-#: clientgui/BOINCBaseFrame.cpp:513
+#: 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 ""
-"Não está autorizado actualmente a gerir o cliente.\n"
-"Por favor, contacte o administrador para que o adicione ao grupo local 'boinc_users'."
+msgstr "Não está autorizado actualmente a gerir o cliente.\nPor favor, contacte o administrador para que o adicione ao grupo local 'boinc_users'."
 
-#: clientgui/BOINCBaseFrame.cpp:522
+#: 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 ""
-"Autorização falhada ao conectar-se ao cliente em execução.\n"
-"Confirme que inicia este programa na mesma directoria que a do cliente."
+msgstr "Autorização falhada ao conectar-se ao cliente em execução.\nConfirme que inicia este programa na mesma directoria que a do cliente."
 
-#: clientgui/BOINCBaseFrame.cpp:524
+#: clientgui/BOINCBaseFrame.cpp:532
 msgid "Authorization failed connecting to running client."
 msgstr "Autorização falhada ao conectar-se ao cliente em execução."
 
-#: clientgui/BOINCBaseFrame.cpp:532
+#: clientgui/BOINCBaseFrame.cpp:540
 msgid "The password you have provided is incorrect, please try again."
 msgstr "A palavra-passe que inseriu está incorrecta, por favor tente novamente."
 
-#: clientgui/BOINCBaseFrame.cpp:576
+#: clientgui/BOINCBaseFrame.cpp:584
 #, c-format
 msgid "%s - Connection Failed"
 msgstr "%s - Conexão Falhada"
 
-#: clientgui/BOINCBaseFrame.cpp:585
+#: 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 não consegue se conectar ao %s cliente.\n"
-"Quer tentar conectar-se novamente?"
+msgstr "%s não consegue se conectar ao %s cliente.\nQuer tentar conectar-se novamente?"
 
-#: clientgui/BOINCBaseFrame.cpp:621
+#: clientgui/BOINCBaseFrame.cpp:629
 #, c-format
 msgid "%s - Daemon Start Failed"
 msgstr "%s - A Inicialização do Daemon falhou"
 
-#: clientgui/BOINCBaseFrame.cpp:631
+#: 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 não consegue iniciar o %s cliente.\n"
-"Por favor, vá a Painel de Controlo->Ferramentas Administrativas->Serviços e inicie o serviço BOINC."
+msgstr "%s não consegue iniciar o %s cliente.\nPor favor, vá a Painel de Controlo->Ferramentas Administrativas->Serviços e inicie o serviço BOINC."
 
-#: clientgui/BOINCBaseFrame.cpp:637
+#: 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 não consegue iniciar o %s cliente.\n"
-"Por favor, inicialize o daemon e tente novamente."
+msgstr "%s não consegue iniciar o %s cliente.\nPor favor, inicialize o daemon e tente novamente."
 
-#: clientgui/BOINCBaseFrame.cpp:688
+#: clientgui/BOINCBaseFrame.cpp:696
 #, c-format
 msgid "%s - Connection Status"
 msgstr "%s - Estado da Conexão"
 
-#: clientgui/BOINCBaseFrame.cpp:699
+#: clientgui/BOINCBaseFrame.cpp:707
 #, 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"
 "To connect up to your local computer please use 'localhost' as the host name."
-msgstr ""
-"%s não está actualmente conectado ao %s cliente.\n"
-"Por favor vá ao menu 'Avançado\\Escolher Computador...' para se conectar ao %s cliente.\n"
-"Para se conectar ao seu computador local, use 'localhost' como o nome de anfitrião."
+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."
 
-#: clientgui/BOINCBaseView.cpp:752
+#: clientgui/BOINCBaseView.cpp:790
 msgid "Project web pages"
 msgstr "Páginas web do projecto"
 
@@ -764,9 +737,7 @@ msgstr "%s - Saída Inesperada"
 msgid ""
 "The %s client has exited unexpectedly 3 times within the last %d minutes.\n"
 "Would you like to restart it again?"
-msgstr ""
-"O cliente %s saiu inesperadamente 3 vezes nos ultimos %d minutos.\n"
-"Quer reiniciar novamente?"
+msgstr "O cliente %s saiu inesperadamente 3 vezes nos ultimos %d minutos.\nQuer reiniciar novamente?"
 
 #: clientgui/BOINCDialupManager.cpp:61
 #, c-format
@@ -778,9 +749,7 @@ 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.\n"
-"Pode fazê-lo agora?"
+msgstr "%s precisa de se conectar à Internet.\nPode fazê-lo agora?"
 
 #: clientgui/BOINCDialupManager.cpp:254
 #, c-format
@@ -802,9 +771,7 @@ 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.\n"
-"A actualizar todos os projectos e a tentar novamente todas as transferências."
+msgstr "%s detectou que está actualmente conectado à Internet.\nA actualizar todos os projectos e a tentar novamente todas as transferências."
 
 #: clientgui/BOINCDialupManager.cpp:417
 #, c-format
@@ -816,7 +783,7 @@ msgstr "%s desconectou-se com sucesso da Internet."
 msgid "%s failed to disconnected from the Internet."
 msgstr "%s falhou ao disconectar-se da Internet."
 
-#: clientgui/BOINCGUIApp.cpp:595
+#: clientgui/BOINCGUIApp.cpp:597
 #, c-format
 msgid ""
 "You currently are not authorized to manage the client.\n"
@@ -827,102 +794,90 @@ 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"
-"\n"
-"Para executar %s como este utilizador, por favor:\n"
-"  - reinstale %s respondendo \"Sim\" à questão acerca de\n"
-"    utilizadores não administrativos\n"
-"ou\n"
-"  - contacte o seu administrador para o adicionar ao  grupo de utilizadores\n"
-"    'boinc_master'."
+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'."
 
-#: clientgui/BOINCGUIApp.cpp:601
+#: clientgui/BOINCGUIApp.cpp:603
 #, c-format
 msgid ""
 "%s ownership or permissions are not set properly; please reinstall %s.\n"
 "(Error code %d"
-msgstr ""
-"%s direitos ou permissões não definidas correctamente; por favor reinstale %s.\n"
-"(Código de erro %d"
+msgstr "%s direitos ou permissões não definidas correctamente; por favor reinstale %s.\n(Código de erro %d"
 
-#: clientgui/BOINCGUIApp.cpp:607
+#: clientgui/BOINCGUIApp.cpp:609
 msgid " at "
 msgstr " em"
 
-#: clientgui/BOINCGUIApp.cpp:610
+#: clientgui/BOINCGUIApp.cpp:612
 msgid ")"
 msgstr ")"
 
-#: clientgui/BOINCGUIApp.cpp:640
+#: 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 ""
-"É necessário que reinicie o computador para que o BOINC seja executado correctamente.\n"
-"Por favor, reinicie o seu computador e tente novamente."
+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:641
+#: clientgui/BOINCGUIApp.cpp:643
 msgid "BOINC Manager"
 msgstr "Gestor do BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:902
+#: 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"
 
-#: clientgui/BOINCGUIApp.cpp:904
+#: clientgui/BOINCGUIApp.cpp:906
 msgid "Startup BOINC so only the system tray icon is visible"
 msgstr "Iniciar o BOINC de modo a que o ícone seja visível apenas na barra de tarefas"
 
-#: clientgui/BOINCGUIApp.cpp:906
+#: clientgui/BOINCGUIApp.cpp:908
 msgid "Directory containing the BOINC Client executable"
 msgstr "Directório contendo o executável do Cliente BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:907
+#: clientgui/BOINCGUIApp.cpp:909
 msgid "BOINC data directory"
 msgstr "Directório de dados do BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:909
+#: clientgui/BOINCGUIApp.cpp:911
 msgid "Host name or IP address"
 msgstr "Nome de anfitrião ou endereço IP"
 
-#: clientgui/BOINCGUIApp.cpp:910
+#: clientgui/BOINCGUIApp.cpp:912
 msgid "GUI RPC port number"
 msgstr "Número da porta do GUI RPC"
 
-#: clientgui/BOINCGUIApp.cpp:911
+#: clientgui/BOINCGUIApp.cpp:913
 msgid "Password"
 msgstr "Palavra-passe"
 
-#: clientgui/BOINCGUIApp.cpp:912
+#: clientgui/BOINCGUIApp.cpp:914
 msgid "Startup BOINC with these optional arguments"
 msgstr "Iniciar o BOINC com estes argumentos opcionais"
 
-#: clientgui/BOINCGUIApp.cpp:913
+#: clientgui/BOINCGUIApp.cpp:915
 msgid "disable BOINC security users and permissions"
 msgstr "desabilitar os utilizadores de segurança e as permissões do BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:914
+#: clientgui/BOINCGUIApp.cpp:916
 msgid "set skin debugging mode to enable skin manager error messages"
 msgstr "iniciar o modo de depuração para habilitar o gestor de mensagens de erro"
 
-#: clientgui/BOINCGUIApp.cpp:915
+#: clientgui/BOINCGUIApp.cpp:917
 msgid "multiple instances of BOINC Manager allowed"
 msgstr "multiplas instâncias do Gestor do BOINC permitidas"
 
-#: clientgui/BOINCGUIApp.cpp:917
+#: 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"
 
-#: clientgui/BOINCGUIApp.cpp:1164
+#: clientgui/BOINCGUIApp.cpp:1166
 msgid "(Automatic Detection)"
 msgstr "(Detecção Automática)"
 
-#: clientgui/BOINCGUIApp.cpp:1165
+#: clientgui/BOINCGUIApp.cpp:1167
 msgid "(Unknown)"
 msgstr "(Desconhecido)"
 
-#: clientgui/BOINCGUIApp.cpp:1166
+#: clientgui/BOINCGUIApp.cpp:1168
 msgid "(User Defined)"
 msgstr "(Definido pelo Utilizador)"
 
@@ -936,14 +891,12 @@ msgstr "Abrir %s Web..."
 msgid "Open %s..."
 msgstr "Abrir %s..."
 
-#: clientgui/BOINCTaskBar.cpp:536
-#: clientgui/BOINCTaskBar.cpp:633
+#: clientgui/BOINCTaskBar.cpp:536 clientgui/BOINCTaskBar.cpp:633
 #: clientgui/BOINCTaskBar.cpp:641
 msgid "Snooze"
 msgstr "Suspender Temporariamente"
 
-#: clientgui/BOINCTaskBar.cpp:538
-#: clientgui/BOINCTaskBar.cpp:660
+#: clientgui/BOINCTaskBar.cpp:538 clientgui/BOINCTaskBar.cpp:660
 #: clientgui/BOINCTaskBar.cpp:668
 msgid "Snooze GPU"
 msgstr "Suspender GPU Temporariamente"
@@ -999,7 +952,7 @@ msgstr "%s Notícias"
 
 #: clientgui/BOINCTaskBar.cpp:825
 msgid "There are new notices - click to view."
-msgstr "Existem notícias novas - carregue para visualizar."
+msgstr "Existem notícias novas - clique para visualizar."
 
 #: clientgui/CompletionErrorPage.cpp:199
 msgid "Failed to add project"
@@ -1022,17 +975,12 @@ msgid ""
 "Please try again later.\n"
 "\n"
 "Click Finish to close."
-msgstr ""
-"Por favor, tente novamente mais tarde.\n"
-"\n"
-"Carregue em Terminar para fechar."
+msgstr "Por favor, tente novamente mais tarde.\n\nClique em Terminar para fechar."
 
-#: 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 "Carregue Terminar para fechar."
+msgstr "Clique em Terminar para fechar."
 
 #: clientgui/CompletionErrorPage.cpp:234
 msgid "Messages from server:"
@@ -1050,18 +998,16 @@ msgstr "Este projecto foi adicionado com sucesso."
 msgid ""
 "When you click Finish, your web browser will go to a page where\n"
 "you can set your account name and preferences."
-msgstr ""
-"Quando carregar em Terminar, o seu navegador de internet irá para uma página onde\n"
-"pode definir o seu nome de conta e preferências."
+msgstr "Quando clica em Terminar, o seu navegador de internet irá para uma página onde\npode definir o seu nome de conta e preferências."
 
 #: clientgui/CompletionPage.cpp:232
 #, c-format
 msgid "Update from %s completed."
-msgstr "Actualização do %s completa."
+msgstr "Actualização do %s concluída."
 
 #: clientgui/CompletionPage.cpp:236
 msgid "Update completed."
-msgstr "Actualização completa."
+msgstr "Actualização concluída."
 
 #: clientgui/CompletionPage.cpp:247
 msgid "Now using account manager"
@@ -1100,587 +1046,683 @@ msgstr "Direitos de Autor:"
 
 #: clientgui/DlgAbout.cpp:192
 msgid ""
-"(C) 2003-2014 University of California, Berkeley.\n"
+"(C) 2003-2015 University of California, Berkeley.\n"
 "All Rights Reserved."
-msgstr ""
-"(C) 2003-2014 Universidade da Califórnia, Berkeley.\n"
-"Todos os Direitos Reservados."
+msgstr "(C) 2003-2015 Universidade da Califórnia, Berkeley.\nTodos os Direitos Reservados."
 
 #: clientgui/DlgAbout.cpp:196
-msgid "Berkeley Open Infrastructure for Network Computing"
-msgstr "Infraestrutura aberta Berkeley para a Rede de Computação"
+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"
 
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:399
+#: clientgui/DlgAbout.cpp:211
+msgid "for more information."
+msgstr "para mais informação."
+
+#: clientgui/DlgAbout.cpp:219 clientgui/DlgExitMessage.cpp:173
+#: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:399
 #: clientgui/DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "&OK"
 
-#: clientgui/DlgAdvPreferences.cpp:602
-msgid "invalid number"
-msgstr "número inválido"
+#: clientgui/DlgAdvPreferences.cpp:669
+msgid "Invalid number"
+msgstr "Número inválido"
+
+#: clientgui/DlgAdvPreferences.cpp:670
+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:603
-msgid "invalid time, format is HH:MM"
-msgstr "formato de tempo inválido, o formato é HH:MM"
+#: clientgui/DlgAdvPreferences.cpp:671
+msgid "Number must be between 0 and 10"
+msgstr "Os números devem ser entre 0 e 10"
 
-#: clientgui/DlgAdvPreferences.cpp:604
-msgid "invalid time interval, format is HH:MM-HH:MM"
-msgstr "formato de tempo inválido, o formato é HH:MM-HH:MM"
+#: clientgui/DlgAdvPreferences.cpp:672
+msgid "Number must be between 0 and 100"
+msgstr "Os números devem ser entre 0 e 100"
 
-#: clientgui/DlgAdvPreferences.cpp:817
+#: clientgui/DlgAdvPreferences.cpp:905
 msgid "invalid input value detected"
 msgstr "valor inválido de entrada detectado"
 
-#: clientgui/DlgAdvPreferences.cpp:819
+#: clientgui/DlgAdvPreferences.cpp:907
 msgid "Validation Error"
 msgstr "Erro de Validação"
 
-#: clientgui/DlgAdvPreferences.cpp:969
-#: clientgui/DlgAdvPreferences.cpp:975
-#: clientgui/DlgAdvPreferences.cpp:981
-msgid "Applications to add"
-msgstr "Aplicações a adicionar"
-
-#: clientgui/DlgAdvPreferences.cpp:998
-#, c-format
-msgid "'%s' is not an executable application."
-msgstr "'%s' não é uma aplicação executável."
-
-#: clientgui/DlgAdvPreferences.cpp:999
-#: clientgui/DlgAdvPreferences.cpp:1046
-#: clientgui/DlgAdvPreferences.cpp:1070
-msgid "Add Exclusive App"
-msgstr "Adicionar Aplicação Exclusiva"
-
-#: clientgui/DlgAdvPreferences.cpp:1011
-msgid "Name of application to add?"
-msgstr "Nome da aplicação a adicionar?"
-
-#: clientgui/DlgAdvPreferences.cpp:1011
-msgid "Add exclusive app"
-msgstr "Adicionar aplicação exclusiva"
-
-#: clientgui/DlgAdvPreferences.cpp:1045
-#, c-format
-msgid "Application names must end with '%s'"
-msgstr "Os nomes das aplicações têm de terminar com '%s'"
-
-#: clientgui/DlgAdvPreferences.cpp:1069
-#, c-format
-msgid "'%s' is already in the list."
-msgstr "'%s' já está na lista."
-
-#: clientgui/DlgAdvPreferences.cpp:1161
-msgid ""
-"Do you really want to clear all local preferences?\n"
-"(This will not affect exclusive applications.)"
-msgstr ""
-"Quer mesmo limpar todas as preferências locais?\n"
-"(As aplicações exclusivas não serão afectadas.)"
+#: clientgui/DlgAdvPreferences.cpp:1119
+msgid "Discard local preferences and use web-based preferences?"
+msgstr "Rejeitar preferências locais e utilizar as preferências web?"
 
-#: clientgui/DlgAdvPreferences.cpp:1162
+#: clientgui/DlgAdvPreferences.cpp:1120
 msgid "Confirmation"
 msgstr "Confirmação"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:49
+#: clientgui/DlgAdvPreferencesBase.cpp:54
 #, c-format
 msgid "%s - Computing preferences"
 msgstr "%s - Preferências de computação"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:66
+#: clientgui/DlgAdvPreferencesBase.cpp:77
+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
+msgid "Using web-based preferences from"
+msgstr "Utilizando preferências web de"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:102
+msgid "Set values and click OK to use local preferences instead."
+msgstr "Defina valores e clique em OK para usar preferências locais."
+
+#: clientgui/DlgAdvPreferencesBase.cpp:111
 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 ""
-"Esta caixa de diálogo controla as preferências para este computador apenas.\n"
-"Carregue em OK para definir as preferências.\n"
-"Carregue em Limpar para restaurar as definições web (excepto aplicações exclusivas)."
+"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:69
+#: clientgui/DlgAdvPreferencesBase.cpp:114
 msgid "Clear"
 msgstr "Limpar"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:70
-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:115
+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:85
-msgid "processor usage"
-msgstr "utilização do processador"
+#: clientgui/DlgAdvPreferencesBase.cpp:118
+msgid "Use web prefs"
+msgstr "Utilizar preferências web"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:88
-msgid "network usage"
-msgstr "utilização de rede"
+#: clientgui/DlgAdvPreferencesBase.cpp:119
+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:91
-msgid "disk and memory usage"
-msgstr "utilização de disco e memória"
+#: clientgui/DlgAdvPreferencesBase.cpp:143
+#: clientgui/DlgAdvPreferencesBase.cpp:637
+msgid "Computing"
+msgstr "A computar"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:94
-msgid "exclusive applications"
-msgstr "aplicações exclusivas"
+#: clientgui/DlgAdvPreferencesBase.cpp:146
+#: clientgui/DlgAdvPreferencesBase.cpp:785
+msgid "Network"
+msgstr "Rede"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:149
+msgid "Disk and memory"
+msgstr "Disco e memória"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:107
-#: clientgui/DlgDiagnosticLogFlags.cpp:104
+#: clientgui/DlgAdvPreferencesBase.cpp:152
+msgid "Daily schedules"
+msgstr "Programações diárias"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:165
+#: clientgui/DlgDiagnosticLogFlags.cpp:119 clientgui/DlgExclusiveApps.cpp:146
+#: clientgui/DlgHiddenColumns.cpp:100
 msgid "OK"
 msgstr "OK"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:108
-msgid "save all values and close the dialog"
-msgstr "guardar todos os valores e fechar caixa de diálogo"
+#: clientgui/DlgAdvPreferencesBase.cpp:166
+msgid "Save all values and close the dialog."
+msgstr "Salvar todos os valores e fechar a caixa de diálogo."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:114
-msgid "close the dialog without saving"
-msgstr "fechar caixa de diálogo sem salvar"
+#: clientgui/DlgAdvPreferencesBase.cpp:172
+msgid "Close the dialog without saving."
+msgstr "Fechar a caixa de diálogo sem guardar."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:118
-#: clientgui/Localization.cpp:35
-#: clientgui/Localization.cpp:121
-#: clientgui/Localization.cpp:139
+#: clientgui/DlgAdvPreferencesBase.cpp:176 clientgui/DlgExclusiveApps.cpp:157
 msgid "Help"
 msgstr "Ajuda"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
-msgid "shows the preferences web page"
-msgstr "mostra a página web das preferências"
+#: clientgui/DlgAdvPreferencesBase.cpp:177
+msgid "Shows the preferences web page."
+msgstr "Mostra  a página web das preferências."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:141
-msgid "Computing allowed"
-msgstr "Computação permitida"
+#: clientgui/DlgAdvPreferencesBase.cpp:239
+#: clientgui/DlgAdvPreferencesBase.cpp:425
+msgid "Usage limits"
+msgstr "Limites de utilização"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
-msgid "While computer is on batteries"
-msgstr "Enquanto o computador está só com bateria"
+#: clientgui/DlgAdvPreferencesBase.cpp:244
+#, 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:149
-msgid "check this if you want this computer to do work while it runs on batteries"
-msgstr "assinale aqui, se quiser que o seu computador execute trabalho enquanto está apenas com a bateria"
+#: clientgui/DlgAdvPreferencesBase.cpp:246
+#: clientgui/DlgAdvPreferencesBase.cpp:258
+msgid "Use at most"
+msgstr "Usar no máximo"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:155
-msgid "While computer is in use"
-msgstr "Enquanto o computador está em utilização"
+#: clientgui/DlgAdvPreferencesBase.cpp:251
+#, no-c-format
+msgid "% of the CPUs"
+msgstr "% dos CPUs"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:158
-msgid "check this if you want this computer to do work even when you're using it"
-msgstr "assinale aqui, se quiser que o seu computador execute trabalho enquanto está a ser utilizado"
+#: clientgui/DlgAdvPreferencesBase.cpp:256
+#, 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."
+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
+#, no-c-format
+msgid "% of CPU time"
+msgstr "% de tempo de CPU"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:270
+msgid "When to suspend"
+msgstr "Quando suspender"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:164
-msgid "Use GPU while computer is in use"
-msgstr "Utilizar a GPU enquanto o computador está em utilização"
+#: clientgui/DlgAdvPreferencesBase.cpp:276
+msgid "Suspend when computer is on battery"
+msgstr "Suspender quando o computador está apenas em bateria"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:167
-msgid "check this if you want your GPU to do work even when you're using the computer"
-msgstr "assinale aqui, se quiser que a sua GPU execute trabalho enquanto o computador está a ser utilizado"
+#: clientgui/DlgAdvPreferencesBase.cpp:279
+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
+msgid "Suspend when computer is in use"
+msgstr "Suspender quando o computador está em utilização"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:288
+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:179
-msgid "Only after computer has been idle for"
-msgstr "Apenas depois do computador estar inactivo por"
+#: clientgui/DlgAdvPreferencesBase.cpp:294
+msgid "Suspend GPU computing when computer is in use"
+msgstr "Suspender computação da GPU quando o computador estiver em utilização"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:188
-msgid "do work only after you haven't used the computer for this number of minutes"
-msgstr "executar trabalho apenas depois do computador não estar em utilização por este número de minutos"
+#: clientgui/DlgAdvPreferencesBase.cpp:297
+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:193
-#: clientgui/DlgAdvPreferencesBase.cpp:342
+#: clientgui/DlgAdvPreferencesBase.cpp:302
+msgid "This determines when the computer is considered 'in use'."
+msgstr "Isto determina quando o computador é considerado 'em utilização'."
+
+#: clientgui/DlgAdvPreferencesBase.cpp:306
+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
 msgid "minutes"
 msgstr "minutos"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:212
-msgid "While processor usage is less than"
-msgstr "Enquanto a utilização do processador é menor do que"
+#: 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:221
-msgid "suspend work if processor usage exceeds this level"
-msgstr "suspender trabalho se a utilização do processador exceder este nivel"
+#: clientgui/DlgAdvPreferencesBase.cpp:323
+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:226
-msgid "percent (0 means no restriction)"
-msgstr "percentagem (0 significa sem restrições)"
+#: clientgui/DlgAdvPreferencesBase.cpp:344
+#: clientgui/DlgAdvPreferencesBase.cpp:474
+msgid "Other"
+msgstr "Outro"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:240
-#: clientgui/DlgAdvPreferencesBase.cpp:506
-msgid "Every day between hours of"
-msgstr "Todos os dias entre as horas"
+#: clientgui/DlgAdvPreferencesBase.cpp:349
+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:244
-msgid "start work at this time"
-msgstr "iniciar trabalho a esta hora"
+#: clientgui/DlgAdvPreferencesBase.cpp:352
+msgid "Store at least"
+msgstr "Armazenar no mínimo "
 
-#: clientgui/DlgAdvPreferencesBase.cpp:248
-#: clientgui/DlgAdvPreferencesBase.cpp:514
-msgid "and"
-msgstr "e"
+#: clientgui/DlgAdvPreferencesBase.cpp:360
+#: clientgui/DlgAdvPreferencesBase.cpp:376
+msgid "days of work"
+msgstr "dias de trabalho"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:252
-msgid "stop work at this time"
-msgstr "parar trabalho a esta hora"
+#: clientgui/DlgAdvPreferencesBase.cpp:365
+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:256
-#: clientgui/DlgAdvPreferencesBase.cpp:522
-msgid "(no restriction if equal)"
-msgstr "(sem restrições se ambos os campos forem iguais)"
+#: clientgui/DlgAdvPreferencesBase.cpp:368
+msgid "Store up to an additional"
+msgstr "Armazene até um adicional"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:261
-#: clientgui/DlgAdvPreferencesBase.cpp:527
-msgid "Day-of-week override:"
-msgstr "Escolha manual dos dias de semana:"
+#: clientgui/DlgAdvPreferencesBase.cpp:381
+#, 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:266
-#: clientgui/DlgAdvPreferencesBase.cpp:532
-msgid "check box to specify hours for this day of week"
-msgstr "assinale para especificar as horas para este dia de semana"
+#: clientgui/DlgAdvPreferencesBase.cpp:383
+msgid "Switch between tasks every"
+msgstr "Trocar entre tarefas a cada"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:272
-#: clientgui/DlgAdvPreferencesBase.cpp:538
-msgid "Monday"
-msgstr "Segunda"
+#: clientgui/DlgAdvPreferencesBase.cpp:391
+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:279
-#: clientgui/DlgAdvPreferencesBase.cpp:545
-msgid "Tuesday"
-msgstr "Terça"
+#: clientgui/DlgAdvPreferencesBase.cpp:392
+msgid "Request tasks to checkpoint at most every"
+msgstr "Solicitar às tarefas que criem um checkpoint no máximo a cada"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:286
-#: clientgui/DlgAdvPreferencesBase.cpp:552
-msgid "Wednesday"
-msgstr "Quarta"
+#: clientgui/DlgAdvPreferencesBase.cpp:396
+msgid "seconds"
+msgstr "segundos"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:293
-#: clientgui/DlgAdvPreferencesBase.cpp:559
-msgid "Thursday"
-msgstr "Quinta"
+#: clientgui/DlgAdvPreferencesBase.cpp:431
+msgid "Limit the download rate of file transfers."
+msgstr "Limitar a taxa de transferência dos ficheiros."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:300
-#: clientgui/DlgAdvPreferencesBase.cpp:566
-msgid "Friday"
-msgstr "Sexta"
+#: clientgui/DlgAdvPreferencesBase.cpp:432
+msgid "Limit download rate to"
+msgstr "Limitar taxa de transferência para"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:307
-#: clientgui/DlgAdvPreferencesBase.cpp:573
-msgid "Saturday"
-msgstr "Sábado"
+#: clientgui/DlgAdvPreferencesBase.cpp:436
+#: clientgui/DlgAdvPreferencesBase.cpp:445
+msgid "KB/second"
+msgstr "KB/segundo"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:580
-msgid "Sunday"
-msgstr "Domingo"
+#: clientgui/DlgAdvPreferencesBase.cpp:440
+msgid "Limit the upload rate of file transfers."
+msgstr "Limitar taxa de upload da transferência de ficheiros."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:328
-msgid "Other options"
-msgstr "Outras opções"
+#: clientgui/DlgAdvPreferencesBase.cpp:441
+msgid "Limit upload rate to"
+msgstr "Limitar taxa de upload para"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:336
-msgid "Switch between applications every"
-msgstr "Trocar entre aplicações a cada"
+#: clientgui/DlgAdvPreferencesBase.cpp:452
+#, 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:345
-msgid "On multiprocessor systems, use at most"
-msgstr "Em sistemas de processador múltiplo, usar no máximo"
+#: clientgui/DlgAdvPreferencesBase.cpp:454
+msgid "Limit usage to"
+msgstr "Limitar utilização a"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
-#, no-c-format
-msgid "% of the processors (0 means no restriction)"
-msgstr "% dos processadores (0 significa sem restrições)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:355
-#: clientgui/DlgAdvPreferencesBase.cpp:618
-#: clientgui/DlgAdvPreferencesBase.cpp:640
-#: clientgui/DlgAdvPreferencesBase.cpp:661
-#: clientgui/DlgAdvPreferencesBase.cpp:683
-#: clientgui/DlgAdvPreferencesBase.cpp:694
-msgid "Use at most"
-msgstr "Usar no máximo"
+#: clientgui/DlgAdvPreferencesBase.cpp:458
+msgid "MB every"
+msgstr "MB a cada"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:362
-#, no-c-format
-msgid "% of CPU time (0 means no restriction)"
-msgstr "% do tempo de CPU (0 significa sem restrições)"
+#: clientgui/DlgAdvPreferencesBase.cpp:462
+msgid "days"
+msgstr "dias"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:386
-msgid "General options"
-msgstr "Opções gerais"
+#: clientgui/DlgAdvPreferencesBase.cpp:479
+#, 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:395
-msgid "Maximum download rate"
-msgstr "Taxa máxima de transferência"
+#: clientgui/DlgAdvPreferencesBase.cpp:481
+msgid "Skip data verification for image files"
+msgstr "Saltar verificação de dados para imagens"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:401
-#: clientgui/DlgAdvPreferencesBase.cpp:410
-msgid "KBytes/second (0 means no restriction)"
-msgstr "KBytes/segundo (0 significa sem restrições)"
+#: clientgui/DlgAdvPreferencesBase.cpp:485
+msgid "Confirm before connecting to Internet"
+msgstr "Confirmar antes de se conectar à Internet"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:404
-msgid "Maximum upload rate"
-msgstr "Taxa máxima de upload"
+#: clientgui/DlgAdvPreferencesBase.cpp:486
+#: clientgui/DlgAdvPreferencesBase.cpp:490
+msgid "Useful only if you have a modem, ISDN or VPN connection."
+msgstr "Útil apenas se tiver um modem, ISDN ou conexão VPN."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:417
-msgid "Minimum work buffer"
-msgstr "Trabalho minímo de buffer "
+#: clientgui/DlgAdvPreferencesBase.cpp:489
+msgid "Disconnect when done"
+msgstr "Disconectar quando terminado"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:425
-msgid "Try to maintain enough tasks to keep busy for this many days"
-msgstr "Tentar manter tarefas suficientes para manter ocupado por estes dias"
+#: clientgui/DlgAdvPreferencesBase.cpp:516
+msgid "Disk"
+msgstr "Disco"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:431
-#: clientgui/DlgAdvPreferencesBase.cpp:449
-msgid "days (maximum value: 10)"
-msgstr "dias (valor máximo: 10)"
+#: clientgui/DlgAdvPreferencesBase.cpp:521
+#, c-format
+msgid "%s will use the most restrictive of these settings:"
+msgstr "%s irá utilizar as definições mais restritivas:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:437
-msgid "Max additional work buffer"
-msgstr "Trabalho adicional máximo de buffer"
+#: clientgui/DlgAdvPreferencesBase.cpp:527
+#, 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:445
-msgid "In addition, maintain enough tasks for up to this many days"
-msgstr "Em adição, manter tarefas suficientes para pelo menos estes dias"
+#: clientgui/DlgAdvPreferencesBase.cpp:530
+#: clientgui/DlgAdvPreferencesBase.cpp:554
+msgid "Use no more than"
+msgstr "Utilizar não mais do que"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:454
-msgid "Transfer at most"
-msgstr "Transferir no máximo"
+#: clientgui/DlgAdvPreferencesBase.cpp:534
+msgid "GB"
+msgstr "GB"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:462
-msgid "MBytes every"
-msgstr "MBytes a cada"
+#: clientgui/DlgAdvPreferencesBase.cpp:539
+#, 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:468
-msgid "days (0 means no restriction)"
-msgstr "dias (0 significa sem restrições)"
+#: clientgui/DlgAdvPreferencesBase.cpp:542
+msgid "Leave at least"
+msgstr "Deixar pelo menos"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:476
-msgid "Skip image file verification"
-msgstr "Saltar verificação do ficheiro de imagem"
+#: clientgui/DlgAdvPreferencesBase.cpp:546
+msgid "GB free"
+msgstr "GB livres"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:478
-msgid "check this if your Internet provider modifies image files"
-msgstr "assinale aqui se o seu provedor de Internet modifica os ficheiros de imagem"
+#: clientgui/DlgAdvPreferencesBase.cpp:551
+#, 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:484
-msgid "Connect options"
-msgstr "Opções de conexão"
+#: clientgui/DlgAdvPreferencesBase.cpp:559
+#, no-c-format
+msgid "% of total"
+msgstr "% do total "
 
-#: clientgui/DlgAdvPreferencesBase.cpp:487
-msgid "Confirm before connecting to internet"
-msgstr "Confirmar antes de se conectar à internet"
+#: clientgui/DlgAdvPreferencesBase.cpp:566
+msgid "Memory"
+msgstr "Memória"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
-msgstr "se assinalado, uma caixa de confirmação aparecerá antes de se tentar conectar à Internet"
+#: clientgui/DlgAdvPreferencesBase.cpp:571
+#, 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:493
-msgid "Disconnect when done"
-msgstr "Disconectar quando terminado"
+#: clientgui/DlgAdvPreferencesBase.cpp:573
+msgid "When computer is in use, use at most"
+msgstr "Quando o computador está a ser utilizado, usar no máximo"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:495
-msgid ""
-"if checked, BOINC hangs up when network usage is done\n"
-"(only relevant for dialup-connection)"
-msgstr ""
-"se assinalado, o BOINC desliga quando o uso de rede estiver realizado\n"
-"(apenas relevante para conexões dial-up)"
+#: clientgui/DlgAdvPreferencesBase.cpp:579
+#: clientgui/DlgAdvPreferencesBase.cpp:591
+#: clientgui/DlgAdvPreferencesBase.cpp:607
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:501
-msgid "Network usage allowed"
-msgstr "Utilização de rede permitida"
+#: clientgui/DlgAdvPreferencesBase.cpp:584
+#, 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."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:510
-msgid "network usage start hour"
-msgstr "hora de início da utilização de rede"
+#: clientgui/DlgAdvPreferencesBase.cpp:586
+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:518
-msgid "network usage stop hour"
-msgstr "hora de paragem da utilização de rede"
+#: clientgui/DlgAdvPreferencesBase.cpp:595
+msgid "Leave non-GPU tasks in memory while suspended"
+msgstr "Deixar tarefas não-GPU em memória enquanto estiverem suspensas"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:610
-#: clientgui/DlgItemProperties.cpp:257
-msgid "Disk usage"
-msgstr "Utilização do disco"
+#: 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."
+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:622
-msgid "the maximum disk space used by BOINC (in Gigabytes)"
-msgstr "máximo de utilização do disco usado pelo BOINC (em Gigabytes)"
+#: clientgui/DlgAdvPreferencesBase.cpp:600
+#, 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:626
-msgid "Gigabytes disk space (0 means no restriction)"
-msgstr "Espaço de disco em Gigabytes (0 significa sem restrições)"
+#: clientgui/DlgAdvPreferencesBase.cpp:602
+msgid "Page/swap file: use at most"
+msgstr "Página/ficheiro swap: usar no máximo"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:629
-msgid "Leave at least"
-msgstr "Deixar pelo menos"
+#: clientgui/DlgAdvPreferencesBase.cpp:627
+msgid "and"
+msgstr "e"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:633
-msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
-msgstr "O BOINC deixa pelo menos este montante de espaço livre em disco (em Gigabytes)"
+#: clientgui/DlgAdvPreferencesBase.cpp:628
+msgid "to"
+msgstr "para"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:637
-msgid "Gigabytes disk space free"
-msgstr "Gigabytes de espaço em disco livre"
+#: clientgui/DlgAdvPreferencesBase.cpp:641
+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
-msgid "BOINC uses at most this percentage of total disk space"
-msgstr "O BOINC utiliza no máximo esta percentagem de espaço total em disco"
+msgid "Compute only between"
+msgstr "Computação apenas entre"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:649
-#, no-c-format
-msgid "% of total disk space"
-msgstr "% de espaço total em disco"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:652
-msgid "Tasks checkpoint to disk at most every"
-msgstr "Checkpoints das tarefas em disco no máximo a cada"
+#: clientgui/DlgAdvPreferencesBase.cpp:654
+#: clientgui/DlgAdvPreferencesBase.cpp:801
+msgid "Day-of-week override"
+msgstr "Anular dia da semana"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:658
-msgid "seconds"
-msgstr "segundos"
+#: clientgui/DlgAdvPreferencesBase.cpp:805
+msgid "Override the times above on the selected days:"
+msgstr "Anular os horários acima dos dias seleccionados:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:668
-#, no-c-format
-msgid "% of page file (swap space)"
-msgstr "% de paginação (espaço temporário)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:675
-msgid "Memory usage"
-msgstr "Utilização da memória"
+#: clientgui/DlgAdvPreferencesBase.cpp:676
+#: clientgui/DlgAdvPreferencesBase.cpp:822
+msgid "Monday"
+msgstr "Segunda"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:691
-#, no-c-format
-msgid "% when computer is in use"
-msgstr "% quando o computador está em utilização"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:701
-#, no-c-format
-msgid "% when computer is idle"
-msgstr "% quando o computador está inactivo"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:706
-msgid "Leave applications in memory while suspended"
-msgstr "Deixar aplicações em memória enquanto suspensas"
+#: clientgui/DlgAdvPreferencesBase.cpp:837
+msgid "Friday"
+msgstr "Sexta"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:708
-msgid "if checked, suspended work units are left in memory"
-msgstr "se assinalado, unidades de trabalho suspensas são deixadas em memória"
+#: clientgui/DlgAdvPreferencesBase.cpp:704
+#: clientgui/DlgAdvPreferencesBase.cpp:850
+msgid "Tuesday"
+msgstr "Terça"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:728
-msgid "Suspend processor and network usage when these applications are running:"
-msgstr "Suspende processador e utilização da rede quando estas aplicações estiverem a correr:"
+#: clientgui/DlgAdvPreferencesBase.cpp:719
+#: clientgui/DlgAdvPreferencesBase.cpp:865
+msgid "Saturday"
+msgstr "Sábado"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:738
-msgid "Add..."
-msgstr "Adicionar..."
+#: clientgui/DlgAdvPreferencesBase.cpp:732
+#: clientgui/DlgAdvPreferencesBase.cpp:878
+msgid "Wednesday"
+msgstr "Quarta"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:739
-msgid "Add an application to this list"
-msgstr "Adicionar uma aplicação a esta lista"
+#: clientgui/DlgAdvPreferencesBase.cpp:747
+#: clientgui/DlgAdvPreferencesBase.cpp:893
+msgid "Sunday"
+msgstr "Domingo"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:744
-msgid "Remove"
-msgstr "Remover"
+#: clientgui/DlgAdvPreferencesBase.cpp:760
+#: clientgui/DlgAdvPreferencesBase.cpp:906
+msgid "Thursday"
+msgstr "Quinta"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:745
-msgid "Remove an application from this list"
-msgstr "Remove uma aplicação desta lista"
+#: clientgui/DlgAdvPreferencesBase.cpp:789
+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:754
-msgid "For advanced options, refer to "
-msgstr "Para opções avançadas, seguir estas instruções: "
+#: clientgui/DlgAdvPreferencesBase.cpp:791
+msgid "Transfer files only between"
+msgstr "Transferir ficheiros apenas entre"
 
 #: clientgui/DlgDiagnosticLogFlags.cpp:65
 #, c-format
 msgid "%s Diagnostic Log Flags"
-msgstr "%s Log das Flags de Diagnóstico"
+msgstr "%s Log das Bandeiras de Diagnóstico"
 
 #: clientgui/DlgDiagnosticLogFlags.cpp:83
-msgid "These flags enable various types of diagnostic messages in the Event Log."
-msgstr "Estas flags habilitam vários tipos de mensagens de diagnóstico no Log de Eventos."
+msgid ""
+"These flags enable various types of diagnostic messages in the Event Log."
+msgstr "Estas bandeiras habilitam vários tipos de mensagens de diagnóstico no Log de Eventos."
+
+#: clientgui/DlgDiagnosticLogFlags.cpp:99
+msgid "More info ..."
+msgstr "Mais informação..."
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:105
+#: clientgui/DlgDiagnosticLogFlags.cpp:120 clientgui/DlgHiddenColumns.cpp:101
 msgid "Save all values and close the dialog"
-msgstr "Guardar todos os valores e fechar o diálogo"
+msgstr "Guardar todos os valores e fechar a caixa de diálogo"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:108
+#: clientgui/DlgDiagnosticLogFlags.cpp:123 clientgui/DlgHiddenColumns.cpp:104
 msgid "Defaults"
-msgstr "Padrões"
+msgstr "Predefinidos"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:109
+#: clientgui/DlgDiagnosticLogFlags.cpp:124 clientgui/DlgHiddenColumns.cpp:105
 msgid "Restore default settings"
-msgstr "Restaurar definições padrão"
+msgstr "Restaurar definições predefinidas"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:113
+#: clientgui/DlgDiagnosticLogFlags.cpp:128 clientgui/DlgHiddenColumns.cpp:109
 msgid "Close the dialog without saving"
-msgstr "Fechar o diálogo sem salvar"
+msgstr "Fechar caixa de diálogo sem guardar"
 
-#: clientgui/DlgEventLog.cpp:226
+#: clientgui/DlgEventLog.cpp:227
 #, c-format
 msgid "%s - Event Log"
 msgstr "%s - Registo de Eventos"
 
-#: clientgui/DlgEventLog.cpp:236
+#: clientgui/DlgEventLog.cpp:237
 msgid "Project"
 msgstr "Projecto"
 
-#: clientgui/DlgEventLog.cpp:237
+#: clientgui/DlgEventLog.cpp:238
 msgid "Time"
 msgstr "Tempo"
 
-#: clientgui/DlgEventLog.cpp:238
+#: clientgui/DlgEventLog.cpp:239
 msgid "Message"
 msgstr "Mensagem"
 
-#: clientgui/DlgEventLog.cpp:300
-#: clientgui/DlgEventLog.cpp:364
+#: clientgui/DlgEventLog.cpp:301 clientgui/DlgEventLog.cpp:351
 msgid "&Show only this project"
 msgstr "&Mostrar apenas este projecto"
 
-#: clientgui/DlgEventLog.cpp:304
+#: clientgui/DlgEventLog.cpp:305
 msgid "Copy &All"
 msgstr "Copiar &Todos"
 
-#: clientgui/DlgEventLog.cpp:306
-#: clientgui/DlgEventLog.cpp:310
+#: clientgui/DlgEventLog.cpp:307 clientgui/DlgEventLog.cpp:311
 msgid "Copy all the messages to the clipboard."
 msgstr "Copiar todas as mensagens para a área de transferência."
 
-#: clientgui/DlgEventLog.cpp:315
+#: clientgui/DlgEventLog.cpp:316
 msgid "Copy &Selected"
 msgstr "Copiar &Seleccionado"
 
-#: clientgui/DlgEventLog.cpp:318
-#: clientgui/DlgEventLog.cpp:326
-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 as mensagens seleccionadas para a área de transferência. Pode seleccionar múltiplas mensagens pressionando o shift enquanto carrega nas mensagens."
+#: 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."
+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:320
-#: clientgui/DlgEventLog.cpp:328
-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 as mensagens seleccionadas para a área de transferência. Pode seleccionar múltiplas mensagens pressionando o shift ou a tecla Ctrl enquanto carrega nas mensagens."
+#: 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."
+msgstr "Copiar as mensagens seleccionadas para a área de transferência. Pode seleccionar múltiplas mensagens pressionando o shift ou a tecla Ctrl enquanto clica nas mensagens."
 
-#: clientgui/DlgEventLog.cpp:335
-#: clientgui/DlgItemProperties.cpp:67
+#: clientgui/DlgEventLog.cpp:336 clientgui/DlgItemProperties.cpp:67
 msgid "&Close"
 msgstr "&Fechar"
 
-#: clientgui/DlgEventLog.cpp:344
-#, c-format
-msgid "Get help with %s"
-msgstr "Obter ajuda com o %s"
-
-#: clientgui/DlgEventLog.cpp:358
+#: clientgui/DlgEventLog.cpp:345
 msgid "Show all &messages"
 msgstr "Mostrar todas as &mensagens"
 
-#: clientgui/DlgEventLog.cpp:359
-#: clientgui/DlgEventLog.cpp:361
+#: clientgui/DlgEventLog.cpp:346 clientgui/DlgEventLog.cpp:348
 msgid "Show messages for all projects"
 msgstr "Mostrar mensagens para todos os projectos"
 
-#: clientgui/DlgEventLog.cpp:365
-#: clientgui/DlgEventLog.cpp:367
+#: clientgui/DlgEventLog.cpp:352 clientgui/DlgEventLog.cpp:354
 msgid "Show only the messages for the selected project"
 msgstr "Mostrar apenas as mensagens para o projecto seleccionado"
 
+#: clientgui/DlgExclusiveApps.cpp:60
+#, c-format
+msgid "%s - Exclusive Applications"
+msgstr "%s - Aplicações Exclusivas"
+
+#: clientgui/DlgExclusiveApps.cpp:72
+msgid ""
+"Suspend processor and network usage when these applications are running:"
+msgstr "Suspende processador e utilização da rede quando estas aplicações estiverem a ser executadas:"
+
+#: clientgui/DlgExclusiveApps.cpp:80 clientgui/DlgExclusiveApps.cpp:104
+msgid "Add..."
+msgstr "Adicionar..."
+
+#: clientgui/DlgExclusiveApps.cpp:81 clientgui/DlgExclusiveApps.cpp:105
+msgid "Add an application to this list"
+msgstr "Adicionar uma aplicação a esta lista"
+
+#: clientgui/DlgExclusiveApps.cpp:86 clientgui/DlgExclusiveApps.cpp:110
+msgid "Remove"
+msgstr "Remover"
+
+#: clientgui/DlgExclusiveApps.cpp:87 clientgui/DlgExclusiveApps.cpp:111
+msgid "Remove an application from this list"
+msgstr "Remove uma aplicação desta lista"
+
+#: clientgui/DlgExclusiveApps.cpp:96
+msgid "Suspend GPU usage when these applications are running:"
+msgstr "Suspende utilização da GPU quando estas aplicações estiverem a ser executadas"
+
+#: clientgui/DlgExclusiveApps.cpp:122
+msgid "For advanced options, refer to "
+msgstr "Para opções avançadas, seguir estas instruções: "
+
+#: clientgui/DlgExclusiveApps.cpp:147
+msgid "save all values and close the dialog"
+msgstr "guardar todos os valores e fechar caixa de diálogo"
+
+#: clientgui/DlgExclusiveApps.cpp:153
+msgid "close the dialog without saving"
+msgstr "fechar caixa de diálogo sem salvar"
+
+#: clientgui/DlgExclusiveApps.cpp:158
+msgid "shows the preferences web page"
+msgstr "mostra a página web das preferências"
+
+#: clientgui/DlgExclusiveApps.cpp:303 clientgui/DlgExclusiveApps.cpp:309
+#: clientgui/DlgExclusiveApps.cpp:315
+msgid "Applications to add"
+msgstr "Aplicações a adicionar"
+
+#: clientgui/DlgExclusiveApps.cpp:332
+#, c-format
+msgid "'%s' is not an executable application."
+msgstr "'%s' não é uma aplicação executável."
+
+#: clientgui/DlgExclusiveApps.cpp:333 clientgui/DlgExclusiveApps.cpp:380
+#: clientgui/DlgExclusiveApps.cpp:404
+msgid "Add Exclusive App"
+msgstr "Adicionar Aplicação Exclusiva"
+
+#: clientgui/DlgExclusiveApps.cpp:345
+msgid "Name of application to add?"
+msgstr "Nome da aplicação a adicionar?"
+
+#: clientgui/DlgExclusiveApps.cpp:345
+msgid "Add exclusive app"
+msgstr "Adicionar aplicação exclusiva"
+
+#: clientgui/DlgExclusiveApps.cpp:379
+#, c-format
+msgid "Application names must end with '%s'"
+msgstr "Os nomes das aplicações têm de terminar com '%s'"
+
+#: clientgui/DlgExclusiveApps.cpp:403
+#, c-format
+msgid "'%s' is already in the list."
+msgstr "'%s' já está na lista."
+
 #: clientgui/DlgExitMessage.cpp:82
 #, c-format
 msgid "%s - Exit Confirmation"
@@ -1695,13 +1737,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,\n"
-"que lhe permite ver e gerir as tarefas\n"
-"em execução no seu computador.\n"
-"\n"
-"Se também quer parar as tarefas em execução,\n"
-"escolha uma das seguintes opções:"
+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:"
 
 #: clientgui/DlgExitMessage.cpp:135
 #, c-format
@@ -1712,13 +1748,7 @@ msgid ""
 "In most cases, it is better just to close the %s window\n"
 "rather than to exit the application; that will allow %s to run its\n"
 "tasks at the times you selected in your preferences."
-msgstr ""
-"Isto irá desligar o %s e as tarefas até que\n"
-"o %s ou a %s protecção de ecrã esteja a correr novamente.\n"
-"\n"
-"Na maioria dos casos, é melhor apenas fechar a %s janela\n"
-"do que sair da aplicação; isso irá permitir %s executar as\n"
-"tarefas nos tempos que seleccionou nas suas preferências."
+msgstr "Isto irá desligar o %s e as tarefas até que\no %s ou a %s protecção de ecrã esteja a ser executada novamente.\n\nNa maioria dos casos, é melhor fechar apenas a %s janela\ndo que sair da aplicação; isso irá permitir %s executar as\ntarefas nos tempos que seleccionou nas suas preferências."
 
 #: clientgui/DlgExitMessage.cpp:153
 #, c-format
@@ -1729,10 +1759,8 @@ msgstr "Parar tarefas em execução quando sair do %s"
 msgid "Remember this decision and do not show this dialog."
 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/DlgExitMessage.cpp:178 clientgui/DlgGenericMessage.cpp:125
+#: clientgui/DlgOptions.cpp:404 clientgui/DlgSelectComputer.cpp:168
 msgid "&Cancel"
 msgstr "&Cancelar"
 
@@ -1740,10 +1768,28 @@ msgstr "&Cancelar"
 msgid "Don't show this dialog again."
 msgstr "Não mostrar esta caixa de diálogo outra vez."
 
-#: clientgui/DlgItemProperties.cpp:194
-#: clientgui/DlgItemProperties.cpp:197
-#: clientgui/DlgItemProperties.cpp:200
-#: clientgui/DlgItemProperties.cpp:203
+#: clientgui/DlgHiddenColumns.cpp:64
+#, c-format
+msgid "%s Column Selection"
+msgstr "%s Selecção de Coluna"
+
+#: clientgui/DlgHiddenColumns.cpp:77
+#, c-format
+msgid "Select which columns %s should show."
+msgstr "Seleccione que coluna %s deve ser mostrada."
+
+#: clientgui/DlgHiddenColumns.cpp:314
+msgid ""
+"Are you sure you want to reset all list columns to the default "
+"configurations?"
+msgstr "Tem a certeza que quer fazer reset à lista de todas as colunas para as configurações padrão?"
+
+#: clientgui/DlgHiddenColumns.cpp:315
+msgid "Confirm defaults"
+msgstr "Confirmar predefinidos"
+
+#: clientgui/DlgItemProperties.cpp:194 clientgui/DlgItemProperties.cpp:197
+#: clientgui/DlgItemProperties.cpp:200 clientgui/DlgItemProperties.cpp:203
 msgid "Don't fetch tasks for "
 msgstr "Não obter tarefas por"
 
@@ -1775,8 +1821,7 @@ msgstr " intervalo de suspensão de obtenção de trabalho"
 msgid "Properties of project "
 msgstr "Propriedades do projecto"
 
-#: clientgui/DlgItemProperties.cpp:243
-#: clientgui/DlgOptions.cpp:221
+#: clientgui/DlgItemProperties.cpp:243 clientgui/DlgOptions.cpp:221
 msgid "General"
 msgstr "Geral"
 
@@ -1808,6 +1853,10 @@ msgstr "Transferência dos ficheiros deferidos por"
 msgid "File uploads deferred for"
 msgstr "Uploads dos ficheiros deferidos por"
 
+#: clientgui/DlgItemProperties.cpp:257
+msgid "Disk usage"
+msgstr "Utilização do disco"
+
 #: clientgui/DlgItemProperties.cpp:258
 msgid "Computer ID"
 msgstr "ID do Computador"
@@ -1816,14 +1865,10 @@ msgstr "ID do Computador"
 msgid "Non CPU intensive"
 msgstr "CPU não intensivo"
 
-#: 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 "sim"
 
@@ -1831,8 +1876,7 @@ msgstr "sim"
 msgid "Suspended via GUI"
 msgstr "Suspenso através da GUI"
 
-#: clientgui/DlgItemProperties.cpp:262
-#: clientgui/DlgItemProperties.cpp:263
+#: clientgui/DlgItemProperties.cpp:262 clientgui/DlgItemProperties.cpp:263
 msgid "no"
 msgstr "não"
 
@@ -1848,14 +1892,13 @@ msgstr "Agendamento de tarefas em progresso"
 msgid "Trickle-up pending"
 msgstr "Avisos pendentes"
 
-#: clientgui/DlgItemProperties.cpp:271
-#: clientgui/DlgItemProperties.cpp:273
+#: clientgui/DlgItemProperties.cpp:271 clientgui/DlgItemProperties.cpp:273
 msgid "Host location"
 msgstr "Localização do anfitrião"
 
 #: clientgui/DlgItemProperties.cpp:273
 msgid "default"
-msgstr "padrão"
+msgstr "predefinido"
 
 #: clientgui/DlgItemProperties.cpp:277
 msgid "Added via account manager"
@@ -1871,7 +1914,7 @@ msgstr "Terminado"
 
 #: clientgui/DlgItemProperties.cpp:285
 msgid "Tasks completed"
-msgstr "Tarefas completas"
+msgstr "Tarefas concluídas"
 
 #: clientgui/DlgItemProperties.cpp:286
 msgid "Tasks failed"
@@ -1941,13 +1984,11 @@ msgstr "Tamanho estimado de computação"
 msgid "CPU time at last checkpoint"
 msgstr "Tempo de CPU no ultimo checkpoint"
 
-#: clientgui/DlgItemProperties.cpp:374
-#: clientgui/DlgItemProperties.cpp:389
+#: clientgui/DlgItemProperties.cpp:374 clientgui/DlgItemProperties.cpp:389
 msgid "CPU time"
 msgstr "Tempo de CPU"
 
-#: clientgui/DlgItemProperties.cpp:376
-#: clientgui/DlgItemProperties.cpp:390
+#: clientgui/DlgItemProperties.cpp:376 clientgui/DlgItemProperties.cpp:390
 msgid "Elapsed time"
 msgstr "Tempo decorrido"
 
@@ -1979,8 +2020,7 @@ msgstr "ID do Processo"
 msgid "Local: "
 msgstr "Local:"
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: clientgui/DlgOptions.cpp:129 clientgui/DlgOptions.cpp:135
 msgid "Options"
 msgstr "Opções"
 
@@ -2022,15 +2062,15 @@ msgstr "Definições da ligação Dial-up e da Rede Virtual Privada"
 
 #: clientgui/DlgOptions.cpp:243
 msgid "&Set Default"
-msgstr "&Definir Predefinição"
+msgstr "&Definir Predefinido"
 
 #: clientgui/DlgOptions.cpp:248
 msgid "&Clear Default"
-msgstr "&Limpar a Predefinição"
+msgstr "&Limpar Predefinido"
 
 #: clientgui/DlgOptions.cpp:255
 msgid "Default Connection:"
-msgstr "Conexões Predefinidas:"
+msgstr "Conexão Predefinida:"
 
 #: clientgui/DlgOptions.cpp:262
 msgid "Connections"
@@ -2044,33 +2084,27 @@ msgstr "Conectar através do servidor HTTP proxy"
 msgid "HTTP Proxy Server Configuration"
 msgstr "Configurações do servidor HTTP Proxy"
 
-#: clientgui/DlgOptions.cpp:283
-#: clientgui/DlgOptions.cpp:347
+#: clientgui/DlgOptions.cpp:283 clientgui/DlgOptions.cpp:347
 msgid "Address:"
 msgstr "Endereço:"
 
-#: clientgui/DlgOptions.cpp:291
-#: clientgui/DlgOptions.cpp:355
+#: clientgui/DlgOptions.cpp:291 clientgui/DlgOptions.cpp:355
 msgid "Port:"
 msgstr "Porta:"
 
-#: clientgui/DlgOptions.cpp:299
-#: clientgui/DlgOptions.cpp:363
+#: clientgui/DlgOptions.cpp:299 clientgui/DlgOptions.cpp:363
 msgid "Don't use proxy for:"
 msgstr "Não usar proxy para:"
 
-#: clientgui/DlgOptions.cpp:306
-#: clientgui/DlgOptions.cpp:370
+#: clientgui/DlgOptions.cpp:306 clientgui/DlgOptions.cpp:370
 msgid "Leave these blank if not needed"
 msgstr "Deixar em branco se desnecessário"
 
-#: clientgui/DlgOptions.cpp:312
-#: clientgui/DlgOptions.cpp:376
+#: clientgui/DlgOptions.cpp:312 clientgui/DlgOptions.cpp:376
 msgid "User Name:"
 msgstr "Nome de Utilizador:"
 
-#: clientgui/DlgOptions.cpp:320
-#: clientgui/DlgOptions.cpp:384
+#: clientgui/DlgOptions.cpp:320 clientgui/DlgOptions.cpp:384
 #: clientgui/DlgSelectComputer.cpp:152
 msgid "Password:"
 msgstr "Palavra-passe:"
@@ -2122,7 +2156,9 @@ msgstr "%s - Selecção de Idioma"
 
 #: 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 "O idioma %s's foi alterado. Para que esta alteração tenha efeito, tem de reiniciar o %s."
 
 #: clientgui/DlgSelectComputer.cpp:91
@@ -2135,16 +2171,13 @@ msgstr "%s - Seleccione Computador"
 msgid ""
 "Another instance of %s is already running \n"
 "on this computer.  Please select a client to monitor."
-msgstr ""
-"Outra instância do %s já está a em execução \n"
-"neste computador. Por favor, seleccione o cliente a monitorizar."
+msgstr "Outra instância do %s já está a em execução \nneste computador. Por favor, seleccione o cliente a monitorizar."
 
 #: clientgui/DlgSelectComputer.cpp:143
 msgid "Host name:"
 msgstr "Nome do anfitrião:"
 
-#: clientgui/Localization.cpp:31
-#: clientgui/Localization.cpp:69
+#: clientgui/Localization.cpp:31 clientgui/Localization.cpp:69
 msgid "Message boards"
 msgstr "Fóruns"
 
@@ -2156,15 +2189,12 @@ msgstr "Trocar mensagens com outros utilizadores nos fóruns do SETI at home"
 msgid "Ask questions and report problems"
 msgstr "Colocar perguntas e reportar problemas"
 
-#: 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 "A sua conta"
 
-#: 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 "Ver informações da sua conta e os créditos totais"
@@ -2177,18 +2207,15 @@ msgstr "As suas preferências"
 msgid "View and modify your SETI at home account profile and preferences"
 msgstr "Ver e modificar as suas preferências no perfil da conta no SETI at home"
 
-#: clientgui/Localization.cpp:47
-#: clientgui/Localization.cpp:89
+#: clientgui/Localization.cpp:47 clientgui/Localization.cpp:89
 msgid "Your results"
 msgstr "Os seus resultados"
 
-#: 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 "Ver os resultados da computação e trabalhos da última semana (ou mais)"
 
-#: clientgui/Localization.cpp:51
-#: clientgui/Localization.cpp:93
+#: clientgui/Localization.cpp:51 clientgui/Localization.cpp:93
 msgid "Your computers"
 msgstr "Os seus computadores"
 
@@ -2196,13 +2223,11 @@ msgstr "Os seus computadores"
 msgid "View a listing of all the computers on which you are running SETI at Home"
 msgstr "Ver uma lista de todos os computadores onde está a executar o SETI at Home"
 
-#: clientgui/Localization.cpp:55
-#: clientgui/Localization.cpp:97
+#: clientgui/Localization.cpp:55 clientgui/Localization.cpp:97
 msgid "Your team"
 msgstr "A sua equipa"
 
-#: clientgui/Localization.cpp:57
-#: clientgui/Localization.cpp:99
+#: clientgui/Localization.cpp:57 clientgui/Localization.cpp:99
 msgid "View information about your team"
 msgstr "Ver informações acerca da sua equipa"
 
@@ -2223,7 +2248,8 @@ msgid "Read a detailed description of the Einstein at Home screensaver"
 msgstr "Ler uma descrição detalhada da protecção de ecrã no Einstein at Home"
 
 #: 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 "Trocar mensagens com administradores e outros utilizadores nos fóruns do Einstein at Home"
 
 #: clientgui/Localization.cpp:73
@@ -2251,7 +2277,8 @@ msgid "Account summary"
 msgstr "Resumo da conta"
 
 #: 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 "Ver uma lista de todos os computadores onde está a executar o Einstein at Home"
 
 #: clientgui/Localization.cpp:101
@@ -2259,7 +2286,9 @@ msgid "LIGO project"
 msgstr "Projecto LIGO"
 
 #: 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 "A página principal do projecto LASER Interferometer Gravitational-wave Observatory (LIGO)"
 
 #: clientgui/Localization.cpp:105
@@ -2270,8 +2299,7 @@ msgstr "Projecto GEO-600"
 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/Localization.cpp:115 clientgui/Localization.cpp:133
 msgid "Team"
 msgstr "Equipa"
 
@@ -2352,7 +2380,9 @@ msgid "Missing application"
 msgstr "Aplicação em falta"
 
 #: 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 "Por favor, transfira e instale a aplicação CoRD de http://cord.sourceforge.net"
 
 #: clientgui/MainDocument.cpp:2442
@@ -2423,8 +2453,7 @@ msgstr "Transferência falhada"
 msgid "Downloading"
 msgstr "Fazendo a transferência"
 
-#: clientgui/MainDocument.cpp:2492
-#: clientgui/MainDocument.cpp:2557
+#: clientgui/MainDocument.cpp:2492 clientgui/MainDocument.cpp:2551
 msgid " (suspended - "
 msgstr "(suspenso - "
 
@@ -2436,7 +2465,7 @@ msgstr "Projecto suspenso pelo utilizador"
 msgid "Task suspended by user"
 msgstr "Tarefa suspensa pelo utilizador"
 
-#: clientgui/MainDocument.cpp:2504
+#: clientgui/MainDocument.cpp:2507
 msgid "Suspended - "
 msgstr "Suspenso - "
 
@@ -2444,92 +2473,91 @@ msgstr "Suspenso - "
 msgid "GPU suspended - "
 msgstr "GPU suspensa - "
 
-#: clientgui/MainDocument.cpp:2517
+#: clientgui/MainDocument.cpp:2514
 msgid "Waiting for memory"
 msgstr "A aguardar por memória"
 
-#: clientgui/MainDocument.cpp:2519
+#: clientgui/MainDocument.cpp:2516
 msgid "Waiting for shared memory"
 msgstr "A aguardar por memória partilhada"
 
-#: clientgui/MainDocument.cpp:2521
+#: clientgui/MainDocument.cpp:2518
 msgid "Running"
 msgstr "Executando"
 
-#: clientgui/MainDocument.cpp:2523
+#: clientgui/MainDocument.cpp:2520
 msgid " (non-CPU-intensive)"
 msgstr " (CPU não intensivo)"
 
-#: clientgui/MainDocument.cpp:2526
+#: clientgui/MainDocument.cpp:2523
 msgid "Waiting to run"
 msgstr "A aguardar a execução"
 
-#: clientgui/MainDocument.cpp:2528
-#: clientgui/MainDocument.cpp:2534
+#: clientgui/MainDocument.cpp:2525 clientgui/MainDocument.cpp:2528
 msgid "Ready to start"
 msgstr "Pronto para começar"
 
-#: clientgui/MainDocument.cpp:2538
+#: clientgui/MainDocument.cpp:2532
 msgid "Postponed: "
 msgstr "Adiado:"
 
-#: clientgui/MainDocument.cpp:2541
+#: clientgui/MainDocument.cpp:2535
 msgid "Postponed"
 msgstr "Adiado"
 
-#: clientgui/MainDocument.cpp:2545
+#: clientgui/MainDocument.cpp:2539
 msgid "Waiting for network access"
-msgstr "A aguardar por acesso à internet"
+msgstr "Aguardando acesso à rede"
 
-#: clientgui/MainDocument.cpp:2549
+#: clientgui/MainDocument.cpp:2543
 msgid "Computation error"
 msgstr "Erro de computação"
 
-#: clientgui/MainDocument.cpp:2553
+#: clientgui/MainDocument.cpp:2547
 msgid "Upload failed"
 msgstr "Upload falhado"
 
-#: clientgui/MainDocument.cpp:2555
+#: clientgui/MainDocument.cpp:2549
 msgid "Uploading"
 msgstr "A fazer o Upload"
 
-#: clientgui/MainDocument.cpp:2566
+#: clientgui/MainDocument.cpp:2560
 msgid "Aborted by user"
 msgstr "Abortado pelo utilizador"
 
-#: clientgui/MainDocument.cpp:2569
+#: clientgui/MainDocument.cpp:2563
 msgid "Aborted by project"
 msgstr "Abortado pelo projecto"
 
-#: clientgui/MainDocument.cpp:2572
+#: clientgui/MainDocument.cpp:2566
 msgid "Aborted: not started by deadline"
 msgstr "Abortado: não iniciado devido à data limite excedida"
 
-#: clientgui/MainDocument.cpp:2575
+#: clientgui/MainDocument.cpp:2569
 msgid "Aborted: disk limit exceeded"
 msgstr "Abortado: limite em disco excedido"
 
-#: clientgui/MainDocument.cpp:2578
+#: clientgui/MainDocument.cpp:2572
 msgid "Aborted: run time limit exceeded"
 msgstr "Abortado: limite de tempo excedido"
 
-#: clientgui/MainDocument.cpp:2581
+#: clientgui/MainDocument.cpp:2575
 msgid "Aborted: memory limit exceeded"
 msgstr "Abortado: limite em memória excedido"
 
-#: clientgui/MainDocument.cpp:2584
+#: clientgui/MainDocument.cpp:2578
 msgid "Aborted"
 msgstr "Abortado"
 
-#: clientgui/MainDocument.cpp:2589
+#: clientgui/MainDocument.cpp:2583
 msgid "Acknowledged"
 msgstr "Reconhecido"
 
-#: clientgui/MainDocument.cpp:2591
+#: clientgui/MainDocument.cpp:2585
 msgid "Ready to report"
 msgstr "Pronto para reportar"
 
-#: clientgui/MainDocument.cpp:2593
+#: clientgui/MainDocument.cpp:2587
 #, c-format
 msgid "Error: invalid state '%d'"
 msgstr "Erro: estado inválido '%d'"
@@ -2551,10 +2579,7 @@ msgid ""
 "The URL you supplied is not that of a BOINC-based project.\n"
 "\n"
 "Please check the URL and try again."
-msgstr ""
-"O URL que forneceu não é de um projecto com base no BOINC.\n"
-"\n"
-"Por favor, verifique o URL e tente novamente."
+msgstr "O URL que forneceu não é de um projecto com base no BOINC.\n\nPor favor, verifique o URL e tente novamente."
 
 #: clientgui/NotDetectedPage.cpp:188
 msgid "Account manager not found"
@@ -2566,11 +2591,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\n"
-"Gestor BOINC.\n"
-"\n"
-"Por favor, verifique o URL e tente novamente."
+msgstr "O URL que forneceu não é de uma conta com base no\nGestor BOINC.\n\nPor favor, verifique o URL e tente novamente."
 
 #: clientgui/NotFoundPage.cpp:181
 msgid "Login Failed."
@@ -2592,53 +2613,54 @@ msgstr "mais..."
 msgid "Choose a project"
 msgstr "Escolha o projecto"
 
-#: clientgui/ProjectInfoPage.cpp:228
+#: 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."
 
-#: clientgui/ProjectInfoPage.cpp:246
+#: clientgui/ProjectInfoPage.cpp:242
 msgid "Categories:"
 msgstr "Categorias:"
 
-#: clientgui/ProjectInfoPage.cpp:267
+#: clientgui/ProjectInfoPage.cpp:262
 msgid "Projects:"
 msgstr "Projectos:"
 
-#: clientgui/ProjectInfoPage.cpp:279
+#: clientgui/ProjectInfoPage.cpp:274
 msgid "Project details"
 msgstr "Detalhes do projecto"
 
-#: clientgui/ProjectInfoPage.cpp:291
+#: clientgui/ProjectInfoPage.cpp:284
 msgid "Research area:"
 msgstr "Área de pesquisa:"
 
-#: clientgui/ProjectInfoPage.cpp:302
+#: clientgui/ProjectInfoPage.cpp:294
 msgid "Organization:"
 msgstr "Organização:"
 
-#: clientgui/ProjectInfoPage.cpp:313
+#: clientgui/ProjectInfoPage.cpp:304
 msgid "Web site:"
 msgstr "Website:"
 
-#: clientgui/ProjectInfoPage.cpp:325
+#: clientgui/ProjectInfoPage.cpp:315
 msgid "Supported systems:"
 msgstr "Sistemas suportados:"
 
-#: clientgui/ProjectInfoPage.cpp:363
+#: clientgui/ProjectInfoPage.cpp:352
 msgid "Project URL:"
 msgstr "URL do Projecto:"
 
-#: clientgui/ProjectInfoPage.cpp:499
-#: clientgui/ProjectInfoPage.cpp:754
-#: clientgui/ProjectInfoPage.cpp:758
+#: clientgui/ProjectInfoPage.cpp:486 clientgui/ProjectInfoPage.cpp:686
+#: clientgui/ProjectInfoPage.cpp:690
 msgid "All"
 msgstr "Todos"
 
-#: clientgui/ProjectInfoPage.cpp:802
-msgid "This project may not have work for your type of computer.  Do you want to add it anyway?"
+#: clientgui/ProjectInfoPage.cpp:735
+msgid ""
+"This project may not have work for your type of computer.  Do you want to "
+"add it anyway?"
 msgstr "Este projecto pode não ter trabalhos para o seu tipo de computador. Quer adicioná-lo de qualquer maneira?"
 
-#: clientgui/ProjectInfoPage.cpp:826
+#: clientgui/ProjectInfoPage.cpp:767
 msgid "You already added this project. Please choose a different project."
 msgstr "Já adicionou este projecto. Por favor escolha um projecto diferente."
 
@@ -2646,12 +2668,12 @@ msgstr "Já adicionou este projecto. Por favor escolha um projecto diferente."
 msgid "Communicating with project."
 msgstr "A comunicar com o projecto."
 
-#: clientgui/ProjectProcessingPage.cpp:510
+#: clientgui/ProjectProcessingPage.cpp:509
 msgid "Required files not found on the server."
 msgstr "Ficheiros necessários não encontrados no servidor."
 
-#: clientgui/ProjectProcessingPage.cpp:513
-#: clientgui/ProjectProcessingPage.cpp:586
+#: clientgui/ProjectProcessingPage.cpp:512
+#: clientgui/ProjectProcessingPage.cpp:585
 msgid "An internal server error has occurred."
 msgstr "Ocorreu um erro interno no servidor."
 
@@ -2659,18 +2681,16 @@ msgstr "Ocorreu um erro interno no servidor."
 msgid ""
 "Communicating with project\n"
 "Please wait..."
-msgstr ""
-"A comunicar com o projecto\n"
-"Por favor aguarde..."
+msgstr "A comunicar com o projecto\nPor favor aguarde..."
 
 #: clientgui/ProjectWelcomePage.cpp:251
 #, c-format
 msgid "Welcome to %s."
-msgstr "Bem Vindo a %s."
+msgstr "Bem vindo a %s."
 
 #: clientgui/ProjectWelcomePage.cpp:254
 msgid "You have volunteered to compute for this project:"
-msgstr "Voluntariou-se para executar computação para este projecto:"
+msgstr "Voluntariou-se para realizar computação neste projecto:"
 
 #: clientgui/ProjectWelcomePage.cpp:255
 msgid "Name:"
@@ -2678,7 +2698,7 @@ msgstr "Nome:"
 
 #: clientgui/ProjectWelcomePage.cpp:258
 msgid "Home:"
-msgstr "Página Principal:"
+msgstr "Página principal:"
 
 #: clientgui/ProjectWelcomePage.cpp:262
 msgid "Description:"
@@ -2693,12 +2713,14 @@ msgid "User:"
 msgstr "Utilizador:"
 
 #: clientgui/ProjectWelcomePage.cpp:273
-msgid "WARNING: This project is not registered with BOINC.  Make sure you trust it before continuing."
-msgstr "AVISO: Este projecto não está registado no BOINC.  Confirme que o projecto é de confiança antes de continuar."
+msgid ""
+"WARNING: This project is not registered with BOINC.  Make sure you trust it "
+"before continuing."
+msgstr "AVISO: Este projecto não está registado no BOINC. Tenha a certeza que confia no mesmo antes de continuar."
 
 #: clientgui/ProjectWelcomePage.cpp:277
 msgid "To continue, click Next."
-msgstr "Para continuar, carregue em Próximo."
+msgstr "Para continuar, clique em Próximo."
 
 #: clientgui/ProxyInfoPage.cpp:195
 msgid "Network communication failure"
@@ -2719,20 +2741,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 comunicão\n"
-"à Internet. As razões mais prováveis são:\n"
-"\n"
-"1) Problemas de conectividade. Verifique a sua conexão à rede ou o modem,\n"
-"depois carregue em voltar Atrás e tente novamente.\n"
-"\n"
-"2) Software da firewall pessoal está a bloquear o World Community\n"
-"Grid - Software BOINC. Configure a sua firewall pessoal para permitir que o\n"
-"BOINC e o Gestor do BOINC comunique na porta 80 e na porta 443,\n"
-"depois carregue em voltar atrás e tente novamente.\n"
-"\n"
-"3) Está a usar um servidor de proxy.\n"
-"Carregue em Próximo para configurar as definições de proxy do BOINC."
+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 [...]
 
 #: clientgui/ProxyInfoPage.cpp:203
 msgid ""
@@ -2749,20 +2758,7 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"O BOINC falhou a comunicação à Internet.\n"
-"As razões mais prováveis são:\n"
-"\n"
-"1) Problemas de conectividade. Verifique a rede\n"
-"ou a conexão ao modem e depois carregue em voltar atrás e tente novamente.\n"
-"\n"
-"2) Software da firewall pessoal esta a bloquear o BOINC.\n"
-"Configure a sua firewall pessoal para permitir o BOINC e.\n"
-"o Gestor do BOINC comunicar na porta 80,\n"
-"depois carregue em voltar atrás e tente novamente.\n"
-"\n"
-"3) Está a usar um servidor de proxy.\n"
-"Carregue em Próximo para configurar as definições de proxy do BOINC."
+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 [...]
 
 #: clientgui/ProxyPage.cpp:331
 msgid "Proxy configuration"
@@ -2772,8 +2768,7 @@ msgstr "Configuração da proxy"
 msgid "HTTP proxy"
 msgstr "Proxy HTTP"
 
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
+#: clientgui/ProxyPage.cpp:337 clientgui/ProxyPage.cpp:357
 msgid "Server:"
 msgstr "Servidor:"
 
@@ -2785,51 +2780,64 @@ msgstr "Detectar automaticamente"
 msgid "SOCKS proxy"
 msgstr "Proxy SOCKS"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:167
+#: clientgui/sg_BoincSimpleFrame.cpp:166
+msgid "Skin"
+msgstr "Máscara"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:168
+msgid "Select the appearance of the user interface."
+msgstr "Selecciona a aparência do interface de utilizador."
+
+#: clientgui/sg_BoincSimpleFrame.cpp:179
+msgid "Display diagnostic messages."
+msgstr "Mostra as mensagens de diagnóstico."
+
+#: clientgui/sg_BoincSimpleFrame.cpp:184
 msgid "Advanced View...\tCtrl+Shift+A"
 msgstr "Vista Avançada...\tCtrl+Shift+A"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:168
+#: clientgui/sg_BoincSimpleFrame.cpp:185
 msgid "Display the advanced graphical interface."
 msgstr "Mostra o interface gráfico avançado."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:175
-msgid "Skin"
-msgstr "Máscara"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:177
-msgid "Select the appearance of the user interface."
-msgstr "Selecciona a aparência do interface de utilizador."
+#: 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/sg_BoincSimpleFrame.cpp:224
+#: clientgui/sg_BoincSimpleFrame.cpp:222
 #, c-format
 msgid "&%s"
 msgstr "&%s"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:405
+#: clientgui/sg_BoincSimpleFrame.cpp:396
 msgid "Default"
-msgstr "Padrão"
+msgstr "Predefinido"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:848
+#: clientgui/sg_BoincSimpleFrame.cpp:838
 msgid "Suspend"
 msgstr "Suspender"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:850
+#: clientgui/sg_BoincSimpleFrame.cpp:840
 msgid "Suspend Computing"
 msgstr "Suspende a Computação"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:851
+#: clientgui/sg_BoincSimpleFrame.cpp:841
 msgid "Resume Computing"
 msgstr "Resume a Computação"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:867
+#: clientgui/sg_BoincSimpleFrame.cpp:857
 msgid "Notices"
 msgstr "Notícias"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:868
+#: 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/sg_BoincSimpleFrame.cpp:879
+#, c-format
+msgid "Get help with %s"
+msgstr "Obter ajuda com o %s"
+
 #: clientgui/sg_DlgMessages.cpp:124
 msgid "Fetching notices; please wait..."
 msgstr "A pesquisar noitícias; por favor aguarde..."
@@ -2847,233 +2855,104 @@ msgstr "Fechar"
 msgid "%s - Notices"
 msgstr "%s - Notícias"
 
-#: clientgui/sg_DlgPreferences.cpp:270
-msgid "This dialog controls preferences for this computer only."
-msgstr "Esta janela controla as preferências para este computador apenas."
-
-#: clientgui/sg_DlgPreferences.cpp:275
-msgid "Click OK to set preferences."
-msgstr "Carregue em OK para definir as preferências."
-
-#: clientgui/sg_DlgPreferences.cpp:280
-msgid "Click Clear to restore web-based settings for all preferences listed below."
-msgstr "Carregue em Limpar para restaurar as configurações definidas na web para todas as preferência abaixo"
-
-#: clientgui/sg_DlgPreferences.cpp:287
-msgid "For additional settings, select Computing Preferences in the Advanced View."
+#: 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/sg_DlgPreferences.cpp:315
-msgid "Do work only between:"
-msgstr "Executar trabalho apenas entre:"
-
-#: clientgui/sg_DlgPreferences.cpp:337
-msgid "Connect to internet only between:"
-msgstr "Conectar-se à internet apenas entre:"
-
-#: clientgui/sg_DlgPreferences.cpp:359
-#: clientgui/sg_DlgPreferences.cpp:376
-msgid "Use no more than:"
-msgstr "Usar não mais do que:"
+#: clientgui/sg_DlgPreferences.cpp:289
+msgid "GB of disk space"
+msgstr "Gb de espaço em disco"
 
-#: clientgui/sg_DlgPreferences.cpp:372
-msgid "of disk space"
-msgstr "de espaço em disco"
-
-#: clientgui/sg_DlgPreferences.cpp:389
-msgid "of the processor"
-msgstr "do processador"
-
-#: clientgui/sg_DlgPreferences.cpp:393
-msgid "Do work while on battery?"
-msgstr "Executar trabalho se ligado apenas à bateria?"
-
-#: clientgui/sg_DlgPreferences.cpp:406
-msgid "Do work after idle for:"
-msgstr "Executar trabalho depois de inactivo por:"
-
-#: clientgui/sg_DlgPreferences.cpp:431
-msgid "Clear all local preferences listed above and close the dialog"
-msgstr "Desmarcar todas as preferências locais listadas acima e fechar a caixa de diálogo"
-
-#: clientgui/sg_DlgPreferences.cpp:609
-#: clientgui/sg_DlgPreferences.cpp:612
-#: clientgui/sg_DlgPreferences.cpp:688
-#: clientgui/sg_DlgPreferences.cpp:692
-#: clientgui/sg_DlgPreferences.cpp:704
-#: clientgui/sg_DlgPreferences.cpp:708
-#: clientgui/sg_DlgPreferences.cpp:851
-#: clientgui/sg_DlgPreferences.cpp:862
-msgid "Anytime"
-msgstr "A qualquer altura"
-
-#: clientgui/sg_DlgPreferences.cpp:645
-msgid "100 MB"
-msgstr "100 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:646
-msgid "200 MB"
-msgstr "200 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:647
-msgid "500 MB"
-msgstr "500 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:648
-msgid "1 GB"
-msgstr "1 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:649
-msgid "2 GB"
-msgstr "2 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:650
-msgid "5 GB"
-msgstr "5 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:651
-msgid "10 GB"
-msgstr "10 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:652
-msgid "20 GB"
-msgstr "20 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:653
-msgid "50 GB"
-msgstr "50 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:654
-msgid "100 GB"
-msgstr "100 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:724
-#, c-format
-msgid "%d MB"
-msgstr "%d MB"
-
-#: clientgui/sg_DlgPreferences.cpp:726
-#, c-format
-msgid "%4.2f GB"
-msgstr "%4.2f GB"
-
-#: clientgui/sg_DlgPreferences.cpp:767
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: clientgui/sg_DlgPreferences.cpp:803
-msgid "0 (Run Always)"
-msgstr "0 (Executar Sempre)"
-
-#: clientgui/sg_DlgPreferences.cpp:806
-#, c-format
-msgid "%d"
-msgstr "%d"
-
-#: clientgui/sg_DlgPreferences.cpp:953
+#: clientgui/sg_DlgPreferences.cpp:980
 #, c-format
 msgid "%s - Computing Preferences"
-msgstr "%s - Preferências de Computação"
+msgstr "%s - Preferência de Computação"
 
-#: clientgui/sg_DlgPreferences.cpp:1033
-msgid "Do you really want to clear all local preferences?\n"
-msgstr "Quer mesmo limpar todas as preferências locais?\n"
+#: 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/sg_ProjectCommandPopup.cpp:66
-#: clientgui/ViewProjects.cpp:179
 msgid "Update"
 msgstr "Actualizar"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:67
-#: clientgui/ViewProjects.cpp:180
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
-msgstr "Reportar todas as tarefas completas, obter os ultimos créditos, obter as ultimas preferências e possivelmente mais tarefas."
+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/sg_ProjectCommandPopup.cpp:73
 #: clientgui/sg_ProjectCommandPopup.cpp:129
-#: clientgui/ViewProjects.cpp:187
-#: clientgui/ViewProjects.cpp:727
 msgid "Suspend tasks for this project."
 msgstr "Suspender tarefas para este projecto."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:78
 #: clientgui/sg_ProjectCommandPopup.cpp:136
-#: clientgui/ViewProjects.cpp:193
-#: clientgui/ViewProjects.cpp:746
 msgid "No new tasks"
 msgstr "Não obter novas tarefas"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:79
-#: clientgui/ViewProjects.cpp:194
 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:200
 msgid "Reset project"
 msgstr "Fazer reset ao projecto"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:85
-#: clientgui/ViewProjects.cpp:201
-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 "Elimina todos os ficheiros e tarefas associadas a este projecto e obtém novas tarefas. Pode actualizar o projecto primeiro para reportar tarefas concluídas."
+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:208
-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 concluidas)."
+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/sg_ProjectCommandPopup.cpp:96
 #: clientgui/sg_TaskCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:214
 msgid "Properties"
 msgstr "Propriedades"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:97
-#: clientgui/ViewProjects.cpp:215
 msgid "Show project details."
 msgstr "Mostrar detalhes do projecto."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:126
-#: clientgui/ViewProjects.cpp:723
 msgid "Resume tasks for this project."
 msgstr "Resumir tarefas para este projecto."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:133
-#: clientgui/ViewProjects.cpp:742
 msgid "Allow new tasks"
 msgstr "Permitir novas tarefas"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:134
-#: clientgui/ViewProjects.cpp:742
 msgid "Allow fetching new tasks for this project."
 msgstr "Permitir obtenção de novas tarefas para este projecto."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:137
-#: clientgui/ViewProjects.cpp:746
 msgid "Don't fetch new tasks for this project."
 msgstr "Não obter novas tarefas para este projecto."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:229
-#: clientgui/ViewProjects.cpp:443
 #, 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
-#: clientgui/ViewProjects.cpp:449
 msgid "Reset Project"
 msgstr "Fazer Reset ao Projecto"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:266
-#: clientgui/ViewProjects.cpp:501
 #, 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
-#: clientgui/ViewProjects.cpp:507
 msgid "Remove Project"
 msgstr "Remover Projecto"
 
@@ -3089,6 +2968,10 @@ msgstr "Sincronizar"
 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"
@@ -3152,9 +3035,7 @@ msgstr "A suspender trabalho para esta tarefa."
 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)"
+msgstr "Tem a certeza que quer cancelar esta tarefa '%s'?\n(Progresso: %.1lf%%, Estado: %s)"
 
 #: clientgui/sg_TaskCommandPopup.cpp:272
 msgid "Abort task"
@@ -3225,52 +3106,51 @@ msgstr "Restante (estimado): %s"
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: clientgui/sg_TaskPanel.cpp:1227
+#: clientgui/sg_TaskPanel.cpp:1228
 msgid "Retrieving current status."
 msgstr "A rever o estado actual."
 
-#: clientgui/sg_TaskPanel.cpp:1233
+#: clientgui/sg_TaskPanel.cpp:1234
 msgid "Downloading work from the server."
 msgstr "A realizar transferência de trabalho do servidor."
 
-#: clientgui/sg_TaskPanel.cpp:1238
+#: clientgui/sg_TaskPanel.cpp:1239
 msgid "Processing Suspended:  Running On Batteries."
 msgstr "Processamento Suspenso:  A executar em Bateria."
 
-#: clientgui/sg_TaskPanel.cpp:1240
+#: clientgui/sg_TaskPanel.cpp:1241
 msgid "Processing Suspended:  User Active."
 msgstr "Processamento Suspenso:  Utilizador Activo."
 
-#: clientgui/sg_TaskPanel.cpp:1242
+#: clientgui/sg_TaskPanel.cpp:1243
 msgid "Processing Suspended:  User paused processing."
 msgstr "Processamento Suspenso:  O utilizador parou o processamento."
 
-#: clientgui/sg_TaskPanel.cpp:1244
+#: clientgui/sg_TaskPanel.cpp:1245
 msgid "Processing Suspended:  Time of Day."
 msgstr "Processamento Suspenso:  Hora do Dia."
 
-#: clientgui/sg_TaskPanel.cpp:1246
+#: clientgui/sg_TaskPanel.cpp:1247
 msgid "Processing Suspended:  Benchmarks Running."
 msgstr "Processamento Suspenso:  A Executar Testes de Performance."
 
-#: clientgui/sg_TaskPanel.cpp:1248
+#: clientgui/sg_TaskPanel.cpp:1249
 msgid "Processing Suspended."
 msgstr "Processamento Suspenso."
 
-#: clientgui/sg_TaskPanel.cpp:1252
+#: clientgui/sg_TaskPanel.cpp:1253
 msgid "Waiting to contact project servers."
 msgstr "A aguardar contacto dos servidores do projecto."
 
-#: clientgui/sg_TaskPanel.cpp:1256
-#: clientgui/sg_TaskPanel.cpp:1265
+#: clientgui/sg_TaskPanel.cpp:1257 clientgui/sg_TaskPanel.cpp:1266
 msgid "Retrieving current status"
 msgstr "A rever estado actual"
 
-#: clientgui/sg_TaskPanel.cpp:1260
+#: clientgui/sg_TaskPanel.cpp:1261
 msgid "No work available to process"
 msgstr "Sem trabalhos disponíveis para processar"
 
-#: clientgui/sg_TaskPanel.cpp:1262
+#: clientgui/sg_TaskPanel.cpp:1263
 msgid "Unable to connect to the core client"
 msgstr "Incapaz de se conectar ao core do cliente"
 
@@ -3299,10 +3179,7 @@ msgid ""
 "The project is temporarily unavailable.\n"
 "\n"
 "Please try again later."
-msgstr ""
-"O projecto está temporariamente indisponível.\n"
-"\n"
-"Por favor tente mais tarde."
+msgstr "O projecto está temporariamente indisponível.\n\nPor favor tente mais tarde."
 
 #: clientgui/UnavailablePage.cpp:190
 msgid "Account manager temporarily unavailable"
@@ -3313,10 +3190,7 @@ msgid ""
 "The account manager is temporarily unavailable.\n"
 "\n"
 "Please try again later."
-msgstr ""
-"O gestor de conta está temporariamente indisponível.\n"
-"\n"
-"Por favor tente mais tarde."
+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."
@@ -3326,8 +3200,7 @@ msgstr "Por favor especifique uma chave de conta para continuar."
 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
+#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
 msgid "Validation conflict"
 msgstr "Conflito de validação"
 
@@ -3348,34 +3221,23 @@ msgid ""
 "Please specify a URL.\n"
 "For example:\n"
 "http://www.example.com/"
-msgstr ""
-"Por favor especifique um URL.\n"
-"Por exemplo:\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
+#: 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: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.\n"
-"Por exemplo:\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
+#: 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."
@@ -3386,7 +3248,6 @@ msgid "'%s' does not contain a valid path."
 msgstr "'%s' não contém um caminho válido."
 
 #: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:175
 msgid "Commands"
 msgstr "Comandos"
 
@@ -3398,13 +3259,11 @@ msgstr "Copiar todas as mensagens"
 msgid "Copy selected messages"
 msgstr "Copiar as mensagens seleccionadas"
 
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
+#: 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
+#: 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."
 
@@ -3432,119 +3291,120 @@ msgstr "Mostrar todas as mensagens"
 msgid "Show messages for all projects."
 msgstr "Mostrar mensagens para todos os projectos."
 
-#: clientgui/ViewProjects.cpp:225
+#: clientgui/ViewProjects.cpp:246 clientgui/ViewStatistics.cpp:426
 msgid "Account"
 msgstr "Conta"
 
-#: clientgui/ViewProjects.cpp:227
+#: clientgui/ViewProjects.cpp:248
 msgid "Work done"
 msgstr "Trabalho concluído"
 
-#: clientgui/ViewProjects.cpp:228
+#: clientgui/ViewProjects.cpp:249
 msgid "Avg. work done"
 msgstr "Média de trabalho realizado"
 
-#: clientgui/ViewProjects.cpp:230
+#: clientgui/ViewProjects.cpp:251 clientgui/ViewTransfers.cpp:215
+#: clientgui/ViewWork.cpp:262
 msgid "Status"
 msgstr "Estado"
 
-#: clientgui/ViewProjects.cpp:255
+#: clientgui/ViewProjects.cpp:330
 msgid "Projects"
 msgstr "Projectos"
 
-#: clientgui/ViewProjects.cpp:307
+#: clientgui/ViewProjects.cpp:382
 msgid "Updating project..."
 msgstr "A actualizar projecto..."
 
-#: clientgui/ViewProjects.cpp:349
+#: clientgui/ViewProjects.cpp:424
 msgid "Resuming project..."
 msgstr "A resumir projecto..."
 
-#: clientgui/ViewProjects.cpp:353
+#: clientgui/ViewProjects.cpp:428
 msgid "Suspending project..."
 msgstr "A suspender projecto..."
 
-#: clientgui/ViewProjects.cpp:390
+#: clientgui/ViewProjects.cpp:465
 msgid "Telling project to allow additional task downloads..."
 msgstr "A notificar o projecto para permitir a transferência de tarefas adicionais..."
 
-#: clientgui/ViewProjects.cpp:394
+#: clientgui/ViewProjects.cpp:469
 msgid "Telling project to not fetch any additional tasks..."
 msgstr "A notificar o projecto para não obter tarefas adicionais..."
 
-#: clientgui/ViewProjects.cpp:430
+#: clientgui/ViewProjects.cpp:505
 msgid "Resetting project..."
 msgstr "A fazer reset ao projecto..."
 
-#: clientgui/ViewProjects.cpp:488
+#: clientgui/ViewProjects.cpp:563
 msgid "Removing project..."
 msgstr "A remover projecto..."
 
-#: clientgui/ViewProjects.cpp:548
+#: clientgui/ViewProjects.cpp:623 clientgui/ViewWork.cpp:686
 msgid "Launching browser..."
 msgstr "A lançar o navegador..."
 
-#: clientgui/ViewProjects.cpp:1063
+#: clientgui/ViewProjects.cpp:1140
 msgid "Requested by user"
 msgstr "Solicitado pelo utilizador"
 
-#: clientgui/ViewProjects.cpp:1064
+#: clientgui/ViewProjects.cpp:1141
 msgid "To fetch work"
 msgstr "Para obter trabalho"
 
-#: clientgui/ViewProjects.cpp:1065
+#: clientgui/ViewProjects.cpp:1142
 msgid "To report completed tasks"
-msgstr "Para reportar tarefas completas"
+msgstr "Para reportar tarefas concluídas"
 
-#: clientgui/ViewProjects.cpp:1066
+#: clientgui/ViewProjects.cpp:1143
 msgid "To send trickle-up message"
 msgstr "Para enviar mensagem de aviso"
 
-#: clientgui/ViewProjects.cpp:1067
+#: clientgui/ViewProjects.cpp:1144
 msgid "Requested by account manager"
 msgstr "Solicitado pelo gestor de conta"
 
-#: clientgui/ViewProjects.cpp:1068
+#: clientgui/ViewProjects.cpp:1145
 msgid "Project initialization"
 msgstr "Inicialização do projecto"
 
-#: clientgui/ViewProjects.cpp:1069
+#: clientgui/ViewProjects.cpp:1146
 msgid "Requested by project"
 msgstr "Solicitado pelo projecto"
 
-#: clientgui/ViewProjects.cpp:1070
+#: clientgui/ViewProjects.cpp:1147
 msgid "Unknown reason"
 msgstr "Razão desconhecida"
 
-#: clientgui/ViewProjects.cpp:1084
+#: clientgui/ViewProjects.cpp:1161
 msgid "Suspended by user"
 msgstr "Suspenso pelo utilizador"
 
-#: clientgui/ViewProjects.cpp:1087
+#: clientgui/ViewProjects.cpp:1164
 msgid "Won't get new tasks"
 msgstr "Não obterá novas tarefas"
 
-#: clientgui/ViewProjects.cpp:1090
+#: clientgui/ViewProjects.cpp:1167
 msgid "Project ended - OK to remove"
 msgstr "Projecto terminado - OK para remover"
 
-#: clientgui/ViewProjects.cpp:1093
+#: clientgui/ViewProjects.cpp:1170
 msgid "Will remove when tasks done"
 msgstr "Irá remover quando as tarefas concluirem"
 
-#: clientgui/ViewProjects.cpp:1096
+#: clientgui/ViewProjects.cpp:1173
 msgid "Scheduler request pending"
 msgstr "Solicitação de agendamento pendente"
 
-#: clientgui/ViewProjects.cpp:1102
+#: clientgui/ViewProjects.cpp:1179
 msgid "Scheduler request in progress"
 msgstr "Solicitação de agendamento em progresso"
 
-#: clientgui/ViewProjects.cpp:1105
+#: clientgui/ViewProjects.cpp:1182
 msgid "Trickle up message pending"
 msgstr "Mensagem de aviso pendente"
 
-#: clientgui/ViewProjects.cpp:1111
+#: clientgui/ViewProjects.cpp:1188
 msgid "Communication deferred "
 msgstr "Comunicação deferida"
 
@@ -3556,31 +3416,27 @@ msgstr "Utilização total em disco"
 msgid "Disk usage by BOINC projects"
 msgstr "Utilização em disco pelos projectos BOINC"
 
-#: clientgui/ViewResources.cpp:116
-msgid "Disk"
-msgstr "Disco"
-
 #: clientgui/ViewResources.cpp:225
 msgid "no projects: 0 bytes used"
 msgstr "sem projectos: 0 bytes usados"
 
-#: clientgui/ViewResources.cpp:262
+#: clientgui/ViewResources.cpp:259
 msgid "used by BOINC: "
 msgstr "utilizado pelo BOINC:"
 
-#: clientgui/ViewResources.cpp:272
+#: clientgui/ViewResources.cpp:269
 msgid "free, available to BOINC: "
 msgstr "livre, disponível para o BOINC: "
 
-#: clientgui/ViewResources.cpp:282
+#: clientgui/ViewResources.cpp:279
 msgid "free, not available to BOINC: "
 msgstr "livre, não disponível para o BOINC: "
 
-#: clientgui/ViewResources.cpp:292
+#: clientgui/ViewResources.cpp:289
 msgid "free: "
 msgstr "livre: "
 
-#: clientgui/ViewResources.cpp:302
+#: clientgui/ViewResources.cpp:299
 msgid "used by other programs: "
 msgstr "utilizado por outros programas: "
 
@@ -3653,13 +3509,11 @@ msgstr "&Próximo projecto >"
 msgid "Show chart for next project"
 msgstr "Mostrar gráfico do próximo projecto"
 
-#: clientgui/ViewStatistics.cpp:2000
-#: clientgui/ViewStatistics.cpp:2390
+#: clientgui/ViewStatistics.cpp:2000 clientgui/ViewStatistics.cpp:2390
 msgid "Hide project list"
 msgstr "Ocultar lista de projectos"
 
-#: clientgui/ViewStatistics.cpp:2001
-#: clientgui/ViewStatistics.cpp:2390
+#: clientgui/ViewStatistics.cpp:2001 clientgui/ViewStatistics.cpp:2390
 msgid "Use entire area for graphs"
 msgstr "Utilizar área completa para os gráficos"
 
@@ -3703,16 +3557,11 @@ msgstr "Mostrar um gráfico com a soma de todos os projectos"
 msgid "Statistics"
 msgstr "Estatísticas"
 
-#: clientgui/ViewStatistics.cpp:2077
-#: clientgui/ViewStatistics.cpp:2098
-#: clientgui/ViewStatistics.cpp:2119
-#: clientgui/ViewStatistics.cpp:2141
-#: clientgui/ViewStatistics.cpp:2162
-#: clientgui/ViewStatistics.cpp:2183
-#: clientgui/ViewStatistics.cpp:2204
-#: clientgui/ViewStatistics.cpp:2225
-#: clientgui/ViewStatistics.cpp:2246
-#: clientgui/ViewStatistics.cpp:2270
+#: clientgui/ViewStatistics.cpp:2077 clientgui/ViewStatistics.cpp:2098
+#: clientgui/ViewStatistics.cpp:2119 clientgui/ViewStatistics.cpp:2141
+#: clientgui/ViewStatistics.cpp:2162 clientgui/ViewStatistics.cpp:2183
+#: clientgui/ViewStatistics.cpp:2204 clientgui/ViewStatistics.cpp:2225
+#: clientgui/ViewStatistics.cpp:2246 clientgui/ViewStatistics.cpp:2270
 msgid "Updating charts..."
 msgstr "A actualizar gráficos..."
 
@@ -3724,199 +3573,185 @@ msgstr "Mostrar lista de projectos"
 msgid "Uses smaller area for graphs"
 msgstr "Usar área mais pequena para os gráficos"
 
-#: clientgui/ViewTransfers.cpp:169
+#: clientgui/ViewTransfers.cpp:187
 msgid "Retry Now"
 msgstr "Tente novamentente"
 
-#: clientgui/ViewTransfers.cpp:170
+#: clientgui/ViewTransfers.cpp:188
 msgid "Retry the file transfer now"
 msgstr "Tentar novamente a transferência do ficheiro agora"
 
-#: clientgui/ViewTransfers.cpp:176
+#: clientgui/ViewTransfers.cpp:194
 msgid "Abort Transfer"
 msgstr "Cancelar Transferência"
 
-#: clientgui/ViewTransfers.cpp:177
+#: clientgui/ViewTransfers.cpp:195
 msgid "Abort this file transfer.  You won't get credit for the task."
 msgstr "Cancelar a transferência deste ficheiro.  Não obterá créditos para a tarefa."
 
-#: clientgui/ViewTransfers.cpp:188
+#: clientgui/ViewTransfers.cpp:210
 msgid "File"
 msgstr "Ficheiro"
 
-#: clientgui/ViewTransfers.cpp:189
-#: clientgui/ViewWork.cpp:238
+#: clientgui/ViewTransfers.cpp:211 clientgui/ViewWork.cpp:261
 msgid "Progress"
 msgstr "Progresso"
 
-#: clientgui/ViewTransfers.cpp:190
+#: clientgui/ViewTransfers.cpp:212
 msgid "Size"
 msgstr "Tamanho"
 
-#: clientgui/ViewTransfers.cpp:191
-msgid "Elapsed Time"
-msgstr "Tempo Decorrido"
+#: clientgui/ViewTransfers.cpp:213 clientgui/ViewWork.cpp:263
+msgid "Elapsed"
+msgstr "Decorrido"
 
-#: clientgui/ViewTransfers.cpp:192
+#: clientgui/ViewTransfers.cpp:214
 msgid "Speed"
 msgstr "Velocidade"
 
-#: clientgui/ViewTransfers.cpp:218
+#: clientgui/ViewTransfers.cpp:295
 msgid "Transfers"
 msgstr "Transferências"
 
-#: clientgui/ViewTransfers.cpp:285
+#: clientgui/ViewTransfers.cpp:362
 msgid "Network activity is suspended - "
 msgstr "Actividade de rede está suspensa - "
 
-#: clientgui/ViewTransfers.cpp:287
+#: clientgui/ViewTransfers.cpp:364
 msgid ""
 ".\n"
 "You can enable it using the Activity menu."
-msgstr ""
-".\n"
-"Pode activá-la utilizando o menu Actividade."
+msgstr ".\nPode activá-la utilizando o menu Actividade."
 
-#: clientgui/ViewTransfers.cpp:290
+#: clientgui/ViewTransfers.cpp:367
 msgid "BOINC"
 msgstr "BOINC"
 
-#: clientgui/ViewTransfers.cpp:297
+#: clientgui/ViewTransfers.cpp:374
 msgid "Retrying transfer now..."
 msgstr "A tentar transferir novamente..."
 
-#: clientgui/ViewTransfers.cpp:335
+#: clientgui/ViewTransfers.cpp:412
 msgid "Aborting transfer..."
 msgstr "A cancelar a transferência..."
 
-#: clientgui/ViewTransfers.cpp:348
+#: 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'?\n"
-"NOTA: Cancelar uma transferência invalidará a tarefa e\n"
-"não receberá crédito pela mesma."
+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:354
+#: clientgui/ViewTransfers.cpp:431
 msgid "Abort File Transfer"
 msgstr "Cancelar Transferência do Ficheiro"
 
-#: clientgui/ViewTransfers.cpp:785
+#: clientgui/ViewTransfers.cpp:864
 msgid "Upload"
 msgstr "Upload"
 
-#: clientgui/ViewTransfers.cpp:785
+#: clientgui/ViewTransfers.cpp:864
 msgid "Download"
 msgstr "Transferir"
 
-#: clientgui/ViewTransfers.cpp:789
+#: clientgui/ViewTransfers.cpp:868
 msgid "retry in "
 msgstr "tentar novamente em "
 
-#: clientgui/ViewTransfers.cpp:791
+#: clientgui/ViewTransfers.cpp:870
 msgid "failed"
 msgstr "falhou"
 
-#: clientgui/ViewTransfers.cpp:794
+#: clientgui/ViewTransfers.cpp:873
 msgid "suspended"
 msgstr "suspenso"
 
-#: clientgui/ViewTransfers.cpp:799
+#: clientgui/ViewTransfers.cpp:878
 msgid "active"
 msgstr "activo"
 
-#: clientgui/ViewTransfers.cpp:801
+#: clientgui/ViewTransfers.cpp:880
 msgid "pending"
 msgstr "pendente"
 
-#: clientgui/ViewTransfers.cpp:808
+#: clientgui/ViewTransfers.cpp:887
 msgid " (project backoff: "
 msgstr " (projecto backoff: "
 
-#: clientgui/ViewWork.cpp:192
-#: clientgui/ViewWork.cpp:782
+#: clientgui/ViewWork.cpp:211 clientgui/ViewWork.cpp:864
 msgid "Show active tasks"
 msgstr "Mostrar tarefas activas"
 
-#: clientgui/ViewWork.cpp:193
-#: clientgui/ViewWork.cpp:783
+#: clientgui/ViewWork.cpp:212 clientgui/ViewWork.cpp:865
 msgid "Show only active tasks."
 msgstr "Mostrar apenas as tarefas activas."
 
-#: clientgui/ViewWork.cpp:206
+#: clientgui/ViewWork.cpp:225
 msgid "Show VM Console"
 msgstr "Mostrar Consola VM"
 
-#: clientgui/ViewWork.cpp:207
+#: clientgui/ViewWork.cpp:226
 msgid "Show VM Console in a window."
 msgstr "Mostrar Consola VM numa janela."
 
-#: clientgui/ViewWork.cpp:214
+#: clientgui/ViewWork.cpp:233
 msgid "Suspend work for this result."
 msgstr "Suspender trabalho para este resultado."
 
-#: clientgui/ViewWork.cpp:221
+#: 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:240
-msgid "Elapsed"
-msgstr "Decorrido"
-
-#: clientgui/ViewWork.cpp:241
+#: clientgui/ViewWork.cpp:264
 msgid "Remaining (estimated)"
 msgstr "Restante (estimado)"
 
-#: clientgui/ViewWork.cpp:242
+#: clientgui/ViewWork.cpp:265
 msgid "Deadline"
 msgstr "Data Limite"
 
-#: clientgui/ViewWork.cpp:269
+#: clientgui/ViewWork.cpp:351
 msgid "Tasks"
 msgstr "Tarefas"
 
-#: clientgui/ViewWork.cpp:362
+#: clientgui/ViewWork.cpp:444
 msgid "Resuming task..."
 msgstr "A resumir tarefa..."
 
-#: clientgui/ViewWork.cpp:365
+#: clientgui/ViewWork.cpp:447
 msgid "Suspending task..."
 msgstr "A suspender tarefa..."
 
-#: clientgui/ViewWork.cpp:394
+#: clientgui/ViewWork.cpp:476
 msgid "Showing graphics for task..."
 msgstr "A mostrar gráficos para a tarefa..."
 
-#: clientgui/ViewWork.cpp:431
+#: clientgui/ViewWork.cpp:513
 msgid "Showing VM console for task..."
 msgstr "A mostrar Consola VM para a tarefa..."
 
-#: clientgui/ViewWork.cpp:484
+#: 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)"
+msgstr "Tem a certeza que quer cancelar esta tarefa '%s'?\n(Progresso: %s, Estado: %s)"
 
-#: clientgui/ViewWork.cpp:490
+#: 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:504
+#: clientgui/ViewWork.cpp:586
 msgid "Aborting task..."
 msgstr "A cancelar a tarefa..."
 
-#: clientgui/ViewWork.cpp:776
+#: clientgui/ViewWork.cpp:858
 msgid "Show all tasks"
 msgstr "Mostrar todas as tarefas"
 
-#: clientgui/ViewWork.cpp:777
+#: clientgui/ViewWork.cpp:859
 msgid "Show all tasks."
 msgstr "Mostrar todas as tarefas."
 
@@ -3936,12 +3771,7 @@ msgid ""
 "\n"
 "Projects added via this wizard will not be\n"
 "listed on or managed via %s."
-msgstr ""
-"Se possível, adicione projectos no\n"
-"website do %s.\n"
-"\n"
-"Projectos adicionados através do assistente não serão\n"
-"listados ou geridos pelo %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/WelcomePage.cpp:313
 msgid ""
@@ -3950,12 +3780,7 @@ msgid ""
 "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\n"
-"a realizar pesquisas em várias áreas da ciência,\n"
-"e você pode-se voluntariar para tantos quanto quiser.\n"
-"Pode adicionar um projecto directamente,\n"
-"ou usar o website de um 'Gestor de Conta' para seleccionar projectos."
+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/WelcomePage.cpp:325
 msgid ""
@@ -3970,17 +3795,7 @@ msgid ""
 "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\n"
-"para os quais contribui.\n"
-"\n"
-"Alguns destes projectos são executados e geridos pela World Community Grid, enquanto outros\n"
-"são executados e geridos por outras equipas de pesquisa ou organizações. O software BOINC\n"
-"pode dividir o seu poder de processamento livre, entre quaisquer combinações de projectos.\n"
-"\n"
-"Alternativamente, se fez o registo com um Gestor de Conta BOINC, pode utilizar\n"
-"isto para escolher a que projectos quer dar suporte.\n"
-"Por favor, escolha que tipo de alterações quer fazer:\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/WelcomePage.cpp:339
 msgid "Use a BOINC Account Manager"
@@ -3994,16 +3809,15 @@ msgstr "Adicionar ou alterar os seus projectos na World Community Grid"
 msgid "Add projects run by other researchers or organizations"
 msgstr "Adicionar projectos executados por outros investigadores ou organizações"
 
-#: clientgui/WizardAttach.cpp:673
+#: clientgui/WizardAttach.cpp:560
 msgid "Do you really want to cancel?"
 msgstr "Quer mesmo cancelar?"
 
-#: clientgui/WizardAttach.cpp:674
+#: clientgui/WizardAttach.cpp:561
 msgid "Question"
 msgstr "Questão"
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
+#: clientgui/wizardex.cpp:377 clientgui/wizardex.cpp:553
 msgid "&Next >"
 msgstr "&Próximo >"
 
@@ -4041,11 +3855,10 @@ msgstr "Mostrar Todos"
 msgid "Quit %s"
 msgstr "Sair %s"
 
-#: clientgui/DlgAdvPreferences.h:30
-msgid "specify work start and stop hours in format HH:MM-HH:MM"
-msgstr "especifique as horas de começo e fim do trabalho no formato HH:MM-HH:MM"
-
-#: clientgui/DlgAdvPreferences.h:31
-msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
-msgstr "especifique o horário inicial e final para a utilização da rede no formato HH:MM-HH:MM"
+#: 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."
 
+#: clientgui/DlgAdvPreferencesBase.h:46
+msgid "On this day of the week, transfer files only during these hours."
+msgstr "Neste dia da semana, transferir ficheiros apenas durante estas horas."
diff --git a/locale/pt_PT/BOINC-Project-Generic.po b/locale/pt_PT/BOINC-Project-Generic.po
old mode 100755
new mode 100644
index b1a5499..59d2c16
--- a/locale/pt_PT/BOINC-Project-Generic.po
+++ b/locale/pt_PT/BOINC-Project-Generic.po
@@ -1,22 +1,25 @@
+# BOINC web translation
 # Copyright (C) 2008 University of California
+# 
 # This file is distributed under the same license as BOINC.
+# 
 # FileID  : $Id$
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.03\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: 2014-01-30 11:35+0000\n"
-"Last-Translator: Miguel Filipe Paulino de Sousa <Miguel.veig at gmail.com>\n"
-"Language-Team: Portuguese <LL at li.org>\n"
-"Language: pt_PT\n"
+"PO-Revision-Date: 2015-02-09 00:18+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\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"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.5.0\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1391081718.0\n"
 
 msgid "LANG_NAME_NATIVE"
 msgstr "Português"
@@ -59,9 +62,7 @@ msgstr "Inserir imagem: [img]http://image_url[/img]  (alt+p)"
 #: ../inc/bbcode_html.inc:35
 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)"
+msgstr "Inserir URL: [url]http://url[/url] ou [url=http://url]URL texto[/url]  (alt+w)"
 
 #: ../inc/bbcode_html.inc:42
 msgid "Font color"
@@ -70,8 +71,7 @@ msgstr "Cor da fonte"
 #: ../inc/bbcode_html.inc:43
 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"
+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
 msgid "Default"
@@ -292,11 +292,9 @@ msgstr "Modificadas em último: %1"
 
 #: ../inc/forum.inc:640
 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"
+"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
 msgid "Report this post as offensive"
@@ -374,22 +372,7 @@ msgid ""
 "        <li> No abusive comments involving race, religion,\n"
 "            nationality, gender, class or sexuality.\n"
 "        "
-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 sejam deliberadamente hostis ou resultem em "
-"insultos.\n"
-"         <li> Comentários abusivos envolvendo raça, religião,\n"
-"              nacionalidade, sexo, classe ou sexualidade.\n"
+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
 msgid "Rules:"
@@ -447,27 +430,20 @@ msgstr "Apenas membros da equipa podem postar no fórum da equipa"
 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."
+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
 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."
+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
 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."
+msgstr "Este tópico está bloqueado. Apenas moderadores do fórum e administradores podem postar aqui."
 
 #: ../inc/forum.inc:1145
 msgid "Can't post to a hidden thread."
@@ -729,9 +705,7 @@ msgstr "% de tempo que o 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"
+msgstr "Enquanto o BOINC está em execução, % de tempo que o computador anfitrião tem conexão à Internet"
 
 #: ../inc/host.inc:191
 #, php-format
@@ -930,8 +904,7 @@ msgstr "Para"
 
 #: ../inc/pm.inc:82
 msgid "User IDs or unique usernames, separated with commas"
-msgstr ""
-"IDs dos utilizadores ou nomes de utilizador únicos, separados com virgulas"
+msgstr "IDs dos utilizadores ou nomes de utilizador únicos, separados com virgulas"
 
 #: ../inc/pm.inc:85 ../user/pm.php:90 ../user/pm.php:139
 msgid "Subject"
@@ -957,9 +930,7 @@ msgstr "Não foi possível criar mensagem"
 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."
+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
 msgid "unread"
@@ -977,9 +948,7 @@ msgstr "Mensagem privada"
 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"
+msgstr "Suspender trabalho quando o computador está ligado apenas à bateria? %1 Só relevante para portáteis %2"
 
 #: ../inc/prefs.inc:85
 msgid "Suspend work while computer is in use?"
@@ -988,9 +957,7 @@ msgstr "Suspender trabalho quando o computador estiver em utilização?"
 #: ../inc/prefs.inc:91
 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"
+msgstr "Suspender trabalho da GPU quando o computador estiver em utilização? %1 Forçado pela versão 6.6.21+ %2"
 
 #: ../inc/prefs.inc:99
 msgid "'In use' means mouse/keyboard activity in last"
@@ -1004,30 +971,23 @@ msgstr "minutos"
 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"
+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: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"
+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: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"
+msgstr "Executar trabalho apenas entre as horas de %1 Sem restrições se igual a %2"
 
 #: ../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"
+msgstr "Deixar tarefas em memória enquanto suspensas? %1 Suspender tarefas irá consumir espaço swap se 'sim' %2"
 
 #: ../inc/prefs.inc:139
 msgid "Switch between tasks every %1 Recommended: 60 minutes %2"
@@ -1069,9 +1029,7 @@ msgstr "GB"
 
 #: ../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"
+msgstr "Disco: deixar livre pelo menos %1 Valores mais pequenos que %2  são ignorados %3"
 
 #: ../inc/prefs.inc:191 ../inc/prefs.inc:201 ../inc/prefs.inc:206
 #: ../inc/prefs.inc:211
@@ -1101,8 +1059,7 @@ msgstr "Memória: quando o computador não está em utilização, usar no máxim
 
 #: ../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"
+msgstr "Manter tarefas suficiente para manter ocupado pelo menos%1(máx10 dias).%2"
 
 #: ../inc/prefs.inc:223 ../inc/prefs.inc:228 ../inc/prefs.inc:270
 #: ../inc/util.inc:274
@@ -1117,17 +1074,13 @@ msgstr "... e um adicional"
 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"
+msgstr "Confirmar antes de se conectar à Internet? %1 Só relevante se tiver um modem, ISDN ou uma conexão VPN %2"
 
 #: ../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"
+msgstr "Desligar quando completo? %1 Só relevante se tiver um modem, ISDN ou uma conecção VPN %2"
 
 #: ../inc/prefs.inc:249
 msgid "Maximum download rate:"
@@ -1156,24 +1109,17 @@ msgstr "Mbytes a cada"
 #: ../inc/prefs.inc:274
 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"
+"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"
 
 #: ../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 "
+"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"
+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:298
 msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
@@ -1199,16 +1145,13 @@ msgstr "Usar GPU Intel %1 Forçado pela versão 7.2+ %s"
 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"
+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: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."
+"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:374
 msgid "Is it OK for %1 and your team (if any) to email you?"
@@ -1233,16 +1176,13 @@ msgstr "Utilização de rede"
 #: ../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."
+msgstr "Estas preferências aplicam-se a todos os projectos BOINC em que participa."
 
 #: ../inc/prefs.inc:395
 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."
+"%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:445
 msgid "bad venue: %1"
@@ -1321,9 +1261,7 @@ msgstr "Estas aplicam-se a todos os projectos BOINC em que participa."
 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."
+msgstr "Em computadores que participem em múltiplos projectos, as preferências utilizadas serão as mais recentes."
 
 #: ../inc/prefs.inc:889
 msgid "These preferences do not apply to Android devices."
@@ -1353,17 +1291,13 @@ msgstr "e"
 msgid ""
 "Your profile will be made visible to other people as soon as it has been "
 "approved by the project. This may take up to a few days."
-msgstr ""
-"O seu perfil ficará visível a outras pessoas assim que for aprovado pelo "
-"projecto. Isto poderá levar alguns dias."
+msgstr "O seu perfil ficará visível a outras pessoas assim que for aprovado pelo projecto. Isto poderá levar alguns dias."
 
 #: ../inc/profile.inc:92
 msgid ""
 "Your profile has been marked as unacceptable. It is not visible to other "
 "people. Please change it."
-msgstr ""
-"O seu perfil foi definido como inaceitável. Não está visivel a outras "
-"pessoas. Por favor altere-o."
+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
 msgid "Database error"
@@ -1373,10 +1307,7 @@ msgstr "Erro da base de dados"
 msgid ""
 "To prevent spam, profiles of users with an average credit of less than %1 "
 "are displayed only to logged-in users. We apologize for this inconvenience."
-msgstr ""
-"Para prevenir spam, perfis de utilizadores com uma média de créditos "
-"inferior a %1 são visiveis apenas a utilizadores logados. Pedimos desculpa "
-"pela inconveniência."
+msgstr "Para prevenir spam, perfis de utilizadores com uma média de créditos inferior a %1 são visiveis apenas a utilizadores logados. Pedimos desculpa pela inconveniência."
 
 #: ../inc/profile.inc:197
 msgid "User is banished"
@@ -1854,9 +1785,7 @@ msgstr "Juntar-se a esta equipa"
 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."
+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
 msgid "Not accepting new members"
@@ -1936,20 +1865,15 @@ msgstr "Esta operação requer privilégios de administrador da equipa"
 
 #: ../inc/team.inc:422
 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."
+"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
 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."
+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
 msgid "Team name, text version"
@@ -2107,7 +2031,6 @@ msgstr "ID do utilizador"
 msgid "Used in community functions"
 msgstr "Utilizado nas funções da comunidade"
 
-# 91%
 #: ../inc/user.inc:216 ../user/weak_auth.php:25
 msgid "Account keys"
 msgstr "Chaves da conta"
@@ -2262,9 +2185,7 @@ msgstr "Página de estado do servidor"
 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."
+msgstr "Ocorreu um erro na base de dados aquando do seu pedido; por favor tente mais tarde."
 
 #: ../inc/util.inc:257
 msgid "Unable to handle request"
@@ -2283,10 +2204,9 @@ msgid "sec"
 msgstr "seg"
 
 #: ../inc/util.inc:444
-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."
+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"
@@ -2302,9 +2222,7 @@ msgstr "Projecto em baixo para manutenção"
 
 #: ../inc/util.inc:799
 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."
+msgstr "%1 está temporariamente em baixo para manutenção. Por favor, tente mais tarde."
 
 #: ../inc/util.inc:817
 msgid "Unable to connect to database - please try again later"
@@ -2312,8 +2230,7 @@ msgstr "Não foi possivel conectar à base de dados - por favor, tente mais tard
 
 #: ../inc/util.inc:821
 msgid "Unable to select database - please try again later"
-msgstr ""
-"Não foi possivel seleccionar a base de dados - por favor, tente mais tarde"
+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
 msgid "Stay logged in on this computer"
@@ -2325,8 +2242,7 @@ 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."
+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."
@@ -2363,11 +2279,7 @@ msgid ""
 "work 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 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."
 
 #: ../user/apps.php:50
 msgid "Platform"
@@ -2391,12 +2303,7 @@ msgid ""
 "It's similar to HTML, but simpler. The tags start with a [ (where you would\n"
 "have used %1 in HTML) and end with ] (where you would have used %2 in\n"
 "HTML)."
-msgstr ""
-"As tags BBCode deixam-o formatar o texto no seu perfil e nos posts nos "
-"fóruns.\n"
-"É similar ao HTML, mas mais simples. As tags começam com um [ (onde usava\n"
-"%1 em HTML) e termina com ] (onde usava %2 em\n"
-"HTML)."
+msgstr "As tags BBCode deixam-o formatar o texto no seu perfil e nos posts nos fóruns.\nÉ similar ao HTML, mas mais simples. As tags começam com um [ (onde usava\n%1 em HTML) e termina com ] (onde usava %2 em\nHTML)."
 
 #: ../user/bbcode.php:31
 msgid "Examples"
@@ -2486,9 +2393,7 @@ msgstr "use para linkar ao SVN de alterações no website do BOINC"
 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,\n"
-"a própria tag não formatada aparecerá em vez do texto formatado."
+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"
@@ -2570,15 +2475,11 @@ msgstr "Não é possivel criar conta"
 
 #: ../user/create_account_action.php:29
 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."
+msgstr "Carregue no botão <b>Voltar atrás</b> do seu navegador para tentar outra vez."
 
 #: ../user/create_account_action.php:47
 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."
+msgstr "A resposta reCAPTCHA nA resposta reCAPTCHA não está correcta. Por favor, tente novamente."
 
 #: ../user/create_account_action.php:70
 msgid "You must supply an invitation code to create an account."
@@ -2590,10 +2491,9 @@ msgstr "O código de convite que inseriu não é válido."
 
 #: ../user/create_account_action.php:84
 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"
+"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
 msgid "There's already an account with that email address."
@@ -2609,9 +2509,7 @@ msgstr "Palavras passe podem apenas incluir caracteres ASCII."
 
 #: ../user/create_account_action.php:106 ../user/edit_passwd_action.php:45
 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."
+msgstr "A nova palavra passe é demasiado pequena: o comprimento minimo da palavra passe é de %1 caracteres."
 
 #: ../user/create_account_action.php:127
 msgid "Couldn't create account"
@@ -2621,18 +2519,13 @@ msgstr "Não foi possivel criar conta"
 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."
+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
 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."
+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"
@@ -2680,11 +2573,9 @@ msgstr "%1 A imagem do seu perfil é mostrada à esquerda."
 
 #: ../user/create_profile.php:66
 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)."
+"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
 msgid "To remove it from your profile, check this box:"
@@ -2694,10 +2585,7 @@ msgstr "Para a remover do perfil, seleccione esta caixa:"
 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."
+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
 msgid "Language"
@@ -2727,30 +2615,23 @@ msgstr "O formato da imagem que fez upload não é suportado."
 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."
+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
 msgid "Your ReCaptcha response was not correct.  Please try again."
-msgstr ""
-"As palavras que escreveu não estão correctas. Por favor, tente novamente."
+msgstr "As palavras que escreveu não estão correctas. Por favor, tente novamente."
 
 #: ../user/create_profile.php:222
 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."
+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
 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."
+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
 msgid "Your profile submission was empty."
@@ -2783,11 +2664,9 @@ msgstr "Criar um perfil"
 
 #: ../user/create_profile.php:343
 msgid ""
-"To prevent spam, an average credit of %1 or greater is required to create or "
-"edit a profile.  We apologize for this inconvenience."
-msgstr ""
-"Para prevenir spam, uma média de créditos de %1 ou superior é necessário "
-"para criar ou editar um perfil. Pedimos desculpa pela incoveniência."
+"To prevent spam, an average credit of %1 or greater is required to create or"
+" edit a profile.  We apologize for this inconvenience."
+msgstr "Para prevenir spam, uma média de créditos de %1 ou superior é necessário para criar ou editar um perfil. Pedimos desculpa pela incoveniência."
 
 #: ../user/delete_account.php:57
 msgid "Couldn't delete account"
@@ -2812,20 +2691,13 @@ msgid ""
 "including your profile and message-board posts.\n"
 "No jobs will be issued to any computers attached\n"
 "to this account."
-msgstr ""
-"Eliminar a sua conta irá remover toda a sua\n"
-"informação pessoal dos nossos servidores,\n"
-"incluindo o seu perfil e posts nos fóruns.\n"
-"Nenhum trabalho será imitido para qualquer computador ligado\n"
-"a esta conta."
+msgstr "Eliminar a sua conta irá remover toda a sua\ninformação pessoal dos nossos servidores,\nincluindo o seu perfil e posts nos fóruns.\nNenhum trabalho será imitido para qualquer computador ligado\na esta conta."
 
 #: ../user/delete_account.php:73
 msgid ""
 "This cannot be undone.\n"
 "Once your account has been deleted, you cannot get it back."
-msgstr ""
-"Esta acção não é reversivel.\n"
-"Assim que a sua conta seja eliminada, não pode recuperá-la."
+msgstr "Esta acção não é reversivel.\nAssim que a sua conta seja eliminada, não pode recuperá-la."
 
 #: ../user/delete_account.php:76
 msgid "Are you sure you want to delete your account?"
@@ -2877,18 +2749,13 @@ 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 --\n"
-"terá que começar do início\n"
-"se quiser outro perfil no futuro."
+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
 msgid ""
 "If you're sure, click 'Yes'\n"
 "to remove your profile from our database."
-msgstr ""
-"Se tem a certeza, carregue em 'Sim'\n"
-"para remover o seu perfil da nossa base de dados."
+msgstr "Se tem a certeza, carregue em 'Sim'\npara remover o seu perfil da nossa base de dados."
 
 #: ../user/delete_profile.php:52
 msgid "Delete my profile"
@@ -2912,10 +2779,9 @@ msgstr "O seu donativo para foi bem sucedido."
 
 #: ../user/donated.php:30
 msgid ""
-"Your donation will be added to the progress bar after confirmation by PayPal."
-msgstr ""
-"O seu donativo será adicionado à barra de progresso depois da confirmação "
-"pelo Paypal."
+"Your donation will be added to the progress bar after confirmation by "
+"PayPal."
+msgstr "O seu donativo será adicionado à barra de progresso depois da confirmação pelo Paypal."
 
 #: ../user/donated.php:32
 msgid "You have canceled your donation."
@@ -2933,9 +2799,7 @@ msgstr "%1 donativos"
 msgid ""
 "This project is accepting donations via\n"
 "%1."
-msgstr ""
-"Este projecto está a aceitar donativo através de\n"
-"%1"
+msgstr "Este projecto está a aceitar donativo através de\n%1"
 
 #: ../user/donations.php:42
 msgid ""
@@ -2950,20 +2814,7 @@ msgid ""
 "        to see the donation amount equivalent in different currencies\n"
 "        (please note that the rates are only estimates\n"
 "         and the actual amount may differ)."
-msgstr ""
-"Para fazer um donativo, insira o montante que quer doar usando os campos "
-"abaixo.\n"
-"        O PayPal aceita vários tipos de moeda\n"
-"        (Dólares Canadianos, Euros, Libras, Dólares Americanos,\n"
-"         Yen, Dólares Australianos, Dólares da Nova Zelândia,\n"
-"         Francos Suiçoes. Dólares de Hong Kong, Dólares de Singapura, Coroa "
-"Sueca,\n"
-"         Coroa Dinamarquesa, Zlótis Polacos, Coroa Norueguesa,\n"
-"         Florins Hungaros, Coroa Checa).\n"
-"         Pode usar o conversor de moeda incluido\n"
-"         para ver o valor da doação equivalente em diferentes moedas\n"
-"         (note que as taxas são apenas estimativas\n"
-"         e o valor actual pode variar)."
+msgstr "Para fazer um donativo, insira o montante que quer doar usando os campos abaixo.\n        O PayPal aceita vários tipos de moeda\n        (Dólares Canadianos, Euros, Libras, Dólares Americanos,\n         Yen, Dólares Australianos, Dólares da Nova Zelândia,\n         Francos Suiçoes. Dólares de Hong Kong, Dólares de Singapura, Coroa Sueca,\n         Coroa Dinamarquesa, Zlótis Polacos, Coroa Norueguesa,\n         Florins Hungaros, Coroa Checa).\n         Pode usar o conversor de moe [...]
 
 #: ../user/donations.php:316
 msgid "Amount you would like to donate"
@@ -2981,10 +2832,7 @@ msgstr "Donativo anónimo"
 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 ""
-"Seleccione aqui se não quiser o seu nome e número de conta mostrador na\n"
-"lista de doadores.<br>Se não seleccionado, será gravado como ID de "
-"utilizador %1"
+msgstr "Seleccione aqui se não quiser o seu nome e número de conta mostrador na\nlista de doadores.<br>Se não seleccionado, será gravado como ID de utilizador %1"
 
 #: ../user/donations.php:324
 msgid "To assign the donation with your user ID, please log in."
@@ -3009,21 +2857,14 @@ msgstr "Pode fazer o download de aplicação em várias categorias."
 #: ../user/download_network.php:31
 msgid ""
 "These applications are not endorsed by %1 and you use them at your own risk."
-msgstr ""
-"Estas aplicações não estão aprovadas pelo %1 e está a usá-las por sua conta "
-"e risco."
+msgstr "Estas aplicações não estão aprovadas pelo %1 e está a usá-las por sua conta e risco."
 
 #: ../user/download_network.php:33
 msgid ""
 "We do not provide instructions for installing these applications.\n"
-"However, the author may have provided some help on installing or "
-"uninstalling the application. \n"
+"However, the author may have provided some help on installing or uninstalling the application. \n"
 "If this is not enough you should contact the author."
-msgstr ""
-"Não fornecemos instruções para instalar estas aplicações.\n"
-"No entanto, o autor pode lhe fornecer ajuda a instalar ou desinstalar a "
-"aplicação.\n"
-"Se não for suficiente, deve contactar o autor."
+msgstr "Não fornecemos instruções para instalar estas aplicações.\nNo entanto, o autor pode lhe fornecer ajuda a instalar ou desinstalar a aplicação.\nSe não for suficiente, deve contactar o autor."
 
 #: ../user/download_network.php:36
 msgid "Instructions for installing and running BOINC are %1here%2."
@@ -3065,9 +2906,7 @@ msgstr "Por favor. %1valide este endereço de email%2."
 msgid ""
 "We can't update your email address due to a database problem.  Please try "
 "again later."
-msgstr ""
-"Não foi possivel actualizar o seu endereço de email devido a um problema na "
-" base de dados. Por favor, tente mais tarde."
+msgstr "Não foi possivel actualizar o seu endereço de email devido a um problema na  base de dados. Por favor, tente mais tarde."
 
 #: ../user/edit_email_form.php:27 ../user/edit_email_form.php:51
 msgid "Change email address"
@@ -3097,9 +2936,7 @@ msgstr "Confirmar o reset"
 msgid ""
 "This action will erase any changes you have made in your community "
 "preferences. To cancel, click your browser's Back button."
-msgstr ""
-"Esta acção apagará quaisquer mudanças que tenha feito nas preferências da "
-"comunidade. Para cancelar, carregue no botão voltar atrás do seu navegador."
+msgstr "Esta acção apagará quaisquer mudanças que tenha feito nas preferências da comunidade. Para cancelar, carregue no botão voltar atrás do seu navegador."
 
 #: ../user/edit_forum_preferences_action.php:38
 msgid "Reset preferences"
@@ -3111,9 +2948,7 @@ msgstr "Erro: Tipo de ficheiro incorrecto, apenas PNG e JPEG são suportados."
 
 #: ../user/edit_forum_preferences_action.php:114
 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"
+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
@@ -3124,9 +2959,7 @@ msgstr "Não existe tal utilizador: %1"
 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?"
+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
 msgid "On my Account page (no email)"
@@ -3185,11 +3018,7 @@ 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."
+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"
@@ -3317,9 +3146,7 @@ msgstr "A sua palavra passe foi alterada."
 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."
+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"
@@ -3394,18 +3221,13 @@ msgid ""
 "A tasks's <b>server state</b> indicates whether the task has been sent to a "
 "computer, and if so whether the computer has finished it. Possible values "
 "are:"
-msgstr ""
-"As tarefas do <b> estado do servidor (Server State) </ b> indica se a tarefa "
-"tiver sido enviada para um computador, e caso afirmativo, se o computador "
-"tiver terminado. Os valores possíveis são:"
+msgstr "As tarefas do <b> estado do servidor (Server State) </ b> indica se a tarefa tiver sido enviada para um computador, e caso afirmativo, se o computador tiver terminado. Os valores possíveis são:"
 
 #: ../user/explain_state.php:35
 msgid ""
 "The task is not ready to send (for example, because its input files are "
 "unavailable)"
-msgstr ""
-"A tarefa não está pronta para ser enviada (por exemplo, porque os ficheiros "
-"de entrada estão indisponíveis)"
+msgstr "A tarefa não está pronta para ser enviada (por exemplo, porque os ficheiros de entrada estão indisponíveis)"
 
 #: ../user/explain_state.php:38
 msgid "The task is ready to send, but hasn't been sent yet."
@@ -3423,9 +3245,7 @@ msgstr "A tarefa foi enviada; à espera de serem completas."
 msgid ""
 "The task has been sent to a computer and either it has timed out or the "
 "computer has reported its completion."
-msgstr ""
-"A tarefa foi enviada para o computador e, ou expirou ou o computador "
-"reportou a tarefa como completa."
+msgstr "A tarefa foi enviada para o computador e, ou expirou ou o computador reportou a tarefa como completa."
 
 #: ../user/explain_state.php:49
 msgid "Outcomes"
@@ -3435,17 +3255,13 @@ msgstr "Resultados"
 msgid ""
 "A tasks's <b>outcome</b> is defined if its server state is <b>over</b>. "
 "Possible values are:"
-msgstr ""
-"O <b>resultado</b> da/s tarefa/s é definido se estado do seu servidor é "
-"<b>terminado</b>. Possiveis valores são:"
+msgstr "O <b>resultado</b> da/s tarefa/s é definido se estado do seu servidor é <b>terminado</b>. Possiveis valores são:"
 
 #: ../user/explain_state.php:57
 msgid ""
 "The task was sent to a computer, but the computer has not yet completed the "
 "work and reported the outcome."
-msgstr ""
-"A tarefa foi enviada para o computador, mas o computador ainda não completou "
-"o trabalho e reportou o resultado."
+msgstr "A tarefa foi enviada para o computador, mas o computador ainda não completou o trabalho e reportou o resultado."
 
 #: ../user/explain_state.php:60
 msgid "A computer completed and reported the task successfully."
@@ -3455,9 +3271,7 @@ msgstr "O computador completou e reportou a tarefa com sucesso."
 msgid ""
 "The server wasn't able to send the task to a computer (perhaps because its "
 "resource requirements were too large)"
-msgstr ""
-"O servidor não conseguiu enviar a tarefa para o computador (talvez porque os "
-"recursos exigidos sejam demasiado grandes)"
+msgstr "O servidor não conseguiu enviar a tarefa para o computador (talvez porque os recursos exigidos sejam demasiado grandes)"
 
 #: ../user/explain_state.php:65
 msgid "Client error"
@@ -3471,25 +3285,19 @@ msgstr "A tarefa foi enviada para o computador e ocorreu um erro."
 msgid ""
 "The task was sent to a computer and no reply was received within the time "
 "limit."
-msgstr ""
-"A tarefa foi enviada para o computador e não foi recebida reposta dentro do "
-"tempo limite."
+msgstr "A tarefa foi enviada para o computador e não foi recebida reposta dentro do tempo limite."
 
 #: ../user/explain_state.php:72
 msgid ""
-"The task wasn't sent to a computer because enough other tasks were completed "
-"for this workunit."
-msgstr ""
-"A tarefa não foi enviada para o computador porque já foram completas tarefas "
-"suficientes para esta unidade de trabalho."
+"The task wasn't sent to a computer because enough other tasks were completed"
+" for this workunit."
+msgstr "A tarefa não foi enviada para o computador porque já foram completas tarefas suficientes para esta unidade de trabalho."
 
 #: ../user/explain_state.php:75
 msgid ""
 "The task was reported but could not be validated, typically because the "
 "output files were lost on the server."
-msgstr ""
-"A tarefa foi reportada mas não pode ser validada, provavelmente porque os "
-"ficheiros de saida foram perdidos no servidor."
+msgstr "A tarefa foi reportada mas não pode ser validada, provavelmente porque os ficheiros de saida foram perdidos no servidor."
 
 #: ../user/explain_state.php:80
 msgid "Client states"
@@ -3497,11 +3305,9 @@ msgstr "Estado dos clientes"
 
 #: ../user/explain_state.php:81
 msgid ""
-"A result's <b>client state</b> indicates the stage of processing at which an "
-"error occurred."
-msgstr ""
-"Um resultado <b>estado do cliente</b> indica o estado do processamento "
-"quando ocorreu um erro."
+"A result's <b>client state</b> indicates the stage of processing at which an"
+" error occurred."
+msgstr "Um resultado <b>estado do cliente</b> indica o estado do processamento quando ocorreu um erro."
 
 #: ../user/explain_state.php:86
 msgid "The computer has not yet completed the task."
@@ -3513,9 +3319,7 @@ msgstr "O computador completou a tarefa com sucesso."
 
 #: ../user/explain_state.php:92
 msgid "The computer couldn't download the application or input files."
-msgstr ""
-"O computador não foi capaz de fazer o download da aplicação ou ficheiros de "
-"entrada."
+msgstr "O computador não foi capaz de fazer o download da aplicação ou ficheiros de entrada."
 
 #: ../user/explain_state.php:95
 msgid "An error occurred during computation."
@@ -3533,9 +3337,7 @@ msgstr "Tempo reportado e tempo limite "
 msgid ""
 "A task's <b>Time reported or deadline</b> field depends on whether the task "
 "has been reported yet:"
-msgstr ""
-"O campo <b>Tempo reportado ou tempo limite<b>da/s tarefa/s  depende se a "
-"tarefa já foi reportada:"
+msgstr "O campo <b>Tempo reportado ou tempo limite<b>da/s tarefa/s  depende se a tarefa já foi reportada:"
 
 #: ../user/explain_state.php:110
 msgid "Already reported"
@@ -3579,8 +3381,7 @@ msgstr "Mandar email"
 
 #: ../user/ffmail_action.php:59
 msgid "Use your browser's back button to return to message form"
-msgstr ""
-"Use o botão 'voltar atrás' do seu navegador para regressar ao formulário"
+msgstr "Use o botão 'voltar atrás' do seu navegador para regressar ao formulário"
 
 #: ../user/ffmail_action.php:63
 msgid "Sending emails"
@@ -3600,19 +3401,15 @@ msgstr "Obrigado por dizer aos seus amigos acerca de %1"
 
 #: ../user/ffmail_action.php:94
 msgid ""
-"You forgot to enter your friends' names and/or email addresses; Please %"
-"1return to the form%2 and enter them."
-msgstr ""
-"Esqueceu-se de inserir o nome dos seus amigos e/ou endereços de email; Por "
-"favor%1regresse ao formulário%2 e insira-os."
+"You forgot to enter your friends' names and/or email addresses; Please "
+"%1return to the form%2 and enter them."
+msgstr "Esqueceu-se de inserir o nome dos seus amigos e/ou endereços de email; Por favor%1regresse ao formulário%2 e insira-os."
 
 #: ../user/ffmail_form.php:30
 msgid ""
 "This project hasn't created an email message - please notify its "
 "administrators"
-msgstr ""
-"Este projecto não criou uma mensagem de e-mail - por favor notifique os "
-"administradores"
+msgstr "Este projecto não criou uma mensagem de e-mail - por favor notifique os administradores"
 
 #: ../user/ffmail_form.php:33
 msgid "Tell your friends about %1"
@@ -3620,19 +3417,14 @@ msgstr "Dizer aos seus amigos acerca de %1"
 
 #: ../user/ffmail_form.php:37
 msgid "Help us by telling your friends, family and coworkers about %1"
-msgstr ""
-"Ajude-nos dizendo aos seus amigos, familia e colegas de trabalho acerca de %"
-"1"
+msgstr "Ajude-nos dizendo aos seus amigos, familia e colegas de trabalho acerca de %1"
 
 #: ../user/ffmail_form.php:39
 msgid ""
 "Fill in this form with the names and email addresses of people you think "
 "might be interested in %1. We'll send them an email in your name, and you "
 "can add your own message if you like."
-msgstr ""
-"Preencha este formulário com os nomes e endereços de email de pessoas que "
-"pense que possam estar interessadas em %1. Enviar-lhe-emos um email em seu "
-"nome e, poderá adicionar a sua própria mensagem se o quiser."
+msgstr "Preencha este formulário com os nomes e endereços de email de pessoas que pense que possam estar interessadas em %1. Enviar-lhe-emos um email em seu nome e, poderá adicionar a sua própria mensagem se o quiser."
 
 #: ../user/ffmail_form.php:42
 msgid "Your name:"
@@ -3680,18 +3472,13 @@ 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. "
+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
 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."
+"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
 msgid "Category"
@@ -3743,9 +3530,7 @@ msgstr "Tem que especificar uma acção..."
 msgid ""
 "You can no longer edit this post.<br/>Posts can only be edited at most %1 "
 "minutes after they have been created."
-msgstr ""
-"Não pode mais editar este post.<br>/Os posts podem apenas ser editados até "
-"no máximo %1 minutos após serem criados."
+msgstr "Não pode mais editar este post.<br>/Os posts podem apenas ser editados até no máximo %1 minutos após serem criados."
 
 #: ../user/forum_edit.php:47
 msgid "You are not authorized to edit this post."
@@ -3859,11 +3644,9 @@ msgstr "Perguntas e respostas"
 
 #: ../user/forum_help_desk.php:30
 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."
+"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
 msgid "Topic"
@@ -3885,9 +3668,7 @@ msgstr "%1 Mensagens do fórum"
 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."
+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
 msgid "Subscribed threads"
@@ -4000,9 +3781,7 @@ msgstr "Moderar tópico '%1'"
 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."
+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
 msgid "Current forum"
@@ -4020,17 +3799,13 @@ msgstr "Novo título:"
 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."
+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
 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."
+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
 msgid "Create new thread"
@@ -4050,9 +3825,7 @@ msgstr "Mostrar este item como Notícia no gestor do BOINC"
 
 #: ../user/forum_post.php:127
 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."
+msgstr "Faça-o só para items prováveis de serem de interesse para todos os voluntários."
 
 #: ../user/forum_rate.php:26
 msgid "Rating offline"
@@ -4064,8 +3837,7 @@ msgstr "Esta funcionalidade está desabilitada pelo projecto"
 
 #: ../user/forum_rate.php:58
 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."
+msgstr "Precisa de mais moderação ou totais de créditos para classificar o post."
 
 #: ../user/forum_rate.php:62
 msgid "You have already rated this post."
@@ -4102,9 +3874,7 @@ msgstr "Problema na submissão do voto"
 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."
+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
@@ -4135,7 +3905,6 @@ msgstr "Precisa de mais moderação ou totais de créditos para reportar um post
 msgid "Report Registered"
 msgstr "Report Registado"
 
-# 92%
 #: ../user/forum_report_post.php:66
 msgid "Your report has been recorded. Thanks for your input."
 msgstr "O seu report foi gravado. Obrigado pela sua inserção."
@@ -4144,9 +3913,7 @@ msgstr "O seu report foi gravado. Obrigado pela sua inserção."
 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"
+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
 msgid "Report a forum post"
@@ -4154,14 +3921,10 @@ msgstr "Reportar um post do fórum"
 
 #: ../user/forum_report_post.php:73
 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 "
+"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."
+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
 msgid "Report post"
@@ -4169,14 +3932,9 @@ msgstr "Reportar post"
 
 #: ../user/forum_report_post.php:81
 msgid ""
-"Why do you find the post offensive: %1Please include enough information so "
-"that a person that\n"
+"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\n"
-"ainda não tenha lido o tópico, seja rapidamente capaz de identificar o "
-"problema.%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
 msgid "Report not registered"
@@ -4184,16 +3942,13 @@ msgstr "Report não registado"
 
 #: ../user/forum_report_post.php:91
 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."
+msgstr "O seu report não pode ser gravado. Por favor aguarde um bocado e tente novamente."
 
 #: ../user/forum_report_post.php:92
 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."
+"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
 msgid "%1 RSS feed"
@@ -4209,9 +3964,7 @@ msgstr "Opcões:"
 
 #: ../user/forum_rss.php:47
 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)."
+msgstr "Incluir posts apenas pelo ID de utilizador %1 (padrão: todos os utilizadores)."
 
 #: ../user/forum_rss.php:49
 msgid "Include only posts from the last %1 days (default: 30)."
@@ -4219,8 +3972,7 @@ 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)"
+msgstr "Truncar posts: %1 (Incluir apenas os primeiros 265 caracteres de cada post)"
 
 #: ../user/forum_rss.php:53
 msgid "Threads only: %1 (Include only the first post of every thread)"
@@ -4306,10 +4058,7 @@ msgstr "Mensagens correspondentes à sua pesquisa:"
 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)."
+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
 msgid "You can also %1try the same search on Google.%2"
@@ -4336,8 +4085,7 @@ msgstr "Subscrição falhada"
 #: ../user/forum_subscribe.php:52
 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.."
+msgstr "Não é possivel de momento subscrevê-lo a %1. Por favor, tente mais tarde.."
 
 #: ../user/forum_subscribe.php:61
 msgid "Unsubscription successful"
@@ -4345,11 +4093,9 @@ msgstr "Subscrição retirada com sucesso"
 
 #: ../user/forum_subscribe.php:64
 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."
+"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
 msgid "Unsubscription failed"
@@ -4358,9 +4104,7 @@ msgstr " Retirar subscrição falhada"
 #: ../user/forum_subscribe.php:67
 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.."
+msgstr "Não é possivel de momento retirar a subscrição de %1. Por favor, tente mais tarde.."
 
 #: ../user/forum_subscribe.php:74
 msgid "Unknown subscription action"
@@ -4396,8 +4140,7 @@ msgstr "Deixar de subscrever"
 
 #: ../user/forum_thread.php:172
 msgid "You are subscribed to this thread.  Click here to unsubscribe."
-msgstr ""
-"Já está subscrito neste tópico. Carregue aqui para deixar de subscrever."
+msgstr "Já está subscrito neste tópico. Carregue aqui para deixar de subscrever."
 
 #: ../user/forum_thread.php:178
 msgid "Subscribe"
@@ -4513,11 +4256,9 @@ msgstr "Adicionar amigo"
 
 #: ../user/friend.php:74
 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."
+"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
 msgid "Add an optional message here:"
@@ -4621,26 +4362,21 @@ msgstr "Esqueceu-se das informações da sua conta?"
 
 #: ../user/get_passwd.php:28
 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:"
+"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
 msgid ""
 "Enter the email address below, and click OK. You will be sent email "
 "instructions for resetting your password."
-msgstr ""
-"Insira em baixo o endereço de email e carregue em OK. Será enviado um email "
-"com instruções para redefinir a sua palavra passe."
+msgstr "Insira em baixo o endereço de email e carregue em OK. Será enviado um email com instruções para redefinir a sua palavra passe."
 
 #: ../user/get_passwd.php:46
 msgid ""
 "2) If you forgot your account's email address, or you can't receive email "
 "there:"
-msgstr ""
-"2) Se esqueceu o endereço de email da sua conta, ou não pode receber emails "
-"nessa conta:"
+msgstr "2) Se esqueceu o endereço de email da sua conta, ou não pode receber emails nessa conta:"
 
 #: ../user/get_passwd.php:47
 msgid ""
@@ -4652,21 +4388,19 @@ msgstr "Se executa o BOINC nesta conta, ainda o pode aceder. Saiba como:"
 msgid ""
 "Go to the BOINC data directory on your computer (its location is written to "
 "the Event Log at startup)."
-msgstr ""
-"Ir para o directório de dados do BOINC no seu computador (a sua localização "
-"está escrita no Log de Eventos ao início)."
+msgstr "Ir para o directório de dados do BOINC no seu computador (a sua localização está escrita no Log de Eventos ao início)."
 
 #: ../user/get_passwd.php:51
 msgid "Find your account file for this project; it will be named <b>%1</b>."
-msgstr ""
-"Encontre o seu ficheiro de conta para este projecto; será chamado <b>%1</b>."
+msgstr "Encontre o seu ficheiro de conta para este projecto; será chamado <b>%1</b>."
 
 #: ../user/get_passwd.php:52
 msgid "Open the file in a text editor like Notepad. You'll see something like"
 msgstr "Abra o ficheiro num editor de texto como o Notepad. Verá algo como"
 
 #: ../user/get_passwd.php:62
-msgid "Select and Copy the string between %1 and %2 (%3 in the above example)."
+msgid ""
+"Select and Copy the string between %1 and %2 (%3 in the above example)."
 msgstr "Seleccionar e Copiar a string entre %1 e %2 (%3 no exemplo abaixo)."
 
 #: ../user/get_passwd.php:64
@@ -4677,9 +4411,7 @@ msgstr "Colar a string no campo abaixo e, carregar em OK."
 msgid ""
 "You will now be logged in to your account; update the email and password of "
 "your account."
-msgstr ""
-"Será agora feito o log in na sua conta; actualizar o email e palavra passe "
-"da sua conta."
+msgstr "Será agora feito o log in na sua conta; actualizar o email e palavra passe da sua conta."
 
 #: ../user/get_passwd.php:71
 msgid "Log in with authenticator"
@@ -4693,9 +4425,7 @@ msgstr "Sem tarefas de GPU reportadas"
 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."
+msgstr "As seguintes listas mostram os modelos GPU mais productivos nas diferentes plataformas. Velocidades relativas são mostradas em parêntesis."
 
 #: ../user/home.php:42
 msgid "Welcome to %1"
@@ -4762,10 +4492,7 @@ msgid ""
 "You can not delete our record of this computer because our database still "
 "contains work for it. You must wait a few days until the work for this "
 "computer has been deleted from the project database."
-msgstr ""
-"Não pode eliminar o nosso registo deste computador porque a base de dados "
-"ainda contém trabalho para ele. Tem de esperar uns dias até que o trabalho "
-"para este computador seja eliminado da base de dados do projecto."
+msgstr "Não pode eliminar o nosso registo deste computador porque a base de dados ainda contém trabalho para ele. Tem de esperar uns dias até que o trabalho para este computador seja eliminado da base de dados do projecto."
 
 #: ../user/host_delete.php:40
 msgid "Delete record of computer"
@@ -4789,11 +4516,9 @@ msgstr "Fundir computadores"
 
 #: ../user/host_edit_form.php:38
 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 ""
-"Por vezes o BOINC assigna identidades separadas para o mesmo computador por "
-"engano. Pode corrigir isto fundindo identidades mais antigas com as novas."
+"Sometimes BOINC assigns separate identities to the same computer by mistake."
+" You can correct this by merging old identities with the newest one."
+msgstr "Por vezes o BOINC assigna identidades separadas para o mesmo computador por engano. Pode corrigir isto fundindo identidades mais antigas com as novas."
 
 #: ../user/host_edit_form.php:56
 msgid "No hosts are eligible for merging with this one."
@@ -4806,9 +4531,7 @@ msgstr "Mostrar detalhes"
 #: ../user/host_edit_form.php:66
 msgid ""
 "Check the computers that are the same as %1 (created %2, computer ID %3):"
-msgstr ""
-"Verifique os computadores que são os mesmos que %1 (criado em %2, ID do "
-"computador %3):"
+msgstr "Verifique os computadores que são os mesmos que %1 (criado em %2, ID do computador %3):"
 
 #: ../user/host_edit_form.php:70 ../user/workunit.php:39
 msgid "name"
@@ -4850,9 +4573,7 @@ msgstr "O local deste anfitrião foi definido para %1."
 msgid ""
 "This change will take effect the next time the host communicates with this "
 "project."
-msgstr ""
-"Esta alteração irá ocorrer da próxima vez que o anfitrião comunicar com este "
-"projecto."
+msgstr "Esta alteração irá ocorrer da próxima vez que o anfitrião comunicar com este projecto."
 
 #: ../user/host_venue_action.php:50
 msgid "Return to host page"
@@ -4869,9 +4590,7 @@ msgstr "Computadores ocultos"
 #: ../user/hosts_user.php:56
 msgid ""
 "This user has chosen not to show information about his or her computers."
-msgstr ""
-"Este utilizador escolheu não mostrar informações relativas aos seus "
-"computadores."
+msgstr "Este utilizador escolheu não mostrar informações relativas aos seus computadores."
 
 #: ../user/hosts_user.php:64
 msgid "Your computers"
@@ -4911,11 +4630,9 @@ msgstr "pré-formatado"
 
 #: ../user/html.php:33
 msgid ""
-"image; height cannot exceed 450 pixels. Please do not link to images without "
-"permission of the web site where the image is hosted."
-msgstr ""
-"imagem; altura não pode exceder 450 pixéis. Por favor, não linke imagens sem "
-"a permisão do website onde a imagem está alojada."
+"image; height cannot exceed 450 pixels. Please do not link to images without"
+" permission of the web site where the image is hosted."
+msgstr "imagem; altura não pode exceder 450 pixéis. Por favor, não linke imagens sem a permisão do website onde a imagem está alojada."
 
 #: ../user/html.php:35
 msgid "You can also use ampersand notation for special characters."
@@ -4930,10 +4647,7 @@ msgid ""
 "Run %1 only on computers that you own, or for which you have obtained the "
 "owner's permission. Some companies and schools have policies that prohibit "
 "using their computers for projects such as %1."
-msgstr ""
-"Executar %1 apenas em computadores que possua, ou que tenha obtido a "
-"permissão do dono. Algumas companhias e escolas têm politícas que proibem de "
-"usar os seus computadores para projectos como %1."
+msgstr "Executar %1 apenas em computadores que possua, ou que tenha obtido a permissão do dono. Algumas companhias e escolas têm politícas que proibem de usar os seus computadores para projectos como %1."
 
 #: ../user/info.php:38
 msgid "How %1 will use your computer"
@@ -4944,19 +4658,13 @@ msgid ""
 "When you run %1 on your computer, it will use part of the computer's CPU "
 "power, disk space, and network bandwidth. You can control how much of your "
 "resources are used by %1, and when it uses them."
-msgstr ""
-"Quando executar o %1 no seu computador, ele irá usar parte do poder do CPU "
-"do seu computador, espaço no disco e largura de banda. Pode controlar a "
-"quantidade de recursos que são usadas pelo %1 e quando são usadas."
+msgstr "Quando executar o %1 no seu computador, ele irá usar parte do poder do CPU do seu computador, espaço no disco e largura de banda. Pode controlar a quantidade de recursos que são usadas pelo %1 e quando são usadas."
 
 #: ../user/info.php:40
 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 ""
-"O trabalho realizado pelo seu computador contribui para os objectivos do %1, "
-"como descrito no website. Os programas das aplicações podem variar de tempo "
-"a tempo."
+msgstr "O trabalho realizado pelo seu computador contribui para os objectivos do %1, como descrito no website. Os programas das aplicações podem variar de tempo a tempo."
 
 #: ../user/info.php:42
 msgid "Privacy policy"
@@ -4964,15 +4672,11 @@ msgstr "Politíca de privacidade"
 
 #: ../user/info.php:43
 msgid ""
-"Your account on %1 is identified by a name that you choose. This name may be "
-"shown on the %1 web site, along with a summary of the work your computer has "
-"done for %1. If you want to be anonymous, choose a name that doesn't reveal "
-"your identity."
-msgstr ""
-"A sua conta no %1 é identificada pelo nome que escolheu. Este nome pode ser "
-"mostrado no %1 website, juntamente com um resumo do trabalho que foi "
-"realizado pelo seu computador para o %1. Se quer permanecer anónimo, escolha "
-"um nome que revele a sua identidade."
+"Your account on %1 is identified by a name that you choose. This name may be"
+" shown on the %1 web site, along with a summary of the work your computer "
+"has done for %1. If you want to be anonymous, choose a name that doesn't "
+"reveal your identity."
+msgstr "A sua conta no %1 é identificada pelo nome que escolheu. Este nome pode ser mostrado no %1 website, juntamente com um resumo do trabalho que foi realizado pelo seu computador para o %1. Se quer permanecer anónimo, escolha um nome que revele a sua identidade."
 
 #: ../user/info.php:44
 msgid ""
@@ -4981,24 +4685,14 @@ 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 ""
-"Se participa em %1, as informações acerca do seu computador (assim como o "
-"tipo de processador, quantidade de memória, etc.) será gravada pelo %1 e "
-"usada para decidir que tipo de trabalho será assignado ao seu computador. "
-"Esta informação será também mostrada no %1's website. Nada que revele a "
-"localização do seu computador (por exemplo o nome do domínio ou o endereço "
-"de rede) será mostrado."
+msgstr "Se participa em %1, as informações acerca do seu computador (assim como o tipo de processador, quantidade de memória, etc.) será gravada pelo %1 e usada para decidir que tipo de trabalho será assignado ao seu computador. Esta informação será também mostrada no %1's website. Nada que revele a localização do seu computador (por exemplo o nome do domínio ou o endereço de rede) será mostrado."
 
 #: ../user/info.php:45
 msgid ""
-"To participate in %1, you must give an address where you receive email. This "
-"address will not be shown on the %1 web site or shared with organizations. %"
-"1 may send you periodic newsletters; however, you can opt out at any time."
-msgstr ""
-"Para participar em %1, tem que inserir um endereço onde receba emails. Este "
-"endereço não será mostrado no %1 website ou organizações partilhadas. %1 "
-"pode enviar newsletters periódicas; no entanto, pode desistir a qualquer "
-"altura."
+"To participate in %1, you must give an address where you receive email. This"
+" address will not be shown on the %1 web site or shared with organizations. "
+"%1 may send you periodic newsletters; however, you can opt out at any time."
+msgstr "Para participar em %1, tem que inserir um endereço onde receba emails. Este endereço não será mostrado no %1 website ou organizações partilhadas. %1 pode enviar newsletters periódicas; no entanto, pode desistir a qualquer altura."
 
 #: ../user/info.php:46
 msgid ""
@@ -5007,24 +4701,15 @@ 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 ""
-"Mensagens privadas enviadas no %1 website estão visíveis apenas ao remetente "
-"e receptor. %1 não examina ou controla o conteúdo das mensagens privadas. "
-"Se receber mensagens privadas indesejáveis de outro %1 utilizador, pode "
-"adicioná-lo ao seu %2filtro de mensagens%3. Isto irá prevenir que veja "
-"mensagens públicas ou privadas desse mesmo utilizador."
+msgstr "Mensagens privadas enviadas no %1 website estão visíveis apenas ao remetente e receptor. %1 não examina ou controla o conteúdo das mensagens privadas. Se receber mensagens privadas indesejáveis de outro %1 utilizador, pode adicioná-lo ao seu %2filtro de mensagens%3. Isto irá prevenir que veja mensagens públicas ou privadas desse mesmo utilizador."
 
 #: ../user/info.php:47
 msgid ""
 "If you use our web site forums you must follow the %2posting guidelines%3.  "
 "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 ""
-"Se usa o nosso fórum na web, tem que seguir as %2instruções para fazer posts"
-"%3. Mensagens postadas ao %1 fórum estão visíveis a todos, incluindo "
-"não-membros. Ao postar nos fóruns, está a garantir licença irrevogável para "
-"que qualquer pessoa possa ver e copiar os seus posts."
+"members.  By posting to the forums, you are granting irrevocable license for"
+" anyone to view and copy your posts."
+msgstr "Se usa o nosso fórum na web, tem que seguir as %2instruções para fazer posts%3. Mensagens postadas ao %1 fórum estão visíveis a todos, incluindo não-membros. Ao postar nos fóruns, está a garantir licença irrevogável para que qualquer pessoa possa ver e copiar os seus posts."
 
 #: ../user/info.php:48
 msgid "Is it safe to run %1?"
@@ -5034,36 +4719,23 @@ msgstr "É seguro executar %1?"
 msgid ""
 "Any time you download a program through the Internet you are taking a "
 "chance: the program might have dangerous errors, or the download server "
-"might have been hacked. %1 has made efforts to minimize these risks. We have "
-"tested our applications carefully. Our servers are behind a firewall and 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 ""
-"De cada vez que faz o download de um programa através da Internet está a "
-"correr um risco: o programa pode conter erros perigosos, ou o servidor de "
-"downloads pode ter sido hackeado. %1 fez um esforço para minimizar estes "
-"riscos. Testamos as nossas aplicações com todos o cuidado. os nossos "
-"servidores estão por trás de uma firewall e configurados para alta "
-"segurança. Para garantir a integridade dos downloads dos programas, todos os "
-"executáveis estão assinados digitalmente num computador seguro não "
-"conectado à Internet."
+"might have been hacked. %1 has made efforts to minimize these risks. We have"
+" tested our applications carefully. Our servers are behind a firewall and "
+"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 "De cada vez que faz o download de um programa através da Internet está a correr um risco: o programa pode conter erros perigosos, ou o servidor de downloads pode ter sido hackeado. %1 fez um esforço para minimizar estes riscos. Testamos as nossas aplicações com todos o cuidado. os nossos servidores estão por trás de uma firewall e configurados para alta segurança. Para garantir a integridade dos downloads dos programas, todos os executáveis estão assinados digitalmente num comput [...]
 
 #: ../user/info.php:50
 msgid ""
 "The applications run by %1 may cause some computers to overheat. If this "
 "happens, stop running %1 or use a %2utility program%3 that limits CPU usage."
-msgstr ""
-"As aplicações executadas pelo %1 podem causar, em alguns computadores, "
-"sobreaquecimento. Se isto acontecer, pare de executar %1 ou use um %"
-"aplicativo%3 que limite o uso do CPU."
+msgstr "As aplicações executadas pelo %1 podem causar, em alguns computadores, sobreaquecimento. Se isto acontecer, pare de executar %1 ou use um %aplicativo%3 que limite o uso do CPU."
 
 #: ../user/info.php:51
 msgid ""
 "%1 was developed by %2. BOINC was developed at the University of California."
-msgstr ""
-"%1 foi desenvolvido pelo %2. O BOINC foi desenvolvido na Universidade da "
-"California."
+msgstr "%1 foi desenvolvido pelo %2. O BOINC foi desenvolvido na Universidade da California."
 
 #: ../user/info.php:53
 msgid "Liability"
@@ -5072,12 +4744,9 @@ msgstr "Responsabilidade"
 #: ../user/info.php:54
 msgid ""
 "%1 and %2 assume no liability for damage to your computer, loss of data, or "
-"any other event or condition that may occur as a result of participating in %"
-"1."
-msgstr ""
-"%1 e %2 não assume responsabilidade por danos no seu computador, perca de "
-"dados ou outros eventos ou condições que possam ocorrer como resultado de "
-"participar em %1."
+"any other event or condition that may occur as a result of participating in "
+"%1."
+msgstr "%1 e %2 não assume responsabilidade por danos no seu computador, perca de dados ou outros eventos ou condições que possam ocorrer como resultado de participar em %1."
 
 #: ../user/info.php:56
 msgid "Other BOINC projects"
@@ -5085,23 +4754,17 @@ msgstr "Outros projectos BOINC"
 
 #: ../user/info.php:57
 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 "
+"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 ""
-"Outros projectos usam a mesma plataforma, o BOINC, como %1. Pode considerar "
-"participar em um ou mais destes projectos. Ao fazê-lo, o seu computador fará "
-"trabalho útil mesmo quando %1 não tiver trabalho disponível."
+msgstr "Outros projectos usam a mesma plataforma, o BOINC, como %1. Pode considerar participar em um ou mais destes projectos. Ao fazê-lo, o seu computador fará trabalho útil mesmo quando %1 não tiver trabalho disponível."
 
 #: ../user/info.php:58
 msgid ""
 "These other projects are not associated with %1, and we cannot vouch for "
 "their security practices or the nature of their research. Join them at your "
 "own risk."
-msgstr ""
-"Estes projectos não estão associados com %1, e não podemos garantir a "
-"natureza de práticas seguras nas suas pesquisas. Junte-se a eles por sua "
-"conta e risco."
+msgstr "Estes projectos não estão associados com %1, e não podemos garantir a natureza de práticas seguras nas suas pesquisas. Junte-se a eles por sua conta e risco."
 
 #: ../user/language_select.php:47
 msgid "Language selection"
@@ -5111,17 +4774,13 @@ msgstr "Selecção de linguagem"
 msgid ""
 "This web site is available in several languages. The currently selected "
 "language is %1."
-msgstr ""
-"Este website está disponível em várias linguagens. A linguagem seleccionada "
-"actualmente é %1."
+msgstr "Este website está disponível em várias linguagens. A linguagem seleccionada actualmente é %1."
 
 #: ../user/language_select.php:78
 msgid ""
 "Normally the choice of language is determined by your browser's language "
 "setting, which is: %1.  You can change this setting using:"
-msgstr ""
-"Normalmente a escolha do idioma é determinada pela definição de idioma do "
-"seu navegador web, que é: %1. Pode alterar esta definição usando:"
+msgstr "Normalmente a escolha do idioma é determinada pela definição de idioma do seu navegador web, que é: %1. Pode alterar esta definição usando:"
 
 #: ../user/language_select.php:83
 msgid "Firefox: Tools/Options/General"
@@ -5136,10 +4795,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 ""
-"Ou pode seleccionar o idioma carregando numa destas ligações. Isto irá "
-"enviar um cookie para o seu navegador; confirme que o seu navegador aceita "
-"cookies do nosso domínio."
+msgstr "Ou pode seleccionar o idioma carregando numa destas ligações. Isto irá enviar um cookie para o seu navegador; confirme que o seu navegador aceita cookies do nosso domínio."
 
 #: ../user/language_select.php:95
 msgid "Language name (click to select)"
@@ -5151,11 +4807,9 @@ msgstr "Use as definições do navegador"
 
 #: ../user/language_select.php:113
 msgid ""
-"Translations are done by volunteers.  If your native language is not here, %"
-"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."
+"Translations are done by volunteers.  If your native language is not here, "
+"%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:"
@@ -5201,13 +4855,7 @@ msgid ""
 "        having that name with the newest computer having that name.\n"
 "        Incompatible computers will not be merged.\n"
 "        <p>"
-msgstr ""
-"Esta operação liga os computadores baseados no seu nome de domínio.\n"
-"<p>\n"
-"Para cada nome de domínio, este ligará todos os computadores antigos\n"
-"tendo esse nome no computador mais recente.\n"
-"Os computador incompatíveis não serão ligados entre si.\n"
-"<p>"
+msgstr "Esta operação liga os computadores baseados no seu nome de domínio.\n<p>\nPara cada nome de domínio, este ligará todos os computadores antigos\ntendo esse nome no computador mais recente.\nOs computador incompatíveis não serão ligados entre si.\n<p>"
 
 #: ../user/merge_by_name.php:82
 msgid "Go ahead and do this"
@@ -5223,11 +4871,7 @@ msgid ""
 "To maximize discussion and flow of information,\n"
 "our message boards are moderated.\n"
 "Message board postings are subject to the following posting rules:\n"
-msgstr ""
-"\n"
-"Para maximizar a discussão e o fluxo de informação,\n"
-"os nosso fóruns são sujeitos a moderação.\n"
-"Posts nos fóruns são sujeitos às seguintes regras:\n"
+msgstr "\nPara maximizar a discussão e o fluxo de informação,\nos nosso fóruns são sujeitos a moderação.\nPosts nos fóruns são sujeitos às seguintes regras:\n"
 
 #: ../user/moderation.php:30
 msgid ""
@@ -5236,8 +4880,7 @@ msgid ""
 "Moderators may delete posts that violate any of these rules.\n"
 "The authors of deleted posts will be notified via email.\n"
 "Gross offenders may have their ability to post messages temporarily revoked\n"
-"(though to prevent abuse only project administrators have the ability to do "
-"so).\n"
+"(though to prevent abuse only project administrators have the ability to do so).\n"
 "Additional kinds of bad behavior (\"bugging\" posts to trap the\n"
 "IP addresses of other participants, excessive thread creation to spam\n"
 "the forums, etc.), while not listed in the formal rules, may still\n"
@@ -5266,46 +4909,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>\n"
-"Os Moderadores podem apagar posts que violem alguma destas regras.\n"
-"Os autores dos posts eliminados serão notificados por email.\n"
-"Infratores grosseiros poderão ter a capacidade de postar mensagens "
-"temporariamente revogadas.\n"
-"(apesar de ser para prevenir abusos, apenas administradores têm o privilégio "
-"de o fazer).\n"
-"Tipos de mau comportamenteo adicionais (\"bugging\" posts para apanhar os\n"
-"endereços de IP de outros participantes, criação excessiva de posts para "
-"fazer spam\n"
-"nos fóruns, ect), enquanto não listados de acordo com as regras, podem ainda\n"
-"levar a sanções similares.\n"
-"<p>\n"
-"Se acredita que um post viola alguma destas regras,\n"
-"carregue no X vermelho no post e preencha o formulário;\n"
-"Os moderadores serão notificados da sua queixa.\n"
-"Por favor use este botão apenas para violações claras - não\n"
-"para disputas pessoais.\n"
-"<p>\n"
-"Nós tentamos ser o mais justo possivel na moderação,\n"
-"mas numa larga comunidade de utilizadores, com muitos pontos de vista,\n"
-"existirão sempre algumas pessoas que não ficarão contentes\n"
-"com as nossas decisões de moderação.\n"
-"Apesar de lamentarmos que isto aconteça,\n"
-"percebam que não podemos satisfazer sempre todas as pessoas\n"
-"e temos que tomar decisões baseadas nos nossos recursos e\n"
-"naquilo que é melhor para o fórum em geral.\n"
-"Por favor não discutam as nossas politicas de moderação nos fóruns. Não "
-"somos\n"
-"um projecto de engenharia social nem estamos num negócio de criação\n"
-"de um sistema perfeito. Esse tipo de discussões tendem a ser "
-"contrapoducentes\n"
-"e potencialmente incendiários. Se tiver alguma queixa legitima,\n"
-"envie um email para o endereço em baixo.\n"
-"<p>\n"
-"Esta politica de moderação é definida pelo %1 projecto.\n"
-"Se tem algum comentário acerca das politicas, envie um email %2.\n"
-"\n"
+msgstr "\n<p>\nOs Moderadores podem apagar posts que violem alguma destas regras.\nOs autores dos posts eliminados serão notificados por email.\nInfratores grosseiros poderão ter a capacidade de postar mensagens temporariamente revogadas.\n(apesar de ser para prevenir abusos, apenas administradores têm o privilégio de o fazer).\nTipos de mau comportamenteo adicionais (\"bugging\" posts para apanhar os\nendereços de IP de outros participantes, criação excessiva de posts para fazer spam\nn [...]
 
 #: ../user/pending.php:66
 msgid "Pending credit"
@@ -5388,10 +4992,7 @@ 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."
+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
 msgid "Could not find user with id %1"
@@ -5421,22 +5022,17 @@ msgstr "Bloquear %1?"
 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?"
+msgstr "Tem a certeza que quer bloquear o utilizador %1 de lhe enviar mensagens privadas?"
 
 #: ../user/pm.php:244
 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."
+msgstr "Tenha em atenção que só pode bloquear um número limitado de utilizadores."
 
 #: ../user/pm.php:245
 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."
+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
 msgid "No, cancel"
@@ -5467,20 +5063,14 @@ 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."
+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
 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."
+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
 msgid "%1 for %2"
@@ -5510,25 +5100,19 @@ msgstr "Cancelar"
 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."
+msgstr "%1Perfis%2 permitem partilhas individuais dos fundos e opiniões com a %3 comunidade."
 
 #: ../user/profile_menu.php:36
 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."
+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
 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!"
+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
 msgid "User of the Day"
@@ -5550,9 +5134,7 @@ msgstr "Pesquisar os perfis %1por país%2."
 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."
+msgstr "Mostrar perfis %1ao acaso%2, %3ao acaso com imagens%2, ou %4ao acaso sem imagens%2."
 
 #: ../user/profile_menu.php:66
 msgid "Alphabetical profile listings:"
@@ -5796,28 +5378,21 @@ msgstr "Estatísticas para %1"
 
 #: ../user/stats.php:37
 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:"
+"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
 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 "
+"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
 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."
+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 "%1 participants may form %2teams%3."
@@ -5826,9 +5401,7 @@ msgstr "%1 participantes podem formar %2equipas%3."
 #: ../user/team.php:29
 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."
+msgstr "Só pode pertencer a uma equipa. Pode juntar-se ou sair duma equipa a qualquer altura."
 
 #: ../user/team.php:31
 msgid "Each team has a %1founder%2 who may:"
@@ -5856,9 +5429,7 @@ msgstr "acabar com a equipa se esta não tiver membros"
 
 #: ../user/team.php:40
 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."
+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
 msgid "Find a team"
@@ -5879,9 +5450,7 @@ msgstr "Criar uma nova equipa"
 #: ../user/team.php:59
 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."
+msgstr "Se não encontrar uma equipa que seja adequada a si, pode %1criar uma equipa%2."
 
 #: ../user/team_admins.php:34
 msgid "Remove Team Admin status from this member"
@@ -5893,9 +5462,7 @@ msgstr "Adicionar ou remover Administradores da Equipa"
 
 #: ../user/team_admins.php:41
 msgid "You can select team members as 'Team Admins'. Team Admins can:"
-msgstr ""
-"Pode seleccionar membros como 'Administradores da Equipa'. Administradores "
-"da Equipa podem:"
+msgstr "Pode seleccionar membros como 'Administradores da Equipa'. Administradores da Equipa podem:"
 
 #: ../user/team_admins.php:43
 msgid "Edit team information (name, URL, description, country)"
@@ -5907,11 +5474,9 @@ msgstr "Ver o histórico da equipa de quem se juntou/saiu"
 
 #: ../user/team_admins.php:45
 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)"
+"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
 msgid "Team Admins cannot:"
@@ -5927,17 +5492,13 @@ msgstr "Remover membros"
 
 #: ../user/team_admins.php:53
 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."
+msgstr "Se um Administrador da Equipa sair da mesma, deixa de ser um Administrador da Equipa."
 
 #: ../user/team_admins.php:54
 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."
+msgstr "Recomendados que só seleccione pessoas para Administradores da Equipa que conheça e tenha confiança."
 
 #: ../user/team_admins.php:59
 msgid "There are currently no Team Admins"
@@ -6007,18 +5568,13 @@ msgstr "Mudar fundador de %1"
 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."
+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
 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."
+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
 msgid "decline request"
@@ -6026,15 +5582,9 @@ msgstr "declinar pedido"
 
 #: ../user/team_change_founder_form.php:58
 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."
+"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
 msgid "No transfer request is pending."
@@ -6044,9 +5594,7 @@ msgstr "Não existe pedido de transferência pendente."
 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."
+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
 msgid "New founder?"
@@ -6202,10 +5750,7 @@ 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)."
+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
 msgid "Yes - remove message board"
@@ -6217,7 +5762,8 @@ msgstr "Fórum removido"
 
 #: ../user/team_forum.php:124
 msgid ""
-"Your team's message board has been removed. You may now %1create a new one%2."
+"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
@@ -6246,15 +5792,9 @@ msgstr "Pedindo liderança de %1"
 
 #: ../user/team_founder_transfer_action.php:98
 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."
+"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
@@ -6269,9 +5809,7 @@ msgstr "Assumir liderança de %1"
 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."
+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
 msgid "Decline founder change request"
@@ -6314,9 +5852,7 @@ msgstr "Solicitou a liderança de %1 em %2."
 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:"
+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
 msgid "Assume foundership"
@@ -6326,25 +5862,13 @@ msgstr "Assumir liderança"
 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."
+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
 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"
+"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?"
+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
 msgid "Request foundership"
@@ -6358,9 +5882,7 @@ msgstr "A alteração de fundador já foi solicitada por %1 em %2."
 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."
+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
@@ -6421,17 +5943,13 @@ msgstr "Pode ver os membros, estatísticas e informações das equipas."
 
 #: ../user/team_lookup.php:98
 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."
+msgstr "Mais de 100 equipas correspondem à sua procura. As primeiras 100 serão mostradas."
 
 #: ../user/team_lookup.php:104
 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."
+"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
 msgid "Team administration for %1"
@@ -6511,27 +6029,21 @@ msgstr "Criar ou gerir um fórum da equipa"
 
 #: ../user/team_manage.php:71
 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."
+"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
 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."
+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."
+"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"
@@ -6565,19 +6077,10 @@ msgstr "Sair %1"
 msgid ""
 "<strong>Please note before quitting a team:</strong>\n"
 "         <ul>\n"
-"         <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>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"
+"         <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>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
 msgid "Quit Team"
@@ -6625,9 +6128,7 @@ msgstr "Resultados da pesquisa de equipas"
 
 #: ../user/team_search.php:94
 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."
+msgstr "Não foram encontradas equipas correspondentes aos seus critérios de pesquisa. Tenta outra pesquisa."
 
 #: ../user/team_search.php:96
 msgid "Or you can %1create a new team%2."
@@ -6638,11 +6139,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 ""
-"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."
+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
 msgid "Change your search"
@@ -6652,14 +6149,11 @@ msgstr "Mudar a sua pesquisa"
 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."
+msgstr "Pode juntar-se com outras pessoas com interesses similares, ou do mesmo país, companhia ou escola."
 
 #: ../user/team_search.php:183
 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."
+msgstr "Use este formulário para encontrar equipas que possam ser adequadas a si."
 
 #: ../user/team_search.php:188
 msgid "%1I'm not interested%2 in joining a team right now."
@@ -6782,9 +6276,7 @@ msgstr "Validar endereço de email do BOINC"
 msgid ""
 "Please visit the following link to validate the email address of your %1 "
 "account:"
-msgstr ""
-"Por favor visite o seguinte link para validar o endereço de email da sua %1 "
-"conta:"
+msgstr "Por favor visite o seguinte link para validar o endereço de email da sua %1 conta:"
 
 #: ../user/validate_email_addr.php:34
 msgid "Validate email sent"
@@ -6794,9 +6286,7 @@ msgstr "Email de validação enviado"
 msgid ""
 "An email has been sent to %1. Visit the link it contains to validate your "
 "email address."
-msgstr ""
-"Um email foi enviado para %1. Visite o link contido para validar o seu "
-"endereço de email."
+msgstr "Um email foi enviado para %1. Visite o link contido para validar o seu endereço de email."
 
 #: ../user/validate_email_addr.php:44
 msgid "No such user."
@@ -6832,14 +6322,10 @@ msgstr "Dados da conta"
 
 #: ../user/weak_auth.php:52
 msgid ""
-"You can access your account either by using your email address and "
-"password,\n"
+"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 ""
-"Pode aceder à sua conta usando o endereço de email e palavra-passe,\n"
-"      ou então usando a 'chave da conta' assignada.\n"
-"      A sua chave da conta é:"
+msgstr "Pode aceder à sua conta usando o endereço de email e palavra-passe,\n      ou então usando a 'chave da conta' assignada.\n      A sua chave da conta é:"
 
 #: ../user/weak_auth.php:57
 msgid "This key can be used to:"
@@ -6855,11 +6341,7 @@ msgid ""
 "       To do so, install BOINC,\n"
 "       create a file named %1 in the BOINC\n"
 "       data directory, and set its contents to:"
-msgstr ""
-"para adicionar um computador à sua conta sem ter de usar o Gestor BOINC.\n"
-"        Para o fazer, instale o BOINC,\n"
-"        crie um ficheiro chamado %1 na directoria de dados\n"
-"        do BOINC e, defina os seus conteúdos para:"
+msgstr "para adicionar um computador à sua conta sem ter de usar o Gestor BOINC.\n        Para o fazer, instale o BOINC,\n        crie um ficheiro chamado %1 na directoria de dados\n        do BOINC e, defina os seus conteúdos para:"
 
 #: ../user/weak_auth.php:73
 msgid "Weak account key"
@@ -6868,28 +6350,17 @@ msgstr "Palavra chave fraca"
 #: ../user/weak_auth.php:74
 msgid ""
 "Your 'weak account key' can be used to attach computers to your account\n"
-"    as described above, but cannot be used to log in to your account or "
-"change it in any way.\n"
+"    as described above, but cannot be used to log in to your account or change it in any way.\n"
 "    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 ""
-"A sua 'chave de conta fraca' pode ser utilizada para adicionar computadores "
-"à sua conta\n"
-"    como descrito acima mas, não pode ser usada para se ligar à sua conta ou "
-"alterá-la de qualquer maneira.\n"
-"    Se quiser adicionar computadores inseguros ou que não sejam de "
-"confiança, à sua conta,\n"
-"    faça-o usando a sua chave de conta fraca.\n"
-"    A sua chave de conta fraca é:"
+msgstr "A sua 'chave de conta fraca' pode ser utilizada para adicionar computadores à sua conta\n    como descrito acima mas, não pode ser usada para se ligar à sua conta ou alterá-la de qualquer maneira.\n    Se quiser adicionar computadores inseguros ou que não sejam de confiança, à sua conta,\n    faça-o usando a sua chave de conta fraca.\n    A sua chave de conta fraca é:"
 
 #: ../user/weak_auth.php:81
 msgid ""
 "If you change your password, your weak account key changes, and your "
 "previous weak account key becomes invalid."
-msgstr ""
-"Se mudar a sua palavra passe, a sua chave fraca mudará e a sua chave fraca "
-"anterior torna-se inválida"
+msgstr "Se mudar a sua palavra passe, a sua chave fraca mudará e a sua chave fraca anterior torna-se inválida"
 
 #: ../user/workunit.php:32
 msgid "can't find workunit"
@@ -6955,9 +6426,7 @@ msgstr "O seu fundo pessoal."
 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."
+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
 msgid "Your opinions about %1"
@@ -6970,12 +6439,7 @@ msgid ""
 "    <li>What are your views about the project?\n"
 "    <li>Any suggestions?\n"
 "    </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>"
+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
 msgid "Color scheme for graphics"
@@ -6993,282 +6457,8 @@ msgstr "Executar apenas as aplicações seleccionadas"
 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?"
+msgstr "Se não houver trabalho para as aplicações seleccionadas, aceitar trabalho de outras aplicações?"
 
 #: ../project.sample/project_specific_prefs.inc:91
 msgid "(all applications)"
 msgstr "(todas as aplicações)"
-
-#~ msgid "Error:"
-#~ msgstr "Erro:"
-
-#~ msgid "Account creation is disabled"
-#~ msgstr "A criação de conta está desabilitada"
-
-#~ msgid ""
-#~ "Sorry, this project has disabled the creation of new accounts.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Pedimos desculpa, mas este projecto desabilitou a criação de novas contas.\n"
-#~ "Por favor, tente mais tarde."
-
-#~ msgid "Account creation is currently disabled. Please try again later."
-#~ msgstr ""
-#~ "A criação de conta está actualmente desabilitada. Por favor, tente mais "
-#~ "tarde."
-
-#~ msgid "nvidia GPU"
-#~ msgstr "GPU nvidia"
-
-#~ msgid ""
-#~ "This project hasn\\'t created an email message - please notify its "
-#~ "administrators"
-#~ msgstr ""
-#~ "Este projecto não criou uma mensagem de email -  por favor notifique os "
-#~ "administradores"
-
-#~ msgid ""
-#~ "These apply to all BOINC projects in which you participate.<br>\n"
-#~ "             On computers participating in multiple projects, the most "
-#~ "recently modified preferences will be used."
-#~ msgstr ""
-#~ "Estas aplica-se a todos os projectos BOINC em que participa.<br>\n"
-#~ "             Computadores que participam em projectos multiplos, as "
-#~ "preferências usadas são as modificadas mais recentemente."
-
-#~ msgid "Export this news item as a Notice"
-#~ msgstr "Exportar estas novidades como Notícia"
-
-#~ msgid ""
-#~ "Go to the BOINC data directory on your computer (on Windows this is usually "
-#~ "<b>C:\\Documents and Settings\\All Users\\Application Data\\BOINC</b> or "
-#~ "<b>C:\\Program Files\\BOINC</b>."
-#~ msgstr ""
-#~ "Vá à directoria de dados do BOINC no seu computador (no Windows usualmente "
-#~ "em <b>C:\\Documents and Settings\\All Users\\Application Data\\BOINC</b> or "
-#~ "<b>C:\\Programas\\BOINC</b>."
-
-#~ msgid "No such task"
-#~ msgstr "Não existe tal tarefa"
-
-#~ msgid ""
-#~ "Computer is connected to the Internet about every %1 Leave blank or 0 if "
-#~ "always connected. %2 BOINC will try to maintain at least this much work "
-#~ "(max 10 days). %3"
-#~ msgstr ""
-#~ "O computador conecta-se à Internet a cada %1 Deixar em branco ou 0 se "
-#~ "estiver sempre ligado. %2 O BOINC irá tentar manter no minímo esta "
-#~ "quantidade de trabalho (máximo 10 dias). %3"
-
-#~ msgid "Maintain enough work for an additional"
-#~ msgstr "Manter trabalho suficiente para uma adicional"
-
-#~ msgid "Update failed: "
-#~ msgstr "Actualização falhada:"
-
-#~ msgid "Provides %1limited access%2 to your account"
-#~ msgstr "Providencia %1acesso limitado%2 à sua conta"
-
-#~ msgid ""
-#~ "Don't use this form. Just run BOINC, select Add Project, and enter an "
-#~ "email address and password."
-#~ msgstr ""
-#~ "Não use este formulário. Execute apenas o BOINC, seleccione Adicionar "
-#~ "Projecto e, insira o endereço de email e palavra passe."
-
-#~ msgid "Do not reorder sticky posts"
-#~ msgstr "Não reordenar posts sticky"
-
-#~ msgid "If a thread contains more than this number of posts"
-#~ msgstr "Se um tópico conter mais do que este número de posts"
-
-#~ msgid "only display the first one and this many of the last ones"
-#~ msgstr "apenas mostrar o primeiro e esta quantidade dos utlimos"
-
-#~ msgid "Your report has been recorded. Thanks you for your input."
-#~ msgstr "O seu report foi gravado. Obrigado pela sua entrada."
-
-#~ msgid "Search type"
-#~ msgstr "Tipo de pesquisa"
-
-#~ msgid "User names starting with"
-#~ msgstr "Nomes de utilizador começando com"
-
-#~ msgid ""
-#~ "Your 'weak account key' lets you link a computer to your account without "
-#~ "giving it the ability to log in to your account or to change it in any "
-#~ "way."
-#~ msgstr ""
-#~ "A sua 'chave fraca da conta' deixa-o linkar um computador à sua conta, "
-#~ "sem permitir que possa fazer login na sua conta ou mudá-la de alguma "
-#~ "maneira."
-
-#~ msgid ""
-#~ "This mechanism works only with projects that have upgraded their server "
-#~ "software 7 Dec 2007 or later."
-#~ msgstr ""
-#~ "Este mecanismo só funciona com projectos que tenham feito o upgrade do "
-#~ "software do seu servidor para 7 Dec 2007 ou mais tarde."
-
-#~ msgid "Your weak account key for this project is:"
-#~ msgstr "A sua chave fraca da conta para este projecto é:"
-
-#~ msgid ""
-#~ "To use your weak account key on a given host, find or create the 'account "
-#~ "file' for this project. This file has a name of the form "
-#~ "<b>account_PROJECT_URL.xml</b>. The account file for %1 is <b>%2</b>."
-#~ msgstr ""
-#~ "Para usar uma chave fraca de conta num determinado anfitrião, procure ou "
-#~ "crie o 'ficheiro conta' para este projecto. Este ficheiro tem o nome do "
-#~ "form <b>account_PROJECT:URL.xml</b>. O ficheiro da conta para %1 é <b>%2</"
-#~ "b>."
-
-#~ msgid "Create this file if needed. Set its contents to:"
-#~ msgstr "Crie este ficheiro se necessário. Defina o seu conteúdo para:"
-
-#~ msgid ""
-#~ "Your weak account key is a function of your password. If you change your "
-#~ "password, your weak account key changes, and your previous weak account "
-#~ "key becomes invalid."
-#~ msgstr ""
-#~ "A sua palavra fraca da conta é uma função da sua palavra-passe. Se mudar "
-#~ "a palavra passe, a sua palavra fraca da conta muda e a sua palavra fraca "
-#~ "da conta torna-se inválida."
-
-#~ msgid "Account key"
-#~ msgstr "Palavra chave da conta"
-
-#~ msgid "Provides full access to your account"
-#~ msgstr "Providencia acesso total a sua conta"
-
-#~ msgid "Export"
-#~ msgstr "Exportar"
-
-#~ msgid "- private message"
-#~ msgstr "- mensagem privada"
-
-#~ msgid "Private message from"
-#~ msgstr "Mensagem privada de"
-
-#~ msgid "Email address verification pending"
-#~ msgstr "Verificação de endereço de email pendente"
-
-#~ msgid "Logged in as %1."
-#~ msgstr "Logado coomo %1."
-
-#~ msgid "Log in as someone else."
-#~ msgstr "Fazer login como outra pessoa."
-
-#~ msgid "No thread with id %1. Please check the link and try again."
-#~ msgstr ""
-#~ "Não existe tópico com esse id %1. Por favor verifique o link e tente "
-#~ "novamente."
-
-#~ msgid "Request not found"
-#~ msgstr "Pedido não encontrado"
-
-#~ msgid "%1 has added you as a friend."
-#~ msgstr "%1 adicionou-o como amigo."
-
-#~ msgid "Account data for %1"
-#~ msgstr "Dados da conta para %1"
-
-#~ msgid "couldn't create message board"
-#~ msgstr "não foi possivel criar um fórum"
-
-#~ msgid "message board not found"
-#~ msgstr "fórum não encontrado"
-
-#~ msgid "no such forum"
-#~ msgstr "não existe tal fórum"
-
-#~ msgid "unknown command %1"
-#~ msgstr "comando desconhecido %1"
-
-#~ msgid "ERROR: %1 does not exist!  Cannot create combo box.<br>"
-#~ msgstr "ERRO: %1 não existe! Não pode criar combo box.<br>"
-
-#~ msgid ""
-#~ "To protect the project's webpages from spam, we kindly ask you to type in "
-#~ "the two words shown in the image:<br>\n"
-#~ msgstr ""
-#~ "Para proteger as páginas web de spam, pedimos-lhe que tenha a amabilidade "
-#~ "de escrever as duas palavras escritas na imagem:<br>\n"
-
-#~ msgid "BOINC client version"
-#~ msgstr "Versão do cliente BOINC"
-
-#~ msgid "Client detached"
-#~ msgstr "Cliente desanexado"
-
-#~ msgid "Maximum daily WU quota per CPU"
-#~ msgstr "Quota máxima por dia de unidades de trabalho por CPU"
-
-#~ msgid "%1/day"
-#~ msgstr "%1/dia"
-
-#~ msgid "Task ID"
-#~ msgstr "ID da tarefa"
-
-#~ msgid "Granted credit"
-#~ msgstr "Crédito garantido"
-
-#~ msgid "Click to"
-#~ msgstr "Carregue para"
-
-#~ msgid "(no restriction if equal)"
-#~ msgstr "(sem restrições se igual)"
-
-#~ msgid "percent of CPU time"
-#~ msgstr "percentagem do tempo de CPU"
-
-#~ msgid "Leave at least"
-#~ msgstr "Levar pelo menos"
-
-#~ msgid "% of page file (swap space)"
-#~ msgstr "% de page file (espaço swap)"
-
-#~ msgid "Use ATI GPU if present %1(enforced by 6.10+ clients)%2"
-#~ msgstr "Usar ATI GPU, se presente %1(forçado pelos clientes da 6.10+)%2"
-
-#~ msgid "KB/s"
-#~ msgstr "KB/s"
-
-#~ msgid "GB disk space"
-#~ msgstr "GB em espaço no disco"
-
-#~ msgid "GB disk space free"
-#~ msgstr "GB em espaço no disco livre"
-
-#~ msgid "(no restriction)"
-#~ msgstr "(sem restrições)"
-
-#~ msgid "%1 GB disk space"
-#~ msgstr "%1 GB em espaço no disco"
-
-#~ msgid "%1 GB disk space free"
-#~ msgstr "%1 GB em espaço no disco livre"
-
-#~ msgid ""
-#~ "Resource share %1If you participate in multiple BOINC projects, this is "
-#~ "the proportion of your resources used by %2%3"
-#~ msgstr ""
-#~ "Partilha de recursos %1Se participa em projectos multiplos do BOINC, esta "
-#~ "é a proporção dos recursos usados pelo %2%3"
-
-#~ msgid "Gbytes"
-#~ msgstr "Gbytes"
-
-#~ msgid "Resource share"
-#~ msgstr "Partilha de recursos"
-
-#~ msgid "<p>"
-#~ msgstr "<p>"
-
-#~ msgid "preferences"
-#~ msgstr "preferências"
-
-#~ msgid "Last %1"
-#~ msgstr "Ultimo %1"
diff --git a/locale/pt_PT/BOINC-Setup.mo b/locale/pt_PT/BOINC-Setup.mo
index 2c4403e..aa74472 100644
Binary files a/locale/pt_PT/BOINC-Setup.mo and b/locale/pt_PT/BOINC-Setup.mo differ
diff --git a/locale/pt_PT/BOINC-Setup.po b/locale/pt_PT/BOINC-Setup.po
old mode 100755
new mode 100644
index 664cc8a..1d7bd15
--- a/locale/pt_PT/BOINC-Setup.po
+++ b/locale/pt_PT/BOINC-Setup.po
@@ -1,46 +1,39 @@
 # 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:
+# Miguel Filipe Paulino de Sousa Veiga <Miguel.veig at gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\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-12 00:42-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: pt_PT\n"
+"PO-Revision-Date: 2015-03-26 01:24+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"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-Basepath: /Volumes/Cheer/BOINC_GIT/boinc_trunk\n"
-"X-POOTLE-MTIME: 1391081656.0\n"
-"X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: mac_installer\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: Installer.cpp:124
 #, c-format
 msgid "Sorry, this version of %s requires system 10.5 or higher."
 msgstr "Pedimos desculpa, mas esta versão do %s requer o sistema 10.5 ou superior."
 
-#: PostInstall.cpp:130
-#: PostInstall.cpp:1136
-#: uninstall.cpp:1618
+#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
 msgid "Yes"
 msgstr "Sim"
 
-#: PostInstall.cpp:131
-#: PostInstall.cpp:1137
-#: uninstall.cpp:1619
+#: PostInstall.cpp:131 PostInstall.cpp:1137 uninstall.cpp:1619
 msgid "No"
 msgstr "Não"
 
 #: PostInstall.cpp:133
 msgid "Should BOINC run even when no user is logged in?"
-msgstr "Deve o BOINC ser executado se nenhum utilizador estiver logado?"
+msgstr "Deve o BOINC ser executado se nenhum utilizador estiver ligado?"
 
 #: PostInstall.cpp:1416
 #, c-format
@@ -48,10 +41,7 @@ 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 ""
-"Utilizadores com permissões de administração neste computador, terão permissão automática para correr e controlar o %s.\n"
-"\n"
-"Quer também que utilizadores com permissões não administrativas sejam capazes de correr e controlar o %s neste Mac?"
+msgstr "Utilizadores com permissões de administração neste computador, terão permissão automática para correr e controlar o %s.\n\nQuer também que utilizadores com permissões não administrativas sejam capazes de correr e controlar o %s neste Mac?"
 
 #: PostInstall.cpp:1444
 #, c-format
@@ -70,9 +60,7 @@ msgstr "Erro de permissão depois do re-lançamento"
 msgid ""
 "Removal may take several minutes.\n"
 "Please be patient."
-msgstr ""
-"A eliminação pode levar vários minutos.\n"
-"Por favor aguarde."
+msgstr "A eliminação pode levar vários minutos.\nPor favor aguarde."
 
 #: uninstall.cpp:156
 #, c-format
@@ -80,10 +68,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 ""
-"Tem a certeza que quer eliminar completamente o %s do seu computador?\n"
-"\n"
-"Serão eliminados os ficheiros executáveis mas não os %s ficheiros de dados."
+msgstr "Tem a certeza que quer eliminar completamente o %s do seu computador?\n\nSerão eliminados os ficheiros executáveis mas não os %s ficheiros de dados."
 
 #: uninstall.cpp:163
 #, c-format
@@ -103,9 +88,7 @@ msgstr "nome do utilizador"
 msgid ""
 "Do you also want to remove VirtualBox from your computer?\n"
 "(VirtualBox was installed along with BOINC.)"
-msgstr ""
-"Também quer remover o VirtualBox do seu computador?\n"
-"(O VirtualBox foi instalado juntamente com o BOINC)"
+msgstr "Também quer remover o VirtualBox do seu computador?\n(O VirtualBox foi instalado juntamente com o BOINC)"
 
 #: uninstall.cpp:312
 #, c-format
@@ -117,23 +100,14 @@ msgid ""
 "\n"
 "for each user, the file\n"
 "\"%s\"."
-msgstr ""
-"Eliminação completa.\n"
-"\n"
-" Pode ainda eliminar os restantes items usando o Localizador: \n"
-"a directoria \"%s\"\n"
-"\n"
-"para cada utilizador, o ficheiro\n"
-"\"%s\"."
+msgstr "Eliminação completa.\n\n Pode ainda eliminar os restantes items usando o Localizador: \na directoria \"%s\"\n\npara cada utilizador, o ficheiro\n\"%s\"."
 
 #: uninstall.cpp:840
 #, c-format
 msgid ""
 "Enter your administrator password to completely remove %s from you computer.\n"
 "\n"
-msgstr ""
-"Insira a sua palavra-passe de  administrador para eliminar o %s na totalidade do seu computador.\n"
-"\n"
+msgstr "Insira a sua palavra-passe de  administrador para eliminar o %s na totalidade do seu computador.\n\n"
 
 #: uninstall.cpp:1616
 msgid "Cancel"
@@ -142,9 +116,3 @@ msgstr "Cancelar"
 #: uninstall.cpp:1617
 msgid "Continue..."
 msgstr "Continuar..."
-
-#, c-format
-#~ msgid "Sorry, this version of %s requires system 10.4 or higher."
-#~ msgstr ""
-#~ "Pedimos desculpa mas esta versão do %s requer o sistema 10.4 ou superior."
-
diff --git a/locale/pt_PT/BOINC-Web.mo b/locale/pt_PT/BOINC-Web.mo
index 9371b96..767d59b 100644
Binary files a/locale/pt_PT/BOINC-Web.mo and b/locale/pt_PT/BOINC-Web.mo differ
diff --git a/locale/pt_PT/BOINC-Web.po b/locale/pt_PT/BOINC-Web.po
old mode 100755
new mode 100644
index eed2db7..b564126
--- a/locale/pt_PT/BOINC-Web.po
+++ b/locale/pt_PT/BOINC-Web.po
@@ -1,26 +1,25 @@
 # BOINC web translation
 # Copyright (C) 2008-2009 University of California
+# 
 # This file is distributed under the same license as BOINC.
+# 
 # FileID  : $Id$
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\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-12 00:43-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: pt_PT\n"
+"PO-Revision-Date: 2015-02-09 00:16+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\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"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
-"X-POOTLE-MTIME: 1393584152.0\n"
-"X-Poedit-KeywordsList: tra\n"
-"X-Poedit-SearchPath-0: doc\n"
 
 #: docutil.php:21
 msgid "Search"
@@ -36,7 +35,9 @@ msgid "This page is %stranslatable%s."
 msgstr "Esta página pode ser %straduzida%s."
 
 #: download.php:39
-msgid "We recommend that you also install VirtualBox, so your computer can work on science projects that require it."
+msgid ""
+"We recommend that you also install VirtualBox, so your computer can work on "
+"science projects that require it."
 msgstr "Recomendamos que também instale a VirtualBox, para que o seu computador possa realizar trabalhos em projectos onde ele seja exigido."
 
 #: download.php:41
@@ -47,14 +48,12 @@ msgstr "Aprender mais sobre o VirtualBox."
 msgid "Download BOINC + VirtualBox"
 msgstr "Transferir o BOINC + VirtualBox"
 
-#: download.php:54
-#: download.php:69
+#: download.php:54 download.php:69
 #, php-format
 msgid "for %s"
 msgstr "para %s"
 
-#: download.php:57
-#: download.php:72
+#: download.php:57 download.php:72
 #, php-format
 msgid "BOINC version %s"
 msgstr "Versão do BOINC %s"
@@ -69,19 +68,28 @@ msgid "Download BOINC"
 msgstr "Transferir o BOINC"
 
 #: download.php:123
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others."
+msgid ""
+"BOINC is a program that lets you donate your idle computer time to science "
+"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, and many others."
 msgstr "O BOINC é um programa que lhe permite doar tempo inactivo do seu computador, para projectos científicos como o SETI at home, Climateprediction.net, Rosetta at home, World Community Grid e muitos outros."
 
 #: download.php:125
-msgid "After installing BOINC on your computer, you can connect it to as many of these projects as you like."
+msgid ""
+"After installing BOINC on your computer, you can connect it to as many of "
+"these projects as you like."
 msgstr "Depois de instalar o BOINC no seu computador, pode-se conectar a tantos projectos quantos desejar."
 
 #: download.php:127
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
+msgid ""
+"You may run this software on a computer only if you own the computer or have"
+" the permission of its owner."
 msgstr "Pode executar este software num computador apenas se for o proprietário, ou tiver permissão do mesmo."
 
 #: download.php:132
-msgid "We recommend that you download BOINC from the Google Play Store or Amazon Appstore, not from here."
+msgid ""
+"We recommend that you download BOINC from the Google Play Store or Amazon "
+"Appstore, not from here."
 msgstr "Recomendamos que transfira o BOINC da Google Play Store ou da Amazon Appstore, não daqui."
 
 #: download.php:167
@@ -92,8 +100,7 @@ msgstr "Requisitos de sistema"
 msgid "Release notes"
 msgstr "Notas de lançamento"
 
-#: download.php:169
-#: index.php:86
+#: download.php:169 index.php:86
 msgid "Help"
 msgstr "Ajuda"
 
@@ -115,20 +122,34 @@ msgstr "BOINC: computação para a ciência"
 
 #: help.php:12
 #, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
+msgid ""
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who"
+" can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"through the process of installing and using BOINC; %s troubleshoot any "
+"problems you might have."
 msgstr "A ajuda online do BOINC permite-lhe conversar com utilizadores experientes do BOINC, que podem: %s responder às suas perguntas sobre o BOINC e computação voluntária; %s  ajudá-lo através do processo de instalação e utilização do BOINC; %s e resolver quaisquer problemas."
 
 #: help.php:21
 #, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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."
+msgid ""
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system."
+" 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 "A ajuda Online do BOINC baseia-se no %sSkype%s, um sistema de comunicação que usa a Internet. O Skype é gratuito (tanto o programa como as chamadas). Se ainda não tem o Skype, %stransfira-o agora e instale-o%s. Quando terminar, regresse a esta página."
 
 #: help.php:28
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
+msgid ""
+"The best way to get help is by voice, for which you need either built-in "
+"microphone and speakers or an external headset for your computer.  You can "
+"also use Skype's text-based chat system or regular email (if you don't have "
+"Skype) to communicate with Help Volunteers."
 msgstr "A melhor maneira de obter ajuda é por voz, pelo que precisa de um microfone e colunas ou auscultadores para o seu computador. Também pode usar o sistema de conversação do Skype, ou o e-mail (se não tiver o Skype) para comunicar com os Voluntários de Ajuda."
 
 #: help.php:31
-msgid "Volunteers speaking several languages are available. Please select a language:"
+msgid ""
+"Volunteers speaking several languages are available. Please select a "
+"language:"
 msgstr "Estão disponíveis voluntários que falam várias idiomas. Por favor, escolha um idioma:"
 
 #: help.php:47
@@ -137,16 +158,22 @@ msgstr "Seja um Voluntário de Ajuda"
 
 #: help.php:50
 #, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
+msgid ""
+"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+"Volunteer%s.  It's a great way to help the cause of scientific research and "
+"volunteer computing - and it's fun!"
 msgstr "Se é um utilizador experiente do BOINC, encorajamo-lo a se %stornar um Voluntário de Ajuda%s. É uma maneira óptima de ajudar a causa de investigação científica e computação voluntária - e é divertido!"
 
 #: help.php:56
 #, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
+msgid ""
+"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
 msgstr "Se já é um Voluntário de Ajuda: para editar as suas preferências, %sclique aqui%s."
 
 #: help_funcs.php:107
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
+msgid ""
+"BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
+"or the University of California."
 msgstr "Os ajudantes do BOINC são voluntários não remunerados. Os seus conselhos não são aprovados pelo BOINC ou pela Universidade da Califórnia."
 
 #: help_funcs.php:110
@@ -197,9 +224,7 @@ msgstr "Voluntário"
 msgid "Download"
 msgstr "Transferir"
 
-#: index.php:87
-#: index.php:120
-#: index.php:171
+#: index.php:87 index.php:120 index.php:171
 msgid "Documentation"
 msgstr "Documentação"
 
@@ -212,7 +237,10 @@ msgid "Links"
 msgstr "Links"
 
 #: index.php:94
-msgid "Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:"
+msgid ""
+"Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure"
+" diseases, study global warming, discover pulsars, and do many other types "
+"of scientific research.  It's safe, secure, and easy:"
 msgstr "Use o tempo inactivo do seu computador (Windows, Mac, Linux, ou Android) para curar doenças, estudar o aquecimento global, descobrir pulsares e realizar várias outros tipos de pesquisa científica. É seguro, protegido e fácil:"
 
 #: index.php:96
@@ -229,7 +257,9 @@ msgstr "Insira um endereço de e-mail e palavra-passe."
 
 #: index.php:102
 #, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
+msgid ""
+"Or, if you run several projects, try an %saccount manager%s such as "
+"%sGridRepublic%s or %sBAM!%s. "
 msgstr "Ou se executa vários projectos, experimente um %sGestor de Conta%s, como o %sGridRepublic%s ou o %sBAM!%s. "
 
 #: index.php:118
@@ -241,11 +271,15 @@ msgid "Software updates"
 msgstr "Actualizações do Programa"
 
 #: index.php:128
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving"
+" you the computing power of thousands of CPUs."
 msgstr "%1Cientistas%2 : utilizam o BOINC para criar um %3Projecto de Computação Voluntário%4, dando-lhe a o poder de computação de milhares de CPUs."
 
 #: index.php:132
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
 msgstr "%1Universidades%2: utilizam o BOINC para criar um %3Campus de Supercomputação Virtual%4."
 
 #: index.php:137
@@ -318,7 +352,8 @@ msgstr "API's para programas add-on"
 
 #: index.php:217
 #, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
+msgid ""
+"Open-source software for %svolunteer computing%s and %sgrid computing%s."
 msgstr "Programa de código aberto para %scomputação voluntária%s e %scomputação de rede%s."
 
 #: index.php:230
@@ -338,7 +373,10 @@ msgid "Seismology"
 msgstr "Sismologia"
 
 #: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
+msgid ""
+"The Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to Internet-connected computers.  You must buy a "
+"sensor to participate."
 msgstr "A Quake-Catcher Network (Rede de detecção de terramotos) está a desenvolver a maior rede de detecção sísmica mundial, utilizando sensores ligados a computadores conectados à Internet. Tem de comprar um sensor para poder participar."
 
 #: projects.inc:27
@@ -350,23 +388,24 @@ msgid "Environmental research"
 msgstr "Investigação ambiental"
 
 #: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
+msgid ""
+"This project is creating a free and continuously updated map of radiation "
+"levels by using sensors connected to volunteers' computers.  You must buy a "
+"sensor to participate."
 msgstr "Este projecto está a criar um mapa grátis e continuadamente actualizado sobre os niveis de radiação, usando sensores ligados aos computadores dos voluntários. Tem de comprar um sensor para participar."
 
 #: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
+msgid ""
+"To participate in these projects you must buy a sensor and attach it to your"
+" computer."
 msgstr "Para participar nestes projectos, terá de comprar um sensor e ligá-lo ao seu computador."
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
 msgstr "Ciência cognitiva e inteligência artificial"
 
-#: projects.inc:60
-#: projects.inc:364
-#: projects.inc:408
-#: projects.inc:457
-#: projects.inc:464
-#: projects.inc:511
+#: projects.inc:60 projects.inc:364 projects.inc:408 projects.inc:457
+#: projects.inc:464 projects.inc:511
 msgid "Private"
 msgstr "Privado"
 
@@ -375,7 +414,11 @@ msgid "Artificial intelligence"
 msgstr "Inteligência Artificial"
 
 #: projects.inc:62
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
+msgid ""
+"Parse and convert semantic nets for use in FreeHAL, an artificial "
+"intelligence that uses semantic networks, stemmers, part of speech "
+"databases, and part of speech taggers in order to imitate human behavior in "
+"conversations."
 msgstr "Analisar e converter redes semânticas para utilizar no FreeHAL, um agente de inteligência artificial que usa redes semânticas, derivações, bases de dados de classes gramaticais e marcadores de classes gramaticais para imitar o comportamento humano em conversas."
 
 #: projects.inc:69
@@ -391,7 +434,12 @@ msgid "Antimalarial drug discovery"
 msgstr "Descoberta de medicamentos para a Malária"
 
 #: projects.inc:84
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
+msgid ""
+"The parasite that causes malaria continues to evolve resistance to available"
+" medication. We therefore urgently need to discover new drugs to replace "
+"existing drugs. Importantly, these new drugs need to target NEW proteins in "
+"the parasite. The FightMalaria at Home project is aimed at finding these new "
+"targets."
 msgstr "O parasita que causa a malária continua a desenvolver resistência à medicação disponível. Precisamos portanto urgentemente de descobrir novos medicamentos para substituir os medicamentos actuais. Mais importante, estes novos medicamentos precisam de se focar nas NOVAS proteínas no parasita. O objectivo do projecto FightMalaria at Home é encontrar estes novos alvos."
 
 #: projects.inc:90
@@ -403,7 +451,12 @@ msgid "Protein structure prediction"
 msgstr "Predição de estruturas proteicas"
 
 #: projects.inc:92
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
+msgid ""
+"POEM at HOME uses a computational approach to predict the biologically active "
+"structure of proteins, to understand the signal-processing mechanisms when "
+"the proteins interact with one another, to understand diseases related to "
+"protein malfunction or aggregation, and to develop new drugs on the basis of"
+" the three-dimensions structure of biologically important proteins."
 msgstr "POEM at HOME utiliza uma abordagem computacional para prever a estrutura biologicamente activa das proteínas, para compreender os mecanismos de processamento de sinal quando as proteínas interagem entre si, para compreender doenças relacionadas com o mau funcionamento ou agregação de proteínas e, para desenvolver novos medicamentos com base na estrutura tri-dimencional de proteínas biologicamente importantes."
 
 #: projects.inc:98
@@ -415,7 +468,11 @@ msgid "Study of protein - ligand interactions"
 msgstr "Estudo das proteínas - interacções de ligação"
 
 #: projects.inc:100
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
+msgid ""
+"Docking at Home has both bioscience and computer science goals. The project "
+"aims to further knowledge of the atomic details of protein-ligand "
+"interactions and, by doing so, will search for insights into the discovery "
+"of novel pharmaceuticals."
 msgstr "A Docking at Home tem objectivos tanto na área da biociência bem como na ciência dos computadores. O projecto visa obter conhecimento mais detalhado sobre as interacções ligando-proteicos procurando descobrir novos medicamentos."
 
 #: projects.inc:114
@@ -427,7 +484,11 @@ msgid "Molecular simulations of proteins"
 msgstr "Simulações moleculares de proteinas"
 
 #: projects.inc:116
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
+msgid ""
+"GPUGrid.net opens novel computational scenarios by the first full-atom "
+"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
+"New biomedical applications suddenly become possible giving a new role to "
+"computational biology for biomedical research."
 msgstr "O GPUGrid.net abre novos cenários computacionais pelo primeiro átomo molecular completo de código dinâmico (CellMD) especialmente optimizado para executar em GPUs NVIDIA. Novas aplicações biomédicas tornam-se de repente possiveis, podendo criar um novo papel na biologia computacional para a pesquisa biomédica."
 
 #: projects.inc:122
@@ -439,11 +500,15 @@ msgid "Genetic linkage analysis"
 msgstr "Análise de ligações genéticas"
 
 #: projects.inc:124
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
+msgid ""
+"Superlink at Technion helps geneticists all over the world find disease-"
+"provoking genes causing some types of diabetes, hypertension (high blood "
+"pressure), cancer, schizophrenia and many others."
 msgstr "Superlink at Technion ajuda os geneticistas de todo o mundo, a encontrar genes que provocam doenças e que causam alguns tipos de diabetes, hipertensão arterial (pressão arterial alta), cancro, esquizofrenia e muitos outros."
 
 #: projects.inc:138
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
+msgid ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
 msgstr "Centro de BioInformáticas e Biologia Computacional na Universidade de Maryland"
 
 #: projects.inc:139
@@ -451,7 +516,11 @@ msgid "Life science research"
 msgstr "Investigação da ciência da vida"
 
 #: projects.inc:140
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
+msgid ""
+"The Lattice Project supplies computing power to scientists at the University"
+" of Maryland studying evolutionary relationships based on DNA sequence data;"
+" bacterial, plasmid, and virus protein sequences; and biological diversity "
+"in nature reserves. "
 msgstr "O Projeto Lattice fornece poder de computação aos cientistas da Universidade de Maryland, que estudam a relação evolutiva baseada nos dados da sequência do ADN; bacteriana: plasmídeo, e sequências das proteínas de vírus e a diversidade biológica nas reservas naturais."
 
 #: projects.inc:146
@@ -463,20 +532,32 @@ msgid "Epidemiology"
 msgstr "Epidemiologia"
 
 #: projects.inc:148
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
+msgid ""
+"Simulation models of the transmission dynamics and health effects of malaria"
+" are an important tool for malaria control. They can be used to determine "
+"optimal strategies for delivering mosquito nets, chemotherapy, or new "
+"vaccines which are currently under development and testing.  Such modeling "
+"is extremely computer intensive, requiring simulations of large human "
+"populations with a diverse set of parameters related to biological and "
+"social factors that influence the distribution of the disease. "
 msgstr "Os modelos de simulação da transmissão dinâmica e efeitos da saúde da malária são uma ferramenta importante para o controlo da mesma. Estes podem ser utilizados para determinar as estratégias ótimas para a distribuição das redes de mosquito, ou novas vacinas que estão atualmente em desenvolvimento ou em teste. Tal modelagem é extremamente intensiva (computador), que requer simulações de uma grande população de humanos com uma definição diversa de parâmetros relacionados com os fa [...]
 
 #: projects.inc:170
 msgid "University of Washington"
 msgstr "Universidade de Washington"
 
-#: projects.inc:171
-#: projects.inc:179
+#: projects.inc:171 projects.inc:179
 msgid "Biology"
 msgstr "Biologia"
 
 #: projects.inc:172
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
+msgid ""
+"Determine the 3-dimensional shapes of proteins in research that may "
+"ultimately lead to finding cures for some major human diseases. By running "
+"Rosetta at home you will help us speed up and extend our research in ways we "
+"couldn't possibly attempt without your help. You will also be helping our "
+"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
+"Cancer, and Alzheimer's"
 msgstr "Determinação do formato tri-dimensional de proteínas em pesquisa que possam em última análise conduzir à descoberta de curas para algumas das mais importantes doenças humanas. Executando Rosetta at home irá ajudar-nos a acelerar e a aumentar a nossa pesquisa sob aspectos que não nos seria possível empreender sem a sua ajuda. Estará também a contribuir para o nosso empenho na elaboração de novas proteínas para combater doenças tais como o VIH, Malaria, Cancro e Alzheimer."
 
 #: projects.inc:178
@@ -484,7 +565,10 @@ msgid "University of Vienna"
 msgstr "Universidade de Viena"
 
 #: projects.inc:180
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
+msgid ""
+"Calculate similarities between proteins. SIMAP provides a public database of"
+" the resulting data, which plays a key role in many bioinformatics research "
+"projects."
 msgstr "Calcular semelhanças entre proteínas. O SIMAP fornece uma base de dados pública dos dados resultantes, que tem um papel importante em muitos projectos de investigação da Bioinformática."
 
 #: projects.inc:186
@@ -500,7 +584,15 @@ msgid "Climate study"
 msgstr "Estudo do clima"
 
 #: projects.inc:200
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
+msgid ""
+"Investigate the approximations that have to be made in state-of-the-art "
+"climate models. By running the model thousands of times we hope to find out "
+"how the model responds to slight tweaks to these approximations - slight "
+"enough to not make the approximations any less realistic. This will allow us"
+" to improve our understanding of how sensitive our models are to small "
+"changes and also to things like changes in carbon dioxide and the sulphur "
+"cycle. This will allow us to explore how climate may change in the next "
+"century under a wide range of different scenarios."
 msgstr "Investigar as aproximações que têm de ser feitas em modelos climáticos. Ao executar o modelo milhares de vezes esperamos descobrir como o modelo responde a pequenos ajustes a essas aproximações - apenas o suficiente para não fazer aproximações menos realista. Isto irá permitir-nos a melhorar o nosso entendimento de como os nossos modelos são sensíveis a pequenas mudanças e também factores como mudanças no dióxido de carbono e no ciclo do enxofre. Isto irá permitir-nos explorar co [...]
 
 #: projects.inc:207
@@ -512,30 +604,45 @@ msgid "Mechanical engineering"
 msgstr "Engenharia Mecânica"
 
 #: projects.inc:214
-msgid "Currently we are calculating the optimum design of a structure call the 52 bar truss"
+msgid ""
+"Currently we are calculating the optimum design of a structure call the 52 "
+"bar truss"
 msgstr "No momento presente, estamos a calcular a configuração mais optimizada para uma estrutura truss 52"
 
-#: projects.inc:224
-#: projects.inc:263
-#: projects.inc:271
+#: projects.inc:224 projects.inc:263 projects.inc:271
 msgid "Astronomy"
 msgstr "Astronomia"
 
 #: projects.inc:225
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
+msgid ""
+"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
+"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
+"Universe. We will measure physical parameters (such as stellar mass surface "
+"density, star formation rate surface density, attenuation, and first-order "
+"star formation history) on a resolved pixel-by-pixel basis using spectral "
+"energy distribution (SED) fitting techniques in a distributed computing "
+"mode."
 msgstr "Vamos combinar a cobertura espectral do GALEX, Pan-STARRS1 e WISE para gerar um comprimento múltiplo de onda UV-óptico-NIR para criar o atlas da galáxia no Universo. Iremos medir parâmetros físicos (tais como a densidade de de massa estelar, a taxa de superfície da formação estelar, e a história da formação das estrelas) numa base de pixel a pixel, usando técnicas de montagem de computação distribuida em energia espectral (SED)."
 
 #: projects.inc:247
 msgid "University of Texas at Austin"
 msgstr "Universidade do Texas em Austin"
 
-#: projects.inc:248
-#: projects.inc:279
+#: projects.inc:248 projects.inc:279
 msgid "Chemistry"
 msgstr "Química"
 
 #: projects.inc:249
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
+msgid ""
+"A common problem in theoretical chemistry, condensed matter physics and "
+"materials science is the calculation of the time evolution of an atomic "
+"scale system where, for example, chemical reactions and/or diffusion occur. "
+"Generally the events of interest are quite rare (many orders of magnitude "
+"slower than the vibrational movements of the atoms), and therefore direct "
+"simulations, tracking every movement of the atoms, would take thousands of "
+"years of computer calculations on the fastest present day computer before a "
+"single event of interest can be expected to occur.  Our research group is "
+"interested in calculating the long time dynamics of systems."
 msgstr "Um problema comum em química teórica, física da matéria condensada e ciência dos materiais é o cálculo da evolução temporal de um sistema de escala atómica, onde, por exemplo, reacções químicas e/ou difusão ocorrem. Geralmente os eventos de interesse são bastante raros (muitas ordens de magnitude mais lenta do que os movimentos vibracionais dos átomos), e como tal simulações directas e seguir cada movimento dos átomos, poderia levar milhares de anos de cálculos computacionais no  [...]
 
 #: projects.inc:262
@@ -543,7 +650,10 @@ msgid "University of Illinois at Urbana-Champaign"
 msgstr "Universidade de Ilinois em Urbana-Champaign"
 
 #: projects.inc:264
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
+msgid ""
+"The goal of Cosmology at Home is to search for the model that best describes "
+"our Universe and to find the range of models that agree with the available "
+"astronomical particle physics data."
 msgstr "O Cosmology at Home tem como objetivo a procura de um modelo, que melhor descreva o nosso Universo e encontrar uma série de modelos que correspondam aos dados físicos disponíveis das partículas astronómicas."
 
 #: projects.inc:270
@@ -551,7 +661,10 @@ msgid "Rensselaer Polytechnic Institute"
 msgstr "Instituto Politécnico Rensselaer (RPI)"
 
 #: projects.inc:272
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
+msgid ""
+"The goal of Milkyway at Home is to create a highly accurate three dimensional "
+"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
+"Survey."
 msgstr "O objectivo do Milkyway at Home é criar um modelo tridimensional altamente preciso da galáxia Via Láctea, usando dados recolhidos pela Sonda Sloan Digital Sky."
 
 #: projects.inc:278
@@ -559,7 +672,13 @@ msgid "Leiden University, The Netherlands"
 msgstr "Universidade de Leiden, Holanda"
 
 #: projects.inc:280
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
+msgid ""
+"Surface science calculations using Classical Dynamics.  Leiden Classical "
+"allows volunteers, students and other scientist to submit their personal "
+"calculations to the grid. Each user has his own personal queue for Classical"
+" Dynamics jobs. In this way students have used the grid to simulate liquid "
+"argon, or to test the validity of the ideal gas law by actually doing the "
+"simulations through the grid."
 msgstr "Cálculos de ciência de superfície usando a Dinâmica Clássica. Leiden Classical permite que os voluntários, estudantes e outros cientistas submetam os seus cálculos pessoais à rede. Cada utilizador tem a sua própria fila de espera pessoal para trabalhos na Classical Dynamics. Desta forma os alunos têm utilizado a rede para simular argôn líquido, ou para testar a validade da lei do gás ideal fazendo as simulações na rede."
 
 #: projects.inc:294
@@ -571,25 +690,36 @@ msgid "Astrophysics"
 msgstr "Astrofísica"
 
 #: projects.inc:296
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
+msgid ""
+"Search for spinning neutron stars (also called pulsars) using data from the "
+"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
+"observatory.  Einstein at Home is a World Year of Physics 2005 project "
+"supported by the American Physical Society (APS) and by a number of "
+"international organizations."
 msgstr "Procura de estrelas giratórias de neutrões (também chamados de pulsares) usando dados do LIGO e detectores de ondas gravitacionais GEO e do observatório Arecibo. O Einstein at Home é o projecto do Ano Mundial da Física de 2005 apoiado pela Sociedade Americana de Física (APS) e por um número de organizações internacionais."
 
-#: projects.inc:310
-#: projects.inc:318
+#: projects.inc:310 projects.inc:318
 msgid "CERN (European Organization for Nuclear Research)"
 msgstr "CERN (Organização Europeia para a Investigação Nuclear)"
 
-#: projects.inc:311
-#: projects.inc:319
+#: projects.inc:311 projects.inc:319
 msgid "Physics"
 msgstr "Física"
 
 #: projects.inc:312
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
+msgid ""
+"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
+"European Organization for Nuclear Research, the world's largest particle "
+"physics laboratory.  It is the most powerful instrument ever built to "
+"investigate on particles proprieties. LHC at home runs simulations to improve "
+"the design of LHC and its detectors."
 msgstr "O Large Hadron Collider (LHC) é um acelerador de partículas no CERN, a Organização Europeia para a Pesquisa Nuclear, o maior laboratório do mundo de física de partículas. É o instrumento mais poderoso jamais construido para investigar as propriedades de partículas. O LHC at home corre simulações para melhorar o design do LHC e os seus detectores."
 
 #: projects.inc:320
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
+msgid ""
+"This project uses CERN-developed virtual machine technology for full-fledged"
+" LHC event physics simulation on volunteer computers.  Requires that you "
+"install VirtualBox on your computer"
 msgstr "Este projecto usa a tecnologia de máquinas virtuais, desenvolvida pelo CERN para as simulações da LHC de eventos fisícos que atingiram um estado de maturação. Requer que instale a VirtualBox no seu computador."
 
 #: projects.inc:326
@@ -601,7 +731,12 @@ msgid "Astrophysics, astrobiology"
 msgstr "Astrofísica, astrobiologia"
 
 #: projects.inc:328
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
+msgid ""
+"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
+"goal is to detect intelligent life outside Earth. One approach, known as "
+"radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
+"signals from space. Such signals are not known to occur naturally, so a "
+"detection would provide evidence of extraterrestrial technology."
 msgstr "SETI (Procura de Vida Inteligente Extraterrestre) é uma área científica cujo objectivo é detectar vida inteligente fora da Terra. Um método, conhecido como radio SETI, usa rádio-telescópios para ouvir sinais de rádio de banda estreita do espaço. Estes sinais não são conhecidos como ocorrendo naturalmente e, como tal a sua detecção providenciaria evidências de tecnologia extraterrestre."
 
 #: projects.inc:342
@@ -613,7 +748,11 @@ msgid "Chemical engineering and nanotechnology"
 msgstr "Engenharia química e nanotecnologia"
 
 #: projects.inc:344
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
+msgid ""
+"The study of molecular magnets and controlled nanoscale magnetism.  These "
+"magnetic molecules may be used to develop tiny magnetic switches, with "
+"applications in medicine (such as local tumor chemotherapy) and "
+"biotechnology."
 msgstr "O estudo de magnetos moleculares e magnetismo controlado à nano escala. Estas moléculas magnéticas podem ser usadas para desenvolver pequenos switchs magnéticos, com aplicações em medicina (como a quimioterapia em tumores localizados) e biotecnologia."
 
 #: projects.inc:351
@@ -629,7 +768,10 @@ msgid "Physics, biochemistry, and others"
 msgstr "Física, bioquímica e outros"
 
 #: projects.inc:358
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
+msgid ""
+"The objective of CAS at home is to encourage and assist scientists in China to "
+"adopt the technologies of volunteer computing and volunteer thinking for "
+"their research."
 msgstr "O objetivo do CAS at home é encorajar e assistir os cientistas na China para adoptarem as tecnologias de computação voluntária e pensamento voluntário para as pesquisas dos mesmos."
 
 #: projects.inc:365
@@ -637,11 +779,12 @@ msgid "Mathematics, physics, evolution"
 msgstr "Matemática, física, evolução"
 
 #: projects.inc:366
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
+msgid ""
+"Yoyo at home is an adapter between BOINC and several existing volunteer "
+"computing projects: ECM, Muon, Evolution at home, and distributed.net"
 msgstr "O Yoyo at home é um intermediário entre o BOINC e vários projetos de computação existentes: ECM, Muon, Evolution at home e distributed.net"
 
-#: projects.inc:371
-#: projects.inc:527
+#: projects.inc:371 projects.inc:527
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 msgstr "MTA-SZTAKI - Laboratório de Sistemas Distribuídos e Paralelos (Hungria)"
 
@@ -650,7 +793,11 @@ msgid "European research projects"
 msgstr "Projectos de Investigação Europeus"
 
 #: projects.inc:373
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
+msgid ""
+"The EDGeS at Home Beta project integrates volunteer computing into the service "
+"grid network of Europe by allowing service grids to send workunits to be "
+"processed by the volunteers of this project. The scientific projects covered"
+" by the project include math, physics, biology, etc."
 msgstr "O projecto EDGeS at Home Beta integra a computação voluntária num serviço de rede da Internet da Europa, que permitem às redes de serviços enviar unidades de trabalho para serem processadas pelos voluntários deste projecto. Os projectos científicos cobertos, incluem matemática, física, biologia, etc."
 
 #: projects.inc:379
@@ -674,7 +821,11 @@ msgid "Medical, environmental and other humanitarian research"
 msgstr "Pesquisa médica, ambiental e outras pesquisas humanitárias"
 
 #: projects.inc:389
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
+msgid ""
+"To further critical non-profit research on some of humanity's most pressing "
+"problems by creating the world's largest volunteer computing grid.  Research"
+" includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"clean water and many more."
 msgstr "Para promover a pesquisa sem fins lucrativos para alguns dos problemas mais críticos da humanidade, criando a maior rede de computação voluntária do mundo. A pesquisa inclui o HIV-AIDS, cancro e doenças tropicais negligenciadas, energia solar, água potável e muitos mais."
 
 #: projects.inc:395
@@ -693,21 +844,18 @@ msgstr "Matemáticas, Fisícas, Inteligência Artificial"
 msgid "Simulation of quantum computing; Goldbach's conjecture."
 msgstr "Simulação de computação quântica; conjectura de Goldbach."
 
-#: projects.inc:450
-#: projects.inc:458
+#: projects.inc:450 projects.inc:458
 msgid "Cryptography"
 msgstr "Criptografia"
 
 #: projects.inc:459
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
+msgid ""
+"Attempt to decode 3 original Enigma messages. The signals were intercepted "
+"in the North Atlantic in 1942 and are believed to be unbroken."
 msgstr "Tentativa de descodificação 3 mensagens originais (Enigma). Estes sinais foram interceptados no Atlântico Norte em 1942 e acredita-se que sejam impossíveis de descodificar."
 
-#: projects.inc:465
-#: projects.inc:504
-#: projects.inc:512
-#: projects.inc:520
-#: projects.inc:528
-#: projects.inc:568
+#: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
+#: projects.inc:528 projects.inc:568
 msgid "Mathematics"
 msgstr "Matemáticas"
 
@@ -724,11 +872,19 @@ msgid "Factorization of large integers"
 msgstr "Factorização de grandes integrais"
 
 #: projects.inc:473
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
+msgid ""
+"NFS at Home is a research project that uses Internet-connected computers to do "
+"the lattice sieving step in the Number Field Sieve factorization of large "
+"integers. As a young school student, you gained your first experience at "
+"breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
+"NFS at Home is a continuation of that experience, only with integers that are "
+"hundreds of digits long."
 msgstr "NFS at Home é um projecto de pesquisa que utiliza computadores conectados à Internet para executar alguns passos na factorização de inteiros grandes. Como um jovem estudante, ganha a sua primeira experiência em quebrar um número inteiro em factores primos, como 15 = 3 * 5 ou 35 = 5 * 7. NFS at Home é uma continuação dessa experiência, apenas com números inteiros que são centenas de dígitos."
 
 #: projects.inc:479
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
+msgid ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
 msgstr "Universidade Técnica Vilnius Gediminas (VGTU) e Universidade de Tecnologia do Kaunas (Lituânia)"
 
 #: projects.inc:480
@@ -736,7 +892,11 @@ msgid "Software testing"
 msgstr "Testes do programa"
 
 #: projects.inc:481
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
+msgid ""
+"The aim of this project is to provide a powerful distributed computing "
+"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
+"well as others Lithuanian academic institutions.  Current applications "
+"involve the study of Monte-Carlo based software testing."
 msgstr "O objectivo específico deste projecto é providenciar uma poderosa plataforma de computação distribuída para os cientistas da Universidade Técnica de Vilnius Gediminas (VGTU), bem como outras instituições académicas Lituanas. As aplicações actuais envolvem o estudo de Monte-Carlo baseado no teste de programa."
 
 #: projects.inc:503
@@ -744,11 +904,20 @@ msgid "Mathematical Institute of Leiden University / Kennislink"
 msgstr "Instituto Matemático da Universidade de Leiden / Kennislink"
 
 #: projects.inc:505
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
+msgid ""
+"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
+"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
+"product of the distinct prime factors of n. The ABC conjecture says that "
+"there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for "
+"any real h > 1. The ABC conjecture is currently one of the greatest open "
+"problems in mathematics. If it is proven to be true, a lot of other open "
+"problems can be answered directly from it."
 msgstr "Pesquisa por 'triplices-abc': inteiros positivos a,b,c tal que a+b= c, a < b <l c, a,b,c não têm divisores comuns e c > rad (abc), onde rad(n) é o produto dos factores primos distintos de n. A conjectura ABC diz que há apenas números finitos de a,b,c tais que log(c)/ log(rad (abc))> h para qualquer h real > 1. A conjectura ABC é actualmente um dos maiores problemas abertos em matemática. Se for provado ser verdadeiro, outros tantos problemas em aberto podem ser respondidos  [...]
 
 #: projects.inc:513
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
+msgid ""
+"Primegrid has multiple projects searching for different forms of very large "
+"prime numbers, including searching for the largest known prime number."
 msgstr "A Primegrid tem multiplos projectos de pesquisa por diferentes formas de números primos muito grandes, incluindo a pesquisa para o maior número primo conhecido."
 
 #: projects.inc:519
@@ -756,11 +925,15 @@ msgid "Hochschule RheinMain University of Applied Sciences"
 msgstr "Universidade Hochschule RheinMai de Ciências Aplicadas"
 
 #: projects.inc:521
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
+msgid ""
+"Search for counterexamples to two conjectures related to the identification "
+"of prime numbers"
 msgstr "Procura de contra-exemplos para duas conjecturas relacionadas com a identificação de números primos"
 
 #: projects.inc:529
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
+msgid ""
+"Find all the generalized binary number systems (in which bases are matrices "
+"and digits are vectors) up to dimension 11."
 msgstr "Encontrar todos os sistemas numéricos binários generalizados (em que as bases são matrizes e os dígitos são vectores) até à dimensão de 11."
 
 #: ../html/inc/news.inc:40
@@ -771,453 +944,3 @@ msgstr "Comentar"
 #, php-format
 msgid "News is available as an %sRSS feed%s"
 msgstr "Notícias disponíveis como um %sFeed RSS%s"
-
-#~ msgid "Astronomy, Physics, and Chemistry"
-#~ msgstr "Astronomia, Fisícas e Quimíca"
-
-#, php-format
-#~ msgid "%s for %s (%s MB)"
-#~ msgstr "%s para %s (%s MB)"
-#~ msgid ""
-#~ "BOINC is a program that lets you donate your idle computer time to science "
-#~ "projects like SETI at home, Climateprediction.net, Rosetta at home, World "
-#~ "Community Grid, and many others. <p> After installing BOINC on your "
-#~ "computer, you can connect it to as many of these projects as you like."
-#~ msgstr ""
-#~ "BOINC é um programa que o deixa doar tempo inactivo do seu computador à "
-#~ "ciência, a projectos como SETI at home, Climateprediction.net, Rosetta at home, "
-#~ "World Community Grid e muitos outros. <p> Depois de instalar o BOINC no seu "
-#~ "computador, pode conectá-lo a tantos projectos quantos quiser."
-#~ msgid "Browser default"
-#~ msgstr "Navegador Predefinido"
-
-#, php-format
-#~ msgid ""
-#~ " Use the idle time on your computer (Windows, Mac, or Linux) to cure "
-#~ "diseases, study global warming, discover pulsars, and do many other types of "
-#~ "scientific research.  It's safe, secure, and easy:  %sChoose%s projects  "
-#~ "%sDownload%s and run BOINC software  %sEnter%s an email address and "
-#~ "password. "
-#~ msgstr ""
-#~ "  Use o tempo inactivo do seu computador (Windows, Mac ou Linux) para curar "
-#~ "doenças, estudar o aquecimento global, descobrir pulsares e muitos outros "
-#~ "tipos de investigação cientifica. É seguro e fácil: %sEscolha%s Projectos %"
-#~ "Transfira%s e execute o programa BOINC e %sInsira%s um endereço de e-mail e "
-#~ "palavra-passe. "
-#~ msgid "IBM Corporate Community Relations"
-#~ msgstr "Relações Corporativas da Comunidade da IBM"
-#~ msgid "Humanitarian research on disease, natural disasters and hunger."
-#~ msgstr "Pesquisa humanitária sobre doenças, desastres naturais e fome."
-#~ msgid ""
-#~ "To further critical non-profit research on some of humanity's most "
-#~ "pressing problems by creating the world's largest volunteer computing "
-#~ "grid.  Research includes HIV/AIDS, cancer, muscular dystrophy, dengue "
-#~ "fever, and many more."
-#~ msgstr ""
-#~ "Para mais pesquisa critica sem fins lucrativos, em alguns dos problemas "
-#~ "mais proeminentes da humanidade através da criação da maior rede de "
-#~ "computação voluntária do mundo. A pesquisa inclui HIV/AIDS, cancro, "
-#~ "distrofia muscular, febre do dengue, e muitos mais."
-#~ msgid ""
-#~ "Primegrid is generating a public sequential prime number database, and is "
-#~ "searching for large twin primes of the form k*2<sup>n</sup>+1 and "
-#~ "k*2<sup>n</sup>-1"
-#~ msgstr ""
-#~ "A Primegrid está a gerar uma base de dados publica sequencial de números "
-#~ "primos e, está a procurar pelos maiores números primos na forma "
-#~ "k*2<sup>n</sup>+1 and k*2<sup>n</sup>-1"
-#~ msgid "FreeHAL"
-#~ msgstr "FreeHAL"
-#~ msgid "private"
-#~ msgstr "privado"
-#~ msgid "POEM at HOME"
-#~ msgstr "POEM at HOME"
-#~ msgid "Docking at Home"
-#~ msgstr "Docking at Home"
-#~ msgid "GPUGrid.net"
-#~ msgstr "GPUGrid.net"
-#~ msgid "Superlink at Technion"
-#~ msgstr "Superlink at Technion"
-#~ msgid "The Lattice Project"
-#~ msgstr "O Projecto Lattice"
-#~ msgid "Malariacontrol.net"
-#~ msgstr "Malariacontrol.net"
-#~ msgid "Rosetta at home"
-#~ msgstr "Rosetta at home"
-#~ msgid "SIMAP"
-#~ msgstr "SIMAP"
-#~ msgid "Virtual Prairie"
-#~ msgstr "Virtual Prairie"
-#~ msgid "University of Houston"
-#~ msgstr "Universidade de Houston"
-#~ msgid "Study of botanical ecosystems"
-#~ msgstr "Estudo de ecossistemas botânicos"
-#~ msgid ""
-#~ "Provide ecological guidelines on the design of prairies with the best "
-#~ "potential for water purification."
-#~ msgstr ""
-#~ "Fornecer orientações ecológicas sobre a concepção de pradarias com o "
-#~ "melhor potencial para a purificação de água."
-#~ msgid "Climateprediction.net"
-#~ msgstr "Climateprediction.net"
-#~ msgid "Astronomy/Physics/Chemistry"
-#~ msgstr "Astronomia/Fisícas/Quimíca"
-#~ msgid "eOn"
-#~ msgstr "eOn"
-#~ msgid "Orbit at home"
-#~ msgstr "Orbit at home"
-#~ msgid "Planetary Science Institute"
-#~ msgstr "Instituto de Ciências Planetárias"
-#~ msgid "Monitor and study the hazard posed by near-Earth asteroids"
-#~ msgstr ""
-#~ "Monitorizar e estudar o perigo representado pelos Asteróides que passam "
-#~ "perto da Terra."
-#~ msgid "Cosmology at Home"
-#~ msgstr "Cosmology at Home"
-#~ msgid "University of Illinois at Urbana-Chamapign"
-#~ msgstr "Universidade de Ilinois em Urbana-Chamapign"
-#~ msgid "Milkyway at home"
-#~ msgstr "Milkyway at home"
-#~ msgid "Leiden Classical"
-#~ msgstr "Leiden Classical"
-#~ msgid "uFluids at home"
-#~ msgstr "uFluids at home"
-#~ msgid "Purdue University"
-#~ msgstr "Universidade Purdue"
-#~ msgid "Physics/Aeronautics"
-#~ msgstr "Fisícas/Aeronauticas"
-#~ msgid ""
-#~ "The uFluids project simulates two-phase fluid behavior in microgravity "
-#~ "and microfluidics problems. Our goal is to design better satellite "
-#~ "propellant management devices and address two-phase flow in microchannel "
-#~ "and MEMS devices."
-#~ msgstr ""
-#~ "O projecto uFluids simula duas fases de comportamento dos fluidos em "
-#~ "problemas de microgravidade e microfluidica. O nosso objetivo é projectar "
-#~ "melhores aparelhos de gestão de satélites propulsores e endereçar duas "
-#~ "fases de fluxo em microcanais e dispositivos de MEMS."
-#~ msgid "Einstein at home"
-#~ msgstr "Einstein at home"
-#~ msgid "LHC at home"
-#~ msgstr "LHC at home"
-#~ msgid "SETI at home"
-#~ msgstr "SETI at home"
-#~ msgid "Quantum Monte Carlo at Home"
-#~ msgstr "Quantum Monte Carlo at Home"
-#~ msgid "University of Muenster (Germany)"
-#~ msgstr "Universidade de Muenster (Alemanha)"
-#~ msgid ""
-#~ "Study the structure and reactivity of molecules using Quantum Chemistry."
-#~ msgstr ""
-#~ "Estuda a estrutura e a re-actividade de moléculas usando Quimíca Quântica."
-#~ msgid "Spinhenge at home"
-#~ msgstr "Spinhenge at home"
-#~ msgid "CAS at home"
-#~ msgstr "CAS at home"
-#~ msgid "Yoyo at home"
-#~ msgstr "Yoyo at home"
-#~ msgid "EDGeS at Home"
-#~ msgstr "EDGeS at Home"
-#~ msgid "Ibercivis"
-#~ msgstr "Ibercivis"
-#~ msgid "World Community Grid"
-#~ msgstr "World Community Grid"
-#~ msgid "Enigma at Home"
-#~ msgstr "Enigma at home"
-#~ msgid "Collatz Conjecture"
-#~ msgstr "Collatz Conjecture"
-#~ msgid "NFS at home"
-#~ msgstr "NFS at home"
-#~ msgid "VTU at home"
-#~ msgstr "VTU at home"
-#~ msgid "AQUA at home"
-#~ msgstr "AQUA at home"
-#~ msgid "D-Wave Systems, Inc."
-#~ msgstr "Sistemas D-Wave, Inc."
-#~ msgid "Quantum computing"
-#~ msgstr "Computação Quantum"
-#~ msgid ""
-#~ "D-Wave's AQUA (Adiabatic QUantum Algorithms) is a research project whose "
-#~ "goal is to predict the performance of superconducting adiabatic quantum "
-#~ "computers on a variety of hard problems arising in fields ranging from "
-#~ "materials science to machine learning. AQUA at home uses Internet-connected "
-#~ "computers to help design and analyze quantum computing algorithms, using "
-#~ "Quantum Monte Carlo techniques."
-#~ msgstr ""
-#~ "D-Wave's AQUA (Algoritmos Quânticos Adiabatico) é um projecto de pesquisa "
-#~ "cujo objectivo é prever o desempenho de computadores supercondutores "
-#~ "quânticos adiabáticos numa variedade de problemas decorrentes em áreas "
-#~ "que vão da ciência dos materiais à aprendizagem da máquina. AQUA@ home "
-#~ "utiliza computadores conectados à Internet para ajudar a projectar e "
-#~ "analisar algoritmos de computação quântica, usando técnicas de Quantum "
-#~ "Monte Carlo."
-#~ msgid "ABC at home"
-#~ msgstr "ABC at home"
-#~ msgid "PrimeGrid"
-#~ msgstr "PrimeGrid"
-#~ msgid "primaboinca"
-#~ msgstr "primaboinca"
-#~ msgid "SZTAKI Desktop Grid"
-#~ msgstr "SZTAKI Desktop Grid"
-#~ msgid "Chess960 at home"
-#~ msgstr "Chess960 at home"
-#~ msgid "Chess-960.org"
-#~ msgstr "Chess-960.org"
-#~ msgid "Game-playing"
-#~ msgstr "Jogos"
-#~ msgid ""
-#~ "This project studies Chess 960, a variant of orthodox chess. In classical "
-#~ "chess the starting position of the game never changes.  In Chess 960, "
-#~ "just before the start of every game, the initial configuration of the "
-#~ "chess pieces is determined randomly."
-#~ msgstr ""
-#~ "Este projecto estuda o Xadrez 960, uma variante do xadrez ortodoxo. No "
-#~ "xadrez clássico a posição inicial do jogo nunca muda. No xadrez 960, "
-#~ "antes do início de cada jogo, a configuração inicial das peças de xadrez "
-#~ "é determinada aleatóriamente."
-#~ msgid "The current release is known to work with these Linux versions:"
-#~ msgstr ""
-#~ "A versão actual é conhecida por trabalhar com estas versões de Linux:"
-#~ msgid ""
-#~ "For other Linux versions, check if a BOINC package is offered by your "
-#~ "Linux distribution."
-#~ msgstr ""
-#~ "Para outras versões de Linux, verifique se pacote do BOINC é oferecido "
-#~ "pela sua distribuição de Linux."
-#~ msgid ""
-#~ "Alternatively, download the %1BOINC client for older Linux versions%2. "
-#~ "This doesn't have a graphical interface, but it should work on all Linux "
-#~ "systems, both x86 and x64."
-#~ msgstr ""
-#~ "Alternativamente, faça o download do %1BOINC para versões%2 mais antigas "
-#~ "de Linux. Este não suporta interface gráfico, mas deverá funcionar em "
-#~ "todos os sistemas Linux, tanto x86 como x64."
-#~ msgid ""
-#~ "Note: if your computer is equipped with an Graphics Processing Unit "
-#~ "(GPU), you may be able to %suse it to compute faster%s"
-#~ msgstr ""
-#~ "Nota: se o seu computador estiver equipado com uma Unidade de "
-#~ "Processamento Gráfico (GPU), pode %susar o seu computador para realizar "
-#~ "uma computação mais rápida%s"
-#~ msgid "TeraFLOPS."
-#~ msgstr "TeraFLOPS"
-#~ msgid "Conferences"
-#~ msgstr "Conferências"
-#~ msgid "[check all that apply]"
-#~ msgstr "[marque aqueles que se aplicam]"
-#~ msgid "Other:"
-#~ msgstr "Outro:"
-#~ msgid "Yes - I have been running BOINC on my computer for..."
-#~ msgstr "Sim - Eu uso o BOINC no meu computador há..."
-#~ msgid "less than a week"
-#~ msgstr "menos de uma semana"
-#~ msgid "less than a month"
-#~ msgstr "menos de um mês"
-#~ msgid "less than a year"
-#~ msgstr "menos de um ano"
-#~ msgid "more than a year"
-#~ msgstr "mais de um ano"
-#~ msgid "No - I used to run BOINC, but..."
-#~ msgstr "Não - I costumava usar o BOINC, mas..."
-#~ msgid "I lost interest"
-#~ msgstr "Perdi o interesse"
-#~ msgid "it was too complicated"
-#~ msgstr "era muito complicado"
-#~ msgid "I stopped it and forgot to start again"
-#~ msgstr "Parei de usar e esqueci-me de recomeçar"
-#~ msgid "it caused problems on my computer"
-#~ msgstr "causou problemas no meu computador"
-#~ msgid "it used too much electricity"
-#~ msgstr "consumia muita eletricidade"
-#~ msgid "I switched to a non-BOINC computing project"
-#~ msgstr "Troquei por um projecto de computação que não o BOINC"
-#~ msgid "No - I tried running BOINC, but..."
-#~ msgstr "Não - Eu tentei usar o BOINC, mas..."
-#~ msgid "the software didn't install correctly"
-#~ msgstr "o software não instalou correctamente"
-#~ msgid "I couldn't figure out how to use the software"
-#~ msgstr "Não consegui descobrir como usar o software"
-#~ msgid "I had network communication problems"
-#~ msgstr "Tive problemas com a internet"
-#~ msgid "I couldn't attach to a project"
-#~ msgstr "Não consegui anexar um projecto"
-#~ msgid "I attached to a project, but never got any work"
-#~ msgstr "Anexei um projecto, mas nunca funcionou"
-#~ msgid "No - I never tried running BOINC, because..."
-#~ msgstr "Não - Nunca tentei usar o BOINC, porque..."
-#~ msgid "I was concerned about security"
-#~ msgstr "Estava preocupado com a segurança"
-#~ msgid "I wasn't interested in any of the projects"
-#~ msgstr "Não estava interessado em nenhum dos projectos"
-#~ msgid "I don't have permission to run it on my computer"
-#~ msgstr "Não tinha permissões para o usar no meu computador"
-#~ msgid "No version was available for my computer"
-#~ msgstr "Não havia uma versão disponível para o meu computador"
-#~ msgid "What kind of computers do you have running BOINC?"
-#~ msgstr "Que tipo de computadores tem a usar o BOINC?"
-#~ msgid "Where are they?"
-#~ msgstr "Onde é que eles estão?"
-#~ msgid "Work"
-#~ msgstr "Trabalho"
-#~ msgid "School"
-#~ msgstr "Escola"
-#~ msgid "How many computers?"
-#~ msgstr "Quantos computadores?"
-#~ msgid "On average, how many hours per day are they powered on?"
-#~ msgstr "Em média, quantas horas por dia estão ligados?"
-#~ msgid "Age"
-#~ msgstr "Idade"
-#~ msgid "Sex"
-#~ msgstr "Sexo"
-#~ msgid "Male"
-#~ msgstr "Homem"
-#~ msgid "Female"
-#~ msgstr "Mulher"
-#~ msgid "Your level of computer expertise"
-#~ msgstr "O seu nível de conhecimentos informáticos"
-#~ msgid "Beginner"
-#~ msgstr "Iniciado"
-#~ msgid "Intermediate"
-#~ msgstr "Intermédio"
-#~ msgid "Advanced"
-#~ msgstr "Avançado"
-#~ msgid "Where did you learn about BOINC projects?"
-#~ msgstr "Onde é que ouviu falar acerca dos projectos BOINC"
-#~ msgid "TV/radio/newspaper"
-#~ msgstr "TV/Rádio/Jornais"
-#~ msgid "From friends, relatives, or coworkers"
-#~ msgstr "Através de amigos, conhecidos ou colegas de trabalho"
-#~ msgid "Team message boards or web sites"
-#~ msgstr "Mensagens em fóruns ou websites"
-#~ msgid "The BOINC web site"
-#~ msgstr "No website do BOINC"
-#~ msgid "Other web sites"
-#~ msgstr "Outro website"
-#~ msgid ""
-#~ "Which are the most important factors when you decide whether to "
-#~ "participate in a BOINC project?"
-#~ msgstr ""
-#~ "Quais são os factores mais importantes que o levaram a participar num "
-#~ "projecto BOINC?"
-#~ msgid "Nice-looking screensaver graphics"
-#~ msgstr "Protecções de ecrã com bom aspecto gráfico"
-#~ msgid "Fair and quick granting of credit for work done"
-#~ msgstr ""
-#~ "Uma maneira rápida e honesta de garantir créditos pelo trabalho realizado"
-#~ msgid "Getting more credit from this project than from others"
-#~ msgstr "Ganhar mais créditos neste projecto do que em outros"
-#~ msgid "Helpful and friendly message boards"
-#~ msgstr "Fóruns com boa ajuda e amigáveis"
-#~ msgid "Participation by project staff on the message boards"
-#~ msgstr "Participação por parte do staff do projecto nos fóruns "
-#~ msgid "Informative project web site"
-#~ msgstr "Website do projecto com muita informação"
-#~ msgid "The science is important and beneficial"
-#~ msgstr "A ciência é importante e benéfica"
-#~ msgid "Non-profit, and results are public"
-#~ msgstr "Não lucrativo e os resultados são públicos"
-#~ msgid "Personal recognition if my computer finds something"
-#~ msgstr "Reconhecimento pessoal se o meu computador encontrar algo"
-#~ msgid "Publication by the project in scientific journals"
-#~ msgstr "Publicações do projecto nos jornais científicos"
-#~ msgid "Periodic email newsletters from the project"
-#~ msgstr "Newsletters periódicas do projecto"
-#~ msgid "How many BOINC projects do you participate in?"
-#~ msgstr "Em quanto projectos do BOINC participa?"
-#~ msgid "Do you run BOINC as a screensaver?"
-#~ msgstr "Usa o BOINC como protecção de ecrã?"
-#~ msgid "Yes"
-#~ msgstr "Sim"
-#~ msgid "No"
-#~ msgstr "Não"
-#~ msgid "Your usage of project messages boards:"
-#~ msgstr "A finalidade com que usa o fórum do projecto:"
-#~ msgid "to read information"
-#~ msgstr "para ler informação"
-#~ msgid "to read and post information"
-#~ msgstr "para ler e colocar informação"
-#~ msgid "None"
-#~ msgstr "Nenhuma"
-#~ msgid ""
-#~ "Where do you get information to help resolve problems with BOINC and/or "
-#~ "BOINC projects?"
-#~ msgstr ""
-#~ "Onde arranja informação que o ajudem a resolver problemas com o BOINC  e/"
-#~ "ou projectos BOINC?"
-#~ msgid "The project message boards"
-#~ msgstr "Nos fóruns do projecto"
-#~ msgid "The BOINC message boards"
-#~ msgstr "Nos fóruns do BOINC"
-#~ msgid "BOINC mailing lists"
-#~ msgstr "Nas lista de e-mail do BOINC"
-#~ msgid "The Unofficial BOINC Wiki"
-#~ msgstr "No site não-oficial BOINC Wiki"
-#~ msgid "Team web sites"
-#~ msgstr "Nos websites das equipas"
-#~ msgid "Google or other search engines"
-#~ msgstr "Google ou outros engenhos de pesquisa"
-#~ msgid "BOINC user survey"
-#~ msgstr "Questionário de utilizador do BOINC"
-#~ msgid ""
-#~ "Several volunteer computing projects, including Climateprediction.net, "
-#~ "Einstein at home, and SETI at home, use software called BOINC.  If you "
-#~ "participate in projects like this, we request that you answer the "
-#~ "following questions.  This will help BOINC-based projects increase "
-#~ "participation and achieve greater scientific results. <p> Please answer "
-#~ "as many questions as you want, then go to the bottom and click OK. If you "
-#~ "previously completed the survey but your answers have changed, please "
-#~ "complete it again - your new answers will replace the old ones. <p> The "
-#~ "current results of the survey are <a href=poll_results.php>here</a>. "
-#~ msgstr ""
-#~ "Vários projectos de computação voluntária, incluindo o Climateprediction."
-#~ "net, Einstein at home, and SETI at home, usam o software conhecido como BOINC. "
-#~ "Se participa em projectos como estes, propomos-lhe que responda às "
-#~ "seguintes questões. Estas questões ajudarão os projectos baseados no "
-#~ "BOINC a ter maior participação e alcançar melhores resultados "
-#~ "científicos. <p> Responda a tantas questões quanto desejar, depois vá ao "
-#~ "topo da página e carregue OK. Se já anteriormente respondeu ao "
-#~ "questionário mas as suas respostas mudaram, por favor responda otura vez "
-#~ "- as suas novas respostas serão substituidas pelas antigas. <p> Os "
-#~ "resultados actuais do questionário estão <a href=poll_results.php>aqui</"
-#~ "a>. "
-#~ msgid "Do you run BOINC?"
-#~ msgstr "Corre o BOINC?"
-#~ msgid "Your participation"
-#~ msgstr "A sua participação"
-#~ msgid "Your computers"
-#~ msgstr "Os computadores"
-#~ msgid "You"
-#~ msgstr "Você"
-#~ msgid "Nationality"
-#~ msgstr "Nacionalidade"
-#~ msgid "Comments"
-#~ msgstr "Comentários"
-#~ msgid ""
-#~ "Please suggest ways that BOINC, and the projects that use it, could be "
-#~ "improved:"
-#~ msgstr ""
-#~ "Por favor sugira maneiras para que o BOINC e os projectos que usa, possam "
-#~ "ser melhorados:"
-#~ msgid "When done click:"
-#~ msgstr "Quando concluido, carregue"
-#~ msgid "Error - results not recorded"
-#~ msgstr "Erro - resultados não guardados"
-#~ msgid ""
-#~ "An internal error has prevented us from recording your survey response.  "
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Um erro interno impediu-nos de guardar as repostas do seu questionário.  "
-#~ "Por favor tente mais tarde."
-#~ msgid "Survey response recorded"
-#~ msgstr "Respostas do questionário guardadas"
-#~ msgid "Thank you for completing the BOINC user survey."
-#~ msgstr "Obrigado por ter preenchido o questionário de utilizador do BOINC"
-#~ msgid "Survey results"
-#~ msgstr "Resultados do questionário"
-#~ msgid ""
-#~ "These are the current results of the <a href=poll.php>BOINC user survey</"
-#~ "a>.  This page is updated every hour."
-#~ msgstr ""
-#~ "Estes são os resultados actuais do <a href=poll.php>questionário do "
-#~ "utilizador do BOINC</a>. Esta página é actualizada hora a hora."
-
diff --git a/locale/ro/BOINC-Client.mo b/locale/ro/BOINC-Client.mo
index fab8c65..80dfca8 100644
Binary files a/locale/ro/BOINC-Client.mo and b/locale/ro/BOINC-Client.mo differ
diff --git a/locale/ro/BOINC-Client.po b/locale/ro/BOINC-Client.po
old mode 100755
new mode 100644
index 44d988a..d49397d
--- a/locale/ro/BOINC-Client.po
+++ b/locale/ro/BOINC-Client.po
@@ -1,23 +1,23 @@
 # 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: BOINC 7.4\n"
+"Project-Id-Version: boinc\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-10-15 22:25-0700\n"
-"PO-Revision-Date: 2015-02-12 00:59-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: ro\n"
+"PO-Revision-Date: 2015-02-09 00:23+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\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"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.1.6\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: acct_mgr.cpp:450
-#: acct_mgr.cpp:459
+#: acct_mgr.cpp:450 acct_mgr.cpp:459
 msgid "Message from account manager"
 msgstr "Mesaj de la managerul de cont"
 
@@ -26,7 +26,9 @@ msgid "Message from server"
 msgstr "Mesaj de la server"
 
 #: client_state.cpp:258
-msgid "Some tasks need more memory than allowed by your preferences.  Please check the preferences."
+msgid ""
+"Some tasks need more memory than allowed by your preferences.  Please check "
+"the preferences."
 msgstr "Unele task-uri au nevoie de mai multă memorie decât este permis de preferinţele dumneavoastră.  Vă rugăm să verificaţi preferinţele."
 
 #: client_state.cpp:520
@@ -39,11 +41,12 @@ msgstr "Varibila de sistem HTTP_PROXY trebuie să specifice un 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"
+msgid ""
+"You used the wrong URL for this project.  When convenient, remove this "
+"project, then add %s"
 msgstr "Aţi folosit un URL greşit pentru acest proect.  Când puteţi, ştergeţi acest proiect, apoi adăugaţi %s"
 
-#: cs_statefile.cpp:828
-#: ../sched/sched_types.cpp:259
+#: cs_statefile.cpp:828 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
 msgstr "Eroare de sintaxă în app_info.xml"
 
@@ -55,18 +58,15 @@ msgstr "Fişierul menţionat în app_info.xml nu există: "
 msgid "A new version of BOINC is available."
 msgstr "O nouă versiune a BOINC este disponibilă."
 
-#: current_version.cpp:94
-#: current_version.cpp:102
+#: current_version.cpp:94 current_version.cpp:102
 msgid "Download"
 msgstr "Descarcă"
 
-#: log_flags.cpp:269
-#: log_flags.cpp:449
+#: log_flags.cpp:269 log_flags.cpp:449
 msgid "Unexpected text in cc_config.xml"
 msgstr "Text neaşteptat în cc_config.xml"
 
-#: log_flags.cpp:423
-#: log_flags.cpp:475
+#: log_flags.cpp:423 log_flags.cpp:475
 msgid "Unrecognized tag in cc_config.xml"
 msgstr "Tag nerecunoscut în cc_config.xml"
 
@@ -91,7 +91,9 @@ msgid "Invalid code signing key.  To fix, remove and add this project."
 msgstr "Cheie semnătură greşită.  Pentru rezolvare, ştergeţi şi adăugaţi acest proiect."
 
 #: ../sched/handle_request.cpp:859
-msgid "The project has changed its security key.  Please remove and add this project."
+msgid ""
+"The project has changed its security key.  Please remove and add this "
+"project."
 msgstr "Proiectul a modificat cheia de securitate.  Că rugăm ştergeţi şi adăugaţi acest proiect."
 
 #: ../sched/handle_request.cpp:943
@@ -103,7 +105,8 @@ msgid "This project doesn't support CPU type"
 msgstr "Acest proiect nu suportă tipul de CPU"
 
 #: ../sched/handle_request.cpp:993
-msgid "Your BOINC client software is too old.  Please install the current version."
+msgid ""
+"Your BOINC client software is too old.  Please install the current version."
 msgstr "Clientul dumneavoastră BOINC este prea vechi.  Vă rugăm instalaţi versiunea curentă."
 
 #: ../sched/handle_request.cpp:1259
@@ -111,15 +114,19 @@ msgid "This project doesn't support computers of type"
 msgstr "Acest proiect nu suportă calculatoare de tipul"
 
 #: ../sched/sched_send.cpp:1092
-msgid "Upgrade to the latest driver to process tasks using your computer's GPU"
+msgid ""
+"Upgrade to the latest driver to process tasks using your computer's GPU"
 msgstr "Upgradaţi la ultima versiune de driver pentru a procesa task-uri folosind GPU-ul calculatorului"
 
 #: ../sched/sched_send.cpp:1099
-msgid "Upgrade to the latest driver to use all of this project's GPU applications"
+msgid ""
+"Upgrade to the latest driver to use all of this project's GPU applications"
 msgstr "Upgradaţi la ultima versiune de driver pentru a folosi toate aplicaţiile GPU ale acestui proiect"
 
 #: ../sched/sched_send.cpp:1118
-msgid "A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to the current version"
+msgid ""
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to"
+" the current version"
 msgstr "O nouă versiune BOINC este necesară pentru a folosi GPU-ul dumneavoastră NVIDIA; vă rugăm upgradaţi la versiunea curentă"
 
 #: ../sched/sched_send.cpp:1146
@@ -141,7 +148,8 @@ msgstr "Este necesară o versiune mai nouă a BOINC; vă rugam instalaţi versiu
 
 #: ../sched/sched_send.cpp:1305
 #, c-format
-msgid "Tasks for %s are available, but your preferences are set to not accept them"
+msgid ""
+"Tasks for %s are available, but your preferences are set to not accept them"
 msgstr "Task-uri pentru %s sunt disponibile, dar preferinţele dumneavoastră sunt setate să nu le accepte"
 
 #: ../sched/sched_types.cpp:254
@@ -151,4 +159,3 @@ msgstr "Nume aplicaţie necunoscut în app_info.xml"
 #: ../sched/sched_version.cpp:214
 msgid "Your app_info.xml file doesn't have a usable version of"
 msgstr "Fişierul dumneavoastră app_info.xml nu are o versiune utilizabilă de"
-
diff --git a/locale/ro/BOINC-Manager.mo b/locale/ro/BOINC-Manager.mo
index d1539f9..36a49d3 100644
Binary files a/locale/ro/BOINC-Manager.mo and b/locale/ro/BOINC-Manager.mo differ
diff --git a/locale/ro/BOINC-Manager.po b/locale/ro/BOINC-Manager.po
index 226e193..d22a045 100644
--- a/locale/ro/BOINC-Manager.po
+++ b/locale/ro/BOINC-Manager.po
@@ -1,63 +1,52 @@
 # 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: BOINC 7.4\n"
+"Project-Id-Version: boinc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-15 14:15-0500\n"
-"PO-Revision-Date: 2015-02-12 00:59-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: ro\n"
+"POT-Creation-Date: 2014-02-02 00:00-0800\n"
+"PO-Revision-Date: 2015-02-23 23:14+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"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc_7.4\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1419254075.0\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-SearchPath-0: clientgui\n"
-"X-Poedit-SearchPath-1: clientgui/msw\n"
-"X-Poedit-SearchPath-2: clientgui/gtk\n"
-"X-Poedit-SearchPath-3: clientgui/mac\n"
-
-#: clientgui/AccountInfoPage.cpp:387
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: AccountInfoPage.cpp:387
 #, c-format
 msgid "Identify your account at %s"
 msgstr "Identificaţi contul dumneavoastră la %s"
 
-#: clientgui/AccountInfoPage.cpp:393
+#: AccountInfoPage.cpp:393
 msgid ""
 "Please enter your account information\n"
 "(to create an account, visit the project's web site)"
-msgstr ""
-"Vă rugăm introduceţi informaţiile contului\n"
-"(pentru a crea una cont, vizitaţi situl web al proiectului)"
+msgstr "Vă rugăm introduceţi informaţiile contului\n(pentru a crea una cont, vizitaţi situl web al proiectului)"
 
-#: clientgui/AccountInfoPage.cpp:397
+#: AccountInfoPage.cpp:397
 msgid ""
 "This project is not currently accepting new accounts.\n"
 "You can add it only if you already have an account."
-msgstr ""
-"Acest proiect nu acceptă noi conturi.\n"
-"Puteţi să îl adăugaţi doar dacă aveţi deja un cont."
+msgstr "Acest proiect nu acceptă noi conturi.\nPuteţi să îl adăugaţi doar dacă aveţi deja un cont."
 
-#: clientgui/AccountInfoPage.cpp:401
+#: AccountInfoPage.cpp:401
 msgid "Are you already running this project?"
 msgstr "Rulaţi deja acest proiect?"
 
-#: clientgui/AccountInfoPage.cpp:405
+#: AccountInfoPage.cpp:405
 msgid "&No, new user"
 msgstr "&Nu, utilizator nou"
 
-#: clientgui/AccountInfoPage.cpp:408
+#: AccountInfoPage.cpp:408
 msgid "&Yes, existing user"
 msgstr "&Da, utilizator existent"
 
-#: clientgui/AccountInfoPage.cpp:413
+#: AccountInfoPage.cpp:413
 msgid ""
 "We were not able to set up your account information\n"
 "automatically.\n"
@@ -65,501 +54,469 @@ msgid ""
 "Please click on the 'Find login information' link\n"
 "below to find out what to put in the email address and\n"
 "password fields."
-msgstr ""
-"Nu s-au putut seta informaţiile contului\n"
-"automat.\n"
-"\n"
-"Vă rugăm selectaţi 'Caută informaţii login'\n"
-"mai jos pentru a afla ce trebuie să introduceţi în\n"
-"câmpurile adresă de email şi parolă."
+msgstr "Nu s-au putut seta informaţiile contului\nautomat.\n\nVă rugăm selectaţi 'Caută informaţii login'\nmai jos pentru a afla ce trebuie să introduceţi în\ncâmpurile adresă de email şi parolă."
 
-#: clientgui/AccountInfoPage.cpp:416
+#: AccountInfoPage.cpp:416
 msgid "Find login information"
 msgstr "Caută informaţii login"
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:649
+#: AccountInfoPage.cpp:436 AccountInfoPage.cpp:641
 msgid "&Password:"
 msgstr "&Parola:"
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:673
+#: AccountInfoPage.cpp:443 AccountInfoPage.cpp:665
 msgid "Choose a &password:"
 msgstr "Alegeţi o &parolă:"
 
-#: clientgui/AccountInfoPage.cpp:446
+#: AccountInfoPage.cpp:446
 msgid "C&onfirm password:"
 msgstr "C&onfirmaţi parola:"
 
-#: clientgui/AccountInfoPage.cpp:453
+#: AccountInfoPage.cpp:453
 #, c-format
 msgid "Are you already running %s?"
 msgstr "Rulaţi deja %s?"
 
-#: clientgui/AccountInfoPage.cpp:482
+#: AccountInfoPage.cpp:482
 msgid "&Username:"
 msgstr "Nume &utilizator:"
 
-#: clientgui/AccountInfoPage.cpp:511
-msgid "&Email address or LDAP ID:"
-msgstr "Adresa &email sau ID LDAP:"
-
-#: clientgui/AccountInfoPage.cpp:515
+#: AccountInfoPage.cpp:508
 msgid "&Email address:"
 msgstr "Adresa &email:"
 
-#: clientgui/AccountInfoPage.cpp:523
+#: AccountInfoPage.cpp:515
 #, c-format
 msgid "minimum length %d"
 msgstr "lungime minimă %d"
 
-#: clientgui/AccountInfoPage.cpp:530
+#: AccountInfoPage.cpp:522
 msgid "Forgot your password?"
 msgstr "Aţi uitat parola?"
 
-#: clientgui/AccountInfoPage.cpp:537
+#: AccountInfoPage.cpp:529
 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 ""
-"Daca nu v-aţi înregistrat deja la acest manager de cont,\n"
-"vă rugăm să o faceţi înainte de a continua.  Selectaţi legătura\n"
-"de mai jos pentru a vă înregistra sau a regăsi o parolă uitată."
+msgstr "Daca nu v-aţi înregistrat deja la acest manager de cont,\nvă rugăm să o faceţi înainte de a continua.  Selectaţi legătura\nde mai jos pentru a vă înregistra sau a regăsi o parolă uitată."
 
-#: clientgui/AccountInfoPage.cpp:540
+#: AccountInfoPage.cpp:532
 msgid "Account manager web site"
 msgstr "Website manager de cont"
 
-#: clientgui/AccountInfoPage.cpp:582
+#: AccountInfoPage.cpp:574 WelcomePage.cpp:348
 msgid "Add project"
 msgstr "Adaugă proiect"
 
-#: clientgui/AccountInfoPage.cpp:584
+#: AccountInfoPage.cpp:576
 msgid "Update account manager"
 msgstr "Actualizează managerul de cont"
 
-#: clientgui/AccountInfoPage.cpp:586
+#: AccountInfoPage.cpp:578 WelcomePage.cpp:307 WelcomePage.cpp:321
 msgid "Use account manager"
 msgstr "Utilizaţi manager de cont"
 
-#: clientgui/AccountInfoPage.cpp:593
+#: AccountInfoPage.cpp:585
 msgid "Please enter a user name."
 msgstr "Vă rugăm specificaţi un nume de utilizator."
 
-#: clientgui/AccountInfoPage.cpp:595
+#: AccountInfoPage.cpp:587
 msgid "Please enter an email address."
 msgstr "Vă rugăm specificaţi o adresă de email."
 
-#: clientgui/AccountInfoPage.cpp:605
+#: AccountInfoPage.cpp:597
 #, c-format
 msgid "Please enter a password of at least %d characters."
 msgstr "Vă rugăm să introduceţi o parolă cu cel puţin %d caractere."
 
-#: clientgui/AccountInfoPage.cpp:615
-msgid "The password and confirmation password do not match. Please type them again."
+#: AccountInfoPage.cpp:607
+msgid ""
+"The password and confirmation password do not match. Please type them again."
 msgstr "Parola si confirmarea parolei nu sunt identice. Vă rugăm să le reintroduceţi."
 
-#: clientgui/AccountManagerInfoPage.cpp:272
+#: AccountManagerInfoPage.cpp:272
 msgid "Choose an account manager"
 msgstr "Alegeţi un manager de cont"
 
-#: clientgui/AccountManagerInfoPage.cpp:275
+#: AccountManagerInfoPage.cpp:275
 msgid ""
 "To choose an account manager, click its name or \n"
 "type its URL below."
-msgstr ""
-"Pentru a alege un manager de cont, apăsaţi pe numele lui sau\n"
-"introduceţi URL-ul lui mai jos."
+msgstr "Pentru a alege un manager de cont, apăsaţi pe numele lui sau\nintroduceţi URL-ul lui mai jos."
 
-#: clientgui/AccountManagerInfoPage.cpp:279
+#: AccountManagerInfoPage.cpp:279
 msgid "Account manager details:"
 msgstr "Detalii manager de cont:"
 
-#: clientgui/AccountManagerInfoPage.cpp:283
+#: AccountManagerInfoPage.cpp:283
 msgid "Account manager &URL:"
 msgstr "&URL Manager de cont:"
 
-#: clientgui/AccountManagerInfoPage.cpp:287
+#: AccountManagerInfoPage.cpp:287
 msgid "Open web page"
 msgstr "Deschide pagină web"
 
-#: clientgui/AccountManagerInfoPage.cpp:290
+#: AccountManagerInfoPage.cpp:290
 msgid "Visit this account manager's web site"
 msgstr "Vizitaţi site web al managerului de cont"
 
-#: clientgui/AccountManagerProcessingPage.cpp:186
-#: clientgui/AccountManagerPropertiesPage.cpp:192
+#: AccountManagerProcessingPage.cpp:187 AccountManagerPropertiesPage.cpp:193
 #, c-format
 msgid "Communicating with %s."
 msgstr "Comunicare cu %s."
 
-#: clientgui/AccountManagerProcessingPage.cpp:193
-#: clientgui/AccountManagerPropertiesPage.cpp:199
+#: AccountManagerProcessingPage.cpp:194 AccountManagerPropertiesPage.cpp:200
 msgid "Communicating with server."
 msgstr "Comunicare cu serverul."
 
-#: clientgui/AccountManagerProcessingPage.cpp:198
-#: clientgui/AccountManagerPropertiesPage.cpp:204
+#: AccountManagerProcessingPage.cpp:199 AccountManagerPropertiesPage.cpp:205
 msgid "Please wait..."
 msgstr "Vă rugăm aşteptaţi..."
 
-#: clientgui/AccountManagerProcessingPage.cpp:325
+#: AccountManagerProcessingPage.cpp:326
 msgid "An internal server error has occurred.\n"
 msgstr "A intervenit o eroare internă server.\n"
 
-#: clientgui/AdvancedFrame.cpp:96
+#: AdvancedFrame.cpp:95
 msgid "Connected"
 msgstr "Conectat"
 
-#: clientgui/AdvancedFrame.cpp:104
+#: AdvancedFrame.cpp:103
 msgid "Disconnected"
 msgstr "Deconectat"
 
-#: clientgui/AdvancedFrame.cpp:318
+#: AdvancedFrame.cpp:322 sg_BoincSimpleFrame.cpp:119
 #, c-format
 msgid "Close the %s window"
 msgstr "Închide fereastra %s"
 
-#: clientgui/AdvancedFrame.cpp:321
+#: AdvancedFrame.cpp:325 sg_BoincSimpleFrame.cpp:122
 msgid "&Close Window"
 msgstr "În&chide Fereastră"
 
-#: clientgui/AdvancedFrame.cpp:332
-#: clientgui/AdvancedFrame.cpp:339
-#: clientgui/AdvancedFrame.cpp:346
+#: AdvancedFrame.cpp:336 AdvancedFrame.cpp:343 AdvancedFrame.cpp:350
 #, c-format
 msgid "Exit %s"
 msgstr "Închide %s"
 
-#: clientgui/AdvancedFrame.cpp:359
-msgid "Preferences..."
-msgstr "Preferinţe…"
-
-#: clientgui/AdvancedFrame.cpp:368
+#: AdvancedFrame.cpp:371
 msgid "&Notices\tCtrl+Shift+N"
 msgstr "A&nunţuri\tCtrl+Shift+N"
 
-#: clientgui/AdvancedFrame.cpp:369
+#: AdvancedFrame.cpp:372
 msgid "Display notices"
 msgstr "Arată anunţuri"
 
-#: clientgui/AdvancedFrame.cpp:374
+#: AdvancedFrame.cpp:377
 msgid "&Projects\tCtrl+Shift+P"
 msgstr "&Proiecte\tCtrl+Shift+P"
 
-#: clientgui/AdvancedFrame.cpp:375
+#: AdvancedFrame.cpp:378
 msgid "Display projects"
 msgstr "Arată proiecte"
 
-#: clientgui/AdvancedFrame.cpp:380
+#: AdvancedFrame.cpp:383
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr "&Task-uri\tCtrl+Shift+T"
 
-#: clientgui/AdvancedFrame.cpp:381
+#: AdvancedFrame.cpp:384
 msgid "Display tasks"
 msgstr "Arată task-uri"
 
-#: clientgui/AdvancedFrame.cpp:386
+#: AdvancedFrame.cpp:389
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr "Trans&feruri\tCtrl+Shift+X"
 
-#: clientgui/AdvancedFrame.cpp:387
+#: AdvancedFrame.cpp:390
 msgid "Display transfers"
 msgstr "Arată transferuri"
 
-#: clientgui/AdvancedFrame.cpp:392
+#: AdvancedFrame.cpp:395
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "&Statistici\tCtrl+Shift+S"
 
-#: clientgui/AdvancedFrame.cpp:393
+#: AdvancedFrame.cpp:396
 msgid "Display statistics"
 msgstr "Arată statistici"
 
-#: clientgui/AdvancedFrame.cpp:398
+#: AdvancedFrame.cpp:401
 msgid "&Disk usage\tCtrl+Shift+D"
 msgstr "Utilizare &disc\tCtrl+Shift+D"
 
-#: clientgui/AdvancedFrame.cpp:399
+#: AdvancedFrame.cpp:402
 msgid "Display disk usage"
 msgstr "Arată utilizare disc"
 
-#: clientgui/AdvancedFrame.cpp:406
+#: AdvancedFrame.cpp:409
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr "&Vizualizare Simplă...\tCtrl+Shift+V"
 
-#: clientgui/AdvancedFrame.cpp:407
+#: AdvancedFrame.cpp:410
 msgid "Display the simple graphical interface."
 msgstr "Arată interfaţa grafică simplă."
 
-#: clientgui/AdvancedFrame.cpp:421
+#: AdvancedFrame.cpp:424
 msgid "&Add project or account manager..."
 msgstr "&Adaugă proiect sau manager de cont..."
 
-#: clientgui/AdvancedFrame.cpp:422
+#: AdvancedFrame.cpp:425 sg_ProjectPanel.cpp:76
 msgid "Volunteer for any or all of 30+ projects in many areas of science"
 msgstr "Oferiţi-vă voluntar pentru unul sau toate din cele mai mult de 30 de proiecte în multe zone ale ştiinţei"
 
-#: clientgui/AdvancedFrame.cpp:426
+#: AdvancedFrame.cpp:429
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "&Sincronizează cu %s"
 
-#: clientgui/AdvancedFrame.cpp:430
+#: AdvancedFrame.cpp:433
 #, c-format
 msgid "Get current settings from %s"
 msgstr "Preia setările curente de la %s"
 
-#: clientgui/AdvancedFrame.cpp:440
+#: AdvancedFrame.cpp:443
 msgid "&Add project..."
 msgstr "&Adaugă proiect..."
 
-#: clientgui/AdvancedFrame.cpp:441
+#: AdvancedFrame.cpp:444
 msgid "Add a project"
 msgstr "Adaugă un proiect"
 
-#: clientgui/AdvancedFrame.cpp:444
+#: AdvancedFrame.cpp:447
 #, c-format
 msgid "S&top using %s..."
 msgstr "Opreş&te utilizarea %s..."
 
-#: clientgui/AdvancedFrame.cpp:450
+#: AdvancedFrame.cpp:453
 msgid "Remove this computer from account manager control."
 msgstr "Elimină acest calculator de sub controlul managerului de cont."
 
-#: clientgui/AdvancedFrame.cpp:455
+#: AdvancedFrame.cpp:458 sg_BoincSimpleFrame.cpp:178
 msgid "&Options..."
 msgstr "&Opţiuni..."
 
-#: clientgui/AdvancedFrame.cpp:456
+#: AdvancedFrame.cpp:459 sg_BoincSimpleFrame.cpp:179
 msgid "Configure display options and proxy settings"
 msgstr "Configurează opţiunile de afişare şi setările proxy"
 
-#: clientgui/AdvancedFrame.cpp:460
+#: AdvancedFrame.cpp:463 sg_BoincSimpleFrame.cpp:172
 msgid "Computing &preferences..."
 msgstr "&Preferinţe calcul..."
 
-#: clientgui/AdvancedFrame.cpp:461
+#: AdvancedFrame.cpp:464 sg_BoincSimpleFrame.cpp:173
 msgid "Configure computing preferences"
 msgstr "Configurează preferinţele de calcul"
 
-#: clientgui/AdvancedFrame.cpp:469
+#: AdvancedFrame.cpp:472
 msgid "&Run always"
 msgstr "&Rulează continuu"
 
-#: clientgui/AdvancedFrame.cpp:470
+#: AdvancedFrame.cpp:473
 msgid "Allow work regardless of preferences"
 msgstr "Rulează indiferent de preferinţe"
 
-#: clientgui/AdvancedFrame.cpp:474
+#: AdvancedFrame.cpp:477
 msgid "Run based on &preferences"
 msgstr "Rulează conform &preferinţelor"
 
-#: clientgui/AdvancedFrame.cpp:475
+#: AdvancedFrame.cpp:478
 msgid "Allow work according to preferences"
 msgstr "Rulează conform preferinţelor"
 
-#: clientgui/AdvancedFrame.cpp:479
+#: AdvancedFrame.cpp:482
 msgid "&Suspend"
 msgstr "&Suspendă"
 
-#: clientgui/AdvancedFrame.cpp:480
+#: AdvancedFrame.cpp:483
 msgid "Stop work regardless of preferences"
 msgstr "Opreşte lucrul indiferent de preferinţe"
 
-#: clientgui/AdvancedFrame.cpp:505
+#: AdvancedFrame.cpp:508
 msgid "Use GPU always"
 msgstr "Foloseşte GPU tot timpul"
 
-#: clientgui/AdvancedFrame.cpp:506
+#: AdvancedFrame.cpp:509
 msgid "Allow GPU work regardless of preferences"
 msgstr "Permite lucrul GPU indiferent de preferinţe"
 
-#: clientgui/AdvancedFrame.cpp:510
+#: AdvancedFrame.cpp:513
 msgid "Use GPU based on preferences"
 msgstr "Foloseşte GPU bazat pe preferinţe"
 
-#: clientgui/AdvancedFrame.cpp:511
+#: AdvancedFrame.cpp:514
 msgid "Allow GPU work according to preferences"
 msgstr "Permite lucrul GPU conform preferinţe"
 
-#: clientgui/AdvancedFrame.cpp:515
+#: AdvancedFrame.cpp:518
 msgid "Suspend GPU"
 msgstr "Suspendă GPU"
 
-#: clientgui/AdvancedFrame.cpp:516
+#: AdvancedFrame.cpp:519
 msgid "Stop GPU work regardless of preferences"
 msgstr "Opreşte lucrul GPU indiferent de preferinţe"
 
-#: clientgui/AdvancedFrame.cpp:540
+#: AdvancedFrame.cpp:543
 msgid "Network activity always available"
 msgstr "Acces la reţea disponibil permanent"
 
-#: clientgui/AdvancedFrame.cpp:541
+#: AdvancedFrame.cpp:544
 msgid "Allow network activity regardless of preferences"
 msgstr "Acces la reţea indiferent de preferinţe"
 
-#: clientgui/AdvancedFrame.cpp:545
+#: AdvancedFrame.cpp:548
 msgid "Network activity based on preferences"
 msgstr "Acces la reţea conform preferinţelor"
 
-#: clientgui/AdvancedFrame.cpp:546
+#: AdvancedFrame.cpp:549
 msgid "Allow network activity according to preferences"
 msgstr "Permite accesul la reţea conform preferinţelor"
 
-#: clientgui/AdvancedFrame.cpp:550
+#: AdvancedFrame.cpp:553
 msgid "Network activity suspended"
 msgstr "Accesul la reţea suspendat"
 
-#: clientgui/AdvancedFrame.cpp:551
+#: AdvancedFrame.cpp:554
 msgid "Stop BOINC network activity"
 msgstr "Opreşte activitatea de reţea a BOINC"
 
-#: clientgui/AdvancedFrame.cpp:561
+#: AdvancedFrame.cpp:564
 #, c-format
 msgid "Connect to another computer running %s"
 msgstr "Conectare la alt calculator care rulează %s"
 
-#: clientgui/AdvancedFrame.cpp:566
+#: AdvancedFrame.cpp:569
 msgid "Select computer..."
 msgstr "Selectează calculator..."
 
-#: clientgui/AdvancedFrame.cpp:571
+#: AdvancedFrame.cpp:574
 msgid "Shut down connected client..."
 msgstr "Opreşte clienul conectat..."
 
-#: clientgui/AdvancedFrame.cpp:572
+#: AdvancedFrame.cpp:575
 msgid "Shut down the currently connected client"
 msgstr "Opreşte clienul curent conectat"
 
-#: clientgui/AdvancedFrame.cpp:576
+#: AdvancedFrame.cpp:579
 msgid "Run CPU &benchmarks"
 msgstr "Rulează &benchmark CPU"
 
-#: clientgui/AdvancedFrame.cpp:577
+#: AdvancedFrame.cpp:580
 msgid "Runs BOINC CPU benchmarks"
 msgstr "Rulează benchmark CPU BOINC"
 
-#: clientgui/AdvancedFrame.cpp:581
+#: AdvancedFrame.cpp:584
 msgid "Do network communication"
 msgstr "Realizează comunicaţia prin reţea"
 
-#: clientgui/AdvancedFrame.cpp:582
+#: AdvancedFrame.cpp:585
 msgid "Do all pending network communication"
 msgstr "Realizează comunicaţiile prin reţea în aşteptare"
 
-#: clientgui/AdvancedFrame.cpp:586
+#: AdvancedFrame.cpp:589
 msgid "Read config files"
 msgstr "Citeşte fişierele de configurare"
 
-#: clientgui/AdvancedFrame.cpp:587
-msgid "Read configuration info from cc_config.xml and any app_config.xml files"
+#: AdvancedFrame.cpp:590
+msgid ""
+"Read configuration info from cc_config.xml and any app_config.xml files"
 msgstr "Citeşte informaţiile de configurare din fişierele cc_config.xml şi app_config.xml"
 
-#: clientgui/AdvancedFrame.cpp:591
+#: AdvancedFrame.cpp:594
 msgid "Read local prefs file"
 msgstr "Citeşte fişierul local de preferinţe"
 
-#: clientgui/AdvancedFrame.cpp:592
+#: AdvancedFrame.cpp:595
 msgid "Read preferences from global_prefs_override.xml."
 msgstr "Citeşte preferinţele din global_prefs_override.xml."
 
-#: clientgui/AdvancedFrame.cpp:597
+#: AdvancedFrame.cpp:600
 #, c-format
 msgid "Launch another instance of %s..."
 msgstr "Lansează o altă instanţă de %s..."
 
-#: clientgui/AdvancedFrame.cpp:601
+#: AdvancedFrame.cpp:604
 #, c-format
 msgid "Launch another %s"
 msgstr "Lansează un alt %s"
 
-#: clientgui/AdvancedFrame.cpp:611
+#: AdvancedFrame.cpp:614
 msgid "Event Log...\tCtrl+Shift+E"
 msgstr "Log Evenimente...\tCtrl+Shift+E"
 
-#: clientgui/AdvancedFrame.cpp:612
+#: AdvancedFrame.cpp:615
 msgid "Display diagnostic messages."
 msgstr "Afişează mesajele de diagnostic."
 
-#: clientgui/AdvancedFrame.cpp:616
-msgid "Event Log Diagnostic Flags...\tCtrl+Shift+F"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:617
-msgid "Enable or disable various diagnostic messages"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:626
+#: AdvancedFrame.cpp:625 sg_BoincSimpleFrame.cpp:188
 #, c-format
 msgid "%s &help"
 msgstr "&Ajutor %s"
 
-#: clientgui/AdvancedFrame.cpp:632
+#: AdvancedFrame.cpp:631 sg_BoincSimpleFrame.cpp:194
 #, c-format
 msgid "Show information about %s"
 msgstr "Arată informaţii despre %s"
 
-#: clientgui/AdvancedFrame.cpp:644
+#: AdvancedFrame.cpp:643
 #, c-format
 msgid "&%s help"
 msgstr "&Ajutor %s"
 
-#: clientgui/AdvancedFrame.cpp:650
+#: AdvancedFrame.cpp:649 sg_BoincSimpleFrame.cpp:212
 #, c-format
 msgid "Show information about the %s"
 msgstr "Arată informaţii despre %s"
 
-#: clientgui/AdvancedFrame.cpp:662
+#: AdvancedFrame.cpp:661 sg_BoincSimpleFrame.cpp:224
 #, c-format
 msgid "%s &web site"
 msgstr "%s &website"
 
-#: clientgui/AdvancedFrame.cpp:668
+#: AdvancedFrame.cpp:667 sg_BoincSimpleFrame.cpp:230
 #, c-format
 msgid "Show information about BOINC and %s"
 msgstr "Afişează informaţii despre BOINC şi %s"
 
-#: clientgui/AdvancedFrame.cpp:680
-#: clientgui/BOINCTaskBar.cpp:544
+#: AdvancedFrame.cpp:679 BOINCTaskBar.cpp:530 sg_BoincSimpleFrame.cpp:242
 #, c-format
 msgid "&About %s..."
 msgstr "&Despre %s..."
 
-#: clientgui/AdvancedFrame.cpp:686
+#: AdvancedFrame.cpp:685 sg_BoincSimpleFrame.cpp:248
 msgid "Licensing and copyright information."
 msgstr "Informaţii despre licenţă şi drepturi de autor."
 
-#: clientgui/AdvancedFrame.cpp:693
+#: AdvancedFrame.cpp:692 sg_BoincSimpleFrame.cpp:255
 msgid "&File"
 msgstr "&Fişier"
 
-#: clientgui/AdvancedFrame.cpp:697
+#: AdvancedFrame.cpp:696 sg_BoincSimpleFrame.cpp:259
 msgid "&View"
 msgstr "&Vizualizare"
 
-#: clientgui/AdvancedFrame.cpp:701
+#: AdvancedFrame.cpp:700 sg_BoincSimpleFrame.cpp:263
 msgid "&Tools"
 msgstr "&Unelte"
 
-#: clientgui/AdvancedFrame.cpp:705
+#: AdvancedFrame.cpp:704
 msgid "&Activity"
 msgstr "&Activitate"
 
-#: clientgui/AdvancedFrame.cpp:709
+#: AdvancedFrame.cpp:708
 msgid "A&dvanced"
 msgstr "A&vansat"
 
-#: clientgui/AdvancedFrame.cpp:713
+#: AdvancedFrame.cpp:712 DlgEventLog.cpp:332 sg_BoincSimpleFrame.cpp:267
+#: wizardex.cpp:374 wizardex.cpp:381
 msgid "&Help"
 msgstr "&Ajutor"
 
-#: clientgui/AdvancedFrame.cpp:1185
+#: AdvancedFrame.cpp:1199
 #, c-format
 msgid "%s - Stop using %s"
 msgstr "%s - Opreşte utilizarea %s"
 
-#: clientgui/AdvancedFrame.cpp:1190
+#: AdvancedFrame.cpp:1204
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -567,256 +524,222 @@ msgid ""
 "but you'll have to manage projects manually.\n"
 "\n"
 "Do you want to stop using %s?"
-msgstr ""
-"Dacă nu mai folosiţi %s,\n"
-"veţi păstra toate proiectele curente,\n"
-"dar va trebui să gestionaţi proiectele manual.\n"
-"\n"
-"Doriţi să nu mai folosiţi %s?"
+msgstr "Dacă nu mai folosiţi %s,\nveţi păstra toate proiectele curente,\ndar va trebui să gestionaţi proiectele manual.\n\nDoriţi să nu mai folosiţi %s?"
 
-#: clientgui/AdvancedFrame.cpp:1397
+#: AdvancedFrame.cpp:1401
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s - Închide clientul curent..."
 
-#: clientgui/AdvancedFrame.cpp:1406
+#: AdvancedFrame.cpp:1410
 #, c-format
 msgid ""
 "%s will shut down the current client\n"
 "and prompt you for another host to connect to."
-msgstr ""
-"%s va opri clientul curent\n"
-"şi vă va cere o altă gazdă la care să se conecteze."
+msgstr "%s va opri clientul curent\nşi vă va cere o altă gazdă la care să se conecteze."
 
-#: clientgui/AdvancedFrame.cpp:1806
+#: AdvancedFrame.cpp:1745 DlgAbout.cpp:119
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: clientgui/AdvancedFrame.cpp:1815
+#: AdvancedFrame.cpp:1754
 #, c-format
 msgid "%s has successfully added %s"
 msgstr "%s a adăugat cu succes %s"
 
-#: clientgui/AdvancedFrame.cpp:1953
+#: AdvancedFrame.cpp:1893
 #, c-format
 msgid "%s - (%s)"
 msgstr "%s - (%s)"
 
-#: clientgui/AdvancedFrame.cpp:1957
+#: AdvancedFrame.cpp:1897
 #, c-format
 msgid "Connecting to %s"
 msgstr "In curs de conectare la %s"
 
-#: clientgui/AdvancedFrame.cpp:1960
+#: AdvancedFrame.cpp:1900
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "Conectat la %s (%s)"
 
-#: clientgui/AlreadyExistsPage.cpp:184
+#: AlreadyExistsPage.cpp:184
 msgid "Username already in use"
 msgstr "Nume utilizator deja folosit"
 
-#: clientgui/AlreadyExistsPage.cpp:187
+#: AlreadyExistsPage.cpp:187
 msgid ""
 "An account with that username already exists and has a\n"
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"Exista deja un cont cu acest nume ude tilizator,\n"
-"dar cu o parolă diferită de cea pe care aţi introdus-o dvs.\n"
-"\n"
-"Va rugăm accesaţi web site-ul proiectului si urmaţi instrucţiunile de acolo."
+msgstr "Exista deja un cont cu acest nume ude tilizator,\ndar cu o parolă diferită de cea pe care aţi introdus-o dvs.\n\nVa rugăm accesaţi web site-ul proiectului si urmaţi instrucţiunile de acolo."
 
-#: clientgui/AlreadyExistsPage.cpp:191
+#: AlreadyExistsPage.cpp:191
 msgid "Email address already in use"
 msgstr "Adresa de email este deja in uz"
 
-#: clientgui/AlreadyExistsPage.cpp:194
+#: AlreadyExistsPage.cpp:194
 msgid ""
 "An account with that email address already exists and has a\n"
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"Exista deja un cont cu această adresă de email,\n"
-"dar cu o parolă diferită de cea pe care aţi introdus-o dvs.\n"
-"\n"
-"Va rugăm accesaţi web site-ul proiectului si urmaţi instrucţiunile de acolo."
+msgstr "Exista deja un cont cu această adresă de email,\ndar cu o parolă diferită de cea pe care aţi introdus-o dvs.\n\nVa rugăm accesaţi web site-ul proiectului si urmaţi instrucţiunile de acolo."
 
-#: clientgui/AsyncRPC.cpp:1031
+#: AsyncRPC.cpp:1031
 msgid "Communicating with BOINC client.  Please wait ..."
 msgstr "Se comunică cu clientul BOINC.  Vă rugăm aşteptaţi ..."
 
-#: clientgui/AsyncRPC.cpp:1034
+#: AsyncRPC.cpp:1034
 #, c-format
 msgid "&Quit %s"
 msgstr "&Închide %s"
 
-#: clientgui/AsyncRPC.cpp:1036
+#: AsyncRPC.cpp:1036
 #, c-format
 msgid "E&xit %s"
 msgstr "I&eşire %s"
 
-#: clientgui/AsyncRPC.cpp:1040
+#: AsyncRPC.cpp:1040
 #, c-format
 msgid "%s - Communication"
 msgstr "%s - Comunicaţie"
 
-#: clientgui/AsyncRPC.cpp:1056
+#: AsyncRPC.cpp:1056 DlgAdvPreferencesBase.cpp:107 sg_DlgPreferences.cpp:433
 msgid "Cancel"
 msgstr "Anulează"
 
-#: clientgui/BOINCBaseFrame.cpp:504
+#: BOINCBaseFrame.cpp:505
 #, c-format
 msgid "%s - Connection Error"
 msgstr "%s - Eroare Conexiune"
 
-#: clientgui/BOINCBaseFrame.cpp:513
+#: BOINCBaseFrame.cpp:514
 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 ""
-"Nu sunteţi autorizat să gestionaţi acest client.\n"
-"Vă rugăm contactaţi administratorul pentru a vă adăuga în grupul 'boinc_users' local."
+msgstr "Nu sunteţi autorizat să gestionaţi acest client.\nVă rugăm contactaţi administratorul pentru a vă adăuga în grupul 'boinc_users' local."
 
-#: clientgui/BOINCBaseFrame.cpp:522
+#: BOINCBaseFrame.cpp:523
 msgid ""
 "Authorization failed connecting to running client.\n"
 "Make sure you start this program in the same directory as the client."
-msgstr ""
-"Autorizare eşuată la conectarea cu clientul.\n"
-"Fiţi sigur că porniţi acest program în acelaşi director cu clientul."
+msgstr "Autorizare eşuată la conectarea cu clientul.\nFiţi sigur că porniţi acest program în acelaşi director cu clientul."
 
-#: clientgui/BOINCBaseFrame.cpp:524
+#: BOINCBaseFrame.cpp:525
 msgid "Authorization failed connecting to running client."
 msgstr "Autorizare eşuată la conectarea la client."
 
-#: clientgui/BOINCBaseFrame.cpp:532
+#: BOINCBaseFrame.cpp:533
 msgid "The password you have provided is incorrect, please try again."
 msgstr "Parola este incorectă, va rugăm reîncercaţi."
 
-#: clientgui/BOINCBaseFrame.cpp:576
+#: BOINCBaseFrame.cpp:577
 #, c-format
 msgid "%s - Connection Failed"
 msgstr "%s - Conexiune Nereuşită"
 
-#: clientgui/BOINCBaseFrame.cpp:585
+#: BOINCBaseFrame.cpp:586
 #, c-format
 msgid ""
 "%s is not able to connect to a %s client.\n"
 "Would you like to try to connect again?"
-msgstr ""
-"%s nu se poate conecta la clientul %s .\n"
-"Doriţi să încerce să se conecteze din nou?"
+msgstr "%s nu se poate conecta la clientul %s .\nDoriţi să încerce să se conecteze din nou?"
 
-#: clientgui/BOINCBaseFrame.cpp:621
+#: BOINCBaseFrame.cpp:622
 #, c-format
 msgid "%s - Daemon Start Failed"
 msgstr "%s - Pornirea Daemon Eşuată"
 
-#: clientgui/BOINCBaseFrame.cpp:631
+#: BOINCBaseFrame.cpp:632
 #, 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 nu poate porni un client %s.\n"
-"Vă rugăm lansaţi Control Panel->Administative Tools->Services şi porniţi serviciul BOINC."
+msgstr "%s nu poate porni un client %s.\nVă rugăm lansaţi Control Panel->Administative Tools->Services şi porniţi serviciul BOINC."
 
-#: clientgui/BOINCBaseFrame.cpp:637
+#: BOINCBaseFrame.cpp:638
 #, c-format
 msgid ""
 "%s is not able to start a %s client.\n"
 "Please start the daemon and try again."
-msgstr ""
-"%s nu poate porni un client %s.\n"
-"Vă rugăm porniţi daemonul şi încercaţi din nou."
+msgstr "%s nu poate porni un client %s.\nVă rugăm porniţi daemonul şi încercaţi din nou."
 
-#: clientgui/BOINCBaseFrame.cpp:688
+#: BOINCBaseFrame.cpp:689
 #, c-format
 msgid "%s - Connection Status"
 msgstr "%s - Stare Conexiune"
 
-#: clientgui/BOINCBaseFrame.cpp:699
+#: BOINCBaseFrame.cpp:700
 #, 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"
 "To connect up to your local computer please use 'localhost' as the host name."
-msgstr ""
-"%s nu este conectat la un client %s.\n"
-"Vă rugăm folosiţi opţiunea din meniu 'Avansat\\Selectaţi Calculator...' pentru a vă conecta la un client %s.\n"
-"Pentru a vă conecta la calculatorul local folosiţi 'localhst' ca şi nume gazdă."
+msgstr "%s nu este conectat la un client %s.\nVă rugăm folosiţi opţiunea din meniu 'Avansat\\Selectaţi Calculator...' pentru a vă conecta la un client %s.\nPentru a vă conecta la calculatorul local folosiţi 'localhst' ca şi nume gazdă."
 
-#: clientgui/BOINCBaseView.cpp:752
+#: BOINCBaseView.cpp:779
 msgid "Project web pages"
 msgstr "Pagini web proiect"
 
-#: clientgui/BOINCClientManager.cpp:573
+#: BOINCClientManager.cpp:575
 #, c-format
 msgid "%s - Unexpected Exit"
 msgstr "%s - Închidere Neaşteptată"
 
-#: clientgui/BOINCClientManager.cpp:583
+#: BOINCClientManager.cpp:585
 #, 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 ""
-"Clientul %s s-a închis neaşteptat de 3 ori în ultimele %d minute.\n"
-"Doriţi să îl restartaţi din nou?"
+msgstr "Clientul %s s-a închis neaşteptat de 3 ori în ultimele %d minute.\nDoriţi să îl restartaţi din nou?"
 
-#: clientgui/BOINCDialupManager.cpp:61
+#: BOINCDialupManager.cpp:61
 #, c-format
 msgid "%s - Network Status"
 msgstr "%s - Stare Reţea"
 
-#: clientgui/BOINCDialupManager.cpp:241
+#: BOINCDialupManager.cpp:241
 #, c-format
 msgid ""
 "%s needs to connect to the Internet.\n"
 "May it do so now?"
-msgstr ""
-"%s necesită să se conecteze la Internet.\n"
-"Poate face asta acum?"
+msgstr "%s necesită să se conecteze la Internet.\nPoate face asta acum?"
 
-#: clientgui/BOINCDialupManager.cpp:254
+#: BOINCDialupManager.cpp:254
 #, c-format
 msgid "%s is connecting to the Internet."
 msgstr "%s se conectează la Internet."
 
-#: clientgui/BOINCDialupManager.cpp:303
+#: BOINCDialupManager.cpp:303
 #, c-format
 msgid "%s has successfully connected to the Internet."
 msgstr "%s s-a conectat cu succes la Internet."
 
-#: clientgui/BOINCDialupManager.cpp:331
+#: BOINCDialupManager.cpp:331
 #, c-format
 msgid "%s failed to connect to the Internet."
 msgstr "%s nu a reuşit să se conecteze la Internet."
 
-#: clientgui/BOINCDialupManager.cpp:372
+#: 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 a detectat că acum este conectat la Internet.\n"
-"Actualizează toate proiectele şi reîncearcă toate transferurile."
+msgstr "%s a detectat că acum este conectat la Internet.\nActualizează toate proiectele şi reîncearcă toate transferurile."
 
-#: clientgui/BOINCDialupManager.cpp:417
+#: BOINCDialupManager.cpp:417
 #, c-format
 msgid "%s has successfully disconnected from the Internet."
 msgstr "%s s-a deconectat cu succes de la Internet."
 
-#: clientgui/BOINCDialupManager.cpp:433
+#: BOINCDialupManager.cpp:433
 #, c-format
 msgid "%s failed to disconnected from the Internet."
 msgstr "%s nu a reuşit să se deconecteze de la Internet."
 
-#: clientgui/BOINCGUIApp.cpp:595
+#: BOINCGUIApp.cpp:339
 #, c-format
 msgid ""
 "You currently are not authorized to manage the client.\n"
@@ -827,867 +750,798 @@ msgid ""
 " or\n"
 "  - contact your administrator to add you to the 'boinc_master'\n"
 "     user group."
-msgstr ""
-"Nu sunteţi autoriza să gestionaţi clientul.\n"
-"\n"
-"Pentru a rula %s pe acest utilizator vă rugăm:\n"
-"  - reinstalaţi %s răspunzând \"Da\" la întrebarea despre\n"
-"     utilizatori ne-administrativi \n"
-" sau\n"
-"  - contactaţi administratorul pentru a vă adăuga în grupul de utilizatori\n"
-"     'boinc_master'."
-
-#: clientgui/BOINCGUIApp.cpp:601
+msgstr "Nu sunteţi autoriza să gestionaţi clientul.\n\nPentru a rula %s pe acest utilizator vă rugăm:\n  - reinstalaţi %s răspunzând \"Da\" la întrebarea despre\n     utilizatori ne-administrativi \n sau\n  - contactaţi administratorul pentru a vă adăuga în grupul de utilizatori\n     'boinc_master'."
+
+#: BOINCGUIApp.cpp:345
 #, c-format
 msgid ""
 "%s ownership or permissions are not set properly; please reinstall %s.\n"
 "(Error code %d"
-msgstr ""
-"%s proprietatea sau permisiunile nu sunt setate corespunzător; vă rugăm reinstalaţi %s.\n"
-"(Cod eroare %d"
+msgstr "%s proprietatea sau permisiunile nu sunt setate corespunzător; vă rugăm reinstalaţi %s.\n(Cod eroare %d"
 
-#: clientgui/BOINCGUIApp.cpp:607
+#: BOINCGUIApp.cpp:351
 msgid " at "
 msgstr " la "
 
-#: clientgui/BOINCGUIApp.cpp:610
+#: BOINCGUIApp.cpp:354 MainDocument.cpp:2484 MainDocument.cpp:2534
+#: MainDocument.cpp:2554 ViewTransfers.cpp:803
 msgid ")"
 msgstr ")"
 
-#: clientgui/BOINCGUIApp.cpp:640
+#: BOINCGUIApp.cpp:384
 msgid ""
 "A reboot is required in order for BOINC to run properly.\n"
 "Please reboot your computer and try again."
-msgstr ""
-"O repornire a calculatorului este necesară pentru ca BOINC să ruleze corespunzător.\n"
-"Vă rugăm reporniţi calculatorul şi încercaţi din nou."
+msgstr "O repornire a calculatorului este necesară pentru ca BOINC să ruleze corespunzător.\nVă rugăm reporniţi calculatorul şi încercaţi din nou."
 
-#: clientgui/BOINCGUIApp.cpp:641
+#: BOINCGUIApp.cpp:385 DlgAbout.cpp:153
 msgid "BOINC Manager"
 msgstr "BOINC Manager"
 
-#: clientgui/BOINCGUIApp.cpp:902
+#: BOINCGUIApp.cpp:572
 msgid "BOINC Manager was started by the operating system automatically"
 msgstr "Managerul BOINC a fost pornit automat de către sistemul de operare"
 
-#: clientgui/BOINCGUIApp.cpp:904
+#: BOINCGUIApp.cpp:574
 msgid "Startup BOINC so only the system tray icon is visible"
 msgstr "Rulează BOINC numai în System Tray"
 
-#: clientgui/BOINCGUIApp.cpp:906
+#: BOINCGUIApp.cpp:576
 msgid "Directory containing the BOINC Client executable"
 msgstr "Directorul care conţine executabilul Clientului BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:907
+#: BOINCGUIApp.cpp:577
 msgid "BOINC data directory"
 msgstr "Director date BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:909
+#: BOINCGUIApp.cpp:579
 msgid "Host name or IP address"
 msgstr "Nume gazdă sau adresă IP"
 
-#: clientgui/BOINCGUIApp.cpp:910
+#: BOINCGUIApp.cpp:580
 msgid "GUI RPC port number"
 msgstr "număr port GUI RPC"
 
-#: clientgui/BOINCGUIApp.cpp:911
+#: BOINCGUIApp.cpp:581
 msgid "Password"
 msgstr "Parola"
 
-#: clientgui/BOINCGUIApp.cpp:912
+#: BOINCGUIApp.cpp:582
 msgid "Startup BOINC with these optional arguments"
 msgstr "Porneşte BOINC cu aceste argumente opţionale"
 
-#: clientgui/BOINCGUIApp.cpp:913
+#: BOINCGUIApp.cpp:583
 msgid "disable BOINC security users and permissions"
 msgstr "dezactivează utilizatorii şi permisiunile de securitate BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:914
+#: BOINCGUIApp.cpp:584
 msgid "set skin debugging mode to enable skin manager error messages"
 msgstr "setează skin în modul de depanare pentru a activa mesajele de eroare ale managerului de skin-uri"
 
-#: clientgui/BOINCGUIApp.cpp:915
+#: BOINCGUIApp.cpp:585
 msgid "multiple instances of BOINC Manager allowed"
 msgstr "sunt permise mai multe insanţe ale Managerului BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:917
+#: BOINCGUIApp.cpp:587
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr "Nefolosit: soluţie temporară pentru bug în XCode 4.2"
 
-#: clientgui/BOINCGUIApp.cpp:1164
+#: BOINCGUIApp.cpp:814
 msgid "(Automatic Detection)"
 msgstr "(Detectare Automata)"
 
-#: clientgui/BOINCGUIApp.cpp:1165
+#: BOINCGUIApp.cpp:815
 msgid "(Unknown)"
 msgstr "(Necunoscut)"
 
-#: clientgui/BOINCGUIApp.cpp:1166
+#: BOINCGUIApp.cpp:816
 msgid "(User Defined)"
 msgstr "(Definit de utilizator)"
 
-#: clientgui/BOINCTaskBar.cpp:522
+#: BOINCTaskBar.cpp:508
 #, c-format
 msgid "Open %s Web..."
 msgstr "Deschide %s Web..."
 
-#: clientgui/BOINCTaskBar.cpp:529
+#: BOINCTaskBar.cpp:515
 #, c-format
 msgid "Open %s..."
 msgstr "Deschide %s..."
 
-#: clientgui/BOINCTaskBar.cpp:536
-#: clientgui/BOINCTaskBar.cpp:633
-#: clientgui/BOINCTaskBar.cpp:641
+#: BOINCTaskBar.cpp:522 BOINCTaskBar.cpp:619 BOINCTaskBar.cpp:627
 msgid "Snooze"
 msgstr "Dormi"
 
-#: clientgui/BOINCTaskBar.cpp:538
-#: clientgui/BOINCTaskBar.cpp:660
-#: clientgui/BOINCTaskBar.cpp:668
+#: BOINCTaskBar.cpp:524 BOINCTaskBar.cpp:646 BOINCTaskBar.cpp:654
 msgid "Snooze GPU"
 msgstr "GPU Dormi"
 
-#: clientgui/BOINCTaskBar.cpp:556
+#: BOINCTaskBar.cpp:542
 msgid "E&xit"
 msgstr "I&eşire"
 
-#: clientgui/BOINCTaskBar.cpp:626
+#: BOINCTaskBar.cpp:612 ViewProjects.cpp:718 ViewWork.cpp:795
+#: sg_BoincSimpleFrame.cpp:758 sg_ProjectCommandPopup.cpp:110
+#: sg_TaskCommandPopup.cpp:102
 msgid "Resume"
 msgstr "Reluare"
 
-#: clientgui/BOINCTaskBar.cpp:653
+#: BOINCTaskBar.cpp:639
 msgid "Resume GPU"
 msgstr "Reluare GPU"
 
-#: clientgui/BOINCTaskBar.cpp:727
+#: BOINCTaskBar.cpp:713
 msgid "Computing is enabled"
 msgstr "Calculele sunt active"
 
-#: clientgui/BOINCTaskBar.cpp:731
+#: BOINCTaskBar.cpp:717
 msgid "Computing is suspended - "
 msgstr "Calculele sunt suspendate - "
 
-#: clientgui/BOINCTaskBar.cpp:741
+#: BOINCTaskBar.cpp:727
 msgid "GPU computing is enabled"
 msgstr "Calculele GPU sunt active"
 
-#: clientgui/BOINCTaskBar.cpp:744
+#: BOINCTaskBar.cpp:730
 msgid "GPU computing is suspended - "
 msgstr "Calculele GPU sunt suspendate - "
 
-#: clientgui/BOINCTaskBar.cpp:753
+#: BOINCTaskBar.cpp:739
 msgid "Network is enabled"
 msgstr "Accesul la reţea este pornit"
 
-#: clientgui/BOINCTaskBar.cpp:756
+#: BOINCTaskBar.cpp:742
 msgid "Network is suspended - "
 msgstr "Accesul la reţea este suspendat - "
 
-#: clientgui/BOINCTaskBar.cpp:764
+#: BOINCTaskBar.cpp:750
 msgid "Reconnecting to client."
 msgstr "Se reconectează la client."
 
-#: clientgui/BOINCTaskBar.cpp:766
+#: BOINCTaskBar.cpp:752
 msgid "Not connected to a client."
 msgstr "Nu este conectat la client."
 
-#: clientgui/BOINCTaskBar.cpp:819
+#: BOINCTaskBar.cpp:805
 #, c-format
 msgid "%s Notices"
 msgstr "%s Anunţuri"
 
-#: clientgui/BOINCTaskBar.cpp:825
+#: BOINCTaskBar.cpp:811
 msgid "There are new notices - click to view."
 msgstr "Există anunţuri noi - apăsaţi pentru vizualizare."
 
-#: clientgui/CompletionErrorPage.cpp:199
+#: CompletionErrorPage.cpp:199
 msgid "Failed to add project"
 msgstr "Adăugarea proiectului a eşuat"
 
-#: clientgui/CompletionErrorPage.cpp:204
+#: CompletionErrorPage.cpp:204
 msgid "Failed to update account manager"
 msgstr "Actualizarea managerului de cont a eşuat"
 
-#: clientgui/CompletionErrorPage.cpp:208
+#: CompletionErrorPage.cpp:208
 msgid "Failed to remove account manager"
 msgstr "Ştergerea managerului de cont a eşuat"
 
-#: clientgui/CompletionErrorPage.cpp:212
+#: CompletionErrorPage.cpp:212
 msgid "Failed to add account manager"
 msgstr "Adăugarea managerului de cont a eşuat"
 
-#: clientgui/CompletionErrorPage.cpp:221
+#: CompletionErrorPage.cpp:221
 msgid ""
 "Please try again later.\n"
 "\n"
 "Click Finish to close."
-msgstr ""
-"Vă rugăm încercaţi mai târziu.\n"
-"\n"
-"Apăsaţi Finalizare pentru a închide."
+msgstr "Vă rugăm încercaţi mai târziu.\n\nApăsaţi Finalizare pentru a închide."
 
-#: clientgui/CompletionErrorPage.cpp:225
-#: clientgui/CompletionPage.cpp:222
-#: clientgui/CompletionPage.cpp:242
-#: clientgui/CompletionPage.cpp:273
+#: CompletionErrorPage.cpp:225 CompletionPage.cpp:222 CompletionPage.cpp:242
+#: CompletionPage.cpp:273
 msgid "Click Finish to close."
 msgstr "Apăsaţi Finalizare pentru a inchide."
 
-#: clientgui/CompletionErrorPage.cpp:234
+#: CompletionErrorPage.cpp:234
 msgid "Messages from server:"
 msgstr "Mesaje de la server:"
 
-#: clientgui/CompletionPage.cpp:207
+#: CompletionPage.cpp:207
 msgid "Project added"
 msgstr "Proiect adăugat"
 
-#: clientgui/CompletionPage.cpp:213
+#: CompletionPage.cpp:213
 msgid "This project has been successfully added."
 msgstr "Acest proiect a fost adăugat cu succes."
 
-#: clientgui/CompletionPage.cpp:218
+#: 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 ""
-"Cand apăsati butonul Finalizare, browserul dumneavoastră va incărca o pagină unde \n"
-"puteţi seta numele contului dvs. si preferinţele."
+msgstr "Cand apăsati butonul Finalizare, browserul dumneavoastră va incărca o pagină unde \nputeţi seta numele contului dvs. si preferinţele."
 
-#: clientgui/CompletionPage.cpp:232
+#: CompletionPage.cpp:232
 #, c-format
 msgid "Update from %s completed."
 msgstr "Actualizarea de la %s s-a încheiat."
 
-#: clientgui/CompletionPage.cpp:236
+#: CompletionPage.cpp:236
 msgid "Update completed."
 msgstr "Actualizare încheiată."
 
-#: clientgui/CompletionPage.cpp:247
+#: CompletionPage.cpp:247
 msgid "Now using account manager"
 msgstr "Acum se foloseşte manageruul de cont"
 
-#: clientgui/CompletionPage.cpp:252
+#: CompletionPage.cpp:252
 #, c-format
 msgid "Welcome to %s!"
 msgstr "Bine aţi venit la %s!"
 
-#: clientgui/CompletionPage.cpp:263
+#: CompletionPage.cpp:263
 #, c-format
 msgid "You are now using %s to manage accounts."
 msgstr "Acum folosiţi %s pentru a gestiona conturile."
 
-#: clientgui/CompletionPage.cpp:267
+#: CompletionPage.cpp:267
 msgid "You are now using this account manager."
 msgstr "Acum folosiţi acest manager de cont."
 
-#: clientgui/DlgAbout.cpp:113
+#: DlgAbout.cpp:113 mac/Mac_GUI.cpp:96
 #, c-format
 msgid "About %s"
 msgstr "Despre %s"
 
-#: clientgui/DlgAbout.cpp:172
+#: DlgAbout.cpp:172
 msgid "Version:"
 msgstr "Versiunea:"
 
-#: clientgui/DlgAbout.cpp:180
+#: DlgAbout.cpp:180
 msgid "wxWidgets Version:"
 msgstr "Versiune wxWidgets:"
 
-#: clientgui/DlgAbout.cpp:188
+#: DlgAbout.cpp:188
 msgid "Copyright:"
 msgstr "Drepturi de autor:"
 
-# 98%
-#: clientgui/DlgAbout.cpp:192
+#: DlgAbout.cpp:192
 msgid ""
-"(C) 2003-2014 University of California, Berkeley.\n"
+"(C) 2003-2013 University of California, Berkeley.\n"
 "All Rights Reserved."
-msgstr ""
-"(C) 2003-2014 Universitatea California, Berkeley.\n"
-"Toate drepturile rezervate."
+msgstr "(C) 2003-2013 Universitatea California, Berkeley.\nToate drepturile rezervate."
 
-#: clientgui/DlgAbout.cpp:196
+#: DlgAbout.cpp:196
 msgid "Berkeley Open Infrastructure for Network Computing"
 msgstr "Berkeley Open Infrastructure for Network Computing"
 
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:399
-#: clientgui/DlgSelectComputer.cpp:163
+#: DlgAbout.cpp:208 DlgExitMessage.cpp:173 DlgGenericMessage.cpp:120
+#: DlgOptions.cpp:396 DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "&OK"
 
-#: clientgui/DlgAdvPreferences.cpp:602
+#: DlgAdvPreferences.cpp:544
 msgid "invalid number"
 msgstr "număr invalid"
 
-#: clientgui/DlgAdvPreferences.cpp:603
+#: DlgAdvPreferences.cpp:545
 msgid "invalid time, format is HH:MM"
 msgstr "timp invalid, formatul este HH:MM"
 
-#: clientgui/DlgAdvPreferences.cpp:604
+#: DlgAdvPreferences.cpp:546
 msgid "invalid time interval, format is HH:MM-HH:MM"
 msgstr "interval timp invalid, formatul este HH:MM-HH:MM"
 
-#: clientgui/DlgAdvPreferences.cpp:817
+#: DlgAdvPreferences.cpp:751
 msgid "invalid input value detected"
 msgstr "valoare introdusă invalidă detectată"
 
-#: clientgui/DlgAdvPreferences.cpp:819
+#: DlgAdvPreferences.cpp:753
 msgid "Validation Error"
 msgstr "Eroare Validare"
 
-#: clientgui/DlgAdvPreferences.cpp:969
-#: clientgui/DlgAdvPreferences.cpp:975
-#: clientgui/DlgAdvPreferences.cpp:981
+#: DlgAdvPreferences.cpp:885 DlgAdvPreferences.cpp:891
+#: DlgAdvPreferences.cpp:897
 msgid "Applications to add"
 msgstr "Aplicaţii de adăugat"
 
-#: clientgui/DlgAdvPreferences.cpp:998
+#: DlgAdvPreferences.cpp:914
 #, c-format
 msgid "'%s' is not an executable application."
 msgstr "'%s' nu este o aplicaţie executabilă."
 
-#: clientgui/DlgAdvPreferences.cpp:999
-#: clientgui/DlgAdvPreferences.cpp:1046
-#: clientgui/DlgAdvPreferences.cpp:1070
+#: DlgAdvPreferences.cpp:915 DlgAdvPreferences.cpp:962
+#: DlgAdvPreferences.cpp:986
 msgid "Add Exclusive App"
 msgstr "Adaugă Aplicaţie Exclusivă"
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Name of application to add?"
 msgstr "Numele aplicaţiei de adăugat?"
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Add exclusive app"
 msgstr "Adaugă aplicaţie exclusiva"
 
-#: clientgui/DlgAdvPreferences.cpp:1045
+#: DlgAdvPreferences.cpp:961
 #, c-format
 msgid "Application names must end with '%s'"
 msgstr "Numele aplicaţiilor trebuie să se termine cu '%s'"
 
-#: clientgui/DlgAdvPreferences.cpp:1069
+#: DlgAdvPreferences.cpp:985
 #, c-format
 msgid "'%s' is already in the list."
 msgstr "'%s' este deja în listă."
 
-#: clientgui/DlgAdvPreferences.cpp:1161
+#: DlgAdvPreferences.cpp:1077
 msgid ""
 "Do you really want to clear all local preferences?\n"
 "(This will not affect exclusive applications.)"
-msgstr ""
-"Sunteţi sigur că doriţi să ştergeţi toate preferinţele locale?\n"
-"(Acest lucru nu va afecta aplicaţiile exclusive.)"
+msgstr "Sunteţi sigur că doriţi să ştergeţi toate preferinţele locale?\n(Acest lucru nu va afecta aplicaţiile exclusive.)"
 
-#: clientgui/DlgAdvPreferences.cpp:1162
+#: DlgAdvPreferences.cpp:1078 sg_DlgPreferences.cpp:1030
 msgid "Confirmation"
 msgstr "Confirmare"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:49
+#: DlgAdvPreferencesBase.cpp:46 sg_DlgPreferences.cpp:946
 #, c-format
-msgid "%s - Computing preferences"
-msgstr "%s - Preferințe calcule"
+msgid "%s - Preferences"
+msgstr "%s - Preferinţe"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:66
+#: DlgAdvPreferencesBase.cpp:62
 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 ""
-"Acest dialog controlează preferinţele doar pentru acest calculator.\n"
-"Apăsaţi OK pentru a seta preferinţele.\n"
-"Apăsaţi Şterge pentru a restaura setările de pe web (excepţie aplicaţiile exclusive)."
+msgstr "Acest dialog controlează preferinţele doar pentru acest calculator.\nApăsaţi OK pentru a seta preferinţele.\nApăsaţi Şterge pentru a restaura setările de pe web (excepţie aplicaţiile exclusive)."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:69
+#: DlgAdvPreferencesBase.cpp:65 sg_DlgPreferences.cpp:428
 msgid "Clear"
 msgstr "Şterge"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:70
+#: DlgAdvPreferencesBase.cpp:66
 msgid "clear all local preferences and close the dialog"
 msgstr "şterge toate preferinţele locale şi închide dialogul"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:85
+#: DlgAdvPreferencesBase.cpp:81
 msgid "processor usage"
 msgstr "utilizare procesor"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:88
+#: DlgAdvPreferencesBase.cpp:84
 msgid "network usage"
 msgstr "utilizare reţea"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:91
+#: DlgAdvPreferencesBase.cpp:87
 msgid "disk and memory usage"
 msgstr "utilizare disc şi memorie"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:94
+#: DlgAdvPreferencesBase.cpp:90
 msgid "exclusive applications"
 msgstr "aplicaţii exclusive"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:107
-#: clientgui/DlgDiagnosticLogFlags.cpp:104
+#: DlgAdvPreferencesBase.cpp:102 sg_DlgPreferences.cpp:424
 msgid "OK"
 msgstr "OK"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:108
+#: DlgAdvPreferencesBase.cpp:103
 msgid "save all values and close the dialog"
 msgstr "salvează toate valorile şi închide dialogul"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:114
+#: DlgAdvPreferencesBase.cpp:108
 msgid "close the dialog without saving"
 msgstr "închide dialogul fără a salva"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:118
-#: clientgui/Localization.cpp:35
-#: clientgui/Localization.cpp:121
-#: clientgui/Localization.cpp:139
+#: DlgAdvPreferencesBase.cpp:112 Localization.cpp:35 Localization.cpp:121
+#: Localization.cpp:139 sg_BoincSimpleFrame.cpp:794 sg_DlgPreferences.cpp:439
 msgid "Help"
 msgstr "Ajutor"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
+#: DlgAdvPreferencesBase.cpp:113
 msgid "shows the preferences web page"
 msgstr "arată pagina web de preferinţe"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:141
+#: DlgAdvPreferencesBase.cpp:135
 msgid "Computing allowed"
 msgstr "Calcule permise"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
+#: DlgAdvPreferencesBase.cpp:139
 msgid "While computer is on batteries"
 msgstr "Atunci când calculatorul este pe baterii"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:149
-msgid "check this if you want this computer to do work while it runs on batteries"
+#: DlgAdvPreferencesBase.cpp:142
+msgid ""
+"check this if you want this computer to do work while it runs on batteries"
 msgstr "bifaţi aici dacă doriţi ca acest calculator să lucreze atunci când rulează pe baterii"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:155
+#: DlgAdvPreferencesBase.cpp:148
 msgid "While computer is in use"
 msgstr "Atunci când calculatorul este folosit"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:158
-msgid "check this if you want this computer to do work even when you're using it"
+#: DlgAdvPreferencesBase.cpp:151
+msgid ""
+"check this if you want this computer to do work even when you're using it"
 msgstr "bifaţi aici dacă doriţi ca acest calculator să lucreze atunci când îl folosiţi"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:164
+#: DlgAdvPreferencesBase.cpp:157
 msgid "Use GPU while computer is in use"
 msgstr "Folosiţi GPU când calculatorul este folosit"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:167
-msgid "check this if you want your GPU to do work even when you're using the computer"
+#: DlgAdvPreferencesBase.cpp:160
+msgid ""
+"check this if you want your GPU to do work even when you're using the "
+"computer"
 msgstr "bifaţi aici dacă doriţi ca GPU să lucreze atunci când folosiţi calculatorul"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:179
+#: DlgAdvPreferencesBase.cpp:172
 msgid "Only after computer has been idle for"
 msgstr "Doar după ce calculatorul a fost nefolosit timp de"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:188
-msgid "do work only after you haven't used the computer for this number of minutes"
+#: DlgAdvPreferencesBase.cpp:182
+msgid ""
+"do work only after you haven't used the computer for this number of minutes"
 msgstr "lucrează numai după ce calculatorul nu a fost folosit acest număr de minute"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:193
-#: clientgui/DlgAdvPreferencesBase.cpp:342
+#: DlgAdvPreferencesBase.cpp:187 DlgAdvPreferencesBase.cpp:336
+#: sg_DlgPreferences.cpp:417
 msgid "minutes"
 msgstr "minute"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:212
+#: DlgAdvPreferencesBase.cpp:206
 msgid "While processor usage is less than"
 msgstr "Atunci când utilizarea procesorului este mai mică de"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:221
+#: DlgAdvPreferencesBase.cpp:216
 msgid "suspend work if processor usage exceeds this level"
 msgstr "suspendaţi lucrul dacă utilizarea procesorului depăşeşte acest nivel"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:226
+#: DlgAdvPreferencesBase.cpp:221
 msgid "percent (0 means no restriction)"
 msgstr "procent (0 înseamnă fără restricţii)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:240
-#: clientgui/DlgAdvPreferencesBase.cpp:506
+#: DlgAdvPreferencesBase.cpp:235 DlgAdvPreferencesBase.cpp:496
 msgid "Every day between hours of"
 msgstr "În fiecare zi între orele"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: DlgAdvPreferencesBase.cpp:239
 msgid "start work at this time"
 msgstr "începe lucrul la această oră"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:248
-#: clientgui/DlgAdvPreferencesBase.cpp:514
+#: DlgAdvPreferencesBase.cpp:243 DlgAdvPreferencesBase.cpp:504
+#: sg_DlgPreferences.cpp:326 sg_DlgPreferences.cpp:348
 msgid "and"
 msgstr "şi"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:252
+#: DlgAdvPreferencesBase.cpp:247
 msgid "stop work at this time"
 msgstr "opreşte lucrul la această oră"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
-#: clientgui/DlgAdvPreferencesBase.cpp:522
+#: DlgAdvPreferencesBase.cpp:251 DlgAdvPreferencesBase.cpp:512
 msgid "(no restriction if equal)"
 msgstr "(fără restricţii dacă egale)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:261
-#: clientgui/DlgAdvPreferencesBase.cpp:527
+#: DlgAdvPreferencesBase.cpp:256 DlgAdvPreferencesBase.cpp:517
 msgid "Day-of-week override:"
 msgstr "Modificări ziua săptămânii:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:266
-#: clientgui/DlgAdvPreferencesBase.cpp:532
+#: DlgAdvPreferencesBase.cpp:261 DlgAdvPreferencesBase.cpp:522
 msgid "check box to specify hours for this day of week"
 msgstr "bifaţi căsuţa pentru a specifica orele pentru această zi a săptămânii"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:272
-#: clientgui/DlgAdvPreferencesBase.cpp:538
+#: DlgAdvPreferencesBase.cpp:267 DlgAdvPreferencesBase.cpp:528
 msgid "Monday"
 msgstr "Luni"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:279
-#: clientgui/DlgAdvPreferencesBase.cpp:545
+#: DlgAdvPreferencesBase.cpp:274 DlgAdvPreferencesBase.cpp:535
 msgid "Tuesday"
 msgstr "Marţi"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:286
-#: clientgui/DlgAdvPreferencesBase.cpp:552
+#: DlgAdvPreferencesBase.cpp:281 DlgAdvPreferencesBase.cpp:542
 msgid "Wednesday"
 msgstr "Miercuri"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:293
-#: clientgui/DlgAdvPreferencesBase.cpp:559
+#: DlgAdvPreferencesBase.cpp:288 DlgAdvPreferencesBase.cpp:549
 msgid "Thursday"
 msgstr "Joi"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:300
-#: clientgui/DlgAdvPreferencesBase.cpp:566
+#: DlgAdvPreferencesBase.cpp:295 DlgAdvPreferencesBase.cpp:556
 msgid "Friday"
 msgstr "Vineri"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:307
-#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: DlgAdvPreferencesBase.cpp:302 DlgAdvPreferencesBase.cpp:563
 msgid "Saturday"
 msgstr "Sâmbătă"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:580
+#: DlgAdvPreferencesBase.cpp:309 DlgAdvPreferencesBase.cpp:570
 msgid "Sunday"
 msgstr "Duminică"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:328
+#: DlgAdvPreferencesBase.cpp:323
 msgid "Other options"
 msgstr "Alte opţiuni"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:336
+#: DlgAdvPreferencesBase.cpp:330
 msgid "Switch between applications every"
 msgstr "Comută între aplicaţii la fiecare"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:345
+#: DlgAdvPreferencesBase.cpp:339
 msgid "On multiprocessor systems, use at most"
 msgstr "Pe sisteme multiprocesor, foloseşte maxim"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
+#: DlgAdvPreferencesBase.cpp:346
 #, no-c-format
-msgid "% of the processors (0 means no restriction)"
-msgstr "% din procesoare (0 înseamnă fără restricții)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:355
-#: clientgui/DlgAdvPreferencesBase.cpp:618
-#: clientgui/DlgAdvPreferencesBase.cpp:640
-#: clientgui/DlgAdvPreferencesBase.cpp:661
-#: clientgui/DlgAdvPreferencesBase.cpp:683
-#: clientgui/DlgAdvPreferencesBase.cpp:694
+msgid "% of the processors (0 means ignore this setting)"
+msgstr "% din procesoare (0 înseamnă să se ignore această setare)"
+
+#: DlgAdvPreferencesBase.cpp:349 DlgAdvPreferencesBase.cpp:605
+#: DlgAdvPreferencesBase.cpp:627 DlgAdvPreferencesBase.cpp:648
+#: DlgAdvPreferencesBase.cpp:669 DlgAdvPreferencesBase.cpp:679
 msgid "Use at most"
 msgstr "Foloseşte cel mult"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:362
+#: DlgAdvPreferencesBase.cpp:356
 #, no-c-format
-msgid "% of CPU time (0 means no restriction)"
-msgstr "% din timp CPU (0 înseamnă fără restricții)"
+msgid "% CPU time"
+msgstr "% timp CPU"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:386
+#: DlgAdvPreferencesBase.cpp:378
 msgid "General options"
 msgstr "Opţiuni generale"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:395
+#: DlgAdvPreferencesBase.cpp:386
 msgid "Maximum download rate"
 msgstr "Viteza maximă de descărcare"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:401
-#: clientgui/DlgAdvPreferencesBase.cpp:410
-msgid "KBytes/second (0 means no restriction)"
-msgstr "KBytes/secundă (0 înseamnă fără restricții)"
+#: DlgAdvPreferencesBase.cpp:392 DlgAdvPreferencesBase.cpp:401
+msgid "KBytes/sec."
+msgstr "KBytes/sec."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:404
+#: DlgAdvPreferencesBase.cpp:395
 msgid "Maximum upload rate"
 msgstr "Viteza maximă de încărcare"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:417
+#: DlgAdvPreferencesBase.cpp:406
+msgid "Transfer at most"
+msgstr "Transferă cel mult"
+
+#: DlgAdvPreferencesBase.cpp:412
+msgid "Mbytes"
+msgstr "Mbytes"
+
+#: DlgAdvPreferencesBase.cpp:415
+msgid "every"
+msgstr "fiecare"
+
+#: DlgAdvPreferencesBase.cpp:421 DlgAdvPreferencesBase.cpp:444
+#: DlgAdvPreferencesBase.cpp:463
+msgid "days"
+msgstr "zile"
+
+#: DlgAdvPreferencesBase.cpp:429
 msgid "Minimum work buffer"
 msgstr "Rezervă lucru minimă"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:425
+#: DlgAdvPreferencesBase.cpp:438
 msgid "Try to maintain enough tasks to keep busy for this many days"
 msgstr "Încearcă să menţină suficiente task-uri pentru a fi ocupat pentru atâtea zile"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:431
-#: clientgui/DlgAdvPreferencesBase.cpp:449
-msgid "days (maximum value: 10)"
-msgstr "zile (valoare maximă: 10)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:437
+#: DlgAdvPreferencesBase.cpp:450
 msgid "Max additional work buffer"
 msgstr "Rezervă lucru adiţională maximă"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:445
+#: DlgAdvPreferencesBase.cpp:459
 msgid "In addition, maintain enough tasks for up to this many days"
 msgstr "În plus, menţine suficiente tasl-uri pentru pâna la atâtea zile"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:454
-msgid "Transfer at most"
-msgstr "Transferă cel mult"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:462
-msgid "MBytes every"
-msgstr "MBytes fiecare"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:468
-msgid "days (0 means no restriction)"
-msgstr "zile 0 înseamnă fără restricţii)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:476
+#: DlgAdvPreferencesBase.cpp:466
 msgid "Skip image file verification"
 msgstr "Sări peste verificarea fişierelor imagine"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:478
+#: DlgAdvPreferencesBase.cpp:468
 msgid "check this if your Internet provider modifies image files"
 msgstr "bifează daca furnizorul de Internet modifică fişierele imagine"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:484
+#: DlgAdvPreferencesBase.cpp:476
 msgid "Connect options"
 msgstr "Opţiuni conectare"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:487
+#: DlgAdvPreferencesBase.cpp:478
 msgid "Confirm before connecting to internet"
 msgstr "Confirmare înainte de conectarea la internet"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
+#: DlgAdvPreferencesBase.cpp:480
+msgid ""
+"if checked, a confirmation dialog will be displayed before trying to connect"
+" to the Internet"
 msgstr "dacă este bifat, un dialog de confirmare va fi afişat înainte de a se încerca o conexiune la Internet"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:493
+#: DlgAdvPreferencesBase.cpp:484
 msgid "Disconnect when done"
 msgstr "Deconectează la finalizare"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:495
+#: DlgAdvPreferencesBase.cpp:486
 msgid ""
 "if checked, BOINC hangs up when network usage is done\n"
 "(only relevant for dialup-connection)"
-msgstr ""
-"dacă este bifat, BOINC închide atunci când utilizarea reţelei este finalizată\n"
-"(relevant doar pentru conexiune dialup)"
+msgstr "dacă este bifat, BOINC închide atunci când utilizarea reţelei este finalizată\n(relevant doar pentru conexiune dialup)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:501
+#: DlgAdvPreferencesBase.cpp:492
 msgid "Network usage allowed"
 msgstr "Acces reţea permis"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:510
+#: DlgAdvPreferencesBase.cpp:500
 msgid "network usage start hour"
 msgstr "acces reţea de la ora"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:518
+#: DlgAdvPreferencesBase.cpp:508
 msgid "network usage stop hour"
 msgstr "acces reţea până la ora"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:610
-#: clientgui/DlgItemProperties.cpp:257
+#: DlgAdvPreferencesBase.cpp:598 DlgItemProperties.cpp:231
 msgid "Disk usage"
 msgstr "Utilizare disc"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:622
+#: DlgAdvPreferencesBase.cpp:609
 msgid "the maximum disk space used by BOINC (in Gigabytes)"
 msgstr "spaţiul maxim pe disc folosit de BOINC (în Gigabytes)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:626
-msgid "Gigabytes disk space (0 means no restriction)"
-msgstr "Gigabytes spațiu disc (0 înseamnă fără restricții)"
+#: DlgAdvPreferencesBase.cpp:613
+msgid "Gigabytes disk space"
+msgstr "Gigabytes spaţiu disc"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:629
+#: DlgAdvPreferencesBase.cpp:616
 msgid "Leave at least"
 msgstr "Lasă cel puţin"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:633
+#: DlgAdvPreferencesBase.cpp:620
 msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
 msgstr "BOINC lasă cel puţin această cantitate de spaţiu pe dic liberă (în Gigabytes)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:637
+#: DlgAdvPreferencesBase.cpp:624
 msgid "Gigabytes disk space free"
 msgstr "Gigabytes spaţiu liber disc"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
+#: DlgAdvPreferencesBase.cpp:631
 msgid "BOINC uses at most this percentage of total disk space"
 msgstr "BOINC foloseşte cel mult acest procent din spaţiul total pe disc"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:649
+#: DlgAdvPreferencesBase.cpp:636
 #, no-c-format
 msgid "% of total disk space"
 msgstr "% din total spaţiu disc"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:652
+#: DlgAdvPreferencesBase.cpp:639
 msgid "Tasks checkpoint to disk at most every"
 msgstr "Task-urile crează punct de control pe disc cel mult la fiecare"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
+#: DlgAdvPreferencesBase.cpp:645
 msgid "seconds"
 msgstr "secunde"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:668
+#: DlgAdvPreferencesBase.cpp:655
 #, no-c-format
 msgid "% of page file (swap space)"
 msgstr "% of page file (spaţiu swap)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:675
+#: DlgAdvPreferencesBase.cpp:662
 msgid "Memory usage"
 msgstr "Utilizare memorie"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
+#: DlgAdvPreferencesBase.cpp:676
 #, no-c-format
 msgid "% when computer is in use"
 msgstr "% când calculatorul este folosit"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:701
+#: DlgAdvPreferencesBase.cpp:686
 #, no-c-format
 msgid "% when computer is idle"
 msgstr "% când calculatorul nu este folosit"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:706
+#: DlgAdvPreferencesBase.cpp:691
 msgid "Leave applications in memory while suspended"
 msgstr "Lasă aplicaţiile în memorie când sunt suspendate"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:708
+#: DlgAdvPreferencesBase.cpp:693
 msgid "if checked, suspended work units are left in memory"
 msgstr "dacă este bifat, unităţile de lucru sunt păstrate în memorie"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:728
-msgid "Suspend processor and network usage when these applications are running:"
+#: DlgAdvPreferencesBase.cpp:713
+msgid ""
+"Suspend processor and network usage when these applications are running:"
 msgstr "Suspendă folosirea procesorului şi a reţelei când rulează aceste aplicaţii:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:738
+#: DlgAdvPreferencesBase.cpp:722
 msgid "Add..."
 msgstr "Adaugă..."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:739
+#: DlgAdvPreferencesBase.cpp:723
 msgid "Add an application to this list"
 msgstr "Adaugă o aplicaţie la această listă"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:744
+#: DlgAdvPreferencesBase.cpp:728 ViewProjects.cpp:202
+#: sg_ProjectCommandPopup.cpp:85
 msgid "Remove"
 msgstr "Şterge"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:745
+#: DlgAdvPreferencesBase.cpp:729
 msgid "Remove an application from this list"
 msgstr "Şterge o aplicaţie din această listă"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:754
+#: DlgAdvPreferencesBase.cpp:738
 msgid "For advanced options, refer to "
 msgstr "Pentru opţiuni avansate, consultaţi "
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:65
-#, c-format
-msgid "%s Diagnostic Log Flags"
-msgstr "%s Markere Log Diagnostic"
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:83
-msgid "These flags enable various types of diagnostic messages in the Event Log."
-msgstr "Aceste markere activează diverse tipuri de mesaje de diagnostic în Log-ul de Evenimente."
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:105
-msgid "Save all values and close the dialog"
-msgstr "Salvează toate valorile şi închide dialogul"
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:108
-msgid "Defaults"
-msgstr "Implicit"
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:109
-msgid "Restore default settings"
-msgstr "Restaurează setările implicite"
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:113
-msgid "Close the dialog without saving"
-msgstr "Închide dialogul fără a salva"
-
-#: clientgui/DlgEventLog.cpp:226
+#: DlgEventLog.cpp:219
 #, c-format
 msgid "%s - Event Log"
 msgstr "%s - Jurnal Evenimente"
 
-#: clientgui/DlgEventLog.cpp:236
+#: DlgEventLog.cpp:232 ViewMessages.cpp:117 ViewProjects.cpp:219
+#: ViewStatistics.cpp:435 ViewStatistics.cpp:2009 ViewTransfers.cpp:182
+#: ViewWork.cpp:232
 msgid "Project"
 msgstr "Proiect"
 
-#: clientgui/DlgEventLog.cpp:237
+#: DlgEventLog.cpp:233 ViewMessages.cpp:118
 msgid "Time"
 msgstr "Timp"
 
-#: clientgui/DlgEventLog.cpp:238
+#: DlgEventLog.cpp:234 ViewMessages.cpp:119
 msgid "Message"
 msgstr "Mesaj"
 
-#: clientgui/DlgEventLog.cpp:300
-#: clientgui/DlgEventLog.cpp:364
+#: DlgEventLog.cpp:290 DlgEventLog.cpp:354
 msgid "&Show only this project"
 msgstr "&Arată doar acest proiect"
 
-#: clientgui/DlgEventLog.cpp:304
+#: DlgEventLog.cpp:294
 msgid "Copy &All"
 msgstr "Copi&ază Tot"
 
-#: clientgui/DlgEventLog.cpp:306
-#: clientgui/DlgEventLog.cpp:310
+#: DlgEventLog.cpp:296 DlgEventLog.cpp:300 ViewMessages.cpp:89
 msgid "Copy all the messages to the clipboard."
 msgstr "Copiază toate mesajele in clipboard."
 
-#: clientgui/DlgEventLog.cpp:315
+#: DlgEventLog.cpp:305
 msgid "Copy &Selected"
 msgstr "Copiază &Selectate"
 
-#: clientgui/DlgEventLog.cpp:318
-#: clientgui/DlgEventLog.cpp:326
-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."
+#: DlgEventLog.cpp:308 DlgEventLog.cpp:316 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 "Copiază mesajele selectate in clipboard. Puteţi selecta mai multe mesaje prin apăsarea si menţinerea tastelor shift sau control în timp ce selectaţi cu mouse-ul mesajele."
 
-#: clientgui/DlgEventLog.cpp:320
-#: clientgui/DlgEventLog.cpp:328
-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."
+#: DlgEventLog.cpp:310 DlgEventLog.cpp:318 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 "Copiază mesajele selectate in clipboard. Puteţi selecta mai multe mesaje prin apăsarea si menţinerea tastelor shift sau control în timp ce selectaţi cu mouse-ul mesajele."
 
-#: clientgui/DlgEventLog.cpp:335
-#: clientgui/DlgItemProperties.cpp:67
+#: DlgEventLog.cpp:325 DlgItemProperties.cpp:67
 msgid "&Close"
 msgstr "&Închide"
 
-#: clientgui/DlgEventLog.cpp:344
+#: DlgEventLog.cpp:334 sg_BoincSimpleFrame.cpp:798 sg_DlgPreferences.cpp:442
 #, c-format
 msgid "Get help with %s"
 msgstr "Ajutor cu %s"
 
-#: clientgui/DlgEventLog.cpp:358
+#: DlgEventLog.cpp:348
 msgid "Show all &messages"
 msgstr "Arată toate &mesajele"
 
-#: clientgui/DlgEventLog.cpp:359
-#: clientgui/DlgEventLog.cpp:361
+#: DlgEventLog.cpp:349 DlgEventLog.cpp:351
 msgid "Show messages for all projects"
 msgstr "Arată mesaje de la toate proiectele"
 
-#: clientgui/DlgEventLog.cpp:365
-#: clientgui/DlgEventLog.cpp:367
+#: DlgEventLog.cpp:355 DlgEventLog.cpp:357
 msgid "Show only the messages for the selected project"
 msgstr "Arată doar mesajele pentru proiectul selectat"
 
-#: clientgui/DlgExitMessage.cpp:82
+#: DlgExitMessage.cpp:82
 #, c-format
 msgid "%s - Exit Confirmation"
 msgstr "%s - Confirmare Ieşire"
 
-#: clientgui/DlgExitMessage.cpp:130
+#: DlgExitMessage.cpp:130
 #, c-format
 msgid ""
 "You have requested to exit the %s,\n"
@@ -1696,15 +1550,9 @@ msgid ""
 "\n"
 "If you also want to stop running the tasks,\n"
 "choose from the following options:"
-msgstr ""
-"Aţi cerut să închideţi %s,\n"
-"care vă permite să vizualizaţi şi să gestionaţi\n"
-"task-urile care rulează pe calculatorul dumneavoastră.\n"
-"\n"
-"Dacă doriţi să opriţi şi rularea task-urilor,\n"
-"alegeţi din următoarele opţiuni:"
+msgstr "Aţi cerut să închideţi %s,\ncare vă permite să vizualizaţi şi să gestionaţi\ntask-urile care rulează pe calculatorul dumneavoastră.\n\nDacă doriţi să opriţi şi rularea task-urilor,\nalegeţi din următoarele opţiuni:"
 
-#: clientgui/DlgExitMessage.cpp:135
+#: DlgExitMessage.cpp:135
 #, c-format
 msgid ""
 "This will shut down %s and its tasks until either the\n"
@@ -1713,1000 +1561,916 @@ msgid ""
 "In most cases, it is better just to close the %s window\n"
 "rather than to exit the application; that will allow %s to run its\n"
 "tasks at the times you selected in your preferences."
-msgstr ""
-"Se va opri %s şi task-urile sale până când fie\n"
-"%s sau screensaver-ul %s va rula din nou.\n"
-"\n"
-"În cele mai multe cazuri, este mai bine doar să închideţi fereastra %s\n"
-"decât să închideţi aplicaţia; asta va permite %s să-şi ruleze\n"
-"task-urile conform intervalelor de timp selectate în preferinţe."
+msgstr "Se va opri %s şi task-urile sale până când fie\n%s sau screensaver-ul %s va rula din nou.\n\nÎn cele mai multe cazuri, este mai bine doar să închideţi fereastra %s\ndecât să închideţi aplicaţia; asta va permite %s să-şi ruleze\ntask-urile conform intervalelor de timp selectate în preferinţe."
 
-#: clientgui/DlgExitMessage.cpp:153
+#: DlgExitMessage.cpp:153
 #, c-format
 msgid "Stop running tasks when exiting the %s"
 msgstr "Opriţi rularea task-urilor când închideţi %s"
 
-#: clientgui/DlgExitMessage.cpp:165
+#: DlgExitMessage.cpp:165
 msgid "Remember this decision and do not show this dialog."
 msgstr "Ţine minte această decizie şi nu mai arăta acest dialog."
 
-#: clientgui/DlgExitMessage.cpp:178
-#: clientgui/DlgGenericMessage.cpp:125
-#: clientgui/DlgOptions.cpp:404
-#: clientgui/DlgSelectComputer.cpp:168
+#: DlgExitMessage.cpp:178 DlgGenericMessage.cpp:125 DlgOptions.cpp:401
+#: DlgSelectComputer.cpp:168 wizardex.cpp:378
 msgid "&Cancel"
 msgstr "&Renunţă"
 
-#: clientgui/DlgGenericMessage.cpp:112
+#: DlgGenericMessage.cpp:112
 msgid "Don't show this dialog again."
 msgstr "Nu arăta acest dialog din nou."
 
-#: clientgui/DlgItemProperties.cpp:194
-#: clientgui/DlgItemProperties.cpp:197
-#: clientgui/DlgItemProperties.cpp:200
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:168 DlgItemProperties.cpp:171
+#: DlgItemProperties.cpp:174 DlgItemProperties.cpp:177
 msgid "Don't fetch tasks for "
 msgstr "Nu vor fi luate task-uri noi pentru "
 
-#: clientgui/DlgItemProperties.cpp:194
+#: DlgItemProperties.cpp:168
 msgid "Project preference"
 msgstr "Preferinţe proiect"
 
-#: clientgui/DlgItemProperties.cpp:197
+#: DlgItemProperties.cpp:171
 msgid "Account manager preference"
 msgstr "Preferinţe manager de cont"
 
-#: clientgui/DlgItemProperties.cpp:200
+#: DlgItemProperties.cpp:174
 msgid "Project has no apps for "
 msgstr "Proiectul nu are aplicaţii pentru "
 
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:177
 msgid "Client configuration excludes "
 msgstr "Configurarea client exclude "
 
-#: clientgui/DlgItemProperties.cpp:207
+#: DlgItemProperties.cpp:181
 msgid " work fetch deferred for"
 msgstr " preluarea de lucru amânată pentru"
 
-#: clientgui/DlgItemProperties.cpp:208
+#: DlgItemProperties.cpp:182
 msgid " work fetch deferral interval"
 msgstr " interval amânare preluare lucru"
 
-#: clientgui/DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:213
 msgid "Properties of project "
 msgstr "Proprietăţi ale proiectului "
 
-#: clientgui/DlgItemProperties.cpp:243
-#: clientgui/DlgOptions.cpp:221
+#: DlgItemProperties.cpp:217 DlgOptions.cpp:218
 msgid "General"
 msgstr "General"
 
-#: clientgui/DlgItemProperties.cpp:244
+#: DlgItemProperties.cpp:218
 msgid "Master URL"
 msgstr "URL Principal"
 
-#: clientgui/DlgItemProperties.cpp:245
+#: DlgItemProperties.cpp:219
 msgid "User name"
 msgstr "Nume utilizator"
 
-#: clientgui/DlgItemProperties.cpp:246
+#: DlgItemProperties.cpp:220
 msgid "Team name"
 msgstr "Nume echipă"
 
-#: clientgui/DlgItemProperties.cpp:247
+#: DlgItemProperties.cpp:221 ViewProjects.cpp:224
 msgid "Resource share"
 msgstr "Resurse partajate"
 
-#: clientgui/DlgItemProperties.cpp:249
+#: DlgItemProperties.cpp:223
 msgid "Scheduler RPC deferred for"
 msgstr "RPC Planificator amânat pentru"
 
-#: clientgui/DlgItemProperties.cpp:252
+#: DlgItemProperties.cpp:226
 msgid "File downloads deferred for"
 msgstr "Descărcările de fişiere amânate pentru"
 
-#: clientgui/DlgItemProperties.cpp:255
+#: DlgItemProperties.cpp:229
 msgid "File uploads deferred for"
 msgstr "Încărcările de fişiere amânate pentru"
 
-#: clientgui/DlgItemProperties.cpp:258
+#: DlgItemProperties.cpp:232
 msgid "Computer ID"
 msgstr "ID calculator"
 
-#: clientgui/DlgItemProperties.cpp:260
+#: DlgItemProperties.cpp:234
 msgid "Non CPU intensive"
 msgstr "CPU neintensiv"
 
-#: 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
+#: DlgItemProperties.cpp:234 DlgItemProperties.cpp:236
+#: DlgItemProperties.cpp:237 DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:242 DlgItemProperties.cpp:251
+#: DlgItemProperties.cpp:254 DlgItemProperties.cpp:257
 msgid "yes"
 msgstr "da"
 
-#: clientgui/DlgItemProperties.cpp:262
+#: DlgItemProperties.cpp:236
 msgid "Suspended via GUI"
 msgstr "Suspendat din GUI"
 
-#: clientgui/DlgItemProperties.cpp:262
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:236 DlgItemProperties.cpp:237
 msgid "no"
 msgstr "nu"
 
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:237
 msgid "Don't request more work"
 msgstr "Nu cere mai mult de lucru"
 
-#: clientgui/DlgItemProperties.cpp:265
+#: DlgItemProperties.cpp:239
 msgid "Scheduler call in progress"
 msgstr "Apel planificator în curs"
 
-#: clientgui/DlgItemProperties.cpp:268
+#: DlgItemProperties.cpp:242
 msgid "Trickle-up pending"
 msgstr "Trickle-up în aşteptare"
 
-#: clientgui/DlgItemProperties.cpp:271
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:245 DlgItemProperties.cpp:247
 msgid "Host location"
 msgstr "Locaţie gazdă"
 
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:247
 msgid "default"
 msgstr "implicit"
 
-#: clientgui/DlgItemProperties.cpp:277
+#: DlgItemProperties.cpp:251
 msgid "Added via account manager"
 msgstr "Adăugat prin manager de cont"
 
-#: clientgui/DlgItemProperties.cpp:280
+#: DlgItemProperties.cpp:254
 msgid "Remove when tasks done"
 msgstr "Şterge când task-urile sunt gata"
 
-#: clientgui/DlgItemProperties.cpp:283
+#: DlgItemProperties.cpp:257
 msgid "Ended"
 msgstr "Finalizat"
 
-#: clientgui/DlgItemProperties.cpp:285
-msgid "Tasks completed"
-msgstr "Sarcini încheiate"
-
-#: clientgui/DlgItemProperties.cpp:286
-msgid "Tasks failed"
-msgstr ""
-
-#: clientgui/DlgItemProperties.cpp:288
+#: DlgItemProperties.cpp:259
 msgid "Credit"
 msgstr "Credit"
 
-#: clientgui/DlgItemProperties.cpp:289
+#: DlgItemProperties.cpp:260
 msgid "User"
 msgstr "Utilizator"
 
-#: clientgui/DlgItemProperties.cpp:296
+#: DlgItemProperties.cpp:267
 msgid "Host"
 msgstr "Gazdă"
 
-#: clientgui/DlgItemProperties.cpp:305
+#: DlgItemProperties.cpp:276
 msgid "Scheduling"
 msgstr "Planificare"
 
-#: clientgui/DlgItemProperties.cpp:306
+#: DlgItemProperties.cpp:277
 msgid "Scheduling priority"
 msgstr "Prioritate planificare"
 
-#: clientgui/DlgItemProperties.cpp:307
+#: DlgItemProperties.cpp:278
 msgid "CPU"
 msgstr "CPU"
 
-#: clientgui/DlgItemProperties.cpp:331
+#: DlgItemProperties.cpp:302
 msgid "Duration correction factor"
 msgstr "Factor corecţie durată"
 
-#: clientgui/DlgItemProperties.cpp:345
+#: DlgItemProperties.cpp:316
 msgid "Properties of task "
 msgstr "Propietăţi ale task-ului "
 
-#: clientgui/DlgItemProperties.cpp:357
+#: DlgItemProperties.cpp:328 ViewWork.cpp:238
 msgid "Application"
 msgstr "Aplicaţia"
 
-#: clientgui/DlgItemProperties.cpp:358
+#: DlgItemProperties.cpp:329 ViewWork.cpp:239
 msgid "Name"
 msgstr "Nume"
 
-#: clientgui/DlgItemProperties.cpp:359
+#: DlgItemProperties.cpp:330
 msgid "State"
 msgstr "Stare"
 
-#: clientgui/DlgItemProperties.cpp:362
+#: DlgItemProperties.cpp:333
 msgid "Received"
 msgstr "Primit"
 
-#: clientgui/DlgItemProperties.cpp:365
+#: DlgItemProperties.cpp:336
 msgid "Report deadline"
 msgstr "Ultima zi pentru raport"
 
-#: clientgui/DlgItemProperties.cpp:367
+#: DlgItemProperties.cpp:338
 msgid "Resources"
 msgstr "Resurse"
 
-#: clientgui/DlgItemProperties.cpp:370
+#: DlgItemProperties.cpp:341
 msgid "Estimated computation size"
 msgstr "Volum calcul estimat"
 
-#: clientgui/DlgItemProperties.cpp:373
+#: DlgItemProperties.cpp:344
 msgid "CPU time at last checkpoint"
 msgstr "Timp CPU la ultimul punct de control"
 
-#: clientgui/DlgItemProperties.cpp:374
-#: clientgui/DlgItemProperties.cpp:389
+#: DlgItemProperties.cpp:345 DlgItemProperties.cpp:360
 msgid "CPU time"
 msgstr "Timp CPU"
 
-#: clientgui/DlgItemProperties.cpp:376
-#: clientgui/DlgItemProperties.cpp:390
+#: DlgItemProperties.cpp:347 DlgItemProperties.cpp:361
 msgid "Elapsed time"
 msgstr "Timp scurs"
 
-#: clientgui/DlgItemProperties.cpp:378
+#: DlgItemProperties.cpp:349
 msgid "Estimated time remaining"
 msgstr "Timp rămas estimat"
 
-#: clientgui/DlgItemProperties.cpp:379
+#: DlgItemProperties.cpp:350
 msgid "Fraction done"
 msgstr "Proporţie finalizat"
 
-#: clientgui/DlgItemProperties.cpp:380
+#: DlgItemProperties.cpp:351
 msgid "Virtual memory size"
 msgstr "Dimensiune memorie virtuală"
 
-#: clientgui/DlgItemProperties.cpp:381
+#: DlgItemProperties.cpp:352
 msgid "Working set size"
 msgstr "Dimensiune memorie de lucru"
 
-#: clientgui/DlgItemProperties.cpp:383
+#: DlgItemProperties.cpp:354
 msgid "Directory"
 msgstr "Director"
 
-#: clientgui/DlgItemProperties.cpp:386
+#: DlgItemProperties.cpp:357
 msgid "Process ID"
 msgstr "ID Proces"
 
-#: clientgui/DlgItemProperties.cpp:456
+#: DlgItemProperties.cpp:427 ViewWork.cpp:1032 sg_TaskPanel.cpp:823
 msgid "Local: "
 msgstr "Local: "
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: DlgOptions.cpp:129 DlgOptions.cpp:135
 msgid "Options"
 msgstr "Opţiuni"
 
-#: clientgui/DlgOptions.cpp:178
+#: DlgOptions.cpp:175
 msgid "Language:"
 msgstr "Limba:"
 
-#: clientgui/DlgOptions.cpp:185
+#: DlgOptions.cpp:182
 msgid "What language should BOINC use?"
 msgstr "Ce limbă să folosească BOINC?"
 
-#: clientgui/DlgOptions.cpp:189
+#: DlgOptions.cpp:186
 msgid "Notice reminder interval:"
 msgstr "Interval reamintere anunţuri:"
 
-#: clientgui/DlgOptions.cpp:196
+#: DlgOptions.cpp:193
 msgid "How often should BOINC remind you of new notices?"
 msgstr "Cât de des trebuie ca BOINC să vă reamintească de noile anunţuri?"
 
-#: clientgui/DlgOptions.cpp:201
+#: DlgOptions.cpp:198
 msgid "Run Manager at login?"
 msgstr "Rulează Manager la login?"
 
-#: clientgui/DlgOptions.cpp:207
+#: DlgOptions.cpp:204
 msgid "Run the BOINC Manager when you log on."
 msgstr "Rulează Manager BOINC la login."
 
-#: clientgui/DlgOptions.cpp:212
+#: DlgOptions.cpp:209
 msgid "Enable Manager exit dialog?"
 msgstr "Activează dialog ieşire Manager?"
 
-#: clientgui/DlgOptions.cpp:218
+#: DlgOptions.cpp:215
 msgid "Display the exit dialog when shutting down the Manager."
 msgstr "Afişează dialogul de ieşire la închiderea Managerului."
 
-#: clientgui/DlgOptions.cpp:229
+#: DlgOptions.cpp:226
 msgid "Dial-up and Virtual Private Network settings"
 msgstr "Setări Dial-up si Virtual Private Network"
 
-#: clientgui/DlgOptions.cpp:243
+#: DlgOptions.cpp:240
 msgid "&Set Default"
 msgstr "&Setează ca implicit"
 
-#: clientgui/DlgOptions.cpp:248
+#: DlgOptions.cpp:245
 msgid "&Clear Default"
 msgstr "Anulează setarea impli&cită"
 
-#: clientgui/DlgOptions.cpp:255
+#: DlgOptions.cpp:252
 msgid "Default Connection:"
 msgstr "Conexiune implicită:"
 
-#: clientgui/DlgOptions.cpp:262
+#: DlgOptions.cpp:259
 msgid "Connections"
 msgstr "Conexiuni"
 
-#: clientgui/DlgOptions.cpp:271
+#: DlgOptions.cpp:268
 msgid "Connect via HTTP proxy server"
 msgstr "Conectare prin HTTP proxy server"
 
-#: clientgui/DlgOptions.cpp:275
+#: DlgOptions.cpp:272
 msgid "HTTP Proxy Server Configuration"
 msgstr "Configurare HTTP Proxy server"
 
-#: clientgui/DlgOptions.cpp:283
-#: clientgui/DlgOptions.cpp:347
+#: DlgOptions.cpp:280 DlgOptions.cpp:344
 msgid "Address:"
 msgstr "Adresa:"
 
-#: clientgui/DlgOptions.cpp:291
-#: clientgui/DlgOptions.cpp:355
+#: DlgOptions.cpp:288 DlgOptions.cpp:352 ProxyPage.cpp:340 ProxyPage.cpp:360
 msgid "Port:"
 msgstr "Port:"
 
-#: clientgui/DlgOptions.cpp:299
-#: clientgui/DlgOptions.cpp:363
+#: DlgOptions.cpp:296 DlgOptions.cpp:360
 msgid "Don't use proxy for:"
 msgstr "Nu folosi proxy pentru:"
 
-#: clientgui/DlgOptions.cpp:306
-#: clientgui/DlgOptions.cpp:370
+#: DlgOptions.cpp:303 DlgOptions.cpp:367
 msgid "Leave these blank if not needed"
 msgstr "Nu completaţi dacă nu e necesar"
 
-#: clientgui/DlgOptions.cpp:312
-#: clientgui/DlgOptions.cpp:376
+#: DlgOptions.cpp:309 DlgOptions.cpp:373 ProxyPage.cpp:343 ProxyPage.cpp:363
 msgid "User Name:"
 msgstr "Nume utilizator:"
 
-#: clientgui/DlgOptions.cpp:320
-#: clientgui/DlgOptions.cpp:384
-#: clientgui/DlgSelectComputer.cpp:152
+#: DlgOptions.cpp:317 DlgOptions.cpp:381 DlgSelectComputer.cpp:152
+#: ProxyPage.cpp:346 ProxyPage.cpp:366
 msgid "Password:"
 msgstr "Parola:"
 
-#: clientgui/DlgOptions.cpp:327
+#: DlgOptions.cpp:324
 msgid "HTTP Proxy"
 msgstr "Proxy HTTP"
 
-#: clientgui/DlgOptions.cpp:335
+#: DlgOptions.cpp:332
 msgid "Connect via SOCKS proxy server"
 msgstr "Conectare prin SOCKS proxy server"
 
-#: clientgui/DlgOptions.cpp:339
+#: DlgOptions.cpp:336
 msgid "SOCKS Proxy Server Configuration"
 msgstr "Configurare SOCKS Proxy server"
 
-#: clientgui/DlgOptions.cpp:391
+#: DlgOptions.cpp:388
 msgid "SOCKS Proxy"
 msgstr "Proxy SOCKS"
 
-#: clientgui/DlgOptions.cpp:589
+#: DlgOptions.cpp:586
 msgid "always"
 msgstr "întotdeauna"
 
-#: clientgui/DlgOptions.cpp:590
+#: DlgOptions.cpp:587
 msgid "1 hour"
 msgstr "1 oră"
 
-#: clientgui/DlgOptions.cpp:591
+#: DlgOptions.cpp:588
 msgid "6 hours"
 msgstr "6 ore"
 
-#: clientgui/DlgOptions.cpp:592
+#: DlgOptions.cpp:589
 msgid "1 day"
 msgstr "1 zi"
 
-#: clientgui/DlgOptions.cpp:593
+#: DlgOptions.cpp:590
 msgid "1 week"
 msgstr "1 săptămână"
 
-#: clientgui/DlgOptions.cpp:594
+#: DlgOptions.cpp:591
 msgid "never"
 msgstr "niciodată"
 
-#: clientgui/DlgOptions.cpp:691
+#: DlgOptions.cpp:688
 #, c-format
 msgid "%s - Language Selection"
 msgstr "%s - Selecţie Limbă"
 
-#: clientgui/DlgOptions.cpp:698
+#: DlgOptions.cpp:695
 #, 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 "Setările de limbă ale %s au fost modificate.  Pentru ca acestea să aibă efect, trebuie să reponiţi %s."
 
-#: clientgui/DlgSelectComputer.cpp:91
+#: DlgSelectComputer.cpp:91
 #, c-format
 msgid "%s - Select Computer"
 msgstr "%s - Selectează Calculator"
 
-#: clientgui/DlgSelectComputer.cpp:125
+#: DlgSelectComputer.cpp:125
 #, c-format
 msgid ""
 "Another instance of %s is already running \n"
 "on this computer.  Please select a client to monitor."
-msgstr ""
-"O altă instanţă de %s rulează deja \n"
-"pe acest calculator.  Vă rugăm selectaţi un client pentru monitorizare."
+msgstr "O altă instanţă de %s rulează deja \npe acest calculator.  Vă rugăm selectaţi un client pentru monitorizare."
 
-#: clientgui/DlgSelectComputer.cpp:143
+#: DlgSelectComputer.cpp:143
 msgid "Host name:"
 msgstr "Nume host:"
 
-#: clientgui/Localization.cpp:31
-#: clientgui/Localization.cpp:69
+#: Localization.cpp:31 Localization.cpp:69
 msgid "Message boards"
 msgstr "Panouri de mesaje"
 
-#: clientgui/Localization.cpp:33
+#: Localization.cpp:33
 msgid "Correspond with other users on the SETI at home message boards"
 msgstr "Corespondează cu alţi useri de pe panourile de mesaje SETI at home"
 
-#: clientgui/Localization.cpp:37
+#: Localization.cpp:37
 msgid "Ask questions and report problems"
 msgstr "Intrebări şi probleme"
 
-#: clientgui/Localization.cpp:39
-#: clientgui/Localization.cpp:81
-#: clientgui/Localization.cpp:111
-#: clientgui/Localization.cpp:129
+#: Localization.cpp:39 Localization.cpp:81 Localization.cpp:111
+#: Localization.cpp:129
 msgid "Your account"
 msgstr "Contul dumneavoastră"
 
-#: clientgui/Localization.cpp:41
-#: clientgui/Localization.cpp:87
-#: clientgui/Localization.cpp:113
+#: Localization.cpp:41 Localization.cpp:87 Localization.cpp:113
 msgid "View your account information and credit totals"
 msgstr "Vizualizaţii informaţii despre cont si total credit"
 
-#: clientgui/Localization.cpp:43
+#: Localization.cpp:43
 msgid "Your preferences"
 msgstr "Preferinţele dumneavoastră"
 
-#: clientgui/Localization.cpp:45
+#: Localization.cpp:45
 msgid "View and modify your SETI at home account profile and preferences"
 msgstr "Vizualizaţi şi modificaţi profilul si preferinţele contului dumneavoastră SETI at home"
 
-#: clientgui/Localization.cpp:47
-#: clientgui/Localization.cpp:89
+#: Localization.cpp:47 Localization.cpp:89
 msgid "Your results"
 msgstr "Rezultatele dumneavoastră"
 
-#: clientgui/Localization.cpp:49
-#: clientgui/Localization.cpp:91
+#: Localization.cpp:49 Localization.cpp:91
 msgid "View your last week (or more) of computational results and work"
 msgstr "Vizualizaţii rezultatele procesării din ultima saptamană (sau mai mult)"
 
-#: clientgui/Localization.cpp:51
-#: clientgui/Localization.cpp:93
+#: Localization.cpp:51 Localization.cpp:93
 msgid "Your computers"
 msgstr "Computerele dumneavoastră"
 
-#: clientgui/Localization.cpp:53
+#: Localization.cpp:53
 msgid "View a listing of all the computers on which you are running SETI at Home"
 msgstr "Vizualizaţi toate computerele dumneavoastră pe care rulează SETI at Home"
 
-#: clientgui/Localization.cpp:55
-#: clientgui/Localization.cpp:97
+#: Localization.cpp:55 Localization.cpp:97
 msgid "Your team"
 msgstr "Echipa dumneavoastră"
 
-#: clientgui/Localization.cpp:57
-#: clientgui/Localization.cpp:99
+#: Localization.cpp:57 Localization.cpp:99
 msgid "View information about your team"
 msgstr "Vizualizaţi informaţii despre echipa dumneavoastră"
 
-#: clientgui/Localization.cpp:61
+#: Localization.cpp:61
 msgid "Common questions"
 msgstr "Întrebări comune"
 
-#: clientgui/Localization.cpp:63
+#: Localization.cpp:63
 msgid "Read the Einstein at Home Frequently Asked Question list"
 msgstr "Citeşte lista Întrebărilor Frecvente Einstein at Home"
 
-#: clientgui/Localization.cpp:65
+#: Localization.cpp:65
 msgid "Screensaver info"
 msgstr "Informaţii screensaver"
 
-#: clientgui/Localization.cpp:67
+#: Localization.cpp:67
 msgid "Read a detailed description of the Einstein at Home screensaver"
 msgstr "Citiţi o descriere detaliată a screensaver-ului Einstein at Home"
 
-#: clientgui/Localization.cpp:71
-msgid "Correspond with admins and other users on the Einstein at Home message boards"
+#: Localization.cpp:71
+msgid ""
+"Correspond with admins and other users on the Einstein at Home message boards"
 msgstr "Corespondaţi cu administratori şi alţi utilizatori pe forumurile Einstein at Home"
 
-#: clientgui/Localization.cpp:73
+#: Localization.cpp:73
 msgid "Einstein status"
 msgstr "Stare Einstein"
 
-#: clientgui/Localization.cpp:75
+#: Localization.cpp:75
 msgid "Current status of the Einstein at Home server"
 msgstr "Stare curentă server Einstein at Home"
 
-#: clientgui/Localization.cpp:77
+#: Localization.cpp:77
 msgid "Report problems"
 msgstr "Raportează probleme"
 
-#: clientgui/Localization.cpp:79
+#: Localization.cpp:79
 msgid "A link to the Einstein at Home problems and bug reports message board"
 msgstr "O legătură către forumul de probleme şi erori Einstein at Home"
 
-#: clientgui/Localization.cpp:83
+#: Localization.cpp:83
 msgid "View and modify your Einstein at Home account profile and preferences"
 msgstr "Vizualizaţi şi modificaţi profilul si preferinţele contului dumneavoastră Einstein at Home"
 
-#: clientgui/Localization.cpp:85
+#: Localization.cpp:85
 msgid "Account summary"
 msgstr "Sumar cont"
 
-#: clientgui/Localization.cpp:95
-msgid "View a listing of all the computers on which you are running Einstein at Home"
+#: Localization.cpp:95
+msgid ""
+"View a listing of all the computers on which you are running Einstein at Home"
 msgstr "Vizualizaţi toate computerele dumneavoastră pe care rulează Einstein at Home"
 
-#: clientgui/Localization.cpp:101
+#: Localization.cpp:101
 msgid "LIGO project"
 msgstr "Proiectul LIGO"
 
-#: clientgui/Localization.cpp:103
-msgid "The home page of the Laser Interferometer Gravitational-wave Observatory (LIGO) project"
+#: Localization.cpp:103
+msgid ""
+"The home page of the Laser Interferometer Gravitational-wave Observatory "
+"(LIGO) project"
 msgstr "Pagina principală a proiectului Laser Interferometer Gravitational-wave Observatory (LIGO)"
 
-#: clientgui/Localization.cpp:105
+#: Localization.cpp:105
 msgid "GEO-600 project"
 msgstr "Proiectul GEO-600"
 
-#: clientgui/Localization.cpp:107
+#: Localization.cpp:107
 msgid "The home page of the GEO-600 project"
 msgstr "Pagina principală a proiectului GEO-600"
 
-#: clientgui/Localization.cpp:115
-#: clientgui/Localization.cpp:133
+#: Localization.cpp:115 Localization.cpp:133 ViewProjects.cpp:221
+#: ViewStatistics.cpp:465
 msgid "Team"
 msgstr "Echipa"
 
-#: clientgui/Localization.cpp:117
+#: Localization.cpp:117
 msgid "Info about your Team"
 msgstr "Informaţii despre Echipa dumneavoastră"
 
-#: clientgui/Localization.cpp:123
+#: Localization.cpp:123
 msgid "Get help for climateprediction.net"
 msgstr "Ajutor pentru climateprediction.net"
 
-#: clientgui/Localization.cpp:125
+#: Localization.cpp:125
 msgid "News"
 msgstr "Ştiri"
 
-#: clientgui/Localization.cpp:127
+#: Localization.cpp:127
 msgid "climateprediction.net News"
 msgstr "Ştiri climateprediction.net"
 
-#: clientgui/Localization.cpp:131
+#: Localization.cpp:131
 msgid "View your account information, credits, and trickles"
 msgstr "Vizualizaţi informaţiile despre cont, credite şi trickles"
 
-#: clientgui/Localization.cpp:135
+#: Localization.cpp:135
 msgid "Info about your team"
 msgstr "Informaţii despre echipa dumneavoastră"
 
-#: clientgui/Localization.cpp:141
+#: Localization.cpp:141
 msgid "Search for help in our help system"
 msgstr "Caută ajutor în sistemul nostru de ajutor"
 
-#: clientgui/Localization.cpp:143
+#: Localization.cpp:143
 msgid "Global Statistics"
 msgstr "Statistici Globale"
 
-#: clientgui/Localization.cpp:145
+#: Localization.cpp:145
 msgid "Summary statistics for World Community Grid"
 msgstr "Sumar statistici pentru World Community Grid"
 
-#: clientgui/Localization.cpp:147
+#: Localization.cpp:147
 msgid "My Grid"
 msgstr "Grid-ul Meu"
 
-#: clientgui/Localization.cpp:149
+#: Localization.cpp:149
 msgid "Your statistics and settings"
 msgstr "Statisticile şi setările dumneavoastră"
 
-#: clientgui/Localization.cpp:151
+#: Localization.cpp:151
 msgid "Device Profiles"
 msgstr "Profiluri Echipamente"
 
-#: clientgui/Localization.cpp:153
+#: Localization.cpp:153
 msgid "Update your device settings"
 msgstr "Actualizaţi setările echipamentelor dumneavoastră"
 
-#: clientgui/Localization.cpp:155
+#: Localization.cpp:155
 msgid "Research"
 msgstr "Cercetare"
 
-#: clientgui/Localization.cpp:157
+#: Localization.cpp:157
 msgid "Learn about the projects hosted at World Community Grid"
 msgstr "Învăţaţi despre proecte găzduite de World Community Grid"
 
-#: clientgui/MainDocument.cpp:583
+#: MainDocument.cpp:583
 msgid "Starting client"
 msgstr "Se porneşte client"
 
-#: clientgui/MainDocument.cpp:591
+#: MainDocument.cpp:591
 msgid "Connecting to client"
 msgstr "Se conectează la client"
 
-#: clientgui/MainDocument.cpp:1205
+#: MainDocument.cpp:1195
 msgid "Retrieving system state; please wait..."
 msgstr "Recuperare informaţii despre starea sistemului; va rugam asteptaţi..."
 
-#: clientgui/MainDocument.cpp:1826
+#: MainDocument.cpp:1816
 msgid "Missing application"
 msgstr "Aplicaţie lipsă"
 
-#: clientgui/MainDocument.cpp:1827
-msgid "Please download and install the CoRD application from http://cord.sourceforge.net"
+#: MainDocument.cpp:1817
+msgid ""
+"Please download and install the CoRD application from "
+"http://cord.sourceforge.net"
 msgstr "Vă rugăm descărcaţi şi instalaţi aplicaţia CoRD de la http://cord.sourceforge.net"
 
-#: clientgui/MainDocument.cpp:2442
+#: MainDocument.cpp:2432
 msgid "on batteries"
 msgstr "pe baterii"
 
-#: clientgui/MainDocument.cpp:2443
+#: MainDocument.cpp:2433
 msgid "computer is in use"
 msgstr "calculatorul este folosit"
 
-#: clientgui/MainDocument.cpp:2444
+#: MainDocument.cpp:2434
 msgid "user request"
 msgstr "cerere utilizator"
 
-#: clientgui/MainDocument.cpp:2445
+#: MainDocument.cpp:2435
 msgid "time of day"
 msgstr "timpul zilei"
 
-#: clientgui/MainDocument.cpp:2446
+#: MainDocument.cpp:2436
 msgid "CPU benchmarks in progress"
 msgstr "Benchmarks CPU în curs"
 
-#: clientgui/MainDocument.cpp:2447
+#: MainDocument.cpp:2437
 msgid "need disk space - check preferences"
 msgstr "este nevoie de spaţiu pe disc - verificaţi preferinţele"
 
-#: clientgui/MainDocument.cpp:2448
+#: MainDocument.cpp:2438
 msgid "computer is not in use"
 msgstr "calculatorul nu este folosit"
 
-#: clientgui/MainDocument.cpp:2449
+#: MainDocument.cpp:2439
 msgid "starting up"
 msgstr "porneşte"
 
-#: clientgui/MainDocument.cpp:2450
+#: MainDocument.cpp:2440
 msgid "an exclusive app is running"
 msgstr "rulează o aplicaţie exclusivă"
 
-#: clientgui/MainDocument.cpp:2451
+#: MainDocument.cpp:2441
 msgid "CPU is busy"
 msgstr "CPU este ocupat"
 
-#: clientgui/MainDocument.cpp:2452
+#: MainDocument.cpp:2442
 msgid "network bandwidth limit exceeded"
 msgstr "limita lăţime bandă reţea depăşită"
 
-#: clientgui/MainDocument.cpp:2453
+#: MainDocument.cpp:2443
 msgid "requested by operating system"
 msgstr "cerut de sistemul de operare"
 
-#: clientgui/MainDocument.cpp:2455
+#: MainDocument.cpp:2445
 msgid "unknown reason"
 msgstr "motiv necunoscut"
 
-#: clientgui/MainDocument.cpp:2477
+#: MainDocument.cpp:2467
 msgid "GPU missing, "
 msgstr "GPU lipsă, "
 
-#: clientgui/MainDocument.cpp:2484
+#: MainDocument.cpp:2474
 msgid "New"
 msgstr "Nou"
 
-#: clientgui/MainDocument.cpp:2488
+#: MainDocument.cpp:2478
 msgid "Download failed"
 msgstr "Download-ul a eşuat"
 
-#: clientgui/MainDocument.cpp:2490
+#: MainDocument.cpp:2480
 msgid "Downloading"
 msgstr "In curs de download"
 
-#: clientgui/MainDocument.cpp:2492
-#: clientgui/MainDocument.cpp:2557
+#: MainDocument.cpp:2482 MainDocument.cpp:2552
 msgid " (suspended - "
 msgstr " (suspendat - "
 
-#: clientgui/MainDocument.cpp:2500
+#: MainDocument.cpp:2490
 msgid "Project suspended by user"
 msgstr "Proiect suspendat de utilizator"
 
-#: clientgui/MainDocument.cpp:2502
+#: MainDocument.cpp:2492
 msgid "Task suspended by user"
 msgstr "Task suspendat de utilizator"
 
-#: clientgui/MainDocument.cpp:2504
+#: MainDocument.cpp:2494
 msgid "Suspended - "
 msgstr "Suspendat - "
 
-# 75%
-#: clientgui/MainDocument.cpp:2510
+#: MainDocument.cpp:2500
 msgid "GPU suspended - "
 msgstr "GPU Suspendat - "
 
-#: clientgui/MainDocument.cpp:2517
+#: MainDocument.cpp:2507
 msgid "Waiting for memory"
 msgstr "În aşteptare de memorie"
 
-#: clientgui/MainDocument.cpp:2519
+#: MainDocument.cpp:2509
 msgid "Waiting for shared memory"
 msgstr "În aşteptare de memorie partajată"
 
-#: clientgui/MainDocument.cpp:2521
+#: MainDocument.cpp:2512
+msgid "Running, high priority"
+msgstr "Rulează, prioritate mare"
+
+#: MainDocument.cpp:2514
 msgid "Running"
 msgstr "Rulează"
 
-#: clientgui/MainDocument.cpp:2523
+#: MainDocument.cpp:2517
 msgid " (non-CPU-intensive)"
 msgstr " (CPU-neintensiv)"
 
-#: clientgui/MainDocument.cpp:2526
+#: MainDocument.cpp:2520
 msgid "Waiting to run"
 msgstr "Aşteaptă să ruleze"
 
-#: clientgui/MainDocument.cpp:2528
-#: clientgui/MainDocument.cpp:2534
+#: MainDocument.cpp:2522 MainDocument.cpp:2528
 msgid "Ready to start"
 msgstr "Gata de start"
 
-#: clientgui/MainDocument.cpp:2538
-msgid "Postponed: "
-msgstr ""
+#: MainDocument.cpp:2532
+msgid " (Scheduler wait: "
+msgstr " (Aşteptare planificator: "
 
-#: clientgui/MainDocument.cpp:2541
-msgid "Postponed"
-msgstr ""
+#: MainDocument.cpp:2536
+msgid " (Scheduler wait)"
+msgstr " (Aşteptare planificator)"
 
-#: clientgui/MainDocument.cpp:2545
-msgid "Waiting for network access"
-msgstr "În aşteptare de acces la reţea"
+#: MainDocument.cpp:2540
+msgid " (Waiting for network access)"
+msgstr " (În aşteptare de acces la reţea)"
 
-#: clientgui/MainDocument.cpp:2549
+#: MainDocument.cpp:2544
 msgid "Computation error"
 msgstr "Eroare de calcul"
 
-#: clientgui/MainDocument.cpp:2553
+#: MainDocument.cpp:2548
 msgid "Upload failed"
 msgstr "Upload-ul a eşuat"
 
-#: clientgui/MainDocument.cpp:2555
+#: MainDocument.cpp:2550
 msgid "Uploading"
 msgstr "In curs de upload"
 
-#: clientgui/MainDocument.cpp:2566
+#: MainDocument.cpp:2561
 msgid "Aborted by user"
 msgstr "Abandonat de utilizator"
 
-#: clientgui/MainDocument.cpp:2569
+#: MainDocument.cpp:2564
 msgid "Aborted by project"
 msgstr "Abandonat de proiect"
 
-#: clientgui/MainDocument.cpp:2572
+#: MainDocument.cpp:2567
 msgid "Aborted: not started by deadline"
 msgstr "Abandonat: nu a fost pornit până la termenul limită"
 
-#: clientgui/MainDocument.cpp:2575
+#: MainDocument.cpp:2570
 msgid "Aborted: disk limit exceeded"
 msgstr "Abandonat: limita de spaţiu pe disc depăşită"
 
-#: clientgui/MainDocument.cpp:2578
+#: MainDocument.cpp:2573
 msgid "Aborted: run time limit exceeded"
 msgstr "Abandonat: limita de timp de rulare depăşită"
 
-#: clientgui/MainDocument.cpp:2581
+#: MainDocument.cpp:2576
 msgid "Aborted: memory limit exceeded"
 msgstr "Abandonat: limita de memorie depăşită"
 
-#: clientgui/MainDocument.cpp:2584
+#: MainDocument.cpp:2579
 msgid "Aborted"
 msgstr "Abandonat"
 
-#: clientgui/MainDocument.cpp:2589
+#: MainDocument.cpp:2584
 msgid "Acknowledged"
 msgstr "Acreditat"
 
-#: clientgui/MainDocument.cpp:2591
+#: MainDocument.cpp:2586
 msgid "Ready to report"
 msgstr "Gata de raport"
 
-#: clientgui/MainDocument.cpp:2593
+#: MainDocument.cpp:2588
 #, c-format
 msgid "Error: invalid state '%d'"
 msgstr "Eroare: stare nevalidă cu codul '%d'"
 
-#: clientgui/NoInternetConnectionPage.cpp:179
+#: NoInternetConnectionPage.cpp:179
 msgid "No Internet connection"
 msgstr "Lipsă conexiune Internet"
 
-#: clientgui/NoInternetConnectionPage.cpp:182
+#: NoInternetConnectionPage.cpp:182
 msgid "Please connect to the Internet and try again."
 msgstr "Vă rugăm conectaţi-vă la Internet si reîncercaţi."
 
-#: clientgui/NotDetectedPage.cpp:181
+#: NotDetectedPage.cpp:181
 msgid "Project not found"
 msgstr "Proiectul nu a fost găsit"
 
-#: clientgui/NotDetectedPage.cpp:184
+#: 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 ""
-"URL-ul furnizat nu este al unui proiect BOINC.\n"
-"\n"
-"Vă rugăm verificaţi URL-ul şi încercaţi din nou."
+msgstr "URL-ul furnizat nu este al unui proiect BOINC.\n\nVă rugăm verificaţi URL-ul şi încercaţi din nou."
 
-#: clientgui/NotDetectedPage.cpp:188
+#: NotDetectedPage.cpp:188
 msgid "Account manager not found"
 msgstr "Nu s-a găsit managerul de cont"
 
-#: clientgui/NotDetectedPage.cpp:191
+#: NotDetectedPage.cpp:191
 msgid ""
 "The URL you supplied is not that of a BOINC-based account\n"
 "manager.\n"
 "\n"
 "Please check the URL and try again."
-msgstr ""
-"URL-ul furnizat nu este al unui manager de cont\n"
-"BOINC.\n"
-"\n"
-"Vă rugăm verificaţi URL-ul şi încercaţi din nou."
+msgstr "URL-ul furnizat nu este al unui manager de cont\nBOINC.\n\nVă rugăm verificaţi URL-ul şi încercaţi din nou."
 
-#: clientgui/NotFoundPage.cpp:181
+#: NotFoundPage.cpp:181
 msgid "Login Failed."
 msgstr "Login Eşuat."
 
-#: clientgui/NotFoundPage.cpp:185
+#: NotFoundPage.cpp:185
 msgid "Check the username and password, and try again."
 msgstr "Verificaţi numele de utilizator şi parola şi încercaţi din nou."
 
-#: clientgui/NotFoundPage.cpp:189
+#: NotFoundPage.cpp:189
 msgid "Check the email address and password, and try again."
 msgstr "Verificaţi adresa de email şi parola şi încercaţi din nou."
 
-#: clientgui/NoticeListCtrl.cpp:229
+#: NoticeListCtrl.cpp:222
 msgid "more..."
 msgstr "mai mult..."
 
-#: clientgui/ProjectInfoPage.cpp:221
+#: ProjectInfoPage.cpp:477 ProjectInfoPage.cpp:778 ProjectInfoPage.cpp:782
+msgid "All"
+msgstr "Tot"
+
+#: ProjectInfoPage.cpp:615
 msgid "Choose a project"
 msgstr "Alege un proiect"
 
-#: clientgui/ProjectInfoPage.cpp:228
+#: ProjectInfoPage.cpp:619
 msgid "To choose a project, click its name or type its URL below."
 msgstr "Pentru a alege un proiect, selectaţi numele sau introduceţi URL-ul mai jos."
 
-#: clientgui/ProjectInfoPage.cpp:246
+#: ProjectInfoPage.cpp:623
 msgid "Categories:"
 msgstr "Categorii:"
 
-#: clientgui/ProjectInfoPage.cpp:267
+#: ProjectInfoPage.cpp:627 sg_ProjectPanel.cpp:89
 msgid "Projects:"
 msgstr "Proiecte:"
 
-#: clientgui/ProjectInfoPage.cpp:279
+#: ProjectInfoPage.cpp:631
 msgid "Project details"
 msgstr "Detalii proiect"
 
-#: clientgui/ProjectInfoPage.cpp:291
+#: ProjectInfoPage.cpp:635
 msgid "Research area:"
 msgstr "Zona de cercetare:"
 
-#: clientgui/ProjectInfoPage.cpp:302
+#: ProjectInfoPage.cpp:639
 msgid "Organization:"
 msgstr "Organizaţie:"
 
-#: clientgui/ProjectInfoPage.cpp:313
+#: ProjectInfoPage.cpp:643
 msgid "Web site:"
 msgstr "Site web:"
 
-#: clientgui/ProjectInfoPage.cpp:325
+#: ProjectInfoPage.cpp:647
 msgid "Supported systems:"
 msgstr "Sisteme suportate:"
 
-#: clientgui/ProjectInfoPage.cpp:363
+#: ProjectInfoPage.cpp:651
 msgid "Project URL:"
 msgstr "URL proiect:"
 
-#: clientgui/ProjectInfoPage.cpp:499
-#: clientgui/ProjectInfoPage.cpp:754
-#: clientgui/ProjectInfoPage.cpp:758
-msgid "All"
-msgstr "Tot"
-
-#: clientgui/ProjectInfoPage.cpp:802
-msgid "This project may not have work for your type of computer.  Do you want to add it anyway?"
+#: ProjectInfoPage.cpp:826
+msgid ""
+"This project may not have work for your type of computer.  Do you want to "
+"add it anyway?"
 msgstr "Acest proiect s-ar putea să nu aibă de lucru pentru tipul dumneavoastră de calculator.  Doriţi să-l adăugaţi oricum?"
 
-#: clientgui/ProjectInfoPage.cpp:826
+#: ProjectInfoPage.cpp:850
 msgid "You already added this project. Please choose a different project."
 msgstr "Aţi adăugat deja acest proiect. Vă rugăm alegeţi un alt proiect."
 
-#: clientgui/ProjectProcessingPage.cpp:321
+#: ProjectProcessingPage.cpp:321
 msgid "Communicating with project."
 msgstr "Se comunică cu proiectul."
 
-#: clientgui/ProjectProcessingPage.cpp:510
+#: ProjectProcessingPage.cpp:509
 msgid "Required files not found on the server."
 msgstr "Fişierele necesare nu s-au găsit pe server."
 
-#: clientgui/ProjectProcessingPage.cpp:513
-#: clientgui/ProjectProcessingPage.cpp:586
+#: ProjectProcessingPage.cpp:512 ProjectProcessingPage.cpp:574
 msgid "An internal server error has occurred."
 msgstr "A apărut o eroare internă server."
 
-#: clientgui/ProjectPropertiesPage.cpp:334
+#: ProjectPropertiesPage.cpp:334
 msgid ""
 "Communicating with project\n"
 "Please wait..."
-msgstr ""
-"În curs de comunicare cu proiectul\n"
-"Vă rugăm să asteptaţi..."
-
-#: clientgui/ProjectWelcomePage.cpp:251
-#, c-format
-msgid "Welcome to %s."
-msgstr "Bine aţi venit la %s."
-
-#: clientgui/ProjectWelcomePage.cpp:254
-msgid "You have volunteered to compute for this project:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:255
-msgid "Name:"
-msgstr "Nume:"
-
-#: clientgui/ProjectWelcomePage.cpp:258
-msgid "Home:"
-msgstr "Acasă:"
-
-#: clientgui/ProjectWelcomePage.cpp:262
-msgid "Description:"
-msgstr "Descriere:"
-
-#: clientgui/ProjectWelcomePage.cpp:265
-msgid "URL:"
-msgstr "URL:"
-
-#: clientgui/ProjectWelcomePage.cpp:268
-msgid "User:"
-msgstr "Utilizator:"
+msgstr "În curs de comunicare cu proiectul\nVă rugăm să asteptaţi..."
 
-#: clientgui/ProjectWelcomePage.cpp:273
-msgid "WARNING: This project is not registered with BOINC.  Make sure you trust it before continuing."
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:277
-msgid "To continue, click Next."
-msgstr "Pentru a continua, apăsaţi Următorul."
-
-#: clientgui/ProxyInfoPage.cpp:195
+#: ProxyInfoPage.cpp:195
 msgid "Network communication failure"
 msgstr "Comunicare in reţea esuată"
 
-#: clientgui/ProxyInfoPage.cpp:199
+#: ProxyInfoPage.cpp:199
 msgid ""
 "The World Community Grid - BOINC software failed to communicate\n"
 "over the Internet. The most likely reasons are:\n"
@@ -2721,22 +2485,9 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"Programul World Community Grid - BOINC nu a reuşit să comunice\n"
-"prin Internet. Cele mai probabile cauze sunt:\n"
-"\n"
-"1) Probleme de conectivitate.  Verificaţi conexiunea la reţea sau modem\n"
-"şi apoi apăsaţi Înapoi pentru a reîncerca.\n"
-"\n"
-"2) Un program firewall personal blochează programul World Community\n"
-"Grid - BOINC.  Configuraţi firewall-ul personal să permită\n"
-"BOINC şi Managerului BOINC să comunice pe portul 80 şi portul 443\n"
-"şi apoi apăsaţi Înapoi pentru a reîncerca.\n"
-"\n"
-"3) Folosiţi un server proxy.\n"
-"Apăsaţi Următorul pentru a configura setările proxy ale BOINC."
+msgstr "Programul World Community Grid - BOINC nu a reuşit să comunice\nprin Internet. Cele mai probabile cauze sunt:\n\n1) Probleme de conectivitate.  Verificaţi conexiunea la reţea sau modem\nşi apoi apăsaţi Înapoi pentru a reîncerca.\n\n2) Un program firewall personal blochează programul World Community\nGrid - BOINC.  Configuraţi firewall-ul personal să permită\nBOINC şi Managerului BOINC să comunice pe portul 80 şi portul 443\nşi apoi apăsaţi Înapoi pentru a reîncerca.\n\n3) Folosiţ [...]
 
-#: clientgui/ProxyInfoPage.cpp:203
+#: ProxyInfoPage.cpp:203
 msgid ""
 "BOINC failed to communicate on the Internet.\n"
 "The most likely reasons are:\n"
@@ -2751,1909 +2502,1201 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"BOINC nu a putut comunica prin Internet.\n"
-"Cele mai probabile cauze sunt:\n"
-"\n"
-"1) Probleme de conectivitate.  Verificaţi conexiunea la reţea \n"
-"sau modem şi apoi apăsaţi Înapoi pentru a reîncerca.\n"
-"\n"
-"2) Un program firewall personal blochează programul BOINC.\n"
-"Configuraţi firewall-ul personal să permită\n"
-"BOINC şi Managerului BOINC să comunice pe portul 80 \n"
-"şi apoi apăsaţi Înapoi pentru a reîncerca.\n"
-"\n"
-"3) Folosiţi un server proxy.\n"
-"Apăsaţi Următorul pentru a configura setările proxy ale BOINC."
+msgstr "BOINC nu a putut comunica prin Internet.\nCele mai probabile cauze sunt:\n\n1) Probleme de conectivitate.  Verificaţi conexiunea la reţea \nsau modem şi apoi apăsaţi Înapoi pentru a reîncerca.\n\n2) Un program firewall personal blochează programul BOINC.\nConfiguraţi firewall-ul personal să permită\nBOINC şi Managerului BOINC să comunice pe portul 80 \nşi apoi apăsaţi Înapoi pentru a reîncerca.\n\n3) Folosiţi un server proxy.\nApăsaţi Următorul pentru a configura setările proxy a [...]
 
-#: clientgui/ProxyPage.cpp:331
+#: ProxyPage.cpp:331
 msgid "Proxy configuration"
 msgstr "Configuraţie proxy"
 
-#: clientgui/ProxyPage.cpp:334
+#: ProxyPage.cpp:334
 msgid "HTTP proxy"
 msgstr "Proxy HTTP"
 
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
+#: ProxyPage.cpp:337 ProxyPage.cpp:357
 msgid "Server:"
 msgstr "Server:"
 
-#: clientgui/ProxyPage.cpp:350
+#: ProxyPage.cpp:350
 msgid "Autodetect"
 msgstr "Autodetectare"
 
-#: clientgui/ProxyPage.cpp:354
+#: ProxyPage.cpp:354
 msgid "SOCKS proxy"
 msgstr "Proxy SOCKS"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:167
-msgid "Advanced View...\tCtrl+Shift+A"
-msgstr "Vizualizare Avansată...\tCtrl+Shift+A"
+#: TermsOfUsePage.cpp:218
+msgid "Terms of Use"
+msgstr "Condiţii de Utilizare"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:168
-msgid "Display the advanced graphical interface."
-msgstr "Afişează interfaţa grafică avansată."
+#: TermsOfUsePage.cpp:222
+msgid "Please read the following terms of use:"
+msgstr "Vă rugăm citiţi următoarele condiţii de utilizare:"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:175
-msgid "Skin"
-msgstr "Skin"
+#: TermsOfUsePage.cpp:231
+msgid "I agree to the terms of use."
+msgstr "Sunt de acord cu condiţiile de utilizare."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:177
-msgid "Select the appearance of the user interface."
-msgstr "Selectaţi aspectul interfeţei utilizator."
+#: TermsOfUsePage.cpp:237
+msgid "I do not agree to the terms of use."
+msgstr "Nu sunt de acord cu condiţiile de utilizare."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:224
-#, c-format
-msgid "&%s"
-msgstr "&%s"
+#: UnavailablePage.cpp:183
+msgid "Project temporarily unavailable"
+msgstr "Proiectul este temporar inaccesibil"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:405
-msgid "Default"
-msgstr "Implicit"
+#: UnavailablePage.cpp:186
+msgid ""
+"The project is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "Pentru moment proiectul nu este accesibil.\n\nVă rugăm încercaţi mai tarziu."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:848
-msgid "Suspend"
-msgstr "Suspendă"
+#: UnavailablePage.cpp:190
+msgid "Account manager temporarily unavailable"
+msgstr "Managerul de contact este pentur moment inaccesibil"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:850
-msgid "Suspend Computing"
-msgstr "Suspendă Calculele"
+#: UnavailablePage.cpp:193
+msgid ""
+"The account manager is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "Pentru moment managerul de cont nu este accesibil.\n\nVă rugăm încercaţi mai tarziu."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:851
-msgid "Resume Computing"
-msgstr "Reia Calculele"
+#: ValidateAccountKey.cpp:68
+msgid "Please specify an account key to continue."
+msgstr "Vă rugăm specificaţi un cheie de cont pentru a continua."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:867
-msgid "Notices"
-msgstr "Anunţuri"
+#: ValidateAccountKey.cpp:71
+msgid "Invalid Account Key; please enter a valid Account Key"
+msgstr "Cheie de Cont nevalidă; va rugăm să introduceţi o Cheie de Cont validă"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:868
-msgid "Open a window to view notices from projects or BOINC"
-msgstr "Deschide o fereastră pentru a vedea anunţurile de la proiecte sau BOINC"
+#: ValidateAccountKey.cpp:82 ValidateEmailAddress.cpp:86
+msgid "Validation conflict"
+msgstr "Conflict de validare"
 
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
-msgstr "Se primesc anunţuri, vă rugăm aşteptaţi..."
+#: ValidateEmailAddress.cpp:72
+msgid "Please specify an email address"
+msgstr "Vă rugăm specificaţi o adresă de email"
 
-#: clientgui/sg_DlgMessages.cpp:132
-msgid "There are no notices at this time."
-msgstr "Nu există anunţuri noi în acest moment."
+#: ValidateEmailAddress.cpp:75
+msgid "Invalid email address; please enter a valid email address"
+msgstr "Adresă email invalidă; vă rugăm introduceţi o adresă de email validă"
 
-#: clientgui/sg_DlgMessages.cpp:146
-msgid "Close"
-msgstr "Închide"
+#: ValidateURL.cpp:69
+msgid "Missing URL"
+msgstr "URL absent"
 
-#: clientgui/sg_DlgMessages.cpp:394
-#, c-format
-msgid "%s - Notices"
-msgstr "%s - Anunţuri"
+#: ValidateURL.cpp:70
+msgid ""
+"Please specify a URL.\n"
+"For example:\n"
+"http://www.example.com/"
+msgstr "Va rugăm specificaţi un URL.\nDe exemplu:\nhttp://www.example.com/"
 
-#: clientgui/sg_DlgPreferences.cpp:270
-msgid "This dialog controls preferences for this computer only."
-msgstr "Acest dialog controlează preferinţele doar pentru acest calculator."
+#: ValidateURL.cpp:83 ValidateURL.cpp:87 ValidateURL.cpp:91
+#: ValidateURL.cpp:103 ValidateURL.cpp:107 ValidateURL.cpp:110
+msgid "Invalid URL"
+msgstr "URL nevalid"
 
-#: clientgui/sg_DlgPreferences.cpp:275
-msgid "Click OK to set preferences."
-msgstr "Selectaţi OK pentru a seta preferinţele."
+#: ValidateURL.cpp:84 ValidateURL.cpp:88 ValidateURL.cpp:92
+msgid ""
+"Please specify a valid URL.\n"
+"For example:\n"
+"http://boincproject.example.com"
+msgstr "Va rugăm specificaţi un URL valid.\nDe exemplu:\nhttp://boincproject.example.com"
 
-#: clientgui/sg_DlgPreferences.cpp:280
-msgid "Click Clear to restore web-based settings for all preferences listed below."
-msgstr "Apăsaţi Ştergere pentru a restaura setările de pe web pentru toate preferinţele listate mai jos."
+#: ValidateURL.cpp:104 ValidateURL.cpp:108
+#, c-format
+msgid "'%s' does not contain a valid host name."
+msgstr "'%s' nu conţine un nume de host valid."
 
-#: clientgui/sg_DlgPreferences.cpp:287
-msgid "For additional settings, select Computing Preferences in the Advanced View."
-msgstr "Pentru setări adiţionale, selectaţi Preferinţe Calcul în Vizualizarea Avanasată."
+#: ValidateURL.cpp:111
+#, c-format
+msgid "'%s' does not contain a valid path."
+msgstr "'%s' nu conţine o cale de căutare validă."
 
-#: clientgui/sg_DlgPreferences.cpp:315
-msgid "Do work only between:"
-msgstr "Lucrează doar între:"
+#: ViewMessages.cpp:84 ViewProjects.cpp:170 ViewStatistics.cpp:1978
+#: ViewTransfers.cpp:160 ViewWork.cpp:183
+msgid "Commands"
+msgstr "Comenzi"
 
-#: clientgui/sg_DlgPreferences.cpp:337
-msgid "Connect to internet only between:"
-msgstr "Se conectează la internet doar între:"
+#: ViewMessages.cpp:88
+msgid "Copy all messages"
+msgstr "Copiază toate mesajele"
 
-#: clientgui/sg_DlgPreferences.cpp:359
-#: clientgui/sg_DlgPreferences.cpp:376
-msgid "Use no more than:"
-msgstr "Nu folosi mai mult de:"
+#: ViewMessages.cpp:95
+msgid "Copy selected messages"
+msgstr "Copiază mesajele selectate"
 
-#: clientgui/sg_DlgPreferences.cpp:372
-msgid "of disk space"
-msgstr "spaţiu pe disc"
+#: ViewMessages.cpp:106 ViewMessages.cpp:502
+msgid "Show only this project"
+msgstr "Arată doar acest proiect"
 
-#: clientgui/sg_DlgPreferences.cpp:389
-msgid "of the processor"
-msgstr "din procesor"
+#: ViewMessages.cpp:107 ViewMessages.cpp:503
+msgid "Show only the messages for the selected project."
+msgstr "Arată doar mesajele pentru proiectul selectat."
 
-#: clientgui/sg_DlgPreferences.cpp:393
-msgid "Do work while on battery?"
-msgstr "Lucrează când este pe baterii?"
+#: ViewMessages.cpp:164
+msgid "Messages"
+msgstr "Mesaje"
 
-#: clientgui/sg_DlgPreferences.cpp:406
-msgid "Do work after idle for:"
-msgstr "Lucrează când este nefolosit pentru:"
+#: ViewMessages.cpp:187
+msgid "Copying all messages to the clipboard..."
+msgstr "Se copiază toate mesajele in clipboard..."
 
-#: clientgui/sg_DlgPreferences.cpp:431
-msgid "Clear all local preferences listed above and close the dialog"
-msgstr "Şterge toate preferinţele locale listate deasupra şi închide dialogul"
+#: ViewMessages.cpp:223
+msgid "Copying selected messages to the clipboard..."
+msgstr "Se copiază mesajele selectate în clipboard..."
 
-#: clientgui/sg_DlgPreferences.cpp:609
-#: clientgui/sg_DlgPreferences.cpp:612
-#: clientgui/sg_DlgPreferences.cpp:688
-#: clientgui/sg_DlgPreferences.cpp:692
-#: clientgui/sg_DlgPreferences.cpp:704
-#: clientgui/sg_DlgPreferences.cpp:708
-#: clientgui/sg_DlgPreferences.cpp:851
-#: clientgui/sg_DlgPreferences.cpp:862
-msgid "Anytime"
-msgstr "Oricând"
+#: ViewMessages.cpp:286
+msgid "Filtering messages..."
+msgstr "Se filtrează mesajele..."
 
-#: clientgui/sg_DlgPreferences.cpp:645
-msgid "100 MB"
-msgstr "100 MB"
+#: ViewMessages.cpp:494
+msgid "Show all messages"
+msgstr "Arată toate mesajele"
 
-#: clientgui/sg_DlgPreferences.cpp:646
-msgid "200 MB"
-msgstr "200 MB"
+#: ViewMessages.cpp:495
+msgid "Show messages for all projects."
+msgstr "Arată mesajele pentru toate proiectele."
 
-#: clientgui/sg_DlgPreferences.cpp:647
-msgid "500 MB"
-msgstr "500 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:648
-msgid "1 GB"
-msgstr "1 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:649
-msgid "2 GB"
-msgstr "2 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:650
-msgid "5 GB"
-msgstr "5 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:651
-msgid "10 GB"
-msgstr "10 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:652
-msgid "20 GB"
-msgstr "20 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:653
-msgid "50 GB"
-msgstr "50 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:654
-msgid "100 GB"
-msgstr "100 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:724
-#, c-format
-msgid "%d MB"
-msgstr "%d MB"
-
-#: clientgui/sg_DlgPreferences.cpp:726
-#, c-format
-msgid "%4.2f GB"
-msgstr "%4.2f GB"
-
-#: clientgui/sg_DlgPreferences.cpp:767
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: clientgui/sg_DlgPreferences.cpp:803
-msgid "0 (Run Always)"
-msgstr "0 (Rulează Permanent)"
-
-#: clientgui/sg_DlgPreferences.cpp:806
-#, c-format
-msgid "%d"
-msgstr "%d"
+#: ViewNotices.cpp:58 sg_DlgMessages.cpp:124
+msgid "Fetching notices; please wait..."
+msgstr "Se primesc anunţuri, vă rugăm aşteptaţi..."
 
-#: clientgui/sg_DlgPreferences.cpp:953
-#, c-format
-msgid "%s - Computing Preferences"
-msgstr "%s - Preferințe Calcule"
+#: ViewNotices.cpp:65 sg_DlgMessages.cpp:132
+msgid "There are no notices at this time."
+msgstr "Nu există anunţuri noi în acest moment."
 
-#: clientgui/sg_DlgPreferences.cpp:1033
-msgid "Do you really want to clear all local preferences?\n"
-msgstr "Sunteţi sigur că doriţi să ştergeţi preferinţele locale?\n"
+#: ViewNotices.cpp:99 sg_BoincSimpleFrame.cpp:776
+msgid "Notices"
+msgstr "Anunţuri"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:66
-#: clientgui/ViewProjects.cpp:179
+#: ViewProjects.cpp:174 sg_ProjectCommandPopup.cpp:61
 msgid "Update"
 msgstr "Actualizare"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:67
-#: clientgui/ViewProjects.cpp:180
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
+#: ViewProjects.cpp:175 sg_ProjectCommandPopup.cpp:62
+msgid ""
+"Report all completed tasks, get latest credit, get latest preferences, and "
+"possibly get more tasks."
 msgstr "Raportează toate sarcinile incheiate, actualizează creditul, actualizeazaă preferinţele si, eventual, cere alte task-uri."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:73
-#: clientgui/sg_ProjectCommandPopup.cpp:129
-#: clientgui/ViewProjects.cpp:187
-#: clientgui/ViewProjects.cpp:727
+#: 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
+msgid "Suspend"
+msgstr "Suspendă"
+
+#: ViewProjects.cpp:182 ViewProjects.cpp:722 sg_ProjectCommandPopup.cpp:68
+#: sg_ProjectCommandPopup.cpp:114
 msgid "Suspend tasks for this project."
 msgstr "Suspendă task-urile pentru acest proiect."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:78
-#: clientgui/sg_ProjectCommandPopup.cpp:136
-#: clientgui/ViewProjects.cpp:193
-#: clientgui/ViewProjects.cpp:746
+#: ViewProjects.cpp:188 ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:73
+#: sg_ProjectCommandPopup.cpp:121
 msgid "No new tasks"
 msgstr "Nici un task nou"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:79
-#: clientgui/ViewProjects.cpp:194
+#: ViewProjects.cpp:189 sg_ProjectCommandPopup.cpp:74
 msgid "Don't get new tasks for this project."
 msgstr "Nu lua task-uri noi pentru acest proiect."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:200
+#: ViewProjects.cpp:195 sg_ProjectCommandPopup.cpp:79
 msgid "Reset project"
 msgstr "Resetează proiectul"
 
-# ?
-#: clientgui/sg_ProjectCommandPopup.cpp:85
-#: clientgui/ViewProjects.cpp:201
-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."
+#: ViewProjects.cpp:196 sg_ProjectCommandPopup.cpp:80
+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 "Sterge toate fişierele si task-urile asociate acestui proiect şi preia noi task-uri.  Puteţi actualiza proiectul întâi, pentru a raporta sarcinile finalizate."
 
-# ?
-#: clientgui/sg_ProjectCommandPopup.cpp:91
-#: clientgui/ViewProjects.cpp:208
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
+#: ViewProjects.cpp:203 sg_ProjectCommandPopup.cpp:86
+msgid ""
+"Remove this project.  Tasks in progress will be lost (use 'Update' first to "
+"report any completed tasks)."
 msgstr "Şterge acest proiect.  Task-urile în curs vor fi pierdute (folosiţi 'Actualizare' mai întâi pentru a raporta task-urile finalizate)."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:96
-#: clientgui/sg_TaskCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:214
+#: ViewProjects.cpp:209 ViewWork.cpp:222 sg_ProjectCommandPopup.cpp:91
+#: sg_TaskCommandPopup.cpp:78
 msgid "Properties"
 msgstr "Proprietăţi"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:97
-#: clientgui/ViewProjects.cpp:215
+#: ViewProjects.cpp:210 sg_ProjectCommandPopup.cpp:92
 msgid "Show project details."
 msgstr "Afişează detaliile proiectului."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:126
-#: clientgui/ViewProjects.cpp:723
-msgid "Resume tasks for this project."
-msgstr "Reluare task-uri pentru acest proiect."
+#: ViewProjects.cpp:220 ViewStatistics.cpp:450
+msgid "Account"
+msgstr "Cont"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:133
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow new tasks"
-msgstr "Permite noi task-uri"
+#: ViewProjects.cpp:222
+msgid "Work done"
+msgstr "Lucru efectuat"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:134
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow fetching new tasks for this project."
-msgstr "Acceptă preluarea de task-uri noi pentru acest proiect."
+#: ViewProjects.cpp:223
+msgid "Avg. work done"
+msgstr "Medie lucru efectuat"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:137
-#: clientgui/ViewProjects.cpp:746
-msgid "Don't fetch new tasks for this project."
-msgstr "Nu prelua task-uri noi pentru acest proiect."
+#: ViewProjects.cpp:225 ViewTransfers.cpp:188 ViewWork.cpp:234
+msgid "Status"
+msgstr "Stare"
+
+#: ViewProjects.cpp:250
+msgid "Projects"
+msgstr "Proiecte"
+
+#: ViewProjects.cpp:302
+msgid "Updating project..."
+msgstr "In curs de actualizare proiect..."
+
+#: ViewProjects.cpp:344
+msgid "Resuming project..."
+msgstr "Reluare proiect..."
+
+#: ViewProjects.cpp:348
+msgid "Suspending project..."
+msgstr "Suspendare proiect..."
+
+#: ViewProjects.cpp:385
+msgid "Telling project to allow additional task downloads..."
+msgstr "Informare proiect pentru a accepta download-ul de task-uri adiţionale..."
+
+#: ViewProjects.cpp:389
+msgid "Telling project to not fetch any additional tasks..."
+msgstr "Informare proiect de a nu accepta task-uri adiţionale..."
+
+#: ViewProjects.cpp:425
+msgid "Resetting project..."
+msgstr "Resetare proiect..."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:229
-#: clientgui/ViewProjects.cpp:443
+#: ViewProjects.cpp:438 sg_ProjectCommandPopup.cpp:214
 #, c-format
 msgid "Are you sure you want to reset project '%s'?"
 msgstr "Sunteti sigur ca doriţi să resetaţi proiectul '%s'?"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:235
-#: clientgui/ViewProjects.cpp:449
+#: ViewProjects.cpp:444 sg_ProjectCommandPopup.cpp:220
 msgid "Reset Project"
 msgstr "Resetare Proiect"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:266
-#: clientgui/ViewProjects.cpp:501
+#: ViewProjects.cpp:483
+msgid "Removing project..."
+msgstr "Ştergere proiect..."
+
+#: ViewProjects.cpp:496 sg_ProjectCommandPopup.cpp:251
 #, c-format
 msgid "Are you sure you want to remove project '%s'?"
 msgstr "Sunteti sigur ca doriţi să ştergeţi proiectul '%s'?"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:272
-#: clientgui/ViewProjects.cpp:507
+#: ViewProjects.cpp:502 sg_ProjectCommandPopup.cpp:257
 msgid "Remove Project"
 msgstr "Şterge Proiect"
 
-#: clientgui/sg_ProjectPanel.cpp:72
-msgid "Add Project"
-msgstr "Adaugă Proiect"
+#: ViewProjects.cpp:543 ViewWork.cpp:599
+msgid "Launching browser..."
+msgstr "Lansare browser..."
 
-#: clientgui/sg_ProjectPanel.cpp:73
-msgid "Synchronize"
-msgstr "Sincronizează"
+#: ViewProjects.cpp:718 sg_ProjectCommandPopup.cpp:111
+msgid "Resume tasks for this project."
+msgstr "Reluare task-uri pentru acest proiect."
 
-#: clientgui/sg_ProjectPanel.cpp:74
-msgid "Work done for this project"
-msgstr "Lucrul terminat pentru acest proiect"
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:118
+msgid "Allow new tasks"
+msgstr "Permite noi task-uri"
 
-#: clientgui/sg_ProjectPanel.cpp:77
-msgid "Synchronize projects with account manager system"
-msgstr "Sincronizează proiectele cu sistemul managerului de cont"
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:119
+msgid "Allow fetching new tasks for this project."
+msgstr "Acceptă preluarea de task-uri noi pentru acest proiect."
 
-#: clientgui/sg_ProjectPanel.cpp:124
-msgid "Select a project to access with the controls below"
-msgstr "Selectaţi un proiect pentru a avea acces la controalele de mai jos"
+#: ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:122
+msgid "Don't fetch new tasks for this project."
+msgstr "Nu prelua task-uri noi pentru acest proiect."
 
-# 88%
-#: clientgui/sg_ProjectPanel.cpp:145
-msgid "Project Web Pages"
-msgstr "Pagini Web Proiect"
+#: ViewProjects.cpp:1058
+msgid "Requested by user"
+msgstr "Cerut de utilizator"
 
-#: clientgui/sg_ProjectPanel.cpp:149
-msgid "Project Commands"
-msgstr "Comenzi Proiect"
+#: ViewProjects.cpp:1059
+msgid "To fetch work"
+msgstr "Pentru a prelua lucrări"
 
-#: clientgui/sg_ProjectPanel.cpp:276
-#, c-format
-msgid "Pop up a menu of web sites for project %s"
-msgstr "Deschide un meniu cu site-urile web pentru proiectul %s"
+#: ViewProjects.cpp:1060
+msgid "To report completed tasks"
+msgstr "Pentru a raporta task-urile finalizate"
 
-#: clientgui/sg_ProjectPanel.cpp:278
-#, c-format
-msgid "Pop up a menu of commands to apply to project %s"
-msgstr "Deschide un meniu cu comenzi care se pot aplica proiectului %s"
+#: ViewProjects.cpp:1061
+msgid "To send trickle-up message"
+msgstr "Pentru a trimite un mesaj trickle-up"
 
-#: clientgui/sg_TaskCommandPopup.cpp:66
-msgid "Show graphics"
-msgstr "Afişează graficele"
+#: ViewProjects.cpp:1062
+msgid "Requested by account manager"
+msgstr "Cerut de managerul de cont"
 
-#: clientgui/sg_TaskCommandPopup.cpp:67
-msgid "Show application graphics in a window."
-msgstr "Afişează graficele aplicaţiei într-o nouă fereastră."
+#: ViewProjects.cpp:1063
+msgid "Project initialization"
+msgstr "Iniţializare proiect"
 
-#: clientgui/sg_TaskCommandPopup.cpp:73
-msgid "Suspend this task."
-msgstr "Suspendă acest task."
+#: ViewProjects.cpp:1064
+msgid "Requested by project"
+msgstr "Cerut de proiect"
 
-#: clientgui/sg_TaskCommandPopup.cpp:78
-msgid "Abort"
-msgstr "Renunţă"
+#: ViewProjects.cpp:1065
+msgid "Unknown reason"
+msgstr "Motiv necunoscut"
 
-#: clientgui/sg_TaskCommandPopup.cpp:79
-msgid "Abandon this task. You will get no credit for it."
-msgstr "Abandonaţi acest task. Nu veţi primi credit pentru el."
+#: ViewProjects.cpp:1079
+msgid "Suspended by user"
+msgstr "Suspendat de utilizator"
 
-#: clientgui/sg_TaskCommandPopup.cpp:85
-msgid "Show task details."
-msgstr "Afişează detalii task."
+#: ViewProjects.cpp:1082
+msgid "Won't get new tasks"
+msgstr "Nu vor fi preluate task-uri noi"
 
-#: clientgui/sg_TaskCommandPopup.cpp:119
-msgid "Resume work for this task."
-msgstr "Reia lucrul pentru acest task."
+#: ViewProjects.cpp:1085
+msgid "Project ended - OK to remove"
+msgstr "Proiect terminat - OK pentru ştergere"
 
-#: clientgui/sg_TaskCommandPopup.cpp:123
-msgid "Suspend work for this task."
-msgstr "Suspendă lucrul pentru acest task."
+#: ViewProjects.cpp:1088
+msgid "Will remove when tasks done"
+msgstr "Va fi şters când se finalizează task-urile"
 
-#: clientgui/sg_TaskCommandPopup.cpp:267
-#, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %.1lf%%, Status: %s)"
-msgstr ""
-"Sunteţi sigur că doriţi să renunţaţi la acest task '%s'?\n"
-"(Progres: %.1lf%%, Stare: %s)"
+#: ViewProjects.cpp:1091
+msgid "Scheduler request pending"
+msgstr "Cerere către planificator în aşteptare"
 
-#: clientgui/sg_TaskCommandPopup.cpp:272
-msgid "Abort task"
-msgstr "Renunţă la task"
+#: ViewProjects.cpp:1097
+msgid "Scheduler request in progress"
+msgstr "Cerere către planificator în curs"
 
-#: clientgui/sg_TaskPanel.cpp:468
-msgid "You don't have any projects.  Please Add a Project."
-msgstr "Nu aveţi nici un proiect.  Vă rugăm Adăugaţi un Proiect."
+#: ViewProjects.cpp:1100
+msgid "Trickle up message pending"
+msgstr "Mesaj trickle-up în aşteptare"
 
-#: clientgui/sg_TaskPanel.cpp:469
-msgid "Not available"
-msgstr "Indisponibil"
+#: ViewProjects.cpp:1106
+msgid "Communication deferred "
+msgstr "Comunicarea este amânată "
 
-#: clientgui/sg_TaskPanel.cpp:480
-msgid "Tasks:"
-msgstr "Task-uri:"
+#: ViewResources.cpp:62
+msgid "Total disk usage"
+msgstr "Utilizare disc totală"
 
-#: clientgui/sg_TaskPanel.cpp:486
-msgid "Select a task to access"
-msgstr "Selectaţi un task pentru a accesa"
+#: ViewResources.cpp:83
+msgid "Disk usage by BOINC projects"
+msgstr "Utilizare disc de către proiectele BOINC"
 
-#: clientgui/sg_TaskPanel.cpp:497
-msgid "From:"
-msgstr "De la:"
+#: ViewResources.cpp:116
+msgid "Disk"
+msgstr "Disc"
 
-#: clientgui/sg_TaskPanel.cpp:551
-msgid "This task's progress"
-msgstr "Progresul acestui task"
+#: ViewResources.cpp:249
+msgid "no projects: 0 bytes used"
+msgstr "nici un proiect: 0 bytes folosiţi"
 
-#: clientgui/sg_TaskPanel.cpp:569
-msgid "Task Commands"
-msgstr "Comenzi Task"
+#: ViewResources.cpp:286
+msgid "used by BOINC: "
+msgstr "folosit de BOINC: "
 
-#: clientgui/sg_TaskPanel.cpp:570
-msgid "Pop up a menu of commands to apply to this task"
-msgstr "Deschideţi un meniu de comenzi care se pot aplica acestui task"
+#: ViewResources.cpp:296
+msgid "free, available to BOINC: "
+msgstr "liber, disponibil pentru BOINC: "
 
-#: clientgui/sg_TaskPanel.cpp:705
-#, c-format
-msgid "Application: %s"
-msgstr "Aplicaţia: %s"
+#: ViewResources.cpp:306
+msgid "free, not available to BOINC: "
+msgstr "liber, indisponibil pentru BOINC: "
 
-#: clientgui/sg_TaskPanel.cpp:728
-#, c-format
-msgid "%.3f%%"
-msgstr "%.3f%%"
+#: ViewResources.cpp:316
+msgid "free: "
+msgstr "liber: "
 
-#: clientgui/sg_TaskPanel.cpp:736
-msgid "Application: Not available"
-msgstr "Aplicaţie: Indisponibil"
+#: ViewResources.cpp:326
+msgid "used by other programs: "
+msgstr "folosit de alte programe: "
 
-#: clientgui/sg_TaskPanel.cpp:836
-msgid "Not Available"
-msgstr "Indisponibil"
+#: ViewStatistics.cpp:1205
+msgid "User Total"
+msgstr "Total utilizator"
 
-#: clientgui/sg_TaskPanel.cpp:851
-#, c-format
-msgid "Elapsed: %s"
-msgstr "Scurs: %s"
+#: ViewStatistics.cpp:1206
+msgid "User Average"
+msgstr "Media utilizator"
 
-# 84%
-#: clientgui/sg_TaskPanel.cpp:865
-#, c-format
-msgid "Remaining (estimated): %s"
-msgstr "Rămas (estimat): %s"
+#: ViewStatistics.cpp:1207
+msgid "Host Total"
+msgstr "Total host"
+
+#: ViewStatistics.cpp:1208
+msgid "Host Average"
+msgstr "Media host"
 
-#: clientgui/sg_TaskPanel.cpp:880
+#: ViewStatistics.cpp:1355
 #, c-format
-msgid "Status: %s"
-msgstr "Stare: %s"
+msgid "Last update: %.0f days ago"
+msgstr "Ultima actualizare: acum %.0f zile"
 
-#: clientgui/sg_TaskPanel.cpp:1227
-msgid "Retrieving current status."
-msgstr "Se primeşte starea curentă."
+#: ViewStatistics.cpp:1982
+msgid "Show user total"
+msgstr "Afişează total utilizator"
 
-#: clientgui/sg_TaskPanel.cpp:1233
-msgid "Downloading work from the server."
-msgstr "Se descarcă de lucru de la server."
+#: ViewStatistics.cpp:1983
+msgid "Show total credit for user"
+msgstr "Afişează credit total pentru utilizator"
 
-#: clientgui/sg_TaskPanel.cpp:1238
-msgid "Processing Suspended:  Running On Batteries."
-msgstr "Procesare Suspendată:  Se Rulează Pe Baterii."
+#: ViewStatistics.cpp:1989
+msgid "Show user average"
+msgstr "Afisează media utilizator"
 
-#: clientgui/sg_TaskPanel.cpp:1240
-msgid "Processing Suspended:  User Active."
-msgstr "Procesare Suspendată:  Utilizator Activ."
-
-#: clientgui/sg_TaskPanel.cpp:1242
-msgid "Processing Suspended:  User paused processing."
-msgstr "Procesare Suspendată:  Utilizatorul a oprit procesarea."
-
-#: clientgui/sg_TaskPanel.cpp:1244
-msgid "Processing Suspended:  Time of Day."
-msgstr "Procesare Suspendată:  Ora."
-
-#: clientgui/sg_TaskPanel.cpp:1246
-msgid "Processing Suspended:  Benchmarks Running."
-msgstr "Procesare Suspendată:  Rulează Benchmarks."
-
-#: clientgui/sg_TaskPanel.cpp:1248
-msgid "Processing Suspended."
-msgstr "Procesare Suspendată."
-
-#: clientgui/sg_TaskPanel.cpp:1252
-msgid "Waiting to contact project servers."
-msgstr "În aşteptarea contactării serverelor de proiect."
-
-#: clientgui/sg_TaskPanel.cpp:1256
-#: clientgui/sg_TaskPanel.cpp:1265
-msgid "Retrieving current status"
-msgstr "Se primeşte starea curentă"
-
-#: clientgui/sg_TaskPanel.cpp:1260
-msgid "No work available to process"
-msgstr "Nu există lucru disponibil pentru procesare"
-
-#: clientgui/sg_TaskPanel.cpp:1262
-msgid "Unable to connect to the core client"
-msgstr "Nu s-a putut conecta la nucleul clientului"
-
-#: clientgui/TermsOfUsePage.cpp:218
-msgid "Terms of Use"
-msgstr "Condiţii de Utilizare"
-
-#: clientgui/TermsOfUsePage.cpp:222
-msgid "Please read the following terms of use:"
-msgstr "Vă rugăm citiţi următoarele condiţii de utilizare:"
-
-#: clientgui/TermsOfUsePage.cpp:231
-msgid "I agree to the terms of use."
-msgstr "Sunt de acord cu condiţiile de utilizare."
-
-#: clientgui/TermsOfUsePage.cpp:237
-msgid "I do not agree to the terms of use."
-msgstr "Nu sunt de acord cu condiţiile de utilizare."
-
-#: clientgui/UnavailablePage.cpp:183
-msgid "Project temporarily unavailable"
-msgstr "Proiectul este temporar inaccesibil"
-
-#: clientgui/UnavailablePage.cpp:186
-msgid ""
-"The project is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-"Pentru moment proiectul nu este accesibil.\n"
-"\n"
-"Vă rugăm încercaţi mai tarziu."
-
-#: clientgui/UnavailablePage.cpp:190
-msgid "Account manager temporarily unavailable"
-msgstr "Managerul de contact este pentur moment inaccesibil"
-
-#: clientgui/UnavailablePage.cpp:193
-msgid ""
-"The account manager is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-"Pentru moment managerul de cont nu este accesibil.\n"
-"\n"
-"Vă rugăm încercaţi mai tarziu."
-
-#: clientgui/ValidateAccountKey.cpp:68
-msgid "Please specify an account key to continue."
-msgstr "Vă rugăm specificaţi un cheie de cont pentru a continua."
-
-#: clientgui/ValidateAccountKey.cpp:71
-msgid "Invalid Account Key; please enter a valid Account Key"
-msgstr "Cheie de Cont nevalidă; va rugăm să introduceţi o Cheie de Cont validă"
-
-#: clientgui/ValidateAccountKey.cpp:82
-#: clientgui/ValidateEmailAddress.cpp:86
-msgid "Validation conflict"
-msgstr "Conflict de validare"
-
-#: clientgui/ValidateEmailAddress.cpp:72
-msgid "Please specify an email address"
-msgstr "Vă rugăm specificaţi o adresă de email"
-
-#: clientgui/ValidateEmailAddress.cpp:75
-msgid "Invalid email address; please enter a valid email address"
-msgstr "Adresă email invalidă; vă rugăm introduceţi o adresă de email validă"
-
-#: clientgui/ValidateURL.cpp:69
-msgid "Missing URL"
-msgstr "URL absent"
-
-#: clientgui/ValidateURL.cpp:70
-msgid ""
-"Please specify a URL.\n"
-"For example:\n"
-"http://www.example.com/"
-msgstr ""
-"Va rugăm specificaţi un URL.\n"
-"De exemplu:\n"
-"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 nevalid"
-
-#: 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 ""
-"Va rugăm specificaţi un URL valid.\n"
-"De exemplu:\n"
-"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' nu conţine un nume de host valid."
-
-#: clientgui/ValidateURL.cpp:111
-#, c-format
-msgid "'%s' does not contain a valid path."
-msgstr "'%s' nu conţine o cale de căutare validă."
-
-#: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:175
-msgid "Commands"
-msgstr "Comenzi"
-
-#: clientgui/ViewMessages.cpp:88
-msgid "Copy all messages"
-msgstr "Copiază toate mesajele"
-
-#: clientgui/ViewMessages.cpp:95
-msgid "Copy selected messages"
-msgstr "Copiază mesajele selectate"
-
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
-msgid "Show only this project"
-msgstr "Arată doar acest proiect"
-
-#: clientgui/ViewMessages.cpp:107
-#: clientgui/ViewMessages.cpp:503
-msgid "Show only the messages for the selected project."
-msgstr "Arată doar mesajele pentru proiectul selectat."
-
-#: clientgui/ViewMessages.cpp:164
-msgid "Messages"
-msgstr "Mesaje"
-
-#: clientgui/ViewMessages.cpp:187
-msgid "Copying all messages to the clipboard..."
-msgstr "Se copiază toate mesajele in clipboard..."
-
-#: clientgui/ViewMessages.cpp:223
-msgid "Copying selected messages to the clipboard..."
-msgstr "Se copiază mesajele selectate în clipboard..."
-
-#: clientgui/ViewMessages.cpp:286
-msgid "Filtering messages..."
-msgstr "Se filtrează mesajele..."
-
-#: clientgui/ViewMessages.cpp:494
-msgid "Show all messages"
-msgstr "Arată toate mesajele"
-
-#: clientgui/ViewMessages.cpp:495
-msgid "Show messages for all projects."
-msgstr "Arată mesajele pentru toate proiectele."
-
-#: clientgui/ViewProjects.cpp:225
-msgid "Account"
-msgstr "Cont"
-
-#: clientgui/ViewProjects.cpp:227
-msgid "Work done"
-msgstr "Lucru efectuat"
-
-#: clientgui/ViewProjects.cpp:228
-msgid "Avg. work done"
-msgstr "Medie lucru efectuat"
-
-#: clientgui/ViewProjects.cpp:230
-msgid "Status"
-msgstr "Stare"
-
-#: clientgui/ViewProjects.cpp:255
-msgid "Projects"
-msgstr "Proiecte"
-
-#: clientgui/ViewProjects.cpp:307
-msgid "Updating project..."
-msgstr "In curs de actualizare proiect..."
-
-#: clientgui/ViewProjects.cpp:349
-msgid "Resuming project..."
-msgstr "Reluare proiect..."
-
-#: clientgui/ViewProjects.cpp:353
-msgid "Suspending project..."
-msgstr "Suspendare proiect..."
-
-# Hmmm... could've done better...
-#: clientgui/ViewProjects.cpp:390
-msgid "Telling project to allow additional task downloads..."
-msgstr "Informare proiect pentru a accepta download-ul de task-uri adiţionale..."
-
-#: clientgui/ViewProjects.cpp:394
-msgid "Telling project to not fetch any additional tasks..."
-msgstr "Informare proiect de a nu accepta task-uri adiţionale..."
-
-#: clientgui/ViewProjects.cpp:430
-msgid "Resetting project..."
-msgstr "Resetare proiect..."
-
-#: clientgui/ViewProjects.cpp:488
-msgid "Removing project..."
-msgstr "Ştergere proiect..."
-
-#: clientgui/ViewProjects.cpp:548
-msgid "Launching browser..."
-msgstr "Lansare browser..."
-
-#: clientgui/ViewProjects.cpp:1063
-msgid "Requested by user"
-msgstr "Cerut de utilizator"
-
-#: clientgui/ViewProjects.cpp:1064
-msgid "To fetch work"
-msgstr "Pentru a prelua lucrări"
-
-#: clientgui/ViewProjects.cpp:1065
-msgid "To report completed tasks"
-msgstr "Pentru a raporta task-urile finalizate"
-
-#: clientgui/ViewProjects.cpp:1066
-msgid "To send trickle-up message"
-msgstr "Pentru a trimite un mesaj trickle-up"
-
-#: clientgui/ViewProjects.cpp:1067
-msgid "Requested by account manager"
-msgstr "Cerut de managerul de cont"
-
-#: clientgui/ViewProjects.cpp:1068
-msgid "Project initialization"
-msgstr "Iniţializare proiect"
-
-#: clientgui/ViewProjects.cpp:1069
-msgid "Requested by project"
-msgstr "Cerut de proiect"
-
-#: clientgui/ViewProjects.cpp:1070
-msgid "Unknown reason"
-msgstr "Motiv necunoscut"
-
-#: clientgui/ViewProjects.cpp:1084
-msgid "Suspended by user"
-msgstr "Suspendat de utilizator"
-
-#: clientgui/ViewProjects.cpp:1087
-msgid "Won't get new tasks"
-msgstr "Nu vor fi preluate task-uri noi"
-
-#: clientgui/ViewProjects.cpp:1090
-msgid "Project ended - OK to remove"
-msgstr "Proiect terminat - OK pentru ştergere"
-
-#: clientgui/ViewProjects.cpp:1093
-msgid "Will remove when tasks done"
-msgstr "Va fi şters când se finalizează task-urile"
-
-#: clientgui/ViewProjects.cpp:1096
-msgid "Scheduler request pending"
-msgstr "Cerere către planificator în aşteptare"
-
-#: clientgui/ViewProjects.cpp:1102
-msgid "Scheduler request in progress"
-msgstr "Cerere către planificator în curs"
-
-#: clientgui/ViewProjects.cpp:1105
-msgid "Trickle up message pending"
-msgstr "Mesaj trickle-up în aşteptare"
-
-#: clientgui/ViewProjects.cpp:1111
-msgid "Communication deferred "
-msgstr "Comunicarea este amânată "
-
-#: clientgui/ViewResources.cpp:62
-msgid "Total disk usage"
-msgstr "Utilizare disc totală"
-
-#: clientgui/ViewResources.cpp:83
-msgid "Disk usage by BOINC projects"
-msgstr "Utilizare disc de către proiectele BOINC"
-
-#: clientgui/ViewResources.cpp:116
-msgid "Disk"
-msgstr "Disc"
-
-#: clientgui/ViewResources.cpp:225
-msgid "no projects: 0 bytes used"
-msgstr "nici un proiect: 0 bytes folosiţi"
-
-#: clientgui/ViewResources.cpp:262
-msgid "used by BOINC: "
-msgstr "folosit de BOINC: "
-
-#: clientgui/ViewResources.cpp:272
-msgid "free, available to BOINC: "
-msgstr "liber, disponibil pentru BOINC: "
-
-#: clientgui/ViewResources.cpp:282
-msgid "free, not available to BOINC: "
-msgstr "liber, indisponibil pentru BOINC: "
-
-#: clientgui/ViewResources.cpp:292
-msgid "free: "
-msgstr "liber: "
-
-#: clientgui/ViewResources.cpp:302
-msgid "used by other programs: "
-msgstr "folosit de alte programe: "
-
-#: clientgui/ViewStatistics.cpp:1181
-msgid "User Total"
-msgstr "Total utilizator"
-
-#: clientgui/ViewStatistics.cpp:1182
-msgid "User Average"
-msgstr "Media utilizator"
-
-#: clientgui/ViewStatistics.cpp:1183
-msgid "Host Total"
-msgstr "Total host"
-
-#: clientgui/ViewStatistics.cpp:1184
-msgid "Host Average"
-msgstr "Media host"
-
-#: clientgui/ViewStatistics.cpp:1331
-#, c-format
-msgid "Last update: %.0f days ago"
-msgstr "Ultima actualizare: acum %.0f zile"
-
-#: clientgui/ViewStatistics.cpp:1956
-msgid "Show user total"
-msgstr "Afişează total utilizator"
-
-#: clientgui/ViewStatistics.cpp:1957
-msgid "Show total credit for user"
-msgstr "Afişează credit total pentru utilizator"
-
-#: clientgui/ViewStatistics.cpp:1963
-msgid "Show user average"
-msgstr "Afisează media utilizator"
-
-#: clientgui/ViewStatistics.cpp:1964
+#: ViewStatistics.cpp:1990
 msgid "Show average credit for user"
 msgstr "Afişează credit mediu pentru utilizator"
 
-#: clientgui/ViewStatistics.cpp:1970
+#: ViewStatistics.cpp:1996
 msgid "Show host total"
 msgstr "Afişează total host"
 
-#: clientgui/ViewStatistics.cpp:1971
+#: ViewStatistics.cpp:1997
 msgid "Show total credit for host"
 msgstr "Afişează credit total pentru gazdă"
 
-#: clientgui/ViewStatistics.cpp:1977
+#: ViewStatistics.cpp:2003
 msgid "Show host average"
 msgstr "Afişează media pentru host"
 
-#: clientgui/ViewStatistics.cpp:1978
+#: ViewStatistics.cpp:2004
 msgid "Show average credit for host"
 msgstr "Afişează credit mediu pentru gazdă"
 
-#: clientgui/ViewStatistics.cpp:1987
+#: ViewStatistics.cpp:2013
 msgid "< &Previous project"
 msgstr "< Proiectul &precedent"
 
-#: clientgui/ViewStatistics.cpp:1988
+#: ViewStatistics.cpp:2014
 msgid "Show chart for previous project"
 msgstr "Arată graficul pentru proiectul precedent"
 
-#: clientgui/ViewStatistics.cpp:1993
+#: ViewStatistics.cpp:2019
 msgid "&Next project >"
 msgstr "&Următorul proiect >"
 
-#: clientgui/ViewStatistics.cpp:1994
+#: ViewStatistics.cpp:2020
 msgid "Show chart for next project"
 msgstr "Arată graficul pentru proiectul următor"
 
-#: clientgui/ViewStatistics.cpp:2000
-#: clientgui/ViewStatistics.cpp:2390
+#: ViewStatistics.cpp:2026 ViewStatistics.cpp:2416
 msgid "Hide project list"
 msgstr "Ascunde lista proiecte"
 
-#: clientgui/ViewStatistics.cpp:2001
-#: clientgui/ViewStatistics.cpp:2390
+#: ViewStatistics.cpp:2027 ViewStatistics.cpp:2416
 msgid "Use entire area for graphs"
 msgstr "Foloseşte întreaga suprafaţă pentru grafice"
 
-#: clientgui/ViewStatistics.cpp:2006
+#: ViewStatistics.cpp:2032
 msgid "Mode view"
 msgstr "Mod vizualizare"
 
-#: clientgui/ViewStatistics.cpp:2010
+#: ViewStatistics.cpp:2036
 msgid "One project"
 msgstr "Un proiect"
 
-#: clientgui/ViewStatistics.cpp:2011
+#: ViewStatistics.cpp:2037
 msgid "Show one chart with selected project"
 msgstr "Arată un grafic cu proiectul selectat"
 
-#: clientgui/ViewStatistics.cpp:2017
+#: ViewStatistics.cpp:2043
 msgid "All projects (separate)"
 msgstr "Toate proiectele (separat)"
 
-#: clientgui/ViewStatistics.cpp:2018
+#: ViewStatistics.cpp:2044
 msgid "Show all projects, one chart per project"
 msgstr "Arată toate proiectele, un grafic pe proiect"
 
-#: clientgui/ViewStatistics.cpp:2024
+#: ViewStatistics.cpp:2050
 msgid "All projects (together)"
 msgstr "Toate proiectele (împreună)"
 
-#: clientgui/ViewStatistics.cpp:2025
+#: ViewStatistics.cpp:2051
 msgid "Show one chart with all projects"
 msgstr "Arată un grafic cu toate proiectele"
 
-#: clientgui/ViewStatistics.cpp:2031
+#: ViewStatistics.cpp:2057
 msgid "All projects (sum)"
 msgstr "Toate proiectele (sumă)"
 
-#: clientgui/ViewStatistics.cpp:2032
+#: ViewStatistics.cpp:2058
 msgid "Show one chart with sum of projects"
 msgstr "Arată un singur grafic cu suma proiectelor"
 
-#: clientgui/ViewStatistics.cpp:2053
+#: ViewStatistics.cpp:2079
 msgid "Statistics"
 msgstr "Statistici"
 
-#: 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
+#: 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
 msgid "Updating charts..."
 msgstr "Actualizare grafice..."
 
-#: clientgui/ViewStatistics.cpp:2394
+#: ViewStatistics.cpp:2420
 msgid "Show project list"
 msgstr "Afişează lista de proiecte"
 
-#: clientgui/ViewStatistics.cpp:2394
+#: ViewStatistics.cpp:2420
 msgid "Uses smaller area for graphs"
 msgstr "Foloseşte o suprafaţă mai mică pentru grafice"
 
-#: clientgui/ViewTransfers.cpp:169
+#: ViewTransfers.cpp:164
 msgid "Retry Now"
 msgstr "Reîncearcă"
 
-#: clientgui/ViewTransfers.cpp:170
+#: ViewTransfers.cpp:165
 msgid "Retry the file transfer now"
 msgstr "Reîncearcă acum transferul de fişier"
 
-#: clientgui/ViewTransfers.cpp:176
+#: ViewTransfers.cpp:171
 msgid "Abort Transfer"
 msgstr "Renunţă la transfer"
 
-#: clientgui/ViewTransfers.cpp:177
+#: ViewTransfers.cpp:172
 msgid "Abort this file transfer.  You won't get credit for the task."
 msgstr "Anulează acest transfer de fişier.  Nu veţi primi credit pentru acest task."
 
-#: clientgui/ViewTransfers.cpp:188
+#: ViewTransfers.cpp:183
 msgid "File"
 msgstr "Fişier"
 
-#: clientgui/ViewTransfers.cpp:189
-#: clientgui/ViewWork.cpp:238
+#: ViewTransfers.cpp:184 ViewWork.cpp:233
 msgid "Progress"
 msgstr "Progres"
 
-#: clientgui/ViewTransfers.cpp:190
+#: ViewTransfers.cpp:185
 msgid "Size"
 msgstr "Dimensiune"
 
-#: clientgui/ViewTransfers.cpp:191
+#: ViewTransfers.cpp:186
 msgid "Elapsed Time"
 msgstr "Timp scurs"
 
-#: clientgui/ViewTransfers.cpp:192
+#: ViewTransfers.cpp:187
 msgid "Speed"
 msgstr "Viteză"
 
-#: clientgui/ViewTransfers.cpp:218
+#: ViewTransfers.cpp:213
 msgid "Transfers"
 msgstr "Transferuri"
 
-#: clientgui/ViewTransfers.cpp:285
+#: ViewTransfers.cpp:280
 msgid "Network activity is suspended - "
 msgstr "Accesul la retea este suspendat - "
 
-#: clientgui/ViewTransfers.cpp:287
+#: ViewTransfers.cpp:282
 msgid ""
 ".\n"
 "You can enable it using the Activity menu."
-msgstr ""
-".\n"
-"Puteţi să îl activaţi folosind meniul Activitate."
+msgstr ".\nPuteţi să îl activaţi folosind meniul Activitate."
 
-#: clientgui/ViewTransfers.cpp:290
+#: ViewTransfers.cpp:285
 msgid "BOINC"
 msgstr "BOINC"
 
-#: clientgui/ViewTransfers.cpp:297
+#: ViewTransfers.cpp:292
 msgid "Retrying transfer now..."
 msgstr "Reiniţializare transfer..."
 
-#: clientgui/ViewTransfers.cpp:335
+#: ViewTransfers.cpp:330
 msgid "Aborting transfer..."
 msgstr "Renunţare la transfer..."
 
-#: clientgui/ViewTransfers.cpp:348
+#: ViewTransfers.cpp:343
 #, 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 ""
-"Sunteţi sigur că doriţi să renunţaţi la acest transfer de fişier '%s'?\n"
-"NOTĂ: Renunţând la transfer se va invalida task-ul şi\n"
-"nu veţi primi credit pentur el."
+msgstr "Sunteţi sigur că doriţi să renunţaţi la acest transfer de fişier '%s'?\nNOTĂ: Renunţând la transfer se va invalida task-ul şi\nnu veţi primi credit pentur el."
 
-#: clientgui/ViewTransfers.cpp:354
+#: ViewTransfers.cpp:349
 msgid "Abort File Transfer"
 msgstr "Renunţă la transferul fişierului"
 
-#: clientgui/ViewTransfers.cpp:785
+#: ViewTransfers.cpp:780
 msgid "Upload"
 msgstr "Încarcă"
 
-#: clientgui/ViewTransfers.cpp:785
+#: ViewTransfers.cpp:780
 msgid "Download"
 msgstr "Descarcă"
 
-#: clientgui/ViewTransfers.cpp:789
+#: ViewTransfers.cpp:784
 msgid "retry in "
 msgstr "reincearcă în "
 
-#: clientgui/ViewTransfers.cpp:791
+#: ViewTransfers.cpp:786
 msgid "failed"
 msgstr "eşuat"
 
-#: clientgui/ViewTransfers.cpp:794
+#: ViewTransfers.cpp:789
 msgid "suspended"
 msgstr "suspendat"
 
-#: clientgui/ViewTransfers.cpp:799
+#: ViewTransfers.cpp:794
 msgid "active"
 msgstr "activ"
 
-#: clientgui/ViewTransfers.cpp:801
+#: ViewTransfers.cpp:796
 msgid "pending"
 msgstr "în aşteptare"
 
-#: clientgui/ViewTransfers.cpp:808
+#: ViewTransfers.cpp:803
 msgid " (project backoff: "
 msgstr " (revenire proiect: "
 
-#: clientgui/ViewWork.cpp:192
-#: clientgui/ViewWork.cpp:782
+#: ViewWork.cpp:187 ViewWork.cpp:777
 msgid "Show active tasks"
 msgstr "Arată task-urile active"
 
-#: clientgui/ViewWork.cpp:193
-#: clientgui/ViewWork.cpp:783
+#: ViewWork.cpp:188 ViewWork.cpp:778
 msgid "Show only active tasks."
 msgstr "Arată doar task-urile active."
 
-#: clientgui/ViewWork.cpp:206
+#: ViewWork.cpp:194 sg_TaskCommandPopup.cpp:60
+msgid "Show graphics"
+msgstr "Afişează graficele"
+
+#: ViewWork.cpp:195 sg_TaskCommandPopup.cpp:61
+msgid "Show application graphics in a window."
+msgstr "Afişează graficele aplicaţiei într-o nouă fereastră."
+
+#: ViewWork.cpp:201
 msgid "Show VM Console"
 msgstr "Afisează consola VM"
 
-#: clientgui/ViewWork.cpp:207
-msgid "Show VM Console in a window."
-msgstr "Afişează Consola VM într-o fereastră."
+#: ViewWork.cpp:202
+msgid "Show VM Console in a window."
+msgstr "Afişează Consola VM într-o fereastră."
+
+#: ViewWork.cpp:209
+msgid "Suspend work for this result."
+msgstr "Suspendare lucru pentru acest rezultat."
+
+#: ViewWork.cpp:215 sg_TaskCommandPopup.cpp:72
+msgid "Abort"
+msgstr "Renunţă"
+
+#: ViewWork.cpp:216
+msgid "Abandon work on the result. You will get no credit for it."
+msgstr "Abandonează lucrul la rezultat. Nu veţi primi credit pentru el."
+
+#: ViewWork.cpp:223 sg_TaskCommandPopup.cpp:79
+msgid "Show task details."
+msgstr "Afişează detalii task."
+
+#: ViewWork.cpp:235
+msgid "Elapsed"
+msgstr "Scurs"
+
+#: ViewWork.cpp:236
+msgid "Remaining (estimated)"
+msgstr "Rămas (estimat)"
+
+#: ViewWork.cpp:237
+msgid "Deadline"
+msgstr "Timp limită"
+
+#: ViewWork.cpp:264
+msgid "Tasks"
+msgstr "Sarcini"
+
+#: ViewWork.cpp:357
+msgid "Resuming task..."
+msgstr "Se reia task-ul..."
+
+#: ViewWork.cpp:360
+msgid "Suspending task..."
+msgstr "Se suspendă task-ul..."
+
+#: ViewWork.cpp:389
+msgid "Showing graphics for task..."
+msgstr "Afişare grafică pentru task..."
+
+#: ViewWork.cpp:426
+msgid "Showing VM console for task..."
+msgstr "Afişează consola VM pentru task..."
+
+#: ViewWork.cpp:479
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %s, Status: %s)"
+msgstr "Sunteţi sigur că doriţi să renunţaţi la acest task '%s'?\n(Progres: %s, Stare: %s)"
+
+#: ViewWork.cpp:485
+#, c-format
+msgid "Are you sure you want to abort these %d tasks?"
+msgstr "Sunteţi sigur că doriţi să renunţaţi la aceste %d taskuri?"
+
+#: ViewWork.cpp:490 sg_TaskCommandPopup.cpp:256
+msgid "Abort task"
+msgstr "Renunţă la task"
+
+#: ViewWork.cpp:499
+msgid "Aborting task..."
+msgstr "Renunţare la task..."
+
+#: ViewWork.cpp:771
+msgid "Show all tasks"
+msgstr "Arată toate task-urile"
+
+#: ViewWork.cpp:772
+msgid "Show all tasks."
+msgstr "Arată toate task-urile."
+
+#: ViewWork.cpp:796 sg_TaskCommandPopup.cpp:103
+msgid "Resume work for this task."
+msgstr "Reia lucrul pentru acest task."
+
+#: ViewWork.cpp:802 sg_TaskCommandPopup.cpp:107
+msgid "Suspend work for this task."
+msgstr "Suspendă lucrul pentru acest task."
+
+#: WelcomePage.cpp:284
+msgid "Add project or account manager"
+msgstr "Adaugă proiect sau manager de cont"
+
+#: WelcomePage.cpp:288
+msgid "Add project or use BOINC Account Manager"
+msgstr "Adaugă proiect sau foloseşte un Manager de Cont BOINC"
+
+#: 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 "Dacă este posibil, adăugaţi proiecte prin\nweb site-ul %s .\n\nProiectele adăugate prin acest vrăjitor nu\no să fie listate sau gestionate prin %s."
+
+#: 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 "Există mai mult de 30 de proiecte BOINC\nrealizând cercetări în multe zone ştiinţifice,\nşi puteţi să vă oferiţi voluntar pentru cât de multe doriţi.\nPuteţi adăuga un proiect direct,\nsau să folosiţi un web site 'Manager de Cont' pentru a selecta proiecte."
+
+#: 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 "Aţi ales să adăugaţi un nou proiect de calcule voluntare sau să modificaţi la ce proiecte\ncontribuiţi.\n\nUnele dintre aceste proiecte sunt rulate şi gestionate de World Community Grid, în timp ce\naltele sunt rulate şi gestionate de alte organizaţii. Programul BOINC poate\nîmpărţi puterea de procesare disponibilă în orice combinaţie de proiecte.\n\nAlternativ, dacă vâaţi înregistrat la un Manager de Cont BOINC, puteţi\nsă-l folosiţi pentru a alege ce proiecte susţineţi.\n\nVă r [...]
+
+#: WelcomePage.cpp:339
+msgid "Use a BOINC Account Manager"
+msgstr "Folosiţi un Manager de Cont BOINC"
+
+#: WelcomePage.cpp:352
+msgid "To continue, click Next."
+msgstr "Pentru a continua, apăsaţi Următorul."
+
+#: WelcomePage.cpp:358
+msgid "Add or change your World Community Grid projects"
+msgstr "Adaugă sau modifică proiecte World Community Grid"
+
+#: WelcomePage.cpp:361
+msgid "Add projects run by other researchers or organizations"
+msgstr "Adaugă proiecte rulate de alţi cercetători şi organizaţii"
+
+#: WizardAttach.cpp:634
+msgid "Do you really want to cancel?"
+msgstr "Sunteţi sigur că doriţi să abandonaţi?"
+
+#: WizardAttach.cpp:635
+msgid "Question"
+msgstr "Întrebare"
+
+#: sg_BoincSimpleFrame.cpp:149
+msgid "Advanced View...\tCtrl+Shift+A"
+msgstr "Vizualizare Avansată...\tCtrl+Shift+A"
+
+#: sg_BoincSimpleFrame.cpp:150
+msgid "Display the advanced graphical interface."
+msgstr "Afişează interfaţa grafică avansată."
+
+#: sg_BoincSimpleFrame.cpp:157
+msgid "Skin"
+msgstr "Skin"
+
+#: sg_BoincSimpleFrame.cpp:159
+msgid "Select the appearance of the user interface."
+msgstr "Selectaţi aspectul interfeţei utilizator."
+
+#: sg_BoincSimpleFrame.cpp:206
+#, c-format
+msgid "&%s"
+msgstr "&%s"
+
+#: sg_BoincSimpleFrame.cpp:390
+msgid "Default"
+msgstr "Implicit"
+
+#: sg_BoincSimpleFrame.cpp:759
+msgid "Suspend Computing"
+msgstr "Suspendă Calculele"
+
+#: sg_BoincSimpleFrame.cpp:760
+msgid "Resume Computing"
+msgstr "Reia Calculele"
+
+#: sg_BoincSimpleFrame.cpp:777
+msgid "Open a window to view notices from projects or BOINC"
+msgstr "Deschide o fereastră pentru a vedea anunţurile de la proiecte sau BOINC"
+
+#: sg_DlgMessages.cpp:146
+msgid "Close"
+msgstr "Închide"
+
+#: sg_DlgMessages.cpp:389
+#, c-format
+msgid "%s - Notices"
+msgstr "%s - Anunţuri"
+
+#: sg_DlgPreferences.cpp:268
+msgid "This dialog controls preferences for this computer only."
+msgstr "Acest dialog controlează preferinţele doar pentru acest calculator."
+
+#: sg_DlgPreferences.cpp:273
+msgid "Click OK to set preferences."
+msgstr "Selectaţi OK pentru a seta preferinţele."
+
+#: sg_DlgPreferences.cpp:278
+msgid ""
+"Click Clear to restore web-based settings for all preferences listed below."
+msgstr "Apăsaţi Ştergere pentru a restaura setările de pe web pentru toate preferinţele listate mai jos."
+
+#: sg_DlgPreferences.cpp:285
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
+msgstr "Pentru setări adiţionale, selectaţi Preferinţe Calcul în Vizualizarea Avanasată."
+
+#: sg_DlgPreferences.cpp:313
+msgid "Do work only between:"
+msgstr "Lucrează doar între:"
+
+#: sg_DlgPreferences.cpp:335
+msgid "Connect to internet only between:"
+msgstr "Se conectează la internet doar între:"
+
+#: sg_DlgPreferences.cpp:357 sg_DlgPreferences.cpp:374
+msgid "Use no more than:"
+msgstr "Nu folosi mai mult de:"
+
+#: sg_DlgPreferences.cpp:370
+msgid "of disk space"
+msgstr "spaţiu pe disc"
+
+#: sg_DlgPreferences.cpp:387
+msgid "of the processor"
+msgstr "din procesor"
+
+#: sg_DlgPreferences.cpp:391
+msgid "Do work while on battery?"
+msgstr "Lucrează când este pe baterii?"
+
+#: sg_DlgPreferences.cpp:404
+msgid "Do work after idle for:"
+msgstr "Lucrează când este nefolosit pentru:"
+
+#: sg_DlgPreferences.cpp:429
+msgid "Clear all local preferences listed above and close the dialog"
+msgstr "Şterge toate preferinţele locale listate deasupra şi închide dialogul"
+
+#: 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 "Oricând"
+
+#: sg_DlgPreferences.cpp:638
+msgid "100 MB"
+msgstr "100 MB"
+
+#: sg_DlgPreferences.cpp:639
+msgid "200 MB"
+msgstr "200 MB"
 
-#: clientgui/ViewWork.cpp:214
-msgid "Suspend work for this result."
-msgstr "Suspendare lucru pentru acest rezultat."
+#: sg_DlgPreferences.cpp:640
+msgid "500 MB"
+msgstr "500 MB"
 
-#: clientgui/ViewWork.cpp:221
-msgid "Abandon work on the result. You will get no credit for it."
-msgstr "Abandonează lucrul la rezultat. Nu veţi primi credit pentru el."
+#: sg_DlgPreferences.cpp:641
+msgid "1 GB"
+msgstr "1 GB"
 
-#: clientgui/ViewWork.cpp:240
-msgid "Elapsed"
-msgstr "Scurs"
+#: sg_DlgPreferences.cpp:642
+msgid "2 GB"
+msgstr "2 GB"
 
-#: clientgui/ViewWork.cpp:241
-msgid "Remaining (estimated)"
-msgstr "Rămas (estimat)"
+#: sg_DlgPreferences.cpp:643
+msgid "5 GB"
+msgstr "5 GB"
 
-#: clientgui/ViewWork.cpp:242
-msgid "Deadline"
-msgstr "Timp limită"
+#: sg_DlgPreferences.cpp:644
+msgid "10 GB"
+msgstr "10 GB"
 
-#: clientgui/ViewWork.cpp:269
-msgid "Tasks"
-msgstr "Sarcini"
+#: sg_DlgPreferences.cpp:645
+msgid "20 GB"
+msgstr "20 GB"
 
-#: clientgui/ViewWork.cpp:362
-msgid "Resuming task..."
-msgstr "Se reia task-ul..."
+#: sg_DlgPreferences.cpp:646
+msgid "50 GB"
+msgstr "50 GB"
 
-#: clientgui/ViewWork.cpp:365
-msgid "Suspending task..."
-msgstr "Se suspendă task-ul..."
+#: sg_DlgPreferences.cpp:647
+msgid "100 GB"
+msgstr "100 GB"
 
-#: clientgui/ViewWork.cpp:394
-msgid "Showing graphics for task..."
-msgstr "Afişare grafică pentru task..."
+#: sg_DlgPreferences.cpp:717
+#, c-format
+msgid "%d MB"
+msgstr "%d MB"
 
-#: clientgui/ViewWork.cpp:431
-msgid "Showing VM console for task..."
-msgstr "Afişează consola VM pentru task..."
+#: sg_DlgPreferences.cpp:719
+#, c-format
+msgid "%4.2f GB"
+msgstr "%4.2f GB"
 
-#: clientgui/ViewWork.cpp:484
+#: sg_DlgPreferences.cpp:760
 #, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %s, Status: %s)"
-msgstr ""
-"Sunteţi sigur că doriţi să renunţaţi la acest task '%s'?\n"
-"(Progres: %s, Stare: %s)"
+msgid "%d%%"
+msgstr "%d%%"
+
+#: sg_DlgPreferences.cpp:796
+msgid "0 (Run Always)"
+msgstr "0 (Rulează Permanent)"
 
-#: clientgui/ViewWork.cpp:490
+#: sg_DlgPreferences.cpp:799
 #, c-format
-msgid "Are you sure you want to abort these %d tasks?"
-msgstr "Sunteţi sigur că doriţi să renunţaţi la aceste %d taskuri?"
+msgid "%d"
+msgstr "%d"
 
-# 75%
-#: clientgui/ViewWork.cpp:504
-msgid "Aborting task..."
-msgstr "Renunţare la task..."
+#: sg_DlgPreferences.cpp:1029
+msgid "Do you really want to clear all local preferences?\n"
+msgstr "Sunteţi sigur că doriţi să ştergeţi preferinţele locale?\n"
 
-#: clientgui/ViewWork.cpp:776
-msgid "Show all tasks"
-msgstr "Arată toate task-urile"
+#: sg_ProjectPanel.cpp:72
+msgid "Add Project"
+msgstr "Adaugă Proiect"
 
-#: clientgui/ViewWork.cpp:777
-msgid "Show all tasks."
-msgstr "Arată toate task-urile."
+#: sg_ProjectPanel.cpp:73
+msgid "Synchronize"
+msgstr "Sincronizează"
 
-#: clientgui/WelcomePage.cpp:284
-msgid "Add project or account manager"
-msgstr "Adaugă proiect sau manager de cont"
+#: sg_ProjectPanel.cpp:74
+msgid "Work done for this project"
+msgstr "Lucrul terminat pentru acest proiect"
 
-#: clientgui/WelcomePage.cpp:288
-msgid "Add project or use BOINC Account Manager"
-msgstr "Adaugă proiect sau foloseşte un Manager de Cont BOINC"
+#: sg_ProjectPanel.cpp:77
+msgid "Synchronize projects with account manager system"
+msgstr "Sincronizează proiectele cu sistemul managerului de cont"
 
-#: 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 ""
-"Dacă este posibil, adăugaţi proiecte prin\n"
-"web site-ul %s .\n"
-"\n"
-"Proiectele adăugate prin acest vrăjitor nu\n"
-"o să fie listate sau gestionate prin %s."
+#: sg_ProjectPanel.cpp:124
+msgid "Select a project to access with the controls below"
+msgstr "Selectaţi un proiect pentru a avea acces la controalele de mai jos"
 
-#: 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 ""
-"Există mai mult de 30 de proiecte BOINC\n"
-"realizând cercetări în multe zone ştiinţifice,\n"
-"şi puteţi să vă oferiţi voluntar pentru cât de multe doriţi.\n"
-"Puteţi adăuga un proiect direct,\n"
-"sau să folosiţi un web site 'Manager de Cont' pentru a selecta proiecte."
+#: sg_ProjectPanel.cpp:145
+msgid "Project Web Pages"
+msgstr "Pagini Web Proiect"
 
-#: 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 ""
-"Aţi ales să adăugaţi un nou proiect de calcule voluntare sau să modificaţi la ce proiecte\n"
-"contribuiţi.\n"
-"\n"
-"Unele dintre aceste proiecte sunt rulate şi gestionate de World Community Grid, în timp ce\n"
-"altele sunt rulate şi gestionate de alte organizaţii. Programul BOINC poate\n"
-"împărţi puterea de procesare disponibilă în orice combinaţie de proiecte.\n"
-"\n"
-"Alternativ, dacă vâaţi înregistrat la un Manager de Cont BOINC, puteţi\n"
-"să-l folosiţi pentru a alege ce proiecte susţineţi.\n"
-"\n"
-"Vă rugăm alegetţi ce tip de modificare doriţi să efectuaţi:\n"
+#: sg_ProjectPanel.cpp:149
+msgid "Project Commands"
+msgstr "Comenzi Proiect"
 
-#: clientgui/WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
-msgstr "Folosiţi un Manager de Cont BOINC"
+#: sg_ProjectPanel.cpp:267
+#, c-format
+msgid "Pop up a menu of web sites for project %s"
+msgstr "Deschide un meniu cu site-urile web pentru proiectul %s"
 
-#: clientgui/WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
-msgstr "Adaugă sau modifică proiecte World Community Grid"
+#: sg_ProjectPanel.cpp:269
+#, c-format
+msgid "Pop up a menu of commands to apply to project %s"
+msgstr "Deschide un meniu cu comenzi care se pot aplica proiectului %s"
 
-#: clientgui/WelcomePage.cpp:361
-msgid "Add projects run by other researchers or organizations"
-msgstr "Adaugă proiecte rulate de alţi cercetători şi organizaţii"
+#: sg_TaskCommandPopup.cpp:67
+msgid "Suspend this task."
+msgstr "Suspendă acest task."
 
-#: clientgui/WizardAttach.cpp:673
-msgid "Do you really want to cancel?"
-msgstr "Sunteţi sigur că doriţi să abandonaţi?"
+#: sg_TaskCommandPopup.cpp:73
+msgid "Abandon this task. You will get no credit for it."
+msgstr "Abandonaţi acest task. Nu veţi primi credit pentru el."
 
-#: clientgui/WizardAttach.cpp:674
-msgid "Question"
-msgstr "Întrebare"
+#: sg_TaskCommandPopup.cpp:251
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %.1lf%%, Status: %s)"
+msgstr "Sunteţi sigur că doriţi să renunţaţi la acest task '%s'?\n(Progres: %.1lf%%, Stare: %s)"
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
-msgid "&Next >"
-msgstr "&Următorul >"
+#: sg_TaskPanel.cpp:464
+msgid "You don't have any projects.  Please Add a Project."
+msgstr "Nu aveţi nici un proiect.  Vă rugăm Adăugaţi un Proiect."
 
-#: clientgui/wizardex.cpp:383
-msgid "< &Back"
-msgstr "< &Înapoi"
+#: sg_TaskPanel.cpp:465
+msgid "Not available"
+msgstr "Indisponibil"
 
-#: clientgui/wizardex.cpp:553
-msgid "&Finish"
-msgstr "&Finalizare"
+#: sg_TaskPanel.cpp:476
+msgid "Tasks:"
+msgstr "Task-uri:"
 
-#: clientgui/common/wxPieCtrl.cpp:64
-msgid "Pie Ctrl"
-msgstr "Pie Ctrl"
+#: sg_TaskPanel.cpp:482
+msgid "Select a task to access"
+msgstr "Selectaţi un task pentru a accesa"
 
-#: clientgui/mac/Mac_GUI.cpp:35
-msgid "Services"
-msgstr "Servicii"
+#: sg_TaskPanel.cpp:493
+msgid "From:"
+msgstr "De la:"
 
-#: clientgui/mac/Mac_GUI.cpp:36
-#, c-format
-msgid "Hide %s"
-msgstr "Ascunde %s"
+#: sg_TaskPanel.cpp:547
+msgid "This task's progress"
+msgstr "Progresul acestui task"
 
-#: clientgui/mac/Mac_GUI.cpp:37
-msgid "Hide Others"
-msgstr "Ascunde Restul"
+#: sg_TaskPanel.cpp:565
+msgid "Task Commands"
+msgstr "Comenzi Task"
 
-#: clientgui/mac/Mac_GUI.cpp:38
-msgid "Show All"
-msgstr "Arată Tot"
+#: sg_TaskPanel.cpp:566
+msgid "Pop up a menu of commands to apply to this task"
+msgstr "Deschideţi un meniu de comenzi care se pot aplica acestui task"
 
-#: clientgui/mac/Mac_GUI.cpp:39
+#: sg_TaskPanel.cpp:701
 #, c-format
-msgid "Quit %s"
-msgstr "Închide %s"
+msgid "Application: %s"
+msgstr "Aplicaţia: %s"
 
-#: clientgui/DlgAdvPreferences.h:30
-msgid "specify work start and stop hours in format HH:MM-HH:MM"
-msgstr "specificaţi orele de început şi sfârşit a lucrului în formatul HH:MM-HH:MM"
-
-#: clientgui/DlgAdvPreferences.h:31
-msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
-msgstr "specificaţi orele de început şi sfârşit ale utilizării reţelei în formatul HH:MM-HH:MM"
-
-# 98%
-#~ msgid ""
-#~ "(C) 2003-2013 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2013 Universitatea California, Berkeley.\n"
-#~ "Toate drepturile rezervate."
+#: sg_TaskPanel.cpp:724
 #, c-format
-#~ msgid "%s - Preferences"
-#~ msgstr "%s - Preferinţe"
+msgid "%.3f%%"
+msgstr "%.3f%%"
 
-#, no-c-format
-#~ msgid "% of the processors (0 means ignore this setting)"
-#~ msgstr "% din procesoare (0 înseamnă să se ignore această setare)"
+#: sg_TaskPanel.cpp:732
+msgid "Application: Not available"
+msgstr "Aplicaţie: Indisponibil"
 
-#, no-c-format
-#~ msgid "% CPU time"
-#~ msgstr "% timp CPU"
-#~ msgid "KBytes/sec."
-#~ msgstr "KBytes/sec."
-#~ msgid "Mbytes"
-#~ msgstr "Mbytes"
-#~ msgid "every"
-#~ msgstr "fiecare"
-#~ msgid "days"
-#~ msgstr "zile"
-#~ msgid "Gigabytes disk space"
-#~ msgstr "Gigabytes spaţiu disc"
-#~ msgid "Running, high priority"
-#~ msgstr "Rulează, prioritate mare"
-#~ msgid " (Scheduler wait: "
-#~ msgstr " (Aşteptare planificator: "
-#~ msgid " (Scheduler wait)"
-#~ msgstr " (Aşteptare planificator)"
-#~ msgid " (Waiting for network access)"
-#~ msgstr " (În aşteptare de acces la reţea)"
-#~ msgid "Preferences…"
-#~ msgstr "Preferinţe…"
-#~ msgid "I do not agree with the terms of use."
-#~ msgstr "Nu sunt de acord cu condiţiile de utilizare."
-#~ msgid "Click Clear to restore web-based settings."
-#~ msgstr "Apăsaţi Şterge pentru a restaura setările de pe web."
-#~ msgid "For additional settings, select Computing Preferences in "
-#~ msgstr "Pentru setări adiţionale, selectaţi Preferinţe Calcul in "
-#~ msgid "the Advanced View."
-#~ msgstr "Vizualizarea Avansată."
-#~ msgid "Workunit name"
-#~ msgstr "Nume unitate de lucru"
-#~ msgid "invalid float"
-#~ msgstr "număr real invalid"
-#~ msgid "Display the advanced (accessible) graphical interface."
-#~ msgstr "Afişează interfaţa grafică avansată (accesibilă)."
-#~ msgid "Paused: Other work running"
-#~ msgstr "Pauză: Rulează alte lucrări"
-#~ msgid "Paused: User initiated.  Click 'Resume' to continue"
-#~ msgstr "Pauză: Iniţiată de utilizator.  Selectaţi 'Reia' pentru a continua"
-#~ msgid "Paused: User active"
-#~ msgstr "Pauză: Utilizator activ"
-#~ msgid "Paused: Computer on battery"
-#~ msgstr "Pauză: Calculator pe baterii"
-#~ msgid "Paused: Time of Day"
-#~ msgstr "Pauză: Ora"
-#~ msgid "Paused: Benchmarks running"
-#~ msgstr "Pauză: Rulează benchmarks"
-#~ msgid "Paused"
-#~ msgstr "Pauză"
-#~ msgid "Paused: Application start delayed"
-#~ msgstr "Pauză: Start aplicaţie întârziat"
-#~ msgid "Click to show project graphics"
-#~ msgstr "Selectaţi pentru a afişa grafica proiectului"
-#~ msgid "Open a window to view messages"
-#~ msgstr "Deschide o fereastră pentru a vedea mesajele"
-#~ msgid "Stop all activity"
-#~ msgstr "Opreşte toată activitatea"
-#~ msgid "Resume activity"
-#~ msgstr "Reia activitatea"
-#~ msgid "Open a window to set your preferences"
-#~ msgstr "Deschide o fereastră pentru a seta preferinţele"
-#~ msgid "Switch to the BOINC advanced view"
-#~ msgstr "Comută BOINC la vizualizare avansată"
-
-# 75%
-#~ msgid "My Projects:"
-#~ msgstr "Proiectele Mele:"
-#, c-format
-#~ msgid "%s. Work done by %s: %0.2f"
-#~ msgstr "%s. Lucru finalizat de %s: %0.2f"
+#: sg_TaskPanel.cpp:832
+msgid "Not Available"
+msgstr "Indisponibil"
 
+#: sg_TaskPanel.cpp:847
 #, c-format
-#~ msgid "%.1lf"
-#~ msgstr "%.1lf"
+msgid "Elapsed: %s"
+msgstr "Scurs: %s"
 
+#: sg_TaskPanel.cpp:861
 #, c-format
-#~ msgid "%d hr %d min %d sec"
-#~ msgstr "%d hr %d min %d sec"
-
-# Not quite pleasing...
-#~ msgid "Are you sure you want to display graphics on a remote machine?"
-#~ msgstr "Sunteţi sigur că doriţi să afişaţi graficele pe o maşină la distanţă?"
-#~ msgid "Application: "
-#~ msgstr "Aplicaţie: "
-#~ msgid "Time Remaining: "
-#~ msgstr "Timp Rămas: "
-#~ msgid "Elapsed Time: "
-#~ msgstr "Timp Scurs: "
-#~ msgid "Account manager website"
-#~ msgstr "Website manager de cont"
-#~ msgid "Account Manager &URL:"
-#~ msgstr "&URL Manager de Cont:"
-#, c-format
-#~ msgid "%s &website"
-#~ msgstr "%s &website"
-#~ msgid "Notice List"
-#~ msgstr "Listă Anunţuri"
+msgid "Remaining (estimated): %s"
+msgstr "Rămas (estimat): %s"
 
+#: sg_TaskPanel.cpp:876
 #, c-format
-#~ msgid "%s; received on %s"
-#~ msgstr "%s; recepţionat în %s"
+msgid "Status: %s"
+msgstr "Stare: %s"
 
-#, c-format
-#~ msgid "%s; received from %s; on %s"
-#~ msgstr "%s; recepţionat de la %s; în %s"
-#~ msgid "Click"
-#~ msgstr "Selectaţi"
-#~ msgid "Project List"
-#~ msgstr "Listă Proiecte"
-#~ msgid "Nvidia GPU Supported"
-#~ msgstr "GPU Nvidia Suportat"
-#~ msgid "ATI GPU Supported"
-#~ msgstr "GPU ATI Suportat"
-#~ msgid "Project Website"
-#~ msgstr "Site web Proiect"
-#~ msgid "One or more items failed to load from the Internet."
-#~ msgstr "Unul sau mai multe elemente nu s-au putut încărca de pe Internet."
-
-# 88%
-#~ msgid "Retry now"
-#~ msgstr "Reîncearcă acum"
-#~ msgid "10%"
-#~ msgstr "10%"
-#~ msgid "20%"
-#~ msgstr "20%"
-#~ msgid "30%"
-#~ msgstr "30%"
-#~ msgid "40%"
-#~ msgstr "40%"
-#~ msgid "50%"
-#~ msgstr "50%"
-#~ msgid "60%"
-#~ msgstr "60%"
-#~ msgid "70%"
-#~ msgstr "70%"
-#~ msgid "80%"
-#~ msgstr "80%"
-#~ msgid "90%"
-#~ msgstr "90%"
-#~ msgid "100%"
-#~ msgstr "100%"
-#~ msgid "1"
-#~ msgstr "1"
-#~ msgid "3"
-#~ msgstr "3"
-#~ msgid "5"
-#~ msgstr "5"
-#~ msgid "10"
-#~ msgstr "10"
-#~ msgid "15"
-#~ msgstr "15"
-#~ msgid "30"
-#~ msgstr "30"
-#~ msgid "60"
-#~ msgstr "60"
-#, c-format
-#~ msgid "Pop up a menu of websites for project %s"
-#~ msgstr "Deschide un meniu cu site-urile web pentru proiectul %s"
-#~ msgid ""
-#~ "for accessibility support, please select advanced from the view menu or type "
-#~ "command shift a"
-#~ msgstr ""
-#~ "pentru suport persoane cu dizabilităţi, vă rugăm selectaţi avansat din "
-#~ "meniul view sau tastaţi control shift a"
-#~ msgid "This panel contains graphs showing user totals for projects"
-#~ msgstr ""
-#~ "Acest panou conţine grafice prezentând totalurile utilizatorului pentru "
-#~ "proiecte"
-#~ msgid "list headers"
-#~ msgstr "antete listă"
-#~ msgid "list of events"
-#~ msgstr "lista de evenimente"
-#~ msgid "list of events is empty"
-#~ msgstr "lista de evenimente este goală"
+#: sg_TaskPanel.cpp:1223
+msgid "Retrieving current status."
+msgstr "Se primeşte starea curentă."
 
-#, c-format
-#~ msgid "list of %s"
-#~ msgstr "lista de %s"
+#: sg_TaskPanel.cpp:1229
+msgid "Downloading work from the server."
+msgstr "Se descarcă de lucru de la server."
 
-#, c-format
-#~ msgid "list of %s is empty"
-#~ msgstr "lista de %s este goală"
+#: sg_TaskPanel.cpp:1234
+msgid "Processing Suspended:  Running On Batteries."
+msgstr "Procesare Suspendată:  Se Rulează Pe Baterii."
 
-#, c-format
-#~ msgid "; current sort column %d of %d; descending order; "
-#~ msgstr "; coloana sortare curentă %d din %d; ordine descendentă; "
+#: sg_TaskPanel.cpp:1236
+msgid "Processing Suspended:  User Active."
+msgstr "Procesare Suspendată:  Utilizator Activ."
 
-#, c-format
-#~ msgid "; current sort column %d of %d; ascending order; "
-#~ msgstr "; coloana sortare curentă %d of %d; ordine ascendentă; "
+#: sg_TaskPanel.cpp:1238
+msgid "Processing Suspended:  User paused processing."
+msgstr "Procesare Suspendată:  Utilizatorul a oprit procesarea."
 
-#, c-format
-#~ msgid "; column %d of %d; "
-#~ msgstr "; coloana %d din %d; "
-#~ msgid "list is empty"
-#~ msgstr "lista este goală"
+#: sg_TaskPanel.cpp:1240
+msgid "Processing Suspended:  Time of Day."
+msgstr "Procesare Suspendată:  Ora."
 
-#, c-format
-#~ msgid "; row %d; "
-#~ msgstr "; linia %d; "
+#: sg_TaskPanel.cpp:1242
+msgid "Processing Suspended:  Benchmarks Running."
+msgstr "Procesare Suspendată:  Rulează Benchmarks."
 
-#, c-format
-#~ msgid "; selected row %d of %d; "
-#~ msgstr "; linia selectată %d din %d; "
+#: sg_TaskPanel.cpp:1244
+msgid "Processing Suspended."
+msgstr "Procesare Suspendată."
 
-#, c-format
-#~ msgid "; selected row %d ; "
-#~ msgstr "; linia selectată %d ; "
+#: sg_TaskPanel.cpp:1248
+msgid "Waiting to contact project servers."
+msgstr "În aşteptarea contactării serverelor de proiect."
 
-#, c-format
-#~ msgid "; row %d of %d; "
-#~ msgstr "; linia %d din %d; "
-#~ msgid "blank"
-#~ msgstr "gol"
-#~ msgid "list of projects or account managers"
-#~ msgstr "lista proiectelor sau managerilor de cont"
+#: sg_TaskPanel.cpp:1252 sg_TaskPanel.cpp:1261
+msgid "Retrieving current status"
+msgstr "Se primeşte starea curentă"
 
-#, c-format
-#~ msgid "selected row %d of %d; "
-#~ msgstr "rândul selectat %d din %d; "
+#: sg_TaskPanel.cpp:1256
+msgid "No work available to process"
+msgstr "Nu există lucru disponibil pentru procesare"
 
-#, c-format
-#~ msgid "row %d of %d; "
-#~ msgstr "rândul %d din %d; "
-#~ msgid "The minimum username length for this project is 1. Please enter a different username."
-#~ msgstr ""
-#~ "Lungimea minimă a numelui de utilizator pentru acest proiect este 1. Vă "
-#~ "rugăm introduceţi un alt nume de utilizator."
-#~ msgid "The minimum username length for this account manager is 1. Please enter a different username."
-#~ msgstr ""
-#~ "Lungimea minimă a numelui de utilizator pentru acest manager de cont este 1. "
-#~ "Vă rugăm introduceţi un alt nume de utilizator."
-#~ msgid "The minimum email address length for this project is 1. Please enter a different email address."
-#~ msgstr ""
-#~ "Lungimea minimă a adresei de email pentru acest proiect este 1. Vă rugăm "
-#~ "introduceţi o altă adresă de email."
-#~ msgid "The minimum email address length for this account manager is 1. Please enter a different email address."
-#~ msgstr ""
-#~ "Lungimea minimă a adresei de email pentru acest manager de cont este 1. Vă "
-#~ "rugăm introduceţi o altă adresă de email."
+#: sg_TaskPanel.cpp:1258
+msgid "Unable to connect to the core client"
+msgstr "Nu s-a putut conecta la nucleul clientului"
 
-#, c-format
-#~ msgid "The minimum password length for this project is %d. Please enter a different password."
-#~ msgstr ""
-#~ "Lungimea minimă pentru parola acestui proiect este %d. Va rugăm alegeţi o "
-#~ "alta parolă."
+#: wizardex.cpp:377 wizardex.cpp:553
+msgid "&Next >"
+msgstr "&Următorul >"
 
-#, c-format
-#~ msgid "The minimum password length for this account manager is %d. Please enter a different password."
-#~ msgstr ""
-#~ "Lungimea minimă pentru parola acestui manager de cont este %d. Va rugăm "
-#~ "alegeţi o alta parolă."
-#~ msgid ""
-#~ "An error has occurred;\n"
-#~ "check the Event Log for details.\n"
-#~ "\n"
-#~ "Click Finish to close."
-#~ msgstr ""
-#~ "A apărut o eroare;\n"
-#~ "verificaţi Jurnalul de Evenimente pentru detalii.\n"
-#~ "\n"
-#~ "Apăsaşi Finalizare pentru a închide."
+#: wizardex.cpp:383
+msgid "< &Back"
+msgstr "< &Înapoi"
 
-#, no-c-format
-#~ msgid "% of the processors"
-#~ msgstr "% din procesoare"
+#: wizardex.cpp:553
+msgid "&Finish"
+msgstr "&Finalizare"
 
-#, c-format
-#~ msgid "New page inserted. Index = %i"
-#~ msgstr "Pagină nouă inserată. Index = %i"
+#: mac/Mac_GUI.cpp:110
+msgid "Preferences…"
+msgstr "Preferinţe…"
 
-#, c-format
-#~ msgid "New page appended. Index = %i"
-#~ msgstr "Pagină nouă adăugată. Index = %i"
+#: mac/Mac_GUI.cpp:122
+msgid "Services"
+msgstr "Servicii"
 
+#: mac/Mac_GUI.cpp:144
 #, c-format
-#~ msgid "Old Page Index = %i"
-#~ msgstr "Index Pagină Veche = %i"
+msgid "Hide %s"
+msgstr "Ascunde %s"
 
-#, c-format
-#~ msgid "OnDropTarget: index by HitTest = %i"
-#~ msgstr "OnDropTarget: index de HitTest = %i"
-
-#, fuzzy
-#~ msgid ""
-#~ "(C) 2003-2011 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2005 University of California at Berkeley.\n"
-#~ "Toate drepturile rezervate."
-#~ msgid "Click 'Retry now' to transfer the file now"
-#~ msgstr "Apasaţi 'Reîncearcă' pentru a transfera fişierul acum"
-#~ msgid ""
-#~ "Click 'Abort transfer' to delete the file from the transfer queue. This "
-#~ "will prevent you from being granted credit for this result."
-#~ msgstr ""
-#~ "Apasaţi 'Renunţă la transfer' pentru a şterge fişierul din coada de "
-#~ "aşteptare. In urma acestei acţiuni nu veţi primi credit pentru acest "
-#~ "rezultat."
-#~ msgid "Aborting result..."
-#~ msgstr "Renunţare la rezultat..."
-
-#, fuzzy
-#~ msgid "Don't fetch NVIDIA GPU tasks"
-#~ msgstr "Nu vor fi luate sarcini noi"
-
-#, fuzzy
-#~ msgid "Don't fetch ATI GPU tasks"
-#~ msgstr "Nu vor fi luate sarcini noi"
-#~ msgid "Web sites"
-#~ msgstr "Sit-uri web"
-#~ msgid "Retrieving host information; please wait..."
-#~ msgstr "Recuperare informaţii despre host; vă rugăm aşteptaţi..."
-#~ msgid "Failed to attach to project"
-#~ msgstr "Ataşare la proiect eşuată."
-#~ msgid "Attach to project"
-#~ msgstr "Ataşare la proiect"
-#~ msgid "You are now successfully attached to this project."
-#~ msgstr "Ataşarea la proiect s-a incheiat cu succes."
-#~ msgid "Detach"
-#~ msgstr "Detaşează"
-#~ msgid "Detaching from project..."
-#~ msgstr "Detaşare de la proiect..."
-#~ msgid "Are you sure you want to detach from project '%s'?"
-#~ msgstr "Sunteţi sigur că doriţi să vă detaşaţi de la proiectul '%s'?"
-#~ msgid "Detach from Project"
-#~ msgstr "Detaşare de la proiect"
-#~ msgid "To completion"
-#~ msgstr "Până la finalizare"
-#~ msgid "Attaching to project..."
-#~ msgstr "Ataşare la proiect..."
-#~ msgid "Debug Flags"
-#~ msgstr "Indicatori de depanare"
-#~ msgid "Project Properties Failure"
-#~ msgstr "Eşuare Proprietăţi Proiect"
-#~ msgid "Project Properties URL Failure"
-#~ msgstr "Eşuare URL Proprietăţi Proiect"
-#~ msgid "Account Creation Disabled"
-#~ msgstr "Creare Cont Dezactivată"
-#~ msgid "Client Account Creation Disabled"
-#~ msgstr "Creare Cont Client Dezactivată"
-#~ msgid "Account Already Exists"
-#~ msgstr "Contul Există Deja"
-#~ msgid "Project Already Attached"
-#~ msgstr "Proiect Deja Ataşat"
-#~ msgid "Project Attach Failure"
-#~ msgstr "Eşuare Ataşare Proiect"
-#~ msgid "Net Detection Failure"
-#~ msgstr "Eşuare Detectare Reţea"
-#~ msgid "You are already attached to this project."
-#~ msgstr "Sunteţi deja ataşat la acest proiect."
-#~ msgid "&Open BOINC Manager..."
-#~ msgstr "Deschide B&OINC Manager"
-#~ msgid "&About BOINC Manager..."
-#~ msgstr "Despre BOINC Manager"
-#~ msgid ""
-#~ "A software platform for distributed computing using volunteered computer "
-#~ "resources"
-#~ msgstr ""
-#~ "O platformă software pentru procesare distribuită cu ajutorul resurselor "
-#~ "de calcul puse la dispoziţie de voluntari"
-#~ msgid ""
-#~ "Account managers make it easy to find and join BOINC projects.\n"
-#~ "For more information, click on the link below."
-#~ msgstr ""
-#~ "Account managers facilitează găsirea si implicarea in proiectele BOINC. \n"
-#~ " Pentru mai multe informaţii, accesaţi linkul de mai jos."
-#~ msgid "Login:"
-#~ msgstr "Login:"
-#~ msgid "Your current account manager is:"
-#~ msgstr "Account managerul curent este:"
-#~ msgid "foo"
-#~ msgstr "foo"
-#~ msgid "&Update"
-#~ msgstr "&Actualizare"
-#~ msgid "Change"
-#~ msgstr "Schimbă"
-#~ msgid "Language Selection:"
-#~ msgstr "Selecţie limbă:"
-#~ msgid "What language should the manager display by default."
-#~ msgstr "Limba utilizată implicit de manager."
-#~ msgid "Reminder Frequency:"
-#~ msgstr "Frecvenţa reminder-ului:"
-#~ msgid ""
-#~ "How often, in minutes, should the manager remind you of possible "
-#~ "connection events."
-#~ msgstr ""
-#~ "Cât de des, în minute, va raporta managerul posibile evenimente ale "
-#~ "conexiunii."
-#~ msgid "&Automatically detect network connection settings"
-#~ msgstr "Detectează &automat setările pentru conectarea la retea"
-#~ msgid "Use my &Local Area Network(LAN) connection"
-#~ msgstr "Utilizează conexiunea mea la reţeaua locală (LAN)"
-#~ msgid "Use my &Dial-up and Virtual Private Network connection"
-#~ msgstr "Utilizează conexiunea mea Dial-up şi Virtual Private Network"
-#~ msgid "&Prompt for username and password"
-#~ msgstr "Solicită nume utilizator si parola"
-#~ msgid "Failed to create wxStaticText, needed by wxHyperLink!"
-#~ msgstr "Creare wxStaticText necesară pentru wxHyperLink eşuată!"
-#~ msgid "View information about your team: BOINC Synergy"
-#~ msgstr "Informaţii despre echipa dvs.: BOINC Synergy"
-#~ msgid "BOINC Manager - Connection Error"
-#~ msgstr "BOINC Manager - Eroare la conectare"
-#~ msgid "BOINC Manager - Connection failed"
-#~ msgstr "BOINC Manager - Conexiune eşuată"
-#~ msgid "Connection failed."
-#~ msgstr "Conexiune eşuată"
-#~ msgid "BOINC info"
-#~ msgstr "Info BOINC"
-#~ msgid "&Hide"
-#~ msgstr "Ascunde"
-#~ msgid "Hides the main BOINC Manager window"
-#~ msgstr "Ascunde fereastra principala BOINC Manager"
-#~ msgid "Run &Benchmarks"
-#~ msgstr "Rulează &Benchmarks"
-#~ msgid "Exit the BOINC Manager"
-#~ msgstr "Ieşire BOINC Manager"
-#~ msgid "&Manage Accounts"
-#~ msgstr "&Gestionează conturile"
-#~ msgid ""
-#~ "Connect to an account manager website and update all of your accounts"
-#~ msgstr ""
-#~ "Conectare la websit-ul account manager si actualizează toate conturile"
-#~ msgid "&Options"
-#~ msgstr "&Opţiuni"
-#~ msgid "&BOINC Manager\tF1"
-#~ msgstr "&BOINC Manager\tF1"
-#~ msgid "Show information about BOINC and BOINC Manager"
-#~ msgstr "Afisează informaţii despre BOINC si BOINC Manager"
-#~ msgid "Language Selection..."
-#~ msgstr "Selecţie limbă..."
-#~ msgid "BOINC Manager - Network Status"
-#~ msgstr "BOINC Manager - Starea reţelei"
-#~ msgid ""
-#~ "BOINC needs a connection to the Internet to perform some maintenance, "
-#~ "open the BOINC Manager to connect up and perform the needed work."
-#~ msgstr ""
-#~ "BOINC necesită o conexiune la Internet pentru operaţii de mentenanţă. "
-#~ "Deschideţi BOINC Manager pentru conectare şi efectuarea operaţiilor "
-#~ "necesare. "
-#~ msgid "Update All"
-#~ msgstr "Actualizează totul"
-#~ msgid ""
-#~ "Report all upload items, completed work, get latest credit, get latest "
-#~ "preferences, and possibly get more work."
-#~ msgstr ""
-#~ "Raportează toate elementele de upload, sarcinile incheiate, actualizează "
-#~ "creditul, actualizează preferinţele şi, eventual, cere alte sarcini."
-#~ msgid "Attach to new project"
-#~ msgstr "Ataşează la un proiect nou"
-#~ msgid ""
-#~ "Attach this computer to a BOINC project.  You'll need a project URL and "
-#~ "account key (visit the project's web site to get these)."
-#~ msgstr ""
-#~ "Ataşează acest computer la un proiect BOINC. Veţi avea nevoie de un URL "
-#~ "al proiectului si o cheie de cont (account key). Vizitaţi site-ul "
-#~ "proiectului pentru a le obţine."
-#~ msgid "Total credit"
-#~ msgstr "Credit total"
-#~ msgid "Avg. credit"
-#~ msgstr "Credit mediu"
-#~ msgid "Updating all project(s)..."
-#~ msgstr "In curs de actualizare a tuturor proiectelor..."
-#~ msgid "Allow new work"
-#~ msgstr "Acceptă sarcini noi"
-#~ msgid "Disk Space"
-#~ msgstr "Spaţiu pe disk"
-#~ msgid "Are you sure you want to abort this file transfer '%s'?"
-#~ msgstr "Sunteţi sigur că doriti să renunţaţi la transferul fişierului '%s'?"
-#~ msgid "Work"
-#~ msgstr "Lucru"
-#~ msgid "Resuming result..."
-#~ msgstr "Reluare rezultat..."
-#~ msgid "Abort result"
-#~ msgstr "Renunţare rezultat"
-#~ msgid "Preempted"
-#~ msgstr "Înlocuit"
-#~ msgid "Ready to run"
-#~ msgstr "Gata de rulare"
-#~ msgid "Activities suspended by user"
-#~ msgstr "Activităţi suspendate de utilizator"
-#~ msgid "Attach to Project"
-#~ msgstr "Ataşare la Proiect"
-#~ msgid "Project Comm Failure"
-#~ msgstr "Eşuare Comunicare Proiect"
-#~ msgid "Google Comm Failure"
-#~ msgstr "Eşuare Comunicare Google"
-#~ msgid "Yahoo Comm Failure"
-#~ msgstr "Eşuare Comunicare Yahoo"
-#~ msgid "Project URL"
-#~ msgstr "URL proiect"
-#~ msgid "Enter the URL of the project's web site."
-#~ msgstr "Introduceţi URL-ul proiectului."
-#~ msgid "For a list of BOINC-based projects go to:"
-#~ msgstr "Pentru o listă a proiectelor bazate pe BOINC accesaţi:"
-#~ msgid "Enter account key"
-#~ msgstr "Introduceţi cheia de cont (account key)"
-#~ msgid "This project uses an \"account key\" to identify you."
-#~ msgstr ""
-#~ "Acest proiect utilizează o \"cheie de cont\" pentru a vă identifica."
-#~ msgid ""
-#~ "Go to the project's web site to create an account. Your account\n"
-#~ "key will be emailed to you."
-#~ msgstr ""
-#~ "Accesaţi web site-ul proiectului pentru a vă crea un cont.\n"
-#~ "Veţi primi prin e-maill cheia de cont."
-#~ msgid "An account key looks like:"
-#~ msgstr "O cheie de cont are forma:"
-#~ msgid "82412313ac88e9a3638f66ea82186948"
-#~ msgstr "82412313ac88e9a3638f66ea82186948"
-#~ msgid "Account key:"
-#~ msgstr "Cheia de cont (Account key):"
-#~ msgid "Account information"
-#~ msgstr "Informaţii cont"
-#~ msgid "Do you wish to use an existing account or create a new one?"
-#~ msgstr "Doriţi să utilizaţi un cont existent sau să creaţi un cont nou?"
-#~ msgid "Create new account"
-#~ msgstr "Crează cont nou"
-#~ msgid "Use existing account"
-#~ msgstr "Utilizează contul existent"
-#~ msgid "Attach to Project Wizard"
-#~ msgstr "Wizard ataşare la proiect"
-#~ msgid "The URL you supplied is not that of a BOINC-based project."
-#~ msgstr "URL-ul pe care l-aţi folosit nu este cel al unui proiect BOINC."
-#~ msgid "Please check the URL and try again."
-#~ msgstr "Vă rugam verificaţi URL-ul şi reîncercaţi."
-#~ msgid "Account not found"
-#~ msgstr "Contul nu a fost găsit."
-#~ msgid "Verify your account name and password are correct and try again."
-#~ msgstr "Verificaţi numele de cont si parola si reîncercaţi."
-#~ msgid "Account creation disabled"
-#~ msgstr "Crearea conturilor dezactivată"
-#~ msgid ""
-#~ "We were unable to communicate with the project or other web\n"
-#~ "sites.\n"
-#~ "\n"
-#~ "Often this means that you are using a proxy server, and you need\n"
-#~ "to tell us about it.\n"
-#~ "\n"
-#~ "Click Next to do proxy configuration."
-#~ msgstr ""
-#~ "Nu am reusit să comunicăm cu proiectul sau alte adrese web.\n"
-#~ "\n"
-#~ "De regulă aceasta se datorează faptului că dvs. utilizaţi un proxy "
-#~ "server.\n"
-#~ "Este necesar să specificati date în legătură cu acesta.\n"
-#~ "\n"
-#~ "Apasaţi Next pentru a seta configuraţia proxy."
-#~ msgid ""
-#~ "If you're using an HTTP proxy, enter its info here.\n"
-#~ "\n"
-#~ "If you're not sure, click Autodetect."
-#~ msgstr ""
-#~ "Dacă utilizaţi un proxy HTTP, introduceti informaţiile necesare aici.\n"
-#~ "\n"
-#~ "Dacă nu sunteţi sigur, apăsaţi Autodetectare."
-#~ msgid ""
-#~ "If you're using a SOCKS proxy, enter its info here.\n"
-#~ "\n"
-#~ "If you're not sure, click Autodetect."
-#~ msgstr ""
-#~ "Dacă utilizaţi un proxy SOCKS, introduceţi informaţiile necesare aici.\n"
-#~ "\n"
-#~ "Dacă nu sunteţi sigur, apăsaţi Autodetectare."
-#~ msgid "Click Next to continue."
-#~ msgstr "Apăsaţi Next pentru a continua."
-#~ msgid "Ref Count Page"
-#~ msgstr "Ref Count Page"
-#~ msgid "This page should never be used in the wizard itself."
-#~ msgstr "Această pagină nu trebuie folosită în wizard."
-#~ msgid ""
-#~ "This page just increases the refcount of various bitmap resources\n"
-#~ "so that DialogBlocks doesn't nuke the refences to them."
-#~ msgstr ""
-#~ "Această pagină are doar rolul de a mări numărul de referinţe ale "
-#~ "diverselor resurse de tip bitmap \n"
-#~ " astfel încât DiagBlocks nu le elimină."
-#~ msgid "About BOINC Manager"
-#~ msgstr "Despre BOINC Manager"
-#~ msgid "Dialup Logon"
-#~ msgstr "Logon prin Dial-up"
+#: mac/Mac_GUI.cpp:158
+msgid "Hide Others"
+msgstr "Ascunde Restul"
+
+#: mac/Mac_GUI.cpp:172
+msgid "Show All"
+msgstr "Arată Tot"
 
+#: mac/Mac_GUI.cpp:186
+#, c-format
+msgid "Quit %s"
+msgstr "Închide %s"
diff --git a/locale/ro/BOINC-Setup.mo b/locale/ro/BOINC-Setup.mo
index aa2837d..adc9e76 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
old mode 100755
new mode 100644
index 1e31c34..999d5fe
--- a/locale/ro/BOINC-Setup.po
+++ b/locale/ro/BOINC-Setup.po
@@ -1,40 +1,32 @@
 # 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: BOINC 7.4\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-12 01:00-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: ro\n"
+"PO-Revision-Date: 2015-02-09 00:25+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\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"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-Basepath: /Volumes/Cheer/BOINC_GIT/boinc_trunk\n"
-"X-POOTLE-MTIME: 1391439498.0\n"
-"X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: mac_installer\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
 #: Installer.cpp:124
 #, c-format
 msgid "Sorry, this version of %s requires system 10.5 or higher."
 msgstr "Ne pare rău, această versiune de %s necesită versiune de sistem 10.5 sau mai mare."
 
-#: PostInstall.cpp:130
-#: PostInstall.cpp:1136
-#: uninstall.cpp:1618
+#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
 msgid "Yes"
 msgstr "Da"
 
-#: PostInstall.cpp:131
-#: PostInstall.cpp:1137
-#: uninstall.cpp:1619
+#: PostInstall.cpp:131 PostInstall.cpp:1137 uninstall.cpp:1619
 msgid "No"
 msgstr "Nu"
 
@@ -48,10 +40,7 @@ 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 ""
-"Utilizatorii cu permisiuni de administrare ale acestui calculator vor avea automat permisiunea de a rula si controla %s.\n"
-"\n"
-"Doriţi să permiteţi şi utilizatorilor fără drepturi de administrare să ruleze şi să controleze %s pe acest Mac?"
+msgstr "Utilizatorii cu permisiuni de administrare ale acestui calculator vor avea automat permisiunea de a rula si controla %s.\n\nDoriţi să permiteţi şi utilizatorilor fără drepturi de administrare să ruleze şi să controleze %s pe acest Mac?"
 
 #: PostInstall.cpp:1444
 #, c-format
@@ -70,9 +59,7 @@ msgstr "Eroare permisiuni după relansare"
 msgid ""
 "Removal may take several minutes.\n"
 "Please be patient."
-msgstr ""
-"Ştergerea poate dura câteva minute.\n"
-"Vă rugăm aşteptaţi."
+msgstr "Ştergerea poate dura câteva minute.\nVă rugăm aşteptaţi."
 
 #: uninstall.cpp:156
 #, c-format
@@ -80,10 +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 ""
-"Sunteţi sigur că doriţi să ştergeţi complet %s de pe calculatorul dumneavoastră?\n"
-"\n"
-"Vor fi şterse executabilele dar nu vor fi atinse fişierele de date %s."
+msgstr "Sunteţi sigur că doriţi să ştergeţi complet %s de pe calculatorul dumneavoastră?\n\nVor fi şterse executabilele dar nu vor fi atinse fişierele de date %s."
 
 #: uninstall.cpp:163
 #, c-format
@@ -103,9 +87,7 @@ msgstr "nume  al utilizatorului"
 msgid ""
 "Do you also want to remove VirtualBox from your computer?\n"
 "(VirtualBox was installed along with BOINC.)"
-msgstr ""
-"Doriţi să ştergeţi şi VirtualBox de pe calculatorul dumneavoastră?\n"
-"(VirtualBox a fost instalat împreună cu BOINC.)"
+msgstr "Doriţi să ştergeţi şi VirtualBox de pe calculatorul dumneavoastră?\n(VirtualBox a fost instalat împreună cu BOINC.)"
 
 #: uninstall.cpp:312
 #, c-format
@@ -117,23 +99,14 @@ msgid ""
 "\n"
 "for each user, the file\n"
 "\"%s\"."
-msgstr ""
-"Ştergere încheiată.\n"
-"\n"
-"Dacă doriţi puteţi să ştergeţi elementele rămase folosind Finder: \n"
-"directorul \"%s\"\n"
-"\n"
-"pentru fiecare utilizator, fişierul\n"
-"\"%s\"."
+msgstr "Ştergere încheiată.\n\nDacă doriţi puteţi să ştergeţi elementele rămase folosind Finder: \ndirectorul \"%s\"\n\npentru fiecare utilizator, fişierul\n\"%s\"."
 
 #: uninstall.cpp:840
 #, c-format
 msgid ""
 "Enter your administrator password to completely remove %s from you computer.\n"
 "\n"
-msgstr ""
-"Introduceţi parola administrativă pentru a elimina complet %s de pe calculatorul dumneavoastră.\n"
-"\n"
+msgstr "Introduceţi parola administrativă pentru a elimina complet %s de pe calculatorul dumneavoastră.\n\n"
 
 #: uninstall.cpp:1616
 msgid "Cancel"
@@ -142,10 +115,3 @@ msgstr "Anulează"
 #: uninstall.cpp:1617
 msgid "Continue..."
 msgstr "Continuă..."
-
-#, c-format
-#~ msgid "Sorry, this version of %s requires system 10.4 or higher."
-#~ msgstr ""
-#~ "Ne pare rău, această versiune de %s necesită versiune de sistem 10.4 sau mai "
-#~ "mare."
-
diff --git a/locale/ro/BOINC-Web.mo b/locale/ro/BOINC-Web.mo
index d6ce2e3..3d03daa 100644
Binary files a/locale/ro/BOINC-Web.mo and b/locale/ro/BOINC-Web.mo differ
diff --git a/locale/ro/BOINC-Web.po b/locale/ro/BOINC-Web.po
index ce52856..93582ce 100755
--- a/locale/ro/BOINC-Web.po
+++ b/locale/ro/BOINC-Web.po
@@ -4,23 +4,25 @@
 # FileID  : $Id$
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\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-12 01:01-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: 2014-02-03 14:59+0000\n"
+"Last-Translator: Marius <marius.sirbu at outlook.com>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
 "X-Generator: Pootle 2.5.0\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
+"X-Poedit-SearchPath-0: doc\n"
 "X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
 "X-POOTLE-MTIME: 1391439569.0\n"
 "X-Poedit-KeywordsList: tra\n"
-"X-Poedit-SearchPath-0: doc\n"
 
 #: docutil.php:21
 msgid "Search"
@@ -36,8 +38,13 @@ msgid "This page is %stranslatable%s."
 msgstr "Această pagină poate fi %stradusă%s."
 
 #: download.php:39
-msgid "We recommend that you also install VirtualBox, so your computer can work on science projects that require it."
-msgstr "Vă recomandăm să instalaţi şi VirtualBox, astfel încât calculatorul dumneavoastră să poată lucra la proiectele ştiinţifice cărora le este necesar."
+msgid ""
+"We recommend that you also install VirtualBox, so your computer can work on "
+"science projects that require it."
+msgstr ""
+"Vă recomandăm să instalaţi şi VirtualBox, astfel încât calculatorul "
+"dumneavoastră să poată lucra la proiectele ştiinţifice cărora le este "
+"necesar."
 
 #: download.php:41
 msgid "Learn more about VirtualBox."
@@ -47,14 +54,12 @@ msgstr "Aflaţi mai multe despre VirtualBox."
 msgid "Download BOINC + VirtualBox"
 msgstr "Descărcaţi BOINC + Virtualbox"
 
-#: download.php:54
-#: download.php:69
+#: download.php:54 download.php:69
 #, php-format
 msgid "for %s"
 msgstr "pentru %s"
 
-#: download.php:57
-#: download.php:72
+#: download.php:57 download.php:72
 #, php-format
 msgid "BOINC version %s"
 msgstr "BOINC versiunea %s"
@@ -69,20 +74,38 @@ msgid "Download BOINC"
 msgstr "Descarcă BOINC"
 
 #: download.php:123
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others."
-msgstr "BOINC este un program care vă permite să donaţi timpul liber al calculatorului dumneavoastră unor proiecte ştiinţifice cum ar fi SETI at home, Climateprediction.net, Rosetta at home, World Community Grid şi multor altora."
+msgid ""
+"BOINC is a program that lets you donate your idle computer time to science "
+"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, and many others."
+msgstr ""
+"BOINC este un program care vă permite să donaţi timpul liber al "
+"calculatorului dumneavoastră unor proiecte ştiinţifice cum ar fi SETI at home, "
+"Climateprediction.net, Rosetta at home, World Community Grid şi multor altora."
 
 #: download.php:125
-msgid "After installing BOINC on your computer, you can connect it to as many of these projects as you like."
-msgstr "După instalarea BOINC pe calculatorul dumneavoastră, puteţi să vă conectaţi la oricâte proiecte doriţi."
+msgid ""
+"After installing BOINC on your computer, you can connect it to as many of "
+"these projects as you like."
+msgstr ""
+"După instalarea BOINC pe calculatorul dumneavoastră, puteţi să vă conectaţi "
+"la oricâte proiecte doriţi."
 
 #: download.php:127
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
-msgstr "Puteţi rula acest program pe un calculator doar dacă este proprietatea dumneavoastră sau aveţi permisiunea proprietarului calculatorului."
+msgid ""
+"You may run this software on a computer only if you own the computer or have "
+"the permission of its owner."
+msgstr ""
+"Puteţi rula acest program pe un calculator doar dacă este proprietatea "
+"dumneavoastră sau aveţi permisiunea proprietarului calculatorului."
 
 #: download.php:132
-msgid "We recommend that you download BOINC from the Google Play Store or Amazon Appstore, not from here."
-msgstr "Vă recomandăm să descărcaţi BOINC din Google Play Store sau Amazon Appstore, nu de aici."
+msgid ""
+"We recommend that you download BOINC from the Google Play Store or Amazon "
+"Appstore, not from here."
+msgstr ""
+"Vă recomandăm să descărcaţi BOINC din Google Play Store sau Amazon Appstore, "
+"nu de aici."
 
 #: download.php:167
 msgid "System requirements"
@@ -92,8 +115,7 @@ msgstr "Cerinţe sistem"
 msgid "Release notes"
 msgstr "Note de lansare"
 
-#: download.php:169
-#: index.php:86
+#: download.php:169 index.php:86
 msgid "Help"
 msgstr "Ajutor"
 
@@ -115,21 +137,49 @@ msgstr "BOINC: calculaţi pentru ştiinţă"
 
 #: help.php:12
 #, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
-msgstr "Ajutorul Online BOINC vă permite să vorbiţi unul-la-unul cu utilizatori experimentaţi BOINC, care: %s răspunde întrebărilor despre BOINC şi calcule voluntare; %s sprijini în procesul de instalare şi utilizare al BOINC; %s îndruma spre rezolvarea oricărei probleme s-ar putea să aveţi."
+msgid ""
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who "
+"can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"through the process of installing and using BOINC; %s troubleshoot any "
+"problems you might have."
+msgstr ""
+"Ajutorul Online BOINC vă permite să vorbiţi unul-la-unul cu utilizatori "
+"experimentaţi BOINC, care: %s răspunde întrebărilor despre BOINC şi calcule "
+"voluntare; %s sprijini în procesul de instalare şi utilizare al BOINC; %s "
+"îndruma spre rezolvarea oricărei probleme s-ar putea să aveţi."
 
 #: help.php:21
 #, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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 "Ajutorul Online BOINC este bazat pe %sSkype%s, un sistem telefonic bazat pe Internet. Skype este gratuit (atât programul cât şi apelurile).  Dacă nu aveţi deja Skype, vă rugăm %ssă-l descărcaţi şi instalaţi acum%s.  Când aţi finalizat, întoarceţi-vă la această pagină."
+msgid ""
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. "
+"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 ""
+"Ajutorul Online BOINC este bazat pe %sSkype%s, un sistem telefonic bazat pe "
+"Internet. Skype este gratuit (atât programul cât şi apelurile).  Dacă nu "
+"aveţi deja Skype, vă rugăm %ssă-l descărcaţi şi instalaţi acum%s.  Când aţi "
+"finalizat, întoarceţi-vă la această pagină."
 
 #: help.php:28
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
-msgstr "Cel mai bun mod de a primi ajutor este prin voce, pentru care aveţi nevoie fie de un microfon şi boxe sau căşti pentru calculatorul dumneavoastră.  De asemenea puteţi folosi şi sistemul de conversaţie bazat pe text al Skype sau email (dacă nu aveţi Skype) pentru a comunica cu Voluntarii pentru Ajutor."
+msgid ""
+"The best way to get help is by voice, for which you need either built-in "
+"microphone and speakers or an external headset for your computer.  You can "
+"also use Skype's text-based chat system or regular email (if you don't have "
+"Skype) to communicate with Help Volunteers."
+msgstr ""
+"Cel mai bun mod de a primi ajutor este prin voce, pentru care aveţi nevoie "
+"fie de un microfon şi boxe sau căşti pentru calculatorul dumneavoastră.  De "
+"asemenea puteţi folosi şi sistemul de conversaţie bazat pe text al Skype sau "
+"email (dacă nu aveţi Skype) pentru a comunica cu Voluntarii pentru Ajutor."
 
 #: help.php:31
-msgid "Volunteers speaking several languages are available. Please select a language:"
-msgstr "Voluntari vorbind mai multe limbi sunt disponibili. Vă rugăm selectaţi o limbă:"
+msgid ""
+"Volunteers speaking several languages are available. Please select a "
+"language:"
+msgstr ""
+"Voluntari vorbind mai multe limbi sunt disponibili. Vă rugăm selectaţi o "
+"limbă:"
 
 #: help.php:47
 msgid "Be a Help Volunteer"
@@ -137,21 +187,36 @@ msgstr "Deveniţi un Voluntar pentru Ajutor"
 
 #: help.php:50
 #, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
-msgstr "Dacă sunteţi un utilizator experimentat BOINC, vă încurajăm %ssă deveniţi un Voluntar pentru Ajutor%s.  Este un mod minunta să ajutaţi cauza cercetărilor ştiinţifice şi a calculelor voluntare - şi este distractiv!"
+msgid ""
+"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+"Volunteer%s.  It's a great way to help the cause of scientific research and "
+"volunteer computing - and it's fun!"
+msgstr ""
+"Dacă sunteţi un utilizator experimentat BOINC, vă încurajăm %ssă deveniţi un "
+"Voluntar pentru Ajutor%s.  Este un mod minunta să ajutaţi cauza "
+"cercetărilor ştiinţifice şi a calculelor voluntare - şi este distractiv!"
 
 #: help.php:56
 #, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
-msgstr "Dacă sunteţi deja un Voluntar pentru Ajutor: pentru a edita setările, %sapăsaţi aici%s."
+msgid ""
+"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
+msgstr ""
+"Dacă sunteţi deja un Voluntar pentru Ajutor: pentru a edita setările, %"
+"sapăsaţi aici%s."
 
 #: help_funcs.php:107
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
-msgstr "Ajutorii BOINC sunt voluntari neplătiţi.  Sfatul lor nu este aprobat de BOINC sau de Universitatea din California."
+msgid ""
+"BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
+"or the University of California."
+msgstr ""
+"Ajutorii BOINC sunt voluntari neplătiţi.  Sfatul lor nu este aprobat de "
+"BOINC sau de Universitatea din California."
 
 #: help_funcs.php:110
 msgid "%1Never%2 give email address or password information to BOINC helpers."
-msgstr "%1Niciodată%2 nu furnizaţi informaţii despre adresa de email sau parola ajutorilor BOINC."
+msgstr ""
+"%1Niciodată%2 nu furnizaţi informaţii despre adresa de email sau parola "
+"ajutorilor BOINC."
 
 #: index.php:24
 msgid "Computing power"
@@ -197,9 +262,7 @@ msgstr "Voluntar"
 msgid "Download"
 msgstr "Descarcă"
 
-#: index.php:87
-#: index.php:120
-#: index.php:171
+#: index.php:87 index.php:120 index.php:171
 msgid "Documentation"
 msgstr "Documentaţie"
 
@@ -212,8 +275,14 @@ msgid "Links"
 msgstr "Legături"
 
 #: index.php:94
-msgid "Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:"
-msgstr "Folosiţi timpul liber al calculatorului dumneavoastră (Windows, Mac, Linux sau Android) pentru a trata boli, a studia încălzirea globală, a descoperi pulsari şi multe alte tipuri de cercetări ştiinţifice.  Este sigur şi uşor:"
+msgid ""
+"Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure "
+"diseases, study global warming, discover pulsars, and do many other types of "
+"scientific research.  It's safe, secure, and easy:"
+msgstr ""
+"Folosiţi timpul liber al calculatorului dumneavoastră (Windows, Mac, Linux "
+"sau Android) pentru a trata boli, a studia încălzirea globală, a descoperi "
+"pulsari şi multe alte tipuri de cercetări ştiinţifice.  Este sigur şi uşor:"
 
 #: index.php:96
 msgid "Choose projects"
@@ -229,8 +298,12 @@ msgstr "Introduceţi o adresă de email şi o parolă."
 
 #: index.php:102
 #, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
-msgstr "Sau, daca rulaţi mai multe proiecte, încercaţi un %smanager de cont%s cum ar fi %sGridRepublic%s sau %sBAM!%s. "
+msgid ""
+"Or, if you run several projects, try an %saccount manager%s such as %"
+"sGridRepublic%s or %sBAM!%s. "
+msgstr ""
+"Sau, daca rulaţi mai multe proiecte, încercaţi un %smanager de cont%s cum ar "
+"fi %sGridRepublic%s sau %sBAM!%s. "
 
 #: index.php:118
 msgid "Compute with BOINC"
@@ -241,12 +314,20 @@ msgid "Software updates"
 msgstr "Actualizări program"
 
 #: index.php:128
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
-msgstr "%1Cercetătorii%2: folosesc BOINC pentru a crea un %3proiect de calcule voluntare%4 oferind puterea de calcul a mii de CPU-uri."
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving "
+"you the computing power of thousands of CPUs."
+msgstr ""
+"%1Cercetătorii%2: folosesc BOINC pentru a crea un %3proiect de calcule "
+"voluntare%4 oferind puterea de calcul a mii de CPU-uri."
 
 #: index.php:132
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
-msgstr "%1Universităţile%2: folosesc BOINC pentru a crea un %3Centru Virtual de Supercalcule în Campus%4."
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
+msgstr ""
+"%1Universităţile%2: folosesc BOINC pentru a crea un %3Centru Virtual de "
+"Supercalcule în Campus%4."
 
 #: index.php:137
 msgid "%1Companies%2: use BOINC for %3desktop Grid computing%4."
@@ -318,8 +399,10 @@ msgstr "API pentru programe add-on"
 
 #: index.php:217
 #, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
-msgstr "Programe open-source pentru %scalcule voluntare%s şi %scalcule în reţea%s."
+msgid ""
+"Open-source software for %svolunteer computing%s and %sgrid computing%s."
+msgstr ""
+"Programe open-source pentru %scalcule voluntare%s şi %scalcule în reţea%s."
 
 #: index.php:230
 msgid "BOINC is based at The University of California, Berkeley"
@@ -338,8 +421,14 @@ msgid "Seismology"
 msgstr "Seismologie"
 
 #: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
-msgstr "Reţeaua Quake-Catcher dezvoltă cea mai mare reţea seismică mondială folosind senzori ataşaţi la calculatoare conectate la Internet.  Trebuie să cumpăraţi un senzor pentru a participa."
+msgid ""
+"The Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to Internet-connected computers.  You must buy a "
+"sensor to participate."
+msgstr ""
+"Reţeaua Quake-Catcher dezvoltă cea mai mare reţea seismică mondială folosind "
+"senzori ataşaţi la calculatoare conectate la Internet.  Trebuie să "
+"cumpăraţi un senzor pentru a participa."
 
 #: projects.inc:27
 msgid "BOINC Poland Foundation"
@@ -350,23 +439,29 @@ msgid "Environmental research"
 msgstr "Cercetări de mediu"
 
 #: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
-msgstr "Acest proiect crează continuu o harta a nivelului radiaţiei, disponibilă gratuit prin folosirea unor senzori conectaţi la calculatoarele voluntarilor.  Trebuie să cumpăraţi un senzor pentru a participa."
+msgid ""
+"This project is creating a free and continuously updated map of radiation "
+"levels by using sensors connected to volunteers' computers.  You must buy a "
+"sensor to participate."
+msgstr ""
+"Acest proiect crează continuu o harta a nivelului radiaţiei, disponibilă "
+"gratuit prin folosirea unor senzori conectaţi la calculatoarele "
+"voluntarilor.  Trebuie să cumpăraţi un senzor pentru a participa."
 
 #: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
-msgstr "Pentru a participa la aceste proiecte trebuie să cumpăraţi un senzor şi să îl ataşaţi la calculatorul dumneavoastră."
+msgid ""
+"To participate in these projects you must buy a sensor and attach it to your "
+"computer."
+msgstr ""
+"Pentru a participa la aceste proiecte trebuie să cumpăraţi un senzor şi să "
+"îl ataşaţi la calculatorul dumneavoastră."
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
 msgstr "Ştiinţe cognitive şi inteligenţă artificială"
 
-#: projects.inc:60
-#: projects.inc:364
-#: projects.inc:408
-#: projects.inc:457
-#: projects.inc:464
-#: projects.inc:511
+#: projects.inc:60 projects.inc:364 projects.inc:408 projects.inc:457
+#: projects.inc:464 projects.inc:511
 msgid "Private"
 msgstr "Privat"
 
@@ -375,8 +470,16 @@ msgid "Artificial intelligence"
 msgstr "Inteligenţă artificială"
 
 #: projects.inc:62
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
-msgstr "Analizează şi converteşte reţele semantice pentru a fi folosite în FreeHAL, o inteligenţă artificială care foloseşte reţele semantice, stemmere, părţi din baze de date de vorbire şi părţi de etichetatoare de vorbire pentru a imita comportamentul uman în conversaţii."
+msgid ""
+"Parse and convert semantic nets for use in FreeHAL, an artificial "
+"intelligence that uses semantic networks, stemmers, part of speech "
+"databases, and part of speech taggers in order to imitate human behavior in "
+"conversations."
+msgstr ""
+"Analizează şi converteşte reţele semantice pentru a fi folosite în FreeHAL, "
+"o inteligenţă artificială care foloseşte reţele semantice, stemmere, părţi "
+"din baze de date de vorbire şi părţi de etichetatoare de vorbire pentru a "
+"imita comportamentul uman în conversaţii."
 
 #: projects.inc:69
 msgid "Biology and Medicine"
@@ -391,8 +494,19 @@ msgid "Antimalarial drug discovery"
 msgstr "Descoperirea medicamentului antimalarie"
 
 #: projects.inc:84
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
-msgstr "Prazitul care cauzează malaria continuă să dezvolte rezistenţă la medicamentele disponibile. Din această cauză avem nevoie să descoperim urgent noi medicamente pentru a le înlocui pe cele existente. Foarte important, aceste noi medicamente trebuie să ţintească NOILE proteine din parazit. Proiectul FightMalaria at Home este orientat pentru găsirea acestor noi ţinte."
+msgid ""
+"The parasite that causes malaria continues to evolve resistance to available "
+"medication. We therefore urgently need to discover new drugs to replace "
+"existing drugs. Importantly, these new drugs need to target NEW proteins in "
+"the parasite. The FightMalaria at Home project is aimed at finding these new "
+"targets."
+msgstr ""
+"Prazitul care cauzează malaria continuă să dezvolte rezistenţă la "
+"medicamentele disponibile. Din această cauză avem nevoie să descoperim "
+"urgent noi medicamente pentru a le înlocui pe cele existente. Foarte "
+"important, aceste noi medicamente trebuie să ţintească NOILE proteine din "
+"parazit. Proiectul FightMalaria at Home este orientat pentru găsirea acestor "
+"noi ţinte."
 
 #: projects.inc:90
 msgid "University of Karlsruhe (Germany)"
@@ -403,8 +517,19 @@ msgid "Protein structure prediction"
 msgstr "Predicţia structurii proteinelor"
 
 #: projects.inc:92
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
-msgstr "POEM at HOME foloeşte o abordare computaţională pentru a prezice structura activă biologic a proteinelor, pentru a înţelege mecanismele de procesare a semnalelor atunci când proteinele interacţionează una cu cealaltă, pentru a înţelege bolile datorate funcţionării eronate sau agregărilor proteinelor şi pentru a dezvolta noi medicamente pe baza structurii tridimensionale a proteinelor importante biologic."
+msgid ""
+"POEM at HOME uses a computational approach to predict the biologically active "
+"structure of proteins, to understand the signal-processing mechanisms when "
+"the proteins interact with one another, to understand diseases related to "
+"protein malfunction or aggregation, and to develop new drugs on the basis of "
+"the three-dimensions structure of biologically important proteins."
+msgstr ""
+"POEM at HOME foloeşte o abordare computaţională pentru a prezice structura "
+"activă biologic a proteinelor, pentru a înţelege mecanismele de procesare a "
+"semnalelor atunci când proteinele interacţionează una cu cealaltă, pentru a "
+"înţelege bolile datorate funcţionării eronate sau agregărilor proteinelor şi "
+"pentru a dezvolta noi medicamente pe baza structurii tridimensionale a "
+"proteinelor importante biologic."
 
 #: projects.inc:98
 msgid "University of Delaware"
@@ -415,8 +540,16 @@ msgid "Study of protein - ligand interactions"
 msgstr "Studiul proteinelor - interacţiuni ligand"
 
 #: projects.inc:100
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
-msgstr "Docking at Home are obiective atât de bioştiinţă cât şi de informatică. Proiectul ţinteşte îmbunătăţirea cunoştinţelor despre detaliile atomice ale lianţilor proteinelor şi astfel capătă o mai bună cunoaştere pentru descoperirea unor farmaceutice inovatoare."
+msgid ""
+"Docking at Home has both bioscience and computer science goals. The project "
+"aims to further knowledge of the atomic details of protein-ligand "
+"interactions and, by doing so, will search for insights into the discovery "
+"of novel pharmaceuticals."
+msgstr ""
+"Docking at Home are obiective atât de bioştiinţă cât şi de informatică. "
+"Proiectul ţinteşte îmbunătăţirea cunoştinţelor despre detaliile atomice ale "
+"lianţilor proteinelor şi astfel capătă o mai bună cunoaştere pentru "
+"descoperirea unor farmaceutice inovatoare."
 
 #: projects.inc:114
 msgid "Barcelona Biomedical Research Park (PRBB)"
@@ -427,8 +560,16 @@ msgid "Molecular simulations of proteins"
 msgstr "Simulări moleculare ale proteinelor"
 
 #: projects.inc:116
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
-msgstr "GPUGrid.net deschide noi scenarii computaţionale prin primul cod dinamic molecular full-atom (CellMD) special optimizat pentru a rula pe GPU-uri NVIDIA. Noi aplicaţii biomedicale au devenit dintr-o dată posibile dând un nou rol biologiei computaţionale în cercetarea biomedicală."
+msgid ""
+"GPUGrid.net opens novel computational scenarios by the first full-atom "
+"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
+"New biomedical applications suddenly become possible giving a new role to "
+"computational biology for biomedical research."
+msgstr ""
+"GPUGrid.net deschide noi scenarii computaţionale prin primul cod dinamic "
+"molecular full-atom (CellMD) special optimizat pentru a rula pe GPU-uri "
+"NVIDIA. Noi aplicaţii biomedicale au devenit dintr-o dată posibile dând un "
+"nou rol biologiei computaţionale în cercetarea biomedicală."
 
 #: projects.inc:122
 msgid "Technion, Israel"
@@ -439,20 +580,37 @@ msgid "Genetic linkage analysis"
 msgstr "Analiza legăturilor genetice"
 
 #: projects.inc:124
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
-msgstr "Superlink at Technion ajută geneticieni din întreaga lume în căutarea genelor provocatoare de boli care cauzează anumite tipuri de diabet, hipertensiune (tensiune mare), cancer, schizofrenie şi multe altele."
+msgid ""
+"Superlink at Technion helps geneticists all over the world find disease-"
+"provoking genes causing some types of diabetes, hypertension (high blood "
+"pressure), cancer, schizophrenia and many others."
+msgstr ""
+"Superlink at Technion ajută geneticieni din întreaga lume în căutarea genelor "
+"provocatoare de boli care cauzează anumite tipuri de diabet, hipertensiune "
+"(tensiune mare), cancer, schizofrenie şi multe altele."
 
 #: projects.inc:138
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
-msgstr "Universitatea Maryland Centrul pentru Bioinformatica şi Biologie Computaţională"
+msgid ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
+msgstr ""
+"Universitatea Maryland Centrul pentru Bioinformatica şi Biologie "
+"Computaţională"
 
 #: projects.inc:139
 msgid "Life science research"
 msgstr "Cercetări ştiinţa vieţii"
 
 #: projects.inc:140
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
-msgstr "Proiectul Lattice furnizează putere de calcul cercetătorilor de la Universitatea din Maryland care studiază relaţii evoluţionare bazate pe date din secvenţa ADN; secvenţe proteice bacteriene, plasmid şi viruşi; şi diversitatea biologică în rezervele naturale. "
+msgid ""
+"The Lattice Project supplies computing power to scientists at the University "
+"of Maryland studying evolutionary relationships based on DNA sequence data; "
+"bacterial, plasmid, and virus protein sequences; and biological diversity in "
+"nature reserves. "
+msgstr ""
+"Proiectul Lattice furnizează putere de calcul cercetătorilor de la "
+"Universitatea din Maryland care studiază relaţii evoluţionare bazate pe date "
+"din secvenţa ADN; secvenţe proteice bacteriene, plasmid şi viruşi; şi "
+"diversitatea biologică în rezervele naturale. "
 
 #: projects.inc:146
 msgid "The Swiss Tropical Institute"
@@ -463,29 +621,61 @@ msgid "Epidemiology"
 msgstr "Epidemiologie"
 
 #: projects.inc:148
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
-msgstr "Modele simulate ale dinamicii de transmisie şi efectelor asupra sănătăţii ale malariei sunt o unealtă importantă în controlul malariei. Aceste pot fi folosite pentru a determina strategii optime pentru livrarea plaselor de insecte, chemoterapiei sau a noilor vaccinuri aflate actual în dezvoltare şi testare.  Aceste modele sunt extrem de intensive ca şi calcule, necesitând simularea unor populaţii umane de dimensiuni mari cu diverse seturi de parametri referitori la factori social [...]
+msgid ""
+"Simulation models of the transmission dynamics and health effects of malaria "
+"are an important tool for malaria control. They can be used to determine "
+"optimal strategies for delivering mosquito nets, chemotherapy, or new "
+"vaccines which are currently under development and testing.  Such modeling "
+"is extremely computer intensive, requiring simulations of large human "
+"populations with a diverse set of parameters related to biological and "
+"social factors that influence the distribution of the disease. "
+msgstr ""
+"Modele simulate ale dinamicii de transmisie şi efectelor asupra sănătăţii "
+"ale malariei sunt o unealtă importantă în controlul malariei. Aceste pot fi "
+"folosite pentru a determina strategii optime pentru livrarea plaselor de "
+"insecte, chemoterapiei sau a noilor vaccinuri aflate actual în dezvoltare şi "
+"testare.  Aceste modele sunt extrem de intensive ca şi calcule, necesitând "
+"simularea unor populaţii umane de dimensiuni mari cu diverse seturi de "
+"parametri referitori la factori sociali şi biologici care influenţează "
+"distribuţia bolii. "
 
 #: projects.inc:170
 msgid "University of Washington"
 msgstr "Universitatea Washington"
 
-#: projects.inc:171
-#: projects.inc:179
+#: projects.inc:171 projects.inc:179
 msgid "Biology"
 msgstr "Biologie"
 
 #: projects.inc:172
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
-msgstr "Determină forma tridimensională a proteinelor în cercetare care nu în ultimul rând vor duce la găsirea unor tratamente pentru câteva boli umane importante. Rulând Rosetta at home veţi ajuta la grăbirea şi extinderea cercetărilor noastre în moduri în care noi nu am putea încerca fără ajutorul dumneavoastră. Ne veţi ajuta şi în eforturile noastre de a dezvolta noi proteine pentru a lupta cu boli ca HIV, Malarie, Cancer şi Alzheimer"
+msgid ""
+"Determine the 3-dimensional shapes of proteins in research that may "
+"ultimately lead to finding cures for some major human diseases. By running "
+"Rosetta at home you will help us speed up and extend our research in ways we "
+"couldn't possibly attempt without your help. You will also be helping our "
+"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
+"Cancer, and Alzheimer's"
+msgstr ""
+"Determină forma tridimensională a proteinelor în cercetare care nu în "
+"ultimul rând vor duce la găsirea unor tratamente pentru câteva boli umane "
+"importante. Rulând Rosetta at home veţi ajuta la grăbirea şi extinderea "
+"cercetărilor noastre în moduri în care noi nu am putea încerca fără ajutorul "
+"dumneavoastră. Ne veţi ajuta şi în eforturile noastre de a dezvolta noi "
+"proteine pentru a lupta cu boli ca HIV, Malarie, Cancer şi Alzheimer"
 
 #: projects.inc:178
 msgid "University of Vienna"
 msgstr "Universitatea Viena"
 
 #: projects.inc:180
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
-msgstr "Calculează similarităţile între proteine. SIMAP oferă o bază de date publică cu datele rezultate, care joacă un rol cheie în multe proiecte de cercetare bioinformatică."
+msgid ""
+"Calculate similarities between proteins. SIMAP provides a public database of "
+"the resulting data, which plays a key role in many bioinformatics research "
+"projects."
+msgstr ""
+"Calculează similarităţile între proteine. SIMAP oferă o bază de date publică "
+"cu datele rezultate, care joacă un rol cheie în multe proiecte de cercetare "
+"bioinformatică."
 
 #: projects.inc:186
 msgid "Earth Sciences"
@@ -500,8 +690,25 @@ msgid "Climate study"
 msgstr "Studiu climatologic"
 
 #: projects.inc:200
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
-msgstr "Investighează aproximaţiile care trebuie făcute în modele climatic de ultimă generaţie. Rulând modelele de mii de ori sperăm să găsim cum răspunde modelul la modificări suficient de mici ale acestor aproximaţii - suficient de mici astfel încât să nu facă aproximările mai puţin realistice. Aceasta ne va permite să ne îmbunătăţim înţelegerea despre cât de sensibile sunt modelele noastre la mici modificări şi totodată la lucruri ca modificarea ciclului dioxidului de carbon sau sulfu [...]
+msgid ""
+"Investigate the approximations that have to be made in state-of-the-art "
+"climate models. By running the model thousands of times we hope to find out "
+"how the model responds to slight tweaks to these approximations - slight "
+"enough to not make the approximations any less realistic. This will allow us "
+"to improve our understanding of how sensitive our models are to small "
+"changes and also to things like changes in carbon dioxide and the sulphur "
+"cycle. This will allow us to explore how climate may change in the next "
+"century under a wide range of different scenarios."
+msgstr ""
+"Investighează aproximaţiile care trebuie făcute în modele climatic de ultimă "
+"generaţie. Rulând modelele de mii de ori sperăm să găsim cum răspunde "
+"modelul la modificări suficient de mici ale acestor aproximaţii - suficient "
+"de mici astfel încât să nu facă aproximările mai puţin realistice. Aceasta "
+"ne va permite să ne îmbunătăţim înţelegerea despre cât de sensibile sunt "
+"modelele noastre la mici modificări şi totodată la lucruri ca modificarea "
+"ciclului dioxidului de carbon sau sulfului. Aceasta ne va permite să "
+"explorăm modificările climatice posibile în următorul secol într-o mare "
+"varietate de scenarii diferite."
 
 #: projects.inc:207
 msgid "Physical Science"
@@ -512,55 +719,110 @@ msgid "Mechanical engineering"
 msgstr "Inginerie mecanică"
 
 #: projects.inc:214
-msgid "Currently we are calculating the optimum design of a structure call the 52 bar truss"
+msgid ""
+"Currently we are calculating the optimum design of a structure call the 52 "
+"bar truss"
 msgstr ""
 
-#: projects.inc:224
-#: projects.inc:263
-#: projects.inc:271
+#: projects.inc:224 projects.inc:263 projects.inc:271
 msgid "Astronomy"
 msgstr "Astronomie"
 
 #: projects.inc:225
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
-msgstr "Vom combina acoperirea spectrală a GALEX, Pan-STARRS1 şi WISE pentru a genera un atlas al galactic de UV-optic-NIR multi lungime de undă pentru Universul apropiat. Vom măsura parametrii fizici (ca densitatea suprafeţei a masei stelare, densitatea suprafeţei unei stele în formare, atenuarea şi istoricul formării unei stele de prim-ordin) pe baza rezolvării pixel cu pixel folosind distribuţia energiei spectrale (SED) cu tehnici de calcul distribuit."
+msgid ""
+"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
+"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
+"Universe. We will measure physical parameters (such as stellar mass surface "
+"density, star formation rate surface density, attenuation, and first-order "
+"star formation history) on a resolved pixel-by-pixel basis using spectral "
+"energy distribution (SED) fitting techniques in a distributed computing mode."
+msgstr ""
+"Vom combina acoperirea spectrală a GALEX, Pan-STARRS1 şi WISE pentru a "
+"genera un atlas al galactic de UV-optic-NIR multi lungime de undă pentru "
+"Universul apropiat. Vom măsura parametrii fizici (ca densitatea suprafeţei a "
+"masei stelare, densitatea suprafeţei unei stele în formare, atenuarea şi "
+"istoricul formării unei stele de prim-ordin) pe baza rezolvării pixel cu "
+"pixel folosind distribuţia energiei spectrale (SED) cu tehnici de calcul "
+"distribuit."
 
 #: projects.inc:247
 msgid "University of Texas at Austin"
 msgstr "Universitatea Texas din Austin"
 
-#: projects.inc:248
-#: projects.inc:279
+#: projects.inc:248 projects.inc:279
 msgid "Chemistry"
 msgstr "Chimie"
 
 #: projects.inc:249
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
-msgstr "O problemă comună în chimia teoretică, fizica materiei condensate şi ştiinţa materialelor este calcularea evoluţie în timp a unui sistem la scară atomică unde, de exemplu, au loc reacţii chimic şi/sau difuzie. În general, evenimentele de interes sunt destul de rare (de mai multe ordine de mărime mai lente deât mişcarea vibratorie a atomilor) şi deci simularea directă, urmărind fiecare mişcare a atomilor, ar dura mii de ani de calcule pe calculator pe cel mai performant calculator [...]
+msgid ""
+"A common problem in theoretical chemistry, condensed matter physics and "
+"materials science is the calculation of the time evolution of an atomic "
+"scale system where, for example, chemical reactions and/or diffusion occur. "
+"Generally the events of interest are quite rare (many orders of magnitude "
+"slower than the vibrational movements of the atoms), and therefore direct "
+"simulations, tracking every movement of the atoms, would take thousands of "
+"years of computer calculations on the fastest present day computer before a "
+"single event of interest can be expected to occur.  Our research group is "
+"interested in calculating the long time dynamics of systems."
+msgstr ""
+"O problemă comună în chimia teoretică, fizica materiei condensate şi ştiinţa "
+"materialelor este calcularea evoluţie în timp a unui sistem la scară "
+"atomică unde, de exemplu, au loc reacţii chimic şi/sau difuzie. În general, "
+"evenimentele de interes sunt destul de rare (de mai multe ordine de mărime "
+"mai lente deât mişcarea vibratorie a atomilor) şi deci simularea directă, "
+"urmărind fiecare mişcare a atomilor, ar dura mii de ani de calcule pe "
+"calculator pe cel mai performant calculator al zilelor noastre, înainte ca "
+"un singur eveniment de interes să poată fi aşteptat să se întâmple.  Grupul "
+"nostru de cercetare este interesat să calculeze dinamica de lungă durată a "
+"sistemelor."
 
 #: projects.inc:262
 msgid "University of Illinois at Urbana-Champaign"
 msgstr "Universitatea Illinois din Urbana-Champaign"
 
 #: projects.inc:264
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
-msgstr "Obiectivul Cosmology at Home este să caute modelul care descrie cel mai bine Universul nostru şi de a găsi o gamă de modele în concordanţă cu datele disponibile cu privire la fizica particulelor astronomice."
+msgid ""
+"The goal of Cosmology at Home is to search for the model that best describes "
+"our Universe and to find the range of models that agree with the available "
+"astronomical particle physics data."
+msgstr ""
+"Obiectivul Cosmology at Home este să caute modelul care descrie cel mai bine "
+"Universul nostru şi de a găsi o gamă de modele în concordanţă cu datele "
+"disponibile cu privire la fizica particulelor astronomice."
 
 #: projects.inc:270
 msgid "Rensselaer Polytechnic Institute"
 msgstr "Institutul Politehnic Rensselaer"
 
 #: projects.inc:272
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
-msgstr "Obiectivul Milkyway at Home este de a crea un model tridimensional de mare acurateţe al galaxiei Calea Lactee folosind date colectate de Sloan Digital Sky Survey."
+msgid ""
+"The goal of Milkyway at Home is to create a highly accurate three dimensional "
+"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
+"Survey."
+msgstr ""
+"Obiectivul Milkyway at Home este de a crea un model tridimensional de mare "
+"acurateţe al galaxiei Calea Lactee folosind date colectate de Sloan Digital "
+"Sky Survey."
 
 #: projects.inc:278
 msgid "Leiden University, The Netherlands"
 msgstr "Universitatea Leiden, Olanda"
 
 #: projects.inc:280
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
-msgstr "Calcule de ştiinţa suprafeţelor folosind Classical Dynamics.  Leiden Classical permite voluntarilor, stundeţilor şi altor cercetători să trimită calculele personale către reţea. Fiecare utilizator are coada personală de sarcini Classical Dynamics. În acest fel studenţii a folosit reţeaua pentru a simula argon lichid sau pentru a test validitatea legii gazului ideal prin realizarea simulărilor prin reţea."
+msgid ""
+"Surface science calculations using Classical Dynamics.  Leiden Classical "
+"allows volunteers, students and other scientist to submit their personal "
+"calculations to the grid. Each user has his own personal queue for Classical "
+"Dynamics jobs. In this way students have used the grid to simulate liquid "
+"argon, or to test the validity of the ideal gas law by actually doing the "
+"simulations through the grid."
+msgstr ""
+"Calcule de ştiinţa suprafeţelor folosind Classical Dynamics.  Leiden "
+"Classical permite voluntarilor, stundeţilor şi altor cercetători să trimită "
+"calculele personale către reţea. Fiecare utilizator are coada personală de "
+"sarcini Classical Dynamics. În acest fel studenţii a folosit reţeaua pentru "
+"a simula argon lichid sau pentru a test validitatea legii gazului ideal prin "
+"realizarea simulărilor prin reţea."
 
 #: projects.inc:294
 msgid "Univ. of Wisconsin - Milwaukee, Max Planck Institute"
@@ -571,26 +833,51 @@ msgid "Astrophysics"
 msgstr "Astrofizică"
 
 #: projects.inc:296
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
-msgstr "Căurarea stelelor neutronice rotitoare (numite şi pulsari) folosind date de la detectoarele de unde gravitaţionale LIGO şi GEO şi de la radio observatorul Arecibo.  Einstein at Home este un proiect World Year of Physics 2005 suportat de Societatea Americană de Fizică (APS) şi de un număr de organizaţii internaţionale."
+msgid ""
+"Search for spinning neutron stars (also called pulsars) using data from the "
+"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
+"observatory.  Einstein at Home is a World Year of Physics 2005 project "
+"supported by the American Physical Society (APS) and by a number of "
+"international organizations."
+msgstr ""
+"Căurarea stelelor neutronice rotitoare (numite şi pulsari) folosind date de "
+"la detectoarele de unde gravitaţionale LIGO şi GEO şi de la radio "
+"observatorul Arecibo.  Einstein at Home este un proiect World Year of Physics "
+"2005 suportat de Societatea Americană de Fizică (APS) şi de un număr de "
+"organizaţii internaţionale."
 
-#: projects.inc:310
-#: projects.inc:318
+#: projects.inc:310 projects.inc:318
 msgid "CERN (European Organization for Nuclear Research)"
 msgstr "CERN (Organizaţia Europeană pentru Cercetări Nucleare)"
 
-#: projects.inc:311
-#: projects.inc:319
+#: projects.inc:311 projects.inc:319
 msgid "Physics"
 msgstr "Fizică"
 
 #: projects.inc:312
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
-msgstr "Large Hadron Collider (LHC) este un accelerator de particule de la CERN, Organizaţia Europeană de Cercetări nucleare, cel mai mare laborator de fizica particulelor din lume.  Este cel mai puternic instrument construit vreodată pentru a investiga proprietăţile particulelor. LHC at home rulează simulări pentru a îmbunătăţii designul LHC şi al detectorilor săi."
+msgid ""
+"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
+"European Organization for Nuclear Research, the world's largest particle "
+"physics laboratory.  It is the most powerful instrument ever built to "
+"investigate on particles proprieties. LHC at home runs simulations to improve "
+"the design of LHC and its detectors."
+msgstr ""
+"Large Hadron Collider (LHC) este un accelerator de particule de la CERN, "
+"Organizaţia Europeană de Cercetări nucleare, cel mai mare laborator de "
+"fizica particulelor din lume.  Este cel mai puternic instrument construit "
+"vreodată pentru a investiga proprietăţile particulelor. LHC at home rulează "
+"simulări pentru a îmbunătăţii designul LHC şi al detectorilor săi."
 
 #: projects.inc:320
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
-msgstr "Acest proiect foloseşte tehnologia maşinilor virtuale dezvoltată de CERN pentru simularea evenimentelor fizice ale LHC pe calculatoarele voluntarilor.  Necesită să instalaţi VirtualBox pe calculatorul dumneavoastră"
+msgid ""
+"This project uses CERN-developed virtual machine technology for full-fledged "
+"LHC event physics simulation on volunteer computers.  Requires that you "
+"install VirtualBox on your computer"
+msgstr ""
+"Acest proiect foloseşte tehnologia maşinilor virtuale dezvoltată de CERN "
+"pentru simularea evenimentelor fizice ale LHC pe calculatoarele "
+"voluntarilor.  Necesită să instalaţi VirtualBox pe calculatorul "
+"dumneavoastră"
 
 #: projects.inc:326
 msgid "University of California, Berkeley"
@@ -601,8 +888,19 @@ msgid "Astrophysics, astrobiology"
 msgstr "Astrofizică, astrobiologie"
 
 #: projects.inc:328
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
-msgstr "SETI (Căutarea Inteligenţei Extraterestre) este o zonă ştiinţifică al cărei obiectiv este detectarea vieţii inteligente în afara Pământului. Una din abordări, cunoscută ca SETI prin radio, foloseşte telescoape radio pentru a asculta semnale radio de bandă îngustă din spaţiu. Astfel de semnale sunt cunsoscute că nu pot apare natural, deci detecţia ar însemna dovada că există tehnologie extraterestră."
+msgid ""
+"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
+"goal is to detect intelligent life outside Earth. One approach, known as "
+"radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
+"signals from space. Such signals are not known to occur naturally, so a "
+"detection would provide evidence of extraterrestrial technology."
+msgstr ""
+"SETI (Căutarea Inteligenţei Extraterestre) este o zonă ştiinţifică al cărei "
+"obiectiv este detectarea vieţii inteligente în afara Pământului. Una din "
+"abordări, cunoscută ca SETI prin radio, foloseşte telescoape radio pentru a "
+"asculta semnale radio de bandă îngustă din spaţiu. Astfel de semnale sunt "
+"cunsoscute că nu pot apare natural, deci detecţia ar însemna dovada că "
+"există tehnologie extraterestră."
 
 #: projects.inc:342
 msgid "Bielefeld University of Applied Sciences"
@@ -613,8 +911,16 @@ msgid "Chemical engineering and nanotechnology"
 msgstr "Inginerie chimică şi nanotehnologie"
 
 #: projects.inc:344
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
-msgstr "Studiul magneţilor moleculari şi a magnetismului controlat la nanoscară.  Aceste molecule magnetice pot fi folosite pentru a dezvolta mici comutatoare magnetice cu aplicabilitate în medicină (cum ar fi chemoterapie locală a tumorilor) şi biotehnologie."
+msgid ""
+"The study of molecular magnets and controlled nanoscale magnetism.  These "
+"magnetic molecules may be used to develop tiny magnetic switches, with "
+"applications in medicine (such as local tumor chemotherapy) and "
+"biotechnology."
+msgstr ""
+"Studiul magneţilor moleculari şi a magnetismului controlat la nanoscară.  "
+"Aceste molecule magnetice pot fi folosite pentru a dezvolta mici comutatoare "
+"magnetice cu aplicabilitate în medicină (cum ar fi chemoterapie locală a "
+"tumorilor) şi biotehnologie."
 
 #: projects.inc:351
 msgid "Multiple applications"
@@ -629,19 +935,28 @@ msgid "Physics, biochemistry, and others"
 msgstr "Fizică, biochimie şi altele"
 
 #: projects.inc:358
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
-msgstr "Obiectivul CAS at home este de a încuraja şi asista cercetătorii din China pentru a adopta tehnologille de calcul distribuit voluntar şi gândire voluntară pentru cercetările lor."
+msgid ""
+"The objective of CAS at home is to encourage and assist scientists in China to "
+"adopt the technologies of volunteer computing and volunteer thinking for "
+"their research."
+msgstr ""
+"Obiectivul CAS at home este de a încuraja şi asista cercetătorii din China "
+"pentru a adopta tehnologille de calcul distribuit voluntar şi gândire "
+"voluntară pentru cercetările lor."
 
 #: projects.inc:365
 msgid "Mathematics, physics, evolution"
 msgstr "Matematică, fizică, evoluţie"
 
 #: projects.inc:366
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
-msgstr "Yoyo at home este un adaptor între BOINC şi alte proiecte de calcule voluntare: ECM, Muon, Evolution at home şi distributed.net"
+msgid ""
+"Yoyo at home is an adapter between BOINC and several existing volunteer "
+"computing projects: ECM, Muon, Evolution at home, and distributed.net"
+msgstr ""
+"Yoyo at home este un adaptor între BOINC şi alte proiecte de calcule voluntare: "
+"ECM, Muon, Evolution at home şi distributed.net"
 
-#: projects.inc:371
-#: projects.inc:527
+#: projects.inc:371 projects.inc:527
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 msgstr "Laboratorul de Sisteme Paralele şi Distribuite MTA-SZTAKI (Ungaria)"
 
@@ -650,8 +965,17 @@ msgid "European research projects"
 msgstr "Proiecte de cercetare Europene"
 
 #: projects.inc:373
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
-msgstr "Proiectul EDGeS at Home Beta integrează calculele voluntare în reţeaua de servicii Europeană permiţând reţelelor de servicii să trimită unităţi de lucru pentru a fi procesate de voluntari ai acestui proiect. Proiectele ştiinţiice acoperite de acest proiect includ matematica, fizica, biologia, etc."
+msgid ""
+"The EDGeS at Home Beta project integrates volunteer computing into the service "
+"grid network of Europe by allowing service grids to send workunits to be "
+"processed by the volunteers of this project. The scientific projects covered "
+"by the project include math, physics, biology, etc."
+msgstr ""
+"Proiectul EDGeS at Home Beta integrează calculele voluntare în reţeaua de "
+"servicii Europeană permiţând reţelelor de servicii să trimită unităţi de "
+"lucru pentru a fi procesate de voluntari ai acestui proiect. Proiectele "
+"ştiinţiice acoperite de acest proiect includ matematica, fizica, biologia, "
+"etc."
 
 #: projects.inc:379
 msgid "Spanish universities and research centers"
@@ -674,8 +998,16 @@ msgid "Medical, environmental and other humanitarian research"
 msgstr "Cercetări medicale, de mediu şi alte cercetări umanitare"
 
 #: projects.inc:389
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
-msgstr "Pentru a avansa cercetările non-profit critic ale unor probleme umanitare presante prin crearea celei mai mari reţele de calcule voluntare.  Cercetările includ HIV-SIDA, cancer, boli tropicale şi neglijate, energia solară, apa curată şi multe altele."
+msgid ""
+"To further critical non-profit research on some of humanity's most pressing "
+"problems by creating the world's largest volunteer computing grid.  Research "
+"includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"clean water and many more."
+msgstr ""
+"Pentru a avansa cercetările non-profit critic ale unor probleme umanitare "
+"presante prin crearea celei mai mari reţele de calcule voluntare.  "
+"Cercetările includ HIV-SIDA, cancer, boli tropicale şi neglijate, energia "
+"solară, apa curată şi multe altele."
 
 #: projects.inc:395
 msgid "Mathematics, computing, and games"
@@ -693,21 +1025,20 @@ msgstr "Matematică, Fizica, Inteligenţă Artificială"
 msgid "Simulation of quantum computing; Goldbach's conjecture."
 msgstr "Simularea calculelor cuantice; presupunerea lui Goldbach."
 
-#: projects.inc:450
-#: projects.inc:458
+#: projects.inc:450 projects.inc:458
 msgid "Cryptography"
 msgstr "Criptografie"
 
 #: projects.inc:459
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
-msgstr "Încearcă sa decodeze 3 mesaje originale Enigma. Semnalele au fost interceptate în Atlanticul de Nord în 1942 şi se presupune că sunt nesparte."
-
-#: projects.inc:465
-#: projects.inc:504
-#: projects.inc:512
-#: projects.inc:520
-#: projects.inc:528
-#: projects.inc:568
+msgid ""
+"Attempt to decode 3 original Enigma messages. The signals were intercepted "
+"in the North Atlantic in 1942 and are believed to be unbroken."
+msgstr ""
+"Încearcă sa decodeze 3 mesaje originale Enigma. Semnalele au fost "
+"interceptate în Atlanticul de Nord în 1942 şi se presupune că sunt nesparte."
+
+#: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
+#: projects.inc:528 projects.inc:568
 msgid "Mathematics"
 msgstr "Matematică"
 
@@ -724,44 +1055,94 @@ msgid "Factorization of large integers"
 msgstr "Factorizarea întregilor mari"
 
 #: projects.inc:473
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
-msgstr "NFS at Home este un proiect de cercetare care foloseşte calculatoare conectate la Internet pentru a realiza anumiţi paşi în factorizarea numerelor întregi mari (Number Field Sieve). Ca şi elev la şcoală aţi căpătat prima experienţă în spargerea întregilor în factori primi, cum ar fi 15 = 3 * 5 sau 35 = 5 * 7. NFS at Home este o continuare a acestei experien'e, doar că întregii sunt lungi de sute de cifre."
+msgid ""
+"NFS at Home is a research project that uses Internet-connected computers to do "
+"the lattice sieving step in the Number Field Sieve factorization of large "
+"integers. As a young school student, you gained your first experience at "
+"breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
+"NFS at Home is a continuation of that experience, only with integers that are "
+"hundreds of digits long."
+msgstr ""
+"NFS at Home este un proiect de cercetare care foloseşte calculatoare conectate "
+"la Internet pentru a realiza anumiţi paşi în factorizarea numerelor întregi "
+"mari (Number Field Sieve). Ca şi elev la şcoală aţi căpătat prima experienţă "
+"în spargerea întregilor în factori primi, cum ar fi 15 = 3 * 5 sau 35 = 5 * "
+"7. NFS at Home este o continuare a acestei experien'e, doar că întregii sunt "
+"lungi de sute de cifre."
 
 #: projects.inc:479
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
-msgstr "Universitatea Tehnică Vilnius Gediminas şi Universitatea Tehnologică Kaunas (Lituania)"
+msgid ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
+msgstr ""
+"Universitatea Tehnică Vilnius Gediminas şi Universitatea Tehnologică Kaunas "
+"(Lituania)"
 
 #: projects.inc:480
 msgid "Software testing"
 msgstr "Testare programe"
 
 #: projects.inc:481
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
-msgstr "Scopul acestui proiect este de a furniza o platformă puternică de calcule distribuite cercetătorilor ştiinţifici ai Universităţii Tehnice Vilnius Gediminas (VGTU) ca şi altor instituţii academice Lituaniene.  Aplicaţiile curente se ocupă de studiul testării software bazate pe Monte-Carlo."
+msgid ""
+"The aim of this project is to provide a powerful distributed computing "
+"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
+"well as others Lithuanian academic institutions.  Current applications "
+"involve the study of Monte-Carlo based software testing."
+msgstr ""
+"Scopul acestui proiect este de a furniza o platformă puternică de calcule "
+"distribuite cercetătorilor ştiinţifici ai Universităţii Tehnice Vilnius "
+"Gediminas (VGTU) ca şi altor instituţii academice Lituaniene.  Aplicaţiile "
+"curente se ocupă de studiul testării software bazate pe Monte-Carlo."
 
 #: projects.inc:503
 msgid "Mathematical Institute of Leiden University / Kennislink"
 msgstr "Institutul de Matematică al Universităţii Leiden / Kennislink"
 
 #: projects.inc:505
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
-msgstr "Caută 'triple-abc': întregi pozitivi a,b,c astfel încât a+b=c, a < b < c, a,b,c nu au nici un divizor comun şi > rad(abc), unde rad(n) este produsul factorilor primi distincţi ai lui n. Presupunerea ABC spune că există doar un număr finit de a, b, c astfel încât log(c)/log(rad(abc)) > h pentru orice real h > 1. Presupunerea ABC este în prezent una din cele mai mari probleme din matematică. Dacă se dovedeşte adevărată, o mulţime de alte probleme deschise pot fi rezolvate dir [...]
+msgid ""
+"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
+"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
+"product of the distinct prime factors of n. The ABC conjecture says that "
+"there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for "
+"any real h > 1. The ABC conjecture is currently one of the greatest open "
+"problems in mathematics. If it is proven to be true, a lot of other open "
+"problems can be answered directly from it."
+msgstr ""
+"Caută 'triple-abc': întregi pozitivi a,b,c astfel încât a+b=c, a < b < "
+"c, a,b,c nu au nici un divizor comun şi > rad(abc), unde rad(n) este "
+"produsul factorilor primi distincţi ai lui n. Presupunerea ABC spune că "
+"există doar un număr finit de a, b, c astfel încât log(c)/log(rad(abc)) > h "
+"pentru orice real h > 1. Presupunerea ABC este în prezent una din cele mai "
+"mari probleme din matematică. Dacă se dovedeşte adevărată, o mulţime de alte "
+"probleme deschise pot fi rezolvate direct din ea."
 
 #: projects.inc:513
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
-msgstr "Primegrid are mai multe proiecte care caută diferite forme a unor numere prime foarte mari, inclusiv căutarea celui mai mare număr prim cunoscut."
+msgid ""
+"Primegrid has multiple projects searching for different forms of very large "
+"prime numbers, including searching for the largest known prime number."
+msgstr ""
+"Primegrid are mai multe proiecte care caută diferite forme a unor numere "
+"prime foarte mari, inclusiv căutarea celui mai mare număr prim cunoscut."
 
 #: projects.inc:519
 msgid "Hochschule RheinMain University of Applied Sciences"
 msgstr "Universitatea de Ştiinţe Aplicate Hochschule RheinMain"
 
 #: projects.inc:521
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
-msgstr "Căutarea unor contraexemple a două presupuneri legate de identificarea numerelor prime"
+msgid ""
+"Search for counterexamples to two conjectures related to the identification "
+"of prime numbers"
+msgstr ""
+"Căutarea unor contraexemple a două presupuneri legate de identificarea "
+"numerelor prime"
 
 #: projects.inc:529
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
-msgstr "Găsirea tuturor sistemelor numerale binare (în care baza sunt matrici şi cifrele sunt vectori) până la dimensiunea 11."
+msgid ""
+"Find all the generalized binary number systems (in which bases are matrices "
+"and digits are vectors) up to dimension 11."
+msgstr ""
+"Găsirea tuturor sistemelor numerale binare (în care baza sunt matrici şi "
+"cifrele sunt vectori) până la dimensiunea 11."
 
 #: ../html/inc/news.inc:40
 msgid "Comment"
@@ -774,12 +1155,14 @@ msgstr "Ştirile sun disponibile ca un %sfeed RSS%s"
 
 #~ msgid "Astronomy, Physics, and Chemistry"
 #~ msgstr "Astronomie, Fizică şi Chimie"
+
 #~ msgid "Download BOINC + Virtualbox"
 #~ msgstr "Descărcaţi BOINC + Virtualbox"
 
 #, php-format
 #~ msgid "%s for %s (%s MB)"
 #~ msgstr "%s pentru %s (%s MB)"
+
 #~ msgid ""
 #~ "BOINC is a program that lets you donate your idle computer time to science "
 #~ "projects like SETI at home, Climateprediction.net, Rosetta at home, World "
@@ -805,6 +1188,7 @@ msgstr "Ştirile sun disponibile ca un %sfeed RSS%s"
 #~ "descoperiţi pulsari şi multe alte tipuri de cercetări ştiinţifice.  Este "
 #~ "sigur şi uşor:  %sAlegeţi%s proiecte  %sDescărcaţi%s şi rulaţi BOINC   %"
 #~ "sIntroduceţi%s o adresă de email şi o parolă. "
+
 #~ msgid "Browser default"
 #~ msgstr "Setări implicite browser"
 
@@ -821,8 +1205,10 @@ msgstr "Ştirile sun disponibile ca un %sfeed RSS%s"
 #~ "descoperi pulsari şi multe alte tipuri de cercetări ştiinţifice.  Este "
 #~ "sigur, garantat şi uşor:  %sAlege%s proiecte  %sDescarcă%s şi rulează BOINC "
 #~ "  %sIntrodu%s o adresă de email şi o parolă. "
+
 #~ msgid "Humanitarian research on disease, natural disasters and hunger."
 #~ msgstr "Cercetări umanitare despre boli, dezastre naturale şi foame."
+
 #~ msgid ""
 #~ "Primegrid is generating a public sequential prime number database, and is "
 #~ "searching for large twin primes of the form k*2<sup>n</sup>+1 and "
@@ -836,3 +1222,423 @@ msgstr "Ştirile sun disponibile ca un %sfeed RSS%s"
 #~ msgid "POEM at HOME"
 #~ msgstr "Home"
 
+# The charset used for the text in this file (please try to use UTF-8 if possible)
+#~ msgid "CHARSET"
+#~ msgstr "UTF-8"
+
+# The name of this language in this language
+#~ msgid "LANG_NAME_NATIVE"
+#~ msgstr "English"
+
+# The name of this language in an international language (English)
+#~ msgid "LANG_NAME_INTERNATIONAL"
+#~ msgstr "English"
+
+# #######################################
+# poll-related stuff
+# #######################################
+# poll-related stuff
+# #######################################
+#~ msgid "POLL_TITLE"
+#~ msgstr "BOINC user survey"
+
+#~ msgid "POLL_INTRO"
+#~ msgstr ""
+#~ "Several volunteer computing projects, including Climateprediction.net, "
+#~ "Einstein at home, and SETI at home, use software called BOINC. If you "
+#~ "participate in projects like this, we request that you answer the "
+#~ "following questions. This will help BOINC-based projects increase "
+#~ "participation and achieve greater scientific results. <p> Please answer "
+#~ "as many questions as you want, then go to the bottom and click OK. If you "
+#~ "previously completed the survey but your answers have changed, please "
+#~ "complete it again - your new answers will replace the old ones. <p> The "
+#~ "current results of the survey are <a href=poll_results.php>here</a>. "
+
+#~ msgid "POLL_RUN"
+#~ msgstr "Do you run BOINC?"
+
+#~ msgid "POLL_PARTICIPATION"
+#~ msgstr "Your participation"
+
+#~ msgid "POLL_COMPUTERS"
+#~ msgstr "Your computers"
+
+#~ msgid "POLL_YOU"
+#~ msgstr "You"
+
+#~ msgid "POLL_NATIONALITY"
+#~ msgstr "Nationality"
+
+#~ msgid "POLL_COMMENTS"
+#~ msgstr "Comments"
+
+#~ msgid "POLL_COMMENTS_QUESTION"
+#~ msgstr ""
+#~ "Please suggest ways that BOINC, and the projects that use it, could be "
+#~ "improved:"
+
+#~ msgid "POLL_OTHER"
+#~ msgstr "Other:"
+
+#~ msgid "POLL_CHECK_ALL"
+#~ msgstr "[check all that apply]"
+
+#~ msgid "POLL_DONE"
+#~ msgstr "When done click:"
+
+#~ msgid "POLL_CURRENT"
+#~ msgstr "Yes - I have been running BOINC on my computer for..."
+
+#~ msgid "POLL_TWEEK"
+#~ msgstr "less than a week"
+
+#~ msgid "POLL_TMONTH"
+#~ msgstr "less than a month"
+
+#~ msgid "POLL_TYEAR"
+#~ msgstr "less than a year"
+
+#~ msgid "POLL_TMOREYEAR"
+#~ msgstr "more than a year"
+
+#~ msgid "POLL_LAPSED"
+#~ msgstr "No - I was running BOINC, but stopped because..."
+
+#~ msgid "POLL_LINTEREST"
+#~ msgstr "I lost interest"
+
+#~ msgid "POLL_LCOMPLICATED"
+#~ msgstr "it was too complicated"
+
+#~ msgid "POLL_LSTOPPED"
+#~ msgstr "I stopped it and forgot to start again"
+
+#~ msgid "POLL_LPROBLEMS"
+#~ msgstr "it caused problems on my computer"
+
+#~ msgid "POLL_LPOWER"
+#~ msgstr "it used too much electricity"
+
+#~ msgid "POLL_LNONBOINC"
+#~ msgstr "I switched to a non-BOINC computing project"
+
+#~ msgid "POLL_FAILED"
+#~ msgstr "No - I tried running BOINC, but..."
+
+#~ msgid "POLL_FINSTALL"
+#~ msgstr "the software didn't install correctly"
+
+#~ msgid "POLL_FFIGURE"
+#~ msgstr "I couldn't figure out how to use the software"
+
+#~ msgid "POLL_FNETWORK"
+#~ msgstr "I had network communication problems"
+
+#~ msgid "POLL_FATTACH"
+#~ msgstr "I couldn't attach to a project"
+
+#~ msgid "POLL_FWORK"
+#~ msgstr "I attached to a project, but never got any work"
+
+#~ msgid "POLL_NEVER"
+#~ msgstr "No - I never tried running BOINC, because..."
+
+#~ msgid "POLL_NSECURITY"
+#~ msgstr "I was concerned about security"
+
+#~ msgid "POLL_NPROJECT"
+#~ msgstr "I wasn't interested in any of the projects"
+
+#~ msgid "POLL_NPERMISSION"
+#~ msgstr "I don't have permission to run it on my computer"
+
+#~ msgid "POLL_NVERSION"
+#~ msgstr "No version was available for my computer"
+
+#~ msgid "POLL_KIND"
+#~ msgstr "What kind of computers do you have running BOINC?"
+
+#~ msgid "POLL_WHERE"
+#~ msgstr "Where are they?"
+
+#~ msgid "POLL_WORK"
+#~ msgstr "Work"
+
+#~ msgid "POLL_SCHOOL"
+#~ msgstr "School"
+
+#~ msgid "POLL_HOW_MANY"
+#~ msgstr "How many computers?"
+
+#~ msgid "POLL_TURNED_ON"
+#~ msgstr "On average, how many hours per day are they powered on?"
+
+#~ msgid "POLL_AGE"
+#~ msgstr "Age"
+
+#~ msgid "POLL_SEX"
+#~ msgstr "Sex"
+
+#~ msgid "POLL_MALE"
+#~ msgstr "Male"
+
+#~ msgid "POLL_FEMALE"
+#~ msgstr "Female"
+
+#~ msgid "POLL_EXPERTISE"
+#~ msgstr "Your level of computer expertise"
+
+#~ msgid "POLL_LEVB"
+#~ msgstr "Beginner"
+
+#~ msgid "POLL_LEVI"
+#~ msgstr "Intermediate"
+
+#~ msgid "POLL_LEVA"
+#~ msgstr "Advanced"
+
+#~ msgid "POLL_LEARN_WHERE"
+#~ msgstr "Where did you learn about BOINC projects?"
+
+#~ msgid "POLL_WTV"
+#~ msgstr "TV/radio/newspaper"
+
+#~ msgid "POLL_WPERS"
+#~ msgstr "From friends, relatives, or coworkers"
+
+#~ msgid "POLL_WTEAM"
+#~ msgstr "Team message boards or web sites"
+
+#~ msgid "POLL_WBOINC"
+#~ msgstr "The BOINC web site"
+
+#~ msgid "POLL_WWEB"
+#~ msgstr "Other web sites"
+
+#~ msgid "POLL_FACTOR"
+#~ msgstr ""
+#~ "Which are the most important factors when you decide whether to "
+#~ "participate in a BOINC project?"
+
+#~ msgid "POLL_GRAPHICS"
+#~ msgstr "Nice-looking screensaver graphics"
+
+#~ msgid "POLL_CREDIT_FAIR"
+#~ msgstr "Fair and quick granting of credit for work done"
+
+#~ msgid "POLL_CREDIT_MORE"
+#~ msgstr "Getting more credit from this project than from others"
+
+#~ msgid "POLL_MB_FRIENDLY"
+#~ msgstr "Helpful and friendly message boards"
+
+#~ msgid "POLL_MB_STAFF"
+#~ msgstr "Participation by project staff on the message boards"
+
+#~ msgid "POLL_WEB_SITE"
+#~ msgstr "Informative project web site"
+
+#~ msgid "POLL_SCIENCE_IMPORTANT"
+#~ msgstr "The science is important and beneficial"
+
+#~ msgid "POLL_SCIENCE_PUBLIC"
+#~ msgstr "Non-profit, and results are public"
+
+#~ msgid "POLL_RECOGNIZE"
+#~ msgstr "Personal recognition if my computer finds something"
+
+#~ msgid "POLL_PUBLISH"
+#~ msgstr "Publication by the project in scientific journals"
+
+#~ msgid "POLL_EMAIL"
+#~ msgstr "Periodic email newsletters from the project"
+
+#~ msgid "POLL_NPROJECTS"
+#~ msgstr "How many BOINC projects do you participate in?"
+
+#~ msgid "POLL_SSAVER"
+#~ msgstr "Do you run BOINC as a screensaver?"
+
+#~ msgid "POLL_YES"
+#~ msgstr "Yes"
+
+#~ msgid "POLL_NO"
+#~ msgstr "No"
+
+#~ msgid "POLL_MBOARDS"
+#~ msgstr "Your usage of project messages boards:"
+
+#~ msgid "POLL_MBR"
+#~ msgstr "to read information"
+
+#~ msgid "POLL_MBRW"
+#~ msgstr "to read and post information"
+
+#~ msgid "POLL_NONE"
+#~ msgstr "None"
+
+#~ msgid "POLL_HELP"
+#~ msgstr ""
+#~ "Where do you get information to help resolve problems with BOINC and/or "
+#~ "BOINC projects?"
+
+#~ msgid "POLL_HELP_PMB"
+#~ msgstr "The project message boards"
+
+#~ msgid "POLL_HELP_BMB"
+#~ msgstr "The BOINC message boards"
+
+#~ msgid "POLL_HELP_BDOC"
+#~ msgstr "The BOINC web site"
+
+#~ msgid "POLL_HELP_BMLIST"
+#~ msgstr "BOINC mailing lists"
+
+#~ msgid "POLL_HELP_WIKI"
+#~ msgstr "The Unofficial BOINC Wiki"
+
+#~ msgid "POLL_HELP_TEAM"
+#~ msgstr "Team web sites"
+
+#~ msgid "POLL_HELP_GOOGLE"
+#~ msgstr "Google or other search engines"
+
+#~ msgid "POLL_ERROR_TITLE"
+#~ msgstr "Error - results not recorded"
+
+#~ msgid "POLL_ERROR_TEXT"
+#~ msgstr ""
+#~ "An internal error has prevented us from recording your survey response.  "
+#~ "Please try again later."
+
+#~ msgid "POLL_RECORDED"
+#~ msgstr "Survey response recorded"
+
+#~ msgid "POLL_THANKS"
+#~ msgstr "Thank you for completing the BOINC user survey."
+
+#~ msgid "POLL_RESULTS_TITLE"
+#~ msgstr "Survey results"
+
+#~ msgid "POLL_RESULTS_TEXT"
+#~ msgstr ""
+#~ "These are the current results of the <a href=poll.php>BOINC user survey</"
+#~ "a>.  This page is updated every hour."
+
+#~ msgid "DL_MIRRORS"
+#~ msgstr ""
+#~ "Note: files are downloaded from mirror servers at boinc.berkeley.edu, "
+#~ "morel.mit.edu, einstein.aei.mpg.de, einstein.astro.gla.ac.uk, einstein."
+#~ "ligo.caltech.edu, and einstein.aset.psu.edu (thanks to these "
+#~ "institutions). The server is chosen randomly - if a download fails, "
+#~ "reload this page and try again. "
+
+# #############################################
+# help.php
+# #############################################
+#~ msgid "HELP_TITLE"
+#~ msgstr "Getting help with BOINC"
+
+#~ msgid "HELP_HEADING1"
+#~ msgstr "Online Help"
+
+#~ msgid "HELP_P1_1"
+#~ msgstr ""
+#~ "BOINC Online Help lets you talk one-on-one with experienced BOINC users, "
+#~ "who can: %s answer questions about BOINC and volunteer computing; %s walk "
+#~ "you through the process of installing and using BOINC; %s troubleshoot "
+#~ "any problems you might have. "
+
+#~ msgid "HELP_P1_2"
+#~ msgstr ""
+#~ "BOINC Online Help is based on %sSkype%s, an Internet-based telephone "
+#~ "system. 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. "
+
+#~ msgid "HELP_P1_3"
+#~ msgstr ""
+#~ "The best way to get help is by voice, for which you need either built-in "
+#~ "microphone and speakers or an external headset for your computer. You can "
+#~ "also use Skype's text-based chat system or regular email (if you don't "
+#~ "have Skype) to communicate with Help Volunteers."
+
+#~ msgid "HELP_P1_4"
+#~ msgstr ""
+#~ "Volunteers speaking several languages are available. Please select a "
+#~ "language: "
+
+#~ msgid "HELP_HEADING2"
+#~ msgstr "BOINC help on the web"
+
+#~ msgid "HELP_P2_ITEM1"
+#~ msgstr "BOINC user's manual"
+
+#~ msgid "HELP_P2_ITEM2"
+#~ msgstr "Troubleshooting BOINC "
+
+#~ msgid "HELP_P2_ITEM3"
+#~ msgstr "BOINC-related web sites "
+
+#~ msgid "HELP_P2_ITEM4"
+#~ msgstr "The BOINC message boards "
+
+#~ msgid "HELP_P2_ITEM5"
+#~ msgstr "The message boards on any BOINC-based project "
+
+#~ msgid "HELP_HEADING3"
+#~ msgstr "Be a Help Volunteer"
+
+#~ msgid "HELP_P3_1"
+#~ msgstr ""
+#~ "If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+#~ "Volunteer%s. It's a great way to help the cause of scientific research "
+#~ "and volunteer computing - and it's fun!  "
+
+#~ msgid "HELP_P3_2"
+#~ msgstr ""
+#~ "If you're already a Help Volunteer: to edit your settings, %sclick here"
+#~ "%s. "
+
+# #############################################
+# index.php
+# #############################################
+#~ msgid "HOME_HEADING1"
+#~ msgstr "Volunteer"
+
+#~ msgid "HOME_P1"
+#~ msgstr ""
+#~ " Use the idle time on your computer  (Windows, Mac, or Linux)  to cure "
+#~ "diseases, study global warming,  discover pulsars, and do many other "
+#~ "types of scientific research.  It's safe, secure, and easy:  %sChoose%s "
+#~ "projects  %sDownload%s and run BOINC software  %sEnter%s an email address "
+#~ "and password. "
+
+#~ msgid "HOME_P2"
+#~ msgstr ""
+#~ "Or, if you run several projects, try an %saccount manager%s such as "
+#~ "%sGridRepublic%s or %sBAM!%s. "
+
+#~ msgid "HOME_P3"
+#~ msgstr ""
+#~ "If you have any questions, or need help getting started, you can %stalk "
+#~ "to a Volunteer Helper%s. "
+
+#~ msgid "HOME_DOWNLOAD"
+#~ msgstr "Download"
+
+#~ msgid "HOME_WEB_SITES"
+#~ msgstr "Web"
+
+#~ msgid "HOME_ADD_ONS"
+#~ msgstr "Add-ons"
+
+#~ msgid "HOME_SURVEY"
+#~ msgstr "Survey"
+
+#~ msgid "HOME_BOINC"
+#~ msgstr "Berkeley Open Infrastructure for Network Computing"
+
+#~ msgid "HOME_BOINC_DESC"
+#~ msgstr ""
+#~ "Open-source software for %svolunteer computing%s and %sgrid computing%s"
diff --git a/locale/ru/BOINC-Client.mo b/locale/ru/BOINC-Client.mo
index 40b3a0a..6d1538a 100644
Binary files a/locale/ru/BOINC-Client.mo and b/locale/ru/BOINC-Client.mo differ
diff --git a/locale/ru/BOINC-Client.po b/locale/ru/BOINC-Client.po
old mode 100755
new mode 100644
index 46b6126..a213a4d
--- a/locale/ru/BOINC-Client.po
+++ b/locale/ru/BOINC-Client.po
@@ -1,23 +1,23 @@
 # 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: BOINC 7.4\n"
+"Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-10-15 22:25-0700\n"
-"PO-Revision-Date: 2015-02-12 01:42-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: ru\n"
+"PO-Revision-Date: 2015-03-12 17:51+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"
-"X-Generator: Pootle 2.1.6\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"
 
-#: acct_mgr.cpp:450
-#: acct_mgr.cpp:459
+#: acct_mgr.cpp:450 acct_mgr.cpp:459
 msgid "Message from account manager"
 msgstr "Сообщение от менеджера проектов"
 
@@ -26,7 +26,9 @@ msgid "Message from server"
 msgstr "Сообщение от сервера"
 
 #: client_state.cpp:258
-msgid "Some tasks need more memory than allowed by your preferences.  Please check the preferences."
+msgid ""
+"Some tasks need more memory than allowed by your preferences.  Please check "
+"the preferences."
 msgstr "Некоторые задания требуют больше памяти, чем разрешено вашими настройками.  Пожалуйста, проверьте настройки."
 
 #: client_state.cpp:520
@@ -39,11 +41,12 @@ msgstr "HTTP-прокси должен быть определен в перем
 
 #: cs_scheduler.cpp:613
 #, c-format
-msgid "You used the wrong URL for this project.  When convenient, remove this project, then add %s"
+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
+#: cs_statefile.cpp:828 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
 msgstr "Ошибка синтаксиса в файле app_info.xml"
 
@@ -55,18 +58,15 @@ msgstr "Файл, на который ссылается app_info.xml, не су
 msgid "A new version of BOINC is available."
 msgstr "Доступна новая версия BOINC."
 
-#: current_version.cpp:94
-#: current_version.cpp:102
+#: current_version.cpp:94 current_version.cpp:102
 msgid "Download"
 msgstr "Загрузить"
 
-#: log_flags.cpp:269
-#: log_flags.cpp:449
+#: 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
+#: log_flags.cpp:423 log_flags.cpp:475
 msgid "Unrecognized tag in cc_config.xml"
 msgstr "Нераспознанный тэг в файле cc_config.xml"
 
@@ -91,7 +91,9 @@ 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."
+msgid ""
+"The project has changed its security key.  Please remove and add this "
+"project."
 msgstr "Проект изменил свой ключ безопасности.  Пожалуйста, удалите и снова добавьте этот проект."
 
 #: ../sched/handle_request.cpp:943
@@ -103,7 +105,8 @@ 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."
+msgid ""
+"Your BOINC client software is too old.  Please install the current version."
 msgstr "У Вас слишком старая версия программного обеспечения BOINC-клиента.  Пожалуйста, установите текущую версию."
 
 #: ../sched/handle_request.cpp:1259
@@ -111,18 +114,21 @@ 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"
+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"
+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"
+msgid ""
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to"
+" the current version"
 msgstr "Необходима более новая версия BOINC для использования вашего ГП NVIDIA; пожалуйста, обновитесь до текущей версии"
 
-# 94%
 #: ../sched/sched_send.cpp:1146
 #, c-format
 msgid "An %s GPU is required to run tasks for this project"
@@ -142,7 +148,8 @@ msgstr "Необходима более новая версия BOINC; пожа
 
 #: ../sched/sched_send.cpp:1305
 #, c-format
-msgid "Tasks for %s are available, but your preferences are set to not accept them"
+msgid ""
+"Tasks for %s are available, but your preferences are set to not accept them"
 msgstr "Доступны задания для %s, но в ваших настройках указано не принимать их"
 
 #: ../sched/sched_types.cpp:254
@@ -152,32 +159,3 @@ msgstr "Неизвестное имя приложения в файле app_inf
 #: ../sched/sched_version.cpp:214
 msgid "Your app_info.xml file doesn't have a usable version of"
 msgstr "Ваш файл app_info.xml не имеет годной версии"
-
-#~ msgid "Download it."
-#~ msgstr "Загрузить её."
-#~ msgid "An NVIDIA or ATI GPU is required to run tasks for this project"
-#~ msgstr ""
-#~ "Для обработки заданий данного проекта необходима видеокарта NVIDIA или ATI"
-#~ msgid "An NVIDIA GPU is required to run tasks for this project"
-#~ msgstr "Для обработки заданий данного проекта необходима видеокарта NVIDIA"
-#~ msgid "An ATI GPU is required to run tasks for this project"
-#~ msgstr "Для обработки заданий данного проекта необходима видеокарта ATI"
-#~ msgid ""
-#~ "Tasks for NVIDIA GPU are available, but your preferences are set to not "
-#~ "accept them"
-#~ msgstr ""
-#~ "Доступны задачи для ГП NVIDIA, но ваши настройки не позволяют принимать их"
-#~ msgid ""
-#~ "Tasks for ATI GPU are available, but your preferences are set to not accept "
-#~ "them"
-#~ msgstr "Доступны задачи для ГП ATI, но ваши настройки не позволяют принимать их"
-#~ msgid ""
-#~ "Tasks for CPU are available, but your preferences are set to not accept them"
-#~ msgstr "Доступны задачи для ЦП, но ваши настройки не позволяют принимать их"
-#~ msgid "error"
-#~ msgstr "ошибка"
-#~ msgid "Can't resolve hostname in remote_hosts.cfg"
-#~ msgstr "Невозможно определить имя компьютера в файле remote_hosts.cfg"
-#~ msgid "is not available for"
-#~ msgstr "не доступно для"
-
diff --git a/locale/ru/BOINC-Manager.mo b/locale/ru/BOINC-Manager.mo
index 6efad8c..f61b106 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 8699c2d..6b16d0f 100644
--- a/locale/ru/BOINC-Manager.po
+++ b/locale/ru/BOINC-Manager.po
@@ -1,65 +1,63 @@
 # 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:
+# Dan <mutari.dirk at gmail.com>, 2015
+# Nikolay Sakharov <saharovna at gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-15 14:15-0500\n"
-"PO-Revision-Date: 2015-02-12 01:43-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: ru\n"
+"POT-Creation-Date: 2015-03-24 13:36-0500\n"
+"PO-Revision-Date: 2015-03-25 14:45+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"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc_7.4\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1419181307.0\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"
+"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\n"
+"X-Poedit-Country: UNITED STATES\n"
+"X-Poedit-Language: English\n"
 "X-Poedit-SearchPath-0: clientgui\n"
-"X-Poedit-SearchPath-1: clientgui/msw\n"
-"X-Poedit-SearchPath-2: clientgui/gtk\n"
-"X-Poedit-SearchPath-3: clientgui/mac\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"
 
-# 81%
-#: clientgui/AccountInfoPage.cpp:387
+#: clientgui/AccountInfoPage.cpp:361
 #, c-format
 msgid "Identify your account at %s"
 msgstr "Идентифицируйте свою учётную запись в %s"
 
-# ???
-#: clientgui/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 ""
-"Укажите данные вашей учётной записи\n"
-"(учётная запись создаётся на сайте проекта)"
+msgstr "Укажите данные вашей учётной записи\n(учётная запись создаётся на сайте проекта)"
 
-# крииииво
-#: clientgui/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 ""
-"Создание новых учётных записей в этом проекте запрещено.\n"
-"Вы можете добавить его, если Вы в нём уже зарегистрированы."
+msgstr "Создание новых учётных записей в этом проекте запрещено.\nВы можете добавить его, если Вы в нём уже зарегистрированы."
 
-#: clientgui/AccountInfoPage.cpp:401
+#: clientgui/AccountInfoPage.cpp:375
 msgid "Are you already running this project?"
 msgstr "Вы уже зарегистрированы в проекте?"
 
-#: clientgui/AccountInfoPage.cpp:405
+#: clientgui/AccountInfoPage.cpp:379
 msgid "&No, new user"
 msgstr "Нет, новый участник"
 
-#: clientgui/AccountInfoPage.cpp:408
+#: clientgui/AccountInfoPage.cpp:382
 msgid "&Yes, existing user"
 msgstr "Да, уже зарегистрирован"
 
-#: clientgui/AccountInfoPage.cpp:413
+#: clientgui/AccountInfoPage.cpp:387
 msgid ""
 "We were not able to set up your account information\n"
 "automatically.\n"
@@ -67,138 +65,123 @@ msgid ""
 "Please click on the 'Find login information' link\n"
 "below to find out what to put in the email address and\n"
 "password fields."
-msgstr ""
-"Не удалось автоматически настроить вашу\n"
-"учётную запись.\n"
-"\n"
-"Пожалуйста нажмите ссылку 'Найти информацию для регистрации',\n"
-"находящуюся ниже, чтобы узнать, что ввести в\n"
-"поле адреса электронной почты и пароля."
+msgstr "Не удалось автоматически настроить вашу\nучётную запись.\n\nПожалуйста нажмите ссылку 'Найти информацию для регистрации',\nнаходящуюся ниже, чтобы узнать, что ввести в\nполе адреса электронной почты и пароля."
 
-#: clientgui/AccountInfoPage.cpp:416
+#: clientgui/AccountInfoPage.cpp:390
 msgid "Find login information"
 msgstr "Найти информацию для регистрации"
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:649
+#: clientgui/AccountInfoPage.cpp:410 clientgui/AccountInfoPage.cpp:632
 msgid "&Password:"
 msgstr "Пароль:"
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:673
+#: clientgui/AccountInfoPage.cpp:417 clientgui/AccountInfoPage.cpp:656
 msgid "Choose a &password:"
 msgstr "Введите пароль:"
 
-#: clientgui/AccountInfoPage.cpp:446
+#: clientgui/AccountInfoPage.cpp:420
 msgid "C&onfirm password:"
 msgstr "Повторный ввод пароля:"
 
-#: clientgui/AccountInfoPage.cpp:453
+#: clientgui/AccountInfoPage.cpp:427
 #, c-format
 msgid "Are you already running %s?"
 msgstr "Вы уже зарегистрированы в проекте %s?"
 
-#: clientgui/AccountInfoPage.cpp:482
+#: clientgui/AccountInfoPage.cpp:456
 msgid "&Username:"
 msgstr "Имя участника:"
 
-#: clientgui/AccountInfoPage.cpp:511
+#: clientgui/AccountInfoPage.cpp:485
 msgid "&Email address or LDAP ID:"
-msgstr "Адрес электронной почты или LDAP ID:"
+msgstr "Адрес электронной почты или идентификатор LDAP:"
 
-#: clientgui/AccountInfoPage.cpp:515
+#: clientgui/AccountInfoPage.cpp:489
 msgid "&Email address:"
 msgstr "Адрес электронной почты:"
 
-#: clientgui/AccountInfoPage.cpp:523
+#: clientgui/AccountInfoPage.cpp:497
 #, c-format
 msgid "minimum length %d"
 msgstr "минимум %d символов"
 
-#: clientgui/AccountInfoPage.cpp:530
+#: clientgui/AccountInfoPage.cpp:504
 msgid "Forgot your password?"
 msgstr "Забыли пароль?"
 
-#: clientgui/AccountInfoPage.cpp:537
+#: 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 ""
-"Если Вы еще не зарегистрировались в этом менеджере проектов,\n"
-"пожалуйста сделайте это перед тем, как продолжить.  Нажмите на ссылку ниже,\n"
-"чтобы зарегистрироваться или восстановить забытый пароль."
+msgstr "Если Вы еще не зарегистрировались в этом менеджере проектов,\nпожалуйста сделайте это перед тем, как продолжить.  Нажмите на ссылку ниже,\nчтобы зарегистрироваться или восстановить забытый пароль."
 
-#: clientgui/AccountInfoPage.cpp:540
+#: clientgui/AccountInfoPage.cpp:514
 msgid "Account manager web site"
 msgstr "Веб-сайт менеджера проектов"
 
-#: clientgui/AccountInfoPage.cpp:582
+#: clientgui/AccountInfoPage.cpp:556
 msgid "Add project"
 msgstr "Добавить проект"
 
-#: clientgui/AccountInfoPage.cpp:584
+#: clientgui/AccountInfoPage.cpp:558
 msgid "Update account manager"
 msgstr "Обновление менеджера проектов"
 
-#: clientgui/AccountInfoPage.cpp:586
+#: clientgui/AccountInfoPage.cpp:560
 msgid "Use account manager"
 msgstr "Использовать менеджер проектов"
 
-#: clientgui/AccountInfoPage.cpp:593
+#: clientgui/AccountInfoPage.cpp:567
 msgid "Please enter a user name."
 msgstr "Пожалуйста, введите имя пользователя."
 
-# ???
-#: clientgui/AccountInfoPage.cpp:595
+#: clientgui/AccountInfoPage.cpp:569
 msgid "Please enter an email address."
 msgstr "Укажите адрес электронной почты."
 
-#: clientgui/AccountInfoPage.cpp:605
+#: clientgui/AccountInfoPage.cpp:579
 #, c-format
 msgid "Please enter a password of at least %d characters."
 msgstr "Укажите пароль, состоящий по крайней мере из %d символов."
 
-#: clientgui/AccountInfoPage.cpp:615
-msgid "The password and confirmation password do not match. Please type them again."
+#: clientgui/AccountInfoPage.cpp:589
+msgid ""
+"The password and confirmation password do not match. Please type them again."
 msgstr "'Пароль' и 'Подтверждение пароля' не совпадают. Повторите ввод пароля."
 
-#: clientgui/AccountManagerInfoPage.cpp:272
+#: clientgui/AccountManagerInfoPage.cpp:270
 msgid "Choose an account manager"
 msgstr "Выбор менеджера проектов"
 
-#: clientgui/AccountManagerInfoPage.cpp:275
+#: clientgui/AccountManagerInfoPage.cpp:273
 msgid ""
 "To choose an account manager, click its name or \n"
 "type its URL below."
-msgstr ""
-"Выберите понравившийся менеджер проектов, щёлкнув на его названии,\n"
-"или введите его адрес URL в поле ниже."
+msgstr "Выберите понравившийся менеджер проектов, щёлкнув на его названии,\nили введите его адрес URL в поле ниже."
 
-#: clientgui/AccountManagerInfoPage.cpp:279
+#: clientgui/AccountManagerInfoPage.cpp:277
 msgid "Account manager details:"
 msgstr "Описание менеджера проектов:"
 
-#: clientgui/AccountManagerInfoPage.cpp:283
+#: clientgui/AccountManagerInfoPage.cpp:281
 msgid "Account manager &URL:"
 msgstr "&URL-адрес менеджера проектов:"
 
-#: clientgui/AccountManagerInfoPage.cpp:287
+#: clientgui/AccountManagerInfoPage.cpp:285
 msgid "Open web page"
 msgstr "Открыть веб-страницу"
 
-#: clientgui/AccountManagerInfoPage.cpp:290
+#: clientgui/AccountManagerInfoPage.cpp:288
 msgid "Visit this account manager's web site"
 msgstr "Посетить сайт менеджера проектов"
 
-# ???
 #: clientgui/AccountManagerProcessingPage.cpp:186
 #: clientgui/AccountManagerPropertiesPage.cpp:192
 #, c-format
 msgid "Communicating with %s."
 msgstr "Установка связи с %s."
 
-# ???
 #: clientgui/AccountManagerProcessingPage.cpp:193
 #: clientgui/AccountManagerPropertiesPage.cpp:199
 msgid "Communicating with server."
@@ -209,330 +192,338 @@ msgstr "Установка связи с сервером."
 msgid "Please wait..."
 msgstr "Пожалуйста подождите..."
 
-# что бы это значило???
 #: clientgui/AccountManagerProcessingPage.cpp:325
 msgid "An internal server error has occurred.\n"
 msgstr "Произошла внутренняя ошибка сервера.\n"
 
-#: clientgui/AdvancedFrame.cpp:96
+#: clientgui/AdvancedFrame.cpp:99
 msgid "Connected"
 msgstr "Соединение установлено"
 
-#: clientgui/AdvancedFrame.cpp:104
+#: clientgui/AdvancedFrame.cpp:107
 msgid "Disconnected"
 msgstr "Отсутствует соединение"
 
-#: clientgui/AdvancedFrame.cpp:318
+#: clientgui/AdvancedFrame.cpp:325
+#, c-format
+msgid "New %s window..."
+msgstr "Новое окно %s..."
+
+#: clientgui/AdvancedFrame.cpp:329
+#, c-format
+msgid "Open another %s window"
+msgstr "Открыть ещё одно окно %s"
+
+#: clientgui/AdvancedFrame.cpp:340
+msgid "Select computer..."
+msgstr "Сменить компьютер..."
+
+#: clientgui/AdvancedFrame.cpp:341
+msgid "Connect to a BOINC client on another computer"
+msgstr "Подключиться к клиенту BOINC на другом компьютере"
+
+#: clientgui/AdvancedFrame.cpp:345
+msgid "Shut down connected client..."
+msgstr "Завершить работу подключенного BOINC клиента..."
+
+#: clientgui/AdvancedFrame.cpp:346
+msgid "Shut down the currently connected BOINC client"
+msgstr "Завершить работу подключенного BOINC-клиента"
+
+#: clientgui/AdvancedFrame.cpp:351
 #, c-format
 msgid "Close the %s window"
 msgstr "Закрыть окно %s"
 
-#: clientgui/AdvancedFrame.cpp:321
-msgid "&Close Window"
+#: clientgui/AdvancedFrame.cpp:354
+msgid "&Close window"
 msgstr "Закрыть окно"
 
-#: clientgui/AdvancedFrame.cpp:332
-#: clientgui/AdvancedFrame.cpp:339
-#: clientgui/AdvancedFrame.cpp:346
+#: clientgui/AdvancedFrame.cpp:363 clientgui/AdvancedFrame.cpp:368
+#: clientgui/AdvancedFrame.cpp:373
 #, c-format
 msgid "Exit %s"
 msgstr "Выйти из %s"
 
-#: clientgui/AdvancedFrame.cpp:359
-msgid "Preferences..."
-msgstr "Настройки..."
+#: clientgui/AdvancedFrame.cpp:386
+msgid "Preferences…"
+msgstr "Настройки клиента..."
 
-#: clientgui/AdvancedFrame.cpp:368
+#: clientgui/AdvancedFrame.cpp:395
 msgid "&Notices\tCtrl+Shift+N"
 msgstr "Уведомления\tCtrl+Shift+N"
 
-#: clientgui/AdvancedFrame.cpp:369
-msgid "Display notices"
+#: clientgui/AdvancedFrame.cpp:396
+msgid "Show notices"
 msgstr "Показать уведомления"
 
-#: clientgui/AdvancedFrame.cpp:374
+#: clientgui/AdvancedFrame.cpp:401
 msgid "&Projects\tCtrl+Shift+P"
 msgstr "Проекты\tCtrl+Shift+P"
 
-#: clientgui/AdvancedFrame.cpp:375
-msgid "Display projects"
+#: clientgui/AdvancedFrame.cpp:402
+msgid "Show projects"
 msgstr "Показать проекты"
 
-#: clientgui/AdvancedFrame.cpp:380
+#: clientgui/AdvancedFrame.cpp:407
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr "Задания\tCtrl+Shift+T"
 
-#: clientgui/AdvancedFrame.cpp:381
-msgid "Display tasks"
+#: clientgui/AdvancedFrame.cpp:408
+msgid "Show tasks"
 msgstr "Показать задания"
 
-#: clientgui/AdvancedFrame.cpp:386
+#: clientgui/AdvancedFrame.cpp:413
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr "Передача\tCtrl+Shift+X"
 
-#: clientgui/AdvancedFrame.cpp:387
-msgid "Display transfers"
-msgstr "Показать передачу данных"
+#: clientgui/AdvancedFrame.cpp:414
+msgid "Show file transfers"
+msgstr "Показать передачу файлов"
 
-#: clientgui/AdvancedFrame.cpp:392
+#: clientgui/AdvancedFrame.cpp:419
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "Статистика\tCtrl+Shift+S"
 
-#: clientgui/AdvancedFrame.cpp:393
-msgid "Display statistics"
+#: clientgui/AdvancedFrame.cpp:420
+msgid "Show statistics"
 msgstr "Показать статистику"
 
-#: clientgui/AdvancedFrame.cpp:398
-msgid "&Disk usage\tCtrl+Shift+D"
+#: clientgui/AdvancedFrame.cpp:425
+msgid "&Disk\tCtrl+Shift+D"
 msgstr "Диск\tCtrl+Shift+D"
 
-#: clientgui/AdvancedFrame.cpp:399
-msgid "Display disk usage"
+#: clientgui/AdvancedFrame.cpp:426
+msgid "Show disk usage"
 msgstr "Показать использование диска"
 
-#: clientgui/AdvancedFrame.cpp:406
+#: 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
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr "Упрощенный вид...\tCtrl+Shift+V"
 
-#: clientgui/AdvancedFrame.cpp:407
-msgid "Display the simple graphical interface."
-msgstr "Изменить внешний вид на более простой и понятный."
+#: clientgui/AdvancedFrame.cpp:440
+msgid "Switch to the Simple View"
+msgstr "Переключиться в Упрощённый вид"
 
-#: clientgui/AdvancedFrame.cpp:421
+#: clientgui/AdvancedFrame.cpp:454
 msgid "&Add project or account manager..."
 msgstr "Добавить проект или менеджер проектов..."
 
-#: clientgui/AdvancedFrame.cpp:422
-msgid "Volunteer for any or all of 30+ projects in many areas of science"
-msgstr "Стать участником в любом или во всех 30+ проектах во многих областях науки"
+#: clientgui/AdvancedFrame.cpp:455
+msgid "Add a new science project, or use an account manager"
+msgstr "Добавить новый научный проект или менеджер проектов"
 
-# обновить данные
-#: clientgui/AdvancedFrame.cpp:426
+#: clientgui/AdvancedFrame.cpp:459
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "Синхронизироваться с %s"
 
-#: clientgui/AdvancedFrame.cpp:430
+#: clientgui/AdvancedFrame.cpp:463
 #, c-format
 msgid "Get current settings from %s"
 msgstr "Обновить настройки с %s"
 
-#: clientgui/AdvancedFrame.cpp:440
+#: clientgui/AdvancedFrame.cpp:473
 msgid "&Add project..."
 msgstr "Добавить проект..."
 
-#: clientgui/AdvancedFrame.cpp:441
+#: clientgui/AdvancedFrame.cpp:474
 msgid "Add a project"
 msgstr "Добавить проект"
 
-# ???
-#: clientgui/AdvancedFrame.cpp:444
+#: clientgui/AdvancedFrame.cpp:477
 #, c-format
 msgid "S&top using %s..."
 msgstr "Отсоединиться от %s..."
 
-#: clientgui/AdvancedFrame.cpp:450
+#: clientgui/AdvancedFrame.cpp:483
 msgid "Remove this computer from account manager control."
 msgstr "Отсоединить этот компьютер от менеджера проектов."
 
-#: clientgui/AdvancedFrame.cpp:455
-msgid "&Options..."
-msgstr "Настройки..."
+#: clientgui/AdvancedFrame.cpp:489
+msgid "Run CPU &benchmarks"
+msgstr "Запустить тест производительности"
 
-#: clientgui/AdvancedFrame.cpp:456
-msgid "Configure display options and proxy settings"
-msgstr "Настройки графического интерфейса программы и прокси серверов"
+#: clientgui/AdvancedFrame.cpp:490
+msgid "Run tests that measure CPU speed"
+msgstr "Запустить тесты, измеряющие скорость процессора"
 
-#: clientgui/AdvancedFrame.cpp:460
-msgid "Computing &preferences..."
-msgstr "Настройки клиента..."
+#: clientgui/AdvancedFrame.cpp:494
+msgid "Retry pending transfers"
+msgstr "Повторить незавершённые передачи"
 
-#: clientgui/AdvancedFrame.cpp:461
-msgid "Configure computing preferences"
-msgstr "Изменить локальные настройки вычислений подключенного клиента"
+#: clientgui/AdvancedFrame.cpp:495
+msgid "Retry deferred file transfers and task requests"
+msgstr "Повторить отложенные запросы заданий и передачу файлов"
 
-#: clientgui/AdvancedFrame.cpp:469
+#: clientgui/AdvancedFrame.cpp:503
 msgid "&Run always"
 msgstr "Постоянная обработка"
 
-#: clientgui/AdvancedFrame.cpp:470
+#: clientgui/AdvancedFrame.cpp:504
 msgid "Allow work regardless of preferences"
 msgstr "Обработка заданий запущена всегда"
 
-#: clientgui/AdvancedFrame.cpp:474
+#: clientgui/AdvancedFrame.cpp:508
 msgid "Run based on &preferences"
 msgstr "График работы определяется настройками"
 
-#: clientgui/AdvancedFrame.cpp:475
+#: clientgui/AdvancedFrame.cpp:509
 msgid "Allow work according to preferences"
 msgstr "Обработка заданий выполняется в соответствии с настройками"
 
-#: clientgui/AdvancedFrame.cpp:479
+#: clientgui/AdvancedFrame.cpp:513
 msgid "&Suspend"
 msgstr "Приостановить обработку"
 
-#: clientgui/AdvancedFrame.cpp:480
+#: clientgui/AdvancedFrame.cpp:514
 msgid "Stop work regardless of preferences"
 msgstr "Приостанавливается обработка всех заданий во всех проектах"
 
-#: clientgui/AdvancedFrame.cpp:505
+#: clientgui/AdvancedFrame.cpp:539
 msgid "Use GPU always"
 msgstr "Постоянная обработка на ГП"
 
-#: clientgui/AdvancedFrame.cpp:506
+#: clientgui/AdvancedFrame.cpp:540
 msgid "Allow GPU work regardless of preferences"
 msgstr "Обработка заданий на ГП запущена всегда"
 
-#: clientgui/AdvancedFrame.cpp:510
+#: clientgui/AdvancedFrame.cpp:544
 msgid "Use GPU based on preferences"
 msgstr "График работы ГП определяется настройками"
 
-#: clientgui/AdvancedFrame.cpp:511
+#: clientgui/AdvancedFrame.cpp:545
 msgid "Allow GPU work according to preferences"
 msgstr "Обработка на ГП выполняется в соответствии с настройками"
 
-#: clientgui/AdvancedFrame.cpp:515
+#: clientgui/AdvancedFrame.cpp:549
 msgid "Suspend GPU"
 msgstr "Приостановить использование ГП"
 
-#: clientgui/AdvancedFrame.cpp:516
+#: clientgui/AdvancedFrame.cpp:550
 msgid "Stop GPU work regardless of preferences"
 msgstr "Остановить обработку заданий на ГП независимо от настроек"
 
-#: clientgui/AdvancedFrame.cpp:540
-msgid "Network activity always available"
+#: clientgui/AdvancedFrame.cpp:574
+msgid "Network activity always allowed"
 msgstr "Подключен к интернету"
 
-#: clientgui/AdvancedFrame.cpp:541
+#: clientgui/AdvancedFrame.cpp:575
 msgid "Allow network activity regardless of preferences"
 msgstr "Разрешается обмен данными через интернет в любой момент времени, независимо от настроек"
 
-#: clientgui/AdvancedFrame.cpp:545
+#: clientgui/AdvancedFrame.cpp:579
 msgid "Network activity based on preferences"
 msgstr "Доступ в интернет определяется настройками"
 
-#: clientgui/AdvancedFrame.cpp:546
+#: clientgui/AdvancedFrame.cpp:580
 msgid "Allow network activity according to preferences"
 msgstr "Обмен данными через интернет осуществляется в соответствии с настройками"
 
-#: clientgui/AdvancedFrame.cpp:550
+#: clientgui/AdvancedFrame.cpp:584
 msgid "Network activity suspended"
 msgstr "Работать автономно"
 
-#: clientgui/AdvancedFrame.cpp:551
+#: clientgui/AdvancedFrame.cpp:585
 msgid "Stop BOINC network activity"
 msgstr "Запрещается обмен данными через интернет между BOINC и серверами проектов"
 
-#: clientgui/AdvancedFrame.cpp:561
-#, c-format
-msgid "Connect to another computer running %s"
-msgstr "Подключить другой компьютер с %s"
+#: clientgui/AdvancedFrame.cpp:594
+msgid "Computing &preferences..."
+msgstr "Настройки клиента..."
 
-#: clientgui/AdvancedFrame.cpp:566
-msgid "Select computer..."
-msgstr "Сменить компьютер..."
+#: clientgui/AdvancedFrame.cpp:595
+msgid "Configure computing preferences"
+msgstr "Изменить локальные настройки вычислений подключенного клиента"
 
-#: clientgui/AdvancedFrame.cpp:571
-msgid "Shut down connected client..."
-msgstr "Завершить работу подключенного BOINC клиента..."
+#: clientgui/AdvancedFrame.cpp:600
+msgid "Exclusive applications..."
+msgstr "Привилегированные приложения..."
 
-#: clientgui/AdvancedFrame.cpp:572
-msgid "Shut down the currently connected client"
-msgstr "Завершить работу подключенного BOINC-клиента"
+#: clientgui/AdvancedFrame.cpp:601
+msgid "Configure exclusive applications"
+msgstr "Настроить привилегированные приложения"
 
-#: clientgui/AdvancedFrame.cpp:576
-msgid "Run CPU &benchmarks"
-msgstr "Запустить тест производительности"
+#: clientgui/AdvancedFrame.cpp:606
+msgid "Select columns..."
+msgstr "Выбрать столбцы..."
+
+#: clientgui/AdvancedFrame.cpp:607
+msgid "Select which columns to display"
+msgstr "Выберите отображаемые столбцы"
+
+#: clientgui/AdvancedFrame.cpp:611
+msgid "Event Log options...\tCtrl+Shift+F"
+msgstr "Параметры журнала событий...\tCtrl+Shift+F"
 
-#: clientgui/AdvancedFrame.cpp:577
-msgid "Runs BOINC CPU benchmarks"
-msgstr "Запустить тест производительности процессора"
+#: clientgui/AdvancedFrame.cpp:612
+msgid "Enable or disable various diagnostic messages"
+msgstr "Включить или отключить различные диагностические сообщения"
 
-# ???
-#: clientgui/AdvancedFrame.cpp:581
-msgid "Do network communication"
-msgstr "Повторить обмен данными с серверами проектов"
+#: clientgui/AdvancedFrame.cpp:616
+msgid "&Other options..."
+msgstr "Другие параметры..."
 
-# ???
-#: clientgui/AdvancedFrame.cpp:582
-msgid "Do all pending network communication"
-msgstr "Повторить все незавершённые обмены данными с серверами проектов"
+#: clientgui/AdvancedFrame.cpp:617
+msgid "Configure display options and network settings"
+msgstr "Настроить параметры отображения и сети"
 
-# 94%
-#: clientgui/AdvancedFrame.cpp:586
+#: clientgui/AdvancedFrame.cpp:622
 msgid "Read config files"
 msgstr "Перезагрузить файлы настроек"
 
-#: clientgui/AdvancedFrame.cpp:587
-msgid "Read configuration info from cc_config.xml and any app_config.xml files"
+#: clientgui/AdvancedFrame.cpp:623
+msgid ""
+"Read configuration info from cc_config.xml and any app_config.xml files"
 msgstr "Перезагрузить информацию о настройках из cc_config.xml и каких-либо файлов app_config.xml"
 
-#: clientgui/AdvancedFrame.cpp:591
+#: clientgui/AdvancedFrame.cpp:627
 msgid "Read local prefs file"
 msgstr "Перезагрузить локальный файл общих настроек"
 
-#: clientgui/AdvancedFrame.cpp:592
+#: clientgui/AdvancedFrame.cpp:628
 msgid "Read preferences from global_prefs_override.xml."
 msgstr "Перезагрузить локальный файл общих настроек global_prefs_override.xml."
 
-#: clientgui/AdvancedFrame.cpp:597
-#, c-format
-msgid "Launch another instance of %s..."
-msgstr "Запустить другой экземпляр %s..."
-
-#: clientgui/AdvancedFrame.cpp:601
-#, c-format
-msgid "Launch another %s"
-msgstr "Запустить другой %s"
-
-#: clientgui/AdvancedFrame.cpp:611
-msgid "Event Log...\tCtrl+Shift+E"
-msgstr "Просмотр событий...\t Ctrl+Shift+E"
-
-#: clientgui/AdvancedFrame.cpp:612
-msgid "Display diagnostic messages."
-msgstr "Показать диагностические сообщения."
-
-#: clientgui/AdvancedFrame.cpp:616
-msgid "Event Log Diagnostic Flags...\tCtrl+Shift+F"
-msgstr "Флаги отладки протокола событий...\tCtrl+Shift+F"
-
-#: clientgui/AdvancedFrame.cpp:617
-msgid "Enable or disable various diagnostic messages"
-msgstr "Включить или отключить различные диагностические сообщения"
-
-#: clientgui/AdvancedFrame.cpp:626
+#: clientgui/AdvancedFrame.cpp:636
 #, c-format
 msgid "%s &help"
 msgstr "Справка %s"
 
-#: clientgui/AdvancedFrame.cpp:632
+#: clientgui/AdvancedFrame.cpp:640
 #, c-format
 msgid "Show information about %s"
 msgstr "Показать справку по %s"
 
-#: clientgui/AdvancedFrame.cpp:644
+#: clientgui/AdvancedFrame.cpp:650
 #, c-format
 msgid "&%s help"
 msgstr "Справка %s"
 
-#: clientgui/AdvancedFrame.cpp:650
+#: clientgui/AdvancedFrame.cpp:654
 #, c-format
 msgid "Show information about the %s"
 msgstr "Показать справку по программе %s"
 
-#: clientgui/AdvancedFrame.cpp:662
+#: clientgui/AdvancedFrame.cpp:665
 #, c-format
 msgid "%s &web site"
 msgstr "&Веб-сайт %s"
 
-#: clientgui/AdvancedFrame.cpp:668
+#: clientgui/AdvancedFrame.cpp:669
 #, c-format
 msgid "Show information about BOINC and %s"
 msgstr "Показать информацию о BOINC и %s"
 
-#: clientgui/AdvancedFrame.cpp:680
-#: clientgui/BOINCTaskBar.cpp:544
+#: clientgui/AdvancedFrame.cpp:680 clientgui/BOINCTaskBar.cpp:544
 #, c-format
 msgid "&About %s..."
 msgstr "О %s..."
@@ -550,27 +541,27 @@ msgid "&View"
 msgstr "Вид"
 
 #: clientgui/AdvancedFrame.cpp:701
-msgid "&Tools"
-msgstr "Сервис"
-
-#: clientgui/AdvancedFrame.cpp:705
 msgid "&Activity"
 msgstr "Управление"
 
+#: clientgui/AdvancedFrame.cpp:705
+msgid "&Options"
+msgstr "Параметры"
+
 #: clientgui/AdvancedFrame.cpp:709
-msgid "A&dvanced"
-msgstr "Дополнительно"
+msgid "&Tools"
+msgstr "Сервис"
 
 #: clientgui/AdvancedFrame.cpp:713
 msgid "&Help"
 msgstr "Справка"
 
-#: clientgui/AdvancedFrame.cpp:1185
+#: clientgui/AdvancedFrame.cpp:1188
 #, c-format
 msgid "%s - Stop using %s"
 msgstr "%s - Прекратить использование %s"
 
-#: clientgui/AdvancedFrame.cpp:1190
+#: clientgui/AdvancedFrame.cpp:1193
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -578,48 +569,41 @@ msgid ""
 "but you'll have to manage projects manually.\n"
 "\n"
 "Do you want to stop using %s?"
-msgstr ""
-"Если Вы прекратите использование %s,\n"
-"все ваши текущие проекты сохранятся,\n"
-"но Вы должны будете управлять ими вручную.\n"
-"\n"
-"Вы действительно хотите прекратить использовать %s?"
+msgstr "Если Вы прекратите использование %s,\nвсе ваши текущие проекты сохранятся,\nно Вы должны будете управлять ими вручную.\n\nВы действительно хотите прекратить использовать %s?"
 
-#: clientgui/AdvancedFrame.cpp:1397
+#: clientgui/AdvancedFrame.cpp:1420
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s - Завершение работы текущего BOINC клиента..."
 
-#: clientgui/AdvancedFrame.cpp:1406
+#: clientgui/AdvancedFrame.cpp:1429
 #, c-format
 msgid ""
 "%s will shut down the current client\n"
 "and prompt you for another host to connect to."
-msgstr ""
-"%s остановит подключенного в данный момент клиента,\n"
-"и запросит у Вас для подключения адрес другого компьютера."
+msgstr "%s остановит подключенного в данный момент клиента,\nи запросит у Вас для подключения адрес другого компьютера."
 
-#: clientgui/AdvancedFrame.cpp:1806
+#: clientgui/AdvancedFrame.cpp:1832
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: clientgui/AdvancedFrame.cpp:1815
+#: clientgui/AdvancedFrame.cpp:1841
 #, c-format
 msgid "%s has successfully added %s"
 msgstr "%s успешно добавил проект %s"
 
-#: clientgui/AdvancedFrame.cpp:1953
+#: clientgui/AdvancedFrame.cpp:1977
 #, c-format
 msgid "%s - (%s)"
 msgstr "%s - (%s)"
 
-#: clientgui/AdvancedFrame.cpp:1957
+#: clientgui/AdvancedFrame.cpp:1981
 #, c-format
 msgid "Connecting to %s"
 msgstr "Идёт подключение к %s"
 
-#: clientgui/AdvancedFrame.cpp:1960
+#: clientgui/AdvancedFrame.cpp:1984
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "Подключен к %s (%s)"
@@ -634,13 +618,8 @@ msgid ""
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"Учётная запись с таким именем участника уже\n"
-"существует и её пароль отличается от введённого вами.\n"
-"\n"
-"Посетите домашнюю страницу проекта для получения инструкций."
+msgstr "Учётная запись с таким именем участника уже\nсуществует и её пароль отличается от введённого вами.\n\nПосетите домашнюю страницу проекта для получения инструкций."
 
-# не влазит полностью
 #: clientgui/AlreadyExistsPage.cpp:191
 msgid "Email address already in use"
 msgstr "Данный адрес эл. почты уже используется"
@@ -651,11 +630,7 @@ msgid ""
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"Учётная запись с таким адресом электронной почты уже\n"
-"существует и её пароль отличается от введённого вами.\n"
-"\n"
-"Посетите домашнюю страницу проекта для получения инструкций."
+msgstr "Учётная запись с таким адресом электронной почты уже\nсуществует и её пароль отличается от введённого вами.\n\nПосетите домашнюю страницу проекта для получения инструкций."
 
 #: clientgui/AsyncRPC.cpp:1031
 msgid "Communicating with BOINC client.  Please wait ..."
@@ -680,96 +655,76 @@ msgstr "%s - Установка связи"
 msgid "Cancel"
 msgstr "Отмена"
 
-#: clientgui/BOINCBaseFrame.cpp:504
+#: clientgui/BOINCBaseFrame.cpp:512
 #, c-format
 msgid "%s - Connection Error"
 msgstr "%s - ошибка соединения"
 
-# Пью пиво,
-# меняю пароли.
-#: clientgui/BOINCBaseFrame.cpp:513
+#: 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 ""
-"У вас недостаточно прав для управления BOINC клиентом.\n"
-"Управление станет возможно после добавления вас в группу 'boinc_users' Администратором компьютера."
-
-# загадочное какое-то сообщение,
-# программа и клиент это типа два разных глюка из одной папки,
-# и все главное сразу догадались кто программа а кто клиент.
-# загадочное какое-то сообщение, программа и клиент это типа два разных глюка из одной папки, и все главное сразу догадались кто программа а кто клиент.
-#: clientgui/BOINCBaseFrame.cpp:522
+msgstr "У вас недостаточно прав для управления BOINC клиентом.\nУправление станет возможно после добавления вас в группу 'boinc_users' Администратором компьютера."
+
+#: 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 ""
-"Подключение к клиенту не удалось из-за ошибки контроля доступа.\n"
-"Убедитесь, что программа запускается из той же папки что и клиент."
+msgstr "Подключение к клиенту не удалось из-за ошибки контроля доступа.\nУбедитесь, что программа запускается из той же папки что и клиент."
 
-#: clientgui/BOINCBaseFrame.cpp:524
+#: clientgui/BOINCBaseFrame.cpp:532
 msgid "Authorization failed connecting to running client."
 msgstr "Подключение к клиенту не удалось из-за ошибки контроля доступа."
 
-#: clientgui/BOINCBaseFrame.cpp:532
+#: clientgui/BOINCBaseFrame.cpp:540
 msgid "The password you have provided is incorrect, please try again."
 msgstr "Введен не правильный пароль, попробуйте подключиться еще раз."
 
-#: clientgui/BOINCBaseFrame.cpp:576
+#: clientgui/BOINCBaseFrame.cpp:584
 #, c-format
 msgid "%s - Connection Failed"
 msgstr "%s - ошибка подключения"
 
-#: clientgui/BOINCBaseFrame.cpp:585
+#: 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 не может подключиться к клиенту %s.\n"
-"Попытаться повторить подключение?"
+msgstr "%s не может подключиться к клиенту %s.\nПопытаться повторить подключение?"
 
-#: clientgui/BOINCBaseFrame.cpp:621
+#: clientgui/BOINCBaseFrame.cpp:629
 #, c-format
 msgid "%s - Daemon Start Failed"
 msgstr "%s - сбой при старте демона"
 
-#: clientgui/BOINCBaseFrame.cpp:631
+#: 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 не может запустить клиента %s.\n"
-"Попробуйте запустить службу BOINC ещё раз из 'Панель управления/Администрирование/Службы'."
+msgstr "%s не может запустить клиента %s.\nПопробуйте запустить службу BOINC ещё раз из 'Панель управления/Администрирование/Службы'."
 
-# чё-то муть какая-то, зачем и что повторить-то.
-#: clientgui/BOINCBaseFrame.cpp:637
+#: 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 не может запустить клиента %s.\n"
-"Попробуйте запустить демона ещё раз."
+msgstr "%s не может запустить клиента %s.\nПопробуйте запустить демона ещё раз."
 
-#: clientgui/BOINCBaseFrame.cpp:688
+#: clientgui/BOINCBaseFrame.cpp:696
 #, c-format
 msgid "%s - Connection Status"
 msgstr "%s - состояние подключения"
 
-#: clientgui/BOINCBaseFrame.cpp:699
+#: clientgui/BOINCBaseFrame.cpp:707
 #, 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"
 "To connect up to your local computer please use 'localhost' as the host name."
-msgstr ""
-"%s не подключен к клиенту %s.\n"
-"Для подключения к клиенту %s воспользуйтесь меню 'Дополнительно\\Сменить компьютер...'.\n"
-"Для локального компьютера используйте 'localhost' в качестве имени компьютера."
+msgstr "%s не подключен к клиенту %s.\nДля подключения к клиенту %s воспользуйтесь меню 'Дополнительно\\Сменить компьютер...'.\nДля локального компьютера используйте 'localhost' в качестве имени компьютера."
 
-#: clientgui/BOINCBaseView.cpp:752
+#: clientgui/BOINCBaseView.cpp:790
 msgid "Project web pages"
 msgstr "Веб-страницы проекта"
 
@@ -783,9 +738,7 @@ msgstr "%s - Неожиданный выход"
 msgid ""
 "The %s client has exited unexpectedly 3 times within the last %d minutes.\n"
 "Would you like to restart it again?"
-msgstr ""
-"Клиент %s неожиданно завершил работу 3 раза за последние %d минут.\n"
-"Хотите перезапустить его ещё раз?"
+msgstr "Клиент %s неожиданно завершил работу 3 раза за последние %d минут.\nХотите перезапустить его ещё раз?"
 
 #: clientgui/BOINCDialupManager.cpp:61
 #, c-format
@@ -797,9 +750,7 @@ msgstr "%s - состояние сетевого подключения"
 msgid ""
 "%s needs to connect to the Internet.\n"
 "May it do so now?"
-msgstr ""
-"%s необходимо подключиться к интернету.\n"
-"Произвести соединение сейчас?"
+msgstr "%s необходимо подключиться к интернету.\nПроизвести соединение сейчас?"
 
 #: clientgui/BOINCDialupManager.cpp:254
 #, c-format
@@ -821,9 +772,7 @@ msgstr "%s не удалось подключиться к интернету."
 msgid ""
 "%s has detected it is now connected to the Internet.\n"
 "Updating all projects and retrying all transfers."
-msgstr ""
-"%s обнаружил установленное подключение к интернету.\n"
-"Идёт обмен файлами данных и обновление информации о проектах."
+msgstr "%s обнаружил установленное подключение к интернету.\nИдёт обмен файлами данных и обновление информации о проектах."
 
 #: clientgui/BOINCDialupManager.cpp:417
 #, c-format
@@ -835,7 +784,7 @@ msgstr "%s разорвал подключение к интернету."
 msgid "%s failed to disconnected from the Internet."
 msgstr "%s не удалось разорвать подключение к интернету."
 
-#: clientgui/BOINCGUIApp.cpp:595
+#: clientgui/BOINCGUIApp.cpp:597
 #, c-format
 msgid ""
 "You currently are not authorized to manage the client.\n"
@@ -846,107 +795,93 @@ msgid ""
 " or\n"
 "  - contact your administrator to add you to the 'boinc_master'\n"
 "     user group."
-msgstr ""
-"В настоящий момент у Вас нет прав на управление клиентом.\n"
-"\n"
-"Чтобы запустить %s под текущим пользователем, необходимо:\n"
-" - переустановить ПО %s, ответив \"Да\" на вопрос\n"
-"   о пользователях без административных прав\n"
-"или\n"
-" - обратиться к Вашему администратору, чтобы он добавил Вас\n"
-"   в группу пользователей 'boinc_master'."
-
-#: clientgui/BOINCGUIApp.cpp:601
+msgstr "В настоящий момент у Вас нет прав на управление клиентом.\n\nЧтобы запустить %s под текущим пользователем, необходимо:\n - переустановить ПО %s, ответив \"Да\" на вопрос\n   о пользователях без административных прав\nили\n - обратиться к Вашему администратору, чтобы он добавил Вас\n   в группу пользователей 'boinc_master'."
+
+#: clientgui/BOINCGUIApp.cpp:603
 #, c-format
 msgid ""
 "%s ownership or permissions are not set properly; please reinstall %s.\n"
 "(Error code %d"
-msgstr ""
-"Владелец %s или права доступа установлены некорректно; пожалуйста переустановите ПО %s.\n"
-"(Код ошибки %d"
+msgstr "Владелец %s или права доступа установлены некорректно; пожалуйста переустановите ПО %s.\n(Код ошибки %d"
 
-#: clientgui/BOINCGUIApp.cpp:607
+#: clientgui/BOINCGUIApp.cpp:609
 msgid " at "
 msgstr " на "
 
-#: clientgui/BOINCGUIApp.cpp:610
+#: clientgui/BOINCGUIApp.cpp:612
 msgid ")"
 msgstr ")"
 
-#: clientgui/BOINCGUIApp.cpp:640
+#: 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 ""
-"Требуется перезагрузка для корректной работы клиента BOINC.\n"
-"Пожалуйста, перезагрузите Ваш компьютер и попытайтесь еще раз."
+msgstr "Требуется перезагрузка для корректной работы клиента BOINC.\nПожалуйста, перезагрузите Ваш компьютер и попытайтесь еще раз."
 
-#: clientgui/BOINCGUIApp.cpp:641
+#: clientgui/BOINCGUIApp.cpp:643
 msgid "BOINC Manager"
 msgstr "BOINC менеджер"
 
-#: clientgui/BOINCGUIApp.cpp:902
+#: clientgui/BOINCGUIApp.cpp:904
 msgid "BOINC Manager was started by the operating system automatically"
 msgstr "BOINC менеджер был автоматически запущен операционной системой"
 
-#: clientgui/BOINCGUIApp.cpp:904
+#: clientgui/BOINCGUIApp.cpp:906
 msgid "Startup BOINC so only the system tray icon is visible"
 msgstr "сворачивать BOINC менеджер в значок на панели задач при запуске"
 
-#: clientgui/BOINCGUIApp.cpp:906
+#: clientgui/BOINCGUIApp.cpp:908
 msgid "Directory containing the BOINC Client executable"
 msgstr "Каталог, содержащий исполняемый файл клиента BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:907
+#: clientgui/BOINCGUIApp.cpp:909
 msgid "BOINC data directory"
 msgstr "Каталог данных BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:909
+#: clientgui/BOINCGUIApp.cpp:911
 msgid "Host name or IP address"
 msgstr "Имя или IP-адрес компьютера"
 
-#: clientgui/BOINCGUIApp.cpp:910
+#: clientgui/BOINCGUIApp.cpp:912
 msgid "GUI RPC port number"
 msgstr "Номер порта GUI RPC"
 
-#: clientgui/BOINCGUIApp.cpp:911
+#: clientgui/BOINCGUIApp.cpp:913
 msgid "Password"
 msgstr "Пароль"
 
-#: clientgui/BOINCGUIApp.cpp:912
+#: clientgui/BOINCGUIApp.cpp:914
 msgid "Startup BOINC with these optional arguments"
 msgstr "запускать BOINC клиент с ключами запуска"
 
-#: clientgui/BOINCGUIApp.cpp:913
+#: clientgui/BOINCGUIApp.cpp:915
 msgid "disable BOINC security users and permissions"
 msgstr "отключить политику безопасности доступа пользователей к BOINC"
 
-# Это описание ключа запуска BOINC managera. Не переводится.
-#: clientgui/BOINCGUIApp.cpp:914
+#: clientgui/BOINCGUIApp.cpp:916
 msgid "set skin debugging mode to enable skin manager error messages"
 msgstr "включить режим отладки менеджера обложек для вывода сообщений об ошибках"
 
-#: clientgui/BOINCGUIApp.cpp:915
+#: clientgui/BOINCGUIApp.cpp:917
 msgid "multiple instances of BOINC Manager allowed"
 msgstr "разрешено несколько экземпляров менеджера BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:917
+#: clientgui/BOINCGUIApp.cpp:919
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr "Не используется: обход ошибки в XCode 4.2"
 
-#: clientgui/BOINCGUIApp.cpp:1164
+#: clientgui/BOINCGUIApp.cpp:1166
 msgid "(Automatic Detection)"
 msgstr "(Автоопределение)"
 
-#: clientgui/BOINCGUIApp.cpp:1165
+#: clientgui/BOINCGUIApp.cpp:1167
 msgid "(Unknown)"
 msgstr "(Неизвестный)"
 
-#: clientgui/BOINCGUIApp.cpp:1166
+#: clientgui/BOINCGUIApp.cpp:1168
 msgid "(User Defined)"
 msgstr "(Пользовательский)"
 
-# не соответствует реальности - реально при фразе "Open BOINC Web..." - открывается GridRepublic
 #: clientgui/BOINCTaskBar.cpp:522
 #, c-format
 msgid "Open %s Web..."
@@ -957,15 +892,12 @@ msgstr "Посетить веб-страницу %s..."
 msgid "Open %s..."
 msgstr "Открыть %s..."
 
-# Сончас
-#: clientgui/BOINCTaskBar.cpp:536
-#: clientgui/BOINCTaskBar.cpp:633
+#: clientgui/BOINCTaskBar.cpp:536 clientgui/BOINCTaskBar.cpp:633
 #: clientgui/BOINCTaskBar.cpp:641
 msgid "Snooze"
 msgstr "Приостановить на час"
 
-#: clientgui/BOINCTaskBar.cpp:538
-#: clientgui/BOINCTaskBar.cpp:660
+#: clientgui/BOINCTaskBar.cpp:538 clientgui/BOINCTaskBar.cpp:660
 #: clientgui/BOINCTaskBar.cpp:668
 msgid "Snooze GPU"
 msgstr "Приостановить ГП на час"
@@ -982,22 +914,18 @@ msgstr "Запустить"
 msgid "Resume GPU"
 msgstr "Запустить ГП"
 
-# переделать
 #: clientgui/BOINCTaskBar.cpp:727
 msgid "Computing is enabled"
 msgstr "Обработка разрешена"
 
-# пауза
 #: clientgui/BOINCTaskBar.cpp:731
 msgid "Computing is suspended - "
 msgstr "Обработка приостановлена - "
 
-# переделать
 #: clientgui/BOINCTaskBar.cpp:741
 msgid "GPU computing is enabled"
 msgstr "Обработка на ГП разрешена"
 
-# пауза
 #: clientgui/BOINCTaskBar.cpp:744
 msgid "GPU computing is suspended - "
 msgstr "Обработка на ГП приостановлена - "
@@ -1031,19 +959,14 @@ msgstr "Есть новые уведомления - нажмите для пр
 msgid "Failed to add project"
 msgstr "Не удалось добавить проект"
 
-# ???
 #: clientgui/CompletionErrorPage.cpp:204
 msgid "Failed to update account manager"
 msgstr "Не удалось обновить менеджер проектов"
 
-# ???
 #: clientgui/CompletionErrorPage.cpp:208
 msgid "Failed to remove account manager"
-msgstr ""
-"Не удалось отсоединиться\n"
-"от менеджера проектов"
+msgstr "Не удалось отсоединиться\nот менеджера проектов"
 
-# ???
 #: clientgui/CompletionErrorPage.cpp:212
 msgid "Failed to add account manager"
 msgstr "Не удалось подключиться к менеджеру проектов"
@@ -1053,15 +976,10 @@ msgid ""
 "Please try again later.\n"
 "\n"
 "Click Finish to close."
-msgstr ""
-"Попробуйте ещё раз позднее.\n"
-"\n"
-"Нажмите кнопку 'Готово' для выхода."
+msgstr "Попробуйте ещё раз позднее.\n\nНажмите кнопку 'Готово' для выхода."
 
-#: 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 "Нажмите кнопку 'Готово' для выхода из мастера."
 
@@ -1077,22 +995,17 @@ msgstr "Проект добавлен"
 msgid "This project has been successfully added."
 msgstr "Этот проект был успешно добавлен"
 
-# ...
 #: 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 ""
-"После нажатия кнопки 'Готово', в вашем браузере\n"
-"автоматически откроется страница, где вы сможете указать\n"
-"имя вашей учётной записи и изменить её настройки."
+msgstr "После нажатия кнопки 'Готово', в вашем браузере\nавтоматически откроется страница, где вы сможете указать\nимя вашей учётной записи и изменить её настройки."
 
 #: clientgui/CompletionPage.cpp:232
 #, c-format
 msgid "Update from %s completed."
 msgstr "Обновление %s завершено."
 
-# ???
 #: clientgui/CompletionPage.cpp:236
 msgid "Update completed."
 msgstr "Обновление завершено."
@@ -1101,7 +1014,6 @@ msgstr "Обновление завершено."
 msgid "Now using account manager"
 msgstr "С данного момента используется менеджер проектов"
 
-# Хоть "в" хоть "на" - всё равно как-то криво
 #: clientgui/CompletionPage.cpp:252
 #, c-format
 msgid "Welcome to %s!"
@@ -1133,599 +1045,684 @@ msgstr "Версия wxWidgets:"
 msgid "Copyright:"
 msgstr "Авторские права:"
 
-# 98%
 #: clientgui/DlgAbout.cpp:192
 msgid ""
-"(C) 2003-2014 University of California, Berkeley.\n"
+"(C) 2003-2015 University of California, Berkeley.\n"
 "All Rights Reserved."
-msgstr ""
-"(C) 2003-2014 Калифорнийский университет, Беркли.\n"
-"Все права защищены."
+msgstr "(C) 2003-2015 Калифорнийский университет, Беркли.\nВсе права защищены."
 
 #: clientgui/DlgAbout.cpp:196
-msgid "Berkeley Open Infrastructure for Network Computing"
-msgstr ""
-"BOINC - Berkeley Open Infrastructure for Network Computing\n"
-"Открытая Инфраструктура для Распределенных Вычислений университета Беркли"
+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 "для получения дополнительной информации."
 
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:399
+#: clientgui/DlgAbout.cpp:219 clientgui/DlgExitMessage.cpp:173
+#: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:399
 #: clientgui/DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "OK"
 
-#: clientgui/DlgAdvPreferences.cpp:602
-msgid "invalid number"
-msgstr "неправильный номер"
+#: clientgui/DlgAdvPreferences.cpp:669
+msgid "Invalid number"
+msgstr "Неверное число"
 
-#: clientgui/DlgAdvPreferences.cpp:603
-msgid "invalid time, format is HH:MM"
-msgstr "ошибка ввода, формат времени ЧЧ:ММ"
+#: clientgui/DlgAdvPreferences.cpp:670
+msgid "Invalid time, value must be between 0:00 and 24:00, format is HH:MM"
+msgstr "Неверное время. Значение должно быть между 0:00 и 24:00 в формате ЧЧ:ММ"
 
-#: clientgui/DlgAdvPreferences.cpp:604
-msgid "invalid time interval, format is HH:MM-HH:MM"
-msgstr "ошибка при задании интервала, правильный формат ЧЧ:ММ-ЧЧ:ММ"
+#: clientgui/DlgAdvPreferences.cpp:671
+msgid "Number must be between 0 and 10"
+msgstr "Число должно быть от 0 до 10"
 
-#: clientgui/DlgAdvPreferences.cpp:817
+#: clientgui/DlgAdvPreferences.cpp:672
+msgid "Number must be between 0 and 100"
+msgstr "Число должно быть от 0 до 100"
+
+#: clientgui/DlgAdvPreferences.cpp:905
 msgid "invalid input value detected"
 msgstr "обнаружено некорректное значение"
 
-#: clientgui/DlgAdvPreferences.cpp:819
+#: clientgui/DlgAdvPreferences.cpp:907
 msgid "Validation Error"
 msgstr "Ошибка проверки"
 
-#: clientgui/DlgAdvPreferences.cpp:969
-#: clientgui/DlgAdvPreferences.cpp:975
-#: clientgui/DlgAdvPreferences.cpp:981
-msgid "Applications to add"
-msgstr "Добавить приложения"
-
-#: clientgui/DlgAdvPreferences.cpp:998
-#, c-format
-msgid "'%s' is not an executable application."
-msgstr "'%s' не является исполняемым приложением."
-
-#: clientgui/DlgAdvPreferences.cpp:999
-#: clientgui/DlgAdvPreferences.cpp:1046
-#: clientgui/DlgAdvPreferences.cpp:1070
-msgid "Add Exclusive App"
-msgstr "Добавить привилегированное приложение"
-
-#: clientgui/DlgAdvPreferences.cpp:1011
-msgid "Name of application to add?"
-msgstr "Имя добавляемого приложения?"
-
-#: clientgui/DlgAdvPreferences.cpp:1011
-msgid "Add exclusive app"
-msgstr "Добавить привилегированное приложение"
+#: clientgui/DlgAdvPreferences.cpp:1119
+msgid "Discard local preferences and use web-based preferences?"
+msgstr "Отменить локальные настройки и использовать веб-настройки?"
 
-#: clientgui/DlgAdvPreferences.cpp:1045
-#, c-format
-msgid "Application names must end with '%s'"
-msgstr "Имена приложений должны оканчиваться на '%s'"
-
-#: clientgui/DlgAdvPreferences.cpp:1069
-#, c-format
-msgid "'%s' is already in the list."
-msgstr "'%s' уже в списке."
-
-#: clientgui/DlgAdvPreferences.cpp:1161
-msgid ""
-"Do you really want to clear all local preferences?\n"
-"(This will not affect exclusive applications.)"
-msgstr ""
-"Вы уверены, что хотите удалить все локальные настройки?\n"
-"(Это не затронет привилегированные приложения.)"
-
-#: clientgui/DlgAdvPreferences.cpp:1162
+#: clientgui/DlgAdvPreferences.cpp:1120
 msgid "Confirmation"
 msgstr "Подтверждение"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:49
+#: clientgui/DlgAdvPreferencesBase.cpp:54
 #, c-format
 msgid "%s - Computing preferences"
 msgstr "%s - Настройки вычислений"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:66
+#: clientgui/DlgAdvPreferencesBase.cpp:77
 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 ""
-"Это диалоговое окно настроек только для этого компьютера.\n"
-"Для сохранения настроек нажмите 'OK'.\n"
-"Для возврата к настройкам с сайта проекта нажмите 'Удалить'\n"
-"(не затронет привилегированные приложения)."
-
-#: clientgui/DlgAdvPreferencesBase.cpp:69
-msgid "Clear"
-msgstr "Удалить"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:70
-msgid "clear all local preferences and close the dialog"
-msgstr "удалить локально хранимые настройки для данного компьютера и закрыть окно"
+"Using local preferences.\n"
+"Click \"Use web prefs\" to use web-based preferences from"
+msgstr "Использование локальных настроек.\nНажмите «Использовать веб-настройки» для использования веб-настроек"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:85
-msgid "processor usage"
-msgstr "процессор"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:88
-msgid "network usage"
-msgstr "настройки сети"
+msgid "Using web-based preferences from"
+msgstr "Использование веб-настроек"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:91
-msgid "disk and memory usage"
-msgstr "диск и память"
+#: clientgui/DlgAdvPreferencesBase.cpp:102
+msgid "Set values and click OK to use local preferences instead."
+msgstr "Установите значения и нажмите 'OK' для использования локальных настроек."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:94
-msgid "exclusive applications"
-msgstr "привилегированные приложения"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:107
-#: clientgui/DlgDiagnosticLogFlags.cpp:104
-msgid "OK"
-msgstr "OK"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:108
-msgid "save all values and close the dialog"
-msgstr "сохранить все значения и закрыть окно"
+#: clientgui/DlgAdvPreferencesBase.cpp:111
+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
-msgid "close the dialog without saving"
-msgstr "закрыть окно без сохранения изменений"
+msgid "Clear"
+msgstr "Удалить"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:115
+msgid "Clear all local preferences and close the dialog."
+msgstr "Удалить локально хранимые настройки для данного компьютера и закрыть окно."
 
-# было 'Вопросы и ответы'-для SETI
 #: clientgui/DlgAdvPreferencesBase.cpp:118
-#: clientgui/Localization.cpp:35
-#: clientgui/Localization.cpp:121
-#: clientgui/Localization.cpp:139
-msgid "Help"
-msgstr "Помощь"
+msgid "Use web prefs"
+msgstr "Использовать веб-настройки"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:119
-msgid "shows the preferences web page"
-msgstr "перейти на веб-страницу с описанием данных настроек"
+msgid "Restore web-based preferences and close the dialog."
+msgstr "Восстановить веб-настройки и закрыть окно."
 
-# переделать
-#: clientgui/DlgAdvPreferencesBase.cpp:141
-msgid "Computing allowed"
-msgstr "Запускать обработку заданий при выполнении следующих условий"
+#: clientgui/DlgAdvPreferencesBase.cpp:143
+#: clientgui/DlgAdvPreferencesBase.cpp:637
+msgid "Computing"
+msgstr "вычислений"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:146
-msgid "While computer is on batteries"
-msgstr "При питании от аккумуляторов"
+#: clientgui/DlgAdvPreferencesBase.cpp:785
+msgid "Network"
+msgstr "Сеть"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:149
-msgid "check this if you want this computer to do work while it runs on batteries"
-msgstr "выберите данный пункт если хотите обрабатывать задания когда компьютер питается от аккумуляторов"
+msgid "Disk and memory"
+msgstr "Диск и память"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:155
-msgid "While computer is in use"
-msgstr "Когда компьютер используется для работы"
+#: clientgui/DlgAdvPreferencesBase.cpp:152
+msgid "Daily schedules"
+msgstr "Ежедневное расписание"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:158
-msgid "check this if you want this computer to do work even when you're using it"
-msgstr "выберите данный пункт если хотите обрабатывать задания когда компьютер используется пользователями для работы"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:164
-msgid "Use GPU while computer is in use"
-msgstr "Использовать ГП когда компьютер используется для работы"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:167
-msgid "check this if you want your GPU to do work even when you're using the computer"
-msgstr "выберите данный пункт если хотите обрабатывать задания с помощью видеокарты (GPU) когда компьютер используется пользователями для работы"
-
-# не удачно
-#: clientgui/DlgAdvPreferencesBase.cpp:179
-msgid "Only after computer has been idle for"
-msgstr "При отсутствии активности пользователя более"
+#: clientgui/DlgAdvPreferencesBase.cpp:165
+#: clientgui/DlgDiagnosticLogFlags.cpp:119 clientgui/DlgExclusiveApps.cpp:146
+#: clientgui/DlgHiddenColumns.cpp:100
+msgid "OK"
+msgstr "OK"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:188
-msgid "do work only after you haven't used the computer for this number of minutes"
-msgstr "через сколько минут отсутствия активности на компьютере начинать обрабатывать задания"
+#: clientgui/DlgAdvPreferencesBase.cpp:166
+msgid "Save all values and close the dialog."
+msgstr "Сохранить все значения и закрыть окно."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:193
-#: clientgui/DlgAdvPreferencesBase.cpp:342
-msgid "minutes"
-msgstr "минут"
+#: clientgui/DlgAdvPreferencesBase.cpp:172
+msgid "Close the dialog without saving."
+msgstr "Закрыть диалоговое окно без сохранения."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:212
-msgid "While processor usage is less than"
-msgstr "При использовании процессора менее"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:221
-msgid "suspend work if processor usage exceeds this level"
-msgstr "остановить обработку, если использование процессора превысит этот уровень"
+#: clientgui/DlgAdvPreferencesBase.cpp:176 clientgui/DlgExclusiveApps.cpp:157
+msgid "Help"
+msgstr "Помощь"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:226
-msgid "percent (0 means no restriction)"
-msgstr "процентов (0 - нет ограничений)"
+#: clientgui/DlgAdvPreferencesBase.cpp:177
+msgid "Shows the preferences web page."
+msgstr "Перейти на веб-страницу с описанием данных настроек."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:240
-#: clientgui/DlgAdvPreferencesBase.cpp:506
-msgid "Every day between hours of"
-msgstr "Ежедневно с"
+#: clientgui/DlgAdvPreferencesBase.cpp:239
+#: clientgui/DlgAdvPreferencesBase.cpp:425
+msgid "Usage limits"
+msgstr "Ограничения использования"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:244
-msgid "start work at this time"
-msgstr "запустить обработку в это время"
+#, 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:248
-#: clientgui/DlgAdvPreferencesBase.cpp:514
-msgid "and"
-msgstr "до"
+#: clientgui/DlgAdvPreferencesBase.cpp:246
+#: clientgui/DlgAdvPreferencesBase.cpp:258
+msgid "Use at most"
+msgstr "Использовать не более"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:252
-msgid "stop work at this time"
-msgstr "остановить обработку в это время"
+#: clientgui/DlgAdvPreferencesBase.cpp:251
+#, no-c-format
+msgid "% of the CPUs"
+msgstr "% процессоров"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:256
-#: clientgui/DlgAdvPreferencesBase.cpp:522
-msgid "(no restriction if equal)"
-msgstr "(ограничение не действует при равенстве значений)"
+#, 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."
+msgstr "Приостанавливать/возобновлять вычисления каждые несколько секунд, чтобы понизить температуру процессора и уменьшить потребляемую энергию. Пример: 75% означает вычислять 3 секунды, подождать 1 секунду и повторить."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:261
-#: clientgui/DlgAdvPreferencesBase.cpp:527
-msgid "Day-of-week override:"
-msgstr "По расписанию:"
+#: clientgui/DlgAdvPreferencesBase.cpp:263
+#, no-c-format
+msgid "% of CPU time"
+msgstr "% времени ЦП"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:266
-#: clientgui/DlgAdvPreferencesBase.cpp:532
-msgid "check box to specify hours for this day of week"
-msgstr "выберите день недели и укажите временной интервал"
+#: clientgui/DlgAdvPreferencesBase.cpp:270
+msgid "When to suspend"
+msgstr "Когда приостанавливать"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:272
-#: clientgui/DlgAdvPreferencesBase.cpp:538
-msgid "Monday"
-msgstr "Понедельник"
+#: clientgui/DlgAdvPreferencesBase.cpp:276
+msgid "Suspend when computer is on battery"
+msgstr "Приостановить, когда компьютер работает от аккумулятора"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:279
-#: clientgui/DlgAdvPreferencesBase.cpp:545
-msgid "Tuesday"
-msgstr "Вторник"
+msgid ""
+"Check this to suspend computing on portables when running on battery power."
+msgstr "Отметьте здесь, чтобы приостановить вычисления на портативных компьютерах при работе от аккумулятора."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:286
-#: clientgui/DlgAdvPreferencesBase.cpp:552
-msgid "Wednesday"
-msgstr "Среда"
+#: clientgui/DlgAdvPreferencesBase.cpp:285
+msgid "Suspend when computer is in use"
+msgstr "Приостановить, когда компьютер используется"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:293
-#: clientgui/DlgAdvPreferencesBase.cpp:559
-msgid "Thursday"
-msgstr "Четверг"
+#: clientgui/DlgAdvPreferencesBase.cpp:288
+msgid ""
+"Check this to suspend computing and file transfers when you're using the "
+"computer."
+msgstr "Отметьте здесь, чтобы приостановить вычисления и передачу файлов, когда Вы используете компьютер."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:300
-#: clientgui/DlgAdvPreferencesBase.cpp:566
-msgid "Friday"
-msgstr "Пятница"
+#: clientgui/DlgAdvPreferencesBase.cpp:294
+msgid "Suspend GPU computing when computer is in use"
+msgstr "Приостановить вычисления на ГП, когда компьютер используется"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:307
-#: clientgui/DlgAdvPreferencesBase.cpp:573
-msgid "Saturday"
-msgstr "Суббота"
+#: clientgui/DlgAdvPreferencesBase.cpp:297
+msgid "Check this to suspend GPU computing when you're using the computer."
+msgstr "Отметьте здесь, чтобы приостановить вычисления на ГП, когда Вы используете компьютер."
+
+#: clientgui/DlgAdvPreferencesBase.cpp:302
+msgid "This determines when the computer is considered 'in use'."
+msgstr "Это определяет, когда компьютер считается 'используемым'."
+
+#: clientgui/DlgAdvPreferencesBase.cpp:306
+msgid "'In use' means mouse/keyboard input in last"
+msgstr "'Использование' означает ввод с помощью мыши/клавиатуры за последние"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:580
-msgid "Sunday"
-msgstr "Воскресенье"
+#: clientgui/DlgAdvPreferencesBase.cpp:387
+msgid "minutes"
+msgstr "минут"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:328
-msgid "Other options"
-msgstr "Другие параметры"
+#: clientgui/DlgAdvPreferencesBase.cpp:321
+#, c-format
+msgid "Suspend when non-%s CPU usage is above"
+msgstr "Приостановить, если использование процессора не-%s-задачами выше"
 
-# поправить
-#: clientgui/DlgAdvPreferencesBase.cpp:336
-msgid "Switch between applications every"
-msgstr "Переключение между приложениями каждые"
+#: clientgui/DlgAdvPreferencesBase.cpp:323
+msgid "Suspend computing when your computer is busy running other programs."
+msgstr "Приостановить вычисления, когда ваш компьютер занят, выполняя другие программы."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:345
-msgid "On multiprocessor systems, use at most"
-msgstr "В многопроцессорных системах использовать"
+#: clientgui/DlgAdvPreferencesBase.cpp:344
+#: clientgui/DlgAdvPreferencesBase.cpp:474
+msgid "Other"
+msgstr "Другое"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:349
+msgid "Store at least enough tasks to keep the computer busy for this long."
+msgstr "Поддерживать минимально допустимое количество заданий, чтобы компьютер был занят указанное время"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:352
-#, no-c-format
-msgid "% of the processors (0 means no restriction)"
-msgstr "% процессоров (0 - нет ограничений)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:355
-#: clientgui/DlgAdvPreferencesBase.cpp:618
-#: clientgui/DlgAdvPreferencesBase.cpp:640
-#: clientgui/DlgAdvPreferencesBase.cpp:661
-#: clientgui/DlgAdvPreferencesBase.cpp:683
-#: clientgui/DlgAdvPreferencesBase.cpp:694
-msgid "Use at most"
-msgstr "Использовать не более"
+msgid "Store at least"
+msgstr "Запасать не менее"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:362
-#, no-c-format
-msgid "% of CPU time (0 means no restriction)"
-msgstr "% времени ЦП (0 - нет ограничений)"
+#: clientgui/DlgAdvPreferencesBase.cpp:360
+#: clientgui/DlgAdvPreferencesBase.cpp:376
+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."
+msgstr "Поддерживать дополнительное количество заданий выше минимального уровня. Определяет, сколько работы запрашивается при обращении к проекту."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:386
-msgid "General options"
-msgstr "Общие параметры"
+#: clientgui/DlgAdvPreferencesBase.cpp:368
+msgid "Store up to an additional"
+msgstr "Запасать дополнительно на"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:395
-msgid "Maximum download rate"
-msgstr "Ограничить скорость загрузки"
+#: clientgui/DlgAdvPreferencesBase.cpp:381
+#, c-format
+msgid "If you run several projects, %s may switch between them this often."
+msgstr "Если у Вас работает несколько проектов, то %s может переключаться между ними с указанной периодичностью."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:401
-#: clientgui/DlgAdvPreferencesBase.cpp:410
-msgid "KBytes/second (0 means no restriction)"
-msgstr "Кбайт/сек (0 - нет ограничений)"
+#: clientgui/DlgAdvPreferencesBase.cpp:383
+msgid "Switch between tasks every"
+msgstr "Переключение между заданиями каждые"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:404
-msgid "Maximum upload rate"
-msgstr "Ограничить скорость отправки"
+#: clientgui/DlgAdvPreferencesBase.cpp:391
+msgid ""
+"This controls how often tasks save their state to disk, so that they can be "
+"restarted later."
+msgstr "Эта настройка управляет тем, как часто задания сохраняют на диск своё состояние для того, чтобы они могли позже перезапуститься с этой точки."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:417
-msgid "Minimum work buffer"
-msgstr "Минимальный буфер"
+#: clientgui/DlgAdvPreferencesBase.cpp:392
+msgid "Request tasks to checkpoint at most every"
+msgstr "Запрашивать сохранение промежуточных результатов заданий примерно каждые"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:425
-msgid "Try to maintain enough tasks to keep busy for this many days"
-msgstr "Пытаться поддерживать достаточный объём заданий, чтобы оставаться занятым работой в течение данного числа дней"
+#: clientgui/DlgAdvPreferencesBase.cpp:396
+msgid "seconds"
+msgstr "секунд"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:431
-#: clientgui/DlgAdvPreferencesBase.cpp:449
-msgid "days (maximum value: 10)"
-msgstr "дней (максимальное значение: 10)"
+msgid "Limit the download rate of file transfers."
+msgstr "Ограничивает скорость загрузки при передаче файлов."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:437
-msgid "Max additional work buffer"
-msgstr "Макс. дополнительный буфер"
+#: clientgui/DlgAdvPreferencesBase.cpp:432
+msgid "Limit download rate to"
+msgstr "Ограничить скорость загрузки"
 
+#: clientgui/DlgAdvPreferencesBase.cpp:436
 #: clientgui/DlgAdvPreferencesBase.cpp:445
-msgid "In addition, maintain enough tasks for up to this many days"
-msgstr "Кроме того, поддерживать достаточный объём заданий вплоть до этого числа дней"
+msgid "KB/second"
+msgstr "КБ/с"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:440
+msgid "Limit the upload rate of file transfers."
+msgstr "Ограничивает скорость отправки при передаче файлов."
+
+#: clientgui/DlgAdvPreferencesBase.cpp:441
+msgid "Limit upload rate to"
+msgstr "Ограничить скорость отправки"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:452
+#, c-format
+msgid "Example: %s should transfer at most 2000 MB of data every 30 days."
+msgstr "Пример: %s должен передавать не более 2000 Мб данных каждые 30 дней."
 
 #: clientgui/DlgAdvPreferencesBase.cpp:454
-msgid "Transfer at most"
-msgstr "Передавать не более"
+msgid "Limit usage to"
+msgstr "Ограничить использование до"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:462
-msgid "MBytes every"
-msgstr "Мбайт каждые"
+#: clientgui/DlgAdvPreferencesBase.cpp:458
+msgid "MB every"
+msgstr "Мб каждые"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:468
-msgid "days (0 means no restriction)"
-msgstr "дней (0 - нет ограничений)"
+#: clientgui/DlgAdvPreferencesBase.cpp:462
+msgid "days"
+msgstr "дней"
 
-# не проверять изображение файла
-#: clientgui/DlgAdvPreferencesBase.cpp:476
-msgid "Skip image file verification"
-msgstr "Не проверять загружаемые файлы"
+#: clientgui/DlgAdvPreferencesBase.cpp:479
+#, 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:478
-msgid "check this if your Internet provider modifies image files"
-msgstr "выберите данный пункт если ваш интернет провайдер изменяет передаваемые файлы"
+#: clientgui/DlgAdvPreferencesBase.cpp:481
+msgid "Skip data verification for image files"
+msgstr "Пропустить проверку данных для файлов изображений"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:484
-msgid "Connect options"
-msgstr "Параметры подключения"
+#: clientgui/DlgAdvPreferencesBase.cpp:485
+msgid "Confirm before connecting to Internet"
+msgstr "Предупреждать перед подключением к сети Интернет"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:487
-msgid "Confirm before connecting to internet"
-msgstr "Предупреждать перед подключением к интернету"
+#: clientgui/DlgAdvPreferencesBase.cpp:486
+#: clientgui/DlgAdvPreferencesBase.cpp:490
+msgid "Useful only if you have a modem, ISDN or VPN connection."
+msgstr "Используется только при наличии модемного, ISDN- или VPN-подключения."
 
 #: clientgui/DlgAdvPreferencesBase.cpp:489
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
-msgstr "перед началом автоматического установления связи с интернетом BOINC спросит можно ли установить соединение"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:493
 msgid "Disconnect when done"
 msgstr "Разорвать соединение после завершения"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:495
-msgid ""
-"if checked, BOINC hangs up when network usage is done\n"
-"(only relevant for dialup-connection)"
-msgstr ""
-"BOINC клиент будет сам разрывать интернет соединение как только завершит все операции\n"
-"(для обладателей dial-up модемов)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:501
-msgid "Network usage allowed"
-msgstr "Доступ в интернет"
+#: clientgui/DlgAdvPreferencesBase.cpp:516
+msgid "Disk"
+msgstr "Диск"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:510
-msgid "network usage start hour"
-msgstr "начиная с данного времени разрешён доступ в интернет"
+#: clientgui/DlgAdvPreferencesBase.cpp:521
+#, c-format
+msgid "%s will use the most restrictive of these settings:"
+msgstr "%s будет использовать наиболее строгие из этих параметров:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:518
-msgid "network usage stop hour"
-msgstr "после данного времени доступ в интернет запрещён"
+#: clientgui/DlgAdvPreferencesBase.cpp:527
+#, c-format
+msgid "Limit the total amount of disk space used by %s."
+msgstr "Ограничивает общий объём дискового пространства, используемого %s."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:610
-#: clientgui/DlgItemProperties.cpp:257
-msgid "Disk usage"
-msgstr "Использование диска"
+#: clientgui/DlgAdvPreferencesBase.cpp:530
+#: clientgui/DlgAdvPreferencesBase.cpp:554
+msgid "Use no more than"
+msgstr "Использовать не более"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:622
-msgid "the maximum disk space used by BOINC (in Gigabytes)"
-msgstr "ограничение на занимаемое BOINC и проектами пространство на диске (в гигабайтах)"
+#: clientgui/DlgAdvPreferencesBase.cpp:534
+msgid "GB"
+msgstr "Гб"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:626
-msgid "Gigabytes disk space (0 means no restriction)"
-msgstr "Гигабайт дискового пространства (0 - нет ограничений)"
+#: clientgui/DlgAdvPreferencesBase.cpp:539
+#, c-format
+msgid ""
+"Limit disk usage to leave this much free space on the volume where %s stores"
+" data."
+msgstr "Ограничивает использование диска, чтобы оставалось не менее указанного объёма свободного места на томе, где %s хранит данные."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:629
+#: clientgui/DlgAdvPreferencesBase.cpp:542
 msgid "Leave at least"
 msgstr "Оставлять не менее"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:633
-msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
-msgstr "минимальный объём дискового пространства, который должен оставаться свободным (в гигабайтах)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:637
-msgid "Gigabytes disk space free"
-msgstr "Гбайт свободного места на диске"
+#: clientgui/DlgAdvPreferencesBase.cpp:546
+msgid "GB free"
+msgstr "Гб свободного места"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
-msgid "BOINC uses at most this percentage of total disk space"
-msgstr "ограничение на занимаемое BOINC и проектами пространство на диске в процентах от общего объёма диска"
+#: clientgui/DlgAdvPreferencesBase.cpp:551
+#, c-format
+msgid ""
+"Limit the percentage of disk space used by %s on the volume where it stores "
+"data."
+msgstr "Ограничивает процент дискового пространства, используемого %s на томе, где он хранит данные."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:649
+#: clientgui/DlgAdvPreferencesBase.cpp:559
 #, no-c-format
-msgid "% of total disk space"
-msgstr "% от объёма диска"
+msgid "% of total"
+msgstr "% от полного объема диска"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:652
-msgid "Tasks checkpoint to disk at most every"
-msgstr "Период сохранения на диск промежуточных результатов заданий"
+#: clientgui/DlgAdvPreferencesBase.cpp:566
+msgid "Memory"
+msgstr "Память"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
-msgid "seconds"
-msgstr "секунд"
+#: clientgui/DlgAdvPreferencesBase.cpp:571
+#, c-format
+msgid "Limit the memory used by %s when you're using the computer."
+msgstr "Ограничивает память, используемую %s, когда Вы используете компьютер."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:668
+#: clientgui/DlgAdvPreferencesBase.cpp:573
+msgid "When computer is in use, use at most"
+msgstr "Когда компьютер используется, использовать не более"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:579
+#: clientgui/DlgAdvPreferencesBase.cpp:591
+#: clientgui/DlgAdvPreferencesBase.cpp:607
 #, no-c-format
-msgid "% of page file (swap space)"
-msgstr "% виртуальной памяти (файл подкачки)"
+msgid "%"
+msgstr "%"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:675
-msgid "Memory usage"
-msgstr "Оперативная память"
+#: clientgui/DlgAdvPreferencesBase.cpp:584
+#, c-format
+msgid "Limit the memory used by %s when you're not using the computer."
+msgstr "Ограничивает память, используемую %s, когда Вы не используете компьютер."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
-#, no-c-format
-msgid "% when computer is in use"
-msgstr "% когда компьютер используется для работы"
+#: clientgui/DlgAdvPreferencesBase.cpp:586
+msgid "When computer is not in use, use at most"
+msgstr "Когда компьютер не используется, использовать не более"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:701
-#, no-c-format
-msgid "% when computer is idle"
-msgstr "% когда компьютер простаивает"
+#: clientgui/DlgAdvPreferencesBase.cpp:595
+msgid "Leave non-GPU tasks in memory while suspended"
+msgstr "Оставлять в памяти неактивные задания, которые не используют графический процессор"
 
-# ?
-#: clientgui/DlgAdvPreferencesBase.cpp:706
-msgid "Leave applications 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."
+msgstr "Если флажок установлен, приостановленные задания остаются в памяти и возобновляются без потери выполненной работы. Если флажок не установлен, приостановленные задания удаляются из памяти и перезапускаются с их последней контрольной точки."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:708
-msgid "if checked, suspended work units are left in memory"
-msgstr "оставлять приложение в памяти на время приостановки обработки задания"
+#: clientgui/DlgAdvPreferencesBase.cpp:600
+#, c-format
+msgid "Limit the swap space (page file) used by %s."
+msgstr "Ограничивает виртуальную память (файл подкачки), используемую %s."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:728
-msgid "Suspend processor and network usage when these applications are running:"
-msgstr "Приостановить использование процессора и сети, когда работают данные приложения:"
+#: clientgui/DlgAdvPreferencesBase.cpp:602
+msgid "Page/swap file: use at most"
+msgstr "Виртуальная память/файл подкачки: использовать не более"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:738
-msgid "Add..."
-msgstr "Добавить..."
+#: clientgui/DlgAdvPreferencesBase.cpp:627
+msgid "and"
+msgstr "до"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:739
-msgid "Add an application to this list"
-msgstr "Добавить приложение в список"
+#: clientgui/DlgAdvPreferencesBase.cpp:628
+msgid "to"
+msgstr "до"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:744
-msgid "Remove"
-msgstr "Удалить"
+#: clientgui/DlgAdvPreferencesBase.cpp:641
+msgid "Compute only during a particular period each day."
+msgstr "Вычислять каждый день только во время определённого периода."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:745
-msgid "Remove an application from this list"
-msgstr "Удалить приложение из списка"
+#: clientgui/DlgAdvPreferencesBase.cpp:644
+msgid "Compute only between"
+msgstr "Вычислять только между"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:754
-msgid "For advanced options, refer to "
-msgstr "Для расширенных настроек, обратитесь к "
+#: clientgui/DlgAdvPreferencesBase.cpp:654
+#: clientgui/DlgAdvPreferencesBase.cpp:801
+msgid "Day-of-week override"
+msgstr "По расписанию"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:658
+#: clientgui/DlgAdvPreferencesBase.cpp:805
+msgid "Override the times above on the selected days:"
+msgstr "Переопределить время в выбранные дни:"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:676
+#: clientgui/DlgAdvPreferencesBase.cpp:822
+msgid "Monday"
+msgstr "Понедельник"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:691
+#: clientgui/DlgAdvPreferencesBase.cpp:837
+msgid "Friday"
+msgstr "Пятница"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:704
+#: clientgui/DlgAdvPreferencesBase.cpp:850
+msgid "Tuesday"
+msgstr "Вторник"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:719
+#: clientgui/DlgAdvPreferencesBase.cpp:865
+msgid "Saturday"
+msgstr "Суббота"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:732
+#: clientgui/DlgAdvPreferencesBase.cpp:878
+msgid "Wednesday"
+msgstr "Среда"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:747
+#: clientgui/DlgAdvPreferencesBase.cpp:893
+msgid "Sunday"
+msgstr "Воскресенье"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:760
+#: clientgui/DlgAdvPreferencesBase.cpp:906
+msgid "Thursday"
+msgstr "Четверг"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:789
+msgid "Transfer files only during a particular period each day."
+msgstr "Передавать файлы только в конкретный период каждый день."
+
+#: clientgui/DlgAdvPreferencesBase.cpp:791
+msgid "Transfer files only between"
+msgstr "Передавать файлы только между"
 
 #: clientgui/DlgDiagnosticLogFlags.cpp:65
 #, c-format
 msgid "%s Diagnostic Log Flags"
-msgstr "Диагностические флаги %s"
+msgstr "Флаги журнала диагностики %s"
 
 #: clientgui/DlgDiagnosticLogFlags.cpp:83
-msgid "These flags enable various types of diagnostic messages in the Event Log."
-msgstr "Эти флаги включают различные типы диагностических сообщений в Просмотре событий."
+msgid ""
+"These flags enable various types of diagnostic messages in the Event Log."
+msgstr "Эти флаги включают различные типы диагностических сообщений в Журнале событий."
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:105
+#: clientgui/DlgDiagnosticLogFlags.cpp:99
+msgid "More info ..."
+msgstr "Подробнее..."
+
+#: clientgui/DlgDiagnosticLogFlags.cpp:120 clientgui/DlgHiddenColumns.cpp:101
 msgid "Save all values and close the dialog"
 msgstr "Сохранить все значения и закрыть окно"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:108
+#: clientgui/DlgDiagnosticLogFlags.cpp:123 clientgui/DlgHiddenColumns.cpp:104
 msgid "Defaults"
 msgstr "По умолчанию"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:109
+#: clientgui/DlgDiagnosticLogFlags.cpp:124 clientgui/DlgHiddenColumns.cpp:105
 msgid "Restore default settings"
-msgstr "Восстановить параметры по умолчанию"
+msgstr "Восстановить настройки по умолчанию"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:113
+#: clientgui/DlgDiagnosticLogFlags.cpp:128 clientgui/DlgHiddenColumns.cpp:109
 msgid "Close the dialog without saving"
-msgstr "Закрыть окно без сохранения"
+msgstr "Закрыть диалоговое окно без сохранения"
 
-#: clientgui/DlgEventLog.cpp:226
+#: clientgui/DlgEventLog.cpp:227
 #, c-format
 msgid "%s - Event Log"
 msgstr "%s - Просмотр событий"
 
-#: clientgui/DlgEventLog.cpp:236
+#: clientgui/DlgEventLog.cpp:237
 msgid "Project"
 msgstr "Проект"
 
-#: clientgui/DlgEventLog.cpp:237
+#: clientgui/DlgEventLog.cpp:238
 msgid "Time"
 msgstr "Время"
 
-#: clientgui/DlgEventLog.cpp:238
-msgid "Message"
-msgstr "Сообщение"
+#: clientgui/DlgEventLog.cpp:239
+msgid "Message"
+msgstr "Сообщение"
+
+#: clientgui/DlgEventLog.cpp:301 clientgui/DlgEventLog.cpp:351
+msgid "&Show only this project"
+msgstr "Показать только этот проект"
+
+#: clientgui/DlgEventLog.cpp:305
+msgid "Copy &All"
+msgstr "Копировать все"
+
+#: clientgui/DlgEventLog.cpp:307 clientgui/DlgEventLog.cpp:311
+msgid "Copy all the messages to the clipboard."
+msgstr "Копировать все сообщения в буфер обмена."
+
+#: clientgui/DlgEventLog.cpp:316
+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."
+msgstr "Копировать выделенные сообщения в буфер обмена. Можно использовать SHIFT и CTRL для выделения нескольких сообщений."
+
+#: 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."
+msgstr "Копировать выделенные сообщения в буфер обмена. Можно использовать SHIFT и CTRL для выделения нескольких сообщений."
+
+#: clientgui/DlgEventLog.cpp:336 clientgui/DlgItemProperties.cpp:67
+msgid "&Close"
+msgstr "Закрыть"
+
+#: clientgui/DlgEventLog.cpp:345
+msgid "Show all &messages"
+msgstr "Показать все сообщения"
+
+#: clientgui/DlgEventLog.cpp:346 clientgui/DlgEventLog.cpp:348
+msgid "Show messages for all projects"
+msgstr "Показать все сообщения"
+
+#: clientgui/DlgEventLog.cpp:352 clientgui/DlgEventLog.cpp:354
+msgid "Show only the messages for the selected project"
+msgstr "Показать сообщения только от выбранного проекта."
+
+#: clientgui/DlgExclusiveApps.cpp:60
+#, c-format
+msgid "%s - Exclusive Applications"
+msgstr "%s - Привилегированные приложения"
+
+#: clientgui/DlgExclusiveApps.cpp:72
+msgid ""
+"Suspend processor and network usage when these applications are running:"
+msgstr "Приостановить использование процессора и сети, когда работают данные приложения:"
+
+#: clientgui/DlgExclusiveApps.cpp:80 clientgui/DlgExclusiveApps.cpp:104
+msgid "Add..."
+msgstr "Добавить..."
+
+#: clientgui/DlgExclusiveApps.cpp:81 clientgui/DlgExclusiveApps.cpp:105
+msgid "Add an application to this list"
+msgstr "Добавить приложение в список"
+
+#: clientgui/DlgExclusiveApps.cpp:86 clientgui/DlgExclusiveApps.cpp:110
+msgid "Remove"
+msgstr "Удалить"
 
-#: clientgui/DlgEventLog.cpp:300
-#: clientgui/DlgEventLog.cpp:364
-msgid "&Show only this project"
-msgstr "Показать только этот проект"
+#: clientgui/DlgExclusiveApps.cpp:87 clientgui/DlgExclusiveApps.cpp:111
+msgid "Remove an application from this list"
+msgstr "Удалить приложение из списка"
 
-#: clientgui/DlgEventLog.cpp:304
-msgid "Copy &All"
-msgstr "Копировать все"
+#: clientgui/DlgExclusiveApps.cpp:96
+msgid "Suspend GPU usage when these applications are running:"
+msgstr "Приостановить использование графического ускорителя, когда работают данные приложения:"
 
-#: clientgui/DlgEventLog.cpp:306
-#: clientgui/DlgEventLog.cpp:310
-msgid "Copy all the messages to the clipboard."
-msgstr "Копировать все сообщения в буфер обмена."
+#: clientgui/DlgExclusiveApps.cpp:122
+msgid "For advanced options, refer to "
+msgstr "Для расширенных настроек, обратитесь к "
 
-#: clientgui/DlgEventLog.cpp:315
-msgid "Copy &Selected"
-msgstr "Копировать выделенное"
+#: clientgui/DlgExclusiveApps.cpp:147
+msgid "save all values and close the dialog"
+msgstr "сохранить все значения и закрыть окно"
 
-#: clientgui/DlgEventLog.cpp:318
-#: clientgui/DlgEventLog.cpp:326
-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 "Копировать выделенные сообщения в буфер обмена. Можно использовать SHIFT и CTRL для выделения нескольких сообщений."
+#: clientgui/DlgExclusiveApps.cpp:153
+msgid "close the dialog without saving"
+msgstr "закрыть окно без сохранения изменений"
 
-#: clientgui/DlgEventLog.cpp:320
-#: clientgui/DlgEventLog.cpp:328
-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 "Копировать выделенные сообщения в буфер обмена. Можно использовать SHIFT и CTRL для выделения нескольких сообщений."
+#: clientgui/DlgExclusiveApps.cpp:158
+msgid "shows the preferences web page"
+msgstr "перейти на веб-страницу с описанием данных настроек"
 
-#: clientgui/DlgEventLog.cpp:335
-#: clientgui/DlgItemProperties.cpp:67
-msgid "&Close"
-msgstr "Закрыть"
+#: clientgui/DlgExclusiveApps.cpp:303 clientgui/DlgExclusiveApps.cpp:309
+#: clientgui/DlgExclusiveApps.cpp:315
+msgid "Applications to add"
+msgstr "Добавить приложения"
 
-#: clientgui/DlgEventLog.cpp:344
+#: clientgui/DlgExclusiveApps.cpp:332
 #, c-format
-msgid "Get help with %s"
-msgstr "Получить справку по %s"
+msgid "'%s' is not an executable application."
+msgstr "'%s' не является исполняемым приложением."
 
-#: clientgui/DlgEventLog.cpp:358
-msgid "Show all &messages"
-msgstr "Показать все сообщения"
+#: clientgui/DlgExclusiveApps.cpp:333 clientgui/DlgExclusiveApps.cpp:380
+#: clientgui/DlgExclusiveApps.cpp:404
+msgid "Add Exclusive App"
+msgstr "Добавить привилегированное приложение"
 
-#: clientgui/DlgEventLog.cpp:359
-#: clientgui/DlgEventLog.cpp:361
-msgid "Show messages for all projects"
-msgstr "Показать все сообщения"
+#: clientgui/DlgExclusiveApps.cpp:345
+msgid "Name of application to add?"
+msgstr "Имя добавляемого приложения?"
 
-#: clientgui/DlgEventLog.cpp:365
-#: clientgui/DlgEventLog.cpp:367
-msgid "Show only the messages for the selected project"
-msgstr "Показать сообщения только от выбранного проекта."
+#: clientgui/DlgExclusiveApps.cpp:345
+msgid "Add exclusive app"
+msgstr "Добавить привилегированное приложение"
+
+#: clientgui/DlgExclusiveApps.cpp:379
+#, c-format
+msgid "Application names must end with '%s'"
+msgstr "Имена приложений должны оканчиваться на '%s'"
+
+#: clientgui/DlgExclusiveApps.cpp:403
+#, c-format
+msgid "'%s' is already in the list."
+msgstr "'%s' уже в списке."
 
 #: clientgui/DlgExitMessage.cpp:82
 #, c-format
@@ -1741,15 +1738,8 @@ msgid ""
 "\n"
 "If you also want to stop running the tasks,\n"
 "choose from the following options:"
-msgstr ""
-"Вы запросили выход из %s,\n"
-"который позволяет Вам просматривать и управлять\n"
-"заданиями, выполняющимися на вашем компьютере.\n"
-"\n"
-"Если Вы хотите также остановить выполняющиеся задания,\n"
-"выберите следующие опции:"
+msgstr "Вы запросили выход из %s,\nкоторый позволяет Вам просматривать и управлять\nзаданиями, выполняющимися на вашем компьютере.\n\nЕсли Вы хотите также остановить выполняющиеся задания,\nвыберите следующие опции:"
 
-# ???
 #: clientgui/DlgExitMessage.cpp:135
 #, c-format
 msgid ""
@@ -1759,13 +1749,7 @@ msgid ""
 "In most cases, it is better just to close the %s window\n"
 "rather than to exit the application; that will allow %s to run its\n"
 "tasks at the times you selected in your preferences."
-msgstr ""
-"Завершение работы %s. Обработка заданий будет остановлена\n"
-"до следующего запуска %s или экранной заставки %s.\n"
-"\n"
-"В большинстве случаев лучше просто закрыть окно %s.\n"
-"Тогда %s продолжит управлять обработкой заданий\n"
-"в соответствии с определёнными вами настройками."
+msgstr "Завершение работы %s. Обработка заданий будет остановлена\nдо следующего запуска %s или экранной заставки %s.\n\nВ большинстве случаев лучше просто закрыть окно %s.\nТогда %s продолжит управлять обработкой заданий\nв соответствии с определёнными вами настройками."
 
 #: clientgui/DlgExitMessage.cpp:153
 #, c-format
@@ -1776,10 +1760,8 @@ 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
 msgid "&Cancel"
 msgstr "Отмена"
 
@@ -1787,11 +1769,28 @@ msgstr "Отмена"
 msgid "Don't show this dialog again."
 msgstr "Больше не показывать данное окно."
 
-# ???
-#: clientgui/DlgItemProperties.cpp:194
-#: clientgui/DlgItemProperties.cpp:197
-#: clientgui/DlgItemProperties.cpp:200
-#: clientgui/DlgItemProperties.cpp:203
+#: clientgui/DlgHiddenColumns.cpp:64
+#, c-format
+msgid "%s Column Selection"
+msgstr "%s - Выбор столбцов"
+
+#: clientgui/DlgHiddenColumns.cpp:77
+#, c-format
+msgid "Select which columns %s should show."
+msgstr "Выберите, какие столбцы %s будет отображать."
+
+#: clientgui/DlgHiddenColumns.cpp:314
+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
 msgid "Don't fetch tasks for "
 msgstr "Не запрашивать задания для"
 
@@ -1819,13 +1818,11 @@ msgstr " запрос заданий отложен на"
 msgid " work fetch deferral interval"
 msgstr "интервал задержки запроса заданий"
 
-# ???? уточнить
 #: clientgui/DlgItemProperties.cpp:239
 msgid "Properties of project "
 msgstr "Информация о проекте "
 
-#: clientgui/DlgItemProperties.cpp:243
-#: clientgui/DlgOptions.cpp:221
+#: clientgui/DlgItemProperties.cpp:243 clientgui/DlgOptions.cpp:221
 msgid "General"
 msgstr "Общие"
 
@@ -1857,6 +1854,10 @@ msgstr "Загрузка файлов отложена на"
 msgid "File uploads deferred for"
 msgstr "Отправка файлов отложена на"
 
+#: clientgui/DlgItemProperties.cpp:257
+msgid "Disk usage"
+msgstr "Использование диска"
+
 #: clientgui/DlgItemProperties.cpp:258
 msgid "Computer ID"
 msgstr "Идентификатор компьютера"
@@ -1865,14 +1866,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 "да"
 
@@ -1880,8 +1877,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 "нет"
 
@@ -1889,7 +1885,6 @@ msgstr "нет"
 msgid "Don't request more work"
 msgstr "Не запрашивать задания"
 
-# ?
 #: clientgui/DlgItemProperties.cpp:265
 msgid "Scheduler call in progress"
 msgstr "Сеанс связи с планировщиком"
@@ -1898,9 +1893,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 "Размещение компьютера"
 
@@ -1908,28 +1901,25 @@ msgstr "Размещение компьютера"
 msgid "default"
 msgstr "по умолчанию"
 
-# ?
 #: clientgui/DlgItemProperties.cpp:277
 msgid "Added via account manager"
 msgstr "Добавлен менеджером проектов"
 
-# ?
 #: clientgui/DlgItemProperties.cpp:280
 msgid "Remove when tasks done"
 msgstr "Будет удалён после завершения заданий"
 
-# что именно завершено ???
 #: clientgui/DlgItemProperties.cpp:283
 msgid "Ended"
 msgstr "Завершён"
 
 #: clientgui/DlgItemProperties.cpp:285
 msgid "Tasks completed"
-msgstr "Задания завершены"
+msgstr "Завершённых успешно заданий"
 
 #: clientgui/DlgItemProperties.cpp:286
 msgid "Tasks failed"
-msgstr "Задания с ошибками"
+msgstr "Завершённых неудачно заданий"
 
 #: clientgui/DlgItemProperties.cpp:288
 msgid "Credit"
@@ -1967,7 +1957,6 @@ msgstr "Информация о задании "
 msgid "Application"
 msgstr "Приложение"
 
-# Имя
 #: clientgui/DlgItemProperties.cpp:358
 msgid "Name"
 msgstr "Задание"
@@ -1984,7 +1973,6 @@ msgstr "Получено"
 msgid "Report deadline"
 msgstr "Отправить до"
 
-# не уверен
 #: clientgui/DlgItemProperties.cpp:367
 msgid "Resources"
 msgstr "Выделено ресурсов"
@@ -1997,13 +1985,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 "Затрачено времени"
 
@@ -2015,7 +2001,6 @@ msgstr "Осталось до завершения"
 msgid "Fraction done"
 msgstr "Процент выполнения"
 
-# не точно
 #: clientgui/DlgItemProperties.cpp:380
 msgid "Virtual memory size"
 msgstr "Объём виртуальной памяти"
@@ -2036,10 +2021,9 @@ msgstr "ID процесса"
 msgid "Local: "
 msgstr "Локальное: "
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: clientgui/DlgOptions.cpp:129 clientgui/DlgOptions.cpp:135
 msgid "Options"
-msgstr "Настройки"
+msgstr "Параметры"
 
 #: clientgui/DlgOptions.cpp:178
 msgid "Language:"
@@ -2061,7 +2045,6 @@ msgstr "Как часто BOINC должен напоминать о новых
 msgid "Run Manager at login?"
 msgstr "Автозагрузка BOINC менеджера?"
 
-# не знаю как это у нормальных людей называется - залогиниваться
 #: clientgui/DlgOptions.cpp:207
 msgid "Run the BOINC Manager when you log on."
 msgstr "Запускать BOINC менеджер при входе пользователя на компьютер."
@@ -2102,33 +2085,27 @@ msgstr "Соединяться через HTTP прокси сервер"
 msgid "HTTP Proxy Server Configuration"
 msgstr "Параметры HTTP прокси сервера"
 
-#: 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
 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
 msgid "User Name:"
 msgstr "Имя пользователя:"
 
-#: clientgui/DlgOptions.cpp:320
-#: clientgui/DlgOptions.cpp:384
+#: clientgui/DlgOptions.cpp:320 clientgui/DlgOptions.cpp:384
 #: clientgui/DlgSelectComputer.cpp:152
 msgid "Password:"
 msgstr "Пароль:"
@@ -2180,7 +2157,9 @@ msgstr "%s - изменение языка"
 
 #: 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 "Язык интерфейса программы %s был изменён.  Для вступления в силу изменений требуется перезапустить %s."
 
 #: clientgui/DlgSelectComputer.cpp:91
@@ -2193,20 +2172,16 @@ msgstr "%s - Подключение к компьютеру"
 msgid ""
 "Another instance of %s is already running \n"
 "on this computer.  Please select a client to monitor."
-msgstr ""
-"На этом компьютере уже работает другой экземпляр %s.\n"
-"Пожалуйста выберите клиента для наблюдения."
+msgstr "На этом компьютере уже работает другой экземпляр %s.\nПожалуйста выберите клиента для наблюдения."
 
 #: clientgui/DlgSelectComputer.cpp:143
 msgid "Host name:"
 msgstr "Имя компьютера в сети или IP:"
 
-#: clientgui/Localization.cpp:31
-#: clientgui/Localization.cpp:69
+#: clientgui/Localization.cpp:31 clientgui/Localization.cpp:69
 msgid "Message boards"
 msgstr "Доска сообщений"
 
-# seti
 #: clientgui/Localization.cpp:33
 msgid "Correspond with other users on the SETI at home message boards"
 msgstr "Форум для общения с другими участниками проекта SETI at home"
@@ -2215,15 +2190,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 "Просмотр информации о вашей учётной записи и набранных очках"
@@ -2232,38 +2204,31 @@ msgstr "Просмотр информации о вашей учётной за
 msgid "Your preferences"
 msgstr "Ваши настройки"
 
-# seti
 #: clientgui/Localization.cpp:45
 msgid "View and modify your SETI at home account profile and preferences"
 msgstr "Просмотр и изменение настроек вашей учётной записи и вашего профиля в проекте SETI at home"
 
-#: 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 "Ваши компьютеры"
 
-# seti
 #: clientgui/Localization.cpp:53
 msgid "View a listing of all the computers on which you are running SETI at Home"
 msgstr "Просмотр информации о ваших компьютерах, участвующих в обработке заданий проекта SETI at Home"
 
-#: 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 "Просмотр информации о команде, к которой вы присоединились"
 
@@ -2271,7 +2236,6 @@ msgstr "Просмотр информации о команде, к которо
 msgid "Common questions"
 msgstr "Частые вопросы"
 
-# einstein
 #: clientgui/Localization.cpp:63
 msgid "Read the Einstein at Home Frequently Asked Question list"
 msgstr "Часто задаваемые вопросы по проекту Einstein at Home"
@@ -2280,37 +2244,31 @@ msgstr "Часто задаваемые вопросы по проекту Einst
 msgid "Screensaver info"
 msgstr "Экранная заставка"
 
-# einstein
 #: clientgui/Localization.cpp:67
 msgid "Read a detailed description of the Einstein at Home screensaver"
 msgstr "Подробное описание экранной заставки проекта Einstein at Home"
 
-# einstein
 #: 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 "Форум для общения с разработчиками и другими участниками проекта Einstein at Home"
 
-# einstein
 #: clientgui/Localization.cpp:73
 msgid "Einstein status"
 msgstr "Состояние серверов"
 
-# einstein
 #: clientgui/Localization.cpp:75
 msgid "Current status of the Einstein at Home server"
 msgstr "Информация о текущем состоянии серверов проекта Einstein at Home"
 
-# ?
 #: clientgui/Localization.cpp:77
 msgid "Report problems"
 msgstr "Проблемы и ошибки"
 
-# einstein
 #: clientgui/Localization.cpp:79
 msgid "A link to the Einstein at Home problems and bug reports message board"
 msgstr "Форум для обсуждения проблем и ошибок в работе программ проекта Einstein at Home"
 
-# einstein
 #: clientgui/Localization.cpp:83
 msgid "View and modify your Einstein at Home account profile and preferences"
 msgstr "Просмотр и изменение настроек вашей учётной записи и вашего профиля в проекте Einstein at Home"
@@ -2319,33 +2277,30 @@ msgstr "Просмотр и изменение настроек вашей уч
 msgid "Account summary"
 msgstr "Учётная запись (инфо.)"
 
-# einstein
 #: 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 "Просмотр информации о ваших компьютерах, участвующих в обработке заданий проекта Einstein at Home"
 
-# einstein
 #: clientgui/Localization.cpp:101
 msgid "LIGO project"
 msgstr "LIGO"
 
-# einstein ?
 #: 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 "Домашняя страница проекта LIGO (лазерный интерферометр обсерватории гравитационных волн)"
 
-# einstein
 #: clientgui/Localization.cpp:105
 msgid "GEO-600 project"
 msgstr "GEO-600"
 
-# einstein
 #: clientgui/Localization.cpp:107
 msgid "The home page of the GEO-600 project"
 msgstr "Домашняя страница проекта GEO-600"
 
-#: clientgui/Localization.cpp:115
-#: clientgui/Localization.cpp:133
+#: clientgui/Localization.cpp:115 clientgui/Localization.cpp:133
 msgid "Team"
 msgstr "Команда"
 
@@ -2353,7 +2308,6 @@ msgstr "Команда"
 msgid "Info about your Team"
 msgstr "Просмотр информации о команде, к которой вы присоединились"
 
-# cpdn ???
 #: clientgui/Localization.cpp:123
 msgid "Get help for climateprediction.net"
 msgstr "Помощь по проекту climateprediction.net"
@@ -2362,7 +2316,6 @@ msgstr "Помощь по проекту climateprediction.net"
 msgid "News"
 msgstr "Новости"
 
-# cpdn
 #: clientgui/Localization.cpp:127
 msgid "climateprediction.net News"
 msgstr "Новости проекта climateprediction.net"
@@ -2375,52 +2328,42 @@ msgstr "Просмотр информации о вашей учётной за
 msgid "Info about your team"
 msgstr "Просмотр информации о команде, к которой вы присоединились"
 
-# ?
 #: clientgui/Localization.cpp:141
 msgid "Search for help in our help system"
 msgstr "Система помощи по работе программ и участии в распределённых вычислениях на базе WCG"
 
-# WCG
 #: clientgui/Localization.cpp:143
 msgid "Global Statistics"
 msgstr "Общая статистика"
 
-# WCG
 #: clientgui/Localization.cpp:145
 msgid "Summary statistics for World Community Grid"
 msgstr "Сводная статистика по проектам WCG"
 
-# WCG
 #: clientgui/Localization.cpp:147
 msgid "My Grid"
 msgstr "Ваша учётная запись"
 
-# WCG
 #: clientgui/Localization.cpp:149
 msgid "Your statistics and settings"
 msgstr "Ваша индивидуальная статистика по проектам и настройки учётной записи"
 
-# WCG
 #: clientgui/Localization.cpp:151
 msgid "Device Profiles"
 msgstr "Настройки компьютера"
 
-# WCG
 #: clientgui/Localization.cpp:153
 msgid "Update your device settings"
 msgstr "Изменение настроек ваших компьютеров"
 
-# WCG
 #: clientgui/Localization.cpp:155
 msgid "Research"
 msgstr "Описания проектов"
 
-# WCG
 #: clientgui/Localization.cpp:157
 msgid "Learn about the projects hosted at World Community Grid"
 msgstr "Подробные описания проектов запущенных в рамках WCG"
 
-# ипользуется внутри программы
 #: clientgui/MainDocument.cpp:583
 msgid "Starting client"
 msgstr "Запуск клиента"
@@ -2438,7 +2381,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 "Пожалуйста загрузите и установите приложение CoRD с сайта http://cord.sourceforge.net"
 
 #: clientgui/MainDocument.cpp:2442
@@ -2469,7 +2414,6 @@ msgstr "необходимо место на диске - проверьте н
 msgid "computer is not in use"
 msgstr "компьютер не используется для работы"
 
-# ипользуется внутри программы
 #: clientgui/MainDocument.cpp:2449
 msgid "starting up"
 msgstr "запуск"
@@ -2510,8 +2454,7 @@ msgstr "Ошибка загрузки данных"
 msgid "Downloading"
 msgstr "Загрузка данных"
 
-#: clientgui/MainDocument.cpp:2492
-#: clientgui/MainDocument.cpp:2557
+#: clientgui/MainDocument.cpp:2492 clientgui/MainDocument.cpp:2551
 msgid " (suspended - "
 msgstr " (приостановлено - "
 
@@ -2519,120 +2462,111 @@ msgstr " (приостановлено - "
 msgid "Project suspended by user"
 msgstr "Проект приостановлен пользователем"
 
-# длинно
 #: clientgui/MainDocument.cpp:2502
 msgid "Task suspended by user"
 msgstr "Обработка задания приостановлена пользователем"
 
-#: clientgui/MainDocument.cpp:2504
+#: clientgui/MainDocument.cpp:2507
 msgid "Suspended - "
 msgstr "Приостановлено - "
 
-# 75%
 #: clientgui/MainDocument.cpp:2510
 msgid "GPU suspended - "
 msgstr "ГП приостановлен - "
 
-#: clientgui/MainDocument.cpp:2517
+#: clientgui/MainDocument.cpp:2514
 msgid "Waiting for memory"
 msgstr "Ожидание освобождения оперативной памяти"
 
-# офигеть можно от такого объяснения
-#: clientgui/MainDocument.cpp:2519
+#: clientgui/MainDocument.cpp:2516
 msgid "Waiting for shared memory"
 msgstr "Ожидание освобождения разделяемой оперативной памяти (shared memory)"
 
-#: clientgui/MainDocument.cpp:2521
+#: clientgui/MainDocument.cpp:2518
 msgid "Running"
 msgstr "Работает"
 
-#: clientgui/MainDocument.cpp:2523
+#: clientgui/MainDocument.cpp:2520
 msgid " (non-CPU-intensive)"
 msgstr " (без использования ЦП)"
 
-# Приостановлено с последующим продолжением обработки
-#: clientgui/MainDocument.cpp:2526
+#: clientgui/MainDocument.cpp:2523
 msgid "Waiting to run"
 msgstr "Ждёт своей очереди"
 
-#: clientgui/MainDocument.cpp:2528
-#: clientgui/MainDocument.cpp:2534
+#: clientgui/MainDocument.cpp:2525 clientgui/MainDocument.cpp:2528
 msgid "Ready to start"
 msgstr "Готово к запуску"
 
-#: clientgui/MainDocument.cpp:2538
+#: clientgui/MainDocument.cpp:2532
 msgid "Postponed: "
 msgstr "Отложено: "
 
-#: clientgui/MainDocument.cpp:2541
+#: clientgui/MainDocument.cpp:2535
 msgid "Postponed"
 msgstr "Отложено"
 
-#: clientgui/MainDocument.cpp:2545
+#: clientgui/MainDocument.cpp:2539
 msgid "Waiting for network access"
 msgstr "Ожидание доступа к сети"
 
-#: clientgui/MainDocument.cpp:2549
+#: clientgui/MainDocument.cpp:2543
 msgid "Computation error"
 msgstr "Ошибка вычислений"
 
-#: clientgui/MainDocument.cpp:2553
+#: clientgui/MainDocument.cpp:2547
 msgid "Upload failed"
 msgstr "Ошибка отправки данных"
 
-#: clientgui/MainDocument.cpp:2555
+#: clientgui/MainDocument.cpp:2549
 msgid "Uploading"
 msgstr "Отправка данных"
 
-#: clientgui/MainDocument.cpp:2566
+#: clientgui/MainDocument.cpp:2560
 msgid "Aborted by user"
 msgstr "Прервано пользователем"
 
-# ???? уточнить
-#: clientgui/MainDocument.cpp:2569
+#: clientgui/MainDocument.cpp:2563
 msgid "Aborted by project"
 msgstr "Прервано проектом"
 
-#: clientgui/MainDocument.cpp:2572
+#: clientgui/MainDocument.cpp:2566
 msgid "Aborted: not started by deadline"
 msgstr "Прервано: не было запущено до крайнего срока"
 
-#: clientgui/MainDocument.cpp:2575
+#: clientgui/MainDocument.cpp:2569
 msgid "Aborted: disk limit exceeded"
 msgstr "Прервано: превышен предел используемого дискового пространства"
 
-#: clientgui/MainDocument.cpp:2578
+#: clientgui/MainDocument.cpp:2572
 msgid "Aborted: run time limit exceeded"
 msgstr "Прервано: превышен предел времени выполнения"
 
-#: clientgui/MainDocument.cpp:2581
+#: clientgui/MainDocument.cpp:2575
 msgid "Aborted: memory limit exceeded"
 msgstr "Прервано: превышен предел используемой памяти"
 
-# ???
-#: clientgui/MainDocument.cpp:2584
+#: clientgui/MainDocument.cpp:2578
 msgid "Aborted"
 msgstr "Прервано"
 
-#: clientgui/MainDocument.cpp:2589
+#: clientgui/MainDocument.cpp:2583
 msgid "Acknowledged"
 msgstr "Признано"
 
-#: clientgui/MainDocument.cpp:2591
+#: clientgui/MainDocument.cpp:2585
 msgid "Ready to report"
 msgstr "Ожидается подтверждение о приеме данных"
 
-#: clientgui/MainDocument.cpp:2593
+#: clientgui/MainDocument.cpp:2587
 #, c-format
 msgid "Error: invalid state '%d'"
 msgstr "Ошибка: недопустимое состояние '%d'"
 
-# ?
 #: clientgui/NoInternetConnectionPage.cpp:179
 msgid "No Internet connection"
 msgstr "Отсутствует связь с интернетом"
 
-# ?
 #: clientgui/NoInternetConnectionPage.cpp:182
 msgid "Please connect to the Internet and try again."
 msgstr "Произведите подключение к интернету и повторите."
@@ -2646,10 +2580,7 @@ msgid ""
 "The URL you supplied is not that of a BOINC-based project.\n"
 "\n"
 "Please check the URL and try again."
-msgstr ""
-"Указанный адрес (URL) не является адресом проекта\n"
-"на базе BOINC.\n"
-"Уточните адрес (URL) и повторите попытку."
+msgstr "Указанный адрес (URL) не является адресом проекта\nна базе BOINC.\nУточните адрес (URL) и повторите попытку."
 
 #: clientgui/NotDetectedPage.cpp:188
 msgid "Account manager not found"
@@ -2661,29 +2592,19 @@ msgid ""
 "manager.\n"
 "\n"
 "Please check the URL and try again."
-msgstr ""
-"Указанный адрес (URL) не является адресом менеджера\n"
-"проектов на базе BOINC.\n"
-"\n"
-"Уточните адрес (URL) и повторите попытку."
+msgstr "Указанный адрес (URL) не является адресом менеджера\nпроектов на базе BOINC.\n\nУточните адрес (URL) и повторите попытку."
 
-# ???? кто такой Login и почему Failed с большой буквы.
 #: clientgui/NotFoundPage.cpp:181
 msgid "Login Failed."
 msgstr "Неудача."
 
-# пользователя
 #: clientgui/NotFoundPage.cpp:185
 msgid "Check the username and password, and try again."
-msgstr ""
-"Проверьте правильность написания имени\n"
-"участника и пароля и повторите ввод."
+msgstr "Проверьте правильность написания имени\nучастника и пароля и повторите ввод."
 
 #: clientgui/NotFoundPage.cpp:189
 msgid "Check the email address and password, and try again."
-msgstr ""
-"Проверьте правильность написания адреса\n"
-"электронной почты и пароля и повторите ввод."
+msgstr "Проверьте правильность написания адреса\nэлектронной почты и пароля и повторите ввод."
 
 #: clientgui/NoticeListCtrl.cpp:229
 msgid "more..."
@@ -2693,70 +2614,67 @@ msgstr "больше..."
 msgid "Choose a project"
 msgstr "Выбор проекта"
 
-#: clientgui/ProjectInfoPage.cpp:228
+#: clientgui/ProjectInfoPage.cpp:226
 msgid "To choose a project, click its name or type its URL below."
-msgstr ""
-"Выберите понравившийся проект щёлкнув на его\n"
-"названии, или введите его адрес URL в поле ниже."
+msgstr "Выберите понравившийся проект щёлкнув на его\nназвании, или введите его адрес URL в поле ниже."
 
-#: clientgui/ProjectInfoPage.cpp:246
+#: clientgui/ProjectInfoPage.cpp:242
 msgid "Categories:"
 msgstr "Категории:"
 
-#: clientgui/ProjectInfoPage.cpp:267
+#: clientgui/ProjectInfoPage.cpp:262
 msgid "Projects:"
 msgstr "Проекты:"
 
-#: clientgui/ProjectInfoPage.cpp:279
+#: clientgui/ProjectInfoPage.cpp:274
 msgid "Project details"
 msgstr "Описание проекта"
 
-#: clientgui/ProjectInfoPage.cpp:291
+#: clientgui/ProjectInfoPage.cpp:284
 msgid "Research area:"
 msgstr "Научная область:"
 
-#: clientgui/ProjectInfoPage.cpp:302
+#: clientgui/ProjectInfoPage.cpp:294
 msgid "Organization:"
 msgstr "Организация:"
 
-#: clientgui/ProjectInfoPage.cpp:313
+#: clientgui/ProjectInfoPage.cpp:304
 msgid "Web site:"
 msgstr "Веб-сайт:"
 
-#: clientgui/ProjectInfoPage.cpp:325
+#: clientgui/ProjectInfoPage.cpp:315
 msgid "Supported systems:"
 msgstr "Поддерживаемые платформы:"
 
-#: clientgui/ProjectInfoPage.cpp:363
+#: clientgui/ProjectInfoPage.cpp:352
 msgid "Project URL:"
 msgstr "URL-адрес проекта:"
 
-#: clientgui/ProjectInfoPage.cpp:499
-#: clientgui/ProjectInfoPage.cpp:754
-#: clientgui/ProjectInfoPage.cpp:758
+#: clientgui/ProjectInfoPage.cpp:486 clientgui/ProjectInfoPage.cpp:686
+#: clientgui/ProjectInfoPage.cpp:690
 msgid "All"
 msgstr "Все"
 
-#: clientgui/ProjectInfoPage.cpp:802
-msgid "This project may not have work for your type of computer.  Do you want to add it anyway?"
+#: clientgui/ProjectInfoPage.cpp:735
+msgid ""
+"This project may not have work for your type of computer.  Do you want to "
+"add it anyway?"
 msgstr "Возможно, что данный проект не поддерживает тип вашего компьютера или операционную систему.  Вы всё равно хотите его добавить?"
 
-#: clientgui/ProjectInfoPage.cpp:826
+#: clientgui/ProjectInfoPage.cpp:767
 msgid "You already added this project. Please choose a different project."
 msgstr "Этот проект уже добавлен. Выберите другой проект."
 
-# ???
 #: clientgui/ProjectProcessingPage.cpp:321
 msgid "Communicating with project."
 msgstr "Установка связи с проектом."
 
-#: clientgui/ProjectProcessingPage.cpp:510
+#: clientgui/ProjectProcessingPage.cpp:509
 msgid "Required files not found on the server."
 msgstr "Необходимые файлы не найдены на сервере."
 
-# что бы это значило???
-#: clientgui/ProjectProcessingPage.cpp:513
-#: clientgui/ProjectProcessingPage.cpp:586
+#: clientgui/ProjectProcessingPage.cpp:512
+#: clientgui/ProjectProcessingPage.cpp:585
 msgid "An internal server error has occurred."
 msgstr "Произошла внутренняя ошибка сервера."
 
@@ -2764,11 +2682,8 @@ msgstr "Произошла внутренняя ошибка сервера."
 msgid ""
 "Communicating with project\n"
 "Please wait..."
-msgstr ""
-"Устанавливается связь с сервером проекта\n"
-"Пожалуйста подождите..."
+msgstr "Устанавливается связь с сервером проекта\nПожалуйста подождите..."
 
-# Хоть "в" хоть "на" - всё равно как-то криво
 #: clientgui/ProjectWelcomePage.cpp:251
 #, c-format
 msgid "Welcome to %s."
@@ -2776,16 +2691,15 @@ msgstr "Добро пожаловать в %s."
 
 #: clientgui/ProjectWelcomePage.cpp:254
 msgid "You have volunteered to compute for this project:"
-msgstr "Вы добровольно участвуете в вычислениях для данного проекта:"
+msgstr "Вы добровольно выполняете расчёты для этого проекта:"
 
-# Имя
 #: clientgui/ProjectWelcomePage.cpp:255
 msgid "Name:"
-msgstr "Название:"
+msgstr "Имя:"
 
 #: clientgui/ProjectWelcomePage.cpp:258
 msgid "Home:"
-msgstr "Домашняя:"
+msgstr "Владелец:"
 
 #: clientgui/ProjectWelcomePage.cpp:262
 msgid "Description:"
@@ -2793,21 +2707,22 @@ msgstr "Описание:"
 
 #: clientgui/ProjectWelcomePage.cpp:265
 msgid "URL:"
-msgstr "Ссылка (URL):"
+msgstr "URL:"
 
 #: clientgui/ProjectWelcomePage.cpp:268
 msgid "User:"
-msgstr "Участник:"
+msgstr "Пользователь:"
 
 #: clientgui/ProjectWelcomePage.cpp:273
-msgid "WARNING: This project is not registered with BOINC.  Make sure you trust it before continuing."
-msgstr "ВНИМАНИЕ: Этот проект не зарегистрирован в BOINC. Убедитесь, что Вы доверяете ему, прежде чем продолжить."
+msgid ""
+"WARNING: This project is not registered with BOINC.  Make sure you trust it "
+"before continuing."
+msgstr "ПРЕДУПРЕЖДЕНИЕ: Этот проект не зарегистрирован в BOINC.  Убедитесь, что Вы доверяете ему, прежде чем продолжить."
 
 #: clientgui/ProjectWelcomePage.cpp:277
 msgid "To continue, click Next."
 msgstr "Для продолжения нажмите кнопку 'Далее'."
 
-# Неудача при попытке установить соединение
 #: clientgui/ProxyInfoPage.cpp:195
 msgid "Network communication failure"
 msgstr "Неудача при установлении соединения"
@@ -2827,20 +2742,7 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"World Community Grid - BOINC не может подключиться к интернету.\n"
-"Возможные причины этого:\n"
-"1) Проблемы соединения.  Проверьте модем или параметры\n"
-"подключения к сети и когда связь с интернетом будет\n"
-"установлена нажмите '< Назад' и повторите попытку.\n"
-"\n"
-"2) Ваш брандмауэр блокирует выход BOINC в интернет.\n"
-"Добавьте в настройках вашего брандмауэра разрешение\n"
-"на доступ BOINC в интернет через порт 80 и 443.\n"
-"После этого нажмите '< Назад' и повторите попытку.\n"
-"\n"
-"3) Вы используете прокси сервер для выхода в интернет,\n"
-"а BOINC не знает об этом."
+msgstr "World Community Grid - BOINC не может подключиться к интернету.\nВозможные причины этого:\n1) Проблемы соединения.  Проверьте модем или параметры\nподключения к сети и когда связь с интернетом будет\nустановлена нажмите '< Назад' и повторите попытку.\n\n2) Ваш брандмауэр блокирует выход BOINC в интернет.\nДобавьте в настройках вашего брандмауэра разрешение\nна доступ BOINC в интернет через порт 80 и 443.\nПосле этого нажмите '< Назад' и повторите попытку.\n\n3) Вы используете про [...]
 
 #: clientgui/ProxyInfoPage.cpp:203
 msgid ""
@@ -2857,20 +2759,7 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"BOINC не может подключиться к интернету.\n"
-"Возможные причины этого:\n"
-"1) Проблемы соединения.  Проверьте модем или параметры\n"
-"подключения к сети и когда связь с интернетом будет\n"
-"установлена нажмите '< Назад' и повторите попытку.\n"
-"\n"
-"2) Ваш брандмауэр блокирует выход BOINC в интернет.\n"
-"Добавьте в настройках вашего брандмауэра разрешение\n"
-"на доступ BOINC в интернет через порт 80.\n"
-"После этого нажмите '< Назад' и повторите попытку.\n"
-"\n"
-"3) Вы используете прокси сервер для выхода в интернет,\n"
-"а BOINC не знает об этом."
+msgstr "BOINC не может подключиться к интернету.\nВозможные причины этого:\n1) Проблемы соединения.  Проверьте модем или параметры\nподключения к сети и когда связь с интернетом будет\nустановлена нажмите '< Назад' и повторите попытку.\n\n2) Ваш брандмауэр блокирует выход BOINC в интернет.\nДобавьте в настройках вашего брандмауэра разрешение\nна доступ BOINC в интернет через порт 80.\nПосле этого нажмите '< Назад' и повторите попытку.\n\n3) Вы используете прокси сервер для выхода в интер [...]
 
 #: clientgui/ProxyPage.cpp:331
 msgid "Proxy configuration"
@@ -2880,8 +2769,7 @@ msgstr "Параметры прокси сервера"
 msgid "HTTP proxy"
 msgstr "HTTP прокси"
 
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
+#: clientgui/ProxyPage.cpp:337 clientgui/ProxyPage.cpp:357
 msgid "Server:"
 msgstr "Сервер:"
 
@@ -2893,51 +2781,64 @@ msgstr "Автоопределение"
 msgid "SOCKS proxy"
 msgstr "SOCKS прокси"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:167
+#: clientgui/sg_BoincSimpleFrame.cpp:166
+msgid "Skin"
+msgstr "Обложка"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:168
+msgid "Select the appearance of the user interface."
+msgstr "Выберите внешний вид пользовательского интерфейса."
+
+#: clientgui/sg_BoincSimpleFrame.cpp:179
+msgid "Display diagnostic messages."
+msgstr "Показать диагностические сообщения."
+
+#: clientgui/sg_BoincSimpleFrame.cpp:184
 msgid "Advanced View...\tCtrl+Shift+A"
 msgstr "Полный вид...\tCtrl+Shift+A"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:168
+#: clientgui/sg_BoincSimpleFrame.cpp:185
 msgid "Display the advanced graphical interface."
 msgstr "Изменить внешний вид на более продвинутый."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:175
-msgid "Skin"
-msgstr "Обложка"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:177
-msgid "Select the appearance of the user interface."
-msgstr "Выберите внешний вид пользовательского интерфейса."
+#: clientgui/sg_BoincSimpleFrame.cpp:201
+msgid "Configure display options and proxy settings"
+msgstr "Настройки графического интерфейса программы и прокси серверов"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:224
+#: clientgui/sg_BoincSimpleFrame.cpp:222
 #, c-format
 msgid "&%s"
 msgstr "&%s"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:405
+#: clientgui/sg_BoincSimpleFrame.cpp:396
 msgid "Default"
 msgstr "По умолчанию"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:848
+#: clientgui/sg_BoincSimpleFrame.cpp:838
 msgid "Suspend"
 msgstr "Приостановить"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:850
+#: clientgui/sg_BoincSimpleFrame.cpp:840
 msgid "Suspend Computing"
 msgstr "Приостановить вычисления"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:851
+#: clientgui/sg_BoincSimpleFrame.cpp:841
 msgid "Resume Computing"
 msgstr "Возобновить вычисления"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:867
+#: clientgui/sg_BoincSimpleFrame.cpp:857
 msgid "Notices"
 msgstr "Уведомления"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:868
+#: clientgui/sg_BoincSimpleFrame.cpp:858
 msgid "Open a window to view notices from projects or BOINC"
 msgstr "Открыть окно просмотра уведомлений проектов и BOINC"
 
+#: clientgui/sg_BoincSimpleFrame.cpp:879
+#, c-format
+msgid "Get help with %s"
+msgstr "Получить справку по %s"
+
 #: clientgui/sg_DlgMessages.cpp:124
 msgid "Fetching notices; please wait..."
 msgstr "Получение уведомлений; пожалуйста подождите..."
@@ -2955,241 +2856,104 @@ msgstr "Закрыть"
 msgid "%s - Notices"
 msgstr "%s - Уведомления "
 
-#: clientgui/sg_DlgPreferences.cpp:270
-msgid "This dialog controls preferences for this computer only."
-msgstr "Это диалоговое окно управляет настройками только этого компьютера."
-
-#: clientgui/sg_DlgPreferences.cpp:275
-msgid "Click OK to set preferences."
-msgstr "Для сохранения настроек нажмите 'OK'."
-
-#: clientgui/sg_DlgPreferences.cpp:280
-msgid "Click Clear to restore web-based settings for all preferences listed below."
-msgstr "Нажмите кнопку 'Удалить', чтобы восстановить параметры, указанные на веб-сайте проекта, для всех настроек, перечисленных ниже."
-
-#: clientgui/sg_DlgPreferences.cpp:287
-msgid "For additional settings, select Computing Preferences in the Advanced View."
+#: clientgui/sg_DlgPreferences.cpp:187
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
 msgstr "Для дополнительных параметров выберите 'Настройки клиента' в меню 'Полный вид'."
 
-#: clientgui/sg_DlgPreferences.cpp:315
-msgid "Do work only between:"
-msgstr "Обрабатывать только с"
-
-#: clientgui/sg_DlgPreferences.cpp:337
-msgid "Connect to internet only between:"
-msgstr "Доступ в интернет только с"
-
-#: clientgui/sg_DlgPreferences.cpp:359
-#: clientgui/sg_DlgPreferences.cpp:376
-msgid "Use no more than:"
-msgstr "Использовать не более:"
-
-#: clientgui/sg_DlgPreferences.cpp:372
-msgid "of disk space"
-msgstr "места на диске"
-
-#: clientgui/sg_DlgPreferences.cpp:389
-msgid "of the processor"
-msgstr "процессора"
-
-# ...отопления
-#: clientgui/sg_DlgPreferences.cpp:393
-msgid "Do work while on battery?"
-msgstr "Работать на батареях?"
-
-#: clientgui/sg_DlgPreferences.cpp:406
-msgid "Do work after idle for:"
-msgstr "Запуск обработки при простое:"
-
-#: clientgui/sg_DlgPreferences.cpp:431
-msgid "Clear all local preferences listed above and close the dialog"
-msgstr "Удалить локально хранимые настройки для данного компьютера и закрыть диалоговое окно"
-
-# ?
-#: clientgui/sg_DlgPreferences.cpp:609
-#: clientgui/sg_DlgPreferences.cpp:612
-#: clientgui/sg_DlgPreferences.cpp:688
-#: clientgui/sg_DlgPreferences.cpp:692
-#: clientgui/sg_DlgPreferences.cpp:704
-#: clientgui/sg_DlgPreferences.cpp:708
-#: clientgui/sg_DlgPreferences.cpp:851
-#: clientgui/sg_DlgPreferences.cpp:862
-msgid "Anytime"
-msgstr "всегда"
-
-#: clientgui/sg_DlgPreferences.cpp:645
-msgid "100 MB"
-msgstr "100 Мб"
-
-#: clientgui/sg_DlgPreferences.cpp:646
-msgid "200 MB"
-msgstr "200 Мб"
-
-#: clientgui/sg_DlgPreferences.cpp:647
-msgid "500 MB"
-msgstr "500 Мб"
-
-#: clientgui/sg_DlgPreferences.cpp:648
-msgid "1 GB"
-msgstr "1 Гб"
-
-#: clientgui/sg_DlgPreferences.cpp:649
-msgid "2 GB"
-msgstr "2 Гб"
-
-#: clientgui/sg_DlgPreferences.cpp:650
-msgid "5 GB"
-msgstr "5 Гб"
-
-#: clientgui/sg_DlgPreferences.cpp:651
-msgid "10 GB"
-msgstr "10 Гб"
-
-#: clientgui/sg_DlgPreferences.cpp:652
-msgid "20 GB"
-msgstr "20 Гб"
-
-#: clientgui/sg_DlgPreferences.cpp:653
-msgid "50 GB"
-msgstr "50 Гб"
-
-#: clientgui/sg_DlgPreferences.cpp:654
-msgid "100 GB"
-msgstr "100 Гб"
-
-#: clientgui/sg_DlgPreferences.cpp:724
-#, c-format
-msgid "%d MB"
-msgstr "%d МБ"
-
-#: clientgui/sg_DlgPreferences.cpp:726
-#, c-format
-msgid "%4.2f GB"
-msgstr "%4.2f ГБ"
-
-#: clientgui/sg_DlgPreferences.cpp:767
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: clientgui/sg_DlgPreferences.cpp:803
-msgid "0 (Run Always)"
-msgstr "0 (работать всегда)"
-
-#: clientgui/sg_DlgPreferences.cpp:806
-#, c-format
-msgid "%d"
-msgstr "%d"
+#: clientgui/sg_DlgPreferences.cpp:289
+msgid "GB of disk space"
+msgstr "ГБ дискового пространства"
 
-#: clientgui/sg_DlgPreferences.cpp:953
+#: clientgui/sg_DlgPreferences.cpp:980
 #, c-format
 msgid "%s - Computing Preferences"
 msgstr "%s - Настройки вычислений"
 
-# ?
-#: clientgui/sg_DlgPreferences.cpp:1033
-msgid "Do you really want to clear all local preferences?\n"
-msgstr "Вы действительно хотите удалить все локально хранимые настройки?\n"
+#: clientgui/sg_DlgPreferences.cpp:1061
+msgid "Discard all local preferences and use web-based preferences?"
+msgstr "Отменить все локальные настройки и использовать веб-настройки?"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:66
-#: clientgui/ViewProjects.cpp:179
 msgid "Update"
 msgstr "Обновить"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:67
-#: clientgui/ViewProjects.cpp:180
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
+msgid ""
+"Report all completed tasks, get latest credit, get latest preferences, and "
+"possibly get more tasks."
 msgstr "Получить информацию с сервера проекта: о подтверждении передачи завершенных заданий, о количестве набранных очков, о настройках учётной записи и (возможно) закачке новых заданий."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:73
 #: clientgui/sg_ProjectCommandPopup.cpp:129
-#: clientgui/ViewProjects.cpp:187
-#: clientgui/ViewProjects.cpp:727
 msgid "Suspend tasks for this project."
 msgstr "Приостановить обработку выделенного проекта."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:78
 #: clientgui/sg_ProjectCommandPopup.cpp:136
-#: clientgui/ViewProjects.cpp:193
-#: clientgui/ViewProjects.cpp:746
 msgid "No new tasks"
 msgstr "Не запрашивать задания"
 
-# ?
-# дубль???
 #: clientgui/sg_ProjectCommandPopup.cpp:79
-#: clientgui/ViewProjects.cpp:194
 msgid "Don't get new tasks for this project."
 msgstr "Не запрашивать новые задания с сервера проекта."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:200
 msgid "Reset project"
 msgstr "Перезапустить проект"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:85
-#: clientgui/ViewProjects.cpp:201
-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"
-"ВНИМАНИЕ: не забудьте перед данной операцией отправить все завершенные задания для данного проекта."
+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:208
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
+msgid ""
+"Remove this project.  Tasks in progress will be lost (use 'Update' first to "
+"report any completed tasks)."
 msgstr "Удалить этот проект.  Обрабатываемые в данный момент задания будут потеряны (используйте 'Обновить' перед данной операцией, чтобы отправить все завершенные задания)."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:96
 #: clientgui/sg_TaskCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:214
 msgid "Properties"
 msgstr "Информация"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:97
-#: clientgui/ViewProjects.cpp:215
 msgid "Show project details."
 msgstr "Информация о проекте."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:126
-#: clientgui/ViewProjects.cpp:723
 msgid "Resume tasks for this project."
 msgstr "Продолжить обработку выделенного проекта."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:133
-#: clientgui/ViewProjects.cpp:742
 msgid "Allow new tasks"
 msgstr "Получать новые задания"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:134
-#: clientgui/ViewProjects.cpp:742
 msgid "Allow fetching new tasks for this project."
 msgstr "Запрашивать новые задания с сервера проекта."
 
-# ???
 #: clientgui/sg_ProjectCommandPopup.cpp:137
-#: clientgui/ViewProjects.cpp:746
 msgid "Don't fetch new tasks for this project."
 msgstr "Не запрашивать новые задания с сервера проекта."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:229
-#: clientgui/ViewProjects.cpp:443
 #, c-format
 msgid "Are you sure you want to reset project '%s'?"
 msgstr "Вы действительно хотите перезапустить проект '%s'?"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:235
-#: clientgui/ViewProjects.cpp:449
 msgid "Reset Project"
 msgstr "Перезапуск проекта"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:266
-#: clientgui/ViewProjects.cpp:501
 #, c-format
 msgid "Are you sure you want to remove project '%s'?"
 msgstr "Вы действительно хотите удалить проект '%s'?"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:272
-#: clientgui/ViewProjects.cpp:507
 msgid "Remove Project"
 msgstr "Удалить проект"
 
@@ -3205,6 +2969,10 @@ msgstr "Синхронзировать"
 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 клиентом и менеджером проектов"
@@ -3268,15 +3036,12 @@ msgstr "Приостановить обработку выделенного з
 msgid ""
 "Are you sure you want to abort this task '%s'?\n"
 "(Progress: %.1lf%%, Status: %s)"
-msgstr ""
-"Вы уверены, что хотите прервать обработку этого задания '%s'?\n"
-"(Прогресс: %.1lf%%, Состояние: %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 не подключен ни к одному проекту.  Пожалуйста добавьте проект."
@@ -3342,56 +3107,51 @@ msgstr "Осталось (приблизительно): %s"
 msgid "Status: %s"
 msgstr "Статус: %s"
 
-# ?????? это о чём
-#: clientgui/sg_TaskPanel.cpp:1227
+#: clientgui/sg_TaskPanel.cpp:1228
 msgid "Retrieving current status."
 msgstr "Проверка текущего состояния."
 
-#: clientgui/sg_TaskPanel.cpp:1233
+#: clientgui/sg_TaskPanel.cpp:1234
 msgid "Downloading work from the server."
 msgstr "Загрузка заданий с сервера проекта."
 
-# ноутбук
-#: clientgui/sg_TaskPanel.cpp:1238
+#: clientgui/sg_TaskPanel.cpp:1239
 msgid "Processing Suspended:  Running On Batteries."
 msgstr "Обработка приостановлена:  работа компьютера от батарей."
 
-#: clientgui/sg_TaskPanel.cpp:1240
+#: clientgui/sg_TaskPanel.cpp:1241
 msgid "Processing Suspended:  User Active."
 msgstr "Обработка приостановлена:  пользователь работает."
 
-#: clientgui/sg_TaskPanel.cpp:1242
+#: clientgui/sg_TaskPanel.cpp:1243
 msgid "Processing Suspended:  User paused processing."
 msgstr "Обработка приостановлена:  по инициативе пользователя."
 
-#: clientgui/sg_TaskPanel.cpp:1244
+#: clientgui/sg_TaskPanel.cpp:1245
 msgid "Processing Suspended:  Time of Day."
 msgstr "Обработка приостановлена:  запрещённое время суток."
 
-#: clientgui/sg_TaskPanel.cpp:1246
+#: clientgui/sg_TaskPanel.cpp:1247
 msgid "Processing Suspended:  Benchmarks Running."
 msgstr "Обработка приостановлена:  запущен тест производительности."
 
-#: clientgui/sg_TaskPanel.cpp:1248
+#: clientgui/sg_TaskPanel.cpp:1249
 msgid "Processing Suspended."
 msgstr "Обработка приостановлена."
 
-# Оригинальная фраза не соостветствует смыслу того места где появляется.
-#: clientgui/sg_TaskPanel.cpp:1252
+#: clientgui/sg_TaskPanel.cpp:1253
 msgid "Waiting to contact project servers."
 msgstr "Подождите пожалуйста."
 
-# ??? для тех кто не заметил, в предыдущей аналогичной фразе есть точка
-#: clientgui/sg_TaskPanel.cpp:1256
-#: clientgui/sg_TaskPanel.cpp:1265
+#: clientgui/sg_TaskPanel.cpp:1257 clientgui/sg_TaskPanel.cpp:1266
 msgid "Retrieving current status"
 msgstr "Проверка текущего состояния"
 
-#: clientgui/sg_TaskPanel.cpp:1260
+#: clientgui/sg_TaskPanel.cpp:1261
 msgid "No work available to process"
 msgstr "Нет заданий для обработки"
 
-#: clientgui/sg_TaskPanel.cpp:1262
+#: clientgui/sg_TaskPanel.cpp:1263
 msgid "Unable to connect to the core client"
 msgstr "Не удалось подключиться к BOINC клиенту"
 
@@ -3420,12 +3180,8 @@ msgid ""
 "The project is temporarily unavailable.\n"
 "\n"
 "Please try again later."
-msgstr ""
-"Проект в данный момент недоступен.\n"
-"\n"
-"Попробуйте подключиться позже."
+msgstr "Проект в данный момент недоступен.\n\nПопробуйте подключиться позже."
 
-# ?
 #: clientgui/UnavailablePage.cpp:190
 msgid "Account manager temporarily unavailable"
 msgstr "Менеджер проектов временно недоступен"
@@ -3435,10 +3191,7 @@ msgid ""
 "The account manager is temporarily unavailable.\n"
 "\n"
 "Please try again later."
-msgstr ""
-"Менеджер проектов в данный момент недоступен.\n"
-"\n"
-"Попробуйте подключиться позже."
+msgstr "Менеджер проектов в данный момент недоступен.\n\nПопробуйте подключиться позже."
 
 #: clientgui/ValidateAccountKey.cpp:68
 msgid "Please specify an account key to continue."
@@ -3448,74 +3201,54 @@ msgstr "Введите учётный ключ для продолжения."
 msgid "Invalid Account Key; please enter a valid Account Key"
 msgstr "Введен не правильный учётный ключ, повторите ввод ключа"
 
-#: clientgui/ValidateAccountKey.cpp:82
-#: clientgui/ValidateEmailAddress.cpp:86
+#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
 msgid "Validation conflict"
 msgstr "Ошибка проверки правильности ввода данных"
 
-# ???
 #: 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"
-"повторите ввод адреса электронной почты"
+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"
-"Пример:\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
+#: 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: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"
-"http://boincproject.example.com"
+msgstr "Введите корректный адрес (URL).\nПример:\nhttp://boincproject.example.com"
 
-# ?
-#: clientgui/ValidateURL.cpp:104
-#: clientgui/ValidateURL.cpp:108
+#: clientgui/ValidateURL.cpp:104 clientgui/ValidateURL.cpp:108
 #, c-format
 msgid "'%s' does not contain a valid host name."
 msgstr "Компьютер (хост) с именем: '%s' не найден."
 
-# ?
 #: clientgui/ValidateURL.cpp:111
 #, c-format
 msgid "'%s' does not contain a valid path."
 msgstr "Указанный путь: '%s' не существует."
 
 #: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:175
 msgid "Commands"
 msgstr "Действия"
 
@@ -3527,13 +3260,11 @@ msgstr "Копировать все"
 msgid "Copy selected messages"
 msgstr "Копировать выделенное"
 
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
+#: clientgui/ViewMessages.cpp:106 clientgui/ViewMessages.cpp:502
 msgid "Show only this project"
 msgstr "Сообщения проекта"
 
-#: clientgui/ViewMessages.cpp:107
-#: clientgui/ViewMessages.cpp:503
+#: clientgui/ViewMessages.cpp:107 clientgui/ViewMessages.cpp:503
 msgid "Show only the messages for the selected project."
 msgstr "Показать сообщения только от выбранного проекта."
 
@@ -3561,126 +3292,120 @@ msgstr "Все сообщения"
 msgid "Show messages for all projects."
 msgstr "Показать все сообщения."
 
-#: clientgui/ViewProjects.cpp:225
+#: clientgui/ViewProjects.cpp:246 clientgui/ViewStatistics.cpp:426
 msgid "Account"
 msgstr "Учётная запись"
 
-# ??
-#: clientgui/ViewProjects.cpp:227
+#: clientgui/ViewProjects.cpp:248
 msgid "Work done"
 msgstr "Заработанные очки"
 
-#: clientgui/ViewProjects.cpp:228
+#: clientgui/ViewProjects.cpp:249
 msgid "Avg. work done"
 msgstr "В среднем за день"
 
-#: clientgui/ViewProjects.cpp:230
+#: clientgui/ViewProjects.cpp:251 clientgui/ViewTransfers.cpp:215
+#: clientgui/ViewWork.cpp:262
 msgid "Status"
 msgstr "Состояние"
 
-#: clientgui/ViewProjects.cpp:255
+#: clientgui/ViewProjects.cpp:330
 msgid "Projects"
 msgstr "Проекты"
 
-#: clientgui/ViewProjects.cpp:307
+#: clientgui/ViewProjects.cpp:382
 msgid "Updating project..."
 msgstr "Обновляется информация о проекте..."
 
-#: clientgui/ViewProjects.cpp:349
+#: clientgui/ViewProjects.cpp:424
 msgid "Resuming project..."
 msgstr "Проект запускается..."
 
-#: clientgui/ViewProjects.cpp:353
+#: clientgui/ViewProjects.cpp:428
 msgid "Suspending project..."
 msgstr "Приостанавливается выполнение проекта..."
 
-#: clientgui/ViewProjects.cpp:390
+#: clientgui/ViewProjects.cpp:465
 msgid "Telling project to allow additional task downloads..."
 msgstr "Передается запрос на разрешение получения новых заданий для обработки..."
 
-#: clientgui/ViewProjects.cpp:394
+#: clientgui/ViewProjects.cpp:469
 msgid "Telling project to not fetch any additional tasks..."
 msgstr "Передается запрос на запрет получения новых заданий для обработки..."
 
-#: clientgui/ViewProjects.cpp:430
+#: clientgui/ViewProjects.cpp:505
 msgid "Resetting project..."
 msgstr "Проект перезапускается..."
 
-#: clientgui/ViewProjects.cpp:488
+#: clientgui/ViewProjects.cpp:563
 msgid "Removing project..."
 msgstr "Удаление проекта..."
 
-#: clientgui/ViewProjects.cpp:548
+#: clientgui/ViewProjects.cpp:623 clientgui/ViewWork.cpp:686
 msgid "Launching browser..."
 msgstr "Загружается браузер..."
 
-#: clientgui/ViewProjects.cpp:1063
+#: clientgui/ViewProjects.cpp:1140
 msgid "Requested by user"
 msgstr "Запрошено пользователем"
 
-#: clientgui/ViewProjects.cpp:1064
+#: clientgui/ViewProjects.cpp:1141
 msgid "To fetch work"
 msgstr "Запросить задания"
 
-#: clientgui/ViewProjects.cpp:1065
+#: clientgui/ViewProjects.cpp:1142
 msgid "To report completed tasks"
 msgstr "Сообщить о завершённых заданиях"
 
-#: clientgui/ViewProjects.cpp:1066
+#: clientgui/ViewProjects.cpp:1143
 msgid "To send trickle-up message"
 msgstr "Отправить промежуточное сообщение"
 
-#: clientgui/ViewProjects.cpp:1067
+#: clientgui/ViewProjects.cpp:1144
 msgid "Requested by account manager"
 msgstr "Запрошено менеджером проектов"
 
-#: clientgui/ViewProjects.cpp:1068
+#: clientgui/ViewProjects.cpp:1145
 msgid "Project initialization"
 msgstr "Инициализация проекта"
 
-# ???? уточнить
-#: clientgui/ViewProjects.cpp:1069
+#: clientgui/ViewProjects.cpp:1146
 msgid "Requested by project"
 msgstr "Запрошено проектом"
 
-#: clientgui/ViewProjects.cpp:1070
+#: clientgui/ViewProjects.cpp:1147
 msgid "Unknown reason"
 msgstr "Неизвестная причина"
 
-#: clientgui/ViewProjects.cpp:1084
+#: clientgui/ViewProjects.cpp:1161
 msgid "Suspended by user"
 msgstr "Приостановлено пользователем"
 
-# ???
-#: clientgui/ViewProjects.cpp:1087
+#: clientgui/ViewProjects.cpp:1164
 msgid "Won't get new tasks"
 msgstr "Не запрашивать новые задания"
 
-# ?
-#: clientgui/ViewProjects.cpp:1090
+#: clientgui/ViewProjects.cpp:1167
 msgid "Project ended - OK to remove"
 msgstr "Проект завершён - можно удалять"
 
-# ?
-#: clientgui/ViewProjects.cpp:1093
+#: clientgui/ViewProjects.cpp:1170
 msgid "Will remove when tasks done"
 msgstr "Будет удалён после завершения заданий"
 
-# ?
-#: clientgui/ViewProjects.cpp:1096
+#: clientgui/ViewProjects.cpp:1173
 msgid "Scheduler request pending"
 msgstr "Запрос информации у планировщика"
 
-# ?
-#: clientgui/ViewProjects.cpp:1102
+#: clientgui/ViewProjects.cpp:1179
 msgid "Scheduler request in progress"
 msgstr "Производится запрос информации у планировщика"
 
-#: clientgui/ViewProjects.cpp:1105
+#: clientgui/ViewProjects.cpp:1182
 msgid "Trickle up message pending"
 msgstr "Ожидание отправки промежуточного сообщения"
 
-#: clientgui/ViewProjects.cpp:1111
+#: clientgui/ViewProjects.cpp:1188
 msgid "Communication deferred "
 msgstr "Повтор через "
 
@@ -3692,50 +3417,42 @@ msgstr "Полный объём диска"
 msgid "Disk usage by BOINC projects"
 msgstr "Занято проектами BOINC"
 
-#: clientgui/ViewResources.cpp:116
-msgid "Disk"
-msgstr "Диск"
-
 #: clientgui/ViewResources.cpp:225
 msgid "no projects: 0 bytes used"
 msgstr "нет проектов: 0 байт используется"
 
-#: clientgui/ViewResources.cpp:262
+#: clientgui/ViewResources.cpp:259
 msgid "used by BOINC: "
 msgstr "занято BOINC: "
 
-#: clientgui/ViewResources.cpp:272
+#: clientgui/ViewResources.cpp:269
 msgid "free, available to BOINC: "
 msgstr "свободно, доступно для BOINC: "
 
-#: clientgui/ViewResources.cpp:282
+#: clientgui/ViewResources.cpp:279
 msgid "free, not available to BOINC: "
 msgstr "свободно, недоступно для BOINC: "
 
-#: clientgui/ViewResources.cpp:292
+#: clientgui/ViewResources.cpp:289
 msgid "free: "
 msgstr "свободно: "
 
-#: clientgui/ViewResources.cpp:302
+#: clientgui/ViewResources.cpp:299
 msgid "used by other programs: "
 msgstr "занято другими данными: "
 
-# Общее количество очков набранных участником
 #: clientgui/ViewStatistics.cpp:1181
 msgid "User Total"
 msgstr "Общее количество очков участника"
 
-# Среднее количество очков набираемых участником за день
 #: clientgui/ViewStatistics.cpp:1182
 msgid "User Average"
 msgstr "Среднее количество очков за день"
 
-# Общее количество очков набранных на данном хосте
 #: clientgui/ViewStatistics.cpp:1183
 msgid "Host Total"
 msgstr "Общее количество очков для хоста"
 
-# Среднее количество очков набираемых данным хостом за день
 #: clientgui/ViewStatistics.cpp:1184
 msgid "Host Average"
 msgstr "Среднее количество очков за день для хоста"
@@ -3793,13 +3510,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 "Использовать всю область для графиков"
 
@@ -3843,16 +3558,11 @@ msgstr "Показать сумму по проектам на одном гра
 msgid "Statistics"
 msgstr "Статистика"
 
-#: clientgui/ViewStatistics.cpp:2077
-#: clientgui/ViewStatistics.cpp:2098
-#: clientgui/ViewStatistics.cpp:2119
-#: clientgui/ViewStatistics.cpp:2141
-#: clientgui/ViewStatistics.cpp:2162
-#: clientgui/ViewStatistics.cpp:2183
-#: clientgui/ViewStatistics.cpp:2204
-#: clientgui/ViewStatistics.cpp:2225
-#: clientgui/ViewStatistics.cpp:2246
-#: clientgui/ViewStatistics.cpp:2270
+#: clientgui/ViewStatistics.cpp:2077 clientgui/ViewStatistics.cpp:2098
+#: clientgui/ViewStatistics.cpp:2119 clientgui/ViewStatistics.cpp:2141
+#: clientgui/ViewStatistics.cpp:2162 clientgui/ViewStatistics.cpp:2183
+#: clientgui/ViewStatistics.cpp:2204 clientgui/ViewStatistics.cpp:2225
+#: clientgui/ViewStatistics.cpp:2246 clientgui/ViewStatistics.cpp:2270
 msgid "Updating charts..."
 msgstr "Обновляется график..."
 
@@ -3864,200 +3574,185 @@ msgstr "Показать список проектов"
 msgid "Uses smaller area for graphs"
 msgstr "Использовать меньшую область для графиков"
 
-#: clientgui/ViewTransfers.cpp:169
+#: clientgui/ViewTransfers.cpp:187
 msgid "Retry Now"
 msgstr "Повторить"
 
-#: clientgui/ViewTransfers.cpp:170
+#: clientgui/ViewTransfers.cpp:188
 msgid "Retry the file transfer now"
 msgstr "Повторить передачу файла"
 
-#: clientgui/ViewTransfers.cpp:176
+#: clientgui/ViewTransfers.cpp:194
 msgid "Abort Transfer"
 msgstr "Удалить"
 
-#: clientgui/ViewTransfers.cpp:177
+#: clientgui/ViewTransfers.cpp:195
 msgid "Abort this file transfer.  You won't get credit for the task."
 msgstr "Прервать передачу файла.  Вы не получите очки за это задание."
 
-#: clientgui/ViewTransfers.cpp:188
+#: clientgui/ViewTransfers.cpp:210
 msgid "File"
 msgstr "Файл"
 
-#: clientgui/ViewTransfers.cpp:189
-#: clientgui/ViewWork.cpp:238
+#: clientgui/ViewTransfers.cpp:211 clientgui/ViewWork.cpp:261
 msgid "Progress"
 msgstr "Прогресс"
 
-#: clientgui/ViewTransfers.cpp:190
+#: clientgui/ViewTransfers.cpp:212
 msgid "Size"
 msgstr "Размер"
 
-#: clientgui/ViewTransfers.cpp:191
-msgid "Elapsed Time"
+#: clientgui/ViewTransfers.cpp:213 clientgui/ViewWork.cpp:263
+msgid "Elapsed"
 msgstr "Затрачено времени"
 
-#: clientgui/ViewTransfers.cpp:192
+#: clientgui/ViewTransfers.cpp:214
 msgid "Speed"
 msgstr "Скорость"
 
-#: clientgui/ViewTransfers.cpp:218
+#: clientgui/ViewTransfers.cpp:295
 msgid "Transfers"
 msgstr "Передача"
 
-#: clientgui/ViewTransfers.cpp:285
+#: clientgui/ViewTransfers.cpp:362
 msgid "Network activity is suspended - "
 msgstr "Доступ в сеть приостановлен - "
 
-#: clientgui/ViewTransfers.cpp:287
+#: clientgui/ViewTransfers.cpp:364
 msgid ""
 ".\n"
 "You can enable it using the Activity menu."
-msgstr ""
-".\n"
-"Вы можете включить его, используя меню Управление."
+msgstr ".\nВы можете включить его, используя меню Управление."
 
-#: clientgui/ViewTransfers.cpp:290
+#: clientgui/ViewTransfers.cpp:367
 msgid "BOINC"
 msgstr "BOINC"
 
-#: clientgui/ViewTransfers.cpp:297
+#: clientgui/ViewTransfers.cpp:374
 msgid "Retrying transfer now..."
 msgstr "Повторная попытка передачи данных..."
 
-#: clientgui/ViewTransfers.cpp:335
+#: clientgui/ViewTransfers.cpp:412
 msgid "Aborting transfer..."
 msgstr "Прерывание передачи данных с последующим удалением передаваемого файла..."
 
-#: clientgui/ViewTransfers.cpp:348
+#: 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"
-"с ошибкой и очки за него будут потеряны."
+msgstr "Вы уверены, что хотите прервать передачу и удалить файл '%s'?\nВНИМАНИЕ: задание, использующее этот файл, будет завершено\nс ошибкой и очки за него будут потеряны."
 
-#: clientgui/ViewTransfers.cpp:354
+#: clientgui/ViewTransfers.cpp:431
 msgid "Abort File Transfer"
 msgstr "Прерывание передачи файла"
 
-#: clientgui/ViewTransfers.cpp:785
+#: clientgui/ViewTransfers.cpp:864
 msgid "Upload"
 msgstr "Отправка"
 
-#: clientgui/ViewTransfers.cpp:785
+#: clientgui/ViewTransfers.cpp:864
 msgid "Download"
 msgstr "Загрузка"
 
-#: clientgui/ViewTransfers.cpp:789
+#: clientgui/ViewTransfers.cpp:868
 msgid "retry in "
 msgstr "повторится через "
 
-#: clientgui/ViewTransfers.cpp:791
+#: clientgui/ViewTransfers.cpp:870
 msgid "failed"
 msgstr "не удалась"
 
-#: clientgui/ViewTransfers.cpp:794
+#: clientgui/ViewTransfers.cpp:873
 msgid "suspended"
 msgstr "приостановлена"
 
-#: clientgui/ViewTransfers.cpp:799
+#: clientgui/ViewTransfers.cpp:878
 msgid "active"
 msgstr "активна"
 
-#: clientgui/ViewTransfers.cpp:801
+#: clientgui/ViewTransfers.cpp:880
 msgid "pending"
 msgstr "ожидает"
 
-#: clientgui/ViewTransfers.cpp:808
+#: clientgui/ViewTransfers.cpp:887
 msgid " (project backoff: "
 msgstr " (запрос к проекту отложен на: "
 
-#: clientgui/ViewWork.cpp:192
-#: clientgui/ViewWork.cpp:782
+#: clientgui/ViewWork.cpp:211 clientgui/ViewWork.cpp:864
 msgid "Show active tasks"
 msgstr "Показать активные задания"
 
-#: clientgui/ViewWork.cpp:193
-#: clientgui/ViewWork.cpp:783
+#: clientgui/ViewWork.cpp:212 clientgui/ViewWork.cpp:865
 msgid "Show only active tasks."
 msgstr "Показать только активные задания."
 
-#: clientgui/ViewWork.cpp:206
+#: clientgui/ViewWork.cpp:225
 msgid "Show VM Console"
 msgstr "Показать консоль ВМ"
 
-#: clientgui/ViewWork.cpp:207
+#: clientgui/ViewWork.cpp:226
 msgid "Show VM Console in a window."
 msgstr "Показать консоль Виртуальной машины в отдельном окне."
 
-#: clientgui/ViewWork.cpp:214
+#: clientgui/ViewWork.cpp:233
 msgid "Suspend work for this result."
 msgstr "Приостановить обработку выделенного задания."
 
-#: clientgui/ViewWork.cpp:221
+#: clientgui/ViewWork.cpp:240
 msgid "Abandon work on the result. You will get no credit for it."
 msgstr "Прервать обработку выделенного задания (удалить задание). Очки за прерванные задания не начисляются."
 
-#: clientgui/ViewWork.cpp:240
-msgid "Elapsed"
-msgstr "Затрачено времени"
-
-#: clientgui/ViewWork.cpp:241
+#: clientgui/ViewWork.cpp:264
 msgid "Remaining (estimated)"
 msgstr "Осталось (приблизительно)"
 
-#: clientgui/ViewWork.cpp:242
+#: clientgui/ViewWork.cpp:265
 msgid "Deadline"
 msgstr "Отправить до"
 
-#: clientgui/ViewWork.cpp:269
+#: clientgui/ViewWork.cpp:351
 msgid "Tasks"
 msgstr "Задания"
 
-#: clientgui/ViewWork.cpp:362
+#: clientgui/ViewWork.cpp:444
 msgid "Resuming task..."
 msgstr "Возобновляется обработка ранее приостановленного задания..."
 
-#: clientgui/ViewWork.cpp:365
+#: clientgui/ViewWork.cpp:447
 msgid "Suspending task..."
 msgstr "Приостанавливается обработка выделенного задания..."
 
-#: clientgui/ViewWork.cpp:394
+#: clientgui/ViewWork.cpp:476
 msgid "Showing graphics for task..."
 msgstr "Открывается окно приложения с графической информацией..."
 
-#: clientgui/ViewWork.cpp:431
+#: clientgui/ViewWork.cpp:513
 msgid "Showing VM console for task..."
 msgstr "Открывается консоль Виртуальной машины..."
 
-#: clientgui/ViewWork.cpp:484
+#: 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)"
+msgstr "Вы уверены, что хотите прервать обработку выделенного задания '%s'?\n(Прогресс: %s, Состояние: %s)"
 
-#: clientgui/ViewWork.cpp:490
+#: clientgui/ViewWork.cpp:572
 #, c-format
 msgid "Are you sure you want to abort these %d tasks?"
 msgstr "Вы уверены, что хотите прервать обработку этих %d заданий?"
 
-# 75%
-#: clientgui/ViewWork.cpp:504
+#: clientgui/ViewWork.cpp:586
 msgid "Aborting task..."
 msgstr "Прерывание задания..."
 
-#: clientgui/ViewWork.cpp:776
+#: clientgui/ViewWork.cpp:858
 msgid "Show all tasks"
 msgstr "Показать все задания"
 
-#: clientgui/ViewWork.cpp:777
+#: clientgui/ViewWork.cpp:859
 msgid "Show all tasks."
 msgstr "Показать все задания."
 
@@ -4077,12 +3772,7 @@ msgid ""
 "\n"
 "Projects added via this wizard will not be\n"
 "listed on or managed via %s."
-msgstr ""
-"Добавляйте поекты на сайте\n"
-"%s, если это возможно.\n"
-"\n"
-"Проекты, добавленные с помощью данного\n"
-"мастера, не будут управляться через %s."
+msgstr "Добавляйте поекты на сайте\n%s, если это возможно.\n\nПроекты, добавленные с помощью данного\nмастера, не будут управляться через %s."
 
 #: clientgui/WelcomePage.cpp:313
 msgid ""
@@ -4091,12 +3781,7 @@ msgid ""
 "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"
-"или использовать 'Менеджер Проектов' для выбора."
+msgstr "Более 30 проектов в различных\nобластях науки используют BOINC,\nи Вы можете добровольно помочь любым из них.\nВы можете добавить проект вручную,\nили использовать 'Менеджер Проектов' для выбора."
 
 #: clientgui/WelcomePage.cpp:325
 msgid ""
@@ -4111,18 +3796,7 @@ msgid ""
 "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"
-"использовать его для выбора проектов, которые хотите поддержать.\n"
-"\n"
-"Пожалуйста, выберите, что Вы хотите сделать:\n"
+msgstr "Вы выбрали добавление нового проекта добровольных вычислений или изменение проектов,\nв которых принимаете участие.\n\nНекоторые из этих проектов запущены и управляются World Community Grid,\nа остальные созданы и управляются другими исследователями и организациями.\nПрограммное обеспечение BOINC может разделить неиспользуемые ресурсы процессора между проектами в любой комбинации.\n\nЛибо, если Вы зарегистрированы в Менеджере проектов BOINC, то можете\nиспользовать его для выбора [...]
 
 #: clientgui/WelcomePage.cpp:339
 msgid "Use a BOINC Account Manager"
@@ -4136,16 +3810,15 @@ msgstr "Добавить или изменить свои проекты в Worl
 msgid "Add projects run by other researchers or organizations"
 msgstr "Добавить проекты, запущенные другими исследователями или организациями"
 
-#: clientgui/WizardAttach.cpp:673
+#: clientgui/WizardAttach.cpp:560
 msgid "Do you really want to cancel?"
 msgstr "Прервать процесс подключения?"
 
-#: clientgui/WizardAttach.cpp:674
+#: clientgui/WizardAttach.cpp:561
 msgid "Question"
 msgstr "Вопрос"
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
+#: clientgui/wizardex.cpp:377 clientgui/wizardex.cpp:553
 msgid "&Next >"
 msgstr "Далее >"
 
@@ -4183,381 +3856,10 @@ msgstr "Показать все"
 msgid "Quit %s"
 msgstr "Выйти из %s"
 
-#: clientgui/DlgAdvPreferences.h:30
-msgid "specify work start and stop hours in format HH:MM-HH:MM"
-msgstr "задайте время, когда разрешено обрабатывать задания, в формате ЧЧ:мм-ЧЧ:мм"
-
-#: clientgui/DlgAdvPreferences.h:31
-msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
-msgstr "задайте время, когда клиенту разрешено подключаться к интернету, в формате ЧЧ:мм-ЧЧ:мм"
-
-# 98%
-#~ msgid ""
-#~ "(C) 2003-2013 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2013 Калифорнийский университет, Беркли.\n"
-#~ "Все права защищены."
-# ???
-#, c-format
-#~ msgid "%s - Preferences"
-#~ msgstr "%s - Настройки клиента"
-
-#, no-c-format
-#~ msgid "% of the processors (0 means ignore this setting)"
-#~ msgstr "% процессоров (0 означает игнорирование этого параметра)"
-
-# Загрузка ЦП
-#, no-c-format
-#~ msgid "% CPU time"
-#~ msgstr "% времени каждого процессора (ЦП)"
-#~ msgid "KBytes/sec."
-#~ msgstr "кбайт/сек."
-#~ msgid "Mbytes"
-#~ msgstr "Мбайт"
-#~ msgid "every"
-#~ msgstr "каждые"
-#~ msgid "days"
-#~ msgstr "дней"
-#~ msgid "Gigabytes disk space"
-#~ msgstr "Гбайт места на диске"
-#~ msgid "Running, high priority"
-#~ msgstr "Работает, обработать в первую очередь"
-#~ msgid " (Scheduler wait: "
-#~ msgstr "(Планировщик ожидает:"
-#~ msgid " (Scheduler wait)"
-#~ msgstr " (Планировщик ожидает)"
-#~ msgid " (Waiting for network access)"
-#~ msgstr "(Ожидание доступа к сети)"
-#~ msgid "Preferences…"
-#~ msgstr "Настройки..."
-#~ msgid "invalid float"
-#~ msgstr "ошибка ввода числа"
-
-# ??
-#~ msgid "Workunit name"
-#~ msgstr "Имя задания"
-#~ msgid "I do not agree with the terms of use."
-#~ msgstr "Я не согласен с условиями использования."
-#~ msgid "Display the advanced (accessible) graphical interface."
-#~ msgstr ""
-#~ "Изменить внешний вид на расширенный (Будут полностью доступны все функции "
-#~ "управления)."
-#~ msgid "Click Clear to restore web-based settings."
-#~ msgstr "Для возврата к настройкам с сайта проекта нажмите 'Удалить'."
-#~ msgid "For additional settings, select Computing Preferences in "
-#~ msgstr "Для дополнительных параметров выберите Настройки клиента в "
-#~ msgid "the Advanced View."
-#~ msgstr "Полном виде."
-#~ msgid "Paused: Other work running"
-#~ msgstr "Пауза: обрабатывается другое задание"
-# Resume это картинка !!! - зависит от скина
-#~ msgid "Paused: User initiated.  Click 'Resume' to continue"
-#~ msgstr ""
-#~ "Пауза: запрошено пользователем.  Нажмите 'Продолжить' для возобновления "
-#~ "обработки"
-#~ msgid "Paused: User active"
-#~ msgstr "Пауза: пользователь работает"
-#~ msgid "Paused: Computer on battery"
-#~ msgstr "Пауза: работа компьютера от батарей"
-#~ msgid "Paused: Time of Day"
-#~ msgstr "Пауза: запрещённое время суток"
-#~ msgid "Paused: Benchmarks running"
-#~ msgstr "Пауза: запущен тест производительности"
-#~ msgid "Paused"
-#~ msgstr "Пауза"
-#~ msgid "Paused: Application start delayed"
-#~ msgstr "Пауза: запуск приложения отложен"
-#~ msgid "Click to show project graphics"
-#~ msgstr "Нажмите чтобы показать окно приложения с графической информацией"
-#~ msgid "Open a window to view messages"
-#~ msgstr "Открыть окно с сообщениями"
-#~ msgid "Stop all activity"
-#~ msgstr "Приостановить всю обработку и сетевую активность"
-#~ msgid "Resume activity"
-#~ msgstr "Возобновить обработку"
-#~ msgid "Open a window to set your preferences"
-#~ msgstr "Открыть окно настроек клиента"
-#~ msgid "Switch to the BOINC advanced view"
-#~ msgstr "Изменить внешний вид BOINC менеджера на более подробный"
-#~ msgid "My Projects:"
-#~ msgstr "Проекты:"
-#, c-format
-#~ msgid "%s. Work done by %s: %0.2f"
-#~ msgstr "%s. Участником %s заработано: %0.2f очков"
-
-#, c-format
-#~ msgid "%.1lf"
-#~ msgstr "%.1lf"
-
-#, c-format
-#~ msgid "%d hr %d min %d sec"
-#~ msgstr "%d часов %d минут %d секунд"
-#~ msgid "Are you sure you want to display graphics on a remote machine?"
-#~ msgstr ""
-#~ "Вы уверены, что хотите показать графическое окно для приложения на удаленном "
-#~ "компьютере?"
-#~ msgid "Application: "
-#~ msgstr "Приложение: "
-#~ msgid "Time Remaining: "
-#~ msgstr "Осталось: "
-#~ msgid "Elapsed Time: "
-#~ msgstr "Затрачено: "
-#~ msgid "Account manager website"
-#~ msgstr "Вебсайт менеджера проектов"
-#~ msgid "Account Manager &URL:"
-#~ msgstr "Адрес (URL):"
-
-#, c-format
-#~ msgid "%s &website"
-#~ msgstr "Домашняя страница %s"
-#~ msgid "Notice List"
-#~ msgstr "Список уведомлений"
-
-#, c-format
-#~ msgid "%s; received on %s"
-#~ msgstr "%s; получен на %s"
-
-#, c-format
-#~ msgid "%s; received from %s; on %s"
-#~ msgstr "%s; получен от %s; на %s"
-#~ msgid "Click"
-#~ msgstr "Нажать"
-#~ msgid "Project List"
-#~ msgstr "Список проектов"
-#~ msgid "Nvidia GPU Supported"
-#~ msgstr "Поддержка ГП NVIDIA"
-#~ msgid "ATI GPU Supported"
-#~ msgstr "Поддержка ГП ATI"
-#~ msgid "Project Website"
-#~ msgstr "Веб-сайт проекта"
-#~ msgid "One or more items failed to load from the Internet."
-#~ msgstr "Один или более элементов не удалось загрузить из интернета."
-
-# 88%
-#~ msgid "Retry now"
-#~ msgstr "Повторить"
-#~ msgid "10%"
-#~ msgstr "10%"
-#~ msgid "20%"
-#~ msgstr "20%"
-#~ msgid "30%"
-#~ msgstr "30%"
-#~ msgid "40%"
-#~ msgstr "40%"
-#~ msgid "50%"
-#~ msgstr "50%"
-#~ msgid "60%"
-#~ msgstr "60%"
-#~ msgid "70%"
-#~ msgstr "70%"
-#~ msgid "80%"
-#~ msgstr "80%"
-#~ msgid "90%"
-#~ msgstr "90%"
-#~ msgid "100%"
-#~ msgstr "100%"
-#~ msgid "1"
-#~ msgstr "1"
-#~ msgid "3"
-#~ msgstr "3"
-#~ msgid "5"
-#~ msgstr "5"
-#~ msgid "10"
-#~ msgstr "10"
-#~ msgid "15"
-#~ msgstr "15"
-#~ msgid "30"
-#~ msgstr "30"
-#~ msgid "60"
-#~ msgstr "60"
-#, c-format
-#~ msgid "Pop up a menu of websites for project %s"
-#~ msgstr "Показать меню веб-сайтов для проекта %s"
-#~ msgid ""
-#~ "for accessibility support, please select advanced from the view menu or type "
-#~ "command shift a"
-#~ msgstr ""
-#~ "для поддержки специальных возможностей, пожалуйста выберите меню "
-#~ "'Расширенный вид' или введите команду shift a"
-#~ msgid "This panel contains graphs showing user totals for projects"
-#~ msgstr ""
-#~ "Эта панель содержит графики, показывающие пользовательские достижения в "
-#~ "проектах"
-#~ msgid "list headers"
-#~ msgstr "заголовки списка"
-#~ msgid "list of events"
-#~ msgstr "список событий"
-#~ msgid "list of events is empty"
-#~ msgstr "список событий пуст"
-
-#, c-format
-#~ msgid "list of %s"
-#~ msgstr "список %s"
-
-#, c-format
-#~ msgid "list of %s is empty"
-#~ msgstr "список %s пуст"
-
-#, c-format
-#~ msgid "; current sort column %d of %d; descending order; "
-#~ msgstr "; текущий столбец сортировки %d из %d; в убывающем порядке; "
-
-#, c-format
-#~ msgid "; current sort column %d of %d; ascending order; "
-#~ msgstr "; текущий столбец сортировки %d из %d; в возрастающем порядке; "
-
-#, c-format
-#~ msgid "; column %d of %d; "
-#~ msgstr "; столбец %d из %d; "
-#~ msgid "list is empty"
-#~ msgstr "список пуст"
-
-#, c-format
-#~ msgid "; row %d; "
-#~ msgstr "; строка %d; "
-
-#, c-format
-#~ msgid "; selected row %d of %d; "
-#~ msgstr "; выбранная строка %d из %d; "
-
-#, c-format
-#~ msgid "; selected row %d ; "
-#~ msgstr "; выбранная строка %d ; "
-
-#, c-format
-#~ msgid "; row %d of %d; "
-#~ msgstr "; строка %d из %d; "
-#~ msgid "blank"
-#~ msgstr "пусто"
-#~ msgid "list of projects or account managers"
-#~ msgstr "список проектов и менеджеров проектов"
-
-#, c-format
-#~ msgid "selected row %d of %d; "
-#~ msgstr "выбранная строка %d из %d; "
-
-#, c-format
-#~ msgid "row %d of %d; "
-#~ msgstr "строка %d из %d; "
-#~ msgid "The minimum username length for this project is 1. Please enter a different username."
-#~ msgstr ""
-#~ "Минимальная длина имени участника для данного проекта 1 символ. Измените имя "
-#~ "участника."
-#~ msgid "The minimum username length for this account manager is 1. Please enter a different username."
-#~ msgstr ""
-#~ "Минимальная длина имени участника для данного менеджера проектов 1 символ. "
-#~ "Измените имя участника."
-#~ msgid "The minimum email address length for this project is 1. Please enter a different email address."
-#~ msgstr ""
-#~ "Минимальная длина адреса электронной почты для данного проекта 1 символ. "
-#~ "Измените адрес."
-#~ msgid "The minimum email address length for this account manager is 1. Please enter a different email address."
-#~ msgstr ""
-#~ "Минимальная длина адреса электронной почты для данного менеджера проектов 1 "
-#~ "символ. Измените адрес."
-
-# ?
-#, c-format
-#~ msgid "The minimum password length for this project is %d. Please enter a different password."
-#~ msgstr ""
-#~ "Минимальная длина пароля для данного проекта %d символов. Измените пароль."
-
-# ?
-#, c-format
-#~ msgid "The minimum password length for this account manager is %d. Please enter a different password."
-#~ msgstr ""
-#~ "Минимальная длина пароля для данного менеджера проектов %d символов. "
-#~ "Измените пароль."
-#~ msgid ""
-#~ "An error has occurred;\n"
-#~ "check the Event Log for details.\n"
-#~ "\n"
-#~ "Click Finish to close."
-#~ msgstr ""
-#~ "Произошла ошибка; подробности можно\n"
-#~ "найти в окне 'Просмотр событий'.\n"
-#~ "\n"
-#~ "Для завершения нажмите кнопку 'Готово'."
-
-# процессоры в процентах
-#, no-c-format
-#~ msgid "% of the processors"
-#~ msgstr "% от общего числа процессоров (ЦП)"
-
-#, c-format
-#~ msgid "New page inserted. Index = %i"
-#~ msgstr "Новая страница вставлена. Индекс = %i"
-
-#, c-format
-#~ msgid "New page appended. Index = %i"
-#~ msgstr "Новая страница добавлена. Индекс = %i"
-
-#, c-format
-#~ msgid "Old Page Index = %i"
-#~ msgstr "Индекс старой страницы = %i"
-
-#, c-format
-#~ msgid "OnDropTarget: index by HitTest = %i"
-#~ msgstr "OnDropTarget: индекс по HitTest = %i"
-#~ msgid "Identify your account "
-#~ msgstr "Ваша учетная запись "
-#~ msgid "Read config file"
-#~ msgstr "Перезагрузить файл спецнастроек"
-#~ msgid "Read configuration info from cc_config.xml"
-#~ msgstr "Перезагрузить файл спецнастроек cc_config.xml"
-#~ msgid ""
-#~ "(C) 2003-2011 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2011 Калифорнийский университет, Беркли.\n"
-#~ "Все права защищены."
-#~ msgid "NVIDIA GPU"
-#~ msgstr "ГП NVIDIA"
-#~ msgid "ATI GPU"
-#~ msgstr "ГП ATI"
-#~ msgid "Multicore CPU Supported"
-#~ msgstr "Поддержка многоядерных ЦП"
-#~ msgid "%s: %.0f"
-#~ msgstr "%s: %.0f"
-#~ msgid "Click 'Retry now' to transfer the file now"
-#~ msgstr "Запустить повторную передачу данных"
-#~ msgid ""
-#~ "Click 'Abort transfer' to delete the file from the transfer queue. This "
-#~ "will prevent you from being granted credit for this result."
-#~ msgstr ""
-#~ "Нажмите 'Прервать передачу' для удаления выделенного файла из очереди "
-#~ "передачи.ВНИМАНИЕ: очки за задание будут потеряны."
-#~ msgid "Aborting result..."
-#~ msgstr "Прерывается обработка выделенного задания..."
-#~ msgid ""
-#~ "You have chosen to add a new BOINC project.  Adding a new\n"
-#~ "project means that you will be connecting your computer to a new "
-#~ "organization.\n"
-#~ "If this is what you wanted to do, please click on\n"
-#~ "the 'Next' button below.\n"
-#~ "\n"
-#~ "Some projects like World Community Grid run multiple research "
-#~ "applications.\n"
-#~ "If you want to change which research applications are sent to your "
-#~ "computer\n"
-#~ "to run, visit the project's website and modify your\n"
-#~ "preferences there.\n"
-#~ "\n"
-#~ "To change which research applications are sent to you from\n"
-#~ "World Community Grid then please click on the following button:"
-#~ msgstr ""
-#~ "Вы выбрали добавление нового проекта BOINC.\n"
-#~ "Добавление нового проекта означает, что ваш компьютер свяжется\n"
-#~ "по сети с сайтом проекта.\n"
-#~ "Если Вы согласны с этим, то нажмите кнопку 'Далее'.\n"
-#~ "\n"
-#~ "Некоторые проекты вроде World Community Grid используют\n"
-#~ "несколько расчётных приложений. \n"
-#~ "Для выбора конкретных расчётных приложений, работающих на вашем "
-#~ "компьютере,\n"
-#~ "необходимо измененить соответствующие настройки на сайте проекта.\n"
-#~ "\n"
-#~ "Для выбора расчётных приложений World Community Grid\n"
-#~ "работающих на вашем компьютере, нажмите следующую кнопку:"
+#: clientgui/DlgAdvPreferencesBase.h:45
+msgid "On this day of the week, compute only during these hours."
+msgstr "В этот день недели выполнять расчёты только в эти часы."
 
+#: clientgui/DlgAdvPreferencesBase.h:46
+msgid "On this day of the week, transfer files only during these hours."
+msgstr "В этот день недели передавать файлы только в эти часы."
diff --git a/locale/ru/BOINC-Project-Generic.po b/locale/ru/BOINC-Project-Generic.po
old mode 100755
new mode 100644
index e5e9889..47fdca0
--- a/locale/ru/BOINC-Project-Generic.po
+++ b/locale/ru/BOINC-Project-Generic.po
@@ -1,35 +1,123 @@
 # BOINC web translation
 # Copyright (C) 2008 University of California
+# 
 # This file is distributed under the same license as BOINC.
+# 
 # FileID  : $Id$
+# 
+# Translators:
+# Nikolay Sakharov <saharovna at gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\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: 2014-08-17 17:09+0000\n"
-"Last-Translator: Nikolay Saharov <saharovna at gmail.com>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: ru\n"
+"POT-Creation-Date: 2015-03-04 08:56 PST\n"
+"PO-Revision-Date: 2015-03-12 17:53+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"
-"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"
-"X-Generator: Pootle 2.5.0\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"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1408295381.0\n"
 
-# The name of this language in this language
-# Имя языка в этом файле
 msgid "LANG_NAME_NATIVE"
 msgstr "Русский"
 
-# The name of this language in an international language (English)
-# Имя языка в этом файле на интернациональном языке (английском)
 msgid "LANG_NAME_INTERNATIONAL"
 msgstr "Russian"
 
+#: ../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 "Идентифицирует Вас на нашем web-сайте. Введите ваше настоящее имя или псевдоним."
+
+#: ../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 "Должен быть действительным адресом в форме 'name at domain'."
+
+#: ../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 "Почтовый индекс или ZIP-код"
+
+#: ../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 "Адрес email:"
+
+#: ../inc/account.inc:103
+msgid "forgot email address?"
+msgstr "забыли адрес email?"
+
+#: ../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)"
@@ -43,330 +131,327 @@ msgid "Underline text: [u]text[/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]http://ссылка_на_картинку[/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]http://url[/url] или [url=http://url]текст "
-"URL[/url]  (alt+w)"
+msgstr "Вставка адреса URL: [url]http://url[/url] или [url=http://url]текст 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]  Подсказка: Вы можете также "
-"использовать color=#FF0000"
+msgstr "Цвет шрифта: [color=red]текст[/color]  Подсказка: Вы можете также использовать 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, чтобы увидеть это сообщение"
+"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 "оценить:"
 
-# 83%
-#: ../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"
@@ -382,373 +467,352 @@ msgid ""
 "        <li> No abusive comments involving race, religion,\n"
 "            nationality, gender, class or sexuality.\n"
 "        "
-msgstr ""
-"\n"
-"<ul>\n"
-"<li> Сообщения должны быть 'дружелюбны к детям': они не должны содержать\n"
-"контент, который является непристойным, связанным с ненавистью,\n"
-"явно сексуальным или наводящим.\n"
-"<li> Не должно быть коммерческой рекламы.\n"
-"<li> Не должно быть ссылок на веб-сайты, связанные с сексуальным "
-"содержанием,\n"
-"азартными играми, или нетерпимостью других.\n"
-"<li> Не должно быть сообщений, раздражающих или противопоставляющих других "
-"людей,\n"
-"или захватывающих обсуждение.\n"
-"<li> Не должно быть сообщений, которые сознательно враждебны или "
-"оскорбительны.\n"
-"<li> Не должно быть оскорбительных комментариев, затрагивающих расу, "
-"религию,\n"
-" национальность, пол, класс или сексуальность.\n"
-" "
-
-#: ../inc/forum.inc:780
+msgstr "\n<ul>\n<li> Сообщения должны быть 'дружелюбны к детям': они не должны содержать\nконтент, который является непристойным, связанным с ненавистью,\nявно сексуальным или наводящим.\n<li> Не должно быть коммерческой рекламы.\n<li> Не должно быть ссылок на веб-сайты, связанные с сексуальным содержанием,\nазартными играми, или нетерпимостью других.\n<li> Не должно быть сообщений, раздражающих или противопоставляющих других людей,\nили захватывающих обсуждение.\n<li> Не должно быть соо [...]
+
+#: ../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 ""
-"Только участники команды могут оставлять сообщения на доске сообщений "
-"команды"
+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, у Вас должно быть определенное "
-"количество очков. Это ограничение должно предотвратить и защитить систему "
-"против злоупотреблений."
+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 ""
-"Прямо сейчас Вы не можете создать тему для обсуждения. Пожалуйста, немного "
-"подождите перед повторной попыткой. Эта задержка произошла для того, чтобы "
-"защитить систему против злоупотреблений."
+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 ""
-"Это обсуждение заблокировано. Только модераторы форума и администраторы "
-"могут оставлять сообщения здесь."
+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 "Тип ЦП"
 
-#: ../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 Мб"
 
-#: ../inc/host.inc:134
+#: ../inc/host.inc:133
 msgid "Cache"
 msgstr "Кэш"
 
-#: ../inc/host.inc:134
+#: ../inc/host.inc:133
 msgid "%1 KB"
 msgstr "%1 Кб"
 
-#: ../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 Гб"
 
-#: ../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 Кб/с"
 
-#: ../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"
 
 #: ../inc/host.inc:193
 msgid "Average CPU efficiency"
@@ -758,7 +822,7 @@ msgstr "Средняя эффективность ЦП"
 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 "Размещение"
 
@@ -774,7 +838,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 "Последний контакт"
 
@@ -782,30 +846,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 "Тип ЦП"
 
-#: ../inc/host.inc:237 ../inc/host.inc:685
+#: ../inc/host.inc:237 ../inc/host.inc:690
 msgid "GPU"
 msgstr "Тип ГП"
 
@@ -813,91 +877,83 @@ msgstr "Тип ГП"
 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 несовместимый ЦП:"
 
-#: ../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 "Версия<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 "Объединить компьютеры по имени"
 
-#: ../inc/language_names.inc:61
+#: ../inc/language_names.inc:62
 msgid "Browser default"
 msgstr "По умолчанию"
 
@@ -910,29 +966,29 @@ msgstr "Комментарий"
 msgid "News is available as an %sRSS feed%s"
 msgstr "Новости доступны в формате %sленты 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 "Входящие"
 
-#: ../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 "нет такого сообщения"
 
@@ -942,10 +998,9 @@ 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:139
+#: ../inc/pm.inc:85 ../user/pm.php:90 ../user/pm.php:144
 msgid "Subject"
 msgstr "Тема"
 
@@ -953,424 +1008,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 ""
-"Вам не разрешается отправлять личные сообщения так часто. Пожалуйста, "
-"подождите немного, прежде чем отправить больше сообщений."
+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"
+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 "Оставлять часть процессоров свободными для других приложений. Пример: 75% означает использовать 6 ядер на 8-ядерном процессоре."
 
-#: ../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 "% процессоров"
 
-#: ../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 ""
-"Приостанавливать обработку на ГП, пока компьютер используется? %1 Начиная с "
-"версии 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 "Приостанавливать/возобновлять вычисления каждые несколько секунд, чтобы понизить температуру ЦП и уменьшить потребляемую энергию. Пример: 75% означает вычислять 3 секунды, подождать 1 секунду и повторить."
+
+#: ../inc/prefs.inc:60
+#, no-php-format
+msgid "% of CPU time"
+msgstr "% времени ЦП"
+
+#: ../inc/prefs.inc:62 ../inc/prefs.inc:208
+msgid "When to suspend"
+msgstr "Когда приостанавливать"
+
+#: ../inc/prefs.inc:64
+msgid "Suspend when computer is on battery"
+msgstr "Приостановить, когда компьютер работает от аккумулятора"
 
-#: ../inc/prefs.inc:99
-msgid "'In use' means mouse/keyboard activity in last"
-msgstr "'Использование' означает активность мыши/клавиатуры за последние"
+#: ../inc/prefs.inc:65
+msgid ""
+"Check this to suspend computing on portables when running on battery power."
+msgstr "Отметьте здесь, чтобы приостановить вычисления на портативных компьютерах при работе от аккумулятора."
+
+#: ../inc/prefs.inc:70
+msgid "Suspend when computer is in use"
+msgstr "Приостановить, когда компьютер используется"
+
+#: ../inc/prefs.inc:71
+msgid ""
+"Check this to suspend computing and file transfers when you're using the "
+"computer."
+msgstr "Отметьте здесь, чтобы приостановить вычисления и передачу файлов, когда Вы используете компьютер."
+
+#: ../inc/prefs.inc:76
+msgid "Suspend GPU computing when computer is in use"
+msgstr "Приостановить вычисления на ГП, когда компьютер используется"
+
+#: ../inc/prefs.inc:77
+msgid "Check this to suspend GPU computing when you're using the computer."
+msgstr "Отметьте здесь, чтобы приостановить вычисления на ГП, когда Вы используете компьютер."
+
+#: ../inc/prefs.inc:82
+msgid "'In use' means mouse/keyboard input in last"
+msgstr "'Использование' означает ввод с помощью мыши/клавиатуры за последние"
+
+#: ../inc/prefs.inc:83
+msgid "This determines when the computer is considered 'in use'."
+msgstr "Это определяет, когда компьютер считается 'используемым'."
 
-#: ../inc/prefs.inc:101 ../inc/prefs.inc:110 ../inc/prefs.inc:144
+#: ../inc/prefs.inc:85 ../inc/prefs.inc:92 ../inc/prefs.inc:122
 msgid "minutes"
 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:89
+msgid "Suspend when no mouse/keyboard input in last"
+msgstr "Приостановить, если мышь/клавиатура не использовались за последние"
+
+#: ../inc/prefs.inc:90
+msgid "This allows some computers to enter low-power mode when not in use."
+msgstr "Это позволяет некоторым компьютерам перейти в режим низкого потребления энергии, когда они не используются."
+
+#: ../inc/prefs.inc:95
+msgid "Suspend when non-BOINC CPU usage is above"
+msgstr "Приостановить, если использование процессора не-BOINC-задачами выше"
+
+#: ../inc/prefs.inc:96
+msgid "Suspend computing when your computer is busy running other programs."
+msgstr "Приостановить вычисления, когда ваш компьютер занят, выполняя другие программы."
+
+#: ../inc/prefs.inc:101
+msgid "Compute only between"
+msgstr "Вычислять только между"
+
+#: ../inc/prefs.inc:102
+msgid "Compute only during a particular period each day."
+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:107
+msgid "Store at least"
+msgstr "Запасать на не менее"
+
+#: ../inc/prefs.inc:108
+msgid "Store at least enough tasks to keep the computer busy for this long."
+msgstr "Поддерживать минимально допустимое количество заданий, чтобы компьютер был занят в течение указанного времени."
+
+#: ../inc/prefs.inc:110 ../inc/prefs.inc:116
+msgid "days of work"
+msgstr "дней работы"
+
+#: ../inc/prefs.inc:113
+msgid "Store up to an additional"
+msgstr "Запасать дополнительно на"
 
 #: ../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 ""
-"Приостанавливать обработку, когда использование ЦП остальными программами "
-"(кроме BOINC) выше %1 0 - без ограничений<br>Начиная с версии 6.10.30+ %2"
+"Store additional tasks above the minimum level.  Determines how much work is"
+" requested when contacting a project."
+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:119
+msgid "Switch between tasks about every"
+msgstr "Переключение между заданиями примерно каждые"
+
+#: ../inc/prefs.inc:120
+msgid "If you run several projects, BOINC may switch between them this often."
+msgstr "Если у Вас работает несколько проектов, то BOINC может переключаться между ними с указанной периодичностью."
+
+#: ../inc/prefs.inc:125
+msgid "Request tasks to checkpoint at most every"
+msgstr "Запрашивать сохранение промежуточных результатов заданий примерно каждые"
 
-#: ../inc/prefs.inc:130
+#: ../inc/prefs.inc:126
 msgid ""
-"Leave tasks in memory while suspended? %1 Suspended tasks will consume swap "
-"space if 'yes' %2"
-msgstr ""
-"Оставлять неактивные задания в памяти? %1 если 'да', приостановленные "
-"задания будут занимать место в виртуальной памяти %2"
+"This controls how often tasks save their state to disk, so that they can be "
+"restarted later."
+msgstr "Эта настройка управляет тем, как часто задания сохраняют на диск своё состояние для того, чтобы они могли позже перезапуститься с этой точки."
+
+#: ../inc/prefs.inc:128
+msgid "seconds"
+msgstr "секунд"
+
+#: ../inc/prefs.inc:136 ../inc/prefs.inc:148
+msgid "Use no more than"
+msgstr "Использовать не более"
+
+#: ../inc/prefs.inc:137
+msgid "Limit the total amount of disk space used by BOINC."
+msgstr "Ограничивает общий объём дискового пространства, используемого BOINC."
 
 #: ../inc/prefs.inc:139
-msgid "Switch between tasks every %1 Recommended: 60 minutes %2"
-msgstr "Переключение между заданиями каждые %1 рекомендуется: 60 минут %2"
+msgid "GB"
+msgstr "Гб"
 
-#: ../inc/prefs.inc:147
-msgid "On multiprocessors, use at most"
-msgstr "На мультипроцессорных системах использовать не более"
+#: ../inc/prefs.inc:142
+msgid "Leave at least"
+msgstr "Оставлять не менее"
+
+#: ../inc/prefs.inc:143
+msgid ""
+"Limit disk usage to leave this much free space on the volume where BOINC "
+"stores data."
+msgstr "Ограничивает использование диска, чтобы оставалось не менее указанного объёма свободного места на томе, где BOINC хранит данные."
+
+#: ../inc/prefs.inc:145
+msgid "GB free"
+msgstr "Гб свободного места"
 
 #: ../inc/prefs.inc:149
-msgid "processors"
-msgstr "процессоров"
+msgid ""
+"Limit the percentage of disk space used by BOINC on the volume where it "
+"stores data."
+msgstr "Ограничивает процент дискового пространства, используемого BOINC на томе, где он хранит данные."
 
-#: ../inc/prefs.inc:153
-msgid "On multiprocessors, use at most %1 Enforced by version 6.1+ %2"
-msgstr ""
-"На мультипроцессорных системах использовать не более %1 Начиная с версии "
-"6.1+ %2"
+#: ../inc/prefs.inc:152
+#, no-php-format
+msgid "% of total"
+msgstr "% от полного объема диска"
 
 #: ../inc/prefs.inc:158
-#, php-format
-msgid "% of the processors"
-msgstr "% процессоров"
+msgid "When computer is in use, use at most"
+msgstr "Когда компьютер используется, использовать не более"
 
-#: ../inc/prefs.inc:162
-msgid "Use at most %1 Can be used to reduce CPU heat %2"
-msgstr ""
-"Использовать не более %1 Может быть использовано для уменьшения перегрева ЦП "
-"%2"
+#: ../inc/prefs.inc:159
+msgid "Limit the memory used by BOINC when you're using the computer."
+msgstr "Ограничивает память, используемую BOINC, когда Вы используете компьютер."
 
-#: ../inc/prefs.inc:167
-#, php-format
-msgid "% of CPU time"
-msgstr "% времени ЦП"
+#: ../inc/prefs.inc:162 ../inc/prefs.inc:169 ../inc/prefs.inc:182
+#, no-php-format
+msgid "%"
+msgstr "%"
 
-#: ../inc/prefs.inc:175 ../inc/prefs.inc:189
-msgid "Disk: use at most"
-msgstr "Диск: использовать не более"
+#: ../inc/prefs.inc:165
+msgid "When computer is not in use, use at most"
+msgstr "Когда компьютер не используется, использовать не более"
 
-#: ../inc/prefs.inc:177 ../inc/prefs.inc:186
-msgid "GB"
-msgstr "Гб"
+#: ../inc/prefs.inc:166
+msgid "Limit the memory used by BOINC when you're not using the computer."
+msgstr "Ограничивает память, используемую BOINC, когда Вы не используете компьютер."
 
-#: ../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:172
+msgid "Leave non-GPU tasks in memory while suspended"
+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:173
+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 "Если флажок установлен, приостановленные задания остаются в памяти и возобновляются без потери выполненной работы. Если флажок не установлен, приостановленные задания удаляются из памяти и перезапускаются с их последней контрольной точки."
 
-#: ../inc/prefs.inc:194
-msgid "Tasks checkpoint to disk at most every"
-msgstr "Период сохранения на диск промежуточных результатов заданий"
+#: ../inc/prefs.inc:178
+msgid "Page/swap file: use at most"
+msgstr "Виртуальная память/файл подкачки: использовать не более"
 
-#: ../inc/prefs.inc:196
-msgid "seconds"
-msgstr "секунд"
+#: ../inc/prefs.inc:179
+msgid "Limit the swap space (page file) used by BOINC."
+msgstr "Ограничивает виртуальную память (файл подкачки), используемую BOINC."
 
-#: ../inc/prefs.inc:199
-msgid "Swap space: use at most"
-msgstr "Виртуальная память: использовать не более"
+#: ../inc/prefs.inc:189
+msgid "Limit download rate to"
+msgstr "Ограничить скорость загрузки"
 
-#: ../inc/prefs.inc:204
-msgid "Memory: when computer is in use, use at most"
-msgstr "Память: когда компьютер используется, использовать не более"
+#: ../inc/prefs.inc:190
+msgid "Limit the download rate of file transfers."
+msgstr "Ограничивает скорость загрузки при передаче файлов."
 
-#: ../inc/prefs.inc:209
-msgid "Memory: when computer is not in use, use at most"
-msgstr "Память: когда компьютер не используется, использовать не более"
+#: ../inc/prefs.inc:192 ../inc/prefs.inc:198
+msgid "KB/second"
+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:195
+msgid "Limit upload rate to"
+msgstr "Ограничить скорость отправки"
+
+#: ../inc/prefs.inc:196
+msgid "Limit the upload rate of file transfers."
+msgstr "Ограничивает скорость отправки при передаче файлов."
 
-#: ../inc/prefs.inc:223 ../inc/prefs.inc:228 ../inc/prefs.inc:270
-#: ../inc/util.inc:274
+#: ../inc/prefs.inc:201
+msgid "Limit usage to"
+msgstr "Ограничить использование до"
+
+#: ../inc/prefs.inc:202
+msgid "Example: BOINC should transfer at most 2000 MB of data every 30 days."
+msgstr "Пример: BOINC должен передавать не более 2000 Мб данных каждые 30 дней."
+
+#: ../inc/prefs.inc:205
+msgid "MB every"
+msgstr "Мб каждые"
+
+#: ../inc/prefs.inc:206 ../inc/util.inc:303
 msgid "days"
 msgstr "дней"
 
-#: ../inc/prefs.inc:226
-msgid "... and up to an additional"
-msgstr "... и дополнительно"
+#: ../inc/prefs.inc:210
+msgid "Transfer files only between"
+msgstr "Передавать файлы только между"
 
-#: ../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 используется только при наличии "
-"модемного, ISDN- или VPN-подключения %2"
+#: ../inc/prefs.inc:211
+msgid "Transfer files only during a particular period each day."
+msgstr "Передавать файлы только в конкретный период каждый день."
 
-#: ../inc/prefs.inc:241
+#: ../inc/prefs.inc:216
+msgid "Skip data verification for image files"
+msgstr "Пропустить проверку данных для файлов изображений"
+
+#: ../inc/prefs.inc:217
 msgid ""
-"Disconnect when done? %1 Matters only if you have a modem, ISDN or VPN "
-"connection %2"
-msgstr ""
-"Разорвать соединение после завершения? %1 используется только при наличии "
-"модемного, ISDN- или VPN-подключения %2"
+"Check this only if your Internet provider modifies image files. Skipping "
+"verification reduces the security of BOINC."
+msgstr "Отметьте только в том случае, если ваш интернет-провайдер изменяет файлы изображений. Пропуск проверки уменьшает безопасность BOINC."
 
-#: ../inc/prefs.inc:249
-msgid "Maximum download rate:"
-msgstr "Максимальная скорость загрузки:"
+#: ../inc/prefs.inc:222
+msgid "Confirm before connecting to Internet"
+msgstr "Предупреждать перед подключением к сети Интернет"
 
-#: ../inc/prefs.inc:251 ../inc/prefs.inc:256
-msgid "Kbytes/sec"
-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:254
-msgid "Maximum upload rate:"
-msgstr "Максимальная скорость отправки:"
+#: ../inc/prefs.inc:228
+msgid "Disconnect when done"
+msgstr "Разорвать соединение после завершения"
 
-#: ../inc/prefs.inc:259
-msgid "Use network only between the hours of"
-msgstr "Использовать сеть только между указанными часами"
+#: ../inc/prefs.inc:235 ../inc/prefs.inc:472 ../user/explain_state.php:94
+msgid "Computing"
+msgstr "Вычисления"
 
-#: ../inc/prefs.inc:263
-msgid "Transfer at most %1 Enforced by version 6.10.46+ %2"
-msgstr "Передавать не более %1 Начиная с версии 6.10.46+ %2"
+#: ../inc/prefs.inc:236
+msgid "Disk"
+msgstr "Диск"
 
-#: ../inc/prefs.inc:269
-msgid "Mbytes every"
-msgstr "Мбайт каждые"
+#: ../inc/prefs.inc:238
+msgid "Network"
+msgstr "Сеть"
 
-#: ../inc/prefs.inc:274
+#: ../inc/prefs.inc:241
 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 Отметьте ТОЛЬКО В ТОМ СЛУЧАЕ, "
-"если ваш интернет-провайдер изменяет файлы изображений (Например, это делает "
-"UMTS). %2 Пропуск проверки уменьшает безопасность BOINC. %3"
+"These preferences apply to all the BOINC projects in which you participate."
+msgstr "Эти настройки применяются ко всем проектам BOINC, в которых Вы участвуете."
 
-#: ../inc/prefs.inc:287
+#: ../inc/prefs.inc:244
 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 Определяет пропорции ресурсов вашего компьютера, "
-"выделенных этому проекту. Пример: если Вы участвуете в двух проектах BOINC с "
-"долями ресурсов 100 и 200, первый получит 1/3 ваших ресурсов, а второй "
-"получит 2/3. %2"
+"%1Unable to update preferences.%2 The values marked in red below were out of"
+" range or not numeric."
+msgstr "%1Невозможно обновить настройки.%2 Значения, отмеченные красным ниже, вне диапазона или не числовые."
 
-#: ../inc/prefs.inc:298
-msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
-msgstr ""
-"Ускорить обработку заданий на ГП, используя отдельный ЦП для каждого "
-"задания?"
+#: ../inc/prefs.inc:483
+msgid "Separate preferences for %1"
+msgstr "Отдельные настройки для конфигурации %1"
 
-#: ../inc/prefs.inc:308
-msgid "Use CPU %1 Enforced by version 6.10+ %2"
-msgstr "Использовать ЦП %1 Начиная с версии 6.10+ %2"
+#: ../inc/prefs.inc:493 ../inc/prefs.inc:528 ../inc/prefs_project.inc:291
+msgid "Edit preferences"
+msgstr "Редактировать настройки"
 
-#: ../inc/prefs.inc:320
-msgid "Use ATI GPU %1 Enforced by version 6.10+ %2"
-msgstr "Использовать ГП ATI %1 Начиная с версии 6.10+ %2"
+#: ../inc/prefs.inc:494 ../user/edit_forum_preferences_form.php:149
+#: ../user/team_admins.php:36
+msgid "Remove"
+msgstr "Удалить"
 
-#: ../inc/prefs.inc:332
-msgid "Use NVIDIA GPU %1 Enforced by version 6.10+ %2"
-msgstr "Использовать ГП NVIDIA %1 Начиная с версии 6.10+ %2"
+#: ../inc/prefs.inc:499
+msgid "Add separate preferences for %1"
+msgstr "Добавить отдельные настройки для конфигурации %1"
 
-#: ../inc/prefs.inc:344
-msgid "Use Intel GPU %1 Enforced by version 7.2+ %2"
-msgstr "Использовать ГП Intel %1 начиная с версии 7.2+ %2"
+#: ../inc/prefs.inc:506
+msgid "These settings apply to all computers using this account except"
+msgstr "Эти параметры применяются ко всем компьютерам, использующим эту учётную запись, за исключением"
 
-#: ../inc/prefs.inc:358
+#: ../inc/prefs.inc:508
 msgid ""
-"Run test applications? %1 This helps us develop applications, but may cause "
-"jobs to fail on your computer %2"
-msgstr ""
-"Выполнять тестовые приложения? %1 Это поможет нам в разработке приложений, "
-"но может привести к ошибкам в расчётах заданий на вашем компьютере %2"
+"computers where you have set preferences locally using the BOINC Manager"
+msgstr "компьютеров, где Вы локально установили настройки с помощью Менеджера BOINC"
 
-#: ../inc/prefs.inc:367
-msgid ""
-"Emails will be sent from %1; make sure your spam filter accepts this address."
-msgstr ""
-"Электронные письма будут отправлены с адреса %1; убедитесь, что ваш фильтр "
-"спама принимает этот адрес."
+#: ../inc/prefs.inc:510
+msgid "Android devices"
+msgstr "устройств на базе Android"
 
-#: ../inc/prefs.inc:374
-msgid "Is it OK for %1 and your team (if any) to email you?"
-msgstr "Могут ли %1 и ваша команда отправлять Вам электронные письма?"
-
-#: ../inc/prefs.inc:380
-msgid "Should %1 show your computers on its web site?"
-msgstr "Должен ли %1 показывать ваши компьютеры на своём веб-сайте?"
-
-#: ../inc/prefs.inc:387
-msgid "Disk and memory usage"
-msgstr "Использование диска и памяти"
-
-#: ../inc/prefs.inc:388
-msgid "Processor usage"
-msgstr "Использование процессора"
+#: ../inc/prefs.inc:513
+msgid "(Switch view)"
+msgstr "(Переключить вид)"
 
-#: ../inc/prefs.inc:389
-msgid "Network usage"
-msgstr "Использование сети"
+#: ../inc/prefs.inc:515 ../inc/prefs_project.inc:272
+msgid "Combined preferences"
+msgstr "Объединённые настройки"
 
-#: ../inc/prefs.inc:392
-msgid ""
-"These preferences apply to all the BOINC projects in which you participate."
-msgstr ""
-"Эти настройки применяются ко всем проектам BOINC, в которых Вы участвуете."
+#: ../inc/prefs.inc:522 ../inc/prefs_project.inc:283
+msgid "Primary (default) preferences"
+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:537
+msgid "Preferences last modified:"
+msgstr "Последнее изменение настроек:"
 
-#: ../inc/prefs.inc:445
-msgid "bad venue: %1"
-msgstr "плохая конфигурация: %1"
+#: ../inc/prefs.inc:553
+msgid "Add preferences"
+msgstr "Добавить настройки"
 
-#: ../inc/prefs.inc:451
-msgid "bad subset: %1"
-msgstr "плохой набор: %1"
+#: ../inc/prefs.inc:557
+msgid "Update preferences"
+msgstr "Обновить настройки"
 
-#: ../inc/prefs.inc:671 ../inc/prefs.inc:674 ../inc/prefs.inc:1025
-#: ../inc/prefs_util.inc:93 ../project.sample/project_specific_prefs.inc:85
+#: ../inc/prefs.inc:628 ../project.sample/project_specific_prefs.inc:84
+#: ../project.sample/project_specific_prefs.inc:224
 msgid "yes"
 msgstr "да"
 
-#: ../inc/prefs.inc:671 ../inc/prefs.inc:674 ../inc/prefs.inc:1027
-#: ../inc/prefs_util.inc:93 ../project.sample/project_specific_prefs.inc:87
+#: ../inc/prefs.inc:630 ../project.sample/project_specific_prefs.inc:86
+#: ../project.sample/project_specific_prefs.inc:224
 msgid "no"
 msgstr "нет"
 
-#: ../inc/prefs.inc:679 ../user/forum_search.php:53
-msgid "no limit"
-msgstr "нет ограничений"
-
-#: ../inc/prefs.inc:704 ../user/team_admins.php:79
-msgid "Add"
-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:638
+msgid "Default computer location"
+msgstr "Расположение компьютера по умолчанию"
 
-#: ../inc/prefs.inc:812 ../user/explain_state.php:94
-msgid "Computing"
-msgstr "вычислений"
+#: ../inc/prefs.inc:639
+msgid ""
+"New computers will use this location for computing and project preferences."
+msgstr "Новые компьютеры будут использовать это расположение для вычислений и настроек проекта."
 
-#: ../inc/prefs.inc:823
-msgid "Separate preferences for %1"
-msgstr "Отдельные настройки для конфигурации %1"
+#: ../inc/prefs_project.inc:52
+msgid "Resource share"
+msgstr "Выделено ресурсов"
 
-#: ../inc/prefs.inc:833 ../inc/prefs.inc:914
-msgid "Edit preferences"
-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 "Определяет пропорции ресурсов вашего компьютера, выделенных этому проекту. Например, если Вы участвуете в двух проектах BOINC с долями ресурсов 100 и 200, первый получит 1/3 ваших ресурсов, а второй получит 2/3."
 
-#: ../inc/prefs.inc:839
-msgid "Add separate preferences for %1"
-msgstr "Добавить отдельные настройки для конфигурации %1"
+#: ../inc/prefs_project.inc:61
+msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
+msgstr "Ускорить обработку заданий на ГП, используя отдельный ЦП для каждого задания?"
 
-#: ../inc/prefs.inc:847 ../inc/prefs.inc:895
-msgid "(Switch View)"
-msgstr "(Переключить вид)"
+#: ../inc/prefs_project.inc:70
+msgid "Use CPU"
+msgstr "Использовать ЦП"
 
-#: ../inc/prefs.inc:849 ../inc/prefs.inc:898
-msgid "Combined preferences"
-msgstr "Объединённые настройки"
+#: ../inc/prefs_project.inc:79
+msgid "Use ATI GPU"
+msgstr "Использовать ГП ATI"
 
-#: ../inc/prefs.inc:854
-msgid "Project specific settings"
-msgstr "Определённые параметры проекта"
+#: ../inc/prefs_project.inc:88
+msgid "Use NVIDIA GPU"
+msgstr "Использовать ГП NVIDIA"
 
-#: ../inc/prefs.inc:862 ../inc/prefs.inc:907
-msgid "Primary (default) preferences"
-msgstr "Основные настройки (по умолчанию)"
+#: ../inc/prefs_project.inc:97
+msgid "Use Intel GPU"
+msgstr "Использовать ГП Intel"
 
-#: ../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_project.inc:107
+msgid "Run test applications?"
+msgstr "Выполнять тестовые приложения?"
 
-#: ../inc/prefs.inc:885
-msgid "These apply to all BOINC projects in which you participate."
-msgstr ""
-"Эти настройки распространяются на все проекты BOINC, в которых Вы "
-"участвуете."
+#: ../inc/prefs_project.inc:108
+msgid ""
+"This helps us develop applications, but may cause jobs to fail on your "
+"computer"
+msgstr "Это поможет нам в разработке приложений, но может привести к ошибкам в расчётах заданий на вашем компьютере"
 
-#: ../inc/prefs.inc:887
+#: ../inc/prefs_project.inc:115
 msgid ""
-"On computers participating in multiple projects, the most recently modified "
-"preferences will be used."
-msgstr ""
-"На компьютерах, участвующих в нескольких проектах, будут использоваться "
-"настройки, изменённые самыми последними."
+"Emails will be sent from %1; make sure your spam filter accepts this "
+"address."
+msgstr "Электронные письма будут отправлены с адреса %1; убедитесь, что ваш фильтр спама принимает этот адрес."
 
-#: ../inc/prefs.inc:889
-msgid "These preferences do not apply to Android devices."
-msgstr "Эти настройки не относятся к Android-устройствам."
+#: ../inc/prefs_project.inc:123
+msgid "Is it OK for %1 and your team (if any) to email you?"
+msgstr "Могут ли %1 и ваша команда отправлять Вам электронные письма?"
 
-#: ../inc/prefs.inc:892
-msgid "Preferences last modified:"
-msgstr "Последнее изменение настроек:"
+#: ../inc/prefs_project.inc:130
+msgid "Should %1 show your computers on its web site?"
+msgstr "Должен ли %1 показывать ваши компьютеры на своём веб-сайте?"
 
-#: ../inc/prefs.inc:944
-msgid "Add preferences"
-msgstr "Добавить настройки"
+#: ../inc/prefs_project.inc:270
+msgid "(Switch View)"
+msgstr "(Переключить вид)"
 
-#: ../inc/prefs.inc:948
-msgid "Update preferences"
-msgstr "Обновить настройки"
+#: ../inc/prefs_project.inc:276
+msgid "Project specific settings"
+msgstr "Определённые параметры проекта"
 
-#: ../inc/prefs.inc:1036 ../inc/prefs.inc:1045
-msgid "Default computer location"
-msgstr "Расположение компьютера по умолчанию"
+#: ../inc/prefs_util.inc:33
+msgid "bad venue: %1"
+msgstr "плохая конфигурация: %1"
+
+#: ../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 "и"
 
@@ -1378,19 +1508,15 @@ msgstr "и"
 msgid ""
 "Your profile will be made visible to other people as soon as it has been "
 "approved by the project. This may take up to a few days."
-msgstr ""
-"Ваш профиль станет виден другим людям, как только он будет одобрен проектом. "
-"На это может потребоваться несколько дней."
+msgstr "Ваш профиль станет виден другим людям, как только он будет одобрен проектом. На это может потребоваться несколько дней."
 
 #: ../inc/profile.inc:92
 msgid ""
 "Your profile has been marked as unacceptable. It is not visible to other "
 "people. Please change it."
-msgstr ""
-"Ваш профиль был отмечен как недопустимый. Другие люди его не видят. "
-"Пожалуйста измените его."
+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 "Ошибка базы данных"
 
@@ -1398,10 +1524,7 @@ msgstr "Ошибка базы данных"
 msgid ""
 "To prevent spam, profiles of users with an average credit of less than %1 "
 "are displayed only to logged-in users. We apologize for this inconvenience."
-msgstr ""
-"Чтобы предотвратить спам, профили пользователей со средним количеством очков "
-"меньше чем %1 показываются только вошедшим пользователям. Мы приносим "
-"извинения за это неудобство."
+msgstr "Чтобы предотвратить спам, профили пользователей со средним количеством очков меньше чем %1 показываются только вошедшим пользователям. Мы приносим извинения за это неудобство."
 
 #: ../inc/profile.inc:197
 msgid "User is banished"
@@ -1411,7 +1534,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 "Редактировать профиль"
 
@@ -1459,11 +1582,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 "В процессе"
 
@@ -1492,6 +1616,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 "Неотправлен"
 
@@ -1647,7 +1772,6 @@ msgstr "Слишком много ошибок (возможно ошибка в
 msgid "Too many results (may be nondeterministic)"
 msgstr "Слишком много результатов (может быть недетерминированным)"
 
-# каких результатов??? тотальных???
 #: ../inc/result.inc:314
 msgid "Too many total results"
 msgstr "Слишком много результатов в целом"
@@ -1657,127 +1781,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 "Время ЦП<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 "Время ЦП"
 
-#: ../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 "Имя задания:"
 
@@ -1793,17 +1925,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 "Тип команды"
 
@@ -1811,7 +1933,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 "Найти"
 
@@ -1831,8 +1953,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 "Нет"
 
@@ -1848,500 +1970,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 ""
-"Внимание: если в Ваших настройках проекта установлено 'отправлять "
-"уведомления по электронной почте', присоединение к команде дает доступ ее "
-"основателя к Вашему адресу электронной почты."
+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глобальную "
-"команду BOINC%2."
+"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глобальную команду 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 ""
-"%1Примечание безопасности%2: если Вы создадите команду, то Ваши настройки "
-"проекта (доля ресурсов, графические настройки) будут видны всем."
+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 "URL веб-страницы команды, если есть"
 
-#: ../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 "Этот URL будет вызываться со страницы команды на этом сайте."
 
-#: ../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 "Межпроектный ID (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"
+msgstr "Статистика на вашем мобильном телефоне"
 
-#: ../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 "Адрес 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 "Почтовый индекс"
 
-#: ../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 "адрес email"
 
-#: ../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 использует Ваш компьютер"
+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 ""
-"Произошла ошибка базы данных во время обработки вашего запроса; пожалуйста "
-"попробуйте ещё раз позже."
+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
-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:473
+msgid ""
+"Link has timed out. Please click Back, refresh the page, and try again."
+msgstr "Ссылка просрочена. Пожалуйста щёлкните Назад, обновите страницу, и попробуйте ещё раз."
 
-#: ../inc/util.inc:569
+#: ../inc/util.inc:552
 msgid "Use BBCode tags to format your text"
-msgstr "Используйте тэги BBCode для форматирования Вашего текста"
+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 временно остановлен для обслуживания.  Пожалуйста попробуйте ещё раз "
-"позже."
+msgstr "%1 временно остановлен для обслуживания.  Пожалуйста попробуйте ещё раз позже."
 
-#: ../inc/util.inc:817
+#: ../inc/util.inc:800
 msgid "Unable to connect to database - please try again later"
-msgstr ""
-"Невозможно подключиться к базе данных - пожалуйста попробуйте ещё раз позже"
+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 "Оставаться авторизованным на этом компьютере"
 
@@ -2349,65 +2448,46 @@ 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 ""
-"Идентифицирует Вас на нашем web-сайте. Введите Ваше настоящее имя или "
-"псевдоним."
-
-#: ../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 "Почтовый индекс или ZIP-код"
-
-#: ../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 "Вы должны указать имя для вашей учётной информации"
 
 #: ../user/account_finish_action.php:30
 msgid "HTML tags not allowed in name"
-msgstr "Тэги HTML недопустимы в Вашем имени"
+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"
@@ -2419,10 +2499,7 @@ msgid ""
 "It's similar to HTML, but simpler. The tags start with a [ (where you would\n"
 "have used %1 in HTML) and end with ] (where you would have used %2 in\n"
 "HTML)."
-msgstr ""
-"Тэги BBCode позволяют вам форматировать текст в вашем профиле\n"
-"и в сообщениях форума. Они похожи на HTML, только проще. Тэги начинаются\n"
-"с символа [ (вместо %1в HTML) и заканчиваются символом ] (вместо %2 в HTML)."
+msgstr "Тэги BBCode позволяют Вам форматировать текст в вашем профиле\nи в сообщениях форума. Они похожи на HTML, только проще. Тэги начинаются\nс символа [ (вместо %1в HTML) и заканчиваются символом ] (вместо %2 в HTML)."
 
 #: ../user/bbcode.php:31
 msgid "Examples"
@@ -2441,156 +2518,78 @@ 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 ""
-"используется для показа предварительно отформатированного текста (обычно "
-"моноширинного)"
+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 "ссылка на билет в системе Trac на сайте BOINC"
 
-#: ../user/bbcode.php:47
+#: ../user/bbcode.php:48
 msgid "use to link to Trac Wiki on BOINC website"
 msgstr "ссылка на статью Wiki на сайте BOINC"
 
-#: ../user/bbcode.php:49
-msgid "use to link to SVN changeset on BOINC website"
-msgstr "ссылка на SVN-метку изменения на сайте 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 ""
-"Если Вы не закроете тэг или некорректно укажете параметр,\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 "Лучшие модели графических ускорителей"
-
-#: ../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 "Прочтите наши правила и политику"
+msgstr "Если Вы не закроете тэг или некорректно укажете параметр,\nвместо отформатированного текста будет просто показан сам тэг."
 
 #: ../user/create_account_action.php:26
 msgid "Can't create account"
@@ -2600,217 +2599,156 @@ 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 "Ваш ответ reCAPTCHA был неправилен. Пожалуйста попробуйте ещё раз."
 
-#: ../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 ""
-"Неправильный адрес электронной почты: Вы должны указать правильный адрес в "
-"форме name at domain"
+"Invalid email address: you must enter a valid address of the form "
+"name at domain"
+msgstr "Неправильный адрес электронной почты: Вы должны указать правильный адрес в форме name at domain"
 
-#: ../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, выберите Добавить проект, и введите свой e-mail и "
-"пароль."
+msgstr "ЗАМЕТКА: Если у Вас есть BOINC Manager, не используйте эту форму. Вместо этого запустите BOINC, выберите Добавить проект, и введите свой e-mail и пароль."
 
-#: ../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 "Должен быть действительным адресом в форме 'name at domain'."
-
-#: ../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 "Подтвердите пароль"
+msgstr "Эта учётная запись будет относиться к команде '%1' и будет иметь настройки проекта как у её основателя."
 
-#: ../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 Фотография Вашего профиля показана слева."
+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 или меньше)."
+"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 или меньше."
+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."
+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 "Ваш ответ ReCaptcha был неправилен.  Пожалуйста попробуйте еще раз."
 
-#: ../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.  Пожалуйста "
-"измените ваш текст и попробуйте еще раз."
+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.  Пожалуйста "
-"измените ваш текст и попробуйте еще раз."
+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"
+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."
-msgstr ""
-"Для предотвращения спама среднее количество очков должно быть %1 или больше, "
-"чтобы создавать или редактировать профиль.  Мы приносим извинения за это "
-"неудобство."
+"To prevent spam, an average credit of %1 or greater is required to create or"
+" edit a profile.  We apologize for this inconvenience."
+msgstr "Для предотвращения спама среднее количество очков должно быть %1 или больше, чтобы создавать или редактировать профиль.  Мы приносим извинения за это неудобство."
 
 #: ../user/delete_account.php:57
 msgid "Couldn't delete account"
@@ -2835,28 +2773,21 @@ msgid ""
 "including your profile and message-board posts.\n"
 "No jobs will be issued to any computers attached\n"
 "to this account."
-msgstr ""
-"При удалении вашей учётной записи с наших серверов\n"
-"будет удалена вся ваша персональная информация,\n"
-"включая ваш профиль и сообщения с доски сообщений.\n"
-"Компьютеры, подключенные к этой учётной записи,\n"
-"не будут получать новые задания."
+msgstr "При удалении вашей учётной записи с наших серверов\nбудет удалена вся ваша персональная информация,\nвключая ваш профиль и сообщения с доски сообщений.\nКомпьютеры, подключенные к этой учётной записи,\nне будут получать новые задания."
 
 #: ../user/delete_account.php:73
 msgid ""
 "This cannot be undone.\n"
 "Once your account has been deleted, you cannot get it back."
-msgstr ""
-"Эта операция не может быть отменена.\n"
-"Как только ваша учётная запись будет удалена, вы не сможете её восстановить."
+msgstr "Эта операция не может быть отменена.\nКак только ваша учётная запись будет удалена, вы не сможете её восстановить."
 
 #: ../user/delete_account.php:76
 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 "Да"
@@ -2865,8 +2796,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 "Нет"
@@ -2875,49 +2806,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"
-"если Вы захотите в будущем другой профиль,\n"
-"Вы должны будете ввести его с самого начала."
+msgstr "Удалённые профили исчезают навсегда и их невозможно восстановить --\nесли Вы захотите в будущем другой профиль,\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"
-"для удаления вашего профиля из нашей базы данных."
+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 "Не удалять мой профиль"
 
@@ -2935,7 +2861,8 @@ msgstr "Ваше пожертвование было принято."
 
 #: ../user/donated.php:30
 msgid ""
-"Your donation will be added to the progress bar after confirmation by PayPal."
+"Your donation will be added to the progress bar after confirmation by "
+"PayPal."
 msgstr "Ваше пожертвование будет добавлено после подтверждения от PayPal."
 
 #: ../user/donated.php:32
@@ -2954,9 +2881,7 @@ msgstr "Пожертвования для %1"
 msgid ""
 "This project is accepting donations via\n"
 "%1."
-msgstr ""
-"Этот проект принимает пожертвования через\n"
-"%1."
+msgstr "Этот проект принимает пожертвования через\n%1."
 
 #: ../user/donations.php:42
 msgid ""
@@ -2971,18 +2896,7 @@ msgid ""
 "        to see the donation amount equivalent in different currencies\n"
 "        (please note that the rates are only estimates\n"
 "         and the actual amount may differ)."
-msgstr ""
-"Укажите в поле ниже то количество, которое Вы желаете пожертвовать.\n"
-"PayPal принимает различные валюты\n"
-"(Канадские доллары, Евро, Фунты стерлингов, Доллары США,\n"
-"Йены, Австралийские доллары, Новозеландские доллары,\n"
-"Швейцарские франки, Гонгконгские доллары, Сингапурские доллары,\n"
-"Шведские кроны, Датские кроны, Польские злотые, Норвежские кроны,\n"
-"Венгерские форинты, Чешские кроны).\n"
-"Вы можете использовать встроенный конвертёр валют,\n"
-"чтобы увидеть эквивалентный объём пожертвований в различных валютах\n"
-"(пожалуйста, учтите, что курсы валют приблизительные,\n"
-"и фактическое количество может отличаться)."
+msgstr "Укажите в поле ниже то количество, которое Вы желаете пожертвовать.\nPayPal принимает различные валюты\n(Канадские доллары, Евро, Фунты стерлингов, Доллары США,\nЙены, Австралийские доллары, Новозеландские доллары,\nШвейцарские франки, Гонгконгские доллары, Сингапурские доллары,\nШведские кроны, Датские кроны, Польские злотые, Норвежские кроны,\nВенгерские форинты, Чешские кроны).\nВы можете использовать встроенный конвертёр валют,\nчтобы увидеть эквивалентный объём пожертвований [...]
 
 #: ../user/donations.php:316
 msgid "Amount you would like to donate"
@@ -3000,11 +2914,7 @@ 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."
@@ -3029,20 +2939,14 @@ msgstr "Вы можете загрузить приложения различн
 #: ../user/download_network.php:31
 msgid ""
 "These applications are not endorsed by %1 and you use them at your own risk."
-msgstr ""
-"Эти приложения не подтверждены %1, и Вы используете их на свой страх и риск."
+msgstr "Эти приложения не подтверждены %1, и Вы используете их на свой страх и риск."
 
 #: ../user/download_network.php:33
 msgid ""
 "We do not provide instructions for installing these applications.\n"
-"However, the author may have provided some help on installing or "
-"uninstalling the application. \n"
+"However, the author may have provided some help on installing or uninstalling the application. \n"
 "If this is not enough you should contact the author."
-msgstr ""
-"Мы не предоставляем инструкции по установке этих приложений.\n"
-"Однако, автор, возможно, предоставил некоторую помощь по установке и "
-"удалении приложения.\n"
-"Если этого недостаточно, Вы должны связаться с автором."
+msgstr "Мы не предоставляем инструкции по установке этих приложений.\nОднако, автор, возможно, предоставил некоторую помощь по установке и удалении приложения.\nЕсли этого недостаточно, Вы должны связаться с автором."
 
 #: ../user/download_network.php:36
 msgid "Instructions for installing and running BOINC are %1here%2."
@@ -3062,9 +2966,7 @@ msgstr "Новый адрес электронной почты '%1' непра
 
 #: ../user/edit_email_action.php:38
 msgid "New email address is same as existing address. Nothing is changed."
-msgstr ""
-"Новый адрес электронной почты такой же, как и существующий. Ничего не "
-"изменено."
+msgstr "Новый адрес электронной почты такой же, как и существующий. Ничего не изменено."
 
 #: ../user/edit_email_action.php:42
 msgid "There's already an account with that email address"
@@ -3086,9 +2988,7 @@ msgstr "Пожалуйста, %1проверьте этот адрес элек
 msgid ""
 "We can't update your email address due to a database problem.  Please try "
 "again later."
-msgstr ""
-"Невозможно обновить ваш адрес электронной почты из-за проблем с базой "
-"данных.  Пожалуйста попробуйте ещё раз позже."
+msgstr "Невозможно обновить ваш адрес электронной почты из-за проблем с базой данных.  Пожалуйста попробуйте ещё раз позже."
 
 #: ../user/edit_email_form.php:27 ../user/edit_email_form.php:51
 msgid "Change email address"
@@ -3118,261 +3018,207 @@ msgstr "Подтвердите сброс"
 msgid ""
 "This action will erase any changes you have made in your community "
 "preferences. To cancel, click your browser's Back button."
-msgstr ""
-"Это действие сотрёт все изменения, которые Вы сделали в своих настройках "
-"сообщества. Для отмены нажмите кнопку Назад в вашем обозревателе."
+msgstr "Это действие сотрёт все изменения, которые Вы сделали в своих настройках сообщества. Для отмены нажмите кнопку Назад в вашем обозревателе."
 
 #: ../user/edit_forum_preferences_action.php:38
 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 "
-"символов."
+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 ""
-"Как мы должны уведомлять Вас о новых личных сообщениях, запросах на дружбу, "
-"сообщениях в подписанных обсуждениях и о других событиях?"
+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. Размер: не более 4 Кб, 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 "осталось символов"
+msgstr "Проверьте %1различные бесплатные сервисы%2,\n<br> предоставляющие динамические 'изображения для подписи',\n<br> которые показывают последнюю информацию о ваших очках, новости проектов, и т.д."
 
-#: ../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 ""
-"Игнорирование сообщений на доске сообщений и личных сообщений от этих "
-"пользователей."
+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 "Неправильный пароль"
+msgid ""
+"We can't update your password due to a database problem. Please try again "
+"later."
+msgstr "Невозможно обновить ваш пароль из-за проблем с базой данных. Пожалуйста попробуйте ещё раз позже."
 
-#: ../user/edit_passwd_action.php:63 ../user/edit_passwd_form.php:25
-#: ../user/edit_passwd_form.php:55
+#: ../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_action.php:67
+#: ../user/edit_passwd_action.php:54
 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 "Ваш адрес email и старый пароль"
-
-#: ../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_form.php:49
-msgid "Get account key by email"
-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 "Новый пароль, ещё раз"
 
@@ -3417,18 +3263,13 @@ msgid ""
 "A tasks's <b>server state</b> indicates whether the task has been sent to a "
 "computer, and if so whether the computer has finished it. Possible values "
 "are:"
-msgstr ""
-"Поле задания <b>состояние сервера</b> показывает, было ли задание отправлено "
-"на компьютер, и если да, было ли оно завершено компьютером. Возможные "
-"значения:"
+msgstr "Поле задания <b>состояние сервера</b> показывает, было ли задание отправлено на компьютер, и если да, было ли оно завершено компьютером. Возможные значения:"
 
 #: ../user/explain_state.php:35
 msgid ""
 "The task is not ready to send (for example, because its input files are "
 "unavailable)"
-msgstr ""
-"Задание не готово к отправке (например, потому что его входные файлы "
-"недоступны)"
+msgstr "Задание не готово к отправке (например, потому что его входные файлы недоступны)"
 
 #: ../user/explain_state.php:38
 msgid "The task is ready to send, but hasn't been sent yet."
@@ -3446,9 +3287,7 @@ msgstr "Задание было отправлено; ожидание заве
 msgid ""
 "The task has been sent to a computer and either it has timed out or the "
 "computer has reported its completion."
-msgstr ""
-"Задание было отправлено на компьютер, и либо оно было просрочено, либо "
-"компьютер сообщил о его завершении."
+msgstr "Задание было отправлено на компьютер, и либо оно было просрочено, либо компьютер сообщил о его завершении."
 
 #: ../user/explain_state.php:49
 msgid "Outcomes"
@@ -3458,17 +3297,13 @@ msgstr "Результаты"
 msgid ""
 "A tasks's <b>outcome</b> is defined if its server state is <b>over</b>. "
 "Possible values are:"
-msgstr ""
-"Поле задания <b>результат</b> определено, если его состояние сервера равно "
-"<b>завершено</b>. Возможные значения:"
+msgstr "Поле задания <b>результат</b> определено, если его состояние сервера равно <b>завершено</b>. Возможные значения:"
 
 #: ../user/explain_state.php:57
 msgid ""
 "The task was sent to a computer, but the computer has not yet completed the "
 "work and reported the outcome."
-msgstr ""
-"Задание было отправлено на компьютер, но компьютер ещё не закончил работу и "
-"не сообщил о результате."
+msgstr "Задание было отправлено на компьютер, но компьютер ещё не закончил работу и не сообщил о результате."
 
 #: ../user/explain_state.php:60
 msgid "A computer completed and reported the task successfully."
@@ -3478,9 +3313,7 @@ msgstr "Компьютер завершил задание и сообщил о
 msgid ""
 "The server wasn't able to send the task to a computer (perhaps because its "
 "resource requirements were too large)"
-msgstr ""
-"Сервер не смог отправить задание на компьютер (возможно, потому что его "
-"требования к ресурсам были слишком большими)"
+msgstr "Сервер не смог отправить задание на компьютер (возможно, потому что его требования к ресурсам были слишком большими)"
 
 #: ../user/explain_state.php:65
 msgid "Client error"
@@ -3494,25 +3327,19 @@ msgstr "Задание было отправлено на компьютер и
 msgid ""
 "The task was sent to a computer and no reply was received within the time "
 "limit."
-msgstr ""
-"Задание было отправлено на компьютер и ответ не был получен за отведённое "
-"время."
+msgstr "Задание было отправлено на компьютер и ответ не был получен за отведённое время."
 
 #: ../user/explain_state.php:72
 msgid ""
-"The task wasn't sent to a computer because enough other tasks were completed "
-"for this workunit."
-msgstr ""
-"Задание не было отправлено на компьютер, так как было завершено достаточное "
-"число других заданий для этой задачи."
+"The task wasn't sent to a computer because enough other tasks were completed"
+" for this workunit."
+msgstr "Задание не было отправлено на компьютер, так как было завершено достаточное число других заданий для этой задачи."
 
 #: ../user/explain_state.php:75
 msgid ""
 "The task was reported but could not be validated, typically because the "
 "output files were lost on the server."
-msgstr ""
-"Было сообщено о завершении задания, но его не удалось проверить, обычно "
-"из-за того что выходные файлы были потеряны на сервере."
+msgstr "Было сообщено о завершении задания, но его не удалось проверить, обычно из-за того что выходные файлы были потеряны на сервере."
 
 #: ../user/explain_state.php:80
 msgid "Client states"
@@ -3520,11 +3347,9 @@ msgstr "Состояния клиента"
 
 #: ../user/explain_state.php:81
 msgid ""
-"A result's <b>client state</b> indicates the stage of processing at which an "
-"error occurred."
-msgstr ""
-"Поле задания <b>состояние клиента</b> показывает стадию обработки, на "
-"которой произошла ошибка."
+"A result's <b>client state</b> indicates the stage of processing at which an"
+" error occurred."
+msgstr "Поле задания <b>состояние клиента</b> показывает стадию обработки, на которой произошла ошибка."
 
 #: ../user/explain_state.php:86
 msgid "The computer has not yet completed the task."
@@ -3554,9 +3379,7 @@ msgstr "Время подтверждения и крайний срок"
 msgid ""
 "A task's <b>Time reported or deadline</b> field depends on whether the task "
 "has been reported yet:"
-msgstr ""
-"Поле задания <b>Время подтверждения или крайний срок</b> зависит от того, "
-"было ли сообщено о завершении задания:"
+msgstr "Поле задания <b>Время подтверждения или крайний срок</b> зависит от того, было ли сообщено о завершении задания:"
 
 #: ../user/explain_state.php:110
 msgid "Already reported"
@@ -3600,41 +3423,35 @@ msgstr "Отправить письмо"
 
 #: ../user/ffmail_action.php:59
 msgid "Use your browser's back button to return to message form"
-msgstr ""
-"Используйте кнопку Назад вашего обозревателя, чтобы вернуться к форме "
-"сообщения"
+msgstr "Используйте кнопку Назад вашего обозревателя, чтобы вернуться к форме сообщения"
 
 #: ../user/ffmail_action.php:63
 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."
-msgstr ""
-"Вы забыли ввести имена и/или адреса электронной почты ваших друзей; "
-"пожалуйста %1вернитесь в форму%2 и введите их."
+"You forgot to enter your friends' names and/or email addresses; Please "
+"%1return to the form%2 and enter them."
+msgstr "Вы забыли ввести имена и/или адреса электронной почты ваших друзей; пожалуйста %1вернитесь в форму%2 и введите их."
 
 #: ../user/ffmail_form.php:30
 msgid ""
 "This project hasn't created an email message - please notify its "
 "administrators"
-msgstr ""
-"Этот проект не создал электронное сообщение - пожалуйста, сообщите об этом "
-"администраторам проекта"
+msgstr "Этот проект не создал электронное сообщение - пожалуйста, сообщите об этом администраторам проекта"
 
 #: ../user/ffmail_form.php:33
 msgid "Tell your friends about %1"
@@ -3649,10 +3466,7 @@ msgid ""
 "Fill in this form with the names and email addresses of people you think "
 "might be interested in %1. We'll send them an email in your name, and you "
 "can add your own message if you like."
-msgstr ""
-"Заполните эту форму именами и адресами электронной почты людей, которые, по "
-"вашему мнению, могут быть заинтересованы в %1. Мы отправим им письмо от "
-"вашего имени, и если Вы пожелаете, Вы можете добавить своё сообщение."
+msgstr "Заполните эту форму именами и адресами электронной почты людей, которые, по вашему мнению, могут быть заинтересованы в %1. Мы отправим им письмо от вашего имени, и если Вы пожелаете, Вы можете добавить своё сообщение."
 
 #: ../user/ffmail_form.php:42
 msgid "Your name:"
@@ -3678,84 +3492,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 только если "
-"он(а) регулярно ведёт себя как тролль."
+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 ""
-"Выберите категорию причины, при необходимости напишите более подробное "
-"описание того, почему пользователь должен быть заблокирован."
+"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 "Вы должны указать действие..."
 
@@ -3763,15 +3566,13 @@ msgstr "Вы должны указать действие..."
 msgid ""
 "You can no longer edit this post.<br/>Posts can only be edited at most %1 "
 "minutes after they have been created."
-msgstr ""
-"Вы больше не можете редактировать это сообщение.<br/>Сообщения могут быть "
-"отредактированы максимум %1 минут после того, как они были созданы."
+msgstr "Вы больше не можете редактировать это сообщение.<br/>Сообщения могут быть отредактированы максимум %1 минут после того, как они были созданы."
 
 #: ../user/forum_edit.php:47
 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 "Форум"
 
@@ -3780,927 +3581,863 @@ 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 "Эта доска сообщений доступна в формате %1ленты RSS%2"
 
-#: ../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, на любом из нескольких "
-"языков. Воспользуйтесь %1горячей линией BOINC%2."
+"Talk live via Skype with a volunteer, in any of several languages. Go to "
+"%1BOINC Online Help%2."
+msgstr "Общайтесь с добровольцами напрямую через Skype, на любом из нескольких языков. Воспользуйтесь %1горячей линией 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 "Тема"
 
-#: ../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 этой доски сообщений."
+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 "1 неделя"
 
-#: ../user/forum_moderate_post.php:84
+#: ../user/forum_moderate_post.php:87
 msgid "2 weeks"
 msgstr "2 недели"
 
-#: ../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 "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 "Дополнительное объяснение %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 ""
-"Выберите категорию причины, или напишите подробное описание, почему Вы "
-"скрываете или блокируете это обсуждение; затем нажмите OK."
+msgstr "Выберите категорию причины, или напишите подробное описание, почему Вы скрываете или блокируете это обсуждение; затем нажмите OK."
 
-#: ../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 ""
-"Только администраторы проекта могут создать здесь обсуждение. Но Вы можете "
-"отвечать в существующих обсуждениях."
+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. Пожалуйста "
-"измените ваш текст и попробуйте ещё раз."
+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 ""
-"Для того, чтобы оценить сообщение, У Вас должно быть больше среднее или "
-"общее количество очков."
+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. Пожалуйста "
-"измените ваш текст и попробуйте ещё раз."
+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 ""
-"У Вас должно быть больше среднее или общее количество очков, чтобы "
-"пожаловаться на это сообщение."
+msgstr "У Вас должно быть больше среднее или общее количество очков, чтобы пожаловаться на это сообщение."
 
-#: ../user/forum_report_post.php:65
+#: ../user/forum_report_post.php:68
 msgid "Report Registered"
 msgstr "Обращение зарегистрировано"
 
-# 92%
-#: ../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 ""
-"Модератор вскоре просмотрит ваше обращение и решит, что делать дальше - это "
-"может занять некоторое время, поэтому запаситесь терпением"
+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 "
+"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 />Вы можете "
-"найти систему оценок в нижней части сообщения."
+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"
+"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Пожалуйста дайте "
-"достаточно информации, чтобы человек,\n"
-"который ещё не читал данное обсуждение, мог быстро обнаружить проблему.%2"
+msgstr "Почему Вы считаете это сообщение оскорбительным: %1Пожалуйста дайте достаточно информации, чтобы человек,\nкоторый ещё не читал данное обсуждение, мог быстро обнаружить проблему.%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 ""
-"Ваше обращение не удалось записать. Пожалуйста подождите немного и "
-"попробуйте ещё раз."
+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 ""
-"Если это не временная ошибка, пожалуйста сообщите о ней разработчикам "
-"проекта."
+"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 "RSS-лента форума %1"
 
-#: ../user/forum_rss.php:42
+#: ../user/forum_rss.php:39
 msgid "This message board is available as an RSS feed."
 msgstr "Эта доска сообщений доступна в формате ленты RSS."
 
-#: ../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 (по умолчанию: все "
-"пользователи)."
+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 "Включить только сообщения за последние %1 дней (по умолчанию: 30)."
 
-#: ../user/forum_rss.php:51
-msgid "Truncate posts: %1 (Include only first 265 characters of each post)"
-msgstr ""
-"Обрезать сообщения: %1 (Включить только первые 265 символов от каждого "
-"сообщения)"
-
-#: ../user/forum_rss.php:53
+#: ../user/forum_rss.php:49
 msgid "Threads only: %1 (Include only the first post of every thread)"
-msgstr ""
-"Только обсуждения: %1 (Включить только первое сообщение каждого обсуждения)"
+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 "1 год"
 
-#: ../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 ""
-"Извините, ничего не найдено соответсвующего вашему поисковому запросу. Вы "
-"можете расширить условия поиска, используя меньше слов (или менее "
-"специфичные слова)."
+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. Вы получите уведомление, как только там появится новое "
-"сообщение."
+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. Пожалуйста, попробуйте ещё "
-"раз немного позднее..."
+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. Вы больше не будете получать уведомления для "
-"этого обсуждения."
+"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. Пожалуйста, попробуйте "
-"ещё раз немного позднее..."
+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 ""
-"Нажмите, чтобы получать уведомления о новых сообщениях в этом обсуждении"
+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 "Разблокировать"
 
-#: ../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 "Заблокировать"
 
-#: ../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 и попросим его/её "
-"подтвердить, что Вы - друзья."
+"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 о Вашем запросе."
+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) Если Вы знаете адрес электронной почты вашей учётной записи, и Вы можете "
-"получить письмо:"
+"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."
-msgstr ""
-"Введите адрес электронной почты ниже и нажмите OK. Вам будут высланы "
-"инструкции для сброса вашего пароля."
+msgstr "Введите адрес электронной почты ниже и нажмите OK. Вам будут высланы инструкции для сброса вашего пароля."
 
 #: ../user/get_passwd.php:46
 msgid ""
 "2) If you forgot your account's email address, or you can't receive email "
 "there:"
-msgstr ""
-"2) Если Вы забыли адрес электронной почты вашей учётной записи, или Вы не "
-"можете получить письмо:"
+msgstr "2) Если Вы забыли адрес электронной почты вашей учётной записи, или Вы не можете получить письмо:"
 
 #: ../user/get_passwd.php:47
 msgid ""
 "If you have run BOINC under this account, you can still access it. Here's "
 "how:"
-msgstr ""
-"Если BOINC запускался под этой вашей учётной записью, Вы можете получить "
-"доступ к ней. Для этого нужно сделать следующее:"
+msgstr "Если BOINC запускался под этой вашей учётной записью, Вы можете получить доступ к ней. Для этого нужно сделать следующее:"
 
 #: ../user/get_passwd.php:50
 msgid ""
 "Go to the BOINC data directory on your computer (its location is written to "
 "the Event Log at startup)."
-msgstr ""
-"Перейдите в каталог данных BOINC на вашем компьютере (его расположение "
-"записывается в журнал событий при запуске)."
+msgstr "Перейдите в каталог данных BOINC на вашем компьютере (его расположение записывается в журнал событий при запуске)."
 
 #: ../user/get_passwd.php:51
 msgid "Find your account file for this project; it will be named <b>%1</b>."
-msgstr ""
-"Найдите там файл учётной записи для этого проекта; он будет называться <b>%"
-"1</b>."
+msgstr "Найдите там файл учётной записи для этого проекта; он будет называться <b>%1</b>."
 
 #: ../user/get_passwd.php:52
 msgid "Open the file in a text editor like Notepad. You'll see something like"
-msgstr ""
-"Откройте этот файл в текстовом редакторе, например в Блокноте. Вы увидите "
-"что-то вроде"
+msgstr "Откройте этот файл в текстовом редакторе, например в Блокноте. Вы увидите что-то вроде"
 
 #: ../user/get_passwd.php:62
-msgid "Select and Copy the string between %1 and %2 (%3 in the above example)."
-msgstr ""
-"Выберите и скопируйте строку между %1 и %2 (%3 в вышеприведённом примере)."
+msgid ""
+"Select and Copy the string between %1 and %2 (%3 in the above example)."
+msgstr "Выберите и скопируйте строку между %1 и %2 (%3 в вышеприведённом примере)."
 
 #: ../user/get_passwd.php:64
 msgid "Paste the string into the field below, and click OK."
@@ -4710,25 +4447,30 @@ msgstr "Вставьте эту строку в расположенное ни
 msgid ""
 "You will now be logged in to your account; update the email and password of "
 "your account."
-msgstr ""
-"Теперь Вы авторизованы; обновите адрес электронной почты и пароль для вашей "
-"учётной записи."
+msgstr "Теперь Вы авторизованы; обновите адрес электронной почты и пароль для вашей учётной записи."
 
 #: ../user/get_passwd.php:71
 msgid "Log in with authenticator"
 msgstr "Авторизоваться с аутентификатором"
 
-#: ../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 "Нет сообщённых ГП-задач"
 
-#: ../user/gpu_list.php:183
+#: ../user/gpu_list.php:206
+msgid "Top GPU models"
+msgstr "Лучшие модели графических ускорителей"
+
+#: ../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 ""
-"Следующие списки показывают наиболее продуктивные модели графических "
-"ускорителей на разных платформах.  Относительные скорости указаны в скобках."
+"platforms.  Relative speeds, measured by average elapsed time of tasks, are "
+"shown in parentheses."
+msgstr "Следующие списки показывают наиболее продуктивные модели графических ускорителей на разных платформах.  Относительные скорости, измеренные по затраченному на задания среднему времени, указаны в скобках."
 
 #: ../user/home.php:42
 msgid "Welcome to %1"
@@ -4736,14 +4478,16 @@ msgstr "Добро пожаловать в %1"
 
 #: ../user/home.php:43
 msgid "View and edit your account preferences using the links below."
-msgstr ""
-"Для просмотра и редактирования настроек Вашей учётной записи используйте "
-"ссылки ниже."
+msgstr "Для просмотра и редактирования настроек вашей учётной записи используйте ссылки ниже."
 
 #: ../user/home.php:46
 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 "анонимная платформа, приложение отсутствует"
@@ -4797,10 +4541,7 @@ msgid ""
 "You can not delete our record of this computer because our database still "
 "contains work for it. You must wait a few days until the work for this "
 "computer has been deleted from the project database."
-msgstr ""
-"Вы не можете удалить запись об этом компьютере, так как в базе всё ещё "
-"содержится для него работа. Вы должны подождать несколько дней, пока работа "
-"для этого компьютера не будет удалена из базы данных проекта."
+msgstr "Вы не можете удалить запись об этом компьютере, так как в базе всё ещё содержится для него работа. Вы должны подождать несколько дней, пока работа для этого компьютера не будет удалена из базы данных проекта."
 
 #: ../user/host_delete.php:40
 msgid "Delete record of computer"
@@ -4824,12 +4565,9 @@ msgstr "Объединение компьютеров"
 
 #: ../user/host_edit_form.php:38
 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 по ошибке назначает различные идентификаторы одному и тому же "
-"компьютеру. Вы можете исправить это объединив старые идентификаторы с самым "
-"новым."
+"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 по ошибке назначает различные идентификаторы одному и тому же компьютеру. Вы можете исправить это объединив старые идентификаторы с самым новым."
 
 #: ../user/host_edit_form.php:56
 msgid "No hosts are eligible for merging with this one."
@@ -4864,10 +4602,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 "Размещение компьютера обновлено"
@@ -4884,9 +4626,7 @@ msgstr "Размещение этого компьютера было устан
 msgid ""
 "This change will take effect the next time the host communicates with this "
 "project."
-msgstr ""
-"Это изменение будет учтено в следующий раз, когда компьютер свяжется с "
-"данным проектом."
+msgstr "Это изменение будет учтено в следующий раз, когда компьютер свяжется с данным проектом."
 
 #: ../user/host_venue_action.php:50
 msgid "Return to host page"
@@ -4943,17 +4683,18 @@ msgstr "предварительное форматирование"
 
 #: ../user/html.php:33
 msgid ""
-"image; height cannot exceed 450 pixels. Please do not link to images without "
-"permission of the web site where the image is hosted."
-msgstr ""
-"изображение; высота не должна превышать 450 пикселей. Пожалуйста, не "
-"публикуйте ссылки на изображения без разрешения вебсайта, где размещено "
-"изображение."
+"image; height cannot exceed 450 pixels. Please do not link to images without"
+" permission of the web site where the image is hosted."
+msgstr "изображение; высота не должна превышать 450 пикселей. Пожалуйста, не публикуйте ссылки на изображения без разрешения вебсайта, где размещено изображение."
 
 #: ../user/html.php:35
 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 только на авторизованных компьютерах"
@@ -4963,34 +4704,24 @@ msgid ""
 "Run %1 only on computers that you own, or for which you have obtained the "
 "owner's permission. Some companies and schools have policies that prohibit "
 "using their computers for projects such as %1."
-msgstr ""
-"Запускайте %1 только на компьютерах, которыми Вы владеете, или для которых "
-"Вы получили права владельца. В некоторых компаниях и школах (ВУЗах) "
-"установлен порядок, по которому запрещается использовать их компьютеры в "
-"таких проектах, как %1."
+msgstr "Запускайте %1 только на компьютерах, которыми Вы владеете, или для которых Вы получили права владельца. В некоторых компаниях и школах (ВУЗах) установлен порядок, по которому запрещается использовать их компьютеры в таких проектах, как %1."
 
 #: ../user/info.php:38
 msgid "How %1 will use your computer"
-msgstr "Как %1 будет использовать Ваш компьютер"
+msgstr "Как %1 будет использовать ваш компьютер"
 
 #: ../user/info.php:39
 msgid ""
 "When you run %1 on your computer, it will use part of the computer's CPU "
 "power, disk space, and network bandwidth. You can control how much of your "
 "resources are used by %1, and when it uses them."
-msgstr ""
-"Когда Вы запускаете %1 на Вашем компьютере, он будет использовать часть "
-"ресурсов процессора, пространство на жестком диске (винчестере), и сетевой "
-"трафик. Вы можете контролировать, сколько ресурсов Вашего компьютера будет "
-"использовано для работы %1, и когда эти ресурсы будут использоваться."
+msgstr "Когда Вы запускаете %1 на Вашем компьютере, он будет использовать часть ресурсов процессора, пространство на жестком диске (винчестере), и сетевой трафик. Вы можете контролировать, сколько ресурсов вашего компьютера будет использовано для работы %1, и когда эти ресурсы будут использоваться."
 
 #: ../user/info.php:40
 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 ""
-"Работа, совершенная Вашим компьютером, содействует решению задач %1, как "
-"описано на web-сайте проекта. Приложения могут меняться время от времени."
+msgstr "Работа, совершённая вашим компьютером, содействует решению задач %1, как описано на web-сайте проекта. Приложения могут меняться время от времени."
 
 #: ../user/info.php:42
 msgid "Privacy policy"
@@ -4998,15 +4729,11 @@ msgstr "Обеспечение конфиденциальности"
 
 #: ../user/info.php:43
 msgid ""
-"Your account on %1 is identified by a name that you choose. This name may be "
-"shown on the %1 web site, along with a summary of the work your computer has "
-"done for %1. If you want to be anonymous, choose a name that doesn't reveal "
-"your identity."
-msgstr ""
-"Ваша учётная запись на %1 идентифицируется по имени, которое Вы указали. Это "
-"имя может быть показано на web-сайте %1, наряду со сводкой работы вашего "
-"компьютера, сделанной для %1. Если Вы хотите остаться неизвестным, выберите "
-"имя, которое не соответствует вашему настоящему имени."
+"Your account on %1 is identified by a name that you choose. This name may be"
+" shown on the %1 web site, along with a summary of the work your computer "
+"has done for %1. If you want to be anonymous, choose a name that doesn't "
+"reveal your identity."
+msgstr "Ваша учётная запись на %1 идентифицируется по имени, которое Вы указали. Это имя может быть показано на web-сайте %1, наряду со сводкой работы вашего компьютера, сделанной для %1. Если Вы хотите остаться неизвестным, выберите имя, которое не соответствует вашему настоящему имени."
 
 #: ../user/info.php:44
 msgid ""
@@ -5015,24 +4742,14 @@ 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 ""
-"Если Вы принимаете участие в %1, информация о Вашем компьютере (такая как "
-"тип процессора, объем оперативной памяти, и т.д.) будет записана проектом %1 "
-"и использована для принятия решения о том, какой тип работы назначить "
-"Вашему компьютеру. Эта информация также будет показана на web-сайте %1. "
-"Ничего, что указывало бы на местонахождение Вашего компьютера (например, его "
-"доменное или сетевое имя), не будет показываться."
+msgstr "Если Вы принимаете участие в %1, информация о вашем компьютере (такая как тип процессора, объем оперативной памяти, и т.д.) будет записана проектом %1 и использована для принятия решения о том, какой тип работы назначить вашему компьютеру. Эта информация также будет показана на web-сайте %1. Ничего, что указывало бы на местонахождение вашего компьютера (например, его доменное или сетевое имя), не будет показываться."
 
 #: ../user/info.php:45
 msgid ""
-"To participate in %1, you must give an address where you receive email. This "
-"address will not be shown on the %1 web site or shared with organizations. %"
-"1 may send you periodic newsletters; however, you can opt out at any time."
-msgstr ""
-"Чтобы принять участие в %1, Вы должны указать Ваш адрес электронной почты. "
-"Этот адрес не будет показан на web-сайте %1 или доступен другим "
-"организациям. %1 может посылать Вам периодические новостные письма; тем не "
-"менее, Вы можете отказаться от них в любое время."
+"To participate in %1, you must give an address where you receive email. This"
+" address will not be shown on the %1 web site or shared with organizations. "
+"%1 may send you periodic newsletters; however, you can opt out at any time."
+msgstr "Чтобы принять участие в %1, Вы должны указать ваш адрес электронной почты. Этот адрес не будет показан на web-сайте %1 или доступен другим организациям. %1 может посылать Вам периодические новостные письма; тем не менее, Вы можете отказаться от них в любое время."
 
 #: ../user/info.php:46
 msgid ""
@@ -5041,26 +4758,15 @@ 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 ""
-"Личные сообщения, отправляемые на веб-сайте %1, видимы только отправителю и "
-"получателю. %1 не просматривает и не контролирует содержимое личных "
-"сообщений.  Если Вы получаете нежелательные личные сообщения от некоторых "
-"пользователей %1, Вы можете добавить их в ваш %2фильтр сообщений%3.  В этом "
-"случае Вы не увидите ни одного общего или личного сообщения от таких "
-"пользователей."
+msgstr "Личные сообщения, отправляемые на веб-сайте %1, видимы только отправителю и получателю. %1 не просматривает и не контролирует содержимое личных сообщений.  Если Вы получаете нежелательные личные сообщения от некоторых пользователей %1, Вы можете добавить их в ваш %2фильтр сообщений%3.  В этом случае Вы не увидите ни одного общего или личного сообщения от таких пользователей."
 
 #: ../user/info.php:47
 msgid ""
 "If you use our web site forums you must follow the %2posting guidelines%3.  "
 "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 ""
-"Если Вы используете форумы нашего веб-сайта, Вы должны следовать %2данным "
-"рекомендациям%3. Сообщения, публикуемые на форумах %1, видны каждому, в том "
-"числе лицам, не являющимся участниками проекта.  Публикуя сообщения на "
-"форумах, Вы предоставляете каждому безотзывную лицензию на просмотр и "
-"копирование ваших сообщений."
+"members.  By posting to the forums, you are granting irrevocable license for"
+" anyone to view and copy your posts."
+msgstr "Если Вы используете форумы нашего веб-сайта, Вы должны следовать %2данным рекомендациям%3. Сообщения, публикуемые на форумах %1, видны каждому, в том числе лицам, не являющимся участниками проекта.  Публикуя сообщения на форумах, Вы предоставляете каждому безотзывную лицензию на просмотр и копирование ваших сообщений."
 
 #: ../user/info.php:48
 msgid "Is it safe to run %1?"
@@ -5070,35 +4776,23 @@ msgstr "Безопасно ли запускать %1?"
 msgid ""
 "Any time you download a program through the Internet you are taking a "
 "chance: the program might have dangerous errors, or the download server "
-"might have been hacked. %1 has made efforts to minimize these risks. We have "
-"tested our applications carefully. Our servers are behind a firewall and 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 ""
-"Каждый раз при загрузке программы через Интернет может случиться следующее: "
-"программа может иметь опасные ошибки, или сервер может быть взломан. %1 "
-"предпринял усилия для минимизации этих рисков. Мы тщательно оттестировали "
-"наши приложения. Наши сервера защищены сетевым экраном и настроены на "
-"высокую безопасность. Чтобы удостовериться в целостности загружаемых "
-"программ, все исполняемые файлы подписаны цифровой подписью на защищенном "
-"компьютере, не подключенном к сети Интернет."
+"might have been hacked. %1 has made efforts to minimize these risks. We have"
+" tested our applications carefully. Our servers are behind a firewall and "
+"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 "Каждый раз при загрузке программы через Интернет может случиться следующее: программа может иметь опасные ошибки, или сервер может быть взломан. %1 предпринял усилия для минимизации этих рисков. Мы тщательно оттестировали наши приложения. Наши сервера защищены сетевым экраном и настроены на высокую безопасность. Чтобы удостовериться в целостности загружаемых программ, все исполняемые файлы подписаны цифровой подписью на защищенном компьютере, не подключенном к сети Интернет."
 
 #: ../user/info.php:50
 msgid ""
 "The applications run by %1 may cause some computers to overheat. If this "
 "happens, stop running %1 or use a %2utility program%3 that limits CPU usage."
-msgstr ""
-"Приложения, запускаемые проектом %1, могут послужить причиной перегрева "
-"некоторых компьютеров. Если это случилось, остановите выполнение %1 или "
-"используйте %2утилиты%3, которые ограничят использование процессора."
+msgstr "Приложения, запускаемые проектом %1, могут послужить причиной перегрева некоторых компьютеров. Если это случилось, остановите выполнение %1 или используйте %2утилиты%3, которые ограничат использование процессора."
 
 #: ../user/info.php:51
 msgid ""
 "%1 was developed by %2. BOINC was developed at the University of California."
-msgstr ""
-"%1 был разработан %2. BOINC был разработан в Университете Калифорнии (the "
-"University of California)."
+msgstr "%1 был разработан %2. BOINC был разработан в Университете Калифорнии (the University of California)."
 
 #: ../user/info.php:53
 msgid "Liability"
@@ -5107,12 +4801,9 @@ msgstr "Ответственность"
 #: ../user/info.php:54
 msgid ""
 "%1 and %2 assume no liability for damage to your computer, loss of data, or "
-"any other event or condition that may occur as a result of participating in %"
-"1."
-msgstr ""
-"%1 и %2 не берут на себя ответственность за ущерб, нанесенный Вашему "
-"компьютеру, потерю данных, или любое другое событие или инцидент, который "
-"может произойти как результат участия в %1."
+"any other event or condition that may occur as a result of participating in "
+"%1."
+msgstr "%1 и %2 не берут на себя ответственность за ущерб, нанесенный вашему компьютеру, потерю данных, или любое другое событие или инцидент, который может произойти как результат участия в %1."
 
 #: ../user/info.php:56
 msgid "Other BOINC projects"
@@ -5120,23 +4811,17 @@ msgstr "Другие BOINC-проекты"
 
 #: ../user/info.php:57
 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 "
+"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 ""
-"Другие проекты используют ту же платформу - BOINC - что и %1. Вы можете "
-"захотеть принять участие в одном или нескольких из этих проектов. Если Вы "
-"присоединитесь к нескольким проектам, Ваш компьютер будет выполнять полезную "
-"работу, даже когда у %1 не будет заданий, доступных для обработки."
+msgstr "Другие проекты используют ту же платформу - BOINC - что и %1. Вы можете захотеть принять участие в одном или нескольких из этих проектов. Если Вы присоединитесь к нескольким проектам, ваш компьютер будет выполнять полезную работу, даже когда у %1 не будет заданий, доступных для обработки."
 
 #: ../user/info.php:58
 msgid ""
 "These other projects are not associated with %1, and we cannot vouch for "
 "their security practices or the nature of their research. Join them at your "
 "own risk."
-msgstr ""
-"Другие проекты не связаны с %1, и мы не можем поручиться за их безопасность "
-"или природу их исследований. Присоединяйтесь к ним на свой страх и риск."
+msgstr "Другие проекты не связаны с %1, и мы не можем поручиться за их безопасность или природу их исследований. Присоединяйтесь к ним на свой страх и риск."
 
 #: ../user/language_select.php:47
 msgid "Language selection"
@@ -5146,17 +4831,13 @@ msgstr "Выбор языка"
 msgid ""
 "This web site is available in several languages. The currently selected "
 "language is %1."
-msgstr ""
-"Этот веб-сайт доступен на нескольких языках. В настоящее время выбран язык: "
-"%1."
+msgstr "Этот веб-сайт доступен на нескольких языках. В настоящее время выбран язык: %1."
 
 #: ../user/language_select.php:78
 msgid ""
 "Normally the choice of language is determined by your browser's language "
 "setting, which is: %1.  You can change this setting using:"
-msgstr ""
-"Обычно выбор языка определяется языковыми настройками вашего браузера, а "
-"именно: %1.  Вы можете поменять эту настройку, используя:"
+msgstr "Обычно выбор языка определяется языковыми настройками вашего браузера, а именно: %1.  Вы можете поменять эту настройку, используя:"
 
 #: ../user/language_select.php:83
 msgid "Firefox: Tools/Options/General"
@@ -5164,57 +4845,30 @@ msgstr "Firefox: Сервис/Настройки/Общие (Tools/Options/Gener
 
 #: ../user/language_select.php:85
 msgid "Microsoft IE: Tools/Internet Options/Languages"
-msgstr ""
-"Microsoft IE: Сервис/Свойства обозревателя/Языки (Tools/Internet "
-"Options/Languages)"
+msgstr "Microsoft IE: Сервис/Свойства обозревателя/Языки (Tools/Internet Options/Languages)"
 
 #: ../user/language_select.php:89
 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 ""
-"Или Вы можете выбрать язык, нажав на одну из ссылок.  Вашему браузеру будет "
-"отправлен файл 'cookie'; убедитесь, что ваш браузер принимает файлы 'cookie' "
-"нашего домена."
-
-#: ../user/language_select.php:95
-msgid "Language name (click to select)"
-msgstr "Название языка (нажмите для выбора)"
-
-#: ../user/language_select.php:97
-msgid "Use browser language setting"
-msgstr "Использовать языковые настройки обозревателя"
-
-#: ../user/language_select.php:113
-msgid ""
-"Translations are done by volunteers.  If your native language is not here, %"
-"1you can provide a translation%2."
-msgstr ""
-"Переводы сделаны добровольцами.  Если Ваш родной язык здесь отсутствует, %"
-"1Вы можете обеспечить перевод%2."
-
-#: ../user/login_form.php:45
-msgid "Email address:"
-msgstr "Адрес email:"
-
-#: ../user/login_form.php:45
-msgid "forgot email address?"
-msgstr "забыли адрес email?"
+msgstr "Или Вы можете выбрать язык, нажав на одну из ссылок.  Вашему браузеру будет отправлен файл 'cookie'; убедитесь, что ваш браузер принимает файлы 'cookie' нашего домена."
 
-#: ../user/login_form.php:48
-msgid "Password:"
-msgstr "Пароль:"
+#: ../user/language_select.php:95
+msgid "Language name (click to select)"
+msgstr "Название языка (нажмите для выбора)"
 
-#: ../user/login_form.php:48
-msgid "forgot password?"
-msgstr "забыли пароль?"
+#: ../user/language_select.php:97
+msgid "Use browser language setting"
+msgstr "Использовать языковые настройки обозревателя"
 
-#: ../user/login_form.php:51
-msgid "Stay logged in"
-msgstr "Оставаться авторизованным"
+#: ../user/language_select.php:113
+msgid ""
+"Translations are done by volunteers.  If your native language is not here, "
+"%1you can provide a translation%2."
+msgstr "Переводы сделаны добровольцами.  Если ваш родной язык здесь отсутствует, %1Вы можете обеспечить перевод%2."
 
-#: ../user/login_form.php:62
+#: ../user/login_form.php:57
 msgid "or %1create an account%2."
 msgstr "или %1создать учётную запись%2."
 
@@ -5238,13 +4892,7 @@ msgid ""
 "        having that name with the newest computer having that name.\n"
 "        Incompatible computers will not be merged.\n"
 "        <p>"
-msgstr ""
-"Данная операция объединяет компьютеры на основе их доменных имен.\n"
-"<p>\n"
-"Эта операция для каждого доменного имени объединит все старые компьютеры\n"
-"с таким именем с самым новым компьютером с таким же именем.\n"
-"Несовместимые компьютеры не будут объединены.\n"
-"<p>"
+msgstr "Данная операция объединяет компьютеры на основе их доменных имен.\n<p>\nЭта операция для каждого доменного имени объединит все старые компьютеры\nс таким именем с самым новым компьютером с таким же именем.\nНесовместимые компьютеры не будут объединены.\n<p>"
 
 #: ../user/merge_by_name.php:82
 msgid "Go ahead and do this"
@@ -5260,11 +4908,7 @@ msgid ""
 "To maximize discussion and flow of information,\n"
 "our message boards are moderated.\n"
 "Message board postings are subject to the following posting rules:\n"
-msgstr ""
-"\n"
-"Для максимизации обсуждения и обмена информацией,\n"
-"наши доски сообщений модерируются.\n"
-"Сообщения доски сообщений подлежат следующим правилам размещения:\n"
+msgstr "\nДля максимизации обсуждения и обмена информацией,\nнаши доски сообщений модерируются.\nСообщения доски сообщений подлежат следующим правилам размещения:\n"
 
 #: ../user/moderation.php:30
 msgid ""
@@ -5273,8 +4917,7 @@ msgid ""
 "Moderators may delete posts that violate any of these rules.\n"
 "The authors of deleted posts will be notified via email.\n"
 "Gross offenders may have their ability to post messages temporarily revoked\n"
-"(though to prevent abuse only project administrators have the ability to do "
-"so).\n"
+"(though to prevent abuse only project administrators have the ability to do so).\n"
 "Additional kinds of bad behavior (\"bugging\" posts to trap the\n"
 "IP addresses of other participants, excessive thread creation to spam\n"
 "the forums, etc.), while not listed in the formal rules, may still\n"
@@ -5303,44 +4946,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>\n"
-"Модераторы могут удалять сообщения, которые нарушают любые из этих правил.\n"
-"Авторы удалённых сообщений будут уведомлены по электронной почте.\n"
-"У серьёзных нарушителей может быть временно отменена возможность размещать "
-"сообщения\n"
-"(хотя для предотвращения злоупотреблений только администраторы проекта имеют "
-"возможность сделать это).\n"
-"Дополнительные виды плохого поведения ('взлом' сообщений для перехвата\n"
-"IP-адресов других участников, чрезмерное создание спам-обсуждений\n"
-"на форумах, и т.д.), хоть и не перечислены в формальных правилах,\n"
-"тем не менее могут привести к аналогичным мерам наказания.\n"
-"<p>\n"
-"Если Вы думаете, что сообщение нарушает какие-либо правила,\n"
-"нажмите красный крестик под сообщением и заполните форму;\n"
-"модераторы будут уведомлены о вашей жалобе.\n"
-"Пожалуйста, используйте эту кнопку только для явных\n"
-"нарушений - не для личных споров.\n"
-"<p>\n"
-"При модерации мы стараемся быть справедливыми, насколько это возможно,\n"
-"но в большом сообществе пользователей, с множеством различных точек зрения,\n"
-"всегда будут некоторые люди, которые будут недовольны нашими методами "
-"модерирования.\n"
-"Хоть мы и сожалеем, что это происходит,\n"
-"нужно понимать, что мы не можем удовлетворить всех людей во все времена\n"
-"и вынуждены принимать решения, основываясь на наших ресурсах и\n"
-"что лучше для форума в целом.\n"
-"Пожалуйста, не надо обсуждать нашу политику модерации на форумах.\n"
-"Мы - не социально-инженерный проект, и мы не создаем совершенно\n"
-"справедливую систему. Поэтому такие дискуссии, скорее всего, будут\n"
-"контрпродуктивными и потенциально опасными. Если у вас есть законное "
-"требование,\n"
-"отправьте электронное письмо по адресу, указанному ниже.\n"
-"<p>\n"
-"Эта политика модерирования установлена в рамках проекта %1.\n"
-"Если у Вас есть комментарии к этой политике, отправьте письмо на адрес %2.\n"
-"\n"
+msgstr "\n<p>\nМодераторы могут удалять сообщения, которые нарушают любые из этих правил.\nАвторы удалённых сообщений будут уведомлены по электронной почте.\nУ серьёзных нарушителей может быть временно отменена возможность размещать сообщения\n(хотя для предотвращения злоупотреблений только администраторы проекта имеют возможность сделать это).\nДополнительные виды плохого поведения ('взлом' сообщений для перехвата\nIP-адресов других участников, чрезмерное создание спам-обсуждений\nна фо [...]
 
 #: ../user/pending.php:66
 msgid "Pending credit"
@@ -5386,271 +4992,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 ""
-"Ваше сообщение было помечено как спам\n"
-"антиспам-системой Akismet.\n"
-"Пожалуйста измените ваш текст и попробуйте ещё раз."
+msgstr "Ваше сообщение было помечено как спам\nантиспам-системой 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 "
-"пользователя"
+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) не принимает Ваши личные сообщения."
+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 "
-"отправлять Вам личные сообщения?"
+msgstr "Вы действительно уверены, что хотите заблокировать пользователя %1 отправлять Вам личные сообщения?"
 
-#: ../user/pm.php:244
+#: ../user/pm.php:249
 msgid "Please note that you can only block a limited amount of users."
-msgstr ""
-"Пожалуйста отметьте, что Вы можете заблокировать только ограниченное "
-"количество пользователей."
+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 ""
-"Как только пользователь был заблокирован, Вы можете разблокировать его "
-"используя страницу настроек форума."
+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"
-"          будут задействованы, когда ваш компьютер свяжется с %1,\n"
-"          или Вы выполните команду %2Обновить%3 из Менеджера BOINC."
+msgstr "Ваши настройки обновлены и\n          будут задействованы, когда ваш компьютер свяжется с %1,\n          или Вы выполните команду %2Обновить%3 из Менеджера 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 ""
-"Ваши настройки были сброшены к значениям по умолчанию, и\n"
-"          будут задействованы, когда ваш компьютер свяжется с %1,\n"
-"          или Вы выполните команду %2Обновить%3 из Менеджера BOINC."
+msgstr "Ваши настройки были сброшены к значениям по умолчанию, и\n          будут задействованы, когда ваш компьютер свяжется с %1,\n          или Вы выполните команду %2Обновить%3 из Менеджера 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 для конфигурации %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?"
+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."
+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 ""
-"Исследуйте разнообразие ваших единомышленников-добровольцев, и представьте "
-"вашу собственную точку зрения другим."
+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, чтобы другие смогли его увидеть!"
+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."
+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 "Нет профилей, соответствующих Вашему запросу."
+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'"
 
@@ -5678,149 +5261,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: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:125
+msgid "Database schema version: "
+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 "текущая скорость (гигафлопс)"
-
-#: ../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"
@@ -5830,762 +5325,700 @@ 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 "Модели графических ускорителей"
+
+#: ../user/stats.php:49
+msgid "CPU models"
+msgstr "Модели ЦП"
+
+#: ../user/stats.php:53
 msgid ""
-"More detailed statistics for %1 and other BOINC-based projects are available "
-"at several web sites:"
-msgstr ""
-"Более детальная статистика %1 и других BOINC-проектов доступна на нескольких "
-"вебсайтах:"
+"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 ""
-"Вы также можете получить вашу текущую статистику в виде \"изображения для "
-"подписи\":"
+"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 ""
-"Дополнительно Вы можете получить вашу индивидуальную суммарную статистику по "
-"всем проектам BOINC с нескольких вебсайтов; см. вашу %1домашнюю страницу%2."
+msgstr "Дополнительно Вы можете получить вашу индивидуальную суммарную статистику по всем проектам BOINC с нескольких вебсайтов; см. вашу %1домашнюю страницу%2."
 
 #: ../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 ""
-"Вы можете состоять только в одной команде. Вы можете присоединиться или "
-"покинуть команду в любое время."
+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."
+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."
+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 ""
-"Вы можете выбрать участников команды в качестве 'Администраторов команды'. "
-"Администраторы команды могут:"
+msgstr "Вы можете выбрать участников команды в качестве 'Администраторов команды'. Администраторы команды могут:"
 
-#: ../user/team_admins.php:43
+#: ../user/team_admins.php:45
 msgid "Edit team information (name, URL, description, country)"
 msgstr "Редактировать информацию о команде (название, URL, описание, страна)"
 
-#: ../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 ""
-"Модерировать форум команды, если есть (администраторы получают уведомления "
-"по электронной почте о событиях модерации и о красных X-сообщениях)"
+"Moderate the team forum, if any (admins get email notification of moderation"
+" events and red X reports)"
+msgstr "Модерировать форум команды, если есть (администраторы получают уведомления по электронной почте о событиях модерации и о красных X-сообщениях)"
 
-#: ../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 ""
-"Если Администратор команды покидает команду, он перестает быть "
-"Администратором."
+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 ""
-"Мы рекомендуем Вам выбирать в качестве Администраторов команды только людей, "
-"которых Вы знаете и которым доверяете."
+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 "Адрес email участника команды:"
 
-#: ../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, но "
-"покинул команду, таким образом отменив запрос."
+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 запросил полномочия основателя этой команды. Это, "
-"возможно, произошло из-за того, что Вы покинули команду или не "
-"контактировали с командой в течение долгого времени."
+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, используя форму ниже."
+"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> "
-"внизу."
+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 перед "
-"созданием новой."
+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 "Список email-адресов команды %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 ""
-"Вы уверены, что Вы хотите удалить доску сообщений вашей команды? Все "
-"обсуждения и сообщения будут безвозвратно удалены. (Вы сможете, однако, "
-"позже создать новую доску сообщений)."
+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."
+"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 ""
-"Вы должны быть участником команды, чтобы получить доступ к этой странице."
+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 дней, у Вас "
-"будет возможность стать новым основателем."
+"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, чтобы воспользоваться возможностями Администратора "
-"команды."
+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 ""
-"Вы должны быть участником команды, чтобы получить доступ к этой странице."
+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 дней прошли с момента подачи вашего запроса, а основатель так и не "
-"ответил. Вы можете теперь принять полномочия основателя, щёлкнув здесь:"
+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, у Вас будет возможность стать основателем."
+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"
+"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
+msgstr "Если основатель команды не активен, а Вы хотите принять роль основателя, нажмите на кнопку ниже. Текущему основателю будет отправлено электронное письмо с подробной информацией о вашем запросе, и у него будет возможность передать Вам полномочия основателя или отклонить ваш запрос. Если основатель не ответит в течение 60 дней, у Вас будет возможность стать основателем.<br /><br />\n                        Вы уверены, что хотите запросить полномочия основателя?"
+
+#: ../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 "%2 пользователем %1 уже была запрошена смена основателя."
 
-#: ../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 дней, поэтому новые "
-"запросы не разрешены. Пожалуйста, попробуйте ещё раз позже."
+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 ""
-"Не удалось присоединиться к команде - пожалуйста, попробуйте ещё раз позже."
+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 ""
-"Присоединение к команде дает доступ её основателю к вашему адресу "
-"электронной почты."
+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 "
-"команд."
+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."
+"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 "Изменение названия команды, URL, описания, типа или страны"
 
-#: ../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 "Просмотр имён участников и email-адресов"
 
-#: ../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 сможет принять полномочия основателя "
-"этой команды."
+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
-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 (текущих и будущих), Вы "
-"можете превратить ее в %1 глобальную команду BOINC%2."
-
 #: ../user/team_manage.php:73
 msgid ""
-"Team admins are encouraged to join and participate in the Google %1boinc-"
-"team-founders%2 group."
-msgstr ""
-"Администраторы команды приглашаются присоединиться и участвовать в группе "
-"Google %1boinc-team-founders%2."
+"To have this team created on all BOINC projects (current and future) you can"
+" make it into a %1BOINC-wide team%2."
+msgstr "Чтобы создать эту команду во всех проектах BOINC (текущих и будущих), Вы можете превратить ее в %1 глобальную команду BOINC%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."
+"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:91
 msgid "Can't delete non-empty team"
@@ -6595,130 +6028,114 @@ 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"
-"         <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"
+"         <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>"
 
-#: ../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 ""
-"Не найдено команд, удовлетворяющих вашим критериям. Попробуйте другой поиск."
+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."
+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 ""
-"Вы можете объединиться в команду с другими людьми с похожими интересами, или "
-"из одной страны, компании, или школы."
+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 элементов"
 
@@ -6726,11 +6143,11 @@ msgstr "Предел превышен - Извините, только перв
 msgid "Top hosts"
 msgstr "Лучшие компьютеры"
 
-#: ../user/top_teams.php:105
+#: ../user/top_teams.php:107
 msgid "Top %1 teams"
 msgstr "Лучшие команды типа %1"
 
-#: ../user/top_teams.php:108
+#: ../user/top_teams.php:110
 msgid "There are no %1 teams"
 msgstr "Нет команд типа %1"
 
@@ -6738,11 +6155,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"
 
@@ -6786,19 +6203,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 "искомая строка должна быть минимум 3 символа"
 
-#: ../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 "Нет пользователей, удовлетворяющих вашим критериям поиска."
 
@@ -6834,9 +6251,7 @@ msgstr "Проверка адреса электронной почты BOINC"
 msgid ""
 "Please visit the following link to validate the email address of your %1 "
 "account:"
-msgstr ""
-"Пожалуйста посетите следующую ссылку, чтобы подтвердить адрес электронной "
-"почты вашей учётной записи в %1:"
+msgstr "Пожалуйста посетите следующую ссылку, чтобы подтвердить адрес электронной почты вашей учётной записи в %1:"
 
 #: ../user/validate_email_addr.php:34
 msgid "Validate email sent"
@@ -6846,9 +6261,7 @@ msgstr "Письмо для проверки отправлено"
 msgid ""
 "An email has been sent to %1. Visit the link it contains to validate your "
 "email address."
-msgstr ""
-"Электронное письмо отправлено на адрес %1. Посетите ссылку, которую оно "
-"содержит, чтобы подтвердить ваш адрес электронной почты."
+msgstr "Электронное письмо отправлено на адрес %1. Посетите ссылку, которую оно содержит, чтобы подтвердить ваш адрес электронной почты."
 
 #: ../user/validate_email_addr.php:44
 msgid "No such user."
@@ -6860,8 +6273,7 @@ msgstr "Ошибка в данных URL - не удалось проверит
 
 #: ../user/validate_email_addr.php:54
 msgid "Database update failed - please try again later."
-msgstr ""
-"Неудача при обновлении базы данных - пожалуйста, попробуйте ещё раз позже."
+msgstr "Неудача при обновлении базы данных - пожалуйста, попробуйте ещё раз позже."
 
 #: ../user/validate_email_addr.php:57
 msgid "Validate email address"
@@ -6871,29 +6283,24 @@ 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 "Данные учётной записи"
 
 #: ../user/weak_auth.php:52
 msgid ""
-"You can access your account either by using your email address and "
-"password,\n"
+"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 ""
-"Вы можете получить доступ к вашей учётной записи либо с использованием "
-"адреса электронной почты и пароля,\n"
-"    либо используя назначенный 'ключ учётной записи'.\n"
-"    Ваш ключ учётной записи:"
+msgstr "Вы можете получить доступ к вашей учётной записи либо с использованием адреса электронной почты и пароля,\n    либо используя назначенный 'ключ учётной записи'.\n    Ваш ключ учётной записи:"
 
 #: ../user/weak_auth.php:57
 msgid "This key can be used to:"
@@ -6909,12 +6316,7 @@ 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,\n"
-"       создать файл с именем %1 в каталоге данных BOINC,\n"
-"       и установить его содержимое следующим образом:"
+msgstr "подключения компьютера к вашей учётной записи без использования Менеджера BOINC.\n       Для этого необходимо установить BOINC,\n       создать файл с именем %1 в каталоге данных BOINC,\n       и установить его содержимое следующим образом:"
 
 #: ../user/weak_auth.php:73
 msgid "Weak account key"
@@ -6923,28 +6325,17 @@ msgstr "Слабый ключ учётной записи"
 #: ../user/weak_auth.php:74
 msgid ""
 "Your 'weak account key' can be used to attach computers to your account\n"
-"    as described above, but cannot be used to log in to your account or "
-"change it in any way.\n"
+"    as described above, but cannot be used to log in to your account or change it in any way.\n"
 "    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"
-"    Если вы хотите подключить ненадежные или небезопасные компьютеры к вашей "
-"учётной записи,\n"
-"    сделайте это, используя ваш слабый ключ учётной записи.\n"
-"    Ваш слабый ключ учётной записи:"
+msgstr "Ваш 'слабый ключ учётной записи' может быть использован для подключения компьютеров к вашей учётной записи,\n    как описано выше, но он не может использоваться для входа в учётную запись или её изменения каким-либо образом.\n    Если вы хотите подключить ненадежные или небезопасные компьютеры к вашей учётной записи,\n    сделайте это, используя ваш слабый ключ учётной записи.\n    Ваш слабый ключ учётной записи:"
 
 #: ../user/weak_auth.php:81
 msgid ""
 "If you change your password, your weak account key changes, and your "
 "previous weak account key becomes invalid."
-msgstr ""
-"Если Вы измените ваш пароль, ваш слабый ключ учётной записи изменится, а "
-"предыдущий слабый ключ учётной записи станет недействительным."
+msgstr "Если Вы измените ваш пароль, ваш слабый ключ учётной записи изменится, а предыдущий слабый ключ учётной записи станет недействительным."
 
 #: ../user/workunit.php:32
 msgid "can't find workunit"
@@ -6954,6 +6345,10 @@ msgstr "не удалось найти задачу"
 msgid "Workunit %1"
 msgstr "Задача %1"
 
+#: ../user/workunit.php:40
+msgid "application"
+msgstr "приложение"
+
 #: ../user/workunit.php:43
 msgid "canonical result"
 msgstr "канонический результат"
@@ -6963,6 +6358,10 @@ msgid "granted credit"
 msgstr "предоставлено очков"
 
 #: ../user/workunit.php:55
+msgid "Tasks in progress"
+msgstr "Задания обрабатываются"
+
+#: ../user/workunit.php:55
 msgid "suppressed pending completion"
 msgstr "скрыто в ожидании завершения"
 
@@ -6990,251 +6389,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 ""
-"Расскажите нам о себе. Вы можете рассказать нам о том, откуда Вы, о своем "
-"возрасте, образовании, увлечениях, или ещё о чём-нибудь."
+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 "Максимальная загрузка ЦП (%) для графики%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 ""
-"Если для выбранных приложений нет никакой работы, принимать работу для "
-"других приложений?"
+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 "(все приложения)"
-
-#~ msgid "Use Intel GPU %1 Enforced by version 7.0+ %2"
-#~ msgstr "Использовать ГП Intel %1 начиная с версии 7.0+ %2"
-
-#~ msgid "Error:"
-#~ msgstr "Ошибка:"
-
-#~ msgid "Account creation is disabled"
-#~ msgstr "Создание учётной записи запрещено"
-
-#~ msgid ""
-#~ "Sorry, this project has disabled the creation of new accounts.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Извините, но этот проект запретил создание новых учётных записей.\n"
-#~ "Пожалуйста попробуйте ещё раз позже."
-
-#~ msgid "Account creation is currently disabled. Please try again later."
-#~ msgstr ""
-#~ "Создание учётной записи в данный момент запрещено. Пожалуйста, попробуйте "
-#~ "ещё раз немного позднее."
-
-#~ msgid ""
-#~ "This project hasn\\'t created an email message - please notify its "
-#~ "administrators"
-#~ msgstr ""
-#~ "Этот проект не создал электронное письмо - пожалуйста, сообщите об этом "
-#~ "администраторам"
-
-#~ msgid "nvidia GPU"
-#~ msgstr "ГП NVIDIA"
-
-#~ msgid ""
-#~ "These apply to all BOINC projects in which you participate.<br>\n"
-#~ "             On computers participating in multiple projects, the most "
-#~ "recently modified preferences will be used."
-#~ msgstr ""
-#~ "Они относятся ко всем проектам BOINC, в которых Вы участвуете.<br>\n"
-#~ "На компьютерах, участвующих в нескольких проектах, будут использоваться "
-#~ "настройки, изменённые самыми последними."
-
-#~ msgid "Export this news item as a Notice"
-#~ msgstr "Экспортировать эту новость как уведомление"
-
-#~ msgid ""
-#~ "Go to the BOINC data directory on your computer (on Windows this is usually "
-#~ "<b>C:\\Documents and Settings\\All Users\\Application Data\\BOINC</b> or "
-#~ "<b>C:\\Program Files\\BOINC</b>."
-#~ msgstr ""
-#~ "Перейдите в каталог данных BOINC на вашем компьютере (в Windows это обычно "
-#~ "<b>C:\\Documents and Settings\\All Users\\Application Data\\BOINC</b> или "
-#~ "<b>C:\\Program Files\\BOINC</b>)."
-
-#~ msgid "No such task"
-#~ msgstr "Нет такого задания"
-
-#~ msgid ""
-#~ "Computer is connected to the Internet about every %1 Leave blank or 0 if "
-#~ "always connected. %2 BOINC will try to maintain at least this much work (max "
-#~ "10 days). %3"
-#~ msgstr ""
-#~ "Компьютер подключен к Интернету примерно каждые %1 Оставить пустым или 0 "
-#~ "если всегда подключен. %2 BOINC будет пытаться поддерживать по крайней мере "
-#~ "такой объем работы (макс. 10 дней). %3"
-
-#~ msgid "Maintain enough work for an additional"
-#~ msgstr "Поддерживать достаточный объем работы для дополнительных"
-
-#~ msgid "Update failed: "
-#~ msgstr "Неудача при обновлении: "
-
-#~ msgid "Provides %1limited access%2 to your account"
-#~ msgstr "Предоставляет %1ограниченный доступ%2 к Вашей учетной записи"
-
-#~ msgid ""
-#~ "Don't use this form. Just run BOINC, select Add Project, and enter an email "
-#~ "address and password."
-#~ msgstr ""
-#~ "Не используйте эту форму. Просто запустите BOINC, выберите 'Добавить "
-#~ "проект', и введите адрес электронной почты и пароль."
-
-#~ msgid "Do not reorder sticky posts"
-#~ msgstr "Не переупорядочевать закреплённые сообщения"
-
-#~ msgid "If a thread contains more than this number of posts"
-#~ msgstr "Если обсуждение содержит более чем данное количество сообщений"
-
-#~ msgid "only display the first one and this many of the last ones"
-#~ msgstr "показать только первое и данное количество последних сообщений"
-
-#~ msgid "Your report has been recorded. Thanks you for your input."
-#~ msgstr "Ваше обращение было записано. Спасибо за вашу помощь."
-
-#~ msgid "Search type"
-#~ msgstr "Тип поиска"
-
-#~ msgid "User names starting with"
-#~ msgstr "Имена пользователей, начинающиеся с"
-
-#~ msgid ""
-#~ "Your 'weak account key' lets you link a computer to your account without "
-#~ "giving it the ability to log in to your account or to change it in any way."
-#~ msgstr ""
-#~ "Ваш 'слабый учётный ключ' позволяет Вам подключать компьютеры к вашей "
-#~ "учётной записи в этом проекте, без предоставления возможности доступа к "
-#~ "вашей учётной записи или её изменения тем или иным образом."
-
-#~ msgid ""
-#~ "This mechanism works only with projects that have upgraded their server "
-#~ "software 7 Dec 2007 or later."
-#~ msgstr ""
-#~ "Данный механизм работает только в тех проектах, которые обновили свое "
-#~ "серверное программное обеспечение после 7 декабря 2007 г."
-
-#~ msgid "Your weak account key for this project is:"
-#~ msgstr "Ваш слабый учетный ключ в этом проекте:"
-
-#~ msgid ""
-#~ "To use your weak account key on a given host, find or create the 'account "
-#~ "file' for this project. This file has a name of the form "
-#~ "<b>account_PROJECT_URL.xml</b>. The account file for %1 is <b>%2</b>."
-#~ msgstr ""
-#~ "Для использования Вашего слабого учетного ключа на заданном компьютере "
-#~ "найдите или создайте 'учетный файл' для этого проекта. Имя этого файла имеет "
-#~ "вид: <b>account_PROJECT_URL.xml</b>. Учетный файл для %1: <b>%2</b>."
-
-#~ msgid "Create this file if needed. Set its contents to:"
-#~ msgstr "Создайте этот файл, если необходимо. Его содержимое должно быть:"
-
-#~ msgid ""
-#~ "Your weak account key is a function of your password. If you change your "
-#~ "password, your weak account key changes, and your previous weak account key "
-#~ "becomes invalid."
-#~ msgstr ""
-#~ "Ваш слабый учетный ключ является функцией Вашего пароля. Если Вы измените "
-#~ "свой пароль, Ваш слабый учетный ключ изменится, и Ваш предыдущий слабый "
-#~ "учетный ключ станет недействительным."
-
-#~ msgid "Account key"
-#~ msgstr "Ключ учетной записи"
-
-#~ msgid "Provides full access to your account"
-#~ msgstr "Предоставляет полный доступ к Вашей учетной записи"
-
-#~ msgid "Export"
-#~ msgstr "Экспортировать"
-
-#~ msgid "- private message"
-#~ msgstr "- личное сообщение"
-
-#~ msgid "Private message from"
-#~ msgstr "Личное сообщение от"
-
-#~ msgid "Email address verification pending"
-#~ msgstr "Ожидание проверки адреса электронной почты"
-
-#~ msgid "Log in as someone else."
-#~ msgstr "Войти по другим именем."
-
-#~ msgid "No thread with id %1. Please check the link and try again."
-#~ msgstr ""
-#~ "Нет обсуждения с id %1. Пожалуйста проверьте ссылку и попробуйте еще раз."
-
-#~ msgid "Request not found"
-#~ msgstr "Запрос не найден"
-
-#~ msgid "%1 has added you as a friend."
-#~ msgstr "%1 добавил Вас в друзья."
-
-#~ msgid "Account data for %1"
-#~ msgstr "Учетные данные для %1"
-
-#~ msgid "couldn't create message board"
-#~ msgstr "невозможно создать доску сообщений"
-
-#~ msgid "message board not found"
-#~ msgstr "доска сообщений не найдена"
-
-#~ msgid "no such forum"
-#~ msgstr "нет такого форума"
-
-#~ msgid "unknown command %1"
-#~ msgstr "неизвестная команда %1"
diff --git a/locale/ru/BOINC-Setup.mo b/locale/ru/BOINC-Setup.mo
index fd6748f..969bfdb 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
old mode 100755
new mode 100644
index 951203b..bf93e2a
--- a/locale/ru/BOINC-Setup.po
+++ b/locale/ru/BOINC-Setup.po
@@ -1,40 +1,32 @@
 # 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: BOINC 7.4\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-12 01:43-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: ru\n"
+"PO-Revision-Date: 2015-03-12 17:53+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"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-Basepath: /Volumes/Cheer/BOINC_GIT/boinc_trunk\n"
-"X-POOTLE-MTIME: 1408289307.0\n"
-"X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: mac_installer\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"
 
 #: 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
+#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
 msgid "Yes"
 msgstr "Да"
 
-#: PostInstall.cpp:131
-#: PostInstall.cpp:1137
-#: uninstall.cpp:1619
+#: PostInstall.cpp:131 PostInstall.cpp:1137 uninstall.cpp:1619
 msgid "No"
 msgstr "Нет"
 
@@ -48,10 +40,7 @@ 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 на этом компьютере Mac?"
+msgstr "Пользователи с правами администратора этого компьютера автоматически смогут запускать и управлять %s.\n\nХотите ли вы, чтобы простые пользователи без административных прав также могли запускать и управлять %s на этом компьютере Mac?"
 
 #: PostInstall.cpp:1444
 #, c-format
@@ -70,9 +59,7 @@ msgstr "Ошибка доступа после перезапуска"
 msgid ""
 "Removal may take several minutes.\n"
 "Please be patient."
-msgstr ""
-"Удаление может занять несколько минут.\n"
-"Пожалуйста, подождите."
+msgstr "Удаление может занять несколько минут.\nПожалуйста, подождите."
 
 #: uninstall.cpp:156
 #, c-format
@@ -80,10 +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 ""
-"Вы уверены, что хотите полностью удалить %s с вашего компьютера?\n"
-"\n"
-"Будут удалены исполняемые файлы, но файлы данных %s останутся."
+msgstr "Вы уверены, что хотите полностью удалить %s с вашего компьютера?\n\nБудут удалены исполняемые файлы, но файлы данных %s останутся."
 
 #: uninstall.cpp:163
 #, c-format
@@ -103,9 +87,7 @@ msgstr "имя  пользователя"
 msgid ""
 "Do you also want to remove VirtualBox from your computer?\n"
 "(VirtualBox was installed along with BOINC.)"
-msgstr ""
-"Хотите ли Вы также удалить VirtualBox с вашего компьютера?\n"
-"(VirtualBox был установлен вместе с BOINC.)"
+msgstr "Хотите ли Вы также удалить VirtualBox с вашего компьютера?\n(VirtualBox был установлен вместе с BOINC.)"
 
 #: uninstall.cpp:312
 #, c-format
@@ -117,23 +99,14 @@ msgid ""
 "\n"
 "for each user, the file\n"
 "\"%s\"."
-msgstr ""
-"Удаление завершено.\n"
-"\n"
-" Вы можете удалить следующие оставшиеся объекты с помощью Поисковика: \n"
-"каталог \"%s\"\n"
-"\n"
-"для каждого пользователя, файл\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"
+msgstr "Для полного удаления %s с вашего компьютера введите пароль администратора.\n\n"
 
 #: uninstall.cpp:1616
 msgid "Cancel"
@@ -142,25 +115,3 @@ msgstr "Отмена"
 #: uninstall.cpp:1617
 msgid "Continue..."
 msgstr "Продолжить..."
-
-#, c-format
-#~ msgid "Sorry, this version of %s requires system 10.4 or higher."
-#~ msgstr "Извините, данная версия %s требует систему 10.4 или выше."
-#~ msgid ""
-#~ "Removal completed.\n"
-#~ "\n"
-#~ " You may want to remove the following remaining items using the Finder: \n"
-#~ "\"/Library/Application Support/BOINC Data\" directory\n"
-#~ "\n"
-#~ "for each user, the file\n"
-#~ "\"/Users/[username]/Library/Preferences/BOINC Manager Preferences\"."
-#~ msgstr ""
-#~ "Удаление завершено.\n"
-#~ "\n"
-#~ "   Воспользуйтесь Поиском, если вы захотите удалить следующие оставшиеся "
-#~ "элементы: \n"
-#~ "каталог \"/Library/Application Support/BOINC Data\"\n"
-#~ "\n"
-#~ "для каждого пользователя, файл\n"
-#~ "\"/Users/[username]/Library/Preferences/BOINC Manager Preferences\"."
-
diff --git a/locale/ru/BOINC-Web.mo b/locale/ru/BOINC-Web.mo
index aa96d9d..4294c35 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
old mode 100755
new mode 100644
index ebf9030..932d023
--- a/locale/ru/BOINC-Web.po
+++ b/locale/ru/BOINC-Web.po
@@ -1,22 +1,25 @@
 # BOINC web translation
 # Copyright (C) 2008-2009 University of California
+# 
 # This file is distributed under the same license as BOINC.
+# 
 # FileID  : $Id$
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\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-12 01:44-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: ru\n"
+"PO-Revision-Date: 2015-03-12 17:53+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"
-"X-Generator: Pootle 2.5.0\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"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1408293979.0\n"
 
 #: docutil.php:21
 msgid "Search"
@@ -32,7 +35,9 @@ msgid "This page is %stranslatable%s."
 msgstr "Эту страницу можно %sперевести%s."
 
 #: download.php:39
-msgid "We recommend that you also install VirtualBox, so your computer can work on science projects that require it."
+msgid ""
+"We recommend that you also install VirtualBox, so your computer can work on "
+"science projects that require it."
 msgstr "Мы рекомендуем Вам также установить VirtualBox, чтобы ваш компьютер мог участвовать в научных проектах, которые требуют это ПО."
 
 #: download.php:41
@@ -43,14 +48,12 @@ msgstr "Узнать больше о VirtualBox."
 msgid "Download BOINC + VirtualBox"
 msgstr "Загрузить BOINC + VirtualBox"
 
-#: download.php:54
-#: download.php:69
+#: download.php:54 download.php:69
 #, php-format
 msgid "for %s"
 msgstr "для %s"
 
-#: download.php:57
-#: download.php:72
+#: download.php:57 download.php:72
 #, php-format
 msgid "BOINC version %s"
 msgstr "Версия BOINC: %s"
@@ -65,19 +68,28 @@ msgid "Download BOINC"
 msgstr "Загрузить BOINC"
 
 #: download.php:123
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others."
+msgid ""
+"BOINC is a program that lets you donate your idle computer time to science "
+"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, and many others."
 msgstr "BOINC - это программа, предоставляющая неиспользуемое время вашего компьютера для научных проектов, таких как: SETI at home, Climateprediction.net, Rosetta at home, World Community Grid и многих других."
 
 #: download.php:125
-msgid "After installing BOINC on your computer, you can connect it to as many of these projects as you like."
+msgid ""
+"After installing BOINC on your computer, you can connect it to as many of "
+"these projects as you like."
 msgstr "После установки BOINC на ваш компьютер Вы сможете выбрать и участвовать одновременно в нескольких проектах, каких - решайте сами."
 
 #: download.php:127
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
+msgid ""
+"You may run this software on a computer only if you own the computer or have"
+" the permission of its owner."
 msgstr "Вы можете запустить это программное обеспечение на компьютере только в том случае, если Вы владеете компьютером или у Вас есть разрешение его владельца."
 
 #: download.php:132
-msgid "We recommend that you download BOINC from the Google Play Store or Amazon Appstore, not from here."
+msgid ""
+"We recommend that you download BOINC from the Google Play Store or Amazon "
+"Appstore, not from here."
 msgstr "Мы рекомендуем Вам скачать BOINC из магазина Google Play или Amazon Appstore, а не отсюда."
 
 #: download.php:167
@@ -88,8 +100,7 @@ msgstr "Системные требования"
 msgid "Release notes"
 msgstr "Описание последней версии"
 
-#: download.php:169
-#: index.php:86
+#: download.php:169 index.php:86
 msgid "Help"
 msgstr "Помощь"
 
@@ -111,20 +122,34 @@ msgstr "BOINC: вычисления для науки"
 
 #: help.php:12
 #, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
+msgid ""
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who"
+" can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"through the process of installing and using BOINC; %s troubleshoot any "
+"problems you might have."
 msgstr "С помощью данной горячей линии BOINC, вы можете задать вопросы опытным пользователям BOINC лично: %s о том, что такое BOINC и распределённые вычисления; %s об установке программного обеспечения BOINC и процессе подключения к проектам; %s о возникших проблемах, связанных с работой BOINC."
 
 #: help.php:21
 #, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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."
+msgid ""
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system."
+" 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 построена на использовании интернет-телефона %sSkype%s. Skype - это бесплатная программа, позволяющая бесплатно звонить по всему миру.  Если у вас ещё не установлен Skype, вы можете %sзагрузить и установить%s его, а затем вернуться на данную страницу для выбора помощника."
 
 #: help.php:28
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
+msgid ""
+"The best way to get help is by voice, for which you need either built-in "
+"microphone and speakers or an external headset for your computer.  You can "
+"also use Skype's text-based chat system or regular email (if you don't have "
+"Skype) to communicate with Help Volunteers."
 msgstr "Лучше всего задать вопрос помощнику лично в режиме телефонного разговора, но для этого потребуются микрофон и наушники.  В качестве альтернативы, в Skype можно воспользоваться текстовым чатом, в крайнем случае оставьте ваш вопрос и адрес электронной почты (чтобы можно было на него ответить)."
 
 #: help.php:31
-msgid "Volunteers speaking several languages are available. Please select a language:"
+msgid ""
+"Volunteers speaking several languages are available. Please select a "
+"language:"
 msgstr "Помощники разговаривают на разных языках. Вы можете выбрать понятный вам:"
 
 #: help.php:47
@@ -133,16 +158,22 @@ msgstr "Станьте добровольным помощником"
 
 #: help.php:50
 #, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
+msgid ""
+"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+"Volunteer%s.  It's a great way to help the cause of scientific research and "
+"volunteer computing - and it's fun!"
 msgstr "Если вы достаточно хорошо понимаете, что такое BOINC и как оно работает, вы сами %sможете стать добровольным помощником%s.  Этим вы поможете как новым участникам BOINC, так и развитию BOINC и распределённых вычислений."
 
 #: help.php:56
 #, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
+msgid ""
+"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
 msgstr "Если вы уже являетесь добровольным помощником: для изменения ваших настроек, %sзайдите сюда%s."
 
 #: help_funcs.php:107
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
+msgid ""
+"BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
+"or the University of California."
 msgstr "Помощники BOINC - это добровольцы, не получающие оплату.  BOINC или Университет Калифорнии не несут ответственности за их советы."
 
 #: help_funcs.php:110
@@ -177,7 +208,6 @@ msgstr "компьютеров.\n"
 msgid "24-hour average:"
 msgstr "В среднем за 24 часа:"
 
-# 80%
 #: index.php:56
 msgid "PetaFLOPS."
 msgstr "петафлопс."
@@ -194,9 +224,7 @@ msgstr "Информация для участников"
 msgid "Download"
 msgstr "Страница загрузки"
 
-#: index.php:87
-#: index.php:120
-#: index.php:171
+#: index.php:87 index.php:120 index.php:171
 msgid "Documentation"
 msgstr "Документация"
 
@@ -209,7 +237,10 @@ msgid "Links"
 msgstr "Ссылки"
 
 #: index.php:94
-msgid "Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:"
+msgid ""
+"Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure"
+" diseases, study global warming, discover pulsars, and do many other types "
+"of scientific research.  It's safe, secure, and easy:"
 msgstr "Используйте время простоя на вашем компьютере (Windows, Mac, Linux или Android), чтобы лечить болезни, изучать глобальное потепление, открывать пульсары, и делать много других типов научных исследований.  Это безопасно, надёжно и просто:"
 
 #: index.php:96
@@ -226,7 +257,9 @@ msgstr "Введите адрес электронной почты и паро
 
 #: index.php:102
 #, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
+msgid ""
+"Or, if you run several projects, try an %saccount manager%s such as "
+"%sGridRepublic%s or %sBAM!%s. "
 msgstr "При желании участвовать одновременно в нескольких проектах, в качестве альтернативы можно воспользоваться сайтами %sменеджеров проектов%s, такими как %sGridRepublic%s или %sBAM!%s. "
 
 #: index.php:118
@@ -238,11 +271,15 @@ msgid "Software updates"
 msgstr "Обновления серверного ПО"
 
 #: index.php:128
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving"
+" you the computing power of thousands of CPUs."
 msgstr "%1Ученые%2: используйте BOINC, чтобы создать %3проект добровольных распределённых вычислений%4, дающий Вам вычислительную мощь тысяч центральных процессоров."
 
 #: index.php:132
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
 msgstr "%1Университеты%2: используйте BOINC, чтобы создать %3Виртуальный Суперкомпьютерный Центр ВУЗа%4."
 
 #: index.php:137
@@ -315,7 +352,8 @@ msgstr "API для ПО сторонних разработчиков"
 
 #: index.php:217
 #, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
+msgid ""
+"Open-source software for %svolunteer computing%s and %sgrid computing%s."
 msgstr "Программное обеспечение с открытым исходным кодом для организации %sдобровольных распределённых вычислений%s и %sраспределённых вычислений в сети%s."
 
 #: index.php:230
@@ -326,7 +364,6 @@ msgstr "BOINC находится в Университете Калифорни
 msgid "Distributed sensing"
 msgstr "Распределённая сеть датчиков"
 
-# 78%
 #: projects.inc:19
 msgid "Stanford University"
 msgstr "Стэнфордский Университет"
@@ -336,7 +373,10 @@ msgid "Seismology"
 msgstr "Сейсмология"
 
 #: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
+msgid ""
+"The Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to Internet-connected computers.  You must buy a "
+"sensor to participate."
 msgstr "Quake-Catcher Network развивает крупнейшую в мире сейсмическую сеть, используя датчики, которые подключены к компьютерам, имеющим выход в интернет.  Вы должны купить датчик для участия в проекте."
 
 #: projects.inc:27
@@ -348,24 +388,24 @@ msgid "Environmental research"
 msgstr "Исследования окружающей среды"
 
 #: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
+msgid ""
+"This project is creating a free and continuously updated map of radiation "
+"levels by using sensors connected to volunteers' computers.  You must buy a "
+"sensor to participate."
 msgstr "Этот проект создаёт бесплатную, постоянно обновляемую карту уровней радиации, используя датчики, подключенные к компьютерам добровольцев.  Вы должны купить датчик для участия в проекте."
 
 #: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
+msgid ""
+"To participate in these projects you must buy a sensor and attach it to your"
+" computer."
 msgstr "Для участия в этих проектах Вы должны купить датчик и подключить его к своему компьютеру."
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
 msgstr "Когнитивная наука и искусственный интеллект"
 
-# 85%
-#: projects.inc:60
-#: projects.inc:364
-#: projects.inc:408
-#: projects.inc:457
-#: projects.inc:464
-#: projects.inc:511
+#: projects.inc:60 projects.inc:364 projects.inc:408 projects.inc:457
+#: projects.inc:464 projects.inc:511
 msgid "Private"
 msgstr "Частный"
 
@@ -374,7 +414,11 @@ msgid "Artificial intelligence"
 msgstr "Искусственный интеллект"
 
 #: projects.inc:62
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
+msgid ""
+"Parse and convert semantic nets for use in FreeHAL, an artificial "
+"intelligence that uses semantic networks, stemmers, part of speech "
+"databases, and part of speech taggers in order to imitate human behavior in "
+"conversations."
 msgstr "Разбор и преобразование семантических сетей для использования во FreeHAL - искусственном интеллекте, который использует семантические сети, алгоритмы семантического поиска, базы данных частей речи, и части речевых добавок, не несущих основной смысловой нагрузки, для имитации поведения человека во время разговоров."
 
 #: projects.inc:69
@@ -390,7 +434,12 @@ msgid "Antimalarial drug discovery"
 msgstr "Поиск лекарств против малярии"
 
 #: projects.inc:84
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
+msgid ""
+"The parasite that causes malaria continues to evolve resistance to available"
+" medication. We therefore urgently need to discover new drugs to replace "
+"existing drugs. Importantly, these new drugs need to target NEW proteins in "
+"the parasite. The FightMalaria at Home project is aimed at finding these new "
+"targets."
 msgstr "Паразит, вызывающий малярию, продолжает увеличивать сопротивление доступным лекарствам. Поэтому нам крайне необходимо обнаружить новые лекарства для замены существующих. Важно, что эти новые лекарства должны быть нацелены на НОВЫЕ белки в паразите. Проект FightMalaria at Home нацелен на открытие таких новых мишеней."
 
 #: projects.inc:90
@@ -402,7 +451,12 @@ msgid "Protein structure prediction"
 msgstr "Предсказание структуры белков"
 
 #: projects.inc:92
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
+msgid ""
+"POEM at HOME uses a computational approach to predict the biologically active "
+"structure of proteins, to understand the signal-processing mechanisms when "
+"the proteins interact with one another, to understand diseases related to "
+"protein malfunction or aggregation, and to develop new drugs on the basis of"
+" the three-dimensions structure of biologically important proteins."
 msgstr "POEM at HOME использует вычислительный подход для предсказания биологически активной структуры белков, для понимания механизма обработки сигналов, когда белки взаимодействуют друг с другом, для понимания болезней, связанных со сбоями или объединением белков, и для разработки новых лекарств на основе трёхмерной структуры биологически важных белков."
 
 #: projects.inc:98
@@ -414,7 +468,11 @@ msgid "Study of protein - ligand interactions"
 msgstr "Исследование белок - лиганд взаимодействия"
 
 #: projects.inc:100
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
+msgid ""
+"Docking at Home has both bioscience and computer science goals. The project "
+"aims to further knowledge of the atomic details of protein-ligand "
+"interactions and, by doing so, will search for insights into the discovery "
+"of novel pharmaceuticals."
 msgstr "Целями Docking at Home являются одновременно и биология, и информатика. Проект нацелен на получение большего количества знаний о взаимодействиях белок-лиганд на атомарном уровне и, в результате, будет искать идеи для открытия новых лекарственных препаратов."
 
 #: projects.inc:114
@@ -426,7 +484,11 @@ msgid "Molecular simulations of proteins"
 msgstr "Молекулярное моделирование белков"
 
 #: projects.inc:116
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
+msgid ""
+"GPUGrid.net opens novel computational scenarios by the first full-atom "
+"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
+"New biomedical applications suddenly become possible giving a new role to "
+"computational biology for biomedical research."
 msgstr "GPUGrid.net открывает новые вычислительные сценарии посредством первого полно-атомного молекулярного динамического кода (CellMD), специально оптимизированного для запуска на графических процессорах NVIDIA. Новые биомедицинские программные приложения неожиданно сделали возможным достичь новых высот в вычислительной биологии для биомедицинских научных исследований."
 
 #: projects.inc:122
@@ -438,11 +500,15 @@ msgid "Genetic linkage analysis"
 msgstr "Анализ генетических связей"
 
 #: projects.inc:124
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
+msgid ""
+"Superlink at Technion helps geneticists all over the world find disease-"
+"provoking genes causing some types of diabetes, hypertension (high blood "
+"pressure), cancer, schizophrenia and many others."
 msgstr "Superlink at Technion помогает генетикам во всем мире находить провоцирующие болезнь гены, вызывающие некоторые типы диабета, гипертонии (высокое кровяное давление), рака, шизофрении и многих других."
 
 #: projects.inc:138
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
+msgid ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
 msgstr "Центр биоинформатики и вычислительной биологии университета Мэриленда"
 
 #: projects.inc:139
@@ -450,7 +516,11 @@ msgid "Life science research"
 msgstr "Исследования в науке о жизни"
 
 #: projects.inc:140
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
+msgid ""
+"The Lattice Project supplies computing power to scientists at the University"
+" of Maryland studying evolutionary relationships based on DNA sequence data;"
+" bacterial, plasmid, and virus protein sequences; and biological diversity "
+"in nature reserves. "
 msgstr "The Lattice Project предоставляет вычислительную мощь ученым в Университете штата Мэриленд, изучающим эволюционные отношения, основанные на данных последовательности ДНК; бактериальные, плазмидные, и вирусные последовательности белков; а также биологическое разнообразие в заповедниках."
 
 #: projects.inc:146
@@ -462,20 +532,32 @@ msgid "Epidemiology"
 msgstr "Эпидемиология"
 
 #: projects.inc:148
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
+msgid ""
+"Simulation models of the transmission dynamics and health effects of malaria"
+" are an important tool for malaria control. They can be used to determine "
+"optimal strategies for delivering mosquito nets, chemotherapy, or new "
+"vaccines which are currently under development and testing.  Such modeling "
+"is extremely computer intensive, requiring simulations of large human "
+"populations with a diverse set of parameters related to biological and "
+"social factors that influence the distribution of the disease. "
 msgstr "Симуляционные модели динамики передачи и влияния малярии на здоровье - важный инструмент для контроля малярии. Они могут быть использованы для определения оптимальной стратегии для поставки противомоскитных сеток, химиотерапии или новых вакцин, которые в настоящее время разрабатываются и испытываются. Такое моделирование чрезвычайно требовательно к вычислительным ресурсам, которые необходимы для моделирования больших групп населения с разнообразным набором параметров, связанных с [...]
 
 #: projects.inc:170
 msgid "University of Washington"
 msgstr "Университет Вашингтона"
 
-#: projects.inc:171
-#: projects.inc:179
+#: projects.inc:171 projects.inc:179
 msgid "Biology"
 msgstr "Биология"
 
 #: projects.inc:172
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
+msgid ""
+"Determine the 3-dimensional shapes of proteins in research that may "
+"ultimately lead to finding cures for some major human diseases. By running "
+"Rosetta at home you will help us speed up and extend our research in ways we "
+"couldn't possibly attempt without your help. You will also be helping our "
+"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
+"Cancer, and Alzheimer's"
 msgstr "Определение трехмерных форм белков в исследовании, которое может в конечном счете привести к обнаружению лекарств для некоторых серьёзных человеческих болезней. Запустив Rosetta at home, Вы поможете ускорить и расширить наше исследование способами, которыми мы не могли бы воспользоваться без вашей помощи. Вы также поможете нам при проектировании новых белков для борьбы с болезнями типа ВИЧ, малярии, рака и Альцгеймера."
 
 #: projects.inc:178
@@ -483,7 +565,10 @@ msgid "University of Vienna"
 msgstr "Университет Вены"
 
 #: projects.inc:180
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
+msgid ""
+"Calculate similarities between proteins. SIMAP provides a public database of"
+" the resulting data, which plays a key role in many bioinformatics research "
+"projects."
 msgstr "Вычисление сходства между белками. SIMAP предоставляет общедоступную базу данных результатов, которые играют ключевую роль во многих биоинформационных научно-исследовательских проектах."
 
 #: projects.inc:186
@@ -499,7 +584,15 @@ msgid "Climate study"
 msgstr "Изучение климата"
 
 #: projects.inc:200
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
+msgid ""
+"Investigate the approximations that have to be made in state-of-the-art "
+"climate models. By running the model thousands of times we hope to find out "
+"how the model responds to slight tweaks to these approximations - slight "
+"enough to not make the approximations any less realistic. This will allow us"
+" to improve our understanding of how sensitive our models are to small "
+"changes and also to things like changes in carbon dioxide and the sulphur "
+"cycle. This will allow us to explore how climate may change in the next "
+"century under a wide range of different scenarios."
 msgstr "Исследование приближений, которые должны быть сделаны в новейших моделях климата. Запуская модель тысячи раз, мы надеемся выяснить, как модель реагирует на небольшие изменения этих приближений - достаточно небольшие для того, чтобы не сделать приближения менее реалистичными. Это позволит нам улучшить наше понимание того, насколько чувствительны наши модели к небольшим изменениям, а также к таким вещам, как изменения в углекислом газе и круговороте серы. Это позволит нам исследова [...]
 
 #: projects.inc:207
@@ -511,39 +604,56 @@ msgid "Mechanical engineering"
 msgstr "Машиностроение"
 
 #: projects.inc:214
-msgid "Currently we are calculating the optimum design of a structure call the 52 bar truss"
+msgid ""
+"Currently we are calculating the optimum design of a structure call the 52 "
+"bar truss"
 msgstr "В настоящее время мы рассчитываем оптимальное исполнение структуры под названием 'ферма из 52 стержней'"
 
-#: projects.inc:224
-#: projects.inc:263
-#: projects.inc:271
+#: projects.inc:224 projects.inc:263 projects.inc:271
 msgid "Astronomy"
 msgstr "Астрономия"
 
 #: projects.inc:225
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
+msgid ""
+"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
+"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
+"Universe. We will measure physical parameters (such as stellar mass surface "
+"density, star formation rate surface density, attenuation, and first-order "
+"star formation history) on a resolved pixel-by-pixel basis using spectral "
+"energy distribution (SED) fitting techniques in a distributed computing "
+"mode."
 msgstr "Мы объединим спектральный охват телескопов GALEX, Pan-STARRS1 и WISE для создания мультичастотного галактического атласа ближайших к нам окресностей Вселенной в ультрафиолетовом/оптическом/инфракрасном спектрах. Мы измерим физические параметры (такие как звездная масса галактик, скорость образования звезд, поглощение излучения пылью и история формирования звёзд первого порядка) на основе попиксельного решения используя методы распределения спектральной энергии (SED), применив для [...]
 
 #: projects.inc:247
 msgid "University of Texas at Austin"
 msgstr "Техасский Университет в Остине"
 
-#: projects.inc:248
-#: projects.inc:279
+#: projects.inc:248 projects.inc:279
 msgid "Chemistry"
 msgstr "Химия"
 
 #: projects.inc:249
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
+msgid ""
+"A common problem in theoretical chemistry, condensed matter physics and "
+"materials science is the calculation of the time evolution of an atomic "
+"scale system where, for example, chemical reactions and/or diffusion occur. "
+"Generally the events of interest are quite rare (many orders of magnitude "
+"slower than the vibrational movements of the atoms), and therefore direct "
+"simulations, tracking every movement of the atoms, would take thousands of "
+"years of computer calculations on the fastest present day computer before a "
+"single event of interest can be expected to occur.  Our research group is "
+"interested in calculating the long time dynamics of systems."
 msgstr "Общая проблема в теоретической химии, физике сжатого вещества и материаловедении - вычисление времени развития систем атомарного масштаба, где, например, происходят химические реакции и/или диффузия. В основном интересующие события случаются весьма редко (во многих случаях изменения происходят медленнее чем вибрация атомов), и поэтому прямое моделирование, отслеживающее каждое движение атомов, заняло бы тысячи лет компьютерных вычислений на самом быстром современном компьютере, п [...]
 
-# 95%
 #: projects.inc:262
 msgid "University of Illinois at Urbana-Champaign"
 msgstr "Университет штата Иллинойс в Urbana-Champаign"
 
 #: projects.inc:264
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
+msgid ""
+"The goal of Cosmology at Home is to search for the model that best describes "
+"our Universe and to find the range of models that agree with the available "
+"astronomical particle physics data."
 msgstr "Цель Cosmology at Home состоит в том, чтобы найти модель, которая лучше всего описывает нашу Вселенную, и найти диапазон моделей, которые соглашаются с доступными данными астрономической физики элементарных частиц."
 
 #: projects.inc:270
@@ -551,7 +661,10 @@ msgid "Rensselaer Polytechnic Institute"
 msgstr "Ренсселеровский политехнический институт"
 
 #: projects.inc:272
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
+msgid ""
+"The goal of Milkyway at Home is to create a highly accurate three dimensional "
+"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
+"Survey."
 msgstr "Цель Milkyway at Home состоит в том, чтобы создать очень точную трёхмерную модель галактики Млечный путь используя данные, собранные Слоановским цифровым обзором неба."
 
 #: projects.inc:278
@@ -559,7 +672,13 @@ msgid "Leiden University, The Netherlands"
 msgstr "Лейденский Университет, Нидерланды"
 
 #: projects.inc:280
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
+msgid ""
+"Surface science calculations using Classical Dynamics.  Leiden Classical "
+"allows volunteers, students and other scientist to submit their personal "
+"calculations to the grid. Each user has his own personal queue for Classical"
+" Dynamics jobs. In this way students have used the grid to simulate liquid "
+"argon, or to test the validity of the ideal gas law by actually doing the "
+"simulations through the grid."
 msgstr "Вычисления науки поверхностей используют Classical Dynamics. Leiden Classical позволяет добровольцам, студентам и другим ученым отправлять результаты своих вычислений в сеть. Каждый пользователь имеет свою собственную личную очередь заданий Classical Dynamics. Таким образом, студенты используют сеть, чтобы смоделировать жидкий аргон, или проверить обоснованность закона идеального газа, фактически производя моделирование посредством сети."
 
 #: projects.inc:294
@@ -571,25 +690,36 @@ msgid "Astrophysics"
 msgstr "Астрофизика"
 
 #: projects.inc:296
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
+msgid ""
+"Search for spinning neutron stars (also called pulsars) using data from the "
+"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
+"observatory.  Einstein at Home is a World Year of Physics 2005 project "
+"supported by the American Physical Society (APS) and by a number of "
+"international organizations."
 msgstr "Поиск вращающихся нейтронных звезд (также называющихся пульсарами) используя данные детекторов гравитационных волн LIGO и GEO, а также радиообсерватории Аресибо. Einstein at Home - проект Международного Года Физики 2005, поддержанный Американским Физическим Обществом (APS) и множеством международных организаций."
 
-#: projects.inc:310
-#: projects.inc:318
+#: projects.inc:310 projects.inc:318
 msgid "CERN (European Organization for Nuclear Research)"
 msgstr "CERN (Европейская Организация Ядерных Исследований)"
 
-#: projects.inc:311
-#: projects.inc:319
+#: projects.inc:311 projects.inc:319
 msgid "Physics"
 msgstr "Физика"
 
 #: projects.inc:312
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
+msgid ""
+"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
+"European Organization for Nuclear Research, the world's largest particle "
+"physics laboratory.  It is the most powerful instrument ever built to "
+"investigate on particles proprieties. LHC at home runs simulations to improve "
+"the design of LHC and its detectors."
 msgstr "Большой Адронный Коллайдер (LHC) - ускоритель частиц в CERN, Европейской Организации Ядерных Исследований, самой большой в мире лаборатории физики элементарных частиц. Это самый мощный инструмент, когда-либо построенный, для исследования поведения элементарных частиц. LHC at home выполняет моделирование для улучшения проекта LHC и его датчиков."
 
 #: projects.inc:320
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
+msgid ""
+"This project uses CERN-developed virtual machine technology for full-fledged"
+" LHC event physics simulation on volunteer computers.  Requires that you "
+"install VirtualBox on your computer"
 msgstr "Этот проект использует технологию виртуальных машин, разработанных в CERN, для моделирования физики полноценных событий LHC на компьютерах добровольцев.  Требуется установка VirtualBox на вашем компьютере"
 
 #: projects.inc:326
@@ -601,7 +731,12 @@ msgid "Astrophysics, astrobiology"
 msgstr "Астрофизика, астробиология"
 
 #: projects.inc:328
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
+msgid ""
+"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
+"goal is to detect intelligent life outside Earth. One approach, known as "
+"radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
+"signals from space. Such signals are not known to occur naturally, so a "
+"detection would provide evidence of extraterrestrial technology."
 msgstr "SETI (Search for Extraterrestrial Intelligence, Поиск ВнеЗемного Разума) - это научное направление, цель которого - обнаружить разумную жизнь вне Земли. На первом этапе, известном как radio SETI (радио SETI), используются радио телескопы для слежения за узкополосными радиосигналами космоса. Естественные источники таких сигналов не известны, поэтому их обнаружение может дать подтверждение о существовании внеземной технологии."
 
 #: projects.inc:342
@@ -613,7 +748,11 @@ msgid "Chemical engineering and nanotechnology"
 msgstr "Химическая технология и нанотехнология"
 
 #: projects.inc:344
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
+msgid ""
+"The study of molecular magnets and controlled nanoscale magnetism.  These "
+"magnetic molecules may be used to develop tiny magnetic switches, with "
+"applications in medicine (such as local tumor chemotherapy) and "
+"biotechnology."
 msgstr "Исследование молекулярных магнитов и контролируемого наноразмерного магнетизма.  Эти магнитные молекулы могут использоваться для разработки крошечных магнитных выключателей, с применением в медицине (типа местной химиотерапии опухолей) и в биотехнологии."
 
 #: projects.inc:351
@@ -629,7 +768,10 @@ msgid "Physics, biochemistry, and others"
 msgstr "Физика, биохимия, и другие"
 
 #: projects.inc:358
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
+msgid ""
+"The objective of CAS at home is to encourage and assist scientists in China to "
+"adopt the technologies of volunteer computing and volunteer thinking for "
+"their research."
 msgstr "Цель CAS at home состоит в том, чтобы рекомендовать и помочь ученым в Китае принять технологии добровольных вычислений и добровольных размышлений в их исследованиях."
 
 #: projects.inc:365
@@ -637,11 +779,12 @@ msgid "Mathematics, physics, evolution"
 msgstr "Математика, физика, эволюция"
 
 #: projects.inc:366
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
+msgid ""
+"Yoyo at home is an adapter between BOINC and several existing volunteer "
+"computing projects: ECM, Muon, Evolution at home, and distributed.net"
 msgstr "Yoyo at home - адаптер между BOINC и несколькими существующими добровольными распределёнными проектами: ECM, Muon, Evolution at home, и distributed.net"
 
-#: projects.inc:371
-#: projects.inc:527
+#: projects.inc:371 projects.inc:527
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 msgstr "Лаборатория Параллельных и Распределенных Систем MTA-SZTAKI (Венгрия)"
 
@@ -650,7 +793,11 @@ msgid "European research projects"
 msgstr "Европейские исследовательские проекты"
 
 #: projects.inc:373
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
+msgid ""
+"The EDGeS at Home Beta project integrates volunteer computing into the service "
+"grid network of Europe by allowing service grids to send workunits to be "
+"processed by the volunteers of this project. The scientific projects covered"
+" by the project include math, physics, biology, etc."
 msgstr "Бета-проект EDGeS at Home объединяет вычисления добровольцев в европейскую сервисную сеть, позволяя сервисной сети посылать задания для обработки добровольцами этого проекта. Научные проекты, поддерживаемые данным проектом, включают в себя математику, физику, биологию и т.д."
 
 #: projects.inc:379
@@ -674,7 +821,11 @@ msgid "Medical, environmental and other humanitarian research"
 msgstr "Медицинские, экологические и другие гуманитарные исследования"
 
 #: projects.inc:389
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
+msgid ""
+"To further critical non-profit research on some of humanity's most pressing "
+"problems by creating the world's largest volunteer computing grid.  Research"
+" includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"clean water and many more."
 msgstr "Для дальнейших критических некоммерческих исследований некоторых из наиболее актуальных проблем человечества, создав крупнейшую в мире добровольную вычислительную сеть.  Исследования включают в себя ВИЧ-СПИД, рак, тропические и забытые болезни, солнечную энергию, чистую воду и многое другое."
 
 #: projects.inc:395
@@ -693,21 +844,18 @@ msgstr "Математика, Физика, Искусственный Инте
 msgid "Simulation of quantum computing; Goldbach's conjecture."
 msgstr "Моделирование квантовых компьютеров; предположение Гольдбаха."
 
-#: projects.inc:450
-#: projects.inc:458
+#: projects.inc:450 projects.inc:458
 msgid "Cryptography"
 msgstr "Криптография"
 
 #: projects.inc:459
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
+msgid ""
+"Attempt to decode 3 original Enigma messages. The signals were intercepted "
+"in the North Atlantic in 1942 and are believed to be unbroken."
 msgstr "Попытка расшифровать 3 оригинальных сообщения Энигмы. Сигналы были перехвачены в Североатлантическом океане в 1942 году и считалось, что их невозможно взломать."
 
-#: projects.inc:465
-#: projects.inc:504
-#: projects.inc:512
-#: projects.inc:520
-#: projects.inc:528
-#: projects.inc:568
+#: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
+#: projects.inc:528 projects.inc:568
 msgid "Mathematics"
 msgstr "Математика"
 
@@ -724,11 +872,19 @@ msgid "Factorization of large integers"
 msgstr "Разложение на множители больших целых чисел"
 
 #: projects.inc:473
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
+msgid ""
+"NFS at Home is a research project that uses Internet-connected computers to do "
+"the lattice sieving step in the Number Field Sieve factorization of large "
+"integers. As a young school student, you gained your first experience at "
+"breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
+"NFS at Home is a continuation of that experience, only with integers that are "
+"hundreds of digits long."
 msgstr "NFS at Home - это исследовательский проект, который использует подключенные к Интернету компьютеры, чтобы рассчитать шаг решетки просеивания при факторизации больших целых чисел в Number Field Sieve (NFS). Школьником Вы получили ваш первый опыт в разложении целых чисел на простые, такие как 15 = 3 * 5 или 35 = 5 * 7. NFS at Home является продолжением этого опыта, только с целыми числами, состоящими из сотен цифр."
 
 #: projects.inc:479
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
+msgid ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
 msgstr "Вильнюсский Технический Университет и Каунасский Университет Технологий (Литва)"
 
 #: projects.inc:480
@@ -736,7 +892,11 @@ msgid "Software testing"
 msgstr "Тестирование программного обеспечения"
 
 #: projects.inc:481
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
+msgid ""
+"The aim of this project is to provide a powerful distributed computing "
+"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
+"well as others Lithuanian academic institutions.  Current applications "
+"involve the study of Monte-Carlo based software testing."
 msgstr "Целью данного проекта является предоставление мощной распределенной вычислительной платформы для ученых из Вильнюсского технического университета (ВГТУ), а также других литовских научных учреждений.  Текущие приложения включают изучение тестирования программного обеспечения, основанного на методе Монте-Карло."
 
 #: projects.inc:503
@@ -744,11 +904,20 @@ msgid "Mathematical Institute of Leiden University / Kennislink"
 msgstr "Математический Институт Лейденского Университета / Кеннислинк"
 
 #: projects.inc:505
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
+msgid ""
+"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
+"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
+"product of the distinct prime factors of n. The ABC conjecture says that "
+"there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for "
+"any real h > 1. The ABC conjecture is currently one of the greatest open "
+"problems in mathematics. If it is proven to be true, a lot of other open "
+"problems can be answered directly from it."
 msgstr "Поиск 'ABC-троек': положительные целые числа a, b, c, такие, что a+b=c, a < b < c, a,b,c не имеют общих делителей и c > rad(abc), где rad(n) - продукт отдельных простых факторов n. ABC-гипотеза говорит, что есть только конечное множество a,b,c, таких что log(c)/log(rad(abc)) > h для любого реального h > 1. ABC-гипотеза - одна из самых больших открытых проблем в математике в настоящее время. Если она будет доказана, многие другие открытые проблемы могут быть решены непосредс [...]
 
 #: projects.inc:513
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
+msgid ""
+"Primegrid has multiple projects searching for different forms of very large "
+"prime numbers, including searching for the largest known prime number."
 msgstr "Primegrid поддерживает множество проектов, ищущих различные формы очень больших простых чисел, включая поиск крупнейшего известного простого числа."
 
 #: projects.inc:519
@@ -756,11 +925,15 @@ msgid "Hochschule RheinMain University of Applied Sciences"
 msgstr "Университет Прикладных Наук РейнМэйн"
 
 #: projects.inc:521
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
+msgid ""
+"Search for counterexamples to two conjectures related to the identification "
+"of prime numbers"
 msgstr "Поиск контрпримеров к двум теоремам, связанным с идентификацией главных чисел"
 
 #: projects.inc:529
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
+msgid ""
+"Find all the generalized binary number systems (in which bases are matrices "
+"and digits are vectors) up to dimension 11."
 msgstr "Поиск всех систем обобщенных двоичных чисел (в которых основания являются матрицами, а цифры - векторами) до 11-го измерения."
 
 #: ../html/inc/news.inc:40
@@ -771,221 +944,3 @@ msgstr "Комментарий"
 #, php-format
 msgid "News is available as an %sRSS feed%s"
 msgstr "Новости доступны в формате %sленты RSS%s"
-
-# 75%
-#~ msgid "Astronomy, Physics, and Chemistry"
-#~ msgstr "Астрономия, Физика, и Химия"
-#~ msgid "Browser default"
-#~ msgstr "как в браузере"
-#, php-format
-#~ msgid ""
-#~ " Use the idle time on your computer (Windows, Mac, or Linux) to cure "
-#~ "diseases, study global warming, discover pulsars, and do many other types of "
-#~ "scientific research.  It's safe, secure, and easy:  %sChoose%s projects  "
-#~ "%sDownload%s and run BOINC software  %sEnter%s an email address and "
-#~ "password. "
-#~ msgstr ""
-#~ " Предоставьте неиспользуемое время вашего компьютера (с ОС: Windows, Mac, "
-#~ "или Linux) для поиска лекарств и методов лечения, изучения глобального "
-#~ "изменения климата, пульсаров, а также для множества других научных "
-#~ "исследований.  Сделать это достаточно просто и относительно безопасно:  %"
-#~ "sВыберите%s понравившиеся проекты  %sЗагрузите%s и установите программное "
-#~ "обеспечение BOINC  %sУкажите:%s ваш адрес электронной почты и пароль для "
-#~ "вашей учётной записи в проекте. "
-#~ msgid "IBM Corporate Community Relations"
-#~ msgstr "Сообщество Корпоративных Отношений IBM"
-#~ msgid "Humanitarian research on disease, natural disasters and hunger."
-#~ msgstr "Гуманитарное исследование болезней, стихийных бедствий и голода."
-#~ msgid ""
-#~ "To further critical non-profit research on some of humanity's most "
-#~ "pressing problems by creating the world's largest volunteer computing "
-#~ "grid.  Research includes HIV/AIDS, cancer, muscular dystrophy, dengue "
-#~ "fever, and many more."
-#~ msgstr ""
-#~ "Cоздание самой большой в мире сети добровольных вычислений для "
-#~ "дальнейшего серьезного некоммерческого исследования относительно "
-#~ "некоторых из самых неотложных проблем человечества.  Исследования "
-#~ "включают ВИЧ/СПИД, рак, мускульную дистрофию, лихорадку и многие другие."
-#~ msgid ""
-#~ "Primegrid is generating a public sequential prime number database, and is "
-#~ "searching for large twin primes of the form k*2<sup>n</sup>+1 and "
-#~ "k*2<sup>n</sup>-1"
-#~ msgstr ""
-#~ "Primegrid формирует общедоступную последовательную базу данных простых "
-#~ "чисел, и ищет большие двойные простые числа вида k*2<sup>n</sup>+1 и "
-#~ "k*2<sup>n</sup>-1"
-#~ msgid "FreeHAL"
-#~ msgstr "FreeHAL"
-#~ msgid "private"
-#~ msgstr "личный"
-#~ msgid "POEM at HOME"
-#~ msgstr "POEM at HOME"
-#~ msgid "Docking at Home"
-#~ msgstr "Docking at Home"
-#~ msgid "GPUGrid.net"
-#~ msgstr "GPUGrid.net"
-#~ msgid "Superlink at Technion"
-#~ msgstr "Superlink at Technion"
-#~ msgid "The Lattice Project"
-#~ msgstr "The Lattice Project"
-#~ msgid "Malariacontrol.net"
-#~ msgstr "Malariacontrol.net"
-#~ msgid "Rosetta at home"
-#~ msgstr "Rosetta at home"
-#~ msgid "SIMAP"
-#~ msgstr "SIMAP"
-#~ msgid "Virtual Prairie"
-#~ msgstr "Virtual Prairie"
-#~ msgid "University of Houston"
-#~ msgstr "Университет Хьюстона"
-#~ msgid "Study of botanical ecosystems"
-#~ msgstr "Изучение ботанических экосистем"
-#~ msgid ""
-#~ "Provide ecological guidelines on the design of prairies with the best "
-#~ "potential for water purification."
-#~ msgstr ""
-#~ "Обеспечивает основные экологические принципы по проектированию прерий с "
-#~ "наилучшим потенциалом для очистки воды."
-#~ msgid "Climateprediction.net"
-#~ msgstr "Climateprediction.net"
-#~ msgid "Astronomy/Physics/Chemistry"
-#~ msgstr "Астрономия/Физика/Химия"
-#~ msgid "eOn"
-#~ msgstr "eOn"
-#~ msgid "Orbit at home"
-#~ msgstr "Orbit at home"
-#~ msgid "Planetary Science Institute"
-#~ msgstr "Институт Планетарной Науки"
-#~ msgid "Monitor and study the hazard posed by near-Earth asteroids"
-#~ msgstr ""
-#~ "Мониторинг и изучение опасности, которую несут околоземные астероиды"
-#~ msgid "Cosmology at Home"
-#~ msgstr "Cosmology at Home"
-#~ msgid "University of Illinois at Urbana-Chamapign"
-#~ msgstr "Университет штата Иллинойс в Urbana-Chamapign"
-#~ msgid "Milkyway at home"
-#~ msgstr "Milkyway at home"
-#~ msgid "Leiden Classical"
-#~ msgstr "Leiden Classical"
-#~ msgid "uFluids at home"
-#~ msgstr "uFluids at home"
-#~ msgid "Purdue University"
-#~ msgstr "Университет Purdue"
-#~ msgid "Physics/Aeronautics"
-#~ msgstr "Физика/Аэронавтика"
-#~ msgid ""
-#~ "The uFluids project simulates two-phase fluid behavior in microgravity "
-#~ "and microfluidics problems. Our goal is to design better satellite "
-#~ "propellant management devices and address two-phase flow in microchannel "
-#~ "and MEMS devices."
-#~ msgstr ""
-#~ "Проект uFluids моделирует двухфазное поведение жидкости в "
-#~ "микрогравитационной и микрожидкостной проблемах. Наша цель состоит в том, "
-#~ "чтобы спроектировать лучшие устройства управления двигателями спутников и "
-#~ "применить двухфазный поток в микроканале и MEMS-устройствах."
-#~ msgid "Einstein at home"
-#~ msgstr "Einstein at home"
-#~ msgid "LHC at home"
-#~ msgstr "LHC at home"
-#~ msgid "SETI at home"
-#~ msgstr "SETI at home"
-#~ msgid "Quantum Monte Carlo at Home"
-#~ msgstr "Quantum Monte Carlo at Home"
-#~ msgid "University of Muenster (Germany)"
-#~ msgstr "Университет Muenster (Германия)"
-#~ msgid ""
-#~ "Study the structure and reactivity of molecules using Quantum Chemistry."
-#~ msgstr ""
-#~ "Изучение структуры и реактивности молекул с использованием Квантовой "
-#~ "Химии."
-#~ msgid "Spinhenge at home"
-#~ msgstr "Spinhenge at home"
-#~ msgid "CAS at home"
-#~ msgstr "CAS at home"
-#~ msgid "Yoyo at home"
-#~ msgstr "Yoyo at home"
-#~ msgid "EDGeS at Home"
-#~ msgstr "EDGeS at Home"
-#~ msgid "Ibercivis"
-#~ msgstr "Ibercivis"
-#~ msgid "World Community Grid"
-#~ msgstr "World Community Grid"
-#~ msgid "Enigma at Home"
-#~ msgstr "Enigma at Home"
-#~ msgid "Collatz Conjecture"
-#~ msgstr "Collatz Conjecture"
-#~ msgid "NFS at home"
-#~ msgstr "NFS at home"
-#~ msgid "VTU at home"
-#~ msgstr "VTU at home"
-#~ msgid "AQUA at home"
-#~ msgstr "AQUA at home"
-#~ msgid "D-Wave Systems, Inc."
-#~ msgstr "D-Wave Systems, Inc."
-#~ msgid "Quantum computing"
-#~ msgstr "Квантовые вычисления"
-#~ msgid ""
-#~ "D-Wave's AQUA (Adiabatic QUantum Algorithms) is a research project whose "
-#~ "goal is to predict the performance of superconducting adiabatic quantum "
-#~ "computers on a variety of hard problems arising in fields ranging from "
-#~ "materials science to machine learning. AQUA at home uses Internet-connected "
-#~ "computers to help design and analyze quantum computing algorithms, using "
-#~ "Quantum Monte Carlo techniques."
-#~ msgstr ""
-#~ "D-Wave AQUA (Adiabatic QUantum Algorithms - Адиабатные Квантовые "
-#~ "Алгоритмы) - научно-исследовательский проект, цель которого состоит в "
-#~ "том, чтобы предсказать производительность супер-управления адиабатными "
-#~ "квантовыми компьютерами на множестве сложных проблем, возникающих в "
-#~ "различных направлениях - от материаловедения до обучения машин. AQUA at home "
-#~ "использует подключенные к Интернету компьютеры, чтобы помочь в "
-#~ "проектировании и анализе квантовых вычислительных алгоритмов, используя "
-#~ "Квантовые методы Монте Карло."
-#~ msgid "ABC at home"
-#~ msgstr "ABC at home"
-#~ msgid "PrimeGrid"
-#~ msgstr "PrimeGrid"
-#~ msgid "primaboinca"
-#~ msgstr "primaboinca"
-#~ msgid "SZTAKI Desktop Grid"
-#~ msgstr "SZTAKI Desktop Grid"
-#~ msgid "Chess960 at home"
-#~ msgstr "Chess960 at home"
-#~ msgid "Chess-960.org"
-#~ msgstr "Chess-960.org"
-#~ msgid "Game-playing"
-#~ msgstr "Игры"
-#~ msgid ""
-#~ "This project studies Chess 960, a variant of orthodox chess. In classical "
-#~ "chess the starting position of the game never changes.  In Chess 960, "
-#~ "just before the start of every game, the initial configuration of the "
-#~ "chess pieces is determined randomly."
-#~ msgstr ""
-#~ "Этот проект изучает Шахматы-960, вариант ортодоксальных шахмат. В "
-#~ "классических шахматах исходное положение игры никогда не меняется. В "
-#~ "Шахматах-960 начальная расстановка фигур выбирается случайным образом "
-#~ "отдельно для каждой партии."
-#~ msgid "The current release is known to work with these Linux versions:"
-#~ msgstr "Текущий выпуск, как известно, работает с этими версиями Linux:"
-#~ msgid ""
-#~ "For other Linux versions, check if a BOINC package is offered by your "
-#~ "Linux distribution."
-#~ msgstr ""
-#~ "Для других версий Linux проверьте, входит ли пакет BOINC в ваш "
-#~ "дистрибутив Linux."
-#~ msgid ""
-#~ "Alternatively, download the %1BOINC client for older Linux versions%2. "
-#~ "This doesn't have a graphical interface, but it should work on all Linux "
-#~ "systems, both x86 and x64."
-#~ msgstr ""
-#~ "Либо загрузите %1клиент BOINC для более старых версий Linux%2. В нем нет "
-#~ "графического интерфейса, но он должен работать на всех системах Linux, "
-#~ "как на x86, так и на x64."
-#~ msgid ""
-#~ "Note: if your computer is equipped with an Graphics Processing Unit "
-#~ "(GPU), you may be able to %suse it to compute faster%s"
-#~ msgstr ""
-#~ "Примечание: если ваш компьютер оборудован видеокартой с графическим "
-#~ "процессором (GPU), вы можете %sиспользовать её для ускорения вычислений%s"
-#~ msgid "TeraFLOPS."
-#~ msgstr "терафлопс."
-
diff --git a/locale/ru/wxstd.mo b/locale/ru/wxstd.mo
deleted file mode 100644
index 55add24..0000000
Binary files a/locale/ru/wxstd.mo and /dev/null differ
diff --git a/locale/sk/BOINC-Client.mo b/locale/sk/BOINC-Client.mo
index 0634060..10bb69f 100644
Binary files a/locale/sk/BOINC-Client.mo and b/locale/sk/BOINC-Client.mo differ
diff --git a/locale/sk/BOINC-Client.po b/locale/sk/BOINC-Client.po
old mode 100755
new mode 100644
index 028d181..82eccde
--- a/locale/sk/BOINC-Client.po
+++ b/locale/sk/BOINC-Client.po
@@ -1,23 +1,23 @@
 # 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: BOINC 7.4\n"
+"Project-Id-Version: boinc\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-10-15 22:25-0700\n"
-"PO-Revision-Date: 2015-02-12 01:48-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: sk\n"
+"PO-Revision-Date: 2015-02-23 23:14+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"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.1.6\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: acct_mgr.cpp:450
-#: acct_mgr.cpp:459
+#: acct_mgr.cpp:450 acct_mgr.cpp:459
 msgid "Message from account manager"
 msgstr "Správa zo Správcu konta"
 
@@ -26,7 +26,9 @@ msgid "Message from server"
 msgstr "Správa zo serveru"
 
 #: client_state.cpp:258
-msgid "Some tasks need more memory than allowed by your preferences.  Please check the preferences."
+msgid ""
+"Some tasks need more memory than allowed by your preferences.  Please check "
+"the preferences."
 msgstr "Niektoré úlohy vyžadujú viac operačnej pamäti, než povoľujú vaše preferencie.  Prosím skontrolujte preferencie."
 
 #: client_state.cpp:520
@@ -39,11 +41,12 @@ msgstr "Premenná prostredia HTTP_PROXY musí obsahovať HTTP proxy adresu"
 
 #: cs_scheduler.cpp:613
 #, c-format
-msgid "You used the wrong URL for this project.  When convenient, remove this project, then add %s"
+msgid ""
+"You used the wrong URL for this project.  When convenient, remove this "
+"project, then add %s"
 msgstr "Použili ste chybnú URL pre tento projekt.  Príležitostne odstráňte tento projekt a potom pridajte %s"
 
-#: cs_statefile.cpp:828
-#: ../sched/sched_types.cpp:259
+#: cs_statefile.cpp:828 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
 msgstr "Syntaktická chyba v app_info.xml"
 
@@ -55,18 +58,15 @@ msgstr "Súbor odkazovaný v app_info.xml neexistuje: "
 msgid "A new version of BOINC is available."
 msgstr "Je dostupná nová verzia BOINC."
 
-#: current_version.cpp:94
-#: current_version.cpp:102
+#: current_version.cpp:94 current_version.cpp:102
 msgid "Download"
 msgstr "Stiahnuť"
 
-#: log_flags.cpp:269
-#: log_flags.cpp:449
+#: log_flags.cpp:269 log_flags.cpp:449
 msgid "Unexpected text in cc_config.xml"
 msgstr "Neočakávaný text v cc_config.xml"
 
-#: log_flags.cpp:423
-#: log_flags.cpp:475
+#: log_flags.cpp:423 log_flags.cpp:475
 msgid "Unrecognized tag in cc_config.xml"
 msgstr "Nerozpoznaný príznak v cc_config.xml"
 
@@ -91,7 +91,9 @@ msgid "Invalid code signing key.  To fix, remove and add this project."
 msgstr "Neplatný kód podpisového kľúča.  Odstráňte a pridajte tento projekt pre nápravu."
 
 #: ../sched/handle_request.cpp:859
-msgid "The project has changed its security key.  Please remove and add this project."
+msgid ""
+"The project has changed its security key.  Please remove and add this "
+"project."
 msgstr "Projekt mal zmenený jeho bezpečnostný kľúč.  Prosím odstráňte a pridajte tento projekt."
 
 #: ../sched/handle_request.cpp:943
@@ -103,7 +105,8 @@ msgid "This project doesn't support CPU type"
 msgstr "Tento projekt nepodporuje CPU typ"
 
 #: ../sched/handle_request.cpp:993
-msgid "Your BOINC client software is too old.  Please install the current version."
+msgid ""
+"Your BOINC client software is too old.  Please install the current version."
 msgstr "Váš klient BOINC je príliš starý.  Prosím nainštalujte aktuálnu verziu."
 
 #: ../sched/handle_request.cpp:1259
@@ -111,15 +114,19 @@ msgid "This project doesn't support computers of type"
 msgstr "Tento projekt nepodporuje počítače typu"
 
 #: ../sched/sched_send.cpp:1092
-msgid "Upgrade to the latest driver to process tasks using your computer's GPU"
+msgid ""
+"Upgrade to the latest driver to process tasks using your computer's GPU"
 msgstr "Aktualizujte na najnovší ovládač pre spracovanie úloh na vašom GPU"
 
 #: ../sched/sched_send.cpp:1099
-msgid "Upgrade to the latest driver to use all of this project's GPU applications"
+msgid ""
+"Upgrade to the latest driver to use all of this project's GPU applications"
 msgstr "Aktualizujte na najnovší ovládač, aby ste mohli využiť všetky GPU aplikácie tohto projektu"
 
 #: ../sched/sched_send.cpp:1118
-msgid "A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to the current version"
+msgid ""
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to"
+" the current version"
 msgstr "Pre použitie NVIDIA GPU je potrebná novšia verzia BOINC; prosím aktualizujte na aktuálnu verziu"
 
 #: ../sched/sched_send.cpp:1146
@@ -141,7 +148,8 @@ msgstr "Je vyžadovaná novšia verzia BOINC; prosím nainštalujte aktuálnu ve
 
 #: ../sched/sched_send.cpp:1305
 #, c-format
-msgid "Tasks for %s are available, but your preferences are set to not accept them"
+msgid ""
+"Tasks for %s are available, but your preferences are set to not accept them"
 msgstr "Úlohy pre %s sú dostupné, avšak Vaše preferencie určujú ich neprijímať"
 
 #: ../sched/sched_types.cpp:254
@@ -151,42 +159,3 @@ msgstr "Neznámy názov aplikácie v súbore app_info.xml"
 #: ../sched/sched_version.cpp:214
 msgid "Your app_info.xml file doesn't have a usable version of"
 msgstr "Váš súbor app_info.xml nemá použiteľnú verziu "
-
-#~ msgid "Download it."
-#~ msgstr "Stiahnuť."
-#~ msgid "An NVIDIA or ATI GPU is required to run tasks for this project"
-#~ msgstr ""
-#~ "Pre spracovanie úloh tohto projektu je vyžadovaná grafická karta (GPU) "
-#~ "NVIDIA alebo ATI"
-#~ msgid "An NVIDIA GPU is required to run tasks for this project"
-#~ msgstr ""
-#~ "Pre spustenie úloh tohto projektu je požadovaná grafická karta (GPU) NVIDIA"
-#~ msgid "An ATI GPU is required to run tasks for this project"
-#~ msgstr ""
-#~ "Pre spustenie úloh tohto projektu je požadovaný grafická karta (GPU) ATI"
-#~ msgid ""
-#~ "Tasks for NVIDIA GPU are available, but your preferences are set to not "
-#~ "accept them"
-#~ msgstr ""
-#~ "Sú dostupné úlohy pre NVIDIA GPU, ale vaše preferencie sú nastavené ich "
-#~ "neakceptovať"
-#~ msgid ""
-#~ "Tasks for ATI GPU are available, but your preferences are set to not accept "
-#~ "them"
-#~ msgstr ""
-#~ "Sú dostupné úlohy pre ATI GPU, ale vaše preferencie sú nastavené ich "
-#~ "neakceptovať"
-#~ msgid ""
-#~ "Tasks for CPU are available, but your preferences are set to not accept them"
-#~ msgstr ""
-#~ "Sú dostupné úlohy pre CPU, ale vaše preferencie sú nastavené ich "
-#~ "neakceptovať"
-#~ msgid "error"
-#~ msgstr "chyba"
-#~ msgid "Can't resolve hostname in remote_hosts.cfg"
-#~ msgstr "Nemožno rozpoznať adresu hostiteľa v remote_hosts.cfg"
-#~ msgid "is not available for"
-#~ msgstr "nie je dostupná pre"
-#~ msgid "Notice from BOINC"
-#~ msgstr "Oznam z BOINC"
-
diff --git a/locale/sk/BOINC-Manager.mo b/locale/sk/BOINC-Manager.mo
index 8e3c5aa..118b17e 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
old mode 100755
new mode 100644
index 6eb90cb..5575fe4
--- a/locale/sk/BOINC-Manager.po
+++ b/locale/sk/BOINC-Manager.po
@@ -1,63 +1,63 @@
 # 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:
+# aceman, 2015
+# Michal, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-15 14:15-0500\n"
-"PO-Revision-Date: 2015-02-12 01:49-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: sk\n"
+"POT-Creation-Date: 2015-03-24 13:36-0500\n"
+"PO-Revision-Date: 2015-03-27 23:03+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"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc_7.4\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1395091864.0\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\n"
+"X-Poedit-Country: UNITED STATES\n"
+"X-Poedit-Language: English\n"
 "X-Poedit-SearchPath-0: clientgui\n"
-"X-Poedit-SearchPath-1: clientgui/msw\n"
-"X-Poedit-SearchPath-2: clientgui/gtk\n"
-"X-Poedit-SearchPath-3: clientgui/mac\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"
 
-#: clientgui/AccountInfoPage.cpp:387
+#: clientgui/AccountInfoPage.cpp:361
 #, c-format
 msgid "Identify your account at %s"
 msgstr "Zadajte údaje Vášho konta na %s"
 
-#: clientgui/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 ""
-"Prosím vložte informácie o Vašom konte\n"
-"(pre vytvorenie konta navštívte web stránku projektu)"
+msgstr "Prosím vložte informácie o Vašom konte\n(pre vytvorenie konta navštívte web stránku projektu)"
 
-#: clientgui/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 ""
-"Tento projekt momentálne neakceptuje nové kontá.\n"
-"Môžete sa pripojiť len ak už máte konto vytvorené."
+msgstr "Tento projekt momentálne neakceptuje nové kontá.\nMôžete sa pripojiť len ak už máte konto vytvorené."
 
-#: clientgui/AccountInfoPage.cpp:401
+#: clientgui/AccountInfoPage.cpp:375
 msgid "Are you already running this project?"
 msgstr "Už ste niekedy počítali pre tento projekt?"
 
-#: clientgui/AccountInfoPage.cpp:405
+#: clientgui/AccountInfoPage.cpp:379
 msgid "&No, new user"
-msgstr "&Nie, som nový užívateľ"
+msgstr "&Nie, som nový používateľ"
 
-#: clientgui/AccountInfoPage.cpp:408
+#: clientgui/AccountInfoPage.cpp:382
 msgid "&Yes, existing user"
 msgstr "Áno, som už existujúci užív&ateľ"
 
-#: clientgui/AccountInfoPage.cpp:413
+#: clientgui/AccountInfoPage.cpp:387
 msgid ""
 "We were not able to set up your account information\n"
 "automatically.\n"
@@ -65,127 +65,116 @@ msgid ""
 "Please click on the 'Find login information' link\n"
 "below to find out what to put in the email address and\n"
 "password fields."
-msgstr ""
-"Nebolo možné automaticky nastaviť údaje o Vašom konte.\n"
-"\n"
-"Prosím kliknite dolu na 'Získať prihlasovacie údaje',\n"
-"aby ste sa dozvedeli, čo je potrebné zadať\n"
-"do polí emailová adresa a heslo."
+msgstr "Nebolo možné automaticky nastaviť údaje o Vašom konte.\n\nProsím kliknite dolu na 'Získať prihlasovacie údaje',\naby ste sa dozvedeli, čo je potrebné zadať\ndo polí emailová adresa a heslo."
 
-#: clientgui/AccountInfoPage.cpp:416
+#: clientgui/AccountInfoPage.cpp:390
 msgid "Find login information"
 msgstr "Získať prihlasovacie údaje"
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:649
+#: clientgui/AccountInfoPage.cpp:410 clientgui/AccountInfoPage.cpp:632
 msgid "&Password:"
 msgstr "&Heslo:"
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:673
+#: clientgui/AccountInfoPage.cpp:417 clientgui/AccountInfoPage.cpp:656
 msgid "Choose a &password:"
 msgstr "Zvoľte &heslo:"
 
-#: clientgui/AccountInfoPage.cpp:446
+#: clientgui/AccountInfoPage.cpp:420
 msgid "C&onfirm password:"
 msgstr "P&otvrďte heslo:"
 
-#: clientgui/AccountInfoPage.cpp:453
+#: clientgui/AccountInfoPage.cpp:427
 #, c-format
 msgid "Are you already running %s?"
 msgstr "Používate už %s?"
 
-#: clientgui/AccountInfoPage.cpp:482
+#: clientgui/AccountInfoPage.cpp:456
 msgid "&Username:"
-msgstr "&Užívateľské meno:"
+msgstr "Po&užívateľské meno:"
 
-#: clientgui/AccountInfoPage.cpp:511
+#: clientgui/AccountInfoPage.cpp:485
 msgid "&Email address or LDAP ID:"
-msgstr ""
+msgstr "&Emailová adresa alebo ID v LDAP:"
 
-#: clientgui/AccountInfoPage.cpp:515
+#: clientgui/AccountInfoPage.cpp:489
 msgid "&Email address:"
 msgstr "&Emailová adresa:"
 
-#: clientgui/AccountInfoPage.cpp:523
+#: clientgui/AccountInfoPage.cpp:497
 #, c-format
 msgid "minimum length %d"
 msgstr "minimálna dĺžka %d"
 
-#: clientgui/AccountInfoPage.cpp:530
+#: clientgui/AccountInfoPage.cpp:504
 msgid "Forgot your password?"
 msgstr "Zabudli ste heslo?"
 
-#: clientgui/AccountInfoPage.cpp:537
+#: 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 ""
-"Ak ešte nie ste zaregistrovaný u tohto Správu konta,\n"
-"urobte to ešte pred pokračovaním.  Kliknite dolu\n"
-"na zaregistrovanie alebo získanie zabudnutého hesla."
+msgstr "Ak ešte nie ste zaregistrovaný u tohto Správu konta,\nurobte to ešte pred pokračovaním.  Kliknite dolu\nna zaregistrovanie alebo získanie zabudnutého hesla."
 
-#: clientgui/AccountInfoPage.cpp:540
+#: clientgui/AccountInfoPage.cpp:514
 msgid "Account manager web site"
-msgstr ""
+msgstr "Website manager de cont"
 
-#: clientgui/AccountInfoPage.cpp:582
+#: clientgui/AccountInfoPage.cpp:556
 msgid "Add project"
 msgstr "Pripojiť sa k projektu"
 
-#: clientgui/AccountInfoPage.cpp:584
+#: clientgui/AccountInfoPage.cpp:558
 msgid "Update account manager"
 msgstr "Aktualizovať Správcu konta"
 
-#: clientgui/AccountInfoPage.cpp:586
+#: clientgui/AccountInfoPage.cpp:560
 msgid "Use account manager"
 msgstr "Použiť Správcu konta"
 
-#: clientgui/AccountInfoPage.cpp:593
+#: clientgui/AccountInfoPage.cpp:567
 msgid "Please enter a user name."
 msgstr "Prosím zadajte používateľské meno."
 
-#: clientgui/AccountInfoPage.cpp:595
+#: clientgui/AccountInfoPage.cpp:569
 msgid "Please enter an email address."
 msgstr "Prosím zadajte emailovú adresu."
 
-#: clientgui/AccountInfoPage.cpp:605
+#: clientgui/AccountInfoPage.cpp:579
 #, c-format
 msgid "Please enter a password of at least %d characters."
 msgstr "Prosím zadajte heslo s aspoň %d znakmi."
 
-#: clientgui/AccountInfoPage.cpp:615
-msgid "The password and confirmation password do not match. Please type them again."
+#: clientgui/AccountInfoPage.cpp:589
+msgid ""
+"The password and confirmation password do not match. Please type them again."
 msgstr "Heslo a potvrdenie hesla nesúhlasia. Prosím vložte ich znova."
 
-#: clientgui/AccountManagerInfoPage.cpp:272
+#: clientgui/AccountManagerInfoPage.cpp:270
 msgid "Choose an account manager"
 msgstr "Zvoľte Správcu konta"
 
-#: clientgui/AccountManagerInfoPage.cpp:275
+#: clientgui/AccountManagerInfoPage.cpp:273
 msgid ""
 "To choose an account manager, click its name or \n"
 "type its URL below."
-msgstr ""
-"Zvoľte Správcu konta kliknutím na jeho názov\n"
-"alebo napíšte jeho adresu URL."
+msgstr "Zvoľte Správcu konta kliknutím na jeho názov\nalebo napíšte jeho adresu URL."
 
-#: clientgui/AccountManagerInfoPage.cpp:279
+#: clientgui/AccountManagerInfoPage.cpp:277
 msgid "Account manager details:"
-msgstr ""
+msgstr "Detaily Správcu konta:"
 
-#: clientgui/AccountManagerInfoPage.cpp:283
+#: clientgui/AccountManagerInfoPage.cpp:281
 msgid "Account manager &URL:"
-msgstr ""
+msgstr "&URL Správcu konta:"
 
-#: clientgui/AccountManagerInfoPage.cpp:287
+#: clientgui/AccountManagerInfoPage.cpp:285
 msgid "Open web page"
-msgstr ""
+msgstr "Otvoriť webstránku"
 
-#: clientgui/AccountManagerInfoPage.cpp:290
+#: clientgui/AccountManagerInfoPage.cpp:288
 msgid "Visit this account manager's web site"
-msgstr ""
+msgstr "Navštíviť webstránku Správcu konta"
 
 #: clientgui/AccountManagerProcessingPage.cpp:186
 #: clientgui/AccountManagerPropertiesPage.cpp:192
@@ -207,320 +196,334 @@ msgstr "Prosím čakajte..."
 msgid "An internal server error has occurred.\n"
 msgstr "Vyskytla sa interná chyba servera.\n"
 
-#: clientgui/AdvancedFrame.cpp:96
+#: clientgui/AdvancedFrame.cpp:99
 msgid "Connected"
 msgstr "Pripojené"
 
-#: clientgui/AdvancedFrame.cpp:104
+#: clientgui/AdvancedFrame.cpp:107
 msgid "Disconnected"
 msgstr "Odpojené"
 
-#: clientgui/AdvancedFrame.cpp:318
+#: clientgui/AdvancedFrame.cpp:325
+#, c-format
+msgid "New %s window..."
+msgstr "Nové okno %s..."
+
+#: clientgui/AdvancedFrame.cpp:329
+#, c-format
+msgid "Open another %s window"
+msgstr "Otvoriť ďalšie okno %s"
+
+#: clientgui/AdvancedFrame.cpp:340
+msgid "Select computer..."
+msgstr "Vybrať počítač..."
+
+#: clientgui/AdvancedFrame.cpp:341
+msgid "Connect to a BOINC client on another computer"
+msgstr "Pripojiť k BOINC klientovi na inom počítači"
+
+#: clientgui/AdvancedFrame.cpp:345
+msgid "Shut down connected client..."
+msgstr "Vypnúť pripojeného klienta..."
+
+#: clientgui/AdvancedFrame.cpp:346
+msgid "Shut down the currently connected BOINC client"
+msgstr "Vypnúť aktuálne pripojeného klienta BOINC"
+
+#: clientgui/AdvancedFrame.cpp:351
 #, c-format
 msgid "Close the %s window"
 msgstr "Zavrieť okno %s"
 
-#: clientgui/AdvancedFrame.cpp:321
-msgid "&Close Window"
+#: clientgui/AdvancedFrame.cpp:354
+msgid "&Close window"
 msgstr "&Zavrieť okno"
 
-#: clientgui/AdvancedFrame.cpp:332
-#: clientgui/AdvancedFrame.cpp:339
-#: clientgui/AdvancedFrame.cpp:346
+#: clientgui/AdvancedFrame.cpp:363 clientgui/AdvancedFrame.cpp:368
+#: clientgui/AdvancedFrame.cpp:373
 #, c-format
 msgid "Exit %s"
 msgstr "Ukončiť %s"
 
-#: clientgui/AdvancedFrame.cpp:359
-msgid "Preferences..."
-msgstr ""
+#: clientgui/AdvancedFrame.cpp:386
+msgid "Preferences…"
+msgstr "Preferencie…"
 
-#: clientgui/AdvancedFrame.cpp:368
+#: clientgui/AdvancedFrame.cpp:395
 msgid "&Notices\tCtrl+Shift+N"
 msgstr "&Oznamy\tCtrl+Shift+N"
 
-#: clientgui/AdvancedFrame.cpp:369
-msgid "Display notices"
+#: clientgui/AdvancedFrame.cpp:396
+msgid "Show notices"
 msgstr "Zobraziť oznamy"
 
-#: clientgui/AdvancedFrame.cpp:374
+#: clientgui/AdvancedFrame.cpp:401
 msgid "&Projects\tCtrl+Shift+P"
 msgstr "&Projekty\t Ctrl+Shift+P"
 
-#: clientgui/AdvancedFrame.cpp:375
-msgid "Display projects"
+#: clientgui/AdvancedFrame.cpp:402
+msgid "Show projects"
 msgstr "Zobraziť projekty"
 
-#: clientgui/AdvancedFrame.cpp:380
+#: clientgui/AdvancedFrame.cpp:407
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr "Ú&lohy\t Ctrl+Shift+T"
 
-#: clientgui/AdvancedFrame.cpp:381
-msgid "Display tasks"
+#: clientgui/AdvancedFrame.cpp:408
+msgid "Show tasks"
 msgstr "Zobraziť úlohy"
 
-#: clientgui/AdvancedFrame.cpp:386
+#: clientgui/AdvancedFrame.cpp:413
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr "P&renosy\tCtrl+Shift+X"
 
-#: clientgui/AdvancedFrame.cpp:387
-msgid "Display transfers"
+#: clientgui/AdvancedFrame.cpp:414
+msgid "Show file transfers"
 msgstr "Zobraziť prenosy"
 
-#: clientgui/AdvancedFrame.cpp:392
+#: clientgui/AdvancedFrame.cpp:419
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "Š&tatistiky\t Ctrl+Shift+S"
 
-#: clientgui/AdvancedFrame.cpp:393
-msgid "Display statistics"
+#: clientgui/AdvancedFrame.cpp:420
+msgid "Show statistics"
 msgstr "Zobraziť štatistiky"
 
-#: clientgui/AdvancedFrame.cpp:398
-msgid "&Disk usage\tCtrl+Shift+D"
-msgstr "Využite &disku\t Ctrl+Shift+D"
+#: clientgui/AdvancedFrame.cpp:425
+msgid "&Disk\tCtrl+Shift+D"
+msgstr "&Disk\tCtrl+Shift+D"
 
-#: clientgui/AdvancedFrame.cpp:399
-msgid "Display disk usage"
+#: clientgui/AdvancedFrame.cpp:426
+msgid "Show disk usage"
 msgstr "Zobraziť využitie disku"
 
-#: clientgui/AdvancedFrame.cpp:406
+#: 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
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr "Jednoduché &zobrazenie...\t Ctrl+Shift+V"
 
-#: clientgui/AdvancedFrame.cpp:407
-msgid "Display the simple graphical interface."
-msgstr "Zobraziť jednoduché grafické rozhranie."
+#: clientgui/AdvancedFrame.cpp:440
+msgid "Switch to the Simple View"
+msgstr "Prepnúť na zjednodušený vzhľad"
 
-#: clientgui/AdvancedFrame.cpp:421
+#: clientgui/AdvancedFrame.cpp:454
 msgid "&Add project or account manager..."
 msgstr "P&ripojiť k projektu alebo Správcovi konta..."
 
-#: clientgui/AdvancedFrame.cpp:422
-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/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:426
+#: clientgui/AdvancedFrame.cpp:459
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "&Synchronizovať s %s"
 
-#: clientgui/AdvancedFrame.cpp:430
+#: clientgui/AdvancedFrame.cpp:463
 #, c-format
 msgid "Get current settings from %s"
 msgstr "Získať aktuálne nastavenia z %s"
 
-#: clientgui/AdvancedFrame.cpp:440
+#: clientgui/AdvancedFrame.cpp:473
 msgid "&Add project..."
 msgstr "P&ripojiť k projektu..."
 
-#: clientgui/AdvancedFrame.cpp:441
+#: clientgui/AdvancedFrame.cpp:474
 msgid "Add a project"
 msgstr "Pripojiť k projektu"
 
-#: clientgui/AdvancedFrame.cpp:444
+#: clientgui/AdvancedFrame.cpp:477
 #, c-format
 msgid "S&top using %s..."
 msgstr "&Ukončiť používanie %s..."
 
-#: clientgui/AdvancedFrame.cpp:450
+#: clientgui/AdvancedFrame.cpp:483
 msgid "Remove this computer from account manager control."
 msgstr "Odstrániť počítač z ovládania Správcom konta."
 
-#: clientgui/AdvancedFrame.cpp:455
-msgid "&Options..."
-msgstr "&Nastavenia..."
+#: clientgui/AdvancedFrame.cpp:489
+msgid "Run CPU &benchmarks"
+msgstr "Spustiť &testy CPU"
 
-#: clientgui/AdvancedFrame.cpp:456
-msgid "Configure display options and proxy settings"
-msgstr "Konfigurovať voľby zobrazenia a nastavenia proxy"
+#: clientgui/AdvancedFrame.cpp:490
+msgid "Run tests that measure CPU speed"
+msgstr "Spustiť testy na zmeranie rýchlosti CPU"
 
-#: clientgui/AdvancedFrame.cpp:460
-msgid "Computing &preferences..."
-msgstr "&Preferencie počítania..."
+#: clientgui/AdvancedFrame.cpp:494
+msgid "Retry pending transfers"
+msgstr "Zopakovať čakajúce prenosy"
 
-#: clientgui/AdvancedFrame.cpp:461
-msgid "Configure computing preferences"
-msgstr "Konfigurovať preferencie počítania"
+#: clientgui/AdvancedFrame.cpp:495
+msgid "Retry deferred file transfers and task requests"
+msgstr "Zopakovať odložené prenosy súborov a požiadavky na úlohy."
 
-#: clientgui/AdvancedFrame.cpp:469
+#: clientgui/AdvancedFrame.cpp:503
 msgid "&Run always"
 msgstr "&Počítať stále"
 
-#: clientgui/AdvancedFrame.cpp:470
+#: clientgui/AdvancedFrame.cpp:504
 msgid "Allow work regardless of preferences"
 msgstr "Povoliť prácu bez ohľadu na preferencie"
 
-#: clientgui/AdvancedFrame.cpp:474
+#: clientgui/AdvancedFrame.cpp:508
 msgid "Run based on &preferences"
 msgstr "P&očítať podľa preferencií"
 
-#: clientgui/AdvancedFrame.cpp:475
+#: clientgui/AdvancedFrame.cpp:509
 msgid "Allow work according to preferences"
 msgstr "Povoliť prácu podľa preferencií"
 
-#: clientgui/AdvancedFrame.cpp:479
+#: clientgui/AdvancedFrame.cpp:513
 msgid "&Suspend"
 msgstr "Po&zastaviť"
 
-#: clientgui/AdvancedFrame.cpp:480
+#: clientgui/AdvancedFrame.cpp:514
 msgid "Stop work regardless of preferences"
 msgstr "Zastaví prácu bez ohľadu na preferencie"
 
-#: clientgui/AdvancedFrame.cpp:505
+#: clientgui/AdvancedFrame.cpp:539
 msgid "Use GPU always"
 msgstr "Vždy používať GPU"
 
-#: clientgui/AdvancedFrame.cpp:506
+#: clientgui/AdvancedFrame.cpp:540
 msgid "Allow GPU work regardless of preferences"
 msgstr "Povoliť prácu na GPU bez ohľadu na preferencie"
 
-#: clientgui/AdvancedFrame.cpp:510
+#: clientgui/AdvancedFrame.cpp:544
 msgid "Use GPU based on preferences"
 msgstr "Počítať na GPU podľa preferencií"
 
-#: clientgui/AdvancedFrame.cpp:511
+#: clientgui/AdvancedFrame.cpp:545
 msgid "Allow GPU work according to preferences"
 msgstr "Povoliť prácu na GPU podľa Vašich preferencií"
 
-#: clientgui/AdvancedFrame.cpp:515
+#: clientgui/AdvancedFrame.cpp:549
 msgid "Suspend GPU"
 msgstr "Pozastaviť GPU"
 
-#: clientgui/AdvancedFrame.cpp:516
+#: clientgui/AdvancedFrame.cpp:550
 msgid "Stop GPU work regardless of preferences"
 msgstr "Zastaviť prácu na GPU bez ohľadu na preferencie"
 
-#: clientgui/AdvancedFrame.cpp:540
-msgid "Network activity always available"
+#: clientgui/AdvancedFrame.cpp:574
+msgid "Network activity always allowed"
 msgstr "Sieťové aktivity vždy povolené"
 
-#: clientgui/AdvancedFrame.cpp:541
+#: clientgui/AdvancedFrame.cpp:575
 msgid "Allow network activity regardless of preferences"
 msgstr "Povoliť sieťové aktivity bez ohľadu na preferencie"
 
-#: clientgui/AdvancedFrame.cpp:545
+#: clientgui/AdvancedFrame.cpp:579
 msgid "Network activity based on preferences"
 msgstr "Sieťové aktivity podľa preferencií"
 
-#: clientgui/AdvancedFrame.cpp:546
+#: clientgui/AdvancedFrame.cpp:580
 msgid "Allow network activity according to preferences"
 msgstr "Povoliť sieťové aktivity v súlade s Vašimi preferenciami"
 
-#: clientgui/AdvancedFrame.cpp:550
+#: clientgui/AdvancedFrame.cpp:584
 msgid "Network activity suspended"
 msgstr "Sieťové aktivity pozastavené"
 
-#: clientgui/AdvancedFrame.cpp:551
+#: clientgui/AdvancedFrame.cpp:585
 msgid "Stop BOINC network activity"
 msgstr "Zastaviť sieťové aktivity pre BOINC"
 
-#: clientgui/AdvancedFrame.cpp:561
-#, c-format
-msgid "Connect to another computer running %s"
-msgstr "Pripojiť k inému počítaču počítajúcemu %s"
+#: clientgui/AdvancedFrame.cpp:594
+msgid "Computing &preferences..."
+msgstr "&Preferencie počítania..."
 
-#: clientgui/AdvancedFrame.cpp:566
-msgid "Select computer..."
-msgstr "Vybrať počítač..."
+#: clientgui/AdvancedFrame.cpp:595
+msgid "Configure computing preferences"
+msgstr "Konfigurovať preferencie počítania"
 
-#: clientgui/AdvancedFrame.cpp:571
-msgid "Shut down connected client..."
-msgstr "Vypnúť pripojeného klienta..."
+#: clientgui/AdvancedFrame.cpp:600
+msgid "Exclusive applications..."
+msgstr "Výhradné aplikácie..."
 
-#: clientgui/AdvancedFrame.cpp:572
-msgid "Shut down the currently connected client"
-msgstr "Vypnúť aktuálne pripojeného klienta"
+#: clientgui/AdvancedFrame.cpp:601
+msgid "Configure exclusive applications"
+msgstr "Nastaviť výhradné aplikácie"
 
-#: clientgui/AdvancedFrame.cpp:576
-msgid "Run CPU &benchmarks"
-msgstr "Spustiť &testy CPU"
+#: clientgui/AdvancedFrame.cpp:606
+msgid "Select columns..."
+msgstr "Vybrať stĺpce..."
 
-#: clientgui/AdvancedFrame.cpp:577
-msgid "Runs BOINC CPU benchmarks"
-msgstr "Spustiť BOINC testy rýchlosti procesora"
+#: clientgui/AdvancedFrame.cpp:607
+msgid "Select which columns to display"
+msgstr "Vybrať stĺpce na zobrazenie"
 
-#: clientgui/AdvancedFrame.cpp:581
-msgid "Do network communication"
-msgstr "Spustiť všetky prenosy"
+#: clientgui/AdvancedFrame.cpp:611
+msgid "Event Log options...\tCtrl+Shift+F"
+msgstr "Nastavenia záznamu udalostí...⇥Ctrl+Shift+F"
+
+#: clientgui/AdvancedFrame.cpp:612
+msgid "Enable or disable various diagnostic messages"
+msgstr "Povoliť alebo zakázať rôzne diagnostické správy"
 
-#: clientgui/AdvancedFrame.cpp:582
-msgid "Do all pending network communication"
-msgstr "Vykonať čakajúcu sieťovú komunikáciu"
+#: clientgui/AdvancedFrame.cpp:616
+msgid "&Other options..."
+msgstr "&Ďalšie nastavenia..."
+
+#: clientgui/AdvancedFrame.cpp:617
+msgid "Configure display options and network settings"
+msgstr "Nastaviť obrazovku a sieť"
 
-#: clientgui/AdvancedFrame.cpp:586
+#: clientgui/AdvancedFrame.cpp:622
 msgid "Read config files"
 msgstr "Načítať konfiguračné súbory"
 
-#: clientgui/AdvancedFrame.cpp:587
-msgid "Read configuration info from cc_config.xml and any app_config.xml files"
+#: clientgui/AdvancedFrame.cpp:623
+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:591
+#: clientgui/AdvancedFrame.cpp:627
 msgid "Read local prefs file"
 msgstr "Načítať súbor lokálnych preferencií"
 
-#: clientgui/AdvancedFrame.cpp:592
+#: clientgui/AdvancedFrame.cpp:628
 msgid "Read preferences from global_prefs_override.xml."
 msgstr "Načítať preferencie z global_prefs_override.xml."
 
-#: clientgui/AdvancedFrame.cpp:597
-#, c-format
-msgid "Launch another instance of %s..."
-msgstr "Spustiť ďalšiu kópiu %s..."
-
-#: clientgui/AdvancedFrame.cpp:601
-#, c-format
-msgid "Launch another %s"
-msgstr "Spustiť ďalší %s"
-
-#: clientgui/AdvancedFrame.cpp:611
-msgid "Event Log...\tCtrl+Shift+E"
-msgstr "Záznam udalostí...\tCtrl+Shift+E"
-
-#: clientgui/AdvancedFrame.cpp:612
-msgid "Display diagnostic messages."
-msgstr "Zobraziť diagnostické správy."
-
-#: clientgui/AdvancedFrame.cpp:616
-msgid "Event Log Diagnostic Flags...\tCtrl+Shift+F"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:617
-msgid "Enable or disable various diagnostic messages"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:626
+#: clientgui/AdvancedFrame.cpp:636
 #, c-format
 msgid "%s &help"
 msgstr "P&omoc s %s"
 
-#: clientgui/AdvancedFrame.cpp:632
+#: clientgui/AdvancedFrame.cpp:640
 #, c-format
 msgid "Show information about %s"
 msgstr "Zobraziť informácie o %s"
 
-#: clientgui/AdvancedFrame.cpp:644
+#: clientgui/AdvancedFrame.cpp:650
 #, c-format
 msgid "&%s help"
 msgstr "Pomoc s &%s"
 
-#: clientgui/AdvancedFrame.cpp:650
+#: clientgui/AdvancedFrame.cpp:654
 #, c-format
 msgid "Show information about the %s"
 msgstr "Zobraziť informácie o %s"
 
-#: clientgui/AdvancedFrame.cpp:662
+#: clientgui/AdvancedFrame.cpp:665
 #, c-format
 msgid "%s &web site"
-msgstr ""
+msgstr "&Webstránka %s"
 
-#: clientgui/AdvancedFrame.cpp:668
+#: clientgui/AdvancedFrame.cpp:669
 #, 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:680 clientgui/BOINCTaskBar.cpp:544
 #, c-format
 msgid "&About %s..."
 msgstr "&O %s..."
@@ -538,27 +541,27 @@ msgid "&View"
 msgstr "&Náhľad"
 
 #: clientgui/AdvancedFrame.cpp:701
-msgid "&Tools"
-msgstr "&Nástroje"
-
-#: clientgui/AdvancedFrame.cpp:705
 msgid "&Activity"
 msgstr "&Aktivity"
 
+#: clientgui/AdvancedFrame.cpp:705
+msgid "&Options"
+msgstr "&Nastavenia"
+
 #: clientgui/AdvancedFrame.cpp:709
-msgid "A&dvanced"
-msgstr "&Pokročilé"
+msgid "&Tools"
+msgstr "&Nástroje"
 
 #: clientgui/AdvancedFrame.cpp:713
 msgid "&Help"
 msgstr "&Pomoc"
 
-#: clientgui/AdvancedFrame.cpp:1185
+#: clientgui/AdvancedFrame.cpp:1188
 #, c-format
 msgid "%s - Stop using %s"
 msgstr "%s - Ukončiť používanie %s"
 
-#: clientgui/AdvancedFrame.cpp:1190
+#: clientgui/AdvancedFrame.cpp:1193
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -566,55 +569,48 @@ msgid ""
 "but you'll have to manage projects manually.\n"
 "\n"
 "Do you want to stop using %s?"
-msgstr ""
-"Ak prestanete používať %s,\n"
-"všetky Vaše aktuálne projekty zostanú zachované,\n"
-"ale budete ich musieť spravovať manuálne.\n"
-"\n"
-"Chcete zastaviť používanie %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:1397
+#: clientgui/AdvancedFrame.cpp:1420
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s - Vypnúť aktuálneho klienta..."
 
-#: clientgui/AdvancedFrame.cpp:1406
+#: clientgui/AdvancedFrame.cpp:1429
 #, 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\n"
-"a vyzve Vás na pripojenie na iný počítač."
+msgstr "%s vypne aktuálne pripojeného klienta\na vyzve Vás na pripojenie na iný počítač."
 
-#: clientgui/AdvancedFrame.cpp:1806
+#: clientgui/AdvancedFrame.cpp:1832
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: clientgui/AdvancedFrame.cpp:1815
+#: clientgui/AdvancedFrame.cpp:1841
 #, c-format
 msgid "%s has successfully added %s"
 msgstr "%s bol úspešne pripojený k %s"
 
-#: clientgui/AdvancedFrame.cpp:1953
+#: clientgui/AdvancedFrame.cpp:1977
 #, c-format
 msgid "%s - (%s)"
 msgstr "%s - (%s)"
 
-#: clientgui/AdvancedFrame.cpp:1957
+#: clientgui/AdvancedFrame.cpp:1981
 #, c-format
 msgid "Connecting to %s"
 msgstr "Pripájanie k %s"
 
-#: clientgui/AdvancedFrame.cpp:1960
+#: clientgui/AdvancedFrame.cpp:1984
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "Pripojené k %s (%s)"
 
 #: clientgui/AlreadyExistsPage.cpp:184
 msgid "Username already in use"
-msgstr "Užívateľské meno je už použité"
+msgstr "Používateľské meno je už použité"
 
 #: clientgui/AlreadyExistsPage.cpp:187
 msgid ""
@@ -622,11 +618,7 @@ msgid ""
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"Konto s týmto užívateľským menom už existuje a má\n"
-"iné heslo ako Vami vložené.\n"
-"\n"
-"Prosím navštívte web stránku projektu a riaďte sa tam instrukciami."
+msgstr "Konto s týmto používateľským menom už existuje a má\niné heslo ako Vami vložené.\n\nProsím navštívte web stránku projektu a riaďte sa tam instrukciami."
 
 #: clientgui/AlreadyExistsPage.cpp:191
 msgid "Email address already in use"
@@ -638,11 +630,7 @@ msgid ""
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"Konto s touto emailovou adresou už existuje a má \n"
-"iné heslo ako ste vložili.\n"
-"\n"
-"Prosím navštívte web stránku projektu a riaďte sa inštrukciami."
+msgstr "Konto s touto emailovou adresou už existuje a má \niné heslo ako ste vložili.\n\nProsím navštívte web stránku projektu a riaďte sa inštrukciami."
 
 #: clientgui/AsyncRPC.cpp:1031
 msgid "Communicating with BOINC client.  Please wait ..."
@@ -667,89 +655,76 @@ msgstr "%s - Komunikácia"
 msgid "Cancel"
 msgstr "Späť"
 
-#: clientgui/BOINCBaseFrame.cpp:504
+#: clientgui/BOINCBaseFrame.cpp:512
 #, c-format
 msgid "%s - Connection Error"
 msgstr "%s - Chyba pripojenia"
 
-#: clientgui/BOINCBaseFrame.cpp:513
+#: 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 ""
-"Momentálne nemáte oprávnenia spravovať tohto klienta.\n"
-"Kontaktujte prosím Vášho administrátora, aby Vás pridal do lokálnej skupiny používateľov 'boinc_users'."
+msgstr "Momentálne nemáte oprávnenia spravovať tohto klienta.\nKontaktujte prosím Vášho administrátora, aby Vás pridal do lokálnej skupiny používateľov 'boinc_users'."
 
-#: clientgui/BOINCBaseFrame.cpp:522
+#: 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 ""
-"Autorizácia nemala pripojenie pre spustenie klienta.\n"
-"Preverte, či spúšťate tento program v tom istom adresári kde je klient."
+msgstr "Autorizácia nemala pripojenie pre spustenie klienta.\nPreverte, či spúšťate tento program v tom istom adresári kde je klient."
 
-#: clientgui/BOINCBaseFrame.cpp:524
+#: clientgui/BOINCBaseFrame.cpp:532
 msgid "Authorization failed connecting to running client."
 msgstr "Zlyhala autorizácia pri pripájaní k bežiacemu klientovi."
 
-#: clientgui/BOINCBaseFrame.cpp:532
+#: clientgui/BOINCBaseFrame.cpp:540
 msgid "The password you have provided is incorrect, please try again."
 msgstr "Heslo ktoré ste poskytli je nesprávne, prosím skúste znova."
 
-#: clientgui/BOINCBaseFrame.cpp:576
+#: clientgui/BOINCBaseFrame.cpp:584
 #, c-format
 msgid "%s - Connection Failed"
 msgstr "%s - Pripojenie neúspešné"
 
-#: clientgui/BOINCBaseFrame.cpp:585
+#: 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 nie je schopný pripojiť sa k %s klientovi.\n"
-"Chcete skúsiť pripojiť sa znova?"
+msgstr "%s nie je schopný pripojiť sa k %s klientovi.\nChcete skúsiť pripojiť sa znova?"
 
-#: clientgui/BOINCBaseFrame.cpp:621
+#: clientgui/BOINCBaseFrame.cpp:629
 #, c-format
 msgid "%s - Daemon Start Failed"
 msgstr "%s - Spustenie daemona zlyhalo"
 
-#: clientgui/BOINCBaseFrame.cpp:631
+#: 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 nie je schopný spustiť %s.\n"
-"Spustite prosím Ovládacie panely->Nástroje pre správu->Služby a spustite službu BOINC."
+msgstr "%s nie je schopný spustiť %s.\nSpustite prosím Ovládacie panely->Nástroje pre správu->Služby a spustite službu BOINC."
 
-#: clientgui/BOINCBaseFrame.cpp:637
+#: 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 nie je schopný spustiť klienta %s.\n"
-"Spustite prosím daemona a skúste to znova."
+msgstr "%s nie je schopný spustiť klienta %s.\nSpustite prosím daemona a skúste to znova."
 
-#: clientgui/BOINCBaseFrame.cpp:688
+#: clientgui/BOINCBaseFrame.cpp:696
 #, c-format
 msgid "%s - Connection Status"
 msgstr "%s - Stav pripojenia"
 
-#: clientgui/BOINCBaseFrame.cpp:699
+#: clientgui/BOINCBaseFrame.cpp:707
 #, 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"
 "To connect up to your local computer please use 'localhost' as the host name."
-msgstr ""
-"%s nie je momentálne pripojený k %s clientovi.\n"
-"Prosím použite 'Súbor\\Vybrať počítač...' voľbu ponuky pre pripojenie sa k %s klientovi.\n"
-"Pre pripojenie sa k Vášmu miestnemu počítaču prosím použite 'localhost' ako názov počítača."
+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."
 
-#: clientgui/BOINCBaseView.cpp:752
+#: clientgui/BOINCBaseView.cpp:790
 msgid "Project web pages"
 msgstr "Webstránky projektu"
 
@@ -763,9 +738,7 @@ msgstr "%s - Nečakané ukončenie"
 msgid ""
 "The %s client has exited unexpectedly 3 times within the last %d minutes.\n"
 "Would you like to restart it again?"
-msgstr ""
-"Klient %s 3x nečakane ukončil prácu počas posledných %d minút.\n"
-"Chcete ho znovu reštartovať?"
+msgstr "Klient %s 3x nečakane ukončil prácu počas posledných %d minút.\nChcete ho znovu reštartovať?"
 
 #: clientgui/BOINCDialupManager.cpp:61
 #, c-format
@@ -777,9 +750,7 @@ msgstr "%s - Stav siete"
 msgid ""
 "%s needs to connect to the Internet.\n"
 "May it do so now?"
-msgstr ""
-"%s sa potrebuje pripojiť k Internetu.\n"
-"Môže to byť teraz?"
+msgstr "%s sa potrebuje pripojiť k Internetu.\nMôže to byť teraz?"
 
 #: clientgui/BOINCDialupManager.cpp:254
 #, c-format
@@ -801,9 +772,7 @@ msgstr "%s bol neúspešný pri pripájaní k Internetu."
 msgid ""
 "%s has detected it is now connected to the Internet.\n"
 "Updating all projects and retrying all transfers."
-msgstr ""
-"%s má detekované aktuálne pripojenie k Internetu.\n"
-"Aktualizujú sa všetky projekty a obnovujú všetky prenosy."
+msgstr "%s má detekované aktuálne pripojenie k Internetu.\nAktualizujú sa všetky projekty a obnovujú všetky prenosy."
 
 #: clientgui/BOINCDialupManager.cpp:417
 #, c-format
@@ -815,7 +784,7 @@ msgstr "%s je úspešne odpojený od Internetu."
 msgid "%s failed to disconnected from the Internet."
 msgstr "%s bol neúspešný pri odpájaní od Internetu."
 
-#: clientgui/BOINCGUIApp.cpp:595
+#: clientgui/BOINCGUIApp.cpp:597
 #, c-format
 msgid ""
 "You currently are not authorized to manage the client.\n"
@@ -826,104 +795,92 @@ msgid ""
 " or\n"
 "  - contact your administrator to add you to the 'boinc_master'\n"
 "     user group."
-msgstr ""
-"Momentálne nemáte oprávnenia na správu klienta.\n"
-"\n"
-"Aby ste mohli používať %s ako aktuálny užívateľ:\n"
-"  - preinštalujte %s s voľbou \"Áno\" pri otázke o\n"
-"     ne-administrátorských kontách\n"
-" alebo\n"
-"  - kontaktujte Vášho administrátora, aby Vás pridal\n"
-"     do skupiny používateľov 'boinc_master'."
-
-#: clientgui/BOINCGUIApp.cpp:601
+msgstr "Momentálne nemáte oprávnenia na správu klienta.\n\nAby ste mohli používať %s ako aktuálny používateľ:\n  - preinštalujte %s s voľbou \"Áno\" pri otázke o\n     ne-administrátorských kontách\n alebo\n  - kontaktujte Vášho administrátora, aby Vás pridal\n     do skupiny používateľov 'boinc_master'."
+
+#: clientgui/BOINCGUIApp.cpp:603
 #, c-format
 msgid ""
 "%s ownership or permissions are not set properly; please reinstall %s.\n"
 "(Error code %d"
-msgstr ""
-"Vlastnícke práva alebo povolenia pre %s nie sú nastavené správne; prosím nainštalujte %s znova.\n"
-"(Kód chyby %d"
+msgstr "Vlastnícke práva alebo povolenia pre %s nie sú nastavené správne; prosím nainštalujte %s znova.\n(Kód chyby %d"
 
-#: clientgui/BOINCGUIApp.cpp:607
+#: clientgui/BOINCGUIApp.cpp:609
 msgid " at "
 msgstr " na "
 
-#: clientgui/BOINCGUIApp.cpp:610
+#: clientgui/BOINCGUIApp.cpp:612
 msgid ")"
 msgstr ")"
 
-#: clientgui/BOINCGUIApp.cpp:640
+#: 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 ""
-"Pre správne fungovanie BOINC je potrebný reštart.\n"
-"Prosím reštartujte počítač a pokus opakujte."
+msgstr "Pre správne fungovanie BOINC je potrebný reštart.\nProsím reštartujte počítač a pokus opakujte."
 
-#: clientgui/BOINCGUIApp.cpp:641
+#: clientgui/BOINCGUIApp.cpp:643
 msgid "BOINC Manager"
 msgstr "Správca BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:902
+#: clientgui/BOINCGUIApp.cpp:904
 msgid "BOINC Manager was started by the operating system automatically"
 msgstr "Správca BOINC bol automaticky spustený operačným systémom"
 
-#: clientgui/BOINCGUIApp.cpp:904
+#: clientgui/BOINCGUIApp.cpp:906
 msgid "Startup BOINC so only the system tray icon is visible"
 msgstr "Spustiť BOINC len s ikonou na paneli úloh"
 
-#: clientgui/BOINCGUIApp.cpp:906
+#: clientgui/BOINCGUIApp.cpp:908
 msgid "Directory containing the BOINC Client executable"
 msgstr "Priečinok obsahujúci program BOINC klient"
 
-#: clientgui/BOINCGUIApp.cpp:907
+#: clientgui/BOINCGUIApp.cpp:909
 msgid "BOINC data directory"
 msgstr "Priečinok pre pracovné dáta BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:909
+#: clientgui/BOINCGUIApp.cpp:911
 msgid "Host name or IP address"
 msgstr "Názov alebo IP adresa servera"
 
-#: clientgui/BOINCGUIApp.cpp:910
+#: clientgui/BOINCGUIApp.cpp:912
 msgid "GUI RPC port number"
 msgstr "Číslo portu pre RPC grafického prostredia"
 
-#: clientgui/BOINCGUIApp.cpp:911
+#: clientgui/BOINCGUIApp.cpp:913
 msgid "Password"
 msgstr "Heslo"
 
-#: clientgui/BOINCGUIApp.cpp:912
+#: clientgui/BOINCGUIApp.cpp:914
 msgid "Startup BOINC with these optional arguments"
 msgstr "Spustiť BOINC s týmito voliteľnými argumentmi"
 
-#: clientgui/BOINCGUIApp.cpp:913
+#: clientgui/BOINCGUIApp.cpp:915
 msgid "disable BOINC security users and permissions"
-msgstr "zablokovať BOINC bezpečnosť užívateľov a oprávnení"
+msgstr "zablokovať BOINC bezpečnosť používateľov a oprávnení"
 
-#: clientgui/BOINCGUIApp.cpp:914
+#: clientgui/BOINCGUIApp.cpp:916
 msgid "set skin debugging mode to enable skin manager error messages"
 msgstr "zapnúť režim ladenia vzhľadu, aby mohli byť zobrazené chybové hlásenia správcu vzhľadu"
 
-#: clientgui/BOINCGUIApp.cpp:915
+#: clientgui/BOINCGUIApp.cpp:917
 msgid "multiple instances of BOINC Manager allowed"
 msgstr "viacnásobné spustenie Správcu BOINC je povolené"
 
-#: clientgui/BOINCGUIApp.cpp:917
+#: clientgui/BOINCGUIApp.cpp:919
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr "Nepoužívané: obchádzka chyby v XCode 4.2"
 
-#: clientgui/BOINCGUIApp.cpp:1164
+#: clientgui/BOINCGUIApp.cpp:1166
 msgid "(Automatic Detection)"
 msgstr "(Automatická detekcia)"
 
-#: clientgui/BOINCGUIApp.cpp:1165
+#: clientgui/BOINCGUIApp.cpp:1167
 msgid "(Unknown)"
 msgstr "(Neznáme)"
 
-#: clientgui/BOINCGUIApp.cpp:1166
+#: clientgui/BOINCGUIApp.cpp:1168
 msgid "(User Defined)"
-msgstr "(Užívateľsky definované)"
+msgstr "(Používateľom definované)"
 
 #: clientgui/BOINCTaskBar.cpp:522
 #, c-format
@@ -935,14 +892,12 @@ msgstr "Otvoriť web %s..."
 msgid "Open %s..."
 msgstr "Otvoriť %s..."
 
-#: clientgui/BOINCTaskBar.cpp:536
-#: clientgui/BOINCTaskBar.cpp:633
+#: clientgui/BOINCTaskBar.cpp:536 clientgui/BOINCTaskBar.cpp:633
 #: clientgui/BOINCTaskBar.cpp:641
 msgid "Snooze"
 msgstr "Uspať"
 
-#: clientgui/BOINCTaskBar.cpp:538
-#: clientgui/BOINCTaskBar.cpp:660
+#: clientgui/BOINCTaskBar.cpp:538 clientgui/BOINCTaskBar.cpp:660
 #: clientgui/BOINCTaskBar.cpp:668
 msgid "Snooze GPU"
 msgstr "Uspať GPU"
@@ -1021,15 +976,10 @@ msgid ""
 "Please try again later.\n"
 "\n"
 "Click Finish to close."
-msgstr ""
-"Prosím skúste znovu neskôr.\n"
-"\n"
-"Kliknite Dokončiť pre zatvorenie."
+msgstr "Prosím skúste znovu neskôr.\n\nKliknite Dokončiť pre zatvorenie."
 
-#: 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 "Kliknite na Dokončiť pre zatvorenie."
 
@@ -1049,9 +999,7 @@ msgstr "Pripojenie k projektu prebehlo úspešne."
 msgid ""
 "When you click Finish, your web browser will go to a page where\n"
 "you can set your account name and preferences."
-msgstr ""
-"Keď kliknete na Dokončiť, Váš webový prehliadač pôjde na stránku,\n"
-"kde môžete nastaviť meno Vášho konta a preferencie."
+msgstr "Keď kliknete na Dokončiť, Váš webový prehliadač pôjde na stránku,\nkde môžete nastaviť meno Vášho konta a preferencie."
 
 #: clientgui/CompletionPage.cpp:232
 #, c-format
@@ -1099,588 +1047,682 @@ msgstr "Autorské práva:"
 
 #: clientgui/DlgAbout.cpp:192
 msgid ""
-"(C) 2003-2014 University of California, Berkeley.\n"
+"(C) 2003-2015 University of California, Berkeley.\n"
 "All Rights Reserved."
-msgstr ""
+msgstr "(C) 2003-2015 Kalifornská Univerzita, Berkeley.\nVšetky práva vyhradené."
 
 #: clientgui/DlgAbout.cpp:196
-msgid "Berkeley Open Infrastructure for Network Computing"
-msgstr ""
-"Berkeley Open Infrastructure for Network Computing\n"
-"(Berkeleyská otvorená infraštruktúra pre sieťové výpočty)"
+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"
 
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:399
+#: clientgui/DlgAbout.cpp:211
+msgid "for more information."
+msgstr "pre viac informácií."
+
+#: clientgui/DlgAbout.cpp:219 clientgui/DlgExitMessage.cpp:173
+#: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:399
 #: clientgui/DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "&OK"
 
-#: clientgui/DlgAdvPreferences.cpp:602
-msgid "invalid number"
-msgstr ""
+#: clientgui/DlgAdvPreferences.cpp:669
+msgid "Invalid number"
+msgstr "Neplatné číslo"
 
-#: clientgui/DlgAdvPreferences.cpp:603
-msgid "invalid time, format is HH:MM"
-msgstr "neplatný čas, formát je HH:MM (24hodinový)"
+#: clientgui/DlgAdvPreferences.cpp:670
+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:604
-msgid "invalid time interval, format is HH:MM-HH:MM"
-msgstr "neplatný časový interval, formát je HH:MM-HH:MM (24hodinový)"
+#: clientgui/DlgAdvPreferences.cpp:671
+msgid "Number must be between 0 and 10"
+msgstr "Číslo musí byť od 0 do 10"
 
-#: clientgui/DlgAdvPreferences.cpp:817
+#: clientgui/DlgAdvPreferences.cpp:672
+msgid "Number must be between 0 and 100"
+msgstr "Číslo musí byť medzi 0 a 100"
+
+#: clientgui/DlgAdvPreferences.cpp:905
 msgid "invalid input value detected"
 msgstr "bola nájdená neplatná vstupná hodnota"
 
-#: clientgui/DlgAdvPreferences.cpp:819
+#: clientgui/DlgAdvPreferences.cpp:907
 msgid "Validation Error"
 msgstr "Chyba pri validácii"
 
-#: clientgui/DlgAdvPreferences.cpp:969
-#: clientgui/DlgAdvPreferences.cpp:975
-#: clientgui/DlgAdvPreferences.cpp:981
-msgid "Applications to add"
-msgstr "Aplikácie na pridanie"
+#: clientgui/DlgAdvPreferences.cpp:1119
+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:998
-#, c-format
-msgid "'%s' is not an executable application."
-msgstr "'%s' nie je spustiteľná aplikácia."
-
-#: clientgui/DlgAdvPreferences.cpp:999
-#: clientgui/DlgAdvPreferences.cpp:1046
-#: clientgui/DlgAdvPreferences.cpp:1070
-msgid "Add Exclusive App"
-msgstr "Pridať výhradnú aplikáciu"
-
-#: clientgui/DlgAdvPreferences.cpp:1011
-msgid "Name of application to add?"
-msgstr "Názov pridávanej aplikácie?"
-
-#: clientgui/DlgAdvPreferences.cpp:1011
-msgid "Add exclusive app"
-msgstr "Pridať výhradnú aplikáciu"
-
-#: clientgui/DlgAdvPreferences.cpp:1045
-#, c-format
-msgid "Application names must end with '%s'"
-msgstr "Názvy aplikácií musia končiť na '%s'"
+#: clientgui/DlgAdvPreferences.cpp:1120
+msgid "Confirmation"
+msgstr "Potvrdenie"
 
-#: clientgui/DlgAdvPreferences.cpp:1069
+#: clientgui/DlgAdvPreferencesBase.cpp:54
 #, c-format
-msgid "'%s' is already in the list."
-msgstr "'%s' sa už nachádza v zozname."
+msgid "%s - Computing preferences"
+msgstr "%s - Preferencie počítania"
 
-#: clientgui/DlgAdvPreferences.cpp:1161
+#: clientgui/DlgAdvPreferencesBase.cpp:77
 msgid ""
-"Do you really want to clear all local preferences?\n"
-"(This will not affect exclusive applications.)"
-msgstr ""
-"Naozaj chcete vymazať všetky lokálne preferencie?\n"
-"(Toto sa netýka výhradných aplikácií.)"
+"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/DlgAdvPreferences.cpp:1162
-msgid "Confirmation"
-msgstr "Potvrdenie"
+#: clientgui/DlgAdvPreferencesBase.cpp:85
+msgid "Using web-based preferences from"
+msgstr "Používanie nastavení webstránky z"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:49
-#, c-format
-msgid "%s - Computing preferences"
-msgstr ""
+#: clientgui/DlgAdvPreferencesBase.cpp:102
+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:66
+#: clientgui/DlgAdvPreferencesBase.cpp:111
 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 ""
-"Táto ponuka obsahuje predvoľby len pre tento počítač.\n"
-"Kliknite na OK pre uloženie predvolieb.\n"
-"Kliknite na Vymazať pre obnovenie predvolieb z webovej stránky projektu (okrem výhradných aplikácií)."
+"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."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:69
+#: clientgui/DlgAdvPreferencesBase.cpp:114
 msgid "Clear"
 msgstr "Vymazať"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:70
-msgid "clear all local preferences and close the dialog"
-msgstr "odstrániť lokálne preferencie a zavrieť ponuku"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:85
-msgid "processor usage"
-msgstr "využitie procesora"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:88
-msgid "network usage"
-msgstr "využitie siete"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:91
-msgid "disk and memory usage"
-msgstr "využitie disku a pamäte"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:94
-msgid "exclusive applications"
-msgstr "výhradná aplikácia"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:107
-#: clientgui/DlgDiagnosticLogFlags.cpp:104
-msgid "OK"
-msgstr "OK"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:108
-msgid "save all values and close the dialog"
-msgstr "uložiť hodnoty a zatvoriť ponuku"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:114
-msgid "close the dialog without saving"
-msgstr "zatvoriť ponuku bez uloženia"
+#: clientgui/DlgAdvPreferencesBase.cpp:115
+msgid "Clear all local preferences and close the dialog."
+msgstr "Odstrániť lokálne preferencie a zavrieť ponuku."
 
 #: clientgui/DlgAdvPreferencesBase.cpp:118
-#: clientgui/Localization.cpp:35
-#: clientgui/Localization.cpp:121
-#: clientgui/Localization.cpp:139
-msgid "Help"
-msgstr "Pomoc"
+msgid "Use web prefs"
+msgstr "Použiť webové nastavenia"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:119
-msgid "shows the preferences web page"
-msgstr "zobrazí webovú stránku s preferenciami"
+msgid "Restore web-based preferences and close the dialog."
+msgstr "Obnoviť nastavenia stránky a zavrieť ponuku."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:141
-msgid "Computing allowed"
-msgstr "Počítanie povolené"
+#: clientgui/DlgAdvPreferencesBase.cpp:143
+#: clientgui/DlgAdvPreferencesBase.cpp:637
+msgid "Computing"
+msgstr "Výpočty"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:146
-msgid "While computer is on batteries"
-msgstr "Pokiaľ je počítač na batériách"
+#: clientgui/DlgAdvPreferencesBase.cpp:785
+msgid "Network"
+msgstr "Sieť"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:149
-msgid "check this if you want this computer to do work while it runs on batteries"
-msgstr "zaškrtnite, ak chcete, aby výpočty prebiehali aj keď počítač ide na batérie"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:155
-msgid "While computer is in use"
-msgstr "Pokiaľ je počítač používaný"
+msgid "Disk and memory"
+msgstr "Disk & Pamäť"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:158
-msgid "check this if you want this computer to do work even when you're using it"
-msgstr "zaškrtnite, ak chcete, aby výpočty prebiehali aj keď počítač používate"
+#: clientgui/DlgAdvPreferencesBase.cpp:152
+msgid "Daily schedules"
+msgstr "Denné plány"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:164
-msgid "Use GPU while computer is in use"
-msgstr "Používať GPU aj keď je počítač používaný"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:167
-msgid "check this if you want your GPU to do work even when you're using the computer"
-msgstr "zaškrtnite, ak chcete, aby výpočty na GPU prebiehali aj keď počítač používate"
+#: clientgui/DlgAdvPreferencesBase.cpp:165
+#: clientgui/DlgDiagnosticLogFlags.cpp:119 clientgui/DlgExclusiveApps.cpp:146
+#: clientgui/DlgHiddenColumns.cpp:100
+msgid "OK"
+msgstr "OK"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:179
-msgid "Only after computer has been idle for"
-msgstr "Len ak bol počítač nepoužívaný aspoň"
+#: clientgui/DlgAdvPreferencesBase.cpp:166
+msgid "Save all values and close the dialog."
+msgstr "Uložiť všetky hodnoty a uzavrieť okno."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:188
-msgid "do work only after you haven't used the computer for this number of minutes"
-msgstr "výpočty budú prebiehať až keď počítač nebol používaný určenú dobu v minútach"
+#: clientgui/DlgAdvPreferencesBase.cpp:172
+msgid "Close the dialog without saving."
+msgstr "Zavrieť ponuku bez uloženia."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:193
-#: clientgui/DlgAdvPreferencesBase.cpp:342
-msgid "minutes"
-msgstr "minút(y)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:212
-msgid "While processor usage is less than"
-msgstr "Pokiaľ je využitie procesora nižšie než"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:221
-msgid "suspend work if processor usage exceeds this level"
-msgstr "pozastaviť prácu ak využitie procesora (inými programami) prekročí túto úroveň"
+#: clientgui/DlgAdvPreferencesBase.cpp:176 clientgui/DlgExclusiveApps.cpp:157
+msgid "Help"
+msgstr "Pomoc"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:226
-msgid "percent (0 means no restriction)"
-msgstr "percent (0 znamená bez obmedzenia)"
+#: clientgui/DlgAdvPreferencesBase.cpp:177
+msgid "Shows the preferences web page."
+msgstr "Ukáže preferencie z webstránky."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:240
-#: clientgui/DlgAdvPreferencesBase.cpp:506
-msgid "Every day between hours of"
-msgstr "Každý deň medzi"
+#: clientgui/DlgAdvPreferencesBase.cpp:239
+#: clientgui/DlgAdvPreferencesBase.cpp:425
+msgid "Usage limits"
+msgstr "Limity používania"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:244
-msgid "start work at this time"
-msgstr "začať počítanie o tomto čase"
+#, 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:248
-#: clientgui/DlgAdvPreferencesBase.cpp:514
-msgid "and"
-msgstr "a"
+#: clientgui/DlgAdvPreferencesBase.cpp:246
+#: clientgui/DlgAdvPreferencesBase.cpp:258
+msgid "Use at most"
+msgstr "Použiť najviac"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:252
-msgid "stop work at this time"
-msgstr "ukončiť počítanie o tomto čase"
+#: clientgui/DlgAdvPreferencesBase.cpp:251
+#, no-c-format
+msgid "% of the CPUs"
+msgstr "% z procesorov"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:256
-#: clientgui/DlgAdvPreferencesBase.cpp:522
-msgid "(no restriction if equal)"
-msgstr "(bez obmedzenia ak sú časy zhodné)"
+#, 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."
+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:261
-#: clientgui/DlgAdvPreferencesBase.cpp:527
-msgid "Day-of-week override:"
-msgstr "Samostatné nastavenia pre dni v týždni:"
+#: clientgui/DlgAdvPreferencesBase.cpp:263
+#, no-c-format
+msgid "% of CPU time"
+msgstr "% času CPU"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:266
-#: clientgui/DlgAdvPreferencesBase.cpp:532
-msgid "check box to specify hours for this day of week"
-msgstr "po zaškrtnutí je možné nastaviť samostatné časy pre tento deň v týždni"
+#: clientgui/DlgAdvPreferencesBase.cpp:270
+msgid "When to suspend"
+msgstr "Kedy pozastaviť"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:272
-#: clientgui/DlgAdvPreferencesBase.cpp:538
-msgid "Monday"
-msgstr "Pondelok"
+#: clientgui/DlgAdvPreferencesBase.cpp:276
+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:545
-msgid "Tuesday"
-msgstr "Utorok"
+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:286
-#: clientgui/DlgAdvPreferencesBase.cpp:552
-msgid "Wednesday"
-msgstr "Streda"
+#: clientgui/DlgAdvPreferencesBase.cpp:285
+msgid "Suspend when computer is in use"
+msgstr "Pozastaviť ked sa počítač používa"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:293
-#: clientgui/DlgAdvPreferencesBase.cpp:559
-msgid "Thursday"
-msgstr "Štvrtok"
+#: clientgui/DlgAdvPreferencesBase.cpp:288
+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:300
-#: clientgui/DlgAdvPreferencesBase.cpp:566
-msgid "Friday"
-msgstr "Piatok"
+#: clientgui/DlgAdvPreferencesBase.cpp:294
+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:307
-#: clientgui/DlgAdvPreferencesBase.cpp:573
-msgid "Saturday"
-msgstr "Sobota"
+#: clientgui/DlgAdvPreferencesBase.cpp:297
+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
+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
+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:580
-msgid "Sunday"
-msgstr "Nedeľa"
+#: clientgui/DlgAdvPreferencesBase.cpp:387
+msgid "minutes"
+msgstr "minút(y)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:328
-msgid "Other options"
-msgstr "Iné nastavenia"
+#: 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:336
-msgid "Switch between applications every"
-msgstr "Prepínať medzi aplikáciami približne každých"
+#: clientgui/DlgAdvPreferencesBase.cpp:323
+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:345
-msgid "On multiprocessor systems, use at most"
-msgstr "Na viacprocesorových systémoch použiť najviac"
+#: clientgui/DlgAdvPreferencesBase.cpp:344
+#: clientgui/DlgAdvPreferencesBase.cpp:474
+msgid "Other"
+msgstr "Ostatné"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:349
+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
-#, no-c-format
-msgid "% of the processors (0 means no restriction)"
-msgstr ""
+msgid "Store at least"
+msgstr "Uložiť aspoň"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:355
-#: clientgui/DlgAdvPreferencesBase.cpp:618
-#: clientgui/DlgAdvPreferencesBase.cpp:640
-#: clientgui/DlgAdvPreferencesBase.cpp:661
-#: clientgui/DlgAdvPreferencesBase.cpp:683
-#: clientgui/DlgAdvPreferencesBase.cpp:694
-msgid "Use at most"
-msgstr "Použiť najviac"
+#: clientgui/DlgAdvPreferencesBase.cpp:360
+#: clientgui/DlgAdvPreferencesBase.cpp:376
+msgid "days of work"
+msgstr "dní práce"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:362
-#, no-c-format
-msgid "% of CPU time (0 means no restriction)"
-msgstr ""
+#: clientgui/DlgAdvPreferencesBase.cpp:365
+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."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:386
-msgid "General options"
-msgstr "Všeobecné nastavenia"
+#: clientgui/DlgAdvPreferencesBase.cpp:368
+msgid "Store up to an additional"
+msgstr "Uložiť až do"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:395
-msgid "Maximum download rate"
-msgstr "Maximálna rýchlosť sťahovania"
+#: clientgui/DlgAdvPreferencesBase.cpp:381
+#, 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:401
-#: clientgui/DlgAdvPreferencesBase.cpp:410
-msgid "KBytes/second (0 means no restriction)"
-msgstr ""
+#: clientgui/DlgAdvPreferencesBase.cpp:383
+msgid "Switch between tasks every"
+msgstr "Prepínať medzi aplikáciami približne každých"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:404
-msgid "Maximum upload rate"
-msgstr "Maximálna rýchlosť odosielania"
+#: clientgui/DlgAdvPreferencesBase.cpp:391
+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:417
-msgid "Minimum work buffer"
-msgstr "Minimálna zásoba práce"
+#: clientgui/DlgAdvPreferencesBase.cpp:392
+msgid "Request tasks to checkpoint at most every"
+msgstr "Ukladať stav úloh každých"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:425
-msgid "Try to maintain enough tasks to keep busy for this many days"
-msgstr "Pokúsiť sa udržiavať dosť úloh na spracovanie počas toľkých dní"
+#: clientgui/DlgAdvPreferencesBase.cpp:396
+msgid "seconds"
+msgstr "sekúnd"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:431
-#: clientgui/DlgAdvPreferencesBase.cpp:449
-msgid "days (maximum value: 10)"
-msgstr ""
+msgid "Limit the download rate of file transfers."
+msgstr "Nastaviť limit sťahovania súborov"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:437
-msgid "Max additional work buffer"
-msgstr "Dodatočná zásoba práce"
+#: clientgui/DlgAdvPreferencesBase.cpp:432
+msgid "Limit download rate to"
+msgstr "Obmedziť rýchlosť sťahovania na"
 
+#: clientgui/DlgAdvPreferencesBase.cpp:436
 #: clientgui/DlgAdvPreferencesBase.cpp:445
-msgid "In addition, maintain enough tasks for up to this many days"
-msgstr "Navyše udržiavať úlohy aspoň na toľko dní"
+msgid "KB/second"
+msgstr "KB/s"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:454
-msgid "Transfer at most"
-msgstr "Preniesť najviac"
+#: clientgui/DlgAdvPreferencesBase.cpp:440
+msgid "Limit the upload rate of file transfers."
+msgstr "Nastaviť rýchlosť odosielania súborov"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:462
-msgid "MBytes every"
-msgstr ""
+#: clientgui/DlgAdvPreferencesBase.cpp:441
+msgid "Limit upload rate to"
+msgstr "Limit rýchlosti odosielania"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:468
-msgid "days (0 means no restriction)"
-msgstr ""
+#: clientgui/DlgAdvPreferencesBase.cpp:452
+#, 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:476
-msgid "Skip image file verification"
-msgstr "Vynechávať verifikáciu obrazových súborov"
+#: clientgui/DlgAdvPreferencesBase.cpp:454
+msgid "Limit usage to"
+msgstr "Obmedziť použitie "
 
-#: clientgui/DlgAdvPreferencesBase.cpp:478
-msgid "check this if your Internet provider modifies image files"
-msgstr ""
-"zaškrtnite ak Váš poskytovateľ pripojenia mení sťahované súbory s obrázkami\n"
-"(napr. pri GPRS, UMTS)"
+#: clientgui/DlgAdvPreferencesBase.cpp:458
+msgid "MB every"
+msgstr "MB každých"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:462
+msgid "days"
+msgstr "dňa (dní)"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:479
+#, 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:484
-msgid "Connect options"
-msgstr "Nastavenie pripojenia"
+#: clientgui/DlgAdvPreferencesBase.cpp:481
+msgid "Skip data verification for image files"
+msgstr "Preskočiť overovanie pri súboroch obrázkov"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:487
-msgid "Confirm before connecting to internet"
+#: clientgui/DlgAdvPreferencesBase.cpp:485
+msgid "Confirm before connecting to Internet"
 msgstr "Potvrdiť pred pripojením k Internetu"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
-msgstr "ak je zaškrtnuté, pred pokusom o pripojenie k Internetu bude vyžadované potvrdenie"
+#: clientgui/DlgAdvPreferencesBase.cpp:486
+#: clientgui/DlgAdvPreferencesBase.cpp:490
+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:493
+#: clientgui/DlgAdvPreferencesBase.cpp:489
 msgid "Disconnect when done"
 msgstr "Odpojiť po dokončení komunikácie"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:495
-msgid ""
-"if checked, BOINC hangs up when network usage is done\n"
-"(only relevant for dialup-connection)"
-msgstr ""
-"ak je zaškrtnuté, BOINC ukončí pripojenie k Internetu po dokončení prenosov\n"
-"(platí len pre vytáčané/dial-up spojenie)"
+#: clientgui/DlgAdvPreferencesBase.cpp:516
+msgid "Disk"
+msgstr "Disk"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:501
-msgid "Network usage allowed"
-msgstr "Prístup k sieti povoliť"
+#: clientgui/DlgAdvPreferencesBase.cpp:521
+#, 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:510
-msgid "network usage start hour"
-msgstr "čas začatia používania siete"
+#: clientgui/DlgAdvPreferencesBase.cpp:527
+#, c-format
+msgid "Limit the total amount of disk space used by %s."
+msgstr "Nastaví využitie disku pre %s."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:518
-msgid "network usage stop hour"
-msgstr "čas ukončenia používania siete"
+#: clientgui/DlgAdvPreferencesBase.cpp:530
+#: clientgui/DlgAdvPreferencesBase.cpp:554
+msgid "Use no more than"
+msgstr "Nepoužiť viac ako"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:610
-#: clientgui/DlgItemProperties.cpp:257
-msgid "Disk usage"
-msgstr "Využitie disku"
+#: clientgui/DlgAdvPreferencesBase.cpp:534
+msgid "GB"
+msgstr "GB"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:622
-msgid "the maximum disk space used by BOINC (in Gigabytes)"
-msgstr "BOINC použije najviac toľkoto miesta na disku (v GB)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:626
-msgid "Gigabytes disk space (0 means no restriction)"
-msgstr ""
+#: clientgui/DlgAdvPreferencesBase.cpp:539
+#, 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."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:629
+#: clientgui/DlgAdvPreferencesBase.cpp:542
 msgid "Leave at least"
 msgstr "Ponechať najmenej"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:633
-msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
-msgstr "BOINC ponechá najmenej toľkoto voľného miesta na disku (v GB)"
+#: clientgui/DlgAdvPreferencesBase.cpp:546
+msgid "GB free"
+msgstr "GB voľných"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:637
-msgid "Gigabytes disk space free"
-msgstr "GB voľného miesta na disku"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:644
-msgid "BOINC uses at most this percentage of total disk space"
-msgstr "BOINC využije najviac toľkoto percent z celkovej kapacity disku"
+#: clientgui/DlgAdvPreferencesBase.cpp:551
+#, 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."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:649
+#: clientgui/DlgAdvPreferencesBase.cpp:559
 #, no-c-format
-msgid "% of total disk space"
-msgstr "% celkového miesta na disku"
+msgid "% of total"
+msgstr "% celku"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:652
-msgid "Tasks checkpoint to disk at most every"
-msgstr "Ukladať stav úloh každých"
+#: clientgui/DlgAdvPreferencesBase.cpp:566
+msgid "Memory"
+msgstr "Pamäť"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
-msgid "seconds"
-msgstr "sekúnd"
+#: clientgui/DlgAdvPreferencesBase.cpp:571
+#, 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č."
+
+#: clientgui/DlgAdvPreferencesBase.cpp:573
+msgid "When computer is in use, use at most"
+msgstr "Keď sa počítač používa, využiť najviac"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:668
+#: clientgui/DlgAdvPreferencesBase.cpp:579
+#: clientgui/DlgAdvPreferencesBase.cpp:591
+#: clientgui/DlgAdvPreferencesBase.cpp:607
 #, no-c-format
-msgid "% of page file (swap space)"
-msgstr "% stránkovacieho súboru (swapového priestoru)"
+msgid "%"
+msgstr "%"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:675
-msgid "Memory usage"
-msgstr "Využitie pamäte"
+#: clientgui/DlgAdvPreferencesBase.cpp:584
+#, 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č."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
-#, no-c-format
-msgid "% when computer is in use"
-msgstr "% keď je počítač používaný"
+#: clientgui/DlgAdvPreferencesBase.cpp:586
+msgid "When computer is not in use, use at most"
+msgstr "Keď sa počítač nepoužíva, použiť maximálne"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:701
-#, no-c-format
-msgid "% when computer is idle"
-msgstr "% keď je počítač nepoužívaný"
+#: clientgui/DlgAdvPreferencesBase.cpp:595
+msgid "Leave non-GPU tasks in memory while suspended"
+msgstr "Ponechať ne-GPU úlohy v pamäti pri ich pozastavení"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:706
-msgid "Leave applications in memory while suspended"
-msgstr "Ponechať aplikácie v pamäti pri ich pozastavení"
+#: 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."
+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."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:708
-msgid "if checked, suspended work units are left in memory"
-msgstr "ak je zaškrtnuté, výpočtové úlohy budú v prípade pozastavenia ponechané v pamäti"
+#: clientgui/DlgAdvPreferencesBase.cpp:600
+#, c-format
+msgid "Limit the swap space (page file) used by %s."
+msgstr "Nastaviť využitie ukladacieho priestoru (stránkovacieho súboru) pre %s."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:728
-msgid "Suspend processor and network usage when these applications are running:"
-msgstr "Pozastaviť používanie procesora a siete ak bežia tieto aplikácie:"
+#: clientgui/DlgAdvPreferencesBase.cpp:602
+msgid "Page/swap file: use at most"
+msgstr "Stránkovací súbor: využiť najviac"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:738
-msgid "Add..."
-msgstr "Pridať..."
+#: clientgui/DlgAdvPreferencesBase.cpp:627
+msgid "and"
+msgstr "a"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:739
-msgid "Add an application to this list"
-msgstr "Pridať aplikáciu do tohto zoznamu"
+#: clientgui/DlgAdvPreferencesBase.cpp:628
+msgid "to"
+msgstr "až"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:744
-msgid "Remove"
-msgstr "Odobrať"
+#: clientgui/DlgAdvPreferencesBase.cpp:641
+msgid "Compute only during a particular period each day."
+msgstr "Vykonávať výpočty v určitý čas každý deň"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:745
-msgid "Remove an application from this list"
-msgstr "Odobrať aplikáciu z tohto zoznamu"
+#: clientgui/DlgAdvPreferencesBase.cpp:644
+msgid "Compute only between"
+msgstr "Počítať len medzi"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:754
-msgid "For advanced options, refer to "
-msgstr "Pre pokročilé možnosti prejdite na "
+#: clientgui/DlgAdvPreferencesBase.cpp:654
+#: clientgui/DlgAdvPreferencesBase.cpp:801
+msgid "Day-of-week override"
+msgstr "Samostatné nastavenia pre dni v týždni:"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:658
+#: clientgui/DlgAdvPreferencesBase.cpp:805
+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
+msgid "Monday"
+msgstr "Pondelok"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:691
+#: clientgui/DlgAdvPreferencesBase.cpp:837
+msgid "Friday"
+msgstr "Piatok"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:704
+#: clientgui/DlgAdvPreferencesBase.cpp:850
+msgid "Tuesday"
+msgstr "Utorok"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:719
+#: clientgui/DlgAdvPreferencesBase.cpp:865
+msgid "Saturday"
+msgstr "Sobota"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:732
+#: clientgui/DlgAdvPreferencesBase.cpp:878
+msgid "Wednesday"
+msgstr "Streda"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:747
+#: clientgui/DlgAdvPreferencesBase.cpp:893
+msgid "Sunday"
+msgstr "Nedeľa"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:760
+#: clientgui/DlgAdvPreferencesBase.cpp:906
+msgid "Thursday"
+msgstr "Štvrtok"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:789
+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
+msgid "Transfer files only between"
+msgstr "Prenos súborov len medzi"
 
 #: clientgui/DlgDiagnosticLogFlags.cpp:65
 #, c-format
 msgid "%s Diagnostic Log Flags"
-msgstr ""
+msgstr "Značky diagnostického záznamu %s"
 
 #: clientgui/DlgDiagnosticLogFlags.cpp:83
-msgid "These flags enable various types of diagnostic messages in the Event Log."
-msgstr ""
+msgid ""
+"These flags enable various types of diagnostic messages in the Event Log."
+msgstr "Tieto značky zapnú rôzne typy diagnostických správ v zázname činnosti."
+
+#: clientgui/DlgDiagnosticLogFlags.cpp:99
+msgid "More info ..."
+msgstr "Viac informácií ..."
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:105
+#: clientgui/DlgDiagnosticLogFlags.cpp:120 clientgui/DlgHiddenColumns.cpp:101
 msgid "Save all values and close the dialog"
-msgstr ""
+msgstr "Uložiť všetky hodnoty a zavrieť okno"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:108
+#: clientgui/DlgDiagnosticLogFlags.cpp:123 clientgui/DlgHiddenColumns.cpp:104
 msgid "Defaults"
-msgstr ""
+msgstr "Predvolené"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:109
+#: clientgui/DlgDiagnosticLogFlags.cpp:124 clientgui/DlgHiddenColumns.cpp:105
 msgid "Restore default settings"
-msgstr ""
+msgstr "Obnoviť pôvodné nastavenia"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:113
+#: clientgui/DlgDiagnosticLogFlags.cpp:128 clientgui/DlgHiddenColumns.cpp:109
 msgid "Close the dialog without saving"
-msgstr ""
+msgstr "Zavrieť okno bez uloženia"
 
-#: clientgui/DlgEventLog.cpp:226
+#: clientgui/DlgEventLog.cpp:227
 #, c-format
 msgid "%s - Event Log"
 msgstr "%s - Záznam udalostí"
 
-#: clientgui/DlgEventLog.cpp:236
+#: clientgui/DlgEventLog.cpp:237
 msgid "Project"
 msgstr "Projekt"
 
-#: clientgui/DlgEventLog.cpp:237
+#: clientgui/DlgEventLog.cpp:238
 msgid "Time"
 msgstr "Čas"
 
-#: clientgui/DlgEventLog.cpp:238
+#: clientgui/DlgEventLog.cpp:239
 msgid "Message"
 msgstr "Hlásenie"
 
-#: clientgui/DlgEventLog.cpp:300
-#: clientgui/DlgEventLog.cpp:364
+#: clientgui/DlgEventLog.cpp:301 clientgui/DlgEventLog.cpp:351
 msgid "&Show only this project"
 msgstr "&Zobraziť len tento projekt"
 
-#: clientgui/DlgEventLog.cpp:304
+#: clientgui/DlgEventLog.cpp:305
 msgid "Copy &All"
 msgstr "Kopírov&ať všetky"
 
-#: clientgui/DlgEventLog.cpp:306
-#: clientgui/DlgEventLog.cpp:310
+#: clientgui/DlgEventLog.cpp:307 clientgui/DlgEventLog.cpp:311
 msgid "Copy all the messages to the clipboard."
 msgstr "Kopírovať všetky správy do kopírovacej schránky."
 
-#: clientgui/DlgEventLog.cpp:315
+#: clientgui/DlgEventLog.cpp:316
 msgid "Copy &Selected"
 msgstr "&Kopírovať vybrané"
 
-#: clientgui/DlgEventLog.cpp:318
-#: clientgui/DlgEventLog.cpp:326
-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
+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 "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:320
-#: clientgui/DlgEventLog.cpp:328
-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 "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 Ctrl."
+#: 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."
+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 Ctrl."
+
+#: clientgui/DlgEventLog.cpp:336 clientgui/DlgItemProperties.cpp:67
+msgid "&Close"
+msgstr "&Zavrieť"
+
+#: clientgui/DlgEventLog.cpp:345
+msgid "Show all &messages"
+msgstr "Zobraziť všetky &správy"
+
+#: clientgui/DlgEventLog.cpp:346 clientgui/DlgEventLog.cpp:348
+msgid "Show messages for all projects"
+msgstr "Zobraziť správy zo všetkých projektov"
+
+#: clientgui/DlgEventLog.cpp:352 clientgui/DlgEventLog.cpp:354
+msgid "Show only the messages for the selected project"
+msgstr "Zobraziť správy len z vybraného projektu"
+
+#: clientgui/DlgExclusiveApps.cpp:60
+#, c-format
+msgid "%s - Exclusive Applications"
+msgstr "%s - výhradné aplikácie"
+
+#: clientgui/DlgExclusiveApps.cpp:72
+msgid ""
+"Suspend processor and network usage when these applications are running:"
+msgstr "Pozastaviť používanie procesora a siete ak bežia tieto aplikácie:"
+
+#: clientgui/DlgExclusiveApps.cpp:80 clientgui/DlgExclusiveApps.cpp:104
+msgid "Add..."
+msgstr "Pridať..."
+
+#: clientgui/DlgExclusiveApps.cpp:81 clientgui/DlgExclusiveApps.cpp:105
+msgid "Add an application to this list"
+msgstr "Pridať aplikáciu do tohto zoznamu"
+
+#: clientgui/DlgExclusiveApps.cpp:86 clientgui/DlgExclusiveApps.cpp:110
+msgid "Remove"
+msgstr "Odobrať"
+
+#: clientgui/DlgExclusiveApps.cpp:87 clientgui/DlgExclusiveApps.cpp:111
+msgid "Remove an application from this list"
+msgstr "Odobrať aplikáciu z tohto zoznamu"
+
+#: clientgui/DlgExclusiveApps.cpp:96
+msgid "Suspend GPU usage when these applications are running:"
+msgstr "Pozastaviť používanie GPU ak bežia tieto aplikácie:"
+
+#: clientgui/DlgExclusiveApps.cpp:122
+msgid "For advanced options, refer to "
+msgstr "Pre pokročilé možnosti prejdite na "
+
+#: clientgui/DlgExclusiveApps.cpp:147
+msgid "save all values and close the dialog"
+msgstr "uložiť hodnoty a zatvoriť ponuku"
+
+#: clientgui/DlgExclusiveApps.cpp:153
+msgid "close the dialog without saving"
+msgstr "zatvoriť ponuku bez uloženia"
+
+#: clientgui/DlgExclusiveApps.cpp:158
+msgid "shows the preferences web page"
+msgstr "zobrazí webovú stránku s preferenciami"
 
-#: clientgui/DlgEventLog.cpp:335
-#: clientgui/DlgItemProperties.cpp:67
-msgid "&Close"
-msgstr "&Zavrieť"
+#: clientgui/DlgExclusiveApps.cpp:303 clientgui/DlgExclusiveApps.cpp:309
+#: clientgui/DlgExclusiveApps.cpp:315
+msgid "Applications to add"
+msgstr "Aplikácie na pridanie"
 
-#: clientgui/DlgEventLog.cpp:344
+#: clientgui/DlgExclusiveApps.cpp:332
 #, c-format
-msgid "Get help with %s"
-msgstr "Získať pomoc s %s"
+msgid "'%s' is not an executable application."
+msgstr "'%s' nie je spustiteľná aplikácia."
 
-#: clientgui/DlgEventLog.cpp:358
-msgid "Show all &messages"
-msgstr "Zobraziť všetky &správy"
+#: clientgui/DlgExclusiveApps.cpp:333 clientgui/DlgExclusiveApps.cpp:380
+#: clientgui/DlgExclusiveApps.cpp:404
+msgid "Add Exclusive App"
+msgstr "Pridať výhradnú aplikáciu"
 
-#: clientgui/DlgEventLog.cpp:359
-#: clientgui/DlgEventLog.cpp:361
-msgid "Show messages for all projects"
-msgstr "Zobraziť správy zo všetkých projektov"
+#: clientgui/DlgExclusiveApps.cpp:345
+msgid "Name of application to add?"
+msgstr "Názov pridávanej aplikácie?"
 
-#: clientgui/DlgEventLog.cpp:365
-#: clientgui/DlgEventLog.cpp:367
-msgid "Show only the messages for the selected project"
-msgstr "Zobraziť správy len z vybraného projektu"
+#: clientgui/DlgExclusiveApps.cpp:345
+msgid "Add exclusive app"
+msgstr "Pridať výhradnú aplikáciu"
+
+#: clientgui/DlgExclusiveApps.cpp:379
+#, c-format
+msgid "Application names must end with '%s'"
+msgstr "Názvy aplikácií musia končiť na '%s'"
+
+#: clientgui/DlgExclusiveApps.cpp:403
+#, c-format
+msgid "'%s' is already in the list."
+msgstr "'%s' sa už nachádza v zozname."
 
 #: clientgui/DlgExitMessage.cpp:82
 #, c-format
@@ -1696,13 +1738,7 @@ msgid ""
 "\n"
 "If you also want to stop running the tasks,\n"
 "choose from the following options:"
-msgstr ""
-"Zvolili ste ukončiť %s,\n"
-"ktorý umožňuje zobrazenie a správu\n"
-"úloh bežiacich na Vašom počítači.\n"
-"\n"
-"Ak chcete ukončiť aj bežiace úlohy,\n"
-"vyberte z nasledujúcich možností:"
+msgstr "Zvolili ste ukončiť %s,\nktorý umožňuje zobrazenie a správu\núloh bežiacich na Vašom počítači.\n\nAk chcete ukončiť aj bežiace úlohy,\nvyberte z nasledujúcich možností:"
 
 #: clientgui/DlgExitMessage.cpp:135
 #, c-format
@@ -1713,13 +1749,7 @@ msgid ""
 "In most cases, it is better just to close the %s window\n"
 "rather than to exit the application; that will allow %s to run its\n"
 "tasks at the times you selected in your preferences."
-msgstr ""
-"Toto ukončí %s a jeho úlohy až kým buď\n"
-"%s alebo šetrič obrazovky %s nebudú znova spustené.\n"
-"\n"
-"Vo väčšine prípadov je lepšie len zatvoriť okno %s,\n"
-"než celkom ukončiť aplikáciu; takto bude môcť %s počítať\n"
-"úlohy ďalej v čase určenom vo Vašich preferenciách."
+msgstr "Toto ukončí %s a jeho úlohy až kým buď\n%s alebo šetrič obrazovky %s nebudú znova spustené.\n\nVo väčšine prípadov je lepšie len zatvoriť okno %s,\nnež celkom ukončiť aplikáciu; takto bude môcť %s počítať\núlohy ďalej v čase určenom vo Vašich preferenciách."
 
 #: clientgui/DlgExitMessage.cpp:153
 #, c-format
@@ -1730,10 +1760,8 @@ msgstr "Ukončiť bežiace výpočty pri ukončení %s"
 msgid "Remember this decision and do not show this dialog."
 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/DlgExitMessage.cpp:178 clientgui/DlgGenericMessage.cpp:125
+#: clientgui/DlgOptions.cpp:404 clientgui/DlgSelectComputer.cpp:168
 msgid "&Cancel"
 msgstr "&Späť"
 
@@ -1741,10 +1769,28 @@ msgstr "&Späť"
 msgid "Don't show this dialog again."
 msgstr "Túto informáciu už nabudúce nezobrazovať."
 
-#: clientgui/DlgItemProperties.cpp:194
-#: clientgui/DlgItemProperties.cpp:197
-#: clientgui/DlgItemProperties.cpp:200
-#: clientgui/DlgItemProperties.cpp:203
+#: clientgui/DlgHiddenColumns.cpp:64
+#, c-format
+msgid "%s Column Selection"
+msgstr "Výber stĺpcov %s"
+
+#: clientgui/DlgHiddenColumns.cpp:77
+#, c-format
+msgid "Select which columns %s should show."
+msgstr "Vybrať, ktoré stĺpce má %s zobraziť."
+
+#: clientgui/DlgHiddenColumns.cpp:314
+msgid ""
+"Are you sure you want to reset all list columns to the default "
+"configurations?"
+msgstr "Skutočne chcete resetovať všetky stĺpce zoznamu na pôvodné nastavenie?"
+
+#: clientgui/DlgHiddenColumns.cpp:315
+msgid "Confirm defaults"
+msgstr "Potvrdiť predvolené nastavenia"
+
+#: clientgui/DlgItemProperties.cpp:194 clientgui/DlgItemProperties.cpp:197
+#: clientgui/DlgItemProperties.cpp:200 clientgui/DlgItemProperties.cpp:203
 msgid "Don't fetch tasks for "
 msgstr "Nezískavať nové úlohy pre "
 
@@ -1776,8 +1822,7 @@ msgstr " interval odkladania získavania práce"
 msgid "Properties of project "
 msgstr "Vlastnosti projektu "
 
-#: clientgui/DlgItemProperties.cpp:243
-#: clientgui/DlgOptions.cpp:221
+#: clientgui/DlgItemProperties.cpp:243 clientgui/DlgOptions.cpp:221
 msgid "General"
 msgstr "Všeobecné"
 
@@ -1787,7 +1832,7 @@ msgstr "Hlavné URL"
 
 #: clientgui/DlgItemProperties.cpp:245
 msgid "User name"
-msgstr "Užívateľské meno"
+msgstr "Používateľské meno"
 
 #: clientgui/DlgItemProperties.cpp:246
 msgid "Team name"
@@ -1809,6 +1854,10 @@ msgstr "Sťahovanie súborov odložené o"
 msgid "File uploads deferred for"
 msgstr "Odosielanie súborov odložené o"
 
+#: clientgui/DlgItemProperties.cpp:257
+msgid "Disk usage"
+msgstr "Využitie disku"
+
 #: clientgui/DlgItemProperties.cpp:258
 msgid "Computer ID"
 msgstr "ID počítača"
@@ -1817,14 +1866,10 @@ msgstr "ID počítača"
 msgid "Non CPU intensive"
 msgstr "Nenáročné na procesor"
 
-#: 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 "áno"
 
@@ -1832,8 +1877,7 @@ msgstr "áno"
 msgid "Suspended via GUI"
 msgstr "Pozastavené cez GUI"
 
-#: clientgui/DlgItemProperties.cpp:262
-#: clientgui/DlgItemProperties.cpp:263
+#: clientgui/DlgItemProperties.cpp:262 clientgui/DlgItemProperties.cpp:263
 msgid "no"
 msgstr "nie"
 
@@ -1849,8 +1893,7 @@ msgstr "Spracováva sa požiadavka plánovača"
 msgid "Trickle-up pending"
 msgstr "Rýchla správa odosielaná"
 
-#: clientgui/DlgItemProperties.cpp:271
-#: clientgui/DlgItemProperties.cpp:273
+#: clientgui/DlgItemProperties.cpp:271 clientgui/DlgItemProperties.cpp:273
 msgid "Host location"
 msgstr "Umiestnenie počítača"
 
@@ -1872,11 +1915,11 @@ msgstr "Ukončené"
 
 #: clientgui/DlgItemProperties.cpp:285
 msgid "Tasks completed"
-msgstr ""
+msgstr "Úlohy dokončené"
 
 #: clientgui/DlgItemProperties.cpp:286
 msgid "Tasks failed"
-msgstr ""
+msgstr "Úlohy zlyhali"
 
 #: clientgui/DlgItemProperties.cpp:288
 msgid "Credit"
@@ -1884,7 +1927,7 @@ msgstr "Kredit"
 
 #: clientgui/DlgItemProperties.cpp:289
 msgid "User"
-msgstr "Užívateľ"
+msgstr "Používateľ"
 
 #: clientgui/DlgItemProperties.cpp:296
 msgid "Host"
@@ -1942,13 +1985,11 @@ msgstr "Odhadovaná doba výpočtu"
 msgid "CPU time at last checkpoint"
 msgstr "Čas CPU pri poslednom uložení stavu"
 
-#: clientgui/DlgItemProperties.cpp:374
-#: clientgui/DlgItemProperties.cpp:389
+#: clientgui/DlgItemProperties.cpp:374 clientgui/DlgItemProperties.cpp:389
 msgid "CPU time"
 msgstr "Čas CPU"
 
-#: clientgui/DlgItemProperties.cpp:376
-#: clientgui/DlgItemProperties.cpp:390
+#: clientgui/DlgItemProperties.cpp:376 clientgui/DlgItemProperties.cpp:390
 msgid "Elapsed time"
 msgstr "Uplynutý čas"
 
@@ -1980,8 +2021,7 @@ msgstr "ID procesu"
 msgid "Local: "
 msgstr "Lokálne: "
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: clientgui/DlgOptions.cpp:129 clientgui/DlgOptions.cpp:135
 msgid "Options"
 msgstr "Možnosti"
 
@@ -2045,33 +2085,27 @@ msgstr "Pripojenie cez HTTP proxy server"
 msgid "HTTP Proxy Server Configuration"
 msgstr "Konfigurácia HTTP proxy servera"
 
-#: clientgui/DlgOptions.cpp:283
-#: clientgui/DlgOptions.cpp:347
+#: clientgui/DlgOptions.cpp:283 clientgui/DlgOptions.cpp:347
 msgid "Address:"
 msgstr "Adresa:"
 
-#: clientgui/DlgOptions.cpp:291
-#: clientgui/DlgOptions.cpp:355
+#: clientgui/DlgOptions.cpp:291 clientgui/DlgOptions.cpp:355
 msgid "Port:"
 msgstr "Port:"
 
-#: clientgui/DlgOptions.cpp:299
-#: clientgui/DlgOptions.cpp:363
+#: clientgui/DlgOptions.cpp:299 clientgui/DlgOptions.cpp:363
 msgid "Don't use proxy for:"
 msgstr "Nepoužívať proxy pre:"
 
-#: clientgui/DlgOptions.cpp:306
-#: clientgui/DlgOptions.cpp:370
+#: clientgui/DlgOptions.cpp:306 clientgui/DlgOptions.cpp:370
 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/DlgOptions.cpp:312 clientgui/DlgOptions.cpp:376
 msgid "User Name:"
-msgstr "Užívateľské meno:"
+msgstr "Používateľské meno:"
 
-#: clientgui/DlgOptions.cpp:320
-#: clientgui/DlgOptions.cpp:384
+#: clientgui/DlgOptions.cpp:320 clientgui/DlgOptions.cpp:384
 #: clientgui/DlgSelectComputer.cpp:152
 msgid "Password:"
 msgstr "Heslo:"
@@ -2123,7 +2157,9 @@ msgstr "%s - Výber jazyka"
 
 #: 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 "Jazyk pre %s bol zmenený.  Aby sa táto zmena prejavila, musíte reštartovať %s."
 
 #: clientgui/DlgSelectComputer.cpp:91
@@ -2136,36 +2172,30 @@ msgstr "%s - Zvoliť počítač"
 msgid ""
 "Another instance of %s is already running \n"
 "on this computer.  Please select a client to monitor."
-msgstr ""
-"Na tomto počítači už beží iný %s.\n"
-"Zvoľte ktorého klienta chcete sledovať."
+msgstr "Na tomto počítači už beží iný %s.\nZvoľte ktorého klienta chcete sledovať."
 
 #: clientgui/DlgSelectComputer.cpp:143
 msgid "Host name:"
 msgstr "Názov počítača:"
 
-#: clientgui/Localization.cpp:31
-#: clientgui/Localization.cpp:69
+#: clientgui/Localization.cpp:31 clientgui/Localization.cpp:69
 msgid "Message boards"
 msgstr "Panely hlásení"
 
 #: clientgui/Localization.cpp:33
 msgid "Correspond with other users on the SETI at home message boards"
-msgstr "Korešpondujte s ostatnými užívateľmi na SETI at home paneloch hlásení"
+msgstr "Korešpondujte s ostatnými používateľmi na SETI at home paneloch hlásení"
 
 #: clientgui/Localization.cpp:37
 msgid "Ask questions and report problems"
 msgstr "Položte otázku a oznámte problémy"
 
-#: 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 "Vaše konto"
 
-#: 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 "Prehľad informácií o Vašom konte a celkovom kredite"
@@ -2178,18 +2208,15 @@ msgstr "Vaše preferencie"
 msgid "View and modify your SETI at home account profile and preferences"
 msgstr "Prezrite si a modifikujte Váš SETI at home profil konta a preferencie"
 
-#: clientgui/Localization.cpp:47
-#: clientgui/Localization.cpp:89
+#: clientgui/Localization.cpp:47 clientgui/Localization.cpp:89
 msgid "Your results"
 msgstr "Vaše výsledky"
 
-#: 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 "Prezrite si posledný týždeň (alebo viac) vypočítaných výsledkov a práce"
 
-#: clientgui/Localization.cpp:51
-#: clientgui/Localization.cpp:93
+#: clientgui/Localization.cpp:51 clientgui/Localization.cpp:93
 msgid "Your computers"
 msgstr "Vaše počítače"
 
@@ -2197,13 +2224,11 @@ msgstr "Vaše počítače"
 msgid "View a listing of all the computers on which you are running SETI at Home"
 msgstr "Prezrite si zoznam všetkých počítačov, na ktorých počítate SETI at Home"
 
-#: clientgui/Localization.cpp:55
-#: clientgui/Localization.cpp:97
+#: clientgui/Localization.cpp:55 clientgui/Localization.cpp:97
 msgid "Your team"
 msgstr "Váš tím"
 
-#: clientgui/Localization.cpp:57
-#: clientgui/Localization.cpp:99
+#: clientgui/Localization.cpp:57 clientgui/Localization.cpp:99
 msgid "View information about your team"
 msgstr "Prehliadnite si informácie o Vašom tíme"
 
@@ -2224,8 +2249,9 @@ msgid "Read a detailed description of the Einstein at Home screensaver"
 msgstr "Prečítajte si podrobný opis šetriča obrazovky Einstein at Home"
 
 #: clientgui/Localization.cpp:71
-msgid "Correspond with admins and other users on the Einstein at Home message boards"
-msgstr "Korešpondujte s administrátormi a ostatnými užívateľmi na Einstein at Home paneloch hlásení"
+msgid ""
+"Correspond with admins and other users on the Einstein at Home message boards"
+msgstr "Korešpondujte s administrátormi a ostatnými používateľmi na Einstein at Home paneloch hlásení"
 
 #: clientgui/Localization.cpp:73
 msgid "Einstein status"
@@ -2252,7 +2278,8 @@ msgid "Account summary"
 msgstr "Súhrn konta"
 
 #: 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 "Prezrite si zoznam všetkých počítačov, na ktorých počítate Einstein at Home"
 
 #: clientgui/Localization.cpp:101
@@ -2260,7 +2287,9 @@ msgid "LIGO project"
 msgstr "LIGO projekt"
 
 #: 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 "Domovská stránka projektu Laser Interferometer Gravitational-wave Observatory (LIGO)"
 
 #: clientgui/Localization.cpp:105
@@ -2271,8 +2300,7 @@ msgstr "Projekt GEO-600"
 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/Localization.cpp:115 clientgui/Localization.cpp:133
 msgid "Team"
 msgstr "Tím"
 
@@ -2353,7 +2381,9 @@ msgid "Missing application"
 msgstr "Chýbajúca aplikácia"
 
 #: 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 "Prosím stiahnite a nainštalujte aplikáciu CoRD z http://cord.sourceforge.net"
 
 #: clientgui/MainDocument.cpp:2442
@@ -2366,7 +2396,7 @@ msgstr "počítač je používaný"
 
 #: clientgui/MainDocument.cpp:2444
 msgid "user request"
-msgstr "požadované užívateľom"
+msgstr "požadované používateľom"
 
 #: clientgui/MainDocument.cpp:2445
 msgid "time of day"
@@ -2424,20 +2454,19 @@ msgstr "Stiahnutie zlyhalo"
 msgid "Downloading"
 msgstr "Sťahovanie"
 
-#: clientgui/MainDocument.cpp:2492
-#: clientgui/MainDocument.cpp:2557
+#: clientgui/MainDocument.cpp:2492 clientgui/MainDocument.cpp:2551
 msgid " (suspended - "
 msgstr " (pozastavené - "
 
 #: clientgui/MainDocument.cpp:2500
 msgid "Project suspended by user"
-msgstr "Projekt pozastavený užívateľom"
+msgstr "Projekt pozastavený používateľom"
 
 #: clientgui/MainDocument.cpp:2502
 msgid "Task suspended by user"
-msgstr "Úloha pozastavená užívateľom"
+msgstr "Úloha pozastavená používateľom"
 
-#: clientgui/MainDocument.cpp:2504
+#: clientgui/MainDocument.cpp:2507
 msgid "Suspended - "
 msgstr "Pozastavené - "
 
@@ -2445,92 +2474,91 @@ msgstr "Pozastavené - "
 msgid "GPU suspended - "
 msgstr "GPU pozastavené - "
 
-#: clientgui/MainDocument.cpp:2517
+#: clientgui/MainDocument.cpp:2514
 msgid "Waiting for memory"
 msgstr "Čakanie na pamäť"
 
-#: clientgui/MainDocument.cpp:2519
+#: clientgui/MainDocument.cpp:2516
 msgid "Waiting for shared memory"
 msgstr "Čakanie na zdieľanú pamäť"
 
-#: clientgui/MainDocument.cpp:2521
+#: clientgui/MainDocument.cpp:2518
 msgid "Running"
 msgstr "Počítanie"
 
-#: clientgui/MainDocument.cpp:2523
+#: clientgui/MainDocument.cpp:2520
 msgid " (non-CPU-intensive)"
 msgstr " (nenáročný na procesor)"
 
-#: clientgui/MainDocument.cpp:2526
+#: clientgui/MainDocument.cpp:2523
 msgid "Waiting to run"
 msgstr "Čakanie na výpočet"
 
-#: clientgui/MainDocument.cpp:2528
-#: clientgui/MainDocument.cpp:2534
+#: clientgui/MainDocument.cpp:2525 clientgui/MainDocument.cpp:2528
 msgid "Ready to start"
 msgstr "Pripravená na spustenie"
 
-#: clientgui/MainDocument.cpp:2538
+#: clientgui/MainDocument.cpp:2532
 msgid "Postponed: "
-msgstr ""
+msgstr "Odložené:"
 
-#: clientgui/MainDocument.cpp:2541
+#: clientgui/MainDocument.cpp:2535
 msgid "Postponed"
-msgstr ""
+msgstr "Pozastavené"
 
-#: clientgui/MainDocument.cpp:2545
+#: clientgui/MainDocument.cpp:2539
 msgid "Waiting for network access"
-msgstr ""
+msgstr "Čakanie na prístup k sieti"
 
-#: clientgui/MainDocument.cpp:2549
+#: clientgui/MainDocument.cpp:2543
 msgid "Computation error"
 msgstr "Chyba výpočtu"
 
-#: clientgui/MainDocument.cpp:2553
+#: clientgui/MainDocument.cpp:2547
 msgid "Upload failed"
 msgstr "Odoslanie zlyhalo"
 
-#: clientgui/MainDocument.cpp:2555
+#: clientgui/MainDocument.cpp:2549
 msgid "Uploading"
 msgstr "Odosielanie"
 
-#: clientgui/MainDocument.cpp:2566
+#: clientgui/MainDocument.cpp:2560
 msgid "Aborted by user"
-msgstr "Zrušená užívateľom"
+msgstr "Zrušená používateľom"
 
-#: clientgui/MainDocument.cpp:2569
+#: clientgui/MainDocument.cpp:2563
 msgid "Aborted by project"
 msgstr "Zrušená projektom"
 
-#: clientgui/MainDocument.cpp:2572
+#: clientgui/MainDocument.cpp:2566
 msgid "Aborted: not started by deadline"
 msgstr "Zrušené: výpočet sa nezačal do určeného termínu"
 
-#: clientgui/MainDocument.cpp:2575
+#: clientgui/MainDocument.cpp:2569
 msgid "Aborted: disk limit exceeded"
 msgstr "Zrušené: prekročený limit použitého miesta na disku"
 
-#: clientgui/MainDocument.cpp:2578
+#: clientgui/MainDocument.cpp:2572
 msgid "Aborted: run time limit exceeded"
 msgstr "Zrušené: prekročený limit na dĺžku výpočtu"
 
-#: clientgui/MainDocument.cpp:2581
+#: clientgui/MainDocument.cpp:2575
 msgid "Aborted: memory limit exceeded"
 msgstr "Zrušené: prekročený limit použitej pamäte"
 
-#: clientgui/MainDocument.cpp:2584
+#: clientgui/MainDocument.cpp:2578
 msgid "Aborted"
 msgstr "Zrušená"
 
-#: clientgui/MainDocument.cpp:2589
+#: clientgui/MainDocument.cpp:2583
 msgid "Acknowledged"
 msgstr "Potvrdená"
 
-#: clientgui/MainDocument.cpp:2591
+#: clientgui/MainDocument.cpp:2585
 msgid "Ready to report"
 msgstr "Pripravená na odoslanie"
 
-#: clientgui/MainDocument.cpp:2593
+#: clientgui/MainDocument.cpp:2587
 #, c-format
 msgid "Error: invalid state '%d'"
 msgstr "Chyba: neplatný stav '%d'"
@@ -2552,10 +2580,7 @@ msgid ""
 "The URL you supplied is not that of a BOINC-based project.\n"
 "\n"
 "Please check the URL and try again."
-msgstr ""
-"URL Vami dodaná nie je z projektov pod BOINC.\n"
-"\n"
-"Prosím skontrolujte URL a skúste znova."
+msgstr "URL Vami dodaná nie je z projektov pod BOINC.\n\nProsím skontrolujte URL a skúste znova."
 
 #: clientgui/NotDetectedPage.cpp:188
 msgid "Account manager not found"
@@ -2567,10 +2592,7 @@ msgid ""
 "manager.\n"
 "\n"
 "Please check the URL and try again."
-msgstr ""
-"Vami dodané URL nie je známym Správcom konta pre BOINC.\n"
-"\n"
-"Prosím skontrolujte URL a skúste znova."
+msgstr "Vami dodané URL nie je známym Správcom konta pre BOINC.\n\nProsím skontrolujte URL a skúste znova."
 
 #: clientgui/NotFoundPage.cpp:181
 msgid "Login Failed."
@@ -2578,7 +2600,7 @@ msgstr "Prihlásenie neúspešné."
 
 #: clientgui/NotFoundPage.cpp:185
 msgid "Check the username and password, and try again."
-msgstr "Skontrolujte užívateľské meno a heslo, potom skúste znova."
+msgstr "Skontrolujte používateľské meno a heslo, potom skúste znova."
 
 #: clientgui/NotFoundPage.cpp:189
 msgid "Check the email address and password, and try again."
@@ -2592,55 +2614,54 @@ msgstr "viac..."
 msgid "Choose a project"
 msgstr "Zvoľte projekt"
 
-#: clientgui/ProjectInfoPage.cpp:228
+#: clientgui/ProjectInfoPage.cpp:226
 msgid "To choose a project, click its name or type its URL below."
-msgstr ""
-"Zvoľte projekt kliknutím na jeho názov\n"
-"alebo napíšte do kolónky jeho adresu URL."
+msgstr "Zvoľte projekt kliknutím na jeho názov\nalebo napíšte do kolónky jeho adresu URL."
 
-#: clientgui/ProjectInfoPage.cpp:246
+#: clientgui/ProjectInfoPage.cpp:242
 msgid "Categories:"
 msgstr "Kategórie:"
 
-#: clientgui/ProjectInfoPage.cpp:267
+#: clientgui/ProjectInfoPage.cpp:262
 msgid "Projects:"
 msgstr "Projekty:"
 
-#: clientgui/ProjectInfoPage.cpp:279
+#: clientgui/ProjectInfoPage.cpp:274
 msgid "Project details"
 msgstr "Detaily projektu"
 
-#: clientgui/ProjectInfoPage.cpp:291
+#: clientgui/ProjectInfoPage.cpp:284
 msgid "Research area:"
 msgstr "Oblasť výskumu:"
 
-#: clientgui/ProjectInfoPage.cpp:302
+#: clientgui/ProjectInfoPage.cpp:294
 msgid "Organization:"
 msgstr "Organizácia:"
 
-#: clientgui/ProjectInfoPage.cpp:313
+#: clientgui/ProjectInfoPage.cpp:304
 msgid "Web site:"
-msgstr "Web stránka:"
+msgstr "Webstránka:"
 
-#: clientgui/ProjectInfoPage.cpp:325
+#: clientgui/ProjectInfoPage.cpp:315
 msgid "Supported systems:"
 msgstr "Podporované systémy:"
 
-#: clientgui/ProjectInfoPage.cpp:363
+#: clientgui/ProjectInfoPage.cpp:352
 msgid "Project URL:"
 msgstr "URL adresa projektu:"
 
-#: clientgui/ProjectInfoPage.cpp:499
-#: clientgui/ProjectInfoPage.cpp:754
-#: clientgui/ProjectInfoPage.cpp:758
+#: clientgui/ProjectInfoPage.cpp:486 clientgui/ProjectInfoPage.cpp:686
+#: clientgui/ProjectInfoPage.cpp:690
 msgid "All"
 msgstr "Všetky"
 
-#: clientgui/ProjectInfoPage.cpp:802
-msgid "This project may not have work for your type of computer.  Do you want to add it anyway?"
+#: clientgui/ProjectInfoPage.cpp:735
+msgid ""
+"This project may not have work for your type of computer.  Do you want to "
+"add it anyway?"
 msgstr "Tento projekt nemusí mať prácu pre Váš typ počítača.  Chcete sa k nemu napriek tomu pripojiť?"
 
-#: clientgui/ProjectInfoPage.cpp:826
+#: clientgui/ProjectInfoPage.cpp:767
 msgid "You already added this project. Please choose a different project."
 msgstr "Tento projekt ste si už pripojili. Prosím zvoľte iný projekt."
 
@@ -2648,12 +2669,12 @@ msgstr "Tento projekt ste si už pripojili. Prosím zvoľte iný projekt."
 msgid "Communicating with project."
 msgstr "Komunikácia so serverom projektu."
 
-#: clientgui/ProjectProcessingPage.cpp:510
+#: clientgui/ProjectProcessingPage.cpp:509
 msgid "Required files not found on the server."
 msgstr "Na serveri sa nenašli potrebné súbory."
 
-#: clientgui/ProjectProcessingPage.cpp:513
-#: clientgui/ProjectProcessingPage.cpp:586
+#: clientgui/ProjectProcessingPage.cpp:512
+#: clientgui/ProjectProcessingPage.cpp:585
 msgid "An internal server error has occurred."
 msgstr "Vyskytla sa interná chyba servera."
 
@@ -2661,42 +2682,42 @@ msgstr "Vyskytla sa interná chyba servera."
 msgid ""
 "Communicating with project\n"
 "Please wait..."
-msgstr ""
-"Komunikácia s projektom\n"
-"Prosím čakajte..."
+msgstr "Komunikácia s projektom\nProsím čakajte..."
 
 #: clientgui/ProjectWelcomePage.cpp:251
 #, c-format
 msgid "Welcome to %s."
-msgstr ""
+msgstr "Vitajte v %s."
 
 #: clientgui/ProjectWelcomePage.cpp:254
 msgid "You have volunteered to compute for this project:"
-msgstr ""
+msgstr "Rozhodli ste sa zúčastniť nasledovných projektov:"
 
 #: clientgui/ProjectWelcomePage.cpp:255
 msgid "Name:"
-msgstr ""
+msgstr "Meno:"
 
 #: clientgui/ProjectWelcomePage.cpp:258
 msgid "Home:"
-msgstr ""
+msgstr "Domov:"
 
 #: clientgui/ProjectWelcomePage.cpp:262
 msgid "Description:"
-msgstr ""
+msgstr "Popis:"
 
 #: clientgui/ProjectWelcomePage.cpp:265
 msgid "URL:"
-msgstr ""
+msgstr "URL:"
 
 #: clientgui/ProjectWelcomePage.cpp:268
 msgid "User:"
-msgstr ""
+msgstr "Používateľ:"
 
 #: clientgui/ProjectWelcomePage.cpp:273
-msgid "WARNING: This project is not registered with BOINC.  Make sure you trust it before continuing."
-msgstr ""
+msgid ""
+"WARNING: This project is not registered with BOINC.  Make sure you trust it "
+"before continuing."
+msgstr "POZOR! Tento projekt nie je zaregistrovaný u BOINC. Uistite sa, že mu dôverujete predtým ako budete pokračovať."
 
 #: clientgui/ProjectWelcomePage.cpp:277
 msgid "To continue, click Next."
@@ -2721,19 +2742,7 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"The World Community Grid - BOINC zlyhal pri komunikácii na Internete.\n"
-"Najpravdepodobnejšie príčiny sú:\n"
-"\n"
-"1) Problém s pripojením.  Skontrolujte Vaše sieťové alebo\n"
-"modemové pripojenie a stlačte tlačidlo späť pre zopakovanie\n"
-"\n"
-"2) Softvér osobného firewallu blokuje World Community Grid - BOINC.\n"
-"Nastavte Váš osobný firewall tak, aby umožnil programom BOINC a Správca BOINC\n"
-"komunikáciu na porte 80 a 443, potom kliknite na Späť a skúste znova.\n"
-"\n"
-"3) Používate proxy server.\n"
-"Kliknite na Ďalej pre konfigurovanie proxy nastavení pre BOINC."
+msgstr "The World Community Grid - BOINC zlyhal pri komunikácii na Internete.\nNajpravdepodobnejšie príčiny sú:\n\n1) Problém s pripojením.  Skontrolujte Vaše sieťové alebo\nmodemové pripojenie a stlačte tlačidlo späť pre zopakovanie\n\n2) Softvér osobného firewallu blokuje World Community Grid - BOINC.\nNastavte Váš osobný firewall tak, aby umožnil programom BOINC a Správca BOINC\nkomunikáciu na porte 80 a 443, potom kliknite na Späť a skúste znova.\n\n3) Používate proxy server.\nKlikni [...]
 
 #: clientgui/ProxyInfoPage.cpp:203
 msgid ""
@@ -2750,19 +2759,7 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"BOINC zlyhal pri komunikácii cez Internet.\n"
-"Najpravdepodobnejšie príčiny sú:\n"
-"\n"
-"1) Problém s pripojením.  Skontrolujte Vaše sieťové alebo\n"
-"modemové pripojenie a stlačte tlačidlo späť pre zopakovanie\n"
-"\n"
-"2) Softvér osobného firewallu blokuje BOINC.\n"
-"Nastavte Váš osobný firewall tak, aby umožnil programom BOINC a Správca BOINC\n"
-"komunikáciu na porte 80, potom kliknite na Späť a skúste znova.\n"
-"\n"
-"3) Používate proxy server.\n"
-"Kliknite na Ďalej pre konfigurovanie proxy nastavení pre BOINC."
+msgstr "BOINC zlyhal pri komunikácii cez Internet.\nNajpravdepodobnejšie príčiny sú:\n\n1) Problém s pripojením.  Skontrolujte Vaše sieťové alebo\nmodemové pripojenie a stlačte tlačidlo späť pre zopakovanie\n\n2) Softvér osobného firewallu blokuje BOINC.\nNastavte Váš osobný firewall tak, aby umožnil programom BOINC a Správca BOINC\nkomunikáciu na porte 80, potom kliknite na Späť a skúste znova.\n\n3) Používate proxy server.\nKliknite na Ďalej pre konfigurovanie proxy nastavení pre BOINC."
 
 #: clientgui/ProxyPage.cpp:331
 msgid "Proxy configuration"
@@ -2772,8 +2769,7 @@ msgstr "Konfigurácia proxy"
 msgid "HTTP proxy"
 msgstr "HTTP proxy server"
 
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
+#: clientgui/ProxyPage.cpp:337 clientgui/ProxyPage.cpp:357
 msgid "Server:"
 msgstr "Server:"
 
@@ -2785,51 +2781,64 @@ msgstr "Autodetekcia"
 msgid "SOCKS proxy"
 msgstr "SOCKS proxy server"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:167
+#: clientgui/sg_BoincSimpleFrame.cpp:166
+msgid "Skin"
+msgstr "Vzhľad"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:168
+msgid "Select the appearance of the user interface."
+msgstr "Vyberte si vzhľad používateľského rozhrania."
+
+#: clientgui/sg_BoincSimpleFrame.cpp:179
+msgid "Display diagnostic messages."
+msgstr "Zobraziť diagnostické správy."
+
+#: clientgui/sg_BoincSimpleFrame.cpp:184
 msgid "Advanced View...\tCtrl+Shift+A"
 msgstr "Pokročilé zobrazenie...\tCtrl+Shift+A"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:168
+#: clientgui/sg_BoincSimpleFrame.cpp:185
 msgid "Display the advanced graphical interface."
 msgstr "Zobraziť pokročilé grafické rozhranie."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:175
-msgid "Skin"
-msgstr "Vzhľad"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:177
-msgid "Select the appearance of the user interface."
-msgstr "Vyberte si vzhľad používateľského rozhrania."
+#: clientgui/sg_BoincSimpleFrame.cpp:201
+msgid "Configure display options and proxy settings"
+msgstr "Konfigurovať voľby zobrazenia a nastavenia proxy"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:224
+#: clientgui/sg_BoincSimpleFrame.cpp:222
 #, c-format
 msgid "&%s"
 msgstr "&%s"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:405
+#: clientgui/sg_BoincSimpleFrame.cpp:396
 msgid "Default"
 msgstr "Predvolené"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:848
+#: clientgui/sg_BoincSimpleFrame.cpp:838
 msgid "Suspend"
 msgstr "Pozastaviť"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:850
+#: clientgui/sg_BoincSimpleFrame.cpp:840
 msgid "Suspend Computing"
 msgstr "Pozastaviť výpočty"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:851
+#: clientgui/sg_BoincSimpleFrame.cpp:841
 msgid "Resume Computing"
 msgstr "Pokračovať vo výpočtoch"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:867
+#: clientgui/sg_BoincSimpleFrame.cpp:857
 msgid "Notices"
 msgstr "Oznamy"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:868
+#: 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/sg_BoincSimpleFrame.cpp:879
+#, c-format
+msgid "Get help with %s"
+msgstr "Získať pomoc s %s"
+
 #: clientgui/sg_DlgMessages.cpp:124
 msgid "Fetching notices; please wait..."
 msgstr "Načítavajú sa oznamy, prosím počkajte..."
@@ -2847,233 +2856,104 @@ msgstr "Zatvoriť"
 msgid "%s - Notices"
 msgstr "%s - Oznamy"
 
-#: clientgui/sg_DlgPreferences.cpp:270
-msgid "This dialog controls preferences for this computer only."
-msgstr "Toto okno nastavuje preferencie len pre tento počítač."
-
-#: clientgui/sg_DlgPreferences.cpp:275
-msgid "Click OK to set preferences."
-msgstr "Kliknite Vymazať pre obnovenie preferencií uvedených nižšie na stav z webu."
-
-#: clientgui/sg_DlgPreferences.cpp:280
-msgid "Click Clear to restore web-based settings for all preferences listed below."
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:287
-msgid "For additional settings, select Computing Preferences in the Advanced View."
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:315
-msgid "Do work only between:"
-msgstr "Pracovať iba medzi:"
-
-#: clientgui/sg_DlgPreferences.cpp:337
-msgid "Connect to internet only between:"
-msgstr "Pripojiť k Internetu iba medzi:"
-
-#: clientgui/sg_DlgPreferences.cpp:359
-#: clientgui/sg_DlgPreferences.cpp:376
-msgid "Use no more than:"
-msgstr "Použiť nie viac ako:"
-
-#: clientgui/sg_DlgPreferences.cpp:372
-msgid "of disk space"
-msgstr "miesta na disku"
-
-#: clientgui/sg_DlgPreferences.cpp:389
-msgid "of the processor"
-msgstr "procesora"
-
-#: clientgui/sg_DlgPreferences.cpp:393
-msgid "Do work while on battery?"
-msgstr "Pracovať pri behu na batérie?"
-
-#: clientgui/sg_DlgPreferences.cpp:406
-msgid "Do work after idle for:"
-msgstr "Pracovať pri nečinnosti za:"
-
-#: clientgui/sg_DlgPreferences.cpp:431
-msgid "Clear all local preferences listed above and close the dialog"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:609
-#: clientgui/sg_DlgPreferences.cpp:612
-#: clientgui/sg_DlgPreferences.cpp:688
-#: clientgui/sg_DlgPreferences.cpp:692
-#: clientgui/sg_DlgPreferences.cpp:704
-#: clientgui/sg_DlgPreferences.cpp:708
-#: clientgui/sg_DlgPreferences.cpp:851
-#: clientgui/sg_DlgPreferences.cpp:862
-msgid "Anytime"
-msgstr "Kedykoľvek"
-
-#: clientgui/sg_DlgPreferences.cpp:645
-msgid "100 MB"
-msgstr "100 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:646
-msgid "200 MB"
-msgstr "200 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:647
-msgid "500 MB"
-msgstr "500 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:648
-msgid "1 GB"
-msgstr "1 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:649
-msgid "2 GB"
-msgstr "2 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:650
-msgid "5 GB"
-msgstr "5 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:651
-msgid "10 GB"
-msgstr "10 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:652
-msgid "20 GB"
-msgstr "20 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:653
-msgid "50 GB"
-msgstr "50 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:654
-msgid "100 GB"
-msgstr "100 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:724
-#, c-format
-msgid "%d MB"
-msgstr "%d MB"
-
-#: clientgui/sg_DlgPreferences.cpp:726
-#, c-format
-msgid "%4.2f GB"
-msgstr "%4.2f GB"
-
-#: clientgui/sg_DlgPreferences.cpp:767
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: clientgui/sg_DlgPreferences.cpp:803
-msgid "0 (Run Always)"
-msgstr "0 (Beží stále)"
+#: 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/sg_DlgPreferences.cpp:806
-#, c-format
-msgid "%d"
-msgstr "%d"
+#: clientgui/sg_DlgPreferences.cpp:289
+msgid "GB of disk space"
+msgstr "Miesto na disku (GB)"
 
-#: clientgui/sg_DlgPreferences.cpp:953
+#: clientgui/sg_DlgPreferences.cpp:980
 #, c-format
 msgid "%s - Computing Preferences"
-msgstr ""
+msgstr "%s - &Preferencie počítania"
 
-#: clientgui/sg_DlgPreferences.cpp:1033
-msgid "Do you really want to clear all local preferences?\n"
-msgstr "Chcete skutočne odstrániť všetky lokálne preferencie?\n"
+#: 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/sg_ProjectCommandPopup.cpp:66
-#: clientgui/ViewProjects.cpp:179
 msgid "Update"
 msgstr "Aktualizovať"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:67
-#: clientgui/ViewProjects.cpp:180
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
+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/sg_ProjectCommandPopup.cpp:73
 #: clientgui/sg_ProjectCommandPopup.cpp:129
-#: clientgui/ViewProjects.cpp:187
-#: clientgui/ViewProjects.cpp:727
 msgid "Suspend tasks for this project."
 msgstr "Pozastaviť úlohy pre tento projekt."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:78
 #: clientgui/sg_ProjectCommandPopup.cpp:136
-#: clientgui/ViewProjects.cpp:193
-#: clientgui/ViewProjects.cpp:746
 msgid "No new tasks"
 msgstr "Žiadne nové úlohy"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:79
-#: clientgui/ViewProjects.cpp:194
 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:200
 msgid "Reset project"
 msgstr "Resetovať projekt"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:85
-#: clientgui/ViewProjects.cpp:201
-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."
+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:208
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
+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/sg_ProjectCommandPopup.cpp:96
 #: clientgui/sg_TaskCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:214
 msgid "Properties"
 msgstr "Vlastnosti"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:97
-#: clientgui/ViewProjects.cpp:215
 msgid "Show project details."
 msgstr "Zobraziť detaily projektu."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:126
-#: clientgui/ViewProjects.cpp:723
 msgid "Resume tasks for this project."
 msgstr "Pokračovať na úlohách pre tento projekt."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:133
-#: clientgui/ViewProjects.cpp:742
 msgid "Allow new tasks"
 msgstr "Povoliť nové úlohy"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:134
-#: clientgui/ViewProjects.cpp:742
 msgid "Allow fetching new tasks for this project."
 msgstr "Povoliť sťahovanie nových úloh pre tento projekt."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:137
-#: clientgui/ViewProjects.cpp:746
 msgid "Don't fetch new tasks for this project."
 msgstr "Nesťahovať nové úlohy pre tento projekt."
 
 #: clientgui/sg_ProjectCommandPopup.cpp:229
-#: clientgui/ViewProjects.cpp:443
 #, 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
-#: clientgui/ViewProjects.cpp:449
 msgid "Reset Project"
 msgstr "Resetovať projekt"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:266
-#: clientgui/ViewProjects.cpp:501
 #, 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
-#: clientgui/ViewProjects.cpp:507
 msgid "Remove Project"
 msgstr "Odstrániť projekt"
 
@@ -3089,6 +2969,10 @@ msgstr "Sychronizovať"
 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"
@@ -3108,7 +2992,7 @@ msgstr "Príkazy projektu"
 #: clientgui/sg_ProjectPanel.cpp:276
 #, c-format
 msgid "Pop up a menu of web sites for project %s"
-msgstr ""
+msgstr "Zobraziť ponuku webových stránok projektu %s"
 
 #: clientgui/sg_ProjectPanel.cpp:278
 #, c-format
@@ -3152,9 +3036,7 @@ msgstr "Pozastaviť prácu na tejto úlohe."
 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)"
+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"
@@ -3225,52 +3107,51 @@ msgstr "Zostáva (odhad): %s"
 msgid "Status: %s"
 msgstr "Stav: %s"
 
-#: clientgui/sg_TaskPanel.cpp:1227
+#: clientgui/sg_TaskPanel.cpp:1228
 msgid "Retrieving current status."
 msgstr "Obnovovanie aktuálneho stavu."
 
-#: clientgui/sg_TaskPanel.cpp:1233
+#: clientgui/sg_TaskPanel.cpp:1234
 msgid "Downloading work from the server."
 msgstr "Sťahovanie práce zo servera."
 
-#: clientgui/sg_TaskPanel.cpp:1238
+#: clientgui/sg_TaskPanel.cpp:1239
 msgid "Processing Suspended:  Running On Batteries."
 msgstr "Spracovanie pozastavené:  Beh na batérie."
 
-#: clientgui/sg_TaskPanel.cpp:1240
+#: clientgui/sg_TaskPanel.cpp:1241
 msgid "Processing Suspended:  User Active."
-msgstr "Spracovanie pozastavené:  Užívateľ pracuje."
+msgstr "Spracovanie pozastavené:  Používateľ pracuje."
 
-#: clientgui/sg_TaskPanel.cpp:1242
+#: clientgui/sg_TaskPanel.cpp:1243
 msgid "Processing Suspended:  User paused processing."
-msgstr "Spracovanie pozastavené:  Užívateľ pozastavil spracovanie."
+msgstr "Spracovanie pozastavené: Používateľ pozastavil spracovanie."
 
-#: clientgui/sg_TaskPanel.cpp:1244
+#: clientgui/sg_TaskPanel.cpp:1245
 msgid "Processing Suspended:  Time of Day."
 msgstr "Spracovanie pozastavené:  Denná doba."
 
-#: clientgui/sg_TaskPanel.cpp:1246
+#: clientgui/sg_TaskPanel.cpp:1247
 msgid "Processing Suspended:  Benchmarks Running."
 msgstr "Spracovanie pozastavené:  Bežia testy rýchlosti."
 
-#: clientgui/sg_TaskPanel.cpp:1248
+#: clientgui/sg_TaskPanel.cpp:1249
 msgid "Processing Suspended."
 msgstr "Spracovanie pozastavené."
 
-#: clientgui/sg_TaskPanel.cpp:1252
+#: clientgui/sg_TaskPanel.cpp:1253
 msgid "Waiting to contact project servers."
 msgstr "Čakanie na spojenie so servermi projektu."
 
-#: clientgui/sg_TaskPanel.cpp:1256
-#: clientgui/sg_TaskPanel.cpp:1265
+#: clientgui/sg_TaskPanel.cpp:1257 clientgui/sg_TaskPanel.cpp:1266
 msgid "Retrieving current status"
 msgstr "Obnovovanie aktuálneho stavu"
 
-#: clientgui/sg_TaskPanel.cpp:1260
+#: clientgui/sg_TaskPanel.cpp:1261
 msgid "No work available to process"
 msgstr "Nie je dostupná žiadna práca na spracovanie"
 
-#: clientgui/sg_TaskPanel.cpp:1262
+#: clientgui/sg_TaskPanel.cpp:1263
 msgid "Unable to connect to the core client"
 msgstr "Zlyhalo pripojenie ku klientovi"
 
@@ -3288,7 +3169,7 @@ msgstr "Súhlasím s podmienkami použitia."
 
 #: clientgui/TermsOfUsePage.cpp:237
 msgid "I do not agree to the terms of use."
-msgstr ""
+msgstr "Nesúhlasím s podmienkami použitia."
 
 #: clientgui/UnavailablePage.cpp:183
 msgid "Project temporarily unavailable"
@@ -3299,10 +3180,7 @@ msgid ""
 "The project is temporarily unavailable.\n"
 "\n"
 "Please try again later."
-msgstr ""
-"Projekt je dočasne nedostupný.\n"
-"\n"
-"Prosím skúste znova neskôr."
+msgstr "Projekt je dočasne nedostupný.\n\nProsím skúste znova neskôr."
 
 #: clientgui/UnavailablePage.cpp:190
 msgid "Account manager temporarily unavailable"
@@ -3313,10 +3191,7 @@ msgid ""
 "The account manager is temporarily unavailable.\n"
 "\n"
 "Please try again later."
-msgstr ""
-"Správca konta je dočasne nedostupný.\n"
-"\n"
-"Prosím skúste znova neskôr."
+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."
@@ -3326,8 +3201,7 @@ msgstr "Prosím špecifikujte kľúč konta pre pokračovanie."
 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
+#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
 msgid "Validation conflict"
 msgstr "Konflikt pri validácii"
 
@@ -3348,34 +3222,23 @@ msgid ""
 "Please specify a URL.\n"
 "For example:\n"
 "http://www.example.com/"
-msgstr ""
-"Prosím špecifikujte URL.\n"
-"Napríklad:\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
+#: 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: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.\n"
-"Napríklad:\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
+#: 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."
@@ -3386,7 +3249,6 @@ msgid "'%s' does not contain a valid path."
 msgstr "'%s' neobsahuje správnu cestu."
 
 #: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:175
 msgid "Commands"
 msgstr "Príkazy"
 
@@ -3398,13 +3260,11 @@ msgstr "Kopírovať všetky správy"
 msgid "Copy selected messages"
 msgstr "Kopírovať vybraté správy"
 
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
+#: 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
+#: 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."
 
@@ -3432,119 +3292,120 @@ msgstr "Zobraziť všetky správy"
 msgid "Show messages for all projects."
 msgstr "Zobraziť správy zo všetkých projektov."
 
-#: clientgui/ViewProjects.cpp:225
+#: clientgui/ViewProjects.cpp:246 clientgui/ViewStatistics.cpp:426
 msgid "Account"
 msgstr "Konto"
 
-#: clientgui/ViewProjects.cpp:227
+#: clientgui/ViewProjects.cpp:248
 msgid "Work done"
 msgstr "Kredit"
 
-#: clientgui/ViewProjects.cpp:228
+#: clientgui/ViewProjects.cpp:249
 msgid "Avg. work done"
 msgstr "Denný priemer"
 
-#: clientgui/ViewProjects.cpp:230
+#: clientgui/ViewProjects.cpp:251 clientgui/ViewTransfers.cpp:215
+#: clientgui/ViewWork.cpp:262
 msgid "Status"
 msgstr "Stav"
 
-#: clientgui/ViewProjects.cpp:255
+#: clientgui/ViewProjects.cpp:330
 msgid "Projects"
 msgstr "Projekty"
 
-#: clientgui/ViewProjects.cpp:307
+#: clientgui/ViewProjects.cpp:382
 msgid "Updating project..."
 msgstr "Aktualizácia projektu..."
 
-#: clientgui/ViewProjects.cpp:349
+#: clientgui/ViewProjects.cpp:424
 msgid "Resuming project..."
 msgstr "Pokračovanie projektu..."
 
-#: clientgui/ViewProjects.cpp:353
+#: clientgui/ViewProjects.cpp:428
 msgid "Suspending project..."
 msgstr "Pozastavenie projektu..."
 
-#: clientgui/ViewProjects.cpp:390
+#: clientgui/ViewProjects.cpp:465
 msgid "Telling project to allow additional task downloads..."
 msgstr "Pokyn projektu, aby stiahol ďalšie úlohy..."
 
-#: clientgui/ViewProjects.cpp:394
+#: clientgui/ViewProjects.cpp:469
 msgid "Telling project to not fetch any additional tasks..."
 msgstr "Pokyn projektu, aby nesťahoval žiadne ďalšie úlohy..."
 
-#: clientgui/ViewProjects.cpp:430
+#: clientgui/ViewProjects.cpp:505
 msgid "Resetting project..."
 msgstr "Resetovanie projektu..."
 
-#: clientgui/ViewProjects.cpp:488
+#: clientgui/ViewProjects.cpp:563
 msgid "Removing project..."
 msgstr "Odstraňovanie projektu..."
 
-#: clientgui/ViewProjects.cpp:548
+#: clientgui/ViewProjects.cpp:623 clientgui/ViewWork.cpp:686
 msgid "Launching browser..."
 msgstr "Spúšťanie webového prehliadača..."
 
-#: clientgui/ViewProjects.cpp:1063
+#: clientgui/ViewProjects.cpp:1140
 msgid "Requested by user"
 msgstr "Vyžiadané používateľom"
 
-#: clientgui/ViewProjects.cpp:1064
+#: clientgui/ViewProjects.cpp:1141
 msgid "To fetch work"
 msgstr "Získať ďalšiu prácu"
 
-#: clientgui/ViewProjects.cpp:1065
+#: clientgui/ViewProjects.cpp:1142
 msgid "To report completed tasks"
 msgstr "Nahlásiť dokončené úlohy"
 
-#: clientgui/ViewProjects.cpp:1066
+#: clientgui/ViewProjects.cpp:1143
 msgid "To send trickle-up message"
 msgstr "Odoslať rýchlu správu o stave"
 
-#: clientgui/ViewProjects.cpp:1067
+#: clientgui/ViewProjects.cpp:1144
 msgid "Requested by account manager"
 msgstr "Vyžiadané Správcom konta"
 
-#: clientgui/ViewProjects.cpp:1068
+#: clientgui/ViewProjects.cpp:1145
 msgid "Project initialization"
 msgstr "Prvotné nastavenie projektu"
 
-#: clientgui/ViewProjects.cpp:1069
+#: clientgui/ViewProjects.cpp:1146
 msgid "Requested by project"
 msgstr "Vyžiadané projektom"
 
-#: clientgui/ViewProjects.cpp:1070
+#: clientgui/ViewProjects.cpp:1147
 msgid "Unknown reason"
 msgstr "Neznámy dôvod"
 
-#: clientgui/ViewProjects.cpp:1084
+#: clientgui/ViewProjects.cpp:1161
 msgid "Suspended by user"
-msgstr "Pozastavené užívateľom"
+msgstr "Pozastavené používateľom"
 
-#: clientgui/ViewProjects.cpp:1087
+#: clientgui/ViewProjects.cpp:1164
 msgid "Won't get new tasks"
 msgstr "Nebudú získané nové úlohy"
 
-#: clientgui/ViewProjects.cpp:1090
+#: clientgui/ViewProjects.cpp:1167
 msgid "Project ended - OK to remove"
 msgstr "Projekt je ukončený - je možné sa od neho odpojiť"
 
-#: clientgui/ViewProjects.cpp:1093
+#: clientgui/ViewProjects.cpp:1170
 msgid "Will remove when tasks done"
 msgstr "Bude odpojený po skončení úloh"
 
-#: clientgui/ViewProjects.cpp:1096
+#: clientgui/ViewProjects.cpp:1173
 msgid "Scheduler request pending"
 msgstr "Žiadosť plánovača nevyriešená"
 
-#: clientgui/ViewProjects.cpp:1102
+#: clientgui/ViewProjects.cpp:1179
 msgid "Scheduler request in progress"
 msgstr "Spracováva sa požiadavka plánovača"
 
-#: clientgui/ViewProjects.cpp:1105
+#: clientgui/ViewProjects.cpp:1182
 msgid "Trickle up message pending"
 msgstr "Rýchla správa o stave čaká na odoslanie"
 
-#: clientgui/ViewProjects.cpp:1111
+#: clientgui/ViewProjects.cpp:1188
 msgid "Communication deferred "
 msgstr "Komunikácia odložená "
 
@@ -3556,37 +3417,33 @@ msgstr "Celkové využitie disku"
 msgid "Disk usage by BOINC projects"
 msgstr "Využitie disku BOINC projektmi"
 
-#: clientgui/ViewResources.cpp:116
-msgid "Disk"
-msgstr "Disk"
-
 #: clientgui/ViewResources.cpp:225
 msgid "no projects: 0 bytes used"
 msgstr "žiadne projekty: použitých 0 bajtov"
 
-#: clientgui/ViewResources.cpp:262
+#: clientgui/ViewResources.cpp:259
 msgid "used by BOINC: "
 msgstr "používané BOINCom: "
 
-#: clientgui/ViewResources.cpp:272
+#: clientgui/ViewResources.cpp:269
 msgid "free, available to BOINC: "
 msgstr "voľné, dostupné pre BOINC: "
 
-#: clientgui/ViewResources.cpp:282
+#: clientgui/ViewResources.cpp:279
 msgid "free, not available to BOINC: "
 msgstr "voľné, nedostupné pre BOINC: "
 
-#: clientgui/ViewResources.cpp:292
+#: clientgui/ViewResources.cpp:289
 msgid "free: "
 msgstr "voľné: "
 
-#: clientgui/ViewResources.cpp:302
+#: clientgui/ViewResources.cpp:299
 msgid "used by other programs: "
 msgstr "používané inými programami: "
 
 #: clientgui/ViewStatistics.cpp:1181
 msgid "User Total"
-msgstr "Celkový kredit užívateľa"
+msgstr "Celkový kredit používateľa"
 
 #: clientgui/ViewStatistics.cpp:1182
 msgid "User Average"
@@ -3653,13 +3510,11 @@ msgstr "&Nasledujúci projekt >"
 msgid "Show chart for next project"
 msgstr "Ukázať graf pre nasledujúci projekt"
 
-#: clientgui/ViewStatistics.cpp:2000
-#: clientgui/ViewStatistics.cpp:2390
+#: clientgui/ViewStatistics.cpp:2000 clientgui/ViewStatistics.cpp:2390
 msgid "Hide project list"
 msgstr "Skryť zoznam projektov"
 
-#: clientgui/ViewStatistics.cpp:2001
-#: clientgui/ViewStatistics.cpp:2390
+#: clientgui/ViewStatistics.cpp:2001 clientgui/ViewStatistics.cpp:2390
 msgid "Use entire area for graphs"
 msgstr "Využiť celú plochu pre grafy"
 
@@ -3703,16 +3558,11 @@ msgstr "Zobraziť jeden graf so súhrnom projektov"
 msgid "Statistics"
 msgstr "Štatistiky"
 
-#: clientgui/ViewStatistics.cpp:2077
-#: clientgui/ViewStatistics.cpp:2098
-#: clientgui/ViewStatistics.cpp:2119
-#: clientgui/ViewStatistics.cpp:2141
-#: clientgui/ViewStatistics.cpp:2162
-#: clientgui/ViewStatistics.cpp:2183
-#: clientgui/ViewStatistics.cpp:2204
-#: clientgui/ViewStatistics.cpp:2225
-#: clientgui/ViewStatistics.cpp:2246
-#: clientgui/ViewStatistics.cpp:2270
+#: clientgui/ViewStatistics.cpp:2077 clientgui/ViewStatistics.cpp:2098
+#: clientgui/ViewStatistics.cpp:2119 clientgui/ViewStatistics.cpp:2141
+#: clientgui/ViewStatistics.cpp:2162 clientgui/ViewStatistics.cpp:2183
+#: clientgui/ViewStatistics.cpp:2204 clientgui/ViewStatistics.cpp:2225
+#: clientgui/ViewStatistics.cpp:2246 clientgui/ViewStatistics.cpp:2270
 msgid "Updating charts..."
 msgstr "Aktualizovanie grafov..."
 
@@ -3724,199 +3574,185 @@ msgstr "Ukázať zoznam projektov"
 msgid "Uses smaller area for graphs"
 msgstr "Použiť menšiu plochu pre grafy"
 
-#: clientgui/ViewTransfers.cpp:169
+#: clientgui/ViewTransfers.cpp:187
 msgid "Retry Now"
 msgstr "Zopakovať teraz"
 
-#: clientgui/ViewTransfers.cpp:170
+#: clientgui/ViewTransfers.cpp:188
 msgid "Retry the file transfer now"
 msgstr "Zopakovať prenos súboru"
 
-#: clientgui/ViewTransfers.cpp:176
+#: clientgui/ViewTransfers.cpp:194
 msgid "Abort Transfer"
 msgstr "Zrušiť prenos"
 
-#: clientgui/ViewTransfers.cpp:177
+#: clientgui/ViewTransfers.cpp:195
 msgid "Abort this file transfer.  You won't get credit for the task."
 msgstr "Zrušiť prenos súboru.  Za túto úlohu nedostanete žiaden kredit."
 
-#: clientgui/ViewTransfers.cpp:188
+#: clientgui/ViewTransfers.cpp:210
 msgid "File"
 msgstr "Súbor"
 
-#: clientgui/ViewTransfers.cpp:189
-#: clientgui/ViewWork.cpp:238
+#: clientgui/ViewTransfers.cpp:211 clientgui/ViewWork.cpp:261
 msgid "Progress"
 msgstr "Priebeh"
 
-#: clientgui/ViewTransfers.cpp:190
+#: clientgui/ViewTransfers.cpp:212
 msgid "Size"
 msgstr "Veľkosť"
 
-#: clientgui/ViewTransfers.cpp:191
-msgid "Elapsed Time"
+#: clientgui/ViewTransfers.cpp:213 clientgui/ViewWork.cpp:263
+msgid "Elapsed"
 msgstr "Uplynutý čas"
 
-#: clientgui/ViewTransfers.cpp:192
+#: clientgui/ViewTransfers.cpp:214
 msgid "Speed"
 msgstr "Rýchlosť"
 
-#: clientgui/ViewTransfers.cpp:218
+#: clientgui/ViewTransfers.cpp:295
 msgid "Transfers"
 msgstr "Prenosy"
 
-#: clientgui/ViewTransfers.cpp:285
+#: clientgui/ViewTransfers.cpp:362
 msgid "Network activity is suspended - "
 msgstr "Sieťové aktivity pozastavené - "
 
-#: clientgui/ViewTransfers.cpp:287
+#: clientgui/ViewTransfers.cpp:364
 msgid ""
 ".\n"
 "You can enable it using the Activity menu."
-msgstr ""
-".\n"
-"Môžete povoliť v menu Aktivity."
+msgstr ".\nMôžete povoliť v menu Aktivity."
 
-#: clientgui/ViewTransfers.cpp:290
+#: clientgui/ViewTransfers.cpp:367
 msgid "BOINC"
 msgstr "BOINC"
 
-#: clientgui/ViewTransfers.cpp:297
+#: clientgui/ViewTransfers.cpp:374
 msgid "Retrying transfer now..."
 msgstr "Opakovanie prenosu teraz..."
 
-#: clientgui/ViewTransfers.cpp:335
+#: clientgui/ViewTransfers.cpp:412
 msgid "Aborting transfer..."
 msgstr "Prerušenie prenosu..."
 
-#: clientgui/ViewTransfers.cpp:348
+#: 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'?\n"
-"POZNÁMKA: Zrušenie prenosu neodsúhlasí úlohu a Vy\n"
-"za ňu nedostanete pridelený kredit."
+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:354
+#: clientgui/ViewTransfers.cpp:431
 msgid "Abort File Transfer"
 msgstr "Zrušiť prenos súboru"
 
-#: clientgui/ViewTransfers.cpp:785
+#: clientgui/ViewTransfers.cpp:864
 msgid "Upload"
 msgstr "Odosielanie"
 
-#: clientgui/ViewTransfers.cpp:785
+#: clientgui/ViewTransfers.cpp:864
 msgid "Download"
 msgstr "Sťahovanie"
 
-#: clientgui/ViewTransfers.cpp:789
+#: clientgui/ViewTransfers.cpp:868
 msgid "retry in "
 msgstr "zopakuje sa o "
 
-#: clientgui/ViewTransfers.cpp:791
+#: clientgui/ViewTransfers.cpp:870
 msgid "failed"
 msgstr "zlyhalo"
 
-#: clientgui/ViewTransfers.cpp:794
+#: clientgui/ViewTransfers.cpp:873
 msgid "suspended"
 msgstr "pozastavené"
 
-#: clientgui/ViewTransfers.cpp:799
+#: clientgui/ViewTransfers.cpp:878
 msgid "active"
 msgstr "prebieha"
 
-#: clientgui/ViewTransfers.cpp:801
+#: clientgui/ViewTransfers.cpp:880
 msgid "pending"
 msgstr "čaká"
 
-#: clientgui/ViewTransfers.cpp:808
+#: clientgui/ViewTransfers.cpp:887
 msgid " (project backoff: "
 msgstr " (odsunutie projektu: "
 
-#: clientgui/ViewWork.cpp:192
-#: clientgui/ViewWork.cpp:782
+#: clientgui/ViewWork.cpp:211 clientgui/ViewWork.cpp:864
 msgid "Show active tasks"
 msgstr "Zobraziť aktívne úlohy"
 
-#: clientgui/ViewWork.cpp:193
-#: clientgui/ViewWork.cpp:783
+#: clientgui/ViewWork.cpp:212 clientgui/ViewWork.cpp:865
 msgid "Show only active tasks."
 msgstr "Zobraziť len aktívne úlohy."
 
-#: clientgui/ViewWork.cpp:206
+#: clientgui/ViewWork.cpp:225
 msgid "Show VM Console"
 msgstr "Ukázať konzolu VM"
 
-#: clientgui/ViewWork.cpp:207
+#: clientgui/ViewWork.cpp:226
 msgid "Show VM Console in a window."
 msgstr "Zobraziť okno s konzolou VM."
 
-#: clientgui/ViewWork.cpp:214
+#: clientgui/ViewWork.cpp:233
 msgid "Suspend work for this result."
 msgstr "Pozastaviť prácu na tomto výsledku."
 
-#: clientgui/ViewWork.cpp:221
+#: 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:240
-msgid "Elapsed"
-msgstr "Uplynutý čas"
-
-#: clientgui/ViewWork.cpp:241
+#: clientgui/ViewWork.cpp:264
 msgid "Remaining (estimated)"
 msgstr "Zostáva (odhad)"
 
-#: clientgui/ViewWork.cpp:242
+#: clientgui/ViewWork.cpp:265
 msgid "Deadline"
 msgstr "Odoslať do"
 
-#: clientgui/ViewWork.cpp:269
+#: clientgui/ViewWork.cpp:351
 msgid "Tasks"
 msgstr "Úlohy"
 
-#: clientgui/ViewWork.cpp:362
+#: clientgui/ViewWork.cpp:444
 msgid "Resuming task..."
 msgstr "Pokračovanie úlohy..."
 
-#: clientgui/ViewWork.cpp:365
+#: clientgui/ViewWork.cpp:447
 msgid "Suspending task..."
 msgstr "Pozastavenie úlohy..."
 
-#: clientgui/ViewWork.cpp:394
+#: clientgui/ViewWork.cpp:476
 msgid "Showing graphics for task..."
 msgstr "Zobrazenie grafiky pre úlohu..."
 
-#: clientgui/ViewWork.cpp:431
+#: clientgui/ViewWork.cpp:513
 msgid "Showing VM console for task..."
 msgstr "Zobrazenie konzoly VM pre úlohu..."
 
-#: clientgui/ViewWork.cpp:484
+#: 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)"
+msgstr "Ste si istý, že chcete zrušiť túto úlohu '%s'?\n(Priebeh: %s, Stav: %s)"
 
-#: clientgui/ViewWork.cpp:490
+#: 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:504
+#: clientgui/ViewWork.cpp:586
 msgid "Aborting task..."
 msgstr "Ruší sa prenos..."
 
-#: clientgui/ViewWork.cpp:776
+#: clientgui/ViewWork.cpp:858
 msgid "Show all tasks"
 msgstr "Zobraziť všetky úlohy"
 
-#: clientgui/ViewWork.cpp:777
+#: clientgui/ViewWork.cpp:859
 msgid "Show all tasks."
 msgstr "Zobraziť všetky úlohy."
 
@@ -3936,12 +3772,7 @@ msgid ""
 "\n"
 "Projects added via this wizard will not be\n"
 "listed on or managed via %s."
-msgstr ""
-"Ak je to možné, pridajte projekty\n"
-"na webovej stránke %s.\n"
-"\n"
-"Projekty pridané týmto sprievodcom nebudú\n"
-"v zozname %s a nepôjdu ním spravovať."
+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/WelcomePage.cpp:313
 msgid ""
@@ -3950,12 +3781,7 @@ msgid ""
 "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,\n"
-"ktoré vykonávajú výskum v mnohých oblastiach vedy,\n"
-"a Vy sa môžete zapojiť do koľkých z nich chcete.\n"
-"Môžete sa pripojiť k projektu priamo, alebo použiť\n"
-"na výber projektov webovú stránku 'Správcu konta'."
+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/WelcomePage.cpp:325
 msgid ""
@@ -3970,19 +3796,7 @@ msgid ""
 "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,\n"
-"do ktorých už prispievate.\n"
-"\n"
-"Niektoré z týchto projektov sú spravované organizáciou World Community Grid,\n"
-"kým ostatné prevádzkujú iní výskumníci a organizácie.\n"
-"Aplikácia BOINC Vám umožní rozdeliť výpočtový výkon medzi\n"
-"ľubovoľnú kombináciu projektov.\n"
-"\n"
-"Ak ste registrovaní u Správcu účtu BOINC, môžete spravovať\n"
-"Vaše projekty v ňom.\n"
-"\n"
-"Vyberte si prosím typ zmeny, ktorú chcete vykonať:\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/WelcomePage.cpp:339
 msgid "Use a BOINC Account Manager"
@@ -3996,16 +3810,15 @@ msgstr "Pripojiť alebo zmeniť projekty World Community Grid"
 msgid "Add projects run by other researchers or organizations"
 msgstr "Pripojiť projekty spravované inými výskumníkmi a organizáciami"
 
-#: clientgui/WizardAttach.cpp:673
+#: clientgui/WizardAttach.cpp:560
 msgid "Do you really want to cancel?"
 msgstr "Chcete skutočne zrušiť operáciu?"
 
-#: clientgui/WizardAttach.cpp:674
+#: clientgui/WizardAttach.cpp:561
 msgid "Question"
 msgstr "Otázka"
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
+#: clientgui/wizardex.cpp:377 clientgui/wizardex.cpp:553
 msgid "&Next >"
 msgstr "Ď&alej >"
 
@@ -4043,744 +3856,10 @@ msgstr "Zobraziť všetky"
 msgid "Quit %s"
 msgstr "Ukončiť %s"
 
-#: clientgui/DlgAdvPreferences.h:30
-msgid "specify work start and stop hours in format HH:MM-HH:MM"
-msgstr "čas, kedy je možné počítať, vo formáte HH:MM-HH:MM"
-
-#: clientgui/DlgAdvPreferences.h:31
-msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
-msgstr "čas, kedy je možné používať sieť, vo formáte HH:MM-HH:MM"
-
-#~ msgid "Account manager website"
-#~ msgstr "Webová stránka Správcu konta"
-#~ msgid "Account Manager &URL:"
-#~ msgstr "&URL Správcu konta:"
-
-#, c-format
-#~ msgid "%s &website"
-#~ msgstr "%s &web stránka"
-#~ msgid ""
-#~ "(C) 2003-2013 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2013 Kalifornská Univerzita, Berkeley.\n"
-#~ "Všetky práva vyhradené."
-#~ msgid "invalid float"
-#~ msgstr "neplatné číslo s desatinnou čiarkou"
-
-#, c-format
-#~ msgid "%s - Preferences"
-#~ msgstr "%s - Preferencie"
-
-#, no-c-format
-#~ msgid "% of the processors (0 means ignore this setting)"
-#~ msgstr "% procesorov (0 znamená ignorovať toto nastavenie)"
-
-#, no-c-format
-#~ msgid "% CPU time"
-#~ msgstr "% CPU času"
-#~ msgid "KBytes/sec."
-#~ msgstr "KB/s"
-#~ msgid "Mbytes"
-#~ msgstr "Megabajtov"
-#~ msgid "every"
-#~ msgstr "každých"
-#~ msgid "days"
-#~ msgstr "dňa (dní)"
-#~ msgid "Gigabytes disk space"
-#~ msgstr "Gigabajtov miesta na disku"
-#~ msgid "Workunit name"
-#~ msgstr "Názov úlohy"
-#~ msgid "Running, high priority"
-#~ msgstr "Počítanie, s vysokou prioritou"
-#~ msgid " (Scheduler wait: "
-#~ msgstr " (Čakanie plánovača: "
-#~ msgid " (Scheduler wait)"
-#~ msgstr " (čakanie plánovača)"
-#~ msgid " (Waiting for network access)"
-#~ msgstr " (Čakanie na prístup k sieti)"
-#~ msgid "Notice List"
-#~ msgstr "Zoznam oznamov"
-
-#, c-format
-#~ msgid "%s; received on %s"
-#~ msgstr "%s; prijatá o %s"
-
-#, c-format
-#~ msgid "%s; received from %s; on %s"
-#~ msgstr "%s; prijatá od %s; o %s"
-#~ msgid "Click"
-#~ msgstr "Klik"
-#~ msgid "Project List"
-#~ msgstr "Projekty"
-#~ msgid "Nvidia GPU Supported"
-#~ msgstr "Môže využiť Nvidia GPU (grafickú kartu)"
-#~ msgid "ATI GPU Supported"
-#~ msgstr "Môže využiť ATI GPU (grafickú kartu)"
-#~ msgid "Project Website"
-#~ msgstr "Webstránka projektu"
-#~ msgid "I do not agree with the terms of use."
-#~ msgstr "Nesúhlasím s podmienkami použitia."
-#~ msgid "One or more items failed to load from the Internet."
-#~ msgstr "Jednu alebo viacero položiek nebolo možné načítať z Internetu."
-#~ msgid "Retry now"
-#~ msgstr "Zopakovať teraz"
-#~ msgid "Display the advanced (accessible) graphical interface."
-#~ msgstr "Zobraziť pokročilé grafické rozhranie."
-#~ msgid "10%"
-#~ msgstr "10%"
-#~ msgid "20%"
-#~ msgstr "20%"
-#~ msgid "30%"
-#~ msgstr "30%"
-#~ msgid "40%"
-#~ msgstr "40%"
-#~ msgid "50%"
-#~ msgstr "50%"
-#~ msgid "60%"
-#~ msgstr "60%"
-#~ msgid "70%"
-#~ msgstr "70%"
-#~ msgid "80%"
-#~ msgstr "80%"
-#~ msgid "90%"
-#~ msgstr "90%"
-#~ msgid "100%"
-#~ msgstr "100%"
-#~ msgid "1"
-#~ msgstr "1"
-#~ msgid "3"
-#~ msgstr "3"
-#~ msgid "5"
-#~ msgstr "5"
-#~ msgid "10"
-#~ msgstr "10"
-#~ msgid "15"
-#~ msgstr "15"
-#~ msgid "30"
-#~ msgstr "30"
-#~ msgid "60"
-#~ msgstr "60"
-#~ msgid "Click Clear to restore web-based settings."
-#~ msgstr "Kliknite Vymazať pre obnovenie nastavení z webstránky projektu."
-#~ msgid "For additional settings, select Computing Preferences in "
-#~ msgstr "Pre pokročilé nastavenia zvoľte Výpočtové preferencie v "
-#~ msgid "the Advanced View."
-#~ msgstr "Pokročilom zobrazení."
-#~ msgid "Paused: Other work running"
-#~ msgstr "Pozastavené: Prebieha výpočet inej úlohy"
-#~ msgid "Paused: User initiated.  Click 'Resume' to continue"
-#~ msgstr ""
-#~ "Pozastavené: Vyžiadané užívateľom.  Kliknite na 'Pokračovať' pre spustenie"
-#~ msgid "Paused: User active"
-#~ msgstr "Pozastavené: Užívateľ je aktívny"
-#~ msgid "Paused: Computer on battery"
-#~ msgstr "Pozastavené: Počítač na batérii"
-#~ msgid "Paused: Time of Day"
-#~ msgstr "Pozastavené: Denná doba"
-#~ msgid "Paused: Benchmarks running"
-#~ msgstr "Pozastavené: Prebiehajú testy rýchlosti procesora"
-#~ msgid "Paused"
-#~ msgstr "Pozastavené"
-#~ msgid "Paused: Application start delayed"
-#~ msgstr "Pozastavené: Odložené spustenie aplikácie"
-#~ msgid "Click to show project graphics"
-#~ msgstr "Kliknutím zobrazíte okno s grafikou projektu"
-
-#, c-format
-#~ msgid "Pop up a menu of websites for project %s"
-#~ msgstr "Zobraziť menu webových stránok projektu %s"
-#~ msgid "Open a window to view messages"
-#~ msgstr "Otvoriť okno pre prezretie správ"
-#~ msgid "Stop all activity"
-#~ msgstr "Zastaviť všetky aktivity"
-#~ msgid "Resume activity"
-#~ msgstr "Povoliť aktivity"
-#~ msgid "Open a window to set your preferences"
-#~ msgstr "Otvoriť okno pre nastavenie Vašich preferencií"
-#~ msgid "Switch to the BOINC advanced view"
-#~ msgstr "Prepnúť BOINC do pokročilého náhľadu"
-#~ msgid "My Projects:"
-#~ msgstr "Moje projekty:"
-
-#, c-format
-#~ msgid "%s. Work done by %s: %0.2f"
-#~ msgstr "%s. Práca dokončená v %s: %0.2f"
-
-#, c-format
-#~ msgid "%.1lf"
-#~ msgstr "%.1lf"
-
-#, c-format
-#~ msgid "%d hr %d min %d sec"
-#~ msgstr "%d hodín %d minút %d sekúnd"
-#~ msgid "Are you sure you want to display graphics on a remote machine?"
-#~ msgstr "Ste si istý, že chcete zobraziť grafiku na vzdialenom počítači?"
-#~ msgid "Application: "
-#~ msgstr "Aplikácia: "
-#~ msgid "Time Remaining: "
-#~ msgstr "Zostávajúci čas: "
-#~ msgid "Elapsed Time: "
-#~ msgstr "Uplynutý čas: "
-#~ msgid ""
-#~ "for accessibility support, please select advanced from the view menu or type "
-#~ "command shift a"
-#~ msgstr ""
-#~ "pre zjednodušenie prístupu zvoľte Pokročilé zobrazenie v menu alebo použite "
-#~ "skratku Ctrl-Shift-A"
-#~ msgid "This panel contains graphs showing user totals for projects"
-#~ msgstr "Tento panel obsahuje grafy zobrazujúce výsledky užívateľa v projektoch"
-#~ msgid "list headers"
-#~ msgstr "hlavičky zoznamu"
-#~ msgid "list of events"
-#~ msgstr "zoznam udalostí"
-#~ msgid "list of events is empty"
-#~ msgstr "zoznam udalostí je prázdny"
-
-#, c-format
-#~ msgid "list of %s"
-#~ msgstr "zoznam %s"
-
-#, c-format
-#~ msgid "list of %s is empty"
-#~ msgstr "zoznam %s je prázdny"
-
-#, c-format
-#~ msgid "; current sort column %d of %d; descending order; "
-#~ msgstr "; triedené podľa stĺpca %d z %d; zostupné poradie; "
-
-#, c-format
-#~ msgid "; current sort column %d of %d; ascending order; "
-#~ msgstr "; triedené podľa stĺpca %d z %d; vzostupné poradie; "
-
-#, c-format
-#~ msgid "; column %d of %d; "
-#~ msgstr "; stĺpec %d z %d; "
-#~ msgid "list is empty"
-#~ msgstr "zoznam je prázdny"
-
-#, c-format
-#~ msgid "; row %d; "
-#~ msgstr "; riadok %d; "
-
-#, c-format
-#~ msgid "; selected row %d of %d; "
-#~ msgstr "; vybraný riadok %d z %d; "
-
-#, c-format
-#~ msgid "; selected row %d ; "
-#~ msgstr "; vybraný riadok %d ; "
-
-#, c-format
-#~ msgid "; row %d of %d; "
-#~ msgstr "; riadok %d z %d; "
-#~ msgid "blank"
-#~ msgstr "prázdne"
-#~ msgid "list of projects or account managers"
-#~ msgstr "zoznam projektov alebo Správcov konta"
-
-#, c-format
-#~ msgid "selected row %d of %d; "
-#~ msgstr "vybraný riadok %d z %d; "
-
-#, c-format
-#~ msgid "row %d of %d; "
-#~ msgstr "riadok %d z %d; "
-#~ msgid "Preferences…"
-#~ msgstr "Preferencie…"
-#~ msgid "The minimum username length for this project is 1. Please enter a different username."
-#~ msgstr ""
-#~ "Minimálna dĺžka používateľského mena pre tento projekt je 1. Prosím zadajte "
-#~ "iné meno."
-#~ msgid "The minimum username length for this account manager is 1. Please enter a different username."
-#~ msgstr ""
-#~ "Minimálna dĺžka používateľského mena pre tohto Správcu konta je 1. Prosím "
-#~ "zadajte iné meno."
-#~ msgid "The minimum email address length for this project is 1. Please enter a different email address."
-#~ msgstr ""
-#~ "Minimálna dĺžka e-mailovej adresy pre tento projekt je 1. Prosím zadajte inú "
-#~ "e-mailovú adresu."
-#~ msgid "The minimum email address length for this account manager is 1. Please enter a different email address."
-#~ msgstr ""
-#~ "Minimálna dĺžka e-mailovej adresy pre tohto Správcu konta je 1. Prosím "
-#~ "zadajte inú e-mailovú adresu."
-
-#, c-format
-#~ msgid "The minimum password length for this project is %d. Please enter a different password."
-#~ msgstr "Mnimálna dĺžka hesla pre tento projekt je %d. Prosím zvoľte iné heslo."
-
-#, c-format
-#~ msgid "The minimum password length for this account manager is %d. Please enter a different password."
-#~ msgstr ""
-#~ "Minimálna dĺžka hesla pre tohoto Správcu konta je %d. Prosím zvoľte iné "
-#~ "heslo."
-#~ msgid ""
-#~ "An error has occurred;\n"
-#~ "check the Event Log for details.\n"
-#~ "\n"
-#~ "Click Finish to close."
-#~ msgstr ""
-#~ "Objavila sa chyba;\n"
-#~ "skontrolujte Záznam udalostí pre podrobnosti.\n"
-#~ "\n"
-#~ "Kliknite na Dokončiť pre zatvorenie."
-
-#, no-c-format
-#~ msgid "% of the processors"
-#~ msgstr "% z procesorov"
-
-#, c-format
-#~ msgid "New page inserted. Index = %i"
-#~ msgstr "Nová stránka vložená. Index = %i"
-
-#, c-format
-#~ msgid "New page appended. Index = %i"
-#~ msgstr "Nová stránka doplnená. Index = %i"
-
-#, c-format
-#~ msgid "Old Page Index = %i"
-#~ msgstr "Index starej stránky = %i"
-
-#, c-format
-#~ msgid "OnDropTarget: index by HitTest = %i"
-#~ msgstr "OnDropTarget: index by HitTest = %i"
-#~ msgid "Identify your account "
-#~ msgstr "Zvoľte Vaše konto "
-#~ msgid "Read config file"
-#~ msgstr "Načítať konfiguračný súbor"
-#~ msgid "Read configuration info from cc_config.xml"
-#~ msgstr "Načítať konfiguračné informácie z cc-config.xml"
-#~ msgid ""
-#~ "(C) 2003-2011 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2011 Kalifornská Univerzita, Berkeley.\n"
-#~ "Všetky práva vyhradené."
-#~ msgid "NVIDIA GPU"
-#~ msgstr "NVIDIA GPU"
-#~ msgid "ATI GPU"
-#~ msgstr "AMD/ATI GPU"
-#~ msgid "Multicore CPU Supported"
-#~ msgstr "Môže využiť viacjadrový procesor"
-#~ msgid "%s: %.0f"
-#~ msgstr "%s: %.0f"
-#~ msgid "Click 'Retry now' to transfer the file now"
-#~ msgstr "Kliknúť na 'Zopakuj teraz' pre prenos súboru teraz"
-#~ msgid ""
-#~ "Click 'Abort transfer' to delete the file from the transfer queue. This "
-#~ "will prevent you from being granted credit for this result."
-#~ msgstr ""
-#~ "Kliknite na 'Zrušiť prenos' pre vymazanie súboru z prenosovej fronty. Za "
-#~ "tento výsledok nedostanete žiadny kredit."
-#~ msgid "Aborting result..."
-#~ msgstr "Rušenie výsledku..."
-#~ msgid ""
-#~ "You have chosen to add a new BOINC project.  Adding a new\n"
-#~ "project means that you will be connecting your computer to a new "
-#~ "organization.\n"
-#~ "If this is what you wanted to do, please click on\n"
-#~ "the 'Next' button below.\n"
-#~ "\n"
-#~ "Some projects like World Community Grid run multiple research "
-#~ "applications.\n"
-#~ "If you want to change which research applications are sent to your "
-#~ "computer\n"
-#~ "to run, visit the project's website and modify your\n"
-#~ "preferences there.\n"
-#~ "\n"
-#~ "To change which research applications are sent to you from\n"
-#~ "World Community Grid then please click on the following button:"
-#~ msgstr ""
-#~ "Zvolili ste pripojenie k novému projektu v BOINC. Pripojenie k novému "
-#~ "projektu\n"
-#~ "znamená, že Váš počítač sa pripojí k novej webovej stránke a "
-#~ "organizácii.\n"
-#~ "Ak ste toto mali v úmysle, pokračujte kliknutím na 'Ďalej'.\n"
-#~ "\n"
-#~ "Niektoré projekty, ako napríklad World Community Grid, používajú viaceré "
-#~ "výskumné aplikácie.\n"
-#~ "Ak chcete zmeniť, ktoré aplikácie smú byť posielané na Váš počítač,\n"
-#~ "mali by ste navštíviť webové stránky projektu a zmeniť tam Vaše "
-#~ "preferencie.\n"
-#~ "\n"
-#~ "Ak chcete zmeniť výskumné aplikácie zasielané\n"
-#~ "z World Community Grid, kliknite na nasledovné tlačidlo:"
-#~ msgid "Change Research Applications at World Community Grid"
-#~ msgstr "Zmeniť výskumné aplikácie vo World Community Grid"
-#~ msgid "Don't fetch NVIDIA GPU tasks"
-#~ msgstr "Nebudú získané nové úlohy pre NVIDIA GPU"
-#~ msgid "NVIDIA GPU work fetch deferred for"
-#~ msgstr "Získavanie práce pre NVIDIA GPU odložené o"
-#~ msgid "NVIDIA GPU work fetch deferral interval"
-#~ msgstr "Interval odkladania získavania práce pre NVIDIA GPU"
-#~ msgid "Don't fetch ATI GPU tasks"
-#~ msgstr "Nebudú získavané nové úlohy pre ATI GPU"
-#~ msgid "ATI GPU work fetch deferred for"
-#~ msgstr "Získavanie práce pre ATI GPU odložené o"
-#~ msgid "ATI GPU work fetch deferral interval"
-#~ msgstr "Interval odkladania získavania práce pre ATI GPU"
-#~ msgid "Remaining"
-#~ msgstr "Zostáva"
-#~ msgid "Web sites"
-#~ msgstr "Web stránky"
-#~ msgid "Connect about every"
-#~ msgstr "Pripojiť sa približne každých"
-#~ msgid ""
-#~ "this computer is connected to the Internet about every X days\n"
-#~ "(0 if it's always connected)"
-#~ msgstr ""
-#~ "tento počítač býva pripojený k Internetu zhruba raz za X dní\n"
-#~ "(0 ak je pripojený stále)"
-#~ msgid "days (max. 10)"
-#~ msgstr "dní (max. 10)"
-#~ msgid "%d.%d%%"
-#~ msgstr "%d.%d%%"
-#~ msgid "Display and network &options..."
-#~ msgstr "M&ožnosti zobrazovania a siete..."
-#~ msgid ""
-#~ "You have requested to exit the %s,\n"
-#~ "which allows you to view and manage\n"
-#~ "the science applications running on your computer.\n"
-#~ "\n"
-#~ "If you also want to stop running the science applications when you\n"
-#~ "exit the Manager, then choose from the following options:"
-#~ msgstr ""
-#~ "Rozhodli ste sa ukončiť %s,\n"
-#~ "ktorý umožňuje zobrazovať a spravovať\n"
-#~ "vedecké úlohy bežiace na Vašom počítači.\n"
-#~ "\n"
-#~ "Ak chcete pri ukončení Správcu BOINC ukončiť aj\n"
-#~ "všetky bežiace vedecké úlohy, zvoľte si z nasledujúcich možností:"
-#~ msgid "Stop running science applications when exiting the Manager"
-#~ msgstr "Ukončiť výpočet vedeckých úloh pri ukončení Správcu"
-#~ msgid "CPU work fetch priority"
-#~ msgstr "Priorita získavania práce pre CPU"
-#~ msgid "NVIDIA GPU scheduling priority"
-#~ msgstr "Priorita plánovania NVIDIA GPU"
-#~ msgid "NVIDIA GPU work fetch priority"
-#~ msgstr "Priorita získavania práce pre NVIDIA GPU"
-#~ msgid "ATI GPU scheduling priority"
-#~ msgstr "Priorita plánovania ATI GPU"
-#~ msgid "ATI GPU work fetch priority"
-#~ msgstr "Priorita získavania práce pre ATI GPU"
-#~ msgid "Estimated app speed"
-#~ msgstr "Odhadovaná rýchlosť aplikácie"
-#~ msgid "Estimated task size"
-#~ msgstr "Odhadovaná veľkosť úlohy"
-#~ msgid "Max RAM usage"
-#~ msgstr "Max.použitá pamäť"
-#~ msgid "%s - Options"
-#~ msgstr "%s - Nastavenia"
-#~ msgid "Retrieving host information; please wait..."
-#~ msgstr "Zisťuje sa stav počítača; prosím čakajte..."
-#~ msgid " (waiting for GPU memory)"
-#~ msgstr " (čakanie na pamäť GPU)"
-#~ msgid "Manager Settings..."
-#~ msgstr "Nastavenia Správcu..."
-#~ msgid "Pause"
-#~ msgstr "Pozastaviť"
-#~ msgid "%s - Messages"
-#~ msgstr "%s - Správy"
-#~ msgid "Skin:"
-#~ msgstr "Vzhľad:"
-#~ msgid "Preferences"
-#~ msgstr "Preferencie"
-#~ msgid "I want to customize my preferences for this computer only."
-#~ msgstr "Chcem upraviť moje preferencie iba pre tento počítač."
-#~ msgid "Customized Preferences"
-#~ msgstr "Upravené preferencie"
-#~ msgid "My total work done this Project"
-#~ msgstr "Moja celková práca pre tento projekt"
-#~ msgid "My Tasks:"
-#~ msgstr "Moje úlohy:"
-#~ msgid "From Project:"
-#~ msgstr "Z projektu:"
-#~ msgid "Elapsed Time: %s"
-#~ msgstr "Uplynutý čas: %s"
-#~ msgid "Time Remaining: %s"
-#~ msgstr "Zostávajúci čas: %s"
-#~ msgid "Upload suspended - "
-#~ msgstr "Odosielanie pozastavené - "
-#~ msgid "Download suspended - "
-#~ msgstr "Sťahovanie pozastavené - "
-#~ msgid "Upload pending"
-#~ msgstr "Odoslanie nevyriešené"
-#~ msgid "Download pending"
-#~ msgstr "Stiahnutie nevyriešené"
-#~ msgid "New Simple View..."
-#~ msgstr "Nové jednoduché zobrazenie..."
-#~ msgid "Display the new simple graphical interface."
-#~ msgstr "Zobraziť nové jednoduché grafické rozhranie."
-#~ msgid "Old Simple View..."
-#~ msgstr "Staré jednoduché zobrazenie..."
-#~ msgid "Display the old simple graphical interface."
-#~ msgstr "Zobraziť staré jednoduché grafické rozhranie."
-#~ msgid "Get help with BOINC"
-#~ msgstr "Získajte pomoc s BOINC"
-#~ msgid "error"
-#~ msgstr "chyba"
-#~ msgid "A new version of BOINC is available."
-#~ msgstr "Nová verzia BOINC je k dispozícii."
-#~ msgid "Download it."
-#~ msgstr "Stiahnuť."
-#~ msgid "Message from"
-#~ msgstr "Správa od"
-#~ msgid "Failed to attach to project"
-#~ msgstr "Neúspešné pripojenie k projektu"
-#~ msgid "Failed to attach to account manager"
-#~ msgstr "Neúspešné pripojenie k správcovi konta"
-#~ msgid "Attached to account manager"
-#~ msgstr "Pripojené k cprávcovi konta"
-#~ msgid "You are now successfully attached to the %s system."
-#~ msgstr "Teraz ste úspešne priojený k %s systému."
-#~ msgid "You are now successfully attached to this account manager."
-#~ msgstr "Teraz ste úspešne pripojený k tomuto správcovi konta."
-#~ msgid "All projects"
-#~ msgstr "Všetky projekty"
-#~ msgid "Attach to project"
-#~ msgstr "Pripojiť k projektu"
-#~ msgid "Attach to account manager"
-#~ msgstr "Pripojiť ku správcovi konta"
-#~ msgid "Attach to a project"
-#~ msgstr "Pripojiť do projektu"
-#~ msgid "%s needs to connect to the Internet.  Please click to open %s."
-#~ msgstr ""
-#~ "%s potrebuje pripojenie k Internetu. Prosím kliknite pre otvorenie %s."
-#~ msgid ""
-#~ "%s couldn't do Internet communication, and no default connection is "
-#~ "selected.\n"
-#~ "Please connect to the Internet, or select a default connection\n"
-#~ "using Advanced/Options/Connections."
-#~ msgstr ""
-#~ "%s nemôže robiť Internetovú komunikáci, a žiadne prednastavené pripojenie "
-#~ "nie je vybraté.\n"
-#~ "Prosím pripojte sa k Internetu, alebo vyberte prednastavené pripojenie\n"
-#~ "použitím Pokročilý/Nastavenia/Pripojenia."
-#~ msgid "Attached to project"
-#~ msgstr "Pripojený k projektu"
-#~ msgid "You are now successfully attached to this project."
-#~ msgstr "Teraz ste úspešne pripojený do tohto projektu."
-#~ msgid "Attached to %s"
-#~ msgstr "Pripojené k %s"
-#~ msgid "Detach"
-#~ msgstr "Odpojiť"
-#~ msgid "Detaching from project..."
-#~ msgstr "Odpájenie od projektu..."
-#~ msgid "Are you sure you want to detach from project '%s'?"
-#~ msgstr "Ste si istý, že sa chcete odppojiť od projektu '%s'?"
-#~ msgid "Detach from Project"
-#~ msgstr "Odpojenie od projektu"
-#~ msgid " - user active"
-#~ msgstr " - užívateľ aktívny"
-#~ msgid " - need disk space"
-#~ msgstr " - potrebné miesto na disku"
-#~ msgid "Attach to an additional project"
-#~ msgstr "Pripojiť k ďalšiemu projektu"
-#~ msgid "To completion"
-#~ msgstr "Do dokončenia"
-#~ msgid "Attach to a project to begin processing work"
-#~ msgstr "Pripojiť k projektu pre zahájenie spracovania práce"
-#~ msgid "%s - Can't find web browser"
-#~ msgstr "%s - Nemožno nájsť web prehliadač"
-#~ msgid ""
-#~ "%s tried to display the web page\n"
-#~ "\t%s\n"
-#~ "but couldn't find a web browser.\n"
-#~ "To fix this, set the environment variable\n"
-#~ "BROWSER to the path of your web browser,\n"
-#~ "then restart the %s."
-#~ msgstr ""
-#~ "%s skúsil zobraziť web stránku\n"
-#~ "\t%s\n"
-#~ "ale nebol nájdený web prehliadač.\n"
-#~ "Pre nápravu nastavte premennú prostredia\n"
-#~ "BROWSER (VYHĽADÁVAČ) do cesty Vášho web prehliadača,\n"
-#~ "potom reštartujte %s."
-#~ msgid "Retrying communications for project(s)..."
-#~ msgstr "Opakovanie komunikácií pre projekt(y)..."
-#~ msgid ""
-#~ "Required wizard file(s) are missing from the target server.\n"
-#~ "(lookup_account.php/create_account.php)\n"
-#~ msgstr ""
-#~ "Požadovaný(é) wizard súbor(y) chýba(jú) na cieľovom servri.\n"
-#~ "(lookup_account.php/create_account.php)\n"
-#~ msgid "User information"
-#~ msgstr "Informácie o užívateľovi"
-#~ msgid "Account Manager URL"
-#~ msgstr "URL správcu konta"
-#~ msgid "Enter the URL of the account manager's web site."
-#~ msgstr "Vložte URL web stránky správcu konta."
-#~ msgid "Close BOINC Manager Window."
-#~ msgstr "Zatvoriť okno BOINC Manažéra"
-#~ msgid "Exit the %s"
-#~ msgstr "Odchod z %s"
-#~ msgid "Attach to &project"
-#~ msgstr "Pripojiť k &projektu"
-#~ msgid "Attaching to project..."
-#~ msgstr "Pripájenie k projektu..."
-#~ msgid "Removal from %s completed."
-#~ msgstr "Odstránenie z %s je úplné."
-#~ msgid "Removal succeeded!"
-#~ msgstr "Odstránenie úspešné!"
-#~ msgid "ID"
-#~ msgstr "ID"
-#~ msgid "Priority"
-#~ msgstr "Priorita"
-#~ msgid "MessagesGrid"
-#~ msgstr "tab. Správy"
-#~ msgid "Copying selected messages to Clipboard..."
-#~ msgstr "Kopírovanie vybratých správ do schránky..."
-#~ msgid ""
-#~ "We'll now guide you through the process of attaching\n"
-#~ "to a project."
-#~ msgstr "Teraz Vás povedieme cez proces pripojenia k projektu."
-#~ msgid "&Stop using%s"
-#~ msgstr "&Zastaviť používanie%s"
-#~ msgid ""
-#~ "We'll now remove this computer from %s.  From now on,\n"
-#~ "attach and detach projects directly from this computer.\n"
-#~ msgstr ""
-#~ "Teraz odstránime tento počítač z %s. Odteraz\n"
-#~ "pripojíme a odpojíme projekty priamo z tohoto počítača.\n"
-#~ msgid ""
-#~ "We'll now guide you through the process of attaching\n"
-#~ "to an account manager.\n"
-#~ "\n"
-#~ "If you want to attach to a single project, click Cancel,\n"
-#~ "then select the 'Attach to project' menu item instead."
-#~ msgstr ""
-#~ "Teraz Vás povedieme cez proces pripojenia\n"
-#~ "k správcovi konta.\n"
-#~ "\n"
-#~ "Ak sa chcete pripojiť k samostatnému projektu, kliknite na Späť,\n"
-#~ "potom namiesto toho vyberte položku 'Pripojiť k projektu' v ponuke."
-#~ msgid "Debug Flags"
-#~ msgstr "Vlajky ladenia"
-#~ msgid "Project Properties Failure"
-#~ msgstr "Vlastnosti projektu zlyhali"
-#~ msgid "Project Properties URL Failure"
-#~ msgstr "URL vlastností projektu zlyhala"
-#~ msgid "Account Creation Disabled"
-#~ msgstr "Vytvorenie konta zablokované"
-#~ msgid "Account Already Exists"
-#~ msgstr "Konto už existuje"
-#~ msgid "Project Already Attached"
-#~ msgstr "Projekt je už pripojený"
-#~ msgid "Project Attach Failure"
-#~ msgstr "Pripojenie projektu zlyhalo"
-#~ msgid "Net Detection Failure"
-#~ msgstr "Net detekcia zlyhala"
-#~ msgid ""
-#~ "You can copy and paste the URL from your browser's\n"
-#~ "address bar."
-#~ msgstr "Môžete skopírovať a vlepiť URL z adresovej lišty Vášho prehliadača."
-#~ msgid "You are already attached to this project."
-#~ msgstr "Už ste pripojený do tohoto projektu."
-#~ msgid "Enter account key"
-#~ msgstr "Vložte kľúč konta"
-#~ msgid ""
-#~ "This project uses an \"account key\" to identify you.\n"
-#~ "\n"
-#~ "Go to the project's web site to create an account. Your account\n"
-#~ "key will be emailed to you."
-#~ msgstr ""
-#~ "Tento projekt používa \"kľúč konta\" na Vašu identifikáciu.\n"
-#~ "\n"
-#~ "Choďte na web stránku projektu pre vytvorenie konta. Váš kľúč\n"
-#~ "konta Vám bude doručený emailom."
-#~ msgid "An account key looks like:"
-#~ msgstr "Kľúč konta vyzerá ako:"
-#~ msgid "82412313ac88e9a3638f66ea82186948"
-#~ msgstr "82412313ac88e9a3638f66ea82186948"
-#~ msgid "Account key:"
-#~ msgstr "Kľúč konta:"
-#~ msgid ""
-#~ "Report completed work, get latest credit, get latest preferences, and "
-#~ "possibly get more work."
-#~ msgstr ""
-#~ "Odoslať dokončenú prácu, získať posledný kredit, získať posledné "
-#~ "preferencie a ak je možné, získať ďalšiu prácu."
-#~ msgid ""
-#~ "%s is going to shutdown the core client it is currently connected to.\n"
-#~ "NOTE: Choosing 'OK' will cause the select new computer dialog to appear \n"
-#~ "so you can attach to a different core client."
-#~ msgstr ""
-#~ "%s vypína klienta jadra, aktuálne k nemu pripojeného.\n"
-#~ "POZNÁMKA: Zvolenie 'OK' spôsobí objavenie sa dialógu výberu nového "
-#~ "počítača, \n"
-#~ "aby ste sa mohli pripojiť k inému klientovi jadra."
-#~ msgid "BOINC Manager - Detach from %s"
-#~ msgstr "BOINC Manažér - Odpojiť od %s"
-#~ msgid "%s is currently suspended...\n"
-#~ msgstr "%s je práve pozastavený...\n"
-#~ msgid "%s networking is currently suspended...\n"
-#~ msgstr "%s pripojenie do siete je práve pozastavené...\n"
-#~ msgid "%s is currently reconnecting to a %s client...\n"
-#~ msgstr "%s sa práve presmerováva na %s klienta...\n"
-#~ msgid "%s is not currently connected to a %s client...\n"
-#~ msgstr "%s nie je práve pripojený na %s klienta...\n"
-#~ msgid "A system for volunteer computing"
-#~ msgstr "Systém pre dobroľnícke výpočty"
-#~ msgid ""
-#~ "This dialog controls preferences on this computer only.\n"
-#~ "On Save - preferences will be stored locally.\n"
-#~ "If you would like to revert to web-based settings, click the Clear-Button."
-#~ msgstr ""
-#~ "Tento dialóg riadi preferencie len na tomto počítači.\n"
-#~ "Pri Uložení - preferencie budú uložené lokálne.\n"
-#~ "Ak by ste sa radi vrátili k nastaveniam na stránke, kliknite na tlačidlo "
-#~ "Odstrániť."
-#~ msgid "when do work"
-#~ msgstr "kedy pracuje"
-#~ msgid "only if computer is idle for"
-#~ msgstr "iba ak je počítač nevyužitý, za"
-#~ msgid "work time restrictions"
-#~ msgstr "obmedzenia doby práce"
-#~ msgid "as specified here:"
-#~ msgstr "ako je stanovené tu:"
-#~ msgid "processors"
-#~ msgstr "procesory(ov)"
-#~ msgid "usage restrictions"
-#~ msgstr "obmedzenia vyuitia"
-#~ msgid "use network only between the hours of"
-#~ msgstr "sieť použiť iba medzi hodinami"
-#~ msgid "use network only as specified here:"
-#~ msgstr "sieť použiť iba ako je stanovené tu:"
-#~ msgid "Click here to disable displaying this message in the future."
-#~ msgstr ""
-#~ "Kliknite sem, pre zablokovanie zobrazenia tohoto hlásenia v budúcnosti."
-#~ msgid "Language Selection:"
-#~ msgstr "Výber jazyka:"
-#~ msgid "What language should the manager display by default."
-#~ msgstr "Ktorý jazyk by mal správca zobrazovať podľa natavenia?"
-#~ msgid "Reminder Frequency:"
-#~ msgstr "Opakovanie pripomienky:"
-#~ msgid ""
-#~ "How often, in minutes, should the manager remind you of possible "
-#~ "connection events."
-#~ msgstr ""
-#~ "Ako často, v minútach, by Vám mal správca pripomínať možné udalosti "
-#~ "spojenia."
-#~ msgid "Project URL"
-#~ msgstr "URL projektu"
-#~ msgid "Enter the URL of the project's web site."
-#~ msgstr "Vložte URL web stránky projektu."
-#~ msgid "For a list of BOINC-based projects go to:"
-#~ msgstr "Pre zoznam projektov pod BOINC choďte na:"
-#~ msgid "BOINC Manager - Messages"
-#~ msgstr "BOINC Manažér - Hlásenia"
-#~ msgid "BOINC Manager - Preferences"
-#~ msgstr "BOINC Manažér - Preferencie"
-#~ msgid "Project Comm Failure"
-#~ msgstr "Komunikácie projektu zlyhali"
-#~ msgid "Google Comm Failure"
-#~ msgstr "Komunikácie Google zlyhali"
-#~ msgid "Yahoo Comm Failure"
-#~ msgstr "Komunikácie Yahoo zlyhali"
-#~ msgid "About BOINC Manager"
-#~ msgstr "O BOINC Manažérovi"
-#~ msgid "BOINC Manager - Options"
-#~ msgstr "BOINC Manažér - Nastavenia"
-#~ msgid "BOINC Manager - Select Computer"
-#~ msgstr "BOINC Manažér - Vybrať počítač"
+#: 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."
 
+#: clientgui/DlgAdvPreferencesBase.h:46
+msgid "On this day of the week, transfer files only during these hours."
+msgstr "Tento deň v týždni prenášať súbory len počas týchto hodín."
diff --git a/locale/sk/BOINC-Project-Generic.po b/locale/sk/BOINC-Project-Generic.po
old mode 100755
new mode 100644
index 4ab2d9e..9f8ef0d
--- a/locale/sk/BOINC-Project-Generic.po
+++ b/locale/sk/BOINC-Project-Generic.po
@@ -1,23 +1,27 @@
 # BOINC web translation
 # Copyright (C) 2008 University of California
+# 
 # This file is distributed under the same license as BOINC.
+# 
 # FileID  : $Id$
+# 
+# Translators:
+# aceman, 2015
+# Michal, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\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: 2013-10-11 22:20+0000\n"
-"Last-Translator: aceman <acelists at atlas.sk>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: sk\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"
+"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"
-"X-Generator: Pootle 2.5.0\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1381530014.0\n"
 
 msgid "LANG_NAME_NATIVE"
 msgstr "Slovenčina"
@@ -25,7 +29,96 @@ msgstr "Slovenčina"
 msgid "LANG_NAME_INTERNATIONAL"
 msgstr "Slovak"
 
-# 75%
+#: ../inc/account.inc:38
+msgid "Invitation Code"
+msgstr "Kód pozvánky"
+
+#: ../inc/account.inc:38
+msgid "A valid invitation code is required to create an account."
+msgstr "Na vytvorenie účtu je potrebný kód z pozvánky."
+
+#: ../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 "Názov"
+
+#: ../inc/account.inc:44 ../user/account_finish.php:41
+msgid "Identifies you on our web site. Use your real name or a nickname."
+msgstr "Slúži ako identifikácia na našej webovej stránke. Môžete použiť vaše meno alebo prezývku."
+
+#: ../inc/account.inc:48
+msgid "Email Address"
+msgstr "E-mailová adresa"
+
+#: ../inc/account.inc:48
+msgid "Must be a valid address of the form 'name at domain'."
+msgstr "Adresa musí byť vo formáte \"meno at doména\"."
+
+#: ../inc/account.inc:57 ../user/edit_email_form.php:47
+msgid "Password"
+msgstr "Heslo"
+
+#: ../inc/account.inc:58
+msgid "Must be at least %1 characters"
+msgstr "Musí obsahovať minimálne %1 znakov"
+
+#: ../inc/account.inc:61
+msgid "Confirm password"
+msgstr "Potvrdiť heslo"
+
+#: ../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 "Krajina"
+
+#: ../inc/account.inc:63 ../user/account_finish.php:45
+msgid "Select the country you want to represent, if any."
+msgstr "Pokiaľ chcete reprezentovať nejakú krajinu, prosím, vyberte ju"
+
+#: ../inc/account.inc:70 ../user/account_finish.php:51
+msgid "Postal or ZIP Code"
+msgstr "PSČ"
+
+#: ../inc/account.inc:70 ../user/account_finish.php:51
+msgid "Optional"
+msgstr "Nepovinné"
+
+#: ../inc/account.inc:86
+msgid "Create account"
+msgstr "Vytvoriť účet"
+
+#: ../inc/account.inc:101
+msgid "Email address:"
+msgstr "E-mailová adresa:"
+
+#: ../inc/account.inc:103
+msgid "forgot email address?"
+msgstr "Zabudli ste e-mailovú adresu?"
+
+#: ../inc/account.inc:106
+msgid "Password:"
+msgstr "Heslo:"
+
+#: ../inc/account.inc:106
+msgid "forgot password?"
+msgstr "Zabudli ste heslo?"
+
+#: ../inc/account.inc:109
+msgid "Stay logged in"
+msgstr "Zostať prihlásený"
+
+#: ../inc/account.inc:114 ../inc/util.inc:238 ../user/login_form.php:41
+msgid "Log in"
+msgstr "Prihlásiť sa"
+
 #: ../inc/bbcode_html.inc:11
 msgid "Bold text: [b]text[/b]  (alt+b)"
 msgstr "Tučný text: [b]text[/b] (alt+b)"
@@ -39,326 +132,327 @@ msgid "Underline text: [u]text[/u]  (alt+u)"
 msgstr "Podčiarknutý text: [u]text[/u]  (alt+u)"
 
 #: ../inc/bbcode_html.inc:20
+msgid "Strikethrough text: [s]text[/s]  (alt+k)"
+msgstr "Prečiarknutý text: [s]text[/s] (alt+k)"
+
+#: ../inc/bbcode_html.inc:23
 msgid "Quote text: [quote]text[/quote]  (alt+q)"
 msgstr "Citovať text: [quote]text[/quote]  (alt+q)"
 
-#: ../inc/bbcode_html.inc:23
+#: ../inc/bbcode_html.inc:26
 msgid "Code display: [code]code[/code]  (alt+c)"
 msgstr "Zobraziť kód: [code]kód[/code]  (alt+c)"
 
-#: ../inc/bbcode_html.inc:26
+#: ../inc/bbcode_html.inc:29
 msgid "List: [list]text[/list] (alt+l)"
 msgstr "Zoznam: [list]text[/list] (alt+l)"
 
-#: ../inc/bbcode_html.inc:29
+#: ../inc/bbcode_html.inc:32
 msgid "Ordered list: [list=]text[/list]  (alt+o)"
 msgstr "Číslovaný zoznam: [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 "Vložiť obrázok: [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 ""
-"Vložiť odkaz: [url]http://url[/url] aj [url=http://url]URL text[/url]  "
-"(alt+w)"
+msgstr "Vložiť odkaz: [url]http://url[/url] aj [url=http://url]URL text[/url]  (alt+w)"
 
-#: ../inc/bbcode_html.inc:42
+#: ../inc/bbcode_html.inc:45
 msgid "Font color"
 msgstr "Farba fontu"
 
-#: ../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 ""
-"Farba fontu: [color=red]text[/color]  Tip: Môžete tiež použiť color=#FF0000"
+msgstr "Farba fontu: [color=red]text[/color]  Tip: Môžete tiež použiť 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 "Predvolený"
 
-#: ../inc/bbcode_html.inc:45
+#: ../inc/bbcode_html.inc:48
 msgid "Dark Red"
 msgstr "Tmavočervená"
 
-#: ../inc/bbcode_html.inc:46
+#: ../inc/bbcode_html.inc:49
 msgid "Red"
 msgstr "Červená"
 
-#: ../inc/bbcode_html.inc:47
+#: ../inc/bbcode_html.inc:50
 msgid "Orange"
 msgstr "Oranžová"
 
-#: ../inc/bbcode_html.inc:48
+#: ../inc/bbcode_html.inc:51
 msgid "Brown"
 msgstr "Hnedá"
 
-#: ../inc/bbcode_html.inc:49
+#: ../inc/bbcode_html.inc:52
 msgid "Yellow"
 msgstr "Žltá"
 
-#: ../inc/bbcode_html.inc:50
+#: ../inc/bbcode_html.inc:53
 msgid "Green"
 msgstr "Zelená"
 
-#: ../inc/bbcode_html.inc:51
+#: ../inc/bbcode_html.inc:54
 msgid "Olive"
 msgstr "Olivovo zelená"
 
-#: ../inc/bbcode_html.inc:52
+#: ../inc/bbcode_html.inc:55
 msgid "Cyan"
 msgstr "Azúrová"
 
-#: ../inc/bbcode_html.inc:53
+#: ../inc/bbcode_html.inc:56
 msgid "Blue"
 msgstr "Modrá"
 
-#: ../inc/bbcode_html.inc:54
+#: ../inc/bbcode_html.inc:57
 msgid "Dark Blue"
 msgstr "Tmavomodrá"
 
-#: ../inc/bbcode_html.inc:55
+#: ../inc/bbcode_html.inc:58
 msgid "Indigo"
 msgstr "Indigovo modrá"
 
-#: ../inc/bbcode_html.inc:56
+#: ../inc/bbcode_html.inc:59
 msgid "Violet"
 msgstr "Fialová"
 
-#: ../inc/bbcode_html.inc:57
+#: ../inc/bbcode_html.inc:60
 msgid "Font size"
 msgstr "Veľkosť fontu"
 
-#: ../inc/bbcode_html.inc:58
+#: ../inc/bbcode_html.inc:61
 msgid "Font size: [size=x-small]small text[/size]"
 msgstr "Veľkosť fontu: [size=x-small]malý text[/size]"
 
-#: ../inc/bbcode_html.inc:60
+#: ../inc/bbcode_html.inc:63
 msgid "Small"
 msgstr "Malý"
 
-#: ../inc/bbcode_html.inc:61
+#: ../inc/bbcode_html.inc:64
 msgid "Normal"
 msgstr "Normálny"
 
-#: ../inc/bbcode_html.inc:62
+#: ../inc/bbcode_html.inc:65
 msgid "Large"
 msgstr "Veľký"
 
-#: ../inc/bbcode_html.inc:65
+#: ../inc/bbcode_html.inc:68
 msgid "Close all open bbCode tags"
 msgstr "Zavrieť všetky otvorené bbCode tagy"
 
-#: ../inc/bbcode_html.inc:65
+#: ../inc/bbcode_html.inc:68
 msgid "Close Tags"
 msgstr "Zavrieť tagy"
 
-#: ../inc/forum.inc:37
+#: ../inc/forum.inc:38
 msgid "Oldest first"
 msgstr "Od najstarších"
 
-#: ../inc/forum.inc:38 ../inc/forum.inc:44
+#: ../inc/forum.inc:39 ../inc/forum.inc:45
 msgid "Newest first"
 msgstr "Od najnovších"
 
-#: ../inc/forum.inc:39
+#: ../inc/forum.inc:40
 msgid "Highest rated posts first"
-msgstr ""
+msgstr "Zobraziť najlepšie hodntené správy ako prvé"
 
-#: ../inc/forum.inc:41
+#: ../inc/forum.inc:42
 msgid "Newest post first"
-msgstr ""
+msgstr "Od najnovších"
 
-#: ../inc/forum.inc:42
+#: ../inc/forum.inc:43
 msgid "Most views first"
-msgstr ""
+msgstr "Najsledovanejšie ako prvé"
 
-#: ../inc/forum.inc:43
+#: ../inc/forum.inc:44
 msgid "Most posts first"
-msgstr ""
+msgstr "Zobraziť s najväčším počtom správ ako prvé"
 
-#: ../inc/forum.inc:125
+#: ../inc/forum.inc:126
 msgid "Search for words in forum messages"
 msgstr "Hladať slová v správach z fóra"
 
-#: ../inc/forum.inc:125
+#: ../inc/forum.inc:126
 msgid "Search forums"
 msgstr "Prehľadať fóra"
 
-#: ../inc/forum.inc:126
+#: ../inc/forum.inc:127
 msgid "Advanced search"
 msgstr "Pokročilé vyhľadávanie"
 
-#: ../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 "Súkromné správy"
 
-#: ../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 "Otázky a Odpovede"
 
-#: ../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 "Nástenky"
 
-#: ../inc/forum.inc:187 ../inc/forum.inc:195
+#: ../inc/forum.inc:188 ../inc/forum.inc:196
 msgid "%1 message board"
 msgstr "nástenka %1"
 
-#: ../inc/forum.inc:245 ../inc/result.inc:695
+#: ../inc/forum.inc:246 ../inc/result.inc:717
 msgid "Previous"
 msgstr "Predchádzajúci"
 
-#: ../inc/forum.inc:283 ../inc/result.inc:704
+#: ../inc/forum.inc:284 ../inc/result.inc:726
 msgid "Next"
 msgstr "Nasledujúci"
 
-#: ../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 "Správa"
 
-#: ../inc/forum.inc:580
+#: ../inc/forum.inc:583
 msgid "Send message"
 msgstr "Odoslať správu"
 
-#: ../inc/forum.inc:580
+#: ../inc/forum.inc:583
 msgid "Send %1 a private message"
 msgstr "Poslať %1 súkromnú správu"
 
-#: ../inc/forum.inc:581
+#: ../inc/forum.inc:584
 msgid "Joined: %1"
-msgstr ""
+msgstr "Pridali ste sa: %1"
 
-#: ../inc/forum.inc:590
+#: ../inc/forum.inc:593
 msgid "Posts: %1"
 msgstr "Príspevky: %1"
 
-#: ../inc/forum.inc:596
+#: ../inc/forum.inc:599
 msgid "Credit: %1"
 msgstr "Kredit: %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 "Túto správu ste zatiaľ nečítali"
 
-#: ../inc/forum.inc:620
+#: ../inc/forum.inc:624
 msgid "Unread"
 msgstr "Neprečítané"
 
-#: ../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 "Správa %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 "skryté"
 
-#: ../inc/forum.inc:625
+#: ../inc/forum.inc:629
 msgid "Posted: %1"
 msgstr "Uverejnené: %1"
 
-#: ../inc/forum.inc:628
+#: ../inc/forum.inc:632
 msgid " - in response to "
 msgstr " - ako odpoveď na "
 
-#: ../inc/forum.inc:631 ../inc/prefs.inc:705 ../inc/prefs.inc:707
+#: ../inc/forum.inc:635
 msgid "Edit"
 msgstr "Upraviť"
 
-#: ../inc/forum.inc:631
+#: ../inc/forum.inc:635
 msgid "Edit this message"
 msgstr "Upraviť správu"
 
-#: ../inc/forum.inc:637
+#: ../inc/forum.inc:641
 msgid "Last modified: %1"
 msgstr "Posledná zmena: %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 ""
+"This post is not shown because the sender is on your 'ignore' list.  Click "
+"%1here%2 to view this post"
+msgstr "Táto správa sa nezobrazila, pretože odosielateľ je vo vašom zozname ignorovaných. Kliknite %1sem%2 na zobrazenie správy."
 
-#: ../inc/forum.inc:668 ../inc/forum.inc:679
+#: ../inc/forum.inc:672 ../inc/forum.inc:683
 msgid "Report this post as offensive"
-msgstr ""
+msgstr "Nahlásiť správu ako urážlivú"
 
-#: ../inc/forum.inc:668 ../inc/forum.inc:679
+#: ../inc/forum.inc:672 ../inc/forum.inc:683
 msgid "Report as offensive"
 msgstr "Nahlásiť ako urážlivý"
 
-#: ../inc/forum.inc:672
+#: ../inc/forum.inc:676
 msgid "Rating: %1"
-msgstr ""
+msgstr "Hodnotenie: %1"
 
-#: ../inc/forum.inc:672
+#: ../inc/forum.inc:676
 msgid "rate: "
-msgstr ""
+msgstr "hodnotenie:"
 
-#: ../inc/forum.inc:675
+#: ../inc/forum.inc:679
 msgid "Click if you like this message"
-msgstr ""
+msgstr "Kliknite ak sa vám táto správa páči"
 
-#: ../inc/forum.inc:675
+#: ../inc/forum.inc:679
 msgid "Rate +"
-msgstr ""
+msgstr "Hodnotiť +"
 
-#: ../inc/forum.inc:677
+#: ../inc/forum.inc:681
 msgid "Click if you don't like this message"
-msgstr ""
+msgstr "Kliknite ak sa vám táto správa nepáči"
 
-#: ../inc/forum.inc:677
+#: ../inc/forum.inc:681
 msgid "Rate -"
-msgstr ""
+msgstr "Hodnotiť -"
 
-#: ../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 ""
+msgstr "Odpovedať"
 
-#: ../inc/forum.inc:685
+#: ../inc/forum.inc:689
 msgid "Post a reply to this message"
-msgstr ""
+msgstr "Odpovedať na túto správu"
 
-#: ../inc/forum.inc:687
+#: ../inc/forum.inc:691
 msgid "Quote"
-msgstr ""
+msgstr "Citát"
 
-#: ../inc/forum.inc:687
+#: ../inc/forum.inc:691
 msgid "Post a reply by quoting this message"
-msgstr ""
+msgstr "Poslať odpoveď citovaním tejto správy"
 
-#: ../inc/forum.inc:708
+#: ../inc/forum.inc:712
 msgid "Hidden by a moderator"
-msgstr ""
+msgstr "Skryté moderátorom"
 
-#: ../inc/forum.inc:729
+#: ../inc/forum.inc:733
 msgid "Posted %1 by %2"
 msgstr "Uverejnené %1 od %2"
 
-#: ../inc/forum.inc:747
+#: ../inc/forum.inc:751
 msgid "You may not post or rate messages until %1"
-msgstr ""
+msgstr "Počkajte s odosielaním alebo hodnotením správ do %1"
 
-#: ../inc/forum.inc:758
+#: ../inc/forum.inc:762
 msgid ""
 "\n"
 "        <ul>\n"
@@ -374,349 +468,352 @@ msgid ""
 "        <li> No abusive comments involving race, religion,\n"
 "            nationality, gender, class or sexuality.\n"
 "        "
-msgstr ""
+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."
 
-#: ../inc/forum.inc:780
+#: ../inc/forum.inc:784
 msgid "Rules:"
-msgstr ""
+msgstr "Pravidlá:"
 
-#: ../inc/forum.inc:781
+#: ../inc/forum.inc:785
 msgid "More info"
 msgstr "Viac informácií"
 
-#: ../inc/forum.inc:1055 ../user/forum_thread.php:189
+#: ../inc/forum.inc:1082 ../user/forum_thread.php:190
 msgid "Unhide"
-msgstr ""
+msgstr "Odkryť"
 
-#: ../inc/forum.inc:1055
+#: ../inc/forum.inc:1082
 msgid "Unhide this post"
-msgstr ""
+msgstr "Zobraziť túto správu"
 
-#: ../inc/forum.inc:1057 ../user/forum_thread.php:195
+#: ../inc/forum.inc:1084 ../user/forum_thread.php:196
 msgid "Hide"
-msgstr ""
+msgstr "Skryť"
 
-#: ../inc/forum.inc:1057
+#: ../inc/forum.inc:1084
 msgid "Hide this post"
-msgstr ""
+msgstr "Skryť túto správu"
 
-#: ../inc/forum.inc:1062 ../user/forum_thread.php:228
+#: ../inc/forum.inc:1089 ../user/forum_thread.php:229
 msgid "Move"
-msgstr ""
+msgstr "Presunúť"
 
-#: ../inc/forum.inc:1062
+#: ../inc/forum.inc:1089
 msgid "Move post to a different thread"
-msgstr ""
+msgstr "Presunúť správu do inej témy"
 
-#: ../inc/forum.inc:1067
+#: ../inc/forum.inc:1094
 msgid "Banish author"
-msgstr ""
+msgstr "Zablokovať autora"
 
-#: ../inc/forum.inc:1074
+#: ../inc/forum.inc:1101
 msgid "Vote to banish author"
-msgstr ""
+msgstr "Voliť na zablokovanie autora"
 
-#: ../inc/forum.inc:1078
+#: ../inc/forum.inc:1105
 msgid "Vote not to banish author"
-msgstr ""
+msgstr "Voliť na neblokovanie autora"
 
-#: ../inc/forum.inc:1083
+#: ../inc/forum.inc:1110
 msgid "Start vote to banish author"
-msgstr ""
+msgstr "Začať voľbu na zablokovanie autora"
 
-#: ../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 "Zmazať"
+
+#: ../inc/forum.inc:1115
+msgid "Delete this post"
+msgstr "Vymazať túto správu"
+
+#: ../inc/forum.inc:1153
 msgid "Only team members can post to the team message board"
-msgstr ""
+msgstr "Len členovia tímu môžu posielať správy na tímovú nástenku."
 
-#: ../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 ""
-"Za účelom vytvorenia nového vlákna v %1 musíte mať určité množstvo bodov. "
-"Slúži to na ochránenie systému voči zneužitiu."
+msgstr "Za účelom vytvorenia nového vlákna v %1 musíte mať určité množstvo bodov. Slúži to na ochránenie systému voči zneužitiu."
 
-#: ../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 ""
-"Momentálne nemôžete vytvoriť viac vlákien. Skúste to prosím neskôr. Toto "
-"oneskorenie bolo vyvolané za účelom ochrany systému voči zneužitiu."
+msgstr "Momentálne nemôžete vytvoriť viac vlákien. Skúste to prosím neskôr. Toto oneskorenie bolo vyvolané za účelom ochrany systému voči zneužitiu."
 
-#: ../inc/forum.inc:1140
+#: ../inc/forum.inc:1177
 msgid ""
 "This thread is locked. Only forum moderators and administrators are allowed "
 "to post there."
-msgstr ""
+msgstr "Táto téma je uzamknutá. Len moderátori a administrátori fóra sem môžu posielať správy."
 
-#: ../inc/forum.inc:1145
+#: ../inc/forum.inc:1182
 msgid "Can't post to a hidden thread."
-msgstr ""
+msgstr "Nedá sa posielať do skrytej témy."
 
-#: ../inc/forum.inc:1173
+#: ../inc/forum.inc:1216
 msgid "Thread"
 msgstr "Vlákno"
 
-#: ../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 "Príspevkov"
 
-#: ../inc/forum.inc:1176 ../user/forum_forum.php:138
+#: ../inc/forum.inc:1219 ../user/forum_forum.php:141
 msgid "Views"
 msgstr "Zobrazenia"
 
-#: ../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 "Posledný príspevok"
 
-#: ../inc/forum.inc:1235
+#: ../inc/forum.inc:1278
 msgid "New posts in the thread %1"
-msgstr ""
+msgstr "Nové správy v téme %1"
 
-#: ../inc/forum.inc:1240
+#: ../inc/forum.inc:1283
 msgid "New posts in subscribed thread"
-msgstr ""
+msgstr "Nové správy v sledovanej téme"
 
-#: ../inc/forum.inc:1241
+#: ../inc/forum.inc:1284
 msgid "There are new posts in the thread '%1'"
-msgstr ""
+msgstr "V téme \"%1\" sú nové správy"
 
-#: ../inc/forum.inc:1251
+#: ../inc/forum.inc:1294
 msgid "Mark all threads as read"
 msgstr "Označiť všetky vlákna ako prečítané"
 
-#: ../inc/forum.inc:1252
+#: ../inc/forum.inc:1295
 msgid "Mark all threads in all message boards as read."
 msgstr "Označiť všetky vlákna na všetkých nástenkách ako prečítané."
 
-#: ../inc/host.inc:24
+#: ../inc/host.inc:25
 msgid "No host"
 msgstr "Žiaden počítač"
 
-#: ../inc/host.inc:26
+#: ../inc/host.inc:27
 msgid "Unavailable"
 msgstr "Nedostupné"
 
-#: ../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 "Domov"
 
-#: ../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 "Práca"
 
-#: ../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 "Škola"
 
-#: ../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 "Aktualizovať"
 
-#: ../inc/host.inc:85
+#: ../inc/host.inc:84
 msgid "Computer information"
 msgstr "Informácie o počítači"
 
-#: ../inc/host.inc:89 ../inc/host.inc:94
+#: ../inc/host.inc:88 ../inc/host.inc:93
 msgid "IP address"
 msgstr "IP adresa"
 
-#: ../inc/host.inc:89
+#: ../inc/host.inc:88
 msgid "(same the last %1 times)"
 msgstr "(rovnaké posledných %1 krát)"
 
-#: ../inc/host.inc:91
+#: ../inc/host.inc:90
 msgid "External IP address"
 msgstr "Vonkajšia IP adresa"
 
-#: ../inc/host.inc:94
+#: ../inc/host.inc:93
 msgid "Show IP address"
 msgstr "Zobraziť IP adresu"
 
-#: ../inc/host.inc:96
+#: ../inc/host.inc:95
 msgid "Domain name"
 msgstr "Názov domény"
 
-#: ../inc/host.inc:98
+#: ../inc/host.inc:97
 msgid "Product name"
-msgstr ""
+msgstr "Názov produktu"
 
-#: ../inc/host.inc:102
+#: ../inc/host.inc:101
 msgid "Local Standard Time"
 msgstr "Miestny štandardný čas"
 
-#: ../inc/host.inc:102
+#: ../inc/host.inc:101
 msgid "UTC %1 hours"
 msgstr "UTC %1 hodín"
 
-#: ../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 "Vlastník"
 
-#: ../inc/host.inc:108 ../inc/host.inc:355
+#: ../inc/host.inc:107 ../inc/host.inc:360
 msgid "Anonymous"
 msgstr "Anonymný"
 
-#: ../inc/host.inc:112 ../inc/result.inc:630
+#: ../inc/host.inc:111 ../inc/result.inc:634 ../user/apps.php:56
 msgid "Created"
 msgstr "Vytvorený"
 
-#: ../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 "Celkový kredit"
 
-#: ../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 "Priemerný kredit"
 
-#: ../inc/host.inc:116
+#: ../inc/host.inc:115
 msgid "Cross project credit"
 msgstr "Kredit naprieč projektami"
 
-#: ../inc/host.inc:118
+#: ../inc/host.inc:117
 msgid "CPU type"
 msgstr "Typ procesora"
 
-#: ../inc/host.inc:119
+#: ../inc/host.inc:118
 msgid "Number of processors"
 msgstr "Počet procesorov"
 
-#: ../inc/host.inc:121
+#: ../inc/host.inc:120
 msgid "Coprocessors"
 msgstr "Koprocesory"
 
-#: ../inc/host.inc:123 ../inc/host.inc:687
+#: ../inc/host.inc:122 ../inc/host.inc:692
 msgid "Operating System"
 msgstr "Operačný systém"
 
-#: ../inc/host.inc:126 ../inc/host.inc:235
+#: ../inc/host.inc:125 ../inc/host.inc:235
 msgid "BOINC version"
 msgstr "Verzia BOINC"
 
-#: ../inc/host.inc:130
+#: ../inc/host.inc:129 ../inc/prefs.inc:237
 msgid "Memory"
 msgstr "Pamäť"
 
-#: ../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 "Vyrovnávacia pamäť"
 
-#: ../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 "Odkladací priestor"
 
-#: ../inc/host.inc:143
+#: ../inc/host.inc:142
 msgid "Total disk space"
 msgstr "Celkový úložný priestor"
 
-#: ../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 "Voľný diskový priestor"
 
-#: ../inc/host.inc:150
+#: ../inc/host.inc:149
 msgid "Measured floating point speed"
 msgstr "Zmeraná rýchlosť s plávajúcou desatinnou čiarkou"
 
-#: ../inc/host.inc:150 ../inc/host.inc:153
+#: ../inc/host.inc:149 ../inc/host.inc:152
 msgid "%1 million ops/sec"
 msgstr "%1 milión operácií/s"
 
-#: ../inc/host.inc:153
+#: ../inc/host.inc:152
 msgid "Measured integer speed"
 msgstr "Zmeraná celočíselná rýchlosť"
 
-#: ../inc/host.inc:157 ../inc/host.inc:159
+#: ../inc/host.inc:156 ../inc/host.inc:158
 msgid "Average upload rate"
 msgstr "Priemerná rýchlosť odosielania"
 
-#: ../inc/host.inc:157 ../inc/host.inc:164
+#: ../inc/host.inc:156 ../inc/host.inc:163
 msgid "%1 KB/sec"
 msgstr "%1 KB/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 "Neznámy"
 
-#: ../inc/host.inc:164 ../inc/host.inc:166
+#: ../inc/host.inc:163 ../inc/host.inc:165
 msgid "Average download rate"
 msgstr "Priemerná rýchlosť sťahovania"
 
-#: ../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 "Priemerná návratová doba "
 
-#: ../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 dní"
 
-#: ../inc/host.inc:170
+#: ../inc/host.inc:169
 msgid "Application details"
 msgstr "Detaily aplikácie"
 
-#: ../inc/host.inc:171
+#: ../inc/host.inc:170
 msgid "Show"
 msgstr "Zobraziť"
 
-#: ../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 "Úlohy"
 
-#: ../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 "Koľkokrát BOINC klient skontaktoval server"
 
-#: ../inc/host.inc:186
+#: ../inc/host.inc:185
 msgid "Last time contacted server"
 msgstr "Posledné skontaktovanie so serverom"
 
-#: ../inc/host.inc:187
-#, php-format
-msgid "% of time BOINC is running"
-msgstr "% dĺžka behu BOINC"
+#: ../inc/host.inc:186
+msgid "Fraction of time BOINC is running"
+msgstr "Časť času kedy BOINC beží."
 
-#: ../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 "Pokým je BOINC spustený, % dĺžka času Internetového spojenia"
 
+#: ../inc/host.inc:190
+msgid "While BOINC is running, fraction of time computing is allowed"
+msgstr "Pokým je BOINC spustený, % dĺžka času výpočtov"
+
 #: ../inc/host.inc:191
-#, php-format
-msgid "While BOINC running, % of time work is allowed"
-msgstr ""
+msgid "While is BOINC running, fraction of time GPU computing is allowed"
+msgstr "Pokým je BOINC spustený, % dĺžka času výpočtov pomocou GPU"
 
 #: ../inc/host.inc:193
 msgid "Average CPU efficiency"
@@ -726,7 +823,7 @@ msgstr "Priemerná efektivita procesora"
 msgid "Task duration correction factor"
 msgstr "Korekčný faktor pre dobu výpočtu"
 
-#: ../inc/host.inc:198 ../inc/host.inc:674
+#: ../inc/host.inc:198 ../inc/host.inc:679
 msgid "Location"
 msgstr "Umiestnenie"
 
@@ -742,38 +839,38 @@ msgstr "Spojiť duplicitné záznamy tohto počítača"
 msgid "Merge"
 msgstr "Spojiť"
 
-#: ../inc/host.inc:207 ../inc/host.inc:689
+#: ../inc/host.inc:207 ../inc/host.inc:694
 msgid "Last contact"
-msgstr ""
+msgstr "Posledný čas kontaktu"
 
 #: ../inc/host.inc:220
 msgid "Computer info"
 msgstr "Informácie o počítači"
 
-#: ../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 "Úroveň"
 
-#: ../inc/host.inc:225 ../inc/host.inc:679
+#: ../inc/host.inc:225 ../inc/host.inc:684
 msgid "Avg. credit"
 msgstr "Priemerný kredit"
 
-#: ../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 "Súčasný priemerný kredit"
 
-#: ../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 "Procesor"
 
-#: ../inc/host.inc:237 ../inc/host.inc:685
+#: ../inc/host.inc:237 ../inc/host.inc:690
 msgid "GPU"
 msgstr "GPU"
 
@@ -781,1526 +878,1621 @@ msgstr "GPU"
 msgid "Operating system"
 msgstr "Operačný systém"
 
-#: ../inc/host.inc:315
+#: ../inc/host.inc:320
 msgid "(%1 processors)"
 msgstr "(%1 procesorov)"
 
-#: ../inc/host.inc:335
+#: ../inc/host.inc:340
 msgid "Details"
 msgstr "Detaily"
 
-#: ../inc/host.inc:340
+#: ../inc/host.inc:345
 msgid "Cross-project stats:"
-msgstr ""
+msgstr "Medziprojektové štatistiký:"
 
-#: ../inc/host.inc:515
+#: ../inc/host.inc:520
 msgid "Host %1 has overlapping lifetime:"
-msgstr ""
+msgstr "Počítač %1 prekračuje životnoť:"
 
-#: ../inc/host.inc:522
+#: ../inc/host.inc:527
 msgid "Host %1 has an incompatible OS:"
-msgstr ""
+msgstr "Počítač %1 nemá kompatibilný operačný systém:"
 
-#: ../inc/host.inc:528
+#: ../inc/host.inc:533
 msgid "Host %1 has an incompatible CPU:"
-msgstr ""
+msgstr "Počítač %1 nemá kompatibilný procesor:"
 
-#: ../inc/host.inc:595
+#: ../inc/host.inc:600
 msgid "same host"
-msgstr ""
+msgstr "rovnaký počítač"
 
-#: ../inc/host.inc:598
+#: ../inc/host.inc:603
 msgid "Can't merge host %1 into %2 - they're incompatible"
-msgstr ""
+msgstr "Nie je možné zlúčiť počítač %1 do počítača %2 - nie sú kompatibilné."
 
-#: ../inc/host.inc:601
+#: ../inc/host.inc:606
 msgid "Merging host %1 into host %2"
-msgstr ""
+msgstr "Spájanie počítača %1 s počítačom %2"
 
-#: ../inc/host.inc:618
+#: ../inc/host.inc:623
 msgid "Couldn't update credit of new computer"
-msgstr ""
+msgstr "Nepodarilo sa aktualizovať kredit nového počítača"
 
-#: ../inc/host.inc:622
+#: ../inc/host.inc:627
 msgid "Couldn't update results"
-msgstr ""
+msgstr "Nepodarilo sa aktualizovať výsledky"
 
-#: ../inc/host.inc:627
+#: ../inc/host.inc:632
 msgid "Couldn't retire old computer"
-msgstr ""
+msgstr "Nepodarilo sa odstrániť starý počítač"
 
-#: ../inc/host.inc:629
+#: ../inc/host.inc:634
 msgid "Retired old computer %1"
-msgstr ""
+msgstr "Starý počítač %1 bol odstránený"
 
-#: ../inc/host.inc:652 ../inc/host.inc:655
+#: ../inc/host.inc:657 ../inc/host.inc:660
 msgid "Show:"
 msgstr "Zobraziť:"
 
-#: ../inc/host.inc:652 ../inc/host.inc:655
+#: ../inc/host.inc:657 ../inc/host.inc:660
 msgid "All computers"
-msgstr ""
+msgstr "Všetky počítače"
 
-#: ../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 ""
+msgstr "Len počítače aktívne posledných 30 dní"
 
-#: ../inc/host.inc:666 ../inc/result.inc:637
+#: ../inc/host.inc:671 ../inc/result.inc:642
 msgid "Computer ID"
 msgstr "ID počítača"
 
-#: ../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 "Názov"
-
-#: ../inc/host.inc:682
+#: ../inc/host.inc:687
 msgid "BOINC<br>version"
 msgstr "BOINC<br>verzia"
 
-#: ../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 ""
+msgstr "Spojiť počítače podľa názvu"
 
-#: ../inc/language_names.inc:61
+#: ../inc/language_names.inc:62
 msgid "Browser default"
-msgstr ""
+msgstr "Predvolené prehliadačom"
 
 #: ../inc/news.inc:40
 msgid "Comment"
-msgstr ""
+msgstr "Komentár"
 
 #: ../inc/news.inc:111
 #, php-format
 msgid "News is available as an %sRSS feed%s"
-msgstr ""
+msgstr "Novinky sú dostupné ako %sRSS feed%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 ""
+msgstr "Inbox"
 
-#: ../inc/pm.inc:26 ../inc/pm.inc:178
+#: ../inc/pm.inc:26 ../inc/pm.inc:180
 msgid "Write"
-msgstr ""
+msgstr "Napísať"
 
-# 80%
-#: ../inc/pm.inc:33 ../inc/user.inc:378
+#: ../inc/pm.inc:33 ../inc/user.inc:458
 msgid "Send private message"
 msgstr "Poslať súkromnú správu"
 
 #: ../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 ""
+msgstr "Náhľad"
 
-#: ../inc/pm.inc:48 ../user/pm.php:131
+#: ../inc/pm.inc:48 ../user/pm.php:136
 msgid "no such message"
 msgstr "nenašla sa správa"
 
 #: ../inc/pm.inc:82
 msgid "To"
-msgstr ""
+msgstr "Komu"
 
 #: ../inc/pm.inc:82
 msgid "User IDs or unique usernames, separated with commas"
-msgstr ""
+msgstr "Užívateľské ID alebo unikátne užívateľské mená oddelené čiarkami"
 
-#: ../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 ""
+msgstr "Predmet"
 
 #: ../inc/pm.inc:89
 msgid "Send message"
-msgstr ""
+msgstr "Poslať správu"
 
-#: ../inc/pm.inc:121
+#: ../inc/pm.inc:122
 msgid "sent you a private message; subject:"
-msgstr ""
+msgstr "vám odoslal(a) súkromú správu; predmet:"
 
-#: ../inc/pm.inc:127
+#: ../inc/pm.inc:129
 msgid "Private message%1 from %2, subject:"
-msgstr ""
+msgstr "Súkromá správa%1 od %2, predmet:"
 
-#: ../inc/pm.inc:135
+#: ../inc/pm.inc:137
 msgid "Couldn't create message"
-msgstr ""
+msgstr "Nepodarilo sa vytvoriť správu"
 
-#: ../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 ""
+msgstr "Nie je možné posielať súkromné správy tak často. Prosím, počkajte chvíľu než znovu odošlete viac správ."
 
-#: ../inc/pm.inc:176 ../user/forum_forum.php:186
+#: ../inc/pm.inc:178 ../user/forum_forum.php:190
 msgid "unread"
 msgstr "neprečítané"
 
-#: ../inc/pm.inc:186
+#: ../inc/pm.inc:188
 msgid "For email notification, %1edit community prefs%2"
-msgstr ""
+msgstr "Na mailové notifikácie %1upravte preferencie komunity%2"
 
-#: ../inc/pm.inc:198
+#: ../inc/pm.inc:204
 msgid "Private message"
 msgstr "Súkromná správa"
 
-#: ../inc/prefs.inc:77
+#: ../inc/prefs.inc:45 ../inc/prefs.inc:187
+msgid "Usage limits"
+msgstr "Limity používania"
+
+#: ../inc/prefs.inc:47 ../inc/prefs.inc:55
+msgid "Use at most"
+msgstr "Použiť najviac"
+
+#: ../inc/prefs.inc:49
+#, no-php-format
 msgid ""
-"Suspend work while computer is on battery power? %1 Matters only for "
-"portable computers %2"
-msgstr ""
+"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."
 
-#: ../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 "% z procesorov"
 
-#: ../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 ""
+"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 "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ť."
 
-#: ../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 "% času CPU"
 
-#: ../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 "Kedy pozastaviť"
 
-#: ../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 ""
+#: ../inc/prefs.inc:64
+msgid "Suspend when computer is on battery"
+msgstr "Pozastaviť keď je počítač napájaný z batérie"
 
-#: ../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 ""
+"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."
 
-#: ../inc/prefs.inc:122
-msgid "Do work only between the hours of %1 No restriction if equal %2"
-msgstr ""
+#: ../inc/prefs.inc:70
+msgid "Suspend when computer is in use"
+msgstr "Pozastaviť keď je počítač používaný"
 
-#: ../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 ""
+"Check this to suspend computing and file transfers when you're using the "
+"computer."
+msgstr "Tu zaškrtnite na pozastavenie výpočtov a prenosov súborov keď používate počítač."
 
-#: ../inc/prefs.inc:139
-msgid "Switch between tasks every %1 Recommended: 60 minutes %2"
-msgstr ""
+#: ../inc/prefs.inc:76
+msgid "Suspend GPU computing when computer is in use"
+msgstr "Pozastaviť výpočty pomocou GPU keď je počítač používaný"
 
-#: ../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 "Tu zaškrtnite na pozastavenie výpočtov pomocou GPU ked používate počítač."
 
-#: ../inc/prefs.inc:149
-msgid "processors"
-msgstr "procesorov"
+#: ../inc/prefs.inc:82
+msgid "'In use' means mouse/keyboard input in last"
+msgstr "\"Používa sa\" znamená keď bola použitá myš alebo klávesnica posledných"
 
-#: ../inc/prefs.inc:153
-msgid "On multiprocessors, use at most %1 Enforced by version 6.1+ %2"
-msgstr ""
+#: ../inc/prefs.inc:83
+msgid "This determines when the computer is considered 'in use'."
+msgstr "Týmto sa určí kedy sa počítač \"používa\"."
 
-#: ../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 "minút(y)"
 
-#: ../inc/prefs.inc:162
-msgid "Use at most %1 Can be used to reduce CPU heat %2"
-msgstr ""
+#: ../inc/prefs.inc:89
+msgid "Suspend when no mouse/keyboard input in last"
+msgstr "Pozastaviť keď sa myš alebo klávesnica nepoužili posledných"
 
-#: ../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 "Toto dovoľuje niektorým počítačom prejsť do nízkoenergetického módu, keď sa nepoužívajú."
 
-#: ../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 "Pozastaviť, ak je procesor využívaný mimo BOINC nad"
 
-#: ../inc/prefs.inc:177 ../inc/prefs.inc:186
-msgid "GB"
-msgstr ""
+#: ../inc/prefs.inc:96
+msgid "Suspend computing when your computer is busy running other programs."
+msgstr "Pozastaviť výpočty, ak váš počítač používajú iné programy."
 
-#: ../inc/prefs.inc:180
-msgid "Disk: leave free at least %1 Values smaller than %2 are ignored %3"
-msgstr ""
+#: ../inc/prefs.inc:101
+msgid "Compute only between"
+msgstr "Počítať len medzi"
 
-#: ../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 "Vykonávať výpočty v určitý čas každý deň"
 
-#: ../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 "Ostatné"
 
-#: ../inc/prefs.inc:196
-msgid "seconds"
-msgstr ""
+#: ../inc/prefs.inc:107
+msgid "Store at least"
+msgstr "Uložiť najmenej"
 
-#: ../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 "Uložiť aspoň toľko úloh, aby bol počítač zamestnaný aspoň takto dlho."
 
-#: ../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 "dní práce"
 
-#: ../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 "Uložiť až do"
 
-#: ../inc/prefs.inc:218
-msgid "Maintain enough tasks to keep busy for at least%1(max 10 days).%2"
-msgstr ""
+#: ../inc/prefs.inc:114
+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."
 
-#: ../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 "Prepínať medzi úlohami každých"
 
-#: ../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 "Pokial beží viacero projektov, BOINC môže medzi nimi prepínať s nasledujúcou frekvenciou:"
 
-#: ../inc/prefs.inc:232
-msgid ""
-"Confirm before connecting to Internet? %1 Matters only if you have a modem, "
-"ISDN or VPN connection %2"
-msgstr ""
+#: ../inc/prefs.inc:125
+msgid "Request tasks to checkpoint at most every"
+msgstr "Ukladať stav úloh každých"
 
-#: ../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 ""
-
-#: ../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 "Tu sa nastavuje, ako často úlohy ukladajú svoj stav na disk, aby mohli byť neskôr reštartované."
 
-#: ../inc/prefs.inc:251 ../inc/prefs.inc:256
-msgid "Kbytes/sec"
-msgstr ""
+#: ../inc/prefs.inc:128
+msgid "seconds"
+msgstr "sekúnd"
 
-#: ../inc/prefs.inc:254
-msgid "Maximum upload rate:"
-msgstr ""
+#: ../inc/prefs.inc:136 ../inc/prefs.inc:148
+msgid "Use no more than"
+msgstr "Nepoužívať viac ako"
 
-#: ../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 "Nastaví koľko miesta na disku využije BOINC."
 
-#: ../inc/prefs.inc:263
-msgid "Transfer at most %1 Enforced by version 6.10.46+ %2"
-msgstr ""
+#: ../inc/prefs.inc:139
+msgid "GB"
+msgstr "GB"
 
-#: ../inc/prefs.inc:269
-msgid "Mbytes every"
-msgstr ""
+#: ../inc/prefs.inc:142
+msgid "Leave at least"
+msgstr "Ponechať aspoň"
 
-#: ../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 ""
+"Limit disk usage to leave this much free space on the volume where BOINC "
+"stores data."
+msgstr "Nastaví použitie disku aby ostalo aspoň toľko voľného miesta na disku, kde sú uložené dáta BOINC."
+
+#: ../inc/prefs.inc:145
+msgid "GB free"
+msgstr "GB voľných"
 
-#: ../inc/prefs.inc:287
+#: ../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 ""
+"Limit the percentage of disk space used by BOINC on the volume where it "
+"stores data."
+msgstr "Nastaví percentuálne využitie miesta na disku aplikáciou BOINC."
 
-#: ../inc/prefs.inc:298
-msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
-msgstr ""
+#: ../inc/prefs.inc:152
+#, no-php-format
+msgid "% of total"
+msgstr "% celku"
 
-#: ../inc/prefs.inc:308
-msgid "Use CPU %1 Enforced by version 6.10+ %2"
-msgstr ""
+#: ../inc/prefs.inc:158
+msgid "When computer is in use, use at most"
+msgstr "Keď sa počítač používa, využiť najviac"
 
-#: ../inc/prefs.inc:320
-msgid "Use ATI GPU %1 Enforced by version 6.10+ %2"
-msgstr ""
+#: ../inc/prefs.inc:159
+msgid "Limit the memory used by BOINC when you're using the computer."
+msgstr "Nastavenie pamäte, ktorú BOINC využíva ked používate počítač."
 
-#: ../inc/prefs.inc:332
-msgid "Use NVIDIA GPU %1 Enforced by version 6.10+ %2"
-msgstr ""
+#: ../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 ""
+#: ../inc/prefs.inc:165
+msgid "When computer is not in use, use at most"
+msgstr "Keď sa počítač nepoužíva, použiť maximálne"
 
-#: ../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 ""
+#: ../inc/prefs.inc:166
+msgid "Limit the memory used by BOINC when you're not using the computer."
+msgstr "Nastavenie pamäte, ktorú BOINC využíva ked nepoužívate počítač."
 
-#: ../inc/prefs.inc:367
+#: ../inc/prefs.inc:172
+msgid "Leave non-GPU tasks in memory while suspended"
+msgstr "Ponechať ne-GPU aplikácie v pamäti pri ich pozastavení"
+
+#: ../inc/prefs.inc:173
 msgid ""
-"Emails will be sent from %1; make sure your spam filter accepts this address."
-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."
+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."
 
-#: ../inc/prefs.inc:374
-msgid "Is it OK for %1 and your team (if any) to email you?"
-msgstr ""
+#: ../inc/prefs.inc:178
+msgid "Page/swap file: use at most"
+msgstr "Stránkovací súbor: použiť maximálne"
 
-#: ../inc/prefs.inc:380
-msgid "Should %1 show your computers on its web site?"
-msgstr ""
+#: ../inc/prefs.inc:179
+msgid "Limit the swap space (page file) used by BOINC."
+msgstr "Nastaviť využitie ukladacieho priestoru (stránkovacieho súboru) pre BOINC."
 
-#: ../inc/prefs.inc:387
-msgid "Disk and memory usage"
-msgstr ""
+#: ../inc/prefs.inc:189
+msgid "Limit download rate to"
+msgstr "Limit rýchlosti sťahovania"
 
-#: ../inc/prefs.inc:388
-msgid "Processor usage"
-msgstr ""
+#: ../inc/prefs.inc:190
+msgid "Limit the download rate of file transfers."
+msgstr "Nastaviť rýchlosť sťahovania súborov"
 
-#: ../inc/prefs.inc:389
-msgid "Network usage"
-msgstr ""
+#: ../inc/prefs.inc:192 ../inc/prefs.inc:198
+msgid "KB/second"
+msgstr "KB/s"
 
-#: ../inc/prefs.inc:392
-msgid ""
-"These preferences apply to all the BOINC projects in which you participate."
-msgstr ""
+#: ../inc/prefs.inc:195
+msgid "Limit upload rate to"
+msgstr "Nastaviť rýchlost odosielania na"
 
-#: ../inc/prefs.inc:395
-msgid ""
-"%1Unable to update preferences.%2 The values marked in red below were out of "
-"range or not numeric."
-msgstr ""
+#: ../inc/prefs.inc:196
+msgid "Limit the upload rate of file transfers."
+msgstr "Nastaviť rýchlosť odosielania súborov"
 
-#: ../inc/prefs.inc:445
-msgid "bad venue: %1"
-msgstr ""
+#: ../inc/prefs.inc:201
+msgid "Limit usage to"
+msgstr "Nastaviť použitie"
 
-#: ../inc/prefs.inc:451
-msgid "bad subset: %1"
-msgstr ""
+#: ../inc/prefs.inc:202
+msgid "Example: BOINC should transfer at most 2000 MB of data every 30 days."
+msgstr "Príklad: BOINC prenesie maximálne 2000 MB dát za 30 dní."
 
-#: ../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 každých"
 
-#: ../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 "dňa (dní)"
 
-#: ../inc/prefs.inc:679 ../user/forum_search.php:53
-msgid "no limit"
-msgstr ""
+#: ../inc/prefs.inc:210
+msgid "Transfer files only between"
+msgstr "Prenos súborov len medzi"
 
-#: ../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 "Prenášať súbory len v určitý čas každý deň"
 
-#: ../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 "Preskočiť overovanie pri súboroch obrázkov"
+
+#: ../inc/prefs.inc:217
+msgid ""
+"Check this only if your Internet provider modifies image files. 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."
+
+#: ../inc/prefs.inc:222
+msgid "Confirm before connecting to Internet"
+msgstr "Potvrďte pred pripojením sa k internetu"
+
+#: ../inc/prefs.inc:223 ../inc/prefs.inc:229
+msgid "Useful only if you have a modem, ISDN or VPN connection."
+msgstr "Použiteľné len pokiaľ vlastníte ISDN alebo VPN pripojenie."
 
-#: ../inc/prefs.inc:812 ../user/explain_state.php:94
+#: ../inc/prefs.inc:228
+msgid "Disconnect when done"
+msgstr "Odpojiť po dokončení komunikácie"
+
+#: ../inc/prefs.inc:235 ../inc/prefs.inc:472 ../user/explain_state.php:94
 msgid "Computing"
-msgstr ""
+msgstr "Výpočty"
 
-#: ../inc/prefs.inc:823
-msgid "Separate preferences for %1"
-msgstr ""
+#: ../inc/prefs.inc:236
+msgid "Disk"
+msgstr "Disk"
 
-#: ../inc/prefs.inc:833 ../inc/prefs.inc:914
-msgid "Edit preferences"
-msgstr ""
+#: ../inc/prefs.inc:238
+msgid "Network"
+msgstr "Sieť"
 
-#: ../inc/prefs.inc:839
-msgid "Add separate preferences for %1"
-msgstr ""
+#: ../inc/prefs.inc:241
+msgid ""
+"These preferences apply to all the BOINC projects in which you participate."
+msgstr "Tieto preferencie sú platné pre všetky BOINC projekty, ktorých sa účastníte."
 
-#: ../inc/prefs.inc:847 ../inc/prefs.inc:895
-msgid "(Switch View)"
-msgstr ""
+#: ../inc/prefs.inc:244
+msgid ""
+"%1Unable to update preferences.%2 The values marked in red below were out of"
+" range or not numeric."
+msgstr "%1Nepodarilo sa aktualizovať nastavenia.%2 Červeno zvýraznené hodnoty sú buď mimo požadovaný rozsah, alebo nie sú číselné hodnoty."
 
-#: ../inc/prefs.inc:849 ../inc/prefs.inc:898
-msgid "Combined preferences"
-msgstr ""
+#: ../inc/prefs.inc:483
+msgid "Separate preferences for %1"
+msgstr "Separátne preferencie pre %1"
 
-#: ../inc/prefs.inc:854
-msgid "Project specific settings"
-msgstr ""
+#: ../inc/prefs.inc:493 ../inc/prefs.inc:528 ../inc/prefs_project.inc:291
+msgid "Edit preferences"
+msgstr "Upraviť preferencie"
 
-#: ../inc/prefs.inc:862 ../inc/prefs.inc:907
-msgid "Primary (default) preferences"
-msgstr ""
+#: ../inc/prefs.inc:494 ../user/edit_forum_preferences_form.php:149
+#: ../user/team_admins.php:36
+msgid "Remove"
+msgstr "Odobrať"
 
-#: ../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 ""
+#: ../inc/prefs.inc:499
+msgid "Add separate preferences for %1"
+msgstr "Pridať zvláštne preferencie pre %1"
 
-#: ../inc/prefs.inc:885
-msgid "These apply to all BOINC projects in which you participate."
-msgstr ""
+#: ../inc/prefs.inc:506
+msgid "These settings apply to all computers using this account except"
+msgstr "Tieto nastavenia platia na všetky počítače, ktoré používa tento účet okrem"
 
-#: ../inc/prefs.inc:887
+#: ../inc/prefs.inc:508
 msgid ""
-"On computers participating in multiple projects, the most recently modified "
-"preferences will be used."
-msgstr ""
+"computers where you have set preferences locally using the BOINC Manager"
+msgstr "počítače, kde ste nastavili preferencie lokálne pomocou správcu BOINC"
 
-#: ../inc/prefs.inc:889
-msgid "These preferences do not apply to Android devices."
-msgstr ""
+#: ../inc/prefs.inc:510
+msgid "Android devices"
+msgstr "Zariadenia s Android"
+
+#: ../inc/prefs.inc:513
+msgid "(Switch view)"
+msgstr "(Prepnúť vzhľad)"
 
-#: ../inc/prefs.inc:892
+#: ../inc/prefs.inc:515 ../inc/prefs_project.inc:272
+msgid "Combined preferences"
+msgstr "Kombinované nastavenia"
+
+#: ../inc/prefs.inc:522 ../inc/prefs_project.inc:283
+msgid "Primary (default) preferences"
+msgstr "Primárne (východzie) nastavenia"
+
+#: ../inc/prefs.inc:537
 msgid "Preferences last modified:"
-msgstr ""
+msgstr "Posledná zmena preferencií:"
 
-#: ../inc/prefs.inc:944
+#: ../inc/prefs.inc:553
 msgid "Add preferences"
-msgstr ""
+msgstr "Pridať preferencie"
 
-#: ../inc/prefs.inc:948
+#: ../inc/prefs.inc:557
 msgid "Update preferences"
-msgstr ""
+msgstr "Aktualizovať preferencie"
+
+#: ../inc/prefs.inc:628 ../project.sample/project_specific_prefs.inc:84
+#: ../project.sample/project_specific_prefs.inc:224
+msgid "yes"
+msgstr "áno"
 
-#: ../inc/prefs.inc:1036 ../inc/prefs.inc:1045
+#: ../inc/prefs.inc:630 ../project.sample/project_specific_prefs.inc:86
+#: ../project.sample/project_specific_prefs.inc:224
+msgid "no"
+msgstr "nie"
+
+#: ../inc/prefs.inc:638
 msgid "Default computer location"
-msgstr ""
+msgstr "Východzie umiestnenie počítača"
+
+#: ../inc/prefs.inc:639
+msgid ""
+"New computers will use this location for computing and project preferences."
+msgstr "Nové počítače použijú toto umiestnenie pre preferencie vo výpočtoch a projektoch."
+
+#: ../inc/prefs_project.inc:52
+msgid "Resource share"
+msgstr "Podiel výkonu"
+
+#: ../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 "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."
+
+#: ../inc/prefs_project.inc:61
+msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
+msgstr "Urýchliť úlohy pre GPU priradením procesora pre každú?"
+
+#: ../inc/prefs_project.inc:70
+msgid "Use CPU"
+msgstr "Použiť procesoru"
+
+#: ../inc/prefs_project.inc:79
+msgid "Use ATI GPU"
+msgstr "Použiť ATI GPU"
+
+#: ../inc/prefs_project.inc:88
+msgid "Use NVIDIA GPU"
+msgstr "Použiť NVIDIA GPU"
 
-#: ../inc/prefs_util.inc:305 ../inc/prefs_util.inc:315
+#: ../inc/prefs_project.inc:97
+msgid "Use Intel GPU"
+msgstr "Použiť Intel GPU"
+
+#: ../inc/prefs_project.inc:107
+msgid "Run test applications?"
+msgstr "Spustiť testovacie aplikácie?"
+
+#: ../inc/prefs_project.inc:108
+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"
+
+#: ../inc/prefs_project.inc:115
+msgid ""
+"Emails will be sent from %1; make sure your spam filter accepts this "
+"address."
+msgstr "Maily budú poslané z adresy %1; uistite sa, že váš spamový filter prepustí tieto adresy."
+
+#: ../inc/prefs_project.inc:123
+msgid "Is it OK for %1 and your team (if any) to email you?"
+msgstr "Súhlasite aby %1 a váš tím vám posielal maily?"
+
+#: ../inc/prefs_project.inc:130
+msgid "Should %1 show your computers on its web site?"
+msgstr "Môže %1 zobraziť vaše počítače na svojej stránke?"
+
+#: ../inc/prefs_project.inc:270
+msgid "(Switch View)"
+msgstr "(Prepnúť vzhľad)"
+
+#: ../inc/prefs_project.inc:276
+msgid "Project specific settings"
+msgstr "Nastavenia špecifické pre projekt"
+
+#: ../inc/prefs_util.inc:33
+msgid "bad venue: %1"
+msgstr "nesprávne miesto: %1"
+
+#: ../inc/prefs_util.inc:39
+msgid "bad subset: %1"
+msgstr "nesprávna podmnožina: %1"
+
+#: ../inc/prefs_util.inc:476 ../inc/prefs_util.inc:500
 msgid "and"
-msgstr ""
+msgstr "a"
 
 #: ../inc/profile.inc:86
 msgid ""
 "Your profile will be made visible to other people as soon as it has been "
 "approved by the project. This may take up to a few days."
-msgstr ""
+msgstr "Váš profil bude viditeľný pre ostatných až keď bude schválený projektom. Toto môže trvať niekoľko dní."
 
 #: ../inc/profile.inc:92
 msgid ""
 "Your profile has been marked as unacceptable. It is not visible to other "
 "people. Please change it."
-msgstr ""
+msgstr "Váš profil bol vyhodnotený ako nepriateľný; ostatní ho neuvidia. Prosím, upravte ho."
 
-#: ../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 ""
+msgstr "Chyba databázy"
 
 #: ../inc/profile.inc:193
 msgid ""
 "To prevent spam, profiles of users with an average credit of less than %1 "
 "are displayed only to logged-in users. We apologize for this inconvenience."
-msgstr ""
+msgstr "Na zabránenie spamu, profily s priemerným kreditom nižším ako %1 sa zobrazujú len prihláseným užívateľom. Za spôsobené nepríjemnosti sa ospravedlňujeme."
 
 #: ../inc/profile.inc:197
 msgid "User is banished"
-msgstr ""
+msgstr "Užívateľ je blokovaný"
 
 #: ../inc/profile.inc:211
 msgid "No profile exists for that user ID."
-msgstr ""
+msgstr "Užívateľ so zadaným ID neexistuje."
 
-#: ../inc/profile.inc:219 ../user/create_profile.php:313
+#: ../inc/profile.inc:219 ../user/create_profile.php:309
 msgid "Edit your profile"
-msgstr ""
+msgstr "Upravte si profil"
 
 #: ../inc/profile.inc:262
 msgid "Your feedback on this profile"
-msgstr ""
+msgstr "Váš názor na tento profil"
 
 #: ../inc/profile.inc:264
 msgid "Recommend this profile for User of the Day:"
-msgstr ""
+msgstr "Odporučiť tento profil na Užívateľa dňa"
 
 #: ../inc/profile.inc:265
 msgid "I %1like%2 this profile"
-msgstr ""
+msgstr "%1Páči sa mi%2 tento profil"
 
 #: ../inc/profile.inc:268
 msgid "Alert administrators to an offensive profile:"
-msgstr ""
+msgstr "Upozorniť administrátorov na urážlivý profil:"
 
 #: ../inc/profile.inc:269
 msgid "I %1do not like%2 this profile"
-msgstr ""
+msgstr "%1Nepáči sa mi%2 tento profil"
 
 #: ../inc/result.inc:35
 msgid "Anonymous platform"
-msgstr ""
+msgstr "Anonymná platforma"
 
 #: ../inc/result.inc:53 ../user/host_app_versions.php:26
 msgid "NVIDIA GPU"
-msgstr ""
+msgstr "GPU NVIDIA"
 
 #: ../inc/result.inc:55 ../user/host_app_versions.php:27
 msgid "ATI GPU"
-msgstr ""
+msgstr "ATI GPU"
 
 #: ../inc/result.inc:57 ../user/host_app_versions.php:28
 msgid "Intel GPU"
-msgstr ""
+msgstr "Intel GPU"
 
 #: ../inc/result.inc:65
 msgid "Not in DB"
-msgstr ""
+msgstr "Nie je v databázi"
 
 #: ../inc/result.inc:91
 msgid "pending"
-msgstr ""
+msgstr "čaká"
 
-#: ../inc/result.inc:114 ../user/forum_search.php:60
+#: ../inc/result.inc:114 ../user/forum_search.php:62
 msgid "All"
-msgstr ""
+msgstr "Všetky"
 
 #: ../inc/result.inc:115 ../inc/result.inc:176 ../inc/result.inc:223
+#: ../user/server_status.php:163
 msgid "In progress"
-msgstr ""
+msgstr "Prebieha"
 
 #: ../inc/result.inc:116
 msgid "Validation pending"
-msgstr ""
+msgstr "Čaká sa na overenie"
 
 #: ../inc/result.inc:117
 msgid "Validation inconclusive"
-msgstr ""
+msgstr "Overenie nepresvedčivé"
 
 #: ../inc/result.inc:118 ../inc/result.inc:268
 msgid "Valid"
-msgstr ""
+msgstr "Platné"
 
 #: ../inc/result.inc:119 ../inc/result.inc:271
 msgid "Invalid"
-msgstr ""
+msgstr "Neplatné"
 
 #: ../inc/result.inc:120 ../inc/result.inc:209
 msgid "Error"
-msgstr ""
+msgstr "Chyba"
 
 #: ../inc/result.inc:174 ../inc/result.inc:221 ../user/explain_state.php:34
 msgid "Inactive"
-msgstr ""
+msgstr "Neaktívne"
 
 #: ../inc/result.inc:175 ../inc/result.inc:222 ../user/explain_state.php:37
+#: ../user/server_status.php:163
 msgid "Unsent"
-msgstr ""
+msgstr "Neposlané"
 
 #: ../inc/result.inc:181
 msgid "Completed, waiting for validation"
-msgstr ""
+msgstr "Dokončené, čaká sa na potvrdenie"
 
 #: ../inc/result.inc:182
 msgid "Completed and validated"
-msgstr ""
+msgstr "Dokončené a potvrdené"
 
 #: ../inc/result.inc:183
 msgid "Completed, marked as invalid"
-msgstr ""
+msgstr "Dokončené, označené ako chybné"
 
 #: ../inc/result.inc:184
 msgid "Completed, can't validate"
-msgstr ""
+msgstr "Dokončené, nedá sa overiť"
 
 #: ../inc/result.inc:185
 msgid "Completed, validation inconclusive"
-msgstr ""
+msgstr "Dokončené, overenie nedokončené"
 
 #: ../inc/result.inc:186
 msgid "Completed, too late to validate"
-msgstr ""
+msgstr "Dokončené, príliš neskoro na overenie"
 
 #: ../inc/result.inc:188
 msgid "Completed"
-msgstr ""
+msgstr "Dokončené"
 
 #: ../inc/result.inc:189 ../inc/result.inc:233 ../user/explain_state.php:62
 msgid "Couldn't send"
-msgstr ""
+msgstr "Nepodarilo sa odoslať"
 
 #: ../inc/result.inc:194 ../inc/result.inc:257
 msgid "Cancelled by server"
-msgstr ""
+msgstr "Zrušené serverom"
 
 #: ../inc/result.inc:199
 msgid "Not started by deadline - canceled"
-msgstr ""
+msgstr "Zrušené - výpočet sa nezačal do určeného termínu"
 
 #: ../inc/result.inc:202
 msgid "Error while downloading"
-msgstr ""
+msgstr "Chyba pri sťahovaní"
 
 #: ../inc/result.inc:204
 msgid "Error while computing"
-msgstr ""
+msgstr "Chyba pri počítaní"
 
 #: ../inc/result.inc:205
 msgid "Error while uploading"
-msgstr ""
+msgstr "Chyba pri odosielaní"
 
 #: ../inc/result.inc:206 ../inc/result.inc:259
 msgid "Aborted by user"
-msgstr ""
+msgstr "Zrušené užívateľom"
 
 #: ../inc/result.inc:207 ../inc/result.inc:260
 msgid "Upload failed"
-msgstr ""
+msgstr "Odosielanie zlyhalo"
 
 #: ../inc/result.inc:210
 msgid "Timed out - no response"
-msgstr ""
+msgstr "Čas vypršal - bez odpovede"
 
 #: ../inc/result.inc:211 ../inc/result.inc:240 ../user/explain_state.php:71
 msgid "Didn't need"
-msgstr ""
+msgstr "Nepotrebné"
 
 #: ../inc/result.inc:212 ../inc/result.inc:241 ../user/explain_state.php:74
 msgid "Validate error"
-msgstr ""
+msgstr "Chyba overenia"
 
 #: ../inc/result.inc:213 ../inc/result.inc:242
 msgid "Abandoned"
-msgstr ""
+msgstr "Zrušené"
 
 #: ../inc/result.inc:224 ../user/explain_state.php:43
 msgid "Over"
-msgstr ""
+msgstr "Po termíne"
 
 #: ../inc/result.inc:232 ../user/explain_state.php:59
 msgid "Success"
-msgstr ""
+msgstr "Úspešné"
 
 #: ../inc/result.inc:236
 msgid "Computation error"
-msgstr ""
+msgstr "Chyba výpočtu"
 
 #: ../inc/result.inc:238
 msgid "Redundant result"
-msgstr ""
+msgstr "Reduntantý výsledok"
 
 #: ../inc/result.inc:239 ../user/explain_state.php:68
 msgid "No reply"
-msgstr ""
+msgstr "Bez odpovede"
 
 #: ../inc/result.inc:249 ../user/explain_state.php:85
 msgid "New"
-msgstr ""
+msgstr "Nové"
 
 #: ../inc/result.inc:250 ../user/explain_state.php:91
 msgid "Downloading"
-msgstr ""
+msgstr "Sťahuje sa"
 
 #: ../inc/result.inc:251
 msgid "Processing"
-msgstr ""
+msgstr "Spracúva sa"
 
 #: ../inc/result.inc:252
 msgid "Compute error"
-msgstr ""
+msgstr "Chyba výpočtu"
 
 #: ../inc/result.inc:253 ../user/explain_state.php:97
 msgid "Uploading"
-msgstr ""
+msgstr "Odosielanie"
 
 #: ../inc/result.inc:254 ../user/explain_state.php:88
 msgid "Done"
-msgstr ""
+msgstr "Hotovo"
 
 #: ../inc/result.inc:267
 msgid "Initial"
-msgstr ""
+msgstr "Počiatočné"
 
 #: ../inc/result.inc:273
 msgid "Not necessary"
-msgstr ""
+msgstr "Nepotrebné"
 
 #: ../inc/result.inc:274
 msgid "Workunit error - check skipped"
-msgstr ""
+msgstr "Chyba pracovnej jednotky - kontrola preskočená"
 
 #: ../inc/result.inc:275
 msgid "Checked, but no consensus yet"
-msgstr ""
+msgstr "Overené, no zatiaľ bez konsenzu"
 
 #: ../inc/result.inc:276
 msgid "Task was reported too late to validate"
-msgstr ""
+msgstr "Úloha bola reportovaná príliš neskoro na overenie"
 
 #: ../inc/result.inc:302
 msgid "Couldn't send result"
-msgstr ""
+msgstr "Nepodarilo sa odoslať výsledok"
 
 #: ../inc/result.inc:306
 msgid "Too many errors (may have bug)"
-msgstr ""
+msgstr "Príliš veľa chýb (možný bug)"
 
 #: ../inc/result.inc:310
 msgid "Too many results (may be nondeterministic)"
-msgstr ""
+msgstr "Príliš veľa výsledkov (môže byť nedeterministický)"
 
 #: ../inc/result.inc:314
 msgid "Too many total results"
-msgstr ""
+msgstr "Príliš veľa výsledkov"
 
 #: ../inc/result.inc:318
 msgid "WU cancelled"
-msgstr ""
+msgstr "Pracovná jednotka zrušená"
 
 #: ../inc/result.inc:322
+msgid "Canonical result is missing"
+msgstr "Chýba kanonický výsledok"
+
+#: ../inc/result.inc:326
 msgid "Unrecognized Error: %1"
-msgstr ""
+msgstr "Neznáma chyba: %1"
 
-#: ../inc/result.inc:349
+#: ../inc/result.inc:353
 msgid "Task name"
-msgstr ""
+msgstr "Názov úlohy"
 
-#: ../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 ""
+msgstr "kliknite na zobrazenie  podrobností"
 
-#: ../inc/result.inc:349
+#: ../inc/result.inc:353
 msgid "Show IDs"
-msgstr ""
+msgstr "Zobraziť ID"
 
-#: ../inc/result.inc:354
+#: ../inc/result.inc:358
 msgid "Show names"
-msgstr ""
+msgstr "Zobraziť názvy"
 
-#: ../inc/result.inc:357
+#: ../inc/result.inc:361
 msgid "Task"
 msgstr "Úloha"
 
-#: ../inc/result.inc:360
+#: ../inc/result.inc:364
 msgid "Work unit"
-msgstr ""
+msgstr "Pracovná jednotka"
 
-#: ../inc/result.inc:369
+#: ../inc/result.inc:373
 msgid "Computer"
-msgstr ""
+msgstr "Počítač"
 
-#: ../inc/result.inc:372 ../inc/result.inc:631
+#: ../inc/result.inc:376 ../inc/result.inc:635
 msgid "Sent"
-msgstr ""
+msgstr "Poslané"
 
-#: ../inc/result.inc:373
+#: ../inc/result.inc:377
 msgid "Time reported<br />or deadline"
-msgstr ""
+msgstr "Čas odoslania <br /> alebo uzávierky"
 
-#: ../inc/result.inc:374
+#: ../inc/result.inc:378
 msgid "explain"
-msgstr ""
+msgstr "vysvetliť"
 
-#: ../inc/result.inc:376 ../user/server_status.php:241
+#: ../inc/result.inc:380 ../user/server_status.php:113
 msgid "Status"
-msgstr ""
+msgstr "Stav"
 
-#: ../inc/result.inc:377
+#: ../inc/result.inc:381
 msgid "Run time<br />(sec)"
-msgstr ""
+msgstr "Čas priebehu <br /> (sek)"
 
-#: ../inc/result.inc:378
+#: ../inc/result.inc:382
 msgid "CPU time<br />(sec)"
-msgstr ""
+msgstr "Procesorový čas <br /> (sek)"
 
-#: ../inc/result.inc:379 ../inc/result.inc:642
+#: ../inc/result.inc:383 ../inc/result.inc:646
 msgid "Credit"
-msgstr ""
+msgstr "Kredit"
 
-#: ../inc/result.inc:380 ../inc/result.inc:724
+#: ../inc/result.inc:384 ../inc/result.inc:746 ../user/server_status.php:163
 msgid "Application"
-msgstr ""
+msgstr "Aplikácia"
 
-#: ../inc/result.inc:629
+#: ../inc/result.inc:633
 msgid "Workunit"
-msgstr ""
+msgstr "Pracovná jednotka"
+
+#: ../inc/result.inc:636
+msgid "Report deadline"
+msgstr "Odoslať do"
 
-#: ../inc/result.inc:632
+#: ../inc/result.inc:637
 msgid "Received"
-msgstr ""
+msgstr "Prijatá"
 
-#: ../inc/result.inc:633
+#: ../inc/result.inc:638
 msgid "Server state"
-msgstr ""
+msgstr "Stat serveru"
 
-#: ../inc/result.inc:634
+#: ../inc/result.inc:639
 msgid "Outcome"
-msgstr ""
+msgstr "Výsledok"
 
-#: ../inc/result.inc:635
+#: ../inc/result.inc:640
 msgid "Client state"
-msgstr ""
+msgstr "Stav klienta"
 
-#: ../inc/result.inc:636
+#: ../inc/result.inc:641
 msgid "Exit status"
-msgstr ""
+msgstr "Opustiť stav"
 
-#: ../inc/result.inc:638
-msgid "Report deadline"
-msgstr ""
-
-#: ../inc/result.inc:639
+#: ../inc/result.inc:643
 msgid "Run time"
-msgstr ""
+msgstr "Čas priebehu"
 
-#: ../inc/result.inc:640
+#: ../inc/result.inc:644
 msgid "CPU time"
 msgstr "Procesorový čas"
 
-#: ../inc/result.inc:641
+#: ../inc/result.inc:645
 msgid "Validate state"
-msgstr ""
+msgstr "Overenie stavu"
 
-#: ../inc/result.inc:643
+#: ../inc/result.inc:647
+msgid "Device peak FLOPS"
+msgstr "Vrcholná hodnota FLOPS na zariadení"
+
+#: ../inc/result.inc:648
 msgid "Application version"
-msgstr ""
+msgstr "Verzia aplikácie"
 
-#: ../inc/result.inc:656
+#: ../inc/result.inc:673
 msgid "Output files"
-msgstr ""
+msgstr "Výstupné súbory"
 
-#: ../inc/result.inc:659
+#: ../inc/result.inc:676
 msgid "Stderr output"
-msgstr ""
+msgstr "Výstup stderr"
 
-#: ../inc/result.inc:706
+#: ../inc/result.inc:728
 msgid "State"
-msgstr ""
+msgstr "Stav"
 
-#: ../inc/result.inc:747
+#: ../inc/result.inc:769
 msgid "Task name:"
-msgstr ""
+msgstr "Názov úlohy:"
 
 #: ../inc/team.inc:40
 msgid "Search criteria (use one or more)"
-msgstr ""
+msgstr "Kritéria vyhľadávania (použite jedno alebo viac)"
 
 #: ../inc/team.inc:41
 msgid "Key words"
-msgstr ""
+msgstr "Kľúčové slová"
 
 #: ../inc/team.inc:41
 msgid "Find teams with these words in their names or descriptions"
-msgstr ""
+msgstr "Nájsť tímy s týmito slovami v popise alebo v názve"
 
-#: ../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 ""
+msgstr "Typ tímu"
 
 #: ../inc/team.inc:51
 msgid "Show only active teams"
-msgstr ""
+msgstr "Zobraziť len aktívne tímy"
 
-#: ../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 ""
+msgstr "Vyhľadávať"
 
 #: ../inc/team.inc:61
 msgid "Requested by you, and founder response deadline has passed."
-msgstr ""
+msgstr "Požadované vami, čas na odpoveď od zakladateľa uplynul."
 
 #: ../inc/team.inc:63
 msgid "Complete foundership transfer"
-msgstr ""
+msgstr "Dokončiť prenos zakladateľstva"
 
 #: ../inc/team.inc:67
 msgid "Requested by you"
-msgstr ""
+msgstr "Vyžiadané vami"
 
 #: ../inc/team.inc:67
 msgid "founder response deadline is %1"
-msgstr ""
+msgstr "Časový limit na odpoveď zakladateľa je do %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 ""
+msgstr "Žiadne"
 
 #: ../inc/team.inc:74
 msgid "Initiate request"
-msgstr ""
+msgstr "Iniciovať žiadosť"
 
 #: ../inc/team.inc:77
 msgid "Deferred"
-msgstr ""
+msgstr "Odložené"
 
 #: ../inc/team.inc:87
 msgid "Team info"
-msgstr ""
+msgstr "Info o tíme"
 
-#: ../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 ""
+msgstr "Popis"
 
-#: ../inc/team.inc:97
+#: ../inc/team.inc:101
 msgid "Web site"
-msgstr ""
+msgstr "Stránka"
 
-#: ../inc/team.inc:120
+#: ../inc/team.inc:127
 msgid "Cross-project stats"
-msgstr ""
+msgstr "Medziprojektové štatistiky"
 
-#: ../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 ""
+msgstr "Typ"
 
-#: ../inc/team.inc:127 ../user/team_manage.php:63
+#: ../inc/team.inc:134 ../user/team_manage.php:65
 msgid "Message board"
 msgstr "Diskusné 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 "Vlákna"
 
-#: ../inc/team.inc:136
+#: ../inc/team.inc:143
 msgid "Join this team"
-msgstr ""
+msgstr "Vstúpiť do tímu"
 
-#: ../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 ""
+msgstr "Poznámka: ak je vybrané \"OK\" na mail v nastaveniach projektu, vstupom do tímu dáte možnosť vidieť vašu mailovú adresu."
 
-#: ../inc/team.inc:140
+#: ../inc/team.inc:147
 msgid "Not accepting new members"
-msgstr ""
+msgstr "Neakceptuje nových členov"
 
-#: ../inc/team.inc:147
+#: ../inc/team.inc:154
 msgid "Foundership change requested"
-msgstr ""
+msgstr "Žiadosť o zmenu zakladateľa"
 
-#: ../inc/team.inc:148
+#: ../inc/team.inc:155
 msgid "Respond by %1"
-msgstr ""
+msgstr "Odpovedať do %1"
 
-#: ../inc/team.inc:152
+#: ../inc/team.inc:159
 msgid "Team foundership change"
-msgstr ""
+msgstr "Zmena zakladateľstva tímu"
 
-#: ../inc/team.inc:156 ../inc/team.inc:359
+#: ../inc/team.inc:163 ../inc/team.inc:368
 msgid "Members"
-msgstr ""
+msgstr "Členovia"
 
-#: ../inc/team.inc:157 ../inc/team.inc:254
+#: ../inc/team.inc:164 ../inc/team.inc:263
 msgid "Founder"
-msgstr ""
+msgstr "Zakladateľ"
 
-#: ../inc/team.inc:169
+#: ../inc/team.inc:178
 msgid "Admins"
-msgstr ""
+msgstr "Administrátori"
 
-#: ../inc/team.inc:184
+#: ../inc/team.inc:193
 msgid "New members in last day"
-msgstr ""
+msgstr "Noví členovia zo včerajška"
 
-#: ../inc/team.inc:185
+#: ../inc/team.inc:194
 msgid "Total members"
-msgstr ""
+msgstr "Počet členov"
 
-#: ../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 "zobraziť"
 
-#: ../inc/team.inc:186
+#: ../inc/team.inc:195
 msgid "Active members"
-msgstr ""
+msgstr "Aktívni členovia"
 
-#: ../inc/team.inc:187
+#: ../inc/team.inc:196
 msgid "Members with credit"
-msgstr ""
+msgstr "Členovia s kreditom"
 
-#: ../inc/team.inc:256
+#: ../inc/team.inc:265
 msgid "Admin"
-msgstr ""
+msgstr "Administrátor"
 
-#: ../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 ""
+msgstr "Predošlé %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 ""
+msgstr "Ďalšie %1"
 
-#: ../inc/team.inc:289
+#: ../inc/team.inc:298
 msgid "No such team."
-msgstr ""
+msgstr "Tím neexistuje"
 
-#: ../inc/team.inc:302
+#: ../inc/team.inc:311
 msgid "This operation requires foundership."
-msgstr ""
+msgstr "Táto operácia vyžaduje zakladateľské práva"
 
-#: ../inc/team.inc:326
+#: ../inc/team.inc:335
 msgid "This operation requires team admin privileges"
-msgstr ""
+msgstr "Táto operácia vyžaduje práva administrátora tímu"
 
-#: ../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 ""
+"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 "Pozor: toto je tím na celom BOINC. Ak urobíte zmeny tu, o chvíľu budú prepísané. Ak chcete vykonať zmeny, vykonajte ich na %1Celo-BOINC tíme%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 ""
+msgstr "%1Poznáma o súkromí%2: ak vytvoríte tím, vaše projektové preferencie (grafické alebo zdieľanie zdrojov) budú verejne viditeľné."
 
-#: ../inc/team.inc:432
+#: ../inc/team.inc:447
 msgid "Team name, text version"
-msgstr ""
+msgstr "Názov tímu, text"
 
-#: ../inc/team.inc:433
+#: ../inc/team.inc:448
 msgid "Don't use HTML tags."
-msgstr ""
+msgstr "Nepoužívajte HTML tagy"
 
-#: ../inc/team.inc:436
+#: ../inc/team.inc:451
 msgid "Team name, HTML version"
-msgstr ""
+msgstr "Názov tímu, HTML verzia"
 
-#: ../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 ""
+msgstr "Môžete použiť %1obmedzené HTML tagy%2."
 
-#: ../inc/team.inc:439
+#: ../inc/team.inc:454
 msgid "If you don't know HTML, leave this box blank."
-msgstr ""
+msgstr "Pokiaľ neovládate HTML, nevypĺňajte."
 
-#: ../inc/team.inc:442
+#: ../inc/team.inc:457
 msgid "URL of team web page, if any"
-msgstr ""
+msgstr "URL stránky tímu (ak existuje)"
 
-#: ../inc/team.inc:442
+#: ../inc/team.inc:457
 msgid "without \"http://\""
-msgstr ""
+msgstr "bez \"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 ""
+msgstr "Na tento odkaz sa dostanete zo stránky tímu na tejto stránke."
 
-#: ../inc/team.inc:446
+#: ../inc/team.inc:461
 msgid "Description of team"
-msgstr ""
+msgstr "Popis tímu"
 
-#: ../inc/team.inc:462
+#: ../inc/team.inc:477
 msgid "Accept new members?"
-msgstr ""
+msgstr "Príjmať nových členov?"
 
-#: ../inc/uotd.inc:28
+#: ../inc/uotd.inc:30
 msgid "User profile"
-msgstr ""
+msgstr "Profil užívateľa"
 
-#: ../inc/user.inc:119
+#: ../inc/user.inc:120
 msgid "Projects in which you are participating"
-msgstr ""
+msgstr "Projekty ktorých sa zúčastňujete"
 
-#: ../inc/user.inc:121
+#: ../inc/user.inc:122
 msgid "Projects in which %1 is participating"
-msgstr ""
+msgstr "Projekty ktorých sa %1 zúčastňuje"
 
-#: ../inc/user.inc:125
+#: ../inc/user.inc:126
 msgid "Project"
-msgstr ""
+msgstr "Projekt"
 
-#: ../inc/user.inc:125
+#: ../inc/user.inc:126
 msgid "Click for user page"
-msgstr ""
+msgstr "Kliknite na zobrazenie užívateľovej stránky"
 
-#: ../inc/user.inc:125
+#: ../inc/user.inc:126
 msgid "Since"
-msgstr ""
+msgstr "Od"
 
-#: ../inc/user.inc:148
+#: ../inc/user.inc:151
 msgid "Computing and credit"
-msgstr ""
+msgstr "Výpočty a kredity"
 
-#: ../inc/user.inc:151
+#: ../inc/user.inc:154
 msgid "Computers on this account"
-msgstr ""
+msgstr "Počítače v tomto účte"
 
-#: ../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 "Zobraziť"
 
-#: ../inc/user.inc:161
+#: ../inc/user.inc:164
 msgid "Cross-project ID"
-msgstr ""
+msgstr "Medziprojektové ID"
 
-#: ../inc/user.inc:162
+#: ../inc/user.inc:165
 msgid "Cross-project statistics"
-msgstr ""
+msgstr "Medziprojektové štatistiky"
 
-#: ../inc/user.inc:163
+#: ../inc/user.inc:166
 msgid "Account"
-msgstr ""
+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 "Tím"
 
-#: ../inc/user.inc:167
+#: ../inc/user.inc:170
 msgid "Cross-project"
-msgstr ""
+msgstr "Medziprojekt"
 
-#: ../inc/user.inc:168 ../user/bs_sample_index.php:54
+#: ../inc/user.inc:171
 msgid "Certificate"
-msgstr ""
+msgstr "Certifikát"
 
-#: ../inc/user.inc:169
+#: ../inc/user.inc:172
 msgid "Stats on your cell phone"
-msgstr ""
+msgstr "Štatistiky na vašom mobile"
 
-#: ../inc/user.inc:183
-msgid "Unknown notification type: %1"
-msgstr ""
-
-#: ../inc/user.inc:198
+#: ../inc/user.inc:197
 msgid "Account information"
-msgstr ""
+msgstr "Informácie o účte"
 
-#: ../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 ""
+msgstr "Mailová adresa"
 
-#: ../inc/user.inc:203 ../inc/user.inc:322
+#: ../inc/user.inc:210 ../inc/user.inc:400
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
-#: ../inc/user.inc:206
+#: ../inc/user.inc:213
 msgid "Postal code"
-msgstr ""
+msgstr "PSČ"
 
-#: ../inc/user.inc:207 ../inc/user.inc:316
+#: ../inc/user.inc:214 ../inc/user.inc:394
 msgid "%1 member since"
-msgstr ""
+msgstr "%1 členom od"
 
-#: ../inc/user.inc:209
+#: ../inc/user.inc:219 ../inc/user.inc:223
 msgid "Change"
-msgstr ""
+msgstr "Zmena"
 
-#: ../inc/user.inc:209
+#: ../inc/user.inc:224
 msgid "email address"
-msgstr ""
+msgstr "mailová adresa"
 
-#: ../inc/user.inc:210
+#: ../inc/user.inc:225
 msgid "password"
-msgstr ""
+msgstr "heslo"
 
-#: ../inc/user.inc:211
+#: ../inc/user.inc:226
 msgid "other account info"
-msgstr ""
+msgstr "ďalšie info o účte"
 
-#: ../inc/user.inc:213 ../inc/user.inc:315
+#: ../inc/user.inc:229 ../inc/user.inc:393
 msgid "User ID"
-msgstr ""
+msgstr "Užívateľské ID"
 
-#: ../inc/user.inc:213
+#: ../inc/user.inc:229
 msgid "Used in community functions"
-msgstr ""
+msgstr "Používané v funkciách komunity"
 
-#: ../inc/user.inc:216 ../user/weak_auth.php:25
+#: ../inc/user.inc:232 ../user/weak_auth.php:25
 msgid "Account keys"
-msgstr ""
+msgstr "Kľúče k účtu"
 
-#: ../inc/user.inc:221
+#: ../inc/user.inc:237
 msgid "Preferences"
-msgstr ""
+msgstr "Nastavenia"
 
-#: ../inc/user.inc:224
+#: ../inc/user.inc:240
 msgid "When and how BOINC uses your computer"
-msgstr ""
+msgstr "Kedy a ako BOINC používa váš počítač"
 
-#: ../inc/user.inc:225
+#: ../inc/user.inc:241
 msgid "Computing preferences"
-msgstr ""
+msgstr "Preferencie výpočtov"
 
-#: ../inc/user.inc:228
+#: ../inc/user.inc:244
 msgid "Message boards and private messages"
-msgstr ""
+msgstr "Nástenky a súkromné správy"
 
-#: ../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 ""
+msgstr "Preferencie komunity"
 
-#: ../inc/user.inc:232
+#: ../inc/user.inc:248
 msgid "Preferences for this project"
-msgstr ""
+msgstr "Preferencie pre tento projekt"
 
-#: ../inc/user.inc:233 ../user/prefs.php:29
+#: ../inc/user.inc:249 ../user/prefs.php:30
 msgid "%1 preferences"
-msgstr ""
+msgstr "%1 preferencie"
 
-#: ../inc/user.inc:239 ../user/bs_sample_index.php:59
-#: ../user/sample_index.php:125
-msgid "Community"
-msgstr ""
+#: ../inc/user.inc:266
+msgid "View the profile of %1"
+msgstr "Zobraziť profil %1"
 
-#: ../inc/user.inc:243 ../user/pm.php:107 ../user/pm.php:147
-msgid "Delete"
-msgstr ""
+#: ../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 "Komunita"
 
-#: ../inc/user.inc:245
+#: ../inc/user.inc:314
 msgid "Create"
 msgstr "Vytvoriť"
 
-#: ../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 ""
+msgstr "%1 správy"
 
-#: ../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 ""
+msgstr "Notifikácie"
 
-#: ../inc/user.inc:269
+#: ../inc/user.inc:346
 msgid "Quit team"
-msgstr ""
+msgstr "Opustiť tím"
 
-#: ../inc/user.inc:271 ../inc/user.inc:288
+#: ../inc/user.inc:348 ../inc/user.inc:365
 msgid "Administer"
-msgstr ""
+msgstr "Spravovať"
 
-#: ../inc/user.inc:277 ../inc/user.inc:290
+#: ../inc/user.inc:354 ../inc/user.inc:367
 msgid "(foundership change request pending)"
-msgstr ""
+msgstr "(žiadosť o zmenu zakladateľstva čaká)"
 
-#: ../inc/user.inc:279
+#: ../inc/user.inc:356
 msgid "Member of team"
-msgstr ""
+msgstr "Člen tímu"
 
-#: ../inc/user.inc:281
+#: ../inc/user.inc:358
 msgid "find a team"
-msgstr ""
+msgstr "nájsť tím"
 
-#: ../inc/user.inc:292
+#: ../inc/user.inc:369
 msgid "Founder but not member of"
-msgstr ""
+msgstr "Zakladateľ ale nie člen"
 
-#: ../inc/user.inc:298
+#: ../inc/user.inc:375
 msgid "Find friends"
-msgstr ""
+msgstr "Nájsť priateľov"
 
-#: ../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 ""
+msgstr "Priatelia"
 
-#: ../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 ""
+msgstr "Počítače"
 
-#: ../inc/user.inc:338
+#: ../inc/user.inc:415
 msgid "Donor"
-msgstr ""
+msgstr "Darca"
 
-#: ../inc/user.inc:378
+#: ../inc/user.inc:458
 msgid "Contact"
-msgstr ""
+msgstr "Kontakt"
 
-#: ../inc/user.inc:381
+#: ../inc/user.inc:461
 msgid "This person is a friend"
-msgstr ""
+msgstr "Táto osoba je priateľ"
 
-#: ../inc/user.inc:382 ../user/friend.php:238
+#: ../inc/user.inc:462 ../user/friend.php:240
 msgid "Cancel friendship"
-msgstr ""
+msgstr "Zrušiť priateľstvo"
 
-#: ../inc/user.inc:385 ../user/friend.php:37
+#: ../inc/user.inc:465 ../user/friend.php:39
 msgid "Request pending"
-msgstr ""
+msgstr "Žiadosť čaká"
 
-#: ../inc/user.inc:387
+#: ../inc/user.inc:467
 msgid "Add as friend"
-msgstr ""
+msgstr "Pridať ako priateľa"
 
-#: ../inc/user.inc:446
+#: ../inc/user.inc:526
 msgid "user name cannot have leading or trailing white space"
-msgstr ""
+msgstr "užívateľské meno nesmie začínať ani končiť medzerou"
 
-#: ../inc/user.inc:450
+#: ../inc/user.inc:530
 msgid "user name must be nonempty"
-msgstr ""
+msgstr "užívateľské meno nesmie byť prázdne"
 
-#: ../inc/user.inc:454
+#: ../inc/user.inc:534
 msgid "user name may not contain HTML tags"
-msgstr ""
+msgstr "užívateľské meno nesmie obsahovať HTLM tagy"
 
-#: ../inc/util.inc:131
+#: ../inc/util.inc:161
 msgid "log out"
-msgstr ""
+msgstr "odhlásiť sa"
 
-#: ../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 ""
+msgstr "prihlásiť sa"
 
-#: ../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 ""
+msgstr "Vytvoriť účet"
 
-#: ../inc/util.inc:206
+#: ../inc/util.inc:240
 msgid "Server status page"
-msgstr ""
+msgstr "Stránka stavu serverov"
 
-#: ../inc/util.inc:248
+#: ../inc/util.inc:277
 msgid ""
 "A database error occurred while handling your request; please try again "
 "later."
-msgstr ""
+msgstr "Nastala chyba databázy pri spracúvaní vašej žiadosti. Prosím, skúste to znovu neskôr."
 
-#: ../inc/util.inc:257
+#: ../inc/util.inc:286
 msgid "Unable to handle request"
-msgstr ""
+msgstr "Žiadosť sa nepodarilo spracovať"
 
-#: ../inc/util.inc:277
+#: ../inc/util.inc:306
 msgid "hours"
-msgstr ""
+msgstr "hodiny"
 
-#: ../inc/util.inc:280
+#: ../inc/util.inc:309
 msgid "min"
-msgstr ""
+msgstr "min"
 
-#: ../inc/util.inc:283
+#: ../inc/util.inc:312
 msgid "sec"
-msgstr ""
-
-#: ../inc/util.inc:444
-msgid "Link has timed out. Please click Back, refresh the page, and try again."
-msgstr ""
+msgstr "sekúnd"
 
-#: ../inc/util.inc:513
-msgid "View the profile of %1"
-msgstr ""
+#: ../inc/util.inc:473
+msgid ""
+"Link has timed out. Please click Back, refresh the page, and try again."
+msgstr "Odkaz vypršal. Prosím, vráťte sa naspäť, obnovte stránku a skúste to znovu."
 
-#: ../inc/util.inc:569
+#: ../inc/util.inc:552
 msgid "Use BBCode tags to format your text"
-msgstr ""
+msgstr "Na formátovanie vášho textu použite BCCode tagy"
 
-#: ../inc/util.inc:796
+#: ../inc/util.inc:779
 msgid "Project down for maintenance"
-msgstr ""
+msgstr "Projekt je pozastavený kvôli údržbe"
 
-#: ../inc/util.inc:799
+#: ../inc/util.inc:782
 msgid "%1 is temporarily shut down for maintenance.  Please try again later."
-msgstr ""
+msgstr "%1 je dočasne vypnutý kvôli údržbe. Prosím, skúste znovu neskôr."
 
-#: ../inc/util.inc:817
+#: ../inc/util.inc:800
 msgid "Unable to connect to database - please try again later"
-msgstr ""
+msgstr "Nedá sa pripojit k databáze. Prosím, skúste to neskôr."
 
-#: ../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
-msgid "Stay logged in on this computer"
-msgstr ""
-
-#: ../user/account_finish.php:34
-msgid "Finish account setup"
-msgstr ""
+msgstr "Nedá sa vybrať databáza. Prosím, skúste to neskor."
 
-#: ../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 ""
+#: ../inc/util.inc:976
+msgid "characters remaining"
+msgstr "znakov zostáva"
 
-#: ../user/account_finish.php:51 ../user/create_account_form.php:104
-msgid "Postal or ZIP Code"
-msgstr ""
+#: ../inc/util_ops.inc:115 ../user/get_passwd.php:72
+msgid "Stay logged in on this computer"
+msgstr "Ostať prihlásený na tomto počítači"
 
-#: ../user/account_finish.php:51 ../user/create_account_form.php:104
-msgid "Optional"
-msgstr ""
+#: ../user/account_finish.php:34
+msgid "Finish account setup"
+msgstr "Dokončiť nastavenia konta"
 
 #: ../user/account_finish_action.php:27
 msgid "You must supply a name for your account"
-msgstr ""
+msgstr "Musíte zadať meno svojho účtu"
 
 #: ../user/account_finish_action.php:30
 msgid "HTML tags not allowed in name"
-msgstr ""
+msgstr "HTML tagy nie sú v mene dovolené"
 
-#: ../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 "Upraviť %1 preferencie"
+
+#: ../user/add_venue.php:82
 msgid "Add %1 preferences for %2"
-msgstr ""
+msgstr "Pridať preferencie %1 pre %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 ""
+msgstr "Aplikácie"
 
-#: ../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 ""
+msgstr "%1 má nasledujúce aplikácie. Keď sa zúčastníte v %1, úlohy pre jednu alebo viac aplikácií budú priradené vášmu počítaču. Aktuálna verzia sa stiahne na váš počítač; stane sa tak automaticky, vy nemusíte urobiť nič."
 
-#: ../user/apps.php:50
+#: ../user/apps.php:54
 msgid "Platform"
-msgstr ""
+msgstr "Platforma"
 
-#: ../user/apps.php:51
+#: ../user/apps.php:55
 msgid "Version"
-msgstr ""
+msgstr "Verzia"
 
-#: ../user/apps.php:52
-msgid "Installation time"
-msgstr ""
+#: ../user/apps.php:57
+msgid "Average computing"
+msgstr "Priemerné výpočty"
 
 #: ../user/bbcode.php:23
 msgid "BBCode tags"
-msgstr ""
+msgstr "BBCode tagy"
 
 #: ../user/bbcode.php:25
 msgid ""
@@ -2308,385 +2500,272 @@ msgid ""
 "It's similar to HTML, but simpler. The tags start with a [ (where you would\n"
 "have used %1 in HTML) and end with ] (where you would have used %2 in\n"
 "HTML)."
-msgstr ""
+msgstr "Tagy BBCode vám umožnia formátovať text vo vašom profile a v správach na nástenku.\nSú podobné HTML, ale jednoduchšie. Tagy začínaju s [ (kde by ste použili normálne %1 v HTML) a končia s ] (kde by ste normálne použili %2 v\nHTML)."
 
 #: ../user/bbcode.php:31
 msgid "Examples"
-msgstr ""
+msgstr "Príklady"
 
 #: ../user/bbcode.php:32
 msgid "Bold"
-msgstr ""
+msgstr "Hrubé"
 
 #: ../user/bbcode.php:33
 msgid "Italic"
-msgstr ""
+msgstr "Kurzíva"
 
 #: ../user/bbcode.php:34
 msgid "Underline"
-msgstr ""
+msgstr "Podčiarknuté"
 
 #: ../user/bbcode.php:35
-msgid "Superscript"
-msgstr ""
+msgid "Strikethrough"
+msgstr "Prečiarknuté"
 
 #: ../user/bbcode.php:36
-msgid "Big text"
-msgstr ""
+msgid "Superscript"
+msgstr "Superscript"
 
 #: ../user/bbcode.php:37
-msgid "Red text"
-msgstr ""
+msgid "Big text"
+msgstr "Veľký text"
 
 #: ../user/bbcode.php:38
-msgid "link to website"
-msgstr ""
+msgid "Red text"
+msgstr "Červený text"
 
 #: ../user/bbcode.php:39
+msgid "link to website"
+msgstr "odkaz na stránku"
+
+#: ../user/bbcode.php:40
 msgid "Quoted text"
-msgstr ""
+msgstr "Citát"
 
-#: ../user/bbcode.php:39
+#: ../user/bbcode.php:40
 msgid "use for quoted blocks of text"
-msgstr ""
+msgstr "používa sa na citované odseky textu"
 
-#: ../user/bbcode.php:40
+#: ../user/bbcode.php:41
 msgid "use to display an image"
-msgstr ""
+msgstr "použiť na zobrazenie obrázku"
 
-#: ../user/bbcode.php:41
+#: ../user/bbcode.php:42
 msgid "Code snippet here"
-msgstr ""
+msgstr "Sem útržok kódu"
 
-#: ../user/bbcode.php:41
+#: ../user/bbcode.php:42
 msgid "use to display some code"
-msgstr ""
+msgstr "použiť na zobrazenie časti kódu"
 
-#: ../user/bbcode.php:42
+#: ../user/bbcode.php:43
 msgid "Pre-formatted text"
-msgstr ""
+msgstr "Predformátovaný text"
 
-#: ../user/bbcode.php:42
+#: ../user/bbcode.php:43
 msgid "use to display pre-formatted (usually monospaced) text"
-msgstr ""
+msgstr "používa sa na predformátovaný (obyčajne jednopriestorový) text"
 
-#: ../user/bbcode.php:43
+#: ../user/bbcode.php:44
 msgid "Item 1"
-msgstr ""
+msgstr "Položka 1"
 
-#: ../user/bbcode.php:43
+#: ../user/bbcode.php:44
 msgid "Item2"
-msgstr ""
+msgstr "Položka 2"
 
-#: ../user/bbcode.php:43
+#: ../user/bbcode.php:44
 msgid "Item 2"
-msgstr ""
+msgstr "Položka 2"
 
-#: ../user/bbcode.php:45
+#: ../user/bbcode.php:46
 msgid "use to link to Trac ticket on BOINC website"
-msgstr ""
+msgstr "použiť na odkaz k Trac tiketu na stránke BOINC"
 
-#: ../user/bbcode.php:47
+#: ../user/bbcode.php:48
 msgid "use to link to Trac Wiki on BOINC website"
-msgstr ""
+msgstr "použiť na odkaz k Trac Wiki na BOINC stránke"
 
-#: ../user/bbcode.php:49
-msgid "use to link to SVN changeset on BOINC website"
-msgstr ""
-
-#: ../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 ""
-
-#: ../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 "Tímy"
-
-#: ../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 ""
-
-#: ../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 ""
+msgstr "Pokiaľ tag správne neuzavriete alebo pokiaľ správne nešpecifikujete parameter,\ntag sa zobrazí v texte."
 
 #: ../user/create_account_action.php:26
 msgid "Can't create account"
-msgstr ""
+msgstr "Účet sa nedá vytvoriť"
 
 #: ../user/create_account_action.php:29
 msgid "Click your browser's <b>Back</b> button to try again."
-msgstr ""
+msgstr "Kliknite na tlačidlo <b>Back</b> vo vašom prehliadači a skúste to znovu."
 
-#: ../user/create_account_action.php:47
+#: ../user/create_account_action.php:46
 msgid "Your reCAPTCHA response was not correct. Please try again."
-msgstr ""
+msgstr "Neodpísali ste obrázok reCAPTCHA správne. Prosím, skúste to znovu."
 
-#: ../user/create_account_action.php:70
+#: ../user/create_account_action.php:69
 msgid "You must supply an invitation code to create an account."
-msgstr ""
+msgstr "Na vytvorenie účtu je potrebný kód pozvánky."
 
-#: ../user/create_account_action.php:73
+#: ../user/create_account_action.php:72
 msgid "The invitation code you gave is not valid."
-msgstr ""
+msgstr "Zadali ste nesprávny kód pozvánky"
 
-#: ../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 ""
+"Invalid email address: you must enter a valid address of the form "
+"name at domain"
+msgstr "Nesprávna mailová adresa. Adresa musí byť vo formáte meno at doména"
 
-#: ../user/create_account_action.php:88
+#: ../user/create_account_action.php:87
 msgid "There's already an account with that email address."
-msgstr ""
+msgstr "Učet s touto mailovou adresou už existuje."
 
-#: ../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 ""
+msgstr "Nové heslá sú rozdielne"
 
-#: ../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 ""
+msgstr "Heslá môžu obsahovať len ASCII znaky."
 
-#: ../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 ""
+msgstr "Nové heslo je príliš krátke. Minimálna dĺžka hesla je %1 znakov."
 
-#: ../user/create_account_action.php:127
+#: ../user/create_account_action.php:126
 msgid "Couldn't create account"
-msgstr ""
+msgstr "Nepodarilo sa vytvoriť účet"
 
-#: ../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 ""
+msgstr "Poznámka: Pokiaľ používate Správcu BOINC, nepoužívajte tento formulár. Namiesto toho spustite BOINC, vyberte Pridať projekt a vložte mailovú adresu a heslo."
 
-#: ../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 ""
-
-#: ../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 ""
-
-#: ../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 ""
+msgstr "Tento účet patrí tímu %1 a bude mať projektové preferencie jeho zakladateľa."
 
-#: ../user/create_profile.php:50
+#: ../user/create_profile.php:52
 msgid "Picture"
-msgstr ""
+msgstr "Obrázok"
 
-#: ../user/create_profile.php:64
+#: ../user/create_profile.php:66
 msgid "%1 Your profile picture is shown to the left."
-msgstr ""
+msgstr "%1 Obrázok vášho profilu je naľavo."
 
-#: ../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 ""
+"To replace it, click the \"Browse\" button and select a JPEG or PNG file (%1"
+" or less)."
+msgstr "Na zmenu kliknite na \"Prehliadať\" a vyberte súbor vo formáte JPEG alebo PNG (%1 alebo menej)."
 
-#: ../user/create_profile.php:69
+#: ../user/create_profile.php:71
 msgid "To remove it from your profile, check this box:"
-msgstr ""
+msgstr "Tu zakliknite, ak chcete obrázok odstrániť z vášho profilu."
 
-#: ../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 ""
+msgstr "Ak chcete pridať do vášhu profilu obrázok, kliknite na tlačidlo\"Prehliadať\" v vyberte súbor vo formáte JPEG alebo PNG. Prosím, vyberte obrázok nie väčší ako %1."
 
-#: ../user/create_profile.php:89
+#: ../user/create_profile.php:91
 msgid "Language"
-msgstr ""
+msgstr "Jazyk"
 
-#: ../user/create_profile.php:92
+#: ../user/create_profile.php:94
 msgid "Select the language in which your profile is written:"
-msgstr ""
+msgstr "Vyberte v akom jazyku je váš profil vyplnený:"
 
-#: ../user/create_profile.php:104
+#: ../user/create_profile.php:106
 msgid "Submit profile"
-msgstr ""
+msgstr "Vytvoriť profil"
 
-#: ../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 ""
+msgstr "Vytvoriť/upraviť profil"
 
-#: ../user/create_profile.php:137
+#: ../user/create_profile.php:134
 msgid "The format of your uploaded image is not supported."
-msgstr ""
+msgstr "Formát nahranej fotky nie je podporovaný."
 
-#: ../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 ""
+msgstr "Váš %1profil%2 vám umožní zdieľať názory a vaše údaje s %3 komunitou."
 
-#: ../user/create_profile.php:213
+#: ../user/create_profile.php:209
 msgid "Your ReCaptcha response was not correct.  Please try again."
-msgstr ""
+msgstr "ReCaptcha bolo vypísané nesprávne. Prosím, skúste to znovu."
 
-#: ../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 ""
+msgstr "Vaša prvá odpoveď bola označená ako spam protispamovým systémom Aksimet. Prosím, pozmeňte text vašej správy a skúste to znovu."
 
-#: ../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 ""
+msgstr "Vaša druhá odpoveď bola označená ako spam protispamovým systémom Aksimet. Prosím, pozmeňte text vašej správy a skúste to znovu."
 
-#: ../user/create_profile.php:246
+#: ../user/create_profile.php:242
 msgid "Your profile submission was empty."
-msgstr ""
+msgstr "Váš profil nebol vyplnený."
 
-#: ../user/create_profile.php:285
+#: ../user/create_profile.php:281
 msgid "Could not update the profile: database error"
-msgstr ""
+msgstr "Nepodarilo sa aktualizovať profil: chyba databázy"
 
-#: ../user/create_profile.php:297
+#: ../user/create_profile.php:293
 msgid "Could not create the profile: database error"
-msgstr ""
+msgstr "Nepodarilo sa vytvoriť profil: chyba databázy"
 
-#: ../user/create_profile.php:302
+#: ../user/create_profile.php:298
 msgid "Profile saved"
-msgstr ""
+msgstr "Profil bol uložený"
 
-#: ../user/create_profile.php:304
+#: ../user/create_profile.php:300
 msgid ""
 "Congratulations! Your profile was successfully entered into our database."
-msgstr ""
+msgstr "Blahoželáme! Váš profil bol úspešne nahraný do našej databázy."
 
-#: ../user/create_profile.php:306
+#: ../user/create_profile.php:302
 msgid "%1View your profile%2"
-msgstr ""
+msgstr "%1Zobraziť váš profil%2"
 
-#: ../user/create_profile.php:315
+#: ../user/create_profile.php:311
 msgid "Create a profile"
-msgstr ""
+msgstr "Vytvoriť 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."
-msgstr ""
+"To prevent spam, an average credit of %1 or greater is required to create or"
+" edit a profile.  We apologize for this inconvenience."
+msgstr "Na zabránenie spamu je požadovaný priemerný kredit %1 , aby bolo možné vytvoriť alebo upraviť profil. Za spôsobené nepríjemnosti sa ospravedlňujeme."
 
 #: ../user/delete_account.php:57
 msgid "Couldn't delete account"
-msgstr ""
+msgstr "Nepodarilo sa vymazať účet"
 
 #: ../user/delete_account.php:59
 msgid "Account deleted"
-msgstr ""
+msgstr "Účet bol vymazaný"
 
 #: ../user/delete_account.php:60
 msgid "Your account has been deleted."
-msgstr ""
+msgstr "Váš účet bol zmazaný"
 
 #: ../user/delete_account.php:64
 msgid "Confirm delete account"
-msgstr ""
+msgstr "Potvrďte zmazanie účtu"
 
 #: ../user/delete_account.php:67
 msgid ""
@@ -2695,104 +2774,105 @@ msgid ""
 "including your profile and message-board posts.\n"
 "No jobs will be issued to any computers attached\n"
 "to this account."
-msgstr ""
+msgstr "Vymazanie vášho profilu odstráni všetky vaše osobné informácie z našich serverov,\nvrátanie vášho profilu a správ z nástenky.\nŽiadne úlohy nebudú viac priraďované k počítačom\nna tomto účte."
 
 #: ../user/delete_account.php:73
 msgid ""
 "This cannot be undone.\n"
 "Once your account has been deleted, you cannot get it back."
-msgstr ""
+msgstr "Toto je nezvratná akcia.\nAk bude váš účet vymazaný, nie je možné ho obnoviť."
 
 #: ../user/delete_account.php:76
 msgid "Are you sure you want to delete your account?"
-msgstr ""
+msgstr "Skutočne chcete vymazať váš účet?"
 
-#: ../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 ""
+msgstr "Áno"
 
 #: ../user/delete_account.php:79
 msgid "Delete this account"
 msgstr "Zmazať tento účet"
 
-#: ../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 ""
+msgstr "Nie"
 
 #: ../user/delete_account.php:80
 msgid "Do not delete this account"
 msgstr "Zachovať tento účet"
 
-#: ../user/delete_profile.php:30
+#: ../user/delete_profile.php:32
 msgid "couldn't delete profile - please try again later"
-msgstr ""
+msgstr "nepodarilo sa vymazať váš účet. Skúste to prosím neskôr"
 
-#: ../user/delete_profile.php:33
+#: ../user/delete_profile.php:35
 msgid "Delete Confirmation"
 msgstr "Potvrdenie zmazania"
 
-#: ../user/delete_profile.php:35
+#: ../user/delete_profile.php:37
 msgid "Your profile has been deleted."
-msgstr ""
+msgstr "Váš profil bol vymazaný"
 
-#: ../user/delete_profile.php:40
+#: ../user/delete_profile.php:42
 msgid "Profile delete confirmation"
-msgstr ""
+msgstr "Potvrdenie vymazania profilu"
 
-#: ../user/delete_profile.php:43
+#: ../user/delete_profile.php:45
 msgid "Are you sure?"
-msgstr ""
+msgstr "Ste si istý?"
 
-#: ../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 ""
+msgstr "Vymazané profily sú nenávratne preč a nie je možné ich obnoviť--\nmusíte začať odznova\nak chcete v budúcnosti iný ptofil."
 
-#: ../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 ""
+msgstr "Ak ste si istý, kliknite na \"Áno\"\nna odstránenie vášho profilu z našej databázay."
 
-#: ../user/delete_profile.php:52
+#: ../user/delete_profile.php:54
 msgid "Delete my profile"
-msgstr ""
+msgstr "Vymazať môj profil"
 
-#: ../user/delete_profile.php:53
+#: ../user/delete_profile.php:55
 msgid "Do not delete my profile"
-msgstr ""
+msgstr "Zachovať môj profil"
 
 #: ../user/donated.php:25
 msgid "PayPal - Transaction Completed"
-msgstr ""
+msgstr "PayPal - Tranzakcia bola dokončená"
 
 #: ../user/donated.php:28
 msgid "Thank you for donating!"
-msgstr ""
+msgstr "Ďakujeme vám za váš dar!"
 
 #: ../user/donated.php:29
 msgid "Your donation for has been completed."
-msgstr ""
+msgstr "Darovanie bolo dokončené."
 
 #: ../user/donated.php:30
 msgid ""
-"Your donation will be added to the progress bar after confirmation by PayPal."
-msgstr ""
+"Your donation will be added to the progress bar after confirmation by "
+"PayPal."
+msgstr "Váš dar bude pripočítaný k celkovej sume po potvrdení PayPal."
 
 #: ../user/donated.php:32
 msgid "You have canceled your donation."
-msgstr ""
+msgstr "Darovanie ste zrušili."
 
 #: ../user/donations.php:24
 msgid "This project is not accepting donations."
-msgstr ""
+msgstr "Projekt nepríjma dary."
 
 #: ../user/donations.php:34
 msgid "%1 donations"
@@ -2802,7 +2882,7 @@ msgstr "%1 darov"
 msgid ""
 "This project is accepting donations via\n"
 "%1."
-msgstr ""
+msgstr "Tento projekt príjma dary cez\n%1."
 
 #: ../user/donations.php:42
 msgid ""
@@ -2817,15 +2897,15 @@ msgid ""
 "        to see the donation amount equivalent in different currencies\n"
 "        (please note that the rates are only estimates\n"
 "         and the actual amount may differ)."
-msgstr ""
+msgstr "Na poskytnutie daru, vyplňte sumu, ktorú chcete darovať, do poľa nižšie.\nPayPal príjma viacero mien\n(Kanadské Doláre, Euro, Anglické Libry, Americké Doláre, Yeny, Austrálske Doláre, Novozélandské Doláre, \nŠvajčiarske Franky, Hongkongské Doláre, Singapurské\nDoláre, Švédske koruny, Poľské Zlote, Nórske koruny,\nMaďarské forinty, České koruny).\nMôžete využiť priložený prevodník na zistenie\nsumy v rôznych menách\n(prosím, berte na vedomie, že prevody sú len orientačné, kurz a a [...]
 
 #: ../user/donations.php:316
 msgid "Amount you would like to donate"
-msgstr ""
+msgstr "Sumu akú chcete darovať"
 
 #: ../user/donations.php:317
 msgid "Estimated value in"
-msgstr ""
+msgstr "Približná hodnota v "
 
 #: ../user/donations.php:320 ../user/donations.php:324
 msgid "Anonymous donation"
@@ -2835,537 +2915,496 @@ msgstr "Anonymný dar"
 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 ""
+msgstr "Tu zaškrtnite, ak nechcete aby bolo vaše meno a číslo účtu zverejnené v\nzozname darcov.<br> Ak nezaškrtnete, vaše meno bude zaznamenané ako užívateľ ID %1"
 
 #: ../user/donations.php:324
 msgid "To assign the donation with your user ID, please log in."
-msgstr ""
+msgstr "Prosím, prihláste sa ak chcete priradiť dar k vášmu užívateľskému ID."
 
 #: ../user/donations.php:328
 msgid "Proceed"
-msgstr ""
+msgstr "Pokračovať"
 
 #: ../user/donations.php:329
 msgid "Donations are accepted through"
-msgstr ""
+msgstr "Príspevky sú príjmané z"
 
 #: ../user/download_network.php:25
 msgid "Download BOINC add-on software"
-msgstr ""
+msgstr "Stiahnuť prídavky BOINC"
 
 #: ../user/download_network.php:28
 msgid "You can download applications in several categories."
-msgstr ""
+msgstr "Môžete stiahnuť aplikácie v rôznych kategóriách."
 
 #: ../user/download_network.php:31
 msgid ""
 "These applications are not endorsed by %1 and you use them at your own risk."
-msgstr ""
+msgstr "Tieto aplikácie nie sú overené %1 a ich použitie je na vlastné riziko."
 
 #: ../user/download_network.php:33
 msgid ""
 "We do not provide instructions for installing these applications.\n"
-"However, the author may have provided some help on installing or "
-"uninstalling the application. \n"
+"However, the author may have provided some help on installing or uninstalling the application. \n"
 "If this is not enough you should contact the author."
-msgstr ""
+msgstr "Neposkytujeme inštrukcie ako nainštalovať tieto aplikácie.\nNo, autor mohol poskytnúť návod ako nainštalovať alebo odinštalovať tieto aplikácie.\nAk je tá informácia nedostatočná, prosím, kontaktujte autora."
 
 #: ../user/download_network.php:36
 msgid "Instructions for installing and running BOINC are %1here%2."
-msgstr ""
+msgstr "Návod ako nainštalovať a používať BOINC nájdete %1tu%2."
 
 #: ../user/download_network.php:38
 msgid "This list is managed centrally at %1the BOINC website%2."
-msgstr ""
+msgstr "Tento zoznam sa centrálne spravuje na %1stránke BOINC%2."
 
 #: ../user/edit_email_action.php:31
 msgid "Change email address of account"
-msgstr ""
+msgstr "Zmeniť mailovú adresu konta"
 
 #: ../user/edit_email_action.php:34 ../user/edit_email_action.php:36
 msgid "New email address '%1' is invalid."
-msgstr ""
+msgstr "Nová mailová adresa %1 je nesprávna."
 
 #: ../user/edit_email_action.php:38
 msgid "New email address is same as existing address. Nothing is changed."
-msgstr ""
+msgstr "Nová mailová adresa je rovnaká ako pôvodná. Neprebehla žiadna zmena."
 
 #: ../user/edit_email_action.php:42
 msgid "There's already an account with that email address"
-msgstr ""
+msgstr "Konto s touto mailovou adresou už existuje"
 
 #: ../user/edit_email_action.php:54
 msgid "Invalid password."
-msgstr ""
+msgstr "Nesprávne heslo"
 
 #: ../user/edit_email_action.php:62
 msgid "The email address of your account is now %1."
-msgstr ""
+msgstr "Mailová adresa vášho účtu je odteraz %1."
 
 #: ../user/edit_email_action.php:64
 msgid "Please %1validate this email address%2."
-msgstr ""
+msgstr "Prosím, %1potvrďte túto mailovú adresu%2."
 
 #: ../user/edit_email_action.php:67
 msgid ""
 "We can't update your email address due to a database problem.  Please try "
 "again later."
-msgstr ""
+msgstr "Momentálne nemôžeme aktualizovať vašu mailovú adresu kvôli problémom s databázou. Prosím, skúste to neskor."
 
 #: ../user/edit_email_form.php:27 ../user/edit_email_form.php:51
 msgid "Change email address"
-msgstr ""
+msgstr "Zmeniť mailovú adresu"
 
 #: ../user/edit_email_form.php:36
 msgid "Change the email address of your account"
-msgstr ""
+msgstr "Zmeniť mailovú adresu vášho účtu."
 
 #: ../user/edit_email_form.php:37
 msgid "New email address"
-msgstr ""
+msgstr "Nová mailová adresa"
 
 #: ../user/edit_email_form.php:38
 msgid "Must be a valid address of the form 'name at domain'"
-msgstr ""
+msgstr "Adresa musí byť v správnom formáte, \"meno at doména\""
 
 #: ../user/edit_email_form.php:48
 msgid "No password?"
-msgstr ""
+msgstr "Žiadne heslo?"
 
 #: ../user/edit_forum_preferences_action.php:33
 msgid "Confirm reset"
-msgstr ""
+msgstr "Potvrďte reset"
 
 #: ../user/edit_forum_preferences_action.php:34
 msgid ""
 "This action will erase any changes you have made in your community "
 "preferences. To cancel, click your browser's Back button."
-msgstr ""
+msgstr "Týmto zrušíte všetky zmeny, ktoré ste vykonali v preferenciách komunity. Ak si to neželáte, kliknite na tlačidlo späť na vašom prehliadači."
 
 #: ../user/edit_forum_preferences_action.php:38
 msgid "Reset preferences"
-msgstr ""
+msgstr "Reset preferencií"
 
-#: ../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 ""
+msgstr "Chyba: Vybraný nesprávny formát súboru, podporovaný formát je len PNG alebo 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 ""
+msgstr "Váš podpis je príliš dlhý, prosím použite najviac 250 znakov."
 
-#: ../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 ""
+msgstr "Užívateľ %1 neexistuje"
 
-#: ../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 ""
+msgstr "Akým spôsobom si želáte byť informovaný o nových správach, žiadostiach o priateľstvo, správach v sledovaných témach a iných udalostiach?"
 
-#: ../user/edit_forum_preferences_form.php:57
+#: ../user/edit_forum_preferences_form.php:46
 msgid "On my Account page (no email)"
-msgstr ""
+msgstr "Na stránke môjho profilu (bez mailu)"
 
-#: ../user/edit_forum_preferences_form.php:58
+#: ../user/edit_forum_preferences_form.php:47
 msgid "Immediately, by email"
-msgstr ""
+msgstr "Okamžite, mailom"
 
-#: ../user/edit_forum_preferences_form.php:59
+#: ../user/edit_forum_preferences_form.php:48
 msgid "In a single daily email"
-msgstr ""
+msgstr "Raz denne mailom"
 
-#: ../user/edit_forum_preferences_form.php:75
+#: ../user/edit_forum_preferences_form.php:65
 msgid "Message-board identity"
 msgstr "Identita na nástenka"
 
-#: ../user/edit_forum_preferences_form.php:76
+#: ../user/edit_forum_preferences_form.php:66
 msgid "Avatar"
-msgstr ""
+msgstr "Obrázok"
 
-#: ../user/edit_forum_preferences_form.php:77
+#: ../user/edit_forum_preferences_form.php:67
 msgid "An image representing you on the message boards."
-msgstr ""
+msgstr "Obrázok, ktorý vás reprezentuje na nástenkách."
 
-#: ../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 ""
+msgstr "Format JPG alebo PNG, maximum 4 KB, 100x100 pixelov"
 
-#: ../user/edit_forum_preferences_form.php:80
+#: ../user/edit_forum_preferences_form.php:70
 msgid "Don't use an avatar"
-msgstr ""
+msgstr "Nepoužívať obrázok"
 
-#: ../user/edit_forum_preferences_form.php:82
+#: ../user/edit_forum_preferences_form.php:72
 msgid "Use a Globally Recognized Avatar provided by %1"
-msgstr ""
+msgstr "Použiť globálne uznávaného avatara od %1"
 
-#: ../user/edit_forum_preferences_form.php:84
+#: ../user/edit_forum_preferences_form.php:74
 msgid "Use this uploaded avatar:"
-msgstr ""
+msgstr "Použiť tohoto nahraného avatara:"
 
-#: ../user/edit_forum_preferences_form.php:87
+#: ../user/edit_forum_preferences_form.php:77
 msgid "Avatar preview"
-msgstr ""
+msgstr "Náhľad na avatara:"
 
-#: ../user/edit_forum_preferences_form.php:87
+#: ../user/edit_forum_preferences_form.php:77
 msgid "This is how your avatar will look"
-msgstr ""
+msgstr "Takto bude váš avatar vyzerať"
 
-#: ../user/edit_forum_preferences_form.php:96
+#: ../user/edit_forum_preferences_form.php:86
 msgid "Signature for message board posts"
-msgstr ""
+msgstr "Podpis na správy na nástenku"
 
-#: ../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 ""
-
-#: ../user/edit_forum_preferences_form.php:104
-msgid "characters remaining"
-msgstr ""
+msgstr "Pozrite si %1rôzne bezplatné služby%2\n<br> poskytovanie dynamických \"obrázkových podpisov\"\n<br> zobrazovanie aktuálnych údajov o kreditoch, projektoch atď."
 
-#: ../user/edit_forum_preferences_form.php:105
+#: ../user/edit_forum_preferences_form.php:93
 msgid "Attach signature by default"
-msgstr ""
+msgstr "Vždy pripojiť podpis"
 
-#: ../user/edit_forum_preferences_form.php:108
+#: ../user/edit_forum_preferences_form.php:96
 msgid "Signature preview"
-msgstr ""
+msgstr "Náhľad na podpis"
 
-#: ../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 ""
+msgstr "Takto bude vyzerať váš podpis na fórach"
 
-#: ../user/edit_forum_preferences_form.php:127
+#: ../user/edit_forum_preferences_form.php:115
 msgid "Message display"
 msgstr "Zobrazenie správy"
 
-#: ../user/edit_forum_preferences_form.php:129
+#: ../user/edit_forum_preferences_form.php:117
 msgid "What to display"
-msgstr ""
+msgstr "Čo zobraziť"
 
-#: ../user/edit_forum_preferences_form.php:130
+#: ../user/edit_forum_preferences_form.php:118
 msgid "Hide avatar images"
-msgstr ""
+msgstr "Skryť obrázky avatarov"
 
-#: ../user/edit_forum_preferences_form.php:131
+#: ../user/edit_forum_preferences_form.php:119
 msgid "Hide signatures"
-msgstr ""
+msgstr "Skryť podpisy"
 
-#: ../user/edit_forum_preferences_form.php:132
+#: ../user/edit_forum_preferences_form.php:120
 msgid "Show images as links"
-msgstr ""
+msgstr "Zobraziť obrázky ako odkazy"
 
-#: ../user/edit_forum_preferences_form.php:133
+#: ../user/edit_forum_preferences_form.php:121
 msgid "Open links in new window/tab"
-msgstr ""
+msgstr "Otvoriť odkazy v novom okne/sekcii"
 
-#: ../user/edit_forum_preferences_form.php:134
+#: ../user/edit_forum_preferences_form.php:122
 msgid "Highlight special users"
-msgstr ""
+msgstr "Zvýrazniť špeciálnych užívateľov"
 
-#: ../user/edit_forum_preferences_form.php:135
+#: ../user/edit_forum_preferences_form.php:123
 msgid "Display this many messages per page"
-msgstr ""
+msgstr "Zobraziť až toľko správ na stránku"
 
-#: ../user/edit_forum_preferences_form.php:139
+#: ../user/edit_forum_preferences_form.php:127
 msgid "How to sort"
-msgstr ""
+msgstr "Ako zoradiť"
 
-#: ../user/edit_forum_preferences_form.php:140
+#: ../user/edit_forum_preferences_form.php:128
 msgid "Threads:"
 msgstr "Vlákna:"
 
-#: ../user/edit_forum_preferences_form.php:140
+#: ../user/edit_forum_preferences_form.php:128
 msgid "Posts:"
 msgstr "Príspevky:"
 
-#: ../user/edit_forum_preferences_form.php:141
+#: ../user/edit_forum_preferences_form.php:129
 msgid "Jump to first new post in thread automatically"
-msgstr ""
+msgstr "Preskočiť hneď k novým správam v téme automaticky."
 
-#: ../user/edit_forum_preferences_form.php:142
+#: ../user/edit_forum_preferences_form.php:130
 msgid "Don't move sticky posts to top"
-msgstr ""
+msgstr "Nepresúvať lepkavé správy navrch"
 
-#: ../user/edit_forum_preferences_form.php:148
+#: ../user/edit_forum_preferences_form.php:137
 msgid "Message filtering"
-msgstr ""
+msgstr "Filtrovanie správ"
 
-#: ../user/edit_forum_preferences_form.php:164
+#: ../user/edit_forum_preferences_form.php:153
 msgid "Filtered users"
-msgstr ""
+msgstr "Filtrovaní užívatelia"
 
-#: ../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 ""
+msgstr "Ignorovať príspevky na nástenke a súkromné správy od týchto užívateľov."
 
-#: ../user/edit_forum_preferences_form.php:167
+#: ../user/edit_forum_preferences_form.php:156
 msgid "User ID (For instance: 123456789)"
-msgstr ""
+msgstr "ID užívateľa (napríklad 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 ""
+msgstr "Pridať užívateľa do filtra"
 
-#: ../user/edit_forum_preferences_form.php:173
+#: ../user/edit_forum_preferences_form.php:162
 msgid "Click here to update preferences"
-msgstr ""
+msgstr "Kliknite sem na aktualizáciu preferencií"
 
-#: ../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 ""
+msgstr "Resetovať"
 
-#: ../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 ""
+msgstr "Alebo kliknite sem na reset preferencií na pôvodné nastavenia"
 
 #: ../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 ""
+msgstr "Nepodarilo sa aktualizovať vaše heslo kvôli problémom s databázou. Prosím, skúste to neskôr."
 
-#: ../user/edit_passwd_form.php:46
-msgid "Current password"
-msgstr ""
-
-#: ../user/edit_passwd_form.php:48
-msgid "<b>OR</b>: Account key"
-msgstr ""
+#: ../user/edit_passwd_action.php:53 ../user/edit_passwd_form.php:25
+#: ../user/edit_passwd_form.php:34
+msgid "Change password"
+msgstr "Zmeniť heslo"
 
-#: ../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 "Vaše heslo bolo zmenené"
 
-#: ../user/edit_passwd_form.php:53
+#: ../user/edit_passwd_form.php:32
 msgid "New password"
-msgstr ""
+msgstr "Nové heslo"
 
-#: ../user/edit_passwd_form.php:54
+#: ../user/edit_passwd_form.php:33
 msgid "New password, again"
-msgstr ""
+msgstr "Zopakovať nové heslo"
 
 #: ../user/edit_user_info_action.php:31
 msgid "HTML tags are not allowed in your name."
-msgstr ""
+msgstr "HTML tagy nie sú v mene povolené"
 
 #: ../user/edit_user_info_action.php:34
 msgid "You must supply a name for your account."
-msgstr ""
+msgstr "Musíte uviesť meno účtu."
 
 #: ../user/edit_user_info_action.php:58
 msgid "Couldn't update user info."
-msgstr ""
+msgstr "Nepodarilo sa aktualizovať údaje."
 
 #: ../user/edit_user_info_form.php:27
 msgid "Edit account information"
-msgstr ""
+msgstr "Upraviť údaje o účte"
 
 #: ../user/edit_user_info_form.php:32
 msgid "Name %1 real name or nickname%2"
-msgstr ""
+msgstr "Meno %1 skutočné meno alebo prezývka%2"
 
 #: ../user/edit_user_info_form.php:35
 msgid "URL %1 of your web page; optional%2"
-msgstr ""
+msgstr "URL %1 vašej stránky; nepovinné%2"
 
 #: ../user/edit_user_info_form.php:43
 msgid "Postal (ZIP) code %1 Optional%2"
-msgstr ""
+msgstr "PSČ %1 Nepovinné%2"
 
 #: ../user/edit_user_info_form.php:47
 msgid "Update info"
-msgstr ""
+msgstr "Aktualizovať údaje"
 
 #: ../user/explain_state.php:27
 msgid "Server states"
-msgstr ""
+msgstr "Stav servervu"
 
 #: ../user/explain_state.php:30
 msgid ""
 "A tasks's <b>server state</b> indicates whether the task has been sent to a "
 "computer, and if so whether the computer has finished it. Possible values "
 "are:"
-msgstr ""
+msgstr "<b>Serverový stav</b> úlohy ukazuje, či bola úloha poslaná na počítač a ak áno, či ju počítač dokončil. Možné hodnoty sú:"
 
 #: ../user/explain_state.php:35
 msgid ""
 "The task is not ready to send (for example, because its input files are "
 "unavailable)"
-msgstr ""
+msgstr "Úloha nie je pripravená na odoslanie (napríklad, pretože vstupné súbory nie sú dostupné)"
 
 #: ../user/explain_state.php:38
 msgid "The task is ready to send, but hasn't been sent yet."
-msgstr ""
+msgstr "Úloha je pripravená na odoslanie, no ešte sa tak nestalo."
 
 #: ../user/explain_state.php:40
 msgid "In Progress"
-msgstr ""
+msgstr "Prebieha"
 
 #: ../user/explain_state.php:41
 msgid "The task has been sent; waiting for completion."
-msgstr ""
+msgstr "Úloha bola odoslaná, čaká sa na dokončenie."
 
 #: ../user/explain_state.php:44
 msgid ""
 "The task has been sent to a computer and either it has timed out or the "
 "computer has reported its completion."
-msgstr ""
+msgstr "Úloha bola poslaná na počítač a buď vypršala alebo počítač ju odoslal ako dokončenú."
 
 #: ../user/explain_state.php:49
 msgid "Outcomes"
-msgstr ""
+msgstr "Výsledky"
 
 #: ../user/explain_state.php:52
 msgid ""
 "A tasks's <b>outcome</b> is defined if its server state is <b>over</b>. "
 "Possible values are:"
-msgstr ""
+msgstr "<b>Výsledok</b> úlohy je určený keď server jej stav určí ako <b>ukončené</b>. Možné hodnoty sú:"
 
 #: ../user/explain_state.php:57
 msgid ""
 "The task was sent to a computer, but the computer has not yet completed the "
 "work and reported the outcome."
-msgstr ""
+msgstr "Úloha bola poslaná na počítač, ten ale prácu ešte nedokončil a neodoslal výsledok."
 
 #: ../user/explain_state.php:60
 msgid "A computer completed and reported the task successfully."
-msgstr ""
+msgstr "Počítač dokončil a úspešne odoslal úlohu."
 
 #: ../user/explain_state.php:63
 msgid ""
 "The server wasn't able to send the task to a computer (perhaps because its "
 "resource requirements were too large)"
-msgstr ""
+msgstr "Server nebol schopný poslať úlohy na počítač (pravdepodobne sú jej požiadavky privysoké)"
 
 #: ../user/explain_state.php:65
 msgid "Client error"
-msgstr ""
+msgstr "Chyba klienta"
 
 #: ../user/explain_state.php:66
 msgid "The task was sent to a computer and an error occurred."
-msgstr ""
+msgstr "Úloha bola odoslaná počítaču, no nastala chyba."
 
 #: ../user/explain_state.php:69
 msgid ""
 "The task was sent to a computer and no reply was received within the time "
 "limit."
-msgstr ""
+msgstr "Úloha bola odoslaná na počítač, no v rámci časového limitu nebola doručená odpoveď."
 
 #: ../user/explain_state.php:72
 msgid ""
-"The task wasn't sent to a computer because enough other tasks were completed "
-"for this workunit."
-msgstr ""
+"The task wasn't sent to a computer because enough other tasks were completed"
+" for this workunit."
+msgstr "Úloha nebola poslaná na počítač, pretože dostatok iných úloh bolo dokončené na tejto jednotke."
 
 #: ../user/explain_state.php:75
 msgid ""
 "The task was reported but could not be validated, typically because the "
 "output files were lost on the server."
-msgstr ""
+msgstr "Úloha bola odoslaná ale nemohla byť overená. Pravdepodobne preto, že súbory s výsledkom boli stratené na serveri."
 
 #: ../user/explain_state.php:80
 msgid "Client states"
-msgstr ""
+msgstr "Stav klienta"
 
 #: ../user/explain_state.php:81
 msgid ""
-"A result's <b>client state</b> indicates the stage of processing at which an "
-"error occurred."
-msgstr ""
+"A result's <b>client state</b> indicates the stage of processing at which an"
+" error occurred."
+msgstr "Výsledok <b>stavu klienta</b> ukazuje fázu spracovania, kedy vznikla chyba."
 
 #: ../user/explain_state.php:86
 msgid "The computer has not yet completed the task."
-msgstr ""
+msgstr "Počítač ešte nedokončil úlohu."
 
 #: ../user/explain_state.php:89
 msgid "The computer completed the task successfully."
-msgstr ""
+msgstr "Počítač úspešne dokončil úlohu."
 
 #: ../user/explain_state.php:92
 msgid "The computer couldn't download the application or input files."
-msgstr ""
+msgstr "Počítaču sa nepodarilo stiahnuť aplikačné alebo vstupné súbory."
 
 #: ../user/explain_state.php:95
 msgid "An error occurred during computation."
-msgstr ""
+msgstr "Počas výpočtu nastala chyba."
 
 #: ../user/explain_state.php:98
 msgid "The computer couldn't upload the output files."
-msgstr ""
+msgstr "Počitaču sa nepodarilo odoslať výsledné súbory."
 
 #: ../user/explain_state.php:103
 msgid "Time reported and deadline"
-msgstr ""
+msgstr "Kedy zaznamenané a uzávierka"
 
 #: ../user/explain_state.php:106
 msgid ""
 "A task's <b>Time reported or deadline</b> field depends on whether the task "
 "has been reported yet:"
-msgstr ""
+msgstr "Pole <b>Čas odoslania alebo uzávierka</b> úlohy závisí, či bola úloha už odoslaná"
 
 #: ../user/explain_state.php:110
 msgid "Already reported"
-msgstr ""
+msgstr "Už bolo odoslané"
 
 #: ../user/explain_state.php:110
 msgid "The date/time it was reported"
-msgstr ""
+msgstr "Dátum/čas záznamu"
 
 #: ../user/explain_state.php:111
 msgid "Not reported yet, deadline in the future"
-msgstr ""
+msgstr "Ešte nezaznamenané, uzávierka v budúcnosti"
 
 #: ../user/explain_state.php:112
 msgid "Deadline, shown in green."
-msgstr ""
+msgstr "Uzávierka, zeleným"
 
 #: ../user/explain_state.php:114
 msgid "Not reported yet, deadline in the past"
-msgstr ""
+msgstr "Neodoslané, uzávierka v minulosti"
 
 #: ../user/explain_state.php:115
 msgid "Deadline, shown in red."
-msgstr ""
+msgstr "Uzávierka, červeným"
 
 #: ../user/explain_state.php:120
 msgid "Unknown field"
@@ -3373,1102 +3412,1110 @@ msgstr "Neznáme pole"
 
 #: ../user/ffmail_action.php:47
 msgid "Email preview"
-msgstr ""
+msgstr "Náhľad mailu"
 
 #: ../user/ffmail_action.php:48
 msgid "Your email will appear as follows:"
-msgstr ""
+msgstr "Váš mail bude vyzerať nasledovne:"
 
 #: ../user/ffmail_action.php:57
 msgid "Send email"
-msgstr ""
+msgstr "Poslať mail"
 
 #: ../user/ffmail_action.php:59
 msgid "Use your browser's back button to return to message form"
-msgstr ""
+msgstr "Použite tlačidlo Naspäť na vašom prehliadači na návrat k formulárom správ"
 
 #: ../user/ffmail_action.php:63
 msgid "Sending emails"
-msgstr ""
+msgstr "Posielanie mailov"
 
-#: ../user/ffmail_action.php:84
+#: ../user/ffmail_action.php:82
 msgid "email sent successfully to %1"
-msgstr ""
+msgstr "mail bol úspešne odoslaný užívateľovi %1"
 
-#: ../user/ffmail_action.php:86
+#: ../user/ffmail_action.php:84
 msgid "failed to send email to %1: %2"
-msgstr ""
+msgstr "nepodarilo sa odoslanie mailu %1: %2"
 
-#: ../user/ffmail_action.php:92
+#: ../user/ffmail_action.php:90
 msgid "Thanks for telling your friends about %1"
-msgstr ""
+msgstr "Ďakujeme za informovanie vašich priateľov o %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."
-msgstr ""
+"You forgot to enter your friends' names and/or email addresses; Please "
+"%1return to the form%2 and enter them."
+msgstr "Zabudli ste uviesť mená a/alebo mailové adresy vašich prijateľov. Prosim, %1vráťte sa do formulára%2 a uveďte ich."
 
 #: ../user/ffmail_form.php:30
 msgid ""
 "This project hasn't created an email message - please notify its "
 "administrators"
-msgstr ""
+msgstr "Tento projekt nevytvoril žiadne mailové správy. Prosím oznámte to jeho administrátorom"
 
 #: ../user/ffmail_form.php:33
 msgid "Tell your friends about %1"
-msgstr ""
+msgstr "Povedzte priateľom o %1"
 
 #: ../user/ffmail_form.php:37
 msgid "Help us by telling your friends, family and coworkers about %1"
-msgstr ""
+msgstr "Pomôžte nám a povedzte o %1 vašim priateľom, rodine a kolegom "
 
 #: ../user/ffmail_form.php:39
 msgid ""
 "Fill in this form with the names and email addresses of people you think "
 "might be interested in %1. We'll send them an email in your name, and you "
 "can add your own message if you like."
-msgstr ""
+msgstr "Vyplnte tento formulár s menami a mailovými adresami ľudí, o ktorých si myslíte, že by mali záujem o %1. Pošleme im mail vo vašom mene a vy, ak si prajete, môžete pridať aj vlastnú správu."
 
 #: ../user/ffmail_form.php:42
 msgid "Your name:"
-msgstr ""
+msgstr "Vaše meno:"
 
 #: ../user/ffmail_form.php:42
 msgid "Your email address:"
-msgstr ""
+msgstr "Vaša mailová adresa:"
 
 #: ../user/ffmail_form.php:48
 msgid "Friend's name:"
-msgstr ""
+msgstr "Meno priateľa:"
 
 #: ../user/ffmail_form.php:48
 msgid "Friend's email address:"
-msgstr ""
+msgstr "Mailová adresa priateľa:"
 
 #: ../user/ffmail_form.php:56
 msgid "Additional message (optional)"
-msgstr ""
+msgstr "Správa (nepovinné)"
 
 #: ../user/ffmail_form.php:59
 msgid "Send"
-msgstr ""
+msgstr "Odoslať"
 
-#: ../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 ""
+msgstr "Nie ste oprávnený blokovať užívateľov"
 
-#: ../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 ""
+msgstr "Hlasovanie ohľadom zablokovania"
 
-#: ../user/forum_banishment_vote.php:50
+#: ../user/forum_banishment_vote.php:52
 msgid "No user with this ID found."
-msgstr ""
+msgstr "Užívateľ so zadaným ID nebol nájdený."
 
-#: ../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 ""
+msgstr "Užívateľ je už zablokovaný"
 
-#: ../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 ""
+msgstr "Skutočne chcete zablokovať užívateľa %1?<br/>Toto zabráni %1 posielať správy na určitú dobu. Malo by sa to používať, len ak sa %1 nevie dlhodobo zmestiť do kože."
 
-#: ../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 ""
+"Select the reason category, optionally write a longer description of why the"
+" user should be banished."
+msgstr "Vyberte kategóriu dôvodu a nepovinne môžete napísať dlhší dôvod, prečo by mal byť užívateľ zablokovaný."
 
-#: ../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
-msgid "Obscene"
-msgstr ""
+msgstr "Kategória"
 
-#: ../user/forum_banishment_vote.php:65
+#: ../user/forum_banishment_vote.php:67
 #: ../user/forum_banishment_vote_action.php:59
-#: ../user/forum_moderate_post.php:56 ../user/forum_moderate_thread.php:53
-msgid "Flame/Hate mail"
-msgstr ""
+#: ../user/forum_moderate_post.php:58 ../user/forum_moderate_thread.php:58
+msgid "Obscene"
+msgstr "Obscénne"
 
-#: ../user/forum_banishment_vote.php:66
+#: ../user/forum_banishment_vote.php:68
 #: ../user/forum_banishment_vote_action.php:61
-#: ../user/forum_moderate_post.php:59
-msgid "User Request"
-msgstr ""
+#: ../user/forum_moderate_post.php:59 ../user/forum_moderate_thread.php:59
+msgid "Flame/Hate mail"
+msgstr "Nenávistný mail"
 
-#: ../user/forum_banishment_vote.php:67
+#: ../user/forum_banishment_vote.php:69
 #: ../user/forum_banishment_vote_action.php:63
-#: ../user/forum_moderate_post.php:60 ../user/forum_moderate_thread.php:55
-msgid "Other"
-msgstr "Ostatné"
+#: ../user/forum_moderate_post.php:62
+msgid "User Request"
+msgstr "Žiadosť užívateľa"
 
-#: ../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 "Dôvod"
 
-#: ../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 ""
+msgstr "Ak nie je prázdne, bude poslané"
 
-#: ../user/forum_banishment_vote.php:74
+#: ../user/forum_banishment_vote.php:77
 msgid "Proceed with vote"
-msgstr ""
+msgstr "Hlasovať"
 
-#: ../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 ""
+msgstr "Musíte špecifikovať úkon"
 
 #: ../user/forum_edit.php:41
 msgid ""
 "You can no longer edit this post.<br/>Posts can only be edited at most %1 "
 "minutes after they have been created."
-msgstr ""
+msgstr "Už nemôžete upravovať túto správu.<br/> Správy môžu byť upravované maximálne %1 minút od ich vytvorenia."
 
 #: ../user/forum_edit.php:47
 msgid "You are not authorized to edit this post."
-msgstr ""
+msgstr "Nie ste autorizovaný upravovať túto správu"
 
-#: ../user/forum_edit.php:86 ../user/forum_search.php:72
+#: ../user/forum_edit.php:86 ../user/forum_search.php:74
 msgid "Forum"
-msgstr ""
+msgstr "Fórum"
 
 #: ../user/forum_edit.php:110
 msgid "Edit your message"
 msgstr "Upraviť Vašu správu"
 
 #: ../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 ""
+msgstr "Titulok"
 
-#: ../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 ""
+msgstr "Pridať môj podpis k tejto správe"
 
-#: ../user/forum_forum.php:41
+#: ../user/forum_forum.php:46
 msgid "Not visible to you"
-msgstr ""
+msgstr "Pre vás skryté"
 
-#: ../user/forum_forum.php:80
+#: ../user/forum_forum.php:83
 msgid "Team message board for %1"
 msgstr "Tímové diskusné fórum pre %1"
 
-#: ../user/forum_forum.php:96
+#: ../user/forum_forum.php:99
 msgid "New thread"
 msgstr "Nové vlákno"
 
-#: ../user/forum_forum.php:96
+#: ../user/forum_forum.php:99
 msgid "Add a new thread to this forum"
-msgstr ""
+msgstr "Pridať novú tému do tohoto fóra"
 
-#: ../user/forum_forum.php:116
+#: ../user/forum_forum.php:119
 msgid "This message board is available as an %1RSS feed%2"
-msgstr ""
+msgstr "Táto nástenka je dostupná ako %1RSS feed%2"
 
-#: ../user/forum_forum.php:174
+#: ../user/forum_forum.php:178
 msgid "This thread is hidden"
-msgstr ""
+msgstr "Táto téma je skrytá"
 
-#: ../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 ""
+msgstr "Táto téma je lepkavá, uzamknutá a vy ste ju ešte neprečítali"
 
-#: ../user/forum_forum.php:178
+#: ../user/forum_forum.php:182
 msgid "sticky/locked/unread"
-msgstr ""
+msgstr "lepkavé/zamknuté/neprečítané"
 
-#: ../user/forum_forum.php:180
+#: ../user/forum_forum.php:184
 msgid "This thread is sticky and you haven't read it yet"
-msgstr ""
+msgstr "Táto téma je lepkavá a vy ste ju ešte neprečítali"
 
-#: ../user/forum_forum.php:180
+#: ../user/forum_forum.php:184
 msgid "sticky/unread"
-msgstr ""
+msgstr "lepkavé/neprečítané"
 
-#: ../user/forum_forum.php:184
+#: ../user/forum_forum.php:188
 msgid "You haven't read this thread yet, and it's locked"
-msgstr ""
+msgstr "Túto tému ste ešte neprečítali a je zamknutá"
 
-#: ../user/forum_forum.php:184
+#: ../user/forum_forum.php:188
 msgid "unread/locked"
-msgstr ""
+msgstr "neprečítané/zamknuté"
 
-# 81%
-#: ../user/forum_forum.php:186
+#: ../user/forum_forum.php:190
 msgid "You haven't read this thread yet"
 msgstr "Toto vlákno ste zatiaľ nečítali"
 
-#: ../user/forum_forum.php:192
+#: ../user/forum_forum.php:196
 msgid "This thread is sticky and locked"
-msgstr ""
+msgstr "Táto téma je lepkavá a zamknutá"
 
-#: ../user/forum_forum.php:192
+#: ../user/forum_forum.php:196
 msgid "sticky/locked"
-msgstr ""
+msgstr "lepkavé/zamknuté"
 
-#: ../user/forum_forum.php:194
+#: ../user/forum_forum.php:198
 msgid "This thread is sticky"
-msgstr ""
+msgstr "Táto téma je lepkavá"
 
-#: ../user/forum_forum.php:194
+#: ../user/forum_forum.php:198
 msgid "sticky"
-msgstr ""
+msgstr "lepkavá"
 
-#: ../user/forum_forum.php:198
+#: ../user/forum_forum.php:202
 msgid "This thread is locked"
-msgstr ""
+msgstr "Táto téma je uzamknutá"
 
-#: ../user/forum_forum.php:198
+#: ../user/forum_forum.php:202
 msgid "locked"
-msgstr ""
+msgstr "zamknuté"
 
-#: ../user/forum_forum.php:200
+#: ../user/forum_forum.php:204
 msgid "You read this thread"
-msgstr ""
+msgstr "Čítate túto tému"
 
-#: ../user/forum_forum.php:200
+#: ../user/forum_forum.php:204
 msgid "read"
 msgstr "prečítané"
 
-#: ../user/forum_help_desk.php:27
+#: ../user/forum_help_desk.php:29
 msgid "Questions and answers"
 msgstr "Otázky a odpovede"
 
-#: ../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 ""
+"Talk live via Skype with a volunteer, in any of several languages. Go to "
+"%1BOINC Online Help%2."
+msgstr "Hovorte naživo s dobrovoľníkmi cez Skype v jednom z mnohých jazykov. Navštívte %1BOINC Online pomoc%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 ""
+msgstr "Predmet"
 
-#: ../user/forum_help_desk.php:45
+#: ../user/forum_help_desk.php:47
 msgid "Questions"
 msgstr "Otázky"
 
-#: ../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 ""
+msgstr "Diskusia medzi členmi %1"
 
-#: ../user/forum_index.php:69
+#: ../user/forum_index.php:74
 msgid "%1 Message boards"
 msgstr "%1 Diskusné fóra"
 
-#: ../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 ""
+msgstr "Pokiaľ máte nejaké otázky alebo problémy, prosím, obráťte sa na sekciu %1Otázky a Odpovede%2 na nástenke."
 
-#: ../user/forum_index.php:123
+#: ../user/forum_index.php:128
 msgid "Subscribed threads"
-msgstr ""
+msgstr "Sledované témy"
 
-#: ../user/forum_moderate_post.php:43
+#: ../user/forum_moderate_post.php:45
 msgid "Moderate post"
 msgstr "Moderovať príspevok"
 
-#: ../user/forum_moderate_post.php:52
+#: ../user/forum_moderate_post.php:55
 msgid "Hide post"
-msgstr ""
+msgstr "Skryť správu"
 
-#: ../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 ""
+msgstr "Reklamný spam"
 
-#: ../user/forum_moderate_post.php:58
+#: ../user/forum_moderate_post.php:61
 msgid "Doublepost"
-msgstr ""
+msgstr "Dvojitá správa"
 
-#: ../user/forum_moderate_post.php:63
+#: ../user/forum_moderate_post.php:66
 msgid "Move post"
 msgstr "Presunúť príspevok"
 
-#: ../user/forum_moderate_post.php:65
+#: ../user/forum_moderate_post.php:68
 msgid "Destination thread ID:"
-msgstr ""
+msgstr "ID cieľovej témy:"
 
-#: ../user/forum_moderate_post.php:78
+#: ../user/forum_moderate_post.php:81
 msgid "Banish user"
-msgstr ""
+msgstr "Zablokovať užívateľa"
 
-#: ../user/forum_moderate_post.php:80
+#: ../user/forum_moderate_post.php:83
 msgid "Ban duration"
-msgstr ""
+msgstr "Trvanie zákazu"
 
-#: ../user/forum_moderate_post.php:81
+#: ../user/forum_moderate_post.php:84
 msgid "4 hours"
 msgstr "4 hodiny"
 
-#: ../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 deň"
 
-#: ../user/forum_moderate_post.php:83
+#: ../user/forum_moderate_post.php:86
 msgid "1 week"
-msgstr ""
+msgstr "Týžden"
 
-#: ../user/forum_moderate_post.php:84
+#: ../user/forum_moderate_post.php:87
 msgid "2 weeks"
-msgstr ""
+msgstr "2 týždne"
 
-#: ../user/forum_moderate_post.php:85
+#: ../user/forum_moderate_post.php:88
 msgid "1 month"
-msgstr ""
+msgstr "mesiac"
 
-#: ../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 ""
+msgstr "Navždy"
 
-#: ../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 ""
+msgstr "OK"
+
+#: ../user/forum_moderate_post.php:107
+msgid "Optional explanation %1 This is included in email to user.%2"
+msgstr "Nepovinné vysvetlenie %1 Toto je pridané do mailu užívateľovi.%2"
 
-#: ../user/forum_moderate_post_action.php:57
+#: ../user/forum_moderate_post_action.php:60
 msgid "You are not authorized to moderate this post."
-msgstr ""
+msgstr "Nemáte moderátorské oprávnenia na túto správu."
 
-#: ../user/forum_moderate_post_action.php:85
+#: ../user/forum_moderate_post_action.php:105
 msgid "Can't move to different category type"
-msgstr ""
+msgstr "Nie je možné presunúť do inej kategórie"
 
-#: ../user/forum_moderate_post_action.php:89
+#: ../user/forum_moderate_post_action.php:109
 msgid "Can't move to different category"
-msgstr ""
+msgstr "Nie je možné presunúť do inej kategórie"
 
-#: ../user/forum_moderate_post_action.php:110
+#: ../user/forum_moderate_post_action.php:130
 msgid "Not authorized to banish users"
-msgstr ""
+msgstr "Nemáte oprávnenie blokovať užívateľov"
 
-#: ../user/forum_moderate_post_action.php:126
+#: ../user/forum_moderate_post_action.php:146
 msgid "Banishment"
-msgstr ""
+msgstr "Blokovanie"
 
-#: ../user/forum_moderate_post_action.php:128
+#: ../user/forum_moderate_post_action.php:148
 msgid "User %1 has been banished."
-msgstr ""
+msgstr "Užívateľ %1 bol zablokovaný."
 
-#: ../user/forum_moderate_post_action.php:131
+#: ../user/forum_moderate_post_action.php:151
 msgid "Action failed: possible database problem"
-msgstr ""
+msgstr "Úkon zlyhal; možný problem s databázou"
 
-#: ../user/forum_moderate_thread.php:33
+#: ../user/forum_moderate_thread.php:38
 msgid "not authorized"
-msgstr ""
+msgstr "neautorizovaný"
 
-#: ../user/forum_moderate_thread.php:36
+#: ../user/forum_moderate_thread.php:41
 msgid "Moderate thread '%1'"
-msgstr ""
+msgstr "Moderovať tému \"%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 ""
+msgstr "Vyberte kategóriu dôvodu, alebo napíšte dlhší popis, prečo chcete skryť alebo uzamknúť túto tému a kliknite na OK."
 
-#: ../user/forum_moderate_thread.php:72
+#: ../user/forum_moderate_thread.php:78
 msgid "Current forum"
-msgstr ""
+msgstr "Aktuálne fórum"
 
-#: ../user/forum_moderate_thread.php:73
+#: ../user/forum_moderate_thread.php:79
 msgid "Destination forum"
-msgstr ""
+msgstr "Cieľové fórum"
 
-#: ../user/forum_moderate_thread.php:77
+#: ../user/forum_moderate_thread.php:83
 msgid "New title:"
-msgstr ""
+msgstr "Nový titulok"
 
-#: ../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 ""
+msgstr "Len administrátori projektu tu môžu vytvárať témy. Vy, však, môžete prispieť do existujúcich tém."
 
-#: ../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 ""
+msgstr "Vaša správa bola označená ako spam protispamovým systémom Aksimet. Prosím, pozmeňte text vašej správy a skúste to znovu."
 
-#: ../user/forum_post.php:70
+#: ../user/forum_post.php:74
 msgid "Create new thread"
-msgstr ""
+msgstr "Vytvoriť novú tému"
 
-#: ../user/forum_post.php:100
+#: ../user/forum_post.php:104
 msgid "Create a new thread"
-msgstr ""
+msgstr "Vytvoriť novú tému"
 
-#: ../user/forum_post.php:105
+#: ../user/forum_post.php:109
 msgid "Remember to add a title"
-msgstr ""
+msgstr "Nezabudnite pridať predmet"
 
-#: ../user/forum_post.php:127
+#: ../user/forum_post.php:131
 msgid "Show this item as a Notice in the BOINC Manager"
-msgstr ""
+msgstr "Zobraziť položku ako upozornenie v BOINC správcovi"
 
-#: ../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 ""
+msgstr "Robte to len s položkami, ktoré by mohli zaujímať všetkých dobrovoľníkov."
 
-#: ../user/forum_rate.php:26
+#: ../user/forum_rate.php:28
 msgid "Rating offline"
-msgstr ""
+msgstr "Hodnotenie offline"
 
-#: ../user/forum_rate.php:27
+#: ../user/forum_rate.php:29
 msgid "This function is turned off by the project"
-msgstr ""
+msgstr "Táto funkcia je v tomto projekte vypnutá"
 
-#: ../user/forum_rate.php:58
+#: ../user/forum_rate.php:60
 msgid "You need more average or total credit to rate a post."
-msgstr ""
+msgstr "Potrebujete viac celkového alebo priemerného kreditu aby ste mohli hodnotiť správu."
 
-#: ../user/forum_rate.php:62
+#: ../user/forum_rate.php:64
 msgid "You have already rated this post."
-msgstr ""
+msgstr "Túto správu ste už ohodnotili"
 
-#: ../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 ""
+msgstr "Návrat do témy"
 
-#: ../user/forum_rate.php:72
+#: ../user/forum_rate.php:74
 msgid "Input Recorded"
-msgstr ""
+msgstr "Názor zaznamenaný"
 
-#: ../user/forum_rate.php:73
+#: ../user/forum_rate.php:75
 msgid "Your input has been recorded. Thanks for your help."
-msgstr ""
+msgstr "Váš názor bol zaznamenaný. Ďakujeme."
 
-#: ../user/forum_rate.php:75
+#: ../user/forum_rate.php:77
 msgid "Vote Registered"
-msgstr ""
+msgstr "Hlas bol prijatý"
 
-#: ../user/forum_rate.php:76
+#: ../user/forum_rate.php:78
 msgid "Your rating has been recorded. Thanks for your input."
-msgstr ""
+msgstr "Váš hlas bol zaznamenaný. Ďakujeme."
 
-#: ../user/forum_rate.php:80
+#: ../user/forum_rate.php:82
 msgid "Vote Submission Problem"
-msgstr ""
+msgstr "Problém s odoslaním hlasu"
 
-#: ../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 ""
+msgstr "Vaša správa bola vyhodnotená protispamovým systémom Aksimet ako spam. Prosím, pozmeňte text správy a skúste to znovu."
 
-#: ../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 ""
+msgstr "Poslať do témy"
 
-#: ../user/forum_reply.php:137
+#: ../user/forum_reply.php:143
 msgid "Message:"
 msgstr "Správa:"
 
-#: ../user/forum_reply.php:140
+#: ../user/forum_reply.php:146
 msgid "reply to %1Message ID%2:"
-msgstr ""
+msgstr "odpovedať na správu %1ID správy%2:"
 
-#: ../user/forum_reply.php:166
+#: ../user/forum_reply.php:172
 msgid "Post reply"
-msgstr ""
+msgstr "Odpovedať"
 
-#: ../user/forum_reply.php:169
+#: ../user/forum_reply.php:175
 msgid "Add my signature to this reply"
-msgstr ""
+msgstr "Pridať môj podpis k odpovedi"
 
-#: ../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 ""
+msgstr "Potrebujete viac celkového alebo priemerného kreditu aby ste mohli reportovať správu."
 
-#: ../user/forum_report_post.php:65
+#: ../user/forum_report_post.php:68
 msgid "Report Registered"
-msgstr ""
+msgstr "Report bol zaregistrovaný."
 
-#: ../user/forum_report_post.php:66
+#: ../user/forum_report_post.php:69
 msgid "Your report has been recorded. Thanks for your input."
-msgstr ""
+msgstr "Váš report bol zaznamenaný. Ďakujeme vám."
 
-#: ../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 ""
+msgstr "Moderátor skontroluje váš report a rozhodne čo s ním. Môže to chvílu trvať, preto vás prosíme o trpezlivosť"
 
-#: ../user/forum_report_post.php:71
+#: ../user/forum_report_post.php:74
 msgid "Report a forum post"
 msgstr "Nahlásiť príspevok"
 
-#: ../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 "
+"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 ""
+msgstr "Než nahlásite túto správu, skúste radšej využiť +/- hodnotenie. Pokiaľ dostatok užívateľov ohodnotí správu negatívne, bude skrtyá.<br /> Hodnotenie môžete nájsť v spodnej časti správy."
 
-#: ../user/forum_report_post.php:80
+#: ../user/forum_report_post.php:83
 msgid "Report post"
 msgstr "Nahlásiť príspevok"
 
-#: ../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"
+"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 ""
+msgstr "Prečo považujete túto správu urážlivou? %1Prosím uveďte dostatok dôvodov, aby osoba, ktorá\nneprečítala celú konverzáciu mohla okamžite identifikovať problém.%2"
 
-#: ../user/forum_report_post.php:90
+#: ../user/forum_report_post.php:93
 msgid "Report not registered"
-msgstr ""
+msgstr "Report nebol zaregistrovaný"
 
-#: ../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 ""
+msgstr "Váš report nemohol byť zaznamenaný. Prosím, chvíľu počkajte a skúste to znovu."
 
-#: ../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 ""
+"If this is not a temporary error, please report it to the project "
+"developers."
+msgstr "Pokiaľ toto nie je dočasná chyba, obráťte sa prosím na vývojarov projektu."
 
-#: ../user/forum_rss.php:41
+#: ../user/forum_rss.php:38
 msgid "%1 RSS feed"
-msgstr ""
+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 ""
+msgstr "Táto nástenka je dostupná ako RSS feed"
 
-#: ../user/forum_rss.php:43
+#: ../user/forum_rss.php:41
 msgid "Options:"
-msgstr ""
+msgstr "Nastavenia:"
 
-#: ../user/forum_rss.php:47
+#: ../user/forum_rss.php:45
 msgid "Include only posts by user ID %1 (default: all users)."
-msgstr ""
+msgstr "Zahrnúť len správy od užívateľa s ID %1 (pôvodne: od všetkých)"
 
-#: ../user/forum_rss.php:49
+#: ../user/forum_rss.php:47
 msgid "Include only posts from the last %1 days (default: 30)."
-msgstr ""
+msgstr "Zahrnúť len správy za posledných %1 dní (pôvodne: 30)."
 
-#: ../user/forum_rss.php:51
-msgid "Truncate posts: %1 (Include only first 265 characters of each post)"
-msgstr ""
-
-#: ../user/forum_rss.php:53
+#: ../user/forum_rss.php:49
 msgid "Threads only: %1 (Include only the first post of every thread)"
-msgstr ""
+msgstr "Témy len: %1 (Zahrnúť len prvú správu v každej téme)"
 
-#: ../user/forum_search.php:27
+#: ../user/forum_search.php:29
 msgid "Forum search"
-msgstr ""
+msgstr "Prehľadávať fórum"
 
-#: ../user/forum_search.php:31
+#: ../user/forum_search.php:33
 msgid "Search query"
 msgstr "Prehľadať fóra"
 
-#: ../user/forum_search.php:32
+#: ../user/forum_search.php:34
 msgid "Search for keywords:"
 msgstr "Hľadať kľúčové slová:"
 
-#: ../user/forum_search.php:33
+#: ../user/forum_search.php:35
 msgid "Posts that contain all the specified words will be displayed"
-msgstr ""
+msgstr "Budú zobrazené správy, ktoré obsahujú všetky z uvedených slov"
 
-#: ../user/forum_search.php:35
+#: ../user/forum_search.php:37
 msgid "For example: \"screensaver freeze\""
-msgstr ""
+msgstr "Napríklad: \"mrzne šetrič obrazovky\""
 
-#: ../user/forum_search.php:36
+#: ../user/forum_search.php:38
 msgid "Search for author ID:"
 msgstr "Hľadať ID autora:"
 
-#: ../user/forum_search.php:37
+#: ../user/forum_search.php:39
 msgid "Only posts by this author will be displayed"
-msgstr ""
+msgstr "Budú zobrazené správy len od tohoto autora"
 
-#: ../user/forum_search.php:39
+#: ../user/forum_search.php:41
 msgid "For example: \"43214\""
-msgstr ""
+msgstr "Napríklad: \"43214\""
 
-#: ../user/forum_search.php:41
+#: ../user/forum_search.php:43
 msgid "Search options"
 msgstr "Možnosti vyhľadávania"
 
-#: ../user/forum_search.php:42
+#: ../user/forum_search.php:44
 msgid "Search limits"
 msgstr "Limity vyhľadávania"
 
-#: ../user/forum_search.php:43
+#: ../user/forum_search.php:45
 msgid "Search at most this many days back in time"
-msgstr ""
+msgstr "Hľadať najviac toľkoto dní dozadu"
 
-#: ../user/forum_search.php:50 ../user/forum_search.php:51
+#: ../user/forum_search.php:52 ../user/forum_search.php:53
 msgid "%1 months"
-msgstr ""
+msgstr "%1 mesiacov"
 
-#: ../user/forum_search.php:52
+#: ../user/forum_search.php:54
 msgid "1 year"
-msgstr ""
+msgstr "1 rok"
+
+#: ../user/forum_search.php:55
+msgid "no limit"
+msgstr "neobmedzene"
 
-#: ../user/forum_search.php:73
+#: ../user/forum_search.php:75
 msgid "Only display posts from this forum"
-msgstr ""
+msgstr "Zobraziť správy len z tohoto fóra"
 
-#: ../user/forum_search.php:84
+#: ../user/forum_search.php:86
 msgid "Sort by"
-msgstr ""
+msgstr "Zoradiť podľa"
 
-#: ../user/forum_search.php:88
+#: ../user/forum_search.php:90
 msgid "Start the search"
-msgstr ""
+msgstr "Začať vyhľádavanie"
 
-#: ../user/forum_search_action.php:141
+#: ../user/forum_search_action.php:143
 msgid "Forum search results"
-msgstr ""
+msgstr "Výsledky vyhľadávania fóra"
 
-#: ../user/forum_search_action.php:174
+#: ../user/forum_search_action.php:176
 msgid "Thread titles matching your query:"
-msgstr ""
+msgstr "Názvy tém zhodné s vašími požiadavkami:"
 
-#: ../user/forum_search_action.php:194
+#: ../user/forum_search_action.php:196
 msgid "Messages matching your query:"
-msgstr ""
+msgstr "Správy zhodné s vašimi požiadavkami:"
 
-#: ../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 ""
+msgstr "Je nám ľúto, ale nenašlo sa nič zhodné s vašimi požiadavkami. Môžete rozšíriť vaše požiadavky použitím menej špecifických slov alebo menšieho počtu slov."
 
-#: ../user/forum_search_action.php:219
+#: ../user/forum_search_action.php:221
 msgid "You can also %1try the same search on Google.%2"
-msgstr ""
+msgstr "Môžete skúsiť %1vyhľadať to isté aj na Google.%2"
 
-#: ../user/forum_search_action.php:224
+#: ../user/forum_search_action.php:226
 msgid "Perform another search"
-msgstr ""
+msgstr "Nové vyhľadávanie"
 
-#: ../user/forum_subscribe.php:46
+#: ../user/forum_subscribe.php:48
 msgid "Subscription successful"
-msgstr ""
+msgstr "Sledovanie nastavené úspešne"
 
-#: ../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 ""
+msgstr "Odteraz sledujete %1. Budete dostávať s každou novou správou."
 
-#: ../user/forum_subscribe.php:51
+#: ../user/forum_subscribe.php:53
 msgid "Subscription failed"
-msgstr ""
+msgstr "Sledovanie sa nepodarilo nastaviť"
 
-#: ../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 ""
+msgstr "Momentálne nie je nastavenie sledovania %1 možné. Prosím, skúste to neskôr."
 
-#: ../user/forum_subscribe.php:61
+#: ../user/forum_subscribe.php:63
 msgid "Unsubscription successful"
-msgstr ""
+msgstr "Zrušenie sledovania prebehlo úspešne"
 
-#: ../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 ""
+"You are no longer subscribed to %1. You will no longer receive notifications"
+" for this thread."
+msgstr "Prestali ste sledovať %1. Viac nebudete dostávať upozornenia o nových správach."
 
-#: ../user/forum_subscribe.php:66
+#: ../user/forum_subscribe.php:68
 msgid "Unsubscription failed"
-msgstr ""
+msgstr "Zrušenie sledovania zlyhalo."
 
-#: ../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 ""
+msgstr "Momentálne nie je možné zrušiť sledovanie %1. Prosím, skúste to znovu neskôr."
 
-#: ../user/forum_subscribe.php:74
+#: ../user/forum_subscribe.php:76
 msgid "Unknown subscription action"
-msgstr ""
+msgstr "Neznámy úkon sledovania"
 
-#: ../user/forum_thread.php:61
+#: ../user/forum_thread.php:66
 msgid "This forum is not visible to you."
-msgstr ""
+msgstr "Toto fórum je pre vás ukryté."
 
-#: ../user/forum_thread.php:69
+#: ../user/forum_thread.php:74
 msgid "This thread has been hidden by moderators."
-msgstr ""
+msgstr "Táto téma bola skrytá moderátormi"
 
-#: ../user/forum_thread.php:128
+#: ../user/forum_thread.php:129
 msgid "My question was answered"
-msgstr ""
+msgstr "Moja otázka bola zodpovedaná"
 
-#: ../user/forum_thread.php:129
+#: ../user/forum_thread.php:130
 msgid "Click here if your question has been adequately answered"
-msgstr ""
+msgstr "Kliknite sem ak vaša otázka bola vhodne zodpovedaná"
 
-#: ../user/forum_thread.php:137
+#: ../user/forum_thread.php:138
 msgid "I've also got this question"
-msgstr ""
+msgstr "Aj ja sa chcem na toto opýtať"
 
-#: ../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 ""
+msgstr "Pridať novú správu do tejto témy"
 
-#: ../user/forum_thread.php:171
+#: ../user/forum_thread.php:172
 msgid "Unsubscribe"
-msgstr ""
+msgstr "Prestať sledovať"
 
-#: ../user/forum_thread.php:172
+#: ../user/forum_thread.php:173
 msgid "You are subscribed to this thread.  Click here to unsubscribe."
-msgstr ""
+msgstr "Túto tému sledujete. Kliknite sem na zrušenie sledovania."
 
-#: ../user/forum_thread.php:178
+#: ../user/forum_thread.php:179
 msgid "Subscribe"
-msgstr ""
+msgstr "Sledovať"
 
-#: ../user/forum_thread.php:179
+#: ../user/forum_thread.php:180
 msgid "Click to get email when there are new posts in this thread"
-msgstr ""
+msgstr "Kliknite aby ste boli informovaní mailom v prípade nových správ v tejto téme"
 
-#: ../user/forum_thread.php:190
+#: ../user/forum_thread.php:191
 msgid "Unhide this thread"
-msgstr ""
+msgstr "Odkryť túto tému"
 
-#: ../user/forum_thread.php:196
+#: ../user/forum_thread.php:197
 msgid "Hide this thread"
-msgstr ""
+msgstr "Skryť túto tému"
 
-#: ../user/forum_thread.php:202
+#: ../user/forum_thread.php:203
 msgid "Make unsticky"
-msgstr ""
+msgstr "Zrušiť označenie lepkavé"
 
-#: ../user/forum_thread.php:203
+#: ../user/forum_thread.php:204
 msgid "Make this thread not sticky"
-msgstr ""
+msgstr "Zrušiť označenie lepkavé"
 
-#: ../user/forum_thread.php:208
+#: ../user/forum_thread.php:209
 msgid "Make sticky"
-msgstr ""
+msgstr "Označiť ako lepkavé"
 
-#: ../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 "Nastaviť, aby sa téma zobrazovala vždy na vrchu fóra"
 
-#: ../user/forum_thread.php:215
+#: ../user/forum_thread.php:216
 msgid "Unlock"
-msgstr ""
+msgstr "Odomknúť"
 
-#: ../user/forum_thread.php:216
-msgid "Unlock this thread"
-msgstr ""
+#: ../user/forum_thread.php:217
+msgid "Allow new posts in this thread"
+msgstr "Povoliť nové správy v tejto téme"
 
-#: ../user/forum_thread.php:221
+#: ../user/forum_thread.php:222
 msgid "Lock"
-msgstr ""
+msgstr "Zamknúť"
 
-#: ../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 "Zakázať nové správy v tejto téme"
 
-#: ../user/forum_thread.php:229
+#: ../user/forum_thread.php:230
 msgid "Move this thread to a different forum"
-msgstr ""
+msgstr "Presunúť tému do iného fóra"
 
-#: ../user/forum_thread.php:234
+#: ../user/forum_thread.php:235
 msgid "Edit title"
-msgstr ""
+msgstr "Upraviť nadpis"
 
-#: ../user/forum_thread.php:235
+#: ../user/forum_thread.php:236
 msgid "Edit thread title"
-msgstr ""
+msgstr "Upraviť názov témy"
 
-#: ../user/forum_thread.php:245
+#: ../user/forum_thread.php:244
+msgid "Delete thread permanently"
+msgstr "Zmazať tému"
+
+#: ../user/forum_thread.php:254
 msgid "Export as Notice"
-msgstr ""
+msgstr "Exportovať ako správu"
 
-#: ../user/forum_thread.php:251
+#: ../user/forum_thread.php:260
 msgid "Don't export"
-msgstr ""
+msgstr "Neexportovať"
 
-#: ../user/forum_thread.php:252
+#: ../user/forum_thread.php:261
 msgid "Don't export this news item as a Notice"
-msgstr ""
+msgstr "Neexportovať túto novinku ako Poznámku"
 
-#: ../user/forum_thread.php:260 ../user/forum_thread.php:262
+#: ../user/forum_thread.php:270 ../user/forum_thread.php:272
 msgid "Sort"
-msgstr ""
+msgstr "Zoradiť"
 
-#: ../user/forum_thread_status.php:49
+#: ../user/forum_thread_status.php:54
 msgid "Thread status updated"
-msgstr ""
+msgstr "Stav témy bol aktualizovaný"
 
-#: ../user/forum_thread_status.php:50
+#: ../user/forum_thread_status.php:55
 msgid "The status has been updated."
-msgstr ""
+msgstr "Stav bol aktualizovaný"
 
-#: ../user/forum_user_posts.php:73
+#: ../user/forum_user_posts.php:75
 msgid "Posts by %1"
 msgstr "Príspevky od %1"
 
-#: ../user/friend.php:33
+#: ../user/friend.php:35
 msgid "Already friends"
-msgstr ""
+msgstr "Už ste priatelia"
 
-#: ../user/friend.php:39
+#: ../user/friend.php:41
 msgid "You requested friendship with %1 on %2."
-msgstr ""
+msgstr "Požiadali ste %1 o priateľstvo v %2."
 
-#: ../user/friend.php:41
+#: ../user/friend.php:43
 msgid "This request is still pending confirmation."
-msgstr ""
+msgstr "Táto žiadosť stále čaká na potvrdenie."
 
-#: ../user/friend.php:52
+#: ../user/friend.php:54
 msgid "%1 is not accepting friendship requests from you"
-msgstr ""
+msgstr "%1 nepríjma žiadosti k priateľstvu od vás"
 
-#: ../user/friend.php:61
+#: ../user/friend.php:63
 msgid "You can't be friends with yourself"
-msgstr ""
+msgstr "Nie je možné sa priateliť sám so sebou"
 
-#: ../user/friend.php:69
+#: ../user/friend.php:71
 msgid "Add friend"
-msgstr ""
+msgstr "Pridať priateľa"
 
-#: ../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 ""
+"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 "Požiadali ste užívateľa menom %1 o priateľstvo. %1 dostane oznámenie a žiadosť o prijatie alebo zamietnutie priateľstva."
 
-#: ../user/friend.php:77
+#: ../user/friend.php:79
 msgid "Add an optional message here:"
-msgstr ""
+msgstr "Správa (nepovinné)"
 
-#: ../user/friend.php:115
+#: ../user/friend.php:117
 msgid "Friend request sent"
-msgstr ""
+msgstr "Žiadosť o priateľstvo bola odoslaná"
 
-#: ../user/friend.php:116
+#: ../user/friend.php:118
 msgid "We have notified %1 of your request."
-msgstr ""
+msgstr "Oboznámili sme %1 s vašou žiadosťou."
 
-#: ../user/friend.php:126
+#: ../user/friend.php:128
 msgid "Please log in as %1"
-msgstr ""
+msgstr "Prosím, prihláste sa ako %1"
 
-#: ../user/friend.php:127
+#: ../user/friend.php:129
 msgid "You must log in as %1 to view this friend request"
-msgstr ""
+msgstr "Na zobrazenie žiadosti o priateľstvo sa musíte prihlásiť ako %1"
 
-#: ../user/friend.php:138
+#: ../user/friend.php:140
 msgid "Friend request"
-msgstr ""
+msgstr "Žiadosť o priateľstvo"
 
-#: ../user/friend.php:141
+#: ../user/friend.php:143
 msgid "%1 has requested friendship with you."
-msgstr ""
+msgstr "%1 vás požiadal o priateľstvo."
 
-#: ../user/friend.php:143
+#: ../user/friend.php:145
 msgid "%1 says: %2"
-msgstr ""
+msgstr "%1 vraví: %2"
 
-#: ../user/friend.php:146
+#: ../user/friend.php:148
 msgid "Accept friendship"
-msgstr ""
+msgstr "Prijať priateľa"
 
-#: ../user/friend.php:146
+#: ../user/friend.php:148
 msgid "Click accept if %1 is in fact a friend"
-msgstr ""
+msgstr "Prijmite, ak %1 je priateľ"
 
-#: ../user/friend.php:147
+#: ../user/friend.php:149
 msgid "Decline"
-msgstr ""
+msgstr "Odmietnuť"
 
-#: ../user/friend.php:147
+#: ../user/friend.php:149
 msgid "Click decline if %1 is not a friend"
-msgstr ""
+msgstr "Odmietnite, ak %1 nie je priateľ"
 
-#: ../user/friend.php:186
+#: ../user/friend.php:188
 msgid "Friendship confirmed"
-msgstr ""
+msgstr "Priateľstvo potvrdené"
 
-#: ../user/friend.php:187
+#: ../user/friend.php:189
 msgid "Your friendship with %1 has been confirmed."
-msgstr ""
+msgstr "Priateľstvo vás a %1 bolo potvrdené."
 
-#: ../user/friend.php:205
+#: ../user/friend.php:207
 msgid "Friendship declined"
-msgstr ""
+msgstr "Priateľstvo odmietnuté"
 
-#: ../user/friend.php:206
+#: ../user/friend.php:208
 msgid "You have declined friendship with %1"
-msgstr ""
+msgstr "Odmietli ste priateľstvo s %1"
 
-#: ../user/friend.php:221
+#: ../user/friend.php:223
 msgid "Notification not found"
-msgstr ""
+msgstr "Správa nenájdená"
 
-#: ../user/friend.php:223
+#: ../user/friend.php:225
 msgid "Friend confirmed"
-msgstr ""
+msgstr "Priateľstvo bolo potvrdené"
 
-#: ../user/friend.php:224
+#: ../user/friend.php:226
 msgid "You are now friends with %1."
-msgstr ""
+msgstr "S %1 ste odteraz priatelia."
 
-#: ../user/friend.php:232
+#: ../user/friend.php:234
 msgid "Cancel friendship?"
-msgstr ""
+msgstr "Zrušiť priateľstvo?"
 
-#: ../user/friend.php:234
+#: ../user/friend.php:236
 msgid "Are you sure you want to cancel your friendship with %1?"
-msgstr ""
+msgstr "Skutočne zrušiť priateľstvo s %1?"
 
-#: ../user/friend.php:239
+#: ../user/friend.php:241
 msgid "Stay friends"
-msgstr ""
+msgstr "Ostať priateľmi"
 
-#: ../user/friend.php:249
+#: ../user/friend.php:251
 msgid "Friendship cancelled"
-msgstr ""
+msgstr "Priateľstvo zrušené"
 
-#: ../user/friend.php:250
+#: ../user/friend.php:252
 msgid "Your friendship with %1 has been cancelled."
-msgstr ""
+msgstr "Vaše priateľstvo s %1 bolo zrušené."
 
-#: ../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) 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:"
 
-#: ../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."
-msgstr ""
+msgstr "Uveďte mailovú adresu a kliknite OK. Odošleme vám na ňu inštrukcie ako si resetovať heslo."
 
 #: ../user/get_passwd.php:46
 msgid ""
 "2) If you forgot your account's email address, or you can't receive email "
 "there:"
-msgstr ""
+msgstr "2) Ak si nepamätáte vašu mailovú adresu, alebo nemôžete na ňu prijať mail:"
 
 #: ../user/get_passwd.php:47
 msgid ""
 "If you have run BOINC under this account, you can still access it. Here's "
 "how:"
-msgstr ""
+msgstr "Ak pod týmto účtom u vás beží BOINC, môžete sa naň dostať. Takto:"
 
 #: ../user/get_passwd.php:50
 msgid ""
 "Go to the BOINC data directory on your computer (its location is written to "
 "the Event Log at startup)."
-msgstr ""
+msgstr "Choďte do dátoveho adresáru BOINC na vašom počítači (jeho umiestnenie je napísané v záznamu činnosti pri štarte)."
 
 #: ../user/get_passwd.php:51
 msgid "Find your account file for this project; it will be named <b>%1</b>."
-msgstr ""
+msgstr "Nájdite súbor s vašim účtom pre tento projekt, volá sa <b>%1</b>."
 
 #: ../user/get_passwd.php:52
 msgid "Open the file in a text editor like Notepad. You'll see something like"
-msgstr ""
+msgstr "Otvorte súbor v textovom editore ako napríklad Poznámkový blok. Uvidíte niečo ako"
 
 #: ../user/get_passwd.php:62
-msgid "Select and Copy the string between %1 and %2 (%3 in the above example)."
-msgstr ""
+msgid ""
+"Select and Copy the string between %1 and %2 (%3 in the above example)."
+msgstr "Vyberte a skopírujte text medzi %1 a %2 (%3 v príklade nižšie)."
 
 #: ../user/get_passwd.php:64
 msgid "Paste the string into the field below, and click OK."
-msgstr ""
+msgstr "Skopírujte text do poľa nižšie a kliknite na OK."
 
 #: ../user/get_passwd.php:65
 msgid ""
 "You will now be logged in to your account; update the email and password of "
 "your account."
-msgstr ""
+msgstr "Ste prihlásení na váš učet, aktualizujte mailovú adresu vášho účtu."
 
 #: ../user/get_passwd.php:71
 msgid "Log in with authenticator"
-msgstr ""
+msgstr "Prihlásiť sa pomocou autentifikátora"
+
+#: ../user/get_passwd.php:81
+msgid "Forgot your account info?"
+msgstr "Zabudli ste údaje o vašom účte?"
 
-#: ../user/gpu_list.php:126 ../user/gpu_list.php:152
+#: ../user/gpu_list.php:150 ../user/gpu_list.php:176
 msgid "No GPU tasks reported"
-msgstr ""
+msgstr "Neboli zaznamenané žiadne GPU úlohy"
+
+#: ../user/gpu_list.php:206
+msgid "Top GPU models"
+msgstr "Top modely GPU"
 
-#: ../user/gpu_list.php:183
+#: ../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 ""
+"platforms.  Relative speeds, measured by average elapsed time of tasks, are "
+"shown in parentheses."
+msgstr "Nasledujúci zoznam obsahuje najproduktívnejšie modely GPU na rôznych platformách. Relatívna rýchlost, meraná priemerným časom uplynutým počas úloh, sú uvedené v zátvorkách."
 
 #: ../user/home.php:42
 msgid "Welcome to %1"
-msgstr ""
+msgstr "Vitajte v %1"
 
 #: ../user/home.php:43
 msgid "View and edit your account preferences using the links below."
-msgstr ""
+msgstr "Zobraziť a upraviť údaje o vašom účte pomocou odkazu nižšie."
 
 #: ../user/home.php:46
 msgid "If you have not already done so, %1download BOINC client software%2."
-msgstr ""
+msgstr "Pokiaľ ste tak už neurobili, %1stiahnite si klient BOINC%2."
+
+#: ../user/home.php:49 ../project.sample/project.inc:70
+msgid "Your account"
+msgstr "Váš účet"
 
 #: ../user/host_app_versions.php:37
 msgid "Anonymous platform, missing app"
-msgstr ""
+msgstr "Anonymná platforma, chýbajúca aplikácia"
 
 #: ../user/host_app_versions.php:40
 msgid "anonymous platform"
-msgstr ""
+msgstr "anonymná platforma"
 
 #: ../user/host_app_versions.php:43
 msgid "Missing app version"
-msgstr ""
+msgstr "Chýba verzia aplikácie"
 
 #: ../user/host_app_versions.php:45
 msgid "Missing app"
-msgstr ""
+msgstr "Chýbajúca aplikácia"
 
 #: ../user/host_app_versions.php:47
 msgid "Missing platform"
-msgstr ""
+msgstr "Chýbajúca platforma"
 
 #: ../user/host_app_versions.php:56
 msgid "Number of tasks completed"
-msgstr ""
+msgstr "Počet dokončených úloh"
 
 #: ../user/host_app_versions.php:57
 msgid "Max tasks per day"
-msgstr ""
+msgstr "Maximálny počet úloh za deň"
 
 #: ../user/host_app_versions.php:58
 msgid "Number of tasks today"
@@ -4476,7 +4523,7 @@ msgstr "Počet úloh za dnes"
 
 #: ../user/host_app_versions.php:59
 msgid "Consecutive valid tasks"
-msgstr ""
+msgstr "Správne úlohy za sebou"
 
 #: ../user/host_app_versions.php:63
 msgid "Average processing rate"
@@ -4484,7 +4531,7 @@ msgstr "Priemerná rýchlosť spracovania"
 
 #: ../user/host_app_versions.php:72
 msgid "Application details for host %1"
-msgstr ""
+msgstr "Detaily aplikácie pre počítač %1"
 
 #: ../user/host_delete.php:31
 msgid "We have no record of that computer."
@@ -4495,7 +4542,7 @@ msgid ""
 "You can not delete our record of this computer because our database still "
 "contains work for it. You must wait a few days until the work for this "
 "computer has been deleted from the project database."
-msgstr ""
+msgstr "Nemôžete vymazať záznam o tomto počítači, pretože v našej databázi je preň stále práca. Musíte počkať pár dni, kým sa práca pre tento počítač neodstráni z projektovej databázy."
 
 #: ../user/host_delete.php:40
 msgid "Delete record of computer"
@@ -4503,17 +4550,15 @@ msgstr "Zmazať záznam o počítači"
 
 #: ../user/host_delete.php:41
 msgid "Record deleted."
-msgstr ""
+msgstr "Záznam bol vymazaný."
 
-# 86%
-# 88%
 #: ../user/host_delete.php:42 ../user/host_edit_action.php:65
 msgid "Return to list of your computers"
 msgstr "Vrátiť sa na zoznam Vašich počítačov"
 
 #: ../user/host_edit_action.php:39
 msgid "Merge computer records"
-msgstr ""
+msgstr "Spojiť záznamy počítačov"
 
 #: ../user/host_edit_form.php:35
 msgid "Merge computers"
@@ -4521,13 +4566,13 @@ msgstr "Spojiť počítače"
 
 #: ../user/host_edit_form.php:38
 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."
+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."
 
 #: ../user/host_edit_form.php:56
 msgid "No hosts are eligible for merging with this one."
-msgstr ""
+msgstr "Žiadne počítače nie sú vhodné na spojenie s týmto."
 
 #: ../user/host_edit_form.php:58 ../user/host_edit_form.php:114
 msgid "Show details"
@@ -4536,7 +4581,7 @@ msgstr "Zobraziť detaily"
 #: ../user/host_edit_form.php:66
 msgid ""
 "Check the computers that are the same as %1 (created %2, computer ID %3):"
-msgstr ""
+msgstr "Skontrolovat zhodu s počítačom %1 (vytvorený %2, ID počítača %3):"
 
 #: ../user/host_edit_form.php:70 ../user/workunit.php:39
 msgid "name"
@@ -4558,35 +4603,39 @@ msgstr "žiaden názov počítača"
 msgid "Merge hosts"
 msgstr "Spojiť počítače"
 
-#: ../user/host_update_credit.php:28
+#: ../user/host_update_credit.php:27
 msgid "Updating computer credit"
-msgstr ""
+msgstr "Aktualizácia kreditov počítača"
+
+#: ../user/host_update_credit.php:37
+msgid "Host credit updated"
+msgstr "Kredity počítača boli aktualizované"
 
 #: ../user/host_venue_action.php:41
 msgid "Host venue updated"
-msgstr ""
+msgstr "Miesto počítača bolo aktualizované"
 
 #: ../user/host_venue_action.php:43
 msgid "none"
-msgstr ""
+msgstr "žiadne"
 
 #: ../user/host_venue_action.php:46
 msgid "The venue of this host has been set to %1."
-msgstr ""
+msgstr "Miesto počítača bolo nastavené na %1."
 
 #: ../user/host_venue_action.php:48
 msgid ""
 "This change will take effect the next time the host communicates with this "
 "project."
-msgstr ""
+msgstr "Táto zmena vojde v účinnosť pri najbližšej komunikácii počítača s projektom."
 
 #: ../user/host_venue_action.php:50
 msgid "Return to host page"
-msgstr ""
+msgstr "Návrat na stránku počítača"
 
 #: ../user/hosts_user.php:53
 msgid "Computers belonging to %1"
-msgstr ""
+msgstr "Počítače patriace do %1"
 
 #: ../user/hosts_user.php:55
 msgid "Computers hidden"
@@ -4595,39 +4644,39 @@ msgstr "Počítače skryté"
 #: ../user/hosts_user.php:56
 msgid ""
 "This user has chosen not to show information about his or her computers."
-msgstr ""
+msgstr "Užívateľ sa rozhodol nezdieľat údaje o svojich počítačoch."
 
 #: ../user/hosts_user.php:64
 msgid "Your computers"
-msgstr ""
+msgstr "Vaše počítače"
 
 #: ../user/html.php:23
 msgid "Allowed HTML tags"
-msgstr ""
+msgstr "Povolené HTML tagy"
 
 #: ../user/html.php:25
 msgid "The following HTML tags are allowed in team descriptions:"
-msgstr ""
+msgstr "Nasledovné HTML tagy sú povolené v popise tímu:"
 
 #: ../user/html.php:27
 msgid "bold"
-msgstr ""
+msgstr "hrubé"
 
 #: ../user/html.php:28
 msgid "italics"
-msgstr ""
+msgstr "kurzíva"
 
 #: ../user/html.php:29
 msgid "hyperlink"
-msgstr ""
+msgstr "hyperlink"
 
 #: ../user/html.php:30
 msgid "paragraph"
-msgstr ""
+msgstr "odsek"
 
 #: ../user/html.php:31
 msgid "break"
-msgstr ""
+msgstr "nový riadok"
 
 #: ../user/html.php:32
 msgid "preformatted"
@@ -4635,53 +4684,57 @@ msgstr "predformátované"
 
 #: ../user/html.php:33
 msgid ""
-"image; height cannot exceed 450 pixels. Please do not link to images without "
-"permission of the web site where the image is hosted."
-msgstr ""
+"image; height cannot exceed 450 pixels. Please do not link to images without"
+" permission of the web site where the image is hosted."
+msgstr "obrázok; výška nemôže presahovať 450 pixelov. Prosím, neuvádzajte odkazy na obrázky bez povolenia stránky, kde sa obrázok nachádza."
 
 #: ../user/html.php:35
 msgid "You can also use ampersand notation for special characters."
-msgstr ""
+msgstr "Môžete použiť znak \"&\" na označenie špeciálnych znakov."
+
+#: ../user/info.php:24 ../user/sample_index.php:78
+msgid "Read our rules and policies"
+msgstr "Prečítajte si naše pravidlá"
 
 #: ../user/info.php:35
 msgid "Run %1 only on authorized computers"
-msgstr ""
+msgstr "Spúšťať %1 len na oprávnených počítačoch"
 
 #: ../user/info.php:36
 msgid ""
 "Run %1 only on computers that you own, or for which you have obtained the "
 "owner's permission. Some companies and schools have policies that prohibit "
 "using their computers for projects such as %1."
-msgstr ""
+msgstr "Spúšťajte %1 len na počítačoch, ktoré vlastníte, alebo ku ktorým máte oprávnenie majiteľa. Niektoré spoločnosti alebo školy svojimi pravidlami zakazujú využívanie svojich počítačov na podobné projekty."
 
 #: ../user/info.php:38
 msgid "How %1 will use your computer"
-msgstr ""
+msgstr "Ako %1 využije váš počítač"
 
 #: ../user/info.php:39
 msgid ""
 "When you run %1 on your computer, it will use part of the computer's CPU "
 "power, disk space, and network bandwidth. You can control how much of your "
 "resources are used by %1, and when it uses them."
-msgstr ""
+msgstr "Keď na vašom počítači beží %1, používa časť procesoru, disku a siete. Môžete nastaviť, akú časť %1 používa a kedy ich používa."
 
 #: ../user/info.php:40
 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 ""
+msgstr "Práca uskutočnená na vašom počítači prispieva k cieľom %1, ako sa píše na ich stránke. Aplikačné programy sa môžu občas zmeniť."
 
 #: ../user/info.php:42
 msgid "Privacy policy"
-msgstr ""
+msgstr "Pravidlá súkromia"
 
 #: ../user/info.php:43
 msgid ""
-"Your account on %1 is identified by a name that you choose. This name may be "
-"shown on the %1 web site, along with a summary of the work your computer has "
-"done for %1. If you want to be anonymous, choose a name that doesn't reveal "
-"your identity."
-msgstr ""
+"Your account on %1 is identified by a name that you choose. This name may be"
+" shown on the %1 web site, along with a summary of the work your computer "
+"has done for %1. If you want to be anonymous, choose a name that doesn't "
+"reveal your identity."
+msgstr "Váš účet na %1 je identifikovaný menom vami zvoleným. Toto meno môže byť zobrazené na stránke %1 spolu s počítačom, ktorý vykonáva výpočty pre %1. Pokiaľ chcete byť anonymný, zvoľte si meno, ktoré vašu identitu neprezradí."
 
 #: ../user/info.php:44
 msgid ""
@@ -4690,14 +4743,14 @@ 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 ""
+msgstr "Ak sa zúčastníte %1, údaje o vašom počítači (napríklad typ procesoru, pamäť atď) bude zaznamenaná %1 a bude podľa nej rozhodovať, aký typ práce bude počítaču priradený. Táto informácia bude zobrazená aj na stránke %1. Nebude, však, zobrazené nič, čo by mohlo poukazovať na umiestnenie vášho počítača (IP adresa, doména...)."
 
 #: ../user/info.php:45
 msgid ""
-"To participate in %1, you must give an address where you receive email. This "
-"address will not be shown on the %1 web site or shared with organizations. %"
-"1 may send you periodic newsletters; however, you can opt out at any time."
-msgstr ""
+"To participate in %1, you must give an address where you receive email. This"
+" address will not be shown on the %1 web site or shared with organizations. "
+"%1 may send you periodic newsletters; however, you can opt out at any time."
+msgstr "Na účasť v %1, je nutné uviesť mailovú adresu. Táto adresa nebude zobrazená na stránkach %1 alebo iných stránkach s nimi spojenými. %1 vám môže posielať pravidelné správy, toto sa, však, dá kedykoľvek vypnúť."
 
 #: ../user/info.php:46
 msgid ""
@@ -4706,149 +4759,128 @@ 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 ""
+msgstr "Súkromné správy poslané na stránke %1 vidia len odosielateľ a adresát. %1 neskúma a ani nekontroluje obsah súkromných správ. Ak dostávate nežiadúce správy od iného užívateľa %1, môžete si ho pridať do %2filtra správ%3. Týmto nebudete viac vidiet súkromné alebo verejné správy od daného užívateľa."
 
 #: ../user/info.php:47
 msgid ""
 "If you use our web site forums you must follow the %2posting guidelines%3.  "
 "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 ""
+"members.  By posting to the forums, you are granting irrevocable license for"
+" anyone to view and copy your posts."
+msgstr "Pokiaľ používate fórum na našej stránke, musíte tak konať v súlade s %2pravidlami%3. Správy poslané na %1 fórum sú prístupné všetkým, vrátane nečlenov. Prispievaním do fóra dávate nezvratné povolenie každému na čítanie i kopírovanie vašej správy."
 
 #: ../user/info.php:48
 msgid "Is it safe to run %1?"
-msgstr ""
+msgstr "Je bezpečné spúšťať %1?"
 
 #: ../user/info.php:49
 msgid ""
 "Any time you download a program through the Internet you are taking a "
 "chance: the program might have dangerous errors, or the download server "
-"might have been hacked. %1 has made efforts to minimize these risks. We have "
-"tested our applications carefully. Our servers are behind a firewall and 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 ""
+"might have been hacked. %1 has made efforts to minimize these risks. We have"
+" tested our applications carefully. Our servers are behind a firewall and "
+"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 "Zakaždým, keď sťahujete program cez internet, riskujete, že program môže mať nebezpečné chyby, alebo že server bol hacknuý. %1 podniklo kroky na minimalizáciu týchto rizík. Naše aplikácie boli starostlivo otestované, naše servery sú za firewallom a nastavené na najvyššiu bezpečnosť. Na zaručenie integrity programov, všetky súbory boli digitálne podpísané na počítači bez pripojenia k internetu."
 
 #: ../user/info.php:50
 msgid ""
 "The applications run by %1 may cause some computers to overheat. If this "
 "happens, stop running %1 or use a %2utility program%3 that limits CPU usage."
-msgstr ""
+msgstr "Aplikácie, ktoré %1 spúšťa, môžu sposobiť pri niektorých počítačoch prehriatie. Ak sa tak stane, vypnite %1 alebo použite %2aplikáciu%3 na obmedzenie využitia procesoru."
 
 #: ../user/info.php:51
 msgid ""
 "%1 was developed by %2. BOINC was developed at the University of California."
-msgstr ""
+msgstr "%1 vyvinuli v zariadení %2. BOINC bol vyvinutý v Kalifornskej Univerzite"
 
 #: ../user/info.php:53
 msgid "Liability"
-msgstr ""
+msgstr "Zodpovednosť"
 
 #: ../user/info.php:54
 msgid ""
 "%1 and %2 assume no liability for damage to your computer, loss of data, or "
-"any other event or condition that may occur as a result of participating in %"
-"1."
-msgstr ""
+"any other event or condition that may occur as a result of participating in "
+"%1."
+msgstr "%1 a %2 nenesú žiadnu zodpovednosť za škody na zariadení alebo stratu dát alebo iné situácie, ktoré môžu vzniknúť zúčastnením sa v %1."
 
 #: ../user/info.php:56
 msgid "Other BOINC projects"
-msgstr ""
+msgstr "Iné BOINC projekty"
 
 #: ../user/info.php:57
 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 "
+"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 ""
+msgstr "Iné projekty používajú rovnakú platformu, BOINC, ako aj %1. Môžete sa zúčastniť aj jedného z tých projektov. V takom prípade bude váš počítač prispievať, aj pokiaľ preň %1 nebude mať žiadnu prácu."
 
 #: ../user/info.php:58
 msgid ""
 "These other projects are not associated with %1, and we cannot vouch for "
 "their security practices or the nature of their research. Join them at your "
 "own risk."
-msgstr ""
+msgstr "Tieto projekty nie sú spojené s %1 a my nemôžeme ručiť za ich bezpečnostné praktiky, alebo za ich výskum. Pridajte sa len na vlastné riziko."
 
 #: ../user/language_select.php:47
 msgid "Language selection"
-msgstr ""
+msgstr "Výber jazyka"
 
 #: ../user/language_select.php:73
 msgid ""
 "This web site is available in several languages. The currently selected "
 "language is %1."
-msgstr ""
+msgstr "Táto stránka je dostupná vo viacerých jazykoch. Momentálne je vybraný jazyk %1."
 
 #: ../user/language_select.php:78
 msgid ""
 "Normally the choice of language is determined by your browser's language "
 "setting, which is: %1.  You can change this setting using:"
-msgstr ""
+msgstr "Obyčajne sa jazyk určí nastavením vášho prehliadača, v tomto prípade je to %1. Toto nastavenie môžete zmeniť nasledovne:"
 
 #: ../user/language_select.php:83
 msgid "Firefox: Tools/Options/General"
-msgstr ""
+msgstr "Firefox: Nástroje/Nastavenia/Všeobecné"
 
 #: ../user/language_select.php:85
 msgid "Microsoft IE: Tools/Internet Options/Languages"
-msgstr ""
+msgstr "Microsoft IE: Nástroje/Nastavenia Internetu/Jazyky"
 
 #: ../user/language_select.php:89
 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 ""
-
-#: ../user/language_select.php:95
-msgid "Language name (click to select)"
-msgstr ""
-
-#: ../user/language_select.php:97
-msgid "Use browser language setting"
-msgstr ""
-
-#: ../user/language_select.php:113
-msgid ""
-"Translations are done by volunteers.  If your native language is not here, %"
-"1you can provide a translation%2."
-msgstr ""
-
-#: ../user/login_form.php:45
-msgid "Email address:"
-msgstr ""
-
-#: ../user/login_form.php:45
-msgid "forgot email address?"
-msgstr ""
+"send your browser a cookie; make sure your browser accepts cookies from our "
+"domain."
+msgstr "Alebo, môžete vybrať jazyk kliknutím na jeden z nasledujúcich odkazov. Toto pošle vášmu prehliadaču súbor cookie, uistite sa, že váš prehliadač akceptuje súbory cookie z našich stránok."
 
-#: ../user/login_form.php:48
-msgid "Password:"
-msgstr ""
+#: ../user/language_select.php:95
+msgid "Language name (click to select)"
+msgstr "Jazyk (kliknite pre výber)"
 
-#: ../user/login_form.php:48
-msgid "forgot password?"
-msgstr ""
+#: ../user/language_select.php:97
+msgid "Use browser language setting"
+msgstr "Použit jazykové nastavenia prehliadača"
 
-#: ../user/login_form.php:51
-msgid "Stay logged in"
-msgstr ""
+#: ../user/language_select.php:113
+msgid ""
+"Translations are done by volunteers.  If your native language is not here, "
+"%1you can provide a translation%2."
+msgstr "Preklady sú robené dobrovoľníkmi. Pokiaľ tu nie je na výber váš rodný jazyk %1môžete nám pomôcť s prekladom%2."
 
-#: ../user/login_form.php:62
+#: ../user/login_form.php:57
 msgid "or %1create an account%2."
-msgstr ""
+msgstr "alebo %1vytvoriť účet%2."
 
 #: ../user/merge_by_name.php:31
 msgid "Processing %1"
-msgstr ""
+msgstr "Spracovanie %1"
 
 #: ../user/merge_by_name.php:43
 msgid "Merged %1 into %2"
-msgstr ""
+msgstr "%1 spojené do %2"
 
-# 86%
 #: ../user/merge_by_name.php:72
 msgid "Return to the list of your computers"
 msgstr "Vrátiť sa na zoznam Vašich počítačov"
@@ -4861,11 +4893,11 @@ msgid ""
 "        having that name with the newest computer having that name.\n"
 "        Incompatible computers will not be merged.\n"
 "        <p>"
-msgstr ""
+msgstr "Táto operácia spojí počítače na základe ich doménového mena.\n<p>\nSpojí staré počítače do nového podľa ich doménového mena.\nNekompatibilné počítače nebudú spojené.\n<p>"
 
 #: ../user/merge_by_name.php:82
 msgid "Go ahead and do this"
-msgstr ""
+msgstr "Vyskúšajte to"
 
 #: ../user/merge_by_name.php:83
 msgid "Return to the list of computers"
@@ -4877,7 +4909,7 @@ msgid ""
 "To maximize discussion and flow of information,\n"
 "our message boards are moderated.\n"
 "Message board postings are subject to the following posting rules:\n"
-msgstr ""
+msgstr "\nPre maximum diskusií a informačného toku,\nsú naše fóra moderované.\nNástenky sú podriadené nasledovným pravidlám:\n"
 
 #: ../user/moderation.php:30
 msgid ""
@@ -4886,8 +4918,7 @@ msgid ""
 "Moderators may delete posts that violate any of these rules.\n"
 "The authors of deleted posts will be notified via email.\n"
 "Gross offenders may have their ability to post messages temporarily revoked\n"
-"(though to prevent abuse only project administrators have the ability to do "
-"so).\n"
+"(though to prevent abuse only project administrators have the ability to do so).\n"
 "Additional kinds of bad behavior (\"bugging\" posts to trap the\n"
 "IP addresses of other participants, excessive thread creation to spam\n"
 "the forums, etc.), while not listed in the formal rules, may still\n"
@@ -4916,23 +4947,23 @@ msgid ""
 "This moderation policy is set by the %1 project.\n"
 "If you have comments about the policy, email %2.\n"
 "\n"
-msgstr ""
+msgstr "\n<p>\nModerátori sú opravnení zmazať správy porušujúce tieto pravidlá.\nAutori nevhodných správ sú upovedomení o zmazaní spravy mailom.\nZa hrubé porušenie môže byť odosielanie správ u autora dočasne zablokované (na zabránenie zneužitia tak môžu učiniť len Administrátori projektu).\nĎalšie porušovania pravidiel (ako je buggovanie, spamovanie atď) môže byť postihnuté podobným \nspôsobom.\n<p>\nAk si myslíte, že správa porušuje nejaké z pravidiel, kliknite na červené X na správe a [...]
 
 #: ../user/pending.php:66
 msgid "Pending credit"
-msgstr ""
+msgstr "Čakajúci kredit"
 
 #: ../user/pending.php:68
 msgid "Result ID"
-msgstr ""
+msgstr "ID výsledku"
 
 #: ../user/pending.php:68
 msgid "Workunit ID"
-msgstr ""
+msgstr "ID Pracovnej jednotky"
 
 #: ../user/pending.php:68
 msgid "Host ID"
-msgstr ""
+msgstr "ID počítača"
 
 #: ../user/pending.php:68
 msgid "Claimed credit"
@@ -4940,437 +4971,352 @@ msgstr "Získaný kredit"
 
 #: ../user/pending.php:81
 msgid "Pending credit: %1"
-msgstr ""
+msgstr "Čakajúci kredit: %1"
 
 #: ../user/pm.php:32
 msgid "Block messages from this user"
-msgstr ""
+msgstr "Blokovať správy od tohoto užívateľa"
 
 #: ../user/pm.php:32
 msgid "Block user"
-msgstr ""
+msgstr "Zablokovať užívateľa"
 
 #: ../user/pm.php:73
 msgid "Your message has been sent."
-msgstr ""
+msgstr "Vaša správa bola odoslaná."
 
 #: ../user/pm.php:83
 msgid "You have no private messages."
-msgstr ""
+msgstr "Nemáte žiadne súkromné správy."
 
 #: ../user/pm.php:90
 msgid "Sender and date"
-msgstr ""
+msgstr "Odosielateľ a dátum"
 
-# 76%
-#: ../user/pm.php:106
+#: ../user/pm.php:111
 msgid "Reply to this message"
 msgstr "Odpovedať na túto správu"
 
-#: ../user/pm.php:107
+#: ../user/pm.php:112
 msgid "Delete this message"
 msgstr "Zmazať túto správu"
 
-#: ../user/pm.php:112
+#: ../user/pm.php:117
 msgid "Select all"
-msgstr ""
+msgstr "Vybrať všetko"
 
-#: ../user/pm.php:114
+#: ../user/pm.php:119
 msgid "Unselect all"
-msgstr ""
+msgstr "Nevybrať nič"
 
-#: ../user/pm.php:117
+#: ../user/pm.php:122
 msgid "Delete selected messages"
-msgstr ""
+msgstr "Zmazať vybrané správy"
 
-#: ../user/pm.php:140
+#: ../user/pm.php:145
 msgid "Sender"
-msgstr ""
+msgstr "Odosielateľ"
 
-#: ../user/pm.php:143
+#: ../user/pm.php:148
 msgid "Date"
-msgstr ""
+msgstr "Dátum"
 
-#: ../user/pm.php:185
+#: ../user/pm.php:190
 msgid "You need to fill all fields to send a private message"
-msgstr ""
+msgstr "Je potrebné vyplniť všetky polia na poslanie súkromnej správy"
 
-#: ../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 ""
+msgstr "Vaša správa bola vyhodnotená ako spam\nprotispamovým systémom Aksimet.\nProsím, pozmeňte text vašej správy a skúste to znovu."
 
-#: ../user/pm.php:205
+#: ../user/pm.php:210
 msgid "Could not find user with id %1"
-msgstr ""
+msgstr "Nepodarilo sa nájsť užívateľa s ID %1"
 
-#: ../user/pm.php:210
+#: ../user/pm.php:215
 msgid "Could not find user with username %1"
-msgstr ""
+msgstr "Nepodarilo sa nájsť užívateľa s užívateľským menom %1"
 
-#: ../user/pm.php:212
+#: ../user/pm.php:217
 msgid "%1 is not a unique username; you will have to use user ID"
-msgstr ""
+msgstr "%1 nie je unikátne užívateľské meno; bude nutné zadať užívateľské ID"
 
-#: ../user/pm.php:217
+#: ../user/pm.php:222
 msgid "User %1 (ID: %2) is not accepting private messages from you."
-msgstr ""
+msgstr "Užívateľ %1 (ID %2) od vás nepríjma súkromné správy."
 
-#: ../user/pm.php:240 ../user/view_profile.php:26
+#: ../user/pm.php:245 ../user/view_profile.php:28
 msgid "No such user"
-msgstr ""
+msgstr "Užívateľ neexistuje"
 
-#: ../user/pm.php:242
+#: ../user/pm.php:247
 msgid "Really block %1?"
-msgstr ""
+msgstr "Naozaj chcete zablokovať %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 ""
+msgstr "Skutočne chcete zablokovať príjem súkromých správ od užívateľa %1?"
 
-#: ../user/pm.php:244
+#: ../user/pm.php:249
 msgid "Please note that you can only block a limited amount of users."
-msgstr ""
+msgstr "Prosím berte na vedomie, že zablokovať môžete len určitý počet užívateľov."
 
-#: ../user/pm.php:245
+#: ../user/pm.php:250
 msgid ""
 "Once the user has been blocked you can unblock it using forum preferences "
 "page."
-msgstr ""
+msgstr "Ak užívateľa zablokujete, je možné ho odblokovať na stránke preferencií fóra."
 
-#: ../user/pm.php:252
+#: ../user/pm.php:257
 msgid "No, cancel"
-msgstr ""
+msgstr "Nie, zrušiť"
 
-#: ../user/pm.php:260 ../user/team_admins.php:98
+#: ../user/pm.php:265 ../user/team_admins.php:100
 msgid "no such user"
-msgstr ""
+msgstr "užívateľ neexistuje"
 
-#: ../user/pm.php:263
+#: ../user/pm.php:268
 msgid "User %1 blocked"
-msgstr ""
+msgstr "Užívateľ %1 zablokovaný"
 
-#: ../user/pm.php:265
+#: ../user/pm.php:270
 msgid "User %1 has been blocked from sending you private messages."
-msgstr ""
+msgstr "Príjem správ od užívateľa %1 bol zablokovaný."
 
-#: ../user/pm.php:266
+#: ../user/pm.php:271
 msgid "To unblock, visit %1message board preferences%2"
-msgstr ""
+msgstr "Na odblokovanie, navštívte %1preferencie nástenky%2"
 
-#: ../user/pm.php:302
+#: ../user/pm.php:307
 msgid "Unknown action"
 msgstr "Neznáma činnosť"
 
-#: ../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 ""
+msgstr "Vaše preferencie boli aktualizované a vojdú\ndo účinnosti keď bude váš počítač komunikovať s %1\nalebo použijete príkaz %2Aktualizácie%3 zo správcu 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 ""
+msgstr "Vaše preferencie boli resetované na pôvodné a vojdú\ndo účinnosti keď bude váš počítač komunikovať s %1\nalebo použijete príkaz %2Aktualizácie%3 zo správcu 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 ""
+msgstr "%1 na %2"
 
-#: ../user/prefs_edit.php:110
+#: ../user/prefs_edit.php:112
 msgid "Back to preferences"
-msgstr ""
+msgstr "Naspäť na stránku preferencií"
 
-#: ../user/prefs_remove.php:45
+#: ../user/prefs_remove.php:46
 msgid "Confirm delete preferences"
-msgstr ""
+msgstr "Potvrďte vymazanie preferencií"
 
-#: ../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 ""
+msgstr "Skutočne chcete vymazať vaše separátne %1 preferencie pre %2?"
 
-#: ../user/prefs_remove.php:52
+#: ../user/prefs_remove.php:53
 msgid "Remove preferences"
-msgstr ""
+msgstr "Odobrať preferencie"
 
-#: ../user/prefs_remove.php:54
+#: ../user/prefs_remove.php:55
 msgid "Cancel"
-msgstr ""
+msgstr "Zrušiť"
+
+#: ../user/profile_menu.php:34 ../user/sample_index.php:119
+msgid "Profiles"
+msgstr "Profily"
 
-#: ../user/profile_menu.php:35
+#: ../user/profile_menu.php:37
 msgid ""
 "%1Profiles%2 let individuals share backgrounds and opinions with the %3 "
 "community."
-msgstr ""
+msgstr "%1Profily%2 umožnia jednotlivcom zdieľat údaje a názory s %3 komunitou."
 
-#: ../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 ""
+msgstr "Preskmajte rôznorodosť medzi dobrovoľníkmi a prispejte vašou prítomnosťou."
 
-#: ../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 ""
+msgstr "Pokiaľ ste tak už nespravili, môžete si %1vytvoriť vlastný profil%2!"
 
-#: ../user/profile_menu.php:42
+#: ../user/profile_menu.php:44
 msgid "User of the Day"
-msgstr ""
+msgstr "Užívateľ dňa"
 
-#: ../user/profile_menu.php:57
+#: ../user/profile_menu.php:59
 msgid "User Profile Explorer"
-msgstr ""
+msgstr "Prieskumník užívateľských profilov"
 
-#: ../user/profile_menu.php:60
+#: ../user/profile_menu.php:62
 msgid "View the %1User Picture Gallery%2."
-msgstr ""
+msgstr "Zobraziť %1Obrázkovú galériu užívateľa%2."
 
-#: ../user/profile_menu.php:61
+#: ../user/profile_menu.php:63
 msgid "Browse profiles %1by country%2."
-msgstr ""
+msgstr "Prezerať profily %1podľa krajín%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 ""
+msgstr "Prehľadávať profily %1náhodne%2, %3náhodne s obrázkami%2, alebo %4náhodne bez obrázkov%2."
 
-#: ../user/profile_menu.php:66
+#: ../user/profile_menu.php:68
 msgid "Alphabetical profile listings:"
-msgstr ""
+msgstr "Abecedný zoznam profilov:"
 
-#: ../user/profile_menu.php:72
+#: ../user/profile_menu.php:74
 msgid "Search profile text"
-msgstr ""
+msgstr "Vyhľadať text v profile"
 
-#: ../user/profile_menu.php:98
+#: ../user/profile_menu.php:100
 msgid "No profiles"
-msgstr ""
+msgstr "Žiadne profily"
 
-#: ../user/profile_menu.php:99
+#: ../user/profile_menu.php:101
 msgid "No profiles matched your query."
-msgstr ""
+msgstr "Žiadne profily nesúhlasia s vašimi požiadavkami"
 
-#: ../user/profile_rate.php:29
+#: ../user/profile_rate.php:31
 msgid "Invalid vote type:"
-msgstr ""
+msgstr "Nevhodný typ hlasu:"
 
-#: ../user/profile_rate.php:34
+#: ../user/profile_rate.php:36
 msgid "Vote Recorded"
-msgstr ""
+msgstr "Hlas zaznamenaný"
 
-#: ../user/profile_rate.php:38
+#: ../user/profile_rate.php:40
 msgid "Thank you"
-msgstr ""
+msgstr "Ďakujeme"
 
-#: ../user/profile_rate.php:41
+#: ../user/profile_rate.php:43
 msgid "Your recommendation has been recorded."
-msgstr ""
+msgstr "Vaše odporúčanie bolo zaznamenané"
 
-#: ../user/profile_rate.php:43
+#: ../user/profile_rate.php:45
 msgid "Your vote to reject this profile has been recorded."
-msgstr ""
+msgstr "Váš hlas na zamietnutie tohoto profilu bol zaznamenaný."
 
-#: ../user/profile_rate.php:46
+#: ../user/profile_rate.php:48
 msgid "Return to profile."
-msgstr ""
+msgstr "Návrat na profil."
 
-#: ../user/profile_search_action.php:36
+#: ../user/profile_search_action.php:38
 msgid "Profiles containing '%1'"
-msgstr ""
+msgstr "Profily obsahujúce \"%1\""
 
-#: ../user/profile_search_action.php:40
+#: ../user/profile_search_action.php:42
 msgid "User name"
-msgstr ""
+msgstr "Používateľské meno"
 
-#: ../user/profile_search_action.php:41
+#: ../user/profile_search_action.php:43
 msgid "Joined project"
-msgstr ""
+msgstr "Pridanie sa k projektu"
 
-#: ../user/profile_search_action.php:44
+#: ../user/profile_search_action.php:46
 msgid "Recent credit"
 msgstr "Nedávny kredit"
 
-#: ../user/profile_search_action.php:54
+#: ../user/profile_search_action.php:56
 msgid "No profiles found containing '%1'"
-msgstr ""
+msgstr "Neboli nájdené žiadne profily obsahujúce \"%1\""
 
 #: ../user/result.php:35
 msgid "Task %1"
-msgstr ""
+msgstr "Úloha %1"
 
 #: ../user/results.php:29
 msgid "This feature is turned off temporarily"
-msgstr ""
+msgstr "Táto funkcia je dočasne vypnutá"
 
 #: ../user/results.php:56
 msgid "No computer with ID %1 found"
-msgstr ""
+msgstr "Počítač s ID %1 nebol nájdený"
 
 #: ../user/results.php:63
 msgid "No access"
-msgstr ""
+msgstr "Žiaden prístup"
 
 #: ../user/results.php:69
 msgid "Missing user ID or host ID"
-msgstr ""
+msgstr "Chýba ID užívateľa alebo ID počítača"
 
 #: ../user/results.php:107
 msgid "No tasks to display"
-msgstr ""
+msgstr "Žiadne úlohy na zobrazenie"
 
-#: ../user/server_status.php:97
-msgid "Running"
-msgstr ""
+#: ../user/sample_index.php:195
+msgid "User of the day"
+msgstr "Používateľ dňa"
 
-#: ../user/server_status.php:100
+#: ../user/server_status.php:59
 msgid "Not Running"
-msgstr ""
+msgstr "Nebeží"
+
+#: ../user/server_status.php:63
+msgid "Running"
+msgstr "Beží"
 
-#: ../user/server_status.php:103
+#: ../user/server_status.php:67
 msgid "Disabled"
-msgstr ""
+msgstr "Neaktívne"
 
-#: ../user/server_status.php:231
+#: ../user/server_status.php:105
 msgid "Project status"
-msgstr ""
+msgstr "Stav projektu"
 
-#: ../user/server_status.php:233
-msgid "Server software version: %1"
-msgstr ""
+#: ../user/server_status.php:110
+msgid "Server status"
+msgstr "Stav serveru"
 
-#: ../user/server_status.php:241
+#: ../user/server_status.php:113
 msgid "Program"
-msgstr ""
+msgstr "Program"
 
-#: ../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: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 ""
+msgstr "Počítač"
 
-#: ../user/server_status.php:299
-msgid "Program is disabled"
-msgstr ""
+#: ../user/server_status.php:125
+msgid "Database schema version: "
+msgstr "Verzia schémy databázy:"
 
-#: ../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 ""
+msgstr "Stav výpočtov"
 
-#: ../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 ""
-
-#: ../user/server_status.php:411
-msgid "current GigaFLOPs"
-msgstr ""
+msgstr "Používatelia"
 
-#: ../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 ""
+msgstr "Úlohy zoradené po aplikáciach"
 
-#: ../user/server_status.php:426
-msgid "avg runtime of last 100 results in h (min-max)"
-msgstr ""
+#: ../user/server_status.php:164
+msgid "Runtime of last 100 tasks in hours: average, min, max"
+msgstr "Čas priebehu posledných 100 úloh v hodinách, priemer, min, max"
 
-#: ../user/server_status.php:427
-msgid "users in last 24h"
-msgstr ""
+#: ../user/server_status.php:165
+msgid "Users in last 24 hours"
+msgstr "Užívatelia za posledných 24 hodín"
 
 #: ../user/show_host_detail.php:40
 msgid "Computer %1"
@@ -5378,865 +5324,877 @@ msgstr "Počítač %1"
 
 #: ../user/stats.php:21
 msgid "Statistics and leaderboards"
-msgstr ""
+msgstr "Štatistiky a rebríčky"
 
-#: ../user/stats.php:28
+#: ../user/stats.php:30
 msgid "Statistics for %1"
-msgstr ""
+msgstr "Štatistiky %1"
+
+#: ../user/stats.php:32 ../user/top_users.php:117
+msgid "Top participants"
+msgstr "Top prispievatelia"
+
+#: ../user/stats.php:40 ../user/team.php:48
+msgid "Top teams"
+msgstr "Top tímy"
+
+#: ../user/stats.php:47
+msgid "Top computers"
+msgstr "Top počítače"
+
+#: ../user/stats.php:48
+msgid "GPU models"
+msgstr "Modely GPU"
 
-#: ../user/stats.php:37
+#: ../user/stats.php:49
+msgid "CPU models"
+msgstr "Modely CPU"
+
+#: ../user/stats.php:53
 msgid ""
-"More detailed statistics for %1 and other BOINC-based projects are available "
-"at several web sites:"
-msgstr ""
+"More detailed statistics for %1 and other BOINC-based projects are available"
+" at several web sites:"
+msgstr "Detailnejšie štatistiky %1 a iných BOINC projektov sú dostupné na viacerých stránkach:"
 
-#: ../user/stats.php:40
+#: ../user/stats.php:56
 msgid ""
-"You can also get your current statistics in the form of a \"signature image"
-"\":"
-msgstr ""
+"You can also get your current statistics in the form of a \"signature "
+"image\":"
+msgstr "Môžete získať vaše aktuálne štatistiky vo forme \"obrázku do podpisu\":"
 
-#: ../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 ""
+msgstr "Takisto, môžete vidieť sumár vašich osobných štatistík zo všetkých BOINC projektov; pozrite sa na vašu %1domovskú stránku%2."
 
 #: ../user/team.php:27
-msgid "%1 participants may form %2teams%3."
-msgstr ""
+msgid "Teams"
+msgstr "Tímy"
 
 #: ../user/team.php:29
+msgid "%1 participants may form %2teams%3."
+msgstr "%1 prispievateľov môže vytvoriť %2tímy%3."
+
+#: ../user/team.php:31
 msgid ""
 "You may belong to only one team. You can join or quit a team at any time."
-msgstr ""
+msgstr "Môžete byť členom len jedného tímu. Opustiť alebo sa pridať do tímu je možné kedykoľvek."
 
-#: ../user/team.php:31
+#: ../user/team.php:33
 msgid "Each team has a %1founder%2 who may:"
-msgstr ""
+msgstr "Každý tím má %1zakladateľa%2 ktorý môže:"
 
-#: ../user/team.php:33
+#: ../user/team.php:35
 msgid "access team members' email addresses"
-msgstr ""
+msgstr "prístup k mailovým adresám členov tímov"
 
-#: ../user/team.php:34
+#: ../user/team.php:36
 msgid "edit the team's name and description"
-msgstr ""
+msgstr "upraviť názov tímu a jeho popis"
 
-#: ../user/team.php:35
+#: ../user/team.php:37
 msgid "add or remove team admins"
-msgstr ""
+msgstr "pridať alebo odobrať administrátorov tímu"
 
-#: ../user/team.php:36
+#: ../user/team.php:38
 msgid "remove members from the team"
-msgstr ""
+msgstr "odobrať členov z tímu"
 
-#: ../user/team.php:37
+#: ../user/team.php:39
 msgid "disband a team if it has no members"
-msgstr ""
+msgstr "rozpustiť tím pokiaľ nemá žiadnych členov"
 
-#: ../user/team.php:40
+#: ../user/team.php:42
 msgid "To join a team, visit its team page and click %1Join this team%2."
-msgstr ""
+msgstr "Pre vstup do tímu, navštívte jeho stránku a kliknite na %1Pridať sa do tohot tímu%2."
 
-#: ../user/team.php:41 ../user/team_search.php:180
+#: ../user/team.php:43 ../user/team_search.php:201
 msgid "Find a team"
-msgstr ""
+msgstr "Nájsť tím"
 
-#: ../user/team.php:48
+#: ../user/team.php:50
 msgid "All teams"
-msgstr ""
+msgstr "Všetky tímy"
 
-#: ../user/team.php:52
+#: ../user/team.php:54
 msgid "%1 teams"
-msgstr ""
+msgstr "%1 tímov"
 
-#: ../user/team.php:58
+#: ../user/team.php:60
 msgid "Create a new team"
-msgstr ""
+msgstr "Vytvoriť nový tím"
 
-#: ../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 ""
+msgstr "Pokiaľ nenájdete tím, ktorý by bol pre vás ten pravý, môžete %1vytvoriť tím%2."
 
-#: ../user/team_admins.php:34
+#: ../user/team_admins.php:36
 msgid "Remove Team Admin status from this member"
-msgstr ""
+msgstr "Odobrať hodnosť administrátora tímu tomuto užívateľovi"
 
-#: ../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 ""
+msgstr "Pridať alebo odobrať administrátorov tímu"
 
-#: ../user/team_admins.php:41
+#: ../user/team_admins.php:43
 msgid "You can select team members as 'Team Admins'. Team Admins can:"
-msgstr ""
+msgstr "Môžete menovať členov tímu administrátormi a umožniť im:"
 
-#: ../user/team_admins.php:43
+#: ../user/team_admins.php:45
 msgid "Edit team information (name, URL, description, country)"
-msgstr ""
+msgstr "Upravovať údaje o tíme (názov, URL, popis, krajinu)"
 
-#: ../user/team_admins.php:44
+#: ../user/team_admins.php:46
 msgid "View the team's join/quit history"
-msgstr ""
+msgstr "Zobraziť kto vstúpil/vystúpil z tímu"
 
-#: ../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 ""
+"Moderate the team forum, if any (admins get email notification of moderation"
+" events and red X reports)"
+msgstr "Moderovať tímové fórum (ak existuje). Administátori budu dostávať mailové upozornenia moderovaných udalostí a reportov s červeným X"
 
-#: ../user/team_admins.php:47
+#: ../user/team_admins.php:49
 msgid "Team Admins cannot:"
-msgstr ""
+msgstr "Administrátori tímu nemôžu:"
 
-#: ../user/team_admins.php:49
+#: ../user/team_admins.php:51
 msgid "Change the team founder"
-msgstr ""
+msgstr "Zmeniť zakladateľa tímu"
 
-#: ../user/team_admins.php:50 ../user/team_manage.php:54
+#: ../user/team_admins.php:52 ../user/team_manage.php:56
 msgid "Remove members"
-msgstr ""
+msgstr "Odobrať členov"
 
-#: ../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 ""
+msgstr "Pokiaľ administrátor tímu opustí tím, nebude viac jeho administrátorom."
 
-#: ../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 ""
+msgstr "Odporúčame vybrať ako administrátorov tímu len ľudí, ktorých poznáte a ktorým dôverujete."
 
-#: ../user/team_admins.php:59
+#: ../user/team_admins.php:61
 msgid "There are currently no Team Admins"
-msgstr ""
+msgstr "Tím momentálne nemá administrátorov."
 
-#: ../user/team_admins.php:61
+#: ../user/team_admins.php:63
 msgid "Current Team Admins"
-msgstr ""
+msgstr "Aktuálni administrátori tímu"
 
-#: ../user/team_admins.php:62
+#: ../user/team_admins.php:64
 msgid "Became Team Admin on"
-msgstr ""
+msgstr "Stať sa administrátorom tímu v"
 
-#: ../user/team_admins.php:77
+#: ../user/team_admins.php:79
 msgid "Add Team Admin"
-msgstr ""
+msgstr "Pridať administrátora tímu"
 
-#: ../user/team_admins.php:78
+#: ../user/team_admins.php:80
 msgid "Email address of team member:"
-msgstr ""
+msgstr "Mailová adresa člena tímu:"
+
+#: ../user/team_admins.php:81
+msgid "Add"
+msgstr "Pridať"
 
-#: ../user/team_admins.php:90
+#: ../user/team_admins.php:92
 msgid "failed to remove admin"
-msgstr ""
+msgstr "odstránenie administrátora zlyhalo"
 
-#: ../user/team_admins.php:99
+#: ../user/team_admins.php:101
 msgid "User is not member of team"
-msgstr ""
+msgstr "Užívateľ nie je členom tímu"
 
-#: ../user/team_admins.php:101
+#: ../user/team_admins.php:103
 msgid "%1 is already an admin of %2"
-msgstr ""
+msgstr "%1 už je administrátor %2"
 
-#: ../user/team_admins.php:105
+#: ../user/team_admins.php:107
 msgid "Couldn't add admin"
-msgstr ""
+msgstr "Nepodarilo sa pridať administrátora"
 
-#: ../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 ""
+msgstr "Tím neexistuje"
 
-#: ../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 ""
+msgstr "tím neexistuje"
 
-#: ../user/team_change_founder_action.php:38
+#: ../user/team_change_founder_action.php:40
 msgid "User is not a member of %1"
-msgstr ""
+msgstr "Užívateľ nie je členom %1"
 
-#: ../user/team_change_founder_action.php:41
+#: ../user/team_change_founder_action.php:43
 msgid "Changing founder of %1"
-msgstr ""
+msgstr "Zmena zakladateľa %1"
 
-#: ../user/team_change_founder_action.php:43
+#: ../user/team_change_founder_action.php:45
 msgid "%1 is now founder of %2"
-msgstr ""
+msgstr "%1 je odteraz zakladateľ %2"
 
-#: ../user/team_change_founder_form.php:37
+#: ../user/team_change_founder_form.php:39
 msgid "Change founder of %1"
-msgstr ""
+msgstr "Zmeniť zakladateľa %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 ""
+msgstr "Člen tímu %1 požiadal o status zakladateľa tímu %2, ale tím opustil, takže žiadosť sa ruší."
 
-#: ../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 ""
+msgstr "Člen tímu %1 žiada o status zakladateľa tímu. Môže to byť preto, pretože ste tím opustili, alebo ste už dlho neboli s tímom v kontakte."
 
-#: ../user/team_change_founder_form.php:55
+#: ../user/team_change_founder_form.php:57
 msgid "decline request"
-msgstr ""
+msgstr "odmietnuť žiadosť"
 
-#: ../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 ""
+"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 "Pokiaľ žiadosť nezamietnete do %1, %2 získa možnosť považovať sa za zakladateľa.<br /><br />\nPokiaľ chcete žiadosť prijať, priraďte status zakladateľa užívateľovi %3 pomocou formuláru nižšie."
 
-#: ../user/team_change_founder_form.php:66
+#: ../user/team_change_founder_form.php:68
 msgid "No transfer request is pending."
-msgstr ""
+msgstr "Žiadna žiadosť na prenos nečaká."
 
-#: ../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 ""
+msgstr "Na priradenie statusu zakladateľa inému členovi tímu, zaškrtnite políčko vedľa jeho mena a kliknite na <strong> Zmeniť na zakladateľa</strong>."
 
-#: ../user/team_change_founder_form.php:76
+#: ../user/team_change_founder_form.php:78
 msgid "New founder?"
-msgstr ""
+msgstr "Nový zakladateľ?"
 
-#: ../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 ""
+msgstr "Zmeniť zakladateľa"
 
-#: ../user/team_change_founder_form.php:108
+#: ../user/team_change_founder_form.php:110
 msgid "There are no users to transfer team to."
-msgstr ""
+msgstr "Nie sú žiadni užívatelia, na ktorých by bolo možné presunúť tím."
 
-#: ../user/team_create_action.php:29
+#: ../user/team_create_action.php:31
 msgid "You must choose a non-blank team name"
-msgstr ""
+msgstr "Názov tímu nemôže byť prázdny"
 
-#: ../user/team_create_action.php:34
+#: ../user/team_create_action.php:36
 msgid "A team named %1 already exists - try another name"
-msgstr ""
+msgstr "Tím s názvom %1 už existuje. Skúste iný názov"
 
-#: ../user/team_create_action.php:54
+#: ../user/team_create_action.php:56
 msgid "Could not create team - please try later."
-msgstr ""
+msgstr "Nepodarilo sa vytvoriť tím. Skúste to, prosím, neskôr."
 
-#: ../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 ""
+msgstr "Vytvoriť tím"
 
-#: ../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 ""
+msgstr "Ste členom %1. Musíte %2opustiť tento tím%3 predtým ako vytvoríte nový."
 
-#: ../user/team_delta.php:65
+#: ../user/team_delta.php:66
 msgid "Not founder or admin"
-msgstr ""
+msgstr "Nie ste zakladateľ ani administrátor"
 
-#: ../user/team_delta.php:72
+#: ../user/team_delta.php:73
 msgid "Team history for %1"
-msgstr ""
+msgstr "História tímu %1"
 
-#: ../user/team_delta.php:75
+#: ../user/team_delta.php:76
 msgid "When"
-msgstr ""
+msgstr "Kedy"
 
-#: ../user/team_delta.php:76
+#: ../user/team_delta.php:77
 msgid "User"
-msgstr ""
+msgstr "Používateľ"
 
-#: ../user/team_delta.php:77
+#: ../user/team_delta.php:78
 msgid "Action"
-msgstr ""
+msgstr "Úkon"
 
-#: ../user/team_delta.php:78
+#: ../user/team_delta.php:79
 msgid "Total credit at time of action"
-msgstr ""
+msgstr "Kreditov spolu v čase úkonu"
 
-#: ../user/team_edit_action.php:53
+#: ../user/team_edit_action.php:55
 msgid "bad country"
-msgstr ""
+msgstr "nesprávna krajina"
 
-#: ../user/team_edit_action.php:59
+#: ../user/team_edit_action.php:61
 msgid "The name '%1' is being used by another team."
-msgstr ""
+msgstr "Názov %1 už používa iný tím."
 
-#: ../user/team_edit_action.php:62
+#: ../user/team_edit_action.php:64
 msgid "Must specify team name"
-msgstr ""
+msgstr "Musíte zadať názov tímu"
 
-#: ../user/team_edit_action.php:90
+#: ../user/team_edit_action.php:92
 msgid "Could not update team - please try again later."
-msgstr ""
+msgstr "Nepodarilo sa aktualizovať tím, prosím skúste to neskôr."
 
-#: ../user/team_edit_form.php:33
+#: ../user/team_edit_form.php:35
 msgid "Edit %1"
-msgstr ""
+msgstr "Upraviť %1"
 
-#: ../user/team_edit_form.php:34
+#: ../user/team_edit_form.php:36
 msgid "Update team info"
-msgstr ""
+msgstr "Aktualizovať info o tíme"
 
-#: ../user/team_email_list.php:61
+#: ../user/team_email_list.php:70
 msgid "%1 Email List"
-msgstr ""
+msgstr "%1 Zoznam mailov"
 
-#: ../user/team_email_list.php:63
+#: ../user/team_email_list.php:72
 msgid "Member list of %1"
-msgstr ""
+msgstr "Zoznam členov %1"
 
-#: ../user/team_email_list.php:78
+#: ../user/team_email_list.php:87
 msgid "Show as plain text"
-msgstr ""
+msgstr "Zobraziť ako text"
 
-#: ../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 ""
+msgstr "Vytvoriť nástenku"
 
-#: ../user/team_forum.php:29
+#: ../user/team_forum.php:31
 msgid "You may create a message board for use by %1."
-msgstr ""
+msgstr "Môžete vytvoriť nástenku pre %1."
 
-#: ../user/team_forum.php:31
+#: ../user/team_forum.php:33
 msgid "Only team members will be able to post."
-msgstr ""
+msgstr "Len členovia tímu budú môcť posielať správy."
 
-#: ../user/team_forum.php:32
+#: ../user/team_forum.php:34
 msgid "At your option, only members will be able to read."
-msgstr ""
+msgstr "Podľa vašich nastavení, čítať budú môcť len členovia."
 
-#: ../user/team_forum.php:33
+#: ../user/team_forum.php:35
 msgid "You and your Team Admins will have moderator privileges."
-msgstr ""
+msgstr "Vy a administrátori vášho tímu budete mať moderátorské práva."
 
-#: ../user/team_forum.php:40
+#: ../user/team_forum.php:42
 msgid "Create a message board for %1"
 msgstr "Vytvoriť diskusné fórum pre %1"
 
-#: ../user/team_forum.php:48
+#: ../user/team_forum.php:50
 msgid "Team already has a message board"
-msgstr ""
+msgstr "Tím už má nástenku"
 
-#: ../user/team_forum.php:59
+#: ../user/team_forum.php:61
 msgid "Team Message Board"
-msgstr ""
+msgstr "Tímová nástenka"
 
-#: ../user/team_forum.php:71
+#: ../user/team_forum.php:73
 msgid "Minimum time between posts (seconds)"
-msgstr ""
+msgstr "Minimálny čas medzi poslaním správ (v sekundách)"
 
-#: ../user/team_forum.php:74
+#: ../user/team_forum.php:76
 msgid "Minimum total credit to post"
-msgstr ""
+msgstr "Minimálny celkový počet kreditov na posielanie správ"
 
-#: ../user/team_forum.php:77
+#: ../user/team_forum.php:79
 msgid "Minimum average credit to post"
-msgstr ""
+msgstr "Minimálny priemerný počet kreditov na posielanie správ"
 
-#: ../user/team_forum.php:80
+#: ../user/team_forum.php:82
 msgid "Submit"
-msgstr ""
+msgstr "Odoslať"
 
-#: ../user/team_forum.php:89
+#: ../user/team_forum.php:91
 msgid "Remove your team's message board."
-msgstr ""
+msgstr "Odstrániť nástenku vášho tímu."
 
-#: ../user/team_forum.php:97
+#: ../user/team_forum.php:99
 msgid "Really remove message board?"
-msgstr ""
+msgstr "Skutočne odstrániť nástenku?"
 
-#: ../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 ""
+msgstr "Skutočne chcete odstrániť nástenku vášho tímu? Všetky témy a správy budú vymazané. (Neskôr však môžete vytvoriť novú nástenku.)"
 
-#: ../user/team_forum.php:100
+#: ../user/team_forum.php:102
 msgid "Yes - remove message board"
-msgstr ""
+msgstr "Áno, odstrániť nástenku."
 
-#: ../user/team_forum.php:121
+#: ../user/team_forum.php:123
 msgid "Message board removed"
-msgstr ""
+msgstr "Nástenka bola odstránená"
 
-#: ../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 ""
+"Your team's message board has been removed. You may now %1create a new "
+"one%2."
+msgstr "Nástenka vášho tímu bola odstránená. Môžete %1vytvoriť novú%2."
 
-#: ../user/team_forum.php:143
+#: ../user/team_forum.php:145
 msgid "Team Message Board Updated"
-msgstr ""
+msgstr "Tímová nástenka bola aktualizovaná."
 
-#: ../user/team_forum.php:144
+#: ../user/team_forum.php:146
 msgid "Update successful"
-msgstr ""
+msgstr "Aktualizácia bola úspešná"
 
-#: ../user/team_forum.php:147
+#: ../user/team_forum.php:149
 msgid "Update failed"
-msgstr ""
+msgstr "Aktualizácia zlyhala"
 
-#: ../user/team_forum.php:154
+#: ../user/team_forum.php:156
 msgid "Team has no forum"
 msgstr "Tím nemá vlastné 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 ""
+msgstr "Musíte byť členom tímu, aby ste mohli stránku zobraziť."
 
-#: ../user/team_founder_transfer_action.php:90
+#: ../user/team_founder_transfer_action.php:92
 msgid "Requesting foundership of %1"
-msgstr ""
+msgstr "Požiadať status zakladateľa %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 ""
+"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 "Aktuálny zakladateľ bol upovedomený o vašej žiadosti mailom a súkromnou správou..<br /><br />\nPokiaľ zakladateľ neodpovie do 60 dní, môžete prevziať zakladateľstvo."
 
-#: ../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 ""
+msgstr "Žiadať status zakladateľa nie je momentálne povolené."
 
-#: ../user/team_founder_transfer_action.php:109
+#: ../user/team_founder_transfer_action.php:111
 msgid "Assumed foundership of %1"
-msgstr ""
+msgstr "Prevzané zakladateľstvo %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 ""
+msgstr "Blahoželáme, stali ste sa zakladateľom tímu %1.\nNavštívte stránku %2Váš účet%3 a nastavenia Administrátora tímu."
 
-#: ../user/team_founder_transfer_action.php:120
+#: ../user/team_founder_transfer_action.php:122
 msgid "Decline founder change request"
-msgstr ""
+msgstr "Odmietnuť žiadosť o zmenu zakladateľa"
 
-#: ../user/team_founder_transfer_action.php:127
+#: ../user/team_founder_transfer_action.php:129
 msgid "The foundership request from %1 has been declined."
-msgstr ""
+msgstr "Žiadosť o zmenu zakladateľa od %1 bola zamietnutá."
 
-#: ../user/team_founder_transfer_action.php:130
+#: ../user/team_founder_transfer_action.php:132
 msgid "There were no foundership requests."
-msgstr ""
+msgstr "Žiadne žiadosti o zmenu zakladateľa."
 
-#: ../user/team_founder_transfer_action.php:134
+#: ../user/team_founder_transfer_action.php:136
 msgid "undefined action %1"
-msgstr ""
+msgstr "nedefinovaná činnosť %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 ""
+msgstr "Návrat k stránke tímu."
 
-#: ../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 ""
+msgstr "Musíte byť členom tímu aby ste mohli otvoriť túto stránku."
 
-#: ../user/team_founder_transfer_form.php:31
+#: ../user/team_founder_transfer_form.php:33
 msgid "Request foundership of %1"
-msgstr ""
+msgstr "Požiadať o status zakladateľa %1"
 
-#: ../user/team_founder_transfer_form.php:38
+#: ../user/team_founder_transfer_form.php:40
 msgid "You are now founder of team %1."
-msgstr ""
+msgstr "Stali ste sa zakladateľom tímu %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 ""
+msgstr "Požiadali ste o status zakladateľa %1 v %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 ""
+msgstr "Ubehlo 60 dní od odoslania vašej žiadosti a zakladateľ neodpovedal. Môžete prevziať zakladateľstvo kliknutím sem:"
 
-#: ../user/team_founder_transfer_form.php:50
+#: ../user/team_founder_transfer_form.php:52
 msgid "Assume foundership"
-msgstr ""
+msgstr "Prevziať zakladateľstvo"
 
-#: ../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 ""
+msgstr "Zakladateľ bol oboznámený s vašou žiadosťou. Ak neodpovie do 1%, bude vám umožnené stať sa zakladateľom."
 
-#: ../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"
+"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 ""
+msgstr "Ak zakladateľ tímu nie je aktívny a chcete sa stať zakladateľom, kliknite na tlačidlo nižšie. Momentálny zakladateľ dostane mail s detailami vašej žiadosti a bude mu umožnené presunúť status zakladateľa na vás alebo bude môcť vašu žiadosť zamietnuť. Ak zakladateľ neodpovie do 60 dní, bude vám umožnené stať sa zakladateľom.<br /><br />\nChcete požiadať o status zakladateľa?"
 
-#: ../user/team_founder_transfer_form.php:65
+#: ../user/team_founder_transfer_form.php:67
 msgid "Request foundership"
-msgstr ""
+msgstr "Požiadať status zakladateľ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 ""
+msgstr "Zmena zakladateľa už bola požiadaná %1 na %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 ""
+msgstr "Od poslednej žiadosti ešte neuplynulo 90 dní, nové žiadosti nie sú povolené."
 
-#: ../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 ""
+msgstr "Do tímu %1 sa nedá vstúpiť."
 
-#: ../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 ""
+msgstr "Už ste členom"
 
-#: ../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 ""
+msgstr "Už ste členom %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 ""
+msgstr "Nepodarilo sa vstúpiť do tímu, prosím skúste to neskôr."
 
-#: ../user/team_join_action.php:40
+#: ../user/team_join_action.php:42
 msgid "Joined %1"
-msgstr ""
+msgstr "Vstúpili ste do %1"
 
-#: ../user/team_join_action.php:41
+#: ../user/team_join_action.php:43
 msgid "You have joined %1."
-msgstr ""
+msgstr "Vstúpili ste do %1."
 
-#: ../user/team_join_form.php:32
+#: ../user/team_join_form.php:34
 msgid "Join %1"
-msgstr ""
+msgstr "Vstúpiť do %1"
 
-#: ../user/team_join_form.php:33
+#: ../user/team_join_form.php:35
 msgid "Please note:"
-msgstr ""
+msgstr "Prosím, pozor:"
 
-#: ../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 ""
+msgstr "Vstúpením do tímu zobrazíte zakladateľovi vašu mailovú adresu."
 
-#: ../user/team_join_form.php:36
+#: ../user/team_join_form.php:38
 msgid "Joining a team does not affect your account's credit."
-msgstr ""
+msgstr "Vstup do tímu neovplyvní vaše kredity."
 
-#: ../user/team_join_form.php:43
+#: ../user/team_join_form.php:45
 msgid "Join team"
-msgstr ""
+msgstr "Vstúpiť do tímu"
 
-#: ../user/team_lookup.php:84
+#: ../user/team_lookup.php:86
 msgid "Search Results"
-msgstr ""
+msgstr "Výsledky vyhľadávania"
 
-#: ../user/team_lookup.php:86
+#: ../user/team_lookup.php:88
 msgid "Search results for '%1'"
-msgstr ""
+msgstr "Hľadať \"%1\""
 
-#: ../user/team_lookup.php:88
+#: ../user/team_lookup.php:90
 msgid "You may view these teams' members, statistics, and information."
-msgstr ""
+msgstr "Môžete si prezrieť štatistiky a údaje členov týchto tímov."
 
-#: ../user/team_lookup.php:98
+#: ../user/team_lookup.php:100
 msgid "More than 100 teams match your search. The first 100 are shown."
-msgstr ""
+msgstr "Viac ako 100 tímov zodpovedá vášmu vyhľadávaniu. Zobrazených je len prvých 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 ""
+"End of results. %1 If you cannot find the team you are looking for, you may "
+"%2create a team%3 yourself."
+msgstr "Koniec výsledkov. %1 Ak neviete nájsť tím, ktorý by mohol byť pre vás ten pravý, môžete si %2vytvoriť vlastný tím%3."
 
-#: ../user/team_manage.php:26
+#: ../user/team_manage.php:28
 msgid "Team administration for %1"
-msgstr ""
+msgstr "Administrátor tímu %1"
 
-#: ../user/team_manage.php:29
+#: ../user/team_manage.php:31
 msgid "Edit team info"
-msgstr ""
+msgstr "Upraviť údaje o tíme"
 
-#: ../user/team_manage.php:30
+#: ../user/team_manage.php:32
 msgid "Change team name, URL, description, type, or country"
-msgstr ""
+msgstr "Zmeniť názov tímu, URL, popis, typ alebo krajinu"
 
-#: ../user/team_manage.php:32
+#: ../user/team_manage.php:34
 msgid "Member list:"
-msgstr ""
+msgstr "Zoznam členov:"
 
-#: ../user/team_manage.php:33 ../user/team_manage.php:37
+#: ../user/team_manage.php:35 ../user/team_manage.php:39
 msgid "HTML"
-msgstr ""
+msgstr "HTML"
 
-# 75%
-#: ../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 ""
+msgstr "Zobraziť mená a mailové adresy členov"
 
-#: ../user/team_manage.php:36
+#: ../user/team_manage.php:38
 msgid "View change history:"
-msgstr ""
+msgstr "Zobraziť históriu zmien:"
 
-#: ../user/team_manage.php:38
+#: ../user/team_manage.php:40
 msgid "XML"
-msgstr ""
+msgstr "XML"
 
-#: ../user/team_manage.php:39
+#: ../user/team_manage.php:41
 msgid "See when members joined or quit this team"
-msgstr ""
+msgstr "Zobraziť kedy členovia vstúpili alebo vystúpili z tímu"
 
-#: ../user/team_manage.php:50
+#: ../user/team_manage.php:52
 msgid "Respond to foundership request."
-msgstr ""
+msgstr "Odpovedať na žiadosť o status zakladateľ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 ""
+msgstr "Ak neodpoviete do %1, %2m bude môcť prevziať zakladateľstvo tímu."
 
-#: ../user/team_manage.php:55
+#: ../user/team_manage.php:57
 msgid "Remove inactive or unwanted members from this team"
-msgstr ""
+msgstr "Odstrániť neaktívnych alebo nechcených členov z tohoto tímu"
 
-#: ../user/team_manage.php:57
+#: ../user/team_manage.php:59
 msgid "Transfer foundership to another member"
-msgstr ""
+msgstr "Presunúť status zakladateľa na iného člena tímu"
 
-#: ../user/team_manage.php:58
+#: ../user/team_manage.php:60
 msgid "Add/remove Team Admins"
-msgstr ""
+msgstr "Pridať/odobrať administrátorov tímu"
 
-#: ../user/team_manage.php:59
+#: ../user/team_manage.php:61
 msgid "Give selected team members Team Admin privileges"
-msgstr ""
+msgstr "Dať vybraným členom tímu administrátorske práva"
 
-#: ../user/team_manage.php:61
+#: ../user/team_manage.php:63
 msgid "Remove team"
-msgstr ""
+msgstr "Odstrániť tím"
 
-#: ../user/team_manage.php:62
+#: ../user/team_manage.php:64
 msgid "Allowed only if team has no members"
-msgstr ""
+msgstr "Možné len pokiaľ tím nemá členov"
 
-#: ../user/team_manage.php:64
+#: ../user/team_manage.php:66
 msgid "Create or manage a team message board"
-msgstr ""
-
-#: ../user/team_manage.php:71
-msgid ""
-"To have this team created on all BOINC projects (current and future) you can "
-"make it into a %1BOINC-wide team%2."
-msgstr ""
+msgstr "Vytvoriť alebo spravovať tímovú nástenku"
 
 #: ../user/team_manage.php:73
 msgid ""
-"Team admins are encouraged to join and participate in the Google %1boinc-"
-"team-founders%2 group."
-msgstr ""
+"To have this team created on all BOINC projects (current and future) you can"
+" make it into a %1BOINC-wide team%2."
+msgstr "Aby bol tento projekt vytvorený na všetkých BOINC projektoch (existujúcich a budúcich), môžete ho vytvoriť ako %1celo-BOINC tím%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 ""
+"Team admins are encouraged to join and participate in the Google %1boinc-"
+"team-founders%2 group."
+msgstr "Odporúčame Tímovím administrátorom, aby sa pridali do skupiny %1boinc-team-founders%2 na Google."
 
 #: ../user/team_manage.php:91
 msgid "Can't delete non-empty team"
-msgstr ""
+msgstr "Nie je možné vymazať tím, ktorý má členov"
 
 #: ../user/team_manage.php:95
 msgid "Team %1 deleted"
-msgstr ""
+msgstr "Tím %1 bol zmazaný"
 
-#: ../user/team_members.php:36
+#: ../user/team_members.php:38
 msgid "Limit exceeded:  Can only display the first 1000 members."
-msgstr ""
+msgstr "Limit bol prekročený. Je možné zobraziť len prvých 1000 členov."
 
-#: ../user/team_members.php:49
+#: ../user/team_members.php:51
 msgid "Members of %1"
-msgstr ""
+msgstr "Členovia %1"
 
-#: ../user/team_quit_action.php:32
+#: ../user/team_quit_action.php:34
 msgid "Unable to quit team"
-msgstr ""
+msgstr "Nie je možné opustiť tím"
 
-#: ../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 ""
+msgstr "Tím neexistuje, alebo nie ste jeho členom."
 
-#: ../user/team_quit_form.php:31
+#: ../user/team_quit_form.php:33
 msgid "Quit %1"
-msgstr ""
+msgstr "Opustiť %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"
-"         <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"
+"         <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 ""
+msgstr "<strong>Pred opustením tímu berte, prosím, na vedomie</strong>\n<ul>\n<li>Ak opustíte tím, môžete sa doň vrátiť, alebo sa môžete pridať do akéhokoľvek iného.\n<li>Opustenie tímu neovplyvní vaše osobné štatistiky ani kredit\n</ul>"
 
-#: ../user/team_quit_form.php:40
+#: ../user/team_quit_form.php:42
 msgid "Quit Team"
-msgstr ""
+msgstr "Opustiť tím"
 
-#: ../user/team_remove_inactive_action.php:31
+#: ../user/team_remove_inactive_action.php:33
 msgid "Removing users from %1"
-msgstr ""
+msgstr "Odoberám používateľov z %1"
 
-#: ../user/team_remove_inactive_action.php:39
+#: ../user/team_remove_inactive_action.php:41
 msgid "%1 is not a member of %2"
-msgstr ""
+msgstr "%1 nie je členom %2"
 
-#: ../user/team_remove_inactive_action.php:42
+#: ../user/team_remove_inactive_action.php:44
 msgid "%1 has been removed"
-msgstr ""
+msgstr "%1 bol odstránený"
 
-#: ../user/team_remove_inactive_form.php:32
+#: ../user/team_remove_inactive_form.php:34
 msgid "Remove members from %1"
-msgstr ""
+msgstr "Odstrániť členov z %1"
 
-#: ../user/team_remove_inactive_form.php:39
+#: ../user/team_remove_inactive_form.php:41
 msgid "Remove?"
-msgstr ""
+msgstr "Odobrať"
 
-#: ../user/team_remove_inactive_form.php:40
+#: ../user/team_remove_inactive_form.php:42
 msgid "Name (ID)"
-msgstr ""
+msgstr "Názov (ID)"
 
-#: ../user/team_remove_inactive_form.php:65
+#: ../user/team_remove_inactive_form.php:67
 msgid "No members are eligible for removal."
-msgstr ""
+msgstr "Žiadni používatelia sa nedajú odobrať."
 
-#: ../user/team_remove_inactive_form.php:68
+#: ../user/team_remove_inactive_form.php:70
 msgid "Remove users"
-msgstr ""
+msgstr "Odobrať používateľov"
 
-#: ../user/team_search.php:68
+#: ../user/team_search.php:76
 msgid "Team name"
-msgstr ""
+msgstr "Názov tímu"
 
-#: ../user/team_search.php:92
+#: ../user/team_search.php:113
 msgid "Team search results"
-msgstr ""
+msgstr "Výsledky vyhľadávania tímov"
 
-#: ../user/team_search.php:94
+#: ../user/team_search.php:115
 msgid "No teams were found matching your criteria. Try another search."
-msgstr ""
+msgstr "Nenašli sa žiadne tímy podľa vašich požiadavok. Skúste to inak."
 
-#: ../user/team_search.php:96
+#: ../user/team_search.php:117
 msgid "Or you can %1create a new team%2."
-msgstr ""
+msgstr "Alebo, môžete %1 vytvoriť nový tím%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 ""
+msgstr "Nasledujúce tímy sú zhodné s jedným alebo viacerými kritériami vášho vyhľadávania.\nAk sa chcete pridať do tímu, navštívte jeho stránku kliknutím na meno a tam kliknite na %1Pridať sa do tímu%2."
 
-#: ../user/team_search.php:107
+#: ../user/team_search.php:128
 msgid "Change your search"
-msgstr ""
+msgstr "Zmeniť vyhľadávanie"
 
-#: ../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 ""
+msgstr "Môžete sa dať dokopy s ľuďmi s podobnými záujmami, alebo s krajanmi, či spolužiakmi alebo kolegami."
 
-#: ../user/team_search.php:183
+#: ../user/team_search.php:204
 msgid "Use this form to find teams that might be right for you."
-msgstr ""
+msgstr "Použiť tento formulár na nájdenie najvhodnejších tímov pre vás."
 
-#: ../user/team_search.php:188
+#: ../user/team_search.php:209
 msgid "%1I'm not interested%2 in joining a team right now."
-msgstr ""
+msgstr "Momentálne %1nemám záujem%2 sa pridať do tímu."
 
-#: ../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 ""
+msgstr "Limit bol prekročený - je nám ľuto, len prvých %1 položiek"
 
 #: ../user/top_hosts.php:82
 msgid "Top hosts"
-msgstr ""
+msgstr "Top počítače"
 
-#: ../user/top_teams.php:105
+#: ../user/top_teams.php:107
 msgid "Top %1 teams"
-msgstr ""
+msgstr "Top %1 tímy"
 
-#: ../user/top_teams.php:108
+#: ../user/top_teams.php:110
 msgid "There are no %1 teams"
-msgstr ""
+msgstr "Neexistujú %1 tímy"
 
 #: ../user/top_users.php:64
 msgid "Participant since"
-msgstr ""
+msgstr "Účastník od"
 
-#: ../user/uotd.php:29
+#: ../user/uotd.php:31
 msgid "No user of the day has been chosen."
-msgstr ""
+msgstr "Užívateľ dňa nebol zvolený"
 
-#: ../user/uotd.php:33
+#: ../user/uotd.php:35
 msgid "User of the Day for %1: %2"
-msgstr ""
+msgstr "Užívateľ dňa %1: %2"
 
 #: ../user/user_search.php:51
 msgid "Filters"
-msgstr ""
+msgstr "Filtre"
 
 #: ../user/user_search.php:52
 msgid "User name starts with"
-msgstr ""
+msgstr "Meno užívateľa sa začína"
 
 #: ../user/user_search.php:53
 msgid "Any"
-msgstr ""
+msgstr "Všetko"
 
 #: ../user/user_search.php:56
 msgid "With profile?"
-msgstr ""
+msgstr "S profilom?"
 
 #: ../user/user_search.php:57 ../user/user_search.php:62
 msgid "Either"
-msgstr ""
+msgstr "Buď"
 
 #: ../user/user_search.php:61
 msgid "On a team?"
-msgstr ""
+msgstr "V tíme_"
 
 #: ../user/user_search.php:66
 msgid "Ordering"
-msgstr ""
+msgstr "Zoradenie"
 
 #: ../user/user_search.php:67
 msgid "Decreasing sign-up time"
-msgstr ""
+msgstr "Skrátenie času na prihlásenie"
 
 #: ../user/user_search.php:68
 msgid "Decreasing average credit"
@@ -6246,29 +6204,29 @@ msgstr "Zostupne podľa priemerného kreditu"
 msgid "Decreasing total credit"
 msgstr "Zostupne podľa celkového kreditu"
 
-#: ../user/user_search.php:100
+#: ../user/user_search.php:84
 msgid "search string must be at least 3 characters"
-msgstr ""
+msgstr "hľadané slovo musí mať najmenej 3 znaky"
 
-#: ../user/user_search.php:133
+#: ../user/user_search.php:118
 msgid "User search results"
-msgstr ""
+msgstr "Výsledky vyhľadávania užívateľov"
 
-#: ../user/user_search.php:140
+#: ../user/user_search.php:125
 msgid "Joined"
-msgstr ""
+msgstr "Pridanie sa"
 
-#: ../user/user_search.php:148
+#: ../user/user_search.php:133
 msgid "No users match your search criteria."
-msgstr ""
+msgstr "Žiaden užívateľ nezodpovedá hľadaným kritérám."
 
 #: ../user/userw.php:35
 msgid "User not found!"
-msgstr ""
+msgstr "Používateľ nenájdený!"
 
 #: ../user/userw.php:44
 msgid "Account Data<br/>for %1<br/>Time:"
-msgstr ""
+msgstr "Údaje účtu <br/> za %1 <br/> Čas:"
 
 #: ../user/userw.php:47
 msgid "Team:"
@@ -6276,83 +6234,82 @@ msgstr "Tím:"
 
 #: ../user/userw.php:48
 msgid "Team TotCred:"
-msgstr ""
+msgstr "TotCred tímu:"
 
 #: ../user/userw.php:49
 msgid "Team AvgCred:"
-msgstr ""
+msgstr "AvgCred tímu:"
 
 #: ../user/userw.php:51
 msgid "Team: None"
-msgstr ""
+msgstr "Tím: Žiaden"
 
 #: ../user/validate_email_addr.php:30
 msgid "Validate BOINC email address"
-msgstr ""
+msgstr "Overiť BOINC mailovú adresu"
 
 #: ../user/validate_email_addr.php:31
 msgid ""
 "Please visit the following link to validate the email address of your %1 "
 "account:"
-msgstr ""
+msgstr "Prosím navštívte nasledujúci odkaz na potvrdenie mailovej adresy vášho %1 konta"
 
 #: ../user/validate_email_addr.php:34
 msgid "Validate email sent"
-msgstr ""
+msgstr "Overovací mail bol odoslaný."
 
 #: ../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 ""
+msgstr "Mail bol poslaný na %1 . Navštívte odkaz obsiahnutý v správe na potvrdenie vašej mailovej adresy."
 
 #: ../user/validate_email_addr.php:44
 msgid "No such user."
-msgstr ""
+msgstr "Používateľ neexistuje."
 
 #: ../user/validate_email_addr.php:49
 msgid "Error in URL data - can't validate email address"
-msgstr ""
+msgstr "Chyba v URL - nebolo možné overiť mailovú adresu"
 
 #: ../user/validate_email_addr.php:54
 msgid "Database update failed - please try again later."
-msgstr ""
+msgstr "Aktualizácia databázy zlyhala - prosím, skúste to znovu."
 
 #: ../user/validate_email_addr.php:57
 msgid "Validate email address"
-msgstr ""
+msgstr "Overiť e-mailovú adresu"
 
 #: ../user/validate_email_addr.php:58
 msgid "The email address of your account has been validated."
-msgstr ""
+msgstr "Mailová adresa vášho účtu bola overená."
 
-#: ../user/view_profile.php:36
+#: ../user/view_profile.php:38
 msgid "This user has no profile"
-msgstr ""
+msgstr "Tento používateľ nemá profil"
 
-#: ../user/view_profile.php:54
+#: ../user/view_profile.php:56
 msgid "Profile: %1"
-msgstr ""
+msgstr "Profil: %1"
 
-#: ../user/view_profile.php:63
+#: ../user/view_profile.php:65
 msgid "Account data"
-msgstr ""
+msgstr "Údaje konta"
 
 #: ../user/weak_auth.php:52
 msgid ""
-"You can access your account either by using your email address and "
-"password,\n"
+"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 ""
+msgstr "Do vášho účtu sa dostanete buď použitím vašej mailovej adresy a hesla,\nalebo použitím priradeného \"kľúču k učtu\"\nKľúč vášho účtu je:"
 
 #: ../user/weak_auth.php:57
 msgid "This key can be used to:"
-msgstr ""
+msgstr "Tento kľúč sa môže použiť na:"
 
 #: ../user/weak_auth.php:59
 msgid "log in to your account on the web"
-msgstr ""
+msgstr "prihlásenie sa do vášho účtu na stránke"
 
 #: ../user/weak_auth.php:61
 msgid ""
@@ -6360,125 +6317,143 @@ msgid ""
 "       To do so, install BOINC,\n"
 "       create a file named %1 in the BOINC\n"
 "       data directory, and set its contents to:"
-msgstr ""
+msgstr "na pridanie počítača do vášho účtu bez pomoci BOINC správcu.\nNainštalujte si BOINC, \nvytvorte súbor s názvom %1 v BOINC\nzložke data a nastavte jeho obsah nasledovne:"
 
 #: ../user/weak_auth.php:73
 msgid "Weak account key"
-msgstr ""
+msgstr "Slabý kľúč účtu"
 
 #: ../user/weak_auth.php:74
 msgid ""
 "Your 'weak account key' can be used to attach computers to your account\n"
-"    as described above, but cannot be used to log in to your account or "
-"change it in any way.\n"
+"    as described above, but cannot be used to log in to your account or change it in any way.\n"
 "    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 ""
+msgstr "Váš \"slabý\" kľúč účtu môže byť použitý na pridanie počítačov\nk vášmu účtu, ako je uvedené nižšie. Nedá sa však použiť na \nprihlásenie sa do účtu a ani jeho zmenu-\nPokiaľ chcete pridať do vášho účtu nezabezpečené alebo nedôveryhodné počítače, použite váš slabý kľúč.\nVáš slabý kľúč je:"
 
 #: ../user/weak_auth.php:81
 msgid ""
 "If you change your password, your weak account key changes, and your "
 "previous weak account key becomes invalid."
-msgstr ""
+msgstr "Pokiaľ si zmeníte heslo, vaše slabé kľúče sa zmenia a vaše predošlé slabé kľúče nebudú viac funkčné."
 
 #: ../user/workunit.php:32
 msgid "can't find workunit"
-msgstr ""
+msgstr "nedá sa nájsť pracovná jednotka"
 
 #: ../user/workunit.php:35
 msgid "Workunit %1"
-msgstr ""
+msgstr "Pracovná jednotka %1"
+
+#: ../user/workunit.php:40
+msgid "application"
+msgstr "aplikácia"
 
 #: ../user/workunit.php:43
 msgid "canonical result"
-msgstr ""
+msgstr "kanonický výsledok"
 
 #: ../user/workunit.php:46
 msgid "granted credit"
-msgstr ""
+msgstr "udelený kredit"
+
+#: ../user/workunit.php:55
+msgid "Tasks in progress"
+msgstr "Prebiehajúce úlohy"
 
 #: ../user/workunit.php:55
 msgid "suppressed pending completion"
-msgstr ""
+msgstr "potlačiť úlohy čakajúce na dokončenie"
 
 #: ../user/workunit.php:58
 msgid "minimum quorum"
-msgstr ""
+msgstr "minimálne quorum"
 
 #: ../user/workunit.php:59
 msgid "initial replication"
-msgstr ""
+msgstr "prvotná replikácia"
 
 #: ../user/workunit.php:60
 msgid "max # of error/total/success tasks"
-msgstr ""
+msgstr "maximálny počet chybných/spolu/úspešných úloh"
 
 #: ../user/workunit.php:64
 msgid "errors"
-msgstr ""
+msgstr "chyby"
 
 #: ../user/workunit.php:67
 msgid "validation"
-msgstr ""
+msgstr "overenie"
 
 #: ../user/workunit.php:67
 msgid "Pending"
-msgstr ""
+msgstr "Čaká"
 
-#: ../project.sample/project.inc:43
+#: ../project.sample/project.inc:70
 msgid "Main page"
-msgstr ""
+msgstr "Hlavná stránka"
 
-#: ../project.sample/project.inc:45
+#: ../project.sample/project.inc:72
 msgid "Copyright"
-msgstr ""
+msgstr "Autorské práva"
 
-#: ../project.sample/project.inc:48
+#: ../project.sample/project.inc:75
 msgid "Generated"
-msgstr ""
+msgstr "Vytvorené"
 
-#: ../project.sample/project.inc:79
+#: ../project.sample/project.inc:106
 msgid "Your personal background."
-msgstr ""
+msgstr "Niečo o vás"
 
-#: ../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 ""
+msgstr "Prezraďte nám niečo o vás. Môžete napísať odkiaľ ste, koľko máte rokov, vaše zamestnanie, záľuby alebo čokoľvek iné."
 
-#: ../project.sample/project.inc:87
+#: ../project.sample/project.inc:114
 msgid "Your opinions about %1"
-msgstr ""
+msgstr "Váš názor na %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 ""
+msgstr "Prezraďte nám, čo si myslíte o %1<ol>\n<li>Prečo spúštate %1?\n<li>Čo si myslíte o projekte samotnom_\n<li>Máte nejaké návrhy?\n</ol>"
 
-#: ../project.sample/project_specific_prefs.inc:47
+#: ../project.sample/project_specific_prefs.inc:53
 msgid "Color scheme for graphics"
-msgstr ""
+msgstr "Farebná schéma pre grafiku"
 
-#: ../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 ""
+msgstr "Maximum % procesoru pre grafiku%10 ... 100%2"
 
-#: ../project.sample/project_specific_prefs.inc:49
+#: ../project.sample/project_specific_prefs.inc:56
 msgid "Run only the selected applications"
-msgstr ""
+msgstr "Spustit len vybrané aplikácie"
+
+#: ../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 "Získavať úlohy len pre určité aplikácie. Užitočné, ak sa chcete sústrediť len na konkrétne aplikácie, alebo ich vylúčiť."
 
-#: ../project.sample/project_specific_prefs.inc:50
+#: ../project.sample/project_specific_prefs.inc:58
 msgid ""
 "If no work for selected applications is available, accept work from other "
 "applications?"
-msgstr ""
+msgstr "Pokiaľ nie je dostupná práca spomedzi vybraných aplikácií, príjmať prácu aj z iných aplikácií?"
 
-#: ../project.sample/project_specific_prefs.inc:91
+#: ../project.sample/project_specific_prefs.inc:59
+msgid "Use faster non-graphical applications if available?"
+msgstr "Použiť rýchlejšie aplikácie bez grafiky, ak je to možné?"
+
+#: ../project.sample/project_specific_prefs.inc:90
 msgid "(all applications)"
-msgstr ""
+msgstr "(všetky aplikácie)"
diff --git a/locale/sk/BOINC-Setup.mo b/locale/sk/BOINC-Setup.mo
index ad64a2a..6983734 100644
Binary files a/locale/sk/BOINC-Setup.mo and b/locale/sk/BOINC-Setup.mo differ
diff --git a/locale/sk/BOINC-Setup.po b/locale/sk/BOINC-Setup.po
old mode 100755
new mode 100644
index 524ee10..807c0cf
--- a/locale/sk/BOINC-Setup.po
+++ b/locale/sk/BOINC-Setup.po
@@ -1,45 +1,40 @@
 # 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:
+# aceman, 2015
+# Michal, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\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-12 01:49-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: sk\n"
+"PO-Revision-Date: 2015-03-20 22:02+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"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-Basepath: /Volumes/Cheer/BOINC_GIT/boinc_trunk\n"
-"X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: mac_installer\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: Installer.cpp:124
 #, c-format
 msgid "Sorry, this version of %s requires system 10.5 or higher."
-msgstr ""
+msgstr "Je nám ľúto, táto verzia %s vyžaduje systém verzie 10.5 a vyšší."
 
-#: PostInstall.cpp:130
-#: PostInstall.cpp:1136
-#: uninstall.cpp:1618
+#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
 msgid "Yes"
-msgstr ""
+msgstr "Áno"
 
-#: PostInstall.cpp:131
-#: PostInstall.cpp:1137
-#: uninstall.cpp:1619
+#: PostInstall.cpp:131 PostInstall.cpp:1137 uninstall.cpp:1619
 msgid "No"
-msgstr ""
+msgstr "Nie"
 
 #: PostInstall.cpp:133
 msgid "Should BOINC run even when no user is logged in?"
-msgstr ""
+msgstr "Má BOINC bežať aj keď nie je prihlásený žiadny používateľ?"
 
 #: PostInstall.cpp:1416
 #, c-format
@@ -47,26 +42,26 @@ 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 ""
+msgstr "Užívatelia s administrátorskými oprávneniami môžu automaticky spúšťať a ovládať %s.\n\nChcete povoliť spúšťanie a ovládanie %s aj ostatným užívateľom tohoto Macu?"
 
 #: PostInstall.cpp:1444
 #, c-format
 msgid "Do you want to set %s as the screensaver for all %s users on this Mac?"
-msgstr ""
+msgstr "Chcete nastaviť %s ako šetrič obrazovky pre všetkých užívateľov %s na tomto Macu?"
 
 #: uninstall.cpp:82
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: uninstall.cpp:136
 msgid "Permission error after relaunch"
-msgstr ""
+msgstr "Chyba oprávnení po reštarte"
 
 #: uninstall.cpp:141
 msgid ""
 "Removal may take several minutes.\n"
 "Please be patient."
-msgstr ""
+msgstr "Odstránenie môže trvať niekoľko minút.\nČakajte, prosím."
 
 #: uninstall.cpp:156
 #, c-format
@@ -74,27 +69,27 @@ 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 ""
+msgstr "Skutočne chcete odstrániť %s z vášho počítača?\n\nBudú odstránené len spúštacie súbory, dátové súbory %s ostanú nedotknuté."
 
 #: uninstall.cpp:163
 #, c-format
 msgid "Canceled: %s has not been touched."
-msgstr ""
+msgstr "Zrušené: S %s nebolo manipulované."
 
 #: uninstall.cpp:174
 #, c-format
 msgid "An error occurred: error code %d"
-msgstr ""
+msgstr "Nastala chyba: Kód %d"
 
 #: uninstall.cpp:230
 msgid "name  of user"
-msgstr ""
+msgstr "meno používateľa"
 
 #: uninstall.cpp:272
 msgid ""
 "Do you also want to remove VirtualBox from your computer?\n"
 "(VirtualBox was installed along with BOINC.)"
-msgstr ""
+msgstr "Chcete z vášho počítača odstrániť aj VirtualBox?\n(VirtualBox bol nainštalovaný spolu s BOINC.)"
 
 #: uninstall.cpp:312
 #, c-format
@@ -106,20 +101,19 @@ msgid ""
 "\n"
 "for each user, the file\n"
 "\"%s\"."
-msgstr ""
+msgstr "Odstránenie bolo dokončené.\n\nMôžete odstrániť nasledovné pozostatky s použitím prehliadača:\nadresár \"%s\"\n\npre každého užívateľa, súbor\n\"%s."
 
 #: uninstall.cpp:840
 #, c-format
 msgid ""
 "Enter your administrator password to completely remove %s from you computer.\n"
 "\n"
-msgstr ""
+msgstr "Napíšte vaše správcovské heslo na úplné odstránenie %s z vášho počítača.\n\n"
 
 #: uninstall.cpp:1616
 msgid "Cancel"
-msgstr ""
+msgstr "Zrušiť"
 
 #: uninstall.cpp:1617
 msgid "Continue..."
-msgstr ""
-
+msgstr "Pokračovať..."
diff --git a/locale/sk/BOINC-Web.mo b/locale/sk/BOINC-Web.mo
index cc066fa..1bef65d 100644
Binary files a/locale/sk/BOINC-Web.mo and b/locale/sk/BOINC-Web.mo differ
diff --git a/locale/sk/BOINC-Web.po b/locale/sk/BOINC-Web.po
old mode 100755
new mode 100644
index f89b9aa..0cf83b9
--- a/locale/sk/BOINC-Web.po
+++ b/locale/sk/BOINC-Web.po
@@ -1,373 +1,413 @@
 # BOINC web translation
 # Copyright (C) 2008-2009 University of California
+# 
 # This file is distributed under the same license as BOINC.
+# 
 # FileID  : $Id$
+# 
+# Translators:
+# aceman, 2015
+# Michal, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\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-12 01:50-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: sk\n"
+"PO-Revision-Date: 2015-03-27 23:13+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"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.1.6\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-KeywordsList: tra\n"
-"X-Poedit-SearchPath-0: doc\n"
 
 #: docutil.php:21
 msgid "Search"
-msgstr ""
+msgstr "Vyhľadávať"
 
 #: docutil.php:103
 msgid "Return to BOINC main page"
-msgstr ""
+msgstr "Návrat na hlavnú stránku BOINC"
 
 #: docutil.php:114
 #, php-format
 msgid "This page is %stranslatable%s."
-msgstr ""
+msgstr "Táto stránka je %spreložiteľná%s."
 
 #: download.php:39
-msgid "We recommend that you also install VirtualBox, so your computer can work on science projects that require it."
-msgstr ""
+msgid ""
+"We recommend that you also install VirtualBox, so your computer can work on "
+"science projects that require it."
+msgstr "Odporúčame nainštalovať aj VirtualBox, aby váš počítač mohol pracovať na projektoch, ktoré ho vyžadujú."
 
 #: download.php:41
 msgid "Learn more about VirtualBox."
-msgstr ""
+msgstr "Zistiť viac o aplikácii VirtualBox"
 
 #: download.php:51
 msgid "Download BOINC + VirtualBox"
-msgstr ""
+msgstr "Stiahnuť BOINC + VirtualBox"
 
-#: download.php:54
-#: download.php:69
+#: download.php:54 download.php:69
 #, php-format
 msgid "for %s"
-msgstr ""
+msgstr "na %s"
 
-#: download.php:57
-#: download.php:72
+#: download.php:57 download.php:72
 #, php-format
 msgid "BOINC version %s"
-msgstr ""
+msgstr "Verzia BOINC %s"
 
 #: download.php:59
 #, php-format
 msgid "VirtualBox version %s"
-msgstr ""
+msgstr "VirtualBox verzia %s"
 
 #: download.php:67
 msgid "Download BOINC"
-msgstr ""
+msgstr "Stiahnuť BOINC"
 
 #: download.php:123
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others."
-msgstr ""
+msgid ""
+"BOINC is a program that lets you donate your idle computer time to science "
+"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, and many others."
+msgstr "BOINC je program, ktorý umožní prepožičať čas, keď počítač nepoužívate projektom, ako napríklad SETI at Home, Climateprediction.net, Rosetta at home, World Community Grid a mnohým dalším."
 
 #: download.php:125
-msgid "After installing BOINC on your computer, you can connect it to as many of these projects as you like."
-msgstr ""
+msgid ""
+"After installing BOINC on your computer, you can connect it to as many of "
+"these projects as you like."
+msgstr "Po nainštalovaní BOINC na váš počítač sa môžete pripojiť k ľubovoľnému množstvu projektov."
 
 #: download.php:127
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
-msgstr ""
+msgid ""
+"You may run this software on a computer only if you own the computer or have"
+" the permission of its owner."
+msgstr "Tento software môžete spúšťať len pokiaľ tento počítač vlastníte, alebo to povolil vlastník počítača."
 
 #: download.php:132
-msgid "We recommend that you download BOINC from the Google Play Store or Amazon Appstore, not from here."
-msgstr ""
+msgid ""
+"We recommend that you download BOINC from the Google Play Store or Amazon "
+"Appstore, not from here."
+msgstr "Odporúčame stiahnuť BOINC z Google Play alebo z Amazon Appstore a nie odtiaľto."
 
 #: download.php:167
 msgid "System requirements"
-msgstr ""
+msgstr "Požiadavky na systém"
 
 #: download.php:168
 msgid "Release notes"
-msgstr ""
+msgstr "Poznámky k tomuto vydaniu"
 
-#: download.php:169
-#: index.php:86
+#: download.php:169 index.php:86
 msgid "Help"
-msgstr ""
+msgstr "Pomoc"
 
 #: download.php:170
 msgid "All versions"
-msgstr ""
+msgstr "Všetky verzie"
 
 #: download.php:171
 msgid "Version history"
-msgstr ""
+msgstr "História verzií"
 
 #: download.php:172
 msgid "GPU computing"
-msgstr ""
+msgstr "Výpočty pomocou GPU"
 
 #: download.php:190
 msgid "BOINC: compute for science"
-msgstr ""
+msgstr "BOINC: výpočty pre vedu"
 
 #: help.php:12
 #, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
-msgstr ""
+msgid ""
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who"
+" can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"through the process of installing and using BOINC; %s troubleshoot any "
+"problems you might have."
+msgstr "Online pomoc BOINC vám umožní priamy rozhovor so skúsenými používateľmi BOINC, ktorí vám môžu: %s odpovedať na otázky ohľadom BOINC a dobrovoľníckych výpočtov, %s previesť vás inštaláciou a používaním BOINC, %s alebo vám pomôžu vyriešiť problémy s ním spojené."
 
 #: help.php:21
 #, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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 ""
+msgid ""
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system."
+" 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 "Online pomoc BOINC je založená na %sSkype%s, internetovom telefónnom systéme. Skype je bezplatný (ako aplikácia, tak aj hovory). Pokiaľ nemáte Skype, prosím, %sstiahnite a nainštalujte ho%s. Keď dokončíte inštaláciu Skype, prosím, vráťte sa na túto stránku."
 
 #: help.php:28
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
-msgstr ""
+msgid ""
+"The best way to get help is by voice, for which you need either built-in "
+"microphone and speakers or an external headset for your computer.  You can "
+"also use Skype's text-based chat system or regular email (if you don't have "
+"Skype) to communicate with Help Volunteers."
+msgstr "Najefektívnejší spôsob ako získať pomoc je telefonicky, na čo potrebujete buďto vstavaný mikrofón a reproduktory alebo externý headset. V prípade, že ich nevlastníte, môžete použiť chatovaciu funkciu Skype, alebo môžete komunikovať s dobrovoľnými pomocníkmi pomocou mailu."
 
 #: help.php:31
-msgid "Volunteers speaking several languages are available. Please select a language:"
-msgstr ""
+msgid ""
+"Volunteers speaking several languages are available. Please select a "
+"language:"
+msgstr "K dispozícii sú dobrovoľníci hovoriaci viacerými jazykmi. Prosím, vyberte si jazyk:"
 
 #: help.php:47
 msgid "Be a Help Volunteer"
-msgstr ""
+msgstr "Staňte sa dobrovoľníkom"
 
 #: help.php:50
 #, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
-msgstr ""
+msgid ""
+"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+"Volunteer%s.  It's a great way to help the cause of scientific research and "
+"volunteer computing - and it's fun!"
+msgstr "Ak ste skúsený používateľ BOINC, môžete sa %sstať dobrovoľným pomocníkom%s. Je to výborný spôsob ako pomôcť vede a dobrovoľníckym výpočtom a okrem toho, je to zábava!"
 
 #: help.php:56
 #, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
-msgstr ""
+msgid ""
+"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
+msgstr "Ak už ste dobrovoľník: na zmenu vašich nastavení, %skliknite sem%s."
 
 #: help_funcs.php:107
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
-msgstr ""
+msgid ""
+"BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
+"or the University of California."
+msgstr "Pomocníci BOINC sú neplatení dobrovoľníci. Ich rady nie sú sponzorované programom BOINC alebo Kalifornskou Univerzitou."
 
 #: help_funcs.php:110
 msgid "%1Never%2 give email address or password information to BOINC helpers."
-msgstr ""
+msgstr "%1Nikdy%2 neprezrádzajte vašu mailovú adresu alebo heslo BOINC pomocníkom."
 
 #: index.php:24
 msgid "Computing power"
-msgstr ""
+msgstr "Výpočtová sila"
 
 #: index.php:26
 msgid "Top 100 volunteers"
-msgstr ""
+msgstr "Top 100 dobrovoľníkov"
 
 #: index.php:27
 msgid "Statistics"
-msgstr ""
+msgstr "Štatistiky"
 
 #: index.php:55
 msgid "Active:"
-msgstr ""
+msgstr "Aktívne:"
 
 #: index.php:55
 msgid "volunteers,"
-msgstr ""
+msgstr "dobrovoľníci,"
 
 #: index.php:55
 msgid "computers.\n"
-msgstr ""
+msgstr "počítače.\n"
 
 #: index.php:56
 msgid "24-hour average:"
-msgstr ""
+msgstr "Priemer za 24 hodín"
 
 #: index.php:56
 msgid "PetaFLOPS."
-msgstr ""
+msgstr "PetaFLOPS."
 
 #: index.php:68
 msgid "News"
-msgstr ""
+msgstr "Novinky"
 
 #: index.php:83
 msgid "Volunteer"
-msgstr ""
+msgstr "Dobrovoľník"
 
 #: index.php:85
 msgid "Download"
-msgstr ""
+msgstr "Stiahnuť"
 
-#: index.php:87
-#: index.php:120
-#: index.php:171
+#: index.php:87 index.php:120 index.php:171
 msgid "Documentation"
-msgstr ""
+msgstr "Dokumentácia"
 
 #: index.php:88
 msgid "Add-ons"
-msgstr ""
+msgstr "Doplnky"
 
 #: index.php:89
 msgid "Links"
-msgstr ""
+msgstr "Odkazy"
 
 #: index.php:94
-msgid "Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:"
-msgstr ""
+msgid ""
+"Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure"
+" diseases, study global warming, discover pulsars, and do many other types "
+"of scientific research.  It's safe, secure, and easy:"
+msgstr "Využite nevyužitý čas na vašom počítači (Windows, Mac, Linux alebo Android) na pomoc pri liečení chorôb, výskum globálneho oteplovania, objavovania pulzarov a veľa dalších typov výskumu. Je to bezpečné a jednoduché:"
 
 #: index.php:96
 msgid "Choose projects"
-msgstr ""
+msgstr "Zvoliť projekty"
 
 #: index.php:97
 msgid "Download BOINC software"
-msgstr ""
+msgstr "Stiahnuť software BOINC"
 
 #: index.php:98
 msgid "Enter an email address and password."
-msgstr ""
+msgstr "Prosím zadajte emailovú adresu a heslo."
 
 #: index.php:102
 #, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
-msgstr ""
+msgid ""
+"Or, if you run several projects, try an %saccount manager%s such as "
+"%sGridRepublic%s or %sBAM!%s. "
+msgstr "Alebo, pokiaľ používate viacero projektov, vyskúšajte %ssprávcu konta%s, napríklad %sGridRepublic%s alebo %sBAM!%s."
 
 #: index.php:118
 msgid "Compute with BOINC"
-msgstr ""
+msgstr "Počítať s BOINC"
 
 #: index.php:121
 msgid "Software updates"
-msgstr ""
+msgstr "Aktualizácie software"
 
 #: index.php:128
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
-msgstr ""
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving"
+" you the computing power of thousands of CPUs."
+msgstr "%1Vedci%2: využite BOINC na vytvorenie %3dobrovoľníckeho výpočtového projektu%4, ktorý vám dá výpočtovú silu tisícov procesorov."
 
 #: index.php:132
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
-msgstr ""
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
+msgstr "%1Univerzity%2: používajte BOINC na vytvorenie %3Virtuálneho supervýpočtového centra%4."
 
 #: index.php:137
 msgid "%1Companies%2: use BOINC for %3desktop Grid computing%4."
-msgstr ""
+msgstr "%1Firmy%2: použite BOINC na vytvorenie %3výpočtovej siete%4."
 
 #: index.php:149
 msgid "The BOINC project"
-msgstr ""
+msgstr "Projekt BOINC"
 
 #: index.php:155
 msgid "Message boards"
-msgstr ""
+msgstr "Nástenky"
 
 #: index.php:156
 msgid "Email lists"
-msgstr ""
+msgstr "Zoznamy emailov"
 
 #: index.php:157
 msgid "Personnel and contributors"
-msgstr ""
+msgstr "Personál a spolupracovníci"
 
 #: index.php:158
 msgid "Events"
-msgstr ""
+msgstr "Udalosti"
 
 #: index.php:159
 msgid "Papers and talks"
-msgstr ""
+msgstr "Publikácie a diskusie"
 
 #: index.php:160
 msgid "Research projects"
-msgstr ""
+msgstr "Výskumné projekty"
 
 #: index.php:161
 msgid "Logos and graphics"
-msgstr ""
+msgstr "Logá a grafiky"
 
 #: index.php:162
 msgid "and"
-msgstr ""
+msgstr "a"
 
 #: index.php:166
 msgid "Help wanted"
-msgstr ""
+msgstr "Hľadá sa pomoc"
 
 #: index.php:168
 msgid "Programming"
-msgstr ""
+msgstr "Programovanie"
 
 #: index.php:169
 msgid "Translation"
-msgstr ""
+msgstr "Preklad"
 
 #: index.php:170
 msgid "Testing"
-msgstr ""
+msgstr "Testovanie"
 
 #: index.php:172
 msgid "Publicity"
-msgstr ""
+msgstr "Publicita"
 
 #: index.php:174
 msgid "Software development"
-msgstr ""
+msgstr "Vývoj software"
 
 #: index.php:175
 msgid "APIs for add-on software"
-msgstr ""
+msgstr "API na softwarové doplnky"
 
 #: index.php:217
 #, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
-msgstr ""
+msgid ""
+"Open-source software for %svolunteer computing%s and %sgrid computing%s."
+msgstr "Open-source software na %sdobrovoľnícky výpočtový projekt%s a %svýpočtové siete%s."
 
 #: index.php:230
 msgid "BOINC is based at The University of California, Berkeley"
-msgstr ""
+msgstr "BOINC má základňu na Kalifornskej Univerzite v Berkley"
 
 #: projects.inc:14
 msgid "Distributed sensing"
-msgstr ""
+msgstr "Distribuovaný monitoring"
 
-# 78%
 #: projects.inc:19
-#, fuzzy
 msgid "Stanford University"
-msgstr "Oxfordská univerzita"
+msgstr "Univerzita Stanford"
 
 #: projects.inc:20
 msgid "Seismology"
-msgstr ""
+msgstr "Seizmológia"
 
 #: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
-msgstr ""
+msgid ""
+"The Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to Internet-connected computers.  You must buy a "
+"sensor to participate."
+msgstr "Sieť Quake-Catcher vyvíja najväčšiu seizmologickú sieť pomocou senzorov pripojených k počítačom. Musíte vlastniť senzor aby ste sa mohli zúčastniť."
 
 #: projects.inc:27
 msgid "BOINC Poland Foundation"
-msgstr ""
+msgstr "Nadácia BOINC Poľsko"
 
 #: projects.inc:28
 msgid "Environmental research"
-msgstr ""
+msgstr "Environmentálny výskum"
 
 #: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
-msgstr ""
+msgid ""
+"This project is creating a free and continuously updated map of radiation "
+"levels by using sensors connected to volunteers' computers.  You must buy a "
+"sensor to participate."
+msgstr "Tento projekt vytvára pravidelne aktualizovanú mapu zdarma, kde monitoruje úroveň radiácie pomocou senzorov pripojených k dobrovoľníckym počítačom. V prípade, že sa chcete zúčastniť, je potrebné vlastniť senzor."
 
 #: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
-msgstr ""
+msgid ""
+"To participate in these projects you must buy a sensor and attach it to your"
+" computer."
+msgstr "Aby ste sa mohli zúčastniť týchto projektov, musíte vlastniť senzor a prepojiť ho s vašim počítačom."
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
 msgstr "Kognitívna veda a umelá inteligencia"
 
-#: projects.inc:60
-#: projects.inc:364
-#: projects.inc:408
-#: projects.inc:457
-#: projects.inc:464
-#: projects.inc:511
+#: projects.inc:60 projects.inc:364 projects.inc:408 projects.inc:457
+#: projects.inc:464 projects.inc:511
 msgid "Private"
 msgstr "Súkromný"
 
@@ -376,8 +416,12 @@ msgid "Artificial intelligence"
 msgstr "Umelá inteligencia"
 
 #: projects.inc:62
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
-msgstr ""
+msgid ""
+"Parse and convert semantic nets for use in FreeHAL, an artificial "
+"intelligence that uses semantic networks, stemmers, part of speech "
+"databases, and part of speech taggers in order to imitate human behavior in "
+"conversations."
+msgstr "Analyzuje a konvertuje sémantické siete na použitie pre FreeHAL, čo je umelá inteligencia, ktorá používa sémantické siete a iné konverzačné pomôcky na imitáciu ľudskej konverzácie."
 
 #: projects.inc:69
 msgid "Biology and Medicine"
@@ -385,15 +429,20 @@ msgstr "Biológia a Medicína"
 
 #: projects.inc:82
 msgid "University College Dublin"
-msgstr ""
+msgstr "Univerzita v Dubline"
 
 #: projects.inc:83
 msgid "Antimalarial drug discovery"
-msgstr ""
+msgstr "Výskum liekov proti malárii"
 
 #: projects.inc:84
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
-msgstr ""
+msgid ""
+"The parasite that causes malaria continues to evolve resistance to available"
+" medication. We therefore urgently need to discover new drugs to replace "
+"existing drugs. Importantly, these new drugs need to target NEW proteins in "
+"the parasite. The FightMalaria at Home project is aimed at finding these new "
+"targets."
+msgstr "Parazit spôsobujúci maláriu sa neustále vyvíja a s ním sa vyvíja aj odolnosť voči dostupným liekom. Preto musíme neodkladne skúmať nové a nahrádzať staré liečivá. Čo je najdôležitejšie, tieto nové liečivá musia byť zamerané na nové proteíny v parazitoch. Projekt FightMalaria at Home je zameraný na vyhľadávanie týchto nových cieľov."
 
 #: projects.inc:90
 msgid "University of Karlsruhe (Germany)"
@@ -404,8 +453,13 @@ msgid "Protein structure prediction"
 msgstr "Predpoklad štruktúry proteínu"
 
 #: projects.inc:92
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
-msgstr ""
+msgid ""
+"POEM at HOME uses a computational approach to predict the biologically active "
+"structure of proteins, to understand the signal-processing mechanisms when "
+"the proteins interact with one another, to understand diseases related to "
+"protein malfunction or aggregation, and to develop new drugs on the basis of"
+" the three-dimensions structure of biologically important proteins."
+msgstr "POEM at HOME využíva výpočtový pristup na predvídanie biologicky aktívnych štruktúr bielkovín na pochopenie signálnych mechanizmov, kde bielkoviny navzájom komunikujú; na pochopenie chorôb spätých s nefunkčnosťou bielkovín a na vývoj nových liečív na základe 3D štrukúr biologicky dôležitých bielkovín."
 
 #: projects.inc:98
 msgid "University of Delaware"
@@ -416,8 +470,12 @@ msgid "Study of protein - ligand interactions"
 msgstr "Štúdia proteínov - súčinnosť ligandov"
 
 #: projects.inc:100
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
-msgstr ""
+msgid ""
+"Docking at Home has both bioscience and computer science goals. The project "
+"aims to further knowledge of the atomic details of protein-ligand "
+"interactions and, by doing so, will search for insights into the discovery "
+"of novel pharmaceuticals."
+msgstr "Dockin at Home má ako biovedecký, tak aj kybernetický cieľ. Ide o rozšírenie vedomostí interakcií medzi proteínmi a ligandmi a týmto dosiahnuť nové znalosti na vývin liečív."
 
 #: projects.inc:114
 msgid "Barcelona Biomedical Research Park (PRBB)"
@@ -428,8 +486,12 @@ msgid "Molecular simulations of proteins"
 msgstr "Molekulárna simulácia proteínov"
 
 #: projects.inc:116
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
-msgstr ""
+msgid ""
+"GPUGrid.net opens novel computational scenarios by the first full-atom "
+"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
+"New biomedical applications suddenly become possible giving a new role to "
+"computational biology for biomedical research."
+msgstr "GPUGrid.net otvára komplexné scenária podľa prvého plno-atómového molekulárneho dynamického kódu (CellMD), špeciálne navrhnutého na beh na GPU NVIDIA . Nové biomedikálne aplikácie sa stali skutočnými a dali komplexným biomedikálnym výpočtom podobu."
 
 #: projects.inc:122
 msgid "Technion, Israel"
@@ -440,11 +502,15 @@ msgid "Genetic linkage analysis"
 msgstr "Analýza genetických väzieb"
 
 #: projects.inc:124
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
+msgid ""
+"Superlink at Technion helps geneticists all over the world find disease-"
+"provoking genes causing some types of diabetes, hypertension (high blood "
+"pressure), cancer, schizophrenia and many others."
 msgstr "Superlink at Technion pomáha genetikom na celom svete nájsť gény vyvolávajúce niektoré typy cukrovky, vysoký krvný tlak, rakovinu, schizofréniu a veľa ďalších."
 
 #: projects.inc:138
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
+msgid ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
 msgstr "Univerzita v Marylande, centrum bioinformatiky a výpočtovej biológie"
 
 #: projects.inc:139
@@ -452,7 +518,11 @@ msgid "Life science research"
 msgstr "Výskum životných vied"
 
 #: projects.inc:140
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
+msgid ""
+"The Lattice Project supplies computing power to scientists at the University"
+" of Maryland studying evolutionary relationships based on DNA sequence data;"
+" bacterial, plasmid, and virus protein sequences; and biological diversity "
+"in nature reserves. "
 msgstr "Projekt Lattice poskytuje výpočtovú silu vedcom z univerzity v Marylande, ktorí študujú vývojové vzťahy založené na sekvenčných dátach DNA; sekvencie proteínov baktérií, plasmidov a vírusov; a biologickú rozmanitosť v prirodzených podmienkach."
 
 #: projects.inc:146
@@ -464,29 +534,44 @@ msgid "Epidemiology"
 msgstr "Epidemiológia"
 
 #: projects.inc:148
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
-msgstr ""
+msgid ""
+"Simulation models of the transmission dynamics and health effects of malaria"
+" are an important tool for malaria control. They can be used to determine "
+"optimal strategies for delivering mosquito nets, chemotherapy, or new "
+"vaccines which are currently under development and testing.  Such modeling "
+"is extremely computer intensive, requiring simulations of large human "
+"populations with a diverse set of parameters related to biological and "
+"social factors that influence the distribution of the disease. "
+msgstr "Simulácie modelových situácií prenosovej dynamiky a zdravotných účinkov malárie je dôležitý nástroj na to, aby bola malária pod kontrolou. Simulácie a výpočty môžu byť použité na vhodné rozmiestnenie sietí na komáre, chemoterapiu  alebo na vývin a testovanie nových vakcín. Takéto modelovanie a testovanie je výpočtovo extrémne náročné a vyžaduje veľkú časť ľudskej populácie s rôznymi parametrami s biologickými a sociálnymi faktormi, ktoré vplývajú na prenos choroby."
 
 #: projects.inc:170
 msgid "University of Washington"
 msgstr "Washingtonská univerzita"
 
-#: projects.inc:171
-#: projects.inc:179
+#: projects.inc:171 projects.inc:179
 msgid "Biology"
 msgstr "Biológia"
 
 #: projects.inc:172
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
-msgstr ""
+msgid ""
+"Determine the 3-dimensional shapes of proteins in research that may "
+"ultimately lead to finding cures for some major human diseases. By running "
+"Rosetta at home you will help us speed up and extend our research in ways we "
+"couldn't possibly attempt without your help. You will also be helping our "
+"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
+"Cancer, and Alzheimer's"
+msgstr "Determinuje 3D tvary bielkovín vo výskume, ktoré by mohli pomôcť k objaveniu liekov na niektoré najrozšírenejšie ľudské choroby. Pri pomoci Rosetta at home, nám pomôžete urýchliť a rozšíriť náš výskum a snahu na dizajnovanie nových proteínov a bojovať proti chorobám ako je HIV, Malária, rakovina a Alzheimerova choroba."
 
 #: projects.inc:178
 msgid "University of Vienna"
 msgstr "Viedenská univerzita"
 
 #: projects.inc:180
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
-msgstr ""
+msgid ""
+"Calculate similarities between proteins. SIMAP provides a public database of"
+" the resulting data, which plays a key role in many bioinformatics research "
+"projects."
+msgstr "Výpočet podobností v proteínoch. SIMAP poskytuje verejnú databázu výsledkov, ktorá hrá kľúčovú úlohu v mnohých bioinformatických výskumných projektoch."
 
 #: projects.inc:186
 msgid "Earth Sciences"
@@ -501,340 +586,363 @@ msgid "Climate study"
 msgstr "Štúdium klímy"
 
 #: projects.inc:200
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
-msgstr ""
+msgid ""
+"Investigate the approximations that have to be made in state-of-the-art "
+"climate models. By running the model thousands of times we hope to find out "
+"how the model responds to slight tweaks to these approximations - slight "
+"enough to not make the approximations any less realistic. This will allow us"
+" to improve our understanding of how sensitive our models are to small "
+"changes and also to things like changes in carbon dioxide and the sulphur "
+"cycle. This will allow us to explore how climate may change in the next "
+"century under a wide range of different scenarios."
+msgstr "Skúma pravdepodobnosti, ktoré by museli nastať v reálnom klimatických modeloch. Pri spúšťaní toho modelu pár tisíc krát, chceme zistiť ako by model odpovedal drobným zmenám, tak malým, aby boli stále realistické. Toto nám umožní zlepšiť naše chápanie  ako sú tieto modely citlivé na zmeny v oxidu uhličitom a cykloch síry. Toto nám dovolí predpovedať, akým sposobom sa klíma zmení v najbližšom storočí pri rôznych scenároch."
 
 #: projects.inc:207
 msgid "Physical Science"
-msgstr ""
+msgstr "Fyzika"
 
 #: projects.inc:213
 msgid "Mechanical engineering"
-msgstr ""
+msgstr "Mechanika"
 
 #: projects.inc:214
-msgid "Currently we are calculating the optimum design of a structure call the 52 bar truss"
-msgstr ""
+msgid ""
+"Currently we are calculating the optimum design of a structure call the 52 "
+"bar truss"
+msgstr "Momentálne vypočítavame optimálny dizajn 52 barového nosníka."
 
-#: projects.inc:224
-#: projects.inc:263
-#: projects.inc:271
+#: projects.inc:224 projects.inc:263 projects.inc:271
 msgid "Astronomy"
 msgstr "Astronómia"
 
 #: projects.inc:225
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
-msgstr ""
+msgid ""
+"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
+"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
+"Universe. We will measure physical parameters (such as stellar mass surface "
+"density, star formation rate surface density, attenuation, and first-order "
+"star formation history) on a resolved pixel-by-pixel basis using spectral "
+"energy distribution (SED) fitting techniques in a distributed computing "
+"mode."
+msgstr "Skombinujeme spektrálne pokrytie GALEX, Pan-STARRS1, a WISE na vytvorenie multi-vlnovodĺžkový UV-optický-NIR atlas galaxie okolitého vesmíru. Budeme merať fyzikálne parametre (napríklad hustota hviezdokop, hustota hviezdnych formácií, útlm a pôvodnú formáciu hviezd) na rozlišení na jednotlivé pixely použitím spektralnej energickej distribúcie (SED) pri využití metódy distribuovaných výpočtov."
 
 #: projects.inc:247
 msgid "University of Texas at Austin"
 msgstr "Texaská univerzita v Austine"
 
-#: projects.inc:248
-#: projects.inc:279
+#: projects.inc:248 projects.inc:279
 msgid "Chemistry"
 msgstr "Chémia"
 
 #: projects.inc:249
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
-msgstr ""
+msgid ""
+"A common problem in theoretical chemistry, condensed matter physics and "
+"materials science is the calculation of the time evolution of an atomic "
+"scale system where, for example, chemical reactions and/or diffusion occur. "
+"Generally the events of interest are quite rare (many orders of magnitude "
+"slower than the vibrational movements of the atoms), and therefore direct "
+"simulations, tracking every movement of the atoms, would take thousands of "
+"years of computer calculations on the fastest present day computer before a "
+"single event of interest can be expected to occur.  Our research group is "
+"interested in calculating the long time dynamics of systems."
+msgstr "Bežný problém teoretickej chémie, fyziky kondenzovanej hmoty a materiálnej vedy je vývoj času na systéme atómovej miery, kde vznikajú, napríklad, chemické reakcie alebo difúzie. Obyčajne sú tieto udalosti veľmi vzácne (o niekoľko rádov pomalšie než vibračných pohybov atómov) a preto by priame simulácie zabrali tisíce rokov počítačovej simulácie na dnešných najvýkonnejších počítačoch. Naša skupina má záujem o dlhodobý výskum."
 
-# 95%
 #: projects.inc:262
-#, fuzzy
 msgid "University of Illinois at Urbana-Champaign"
-msgstr "Illinoiská univerzita v Urbana-Champaign"
+msgstr "Univerzita Illinois v Urbana-Champaign"
 
 #: projects.inc:264
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
-msgstr ""
+msgid ""
+"The goal of Cosmology at Home is to search for the model that best describes "
+"our Universe and to find the range of models that agree with the available "
+"astronomical particle physics data."
+msgstr "Cieľ Cosmology at Home je výskum modelu, ktorý by najlepšie vystihoval popis nášho vesmíru a nájsť rozsah modelov, ktoré súhlasia s dostupnými údajmi astronomických častíc."
 
 #: projects.inc:270
 msgid "Rensselaer Polytechnic Institute"
 msgstr "Polytechnický inštitút Rensselaer"
 
 #: projects.inc:272
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
-msgstr ""
+msgid ""
+"The goal of Milkyway at Home is to create a highly accurate three dimensional "
+"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
+"Survey."
+msgstr "Cieľom projektu Milkyway at Home je vytvorenie vysoko presného 3D modelu Mliečnej Dráhy pomocou údajov zozbieraných Sloan Digital Sky Survey."
 
 #: projects.inc:278
 msgid "Leiden University, The Netherlands"
 msgstr "Leidenská univerzita, Holandsko"
 
 #: projects.inc:280
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
-msgstr ""
+msgid ""
+"Surface science calculations using Classical Dynamics.  Leiden Classical "
+"allows volunteers, students and other scientist to submit their personal "
+"calculations to the grid. Each user has his own personal queue for Classical"
+" Dynamics jobs. In this way students have used the grid to simulate liquid "
+"argon, or to test the validity of the ideal gas law by actually doing the "
+"simulations through the grid."
+msgstr "Výpočty povrchovej vedy, ktoré využívajú klasickú dynamiku. Leiden Classical umožňuje dobrovoľníkom, študentom a iným vedcom posielať ich osobné výpočty. Každý užívateľ má svoj osobný rad pre výpočty klasickej dynamiky. Takýmto spôsobom získajú naši študenti priestory na simuláciu tekutého argónu, alebo vykonávať testy a simulácie s ideálnym plynom."
 
 #: projects.inc:294
 msgid "Univ. of Wisconsin - Milwaukee, Max Planck Institute"
-msgstr ""
+msgstr "Univerzita Wisconsin - Milwaukee, Inštitút Maxa Plancka"
 
 #: projects.inc:295
 msgid "Astrophysics"
-msgstr ""
+msgstr "Astrofyzika"
 
 #: projects.inc:296
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
-msgstr ""
-
-#: projects.inc:310
-#: projects.inc:318
+msgid ""
+"Search for spinning neutron stars (also called pulsars) using data from the "
+"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
+"observatory.  Einstein at Home is a World Year of Physics 2005 project "
+"supported by the American Physical Society (APS) and by a number of "
+"international organizations."
+msgstr "Hľadá rotujúce neutrónové hviezdy (nazývané aj pulzary) pomocou dát z LIGO a GEO detektorov gravitačných vĺn, a z Arecibo observatória. Einstein at Home je Fyzikálny projekt roku 2005, podporovaný Americkou Fyzikálnou Spoločnosťou (APS) a radom ďalších organizácií."
+
+#: projects.inc:310 projects.inc:318
 msgid "CERN (European Organization for Nuclear Research)"
-msgstr ""
+msgstr "CERN (European Organization for Nuclear Research - Európska Organizácia Jadrového Výskumu)"
 
-#: projects.inc:311
-#: projects.inc:319
+#: projects.inc:311 projects.inc:319
 msgid "Physics"
-msgstr ""
+msgstr "Fyzika"
 
 #: projects.inc:312
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
-msgstr ""
+msgid ""
+"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
+"European Organization for Nuclear Research, the world's largest particle "
+"physics laboratory.  It is the most powerful instrument ever built to "
+"investigate on particles proprieties. LHC at home runs simulations to improve "
+"the design of LHC and its detectors."
+msgstr "Veľký hadrónový urýchľovač, (LHC) v CERNe je najväčšie fyzikálne laboratórium na svete. Je to namocnejší nástroj, ktorý človek vybudoval, na výskum častíc a ich vlastností. LHC at home simuluje možnosti zlepšenia dizajnu LHC a jeho detektorov."
 
 #: projects.inc:320
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
-msgstr ""
+msgid ""
+"This project uses CERN-developed virtual machine technology for full-fledged"
+" LHC event physics simulation on volunteer computers.  Requires that you "
+"install VirtualBox on your computer"
+msgstr "Tento projekt využíva technológiu virtuálnych počítačov, vyvinutých v CERNe na pokročilú simuláciu LHC udalostí na dobrovoľníckom počítači. Vyžaduje nainštalovanú aplikáciu VirtualBox."
 
 #: projects.inc:326
 msgid "University of California, Berkeley"
-msgstr ""
+msgstr "Kalifornská Univerzita, Berkley"
 
 #: projects.inc:327
 msgid "Astrophysics, astrobiology"
-msgstr ""
+msgstr "Astrofyzika, astrobiológia"
 
 #: projects.inc:328
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
-msgstr ""
+msgid ""
+"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
+"goal is to detect intelligent life outside Earth. One approach, known as "
+"radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
+"signals from space. Such signals are not known to occur naturally, so a "
+"detection would provide evidence of extraterrestrial technology."
+msgstr "SETI (Výskum Extreterestriálnej Inteligencie) je vedecká disciplína, ktorej cieľom je nájsť inteligentný život mimo Zeme. Jeden z prístupov, nazývaný aj radio SETI používa rádioteleskopy na posluch úzkopasmových rádiosignálov z vesmíru. Takéto signály nevznikajú prirodzene, takže ich nález by potvrdil existenciu mimozemského života."
 
 #: projects.inc:342
 msgid "Bielefeld University of Applied Sciences"
-msgstr ""
+msgstr "Univerzita Aplikovanej vedy Bielefeld"
 
 #: projects.inc:343
 msgid "Chemical engineering and nanotechnology"
-msgstr ""
+msgstr "Chémia a nanotechnológia"
 
 #: projects.inc:344
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
-msgstr ""
+msgid ""
+"The study of molecular magnets and controlled nanoscale magnetism.  These "
+"magnetic molecules may be used to develop tiny magnetic switches, with "
+"applications in medicine (such as local tumor chemotherapy) and "
+"biotechnology."
+msgstr "Výskum molekulárnych magnetov a kontrolovaný nanomagnetizmus. Tieto magnetické molekuly môžu byť využité na vytvorenie drobných magnetických prepínačov s využitím v medicíne (napríklad lokálna chemoterapia) a biotechnológii."
 
 #: projects.inc:351
 msgid "Multiple applications"
-msgstr ""
+msgstr "Viacero aplikácií"
 
 #: projects.inc:356
 msgid "Chinese Academy of Sciences"
-msgstr ""
+msgstr "Čínska Akadémia vied"
 
 #: projects.inc:357
 msgid "Physics, biochemistry, and others"
-msgstr ""
+msgstr "Fyzika, biochémia a iné"
 
 #: projects.inc:358
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
-msgstr ""
+msgid ""
+"The objective of CAS at home is to encourage and assist scientists in China to "
+"adopt the technologies of volunteer computing and volunteer thinking for "
+"their research."
+msgstr "Cieľ projektu CAS at home je podporiť a pomôcť čínskym vedcom s technológiami dobrovoľníckych výpočtov a dobrovoľníkom pridať sa."
 
 #: projects.inc:365
 msgid "Mathematics, physics, evolution"
-msgstr ""
+msgstr "Matematika, fyzika, evolúcia"
 
 #: projects.inc:366
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
-msgstr ""
+msgid ""
+"Yoyo at home is an adapter between BOINC and several existing volunteer "
+"computing projects: ECM, Muon, Evolution at home, and distributed.net"
+msgstr "Yoyo at home is adaptér medzi BOINC a ďalšími projektami: ECM, Muon, Evolution at home a distributed.net"
 
-#: projects.inc:371
-#: projects.inc:527
+#: projects.inc:371 projects.inc:527
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
-msgstr ""
+msgstr "MTA-SZTAKI Laboratórium Paralených a distribuovaných systémov (Maďarsko)"
 
 #: projects.inc:372
 msgid "European research projects"
-msgstr ""
+msgstr "Európske výskumné projekty"
 
 #: projects.inc:373
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
-msgstr ""
+msgid ""
+"The EDGeS at Home Beta project integrates volunteer computing into the service "
+"grid network of Europe by allowing service grids to send workunits to be "
+"processed by the volunteers of this project. The scientific projects covered"
+" by the project include math, physics, biology, etc."
+msgstr "Projekt EDGeS at Home Beta zapája dobrovoľnícke počítače do služobnej siete Európy, pričom posiela pracovné jednotky na dobrovoľnícke počítače na spracovanie. Vedecké projekty sú napríklad z oblastí matematiky, fyziky, biológie atď."
 
 #: projects.inc:379
 msgid "Spanish universities and research centers"
-msgstr ""
+msgstr "Španielske univerzity a výskumné centrá"
 
 #: projects.inc:380
 msgid "Various Spanish research projects"
-msgstr ""
+msgstr "Rôzne španielske výskumné projekty"
 
 #: projects.inc:381
 msgid "Research in physics, material science, and biomedicine"
-msgstr ""
+msgstr "Výzkum vo fyzike, materiálnej vede a biomedicíne"
 
 #: projects.inc:387
 msgid "IBM Corporate Citizenship"
-msgstr ""
+msgstr "IBM Corporate Citizenship"
 
 #: projects.inc:388
 msgid "Medical, environmental and other humanitarian research"
-msgstr ""
+msgstr "Medicínsky, enviromentálny a iný humanitárny výskum"
 
 #: projects.inc:389
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
-msgstr ""
+msgid ""
+"To further critical non-profit research on some of humanity's most pressing "
+"problems by creating the world's largest volunteer computing grid.  Research"
+" includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"clean water and many more."
+msgstr "Aby sa kritický neziskový výskum posunul vpred, bola vytvorená sieť najväčšej dobrovoľníckej výpočtovej siete. Výskumy zahŕňaju HIV-AIDS, rakovina, tropické a zanedbané choroby, slnečnú energiu, pitnú vodu a veľa iných."
 
 #: projects.inc:395
 msgid "Mathematics, computing, and games"
-msgstr ""
+msgstr "Matematika, výpočty a hry"
 
 #: projects.inc:401
 msgid "Computer Science"
-msgstr ""
+msgstr "Kybernetika"
 
 #: projects.inc:409
 msgid "Mathematics, Physics, Artificial Intelligence"
-msgstr ""
+msgstr "Matematika, fyzika, umelá inteligencia"
 
 #: projects.inc:410
 msgid "Simulation of quantum computing; Goldbach's conjecture."
-msgstr ""
+msgstr "Simulácia kvantových výpočtov: Goldbachova domnienka."
 
-#: projects.inc:450
-#: projects.inc:458
+#: projects.inc:450 projects.inc:458
 msgid "Cryptography"
-msgstr ""
+msgstr "Kryptografia"
 
 #: projects.inc:459
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
-msgstr ""
+msgid ""
+"Attempt to decode 3 original Enigma messages. The signals were intercepted "
+"in the North Atlantic in 1942 and are believed to be unbroken."
+msgstr "Pokus o dekódovanie 3 pôvodných správ z Enigmy. Tieto signály boli zachytené v Severnom Atlantiku v roku 1942 a údajne sú neprelomené."
 
-#: projects.inc:465
-#: projects.inc:504
-#: projects.inc:512
-#: projects.inc:520
-#: projects.inc:528
-#: projects.inc:568
+#: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
+#: projects.inc:528 projects.inc:568
 msgid "Mathematics"
-msgstr ""
+msgstr "Matematika"
 
 #: projects.inc:466
 msgid "Study the Collatz Conjecture, an unsolved conjecture in mathematics"
-msgstr ""
+msgstr "Skúma Collatzovu domnienku, nevyriešenú domnienku v matematike."
 
 #: projects.inc:471
 msgid "California State University Fullerton"
-msgstr ""
+msgstr "Kalifornská Štátna Univerzita Fullerton"
 
 #: projects.inc:472
 msgid "Factorization of large integers"
-msgstr ""
+msgstr "Faktorizácia veľkých integrálov"
 
 #: projects.inc:473
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
-msgstr ""
+msgid ""
+"NFS at Home is a research project that uses Internet-connected computers to do "
+"the lattice sieving step in the Number Field Sieve factorization of large "
+"integers. As a young school student, you gained your first experience at "
+"breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
+"NFS at Home is a continuation of that experience, only with integers that are "
+"hundreds of digits long."
+msgstr "NFS at Home je výskumný projekt, ktorý využíva online počítače na krok mriežkového preosievania pri faktorizácií veľkých integrálov. Ako žiak ste získali prvé skúsenosti s rozbitím integrálu do prvočísel, napríklad 15=3*5 alebo 35=5*7. NFS at Home je pokračovanie tohoto procesu, čísla sú, akurát, stovky miest dlhé."
 
 #: projects.inc:479
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
-msgstr ""
+msgid ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
+msgstr "Technická univerzita Gediminas  v meste Vilnius a Technická univerzita Kaunas (Litva)"
 
 #: projects.inc:480
 msgid "Software testing"
-msgstr ""
+msgstr "Testovanie softwaru"
 
 #: projects.inc:481
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
-msgstr ""
+msgid ""
+"The aim of this project is to provide a powerful distributed computing "
+"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
+"well as others Lithuanian academic institutions.  Current applications "
+"involve the study of Monte-Carlo based software testing."
+msgstr "Cieľ tohoto projektu je dodať mocnú distribuovanú výpočtovú platformu pre vedcov z Technickej univerzity Gediminas vo Vilniuse (VGTU) ako aj iným lotyšským vedeckým ústavom. Momentálne je medzi aplikáciami zahrnutý výskum testovania software v Monte-Carlo."
 
 #: projects.inc:503
 msgid "Mathematical Institute of Leiden University / Kennislink"
-msgstr ""
+msgstr "Matematický inštitút Leidenskej Univerzity, Kennislink"
 
 #: projects.inc:505
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
-msgstr ""
+msgid ""
+"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
+"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
+"product of the distinct prime factors of n. The ABC conjecture says that "
+"there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for "
+"any real h > 1. The ABC conjecture is currently one of the greatest open "
+"problems in mathematics. If it is proven to be true, a lot of other open "
+"problems can be answered directly from it."
+msgstr "Vyhľadávanie \"ABC-trojíc\": celé kladné čísla a, b, c tak, že a + b = c, & lt; b & lt; c, a, b, c nemajú spoločné delitele a c> rad(ABC), kde rad(n) je výsledok z priamych prvočísel n. Domnienka ABC hovorí, že existuje len konečne veľa, b, c taká, že log (c) / log (rad(abc))> h pre skutočný h> 1. Domnienka ABC je jedna z najväčších otvorených problémov v matematike. Je dokázané, že je odpoveďou na mnoho ďalších otvorených problemov."
 
 #: projects.inc:513
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
-msgstr ""
+msgid ""
+"Primegrid has multiple projects searching for different forms of very large "
+"prime numbers, including searching for the largest known prime number."
+msgstr "Primegrid má viacero projektov, ktoré hľadajú rôzne formy veľmi veľkých prvočísel, vrátane hľadania najväčšieho prvočísla."
 
 #: projects.inc:519
 msgid "Hochschule RheinMain University of Applied Sciences"
-msgstr ""
+msgstr "Univerzita Aplikovanej vedy Hochschule RheinMain"
 
 #: projects.inc:521
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
-msgstr ""
+msgid ""
+"Search for counterexamples to two conjectures related to the identification "
+"of prime numbers"
+msgstr "Hľadá protipríklady k dvom domnienkam spojenými s identifikáciou prvočísel."
 
 #: projects.inc:529
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
-msgstr ""
+msgid ""
+"Find all the generalized binary number systems (in which bases are matrices "
+"and digits are vectors) up to dimension 11."
+msgstr "Hľadá všetky všeobecné systémy binarnych čisel (kde základy su matrice a čísla sú vektory) až po 11 miestne čísla."
 
 #: ../html/inc/news.inc:40
 msgid "Comment"
-msgstr ""
+msgstr "Komentár"
 
 #: ../html/inc/news.inc:111
 #, php-format
 msgid "News is available as an %sRSS feed%s"
-msgstr ""
-
-# 75%
-#, fuzzy
-#~ msgid "Astronomy, Physics, and Chemistry"
-#~ msgstr "Astronómia/Fyzika/Chémia"
-#~ msgid "FreeHAL"
-#~ msgstr "FreeHAL"
-#~ msgid "private"
-#~ msgstr "súkromný"
-#~ msgid "POEM at HOME"
-#~ msgstr "POEM at HOME"
-#~ msgid "Docking at Home"
-#~ msgstr "Docking at Home"
-#~ msgid "GPUGrid.net"
-#~ msgstr "GPUGrid.net"
-#~ msgid "Superlink at Technion"
-#~ msgstr "Superlink at Technion"
-#~ msgid "The Lattice Project"
-#~ msgstr "Projekt Lattice"
-#~ msgid "Malariacontrol.net"
-#~ msgstr "Malariacontrol.net"
-#~ msgid "Rosetta at home"
-#~ msgstr "Rosetta at home"
-#~ msgid "SIMAP"
-#~ msgstr "SIMAP"
-#~ msgid "Virtual Prairie"
-#~ msgstr "Virtuálne prérie"
-#~ msgid "University of Houston"
-#~ msgstr "Univerzita v Houstone"
-#~ msgid "Study of botanical ecosystems"
-#~ msgstr "Štúdia botanických ekosystémov"
-#~ msgid "Climateprediction.net"
-#~ msgstr "Climateprediction.net"
-#~ msgid "Astronomy/Physics/Chemistry"
-#~ msgstr "Astronómia/Fyzika/Chémia"
-#~ msgid "eOn"
-#~ msgstr "eOn"
-#~ msgid "Orbit at home"
-#~ msgstr "Orbit at home"
-#~ msgid "Planetary Science Institute"
-#~ msgstr "Inštitút planetárnych ved"
-#~ msgid "Monitor and study the hazard posed by near-Earth asteroids"
-#~ msgstr ""
-#~ "Študiúm a sledovanie rizík, ktorá predstavujú pre Zem neďaleké asteroidy"
-#~ msgid "Cosmology at Home"
-#~ msgstr "Cosmology at Home"
-#~ msgid "University of Illinois at Urbana-Chamapign"
-#~ msgstr "Illinoiská univerzita v Urbana-Champaign"
-#~ msgid "Milkyway at home"
-#~ msgstr "Milkyway at home"
-#~ msgid "Leiden Classical"
-#~ msgstr "Leiden Classical"
-#~ msgid "uFluids at home"
-#~ msgstr "uFluids at home"
-#~ msgid "Purdue University"
-#~ msgstr "Purdueova univerzita"
-#~ msgid "Physics/Aeronautics"
-#~ msgstr "Fyzika/Letectvo"
-
-# 75%
-#, fuzzy
-#~ msgid "University of Muenster (Germany)"
-#~ msgstr "Univerzita v Karlsruhe (Nemecko)"
-
+msgstr "Novinky sú dostupné ako %sRSS feed%s"
diff --git a/locale/sl/BOINC-Client.mo b/locale/sl/BOINC-Client.mo
index c063940..a0913aa 100644
Binary files a/locale/sl/BOINC-Client.mo and b/locale/sl/BOINC-Client.mo differ
diff --git a/locale/sl/BOINC-Client.po b/locale/sl/BOINC-Client.po
index ed934a5..0fc2021 100755
--- a/locale/sl/BOINC-Client.po
+++ b/locale/sl/BOINC-Client.po
@@ -4,20 +4,21 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-10-15 22:25-0700\n"
-"PO-Revision-Date: 2015-02-12 01:52-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: 2013-06-05 20:02+0200\n"
+"Last-Translator: Anonymous Pootle User\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
+"n%100==4 ? 2 : 3);\n"
 "X-Generator: Pootle 2.1.6\n"
 
-#: acct_mgr.cpp:450
-#: acct_mgr.cpp:459
+#: acct_mgr.cpp:450 acct_mgr.cpp:459
 #, fuzzy
 msgid "Message from account manager"
 msgstr "Sporočilo strežnika projekta:"
@@ -28,7 +29,9 @@ msgid "Message from server"
 msgstr "Sporočilo strežnika projekta:"
 
 #: client_state.cpp:258
-msgid "Some tasks need more memory than allowed by your preferences.  Please check the preferences."
+msgid ""
+"Some tasks need more memory than allowed by your preferences.  Please check "
+"the preferences."
 msgstr ""
 
 #: client_state.cpp:520
@@ -41,11 +44,12 @@ msgstr "HTTP_PROXY spremenljivka okolja mora določati HTTP posrednika"
 
 #: cs_scheduler.cpp:613
 #, c-format
-msgid "You used the wrong URL for this project.  When convenient, remove this project, then add %s"
+msgid ""
+"You used the wrong URL for this project.  When convenient, remove this "
+"project, then add %s"
 msgstr ""
 
-#: cs_statefile.cpp:828
-#: ../sched/sched_types.cpp:259
+#: cs_statefile.cpp:828 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
 msgstr "Sintaktična napaka v app_info.xml"
 
@@ -57,18 +61,15 @@ msgstr ""
 msgid "A new version of BOINC is available."
 msgstr "Na voljo je nova različica BOINC."
 
-#: current_version.cpp:94
-#: current_version.cpp:102
+#: current_version.cpp:94 current_version.cpp:102
 msgid "Download"
 msgstr ""
 
-#: log_flags.cpp:269
-#: log_flags.cpp:449
+#: log_flags.cpp:269 log_flags.cpp:449
 msgid "Unexpected text in cc_config.xml"
 msgstr "Nepričakovano besedilo v cc_config.xml"
 
-#: log_flags.cpp:423
-#: log_flags.cpp:475
+#: log_flags.cpp:423 log_flags.cpp:475
 msgid "Unrecognized tag in cc_config.xml"
 msgstr "Neprepoznana značka v cc_config.xml"
 
@@ -88,15 +89,21 @@ msgstr "Manjkajoča končna značka v cc_config.xml"
 #: ../sched/handle_request.cpp:307
 #, fuzzy
 msgid "Invalid or missing account key.  To fix, remove and add this project."
-msgstr "Napačen ali manjkajoč ključ računa.  Da popravite, se odklopite in ponovno priklopite na ta projekt."
+msgstr ""
+"Napačen ali manjkajoč ključ računa.  Da popravite, se odklopite in ponovno "
+"priklopite na ta projekt."
 
 #: ../sched/handle_request.cpp:849
 #, fuzzy
 msgid "Invalid code signing key.  To fix, remove and add this project."
-msgstr "Napačen ali manjkajoč ključ računa.  Da popravite, se odklopite in ponovno priklopite na ta projekt."
+msgstr ""
+"Napačen ali manjkajoč ključ računa.  Da popravite, se odklopite in ponovno "
+"priklopite na ta projekt."
 
 #: ../sched/handle_request.cpp:859
-msgid "The project has changed its security key.  Please remove and add this project."
+msgid ""
+"The project has changed its security key.  Please remove and add this "
+"project."
 msgstr ""
 
 #: ../sched/handle_request.cpp:943
@@ -108,8 +115,11 @@ msgid "This project doesn't support CPU type"
 msgstr "Ta projekt ne podpira tipa procesorja"
 
 #: ../sched/handle_request.cpp:993
-msgid "Your BOINC client software is too old.  Please install the current version."
-msgstr "Vaša programska oprema BOINC odjemalec je prestara.  Prosimo, namestite trenutno različico."
+msgid ""
+"Your BOINC client software is too old.  Please install the current version."
+msgstr ""
+"Vaša programska oprema BOINC odjemalec je prestara.  Prosimo, namestite "
+"trenutno različico."
 
 #: ../sched/handle_request.cpp:1259
 msgid "This project doesn't support computers of type"
@@ -117,26 +127,38 @@ msgstr "Ta projekt ne podpira računalnikov tega tipa"
 
 #: ../sched/sched_send.cpp:1092
 msgid "Upgrade to the latest driver to process tasks using your computer's GPU"
-msgstr "Posodobite na najnovejši gonilnik za obdelovanje opravil z uporabo grafičnega procesorja vašega računalnika"
+msgstr ""
+"Posodobite na najnovejši gonilnik za obdelovanje opravil z uporabo "
+"grafičnega procesorja vašega računalnika"
 
 #: ../sched/sched_send.cpp:1099
-msgid "Upgrade to the latest driver to use all of this project's GPU applications"
-msgstr "Posodobite na najnovejši gonilnik za uporabo vseh aplikacij grafičnega procesorja tega projekta"
+msgid ""
+"Upgrade to the latest driver to use all of this project's GPU applications"
+msgstr ""
+"Posodobite na najnovejši gonilnik za uporabo vseh aplikacij grafičnega "
+"procesorja tega projekta"
 
 #: ../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 "Za uporabo vašega NVIDIA grafičnega procesorja je potrebna novejša različica BOINC; prosim nadgradite na trenutno različico"
+msgid ""
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to "
+"the current version"
+msgstr ""
+"Za uporabo vašega NVIDIA grafičnega procesorja je potrebna novejša različica "
+"BOINC; prosim nadgradite na trenutno različico"
 
 # 94%
 #: ../sched/sched_send.cpp:1146
 #, c-format
+#, c-format, fuzzy
 msgid "An %s GPU is required to run tasks for this project"
-msgstr ""
+msgstr "ATI grafični procesor je potreben za poganjanje opravil tega projekta"
 
 #: ../sched/sched_send.cpp:1262
 #, fuzzy
 msgid "No tasks are available for the applications you have selected."
-msgstr "Za aplikacije, ki ste jih izbrali, ni na voljo dela.  Prosimo, preverite vaše nastavitve projektov na spletni strani."
+msgstr ""
+"Za aplikacije, ki ste jih izbrali, ni na voljo dela.  Prosimo, preverite "
+"vaše nastavitve projektov na spletni strani."
 
 #: ../sched/sched_send.cpp:1288
 msgid "Your computer type is not supported by this project"
@@ -144,11 +166,13 @@ msgstr "Ta projekt ne podpira vašega tipa računalnika"
 
 #: ../sched/sched_send.cpp:1294
 msgid "Newer BOINC version required; please install current version"
-msgstr "Zahtevana je nova različica BOINC; prosimo, namestite trenutno različico"
+msgstr ""
+"Zahtevana je nova različica BOINC; prosimo, namestite trenutno različico"
 
 #: ../sched/sched_send.cpp:1305
 #, c-format
-msgid "Tasks for %s are available, but your preferences are set to not accept them"
+msgid ""
+"Tasks for %s are available, but your preferences are set to not accept them"
 msgstr ""
 
 #: ../sched/sched_types.cpp:254
@@ -161,44 +185,52 @@ msgstr "Vaša datoteka app_info.xml nima uporabne različice"
 
 #~ msgid "Download it."
 #~ msgstr "Prenesite jo."
+
 #~ msgid "An NVIDIA or ATI GPU is required to run tasks for this project"
 #~ msgstr ""
 #~ "NVIDIA ali ATI grafični procesor je potreben za poganjanje opravil tega "
 #~ "projekta"
+
 #~ msgid "An NVIDIA GPU is required to run tasks for this project"
 #~ msgstr ""
 #~ "NVIDIA grafični procesor je potreben za poganjanje opravil tega projekta"
+
 #~ msgid "An ATI GPU is required to run tasks for this project"
 #~ msgstr "ATI grafični procesor je potreben za poganjanje opravil tega projekta"
+
 #~ msgid ""
 #~ "Tasks for NVIDIA GPU are available, but your preferences are set to not "
 #~ "accept them"
 #~ msgstr ""
 #~ "Opravila za NVIDIA grafični procesor so na voljo, vendar so vaše nastavitve, "
 #~ "da jih ne sprejemate"
+
 #~ msgid ""
 #~ "Tasks for ATI GPU are available, but your preferences are set to not accept "
 #~ "them"
 #~ msgstr ""
 #~ "Opravila za ATI grafični procesor so na voljo, vendar so vaše nastavitve, da "
 #~ "jih ne sprejemate"
+
 #~ msgid ""
 #~ "Tasks for CPU are available, but your preferences are set to not accept them"
 #~ msgstr ""
 #~ "Opravila za procesor so na voljo, vendar so vaše nastavitve, da jih ne "
 #~ "sprejemate"
+
 #~ msgid "error"
 #~ msgstr "napaka"
+
 #~ msgid "Can't resolve hostname in remote_hosts.cfg"
 #~ msgstr "Ni mogoče razrešiti ime gostitelja v remote_hosts.cfg"
 
 #, fuzzy
 #~ msgid "is not available for"
 #~ msgstr "ni na voljo za vaš tip računalnika"
+
 #~ msgid ""
 #~ "You may have an outdated code signing key.  Try attaching and reattaching "
 #~ "this project."
 #~ msgstr ""
 #~ "Morda imate zastarel ključ za podpisovanje kode.  Poskusite se odklopiti "
 #~ "in ponovno priklopiti na ta projekt."
-
diff --git a/locale/sl/BOINC-Manager.mo b/locale/sl/BOINC-Manager.mo
index 64c4331..e522d6e 100644
Binary files a/locale/sl/BOINC-Manager.mo and b/locale/sl/BOINC-Manager.mo differ
diff --git a/locale/sl/BOINC-Manager.po b/locale/sl/BOINC-Manager.po
index 545d8a2..de644c4 100755
--- a/locale/sl/BOINC-Manager.po
+++ b/locale/sl/BOINC-Manager.po
@@ -4,32 +4,35 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-15 14:15-0500\n"
-"PO-Revision-Date: 2015-02-12 01:58-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"POT-Creation-Date: 2014-02-02 00:00-0800\n"
+"PO-Revision-Date: 2013-06-05 20:02+0200\n"
+"Last-Translator: Anonymous Pootle User\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
+"n%100==4 ? 2 : 3);\n"
 "X-Generator: Pootle 2.1.6\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc_7.4\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-SearchPath-0: clientgui\n"
 "X-Poedit-SearchPath-1: clientgui/msw\n"
 "X-Poedit-SearchPath-2: clientgui/gtk\n"
 "X-Poedit-SearchPath-3: clientgui/mac\n"
+"X-Poedit-SearchPath-0: clientgui\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\n"
+"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
 
 # 81%
-#: clientgui/AccountInfoPage.cpp:387
+#: AccountInfoPage.cpp:387
 #, c-format
+#, fuzzy, c-format
 msgid "Identify your account at %s"
-msgstr ""
+msgstr "Identificirajte vaš uporabniški račun"
 
-#: clientgui/AccountInfoPage.cpp:393
+#: AccountInfoPage.cpp:393
 msgid ""
 "Please enter your account information\n"
 "(to create an account, visit the project's web site)"
@@ -37,7 +40,7 @@ msgstr ""
 "Prosim vnesite informacije o vašem uporabniškem računu\n"
 "(da ustvarite račun, obiščite domačo stran projekta)"
 
-#: clientgui/AccountInfoPage.cpp:397
+#: AccountInfoPage.cpp:397
 #, fuzzy
 msgid ""
 "This project is not currently accepting new accounts.\n"
@@ -46,19 +49,19 @@ msgstr ""
 "Ta projekt trenutne ne sprejema novih uporabniških računov.\n"
 "Lahko se pripnete le, če račun že imate."
 
-#: clientgui/AccountInfoPage.cpp:401
+#: AccountInfoPage.cpp:401
 msgid "Are you already running this project?"
 msgstr "Ali že poganjate ta projekt?"
 
-#: clientgui/AccountInfoPage.cpp:405
+#: AccountInfoPage.cpp:405
 msgid "&No, new user"
 msgstr "&Ne, nov uporabnik"
 
-#: clientgui/AccountInfoPage.cpp:408
+#: AccountInfoPage.cpp:408
 msgid "&Yes, existing user"
 msgstr "&Da, obstoječi uporabnik"
 
-#: clientgui/AccountInfoPage.cpp:413
+#: AccountInfoPage.cpp:413
 #, fuzzy
 msgid ""
 "We were not able to set up your account information\n"
@@ -75,52 +78,46 @@ msgstr ""
 "spodaj, da izveste kaj napisati v vnosni polji\n"
 "elektronska pošta in geslo."
 
-#: clientgui/AccountInfoPage.cpp:416
+#: AccountInfoPage.cpp:416
 #, fuzzy
 msgid "Find login information"
 msgstr "Najdi prijavne informacije"
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:649
+#: AccountInfoPage.cpp:436 AccountInfoPage.cpp:641
 msgid "&Password:"
 msgstr "&Geslo:"
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:673
+#: AccountInfoPage.cpp:443 AccountInfoPage.cpp:665
 msgid "Choose a &password:"
 msgstr "Izberite &geslo:"
 
-#: clientgui/AccountInfoPage.cpp:446
+#: AccountInfoPage.cpp:446
 msgid "C&onfirm password:"
 msgstr "P&otrdi geslo:"
 
-#: clientgui/AccountInfoPage.cpp:453
+#: AccountInfoPage.cpp:453
 #, c-format
 msgid "Are you already running %s?"
 msgstr "Ali že poganjate %s?"
 
-#: clientgui/AccountInfoPage.cpp:482
+#: AccountInfoPage.cpp:482
 msgid "&Username:"
 msgstr "&Uporabniško ime:"
 
-#: clientgui/AccountInfoPage.cpp:511
-msgid "&Email address or LDAP ID:"
-msgstr ""
-
-#: clientgui/AccountInfoPage.cpp:515
+#: AccountInfoPage.cpp:508
 msgid "&Email address:"
 msgstr "&Elektronska pošta:"
 
-#: clientgui/AccountInfoPage.cpp:523
+#: AccountInfoPage.cpp:515
 #, c-format
 msgid "minimum length %d"
 msgstr "minimalna dolžina %d"
 
-#: clientgui/AccountInfoPage.cpp:530
+#: AccountInfoPage.cpp:522
 msgid "Forgot your password?"
 msgstr "Ste pozabili geslo?"
 
-#: clientgui/AccountInfoPage.cpp:537
+#: AccountInfoPage.cpp:529
 msgid ""
 "If you have not yet registered with this account manager,\n"
 "please do so before proceeding.  Click on the link below\n"
@@ -130,45 +127,46 @@ msgstr ""
 "prosim to storite pred nadaljevanjem. Kliknite na povezavo spodaj\n"
 "za registriracijo ali da spet pridobite pozabljeno geslo."
 
-#: clientgui/AccountInfoPage.cpp:540
+#: AccountInfoPage.cpp:532
 msgid "Account manager web site"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:582
+#: AccountInfoPage.cpp:574 WelcomePage.cpp:348
 msgid "Add project"
 msgstr "Dodaj projekt"
 
-#: clientgui/AccountInfoPage.cpp:584
+#: AccountInfoPage.cpp:576
 msgid "Update account manager"
 msgstr "Posodobite upravitelja računov"
 
-#: clientgui/AccountInfoPage.cpp:586
+#: AccountInfoPage.cpp:578 WelcomePage.cpp:307 WelcomePage.cpp:321
 #, fuzzy
 msgid "Use account manager"
 msgstr "Dodaj upravitelja računov"
 
-#: clientgui/AccountInfoPage.cpp:593
+#: AccountInfoPage.cpp:585
 msgid "Please enter a user name."
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:595
+#: AccountInfoPage.cpp:587
 msgid "Please enter an email address."
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:605
+#: AccountInfoPage.cpp:597
 #, c-format
 msgid "Please enter a password of at least %d characters."
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:615
-msgid "The password and confirmation password do not match. Please type them again."
+#: AccountInfoPage.cpp:607
+msgid ""
+"The password and confirmation password do not match. Please type them again."
 msgstr "Geslo in potrditev gesla se ne ujemata. Prosim, vtipkajte jih znova."
 
-#: clientgui/AccountManagerInfoPage.cpp:272
+#: AccountManagerInfoPage.cpp:272
 msgid "Choose an account manager"
 msgstr "Izberite upravitelja računov"
 
-#: clientgui/AccountManagerInfoPage.cpp:275
+#: AccountManagerInfoPage.cpp:275
 msgid ""
 "To choose an account manager, click its name or \n"
 "type its URL below."
@@ -176,398 +174,386 @@ msgstr ""
 "Da izberete upravitelja računov, kliknite njegovo ime ali\n"
 "spodaj napišite njegov URL."
 
-#: clientgui/AccountManagerInfoPage.cpp:279
+#: AccountManagerInfoPage.cpp:279
 msgid "Account manager details:"
 msgstr ""
 
-#: clientgui/AccountManagerInfoPage.cpp:283
+#: AccountManagerInfoPage.cpp:283
 msgid "Account manager &URL:"
 msgstr ""
 
-#: clientgui/AccountManagerInfoPage.cpp:287
+#: AccountManagerInfoPage.cpp:287
 msgid "Open web page"
 msgstr ""
 
-#: clientgui/AccountManagerInfoPage.cpp:290
+#: AccountManagerInfoPage.cpp:290
 msgid "Visit this account manager's web site"
 msgstr ""
 
-#: clientgui/AccountManagerProcessingPage.cpp:186
-#: clientgui/AccountManagerPropertiesPage.cpp:192
+#: AccountManagerProcessingPage.cpp:187 AccountManagerPropertiesPage.cpp:193
 #, c-format
 msgid "Communicating with %s."
 msgstr "Komuniciram z %s."
 
-#: clientgui/AccountManagerProcessingPage.cpp:193
-#: clientgui/AccountManagerPropertiesPage.cpp:199
+#: AccountManagerProcessingPage.cpp:194 AccountManagerPropertiesPage.cpp:200
 msgid "Communicating with server."
 msgstr "Komuniciram s strežnikom."
 
-#: clientgui/AccountManagerProcessingPage.cpp:198
-#: clientgui/AccountManagerPropertiesPage.cpp:204
+#: AccountManagerProcessingPage.cpp:199 AccountManagerPropertiesPage.cpp:205
 msgid "Please wait..."
 msgstr "Prosim, počakajte..."
 
-#: clientgui/AccountManagerProcessingPage.cpp:325
+#: AccountManagerProcessingPage.cpp:326
 msgid "An internal server error has occurred.\n"
 msgstr "Pojavila se je notranja napaka strežnika\n"
 
-#: clientgui/AdvancedFrame.cpp:96
+#: AdvancedFrame.cpp:95
 msgid "Connected"
 msgstr "Povezan"
 
-#: clientgui/AdvancedFrame.cpp:104
+#: AdvancedFrame.cpp:103
 msgid "Disconnected"
 msgstr "Odklopljen"
 
-#: clientgui/AdvancedFrame.cpp:318
+#: AdvancedFrame.cpp:322 sg_BoincSimpleFrame.cpp:119
 #, c-format
 msgid "Close the %s window"
 msgstr "Zapri okno %s"
 
-#: clientgui/AdvancedFrame.cpp:321
+#: AdvancedFrame.cpp:325 sg_BoincSimpleFrame.cpp:122
 msgid "&Close Window"
 msgstr "&Zapri okno"
 
-#: clientgui/AdvancedFrame.cpp:332
-#: clientgui/AdvancedFrame.cpp:339
-#: clientgui/AdvancedFrame.cpp:346
+#: AdvancedFrame.cpp:336 AdvancedFrame.cpp:343 AdvancedFrame.cpp:350
 #, c-format
 msgid "Exit %s"
 msgstr "Zapusti %s"
 
-#: clientgui/AdvancedFrame.cpp:359
-msgid "Preferences..."
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:368
+#: AdvancedFrame.cpp:371
 msgid "&Notices\tCtrl+Shift+N"
 msgstr "&Obvestila\tCtrl+Shift+N"
 
-#: clientgui/AdvancedFrame.cpp:369
+#: AdvancedFrame.cpp:372
 msgid "Display notices"
 msgstr "Prikaži obvestila"
 
-#: clientgui/AdvancedFrame.cpp:374
+#: AdvancedFrame.cpp:377
 msgid "&Projects\tCtrl+Shift+P"
 msgstr "&Projekti\tCtrl-Shitf+P"
 
-#: clientgui/AdvancedFrame.cpp:375
+#: AdvancedFrame.cpp:378
 msgid "Display projects"
 msgstr "Prikaži projekte"
 
-#: clientgui/AdvancedFrame.cpp:380
+#: AdvancedFrame.cpp:383
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr "&Opravila\tCtrl+Shift+T"
 
-#: clientgui/AdvancedFrame.cpp:381
+#: AdvancedFrame.cpp:384
 msgid "Display tasks"
 msgstr "Prikaži opravila"
 
-#: clientgui/AdvancedFrame.cpp:386
+#: AdvancedFrame.cpp:389
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr "P&renosi\tCtrl-Shift+X"
 
-#: clientgui/AdvancedFrame.cpp:387
+#: AdvancedFrame.cpp:390
 msgid "Display transfers"
 msgstr "Prikaži prenose"
 
-#: clientgui/AdvancedFrame.cpp:392
+#: AdvancedFrame.cpp:395
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "&Statistika\tCtrl+Shift+S"
 
-#: clientgui/AdvancedFrame.cpp:393
+#: AdvancedFrame.cpp:396
 msgid "Display statistics"
 msgstr "Prikaži statistiko"
 
-#: clientgui/AdvancedFrame.cpp:398
+#: AdvancedFrame.cpp:401
 msgid "&Disk usage\tCtrl+Shift+D"
 msgstr "Poraba &diska\tCtrl+Shift+D"
 
-#: clientgui/AdvancedFrame.cpp:399
+#: AdvancedFrame.cpp:402
 msgid "Display disk usage"
 msgstr "Prikaži porabo diska"
 
-#: clientgui/AdvancedFrame.cpp:406
+#: AdvancedFrame.cpp:409
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr "Preprosti &pogled...\tCtrl+Shift+V"
 
-#: clientgui/AdvancedFrame.cpp:407
+#: AdvancedFrame.cpp:410
 msgid "Display the simple graphical interface."
 msgstr "Prikaži preprost uporabniški vmesnik."
 
-#: clientgui/AdvancedFrame.cpp:421
+#: AdvancedFrame.cpp:424
 msgid "&Add project or account manager..."
 msgstr "Dodaj &projekt ali upravitelja računov..."
 
-#: clientgui/AdvancedFrame.cpp:422
+#: AdvancedFrame.cpp:425 sg_ProjectPanel.cpp:76
 msgid "Volunteer for any or all of 30+ projects in many areas of science"
-msgstr "Bodite prostovoljec za kateregakoli ali vse izmed več kot 30 projektov na več znanstvenih področjih"
+msgstr ""
+"Bodite prostovoljec za kateregakoli ali vse izmed več kot 30 projektov na "
+"več znanstvenih področjih"
 
-#: clientgui/AdvancedFrame.cpp:426
+#: AdvancedFrame.cpp:429
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "&Sinhroniziraj s %s"
 
-#: clientgui/AdvancedFrame.cpp:430
+#: AdvancedFrame.cpp:433
 #, c-format
 msgid "Get current settings from %s"
 msgstr "Dobi trenutne nastavitve od %s"
 
-#: clientgui/AdvancedFrame.cpp:440
+#: AdvancedFrame.cpp:443
 msgid "&Add project..."
 msgstr "Dodaj &projekt..."
 
-#: clientgui/AdvancedFrame.cpp:441
+#: AdvancedFrame.cpp:444
 msgid "Add a project"
 msgstr "Dodaj projekt"
 
-#: clientgui/AdvancedFrame.cpp:444
+#: AdvancedFrame.cpp:447
 #, c-format
 msgid "S&top using %s..."
 msgstr "Nehaj&te uporabljati %s..."
 
-#: clientgui/AdvancedFrame.cpp:450
+#: AdvancedFrame.cpp:453
 msgid "Remove this computer from account manager control."
 msgstr "Odstrani ta računalnik iz nadzora upravitelja računov."
 
-#: clientgui/AdvancedFrame.cpp:455
+#: AdvancedFrame.cpp:458 sg_BoincSimpleFrame.cpp:178
 msgid "&Options..."
 msgstr "M&ožnosti"
 
-#: clientgui/AdvancedFrame.cpp:456
+#: AdvancedFrame.cpp:459 sg_BoincSimpleFrame.cpp:179
 #, fuzzy
 msgid "Configure display options and proxy settings"
-msgstr "Nastavi možnosti grafičnega uporabniškega vmesnika in nastavitve posredniškega strežnika (proxy)"
+msgstr ""
+"Nastavi možnosti grafičnega uporabniškega vmesnika in nastavitve "
+"posredniškega strežnika (proxy)"
 
-#: clientgui/AdvancedFrame.cpp:460
+#: AdvancedFrame.cpp:463 sg_BoincSimpleFrame.cpp:172
 msgid "Computing &preferences..."
 msgstr "&Nastavitve računanja..."
 
-#: clientgui/AdvancedFrame.cpp:461
+#: AdvancedFrame.cpp:464 sg_BoincSimpleFrame.cpp:173
 msgid "Configure computing preferences"
 msgstr "Nastavi nastavitve računanja"
 
-#: clientgui/AdvancedFrame.cpp:469
+#: AdvancedFrame.cpp:472
 msgid "&Run always"
 msgstr "&Poganjaj vedno"
 
-#: clientgui/AdvancedFrame.cpp:470
+#: AdvancedFrame.cpp:473
 msgid "Allow work regardless of preferences"
 msgstr "Dovoli delo, ne glede na nastavitve"
 
-#: clientgui/AdvancedFrame.cpp:474
+#: AdvancedFrame.cpp:477
 msgid "Run based on &preferences"
 msgstr "Poganjaj glede na &nastavitve"
 
-#: clientgui/AdvancedFrame.cpp:475
+#: AdvancedFrame.cpp:478
 msgid "Allow work according to preferences"
 msgstr "Dovoli delo glede na vaše nastavitve"
 
-#: clientgui/AdvancedFrame.cpp:479
+#: AdvancedFrame.cpp:482
 msgid "&Suspend"
 msgstr "Na ča&kanje"
 
-#: clientgui/AdvancedFrame.cpp:480
+#: AdvancedFrame.cpp:483
 msgid "Stop work regardless of preferences"
 msgstr "Ustavi delo ne glede na nastavitve"
 
-#: clientgui/AdvancedFrame.cpp:505
+#: AdvancedFrame.cpp:508
 msgid "Use GPU always"
 msgstr "Vedno uporabi grafični procesor"
 
-#: clientgui/AdvancedFrame.cpp:506
+#: AdvancedFrame.cpp:509
 msgid "Allow GPU work regardless of preferences"
 msgstr "Dovoli delo grafičnega procesorja, ne glede na nastavitve"
 
-#: clientgui/AdvancedFrame.cpp:510
+#: AdvancedFrame.cpp:513
 msgid "Use GPU based on preferences"
 msgstr "Uporabi grafični procesor, glede na nastavitve"
 
-#: clientgui/AdvancedFrame.cpp:511
+#: AdvancedFrame.cpp:514
 msgid "Allow GPU work according to preferences"
 msgstr "Dovoli delo grafičnega procesorja glede na nastavitve"
 
-#: clientgui/AdvancedFrame.cpp:515
+#: AdvancedFrame.cpp:518
 msgid "Suspend GPU"
 msgstr "Daj grafični procesor na čakanje"
 
-#: clientgui/AdvancedFrame.cpp:516
+#: AdvancedFrame.cpp:519
 msgid "Stop GPU work regardless of preferences"
 msgstr "Ustavi delo grafičnega procesorja, ne glede na nastavitve"
 
-#: clientgui/AdvancedFrame.cpp:540
+#: AdvancedFrame.cpp:543
 msgid "Network activity always available"
 msgstr "Mrežna aktivnost je vedno na voljo"
 
-#: clientgui/AdvancedFrame.cpp:541
+#: AdvancedFrame.cpp:544
 msgid "Allow network activity regardless of preferences"
 msgstr "Dovoli mrežno aktivnost ne glede na nastavitve"
 
-#: clientgui/AdvancedFrame.cpp:545
+#: AdvancedFrame.cpp:548
 msgid "Network activity based on preferences"
 msgstr "Mrežna aktivnost temelječa na nastavitvah"
 
-#: clientgui/AdvancedFrame.cpp:546
+#: AdvancedFrame.cpp:549
 msgid "Allow network activity according to preferences"
 msgstr "Dovoli mrežno aktivnost glede na nastavitve"
 
-#: clientgui/AdvancedFrame.cpp:550
+#: AdvancedFrame.cpp:553
 msgid "Network activity suspended"
 msgstr "Mrežna aktivnost na čakanju"
 
-#: clientgui/AdvancedFrame.cpp:551
+#: AdvancedFrame.cpp:554
 msgid "Stop BOINC network activity"
 msgstr "Ustavi mrežno aktivnost BOINC"
 
-#: clientgui/AdvancedFrame.cpp:561
+#: AdvancedFrame.cpp:564
 #, c-format
 msgid "Connect to another computer running %s"
 msgstr "Poveži se na drug računalnik, ki poganja %s"
 
-#: clientgui/AdvancedFrame.cpp:566
+#: AdvancedFrame.cpp:569
 msgid "Select computer..."
 msgstr "Izberi računalnik..."
 
-#: clientgui/AdvancedFrame.cpp:571
+#: AdvancedFrame.cpp:574
 msgid "Shut down connected client..."
 msgstr "Izklopi povezanega odjemalca..."
 
-#: clientgui/AdvancedFrame.cpp:572
+#: AdvancedFrame.cpp:575
 msgid "Shut down the currently connected client"
 msgstr "Izklopi trentuno povezanega odjemalca"
 
-#: clientgui/AdvancedFrame.cpp:576
+#: AdvancedFrame.cpp:579
 msgid "Run CPU &benchmarks"
 msgstr "Poženi meritev &hitrost procesorja"
 
-#: clientgui/AdvancedFrame.cpp:577
+#: AdvancedFrame.cpp:580
 msgid "Runs BOINC CPU benchmarks"
 msgstr "Požene BOINC meritve hitrosti procesorja"
 
-#: clientgui/AdvancedFrame.cpp:581
+#: AdvancedFrame.cpp:584
 msgid "Do network communication"
 msgstr "Izvedi komunikacijo po mreži"
 
-#: clientgui/AdvancedFrame.cpp:582
+#: AdvancedFrame.cpp:585
 msgid "Do all pending network communication"
 msgstr "Izvedi vso čakajočo komunikacijo po mreži"
 
 # 94%
-#: clientgui/AdvancedFrame.cpp:586
+#: AdvancedFrame.cpp:589
 #, fuzzy
 msgid "Read config files"
 msgstr "Preberi konfiguracijsko datoteko"
 
-#: clientgui/AdvancedFrame.cpp:587
+#: AdvancedFrame.cpp:590
 msgid "Read configuration info from cc_config.xml and any app_config.xml files"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:591
+#: AdvancedFrame.cpp:594
 msgid "Read local prefs file"
 msgstr "Preberi lokalno datoteko z nastavitvami"
 
-#: clientgui/AdvancedFrame.cpp:592
+#: AdvancedFrame.cpp:595
 msgid "Read preferences from global_prefs_override.xml."
 msgstr "Preberi nastavitve iz global_prefs_override.xml."
 
-#: clientgui/AdvancedFrame.cpp:597
+#: AdvancedFrame.cpp:600
 #, c-format
 msgid "Launch another instance of %s..."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:601
+#: AdvancedFrame.cpp:604
 #, c-format
 msgid "Launch another %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:611
+#: AdvancedFrame.cpp:614
 msgid "Event Log...\tCtrl+Shift+E"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:612
+#: AdvancedFrame.cpp:615
 msgid "Display diagnostic messages."
 msgstr "Prikaži diagnostična sporočila."
 
-#: clientgui/AdvancedFrame.cpp:616
-msgid "Event Log Diagnostic Flags...\tCtrl+Shift+F"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:617
-msgid "Enable or disable various diagnostic messages"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:626
+#: AdvancedFrame.cpp:625 sg_BoincSimpleFrame.cpp:188
 #, c-format
 msgid "%s &help"
 msgstr "%s &pomoč"
 
-#: clientgui/AdvancedFrame.cpp:632
+#: AdvancedFrame.cpp:631 sg_BoincSimpleFrame.cpp:194
 #, c-format
 msgid "Show information about %s"
 msgstr "Prikaži informacije o %s"
 
-#: clientgui/AdvancedFrame.cpp:644
+#: AdvancedFrame.cpp:643
 #, c-format
 msgid "&%s help"
 msgstr "&%s pomoč"
 
-#: clientgui/AdvancedFrame.cpp:650
+#: AdvancedFrame.cpp:649 sg_BoincSimpleFrame.cpp:212
 #, c-format
 msgid "Show information about the %s"
 msgstr "Prikaži informacije o %s"
 
-#: clientgui/AdvancedFrame.cpp:662
+#: AdvancedFrame.cpp:661 sg_BoincSimpleFrame.cpp:224
 #, c-format
 msgid "%s &web site"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:668
+#: AdvancedFrame.cpp:667 sg_BoincSimpleFrame.cpp:230
 #, c-format
 msgid "Show information about BOINC and %s"
 msgstr "Prikaži informacije o BOINC in %s"
 
-#: clientgui/AdvancedFrame.cpp:680
-#: clientgui/BOINCTaskBar.cpp:544
+#: AdvancedFrame.cpp:679 BOINCTaskBar.cpp:530 sg_BoincSimpleFrame.cpp:242
 #, c-format
 msgid "&About %s..."
 msgstr "&O %s..."
 
-#: clientgui/AdvancedFrame.cpp:686
+#: AdvancedFrame.cpp:685 sg_BoincSimpleFrame.cpp:248
 msgid "Licensing and copyright information."
 msgstr "Informacije o licencah in avtorskih pravicah."
 
-#: clientgui/AdvancedFrame.cpp:693
+#: AdvancedFrame.cpp:692 sg_BoincSimpleFrame.cpp:255
 msgid "&File"
 msgstr "&Datoteka"
 
-#: clientgui/AdvancedFrame.cpp:697
+#: AdvancedFrame.cpp:696 sg_BoincSimpleFrame.cpp:259
 msgid "&View"
 msgstr "&Pogled"
 
-#: clientgui/AdvancedFrame.cpp:701
+#: AdvancedFrame.cpp:700 sg_BoincSimpleFrame.cpp:263
 msgid "&Tools"
 msgstr "&Orodja"
 
-#: clientgui/AdvancedFrame.cpp:705
+#: AdvancedFrame.cpp:704
 msgid "&Activity"
 msgstr "&Aktivnost"
 
-#: clientgui/AdvancedFrame.cpp:709
+#: AdvancedFrame.cpp:708
 msgid "A&dvanced"
 msgstr "Nap&redno"
 
-#: clientgui/AdvancedFrame.cpp:713
+#: AdvancedFrame.cpp:712 DlgEventLog.cpp:332 sg_BoincSimpleFrame.cpp:267
+#: wizardex.cpp:374 wizardex.cpp:381
 msgid "&Help"
 msgstr "Po&moč"
 
-#: clientgui/AdvancedFrame.cpp:1185
+#: AdvancedFrame.cpp:1199
 #, c-format
 msgid "%s - Stop using %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:1190
+#: AdvancedFrame.cpp:1204
 #, c-format
+#, fuzzy, c-format
 msgid ""
 "If you stop using %s,\n"
 "you'll keep all your current projects,\n"
@@ -581,12 +567,12 @@ msgstr ""
 "\n"
 "Ali se želite odklopiti od %s?"
 
-#: clientgui/AdvancedFrame.cpp:1397
+#: AdvancedFrame.cpp:1401
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s - Zaustavi trenutnega odjemalca..."
 
-#: clientgui/AdvancedFrame.cpp:1406
+#: AdvancedFrame.cpp:1410
 #, c-format
 msgid ""
 "%s will shut down the current client\n"
@@ -595,36 +581,37 @@ msgstr ""
 "%s bo zaustavil trenutnega odjemalca\n"
 "in vas povprašal po drugem gostitelju, na katerega naj se poveže."
 
-#: clientgui/AdvancedFrame.cpp:1806
+#: AdvancedFrame.cpp:1745 DlgAbout.cpp:119
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: clientgui/AdvancedFrame.cpp:1815
+#: AdvancedFrame.cpp:1754
 #, c-format
+#, fuzzy, c-format
 msgid "%s has successfully added %s"
 msgstr "%s se je uspešno pripel(-a) na %s"
 
-#: clientgui/AdvancedFrame.cpp:1953
+#: AdvancedFrame.cpp:1893
 #, c-format
 msgid "%s - (%s)"
 msgstr "%s - (%s)"
 
-#: clientgui/AdvancedFrame.cpp:1957
+#: AdvancedFrame.cpp:1897
 #, c-format
 msgid "Connecting to %s"
 msgstr "Povezujem se na %s"
 
-#: clientgui/AdvancedFrame.cpp:1960
+#: AdvancedFrame.cpp:1900
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "Povezan na %s (%s)"
 
-#: clientgui/AlreadyExistsPage.cpp:184
+#: AlreadyExistsPage.cpp:184
 msgid "Username already in use"
 msgstr "Uporabniško ime je že v uporabi"
 
-#: clientgui/AlreadyExistsPage.cpp:187
+#: AlreadyExistsPage.cpp:187
 msgid ""
 "An account with that username already exists and has a\n"
 "different password than the one you entered.\n"
@@ -636,11 +623,11 @@ msgstr ""
 "\n"
 "Prosim, obiščite spletno stran projekta in sledite tamkajšnjim navodilom."
 
-#: clientgui/AlreadyExistsPage.cpp:191
+#: AlreadyExistsPage.cpp:191
 msgid "Email address already in use"
 msgstr "Naslov elektronske pošte je že v uporabi"
 
-#: clientgui/AlreadyExistsPage.cpp:194
+#: AlreadyExistsPage.cpp:194
 msgid ""
 "An account with that email address already exists and has a\n"
 "different password than the one you entered.\n"
@@ -652,43 +639,45 @@ msgstr ""
 "\n"
 "Prosim, obiščite spletno stran projekta in sledite tamkajšnjim navodilom."
 
-#: clientgui/AsyncRPC.cpp:1031
+#: AsyncRPC.cpp:1031
 msgid "Communicating with BOINC client.  Please wait ..."
 msgstr "Komuniciram z BOINC odjemalcem.  Prosim, počakajte ..."
 
-#: clientgui/AsyncRPC.cpp:1034
+#: AsyncRPC.cpp:1034
 #, c-format
 msgid "&Quit %s"
 msgstr "Za&pusti %s"
 
-#: clientgui/AsyncRPC.cpp:1036
+#: AsyncRPC.cpp:1036
 #, c-format
 msgid "E&xit %s"
 msgstr "Za&pusti %s"
 
-#: clientgui/AsyncRPC.cpp:1040
+#: AsyncRPC.cpp:1040
 #, c-format
 msgid "%s - Communication"
 msgstr "%s - Komunikacija"
 
-#: clientgui/AsyncRPC.cpp:1056
+#: AsyncRPC.cpp:1056 DlgAdvPreferencesBase.cpp:107 sg_DlgPreferences.cpp:433
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: clientgui/BOINCBaseFrame.cpp:504
+#: BOINCBaseFrame.cpp:505
 #, c-format
 msgid "%s - Connection Error"
 msgstr "%s - Napaka pri povezavi"
 
-#: clientgui/BOINCBaseFrame.cpp:513
+#: BOINCBaseFrame.cpp:514
 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 ""
 "Trenutno nimate dovoljenja upravljati odjemalca.\n"
-"Prosim, kontaktirajte skrbnika sistema, da vas doda v uporabniško skupino 'boinc_users'."
+"Prosim, kontaktirajte skrbnika sistema, da vas doda v uporabniško skupino "
+"'boinc_users'."
 
-#: clientgui/BOINCBaseFrame.cpp:522
+#: BOINCBaseFrame.cpp:523
 msgid ""
 "Authorization failed connecting to running client.\n"
 "Make sure you start this program in the same directory as the client."
@@ -696,20 +685,20 @@ msgstr ""
 "Avtorizacija je bila neuspešna med povezovanje na delujoči odjemalec.\n"
 "Preverite, da poganjate ta program iz istega imenika kot odjemalca."
 
-#: clientgui/BOINCBaseFrame.cpp:524
+#: BOINCBaseFrame.cpp:525
 msgid "Authorization failed connecting to running client."
 msgstr "Avtorizacija je bila neuspešna med povezovanjem na delujoči odjemalec."
 
-#: clientgui/BOINCBaseFrame.cpp:532
+#: BOINCBaseFrame.cpp:533
 msgid "The password you have provided is incorrect, please try again."
 msgstr "Geslo, ki ste ga vnesli, ni pravilno. Prosim, poskusite znova."
 
-#: clientgui/BOINCBaseFrame.cpp:576
+#: BOINCBaseFrame.cpp:577
 #, c-format
 msgid "%s - Connection Failed"
 msgstr "%s - Povezava ni uspela"
 
-#: clientgui/BOINCBaseFrame.cpp:585
+#: BOINCBaseFrame.cpp:586
 #, c-format
 msgid ""
 "%s is not able to connect to a %s client.\n"
@@ -718,21 +707,23 @@ msgstr ""
 "%s se ni mogel povezati na odjemalca %s.\n"
 "Se želite poskusiti povezati znova?"
 
-#: clientgui/BOINCBaseFrame.cpp:621
+#: BOINCBaseFrame.cpp:622
 #, c-format
 msgid "%s - Daemon Start Failed"
 msgstr "%s - Zagon strežniškega procesa (daemon) ni uspel"
 
-#: clientgui/BOINCBaseFrame.cpp:631
+#: BOINCBaseFrame.cpp:632
 #, 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 ""
 "%s ni mogel zagnati odjemalca %s.\n"
-"Prosim, poženite Nadzorna plošča->Skrbniška orodja->Storitve in poženite BOINC storitev."
+"Prosim, poženite Nadzorna plošča->Skrbniška orodja->Storitve in poženite "
+"BOINC storitev."
 
-#: clientgui/BOINCBaseFrame.cpp:637
+#: BOINCBaseFrame.cpp:638
 #, c-format
 msgid ""
 "%s is not able to start a %s client.\n"
@@ -741,33 +732,36 @@ msgstr ""
 "%s ne more zagnati odjemalca %s.\n"
 "Prosim, poženite strežniki proces (daemon) in poskusite znova."
 
-#: clientgui/BOINCBaseFrame.cpp:688
+#: BOINCBaseFrame.cpp:689
 #, c-format
 msgid "%s - Connection Status"
 msgstr "%s - Status povezave"
 
-#: clientgui/BOINCBaseFrame.cpp:699
+#: BOINCBaseFrame.cpp:700
 #, 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 ""
 "%s trenutno ni povezan na odjemalca %s.\n"
-"Prosim, uporabite 'Napredno/Izberi računalnik'  izbiro menuja, da se povežete na odjemalca %s.\n"
-"Za povezavo na lokalni računalnik, prosim, uporabite 'localhost' kot ime gostitelja."
+"Prosim, uporabite 'Napredno/Izberi računalnik'  izbiro menuja, da se "
+"povežete na odjemalca %s.\n"
+"Za povezavo na lokalni računalnik, prosim, uporabite 'localhost' kot ime "
+"gostitelja."
 
-#: clientgui/BOINCBaseView.cpp:752
+#: BOINCBaseView.cpp:779
 #, fuzzy
 msgid "Project web pages"
 msgstr "Spletna stran projekta"
 
-#: clientgui/BOINCClientManager.cpp:573
+#: BOINCClientManager.cpp:575
 #, c-format
 msgid "%s - Unexpected Exit"
 msgstr "%s - Nepričakovan izhod"
 
-#: clientgui/BOINCClientManager.cpp:583
+#: BOINCClientManager.cpp:585
 #, c-format
 msgid ""
 "The %s client has exited unexpectedly 3 times within the last %d minutes.\n"
@@ -776,12 +770,12 @@ msgstr ""
 "Odjemalec %s je izstopil 3 krat v zadnjih %d minutah.\n"
 "Ga želite znova zagnati?"
 
-#: clientgui/BOINCDialupManager.cpp:61
+#: BOINCDialupManager.cpp:61
 #, c-format
 msgid "%s - Network Status"
 msgstr "%s - status omrežja"
 
-#: clientgui/BOINCDialupManager.cpp:241
+#: BOINCDialupManager.cpp:241
 #, c-format
 msgid ""
 "%s needs to connect to the Internet.\n"
@@ -790,22 +784,22 @@ msgstr ""
 "%s se mora povezati na internet.\n"
 "Ali lahko to stori zdaj?"
 
-#: clientgui/BOINCDialupManager.cpp:254
+#: BOINCDialupManager.cpp:254
 #, c-format
 msgid "%s is connecting to the Internet."
 msgstr "%s se povezuje na internet."
 
-#: clientgui/BOINCDialupManager.cpp:303
+#: BOINCDialupManager.cpp:303
 #, c-format
 msgid "%s has successfully connected to the Internet."
 msgstr "%s se je uspešno povezal na internet."
 
-#: clientgui/BOINCDialupManager.cpp:331
+#: BOINCDialupManager.cpp:331
 #, c-format
 msgid "%s failed to connect to the Internet."
 msgstr "%s se ni uspel povezati na internet."
 
-#: clientgui/BOINCDialupManager.cpp:372
+#: BOINCDialupManager.cpp:372
 #, c-format
 msgid ""
 "%s has detected it is now connected to the Internet.\n"
@@ -814,18 +808,19 @@ msgstr ""
 "%s je ugotovil, da je zdaj povezan na internet.\n"
 "Posodobljajo se vsi projekti in ponovno se poskušajo izvesti vsi prenosi."
 
-#: clientgui/BOINCDialupManager.cpp:417
+#: BOINCDialupManager.cpp:417
 #, c-format
 msgid "%s has successfully disconnected from the Internet."
 msgstr "%s se je uspešno odklopil z interneta."
 
-#: clientgui/BOINCDialupManager.cpp:433
+#: BOINCDialupManager.cpp:433
 #, c-format
 msgid "%s failed to disconnected from the Internet."
 msgstr "%s se ni uspel odklopiti z interneta."
 
-#: clientgui/BOINCGUIApp.cpp:595
+#: BOINCGUIApp.cpp:339
 #, c-format
+#, fuzzy, c-format
 msgid ""
 "You currently are not authorized to manage the client.\n"
 "\n"
@@ -836,23 +831,36 @@ msgid ""
 "  - contact your administrator to add you to the 'boinc_master'\n"
 "     user group."
 msgstr ""
-
-#: clientgui/BOINCGUIApp.cpp:601
+"Trenutno nimate dovoljenja za upravljanje odjemalca.\n"
+"\n"
+"Da poganjate BOINC kot ta uporabnik, prosim:\n"
+"  - ponovno namestite BOINC in odgovorite z \"Da\" na vprašanje o\n"
+"     ne-administrativnih uporabnikih\n"
+" ali\n"
+"  - kontaktirajte vašega sistemskega skrbnika, da vas doda v\n"
+"      uporabniško skupino \"boinc_master\"."
+
+#: BOINCGUIApp.cpp:345
 #, c-format
+#, fuzzy, c-format
 msgid ""
 "%s ownership or permissions are not set properly; please reinstall %s.\n"
 "(Error code %d"
 msgstr ""
+"Lastništvo BOINC ali pravice niso prav nastavljene; prosim, ponovno "
+"namestite BOINC.\n"
+"(Koda napake %d)"
 
-#: clientgui/BOINCGUIApp.cpp:607
+#: BOINCGUIApp.cpp:351
 msgid " at "
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:610
+#: BOINCGUIApp.cpp:354 MainDocument.cpp:2484 MainDocument.cpp:2534
+#: MainDocument.cpp:2554 ViewTransfers.cpp:803
 msgid ")"
 msgstr ")"
 
-#: clientgui/BOINCGUIApp.cpp:640
+#: BOINCGUIApp.cpp:384
 msgid ""
 "A reboot is required in order for BOINC to run properly.\n"
 "Please reboot your computer and try again."
@@ -860,191 +868,190 @@ msgstr ""
 "Ponovni zagon je potreben, da bo lahko BOINC pravilno tekel.\n"
 "Prosim, ponovno zaženite vaš računalnik in poskusite znova."
 
-#: clientgui/BOINCGUIApp.cpp:641
+#: BOINCGUIApp.cpp:385 DlgAbout.cpp:153
 msgid "BOINC Manager"
 msgstr "BOINC Upravitelj"
 
-#: clientgui/BOINCGUIApp.cpp:902
+#: BOINCGUIApp.cpp:572
 msgid "BOINC Manager was started by the operating system automatically"
 msgstr "BOINC Upravitelj je bil samodejno pognan s strani operacijskega sistema"
 
-#: clientgui/BOINCGUIApp.cpp:904
+#: BOINCGUIApp.cpp:574
 msgid "Startup BOINC so only the system tray icon is visible"
-msgstr "Poženi BOINC ob zagonu, tako da je vidna samo ikona v sistemskem pladnju."
+msgstr ""
+"Poženi BOINC ob zagonu, tako da je vidna samo ikona v sistemskem pladnju."
 
-#: clientgui/BOINCGUIApp.cpp:906
+#: BOINCGUIApp.cpp:576
 msgid "Directory containing the BOINC Client executable"
 msgstr "Imenik, ki vsebuje program BOINC Odjemalec."
 
-#: clientgui/BOINCGUIApp.cpp:907
+#: BOINCGUIApp.cpp:577
 msgid "BOINC data directory"
 msgstr "BOINC podatkovni imenik"
 
-#: clientgui/BOINCGUIApp.cpp:909
+#: BOINCGUIApp.cpp:579
 msgid "Host name or IP address"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:910
+#: BOINCGUIApp.cpp:580
 msgid "GUI RPC port number"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:911
+#: BOINCGUIApp.cpp:581
 #, fuzzy
 msgid "Password"
 msgstr "Geslo:"
 
-#: clientgui/BOINCGUIApp.cpp:912
+#: BOINCGUIApp.cpp:582
 msgid "Startup BOINC with these optional arguments"
 msgstr "Ob zagonu poženi BOINC s temi opcijskimi argumenti."
 
-#: clientgui/BOINCGUIApp.cpp:913
+#: BOINCGUIApp.cpp:583
 msgid "disable BOINC security users and permissions"
 msgstr "onemogoči BOINC varnostne uporabnike in dovoljenja"
 
-#: clientgui/BOINCGUIApp.cpp:914
+#: BOINCGUIApp.cpp:584
 msgid "set skin debugging mode to enable skin manager error messages"
-msgstr "nastavi razhroščevalni način preobleke, da omogočite sporočila o napakah upravitelja preoblek"
+msgstr ""
+"nastavi razhroščevalni način preobleke, da omogočite sporočila o napakah "
+"upravitelja preoblek"
 
-#: clientgui/BOINCGUIApp.cpp:915
+#: BOINCGUIApp.cpp:585
 msgid "multiple instances of BOINC Manager allowed"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:917
+#: BOINCGUIApp.cpp:587
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:1164
+#: BOINCGUIApp.cpp:814
 msgid "(Automatic Detection)"
 msgstr "(samodejna prepoznava)"
 
-#: clientgui/BOINCGUIApp.cpp:1165
+#: BOINCGUIApp.cpp:815
 msgid "(Unknown)"
 msgstr "(neznano)"
 
-#: clientgui/BOINCGUIApp.cpp:1166
+#: BOINCGUIApp.cpp:816
 msgid "(User Defined)"
 msgstr "(določeno s strani uporabnika)"
 
-#: clientgui/BOINCTaskBar.cpp:522
+#: BOINCTaskBar.cpp:508
 #, c-format
 msgid "Open %s Web..."
 msgstr "Odpri spletno stran %s..."
 
-#: clientgui/BOINCTaskBar.cpp:529
+#: BOINCTaskBar.cpp:515
 #, c-format
 msgid "Open %s..."
 msgstr "Odpri %s..."
 
-#: clientgui/BOINCTaskBar.cpp:536
-#: clientgui/BOINCTaskBar.cpp:633
-#: clientgui/BOINCTaskBar.cpp:641
+#: BOINCTaskBar.cpp:522 BOINCTaskBar.cpp:619 BOINCTaskBar.cpp:627
 msgid "Snooze"
 msgstr "Dremež"
 
-#: clientgui/BOINCTaskBar.cpp:538
-#: clientgui/BOINCTaskBar.cpp:660
-#: clientgui/BOINCTaskBar.cpp:668
+#: BOINCTaskBar.cpp:524 BOINCTaskBar.cpp:646 BOINCTaskBar.cpp:654
 msgid "Snooze GPU"
 msgstr "Dremež grafičnega procesorja"
 
-#: clientgui/BOINCTaskBar.cpp:556
+#: BOINCTaskBar.cpp:542
 msgid "E&xit"
 msgstr "Iz&hod"
 
-#: clientgui/BOINCTaskBar.cpp:626
+#: BOINCTaskBar.cpp:612 ViewProjects.cpp:718 ViewWork.cpp:795
+#: sg_BoincSimpleFrame.cpp:758 sg_ProjectCommandPopup.cpp:110
+#: sg_TaskCommandPopup.cpp:102
 msgid "Resume"
 msgstr "Nadaljuj"
 
-#: clientgui/BOINCTaskBar.cpp:653
+#: BOINCTaskBar.cpp:639
 #, fuzzy
 msgid "Resume GPU"
 msgstr "Nadaljuj"
 
-#: clientgui/BOINCTaskBar.cpp:727
+#: BOINCTaskBar.cpp:713
 msgid "Computing is enabled"
 msgstr "Računanje je omogočeno"
 
-#: clientgui/BOINCTaskBar.cpp:731
+#: BOINCTaskBar.cpp:717
 msgid "Computing is suspended - "
 msgstr "Računanje je na čakanju - "
 
-#: clientgui/BOINCTaskBar.cpp:741
+#: BOINCTaskBar.cpp:727
 msgid "GPU computing is enabled"
 msgstr "Računanje grafičnega procesorja je omogočeno"
 
-#: clientgui/BOINCTaskBar.cpp:744
+#: BOINCTaskBar.cpp:730
 msgid "GPU computing is suspended - "
 msgstr "Računanje grafičnega procesorja je na čakanju - "
 
-#: clientgui/BOINCTaskBar.cpp:753
+#: BOINCTaskBar.cpp:739
 msgid "Network is enabled"
 msgstr "Mreža je omogočena"
 
-#: clientgui/BOINCTaskBar.cpp:756
+#: BOINCTaskBar.cpp:742
 msgid "Network is suspended - "
 msgstr "Mrežna aktivnost na čakanju - "
 
-#: clientgui/BOINCTaskBar.cpp:764
+#: BOINCTaskBar.cpp:750
 msgid "Reconnecting to client."
 msgstr "Ponovno se povezujem na odjemalca."
 
-#: clientgui/BOINCTaskBar.cpp:766
+#: BOINCTaskBar.cpp:752
 msgid "Not connected to a client."
 msgstr "Nisem povezan na odjemalca."
 
-#: clientgui/BOINCTaskBar.cpp:819
+#: BOINCTaskBar.cpp:805
 #, c-format
 msgid "%s Notices"
 msgstr "%s Obvestila"
 
-#: clientgui/BOINCTaskBar.cpp:825
+#: BOINCTaskBar.cpp:811
 msgid "There are new notices - click to view."
 msgstr "Nova sporočila - kliknite za ogled."
 
-#: clientgui/CompletionErrorPage.cpp:199
+#: CompletionErrorPage.cpp:199
 msgid "Failed to add project"
 msgstr ""
 
-#: clientgui/CompletionErrorPage.cpp:204
+#: CompletionErrorPage.cpp:204
 msgid "Failed to update account manager"
 msgstr "Nisem uspel posodobiti upravitelja računov"
 
-#: clientgui/CompletionErrorPage.cpp:208
+#: CompletionErrorPage.cpp:208
 msgid "Failed to remove account manager"
 msgstr "Nisem uspel odstraniti upravitelja računov"
 
-#: clientgui/CompletionErrorPage.cpp:212
+#: CompletionErrorPage.cpp:212
 #, fuzzy
 msgid "Failed to add account manager"
 msgstr "Nisem uspel posodobiti upravitelja računov"
 
-#: clientgui/CompletionErrorPage.cpp:221
+#: CompletionErrorPage.cpp:221
 msgid ""
 "Please try again later.\n"
 "\n"
 "Click Finish to close."
 msgstr ""
 
-#: clientgui/CompletionErrorPage.cpp:225
-#: clientgui/CompletionPage.cpp:222
-#: clientgui/CompletionPage.cpp:242
-#: clientgui/CompletionPage.cpp:273
+#: CompletionErrorPage.cpp:225 CompletionPage.cpp:222 CompletionPage.cpp:242
+#: CompletionPage.cpp:273
 msgid "Click Finish to close."
 msgstr "Kliknite Končaj, da zaprete."
 
-#: clientgui/CompletionErrorPage.cpp:234
+#: CompletionErrorPage.cpp:234
 msgid "Messages from server:"
 msgstr "Sporočila strežnika:"
 
-#: clientgui/CompletionPage.cpp:207
+#: CompletionPage.cpp:207
 msgid "Project added"
 msgstr "Projekt dodan"
 
-#: clientgui/CompletionPage.cpp:213
+#: CompletionPage.cpp:213
 msgid "This project has been successfully added."
 msgstr "Ta projekt je bil uspešno dodan."
 
-#: clientgui/CompletionPage.cpp:218
+#: 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."
@@ -1052,139 +1059,138 @@ msgstr ""
 "Ko kliknete Končaj, bo vaš spletni brskalnik šel na stran, kjer\n"
 "lahko nastavite vaše uporabniško ime in nastavitve."
 
-#: clientgui/CompletionPage.cpp:232
+#: CompletionPage.cpp:232
 #, c-format
 msgid "Update from %s completed."
 msgstr "Posodobitev iz %s je dokončana."
 
-#: clientgui/CompletionPage.cpp:236
+#: CompletionPage.cpp:236
 msgid "Update completed."
 msgstr "Posodobitev je dokončana."
 
-#: clientgui/CompletionPage.cpp:247
+#: CompletionPage.cpp:247
 msgid "Now using account manager"
 msgstr ""
 
-#: clientgui/CompletionPage.cpp:252
+#: CompletionPage.cpp:252
 #, c-format
 msgid "Welcome to %s!"
 msgstr "Dobrodošli pri %s!"
 
-#: clientgui/CompletionPage.cpp:263
+#: CompletionPage.cpp:263
 #, c-format
 msgid "You are now using %s to manage accounts."
 msgstr ""
 
-#: clientgui/CompletionPage.cpp:267
+#: CompletionPage.cpp:267
 msgid "You are now using this account manager."
 msgstr ""
 
-#: clientgui/DlgAbout.cpp:113
+#: DlgAbout.cpp:113 mac/Mac_GUI.cpp:96
 #, c-format
 msgid "About %s"
 msgstr "O %s"
 
-#: clientgui/DlgAbout.cpp:172
+#: DlgAbout.cpp:172
 msgid "Version:"
 msgstr "Različica:"
 
-#: clientgui/DlgAbout.cpp:180
+#: DlgAbout.cpp:180
 msgid "wxWidgets Version:"
 msgstr "wxWidgets različica:"
 
-#: clientgui/DlgAbout.cpp:188
+#: DlgAbout.cpp:188
 msgid "Copyright:"
 msgstr "Avtorske pravice:"
 
-#: clientgui/DlgAbout.cpp:192
+# 98%
+#: DlgAbout.cpp:192
+#, fuzzy
 msgid ""
-"(C) 2003-2014 University of California, Berkeley.\n"
+"(C) 2003-2013 University of California, Berkeley.\n"
 "All Rights Reserved."
 msgstr ""
+"(C) 2003-2010 University of California, Berkeley.\n"
+"Vse pravice pridržane."
 
-#: clientgui/DlgAbout.cpp:196
+#: DlgAbout.cpp:196
 msgid "Berkeley Open Infrastructure for Network Computing"
 msgstr "Berkeleyeva odprta infrastruktura za mrežno računanje"
 
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:399
-#: clientgui/DlgSelectComputer.cpp:163
+#: DlgAbout.cpp:208 DlgExitMessage.cpp:173 DlgGenericMessage.cpp:120
+#: DlgOptions.cpp:396 DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "&V redu"
 
-#: clientgui/DlgAdvPreferences.cpp:602
+#: DlgAdvPreferences.cpp:544
 msgid "invalid number"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:603
+#: DlgAdvPreferences.cpp:545
 msgid "invalid time, format is HH:MM"
 msgstr "napačen čas, format je HH:MM"
 
-#: clientgui/DlgAdvPreferences.cpp:604
+#: DlgAdvPreferences.cpp:546
 msgid "invalid time interval, format is HH:MM-HH:MM"
 msgstr "napačen časovni interval, format je HH:MM-HH:MM"
 
-#: clientgui/DlgAdvPreferences.cpp:817
+#: DlgAdvPreferences.cpp:751
 msgid "invalid input value detected"
 msgstr "zaznana je bila napačna vhodna vrednost"
 
-#: clientgui/DlgAdvPreferences.cpp:819
+#: DlgAdvPreferences.cpp:753
 msgid "Validation Error"
 msgstr "Napaka pri validaciji"
 
-#: clientgui/DlgAdvPreferences.cpp:969
-#: clientgui/DlgAdvPreferences.cpp:975
-#: clientgui/DlgAdvPreferences.cpp:981
+#: DlgAdvPreferences.cpp:885 DlgAdvPreferences.cpp:891
+#: DlgAdvPreferences.cpp:897
 msgid "Applications to add"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:998
+#: DlgAdvPreferences.cpp:914
 #, c-format
 msgid "'%s' is not an executable application."
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:999
-#: clientgui/DlgAdvPreferences.cpp:1046
-#: clientgui/DlgAdvPreferences.cpp:1070
+#: DlgAdvPreferences.cpp:915 DlgAdvPreferences.cpp:962
+#: DlgAdvPreferences.cpp:986
 msgid "Add Exclusive App"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Name of application to add?"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Add exclusive app"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1045
+#: DlgAdvPreferences.cpp:961
 #, c-format
 msgid "Application names must end with '%s'"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1069
+#: DlgAdvPreferences.cpp:985
 #, c-format
 msgid "'%s' is already in the list."
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1161
+#: DlgAdvPreferences.cpp:1077
 msgid ""
 "Do you really want to clear all local preferences?\n"
 "(This will not affect exclusive applications.)"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1162
+#: DlgAdvPreferences.cpp:1078 sg_DlgPreferences.cpp:1030
 msgid "Confirmation"
 msgstr "Potrditev"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:49
+#: DlgAdvPreferencesBase.cpp:46 sg_DlgPreferences.cpp:946
 #, c-format
-msgid "%s - Computing preferences"
-msgstr ""
+msgid "%s - Preferences"
+msgstr "%s - Nastavitve"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:66
+#: DlgAdvPreferencesBase.cpp:62
 #, fuzzy
 msgid ""
 "This dialog controls preferences for this computer only.\n"
@@ -1195,499 +1201,476 @@ msgstr ""
 "Kliknite V redu, da nastavite nastavitve.\n"
 "Kliknite Počisti, da obnovite nastavitve temelječe na spletu."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:69
+#: DlgAdvPreferencesBase.cpp:65 sg_DlgPreferences.cpp:428
 msgid "Clear"
 msgstr "Počisti"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:70
+#: DlgAdvPreferencesBase.cpp:66
 msgid "clear all local preferences and close the dialog"
 msgstr "počisti vse lokalne nastavitve in zapri ta dialog"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:85
+#: DlgAdvPreferencesBase.cpp:81
 msgid "processor usage"
 msgstr "uporaba procesorja"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:88
+#: DlgAdvPreferencesBase.cpp:84
 msgid "network usage"
 msgstr "uporaba mreže"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:91
+#: DlgAdvPreferencesBase.cpp:87
 msgid "disk and memory usage"
 msgstr "poraba diska in pomnilnika"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:94
+#: DlgAdvPreferencesBase.cpp:90
 msgid "exclusive applications"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:107
-#: clientgui/DlgDiagnosticLogFlags.cpp:104
+#: DlgAdvPreferencesBase.cpp:102 sg_DlgPreferences.cpp:424
 msgid "OK"
 msgstr "V redu"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:108
+#: DlgAdvPreferencesBase.cpp:103
 msgid "save all values and close the dialog"
 msgstr "shrani vse vrednosti in zapri dialog"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:114
+#: DlgAdvPreferencesBase.cpp:108
 msgid "close the dialog without saving"
 msgstr "zapri ta dialog brez shranjevanja"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:118
-#: clientgui/Localization.cpp:35
-#: clientgui/Localization.cpp:121
-#: clientgui/Localization.cpp:139
+#: DlgAdvPreferencesBase.cpp:112 Localization.cpp:35 Localization.cpp:121
+#: Localization.cpp:139 sg_BoincSimpleFrame.cpp:794 sg_DlgPreferences.cpp:439
 msgid "Help"
 msgstr "Pomoč"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
+#: DlgAdvPreferencesBase.cpp:113
 msgid "shows the preferences web page"
 msgstr "prikaže spletno stran z nastavitvami"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:141
+#: DlgAdvPreferencesBase.cpp:135
 msgid "Computing allowed"
 msgstr "Računanje dovoljeno"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
+#: DlgAdvPreferencesBase.cpp:139
 msgid "While computer is on batteries"
 msgstr "Medtem, ko računalnik deluje na baterije"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:149
-msgid "check this if you want this computer to do work while it runs on batteries"
-msgstr "obkljukajte to, če želite, da računalnik opravlja delo med tem ko deluje na baterije"
+#: DlgAdvPreferencesBase.cpp:142
+msgid ""
+"check this if you want this computer to do work while it runs on batteries"
+msgstr ""
+"obkljukajte to, če želite, da računalnik opravlja delo med tem ko deluje na "
+"baterije"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:155
+#: DlgAdvPreferencesBase.cpp:148
 msgid "While computer is in use"
 msgstr "Medtem, ko je računalnik v uporabi"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:158
-msgid "check this if you want this computer to do work even when you're using it"
-msgstr "obkljukajte to, če želite, da računalnik opravlja delo tudi, ko ga uporabljate vi"
+#: DlgAdvPreferencesBase.cpp:151
+msgid ""
+"check this if you want this computer to do work even when you're using it"
+msgstr ""
+"obkljukajte to, če želite, da računalnik opravlja delo tudi, ko ga "
+"uporabljate vi"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:164
+#: DlgAdvPreferencesBase.cpp:157
 msgid "Use GPU while computer is in use"
 msgstr "Uporabi grafični procesor medtem, ko je računalnik v uporabi"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:167
-msgid "check this if you want your GPU to do work even when you're using the computer"
-msgstr "obkljukajte to, če želite uporabiti vaš grafični procesor za delo tudi, ko računalnik uporabljate vi"
+#: DlgAdvPreferencesBase.cpp:160
+msgid ""
+"check this if you want your GPU to do work even when you're using the "
+"computer"
+msgstr ""
+"obkljukajte to, če želite uporabiti vaš grafični procesor za delo tudi, ko "
+"računalnik uporabljate vi"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:179
+#: DlgAdvPreferencesBase.cpp:172
 msgid "Only after computer has been idle for"
 msgstr "Samo, ko je računalnik bil nedejeven že"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:188
-msgid "do work only after you haven't used the computer for this number of minutes"
+#: DlgAdvPreferencesBase.cpp:182
+msgid ""
+"do work only after you haven't used the computer for this number of minutes"
 msgstr "opravljaj delo samo, kadar niste uporabljali računalnik že toliko minut"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:193
-#: clientgui/DlgAdvPreferencesBase.cpp:342
+#: DlgAdvPreferencesBase.cpp:187 DlgAdvPreferencesBase.cpp:336
+#: sg_DlgPreferences.cpp:417
 msgid "minutes"
 msgstr "minut"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:212
+#: DlgAdvPreferencesBase.cpp:206
 msgid "While processor usage is less than"
 msgstr "Medtem, ko je uporaba procesorja manjša kot"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:221
+#: DlgAdvPreferencesBase.cpp:216
 msgid "suspend work if processor usage exceeds this level"
 msgstr "prekine delo, če uporaba procesorja preseže ta nivo"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:226
+#: DlgAdvPreferencesBase.cpp:221
 msgid "percent (0 means no restriction)"
 msgstr "odstotkov (0 pomeni brez omejitev)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:240
-#: clientgui/DlgAdvPreferencesBase.cpp:506
+#: DlgAdvPreferencesBase.cpp:235 DlgAdvPreferencesBase.cpp:496
 msgid "Every day between hours of"
 msgstr "Vsak dan med urami"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: DlgAdvPreferencesBase.cpp:239
 msgid "start work at this time"
 msgstr "prični z delom ob tem času"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:248
-#: clientgui/DlgAdvPreferencesBase.cpp:514
+#: DlgAdvPreferencesBase.cpp:243 DlgAdvPreferencesBase.cpp:504
+#: sg_DlgPreferences.cpp:326 sg_DlgPreferences.cpp:348
 msgid "and"
 msgstr "in"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:252
+#: DlgAdvPreferencesBase.cpp:247
 msgid "stop work at this time"
 msgstr "zaključi z delom ob tem času"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
-#: clientgui/DlgAdvPreferencesBase.cpp:522
+#: DlgAdvPreferencesBase.cpp:251 DlgAdvPreferencesBase.cpp:512
 msgid "(no restriction if equal)"
 msgstr "(če sta enaka, ni omejitve)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:261
-#: clientgui/DlgAdvPreferencesBase.cpp:527
+#: DlgAdvPreferencesBase.cpp:256 DlgAdvPreferencesBase.cpp:517
 msgid "Day-of-week override:"
 msgstr "Dan-v-tednu povozi nastavitve:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:266
-#: clientgui/DlgAdvPreferencesBase.cpp:532
+#: DlgAdvPreferencesBase.cpp:261 DlgAdvPreferencesBase.cpp:522
 msgid "check box to specify hours for this day of week"
 msgstr "kliknite tu, da podate ure za ta dan v tednu"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:272
-#: clientgui/DlgAdvPreferencesBase.cpp:538
+#: DlgAdvPreferencesBase.cpp:267 DlgAdvPreferencesBase.cpp:528
 msgid "Monday"
 msgstr "ponedeljek"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:279
-#: clientgui/DlgAdvPreferencesBase.cpp:545
+#: DlgAdvPreferencesBase.cpp:274 DlgAdvPreferencesBase.cpp:535
 msgid "Tuesday"
 msgstr "torek"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:286
-#: clientgui/DlgAdvPreferencesBase.cpp:552
+#: DlgAdvPreferencesBase.cpp:281 DlgAdvPreferencesBase.cpp:542
 msgid "Wednesday"
 msgstr "sreda"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:293
-#: clientgui/DlgAdvPreferencesBase.cpp:559
+#: DlgAdvPreferencesBase.cpp:288 DlgAdvPreferencesBase.cpp:549
 msgid "Thursday"
 msgstr "četrtek"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:300
-#: clientgui/DlgAdvPreferencesBase.cpp:566
+#: DlgAdvPreferencesBase.cpp:295 DlgAdvPreferencesBase.cpp:556
 msgid "Friday"
 msgstr "petek"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:307
-#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: DlgAdvPreferencesBase.cpp:302 DlgAdvPreferencesBase.cpp:563
 msgid "Saturday"
 msgstr "sobota"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:580
+#: DlgAdvPreferencesBase.cpp:309 DlgAdvPreferencesBase.cpp:570
 msgid "Sunday"
 msgstr "nedelja"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:328
+#: DlgAdvPreferencesBase.cpp:323
 msgid "Other options"
 msgstr "Druge možnosti"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:336
+#: DlgAdvPreferencesBase.cpp:330
 msgid "Switch between applications every"
 msgstr "Preklopi med aplikacijami vsakih"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:345
+#: DlgAdvPreferencesBase.cpp:339
 msgid "On multiprocessor systems, use at most"
 msgstr "Na večprocesorskih sistemih uporabi največ"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
+#: DlgAdvPreferencesBase.cpp:346
 #, no-c-format
-msgid "% of the processors (0 means no restriction)"
+msgid "% of the processors (0 means ignore this setting)"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:355
-#: clientgui/DlgAdvPreferencesBase.cpp:618
-#: clientgui/DlgAdvPreferencesBase.cpp:640
-#: clientgui/DlgAdvPreferencesBase.cpp:661
-#: clientgui/DlgAdvPreferencesBase.cpp:683
-#: clientgui/DlgAdvPreferencesBase.cpp:694
+#: DlgAdvPreferencesBase.cpp:349 DlgAdvPreferencesBase.cpp:605
+#: DlgAdvPreferencesBase.cpp:627 DlgAdvPreferencesBase.cpp:648
+#: DlgAdvPreferencesBase.cpp:669 DlgAdvPreferencesBase.cpp:679
 msgid "Use at most"
 msgstr "Uporabi največ"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:362
+#: DlgAdvPreferencesBase.cpp:356
 #, no-c-format
-msgid "% of CPU time (0 means no restriction)"
-msgstr ""
+msgid "% CPU time"
+msgstr "% procesorskega časa"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:386
+#: DlgAdvPreferencesBase.cpp:378
 msgid "General options"
 msgstr "Splošne možnosti"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:395
+#: DlgAdvPreferencesBase.cpp:386
 msgid "Maximum download rate"
 msgstr "Največja hitrost prejemanja"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:401
-#: clientgui/DlgAdvPreferencesBase.cpp:410
-msgid "KBytes/second (0 means no restriction)"
-msgstr ""
+#: DlgAdvPreferencesBase.cpp:392 DlgAdvPreferencesBase.cpp:401
+msgid "KBytes/sec."
+msgstr "KBajtov/sekundo"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:404
+#: DlgAdvPreferencesBase.cpp:395
 msgid "Maximum upload rate"
 msgstr "Največja hitrost pošiljanja"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:417
+#: DlgAdvPreferencesBase.cpp:406
+msgid "Transfer at most"
+msgstr "Prenesi največ"
+
+#: DlgAdvPreferencesBase.cpp:412
+msgid "Mbytes"
+msgstr "Mbajtov"
+
+#: DlgAdvPreferencesBase.cpp:415
+msgid "every"
+msgstr "vsakih"
+
+#: DlgAdvPreferencesBase.cpp:421 DlgAdvPreferencesBase.cpp:444
+#: DlgAdvPreferencesBase.cpp:463
+msgid "days"
+msgstr "dni"
+
+#: DlgAdvPreferencesBase.cpp:429
 #, fuzzy
 msgid "Minimum work buffer"
 msgstr "Dodatni delovni medpomnilnik"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:425
+#: DlgAdvPreferencesBase.cpp:438
 msgid "Try to maintain enough tasks to keep busy for this many days"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:431
-#: clientgui/DlgAdvPreferencesBase.cpp:449
-msgid "days (maximum value: 10)"
-msgstr ""
-
-#: clientgui/DlgAdvPreferencesBase.cpp:437
+#: DlgAdvPreferencesBase.cpp:450
 #, fuzzy
 msgid "Max additional work buffer"
 msgstr "Dodatni delovni medpomnilnik"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:445
+#: DlgAdvPreferencesBase.cpp:459
 msgid "In addition, maintain enough tasks for up to this many days"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:454
-msgid "Transfer at most"
-msgstr "Prenesi največ"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:462
-msgid "MBytes every"
-msgstr ""
-
-#: clientgui/DlgAdvPreferencesBase.cpp:468
-msgid "days (0 means no restriction)"
-msgstr ""
-
-#: clientgui/DlgAdvPreferencesBase.cpp:476
+#: DlgAdvPreferencesBase.cpp:466
 msgid "Skip image file verification"
 msgstr "Preskoči preverjanje slikovne datoteke"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:478
+#: DlgAdvPreferencesBase.cpp:468
 msgid "check this if your Internet provider modifies image files"
 msgstr "obkljukajte to, če vaš ponudnik interneta spreminja slikovne datoteke"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:484
+#: DlgAdvPreferencesBase.cpp:476
 msgid "Connect options"
 msgstr "Možnosti povezave"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:487
+#: DlgAdvPreferencesBase.cpp:478
 msgid "Confirm before connecting to internet"
 msgstr "Zahtevaj potrditev pred povezavo na internet"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
-msgstr "če je obkljukano, bo prikazan potrditveni dialog pred poskusom povezave na internet"
+#: DlgAdvPreferencesBase.cpp:480
+msgid ""
+"if checked, a confirmation dialog will be displayed before trying to connect "
+"to the Internet"
+msgstr ""
+"če je obkljukano, bo prikazan potrditveni dialog pred poskusom povezave na "
+"internet"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:493
+#: DlgAdvPreferencesBase.cpp:484
 msgid "Disconnect when done"
 msgstr "Odklopi, ko je končano"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:495
+#: DlgAdvPreferencesBase.cpp:486
 msgid ""
 "if checked, BOINC hangs up when network usage is done\n"
 "(only relevant for dialup-connection)"
 msgstr ""
-"če je obkljukano, bo BOINC prekinil mrežno povezavo, ko bo pošiljanje končano\n"
+"če je obkljukano, bo BOINC prekinil mrežno povezavo, ko bo pošiljanje "
+"končano\n"
 "(smiselno le za klicne povezave)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:501
+#: DlgAdvPreferencesBase.cpp:492
 msgid "Network usage allowed"
 msgstr "Dovoljena uporaba mreže"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:510
+#: DlgAdvPreferencesBase.cpp:500
 msgid "network usage start hour"
 msgstr "začetna ura uporabe mreže"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:518
+#: DlgAdvPreferencesBase.cpp:508
 msgid "network usage stop hour"
 msgstr "končna ura uporabe mreže"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:610
-#: clientgui/DlgItemProperties.cpp:257
+#: DlgAdvPreferencesBase.cpp:598 DlgItemProperties.cpp:231
 msgid "Disk usage"
 msgstr "Poraba diska"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:622
+#: DlgAdvPreferencesBase.cpp:609
 msgid "the maximum disk space used by BOINC (in Gigabytes)"
 msgstr "največji dovoljeni prostor za uporabo s strani BOINC (v gigabajtih)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:626
-msgid "Gigabytes disk space (0 means no restriction)"
-msgstr ""
+#: DlgAdvPreferencesBase.cpp:613
+msgid "Gigabytes disk space"
+msgstr "Prostor na disku v gigabajtih"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:629
+#: DlgAdvPreferencesBase.cpp:616
 msgid "Leave at least"
 msgstr "Pusti vsaj"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:633
+#: DlgAdvPreferencesBase.cpp:620
 msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
 msgstr "BOINC naj pusti prosto vsaj to količino diska (v gigabajtih)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:637
+#: DlgAdvPreferencesBase.cpp:624
 msgid "Gigabytes disk space free"
 msgstr "Gigabajtov prostega prostora na disku"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
+#: DlgAdvPreferencesBase.cpp:631
 msgid "BOINC uses at most this percentage of total disk space"
 msgstr "BOINC naj uporablja največ ta odstotek prostora na disku"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:649
+#: DlgAdvPreferencesBase.cpp:636
 #, no-c-format
 msgid "% of total disk space"
 msgstr "% skupnega prostora na disku"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:652
+#: DlgAdvPreferencesBase.cpp:639
 msgid "Tasks checkpoint to disk at most every"
 msgstr "Opravila nastavijo kontrolno točko na disk največ na vsakih"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
+#: DlgAdvPreferencesBase.cpp:645
 msgid "seconds"
 msgstr "sekund"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:668
+#: DlgAdvPreferencesBase.cpp:655
 #, no-c-format
 msgid "% of page file (swap space)"
 msgstr "% izmenjevalne datoteke (navidezni pomnilnik)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:675
+#: DlgAdvPreferencesBase.cpp:662
 msgid "Memory usage"
 msgstr "Poraba pomnilnika"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
+#: DlgAdvPreferencesBase.cpp:676
 #, no-c-format
 msgid "% when computer is in use"
 msgstr "%, ko je računalnik v uporabi"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:701
+#: DlgAdvPreferencesBase.cpp:686
 #, no-c-format
 msgid "% when computer is idle"
 msgstr "%, ko je računalnik nedejaven"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:706
+#: DlgAdvPreferencesBase.cpp:691
 msgid "Leave applications in memory while suspended"
 msgstr "Pusti aplikacije v pomnilniku med tem, ko so na čakanju"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:708
+#: DlgAdvPreferencesBase.cpp:693
 msgid "if checked, suspended work units are left in memory"
 msgstr "če je obkljukano, bodo delovne enote na čakanju ostale v pomnilniku"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:728
-msgid "Suspend processor and network usage when these applications are running:"
+#: DlgAdvPreferencesBase.cpp:713
+msgid ""
+"Suspend processor and network usage when these applications are running:"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:738
+#: DlgAdvPreferencesBase.cpp:722
 msgid "Add..."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:739
+#: DlgAdvPreferencesBase.cpp:723
 msgid "Add an application to this list"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:744
+#: DlgAdvPreferencesBase.cpp:728 ViewProjects.cpp:202
+#: sg_ProjectCommandPopup.cpp:85
 msgid "Remove"
 msgstr "Odstrani"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:745
+#: DlgAdvPreferencesBase.cpp:729
 msgid "Remove an application from this list"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:754
+#: DlgAdvPreferencesBase.cpp:738
 msgid "For advanced options, refer to "
 msgstr ""
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:65
-#, c-format
-msgid "%s Diagnostic Log Flags"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:83
-msgid "These flags enable various types of diagnostic messages in the Event Log."
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:105
-msgid "Save all values and close the dialog"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:108
-msgid "Defaults"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:109
-msgid "Restore default settings"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:113
-msgid "Close the dialog without saving"
-msgstr ""
-
-#: clientgui/DlgEventLog.cpp:226
+#: DlgEventLog.cpp:219
 #, c-format
 msgid "%s - Event Log"
 msgstr "%s - Dnevnik dogodkov"
 
-#: clientgui/DlgEventLog.cpp:236
+#: DlgEventLog.cpp:232 ViewMessages.cpp:117 ViewProjects.cpp:219
+#: ViewStatistics.cpp:435 ViewStatistics.cpp:2009 ViewTransfers.cpp:182
+#: ViewWork.cpp:232
 msgid "Project"
 msgstr "Projekt"
 
-#: clientgui/DlgEventLog.cpp:237
+#: DlgEventLog.cpp:233 ViewMessages.cpp:118
 msgid "Time"
 msgstr "Čas"
 
-#: clientgui/DlgEventLog.cpp:238
+#: DlgEventLog.cpp:234 ViewMessages.cpp:119
 msgid "Message"
 msgstr "Sporočilo"
 
-#: clientgui/DlgEventLog.cpp:300
-#: clientgui/DlgEventLog.cpp:364
+#: DlgEventLog.cpp:290 DlgEventLog.cpp:354
 #, fuzzy
 msgid "&Show only this project"
 msgstr "Prikaži samo ta projekt"
 
-#: clientgui/DlgEventLog.cpp:304
+#: DlgEventLog.cpp:294
 #, fuzzy
 msgid "Copy &All"
 msgstr "Kopiraj vse"
 
-#: clientgui/DlgEventLog.cpp:306
-#: clientgui/DlgEventLog.cpp:310
+#: DlgEventLog.cpp:296 DlgEventLog.cpp:300 ViewMessages.cpp:89
 msgid "Copy all the messages to the clipboard."
 msgstr "Kopiraj vsa sporočila na odložišče."
 
-#: clientgui/DlgEventLog.cpp:315
+#: DlgEventLog.cpp:305
 #, fuzzy
 msgid "Copy &Selected"
 msgstr "Kopiraj izbrano"
 
-#: clientgui/DlgEventLog.cpp:318
-#: clientgui/DlgEventLog.cpp:326
-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 "Kopiraj označena sporočila na odložišče. Označite lahko več sporočil s tem, da držite pritisnjeno shift ali ctrl tipko med klikanjem na sporočila."
+#: DlgEventLog.cpp:308 DlgEventLog.cpp:316 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 ""
+"Kopiraj označena sporočila na odložišče. Označite lahko več sporočil s tem, "
+"da držite pritisnjeno shift ali ctrl tipko med klikanjem na sporočila."
 
-#: clientgui/DlgEventLog.cpp:320
-#: clientgui/DlgEventLog.cpp:328
-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 "Kopiraj označena sporočila na odložišče. Označite lahko več sporočil s tem, da držite pritisnjeno shift ali ctrl tipko med klikanjem na sporočila."
+#: DlgEventLog.cpp:310 DlgEventLog.cpp:318 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 ""
+"Kopiraj označena sporočila na odložišče. Označite lahko več sporočil s tem, "
+"da držite pritisnjeno shift ali ctrl tipko med klikanjem na sporočila."
 
-#: clientgui/DlgEventLog.cpp:335
-#: clientgui/DlgItemProperties.cpp:67
+#: DlgEventLog.cpp:325 DlgItemProperties.cpp:67
 msgid "&Close"
 msgstr "&Zapri"
 
-#: clientgui/DlgEventLog.cpp:344
+#: DlgEventLog.cpp:334 sg_BoincSimpleFrame.cpp:798 sg_DlgPreferences.cpp:442
 #, c-format
 msgid "Get help with %s"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:358
+#: DlgEventLog.cpp:348
 #, fuzzy
 msgid "Show all &messages"
 msgstr "Prikaži vsa sporočila"
 
-#: clientgui/DlgEventLog.cpp:359
-#: clientgui/DlgEventLog.cpp:361
+#: DlgEventLog.cpp:349 DlgEventLog.cpp:351
 msgid "Show messages for all projects"
 msgstr "Prikaži sporočila za vse projekte"
 
-#: clientgui/DlgEventLog.cpp:365
-#: clientgui/DlgEventLog.cpp:367
+#: DlgEventLog.cpp:355 DlgEventLog.cpp:357
 msgid "Show only the messages for the selected project"
 msgstr "Prikaži samo sporočila za izbrani projekt"
 
-#: clientgui/DlgExitMessage.cpp:82
+#: DlgExitMessage.cpp:82
 #, c-format
 msgid "%s - Exit Confirmation"
 msgstr "%s - Potrditev pred izhodom"
 
-#: clientgui/DlgExitMessage.cpp:130
+#: DlgExitMessage.cpp:130
 #, c-format
 msgid ""
 "You have requested to exit the %s,\n"
@@ -1698,8 +1681,9 @@ msgid ""
 "choose from the following options:"
 msgstr ""
 
-#: clientgui/DlgExitMessage.cpp:135
+#: DlgExitMessage.cpp:135
 #, c-format
+#, fuzzy, c-format
 msgid ""
 "This will shut down %s and its tasks until either the\n"
 "%s or the %s screen saver is run again.\n"
@@ -1715,849 +1699,826 @@ msgstr ""
 "namesto izhoda iz aplikacije; to bo omogočalo %s, da poganja\n"
 "svoja opravila ob časih, ki ste jih izbrali v nastavitvah."
 
-#: clientgui/DlgExitMessage.cpp:153
+#: DlgExitMessage.cpp:153
 #, c-format
 msgid "Stop running tasks when exiting the %s"
 msgstr ""
 
-#: clientgui/DlgExitMessage.cpp:165
+#: DlgExitMessage.cpp:165
 msgid "Remember this decision and do not show this dialog."
 msgstr "Zapomni si to odločitev in ne prikaži tega dialoga."
 
-#: clientgui/DlgExitMessage.cpp:178
-#: clientgui/DlgGenericMessage.cpp:125
-#: clientgui/DlgOptions.cpp:404
-#: clientgui/DlgSelectComputer.cpp:168
+#: DlgExitMessage.cpp:178 DlgGenericMessage.cpp:125 DlgOptions.cpp:401
+#: DlgSelectComputer.cpp:168 wizardex.cpp:378
 msgid "&Cancel"
 msgstr "&Prekliči"
 
-#: clientgui/DlgGenericMessage.cpp:112
+#: DlgGenericMessage.cpp:112
 msgid "Don't show this dialog again."
 msgstr "Ne prikaži znova tega dialoga."
 
-#: clientgui/DlgItemProperties.cpp:194
-#: clientgui/DlgItemProperties.cpp:197
-#: clientgui/DlgItemProperties.cpp:200
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:168 DlgItemProperties.cpp:171
+#: DlgItemProperties.cpp:174 DlgItemProperties.cpp:177
 #, fuzzy
 msgid "Don't fetch tasks for "
 msgstr "Ne potegni novih opravil za procesor"
 
-#: clientgui/DlgItemProperties.cpp:194
+#: DlgItemProperties.cpp:168
 msgid "Project preference"
 msgstr "Nastavitve projekta"
 
-#: clientgui/DlgItemProperties.cpp:197
+#: DlgItemProperties.cpp:171
 #, fuzzy
 msgid "Account manager preference"
 msgstr "Spletna stran upravitelja računov"
 
-#: clientgui/DlgItemProperties.cpp:200
+#: DlgItemProperties.cpp:174
 #, fuzzy
 msgid "Project has no apps for "
 msgstr "Spletna stran projekta"
 
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:177
 msgid "Client configuration excludes "
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:207
+#: DlgItemProperties.cpp:181
 #, fuzzy
 msgid " work fetch deferred for"
 msgstr "Prevzemanje dela za procesor odloženo za"
 
-#: clientgui/DlgItemProperties.cpp:208
+#: DlgItemProperties.cpp:182
 #, fuzzy
 msgid " work fetch deferral interval"
 msgstr "Odložitveni interval prevzemanja dela za procesor"
 
-#: clientgui/DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:213
 msgid "Properties of project "
 msgstr "Lastnosti projekta"
 
-#: clientgui/DlgItemProperties.cpp:243
-#: clientgui/DlgOptions.cpp:221
+#: DlgItemProperties.cpp:217 DlgOptions.cpp:218
 msgid "General"
 msgstr "Splošno"
 
-#: clientgui/DlgItemProperties.cpp:244
+#: DlgItemProperties.cpp:218
 msgid "Master URL"
 msgstr "Glavni URL"
 
-#: clientgui/DlgItemProperties.cpp:245
+#: DlgItemProperties.cpp:219
 msgid "User name"
 msgstr "Uporabniško ime"
 
-#: clientgui/DlgItemProperties.cpp:246
+#: DlgItemProperties.cpp:220
 msgid "Team name"
 msgstr "Ime ekipe"
 
-#: clientgui/DlgItemProperties.cpp:247
+#: DlgItemProperties.cpp:221 ViewProjects.cpp:224
 msgid "Resource share"
 msgstr "Delitev sredstev"
 
-#: clientgui/DlgItemProperties.cpp:249
+#: DlgItemProperties.cpp:223
 msgid "Scheduler RPC deferred for"
 msgstr "RPC razvrščevalnika odložena za"
 
-#: clientgui/DlgItemProperties.cpp:252
+#: DlgItemProperties.cpp:226
 msgid "File downloads deferred for"
 msgstr "Prejemanje datotek odloženo za"
 
-#: clientgui/DlgItemProperties.cpp:255
+#: DlgItemProperties.cpp:229
 msgid "File uploads deferred for"
 msgstr "Nalaganje datotek odloženo za"
 
-#: clientgui/DlgItemProperties.cpp:258
+#: DlgItemProperties.cpp:232
 msgid "Computer ID"
 msgstr "ID računalnika"
 
-#: clientgui/DlgItemProperties.cpp:260
+#: DlgItemProperties.cpp:234
 msgid "Non CPU intensive"
 msgstr "Ne procesorsko intenzivno"
 
-#: 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
+#: DlgItemProperties.cpp:234 DlgItemProperties.cpp:236
+#: DlgItemProperties.cpp:237 DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:242 DlgItemProperties.cpp:251
+#: DlgItemProperties.cpp:254 DlgItemProperties.cpp:257
 msgid "yes"
 msgstr "da"
 
-#: clientgui/DlgItemProperties.cpp:262
+#: DlgItemProperties.cpp:236
 msgid "Suspended via GUI"
 msgstr "Na čakanju prek uporabniškega vmesnika"
 
-#: clientgui/DlgItemProperties.cpp:262
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:236 DlgItemProperties.cpp:237
 msgid "no"
 msgstr "ne"
 
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:237
 msgid "Don't request more work"
 msgstr "Ne zahtevaj več dela"
 
-#: clientgui/DlgItemProperties.cpp:265
+#: DlgItemProperties.cpp:239
 msgid "Scheduler call in progress"
 msgstr "Poteka klic razvrščevalnika"
 
-#: clientgui/DlgItemProperties.cpp:268
+#: DlgItemProperties.cpp:242
 msgid "Trickle-up pending"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:271
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:245 DlgItemProperties.cpp:247
 #, fuzzy
 msgid "Host location"
 msgstr "Testno obvestilo"
 
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:247
 #, fuzzy
 msgid "default"
 msgstr "&Nastavi privzeto"
 
-#: clientgui/DlgItemProperties.cpp:277
+#: DlgItemProperties.cpp:251
 msgid "Added via account manager"
 msgstr "Dodano prek upravitelja računov"
 
-#: clientgui/DlgItemProperties.cpp:280
+#: DlgItemProperties.cpp:254
 msgid "Remove when tasks done"
 msgstr "Odstrani, ko bodo opravila opravljena"
 
-#: clientgui/DlgItemProperties.cpp:283
+#: DlgItemProperties.cpp:257
 msgid "Ended"
 msgstr "Končano"
 
-#: clientgui/DlgItemProperties.cpp:285
-msgid "Tasks completed"
-msgstr ""
-
-#: clientgui/DlgItemProperties.cpp:286
-msgid "Tasks failed"
-msgstr ""
-
-#: clientgui/DlgItemProperties.cpp:288
+#: DlgItemProperties.cpp:259
 msgid "Credit"
 msgstr "Točke"
 
-#: clientgui/DlgItemProperties.cpp:289
+#: DlgItemProperties.cpp:260
 msgid "User"
 msgstr "Uporabnik"
 
-#: clientgui/DlgItemProperties.cpp:296
+#: DlgItemProperties.cpp:267
 msgid "Host"
 msgstr "Gostitelj"
 
-#: clientgui/DlgItemProperties.cpp:305
+#: DlgItemProperties.cpp:276
 msgid "Scheduling"
 msgstr "Razvrščanje"
 
-#: clientgui/DlgItemProperties.cpp:306
+#: DlgItemProperties.cpp:277
 #, fuzzy
 msgid "Scheduling priority"
 msgstr "Prioriteta razvrščanja procesorja"
 
-#: clientgui/DlgItemProperties.cpp:307
+#: DlgItemProperties.cpp:278
 msgid "CPU"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:331
+#: DlgItemProperties.cpp:302
 msgid "Duration correction factor"
 msgstr "Korekcijski faktor trajanja"
 
-#: clientgui/DlgItemProperties.cpp:345
+#: DlgItemProperties.cpp:316
 msgid "Properties of task "
 msgstr "Lastnosti opravila"
 
-#: clientgui/DlgItemProperties.cpp:357
+#: DlgItemProperties.cpp:328 ViewWork.cpp:238
 msgid "Application"
 msgstr "Aplikacija"
 
-#: clientgui/DlgItemProperties.cpp:358
+#: DlgItemProperties.cpp:329 ViewWork.cpp:239
 msgid "Name"
 msgstr "Ime"
 
-#: clientgui/DlgItemProperties.cpp:359
+#: DlgItemProperties.cpp:330
 msgid "State"
 msgstr "Stanje"
 
-#: clientgui/DlgItemProperties.cpp:362
+#: DlgItemProperties.cpp:333
 msgid "Received"
 msgstr "Prejeto"
 
-#: clientgui/DlgItemProperties.cpp:365
+#: DlgItemProperties.cpp:336
 msgid "Report deadline"
 msgstr "Rok za poročilo"
 
-#: clientgui/DlgItemProperties.cpp:367
+#: DlgItemProperties.cpp:338
 msgid "Resources"
 msgstr "Viri"
 
-#: clientgui/DlgItemProperties.cpp:370
+#: DlgItemProperties.cpp:341
 msgid "Estimated computation size"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:373
+#: DlgItemProperties.cpp:344
 msgid "CPU time at last checkpoint"
 msgstr "Procesorski čas ob zadnji kontrolni točki"
 
-#: clientgui/DlgItemProperties.cpp:374
-#: clientgui/DlgItemProperties.cpp:389
+#: DlgItemProperties.cpp:345 DlgItemProperties.cpp:360
 msgid "CPU time"
 msgstr "Procesorski čas"
 
-#: clientgui/DlgItemProperties.cpp:376
-#: clientgui/DlgItemProperties.cpp:390
+#: DlgItemProperties.cpp:347 DlgItemProperties.cpp:361
 msgid "Elapsed time"
 msgstr "Pretečeni čas"
 
-#: clientgui/DlgItemProperties.cpp:378
+#: DlgItemProperties.cpp:349
 msgid "Estimated time remaining"
 msgstr "Ocena preostalega časa"
 
-#: clientgui/DlgItemProperties.cpp:379
+#: DlgItemProperties.cpp:350
 msgid "Fraction done"
 msgstr "Opravljeni del"
 
-#: clientgui/DlgItemProperties.cpp:380
+#: DlgItemProperties.cpp:351
 msgid "Virtual memory size"
 msgstr "Velikost navideznega pomnilnika"
 
-#: clientgui/DlgItemProperties.cpp:381
+#: DlgItemProperties.cpp:352
 msgid "Working set size"
 msgstr "Velikost delovne množice"
 
-#: clientgui/DlgItemProperties.cpp:383
+#: DlgItemProperties.cpp:354
 msgid "Directory"
 msgstr "Imenik"
 
-#: clientgui/DlgItemProperties.cpp:386
+#: DlgItemProperties.cpp:357
 msgid "Process ID"
 msgstr "ID procesa"
 
-#: clientgui/DlgItemProperties.cpp:456
+#: DlgItemProperties.cpp:427 ViewWork.cpp:1032 sg_TaskPanel.cpp:823
 msgid "Local: "
 msgstr "Lokalno: "
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: DlgOptions.cpp:129 DlgOptions.cpp:135
 msgid "Options"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:178
+#: DlgOptions.cpp:175
 msgid "Language:"
 msgstr "Jezik:"
 
-#: clientgui/DlgOptions.cpp:185
+#: DlgOptions.cpp:182
 msgid "What language should BOINC use?"
 msgstr "Kateri jezik naj uporablja BOINC?"
 
-#: clientgui/DlgOptions.cpp:189
+#: DlgOptions.cpp:186
 #, fuzzy
 msgid "Notice reminder interval:"
 msgstr ""
 "Interval opomnika obvestil:\n"
 "(minute; 0 pomeni nič opomnikov)"
 
-#: clientgui/DlgOptions.cpp:196
+#: DlgOptions.cpp:193
 msgid "How often should BOINC remind you of new notices?"
 msgstr "Kako pogosto naj vas BOINC opominja na nova obvestila?"
 
-#: clientgui/DlgOptions.cpp:201
+#: DlgOptions.cpp:198
 msgid "Run Manager at login?"
 msgstr "Poženi Upravitelja ob prijavi?"
 
-#: clientgui/DlgOptions.cpp:207
+#: DlgOptions.cpp:204
 msgid "Run the BOINC Manager when you log on."
 msgstr "Požene BOINC Upravitelja, ko se prijavite."
 
-#: clientgui/DlgOptions.cpp:212
+#: DlgOptions.cpp:209
 msgid "Enable Manager exit dialog?"
 msgstr "Omogoči izhodni dialog Upravitelja?"
 
-#: clientgui/DlgOptions.cpp:218
+#: DlgOptions.cpp:215
 msgid "Display the exit dialog when shutting down the Manager."
 msgstr "Prikaži izhodni dialog ob zaustavljanju Upravitelja."
 
-#: clientgui/DlgOptions.cpp:229
+#: DlgOptions.cpp:226
 msgid "Dial-up and Virtual Private Network settings"
 msgstr "Nastavitve klicnega dostopa in navideznega privatnega omrežja (VPN)"
 
-#: clientgui/DlgOptions.cpp:243
+#: DlgOptions.cpp:240
 msgid "&Set Default"
 msgstr "&Nastavi privzeto"
 
-#: clientgui/DlgOptions.cpp:248
+#: DlgOptions.cpp:245
 msgid "&Clear Default"
 msgstr "&Počisti privzeto"
 
-#: clientgui/DlgOptions.cpp:255
+#: DlgOptions.cpp:252
 msgid "Default Connection:"
 msgstr "Privzeta povezava:"
 
-#: clientgui/DlgOptions.cpp:262
+#: DlgOptions.cpp:259
 msgid "Connections"
 msgstr "Povezave"
 
-#: clientgui/DlgOptions.cpp:271
+#: DlgOptions.cpp:268
 msgid "Connect via HTTP proxy server"
 msgstr "Poveži se preko HTTP posredniškega strežnika (proxy)"
 
-#: clientgui/DlgOptions.cpp:275
+#: DlgOptions.cpp:272
 msgid "HTTP Proxy Server Configuration"
 msgstr "Nastavitve HTTP posredniškega strežnika"
 
-#: clientgui/DlgOptions.cpp:283
-#: clientgui/DlgOptions.cpp:347
+#: DlgOptions.cpp:280 DlgOptions.cpp:344
 msgid "Address:"
 msgstr "Naslov:"
 
-#: clientgui/DlgOptions.cpp:291
-#: clientgui/DlgOptions.cpp:355
+#: DlgOptions.cpp:288 DlgOptions.cpp:352 ProxyPage.cpp:340 ProxyPage.cpp:360
 msgid "Port:"
 msgstr "Vrata:"
 
-#: clientgui/DlgOptions.cpp:299
-#: clientgui/DlgOptions.cpp:363
+#: DlgOptions.cpp:296 DlgOptions.cpp:360
 msgid "Don't use proxy for:"
 msgstr "Ne uporabljaj posrednika za:"
 
-#: clientgui/DlgOptions.cpp:306
-#: clientgui/DlgOptions.cpp:370
+#: DlgOptions.cpp:303 DlgOptions.cpp:367
 msgid "Leave these blank if not needed"
 msgstr "Pusti prazno, če ni potrebno"
 
-#: clientgui/DlgOptions.cpp:312
-#: clientgui/DlgOptions.cpp:376
+#: DlgOptions.cpp:309 DlgOptions.cpp:373 ProxyPage.cpp:343 ProxyPage.cpp:363
 msgid "User Name:"
 msgstr "Uporabniško ime:"
 
-#: clientgui/DlgOptions.cpp:320
-#: clientgui/DlgOptions.cpp:384
-#: clientgui/DlgSelectComputer.cpp:152
+#: DlgOptions.cpp:317 DlgOptions.cpp:381 DlgSelectComputer.cpp:152
+#: ProxyPage.cpp:346 ProxyPage.cpp:366
 msgid "Password:"
 msgstr "Geslo:"
 
-#: clientgui/DlgOptions.cpp:327
+#: DlgOptions.cpp:324
 msgid "HTTP Proxy"
 msgstr "HTTP posrednik:"
 
-#: clientgui/DlgOptions.cpp:335
+#: DlgOptions.cpp:332
 msgid "Connect via SOCKS proxy server"
 msgstr "Poveži se preko SOCKS posredniškega strežnika (proxy)"
 
-#: clientgui/DlgOptions.cpp:339
+#: DlgOptions.cpp:336
 msgid "SOCKS Proxy Server Configuration"
 msgstr "Nastavitve SOCKS posredniškega strežnika"
 
-#: clientgui/DlgOptions.cpp:391
+#: DlgOptions.cpp:388
 msgid "SOCKS Proxy"
 msgstr "SOCKS posrednik"
 
-#: clientgui/DlgOptions.cpp:589
+#: DlgOptions.cpp:586
 #, fuzzy
 msgid "always"
 msgstr "&Poganjaj vedno"
 
-#: clientgui/DlgOptions.cpp:590
+#: DlgOptions.cpp:587
 msgid "1 hour"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:591
+#: DlgOptions.cpp:588
 msgid "6 hours"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:592
+#: DlgOptions.cpp:589
 #, fuzzy
 msgid "1 day"
 msgstr "dni"
 
-#: clientgui/DlgOptions.cpp:593
+#: DlgOptions.cpp:590
 msgid "1 week"
 msgstr ""
 
-#: clientgui/DlgOptions.cpp:594
+#: DlgOptions.cpp:591
 #, fuzzy
 msgid "never"
 msgstr "vsakih"
 
-#: clientgui/DlgOptions.cpp:691
+#: DlgOptions.cpp:688
 #, c-format
 msgid "%s - Language Selection"
 msgstr "%s - Izbira jezika"
 
-#: clientgui/DlgOptions.cpp:698
+#: DlgOptions.cpp:695
 #, c-format
-msgid "The %s's language has been changed.  In order for this change to take effect, you must restart the %s."
-msgstr "Privzeti jezik za %s je bil spremenjen, da to začne veljati morate ponovno zagnati %s."
+#, fuzzy, c-format
+msgid ""
+"The %s's language has been changed.  In order for this change to take "
+"effect, you must restart the %s."
+msgstr ""
+"Privzeti jezik za %s je bil spremenjen, da to začne veljati morate ponovno "
+"zagnati %s."
 
-#: clientgui/DlgSelectComputer.cpp:91
+#: DlgSelectComputer.cpp:91
 #, c-format
 msgid "%s - Select Computer"
 msgstr "%s - Izberi računalnik"
 
-#: clientgui/DlgSelectComputer.cpp:125
+#: DlgSelectComputer.cpp:125
 #, c-format
 msgid ""
 "Another instance of %s is already running \n"
 "on this computer.  Please select a client to monitor."
 msgstr ""
 
-#: clientgui/DlgSelectComputer.cpp:143
+#: DlgSelectComputer.cpp:143
 msgid "Host name:"
 msgstr "Ime gostitelja:"
 
-#: clientgui/Localization.cpp:31
-#: clientgui/Localization.cpp:69
+#: Localization.cpp:31 Localization.cpp:69
 msgid "Message boards"
 msgstr "Razpravljalnice"
 
-#: clientgui/Localization.cpp:33
+#: Localization.cpp:33
 msgid "Correspond with other users on the SETI at home message boards"
 msgstr "Dopisuj si z drugimi uporabniki na SETI at home razpravljalnicah."
 
-#: clientgui/Localization.cpp:37
+#: Localization.cpp:37
 msgid "Ask questions and report problems"
 msgstr "Postavi vprašanja in prijavi probleme"
 
-#: clientgui/Localization.cpp:39
-#: clientgui/Localization.cpp:81
-#: clientgui/Localization.cpp:111
-#: clientgui/Localization.cpp:129
+#: Localization.cpp:39 Localization.cpp:81 Localization.cpp:111
+#: Localization.cpp:129
 msgid "Your account"
 msgstr "Vaš račun"
 
-#: clientgui/Localization.cpp:41
-#: clientgui/Localization.cpp:87
-#: clientgui/Localization.cpp:113
+#: Localization.cpp:41 Localization.cpp:87 Localization.cpp:113
 msgid "View your account information and credit totals"
 msgstr "Poglej informacije vašega računa in skupno točk"
 
-#: clientgui/Localization.cpp:43
+#: Localization.cpp:43
 msgid "Your preferences"
 msgstr "Vaše nastavitve"
 
-#: clientgui/Localization.cpp:45
+#: Localization.cpp:45
 msgid "View and modify your SETI at home account profile and preferences"
 msgstr "Poglej in spremeni vaš SETI at home uporabniški profil in nastavitve"
 
-#: clientgui/Localization.cpp:47
-#: clientgui/Localization.cpp:89
+#: Localization.cpp:47 Localization.cpp:89
 msgid "Your results"
 msgstr "Vaši rezultati"
 
-#: clientgui/Localization.cpp:49
-#: clientgui/Localization.cpp:91
+#: Localization.cpp:49 Localization.cpp:91
 msgid "View your last week (or more) of computational results and work"
 msgstr "Poglej zadnji teden (ali dlje) rezultatov računanja in dela"
 
-#: clientgui/Localization.cpp:51
-#: clientgui/Localization.cpp:93
+#: Localization.cpp:51 Localization.cpp:93
 msgid "Your computers"
 msgstr "Vaši računalniki"
 
-#: clientgui/Localization.cpp:53
+#: Localization.cpp:53
 msgid "View a listing of all the computers on which you are running SETI at Home"
 msgstr "Poglej seznam vseh računalnikov, na katerih poganjate SETI at home"
 
-#: clientgui/Localization.cpp:55
-#: clientgui/Localization.cpp:97
+#: Localization.cpp:55 Localization.cpp:97
 msgid "Your team"
 msgstr "Vaša ekipa"
 
-#: clientgui/Localization.cpp:57
-#: clientgui/Localization.cpp:99
+#: Localization.cpp:57 Localization.cpp:99
 msgid "View information about your team"
 msgstr "Poglej informacije o vaši ekipi"
 
-#: clientgui/Localization.cpp:61
+#: Localization.cpp:61
 msgid "Common questions"
 msgstr "Pogosta vprašanja"
 
-#: clientgui/Localization.cpp:63
+#: Localization.cpp:63
 msgid "Read the Einstein at Home Frequently Asked Question list"
 msgstr "Preberi Einstein at Home seznam pogosto zastavljenih vprašanj"
 
-#: clientgui/Localization.cpp:65
+#: Localization.cpp:65
 msgid "Screensaver info"
 msgstr "Ohranjevalnik zaslona"
 
-#: clientgui/Localization.cpp:67
+#: Localization.cpp:67
 msgid "Read a detailed description of the Einstein at Home screensaver"
 msgstr "Preberi podrobno razlago Einstein at Home ohranjevalnika zaslona"
 
-#: clientgui/Localization.cpp:71
-msgid "Correspond with admins and other users on the Einstein at Home message boards"
-msgstr "Dopisuj si z administratorji in drugimi uporabniki na Einstein at Home forumu"
+#: Localization.cpp:71
+msgid ""
+"Correspond with admins and other users on the Einstein at Home message boards"
+msgstr ""
+"Dopisuj si z administratorji in drugimi uporabniki na Einstein at Home forumu"
 
-#: clientgui/Localization.cpp:73
+#: Localization.cpp:73
 msgid "Einstein status"
 msgstr "Einsteinov status"
 
-#: clientgui/Localization.cpp:75
+#: Localization.cpp:75
 msgid "Current status of the Einstein at Home server"
 msgstr "Trenutni status Einstein at Home strežnika"
 
-#: clientgui/Localization.cpp:77
+#: Localization.cpp:77
 msgid "Report problems"
 msgstr "Sporoči probleme"
 
-#: clientgui/Localization.cpp:79
+#: Localization.cpp:79
 msgid "A link to the Einstein at Home problems and bug reports message board"
 msgstr "Povezava na Einstein at Home razpravljalnico problemi in sporočanje napak"
 
-#: clientgui/Localization.cpp:83
+#: Localization.cpp:83
 msgid "View and modify your Einstein at Home account profile and preferences"
 msgstr "Poglej in spremeni vaš Einstein at Home uporabniški profil in nastavitve"
 
-#: clientgui/Localization.cpp:85
+#: Localization.cpp:85
 msgid "Account summary"
 msgstr "Povzetek o računu"
 
-#: clientgui/Localization.cpp:95
-msgid "View a listing of all the computers on which you are running Einstein at Home"
+#: Localization.cpp:95
+msgid ""
+"View a listing of all the computers on which you are running Einstein at Home"
 msgstr "Poglej seznam vseh računalnikov, na katerih poganjate Einstein at Home"
 
-#: clientgui/Localization.cpp:101
+#: Localization.cpp:101
 msgid "LIGO project"
 msgstr "Projekt LIGO"
 
-#: clientgui/Localization.cpp:103
-msgid "The home page of the Laser Interferometer Gravitational-wave Observatory (LIGO) project"
+#: Localization.cpp:103
+msgid ""
+"The home page of the Laser Interferometer Gravitational-wave Observatory "
+"(LIGO) project"
 msgstr "Domača stran Laser Interferometer Gravitational-wave Observatory (LIGO)"
 
-#: clientgui/Localization.cpp:105
+#: Localization.cpp:105
 msgid "GEO-600 project"
 msgstr "Projekt GEO-600"
 
-#: clientgui/Localization.cpp:107
+#: Localization.cpp:107
 msgid "The home page of the GEO-600 project"
 msgstr "Domača stran projekta GEO-600"
 
-#: clientgui/Localization.cpp:115
-#: clientgui/Localization.cpp:133
+#: Localization.cpp:115 Localization.cpp:133 ViewProjects.cpp:221
+#: ViewStatistics.cpp:465
 msgid "Team"
 msgstr "Ekipa"
 
-#: clientgui/Localization.cpp:117
+#: Localization.cpp:117
 msgid "Info about your Team"
 msgstr "Informacije o vaši ekipi"
 
-#: clientgui/Localization.cpp:123
+#: Localization.cpp:123
 msgid "Get help for climateprediction.net"
 msgstr "Dobi pomoč za climateprediction.net"
 
-#: clientgui/Localization.cpp:125
+#: Localization.cpp:125
 msgid "News"
 msgstr "Novice"
 
-#: clientgui/Localization.cpp:127
+#: Localization.cpp:127
 msgid "climateprediction.net News"
 msgstr "Novice climateprediction.net"
 
-#: clientgui/Localization.cpp:131
+#: Localization.cpp:131
 msgid "View your account information, credits, and trickles"
 msgstr "Poglej informacije o vašem računu, zaslugah in korakih"
 
-#: clientgui/Localization.cpp:135
+#: Localization.cpp:135
 msgid "Info about your team"
 msgstr "Informacije o vaši ekipi"
 
-#: clientgui/Localization.cpp:141
+#: Localization.cpp:141
 msgid "Search for help in our help system"
 msgstr "Poišči pomoč v našem sistemu pomoči"
 
-#: clientgui/Localization.cpp:143
+#: Localization.cpp:143
 msgid "Global Statistics"
 msgstr "Globalna statistika"
 
-#: clientgui/Localization.cpp:145
+#: Localization.cpp:145
 msgid "Summary statistics for World Community Grid"
 msgstr "Povzetek statistike za World Community Grid"
 
-#: clientgui/Localization.cpp:147
+#: Localization.cpp:147
 msgid "My Grid"
 msgstr "Moja mreža"
 
-#: clientgui/Localization.cpp:149
+#: Localization.cpp:149
 msgid "Your statistics and settings"
 msgstr "Vaša statistika in nastavitve"
 
-#: clientgui/Localization.cpp:151
+#: Localization.cpp:151
 msgid "Device Profiles"
 msgstr "Profili naprav"
 
-#: clientgui/Localization.cpp:153
+#: Localization.cpp:153
 msgid "Update your device settings"
 msgstr "Posodobite vaše nastavitve naprav"
 
-#: clientgui/Localization.cpp:155
+#: Localization.cpp:155
 msgid "Research"
 msgstr "Raziskave"
 
-#: clientgui/Localization.cpp:157
+#: Localization.cpp:157
 msgid "Learn about the projects hosted at World Community Grid"
 msgstr "Izvejte o projektih, ki gostujejo na World Community Grid"
 
-#: clientgui/MainDocument.cpp:583
+#: MainDocument.cpp:583
 msgid "Starting client"
 msgstr "Zaganjam odjemalca"
 
-#: clientgui/MainDocument.cpp:591
+#: MainDocument.cpp:591
 #, fuzzy
 msgid "Connecting to client"
 msgstr "Ponovno se povezujem na odjemalca."
 
-#: clientgui/MainDocument.cpp:1205
+#: MainDocument.cpp:1195
 msgid "Retrieving system state; please wait..."
 msgstr "Pridobivam stanje sistema; prosim, počakajte..."
 
-#: clientgui/MainDocument.cpp:1826
+#: MainDocument.cpp:1816
 #, fuzzy
 msgid "Missing application"
 msgstr "Aplikacija"
 
-#: clientgui/MainDocument.cpp:1827
-msgid "Please download and install the CoRD application from http://cord.sourceforge.net"
+#: MainDocument.cpp:1817
+msgid ""
+"Please download and install the CoRD application from http://cord."
+"sourceforge.net"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2442
+#: MainDocument.cpp:2432
 msgid "on batteries"
 msgstr "na baterijah"
 
-#: clientgui/MainDocument.cpp:2443
+#: MainDocument.cpp:2433
 msgid "computer is in use"
 msgstr "medtem, ko je računalnik v uporabi"
 
-#: clientgui/MainDocument.cpp:2444
+#: MainDocument.cpp:2434
 msgid "user request"
 msgstr "uporabniška zahteva"
 
-#: clientgui/MainDocument.cpp:2445
+#: MainDocument.cpp:2435
 msgid "time of day"
 msgstr "čas dneva"
 
-#: clientgui/MainDocument.cpp:2446
+#: MainDocument.cpp:2436
 msgid "CPU benchmarks in progress"
 msgstr "Potekajo meritve hitrosti procesorja"
 
-#: clientgui/MainDocument.cpp:2447
+#: MainDocument.cpp:2437
 msgid "need disk space - check preferences"
 msgstr "potrebujem prostor na disku - preverite nastavitve"
 
-#: clientgui/MainDocument.cpp:2448
+#: MainDocument.cpp:2438
 msgid "computer is not in use"
 msgstr "računalnik ni v uporabi"
 
-#: clientgui/MainDocument.cpp:2449
+#: MainDocument.cpp:2439
 msgid "starting up"
 msgstr "zaganjam"
 
-#: clientgui/MainDocument.cpp:2450
+#: MainDocument.cpp:2440
 msgid "an exclusive app is running"
 msgstr "teče eksluzivna aplikacija"
 
-#: clientgui/MainDocument.cpp:2451
+#: MainDocument.cpp:2441
 msgid "CPU is busy"
 msgstr "procesor je zaseden"
 
-#: clientgui/MainDocument.cpp:2452
+#: MainDocument.cpp:2442
 msgid "network bandwidth limit exceeded"
 msgstr "presežena omejitev pasovne širine mreze"
 
-#: clientgui/MainDocument.cpp:2453
+#: MainDocument.cpp:2443
 msgid "requested by operating system"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2455
+#: MainDocument.cpp:2445
 msgid "unknown reason"
 msgstr "neznan razlog"
 
-#: clientgui/MainDocument.cpp:2477
+#: MainDocument.cpp:2467
 msgid "GPU missing, "
 msgstr "Manjka grafični procesor, "
 
-#: clientgui/MainDocument.cpp:2484
+#: MainDocument.cpp:2474
 msgid "New"
 msgstr "Novo"
 
-#: clientgui/MainDocument.cpp:2488
+#: MainDocument.cpp:2478
 msgid "Download failed"
 msgstr "Prejemanje ni uspelo"
 
-#: clientgui/MainDocument.cpp:2490
+#: MainDocument.cpp:2480
 msgid "Downloading"
 msgstr "Prejemam"
 
-#: clientgui/MainDocument.cpp:2492
-#: clientgui/MainDocument.cpp:2557
+#: MainDocument.cpp:2482 MainDocument.cpp:2552
 msgid " (suspended - "
 msgstr "(na čakanju - "
 
-#: clientgui/MainDocument.cpp:2500
+#: MainDocument.cpp:2490
 msgid "Project suspended by user"
 msgstr "Na čakanju"
 
-#: clientgui/MainDocument.cpp:2502
+#: MainDocument.cpp:2492
 msgid "Task suspended by user"
 msgstr "Na čakanje"
 
-#: clientgui/MainDocument.cpp:2504
+#: MainDocument.cpp:2494
 msgid "Suspended - "
 msgstr "Na čakanju - "
 
 # 75%
-#: clientgui/MainDocument.cpp:2510
+#: MainDocument.cpp:2500
 #, fuzzy
 msgid "GPU suspended - "
 msgstr "(na čakanju - "
 
-#: clientgui/MainDocument.cpp:2517
+#: MainDocument.cpp:2507
 msgid "Waiting for memory"
 msgstr "Čaka na pomnilnik"
 
-#: clientgui/MainDocument.cpp:2519
+#: MainDocument.cpp:2509
 msgid "Waiting for shared memory"
 msgstr "Čaka na deljeni pomnilnik"
 
-#: clientgui/MainDocument.cpp:2521
+#: MainDocument.cpp:2512
+msgid "Running, high priority"
+msgstr "Se izvaja, visoka prioriteta"
+
+#: MainDocument.cpp:2514
 msgid "Running"
 msgstr "Se izvaja"
 
-#: clientgui/MainDocument.cpp:2523
+#: MainDocument.cpp:2517
 msgid " (non-CPU-intensive)"
 msgstr " (ne-procesorsko-intenzitvno)"
 
-#: clientgui/MainDocument.cpp:2526
+#: MainDocument.cpp:2520
 msgid "Waiting to run"
 msgstr "Čaka na izvajanje"
 
-#: clientgui/MainDocument.cpp:2528
-#: clientgui/MainDocument.cpp:2534
+#: MainDocument.cpp:2522 MainDocument.cpp:2528
 msgid "Ready to start"
 msgstr "Pripravljen začeti"
 
-#: clientgui/MainDocument.cpp:2538
-msgid "Postponed: "
+#: MainDocument.cpp:2532
+msgid " (Scheduler wait: "
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2541
-msgid "Postponed"
+#: MainDocument.cpp:2536
+msgid " (Scheduler wait)"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2545
-msgid "Waiting for network access"
-msgstr ""
+#: MainDocument.cpp:2540
+#, fuzzy
+msgid " (Waiting for network access)"
+msgstr "Čaka na pomnilnik"
 
-#: clientgui/MainDocument.cpp:2549
+#: MainDocument.cpp:2544
 msgid "Computation error"
 msgstr "Napaka pri računanju"
 
-#: clientgui/MainDocument.cpp:2553
+#: MainDocument.cpp:2548
 msgid "Upload failed"
 msgstr "Pošiljanje ni uspelo"
 
-#: clientgui/MainDocument.cpp:2555
+#: MainDocument.cpp:2550
 msgid "Uploading"
 msgstr "Pošilja se"
 
-#: clientgui/MainDocument.cpp:2566
+#: MainDocument.cpp:2561
 msgid "Aborted by user"
 msgstr "Opuščeno s strani uporabnika"
 
-#: clientgui/MainDocument.cpp:2569
+#: MainDocument.cpp:2564
 msgid "Aborted by project"
 msgstr "Opuščeno s strani projekta"
 
-#: clientgui/MainDocument.cpp:2572
+#: MainDocument.cpp:2567
 msgid "Aborted: not started by deadline"
 msgstr "Opuščeno: ni se pričelo do roka"
 
-#: clientgui/MainDocument.cpp:2575
+#: MainDocument.cpp:2570
 msgid "Aborted: disk limit exceeded"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2578
+#: MainDocument.cpp:2573
 msgid "Aborted: run time limit exceeded"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2581
+#: MainDocument.cpp:2576
 msgid "Aborted: memory limit exceeded"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2584
+#: MainDocument.cpp:2579
 msgid "Aborted"
 msgstr "Opuščeno"
 
-#: clientgui/MainDocument.cpp:2589
+#: MainDocument.cpp:2584
 msgid "Acknowledged"
 msgstr "Potrjeno"
 
-#: clientgui/MainDocument.cpp:2591
+#: MainDocument.cpp:2586
 msgid "Ready to report"
 msgstr "Pripravljen poročati"
 
-#: clientgui/MainDocument.cpp:2593
+#: MainDocument.cpp:2588
 #, c-format
 msgid "Error: invalid state '%d'"
 msgstr "Napaka: neveljavno stanje '%d'"
 
-#: clientgui/NoInternetConnectionPage.cpp:179
+#: NoInternetConnectionPage.cpp:179
 msgid "No Internet connection"
 msgstr "Ni povezave na internet"
 
-#: clientgui/NoInternetConnectionPage.cpp:182
+#: NoInternetConnectionPage.cpp:182
 msgid "Please connect to the Internet and try again."
 msgstr "Prosim, povežite se na internet in poskusite znova."
 
-#: clientgui/NotDetectedPage.cpp:181
+#: NotDetectedPage.cpp:181
 msgid "Project not found"
 msgstr "Projekt ni bil najden"
 
-#: clientgui/NotDetectedPage.cpp:184
+#: NotDetectedPage.cpp:184
 msgid ""
 "The URL you supplied is not that of a BOINC-based project.\n"
 "\n"
@@ -2567,11 +2528,11 @@ msgstr ""
 "\n"
 "Prosim, preverite URL in poskusite znova."
 
-#: clientgui/NotDetectedPage.cpp:188
+#: NotDetectedPage.cpp:188
 msgid "Account manager not found"
 msgstr "Upravitelj računov ni bil najden"
 
-#: clientgui/NotDetectedPage.cpp:191
+#: NotDetectedPage.cpp:191
 msgid ""
 "The URL you supplied is not that of a BOINC-based account\n"
 "manager.\n"
@@ -2583,95 +2544,97 @@ msgstr ""
 "\n"
 "Prosim, preverite URL in poskusite znova."
 
-#: clientgui/NotFoundPage.cpp:181
+#: NotFoundPage.cpp:181
 msgid "Login Failed."
 msgstr "Prijava ni uspela."
 
-#: clientgui/NotFoundPage.cpp:185
+#: NotFoundPage.cpp:185
 msgid "Check the username and password, and try again."
 msgstr "Preverite uporabniško ime in geslo ter poskusite znova."
 
-#: clientgui/NotFoundPage.cpp:189
+#: NotFoundPage.cpp:189
 msgid "Check the email address and password, and try again."
 msgstr "Preverite naslov elektronske pošte in geslo ter poskusite znova."
 
-#: clientgui/NoticeListCtrl.cpp:229
+#: NoticeListCtrl.cpp:222
 msgid "more..."
 msgstr "več..."
 
-#: clientgui/ProjectInfoPage.cpp:221
+#: ProjectInfoPage.cpp:477 ProjectInfoPage.cpp:778 ProjectInfoPage.cpp:782
+msgid "All"
+msgstr ""
+
+#: ProjectInfoPage.cpp:615
 msgid "Choose a project"
 msgstr "Izberite projekt"
 
-#: clientgui/ProjectInfoPage.cpp:228
+#: ProjectInfoPage.cpp:619
 msgid "To choose a project, click its name or type its URL below."
-msgstr "Da izberete projekt, kliknite na njegovo ime ali spodaj napišite njegov URL."
+msgstr ""
+"Da izberete projekt, kliknite na njegovo ime ali spodaj napišite njegov URL."
 
-#: clientgui/ProjectInfoPage.cpp:246
+#: ProjectInfoPage.cpp:623
 msgid "Categories:"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:267
+#: ProjectInfoPage.cpp:627 sg_ProjectPanel.cpp:89
 #, fuzzy
 msgid "Projects:"
 msgstr "Projekti"
 
-#: clientgui/ProjectInfoPage.cpp:279
+#: ProjectInfoPage.cpp:631
 msgid "Project details"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:291
+#: ProjectInfoPage.cpp:635
 msgid "Research area:"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:302
+#: ProjectInfoPage.cpp:639
 msgid "Organization:"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:313
+#: ProjectInfoPage.cpp:643
 #, fuzzy
 msgid "Web site:"
 msgstr "Spletne strani"
 
-#: clientgui/ProjectInfoPage.cpp:325
+#: ProjectInfoPage.cpp:647
 msgid "Supported systems:"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:363
+#: ProjectInfoPage.cpp:651
 #, fuzzy
 msgid "Project URL:"
 msgstr "&URL projekta:"
 
-#: clientgui/ProjectInfoPage.cpp:499
-#: clientgui/ProjectInfoPage.cpp:754
-#: clientgui/ProjectInfoPage.cpp:758
-msgid "All"
-msgstr ""
-
-#: clientgui/ProjectInfoPage.cpp:802
+#: ProjectInfoPage.cpp:826
 #, fuzzy
-msgid "This project may not have work for your type of computer.  Do you want to add it anyway?"
-msgstr "Ta projekt morda nima dela za vaš tip računalnika. Ali ste prepričani, da želite nadaljevati?"
+msgid ""
+"This project may not have work for your type of computer.  Do you want to "
+"add it anyway?"
+msgstr ""
+"Ta projekt morda nima dela za vaš tip računalnika. Ali ste prepričani, da "
+"želite nadaljevati?"
 
-#: clientgui/ProjectInfoPage.cpp:826
+#: ProjectInfoPage.cpp:850
 #, fuzzy
 msgid "You already added this project. Please choose a different project."
 msgstr "Na ta projekt ste že pripeti. Prosim, izberite drug projekt."
 
-#: clientgui/ProjectProcessingPage.cpp:321
+#: ProjectProcessingPage.cpp:321
 msgid "Communicating with project."
 msgstr "Komuniciram s projektom."
 
-#: clientgui/ProjectProcessingPage.cpp:510
+#: ProjectProcessingPage.cpp:509
 msgid "Required files not found on the server."
 msgstr "Zahtevane datoteke na strežniku niso bile najdene."
 
-#: clientgui/ProjectProcessingPage.cpp:513
-#: clientgui/ProjectProcessingPage.cpp:586
+#: ProjectProcessingPage.cpp:512 ProjectProcessingPage.cpp:574
 msgid "An internal server error has occurred."
 msgstr "Pripetila se je notranja napaka strežnika."
 
-#: clientgui/ProjectPropertiesPage.cpp:334
+#: ProjectPropertiesPage.cpp:334
 msgid ""
 "Communicating with project\n"
 "Please wait..."
@@ -2679,48 +2642,11 @@ msgstr ""
 "Komuniciram s projektom\n"
 "Prosim, počakajte..."
 
-#: clientgui/ProjectWelcomePage.cpp:251
-#, c-format
-msgid "Welcome to %s."
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:254
-msgid "You have volunteered to compute for this project:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:255
-msgid "Name:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:258
-msgid "Home:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:262
-msgid "Description:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:265
-msgid "URL:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:268
-msgid "User:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:273
-msgid "WARNING: This project is not registered with BOINC.  Make sure you trust it before continuing."
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:277
-msgid "To continue, click Next."
-msgstr "Za nadaljevanje kliknite Naprej."
-
-#: clientgui/ProxyInfoPage.cpp:195
+#: ProxyInfoPage.cpp:195
 msgid "Network communication failure"
 msgstr "Napaka pri komunikaciji po mreži"
 
-#: clientgui/ProxyInfoPage.cpp:199
+#: ProxyInfoPage.cpp:199
 msgid ""
 "The World Community Grid - BOINC software failed to communicate\n"
 "over the Internet. The most likely reasons are:\n"
@@ -2750,7 +2676,7 @@ msgstr ""
 "3) Uporabljate posredniški strežnik\n"
 "Kliknite Naprej, da nastavite BOINC nastavitve posredniškega strežnika."
 
-#: clientgui/ProxyInfoPage.cpp:203
+#: ProxyInfoPage.cpp:203
 msgid ""
 "BOINC failed to communicate on the Internet.\n"
 "The most likely reasons are:\n"
@@ -2780,1031 +2706,625 @@ msgstr ""
 "3) Uporabljate posredniški strežnik\n"
 "Kliknite Naprej, da nastavite BOINC nastavitve posredniškega strežnika."
 
-#: clientgui/ProxyPage.cpp:331
+#: ProxyPage.cpp:331
 msgid "Proxy configuration"
 msgstr "Nastavitve posredniškega strežnika"
 
-#: clientgui/ProxyPage.cpp:334
+#: ProxyPage.cpp:334
 msgid "HTTP proxy"
 msgstr "HTTP posrednik"
 
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
+#: ProxyPage.cpp:337 ProxyPage.cpp:357
 msgid "Server:"
 msgstr "Strežnik:"
 
-#: clientgui/ProxyPage.cpp:350
+#: ProxyPage.cpp:350
 msgid "Autodetect"
 msgstr "Samodejno prepoznaj"
 
-#: clientgui/ProxyPage.cpp:354
+#: ProxyPage.cpp:354
 msgid "SOCKS proxy"
 msgstr "SOCKS posrednik"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:167
-msgid "Advanced View...\tCtrl+Shift+A"
-msgstr "Napredni pogled...\\Ctrl+Shift+A"
+#: TermsOfUsePage.cpp:218
+msgid "Terms of Use"
+msgstr "Pogoji uporabe"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:168
-#, fuzzy
-msgid "Display the advanced graphical interface."
-msgstr "Prikaži preprost uporabniški vmesnik."
+#: TermsOfUsePage.cpp:222
+msgid "Please read the following terms of use:"
+msgstr "Prosim, preberite sledeče pogoje uporabe:"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:175
-msgid "Skin"
-msgstr "Preobleka"
+#: TermsOfUsePage.cpp:231
+msgid "I agree to the terms of use."
+msgstr "Strinjam se s pogoji uporabe."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:177
-msgid "Select the appearance of the user interface."
+#: TermsOfUsePage.cpp:237
+msgid "I do not agree to the terms of use."
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:224
-#, c-format
-msgid "&%s"
-msgstr "&%s"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:405
-#, fuzzy
-msgid "Default"
-msgstr "&Nastavi privzeto"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:848
-msgid "Suspend"
-msgstr "Daj na čakanje"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:850
-msgid "Suspend Computing"
-msgstr ""
+#: UnavailablePage.cpp:183
+msgid "Project temporarily unavailable"
+msgstr "Projekt začasno ni na voljo"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:851
-msgid "Resume Computing"
+#: UnavailablePage.cpp:186
+msgid ""
+"The project is temporarily unavailable.\n"
+"\n"
+"Please try again later."
 msgstr ""
+"Projekt začasno ni na voljo.\n"
+"\n"
+"Prosim, poskusite kasneje."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:867
-msgid "Notices"
-msgstr "Obvestila"
+#: UnavailablePage.cpp:190
+msgid "Account manager temporarily unavailable"
+msgstr "Upravitelj računov začasno ni na voljo"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:868
-msgid "Open a window to view notices from projects or BOINC"
+#: UnavailablePage.cpp:193
+msgid ""
+"The account manager is temporarily unavailable.\n"
+"\n"
+"Please try again later."
 msgstr ""
+"Upravitelj računov začasno ni na voljo.\n"
+"\n"
+"Prosim, poskusite kasneje."
 
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
-msgstr ""
+#: ValidateAccountKey.cpp:68
+msgid "Please specify an account key to continue."
+msgstr "Za nadaljevanje, prosim, podajte ključ računa. "
 
-#: clientgui/sg_DlgMessages.cpp:132
-#, fuzzy
-msgid "There are no notices at this time."
-msgstr "Nova sporočila - kliknite za ogled."
+#: ValidateAccountKey.cpp:71
+msgid "Invalid Account Key; please enter a valid Account Key"
+msgstr "Napačen ključ računa; prosim vnesite veljaven ključ računa."
 
-#: clientgui/sg_DlgMessages.cpp:146
-msgid "Close"
-msgstr "Zapri"
+#: ValidateAccountKey.cpp:82 ValidateEmailAddress.cpp:86
+msgid "Validation conflict"
+msgstr "Konflikt pri validaciji"
 
-#: clientgui/sg_DlgMessages.cpp:394
-#, c-format
-msgid "%s - Notices"
-msgstr "%s Obvestila"
+#: ValidateEmailAddress.cpp:72
+msgid "Please specify an email address"
+msgstr "Prosim, vnesite naslov elektronske pošte"
 
-#: clientgui/sg_DlgPreferences.cpp:270
-msgid "This dialog controls preferences for this computer only."
+#: ValidateEmailAddress.cpp:75
+msgid "Invalid email address; please enter a valid email address"
 msgstr ""
+"Napačen naslov elektronske pošte; prosim vnesite pravilen naslov elektronske "
+"pošte"
 
-#: clientgui/sg_DlgPreferences.cpp:275
-msgid "Click OK to set preferences."
-msgstr ""
+#: ValidateURL.cpp:69
+msgid "Missing URL"
+msgstr "Manjkajoč URL"
 
-#: clientgui/sg_DlgPreferences.cpp:280
-msgid "Click Clear to restore web-based settings for all preferences listed below."
+#: ValidateURL.cpp:70
+msgid ""
+"Please specify a URL.\n"
+"For example:\n"
+"http://www.example.com/"
 msgstr ""
+"Prosim podajte URL.\n"
+"Na primer:\n"
+"http://www.primer.si/"
 
-#: clientgui/sg_DlgPreferences.cpp:287
-msgid "For additional settings, select Computing Preferences in the Advanced View."
-msgstr ""
+#: ValidateURL.cpp:83 ValidateURL.cpp:87 ValidateURL.cpp:91
+#: ValidateURL.cpp:103 ValidateURL.cpp:107 ValidateURL.cpp:110
+msgid "Invalid URL"
+msgstr "Napačen URL"
 
-#: clientgui/sg_DlgPreferences.cpp:315
-msgid "Do work only between:"
-msgstr "Opravljaj delo le med:"
+#: ValidateURL.cpp:84 ValidateURL.cpp:88 ValidateURL.cpp:92
+msgid ""
+"Please specify a valid URL.\n"
+"For example:\n"
+"http://boincproject.example.com"
+msgstr ""
+"Prosim podajte veljaven URL.\n"
+"Na primer:\n"
+"http://www.primer.si/"
 
-#: clientgui/sg_DlgPreferences.cpp:337
-msgid "Connect to internet only between:"
-msgstr "Poveži se na internet samo med:"
+#: ValidateURL.cpp:104 ValidateURL.cpp:108
+#, c-format
+msgid "'%s' does not contain a valid host name."
+msgstr "'%s' ne vsebuje veljavnega imena gostitelja."
 
-#: clientgui/sg_DlgPreferences.cpp:359
-#: clientgui/sg_DlgPreferences.cpp:376
-msgid "Use no more than:"
-msgstr "Ne uporabi več kot:"
+#: ValidateURL.cpp:111
+#, c-format
+msgid "'%s' does not contain a valid path."
+msgstr "'%s' ne vsebuje veljavne poti."
 
-#: clientgui/sg_DlgPreferences.cpp:372
-msgid "of disk space"
-msgstr "prostora na disku"
+#: ViewMessages.cpp:84 ViewProjects.cpp:170 ViewStatistics.cpp:1978
+#: ViewTransfers.cpp:160 ViewWork.cpp:183
+msgid "Commands"
+msgstr "Možnosti"
 
-#: clientgui/sg_DlgPreferences.cpp:389
-msgid "of the processor"
-msgstr "procesorskega časa"
+#: ViewMessages.cpp:88
+msgid "Copy all messages"
+msgstr "Kopiraj vsa sporočila"
 
-#: clientgui/sg_DlgPreferences.cpp:393
-msgid "Do work while on battery?"
-msgstr "Opravljati delo med delovanjem na baterije?"
+#: ViewMessages.cpp:95
+msgid "Copy selected messages"
+msgstr "Kopiraj izbrana sporočila"
 
-#: clientgui/sg_DlgPreferences.cpp:406
-msgid "Do work after idle for:"
-msgstr "Opravljati delo, ko je neaktiven že:"
+#: ViewMessages.cpp:106 ViewMessages.cpp:502
+msgid "Show only this project"
+msgstr "Prikaži samo ta projekt"
 
-#: clientgui/sg_DlgPreferences.cpp:431
-msgid "Clear all local preferences listed above and close the dialog"
-msgstr ""
+#: ViewMessages.cpp:107 ViewMessages.cpp:503
+msgid "Show only the messages for the selected project."
+msgstr "Prikaži samo sporočila za izbrani projekt."
 
-#: clientgui/sg_DlgPreferences.cpp:609
-#: clientgui/sg_DlgPreferences.cpp:612
-#: clientgui/sg_DlgPreferences.cpp:688
-#: clientgui/sg_DlgPreferences.cpp:692
-#: clientgui/sg_DlgPreferences.cpp:704
-#: clientgui/sg_DlgPreferences.cpp:708
-#: clientgui/sg_DlgPreferences.cpp:851
-#: clientgui/sg_DlgPreferences.cpp:862
-msgid "Anytime"
-msgstr "Kdajkoli"
+#: ViewMessages.cpp:164
+msgid "Messages"
+msgstr "Sporočila"
 
-#: clientgui/sg_DlgPreferences.cpp:645
-msgid "100 MB"
-msgstr "100 MB"
+#: ViewMessages.cpp:187
+msgid "Copying all messages to the clipboard..."
+msgstr "Kopiram vsa sporočila na odložišče..."
 
-#: clientgui/sg_DlgPreferences.cpp:646
-msgid "200 MB"
-msgstr "200 MB"
+#: ViewMessages.cpp:223
+msgid "Copying selected messages to the clipboard..."
+msgstr "Kopiraj izbrana sporočila na odložišče..."
 
-#: clientgui/sg_DlgPreferences.cpp:647
-msgid "500 MB"
-msgstr "500 MB"
+#: ViewMessages.cpp:286
+msgid "Filtering messages..."
+msgstr "Filtriram sporočila..."
 
-#: clientgui/sg_DlgPreferences.cpp:648
-msgid "1 GB"
-msgstr "1 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:649
-msgid "2 GB"
-msgstr "2 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:650
-msgid "5 GB"
-msgstr "5 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:651
-msgid "10 GB"
-msgstr "10 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:652
-msgid "20 GB"
-msgstr "20 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:653
-msgid "50 GB"
-msgstr "50 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:654
-msgid "100 GB"
-msgstr "100 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:724
-#, c-format
-msgid "%d MB"
-msgstr "%d MB"
-
-#: clientgui/sg_DlgPreferences.cpp:726
-#, c-format
-msgid "%4.2f GB"
-msgstr "%4.2f GB"
-
-#: clientgui/sg_DlgPreferences.cpp:767
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: clientgui/sg_DlgPreferences.cpp:803
-msgid "0 (Run Always)"
-msgstr "0 (Vedno naj teče)"
+#: ViewMessages.cpp:494
+msgid "Show all messages"
+msgstr "Prikaži vsa sporočila"
 
-#: clientgui/sg_DlgPreferences.cpp:806
-#, c-format
-msgid "%d"
-msgstr "%d"
+#: ViewMessages.cpp:495
+msgid "Show messages for all projects."
+msgstr "Prikaži sporočila za vse projekte."
 
-#: clientgui/sg_DlgPreferences.cpp:953
-#, c-format
-msgid "%s - Computing Preferences"
+#: ViewNotices.cpp:58 sg_DlgMessages.cpp:124
+msgid "Fetching notices; please wait..."
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:1033
+#: ViewNotices.cpp:65 sg_DlgMessages.cpp:132
 #, fuzzy
-msgid "Do you really want to clear all local preferences?\n"
-msgstr "Res želite počistiti vse lokalne nastavitve?"
+msgid "There are no notices at this time."
+msgstr "Nova sporočila - kliknite za ogled."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:66
-#: clientgui/ViewProjects.cpp:179
+#: ViewNotices.cpp:99 sg_BoincSimpleFrame.cpp:776
+msgid "Notices"
+msgstr "Obvestila"
+
+#: ViewProjects.cpp:174 sg_ProjectCommandPopup.cpp:61
 msgid "Update"
 msgstr "Posodobi"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:67
-#: clientgui/ViewProjects.cpp:180
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
-msgstr "Poročaj o vseh opravljenih opravilih, dobi najnovejše zasluge, dobi najnovejše nastavitve in morda dobi več opravil."
+#: ViewProjects.cpp:175 sg_ProjectCommandPopup.cpp:62
+msgid ""
+"Report all completed tasks, get latest credit, get latest preferences, and "
+"possibly get more tasks."
+msgstr ""
+"Poročaj o vseh opravljenih opravilih, dobi najnovejše zasluge, dobi "
+"najnovejše nastavitve in morda dobi več opravil."
+
+#: 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
+msgid "Suspend"
+msgstr "Daj na čakanje"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:73
-#: clientgui/sg_ProjectCommandPopup.cpp:129
-#: clientgui/ViewProjects.cpp:187
-#: clientgui/ViewProjects.cpp:727
+#: ViewProjects.cpp:182 ViewProjects.cpp:722 sg_ProjectCommandPopup.cpp:68
+#: sg_ProjectCommandPopup.cpp:114
 msgid "Suspend tasks for this project."
 msgstr "Daj opravila tega projekta na čakanje."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:78
-#: clientgui/sg_ProjectCommandPopup.cpp:136
-#: clientgui/ViewProjects.cpp:193
-#: clientgui/ViewProjects.cpp:746
+#: ViewProjects.cpp:188 ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:73
+#: sg_ProjectCommandPopup.cpp:121
 msgid "No new tasks"
 msgstr "Brez novih opravil"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:79
-#: clientgui/ViewProjects.cpp:194
+#: ViewProjects.cpp:189 sg_ProjectCommandPopup.cpp:74
 msgid "Don't get new tasks for this project."
 msgstr "Ne dobi novih opravil za ta projekt."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:200
+#: ViewProjects.cpp:195 sg_ProjectCommandPopup.cpp:79
 msgid "Reset project"
 msgstr "Resetiraj projekt"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:85
-#: clientgui/ViewProjects.cpp:201
-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 "Briše vse datoteke in opravila povezana s tem projektom in dobi nova opravila.  Lahko najprej posodobite projekt, da poročate o morebitnih opravljenih opravilih."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:91
-#: clientgui/ViewProjects.cpp:208
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
-msgstr "Odstrani ta projekt.  Opravila, ki potekajo, bodo izgubljena (najprej uporabite 'Posodobi', da sporočite morebitna opravljena opravila)."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:96
-#: clientgui/sg_TaskCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:214
-msgid "Properties"
-msgstr "Lastnosti"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:97
-#: clientgui/ViewProjects.cpp:215
-msgid "Show project details."
-msgstr "Prikaži podrobnosti projekta."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:126
-#: clientgui/ViewProjects.cpp:723
-msgid "Resume tasks for this project."
-msgstr "Nadaljuj opravila tega projekta."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:133
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow new tasks"
-msgstr "Dovoli nova opravila"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:134
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow fetching new tasks for this project."
-msgstr "Dovoli pobiranje novih opravil za ta projekt."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:137
-#: clientgui/ViewProjects.cpp:746
-msgid "Don't fetch new tasks for this project."
-msgstr "Ne poberi novih opravil za ta projekt."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:229
-#: clientgui/ViewProjects.cpp:443
-#, c-format
-msgid "Are you sure you want to reset project '%s'?"
-msgstr "Ali ste prepričani, da želite resetirati projekt '%s'?"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:235
-#: clientgui/ViewProjects.cpp:449
-msgid "Reset Project"
-msgstr "Resetiraj projekt"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:266
-#: clientgui/ViewProjects.cpp:501
-#, c-format
-msgid "Are you sure you want to remove project '%s'?"
-msgstr "Ali ste prepričani, da želite odstraniti projekt '%s'?"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:272
-#: clientgui/ViewProjects.cpp:507
-msgid "Remove Project"
-msgstr "Odstrani projekt"
-
-#: clientgui/sg_ProjectPanel.cpp:72
-#, fuzzy
-msgid "Add Project"
-msgstr "Dodaj projekt"
-
-#: clientgui/sg_ProjectPanel.cpp:73
-msgid "Synchronize"
-msgstr ""
-
-#: clientgui/sg_ProjectPanel.cpp:74
-msgid "Work done for this project"
-msgstr ""
-
-#: clientgui/sg_ProjectPanel.cpp:77
-msgid "Synchronize projects with account manager system"
-msgstr "Sinhronizirajte projekte s sistemom upravljanja računov"
-
-#: clientgui/sg_ProjectPanel.cpp:124
-msgid "Select a project to access with the controls below"
-msgstr ""
-
-#: clientgui/sg_ProjectPanel.cpp:145
-#, fuzzy
-msgid "Project Web Pages"
-msgstr "Spletna stran projekta"
-
-#: 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 "Prikaži grafiko"
-
-#: clientgui/sg_TaskCommandPopup.cpp:67
-msgid "Show application graphics in a window."
-msgstr "V oknu prikaži grafiko aplikacije."
-
-#: clientgui/sg_TaskCommandPopup.cpp:73
-msgid "Suspend this task."
-msgstr ""
-
-#: clientgui/sg_TaskCommandPopup.cpp:78
-msgid "Abort"
-msgstr "Opusti"
-
-#: 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 "Prikaži podrobnosti opravila."
-
-#: clientgui/sg_TaskCommandPopup.cpp:119
-msgid "Resume work for this task."
-msgstr "Nadaljuj z delom za to opravila."
-
-#: clientgui/sg_TaskCommandPopup.cpp:123
-msgid "Suspend work for this task."
-msgstr "Daj delo za to opravilo na čakanje."
-
-#: clientgui/sg_TaskCommandPopup.cpp:267
-#, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %.1lf%%, Status: %s)"
-msgstr ""
-"Ali ste prepričani, da želite opustiti to opravilo '%s'?\n"
-"(Napredek: %.1lf%%, Status: %s)"
-
-#: clientgui/sg_TaskCommandPopup.cpp:272
-msgid "Abort task"
-msgstr "Opusti opravilo"
-
-#: clientgui/sg_TaskPanel.cpp:468
-msgid "You don't have any projects.  Please Add a Project."
-msgstr "Nimate projektov.  Prosimo dodajte projekt."
-
-#: clientgui/sg_TaskPanel.cpp:469
-msgid "Not available"
-msgstr ""
-
-#: clientgui/sg_TaskPanel.cpp:480
-#, fuzzy
-msgid "Tasks:"
-msgstr "Opravila"
-
-#: clientgui/sg_TaskPanel.cpp:486
-msgid "Select a task to access"
-msgstr ""
-
-#: clientgui/sg_TaskPanel.cpp:497
-#, fuzzy
-msgid "From:"
-msgstr "Od"
-
-#: 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 "Aplikacija: %s"
-
-#: 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 ""
-
-# 84%
-#: 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:1227
-msgid "Retrieving current status."
-msgstr "Pridobivam trenutni status."
-
-#: clientgui/sg_TaskPanel.cpp:1233
-msgid "Downloading work from the server."
-msgstr "Prejemam delo s strežnika."
-
-#: clientgui/sg_TaskPanel.cpp:1238
-msgid "Processing Suspended:  Running On Batteries."
-msgstr "Obdelava na čakanju:  Teče na baterijah."
-
-#: clientgui/sg_TaskPanel.cpp:1240
-msgid "Processing Suspended:  User Active."
-msgstr "Obdelava na čakanju:  Uporabnik aktiven."
-
-#: clientgui/sg_TaskPanel.cpp:1242
-msgid "Processing Suspended:  User paused processing."
-msgstr "Obdelava na čakanju:  Na željo uporabnika."
-
-#: clientgui/sg_TaskPanel.cpp:1244
-msgid "Processing Suspended:  Time of Day."
-msgstr "Obdelava na čakanju:  Čas dneva."
-
-#: clientgui/sg_TaskPanel.cpp:1246
-msgid "Processing Suspended:  Benchmarks Running."
-msgstr "Obdelava na čakanju:  Potekajo meritve hitrosti."
-
-#: clientgui/sg_TaskPanel.cpp:1248
-msgid "Processing Suspended."
-msgstr "Obdelava na čakanju."
-
-#: clientgui/sg_TaskPanel.cpp:1252
-msgid "Waiting to contact project servers."
-msgstr "Čakam, da kontaktiram strežnike projektov."
-
-#: clientgui/sg_TaskPanel.cpp:1256
-#: clientgui/sg_TaskPanel.cpp:1265
-msgid "Retrieving current status"
-msgstr "Pridobivam trenutni status"
-
-#: clientgui/sg_TaskPanel.cpp:1260
-msgid "No work available to process"
-msgstr "Na voljo ni dela za obdelati."
-
-#: clientgui/sg_TaskPanel.cpp:1262
-msgid "Unable to connect to the core client"
-msgstr "Ne morem se povezati na odjemalca jedra"
-
-#: clientgui/TermsOfUsePage.cpp:218
-msgid "Terms of Use"
-msgstr "Pogoji uporabe"
-
-#: clientgui/TermsOfUsePage.cpp:222
-msgid "Please read the following terms of use:"
-msgstr "Prosim, preberite sledeče pogoje uporabe:"
-
-#: clientgui/TermsOfUsePage.cpp:231
-msgid "I agree to the terms of use."
-msgstr "Strinjam se s pogoji uporabe."
-
-#: clientgui/TermsOfUsePage.cpp:237
-msgid "I do not agree to the terms of use."
-msgstr ""
-
-#: clientgui/UnavailablePage.cpp:183
-msgid "Project temporarily unavailable"
-msgstr "Projekt začasno ni na voljo"
-
-#: clientgui/UnavailablePage.cpp:186
-msgid ""
-"The project is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-"Projekt začasno ni na voljo.\n"
-"\n"
-"Prosim, poskusite kasneje."
-
-#: clientgui/UnavailablePage.cpp:190
-msgid "Account manager temporarily unavailable"
-msgstr "Upravitelj računov začasno ni na voljo"
-
-#: clientgui/UnavailablePage.cpp:193
-msgid ""
-"The account manager is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-"Upravitelj računov začasno ni na voljo.\n"
-"\n"
-"Prosim, poskusite kasneje."
-
-#: clientgui/ValidateAccountKey.cpp:68
-msgid "Please specify an account key to continue."
-msgstr "Za nadaljevanje, prosim, podajte ključ računa. "
-
-#: clientgui/ValidateAccountKey.cpp:71
-msgid "Invalid Account Key; please enter a valid Account Key"
-msgstr "Napačen ključ računa; prosim vnesite veljaven ključ računa."
-
-#: clientgui/ValidateAccountKey.cpp:82
-#: clientgui/ValidateEmailAddress.cpp:86
-msgid "Validation conflict"
-msgstr "Konflikt pri validaciji"
-
-#: clientgui/ValidateEmailAddress.cpp:72
-msgid "Please specify an email address"
-msgstr "Prosim, vnesite naslov elektronske pošte"
-
-#: clientgui/ValidateEmailAddress.cpp:75
-msgid "Invalid email address; please enter a valid email address"
-msgstr "Napačen naslov elektronske pošte; prosim vnesite pravilen naslov elektronske pošte"
-
-#: clientgui/ValidateURL.cpp:69
-msgid "Missing URL"
-msgstr "Manjkajoč URL"
-
-#: clientgui/ValidateURL.cpp:70
+#: ViewProjects.cpp:196 sg_ProjectCommandPopup.cpp:80
 msgid ""
-"Please specify a URL.\n"
-"For example:\n"
-"http://www.example.com/"
+"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 ""
-"Prosim podajte URL.\n"
-"Na primer:\n"
-"http://www.primer.si/"
-
-#: 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 "Napačen URL"
+"Briše vse datoteke in opravila povezana s tem projektom in dobi nova "
+"opravila.  Lahko najprej posodobite projekt, da poročate o morebitnih "
+"opravljenih opravilih."
 
-#: clientgui/ValidateURL.cpp:84
-#: clientgui/ValidateURL.cpp:88
-#: clientgui/ValidateURL.cpp:92
+#: ViewProjects.cpp:203 sg_ProjectCommandPopup.cpp:86
 msgid ""
-"Please specify a valid URL.\n"
-"For example:\n"
-"http://boincproject.example.com"
+"Remove this project.  Tasks in progress will be lost (use 'Update' first to "
+"report any completed tasks)."
 msgstr ""
-"Prosim podajte veljaven URL.\n"
-"Na primer:\n"
-"http://www.primer.si/"
-
-#: clientgui/ValidateURL.cpp:104
-#: clientgui/ValidateURL.cpp:108
-#, c-format
-msgid "'%s' does not contain a valid host name."
-msgstr "'%s' ne vsebuje veljavnega imena gostitelja."
-
-#: clientgui/ValidateURL.cpp:111
-#, c-format
-msgid "'%s' does not contain a valid path."
-msgstr "'%s' ne vsebuje veljavne poti."
-
-#: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:175
-msgid "Commands"
-msgstr "Možnosti"
-
-#: clientgui/ViewMessages.cpp:88
-msgid "Copy all messages"
-msgstr "Kopiraj vsa sporočila"
-
-#: clientgui/ViewMessages.cpp:95
-msgid "Copy selected messages"
-msgstr "Kopiraj izbrana sporočila"
-
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
-msgid "Show only this project"
-msgstr "Prikaži samo ta projekt"
+"Odstrani ta projekt.  Opravila, ki potekajo, bodo izgubljena (najprej "
+"uporabite 'Posodobi', da sporočite morebitna opravljena opravila)."
 
-#: clientgui/ViewMessages.cpp:107
-#: clientgui/ViewMessages.cpp:503
-msgid "Show only the messages for the selected project."
-msgstr "Prikaži samo sporočila za izbrani projekt."
-
-#: clientgui/ViewMessages.cpp:164
-msgid "Messages"
-msgstr "Sporočila"
-
-#: clientgui/ViewMessages.cpp:187
-msgid "Copying all messages to the clipboard..."
-msgstr "Kopiram vsa sporočila na odložišče..."
-
-#: clientgui/ViewMessages.cpp:223
-msgid "Copying selected messages to the clipboard..."
-msgstr "Kopiraj izbrana sporočila na odložišče..."
-
-#: clientgui/ViewMessages.cpp:286
-msgid "Filtering messages..."
-msgstr "Filtriram sporočila..."
-
-#: clientgui/ViewMessages.cpp:494
-msgid "Show all messages"
-msgstr "Prikaži vsa sporočila"
+#: ViewProjects.cpp:209 ViewWork.cpp:222 sg_ProjectCommandPopup.cpp:91
+#: sg_TaskCommandPopup.cpp:78
+msgid "Properties"
+msgstr "Lastnosti"
 
-#: clientgui/ViewMessages.cpp:495
-msgid "Show messages for all projects."
-msgstr "Prikaži sporočila za vse projekte."
+#: ViewProjects.cpp:210 sg_ProjectCommandPopup.cpp:92
+msgid "Show project details."
+msgstr "Prikaži podrobnosti projekta."
 
-#: clientgui/ViewProjects.cpp:225
+#: ViewProjects.cpp:220 ViewStatistics.cpp:450
 msgid "Account"
 msgstr "Račun"
 
-#: clientgui/ViewProjects.cpp:227
+#: ViewProjects.cpp:222
 msgid "Work done"
 msgstr "Opravljeno delo"
 
-#: clientgui/ViewProjects.cpp:228
+#: ViewProjects.cpp:223
 msgid "Avg. work done"
 msgstr "Povpr. opravljeno delo"
 
-#: clientgui/ViewProjects.cpp:230
+#: ViewProjects.cpp:225 ViewTransfers.cpp:188 ViewWork.cpp:234
 msgid "Status"
 msgstr "Status"
 
-#: clientgui/ViewProjects.cpp:255
+#: ViewProjects.cpp:250
 msgid "Projects"
 msgstr "Projekti"
 
-#: clientgui/ViewProjects.cpp:307
+#: ViewProjects.cpp:302
 msgid "Updating project..."
 msgstr "Posodobljam projekt..."
 
-#: clientgui/ViewProjects.cpp:349
+#: ViewProjects.cpp:344
 msgid "Resuming project..."
 msgstr "Nadaljujem projekt..."
 
-#: clientgui/ViewProjects.cpp:353
+#: ViewProjects.cpp:348
 msgid "Suspending project..."
 msgstr "Dajem projekt na čakanje..."
 
-#: clientgui/ViewProjects.cpp:390
+#: ViewProjects.cpp:385
 msgid "Telling project to allow additional task downloads..."
 msgstr "Sporočam projektu, da je dovoljeno prejemanje dodatnih opravil..."
 
-#: clientgui/ViewProjects.cpp:394
+#: ViewProjects.cpp:389
 msgid "Telling project to not fetch any additional tasks..."
 msgstr "Sporočam projektu, naj ne pobira dodatnih opravil..."
 
-#: clientgui/ViewProjects.cpp:430
+#: ViewProjects.cpp:425
 msgid "Resetting project..."
 msgstr "Resetiram projekt..."
 
-#: clientgui/ViewProjects.cpp:488
+#: ViewProjects.cpp:438 sg_ProjectCommandPopup.cpp:214
+#, c-format
+msgid "Are you sure you want to reset project '%s'?"
+msgstr "Ali ste prepričani, da želite resetirati projekt '%s'?"
+
+#: ViewProjects.cpp:444 sg_ProjectCommandPopup.cpp:220
+msgid "Reset Project"
+msgstr "Resetiraj projekt"
+
+#: ViewProjects.cpp:483
 msgid "Removing project..."
 msgstr "Odstranjujem projekt..."
 
-#: clientgui/ViewProjects.cpp:548
-msgid "Launching browser..."
-msgstr "Zaganjam brskalnik..."
+#: ViewProjects.cpp:496 sg_ProjectCommandPopup.cpp:251
+#, c-format
+msgid "Are you sure you want to remove project '%s'?"
+msgstr "Ali ste prepričani, da želite odstraniti projekt '%s'?"
+
+#: ViewProjects.cpp:502 sg_ProjectCommandPopup.cpp:257
+msgid "Remove Project"
+msgstr "Odstrani projekt"
+
+#: ViewProjects.cpp:543 ViewWork.cpp:599
+msgid "Launching browser..."
+msgstr "Zaganjam brskalnik..."
+
+#: ViewProjects.cpp:718 sg_ProjectCommandPopup.cpp:111
+msgid "Resume tasks for this project."
+msgstr "Nadaljuj opravila tega projekta."
+
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:118
+msgid "Allow new tasks"
+msgstr "Dovoli nova opravila"
+
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:119
+msgid "Allow fetching new tasks for this project."
+msgstr "Dovoli pobiranje novih opravil za ta projekt."
+
+#: ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:122
+msgid "Don't fetch new tasks for this project."
+msgstr "Ne poberi novih opravil za ta projekt."
 
-#: clientgui/ViewProjects.cpp:1063
+#: ViewProjects.cpp:1058
 #, fuzzy
 msgid "Requested by user"
 msgstr "Na čakanju"
 
-#: clientgui/ViewProjects.cpp:1064
+#: ViewProjects.cpp:1059
 msgid "To fetch work"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1065
+#: ViewProjects.cpp:1060
 msgid "To report completed tasks"
 msgstr ""
 
 # well it would help if i knew what this should mean in context of BOINC :)
-#: clientgui/ViewProjects.cpp:1066
+#: ViewProjects.cpp:1061
 #, fuzzy
 msgid "To send trickle-up message"
 msgstr "Pretoči čakajoča sporočila gor"
 
-#: clientgui/ViewProjects.cpp:1067
+#: ViewProjects.cpp:1062
 #, fuzzy
 msgid "Requested by account manager"
 msgstr "Dodaj upravitelja računov"
 
-#: clientgui/ViewProjects.cpp:1068
+#: ViewProjects.cpp:1063
 #, fuzzy
 msgid "Project initialization"
 msgstr "Projekt ni bil najden"
 
-#: clientgui/ViewProjects.cpp:1069
+#: ViewProjects.cpp:1064
 #, fuzzy
 msgid "Requested by project"
 msgstr "Opuščeno s strani projekta"
 
-#: clientgui/ViewProjects.cpp:1070
+#: ViewProjects.cpp:1065
 #, fuzzy
 msgid "Unknown reason"
 msgstr "neznan razlog"
 
-#: clientgui/ViewProjects.cpp:1084
+#: ViewProjects.cpp:1079
 msgid "Suspended by user"
 msgstr "Na čakanju"
 
-#: clientgui/ViewProjects.cpp:1087
+#: ViewProjects.cpp:1082
 msgid "Won't get new tasks"
 msgstr "Ne bom pridobil novih opravil"
 
-#: clientgui/ViewProjects.cpp:1090
+#: ViewProjects.cpp:1085
 msgid "Project ended - OK to remove"
 msgstr "Projekt končan - lahko odstranite"
 
-#: clientgui/ViewProjects.cpp:1093
+#: ViewProjects.cpp:1088
 msgid "Will remove when tasks done"
 msgstr "Odstranjeno bo, ko bodo opravila opravljena"
 
-#: clientgui/ViewProjects.cpp:1096
+#: ViewProjects.cpp:1091
 msgid "Scheduler request pending"
 msgstr "Čakajoča zahteva razvrščevalnika"
 
-#: clientgui/ViewProjects.cpp:1102
+#: ViewProjects.cpp:1097
 msgid "Scheduler request in progress"
 msgstr "Poteka zahteva razvrščevalnika"
 
 # well it would help if i knew what this should mean in context of BOINC :)
-#: clientgui/ViewProjects.cpp:1105
+#: ViewProjects.cpp:1100
 msgid "Trickle up message pending"
 msgstr "Pretoči čakajoča sporočila gor"
 
-#: clientgui/ViewProjects.cpp:1111
+#: ViewProjects.cpp:1106
 msgid "Communication deferred "
 msgstr "Komunikacija odložena "
 
-#: clientgui/ViewResources.cpp:62
+#: ViewResources.cpp:62
 msgid "Total disk usage"
 msgstr "Skupna poraba diska"
 
-#: clientgui/ViewResources.cpp:83
+#: ViewResources.cpp:83
 msgid "Disk usage by BOINC projects"
 msgstr "Poraba diska s strani BOINC projektov"
 
-#: clientgui/ViewResources.cpp:116
+#: ViewResources.cpp:116
 msgid "Disk"
 msgstr "Disk"
 
-#: clientgui/ViewResources.cpp:225
+#: ViewResources.cpp:249
 msgid "no projects: 0 bytes used"
 msgstr ""
 
-#: clientgui/ViewResources.cpp:262
+#: ViewResources.cpp:286
 msgid "used by BOINC: "
 msgstr "BOINC uporablja: "
 
-#: clientgui/ViewResources.cpp:272
+#: ViewResources.cpp:296
 msgid "free, available to BOINC: "
 msgstr "prosto, na voljo za BOINC: "
 
-#: clientgui/ViewResources.cpp:282
+#: ViewResources.cpp:306
 msgid "free, not available to BOINC: "
 msgstr "prosto, ni na voljo za BOINC: "
 
-#: clientgui/ViewResources.cpp:292
+#: ViewResources.cpp:316
 msgid "free: "
 msgstr "prosto: "
 
-#: clientgui/ViewResources.cpp:302
+#: ViewResources.cpp:326
 msgid "used by other programs: "
 msgstr "uporabljajo drugi programi: "
 
-#: clientgui/ViewStatistics.cpp:1181
+#: ViewStatistics.cpp:1205
 msgid "User Total"
 msgstr "Skupaj od uporabnika"
 
-#: clientgui/ViewStatistics.cpp:1182
+#: ViewStatistics.cpp:1206
 msgid "User Average"
 msgstr "Uporabnikovo povprečje"
 
-#: clientgui/ViewStatistics.cpp:1183
+#: ViewStatistics.cpp:1207
 msgid "Host Total"
 msgstr "Skupaj gostiteljev"
 
-#: clientgui/ViewStatistics.cpp:1184
+#: ViewStatistics.cpp:1208
 msgid "Host Average"
 msgstr "Gostiteljev v povprečju"
 
-#: clientgui/ViewStatistics.cpp:1331
+#: ViewStatistics.cpp:1355
 #, c-format
 msgid "Last update: %.0f days ago"
 msgstr "Zadnja posodobitev: pred %.0f dnevi"
 
-#: clientgui/ViewStatistics.cpp:1956
+#: ViewStatistics.cpp:1982
 msgid "Show user total"
 msgstr "Uporabnik skupno"
 
-#: clientgui/ViewStatistics.cpp:1957
+#: ViewStatistics.cpp:1983
 msgid "Show total credit for user"
 msgstr "Prikaži vse uporabnikove točke"
 
-#: clientgui/ViewStatistics.cpp:1963
+#: ViewStatistics.cpp:1989
 msgid "Show user average"
 msgstr "Uporabnik povprečno"
 
-#: clientgui/ViewStatistics.cpp:1964
+#: ViewStatistics.cpp:1990
 msgid "Show average credit for user"
 msgstr "Prikaži povprečje točk za uporabnika"
 
-#: clientgui/ViewStatistics.cpp:1970
+#: ViewStatistics.cpp:1996
 msgid "Show host total"
 msgstr "Gostitelj skupno"
 
-#: clientgui/ViewStatistics.cpp:1971
+#: ViewStatistics.cpp:1997
 msgid "Show total credit for host"
 msgstr "Prikaži skupno točk za gostitelja"
 
-#: clientgui/ViewStatistics.cpp:1977
+#: ViewStatistics.cpp:2003
 msgid "Show host average"
 msgstr "Gostitelj povprečno"
 
-#: clientgui/ViewStatistics.cpp:1978
+#: ViewStatistics.cpp:2004
 msgid "Show average credit for host"
 msgstr "Prikaži povprečje točk za gostitelja"
 
-#: clientgui/ViewStatistics.cpp:1987
+#: ViewStatistics.cpp:2013
 msgid "< &Previous project"
 msgstr "< &Predhodni projekt"
 
-#: clientgui/ViewStatistics.cpp:1988
+#: ViewStatistics.cpp:2014
 msgid "Show chart for previous project"
 msgstr "Prikaži graf za predhodni projekt"
 
-#: clientgui/ViewStatistics.cpp:1993
+#: ViewStatistics.cpp:2019
 msgid "&Next project >"
 msgstr "&Naslednji projekt >"
 
-#: clientgui/ViewStatistics.cpp:1994
+#: ViewStatistics.cpp:2020
 msgid "Show chart for next project"
 msgstr "Prikaži graf za naslednji projekt"
 
-#: clientgui/ViewStatistics.cpp:2000
-#: clientgui/ViewStatistics.cpp:2390
+#: ViewStatistics.cpp:2026 ViewStatistics.cpp:2416
 msgid "Hide project list"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2001
-#: clientgui/ViewStatistics.cpp:2390
+#: ViewStatistics.cpp:2027 ViewStatistics.cpp:2416
 msgid "Use entire area for graphs"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2006
+#: ViewStatistics.cpp:2032
 msgid "Mode view"
 msgstr "Način pogleda"
 
-#: clientgui/ViewStatistics.cpp:2010
+#: ViewStatistics.cpp:2036
 msgid "One project"
 msgstr "En projekt"
 
-#: clientgui/ViewStatistics.cpp:2011
+#: ViewStatistics.cpp:2037
 msgid "Show one chart with selected project"
 msgstr "Prikaži en graf z izbranim projektom"
 
-#: clientgui/ViewStatistics.cpp:2017
+#: ViewStatistics.cpp:2043
 msgid "All projects (separate)"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2018
+#: ViewStatistics.cpp:2044
 msgid "Show all projects, one chart per project"
 msgstr "Prikaži vse projekte, en graf na projekt"
 
-#: clientgui/ViewStatistics.cpp:2024
+#: ViewStatistics.cpp:2050
 msgid "All projects (together)"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2025
+#: ViewStatistics.cpp:2051
 msgid "Show one chart with all projects"
 msgstr "Prikaži en graf z vsemi projekti"
 
-#: clientgui/ViewStatistics.cpp:2031
+#: ViewStatistics.cpp:2057
 #, fuzzy
 msgid "All projects (sum)"
 msgstr "Vsi projekti (vsota)"
 
-#: clientgui/ViewStatistics.cpp:2032
+#: ViewStatistics.cpp:2058
 #, fuzzy
 msgid "Show one chart with sum of projects"
 msgstr "Prikaži en graf z vsemi projekti"
 
-#: clientgui/ViewStatistics.cpp:2053
+#: ViewStatistics.cpp:2079
 msgid "Statistics"
 msgstr "Statistika"
 
-#: 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
+#: 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
 msgid "Updating charts..."
 msgstr "Posodobljam grafe..."
 
-#: clientgui/ViewStatistics.cpp:2394
+#: ViewStatistics.cpp:2420
 msgid "Show project list"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2394
+#: ViewStatistics.cpp:2420
 msgid "Uses smaller area for graphs"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:169
+#: ViewTransfers.cpp:164
 msgid "Retry Now"
 msgstr "Ponovno poskusi zdaj"
 
-#: clientgui/ViewTransfers.cpp:170
+#: ViewTransfers.cpp:165
 msgid "Retry the file transfer now"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:176
+#: ViewTransfers.cpp:171
 msgid "Abort Transfer"
 msgstr "Opusti prenos"
 
-#: clientgui/ViewTransfers.cpp:177
+#: ViewTransfers.cpp:172
 msgid "Abort this file transfer.  You won't get credit for the task."
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:188
+#: ViewTransfers.cpp:183
 msgid "File"
 msgstr "Datoteka"
 
-#: clientgui/ViewTransfers.cpp:189
-#: clientgui/ViewWork.cpp:238
+#: ViewTransfers.cpp:184 ViewWork.cpp:233
 msgid "Progress"
 msgstr "Napredek"
 
-#: clientgui/ViewTransfers.cpp:190
+#: ViewTransfers.cpp:185
 msgid "Size"
 msgstr "Velikost"
 
-#: clientgui/ViewTransfers.cpp:191
+#: ViewTransfers.cpp:186
 msgid "Elapsed Time"
 msgstr "Pretečeni čas"
 
-#: clientgui/ViewTransfers.cpp:192
+#: ViewTransfers.cpp:187
 msgid "Speed"
 msgstr "Hitrost"
 
-#: clientgui/ViewTransfers.cpp:218
+#: ViewTransfers.cpp:213
 msgid "Transfers"
 msgstr "Prenosi"
 
-#: clientgui/ViewTransfers.cpp:285
+#: ViewTransfers.cpp:280
 msgid "Network activity is suspended - "
 msgstr "Mrežna aktivnost je na čakanju - "
 
-#: clientgui/ViewTransfers.cpp:287
+#: ViewTransfers.cpp:282
 msgid ""
 ".\n"
 "You can enable it using the Activity menu."
@@ -3812,19 +3332,19 @@ msgstr ""
 ".\n"
 "Lahko omogočite v menuju Aktivnost."
 
-#: clientgui/ViewTransfers.cpp:290
+#: ViewTransfers.cpp:285
 msgid "BOINC"
 msgstr "BOINC"
 
-#: clientgui/ViewTransfers.cpp:297
+#: ViewTransfers.cpp:292
 msgid "Retrying transfer now..."
 msgstr "Zdaj ponovno poskušam prenesti..."
 
-#: clientgui/ViewTransfers.cpp:335
+#: ViewTransfers.cpp:330
 msgid "Aborting transfer..."
 msgstr "Opuščam prenos..."
 
-#: clientgui/ViewTransfers.cpp:348
+#: ViewTransfers.cpp:343
 #, c-format
 msgid ""
 "Are you sure you want to abort this file transfer '%s'?\n"
@@ -3835,106 +3355,120 @@ msgstr ""
 "OPOMBA: Opustitev prenosa bo razveljavila opravilo in\n"
 "zanj ne boste dobili točk."
 
-#: clientgui/ViewTransfers.cpp:354
+#: ViewTransfers.cpp:349
 msgid "Abort File Transfer"
 msgstr "Opusti prenos datoteke"
 
-#: clientgui/ViewTransfers.cpp:785
+#: ViewTransfers.cpp:780
 msgid "Upload"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:785
+#: ViewTransfers.cpp:780
 msgid "Download"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:789
+#: ViewTransfers.cpp:784
 #, fuzzy
 msgid "retry in "
 msgstr "Ponovno poskusi čez_"
 
-#: clientgui/ViewTransfers.cpp:791
+#: ViewTransfers.cpp:786
 msgid "failed"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:794
+#: ViewTransfers.cpp:789
 msgid "suspended"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:799
+#: ViewTransfers.cpp:794
 msgid "active"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:801
+#: ViewTransfers.cpp:796
 msgid "pending"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:808
+#: ViewTransfers.cpp:803
 msgid " (project backoff: "
 msgstr " (projekt je odstopil: "
 
-#: clientgui/ViewWork.cpp:192
-#: clientgui/ViewWork.cpp:782
+#: ViewWork.cpp:187 ViewWork.cpp:777
 msgid "Show active tasks"
 msgstr "Prikaži aktivna opravila"
 
-#: clientgui/ViewWork.cpp:193
-#: clientgui/ViewWork.cpp:783
+#: ViewWork.cpp:188 ViewWork.cpp:778
 msgid "Show only active tasks."
 msgstr "Prikaži samo aktivna opravila"
 
-#: clientgui/ViewWork.cpp:206
+#: ViewWork.cpp:194 sg_TaskCommandPopup.cpp:60
+msgid "Show graphics"
+msgstr "Prikaži grafiko"
+
+#: ViewWork.cpp:195 sg_TaskCommandPopup.cpp:61
+msgid "Show application graphics in a window."
+msgstr "V oknu prikaži grafiko aplikacije."
+
+#: ViewWork.cpp:201
 #, fuzzy
 msgid "Show VM Console"
 msgstr "Gostitelj skupno"
 
-#: clientgui/ViewWork.cpp:207
+#: ViewWork.cpp:202
 #, fuzzy
 msgid "Show VM Console in a window."
 msgstr "V oknu prikaži grafiko aplikacije."
 
-#: clientgui/ViewWork.cpp:214
+#: ViewWork.cpp:209
 msgid "Suspend work for this result."
 msgstr "Delo za ta rezultat daj na čakanje."
 
-#: clientgui/ViewWork.cpp:221
+#: ViewWork.cpp:215 sg_TaskCommandPopup.cpp:72
+msgid "Abort"
+msgstr "Opusti"
+
+#: ViewWork.cpp:216
 msgid "Abandon work on the result. You will get no credit for it."
 msgstr "Opusti delo na tem rezultatu. Zanj ne boste dobili točk."
 
-#: clientgui/ViewWork.cpp:240
+#: ViewWork.cpp:223 sg_TaskCommandPopup.cpp:79
+msgid "Show task details."
+msgstr "Prikaži podrobnosti opravila."
+
+#: ViewWork.cpp:235
 msgid "Elapsed"
 msgstr "Preteklo"
 
-#: clientgui/ViewWork.cpp:241
+#: ViewWork.cpp:236
 #, fuzzy
 msgid "Remaining (estimated)"
 msgstr "Preostaja"
 
-#: clientgui/ViewWork.cpp:242
+#: ViewWork.cpp:237
 msgid "Deadline"
 msgstr "Rok"
 
-#: clientgui/ViewWork.cpp:269
+#: ViewWork.cpp:264
 msgid "Tasks"
 msgstr "Opravila"
 
-#: clientgui/ViewWork.cpp:362
+#: ViewWork.cpp:357
 msgid "Resuming task..."
 msgstr "Nadaljujem opravilo..."
 
-#: clientgui/ViewWork.cpp:365
+#: ViewWork.cpp:360
 msgid "Suspending task..."
 msgstr "Opravilo dajem na čakanje..."
 
-#: clientgui/ViewWork.cpp:394
+#: ViewWork.cpp:389
 msgid "Showing graphics for task..."
 msgstr "Prikazujem grafiko za to opravilo..."
 
-#: clientgui/ViewWork.cpp:431
+#: ViewWork.cpp:426
 #, fuzzy
 msgid "Showing VM console for task..."
 msgstr "Prikazujem grafiko za to opravilo..."
 
-#: clientgui/ViewWork.cpp:484
+#: ViewWork.cpp:479
 #, c-format
 msgid ""
 "Are you sure you want to abort this task '%s'?\n"
@@ -3943,34 +3477,46 @@ msgstr ""
 "Ali ste prepričani, da želite opustiti to opravilo '%s'?\n"
 "(Napredek: %s, Status: %s)"
 
-#: clientgui/ViewWork.cpp:490
+#: ViewWork.cpp:485
 #, c-format
 msgid "Are you sure you want to abort these %d tasks?"
 msgstr "Ali ste prepričani, da želite opustiti teh %d opravil?"
 
+#: ViewWork.cpp:490 sg_TaskCommandPopup.cpp:256
+msgid "Abort task"
+msgstr "Opusti opravilo"
+
 # 75%
-#: clientgui/ViewWork.cpp:504
+#: ViewWork.cpp:499
 #, fuzzy
 msgid "Aborting task..."
 msgstr "Opuščam prenos..."
 
-#: clientgui/ViewWork.cpp:776
+#: ViewWork.cpp:771
 msgid "Show all tasks"
 msgstr "Prikaži vsa opravila"
 
-#: clientgui/ViewWork.cpp:777
+#: ViewWork.cpp:772
 msgid "Show all tasks."
 msgstr "Prikaži vsa opravila."
 
-#: clientgui/WelcomePage.cpp:284
+#: ViewWork.cpp:796 sg_TaskCommandPopup.cpp:103
+msgid "Resume work for this task."
+msgstr "Nadaljuj z delom za to opravila."
+
+#: ViewWork.cpp:802 sg_TaskCommandPopup.cpp:107
+msgid "Suspend work for this task."
+msgstr "Daj delo za to opravilo na čakanje."
+
+#: WelcomePage.cpp:284
 msgid "Add project or account manager"
 msgstr "Dodaj projekt ali upravitelja računov"
 
-#: clientgui/WelcomePage.cpp:288
+#: WelcomePage.cpp:288
 msgid "Add project or use BOINC Account Manager"
 msgstr ""
 
-#: clientgui/WelcomePage.cpp:297
+#: WelcomePage.cpp:297
 #, c-format
 msgid ""
 "If possible, add projects at the\n"
@@ -3984,7 +3530,7 @@ msgstr ""
 "Projekti dodani preko tega čarovnika ne bodo\n"
 "prikazani ali upravljani prek %s."
 
-#: clientgui/WelcomePage.cpp:313
+#: WelcomePage.cpp:313
 #, fuzzy
 msgid ""
 "There are over 30 BOINC-based projects\n"
@@ -3999,160 +3545,494 @@ msgstr ""
 "Lahko se neposredno priklopite na projekt\n"
 "ali uporabite spletno stran 'Upravitelja računov', da izberete projekte."
 
-#: 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"
+#: 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 ""
+
+#: WelcomePage.cpp:339
+msgid "Use a BOINC Account Manager"
+msgstr ""
+
+#: WelcomePage.cpp:352
+msgid "To continue, click Next."
+msgstr "Za nadaljevanje kliknite Naprej."
+
+#: WelcomePage.cpp:358
+msgid "Add or change your World Community Grid projects"
+msgstr ""
+
+#: WelcomePage.cpp:361
+msgid "Add projects run by other researchers or organizations"
+msgstr ""
+
+#: WizardAttach.cpp:634
+msgid "Do you really want to cancel?"
+msgstr "Res želite preklicati?"
+
+#: WizardAttach.cpp:635
+msgid "Question"
+msgstr "Vprašanje"
+
+#: sg_BoincSimpleFrame.cpp:149
+msgid "Advanced View...\tCtrl+Shift+A"
+msgstr "Napredni pogled...\\Ctrl+Shift+A"
+
+#: sg_BoincSimpleFrame.cpp:150
+#, fuzzy
+msgid "Display the advanced graphical interface."
+msgstr "Prikaži preprost uporabniški vmesnik."
+
+#: sg_BoincSimpleFrame.cpp:157
+msgid "Skin"
+msgstr "Preobleka"
+
+#: sg_BoincSimpleFrame.cpp:159
+msgid "Select the appearance of the user interface."
+msgstr ""
+
+#: sg_BoincSimpleFrame.cpp:206
+#, c-format
+msgid "&%s"
+msgstr "&%s"
+
+#: sg_BoincSimpleFrame.cpp:390
+#, fuzzy
+msgid "Default"
+msgstr "&Nastavi privzeto"
+
+#: sg_BoincSimpleFrame.cpp:759
+msgid "Suspend Computing"
+msgstr ""
+
+#: sg_BoincSimpleFrame.cpp:760
+msgid "Resume Computing"
+msgstr ""
+
+#: sg_BoincSimpleFrame.cpp:777
+msgid "Open a window to view notices from projects or BOINC"
+msgstr ""
+
+#: sg_DlgMessages.cpp:146
+msgid "Close"
+msgstr "Zapri"
+
+#: sg_DlgMessages.cpp:389
+#, c-format
+#, fuzzy, c-format
+msgid "%s - Notices"
+msgstr "%s Obvestila"
+
+#: sg_DlgPreferences.cpp:268
+msgid "This dialog controls preferences for this computer only."
+msgstr ""
+
+#: sg_DlgPreferences.cpp:273
+msgid "Click OK to set preferences."
+msgstr ""
+
+#: sg_DlgPreferences.cpp:278
+msgid ""
+"Click Clear to restore web-based settings for all preferences listed below."
+msgstr ""
+
+#: sg_DlgPreferences.cpp:285
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
+msgstr ""
+
+#: sg_DlgPreferences.cpp:313
+msgid "Do work only between:"
+msgstr "Opravljaj delo le med:"
+
+#: sg_DlgPreferences.cpp:335
+msgid "Connect to internet only between:"
+msgstr "Poveži se na internet samo med:"
+
+#: sg_DlgPreferences.cpp:357 sg_DlgPreferences.cpp:374
+msgid "Use no more than:"
+msgstr "Ne uporabi več kot:"
+
+#: sg_DlgPreferences.cpp:370
+msgid "of disk space"
+msgstr "prostora na disku"
+
+#: sg_DlgPreferences.cpp:387
+msgid "of the processor"
+msgstr "procesorskega časa"
+
+#: sg_DlgPreferences.cpp:391
+msgid "Do work while on battery?"
+msgstr "Opravljati delo med delovanjem na baterije?"
+
+#: sg_DlgPreferences.cpp:404
+msgid "Do work after idle for:"
+msgstr "Opravljati delo, ko je neaktiven že:"
+
+#: sg_DlgPreferences.cpp:429
+msgid "Clear all local preferences listed above and close the dialog"
+msgstr ""
+
+#: 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 "Kdajkoli"
+
+#: 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
+#, c-format
+msgid "%d MB"
+msgstr "%d MB"
+
+#: sg_DlgPreferences.cpp:719
+#, c-format
+msgid "%4.2f GB"
+msgstr "%4.2f GB"
+
+#: sg_DlgPreferences.cpp:760
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
+
+#: sg_DlgPreferences.cpp:796
+msgid "0 (Run Always)"
+msgstr "0 (Vedno naj teče)"
+
+#: sg_DlgPreferences.cpp:799
+#, c-format
+msgid "%d"
+msgstr "%d"
+
+#: sg_DlgPreferences.cpp:1029
+#, fuzzy
+msgid "Do you really want to clear all local preferences?\n"
+msgstr "Res želite počistiti vse lokalne nastavitve?"
+
+#: sg_ProjectPanel.cpp:72
+#, fuzzy
+msgid "Add Project"
+msgstr "Dodaj projekt"
+
+#: sg_ProjectPanel.cpp:73
+msgid "Synchronize"
+msgstr ""
+
+#: sg_ProjectPanel.cpp:74
+msgid "Work done for this project"
+msgstr ""
+
+#: sg_ProjectPanel.cpp:77
+msgid "Synchronize projects with account manager system"
+msgstr "Sinhronizirajte projekte s sistemom upravljanja računov"
+
+#: sg_ProjectPanel.cpp:124
+msgid "Select a project to access with the controls below"
+msgstr ""
+
+#: sg_ProjectPanel.cpp:145
+#, fuzzy
+msgid "Project Web Pages"
+msgstr "Spletna stran projekta"
+
+#: sg_ProjectPanel.cpp:149
+msgid "Project Commands"
+msgstr ""
+
+#: sg_ProjectPanel.cpp:267
+#, c-format
+msgid "Pop up a menu of web sites for project %s"
+msgstr ""
+
+#: sg_ProjectPanel.cpp:269
+#, c-format
+msgid "Pop up a menu of commands to apply to project %s"
+msgstr ""
+
+#: sg_TaskCommandPopup.cpp:67
+msgid "Suspend this task."
+msgstr ""
+
+#: sg_TaskCommandPopup.cpp:73
+msgid "Abandon this task. You will get no credit for it."
+msgstr ""
+
+#: sg_TaskCommandPopup.cpp:251
+#, c-format
+#, fuzzy, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %.1lf%%, Status: %s)"
+msgstr ""
+"Ali ste prepričani, da želite opustiti to opravilo '%s'?\n"
+"(Napredek: %s %%, Status: %s)"
+
+#: sg_TaskPanel.cpp:464
+msgid "You don't have any projects.  Please Add a Project."
+msgstr "Nimate projektov.  Prosimo dodajte projekt."
+
+#: sg_TaskPanel.cpp:465
+msgid "Not available"
+msgstr ""
+
+#: sg_TaskPanel.cpp:476
+#, fuzzy
+msgid "Tasks:"
+msgstr "Opravila"
+
+#: sg_TaskPanel.cpp:482
+msgid "Select a task to access"
+msgstr ""
+
+#: sg_TaskPanel.cpp:493
+#, fuzzy
+msgid "From:"
+msgstr "Od"
+
+#: sg_TaskPanel.cpp:547
+msgid "This task's progress"
+msgstr ""
+
+#: sg_TaskPanel.cpp:565
+msgid "Task Commands"
+msgstr ""
+
+#: sg_TaskPanel.cpp:566
+msgid "Pop up a menu of commands to apply to this task"
+msgstr ""
+
+#: sg_TaskPanel.cpp:701
+#, c-format
+#, fuzzy, c-format
+msgid "Application: %s"
+msgstr "Aplikacija: "
+
+#: sg_TaskPanel.cpp:724
+#, c-format
+msgid "%.3f%%"
+msgstr ""
+
+#: sg_TaskPanel.cpp:732
+msgid "Application: Not available"
 msgstr ""
 
-#: clientgui/WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
+#: sg_TaskPanel.cpp:832
+msgid "Not Available"
 msgstr ""
 
-#: clientgui/WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
+#: sg_TaskPanel.cpp:847
+#, c-format
+msgid "Elapsed: %s"
 msgstr ""
 
-#: clientgui/WelcomePage.cpp:361
-msgid "Add projects run by other researchers or organizations"
+# 84%
+#: sg_TaskPanel.cpp:861
+#, c-format
+#, fuzzy, c-format
+msgid "Remaining (estimated): %s"
+msgstr "Preostaja"
+
+#: sg_TaskPanel.cpp:876
+#, c-format
+msgid "Status: %s"
 msgstr ""
 
-#: clientgui/WizardAttach.cpp:673
-msgid "Do you really want to cancel?"
-msgstr "Res želite preklicati?"
+#: sg_TaskPanel.cpp:1223
+msgid "Retrieving current status."
+msgstr "Pridobivam trenutni status."
 
-#: clientgui/WizardAttach.cpp:674
-msgid "Question"
-msgstr "Vprašanje"
+#: sg_TaskPanel.cpp:1229
+msgid "Downloading work from the server."
+msgstr "Prejemam delo s strežnika."
+
+#: sg_TaskPanel.cpp:1234
+msgid "Processing Suspended:  Running On Batteries."
+msgstr "Obdelava na čakanju:  Teče na baterijah."
+
+#: sg_TaskPanel.cpp:1236
+msgid "Processing Suspended:  User Active."
+msgstr "Obdelava na čakanju:  Uporabnik aktiven."
+
+#: sg_TaskPanel.cpp:1238
+msgid "Processing Suspended:  User paused processing."
+msgstr "Obdelava na čakanju:  Na željo uporabnika."
+
+#: sg_TaskPanel.cpp:1240
+msgid "Processing Suspended:  Time of Day."
+msgstr "Obdelava na čakanju:  Čas dneva."
+
+#: sg_TaskPanel.cpp:1242
+msgid "Processing Suspended:  Benchmarks Running."
+msgstr "Obdelava na čakanju:  Potekajo meritve hitrosti."
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
+#: sg_TaskPanel.cpp:1244
+msgid "Processing Suspended."
+msgstr "Obdelava na čakanju."
+
+#: sg_TaskPanel.cpp:1248
+msgid "Waiting to contact project servers."
+msgstr "Čakam, da kontaktiram strežnike projektov."
+
+#: sg_TaskPanel.cpp:1252 sg_TaskPanel.cpp:1261
+msgid "Retrieving current status"
+msgstr "Pridobivam trenutni status"
+
+#: sg_TaskPanel.cpp:1256
+msgid "No work available to process"
+msgstr "Na voljo ni dela za obdelati."
+
+#: sg_TaskPanel.cpp:1258
+msgid "Unable to connect to the core client"
+msgstr "Ne morem se povezati na odjemalca jedra"
+
+#: wizardex.cpp:377 wizardex.cpp:553
 msgid "&Next >"
 msgstr "&Naprej >"
 
-#: clientgui/wizardex.cpp:383
+#: wizardex.cpp:383
 msgid "< &Back"
 msgstr "< Na&zaj"
 
-#: clientgui/wizardex.cpp:553
+#: wizardex.cpp:553
 msgid "&Finish"
 msgstr "&Končaj"
 
-#: clientgui/common/wxPieCtrl.cpp:64
-msgid "Pie Ctrl"
-msgstr "Pie Ctrl"
+#: mac/Mac_GUI.cpp:110
+#, fuzzy
+msgid "Preferences…"
+msgstr "Nastavitve"
 
-#: clientgui/mac/Mac_GUI.cpp:35
+#: mac/Mac_GUI.cpp:122
 msgid "Services"
 msgstr ""
 
-#: clientgui/mac/Mac_GUI.cpp:36
+#: mac/Mac_GUI.cpp:144
 #, c-format
 msgid "Hide %s"
 msgstr ""
 
-#: clientgui/mac/Mac_GUI.cpp:37
+#: mac/Mac_GUI.cpp:158
 msgid "Hide Others"
 msgstr ""
 
-#: clientgui/mac/Mac_GUI.cpp:38
+#: mac/Mac_GUI.cpp:172
 msgid "Show All"
 msgstr ""
 
-#: clientgui/mac/Mac_GUI.cpp:39
+#: mac/Mac_GUI.cpp:186
 #, c-format
+#, fuzzy, c-format
 msgid "Quit %s"
 msgstr "Za&pusti %s"
 
-#: clientgui/DlgAdvPreferences.h:30
-msgid "specify work start and stop hours in format HH:MM-HH:MM"
-msgstr "podajte začetne in končne ure dela v formatu HH:MM-HH:MM"
-
-#: clientgui/DlgAdvPreferences.h:31
-msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
-msgstr "podajte začetne in končne ure uporabe mreže v formatu HH:MM-HH:MM"
-
-# 98%
-#, fuzzy
-#~ msgid ""
-#~ "(C) 2003-2013 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2010 University of California, Berkeley.\n"
-#~ "Vse pravice pridržane."
-
-#, c-format
-#~ msgid "%s - Preferences"
-#~ msgstr "%s - Nastavitve"
-
-#, no-c-format
-#~ msgid "% CPU time"
-#~ msgstr "% procesorskega časa"
-#~ msgid "KBytes/sec."
-#~ msgstr "KBajtov/sekundo"
-#~ msgid "Mbytes"
-#~ msgstr "Mbajtov"
-#~ msgid "every"
-#~ msgstr "vsakih"
-#~ msgid "days"
-#~ msgstr "dni"
-#~ msgid "Gigabytes disk space"
-#~ msgstr "Prostor na disku v gigabajtih"
-#~ msgid "Running, high priority"
-#~ msgstr "Se izvaja, visoka prioriteta"
-
-#, fuzzy
-#~ msgid " (Waiting for network access)"
-#~ msgstr "Čaka na pomnilnik"
-
-#, fuzzy
-#~ msgid "Preferences…"
-#~ msgstr "Nastavitve"
 #~ msgid "I do not agree with the terms of use."
 #~ msgstr "Ne strinjam se s pogoji uporabe."
+
 #~ msgid "Workunit name"
 #~ msgstr "Ime delovne enote"
+
 #~ msgid "invalid float"
 #~ msgstr "napačno število s plavajočo vejico"
+
 #~ msgid "Display the advanced (accessible) graphical interface."
 #~ msgstr "Prikaži napredni (dostopen) grafični vmesnik."
+
 #~ msgid "Paused: Other work running"
 #~ msgstr "Na čakanju: teče drugo delo"
+
 #~ msgid "Paused: User initiated.  Click 'Resume' to continue"
 #~ msgstr "Na čakanju: na željo uporabnika.  Kliknite 'Nadaljuj' za nadaljevanje."
+
 #~ msgid "Paused: User active"
 #~ msgstr "Na čakanju: uporabnik aktiven"
+
 #~ msgid "Paused: Computer on battery"
 #~ msgstr "Na čakanju: računalnik deluje na baterije"
+
 #~ msgid "Paused: Time of Day"
 #~ msgstr "Na čakanju: čas dneva"
+
 #~ msgid "Paused: Benchmarks running"
 #~ msgstr "Na pavzi: potekajo meritve hitrosti"
+
 #~ msgid "Paused"
 #~ msgstr "Na pavzi"
+
 #~ msgid "Paused: Application start delayed"
 #~ msgstr "Na pavzi: odložen pričetek aplikacije"
+
 #~ msgid "Click to show project graphics"
 #~ msgstr "Kliknite za prikaz grafike projekta"
+
 #~ msgid "Open a window to view messages"
 #~ msgstr "Odprite okno za pregled sporočil"
+
 #~ msgid "Stop all activity"
 #~ msgstr "Ustavi vse aktivnosti"
+
 #~ msgid "Resume activity"
 #~ msgstr "Nadaljuj aktivnosti"
+
 #~ msgid "Open a window to set your preferences"
 #~ msgstr "Odprite okno, da nastavite svoje nastavitve"
+
 #~ msgid "Switch to the BOINC advanced view"
 #~ msgstr "Preklopite na BOINC napredni pogled"
+
 #~ msgid "My Projects:"
 #~ msgstr "Moji projekti:"
 
@@ -4167,23 +4047,30 @@ msgstr "podajte začetne in končne ure uporabe mreže v formatu HH:MM-HH:MM"
 #, c-format
 #~ msgid "%d hr %d min %d sec"
 #~ msgstr "%d ur %d minut %d sekund"
+
 #~ msgid "Are you sure you want to display graphics on a remote machine?"
 #~ msgstr ""
 #~ "Ali ste prepričani, da želite prikazati grafiko na oddaljenem računalniku?"
+
 #~ msgid "Application: "
 #~ msgstr "Aplikacija: "
+
 #~ msgid "Time Remaining: "
 #~ msgstr "Preostali čas: "
+
 #~ msgid "Elapsed Time: "
 #~ msgstr "Pretečeni čas: "
+
 #~ msgid "Account manager website"
 #~ msgstr "Spletna stran upravitelja računov"
+
 #~ msgid "Account Manager &URL:"
 #~ msgstr "Upravitelj računov &URL:"
 
 #, c-format
 #~ msgid "%s &website"
 #~ msgstr "%s &spletna stran"
+
 #~ msgid "Notice List"
 #~ msgstr "Seznam obvestil"
 
@@ -4194,14 +4081,19 @@ msgstr "podajte začetne in končne ure uporabe mreže v formatu HH:MM-HH:MM"
 #, c-format
 #~ msgid "%s; received from %s; on %s"
 #~ msgstr "%s; prejeto od %s; %s"
+
 #~ msgid "Click"
 #~ msgstr "Kliknite"
+
 #~ msgid "Project List"
 #~ msgstr "Seznam projektov"
+
 #~ msgid "Nvidia GPU Supported"
 #~ msgstr "Podprti Nvidia grafični procesorji"
+
 #~ msgid "ATI GPU Supported"
 #~ msgstr "Podprti ATI grafični procesorji"
+
 #~ msgid "Project Website"
 #~ msgstr "Spletna stran projekta"
 
@@ -4209,53 +4101,75 @@ msgstr "podajte začetne in končne ure uporabe mreže v formatu HH:MM-HH:MM"
 #, fuzzy
 #~ msgid "Retry now"
 #~ msgstr "Ponovno poskusi zdaj"
+
 #~ msgid "10%"
 #~ msgstr "10%"
+
 #~ msgid "20%"
 #~ msgstr "20%"
+
 #~ msgid "30%"
 #~ msgstr "30%"
+
 #~ msgid "40%"
 #~ msgstr "40%"
+
 #~ msgid "50%"
 #~ msgstr "50%"
+
 #~ msgid "60%"
 #~ msgstr "60%"
+
 #~ msgid "70%"
 #~ msgstr "70%"
+
 #~ msgid "80%"
 #~ msgstr "80%"
+
 #~ msgid "90%"
 #~ msgstr "90%"
+
 #~ msgid "100%"
 #~ msgstr "100%"
+
 #~ msgid "1"
 #~ msgstr "1"
+
 #~ msgid "3"
 #~ msgstr "3"
+
 #~ msgid "5"
 #~ msgstr "5"
+
 #~ msgid "10"
 #~ msgstr "10"
+
 #~ msgid "15"
 #~ msgstr "15"
+
 #~ msgid "30"
 #~ msgstr "30"
+
 #~ msgid "60"
 #~ msgstr "60"
+
 #~ msgid ""
 #~ "for accessibility support, please select advanced from the view menu or type "
 #~ "command shift a"
 #~ msgstr ""
 #~ "za podporo pomožnim tehnologijam, prosim, izberite napredno pod menujem "
 #~ "pogled ali pritisnite command shift a"
+
 #~ msgid "This panel contains graphs showing user totals for projects"
 #~ msgstr ""
 #~ "Ta pladenj vsebuje grafe, ki prikazujejo skupne točke uporabnika za projekte"
+
 #~ msgid "list headers"
 #~ msgstr "seznam zaglavij"
+
 #~ msgid "list of events"
 #~ msgstr "seznam dogodkov"
+
 #~ msgid "list of events is empty"
 #~ msgstr "seznam dogodkov je prazen"
 
@@ -4278,6 +4192,7 @@ msgstr "podajte začetne in končne ure uporabe mreže v formatu HH:MM-HH:MM"
 #, c-format
 #~ msgid "; column %d of %d; "
 #~ msgstr "; stolpec %d od %d; "
+
 #~ msgid "list is empty"
 #~ msgstr "seznam je prazen"
 
@@ -4296,8 +4211,10 @@ msgstr "podajte začetne in končne ure uporabe mreže v formatu HH:MM-HH:MM"
 #, c-format
 #~ msgid "; row %d of %d; "
 #~ msgstr "; vrstica %d od %d; "
+
 #~ msgid "blank"
 #~ msgstr "prazno"
+
 #~ msgid "list of projects or account managers"
 #~ msgstr "seznam projektov ali upraviteljev računov"
 
@@ -4351,10 +4268,22 @@ msgstr "podajte začetne in končne ure uporabe mreže v formatu HH:MM-HH:MM"
 #, c-format
 #~ msgid "OnDropTarget: index by HitTest = %i"
 #~ msgstr "OnDropTarget: indeks od HitTest = %i"
+
+#~ msgid "Pie Ctrl"
+#~ msgstr "Pie Ctrl"
+
+#~ msgid "specify work start and stop hours in format HH:MM-HH:MM"
+#~ msgstr "podajte začetne in končne ure dela v formatu HH:MM-HH:MM"
+
+#~ msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
+#~ msgstr "podajte začetne in končne ure uporabe mreže v formatu HH:MM-HH:MM"
+
 #~ msgid "Identify your account "
 #~ msgstr "Identificirajte vaš uporabniški račun"
+
 #~ msgid "Read config file"
 #~ msgstr "Preberi konfiguracijsko datoteko"
+
 #~ msgid "Read configuration info from cc_config.xml"
 #~ msgstr "Preberi konfiguracijske informacije iz cc_config.xml"
 
@@ -4365,10 +4294,13 @@ msgstr "podajte začetne in končne ure uporabe mreže v formatu HH:MM-HH:MM"
 #~ msgstr ""
 #~ "(C) 2003-2010 University of California, Berkeley.\n"
 #~ "Vse pravice pridržane."
+
 #~ msgid "Multicore CPU Supported"
 #~ msgstr "Podprti večjedrni procesorji"
+
 #~ msgid "Click 'Retry now' to transfer the file now"
 #~ msgstr "Kliknite 'Ponovno poskusi zdaj', da zdaj prenesete datoteko"
+
 #~ msgid ""
 #~ "Click 'Abort transfer' to delete the file from the transfer queue. This "
 #~ "will prevent you from being granted credit for this result."
@@ -4376,6 +4308,7 @@ msgstr "podajte začetne in končne ure uporabe mreže v formatu HH:MM-HH:MM"
 #~ "Kliknite 'Opusti prenos', da izbrišete datoteko iz čakalne vrste "
 #~ "prenosov. To vam bo prepričilo, da bi bili nagrajeni z zaslugami za ta "
 #~ "rezultat."
+
 #~ msgid "Aborting result..."
 #~ msgstr "Opuščam rezultat..."
 
@@ -4411,34 +4344,47 @@ msgstr "podajte začetne in končne ure uporabe mreže v formatu HH:MM-HH:MM"
 #~ "\n"
 #~ "Da spremenite katere raziskovalne aplikacije so poslane vam iz\n"
 #~ "World Community Grid, prosim kliknite sledeči gumb:"
+
 #~ msgid "Change Research Applications at World Community Grid"
 #~ msgstr "Spremeni raziskovalne aplikacije na World Community Grid"
+
 #~ msgid "Don't fetch NVIDIA GPU tasks"
 #~ msgstr "Ne potegni novih opravil za NVIDIA grafični procesor"
+
 #~ msgid "NVIDIA GPU work fetch deferred for"
 #~ msgstr "Prevzemanje dela za NVIDIA grafični procesor odloženo za"
+
 #~ msgid "NVIDIA GPU work fetch deferral interval"
 #~ msgstr "Odložitveni interval prevzemanja dela za NVIDIA grafični procesor"
+
 #~ msgid "Don't fetch ATI GPU tasks"
 #~ msgstr "Ne potegni novih opravil za ATI grafični procesor"
+
 #~ msgid "ATI GPU work fetch deferred for"
 #~ msgstr "Prevzemanje dela za ATI grafični procesor odloženo za"
+
 #~ msgid "ATI GPU work fetch deferral interval"
 #~ msgstr "Odložitveni interval prevzemanja dela za ATI grafični procesor"
+
 #~ msgid "Web sites"
 #~ msgstr "Spletne strani"
+
 #~ msgid "Connect about every"
 #~ msgstr "Poveži se približno vsakih"
+
 #~ msgid ""
 #~ "this computer is connected to the Internet about every X days\n"
 #~ "(0 if it's always connected)"
 #~ msgstr ""
 #~ "ta računalnik je povezan na internet približno vsakih X dni\n"
 #~ "(0, če je zmeraj povezan)"
+
 #~ msgid "days (max. 10)"
 #~ msgstr "dni (največ 10)"
+
 #~ msgid "Display and network &options..."
 #~ msgstr "M&ožnosti prikaza in mreže..."
+
 #~ msgid ""
 #~ "You have requested to exit the %s,\n"
 #~ "which allows you to view and manage\n"
@@ -4453,76 +4399,112 @@ msgstr "podajte začetne in končne ure uporabe mreže v formatu HH:MM-HH:MM"
 #~ "\n"
 #~ "Če želite tudi ustaviti delujoče znanstvene aplikacije, ko\n"
 #~ "zapuščate Upravljalca, potem izberite sledeče možnosti:"
+
 #~ msgid "Stop running science applications when exiting the Manager"
 #~ msgstr "Zaustavi delujoče znanstvene aplikacije ob izhodu iz Upravitelja"
+
 #~ msgid "CPU work fetch priority"
 #~ msgstr "Prioriteta prevzemanja dela za procesor"
+
 #~ msgid "NVIDIA GPU scheduling priority"
 #~ msgstr "Prioriteta razvrščanja NIVIDIA grafičnega procesorja"
+
 #~ msgid "NVIDIA GPU work fetch priority"
 #~ msgstr "Prioriteta prevzemanja dela za NVIDIA grafični procesor"
+
 #~ msgid "ATI GPU scheduling priority"
 #~ msgstr "Prioriteta razvrščanja ATI grafičnega procesorja"
+
 #~ msgid "ATI GPU work fetch priority"
 #~ msgstr "Prioriteta prevzemanje dela za ATI grafični procesor"
+
 #~ msgid "%s - Options"
 #~ msgstr "%s - Možnosti"
+
 #~ msgid "Retrieving host information; please wait..."
 #~ msgstr "Pridobivam informacije o gostitelju; prosim počakajte..."
+
 #~ msgid " (waiting for GPU memory)"
 #~ msgstr " (čakajoč na grafični pomnilnik)"
+
 #~ msgid "%s - Messages"
 #~ msgstr "%s - Sporočila"
+
 #~ msgid "Skin:"
 #~ msgstr "Preobleka:"
+
 #~ msgid "Preferences"
 #~ msgstr "Nastavitve"
+
 #~ msgid "I want to customize my preferences for this computer only."
 #~ msgstr "Želim prikrojiti moje nastavitve samo za ta računalnik."
+
 #~ msgid "Customized Preferences"
 #~ msgstr "Prikrojene nastavitve"
+
 #~ msgid "Upload suspended - "
 #~ msgstr "Pošiljanje na čakanju - "
+
 #~ msgid "Download suspended - "
 #~ msgstr "Prejemanje na čakanju - "
+
 #~ msgid "Upload pending"
 #~ msgstr "Čakajoče pošiljanje"
+
 #~ msgid "Download pending"
 #~ msgstr "Čakajoče prejemanje"
+
 #~ msgid "Get help with BOINC"
 #~ msgstr "Dobi pomoč za BOINC"
+
 #~ msgid "Event Log..."
 #~ msgstr "Dnevnik dogodkov..."
+
 #~ msgid "Attaching to project or account manager..."
 #~ msgstr "Pripenjam se na projekt ali upravitelja računov..."
+
 #~ msgid "%s - Detach from %s"
 #~ msgstr "%s - Odpni se od %s"
+
 #~ msgid "Retrying communications."
 #~ msgstr "Ponovno poskušam komunicirati."
+
 #~ msgid "Failed to attach to project"
 #~ msgstr "Nisem se uspel pripeti na projekt"
+
 #~ msgid "Failed to attach to account manager"
 #~ msgstr "Nisem se uspel pripeti na upravitelja računov"
+
 #~ msgid "Attached to account manager"
 #~ msgstr "Pripet na upravitelja računov"
+
 #~ msgid "You are now successfully attached to the %s system."
 #~ msgstr "Zdaj ste uspešno pripeti na sistem %s."
+
 #~ msgid "You are now successfully attached to this account manager."
 #~ msgstr "Zdaj ste uspešno pripeti na ta upravitelj računov."
+
 #~ msgid "News Feeds"
 #~ msgstr "Viri novic"
+
 #~ msgid "Display the latest news about BOINC"
 #~ msgstr "Prikaži najnovejše novice o BOINC"
+
 #~ msgid "not attached to any BOINC project: 0 bytes"
 #~ msgstr "nisem priklopljen na noben BOINC projekt: 0 bajtov"
+
 #~ msgid "All projects"
 #~ msgstr "Vsi projekti"
+
 #~ msgid "Attach to project"
 #~ msgstr "Priklopite se k projektu"
+
 #~ msgid "Attach to account manager"
 #~ msgstr "Pripnite se na upravitelja računov"
+
 #~ msgid "%s needs to connect to the Internet.  Please click to open %s."
 #~ msgstr "%s se mora povezati na internet.  Prosim kliknite, da odprete %s."
+
 #~ msgid ""
 #~ "%s is unable to communicate with a project and needs an Internet "
 #~ "connection.\n"
@@ -4532,6 +4514,7 @@ msgstr "podajte začetne in končne ure uporabe mreže v formatu HH:MM-HH:MM"
 #~ "%s ne more komunicirati s projektom in potrebuje internetno povezavo.\n"
 #~ "Prosim povežite se na internet in nato izberite 'Opravi komunikacijo po "
 #~ "mreži' v menuju Napredno."
+
 #~ msgid ""
 #~ "%s couldn't do Internet communication, and no default connection is "
 #~ "selected.\n"
@@ -4542,85 +4525,121 @@ msgstr "podajte začetne in končne ure uporabe mreže v formatu HH:MM-HH:MM"
 #~ "nastavljena.\n"
 #~ "Prosim, povežite se na internet ali izberite privzeto povezavo\n"
 #~ "z uporabo Napredno/Možnosti/Povezave."
+
 #~ msgid "Attached to project"
 #~ msgstr "Pripet na projekt"
+
 #~ msgid "You are now successfully attached to this project."
 #~ msgstr "Zdaj ste se uspešno pripeli na ta projekt."
+
 #~ msgid "Attached to %s"
 #~ msgstr "Pripet na %s"
+
 #~ msgid "Detach when done"
 #~ msgstr "Odpni se, ko je opravljeno"
+
 #~ msgid "Retrieving notices..."
 #~ msgstr "Prejemam obvestila..."
+
 #~ msgid "Detach"
 #~ msgstr "Odpni"
+
 #~ msgid "Detaching from project..."
 #~ msgstr "Odpenjam se od projekta..."
+
 #~ msgid "Are you sure you want to detach from project '%s'?"
 #~ msgstr "Ali ste prepričani, da se želite odpeti od projekta '%s'?"
+
 #~ msgid "Detach from Project"
 #~ msgstr "Odpni se od projekta"
+
 #~ msgid " - user active"
 #~ msgstr " - uporabnik aktiven"
+
 #~ msgid " - computation suspended"
 #~ msgstr " - računanje na čakanju"
+
 #~ msgid " - need disk space"
 #~ msgstr " - potrebuje prostor na disku"
+
 #~ msgid "Attach to an additional project"
 #~ msgstr "Priklopite se na dodaten projekt"
+
 #~ msgid "To completion"
 #~ msgstr "Do konca"
+
 #~ msgid ""
 #~ "We'll guide you through the process of attaching\n"
 #~ "to a project or account manager."
 #~ msgstr ""
 #~ "Vodili vas bomo skozi proces pripenjanja\n"
 #~ "na projekt ali upravitelja računov."
+
 #~ msgid "events"
 #~ msgstr "dogodki"
+
 #~ msgid " is empty"
 #~ msgstr " je prazno"
+
 #~ msgid "%d of %d; "
 #~ msgstr "%d od %d; "
+
 #~ msgid "current sort column "
 #~ msgstr "trenutno urejeno po stolpcu "
+
 #~ msgid " descending order "
 #~ msgstr "padajoče"
+
 #~ msgid " ascending order "
 #~ msgstr "naraščajoče"
+
 #~ msgid "column "
 #~ msgstr "stolpec "
+
 #~ msgid "of %d; "
 #~ msgstr "od %d; "
+
 #~ msgid "Attach to a project or account manager to begin processing work"
 #~ msgstr ""
 #~ "Priklopite se na projekt ali upravitelja računov za začetek obdelave dela"
+
 #~ msgid "Attach to a project to begin processing work"
 #~ msgstr "Priklopite se na projekt za začetek dela procesiranja"
+
 #~ msgid "Use GPU never"
 #~ msgstr "Nikoli ne uporabi grafičnega procesorja"
+
 #~ msgid "BOINC Notification"
 #~ msgstr "BOINC obvestilo"
+
 #~ msgid ""
 #~ "TEST: Fluffy at Home just found out that the Fluffy project has been "
 #~ "published in Nature"
 #~ msgstr ""
 #~ "TEST: Fluffy at Home so pravkar ugotovili, da je bil v Nature objavljen "
 #~ "članek o projektu Fluffy"
+
 #~ msgid "%s: %.2f%% completed."
 #~ msgstr "%s: %.2f%% dokončano."
+
 #~ msgid "%d tasks running."
 #~ msgstr "Poteka %d opravil."
+
 #~ msgid "&Close Window\tCtrl+W"
 #~ msgstr "&Zapri okno\tCtrl+W"
+
 #~ msgid "&Messages\tCtrl+Shift+M"
 #~ msgstr "S&poročila\tCtrl+Shift+M"
+
 #~ msgid "Display messages"
 #~ msgstr "Prikaži sporočila"
+
 #~ msgid "Display news"
 #~ msgstr "Prikaži novice"
+
 #~ msgid "%s - Can't find web browser"
 #~ msgstr "%s - Ne najdem spletnega brskalnika"
+
 #~ msgid ""
 #~ "%s tried to display the web page\n"
 #~ "\t%s\n"
@@ -4635,52 +4654,72 @@ msgstr "podajte začetne in končne ure uporabe mreže v formatu HH:MM-HH:MM"
 #~ "Da to popravite, nastavite spremenljivko okolja\n"
 #~ "BROWSER na pot do vašega spletnega brskalnika,\n"
 #~ "nato pa ponovno zaženite %s."
+
 #~ msgid "Starting client services; please wait..."
 #~ msgstr "Zaganjam storitve odjemalca; prosim, počakajte..."
+
 #~ msgid "BOINC Website"
 #~ msgstr "BOINC spletna stran"
+
 #~ msgid "Display the latest news about BOINC from the BOINC website"
 #~ msgstr "Prikaži zadnje novice o BOINC s spletne strani BOINC"
+
 #~ msgid "Network activity based on pre&ferences"
 #~ msgstr "Mrežna aktivnost glede na &nastavitve"
+
 #~ msgid "Network activity s&uspended"
 #~ msgstr "Mrežna aktivnost na ča&kanju"
+
 #~ msgid "%s - Shutdown the current client..."
 #~ msgstr "%s - Zaustavi trenutnega odjemalca"
+
 #~ msgid ""
 #~ "%s will shut down the currently connected client,\n"
 #~ "and prompt you for another host to connect to.\n"
 #~ msgstr ""
 #~ "%s bo zaustavil trenutno povezanega odjemalca,\n"
 #~ "in vas vprašal po drugem gostitelju, na katerega naj se poveže.\n"
+
 #~ msgid "Retrying communications for project(s)..."
 #~ msgstr "Ponoven poskus komunikacije za projekt(e)..."
+
 #~ msgid "Switch between applications between every"
 #~ msgstr "Preklopi med aplikacijami vsakih"
+
 #~ msgid ""
 #~ "Required wizard file(s) are missing from the target server.\n"
 #~ "(lookup_account.php/create_account.php)\n"
 #~ msgstr ""
 #~ "Zahtevane datoteke čarovnika manjkajo na ciljnem strežniku.\n"
 #~ "(lookup_account.php/create_account.php)\n"
+
 #~ msgid "ID"
 #~ msgstr "ID"
+
 #~ msgid "Priority"
 #~ msgstr "Prioriteta"
+
 #~ msgid "MessagesGrid"
 #~ msgstr "Mreža sporočil"
+
 #~ msgid "Copying selected messages to Clipboard..."
 #~ msgstr "Kopiram izbrana sporočila na odložišče..."
+
 #~ msgid "Info"
 #~ msgstr "Informacije"
+
 #~ msgid "Warning"
 #~ msgstr "Opozorilo"
+
 #~ msgid "ProjectsGrid"
 #~ msgstr "Mreža projektov"
+
 #~ msgid "TransfersGrid"
 #~ msgstr "Mreža prenosov"
+
 #~ msgid "Aborting transfer(s)..."
 #~ msgstr "Opuščam prenos(e)..."
+
 #~ msgid ""
 #~ "Are you sure you want to abort this file(s) transfer ?\n"
 #~ "NOTE: Aborting a transfer will invalidate a task and you\n"
@@ -4689,8 +4728,9 @@ msgstr "podajte začetne in končne ure uporabe mreže v formatu HH:MM-HH:MM"
 #~ "Ali ste prepričani, da želite opustiti prenos te datoteke/datotek?\n"
 #~ "OPOMBA: Opustitev prenosa bo razveljavila opravilo in zanj\n"
 #~ "ne boste prejeli točk."
+
 #~ msgid "Abort File Transfer(s)"
 #~ msgstr "Opusti prenos(e) datotek"
+
 #~ msgid "TasksGrid"
 #~ msgstr "Mreža opravil"
-
diff --git a/locale/sl/BOINC-Setup.mo b/locale/sl/BOINC-Setup.mo
index d1afe00..d9771d4 100644
Binary files a/locale/sl/BOINC-Setup.mo and b/locale/sl/BOINC-Setup.mo differ
diff --git a/locale/sl/BOINC-Setup.po b/locale/sl/BOINC-Setup.po
index d9fb9ee..1dbfc30 100755
--- a/locale/sl/BOINC-Setup.po
+++ b/locale/sl/BOINC-Setup.po
@@ -4,36 +4,32 @@
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-01-26 00:00-0800\n"
-"PO-Revision-Date: 2015-02-12 01:59-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\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-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: mac_installer\n"
 
 #: Installer.cpp:124
 #, c-format
 msgid "Sorry, this version of %s requires system 10.5 or higher."
 msgstr ""
 
-#: PostInstall.cpp:130
-#: PostInstall.cpp:1136
-#: uninstall.cpp:1618
+#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
 msgid "Yes"
 msgstr ""
 
-#: PostInstall.cpp:131
-#: PostInstall.cpp:1137
-#: uninstall.cpp:1619
+#: PostInstall.cpp:131 PostInstall.cpp:1137 uninstall.cpp:1619
 msgid "No"
 msgstr ""
 
@@ -44,9 +40,11 @@ msgstr ""
 #: PostInstall.cpp:1416
 #, c-format
 msgid ""
-"Users who are permitted to administer this computer will automatically be allowed to run and control %s.\n"
+"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?"
+"Do you also want non-administrative users to be able to run and control %s "
+"on this Mac?"
 msgstr ""
 
 #: PostInstall.cpp:1444
@@ -111,7 +109,8 @@ msgstr ""
 #: uninstall.cpp:840
 #, c-format
 msgid ""
-"Enter your administrator password to completely remove %s from you computer.\n"
+"Enter your administrator password to completely remove %s from you "
+"computer.\n"
 "\n"
 msgstr ""
 
@@ -122,4 +121,3 @@ msgstr ""
 #: uninstall.cpp:1617
 msgid "Continue..."
 msgstr ""
-
diff --git a/locale/sl/BOINC-Web.mo b/locale/sl/BOINC-Web.mo
index 7915793..1670013 100644
Binary files a/locale/sl/BOINC-Web.mo and b/locale/sl/BOINC-Web.mo differ
diff --git a/locale/sl/BOINC-Web.po b/locale/sl/BOINC-Web.po
index ef64640..935e0a8 100755
--- a/locale/sl/BOINC-Web.po
+++ b/locale/sl/BOINC-Web.po
@@ -4,16 +4,18 @@
 # FileID  : $Id$
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: PACKAGE VERSION\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-12 01:59-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
+"PO-Revision-Date: 2014-08-07 14:27+0000\n"
+"Last-Translator: Anonymous Pootle User\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
+"n%100==4 ? 2 : 3);\n"
 "X-Generator: Pootle 2.5.0\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-POOTLE-MTIME: 1407421662.0\n"
@@ -32,7 +34,9 @@ msgid "This page is %stranslatable%s."
 msgstr "Ta stran je %sprevedljiva%s."
 
 #: download.php:39
-msgid "We recommend that you also install VirtualBox, so your computer can work on science projects that require it."
+msgid ""
+"We recommend that you also install VirtualBox, so your computer can work on "
+"science projects that require it."
 msgstr ""
 
 #: download.php:41
@@ -43,14 +47,12 @@ msgstr ""
 msgid "Download BOINC + VirtualBox"
 msgstr ""
 
-#: download.php:54
-#: download.php:69
+#: download.php:54 download.php:69
 #, php-format
 msgid "for %s"
 msgstr ""
 
-#: download.php:57
-#: download.php:72
+#: download.php:57 download.php:72
 #, php-format
 msgid "BOINC version %s"
 msgstr ""
@@ -65,19 +67,30 @@ msgid "Download BOINC"
 msgstr "Prenesite BOINC"
 
 #: download.php:123
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others."
+msgid ""
+"BOINC is a program that lets you donate your idle computer time to science "
+"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, and many others."
 msgstr ""
 
 #: download.php:125
-msgid "After installing BOINC on your computer, you can connect it to as many of these projects as you like."
+msgid ""
+"After installing BOINC on your computer, you can connect it to as many of "
+"these projects as you like."
 msgstr ""
 
 #: download.php:127
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
-msgstr "To programsko opremo lahko poganjate samo na računalniku, ki je vaš ali pa imate dovoljenje njegovega lastnika."
+msgid ""
+"You may run this software on a computer only if you own the computer or have "
+"the permission of its owner."
+msgstr ""
+"To programsko opremo lahko poganjate samo na računalniku, ki je vaš ali pa "
+"imate dovoljenje njegovega lastnika."
 
 #: download.php:132
-msgid "We recommend that you download BOINC from the Google Play Store or Amazon Appstore, not from here."
+msgid ""
+"We recommend that you download BOINC from the Google Play Store or Amazon "
+"Appstore, not from here."
 msgstr ""
 
 #: download.php:167
@@ -88,8 +101,7 @@ msgstr "Sistemske zahteve"
 msgid "Release notes"
 msgstr "Opombe ob izdaji"
 
-#: download.php:169
-#: index.php:86
+#: download.php:169 index.php:86
 msgid "Help"
 msgstr "Pomoč"
 
@@ -111,21 +123,48 @@ msgstr "BOINC: računajte za znanost"
 
 #: help.php:12
 #, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
-msgstr "BOINC pomoč na internetu vam omogoča govoriti ena-na-ena z izkušenimi uporabniki BOINC, ki lahko: %sodgovorijo na vprašanja o BOINC in prostovoljnem računanju; %s vas vodijo skozi proces namestitve in uporabe BOINC; %s odpravljajo morebitne probleme."
+msgid ""
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who "
+"can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"through the process of installing and using BOINC; %s troubleshoot any "
+"problems you might have."
+msgstr ""
+"BOINC pomoč na internetu vam omogoča govoriti ena-na-ena z izkušenimi "
+"uporabniki BOINC, ki lahko: %sodgovorijo na vprašanja o BOINC in "
+"prostovoljnem računanju; %s vas vodijo skozi proces namestitve in uporabe "
+"BOINC; %s odpravljajo morebitne probleme."
 
 #: help.php:21
 #, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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 pomoč na internetu temelji na %sSkype%s, telefonskem sistemu na internetu. Skype je zastonj (tako programska oprema kot klici).  Če še nimate Skype, ga %snaložite in namestite zdaj%s.  Ko boste končali, se vrnite na to stran."
+msgid ""
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. "
+"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 pomoč na internetu temelji na %sSkype%s, telefonskem sistemu na "
+"internetu. Skype je zastonj (tako programska oprema kot klici).  Če še "
+"nimate Skype, ga %snaložite in namestite zdaj%s.  Ko boste končali, se "
+"vrnite na to stran."
 
 #: help.php:28
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
-msgstr "Najboljši način, da dobite pomoč je glasovno, za kar rabite ali vdelan mikrofon in zvočnike ali zunanji komplet slušalk in mikrofona za vaš računalnik.  Lahko tudi uporabite Skypov tekstovni klepet ali navadno pošto (če nimate Skype) za komunikacijo s prostovoljci za pomoč."
+msgid ""
+"The best way to get help is by voice, for which you need either built-in "
+"microphone and speakers or an external headset for your computer.  You can "
+"also use Skype's text-based chat system or regular email (if you don't have "
+"Skype) to communicate with Help Volunteers."
+msgstr ""
+"Najboljši način, da dobite pomoč je glasovno, za kar rabite ali vdelan "
+"mikrofon in zvočnike ali zunanji komplet slušalk in mikrofona za vaš "
+"računalnik.  Lahko tudi uporabite Skypov tekstovni klepet ali navadno pošto "
+"(če nimate Skype) za komunikacijo s prostovoljci za pomoč."
 
 #: help.php:31
-msgid "Volunteers speaking several languages are available. Please select a language:"
-msgstr "Na voljo so prostovoljci, ki govorijo več jezikov. Prosim, izberite jezik:"
+msgid ""
+"Volunteers speaking several languages are available. Please select a "
+"language:"
+msgstr ""
+"Na voljo so prostovoljci, ki govorijo več jezikov. Prosim, izberite jezik:"
 
 #: help.php:47
 msgid "Be a Help Volunteer"
@@ -133,21 +172,35 @@ msgstr "Bodi prostovoljec za pomoč."
 
 #: help.php:50
 #, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
-msgstr "Če ste izkušen uporabnik BOINC, vas spodbujamo, da %spostanete prostovoljec za pomoč%s.  To je krasen način, da pomagate znastvenim raziskavam in prostovoljnem računanju - in zabavno je!"
+msgid ""
+"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+"Volunteer%s.  It's a great way to help the cause of scientific research and "
+"volunteer computing - and it's fun!"
+msgstr ""
+"Če ste izkušen uporabnik BOINC, vas spodbujamo, da %spostanete prostovoljec "
+"za pomoč%s.  To je krasen način, da pomagate znastvenim raziskavam in "
+"prostovoljnem računanju - in zabavno je!"
 
 #: help.php:56
 #, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
-msgstr "Če ste že prostovoljec za pomoč: da uredite vaše nastavitve, %skliknite tu%s."
+msgid ""
+"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
+msgstr ""
+"Če ste že prostovoljec za pomoč: da uredite vaše nastavitve, %skliknite tu%"
+"s."
 
 #: help_funcs.php:107
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
-msgstr "BOINC pomočniki so neplačani prostovoljci.  Njihovih nasvetov ne potrujejeta BOINC ali University of California."
+msgid ""
+"BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
+"or the University of California."
+msgstr ""
+"BOINC pomočniki so neplačani prostovoljci.  Njihovih nasvetov ne potrujejeta "
+"BOINC ali University of California."
 
 #: help_funcs.php:110
 msgid "%1Never%2 give email address or password information to BOINC helpers."
-msgstr "BOINC pomočnikom%1nikoli%2 ne dajajte naslova elektronske pošte ali gesla."
+msgstr ""
+"BOINC pomočnikom%1nikoli%2 ne dajajte naslova elektronske pošte ali gesla."
 
 #: index.php:24
 msgid "Computing power"
@@ -195,9 +248,7 @@ msgstr "Bodi prostovoljec"
 msgid "Download"
 msgstr "Prenesi"
 
-#: index.php:87
-#: index.php:120
-#: index.php:171
+#: index.php:87 index.php:120 index.php:171
 msgid "Documentation"
 msgstr "Dokumentacija"
 
@@ -210,7 +261,10 @@ msgid "Links"
 msgstr ""
 
 #: index.php:94
-msgid "Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:"
+msgid ""
+"Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure "
+"diseases, study global warming, discover pulsars, and do many other types of "
+"scientific research.  It's safe, secure, and easy:"
 msgstr ""
 
 #: index.php:96
@@ -227,8 +281,12 @@ msgstr ""
 
 #: index.php:102
 #, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
-msgstr "Ali, če poganjate več projektov, poskusite %supravitelja računov%s, kot sta %sGridRepublic%s ali %sBAM!%s"
+msgid ""
+"Or, if you run several projects, try an %saccount manager%s such as %"
+"sGridRepublic%s or %sBAM!%s. "
+msgstr ""
+"Ali, če poganjate več projektov, poskusite %supravitelja računov%s, kot sta "
+"%sGridRepublic%s ali %sBAM!%s"
 
 #: index.php:118
 msgid "Compute with BOINC"
@@ -239,12 +297,20 @@ msgid "Software updates"
 msgstr "Posodobitve programske opreme"
 
 #: index.php:128
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
-msgstr "%1Znanstveniki%2: uporabite BOINC, da ustvarite %3projekt prostovoljnega računanja%4, kar vam da računsko moč tisočev procesorjev."
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving "
+"you the computing power of thousands of CPUs."
+msgstr ""
+"%1Znanstveniki%2: uporabite BOINC, da ustvarite %3projekt prostovoljnega "
+"računanja%4, kar vam da računsko moč tisočev procesorjev."
 
 #: index.php:132
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
-msgstr "%1Univerze%2: uporabite BOINC, da ustvarite %3navidezni univerzitetni superračunalniški center%4."
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
+msgstr ""
+"%1Univerze%2: uporabite BOINC, da ustvarite %3navidezni univerzitetni "
+"superračunalniški center%4."
 
 #: index.php:137
 msgid "%1Companies%2: use BOINC for %3desktop Grid computing%4."
@@ -316,8 +382,11 @@ msgstr "Programski vmesniki (API) za dodatno programsko opremo"
 
 #: index.php:217
 #, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
-msgstr "Odprtokodna programska oprema za %sprostovoljno računanje%s in %smrežno računanje%s."
+msgid ""
+"Open-source software for %svolunteer computing%s and %sgrid computing%s."
+msgstr ""
+"Odprtokodna programska oprema za %sprostovoljno računanje%s in %smrežno "
+"računanje%s."
 
 #: index.php:230
 msgid "BOINC is based at The University of California, Berkeley"
@@ -336,7 +405,10 @@ msgid "Seismology"
 msgstr ""
 
 #: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
+msgid ""
+"The Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to Internet-connected computers.  You must buy a "
+"sensor to participate."
 msgstr ""
 
 #: projects.inc:27
@@ -348,23 +420,24 @@ msgid "Environmental research"
 msgstr ""
 
 #: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
+msgid ""
+"This project is creating a free and continuously updated map of radiation "
+"levels by using sensors connected to volunteers' computers.  You must buy a "
+"sensor to participate."
 msgstr ""
 
 #: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
+msgid ""
+"To participate in these projects you must buy a sensor and attach it to your "
+"computer."
 msgstr ""
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
 msgstr ""
 
-#: projects.inc:60
-#: projects.inc:364
-#: projects.inc:408
-#: projects.inc:457
-#: projects.inc:464
-#: projects.inc:511
+#: projects.inc:60 projects.inc:364 projects.inc:408 projects.inc:457
+#: projects.inc:464 projects.inc:511
 msgid "Private"
 msgstr ""
 
@@ -373,7 +446,11 @@ msgid "Artificial intelligence"
 msgstr ""
 
 #: projects.inc:62
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
+msgid ""
+"Parse and convert semantic nets for use in FreeHAL, an artificial "
+"intelligence that uses semantic networks, stemmers, part of speech "
+"databases, and part of speech taggers in order to imitate human behavior in "
+"conversations."
 msgstr ""
 
 #: projects.inc:69
@@ -389,7 +466,12 @@ msgid "Antimalarial drug discovery"
 msgstr ""
 
 #: projects.inc:84
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
+msgid ""
+"The parasite that causes malaria continues to evolve resistance to available "
+"medication. We therefore urgently need to discover new drugs to replace "
+"existing drugs. Importantly, these new drugs need to target NEW proteins in "
+"the parasite. The FightMalaria at Home project is aimed at finding these new "
+"targets."
 msgstr ""
 
 #: projects.inc:90
@@ -401,7 +483,12 @@ msgid "Protein structure prediction"
 msgstr ""
 
 #: projects.inc:92
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
+msgid ""
+"POEM at HOME uses a computational approach to predict the biologically active "
+"structure of proteins, to understand the signal-processing mechanisms when "
+"the proteins interact with one another, to understand diseases related to "
+"protein malfunction or aggregation, and to develop new drugs on the basis of "
+"the three-dimensions structure of biologically important proteins."
 msgstr ""
 
 #: projects.inc:98
@@ -413,7 +500,11 @@ msgid "Study of protein - ligand interactions"
 msgstr ""
 
 #: projects.inc:100
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
+msgid ""
+"Docking at Home has both bioscience and computer science goals. The project "
+"aims to further knowledge of the atomic details of protein-ligand "
+"interactions and, by doing so, will search for insights into the discovery "
+"of novel pharmaceuticals."
 msgstr ""
 
 #: projects.inc:114
@@ -425,7 +516,11 @@ msgid "Molecular simulations of proteins"
 msgstr ""
 
 #: projects.inc:116
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
+msgid ""
+"GPUGrid.net opens novel computational scenarios by the first full-atom "
+"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
+"New biomedical applications suddenly become possible giving a new role to "
+"computational biology for biomedical research."
 msgstr ""
 
 #: projects.inc:122
@@ -437,11 +532,15 @@ msgid "Genetic linkage analysis"
 msgstr ""
 
 #: projects.inc:124
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
+msgid ""
+"Superlink at Technion helps geneticists all over the world find disease-"
+"provoking genes causing some types of diabetes, hypertension (high blood "
+"pressure), cancer, schizophrenia and many others."
 msgstr ""
 
 #: projects.inc:138
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
+msgid ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
 msgstr ""
 
 #: projects.inc:139
@@ -449,7 +548,11 @@ msgid "Life science research"
 msgstr ""
 
 #: projects.inc:140
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
+msgid ""
+"The Lattice Project supplies computing power to scientists at the University "
+"of Maryland studying evolutionary relationships based on DNA sequence data; "
+"bacterial, plasmid, and virus protein sequences; and biological diversity in "
+"nature reserves. "
 msgstr ""
 
 #: projects.inc:146
@@ -461,20 +564,32 @@ msgid "Epidemiology"
 msgstr ""
 
 #: projects.inc:148
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
+msgid ""
+"Simulation models of the transmission dynamics and health effects of malaria "
+"are an important tool for malaria control. They can be used to determine "
+"optimal strategies for delivering mosquito nets, chemotherapy, or new "
+"vaccines which are currently under development and testing.  Such modeling "
+"is extremely computer intensive, requiring simulations of large human "
+"populations with a diverse set of parameters related to biological and "
+"social factors that influence the distribution of the disease. "
 msgstr ""
 
 #: projects.inc:170
 msgid "University of Washington"
 msgstr ""
 
-#: projects.inc:171
-#: projects.inc:179
+#: projects.inc:171 projects.inc:179
 msgid "Biology"
 msgstr ""
 
 #: projects.inc:172
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
+msgid ""
+"Determine the 3-dimensional shapes of proteins in research that may "
+"ultimately lead to finding cures for some major human diseases. By running "
+"Rosetta at home you will help us speed up and extend our research in ways we "
+"couldn't possibly attempt without your help. You will also be helping our "
+"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
+"Cancer, and Alzheimer's"
 msgstr ""
 
 #: projects.inc:178
@@ -482,7 +597,10 @@ msgid "University of Vienna"
 msgstr ""
 
 #: projects.inc:180
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
+msgid ""
+"Calculate similarities between proteins. SIMAP provides a public database of "
+"the resulting data, which plays a key role in many bioinformatics research "
+"projects."
 msgstr ""
 
 #: projects.inc:186
@@ -498,7 +616,15 @@ msgid "Climate study"
 msgstr ""
 
 #: projects.inc:200
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
+msgid ""
+"Investigate the approximations that have to be made in state-of-the-art "
+"climate models. By running the model thousands of times we hope to find out "
+"how the model responds to slight tweaks to these approximations - slight "
+"enough to not make the approximations any less realistic. This will allow us "
+"to improve our understanding of how sensitive our models are to small "
+"changes and also to things like changes in carbon dioxide and the sulphur "
+"cycle. This will allow us to explore how climate may change in the next "
+"century under a wide range of different scenarios."
 msgstr ""
 
 #: projects.inc:207
@@ -510,30 +636,44 @@ msgid "Mechanical engineering"
 msgstr ""
 
 #: projects.inc:214
-msgid "Currently we are calculating the optimum design of a structure call the 52 bar truss"
+msgid ""
+"Currently we are calculating the optimum design of a structure call the 52 "
+"bar truss"
 msgstr ""
 
-#: projects.inc:224
-#: projects.inc:263
-#: projects.inc:271
+#: projects.inc:224 projects.inc:263 projects.inc:271
 msgid "Astronomy"
 msgstr ""
 
 #: projects.inc:225
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
+msgid ""
+"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
+"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
+"Universe. We will measure physical parameters (such as stellar mass surface "
+"density, star formation rate surface density, attenuation, and first-order "
+"star formation history) on a resolved pixel-by-pixel basis using spectral "
+"energy distribution (SED) fitting techniques in a distributed computing mode."
 msgstr ""
 
 #: projects.inc:247
 msgid "University of Texas at Austin"
 msgstr ""
 
-#: projects.inc:248
-#: projects.inc:279
+#: projects.inc:248 projects.inc:279
 msgid "Chemistry"
 msgstr ""
 
 #: projects.inc:249
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
+msgid ""
+"A common problem in theoretical chemistry, condensed matter physics and "
+"materials science is the calculation of the time evolution of an atomic "
+"scale system where, for example, chemical reactions and/or diffusion occur. "
+"Generally the events of interest are quite rare (many orders of magnitude "
+"slower than the vibrational movements of the atoms), and therefore direct "
+"simulations, tracking every movement of the atoms, would take thousands of "
+"years of computer calculations on the fastest present day computer before a "
+"single event of interest can be expected to occur.  Our research group is "
+"interested in calculating the long time dynamics of systems."
 msgstr ""
 
 #: projects.inc:262
@@ -541,7 +681,10 @@ msgid "University of Illinois at Urbana-Champaign"
 msgstr ""
 
 #: projects.inc:264
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
+msgid ""
+"The goal of Cosmology at Home is to search for the model that best describes "
+"our Universe and to find the range of models that agree with the available "
+"astronomical particle physics data."
 msgstr ""
 
 #: projects.inc:270
@@ -549,7 +692,10 @@ msgid "Rensselaer Polytechnic Institute"
 msgstr ""
 
 #: projects.inc:272
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
+msgid ""
+"The goal of Milkyway at Home is to create a highly accurate three dimensional "
+"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
+"Survey."
 msgstr ""
 
 #: projects.inc:278
@@ -557,7 +703,13 @@ msgid "Leiden University, The Netherlands"
 msgstr ""
 
 #: projects.inc:280
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
+msgid ""
+"Surface science calculations using Classical Dynamics.  Leiden Classical "
+"allows volunteers, students and other scientist to submit their personal "
+"calculations to the grid. Each user has his own personal queue for Classical "
+"Dynamics jobs. In this way students have used the grid to simulate liquid "
+"argon, or to test the validity of the ideal gas law by actually doing the "
+"simulations through the grid."
 msgstr ""
 
 #: projects.inc:294
@@ -569,25 +721,36 @@ msgid "Astrophysics"
 msgstr ""
 
 #: projects.inc:296
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
+msgid ""
+"Search for spinning neutron stars (also called pulsars) using data from the "
+"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
+"observatory.  Einstein at Home is a World Year of Physics 2005 project "
+"supported by the American Physical Society (APS) and by a number of "
+"international organizations."
 msgstr ""
 
-#: projects.inc:310
-#: projects.inc:318
+#: projects.inc:310 projects.inc:318
 msgid "CERN (European Organization for Nuclear Research)"
 msgstr ""
 
-#: projects.inc:311
-#: projects.inc:319
+#: projects.inc:311 projects.inc:319
 msgid "Physics"
 msgstr ""
 
 #: projects.inc:312
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
+msgid ""
+"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
+"European Organization for Nuclear Research, the world's largest particle "
+"physics laboratory.  It is the most powerful instrument ever built to "
+"investigate on particles proprieties. LHC at home runs simulations to improve "
+"the design of LHC and its detectors."
 msgstr ""
 
 #: projects.inc:320
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
+msgid ""
+"This project uses CERN-developed virtual machine technology for full-fledged "
+"LHC event physics simulation on volunteer computers.  Requires that you "
+"install VirtualBox on your computer"
 msgstr ""
 
 #: projects.inc:326
@@ -600,7 +763,12 @@ msgid "Astrophysics, astrobiology"
 msgstr ""
 
 #: projects.inc:328
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
+msgid ""
+"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
+"goal is to detect intelligent life outside Earth. One approach, known as "
+"radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
+"signals from space. Such signals are not known to occur naturally, so a "
+"detection would provide evidence of extraterrestrial technology."
 msgstr ""
 
 #: projects.inc:342
@@ -612,7 +780,11 @@ msgid "Chemical engineering and nanotechnology"
 msgstr ""
 
 #: projects.inc:344
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
+msgid ""
+"The study of molecular magnets and controlled nanoscale magnetism.  These "
+"magnetic molecules may be used to develop tiny magnetic switches, with "
+"applications in medicine (such as local tumor chemotherapy) and "
+"biotechnology."
 msgstr ""
 
 #: projects.inc:351
@@ -628,7 +800,10 @@ msgid "Physics, biochemistry, and others"
 msgstr ""
 
 #: projects.inc:358
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
+msgid ""
+"The objective of CAS at home is to encourage and assist scientists in China to "
+"adopt the technologies of volunteer computing and volunteer thinking for "
+"their research."
 msgstr ""
 
 #: projects.inc:365
@@ -636,11 +811,12 @@ msgid "Mathematics, physics, evolution"
 msgstr ""
 
 #: projects.inc:366
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
+msgid ""
+"Yoyo at home is an adapter between BOINC and several existing volunteer "
+"computing projects: ECM, Muon, Evolution at home, and distributed.net"
 msgstr ""
 
-#: projects.inc:371
-#: projects.inc:527
+#: projects.inc:371 projects.inc:527
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 msgstr ""
 
@@ -650,7 +826,11 @@ msgid "European research projects"
 msgstr "Raziskovalni projekti"
 
 #: projects.inc:373
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
+msgid ""
+"The EDGeS at Home Beta project integrates volunteer computing into the service "
+"grid network of Europe by allowing service grids to send workunits to be "
+"processed by the volunteers of this project. The scientific projects covered "
+"by the project include math, physics, biology, etc."
 msgstr ""
 
 #: projects.inc:379
@@ -675,7 +855,11 @@ msgid "Medical, environmental and other humanitarian research"
 msgstr ""
 
 #: projects.inc:389
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
+msgid ""
+"To further critical non-profit research on some of humanity's most pressing "
+"problems by creating the world's largest volunteer computing grid.  Research "
+"includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"clean water and many more."
 msgstr ""
 
 #: projects.inc:395
@@ -694,21 +878,18 @@ msgstr ""
 msgid "Simulation of quantum computing; Goldbach's conjecture."
 msgstr ""
 
-#: projects.inc:450
-#: projects.inc:458
+#: projects.inc:450 projects.inc:458
 msgid "Cryptography"
 msgstr ""
 
 #: projects.inc:459
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
+msgid ""
+"Attempt to decode 3 original Enigma messages. The signals were intercepted "
+"in the North Atlantic in 1942 and are believed to be unbroken."
 msgstr ""
 
-#: projects.inc:465
-#: projects.inc:504
-#: projects.inc:512
-#: projects.inc:520
-#: projects.inc:528
-#: projects.inc:568
+#: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
+#: projects.inc:528 projects.inc:568
 msgid "Mathematics"
 msgstr ""
 
@@ -725,11 +906,19 @@ msgid "Factorization of large integers"
 msgstr ""
 
 #: projects.inc:473
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
+msgid ""
+"NFS at Home is a research project that uses Internet-connected computers to do "
+"the lattice sieving step in the Number Field Sieve factorization of large "
+"integers. As a young school student, you gained your first experience at "
+"breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
+"NFS at Home is a continuation of that experience, only with integers that are "
+"hundreds of digits long."
 msgstr ""
 
 #: projects.inc:479
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
+msgid ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
 msgstr ""
 
 #: projects.inc:480
@@ -738,7 +927,11 @@ msgid "Software testing"
 msgstr "Posodobitve programske opreme"
 
 #: projects.inc:481
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
+msgid ""
+"The aim of this project is to provide a powerful distributed computing "
+"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
+"well as others Lithuanian academic institutions.  Current applications "
+"involve the study of Monte-Carlo based software testing."
 msgstr ""
 
 #: projects.inc:503
@@ -746,11 +939,20 @@ msgid "Mathematical Institute of Leiden University / Kennislink"
 msgstr ""
 
 #: projects.inc:505
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
+msgid ""
+"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
+"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
+"product of the distinct prime factors of n. The ABC conjecture says that "
+"there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for "
+"any real h > 1. The ABC conjecture is currently one of the greatest open "
+"problems in mathematics. If it is proven to be true, a lot of other open "
+"problems can be answered directly from it."
 msgstr ""
 
 #: projects.inc:513
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
+msgid ""
+"Primegrid has multiple projects searching for different forms of very large "
+"prime numbers, including searching for the largest known prime number."
 msgstr ""
 
 #: projects.inc:519
@@ -758,11 +960,15 @@ msgid "Hochschule RheinMain University of Applied Sciences"
 msgstr ""
 
 #: projects.inc:521
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
+msgid ""
+"Search for counterexamples to two conjectures related to the identification "
+"of prime numbers"
 msgstr ""
 
 #: projects.inc:529
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
+msgid ""
+"Find all the generalized binary number systems (in which bases are matrices "
+"and digits are vectors) up to dimension 11."
 msgstr ""
 
 #: ../html/inc/news.inc:40
@@ -778,6 +984,7 @@ msgstr "Novice so na voljo na %sRSS viru%s"
 #, php-format
 #~ msgid "%s for %s (%s MB)"
 #~ msgstr "%s za %s (%s MB)"
+
 #~ msgid ""
 #~ "BOINC is a program that lets you donate your idle computer time to science "
 #~ "projects like SETI at home, Climateprediction.net, Rosetta at home, World "
@@ -788,6 +995,7 @@ msgstr "Novice so na voljo na %sRSS viru%s"
 #~ "znanstvenim projektom, kot so SETI at home, Climateprediction.net, "
 #~ "Rosetta at home, World Community Grid in mnogi drugi. <p>Po namestitvi BOINC na "
 #~ "vaš računalnik se lahko povežete na toliko projektov, kot želite."
+
 #~ msgid "Browser default"
 #~ msgstr "Privzeto v brskalniku"
 
@@ -816,14 +1024,17 @@ msgstr "Novice so na voljo na %sRSS viru%s"
 #, fuzzy
 #~ msgid "ABC at home"
 #~ msgstr "Doma"
+
 #~ msgid "The current release is known to work with these Linux versions:"
 #~ msgstr "Znano je, da trenutna izdaja deluje s sledečimi Linux različicami:"
+
 #~ msgid ""
 #~ "For other Linux versions, check if a BOINC package is offered by your "
 #~ "Linux distribution."
 #~ msgstr ""
 #~ "Za druge Linux različice preverite, če vaša Linux distribucija ponuja "
 #~ "paket BOINC."
+
 #~ msgid ""
 #~ "Alternatively, download the %1BOINC client for older Linux versions%2. "
 #~ "This doesn't have a graphical interface, but it should work on all Linux "
@@ -832,173 +1043,251 @@ msgstr "Novice so na voljo na %sRSS viru%s"
 #~ "Druga možnost je, da potegnete %1BOINC odjemalca za starejše Linux "
 #~ "različice%2. Ta nima grafičnega vmesnika, vendar pa bi moral teči na vseh "
 #~ "Linux sistemih, tako x86 kot  x64."
+
 #~ msgid ""
 #~ "Note: if your computer is equipped with an Graphics Processing Unit "
 #~ "(GPU), you may be able to %suse it to compute faster%s"
 #~ msgstr ""
 #~ "Opomba: če je vaš računalnik opremeljen z grafičnim procesorjem, ga morda "
 #~ "lahko %suporabite, da računate hitreje%s"
+
 #~ msgid "TeraFLOPS."
 #~ msgstr "TeraFLOPS"
+
 #~ msgid "Conferences"
 #~ msgstr "Konference"
+
 #~ msgid "[check all that apply]"
 #~ msgstr "[obkljukajte vse, kar velja]"
+
 #~ msgid "Other:"
 #~ msgstr "Drugo:"
+
 #~ msgid "Yes - I have been running BOINC on my computer for..."
 #~ msgstr "Da - poganjam BOINC na mojem računalniku že..."
+
 #~ msgid "less than a week"
 #~ msgstr "manj kot teden"
+
 #~ msgid "less than a month"
 #~ msgstr "manj kot mesec"
+
 #~ msgid "less than a year"
 #~ msgstr "manj kot leto"
+
 #~ msgid "more than a year"
 #~ msgstr "več kot leto"
+
 #~ msgid "No - I used to run BOINC, but..."
 #~ msgstr "Ne - poganjal(-a) sem BOINC, vendar..."
+
 #~ msgid "I lost interest"
 #~ msgstr "sem izgubil(-a) interes"
+
 #~ msgid "it was too complicated"
 #~ msgstr "je bilo preveč komplicirano"
+
 #~ msgid "I stopped it and forgot to start again"
 #~ msgstr "prenehal sem in pozabil spet pričeti"
+
 #~ msgid "it caused problems on my computer"
 #~ msgstr "je na mojem računalniku povzročal probleme"
+
 #~ msgid "it used too much electricity"
 #~ msgstr "je porabljal preveč elektrike"
+
 #~ msgid "I switched to a non-BOINC computing project"
 #~ msgstr "Preklopil sem na na računski projekt, ki ni BOINC"
+
 #~ msgid "No - I tried running BOINC, but..."
 #~ msgstr "Ne - poskusil(-a) sem pognati BOINC, vendar..."
+
 #~ msgid "the software didn't install correctly"
 #~ msgstr "se programska oprema ni pravilno namestila"
+
 #~ msgid "I couldn't figure out how to use the software"
 #~ msgstr "nisem mogel/mogla ugotoviti, kako uporabljati to programsko opremo"
+
 #~ msgid "I had network communication problems"
 #~ msgstr "sem imel(-a) probleme s komunikacijo po mreži"
+
 #~ msgid "I couldn't attach to a project"
 #~ msgstr "se nisem mogel/mogla pripeti na projekt"
+
 #~ msgid "I attached to a project, but never got any work"
 #~ msgstr ""
 #~ "nisem dobil(-a) nobenega dela, kljub temu, da sem se pripel(-a) na projekt"
+
 #~ msgid "No - I never tried running BOINC, because..."
 #~ msgstr "Ne - nikoli nisem poskusil(-a) pognati BOINC, ker..."
+
 #~ msgid "I was concerned about security"
 #~ msgstr "me je skrbelo za varnost"
+
 #~ msgid "I wasn't interested in any of the projects"
 #~ msgstr "me nobeden izmed projektov ni zanimal"
+
 #~ msgid "I don't have permission to run it on my computer"
 #~ msgstr "ga nimam pravice poganjati na mojem računalniku"
+
 #~ msgid "No version was available for my computer"
 #~ msgstr "za moj računalnik ni bilo na voljo različice"
+
 #~ msgid "What kind of computers do you have running BOINC?"
 #~ msgstr "Na kakšnih računalnikih poganjate BOINC?"
+
 #~ msgid "Where are they?"
 #~ msgstr "Kje so?"
+
 #~ msgid "Work"
 #~ msgstr "Služba"
+
 #~ msgid "School"
 #~ msgstr "Šola"
+
 #~ msgid "How many computers?"
 #~ msgstr "Koliko računalnikov?"
+
 #~ msgid "On average, how many hours per day are they powered on?"
 #~ msgstr "Koliko ur na dan so v povprečju prižgani?"
+
 #~ msgid "Age"
 #~ msgstr "Starost"
+
 #~ msgid "Sex"
 #~ msgstr "Spol"
+
 #~ msgid "Male"
 #~ msgstr "moški"
+
 #~ msgid "Female"
 #~ msgstr "ženska"
+
 #~ msgid "Your level of computer expertise"
 #~ msgstr "Nivo vašega računalniškega znanja"
+
 #~ msgid "Beginner"
 #~ msgstr "začetniško"
+
 #~ msgid "Intermediate"
 #~ msgstr "srednje"
+
 #~ msgid "Advanced"
 #~ msgstr "napredno"
+
 #~ msgid "Where did you learn about BOINC projects?"
 #~ msgstr "Kje ste izvedeli o BOINC projektih?"
+
 #~ msgid "TV/radio/newspaper"
 #~ msgstr "TV/radio/časopis"
+
 #~ msgid "From friends, relatives, or coworkers"
 #~ msgstr "od prijateljev, sorodnikov ali sodelavcev"
+
 #~ msgid "Team message boards or web sites"
 #~ msgstr "razpravljalnica ali spletna stran ekipe"
+
 #~ msgid "The BOINC web site"
 #~ msgstr "Na spletni strani BOINC"
+
 #~ msgid "Other web sites"
 #~ msgstr "Na drugih spletnih straneh"
+
 #~ msgid ""
 #~ "Which are the most important factors when you decide whether to "
 #~ "participate in a BOINC project?"
 #~ msgstr ""
 #~ "Kateri so najpomembnejši faktorji, ko se odločate, ali bi sodelovali v "
 #~ "BOINC projektu?"
+
 #~ msgid "Nice-looking screensaver graphics"
 #~ msgstr "dobra grafična podoba ohranjevalnika zaslona"
+
 #~ msgid "Fair and quick granting of credit for work done"
 #~ msgstr "pošteno in hitro dodeljavanje točk za opravljeno delo"
+
 #~ msgid "Getting more credit from this project than from others"
 #~ msgstr "od tega projekt dobim več točk kot od drugih"
+
 #~ msgid "Helpful and friendly message boards"
 #~ msgstr "razpravljalnice so prijazne in v pomoč"
+
 #~ msgid "Participation by project staff on the message boards"
 #~ msgstr "sodelovanje osebja projekta na razpravljalnicah"
+
 #~ msgid "Informative project web site"
 #~ msgstr "informativna spletna stran"
+
 #~ msgid "The science is important and beneficial"
 #~ msgstr "znanost je pomembna in koristna"
+
 #~ msgid "Non-profit, and results are public"
 #~ msgstr "neprofitno in rezultati so javni"
+
 #~ msgid "Personal recognition if my computer finds something"
 #~ msgstr "osebno priznanje, če moj računalnik nekaj najde"
+
 #~ msgid "Publication by the project in scientific journals"
 #~ msgstr "publikacije projekta v znanstvenih revijah"
+
 #~ msgid "Periodic email newsletters from the project"
 #~ msgstr "periodične novice projekta po elektronski pošti"
+
 #~ msgid "How many BOINC projects do you participate in?"
 #~ msgstr "V koliko BOINC projektih sodelujete?"
+
 #~ msgid "Do you run BOINC as a screensaver?"
 #~ msgstr "Ali uporabljate BOINC kot ohranjevalnik zaslona?"
+
 #~ msgid "Yes"
 #~ msgstr "Da"
+
 #~ msgid "No"
 #~ msgstr "Ne"
+
 #~ msgid "Your usage of project messages boards:"
 #~ msgstr "Vaša uporaba razpravljalnic projekta:"
+
 #~ msgid "to read information"
 #~ msgstr "za branje informacije"
+
 #~ msgid "to read and post information"
 #~ msgstr "za branje in objavo informacij"
+
 #~ msgid "None"
 #~ msgstr "brez"
+
 #~ msgid ""
 #~ "Where do you get information to help resolve problems with BOINC and/or "
 #~ "BOINC projects?"
 #~ msgstr ""
 #~ "Kje dobite informacije, ki vam pomagajo razrešiti težave z BOINC in/ali "
 #~ "BOINC projekti?"
+
 #~ msgid "The project message boards"
 #~ msgstr "Razpravljalnice projekta"
+
 #~ msgid "The BOINC message boards"
 #~ msgstr "Razpravljalnice BOINC"
+
 #~ msgid "BOINC mailing lists"
 #~ msgstr "BOINC poštni seznam"
+
 #~ msgid "The Unofficial BOINC Wiki"
 #~ msgstr "Neuradni BOINC Wiki"
+
 #~ msgid "Team web sites"
 #~ msgstr "Spletne strani ekip"
+
 #~ msgid "Google or other search engines"
 #~ msgstr "Google ali drugi iskalniki"
+
 #~ msgid "... more"
 #~ msgstr ".. več"
+
 #~ msgid "BOINC user survey"
 #~ msgstr "BOINC uporabniška anketa"
+
 #~ msgid ""
 #~ "Several volunteer computing projects, including Climateprediction.net, "
 #~ "Einstein at home, and SETI at home, use software called BOINC.  If you "
@@ -1020,44 +1309,57 @@ msgstr "Novice so na voljo na %sRSS viru%s"
 #~ "vmes spremenili, jo prosim spet izpolnite - vaši novi odgovori bodo "
 #~ "zamenjali stare. <p> Trenutni rezultati ankete so <a href=poll_results."
 #~ "php>tukaj</a>. "
+
 #~ msgid "Do you run BOINC?"
 #~ msgstr "Ali poganjate BOINC?"
+
 #~ msgid "Your participation"
 #~ msgstr "Vaša udeležba"
+
 #~ msgid "Your computers"
 #~ msgstr "Vaši računalniki"
+
 #~ msgid "You"
 #~ msgstr "Vi"
+
 #~ msgid "Nationality"
 #~ msgstr "Narodnost"
+
 #~ msgid "Comments"
 #~ msgstr "Pripombe"
+
 #~ msgid ""
 #~ "Please suggest ways that BOINC, and the projects that use it, could be "
 #~ "improved:"
 #~ msgstr ""
 #~ "Prosim predlagajte na katere načine bi BOINC in projekti, ki ga "
 #~ "uporabljajo, lahko bili izboljšani:"
+
 #~ msgid "When done click:"
 #~ msgstr "Ko zaključite, kliknite:"
+
 #~ msgid "Error - results not recorded"
 #~ msgstr "Napaka - rezultati niso zabeleženi"
+
 #~ msgid ""
 #~ "An internal error has prevented us from recording your survey response.  "
 #~ "Please try again later."
 #~ msgstr ""
 #~ "Interna napaka nam je preprečila zabeležiti rezultate vaše ankete.  "
 #~ "Prosimo, poskusite znova kasneje."
+
 #~ msgid "Survey response recorded"
 #~ msgstr "Odgovori na anketo zabeleženi"
+
 #~ msgid "Thank you for completing the BOINC user survey."
 #~ msgstr "Hvala, da ste izpolnili BOINC uporabniško anketo."
+
 #~ msgid "Survey results"
 #~ msgstr "Rezultati ankete"
+
 #~ msgid ""
 #~ "These are the current results of the <a href=poll.php>BOINC user survey</"
 #~ "a>.  This page is updated every hour."
 #~ msgstr ""
 #~ "To so trenutni rezultati <a href=poll.php>BOINC uporabniške ankete</a>.  "
 #~ "Ta stran je posodobljena vsako uro."
-
diff --git a/locale/sv_SE/BOINC-Client.mo b/locale/sv/BOINC-Client.mo
similarity index 51%
rename from locale/sv_SE/BOINC-Client.mo
rename to locale/sv/BOINC-Client.mo
index 8474956..2cf722e 100644
Binary files a/locale/sv_SE/BOINC-Client.mo and b/locale/sv/BOINC-Client.mo differ
diff --git a/locale/sv_SE/BOINC-Client.po b/locale/sv/BOINC-Client.po
similarity index 55%
rename from locale/sv_SE/BOINC-Client.po
rename to locale/sv/BOINC-Client.po
index 92473aa..0896841 100644
--- a/locale/sv_SE/BOINC-Client.po
+++ b/locale/sv/BOINC-Client.po
@@ -1,24 +1,23 @@
 # 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: BOINC 7.4\n"
+"Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-10-15 22:25-0700\n"
-"PO-Revision-Date: 2015-02-12 02:01-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: sv_SE\n"
+"PO-Revision-Date: 2015-03-13 15:48+0000\n"
+"Last-Translator: Rom Walton\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/boinc/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-POOTLE-MTIME: 1419491367.0\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: acct_mgr.cpp:450
-#: acct_mgr.cpp:459
+#: acct_mgr.cpp:450 acct_mgr.cpp:459
 msgid "Message from account manager"
 msgstr "Meddelande från kontohanteraren"
 
@@ -27,7 +26,9 @@ msgid "Message from server"
 msgstr "Meddelande från server"
 
 #: client_state.cpp:258
-msgid "Some tasks need more memory than allowed by your preferences.  Please check the preferences."
+msgid ""
+"Some tasks need more memory than allowed by your preferences.  Please check "
+"the preferences."
 msgstr "En del uppgifter kräver mer minne än dina inställningar tillåter.  Kontrollera inställningarna."
 
 #: client_state.cpp:520
@@ -40,11 +41,12 @@ msgstr "Miljövariabeln HTTP_PROXY måste specificera en HTTP-proxy"
 
 #: cs_scheduler.cpp:613
 #, c-format
-msgid "You used the wrong URL for this project.  When convenient, remove this project, then add %s"
+msgid ""
+"You used the wrong URL for this project.  When convenient, remove this "
+"project, then add %s"
 msgstr "Du använde fel URL för detta projekt.  När det känns bekvämt, ta bort detta projekt och lägg sedan till %s"
 
-#: cs_statefile.cpp:828
-#: ../sched/sched_types.cpp:259
+#: cs_statefile.cpp:828 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
 msgstr "Syntaxfel i app_info.xml"
 
@@ -56,32 +58,29 @@ msgstr "Filen som det hänvisas till i app_info.xml finns inte: "
 msgid "A new version of BOINC is available."
 msgstr "En ny version av BOINC är tillgänglig."
 
-#: current_version.cpp:94
-#: current_version.cpp:102
+#: current_version.cpp:94 current_version.cpp:102
 msgid "Download"
 msgstr "Hämta"
 
-#: log_flags.cpp:269
-#: log_flags.cpp:449
+#: log_flags.cpp:269 log_flags.cpp:449
 msgid "Unexpected text in cc_config.xml"
 msgstr "Oväntad text i cc_config.xml"
 
-#: log_flags.cpp:423
-#: log_flags.cpp:475
+#: log_flags.cpp:423 log_flags.cpp:475
 msgid "Unrecognized tag in cc_config.xml"
-msgstr "Okänd tagg i cc_config.xml"
+msgstr "Okänd markering i cc_config.xml"
 
 #: log_flags.cpp:440
 msgid "Missing start tag in cc_config.xml"
-msgstr "Starttagg i cc_config.xml saknas"
+msgstr "cc_config.xml saknar startmarkering"
 
 #: log_flags.cpp:465
 msgid "Error in cc_config.xml options"
-msgstr "Fel i cc_config.xml-alternativen"
+msgstr "Fel i alternativen för cc_config.xml"
 
 #: log_flags.cpp:483
 msgid "Missing end tag in cc_config.xml"
-msgstr "Sluttagg i cc_config.xml saknas"
+msgstr "cc_config.xml saknar slutmarkering"
 
 #: ../sched/handle_request.cpp:307
 msgid "Invalid or missing account key.  To fix, remove and add this project."
@@ -92,7 +91,9 @@ msgid "Invalid code signing key.  To fix, remove and add this project."
 msgstr "Ogiltig nyckel för kodsignatur.  För att rätta till, ta bort och lägg till detta projekt."
 
 #: ../sched/handle_request.cpp:859
-msgid "The project has changed its security key.  Please remove and add this project."
+msgid ""
+"The project has changed its security key.  Please remove and add this "
+"project."
 msgstr "Projektet har ändrat sin säkerhetsnyckel.  Ta bort och lägg till detta projekt."
 
 #: ../sched/handle_request.cpp:943
@@ -104,7 +105,8 @@ msgid "This project doesn't support CPU type"
 msgstr "Detta projekt stöder inte CPU-typen"
 
 #: ../sched/handle_request.cpp:993
-msgid "Your BOINC client software is too old.  Please install the current version."
+msgid ""
+"Your BOINC client software is too old.  Please install the current version."
 msgstr "Din BOINC-klientprogramvara är för gammal.  Installera aktuell version."
 
 #: ../sched/handle_request.cpp:1259
@@ -112,26 +114,29 @@ msgid "This project doesn't support computers of type"
 msgstr "Detta projekt stöder inte datorer av typen"
 
 #: ../sched/sched_send.cpp:1092
-msgid "Upgrade to the latest driver to process tasks using your computer's GPU"
+msgid ""
+"Upgrade to the latest driver to process tasks using your computer's GPU"
 msgstr "Uppgradera till den senaste drivrutinen för att bearbeta uppgifter med din dators GPU"
 
 #: ../sched/sched_send.cpp:1099
-msgid "Upgrade to the latest driver to use all of this project's GPU applications"
+msgid ""
+"Upgrade to the latest driver to use all of this project's GPU applications"
 msgstr "Uppgradera till den senaste drivrutinen för att använda alla detta projekts GPU-program"
 
 #: ../sched/sched_send.cpp:1118
-msgid "A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to the current version"
+msgid ""
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to"
+" the current version"
 msgstr "En nyare version av BOINC behövs för att kunna använda din NVIDIA GPU; Uppgradera till aktuell 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 "En %s-GPU behövs för att köra uppgifter för detta projekt"
+msgstr "Det krävs en %s-GPU för att köra uppgifter för detta projekt"
 
 #: ../sched/sched_send.cpp:1262
 msgid "No tasks are available for the applications you have selected."
-msgstr "Inga uppgifter tillgängliga för programmen du har valt."
+msgstr "Programmen du valde har inga uppgifter tillgängliga."
 
 #: ../sched/sched_send.cpp:1288
 msgid "Your computer type is not supported by this project"
@@ -143,48 +148,14 @@ msgstr "Nyare BOINC-version krävs; vänligen installera aktuell version"
 
 #: ../sched/sched_send.cpp:1305
 #, c-format
-msgid "Tasks for %s are available, but your preferences are set to not accept them"
-msgstr "Uppgifter för %s finns tillgänliga, men dina inställningar tillåter dem inte"
+msgid ""
+"Tasks for %s are available, but your preferences are set to not accept them"
+msgstr "Uppgifter för %s är tillgängliga, men dina inställningar är inställda på att inte acceptera dem"
 
 #: ../sched/sched_types.cpp:254
 msgid "Unknown app name in app_info.xml"
-msgstr "Uppgifter för %s finns tillgängliga, men dina inställningar tillåter dem inte"
+msgstr "Okänt programnamn i app_info.xml"
 
 #: ../sched/sched_version.cpp:214
 msgid "Your app_info.xml file doesn't have a usable version of"
 msgstr "Din app_info.xml-fil har ingen användbar version av"
-
-#~ msgid "Download it."
-#~ msgstr "Ladda ned den."
-#~ msgid "An NVIDIA or ATI GPU is required to run tasks for this project"
-#~ msgstr "En NVIDIA eller ATI GPU behövs för att köra processer för projektet"
-#~ msgid "An NVIDIA GPU is required to run tasks for this project"
-#~ msgstr "En NVIDIA GPU behövs för att köra processer för projektet"
-#~ msgid "An ATI GPU is required to run tasks for this project"
-#~ msgstr "Ett ATI GPU behövs för att köra processer för projektet"
-#~ msgid ""
-#~ "Tasks for NVIDIA GPU are available, but your preferences are set to not "
-#~ "accept them"
-#~ msgstr ""
-#~ "Uppgifter för NVIDIA GPU:er finns tillgängliga, men dina inställningar är "
-#~ "satta till att inte acceptera dessa"
-#~ msgid ""
-#~ "Tasks for ATI GPU are available, but your preferences are set to not accept "
-#~ "them"
-#~ msgstr ""
-#~ "Uppgifter för ATI GPU:er finns tillgängliga, men dina inställningar är satta "
-#~ "till att inte acceptera dessa"
-#~ msgid ""
-#~ "Tasks for CPU are available, but your preferences are set to not accept them"
-#~ msgstr ""
-#~ "Uppgifter för CPU finns tillgängliga, men du har valt att inte acceptera "
-#~ "dessa"
-#~ msgid "error"
-#~ msgstr "fel"
-#~ msgid "Can't resolve hostname in remote_hosts.cfg"
-#~ msgstr "Kan inte avgöra värdnamn i remote_hosts.cfg"
-#~ msgid "is not available for"
-#~ msgstr "är inte tillgänglig för"
-#~ msgid "Notice from BOINC"
-#~ msgstr "Notis från BOINC"
-
diff --git a/locale/sv_SE/BOINC-Manager.mo b/locale/sv_SE/BOINC-Manager.mo
deleted file mode 100644
index 4634d49..0000000
Binary files a/locale/sv_SE/BOINC-Manager.mo and /dev/null differ
diff --git a/locale/sv_SE/BOINC-Manager.po b/locale/sv_SE/BOINC-Manager.po
deleted file mode 100644
index 06f39d2..0000000
--- a/locale/sv_SE/BOINC-Manager.po
+++ /dev/null
@@ -1,4369 +0,0 @@
-# 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.
-msgid ""
-msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-15 16:56-0500\n"
-"PO-Revision-Date: 2015-02-12 02:01-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: sv_SE\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc_7.4\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1419491504.0\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-SearchPath-0: clientgui\n"
-"X-Poedit-SearchPath-1: clientgui/msw\n"
-"X-Poedit-SearchPath-2: clientgui/mac\n"
-"X-Poedit-SearchPath-3: clientgui/mac\n"
-
-# ermer: Tasks: Uppgifter
-#: clientgui/AccountInfoPage.cpp:387
-#, c-format
-msgid "Identify your account at %s"
-msgstr "Identifiera ditt konto hos %s"
-
-#: clientgui/AccountInfoPage.cpp:393
-msgid ""
-"Please enter your account information\n"
-"(to create an account, visit the project's web site)"
-msgstr ""
-"Ange din kontoinformation\n"
-"(besök projektets webbplats för att skapa ett konto)"
-
-#: clientgui/AccountInfoPage.cpp:397
-msgid ""
-"This project is not currently accepting new accounts.\n"
-"You can add it only if you already have an account."
-msgstr ""
-"Projektet accepterar för närvarande inte nya konton.\n"
-"Du kan bara lägga till det om du redan har ett konto."
-
-#: clientgui/AccountInfoPage.cpp:401
-msgid "Are you already running this project?"
-msgstr "Kör du redan detta projekt?"
-
-#: clientgui/AccountInfoPage.cpp:405
-msgid "&No, new user"
-msgstr "&Nej, ny användare"
-
-#: clientgui/AccountInfoPage.cpp:408
-msgid "&Yes, existing user"
-msgstr "&Ja, befintlig användare"
-
-#: clientgui/AccountInfoPage.cpp:413
-msgid ""
-"We were not able to set up your account information\n"
-"automatically.\n"
-"\n"
-"Please click on the 'Find login information' link\n"
-"below to find out what to put in the email address and\n"
-"password fields."
-msgstr ""
-"Vi kunde inte ställa in din kontoinformation\n"
-"automatiskt.\n"
-"\n"
-"Klicka på länken ”Hitta inloggningsuppgifter”\n"
-"nedanför för att se vad du ska ange i e-post- och\n"
-"lösenordsfälten."
-
-#: clientgui/AccountInfoPage.cpp:416
-msgid "Find login information"
-msgstr "Hitta inloggningsuppgifter"
-
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:649
-msgid "&Password:"
-msgstr "&Lösenord:"
-
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:673
-msgid "Choose a &password:"
-msgstr "Välj ett &lösenord:"
-
-#: clientgui/AccountInfoPage.cpp:446
-msgid "C&onfirm password:"
-msgstr "&Bekräfta lösenord:"
-
-#: clientgui/AccountInfoPage.cpp:453
-#, c-format
-msgid "Are you already running %s?"
-msgstr "Kör du redan %s?"
-
-#: clientgui/AccountInfoPage.cpp:482
-msgid "&Username:"
-msgstr "&Användarnamn:"
-
-#: clientgui/AccountInfoPage.cpp:511
-msgid "&Email address or LDAP ID:"
-msgstr "&E-postadress eller LDAP-ID:"
-
-#: clientgui/AccountInfoPage.cpp:515
-msgid "&Email address:"
-msgstr "&E-postadress:"
-
-#: clientgui/AccountInfoPage.cpp:523
-#, c-format
-msgid "minimum length %d"
-msgstr "minimal längd %d"
-
-#: clientgui/AccountInfoPage.cpp:530
-msgid "Forgot your password?"
-msgstr "Glömt ditt lösenord?"
-
-#: clientgui/AccountInfoPage.cpp:537
-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 ""
-"Om du inte har registrerat med den här kontohanteraren,\n"
-"gör detta innan du fortsätter.  Klicka på länken nedan\n"
-"för att registrera eller hämta ett bortglömt lösenord."
-
-#: clientgui/AccountInfoPage.cpp:540
-msgid "Account manager web site"
-msgstr "Kontohanterarens webbplats"
-
-#: clientgui/AccountInfoPage.cpp:582
-msgid "Add project"
-msgstr "Lägg till projekt"
-
-#: clientgui/AccountInfoPage.cpp:584
-msgid "Update account manager"
-msgstr "Uppdatera kontohanteraren"
-
-#: clientgui/AccountInfoPage.cpp:586
-msgid "Use account manager"
-msgstr "Använd kontohanteraren"
-
-#: clientgui/AccountInfoPage.cpp:593
-msgid "Please enter a user name."
-msgstr "Ange ett användarnamn."
-
-#: clientgui/AccountInfoPage.cpp:595
-msgid "Please enter an email address."
-msgstr "Ange en e-postadress."
-
-#: clientgui/AccountInfoPage.cpp:605
-#, c-format
-msgid "Please enter a password of at least %d characters."
-msgstr "Ange ett lösenord med minst %d tecken."
-
-#: clientgui/AccountInfoPage.cpp:615
-msgid "The password and confirmation password do not match. Please type them again."
-msgstr "Lösenordet och bekräftelselösenordet stämde inte överens. Prova igen."
-
-#: clientgui/AccountManagerInfoPage.cpp:272
-msgid "Choose an account manager"
-msgstr "Välj en kontohanterare"
-
-#: clientgui/AccountManagerInfoPage.cpp:275
-msgid ""
-"To choose an account manager, click its name or \n"
-"type its URL below."
-msgstr ""
-"För att välja en kontohanterare, klicka på dess namn eller \n"
-"skriv in dess URL nedan."
-
-#: clientgui/AccountManagerInfoPage.cpp:279
-msgid "Account manager details:"
-msgstr "Kontohanterarens detaljer:"
-
-#: clientgui/AccountManagerInfoPage.cpp:283
-msgid "Account manager &URL:"
-msgstr "&URL för kontohanterare:"
-
-#: clientgui/AccountManagerInfoPage.cpp:287
-msgid "Open web page"
-msgstr "Öppna webbsida"
-
-#: clientgui/AccountManagerInfoPage.cpp:290
-msgid "Visit this account manager's web site"
-msgstr "Besök denna kontohanterares webbplats"
-
-#: clientgui/AccountManagerProcessingPage.cpp:186
-#: clientgui/AccountManagerPropertiesPage.cpp:192
-#, c-format
-msgid "Communicating with %s."
-msgstr "Kommunicerar med %s."
-
-#: clientgui/AccountManagerProcessingPage.cpp:193
-#: clientgui/AccountManagerPropertiesPage.cpp:199
-msgid "Communicating with server."
-msgstr "Kommunicerar med server."
-
-#: clientgui/AccountManagerProcessingPage.cpp:198
-#: clientgui/AccountManagerPropertiesPage.cpp:204
-msgid "Please wait..."
-msgstr "Vänligen vänta…"
-
-#: clientgui/AccountManagerProcessingPage.cpp:325
-msgid "An internal server error has occurred.\n"
-msgstr "Ett internt serverfel har inträffat.\n"
-
-#: clientgui/AdvancedFrame.cpp:96
-msgid "Connected"
-msgstr "Ansluten"
-
-#: clientgui/AdvancedFrame.cpp:104
-msgid "Disconnected"
-msgstr "Frånkopplad"
-
-#: clientgui/AdvancedFrame.cpp:318
-#, c-format
-msgid "Close the %s window"
-msgstr "Stäng %s-fönstret"
-
-#: clientgui/AdvancedFrame.cpp:321
-msgid "&Close Window"
-msgstr "&Stäng fönstret"
-
-#: clientgui/AdvancedFrame.cpp:332
-#: clientgui/AdvancedFrame.cpp:339
-#: clientgui/AdvancedFrame.cpp:346
-#, c-format
-msgid "Exit %s"
-msgstr "Avsluta %s"
-
-#: clientgui/AdvancedFrame.cpp:359
-msgid "Preferences..."
-msgstr "Inställningar…"
-
-#: clientgui/AdvancedFrame.cpp:368
-msgid "&Notices\tCtrl+Shift+N"
-msgstr "&Meddelanden\tCtrl+Skift+N"
-
-#: clientgui/AdvancedFrame.cpp:369
-msgid "Display notices"
-msgstr "Visa meddelanden"
-
-#: clientgui/AdvancedFrame.cpp:374
-msgid "&Projects\tCtrl+Shift+P"
-msgstr "&Projekt\tCtrl+Skift+P"
-
-#: clientgui/AdvancedFrame.cpp:375
-msgid "Display projects"
-msgstr "Visa projekt"
-
-#: clientgui/AdvancedFrame.cpp:380
-msgid "&Tasks\tCtrl+Shift+T"
-msgstr "&Uppgifter\tCtrl+Skift+T"
-
-#: clientgui/AdvancedFrame.cpp:381
-msgid "Display tasks"
-msgstr "Visa uppgifter"
-
-#: clientgui/AdvancedFrame.cpp:386
-msgid "Trans&fers\tCtrl+Shift+X"
-msgstr "Över&föringar\tCtrl+Skift+X"
-
-#: clientgui/AdvancedFrame.cpp:387
-msgid "Display transfers"
-msgstr "Visa överföringar"
-
-#: clientgui/AdvancedFrame.cpp:392
-msgid "&Statistics\tCtrl+Shift+S"
-msgstr "&Statistik\tCtrl+Skift+S"
-
-#: clientgui/AdvancedFrame.cpp:393
-msgid "Display statistics"
-msgstr "Visa statistik"
-
-#: clientgui/AdvancedFrame.cpp:398
-msgid "&Disk usage\tCtrl+Shift+D"
-msgstr "&Diskanvändning\tCtrl+Skift+D"
-
-#: clientgui/AdvancedFrame.cpp:399
-msgid "Display disk usage"
-msgstr "Visa diskanvändning"
-
-#: clientgui/AdvancedFrame.cpp:406
-msgid "Simple &View...\tCtrl+Shift+V"
-msgstr "Enkel &vy...\tCtrl+Skift+V"
-
-#: clientgui/AdvancedFrame.cpp:407
-msgid "Display the simple graphical interface."
-msgstr "Visa det förenklade grafiska gränssnittet."
-
-#: clientgui/AdvancedFrame.cpp:421
-msgid "&Add project or account manager..."
-msgstr "&Lägg till projekt eller kontohanterare…"
-
-#: clientgui/AdvancedFrame.cpp:422
-msgid "Volunteer for any or all of 30+ projects in many areas of science"
-msgstr "Bli volontär för något av, eller alla de 30+ projekten som finns inom flera vetenskapsområden"
-
-#: clientgui/AdvancedFrame.cpp:426
-#, c-format
-msgid "&Synchronize with %s"
-msgstr "&Synkronisera med %s"
-
-#: clientgui/AdvancedFrame.cpp:430
-#, c-format
-msgid "Get current settings from %s"
-msgstr "Hämta aktuella inställningar från %s"
-
-#: clientgui/AdvancedFrame.cpp:440
-msgid "&Add project..."
-msgstr "&Lägg till projekt…"
-
-#: clientgui/AdvancedFrame.cpp:441
-msgid "Add a project"
-msgstr "Lägg till ett projekt"
-
-#: clientgui/AdvancedFrame.cpp:444
-#, c-format
-msgid "S&top using %s..."
-msgstr "S&luta att använda %s…"
-
-#: clientgui/AdvancedFrame.cpp:450
-msgid "Remove this computer from account manager control."
-msgstr "Ta bort denna dator från kontohanterarkontroll."
-
-#: clientgui/AdvancedFrame.cpp:455
-msgid "&Options..."
-msgstr "&Alternativ…"
-
-#: clientgui/AdvancedFrame.cpp:456
-msgid "Configure display options and proxy settings"
-msgstr "Konfigurera visningsalternativ och proxyinställningar"
-
-#: clientgui/AdvancedFrame.cpp:460
-msgid "Computing &preferences..."
-msgstr "&Beräkningsinställningar…"
-
-#: clientgui/AdvancedFrame.cpp:461
-msgid "Configure computing preferences"
-msgstr "Konfigurera beräkningsinställningar"
-
-#: clientgui/AdvancedFrame.cpp:469
-msgid "&Run always"
-msgstr "&Kör alltid"
-
-#: clientgui/AdvancedFrame.cpp:470
-msgid "Allow work regardless of preferences"
-msgstr "Tillåt jobb oavsett inställningar"
-
-#: clientgui/AdvancedFrame.cpp:474
-msgid "Run based on &preferences"
-msgstr "Kör baserat på &inställningar"
-
-#: clientgui/AdvancedFrame.cpp:475
-msgid "Allow work according to preferences"
-msgstr "Tillåt jobb baserat på inställningar"
-
-#: clientgui/AdvancedFrame.cpp:479
-msgid "&Suspend"
-msgstr "&Vänteläge"
-
-#: clientgui/AdvancedFrame.cpp:480
-msgid "Stop work regardless of preferences"
-msgstr "Stoppa jobb oavsett inställningar"
-
-#: clientgui/AdvancedFrame.cpp:505
-msgid "Use GPU always"
-msgstr "Använd alltid GPU"
-
-#: clientgui/AdvancedFrame.cpp:506
-msgid "Allow GPU work regardless of preferences"
-msgstr "Tillåt GPU-jobb oavsett inställningar"
-
-#: clientgui/AdvancedFrame.cpp:510
-msgid "Use GPU based on preferences"
-msgstr "Använd GPU baserat på inställningar"
-
-#: clientgui/AdvancedFrame.cpp:511
-msgid "Allow GPU work according to preferences"
-msgstr "Tillåt GPU-jobb baserat på inställningar"
-
-#: clientgui/AdvancedFrame.cpp:515
-msgid "Suspend GPU"
-msgstr "Försätt GPU i vänteläge"
-
-#: clientgui/AdvancedFrame.cpp:516
-msgid "Stop GPU work regardless of preferences"
-msgstr "Stoppa GPU-jobb oavsett inställningar"
-
-#: clientgui/AdvancedFrame.cpp:540
-msgid "Network activity always available"
-msgstr "Nätverksaktivitet alltid tillgänglig"
-
-#: clientgui/AdvancedFrame.cpp:541
-msgid "Allow network activity regardless of preferences"
-msgstr "Tillåt nätverksaktivitet oavsett inställningar"
-
-#: clientgui/AdvancedFrame.cpp:545
-msgid "Network activity based on preferences"
-msgstr "Nätverksaktivitet baserat på inställningar"
-
-#: clientgui/AdvancedFrame.cpp:546
-msgid "Allow network activity according to preferences"
-msgstr "Tillåt nätverksaktivitet baserat på inställningar"
-
-#: clientgui/AdvancedFrame.cpp:550
-msgid "Network activity suspended"
-msgstr "Nätverksaktivitet försatt i vänteläge"
-
-#: clientgui/AdvancedFrame.cpp:551
-msgid "Stop BOINC network activity"
-msgstr "Stoppa BOINC nätverksaktivitet"
-
-#: clientgui/AdvancedFrame.cpp:561
-#, c-format
-msgid "Connect to another computer running %s"
-msgstr "Anslut till en annan dator körandes %s"
-
-#: clientgui/AdvancedFrame.cpp:566
-msgid "Select computer..."
-msgstr "Välj dator…"
-
-#: clientgui/AdvancedFrame.cpp:571
-msgid "Shut down connected client..."
-msgstr "Stoppa den anslutna klienten…"
-
-#: clientgui/AdvancedFrame.cpp:572
-msgid "Shut down the currently connected client"
-msgstr "Stoppa aktuell ansluten klient"
-
-#: clientgui/AdvancedFrame.cpp:576
-msgid "Run CPU &benchmarks"
-msgstr "Kör CPU-&mätningar"
-
-#: clientgui/AdvancedFrame.cpp:577
-msgid "Runs BOINC CPU benchmarks"
-msgstr "Kör BOINC CPU-mätningar"
-
-#: clientgui/AdvancedFrame.cpp:581
-msgid "Do network communication"
-msgstr "Utför nätverkskommunikation"
-
-#: clientgui/AdvancedFrame.cpp:582
-msgid "Do all pending network communication"
-msgstr "Utför all väntande nätverkskommunikation"
-
-#: clientgui/AdvancedFrame.cpp:586
-msgid "Read config files"
-msgstr "Läs konfigurationsfiler"
-
-#: clientgui/AdvancedFrame.cpp:587
-msgid "Read configuration info from cc_config.xml and any app_config.xml files"
-msgstr "Läs konfiguration från cc_config.xml och eventuella app_config.xml-filer"
-
-#: clientgui/AdvancedFrame.cpp:591
-msgid "Read local prefs file"
-msgstr "Läs lokal inställningsfil"
-
-#: clientgui/AdvancedFrame.cpp:592
-msgid "Read preferences from global_prefs_override.xml."
-msgstr "Läs inställningar från global_prefs_override.xml."
-
-#: clientgui/AdvancedFrame.cpp:597
-#, c-format
-msgid "Launch another instance of %s..."
-msgstr "Starta ännu en instans av %s…"
-
-#: clientgui/AdvancedFrame.cpp:601
-#, c-format
-msgid "Launch another %s"
-msgstr "Starta en annan %s"
-
-#: clientgui/AdvancedFrame.cpp:611
-msgid "Event Log...\tCtrl+Shift+E"
-msgstr "Händelselogg...\tCtrl+Skift+E"
-
-#: clientgui/AdvancedFrame.cpp:612
-msgid "Display diagnostic messages."
-msgstr "Visa diagnostiska meddelanden."
-
-#: clientgui/AdvancedFrame.cpp:616
-msgid "Event Log Diagnostic Flags...\tCtrl+Shift+F"
-msgstr "Diagnosflaggor för händelselogg...\tCtrl+Skift+F"
-
-#: clientgui/AdvancedFrame.cpp:617
-msgid "Enable or disable various diagnostic messages"
-msgstr "Aktivera eller inaktivera olika diagnostiska meddelanden"
-
-#: clientgui/AdvancedFrame.cpp:626
-#, c-format
-msgid "%s &help"
-msgstr "%s-&hjälp"
-
-#: clientgui/AdvancedFrame.cpp:632
-#, c-format
-msgid "Show information about %s"
-msgstr "Visa information om %s"
-
-#: clientgui/AdvancedFrame.cpp:644
-#, c-format
-msgid "&%s help"
-msgstr "&%s-hjälp"
-
-#: clientgui/AdvancedFrame.cpp:650
-#, c-format
-msgid "Show information about the %s"
-msgstr "Visa information om %s"
-
-#: clientgui/AdvancedFrame.cpp:662
-#, c-format
-msgid "%s &web site"
-msgstr "%s-&webbplats"
-
-#: clientgui/AdvancedFrame.cpp:668
-#, c-format
-msgid "Show information about BOINC and %s"
-msgstr "Visa information om BOINC och %s"
-
-#: clientgui/AdvancedFrame.cpp:680
-#: clientgui/BOINCTaskBar.cpp:544
-#, c-format
-msgid "&About %s..."
-msgstr "&Om %s…"
-
-#: clientgui/AdvancedFrame.cpp:686
-msgid "Licensing and copyright information."
-msgstr "Licens- och upphovsrättsinformation."
-
-#: clientgui/AdvancedFrame.cpp:693
-msgid "&File"
-msgstr "&Arkiv"
-
-#: clientgui/AdvancedFrame.cpp:697
-msgid "&View"
-msgstr "&Visa"
-
-#: clientgui/AdvancedFrame.cpp:701
-msgid "&Tools"
-msgstr "&Verktyg"
-
-#: clientgui/AdvancedFrame.cpp:705
-msgid "&Activity"
-msgstr "&Aktivitet"
-
-#: clientgui/AdvancedFrame.cpp:709
-msgid "A&dvanced"
-msgstr "Avan&cerat"
-
-#: clientgui/AdvancedFrame.cpp:713
-msgid "&Help"
-msgstr "&Hjälp"
-
-#: clientgui/AdvancedFrame.cpp:1185
-#, c-format
-msgid "%s - Stop using %s"
-msgstr "%s - Sluta att använda %s"
-
-#: clientgui/AdvancedFrame.cpp:1190
-#, c-format
-msgid ""
-"If you stop using %s,\n"
-"you'll keep all your current projects,\n"
-"but you'll have to manage projects manually.\n"
-"\n"
-"Do you want to stop using %s?"
-msgstr ""
-"Om du slutar att använda %s,\n"
-"kommer du att behålla alla aktuella projekt,\n"
-"men du måste hantera projekten manuellt.\n"
-"\n"
-"Vill du sluta att använda %s?"
-
-#: clientgui/AdvancedFrame.cpp:1397
-#, c-format
-msgid "%s - Shut down the current client..."
-msgstr "%s - Stäng av den aktuella klienten…"
-
-#: clientgui/AdvancedFrame.cpp:1406
-#, c-format
-msgid ""
-"%s will shut down the current client\n"
-"and prompt you for another host to connect to."
-msgstr ""
-"%s kommer att stänga av den aktuella klienten\n"
-"och därefter fråga efter en annan värd att ansluta till."
-
-#: clientgui/AdvancedFrame.cpp:1806
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: clientgui/AdvancedFrame.cpp:1815
-#, c-format
-msgid "%s has successfully added %s"
-msgstr "%s har lagt till %s"
-
-#: clientgui/AdvancedFrame.cpp:1953
-#, c-format
-msgid "%s - (%s)"
-msgstr "%s - (%s)"
-
-#: clientgui/AdvancedFrame.cpp:1957
-#, c-format
-msgid "Connecting to %s"
-msgstr "Ansluter till %s"
-
-#: clientgui/AdvancedFrame.cpp:1960
-#, c-format
-msgid "Connected to %s (%s)"
-msgstr "Ansluten till %s (%s)"
-
-#: clientgui/AlreadyExistsPage.cpp:184
-msgid "Username already in use"
-msgstr "Användarnamnet används redan"
-
-#: clientgui/AlreadyExistsPage.cpp:187
-msgid ""
-"An account with that username already exists and has a\n"
-"different password than the one you entered.\n"
-"\n"
-"Please visit the project's web site and follow the instructions there."
-msgstr ""
-"Ett konto med det användarnamnet finns redan och har ett\n"
-"annat lösenord än det du angav.\n"
-"\n"
-"Besök projektets webbplats och följ instruktionerna där."
-
-#: clientgui/AlreadyExistsPage.cpp:191
-msgid "Email address already in use"
-msgstr "E-postadressen används redan"
-
-#: 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"
-"\n"
-"Please visit the project's web site and follow the instructions there."
-msgstr ""
-"Ett konto med den e-postadressen används redan och har ett\n"
-"annat lösenord än det du angav.\n"
-"\n"
-"Besök projektets webbplats och följ instruktionerna där."
-
-#: clientgui/AsyncRPC.cpp:1031
-msgid "Communicating with BOINC client.  Please wait ..."
-msgstr "Kommunicerar med BOINC-klienten.  Vänligen vänta …"
-
-#: clientgui/AsyncRPC.cpp:1034
-#, c-format
-msgid "&Quit %s"
-msgstr "&Avbryt %s"
-
-# 87%
-# 100%
-#: clientgui/AsyncRPC.cpp:1036
-#, c-format
-msgid "E&xit %s"
-msgstr "&Avsluta %s"
-
-#: clientgui/AsyncRPC.cpp:1040
-#, c-format
-msgid "%s - Communication"
-msgstr "%s - Kommunikation"
-
-#: clientgui/AsyncRPC.cpp:1056
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: clientgui/BOINCBaseFrame.cpp:504
-#, c-format
-msgid "%s - Connection Error"
-msgstr "%s - Anslutningsfel"
-
-#: clientgui/BOINCBaseFrame.cpp:513
-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 ""
-"Du är för närvarande inte auktoriserad till att hantera klienten.\n"
-"Kontakta din systemadministratör för att bli tillagd till ”boinc_users” lokala användargrupp."
-
-#: clientgui/BOINCBaseFrame.cpp:522
-msgid ""
-"Authorization failed connecting to running client.\n"
-"Make sure you start this program in the same directory as the client."
-msgstr ""
-"Auktorisering misslyckades vid anslutning till körande klient.\n"
-"Säkerställ att du startade programmet i samma katalog som klienten."
-
-#: clientgui/BOINCBaseFrame.cpp:524
-msgid "Authorization failed connecting to running client."
-msgstr "Auktorisering misslyckades vid anslutning till körande klient."
-
-#: clientgui/BOINCBaseFrame.cpp:532
-msgid "The password you have provided is incorrect, please try again."
-msgstr "Det lösenord du angav är inte korrekt,prova igen."
-
-#: clientgui/BOINCBaseFrame.cpp:576
-#, c-format
-msgid "%s - Connection Failed"
-msgstr "%s - Anslutning misslyckades"
-
-#: clientgui/BOINCBaseFrame.cpp:585
-#, c-format
-msgid ""
-"%s is not able to connect to a %s client.\n"
-"Would you like to try to connect again?"
-msgstr ""
-"%s kan inte ansluta till en %s-klient.\n"
-"Vill du prova att ansluta igen?"
-
-#: clientgui/BOINCBaseFrame.cpp:621
-#, c-format
-msgid "%s - Daemon Start Failed"
-msgstr "%s - Demon kunde inte starta"
-
-#: clientgui/BOINCBaseFrame.cpp:631
-#, 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 kan inte starta en %s-klient.\n"
-"Starta Kontrollpanel->Administrativa verktyg->Tjänster och starta BOINC-tjänsten."
-
-#: clientgui/BOINCBaseFrame.cpp:637
-#, c-format
-msgid ""
-"%s is not able to start a %s client.\n"
-"Please start the daemon and try again."
-msgstr ""
-"%s kan inte starta en %s-klient.\n"
-"Starta demonen och prova igen."
-
-#: clientgui/BOINCBaseFrame.cpp:688
-#, c-format
-msgid "%s - Connection Status"
-msgstr "%s - Anslutningsstatus"
-
-#: clientgui/BOINCBaseFrame.cpp:699
-#, 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"
-"To connect up to your local computer please use 'localhost' as the host name."
-msgstr ""
-"%s är inte ansluten till en %s-klient.\n"
-"Välj ”Avancerat\\Välj dator...”-menyalternativet för att ansluta till en %s-klient.\n"
-"Använd ”localhost” som värdnamn för att ansluta till din lokala dator."
-
-#: clientgui/BOINCBaseView.cpp:752
-msgid "Project web pages"
-msgstr "Projektwebbsidor"
-
-#: clientgui/BOINCClientManager.cpp:573
-#, c-format
-msgid "%s - Unexpected Exit"
-msgstr "%s - Oväntat avslut"
-
-#: 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 ""
-"%s-klienten har tre gånger avslutat oväntat inom de %d senaste minuterna.\n"
-"Vill du prova att starta om den igen?"
-
-#: clientgui/BOINCDialupManager.cpp:61
-#, c-format
-msgid "%s - Network Status"
-msgstr "%s - Nätverkstatus"
-
-#: clientgui/BOINCDialupManager.cpp:241
-#, c-format
-msgid ""
-"%s needs to connect to the Internet.\n"
-"May it do so now?"
-msgstr ""
-"%s behöver ansluta till Internet.\n"
-"Får den göra det nu?"
-
-#: clientgui/BOINCDialupManager.cpp:254
-#, c-format
-msgid "%s is connecting to the Internet."
-msgstr "%s ansluter till Internet."
-
-#: clientgui/BOINCDialupManager.cpp:303
-#, c-format
-msgid "%s has successfully connected to the Internet."
-msgstr "%s lyckades med att ansluta till Internet."
-
-#: clientgui/BOINCDialupManager.cpp:331
-#, c-format
-msgid "%s failed to connect to the Internet."
-msgstr "%s kunde inte ansluta till Internet."
-
-#: 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 har upptäckt att den nu är ansluten till Internet.\n"
-"Uppdaterar alla projekt och försöker starta alla överföringar igen."
-
-#: clientgui/BOINCDialupManager.cpp:417
-#, c-format
-msgid "%s has successfully disconnected from the Internet."
-msgstr "%s har avbrutit anslutningen till Internet."
-
-#: clientgui/BOINCDialupManager.cpp:433
-#, c-format
-msgid "%s failed to disconnected from the Internet."
-msgstr "%s kunde inte avbryta anslutningen till Internet."
-
-#: clientgui/BOINCGUIApp.cpp:595
-#, c-format
-msgid ""
-"You currently are not authorized to manage the client.\n"
-"\n"
-"To run %s as this user, please:\n"
-"  - reinstall %s answering \"Yes\" to the question about\n"
-"     non-administrative users\n"
-" or\n"
-"  - contact your administrator to add you to the 'boinc_master'\n"
-"     user group."
-msgstr ""
-"Du är för närvarande inte auktoriserad till att hantera klienten.\n"
-"\n"
-"För att köra %s som denna användare vänligen:\n"
-"  - ominstallera %s och svara ”Ja” på frågan om \n"
-"    icke-administrativa användare\n"
-" eller\n"
-"  - kontakta din administratör för att bli tillagd till användargruppen\n"
-"    ”boinc_master”."
-
-#: clientgui/BOINCGUIApp.cpp:601
-#, c-format
-msgid ""
-"%s ownership or permissions are not set properly; please reinstall %s.\n"
-"(Error code %d"
-msgstr ""
-"Ägarskap eller rättigheter för %s är inte inställda korrekt; installera om %s.\n"
-"(Felkod %d"
-
-#: clientgui/BOINCGUIApp.cpp:607
-msgid " at "
-msgstr " vid "
-
-#: clientgui/BOINCGUIApp.cpp:610
-msgid ")"
-msgstr ")"
-
-#: clientgui/BOINCGUIApp.cpp:640
-msgid ""
-"A reboot is required in order for BOINC to run properly.\n"
-"Please reboot your computer and try again."
-msgstr ""
-"En omstart är nödvändig för att BOINC ska kunna köra korrekt.\n"
-"Starta om din dator och prova igen."
-
-#: clientgui/BOINCGUIApp.cpp:641
-msgid "BOINC Manager"
-msgstr "BOINC-hanteraren"
-
-#: clientgui/BOINCGUIApp.cpp:902
-msgid "BOINC Manager was started by the operating system automatically"
-msgstr "BOINC-hanteraren startades automatiskt av operativsystemet"
-
-#: clientgui/BOINCGUIApp.cpp:904
-msgid "Startup BOINC so only the system tray icon is visible"
-msgstr "Starta BOINC så att endast aktivitetsfältsikonen är synlig"
-
-#: clientgui/BOINCGUIApp.cpp:906
-msgid "Directory containing the BOINC Client executable"
-msgstr "Katalog innehållandes den körbara BOINC-klienten"
-
-#: clientgui/BOINCGUIApp.cpp:907
-msgid "BOINC data directory"
-msgstr "BOINC-datakatalog"
-
-#: clientgui/BOINCGUIApp.cpp:909
-msgid "Host name or IP address"
-msgstr "Värdnamn eller IP-adress"
-
-#: clientgui/BOINCGUIApp.cpp:910
-msgid "GUI RPC port number"
-msgstr "GUI RPC-portnummer"
-
-#: clientgui/BOINCGUIApp.cpp:911
-msgid "Password"
-msgstr "Lösenord"
-
-#: clientgui/BOINCGUIApp.cpp:912
-msgid "Startup BOINC with these optional arguments"
-msgstr "Starta BOINC med dessa valfria argument"
-
-#: clientgui/BOINCGUIApp.cpp:913
-msgid "disable BOINC security users and permissions"
-msgstr "inaktivera BOINC säkerhetsanvändare och rättigheter"
-
-#: clientgui/BOINCGUIApp.cpp:914
-msgid "set skin debugging mode to enable skin manager error messages"
-msgstr "ställ in felsökningsläge för tema för att aktivera temahanterarens felmeddelanden"
-
-#: clientgui/BOINCGUIApp.cpp:915
-msgid "multiple instances of BOINC Manager allowed"
-msgstr "flera instanser av BOINC-hanteraren tillåten"
-
-#: clientgui/BOINCGUIApp.cpp:917
-msgid "Not used: workaround for bug in XCode 4.2"
-msgstr "Inte använd: temporär lösning för bugg i XCode 4.2"
-
-#: clientgui/BOINCGUIApp.cpp:1164
-msgid "(Automatic Detection)"
-msgstr "(Upptäck automatiskt)"
-
-#: clientgui/BOINCGUIApp.cpp:1165
-msgid "(Unknown)"
-msgstr "(Okänd)"
-
-#: clientgui/BOINCGUIApp.cpp:1166
-msgid "(User Defined)"
-msgstr "(Användardefinierad)"
-
-#: clientgui/BOINCTaskBar.cpp:522
-#, c-format
-msgid "Open %s Web..."
-msgstr "Öppna %s webb…"
-
-#: clientgui/BOINCTaskBar.cpp:529
-#, c-format
-msgid "Open %s..."
-msgstr "Öppna %s…"
-
-#: clientgui/BOINCTaskBar.cpp:536
-#: clientgui/BOINCTaskBar.cpp:633
-#: clientgui/BOINCTaskBar.cpp:641
-msgid "Snooze"
-msgstr "Aktivera viloläge"
-
-#: clientgui/BOINCTaskBar.cpp:538
-#: clientgui/BOINCTaskBar.cpp:660
-#: clientgui/BOINCTaskBar.cpp:668
-msgid "Snooze GPU"
-msgstr "Aktivera GPU-viloläge"
-
-#: clientgui/BOINCTaskBar.cpp:556
-msgid "E&xit"
-msgstr "&Avsluta"
-
-#: clientgui/BOINCTaskBar.cpp:626
-msgid "Resume"
-msgstr "Återuppta"
-
-#: clientgui/BOINCTaskBar.cpp:653
-msgid "Resume GPU"
-msgstr "Återuppta GPU"
-
-#: clientgui/BOINCTaskBar.cpp:727
-msgid "Computing is enabled"
-msgstr "Beräkning är aktiverad"
-
-#: clientgui/BOINCTaskBar.cpp:731
-msgid "Computing is suspended - "
-msgstr "Beräkning är i vänteläge - "
-
-#: clientgui/BOINCTaskBar.cpp:741
-msgid "GPU computing is enabled"
-msgstr "GPU-beräkning är aktiverad"
-
-#: clientgui/BOINCTaskBar.cpp:744
-msgid "GPU computing is suspended - "
-msgstr "GPU-beräkning är i vänteläge - "
-
-#: clientgui/BOINCTaskBar.cpp:753
-msgid "Network is enabled"
-msgstr "Nätverk är aktiverat"
-
-#: clientgui/BOINCTaskBar.cpp:756
-msgid "Network is suspended - "
-msgstr "Nätverk är i vänteläge - "
-
-#: clientgui/BOINCTaskBar.cpp:764
-msgid "Reconnecting to client."
-msgstr "Återansluter till klient."
-
-#: clientgui/BOINCTaskBar.cpp:766
-msgid "Not connected to a client."
-msgstr "Inte ansluten till en klient."
-
-#: clientgui/BOINCTaskBar.cpp:819
-#, c-format
-msgid "%s Notices"
-msgstr "%s meddelanden"
-
-#: clientgui/BOINCTaskBar.cpp:825
-msgid "There are new notices - click to view."
-msgstr "Det finns nya meddelanden - klicka för att visa."
-
-#: clientgui/CompletionErrorPage.cpp:199
-msgid "Failed to add project"
-msgstr "Misslyckades med att lägga till projekt"
-
-#: clientgui/CompletionErrorPage.cpp:204
-msgid "Failed to update account manager"
-msgstr "Misslyckades med att uppdatera kontohanterare"
-
-#: clientgui/CompletionErrorPage.cpp:208
-msgid "Failed to remove account manager"
-msgstr "Misslyckades med att ta bort kontohanterare"
-
-#: clientgui/CompletionErrorPage.cpp:212
-msgid "Failed to add account manager"
-msgstr "Misslyckades med att lägga till kontohanterare"
-
-#: clientgui/CompletionErrorPage.cpp:221
-msgid ""
-"Please try again later.\n"
-"\n"
-"Click Finish to close."
-msgstr ""
-"Prova igen senare.\n"
-"\n"
-"Klicka Avsluta för att stänga."
-
-#: clientgui/CompletionErrorPage.cpp:225
-#: clientgui/CompletionPage.cpp:222
-#: clientgui/CompletionPage.cpp:242
-#: clientgui/CompletionPage.cpp:273
-msgid "Click Finish to close."
-msgstr "Välj Avsluta för att stänga."
-
-#: clientgui/CompletionErrorPage.cpp:234
-msgid "Messages from server:"
-msgstr "Meddelanden från server:"
-
-#: clientgui/CompletionPage.cpp:207
-msgid "Project added"
-msgstr "Projekt tillagt"
-
-#: clientgui/CompletionPage.cpp:213
-msgid "This project has been successfully added."
-msgstr "Projektet lades till."
-
-#: 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 ""
-"När du klickat på Avsluta kommer din webbläsare att ta dig till en sida där\n"
-"du kan ställa in ditt kontonamn och andra inställningar."
-
-#: clientgui/CompletionPage.cpp:232
-#, c-format
-msgid "Update from %s completed."
-msgstr "Uppdatering från %s slutförd."
-
-#: clientgui/CompletionPage.cpp:236
-msgid "Update completed."
-msgstr "Uppdatering slutförd."
-
-#: clientgui/CompletionPage.cpp:247
-msgid "Now using account manager"
-msgstr "Använder nu kontohanteraren"
-
-#: clientgui/CompletionPage.cpp:252
-#, c-format
-msgid "Welcome to %s!"
-msgstr "Välkommen till %s!"
-
-#: clientgui/CompletionPage.cpp:263
-#, c-format
-msgid "You are now using %s to manage accounts."
-msgstr "Du använder nu %s för att hantera konton."
-
-#: clientgui/CompletionPage.cpp:267
-msgid "You are now using this account manager."
-msgstr "Du använder nu denna kontohanterare."
-
-#: clientgui/DlgAbout.cpp:113
-#, c-format
-msgid "About %s"
-msgstr "Om %s"
-
-#: clientgui/DlgAbout.cpp:172
-msgid "Version:"
-msgstr "Version:"
-
-#: clientgui/DlgAbout.cpp:180
-msgid "wxWidgets Version:"
-msgstr "wxWidgets-version:"
-
-#: clientgui/DlgAbout.cpp:188
-msgid "Copyright:"
-msgstr "Upphovsrätt:"
-
-#: clientgui/DlgAbout.cpp:192
-msgid ""
-"(C) 2003-2014 University of California, Berkeley.\n"
-"All Rights Reserved."
-msgstr ""
-"(C) 2003-2014 University of California, Berkeley.\n"
-"Alla rättigheter förbehållna."
-
-#: clientgui/DlgAbout.cpp:196
-msgid "Berkeley Open Infrastructure for Network Computing"
-msgstr "Berkeley Open Infrastructure for Network Computing"
-
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:399
-#: clientgui/DlgSelectComputer.cpp:163
-msgid "&OK"
-msgstr "&OK"
-
-#: clientgui/DlgAdvPreferences.cpp:602
-msgid "invalid number"
-msgstr "ogiltigt tal"
-
-#: clientgui/DlgAdvPreferences.cpp:603
-msgid "invalid time, format is HH:MM"
-msgstr "ogiltig tid, formatet är HH:MM"
-
-#: clientgui/DlgAdvPreferences.cpp:604
-msgid "invalid time interval, format is HH:MM-HH:MM"
-msgstr "ogiltigt tidsintervall, formatet är HH:MM-HH:MM"
-
-#: clientgui/DlgAdvPreferences.cpp:817
-msgid "invalid input value detected"
-msgstr "ogiltigt inmatningsvärde upptäckt"
-
-#: clientgui/DlgAdvPreferences.cpp:819
-msgid "Validation Error"
-msgstr "Valideringsfel"
-
-#: clientgui/DlgAdvPreferences.cpp:969
-#: clientgui/DlgAdvPreferences.cpp:975
-#: clientgui/DlgAdvPreferences.cpp:981
-msgid "Applications to add"
-msgstr "Program att lägga till"
-
-#: clientgui/DlgAdvPreferences.cpp:998
-#, c-format
-msgid "'%s' is not an executable application."
-msgstr "”%s” är inte ett körbart program."
-
-#: clientgui/DlgAdvPreferences.cpp:999
-#: clientgui/DlgAdvPreferences.cpp:1046
-#: clientgui/DlgAdvPreferences.cpp:1070
-msgid "Add Exclusive App"
-msgstr "Lägg till exklusivt program"
-
-#: clientgui/DlgAdvPreferences.cpp:1011
-msgid "Name of application to add?"
-msgstr "Namn på programmet som ska läggas till?"
-
-#: clientgui/DlgAdvPreferences.cpp:1011
-msgid "Add exclusive app"
-msgstr "Lägg till exklusivt program"
-
-#: clientgui/DlgAdvPreferences.cpp:1045
-#, c-format
-msgid "Application names must end with '%s'"
-msgstr "Programnamn måste sluta med ”%s”"
-
-#: clientgui/DlgAdvPreferences.cpp:1069
-#, c-format
-msgid "'%s' is already in the list."
-msgstr "”%s” finns redan i listan."
-
-#: clientgui/DlgAdvPreferences.cpp:1161
-msgid ""
-"Do you really want to clear all local preferences?\n"
-"(This will not affect exclusive applications.)"
-msgstr ""
-"Vill du verkligen ta bort alla lokala inställningar?\n"
-"(Det kommer inte att påverka exklusiva program.)"
-
-#: clientgui/DlgAdvPreferences.cpp:1162
-msgid "Confirmation"
-msgstr "Bekräftelse"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:49
-#, c-format
-msgid "%s - Computing preferences"
-msgstr "%s - Beräkningsinställningar"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:66
-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 ""
-"Denna dialog kontrollerar endast inställningarna för denna dator.\n"
-"Välj OK för att ställa in inställningar.\n"
-"Välj Rensa för att återställa webbaserade inställningar (förutom exklusiva program)."
-
-#: clientgui/DlgAdvPreferencesBase.cpp:69
-msgid "Clear"
-msgstr "Rensa"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:70
-msgid "clear all local preferences and close the dialog"
-msgstr "rensa alla lokala inställningar och stäng dialogen"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:85
-msgid "processor usage"
-msgstr "processoranvändning"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:88
-msgid "network usage"
-msgstr "nätverksanvändning"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:91
-msgid "disk and memory usage"
-msgstr "disk- och minnesanvändning"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:94
-msgid "exclusive applications"
-msgstr "exklusiva program"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:107
-#: clientgui/DlgDiagnosticLogFlags.cpp:104
-msgid "OK"
-msgstr "OK"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:108
-msgid "save all values and close the dialog"
-msgstr "spara alla värden och stäng dialogen"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:114
-msgid "close the dialog without saving"
-msgstr "stäng dialogen utan att spara"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:118
-#: clientgui/Localization.cpp:35
-#: clientgui/Localization.cpp:121
-#: clientgui/Localization.cpp:139
-msgid "Help"
-msgstr "Hjälp"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:119
-msgid "shows the preferences web page"
-msgstr "visa inställningswebbsidan"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:141
-msgid "Computing allowed"
-msgstr "Beräkningar tilllåtna"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:146
-msgid "While computer is on batteries"
-msgstr "Då datorn går på batterier"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:149
-msgid "check this if you want this computer to do work while it runs on batteries"
-msgstr "markera denna om du vill att denna dator ska utföra jobb då den går på batterier"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:155
-msgid "While computer is in use"
-msgstr "Medan datorn används"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:158
-msgid "check this if you want this computer to do work even when you're using it"
-msgstr "markera denna om du vill att datorn ska utföra jobb även när du använder den"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:164
-msgid "Use GPU while computer is in use"
-msgstr "Använd GPU då datorn används"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:167
-msgid "check this if you want your GPU to do work even when you're using the computer"
-msgstr "markera denna om du vill att din GPU ska utföra jobb även när du använder datorn"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:179
-msgid "Only after computer has been idle for"
-msgstr "Bara efter att datorn har varit oanvänd i"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:188
-msgid "do work only after you haven't used the computer for this number of minutes"
-msgstr "utför jobb bara om du inte har använt datorn för detta antal minuter"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:193
-#: clientgui/DlgAdvPreferencesBase.cpp:342
-msgid "minutes"
-msgstr "minuter"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:212
-msgid "While processor usage is less than"
-msgstr "Då processoranvändning är mindre än"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:221
-msgid "suspend work if processor usage exceeds this level"
-msgstr "försätt jobb i vänteläge om processoranvändning överstiger denna nivå"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:226
-msgid "percent (0 means no restriction)"
-msgstr "procent (0 betyder ingen begränsning)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:240
-#: clientgui/DlgAdvPreferencesBase.cpp:506
-msgid "Every day between hours of"
-msgstr "Varje dag mellan"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:244
-msgid "start work at this time"
-msgstr "starta jobb denna tid"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:248
-#: clientgui/DlgAdvPreferencesBase.cpp:514
-msgid "and"
-msgstr "och"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:252
-msgid "stop work at this time"
-msgstr "stoppa jobb vid denna tid"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:256
-#: clientgui/DlgAdvPreferencesBase.cpp:522
-msgid "(no restriction if equal)"
-msgstr "(ingen begränsning om likadan)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:261
-#: clientgui/DlgAdvPreferencesBase.cpp:527
-msgid "Day-of-week override:"
-msgstr "Åsidosätt veckodag:"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:266
-#: clientgui/DlgAdvPreferencesBase.cpp:532
-msgid "check box to specify hours for this day of week"
-msgstr "markera ruta för att ange timmar för denna veckodag"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:272
-#: clientgui/DlgAdvPreferencesBase.cpp:538
-msgid "Monday"
-msgstr "Måndag"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:279
-#: clientgui/DlgAdvPreferencesBase.cpp:545
-msgid "Tuesday"
-msgstr "Tisdag"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:286
-#: clientgui/DlgAdvPreferencesBase.cpp:552
-msgid "Wednesday"
-msgstr "Onsdag"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:293
-#: clientgui/DlgAdvPreferencesBase.cpp:559
-msgid "Thursday"
-msgstr "Torsdag"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:300
-#: clientgui/DlgAdvPreferencesBase.cpp:566
-msgid "Friday"
-msgstr "Fredag"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:307
-#: clientgui/DlgAdvPreferencesBase.cpp:573
-msgid "Saturday"
-msgstr "Lördag"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:580
-msgid "Sunday"
-msgstr "Söndag"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:328
-msgid "Other options"
-msgstr "Andra alternativ"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:336
-msgid "Switch between applications every"
-msgstr "Växla mellan program var"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:345
-msgid "On multiprocessor systems, use at most"
-msgstr "% av processorerna (0 betyder ingen begränsning)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:352
-#, no-c-format
-msgid "% of the processors (0 means no restriction)"
-msgstr "% av processorerna (0 betyder ingen begränsning)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:355
-#: clientgui/DlgAdvPreferencesBase.cpp:618
-#: clientgui/DlgAdvPreferencesBase.cpp:640
-#: clientgui/DlgAdvPreferencesBase.cpp:661
-#: clientgui/DlgAdvPreferencesBase.cpp:683
-#: clientgui/DlgAdvPreferencesBase.cpp:694
-msgid "Use at most"
-msgstr "Använd som mest"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:362
-#, no-c-format
-msgid "% of CPU time (0 means no restriction)"
-msgstr "% av CPU-tid (0 betyder ingen begränsning)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:386
-msgid "General options"
-msgstr "Allmänna alternativ"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:395
-msgid "Maximum download rate"
-msgstr "Maximal hämtningshastighet"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:401
-#: clientgui/DlgAdvPreferencesBase.cpp:410
-msgid "KBytes/second (0 means no restriction)"
-msgstr "KByte/sekund (0 betyder ingen begränsning)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:404
-msgid "Maximum upload rate"
-msgstr "Maximal sändninghastighet"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:417
-msgid "Minimum work buffer"
-msgstr "Minsta jobbuffert"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:425
-msgid "Try to maintain enough tasks to keep busy for this many days"
-msgstr "Försök att upprätthålla tillräckligt med uppgifter för att vara upptagen i så här många dagar"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:431
-#: clientgui/DlgAdvPreferencesBase.cpp:449
-msgid "days (maximum value: 10)"
-msgstr "dagar (högsta värde: 10)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:437
-msgid "Max additional work buffer"
-msgstr "Max buffert för extrajobb"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:445
-msgid "In addition, maintain enough tasks for up to this many days"
-msgstr "Håll uppgifter i kö för upp till så här många dagar"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:454
-msgid "Transfer at most"
-msgstr "Överför som mest"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:462
-msgid "MBytes every"
-msgstr "MByte var"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:468
-msgid "days (0 means no restriction)"
-msgstr "dagar (0 betyder ingen begränsning)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:476
-msgid "Skip image file verification"
-msgstr "Hoppa över verifiering av bildfiler"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:478
-msgid "check this if your Internet provider modifies image files"
-msgstr "markera om din internetleverantör ändrar bildfiler"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:484
-msgid "Connect options"
-msgstr "Anslutningsalternativ"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:487
-msgid "Confirm before connecting to internet"
-msgstr "Bekräfta innan anslutning till internet sker"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:489
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
-msgstr "om markerad kommer en bekräftelsedialog att visas innan anslutning till internet sker"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:493
-msgid "Disconnect when done"
-msgstr "Avbryt anslutning när klar"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:495
-msgid ""
-"if checked, BOINC hangs up when network usage is done\n"
-"(only relevant for dialup-connection)"
-msgstr ""
-"om markerad kommer BOINC att lägga på när nätverksanvändning är klar\n"
-"(endast relevant för uppringda anslutningar)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:501
-msgid "Network usage allowed"
-msgstr "Nätverksanvändning tillåten"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:510
-msgid "network usage start hour"
-msgstr "starttimme för nätverksanvändning"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:518
-msgid "network usage stop hour"
-msgstr "stopptimme för nätverksanvändning"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:610
-#: clientgui/DlgItemProperties.cpp:257
-msgid "Disk usage"
-msgstr "Diskanvändning"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:622
-msgid "the maximum disk space used by BOINC (in Gigabytes)"
-msgstr "maximala diskutrymmet använt av BOINC (i Gigabyte)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:626
-msgid "Gigabytes disk space (0 means no restriction)"
-msgstr "Gigabyte diskutrymme (0 betyder ingen begränsning)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:629
-msgid "Leave at least"
-msgstr "Lämna åtminstone"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:633
-msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
-msgstr "BOINC lämnar åtminstone detta diskutrymme (i Gigabyte)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:637
-msgid "Gigabytes disk space free"
-msgstr "Gigabyte diskutrymme fritt"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:644
-msgid "BOINC uses at most this percentage of total disk space"
-msgstr "BOINC använder som mest dessa procent av det totala diskutrymmet"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:649
-#, no-c-format
-msgid "% of total disk space"
-msgstr "% av totalt diskutrymme"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:652
-msgid "Tasks checkpoint to disk at most every"
-msgstr "Uppgifter spar kontrollpunkter på disk som mest var"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:658
-msgid "seconds"
-msgstr "sekunder"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:668
-#, no-c-format
-msgid "% of page file (swap space)"
-msgstr "% av växlingsfil (växlingsutrymme)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:675
-msgid "Memory usage"
-msgstr "Minnesanvändning"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:691
-#, no-c-format
-msgid "% when computer is in use"
-msgstr "% när datorn används"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:701
-#, no-c-format
-msgid "% when computer is idle"
-msgstr "% när datorn inte används"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:706
-msgid "Leave applications in memory while suspended"
-msgstr "Lämna program i minnet medan försatt i vänteläge"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:708
-msgid "if checked, suspended work units are left in memory"
-msgstr "om markerad lämnas jobbenheter i viloläge kvar i minnet"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:728
-msgid "Suspend processor and network usage when these applications are running:"
-msgstr "Försätt processorer och nätverksanvändning i viloläge i när dessa program körs:"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:738
-msgid "Add..."
-msgstr "Lägg till…"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:739
-msgid "Add an application to this list"
-msgstr "Lägg till ett program till denna lista"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:744
-msgid "Remove"
-msgstr "Ta bort"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:745
-msgid "Remove an application from this list"
-msgstr "Ta bort ett program från listan"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:754
-msgid "For advanced options, refer to "
-msgstr "För avancerade alternativ, se "
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:65
-#, c-format
-msgid "%s Diagnostic Log Flags"
-msgstr "%s Diagnostiska loggflaggor"
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:83
-msgid "These flags enable various types of diagnostic messages in the Event Log."
-msgstr "Dessa flaggor aktiverar olika typer av diagnostiska meddelanden i händelseloggen."
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:105
-msgid "Save all values and close the dialog"
-msgstr "Spara alla värden och stäng dialogen"
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:108
-msgid "Defaults"
-msgstr "Standardvärden"
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:109
-msgid "Restore default settings"
-msgstr "Återställ standardinställningar"
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:113
-msgid "Close the dialog without saving"
-msgstr "Stäng dialogrutan utan att spara"
-
-#: clientgui/DlgEventLog.cpp:226
-#, c-format
-msgid "%s - Event Log"
-msgstr "%s - Händelselogg"
-
-#: clientgui/DlgEventLog.cpp:236
-msgid "Project"
-msgstr "Projekt"
-
-#: clientgui/DlgEventLog.cpp:237
-msgid "Time"
-msgstr "Tid"
-
-#: clientgui/DlgEventLog.cpp:238
-msgid "Message"
-msgstr "Meddelande"
-
-#: clientgui/DlgEventLog.cpp:300
-#: clientgui/DlgEventLog.cpp:364
-msgid "&Show only this project"
-msgstr "&Visa bara detta projekt"
-
-#: clientgui/DlgEventLog.cpp:304
-msgid "Copy &All"
-msgstr "Kopiera &alla"
-
-#: clientgui/DlgEventLog.cpp:306
-#: clientgui/DlgEventLog.cpp:310
-msgid "Copy all the messages to the clipboard."
-msgstr "Kopiera alla meddelanden till urklipp."
-
-#: clientgui/DlgEventLog.cpp:315
-msgid "Copy &Selected"
-msgstr "Kopiera &markerade"
-
-#: clientgui/DlgEventLog.cpp:318
-#: clientgui/DlgEventLog.cpp:326
-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 "Kopiera markerade meddelanden till urklipp. Du kan välja flera meddelanden genom att hålla nere skift- eller kontrolltangenten när du klickar på meddelanden."
-
-#: clientgui/DlgEventLog.cpp:320
-#: clientgui/DlgEventLog.cpp:328
-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 "Kopiera markerade meddelanden till urklipp. Du kan välja flera meddelanden genom att hålla nere skift- eller kontrolltangenten när du klickar på meddelanden."
-
-#: clientgui/DlgEventLog.cpp:335
-#: clientgui/DlgItemProperties.cpp:67
-msgid "&Close"
-msgstr "&Stäng"
-
-#: clientgui/DlgEventLog.cpp:344
-#, c-format
-msgid "Get help with %s"
-msgstr "Få hjälp med %s"
-
-#: clientgui/DlgEventLog.cpp:358
-msgid "Show all &messages"
-msgstr "Visa alla &meddelanden"
-
-#: clientgui/DlgEventLog.cpp:359
-#: clientgui/DlgEventLog.cpp:361
-msgid "Show messages for all projects"
-msgstr "Visa meddelanden för alla projekt"
-
-#: clientgui/DlgEventLog.cpp:365
-#: clientgui/DlgEventLog.cpp:367
-msgid "Show only the messages for the selected project"
-msgstr "Visa endast meddelanden för det markerade projektet"
-
-#: clientgui/DlgExitMessage.cpp:82
-#, c-format
-msgid "%s - Exit Confirmation"
-msgstr "%s - Avslutningsbekräftelse"
-
-#: clientgui/DlgExitMessage.cpp:130
-#, c-format
-msgid ""
-"You have requested to exit the %s,\n"
-"which allows you to view and manage\n"
-"the tasks running on your computer.\n"
-"\n"
-"If you also want to stop running the tasks,\n"
-"choose from the following options:"
-msgstr ""
-"Du har begärt att avsluta %s,\n"
-"som tillåter dig att se och hantera\n"
-"uppgifterna som kör på din dator.\n"
-"\n"
-"Om du också vill avsluta själva uppgifterna\n"
-"kan du välja mellan följande:"
-
-#: clientgui/DlgExitMessage.cpp:135
-#, c-format
-msgid ""
-"This will shut down %s and its tasks until either the\n"
-"%s or the %s screen saver is run again.\n"
-"\n"
-"In most cases, it is better just to close the %s window\n"
-"rather than to exit the application; that will allow %s to run its\n"
-"tasks at the times you selected in your preferences."
-msgstr ""
-"Detta kommer att stänga ned %s och dess uppgifter till antingen\n"
-"%s eller %s-skärmsläckaren körs igen.\n"
-"\n"
-"I de flesta fall är det bättre att bara stänga %s-fönstret\n"
-"istället för att avsluta programmet; det tillåter %s att köra\n"
-"sina uppgifter de tider du valt i dina inställningar."
-
-#: clientgui/DlgExitMessage.cpp:153
-#, c-format
-msgid "Stop running tasks when exiting the %s"
-msgstr "Sluta att köra uppgifter när %s avslutas"
-
-#: clientgui/DlgExitMessage.cpp:165
-msgid "Remember this decision and do not show this dialog."
-msgstr "Kom ihåg detta val och visa inte denna dialog."
-
-#: clientgui/DlgExitMessage.cpp:178
-#: clientgui/DlgGenericMessage.cpp:125
-#: clientgui/DlgOptions.cpp:404
-#: clientgui/DlgSelectComputer.cpp:168
-msgid "&Cancel"
-msgstr "&Avbryt"
-
-#: clientgui/DlgGenericMessage.cpp:112
-msgid "Don't show this dialog again."
-msgstr "Visa inte denna dialog igen."
-
-#: clientgui/DlgItemProperties.cpp:194
-#: clientgui/DlgItemProperties.cpp:197
-#: clientgui/DlgItemProperties.cpp:200
-#: clientgui/DlgItemProperties.cpp:203
-msgid "Don't fetch tasks for "
-msgstr "Hämta inte uppgifter för "
-
-#: clientgui/DlgItemProperties.cpp:194
-msgid "Project preference"
-msgstr "Projektinställning"
-
-#: clientgui/DlgItemProperties.cpp:197
-msgid "Account manager preference"
-msgstr "Inställningar för kontohanteraren"
-
-#: clientgui/DlgItemProperties.cpp:200
-msgid "Project has no apps for "
-msgstr "Projekt har inga program för "
-
-#: clientgui/DlgItemProperties.cpp:203
-msgid "Client configuration excludes "
-msgstr "Klientkonfiguration utesluter "
-
-#: clientgui/DlgItemProperties.cpp:207
-msgid " work fetch deferred for"
-msgstr " jobbhämtning uppskjuten för"
-
-#: clientgui/DlgItemProperties.cpp:208
-msgid " work fetch deferral interval"
-msgstr " uppskjutningsintervall för jobbhämtning"
-
-#: clientgui/DlgItemProperties.cpp:239
-msgid "Properties of project "
-msgstr "Projektegenskaper "
-
-#: clientgui/DlgItemProperties.cpp:243
-#: clientgui/DlgOptions.cpp:221
-msgid "General"
-msgstr "Allmänt"
-
-#: clientgui/DlgItemProperties.cpp:244
-msgid "Master URL"
-msgstr "Huvud-URL"
-
-#: clientgui/DlgItemProperties.cpp:245
-msgid "User name"
-msgstr "Användarnamn"
-
-#: clientgui/DlgItemProperties.cpp:246
-msgid "Team name"
-msgstr "Lagnamn"
-
-#: clientgui/DlgItemProperties.cpp:247
-msgid "Resource share"
-msgstr "Resursfördelning"
-
-#: clientgui/DlgItemProperties.cpp:249
-msgid "Scheduler RPC deferred for"
-msgstr "SchemaläggarRPC uppskjuten för"
-
-#: clientgui/DlgItemProperties.cpp:252
-msgid "File downloads deferred for"
-msgstr "Filhämtningar uppskjutna för"
-
-#: clientgui/DlgItemProperties.cpp:255
-msgid "File uploads deferred for"
-msgstr "Filsändningar uppskjutna för"
-
-#: clientgui/DlgItemProperties.cpp:258
-msgid "Computer ID"
-msgstr "Dator-ID"
-
-#: clientgui/DlgItemProperties.cpp:260
-msgid "Non CPU intensive"
-msgstr "Icke CPU-intensiv"
-
-#: 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 "ja"
-
-#: clientgui/DlgItemProperties.cpp:262
-msgid "Suspended via GUI"
-msgstr "Vänteläge via GUI"
-
-#: clientgui/DlgItemProperties.cpp:262
-#: clientgui/DlgItemProperties.cpp:263
-msgid "no"
-msgstr "nej"
-
-#: clientgui/DlgItemProperties.cpp:263
-msgid "Don't request more work"
-msgstr "Begär inte mer jobb"
-
-#: clientgui/DlgItemProperties.cpp:265
-msgid "Scheduler call in progress"
-msgstr "Schemaläggaranrop pågår"
-
-#: clientgui/DlgItemProperties.cpp:268
-msgid "Trickle-up pending"
-msgstr "Flöde väntar"
-
-#: clientgui/DlgItemProperties.cpp:271
-#: clientgui/DlgItemProperties.cpp:273
-msgid "Host location"
-msgstr "Värdplats"
-
-#: clientgui/DlgItemProperties.cpp:273
-msgid "default"
-msgstr "standard"
-
-#: clientgui/DlgItemProperties.cpp:277
-msgid "Added via account manager"
-msgstr "Tillagd via kontohanterare"
-
-#: clientgui/DlgItemProperties.cpp:280
-msgid "Remove when tasks done"
-msgstr "Ta bort när uppgifter är avklarade"
-
-#: clientgui/DlgItemProperties.cpp:283
-msgid "Ended"
-msgstr "Avslutad"
-
-#: clientgui/DlgItemProperties.cpp:285
-msgid "Tasks completed"
-msgstr "Uppgifter färdiga"
-
-#: clientgui/DlgItemProperties.cpp:286
-msgid "Tasks failed"
-msgstr "Uppgifter misslyckades"
-
-#: clientgui/DlgItemProperties.cpp:288
-msgid "Credit"
-msgstr "Poäng"
-
-#: clientgui/DlgItemProperties.cpp:289
-msgid "User"
-msgstr "Användare"
-
-#: clientgui/DlgItemProperties.cpp:296
-msgid "Host"
-msgstr "Värd"
-
-#: clientgui/DlgItemProperties.cpp:305
-msgid "Scheduling"
-msgstr "Schemalägger"
-
-#: clientgui/DlgItemProperties.cpp:306
-msgid "Scheduling priority"
-msgstr "Schemalägger prioritet"
-
-#: clientgui/DlgItemProperties.cpp:307
-msgid "CPU"
-msgstr "CPU"
-
-#: clientgui/DlgItemProperties.cpp:331
-msgid "Duration correction factor"
-msgstr "Tidkorrigeringsfaktor"
-
-#: clientgui/DlgItemProperties.cpp:345
-msgid "Properties of task "
-msgstr "Egenskaper för uppgift "
-
-#: clientgui/DlgItemProperties.cpp:357
-msgid "Application"
-msgstr "Program"
-
-#: clientgui/DlgItemProperties.cpp:358
-msgid "Name"
-msgstr "Namn"
-
-#: clientgui/DlgItemProperties.cpp:359
-msgid "State"
-msgstr "Tillstånd"
-
-#: clientgui/DlgItemProperties.cpp:362
-msgid "Received"
-msgstr "Mottagit"
-
-#: clientgui/DlgItemProperties.cpp:365
-msgid "Report deadline"
-msgstr "Rapporteringstidsgräns"
-
-#: clientgui/DlgItemProperties.cpp:367
-msgid "Resources"
-msgstr "Resurser"
-
-#: clientgui/DlgItemProperties.cpp:370
-msgid "Estimated computation size"
-msgstr "Förväntad beräkningsstorlek"
-
-#: clientgui/DlgItemProperties.cpp:373
-msgid "CPU time at last checkpoint"
-msgstr "CPU-tid vid senaste kontrollpunkten"
-
-#: clientgui/DlgItemProperties.cpp:374
-#: clientgui/DlgItemProperties.cpp:389
-msgid "CPU time"
-msgstr "CPU-tid"
-
-#: clientgui/DlgItemProperties.cpp:376
-#: clientgui/DlgItemProperties.cpp:390
-msgid "Elapsed time"
-msgstr "Förfluten tid"
-
-#: clientgui/DlgItemProperties.cpp:378
-msgid "Estimated time remaining"
-msgstr "Beräknad kvarvarande tid"
-
-#: clientgui/DlgItemProperties.cpp:379
-msgid "Fraction done"
-msgstr "Procentdel klar"
-
-#: clientgui/DlgItemProperties.cpp:380
-msgid "Virtual memory size"
-msgstr "Storlek på virtuella minnet"
-
-#: clientgui/DlgItemProperties.cpp:381
-msgid "Working set size"
-msgstr "Storlek på uppgift"
-
-#: clientgui/DlgItemProperties.cpp:383
-msgid "Directory"
-msgstr "Katalog"
-
-#: clientgui/DlgItemProperties.cpp:386
-msgid "Process ID"
-msgstr "Process-ID"
-
-#: clientgui/DlgItemProperties.cpp:456
-msgid "Local: "
-msgstr "Lokal: "
-
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
-msgid "Options"
-msgstr "Alternativ"
-
-#: clientgui/DlgOptions.cpp:178
-msgid "Language:"
-msgstr "Språk:"
-
-#: clientgui/DlgOptions.cpp:185
-msgid "What language should BOINC use?"
-msgstr "Vilket språk ska BOINC använda?"
-
-#: clientgui/DlgOptions.cpp:189
-msgid "Notice reminder interval:"
-msgstr "Intervall för påminnelse om meddelanden:"
-
-#: clientgui/DlgOptions.cpp:196
-msgid "How often should BOINC remind you of new notices?"
-msgstr "Hur ofta ska BOINC påminna dig om nya meddelanden?"
-
-#: clientgui/DlgOptions.cpp:201
-msgid "Run Manager at login?"
-msgstr "Kör hanteraren vid inloggning?"
-
-#: clientgui/DlgOptions.cpp:207
-msgid "Run the BOINC Manager when you log on."
-msgstr "Kör BOINC-hanteraren när du loggar in."
-
-#: clientgui/DlgOptions.cpp:212
-msgid "Enable Manager exit dialog?"
-msgstr "Aktivera dialog vid hanterarens avslut?"
-
-#: clientgui/DlgOptions.cpp:218
-msgid "Display the exit dialog when shutting down the Manager."
-msgstr "Visa avslutningsdialog när hanteraren stängs ned."
-
-#: clientgui/DlgOptions.cpp:229
-msgid "Dial-up and Virtual Private Network settings"
-msgstr "Ring upp- och VPN-inställningar"
-
-#: clientgui/DlgOptions.cpp:243
-msgid "&Set Default"
-msgstr "&Sätt standard"
-
-#: clientgui/DlgOptions.cpp:248
-msgid "&Clear Default"
-msgstr "&Rensa standard"
-
-#: clientgui/DlgOptions.cpp:255
-msgid "Default Connection:"
-msgstr "Standardanslutning:"
-
-#: clientgui/DlgOptions.cpp:262
-msgid "Connections"
-msgstr "Anslutningar"
-
-#: clientgui/DlgOptions.cpp:271
-msgid "Connect via HTTP proxy server"
-msgstr "Anslut via HTTP-proxyserver"
-
-#: clientgui/DlgOptions.cpp:275
-msgid "HTTP Proxy Server Configuration"
-msgstr "Konfiguration av HTTP-proxyserver"
-
-#: clientgui/DlgOptions.cpp:283
-#: clientgui/DlgOptions.cpp:347
-msgid "Address:"
-msgstr "Adress:"
-
-#: clientgui/DlgOptions.cpp:291
-#: clientgui/DlgOptions.cpp:355
-msgid "Port:"
-msgstr "Port:"
-
-#: clientgui/DlgOptions.cpp:299
-#: clientgui/DlgOptions.cpp:363
-msgid "Don't use proxy for:"
-msgstr "Använd inte proxy för:"
-
-#: clientgui/DlgOptions.cpp:306
-#: clientgui/DlgOptions.cpp:370
-msgid "Leave these blank if not needed"
-msgstr "Lämna dessa tomma om de inte behövs"
-
-#: clientgui/DlgOptions.cpp:312
-#: clientgui/DlgOptions.cpp:376
-msgid "User Name:"
-msgstr "Användarnamn:"
-
-#: clientgui/DlgOptions.cpp:320
-#: clientgui/DlgOptions.cpp:384
-#: clientgui/DlgSelectComputer.cpp:152
-msgid "Password:"
-msgstr "Lösenord:"
-
-#: clientgui/DlgOptions.cpp:327
-msgid "HTTP Proxy"
-msgstr "HTTP-proxy"
-
-#: clientgui/DlgOptions.cpp:335
-msgid "Connect via SOCKS proxy server"
-msgstr "Anslut via SOCKS-proxyserver"
-
-#: clientgui/DlgOptions.cpp:339
-msgid "SOCKS Proxy Server Configuration"
-msgstr "Konfiguration av SOCKS-proxyserver"
-
-#: clientgui/DlgOptions.cpp:391
-msgid "SOCKS Proxy"
-msgstr "SOCKS-proxy"
-
-#: clientgui/DlgOptions.cpp:589
-msgid "always"
-msgstr "alltid"
-
-#: clientgui/DlgOptions.cpp:590
-msgid "1 hour"
-msgstr "en timme"
-
-#: clientgui/DlgOptions.cpp:591
-msgid "6 hours"
-msgstr "sex timmar"
-
-#: clientgui/DlgOptions.cpp:592
-msgid "1 day"
-msgstr "en dag"
-
-#: clientgui/DlgOptions.cpp:593
-msgid "1 week"
-msgstr "en vecka"
-
-#: clientgui/DlgOptions.cpp:594
-msgid "never"
-msgstr "aldrig"
-
-#: clientgui/DlgOptions.cpp:691
-#, c-format
-msgid "%s - Language Selection"
-msgstr "%s - Språkval"
-
-#: 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 "%s-språket är ändrat.  För att detta ska börja gälla måste du starta om %s."
-
-#: clientgui/DlgSelectComputer.cpp:91
-#, c-format
-msgid "%s - Select Computer"
-msgstr "%s - Välj dator"
-
-#: 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 ""
-"En annan instans av %s kör redan\n"
-"på denna dator.  Välj en klient att övervaka."
-
-#: clientgui/DlgSelectComputer.cpp:143
-msgid "Host name:"
-msgstr "Värdnamn:"
-
-#: clientgui/Localization.cpp:31
-#: clientgui/Localization.cpp:69
-msgid "Message boards"
-msgstr "Forum"
-
-#: clientgui/Localization.cpp:33
-msgid "Correspond with other users on the SETI at home message boards"
-msgstr "Träffa andra användare på forumet för SETI at home"
-
-#: clientgui/Localization.cpp:37
-msgid "Ask questions and report problems"
-msgstr "Ställ frågor och rapportera problem"
-
-#: clientgui/Localization.cpp:39
-#: clientgui/Localization.cpp:81
-#: clientgui/Localization.cpp:111
-#: clientgui/Localization.cpp:129
-msgid "Your account"
-msgstr "Ditt konto"
-
-#: clientgui/Localization.cpp:41
-#: clientgui/Localization.cpp:87
-#: clientgui/Localization.cpp:113
-msgid "View your account information and credit totals"
-msgstr "Se din kontoinformation och din poängtotal"
-
-#: clientgui/Localization.cpp:43
-msgid "Your preferences"
-msgstr "Dina inställningar"
-
-#: clientgui/Localization.cpp:45
-msgid "View and modify your SETI at home account profile and preferences"
-msgstr "Din SETI at home-profil och dina inställningar"
-
-#: clientgui/Localization.cpp:47
-#: clientgui/Localization.cpp:89
-msgid "Your results"
-msgstr "Dina resultat"
-
-#: clientgui/Localization.cpp:49
-#: clientgui/Localization.cpp:91
-msgid "View your last week (or more) of computational results and work"
-msgstr "Visa senaste veckan (eller mer) av beräkningsresultat och jobb"
-
-#: clientgui/Localization.cpp:51
-#: clientgui/Localization.cpp:93
-msgid "Your computers"
-msgstr "Dina datorer"
-
-#: clientgui/Localization.cpp:53
-msgid "View a listing of all the computers on which you are running SETI at Home"
-msgstr "Visa en lista över alla datorer på vilka du kör SETI at home"
-
-#: clientgui/Localization.cpp:55
-#: clientgui/Localization.cpp:97
-msgid "Your team"
-msgstr "Ditt lag"
-
-#: clientgui/Localization.cpp:57
-#: clientgui/Localization.cpp:99
-msgid "View information about your team"
-msgstr "Visa information om ditt lag"
-
-#: clientgui/Localization.cpp:61
-msgid "Common questions"
-msgstr "Vanliga frågor"
-
-#: clientgui/Localization.cpp:63
-msgid "Read the Einstein at Home Frequently Asked Question list"
-msgstr "Läs listan över vanliga frågor (FAQ) för Einstein at Home"
-
-#: clientgui/Localization.cpp:65
-msgid "Screensaver info"
-msgstr "Skärmsläckarinfo"
-
-#: clientgui/Localization.cpp:67
-msgid "Read a detailed description of the Einstein at Home screensaver"
-msgstr "Läs en detaljerad beskrivning över skärmsläckaren för Einstein at Home"
-
-#: clientgui/Localization.cpp:71
-msgid "Correspond with admins and other users on the Einstein at Home message boards"
-msgstr "Träffa andra användare på forumet för Einstein at Home"
-
-#: clientgui/Localization.cpp:73
-msgid "Einstein status"
-msgstr "Einstein-status"
-
-#: clientgui/Localization.cpp:75
-msgid "Current status of the Einstein at Home server"
-msgstr "Aktuell status för Einstein at Home-servern"
-
-#: clientgui/Localization.cpp:77
-msgid "Report problems"
-msgstr "Rapportera problem"
-
-#: clientgui/Localization.cpp:79
-msgid "A link to the Einstein at Home problems and bug reports message board"
-msgstr "En länk till forum för problem och felrapporter för Einstein at Home"
-
-#: clientgui/Localization.cpp:83
-msgid "View and modify your Einstein at Home account profile and preferences"
-msgstr "Din Einstein at home-profil och dina inställningar"
-
-#: clientgui/Localization.cpp:85
-msgid "Account summary"
-msgstr "Kontosummering"
-
-#: clientgui/Localization.cpp:95
-msgid "View a listing of all the computers on which you are running Einstein at Home"
-msgstr "Visa en lista över på vilka datorer du kör Einstein at home"
-
-#: clientgui/Localization.cpp:101
-msgid "LIGO project"
-msgstr "LIGO-projektet"
-
-#: clientgui/Localization.cpp:103
-msgid "The home page of the Laser Interferometer Gravitational-wave Observatory (LIGO) project"
-msgstr "Webbplatsen för projektet Laser Interferometer Gravitational-wave Observatory (LIGO)"
-
-#: clientgui/Localization.cpp:105
-msgid "GEO-600 project"
-msgstr "GEO-600-projektet"
-
-#: clientgui/Localization.cpp:107
-msgid "The home page of the GEO-600 project"
-msgstr "Webbplats för GEO-600-projektet"
-
-#: clientgui/Localization.cpp:115
-#: clientgui/Localization.cpp:133
-msgid "Team"
-msgstr "Lag"
-
-#: clientgui/Localization.cpp:117
-msgid "Info about your Team"
-msgstr "Info om ditt lag"
-
-#: clientgui/Localization.cpp:123
-msgid "Get help for climateprediction.net"
-msgstr "Få hjälp för climateprediction.net"
-
-#: clientgui/Localization.cpp:125
-msgid "News"
-msgstr "Nyheter"
-
-#: clientgui/Localization.cpp:127
-msgid "climateprediction.net News"
-msgstr "climateprediction.net-nyheter"
-
-#: clientgui/Localization.cpp:131
-msgid "View your account information, credits, and trickles"
-msgstr "Se din kontoinformation, poäng och flöden"
-
-#: clientgui/Localization.cpp:135
-msgid "Info about your team"
-msgstr "Info om ditt lag"
-
-#: clientgui/Localization.cpp:141
-msgid "Search for help in our help system"
-msgstr "Sök efter hjälp i våra hjälpsystem"
-
-#: clientgui/Localization.cpp:143
-msgid "Global Statistics"
-msgstr "Global statistik"
-
-#: clientgui/Localization.cpp:145
-msgid "Summary statistics for World Community Grid"
-msgstr "Statistiksummering för World Community Grid"
-
-#: clientgui/Localization.cpp:147
-msgid "My Grid"
-msgstr "Min gridd"
-
-#: clientgui/Localization.cpp:149
-msgid "Your statistics and settings"
-msgstr "Din statistik och inställningar"
-
-#: clientgui/Localization.cpp:151
-msgid "Device Profiles"
-msgstr "Enhetsprofiler"
-
-#: clientgui/Localization.cpp:153
-msgid "Update your device settings"
-msgstr "Uppdatera dina enhetsinställningar"
-
-#: clientgui/Localization.cpp:155
-msgid "Research"
-msgstr "Forskning"
-
-#: clientgui/Localization.cpp:157
-msgid "Learn about the projects hosted at World Community Grid"
-msgstr "Få reda på mer om projekten på World Community Grid"
-
-#: clientgui/MainDocument.cpp:583
-msgid "Starting client"
-msgstr "Startar klient"
-
-#: clientgui/MainDocument.cpp:591
-msgid "Connecting to client"
-msgstr "Ansluter till klient"
-
-#: clientgui/MainDocument.cpp:1205
-msgid "Retrieving system state; please wait..."
-msgstr "Hämtar systemtillstånd; vänligen vänta…"
-
-#: clientgui/MainDocument.cpp:1826
-msgid "Missing application"
-msgstr "Saknar program"
-
-#: clientgui/MainDocument.cpp:1827
-msgid "Please download and install the CoRD application from http://cord.sourceforge.net"
-msgstr "Hämta och installera CORD-programmet från http://cord.sourceforge.net"
-
-#: clientgui/MainDocument.cpp:2442
-msgid "on batteries"
-msgstr "på batterier"
-
-#: clientgui/MainDocument.cpp:2443
-msgid "computer is in use"
-msgstr "datorn används"
-
-#: clientgui/MainDocument.cpp:2444
-msgid "user request"
-msgstr "användarbegäran"
-
-#: clientgui/MainDocument.cpp:2445
-msgid "time of day"
-msgstr "tidpunkt på dagen"
-
-#: clientgui/MainDocument.cpp:2446
-msgid "CPU benchmarks in progress"
-msgstr "CPU-mätning pågår"
-
-#: clientgui/MainDocument.cpp:2447
-msgid "need disk space - check preferences"
-msgstr "behöver diskutrymme - kontrollera inställningar"
-
-#: clientgui/MainDocument.cpp:2448
-msgid "computer is not in use"
-msgstr "datorn används ej"
-
-#: clientgui/MainDocument.cpp:2449
-msgid "starting up"
-msgstr "startar upp"
-
-#: clientgui/MainDocument.cpp:2450
-msgid "an exclusive app is running"
-msgstr "ett exklusivt program körs"
-
-#: clientgui/MainDocument.cpp:2451
-msgid "CPU is busy"
-msgstr "CPU:n är upptagen"
-
-#: clientgui/MainDocument.cpp:2452
-msgid "network bandwidth limit exceeded"
-msgstr "överskriden bandbreddsgräns för nätverk"
-
-#: clientgui/MainDocument.cpp:2453
-msgid "requested by operating system"
-msgstr "begärd av operativsystem"
-
-#: clientgui/MainDocument.cpp:2455
-msgid "unknown reason"
-msgstr "okänd anledning"
-
-#: clientgui/MainDocument.cpp:2477
-msgid "GPU missing, "
-msgstr "GPU saknas, "
-
-#: clientgui/MainDocument.cpp:2484
-msgid "New"
-msgstr "Ny"
-
-#: clientgui/MainDocument.cpp:2488
-msgid "Download failed"
-msgstr "Hämtning misslyckades"
-
-#: clientgui/MainDocument.cpp:2490
-msgid "Downloading"
-msgstr "Hämtar"
-
-#: clientgui/MainDocument.cpp:2492
-#: clientgui/MainDocument.cpp:2557
-msgid " (suspended - "
-msgstr " (i vänteläge - "
-
-#: clientgui/MainDocument.cpp:2500
-msgid "Project suspended by user"
-msgstr "Projekt försatt i vänteläge av användare"
-
-#: clientgui/MainDocument.cpp:2502
-msgid "Task suspended by user"
-msgstr "Uppgift försatt i vänteläge av användare"
-
-#: clientgui/MainDocument.cpp:2504
-msgid "Suspended - "
-msgstr "Vänteläge - "
-
-#: clientgui/MainDocument.cpp:2510
-msgid "GPU suspended - "
-msgstr "GPU i vänteläge - "
-
-#: clientgui/MainDocument.cpp:2517
-msgid "Waiting for memory"
-msgstr "Väntar på minne"
-
-#: clientgui/MainDocument.cpp:2519
-msgid "Waiting for shared memory"
-msgstr "Väntar på delat minne"
-
-#: clientgui/MainDocument.cpp:2521
-msgid "Running"
-msgstr "Kör"
-
-#: clientgui/MainDocument.cpp:2523
-msgid " (non-CPU-intensive)"
-msgstr " (ej CPU-intensiv)"
-
-#: clientgui/MainDocument.cpp:2526
-msgid "Waiting to run"
-msgstr "Väntar på att köra"
-
-#: clientgui/MainDocument.cpp:2528
-#: clientgui/MainDocument.cpp:2534
-msgid "Ready to start"
-msgstr "Redo att starta"
-
-#: clientgui/MainDocument.cpp:2538
-msgid "Postponed: "
-msgstr "Uppskjuten:"
-
-#: clientgui/MainDocument.cpp:2541
-msgid "Postponed"
-msgstr "Uppskjuten"
-
-#: clientgui/MainDocument.cpp:2545
-msgid "Waiting for network access"
-msgstr " (Väntar på nätverksåtkomst)"
-
-#: clientgui/MainDocument.cpp:2549
-msgid "Computation error"
-msgstr "Beräkningsfel"
-
-#: clientgui/MainDocument.cpp:2553
-msgid "Upload failed"
-msgstr "Skicka misslyckades"
-
-#: clientgui/MainDocument.cpp:2555
-msgid "Uploading"
-msgstr "Skickar"
-
-#: clientgui/MainDocument.cpp:2566
-msgid "Aborted by user"
-msgstr "Avbruten av användare"
-
-#: clientgui/MainDocument.cpp:2569
-msgid "Aborted by project"
-msgstr "Avbruten av projekt"
-
-#: clientgui/MainDocument.cpp:2572
-msgid "Aborted: not started by deadline"
-msgstr "Avbruten: startade inte inom tidgräns"
-
-#: clientgui/MainDocument.cpp:2575
-msgid "Aborted: disk limit exceeded"
-msgstr "Avbruten: diskgräns överskriden"
-
-#: clientgui/MainDocument.cpp:2578
-msgid "Aborted: run time limit exceeded"
-msgstr "Avbruten: körtidsgräns överskriden"
-
-#: clientgui/MainDocument.cpp:2581
-msgid "Aborted: memory limit exceeded"
-msgstr "Avbruten: minnesgräns överskriden"
-
-#: clientgui/MainDocument.cpp:2584
-msgid "Aborted"
-msgstr "Avbruten"
-
-#: clientgui/MainDocument.cpp:2589
-msgid "Acknowledged"
-msgstr "Erkänd"
-
-#: clientgui/MainDocument.cpp:2591
-msgid "Ready to report"
-msgstr "Klar att rapportera"
-
-#: clientgui/MainDocument.cpp:2593
-#, c-format
-msgid "Error: invalid state '%d'"
-msgstr "Fel: ogiltigt tillstånd ”%d”"
-
-#: clientgui/NoInternetConnectionPage.cpp:179
-msgid "No Internet connection"
-msgstr "Ingen Internetanslutning"
-
-#: clientgui/NoInternetConnectionPage.cpp:182
-msgid "Please connect to the Internet and try again."
-msgstr "Anslut till Internet och prova igen."
-
-#: clientgui/NotDetectedPage.cpp:181
-msgid "Project not found"
-msgstr "Projektet hittades inte"
-
-#: 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 ""
-"URL:en du angav går inte till ett BOINC-projekt.\n"
-"\n"
-"Kontrollera URL:en och prova igen."
-
-#: clientgui/NotDetectedPage.cpp:188
-msgid "Account manager not found"
-msgstr "Kontohanteraren hittades inte"
-
-#: clientgui/NotDetectedPage.cpp:191
-msgid ""
-"The URL you supplied is not that of a BOINC-based account\n"
-"manager.\n"
-"\n"
-"Please check the URL and try again."
-msgstr ""
-"URL:en du angav hör inte till en BOINC-baserad\n"
-"kontohantering.\n"
-"\n"
-"Kontrollera URL:en och prova igen."
-
-#: clientgui/NotFoundPage.cpp:181
-msgid "Login Failed."
-msgstr "Inloggning misslyckades."
-
-#: clientgui/NotFoundPage.cpp:185
-msgid "Check the username and password, and try again."
-msgstr "Kontrollera användarnamn samt lösenord och prova igen."
-
-#: clientgui/NotFoundPage.cpp:189
-msgid "Check the email address and password, and try again."
-msgstr "Kontrollera e-postadress samt lösenord och prova igen."
-
-#: clientgui/NoticeListCtrl.cpp:229
-msgid "more..."
-msgstr "mer…"
-
-#: clientgui/ProjectInfoPage.cpp:221
-msgid "Choose a project"
-msgstr "Välj ett projekt"
-
-#: clientgui/ProjectInfoPage.cpp:228
-msgid "To choose a project, click its name or type its URL below."
-msgstr "För att välja ett projekt, klicka på dess namn eller skriv in dess URL nedan."
-
-#: clientgui/ProjectInfoPage.cpp:246
-msgid "Categories:"
-msgstr "Kategorier:"
-
-#: clientgui/ProjectInfoPage.cpp:267
-msgid "Projects:"
-msgstr "Projekt:"
-
-#: clientgui/ProjectInfoPage.cpp:279
-msgid "Project details"
-msgstr "Projektdetaljer"
-
-#: clientgui/ProjectInfoPage.cpp:291
-msgid "Research area:"
-msgstr "Forskningsområde:"
-
-#: clientgui/ProjectInfoPage.cpp:302
-msgid "Organization:"
-msgstr "Organisation:"
-
-#: clientgui/ProjectInfoPage.cpp:313
-msgid "Web site:"
-msgstr "Webbplats:"
-
-#: clientgui/ProjectInfoPage.cpp:325
-msgid "Supported systems:"
-msgstr "Systemstöd:"
-
-#: clientgui/ProjectInfoPage.cpp:363
-msgid "Project URL:"
-msgstr "Projekt-URL:"
-
-#: clientgui/ProjectInfoPage.cpp:499
-#: clientgui/ProjectInfoPage.cpp:754
-#: clientgui/ProjectInfoPage.cpp:758
-msgid "All"
-msgstr "Alla"
-
-#: clientgui/ProjectInfoPage.cpp:802
-msgid "This project may not have work for your type of computer.  Do you want to add it anyway?"
-msgstr "Detta projekt kanske inte har jobb för din typ av dator.  Vill du lägga till det ändå?"
-
-#: clientgui/ProjectInfoPage.cpp:826
-msgid "You already added this project. Please choose a different project."
-msgstr "Du har redan lagt till detta projekt. Välj ett annat projekt."
-
-#: clientgui/ProjectProcessingPage.cpp:321
-msgid "Communicating with project."
-msgstr "Kommunicerar med projekt."
-
-#: clientgui/ProjectProcessingPage.cpp:510
-msgid "Required files not found on the server."
-msgstr "Nödvändiga filer hittades inte på servern."
-
-#: clientgui/ProjectProcessingPage.cpp:513
-#: clientgui/ProjectProcessingPage.cpp:586
-msgid "An internal server error has occurred."
-msgstr "Ett internt serverfel har uppstått."
-
-#: clientgui/ProjectPropertiesPage.cpp:334
-msgid ""
-"Communicating with project\n"
-"Please wait..."
-msgstr ""
-"Kommunicerar med projekt\n"
-"Vänligen vänta…"
-
-#: clientgui/ProjectWelcomePage.cpp:251
-#, c-format
-msgid "Welcome to %s."
-msgstr "Välkommen till %s."
-
-#: clientgui/ProjectWelcomePage.cpp:254
-msgid "You have volunteered to compute for this project:"
-msgstr "Du har anmält dig som volontär till att beräkna för detta projekt:"
-
-#: clientgui/ProjectWelcomePage.cpp:255
-msgid "Name:"
-msgstr "Namn:"
-
-#: clientgui/ProjectWelcomePage.cpp:258
-msgid "Home:"
-msgstr "Hem:"
-
-#: clientgui/ProjectWelcomePage.cpp:262
-msgid "Description:"
-msgstr "Beskrivning:"
-
-#: clientgui/ProjectWelcomePage.cpp:265
-msgid "URL:"
-msgstr "URL:"
-
-#: clientgui/ProjectWelcomePage.cpp:268
-msgid "User:"
-msgstr "Användare:"
-
-#: clientgui/ProjectWelcomePage.cpp:273
-msgid "WARNING: This project is not registered with BOINC.  Make sure you trust it before continuing."
-msgstr "VARNING: Detta projekt är inte registrerat med BOINC.   Var säker. på. att du litar på det innan du fortsätter."
-
-#: clientgui/ProjectWelcomePage.cpp:277
-msgid "To continue, click Next."
-msgstr "Välj Nästa för att fortsätta."
-
-#: clientgui/ProxyInfoPage.cpp:195
-msgid "Network communication failure"
-msgstr "Nätverkskommunikationsfel"
-
-#: clientgui/ProxyInfoPage.cpp:199
-msgid ""
-"The World Community Grid - BOINC software failed to communicate\n"
-"over the Internet. The most likely reasons are:\n"
-"\n"
-"1) Connectivity problem.  Check your network or modem connection\n"
-"and then click Back to try again.\n"
-"\n"
-"2) Personal firewall software is blocking the World Community\n"
-"Grid - BOINC software.  Configure your personal firewall to let\n"
-"BOINC and BOINC Manager communicate on port 80 and port 443,\n"
-"then click Back to try again.\n"
-"\n"
-"3) You are using a proxy server.\n"
-"Click Next to configure BOINC's proxy settings."
-msgstr ""
-"World Community Grid - BOINC-programvaran misslyckades med att kommunicera\n"
-"via Internet. Det mest troliga är:\n"
-"\n"
-"1) Förbindelseproblem.  Kontrollera ditt nätverk eller modemanslutning\n"
-"och klicka sedan Bakåt för att prova igen.\n"
-"\n"
-"2) Din brandvägg blockerar World Community\n"
-"Grid - BOINC-programvaran.  Konfigurera din brandvägg till att\n"
-"låta BOINC och BOINC-hanteraren kommunicera över port 80 och 443,\n"
-"klicka sedan Bakåt för att prova igen.\n"
-"\n"
-"3) Du använder en proxyserver.\n"
-"Klicka Nästa för att konfigurera BOINCs proxyinställningar ."
-
-#: clientgui/ProxyInfoPage.cpp:203
-msgid ""
-"BOINC failed to communicate on the Internet.\n"
-"The most likely reasons are:\n"
-"\n"
-"1) Connectivity problem.  Check your network\n"
-"or modem connection and then click Back to try again.\n"
-"\n"
-"2) Personal firewall software is blocking BOINC.\n"
-"Configure your personal firewall to let BOINC and\n"
-"BOINC Manager communicate on port 80,\n"
-"then click Back to try again.\n"
-"\n"
-"3) You are using a proxy server.\n"
-"Click Next to configure BOINC's proxy settings."
-msgstr ""
-"BOINC kunde ej kommunicera via Internet.\n"
-"Det mest troliga är:\n"
-"\n"
-"1) Förbindelseproblem.  Kontrollera ditt nätverk eller\n"
-"modemanslutning och klicka sedan Bakåt för att prova igen.\n"
-"\n"
-"2) Din brandvägg blockerar BOINC.\n"
-"Konfigurera din brandvägg till att låta BOINC och\n"
-"BOINC-hanteraren kommunicera på port 80,\n"
-"licka sedan Bakåt för att prova igen.\n"
-"\n"
-"3) Du använder en proxy-server.\n"
-"Klicka Nästa för att konfigurera BOINCs proxyinställningar."
-
-#: clientgui/ProxyPage.cpp:331
-msgid "Proxy configuration"
-msgstr "Proxykonfiguration"
-
-#: clientgui/ProxyPage.cpp:334
-msgid "HTTP proxy"
-msgstr "HTTP-proxy"
-
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
-msgid "Server:"
-msgstr "Server:"
-
-#: clientgui/ProxyPage.cpp:350
-msgid "Autodetect"
-msgstr "Upptäck automatiskt"
-
-#: clientgui/ProxyPage.cpp:354
-msgid "SOCKS proxy"
-msgstr "SOCKS-proxy"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:167
-msgid "Advanced View...\tCtrl+Shift+A"
-msgstr "Avancerad vy...\tCtrl+Skift+A"
-
-# 82%
-# 100%
-#: clientgui/sg_BoincSimpleFrame.cpp:168
-msgid "Display the advanced graphical interface."
-msgstr "Visa det avancerade grafiska gränssnittet."
-
-#: clientgui/sg_BoincSimpleFrame.cpp:175
-msgid "Skin"
-msgstr "Tema"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:177
-msgid "Select the appearance of the user interface."
-msgstr "Välj utseendet på användargränssnittet."
-
-#: clientgui/sg_BoincSimpleFrame.cpp:224
-#, c-format
-msgid "&%s"
-msgstr "&%s"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:405
-msgid "Default"
-msgstr "Standard"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:848
-msgid "Suspend"
-msgstr "Vänteläge"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:850
-msgid "Suspend Computing"
-msgstr "Beräkning i vänteläge"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:851
-msgid "Resume Computing"
-msgstr "Återuppta beräkning"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:867
-msgid "Notices"
-msgstr "Meddelanden"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:868
-msgid "Open a window to view notices from projects or BOINC"
-msgstr "Öppna ett fönster för att visa meddelanden från projekt eller BOINC"
-
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
-msgstr "Hämtar meddelanden; Vänligen vänta…"
-
-#: clientgui/sg_DlgMessages.cpp:132
-msgid "There are no notices at this time."
-msgstr "Det finns inga meddelanden just nu."
-
-#: clientgui/sg_DlgMessages.cpp:146
-msgid "Close"
-msgstr "Stäng"
-
-#: clientgui/sg_DlgMessages.cpp:394
-#, c-format
-msgid "%s - Notices"
-msgstr "%s - Meddelanden"
-
-#: clientgui/sg_DlgPreferences.cpp:270
-msgid "This dialog controls preferences for this computer only."
-msgstr "Denna dialog kontrollerar inställningar endast för denna dator."
-
-#: clientgui/sg_DlgPreferences.cpp:275
-msgid "Click OK to set preferences."
-msgstr "Klicka OK för att ange inställningar."
-
-#: clientgui/sg_DlgPreferences.cpp:280
-msgid "Click Clear to restore web-based settings for all preferences listed below."
-msgstr "Klicka Rensa för att återställa webbaserade inställningar för de som listas nedanför:"
-
-#: clientgui/sg_DlgPreferences.cpp:287
-msgid "For additional settings, select Computing Preferences in the Advanced View."
-msgstr "För ytterligare inställningar, välj Beräkningsinställningar i  Avancerad vy."
-
-#: clientgui/sg_DlgPreferences.cpp:315
-msgid "Do work only between:"
-msgstr "Utför jobb endast mellan:"
-
-#: clientgui/sg_DlgPreferences.cpp:337
-msgid "Connect to internet only between:"
-msgstr "Anslut endast till internet mellan:"
-
-#: clientgui/sg_DlgPreferences.cpp:359
-#: clientgui/sg_DlgPreferences.cpp:376
-msgid "Use no more than:"
-msgstr "Använd inte mer än:"
-
-#: clientgui/sg_DlgPreferences.cpp:372
-msgid "of disk space"
-msgstr "av diskutrymme"
-
-#: clientgui/sg_DlgPreferences.cpp:389
-msgid "of the processor"
-msgstr "av processorn"
-
-#: clientgui/sg_DlgPreferences.cpp:393
-msgid "Do work while on battery?"
-msgstr "Utför jobb medan dator kör på batteri?"
-
-#: clientgui/sg_DlgPreferences.cpp:406
-msgid "Do work after idle for:"
-msgstr "Utför jobb efter inaktiv i:"
-
-#: clientgui/sg_DlgPreferences.cpp:431
-msgid "Clear all local preferences listed above and close the dialog"
-msgstr "Rensa alla lokala inställningar och stäng dialogen"
-
-#: clientgui/sg_DlgPreferences.cpp:609
-#: clientgui/sg_DlgPreferences.cpp:612
-#: clientgui/sg_DlgPreferences.cpp:688
-#: clientgui/sg_DlgPreferences.cpp:692
-#: clientgui/sg_DlgPreferences.cpp:704
-#: clientgui/sg_DlgPreferences.cpp:708
-#: clientgui/sg_DlgPreferences.cpp:851
-#: clientgui/sg_DlgPreferences.cpp:862
-msgid "Anytime"
-msgstr "När som helst"
-
-#: clientgui/sg_DlgPreferences.cpp:645
-msgid "100 MB"
-msgstr "100 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:646
-msgid "200 MB"
-msgstr "200 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:647
-msgid "500 MB"
-msgstr "500 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:648
-msgid "1 GB"
-msgstr "1 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:649
-msgid "2 GB"
-msgstr "2 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:650
-msgid "5 GB"
-msgstr "5 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:651
-msgid "10 GB"
-msgstr "10 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:652
-msgid "20 GB"
-msgstr "20 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:653
-msgid "50 GB"
-msgstr "50 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:654
-msgid "100 GB"
-msgstr "100 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:724
-#, c-format
-msgid "%d MB"
-msgstr "%d MB"
-
-#: clientgui/sg_DlgPreferences.cpp:726
-#, c-format
-msgid "%4.2f GB"
-msgstr "%4.2f GB"
-
-#: clientgui/sg_DlgPreferences.cpp:767
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: clientgui/sg_DlgPreferences.cpp:803
-msgid "0 (Run Always)"
-msgstr "0 (Kör alltid)"
-
-#: clientgui/sg_DlgPreferences.cpp:806
-#, c-format
-msgid "%d"
-msgstr "%d"
-
-#: clientgui/sg_DlgPreferences.cpp:953
-#, c-format
-msgid "%s - Computing Preferences"
-msgstr "%s - Beräkningsinställningar"
-
-#: clientgui/sg_DlgPreferences.cpp:1033
-msgid "Do you really want to clear all local preferences?\n"
-msgstr "Är du säker på att du vill rensa alla lokala inställningar?\n"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:66
-#: clientgui/ViewProjects.cpp:179
-msgid "Update"
-msgstr "Uppdatera"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:67
-#: clientgui/ViewProjects.cpp:180
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
-msgstr "Rapportera alla färdiga uppgifter, hämta senaste poäng, hämta senaste inställningar och möjligen fler uppgifter."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:73
-#: clientgui/sg_ProjectCommandPopup.cpp:129
-#: clientgui/ViewProjects.cpp:187
-#: clientgui/ViewProjects.cpp:727
-msgid "Suspend tasks for this project."
-msgstr "Försätt detta projekts uppgifter i vänteläge."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:78
-#: clientgui/sg_ProjectCommandPopup.cpp:136
-#: clientgui/ViewProjects.cpp:193
-#: clientgui/ViewProjects.cpp:746
-msgid "No new tasks"
-msgstr "Inga nya uppgifter"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:79
-#: clientgui/ViewProjects.cpp:194
-msgid "Don't get new tasks for this project."
-msgstr "Hämta inte nya uppgifter för detta projekt."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:200
-msgid "Reset project"
-msgstr "Starta om projekt"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:85
-#: clientgui/ViewProjects.cpp:201
-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 "Ta bort alla filer och uppgifter associerade med detta projekt och hämta nya uppgifter.  Du kan uppdatera projektet först för att rapportera avklarade uppgifter."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:91
-#: clientgui/ViewProjects.cpp:208
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
-msgstr "Ta bort detta projekt.  Pågående uppgifter kommer att gå förlorade (använd ”Uppdatera” först för att rapportera avklarade uppgifter)."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:96
-#: clientgui/sg_TaskCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:214
-msgid "Properties"
-msgstr "Egenskaper"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:97
-#: clientgui/ViewProjects.cpp:215
-msgid "Show project details."
-msgstr "Visa projektdetaljer."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:126
-#: clientgui/ViewProjects.cpp:723
-msgid "Resume tasks for this project."
-msgstr "Återuppta uppgifter för detta projekt."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:133
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow new tasks"
-msgstr "Tillåt nya uppgifter"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:134
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow fetching new tasks for this project."
-msgstr "Tillåt nya uppgifter att hämtas för detta projekt."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:137
-#: clientgui/ViewProjects.cpp:746
-msgid "Don't fetch new tasks for this project."
-msgstr "Hämta inte nya uppgifter för detta projekt."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:229
-#: clientgui/ViewProjects.cpp:443
-#, c-format
-msgid "Are you sure you want to reset project '%s'?"
-msgstr "Är du säker på att du vill rensa projektet ”%s”?"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:235
-#: clientgui/ViewProjects.cpp:449
-msgid "Reset Project"
-msgstr "Återställ projekt"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:266
-#: clientgui/ViewProjects.cpp:501
-#, c-format
-msgid "Are you sure you want to remove project '%s'?"
-msgstr "Är du säker på att du vill ta bort projektet ”%s”?"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:272
-#: clientgui/ViewProjects.cpp:507
-msgid "Remove Project"
-msgstr "Ta bort projekt"
-
-#: clientgui/sg_ProjectPanel.cpp:72
-msgid "Add Project"
-msgstr "Lägg till projekt"
-
-#: clientgui/sg_ProjectPanel.cpp:73
-msgid "Synchronize"
-msgstr "Synkronisera"
-
-#: clientgui/sg_ProjectPanel.cpp:74
-msgid "Work done for this project"
-msgstr "Jobb utfört för detta projekt"
-
-#: clientgui/sg_ProjectPanel.cpp:77
-msgid "Synchronize projects with account manager system"
-msgstr "Synkronisera projekt med kontohanterarsystem"
-
-#: clientgui/sg_ProjectPanel.cpp:124
-msgid "Select a project to access with the controls below"
-msgstr "Välj ett projekt att komma åt med kontrollerna nedan"
-
-# 88%
-# 100%
-#: clientgui/sg_ProjectPanel.cpp:145
-msgid "Project Web Pages"
-msgstr "Projektwebbsidor"
-
-#: clientgui/sg_ProjectPanel.cpp:149
-msgid "Project Commands"
-msgstr "Projektkommandon"
-
-#: clientgui/sg_ProjectPanel.cpp:276
-#, c-format
-msgid "Pop up a menu of web sites for project %s"
-msgstr "Visa en meny av webbplatser för projekt %s"
-
-#: clientgui/sg_ProjectPanel.cpp:278
-#, c-format
-msgid "Pop up a menu of commands to apply to project %s"
-msgstr "Visa en meny av kommandon för projektet %s"
-
-#: clientgui/sg_TaskCommandPopup.cpp:66
-msgid "Show graphics"
-msgstr "Visa grafik"
-
-#: clientgui/sg_TaskCommandPopup.cpp:67
-msgid "Show application graphics in a window."
-msgstr "Visa programgrafik i ett fönster."
-
-#: clientgui/sg_TaskCommandPopup.cpp:73
-msgid "Suspend this task."
-msgstr "Försätt denna uppgift i vänteläge."
-
-#: clientgui/sg_TaskCommandPopup.cpp:78
-msgid "Abort"
-msgstr "Avbryt"
-
-#: clientgui/sg_TaskCommandPopup.cpp:79
-msgid "Abandon this task. You will get no credit for it."
-msgstr "Överge denna uppgift. Du kommer inte att få poäng för den."
-
-#: clientgui/sg_TaskCommandPopup.cpp:85
-msgid "Show task details."
-msgstr "Visa uppgiftsdetaljer."
-
-#: clientgui/sg_TaskCommandPopup.cpp:119
-msgid "Resume work for this task."
-msgstr "Återuppta jobb för denna uppgift."
-
-#: clientgui/sg_TaskCommandPopup.cpp:123
-msgid "Suspend work for this task."
-msgstr "Försätt jobb för denna uppgift i vänteläge."
-
-#: clientgui/sg_TaskCommandPopup.cpp:267
-#, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %.1lf%%, Status: %s)"
-msgstr ""
-"Är du säker på att du vill avbryta denna uppgift '%s'?\n"
-"(Utfört: %.1lf%%, Status: %s)"
-
-#: clientgui/sg_TaskCommandPopup.cpp:272
-msgid "Abort task"
-msgstr "Avbryt uppgift"
-
-#: clientgui/sg_TaskPanel.cpp:468
-msgid "You don't have any projects.  Please Add a Project."
-msgstr "Du har inga projekt.  Lägg till ett projekt."
-
-#: clientgui/sg_TaskPanel.cpp:469
-msgid "Not available"
-msgstr "Inte tillgänglig"
-
-#: clientgui/sg_TaskPanel.cpp:480
-msgid "Tasks:"
-msgstr "Uppgifter:"
-
-#: clientgui/sg_TaskPanel.cpp:486
-msgid "Select a task to access"
-msgstr "Välj en uppgift att komma åt"
-
-#: clientgui/sg_TaskPanel.cpp:497
-msgid "From:"
-msgstr "Från:"
-
-#: clientgui/sg_TaskPanel.cpp:551
-msgid "This task's progress"
-msgstr "Vad denna uppgift utfört"
-
-#: clientgui/sg_TaskPanel.cpp:569
-msgid "Task Commands"
-msgstr "Uppgiftskommandon"
-
-#: clientgui/sg_TaskPanel.cpp:570
-msgid "Pop up a menu of commands to apply to this task"
-msgstr "Visa en meny med kommandon för denna uppgift"
-
-#: clientgui/sg_TaskPanel.cpp:705
-#, c-format
-msgid "Application: %s"
-msgstr "Program: %s"
-
-#: clientgui/sg_TaskPanel.cpp:728
-#, c-format
-msgid "%.3f%%"
-msgstr "%.3f%%"
-
-#: clientgui/sg_TaskPanel.cpp:736
-msgid "Application: Not available"
-msgstr "Program: ej tillgängligt"
-
-#: clientgui/sg_TaskPanel.cpp:836
-msgid "Not Available"
-msgstr "Ej tillgängligt"
-
-#: clientgui/sg_TaskPanel.cpp:851
-#, c-format
-msgid "Elapsed: %s"
-msgstr "Förflutit: %s"
-
-#: clientgui/sg_TaskPanel.cpp:865
-#, c-format
-msgid "Remaining (estimated): %s"
-msgstr "Återstående (beräknad): %s"
-
-#: clientgui/sg_TaskPanel.cpp:880
-#, c-format
-msgid "Status: %s"
-msgstr "Status: %s"
-
-#: clientgui/sg_TaskPanel.cpp:1227
-msgid "Retrieving current status."
-msgstr "Hämtar nuvarande status."
-
-#: clientgui/sg_TaskPanel.cpp:1233
-msgid "Downloading work from the server."
-msgstr "Hämtar jobb från servern."
-
-#: clientgui/sg_TaskPanel.cpp:1238
-msgid "Processing Suspended:  Running On Batteries."
-msgstr "Bearbetning i vänteläge:  Kör på batterier."
-
-#: clientgui/sg_TaskPanel.cpp:1240
-msgid "Processing Suspended:  User Active."
-msgstr "Bearbetning i vänteläge:  Aktiv användare."
-
-#: clientgui/sg_TaskPanel.cpp:1242
-msgid "Processing Suspended:  User paused processing."
-msgstr "Bearbetning i vänteläge:  Pausad av användare."
-
-#: clientgui/sg_TaskPanel.cpp:1244
-msgid "Processing Suspended:  Time of Day."
-msgstr "Bearbetning i vänteläge:  Tid på dagen."
-
-#: clientgui/sg_TaskPanel.cpp:1246
-msgid "Processing Suspended:  Benchmarks Running."
-msgstr "Bearbetning i vänteläge:  Prestandamätningar kör."
-
-#: clientgui/sg_TaskPanel.cpp:1248
-msgid "Processing Suspended."
-msgstr "Bearbetning i vänteläge."
-
-#: clientgui/sg_TaskPanel.cpp:1252
-msgid "Waiting to contact project servers."
-msgstr "Väntar på kontakt med projektservrarna."
-
-#: clientgui/sg_TaskPanel.cpp:1256
-#: clientgui/sg_TaskPanel.cpp:1265
-msgid "Retrieving current status"
-msgstr "Hämtar aktuell status"
-
-#: clientgui/sg_TaskPanel.cpp:1260
-msgid "No work available to process"
-msgstr "Inget tillgängligt jobb att behandla"
-
-#: clientgui/sg_TaskPanel.cpp:1262
-msgid "Unable to connect to the core client"
-msgstr "Kan inte ansluta till kärnklienten"
-
-#: clientgui/TermsOfUsePage.cpp:218
-msgid "Terms of Use"
-msgstr "Användarvillkor"
-
-#: clientgui/TermsOfUsePage.cpp:222
-msgid "Please read the following terms of use:"
-msgstr "Läs följande användarvillkor:"
-
-#: clientgui/TermsOfUsePage.cpp:231
-msgid "I agree to the terms of use."
-msgstr "Jag godkänner användarvillkoren."
-
-#: clientgui/TermsOfUsePage.cpp:237
-msgid "I do not agree to the terms of use."
-msgstr "Jag godkänner ej användarvillkoren."
-
-#: clientgui/UnavailablePage.cpp:183
-msgid "Project temporarily unavailable"
-msgstr "Projektet inte tillgängligt för tillfället"
-
-#: clientgui/UnavailablePage.cpp:186
-msgid ""
-"The project is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-"Projektet inte tillgängligt för tillfället.\n"
-"\n"
-"Prova senare."
-
-#: clientgui/UnavailablePage.cpp:190
-msgid "Account manager temporarily unavailable"
-msgstr "Kontohanteraren är inte tillgänglig för tillfället"
-
-#: clientgui/UnavailablePage.cpp:193
-msgid ""
-"The account manager is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-"Kontohanteraren är inte tillgänglig för tillfället.\n"
-"\n"
-"Prova senare."
-
-#: clientgui/ValidateAccountKey.cpp:68
-msgid "Please specify an account key to continue."
-msgstr "Ange en kontonyckel för att fortsätta."
-
-#: clientgui/ValidateAccountKey.cpp:71
-msgid "Invalid Account Key; please enter a valid Account Key"
-msgstr "Ogiltig kontonyckel; Ange en giltig kontonyckel"
-
-#: clientgui/ValidateAccountKey.cpp:82
-#: clientgui/ValidateEmailAddress.cpp:86
-msgid "Validation conflict"
-msgstr "Valideringskonflikt"
-
-#: clientgui/ValidateEmailAddress.cpp:72
-msgid "Please specify an email address"
-msgstr "Ange en e-postadress"
-
-#: clientgui/ValidateEmailAddress.cpp:75
-msgid "Invalid email address; please enter a valid email address"
-msgstr "Ogiltig e-postadress; Ange en giltig e-postadress"
-
-#: clientgui/ValidateURL.cpp:69
-msgid "Missing URL"
-msgstr "Saknar URL"
-
-#: clientgui/ValidateURL.cpp:70
-msgid ""
-"Please specify a URL.\n"
-"For example:\n"
-"http://www.example.com/"
-msgstr ""
-"Ange en URL.\n"
-"Till exempel:\n"
-"http://www.exempel.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 "Ogiltig 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 ""
-"Ange en giltig URL.\n"
-"Till exempel:\n"
-"http://boincprojekt.exempel.com"
-
-#: clientgui/ValidateURL.cpp:104
-#: clientgui/ValidateURL.cpp:108
-#, c-format
-msgid "'%s' does not contain a valid host name."
-msgstr "”%s” innehåller inte ett giltigt värdnamn."
-
-#: clientgui/ValidateURL.cpp:111
-#, c-format
-msgid "'%s' does not contain a valid path."
-msgstr "”%s” innehåller inte en giltig sökväg."
-
-#: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:175
-msgid "Commands"
-msgstr "Kommandon"
-
-#: clientgui/ViewMessages.cpp:88
-msgid "Copy all messages"
-msgstr "Kopiera alla meddelanden"
-
-#: clientgui/ViewMessages.cpp:95
-msgid "Copy selected messages"
-msgstr "Kopiera utvalda meddelanden"
-
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
-msgid "Show only this project"
-msgstr "Visa endast detta projekt"
-
-#: clientgui/ViewMessages.cpp:107
-#: clientgui/ViewMessages.cpp:503
-msgid "Show only the messages for the selected project."
-msgstr "Visa endast meddelanden för det valda projektet."
-
-#: clientgui/ViewMessages.cpp:164
-msgid "Messages"
-msgstr "Meddelanden"
-
-#: clientgui/ViewMessages.cpp:187
-msgid "Copying all messages to the clipboard..."
-msgstr "Kopierar alla meddelanden till urklipp…"
-
-#: clientgui/ViewMessages.cpp:223
-msgid "Copying selected messages to the clipboard..."
-msgstr "Kopierar valda meddelanden till utklipp…"
-
-#: clientgui/ViewMessages.cpp:286
-msgid "Filtering messages..."
-msgstr "Filtrerar meddelanden…"
-
-#: clientgui/ViewMessages.cpp:494
-msgid "Show all messages"
-msgstr "Visa alla meddelanden"
-
-#: clientgui/ViewMessages.cpp:495
-msgid "Show messages for all projects."
-msgstr "Visa meddelanden för alla projekt."
-
-#: clientgui/ViewProjects.cpp:225
-msgid "Account"
-msgstr "Konto"
-
-#: clientgui/ViewProjects.cpp:227
-msgid "Work done"
-msgstr "Utfört jobb"
-
-#: clientgui/ViewProjects.cpp:228
-msgid "Avg. work done"
-msgstr "Genomsnittligt utfört jobb"
-
-#: clientgui/ViewProjects.cpp:230
-msgid "Status"
-msgstr "Status"
-
-#: clientgui/ViewProjects.cpp:255
-msgid "Projects"
-msgstr "Projekt"
-
-#: clientgui/ViewProjects.cpp:307
-msgid "Updating project..."
-msgstr "Uppdaterar projekt…"
-
-#: clientgui/ViewProjects.cpp:349
-msgid "Resuming project..."
-msgstr "Återupptar projekt…"
-
-#: clientgui/ViewProjects.cpp:353
-msgid "Suspending project..."
-msgstr "Försätter projekt i vänteläge…"
-
-#: clientgui/ViewProjects.cpp:390
-msgid "Telling project to allow additional task downloads..."
-msgstr "Ställer in projekt till att tillåta flera hämtningar av uppgifter…"
-
-#: clientgui/ViewProjects.cpp:394
-msgid "Telling project to not fetch any additional tasks..."
-msgstr "Ställer in projekt till att inte hämta flera uppgifter…"
-
-#: clientgui/ViewProjects.cpp:430
-msgid "Resetting project..."
-msgstr "Nollställer projekt…"
-
-#: clientgui/ViewProjects.cpp:488
-msgid "Removing project..."
-msgstr "Tar bort projekt…"
-
-#: clientgui/ViewProjects.cpp:548
-msgid "Launching browser..."
-msgstr "Startar webbläsare…"
-
-#: clientgui/ViewProjects.cpp:1063
-msgid "Requested by user"
-msgstr "Begärd av användare"
-
-#: clientgui/ViewProjects.cpp:1064
-msgid "To fetch work"
-msgstr "För att hämta jobb"
-
-#: clientgui/ViewProjects.cpp:1065
-msgid "To report completed tasks"
-msgstr "För att rapportera avslutade jobb"
-
-#: clientgui/ViewProjects.cpp:1066
-msgid "To send trickle-up message"
-msgstr "För att sända flödesmeddelande"
-
-#: clientgui/ViewProjects.cpp:1067
-msgid "Requested by account manager"
-msgstr "Begärd av kontohanteraren"
-
-#: clientgui/ViewProjects.cpp:1068
-msgid "Project initialization"
-msgstr "Projektinitiering"
-
-#: clientgui/ViewProjects.cpp:1069
-msgid "Requested by project"
-msgstr "Begärd av projekt"
-
-#: clientgui/ViewProjects.cpp:1070
-msgid "Unknown reason"
-msgstr "Okänd anledning"
-
-#: clientgui/ViewProjects.cpp:1084
-msgid "Suspended by user"
-msgstr "Försatt i vänteläge av användare"
-
-#: clientgui/ViewProjects.cpp:1087
-msgid "Won't get new tasks"
-msgstr "Hämtar inte nya uppgifter"
-
-#: clientgui/ViewProjects.cpp:1090
-msgid "Project ended - OK to remove"
-msgstr "Projektet är avslutat - det kan tas bort"
-
-#: clientgui/ViewProjects.cpp:1093
-msgid "Will remove when tasks done"
-msgstr "Kommer att ta bort när uppgifter är avklarade"
-
-#: clientgui/ViewProjects.cpp:1096
-msgid "Scheduler request pending"
-msgstr "Schemaläggarbegäran väntar"
-
-#: clientgui/ViewProjects.cpp:1102
-msgid "Scheduler request in progress"
-msgstr "Schemaläggarbegäran pågår"
-
-#: clientgui/ViewProjects.cpp:1105
-msgid "Trickle up message pending"
-msgstr "Flödesmeddelande väntar"
-
-#: clientgui/ViewProjects.cpp:1111
-msgid "Communication deferred "
-msgstr "Kommunikation fördröjd "
-
-#: clientgui/ViewResources.cpp:62
-msgid "Total disk usage"
-msgstr "Total diskanvändning"
-
-#: clientgui/ViewResources.cpp:83
-msgid "Disk usage by BOINC projects"
-msgstr "Diskanvändning för BOINC-projekt"
-
-#: clientgui/ViewResources.cpp:116
-msgid "Disk"
-msgstr "Disk"
-
-#: clientgui/ViewResources.cpp:225
-msgid "no projects: 0 bytes used"
-msgstr "inga projekt: 0 byte använt"
-
-#: clientgui/ViewResources.cpp:262
-msgid "used by BOINC: "
-msgstr "använt av BOINC: "
-
-#: clientgui/ViewResources.cpp:272
-msgid "free, available to BOINC: "
-msgstr "fritt, tillgängligt för BOINC: "
-
-#: clientgui/ViewResources.cpp:282
-msgid "free, not available to BOINC: "
-msgstr "fritt, ej tillgängligt för BOINC: "
-
-#: clientgui/ViewResources.cpp:292
-msgid "free: "
-msgstr "fritt: "
-
-#: clientgui/ViewResources.cpp:302
-msgid "used by other programs: "
-msgstr "använt av andra program: "
-
-#: clientgui/ViewStatistics.cpp:1181
-msgid "User Total"
-msgstr "Användartotalsumma"
-
-#: clientgui/ViewStatistics.cpp:1182
-msgid "User Average"
-msgstr "Användargenomsnitt"
-
-#: clientgui/ViewStatistics.cpp:1183
-msgid "Host Total"
-msgstr "Värdtotalsumma"
-
-#: clientgui/ViewStatistics.cpp:1184
-msgid "Host Average"
-msgstr "Värdgenomsnitt"
-
-#: clientgui/ViewStatistics.cpp:1331
-#, c-format
-msgid "Last update: %.0f days ago"
-msgstr "Senaste uppdatering: %.0f dagar sedan"
-
-#: clientgui/ViewStatistics.cpp:1956
-msgid "Show user total"
-msgstr "Användartotalsumma"
-
-#: clientgui/ViewStatistics.cpp:1957
-msgid "Show total credit for user"
-msgstr "Sammanlagd poäng för användaren"
-
-#: clientgui/ViewStatistics.cpp:1963
-msgid "Show user average"
-msgstr "Användargenomsnitt"
-
-#: clientgui/ViewStatistics.cpp:1964
-msgid "Show average credit for user"
-msgstr "Genomsnittlig poäng för användare"
-
-#: clientgui/ViewStatistics.cpp:1970
-msgid "Show host total"
-msgstr "Värdtotalsumma"
-
-#: clientgui/ViewStatistics.cpp:1971
-msgid "Show total credit for host"
-msgstr "Totala antalet värdpoäng"
-
-#: clientgui/ViewStatistics.cpp:1977
-msgid "Show host average"
-msgstr "Värdgenomsnitt"
-
-#: clientgui/ViewStatistics.cpp:1978
-msgid "Show average credit for host"
-msgstr "Genomsnittlig värdpoäng"
-
-#: clientgui/ViewStatistics.cpp:1987
-msgid "< &Previous project"
-msgstr "< &Föregående projekt"
-
-#: clientgui/ViewStatistics.cpp:1988
-msgid "Show chart for previous project"
-msgstr "Visa diagram för föregående projekt"
-
-#: clientgui/ViewStatistics.cpp:1993
-msgid "&Next project >"
-msgstr "&Nästa projekt >"
-
-#: clientgui/ViewStatistics.cpp:1994
-msgid "Show chart for next project"
-msgstr "Visa diagram för nästa projekt"
-
-#: clientgui/ViewStatistics.cpp:2000
-#: clientgui/ViewStatistics.cpp:2390
-msgid "Hide project list"
-msgstr "Dölj projektlista"
-
-#: clientgui/ViewStatistics.cpp:2001
-#: clientgui/ViewStatistics.cpp:2390
-msgid "Use entire area for graphs"
-msgstr "Använd hela området till grafer"
-
-#: clientgui/ViewStatistics.cpp:2006
-msgid "Mode view"
-msgstr "Lägesvy"
-
-#: clientgui/ViewStatistics.cpp:2010
-msgid "One project"
-msgstr "Ett projekt"
-
-#: clientgui/ViewStatistics.cpp:2011
-msgid "Show one chart with selected project"
-msgstr "Visa ett diagram med valt projekt"
-
-#: clientgui/ViewStatistics.cpp:2017
-msgid "All projects (separate)"
-msgstr "Alla projekt (separata)"
-
-#: clientgui/ViewStatistics.cpp:2018
-msgid "Show all projects, one chart per project"
-msgstr "Visa alla projekt, ett diagram per projekt"
-
-#: clientgui/ViewStatistics.cpp:2024
-msgid "All projects (together)"
-msgstr "Alla projekt (tillsammans)"
-
-#: clientgui/ViewStatistics.cpp:2025
-msgid "Show one chart with all projects"
-msgstr "Visa ett diagram med alla projekt"
-
-#: clientgui/ViewStatistics.cpp:2031
-msgid "All projects (sum)"
-msgstr "Alla projekt (summerade)"
-
-#: clientgui/ViewStatistics.cpp:2032
-msgid "Show one chart with sum of projects"
-msgstr "Visa ett diagram med summan av projekt"
-
-#: clientgui/ViewStatistics.cpp:2053
-msgid "Statistics"
-msgstr "Statistik"
-
-#: 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 "Uppdaterar diagram…"
-
-#: clientgui/ViewStatistics.cpp:2394
-msgid "Show project list"
-msgstr "Visa projektlista"
-
-#: clientgui/ViewStatistics.cpp:2394
-msgid "Uses smaller area for graphs"
-msgstr "Använd mindre områden för grafer"
-
-#: clientgui/ViewTransfers.cpp:169
-msgid "Retry Now"
-msgstr "Prova igen"
-
-#: clientgui/ViewTransfers.cpp:170
-msgid "Retry the file transfer now"
-msgstr "Pröva filöverföring igen"
-
-#: clientgui/ViewTransfers.cpp:176
-msgid "Abort Transfer"
-msgstr "Avbryt överföring"
-
-#: clientgui/ViewTransfers.cpp:177
-msgid "Abort this file transfer.  You won't get credit for the task."
-msgstr "Avbryt denna filöverföring.  Du kommer inte att få poäng för denna uppgift."
-
-#: clientgui/ViewTransfers.cpp:188
-msgid "File"
-msgstr "Fil"
-
-#: clientgui/ViewTransfers.cpp:189
-#: clientgui/ViewWork.cpp:238
-msgid "Progress"
-msgstr "Utfört"
-
-#: clientgui/ViewTransfers.cpp:190
-msgid "Size"
-msgstr "Storlek"
-
-#: clientgui/ViewTransfers.cpp:191
-msgid "Elapsed Time"
-msgstr "Förfluten tid"
-
-#: clientgui/ViewTransfers.cpp:192
-msgid "Speed"
-msgstr "Hastighet"
-
-#: clientgui/ViewTransfers.cpp:218
-msgid "Transfers"
-msgstr "Överföringar"
-
-#: clientgui/ViewTransfers.cpp:285
-msgid "Network activity is suspended - "
-msgstr "Nätverksaktivitet försatt i vänteläge - "
-
-#: clientgui/ViewTransfers.cpp:287
-msgid ""
-".\n"
-"You can enable it using the Activity menu."
-msgstr ""
-".\n"
-"Du kan aktivera det med Aktivitetsmenyn."
-
-#: clientgui/ViewTransfers.cpp:290
-msgid "BOINC"
-msgstr "BOINC"
-
-#: clientgui/ViewTransfers.cpp:297
-msgid "Retrying transfer now..."
-msgstr "Provar överföring igen…"
-
-#: clientgui/ViewTransfers.cpp:335
-msgid "Aborting transfer..."
-msgstr "Avbryt överföring…"
-
-#: clientgui/ViewTransfers.cpp:348
-#, 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 ""
-"Är du säker på att du vill avbryta denna överföring ”%s”?\n"
-"OBS: Att avbryta en överföring kommer att göra en uppgift ogiltig och du\n"
-"kommer inte att få poäng för den."
-
-#: clientgui/ViewTransfers.cpp:354
-msgid "Abort File Transfer"
-msgstr "Avbryt filöverföring"
-
-#: clientgui/ViewTransfers.cpp:785
-msgid "Upload"
-msgstr "Skicka"
-
-#: clientgui/ViewTransfers.cpp:785
-msgid "Download"
-msgstr "Hämta"
-
-#: clientgui/ViewTransfers.cpp:789
-msgid "retry in "
-msgstr "prova igen om "
-
-#: clientgui/ViewTransfers.cpp:791
-msgid "failed"
-msgstr "misslyckades"
-
-#: clientgui/ViewTransfers.cpp:794
-msgid "suspended"
-msgstr "i vänteläge"
-
-#: clientgui/ViewTransfers.cpp:799
-msgid "active"
-msgstr "aktiv"
-
-#: clientgui/ViewTransfers.cpp:801
-msgid "pending"
-msgstr "väntar"
-
-#: clientgui/ViewTransfers.cpp:808
-msgid " (project backoff: "
-msgstr " (projekt backoff: "
-
-#: clientgui/ViewWork.cpp:192
-#: clientgui/ViewWork.cpp:782
-msgid "Show active tasks"
-msgstr "Aktiva uppgifter"
-
-#: clientgui/ViewWork.cpp:193
-#: clientgui/ViewWork.cpp:783
-msgid "Show only active tasks."
-msgstr "Visa endast aktiva uppgifter."
-
-#: clientgui/ViewWork.cpp:206
-msgid "Show VM Console"
-msgstr "Visa VM-konsoll"
-
-#: clientgui/ViewWork.cpp:207
-msgid "Show VM Console in a window."
-msgstr "Visa VM-konsoll i ett fönster."
-
-#: clientgui/ViewWork.cpp:214
-msgid "Suspend work for this result."
-msgstr "Sätt detta resultats jobb i vänteläge."
-
-#: clientgui/ViewWork.cpp:221
-msgid "Abandon work on the result. You will get no credit for it."
-msgstr "Överge jobb. Du får inga poäng för det."
-
-#: clientgui/ViewWork.cpp:240
-msgid "Elapsed"
-msgstr "Förfluten"
-
-#: clientgui/ViewWork.cpp:241
-msgid "Remaining (estimated)"
-msgstr "Återstående (beräknad)"
-
-#: clientgui/ViewWork.cpp:242
-msgid "Deadline"
-msgstr "Tidsgräns"
-
-#: clientgui/ViewWork.cpp:269
-msgid "Tasks"
-msgstr "Uppgifter"
-
-#: clientgui/ViewWork.cpp:362
-msgid "Resuming task..."
-msgstr "Återupptar uppgift…"
-
-#: clientgui/ViewWork.cpp:365
-msgid "Suspending task..."
-msgstr "Uppgift i vänteläge…"
-
-#: clientgui/ViewWork.cpp:394
-msgid "Showing graphics for task..."
-msgstr "Visar grafik för uppgift…"
-
-#: clientgui/ViewWork.cpp:431
-msgid "Showing VM console for task..."
-msgstr "Visar VM-konsoll för uppgift…"
-
-#: clientgui/ViewWork.cpp:484
-#, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %s, Status: %s)"
-msgstr ""
-"Är du säker på att du vill avbryta denna uppgift ”%s”?\n"
-"(Utfört: %s, Status: %s)"
-
-#: clientgui/ViewWork.cpp:490
-#, c-format
-msgid "Are you sure you want to abort these %d tasks?"
-msgstr "Är du säker på att du vill avbryta dessa %d uppgifter?"
-
-#: clientgui/ViewWork.cpp:504
-msgid "Aborting task..."
-msgstr "Avbryter uppgift…"
-
-#: clientgui/ViewWork.cpp:776
-msgid "Show all tasks"
-msgstr "Alla uppgifter"
-
-#: clientgui/ViewWork.cpp:777
-msgid "Show all tasks."
-msgstr "Visa alla uppgifter."
-
-#: clientgui/WelcomePage.cpp:284
-msgid "Add project or account manager"
-msgstr "Lägg till projekt eller kontohanterare"
-
-#: clientgui/WelcomePage.cpp:288
-msgid "Add project or use BOINC Account Manager"
-msgstr "Lägg till projekt eller använd BOINC kontohanterare"
-
-#: 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 ""
-"Om möjligt, lägg till projekt från\n"
-"%s-webbplatsen.\n"
-"\n"
-"Projekt tillagda via denna guide kommer ej att\n"
-"listas eller hanteras via %s."
-
-#: clientgui/WelcomePage.cpp:313
-msgid ""
-"There are over 30 BOINC-based projects\n"
-"doing research in many areas of science,\n"
-"and you can volunteer for as many of them as you like.\n"
-"You can add a project directly,\n"
-"or use an 'Account Manager' web site to select projects."
-msgstr ""
-"Det finns mer än 30 BOINC-baserade projekt\n"
-"som utför forskning inom många vetenskapsområden,\n"
-"och du kan anmäla dig som frivillig till så många av dem som du vill.\n"
-"Du kan lägga till ett projekt direkt,\n"
-"eller använda en ”kontohanterar”-webbplats för att välja projekt."
-
-#: 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 ""
-"Du har valt att lägga till ett nytt frivilligt beräkningsprojekt eller att ändra vilka projekt\n"
-"du bidrar till\n"
-"\n"
-"Några av dessa projekt körs och hanteras av World Community Grid, medan andra\n"
-"körs och hanteras av andra forskare och organisationer. BOINC-mjukvaran\n"
-"kan fördela din lediga processorkraft mellan vilken projektkombination som helst.\n"
-"\n"
-"Alternativt, om du har registrerat med en BOINC-kontohanterare, kan du använda\n"
-"denna till att välja vilka projekt du vill stödja.\n"
-"\n"
-"Vänligen välj vilka förändringar du vill göra:\n"
-
-#: clientgui/WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
-msgstr "Använd en BOINC kontohanterare"
-
-#: clientgui/WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
-msgstr "Lägg till eller ändra dina World Community Grid-projekt"
-
-#: clientgui/WelcomePage.cpp:361
-msgid "Add projects run by other researchers or organizations"
-msgstr "Lägg till projekt som körs av andra forskare och organisationer"
-
-#: clientgui/WizardAttach.cpp:673
-msgid "Do you really want to cancel?"
-msgstr "Vill du verkligen avbryta?"
-
-#: clientgui/WizardAttach.cpp:674
-msgid "Question"
-msgstr "Fråga"
-
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
-msgid "&Next >"
-msgstr "&Nästa >"
-
-#: clientgui/wizardex.cpp:383
-msgid "< &Back"
-msgstr "< &Bakåt"
-
-#: clientgui/wizardex.cpp:553
-msgid "&Finish"
-msgstr "&Avsluta"
-
-#: clientgui/common/wxPieCtrl.cpp:64
-msgid "Pie Ctrl"
-msgstr "Pie Ctrl"
-
-#: clientgui/mac/Mac_GUI.cpp:35
-msgid "Services"
-msgstr "Tjänster"
-
-#: clientgui/mac/Mac_GUI.cpp:36
-#, c-format
-msgid "Hide %s"
-msgstr "Göm %s"
-
-#: clientgui/mac/Mac_GUI.cpp:37
-msgid "Hide Others"
-msgstr "Göm andra"
-
-#: clientgui/mac/Mac_GUI.cpp:38
-msgid "Show All"
-msgstr "Visa alla"
-
-#: clientgui/mac/Mac_GUI.cpp:39
-#, c-format
-msgid "Quit %s"
-msgstr "Avsluta %s"
-
-#: clientgui/DlgAdvPreferences.h:30
-msgid "specify work start and stop hours in format HH:MM-HH:MM"
-msgstr "ange start- och stopptid för jobb i formatet HH:MM-HH:MM"
-
-#: clientgui/DlgAdvPreferences.h:31
-msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
-msgstr "ange start- och stopptid för nätverksanvändning i formatet HH:MM-HH:MM"
-
-#~ msgid "Account manager website"
-#~ msgstr "Kontohanterarens webbplats"
-#~ msgid ""
-#~ "The minimum username length for this project is 1. Please enter a different "
-#~ "username."
-#~ msgstr ""
-#~ "Minsta längd på användarnamn för detta projekt är ett. Ange ett annat "
-#~ "användarnamn."
-#~ msgid ""
-#~ "The minimum username length for this account manager is 1. Please enter a "
-#~ "different username."
-#~ msgstr ""
-#~ "Minsta längd på användarnamn för denna kontohanterare är ett. Ange ett annat "
-#~ "användarnamn."
-#~ msgid ""
-#~ "The minimum email address length for this project is 1. Please enter a "
-#~ "different email address."
-#~ msgstr ""
-#~ "Minsta längd på e-postadress för detta projekt är ett. Ange en annan "
-#~ "e-postadress."
-#~ msgid ""
-#~ "The minimum email address length for this account manager is 1. Please enter "
-#~ "a different email address."
-#~ msgstr ""
-#~ "Minsta längd på e-postadress för denna kontohanterare är ett. Ange en annan "
-#~ "e-postadress."
-
-#, c-format
-#~ msgid ""
-#~ "The minimum password length for this project is %d. Please enter a different "
-#~ "password."
-#~ msgstr ""
-#~ "Minsta längd på lösenord för detta projekt är %d. Ange ett annat lösenord."
-
-#, c-format
-#~ msgid ""
-#~ "The minimum password length for this account manager is %d. Please enter a "
-#~ "different password."
-#~ msgstr ""
-#~ "Minsta längd på lösenord för denna kontohanterare är %d. Ange ett annat "
-#~ "lösenord."
-#~ msgid "Account Manager &URL:"
-#~ msgstr "&URL för kontohanterare:"
-
-#, c-format
-#~ msgid "%s &website"
-#~ msgstr "%s-&webbplats"
-#~ msgid ""
-#~ "An error has occurred;\n"
-#~ "check the Event Log for details.\n"
-#~ "\n"
-#~ "Click Finish to close."
-#~ msgstr ""
-#~ "Ett fel har inträffat;\n"
-#~ "Prova igen senare.\n"
-#~ "\n"
-#~ "Välj Avsluta för att stänga."
-#~ msgid ""
-#~ "(C) 2003-2013 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2013 University of California, Berkeley.\n"
-#~ "Alla rättigheter förbehållna."
-#~ msgid "invalid float"
-#~ msgstr "ogiltigt flyttal"
-
-#, c-format
-#~ msgid "%s - Preferences"
-#~ msgstr "%s - Inställningar"
-
-#, no-c-format
-#~ msgid "% of the processors"
-#~ msgstr "% av processorerna"
-
-#, no-c-format
-#~ msgid "% CPU time"
-#~ msgstr "% CPU-tid"
-#~ msgid "KBytes/sec."
-#~ msgstr "KByte/sek."
-#~ msgid "Mbytes"
-#~ msgstr "Mbyte"
-#~ msgid "every"
-#~ msgstr "var"
-#~ msgid "days"
-#~ msgstr "dagar"
-#~ msgid "Gigabytes disk space"
-#~ msgstr "Gigabyte diskutrymme"
-#~ msgid "Workunit name"
-#~ msgstr "Namn på jobbenhet"
-#~ msgid "Running, high priority"
-#~ msgstr "Kör, hög prioritet"
-#~ msgid " (Scheduler wait: "
-#~ msgstr " (Schemaläggare väntar: "
-#~ msgid " (Scheduler wait)"
-#~ msgstr " (Schemaläggare väntar)"
-#~ msgid " (Waiting for network access)"
-#~ msgstr " (Väntar på nätverksåtkomst)"
-#~ msgid "Notice List"
-#~ msgstr "Meddelandelista"
-
-#, c-format
-#~ msgid "%s; received on %s"
-#~ msgstr "%s; mottaget från %s"
-
-#, c-format
-#~ msgid "%s; received from %s; on %s"
-#~ msgstr "%s; mottaget från %s; på %s"
-#~ msgid "Click"
-#~ msgstr "Klick"
-#~ msgid "Project List"
-#~ msgstr "Projektlista"
-#~ msgid "Nvidia GPU Supported"
-#~ msgstr "Nvidia-GPU stöds"
-#~ msgid "ATI GPU Supported"
-#~ msgstr "ATI-GPU stöds"
-#~ msgid "Project Website"
-#~ msgstr "Projektwebbplats"
-
-# 82%
-# 75%
-# 100%
-#~ msgid "Display the advanced (accessible) graphical interface."
-#~ msgstr "Visa det avancerade (tillgängliga) grafiska gränssnittet."
-#~ msgid "One or more items failed to load from the Internet."
-#~ msgstr "Ett eller flera objekt kunde inte hämtas från Internet."
-#~ msgid "Retry now"
-#~ msgstr "Försök igen nu"
-#~ msgid "10%"
-#~ msgstr "10%"
-#~ msgid "20%"
-#~ msgstr "20%"
-#~ msgid "30%"
-#~ msgstr "30%"
-#~ msgid "40%"
-#~ msgstr "40%"
-#~ msgid "50%"
-#~ msgstr "50%"
-#~ msgid "60%"
-#~ msgstr "60%"
-#~ msgid "70%"
-#~ msgstr "70%"
-#~ msgid "80%"
-#~ msgstr "80%"
-#~ msgid "90%"
-#~ msgstr "90%"
-#~ msgid "100%"
-#~ msgstr "100%"
-#~ msgid "1"
-#~ msgstr "1"
-#~ msgid "3"
-#~ msgstr "3"
-#~ msgid "5"
-#~ msgstr "5"
-#~ msgid "10"
-#~ msgstr "10"
-#~ msgid "15"
-#~ msgstr "15"
-#~ msgid "30"
-#~ msgstr "30"
-#~ msgid "60"
-#~ msgstr "60"
-#~ msgid "Click Clear to restore web-based settings."
-#~ msgstr "Klicka Rensa för att återställa webbaserade inställningar."
-#~ msgid "For additional settings, select Computing Preferences in "
-#~ msgstr "För ytterligare inställningar, välj Beräkningsinställningar i "
-#~ msgid "the Advanced View."
-#~ msgstr "den avancerade vyn."
-#~ msgid "Paused: Other work running"
-#~ msgstr "Pausad: Annat jobb körs"
-#~ msgid "Paused: User initiated.  Click 'Resume' to continue"
-#~ msgstr "Pausad: Användarinitierad.  Klicka ”Återuppta” för att fortsätta"
-#~ msgid "Paused: User active"
-#~ msgstr "Pausad: Användarinitierad.  Klicka ”Återuppta” för att fortsätta"
-#~ msgid "Paused: Computer on battery"
-#~ msgstr "Pausad: Datorn kör på batteri"
-#~ msgid "Paused: Time of Day"
-#~ msgstr "Pausad: Tidpunkt på dagen"
-#~ msgid "Paused: Benchmarks running"
-#~ msgstr "Pausad: Prestandamätningar körs"
-#~ msgid "Paused"
-#~ msgstr "Pausad"
-#~ msgid "Paused: Application start delayed"
-#~ msgstr "Pausad: Programstart fördröjd"
-#~ msgid "Click to show project graphics"
-#~ msgstr "Klicka för att visa projektgrafik"
-#, c-format
-#~ msgid "Pop up a menu of websites for project %s"
-#~ msgstr "Visa en meny av webbplatser för projekt %s"
-#~ msgid "Open a window to view messages"
-#~ msgstr "Öppna ett fönster för att visa meddelanden"
-#~ msgid "Stop all activity"
-#~ msgstr "Stoppa all aktivitet"
-#~ msgid "Resume activity"
-#~ msgstr "Återuppta aktivitet"
-#~ msgid "Open a window to set your preferences"
-#~ msgstr "Öppna ett fönster för att ange dina inställningar"
-#~ msgid "Switch to the BOINC advanced view"
-#~ msgstr "Växla till BOINCs avancerade vy"
-
-# 75%
-# 100%
-#~ msgid "My Projects:"
-#~ msgstr "Mina projekt:"
-#, c-format
-#~ msgid "%s. Work done by %s: %0.2f"
-#~ msgstr "%s. Jobb utfört av %s: %0.2f"
-
-#, c-format
-#~ msgid "%.1lf"
-#~ msgstr "%.1lf"
-
-#, c-format
-#~ msgid "%d hr %d min %d sec"
-#~ msgstr "%d t %d min %d sek"
-#~ msgid "Are you sure you want to display graphics on a remote machine?"
-#~ msgstr "Är du säker på att du vill visa grafik på en fjärrmaskin?"
-#~ msgid "Application: "
-#~ msgstr "Program: "
-#~ msgid "Time Remaining: "
-#~ msgstr "Återstående tid: "
-#~ msgid "Elapsed Time: "
-#~ msgstr "Förfluten tid: "
-#~ msgid "I do not agree with the terms of use."
-#~ msgstr "Jag godkänner ej användarvillkoren."
-
-#, c-format
-#~ msgid "New page inserted. Index = %i"
-#~ msgstr "Ny sida infogad. Index = %i"
-
-#, c-format
-#~ msgid "New page appended. Index = %i"
-#~ msgstr "Ny sida infogad. Index = %i"
-
-#, c-format
-#~ msgid "Old Page Index = %i"
-#~ msgstr "Gammalt sidoindex = %i"
-
-#, c-format
-#~ msgid "OnDropTarget: index by HitTest = %i"
-#~ msgstr "OnDropTarget: index av HitTest = %i"
-#~ msgid ""
-#~ "for accessibility support, please select advanced from the view menu or type "
-#~ "command shift a"
-#~ msgstr ""
-#~ "för tillgänglighetsstöd, välj avancerat från menyn Visa eller skriv "
-#~ "kommandot skift a"
-#~ msgid "This panel contains graphs showing user totals for projects"
-#~ msgstr ""
-#~ "Denna panel innehåller grafer som visar användartotalsumma för projekten"
-#~ msgid "list headers"
-#~ msgstr "listhuvuden"
-#~ msgid "list of events"
-#~ msgstr "händelselista"
-#~ msgid "list of events is empty"
-#~ msgstr "händelselista är tom"
-
-#, c-format
-#~ msgid "list of %s"
-#~ msgstr "lista av %s"
-
-#, c-format
-#~ msgid "list of %s is empty"
-#~ msgstr "lista av %s är tom"
-
-#, c-format
-#~ msgid "; current sort column %d of %d; descending order; "
-#~ msgstr "; aktuell sorteringskolumn %d av %d; sjunkande ordning; "
-
-#, c-format
-#~ msgid "; current sort column %d of %d; ascending order; "
-#~ msgstr "; aktuell sorteringskolumn %d av %d; stigande ordning; "
-
-#, c-format
-#~ msgid "; column %d of %d; "
-#~ msgstr "; kolumn %d av %d; "
-#~ msgid "list is empty"
-#~ msgstr "lista är tom"
-
-#, c-format
-#~ msgid "; row %d; "
-#~ msgstr "; rad %d; "
-
-#, c-format
-#~ msgid "; selected row %d of %d; "
-#~ msgstr "; valde rad %d av %d; "
-
-#, c-format
-#~ msgid "; selected row %d ; "
-#~ msgstr "; valde rad %d ; "
-
-#, c-format
-#~ msgid "; row %d of %d; "
-#~ msgstr "; rad %d av %d; "
-#~ msgid "blank"
-#~ msgstr "blank"
-#~ msgid "list of projects or account managers"
-#~ msgstr "lista över projekt eller kontohanterare"
-
-#, c-format
-#~ msgid "selected row %d of %d; "
-#~ msgstr "valde rad %d av %d; "
-
-#, c-format
-#~ msgid "row %d of %d; "
-#~ msgstr "rad %d av %d; "
-#~ msgid "Preferences…"
-#~ msgstr "Inställningar…"
-#~ msgid "%s - Messages"
-#~ msgstr "%s - Meddelanden"
-
diff --git a/locale/sv_SE/BOINC-Project-Generic.po b/locale/sv_SE/BOINC-Project-Generic.po
deleted file mode 100755
index b615274..0000000
--- a/locale/sv_SE/BOINC-Project-Generic.po
+++ /dev/null
@@ -1,6467 +0,0 @@
-# BOINC web translation
-# Copyright (C) 2008 University of California
-# This file is distributed under the same license as BOINC.
-# FileID  : $Id$
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\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: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: sv_SE\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.2.1\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-msgid "LANG_NAME_NATIVE"
-msgstr "English"
-
-msgid "LANG_NAME_INTERNATIONAL"
-msgstr "English"
-
-#: ../inc/bbcode_html.inc:11
-msgid "Bold text: [b]text[/b]  (alt+b)"
-msgstr ""
-
-#: ../inc/bbcode_html.inc:14
-msgid "Italic text: [i]text[/i]  (alt+i)"
-msgstr ""
-
-#: ../inc/bbcode_html.inc:17
-msgid "Underline text: [u]text[/u]  (alt+u)"
-msgstr ""
-
-#: ../inc/bbcode_html.inc:20
-msgid "Quote text: [quote]text[/quote]  (alt+q)"
-msgstr ""
-
-#: ../inc/bbcode_html.inc:23
-msgid "Code display: [code]code[/code]  (alt+c)"
-msgstr ""
-
-#: ../inc/bbcode_html.inc:26
-msgid "List: [list]text[/list] (alt+l)"
-msgstr ""
-
-#: ../inc/bbcode_html.inc:29
-msgid "Ordered list: [list=]text[/list]  (alt+o)"
-msgstr ""
-
-#: ../inc/bbcode_html.inc:32
-msgid "Insert image: [img]http://image_url[/img]  (alt+p)"
-msgstr ""
-
-#: ../inc/bbcode_html.inc:35
-msgid ""
-"Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url]  (alt+w)"
-msgstr ""
-
-#: ../inc/bbcode_html.inc:42
-msgid "Font color"
-msgstr ""
-
-#: ../inc/bbcode_html.inc:43
-msgid ""
-"Font color: [color=red]text[/color]  Tip: you can also use color=#FF0000"
-msgstr ""
-
-#: ../inc/bbcode_html.inc:44 ../inc/bbcode_html.inc:59 ../inc/prefs.inc:638
-msgid "Default"
-msgstr ""
-
-#: ../inc/bbcode_html.inc:45
-msgid "Dark Red"
-msgstr ""
-
-#: ../inc/bbcode_html.inc:46
-msgid "Red"
-msgstr ""
-
-#: ../inc/bbcode_html.inc:47
-msgid "Orange"
-msgstr ""
-
-#: ../inc/bbcode_html.inc:48
-msgid "Brown"
-msgstr ""
-
-#: ../inc/bbcode_html.inc:49
-msgid "Yellow"
-msgstr ""
-
-#: ../inc/bbcode_html.inc:50
-msgid "Green"
-msgstr ""
-
-#: ../inc/bbcode_html.inc:51
-msgid "Olive"
-msgstr ""
-
-#: ../inc/bbcode_html.inc:52
-msgid "Cyan"
-msgstr ""
-
-#: ../inc/bbcode_html.inc:53
-msgid "Blue"
-msgstr ""
-
-#: ../inc/bbcode_html.inc:54
-msgid "Dark Blue"
-msgstr ""
-
-#: ../inc/bbcode_html.inc:55
-msgid "Indigo"
-msgstr ""
-
-#: ../inc/bbcode_html.inc:56
-msgid "Violet"
-msgstr ""
-
-#: ../inc/bbcode_html.inc:57
-msgid "Font size"
-msgstr ""
-
-#: ../inc/bbcode_html.inc:58
-msgid "Font size: [size=x-small]small text[/size]"
-msgstr ""
-
-#: ../inc/bbcode_html.inc:60
-msgid "Small"
-msgstr ""
-
-#: ../inc/bbcode_html.inc:61
-msgid "Normal"
-msgstr ""
-
-#: ../inc/bbcode_html.inc:62
-msgid "Large"
-msgstr ""
-
-#: ../inc/bbcode_html.inc:65
-msgid "Close all open bbCode tags"
-msgstr ""
-
-#: ../inc/bbcode_html.inc:65
-msgid "Close Tags"
-msgstr ""
-
-#: ../inc/forum.inc:37
-msgid "Oldest first"
-msgstr ""
-
-#: ../inc/forum.inc:38 ../inc/forum.inc:44
-msgid "Newest first"
-msgstr ""
-
-#: ../inc/forum.inc:39
-msgid "Highest rated posts first"
-msgstr ""
-
-#: ../inc/forum.inc:41
-msgid "Newest post first"
-msgstr ""
-
-#: ../inc/forum.inc:42
-msgid "Most views first"
-msgstr ""
-
-#: ../inc/forum.inc:43
-msgid "Most posts first"
-msgstr ""
-
-#: ../inc/forum.inc:125
-msgid "Search for words in forum messages"
-msgstr ""
-
-#: ../inc/forum.inc:125
-msgid "Search forums"
-msgstr ""
-
-#: ../inc/forum.inc:126
-msgid "Advanced search"
-msgstr ""
-
-#: ../inc/forum.inc:132 ../inc/user.inc:253 ../user/pm.php:69
-#: ../user/pm.php:133
-msgid "Private messages"
-msgstr ""
-
-#: ../inc/forum.inc:151 ../user/bs_sample_index.php:63
-#: ../user/forum_forum.php:71 ../user/sample_index.php:130
-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
-msgid "Message boards"
-msgstr ""
-
-#: ../inc/forum.inc:187 ../inc/forum.inc:195
-msgid "%1 message board"
-msgstr ""
-
-#: ../inc/forum.inc:245 ../inc/result.inc:695
-msgid "Previous"
-msgstr ""
-
-#: ../inc/forum.inc:283 ../inc/result.inc:704
-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
-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
-msgid "Message"
-msgstr ""
-
-#: ../inc/forum.inc:580
-msgid "Send message"
-msgstr ""
-
-#: ../inc/forum.inc:580
-msgid "Send %1 a private message"
-msgstr ""
-
-#: ../inc/forum.inc:581
-msgid "Joined: %1"
-msgstr ""
-
-#: ../inc/forum.inc:590
-msgid "Posts: %1"
-msgstr ""
-
-#: ../inc/forum.inc:596
-msgid "Credit: %1"
-msgstr ""
-
-#: ../inc/forum.inc:597
-msgid "RAC: %1"
-msgstr ""
-
-#: ../inc/forum.inc:620
-msgid "You haven't read this message yet"
-msgstr ""
-
-#: ../inc/forum.inc:620
-msgid "Unread"
-msgstr ""
-
-#: ../inc/forum.inc:623 ../inc/forum.inc:628 ../inc/forum.inc:727
-msgid "Message %1"
-msgstr ""
-
-#: ../inc/forum.inc:624 ../inc/user.inc:331 ../user/forum_forum.php:174
-msgid "hidden"
-msgstr ""
-
-#: ../inc/forum.inc:625
-msgid "Posted: %1"
-msgstr ""
-
-#: ../inc/forum.inc:628
-msgid " - in response to "
-msgstr ""
-
-#: ../inc/forum.inc:631 ../inc/prefs.inc:705 ../inc/prefs.inc:707
-msgid "Edit"
-msgstr ""
-
-#: ../inc/forum.inc:631
-msgid "Edit this message"
-msgstr ""
-
-#: ../inc/forum.inc:637
-msgid "Last modified: %1"
-msgstr ""
-
-#: ../inc/forum.inc:640
-msgid ""
-"This post is not shown because the sender is on your 'ignore' list.  Click %"
-"1here%2 to view this post"
-msgstr ""
-
-#: ../inc/forum.inc:668 ../inc/forum.inc:679
-msgid "Report this post as offensive"
-msgstr ""
-
-#: ../inc/forum.inc:668 ../inc/forum.inc:679
-msgid "Report as offensive"
-msgstr ""
-
-#: ../inc/forum.inc:672
-msgid "Rating: %1"
-msgstr ""
-
-#: ../inc/forum.inc:672
-msgid "rate: "
-msgstr ""
-
-#: ../inc/forum.inc:675
-msgid "Click if you like this message"
-msgstr ""
-
-#: ../inc/forum.inc:675
-msgid "Rate +"
-msgstr ""
-
-#: ../inc/forum.inc:677
-msgid "Click if you don't like this message"
-msgstr ""
-
-#: ../inc/forum.inc:677
-msgid "Rate -"
-msgstr ""
-
-#: ../inc/forum.inc:685 ../user/pm.php:106 ../user/pm.php:146
-msgid "Reply"
-msgstr ""
-
-#: ../inc/forum.inc:685
-msgid "Post a reply to this message"
-msgstr ""
-
-#: ../inc/forum.inc:687
-msgid "Quote"
-msgstr ""
-
-#: ../inc/forum.inc:687
-msgid "Post a reply by quoting this message"
-msgstr ""
-
-#: ../inc/forum.inc:708
-msgid "Hidden by a moderator"
-msgstr ""
-
-#: ../inc/forum.inc:729
-msgid "Posted %1 by %2"
-msgstr ""
-
-#: ../inc/forum.inc:747
-msgid "You may not post or rate messages until %1"
-msgstr ""
-
-#: ../inc/forum.inc:758
-msgid ""
-"\n"
-"        <ul>\n"
-"        <li> Posts must be 'kid friendly': they may not contain\n"
-"            content that is obscene, hate-related,\n"
-"            sexually explicit or suggestive.\n"
-"        <li> No commercial advertisements.\n"
-"        <li> No links to web sites involving sexual content,\n"
-"            gambling, or intolerance of others.\n"
-"        <li> No messages intended to annoy or antagonize other people,\n"
-"            or to hijack a thread.\n"
-"        <li> No messages that are deliberately hostile or insulting.\n"
-"        <li> No abusive comments involving race, religion,\n"
-"            nationality, gender, class or sexuality.\n"
-"        "
-msgstr ""
-
-#: ../inc/forum.inc:780
-msgid "Rules:"
-msgstr ""
-
-#: ../inc/forum.inc:781
-msgid "More info"
-msgstr ""
-
-#: ../inc/forum.inc:1055 ../user/forum_thread.php:189
-msgid "Unhide"
-msgstr ""
-
-#: ../inc/forum.inc:1055
-msgid "Unhide this post"
-msgstr ""
-
-#: ../inc/forum.inc:1057 ../user/forum_thread.php:195
-msgid "Hide"
-msgstr ""
-
-#: ../inc/forum.inc:1057
-msgid "Hide this post"
-msgstr ""
-
-#: ../inc/forum.inc:1062 ../user/forum_thread.php:228
-msgid "Move"
-msgstr ""
-
-#: ../inc/forum.inc:1062
-msgid "Move post to a different thread"
-msgstr ""
-
-#: ../inc/forum.inc:1067
-msgid "Banish author"
-msgstr ""
-
-#: ../inc/forum.inc:1074
-msgid "Vote to banish author"
-msgstr ""
-
-#: ../inc/forum.inc:1078
-msgid "Vote not to banish author"
-msgstr ""
-
-#: ../inc/forum.inc:1083
-msgid "Start vote to banish author"
-msgstr ""
-
-#: ../inc/forum.inc:1116
-msgid "Only team members can post to the team message board"
-msgstr ""
-
-#: ../inc/forum.inc:1126
-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 ""
-
-#: ../inc/forum.inc:1133
-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
-msgid ""
-"This thread is locked. Only forum moderators and administrators are allowed "
-"to post there."
-msgstr ""
-
-#: ../inc/forum.inc:1145
-msgid "Can't post to a hidden thread."
-msgstr ""
-
-#: ../inc/forum.inc:1173
-msgid "Thread"
-msgstr ""
-
-#: ../inc/forum.inc:1174 ../inc/team.inc:128 ../user/forum_forum.php:136
-#: ../user/forum_index.php:94
-msgid "Posts"
-msgstr ""
-
-#: ../inc/forum.inc:1176 ../user/forum_forum.php:138
-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
-msgid "Last post"
-msgstr ""
-
-#: ../inc/forum.inc:1235
-msgid "New posts in the thread %1"
-msgstr ""
-
-#: ../inc/forum.inc:1240
-msgid "New posts in subscribed thread"
-msgstr ""
-
-#: ../inc/forum.inc:1241
-msgid "There are new posts in the thread '%1'"
-msgstr ""
-
-#: ../inc/forum.inc:1251
-msgid "Mark all threads as read"
-msgstr ""
-
-#: ../inc/forum.inc:1252
-msgid "Mark all threads in all message boards as read."
-msgstr ""
-
-#: ../inc/host.inc:24
-msgid "No host"
-msgstr ""
-
-#: ../inc/host.inc:26
-msgid "Unavailable"
-msgstr ""
-
-#: ../inc/host.inc:56 ../inc/prefs.inc:639 ../inc/prefs.inc:1048
-msgid "Home"
-msgstr ""
-
-#: ../inc/host.inc:57 ../inc/prefs.inc:641 ../inc/prefs.inc:1049
-#: ../user/server_status.php:314
-msgid "Work"
-msgstr ""
-
-#: ../inc/host.inc:58 ../inc/prefs.inc:640 ../inc/prefs.inc:1050
-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
-msgid "Update"
-msgstr ""
-
-#: ../inc/host.inc:85
-msgid "Computer information"
-msgstr ""
-
-#: ../inc/host.inc:89 ../inc/host.inc:94
-msgid "IP address"
-msgstr ""
-
-#: ../inc/host.inc:89
-msgid "(same the last %1 times)"
-msgstr ""
-
-#: ../inc/host.inc:91
-msgid "External IP address"
-msgstr ""
-
-#: ../inc/host.inc:94
-msgid "Show IP address"
-msgstr ""
-
-#: ../inc/host.inc:96
-msgid "Domain name"
-msgstr ""
-
-#: ../inc/host.inc:98
-msgid "Product name"
-msgstr ""
-
-#: ../inc/host.inc:102
-msgid "Local Standard Time"
-msgstr ""
-
-#: ../inc/host.inc:102
-msgid "UTC %1 hours"
-msgstr ""
-
-#: ../inc/host.inc:106 ../inc/host.inc:108 ../inc/host.inc:222
-msgid "Owner"
-msgstr ""
-
-#: ../inc/host.inc:108 ../inc/host.inc:355
-msgid "Anonymous"
-msgstr ""
-
-#: ../inc/host.inc:112 ../inc/result.inc:630
-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
-msgid "Total credit"
-msgstr ""
-
-#: ../inc/host.inc:114 ../inc/user.inc:125 ../user/team_search.php:70
-#: ../user/user_search.php:139
-msgid "Average credit"
-msgstr ""
-
-#: ../inc/host.inc:116
-msgid "Cross project credit"
-msgstr ""
-
-#: ../inc/host.inc:118
-msgid "CPU type"
-msgstr ""
-
-#: ../inc/host.inc:119
-msgid "Number of processors"
-msgstr ""
-
-#: ../inc/host.inc:121
-msgid "Coprocessors"
-msgstr ""
-
-#: ../inc/host.inc:123 ../inc/host.inc:687
-msgid "Operating System"
-msgstr ""
-
-#: ../inc/host.inc:126 ../inc/host.inc:235
-msgid "BOINC version"
-msgstr ""
-
-#: ../inc/host.inc:130
-msgid "Memory"
-msgstr ""
-
-#: ../inc/host.inc:130 ../inc/host.inc:140
-msgid "%1 MB"
-msgstr ""
-
-#: ../inc/host.inc:134
-msgid "Cache"
-msgstr ""
-
-#: ../inc/host.inc:134
-msgid "%1 KB"
-msgstr ""
-
-#: ../inc/host.inc:140
-msgid "Swap space"
-msgstr ""
-
-#: ../inc/host.inc:143
-msgid "Total disk space"
-msgstr ""
-
-#: ../inc/host.inc:143 ../inc/host.inc:146
-msgid "%1 GB"
-msgstr ""
-
-#: ../inc/host.inc:146
-msgid "Free Disk Space"
-msgstr ""
-
-#: ../inc/host.inc:150
-msgid "Measured floating point speed"
-msgstr ""
-
-#: ../inc/host.inc:150 ../inc/host.inc:153
-msgid "%1 million ops/sec"
-msgstr ""
-
-#: ../inc/host.inc:153
-msgid "Measured integer speed"
-msgstr ""
-
-#: ../inc/host.inc:157 ../inc/host.inc:159
-msgid "Average upload rate"
-msgstr ""
-
-#: ../inc/host.inc:157 ../inc/host.inc:164
-msgid "%1 KB/sec"
-msgstr ""
-
-#: ../inc/host.inc:159 ../inc/host.inc:166 ../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
-msgid "Average download rate"
-msgstr ""
-
-#: ../inc/host.inc:169 ../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
-msgid "%1 days"
-msgstr ""
-
-#: ../inc/host.inc:170
-msgid "Application details"
-msgstr ""
-
-#: ../inc/host.inc:171
-msgid "Show"
-msgstr ""
-
-#: ../inc/host.inc:181 ../inc/host.inc:336 ../inc/user.inc:152
-msgid "Tasks"
-msgstr ""
-
-#: ../inc/host.inc:185 ../inc/host.inc:206
-msgid "Number of times client has contacted server"
-msgstr ""
-
-#: ../inc/host.inc:186
-msgid "Last time contacted server"
-msgstr ""
-
-#: ../inc/host.inc:187
-#, php-format
-msgid "% of time BOINC is running"
-msgstr ""
-
-#: ../inc/host.inc:189
-#, php-format
-msgid "While BOINC running, % of time host has an Internet connection"
-msgstr ""
-
-#: ../inc/host.inc:191
-#, php-format
-msgid "While BOINC running, % of time work is allowed"
-msgstr ""
-
-#: ../inc/host.inc:193
-msgid "Average CPU efficiency"
-msgstr ""
-
-#: ../inc/host.inc:196
-msgid "Task duration correction factor"
-msgstr ""
-
-#: ../inc/host.inc:198 ../inc/host.inc:674
-msgid "Location"
-msgstr ""
-
-#: ../inc/host.inc:200
-msgid "Delete this computer"
-msgstr ""
-
-#: ../inc/host.inc:204
-msgid "Merge duplicate records of this computer"
-msgstr ""
-
-#: ../inc/host.inc:204
-msgid "Merge"
-msgstr ""
-
-#: ../inc/host.inc:207 ../inc/host.inc:689
-msgid "Last contact"
-msgstr ""
-
-#: ../inc/host.inc:220
-msgid "Computer info"
-msgstr ""
-
-#: ../inc/host.inc:221 ../inc/host.inc:676 ../inc/team.inc:357
-#: ../user/top_users.php:48
-msgid "Rank"
-msgstr ""
-
-#: ../inc/host.inc:225 ../inc/host.inc:679
-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
-#: ../user/top_users.php:58
-msgid "Recent average credit"
-msgstr ""
-
-#: ../inc/host.inc:236 ../inc/host.inc:684 ../inc/result.inc:51
-#: ../user/host_app_versions.php:25
-msgid "CPU"
-msgstr ""
-
-#: ../inc/host.inc:237 ../inc/host.inc:685
-msgid "GPU"
-msgstr ""
-
-#: ../inc/host.inc:238
-msgid "Operating system"
-msgstr ""
-
-#: ../inc/host.inc:315
-msgid "(%1 processors)"
-msgstr ""
-
-#: ../inc/host.inc:335
-msgid "Details"
-msgstr ""
-
-#: ../inc/host.inc:340
-msgid "Cross-project stats:"
-msgstr ""
-
-#: ../inc/host.inc:515
-msgid "Host %1 has overlapping lifetime:"
-msgstr ""
-
-#: ../inc/host.inc:522
-msgid "Host %1 has an incompatible OS:"
-msgstr ""
-
-#: ../inc/host.inc:528
-msgid "Host %1 has an incompatible CPU:"
-msgstr ""
-
-#: ../inc/host.inc:595
-msgid "same host"
-msgstr ""
-
-#: ../inc/host.inc:598
-msgid "Can't merge host %1 into %2 - they're incompatible"
-msgstr ""
-
-#: ../inc/host.inc:601
-msgid "Merging host %1 into host %2"
-msgstr ""
-
-#: ../inc/host.inc:618
-msgid "Couldn't update credit of new computer"
-msgstr ""
-
-#: ../inc/host.inc:622
-msgid "Couldn't update results"
-msgstr ""
-
-#: ../inc/host.inc:627
-msgid "Couldn't retire old computer"
-msgstr ""
-
-#: ../inc/host.inc:629
-msgid "Retired old computer %1"
-msgstr ""
-
-#: ../inc/host.inc:652 ../inc/host.inc:655
-msgid "Show:"
-msgstr ""
-
-#: ../inc/host.inc:652 ../inc/host.inc:655
-msgid "All computers"
-msgstr ""
-
-#: ../inc/host.inc:652 ../inc/host.inc:655
-msgid "Only computers active in past 30 days"
-msgstr ""
-
-#: ../inc/host.inc:666 ../inc/result.inc:637
-msgid "Computer ID"
-msgstr ""
-
-#: ../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
-msgid "BOINC<br>version"
-msgstr ""
-
-#: ../inc/host.inc:745 ../user/merge_by_name.php:65
-msgid "Merge computers by name"
-msgstr ""
-
-#: ../inc/language_names.inc:61
-msgid "Browser default"
-msgstr ""
-
-#: ../inc/news.inc:40
-msgid "Comment"
-msgstr ""
-
-#: ../inc/news.inc:111
-#, php-format
-msgid "News is available as an %sRSS feed%s"
-msgstr ""
-
-#: ../inc/pm.inc:25 ../inc/pm.inc:174 ../user/pm.php:69 ../user/pm.php:148
-msgid "Inbox"
-msgstr ""
-
-#: ../inc/pm.inc:26 ../inc/pm.inc:178
-msgid "Write"
-msgstr ""
-
-#: ../inc/pm.inc:33 ../inc/user.inc:378
-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
-msgid "Preview"
-msgstr ""
-
-#: ../inc/pm.inc:48 ../user/pm.php:131
-msgid "no such message"
-msgstr ""
-
-#: ../inc/pm.inc:82
-msgid "To"
-msgstr ""
-
-#: ../inc/pm.inc:82
-msgid "User IDs or unique usernames, separated with commas"
-msgstr ""
-
-#: ../inc/pm.inc:85 ../user/pm.php:90 ../user/pm.php:139
-msgid "Subject"
-msgstr ""
-
-#: ../inc/pm.inc:89
-msgid "Send message"
-msgstr ""
-
-#: ../inc/pm.inc:121
-msgid "sent you a private message; subject:"
-msgstr ""
-
-#: ../inc/pm.inc:127
-msgid "Private message%1 from %2, subject:"
-msgstr ""
-
-#: ../inc/pm.inc:135
-msgid "Couldn't create message"
-msgstr ""
-
-#: ../inc/pm.inc:166
-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
-msgid "unread"
-msgstr ""
-
-#: ../inc/pm.inc:186
-msgid "For email notification, %1edit community prefs%2"
-msgstr ""
-
-#: ../inc/pm.inc:198
-msgid "Private message"
-msgstr ""
-
-#: ../inc/prefs.inc:77
-msgid ""
-"Suspend work while computer is on battery power? %1 Matters only for "
-"portable computers %2"
-msgstr ""
-
-#: ../inc/prefs.inc:85
-msgid "Suspend work while computer is in use?"
-msgstr ""
-
-#: ../inc/prefs.inc:91
-msgid ""
-"Suspend GPU work while computer is in use? %1 Enforced by version 6.6.21+ %2"
-msgstr ""
-
-#: ../inc/prefs.inc:99
-msgid "'In use' means mouse/keyboard activity in last"
-msgstr ""
-
-#: ../inc/prefs.inc:101 ../inc/prefs.inc:110 ../inc/prefs.inc:144
-msgid "minutes"
-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 ""
-
-#: ../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 ""
-
-#: ../inc/prefs.inc:122
-msgid "Do work only between the hours of %1 No restriction if equal %2"
-msgstr ""
-
-#: ../inc/prefs.inc:130
-msgid ""
-"Leave tasks in memory while suspended? %1 Suspended tasks will consume swap "
-"space if 'yes' %2"
-msgstr ""
-
-#: ../inc/prefs.inc:139
-msgid "Switch between tasks every %1 Recommended: 60 minutes %2"
-msgstr ""
-
-#: ../inc/prefs.inc:147
-msgid "On multiprocessors, use at most"
-msgstr ""
-
-#: ../inc/prefs.inc:149
-msgid "processors"
-msgstr ""
-
-#: ../inc/prefs.inc:153
-msgid "On multiprocessors, use at most %1 Enforced by version 6.1+ %2"
-msgstr ""
-
-#: ../inc/prefs.inc:158
-#, php-format
-msgid "% of the processors"
-msgstr ""
-
-#: ../inc/prefs.inc:162
-msgid "Use at most %1 Can be used to reduce CPU heat %2"
-msgstr ""
-
-#: ../inc/prefs.inc:167
-#, php-format
-msgid "% of CPU time"
-msgstr ""
-
-#: ../inc/prefs.inc:175 ../inc/prefs.inc:189
-msgid "Disk: use at most"
-msgstr ""
-
-#: ../inc/prefs.inc:177 ../inc/prefs.inc:186
-msgid "GB"
-msgstr ""
-
-#: ../inc/prefs.inc:180
-msgid "Disk: leave free at least %1 Values smaller than %2 are ignored %3"
-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:194
-msgid "Tasks checkpoint to disk at most every"
-msgstr ""
-
-#: ../inc/prefs.inc:196
-msgid "seconds"
-msgstr ""
-
-#: ../inc/prefs.inc:199
-msgid "Swap space: use at most"
-msgstr ""
-
-#: ../inc/prefs.inc:204
-msgid "Memory: when computer is in use, use at most"
-msgstr ""
-
-#: ../inc/prefs.inc:209
-msgid "Memory: when computer is not in use, use at most"
-msgstr ""
-
-#: ../inc/prefs.inc:218
-msgid "Maintain enough tasks to keep busy for at least%1(max 10 days).%2"
-msgstr ""
-
-#: ../inc/prefs.inc:223 ../inc/prefs.inc:228 ../inc/prefs.inc:270
-#: ../inc/util.inc:274
-msgid "days"
-msgstr ""
-
-#: ../inc/prefs.inc:226
-msgid "... and up to an additional"
-msgstr ""
-
-#: ../inc/prefs.inc:232
-msgid ""
-"Confirm before connecting to Internet? %1 Matters only if you have a modem, "
-"ISDN or VPN connection %2"
-msgstr ""
-
-#: ../inc/prefs.inc:241
-msgid ""
-"Disconnect when done? %1 Matters only if you have a modem, ISDN or VPN "
-"connection %2"
-msgstr ""
-
-#: ../inc/prefs.inc:249
-msgid "Maximum download rate:"
-msgstr ""
-
-#: ../inc/prefs.inc:251 ../inc/prefs.inc:256
-msgid "Kbytes/sec"
-msgstr ""
-
-#: ../inc/prefs.inc:254
-msgid "Maximum upload rate:"
-msgstr ""
-
-#: ../inc/prefs.inc:259
-msgid "Use network only between the hours of"
-msgstr ""
-
-#: ../inc/prefs.inc:263
-msgid "Transfer at most %1 Enforced by version 6.10.46+ %2"
-msgstr ""
-
-#: ../inc/prefs.inc:269
-msgid "Mbytes every"
-msgstr ""
-
-#: ../inc/prefs.inc:274
-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 ""
-
-#: ../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 ""
-
-#: ../inc/prefs.inc:298
-msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
-msgstr ""
-
-#: ../inc/prefs.inc:308
-msgid "Use CPU %1 Enforced by version 6.10+ %2"
-msgstr ""
-
-#: ../inc/prefs.inc:320
-msgid "Use ATI GPU %1 Enforced by version 6.10+ %2"
-msgstr ""
-
-#: ../inc/prefs.inc:332
-msgid "Use NVIDIA GPU %1 Enforced by version 6.10+ %2"
-msgstr ""
-
-#: ../inc/prefs.inc:344
-msgid "Use Intel GPU %1 Enforced by version 7.2+ %2"
-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 ""
-
-#: ../inc/prefs.inc:367
-msgid ""
-"Emails will be sent from %1; make sure your spam filter accepts this address."
-msgstr ""
-
-#: ../inc/prefs.inc:374
-msgid "Is it OK for %1 and your team (if any) to email you?"
-msgstr ""
-
-#: ../inc/prefs.inc:380
-msgid "Should %1 show your computers on its web site?"
-msgstr ""
-
-#: ../inc/prefs.inc:387
-msgid "Disk and memory usage"
-msgstr ""
-
-#: ../inc/prefs.inc:388
-msgid "Processor usage"
-msgstr ""
-
-#: ../inc/prefs.inc:389
-msgid "Network usage"
-msgstr ""
-
-#: ../inc/prefs.inc:392
-msgid ""
-"These preferences apply to all the BOINC projects in which you participate."
-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 ""
-
-#: ../inc/prefs.inc:445
-msgid "bad venue: %1"
-msgstr ""
-
-#: ../inc/prefs.inc:451
-msgid "bad subset: %1"
-msgstr ""
-
-#: ../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: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:679 ../user/forum_search.php:53
-msgid "no limit"
-msgstr ""
-
-#: ../inc/prefs.inc:704 ../user/team_admins.php:79
-msgid "Add"
-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:812 ../user/explain_state.php:94
-msgid "Computing"
-msgstr ""
-
-#: ../inc/prefs.inc:823
-msgid "Separate preferences for %1"
-msgstr ""
-
-#: ../inc/prefs.inc:833 ../inc/prefs.inc:914
-msgid "Edit preferences"
-msgstr ""
-
-#: ../inc/prefs.inc:839
-msgid "Add separate preferences for %1"
-msgstr ""
-
-#: ../inc/prefs.inc:847 ../inc/prefs.inc:895
-msgid "(Switch View)"
-msgstr ""
-
-#: ../inc/prefs.inc:849 ../inc/prefs.inc:898
-msgid "Combined preferences"
-msgstr ""
-
-#: ../inc/prefs.inc:854
-msgid "Project specific settings"
-msgstr ""
-
-#: ../inc/prefs.inc:862 ../inc/prefs.inc:907
-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 ""
-
-#: ../inc/prefs.inc:885
-msgid "These apply to all BOINC projects in which you participate."
-msgstr ""
-
-#: ../inc/prefs.inc:887
-msgid ""
-"On computers participating in multiple projects, the most recently modified "
-"preferences will be used."
-msgstr ""
-
-#: ../inc/prefs.inc:889
-msgid "These preferences do not apply to Android devices."
-msgstr ""
-
-#: ../inc/prefs.inc:892
-msgid "Preferences last modified:"
-msgstr ""
-
-#: ../inc/prefs.inc:944
-msgid "Add preferences"
-msgstr ""
-
-#: ../inc/prefs.inc:948
-msgid "Update preferences"
-msgstr ""
-
-#: ../inc/prefs.inc:1036 ../inc/prefs.inc:1045
-msgid "Default computer location"
-msgstr ""
-
-#: ../inc/prefs_util.inc:305 ../inc/prefs_util.inc:315
-msgid "and"
-msgstr ""
-
-#: ../inc/profile.inc:86
-msgid ""
-"Your profile will be made visible to other people as soon as it has been "
-"approved by the project. This may take up to a few days."
-msgstr ""
-
-#: ../inc/profile.inc:92
-msgid ""
-"Your profile has been marked as unacceptable. It is not visible to other "
-"people. Please change it."
-msgstr ""
-
-#: ../inc/profile.inc:172 ../user/friend.php:105 ../user/friend.php:172
-msgid "Database error"
-msgstr ""
-
-#: ../inc/profile.inc:193
-msgid ""
-"To prevent spam, profiles of users with an average credit of less than %1 "
-"are displayed only to logged-in users. We apologize for this inconvenience."
-msgstr ""
-
-#: ../inc/profile.inc:197
-msgid "User is banished"
-msgstr ""
-
-#: ../inc/profile.inc:211
-msgid "No profile exists for that user ID."
-msgstr ""
-
-#: ../inc/profile.inc:219 ../user/create_profile.php:313
-msgid "Edit your profile"
-msgstr ""
-
-#: ../inc/profile.inc:262
-msgid "Your feedback on this profile"
-msgstr ""
-
-#: ../inc/profile.inc:264
-msgid "Recommend this profile for User of the Day:"
-msgstr ""
-
-#: ../inc/profile.inc:265
-msgid "I %1like%2 this profile"
-msgstr ""
-
-#: ../inc/profile.inc:268
-msgid "Alert administrators to an offensive profile:"
-msgstr ""
-
-#: ../inc/profile.inc:269
-msgid "I %1do not like%2 this profile"
-msgstr ""
-
-#: ../inc/result.inc:35
-msgid "Anonymous platform"
-msgstr ""
-
-#: ../inc/result.inc:53 ../user/host_app_versions.php:26
-msgid "NVIDIA GPU"
-msgstr ""
-
-#: ../inc/result.inc:55 ../user/host_app_versions.php:27
-msgid "ATI GPU"
-msgstr ""
-
-#: ../inc/result.inc:57 ../user/host_app_versions.php:28
-msgid "Intel GPU"
-msgstr ""
-
-#: ../inc/result.inc:65
-msgid "Not in DB"
-msgstr ""
-
-#: ../inc/result.inc:91
-msgid "pending"
-msgstr ""
-
-#: ../inc/result.inc:114 ../user/forum_search.php:60
-msgid "All"
-msgstr ""
-
-#: ../inc/result.inc:115 ../inc/result.inc:176 ../inc/result.inc:223
-msgid "In progress"
-msgstr ""
-
-#: ../inc/result.inc:116
-msgid "Validation pending"
-msgstr ""
-
-#: ../inc/result.inc:117
-msgid "Validation inconclusive"
-msgstr ""
-
-#: ../inc/result.inc:118 ../inc/result.inc:268
-msgid "Valid"
-msgstr ""
-
-#: ../inc/result.inc:119 ../inc/result.inc:271
-msgid "Invalid"
-msgstr ""
-
-#: ../inc/result.inc:120 ../inc/result.inc:209
-msgid "Error"
-msgstr ""
-
-#: ../inc/result.inc:174 ../inc/result.inc:221 ../user/explain_state.php:34
-msgid "Inactive"
-msgstr ""
-
-#: ../inc/result.inc:175 ../inc/result.inc:222 ../user/explain_state.php:37
-msgid "Unsent"
-msgstr ""
-
-#: ../inc/result.inc:181
-msgid "Completed, waiting for validation"
-msgstr ""
-
-#: ../inc/result.inc:182
-msgid "Completed and validated"
-msgstr ""
-
-#: ../inc/result.inc:183
-msgid "Completed, marked as invalid"
-msgstr ""
-
-#: ../inc/result.inc:184
-msgid "Completed, can't validate"
-msgstr ""
-
-#: ../inc/result.inc:185
-msgid "Completed, validation inconclusive"
-msgstr ""
-
-#: ../inc/result.inc:186
-msgid "Completed, too late to validate"
-msgstr ""
-
-#: ../inc/result.inc:188
-msgid "Completed"
-msgstr ""
-
-#: ../inc/result.inc:189 ../inc/result.inc:233 ../user/explain_state.php:62
-msgid "Couldn't send"
-msgstr ""
-
-#: ../inc/result.inc:194 ../inc/result.inc:257
-msgid "Cancelled by server"
-msgstr ""
-
-#: ../inc/result.inc:199
-msgid "Not started by deadline - canceled"
-msgstr ""
-
-#: ../inc/result.inc:202
-msgid "Error while downloading"
-msgstr ""
-
-#: ../inc/result.inc:204
-msgid "Error while computing"
-msgstr ""
-
-#: ../inc/result.inc:205
-msgid "Error while uploading"
-msgstr ""
-
-#: ../inc/result.inc:206 ../inc/result.inc:259
-msgid "Aborted by user"
-msgstr ""
-
-#: ../inc/result.inc:207 ../inc/result.inc:260
-msgid "Upload failed"
-msgstr ""
-
-#: ../inc/result.inc:210
-msgid "Timed out - no response"
-msgstr ""
-
-#: ../inc/result.inc:211 ../inc/result.inc:240 ../user/explain_state.php:71
-msgid "Didn't need"
-msgstr ""
-
-#: ../inc/result.inc:212 ../inc/result.inc:241 ../user/explain_state.php:74
-msgid "Validate error"
-msgstr ""
-
-#: ../inc/result.inc:213 ../inc/result.inc:242
-msgid "Abandoned"
-msgstr ""
-
-#: ../inc/result.inc:224 ../user/explain_state.php:43
-msgid "Over"
-msgstr ""
-
-#: ../inc/result.inc:232 ../user/explain_state.php:59
-msgid "Success"
-msgstr ""
-
-#: ../inc/result.inc:236
-msgid "Computation error"
-msgstr ""
-
-#: ../inc/result.inc:238
-msgid "Redundant result"
-msgstr ""
-
-#: ../inc/result.inc:239 ../user/explain_state.php:68
-msgid "No reply"
-msgstr ""
-
-#: ../inc/result.inc:249 ../user/explain_state.php:85
-msgid "New"
-msgstr ""
-
-#: ../inc/result.inc:250 ../user/explain_state.php:91
-msgid "Downloading"
-msgstr ""
-
-#: ../inc/result.inc:251
-msgid "Processing"
-msgstr ""
-
-#: ../inc/result.inc:252
-msgid "Compute error"
-msgstr ""
-
-#: ../inc/result.inc:253 ../user/explain_state.php:97
-msgid "Uploading"
-msgstr ""
-
-#: ../inc/result.inc:254 ../user/explain_state.php:88
-msgid "Done"
-msgstr ""
-
-#: ../inc/result.inc:267
-msgid "Initial"
-msgstr ""
-
-#: ../inc/result.inc:273
-msgid "Not necessary"
-msgstr ""
-
-#: ../inc/result.inc:274
-msgid "Workunit error - check skipped"
-msgstr ""
-
-#: ../inc/result.inc:275
-msgid "Checked, but no consensus yet"
-msgstr ""
-
-#: ../inc/result.inc:276
-msgid "Task was reported too late to validate"
-msgstr ""
-
-#: ../inc/result.inc:302
-msgid "Couldn't send result"
-msgstr ""
-
-#: ../inc/result.inc:306
-msgid "Too many errors (may have bug)"
-msgstr ""
-
-#: ../inc/result.inc:310
-msgid "Too many results (may be nondeterministic)"
-msgstr ""
-
-#: ../inc/result.inc:314
-msgid "Too many total results"
-msgstr ""
-
-#: ../inc/result.inc:318
-msgid "WU cancelled"
-msgstr ""
-
-#: ../inc/result.inc:322
-msgid "Unrecognized Error: %1"
-msgstr ""
-
-#: ../inc/result.inc:349
-msgid "Task name"
-msgstr ""
-
-#: ../inc/result.inc:349 ../inc/result.inc:354 ../inc/result.inc:357
-#: ../inc/result.inc:360
-msgid "click for details"
-msgstr ""
-
-#: ../inc/result.inc:349
-msgid "Show IDs"
-msgstr ""
-
-#: ../inc/result.inc:354
-msgid "Show names"
-msgstr ""
-
-#: ../inc/result.inc:357
-msgid "Task"
-msgstr ""
-
-#: ../inc/result.inc:360
-msgid "Work unit"
-msgstr ""
-
-#: ../inc/result.inc:369
-msgid "Computer"
-msgstr ""
-
-#: ../inc/result.inc:372 ../inc/result.inc:631
-msgid "Sent"
-msgstr ""
-
-#: ../inc/result.inc:373
-msgid "Time reported<br />or deadline"
-msgstr ""
-
-#: ../inc/result.inc:374
-msgid "explain"
-msgstr ""
-
-#: ../inc/result.inc:376 ../user/server_status.php:241
-msgid "Status"
-msgstr ""
-
-#: ../inc/result.inc:377
-msgid "Run time<br />(sec)"
-msgstr ""
-
-#: ../inc/result.inc:378
-msgid "CPU time<br />(sec)"
-msgstr ""
-
-#: ../inc/result.inc:379 ../inc/result.inc:642
-msgid "Credit"
-msgstr ""
-
-#: ../inc/result.inc:380 ../inc/result.inc:724
-msgid "Application"
-msgstr ""
-
-#: ../inc/result.inc:629
-msgid "Workunit"
-msgstr ""
-
-#: ../inc/result.inc:632
-msgid "Received"
-msgstr ""
-
-#: ../inc/result.inc:633
-msgid "Server state"
-msgstr ""
-
-#: ../inc/result.inc:634
-msgid "Outcome"
-msgstr ""
-
-#: ../inc/result.inc:635
-msgid "Client state"
-msgstr ""
-
-#: ../inc/result.inc:636
-msgid "Exit status"
-msgstr ""
-
-#: ../inc/result.inc:638
-msgid "Report deadline"
-msgstr ""
-
-#: ../inc/result.inc:639
-msgid "Run time"
-msgstr ""
-
-#: ../inc/result.inc:640
-msgid "CPU time"
-msgstr ""
-
-#: ../inc/result.inc:641
-msgid "Validate state"
-msgstr ""
-
-#: ../inc/result.inc:643
-msgid "Application version"
-msgstr ""
-
-#: ../inc/result.inc:656
-msgid "Output files"
-msgstr ""
-
-#: ../inc/result.inc:659
-msgid "Stderr output"
-msgstr ""
-
-#: ../inc/result.inc:706
-msgid "State"
-msgstr ""
-
-#: ../inc/result.inc:747
-msgid "Task name:"
-msgstr ""
-
-#: ../inc/team.inc:40
-msgid "Search criteria (use one or more)"
-msgstr ""
-
-#: ../inc/team.inc:41
-msgid "Key words"
-msgstr ""
-
-#: ../inc/team.inc:41
-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
-msgid "Type of team"
-msgstr ""
-
-#: ../inc/team.inc:51
-msgid "Show only active teams"
-msgstr ""
-
-#: ../inc/team.inc:52 ../user/profile_menu.php:76 ../user/user_search.php:70
-msgid "Search"
-msgstr ""
-
-#: ../inc/team.inc:61
-msgid "Requested by you, and founder response deadline has passed."
-msgstr ""
-
-#: ../inc/team.inc:63
-msgid "Complete foundership transfer"
-msgstr ""
-
-#: ../inc/team.inc:67
-msgid "Requested by you"
-msgstr ""
-
-#: ../inc/team.inc:67
-msgid "founder response deadline is %1"
-msgstr ""
-
-#: ../inc/team.inc:72 ../inc/team.inc:555 ../inc/user.inc:281
-#: ../inc/user.inc:371
-msgid "None"
-msgstr ""
-
-#: ../inc/team.inc:74
-msgid "Initiate request"
-msgstr ""
-
-#: ../inc/team.inc:77
-msgid "Deferred"
-msgstr ""
-
-#: ../inc/team.inc:87
-msgid "Team info"
-msgstr ""
-
-#: ../inc/team.inc:89 ../user/team_forum.php:70 ../user/team_search.php:69
-msgid "Description"
-msgstr ""
-
-#: ../inc/team.inc:97
-msgid "Web site"
-msgstr ""
-
-#: ../inc/team.inc:120
-msgid "Cross-project stats"
-msgstr ""
-
-#: ../inc/team.inc:123 ../inc/team.inc:374 ../user/team_search.php:71
-msgid "Type"
-msgstr ""
-
-#: ../inc/team.inc:127 ../user/team_manage.php:63
-msgid "Message board"
-msgstr ""
-
-#: ../inc/team.inc:128 ../user/forum_forum.php:135 ../user/forum_index.php:93
-msgid "Threads"
-msgstr ""
-
-#: ../inc/team.inc:136
-msgid "Join this team"
-msgstr ""
-
-#: ../inc/team.inc:137
-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
-msgid "Not accepting new members"
-msgstr ""
-
-#: ../inc/team.inc:147
-msgid "Foundership change requested"
-msgstr ""
-
-#: ../inc/team.inc:148
-msgid "Respond by %1"
-msgstr ""
-
-#: ../inc/team.inc:152
-msgid "Team foundership change"
-msgstr ""
-
-#: ../inc/team.inc:156 ../inc/team.inc:359
-msgid "Members"
-msgstr ""
-
-#: ../inc/team.inc:157 ../inc/team.inc:254
-msgid "Founder"
-msgstr ""
-
-#: ../inc/team.inc:169
-msgid "Admins"
-msgstr ""
-
-#: ../inc/team.inc:184
-msgid "New members in last day"
-msgstr ""
-
-#: ../inc/team.inc:185
-msgid "Total members"
-msgstr ""
-
-#: ../inc/team.inc:185 ../inc/team.inc:186 ../inc/team.inc:187
-msgid "view"
-msgstr ""
-
-#: ../inc/team.inc:186
-msgid "Active members"
-msgstr ""
-
-#: ../inc/team.inc:187
-msgid "Members with credit"
-msgstr ""
-
-#: ../inc/team.inc:256
-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
-msgid "Previous %1"
-msgstr ""
-
-#: ../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
-msgid "Next %1"
-msgstr ""
-
-#: ../inc/team.inc:289
-msgid "No such team."
-msgstr ""
-
-#: ../inc/team.inc:302
-msgid "This operation requires foundership."
-msgstr ""
-
-#: ../inc/team.inc:326
-msgid "This operation requires team admin privileges"
-msgstr ""
-
-#: ../inc/team.inc:422
-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 ""
-
-#: ../inc/team.inc:428
-msgid ""
-"%1Privacy note%2: if you create a team, your project preferences (resource "
-"share, graphics preferences) will be visible to the public."
-msgstr ""
-
-#: ../inc/team.inc:432
-msgid "Team name, text version"
-msgstr ""
-
-#: ../inc/team.inc:433
-msgid "Don't use HTML tags."
-msgstr ""
-
-#: ../inc/team.inc:436
-msgid "Team name, HTML version"
-msgstr ""
-
-#: ../inc/team.inc:438 ../inc/team.inc:448
-msgid "You may use %1limited HTML tags%2."
-msgstr ""
-
-#: ../inc/team.inc:439
-msgid "If you don't know HTML, leave this box blank."
-msgstr ""
-
-#: ../inc/team.inc:442
-msgid "URL of team web page, if any"
-msgstr ""
-
-#: ../inc/team.inc:442
-msgid "without \"http://\""
-msgstr ""
-
-#: ../inc/team.inc:443
-msgid "This URL will be linked to from the team's page on this site."
-msgstr ""
-
-#: ../inc/team.inc:446
-msgid "Description of team"
-msgstr ""
-
-#: ../inc/team.inc:462
-msgid "Accept new members?"
-msgstr ""
-
-#: ../inc/uotd.inc:28
-msgid "User profile"
-msgstr ""
-
-#: ../inc/user.inc:119
-msgid "Projects in which you are participating"
-msgstr ""
-
-#: ../inc/user.inc:121
-msgid "Projects in which %1 is participating"
-msgstr ""
-
-#: ../inc/user.inc:125
-msgid "Project"
-msgstr ""
-
-#: ../inc/user.inc:125
-msgid "Click for user page"
-msgstr ""
-
-#: ../inc/user.inc:125
-msgid "Since"
-msgstr ""
-
-#: ../inc/user.inc:148
-msgid "Computing and credit"
-msgstr ""
-
-#: ../inc/user.inc:151
-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
-msgid "View"
-msgstr ""
-
-#: ../inc/user.inc:161
-msgid "Cross-project ID"
-msgstr ""
-
-#: ../inc/user.inc:162
-msgid "Cross-project statistics"
-msgstr ""
-
-#: ../inc/user.inc:163
-msgid "Account"
-msgstr ""
-
-#: ../inc/user.inc:165 ../inc/user.inc:281 ../inc/user.inc:369
-#: ../inc/user.inc:371 ../user/user_search.php:139
-msgid "Team"
-msgstr ""
-
-#: ../inc/user.inc:167
-msgid "Cross-project"
-msgstr ""
-
-#: ../inc/user.inc:168 ../user/bs_sample_index.php:54
-msgid "Certificate"
-msgstr ""
-
-#: ../inc/user.inc:169
-msgid "Stats on your cell phone"
-msgstr ""
-
-#: ../inc/user.inc:183
-msgid "Unknown notification type: %1"
-msgstr ""
-
-#: ../inc/user.inc:198
-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
-msgid "Email address"
-msgstr ""
-
-#: ../inc/user.inc:203 ../inc/user.inc:322
-msgid "URL"
-msgstr ""
-
-#: ../inc/user.inc:206
-msgid "Postal code"
-msgstr ""
-
-#: ../inc/user.inc:207 ../inc/user.inc:316
-msgid "%1 member since"
-msgstr ""
-
-#: ../inc/user.inc:209
-msgid "Change"
-msgstr ""
-
-#: ../inc/user.inc:209
-msgid "email address"
-msgstr ""
-
-#: ../inc/user.inc:210
-msgid "password"
-msgstr ""
-
-#: ../inc/user.inc:211
-msgid "other account info"
-msgstr ""
-
-#: ../inc/user.inc:213 ../inc/user.inc:315
-msgid "User ID"
-msgstr ""
-
-#: ../inc/user.inc:213
-msgid "Used in community functions"
-msgstr ""
-
-#: ../inc/user.inc:216 ../user/weak_auth.php:25
-msgid "Account keys"
-msgstr ""
-
-#: ../inc/user.inc:221
-msgid "Preferences"
-msgstr ""
-
-#: ../inc/user.inc:224
-msgid "When and how BOINC uses your computer"
-msgstr ""
-
-#: ../inc/user.inc:225
-msgid "Computing preferences"
-msgstr ""
-
-#: ../inc/user.inc:228
-msgid "Message boards and private messages"
-msgstr ""
-
-#: ../inc/user.inc:229 ../user/edit_forum_preferences_form.php:31
-msgid "Community preferences"
-msgstr ""
-
-#: ../inc/user.inc:232
-msgid "Preferences for this project"
-msgstr ""
-
-#: ../inc/user.inc:233 ../user/prefs.php:29
-msgid "%1 preferences"
-msgstr ""
-
-#: ../inc/user.inc:239 ../user/bs_sample_index.php:59
-#: ../user/sample_index.php:125
-msgid "Community"
-msgstr ""
-
-#: ../inc/user.inc:243 ../user/pm.php:107 ../user/pm.php:147
-msgid "Delete"
-msgstr ""
-
-#: ../inc/user.inc:245
-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
-msgid "%1 posts"
-msgstr ""
-
-#: ../inc/user.inc:262 ../user/edit_forum_preferences_form.php:51
-msgid "Notifications"
-msgstr ""
-
-#: ../inc/user.inc:269
-msgid "Quit team"
-msgstr ""
-
-#: ../inc/user.inc:271 ../inc/user.inc:288
-msgid "Administer"
-msgstr ""
-
-#: ../inc/user.inc:277 ../inc/user.inc:290
-msgid "(foundership change request pending)"
-msgstr ""
-
-#: ../inc/user.inc:279
-msgid "Member of team"
-msgstr ""
-
-#: ../inc/user.inc:281
-msgid "find a team"
-msgstr ""
-
-#: ../inc/user.inc:292
-msgid "Founder but not member of"
-msgstr ""
-
-#: ../inc/user.inc:298
-msgid "Find friends"
-msgstr ""
-
-#: ../inc/user.inc:305 ../inc/user.inc:307 ../inc/user.inc:385
-#: ../inc/user.inc:387 ../inc/user.inc:396
-msgid "Friends"
-msgstr ""
-
-#: ../inc/user.inc:329 ../inc/user.inc:331 ../user/server_status.php:392
-msgid "Computers"
-msgstr ""
-
-#: ../inc/user.inc:338
-msgid "Donor"
-msgstr ""
-
-#: ../inc/user.inc:378
-msgid "Contact"
-msgstr ""
-
-#: ../inc/user.inc:381
-msgid "This person is a friend"
-msgstr ""
-
-#: ../inc/user.inc:382 ../user/friend.php:238
-msgid "Cancel friendship"
-msgstr ""
-
-#: ../inc/user.inc:385 ../user/friend.php:37
-msgid "Request pending"
-msgstr ""
-
-#: ../inc/user.inc:387
-msgid "Add as friend"
-msgstr ""
-
-#: ../inc/user.inc:446
-msgid "user name cannot have leading or trailing white space"
-msgstr ""
-
-#: ../inc/user.inc:450
-msgid "user name must be nonempty"
-msgstr ""
-
-#: ../inc/user.inc:454
-msgid "user name may not contain HTML tags"
-msgstr ""
-
-#: ../inc/util.inc:131
-msgid "log out"
-msgstr ""
-
-#: ../inc/util.inc:133
-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
-msgid "Create an account"
-msgstr ""
-
-#: ../inc/util.inc:206
-msgid "Server status page"
-msgstr ""
-
-#: ../inc/util.inc:248
-msgid ""
-"A database error occurred while handling your request; please try again "
-"later."
-msgstr ""
-
-#: ../inc/util.inc:257
-msgid "Unable to handle request"
-msgstr ""
-
-#: ../inc/util.inc:277
-msgid "hours"
-msgstr ""
-
-#: ../inc/util.inc:280
-msgid "min"
-msgstr ""
-
-#: ../inc/util.inc:283
-msgid "sec"
-msgstr ""
-
-#: ../inc/util.inc:444
-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 ""
-
-#: ../inc/util.inc:569
-msgid "Use BBCode tags to format your text"
-msgstr ""
-
-#: ../inc/util.inc:796
-msgid "Project down for maintenance"
-msgstr ""
-
-#: ../inc/util.inc:799
-msgid "%1 is temporarily shut down for maintenance.  Please try again later."
-msgstr ""
-
-#: ../inc/util.inc:817
-msgid "Unable to connect to database - please try again later"
-msgstr ""
-
-#: ../inc/util.inc:821
-msgid "Unable to select database - please try again later"
-msgstr ""
-
-#: ../inc/util_ops.inc:109 ../user/get_passwd.php:72
-msgid "Stay logged in on this computer"
-msgstr ""
-
-#: ../user/account_finish.php:34
-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 ""
-
-#: ../user/account_finish_action.php:30
-msgid "HTML tags not allowed in name"
-msgstr ""
-
-#: ../user/add_venue.php:81
-msgid "Add %1 preferences for %2"
-msgstr ""
-
-#: ../user/apps.php:32 ../user/bs_sample_index.php:55
-#: ../user/sample_index.php:120
-msgid "Applications"
-msgstr ""
-
-#: ../user/apps.php:33
-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 "
-"computer. The current version of the application will be downloaded to your "
-"computer. This happens automatically; you don't have to do anything."
-msgstr ""
-
-#: ../user/apps.php:50
-msgid "Platform"
-msgstr ""
-
-#: ../user/apps.php:51
-msgid "Version"
-msgstr ""
-
-#: ../user/apps.php:52
-msgid "Installation time"
-msgstr ""
-
-#: ../user/bbcode.php:23
-msgid "BBCode tags"
-msgstr ""
-
-#: ../user/bbcode.php:25
-msgid ""
-"BBCode tags let you format text in your profile and message-board postings.\n"
-"It's similar to HTML, but simpler. The tags start with a [ (where you would\n"
-"have used %1 in HTML) and end with ] (where you would have used %2 in\n"
-"HTML)."
-msgstr ""
-
-#: ../user/bbcode.php:31
-msgid "Examples"
-msgstr ""
-
-#: ../user/bbcode.php:32
-msgid "Bold"
-msgstr ""
-
-#: ../user/bbcode.php:33
-msgid "Italic"
-msgstr ""
-
-#: ../user/bbcode.php:34
-msgid "Underline"
-msgstr ""
-
-#: ../user/bbcode.php:35
-msgid "Superscript"
-msgstr ""
-
-#: ../user/bbcode.php:36
-msgid "Big text"
-msgstr ""
-
-#: ../user/bbcode.php:37
-msgid "Red text"
-msgstr ""
-
-#: ../user/bbcode.php:38
-msgid "link to website"
-msgstr ""
-
-#: ../user/bbcode.php:39
-msgid "Quoted text"
-msgstr ""
-
-#: ../user/bbcode.php:39
-msgid "use for quoted blocks of text"
-msgstr ""
-
-#: ../user/bbcode.php:40
-msgid "use to display an image"
-msgstr ""
-
-#: ../user/bbcode.php:41
-msgid "Code snippet here"
-msgstr ""
-
-#: ../user/bbcode.php:41
-msgid "use to display some code"
-msgstr ""
-
-#: ../user/bbcode.php:42
-msgid "Pre-formatted text"
-msgstr ""
-
-#: ../user/bbcode.php:42
-msgid "use to display pre-formatted (usually monospaced) text"
-msgstr ""
-
-#: ../user/bbcode.php:43
-msgid "Item 1"
-msgstr ""
-
-#: ../user/bbcode.php:43
-msgid "Item2"
-msgstr ""
-
-#: ../user/bbcode.php:43
-msgid "Item 2"
-msgstr ""
-
-#: ../user/bbcode.php:45
-msgid "use to link to Trac ticket on BOINC website"
-msgstr ""
-
-#: ../user/bbcode.php:47
-msgid "use to link to Trac Wiki on BOINC website"
-msgstr ""
-
-#: ../user/bbcode.php:49
-msgid "use to link to SVN changeset on BOINC website"
-msgstr ""
-
-#: ../user/bbcode.php:53
-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 ""
-
-#: ../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 ""
-
-#: ../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 ""
-
-#: ../user/create_account_action.php:29
-msgid "Click your browser's <b>Back</b> button to try again."
-msgstr ""
-
-#: ../user/create_account_action.php:47
-msgid "Your reCAPTCHA response was not correct. Please try again."
-msgstr ""
-
-#: ../user/create_account_action.php:70
-msgid "You must supply an invitation code to create an account."
-msgstr ""
-
-#: ../user/create_account_action.php:73
-msgid "The invitation code you gave is not valid."
-msgstr ""
-
-#: ../user/create_account_action.php:84
-msgid ""
-"Invalid email address: you must enter a valid address of the form name at domain"
-msgstr ""
-
-#: ../user/create_account_action.php:88
-msgid "There's already an account with that email address."
-msgstr ""
-
-#: ../user/create_account_action.php:94 ../user/edit_passwd_action.php:33
-msgid "New passwords are different"
-msgstr ""
-
-#: ../user/create_account_action.php:101 ../user/edit_passwd_action.php:41
-msgid "Passwords may only include ASCII characters."
-msgstr ""
-
-#: ../user/create_account_action.php:106 ../user/edit_passwd_action.php:45
-msgid "New password is too short: minimum password length is %1 characters."
-msgstr ""
-
-#: ../user/create_account_action.php:127
-msgid "Couldn't create account"
-msgstr ""
-
-#: ../user/create_account_form.php:44
-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 ""
-
-#: ../user/create_account_form.php:61
-msgid ""
-"This account will belong to the team %1 and will have the project "
-"preferences of its founder."
-msgstr ""
-
-#: ../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 ""
-
-#: ../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
-msgid "Picture"
-msgstr ""
-
-#: ../user/create_profile.php:64
-msgid "%1 Your profile picture is shown to the left."
-msgstr ""
-
-#: ../user/create_profile.php:66
-msgid ""
-"To replace it, click the \"Browse\" button and select a JPEG or PNG file (%1 "
-"or less)."
-msgstr ""
-
-#: ../user/create_profile.php:69
-msgid "To remove it from your profile, check this box:"
-msgstr ""
-
-#: ../user/create_profile.php:77
-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 ""
-
-#: ../user/create_profile.php:89
-msgid "Language"
-msgstr ""
-
-#: ../user/create_profile.php:92
-msgid "Select the language in which your profile is written:"
-msgstr ""
-
-#: ../user/create_profile.php:104
-msgid "Submit profile"
-msgstr ""
-
-#: ../user/create_profile.php:110
-msgid "Please enter the words shown in the image."
-msgstr ""
-
-#: ../user/create_profile.php:115
-msgid "Create/edit profile"
-msgstr ""
-
-#: ../user/create_profile.php:137
-msgid "The format of your uploaded image is not supported."
-msgstr ""
-
-#: ../user/create_profile.php:166
-msgid ""
-"Your %1profile%2 lets you share your opinions and background with the %3 "
-"community."
-msgstr ""
-
-#: ../user/create_profile.php:213
-msgid "Your ReCaptcha response was not correct.  Please try again."
-msgstr ""
-
-#: ../user/create_profile.php:222
-msgid ""
-"Your first response was flagged as spam by the Akismet anti-spam system.  "
-"Please modify your text and try again."
-msgstr ""
-
-#: ../user/create_profile.php:230
-msgid ""
-"Your second response was flagged as spam by the Akismet anti-spam system.  "
-"Please modify your text and try again."
-msgstr ""
-
-#: ../user/create_profile.php:246
-msgid "Your profile submission was empty."
-msgstr ""
-
-#: ../user/create_profile.php:285
-msgid "Could not update the profile: database error"
-msgstr ""
-
-#: ../user/create_profile.php:297
-msgid "Could not create the profile: database error"
-msgstr ""
-
-#: ../user/create_profile.php:302
-msgid "Profile saved"
-msgstr ""
-
-#: ../user/create_profile.php:304
-msgid ""
-"Congratulations! Your profile was successfully entered into our database."
-msgstr ""
-
-#: ../user/create_profile.php:306
-msgid "%1View your profile%2"
-msgstr ""
-
-#: ../user/create_profile.php:315
-msgid "Create a profile"
-msgstr ""
-
-#: ../user/create_profile.php:343
-msgid ""
-"To prevent spam, an average credit of %1 or greater is required to create or "
-"edit a profile.  We apologize for this inconvenience."
-msgstr ""
-
-#: ../user/delete_account.php:57
-msgid "Couldn't delete account"
-msgstr ""
-
-#: ../user/delete_account.php:59
-msgid "Account deleted"
-msgstr ""
-
-#: ../user/delete_account.php:60
-msgid "Your account has been deleted."
-msgstr ""
-
-#: ../user/delete_account.php:64
-msgid "Confirm delete account"
-msgstr ""
-
-#: ../user/delete_account.php:67
-msgid ""
-"Deleting your account will remove all of your\n"
-"personal information from our servers,\n"
-"including your profile and message-board posts.\n"
-"No jobs will be issued to any computers attached\n"
-"to this account."
-msgstr ""
-
-#: ../user/delete_account.php:73
-msgid ""
-"This cannot be undone.\n"
-"Once your account has been deleted, you cannot get it back."
-msgstr ""
-
-#: ../user/delete_account.php:76
-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/user_search.php:64
-msgid "Yes"
-msgstr ""
-
-#: ../user/delete_account.php:79
-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/user_search.php:63
-msgid "No"
-msgstr ""
-
-#: ../user/delete_account.php:80
-msgid "Do not delete this account"
-msgstr ""
-
-#: ../user/delete_profile.php:30
-msgid "couldn't delete profile - please try again later"
-msgstr ""
-
-#: ../user/delete_profile.php:33
-msgid "Delete Confirmation"
-msgstr ""
-
-#: ../user/delete_profile.php:35
-msgid "Your profile has been deleted."
-msgstr ""
-
-#: ../user/delete_profile.php:40
-msgid "Profile delete confirmation"
-msgstr ""
-
-#: ../user/delete_profile.php:43
-msgid "Are you sure?"
-msgstr ""
-
-#: ../user/delete_profile.php:44
-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 ""
-
-#: ../user/delete_profile.php:48
-msgid ""
-"If you're sure, click 'Yes'\n"
-"to remove your profile from our database."
-msgstr ""
-
-#: ../user/delete_profile.php:52
-msgid "Delete my profile"
-msgstr ""
-
-#: ../user/delete_profile.php:53
-msgid "Do not delete my profile"
-msgstr ""
-
-#: ../user/donated.php:25
-msgid "PayPal - Transaction Completed"
-msgstr ""
-
-#: ../user/donated.php:28
-msgid "Thank you for donating!"
-msgstr ""
-
-#: ../user/donated.php:29
-msgid "Your donation for has been completed."
-msgstr ""
-
-#: ../user/donated.php:30
-msgid ""
-"Your donation will be added to the progress bar after confirmation by PayPal."
-msgstr ""
-
-#: ../user/donated.php:32
-msgid "You have canceled your donation."
-msgstr ""
-
-#: ../user/donations.php:24
-msgid "This project is not accepting donations."
-msgstr ""
-
-#: ../user/donations.php:34
-msgid "%1 donations"
-msgstr ""
-
-#: ../user/donations.php:39
-msgid ""
-"This project is accepting donations via\n"
-"%1."
-msgstr ""
-
-#: ../user/donations.php:42
-msgid ""
-"To donate, fill in the amount you want to donate using the field below.\n"
-"        PayPal is accepting multiple currencies\n"
-"        (Canadian Dollars, Euros, Pounds Sterling, U.S. Dollars,\n"
-"         Yen, Australian Dollars, New Zealand Dollars,\n"
-"        Swiss Francs, Hong Kong Dollars, Singapore Dollars, Swedish Kronor,\n"
-"        Danish Kroner, Polish Zloty, Norwegian Kroner,\n"
-"        Hungarian Forint, Czech Koruna).\n"
-"        You can use included currency converter\n"
-"        to see the donation amount equivalent in different currencies\n"
-"        (please note that the rates are only estimates\n"
-"         and the actual amount may differ)."
-msgstr ""
-
-#: ../user/donations.php:316
-msgid "Amount you would like to donate"
-msgstr ""
-
-#: ../user/donations.php:317
-msgid "Estimated value in"
-msgstr ""
-
-#: ../user/donations.php:320 ../user/donations.php:324
-msgid "Anonymous donation"
-msgstr ""
-
-#: ../user/donations.php:320
-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 ""
-
-#: ../user/donations.php:324
-msgid "To assign the donation with your user ID, please log in."
-msgstr ""
-
-#: ../user/donations.php:328
-msgid "Proceed"
-msgstr ""
-
-#: ../user/donations.php:329
-msgid "Donations are accepted through"
-msgstr ""
-
-#: ../user/download_network.php:25
-msgid "Download BOINC add-on software"
-msgstr ""
-
-#: ../user/download_network.php:28
-msgid "You can download applications in several categories."
-msgstr ""
-
-#: ../user/download_network.php:31
-msgid ""
-"These applications are not endorsed by %1 and you use them at your own risk."
-msgstr ""
-
-#: ../user/download_network.php:33
-msgid ""
-"We do not provide instructions for installing these applications.\n"
-"However, the author may have provided some help on installing or "
-"uninstalling the application. \n"
-"If this is not enough you should contact the author."
-msgstr ""
-
-#: ../user/download_network.php:36
-msgid "Instructions for installing and running BOINC are %1here%2."
-msgstr ""
-
-#: ../user/download_network.php:38
-msgid "This list is managed centrally at %1the BOINC website%2."
-msgstr ""
-
-#: ../user/edit_email_action.php:31
-msgid "Change email address of account"
-msgstr ""
-
-#: ../user/edit_email_action.php:34 ../user/edit_email_action.php:36
-msgid "New email address '%1' is invalid."
-msgstr ""
-
-#: ../user/edit_email_action.php:38
-msgid "New email address is same as existing address. Nothing is changed."
-msgstr ""
-
-#: ../user/edit_email_action.php:42
-msgid "There's already an account with that email address"
-msgstr ""
-
-#: ../user/edit_email_action.php:54
-msgid "Invalid password."
-msgstr ""
-
-#: ../user/edit_email_action.php:62
-msgid "The email address of your account is now %1."
-msgstr ""
-
-#: ../user/edit_email_action.php:64
-msgid "Please %1validate this email address%2."
-msgstr ""
-
-#: ../user/edit_email_action.php:67
-msgid ""
-"We can't update your email address due to a database problem.  Please try "
-"again later."
-msgstr ""
-
-#: ../user/edit_email_form.php:27 ../user/edit_email_form.php:51
-msgid "Change email address"
-msgstr ""
-
-#: ../user/edit_email_form.php:36
-msgid "Change the email address of your account"
-msgstr ""
-
-#: ../user/edit_email_form.php:37
-msgid "New email address"
-msgstr ""
-
-#: ../user/edit_email_form.php:38
-msgid "Must be a valid address of the form 'name at domain'"
-msgstr ""
-
-#: ../user/edit_email_form.php:48
-msgid "No password?"
-msgstr ""
-
-#: ../user/edit_forum_preferences_action.php:33
-msgid "Confirm reset"
-msgstr ""
-
-#: ../user/edit_forum_preferences_action.php:34
-msgid ""
-"This action will erase any changes you have made in your community "
-"preferences. To cancel, click your browser's Back button."
-msgstr ""
-
-#: ../user/edit_forum_preferences_action.php:38
-msgid "Reset preferences"
-msgstr ""
-
-#: ../user/edit_forum_preferences_action.php:88
-msgid "Error: Not the right kind of file, only PNG and JPEG are supported."
-msgstr ""
-
-#: ../user/edit_forum_preferences_action.php:114
-msgid "Your signature was too long, please keep it less than 250 characters."
-msgstr ""
-
-#: ../user/edit_forum_preferences_action.php:132
-#: ../user/edit_forum_preferences_action.php:146
-msgid "No such user: %1"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:56
-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
-msgid "On my Account page (no email)"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:58
-msgid "Immediately, by email"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:59
-msgid "In a single daily email"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:75
-msgid "Message-board identity"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:76
-msgid "Avatar"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:77
-msgid "An image representing you on the message boards."
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:78
-msgid "Format: JPG or PNG. Size: at most 4 KB, 100x100 pixels"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:80
-msgid "Don't use an avatar"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:82
-msgid "Use a Globally Recognized Avatar provided by %1"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:84
-msgid "Use this uploaded avatar:"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:87
-msgid "Avatar preview"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:87
-msgid "This is how your avatar will look"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:96
-msgid "Signature for message board posts"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:99
-msgid ""
-"Check out %1various free services%2\n"
-"<br> providing dynamic 'signature images'\n"
-"<br> showing your latest credit info, project news, etc."
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:104
-msgid "characters remaining"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:105
-msgid "Attach signature by default"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:108
-msgid "Signature preview"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:109
-msgid "This is how your signature will look in the forums"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:127
-msgid "Message display"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:129
-msgid "What to display"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:130
-msgid "Hide avatar images"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:131
-msgid "Hide signatures"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:132
-msgid "Show images as links"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:133
-msgid "Open links in new window/tab"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:134
-msgid "Highlight special users"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:135
-msgid "Display this many messages per page"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:139
-msgid "How to sort"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:140
-msgid "Threads:"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:140
-msgid "Posts:"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:141
-msgid "Jump to first new post in thread automatically"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:142
-msgid "Don't move sticky posts to top"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:148
-msgid "Message filtering"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:164
-msgid "Filtered users"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:165
-msgid "Ignore message board posts and private messages from these users."
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:167
-msgid "User ID (For instance: 123456789)"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:168 ../user/pm.php:251
-msgid "Add user to filter"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:173
-msgid "Click here to update preferences"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:175
-#: ../user/edit_forum_preferences_form.php:177
-msgid "Reset"
-msgstr ""
-
-#: ../user/edit_forum_preferences_form.php:176
-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 ""
-
-#: ../user/edit_passwd_form.php:49
-msgid "Get account key by email"
-msgstr ""
-
-#: ../user/edit_passwd_form.php:53
-msgid "New password"
-msgstr ""
-
-#: ../user/edit_passwd_form.php:54
-msgid "New password, again"
-msgstr ""
-
-#: ../user/edit_user_info_action.php:31
-msgid "HTML tags are not allowed in your name."
-msgstr ""
-
-#: ../user/edit_user_info_action.php:34
-msgid "You must supply a name for your account."
-msgstr ""
-
-#: ../user/edit_user_info_action.php:58
-msgid "Couldn't update user info."
-msgstr ""
-
-#: ../user/edit_user_info_form.php:27
-msgid "Edit account information"
-msgstr ""
-
-#: ../user/edit_user_info_form.php:32
-msgid "Name %1 real name or nickname%2"
-msgstr ""
-
-#: ../user/edit_user_info_form.php:35
-msgid "URL %1 of your web page; optional%2"
-msgstr ""
-
-#: ../user/edit_user_info_form.php:43
-msgid "Postal (ZIP) code %1 Optional%2"
-msgstr ""
-
-#: ../user/edit_user_info_form.php:47
-msgid "Update info"
-msgstr ""
-
-#: ../user/explain_state.php:27
-msgid "Server states"
-msgstr ""
-
-#: ../user/explain_state.php:30
-msgid ""
-"A tasks's <b>server state</b> indicates whether the task has been sent to a "
-"computer, and if so whether the computer has finished it. Possible values "
-"are:"
-msgstr ""
-
-#: ../user/explain_state.php:35
-msgid ""
-"The task is not ready to send (for example, because its input files are "
-"unavailable)"
-msgstr ""
-
-#: ../user/explain_state.php:38
-msgid "The task is ready to send, but hasn't been sent yet."
-msgstr ""
-
-#: ../user/explain_state.php:40
-msgid "In Progress"
-msgstr ""
-
-#: ../user/explain_state.php:41
-msgid "The task has been sent; waiting for completion."
-msgstr ""
-
-#: ../user/explain_state.php:44
-msgid ""
-"The task has been sent to a computer and either it has timed out or the "
-"computer has reported its completion."
-msgstr ""
-
-#: ../user/explain_state.php:49
-msgid "Outcomes"
-msgstr ""
-
-#: ../user/explain_state.php:52
-msgid ""
-"A tasks's <b>outcome</b> is defined if its server state is <b>over</b>. "
-"Possible values are:"
-msgstr ""
-
-#: ../user/explain_state.php:57
-msgid ""
-"The task was sent to a computer, but the computer has not yet completed the "
-"work and reported the outcome."
-msgstr ""
-
-#: ../user/explain_state.php:60
-msgid "A computer completed and reported the task successfully."
-msgstr ""
-
-#: ../user/explain_state.php:63
-msgid ""
-"The server wasn't able to send the task to a computer (perhaps because its "
-"resource requirements were too large)"
-msgstr ""
-
-#: ../user/explain_state.php:65
-msgid "Client error"
-msgstr ""
-
-#: ../user/explain_state.php:66
-msgid "The task was sent to a computer and an error occurred."
-msgstr ""
-
-#: ../user/explain_state.php:69
-msgid ""
-"The task was sent to a computer and no reply was received within the time "
-"limit."
-msgstr ""
-
-#: ../user/explain_state.php:72
-msgid ""
-"The task wasn't sent to a computer because enough other tasks were completed "
-"for this workunit."
-msgstr ""
-
-#: ../user/explain_state.php:75
-msgid ""
-"The task was reported but could not be validated, typically because the "
-"output files were lost on the server."
-msgstr ""
-
-#: ../user/explain_state.php:80
-msgid "Client states"
-msgstr ""
-
-#: ../user/explain_state.php:81
-msgid ""
-"A result's <b>client state</b> indicates the stage of processing at which an "
-"error occurred."
-msgstr ""
-
-#: ../user/explain_state.php:86
-msgid "The computer has not yet completed the task."
-msgstr ""
-
-#: ../user/explain_state.php:89
-msgid "The computer completed the task successfully."
-msgstr ""
-
-#: ../user/explain_state.php:92
-msgid "The computer couldn't download the application or input files."
-msgstr ""
-
-#: ../user/explain_state.php:95
-msgid "An error occurred during computation."
-msgstr ""
-
-#: ../user/explain_state.php:98
-msgid "The computer couldn't upload the output files."
-msgstr ""
-
-#: ../user/explain_state.php:103
-msgid "Time reported and deadline"
-msgstr ""
-
-#: ../user/explain_state.php:106
-msgid ""
-"A task's <b>Time reported or deadline</b> field depends on whether the task "
-"has been reported yet:"
-msgstr ""
-
-#: ../user/explain_state.php:110
-msgid "Already reported"
-msgstr ""
-
-#: ../user/explain_state.php:110
-msgid "The date/time it was reported"
-msgstr ""
-
-#: ../user/explain_state.php:111
-msgid "Not reported yet, deadline in the future"
-msgstr ""
-
-#: ../user/explain_state.php:112
-msgid "Deadline, shown in green."
-msgstr ""
-
-#: ../user/explain_state.php:114
-msgid "Not reported yet, deadline in the past"
-msgstr ""
-
-#: ../user/explain_state.php:115
-msgid "Deadline, shown in red."
-msgstr ""
-
-#: ../user/explain_state.php:120
-msgid "Unknown field"
-msgstr ""
-
-#: ../user/ffmail_action.php:47
-msgid "Email preview"
-msgstr ""
-
-#: ../user/ffmail_action.php:48
-msgid "Your email will appear as follows:"
-msgstr ""
-
-#: ../user/ffmail_action.php:57
-msgid "Send email"
-msgstr ""
-
-#: ../user/ffmail_action.php:59
-msgid "Use your browser's back button to return to message form"
-msgstr ""
-
-#: ../user/ffmail_action.php:63
-msgid "Sending emails"
-msgstr ""
-
-#: ../user/ffmail_action.php:84
-msgid "email sent successfully to %1"
-msgstr ""
-
-#: ../user/ffmail_action.php:86
-msgid "failed to send email to %1: %2"
-msgstr ""
-
-#: ../user/ffmail_action.php:92
-msgid "Thanks for telling your friends about %1"
-msgstr ""
-
-#: ../user/ffmail_action.php:94
-msgid ""
-"You forgot to enter your friends' names and/or email addresses; Please %"
-"1return to the form%2 and enter them."
-msgstr ""
-
-#: ../user/ffmail_form.php:30
-msgid ""
-"This project hasn't created an email message - please notify its "
-"administrators"
-msgstr ""
-
-#: ../user/ffmail_form.php:33
-msgid "Tell your friends about %1"
-msgstr ""
-
-#: ../user/ffmail_form.php:37
-msgid "Help us by telling your friends, family and coworkers about %1"
-msgstr ""
-
-#: ../user/ffmail_form.php:39
-msgid ""
-"Fill in this form with the names and email addresses of people you think "
-"might be interested in %1. We'll send them an email in your name, and you "
-"can add your own message if you like."
-msgstr ""
-
-#: ../user/ffmail_form.php:42
-msgid "Your name:"
-msgstr ""
-
-#: ../user/ffmail_form.php:42
-msgid "Your email address:"
-msgstr ""
-
-#: ../user/ffmail_form.php:48
-msgid "Friend's name:"
-msgstr ""
-
-#: ../user/ffmail_form.php:48
-msgid "Friend's email address:"
-msgstr ""
-
-#: ../user/ffmail_form.php:56
-msgid "Additional message (optional)"
-msgstr ""
-
-#: ../user/ffmail_form.php:59
-msgid "Send"
-msgstr ""
-
-#: ../user/forum_banishment_vote.php:35
-#: ../user/forum_banishment_vote_action.php:33
-msgid "You are not authorized to banish users."
-msgstr ""
-
-#: ../user/forum_banishment_vote.php:41 ../user/forum_banishment_vote.php:46
-msgid "Banishment Vote"
-msgstr ""
-
-#: ../user/forum_banishment_vote.php:50
-msgid "No user with this ID found."
-msgstr ""
-
-#: ../user/forum_banishment_vote.php:54 ../user/forum_moderate_post.php:76
-msgid "User is already banished"
-msgstr ""
-
-#: ../user/forum_banishment_vote.php:59 ../user/forum_moderate_post.php:79
-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 ""
-
-#: ../user/forum_banishment_vote.php:61
-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
-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
-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
-msgid "Flame/Hate mail"
-msgstr ""
-
-#: ../user/forum_banishment_vote.php:66
-#: ../user/forum_banishment_vote_action.php:61
-#: ../user/forum_moderate_post.php:59
-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
-msgid "Reason"
-msgstr ""
-
-#: ../user/forum_banishment_vote.php:69 ../user/forum_moderate_thread.php:85
-msgid "Mailed if nonempty"
-msgstr ""
-
-#: ../user/forum_banishment_vote.php:74
-msgid "Proceed with vote"
-msgstr ""
-
-#: ../user/forum_banishment_vote_action.php:39
-#: ../user/forum_moderate_post_action.php:63
-msgid "You must specify an action..."
-msgstr ""
-
-#: ../user/forum_edit.php:41
-msgid ""
-"You can no longer edit this post.<br/>Posts can only be edited at most %1 "
-"minutes after they have been created."
-msgstr ""
-
-#: ../user/forum_edit.php:47
-msgid "You are not authorized to edit this post."
-msgstr ""
-
-#: ../user/forum_edit.php:86 ../user/forum_search.php:72
-msgid "Forum"
-msgstr ""
-
-#: ../user/forum_edit.php:110
-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
-msgid "Title"
-msgstr ""
-
-#: ../user/forum_edit.php:144 ../user/forum_post.php:129
-msgid "Add my signature to this post"
-msgstr ""
-
-#: ../user/forum_forum.php:41
-msgid "Not visible to you"
-msgstr ""
-
-#: ../user/forum_forum.php:80
-msgid "Team message board for %1"
-msgstr ""
-
-#: ../user/forum_forum.php:96
-msgid "New thread"
-msgstr ""
-
-#: ../user/forum_forum.php:96
-msgid "Add a new thread to this forum"
-msgstr ""
-
-#: ../user/forum_forum.php:116
-msgid "This message board is available as an %1RSS feed%2"
-msgstr ""
-
-#: ../user/forum_forum.php:174
-msgid "This thread is hidden"
-msgstr ""
-
-#: ../user/forum_forum.php:178
-msgid "This thread is sticky and locked, and you haven't read it yet"
-msgstr ""
-
-#: ../user/forum_forum.php:178
-msgid "sticky/locked/unread"
-msgstr ""
-
-#: ../user/forum_forum.php:180
-msgid "This thread is sticky and you haven't read it yet"
-msgstr ""
-
-#: ../user/forum_forum.php:180
-msgid "sticky/unread"
-msgstr ""
-
-#: ../user/forum_forum.php:184
-msgid "You haven't read this thread yet, and it's locked"
-msgstr ""
-
-#: ../user/forum_forum.php:184
-msgid "unread/locked"
-msgstr ""
-
-#: ../user/forum_forum.php:186
-msgid "You haven't read this thread yet"
-msgstr ""
-
-#: ../user/forum_forum.php:192
-msgid "This thread is sticky and locked"
-msgstr ""
-
-#: ../user/forum_forum.php:192
-msgid "sticky/locked"
-msgstr ""
-
-#: ../user/forum_forum.php:194
-msgid "This thread is sticky"
-msgstr ""
-
-#: ../user/forum_forum.php:194
-msgid "sticky"
-msgstr ""
-
-#: ../user/forum_forum.php:198
-msgid "This thread is locked"
-msgstr ""
-
-#: ../user/forum_forum.php:198
-msgid "locked"
-msgstr ""
-
-#: ../user/forum_forum.php:200
-msgid "You read this thread"
-msgstr ""
-
-#: ../user/forum_forum.php:200
-msgid "read"
-msgstr ""
-
-#: ../user/forum_help_desk.php:27
-msgid "Questions and answers"
-msgstr ""
-
-#: ../user/forum_help_desk.php:30
-msgid ""
-"Talk live via Skype with a volunteer, in any of several languages. Go to %"
-"1BOINC Online Help%2."
-msgstr ""
-
-#: ../user/forum_help_desk.php:44 ../user/forum_index.php:92
-msgid "Topic"
-msgstr ""
-
-#: ../user/forum_help_desk.php:45
-msgid "Questions"
-msgstr ""
-
-#: ../user/forum_index.php:53 ../user/team_forum.php:68
-msgid "Discussion among members of %1"
-msgstr ""
-
-#: ../user/forum_index.php:69
-msgid "%1 Message boards"
-msgstr ""
-
-#: ../user/forum_index.php:78
-msgid ""
-"If you have a question or problem, please use the %1Questions & Answers%2 "
-"section of the message boards."
-msgstr ""
-
-#: ../user/forum_index.php:123
-msgid "Subscribed threads"
-msgstr ""
-
-#: ../user/forum_moderate_post.php:43
-msgid "Moderate post"
-msgstr ""
-
-#: ../user/forum_moderate_post.php:52
-msgid "Hide post"
-msgstr ""
-
-#: ../user/forum_moderate_post.php:57 ../user/forum_moderate_thread.php:54
-msgid "Commercial spam"
-msgstr ""
-
-#: ../user/forum_moderate_post.php:58
-msgid "Doublepost"
-msgstr ""
-
-#: ../user/forum_moderate_post.php:63
-msgid "Move post"
-msgstr ""
-
-#: ../user/forum_moderate_post.php:65
-msgid "Destination thread ID:"
-msgstr ""
-
-#: ../user/forum_moderate_post.php:78
-msgid "Banish user"
-msgstr ""
-
-#: ../user/forum_moderate_post.php:80
-msgid "Ban duration"
-msgstr ""
-
-#: ../user/forum_moderate_post.php:81
-msgid "4 hours"
-msgstr ""
-
-#: ../user/forum_moderate_post.php:82 ../user/forum_search.php:45
-msgid "1 day"
-msgstr ""
-
-#: ../user/forum_moderate_post.php:83
-msgid "1 week"
-msgstr ""
-
-#: ../user/forum_moderate_post.php:84
-msgid "2 weeks"
-msgstr ""
-
-#: ../user/forum_moderate_post.php:85
-msgid "1 month"
-msgstr ""
-
-#: ../user/forum_moderate_post.php:86
-msgid "Forever"
-msgstr ""
-
-#: ../user/forum_moderate_post.php:96
-msgid "Optional explanation %1 This is included in email to user.%2"
-msgstr ""
-
-#: ../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
-msgid "OK"
-msgstr ""
-
-#: ../user/forum_moderate_post_action.php:57
-msgid "You are not authorized to moderate this post."
-msgstr ""
-
-#: ../user/forum_moderate_post_action.php:85
-msgid "Can't move to different category type"
-msgstr ""
-
-#: ../user/forum_moderate_post_action.php:89
-msgid "Can't move to different category"
-msgstr ""
-
-#: ../user/forum_moderate_post_action.php:110
-msgid "Not authorized to banish users"
-msgstr ""
-
-#: ../user/forum_moderate_post_action.php:126
-msgid "Banishment"
-msgstr ""
-
-#: ../user/forum_moderate_post_action.php:128
-msgid "User %1 has been banished."
-msgstr ""
-
-#: ../user/forum_moderate_post_action.php:131
-msgid "Action failed: possible database problem"
-msgstr ""
-
-#: ../user/forum_moderate_thread.php:33
-msgid "not authorized"
-msgstr ""
-
-#: ../user/forum_moderate_thread.php:36
-msgid "Moderate thread '%1'"
-msgstr ""
-
-#: ../user/forum_moderate_thread.php:48
-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
-msgid "Current forum"
-msgstr ""
-
-#: ../user/forum_moderate_thread.php:73
-msgid "Destination forum"
-msgstr ""
-
-#: ../user/forum_moderate_thread.php:77
-msgid "New title:"
-msgstr ""
-
-#: ../user/forum_post.php:40
-msgid ""
-"Only project admins may create a thread here. However, you may reply to "
-"existing threads."
-msgstr ""
-
-#: ../user/forum_post.php:60
-msgid ""
-"Your message was flagged as spam by the Akismet anti-spam system. Please "
-"modify your text and try again."
-msgstr ""
-
-#: ../user/forum_post.php:70
-msgid "Create new thread"
-msgstr ""
-
-#: ../user/forum_post.php:100
-msgid "Create a new thread"
-msgstr ""
-
-#: ../user/forum_post.php:105
-msgid "Remember to add a title"
-msgstr ""
-
-#: ../user/forum_post.php:127
-msgid "Show this item as a Notice in the BOINC Manager"
-msgstr ""
-
-#: ../user/forum_post.php:127
-msgid "Do so only for items likely to be of interest to all volunteers."
-msgstr ""
-
-#: ../user/forum_rate.php:26
-msgid "Rating offline"
-msgstr ""
-
-#: ../user/forum_rate.php:27
-msgid "This function is turned off by the project"
-msgstr ""
-
-#: ../user/forum_rate.php:58
-msgid "You need more average or total credit to rate a post."
-msgstr ""
-
-#: ../user/forum_rate.php:62
-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
-msgid "Return to thread"
-msgstr ""
-
-#: ../user/forum_rate.php:72
-msgid "Input Recorded"
-msgstr ""
-
-#: ../user/forum_rate.php:73
-msgid "Your input has been recorded. Thanks for your help."
-msgstr ""
-
-#: ../user/forum_rate.php:75
-msgid "Vote Registered"
-msgstr ""
-
-#: ../user/forum_rate.php:76
-msgid "Your rating has been recorded. Thanks for your input."
-msgstr ""
-
-#: ../user/forum_rate.php:80
-msgid "Vote Submission Problem"
-msgstr ""
-
-#: ../user/forum_reply.php:73
-msgid ""
-"Your post has been flagged as spam by the Akismet anti-spam system. Please "
-"modify your text and try again."
-msgstr ""
-
-#: ../user/forum_reply.php:88 ../user/forum_thread.php:158
-#: ../user/forum_thread.php:274
-msgid "Post to thread"
-msgstr ""
-
-#: ../user/forum_reply.php:137
-msgid "Message:"
-msgstr ""
-
-#: ../user/forum_reply.php:140
-msgid "reply to %1Message ID%2:"
-msgstr ""
-
-#: ../user/forum_reply.php:166
-msgid "Post reply"
-msgstr ""
-
-#: ../user/forum_reply.php:169
-msgid "Add my signature to this reply"
-msgstr ""
-
-#: ../user/forum_report_post.php:45
-msgid "You need more average or total credit to report a post."
-msgstr ""
-
-#: ../user/forum_report_post.php:65
-msgid "Report Registered"
-msgstr ""
-
-#: ../user/forum_report_post.php:66
-msgid "Your report has been recorded. Thanks for your input."
-msgstr ""
-
-#: ../user/forum_report_post.php:67
-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
-msgid "Report a forum post"
-msgstr ""
-
-#: ../user/forum_report_post.php:73
-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 ""
-
-#: ../user/forum_report_post.php:80
-msgid "Report post"
-msgstr ""
-
-#: ../user/forum_report_post.php:81
-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 ""
-
-#: ../user/forum_report_post.php:90
-msgid "Report not registered"
-msgstr ""
-
-#: ../user/forum_report_post.php:91
-msgid "Your report could not be recorded. Please wait a while and try again."
-msgstr ""
-
-#: ../user/forum_report_post.php:92
-msgid ""
-"If this is not a temporary error, please report it to the project developers."
-msgstr ""
-
-#: ../user/forum_rss.php:41
-msgid "%1 RSS feed"
-msgstr ""
-
-#: ../user/forum_rss.php:42
-msgid "This message board is available as an RSS feed."
-msgstr ""
-
-#: ../user/forum_rss.php:43
-msgid "Options:"
-msgstr ""
-
-#: ../user/forum_rss.php:47
-msgid "Include only posts by user ID %1 (default: all users)."
-msgstr ""
-
-#: ../user/forum_rss.php:49
-msgid "Include only posts from the last %1 days (default: 30)."
-msgstr ""
-
-#: ../user/forum_rss.php:51
-msgid "Truncate posts: %1 (Include only first 265 characters of each post)"
-msgstr ""
-
-#: ../user/forum_rss.php:53
-msgid "Threads only: %1 (Include only the first post of every thread)"
-msgstr ""
-
-#: ../user/forum_search.php:27
-msgid "Forum search"
-msgstr ""
-
-#: ../user/forum_search.php:31
-msgid "Search query"
-msgstr ""
-
-#: ../user/forum_search.php:32
-msgid "Search for keywords:"
-msgstr ""
-
-#: ../user/forum_search.php:33
-msgid "Posts that contain all the specified words will be displayed"
-msgstr ""
-
-#: ../user/forum_search.php:35
-msgid "For example: \"screensaver freeze\""
-msgstr ""
-
-#: ../user/forum_search.php:36
-msgid "Search for author ID:"
-msgstr ""
-
-#: ../user/forum_search.php:37
-msgid "Only posts by this author will be displayed"
-msgstr ""
-
-#: ../user/forum_search.php:39
-msgid "For example: \"43214\""
-msgstr ""
-
-#: ../user/forum_search.php:41
-msgid "Search options"
-msgstr ""
-
-#: ../user/forum_search.php:42
-msgid "Search limits"
-msgstr ""
-
-#: ../user/forum_search.php:43
-msgid "Search at most this many days back in time"
-msgstr ""
-
-#: ../user/forum_search.php:50 ../user/forum_search.php:51
-msgid "%1 months"
-msgstr ""
-
-#: ../user/forum_search.php:52
-msgid "1 year"
-msgstr ""
-
-#: ../user/forum_search.php:73
-msgid "Only display posts from this forum"
-msgstr ""
-
-#: ../user/forum_search.php:84
-msgid "Sort by"
-msgstr ""
-
-#: ../user/forum_search.php:88
-msgid "Start the search"
-msgstr ""
-
-#: ../user/forum_search_action.php:141
-msgid "Forum search results"
-msgstr ""
-
-#: ../user/forum_search_action.php:174
-msgid "Thread titles matching your query:"
-msgstr ""
-
-#: ../user/forum_search_action.php:194
-msgid "Messages matching your query:"
-msgstr ""
-
-#: ../user/forum_search_action.php:217
-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
-msgid "You can also %1try the same search on Google.%2"
-msgstr ""
-
-#: ../user/forum_search_action.php:224
-msgid "Perform another search"
-msgstr ""
-
-#: ../user/forum_subscribe.php:46
-msgid "Subscription successful"
-msgstr ""
-
-#: ../user/forum_subscribe.php:49
-msgid ""
-"You are now subscribed to %1. You will be notified whenever there is a new "
-"post."
-msgstr ""
-
-#: ../user/forum_subscribe.php:51
-msgid "Subscription failed"
-msgstr ""
-
-#: ../user/forum_subscribe.php:52
-msgid ""
-"We are currently unable to subscribe you to %1. Please try again later.."
-msgstr ""
-
-#: ../user/forum_subscribe.php:61
-msgid "Unsubscription successful"
-msgstr ""
-
-#: ../user/forum_subscribe.php:64
-msgid ""
-"You are no longer subscribed to %1. You will no longer receive notifications "
-"for this thread."
-msgstr ""
-
-#: ../user/forum_subscribe.php:66
-msgid "Unsubscription failed"
-msgstr ""
-
-#: ../user/forum_subscribe.php:67
-msgid ""
-"We are currently unable to unsubscribe you from %1. Please try again later.."
-msgstr ""
-
-#: ../user/forum_subscribe.php:74
-msgid "Unknown subscription action"
-msgstr ""
-
-#: ../user/forum_thread.php:61
-msgid "This forum is not visible to you."
-msgstr ""
-
-#: ../user/forum_thread.php:69
-msgid "This thread has been hidden by moderators."
-msgstr ""
-
-#: ../user/forum_thread.php:128
-msgid "My question was answered"
-msgstr ""
-
-#: ../user/forum_thread.php:129
-msgid "Click here if your question has been adequately answered"
-msgstr ""
-
-#: ../user/forum_thread.php:137
-msgid "I've also got this question"
-msgstr ""
-
-#: ../user/forum_thread.php:159 ../user/forum_thread.php:275
-msgid "Add a new message to this thread"
-msgstr ""
-
-#: ../user/forum_thread.php:171
-msgid "Unsubscribe"
-msgstr ""
-
-#: ../user/forum_thread.php:172
-msgid "You are subscribed to this thread.  Click here to unsubscribe."
-msgstr ""
-
-#: ../user/forum_thread.php:178
-msgid "Subscribe"
-msgstr ""
-
-#: ../user/forum_thread.php:179
-msgid "Click to get email when there are new posts in this thread"
-msgstr ""
-
-#: ../user/forum_thread.php:190
-msgid "Unhide this thread"
-msgstr ""
-
-#: ../user/forum_thread.php:196
-msgid "Hide this thread"
-msgstr ""
-
-#: ../user/forum_thread.php:202
-msgid "Make unsticky"
-msgstr ""
-
-#: ../user/forum_thread.php:203
-msgid "Make this thread not sticky"
-msgstr ""
-
-#: ../user/forum_thread.php:208
-msgid "Make sticky"
-msgstr ""
-
-#: ../user/forum_thread.php:209
-msgid "Make this thread sticky"
-msgstr ""
-
-#: ../user/forum_thread.php:215
-msgid "Unlock"
-msgstr ""
-
-#: ../user/forum_thread.php:216
-msgid "Unlock this thread"
-msgstr ""
-
-#: ../user/forum_thread.php:221
-msgid "Lock"
-msgstr ""
-
-#: ../user/forum_thread.php:222
-msgid "Lock this thread"
-msgstr ""
-
-#: ../user/forum_thread.php:229
-msgid "Move this thread to a different forum"
-msgstr ""
-
-#: ../user/forum_thread.php:234
-msgid "Edit title"
-msgstr ""
-
-#: ../user/forum_thread.php:235
-msgid "Edit thread title"
-msgstr ""
-
-#: ../user/forum_thread.php:245
-msgid "Export as Notice"
-msgstr ""
-
-#: ../user/forum_thread.php:251
-msgid "Don't export"
-msgstr ""
-
-#: ../user/forum_thread.php:252
-msgid "Don't export this news item as a Notice"
-msgstr ""
-
-#: ../user/forum_thread.php:260 ../user/forum_thread.php:262
-msgid "Sort"
-msgstr ""
-
-#: ../user/forum_thread_status.php:49
-msgid "Thread status updated"
-msgstr ""
-
-#: ../user/forum_thread_status.php:50
-msgid "The status has been updated."
-msgstr ""
-
-#: ../user/forum_user_posts.php:73
-msgid "Posts by %1"
-msgstr ""
-
-#: ../user/friend.php:33
-msgid "Already friends"
-msgstr ""
-
-#: ../user/friend.php:39
-msgid "You requested friendship with %1 on %2."
-msgstr ""
-
-#: ../user/friend.php:41
-msgid "This request is still pending confirmation."
-msgstr ""
-
-#: ../user/friend.php:52
-msgid "%1 is not accepting friendship requests from you"
-msgstr ""
-
-#: ../user/friend.php:61
-msgid "You can't be friends with yourself"
-msgstr ""
-
-#: ../user/friend.php:69
-msgid "Add friend"
-msgstr ""
-
-#: ../user/friend.php:74
-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 ""
-
-#: ../user/friend.php:77
-msgid "Add an optional message here:"
-msgstr ""
-
-#: ../user/friend.php:115
-msgid "Friend request sent"
-msgstr ""
-
-#: ../user/friend.php:116
-msgid "We have notified %1 of your request."
-msgstr ""
-
-#: ../user/friend.php:126
-msgid "Please log in as %1"
-msgstr ""
-
-#: ../user/friend.php:127
-msgid "You must log in as %1 to view this friend request"
-msgstr ""
-
-#: ../user/friend.php:138
-msgid "Friend request"
-msgstr ""
-
-#: ../user/friend.php:141
-msgid "%1 has requested friendship with you."
-msgstr ""
-
-#: ../user/friend.php:143
-msgid "%1 says: %2"
-msgstr ""
-
-#: ../user/friend.php:146
-msgid "Accept friendship"
-msgstr ""
-
-#: ../user/friend.php:146
-msgid "Click accept if %1 is in fact a friend"
-msgstr ""
-
-#: ../user/friend.php:147
-msgid "Decline"
-msgstr ""
-
-#: ../user/friend.php:147
-msgid "Click decline if %1 is not a friend"
-msgstr ""
-
-#: ../user/friend.php:186
-msgid "Friendship confirmed"
-msgstr ""
-
-#: ../user/friend.php:187
-msgid "Your friendship with %1 has been confirmed."
-msgstr ""
-
-#: ../user/friend.php:205
-msgid "Friendship declined"
-msgstr ""
-
-#: ../user/friend.php:206
-msgid "You have declined friendship with %1"
-msgstr ""
-
-#: ../user/friend.php:221
-msgid "Notification not found"
-msgstr ""
-
-#: ../user/friend.php:223
-msgid "Friend confirmed"
-msgstr ""
-
-#: ../user/friend.php:224
-msgid "You are now friends with %1."
-msgstr ""
-
-#: ../user/friend.php:232
-msgid "Cancel friendship?"
-msgstr ""
-
-#: ../user/friend.php:234
-msgid "Are you sure you want to cancel your friendship with %1?"
-msgstr ""
-
-#: ../user/friend.php:239
-msgid "Stay friends"
-msgstr ""
-
-#: ../user/friend.php:249
-msgid "Friendship cancelled"
-msgstr ""
-
-#: ../user/friend.php:250
-msgid "Your friendship with %1 has been cancelled."
-msgstr ""
-
-#: ../user/get_passwd.php:25
-msgid "Forgot your account info?"
-msgstr ""
-
-#: ../user/get_passwd.php:28
-msgid ""
-"1) If you know your account's email address, and you can receive email there:"
-msgstr ""
-
-#: ../user/get_passwd.php:29
-msgid ""
-"Enter the email address below, and click OK. You will be sent email "
-"instructions for resetting your password."
-msgstr ""
-
-#: ../user/get_passwd.php:46
-msgid ""
-"2) If you forgot your account's email address, or you can't receive email "
-"there:"
-msgstr ""
-
-#: ../user/get_passwd.php:47
-msgid ""
-"If you have run BOINC under this account, you can still access it. Here's "
-"how:"
-msgstr ""
-
-#: ../user/get_passwd.php:50
-msgid ""
-"Go to the BOINC data directory on your computer (its location is written to "
-"the Event Log at startup)."
-msgstr ""
-
-#: ../user/get_passwd.php:51
-msgid "Find your account file for this project; it will be named <b>%1</b>."
-msgstr ""
-
-#: ../user/get_passwd.php:52
-msgid "Open the file in a text editor like Notepad. You'll see something like"
-msgstr ""
-
-#: ../user/get_passwd.php:62
-msgid "Select and Copy the string between %1 and %2 (%3 in the above example)."
-msgstr ""
-
-#: ../user/get_passwd.php:64
-msgid "Paste the string into the field below, and click OK."
-msgstr ""
-
-#: ../user/get_passwd.php:65
-msgid ""
-"You will now be logged in to your account; update the email and password of "
-"your account."
-msgstr ""
-
-#: ../user/get_passwd.php:71
-msgid "Log in with authenticator"
-msgstr ""
-
-#: ../user/gpu_list.php:126 ../user/gpu_list.php:152
-msgid "No GPU tasks reported"
-msgstr ""
-
-#: ../user/gpu_list.php:183
-msgid ""
-"The following lists show the most productive GPU models on different "
-"platforms.  Relative speeds are shown in parentheses."
-msgstr ""
-
-#: ../user/home.php:42
-msgid "Welcome to %1"
-msgstr ""
-
-#: ../user/home.php:43
-msgid "View and edit your account preferences using the links below."
-msgstr ""
-
-#: ../user/home.php:46
-msgid "If you have not already done so, %1download BOINC client software%2."
-msgstr ""
-
-#: ../user/host_app_versions.php:37
-msgid "Anonymous platform, missing app"
-msgstr ""
-
-#: ../user/host_app_versions.php:40
-msgid "anonymous platform"
-msgstr ""
-
-#: ../user/host_app_versions.php:43
-msgid "Missing app version"
-msgstr ""
-
-#: ../user/host_app_versions.php:45
-msgid "Missing app"
-msgstr ""
-
-#: ../user/host_app_versions.php:47
-msgid "Missing platform"
-msgstr ""
-
-#: ../user/host_app_versions.php:56
-msgid "Number of tasks completed"
-msgstr ""
-
-#: ../user/host_app_versions.php:57
-msgid "Max tasks per day"
-msgstr ""
-
-#: ../user/host_app_versions.php:58
-msgid "Number of tasks today"
-msgstr ""
-
-#: ../user/host_app_versions.php:59
-msgid "Consecutive valid tasks"
-msgstr ""
-
-#: ../user/host_app_versions.php:63
-msgid "Average processing rate"
-msgstr ""
-
-#: ../user/host_app_versions.php:72
-msgid "Application details for host %1"
-msgstr ""
-
-#: ../user/host_delete.php:31
-msgid "We have no record of that computer."
-msgstr ""
-
-#: ../user/host_delete.php:38
-msgid ""
-"You can not delete our record of this computer because our database still "
-"contains work for it. You must wait a few days until the work for this "
-"computer has been deleted from the project database."
-msgstr ""
-
-#: ../user/host_delete.php:40
-msgid "Delete record of computer"
-msgstr ""
-
-#: ../user/host_delete.php:41
-msgid "Record deleted."
-msgstr ""
-
-#: ../user/host_delete.php:42 ../user/host_edit_action.php:65
-msgid "Return to list of your computers"
-msgstr ""
-
-#: ../user/host_edit_action.php:39
-msgid "Merge computer records"
-msgstr ""
-
-#: ../user/host_edit_form.php:35
-msgid "Merge computers"
-msgstr ""
-
-#: ../user/host_edit_form.php:38
-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 ""
-
-#: ../user/host_edit_form.php:56
-msgid "No hosts are eligible for merging with this one."
-msgstr ""
-
-#: ../user/host_edit_form.php:58 ../user/host_edit_form.php:114
-msgid "Show details"
-msgstr ""
-
-#: ../user/host_edit_form.php:66
-msgid ""
-"Check the computers that are the same as %1 (created %2, computer ID %3):"
-msgstr ""
-
-#: ../user/host_edit_form.php:70 ../user/workunit.php:39
-msgid "name"
-msgstr ""
-
-#: ../user/host_edit_form.php:70 ../user/workunit.php:41
-msgid "created"
-msgstr ""
-
-#: ../user/host_edit_form.php:70
-msgid "computer ID"
-msgstr ""
-
-#: ../user/host_edit_form.php:77
-msgid "no hostname"
-msgstr ""
-
-#: ../user/host_edit_form.php:109
-msgid "Merge hosts"
-msgstr ""
-
-#: ../user/host_update_credit.php:28
-msgid "Updating computer credit"
-msgstr ""
-
-#: ../user/host_venue_action.php:41
-msgid "Host venue updated"
-msgstr ""
-
-#: ../user/host_venue_action.php:43
-msgid "none"
-msgstr ""
-
-#: ../user/host_venue_action.php:46
-msgid "The venue of this host has been set to %1."
-msgstr ""
-
-#: ../user/host_venue_action.php:48
-msgid ""
-"This change will take effect the next time the host communicates with this "
-"project."
-msgstr ""
-
-#: ../user/host_venue_action.php:50
-msgid "Return to host page"
-msgstr ""
-
-#: ../user/hosts_user.php:53
-msgid "Computers belonging to %1"
-msgstr ""
-
-#: ../user/hosts_user.php:55
-msgid "Computers hidden"
-msgstr ""
-
-#: ../user/hosts_user.php:56
-msgid ""
-"This user has chosen not to show information about his or her computers."
-msgstr ""
-
-#: ../user/hosts_user.php:64
-msgid "Your computers"
-msgstr ""
-
-#: ../user/html.php:23
-msgid "Allowed HTML tags"
-msgstr ""
-
-#: ../user/html.php:25
-msgid "The following HTML tags are allowed in team descriptions:"
-msgstr ""
-
-#: ../user/html.php:27
-msgid "bold"
-msgstr ""
-
-#: ../user/html.php:28
-msgid "italics"
-msgstr ""
-
-#: ../user/html.php:29
-msgid "hyperlink"
-msgstr ""
-
-#: ../user/html.php:30
-msgid "paragraph"
-msgstr ""
-
-#: ../user/html.php:31
-msgid "break"
-msgstr ""
-
-#: ../user/html.php:32
-msgid "preformatted"
-msgstr ""
-
-#: ../user/html.php:33
-msgid ""
-"image; height cannot exceed 450 pixels. Please do not link to images without "
-"permission of the web site where the image is hosted."
-msgstr ""
-
-#: ../user/html.php:35
-msgid "You can also use ampersand notation for special characters."
-msgstr ""
-
-#: ../user/info.php:35
-msgid "Run %1 only on authorized computers"
-msgstr ""
-
-#: ../user/info.php:36
-msgid ""
-"Run %1 only on computers that you own, or for which you have obtained the "
-"owner's permission. Some companies and schools have policies that prohibit "
-"using their computers for projects such as %1."
-msgstr ""
-
-#: ../user/info.php:38
-msgid "How %1 will use your computer"
-msgstr ""
-
-#: ../user/info.php:39
-msgid ""
-"When you run %1 on your computer, it will use part of the computer's CPU "
-"power, disk space, and network bandwidth. You can control how much of your "
-"resources are used by %1, and when it uses them."
-msgstr ""
-
-#: ../user/info.php:40
-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 ""
-
-#: ../user/info.php:42
-msgid "Privacy policy"
-msgstr ""
-
-#: ../user/info.php:43
-msgid ""
-"Your account on %1 is identified by a name that you choose. This name may be "
-"shown on the %1 web site, along with a summary of the work your computer has "
-"done for %1. If you want to be anonymous, choose a name that doesn't reveal "
-"your identity."
-msgstr ""
-
-#: ../user/info.php:44
-msgid ""
-"If you participate in %1, information about your computer (such as its "
-"processor type, amount of memory, etc.) will be recorded by %1 and used to "
-"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 ""
-
-#: ../user/info.php:45
-msgid ""
-"To participate in %1, you must give an address where you receive email. This "
-"address will not be shown on the %1 web site or shared with organizations. %"
-"1 may send you periodic newsletters; however, you can opt out at any time."
-msgstr ""
-
-#: ../user/info.php:46
-msgid ""
-"Private messages sent on the %1 web site are visible only to the sender and "
-"recipient.  %1 does not examine or police the content of private messages.  "
-"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 ""
-
-#: ../user/info.php:47
-msgid ""
-"If you use our web site forums you must follow the %2posting guidelines%3.  "
-"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 ""
-
-#: ../user/info.php:48
-msgid "Is it safe to run %1?"
-msgstr ""
-
-#: ../user/info.php:49
-msgid ""
-"Any time you download a program through the Internet you are taking a "
-"chance: the program might have dangerous errors, or the download server "
-"might have been hacked. %1 has made efforts to minimize these risks. We have "
-"tested our applications carefully. Our servers are behind a firewall and 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 ""
-
-#: ../user/info.php:50
-msgid ""
-"The applications run by %1 may cause some computers to overheat. If this "
-"happens, stop running %1 or use a %2utility program%3 that limits CPU usage."
-msgstr ""
-
-#: ../user/info.php:51
-msgid ""
-"%1 was developed by %2. BOINC was developed at the University of California."
-msgstr ""
-
-#: ../user/info.php:53
-msgid "Liability"
-msgstr ""
-
-#: ../user/info.php:54
-msgid ""
-"%1 and %2 assume no liability for damage to your computer, loss of data, or "
-"any other event or condition that may occur as a result of participating in %"
-"1."
-msgstr ""
-
-#: ../user/info.php:56
-msgid "Other BOINC projects"
-msgstr ""
-
-#: ../user/info.php:57
-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 ""
-
-#: ../user/info.php:58
-msgid ""
-"These other projects are not associated with %1, and we cannot vouch for "
-"their security practices or the nature of their research. Join them at your "
-"own risk."
-msgstr ""
-
-#: ../user/language_select.php:47
-msgid "Language selection"
-msgstr ""
-
-#: ../user/language_select.php:73
-msgid ""
-"This web site is available in several languages. The currently selected "
-"language is %1."
-msgstr ""
-
-#: ../user/language_select.php:78
-msgid ""
-"Normally the choice of language is determined by your browser's language "
-"setting, which is: %1.  You can change this setting using:"
-msgstr ""
-
-#: ../user/language_select.php:83
-msgid "Firefox: Tools/Options/General"
-msgstr ""
-
-#: ../user/language_select.php:85
-msgid "Microsoft IE: Tools/Internet Options/Languages"
-msgstr ""
-
-#: ../user/language_select.php:89
-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 ""
-
-#: ../user/language_select.php:95
-msgid "Language name (click to select)"
-msgstr ""
-
-#: ../user/language_select.php:97
-msgid "Use browser language setting"
-msgstr ""
-
-#: ../user/language_select.php:113
-msgid ""
-"Translations are done by volunteers.  If your native language is not here, %"
-"1you can provide a translation%2."
-msgstr ""
-
-#: ../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
-msgid "or %1create an account%2."
-msgstr ""
-
-#: ../user/merge_by_name.php:31
-msgid "Processing %1"
-msgstr ""
-
-#: ../user/merge_by_name.php:43
-msgid "Merged %1 into %2"
-msgstr ""
-
-#: ../user/merge_by_name.php:72
-msgid "Return to the list of your computers"
-msgstr ""
-
-#: ../user/merge_by_name.php:76
-msgid ""
-"This operation merges computers based on their domain name.\n"
-"        <p>\n"
-"        For each domain name, it will merge all older computers\n"
-"        having that name with the newest computer having that name.\n"
-"        Incompatible computers will not be merged.\n"
-"        <p>"
-msgstr ""
-
-#: ../user/merge_by_name.php:82
-msgid "Go ahead and do this"
-msgstr ""
-
-#: ../user/merge_by_name.php:83
-msgid "Return to the list of computers"
-msgstr ""
-
-#: ../user/moderation.php:26
-msgid ""
-"\n"
-"To maximize discussion and flow of information,\n"
-"our message boards are moderated.\n"
-"Message board postings are subject to the following posting rules:\n"
-msgstr ""
-
-#: ../user/moderation.php:30
-msgid ""
-"\n"
-"<p>\n"
-"Moderators may delete posts that violate any of these rules.\n"
-"The authors of deleted posts will be notified via email.\n"
-"Gross offenders may have their ability to post messages temporarily revoked\n"
-"(though to prevent abuse only project administrators have the ability to do "
-"so).\n"
-"Additional kinds of bad behavior (\"bugging\" posts to trap the\n"
-"IP addresses of other participants, excessive thread creation to spam\n"
-"the forums, etc.), while not listed in the formal rules, may still\n"
-"lead to similar penalties.\n"
-"<p>\n"
-"If you think a post violates any of the posting rules,\n"
-"click the red X on the post and fill out the form;\n"
-"moderators will be notified of your complaint.\n"
-"Please use this button only for clear violations - not\n"
-"personal disputes.\n"
-"<p>\n"
-"We try to be as fair as we can when moderating,\n"
-"but in a large community of users, with many different viewpoints,\n"
-"there will always be some people that will not be happy\n"
-"with our moderation decisions.\n"
-"While we regret that this happens,\n"
-"please realize that we cannot suit all of the people all of the time\n"
-"and have to make decisions based on our resources and\n"
-"what is best for the forum overall.\n"
-"Please don't discuss our moderation policy on the forums. We aren't\n"
-"a social engineering project nor are we in the business of creating\n"
-"a perfectly fair system. So such discussions tend to be counterproductive\n"
-"and potentially incendiary. If you have a legitimate claim,\n"
-"send email to the address below.\n"
-"<p>\n"
-"This moderation policy is set by the %1 project.\n"
-"If you have comments about the policy, email %2.\n"
-"\n"
-msgstr ""
-
-#: ../user/pending.php:66
-msgid "Pending credit"
-msgstr ""
-
-#: ../user/pending.php:68
-msgid "Result ID"
-msgstr ""
-
-#: ../user/pending.php:68
-msgid "Workunit ID"
-msgstr ""
-
-#: ../user/pending.php:68
-msgid "Host ID"
-msgstr ""
-
-#: ../user/pending.php:68
-msgid "Claimed credit"
-msgstr ""
-
-#: ../user/pending.php:81
-msgid "Pending credit: %1"
-msgstr ""
-
-#: ../user/pm.php:32
-msgid "Block messages from this user"
-msgstr ""
-
-#: ../user/pm.php:32
-msgid "Block user"
-msgstr ""
-
-#: ../user/pm.php:73
-msgid "Your message has been sent."
-msgstr ""
-
-#: ../user/pm.php:83
-msgid "You have no private messages."
-msgstr ""
-
-#: ../user/pm.php:90
-msgid "Sender and date"
-msgstr ""
-
-#: ../user/pm.php:106
-msgid "Reply to this message"
-msgstr ""
-
-#: ../user/pm.php:107
-msgid "Delete this message"
-msgstr ""
-
-#: ../user/pm.php:112
-msgid "Select all"
-msgstr ""
-
-#: ../user/pm.php:114
-msgid "Unselect all"
-msgstr ""
-
-#: ../user/pm.php:117
-msgid "Delete selected messages"
-msgstr ""
-
-#: ../user/pm.php:140
-msgid "Sender"
-msgstr ""
-
-#: ../user/pm.php:143
-msgid "Date"
-msgstr ""
-
-#: ../user/pm.php:185
-msgid "You need to fill all fields to send a private message"
-msgstr ""
-
-#: ../user/pm.php:188
-msgid ""
-"Your message was flagged as spam\n"
-"                by the Akismet anti-spam system.\n"
-"                Please modify your text and try again."
-msgstr ""
-
-#: ../user/pm.php:205
-msgid "Could not find user with id %1"
-msgstr ""
-
-#: ../user/pm.php:210
-msgid "Could not find user with username %1"
-msgstr ""
-
-#: ../user/pm.php:212
-msgid "%1 is not a unique username; you will have to use user ID"
-msgstr ""
-
-#: ../user/pm.php:217
-msgid "User %1 (ID: %2) is not accepting private messages from you."
-msgstr ""
-
-#: ../user/pm.php:240 ../user/view_profile.php:26
-msgid "No such user"
-msgstr ""
-
-#: ../user/pm.php:242
-msgid "Really block %1?"
-msgstr ""
-
-#: ../user/pm.php:243
-msgid ""
-"Are you really sure you want to block user %1 from sending you private "
-"messages?"
-msgstr ""
-
-#: ../user/pm.php:244
-msgid "Please note that you can only block a limited amount of users."
-msgstr ""
-
-#: ../user/pm.php:245
-msgid ""
-"Once the user has been blocked you can unblock it using forum preferences "
-"page."
-msgstr ""
-
-#: ../user/pm.php:252
-msgid "No, cancel"
-msgstr ""
-
-#: ../user/pm.php:260 ../user/team_admins.php:98
-msgid "no such user"
-msgstr ""
-
-#: ../user/pm.php:263
-msgid "User %1 blocked"
-msgstr ""
-
-#: ../user/pm.php:265
-msgid "User %1 has been blocked from sending you private messages."
-msgstr ""
-
-#: ../user/pm.php:266
-msgid "To unblock, visit %1message board preferences%2"
-msgstr ""
-
-#: ../user/pm.php:302
-msgid "Unknown action"
-msgstr ""
-
-#: ../user/prefs.php:32
-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 ""
-
-#: ../user/prefs.php:41
-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 ""
-
-#: ../user/prefs_edit.php:65 ../user/prefs_edit.php:93
-msgid "%1 for %2"
-msgstr ""
-
-#: ../user/prefs_edit.php:110
-msgid "Back to preferences"
-msgstr ""
-
-#: ../user/prefs_remove.php:45
-msgid "Confirm delete preferences"
-msgstr ""
-
-#: ../user/prefs_remove.php:48
-msgid "Are you sure you want to delete your separate %1 preferences for %2?"
-msgstr ""
-
-#: ../user/prefs_remove.php:52
-msgid "Remove preferences"
-msgstr ""
-
-#: ../user/prefs_remove.php:54
-msgid "Cancel"
-msgstr ""
-
-#: ../user/profile_menu.php:35
-msgid ""
-"%1Profiles%2 let individuals share backgrounds and opinions with the %3 "
-"community."
-msgstr ""
-
-#: ../user/profile_menu.php:36
-msgid ""
-"Explore the diversity of your fellow volunteers, and contribute your own "
-"views for others to enjoy."
-msgstr ""
-
-#: ../user/profile_menu.php:37
-msgid ""
-"If you haven't already, you can %1create your own user profile%2 for others "
-"to see!"
-msgstr ""
-
-#: ../user/profile_menu.php:42
-msgid "User of the Day"
-msgstr ""
-
-#: ../user/profile_menu.php:57
-msgid "User Profile Explorer"
-msgstr ""
-
-#: ../user/profile_menu.php:60
-msgid "View the %1User Picture Gallery%2."
-msgstr ""
-
-#: ../user/profile_menu.php:61
-msgid "Browse profiles %1by country%2."
-msgstr ""
-
-#: ../user/profile_menu.php:62
-msgid ""
-"Browse profiles %1at random%2, %3at random with pictures%2, or %4at random "
-"without pictures%2."
-msgstr ""
-
-#: ../user/profile_menu.php:66
-msgid "Alphabetical profile listings:"
-msgstr ""
-
-#: ../user/profile_menu.php:72
-msgid "Search profile text"
-msgstr ""
-
-#: ../user/profile_menu.php:98
-msgid "No profiles"
-msgstr ""
-
-#: ../user/profile_menu.php:99
-msgid "No profiles matched your query."
-msgstr ""
-
-#: ../user/profile_rate.php:29
-msgid "Invalid vote type:"
-msgstr ""
-
-#: ../user/profile_rate.php:34
-msgid "Vote Recorded"
-msgstr ""
-
-#: ../user/profile_rate.php:38
-msgid "Thank you"
-msgstr ""
-
-#: ../user/profile_rate.php:41
-msgid "Your recommendation has been recorded."
-msgstr ""
-
-#: ../user/profile_rate.php:43
-msgid "Your vote to reject this profile has been recorded."
-msgstr ""
-
-#: ../user/profile_rate.php:46
-msgid "Return to profile."
-msgstr ""
-
-#: ../user/profile_search_action.php:36
-msgid "Profiles containing '%1'"
-msgstr ""
-
-#: ../user/profile_search_action.php:40
-msgid "User name"
-msgstr ""
-
-#: ../user/profile_search_action.php:41
-msgid "Joined project"
-msgstr ""
-
-#: ../user/profile_search_action.php:44
-msgid "Recent credit"
-msgstr ""
-
-#: ../user/profile_search_action.php:54
-msgid "No profiles found containing '%1'"
-msgstr ""
-
-#: ../user/result.php:35
-msgid "Task %1"
-msgstr ""
-
-#: ../user/results.php:29
-msgid "This feature is turned off temporarily"
-msgstr ""
-
-#: ../user/results.php:56
-msgid "No computer with ID %1 found"
-msgstr ""
-
-#: ../user/results.php:63
-msgid "No access"
-msgstr ""
-
-#: ../user/results.php:69
-msgid "Missing user ID or host ID"
-msgstr ""
-
-#: ../user/results.php:107
-msgid "No tasks to display"
-msgstr ""
-
-#: ../user/server_status.php:97
-msgid "Running"
-msgstr ""
-
-#: ../user/server_status.php:100
-msgid "Not Running"
-msgstr ""
-
-#: ../user/server_status.php:103
-msgid "Disabled"
-msgstr ""
-
-#: ../user/server_status.php:231
-msgid "Project status"
-msgstr ""
-
-#: ../user/server_status.php:233
-msgid "Server software version: %1"
-msgstr ""
-
-#: ../user/server_status.php:241
-msgid "Program"
-msgstr ""
-
-#: ../user/server_status.php:241
-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: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
-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
-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 ""
-
-#: ../user/server_status.php:411
-msgid "current GigaFLOPs"
-msgstr ""
-
-#: ../user/server_status.php:420
-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 ""
-
-#: ../user/server_status.php:427
-msgid "users in last 24h"
-msgstr ""
-
-#: ../user/show_host_detail.php:40
-msgid "Computer %1"
-msgstr ""
-
-#: ../user/stats.php:21
-msgid "Statistics and leaderboards"
-msgstr ""
-
-#: ../user/stats.php:28
-msgid "Statistics for %1"
-msgstr ""
-
-#: ../user/stats.php:37
-msgid ""
-"More detailed statistics for %1 and other BOINC-based projects are available "
-"at several web sites:"
-msgstr ""
-
-#: ../user/stats.php:40
-msgid ""
-"You can also get your current statistics in the form of a \"signature image"
-"\":"
-msgstr ""
-
-#: ../user/stats.php:43
-msgid ""
-"Additionally you can get your individual statistics summed across all BOINC "
-"projects from several sites; see your %1home page%2."
-msgstr ""
-
-#: ../user/team.php:27
-msgid "%1 participants may form %2teams%3."
-msgstr ""
-
-#: ../user/team.php:29
-msgid ""
-"You may belong to only one team. You can join or quit a team at any time."
-msgstr ""
-
-#: ../user/team.php:31
-msgid "Each team has a %1founder%2 who may:"
-msgstr ""
-
-#: ../user/team.php:33
-msgid "access team members' email addresses"
-msgstr ""
-
-#: ../user/team.php:34
-msgid "edit the team's name and description"
-msgstr ""
-
-#: ../user/team.php:35
-msgid "add or remove team admins"
-msgstr ""
-
-#: ../user/team.php:36
-msgid "remove members from the team"
-msgstr ""
-
-#: ../user/team.php:37
-msgid "disband a team if it has no members"
-msgstr ""
-
-#: ../user/team.php:40
-msgid "To join a team, visit its team page and click %1Join this team%2."
-msgstr ""
-
-#: ../user/team.php:41 ../user/team_search.php:180
-msgid "Find a team"
-msgstr ""
-
-#: ../user/team.php:48
-msgid "All teams"
-msgstr ""
-
-#: ../user/team.php:52
-msgid "%1 teams"
-msgstr ""
-
-#: ../user/team.php:58
-msgid "Create a new team"
-msgstr ""
-
-#: ../user/team.php:59
-msgid ""
-"If you cannot find a team that is right for you, you can %1create a team%2."
-msgstr ""
-
-#: ../user/team_admins.php:34
-msgid "Remove Team Admin status from this member"
-msgstr ""
-
-#: ../user/team_admins.php:40 ../user/team_admins.php:51
-msgid "Add or remove Team Admins"
-msgstr ""
-
-#: ../user/team_admins.php:41
-msgid "You can select team members as 'Team Admins'. Team Admins can:"
-msgstr ""
-
-#: ../user/team_admins.php:43
-msgid "Edit team information (name, URL, description, country)"
-msgstr ""
-
-#: ../user/team_admins.php:44
-msgid "View the team's join/quit history"
-msgstr ""
-
-#: ../user/team_admins.php:45
-msgid ""
-"Moderate the team forum, if any (admins get email notification of moderation "
-"events and red X reports)"
-msgstr ""
-
-#: ../user/team_admins.php:47
-msgid "Team Admins cannot:"
-msgstr ""
-
-#: ../user/team_admins.php:49
-msgid "Change the team founder"
-msgstr ""
-
-#: ../user/team_admins.php:50 ../user/team_manage.php:54
-msgid "Remove members"
-msgstr ""
-
-#: ../user/team_admins.php:53
-msgid "If a Team Admin quits the team, they cease to be a Team Admin."
-msgstr ""
-
-#: ../user/team_admins.php:54
-msgid ""
-"We recommend that you select only people you know and trust very well as "
-"Team Admins."
-msgstr ""
-
-#: ../user/team_admins.php:59
-msgid "There are currently no Team Admins"
-msgstr ""
-
-#: ../user/team_admins.php:61
-msgid "Current Team Admins"
-msgstr ""
-
-#: ../user/team_admins.php:62
-msgid "Became Team Admin on"
-msgstr ""
-
-#: ../user/team_admins.php:77
-msgid "Add Team Admin"
-msgstr ""
-
-#: ../user/team_admins.php:78
-msgid "Email address of team member:"
-msgstr ""
-
-#: ../user/team_admins.php:90
-msgid "failed to remove admin"
-msgstr ""
-
-#: ../user/team_admins.php:99
-msgid "User is not member of team"
-msgstr ""
-
-#: ../user/team_admins.php:101
-msgid "%1 is already an admin of %2"
-msgstr ""
-
-#: ../user/team_admins.php:105
-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
-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
-msgid "no such team"
-msgstr ""
-
-#: ../user/team_change_founder_action.php:38
-msgid "User is not a member of %1"
-msgstr ""
-
-#: ../user/team_change_founder_action.php:41
-msgid "Changing founder of %1"
-msgstr ""
-
-#: ../user/team_change_founder_action.php:43
-msgid "%1 is now founder of %2"
-msgstr ""
-
-#: ../user/team_change_founder_form.php:37
-msgid "Change founder of %1"
-msgstr ""
-
-#: ../user/team_change_founder_form.php:43
-msgid ""
-"Team member %1 requested this team's foundership on %2, but left the team, "
-"thus canceling the request."
-msgstr ""
-
-#: ../user/team_change_founder_form.php:49
-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 ""
-
-#: ../user/team_change_founder_form.php:55
-msgid "decline request"
-msgstr ""
-
-#: ../user/team_change_founder_form.php:58
-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 ""
-
-#: ../user/team_change_founder_form.php:66
-msgid "No transfer request is pending."
-msgstr ""
-
-#: ../user/team_change_founder_form.php:69
-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 ""
-
-#: ../user/team_change_founder_form.php:76
-msgid "New founder?"
-msgstr ""
-
-#: ../user/team_change_founder_form.php:105 ../user/team_manage.php:56
-msgid "Change founder"
-msgstr ""
-
-#: ../user/team_change_founder_form.php:108
-msgid "There are no users to transfer team to."
-msgstr ""
-
-#: ../user/team_create_action.php:29
-msgid "You must choose a non-blank team name"
-msgstr ""
-
-#: ../user/team_create_action.php:34
-msgid "A team named %1 already exists - try another name"
-msgstr ""
-
-#: ../user/team_create_action.php:54
-msgid "Could not create team - please try later."
-msgstr ""
-
-#: ../user/team_create_form.php:27 ../user/team_create_form.php:32
-msgid "Create a team"
-msgstr ""
-
-#: ../user/team_create_form.php:30
-msgid ""
-"You belong to %1. You must %2quit this team%3 before creating a new one."
-msgstr ""
-
-#: ../user/team_delta.php:65
-msgid "Not founder or admin"
-msgstr ""
-
-#: ../user/team_delta.php:72
-msgid "Team history for %1"
-msgstr ""
-
-#: ../user/team_delta.php:75
-msgid "When"
-msgstr ""
-
-#: ../user/team_delta.php:76
-msgid "User"
-msgstr ""
-
-#: ../user/team_delta.php:77
-msgid "Action"
-msgstr ""
-
-#: ../user/team_delta.php:78
-msgid "Total credit at time of action"
-msgstr ""
-
-#: ../user/team_edit_action.php:53
-msgid "bad country"
-msgstr ""
-
-#: ../user/team_edit_action.php:59
-msgid "The name '%1' is being used by another team."
-msgstr ""
-
-#: ../user/team_edit_action.php:62
-msgid "Must specify team name"
-msgstr ""
-
-#: ../user/team_edit_action.php:90
-msgid "Could not update team - please try again later."
-msgstr ""
-
-#: ../user/team_edit_form.php:33
-msgid "Edit %1"
-msgstr ""
-
-#: ../user/team_edit_form.php:34
-msgid "Update team info"
-msgstr ""
-
-#: ../user/team_email_list.php:61
-msgid "%1 Email List"
-msgstr ""
-
-#: ../user/team_email_list.php:63
-msgid "Member list of %1"
-msgstr ""
-
-#: ../user/team_email_list.php:78
-msgid "Show as plain text"
-msgstr ""
-
-#: ../user/team_forum.php:28 ../user/team_forum.php:39
-msgid "Create Message Board"
-msgstr ""
-
-#: ../user/team_forum.php:29
-msgid "You may create a message board for use by %1."
-msgstr ""
-
-#: ../user/team_forum.php:31
-msgid "Only team members will be able to post."
-msgstr ""
-
-#: ../user/team_forum.php:32
-msgid "At your option, only members will be able to read."
-msgstr ""
-
-#: ../user/team_forum.php:33
-msgid "You and your Team Admins will have moderator privileges."
-msgstr ""
-
-#: ../user/team_forum.php:40
-msgid "Create a message board for %1"
-msgstr ""
-
-#: ../user/team_forum.php:48
-msgid "Team already has a message board"
-msgstr ""
-
-#: ../user/team_forum.php:59
-msgid "Team Message Board"
-msgstr ""
-
-#: ../user/team_forum.php:71
-msgid "Minimum time between posts (seconds)"
-msgstr ""
-
-#: ../user/team_forum.php:74
-msgid "Minimum total credit to post"
-msgstr ""
-
-#: ../user/team_forum.php:77
-msgid "Minimum average credit to post"
-msgstr ""
-
-#: ../user/team_forum.php:80
-msgid "Submit"
-msgstr ""
-
-#: ../user/team_forum.php:89
-msgid "Remove your team's message board."
-msgstr ""
-
-#: ../user/team_forum.php:97
-msgid "Really remove message board?"
-msgstr ""
-
-#: ../user/team_forum.php:98
-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
-msgid "Yes - remove message board"
-msgstr ""
-
-#: ../user/team_forum.php:121
-msgid "Message board removed"
-msgstr ""
-
-#: ../user/team_forum.php:124
-msgid ""
-"Your team's message board has been removed. You may now %1create a new one%2."
-msgstr ""
-
-#: ../user/team_forum.php:143
-msgid "Team Message Board Updated"
-msgstr ""
-
-#: ../user/team_forum.php:144
-msgid "Update successful"
-msgstr ""
-
-#: ../user/team_forum.php:147
-msgid "Update failed"
-msgstr ""
-
-#: ../user/team_forum.php:154
-msgid "Team has no forum"
-msgstr ""
-
-#: ../user/team_founder_transfer_action.php:36
-msgid "You must be a member of a team to access this page."
-msgstr ""
-
-#: ../user/team_founder_transfer_action.php:90
-msgid "Requesting foundership of %1"
-msgstr ""
-
-#: ../user/team_founder_transfer_action.php:98
-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 ""
-
-#: ../user/team_founder_transfer_action.php:102
-#: ../user/team_founder_transfer_action.php:113
-msgid "Foundership request not allowed now"
-msgstr ""
-
-#: ../user/team_founder_transfer_action.php:109
-msgid "Assumed foundership of %1"
-msgstr ""
-
-#: ../user/team_founder_transfer_action.php:111
-msgid ""
-"Congratulations, you are now the founder of team %1. Go to %2Your Account "
-"page%3 to find the Team Admin options."
-msgstr ""
-
-#: ../user/team_founder_transfer_action.php:120
-msgid "Decline founder change request"
-msgstr ""
-
-#: ../user/team_founder_transfer_action.php:127
-msgid "The foundership request from %1 has been declined."
-msgstr ""
-
-#: ../user/team_founder_transfer_action.php:130
-msgid "There were no foundership requests."
-msgstr ""
-
-#: ../user/team_founder_transfer_action.php:134
-msgid "undefined action %1"
-msgstr ""
-
-#: ../user/team_founder_transfer_action.php:137
-#: ../user/team_founder_transfer_form.php:83
-msgid "Return to team page"
-msgstr ""
-
-#: ../user/team_founder_transfer_form.php:28
-msgid "You need to be a member of a team to access this page."
-msgstr ""
-
-#: ../user/team_founder_transfer_form.php:31
-msgid "Request foundership of %1"
-msgstr ""
-
-#: ../user/team_founder_transfer_form.php:38
-msgid "You are now founder of team %1."
-msgstr ""
-
-#: ../user/team_founder_transfer_form.php:44
-msgid "You requested the foundership of %1 on %2."
-msgstr ""
-
-#: ../user/team_founder_transfer_form.php:47
-msgid ""
-"60 days have elapsed since your request, and the founder has not responded. "
-"You may now assume foundership by clicking here:"
-msgstr ""
-
-#: ../user/team_founder_transfer_form.php:50
-msgid "Assume foundership"
-msgstr ""
-
-#: ../user/team_founder_transfer_form.php:54
-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 ""
-
-#: ../user/team_founder_transfer_form.php:60
-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 ""
-
-#: ../user/team_founder_transfer_form.php:65
-msgid "Request foundership"
-msgstr ""
-
-#: ../user/team_founder_transfer_form.php:74
-msgid "Founder change has already been requested by %1 on %2."
-msgstr ""
-
-#: ../user/team_founder_transfer_form.php:77
-msgid ""
-"A foundership change was requested during the last 90 days, so new requests "
-"are not allowed. Please try again later."
-msgstr ""
-
-#: ../user/team_join.php:32 ../user/team_join_action.php:32
-#: ../user/team_join_form.php:29
-msgid "The team %1 is not joinable."
-msgstr ""
-
-#: ../user/team_join.php:35 ../user/team_join_action.php:35
-msgid "Already a member"
-msgstr ""
-
-#: ../user/team_join.php:36 ../user/team_join_action.php:36
-msgid "You are already a member of %1."
-msgstr ""
-
-#: ../user/team_join.php:42 ../user/team_join_action.php:43
-msgid "Couldn't join team - please try again later."
-msgstr ""
-
-#: ../user/team_join_action.php:40
-msgid "Joined %1"
-msgstr ""
-
-#: ../user/team_join_action.php:41
-msgid "You have joined %1."
-msgstr ""
-
-#: ../user/team_join_form.php:32
-msgid "Join %1"
-msgstr ""
-
-#: ../user/team_join_form.php:33
-msgid "Please note:"
-msgstr ""
-
-#: ../user/team_join_form.php:35
-msgid "Joining a team gives its founder access to your email address."
-msgstr ""
-
-#: ../user/team_join_form.php:36
-msgid "Joining a team does not affect your account's credit."
-msgstr ""
-
-#: ../user/team_join_form.php:43
-msgid "Join team"
-msgstr ""
-
-#: ../user/team_lookup.php:84
-msgid "Search Results"
-msgstr ""
-
-#: ../user/team_lookup.php:86
-msgid "Search results for '%1'"
-msgstr ""
-
-#: ../user/team_lookup.php:88
-msgid "You may view these teams' members, statistics, and information."
-msgstr ""
-
-#: ../user/team_lookup.php:98
-msgid "More than 100 teams match your search. The first 100 are shown."
-msgstr ""
-
-#: ../user/team_lookup.php:104
-msgid ""
-"End of results. %1 If you cannot find the team you are looking for, you may %"
-"2create a team%3 yourself."
-msgstr ""
-
-#: ../user/team_manage.php:26
-msgid "Team administration for %1"
-msgstr ""
-
-#: ../user/team_manage.php:29
-msgid "Edit team info"
-msgstr ""
-
-#: ../user/team_manage.php:30
-msgid "Change team name, URL, description, type, or country"
-msgstr ""
-
-#: ../user/team_manage.php:32
-msgid "Member list:"
-msgstr ""
-
-#: ../user/team_manage.php:33 ../user/team_manage.php:37
-msgid "HTML"
-msgstr ""
-
-#: ../user/team_manage.php:34
-msgid "text"
-msgstr ""
-
-#: ../user/team_manage.php:35
-msgid "View member names and email addresses"
-msgstr ""
-
-#: ../user/team_manage.php:36
-msgid "View change history:"
-msgstr ""
-
-#: ../user/team_manage.php:38
-msgid "XML"
-msgstr ""
-
-#: ../user/team_manage.php:39
-msgid "See when members joined or quit this team"
-msgstr ""
-
-#: ../user/team_manage.php:50
-msgid "Respond to foundership request."
-msgstr ""
-
-#: ../user/team_manage.php:50
-msgid "If you don't respond by %1, %2 may assume foundership of this team."
-msgstr ""
-
-#: ../user/team_manage.php:55
-msgid "Remove inactive or unwanted members from this team"
-msgstr ""
-
-#: ../user/team_manage.php:57
-msgid "Transfer foundership to another member"
-msgstr ""
-
-#: ../user/team_manage.php:58
-msgid "Add/remove Team Admins"
-msgstr ""
-
-#: ../user/team_manage.php:59
-msgid "Give selected team members Team Admin privileges"
-msgstr ""
-
-#: ../user/team_manage.php:61
-msgid "Remove team"
-msgstr ""
-
-#: ../user/team_manage.php:62
-msgid "Allowed only if team has no members"
-msgstr ""
-
-#: ../user/team_manage.php:64
-msgid "Create or manage a team message board"
-msgstr ""
-
-#: ../user/team_manage.php:71
-msgid ""
-"To have this team created on all BOINC projects (current and future) you can "
-"make it into a %1BOINC-wide team%2."
-msgstr ""
-
-#: ../user/team_manage.php:73
-msgid ""
-"Team admins are encouraged to join and participate in the Google %1boinc-"
-"team-founders%2 group."
-msgstr ""
-
-#: ../user/team_manage.php:75
-msgid ""
-"Other resources for BOINC team admins are available from a third-party site, "
-"%1www.boincteams.com%2."
-msgstr ""
-
-#: ../user/team_manage.php:91
-msgid "Can't delete non-empty team"
-msgstr ""
-
-#: ../user/team_manage.php:95
-msgid "Team %1 deleted"
-msgstr ""
-
-#: ../user/team_members.php:36
-msgid "Limit exceeded:  Can only display the first 1000 members."
-msgstr ""
-
-#: ../user/team_members.php:49
-msgid "Members of %1"
-msgstr ""
-
-#: ../user/team_quit_action.php:32
-msgid "Unable to quit team"
-msgstr ""
-
-#: ../user/team_quit_action.php:33
-msgid "Team doesn't exist, or you don't belong to it."
-msgstr ""
-
-#: ../user/team_quit_form.php:31
-msgid "Quit %1"
-msgstr ""
-
-#: ../user/team_quit_form.php:32
-msgid ""
-"<strong>Please note before quitting a team:</strong>\n"
-"         <ul>\n"
-"         <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 ""
-
-#: ../user/team_quit_form.php:40
-msgid "Quit Team"
-msgstr ""
-
-#: ../user/team_remove_inactive_action.php:31
-msgid "Removing users from %1"
-msgstr ""
-
-#: ../user/team_remove_inactive_action.php:39
-msgid "%1 is not a member of %2"
-msgstr ""
-
-#: ../user/team_remove_inactive_action.php:42
-msgid "%1 has been removed"
-msgstr ""
-
-#: ../user/team_remove_inactive_form.php:32
-msgid "Remove members from %1"
-msgstr ""
-
-#: ../user/team_remove_inactive_form.php:39
-msgid "Remove?"
-msgstr ""
-
-#: ../user/team_remove_inactive_form.php:40
-msgid "Name (ID)"
-msgstr ""
-
-#: ../user/team_remove_inactive_form.php:65
-msgid "No members are eligible for removal."
-msgstr ""
-
-#: ../user/team_remove_inactive_form.php:68
-msgid "Remove users"
-msgstr ""
-
-#: ../user/team_search.php:68
-msgid "Team name"
-msgstr ""
-
-#: ../user/team_search.php:92
-msgid "Team search results"
-msgstr ""
-
-#: ../user/team_search.php:94
-msgid "No teams were found matching your criteria. Try another search."
-msgstr ""
-
-#: ../user/team_search.php:96
-msgid "Or you can %1create a new team%2."
-msgstr ""
-
-#: ../user/team_search.php:100
-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 ""
-
-#: ../user/team_search.php:107
-msgid "Change your search"
-msgstr ""
-
-#: ../user/team_search.php:181
-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
-msgid "Use this form to find teams that might be right for you."
-msgstr ""
-
-#: ../user/team_search.php:188
-msgid "%1I'm not interested%2 in joining a team right now."
-msgstr ""
-
-#: ../user/top_hosts.php:67 ../user/top_teams.php:100
-#: ../user/top_users.php:112
-msgid "Limit exceeded - Sorry, first %1 items only"
-msgstr ""
-
-#: ../user/top_hosts.php:82
-msgid "Top hosts"
-msgstr ""
-
-#: ../user/top_teams.php:105
-msgid "Top %1 teams"
-msgstr ""
-
-#: ../user/top_teams.php:108
-msgid "There are no %1 teams"
-msgstr ""
-
-#: ../user/top_users.php:64
-msgid "Participant since"
-msgstr ""
-
-#: ../user/uotd.php:29
-msgid "No user of the day has been chosen."
-msgstr ""
-
-#: ../user/uotd.php:33
-msgid "User of the Day for %1: %2"
-msgstr ""
-
-#: ../user/user_search.php:51
-msgid "Filters"
-msgstr ""
-
-#: ../user/user_search.php:52
-msgid "User name starts with"
-msgstr ""
-
-#: ../user/user_search.php:53
-msgid "Any"
-msgstr ""
-
-#: ../user/user_search.php:56
-msgid "With profile?"
-msgstr ""
-
-#: ../user/user_search.php:57 ../user/user_search.php:62
-msgid "Either"
-msgstr ""
-
-#: ../user/user_search.php:61
-msgid "On a team?"
-msgstr ""
-
-#: ../user/user_search.php:66
-msgid "Ordering"
-msgstr ""
-
-#: ../user/user_search.php:67
-msgid "Decreasing sign-up time"
-msgstr ""
-
-#: ../user/user_search.php:68
-msgid "Decreasing average credit"
-msgstr ""
-
-#: ../user/user_search.php:69
-msgid "Decreasing total credit"
-msgstr ""
-
-#: ../user/user_search.php:100
-msgid "search string must be at least 3 characters"
-msgstr ""
-
-#: ../user/user_search.php:133
-msgid "User search results"
-msgstr ""
-
-#: ../user/user_search.php:140
-msgid "Joined"
-msgstr ""
-
-#: ../user/user_search.php:148
-msgid "No users match your search criteria."
-msgstr ""
-
-#: ../user/userw.php:35
-msgid "User not found!"
-msgstr ""
-
-#: ../user/userw.php:44
-msgid "Account Data<br/>for %1<br/>Time:"
-msgstr ""
-
-#: ../user/userw.php:47
-msgid "Team:"
-msgstr ""
-
-#: ../user/userw.php:48
-msgid "Team TotCred:"
-msgstr ""
-
-#: ../user/userw.php:49
-msgid "Team AvgCred:"
-msgstr ""
-
-#: ../user/userw.php:51
-msgid "Team: None"
-msgstr ""
-
-#: ../user/validate_email_addr.php:30
-msgid "Validate BOINC email address"
-msgstr ""
-
-#: ../user/validate_email_addr.php:31
-msgid ""
-"Please visit the following link to validate the email address of your %1 "
-"account:"
-msgstr ""
-
-#: ../user/validate_email_addr.php:34
-msgid "Validate email sent"
-msgstr ""
-
-#: ../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 ""
-
-#: ../user/validate_email_addr.php:44
-msgid "No such user."
-msgstr ""
-
-#: ../user/validate_email_addr.php:49
-msgid "Error in URL data - can't validate email address"
-msgstr ""
-
-#: ../user/validate_email_addr.php:54
-msgid "Database update failed - please try again later."
-msgstr ""
-
-#: ../user/validate_email_addr.php:57
-msgid "Validate email address"
-msgstr ""
-
-#: ../user/validate_email_addr.php:58
-msgid "The email address of your account has been validated."
-msgstr ""
-
-#: ../user/view_profile.php:36
-msgid "This user has no profile"
-msgstr ""
-
-#: ../user/view_profile.php:54
-msgid "Profile: %1"
-msgstr ""
-
-#: ../user/view_profile.php:63
-msgid "Account data"
-msgstr ""
-
-#: ../user/weak_auth.php:52
-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 ""
-
-#: ../user/weak_auth.php:57
-msgid "This key can be used to:"
-msgstr ""
-
-#: ../user/weak_auth.php:59
-msgid "log in to your account on the web"
-msgstr ""
-
-#: ../user/weak_auth.php:61
-msgid ""
-"to attach a computer to your account without using the BOINC Manager.\n"
-"       To do so, install BOINC,\n"
-"       create a file named %1 in the BOINC\n"
-"       data directory, and set its contents to:"
-msgstr ""
-
-#: ../user/weak_auth.php:73
-msgid "Weak account key"
-msgstr ""
-
-#: ../user/weak_auth.php:74
-msgid ""
-"Your 'weak account key' can be used to attach computers to your account\n"
-"    as described above, but cannot be used to log in to your account or "
-"change it in any way.\n"
-"    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 ""
-
-#: ../user/weak_auth.php:81
-msgid ""
-"If you change your password, your weak account key changes, and your "
-"previous weak account key becomes invalid."
-msgstr ""
-
-#: ../user/workunit.php:32
-msgid "can't find workunit"
-msgstr ""
-
-#: ../user/workunit.php:35
-msgid "Workunit %1"
-msgstr ""
-
-#: ../user/workunit.php:43
-msgid "canonical result"
-msgstr ""
-
-#: ../user/workunit.php:46
-msgid "granted credit"
-msgstr ""
-
-#: ../user/workunit.php:55
-msgid "suppressed pending completion"
-msgstr ""
-
-#: ../user/workunit.php:58
-msgid "minimum quorum"
-msgstr ""
-
-#: ../user/workunit.php:59
-msgid "initial replication"
-msgstr ""
-
-#: ../user/workunit.php:60
-msgid "max # of error/total/success tasks"
-msgstr ""
-
-#: ../user/workunit.php:64
-msgid "errors"
-msgstr ""
-
-#: ../user/workunit.php:67
-msgid "validation"
-msgstr ""
-
-#: ../user/workunit.php:67
-msgid "Pending"
-msgstr ""
-
-#: ../project.sample/project.inc:43
-msgid "Main page"
-msgstr ""
-
-#: ../project.sample/project.inc:45
-msgid "Copyright"
-msgstr ""
-
-#: ../project.sample/project.inc:48
-msgid "Generated"
-msgstr ""
-
-#: ../project.sample/project.inc:79
-msgid "Your personal background."
-msgstr ""
-
-#: ../project.sample/project.inc:83
-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
-msgid "Your opinions about %1"
-msgstr ""
-
-#: ../project.sample/project.inc:91
-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 ""
-
-#: ../project.sample/project_specific_prefs.inc:47
-msgid "Color scheme for graphics"
-msgstr ""
-
-#: ../project.sample/project_specific_prefs.inc:48
-msgid "Maximum CPU % for graphics%10 ... 100%2"
-msgstr ""
-
-#: ../project.sample/project_specific_prefs.inc:49
-msgid "Run only the selected applications"
-msgstr ""
-
-#: ../project.sample/project_specific_prefs.inc:50
-msgid ""
-"If no work for selected applications is available, accept work from other "
-"applications?"
-msgstr ""
-
-#: ../project.sample/project_specific_prefs.inc:91
-msgid "(all applications)"
-msgstr ""
diff --git a/locale/sv_SE/BOINC-Setup.mo b/locale/sv_SE/BOINC-Setup.mo
deleted file mode 100644
index 29d661f..0000000
Binary files a/locale/sv_SE/BOINC-Setup.mo and /dev/null differ
diff --git a/locale/sv_SE/BOINC-Setup.po b/locale/sv_SE/BOINC-Setup.po
deleted file mode 100644
index beacd64..0000000
--- a/locale/sv_SE/BOINC-Setup.po
+++ /dev/null
@@ -1,122 +0,0 @@
-# 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.
-msgid ""
-msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-26 00:00-0800\n"
-"PO-Revision-Date: 2015-02-12 02:02-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: sv_SE\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.9.0\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#: Installer.cpp:124
-#, c-format
-msgid "Sorry, this version of %s requires system 10.5 or higher."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: PostInstall.cpp:1444
-#, c-format
-msgid "Do you want to set %s as the screensaver for all %s users on this Mac?"
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: uninstall.cpp:163
-#, c-format
-msgid "Canceled: %s has not been touched."
-msgstr ""
-
-#: uninstall.cpp:174
-#, c-format
-msgid "An error occurred: error code %d"
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: uninstall.cpp:840
-#, c-format
-msgid ""
-"Enter your administrator password to completely remove %s from you computer.\n"
-"\n"
-msgstr ""
-
-#: uninstall.cpp:1616
-msgid "Cancel"
-msgstr ""
-
-#: uninstall.cpp:1617
-msgid "Continue..."
-msgstr ""
-
diff --git a/locale/sv_SE/BOINC-Web.mo b/locale/sv_SE/BOINC-Web.mo
deleted file mode 100644
index 7affb3c..0000000
Binary files a/locale/sv_SE/BOINC-Web.mo and /dev/null differ
diff --git a/locale/sv_SE/BOINC-Web.po b/locale/sv_SE/BOINC-Web.po
deleted file mode 100644
index dc4144d..0000000
--- a/locale/sv_SE/BOINC-Web.po
+++ /dev/null
@@ -1,799 +0,0 @@
-# BOINC web translation
-# Copyright (C) 2008-2009 University of California
-# This file is distributed under the same license as BOINC.
-# FileID  : $Id$
-msgid ""
-msgstr ""
-"Project-Id-Version: BOINC 7.4\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-12 02:03-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: sv_SE\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.1.6\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-KeywordsList: tra\n"
-"X-Poedit-SearchPath-0: doc\n"
-
-#: docutil.php:21
-msgid "Search"
-msgstr "Sök"
-
-#: docutil.php:103
-msgid "Return to BOINC main page"
-msgstr ""
-
-#: docutil.php:114
-#, php-format
-msgid "This page is %stranslatable%s."
-msgstr ""
-
-#: download.php:39
-msgid "We recommend that you also install VirtualBox, so your computer can work on science projects that require it."
-msgstr ""
-
-#: download.php:41
-msgid "Learn more about VirtualBox."
-msgstr ""
-
-#: download.php:51
-msgid "Download BOINC + VirtualBox"
-msgstr ""
-
-#: download.php:54
-#: download.php:69
-#, php-format
-msgid "for %s"
-msgstr ""
-
-#: download.php:57
-#: download.php:72
-#, php-format
-msgid "BOINC version %s"
-msgstr ""
-
-#: download.php:59
-#, php-format
-msgid "VirtualBox version %s"
-msgstr ""
-
-#: download.php:67
-msgid "Download BOINC"
-msgstr ""
-
-#: download.php:123
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others."
-msgstr ""
-
-#: download.php:125
-msgid "After installing BOINC on your computer, you can connect it to as many of these projects as you like."
-msgstr ""
-
-#: download.php:127
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
-msgstr ""
-
-#: download.php:132
-msgid "We recommend that you download BOINC from the Google Play Store or Amazon Appstore, not from here."
-msgstr ""
-
-#: download.php:167
-msgid "System requirements"
-msgstr "Systemkrav"
-
-#: download.php:168
-msgid "Release notes"
-msgstr ""
-
-#: download.php:169
-#: index.php:86
-msgid "Help"
-msgstr "Hjälp"
-
-#: download.php:170
-msgid "All versions"
-msgstr ""
-
-#: download.php:171
-msgid "Version history"
-msgstr ""
-
-#: download.php:172
-msgid "GPU computing"
-msgstr ""
-
-#: download.php:190
-msgid "BOINC: compute for science"
-msgstr ""
-
-#: help.php:12
-#, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
-msgstr ""
-
-#: help.php:21
-#, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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 ""
-
-#: help.php:28
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
-msgstr ""
-
-#: help.php:31
-msgid "Volunteers speaking several languages are available. Please select a language:"
-msgstr ""
-
-#: help.php:47
-msgid "Be a Help Volunteer"
-msgstr ""
-
-#: help.php:50
-#, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
-msgstr ""
-
-#: help.php:56
-#, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
-msgstr ""
-
-#: help_funcs.php:107
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
-msgstr ""
-
-#: help_funcs.php:110
-msgid "%1Never%2 give email address or password information to BOINC helpers."
-msgstr ""
-
-#: index.php:24
-msgid "Computing power"
-msgstr "Datorkraft"
-
-#: index.php:26
-msgid "Top 100 volunteers"
-msgstr ""
-
-#: index.php:27
-msgid "Statistics"
-msgstr "Statistik"
-
-#: index.php:55
-msgid "Active:"
-msgstr "Aktiva:"
-
-#: index.php:55
-msgid "volunteers,"
-msgstr "voluntärer,"
-
-#: index.php:55
-msgid "computers.\n"
-msgstr "datorer.\n"
-
-#: index.php:56
-msgid "24-hour average:"
-msgstr "24-timmarssnitt:"
-
-#: index.php:56
-msgid "PetaFLOPS."
-msgstr ""
-
-#: index.php:68
-msgid "News"
-msgstr "Nyheter"
-
-#: index.php:83
-msgid "Volunteer"
-msgstr ""
-
-#: index.php:85
-msgid "Download"
-msgstr ""
-
-#: index.php:87
-#: index.php:120
-#: index.php:171
-msgid "Documentation"
-msgstr "Dokumentation"
-
-#: index.php:88
-msgid "Add-ons"
-msgstr ""
-
-#: index.php:89
-msgid "Links"
-msgstr ""
-
-#: index.php:94
-msgid "Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:"
-msgstr ""
-
-#: index.php:96
-msgid "Choose projects"
-msgstr ""
-
-#: index.php:97
-msgid "Download BOINC software"
-msgstr ""
-
-#: index.php:98
-msgid "Enter an email address and password."
-msgstr ""
-
-#: index.php:102
-#, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
-msgstr ""
-
-#: index.php:118
-msgid "Compute with BOINC"
-msgstr ""
-
-#: index.php:121
-msgid "Software updates"
-msgstr "Mjukvaruppdateringar"
-
-#: index.php:128
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
-msgstr ""
-
-#: index.php:132
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
-msgstr ""
-
-#: index.php:137
-msgid "%1Companies%2: use BOINC for %3desktop Grid computing%4."
-msgstr ""
-
-#: index.php:149
-msgid "The BOINC project"
-msgstr "BOINC-projektet"
-
-#: index.php:155
-msgid "Message boards"
-msgstr ""
-
-#: index.php:156
-msgid "Email lists"
-msgstr "E-postlistor"
-
-#: index.php:157
-msgid "Personnel and contributors"
-msgstr ""
-
-#: index.php:158
-msgid "Events"
-msgstr ""
-
-#: index.php:159
-msgid "Papers and talks"
-msgstr "Papper och föreläsningar"
-
-#: index.php:160
-msgid "Research projects"
-msgstr "Forskningsprojekt"
-
-#: index.php:161
-msgid "Logos and graphics"
-msgstr "Logotyper och grafik"
-
-#: index.php:162
-msgid "and"
-msgstr "och"
-
-#: index.php:166
-msgid "Help wanted"
-msgstr "Hjälp önskad"
-
-#: index.php:168
-msgid "Programming"
-msgstr "Programmering"
-
-#: index.php:169
-msgid "Translation"
-msgstr "Översättning"
-
-#: index.php:170
-msgid "Testing"
-msgstr "Testning"
-
-#: index.php:172
-msgid "Publicity"
-msgstr "Publicitet"
-
-#: index.php:174
-msgid "Software development"
-msgstr "Mjukvaruutveckling"
-
-#: index.php:175
-msgid "APIs for add-on software"
-msgstr ""
-
-#: index.php:217
-#, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
-msgstr ""
-
-#: index.php:230
-msgid "BOINC is based at The University of California, Berkeley"
-msgstr ""
-
-#: projects.inc:14
-msgid "Distributed sensing"
-msgstr ""
-
-#: projects.inc:19
-msgid "Stanford University"
-msgstr ""
-
-#: projects.inc:20
-msgid "Seismology"
-msgstr ""
-
-#: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
-msgstr ""
-
-#: projects.inc:27
-msgid "BOINC Poland Foundation"
-msgstr ""
-
-#: projects.inc:28
-msgid "Environmental research"
-msgstr ""
-
-#: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
-msgstr ""
-
-#: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
-msgstr ""
-
-#: projects.inc:37
-msgid "Cognitive science and artifical intelligence"
-msgstr "Kognitionsvetenskap och artificiell intelligens"
-
-# 85%
-# 100%
-#: projects.inc:60
-#: projects.inc:364
-#: projects.inc:408
-#: projects.inc:457
-#: projects.inc:464
-#: projects.inc:511
-#, fuzzy
-msgid "Private"
-msgstr "privat"
-
-#: projects.inc:61
-msgid "Artificial intelligence"
-msgstr "Artificiell intelligens"
-
-#: projects.inc:62
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
-msgstr ""
-
-#: projects.inc:69
-msgid "Biology and Medicine"
-msgstr "Biologi och medicin"
-
-#: projects.inc:82
-msgid "University College Dublin"
-msgstr ""
-
-#: projects.inc:83
-msgid "Antimalarial drug discovery"
-msgstr ""
-
-#: projects.inc:84
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
-msgstr ""
-
-#: projects.inc:90
-msgid "University of Karlsruhe (Germany)"
-msgstr ""
-
-#: projects.inc:91
-msgid "Protein structure prediction"
-msgstr ""
-
-#: projects.inc:92
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
-msgstr ""
-
-#: projects.inc:98
-msgid "University of Delaware"
-msgstr ""
-
-#: projects.inc:99
-msgid "Study of protein - ligand interactions"
-msgstr ""
-
-#: projects.inc:100
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
-msgstr ""
-
-#: projects.inc:114
-msgid "Barcelona Biomedical Research Park (PRBB)"
-msgstr ""
-
-#: projects.inc:115
-msgid "Molecular simulations of proteins"
-msgstr ""
-
-#: projects.inc:116
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
-msgstr ""
-
-#: projects.inc:122
-msgid "Technion, Israel"
-msgstr "Technion, Israel"
-
-#: projects.inc:123
-msgid "Genetic linkage analysis"
-msgstr "Analys av genetiska kopplingar"
-
-#: projects.inc:124
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
-msgstr ""
-
-#: projects.inc:138
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
-msgstr ""
-
-#: projects.inc:139
-msgid "Life science research"
-msgstr ""
-
-#: projects.inc:140
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
-msgstr ""
-
-#: projects.inc:146
-msgid "The Swiss Tropical Institute"
-msgstr ""
-
-#: projects.inc:147
-msgid "Epidemiology"
-msgstr ""
-
-#: projects.inc:148
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
-msgstr ""
-
-#: projects.inc:170
-msgid "University of Washington"
-msgstr ""
-
-#: projects.inc:171
-#: projects.inc:179
-msgid "Biology"
-msgstr ""
-
-#: projects.inc:172
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
-msgstr ""
-
-#: projects.inc:178
-msgid "University of Vienna"
-msgstr ""
-
-#: projects.inc:180
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
-msgstr ""
-
-#: projects.inc:186
-msgid "Earth Sciences"
-msgstr ""
-
-#: projects.inc:198
-msgid "Oxford University"
-msgstr ""
-
-#: projects.inc:199
-msgid "Climate study"
-msgstr ""
-
-#: projects.inc:200
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
-msgstr ""
-
-#: projects.inc:207
-msgid "Physical Science"
-msgstr ""
-
-#: projects.inc:213
-msgid "Mechanical engineering"
-msgstr ""
-
-#: projects.inc:214
-msgid "Currently we are calculating the optimum design of a structure call the 52 bar truss"
-msgstr ""
-
-#: projects.inc:224
-#: projects.inc:263
-#: projects.inc:271
-msgid "Astronomy"
-msgstr ""
-
-#: projects.inc:225
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
-msgstr ""
-
-#: projects.inc:247
-msgid "University of Texas at Austin"
-msgstr ""
-
-#: projects.inc:248
-#: projects.inc:279
-msgid "Chemistry"
-msgstr ""
-
-#: projects.inc:249
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
-msgstr ""
-
-#: projects.inc:262
-msgid "University of Illinois at Urbana-Champaign"
-msgstr ""
-
-#: projects.inc:264
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
-msgstr ""
-
-#: projects.inc:270
-msgid "Rensselaer Polytechnic Institute"
-msgstr ""
-
-#: projects.inc:272
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
-msgstr ""
-
-#: projects.inc:278
-msgid "Leiden University, The Netherlands"
-msgstr ""
-
-#: projects.inc:280
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
-msgstr ""
-
-#: projects.inc:294
-msgid "Univ. of Wisconsin - Milwaukee, Max Planck Institute"
-msgstr ""
-
-#: projects.inc:295
-msgid "Astrophysics"
-msgstr ""
-
-#: projects.inc:296
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
-msgstr ""
-
-#: projects.inc:310
-#: projects.inc:318
-msgid "CERN (European Organization for Nuclear Research)"
-msgstr ""
-
-#: projects.inc:311
-#: projects.inc:319
-msgid "Physics"
-msgstr ""
-
-#: projects.inc:312
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
-msgstr ""
-
-#: projects.inc:320
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
-msgstr ""
-
-#: projects.inc:326
-msgid "University of California, Berkeley"
-msgstr ""
-
-#: projects.inc:327
-msgid "Astrophysics, astrobiology"
-msgstr ""
-
-#: projects.inc:328
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
-msgstr ""
-
-#: projects.inc:342
-msgid "Bielefeld University of Applied Sciences"
-msgstr ""
-
-#: projects.inc:343
-msgid "Chemical engineering and nanotechnology"
-msgstr ""
-
-#: projects.inc:344
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
-msgstr ""
-
-#: projects.inc:351
-msgid "Multiple applications"
-msgstr ""
-
-#: projects.inc:356
-msgid "Chinese Academy of Sciences"
-msgstr ""
-
-#: projects.inc:357
-msgid "Physics, biochemistry, and others"
-msgstr ""
-
-#: projects.inc:358
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
-msgstr ""
-
-#: projects.inc:365
-msgid "Mathematics, physics, evolution"
-msgstr ""
-
-#: projects.inc:366
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
-msgstr ""
-
-#: projects.inc:371
-#: projects.inc:527
-msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
-msgstr ""
-
-#: projects.inc:372
-#, fuzzy
-msgid "European research projects"
-msgstr "Forskningsprojekt"
-
-#: projects.inc:373
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
-msgstr ""
-
-#: projects.inc:379
-msgid "Spanish universities and research centers"
-msgstr ""
-
-#: projects.inc:380
-#, fuzzy
-msgid "Various Spanish research projects"
-msgstr "Forskningsprojekt"
-
-#: projects.inc:381
-msgid "Research in physics, material science, and biomedicine"
-msgstr ""
-
-#: projects.inc:387
-msgid "IBM Corporate Citizenship"
-msgstr ""
-
-#: projects.inc:388
-msgid "Medical, environmental and other humanitarian research"
-msgstr ""
-
-#: projects.inc:389
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
-msgstr ""
-
-#: projects.inc:395
-msgid "Mathematics, computing, and games"
-msgstr ""
-
-#: projects.inc:401
-msgid "Computer Science"
-msgstr ""
-
-#: projects.inc:409
-msgid "Mathematics, Physics, Artificial Intelligence"
-msgstr ""
-
-#: projects.inc:410
-msgid "Simulation of quantum computing; Goldbach's conjecture."
-msgstr ""
-
-#: projects.inc:450
-#: projects.inc:458
-msgid "Cryptography"
-msgstr ""
-
-#: projects.inc:459
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
-msgstr ""
-
-#: projects.inc:465
-#: projects.inc:504
-#: projects.inc:512
-#: projects.inc:520
-#: projects.inc:528
-#: projects.inc:568
-msgid "Mathematics"
-msgstr ""
-
-#: projects.inc:466
-msgid "Study the Collatz Conjecture, an unsolved conjecture in mathematics"
-msgstr ""
-
-#: projects.inc:471
-msgid "California State University Fullerton"
-msgstr ""
-
-#: projects.inc:472
-msgid "Factorization of large integers"
-msgstr ""
-
-#: projects.inc:473
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
-msgstr ""
-
-#: projects.inc:479
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
-msgstr ""
-
-#: projects.inc:480
-#, fuzzy
-msgid "Software testing"
-msgstr "Mjukvaruppdateringar"
-
-#: projects.inc:481
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
-msgstr ""
-
-#: projects.inc:503
-msgid "Mathematical Institute of Leiden University / Kennislink"
-msgstr ""
-
-#: projects.inc:505
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
-msgstr ""
-
-#: projects.inc:513
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
-msgstr ""
-
-#: projects.inc:519
-msgid "Hochschule RheinMain University of Applied Sciences"
-msgstr ""
-
-#: projects.inc:521
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
-msgstr ""
-
-#: projects.inc:529
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
-msgstr ""
-
-#: ../html/inc/news.inc:40
-msgid "Comment"
-msgstr ""
-
-#: ../html/inc/news.inc:111
-#, php-format
-msgid "News is available as an %sRSS feed%s"
-msgstr ""
-
-#, php-format
-#~ msgid "%s for %s (%s MB)"
-#~ msgstr "%s för %s (%s MB)"
-#~ msgid "FreeHAL"
-#~ msgstr "FreeHAL"
-#~ msgid "private"
-#~ msgstr "privat"
-
-#, fuzzy
-#~ msgid "POEM at HOME"
-#~ msgstr "POEM at HOME"
-#~ msgid "Docking at Home"
-#~ msgstr "Docking at Home"
-#~ msgid "GPUGrid.net"
-#~ msgstr "GPUGrid.net"
-
-#, fuzzy
-#~ msgid "The Lattice Project"
-#~ msgstr "BOINC-projektet"
-
diff --git a/locale/sv_SE/wxstd.mo b/locale/sv_SE/wxstd.mo
deleted file mode 100644
index 556b5f8..0000000
Binary files a/locale/sv_SE/wxstd.mo and /dev/null differ
diff --git a/locale/templates/BOINC-Client.pot b/locale/templates/BOINC-Client.pot
old mode 100755
new mode 100644
diff --git a/locale/templates/BOINC-Manager.pot b/locale/templates/BOINC-Manager.pot
old mode 100755
new mode 100644
index 76456d6..99ffcbb
--- a/locale/templates/BOINC-Manager.pot
+++ b/locale/templates/BOINC-Manager.pot
@@ -5,52 +5,55 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: BOINC 7.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-15 16:56-0500\n"
-"PO-Revision-Date: 2014-12-15 16:56-0500\n"
+"POT-Creation-Date: 2015-03-24 13:36-0500\n"
+"PO-Revision-Date: 2015-03-24 13:37-0500\n"
 "Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
 "Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc_7.4\n"
 "X-Poedit-Language: English\n"
 "X-Poedit-Country: UNITED STATES\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\n"
 "X-Poedit-SearchPath-0: clientgui\n"
-"X-Poedit-SearchPath-1: clientgui/msw\n"
-"X-Poedit-SearchPath-2: clientgui/mac\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"
 
-#: clientgui/AccountInfoPage.cpp:387
+#: clientgui/AccountInfoPage.cpp:361
 #, c-format
 msgid "Identify your account at %s"
 msgstr ""
 
-#: clientgui/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 ""
 
-#: clientgui/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 ""
 
-#: clientgui/AccountInfoPage.cpp:401
+#: clientgui/AccountInfoPage.cpp:375
 msgid "Are you already running this project?"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:405
+#: clientgui/AccountInfoPage.cpp:379
 msgid "&No, new user"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:408
+#: clientgui/AccountInfoPage.cpp:382
 msgid "&Yes, existing user"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:413
+#: clientgui/AccountInfoPage.cpp:387
 msgid ""
 "We were not able to set up your account information\n"
 "automatically.\n"
@@ -60,113 +63,113 @@ msgid ""
 "password fields."
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:416
+#: clientgui/AccountInfoPage.cpp:390
 msgid "Find login information"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:649
+#: clientgui/AccountInfoPage.cpp:410
+#: clientgui/AccountInfoPage.cpp:632
 msgid "&Password:"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:673
+#: clientgui/AccountInfoPage.cpp:417
+#: clientgui/AccountInfoPage.cpp:656
 msgid "Choose a &password:"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:446
+#: clientgui/AccountInfoPage.cpp:420
 msgid "C&onfirm password:"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:453
+#: clientgui/AccountInfoPage.cpp:427
 #, c-format
 msgid "Are you already running %s?"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:482
+#: clientgui/AccountInfoPage.cpp:456
 msgid "&Username:"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:511
+#: clientgui/AccountInfoPage.cpp:485
 msgid "&Email address or LDAP ID:"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:515
+#: clientgui/AccountInfoPage.cpp:489
 msgid "&Email address:"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:523
+#: clientgui/AccountInfoPage.cpp:497
 #, c-format
 msgid "minimum length %d"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:530
+#: clientgui/AccountInfoPage.cpp:504
 msgid "Forgot your password?"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:537
+#: 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 ""
 
-#: clientgui/AccountInfoPage.cpp:540
+#: clientgui/AccountInfoPage.cpp:514
 msgid "Account manager web site"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:582
+#: clientgui/AccountInfoPage.cpp:556
 msgid "Add project"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:584
+#: clientgui/AccountInfoPage.cpp:558
 msgid "Update account manager"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:586
+#: clientgui/AccountInfoPage.cpp:560
 msgid "Use account manager"
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:593
+#: clientgui/AccountInfoPage.cpp:567
 msgid "Please enter a user name."
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:595
+#: clientgui/AccountInfoPage.cpp:569
 msgid "Please enter an email address."
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:605
+#: clientgui/AccountInfoPage.cpp:579
 #, c-format
 msgid "Please enter a password of at least %d characters."
 msgstr ""
 
-#: clientgui/AccountInfoPage.cpp:615
+#: clientgui/AccountInfoPage.cpp:589
 msgid "The password and confirmation password do not match. Please type them again."
 msgstr ""
 
-#: clientgui/AccountManagerInfoPage.cpp:272
+#: clientgui/AccountManagerInfoPage.cpp:270
 msgid "Choose an account manager"
 msgstr ""
 
-#: clientgui/AccountManagerInfoPage.cpp:275
+#: clientgui/AccountManagerInfoPage.cpp:273
 msgid ""
 "To choose an account manager, click its name or \n"
 "type its URL below."
 msgstr ""
 
-#: clientgui/AccountManagerInfoPage.cpp:279
+#: clientgui/AccountManagerInfoPage.cpp:277
 msgid "Account manager details:"
 msgstr ""
 
-#: clientgui/AccountManagerInfoPage.cpp:283
+#: clientgui/AccountManagerInfoPage.cpp:281
 msgid "Account manager &URL:"
 msgstr ""
 
-#: clientgui/AccountManagerInfoPage.cpp:287
+#: clientgui/AccountManagerInfoPage.cpp:285
 msgid "Open web page"
 msgstr ""
 
-#: clientgui/AccountManagerInfoPage.cpp:290
+#: clientgui/AccountManagerInfoPage.cpp:288
 msgid "Visit this account manager's web site"
 msgstr ""
 
@@ -190,314 +193,329 @@ msgstr ""
 msgid "An internal server error has occurred.\n"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:96
+#: clientgui/AdvancedFrame.cpp:99
 msgid "Connected"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:104
+#: clientgui/AdvancedFrame.cpp:107
 msgid "Disconnected"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:318
+#: clientgui/AdvancedFrame.cpp:325
 #, c-format
-msgid "Close the %s window"
+msgid "New %s window..."
+msgstr ""
+
+#: clientgui/AdvancedFrame.cpp:329
+#, c-format
+msgid "Open another %s window"
+msgstr ""
+
+#: clientgui/AdvancedFrame.cpp:340
+msgid "Select computer..."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:321
-msgid "&Close Window"
+#: clientgui/AdvancedFrame.cpp:341
+msgid "Connect to a BOINC client on another computer"
+msgstr ""
+
+#: clientgui/AdvancedFrame.cpp:345
+msgid "Shut down connected client..."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:332
-#: clientgui/AdvancedFrame.cpp:339
 #: clientgui/AdvancedFrame.cpp:346
+msgid "Shut down the currently connected BOINC client"
+msgstr ""
+
+#: clientgui/AdvancedFrame.cpp:351
 #, c-format
-msgid "Exit %s"
+msgid "Close the %s window"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:359
-msgid "Preferences..."
+#: clientgui/AdvancedFrame.cpp:354
+msgid "&Close window"
 msgstr ""
 
+#: clientgui/AdvancedFrame.cpp:363
 #: clientgui/AdvancedFrame.cpp:368
+#: clientgui/AdvancedFrame.cpp:373
+#, c-format
+msgid "Exit %s"
+msgstr ""
+
+#: clientgui/AdvancedFrame.cpp:386
+msgid "Preferences…"
+msgstr ""
+
+#: clientgui/AdvancedFrame.cpp:395
 msgid "&Notices\tCtrl+Shift+N"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:369
-msgid "Display notices"
+#: clientgui/AdvancedFrame.cpp:396
+msgid "Show notices"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:374
+#: clientgui/AdvancedFrame.cpp:401
 msgid "&Projects\tCtrl+Shift+P"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:375
-msgid "Display projects"
+#: clientgui/AdvancedFrame.cpp:402
+msgid "Show projects"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:380
+#: clientgui/AdvancedFrame.cpp:407
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:381
-msgid "Display tasks"
+#: clientgui/AdvancedFrame.cpp:408
+msgid "Show tasks"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:386
+#: clientgui/AdvancedFrame.cpp:413
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:387
-msgid "Display transfers"
+#: clientgui/AdvancedFrame.cpp:414
+msgid "Show file transfers"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:392
+#: clientgui/AdvancedFrame.cpp:419
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:393
-msgid "Display statistics"
+#: clientgui/AdvancedFrame.cpp:420
+msgid "Show statistics"
+msgstr ""
+
+#: clientgui/AdvancedFrame.cpp:425
+msgid "&Disk\tCtrl+Shift+D"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:398
-msgid "&Disk usage\tCtrl+Shift+D"
+#: clientgui/AdvancedFrame.cpp:426
+msgid "Show disk usage"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:399
-msgid "Display disk usage"
+#: clientgui/AdvancedFrame.cpp:432
+msgid "Event Log...\tCtrl+Shift+E"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:406
+#: clientgui/AdvancedFrame.cpp:433
+msgid "Show diagnostic messages"
+msgstr ""
+
+#: clientgui/AdvancedFrame.cpp:439
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:407
-msgid "Display the simple graphical interface."
+#: clientgui/AdvancedFrame.cpp:440
+msgid "Switch to the Simple View"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:421
+#: clientgui/AdvancedFrame.cpp:454
 msgid "&Add project or account manager..."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:422
-msgid "Volunteer for any or all of 30+ projects in many areas of science"
+#: clientgui/AdvancedFrame.cpp:455
+msgid "Add a new science project, or use an account manager"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:426
+#: clientgui/AdvancedFrame.cpp:459
 #, c-format
 msgid "&Synchronize with %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:430
+#: clientgui/AdvancedFrame.cpp:463
 #, c-format
 msgid "Get current settings from %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:440
+#: clientgui/AdvancedFrame.cpp:473
 msgid "&Add project..."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:441
+#: clientgui/AdvancedFrame.cpp:474
 msgid "Add a project"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:444
+#: clientgui/AdvancedFrame.cpp:477
 #, c-format
 msgid "S&top using %s..."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:450
+#: clientgui/AdvancedFrame.cpp:483
 msgid "Remove this computer from account manager control."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:455
-msgid "&Options..."
+#: clientgui/AdvancedFrame.cpp:489
+msgid "Run CPU &benchmarks"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:456
-msgid "Configure display options and proxy settings"
+#: clientgui/AdvancedFrame.cpp:490
+msgid "Run tests that measure CPU speed"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:460
-msgid "Computing &preferences..."
+#: clientgui/AdvancedFrame.cpp:494
+msgid "Retry pending transfers"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:461
-msgid "Configure computing preferences"
+#: clientgui/AdvancedFrame.cpp:495
+msgid "Retry deferred file transfers and task requests"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:469
+#: clientgui/AdvancedFrame.cpp:503
 msgid "&Run always"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:470
+#: clientgui/AdvancedFrame.cpp:504
 msgid "Allow work regardless of preferences"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:474
+#: clientgui/AdvancedFrame.cpp:508
 msgid "Run based on &preferences"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:475
+#: clientgui/AdvancedFrame.cpp:509
 msgid "Allow work according to preferences"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:479
+#: clientgui/AdvancedFrame.cpp:513
 msgid "&Suspend"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:480
+#: clientgui/AdvancedFrame.cpp:514
 msgid "Stop work regardless of preferences"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:505
+#: clientgui/AdvancedFrame.cpp:539
 msgid "Use GPU always"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:506
+#: clientgui/AdvancedFrame.cpp:540
 msgid "Allow GPU work regardless of preferences"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:510
+#: clientgui/AdvancedFrame.cpp:544
 msgid "Use GPU based on preferences"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:511
+#: clientgui/AdvancedFrame.cpp:545
 msgid "Allow GPU work according to preferences"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:515
+#: clientgui/AdvancedFrame.cpp:549
 msgid "Suspend GPU"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:516
+#: clientgui/AdvancedFrame.cpp:550
 msgid "Stop GPU work regardless of preferences"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:540
-msgid "Network activity always available"
+#: clientgui/AdvancedFrame.cpp:574
+msgid "Network activity always allowed"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:541
+#: clientgui/AdvancedFrame.cpp:575
 msgid "Allow network activity regardless of preferences"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:545
+#: clientgui/AdvancedFrame.cpp:579
 msgid "Network activity based on preferences"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:546
+#: clientgui/AdvancedFrame.cpp:580
 msgid "Allow network activity according to preferences"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:550
+#: clientgui/AdvancedFrame.cpp:584
 msgid "Network activity suspended"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:551
+#: clientgui/AdvancedFrame.cpp:585
 msgid "Stop BOINC network activity"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:561
-#, c-format
-msgid "Connect to another computer running %s"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:566
-msgid "Select computer..."
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:571
-msgid "Shut down connected client..."
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:572
-msgid "Shut down the currently connected client"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:576
-msgid "Run CPU &benchmarks"
+#: clientgui/AdvancedFrame.cpp:594
+msgid "Computing &preferences..."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:577
-msgid "Runs BOINC CPU benchmarks"
+#: clientgui/AdvancedFrame.cpp:595
+msgid "Configure computing preferences"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:581
-msgid "Do network communication"
+#: clientgui/AdvancedFrame.cpp:600
+msgid "Exclusive applications..."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:582
-msgid "Do all pending network communication"
+#: clientgui/AdvancedFrame.cpp:601
+msgid "Configure exclusive applications"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:586
-msgid "Read config files"
+#: clientgui/AdvancedFrame.cpp:606
+msgid "Select columns..."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:587
-msgid "Read configuration info from cc_config.xml and any app_config.xml files"
+#: clientgui/AdvancedFrame.cpp:607
+msgid "Select which columns to display"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:591
-msgid "Read local prefs file"
+#: clientgui/AdvancedFrame.cpp:611
+msgid "Event Log options...\tCtrl+Shift+F"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:592
-msgid "Read preferences from global_prefs_override.xml."
+#: clientgui/AdvancedFrame.cpp:612
+msgid "Enable or disable various diagnostic messages"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:597
-#, c-format
-msgid "Launch another instance of %s..."
+#: clientgui/AdvancedFrame.cpp:616
+msgid "&Other options..."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:601
-#, c-format
-msgid "Launch another %s"
+#: clientgui/AdvancedFrame.cpp:617
+msgid "Configure display options and network settings"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:611
-msgid "Event Log...\tCtrl+Shift+E"
+#: clientgui/AdvancedFrame.cpp:622
+msgid "Read config files"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:612
-msgid "Display diagnostic messages."
+#: clientgui/AdvancedFrame.cpp:623
+msgid "Read configuration info from cc_config.xml and any app_config.xml files"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:616
-msgid "Event Log Diagnostic Flags...\tCtrl+Shift+F"
+#: clientgui/AdvancedFrame.cpp:627
+msgid "Read local prefs file"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:617
-msgid "Enable or disable various diagnostic messages"
+#: clientgui/AdvancedFrame.cpp:628
+msgid "Read preferences from global_prefs_override.xml."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:626
+#: clientgui/AdvancedFrame.cpp:636
 #, c-format
 msgid "%s &help"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:632
+#: clientgui/AdvancedFrame.cpp:640
 #, c-format
 msgid "Show information about %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:644
+#: clientgui/AdvancedFrame.cpp:650
 #, c-format
 msgid "&%s help"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:650
+#: clientgui/AdvancedFrame.cpp:654
 #, c-format
 msgid "Show information about the %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:662
+#: clientgui/AdvancedFrame.cpp:665
 #, c-format
 msgid "%s &web site"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:668
+#: clientgui/AdvancedFrame.cpp:669
 #, c-format
 msgid "Show information about BOINC and %s"
 msgstr ""
@@ -521,27 +539,27 @@ msgid "&View"
 msgstr ""
 
 #: clientgui/AdvancedFrame.cpp:701
-msgid "&Tools"
+msgid "&Activity"
 msgstr ""
 
 #: clientgui/AdvancedFrame.cpp:705
-msgid "&Activity"
+msgid "&Options"
 msgstr ""
 
 #: clientgui/AdvancedFrame.cpp:709
-msgid "A&dvanced"
+msgid "&Tools"
 msgstr ""
 
 #: clientgui/AdvancedFrame.cpp:713
 msgid "&Help"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:1185
+#: clientgui/AdvancedFrame.cpp:1188
 #, c-format
 msgid "%s - Stop using %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:1190
+#: clientgui/AdvancedFrame.cpp:1193
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -551,39 +569,39 @@ msgid ""
 "Do you want to stop using %s?"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:1397
+#: clientgui/AdvancedFrame.cpp:1420
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:1406
+#: clientgui/AdvancedFrame.cpp:1429
 #, c-format
 msgid ""
 "%s will shut down the current client\n"
 "and prompt you for another host to connect to."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:1806
+#: clientgui/AdvancedFrame.cpp:1832
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:1815
+#: clientgui/AdvancedFrame.cpp:1841
 #, c-format
 msgid "%s has successfully added %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:1953
+#: clientgui/AdvancedFrame.cpp:1977
 #, c-format
 msgid "%s - (%s)"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:1957
+#: clientgui/AdvancedFrame.cpp:1981
 #, c-format
 msgid "Connecting to %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:1960
+#: clientgui/AdvancedFrame.cpp:1984
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr ""
@@ -635,68 +653,68 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: clientgui/BOINCBaseFrame.cpp:504
+#: clientgui/BOINCBaseFrame.cpp:512
 #, c-format
 msgid "%s - Connection Error"
 msgstr ""
 
-#: clientgui/BOINCBaseFrame.cpp:513
+#: 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 ""
 
-#: clientgui/BOINCBaseFrame.cpp:522
+#: 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 ""
 
-#: clientgui/BOINCBaseFrame.cpp:524
+#: clientgui/BOINCBaseFrame.cpp:532
 msgid "Authorization failed connecting to running client."
 msgstr ""
 
-#: clientgui/BOINCBaseFrame.cpp:532
+#: clientgui/BOINCBaseFrame.cpp:540
 msgid "The password you have provided is incorrect, please try again."
 msgstr ""
 
-#: clientgui/BOINCBaseFrame.cpp:576
+#: clientgui/BOINCBaseFrame.cpp:584
 #, c-format
 msgid "%s - Connection Failed"
 msgstr ""
 
-#: clientgui/BOINCBaseFrame.cpp:585
+#: 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 ""
 
-#: clientgui/BOINCBaseFrame.cpp:621
+#: clientgui/BOINCBaseFrame.cpp:629
 #, c-format
 msgid "%s - Daemon Start Failed"
 msgstr ""
 
-#: clientgui/BOINCBaseFrame.cpp:631
+#: 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 ""
 
-#: clientgui/BOINCBaseFrame.cpp:637
+#: 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 ""
 
-#: clientgui/BOINCBaseFrame.cpp:688
+#: clientgui/BOINCBaseFrame.cpp:696
 #, c-format
 msgid "%s - Connection Status"
 msgstr ""
 
-#: clientgui/BOINCBaseFrame.cpp:699
+#: clientgui/BOINCBaseFrame.cpp:707
 #, c-format
 msgid ""
 "%s is not currently connected to a %s client.\n"
@@ -704,7 +722,7 @@ msgid ""
 "To connect up to your local computer please use 'localhost' as the host name."
 msgstr ""
 
-#: clientgui/BOINCBaseView.cpp:752
+#: clientgui/BOINCBaseView.cpp:790
 msgid "Project web pages"
 msgstr ""
 
@@ -764,7 +782,7 @@ msgstr ""
 msgid "%s failed to disconnected from the Internet."
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:595
+#: clientgui/BOINCGUIApp.cpp:597
 #, c-format
 msgid ""
 "You currently are not authorized to manage the client.\n"
@@ -777,88 +795,88 @@ msgid ""
 "     user group."
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:601
+#: clientgui/BOINCGUIApp.cpp:603
 #, c-format
 msgid ""
 "%s ownership or permissions are not set properly; please reinstall %s.\n"
 "(Error code %d"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:607
+#: clientgui/BOINCGUIApp.cpp:609
 msgid " at "
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:610
+#: clientgui/BOINCGUIApp.cpp:612
 msgid ")"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:640
+#: 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 ""
 
-#: clientgui/BOINCGUIApp.cpp:641
+#: clientgui/BOINCGUIApp.cpp:643
 msgid "BOINC Manager"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:902
+#: clientgui/BOINCGUIApp.cpp:904
 msgid "BOINC Manager was started by the operating system automatically"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:904
+#: clientgui/BOINCGUIApp.cpp:906
 msgid "Startup BOINC so only the system tray icon is visible"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:906
+#: clientgui/BOINCGUIApp.cpp:908
 msgid "Directory containing the BOINC Client executable"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:907
+#: clientgui/BOINCGUIApp.cpp:909
 msgid "BOINC data directory"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:909
+#: clientgui/BOINCGUIApp.cpp:911
 msgid "Host name or IP address"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:910
+#: clientgui/BOINCGUIApp.cpp:912
 msgid "GUI RPC port number"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:911
+#: clientgui/BOINCGUIApp.cpp:913
 msgid "Password"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:912
+#: clientgui/BOINCGUIApp.cpp:914
 msgid "Startup BOINC with these optional arguments"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:913
+#: clientgui/BOINCGUIApp.cpp:915
 msgid "disable BOINC security users and permissions"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:914
+#: clientgui/BOINCGUIApp.cpp:916
 msgid "set skin debugging mode to enable skin manager error messages"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:915
+#: clientgui/BOINCGUIApp.cpp:917
 msgid "multiple instances of BOINC Manager allowed"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:917
+#: clientgui/BOINCGUIApp.cpp:919
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:1164
+#: clientgui/BOINCGUIApp.cpp:1166
 msgid "(Automatic Detection)"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:1165
+#: clientgui/BOINCGUIApp.cpp:1167
 msgid "(Unknown)"
 msgstr ""
 
-#: clientgui/BOINCGUIApp.cpp:1166
+#: clientgui/BOINCGUIApp.cpp:1168
 msgid "(User Defined)"
 msgstr ""
 
@@ -1031,15 +1049,23 @@ msgstr ""
 
 #: clientgui/DlgAbout.cpp:192
 msgid ""
-"(C) 2003-2014 University of California, Berkeley.\n"
+"(C) 2003-2015 University of California, Berkeley.\n"
 "All Rights Reserved."
 msgstr ""
 
 #: clientgui/DlgAbout.cpp:196
-msgid "Berkeley Open Infrastructure for Network Computing"
+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."
 msgstr ""
 
-#: clientgui/DlgAbout.cpp:208
+#: clientgui/DlgAbout.cpp:219
 #: clientgui/DlgExitMessage.cpp:173
 #: clientgui/DlgGenericMessage.cpp:120
 #: clientgui/DlgOptions.cpp:399
@@ -1047,466 +1073,468 @@ msgstr ""
 msgid "&OK"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:602
-msgid "invalid number"
-msgstr ""
-
-#: clientgui/DlgAdvPreferences.cpp:603
-msgid "invalid time, format is HH:MM"
-msgstr ""
-
-#: clientgui/DlgAdvPreferences.cpp:604
-msgid "invalid time interval, format is HH:MM-HH:MM"
+#: clientgui/DlgAdvPreferences.cpp:669
+msgid "Invalid number"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:817
-msgid "invalid input value detected"
+#: clientgui/DlgAdvPreferences.cpp:670
+msgid "Invalid time, value must be between 0:00 and 24:00, format is HH:MM"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:819
-msgid "Validation Error"
+#: clientgui/DlgAdvPreferences.cpp:671
+msgid "Number must be between 0 and 10"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:969
-#: clientgui/DlgAdvPreferences.cpp:975
-#: clientgui/DlgAdvPreferences.cpp:981
-msgid "Applications to add"
-msgstr ""
-
-#: clientgui/DlgAdvPreferences.cpp:998
-#, c-format
-msgid "'%s' is not an executable application."
+#: clientgui/DlgAdvPreferences.cpp:672
+msgid "Number must be between 0 and 100"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:999
-#: clientgui/DlgAdvPreferences.cpp:1046
-#: clientgui/DlgAdvPreferences.cpp:1070
-msgid "Add Exclusive App"
+#: clientgui/DlgAdvPreferences.cpp:905
+msgid "invalid input value detected"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1011
-msgid "Name of application to add?"
+#: clientgui/DlgAdvPreferences.cpp:907
+msgid "Validation Error"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1011
-msgid "Add exclusive app"
+#: clientgui/DlgAdvPreferences.cpp:1119
+msgid "Discard local preferences and use web-based preferences?"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1045
-#, c-format
-msgid "Application names must end with '%s'"
+#: clientgui/DlgAdvPreferences.cpp:1120
+msgid "Confirmation"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1069
+#: clientgui/DlgAdvPreferencesBase.cpp:54
 #, c-format
-msgid "'%s' is already in the list."
+msgid "%s - Computing preferences"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1161
+#: clientgui/DlgAdvPreferencesBase.cpp:77
 msgid ""
-"Do you really want to clear all local preferences?\n"
-"(This will not affect exclusive applications.)"
+"Using local preferences.\n"
+"Click \"Use web prefs\" to use web-based preferences from"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:1162
-msgid "Confirmation"
+#: clientgui/DlgAdvPreferencesBase.cpp:85
+msgid "Using web-based preferences from"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:49
-#, c-format
-msgid "%s - Computing preferences"
+#: clientgui/DlgAdvPreferencesBase.cpp:102
+msgid "Set values and click OK to use local preferences instead."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:66
+#: clientgui/DlgAdvPreferencesBase.cpp:111
 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)."
+"Click Clear to restore web-based settings."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:69
+#: clientgui/DlgAdvPreferencesBase.cpp:114
 msgid "Clear"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:70
-msgid "clear all local preferences and close the dialog"
+#: clientgui/DlgAdvPreferencesBase.cpp:115
+msgid "Clear all local preferences and close the dialog."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:85
-msgid "processor usage"
+#: clientgui/DlgAdvPreferencesBase.cpp:118
+msgid "Use web prefs"
+msgstr ""
+
+#: clientgui/DlgAdvPreferencesBase.cpp:119
+msgid "Restore web-based preferences and close the dialog."
+msgstr ""
+
+#: clientgui/DlgAdvPreferencesBase.cpp:143
+#: clientgui/DlgAdvPreferencesBase.cpp:637
+msgid "Computing"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:88
-msgid "network usage"
+#: clientgui/DlgAdvPreferencesBase.cpp:146
+#: clientgui/DlgAdvPreferencesBase.cpp:785
+msgid "Network"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:91
-msgid "disk and memory usage"
+#: clientgui/DlgAdvPreferencesBase.cpp:149
+msgid "Disk and memory"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:94
-msgid "exclusive applications"
+#: clientgui/DlgAdvPreferencesBase.cpp:152
+msgid "Daily schedules"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:107
-#: clientgui/DlgDiagnosticLogFlags.cpp:104
+#: clientgui/DlgAdvPreferencesBase.cpp:165
+#: clientgui/DlgDiagnosticLogFlags.cpp:119
+#: clientgui/DlgExclusiveApps.cpp:146
+#: clientgui/DlgHiddenColumns.cpp:100
 msgid "OK"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:108
-msgid "save all values and close the dialog"
+#: clientgui/DlgAdvPreferencesBase.cpp:166
+msgid "Save all values and close the dialog."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:114
-msgid "close the dialog without saving"
+#: clientgui/DlgAdvPreferencesBase.cpp:172
+msgid "Close the dialog without saving."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:118
-#: clientgui/Localization.cpp:35
-#: clientgui/Localization.cpp:121
-#: clientgui/Localization.cpp:139
+#: clientgui/DlgAdvPreferencesBase.cpp:176
+#: clientgui/DlgExclusiveApps.cpp:157
 msgid "Help"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
-msgid "shows the preferences web page"
+#: clientgui/DlgAdvPreferencesBase.cpp:177
+msgid "Shows the preferences web page."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:141
-msgid "Computing allowed"
+#: clientgui/DlgAdvPreferencesBase.cpp:239
+#: clientgui/DlgAdvPreferencesBase.cpp:425
+msgid "Usage limits"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
-msgid "While computer is on batteries"
+#: clientgui/DlgAdvPreferencesBase.cpp:244
+#, no-c-format
+msgid "Keep some CPUs free for other applications. Example: 75% means use 6 cores on an 8-core CPU."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:149
-msgid "check this if you want this computer to do work while it runs on batteries"
+#: clientgui/DlgAdvPreferencesBase.cpp:246
+#: clientgui/DlgAdvPreferencesBase.cpp:258
+msgid "Use at most"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:155
-msgid "While computer is in use"
+#: clientgui/DlgAdvPreferencesBase.cpp:251
+#, no-c-format
+msgid "% of the CPUs"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:158
-msgid "check this if you want this computer to do work even when you're using it"
+#: clientgui/DlgAdvPreferencesBase.cpp:256
+#, 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."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:164
-msgid "Use GPU while computer is in use"
+#: clientgui/DlgAdvPreferencesBase.cpp:263
+#, no-c-format
+msgid "% of CPU time"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:167
-msgid "check this if you want your GPU to do work even when you're using the computer"
+#: clientgui/DlgAdvPreferencesBase.cpp:270
+msgid "When to suspend"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:179
-msgid "Only after computer has been idle for"
+#: clientgui/DlgAdvPreferencesBase.cpp:276
+msgid "Suspend when computer is on battery"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:188
-msgid "do work only after you haven't used the computer for this number of minutes"
+#: clientgui/DlgAdvPreferencesBase.cpp:279
+msgid "Check this to suspend computing on portables when running on battery power."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:193
-#: clientgui/DlgAdvPreferencesBase.cpp:342
-msgid "minutes"
+#: clientgui/DlgAdvPreferencesBase.cpp:285
+msgid "Suspend when computer is in use"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:212
-msgid "While processor usage is less than"
+#: clientgui/DlgAdvPreferencesBase.cpp:288
+msgid "Check this to suspend computing and file transfers when you're using the computer."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:221
-msgid "suspend work if processor usage exceeds this level"
+#: clientgui/DlgAdvPreferencesBase.cpp:294
+msgid "Suspend GPU computing when computer is in use"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:226
-msgid "percent (0 means no restriction)"
+#: clientgui/DlgAdvPreferencesBase.cpp:297
+msgid "Check this to suspend GPU computing when you're using the computer."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:240
-#: clientgui/DlgAdvPreferencesBase.cpp:506
-msgid "Every day between hours of"
+#: clientgui/DlgAdvPreferencesBase.cpp:302
+msgid "This determines when the computer is considered 'in use'."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
-msgid "start work at this time"
+#: clientgui/DlgAdvPreferencesBase.cpp:306
+msgid "'In use' means mouse/keyboard input in last"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:248
-#: clientgui/DlgAdvPreferencesBase.cpp:514
-msgid "and"
+#: clientgui/DlgAdvPreferencesBase.cpp:314
+#: clientgui/DlgAdvPreferencesBase.cpp:387
+msgid "minutes"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:252
-msgid "stop work at this time"
+#: clientgui/DlgAdvPreferencesBase.cpp:321
+#, c-format
+msgid "Suspend when non-%s CPU usage is above"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
-#: clientgui/DlgAdvPreferencesBase.cpp:522
-msgid "(no restriction if equal)"
+#: clientgui/DlgAdvPreferencesBase.cpp:323
+msgid "Suspend computing when your computer is busy running other programs."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:261
-#: clientgui/DlgAdvPreferencesBase.cpp:527
-msgid "Day-of-week override:"
+#: clientgui/DlgAdvPreferencesBase.cpp:344
+#: clientgui/DlgAdvPreferencesBase.cpp:474
+msgid "Other"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:266
-#: clientgui/DlgAdvPreferencesBase.cpp:532
-msgid "check box to specify hours for this day of week"
+#: clientgui/DlgAdvPreferencesBase.cpp:349
+msgid "Store at least enough tasks to keep the computer busy for this long."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:272
-#: clientgui/DlgAdvPreferencesBase.cpp:538
-msgid "Monday"
+#: clientgui/DlgAdvPreferencesBase.cpp:352
+msgid "Store at least"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:279
-#: clientgui/DlgAdvPreferencesBase.cpp:545
-msgid "Tuesday"
+#: clientgui/DlgAdvPreferencesBase.cpp:360
+#: clientgui/DlgAdvPreferencesBase.cpp:376
+msgid "days of work"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:286
-#: clientgui/DlgAdvPreferencesBase.cpp:552
-msgid "Wednesday"
+#: clientgui/DlgAdvPreferencesBase.cpp:365
+msgid "Store additional tasks above the minimum level.  Determines how much work is requested when contacting a project."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:293
-#: clientgui/DlgAdvPreferencesBase.cpp:559
-msgid "Thursday"
+#: clientgui/DlgAdvPreferencesBase.cpp:368
+msgid "Store up to an additional"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:300
-#: clientgui/DlgAdvPreferencesBase.cpp:566
-msgid "Friday"
+#: clientgui/DlgAdvPreferencesBase.cpp:381
+#, c-format
+msgid "If you run several projects, %s may switch between them this often."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:307
-#: clientgui/DlgAdvPreferencesBase.cpp:573
-msgid "Saturday"
+#: clientgui/DlgAdvPreferencesBase.cpp:383
+msgid "Switch between tasks every"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:580
-msgid "Sunday"
+#: clientgui/DlgAdvPreferencesBase.cpp:391
+msgid "This controls how often tasks save their state to disk, so that they can be restarted later."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:328
-msgid "Other options"
+#: clientgui/DlgAdvPreferencesBase.cpp:392
+msgid "Request tasks to checkpoint at most every"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:336
-msgid "Switch between applications every"
+#: clientgui/DlgAdvPreferencesBase.cpp:396
+msgid "seconds"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:345
-msgid "On multiprocessor systems, use at most"
+#: clientgui/DlgAdvPreferencesBase.cpp:431
+msgid "Limit the download rate of file transfers."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
-#, no-c-format
-msgid "% of the processors (0 means no restriction)"
+#: clientgui/DlgAdvPreferencesBase.cpp:432
+msgid "Limit download rate to"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:355
-#: clientgui/DlgAdvPreferencesBase.cpp:618
-#: clientgui/DlgAdvPreferencesBase.cpp:640
-#: clientgui/DlgAdvPreferencesBase.cpp:661
-#: clientgui/DlgAdvPreferencesBase.cpp:683
-#: clientgui/DlgAdvPreferencesBase.cpp:694
-msgid "Use at most"
+#: clientgui/DlgAdvPreferencesBase.cpp:436
+#: clientgui/DlgAdvPreferencesBase.cpp:445
+msgid "KB/second"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:362
-#, no-c-format
-msgid "% of CPU time (0 means no restriction)"
+#: clientgui/DlgAdvPreferencesBase.cpp:440
+msgid "Limit the upload rate of file transfers."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:386
-msgid "General options"
+#: clientgui/DlgAdvPreferencesBase.cpp:441
+msgid "Limit upload rate to"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:395
-msgid "Maximum download rate"
+#: clientgui/DlgAdvPreferencesBase.cpp:452
+#, c-format
+msgid "Example: %s should transfer at most 2000 MB of data every 30 days."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:401
-#: clientgui/DlgAdvPreferencesBase.cpp:410
-msgid "KBytes/second (0 means no restriction)"
+#: clientgui/DlgAdvPreferencesBase.cpp:454
+msgid "Limit usage to"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:404
-msgid "Maximum upload rate"
+#: clientgui/DlgAdvPreferencesBase.cpp:458
+msgid "MB every"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:417
-msgid "Minimum work buffer"
+#: clientgui/DlgAdvPreferencesBase.cpp:462
+msgid "days"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:425
-msgid "Try to maintain enough tasks to keep busy for this many days"
+#: clientgui/DlgAdvPreferencesBase.cpp:479
+#, c-format
+msgid "Check this only if your Internet provider modifies image files. Skipping verification reduces the security of %s."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:431
-#: clientgui/DlgAdvPreferencesBase.cpp:449
-msgid "days (maximum value: 10)"
+#: clientgui/DlgAdvPreferencesBase.cpp:481
+msgid "Skip data verification for image files"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:437
-msgid "Max additional work buffer"
+#: clientgui/DlgAdvPreferencesBase.cpp:485
+msgid "Confirm before connecting to Internet"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:445
-msgid "In addition, maintain enough tasks for up to this many days"
+#: clientgui/DlgAdvPreferencesBase.cpp:486
+#: clientgui/DlgAdvPreferencesBase.cpp:490
+msgid "Useful only if you have a modem, ISDN or VPN connection."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:454
-msgid "Transfer at most"
+#: clientgui/DlgAdvPreferencesBase.cpp:489
+msgid "Disconnect when done"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:462
-msgid "MBytes every"
+#: clientgui/DlgAdvPreferencesBase.cpp:516
+msgid "Disk"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:468
-msgid "days (0 means no restriction)"
+#: clientgui/DlgAdvPreferencesBase.cpp:521
+#, c-format
+msgid "%s will use the most restrictive of these settings:"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:476
-msgid "Skip image file verification"
+#: clientgui/DlgAdvPreferencesBase.cpp:527
+#, c-format
+msgid "Limit the total amount of disk space used by %s."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:478
-msgid "check this if your Internet provider modifies image files"
+#: clientgui/DlgAdvPreferencesBase.cpp:530
+#: clientgui/DlgAdvPreferencesBase.cpp:554
+msgid "Use no more than"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:484
-msgid "Connect options"
+#: clientgui/DlgAdvPreferencesBase.cpp:534
+msgid "GB"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:487
-msgid "Confirm before connecting to internet"
+#: clientgui/DlgAdvPreferencesBase.cpp:539
+#, c-format
+msgid "Limit disk usage to leave this much free space on the volume where %s stores data."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
+#: clientgui/DlgAdvPreferencesBase.cpp:542
+msgid "Leave at least"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:493
-msgid "Disconnect when done"
+#: clientgui/DlgAdvPreferencesBase.cpp:546
+msgid "GB free"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:495
-msgid ""
-"if checked, BOINC hangs up when network usage is done\n"
-"(only relevant for dialup-connection)"
+#: clientgui/DlgAdvPreferencesBase.cpp:551
+#, c-format
+msgid "Limit the percentage of disk space used by %s on the volume where it stores data."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:501
-msgid "Network usage allowed"
+#: clientgui/DlgAdvPreferencesBase.cpp:559
+#, no-c-format
+msgid "% of total"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:510
-msgid "network usage start hour"
+#: clientgui/DlgAdvPreferencesBase.cpp:566
+msgid "Memory"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:518
-msgid "network usage stop hour"
+#: clientgui/DlgAdvPreferencesBase.cpp:571
+#, c-format
+msgid "Limit the memory used by %s when you're using the computer."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:610
-#: clientgui/DlgItemProperties.cpp:257
-msgid "Disk usage"
+#: clientgui/DlgAdvPreferencesBase.cpp:573
+msgid "When computer is in use, use at most"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:622
-msgid "the maximum disk space used by BOINC (in Gigabytes)"
+#: clientgui/DlgAdvPreferencesBase.cpp:579
+#: clientgui/DlgAdvPreferencesBase.cpp:591
+#: clientgui/DlgAdvPreferencesBase.cpp:607
+#, no-c-format
+msgid "%"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:626
-msgid "Gigabytes disk space (0 means no restriction)"
+#: clientgui/DlgAdvPreferencesBase.cpp:584
+#, c-format
+msgid "Limit the memory used by %s when you're not using the computer."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:629
-msgid "Leave at least"
+#: clientgui/DlgAdvPreferencesBase.cpp:586
+msgid "When computer is not in use, use at most"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:633
-msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
+#: clientgui/DlgAdvPreferencesBase.cpp:595
+msgid "Leave non-GPU tasks in memory while suspended"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:637
-msgid "Gigabytes disk space free"
+#: 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."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
-msgid "BOINC uses at most this percentage of total disk space"
+#: clientgui/DlgAdvPreferencesBase.cpp:600
+#, c-format
+msgid "Limit the swap space (page file) used by %s."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:649
-#, no-c-format
-msgid "% of total disk space"
+#: clientgui/DlgAdvPreferencesBase.cpp:602
+msgid "Page/swap file: use at most"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:652
-msgid "Tasks checkpoint to disk at most every"
+#: clientgui/DlgAdvPreferencesBase.cpp:627
+msgid "and"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
-msgid "seconds"
+#: clientgui/DlgAdvPreferencesBase.cpp:628
+msgid "to"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:668
-#, no-c-format
-msgid "% of page file (swap space)"
+#: clientgui/DlgAdvPreferencesBase.cpp:641
+msgid "Compute only during a particular period each day."
+msgstr ""
+
+#: clientgui/DlgAdvPreferencesBase.cpp:644
+msgid "Compute only between"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:675
-msgid "Memory usage"
+#: clientgui/DlgAdvPreferencesBase.cpp:654
+#: clientgui/DlgAdvPreferencesBase.cpp:801
+msgid "Day-of-week override"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
-#, no-c-format
-msgid "% when computer is in use"
+#: clientgui/DlgAdvPreferencesBase.cpp:658
+#: clientgui/DlgAdvPreferencesBase.cpp:805
+msgid "Override the times above on the selected days:"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:701
-#, no-c-format
-msgid "% when computer is idle"
+#: clientgui/DlgAdvPreferencesBase.cpp:676
+#: clientgui/DlgAdvPreferencesBase.cpp:822
+msgid "Monday"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:706
-msgid "Leave applications in memory while suspended"
+#: clientgui/DlgAdvPreferencesBase.cpp:691
+#: clientgui/DlgAdvPreferencesBase.cpp:837
+msgid "Friday"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:708
-msgid "if checked, suspended work units are left in memory"
+#: clientgui/DlgAdvPreferencesBase.cpp:704
+#: clientgui/DlgAdvPreferencesBase.cpp:850
+msgid "Tuesday"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:728
-msgid "Suspend processor and network usage when these applications are running:"
+#: clientgui/DlgAdvPreferencesBase.cpp:719
+#: clientgui/DlgAdvPreferencesBase.cpp:865
+msgid "Saturday"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:738
-msgid "Add..."
+#: clientgui/DlgAdvPreferencesBase.cpp:732
+#: clientgui/DlgAdvPreferencesBase.cpp:878
+msgid "Wednesday"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:739
-msgid "Add an application to this list"
+#: clientgui/DlgAdvPreferencesBase.cpp:747
+#: clientgui/DlgAdvPreferencesBase.cpp:893
+msgid "Sunday"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:744
-msgid "Remove"
+#: clientgui/DlgAdvPreferencesBase.cpp:760
+#: clientgui/DlgAdvPreferencesBase.cpp:906
+msgid "Thursday"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:745
-msgid "Remove an application from this list"
+#: clientgui/DlgAdvPreferencesBase.cpp:789
+msgid "Transfer files only during a particular period each day."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:754
-msgid "For advanced options, refer to "
+#: clientgui/DlgAdvPreferencesBase.cpp:791
+msgid "Transfer files only between"
 msgstr ""
 
 #: clientgui/DlgDiagnosticLogFlags.cpp:65
@@ -1518,91 +1546,178 @@ msgstr ""
 msgid "These flags enable various types of diagnostic messages in the Event Log."
 msgstr ""
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:105
+#: clientgui/DlgDiagnosticLogFlags.cpp:99
+msgid "More info ..."
+msgstr ""
+
+#: clientgui/DlgDiagnosticLogFlags.cpp:120
+#: clientgui/DlgHiddenColumns.cpp:101
 msgid "Save all values and close the dialog"
 msgstr ""
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:108
+#: clientgui/DlgDiagnosticLogFlags.cpp:123
+#: clientgui/DlgHiddenColumns.cpp:104
 msgid "Defaults"
 msgstr ""
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:109
+#: clientgui/DlgDiagnosticLogFlags.cpp:124
+#: clientgui/DlgHiddenColumns.cpp:105
 msgid "Restore default settings"
 msgstr ""
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:113
+#: clientgui/DlgDiagnosticLogFlags.cpp:128
+#: clientgui/DlgHiddenColumns.cpp:109
 msgid "Close the dialog without saving"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:226
+#: clientgui/DlgEventLog.cpp:227
 #, c-format
 msgid "%s - Event Log"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:236
+#: clientgui/DlgEventLog.cpp:237
 msgid "Project"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:237
+#: clientgui/DlgEventLog.cpp:238
 msgid "Time"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:238
+#: clientgui/DlgEventLog.cpp:239
 msgid "Message"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:300
-#: clientgui/DlgEventLog.cpp:364
+#: clientgui/DlgEventLog.cpp:301
+#: clientgui/DlgEventLog.cpp:351
 msgid "&Show only this project"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:304
+#: clientgui/DlgEventLog.cpp:305
 msgid "Copy &All"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:306
-#: clientgui/DlgEventLog.cpp:310
+#: clientgui/DlgEventLog.cpp:307
+#: clientgui/DlgEventLog.cpp:311
 msgid "Copy all the messages to the clipboard."
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:315
+#: clientgui/DlgEventLog.cpp:316
 msgid "Copy &Selected"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:318
-#: clientgui/DlgEventLog.cpp:326
+#: 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."
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:320
-#: clientgui/DlgEventLog.cpp:328
+#: 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."
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:335
+#: clientgui/DlgEventLog.cpp:336
 #: clientgui/DlgItemProperties.cpp:67
 msgid "&Close"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:344
-#, c-format
-msgid "Get help with %s"
-msgstr ""
-
-#: clientgui/DlgEventLog.cpp:358
+#: clientgui/DlgEventLog.cpp:345
 msgid "Show all &messages"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:359
-#: clientgui/DlgEventLog.cpp:361
+#: clientgui/DlgEventLog.cpp:346
+#: clientgui/DlgEventLog.cpp:348
 msgid "Show messages for all projects"
 msgstr ""
 
-#: clientgui/DlgEventLog.cpp:365
-#: clientgui/DlgEventLog.cpp:367
+#: clientgui/DlgEventLog.cpp:352
+#: clientgui/DlgEventLog.cpp:354
 msgid "Show only the messages for the selected project"
 msgstr ""
 
+#: clientgui/DlgExclusiveApps.cpp:60
+#, c-format
+msgid "%s - Exclusive Applications"
+msgstr ""
+
+#: clientgui/DlgExclusiveApps.cpp:72
+msgid "Suspend processor and network usage when these applications are running:"
+msgstr ""
+
+#: clientgui/DlgExclusiveApps.cpp:80
+#: clientgui/DlgExclusiveApps.cpp:104
+msgid "Add..."
+msgstr ""
+
+#: clientgui/DlgExclusiveApps.cpp:81
+#: clientgui/DlgExclusiveApps.cpp:105
+msgid "Add an application to this list"
+msgstr ""
+
+#: clientgui/DlgExclusiveApps.cpp:86
+#: clientgui/DlgExclusiveApps.cpp:110
+msgid "Remove"
+msgstr ""
+
+#: clientgui/DlgExclusiveApps.cpp:87
+#: clientgui/DlgExclusiveApps.cpp:111
+msgid "Remove an application from this list"
+msgstr ""
+
+#: clientgui/DlgExclusiveApps.cpp:96
+msgid "Suspend GPU usage when these applications are running:"
+msgstr ""
+
+#: clientgui/DlgExclusiveApps.cpp:122
+msgid "For advanced options, refer to "
+msgstr ""
+
+#: clientgui/DlgExclusiveApps.cpp:147
+msgid "save all values and close the dialog"
+msgstr ""
+
+#: clientgui/DlgExclusiveApps.cpp:153
+msgid "close the dialog without saving"
+msgstr ""
+
+#: clientgui/DlgExclusiveApps.cpp:158
+msgid "shows the preferences web page"
+msgstr ""
+
+#: clientgui/DlgExclusiveApps.cpp:303
+#: clientgui/DlgExclusiveApps.cpp:309
+#: clientgui/DlgExclusiveApps.cpp:315
+msgid "Applications to add"
+msgstr ""
+
+#: clientgui/DlgExclusiveApps.cpp:332
+#, c-format
+msgid "'%s' is not an executable application."
+msgstr ""
+
+#: clientgui/DlgExclusiveApps.cpp:333
+#: clientgui/DlgExclusiveApps.cpp:380
+#: clientgui/DlgExclusiveApps.cpp:404
+msgid "Add Exclusive App"
+msgstr ""
+
+#: clientgui/DlgExclusiveApps.cpp:345
+msgid "Name of application to add?"
+msgstr ""
+
+#: clientgui/DlgExclusiveApps.cpp:345
+msgid "Add exclusive app"
+msgstr ""
+
+#: clientgui/DlgExclusiveApps.cpp:379
+#, c-format
+msgid "Application names must end with '%s'"
+msgstr ""
+
+#: clientgui/DlgExclusiveApps.cpp:403
+#, c-format
+msgid "'%s' is already in the list."
+msgstr ""
+
 #: clientgui/DlgExitMessage.cpp:82
 #, c-format
 msgid "%s - Exit Confirmation"
@@ -1650,6 +1765,24 @@ msgstr ""
 msgid "Don't show this dialog again."
 msgstr ""
 
+#: clientgui/DlgHiddenColumns.cpp:64
+#, c-format
+msgid "%s Column Selection"
+msgstr ""
+
+#: clientgui/DlgHiddenColumns.cpp:77
+#, c-format
+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?"
+msgstr ""
+
+#: clientgui/DlgHiddenColumns.cpp:315
+msgid "Confirm defaults"
+msgstr ""
+
 #: clientgui/DlgItemProperties.cpp:194
 #: clientgui/DlgItemProperties.cpp:197
 #: clientgui/DlgItemProperties.cpp:200
@@ -1718,6 +1851,10 @@ msgstr ""
 msgid "File uploads deferred for"
 msgstr ""
 
+#: clientgui/DlgItemProperties.cpp:257
+msgid "Disk usage"
+msgstr ""
+
 #: clientgui/DlgItemProperties.cpp:258
 msgid "Computer ID"
 msgstr ""
@@ -2332,7 +2469,7 @@ msgid "Downloading"
 msgstr ""
 
 #: clientgui/MainDocument.cpp:2492
-#: clientgui/MainDocument.cpp:2557
+#: clientgui/MainDocument.cpp:2551
 msgid " (suspended - "
 msgstr ""
 
@@ -2344,7 +2481,7 @@ msgstr ""
 msgid "Task suspended by user"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2504
+#: clientgui/MainDocument.cpp:2507
 msgid "Suspended - "
 msgstr ""
 
@@ -2352,92 +2489,92 @@ msgstr ""
 msgid "GPU suspended - "
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2517
+#: clientgui/MainDocument.cpp:2514
 msgid "Waiting for memory"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2519
+#: clientgui/MainDocument.cpp:2516
 msgid "Waiting for shared memory"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2521
+#: clientgui/MainDocument.cpp:2518
 msgid "Running"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2523
+#: clientgui/MainDocument.cpp:2520
 msgid " (non-CPU-intensive)"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2526
+#: clientgui/MainDocument.cpp:2523
 msgid "Waiting to run"
 msgstr ""
 
+#: clientgui/MainDocument.cpp:2525
 #: clientgui/MainDocument.cpp:2528
-#: clientgui/MainDocument.cpp:2534
 msgid "Ready to start"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2538
+#: clientgui/MainDocument.cpp:2532
 msgid "Postponed: "
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2541
+#: clientgui/MainDocument.cpp:2535
 msgid "Postponed"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2545
+#: clientgui/MainDocument.cpp:2539
 msgid "Waiting for network access"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2549
+#: clientgui/MainDocument.cpp:2543
 msgid "Computation error"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2553
+#: clientgui/MainDocument.cpp:2547
 msgid "Upload failed"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2555
+#: clientgui/MainDocument.cpp:2549
 msgid "Uploading"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2566
+#: clientgui/MainDocument.cpp:2560
 msgid "Aborted by user"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2569
+#: clientgui/MainDocument.cpp:2563
 msgid "Aborted by project"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2572
+#: clientgui/MainDocument.cpp:2566
 msgid "Aborted: not started by deadline"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2575
+#: clientgui/MainDocument.cpp:2569
 msgid "Aborted: disk limit exceeded"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2578
+#: clientgui/MainDocument.cpp:2572
 msgid "Aborted: run time limit exceeded"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2581
+#: clientgui/MainDocument.cpp:2575
 msgid "Aborted: memory limit exceeded"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2584
+#: clientgui/MainDocument.cpp:2578
 msgid "Aborted"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2589
+#: clientgui/MainDocument.cpp:2583
 msgid "Acknowledged"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2591
+#: clientgui/MainDocument.cpp:2585
 msgid "Ready to report"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2593
+#: clientgui/MainDocument.cpp:2587
 #, c-format
 msgid "Error: invalid state '%d'"
 msgstr ""
@@ -2493,53 +2630,53 @@ msgstr ""
 msgid "Choose a project"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:228
+#: clientgui/ProjectInfoPage.cpp:226
 msgid "To choose a project, click its name or type its URL below."
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:246
+#: clientgui/ProjectInfoPage.cpp:242
 msgid "Categories:"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:267
+#: clientgui/ProjectInfoPage.cpp:262
 msgid "Projects:"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:279
+#: clientgui/ProjectInfoPage.cpp:274
 msgid "Project details"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:291
+#: clientgui/ProjectInfoPage.cpp:284
 msgid "Research area:"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:302
+#: clientgui/ProjectInfoPage.cpp:294
 msgid "Organization:"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:313
+#: clientgui/ProjectInfoPage.cpp:304
 msgid "Web site:"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:325
+#: clientgui/ProjectInfoPage.cpp:315
 msgid "Supported systems:"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:363
+#: clientgui/ProjectInfoPage.cpp:352
 msgid "Project URL:"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:499
-#: clientgui/ProjectInfoPage.cpp:754
-#: clientgui/ProjectInfoPage.cpp:758
+#: clientgui/ProjectInfoPage.cpp:486
+#: clientgui/ProjectInfoPage.cpp:686
+#: clientgui/ProjectInfoPage.cpp:690
 msgid "All"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:802
+#: clientgui/ProjectInfoPage.cpp:735
 msgid "This project may not have work for your type of computer.  Do you want to add it anyway?"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:826
+#: clientgui/ProjectInfoPage.cpp:767
 msgid "You already added this project. Please choose a different project."
 msgstr ""
 
@@ -2547,12 +2684,12 @@ msgstr ""
 msgid "Communicating with project."
 msgstr ""
 
-#: clientgui/ProjectProcessingPage.cpp:510
+#: clientgui/ProjectProcessingPage.cpp:509
 msgid "Required files not found on the server."
 msgstr ""
 
-#: clientgui/ProjectProcessingPage.cpp:513
-#: clientgui/ProjectProcessingPage.cpp:586
+#: clientgui/ProjectProcessingPage.cpp:512
+#: clientgui/ProjectProcessingPage.cpp:585
 msgid "An internal server error has occurred."
 msgstr ""
 
@@ -2658,51 +2795,64 @@ msgstr ""
 msgid "SOCKS proxy"
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:167
-msgid "Advanced View...\tCtrl+Shift+A"
+#: clientgui/sg_BoincSimpleFrame.cpp:166
+msgid "Skin"
 msgstr ""
 
 #: clientgui/sg_BoincSimpleFrame.cpp:168
-msgid "Display the advanced graphical interface."
+msgid "Select the appearance of the user interface."
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:175
-msgid "Skin"
+#: clientgui/sg_BoincSimpleFrame.cpp:179
+msgid "Display diagnostic messages."
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:177
-msgid "Select the appearance of the user interface."
+#: clientgui/sg_BoincSimpleFrame.cpp:184
+msgid "Advanced View...\tCtrl+Shift+A"
+msgstr ""
+
+#: clientgui/sg_BoincSimpleFrame.cpp:185
+msgid "Display the advanced graphical interface."
+msgstr ""
+
+#: clientgui/sg_BoincSimpleFrame.cpp:201
+msgid "Configure display options and proxy settings"
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:224
+#: clientgui/sg_BoincSimpleFrame.cpp:222
 #, c-format
 msgid "&%s"
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:405
+#: clientgui/sg_BoincSimpleFrame.cpp:396
 msgid "Default"
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:848
+#: clientgui/sg_BoincSimpleFrame.cpp:838
 msgid "Suspend"
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:850
+#: clientgui/sg_BoincSimpleFrame.cpp:840
 msgid "Suspend Computing"
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:851
+#: clientgui/sg_BoincSimpleFrame.cpp:841
 msgid "Resume Computing"
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:867
+#: clientgui/sg_BoincSimpleFrame.cpp:857
 msgid "Notices"
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:868
+#: clientgui/sg_BoincSimpleFrame.cpp:858
 msgid "Open a window to view notices from projects or BOINC"
 msgstr ""
 
+#: clientgui/sg_BoincSimpleFrame.cpp:879
+#, c-format
+msgid "Get help with %s"
+msgstr ""
+
 #: clientgui/sg_DlgMessages.cpp:124
 msgid "Fetching notices; please wait..."
 msgstr ""
@@ -2720,233 +2870,97 @@ msgstr ""
 msgid "%s - Notices"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:270
-msgid "This dialog controls preferences for this computer only."
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:275
-msgid "Click OK to set preferences."
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:280
-msgid "Click Clear to restore web-based settings for all preferences listed below."
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:287
+#: clientgui/sg_DlgPreferences.cpp:187
 msgid "For additional settings, select Computing Preferences in the Advanced View."
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:315
-msgid "Do work only between:"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:337
-msgid "Connect to internet only between:"
+#: clientgui/sg_DlgPreferences.cpp:289
+msgid "GB of disk space"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:359
-#: clientgui/sg_DlgPreferences.cpp:376
-msgid "Use no more than:"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:372
-msgid "of disk space"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:389
-msgid "of the processor"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:393
-msgid "Do work while on battery?"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:406
-msgid "Do work after idle for:"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:431
-msgid "Clear all local preferences listed above and close the dialog"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:609
-#: clientgui/sg_DlgPreferences.cpp:612
-#: clientgui/sg_DlgPreferences.cpp:688
-#: clientgui/sg_DlgPreferences.cpp:692
-#: clientgui/sg_DlgPreferences.cpp:704
-#: clientgui/sg_DlgPreferences.cpp:708
-#: clientgui/sg_DlgPreferences.cpp:851
-#: clientgui/sg_DlgPreferences.cpp:862
-msgid "Anytime"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:645
-msgid "100 MB"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:646
-msgid "200 MB"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:647
-msgid "500 MB"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:648
-msgid "1 GB"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:649
-msgid "2 GB"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:650
-msgid "5 GB"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:651
-msgid "10 GB"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:652
-msgid "20 GB"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:653
-msgid "50 GB"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:654
-msgid "100 GB"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:724
-#, c-format
-msgid "%d MB"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:726
-#, c-format
-msgid "%4.2f GB"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:767
-#, c-format
-msgid "%d%%"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:803
-msgid "0 (Run Always)"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:806
-#, c-format
-msgid "%d"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:953
+#: clientgui/sg_DlgPreferences.cpp:980
 #, c-format
 msgid "%s - Computing Preferences"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:1033
-msgid "Do you really want to clear all local preferences?\n"
+#: clientgui/sg_DlgPreferences.cpp:1061
+msgid "Discard all local preferences and use web-based preferences?"
 msgstr ""
 
 #: clientgui/sg_ProjectCommandPopup.cpp:66
-#: clientgui/ViewProjects.cpp:179
 msgid "Update"
 msgstr ""
 
 #: clientgui/sg_ProjectCommandPopup.cpp:67
-#: clientgui/ViewProjects.cpp:180
 msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
 msgstr ""
 
 #: clientgui/sg_ProjectCommandPopup.cpp:73
 #: clientgui/sg_ProjectCommandPopup.cpp:129
-#: clientgui/ViewProjects.cpp:187
-#: clientgui/ViewProjects.cpp:727
 msgid "Suspend tasks for this project."
 msgstr ""
 
 #: clientgui/sg_ProjectCommandPopup.cpp:78
 #: clientgui/sg_ProjectCommandPopup.cpp:136
-#: clientgui/ViewProjects.cpp:193
-#: clientgui/ViewProjects.cpp:746
 msgid "No new tasks"
 msgstr ""
 
 #: clientgui/sg_ProjectCommandPopup.cpp:79
-#: clientgui/ViewProjects.cpp:194
 msgid "Don't get new tasks for this project."
 msgstr ""
 
 #: clientgui/sg_ProjectCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:200
 msgid "Reset project"
 msgstr ""
 
 #: clientgui/sg_ProjectCommandPopup.cpp:85
-#: clientgui/ViewProjects.cpp:201
 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:208
 msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
 msgstr ""
 
 #: clientgui/sg_ProjectCommandPopup.cpp:96
 #: clientgui/sg_TaskCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:214
 msgid "Properties"
 msgstr ""
 
 #: clientgui/sg_ProjectCommandPopup.cpp:97
-#: clientgui/ViewProjects.cpp:215
 msgid "Show project details."
 msgstr ""
 
 #: clientgui/sg_ProjectCommandPopup.cpp:126
-#: clientgui/ViewProjects.cpp:723
 msgid "Resume tasks for this project."
 msgstr ""
 
 #: clientgui/sg_ProjectCommandPopup.cpp:133
-#: clientgui/ViewProjects.cpp:742
 msgid "Allow new tasks"
 msgstr ""
 
 #: clientgui/sg_ProjectCommandPopup.cpp:134
-#: clientgui/ViewProjects.cpp:742
 msgid "Allow fetching new tasks for this project."
 msgstr ""
 
 #: clientgui/sg_ProjectCommandPopup.cpp:137
-#: clientgui/ViewProjects.cpp:746
 msgid "Don't fetch new tasks for this project."
 msgstr ""
 
 #: clientgui/sg_ProjectCommandPopup.cpp:229
-#: clientgui/ViewProjects.cpp:443
 #, c-format
 msgid "Are you sure you want to reset project '%s'?"
 msgstr ""
 
 #: clientgui/sg_ProjectCommandPopup.cpp:235
-#: clientgui/ViewProjects.cpp:449
 msgid "Reset Project"
 msgstr ""
 
 #: clientgui/sg_ProjectCommandPopup.cpp:266
-#: clientgui/ViewProjects.cpp:501
 #, c-format
 msgid "Are you sure you want to remove project '%s'?"
 msgstr ""
 
 #: clientgui/sg_ProjectCommandPopup.cpp:272
-#: clientgui/ViewProjects.cpp:507
 msgid "Remove Project"
 msgstr ""
 
@@ -2962,6 +2976,10 @@ msgstr ""
 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 ""
@@ -3096,52 +3114,52 @@ msgstr ""
 msgid "Status: %s"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1227
+#: clientgui/sg_TaskPanel.cpp:1228
 msgid "Retrieving current status."
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1233
+#: clientgui/sg_TaskPanel.cpp:1234
 msgid "Downloading work from the server."
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1238
+#: clientgui/sg_TaskPanel.cpp:1239
 msgid "Processing Suspended:  Running On Batteries."
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1240
+#: clientgui/sg_TaskPanel.cpp:1241
 msgid "Processing Suspended:  User Active."
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1242
+#: clientgui/sg_TaskPanel.cpp:1243
 msgid "Processing Suspended:  User paused processing."
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1244
+#: clientgui/sg_TaskPanel.cpp:1245
 msgid "Processing Suspended:  Time of Day."
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1246
+#: clientgui/sg_TaskPanel.cpp:1247
 msgid "Processing Suspended:  Benchmarks Running."
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1248
+#: clientgui/sg_TaskPanel.cpp:1249
 msgid "Processing Suspended."
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1252
+#: clientgui/sg_TaskPanel.cpp:1253
 msgid "Waiting to contact project servers."
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1256
-#: clientgui/sg_TaskPanel.cpp:1265
+#: clientgui/sg_TaskPanel.cpp:1257
+#: clientgui/sg_TaskPanel.cpp:1266
 msgid "Retrieving current status"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1260
+#: clientgui/sg_TaskPanel.cpp:1261
 msgid "No work available to process"
 msgstr ""
 
-#: clientgui/sg_TaskPanel.cpp:1262
+#: clientgui/sg_TaskPanel.cpp:1263
 msgid "Unable to connect to the core client"
 msgstr ""
 
@@ -3245,7 +3263,6 @@ msgid "'%s' does not contain a valid path."
 msgstr ""
 
 #: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:175
 msgid "Commands"
 msgstr ""
 
@@ -3291,119 +3308,123 @@ msgstr ""
 msgid "Show messages for all projects."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:225
+#: clientgui/ViewProjects.cpp:246
+#: clientgui/ViewStatistics.cpp:426
 msgid "Account"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:227
+#: clientgui/ViewProjects.cpp:248
 msgid "Work done"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:228
+#: clientgui/ViewProjects.cpp:249
 msgid "Avg. work done"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:230
+#: clientgui/ViewProjects.cpp:251
+#: clientgui/ViewTransfers.cpp:215
+#: clientgui/ViewWork.cpp:262
 msgid "Status"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:255
+#: clientgui/ViewProjects.cpp:330
 msgid "Projects"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:307
+#: clientgui/ViewProjects.cpp:382
 msgid "Updating project..."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:349
+#: clientgui/ViewProjects.cpp:424
 msgid "Resuming project..."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:353
+#: clientgui/ViewProjects.cpp:428
 msgid "Suspending project..."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:390
+#: clientgui/ViewProjects.cpp:465
 msgid "Telling project to allow additional task downloads..."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:394
+#: clientgui/ViewProjects.cpp:469
 msgid "Telling project to not fetch any additional tasks..."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:430
+#: clientgui/ViewProjects.cpp:505
 msgid "Resetting project..."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:488
+#: clientgui/ViewProjects.cpp:563
 msgid "Removing project..."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:548
+#: clientgui/ViewProjects.cpp:623
+#: clientgui/ViewWork.cpp:686
 msgid "Launching browser..."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1063
+#: clientgui/ViewProjects.cpp:1140
 msgid "Requested by user"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1064
+#: clientgui/ViewProjects.cpp:1141
 msgid "To fetch work"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1065
+#: clientgui/ViewProjects.cpp:1142
 msgid "To report completed tasks"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1066
+#: clientgui/ViewProjects.cpp:1143
 msgid "To send trickle-up message"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1067
+#: clientgui/ViewProjects.cpp:1144
 msgid "Requested by account manager"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1068
+#: clientgui/ViewProjects.cpp:1145
 msgid "Project initialization"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1069
+#: clientgui/ViewProjects.cpp:1146
 msgid "Requested by project"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1070
+#: clientgui/ViewProjects.cpp:1147
 msgid "Unknown reason"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1084
+#: clientgui/ViewProjects.cpp:1161
 msgid "Suspended by user"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1087
+#: clientgui/ViewProjects.cpp:1164
 msgid "Won't get new tasks"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1090
+#: clientgui/ViewProjects.cpp:1167
 msgid "Project ended - OK to remove"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1093
+#: clientgui/ViewProjects.cpp:1170
 msgid "Will remove when tasks done"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1096
+#: clientgui/ViewProjects.cpp:1173
 msgid "Scheduler request pending"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1102
+#: clientgui/ViewProjects.cpp:1179
 msgid "Scheduler request in progress"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1105
+#: clientgui/ViewProjects.cpp:1182
 msgid "Trickle up message pending"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:1111
+#: clientgui/ViewProjects.cpp:1188
 msgid "Communication deferred "
 msgstr ""
 
@@ -3415,31 +3436,27 @@ msgstr ""
 msgid "Disk usage by BOINC projects"
 msgstr ""
 
-#: clientgui/ViewResources.cpp:116
-msgid "Disk"
-msgstr ""
-
 #: clientgui/ViewResources.cpp:225
 msgid "no projects: 0 bytes used"
 msgstr ""
 
-#: clientgui/ViewResources.cpp:262
+#: clientgui/ViewResources.cpp:259
 msgid "used by BOINC: "
 msgstr ""
 
-#: clientgui/ViewResources.cpp:272
+#: clientgui/ViewResources.cpp:269
 msgid "free, available to BOINC: "
 msgstr ""
 
-#: clientgui/ViewResources.cpp:282
+#: clientgui/ViewResources.cpp:279
 msgid "free, not available to BOINC: "
 msgstr ""
 
-#: clientgui/ViewResources.cpp:292
+#: clientgui/ViewResources.cpp:289
 msgid "free: "
 msgstr ""
 
-#: clientgui/ViewResources.cpp:302
+#: clientgui/ViewResources.cpp:299
 msgid "used by other programs: "
 msgstr ""
 
@@ -3583,70 +3600,71 @@ msgstr ""
 msgid "Uses smaller area for graphs"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:169
+#: clientgui/ViewTransfers.cpp:187
 msgid "Retry Now"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:170
+#: clientgui/ViewTransfers.cpp:188
 msgid "Retry the file transfer now"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:176
+#: clientgui/ViewTransfers.cpp:194
 msgid "Abort Transfer"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:177
+#: clientgui/ViewTransfers.cpp:195
 msgid "Abort this file transfer.  You won't get credit for the task."
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:188
+#: clientgui/ViewTransfers.cpp:210
 msgid "File"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:189
-#: clientgui/ViewWork.cpp:238
+#: clientgui/ViewTransfers.cpp:211
+#: clientgui/ViewWork.cpp:261
 msgid "Progress"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:190
+#: clientgui/ViewTransfers.cpp:212
 msgid "Size"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:191
-msgid "Elapsed Time"
+#: clientgui/ViewTransfers.cpp:213
+#: clientgui/ViewWork.cpp:263
+msgid "Elapsed"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:192
+#: clientgui/ViewTransfers.cpp:214
 msgid "Speed"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:218
+#: clientgui/ViewTransfers.cpp:295
 msgid "Transfers"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:285
+#: clientgui/ViewTransfers.cpp:362
 msgid "Network activity is suspended - "
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:287
+#: clientgui/ViewTransfers.cpp:364
 msgid ""
 ".\n"
 "You can enable it using the Activity menu."
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:290
+#: clientgui/ViewTransfers.cpp:367
 msgid "BOINC"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:297
+#: clientgui/ViewTransfers.cpp:374
 msgid "Retrying transfer now..."
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:335
+#: clientgui/ViewTransfers.cpp:412
 msgid "Aborting transfer..."
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:348
+#: clientgui/ViewTransfers.cpp:425
 #, c-format
 msgid ""
 "Are you sure you want to abort this file transfer '%s'?\n"
@@ -3654,121 +3672,117 @@ msgid ""
 "will not receive credit for it."
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:354
+#: clientgui/ViewTransfers.cpp:431
 msgid "Abort File Transfer"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:785
+#: clientgui/ViewTransfers.cpp:864
 msgid "Upload"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:785
+#: clientgui/ViewTransfers.cpp:864
 msgid "Download"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:789
+#: clientgui/ViewTransfers.cpp:868
 msgid "retry in "
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:791
+#: clientgui/ViewTransfers.cpp:870
 msgid "failed"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:794
+#: clientgui/ViewTransfers.cpp:873
 msgid "suspended"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:799
+#: clientgui/ViewTransfers.cpp:878
 msgid "active"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:801
+#: clientgui/ViewTransfers.cpp:880
 msgid "pending"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:808
+#: clientgui/ViewTransfers.cpp:887
 msgid " (project backoff: "
 msgstr ""
 
-#: clientgui/ViewWork.cpp:192
-#: clientgui/ViewWork.cpp:782
+#: clientgui/ViewWork.cpp:211
+#: clientgui/ViewWork.cpp:864
 msgid "Show active tasks"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:193
-#: clientgui/ViewWork.cpp:783
+#: clientgui/ViewWork.cpp:212
+#: clientgui/ViewWork.cpp:865
 msgid "Show only active tasks."
 msgstr ""
 
-#: clientgui/ViewWork.cpp:206
+#: clientgui/ViewWork.cpp:225
 msgid "Show VM Console"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:207
+#: clientgui/ViewWork.cpp:226
 msgid "Show VM Console in a window."
 msgstr ""
 
-#: clientgui/ViewWork.cpp:214
+#: clientgui/ViewWork.cpp:233
 msgid "Suspend work for this result."
 msgstr ""
 
-#: clientgui/ViewWork.cpp:221
-msgid "Abandon work on the result. You will get no credit for it."
-msgstr ""
-
 #: clientgui/ViewWork.cpp:240
-msgid "Elapsed"
+msgid "Abandon work on the result. You will get no credit for it."
 msgstr ""
 
-#: clientgui/ViewWork.cpp:241
+#: clientgui/ViewWork.cpp:264
 msgid "Remaining (estimated)"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:242
+#: clientgui/ViewWork.cpp:265
 msgid "Deadline"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:269
+#: clientgui/ViewWork.cpp:351
 msgid "Tasks"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:362
+#: clientgui/ViewWork.cpp:444
 msgid "Resuming task..."
 msgstr ""
 
-#: clientgui/ViewWork.cpp:365
+#: clientgui/ViewWork.cpp:447
 msgid "Suspending task..."
 msgstr ""
 
-#: clientgui/ViewWork.cpp:394
+#: clientgui/ViewWork.cpp:476
 msgid "Showing graphics for task..."
 msgstr ""
 
-#: clientgui/ViewWork.cpp:431
+#: clientgui/ViewWork.cpp:513
 msgid "Showing VM console for task..."
 msgstr ""
 
-#: clientgui/ViewWork.cpp:484
+#: 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:490
+#: clientgui/ViewWork.cpp:572
 #, c-format
 msgid "Are you sure you want to abort these %d tasks?"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:504
+#: clientgui/ViewWork.cpp:586
 msgid "Aborting task..."
 msgstr ""
 
-#: clientgui/ViewWork.cpp:776
+#: clientgui/ViewWork.cpp:858
 msgid "Show all tasks"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:777
+#: clientgui/ViewWork.cpp:859
 msgid "Show all tasks."
 msgstr ""
 
@@ -3826,11 +3840,11 @@ msgstr ""
 msgid "Add projects run by other researchers or organizations"
 msgstr ""
 
-#: clientgui/WizardAttach.cpp:673
+#: clientgui/WizardAttach.cpp:560
 msgid "Do you really want to cancel?"
 msgstr ""
 
-#: clientgui/WizardAttach.cpp:674
+#: clientgui/WizardAttach.cpp:561
 msgid "Question"
 msgstr ""
 
@@ -3873,11 +3887,11 @@ msgstr ""
 msgid "Quit %s"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.h:30
-msgid "specify work start and stop hours in format HH:MM-HH:MM"
+#: clientgui/DlgAdvPreferencesBase.h:45
+msgid "On this day of the week, compute only during these hours."
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.h:31
-msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
+#: clientgui/DlgAdvPreferencesBase.h:46
+msgid "On this day of the week, transfer files only during these hours."
 msgstr ""
 
diff --git a/locale/templates/BOINC-Project-Generic.pot b/locale/templates/BOINC-Project-Generic.pot
old mode 100755
new mode 100644
index 07fb363..b0459b6
--- a/locale/templates/BOINC-Project-Generic.pot
+++ b/locale/templates/BOINC-Project-Generic.pot
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: BOINC $Id$\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"
+"POT-Creation-Date: 2015-03-04 08:56 PST\n"
 "Last-Translator: Generated automatically from source files\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -22,6 +22,96 @@ msgstr ""
 msgid "LANG_NAME_INTERNATIONAL"
 msgstr ""
 
+#: ../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 ""
+
+#: ../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 ""
@@ -35,323 +125,327 @@ msgid "Underline text: [u]text[/u]  (alt+u)"
 msgstr ""
 
 #: ../inc/bbcode_html.inc:20
-msgid "Quote text: [quote]text[/quote]  (alt+q)"
+msgid "Strikethrough text: [s]text[/s]  (alt+k)"
 msgstr ""
 
 #: ../inc/bbcode_html.inc:23
-msgid "Code display: [code]code[/code]  (alt+c)"
+msgid "Quote text: [quote]text[/quote]  (alt+q)"
 msgstr ""
 
 #: ../inc/bbcode_html.inc:26
-msgid "List: [list]text[/list] (alt+l)"
+msgid "Code display: [code]code[/code]  (alt+c)"
 msgstr ""
 
 #: ../inc/bbcode_html.inc:29
-msgid "Ordered list: [list=]text[/list]  (alt+o)"
+msgid "List: [list]text[/list] (alt+l)"
 msgstr ""
 
 #: ../inc/bbcode_html.inc:32
-msgid "Insert image: [img]http://image_url[/img]  (alt+p)"
+msgid "Ordered list: [list=]text[/list]  (alt+o)"
 msgstr ""
 
 #: ../inc/bbcode_html.inc:35
+msgid "Insert image: [img]http://image_url[/img]  (alt+p)"
+msgstr ""
+
+#: ../inc/bbcode_html.inc:38
 msgid ""
 "Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url]  (alt+w)"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../inc/forum.inc:581
+#: ../inc/forum.inc:584
 msgid "Joined: %1"
 msgstr ""
 
-#: ../inc/forum.inc:590
+#: ../inc/forum.inc:593
 msgid "Posts: %1"
 msgstr ""
 
-#: ../inc/forum.inc:596
+#: ../inc/forum.inc:599
 msgid "Credit: %1"
 msgstr ""
 
-#: ../inc/forum.inc:597
+#: ../inc/forum.inc:600
 msgid "RAC: %1"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../inc/forum.inc:747
+#: ../inc/forum.inc:751
 msgid "You may not post or rate messages until %1"
 msgstr ""
 
-#: ../inc/forum.inc:758
+#: ../inc/forum.inc:762
 msgid ""
 "\n"
 "        <ul>\n"
@@ -369,342 +463,349 @@ msgid ""
 "        "
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../inc/host.inc:89
+#: ../inc/host.inc:88
 msgid "(same the last %1 times)"
 msgstr ""
 
-#: ../inc/host.inc:91
+#: ../inc/host.inc:90
 msgid "External IP address"
 msgstr ""
 
-#: ../inc/host.inc:94
+#: ../inc/host.inc:93
 msgid "Show IP address"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../inc/host.inc:134
+#: ../inc/host.inc:133
 msgid "Cache"
 msgstr ""
 
-#: ../inc/host.inc:134
+#: ../inc/host.inc:133
 msgid "%1 KB"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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"
+#: ../inc/host.inc:186
+msgid "Fraction of time BOINC is running"
 msgstr ""
 
-#: ../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 ""
+
+#: ../inc/host.inc:190
+msgid "While BOINC is running, fraction of time computing is allowed"
 msgstr ""
 
 #: ../inc/host.inc:191
-#, php-format
-msgid "While BOINC running, % of time work is allowed"
+msgid "While is BOINC running, fraction of time GPU computing is allowed"
 msgstr ""
 
 #: ../inc/host.inc:193
@@ -715,7 +816,7 @@ msgstr ""
 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 ""
 
@@ -731,7 +832,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 ""
 
@@ -739,30 +840,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 ""
 
-#: ../inc/host.inc:237 ../inc/host.inc:685
+#: ../inc/host.inc:237 ../inc/host.inc:690
 msgid "GPU"
 msgstr ""
 
@@ -770,91 +871,83 @@ msgstr ""
 msgid "Operating system"
 msgstr ""
 
-#: ../inc/host.inc:315
+#: ../inc/host.inc:320
 msgid "(%1 processors)"
 msgstr ""
 
-#: ../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 ""
 
-#: ../inc/host.inc:522
+#: ../inc/host.inc:527
 msgid "Host %1 has an incompatible OS:"
 msgstr ""
 
-#: ../inc/host.inc:528
+#: ../inc/host.inc:533
 msgid "Host %1 has an incompatible CPU:"
 msgstr ""
 
-#: ../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 ""
 
-#: ../inc/host.inc:601
+#: ../inc/host.inc:606
 msgid "Merging host %1 into host %2"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../inc/host.inc:666 ../inc/result.inc:637
+#: ../inc/host.inc:671 ../inc/result.inc:642
 msgid "Computer ID"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
@@ -867,29 +960,29 @@ msgstr ""
 msgid "News is available as an %sRSS feed%s"
 msgstr ""
 
-#: ../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 ""
 
@@ -901,7 +994,7 @@ msgstr ""
 msgid "User IDs or unique usernames, separated with commas"
 msgstr ""
 
-#: ../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 ""
 
@@ -909,375 +1002,498 @@ 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 ""
 
-#: ../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 ""
 
-#: ../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"
+"Keep some CPUs free for other applications. Example: 75% means use 6 cores "
+"on an 8-core CPU."
 msgstr ""
 
-#: ../inc/prefs.inc:85
-msgid "Suspend work while computer is in use?"
+#: ../inc/prefs.inc:52
+#, no-php-format
+msgid "% of the CPUs"
 msgstr ""
 
-#: ../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"
+"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 ""
 
-#: ../inc/prefs.inc:99
-msgid "'In use' means mouse/keyboard activity in last"
+#: ../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"
+#: ../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"
+#: ../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"
+"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"
+#: ../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"
+"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"
+#: ../inc/prefs.inc:76
+msgid "Suspend GPU computing when computer is in use"
 msgstr ""
 
-#: ../inc/prefs.inc:147
-msgid "On multiprocessors, use at most"
+#: ../inc/prefs.inc:77
+msgid "Check this to suspend GPU computing when you're using the computer."
 msgstr ""
 
-#: ../inc/prefs.inc:149
-msgid "processors"
+#: ../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"
+#: ../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"
+#: ../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"
+#: ../inc/prefs.inc:89
+msgid "Suspend when no mouse/keyboard input in last"
 msgstr ""
 
-#: ../inc/prefs.inc:167
-#, php-format
-msgid "% of CPU time"
+#: ../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"
+#: ../inc/prefs.inc:95
+msgid "Suspend when non-BOINC CPU usage is above"
 msgstr ""
 
-#: ../inc/prefs.inc:177 ../inc/prefs.inc:186
-msgid "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"
+#: ../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"
+#: ../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"
+#: ../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"
+#: ../inc/prefs.inc:107
+msgid "Store at least"
 msgstr ""
 
-#: ../inc/prefs.inc:199
-msgid "Swap space: use at most"
+#: ../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"
+#: ../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"
+#: ../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"
+#: ../inc/prefs.inc:114
+msgid ""
+"Store additional tasks above the minimum level.  Determines how much work is "
+"requested when contacting a project."
 msgstr ""
 
-#: ../inc/prefs.inc:223 ../inc/prefs.inc:228 ../inc/prefs.inc:270
-#: ../inc/util.inc:274
-msgid "days"
+#: ../inc/prefs.inc:119
+msgid "Switch between tasks about every"
 msgstr ""
 
-#: ../inc/prefs.inc:226
-msgid "... and up to an additional"
+#: ../inc/prefs.inc:120
+msgid "If you run several projects, BOINC may switch between them this often."
 msgstr ""
 
-#: ../inc/prefs.inc:232
-msgid ""
-"Confirm before connecting to Internet? %1 Matters only if you have a modem, "
-"ISDN or VPN connection %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"
+"This controls how often tasks save their state to disk, so that they can be "
+"restarted later."
 msgstr ""
 
-#: ../inc/prefs.inc:249
-msgid "Maximum download rate:"
+#: ../inc/prefs.inc:128
+msgid "seconds"
 msgstr ""
 
-#: ../inc/prefs.inc:251 ../inc/prefs.inc:256
-msgid "Kbytes/sec"
+#: ../inc/prefs.inc:136 ../inc/prefs.inc:148
+msgid "Use no more than"
 msgstr ""
 
-#: ../inc/prefs.inc:254
-msgid "Maximum upload rate:"
+#: ../inc/prefs.inc:137
+msgid "Limit the total amount of disk space used by BOINC."
 msgstr ""
 
-#: ../inc/prefs.inc:259
-msgid "Use network only between the hours of"
+#: ../inc/prefs.inc:139
+msgid "GB"
 msgstr ""
 
-#: ../inc/prefs.inc:263
-msgid "Transfer at most %1 Enforced by version 6.10.46+ %2"
+#: ../inc/prefs.inc:142
+msgid "Leave at least"
 msgstr ""
 
-#: ../inc/prefs.inc:269
-msgid "Mbytes every"
+#: ../inc/prefs.inc:143
+msgid ""
+"Limit disk usage to leave this much free space on the volume where BOINC "
+"stores data."
 msgstr ""
 
-#: ../inc/prefs.inc:274
-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"
+#: ../inc/prefs.inc:145
+msgid "GB free"
 msgstr ""
 
-#: ../inc/prefs.inc:287
+#: ../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"
+"Limit the percentage of disk space used by BOINC on the volume where it "
+"stores data."
 msgstr ""
 
-#: ../inc/prefs.inc:298
-msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
+#: ../inc/prefs.inc:152
+#, no-php-format
+msgid "% of total"
+msgstr ""
+
+#: ../inc/prefs.inc:158
+msgid "When computer is in use, use at most"
+msgstr ""
+
+#: ../inc/prefs.inc:159
+msgid "Limit the memory used by BOINC when you're using the computer."
 msgstr ""
 
-#: ../inc/prefs.inc:308
-msgid "Use CPU %1 Enforced by version 6.10+ %2"
+#: ../inc/prefs.inc:162 ../inc/prefs.inc:169 ../inc/prefs.inc:182
+#, no-php-format
+msgid "%"
 msgstr ""
 
-#: ../inc/prefs.inc:320
-msgid "Use ATI GPU %1 Enforced by version 6.10+ %2"
+#: ../inc/prefs.inc:165
+msgid "When computer is not in use, use at most"
 msgstr ""
 
-#: ../inc/prefs.inc:332
-msgid "Use NVIDIA GPU %1 Enforced by version 6.10+ %2"
+#: ../inc/prefs.inc:166
+msgid "Limit the memory used by BOINC when you're not using the computer."
 msgstr ""
 
-#: ../inc/prefs.inc:344
-msgid "Use Intel GPU %1 Enforced by version 7.2+ %2"
+#: ../inc/prefs.inc:172
+msgid "Leave non-GPU tasks in memory while suspended"
 msgstr ""
 
-#: ../inc/prefs.inc:358
+#: ../inc/prefs.inc:173
 msgid ""
-"Run test applications? %1 This helps us develop applications, but may cause "
-"jobs to fail on your computer %2"
+"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:178
+msgid "Page/swap file: use at most"
 msgstr ""
 
-#: ../inc/prefs.inc:367
+#: ../inc/prefs.inc:179
+msgid "Limit the swap space (page file) used by BOINC."
+msgstr ""
+
+#: ../inc/prefs.inc:189
+msgid "Limit download rate to"
+msgstr ""
+
+#: ../inc/prefs.inc:190
+msgid "Limit the download rate of file transfers."
+msgstr ""
+
+#: ../inc/prefs.inc:192 ../inc/prefs.inc:198
+msgid "KB/second"
+msgstr ""
+
+#: ../inc/prefs.inc:195
+msgid "Limit upload rate to"
+msgstr ""
+
+#: ../inc/prefs.inc:196
+msgid "Limit the upload rate of file transfers."
+msgstr ""
+
+#: ../inc/prefs.inc:201
+msgid "Limit usage to"
+msgstr ""
+
+#: ../inc/prefs.inc:202
+msgid "Example: BOINC should transfer at most 2000 MB of data every 30 days."
+msgstr ""
+
+#: ../inc/prefs.inc:205
+msgid "MB every"
+msgstr ""
+
+#: ../inc/prefs.inc:206 ../inc/util.inc:303
+msgid "days"
+msgstr ""
+
+#: ../inc/prefs.inc:210
+msgid "Transfer files only between"
+msgstr ""
+
+#: ../inc/prefs.inc:211
+msgid "Transfer files only during a particular period each day."
+msgstr ""
+
+#: ../inc/prefs.inc:216
+msgid "Skip data verification for image files"
+msgstr ""
+
+#: ../inc/prefs.inc:217
 msgid ""
-"Emails will be sent from %1; make sure your spam filter accepts this address."
+"Check this only if your Internet provider modifies image files. Skipping "
+"verification reduces the security of BOINC."
 msgstr ""
 
-#: ../inc/prefs.inc:374
-msgid "Is it OK for %1 and your team (if any) to email you?"
+#: ../inc/prefs.inc:222
+msgid "Confirm before connecting to Internet"
 msgstr ""
 
-#: ../inc/prefs.inc:380
-msgid "Should %1 show your computers on its web site?"
+#: ../inc/prefs.inc:223 ../inc/prefs.inc:229
+msgid "Useful only if you have a modem, ISDN or VPN connection."
+msgstr ""
+
+#: ../inc/prefs.inc:228
+msgid "Disconnect when done"
 msgstr ""
 
-#: ../inc/prefs.inc:387
-msgid "Disk and memory usage"
+#: ../inc/prefs.inc:235 ../inc/prefs.inc:472 ../user/explain_state.php:94
+msgid "Computing"
 msgstr ""
 
-#: ../inc/prefs.inc:388
-msgid "Processor usage"
+#: ../inc/prefs.inc:236
+msgid "Disk"
 msgstr ""
 
-#: ../inc/prefs.inc:389
-msgid "Network usage"
+#: ../inc/prefs.inc:238
+msgid "Network"
 msgstr ""
 
-#: ../inc/prefs.inc:392
+#: ../inc/prefs.inc:241
 msgid ""
 "These preferences apply to all the BOINC projects in which you participate."
 msgstr ""
 
-#: ../inc/prefs.inc:395
+#: ../inc/prefs.inc:244
 msgid ""
 "%1Unable to update preferences.%2 The values marked in red below were out of "
 "range or not numeric."
 msgstr ""
 
-#: ../inc/prefs.inc:445
-msgid "bad venue: %1"
+#: ../inc/prefs.inc:483
+msgid "Separate preferences for %1"
 msgstr ""
 
-#: ../inc/prefs.inc:451
-msgid "bad subset: %1"
+#: ../inc/prefs.inc:493 ../inc/prefs.inc:528 ../inc/prefs_project.inc:291
+msgid "Edit preferences"
 msgstr ""
 
-#: ../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"
+#: ../inc/prefs.inc:494 ../user/edit_forum_preferences_form.php:149
+#: ../user/team_admins.php:36
+msgid "Remove"
 msgstr ""
 
-#: ../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"
+#: ../inc/prefs.inc:499
+msgid "Add separate preferences for %1"
 msgstr ""
 
-#: ../inc/prefs.inc:679 ../user/forum_search.php:53
-msgid "no limit"
+#: ../inc/prefs.inc:506
+msgid "These settings apply to all computers using this account except"
 msgstr ""
 
-#: ../inc/prefs.inc:704 ../user/team_admins.php:79
-msgid "Add"
+#: ../inc/prefs.inc:508
+msgid ""
+"computers where you have set preferences locally using the BOINC Manager"
 msgstr ""
 
-#: ../inc/prefs.inc:706 ../inc/prefs.inc:834
-#: ../user/edit_forum_preferences_form.php:160 ../user/team_admins.php:34
-msgid "Remove"
+#: ../inc/prefs.inc:510
+msgid "Android devices"
 msgstr ""
 
-#: ../inc/prefs.inc:812 ../user/explain_state.php:94
-msgid "Computing"
+#: ../inc/prefs.inc:513
+msgid "(Switch view)"
 msgstr ""
 
-#: ../inc/prefs.inc:823
-msgid "Separate preferences for %1"
+#: ../inc/prefs.inc:515 ../inc/prefs_project.inc:272
+msgid "Combined preferences"
 msgstr ""
 
-#: ../inc/prefs.inc:833 ../inc/prefs.inc:914
-msgid "Edit preferences"
+#: ../inc/prefs.inc:522 ../inc/prefs_project.inc:283
+msgid "Primary (default) preferences"
 msgstr ""
 
-#: ../inc/prefs.inc:839
-msgid "Add separate preferences for %1"
+#: ../inc/prefs.inc:537
+msgid "Preferences last modified:"
 msgstr ""
 
-#: ../inc/prefs.inc:847 ../inc/prefs.inc:895
-msgid "(Switch View)"
+#: ../inc/prefs.inc:553
+msgid "Add preferences"
 msgstr ""
 
-#: ../inc/prefs.inc:849 ../inc/prefs.inc:898
-msgid "Combined preferences"
+#: ../inc/prefs.inc:557
+msgid "Update preferences"
 msgstr ""
 
-#: ../inc/prefs.inc:854
-msgid "Project specific settings"
+#: ../inc/prefs.inc:628 ../project.sample/project_specific_prefs.inc:84
+#: ../project.sample/project_specific_prefs.inc:224
+msgid "yes"
 msgstr ""
 
-#: ../inc/prefs.inc:862 ../inc/prefs.inc:907
-msgid "Primary (default) preferences"
+#: ../inc/prefs.inc:630 ../project.sample/project_specific_prefs.inc:86
+#: ../project.sample/project_specific_prefs.inc:224
+msgid "no"
 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"
+#: ../inc/prefs.inc:638
+msgid "Default computer location"
+msgstr ""
+
+#: ../inc/prefs.inc:639
+msgid ""
+"New computers will use this location for computing and project preferences."
 msgstr ""
 
-#: ../inc/prefs.inc:885
-msgid "These apply to all BOINC projects in which you participate."
+#: ../inc/prefs_project.inc:52
+msgid "Resource share"
 msgstr ""
 
-#: ../inc/prefs.inc:887
+#: ../inc/prefs_project.inc:53
 msgid ""
-"On computers participating in multiple projects, the most recently modified "
-"preferences will be used."
+"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 ""
 
-#: ../inc/prefs.inc:889
-msgid "These preferences do not apply to Android devices."
+#: ../inc/prefs_project.inc:61
+msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
 msgstr ""
 
-#: ../inc/prefs.inc:892
-msgid "Preferences last modified:"
+#: ../inc/prefs_project.inc:70
+msgid "Use CPU"
 msgstr ""
 
-#: ../inc/prefs.inc:944
-msgid "Add preferences"
+#: ../inc/prefs_project.inc:79
+msgid "Use ATI GPU"
 msgstr ""
 
-#: ../inc/prefs.inc:948
-msgid "Update preferences"
+#: ../inc/prefs_project.inc:88
+msgid "Use NVIDIA GPU"
 msgstr ""
 
-#: ../inc/prefs.inc:1036 ../inc/prefs.inc:1045
-msgid "Default computer location"
+#: ../inc/prefs_project.inc:97
+msgid "Use Intel GPU"
+msgstr ""
+
+#: ../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 ""
+
+#: ../inc/prefs_project.inc:123
+msgid "Is it OK for %1 and your team (if any) to email you?"
 msgstr ""
 
-#: ../inc/prefs_util.inc:305 ../inc/prefs_util.inc:315
+#: ../inc/prefs_project.inc:130
+msgid "Should %1 show your computers on its web site?"
+msgstr ""
+
+#: ../inc/prefs_project.inc:270
+msgid "(Switch View)"
+msgstr ""
+
+#: ../inc/prefs_project.inc:276
+msgid "Project specific settings"
+msgstr ""
+
+#: ../inc/prefs_util.inc:33
+msgid "bad venue: %1"
+msgstr ""
+
+#: ../inc/prefs_util.inc:39
+msgid "bad subset: %1"
+msgstr ""
+
+#: ../inc/prefs_util.inc:476 ../inc/prefs_util.inc:500
 msgid "and"
 msgstr ""
 
@@ -1293,7 +1509,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 ""
 
@@ -1311,7 +1527,7 @@ msgstr ""
 msgid "No profile exists for that user ID."
 msgstr ""
 
-#: ../inc/profile.inc:219 ../user/create_profile.php:313
+#: ../inc/profile.inc:219 ../user/create_profile.php:309
 msgid "Edit your profile"
 msgstr ""
 
@@ -1359,11 +1575,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 ""
 
@@ -1392,6 +1609,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 ""
 
@@ -1556,127 +1774,135 @@ msgid "WU cancelled"
 msgstr ""
 
 #: ../inc/result.inc:322
+msgid "Canonical result is missing"
+msgstr ""
+
+#: ../inc/result.inc:326
 msgid "Unrecognized Error: %1"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../inc/result.inc:378
+#: ../inc/result.inc:382
 msgid "CPU time<br />(sec)"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
+
+#: ../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 ""
 
@@ -1692,17 +1918,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 ""
 
@@ -1710,7 +1926,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 ""
 
@@ -1730,8 +1946,8 @@ msgstr ""
 msgid "founder response deadline is %1"
 msgstr ""
 
-#: ../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 ""
 
@@ -1747,485 +1963,476 @@ 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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../inc/team.inc:436
+#: ../inc/team.inc:451
 msgid "Team name, HTML version"
 msgstr ""
 
-#: ../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 ""
 
-#: ../inc/team.inc:439
+#: ../inc/team.inc:454
 msgid "If you don't know HTML, leave this box blank."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
-
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../inc/user.inc:239 ../user/bs_sample_index.php:59
-#: ../user/sample_index.php:125
-msgid "Community"
+#: ../inc/user.inc:266
+msgid "View the profile of %1"
 msgstr ""
 
-#: ../inc/user.inc:243 ../user/pm.php:107 ../user/pm.php:147
-msgid "Delete"
+#: ../inc/user.inc:267 ../inc/user.inc:316 ../inc/user.inc:482
+msgid "Profile"
 msgstr ""
 
-#: ../inc/user.inc:245
-msgid "Create"
+#: ../inc/user.inc:307 ../user/sample_index.php:114
+msgid "Community"
 msgstr ""
 
-#: ../inc/user.inc:247 ../inc/user.inc:402 ../inc/util.inc:514
-msgid "Profile"
+#: ../inc/user.inc:314
+msgid "Create"
 msgstr ""
 
-#: ../inc/user.inc:250 ../inc/user.inc:375
+#: ../inc/user.inc:321 ../inc/user.inc:454
 msgid "%1 posts"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
-
-#: ../inc/util.inc:569
+#: ../inc/util.inc:552
 msgid "Use BBCode tags to format your text"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
@@ -2233,22 +2440,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 ""
@@ -2257,33 +2448,37 @@ msgstr ""
 msgid "HTML tags not allowed in name"
 msgstr ""
 
-#: ../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 ""
+
+#: ../user/add_venue.php:82
 msgid "Add %1 preferences for %2"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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"
+#: ../user/apps.php:57
+msgid "Average computing"
 msgstr ""
 
 #: ../user/bbcode.php:23
@@ -2315,153 +2510,79 @@ msgid "Underline"
 msgstr ""
 
 #: ../user/bbcode.php:35
-msgid "Superscript"
+msgid "Strikethrough"
 msgstr ""
 
 #: ../user/bbcode.php:36
-msgid "Big text"
+msgid "Superscript"
 msgstr ""
 
 #: ../user/bbcode.php:37
-msgid "Red text"
+msgid "Big text"
 msgstr ""
 
 #: ../user/bbcode.php:38
-msgid "link to website"
+msgid "Red text"
 msgstr ""
 
 #: ../user/bbcode.php:39
+msgid "link to website"
+msgstr ""
+
+#: ../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 ""
 
-#: ../user/bbcode.php:43
+#: ../user/bbcode.php:44
 msgid "Item2"
 msgstr ""
 
-#: ../user/bbcode.php:43
+#: ../user/bbcode.php:44
 msgid "Item 2"
 msgstr ""
 
-#: ../user/bbcode.php:45
+#: ../user/bbcode.php:46
 msgid "use to link to Trac ticket on BOINC website"
 msgstr ""
 
-#: ../user/bbcode.php:47
+#: ../user/bbcode.php:48
 msgid "use to link to Trac Wiki on BOINC website"
 msgstr ""
 
-#: ../user/bbcode.php:49
-msgid "use to link to SVN changeset on BOINC website"
-msgstr ""
-
-#: ../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 ""
 
-#: ../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 ""
-
-#: ../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 ""
@@ -2470,191 +2591,151 @@ msgstr ""
 msgid "Click your browser's <b>Back</b> button to try again."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
-
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -2695,9 +2776,9 @@ msgstr ""
 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 ""
@@ -2706,8 +2787,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 ""
@@ -2716,44 +2797,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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
@@ -2934,241 +3015,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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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"
+#: ../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"
+#: ../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 ""
 
@@ -3379,19 +3420,19 @@ msgstr ""
 msgid "Sending emails"
 msgstr ""
 
-#: ../user/ffmail_action.php:84
+#: ../user/ffmail_action.php:82
 msgid "email sent successfully to %1"
 msgstr ""
 
-#: ../user/ffmail_action.php:86
+#: ../user/ffmail_action.php:84
 msgid "failed to send email to %1: %2"
 msgstr ""
 
-#: ../user/ffmail_action.php:92
+#: ../user/ffmail_action.php:90
 msgid "Thanks for telling your friends about %1"
 msgstr ""
 
-#: ../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."
@@ -3442,79 +3483,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 ""
 
-#: ../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 ""
 
-#: ../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
-msgid "Obscene"
-msgstr ""
-
-#: ../user/forum_banishment_vote.php:65
+#: ../user/forum_banishment_vote.php:67
 #: ../user/forum_banishment_vote_action.php:59
-#: ../user/forum_moderate_post.php:56 ../user/forum_moderate_thread.php:53
-msgid "Flame/Hate mail"
+#: ../user/forum_moderate_post.php:58 ../user/forum_moderate_thread.php:58
+msgid "Obscene"
 msgstr ""
 
-#: ../user/forum_banishment_vote.php:66
+#: ../user/forum_banishment_vote.php:68
 #: ../user/forum_banishment_vote_action.php:61
-#: ../user/forum_moderate_post.php:59
-msgid "User Request"
+#: ../user/forum_moderate_post.php:59 ../user/forum_moderate_thread.php:59
+msgid "Flame/Hate mail"
 msgstr ""
 
-#: ../user/forum_banishment_vote.php:67
+#: ../user/forum_banishment_vote.php:69
 #: ../user/forum_banishment_vote_action.php:63
-#: ../user/forum_moderate_post.php:60 ../user/forum_moderate_thread.php:55
-msgid "Other"
+#: ../user/forum_moderate_post.php:62
+msgid "User Request"
 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 ""
 
@@ -3528,7 +3563,7 @@ msgstr ""
 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 ""
 
@@ -3537,827 +3572,827 @@ 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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../user/forum_index.php:69
+#: ../user/forum_index.php:74
 msgid "%1 Message boards"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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"
+#: ../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.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
-msgid "OK"
+#: ../user/forum_moderate_post.php:107
+msgid "Optional explanation %1 This is included in email to user.%2"
 msgstr ""
 
-#: ../user/forum_moderate_post_action.php:57
+#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../user/forum_rss.php:42
+#: ../user/forum_rss.php:39
 msgid "This message board is available as an RSS feed."
 msgstr ""
 
-#: ../user/forum_rss.php:43
+#: ../user/forum_rss.php:41
 msgid "Options:"
 msgstr ""
 
-#: ../user/forum_rss.php:47
-msgid "Include only posts by user ID %1 (default: all users)."
-msgstr ""
-
-#: ../user/forum_rss.php:49
-msgid "Include only posts from the last %1 days (default: 30)."
+#: ../user/forum_rss.php:45
+msgid "Include only posts by user ID %1 (default: all users)."
 msgstr ""
 
-#: ../user/forum_rss.php:51
-msgid "Truncate posts: %1 (Include only first 265 characters of each post)"
+#: ../user/forum_rss.php:47
+msgid "Include only posts from the last %1 days (default: 30)."
 msgstr ""
 
-#: ../user/forum_rss.php:53
+#: ../user/forum_rss.php:49
 msgid "Threads only: %1 (Include only the first post of every thread)"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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"
+#: ../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 ""
 
-#: ../user/forum_thread.php:216
-msgid "Unlock this thread"
+#: ../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 ""
 
-#: ../user/forum_thread.php:222
-msgid "Lock this thread"
+#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../user/friend.php:126
+#: ../user/friend.php:128
 msgid "Please log in as %1"
 msgstr ""
 
-#: ../user/friend.php:127
+#: ../user/friend.php:129
 msgid "You must log in as %1 to view this friend request"
 msgstr ""
 
-#: ../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 ""
 
-#: ../user/friend.php:143
+#: ../user/friend.php:145
 msgid "%1 says: %2"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -4407,14 +4442,23 @@ msgstr ""
 msgid "Log in with authenticator"
 msgstr ""
 
-#: ../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 ""
 
-#: ../user/gpu_list.php:183
+#: ../user/gpu_list.php:206
+msgid "Top GPU models"
+msgstr ""
+
+#: ../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 ""
 
 #: ../user/home.php:42
@@ -4429,6 +4473,10 @@ msgstr ""
 msgid "If you have not already done so, %1download BOINC client software%2."
 msgstr ""
 
+#: ../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 ""
@@ -4543,10 +4591,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 ""
@@ -4628,6 +4680,10 @@ msgstr ""
 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 ""
@@ -4801,27 +4857,7 @@ msgid ""
 "1you can provide a translation%2."
 msgstr ""
 
-#: ../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 ""
 
@@ -4946,244 +4982,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 ""
 
-#: ../user/pm.php:205
+#: ../user/pm.php:210
 msgid "Could not find user with id %1"
 msgstr ""
 
-#: ../user/pm.php:210
+#: ../user/pm.php:215
 msgid "Could not find user with username %1"
 msgstr ""
 
-#: ../user/pm.php:212
+#: ../user/pm.php:217
 msgid "%1 is not a unique username; you will have to use user ID"
 msgstr ""
 
-#: ../user/pm.php:217
+#: ../user/pm.php:222
 msgid "User %1 (ID: %2) is not accepting private messages from you."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../user/pm.php:265
+#: ../user/pm.php:270
 msgid "User %1 has been blocked from sending you private messages."
 msgstr ""
 
-#: ../user/pm.php:266
+#: ../user/pm.php:271
 msgid "To unblock, visit %1message board preferences%2"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../user/profile_menu.php:61
+#: ../user/profile_menu.php:63
 msgid "Browse profiles %1by country%2."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
@@ -5211,367 +5251,307 @@ msgstr ""
 msgid "No tasks to display"
 msgstr ""
 
-#: ../user/server_status.php:97
-msgid "Running"
+#: ../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"
+#: ../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: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"
+#: ../user/server_status.php:125
+msgid "Database schema version: "
 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"
+#: ../user/server_status.php:161
+msgid "Tasks by application"
 msgstr ""
 
-#: ../user/server_status.php:411
-msgid "current GigaFLOPs"
+#: ../user/server_status.php:164
+msgid "Runtime of last 100 tasks in hours: average, min, max"
 msgstr ""
 
-#: ../user/server_status.php:420
-msgid "Tasks by application"
+#: ../user/server_status.php:165
+msgid "Users in last 24 hours"
 msgstr ""
 
-#: ../user/server_status.php:423 ../user/workunit.php:40
-msgid "application"
+#: ../user/show_host_detail.php:40
+msgid "Computer %1"
 msgstr ""
 
-#: ../user/server_status.php:424
-msgid "unsent"
+#: ../user/stats.php:21
+msgid "Statistics and leaderboards"
 msgstr ""
 
-#: ../user/server_status.php:425
-msgid "in progress"
+#: ../user/stats.php:30
+msgid "Statistics for %1"
 msgstr ""
 
-#: ../user/server_status.php:426
-msgid "avg runtime of last 100 results in h (min-max)"
+#: ../user/stats.php:32 ../user/top_users.php:117
+msgid "Top participants"
 msgstr ""
 
-#: ../user/server_status.php:427
-msgid "users in last 24h"
+#: ../user/stats.php:40 ../user/team.php:48
+msgid "Top teams"
 msgstr ""
 
-#: ../user/show_host_detail.php:40
-msgid "Computer %1"
+#: ../user/stats.php:47
+msgid "Top computers"
 msgstr ""
 
-#: ../user/stats.php:21
-msgid "Statistics and leaderboards"
+#: ../user/stats.php:48
+msgid "GPU models"
 msgstr ""
 
-#: ../user/stats.php:28
-msgid "Statistics for %1"
+#: ../user/stats.php:49
+msgid "CPU models"
 msgstr ""
 
-#: ../user/stats.php:37
+#: ../user/stats.php:53
 msgid ""
 "More detailed statistics for %1 and other BOINC-based projects are available "
 "at several web sites:"
 msgstr ""
 
-#: ../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 ""
 
 #: ../user/team.php:27
-msgid "%1 participants may form %2teams%3."
+msgid "Teams"
 msgstr ""
 
 #: ../user/team.php:29
+msgid "%1 participants may form %2teams%3."
+msgstr ""
+
+#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../user/team_change_founder_action.php:41
+#: ../user/team_change_founder_action.php:43
 msgid "Changing founder of %1"
 msgstr ""
 
-#: ../user/team_change_founder_action.php:43
+#: ../user/team_change_founder_action.php:45
 msgid "%1 is now founder of %2"
 msgstr ""
 
-#: ../user/team_change_founder_form.php:37
+#: ../user/team_change_founder_form.php:39
 msgid "Change founder of %1"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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"
@@ -5579,210 +5559,210 @@ msgid ""
 "form below."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../user/team_email_list.php:63
+#: ../user/team_email_list.php:72
 msgid "Member list of %1"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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"
@@ -5790,75 +5770,75 @@ msgid ""
 "will be allowed to become the founder."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../user/team_founder_transfer_form.php:38
+#: ../user/team_founder_transfer_form.php:40
 msgid "You are now founder of team %1."
 msgstr ""
 
-#: ../user/team_founder_transfer_form.php:44
+#: ../user/team_founder_transfer_form.php:46
 msgid "You requested the foundership of %1 on %2."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -5868,181 +5848,175 @@ msgid ""
 "                       Are you sure you want to request foundership?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../user/team_join_action.php:41
+#: ../user/team_join_action.php:43
 msgid "You have joined %1."
 msgstr ""
 
-#: ../user/team_join_form.php:32
+#: ../user/team_join_form.php:34
 msgid "Join %1"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../user/team_manage.php:26
+#: ../user/team_manage.php:28
 msgid "Team administration for %1"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../user/team_manage.php:75
-msgid ""
-"Other resources for BOINC team admins are available from a third-party site, "
-"%1www.boincteams.com%2."
-msgstr ""
-
 #: ../user/team_manage.php:91
 msgid "Can't delete non-empty team"
 msgstr ""
@@ -6051,27 +6025,27 @@ msgstr ""
 msgid "Team %1 deleted"
 msgstr ""
 
-#: ../user/team_members.php:36
+#: ../user/team_members.php:38
 msgid "Limit exceeded:  Can only display the first 1000 members."
 msgstr ""
 
-#: ../user/team_members.php:49
+#: ../user/team_members.php:51
 msgid "Members of %1"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 +6056,85 @@ msgid ""
 "         </ul>"
 msgstr ""
 
-#: ../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 ""
 
-#: ../user/team_remove_inactive_action.php:39
+#: ../user/team_remove_inactive_action.php:41
 msgid "%1 is not a member of %2"
 msgstr ""
 
-#: ../user/team_remove_inactive_action.php:42
+#: ../user/team_remove_inactive_action.php:44
 msgid "%1 has been removed"
 msgstr ""
 
-#: ../user/team_remove_inactive_form.php:32
+#: ../user/team_remove_inactive_form.php:34
 msgid "Remove members from %1"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
@@ -6168,11 +6142,11 @@ msgstr ""
 msgid "Top hosts"
 msgstr ""
 
-#: ../user/top_teams.php:105
+#: ../user/top_teams.php:107
 msgid "Top %1 teams"
 msgstr ""
 
-#: ../user/top_teams.php:108
+#: ../user/top_teams.php:110
 msgid "There are no %1 teams"
 msgstr ""
 
@@ -6180,11 +6154,11 @@ msgstr ""
 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 ""
 
@@ -6228,19 +6202,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 +6282,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 ""
 
-#: ../user/view_profile.php:63
+#: ../user/view_profile.php:65
 msgid "Account data"
 msgstr ""
 
@@ -6372,6 +6346,10 @@ msgstr ""
 msgid "Workunit %1"
 msgstr ""
 
+#: ../user/workunit.php:40
+msgid "application"
+msgstr ""
+
 #: ../user/workunit.php:43
 msgid "canonical result"
 msgstr ""
@@ -6381,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 ""
 
@@ -6408,33 +6390,33 @@ 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 ""
 
-#: ../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"
@@ -6443,24 +6425,35 @@ msgid ""
 "    </ol>"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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/templates/BOINC-Setup.pot b/locale/templates/BOINC-Setup.pot
old mode 100755
new mode 100644
diff --git a/locale/templates/BOINC-Web.pot b/locale/templates/BOINC-Web.pot
old mode 100755
new mode 100644
diff --git a/locale/tr/BOINC-Client.mo b/locale/tr/BOINC-Client.mo
index 0408ae6..f28f72e 100644
Binary files a/locale/tr/BOINC-Client.mo and b/locale/tr/BOINC-Client.mo differ
diff --git a/locale/tr/BOINC-Client.po b/locale/tr/BOINC-Client.po
index b002a33..d68821c 100644
--- a/locale/tr/BOINC-Client.po
+++ b/locale/tr/BOINC-Client.po
@@ -1,24 +1,23 @@
 # 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: BOICN 7.4\n"
+"Project-Id-Version: boinc\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-10-15 22:25-0700\n"
-"PO-Revision-Date: 2015-02-12 02:04-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: Turkish <weboglan at hotmail.com>\n"
-"Language: tr\n"
+"PO-Revision-Date: 2015-02-09 01:15+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/boinc/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-POOTLE-MTIME: 1398157804.0\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: acct_mgr.cpp:450
-#: acct_mgr.cpp:459
+#: acct_mgr.cpp:450 acct_mgr.cpp:459
 msgid "Message from account manager"
 msgstr "Hesap yöneticisinden mesaj"
 
@@ -27,7 +26,9 @@ msgid "Message from server"
 msgstr "Sunucudan mesaj"
 
 #: client_state.cpp:258
-msgid "Some tasks need more memory than allowed by your preferences.  Please check the preferences."
+msgid ""
+"Some tasks need more memory than allowed by your preferences.  Please check "
+"the preferences."
 msgstr "Bazı uygulamalar, tercihlerinizde belirttiğinizden daha fazla belleğe ihtiyaç duyuyor.  Lütfen tercihlerinizi kontrol edin."
 
 #: client_state.cpp:520
@@ -40,11 +41,12 @@ msgstr "HTTP_PROXY ortam değişkeni mutlaka bir HTTP vekil sunucusu belirtmeli"
 
 #: cs_scheduler.cpp:613
 #, c-format
-msgid "You used the wrong URL for this project.  When convenient, remove this project, then add %s"
+msgid ""
+"You used the wrong URL for this project.  When convenient, remove this "
+"project, then add %s"
 msgstr "Bu proje için yanlış bir internet adresi kullandınız.  Uygun olduğunda, bu projeyi kaldırıp, ardından bunu ekleyin: %s"
 
-#: cs_statefile.cpp:828
-#: ../sched/sched_types.cpp:259
+#: cs_statefile.cpp:828 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
 msgstr "app_info.xml dosyasında sözdizimi hatası"
 
@@ -56,18 +58,15 @@ msgstr "app_info.xml dosyasında belirtilen dosya mevcut değil:"
 msgid "A new version of BOINC is available."
 msgstr "BOINC'in yeni bir sürümü mevcut."
 
-#: current_version.cpp:94
-#: current_version.cpp:102
+#: current_version.cpp:94 current_version.cpp:102
 msgid "Download"
 msgstr "İndir"
 
-#: log_flags.cpp:269
-#: log_flags.cpp:449
+#: log_flags.cpp:269 log_flags.cpp:449
 msgid "Unexpected text in cc_config.xml"
 msgstr "cc_config.xml dosyasında beklenmedik metin"
 
-#: log_flags.cpp:423
-#: log_flags.cpp:475
+#: log_flags.cpp:423 log_flags.cpp:475
 msgid "Unrecognized tag in cc_config.xml"
 msgstr "cc_config.xml dosyasında tanınmayan etiket"
 
@@ -92,7 +91,9 @@ msgid "Invalid code signing key.  To fix, remove and add this project."
 msgstr "Hesap anahtarı geçersiz.  Sorunu çözmek için, projeyi kaldırıp, yeniden ekleyin."
 
 #: ../sched/handle_request.cpp:859
-msgid "The project has changed its security key.  Please remove and add this project."
+msgid ""
+"The project has changed its security key.  Please remove and add this "
+"project."
 msgstr "Proje, güvenlik anahtarını değiştirdi.  Lütfen bu projeyi kaldırıp, yeniden ekleyin."
 
 #: ../sched/handle_request.cpp:943
@@ -104,7 +105,8 @@ msgid "This project doesn't support CPU type"
 msgstr "İşlemciniz bu proje için uygun değil"
 
 #: ../sched/handle_request.cpp:993
-msgid "Your BOINC client software is too old.  Please install the current version."
+msgid ""
+"Your BOINC client software is too old.  Please install the current version."
 msgstr "BOINC istemci yazılımınız çok eski.  Lütfen son sürümü kurun."
 
 #: ../sched/handle_request.cpp:1259
@@ -112,18 +114,21 @@ msgid "This project doesn't support computers of type"
 msgstr "Bilgisayarınızın özellikleri bu projeye uygun değil"
 
 #: ../sched/sched_send.cpp:1092
-msgid "Upgrade to the latest driver to process tasks using your computer's GPU"
+msgid ""
+"Upgrade to the latest driver to process tasks using your computer's GPU"
 msgstr "Bilgisayarınızın GPU'sunu kullanan projeleri hesaplatmak için ekran kartı sürücüsünü son sürüme yükseltin"
 
 #: ../sched/sched_send.cpp:1099
-msgid "Upgrade to the latest driver to use all of this project's GPU applications"
+msgid ""
+"Upgrade to the latest driver to use all of this project's GPU applications"
 msgstr "Bu projenin tüm GPU uygulamalarını kullanabilmek için, ekran kartı sürücülerinizi son sürüme yükseltin"
 
 #: ../sched/sched_send.cpp:1118
-msgid "A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to the current version"
+msgid ""
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to"
+" the current version"
 msgstr "NVIDIA GPU'nuzu kullanabilmek için BOINC'in yeni sürümü gerekli; lütfen mevcut sürümü yükseltin"
 
-# 94%
 #: ../sched/sched_send.cpp:1146
 #, c-format
 msgid "An %s GPU is required to run tasks for this project"
@@ -143,7 +148,8 @@ msgstr "Daha yeni bir BOINC sürümü gerekiyor; lütfen son sürümü kurun"
 
 #: ../sched/sched_send.cpp:1305
 #, c-format
-msgid "Tasks for %s are available, but your preferences are set to not accept them"
+msgid ""
+"Tasks for %s are available, but your preferences are set to not accept them"
 msgstr "%s için işler mevcut, ancak, tercihleriniz bunları kabul etmek üzere ayarlanmamış"
 
 #: ../sched/sched_types.cpp:254
@@ -153,59 +159,3 @@ msgstr "app_info.xml dosyasında bilinmeyen uygulama ismi"
 #: ../sched/sched_version.cpp:214
 msgid "Your app_info.xml file doesn't have a usable version of"
 msgstr "app_info.xml dosyanız, bunun kullanılabilir bir sürümüne sahip değil:"
-
-#~ msgid "Download it."
-#~ msgstr "İndir."
-#~ msgid "An NVIDIA or ATI GPU is required to run tasks for this project"
-#~ msgstr ""
-#~ "Bu projedeki işleri çalıştırabilmek için, bir NVIDIA ya da ATI GPU "
-#~ "gerekiyor"
-#~ msgid "An NVIDIA GPU is required to run tasks for this project"
-#~ msgstr "Bu projedeki işleri çalıştırabilmek için, bir NVIDIA GPU gerekiyor"
-#~ msgid "An ATI GPU is required to run tasks for this project"
-#~ msgstr "Bu projedeki işleri çalıştırabilmek için, bir ATI GPU gerekiyor"
-#~ msgid ""
-#~ "Tasks for NVIDIA GPU are available, but your preferences are set to not "
-#~ "accept them"
-#~ msgstr ""
-#~ "NVIDIA GPU için işler mevcut, ancak, tercihleriniz bu işleri kabul edecek "
-#~ "şekilde ayarlanmamış"
-#~ msgid ""
-#~ "Tasks for ATI GPU are available, but your preferences are set to not "
-#~ "accept them"
-#~ msgstr ""
-#~ "ATI GPU için işler mevcut, ancak, tercihleriniz bu işleri kabul edecek "
-#~ "şekilde ayarlanmamış"
-#~ msgid ""
-#~ "Tasks for CPU are available, but your preferences are set to not accept "
-#~ "them"
-#~ msgstr ""
-#~ "CPU için işler mevcut, ancak, tercihleriniz bu işleri kabul edecek "
-#~ "şekilde ayarlanmamış"
-#~ msgid "error"
-#~ msgstr "hata"
-#~ msgid "Can't resolve hostname in remote_hosts.cfg"
-#~ msgstr "remote_hosts.cfg dosyasındaki alan adı çözümlenemedi"
-#~ msgid "is not available for"
-#~ msgstr "bunun için mevcut değil - "
-#~ msgid "Notice from BOINC"
-#~ msgstr "BOINC'den bildirim"
-#~ msgid "Message from"
-#~ msgstr "Sunucudan mesaj - "
-#~ msgid ""
-#~ "You may have an outdated code signing key.  Try attaching and reattaching "
-#~ "this project."
-#~ msgstr ""
-#~ "Tarihi geçmiş bir kod imza anahtarına sahip olabilirsiniz.   Projeden "
-#~ "ayrılıp, tekrar katılmayı deneyin."
-#~ msgid "XML syntax error in"
-#~ msgstr "XML sözdizimi hatası:"
-#~ msgid "Unparsed tag in"
-#~ msgstr "Çözümlenemeyen etiket:"
-#~ msgid ""
-#~ "Your preference for network connection interval is too high for this "
-#~ "project"
-#~ msgstr ""
-#~ "Ağ bağlantısı gerçekleştirme sıklığı tercihiniz, bu proje için çok yüksek "
-#~ "bir değere ayarlanmış"
-
diff --git a/locale/tr/BOINC-Manager.mo b/locale/tr/BOINC-Manager.mo
index 4d18638..6527e1a 100644
Binary files a/locale/tr/BOINC-Manager.mo and b/locale/tr/BOINC-Manager.mo differ
diff --git a/locale/tr/BOINC-Manager.po b/locale/tr/BOINC-Manager.po
index 431cd09..665a05f 100644
--- a/locale/tr/BOINC-Manager.po
+++ b/locale/tr/BOINC-Manager.po
@@ -1,64 +1,52 @@
 # 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: BOINC 7.4\n"
+"Project-Id-Version: boinc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-15 16:56-0500\n"
-"PO-Revision-Date: 2015-02-12 02:05-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: Donanım Haber <bilgi at donanimhaber.com>\n"
-"Language: tr\n"
+"POT-Creation-Date: 2014-02-02 00:00-0800\n"
+"PO-Revision-Date: 2015-02-09 01:19+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/boinc/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc_7.4\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1398158771.0\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-SearchPath-0: clientgui\n"
-"X-Poedit-SearchPath-1: clientgui/msw\n"
-"X-Poedit-SearchPath-2: clientgui/mac\n"
-"X-Poedit-SearchPath-3: clientgui/mac\n"
-
-# 81%
-#: clientgui/AccountInfoPage.cpp:387
+"Language: tr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: AccountInfoPage.cpp:387
 #, c-format
 msgid "Identify your account at %s"
 msgstr "%s için hesap bilgilerinizi girin"
 
-#: clientgui/AccountInfoPage.cpp:393
+#: AccountInfoPage.cpp:393
 msgid ""
 "Please enter your account information\n"
 "(to create an account, visit the project's web site)"
-msgstr ""
-"Lütfen hesap bilgilerinizi girin\n"
-"(bir hesap yaratmak için, projenin sitesini ziyaret edin)"
+msgstr "Lütfen hesap bilgilerinizi girin\n(bir hesap yaratmak için, projenin sitesini ziyaret edin)"
 
-#: clientgui/AccountInfoPage.cpp:397
+#: AccountInfoPage.cpp:397
 msgid ""
 "This project is not currently accepting new accounts.\n"
 "You can add it only if you already have an account."
-msgstr ""
-"Bu proje şu anda yeni hesapları kabul etmiyor.\n"
-"Yalnızca, mevcut bir hesabınız varsa projeyi ekleyebilirsiniz."
+msgstr "Bu proje şu anda yeni hesapları kabul etmiyor.\nYalnızca, mevcut bir hesabınız varsa projeyi ekleyebilirsiniz."
 
-#: clientgui/AccountInfoPage.cpp:401
+#: AccountInfoPage.cpp:401
 msgid "Are you already running this project?"
 msgstr "Bu projeye daha önce üye oldunuz mu?"
 
-#: clientgui/AccountInfoPage.cpp:405
+#: AccountInfoPage.cpp:405
 msgid "&No, new user"
 msgstr "&Hayır, yeni kullanıcıyım"
 
-#: clientgui/AccountInfoPage.cpp:408
+#: AccountInfoPage.cpp:408
 msgid "&Yes, existing user"
 msgstr "&Evet, bilgilerimi gireceğim"
 
-#: clientgui/AccountInfoPage.cpp:413
+#: AccountInfoPage.cpp:413
 msgid ""
 "We were not able to set up your account information\n"
 "automatically.\n"
@@ -66,501 +54,469 @@ msgid ""
 "Please click on the 'Find login information' link\n"
 "below to find out what to put in the email address and\n"
 "password fields."
-msgstr ""
-"Hesap bilginizi otomatik olarak ayarlayamadık.\n"
-"\n"
-"Lütfen, e-posta adresi ve parola bölümlerine ne yazılması\n"
-"gerektiğini bulmak için aşağıdaki 'Giriş bilgisini bul' \n"
-"bağlantısına tıklayın."
+msgstr "Hesap bilginizi otomatik olarak ayarlayamadık.\n\nLütfen, e-posta adresi ve parola bölümlerine ne yazılması\ngerektiğini bulmak için aşağıdaki 'Giriş bilgisini bul' \nbağlantısına tıklayın."
 
-#: clientgui/AccountInfoPage.cpp:416
+#: AccountInfoPage.cpp:416
 msgid "Find login information"
 msgstr "Giriş bilgilerini bul"
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:649
+#: AccountInfoPage.cpp:436 AccountInfoPage.cpp:641
 msgid "&Password:"
 msgstr "&Parola:"
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:673
+#: AccountInfoPage.cpp:443 AccountInfoPage.cpp:665
 msgid "Choose a &password:"
 msgstr "Bir &parola yazın:"
 
-#: clientgui/AccountInfoPage.cpp:446
+#: AccountInfoPage.cpp:446
 msgid "C&onfirm password:"
 msgstr "Parolayı &tekrar yazın:"
 
-#: clientgui/AccountInfoPage.cpp:453
+#: AccountInfoPage.cpp:453
 #, c-format
 msgid "Are you already running %s?"
 msgstr "Zaten %s projesini çalıştırıyor musunuz?"
 
-#: clientgui/AccountInfoPage.cpp:482
+#: AccountInfoPage.cpp:482
 msgid "&Username:"
 msgstr "&Kullanıcı adı:"
 
-#: clientgui/AccountInfoPage.cpp:511
-msgid "&Email address or LDAP ID:"
-msgstr ""
-
-#: clientgui/AccountInfoPage.cpp:515
+#: AccountInfoPage.cpp:508
 msgid "&Email address:"
 msgstr "&E-posta adresi:"
 
-#: clientgui/AccountInfoPage.cpp:523
+#: AccountInfoPage.cpp:515
 #, c-format
 msgid "minimum length %d"
 msgstr "en az %d karakter"
 
-#: clientgui/AccountInfoPage.cpp:530
+#: AccountInfoPage.cpp:522
 msgid "Forgot your password?"
 msgstr "Parolanızı mı unuttunuz?"
 
-#: clientgui/AccountInfoPage.cpp:537
+#: AccountInfoPage.cpp:529
 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 ""
-"Eğer bu hesap yöneticisine henüz kayıtlı değilseniz, devam\n"
-"etmeden önce kaydolun.  Lütfen kaydolmak ya da unuttuğunuz\n"
-"parolayı bulmak için aşağıdaki bağlantıya tıklayın."
+msgstr "Eğer bu hesap yöneticisine henüz kayıtlı değilseniz, devam\netmeden önce kaydolun.  Lütfen kaydolmak ya da unuttuğunuz\nparolayı bulmak için aşağıdaki bağlantıya tıklayın."
 
-#: clientgui/AccountInfoPage.cpp:540
+#: AccountInfoPage.cpp:532
 msgid "Account manager web site"
 msgstr "Hesap Yöneticisi sitesi"
 
-#: clientgui/AccountInfoPage.cpp:582
+#: AccountInfoPage.cpp:574 WelcomePage.cpp:348
 msgid "Add project"
 msgstr "Proje ekle"
 
-#: clientgui/AccountInfoPage.cpp:584
+#: AccountInfoPage.cpp:576
 msgid "Update account manager"
 msgstr "Hesap yöneticisini güncelle"
 
-#: clientgui/AccountInfoPage.cpp:586
+#: AccountInfoPage.cpp:578 WelcomePage.cpp:307 WelcomePage.cpp:321
 msgid "Use account manager"
 msgstr "Hesap yöneticisi kullan"
 
-#: clientgui/AccountInfoPage.cpp:593
+#: AccountInfoPage.cpp:585
 msgid "Please enter a user name."
 msgstr "Lütfen bir kullanıcı adı yazın."
 
-#: clientgui/AccountInfoPage.cpp:595
+#: AccountInfoPage.cpp:587
 msgid "Please enter an email address."
 msgstr "Lütfen bir e-posta adresi yazın."
 
-#: clientgui/AccountInfoPage.cpp:605
+#: AccountInfoPage.cpp:597
 #, c-format
 msgid "Please enter a password of at least %d characters."
 msgstr "Lütfen en az %d karakterden oluşan bir parola yazın."
 
-#: clientgui/AccountInfoPage.cpp:615
-msgid "The password and confirmation password do not match. Please type them again."
+#: AccountInfoPage.cpp:607
+msgid ""
+"The password and confirmation password do not match. Please type them again."
 msgstr "Parola ve parola doğrulaması birbirini tutmuyor. Lütfen tekrar yazın."
 
-#: clientgui/AccountManagerInfoPage.cpp:272
+#: AccountManagerInfoPage.cpp:272
 msgid "Choose an account manager"
 msgstr "Bir hesap yöneticisi seçin"
 
-#: clientgui/AccountManagerInfoPage.cpp:275
+#: AccountManagerInfoPage.cpp:275
 msgid ""
 "To choose an account manager, click its name or \n"
 "type its URL below."
-msgstr ""
-"Bir hesap yöneticisi seçmek için ismine tıklayın ya da \n"
-"aşağıya internet adresini girin."
+msgstr "Bir hesap yöneticisi seçmek için ismine tıklayın ya da \naşağıya internet adresini girin."
 
-#: clientgui/AccountManagerInfoPage.cpp:279
+#: AccountManagerInfoPage.cpp:279
 msgid "Account manager details:"
 msgstr "Hesap Yöneticisi detayları:"
 
-#: clientgui/AccountManagerInfoPage.cpp:283
+#: AccountManagerInfoPage.cpp:283
 msgid "Account manager &URL:"
 msgstr "Hesap Yöneticisi &adresi:"
 
-#: clientgui/AccountManagerInfoPage.cpp:287
+#: AccountManagerInfoPage.cpp:287
 msgid "Open web page"
 msgstr "İnternet sitesini aç"
 
-#: clientgui/AccountManagerInfoPage.cpp:290
+#: AccountManagerInfoPage.cpp:290
 msgid "Visit this account manager's web site"
 msgstr "Bu Hesap Yöneticisinin internet sitesini ziyaret edin"
 
-#: clientgui/AccountManagerProcessingPage.cpp:186
-#: clientgui/AccountManagerPropertiesPage.cpp:192
+#: AccountManagerProcessingPage.cpp:187 AccountManagerPropertiesPage.cpp:193
 #, c-format
 msgid "Communicating with %s."
 msgstr "%s ile bağlantı kuruluyor."
 
-#: clientgui/AccountManagerProcessingPage.cpp:193
-#: clientgui/AccountManagerPropertiesPage.cpp:199
+#: AccountManagerProcessingPage.cpp:194 AccountManagerPropertiesPage.cpp:200
 msgid "Communicating with server."
 msgstr "Sunucu ile bağlantı kuruluyor."
 
-#: clientgui/AccountManagerProcessingPage.cpp:198
-#: clientgui/AccountManagerPropertiesPage.cpp:204
+#: AccountManagerProcessingPage.cpp:199 AccountManagerPropertiesPage.cpp:205
 msgid "Please wait..."
 msgstr "Lütfen bekleyin..."
 
-#: clientgui/AccountManagerProcessingPage.cpp:325
+#: AccountManagerProcessingPage.cpp:326
 msgid "An internal server error has occurred.\n"
 msgstr "Sunucuda dahili bir hata meydana geldi.\n"
 
-#: clientgui/AdvancedFrame.cpp:96
+#: AdvancedFrame.cpp:95
 msgid "Connected"
 msgstr "Bağlandı"
 
-#: clientgui/AdvancedFrame.cpp:104
+#: AdvancedFrame.cpp:103
 msgid "Disconnected"
 msgstr "Bağlantı kesildi"
 
-#: clientgui/AdvancedFrame.cpp:318
+#: AdvancedFrame.cpp:322 sg_BoincSimpleFrame.cpp:119
 #, c-format
 msgid "Close the %s window"
 msgstr "%s penceresini kapatır."
 
-#: clientgui/AdvancedFrame.cpp:321
+#: AdvancedFrame.cpp:325 sg_BoincSimpleFrame.cpp:122
 msgid "&Close Window"
 msgstr "&Pencereyi kapat"
 
-#: clientgui/AdvancedFrame.cpp:332
-#: clientgui/AdvancedFrame.cpp:339
-#: clientgui/AdvancedFrame.cpp:346
+#: AdvancedFrame.cpp:336 AdvancedFrame.cpp:343 AdvancedFrame.cpp:350
 #, c-format
 msgid "Exit %s"
 msgstr "%s'dan çık"
 
-#: clientgui/AdvancedFrame.cpp:359
-msgid "Preferences..."
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:368
+#: AdvancedFrame.cpp:371
 msgid "&Notices\tCtrl+Shift+N"
 msgstr "&Bildirimler\tCtrl+Shift+N"
 
-#: clientgui/AdvancedFrame.cpp:369
+#: AdvancedFrame.cpp:372
 msgid "Display notices"
 msgstr "Bildirimleri görüntüler."
 
-#: clientgui/AdvancedFrame.cpp:374
+#: AdvancedFrame.cpp:377
 msgid "&Projects\tCtrl+Shift+P"
 msgstr "&Projeler\tCtrl+Shift+P"
 
-#: clientgui/AdvancedFrame.cpp:375
+#: AdvancedFrame.cpp:378
 msgid "Display projects"
 msgstr "Projeleri görüntüler."
 
-#: clientgui/AdvancedFrame.cpp:380
+#: AdvancedFrame.cpp:383
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr "İ&şler\tCtrl+Shift+T"
 
-#: clientgui/AdvancedFrame.cpp:381
+#: AdvancedFrame.cpp:384
 msgid "Display tasks"
 msgstr "İşleri görüntüler."
 
-#: clientgui/AdvancedFrame.cpp:386
+#: AdvancedFrame.cpp:389
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr "&Aktarımlar\tCtrl+Shift+X"
 
-#: clientgui/AdvancedFrame.cpp:387
+#: AdvancedFrame.cpp:390
 msgid "Display transfers"
 msgstr "Aktarımları görüntüler."
 
-#: clientgui/AdvancedFrame.cpp:392
+#: AdvancedFrame.cpp:395
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "İ&statistikler\tCtrl+Shift+S"
 
-#: clientgui/AdvancedFrame.cpp:393
+#: AdvancedFrame.cpp:396
 msgid "Display statistics"
 msgstr "İstatistikleri görüntüler."
 
-#: clientgui/AdvancedFrame.cpp:398
+#: AdvancedFrame.cpp:401
 msgid "&Disk usage\tCtrl+Shift+D"
 msgstr "&Disk kullanımı\tCtrl+Shift+D"
 
-#: clientgui/AdvancedFrame.cpp:399
+#: AdvancedFrame.cpp:402
 msgid "Display disk usage"
 msgstr "Disk kullanımını görüntüler."
 
-#: clientgui/AdvancedFrame.cpp:406
+#: AdvancedFrame.cpp:409
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr "&Basit görünüm...\tCtrl+Shift+V"
 
-#: clientgui/AdvancedFrame.cpp:407
+#: AdvancedFrame.cpp:410
 msgid "Display the simple graphical interface."
 msgstr "Basit grafiksel arayüzü görüntüler."
 
-#: clientgui/AdvancedFrame.cpp:421
+#: AdvancedFrame.cpp:424
 msgid "&Add project or account manager..."
 msgstr "&Proje ya da hesap yöneticisi ekle..."
 
-#: clientgui/AdvancedFrame.cpp:422
+#: AdvancedFrame.cpp:425 sg_ProjectPanel.cpp:76
 msgid "Volunteer for any or all of 30+ projects in many areas of science"
 msgstr "Bilimin pek çok alanından 30'dan fazla projeden birisi için gönüllü olun"
 
-#: clientgui/AdvancedFrame.cpp:426
+#: AdvancedFrame.cpp:429
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "%s ile &eşitle"
 
-#: clientgui/AdvancedFrame.cpp:430
+#: AdvancedFrame.cpp:433
 #, c-format
 msgid "Get current settings from %s"
 msgstr "Güncel ayarları %s hesap yöneticisinden alır."
 
-#: clientgui/AdvancedFrame.cpp:440
+#: AdvancedFrame.cpp:443
 msgid "&Add project..."
 msgstr "&Proje ekle..."
 
-#: clientgui/AdvancedFrame.cpp:441
+#: AdvancedFrame.cpp:444
 msgid "Add a project"
 msgstr "Bir proje eklemenizi sağlar."
 
-#: clientgui/AdvancedFrame.cpp:444
+#: AdvancedFrame.cpp:447
 #, c-format
 msgid "S&top using %s..."
 msgstr "%s kullanmayı durdur..."
 
-#: clientgui/AdvancedFrame.cpp:450
+#: AdvancedFrame.cpp:453
 msgid "Remove this computer from account manager control."
 msgstr "Bu bilgisayarı hesap yöneticisi kontrolünden çıkarır."
 
-#: clientgui/AdvancedFrame.cpp:455
+#: AdvancedFrame.cpp:458 sg_BoincSimpleFrame.cpp:178
 msgid "&Options..."
 msgstr "&Seçenekler..."
 
-#: clientgui/AdvancedFrame.cpp:456
+#: AdvancedFrame.cpp:459 sg_BoincSimpleFrame.cpp:179
 msgid "Configure display options and proxy settings"
 msgstr "Arayüz seçeneklerini ve vekil sunucu ayarlarını yapılandırabileceğiniz pencereyi açar."
 
-#: clientgui/AdvancedFrame.cpp:460
+#: AdvancedFrame.cpp:463 sg_BoincSimpleFrame.cpp:172
 msgid "Computing &preferences..."
 msgstr "&Hesaplama tercihleri..."
 
-#: clientgui/AdvancedFrame.cpp:461
+#: AdvancedFrame.cpp:464 sg_BoincSimpleFrame.cpp:173
 msgid "Configure computing preferences"
 msgstr "İşlerin çalışmasıyla ilgili bu bilgisayara ait tercihleri ayarlayabileceğiniz pencereyi açar."
 
-#: clientgui/AdvancedFrame.cpp:469
+#: AdvancedFrame.cpp:472
 msgid "&Run always"
 msgstr "&Daima çalış"
 
-#: clientgui/AdvancedFrame.cpp:470
+#: AdvancedFrame.cpp:473
 msgid "Allow work regardless of preferences"
 msgstr "Ayarları göz önüne almadan işleri sürekli çalıştırır."
 
-#: clientgui/AdvancedFrame.cpp:474
+#: AdvancedFrame.cpp:477
 msgid "Run based on &preferences"
 msgstr "&Tercihlere göre çalış"
 
-#: clientgui/AdvancedFrame.cpp:475
+#: AdvancedFrame.cpp:478
 msgid "Allow work according to preferences"
 msgstr "İşleri tercihlerdeki ayarlarınıza göre çalıştırır."
 
-#: clientgui/AdvancedFrame.cpp:479
+#: AdvancedFrame.cpp:482
 msgid "&Suspend"
 msgstr "&Durdur"
 
-#: clientgui/AdvancedFrame.cpp:480
+#: AdvancedFrame.cpp:483
 msgid "Stop work regardless of preferences"
 msgstr "Ayarları göz önüne almadan işlerin çalışmasını durdurur."
 
-#: clientgui/AdvancedFrame.cpp:505
+#: AdvancedFrame.cpp:508
 msgid "Use GPU always"
 msgstr "GPU'yu &daima kullan"
 
-#: clientgui/AdvancedFrame.cpp:506
+#: AdvancedFrame.cpp:509
 msgid "Allow GPU work regardless of preferences"
 msgstr "Ayarları göz önüne almadan GPU'yu sürekli kullanır."
 
-#: clientgui/AdvancedFrame.cpp:510
+#: AdvancedFrame.cpp:513
 msgid "Use GPU based on preferences"
 msgstr "GPU'yu tercihlere göre kullan"
 
-#: clientgui/AdvancedFrame.cpp:511
+#: AdvancedFrame.cpp:514
 msgid "Allow GPU work according to preferences"
 msgstr "GPU'yu tercihlerdeki ayarlarınıza göre kullanır."
 
-#: clientgui/AdvancedFrame.cpp:515
+#: AdvancedFrame.cpp:518
 msgid "Suspend GPU"
 msgstr "GPU kullanımını durdur"
 
-#: clientgui/AdvancedFrame.cpp:516
+#: AdvancedFrame.cpp:519
 msgid "Stop GPU work regardless of preferences"
 msgstr "Ayarları göz önüne almadan GPU'nun kullanımını durdurur."
 
-#: clientgui/AdvancedFrame.cpp:540
+#: AdvancedFrame.cpp:543
 msgid "Network activity always available"
 msgstr "Ağ iletişimi daima mümkün"
 
-#: clientgui/AdvancedFrame.cpp:541
+#: AdvancedFrame.cpp:544
 msgid "Allow network activity regardless of preferences"
 msgstr "Ayarları göz önüne almadan ağ iletişimine izin verir."
 
-#: clientgui/AdvancedFrame.cpp:545
+#: AdvancedFrame.cpp:548
 msgid "Network activity based on preferences"
 msgstr "Tercihlere göre ağ iletişimi"
 
-#: clientgui/AdvancedFrame.cpp:546
+#: AdvancedFrame.cpp:549
 msgid "Allow network activity according to preferences"
 msgstr "Tercihlerdeki ayarlara göre ağ iletişimi yapar."
 
-#: clientgui/AdvancedFrame.cpp:550
+#: AdvancedFrame.cpp:553
 msgid "Network activity suspended"
 msgstr "Ağ iletişimini durdur"
 
-#: clientgui/AdvancedFrame.cpp:551
+#: AdvancedFrame.cpp:554
 msgid "Stop BOINC network activity"
 msgstr "BOINC'in tüm ağ iletişimini durdurur."
 
-#: clientgui/AdvancedFrame.cpp:561
+#: AdvancedFrame.cpp:564
 #, c-format
 msgid "Connect to another computer running %s"
 msgstr "%s çalıştıran başka bir bilgisayarı seçip bağlanmayı sağlar."
 
-#: clientgui/AdvancedFrame.cpp:566
+#: AdvancedFrame.cpp:569
 msgid "Select computer..."
 msgstr "Bilgisayar seç ve bağlan..."
 
-#: clientgui/AdvancedFrame.cpp:571
+#: AdvancedFrame.cpp:574
 msgid "Shut down connected client..."
 msgstr "Bağlı olan istemciyi kapat..."
 
-#: clientgui/AdvancedFrame.cpp:572
+#: AdvancedFrame.cpp:575
 msgid "Shut down the currently connected client"
 msgstr "Şu anda bağlı olan istemciyi kapatır."
 
-#: clientgui/AdvancedFrame.cpp:576
+#: AdvancedFrame.cpp:579
 msgid "Run CPU &benchmarks"
 msgstr "&İşlemci testlerini çalıştır"
 
-#: clientgui/AdvancedFrame.cpp:577
+#: AdvancedFrame.cpp:580
 msgid "Runs BOINC CPU benchmarks"
 msgstr "BOINC'in işlemci (CPU) testlerini çalıştırır. Sonuçları Olay Günlüğü'nde görebilirsiniz."
 
-#: clientgui/AdvancedFrame.cpp:581
+#: AdvancedFrame.cpp:584
 msgid "Do network communication"
 msgstr "Ağ iletişimini gerçekleştir"
 
-#: clientgui/AdvancedFrame.cpp:582
+#: AdvancedFrame.cpp:585
 msgid "Do all pending network communication"
 msgstr "Beklemedeki tüm ağ iletişimini hemen gerçekleştirir."
 
-# 94%
-#: clientgui/AdvancedFrame.cpp:586
+#: AdvancedFrame.cpp:589
 msgid "Read config files"
 msgstr "Yapılandırma dosyalarını oku"
 
-#: clientgui/AdvancedFrame.cpp:587
-msgid "Read configuration info from cc_config.xml and any app_config.xml files"
+#: AdvancedFrame.cpp:590
+msgid ""
+"Read configuration info from cc_config.xml and any app_config.xml files"
 msgstr "Yapılandırma bilgisini cc_config.xml ve any app_config.xml dosyalarından oku"
 
-#: clientgui/AdvancedFrame.cpp:591
+#: AdvancedFrame.cpp:594
 msgid "Read local prefs file"
 msgstr "Yerel tercih dosyasını oku"
 
-#: clientgui/AdvancedFrame.cpp:592
+#: AdvancedFrame.cpp:595
 msgid "Read preferences from global_prefs_override.xml."
 msgstr "Yerel tercihleri global_prefs_override.xml dosyasından okur."
 
-#: clientgui/AdvancedFrame.cpp:597
+#: AdvancedFrame.cpp:600
 #, c-format
 msgid "Launch another instance of %s..."
 msgstr "Bu bilgisayarda %s'ın başka bir kopyasını çalıştırır."
 
-#: clientgui/AdvancedFrame.cpp:601
+#: AdvancedFrame.cpp:604
 #, c-format
 msgid "Launch another %s"
 msgstr "Başka bir %s çalıştır"
 
-#: clientgui/AdvancedFrame.cpp:611
+#: AdvancedFrame.cpp:614
 msgid "Event Log...\tCtrl+Shift+E"
 msgstr "Olay günlüğü...\tCtrl+Shift+E"
 
-#: clientgui/AdvancedFrame.cpp:612
+#: AdvancedFrame.cpp:615
 msgid "Display diagnostic messages."
 msgstr "Tanılama mesajlarını görüntüler."
 
-#: clientgui/AdvancedFrame.cpp:616
-msgid "Event Log Diagnostic Flags...\tCtrl+Shift+F"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:617
-msgid "Enable or disable various diagnostic messages"
-msgstr ""
-
-#: clientgui/AdvancedFrame.cpp:626
+#: AdvancedFrame.cpp:625 sg_BoincSimpleFrame.cpp:188
 #, c-format
 msgid "%s &help"
 msgstr "%s &yardım"
 
-#: clientgui/AdvancedFrame.cpp:632
+#: AdvancedFrame.cpp:631 sg_BoincSimpleFrame.cpp:194
 #, c-format
 msgid "Show information about %s"
 msgstr "Gönüllü kullanıcılardan %s hakkında yardım almanızı sağlar."
 
-#: clientgui/AdvancedFrame.cpp:644
+#: AdvancedFrame.cpp:643
 #, c-format
 msgid "&%s help"
 msgstr "&%s yardım"
 
-#: clientgui/AdvancedFrame.cpp:650
+#: AdvancedFrame.cpp:649 sg_BoincSimpleFrame.cpp:212
 #, c-format
 msgid "Show information about the %s"
 msgstr "%s yardım sitesini açar."
 
-#: clientgui/AdvancedFrame.cpp:662
+#: AdvancedFrame.cpp:661 sg_BoincSimpleFrame.cpp:224
 #, c-format
 msgid "%s &web site"
 msgstr "%s &internet sitesi"
 
-#: clientgui/AdvancedFrame.cpp:668
+#: AdvancedFrame.cpp:667 sg_BoincSimpleFrame.cpp:230
 #, c-format
 msgid "Show information about BOINC and %s"
 msgstr "BOINC ve %s resmi internet sitesini açar."
 
-#: clientgui/AdvancedFrame.cpp:680
-#: clientgui/BOINCTaskBar.cpp:544
+#: AdvancedFrame.cpp:679 BOINCTaskBar.cpp:530 sg_BoincSimpleFrame.cpp:242
 #, c-format
 msgid "&About %s..."
 msgstr "&%s hakkında..."
 
-#: clientgui/AdvancedFrame.cpp:686
+#: AdvancedFrame.cpp:685 sg_BoincSimpleFrame.cpp:248
 msgid "Licensing and copyright information."
 msgstr "Sürüm, lisans, telif hakkı ve çeviri bilgisini görüntüler."
 
-#: clientgui/AdvancedFrame.cpp:693
+#: AdvancedFrame.cpp:692 sg_BoincSimpleFrame.cpp:255
 msgid "&File"
 msgstr "&Dosya"
 
-#: clientgui/AdvancedFrame.cpp:697
+#: AdvancedFrame.cpp:696 sg_BoincSimpleFrame.cpp:259
 msgid "&View"
 msgstr "&Görünüm"
 
-#: clientgui/AdvancedFrame.cpp:701
+#: AdvancedFrame.cpp:700 sg_BoincSimpleFrame.cpp:263
 msgid "&Tools"
 msgstr "&Araçlar"
 
-#: clientgui/AdvancedFrame.cpp:705
+#: AdvancedFrame.cpp:704
 msgid "&Activity"
 msgstr "&Çalışma"
 
-#: clientgui/AdvancedFrame.cpp:709
+#: AdvancedFrame.cpp:708
 msgid "A&dvanced"
 msgstr "&Gelişmiş"
 
-#: clientgui/AdvancedFrame.cpp:713
+#: AdvancedFrame.cpp:712 DlgEventLog.cpp:332 sg_BoincSimpleFrame.cpp:267
+#: wizardex.cpp:374 wizardex.cpp:381
 msgid "&Help"
 msgstr "&Yardım"
 
-#: clientgui/AdvancedFrame.cpp:1185
+#: AdvancedFrame.cpp:1199
 #, c-format
 msgid "%s - Stop using %s"
 msgstr "%s - %s kullanmayı durdur"
 
-#: clientgui/AdvancedFrame.cpp:1190
+#: AdvancedFrame.cpp:1204
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -568,256 +524,222 @@ msgid ""
 "but you'll have to manage projects manually.\n"
 "\n"
 "Do you want to stop using %s?"
-msgstr ""
-"Eğer %s kullanmayı durdurursanız,\n"
-"mevcut tüm projeleriniz korunacak, fakat,\n"
-"projeleri elle yönetmeniz gerekecek.\n"
-"\n"
-"%s kullanmayı durdurmak istiyor musunuz?"
+msgstr "Eğer %s kullanmayı durdurursanız,\nmevcut tüm projeleriniz korunacak, fakat,\nprojeleri elle yönetmeniz gerekecek.\n\n%s kullanmayı durdurmak istiyor musunuz?"
 
-#: clientgui/AdvancedFrame.cpp:1397
+#: AdvancedFrame.cpp:1401
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s - Bağlı istemciyi kapat..."
 
-#: clientgui/AdvancedFrame.cpp:1406
+#: AdvancedFrame.cpp:1410
 #, c-format
 msgid ""
 "%s will shut down the current client\n"
 "and prompt you for another host to connect to."
-msgstr ""
-"%s şu anda bağlı olan istemciyi kapatacak ve\n"
-"sizi başka birine bağlanmanız için uyaracak."
+msgstr "%s şu anda bağlı olan istemciyi kapatacak ve\nsizi başka birine bağlanmanız için uyaracak."
 
-#: clientgui/AdvancedFrame.cpp:1806
+#: AdvancedFrame.cpp:1745 DlgAbout.cpp:119
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: clientgui/AdvancedFrame.cpp:1815
+#: AdvancedFrame.cpp:1754
 #, c-format
 msgid "%s has successfully added %s"
 msgstr "%s başarıyla %s'e eklendi."
 
-#: clientgui/AdvancedFrame.cpp:1953
+#: AdvancedFrame.cpp:1893
 #, c-format
 msgid "%s - (%s)"
 msgstr "%s - (%s)"
 
-#: clientgui/AdvancedFrame.cpp:1957
+#: AdvancedFrame.cpp:1897
 #, c-format
 msgid "Connecting to %s"
 msgstr "%s istemcisine bağlanıyor"
 
-#: clientgui/AdvancedFrame.cpp:1960
+#: AdvancedFrame.cpp:1900
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "%s istemcisine bağlı (%s)"
 
-#: clientgui/AlreadyExistsPage.cpp:184
+#: AlreadyExistsPage.cpp:184
 msgid "Username already in use"
 msgstr "Kullanıcı adı zaten kullanımda"
 
-#: clientgui/AlreadyExistsPage.cpp:187
+#: AlreadyExistsPage.cpp:187
 msgid ""
 "An account with that username already exists and has a\n"
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"Bu kullanıcı adıyla bir hesap var ve\n"
-"girdiğinizden farklı bir parolaya sahip.\n"
-"\n"
-"Lütfen projenin sitesini ziyaret edip, yönergeleri izleyin."
+msgstr "Bu kullanıcı adıyla bir hesap var ve\ngirdiğinizden farklı bir parolaya sahip.\n\nLütfen projenin sitesini ziyaret edip, yönergeleri izleyin."
 
-#: clientgui/AlreadyExistsPage.cpp:191
+#: AlreadyExistsPage.cpp:191
 msgid "Email address already in use"
 msgstr "E-posta adresi zaten kullanımda"
 
-#: clientgui/AlreadyExistsPage.cpp:194
+#: AlreadyExistsPage.cpp:194
 msgid ""
 "An account with that email address already exists and has a\n"
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"Bu e-posta adresiyle bir hesap var ve\n"
-"girdiğinizden farklı bir parolaya sahip.\n"
-"\n"
-"Lütfen projenin sitesini ziyaret edip, yönergeleri izleyin."
+msgstr "Bu e-posta adresiyle bir hesap var ve\ngirdiğinizden farklı bir parolaya sahip.\n\nLütfen projenin sitesini ziyaret edip, yönergeleri izleyin."
 
-#: clientgui/AsyncRPC.cpp:1031
+#: AsyncRPC.cpp:1031
 msgid "Communicating with BOINC client.  Please wait ..."
 msgstr "BOINC istemcisine bağlanılıyor.  Lütfen bekleyin..."
 
-#: clientgui/AsyncRPC.cpp:1034
+#: AsyncRPC.cpp:1034
 #, c-format
 msgid "&Quit %s"
 msgstr "%s'den &ayrıl"
 
-#: clientgui/AsyncRPC.cpp:1036
+#: AsyncRPC.cpp:1036
 #, c-format
 msgid "E&xit %s"
 msgstr "%s'den &çık"
 
-#: clientgui/AsyncRPC.cpp:1040
+#: AsyncRPC.cpp:1040
 #, c-format
 msgid "%s - Communication"
 msgstr "%s - İletişim"
 
-#: clientgui/AsyncRPC.cpp:1056
+#: AsyncRPC.cpp:1056 DlgAdvPreferencesBase.cpp:107 sg_DlgPreferences.cpp:433
 msgid "Cancel"
 msgstr "İptal"
 
-#: clientgui/BOINCBaseFrame.cpp:504
+#: BOINCBaseFrame.cpp:505
 #, c-format
 msgid "%s - Connection Error"
 msgstr "%s - Bağlantı Hatası"
 
-#: clientgui/BOINCBaseFrame.cpp:513
+#: BOINCBaseFrame.cpp:514
 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 ""
-"İstemciyi yönetmek için yetkili durumda değilsiniz.\n"
-"Lüfen 'boinc_users' yerel kullanıcı grubuna dahil olmak için yöneticinizle temasa geçin."
+msgstr "İstemciyi yönetmek için yetkili durumda değilsiniz.\nLüfen 'boinc_users' yerel kullanıcı grubuna dahil olmak için yöneticinizle temasa geçin."
 
-#: clientgui/BOINCBaseFrame.cpp:522
+#: BOINCBaseFrame.cpp:523
 msgid ""
 "Authorization failed connecting to running client.\n"
 "Make sure you start this program in the same directory as the client."
-msgstr ""
-"Çalışan istemciye bağlanmak için yetkilendirilme başarısız.\n"
-"Bu programın istemciyle aynı klasörde çalıştırıldığından emin olun."
+msgstr "Çalışan istemciye bağlanmak için yetkilendirilme başarısız.\nBu programın istemciyle aynı klasörde çalıştırıldığından emin olun."
 
-#: clientgui/BOINCBaseFrame.cpp:524
+#: BOINCBaseFrame.cpp:525
 msgid "Authorization failed connecting to running client."
 msgstr "Çalışan istemciye bağlanmak için yetkilendirilme başarısız."
 
-#: clientgui/BOINCBaseFrame.cpp:532
+#: BOINCBaseFrame.cpp:533
 msgid "The password you have provided is incorrect, please try again."
 msgstr "Belirttiğiniz parola hatalı, lütfen tekrar deneyin."
 
-#: clientgui/BOINCBaseFrame.cpp:576
+#: BOINCBaseFrame.cpp:577
 #, c-format
 msgid "%s - Connection Failed"
 msgstr "%s - Bağlantı Başarısız"
 
-#: clientgui/BOINCBaseFrame.cpp:585
+#: BOINCBaseFrame.cpp:586
 #, c-format
 msgid ""
 "%s is not able to connect to a %s client.\n"
 "Would you like to try to connect again?"
-msgstr ""
-"%s, %s istemcisine bağlanamıyor.\n"
-"Bağlanmayı yeniden denemek ister misiniz?"
+msgstr "%s, %s istemcisine bağlanamıyor.\nBağlanmayı yeniden denemek ister misiniz?"
 
-#: clientgui/BOINCBaseFrame.cpp:621
+#: BOINCBaseFrame.cpp:622
 #, c-format
 msgid "%s - Daemon Start Failed"
 msgstr "%s - Hizmet İşlemi Başlatılamadı"
 
-#: clientgui/BOINCBaseFrame.cpp:631
+#: BOINCBaseFrame.cpp:632
 #, 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, %s istemcisini başlatamıyor.\n"
-"Lütfen, Denetim Masası->Yönetimsel Araçlar->Hizmetler bölümüne gidip, BOINC Hizmeti'ni başlatın."
+msgstr "%s, %s istemcisini başlatamıyor.\nLütfen, Denetim Masası->Yönetimsel Araçlar->Hizmetler bölümüne gidip, BOINC Hizmeti'ni başlatın."
 
-#: clientgui/BOINCBaseFrame.cpp:637
+#: BOINCBaseFrame.cpp:638
 #, c-format
 msgid ""
 "%s is not able to start a %s client.\n"
 "Please start the daemon and try again."
-msgstr ""
-"%s, %s istemcisini başlatamıyor.\n"
-"Lütfen BOINC Hizmetini başlatıp yeniden deneyin."
+msgstr "%s, %s istemcisini başlatamıyor.\nLütfen BOINC Hizmetini başlatıp yeniden deneyin."
 
-#: clientgui/BOINCBaseFrame.cpp:688
+#: BOINCBaseFrame.cpp:689
 #, c-format
 msgid "%s - Connection Status"
 msgstr "%s - Bağlantı Durumu"
 
-#: clientgui/BOINCBaseFrame.cpp:699
+#: BOINCBaseFrame.cpp:700
 #, 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"
 "To connect up to your local computer please use 'localhost' as the host name."
-msgstr ""
-"%s şu anda bir %s istemcisine bağlı değil.\n"
-"Lütfen 'Gelişmiş\\Bilgisayar seç ve bağlan...' menüsünden bir %s istemcisine bağlanın.\n"
-"Kendi bilgisayarınıza bağlanmak için lütfen bigisayar adı olarak 'localhost' yazın."
+msgstr "%s şu anda bir %s istemcisine bağlı değil.\nLütfen 'Gelişmiş\\Bilgisayar seç ve bağlan...' menüsünden bir %s istemcisine bağlanın.\nKendi bilgisayarınıza bağlanmak için lütfen bigisayar adı olarak 'localhost' yazın."
 
-#: clientgui/BOINCBaseView.cpp:752
+#: BOINCBaseView.cpp:779
 msgid "Project web pages"
 msgstr "Proje internet sayfaları"
 
-#: clientgui/BOINCClientManager.cpp:573
+#: BOINCClientManager.cpp:575
 #, c-format
 msgid "%s - Unexpected Exit"
 msgstr "%s - Beklenmedik Kapanma"
 
-#: clientgui/BOINCClientManager.cpp:583
+#: BOINCClientManager.cpp:585
 #, 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 ""
-"%s istemcisi son %d dakika içinde beklenmedik şekilde 3 kez kapandı.\n"
-"Yeniden başlatmak istiyor musunuz?"
+msgstr "%s istemcisi son %d dakika içinde beklenmedik şekilde 3 kez kapandı.\nYeniden başlatmak istiyor musunuz?"
 
-#: clientgui/BOINCDialupManager.cpp:61
+#: BOINCDialupManager.cpp:61
 #, c-format
 msgid "%s - Network Status"
 msgstr "%s - Ağ Durumu"
 
-#: clientgui/BOINCDialupManager.cpp:241
+#: BOINCDialupManager.cpp:241
 #, c-format
 msgid ""
 "%s needs to connect to the Internet.\n"
 "May it do so now?"
-msgstr ""
-"%s İnternete bağlanmaya ihtiyaç duyuyor.\n"
-"Bunu şimdi yapabilir mi?"
+msgstr "%s İnternete bağlanmaya ihtiyaç duyuyor.\nBunu şimdi yapabilir mi?"
 
-#: clientgui/BOINCDialupManager.cpp:254
+#: BOINCDialupManager.cpp:254
 #, c-format
 msgid "%s is connecting to the Internet."
 msgstr "%s internete bağlanıyor."
 
-#: clientgui/BOINCDialupManager.cpp:303
+#: BOINCDialupManager.cpp:303
 #, c-format
 msgid "%s has successfully connected to the Internet."
 msgstr "%s başarıyla internete bağlandı."
 
-#: clientgui/BOINCDialupManager.cpp:331
+#: BOINCDialupManager.cpp:331
 #, c-format
 msgid "%s failed to connect to the Internet."
 msgstr "%s internete bağlanırken başarısız oldu."
 
-#: clientgui/BOINCDialupManager.cpp:372
+#: 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 şu anda internete bağlı olduğunuzu belirledi.\n"
-"Tüm projeler güncelleniyor ve aktarımlar gerçekleştiriliyor."
+msgstr "%s şu anda internete bağlı olduğunuzu belirledi.\nTüm projeler güncelleniyor ve aktarımlar gerçekleştiriliyor."
 
-#: clientgui/BOINCDialupManager.cpp:417
+#: BOINCDialupManager.cpp:417
 #, c-format
 msgid "%s has successfully disconnected from the Internet."
 msgstr "%s başarıyla internet bağlantısını kesti."
 
-#: clientgui/BOINCDialupManager.cpp:433
+#: BOINCDialupManager.cpp:433
 #, c-format
 msgid "%s failed to disconnected from the Internet."
 msgstr "%s internet bağlantısını keserken başarısız oldu."
 
-#: clientgui/BOINCGUIApp.cpp:595
+#: BOINCGUIApp.cpp:339
 #, c-format
 msgid ""
 "You currently are not authorized to manage the client.\n"
@@ -828,873 +750,798 @@ msgid ""
 " or\n"
 "  - contact your administrator to add you to the 'boinc_master'\n"
 "     user group."
-msgstr ""
-"Bu istemciyi yönetmek için yetkilendirilmemişsiniz.\n"
-"\n"
-"Bu kullanıcıyla %s çalıştırabilmek için, lütfen:\n"
-"- %s'ı, bilgisayar yöneticisi olmayan kullanıcıların da\n"
-"çalıştırabilmesi hakkındaki soruya \"Evet\" yanıtını vererek\n"
-"yeniden kurun\n"
-"ya da\n"
-"- sizi 'boinc_master' kullanıcı grubuna dahil etmesi için\n"
-"yöneticinizle temasa geçin."
-
-#: clientgui/BOINCGUIApp.cpp:601
+msgstr "Bu istemciyi yönetmek için yetkilendirilmemişsiniz.\n\nBu kullanıcıyla %s çalıştırabilmek için, lütfen:\n- %s'ı, bilgisayar yöneticisi olmayan kullanıcıların da\nçalıştırabilmesi hakkındaki soruya \"Evet\" yanıtını vererek\nyeniden kurun\nya da\n- sizi 'boinc_master' kullanıcı grubuna dahil etmesi için\nyöneticinizle temasa geçin."
+
+#: BOINCGUIApp.cpp:345
 #, c-format
 msgid ""
 "%s ownership or permissions are not set properly; please reinstall %s.\n"
 "(Error code %d"
-msgstr ""
-"%s sahipliği ya da izinleri doğru olarak ayarlanmamış; lütfen %s'i yeniden kurun.\n"
-"(Hata kodu %d"
+msgstr "%s sahipliği ya da izinleri doğru olarak ayarlanmamış; lütfen %s'i yeniden kurun.\n(Hata kodu %d"
 
-#: clientgui/BOINCGUIApp.cpp:607
+#: BOINCGUIApp.cpp:351
 msgid " at "
 msgstr " at "
 
-#: clientgui/BOINCGUIApp.cpp:610
+#: BOINCGUIApp.cpp:354 MainDocument.cpp:2484 MainDocument.cpp:2534
+#: MainDocument.cpp:2554 ViewTransfers.cpp:803
 msgid ")"
 msgstr ")"
 
-#: clientgui/BOINCGUIApp.cpp:640
+#: BOINCGUIApp.cpp:384
 msgid ""
 "A reboot is required in order for BOINC to run properly.\n"
 "Please reboot your computer and try again."
-msgstr ""
-"BOINC'in doğru çalışması için yeniden başlatma gerekiyor.\n"
-"Bilgisayarınızı yeniden başlatın ve yeniden deneyin."
+msgstr "BOINC'in doğru çalışması için yeniden başlatma gerekiyor.\nBilgisayarınızı yeniden başlatın ve yeniden deneyin."
 
-#: clientgui/BOINCGUIApp.cpp:641
+#: BOINCGUIApp.cpp:385 DlgAbout.cpp:153
 msgid "BOINC Manager"
 msgstr "BOINC Manager"
 
-#: clientgui/BOINCGUIApp.cpp:902
+#: BOINCGUIApp.cpp:572
 msgid "BOINC Manager was started by the operating system automatically"
 msgstr "BOINC Manager, işletim sistemi tarafından otomatik başlatılacak"
 
-#: clientgui/BOINCGUIApp.cpp:904
+#: BOINCGUIApp.cpp:574
 msgid "Startup BOINC so only the system tray icon is visible"
 msgstr "BOINC'i sadece sistem tepsisi simgesi görünecek şekilde başlat"
 
-#: clientgui/BOINCGUIApp.cpp:906
+#: BOINCGUIApp.cpp:576
 msgid "Directory containing the BOINC Client executable"
 msgstr "Klasör, BOINC İstemcisi çalıştırılabilir dosyalarını içerir"
 
-#: clientgui/BOINCGUIApp.cpp:907
+#: BOINCGUIApp.cpp:577
 msgid "BOINC data directory"
 msgstr "BOINC veri klasörü"
 
-#: clientgui/BOINCGUIApp.cpp:909
+#: BOINCGUIApp.cpp:579
 msgid "Host name or IP address"
 msgstr "Sunucu adı ya da IP adresi"
 
-#: clientgui/BOINCGUIApp.cpp:910
+#: BOINCGUIApp.cpp:580
 msgid "GUI RPC port number"
 msgstr "GUI RPC bağlantı noktası numarası"
 
-#: clientgui/BOINCGUIApp.cpp:911
+#: BOINCGUIApp.cpp:581
 msgid "Password"
 msgstr "Parola"
 
-#: clientgui/BOINCGUIApp.cpp:912
+#: BOINCGUIApp.cpp:582
 msgid "Startup BOINC with these optional arguments"
 msgstr "BOINC'i bu isteğe bağlı parametrelerle çalıştır"
 
-#: clientgui/BOINCGUIApp.cpp:913
+#: BOINCGUIApp.cpp:583
 msgid "disable BOINC security users and permissions"
 msgstr "BOINC güvenlik kullanıcılarını ve izinlerini devre dışı bırak"
 
-#: clientgui/BOINCGUIApp.cpp:914
+#: BOINCGUIApp.cpp:584
 msgid "set skin debugging mode to enable skin manager error messages"
 msgstr "görünüm yöneticisi hata mesajları için, görünüm hata ayıklama moduna geçin"
 
-#: clientgui/BOINCGUIApp.cpp:915
+#: BOINCGUIApp.cpp:585
 msgid "multiple instances of BOINC Manager allowed"
 msgstr "BOINC Manager'ın birden çok kopyasına izin verildi"
 
-#: clientgui/BOINCGUIApp.cpp:917
+#: BOINCGUIApp.cpp:587
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr "Kullanılmadı: XCode 4.2'deki hata için geçici çözüm"
 
-#: clientgui/BOINCGUIApp.cpp:1164
+#: BOINCGUIApp.cpp:814
 msgid "(Automatic Detection)"
 msgstr "(Otomatik Belirleme)"
 
-#: clientgui/BOINCGUIApp.cpp:1165
+#: BOINCGUIApp.cpp:815
 msgid "(Unknown)"
 msgstr "(Bilinmiyor)"
 
-#: clientgui/BOINCGUIApp.cpp:1166
+#: BOINCGUIApp.cpp:816
 msgid "(User Defined)"
 msgstr "(Kullanıcı Tanımlı)"
 
-#: clientgui/BOINCTaskBar.cpp:522
+#: BOINCTaskBar.cpp:508
 #, c-format
 msgid "Open %s Web..."
 msgstr "%s Sitesini Aç..."
 
-#: clientgui/BOINCTaskBar.cpp:529
+#: BOINCTaskBar.cpp:515
 #, c-format
 msgid "Open %s..."
 msgstr "%s'ı Aç..."
 
-#: clientgui/BOINCTaskBar.cpp:536
-#: clientgui/BOINCTaskBar.cpp:633
-#: clientgui/BOINCTaskBar.cpp:641
+#: BOINCTaskBar.cpp:522 BOINCTaskBar.cpp:619 BOINCTaskBar.cpp:627
 msgid "Snooze"
 msgstr "Hesaplamayı bir süre ertele"
 
-#: clientgui/BOINCTaskBar.cpp:538
-#: clientgui/BOINCTaskBar.cpp:660
-#: clientgui/BOINCTaskBar.cpp:668
+#: BOINCTaskBar.cpp:524 BOINCTaskBar.cpp:646 BOINCTaskBar.cpp:654
 msgid "Snooze GPU"
 msgstr "GPU ile hesaplamayı bir süre ertele"
 
-#: clientgui/BOINCTaskBar.cpp:556
+#: BOINCTaskBar.cpp:542
 msgid "E&xit"
 msgstr "&Çık"
 
-#: clientgui/BOINCTaskBar.cpp:626
+#: BOINCTaskBar.cpp:612 ViewProjects.cpp:718 ViewWork.cpp:795
+#: sg_BoincSimpleFrame.cpp:758 sg_ProjectCommandPopup.cpp:110
+#: sg_TaskCommandPopup.cpp:102
 msgid "Resume"
 msgstr "Sürdür"
 
-#: clientgui/BOINCTaskBar.cpp:653
+#: BOINCTaskBar.cpp:639
 msgid "Resume GPU"
 msgstr "GPU ile hesaplamayı sürdür"
 
-#: clientgui/BOINCTaskBar.cpp:727
+#: BOINCTaskBar.cpp:713
 msgid "Computing is enabled"
 msgstr "Hesaplama devrede"
 
-#: clientgui/BOINCTaskBar.cpp:731
+#: BOINCTaskBar.cpp:717
 msgid "Computing is suspended - "
 msgstr "Hesaplama durakladı - "
 
-#: clientgui/BOINCTaskBar.cpp:741
+#: BOINCTaskBar.cpp:727
 msgid "GPU computing is enabled"
 msgstr "GPU ile hesaplama devrede"
 
-#: clientgui/BOINCTaskBar.cpp:744
+#: BOINCTaskBar.cpp:730
 msgid "GPU computing is suspended - "
 msgstr "GPU ile hesaplama durakladı - "
 
-#: clientgui/BOINCTaskBar.cpp:753
+#: BOINCTaskBar.cpp:739
 msgid "Network is enabled"
 msgstr "Ağ iletişimi devrede"
 
-#: clientgui/BOINCTaskBar.cpp:756
+#: BOINCTaskBar.cpp:742
 msgid "Network is suspended - "
 msgstr "Ağ iletişimi durakladı - "
 
-#: clientgui/BOINCTaskBar.cpp:764
+#: BOINCTaskBar.cpp:750
 msgid "Reconnecting to client."
 msgstr "İstemciye yeniden bağlanılıyor."
 
-#: clientgui/BOINCTaskBar.cpp:766
+#: BOINCTaskBar.cpp:752
 msgid "Not connected to a client."
 msgstr "Bir istemciye bağlanmadı."
 
-#: clientgui/BOINCTaskBar.cpp:819
+#: BOINCTaskBar.cpp:805
 #, c-format
 msgid "%s Notices"
 msgstr "%s Bildirimleri"
 
-#: clientgui/BOINCTaskBar.cpp:825
+#: BOINCTaskBar.cpp:811
 msgid "There are new notices - click to view."
 msgstr "Yeni bildirimler var. Görmek için tıklayın."
 
-#: clientgui/CompletionErrorPage.cpp:199
+#: CompletionErrorPage.cpp:199
 msgid "Failed to add project"
 msgstr "Projeyi ekleme başarısız oldu"
 
-#: clientgui/CompletionErrorPage.cpp:204
+#: CompletionErrorPage.cpp:204
 msgid "Failed to update account manager"
 msgstr "Hesap yöneticisini güncelleme başarısız oldu"
 
-#: clientgui/CompletionErrorPage.cpp:208
+#: CompletionErrorPage.cpp:208
 msgid "Failed to remove account manager"
 msgstr "Hesap yöneticisini kaldırma başarısız oldu"
 
-#: clientgui/CompletionErrorPage.cpp:212
+#: CompletionErrorPage.cpp:212
 msgid "Failed to add account manager"
 msgstr "Hesap yöneticisini ekleme başarısız oldu"
 
-#: clientgui/CompletionErrorPage.cpp:221
+#: CompletionErrorPage.cpp:221
 msgid ""
 "Please try again later.\n"
 "\n"
 "Click Finish to close."
-msgstr ""
-"Lütfen daha sonra tekrar deneyin.\n"
-"\n"
-"Kapatmak için Son'u tıklayın."
+msgstr "Lütfen daha sonra tekrar deneyin.\n\nKapatmak için Son'u tıklayın."
 
-#: clientgui/CompletionErrorPage.cpp:225
-#: clientgui/CompletionPage.cpp:222
-#: clientgui/CompletionPage.cpp:242
-#: clientgui/CompletionPage.cpp:273
+#: CompletionErrorPage.cpp:225 CompletionPage.cpp:222 CompletionPage.cpp:242
+#: CompletionPage.cpp:273
 msgid "Click Finish to close."
 msgstr "Kapatmak için Son'u tıklayın."
 
-#: clientgui/CompletionErrorPage.cpp:234
+#: CompletionErrorPage.cpp:234
 msgid "Messages from server:"
 msgstr "Sunucudan mesajlar:"
 
-#: clientgui/CompletionPage.cpp:207
+#: CompletionPage.cpp:207
 msgid "Project added"
 msgstr "Proje eklendi"
 
-#: clientgui/CompletionPage.cpp:213
+#: CompletionPage.cpp:213
 msgid "This project has been successfully added."
 msgstr "Bu proje başarıyla eklendi."
 
-#: clientgui/CompletionPage.cpp:218
+#: 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 ""
-"Son'u tıkladığınızda, internet tarayıcınız kullanıcı adı ve\n"
-"tercihlerinizi belirleyebileceğiniz siteyi açacak."
+msgstr "Son'u tıkladığınızda, internet tarayıcınız kullanıcı adı ve\ntercihlerinizi belirleyebileceğiniz siteyi açacak."
 
-#: clientgui/CompletionPage.cpp:232
+#: CompletionPage.cpp:232
 #, c-format
 msgid "Update from %s completed."
 msgstr "%s'den güncelleme tamamlandı."
 
-#: clientgui/CompletionPage.cpp:236
+#: CompletionPage.cpp:236
 msgid "Update completed."
 msgstr "Güncelleme tamamlandı."
 
-#: clientgui/CompletionPage.cpp:247
+#: CompletionPage.cpp:247
 msgid "Now using account manager"
 msgstr "Şu anda hesap yöneticisi kullanılıyor"
 
-#: clientgui/CompletionPage.cpp:252
+#: CompletionPage.cpp:252
 #, c-format
 msgid "Welcome to %s!"
 msgstr "%s'e hoş geldiniz!"
 
-#: clientgui/CompletionPage.cpp:263
+#: CompletionPage.cpp:263
 #, c-format
 msgid "You are now using %s to manage accounts."
 msgstr "Şu anda hesapları yönetmek için %s kullanıyorsunuz."
 
-#: clientgui/CompletionPage.cpp:267
+#: CompletionPage.cpp:267
 msgid "You are now using this account manager."
 msgstr "Şu anda bu hesap yöneticisini kullanıyorsunuz."
 
-#: clientgui/DlgAbout.cpp:113
+#: DlgAbout.cpp:113 mac/Mac_GUI.cpp:96
 #, c-format
 msgid "About %s"
 msgstr "%s Hakkında"
 
-#: clientgui/DlgAbout.cpp:172
+#: DlgAbout.cpp:172
 msgid "Version:"
 msgstr "Sürüm:"
 
-#: clientgui/DlgAbout.cpp:180
+#: DlgAbout.cpp:180
 msgid "wxWidgets Version:"
 msgstr "wxWidgets sürümü:"
 
-#: clientgui/DlgAbout.cpp:188
+#: DlgAbout.cpp:188
 msgid "Copyright:"
 msgstr "Telif hakkı:"
 
-#: clientgui/DlgAbout.cpp:192
+#: DlgAbout.cpp:192
 msgid ""
-"(C) 2003-2014 University of California, Berkeley.\n"
+"(C) 2003-2013 University of California, Berkeley.\n"
 "All Rights Reserved."
-msgstr ""
+msgstr "(C) 2003-2013 Kaliforniya Üniversitesi, Berkeley.\nTüm hakları saklıdır."
 
-#: clientgui/DlgAbout.cpp:196
+#: DlgAbout.cpp:196
 msgid "Berkeley Open Infrastructure for Network Computing"
-msgstr ""
-"                 Türkçe çeviri: Aycan Demirel\n"
-"\n"
-"\n"
-"Berkeley Open Infrastructure for Network Computing"
+msgstr "                 Türkçe çeviri: Aycan Demirel\n\n\nBerkeley Open Infrastructure for Network Computing"
 
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:399
-#: clientgui/DlgSelectComputer.cpp:163
+#: DlgAbout.cpp:208 DlgExitMessage.cpp:173 DlgGenericMessage.cpp:120
+#: DlgOptions.cpp:396 DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "&Tamam"
 
-#: clientgui/DlgAdvPreferences.cpp:602
+#: DlgAdvPreferences.cpp:544
 msgid "invalid number"
 msgstr "geçersiz sayı"
 
-#: clientgui/DlgAdvPreferences.cpp:603
+#: DlgAdvPreferences.cpp:545
 msgid "invalid time, format is HH:MM"
 msgstr "geçersiz saat, biçim SS:DD şeklinde olmalı"
 
-#: clientgui/DlgAdvPreferences.cpp:604
+#: DlgAdvPreferences.cpp:546
 msgid "invalid time interval, format is HH:MM-HH:MM"
 msgstr "geçersiz saat aralığı, biçim SS:DD-SS:DD şeklinde olmalı"
 
-#: clientgui/DlgAdvPreferences.cpp:817
+#: DlgAdvPreferences.cpp:751
 msgid "invalid input value detected"
 msgstr "geçersiz giriş değeri belirlendi"
 
-#: clientgui/DlgAdvPreferences.cpp:819
+#: DlgAdvPreferences.cpp:753
 msgid "Validation Error"
 msgstr "Doğrulama Hatası"
 
-#: clientgui/DlgAdvPreferences.cpp:969
-#: clientgui/DlgAdvPreferences.cpp:975
-#: clientgui/DlgAdvPreferences.cpp:981
+#: DlgAdvPreferences.cpp:885 DlgAdvPreferences.cpp:891
+#: DlgAdvPreferences.cpp:897
 msgid "Applications to add"
 msgstr "Uygulama ekle"
 
-#: clientgui/DlgAdvPreferences.cpp:998
+#: DlgAdvPreferences.cpp:914
 #, c-format
 msgid "'%s' is not an executable application."
 msgstr "'%s' çalıştırılabilir bir uygulama değil."
 
-#: clientgui/DlgAdvPreferences.cpp:999
-#: clientgui/DlgAdvPreferences.cpp:1046
-#: clientgui/DlgAdvPreferences.cpp:1070
+#: DlgAdvPreferences.cpp:915 DlgAdvPreferences.cpp:962
+#: DlgAdvPreferences.cpp:986
 msgid "Add Exclusive App"
 msgstr "Ayrıcalıklı Uygulama Ekle"
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Name of application to add?"
 msgstr "Eklenecek uygulamanın ismi?"
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Add exclusive app"
 msgstr "Ayrıcalıklı uygulama ekle"
 
-#: clientgui/DlgAdvPreferences.cpp:1045
+#: DlgAdvPreferences.cpp:961
 #, c-format
 msgid "Application names must end with '%s'"
 msgstr "Uygulama isimleri mutlaka '%s' ile bitmelidir"
 
-#: clientgui/DlgAdvPreferences.cpp:1069
+#: DlgAdvPreferences.cpp:985
 #, c-format
 msgid "'%s' is already in the list."
 msgstr "'%s' zaten listede."
 
-#: clientgui/DlgAdvPreferences.cpp:1161
+#: DlgAdvPreferences.cpp:1077
 msgid ""
 "Do you really want to clear all local preferences?\n"
 "(This will not affect exclusive applications.)"
-msgstr ""
-"Tüm yerel tercihleri kaldırmak istediğinize emin misiniz?\n"
-"(Bu, ayrıcalıklı uygulama listesini silmeyecektir.)"
+msgstr "Tüm yerel tercihleri kaldırmak istediğinize emin misiniz?\n(Bu, ayrıcalıklı uygulama listesini silmeyecektir.)"
 
-#: clientgui/DlgAdvPreferences.cpp:1162
+#: DlgAdvPreferences.cpp:1078 sg_DlgPreferences.cpp:1030
 msgid "Confirmation"
 msgstr "Onaylama"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:49
+#: DlgAdvPreferencesBase.cpp:46 sg_DlgPreferences.cpp:946
 #, c-format
-msgid "%s - Computing preferences"
-msgstr ""
+msgid "%s - Preferences"
+msgstr "%s - Tercihler"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:66
+#: DlgAdvPreferencesBase.cpp:62
 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 ""
-"Bu pencere, tercihlerinizi yalnızca bu bilgisayarınız için özelleştirir.\n"
-"Tercihlerinizi kaydetmek için 'Tamam'ı tıklayın.\n"
-"İnternet tabanlı ayarlarınıza dönmek için 'Temizle'yi tıklayın (ayrıcalıklı uygulama listesi silinmez)."
+msgstr "Bu pencere, tercihlerinizi yalnızca bu bilgisayarınız için özelleştirir.\nTercihlerinizi kaydetmek için 'Tamam'ı tıklayın.\nİnternet tabanlı ayarlarınıza dönmek için 'Temizle'yi tıklayın (ayrıcalıklı uygulama listesi silinmez)."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:69
+#: DlgAdvPreferencesBase.cpp:65 sg_DlgPreferences.cpp:428
 msgid "Clear"
 msgstr "Temizle"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:70
+#: DlgAdvPreferencesBase.cpp:66
 msgid "clear all local preferences and close the dialog"
 msgstr "tüm yerel tercihleri temizler ve pencereyi kapatır"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:85
+#: DlgAdvPreferencesBase.cpp:81
 msgid "processor usage"
 msgstr "işlemci kullanımı"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:88
+#: DlgAdvPreferencesBase.cpp:84
 msgid "network usage"
 msgstr "ağ kullanımı"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:91
+#: DlgAdvPreferencesBase.cpp:87
 msgid "disk and memory usage"
 msgstr "disk ve bellek kullanımı"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:94
+#: DlgAdvPreferencesBase.cpp:90
 msgid "exclusive applications"
 msgstr "ayrıcalıklı uygulamalar"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:107
-#: clientgui/DlgDiagnosticLogFlags.cpp:104
+#: DlgAdvPreferencesBase.cpp:102 sg_DlgPreferences.cpp:424
 msgid "OK"
 msgstr "Tamam"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:108
+#: DlgAdvPreferencesBase.cpp:103
 msgid "save all values and close the dialog"
 msgstr "tüm değişiklikleri kaydeder ve pencereyi kapatır"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:114
+#: DlgAdvPreferencesBase.cpp:108
 msgid "close the dialog without saving"
 msgstr "değişiklikleri kaydetmeden pencereyi kapatır"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:118
-#: clientgui/Localization.cpp:35
-#: clientgui/Localization.cpp:121
-#: clientgui/Localization.cpp:139
+#: DlgAdvPreferencesBase.cpp:112 Localization.cpp:35 Localization.cpp:121
+#: Localization.cpp:139 sg_BoincSimpleFrame.cpp:794 sg_DlgPreferences.cpp:439
 msgid "Help"
 msgstr "Yardım"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
+#: DlgAdvPreferencesBase.cpp:113
 msgid "shows the preferences web page"
 msgstr "Tercihler internet sayfasını görüntüler"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:141
+#: DlgAdvPreferencesBase.cpp:135
 msgid "Computing allowed"
 msgstr "Hesaplama izinleri"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
+#: DlgAdvPreferencesBase.cpp:139
 msgid "While computer is on batteries"
 msgstr "Bilgisayarım pil gücündeyken hesaplama çalışsın"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:149
-msgid "check this if you want this computer to do work while it runs on batteries"
+#: DlgAdvPreferencesBase.cpp:142
+msgid ""
+"check this if you want this computer to do work while it runs on batteries"
 msgstr "bilgisayarınız pille çalışırken hesaplamaların çalışmasını istiyorsanız bunu işaretleyin"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:155
+#: DlgAdvPreferencesBase.cpp:148
 msgid "While computer is in use"
 msgstr "Bilgisayarımı kullanırken işlemci ile hesaplama çalışsın"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:158
-msgid "check this if you want this computer to do work even when you're using it"
+#: DlgAdvPreferencesBase.cpp:151
+msgid ""
+"check this if you want this computer to do work even when you're using it"
 msgstr "BOINC normalde bilgisayar boştayken çalışır. Bilgisayarınızı kullandığınız sırada da işlemci (CPU) ile hesaplamanın çalışmasını istiyorsanız bunu işaretleyin"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:164
+#: DlgAdvPreferencesBase.cpp:157
 msgid "Use GPU while computer is in use"
 msgstr "Bilgisayarımı kullanırken ekran kartı ile hesaplama çalışsın"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:167
-msgid "check this if you want your GPU to do work even when you're using the computer"
+#: DlgAdvPreferencesBase.cpp:160
+msgid ""
+"check this if you want your GPU to do work even when you're using the "
+"computer"
 msgstr "BOINC normalde bilgisayar boştayken çalışır. Bilgisayarınızı kullandığınız sırada da ekran kartınızla (GPU) hesaplamanın çalışmasını istiyorsanız bunu işaretleyin (bazı ekran kartlarıyla sistemde yavaşlama yaratabilir)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:179
+#: DlgAdvPreferencesBase.cpp:172
 msgid "Only after computer has been idle for"
 msgstr "Yalnızca bilgisayarım bu süre kadar boşta kaldığında:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:188
-msgid "do work only after you haven't used the computer for this number of minutes"
+#: DlgAdvPreferencesBase.cpp:182
+msgid ""
+"do work only after you haven't used the computer for this number of minutes"
 msgstr "bilgisayarınızı kaç dakika kullanılmadığınızda (klavye ve fare hareketi olmadığında) hesaplamanın başlamasını istediğinizi belirleyin"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:193
-#: clientgui/DlgAdvPreferencesBase.cpp:342
+#: DlgAdvPreferencesBase.cpp:187 DlgAdvPreferencesBase.cpp:336
+#: sg_DlgPreferences.cpp:417
 msgid "minutes"
 msgstr "dakika"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:212
+#: DlgAdvPreferencesBase.cpp:206
 msgid "While processor usage is less than"
 msgstr "İşlemci kullanımı bu orandan azsa:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:221
+#: DlgAdvPreferencesBase.cpp:216
 msgid "suspend work if processor usage exceeds this level"
 msgstr "BOINC dışındaki diğer programların işlemci kullanımı bu seviyeyi aşarsa, hesaplama duraklatılır"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:226
+#: DlgAdvPreferencesBase.cpp:221
 msgid "percent (0 means no restriction)"
 msgstr "% (sınırlamayı kaldırmak için 0 yazın)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:240
-#: clientgui/DlgAdvPreferencesBase.cpp:506
+#: DlgAdvPreferencesBase.cpp:235 DlgAdvPreferencesBase.cpp:496
 msgid "Every day between hours of"
 msgstr "Her gün bu saatler arasında:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: DlgAdvPreferencesBase.cpp:239
 msgid "start work at this time"
 msgstr "bu saatte hesaplamayı başlat"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:248
-#: clientgui/DlgAdvPreferencesBase.cpp:514
+#: DlgAdvPreferencesBase.cpp:243 DlgAdvPreferencesBase.cpp:504
+#: sg_DlgPreferences.cpp:326 sg_DlgPreferences.cpp:348
 msgid "and"
 msgstr "ve"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:252
+#: DlgAdvPreferencesBase.cpp:247
 msgid "stop work at this time"
 msgstr "bu saatte hesaplamayı durdur"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
-#: clientgui/DlgAdvPreferencesBase.cpp:522
+#: DlgAdvPreferencesBase.cpp:251 DlgAdvPreferencesBase.cpp:512
 msgid "(no restriction if equal)"
 msgstr "(birbirine eşitse, sınırlama ortadan kalkar)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:261
-#: clientgui/DlgAdvPreferencesBase.cpp:527
+#: DlgAdvPreferencesBase.cpp:256 DlgAdvPreferencesBase.cpp:517
 msgid "Day-of-week override:"
 msgstr "Haftanın günlerinde sınırlamalar:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:266
-#: clientgui/DlgAdvPreferencesBase.cpp:532
+#: DlgAdvPreferencesBase.cpp:261 DlgAdvPreferencesBase.cpp:522
 msgid "check box to specify hours for this day of week"
 msgstr "haftanın belli günlerindeki çalışma saatlerini belirlemek için kutuları işaretleyin"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:272
-#: clientgui/DlgAdvPreferencesBase.cpp:538
+#: DlgAdvPreferencesBase.cpp:267 DlgAdvPreferencesBase.cpp:528
 msgid "Monday"
 msgstr "Pazartesi"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:279
-#: clientgui/DlgAdvPreferencesBase.cpp:545
+#: DlgAdvPreferencesBase.cpp:274 DlgAdvPreferencesBase.cpp:535
 msgid "Tuesday"
 msgstr "Salı"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:286
-#: clientgui/DlgAdvPreferencesBase.cpp:552
+#: DlgAdvPreferencesBase.cpp:281 DlgAdvPreferencesBase.cpp:542
 msgid "Wednesday"
 msgstr "Çarşamba"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:293
-#: clientgui/DlgAdvPreferencesBase.cpp:559
+#: DlgAdvPreferencesBase.cpp:288 DlgAdvPreferencesBase.cpp:549
 msgid "Thursday"
 msgstr "Perşembe"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:300
-#: clientgui/DlgAdvPreferencesBase.cpp:566
+#: DlgAdvPreferencesBase.cpp:295 DlgAdvPreferencesBase.cpp:556
 msgid "Friday"
 msgstr "Cuma"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:307
-#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: DlgAdvPreferencesBase.cpp:302 DlgAdvPreferencesBase.cpp:563
 msgid "Saturday"
 msgstr "Cumartesi"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:580
+#: DlgAdvPreferencesBase.cpp:309 DlgAdvPreferencesBase.cpp:570
 msgid "Sunday"
 msgstr "Pazar"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:328
+#: DlgAdvPreferencesBase.cpp:323
 msgid "Other options"
 msgstr "Diğer seçenekler"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:336
+#: DlgAdvPreferencesBase.cpp:330
 msgid "Switch between applications every"
 msgstr "Bu kadar sürede bir, çalışan uygulamayı değiştir:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:345
+#: DlgAdvPreferencesBase.cpp:339
 msgid "On multiprocessor systems, use at most"
 msgstr "Çok çekirdekli sistemlerde çekirdeklerin en çok"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
+#: DlgAdvPreferencesBase.cpp:346
 #, no-c-format
-msgid "% of the processors (0 means no restriction)"
-msgstr ""
+msgid "% of the processors (0 means ignore this setting)"
+msgstr "% kadarı kullanılsın (ayarlamayı iptal etmek için 0 yazın)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:355
-#: clientgui/DlgAdvPreferencesBase.cpp:618
-#: clientgui/DlgAdvPreferencesBase.cpp:640
-#: clientgui/DlgAdvPreferencesBase.cpp:661
-#: clientgui/DlgAdvPreferencesBase.cpp:683
-#: clientgui/DlgAdvPreferencesBase.cpp:694
+#: DlgAdvPreferencesBase.cpp:349 DlgAdvPreferencesBase.cpp:605
+#: DlgAdvPreferencesBase.cpp:627 DlgAdvPreferencesBase.cpp:648
+#: DlgAdvPreferencesBase.cpp:669 DlgAdvPreferencesBase.cpp:679
 msgid "Use at most"
 msgstr "En çok"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:362
+#: DlgAdvPreferencesBase.cpp:356
 #, no-c-format
-msgid "% of CPU time (0 means no restriction)"
-msgstr ""
+msgid "% CPU time"
+msgstr "% kadar işlemci gücü kullanılsın"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:386
+#: DlgAdvPreferencesBase.cpp:378
 msgid "General options"
 msgstr "Genel seçenekler"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:395
+#: DlgAdvPreferencesBase.cpp:386
 msgid "Maximum download rate"
 msgstr "En yüksek indirme hızı:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:401
-#: clientgui/DlgAdvPreferencesBase.cpp:410
-msgid "KBytes/second (0 means no restriction)"
-msgstr ""
+#: DlgAdvPreferencesBase.cpp:392 DlgAdvPreferencesBase.cpp:401
+msgid "KBytes/sec."
+msgstr "KBayt/sn"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:404
+#: DlgAdvPreferencesBase.cpp:395
 msgid "Maximum upload rate"
 msgstr "En yüksek gönderme hızı:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:417
+#: DlgAdvPreferencesBase.cpp:406
+msgid "Transfer at most"
+msgstr "İnternet kullanım kotası:"
+
+#: DlgAdvPreferencesBase.cpp:412
+msgid "Mbytes"
+msgstr "MB"
+
+#: DlgAdvPreferencesBase.cpp:415
+msgid "every"
+msgstr "her"
+
+#: DlgAdvPreferencesBase.cpp:421 DlgAdvPreferencesBase.cpp:444
+#: DlgAdvPreferencesBase.cpp:463
+msgid "days"
+msgstr "günlük"
+
+#: DlgAdvPreferencesBase.cpp:429
 msgid "Minimum work buffer"
 msgstr "En az bu kadar yetecek iş indirilsin:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:425
+#: DlgAdvPreferencesBase.cpp:438
 msgid "Try to maintain enough tasks to keep busy for this many days"
 msgstr "En az bu kadar gün boyunca yetecek miktarda iş indirilir"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:431
-#: clientgui/DlgAdvPreferencesBase.cpp:449
-msgid "days (maximum value: 10)"
-msgstr ""
-
-#: clientgui/DlgAdvPreferencesBase.cpp:437
+#: DlgAdvPreferencesBase.cpp:450
 msgid "Max additional work buffer"
 msgstr "En çok bu sürede tüketilebilecek iş indir:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:445
+#: DlgAdvPreferencesBase.cpp:459
 msgid "In addition, maintain enough tasks for up to this many days"
 msgstr "Bunun yanında, en çok bu kadar günde tüketilebilecek miktarda iş indirilir"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:454
-msgid "Transfer at most"
-msgstr "İnternet kullanım kotası:"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:462
-msgid "MBytes every"
-msgstr ""
-
-#: clientgui/DlgAdvPreferencesBase.cpp:468
-msgid "days (0 means no restriction)"
-msgstr ""
-
-#: clientgui/DlgAdvPreferencesBase.cpp:476
+#: DlgAdvPreferencesBase.cpp:466
 msgid "Skip image file verification"
 msgstr "Resim dosyasıyla doğrulamayı atla"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:478
+#: DlgAdvPreferencesBase.cpp:468
 msgid "check this if your Internet provider modifies image files"
 msgstr "internet sağlayıcınız resim dosyalarını değiştiriyorsa bunu işaretleyin"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:484
+#: DlgAdvPreferencesBase.cpp:476
 msgid "Connect options"
 msgstr "Bağlanma seçenekleri"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:487
+#: DlgAdvPreferencesBase.cpp:478
 msgid "Confirm before connecting to internet"
 msgstr "Internete bağlanmadan önce onay iste"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
+#: DlgAdvPreferencesBase.cpp:480
+msgid ""
+"if checked, a confirmation dialog will be displayed before trying to connect"
+" to the Internet"
 msgstr "işaretlerseniz, internet bağlantısı kurulmaya çalışılmadan önce sizden onay isteyen bir mesaj belirir"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:493
+#: DlgAdvPreferencesBase.cpp:484
 msgid "Disconnect when done"
 msgstr "Tamamlandığında bağlantıyı kes"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:495
+#: DlgAdvPreferencesBase.cpp:486
 msgid ""
 "if checked, BOINC hangs up when network usage is done\n"
 "(only relevant for dialup-connection)"
-msgstr ""
-"işaretlenirse, ağ kullanımı tamamlandığında BOINC hattı kapatır\n"
-"(yalnızca uygun çevirmeli bağlantılar için)"
+msgstr "işaretlenirse, ağ kullanımı tamamlandığında BOINC hattı kapatır\n(yalnızca uygun çevirmeli bağlantılar için)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:501
+#: DlgAdvPreferencesBase.cpp:492
 msgid "Network usage allowed"
 msgstr "Ağ kullanım izinleri"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:510
+#: DlgAdvPreferencesBase.cpp:500
 msgid "network usage start hour"
 msgstr "ağ kullanımı başlangıç saati"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:518
+#: DlgAdvPreferencesBase.cpp:508
 msgid "network usage stop hour"
 msgstr "ağ kullanımı bitiş saati"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:610
-#: clientgui/DlgItemProperties.cpp:257
+#: DlgAdvPreferencesBase.cpp:598 DlgItemProperties.cpp:231
 msgid "Disk usage"
 msgstr "Disk kullanımı"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:622
+#: DlgAdvPreferencesBase.cpp:609
 msgid "the maximum disk space used by BOINC (in Gigabytes)"
 msgstr "BOINC, disk alanının gigabayt olarak en çok bu kadarını kullanabilecek"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:626
-msgid "Gigabytes disk space (0 means no restriction)"
-msgstr ""
+#: DlgAdvPreferencesBase.cpp:613
+msgid "Gigabytes disk space"
+msgstr "GB disk alanı kullanılsın"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:629
+#: DlgAdvPreferencesBase.cpp:616
 msgid "Leave at least"
 msgstr "En az"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:633
+#: DlgAdvPreferencesBase.cpp:620
 msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
 msgstr "BOINC, disk dolarsa en az bu miktarda disk alanını boş bırakacak"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:637
+#: DlgAdvPreferencesBase.cpp:624
 msgid "Gigabytes disk space free"
 msgstr "GB disk alanı boş kalsın"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
+#: DlgAdvPreferencesBase.cpp:631
 msgid "BOINC uses at most this percentage of total disk space"
 msgstr "BOINC, disk alanının yüzde olarak en çok bu kadarını kullanabilecek"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:649
+#: DlgAdvPreferencesBase.cpp:636
 #, no-c-format
 msgid "% of total disk space"
 msgstr "% kadar disk alanı kullanılsın"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:652
+#: DlgAdvPreferencesBase.cpp:639
 msgid "Tasks checkpoint to disk at most every"
 msgstr "İşler, kontrol noktasını diske en fazla"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
+#: DlgAdvPreferencesBase.cpp:645
 msgid "seconds"
 msgstr "saniyede bir kaydetsin"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:668
+#: DlgAdvPreferencesBase.cpp:655
 #, no-c-format
 msgid "% of page file (swap space)"
 msgstr "% kadar sanal bellek (swap alanı) kullanılsın"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:675
+#: DlgAdvPreferencesBase.cpp:662
 msgid "Memory usage"
 msgstr "Bellek (RAM) kullanımı"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
+#: DlgAdvPreferencesBase.cpp:676
 #, no-c-format
 msgid "% when computer is in use"
 msgstr "% kadar bellek kullanılsın (bilgisayarımı kullanırken)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:701
+#: DlgAdvPreferencesBase.cpp:686
 #, no-c-format
 msgid "% when computer is idle"
 msgstr "% kadar bellek kullanılsın (bilgisayarım boştayken)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:706
+#: DlgAdvPreferencesBase.cpp:691
 msgid "Leave applications in memory while suspended"
 msgstr "Durakladığında uygulamaları bellekte bırak"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:708
+#: DlgAdvPreferencesBase.cpp:693
 msgid "if checked, suspended work units are left in memory"
 msgstr "işaretlenirse, duraklamış işlerin uygulamaları kapatılmaz ve bellekte kalmayı sürdürür"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:728
-msgid "Suspend processor and network usage when these applications are running:"
+#: DlgAdvPreferencesBase.cpp:713
+msgid ""
+"Suspend processor and network usage when these applications are running:"
 msgstr "Bu uygulamalar çalışırken, işlemci ve ağ kullanımı duraklatılacak:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:738
+#: DlgAdvPreferencesBase.cpp:722
 msgid "Add..."
 msgstr "Ekle..."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:739
+#: DlgAdvPreferencesBase.cpp:723
 msgid "Add an application to this list"
 msgstr "Bu listeye bir uygulama ekle"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:744
+#: DlgAdvPreferencesBase.cpp:728 ViewProjects.cpp:202
+#: sg_ProjectCommandPopup.cpp:85
 msgid "Remove"
 msgstr "Kaldır"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:745
+#: DlgAdvPreferencesBase.cpp:729
 msgid "Remove an application from this list"
 msgstr "Bu listeden bir uygulama kaldır"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:754
+#: DlgAdvPreferencesBase.cpp:738
 msgid "For advanced options, refer to "
 msgstr "Gelişmiş seçenekler için, lütfen ziyaret edin:  "
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:65
-#, c-format
-msgid "%s Diagnostic Log Flags"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:83
-msgid "These flags enable various types of diagnostic messages in the Event Log."
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:105
-msgid "Save all values and close the dialog"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:108
-msgid "Defaults"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:109
-msgid "Restore default settings"
-msgstr ""
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:113
-msgid "Close the dialog without saving"
-msgstr ""
-
-#: clientgui/DlgEventLog.cpp:226
+#: DlgEventLog.cpp:219
 #, c-format
 msgid "%s - Event Log"
 msgstr "%s - Olay Günlüğü"
 
-#: clientgui/DlgEventLog.cpp:236
+#: DlgEventLog.cpp:232 ViewMessages.cpp:117 ViewProjects.cpp:219
+#: ViewStatistics.cpp:435 ViewStatistics.cpp:2009 ViewTransfers.cpp:182
+#: ViewWork.cpp:232
 msgid "Project"
 msgstr "Proje"
 
-#: clientgui/DlgEventLog.cpp:237
+#: DlgEventLog.cpp:233 ViewMessages.cpp:118
 msgid "Time"
 msgstr "Zaman"
 
-#: clientgui/DlgEventLog.cpp:238
+#: DlgEventLog.cpp:234 ViewMessages.cpp:119
 msgid "Message"
 msgstr "Mesaj"
 
-#: clientgui/DlgEventLog.cpp:300
-#: clientgui/DlgEventLog.cpp:364
+#: DlgEventLog.cpp:290 DlgEventLog.cpp:354
 msgid "&Show only this project"
 msgstr "&Yalnızca bu projeyi göster"
 
-#: clientgui/DlgEventLog.cpp:304
+#: DlgEventLog.cpp:294
 msgid "Copy &All"
 msgstr "&Tümünü kopyala"
 
-#: clientgui/DlgEventLog.cpp:306
-#: clientgui/DlgEventLog.cpp:310
+#: DlgEventLog.cpp:296 DlgEventLog.cpp:300 ViewMessages.cpp:89
 msgid "Copy all the messages to the clipboard."
 msgstr "Tüm mesajları panoya kopyalar."
 
-#: clientgui/DlgEventLog.cpp:315
+#: DlgEventLog.cpp:305
 msgid "Copy &Selected"
 msgstr "&Seçili mesajları kopyala"
 
-#: clientgui/DlgEventLog.cpp:318
-#: clientgui/DlgEventLog.cpp:326
-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 ""
-"Seçili mesajları panoya kopyalar. Shift ya da komut düğmelerine basıp\n"
-"mesajların üzerine tıklayarak, çok sayıda mesajı seçebilirsiniz."
+#: DlgEventLog.cpp:308 DlgEventLog.cpp:316 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 "Seçili mesajları panoya kopyalar. Shift ya da komut düğmelerine basıp\nmesajların üzerine tıklayarak, çok sayıda mesajı seçebilirsiniz."
 
-#: clientgui/DlgEventLog.cpp:320
-#: clientgui/DlgEventLog.cpp:328
-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 ""
-"Seçili mesajları panoya kopyalar. Shift ya da Ctrl düğmelerine basıp\n"
-"mesajların üzerine tıklayarak, çok sayıda mesajı seçebilirsiniz."
+#: DlgEventLog.cpp:310 DlgEventLog.cpp:318 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 "Seçili mesajları panoya kopyalar. Shift ya da Ctrl düğmelerine basıp\nmesajların üzerine tıklayarak, çok sayıda mesajı seçebilirsiniz."
 
-#: clientgui/DlgEventLog.cpp:335
-#: clientgui/DlgItemProperties.cpp:67
+#: DlgEventLog.cpp:325 DlgItemProperties.cpp:67
 msgid "&Close"
 msgstr "&Kapat"
 
-#: clientgui/DlgEventLog.cpp:344
+#: DlgEventLog.cpp:334 sg_BoincSimpleFrame.cpp:798 sg_DlgPreferences.cpp:442
 #, c-format
 msgid "Get help with %s"
 msgstr "%s ile yardım alın"
 
-#: clientgui/DlgEventLog.cpp:358
+#: DlgEventLog.cpp:348
 msgid "Show all &messages"
 msgstr "&Tüm mesajları göster"
 
-#: clientgui/DlgEventLog.cpp:359
-#: clientgui/DlgEventLog.cpp:361
+#: DlgEventLog.cpp:349 DlgEventLog.cpp:351
 msgid "Show messages for all projects"
 msgstr "Tüm projelere ait mesajları gösterir."
 
-#: clientgui/DlgEventLog.cpp:365
-#: clientgui/DlgEventLog.cpp:367
+#: DlgEventLog.cpp:355 DlgEventLog.cpp:357
 msgid "Show only the messages for the selected project"
 msgstr "Yalnızca şu anda seçili projeye ait mesajları ve BOINC'in genel mesajlarını görüntüler."
 
-#: clientgui/DlgExitMessage.cpp:82
+#: DlgExitMessage.cpp:82
 #, c-format
 msgid "%s - Exit Confirmation"
 msgstr "%s - Çıkış Onaylama"
 
-#: clientgui/DlgExitMessage.cpp:130
+#: DlgExitMessage.cpp:130
 #, c-format
 msgid ""
 "You have requested to exit the %s,\n"
@@ -1703,15 +1550,9 @@ msgid ""
 "\n"
 "If you also want to stop running the tasks,\n"
 "choose from the following options:"
-msgstr ""
-"%s'dan çıkmak istediniz.\n"
-"Bu program, bilgisayarınızda çalışan bilimsel\n"
-"uygulamaları görmenizi ve yönetmenizi sağlar.\n"
-"\n"
-"Çıktığınızda bilimsel uygulamaların da kapanmasını\n"
-"istiyorsanız, aşağıdaki seçenekleri işaretleyin:"
+msgstr "%s'dan çıkmak istediniz.\nBu program, bilgisayarınızda çalışan bilimsel\nuygulamaları görmenizi ve yönetmenizi sağlar.\n\nÇıktığınızda bilimsel uygulamaların da kapanmasını\nistiyorsanız, aşağıdaki seçenekleri işaretleyin:"
 
-#: clientgui/DlgExitMessage.cpp:135
+#: DlgExitMessage.cpp:135
 #, c-format
 msgid ""
 "This will shut down %s and its tasks until either the\n"
@@ -1720,1000 +1561,916 @@ msgid ""
 "In most cases, it is better just to close the %s window\n"
 "rather than to exit the application; that will allow %s to run its\n"
 "tasks at the times you selected in your preferences."
-msgstr ""
-"Bu işlem, %s'ı ve işlerini kapatır. %s uygulaması\n"
-"ya da %s ekran koruyucusu tekrar çalışana kadar da kapalı kalır.\n"
-"\n"
-"Bir çok durumda sadece %s penceresini kapatmak,\n"
-"uygulamayı kapatmaktan iyidir. Böylece %s,\n"
-"işleri ve zamanlanmış görevleri tercihlerinizde belirlediğiniz\n"
-"şekilde çalıştırabilir."
+msgstr "Bu işlem, %s'ı ve işlerini kapatır. %s uygulaması\nya da %s ekran koruyucusu tekrar çalışana kadar da kapalı kalır.\n\nBir çok durumda sadece %s penceresini kapatmak,\nuygulamayı kapatmaktan iyidir. Böylece %s,\nişleri ve zamanlanmış görevleri tercihlerinizde belirlediğiniz\nşekilde çalıştırabilir."
 
-#: clientgui/DlgExitMessage.cpp:153
+#: DlgExitMessage.cpp:153
 #, c-format
 msgid "Stop running tasks when exiting the %s"
 msgstr "%s'dan çıkarken, çalışan bilimsel uygulamaları da durdur"
 
-#: clientgui/DlgExitMessage.cpp:165
+#: DlgExitMessage.cpp:165
 msgid "Remember this decision and do not show this dialog."
 msgstr "Seçimimi hatırla ve tekrar sorma"
 
-#: clientgui/DlgExitMessage.cpp:178
-#: clientgui/DlgGenericMessage.cpp:125
-#: clientgui/DlgOptions.cpp:404
-#: clientgui/DlgSelectComputer.cpp:168
+#: DlgExitMessage.cpp:178 DlgGenericMessage.cpp:125 DlgOptions.cpp:401
+#: DlgSelectComputer.cpp:168 wizardex.cpp:378
 msgid "&Cancel"
 msgstr "&İptal"
 
-#: clientgui/DlgGenericMessage.cpp:112
+#: DlgGenericMessage.cpp:112
 msgid "Don't show this dialog again."
 msgstr "Bu pencereyi tekrar gösterme."
 
-#: clientgui/DlgItemProperties.cpp:194
-#: clientgui/DlgItemProperties.cpp:197
-#: clientgui/DlgItemProperties.cpp:200
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:168 DlgItemProperties.cpp:171
+#: DlgItemProperties.cpp:174 DlgItemProperties.cpp:177
 msgid "Don't fetch tasks for "
 msgstr "Bunun için işler indirme: "
 
-#: clientgui/DlgItemProperties.cpp:194
+#: DlgItemProperties.cpp:168
 msgid "Project preference"
 msgstr "Proje tercihleri"
 
-#: clientgui/DlgItemProperties.cpp:197
+#: DlgItemProperties.cpp:171
 msgid "Account manager preference"
 msgstr "Hesap yöneticisi tercihi"
 
-#: clientgui/DlgItemProperties.cpp:200
+#: DlgItemProperties.cpp:174
 msgid "Project has no apps for "
 msgstr "Projenin bunun için uygulaması bulunmuyor: "
 
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:177
 msgid "Client configuration excludes "
 msgstr "İstemci yapılandırması bunu içermez: "
 
-#: clientgui/DlgItemProperties.cpp:207
+#: DlgItemProperties.cpp:181
 msgid " work fetch deferred for"
 msgstr " iş indirme ertelendi"
 
-#: clientgui/DlgItemProperties.cpp:208
+#: DlgItemProperties.cpp:182
 msgid " work fetch deferral interval"
 msgstr " iş indirme erteleme aralığı"
 
-#: clientgui/DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:213
 msgid "Properties of project "
 msgstr "Projenin özellikleri: "
 
-#: clientgui/DlgItemProperties.cpp:243
-#: clientgui/DlgOptions.cpp:221
+#: DlgItemProperties.cpp:217 DlgOptions.cpp:218
 msgid "General"
 msgstr "Genel"
 
-#: clientgui/DlgItemProperties.cpp:244
+#: DlgItemProperties.cpp:218
 msgid "Master URL"
 msgstr "Ana URL"
 
-#: clientgui/DlgItemProperties.cpp:245
+#: DlgItemProperties.cpp:219
 msgid "User name"
 msgstr "Kullanıcı adı"
 
-#: clientgui/DlgItemProperties.cpp:246
+#: DlgItemProperties.cpp:220
 msgid "Team name"
 msgstr "Takım adı"
 
-#: clientgui/DlgItemProperties.cpp:247
+#: DlgItemProperties.cpp:221 ViewProjects.cpp:224
 msgid "Resource share"
 msgstr "Kaynak paylaşımı"
 
-#: clientgui/DlgItemProperties.cpp:249
+#: DlgItemProperties.cpp:223
 msgid "Scheduler RPC deferred for"
 msgstr "Zamanlanmış RPC ertelendi"
 
-#: clientgui/DlgItemProperties.cpp:252
+#: DlgItemProperties.cpp:226
 msgid "File downloads deferred for"
 msgstr "Dosya indirmeler ertelendi"
 
-#: clientgui/DlgItemProperties.cpp:255
+#: DlgItemProperties.cpp:229
 msgid "File uploads deferred for"
 msgstr "Dosya göndermeler ertelendi"
 
-#: clientgui/DlgItemProperties.cpp:258
+#: DlgItemProperties.cpp:232
 msgid "Computer ID"
 msgstr "Bilgisayar ID"
 
-#: clientgui/DlgItemProperties.cpp:260
+#: DlgItemProperties.cpp:234
 msgid "Non CPU intensive"
 msgstr "CPU-yoğun değil"
 
-#: 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
+#: DlgItemProperties.cpp:234 DlgItemProperties.cpp:236
+#: DlgItemProperties.cpp:237 DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:242 DlgItemProperties.cpp:251
+#: DlgItemProperties.cpp:254 DlgItemProperties.cpp:257
 msgid "yes"
 msgstr "evet"
 
-#: clientgui/DlgItemProperties.cpp:262
+#: DlgItemProperties.cpp:236
 msgid "Suspended via GUI"
 msgstr "Grafik arabirimi (GUI) ile durduruldu"
 
-#: clientgui/DlgItemProperties.cpp:262
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:236 DlgItemProperties.cpp:237
 msgid "no"
 msgstr "hayır"
 
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:237
 msgid "Don't request more work"
 msgstr "Daha fazla iş isteme"
 
-#: clientgui/DlgItemProperties.cpp:265
+#: DlgItemProperties.cpp:239
 msgid "Scheduler call in progress"
 msgstr "Zamanlanmış çağrı sürmekte"
 
-#: clientgui/DlgItemProperties.cpp:268
+#: DlgItemProperties.cpp:242
 msgid "Trickle-up pending"
 msgstr "İş ilerleme kuyruğu"
 
-#: clientgui/DlgItemProperties.cpp:271
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:245 DlgItemProperties.cpp:247
 msgid "Host location"
 msgstr "Sunucu konumu"
 
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:247
 msgid "default"
 msgstr "varsayılan"
 
-#: clientgui/DlgItemProperties.cpp:277
+#: DlgItemProperties.cpp:251
 msgid "Added via account manager"
 msgstr "Hesap yöneticisi aracılığıyla eklendi"
 
-#: clientgui/DlgItemProperties.cpp:280
+#: DlgItemProperties.cpp:254
 msgid "Remove when tasks done"
 msgstr "İşler tamamlandığında kaldır"
 
-#: clientgui/DlgItemProperties.cpp:283
+#: DlgItemProperties.cpp:257
 msgid "Ended"
 msgstr "Sonlandı"
 
-#: clientgui/DlgItemProperties.cpp:285
-msgid "Tasks completed"
-msgstr ""
-
-#: clientgui/DlgItemProperties.cpp:286
-msgid "Tasks failed"
-msgstr ""
-
-#: clientgui/DlgItemProperties.cpp:288
+#: DlgItemProperties.cpp:259
 msgid "Credit"
 msgstr "Kredi"
 
-#: clientgui/DlgItemProperties.cpp:289
+#: DlgItemProperties.cpp:260
 msgid "User"
 msgstr "Kullanıcı"
 
-#: clientgui/DlgItemProperties.cpp:296
+#: DlgItemProperties.cpp:267
 msgid "Host"
 msgstr "Bilgisayar"
 
-#: clientgui/DlgItemProperties.cpp:305
+#: DlgItemProperties.cpp:276
 msgid "Scheduling"
 msgstr "Zamanlama"
 
-#: clientgui/DlgItemProperties.cpp:306
+#: DlgItemProperties.cpp:277
 msgid "Scheduling priority"
 msgstr "Zamanlama önceliği"
 
-#: clientgui/DlgItemProperties.cpp:307
+#: DlgItemProperties.cpp:278
 msgid "CPU"
 msgstr "CPU"
 
-#: clientgui/DlgItemProperties.cpp:331
+#: DlgItemProperties.cpp:302
 msgid "Duration correction factor"
 msgstr "Süre düzeltme faktörü"
 
-#: clientgui/DlgItemProperties.cpp:345
+#: DlgItemProperties.cpp:316
 msgid "Properties of task "
 msgstr "İşin özellikleri: "
 
-#: clientgui/DlgItemProperties.cpp:357
+#: DlgItemProperties.cpp:328 ViewWork.cpp:238
 msgid "Application"
 msgstr "Uygulama"
 
-#: clientgui/DlgItemProperties.cpp:358
+#: DlgItemProperties.cpp:329 ViewWork.cpp:239
 msgid "Name"
 msgstr "İsim"
 
-#: clientgui/DlgItemProperties.cpp:359
+#: DlgItemProperties.cpp:330
 msgid "State"
 msgstr "Durum"
 
-#: clientgui/DlgItemProperties.cpp:362
+#: DlgItemProperties.cpp:333
 msgid "Received"
 msgstr "Alınma zamanı"
 
-#: clientgui/DlgItemProperties.cpp:365
+#: DlgItemProperties.cpp:336
 msgid "Report deadline"
 msgstr "Son teslim zamanı"
 
-#: clientgui/DlgItemProperties.cpp:367
+#: DlgItemProperties.cpp:338
 msgid "Resources"
 msgstr "Kullandığı kaynaklar"
 
-#: clientgui/DlgItemProperties.cpp:370
+#: DlgItemProperties.cpp:341
 msgid "Estimated computation size"
 msgstr "Tahmini hesaplama miktarı"
 
-#: clientgui/DlgItemProperties.cpp:373
+#: DlgItemProperties.cpp:344
 msgid "CPU time at last checkpoint"
 msgstr "Kontrol noktasındaki CPU zamanı"
 
-#: clientgui/DlgItemProperties.cpp:374
-#: clientgui/DlgItemProperties.cpp:389
+#: DlgItemProperties.cpp:345 DlgItemProperties.cpp:360
 msgid "CPU time"
 msgstr "CPU zamanı"
 
-#: clientgui/DlgItemProperties.cpp:376
-#: clientgui/DlgItemProperties.cpp:390
+#: DlgItemProperties.cpp:347 DlgItemProperties.cpp:361
 msgid "Elapsed time"
 msgstr "Geçen süre"
 
-#: clientgui/DlgItemProperties.cpp:378
+#: DlgItemProperties.cpp:349
 msgid "Estimated time remaining"
 msgstr "Tahmini kalan süre"
 
-#: clientgui/DlgItemProperties.cpp:379
+#: DlgItemProperties.cpp:350
 msgid "Fraction done"
 msgstr "Tamamlanan bölüm"
 
-#: clientgui/DlgItemProperties.cpp:380
+#: DlgItemProperties.cpp:351
 msgid "Virtual memory size"
 msgstr "Sanal bellek kullanımı"
 
-#: clientgui/DlgItemProperties.cpp:381
+#: DlgItemProperties.cpp:352
 msgid "Working set size"
 msgstr "Fiziksel bellek kullanımı"
 
-#: clientgui/DlgItemProperties.cpp:383
+#: DlgItemProperties.cpp:354
 msgid "Directory"
 msgstr "Bulunduğu klasör"
 
-#: clientgui/DlgItemProperties.cpp:386
+#: DlgItemProperties.cpp:357
 msgid "Process ID"
 msgstr "İşlem ID"
 
-#: clientgui/DlgItemProperties.cpp:456
+#: DlgItemProperties.cpp:427 ViewWork.cpp:1032 sg_TaskPanel.cpp:823
 msgid "Local: "
 msgstr "Yerel:"
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: DlgOptions.cpp:129 DlgOptions.cpp:135
 msgid "Options"
 msgstr "Seçenekler"
 
-#: clientgui/DlgOptions.cpp:178
+#: DlgOptions.cpp:175
 msgid "Language:"
 msgstr "Dil:"
 
-#: clientgui/DlgOptions.cpp:185
+#: DlgOptions.cpp:182
 msgid "What language should BOINC use?"
 msgstr "BOINC Manager'ı hangi dilde kullanmak istediğinizi seçin."
 
-#: clientgui/DlgOptions.cpp:189
+#: DlgOptions.cpp:186
 msgid "Notice reminder interval:"
 msgstr "Bildirim hatırlatma sıklığı:"
 
-#: clientgui/DlgOptions.cpp:196
+#: DlgOptions.cpp:193
 msgid "How often should BOINC remind you of new notices?"
 msgstr "BOINC Manager'ın, yeni bildirimler olduğunu size ne kadar sürede bir hatırlatmasını istediğinizi belirleyin."
 
-#: clientgui/DlgOptions.cpp:201
+#: DlgOptions.cpp:198
 msgid "Run Manager at login?"
 msgstr "Açılışta BOINC Manager'ı çalıştır"
 
-#: clientgui/DlgOptions.cpp:207
+#: DlgOptions.cpp:204
 msgid "Run the BOINC Manager when you log on."
 msgstr "İşaretlerseniz, bilgisayarda oturum açtığınızda BOINC Manager otomatik olarak çalışır."
 
-#: clientgui/DlgOptions.cpp:212
+#: DlgOptions.cpp:209
 msgid "Enable Manager exit dialog?"
 msgstr "BOINC Manager'dan çıkarken sor"
 
-#: clientgui/DlgOptions.cpp:218
+#: DlgOptions.cpp:215
 msgid "Display the exit dialog when shutting down the Manager."
 msgstr "İşaretlerseniz, BOINC Manager'ı kapatırken bunu onaylamanızı isteyen bir pencere belirir."
 
-#: clientgui/DlgOptions.cpp:229
+#: DlgOptions.cpp:226
 msgid "Dial-up and Virtual Private Network settings"
 msgstr "Çevirmeli bağlantı ve Sanal Özel Ağ (VPN) ayarları"
 
-#: clientgui/DlgOptions.cpp:243
+#: DlgOptions.cpp:240
 msgid "&Set Default"
 msgstr "&Varsayılan Yap"
 
-#: clientgui/DlgOptions.cpp:248
+#: DlgOptions.cpp:245
 msgid "&Clear Default"
 msgstr "&Varsayılanı Kaldır"
 
-#: clientgui/DlgOptions.cpp:255
+#: DlgOptions.cpp:252
 msgid "Default Connection:"
 msgstr "Varsayılan Bağlantı:"
 
-#: clientgui/DlgOptions.cpp:262
+#: DlgOptions.cpp:259
 msgid "Connections"
 msgstr "Bağlantılar"
 
-#: clientgui/DlgOptions.cpp:271
+#: DlgOptions.cpp:268
 msgid "Connect via HTTP proxy server"
 msgstr "HTTP vekil sunucu (proxy) aracılığıyla bağlan"
 
-#: clientgui/DlgOptions.cpp:275
+#: DlgOptions.cpp:272
 msgid "HTTP Proxy Server Configuration"
 msgstr "HTTP Vekil Sunucu Yapılandırması"
 
-#: clientgui/DlgOptions.cpp:283
-#: clientgui/DlgOptions.cpp:347
+#: DlgOptions.cpp:280 DlgOptions.cpp:344
 msgid "Address:"
 msgstr "Adres:"
 
-#: clientgui/DlgOptions.cpp:291
-#: clientgui/DlgOptions.cpp:355
+#: DlgOptions.cpp:288 DlgOptions.cpp:352 ProxyPage.cpp:340 ProxyPage.cpp:360
 msgid "Port:"
 msgstr "Bağlantı noktası:"
 
-#: clientgui/DlgOptions.cpp:299
-#: clientgui/DlgOptions.cpp:363
+#: DlgOptions.cpp:296 DlgOptions.cpp:360
 msgid "Don't use proxy for:"
 msgstr "Burası için vekil sunucu kullanma:"
 
-#: clientgui/DlgOptions.cpp:306
-#: clientgui/DlgOptions.cpp:370
+#: DlgOptions.cpp:303 DlgOptions.cpp:367
 msgid "Leave these blank if not needed"
 msgstr "Gerekli değilse bu bölümü boş bırakın"
 
-#: clientgui/DlgOptions.cpp:312
-#: clientgui/DlgOptions.cpp:376
+#: DlgOptions.cpp:309 DlgOptions.cpp:373 ProxyPage.cpp:343 ProxyPage.cpp:363
 msgid "User Name:"
 msgstr "Kullanıcı adı:"
 
-#: clientgui/DlgOptions.cpp:320
-#: clientgui/DlgOptions.cpp:384
-#: clientgui/DlgSelectComputer.cpp:152
+#: DlgOptions.cpp:317 DlgOptions.cpp:381 DlgSelectComputer.cpp:152
+#: ProxyPage.cpp:346 ProxyPage.cpp:366
 msgid "Password:"
 msgstr "Parola:"
 
-#: clientgui/DlgOptions.cpp:327
+#: DlgOptions.cpp:324
 msgid "HTTP Proxy"
 msgstr "HTTP Proxy"
 
-#: clientgui/DlgOptions.cpp:335
+#: DlgOptions.cpp:332
 msgid "Connect via SOCKS proxy server"
 msgstr "SOCKS vekil sunucu (proxy) aracılığıyla bağlan"
 
-#: clientgui/DlgOptions.cpp:339
+#: DlgOptions.cpp:336
 msgid "SOCKS Proxy Server Configuration"
 msgstr "SOCKS Vekil Sunucu Yapılandırması"
 
-#: clientgui/DlgOptions.cpp:391
+#: DlgOptions.cpp:388
 msgid "SOCKS Proxy"
 msgstr "SOCKS Proxy"
 
-#: clientgui/DlgOptions.cpp:589
+#: DlgOptions.cpp:586
 msgid "always"
 msgstr "her zaman"
 
-#: clientgui/DlgOptions.cpp:590
+#: DlgOptions.cpp:587
 msgid "1 hour"
 msgstr "her saat"
 
-#: clientgui/DlgOptions.cpp:591
+#: DlgOptions.cpp:588
 msgid "6 hours"
 msgstr "6 saatte bir"
 
-#: clientgui/DlgOptions.cpp:592
+#: DlgOptions.cpp:589
 msgid "1 day"
 msgstr "günde bir"
 
-#: clientgui/DlgOptions.cpp:593
+#: DlgOptions.cpp:590
 msgid "1 week"
 msgstr "haftada bir"
 
-#: clientgui/DlgOptions.cpp:594
+#: DlgOptions.cpp:591
 msgid "never"
 msgstr "asla"
 
-#: clientgui/DlgOptions.cpp:691
+#: DlgOptions.cpp:688
 #, c-format
 msgid "%s - Language Selection"
 msgstr "%s - Dil Seçimi"
 
-#: clientgui/DlgOptions.cpp:698
+#: DlgOptions.cpp:695
 #, 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 "%s'ın varsayılan dili değişti.  Değişikliğin etkili olması için %s yeniden başlatılmalı."
 
-#: clientgui/DlgSelectComputer.cpp:91
+#: DlgSelectComputer.cpp:91
 #, c-format
 msgid "%s - Select Computer"
 msgstr "%s - Bilgisayar Seç ve Bağlan"
 
-#: clientgui/DlgSelectComputer.cpp:125
+#: DlgSelectComputer.cpp:125
 #, c-format
 msgid ""
 "Another instance of %s is already running \n"
 "on this computer.  Please select a client to monitor."
-msgstr ""
-"%s'ın başka bir kopyası şu anda bu bilgisayarda\n"
-"zaten çalışıyor.  Lütfen izlemek için bir istemci seçin."
+msgstr "%s'ın başka bir kopyası şu anda bu bilgisayarda\nzaten çalışıyor.  Lütfen izlemek için bir istemci seçin."
 
-#: clientgui/DlgSelectComputer.cpp:143
+#: DlgSelectComputer.cpp:143
 msgid "Host name:"
 msgstr "Sunucu adı:"
 
-#: clientgui/Localization.cpp:31
-#: clientgui/Localization.cpp:69
+#: Localization.cpp:31 Localization.cpp:69
 msgid "Message boards"
 msgstr "Forum sayfaları"
 
-#: clientgui/Localization.cpp:33
+#: Localization.cpp:33
 msgid "Correspond with other users on the SETI at home message boards"
 msgstr "Diğer kullanıcılarla SETI at home forum sayfaları aracılığıyla iletişim kurun"
 
-#: clientgui/Localization.cpp:37
+#: Localization.cpp:37
 msgid "Ask questions and report problems"
 msgstr "Sorular sorun ve problemleri bildirin"
 
-#: clientgui/Localization.cpp:39
-#: clientgui/Localization.cpp:81
-#: clientgui/Localization.cpp:111
-#: clientgui/Localization.cpp:129
+#: Localization.cpp:39 Localization.cpp:81 Localization.cpp:111
+#: Localization.cpp:129
 msgid "Your account"
 msgstr "Hesabınız"
 
-#: clientgui/Localization.cpp:41
-#: clientgui/Localization.cpp:87
-#: clientgui/Localization.cpp:113
+#: Localization.cpp:41 Localization.cpp:87 Localization.cpp:113
 msgid "View your account information and credit totals"
 msgstr "Hesap bilgilerinizi ve toplam kredinizi görüntüleyin"
 
-#: clientgui/Localization.cpp:43
+#: Localization.cpp:43
 msgid "Your preferences"
 msgstr "Tercihleriniz"
 
-#: clientgui/Localization.cpp:45
+#: Localization.cpp:45
 msgid "View and modify your SETI at home account profile and preferences"
 msgstr "SETI at home hesap profili ve tercihlerini görüp değiştirin"
 
-#: clientgui/Localization.cpp:47
-#: clientgui/Localization.cpp:89
+#: Localization.cpp:47 Localization.cpp:89
 msgid "Your results"
 msgstr "Sonuçlarınız"
 
-#: clientgui/Localization.cpp:49
-#: clientgui/Localization.cpp:91
+#: Localization.cpp:49 Localization.cpp:91
 msgid "View your last week (or more) of computational results and work"
 msgstr "Son haftaya ait (ya da daha eski) hesaplama sonuçlarınızı ve işlerinizi görüntüleyin"
 
-#: clientgui/Localization.cpp:51
-#: clientgui/Localization.cpp:93
+#: Localization.cpp:51 Localization.cpp:93
 msgid "Your computers"
 msgstr "Bilgisayarlarınız"
 
-#: clientgui/Localization.cpp:53
+#: Localization.cpp:53
 msgid "View a listing of all the computers on which you are running SETI at Home"
 msgstr "SETI at Home çalıştırdığınız tüm bilgisayarların listesini görün"
 
-#: clientgui/Localization.cpp:55
-#: clientgui/Localization.cpp:97
+#: Localization.cpp:55 Localization.cpp:97
 msgid "Your team"
 msgstr "Takımınız"
 
-#: clientgui/Localization.cpp:57
-#: clientgui/Localization.cpp:99
+#: Localization.cpp:57 Localization.cpp:99
 msgid "View information about your team"
 msgstr "Takımınız hakkındaki bilgileri görüntüleyin"
 
-#: clientgui/Localization.cpp:61
+#: Localization.cpp:61
 msgid "Common questions"
 msgstr "Çeşitli sorular"
 
-#: clientgui/Localization.cpp:63
+#: Localization.cpp:63
 msgid "Read the Einstein at Home Frequently Asked Question list"
 msgstr "Einstein at Home Sık Sorulan Sorular listesini okuyun"
 
-#: clientgui/Localization.cpp:65
+#: Localization.cpp:65
 msgid "Screensaver info"
 msgstr "Ekran koruyucu bilgisi"
 
-#: clientgui/Localization.cpp:67
+#: Localization.cpp:67
 msgid "Read a detailed description of the Einstein at Home screensaver"
 msgstr "Einstein at Home ekran koruyucusunun detaylı açıklamalarını okuyun"
 
-#: clientgui/Localization.cpp:71
-msgid "Correspond with admins and other users on the Einstein at Home message boards"
+#: Localization.cpp:71
+msgid ""
+"Correspond with admins and other users on the Einstein at Home message boards"
 msgstr "Yöneticiler ve başka kullanıcılarla Einstein at Home forumlarında mesajlaşın"
 
-#: clientgui/Localization.cpp:73
+#: Localization.cpp:73
 msgid "Einstein status"
 msgstr "Einstein durumu"
 
-#: clientgui/Localization.cpp:75
+#: Localization.cpp:75
 msgid "Current status of the Einstein at Home server"
 msgstr "Einstein at Home sunucusunun şu anki durumu"
 
-#: clientgui/Localization.cpp:77
+#: Localization.cpp:77
 msgid "Report problems"
 msgstr "Sorunları bildir"
 
-#: clientgui/Localization.cpp:79
+#: Localization.cpp:79
 msgid "A link to the Einstein at Home problems and bug reports message board"
 msgstr "Einstein at Home problemleri ve hata raporları forumuna kısa yol"
 
-#: clientgui/Localization.cpp:83
+#: Localization.cpp:83
 msgid "View and modify your Einstein at Home account profile and preferences"
 msgstr "Einstein at Home hesap profilinizi ve tercihlerinizi görün ve değiştirin"
 
-#: clientgui/Localization.cpp:85
+#: Localization.cpp:85
 msgid "Account summary"
 msgstr "Hesap özeti"
 
-#: clientgui/Localization.cpp:95
-msgid "View a listing of all the computers on which you are running Einstein at Home"
+#: Localization.cpp:95
+msgid ""
+"View a listing of all the computers on which you are running Einstein at Home"
 msgstr "Einstein at Home çalıştırdığınız tüm bilgisayarların bir listesini görün"
 
-#: clientgui/Localization.cpp:101
+#: Localization.cpp:101
 msgid "LIGO project"
 msgstr "LIGO projesi"
 
-#: clientgui/Localization.cpp:103
-msgid "The home page of the Laser Interferometer Gravitational-wave Observatory (LIGO) project"
+#: Localization.cpp:103
+msgid ""
+"The home page of the Laser Interferometer Gravitational-wave Observatory "
+"(LIGO) project"
 msgstr "Laser Interferometer Gravitational-wave Observatory (LIGO) projesinin ana sayfası"
 
-#: clientgui/Localization.cpp:105
+#: Localization.cpp:105
 msgid "GEO-600 project"
 msgstr "GEO-600 projesi"
 
-#: clientgui/Localization.cpp:107
+#: Localization.cpp:107
 msgid "The home page of the GEO-600 project"
 msgstr "GEO-600 projesinin ana sayfası"
 
-#: clientgui/Localization.cpp:115
-#: clientgui/Localization.cpp:133
+#: Localization.cpp:115 Localization.cpp:133 ViewProjects.cpp:221
+#: ViewStatistics.cpp:465
 msgid "Team"
 msgstr "Takım"
 
-#: clientgui/Localization.cpp:117
+#: Localization.cpp:117
 msgid "Info about your Team"
 msgstr "Takımınız hakkında bilgi"
 
-#: clientgui/Localization.cpp:123
+#: Localization.cpp:123
 msgid "Get help for climateprediction.net"
 msgstr "climateprediction.net için yardım al"
 
-#: clientgui/Localization.cpp:125
+#: Localization.cpp:125
 msgid "News"
 msgstr "Haberler"
 
-#: clientgui/Localization.cpp:127
+#: Localization.cpp:127
 msgid "climateprediction.net News"
 msgstr "climateprediction.net Haberleri"
 
-#: clientgui/Localization.cpp:131
+#: Localization.cpp:131
 msgid "View your account information, credits, and trickles"
 msgstr "Hesap bilgilerinizi, kredilerinizi ve iş ilerleme raporlarını görün"
 
-#: clientgui/Localization.cpp:135
+#: Localization.cpp:135
 msgid "Info about your team"
 msgstr "Takımınız hakkında bilgi"
 
-#: clientgui/Localization.cpp:141
+#: Localization.cpp:141
 msgid "Search for help in our help system"
 msgstr "Yardım sistemimizde arama yapın"
 
-#: clientgui/Localization.cpp:143
+#: Localization.cpp:143
 msgid "Global Statistics"
 msgstr "Global İstatistikler"
 
-#: clientgui/Localization.cpp:145
+#: Localization.cpp:145
 msgid "Summary statistics for World Community Grid"
 msgstr "World Community Grid için genel istatistikler"
 
-#: clientgui/Localization.cpp:147
+#: Localization.cpp:147
 msgid "My Grid"
 msgstr "Grid'im"
 
-#: clientgui/Localization.cpp:149
+#: Localization.cpp:149
 msgid "Your statistics and settings"
 msgstr "İstatistikleriniz ve ayarlarınız"
 
-#: clientgui/Localization.cpp:151
+#: Localization.cpp:151
 msgid "Device Profiles"
 msgstr "Aygıt Profilleri"
 
-#: clientgui/Localization.cpp:153
+#: Localization.cpp:153
 msgid "Update your device settings"
 msgstr "Bilgisayarlarınız için tercihleri inceleyin ve düzenleyin"
 
-#: clientgui/Localization.cpp:155
+#: Localization.cpp:155
 msgid "Research"
 msgstr "Araştırma"
 
-#: clientgui/Localization.cpp:157
+#: Localization.cpp:157
 msgid "Learn about the projects hosted at World Community Grid"
 msgstr "World Community Grid tarafından barındırılan projeler hakkında bilgi edinin"
 
-#: clientgui/MainDocument.cpp:583
+#: MainDocument.cpp:583
 msgid "Starting client"
 msgstr "İstemci başlıyor"
 
-#: clientgui/MainDocument.cpp:591
+#: MainDocument.cpp:591
 msgid "Connecting to client"
 msgstr "İstemciye bağlanılıyor"
 
-#: clientgui/MainDocument.cpp:1205
+#: MainDocument.cpp:1195
 msgid "Retrieving system state; please wait..."
 msgstr "Sistem durum bilgisi alınıyor; lütfen bekleyin..."
 
-#: clientgui/MainDocument.cpp:1826
+#: MainDocument.cpp:1816
 msgid "Missing application"
 msgstr "Uygulama bulunamadı"
 
-#: clientgui/MainDocument.cpp:1827
-msgid "Please download and install the CoRD application from http://cord.sourceforge.net"
+#: MainDocument.cpp:1817
+msgid ""
+"Please download and install the CoRD application from "
+"http://cord.sourceforge.net"
 msgstr "Lütfen CoRD uygulamasını buradan indirin ve kurun: http://cord.sourceforge.net"
 
-#: clientgui/MainDocument.cpp:2442
+#: MainDocument.cpp:2432
 msgid "on batteries"
 msgstr "pil gücünde"
 
-#: clientgui/MainDocument.cpp:2443
+#: MainDocument.cpp:2433
 msgid "computer is in use"
 msgstr "bilgisayar kullanımda"
 
-#: clientgui/MainDocument.cpp:2444
+#: MainDocument.cpp:2434
 msgid "user request"
 msgstr "kullanıcı talebi"
 
-#: clientgui/MainDocument.cpp:2445
+#: MainDocument.cpp:2435
 msgid "time of day"
 msgstr "günlük zamanlama"
 
-#: clientgui/MainDocument.cpp:2446
+#: MainDocument.cpp:2436
 msgid "CPU benchmarks in progress"
 msgstr "İşlemci testleri sürüyor"
 
-#: clientgui/MainDocument.cpp:2447
+#: MainDocument.cpp:2437
 msgid "need disk space - check preferences"
 msgstr "disk alanı gerekiyor - tercihleri kontrol edin"
 
-#: clientgui/MainDocument.cpp:2448
+#: MainDocument.cpp:2438
 msgid "computer is not in use"
 msgstr "bilgisayar kullanımda değil"
 
-#: clientgui/MainDocument.cpp:2449
+#: MainDocument.cpp:2439
 msgid "starting up"
 msgstr "başlıyor"
 
-#: clientgui/MainDocument.cpp:2450
+#: MainDocument.cpp:2440
 msgid "an exclusive app is running"
 msgstr "ayrıcalıklı bir uygulama çalışıyor"
 
-#: clientgui/MainDocument.cpp:2451
+#: MainDocument.cpp:2441
 msgid "CPU is busy"
 msgstr "İşlemci meşgul"
 
-#: clientgui/MainDocument.cpp:2452
+#: MainDocument.cpp:2442
 msgid "network bandwidth limit exceeded"
 msgstr "ağ kullanım kotası doldu"
 
-#: clientgui/MainDocument.cpp:2453
+#: MainDocument.cpp:2443
 msgid "requested by operating system"
 msgstr "işletim sistemi tarafından istendi"
 
-#: clientgui/MainDocument.cpp:2455
+#: MainDocument.cpp:2445
 msgid "unknown reason"
 msgstr "bilinmeyen sebep"
 
-#: clientgui/MainDocument.cpp:2477
+#: MainDocument.cpp:2467
 msgid "GPU missing, "
 msgstr "GPU mevcut değil, "
 
-#: clientgui/MainDocument.cpp:2484
+#: MainDocument.cpp:2474
 msgid "New"
 msgstr "Yeni"
 
-#: clientgui/MainDocument.cpp:2488
+#: MainDocument.cpp:2478
 msgid "Download failed"
 msgstr "İndirme başarısız"
 
-#: clientgui/MainDocument.cpp:2490
+#: MainDocument.cpp:2480
 msgid "Downloading"
 msgstr "İndiriliyor"
 
-#: clientgui/MainDocument.cpp:2492
-#: clientgui/MainDocument.cpp:2557
+#: MainDocument.cpp:2482 MainDocument.cpp:2552
 msgid " (suspended - "
 msgstr " (durakladı - "
 
-#: clientgui/MainDocument.cpp:2500
+#: MainDocument.cpp:2490
 msgid "Project suspended by user"
 msgstr "Kullanıcı projeyi durdurdu"
 
-#: clientgui/MainDocument.cpp:2502
+#: MainDocument.cpp:2492
 msgid "Task suspended by user"
 msgstr "Kullanıcı işi durdurdu"
 
-#: clientgui/MainDocument.cpp:2504
+#: MainDocument.cpp:2494
 msgid "Suspended - "
 msgstr "Durakladı - "
 
-# 75%
-#: clientgui/MainDocument.cpp:2510
+#: MainDocument.cpp:2500
 msgid "GPU suspended - "
 msgstr "GPU durakladı - "
 
-#: clientgui/MainDocument.cpp:2517
+#: MainDocument.cpp:2507
 msgid "Waiting for memory"
 msgstr "Bellek için bekleniyor"
 
-#: clientgui/MainDocument.cpp:2519
+#: MainDocument.cpp:2509
 msgid "Waiting for shared memory"
 msgstr "Paylaşılan bellek için bekleniyor"
 
-#: clientgui/MainDocument.cpp:2521
+#: MainDocument.cpp:2512
+msgid "Running, high priority"
+msgstr "Çalışıyor, yüksek öncelikli"
+
+#: MainDocument.cpp:2514
 msgid "Running"
 msgstr "Çalışıyor"
 
-#: clientgui/MainDocument.cpp:2523
+#: MainDocument.cpp:2517
 msgid " (non-CPU-intensive)"
 msgstr " (CPU-yoğun-değil)"
 
-#: clientgui/MainDocument.cpp:2526
+#: MainDocument.cpp:2520
 msgid "Waiting to run"
 msgstr "Çalışmayı bekliyor"
 
-#: clientgui/MainDocument.cpp:2528
-#: clientgui/MainDocument.cpp:2534
+#: MainDocument.cpp:2522 MainDocument.cpp:2528
 msgid "Ready to start"
 msgstr "Başlamaya hazır"
 
-#: clientgui/MainDocument.cpp:2538
-msgid "Postponed: "
-msgstr ""
+#: MainDocument.cpp:2532
+msgid " (Scheduler wait: "
+msgstr " (Zamanlanmış bekleme: "
 
-#: clientgui/MainDocument.cpp:2541
-msgid "Postponed"
-msgstr ""
+#: MainDocument.cpp:2536
+msgid " (Scheduler wait)"
+msgstr " (Zamanlanmış bekleme)"
 
-#: clientgui/MainDocument.cpp:2545
-msgid "Waiting for network access"
-msgstr ""
+#: MainDocument.cpp:2540
+msgid " (Waiting for network access)"
+msgstr " (Ağ erişimi için bekleniyor)"
 
-#: clientgui/MainDocument.cpp:2549
+#: MainDocument.cpp:2544
 msgid "Computation error"
 msgstr "Hesaplama hatası"
 
-#: clientgui/MainDocument.cpp:2553
+#: MainDocument.cpp:2548
 msgid "Upload failed"
 msgstr "Gönderme başarısız"
 
-#: clientgui/MainDocument.cpp:2555
+#: MainDocument.cpp:2550
 msgid "Uploading"
 msgstr "Gönderiliyor"
 
-#: clientgui/MainDocument.cpp:2566
+#: MainDocument.cpp:2561
 msgid "Aborted by user"
 msgstr "Kullanıcı tarafından iptal edildi"
 
-#: clientgui/MainDocument.cpp:2569
+#: MainDocument.cpp:2564
 msgid "Aborted by project"
 msgstr "Proje tarafından iptal edildi"
 
-#: clientgui/MainDocument.cpp:2572
+#: MainDocument.cpp:2567
 msgid "Aborted: not started by deadline"
 msgstr "İptal edildi: Son teslim zamanı nedeniyle başlamadı"
 
-#: clientgui/MainDocument.cpp:2575
+#: MainDocument.cpp:2570
 msgid "Aborted: disk limit exceeded"
 msgstr "İptal edildi: Disk limitine ulaşıldı"
 
-#: clientgui/MainDocument.cpp:2578
+#: MainDocument.cpp:2573
 msgid "Aborted: run time limit exceeded"
 msgstr "İptal edildi: Zaman limitine ulaşıldı"
 
-#: clientgui/MainDocument.cpp:2581
+#: MainDocument.cpp:2576
 msgid "Aborted: memory limit exceeded"
 msgstr "İptal edildi: Bellek limitine ulaşıldı"
 
-#: clientgui/MainDocument.cpp:2584
+#: MainDocument.cpp:2579
 msgid "Aborted"
 msgstr "İptal edildi"
 
-#: clientgui/MainDocument.cpp:2589
+#: MainDocument.cpp:2584
 msgid "Acknowledged"
 msgstr "Kabul edildi"
 
-#: clientgui/MainDocument.cpp:2591
+#: MainDocument.cpp:2586
 msgid "Ready to report"
 msgstr "Raporlanmaya hazır"
 
-#: clientgui/MainDocument.cpp:2593
+#: MainDocument.cpp:2588
 #, c-format
 msgid "Error: invalid state '%d'"
 msgstr "Hata: Geçersiz durum '%d'"
 
-#: clientgui/NoInternetConnectionPage.cpp:179
+#: NoInternetConnectionPage.cpp:179
 msgid "No Internet connection"
 msgstr "İnternet bağlantısı yok"
 
-#: clientgui/NoInternetConnectionPage.cpp:182
+#: NoInternetConnectionPage.cpp:182
 msgid "Please connect to the Internet and try again."
 msgstr "Lütfen internete bağlanıp, tekrar deneyin."
 
-#: clientgui/NotDetectedPage.cpp:181
+#: NotDetectedPage.cpp:181
 msgid "Project not found"
 msgstr "Proje bulunamadı"
 
-#: clientgui/NotDetectedPage.cpp:184
+#: 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 ""
-"Belirttiğiniz adreste bir BOINC projesi bulunmuyor.\n"
-"\n"
-"Adresi kontrol edip tekrar deneyin."
+msgstr "Belirttiğiniz adreste bir BOINC projesi bulunmuyor.\n\nAdresi kontrol edip tekrar deneyin."
 
-#: clientgui/NotDetectedPage.cpp:188
+#: NotDetectedPage.cpp:188
 msgid "Account manager not found"
 msgstr "Hesap yöneticisi bulunamadı"
 
-#: clientgui/NotDetectedPage.cpp:191
+#: NotDetectedPage.cpp:191
 msgid ""
 "The URL you supplied is not that of a BOINC-based account\n"
 "manager.\n"
 "\n"
 "Please check the URL and try again."
-msgstr ""
-"Belirttiğiniz adreste bir BOINC hesap yöneticisi bulunmuyor.\n"
-"\n"
-"Adresi kontrol edip tekrar deneyin."
+msgstr "Belirttiğiniz adreste bir BOINC hesap yöneticisi bulunmuyor.\n\nAdresi kontrol edip tekrar deneyin."
 
-#: clientgui/NotFoundPage.cpp:181
+#: NotFoundPage.cpp:181
 msgid "Login Failed."
 msgstr "Giriş başarısız."
 
-#: clientgui/NotFoundPage.cpp:185
+#: NotFoundPage.cpp:185
 msgid "Check the username and password, and try again."
 msgstr "Kullanıcı adı ve parolayı kontrol edip, tekrar deneyin."
 
-#: clientgui/NotFoundPage.cpp:189
+#: NotFoundPage.cpp:189
 msgid "Check the email address and password, and try again."
 msgstr "E-posta, kullanıcı adı ve parolayı kontrol edip, tekrar deneyin."
 
-#: clientgui/NoticeListCtrl.cpp:229
+#: NoticeListCtrl.cpp:222
 msgid "more..."
 msgstr "devamı..."
 
-#: clientgui/ProjectInfoPage.cpp:221
+#: ProjectInfoPage.cpp:477 ProjectInfoPage.cpp:778 ProjectInfoPage.cpp:782
+msgid "All"
+msgstr "Tümü"
+
+#: ProjectInfoPage.cpp:615
 msgid "Choose a project"
 msgstr "Bir proje seçin"
 
-#: clientgui/ProjectInfoPage.cpp:228
+#: ProjectInfoPage.cpp:619
 msgid "To choose a project, click its name or type its URL below."
 msgstr "Bir proje seçmek için, ismine tıklayın ya da aşağıya adresini girin."
 
-#: clientgui/ProjectInfoPage.cpp:246
+#: ProjectInfoPage.cpp:623
 msgid "Categories:"
 msgstr "Kategoriler:"
 
-#: clientgui/ProjectInfoPage.cpp:267
+#: ProjectInfoPage.cpp:627 sg_ProjectPanel.cpp:89
 msgid "Projects:"
 msgstr "Projeler:"
 
-#: clientgui/ProjectInfoPage.cpp:279
+#: ProjectInfoPage.cpp:631
 msgid "Project details"
 msgstr "Proje detayları"
 
-#: clientgui/ProjectInfoPage.cpp:291
+#: ProjectInfoPage.cpp:635
 msgid "Research area:"
 msgstr "Araştırma alanı:"
 
-#: clientgui/ProjectInfoPage.cpp:302
+#: ProjectInfoPage.cpp:639
 msgid "Organization:"
 msgstr "Organizasyon:"
 
-#: clientgui/ProjectInfoPage.cpp:313
+#: ProjectInfoPage.cpp:643
 msgid "Web site:"
 msgstr "İnternet sitesi:"
 
-#: clientgui/ProjectInfoPage.cpp:325
+#: ProjectInfoPage.cpp:647
 msgid "Supported systems:"
 msgstr "Desteklenen sistemler:"
 
-#: clientgui/ProjectInfoPage.cpp:363
+#: ProjectInfoPage.cpp:651
 msgid "Project URL:"
 msgstr "Proje adresi:"
 
-#: clientgui/ProjectInfoPage.cpp:499
-#: clientgui/ProjectInfoPage.cpp:754
-#: clientgui/ProjectInfoPage.cpp:758
-msgid "All"
-msgstr "Tümü"
-
-#: clientgui/ProjectInfoPage.cpp:802
-msgid "This project may not have work for your type of computer.  Do you want to add it anyway?"
+#: ProjectInfoPage.cpp:826
+msgid ""
+"This project may not have work for your type of computer.  Do you want to "
+"add it anyway?"
 msgstr "Bu proje bilgisayarınızın özelliklerine uygun işe sahip olmayabilir.  Yine de eklemek istediğinize emin misiniz?"
 
-#: clientgui/ProjectInfoPage.cpp:826
+#: ProjectInfoPage.cpp:850
 msgid "You already added this project. Please choose a different project."
 msgstr "Bu projeyi zaten eklemiş durumdasınız. Lütfen farklı bir proje seçin."
 
-#: clientgui/ProjectProcessingPage.cpp:321
+#: ProjectProcessingPage.cpp:321
 msgid "Communicating with project."
 msgstr "Proje ile bağlantı kuruluyor."
 
-#: clientgui/ProjectProcessingPage.cpp:510
+#: ProjectProcessingPage.cpp:509
 msgid "Required files not found on the server."
 msgstr "Gerekli dosyalar sunucu üzerinde bulunamadı."
 
-#: clientgui/ProjectProcessingPage.cpp:513
-#: clientgui/ProjectProcessingPage.cpp:586
+#: ProjectProcessingPage.cpp:512 ProjectProcessingPage.cpp:574
 msgid "An internal server error has occurred."
 msgstr "Sunucuda dahili bir hata meydana geldi."
 
-#: clientgui/ProjectPropertiesPage.cpp:334
+#: ProjectPropertiesPage.cpp:334
 msgid ""
 "Communicating with project\n"
 "Please wait..."
-msgstr ""
-"Projeye bağlanılıyor\n"
-"Lütfen bekleyin..."
-
-#: clientgui/ProjectWelcomePage.cpp:251
-#, c-format
-msgid "Welcome to %s."
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:254
-msgid "You have volunteered to compute for this project:"
-msgstr ""
+msgstr "Projeye bağlanılıyor\nLütfen bekleyin..."
 
-#: clientgui/ProjectWelcomePage.cpp:255
-msgid "Name:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:258
-msgid "Home:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:262
-msgid "Description:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:265
-msgid "URL:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:268
-msgid "User:"
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:273
-msgid "WARNING: This project is not registered with BOINC.  Make sure you trust it before continuing."
-msgstr ""
-
-#: clientgui/ProjectWelcomePage.cpp:277
-msgid "To continue, click Next."
-msgstr "Devam etmek için, İleri'yi tıklayın."
-
-#: clientgui/ProxyInfoPage.cpp:195
+#: ProxyInfoPage.cpp:195
 msgid "Network communication failure"
 msgstr "Ağ bağlantısı başarısız"
 
-#: clientgui/ProxyInfoPage.cpp:199
+#: ProxyInfoPage.cpp:199
 msgid ""
 "The World Community Grid - BOINC software failed to communicate\n"
 "over the Internet. The most likely reasons are:\n"
@@ -2728,22 +2485,9 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"The World Community Grid - BOINC yazılımı İnternet üzerinden\n"
-"bağlantı gerçekleştiremedi. Sıkça karşılaşılan sorunlar:\n"
-"\n"
-"1) Bağlantı problemi. Ağ ve modem bağlantılarınızı kontrol edin ve\n"
-"tekrar denemek için Geri'yi tıklayın.\n"
-"\n"
-"2) Kişisel güvenlik duvarı yazılımı World Community Grid - BOINC\n"
-"yazılımını engelliyor. Kişisel güvenlik duvarınızı, BOINC ve BOINC\n"
-"Manager'ın bağlantı noktaları (port) 80 ve 443 üzerinden haberleşmesine\n"
-"izin verecek şekilde yapılandırın ve yeniden denemek için Geri'yi tıklayın.\n"
-"\n"
-"3) Bir vekil sunucu (proxy) kullanıyorsunuz.\n"
-"BOINC'in vekil sunucu ayarlarını yapmak için İleri'yi tıklayın."
+msgstr "The World Community Grid - BOINC yazılımı İnternet üzerinden\nbağlantı gerçekleştiremedi. Sıkça karşılaşılan sorunlar:\n\n1) Bağlantı problemi. Ağ ve modem bağlantılarınızı kontrol edin ve\ntekrar denemek için Geri'yi tıklayın.\n\n2) Kişisel güvenlik duvarı yazılımı World Community Grid - BOINC\nyazılımını engelliyor. Kişisel güvenlik duvarınızı, BOINC ve BOINC\nManager'ın bağlantı noktaları (port) 80 ve 443 üzerinden haberleşmesine\nizin verecek şekilde yapılandırın ve yeniden d [...]
 
-#: clientgui/ProxyInfoPage.cpp:203
+#: ProxyInfoPage.cpp:203
 msgid ""
 "BOINC failed to communicate on the Internet.\n"
 "The most likely reasons are:\n"
@@ -2758,1944 +2502,1201 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"BOINC yazılımı İnternet üzerinden bağlantı gerçekleştiremedi.\n"
-"Sıkça karşılaşılan sorunlar:\n"
-"\n"
-"1) Bağlantı problemi. Ağ ve modem bağlantılarınızı kontrol edin ve\n"
-"tekrar denemek için Geri'yi tıklayın.\n"
-"\n"
-"2) Kişisel güvenlik duvarı yazılımı BOINC'i engelliyor. Kişisel güvenlik\n"
-"duvarınızı, BOINC ve BOINC Manager'ın bağlantı noktaları 80 ve 443\n"
-"üzerinden haberleşmesine izin verecek şekilde yapılandırın ve yeniden\n"
-"denemek için Geri'yi tıklayın.\n"
-"\n"
-"3) Bir vekil sunucu (proxy) kullanıyorsunuz.\n"
-"BOINC'in vekil sunucu ayarlarını yapmak için İleri'yi tıklayın."
+msgstr "BOINC yazılımı İnternet üzerinden bağlantı gerçekleştiremedi.\nSıkça karşılaşılan sorunlar:\n\n1) Bağlantı problemi. Ağ ve modem bağlantılarınızı kontrol edin ve\ntekrar denemek için Geri'yi tıklayın.\n\n2) Kişisel güvenlik duvarı yazılımı BOINC'i engelliyor. Kişisel güvenlik\nduvarınızı, BOINC ve BOINC Manager'ın bağlantı noktaları 80 ve 443\nüzerinden haberleşmesine izin verecek şekilde yapılandırın ve yeniden\ndenemek için Geri'yi tıklayın.\n\n3) Bir vekil sunucu (proxy) kulla [...]
 
-#: clientgui/ProxyPage.cpp:331
+#: ProxyPage.cpp:331
 msgid "Proxy configuration"
 msgstr "Proxy yapılandırması"
 
-#: clientgui/ProxyPage.cpp:334
+#: ProxyPage.cpp:334
 msgid "HTTP proxy"
 msgstr "HTTP proxy"
 
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
+#: ProxyPage.cpp:337 ProxyPage.cpp:357
 msgid "Server:"
 msgstr "Sunucu:"
 
-#: clientgui/ProxyPage.cpp:350
+#: ProxyPage.cpp:350
 msgid "Autodetect"
 msgstr "Otomatik belirle"
 
-#: clientgui/ProxyPage.cpp:354
+#: ProxyPage.cpp:354
 msgid "SOCKS proxy"
 msgstr "SOCKS proxy"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:167
-msgid "Advanced View...\tCtrl+Shift+A"
-msgstr "Gelişmiş görünüm...\tCtrl+Shift+A"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:168
-msgid "Display the advanced graphical interface."
-msgstr "Gelişmiş grafiksel arayüzü görüntüler."
+#: TermsOfUsePage.cpp:218
+msgid "Terms of Use"
+msgstr "Kullanım Koşulları"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:175
-msgid "Skin"
-msgstr "Kaplama"
+#: TermsOfUsePage.cpp:222
+msgid "Please read the following terms of use:"
+msgstr "Lütfen aşağıdaki kullanım koşullarını okuyun:"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:177
-msgid "Select the appearance of the user interface."
-msgstr "Kullanıcı arayüzünün görünümünü seçin."
+#: TermsOfUsePage.cpp:231
+msgid "I agree to the terms of use."
+msgstr "Kullanım koşullarını kabul ediyorum."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:224
-#, c-format
-msgid "&%s"
-msgstr "&%s"
+#: TermsOfUsePage.cpp:237
+msgid "I do not agree to the terms of use."
+msgstr "Kullanım koşullarını kabul etmiyorum."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:405
-msgid "Default"
-msgstr "Varsayılan"
+#: UnavailablePage.cpp:183
+msgid "Project temporarily unavailable"
+msgstr "Proje geçiçi olarak kullanılamaz durumda"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:848
-msgid "Suspend"
-msgstr "Duraklat"
+#: UnavailablePage.cpp:186
+msgid ""
+"The project is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "Proje geçiçi olarak kullanılamaz durumda.\n\nLütfen daha sonra tekrar deneyin."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:850
-msgid "Suspend Computing"
-msgstr "Hesaplamayı duraklatır"
+#: UnavailablePage.cpp:190
+msgid "Account manager temporarily unavailable"
+msgstr "Hesap yöneticisi geçici olarak devre dışı."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:851
-msgid "Resume Computing"
-msgstr "Hesaplamayı sürdürür"
+#: UnavailablePage.cpp:193
+msgid ""
+"The account manager is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "Hesap yöneticisi geçici olarak devre dışı.\n\nLütfen daha sonra tekrar deneyin."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:867
-msgid "Notices"
-msgstr "Bildirimler"
+#: ValidateAccountKey.cpp:68
+msgid "Please specify an account key to continue."
+msgstr "Lütfen devam etmek için bir hesap anahtarı belirtin."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:868
-msgid "Open a window to view notices from projects or BOINC"
-msgstr "Projelerden ya da BOINC'ten gelen bildirimleri gösterir"
+#: ValidateAccountKey.cpp:71
+msgid "Invalid Account Key; please enter a valid Account Key"
+msgstr "Geçersiz hesap anahtarı; lütfen geçerli bir hesap anahtarı girin."
 
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
-msgstr "Bildirimler alınıyor; lütfen bekleyin..."
+#: ValidateAccountKey.cpp:82 ValidateEmailAddress.cpp:86
+msgid "Validation conflict"
+msgstr "Doğrulama tutmuyor"
 
-#: clientgui/sg_DlgMessages.cpp:132
-msgid "There are no notices at this time."
-msgstr "Şu anda görüntülenecek bildirim yok."
+#: ValidateEmailAddress.cpp:72
+msgid "Please specify an email address"
+msgstr "Lütfen bir e-posta adresi belirtin."
 
-#: clientgui/sg_DlgMessages.cpp:146
-msgid "Close"
-msgstr "Kapat"
+#: ValidateEmailAddress.cpp:75
+msgid "Invalid email address; please enter a valid email address"
+msgstr "Geçersiz e-posta adresi; lütfen geçerli bir e-posta adresi girin."
 
-#: clientgui/sg_DlgMessages.cpp:394
-#, c-format
-msgid "%s - Notices"
-msgstr "%s  - Bildirimler"
+#: ValidateURL.cpp:69
+msgid "Missing URL"
+msgstr "Eksik adres"
 
-#: clientgui/sg_DlgPreferences.cpp:270
-msgid "This dialog controls preferences for this computer only."
-msgstr "Bu pencere, tercihleri yalnızca bu bilgisayarınız için özelleştirir."
+#: ValidateURL.cpp:70
+msgid ""
+"Please specify a URL.\n"
+"For example:\n"
+"http://www.example.com/"
+msgstr "Lütfen bir internet adresi belirtin.\nÖrneğin:\nhttp://www.ornek.com/"
 
-#: clientgui/sg_DlgPreferences.cpp:275
-msgid "Click OK to set preferences."
-msgstr "Tercihlerinizi kaydetmek için 'Tamam'ı tıklayın."
+#: ValidateURL.cpp:83 ValidateURL.cpp:87 ValidateURL.cpp:91
+#: ValidateURL.cpp:103 ValidateURL.cpp:107 ValidateURL.cpp:110
+msgid "Invalid URL"
+msgstr "Geçersiz adres"
 
-#: clientgui/sg_DlgPreferences.cpp:280
-msgid "Click Clear to restore web-based settings for all preferences listed below."
-msgstr "Aşağıda listelenen tüm tercihler ​için web tabanlı ayarları geri yüklemek için Temizle'yi tıklatın."
+#: ValidateURL.cpp:84 ValidateURL.cpp:88 ValidateURL.cpp:92
+msgid ""
+"Please specify a valid URL.\n"
+"For example:\n"
+"http://boincproject.example.com"
+msgstr "Lütfen geçerli bir internet adresi belirtin.\nÖrneğin:\nhttp:/boincproject.ornek.com"
 
-#: clientgui/sg_DlgPreferences.cpp:287
-msgid "For additional settings, select Computing Preferences in the Advanced View."
-msgstr "Ek ayarlar için, 'Gelişmiş görünüm'de 'Hesaplama tercihleri' seçeneğini seçin."
+#: ValidateURL.cpp:104 ValidateURL.cpp:108
+#, c-format
+msgid "'%s' does not contain a valid host name."
+msgstr "'%s' geçerli bir bilgisayar adı içermiyor."
 
-#: clientgui/sg_DlgPreferences.cpp:315
-msgid "Do work only between:"
-msgstr "Yalnızca bu saatler arasında çalıştır:"
+#: ValidateURL.cpp:111
+#, c-format
+msgid "'%s' does not contain a valid path."
+msgstr "'%s' geçerli bir yol içermiyor."
 
-#: clientgui/sg_DlgPreferences.cpp:337
-msgid "Connect to internet only between:"
-msgstr "Bu saatler arasında internete bağlan:"
+#: ViewMessages.cpp:84 ViewProjects.cpp:170 ViewStatistics.cpp:1978
+#: ViewTransfers.cpp:160 ViewWork.cpp:183
+msgid "Commands"
+msgstr "Komutlar"
 
-#: clientgui/sg_DlgPreferences.cpp:359
-#: clientgui/sg_DlgPreferences.cpp:376
-msgid "Use no more than:"
-msgstr "En çok bu kadar kullan:"
+#: ViewMessages.cpp:88
+msgid "Copy all messages"
+msgstr "Tüm mesajları kopyala"
 
-#: clientgui/sg_DlgPreferences.cpp:372
-msgid "of disk space"
-msgstr "disk alanı"
+#: ViewMessages.cpp:95
+msgid "Copy selected messages"
+msgstr "Seçili mesajları kopyala"
 
-#: clientgui/sg_DlgPreferences.cpp:389
-msgid "of the processor"
-msgstr "işlemci (CPU) gücü"
+#: ViewMessages.cpp:106 ViewMessages.cpp:502
+msgid "Show only this project"
+msgstr "Yalnızca bu projeyi göster"
 
-#: clientgui/sg_DlgPreferences.cpp:393
-msgid "Do work while on battery?"
-msgstr "Pil gücündeyken işleri çalıştır?"
-
-#: clientgui/sg_DlgPreferences.cpp:406
-msgid "Do work after idle for:"
-msgstr "Bu kadar süre boşta kaldığında çalıştır:"
-
-#: clientgui/sg_DlgPreferences.cpp:431
-msgid "Clear all local preferences listed above and close the dialog"
-msgstr "Yukarıda listelenen tüm yerel tercihleri temizler ve pencereyi kapatır"
-
-#: clientgui/sg_DlgPreferences.cpp:609
-#: clientgui/sg_DlgPreferences.cpp:612
-#: clientgui/sg_DlgPreferences.cpp:688
-#: clientgui/sg_DlgPreferences.cpp:692
-#: clientgui/sg_DlgPreferences.cpp:704
-#: clientgui/sg_DlgPreferences.cpp:708
-#: clientgui/sg_DlgPreferences.cpp:851
-#: clientgui/sg_DlgPreferences.cpp:862
-msgid "Anytime"
-msgstr "Herhangi"
-
-#: clientgui/sg_DlgPreferences.cpp:645
-msgid "100 MB"
-msgstr "100 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:646
-msgid "200 MB"
-msgstr "200 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:647
-msgid "500 MB"
-msgstr "500 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:648
-msgid "1 GB"
-msgstr "1 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:649
-msgid "2 GB"
-msgstr "2 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:650
-msgid "5 GB"
-msgstr "5 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:651
-msgid "10 GB"
-msgstr "10 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:652
-msgid "20 GB"
-msgstr "20 GB"
+#: ViewMessages.cpp:107 ViewMessages.cpp:503
+msgid "Show only the messages for the selected project."
+msgstr "Yalnızca şu anda seçili projeye ait mesajları ve BOINC'in genel mesajlarını görüntüler."
 
-#: clientgui/sg_DlgPreferences.cpp:653
-msgid "50 GB"
-msgstr "50 GB"
+#: ViewMessages.cpp:164
+msgid "Messages"
+msgstr "Mesajlar"
 
-#: clientgui/sg_DlgPreferences.cpp:654
-msgid "100 GB"
-msgstr "100 GB"
+#: ViewMessages.cpp:187
+msgid "Copying all messages to the clipboard..."
+msgstr "Tüm mesajlar panoya kopyalanıyor..."
 
-#: clientgui/sg_DlgPreferences.cpp:724
-#, c-format
-msgid "%d MB"
-msgstr "%d MB"
+#: ViewMessages.cpp:223
+msgid "Copying selected messages to the clipboard..."
+msgstr "Seçili mesajlar panoya kopyalanıyor..."
 
-#: clientgui/sg_DlgPreferences.cpp:726
-#, c-format
-msgid "%4.2f GB"
-msgstr "%4.2f GB"
+#: ViewMessages.cpp:286
+msgid "Filtering messages..."
+msgstr "Mesajlar filtreleniyor...."
 
-#: clientgui/sg_DlgPreferences.cpp:767
-#, c-format
-msgid "%d%%"
-msgstr "%%%d"
+#: ViewMessages.cpp:494
+msgid "Show all messages"
+msgstr "Tüm mesajları göster"
 
-#: clientgui/sg_DlgPreferences.cpp:803
-msgid "0 (Run Always)"
-msgstr "0 (Daima çalış)"
+#: ViewMessages.cpp:495
+msgid "Show messages for all projects."
+msgstr "Tüm projeler için mesajları gösterir."
 
-#: clientgui/sg_DlgPreferences.cpp:806
-#, c-format
-msgid "%d"
-msgstr "%d"
+#: ViewNotices.cpp:58 sg_DlgMessages.cpp:124
+msgid "Fetching notices; please wait..."
+msgstr "Bildirimler alınıyor; lütfen bekleyin..."
 
-#: clientgui/sg_DlgPreferences.cpp:953
-#, c-format
-msgid "%s - Computing Preferences"
-msgstr ""
+#: ViewNotices.cpp:65 sg_DlgMessages.cpp:132
+msgid "There are no notices at this time."
+msgstr "Şu anda görüntülenecek bildirim yok."
 
-#: clientgui/sg_DlgPreferences.cpp:1033
-msgid "Do you really want to clear all local preferences?\n"
-msgstr "Tüm yerel tercihlerinizi kaldırmak istediğinize emin misiniz?\n"
+#: ViewNotices.cpp:99 sg_BoincSimpleFrame.cpp:776
+msgid "Notices"
+msgstr "Bildirimler"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:66
-#: clientgui/ViewProjects.cpp:179
+#: ViewProjects.cpp:174 sg_ProjectCommandPopup.cpp:61
 msgid "Update"
 msgstr "Güncelle"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:67
-#: clientgui/ViewProjects.cpp:180
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
+#: ViewProjects.cpp:175 sg_ProjectCommandPopup.cpp:62
+msgid ""
+"Report all completed tasks, get latest credit, get latest preferences, and "
+"possibly get more tasks."
 msgstr "Tamamlanan işleri raporlar, güncel kredi bigilerini ve tercih ayarlarını alır ve gerekiyorsa daha fazla iş indirir."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:73
-#: clientgui/sg_ProjectCommandPopup.cpp:129
-#: clientgui/ViewProjects.cpp:187
-#: clientgui/ViewProjects.cpp:727
+#: 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
+msgid "Suspend"
+msgstr "Duraklat"
+
+#: ViewProjects.cpp:182 ViewProjects.cpp:722 sg_ProjectCommandPopup.cpp:68
+#: sg_ProjectCommandPopup.cpp:114
 msgid "Suspend tasks for this project."
 msgstr "Bu projenin işlerini durdurur."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:78
-#: clientgui/sg_ProjectCommandPopup.cpp:136
-#: clientgui/ViewProjects.cpp:193
-#: clientgui/ViewProjects.cpp:746
+#: ViewProjects.cpp:188 ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:73
+#: sg_ProjectCommandPopup.cpp:121
 msgid "No new tasks"
 msgstr "Yeni işler indirme"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:79
-#: clientgui/ViewProjects.cpp:194
+#: ViewProjects.cpp:189 sg_ProjectCommandPopup.cpp:74
 msgid "Don't get new tasks for this project."
 msgstr "Bu proje artık yeni işler indirmez."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:200
+#: ViewProjects.cpp:195 sg_ProjectCommandPopup.cpp:79
 msgid "Reset project"
 msgstr "Projeyi sıfırla"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:85
-#: clientgui/ViewProjects.cpp:201
-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."
+#: ViewProjects.cpp:196 sg_ProjectCommandPopup.cpp:80
+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 "Bu projeye ilişkin tüm dosyalar ile işleri siler ve yeni işler alır.  Tamamlanmış işler varsa sonuçları raporlamak için önce projeyi güncelleyebilirsiniz."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:91
-#: clientgui/ViewProjects.cpp:208
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
+#: ViewProjects.cpp:203 sg_ProjectCommandPopup.cpp:86
+msgid ""
+"Remove this project.  Tasks in progress will be lost (use 'Update' first to "
+"report any completed tasks)."
 msgstr "Bu bilgisayardan bu projeyi kaldırır.  Sürmekte olan işler kaybedilir (tamamlanmış işlerin sonuçlarını göndermek için önce 'Güncelle' komutunu kullanın)."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:96
-#: clientgui/sg_TaskCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:214
+#: ViewProjects.cpp:209 ViewWork.cpp:222 sg_ProjectCommandPopup.cpp:91
+#: sg_TaskCommandPopup.cpp:78
 msgid "Properties"
 msgstr "Özellikler"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:97
-#: clientgui/ViewProjects.cpp:215
+#: ViewProjects.cpp:210 sg_ProjectCommandPopup.cpp:92
 msgid "Show project details."
 msgstr "Proje detaylarını görüntüler."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:126
-#: clientgui/ViewProjects.cpp:723
-msgid "Resume tasks for this project."
-msgstr "Bu projenin işleri yeniden çalıştırılır."
+#: ViewProjects.cpp:220 ViewStatistics.cpp:450
+msgid "Account"
+msgstr "Hesap"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:133
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow new tasks"
-msgstr "Yeni işler indir"
+#: ViewProjects.cpp:222
+msgid "Work done"
+msgstr "Kredi"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:134
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow fetching new tasks for this project."
-msgstr "Bu projenin yeni işler indirmesine izin verir."
+#: ViewProjects.cpp:223
+msgid "Avg. work done"
+msgstr "Günlük ortalama kredi"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:137
-#: clientgui/ViewProjects.cpp:746
-msgid "Don't fetch new tasks for this project."
-msgstr "Bu projeye artık yeni işler alınmaz."
+#: ViewProjects.cpp:225 ViewTransfers.cpp:188 ViewWork.cpp:234
+msgid "Status"
+msgstr "Durum"
+
+#: ViewProjects.cpp:250
+msgid "Projects"
+msgstr "Projeler"
+
+#: ViewProjects.cpp:302
+msgid "Updating project..."
+msgstr "Proje güncelleniyor..."
+
+#: ViewProjects.cpp:344
+msgid "Resuming project..."
+msgstr "Proje sürdürülüyor..."
+
+#: ViewProjects.cpp:348
+msgid "Suspending project..."
+msgstr "Proje durduruluyor..."
+
+#: ViewProjects.cpp:385
+msgid "Telling project to allow additional task downloads..."
+msgstr "Projeye yeni iş indirmeleri yapılabileceği bildiriliyor..."
+
+#: ViewProjects.cpp:389
+msgid "Telling project to not fetch any additional tasks..."
+msgstr "Projeye yeni iş indirmeleri yapılmayacağı bildiriliyor..."
+
+#: ViewProjects.cpp:425
+msgid "Resetting project..."
+msgstr "Proje sıfırlanıyor..."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:229
-#: clientgui/ViewProjects.cpp:443
+#: ViewProjects.cpp:438 sg_ProjectCommandPopup.cpp:214
 #, c-format
 msgid "Are you sure you want to reset project '%s'?"
 msgstr "'%s' projesini sıfırlamak istediğinize emin misiniz?"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:235
-#: clientgui/ViewProjects.cpp:449
+#: ViewProjects.cpp:444 sg_ProjectCommandPopup.cpp:220
 msgid "Reset Project"
 msgstr "Projeyi sıfırla"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:266
-#: clientgui/ViewProjects.cpp:501
+#: ViewProjects.cpp:483
+msgid "Removing project..."
+msgstr "Proje kaldırılıyor..."
+
+#: ViewProjects.cpp:496 sg_ProjectCommandPopup.cpp:251
 #, c-format
 msgid "Are you sure you want to remove project '%s'?"
 msgstr "'%s' projesini kaldırmak istediğinize emin misiniz?"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:272
-#: clientgui/ViewProjects.cpp:507
+#: ViewProjects.cpp:502 sg_ProjectCommandPopup.cpp:257
 msgid "Remove Project"
 msgstr "Projeyi kaldır"
 
-#: clientgui/sg_ProjectPanel.cpp:72
-msgid "Add Project"
-msgstr "Proje ekle"
+#: ViewProjects.cpp:543 ViewWork.cpp:599
+msgid "Launching browser..."
+msgstr "Tarayıcı çalıştırılıyor..."
 
-#: clientgui/sg_ProjectPanel.cpp:73
-msgid "Synchronize"
-msgstr "Eşitle"
+#: ViewProjects.cpp:718 sg_ProjectCommandPopup.cpp:111
+msgid "Resume tasks for this project."
+msgstr "Bu projenin işleri yeniden çalıştırılır."
 
-#: clientgui/sg_ProjectPanel.cpp:74
-msgid "Work done for this project"
-msgstr "Bu projede elde ettiğiniz toplam kredi"
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:118
+msgid "Allow new tasks"
+msgstr "Yeni işler indir"
 
-#: clientgui/sg_ProjectPanel.cpp:77
-msgid "Synchronize projects with account manager system"
-msgstr "Projeleri hesap yöneticisi sistemiyle senkronize eder"
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:119
+msgid "Allow fetching new tasks for this project."
+msgstr "Bu projenin yeni işler indirmesine izin verir."
 
-#: clientgui/sg_ProjectPanel.cpp:124
-msgid "Select a project to access with the controls below"
-msgstr "Aşağıdaki kontrollere erişimek için bir proje seçin"
+#: ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:122
+msgid "Don't fetch new tasks for this project."
+msgstr "Bu projeye artık yeni işler alınmaz."
 
-#: clientgui/sg_ProjectPanel.cpp:145
-msgid "Project Web Pages"
-msgstr "Proje internet sayfaları"
+#: ViewProjects.cpp:1058
+msgid "Requested by user"
+msgstr "Kullanıcı tarafından istendi"
 
-#: clientgui/sg_ProjectPanel.cpp:149
-msgid "Project Commands"
-msgstr "Proje komutları"
+#: ViewProjects.cpp:1059
+msgid "To fetch work"
+msgstr "İş indiriliyor"
 
-#: clientgui/sg_ProjectPanel.cpp:276
-#, c-format
-msgid "Pop up a menu of web sites for project %s"
-msgstr "%s projesinin internet sayfaları için bir menü açar"
+#: ViewProjects.cpp:1060
+msgid "To report completed tasks"
+msgstr "Tamamlanan işler raporlanıyor"
 
-#: clientgui/sg_ProjectPanel.cpp:278
-#, c-format
-msgid "Pop up a menu of commands to apply to project %s"
-msgstr "%s projesine verilebilecek komutları gösterir"
+#: ViewProjects.cpp:1061
+msgid "To send trickle-up message"
+msgstr "İş ilerleme mesajı gönderimi"
 
-#: clientgui/sg_TaskCommandPopup.cpp:66
-msgid "Show graphics"
-msgstr "Grafikleri göster"
+#: ViewProjects.cpp:1062
+msgid "Requested by account manager"
+msgstr "Hesap yöneticisi tarafından istendi"
 
-#: clientgui/sg_TaskCommandPopup.cpp:67
-msgid "Show application graphics in a window."
-msgstr "Uygulama grafiklerini bir pencerede gösterir."
+#: ViewProjects.cpp:1063
+msgid "Project initialization"
+msgstr "Proje başlatılıyor"
 
-#: clientgui/sg_TaskCommandPopup.cpp:73
-msgid "Suspend this task."
-msgstr "Bu işi duraklat."
+#: ViewProjects.cpp:1064
+msgid "Requested by project"
+msgstr "Proje tarafından istendi"
 
-#: clientgui/sg_TaskCommandPopup.cpp:78
-msgid "Abort"
-msgstr "İptal"
+#: ViewProjects.cpp:1065
+msgid "Unknown reason"
+msgstr "Bilinmeyen sebep"
 
-#: clientgui/sg_TaskCommandPopup.cpp:79
-msgid "Abandon this task. You will get no credit for it."
-msgstr "Bu işi iptal eder. Bu iş için kredi alamayacaksanız."
+#: ViewProjects.cpp:1079
+msgid "Suspended by user"
+msgstr "Kullanıcı tarafından durduruldu"
 
-#: clientgui/sg_TaskCommandPopup.cpp:85
-msgid "Show task details."
-msgstr "Seçili işin detaylı bilgilerini gösterir."
+#: ViewProjects.cpp:1082
+msgid "Won't get new tasks"
+msgstr "Yeni işler alınmayacak"
 
-#: clientgui/sg_TaskCommandPopup.cpp:119
-msgid "Resume work for this task."
-msgstr "Seçili işlerin çalışmasını sürdürür."
+#: ViewProjects.cpp:1085
+msgid "Project ended - OK to remove"
+msgstr "Proje sona erdi - Kaldırmak için Tamam'a tıklayın"
 
-#: clientgui/sg_TaskCommandPopup.cpp:123
-msgid "Suspend work for this task."
-msgstr "Seçili işlerin çalışmasını durdurur."
+#: ViewProjects.cpp:1088
+msgid "Will remove when tasks done"
+msgstr "İşler tamamlandığında kaldırılacak"
 
-#: 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"
-"adlı işi iptal etmek istediğinize emin misiniz?\n"
-"(İlerleme: %%%.1lf, Durum: %s)"
+#: ViewProjects.cpp:1091
+msgid "Scheduler request pending"
+msgstr "Zamanlanmış istek kuyrukta"
 
-#: clientgui/sg_TaskCommandPopup.cpp:272
-msgid "Abort task"
-msgstr "İşi iptal et"
+#: ViewProjects.cpp:1097
+msgid "Scheduler request in progress"
+msgstr "Zamanlanmış istek gerçekleştiriliyor"
 
-#: clientgui/sg_TaskPanel.cpp:468
-msgid "You don't have any projects.  Please Add a Project."
-msgstr "Katıldığınız bir proje bulunmuyor.  Lütfen bir proje ekleyin."
+#: ViewProjects.cpp:1100
+msgid "Trickle up message pending"
+msgstr "İş ilerleme mesajı kuyrukta"
 
-#: clientgui/sg_TaskPanel.cpp:469
-msgid "Not available"
-msgstr "Mevcut değil"
+#: ViewProjects.cpp:1106
+msgid "Communication deferred "
+msgstr "Haberleşme ertelendi "
 
-#: clientgui/sg_TaskPanel.cpp:480
-msgid "Tasks:"
-msgstr "İşler:"
+#: ViewResources.cpp:62
+msgid "Total disk usage"
+msgstr "Toplam disk kullanımı"
 
-#: clientgui/sg_TaskPanel.cpp:486
-msgid "Select a task to access"
-msgstr "Erişim için bir iş seçin"
+#: ViewResources.cpp:83
+msgid "Disk usage by BOINC projects"
+msgstr "BOINC projelerinin disk kullanımı"
 
-#: clientgui/sg_TaskPanel.cpp:497
-msgid "From:"
-msgstr "Sahibi:"
+#: ViewResources.cpp:116
+msgid "Disk"
+msgstr "Disk"
 
-#: clientgui/sg_TaskPanel.cpp:551
-msgid "This task's progress"
-msgstr "Bu işin ilerleme oranı"
+#: ViewResources.cpp:249
+msgid "no projects: 0 bytes used"
+msgstr "proje yok: 0 bayt kullanılıyor"
 
-#: clientgui/sg_TaskPanel.cpp:569
-msgid "Task Commands"
-msgstr "İş komutları"
+#: ViewResources.cpp:286
+msgid "used by BOINC: "
+msgstr "BOINC tarafından kullanılan: "
 
-#: clientgui/sg_TaskPanel.cpp:570
-msgid "Pop up a menu of commands to apply to this task"
-msgstr "Bu işe verilebilecek komutları gösterir"
+#: ViewResources.cpp:296
+msgid "free, available to BOINC: "
+msgstr "boş ve BOINC tarafından kullanılabilir: "
 
-#: clientgui/sg_TaskPanel.cpp:705
-#, c-format
-msgid "Application: %s"
-msgstr "Uygulama: %s"
+#: ViewResources.cpp:306
+msgid "free, not available to BOINC: "
+msgstr "boş ancak BOINC tarafından kullanılamaz: "
 
-#: clientgui/sg_TaskPanel.cpp:728
-#, c-format
-msgid "%.3f%%"
-msgstr "%%%.3f"
+#: ViewResources.cpp:316
+msgid "free: "
+msgstr "boş: "
 
-#: clientgui/sg_TaskPanel.cpp:736
-msgid "Application: Not available"
-msgstr "Uygulama: Mevcut değil"
+#: ViewResources.cpp:326
+msgid "used by other programs: "
+msgstr "başka programlarca kullanılan: "
 
-#: clientgui/sg_TaskPanel.cpp:836
-msgid "Not Available"
-msgstr "Mevcut değil"
+#: ViewStatistics.cpp:1205
+msgid "User Total"
+msgstr "Toplam Krediniz"
 
-#: clientgui/sg_TaskPanel.cpp:851
-#, c-format
-msgid "Elapsed: %s"
-msgstr "Geçen süre: %s"
+#: ViewStatistics.cpp:1206
+msgid "User Average"
+msgstr "Günlük Ortalama Krediniz"
 
-#: clientgui/sg_TaskPanel.cpp:865
-#, c-format
-msgid "Remaining (estimated): %s"
-msgstr "Kalan süre (tahmini): %s"
+#: ViewStatistics.cpp:1207
+msgid "Host Total"
+msgstr "Bilgisayarınızın Toplam Kredisi"
 
-#: clientgui/sg_TaskPanel.cpp:880
-#, c-format
-msgid "Status: %s"
-msgstr "Durum: %s"
+#: ViewStatistics.cpp:1208
+msgid "Host Average"
+msgstr "Bilgisayarınızın Günlük Ortalama Kredisi"
 
-#: clientgui/sg_TaskPanel.cpp:1227
-msgid "Retrieving current status."
-msgstr "Mevcut durum bilgisi alınıyor..."
+#: ViewStatistics.cpp:1355
+#, c-format
+msgid "Last update: %.0f days ago"
+msgstr "Son güncelleme: %.0f gün önce"
 
-#: clientgui/sg_TaskPanel.cpp:1233
-msgid "Downloading work from the server."
-msgstr "İş sunucudan indiriliyor"
+#: ViewStatistics.cpp:1982
+msgid "Show user total"
+msgstr "Toplam kredim"
 
-#: clientgui/sg_TaskPanel.cpp:1238
-msgid "Processing Suspended:  Running On Batteries."
-msgstr "Çalışma Durdu:  Pil Gücünde Çalışıyor."
+#: ViewStatistics.cpp:1983
+msgid "Show total credit for user"
+msgstr "Toplam kredinizi görüntüler"
 
-#: clientgui/sg_TaskPanel.cpp:1240
-msgid "Processing Suspended:  User Active."
-msgstr "Çalışma Durdu:  Kullanıcı Faal."
+#: ViewStatistics.cpp:1989
+msgid "Show user average"
+msgstr "Günlük ortalama kredim"
 
-#: clientgui/sg_TaskPanel.cpp:1242
-msgid "Processing Suspended:  User paused processing."
-msgstr "Çalışma Durdu:  Kullanıcı Çalışmayı Duraklattı."
+#: ViewStatistics.cpp:1990
+msgid "Show average credit for user"
+msgstr "Günlük üretilen ortalama kredinizi görüntüler"
 
-#: clientgui/sg_TaskPanel.cpp:1244
-msgid "Processing Suspended:  Time of Day."
-msgstr "Çalışma Durdu:  Günlük Zamanlama"
+#: ViewStatistics.cpp:1996
+msgid "Show host total"
+msgstr "Bilgisayarımın toplam kredisi"
 
-#: clientgui/sg_TaskPanel.cpp:1246
-msgid "Processing Suspended:  Benchmarks Running."
-msgstr "Çalışma Durdu:  Testler Çalışıyor."
+#: ViewStatistics.cpp:1997
+msgid "Show total credit for host"
+msgstr "Bu bilgisayarınızın toplam kredisini görüntüler"
 
-#: clientgui/sg_TaskPanel.cpp:1248
-msgid "Processing Suspended."
-msgstr "Çalışma Durdu."
+#: ViewStatistics.cpp:2003
+msgid "Show host average"
+msgstr "Bilgisayarımın ortalama kredisi"
 
-#: clientgui/sg_TaskPanel.cpp:1252
-msgid "Waiting to contact project servers."
-msgstr "Proje sunucularına bağlanılması için bekleniyor."
+#: ViewStatistics.cpp:2004
+msgid "Show average credit for host"
+msgstr "Bu bilgisayarınızın ortalama kredisini görüntüler"
 
-#: clientgui/sg_TaskPanel.cpp:1256
-#: clientgui/sg_TaskPanel.cpp:1265
-msgid "Retrieving current status"
-msgstr "Mevcut durum bilgisi alınıyor"
+#: ViewStatistics.cpp:2013
+msgid "< &Previous project"
+msgstr "< &Önceki proje"
 
-#: clientgui/sg_TaskPanel.cpp:1260
-msgid "No work available to process"
-msgstr "Çalıştırılacak iş bulunmuyor"
+#: ViewStatistics.cpp:2014
+msgid "Show chart for previous project"
+msgstr "Önceki proje için çizelge"
 
-#: clientgui/sg_TaskPanel.cpp:1262
-msgid "Unable to connect to the core client"
-msgstr "Çekirdek istemciyle bağlantı kurulamadı"
+#: ViewStatistics.cpp:2019
+msgid "&Next project >"
+msgstr "&Sonraki proje >"
 
-#: clientgui/TermsOfUsePage.cpp:218
-msgid "Terms of Use"
-msgstr "Kullanım Koşulları"
+#: ViewStatistics.cpp:2020
+msgid "Show chart for next project"
+msgstr "Sonraki proje için çizelge"
 
-#: clientgui/TermsOfUsePage.cpp:222
-msgid "Please read the following terms of use:"
-msgstr "Lütfen aşağıdaki kullanım koşullarını okuyun:"
+#: ViewStatistics.cpp:2026 ViewStatistics.cpp:2416
+msgid "Hide project list"
+msgstr "Proje listesini gizle"
 
-#: clientgui/TermsOfUsePage.cpp:231
-msgid "I agree to the terms of use."
-msgstr "Kullanım koşullarını kabul ediyorum."
+#: ViewStatistics.cpp:2027 ViewStatistics.cpp:2416
+msgid "Use entire area for graphs"
+msgstr "Tüm alan grafikler için kullanılır"
 
-#: clientgui/TermsOfUsePage.cpp:237
-msgid "I do not agree to the terms of use."
-msgstr "Kullanım koşullarını kabul etmiyorum."
+#: ViewStatistics.cpp:2032
+msgid "Mode view"
+msgstr "Görünüm kipi"
 
-#: clientgui/UnavailablePage.cpp:183
-msgid "Project temporarily unavailable"
-msgstr "Proje geçiçi olarak kullanılamaz durumda"
+#: ViewStatistics.cpp:2036
+msgid "One project"
+msgstr "Tek proje"
 
-#: clientgui/UnavailablePage.cpp:186
-msgid ""
-"The project is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-"Proje geçiçi olarak kullanılamaz durumda.\n"
-"\n"
-"Lütfen daha sonra tekrar deneyin."
+#: ViewStatistics.cpp:2037
+msgid "Show one chart with selected project"
+msgstr "Seçilen projeyi tek çizelgede göster"
 
-#: clientgui/UnavailablePage.cpp:190
-msgid "Account manager temporarily unavailable"
-msgstr "Hesap yöneticisi geçici olarak devre dışı."
+#: ViewStatistics.cpp:2043
+msgid "All projects (separate)"
+msgstr "Tüm projeler (ayrı)"
 
-#: clientgui/UnavailablePage.cpp:193
-msgid ""
-"The account manager is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-"Hesap yöneticisi geçici olarak devre dışı.\n"
-"\n"
-"Lütfen daha sonra tekrar deneyin."
+#: ViewStatistics.cpp:2044
+msgid "Show all projects, one chart per project"
+msgstr "Tüm projeleri göster, her biri için ayrı çizelge"
 
-#: clientgui/ValidateAccountKey.cpp:68
-msgid "Please specify an account key to continue."
-msgstr "Lütfen devam etmek için bir hesap anahtarı belirtin."
+#: ViewStatistics.cpp:2050
+msgid "All projects (together)"
+msgstr "Tüm projeler (birlikte)"
 
-#: clientgui/ValidateAccountKey.cpp:71
-msgid "Invalid Account Key; please enter a valid Account Key"
-msgstr "Geçersiz hesap anahtarı; lütfen geçerli bir hesap anahtarı girin."
+#: ViewStatistics.cpp:2051
+msgid "Show one chart with all projects"
+msgstr "Tüm projelerin bulunduğu tek çizelge göster"
 
-#: clientgui/ValidateAccountKey.cpp:82
-#: clientgui/ValidateEmailAddress.cpp:86
-msgid "Validation conflict"
-msgstr "Doğrulama tutmuyor"
+#: ViewStatistics.cpp:2057
+msgid "All projects (sum)"
+msgstr "Tüm projeler (özet)"
 
-#: clientgui/ValidateEmailAddress.cpp:72
-msgid "Please specify an email address"
-msgstr "Lütfen bir e-posta adresi belirtin."
+#: ViewStatistics.cpp:2058
+msgid "Show one chart with sum of projects"
+msgstr "Tüm projelerin özetinin bulunduğu tek çizelge göster"
 
-#: clientgui/ValidateEmailAddress.cpp:75
-msgid "Invalid email address; please enter a valid email address"
-msgstr "Geçersiz e-posta adresi; lütfen geçerli bir e-posta adresi girin."
+#: ViewStatistics.cpp:2079
+msgid "Statistics"
+msgstr "İstatistikler"
 
-#: clientgui/ValidateURL.cpp:69
-msgid "Missing URL"
-msgstr "Eksik adres"
+#: 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
+msgid "Updating charts..."
+msgstr "Çizelgeler güncelleniyor..."
 
-#: clientgui/ValidateURL.cpp:70
-msgid ""
-"Please specify a URL.\n"
-"For example:\n"
-"http://www.example.com/"
-msgstr ""
-"Lütfen bir internet adresi belirtin.\n"
-"Örneğin:\n"
-"http://www.ornek.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 "Geçersiz adres"
+#: ViewStatistics.cpp:2420
+msgid "Show project list"
+msgstr "Proje listesini göster"
 
-#: 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 ""
-"Lütfen geçerli bir internet adresi belirtin.\n"
-"Örneğin:\n"
-"http:/boincproject.ornek.com"
+#: ViewStatistics.cpp:2420
+msgid "Uses smaller area for graphs"
+msgstr "Grafikler için daha küçük bir alan kullanılır"
 
-#: clientgui/ValidateURL.cpp:104
-#: clientgui/ValidateURL.cpp:108
-#, c-format
-msgid "'%s' does not contain a valid host name."
-msgstr "'%s' geçerli bir bilgisayar adı içermiyor."
+#: ViewTransfers.cpp:164
+msgid "Retry Now"
+msgstr "Şimdi dene"
 
-#: clientgui/ValidateURL.cpp:111
-#, c-format
-msgid "'%s' does not contain a valid path."
-msgstr "'%s' geçerli bir yol içermiyor."
+#: ViewTransfers.cpp:165
+msgid "Retry the file transfer now"
+msgstr "Dosya transferini şimdi yeniden dener"
 
-#: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:175
-msgid "Commands"
-msgstr "Komutlar"
+#: ViewTransfers.cpp:171
+msgid "Abort Transfer"
+msgstr "Aktarımı iptal et"
 
-#: clientgui/ViewMessages.cpp:88
-msgid "Copy all messages"
-msgstr "Tüm mesajları kopyala"
+#: ViewTransfers.cpp:172
+msgid "Abort this file transfer.  You won't get credit for the task."
+msgstr "Bu dosya aktarımını iptal eder. Bu iş için kredi alamazsınız."
 
-#: clientgui/ViewMessages.cpp:95
-msgid "Copy selected messages"
-msgstr "Seçili mesajları kopyala"
+#: ViewTransfers.cpp:183
+msgid "File"
+msgstr "Dosya"
 
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
-msgid "Show only this project"
-msgstr "Yalnızca bu projeyi göster"
+#: ViewTransfers.cpp:184 ViewWork.cpp:233
+msgid "Progress"
+msgstr "İlerleme"
 
-#: clientgui/ViewMessages.cpp:107
-#: clientgui/ViewMessages.cpp:503
-msgid "Show only the messages for the selected project."
-msgstr "Yalnızca şu anda seçili projeye ait mesajları ve BOINC'in genel mesajlarını görüntüler."
+#: ViewTransfers.cpp:185
+msgid "Size"
+msgstr "Boyut"
 
-#: clientgui/ViewMessages.cpp:164
-msgid "Messages"
-msgstr "Mesajlar"
+#: ViewTransfers.cpp:186
+msgid "Elapsed Time"
+msgstr "Geçen süre"
 
-#: clientgui/ViewMessages.cpp:187
-msgid "Copying all messages to the clipboard..."
-msgstr "Tüm mesajlar panoya kopyalanıyor..."
+#: ViewTransfers.cpp:187
+msgid "Speed"
+msgstr "Hız"
 
-#: clientgui/ViewMessages.cpp:223
-msgid "Copying selected messages to the clipboard..."
-msgstr "Seçili mesajlar panoya kopyalanıyor..."
+#: ViewTransfers.cpp:213
+msgid "Transfers"
+msgstr "Aktarımlar"
 
-#: clientgui/ViewMessages.cpp:286
-msgid "Filtering messages..."
-msgstr "Mesajlar filtreleniyor...."
+#: ViewTransfers.cpp:280
+msgid "Network activity is suspended - "
+msgstr "Ağ faaliyeti durakladı - "
 
-#: clientgui/ViewMessages.cpp:494
-msgid "Show all messages"
-msgstr "Tüm mesajları göster"
+#: ViewTransfers.cpp:282
+msgid ""
+".\n"
+"You can enable it using the Activity menu."
+msgstr ".\nÇalışma menüsünü kullanarak yeniden sürdürebilirsiniz."
 
-#: clientgui/ViewMessages.cpp:495
-msgid "Show messages for all projects."
-msgstr "Tüm projeler için mesajları gösterir."
+#: ViewTransfers.cpp:285
+msgid "BOINC"
+msgstr "BOINC"
 
-#: clientgui/ViewProjects.cpp:225
-msgid "Account"
-msgstr "Hesap"
+#: ViewTransfers.cpp:292
+msgid "Retrying transfer now..."
+msgstr "Aktarım yeniden deneniyor..."
 
-#: clientgui/ViewProjects.cpp:227
-msgid "Work done"
-msgstr "Kredi"
+#: ViewTransfers.cpp:330
+msgid "Aborting transfer..."
+msgstr "Aktarım iptal ediliyor..."
 
-#: clientgui/ViewProjects.cpp:228
-msgid "Avg. work done"
-msgstr "Günlük ortalama kredi"
+#: ViewTransfers.cpp:343
+#, 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'\nadlı dosyayı aktarımı iptal etmek istediğinize emin misiniz?\nNOT: Bir aktarımı durdurmak, işi geçersiz kılar ve kredi alamazsınız."
 
-#: clientgui/ViewProjects.cpp:230
-msgid "Status"
-msgstr "Durum"
+#: ViewTransfers.cpp:349
+msgid "Abort File Transfer"
+msgstr "Dosya Aktarımını İptal Et"
 
-#: clientgui/ViewProjects.cpp:255
-msgid "Projects"
-msgstr "Projeler"
+#: ViewTransfers.cpp:780
+msgid "Upload"
+msgstr "Gönderme"
 
-#: clientgui/ViewProjects.cpp:307
-msgid "Updating project..."
-msgstr "Proje güncelleniyor..."
+#: ViewTransfers.cpp:780
+msgid "Download"
+msgstr "İndirme"
 
-#: clientgui/ViewProjects.cpp:349
-msgid "Resuming project..."
-msgstr "Proje sürdürülüyor..."
+#: ViewTransfers.cpp:784
+msgid "retry in "
+msgstr "yeniden denenecek "
 
-#: clientgui/ViewProjects.cpp:353
-msgid "Suspending project..."
-msgstr "Proje durduruluyor..."
+#: ViewTransfers.cpp:786
+msgid "failed"
+msgstr "başarısız"
 
-#: clientgui/ViewProjects.cpp:390
-msgid "Telling project to allow additional task downloads..."
-msgstr "Projeye yeni iş indirmeleri yapılabileceği bildiriliyor..."
+#: ViewTransfers.cpp:789
+msgid "suspended"
+msgstr "durakladı"
 
-#: clientgui/ViewProjects.cpp:394
-msgid "Telling project to not fetch any additional tasks..."
-msgstr "Projeye yeni iş indirmeleri yapılmayacağı bildiriliyor..."
+#: ViewTransfers.cpp:794
+msgid "active"
+msgstr "sürüyor"
 
-#: clientgui/ViewProjects.cpp:430
-msgid "Resetting project..."
-msgstr "Proje sıfırlanıyor..."
+#: ViewTransfers.cpp:796
+msgid "pending"
+msgstr "kuyrukta"
 
-#: clientgui/ViewProjects.cpp:488
-msgid "Removing project..."
-msgstr "Proje kaldırılıyor..."
+#: ViewTransfers.cpp:803
+msgid " (project backoff: "
+msgstr " (proje ertelendi: "
 
-#: clientgui/ViewProjects.cpp:548
-msgid "Launching browser..."
-msgstr "Tarayıcı çalıştırılıyor..."
+#: ViewWork.cpp:187 ViewWork.cpp:777
+msgid "Show active tasks"
+msgstr "Süren işleri göster"
 
-#: clientgui/ViewProjects.cpp:1063
-msgid "Requested by user"
-msgstr "Kullanıcı tarafından istendi"
+#: ViewWork.cpp:188 ViewWork.cpp:778
+msgid "Show only active tasks."
+msgstr "Yalnızca çalışmakta olan işleri gösterir."
 
-#: clientgui/ViewProjects.cpp:1064
-msgid "To fetch work"
-msgstr "İş indiriliyor"
+#: ViewWork.cpp:194 sg_TaskCommandPopup.cpp:60
+msgid "Show graphics"
+msgstr "Grafikleri göster"
 
-#: clientgui/ViewProjects.cpp:1065
-msgid "To report completed tasks"
-msgstr "Tamamlanan işler raporlanıyor"
+#: ViewWork.cpp:195 sg_TaskCommandPopup.cpp:61
+msgid "Show application graphics in a window."
+msgstr "Uygulama grafiklerini bir pencerede gösterir."
 
-#: clientgui/ViewProjects.cpp:1066
-msgid "To send trickle-up message"
-msgstr "İş ilerleme mesajı gönderimi"
+#: ViewWork.cpp:201
+msgid "Show VM Console"
+msgstr "VM Konsolu'nu görüntüle"
 
-#: clientgui/ViewProjects.cpp:1067
-msgid "Requested by account manager"
-msgstr "Hesap yöneticisi tarafından istendi"
+#: ViewWork.cpp:202
+msgid "Show VM Console in a window."
+msgstr "VM Konsolu'nu bir pencerede gösterir."
 
-#: clientgui/ViewProjects.cpp:1068
-msgid "Project initialization"
-msgstr "Proje başlatılıyor"
+#: ViewWork.cpp:209
+msgid "Suspend work for this result."
+msgstr "Seçili işlerin çalışmasını durdurur."
 
-#: clientgui/ViewProjects.cpp:1069
-msgid "Requested by project"
-msgstr "Proje tarafından istendi"
+#: ViewWork.cpp:215 sg_TaskCommandPopup.cpp:72
+msgid "Abort"
+msgstr "İptal"
 
-#: clientgui/ViewProjects.cpp:1070
-msgid "Unknown reason"
-msgstr "Bilinmeyen sebep"
+#: ViewWork.cpp:216
+msgid "Abandon work on the result. You will get no credit for it."
+msgstr "Seçili işleri iptal eder (işten kredi alamazsınız)."
 
-#: clientgui/ViewProjects.cpp:1084
-msgid "Suspended by user"
-msgstr "Kullanıcı tarafından durduruldu"
+#: ViewWork.cpp:223 sg_TaskCommandPopup.cpp:79
+msgid "Show task details."
+msgstr "Seçili işin detaylı bilgilerini gösterir."
 
-#: clientgui/ViewProjects.cpp:1087
-msgid "Won't get new tasks"
-msgstr "Yeni işler alınmayacak"
+#: ViewWork.cpp:235
+msgid "Elapsed"
+msgstr "Geçen"
 
-#: clientgui/ViewProjects.cpp:1090
-msgid "Project ended - OK to remove"
-msgstr "Proje sona erdi - Kaldırmak için Tamam'a tıklayın"
+#: ViewWork.cpp:236
+msgid "Remaining (estimated)"
+msgstr "Kalan (tahmini)"
 
-#: clientgui/ViewProjects.cpp:1093
-msgid "Will remove when tasks done"
-msgstr "İşler tamamlandığında kaldırılacak"
+#: ViewWork.cpp:237
+msgid "Deadline"
+msgstr "Son teslim zamanı"
 
-#: clientgui/ViewProjects.cpp:1096
-msgid "Scheduler request pending"
-msgstr "Zamanlanmış istek kuyrukta"
+#: ViewWork.cpp:264
+msgid "Tasks"
+msgstr "İşler"
 
-#: clientgui/ViewProjects.cpp:1102
-msgid "Scheduler request in progress"
-msgstr "Zamanlanmış istek gerçekleştiriliyor"
+#: ViewWork.cpp:357
+msgid "Resuming task..."
+msgstr "İş sürdürülüyor..."
 
-#: clientgui/ViewProjects.cpp:1105
-msgid "Trickle up message pending"
-msgstr "İş ilerleme mesajı kuyrukta"
+#: ViewWork.cpp:360
+msgid "Suspending task..."
+msgstr "İş durduruluyor..."
 
-#: clientgui/ViewProjects.cpp:1111
-msgid "Communication deferred "
-msgstr "Haberleşme ertelendi "
+#: ViewWork.cpp:389
+msgid "Showing graphics for task..."
+msgstr "İşin grafikleri gösteriliyor..."
 
-#: clientgui/ViewResources.cpp:62
-msgid "Total disk usage"
-msgstr "Toplam disk kullanımı"
+#: ViewWork.cpp:426
+msgid "Showing VM console for task..."
+msgstr "İşin VM Konsolu gösteriliyor..."
 
-#: clientgui/ViewResources.cpp:83
-msgid "Disk usage by BOINC projects"
-msgstr "BOINC projelerinin disk kullanımı"
+#: ViewWork.cpp:479
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %s, Status: %s)"
+msgstr "'%s'\nadlı işi iptal etmek istediğinize emin misiniz?\n(İlerleme: %s, Durum: %s)"
 
-#: clientgui/ViewResources.cpp:116
-msgid "Disk"
-msgstr "Disk"
+#: ViewWork.cpp:485
+#, c-format
+msgid "Are you sure you want to abort these %d tasks?"
+msgstr "Bu %d işi iptal etmek istediğinize emin miziniz?"
 
-#: clientgui/ViewResources.cpp:225
-msgid "no projects: 0 bytes used"
-msgstr "proje yok: 0 bayt kullanılıyor"
+#: ViewWork.cpp:490 sg_TaskCommandPopup.cpp:256
+msgid "Abort task"
+msgstr "İşi iptal et"
 
-#: clientgui/ViewResources.cpp:262
-msgid "used by BOINC: "
-msgstr "BOINC tarafından kullanılan: "
+#: ViewWork.cpp:499
+msgid "Aborting task..."
+msgstr "İş iptal ediliyor..."
 
-#: clientgui/ViewResources.cpp:272
-msgid "free, available to BOINC: "
-msgstr "boş ve BOINC tarafından kullanılabilir: "
+#: ViewWork.cpp:771
+msgid "Show all tasks"
+msgstr "Tüm işleri göster"
 
-#: clientgui/ViewResources.cpp:282
-msgid "free, not available to BOINC: "
-msgstr "boş ancak BOINC tarafından kullanılamaz: "
+#: ViewWork.cpp:772
+msgid "Show all tasks."
+msgstr "Çalışan, bekleyen ve durdurulmuş tüm işleri gösterir."
 
-#: clientgui/ViewResources.cpp:292
-msgid "free: "
-msgstr "boş: "
+#: ViewWork.cpp:796 sg_TaskCommandPopup.cpp:103
+msgid "Resume work for this task."
+msgstr "Seçili işlerin çalışmasını sürdürür."
 
-#: clientgui/ViewResources.cpp:302
-msgid "used by other programs: "
-msgstr "başka programlarca kullanılan: "
+#: ViewWork.cpp:802 sg_TaskCommandPopup.cpp:107
+msgid "Suspend work for this task."
+msgstr "Seçili işlerin çalışmasını durdurur."
 
-#: clientgui/ViewStatistics.cpp:1181
-msgid "User Total"
-msgstr "Toplam Krediniz"
+#: WelcomePage.cpp:284
+msgid "Add project or account manager"
+msgstr "Proje ya da hesap yöneticisi ekle"
 
-#: clientgui/ViewStatistics.cpp:1182
-msgid "User Average"
-msgstr "Günlük Ortalama Krediniz"
+#: WelcomePage.cpp:288
+msgid "Add project or use BOINC Account Manager"
+msgstr "Proje ekle ya da BOINC Hesap Yöneticisi kullan"
 
-#: clientgui/ViewStatistics.cpp:1183
-msgid "Host Total"
-msgstr "Bilgisayarınızın Toplam Kredisi"
+#: 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 "Eğer mümkünse projeleri %s\ninternet sitesinden ekleyin.\n\nBu sihirbazla eklenen projeler, %s ile\nlistelenemez ya da yönetilemez."
 
-#: clientgui/ViewStatistics.cpp:1184
-msgid "Host Average"
-msgstr "Bilgisayarınızın Günlük Ortalama Kredisi"
+#: 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 "Bilimin çeşitli alanlarında araştırma yapılan\n30'un üzerinde BOINC tabanlı proje mevcuttur ve\nistediklerinize destek vermek için gönüllü olabilirsiniz.\nDirekt olarak bir projeyi ekleyebilir ya da\nprojeleri seçmek için bir 'Hesap Yöneticisi' sitesi\nkullanabilirsiniz."
 
-#: clientgui/ViewStatistics.cpp:1331
-#, c-format
-msgid "Last update: %.0f days ago"
-msgstr "Son güncelleme: %.0f gün önce"
+#: 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 "Yeni bir gönüllü hesaplama projesi eklemeyi ya da katkıda bulunduğunuz projeleri\ndeğiştirmeyi seçtiniz.\n\nBu projelerden bazıları, World Community Grid tarafından işletilir ve yönetilirken,\ndiğerleri ise başka araştırmacılar ya da organizasyonlar tarafından işletilir ve\nyönetilir. BOINC yazılımı ile boş işlemci gücünüzü, bu projelerin herhangi bir\nkombinasyonu arasında paylaştırabilirsiniz.\n\nAlternatif olarak, bir BOINC Hesap Yöneticisi kullanıyorsanız, desteklemek istediğ [...]
 
-#: clientgui/ViewStatistics.cpp:1956
-msgid "Show user total"
-msgstr "Toplam kredim"
+#: WelcomePage.cpp:339
+msgid "Use a BOINC Account Manager"
+msgstr "Bir BOINC Hesap Yöneticisi kullan"
 
-#: clientgui/ViewStatistics.cpp:1957
-msgid "Show total credit for user"
-msgstr "Toplam kredinizi görüntüler"
+#: WelcomePage.cpp:352
+msgid "To continue, click Next."
+msgstr "Devam etmek için, İleri'yi tıklayın."
 
-#: clientgui/ViewStatistics.cpp:1963
-msgid "Show user average"
-msgstr "Günlük ortalama kredim"
+#: WelcomePage.cpp:358
+msgid "Add or change your World Community Grid projects"
+msgstr "World Community Grid projeleri ekle ya da değiştir"
 
-#: clientgui/ViewStatistics.cpp:1964
-msgid "Show average credit for user"
-msgstr "Günlük üretilen ortalama kredinizi görüntüler"
+#: WelcomePage.cpp:361
+msgid "Add projects run by other researchers or organizations"
+msgstr "Başka araştırmacı ya da organizasyonların projelerini ekle"
 
-#: clientgui/ViewStatistics.cpp:1970
-msgid "Show host total"
-msgstr "Bilgisayarımın toplam kredisi"
+#: WizardAttach.cpp:634
+msgid "Do you really want to cancel?"
+msgstr "İptal etmek istediğinize emin misiniz?"
 
-#: clientgui/ViewStatistics.cpp:1971
-msgid "Show total credit for host"
-msgstr "Bu bilgisayarınızın toplam kredisini görüntüler"
+#: WizardAttach.cpp:635
+msgid "Question"
+msgstr "Soru"
 
-#: clientgui/ViewStatistics.cpp:1977
-msgid "Show host average"
-msgstr "Bilgisayarımın ortalama kredisi"
+#: sg_BoincSimpleFrame.cpp:149
+msgid "Advanced View...\tCtrl+Shift+A"
+msgstr "Gelişmiş görünüm...\tCtrl+Shift+A"
 
-#: clientgui/ViewStatistics.cpp:1978
-msgid "Show average credit for host"
-msgstr "Bu bilgisayarınızın ortalama kredisini görüntüler"
+#: sg_BoincSimpleFrame.cpp:150
+msgid "Display the advanced graphical interface."
+msgstr "Gelişmiş grafiksel arayüzü görüntüler."
 
-#: clientgui/ViewStatistics.cpp:1987
-msgid "< &Previous project"
-msgstr "< &Önceki proje"
+#: sg_BoincSimpleFrame.cpp:157
+msgid "Skin"
+msgstr "Kaplama"
 
-#: clientgui/ViewStatistics.cpp:1988
-msgid "Show chart for previous project"
-msgstr "Önceki proje için çizelge"
+#: sg_BoincSimpleFrame.cpp:159
+msgid "Select the appearance of the user interface."
+msgstr "Kullanıcı arayüzünün görünümünü seçin."
 
-#: clientgui/ViewStatistics.cpp:1993
-msgid "&Next project >"
-msgstr "&Sonraki proje >"
+#: sg_BoincSimpleFrame.cpp:206
+#, c-format
+msgid "&%s"
+msgstr "&%s"
 
-#: clientgui/ViewStatistics.cpp:1994
-msgid "Show chart for next project"
-msgstr "Sonraki proje için çizelge"
+#: sg_BoincSimpleFrame.cpp:390
+msgid "Default"
+msgstr "Varsayılan"
 
-#: clientgui/ViewStatistics.cpp:2000
-#: clientgui/ViewStatistics.cpp:2390
-msgid "Hide project list"
-msgstr "Proje listesini gizle"
+#: sg_BoincSimpleFrame.cpp:759
+msgid "Suspend Computing"
+msgstr "Hesaplamayı duraklatır"
 
-#: clientgui/ViewStatistics.cpp:2001
-#: clientgui/ViewStatistics.cpp:2390
-msgid "Use entire area for graphs"
-msgstr "Tüm alan grafikler için kullanılır"
+#: sg_BoincSimpleFrame.cpp:760
+msgid "Resume Computing"
+msgstr "Hesaplamayı sürdürür"
 
-#: clientgui/ViewStatistics.cpp:2006
-msgid "Mode view"
-msgstr "Görünüm kipi"
+#: sg_BoincSimpleFrame.cpp:777
+msgid "Open a window to view notices from projects or BOINC"
+msgstr "Projelerden ya da BOINC'ten gelen bildirimleri gösterir"
 
-#: clientgui/ViewStatistics.cpp:2010
-msgid "One project"
-msgstr "Tek proje"
+#: sg_DlgMessages.cpp:146
+msgid "Close"
+msgstr "Kapat"
 
-#: clientgui/ViewStatistics.cpp:2011
-msgid "Show one chart with selected project"
-msgstr "Seçilen projeyi tek çizelgede göster"
+#: sg_DlgMessages.cpp:389
+#, c-format
+msgid "%s - Notices"
+msgstr "%s  - Bildirimler"
 
-#: clientgui/ViewStatistics.cpp:2017
-msgid "All projects (separate)"
-msgstr "Tüm projeler (ayrı)"
+#: sg_DlgPreferences.cpp:268
+msgid "This dialog controls preferences for this computer only."
+msgstr "Bu pencere, tercihleri yalnızca bu bilgisayarınız için özelleştirir."
 
-#: clientgui/ViewStatistics.cpp:2018
-msgid "Show all projects, one chart per project"
-msgstr "Tüm projeleri göster, her biri için ayrı çizelge"
+#: sg_DlgPreferences.cpp:273
+msgid "Click OK to set preferences."
+msgstr "Tercihlerinizi kaydetmek için 'Tamam'ı tıklayın."
 
-#: clientgui/ViewStatistics.cpp:2024
-msgid "All projects (together)"
-msgstr "Tüm projeler (birlikte)"
+#: sg_DlgPreferences.cpp:278
+msgid ""
+"Click Clear to restore web-based settings for all preferences listed below."
+msgstr "Aşağıda listelenen tüm tercihler ​için web tabanlı ayarları geri yüklemek için Temizle'yi tıklatın."
 
-#: clientgui/ViewStatistics.cpp:2025
-msgid "Show one chart with all projects"
-msgstr "Tüm projelerin bulunduğu tek çizelge göster"
+#: sg_DlgPreferences.cpp:285
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
+msgstr "Ek ayarlar için, 'Gelişmiş görünüm'de 'Hesaplama tercihleri' seçeneğini seçin."
 
-#: clientgui/ViewStatistics.cpp:2031
-msgid "All projects (sum)"
-msgstr "Tüm projeler (özet)"
+#: sg_DlgPreferences.cpp:313
+msgid "Do work only between:"
+msgstr "Yalnızca bu saatler arasında çalıştır:"
 
-#: clientgui/ViewStatistics.cpp:2032
-msgid "Show one chart with sum of projects"
-msgstr "Tüm projelerin özetinin bulunduğu tek çizelge göster"
+#: sg_DlgPreferences.cpp:335
+msgid "Connect to internet only between:"
+msgstr "Bu saatler arasında internete bağlan:"
 
-#: clientgui/ViewStatistics.cpp:2053
-msgid "Statistics"
-msgstr "İstatistikler"
+#: sg_DlgPreferences.cpp:357 sg_DlgPreferences.cpp:374
+msgid "Use no more than:"
+msgstr "En çok bu kadar kullan:"
 
-#: 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 "Çizelgeler güncelleniyor..."
+#: sg_DlgPreferences.cpp:370
+msgid "of disk space"
+msgstr "disk alanı"
 
-#: clientgui/ViewStatistics.cpp:2394
-msgid "Show project list"
-msgstr "Proje listesini göster"
+#: sg_DlgPreferences.cpp:387
+msgid "of the processor"
+msgstr "işlemci (CPU) gücü"
 
-#: clientgui/ViewStatistics.cpp:2394
-msgid "Uses smaller area for graphs"
-msgstr "Grafikler için daha küçük bir alan kullanılır"
+#: sg_DlgPreferences.cpp:391
+msgid "Do work while on battery?"
+msgstr "Pil gücündeyken işleri çalıştır?"
 
-#: clientgui/ViewTransfers.cpp:169
-msgid "Retry Now"
-msgstr "Şimdi dene"
+#: sg_DlgPreferences.cpp:404
+msgid "Do work after idle for:"
+msgstr "Bu kadar süre boşta kaldığında çalıştır:"
 
-#: clientgui/ViewTransfers.cpp:170
-msgid "Retry the file transfer now"
-msgstr "Dosya transferini şimdi yeniden dener"
+#: sg_DlgPreferences.cpp:429
+msgid "Clear all local preferences listed above and close the dialog"
+msgstr "Yukarıda listelenen tüm yerel tercihleri temizler ve pencereyi kapatır"
 
-#: clientgui/ViewTransfers.cpp:176
-msgid "Abort Transfer"
-msgstr "Aktarımı iptal et"
+#: 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 "Herhangi"
 
-#: clientgui/ViewTransfers.cpp:177
-msgid "Abort this file transfer.  You won't get credit for the task."
-msgstr "Bu dosya aktarımını iptal eder. Bu iş için kredi alamazsınız."
+#: sg_DlgPreferences.cpp:638
+msgid "100 MB"
+msgstr "100 MB"
 
-#: clientgui/ViewTransfers.cpp:188
-msgid "File"
-msgstr "Dosya"
+#: sg_DlgPreferences.cpp:639
+msgid "200 MB"
+msgstr "200 MB"
 
-#: clientgui/ViewTransfers.cpp:189
-#: clientgui/ViewWork.cpp:238
-msgid "Progress"
-msgstr "İlerleme"
+#: sg_DlgPreferences.cpp:640
+msgid "500 MB"
+msgstr "500 MB"
 
-#: clientgui/ViewTransfers.cpp:190
-msgid "Size"
-msgstr "Boyut"
+#: sg_DlgPreferences.cpp:641
+msgid "1 GB"
+msgstr "1 GB"
 
-#: clientgui/ViewTransfers.cpp:191
-msgid "Elapsed Time"
-msgstr "Geçen süre"
+#: sg_DlgPreferences.cpp:642
+msgid "2 GB"
+msgstr "2 GB"
 
-#: clientgui/ViewTransfers.cpp:192
-msgid "Speed"
-msgstr "Hız"
+#: sg_DlgPreferences.cpp:643
+msgid "5 GB"
+msgstr "5 GB"
 
-#: clientgui/ViewTransfers.cpp:218
-msgid "Transfers"
-msgstr "Aktarımlar"
+#: sg_DlgPreferences.cpp:644
+msgid "10 GB"
+msgstr "10 GB"
 
-#: clientgui/ViewTransfers.cpp:285
-msgid "Network activity is suspended - "
-msgstr "Ağ faaliyeti durakladı - "
+#: 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
+#, c-format
+msgid "%d MB"
+msgstr "%d MB"
+
+#: sg_DlgPreferences.cpp:719
+#, c-format
+msgid "%4.2f GB"
+msgstr "%4.2f GB"
+
+#: sg_DlgPreferences.cpp:760
+#, c-format
+msgid "%d%%"
+msgstr "%%%d"
 
-#: clientgui/ViewTransfers.cpp:287
-msgid ""
-".\n"
-"You can enable it using the Activity menu."
-msgstr ""
-".\n"
-"Çalışma menüsünü kullanarak yeniden sürdürebilirsiniz."
+#: sg_DlgPreferences.cpp:796
+msgid "0 (Run Always)"
+msgstr "0 (Daima çalış)"
 
-#: clientgui/ViewTransfers.cpp:290
-msgid "BOINC"
-msgstr "BOINC"
+#: sg_DlgPreferences.cpp:799
+#, c-format
+msgid "%d"
+msgstr "%d"
 
-#: clientgui/ViewTransfers.cpp:297
-msgid "Retrying transfer now..."
-msgstr "Aktarım yeniden deneniyor..."
+#: sg_DlgPreferences.cpp:1029
+msgid "Do you really want to clear all local preferences?\n"
+msgstr "Tüm yerel tercihlerinizi kaldırmak istediğinize emin misiniz?\n"
 
-#: clientgui/ViewTransfers.cpp:335
-msgid "Aborting transfer..."
-msgstr "Aktarım iptal ediliyor..."
+#: sg_ProjectPanel.cpp:72
+msgid "Add Project"
+msgstr "Proje ekle"
 
-#: clientgui/ViewTransfers.cpp:348
-#, 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"
-"adlı dosyayı aktarımı iptal etmek istediğinize emin misiniz?\n"
-"NOT: Bir aktarımı durdurmak, işi geçersiz kılar ve kredi alamazsınız."
+#: sg_ProjectPanel.cpp:73
+msgid "Synchronize"
+msgstr "Eşitle"
 
-#: clientgui/ViewTransfers.cpp:354
-msgid "Abort File Transfer"
-msgstr "Dosya Aktarımını İptal Et"
+#: sg_ProjectPanel.cpp:74
+msgid "Work done for this project"
+msgstr "Bu projede elde ettiğiniz toplam kredi"
 
-#: clientgui/ViewTransfers.cpp:785
-msgid "Upload"
-msgstr "Gönderme"
+#: sg_ProjectPanel.cpp:77
+msgid "Synchronize projects with account manager system"
+msgstr "Projeleri hesap yöneticisi sistemiyle senkronize eder"
 
-#: clientgui/ViewTransfers.cpp:785
-msgid "Download"
-msgstr "İndirme"
+#: sg_ProjectPanel.cpp:124
+msgid "Select a project to access with the controls below"
+msgstr "Aşağıdaki kontrollere erişimek için bir proje seçin"
 
-#: clientgui/ViewTransfers.cpp:789
-msgid "retry in "
-msgstr "yeniden denenecek "
+#: sg_ProjectPanel.cpp:145
+msgid "Project Web Pages"
+msgstr "Proje internet sayfaları"
 
-#: clientgui/ViewTransfers.cpp:791
-msgid "failed"
-msgstr "başarısız"
+#: sg_ProjectPanel.cpp:149
+msgid "Project Commands"
+msgstr "Proje komutları"
 
-#: clientgui/ViewTransfers.cpp:794
-msgid "suspended"
-msgstr "durakladı"
+#: sg_ProjectPanel.cpp:267
+#, c-format
+msgid "Pop up a menu of web sites for project %s"
+msgstr "%s projesinin internet sayfaları için bir menü açar"
 
-#: clientgui/ViewTransfers.cpp:799
-msgid "active"
-msgstr "sürüyor"
+#: sg_ProjectPanel.cpp:269
+#, c-format
+msgid "Pop up a menu of commands to apply to project %s"
+msgstr "%s projesine verilebilecek komutları gösterir"
 
-#: clientgui/ViewTransfers.cpp:801
-msgid "pending"
-msgstr "kuyrukta"
+#: sg_TaskCommandPopup.cpp:67
+msgid "Suspend this task."
+msgstr "Bu işi duraklat."
 
-#: clientgui/ViewTransfers.cpp:808
-msgid " (project backoff: "
-msgstr " (proje ertelendi: "
+#: sg_TaskCommandPopup.cpp:73
+msgid "Abandon this task. You will get no credit for it."
+msgstr "Bu işi iptal eder. Bu iş için kredi alamayacaksanız."
 
-#: clientgui/ViewWork.cpp:192
-#: clientgui/ViewWork.cpp:782
-msgid "Show active tasks"
-msgstr "Süren işleri göster"
+#: sg_TaskCommandPopup.cpp:251
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %.1lf%%, Status: %s)"
+msgstr "'%s'\nadlı işi iptal etmek istediğinize emin misiniz?\n(İlerleme: %%%.1lf, Durum: %s)"
 
-#: clientgui/ViewWork.cpp:193
-#: clientgui/ViewWork.cpp:783
-msgid "Show only active tasks."
-msgstr "Yalnızca çalışmakta olan işleri gösterir."
+#: sg_TaskPanel.cpp:464
+msgid "You don't have any projects.  Please Add a Project."
+msgstr "Katıldığınız bir proje bulunmuyor.  Lütfen bir proje ekleyin."
 
-#: clientgui/ViewWork.cpp:206
-msgid "Show VM Console"
-msgstr "VM Konsolu'nu görüntüle"
+#: sg_TaskPanel.cpp:465
+msgid "Not available"
+msgstr "Mevcut değil"
 
-#: clientgui/ViewWork.cpp:207
-msgid "Show VM Console in a window."
-msgstr "VM Konsolu'nu bir pencerede gösterir."
+#: sg_TaskPanel.cpp:476
+msgid "Tasks:"
+msgstr "İşler:"
 
-#: clientgui/ViewWork.cpp:214
-msgid "Suspend work for this result."
-msgstr "Seçili işlerin çalışmasını durdurur."
+#: sg_TaskPanel.cpp:482
+msgid "Select a task to access"
+msgstr "Erişim için bir iş seçin"
 
-#: clientgui/ViewWork.cpp:221
-msgid "Abandon work on the result. You will get no credit for it."
-msgstr "Seçili işleri iptal eder (işten kredi alamazsınız)."
+#: sg_TaskPanel.cpp:493
+msgid "From:"
+msgstr "Sahibi:"
 
-#: clientgui/ViewWork.cpp:240
-msgid "Elapsed"
-msgstr "Geçen"
+#: sg_TaskPanel.cpp:547
+msgid "This task's progress"
+msgstr "Bu işin ilerleme oranı"
 
-#: clientgui/ViewWork.cpp:241
-msgid "Remaining (estimated)"
-msgstr "Kalan (tahmini)"
+#: sg_TaskPanel.cpp:565
+msgid "Task Commands"
+msgstr "İş komutları"
 
-#: clientgui/ViewWork.cpp:242
-msgid "Deadline"
-msgstr "Son teslim zamanı"
+#: sg_TaskPanel.cpp:566
+msgid "Pop up a menu of commands to apply to this task"
+msgstr "Bu işe verilebilecek komutları gösterir"
 
-#: clientgui/ViewWork.cpp:269
-msgid "Tasks"
-msgstr "İşler"
+#: sg_TaskPanel.cpp:701
+#, c-format
+msgid "Application: %s"
+msgstr "Uygulama: %s"
 
-#: clientgui/ViewWork.cpp:362
-msgid "Resuming task..."
-msgstr "İş sürdürülüyor..."
+#: sg_TaskPanel.cpp:724
+#, c-format
+msgid "%.3f%%"
+msgstr "%%%.3f"
 
-#: clientgui/ViewWork.cpp:365
-msgid "Suspending task..."
-msgstr "İş durduruluyor..."
+#: sg_TaskPanel.cpp:732
+msgid "Application: Not available"
+msgstr "Uygulama: Mevcut değil"
 
-#: clientgui/ViewWork.cpp:394
-msgid "Showing graphics for task..."
-msgstr "İşin grafikleri gösteriliyor..."
+#: sg_TaskPanel.cpp:832
+msgid "Not Available"
+msgstr "Mevcut değil"
 
-#: clientgui/ViewWork.cpp:431
-msgid "Showing VM console for task..."
-msgstr "İşin VM Konsolu gösteriliyor..."
+#: sg_TaskPanel.cpp:847
+#, c-format
+msgid "Elapsed: %s"
+msgstr "Geçen süre: %s"
 
-#: clientgui/ViewWork.cpp:484
+#: sg_TaskPanel.cpp:861
 #, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %s, Status: %s)"
-msgstr ""
-"'%s'\n"
-"adlı işi iptal etmek istediğinize emin misiniz?\n"
-"(İlerleme: %s, Durum: %s)"
+msgid "Remaining (estimated): %s"
+msgstr "Kalan süre (tahmini): %s"
 
-#: clientgui/ViewWork.cpp:490
+#: sg_TaskPanel.cpp:876
 #, c-format
-msgid "Are you sure you want to abort these %d tasks?"
-msgstr "Bu %d işi iptal etmek istediğinize emin miziniz?"
+msgid "Status: %s"
+msgstr "Durum: %s"
 
-# 75%
-#: clientgui/ViewWork.cpp:504
-msgid "Aborting task..."
-msgstr "İş iptal ediliyor..."
+#: sg_TaskPanel.cpp:1223
+msgid "Retrieving current status."
+msgstr "Mevcut durum bilgisi alınıyor..."
 
-#: clientgui/ViewWork.cpp:776
-msgid "Show all tasks"
-msgstr "Tüm işleri göster"
+#: sg_TaskPanel.cpp:1229
+msgid "Downloading work from the server."
+msgstr "İş sunucudan indiriliyor"
 
-#: clientgui/ViewWork.cpp:777
-msgid "Show all tasks."
-msgstr "Çalışan, bekleyen ve durdurulmuş tüm işleri gösterir."
+#: sg_TaskPanel.cpp:1234
+msgid "Processing Suspended:  Running On Batteries."
+msgstr "Çalışma Durdu:  Pil Gücünde Çalışıyor."
 
-#: clientgui/WelcomePage.cpp:284
-msgid "Add project or account manager"
-msgstr "Proje ya da hesap yöneticisi ekle"
+#: sg_TaskPanel.cpp:1236
+msgid "Processing Suspended:  User Active."
+msgstr "Çalışma Durdu:  Kullanıcı Faal."
 
-#: clientgui/WelcomePage.cpp:288
-msgid "Add project or use BOINC Account Manager"
-msgstr "Proje ekle ya da BOINC Hesap Yöneticisi kullan"
+#: sg_TaskPanel.cpp:1238
+msgid "Processing Suspended:  User paused processing."
+msgstr "Çalışma Durdu:  Kullanıcı Çalışmayı Duraklattı."
 
-#: 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 ""
-"Eğer mümkünse projeleri %s\n"
-"internet sitesinden ekleyin.\n"
-"\n"
-"Bu sihirbazla eklenen projeler, %s ile\n"
-"listelenemez ya da yönetilemez."
+#: sg_TaskPanel.cpp:1240
+msgid "Processing Suspended:  Time of Day."
+msgstr "Çalışma Durdu:  Günlük Zamanlama"
 
-#: 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 ""
-"Bilimin çeşitli alanlarında araştırma yapılan\n"
-"30'un üzerinde BOINC tabanlı proje mevcuttur ve\n"
-"istediklerinize destek vermek için gönüllü olabilirsiniz.\n"
-"Direkt olarak bir projeyi ekleyebilir ya da\n"
-"projeleri seçmek için bir 'Hesap Yöneticisi' sitesi\n"
-"kullanabilirsiniz."
-
-#: 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 ""
-"Yeni bir gönüllü hesaplama projesi eklemeyi ya da katkıda bulunduğunuz projeleri\n"
-"değiştirmeyi seçtiniz.\n"
-"\n"
-"Bu projelerden bazıları, World Community Grid tarafından işletilir ve yönetilirken,\n"
-"diğerleri ise başka araştırmacılar ya da organizasyonlar tarafından işletilir ve\n"
-"yönetilir. BOINC yazılımı ile boş işlemci gücünüzü, bu projelerin herhangi bir\n"
-"kombinasyonu arasında paylaştırabilirsiniz.\n"
-"\n"
-"Alternatif olarak, bir BOINC Hesap Yöneticisi kullanıyorsanız, desteklemek istediğiniz\n"
-"projeleri onun aracılığıyla da seçebilirsiniz.\n"
-"\n"
-"Lütfen yapmak istediğiniz değişiklik türünü seçin:\n"
+#: sg_TaskPanel.cpp:1242
+msgid "Processing Suspended:  Benchmarks Running."
+msgstr "Çalışma Durdu:  Testler Çalışıyor."
 
-#: clientgui/WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
-msgstr "Bir BOINC Hesap Yöneticisi kullan"
+#: sg_TaskPanel.cpp:1244
+msgid "Processing Suspended."
+msgstr "Çalışma Durdu."
 
-#: clientgui/WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
-msgstr "World Community Grid projeleri ekle ya da değiştir"
+#: sg_TaskPanel.cpp:1248
+msgid "Waiting to contact project servers."
+msgstr "Proje sunucularına bağlanılması için bekleniyor."
 
-#: clientgui/WelcomePage.cpp:361
-msgid "Add projects run by other researchers or organizations"
-msgstr "Başka araştırmacı ya da organizasyonların projelerini ekle"
+#: sg_TaskPanel.cpp:1252 sg_TaskPanel.cpp:1261
+msgid "Retrieving current status"
+msgstr "Mevcut durum bilgisi alınıyor"
 
-#: clientgui/WizardAttach.cpp:673
-msgid "Do you really want to cancel?"
-msgstr "İptal etmek istediğinize emin misiniz?"
+#: sg_TaskPanel.cpp:1256
+msgid "No work available to process"
+msgstr "Çalıştırılacak iş bulunmuyor"
 
-#: clientgui/WizardAttach.cpp:674
-msgid "Question"
-msgstr "Soru"
+#: sg_TaskPanel.cpp:1258
+msgid "Unable to connect to the core client"
+msgstr "Çekirdek istemciyle bağlantı kurulamadı"
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
+#: wizardex.cpp:377 wizardex.cpp:553
 msgid "&Next >"
 msgstr "&İleri >"
 
-#: clientgui/wizardex.cpp:383
+#: wizardex.cpp:383
 msgid "< &Back"
 msgstr "< &Geri"
 
-#: clientgui/wizardex.cpp:553
+#: wizardex.cpp:553
 msgid "&Finish"
 msgstr "&Son"
 
-#: clientgui/common/wxPieCtrl.cpp:64
-msgid "Pie Ctrl"
-msgstr "Pie Ctrl"
+#: mac/Mac_GUI.cpp:110
+msgid "Preferences…"
+msgstr "Tercihler..."
 
-#: clientgui/mac/Mac_GUI.cpp:35
+#: mac/Mac_GUI.cpp:122
 msgid "Services"
 msgstr "Servisler"
 
-#: clientgui/mac/Mac_GUI.cpp:36
+#: mac/Mac_GUI.cpp:144
 #, c-format
 msgid "Hide %s"
 msgstr "%s gizle"
 
-#: clientgui/mac/Mac_GUI.cpp:37
+#: mac/Mac_GUI.cpp:158
 msgid "Hide Others"
 msgstr "Diğerlerini gizle"
 
-#: clientgui/mac/Mac_GUI.cpp:38
+#: mac/Mac_GUI.cpp:172
 msgid "Show All"
 msgstr "Tümünü Göster"
 
-#: clientgui/mac/Mac_GUI.cpp:39
+#: mac/Mac_GUI.cpp:186
 #, c-format
 msgid "Quit %s"
 msgstr "%s'den ayrıl"
-
-#: clientgui/DlgAdvPreferences.h:30
-msgid "specify work start and stop hours in format HH:MM-HH:MM"
-msgstr "başlama ve durma saatlerini SS:DD-SS:DD formatına göre belirleyin"
-
-#: clientgui/DlgAdvPreferences.h:31
-msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
-msgstr "ağ kullanım saatlerini SS:DD-SS:DD formatına göre belirleyin"
-
-# 98%
-#~ msgid ""
-#~ "(C) 2003-2013 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2013 Kaliforniya Üniversitesi, Berkeley.\n"
-#~ "Tüm hakları saklıdır."
-#, c-format
-#~ msgid "%s - Preferences"
-#~ msgstr "%s - Tercihler"
-
-#, no-c-format
-#~ msgid "% of the processors (0 means ignore this setting)"
-#~ msgstr "% kadarı kullanılsın (ayarlamayı iptal etmek için 0 yazın)"
-
-#, no-c-format
-#~ msgid "% CPU time"
-#~ msgstr "% kadar işlemci gücü kullanılsın"
-#~ msgid "KBytes/sec."
-#~ msgstr "KBayt/sn"
-#~ msgid "Mbytes"
-#~ msgstr "MB"
-#~ msgid "every"
-#~ msgstr "her"
-#~ msgid "days"
-#~ msgstr "günlük"
-#~ msgid "Gigabytes disk space"
-#~ msgstr "GB disk alanı kullanılsın"
-#~ msgid "Running, high priority"
-#~ msgstr "Çalışıyor, yüksek öncelikli"
-#~ msgid " (Scheduler wait: "
-#~ msgstr " (Zamanlanmış bekleme: "
-#~ msgid " (Scheduler wait)"
-#~ msgstr " (Zamanlanmış bekleme)"
-#~ msgid " (Waiting for network access)"
-#~ msgstr " (Ağ erişimi için bekleniyor)"
-#~ msgid "Preferences…"
-#~ msgstr "Tercihler..."
-#~ msgid "I do not agree with the terms of use."
-#~ msgstr "Kullanım koşullarını kabul etmiyorum."
-#~ msgid "Click Clear to restore web-based settings."
-#~ msgstr "İnternet tabanlı ayarlarınıza dönmek için 'Temizle'yi tıklayın."
-#~ msgid "For additional settings, select Computing Preferences in "
-#~ msgstr "Detaylı tercih seçenekleri için, 'Gelişmiş görünüm'e geçiş yapın ve "
-#~ msgid "the Advanced View."
-#~ msgstr "menüden 'Hesaplama tercihleri'ni seçin."
-#~ msgid "Workunit name"
-#~ msgstr "İş birimi ismi"
-#~ msgid "invalid float"
-#~ msgstr "geçersiz değer"
-#~ msgid "Display the advanced (accessible) graphical interface."
-#~ msgstr "Gelişmiş (erişilebilir) grafiksel arayüzü görüntüler."
-#~ msgid "Paused: Other work running"
-#~ msgstr "Durakladı: Başka iş çalışıyor"
-#~ msgid "Paused: User initiated.  Click 'Resume' to continue"
-#~ msgstr "Durakladı: Kullanıcı duraklattı.  Devam etmek için 'Devam'a tıklayın"
-#~ msgid "Paused: User active"
-#~ msgstr "Durakladı: Kullanıcı faal"
-#~ msgid "Paused: Computer on battery"
-#~ msgstr "Durakladı: Bilgisayar pil gücünde"
-#~ msgid "Paused: Time of Day"
-#~ msgstr "Durakladı: Günlük zamanlama"
-#~ msgid "Paused: Benchmarks running"
-#~ msgstr "Durakladı: Testler çalışıyor"
-#~ msgid "Paused"
-#~ msgstr "Durakladı"
-#~ msgid "Paused: Application start delayed"
-#~ msgstr "Durakladı: Uygulamanın başlaması ertelendi"
-#~ msgid "Click to show project graphics"
-#~ msgstr "Proje grafiklerini görmek için tıklayın"
-#~ msgid "Open a window to view messages"
-#~ msgstr "BOINC mesajları penceresini açar"
-#~ msgid "Stop all activity"
-#~ msgstr "Tüm çalışmayı duraklatır"
-#~ msgid "Resume activity"
-#~ msgstr "Çalışmayı sürdürür"
-#~ msgid "Open a window to set your preferences"
-#~ msgstr "Tercihlerinizi ayarlayabileceğiniz pencereyi açar"
-#~ msgid "Switch to the BOINC advanced view"
-#~ msgstr "BOINC gelişmiş görünümüne geçiş yapar"
-#~ msgid "My Projects:"
-#~ msgstr "Projelerim:"
-
-#, c-format
-#~ msgid "%s. Work done by %s: %0.2f"
-#~ msgstr "%s. %s tarafından elde edilen kredi: %0.2f"
-
-#, c-format
-#~ msgid "%.1lf"
-#~ msgstr "%.1lf"
-
-#, c-format
-#~ msgid "%d hr %d min %d sec"
-#~ msgstr "%d s %d dk %d sn"
-#~ msgid "Are you sure you want to display graphics on a remote machine?"
-#~ msgstr "Uzak bilgisayardaki grafikleri görüntülemek istediğinize emin misiniz?"
-#~ msgid "Application: "
-#~ msgstr "Uygulama: "
-#~ msgid "Time Remaining: "
-#~ msgstr "Kalan süre: "
-#~ msgid "Elapsed Time: "
-#~ msgstr "Geçen süre: "
-#~ msgid "Account manager website"
-#~ msgstr "Hesap yöneticisi sitesi"
-#~ msgid "Account Manager &URL:"
-#~ msgstr "Hesap Yöneticisi &internet adresi:"
-
-#, c-format
-#~ msgid "%s &website"
-#~ msgstr "%s internet sitesi"
-#~ msgid "Notice List"
-#~ msgstr "Bildirim Listesi"
-
-#, c-format
-#~ msgid "%s; received on %s"
-#~ msgstr "%s; alınma %s"
-
-#, c-format
-#~ msgid "%s; received from %s; on %s"
-#~ msgstr "%s; %s kaynağından; alınma %s"
-#~ msgid "Click"
-#~ msgstr "Tıkla"
-#~ msgid "Project List"
-#~ msgstr "Proje Listesi"
-#~ msgid "Nvidia GPU Supported"
-#~ msgstr "NVIDIA GPU destekleniyor"
-#~ msgid "ATI GPU Supported"
-#~ msgstr "ATI GPU destekleniyor"
-#~ msgid "Project Website"
-#~ msgstr "Proje internet sitesi"
-#~ msgid "One or more items failed to load from the Internet."
-#~ msgstr "Bir ya da daha fazla öğe internetten yüklenirken başarısız olundu."
-
-# 88%
-#~ msgid "Retry now"
-#~ msgstr "Şimdi yeniden dene"
-#~ msgid "10%"
-#~ msgstr "%10"
-#~ msgid "20%"
-#~ msgstr "%20"
-#~ msgid "30%"
-#~ msgstr "%30"
-#~ msgid "40%"
-#~ msgstr "%40"
-#~ msgid "50%"
-#~ msgstr "%50"
-#~ msgid "60%"
-#~ msgstr "% 60"
-#~ msgid "70%"
-#~ msgstr "%70"
-#~ msgid "80%"
-#~ msgstr "%80"
-#~ msgid "90%"
-#~ msgstr "%90"
-#~ msgid "100%"
-#~ msgstr "%100"
-#~ msgid "1"
-#~ msgstr "1"
-#~ msgid "3"
-#~ msgstr "3"
-#~ msgid "5"
-#~ msgstr "5"
-#~ msgid "10"
-#~ msgstr "10"
-#~ msgid "15"
-#~ msgstr "15"
-#~ msgid "30"
-#~ msgstr "30"
-#~ msgid "60"
-#~ msgstr "60"
-#, c-format
-#~ msgid "Pop up a menu of websites for project %s"
-#~ msgstr "%s projesinin internet sayfalarını açar"
-#~ msgid ""
-#~ "for accessibility support, please select advanced from the view menu or type "
-#~ "command shift a"
-#~ msgstr ""
-#~ "erişilebilirlik desteği için, lütfen \"görünüm\" menüsünden \"gelişmiş\"i seçin "
-#~ "ya da klavyeden komut+shift+a tuşlarına basın"
-#~ msgid "This panel contains graphs showing user totals for projects"
-#~ msgstr ""
-#~ "Bu panel, kullanıcının projelerdeki toplamı ya da ortalamasıyla ilgili "
-#~ "grafikleri içerir"
-#~ msgid "list headers"
-#~ msgstr "liste başlıkları"
-#~ msgid "list of events"
-#~ msgstr "olay listesi"
-#~ msgid "list of events is empty"
-#~ msgstr "olay listesi boş"
-
-#, c-format
-#~ msgid "list of %s"
-#~ msgstr "%s listesi"
-
-#, c-format
-#~ msgid "list of %s is empty"
-#~ msgstr "%s listesi boş"
-
-#, c-format
-#~ msgid "; current sort column %d of %d; descending order; "
-#~ msgstr "; mevcut sıralama sütunu %d/%d; azalarak; "
-
-#, c-format
-#~ msgid "; current sort column %d of %d; ascending order; "
-#~ msgstr "; mevcut sıralama sütunu %d/%d; artarak; "
-
-#, c-format
-#~ msgid "; column %d of %d; "
-#~ msgstr "; sütun %d/%d; "
-#~ msgid "list is empty"
-#~ msgstr "liste boş"
-
-#, c-format
-#~ msgid "; row %d; "
-#~ msgstr "; sıra %d; "
-
-#, c-format
-#~ msgid "; selected row %d of %d; "
-#~ msgstr "; seçili sıra %d/%d; "
-
-#, c-format
-#~ msgid "; selected row %d ; "
-#~ msgstr "; seçili sıra %d ; "
-
-#, c-format
-#~ msgid "; row %d of %d; "
-#~ msgstr "; sıra %d/%d; "
-#~ msgid "blank"
-#~ msgstr "boş"
-#~ msgid "list of projects or account managers"
-#~ msgstr "projeler veya hesap yöneticilerinin listesi"
-
-#, c-format
-#~ msgid "selected row %d of %d; "
-#~ msgstr "seçili sıra %d/%d; "
-
-#, c-format
-#~ msgid "row %d of %d; "
-#~ msgstr "sıra %d/%d; "
-#~ msgid ""
-#~ "The minimum username length for this project is 1. Please enter a "
-#~ "different username."
-#~ msgstr ""
-#~ "Bu proje için kullanıcı adı uzunluğu en az 1 karakter olmalı. Lütfen "
-#~ "uygun bir kullanıcı adı girin."
-#~ msgid ""
-#~ "The minimum username length for this account manager is 1. Please enter a "
-#~ "different username."
-#~ msgstr ""
-#~ "Bu hesap yöneticisi için kullanıcı adı uzunluğu en az 1 karakter olmalı. "
-#~ "Lütfen uygun bir kullanıcı adı girin."
-#~ msgid ""
-#~ "The minimum email address length for this project is 1. Please enter a "
-#~ "different email address."
-#~ msgstr ""
-#~ "Bu proje için e-posta adresi uzunluğu en az 1 karakter olmalı. Lütfen "
-#~ "uygun bir e-posta adresi girin."
-#~ msgid ""
-#~ "The minimum email address length for this account manager is 1. Please "
-#~ "enter a different email address."
-#~ msgstr ""
-#~ "Bu hesap yöneticisi için e-posta adresi uzunluğu en az 1 karakter olmalı. "
-#~ "Lütfen uygun bir e-posta adresi girin."
-#~ msgid ""
-#~ "The minimum password length for this project is %d. Please enter a "
-#~ "different password."
-#~ msgstr ""
-#~ "Bu proje için parola uzunluğu en az %d karakter olmalı. Lütfen uygun bir "
-#~ "parola girin."
-#~ msgid ""
-#~ "The minimum password length for this account manager is %d. Please enter "
-#~ "a different password."
-#~ msgstr ""
-#~ "Bu hesap yöneticisi için parola uzunluğu en az %d karakter olmalı. Lütfen "
-#~ "uygun bir parola girin."
-#~ msgid ""
-#~ "An error has occurred;\n"
-#~ "check the Event Log for details.\n"
-#~ "\n"
-#~ "Click Finish to close."
-#~ msgstr ""
-#~ "Bir hata meydana geldi;\n"
-#~ "detaylar için Olay Günlüğü'nü kontrol edin.\n"
-#~ "\n"
-#~ "Kapatmak için Son'u tıklayın."
-#~ msgid "% of the processors"
-#~ msgstr "% kadarı kullanılsın"
-#~ msgid "New page inserted. Index = %i"
-#~ msgstr "Yeni sayfa girildi. İndex = %i"
-#~ msgid "New page appended. Index = %i"
-#~ msgstr "New page eklendi. İndex = %i"
-#~ msgid "Old Page Index = %i"
-#~ msgstr "Eski Sayfa İndex'i= %i"
-#~ msgid "OnDropTarget: index by HitTest = %i"
-#~ msgstr "OnDropTarget: HitTest tarafından index = %i"
-#~ msgid "Identify your account "
-#~ msgstr "Hesap bilgilerinizi girin"
-#~ msgid "Read config file"
-#~ msgstr "Yapılandırma dosyasını oku"
-#~ msgid "Read configuration info from cc_config.xml"
-#~ msgstr "Yapılandırma bilgisini cc_config.xml dosyasından okur."
-#~ msgid ""
-#~ "(C) 2003-2011 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2011 Kaliforniya Üniversitesi, Berkeley.\n"
-#~ "Tüm hakları saklıdır."
-#~ msgid "NVIDIA GPU"
-#~ msgstr "NVIDIA GPU"
-#~ msgid "ATI GPU"
-#~ msgstr "ATI GPU"
-#~ msgid "Multicore CPU Supported"
-#~ msgstr "Çok çekirdekli işlemci destekleniyor"
-#~ msgid "%s: %.0f"
-#~ msgstr "%s: %0.2f"
-#~ msgid "Click 'Retry now' to transfer the file now"
-#~ msgstr "Dosya aktarımını yeniden denemeyi sağlar."
-#~ msgid ""
-#~ "Click 'Abort transfer' to delete the file from the transfer queue. This "
-#~ "will prevent you from being granted credit for this result."
-#~ msgstr ""
-#~ "Dosyayı aktarım kuyruğundan çıkarmayı sağlar.\n"
-#~ "Bunu yapmak, sonuçtan kredi almanızı engelleyecektir."
-#~ msgid "Aborting result..."
-#~ msgstr "Sonuç iptal ediliyor..."
-#~ msgid ""
-#~ "You have chosen to add a new BOINC project.  Adding a new\n"
-#~ "project means that you will be connecting your computer to a new "
-#~ "organization.\n"
-#~ "If this is what you wanted to do, please click on\n"
-#~ "the 'Next' button below.\n"
-#~ "\n"
-#~ "Some projects like World Community Grid run multiple research "
-#~ "applications.\n"
-#~ "If you want to change which research applications are sent to your "
-#~ "computer\n"
-#~ "to run, visit the project's website and modify your\n"
-#~ "preferences there.\n"
-#~ "\n"
-#~ "To change which research applications are sent to you from\n"
-#~ "World Community Grid then please click on the following button:"
-#~ msgstr ""
-#~ "Yeni bir BOINC projesi eklemeyi seçtiniz. Bunun anlamı, bilgisayarınız "
-#~ "bir\n"
-#~ "internet sitesine ve organizasyonuna bağlanacak. Eğer istediğiniz buysa,\n"
-#~ "aşağıdaki 'İleri' butonuna basın.\n"
-#~ "\n"
-#~ "World Community Grid gibi bazı projeler, birden fazla araştırma "
-#~ "uygulamasına\n"
-#~ "sahiptir. Eğer bilgisayarınıza gönderilen uygulamaları değiştirmek "
-#~ "isterseniz,\n"
-#~ "projenin İnternet sitesini ziyaret etmeli ve buradaki tercihlerinizi "
-#~ "değiştirmelisiniz.\n"
-#~ "\n"
-#~ "World Community Grid'den gönderilen araştırma uygulamalarını değiştirmek\n"
-#~ "için lütfen aşağıdaki butona tıklayın:"
-#~ msgid "Change Research Applications at World Community Grid"
-#~ msgstr "World Community Grid'te Araştırma Uygulamalarını değiştirin"
-#~ msgid "Don't fetch NVIDIA GPU tasks"
-#~ msgstr "NVDIA GPU için yeni işler alınmayacak"
-#~ msgid "NVIDIA GPU work fetch deferred for"
-#~ msgstr "NVIDIA GPU iş alma ertelendi"
-#~ msgid "NVIDIA GPU work fetch deferral interval"
-#~ msgstr "NVIDIA GPU iş alma aralığı"
-#~ msgid "Don't fetch ATI GPU tasks"
-#~ msgstr "ATI GPU için yeni işler alınmayacak"
-#~ msgid "ATI GPU work fetch deferred for"
-#~ msgstr "ATI GPU iş alma ertelendi"
-#~ msgid "ATI GPU work fetch deferral interval"
-#~ msgstr "ATI GPU iş alma aralığı"
-#~ msgid "Web sites"
-#~ msgstr "İnternet siteleri"
-#~ msgid "Connect about every"
-#~ msgstr "Bağlantı gerçekleştirme:"
-#~ msgid ""
-#~ "this computer is connected to the Internet about every X days\n"
-#~ "(0 if it's always connected)"
-#~ msgstr ""
-#~ "bu bilgisayarın internete kaç günde bir bağlandığını belirtin\n"
-#~ "(sürekli bağlıysa 0 yazın)"
-#~ msgid "days (max. 10)"
-#~ msgstr "günlük (en fazla 10)"
-#~ msgid "%d.%d%%"
-#~ msgstr "%%%d.%d"
-#~ msgid "Display and network &options..."
-#~ msgstr "Görünüm ve ağ &seçenekleri..."
-#~ msgid ""
-#~ "You have requested to exit the %s,\n"
-#~ "which allows you to view and manage\n"
-#~ "the science applications running on your computer.\n"
-#~ "\n"
-#~ "If you also want to stop running the science applications when you\n"
-#~ "exit the Manager, then choose from the following options:"
-#~ msgstr ""
-#~ "%s'dan çıkmak istediniz.\n"
-#~ "Bu program, bilgisayarınızda çalışan bilimsel\n"
-#~ "uygulamaları görmenizi ve yönetmenizi sağlar.\n"
-#~ "\n"
-#~ "Manager'dan çıktığınızda bilimsel uygulamaların da\n"
-#~ "kapanmasını istiyorsanız, aşağıdaki seçenekleri işaretleyin:"
-#~ msgid "Stop running science applications when exiting the Manager"
-#~ msgstr "Manager'dan çıkarken, çalışan bilimsel uygulamaları da durdur"
-#~ msgid "CPU work fetch priority"
-#~ msgstr "CPU iş alma önceliği"
-#~ msgid "NVIDIA GPU scheduling priority"
-#~ msgstr "NVIDIA GPU zamanlama önceliği"
-#~ msgid "NVIDIA GPU work fetch priority"
-#~ msgstr "NVIDIA GPU iş alma önceliği"
-#~ msgid "ATI GPU scheduling priority"
-#~ msgstr "ATI GPU zamanlama önceliği"
-#~ msgid "ATI GPU work fetch priority"
-#~ msgstr "ATI GPU iş alma önceliği"
-#~ msgid "Estimated app speed"
-#~ msgstr "Tahmini uygulama hızı"
-#~ msgid "Estimated task size"
-#~ msgstr "Tahmini iş hızı"
-#~ msgid "Max RAM usage"
-#~ msgstr "En fazla RAM kullanımı"
-#~ msgid "%s - Options"
-#~ msgstr "%s - Seçenekler"
-#~ msgid "Retrieving host information; please wait..."
-#~ msgstr "Bilgisayar bilgisi alınıyor; lütfen bekleyin..."
-#~ msgid " (waiting for GPU memory)"
-#~ msgstr " (GPU belleği için bekliyor)"
-#~ msgid "Manager Settings..."
-#~ msgstr "Manager Ayarları..."
-#~ msgid "Pause"
-#~ msgstr "Duraklat"
-#~ msgid "%s - Messages"
-#~ msgstr "%s - Mesajlar"
-#~ msgid "Skin:"
-#~ msgstr "Kaplama:"
-#~ msgid "Preferences"
-#~ msgstr "Tercihler"
-#~ msgid "I want to customize my preferences for this computer only."
-#~ msgstr "Tercihlerimi yalnızca bu bilgisayar için özelleştirmek istiyorum."
-#~ msgid "Customized Preferences"
-#~ msgstr "Özelleştirilmiş Tercihler"
-#~ msgid "My total work done this Project"
-#~ msgstr "Bu projede tamamladığım toplam  iş"
-#~ msgid "My Tasks:"
-#~ msgstr "İşlerim:"
-#~ msgid "From Project:"
-#~ msgstr "Projeden:"
-#~ msgid "Elapsed Time: %s"
-#~ msgstr "Geçen Süre: %s"
-#~ msgid "Upload suspended - "
-#~ msgstr "Gönderme durakladı - "
-#~ msgid "Download suspended - "
-#~ msgstr "İndirme durakladı - "
-#~ msgid "Upload pending"
-#~ msgstr "Gönderme kuyrukta"
-#~ msgid "Download pending"
-#~ msgstr "İndirme kuyrukta"
-#~ msgid "New Simple View..."
-#~ msgstr "Yeni Basit Görünüm..."
-#~ msgid "Display the new simple graphical interface."
-#~ msgstr "Yeni basit grafiksel arayüzü görüntüler."
-#~ msgid "Old Simple View..."
-#~ msgstr "Eski Basit Görünüm..."
-#~ msgid "Display the old simple graphical interface."
-#~ msgstr "Eski basit grafiksel arayüzü görüntüler."
-#~ msgid "Get help with BOINC"
-#~ msgstr "BOINC yardım sitesini açar"
-#~ msgid "Event Log..."
-#~ msgstr "Olay günlüğü..."
-#~ msgid "Attaching to project or account manager..."
-#~ msgstr "Projeye katılıyor ya da hesap yöneticisine bağlanıyor..."
-#~ msgid "%s - Detach from %s"
-#~ msgstr "%s - %s'den ayrıl"
-#~ msgid "Retrying communications."
-#~ msgstr "Yeniden bağlantı kurulmaya çalışılıyor."
-#~ msgid "Failed to attach to project"
-#~ msgstr "Projeye katılılım başarısız oldu"
-#~ msgid "Failed to attach to account manager"
-#~ msgstr "Hesap yöneticisine bağlanma başarısız oldu"
-#~ msgid "Attached to account manager"
-#~ msgstr "Hesap yöneticisine bağlandınız"
-#~ msgid "You are now successfully attached to the %s system."
-#~ msgstr "Şu anda %s sistemine başarıyla katıldınız."
-#~ msgid "You are now successfully attached to this account manager."
-#~ msgstr "Şu anda bu hesap yöneticisine başarıyla bağlandınız."
-#~ msgid "News Feeds"
-#~ msgstr "Haber Akışları"
-#~ msgid "Display the latest news about BOINC"
-#~ msgstr "BOINC hakkındaki son haberleri görüntüler"
-#~ msgid "not attached to any BOINC project: 0 bytes"
-#~ msgstr "herhangi bir BOINC projesine katılmadınız: 0 bayt"
-#~ msgid "All projects"
-#~ msgstr "Tüm projeler"
-#~ msgid "Attach to project"
-#~ msgstr "Projeye katıl"
-#~ msgid "Attach to account manager"
-#~ msgstr "Hesap yöneticisine bağlan"
-#~ msgid "Attach to a project"
-#~ msgstr "Bir projeye katılmanızı sağlar."
-#~ msgid "%s needs to connect to the Internet.  Please click to open %s."
-#~ msgstr ""
-#~ "%s internete bağlanmak istiyor. Lütfen %s programını açmak için tıklayın."
-#~ msgid ""
-#~ "%s is unable to communicate with a project and needs an Internet "
-#~ "connection.\n"
-#~ "Please connect to the Internet, then select the 'Do network "
-#~ "communications' item from the Advanced menu."
-#~ msgstr ""
-#~ "%s bir projeyle iletişim kuramadı ve İnternet bağlantısına ihtiyaç "
-#~ "duyuyor.\n"
-#~ "Lütfen internete bağlanın, sonra Gelişmiş menüsünden\n"
-#~ "'Ağ iletişimi gerçekleştir' komutunu seçin."
-#~ msgid ""
-#~ "%s couldn't do Internet communication, and no default connection is "
-#~ "selected.\n"
-#~ "Please connect to the Internet, or select a default connection\n"
-#~ "using Advanced/Options/Connections."
-#~ msgstr ""
-#~ "%s internet bağlantısı kuramadı ve varsayılan internet bağlantısı da "
-#~ "seçili değil.\n"
-#~ "Lütfen internete bağlanın ya da Gelişmiş/Seçenekler/Bağlantılar "
-#~ "menüsünden\n"
-#~ "varsayılan bir bağlantı seçin."
-#~ msgid "One or more notices are now available for viewing."
-#~ msgstr "Görülebilecek bir ya da birkaç yeni bildirim var."
-#~ msgid "Attached to project"
-#~ msgstr "Projeye katıldınız"
-#~ msgid "You are now successfully attached to this project."
-#~ msgstr "Bu projeye başarıyla katıldınız."
-#~ msgid "Attached to %s"
-#~ msgstr "%s'e katıldınız"
-#~ msgid "Detach when done"
-#~ msgstr "Tamamlandığında ayrıl"
-#~ msgid "Retrieving notices..."
-#~ msgstr "Bildirimler alınıyor..."
-#~ msgid "Detach"
-#~ msgstr "Ayrıl"
-#~ msgid "Detaching from project..."
-#~ msgstr "Projeden ayrılıyorsunuz..."
-#~ msgid "Are you sure you want to detach from project '%s'?"
-#~ msgstr "'%s' projesinden ayrılmak istediğinize emin misiniz?"
-#~ msgid "Detach from Project"
-#~ msgstr "Projeden ayrıl"
-#~ msgid "error"
-#~ msgstr "hata"
-#~ msgid "A new version of BOINC is available."
-#~ msgstr "BOINC'in yeni sürümü mevcut."
-#~ msgid "Download it."
-#~ msgstr "İndir."
-#~ msgid "Couldn't write state file; check directory permissions"
-#~ msgstr "Durum dosyası yazılamadı; klasör izinlerini kontrol edin"
-#~ msgid "The HTTP_PROXY environment variable must specify an HTTP proxy"
-#~ msgstr "HTTP_PROXY ortam değişkeni bir HTTP vekil sunucu belirtmeli"
-#~ msgid "Message from project server:"
-#~ msgstr "Proje sunucusundan mesaj:"
-#~ msgid "XML syntax error in"
-#~ msgstr "XML sözdizimi hatası:"
-#~ msgid "Can't resolve hostname in"
-#~ msgstr "Sunucu adresi çözülemedi:"
-#~ msgid "Unrecognized tag in"
-#~ msgstr "Tanınmayan etiket:"
-#~ msgid "Missing start tag in"
-#~ msgstr "Başlangıç etiketi kayıp:"
-#~ msgid "Unparsed tag in"
-#~ msgstr "Çözümlenemeyen etiket:"
-#~ msgid "Missing end tag in"
-#~ msgstr "Bitiş etiketi kayıp:"
-#~ msgid ""
-#~ "BOINC can't access Internet - check network connection or proxy "
-#~ "configuration."
-#~ msgstr ""
-#~ "BOINC internete erişemiyor - lütfen ağ bağlantınızı ya da vekil sunucu "
-#~ "ayarlarınızı kontrol edin."
-#~ msgid "Attach this computer to a project or account manager"
-#~ msgstr "Bu bilgisayarda bir projeye katıl ya da hesap yöneticisine bağlan"
-#~ msgid "Client is processing results."
-#~ msgstr "İstemci sonuçları işliyor."
-#~ msgid " - user active"
-#~ msgstr " - kullanıcı faal"
-#~ msgid " - computation suspended"
-#~ msgstr " - hesaplama durduruldu"
-#~ msgid " - need disk space"
-#~ msgstr " - disk alanı gerekiyor"
-#~ msgid "Attach to an additional project"
-#~ msgstr "Bir projeye katılmanız için sihirbazı açar"
-#~ msgid "To completion"
-#~ msgstr "Kalan"
-#~ msgid ""
-#~ "We'll guide you through the process of attaching\n"
-#~ "to a project or account manager."
-#~ msgstr ""
-#~ "Size bir projeye katılma ya da hesap yöneticisine bağlanma işleminde "
-#~ "rehberlik edeceğiz.\n"
-#~ "Lütfen aşağıdan ne yapmak istediğinizi seçip, İleri butonuna tıklayın."
-#~ msgid "events"
-#~ msgstr "olaylar"
-#~ msgid "current sort column "
-#~ msgstr "şu anki sıralama sütunu"
-#~ msgid " descending order "
-#~ msgstr "azalan sıralama"
-#~ msgid " ascending order "
-#~ msgstr "artan sıralama"
-#~ msgid "column "
-#~ msgstr "sütun"
-#~ msgid "Attach to a project or account manager to begin processing work"
-#~ msgstr ""
-#~ "İşleri çalıştırmak için bir projeye katılmanızı ya da hesap yöneticisine "
-#~ "bağlanmanızı sağlar."
-#~ msgid "Attach to a project to begin processing work"
-#~ msgstr "İşleri çalıştırmaya başlamak için bir projeye katılmayı sağlar."
-#~ msgid "Use GPU never"
-#~ msgstr "GPU kullanımını &durdur"
-#~ msgid "BOINC Notification"
-#~ msgstr "BOINC Bildirimi"
-#~ msgid ""
-#~ "TEST: Fluffy at Home just found out that the Fluffy project has been "
-#~ "published in Nature"
-#~ msgstr ""
-#~ "TEST: Nature tarafından yayınlanan Fluffy projesinde Fluffy at Home bulundu"
-#~ msgid "%s: %.2f%% completed."
-#~ msgstr "%s: %%%.2f tamamlandı."
-#~ msgid "%d tasks running."
-#~ msgstr "%d iş çalışıyor."
-#~ msgid "&Close Window\tCtrl+W"
-#~ msgstr "&Pencereyi Kapat\tCtrl+W"
-#~ msgid "%s - Can't find web browser"
-#~ msgstr "%s - İnternet tarayıcı bulunamadı"
-#~ msgid "Add account manager"
-#~ msgstr "Hesap yöneticisi ekle"
-
-#, fuzzy
-#~ msgid " is empty"
-#~ msgstr "liste boş"
-
-#, fuzzy
-#~ msgid "of %d; "
-#~ msgstr "taneden %d"
-
diff --git a/locale/tr/BOINC-Project-Generic.po b/locale/tr/BOINC-Project-Generic.po
index a2250be..4d0a9a4 100644
--- a/locale/tr/BOINC-Project-Generic.po
+++ b/locale/tr/BOINC-Project-Generic.po
@@ -1,22 +1,26 @@
+# BOINC web translation
 # Copyright (C) 2008 University of California
+# 
 # This file is distributed under the same license as BOINC.
+# 
 # FileID  : $Id$
+# 
+# Translators:
+# Faruk SARI <faruksari at hotmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC Project Generic\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: 2014-01-17 20:25+0000\n"
-"Last-Translator: Aycan <aycandemirel at hotmail.com>\n"
-"Language-Team: Donanım Haber\n"
-"Language: tr\n"
+"PO-Revision-Date: 2015-02-09 07:33+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.5.0\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1389990335.0\n"
 
 msgid "LANG_NAME_NATIVE"
 msgstr "Türkçe"
@@ -59,9 +63,7 @@ msgstr "Resim ekle: [img]http://resim_adresi[/img]  (alt+p)"
 #: ../inc/bbcode_html.inc:35
 msgid ""
 "Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url]  (alt+w)"
-msgstr ""
-"Adres gir: [url]http://adres[/url] ya da [url=http://url]adres metni[/url]  "
-"(alt+w)"
+msgstr "Adres gir: [url]http://adres[/url] ya da [url=http://url]adres metni[/url]  (alt+w)"
 
 #: ../inc/bbcode_html.inc:42
 msgid "Font color"
@@ -70,9 +72,7 @@ msgstr "Font rengi"
 #: ../inc/bbcode_html.inc:43
 msgid ""
 "Font color: [color=red]text[/color]  Tip: you can also use color=#FF0000"
-msgstr ""
-"Font rengi: [color=red]metin[/color]  İpucu: color=#FF0000 şeklinde de "
-"yazabilirsiniz"
+msgstr "Font rengi: [color=red]metin[/color]  İpucu: color=#FF0000 şeklinde de yazabilirsiniz"
 
 #: ../inc/bbcode_html.inc:44 ../inc/bbcode_html.inc:59 ../inc/prefs.inc:638
 msgid "Default"
@@ -293,11 +293,9 @@ msgstr "Son düzenleme: %1"
 
 #: ../inc/forum.inc:640
 msgid ""
-"This post is not shown because the sender is on your 'ignore' list.  Click %"
-"1here%2 to view this post"
-msgstr ""
-"Bu gönderi gösterilemiyor, çünkü gönderici 'yoksay' listenizde.  Bu "
-"gönderiyi okumak için %1buraya%2 tıklayın"
+"This post is not shown because the sender is on your 'ignore' list.  Click "
+"%1here%2 to view this post"
+msgstr "Bu gönderi gösterilemiyor, çünkü gönderici 'yoksay' listenizde.  Bu gönderiyi okumak için %1buraya%2 tıklayın"
 
 #: ../inc/forum.inc:668 ../inc/forum.inc:679
 msgid "Report this post as offensive"
@@ -375,24 +373,7 @@ msgid ""
 "        <li> No abusive comments involving race, religion,\n"
 "            nationality, gender, class or sexuality.\n"
 "        "
-msgstr ""
-"\n"
-"        <ul>\n"
-"        <li> Gönderiler mutlaka 'çocuk dostu' olmalıdır: İçerikleri açık "
-"saçık,\n"
-"            nefretle ilişkili, cinsel açıdan müstehcen ya da imalı "
-"olmamalıdır.\n"
-"        <li> Mesajlarda ticari reklamlar olmamalı,\n"
-"        <li> Seksüel içerikli, kumar oynatan ya da başkalarını rahatsız "
-"edecek\n"
-"            internet sitelerine bağlantı içermemeli,\n"
-"        <li> İnsanları yönlendirmeyi ya da kışkırtmayı, ya da bir konuda\n"
-"            kandırmayı amaçlamamalı,\n"
-"        <li> Kasıtlı şekilde düşmanca ya da aşağılayıcı olmamalı,\n"
-"        <li> Irk, din, milliyet, cinsiyet, sınıf veya cinsellik içeren "
-"küfürlü\n"
-"            yorumlar olmamalıdır.\n"
-"        "
+msgstr "\n        <ul>\n        <li> Gönderiler mutlaka 'çocuk dostu' olmalıdır: İçerikleri açık saçık,\n            nefretle ilişkili, cinsel açıdan müstehcen ya da imalı olmamalıdır.\n        <li> Mesajlarda ticari reklamlar olmamalı,\n        <li> Seksüel içerikli, kumar oynatan ya da başkalarını rahatsız edecek\n            internet sitelerine bağlantı içermemeli,\n        <li> İnsanları yönlendirmeyi ya da kışkırtmayı, ya da bir konuda\n            kandırmayı amaçlamamalı,\n         [...]
 
 #: ../inc/forum.inc:780
 msgid "Rules:"
@@ -450,28 +431,20 @@ msgstr "Takım mesaj panosuna yalnızca takım üyeleri gönderim yapabilir"
 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 içerisinde yeni bir konu başlığı oluşturmak için, belli bir kredi "
-"miktarına sahip olmalısınız. Bu uygulamayla, sistemin kural dışı kullanımını "
-"ve suistimal edilmesini önlemeyi amaçlıyoruz."
+msgstr "%1 içerisinde yeni bir konu başlığı oluşturmak için, belli bir kredi miktarına sahip olmalısınız. Bu uygulamayla, sistemin kural dışı kullanımını ve suistimal edilmesini önlemeyi amaçlıyoruz."
 
 #: ../inc/forum.inc:1133
 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 ""
-"Şu anda daha fazla yeni konu başlığı oluşturamazsınız. Lütfen yeniden "
-"denemek için bir süre bekleyin. Bu gecikmeyle, sistemin kural dışı "
-"kullanımını önlemeyi amaçlıyoruz."
+msgstr "Şu anda daha fazla yeni konu başlığı oluşturamazsınız. Lütfen yeniden denemek için bir süre bekleyin. Bu gecikmeyle, sistemin kural dışı kullanımını önlemeyi amaçlıyoruz."
 
 #: ../inc/forum.inc:1140
 msgid ""
 "This thread is locked. Only forum moderators and administrators are allowed "
 "to post there."
-msgstr ""
-"Bu konu başlığı kilitli. Yalnızca forum moderatörleri ya da yöneticilerin "
-"gönderi yapmasına izin var."
+msgstr "Bu konu başlığı kilitli. Yalnızca forum moderatörleri ya da yöneticilerin gönderi yapmasına izin var."
 
 #: ../inc/forum.inc:1145
 msgid "Can't post to a hidden thread."
@@ -513,8 +486,7 @@ msgstr "Tümünü okundu olarak işaretle"
 
 #: ../inc/forum.inc:1252
 msgid "Mark all threads in all message boards as read."
-msgstr ""
-"Tüm mesaj panolarındaki tüm konu başlıklarını -okundu- olarak işaretler."
+msgstr "Tüm mesaj panolarındaki tüm konu başlıklarını -okundu- olarak işaretler."
 
 #: ../inc/host.inc:24
 msgid "No host"
@@ -727,19 +699,14 @@ msgid "Last time contacted server"
 msgstr "Sunucuya son bağlandığı zaman"
 
 #: ../inc/host.inc:187
-#, php-format
 msgid "% of time BOINC is running"
 msgstr "BOINC'in çalışır durumda olduğu zaman yüzdesi"
 
 #: ../inc/host.inc:189
-#, php-format
 msgid "While BOINC running, % of time host has an Internet connection"
-msgstr ""
-"BOINC çalışırken, bilgisayarın internet bağlantısına sahip olduğu zaman "
-"yüzdesi"
+msgstr "BOINC çalışırken, bilgisayarın internet bağlantısına sahip olduğu zaman yüzdesi"
 
 #: ../inc/host.inc:191
-#, php-format
 msgid "While BOINC running, % of time work is allowed"
 msgstr "BOINC çalışırken, yeni işlerin kabul edildiği zaman yüzdesi"
 
@@ -961,9 +928,7 @@ msgstr "mesaj oluşturulamadı"
 msgid ""
 "You are not allowed to send privates messages so often. Please wait some "
 "time before sending more messages."
-msgstr ""
-"Çok sık aralıklarla özel mesaj gönderemezsiniz. Yeni mesaj göndermek için "
-"lütfen bir süre bekleyin."
+msgstr "Çok sık aralıklarla özel mesaj gönderemezsiniz. Yeni mesaj göndermek için lütfen bir süre bekleyin."
 
 #: ../inc/pm.inc:176 ../user/forum_forum.php:186
 msgid "unread"
@@ -981,9 +946,7 @@ msgstr "Özel mesaj"
 msgid ""
 "Suspend work while computer is on battery power? %1 Matters only for "
 "portable computers %2"
-msgstr ""
-"Bilgisayar pil gücünde olduğunda çalışma duraklatılsın mı? %1 Yalnızca "
-"taşınabilir bilgisayarlara uygulanır. %2"
+msgstr "Bilgisayar pil gücünde olduğunda çalışma duraklatılsın mı? %1 Yalnızca taşınabilir bilgisayarlara uygulanır. %2"
 
 #: ../inc/prefs.inc:85
 msgid "Suspend work while computer is in use?"
@@ -992,15 +955,11 @@ msgstr "Bilgisayar kullanımda olduğunda çalışma duraklatılsın mı?"
 #: ../inc/prefs.inc:91
 msgid ""
 "Suspend GPU work while computer is in use? %1 Enforced by version 6.6.21+ %2"
-msgstr ""
-"Bilgisayar kullanımda olduğunda GPU kullanımı duraklatılsın mı? %1 Sürüm "
-"6.6.21 ve üzeri için. %2"
+msgstr "Bilgisayar kullanımda olduğunda GPU kullanımı duraklatılsın mı? %1 Sürüm 6.6.21 ve üzeri için. %2"
 
 #: ../inc/prefs.inc:99
 msgid "'In use' means mouse/keyboard activity in last"
-msgstr ""
-"Bilgisayarı, yani fare ve klavyeyi bu kadar süre kullanmadığımda çalışma "
-"başlasın"
+msgstr "Bilgisayarı, yani fare ve klavyeyi bu kadar süre kullanmadığımda çalışma başlasın"
 
 #: ../inc/prefs.inc:101 ../inc/prefs.inc:110 ../inc/prefs.inc:144
 msgid "minutes"
@@ -1010,36 +969,27 @@ msgstr "dakika"
 msgid ""
 "Suspend work if no mouse/keyboard activity in last %1 Needed to enter low-"
 "power mode on some computers %2"
-msgstr ""
-"Bu kadar süre fare/klavye aktivitesi yoksa çalışma duraklasın %1 Bazı "
-"bilgisayarlarda, düşük güç moduna geçmek için gerekli. %2"
+msgstr "Bu kadar süre fare/klavye aktivitesi yoksa çalışma duraklasın %1 Bazı bilgisayarlarda, düşük güç moduna geçmek için gerekli. %2"
 
 #: ../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 ""
-"BOINC dışındaki uygulamaların CPU kullanımı bu orandan fazlaysa çalışma "
-"duraklasın %1 0 yazılırsa sınırlama olmaz<br>Sürüm 6.10.30 ve üzeri için. %2"
+msgstr "BOINC dışındaki uygulamaların CPU kullanımı bu orandan fazlaysa çalışma duraklasın %1 0 yazılırsa sınırlama olmaz<br>Sürüm 6.10.30 ve üzeri için. %2"
 
 #: ../inc/prefs.inc:122
 msgid "Do work only between the hours of %1 No restriction if equal %2"
-msgstr ""
-"İşler hergün yalnızca bu saatler arasında çalışsın  %1 İki kutuya da aynı "
-"saat yazılırsa sınırlama ortadan kalkar. %2"
+msgstr "İşler hergün yalnızca bu saatler arasında çalışsın  %1 İki kutuya da aynı saat yazılırsa sınırlama ortadan kalkar. %2"
 
 #: ../inc/prefs.inc:130
 msgid ""
 "Leave tasks in memory while suspended? %1 Suspended tasks will consume swap "
 "space if 'yes' %2"
-msgstr ""
-"Durakladığında uygulamalar bellekte kalsın mı? %1 'Evet'i seçerseniz, "
-"uygulamalar durakladığında sanal bellekte yer işgal etmeyi sürdürür. %2"
+msgstr "Durakladığında uygulamalar bellekte kalsın mı? %1 'Evet'i seçerseniz, uygulamalar durakladığında sanal bellekte yer işgal etmeyi sürdürür. %2"
 
 #: ../inc/prefs.inc:139
 msgid "Switch between tasks every %1 Recommended: 60 minutes %2"
-msgstr ""
-"Çalışan uygulama bu kadar sürede bir değişsin %1 Önerilen: 60 dakika. %2"
+msgstr "Çalışan uygulama bu kadar sürede bir değişsin %1 Önerilen: 60 dakika. %2"
 
 #: ../inc/prefs.inc:147
 msgid "On multiprocessors, use at most"
@@ -1051,22 +1001,17 @@ msgstr "adeti kullanılsın"
 
 #: ../inc/prefs.inc:153
 msgid "On multiprocessors, use at most %1 Enforced by version 6.1+ %2"
-msgstr ""
-"Çok işlemcili sistemlerde, işlemcilerin en fazla %1 Sürüm 6.1+ ve üzeri için "
-"geçerli. %2"
+msgstr "Çok işlemcili sistemlerde, işlemcilerin en fazla %1 Sürüm 6.1+ ve üzeri için geçerli. %2"
 
 #: ../inc/prefs.inc:158
-#, php-format
 msgid "% of the processors"
 msgstr "% kadarı kullanılsın"
 
 #: ../inc/prefs.inc:162
 msgid "Use at most %1 Can be used to reduce CPU heat %2"
-msgstr ""
-"CPU zamanının en fazla %1 CPU sıcaklığını azaltmak için kullanılabilir. %2"
+msgstr "CPU zamanının en fazla %1 CPU sıcaklığını azaltmak için kullanılabilir. %2"
 
 #: ../inc/prefs.inc:167
-#, php-format
 msgid "% of CPU time"
 msgstr "% kadarı kullanılsın"
 
@@ -1084,7 +1029,6 @@ msgstr "Disk: En az kullanım %1 %2'den küçük değerler görmezden gelinecek
 
 #: ../inc/prefs.inc:191 ../inc/prefs.inc:201 ../inc/prefs.inc:206
 #: ../inc/prefs.inc:211
-#, php-format
 msgid "% of total"
 msgstr "% kadar "
 
@@ -1110,9 +1054,7 @@ msgstr "Bellek: Bilgisayar boştayken en fazla kullanım"
 
 #: ../inc/prefs.inc:218
 msgid "Maintain enough tasks to keep busy for at least%1(max 10 days).%2"
-msgstr ""
-"En az bu süre kadar meşgul tutacak miktarda iş bulundur%1(en fazla 10 gün).%"
-"2"
+msgstr "En az bu süre kadar meşgul tutacak miktarda iş bulundur%1(en fazla 10 gün).%2"
 
 #: ../inc/prefs.inc:223 ../inc/prefs.inc:228 ../inc/prefs.inc:270
 #: ../inc/util.inc:274
@@ -1127,17 +1069,13 @@ msgstr "... ve ek olarak da depoda bu kadar iş bulunsun"
 msgid ""
 "Confirm before connecting to Internet? %1 Matters only if you have a modem, "
 "ISDN or VPN connection %2"
-msgstr ""
-"İnternete bağlanmadan önce onay istensin mi? %1 Yalnızca bir modeme, ISDN ya "
-"da VPN bağlantısına sahip olmanız durumunda. %2"
+msgstr "İnternete bağlanmadan önce onay istensin mi? %1 Yalnızca bir modeme, ISDN ya da VPN bağlantısına sahip olmanız durumunda. %2"
 
 #: ../inc/prefs.inc:241
 msgid ""
 "Disconnect when done? %1 Matters only if you have a modem, ISDN or VPN "
 "connection %2"
-msgstr ""
-"Tamamlandığında bağlantı kesilsin mi? %1 Yalnızca bir modeme, ISDN ya da VPN "
-"bağlantısına sahip olmanız durumunda. %2"
+msgstr "Tamamlandığında bağlantı kesilsin mi? %1 Yalnızca bir modeme, ISDN ya da VPN bağlantısına sahip olmanız durumunda. %2"
 
 #: ../inc/prefs.inc:249
 msgid "Maximum download rate:"
@@ -1166,24 +1104,17 @@ msgstr "MB, her"
 #: ../inc/prefs.inc:274
 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 ""
-"Resim dosyasıyla doğrulama atlansın mı? %1 YALNIZCA, internet sağlayıcınız "
-"resim dosyalarını değiştiriyorsa işaretleyin (örneğin UMTS bunu yapabilir). "
-"%2 Resim dosyasıyla doğrulamayı atlamak, BOINC'in güvenliğini azaltır. %3"
+"modifies image files (UMTS does this, for example). %2 Skipping verification"
+" reduces the security of BOINC. %3"
+msgstr "Resim dosyasıyla doğrulama atlansın mı? %1 YALNIZCA, internet sağlayıcınız resim dosyalarını değiştiriyorsa işaretleyin (örneğin UMTS bunu yapabilir). %2 Resim dosyasıyla doğrulamayı atlamak, BOINC'in güvenliğini azaltır. %3"
 
 #: ../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 "
+"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 ""
-"Kaynak paylaşımı %1 Bilgisayarınızın bu projeye ayırılacak kaynak oranını "
-"belirler. Örneğin: Bilgisayarınızda iki BOINC projesine katıldıysanız ve "
-"projelere 100 ve 200 kaynak ayrıldıysa, ilk proje kaynakların 1/3'ünü, "
-"ikincisi ise 2/3'ünü kullanır. %2"
+msgstr "Kaynak paylaşımı %1 Bilgisayarınızın bu projeye ayırılacak kaynak oranını belirler. Örneğin: Bilgisayarınızda iki BOINC projesine katıldıysanız ve projelere 100 ve 200 kaynak ayrıldıysa, ilk proje kaynakların 1/3'ünü, ikincisi ise 2/3'ünü kullanır. %2"
 
 #: ../inc/prefs.inc:298
 msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
@@ -1209,29 +1140,21 @@ msgstr "Intel GPU kullanılsın %1 Sürüm 7.2 ve üzeri için. %2"
 msgid ""
 "Run test applications? %1 This helps us develop applications, but may cause "
 "jobs to fail on your computer %2"
-msgstr ""
-"Test uygulamaları çalıştırılsın mı? %1 Bu, uygulamaları geliştirme konusunda "
-"bize yardımcı olacak. Ancak, bazen iş hesaplamalarının başarısız olmasına "
-"sebep olabilir. %2"
+msgstr "Test uygulamaları çalıştırılsın mı? %1 Bu, uygulamaları geliştirme konusunda bize yardımcı olacak. Ancak, bazen iş hesaplamalarının başarısız olmasına sebep olabilir. %2"
 
 #: ../inc/prefs.inc:367
 msgid ""
-"Emails will be sent from %1; make sure your spam filter accepts this address."
-msgstr ""
-"E-postalar %1 adresinden gönderilecek; gereksiz posta (spam) filtrenizin bu "
-"adresi kabul ettiğinden emin olun."
+"Emails will be sent from %1; make sure your spam filter accepts this "
+"address."
+msgstr "E-postalar %1 adresinden gönderilecek; gereksiz posta (spam) filtrenizin bu adresi kabul ettiğinden emin olun."
 
 #: ../inc/prefs.inc:374
 msgid "Is it OK for %1 and your team (if any) to email you?"
-msgstr ""
-"Takımınızın (eğer varsa) ve %1 projesinin size e-posta göndermesine izin "
-"verilsin mi?"
+msgstr "Takımınızın (eğer varsa) ve %1 projesinin size e-posta göndermesine izin verilsin mi?"
 
 #: ../inc/prefs.inc:380
 msgid "Should %1 show your computers on its web site?"
-msgstr ""
-"%1, projeye katıldığınız bilgisayarları bu internet sitesi üzerinde "
-"göstersin mi?"
+msgstr "%1, projeye katıldığınız bilgisayarları bu internet sitesi üzerinde göstersin mi?"
 
 #: ../inc/prefs.inc:387
 msgid "Disk and memory usage"
@@ -1252,11 +1175,9 @@ msgstr "Bu tercihler, katıldığınız tüm BOINC projelerine uygulanacak."
 
 #: ../inc/prefs.inc:395
 msgid ""
-"%1Unable to update preferences.%2 The values marked in red below were out of "
-"range or not numeric."
-msgstr ""
-"%1Tercihler güncellenemedi.%2 Kırmızıyla işaretlenen değerler izin verilen "
-"aralık dışında ya da rakam değiller."
+"%1Unable to update preferences.%2 The values marked in red below were out of"
+" range or not numeric."
+msgstr "%1Tercihler güncellenemedi.%2 Kırmızıyla işaretlenen değerler izin verilen aralık dışında ya da rakam değiller."
 
 #: ../inc/prefs.inc:445
 msgid "bad venue: %1"
@@ -1335,9 +1256,7 @@ msgstr "Bu tercihler, katıldığınız tüm BOINC projelerine uygulanacak."
 msgid ""
 "On computers participating in multiple projects, the most recently modified "
 "preferences will be used."
-msgstr ""
-"Çok sayıda projeye katıldığınız bilgisayarlarda, değiştirilme tarihi en "
-"yakın olan tercihler kullanılacak."
+msgstr "Çok sayıda projeye katıldığınız bilgisayarlarda, değiştirilme tarihi en yakın olan tercihler kullanılacak."
 
 #: ../inc/prefs.inc:889
 msgid "These preferences do not apply to Android devices."
@@ -1367,17 +1286,13 @@ msgstr "ve"
 msgid ""
 "Your profile will be made visible to other people as soon as it has been "
 "approved by the project. This may take up to a few days."
-msgstr ""
-"Profiliniz, proje tarafından onaylanırsa diğer kişiler tarafından "
-"görülebilir olacak. Bunun gerçekleşmesi birkaç gün alabilir."
+msgstr "Profiliniz, proje tarafından onaylanırsa diğer kişiler tarafından görülebilir olacak. Bunun gerçekleşmesi birkaç gün alabilir."
 
 #: ../inc/profile.inc:92
 msgid ""
 "Your profile has been marked as unacceptable. It is not visible to other "
 "people. Please change it."
-msgstr ""
-"Profiliniz onaylanmadı. Diğerleri tarafından görülemeyecek. Lütfen gerekli "
-"kısımları değiştirin."
+msgstr "Profiliniz onaylanmadı. Diğerleri tarafından görülemeyecek. Lütfen gerekli kısımları değiştirin."
 
 #: ../inc/profile.inc:172 ../user/friend.php:105 ../user/friend.php:172
 msgid "Database error"
@@ -1387,11 +1302,7 @@ msgstr "Veritabanı hatası"
 msgid ""
 "To prevent spam, profiles of users with an average credit of less than %1 "
 "are displayed only to logged-in users. We apologize for this inconvenience."
-msgstr ""
-"Çok sayıda sahte hesap oluşturularak sitemize saldırının önüne geçmek "
-"amacıyla, ortalama kredisi %1'den az olan kullanıcıların profilleri, "
-"yalnızca giriş yapmış kullanıcılara görünür.  Verdiğimiz rahatsızlık "
-"nedeniyle özür dileriz."
+msgstr "Çok sayıda sahte hesap oluşturularak sitemize saldırının önüne geçmek amacıyla, ortalama kredisi %1'den az olan kullanıcıların profilleri, yalnızca giriş yapmış kullanıcılara görünür.  Verdiğimiz rahatsızlık nedeniyle özür dileriz."
 
 #: ../inc/profile.inc:197
 msgid "User is banished"
@@ -1869,9 +1780,7 @@ msgstr "Bu takıma katıl"
 msgid ""
 "Note: if 'OK to email' is set in your project preferences, joining a team "
 "gives its founder access to your email address."
-msgstr ""
-"Not: Topluluk tercihlerinizde 'e-postayla uyarı' aktifse, katıldığınızda "
-"takım kurucusu e-posta adresinizi görebilecek."
+msgstr "Not: Topluluk tercihlerinizde 'e-postayla uyarı' aktifse, katıldığınızda takım kurucusu e-posta adresinizi görebilecek."
 
 #: ../inc/team.inc:140
 msgid "Not accepting new members"
@@ -1951,20 +1860,15 @@ msgstr "Bu işlem takım yöneticisi hakları gerektirir."
 
 #: ../inc/team.inc:422
 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 ""
-"UYARI: Bu bir BOINC genişletilmiş-takımıdır. Eğer burada değişiklikler "
-"yaparsanız, bir süre sonra üzerine yazılabilir. Bunun yerine, %1BOINC "
-"genişletilmiş-takım%2ı düzenleyin."
+"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 "UYARI: Bu bir BOINC genişletilmiş-takımıdır. Eğer burada değişiklikler yaparsanız, bir süre sonra üzerine yazılabilir. Bunun yerine, %1BOINC genişletilmiş-takım%2ı düzenleyin."
 
 #: ../inc/team.inc:428
 msgid ""
 "%1Privacy note%2: if you create a team, your project preferences (resource "
 "share, graphics preferences) will be visible to the public."
-msgstr ""
-"%1Gizlilik notu%2: Bir takım kurarsanız, proje tercihleriniz (kaynak "
-"paylaşımı, grafik tercihleri) herkese görünür olacaktır."
+msgstr "%1Gizlilik notu%2: Bir takım kurarsanız, proje tercihleriniz (kaynak paylaşımı, grafik tercihleri) herkese görünür olacaktır."
 
 #: ../inc/team.inc:432
 msgid "Team name, text version"
@@ -2276,9 +2180,7 @@ msgstr "Sunucu durumu"
 msgid ""
 "A database error occurred while handling your request; please try again "
 "later."
-msgstr ""
-"İsteğiniz gerçekleştirilirken veritabanı hatası oluştu; lütfen daha sonra "
-"tekrar deneyin."
+msgstr "İsteğiniz gerçekleştirilirken veritabanı hatası oluştu; lütfen daha sonra tekrar deneyin."
 
 #: ../inc/util.inc:257
 msgid "Unable to handle request"
@@ -2297,10 +2199,9 @@ msgid "sec"
 msgstr "san"
 
 #: ../inc/util.inc:444
-msgid "Link has timed out. Please click Back, refresh the page, and try again."
-msgstr ""
-"Bağlantı zaman aşımına uğradı. Lütfen Geri'ye tıklayın ve sayfayı yenileyip, "
-"yeniden deneyin."
+msgid ""
+"Link has timed out. Please click Back, refresh the page, and try again."
+msgstr "Bağlantı zaman aşımına uğradı. Lütfen Geri'ye tıklayın ve sayfayı yenileyip, yeniden deneyin."
 
 #: ../inc/util.inc:513
 msgid "View the profile of %1"
@@ -2316,9 +2217,7 @@ msgstr "Proje bakım için kapatıldı"
 
 #: ../inc/util.inc:799
 msgid "%1 is temporarily shut down for maintenance.  Please try again later."
-msgstr ""
-"%1 sunucumuz bakım için geçiçi olarak kapalı durumda.  Lütfen taha sonra "
-"tekrar deneyin."
+msgstr "%1 sunucumuz bakım için geçiçi olarak kapalı durumda.  Lütfen taha sonra tekrar deneyin."
 
 #: ../inc/util.inc:817
 msgid "Unable to connect to database - please try again later"
@@ -2338,9 +2237,7 @@ msgstr "Hesap yapılandırmasını bitir"
 
 #: ../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 ""
-"Sitemizde bu isimle yer alacaksınız. Gerçek adınızı ya da takma adınızı "
-"kullanın."
+msgstr "Sitemizde bu isimle yer alacaksınız. Gerçek adınızı ya da takma adınızı kullanın."
 
 #: ../user/account_finish.php:45 ../user/create_account_form.php:98
 msgid "Select the country you want to represent, if any."
@@ -2377,12 +2274,7 @@ msgid ""
 "work 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 şu anda aşağıdaki uygulamalara sahip. %1 projesine katıldığınızda, bu "
-"uygulamalardan bir ya da daha fazlasına ait işler bilgisayarınıza "
-"gönderilecek. İşleri hesaplamak için gerekli uygulamanın son sürümü de "
-"bilgisayarınıza indirilecek. Bu otomatik olarak gerçekleşecek, herhangi bir "
-"şey yapmanız gerekmeyecek."
+msgstr "%1 şu anda aşağıdaki uygulamalara sahip. %1 projesine katıldığınızda, bu uygulamalardan bir ya da daha fazlasına ait işler bilgisayarınıza gönderilecek. İşleri hesaplamak için gerekli uygulamanın son sürümü de bilgisayarınıza indirilecek. Bu otomatik olarak gerçekleşecek, herhangi bir şey yapmanız gerekmeyecek."
 
 #: ../user/apps.php:50
 msgid "Platform"
@@ -2406,12 +2298,7 @@ msgid ""
 "It's similar to HTML, but simpler. The tags start with a [ (where you would\n"
 "have used %1 in HTML) and end with ] (where you would have used %2 in\n"
 "HTML)."
-msgstr ""
-"BBCode etiketleri, profilinizdeki ve mesaj panolarındaki metinleri "
-"biçimlendirmenizi sağlar.\n"
-"HTML gibidir, fakat daha basittir. Etiketler bir [ ile başlar (HTML'de "
-"kullanılan\n"
-"%1 gibi) ve bir ] ile biter (HTML'de kullanılan %2 gibi)."
+msgstr "BBCode etiketleri, profilinizdeki ve mesaj panolarındaki metinleri biçimlendirmenizi sağlar.\nHTML gibidir, fakat daha basittir. Etiketler bir [ ile başlar (HTML'de kullanılan\n%1 gibi) ve bir ] ile biter (HTML'de kullanılan %2 gibi)."
 
 #: ../user/bbcode.php:31
 msgid "Examples"
@@ -2501,18 +2388,15 @@ msgstr "BOINC sitesindeki SVN değişiklik setine bağlantı için"
 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 ""
-"Eğer bir etiketi kapatmaz ya da parametreyi doğru girmezseniz,\n"
-"biçimlenmiş metin yerine, etiketin ham hali görüntülenecektir."
+msgstr "Eğer bir etiketi kapatmaz ya da parametreyi doğru girmezseniz,\nbiçimlenmiş metin yerine, etiketin ham hali görüntülenecektir."
 
 #: ../user/bs_sample_index.php:44
 msgid "Participants"
 msgstr "Katılımcılar"
 
 #: ../user/bs_sample_index.php:46
-#, fuzzy
 msgid "Do work"
-msgstr "İş"
+msgstr "Çalışma yap"
 
 #: ../user/bs_sample_index.php:47 ../user/bs_sample_index.php:50
 #: ../user/home.php:49 ../project.sample/project.inc:43
@@ -2602,10 +2486,9 @@ msgstr "Sahip olduğunuz davet kodu geçersiz."
 
 #: ../user/create_account_action.php:84
 msgid ""
-"Invalid email address: you must enter a valid address of the form name at domain"
-msgstr ""
-"Geçersiz e-posta adresi: 'isim at site' biçiminde geçerli bir adres "
-"girmelisiniz"
+"Invalid email address: you must enter a valid address of the form "
+"name at domain"
+msgstr "Geçersiz e-posta adresi: 'isim at site' biçiminde geçerli bir adres girmelisiniz"
 
 #: ../user/create_account_action.php:88
 msgid "There's already an account with that email address."
@@ -2631,17 +2514,13 @@ msgstr "Hesap oluşturulamadı"
 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 ""
-"Not: BOINC Manager kullanıyorsanız, bu formu kullanmayın. Sadece BOINC'i "
-"çalıştırın, Proje Ekle'yi seçin ve bir e-posta adresi ve şifre girin."
+msgstr "Not: BOINC Manager kullanıyorsanız, bu formu kullanmayın. Sadece BOINC'i çalıştırın, Proje Ekle'yi seçin ve bir e-posta adresi ve şifre girin."
 
 #: ../user/create_account_form.php:61
 msgid ""
 "This account will belong to the team %1 and will have the project "
 "preferences of its founder."
-msgstr ""
-"Bu hesap %1 takımının üyesi olacak ve takım kurucusunun proje tercihlerine "
-"sahip olacak."
+msgstr "Bu hesap %1 takımının üyesi olacak ve takım kurucusunun proje tercihlerine sahip olacak."
 
 #: ../user/create_account_form.php:73
 msgid "Invitation Code"
@@ -2689,11 +2568,9 @@ msgstr "%1 Profil fotoğrafınız solda gösteriliyor."
 
 #: ../user/create_profile.php:66
 msgid ""
-"To replace it, click the \"Browse\" button and select a JPEG or PNG file (%1 "
-"or less)."
-msgstr ""
-"Yenisiyle değiştirmek için, \"Gözat\" butonuna tıklayın ve bir JPEG veya PNG "
-"dosyası seçin (%1 ya da daha küçük)."
+"To replace it, click the \"Browse\" button and select a JPEG or PNG file (%1"
+" or less)."
+msgstr "Yenisiyle değiştirmek için, \"Gözat\" butonuna tıklayın ve bir JPEG veya PNG dosyası seçin (%1 ya da daha küçük)."
 
 #: ../user/create_profile.php:69
 msgid "To remove it from your profile, check this box:"
@@ -2703,10 +2580,7 @@ msgstr "Profilinizden kaldırmak için, bu kutucuğu işaretleyin:"
 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 ""
-"Eğer profilinizin bir resim içermesini istiyorsanız, \"Gözat\" butonuna "
-"tıklayın ve bir JPEG veya PNG dosyası seçin. Lütfen %1 ya da daha küçük "
-"resim dosyalarını seçin."
+msgstr "Eğer profilinizin bir resim içermesini istiyorsanız, \"Gözat\" butonuna tıklayın ve bir JPEG veya PNG dosyası seçin. Lütfen %1 ya da daha küçük resim dosyalarını seçin."
 
 #: ../user/create_profile.php:89
 msgid "Language"
@@ -2736,9 +2610,7 @@ msgstr "Gönderdiğiniz resim formatı desteklenmiyor."
 msgid ""
 "Your %1profile%2 lets you share your opinions and background with the %3 "
 "community."
-msgstr ""
-"%1Profiliniz%2, fikirlerinizi ve özgeçmişinizi %3 topluluğuyla paylaşmanızı "
-"sağlar."
+msgstr "%1Profiliniz%2, fikirlerinizi ve özgeçmişinizi %3 topluluğuyla paylaşmanızı sağlar."
 
 #: ../user/create_profile.php:213
 msgid "Your ReCaptcha response was not correct.  Please try again."
@@ -2748,17 +2620,13 @@ msgstr "ReCaptcha yanıtınız doğru değil.  Lütfen tekrar deneyin."
 msgid ""
 "Your first response was flagged as spam by the Akismet anti-spam system.  "
 "Please modify your text and try again."
-msgstr ""
-"İlk yanıtınız Akismet anti-spam sistemi tarafından bir saldırı olarak "
-"algılandı.  Lütfen yazdığınızı değiştirip tekrar deneyin."
+msgstr "İlk yanıtınız Akismet anti-spam sistemi tarafından bir saldırı olarak algılandı.  Lütfen yazdığınızı değiştirip tekrar deneyin."
 
 #: ../user/create_profile.php:230
 msgid ""
 "Your second response was flagged as spam by the Akismet anti-spam system.  "
 "Please modify your text and try again."
-msgstr ""
-"İkinci yanıtınız Akismet anti-spam sistemi tarafından bir saldırı olarak "
-"algılandı.  Lütfen yazdığınızı değiştirip tekrar deneyin."
+msgstr "İkinci yanıtınız Akismet anti-spam sistemi tarafından bir saldırı olarak algılandı.  Lütfen yazdığınızı değiştirip tekrar deneyin."
 
 #: ../user/create_profile.php:246
 msgid "Your profile submission was empty."
@@ -2791,12 +2659,9 @@ msgstr "Bir profil oluştur"
 
 #: ../user/create_profile.php:343
 msgid ""
-"To prevent spam, an average credit of %1 or greater is required to create or "
-"edit a profile.  We apologize for this inconvenience."
-msgstr ""
-"Sitemize saldırıların önüne geçmek amacıyla, profil oluşturmak ve "
-"değiştirmek için ortalama kredinin %1 ya da fazlası olması gerekir.  "
-"Verdiğimiz rahatsızlık nedeniyle özür dileriz."
+"To prevent spam, an average credit of %1 or greater is required to create or"
+" edit a profile.  We apologize for this inconvenience."
+msgstr "Sitemize saldırıların önüne geçmek amacıyla, profil oluşturmak ve değiştirmek için ortalama kredinin %1 ya da fazlası olması gerekir.  Verdiğimiz rahatsızlık nedeniyle özür dileriz."
 
 #: ../user/delete_account.php:57
 msgid "Couldn't delete account"
@@ -2821,20 +2686,13 @@ msgid ""
 "including your profile and message-board posts.\n"
 "No jobs will be issued to any computers attached\n"
 "to this account."
-msgstr ""
-"Hesabınızın silinmesiyle, profil ve mesaj panosu\n"
-"gönderileriniz de dahil tüm kişisel bilgileriniz\n"
-"sunucularımızdan kaldırılacak.\n"
-"Bu hesabın kurulu olduğu bilgisayarlara ise işler\n"
-"gönderilmeyecek."
+msgstr "Hesabınızın silinmesiyle, profil ve mesaj panosu\ngönderileriniz de dahil tüm kişisel bilgileriniz\nsunucularımızdan kaldırılacak.\nBu hesabın kurulu olduğu bilgisayarlara ise işler\ngönderilmeyecek."
 
 #: ../user/delete_account.php:73
 msgid ""
 "This cannot be undone.\n"
 "Once your account has been deleted, you cannot get it back."
-msgstr ""
-"Bu işlem geri alınamaz.\n"
-"Hesabınızı sildiğinizde, onu tekrar geri alamazsınız."
+msgstr "Bu işlem geri alınamaz.\nHesabınızı sildiğinizde, onu tekrar geri alamazsınız."
 
 #: ../user/delete_account.php:76
 msgid "Are you sure you want to delete your account?"
@@ -2886,17 +2744,13 @@ 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 ""
-"Silinen profiller sonsuza kadar yok olur ve kurtarılamaz--\n"
-"Gelecekte yeni bir profil yaratmak için baştan başlamanız gerekir."
+msgstr "Silinen profiller sonsuza kadar yok olur ve kurtarılamaz--\nGelecekte yeni bir profil yaratmak için baştan başlamanız gerekir."
 
 #: ../user/delete_profile.php:48
 msgid ""
 "If you're sure, click 'Yes'\n"
 "to remove your profile from our database."
-msgstr ""
-"Eminseniz, profilinizin sunucularımızdan silinmesi için\n"
-"lütfen 'Evet'e tıklayın."
+msgstr "Eminseniz, profilinizin sunucularımızdan silinmesi için\nlütfen 'Evet'e tıklayın."
 
 #: ../user/delete_profile.php:52
 msgid "Delete my profile"
@@ -2920,9 +2774,9 @@ msgstr "Bağışınız tamamlandı."
 
 #: ../user/donated.php:30
 msgid ""
-"Your donation will be added to the progress bar after confirmation by PayPal."
-msgstr ""
-"Bağışınız PayPal tarafından onaylandıktan sonra ilerleme çubuğuna eklenecek."
+"Your donation will be added to the progress bar after confirmation by "
+"PayPal."
+msgstr "Bağışınız PayPal tarafından onaylandıktan sonra ilerleme çubuğuna eklenecek."
 
 #: ../user/donated.php:32
 msgid "You have canceled your donation."
@@ -2955,18 +2809,7 @@ msgid ""
 "        to see the donation amount equivalent in different currencies\n"
 "        (please note that the rates are only estimates\n"
 "         and the actual amount may differ)."
-msgstr ""
-"Bağış yapmak için, istediğiniz miktara göre aşağıdaki formu doldurun.\n"
-"        PayPal bir çok para birimini destekler \n"
-"        (Kanada Doları, Avro, İngiliz Sterlini, ABD Doları,\n"
-"         Yen, Avusturalya Doları, Yeni Zelanda Doları,\n"
-"        İsviçre Frangı, Hong Kong Doları, Singapur Doları, İsveç Kronu, \n"
-"         Danimarka Kronu, Polonya Zlotisi, Norveç Kronu,\n"
-"        Macar Forinti, Çek Korunası).\n"
-"        Farklı para birimlerinin değerlerini görmek için,\n"
-"        dönüştürücüyü kullanabilirsiniz (Ancak, bu değerlerin\n"
-"        yaklaşık olduğunu ve gerçek miktarın farklı olabileceğini\n"
-"        unutmayın)."
+msgstr "Bağış yapmak için, istediğiniz miktara göre aşağıdaki formu doldurun.\n        PayPal bir çok para birimini destekler \n        (Kanada Doları, Avro, İngiliz Sterlini, ABD Doları,\n         Yen, Avusturalya Doları, Yeni Zelanda Doları,\n        İsviçre Frangı, Hong Kong Doları, Singapur Doları, İsveç Kronu, \n         Danimarka Kronu, Polonya Zlotisi, Norveç Kronu,\n        Macar Forinti, Çek Korunası).\n        Farklı para birimlerinin değerlerini görmek için,\n        dönüştürü [...]
 
 #: ../user/donations.php:316
 msgid "Amount you would like to donate"
@@ -2984,9 +2827,7 @@ msgstr "Anonim bağış"
 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 ""
-"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 "Select this if you dont want your name and account number displayed in\ndonator lists.<br>If not checked, you will be recorded as user ID %1"
 
 #: ../user/donations.php:324
 msgid "To assign the donation with your user ID, please log in."
@@ -3011,21 +2852,14 @@ msgstr "Çeşitli kategorilerdeki bu uygulamaları indirebilirsiniz."
 #: ../user/download_network.php:31
 msgid ""
 "These applications are not endorsed by %1 and you use them at your own risk."
-msgstr ""
-"Bu uygulamalar %1 tarafından onaylanmamıştır ve kullanmak sizin alacağınız "
-"bir risktir."
+msgstr "Bu uygulamalar %1 tarafından onaylanmamıştır ve kullanmak sizin alacağınız bir risktir."
 
 #: ../user/download_network.php:33
 msgid ""
 "We do not provide instructions for installing these applications.\n"
-"However, the author may have provided some help on installing or "
-"uninstalling the application. \n"
+"However, the author may have provided some help on installing or uninstalling the application. \n"
 "If this is not enough you should contact the author."
-msgstr ""
-"Bu uygulamaların kurulum yönergelerini sağlamıyoruz.\n"
-"Bununla birlikte, yazarı kurulumu ve kaldırılmasıyla ilgili yardım sağlıyor "
-"olabilir. \n"
-"Eğer bu sizin için yeterli değilse, yazarıyla irtibata geçmelisiniz. "
+msgstr "Bu uygulamaların kurulum yönergelerini sağlamıyoruz.\nBununla birlikte, yazarı kurulumu ve kaldırılmasıyla ilgili yardım sağlıyor olabilir. \nEğer bu sizin için yeterli değilse, yazarıyla irtibata geçmelisiniz. "
 
 #: ../user/download_network.php:36
 msgid "Instructions for installing and running BOINC are %1here%2."
@@ -3067,9 +2901,7 @@ msgstr "Lütfen %1bu e-posta adresini doğrulayın%2."
 msgid ""
 "We can't update your email address due to a database problem.  Please try "
 "again later."
-msgstr ""
-"Veritabanı hatası nedeniyle e-posta adresinizi güncelleyemedik.  Lütfen daha "
-"sonra tekrar deneyin."
+msgstr "Veritabanı hatası nedeniyle e-posta adresinizi güncelleyemedik.  Lütfen daha sonra tekrar deneyin."
 
 #: ../user/edit_email_form.php:27 ../user/edit_email_form.php:51
 msgid "Change email address"
@@ -3099,9 +2931,7 @@ msgstr "Sıfırlamayı onayla"
 msgid ""
 "This action will erase any changes you have made in your community "
 "preferences. To cancel, click your browser's Back button."
-msgstr ""
-"Bu eylem, topluluk tercihlerinizde yaptığınız değişiklikleri silecek. İptal "
-"etmek için, tarayıcınızın Geri butonuna basın."
+msgstr "Bu eylem, topluluk tercihlerinizde yaptığınız değişiklikleri silecek. İptal etmek için, tarayıcınızın Geri butonuna basın."
 
 #: ../user/edit_forum_preferences_action.php:38
 msgid "Reset preferences"
@@ -3124,9 +2954,7 @@ msgstr "Böyle bir kullanıcı yok: %1"
 msgid ""
 "How should we notify you of new private messages, friend requests, posts in "
 "subscribed threads, and other events?"
-msgstr ""
-"Sizi yeni özel mesajlar, arkadaşlık istekleri , abone olunan konu "
-"başlıklarına gönderiler ve diğer olaylar hakkında nasıl bilgilendirelim?"
+msgstr "Sizi yeni özel mesajlar, arkadaşlık istekleri , abone olunan konu başlıklarına gönderiler ve diğer olaylar hakkında nasıl bilgilendirelim?"
 
 #: ../user/edit_forum_preferences_form.php:57
 msgid "On my Account page (no email)"
@@ -3185,10 +3013,7 @@ 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Çeşitli bedava servislere%2 gözatın.\n"
-"<br> Dinamik 'imza resimleri',\n"
-"<br> son kredi bilginizi, proje haberlerini vs gösterir."
+msgstr "%1Çeşitli bedava servislere%2 gözatın.\n<br> Dinamik 'imza resimleri',\n<br> son kredi bilginizi, proje haberlerini vs gösterir."
 
 #: ../user/edit_forum_preferences_form.php:104
 msgid "characters remaining"
@@ -3268,8 +3093,7 @@ msgstr "Filtrelenen kullanıcılar"
 
 #: ../user/edit_forum_preferences_form.php:165
 msgid "Ignore message board posts and private messages from these users."
-msgstr ""
-"Bu kullanıcıların mesaj panosu ve özel mesaj gönderilerini görmezden gel."
+msgstr "Bu kullanıcıların mesaj panosu ve özel mesaj gönderilerini görmezden gel."
 
 #: ../user/edit_forum_preferences_form.php:167
 msgid "User ID (For instance: 123456789)"
@@ -3317,9 +3141,7 @@ msgstr "Parolanız değişti."
 msgid ""
 "We can't update your password due to a database problem. Please try again "
 "later."
-msgstr ""
-"Parolanızı veritaban problemi nedeniyle güncelleyemedik. Lütfen daha sonra "
-"tekrar deneyin."
+msgstr "Parolanızı veritaban problemi nedeniyle güncelleyemedik. Lütfen daha sonra tekrar deneyin."
 
 #: ../user/edit_passwd_form.php:39
 msgid "You can identify yourself using either"
@@ -3394,17 +3216,13 @@ msgid ""
 "A tasks's <b>server state</b> indicates whether the task has been sent to a "
 "computer, and if so whether the computer has finished it. Possible values "
 "are:"
-msgstr ""
-"Bir işin <b>sunucu durumu</b>, bir bilgisayara gönderilip gönderilmediğini "
-"ve bilgisayarın onu tamamlayıp tamamlamadığını anlatır. Muhtemel değerler "
-"şunlardır:"
+msgstr "Bir işin <b>sunucu durumu</b>, bir bilgisayara gönderilip gönderilmediğini ve bilgisayarın onu tamamlayıp tamamlamadığını anlatır. Muhtemel değerler şunlardır:"
 
 #: ../user/explain_state.php:35
 msgid ""
 "The task is not ready to send (for example, because its input files are "
 "unavailable)"
-msgstr ""
-"İş gönderilmeye hazır değil (örneğin, giriş dosyaları henüz mevcut değil)"
+msgstr "İş gönderilmeye hazır değil (örneğin, giriş dosyaları henüz mevcut değil)"
 
 #: ../user/explain_state.php:38
 msgid "The task is ready to send, but hasn't been sent yet."
@@ -3422,9 +3240,7 @@ msgstr "İş gönderildi, tamamlanması bekleniyor."
 msgid ""
 "The task has been sent to a computer and either it has timed out or the "
 "computer has reported its completion."
-msgstr ""
-"İş bir bilgisayara gönderildi ve son teslim zamanı geçti ya da bilgisayar "
-"tamamlandığını bildirdi."
+msgstr "İş bir bilgisayara gönderildi ve son teslim zamanı geçti ya da bilgisayar tamamlandığını bildirdi."
 
 #: ../user/explain_state.php:49
 msgid "Outcomes"
@@ -3434,17 +3250,13 @@ msgstr "Sonuçlar"
 msgid ""
 "A tasks's <b>outcome</b> is defined if its server state is <b>over</b>. "
 "Possible values are:"
-msgstr ""
-"Bir işin <b>sonucu</b>, sunucu durumu <b>tamamlandı</b> ise belirlenir. "
-"Muhtemel değerler şunlardır:"
+msgstr "Bir işin <b>sonucu</b>, sunucu durumu <b>tamamlandı</b> ise belirlenir. Muhtemel değerler şunlardır:"
 
 #: ../user/explain_state.php:57
 msgid ""
 "The task was sent to a computer, but the computer has not yet completed the "
 "work and reported the outcome."
-msgstr ""
-"İş bir bilgisayara gönderildi, fakat bilgisayar henüz tamamlamadı ve "
-"sonucunu raporlamadı."
+msgstr "İş bir bilgisayara gönderildi, fakat bilgisayar henüz tamamlamadı ve sonucunu raporlamadı."
 
 #: ../user/explain_state.php:60
 msgid "A computer completed and reported the task successfully."
@@ -3454,9 +3266,7 @@ msgstr "Bir bilgisayar işi başarıyla tamamladı ve raporladı."
 msgid ""
 "The server wasn't able to send the task to a computer (perhaps because its "
 "resource requirements were too large)"
-msgstr ""
-"Sunucu işi bir bilgisayara göndermeyi başaramadı (muhtemelen sistem "
-"ihtiyaçları çok yüksek ya da dosya boyu çok büyük)"
+msgstr "Sunucu işi bir bilgisayara göndermeyi başaramadı (muhtemelen sistem ihtiyaçları çok yüksek ya da dosya boyu çok büyük)"
 
 #: ../user/explain_state.php:65
 msgid "Client error"
@@ -3470,25 +3280,19 @@ msgstr "İş bir bilgisayara gönderildi ve hata meydana geldi."
 msgid ""
 "The task was sent to a computer and no reply was received within the time "
 "limit."
-msgstr ""
-"İş bir bilgisayara gönderildi ve son teslim tarihi içinde bir yanıt "
-"alınamadı."
+msgstr "İş bir bilgisayara gönderildi ve son teslim tarihi içinde bir yanıt alınamadı."
 
 #: ../user/explain_state.php:72
 msgid ""
-"The task wasn't sent to a computer because enough other tasks were completed "
-"for this workunit."
-msgstr ""
-"İş bir bilgisayara gönderilemedi, çünkü bu iş birimi için yeterli miktarda "
-"diğer işler tamamlandı."
+"The task wasn't sent to a computer because enough other tasks were completed"
+" for this workunit."
+msgstr "İş bir bilgisayara gönderilemedi, çünkü bu iş birimi için yeterli miktarda diğer işler tamamlandı."
 
 #: ../user/explain_state.php:75
 msgid ""
 "The task was reported but could not be validated, typically because the "
 "output files were lost on the server."
-msgstr ""
-"İş raporlandı, fakat doğrulanamadı. Çünkü, genellikle sonuç dosyaları "
-"sunucuda kayboldu."
+msgstr "İş raporlandı, fakat doğrulanamadı. Çünkü, genellikle sonuç dosyaları sunucuda kayboldu."
 
 #: ../user/explain_state.php:80
 msgid "Client states"
@@ -3496,11 +3300,9 @@ msgstr "İstemci durumları"
 
 #: ../user/explain_state.php:81
 msgid ""
-"A result's <b>client state</b> indicates the stage of processing at which an "
-"error occurred."
-msgstr ""
-"Bir sonucun <b>istemci durumu</b> hesaplama sırasında meydana gelen bir "
-"hatayı anlatır."
+"A result's <b>client state</b> indicates the stage of processing at which an"
+" error occurred."
+msgstr "Bir sonucun <b>istemci durumu</b> hesaplama sırasında meydana gelen bir hatayı anlatır."
 
 #: ../user/explain_state.php:86
 msgid "The computer has not yet completed the task."
@@ -3530,9 +3332,7 @@ msgstr "Raporlanma ya da son teslim tarihi"
 msgid ""
 "A task's <b>Time reported or deadline</b> field depends on whether the task "
 "has been reported yet:"
-msgstr ""
-"Bir işin <b>raporlanma ya da son teslim tarihi</b> işin raporlanıp "
-"raporlanmadığına işaret eder:"
+msgstr "Bir işin <b>raporlanma ya da son teslim tarihi</b> işin raporlanıp raporlanmadığına işaret eder:"
 
 #: ../user/explain_state.php:110
 msgid "Already reported"
@@ -3596,18 +3396,15 @@ msgstr "Arkadaşlarınıza %1 projesinden bahsettiğiniz için teşekkürler"
 
 #: ../user/ffmail_action.php:94
 msgid ""
-"You forgot to enter your friends' names and/or email addresses; Please %"
-"1return to the form%2 and enter them."
-msgstr ""
-"Arkadaşlarınızın e-posta adreslerini ve/veya isimlerini girmeyi unuttunuz. "
-"Lütfen %1forma geri dönün%2 ve yazın."
+"You forgot to enter your friends' names and/or email addresses; Please "
+"%1return to the form%2 and enter them."
+msgstr "Arkadaşlarınızın e-posta adreslerini ve/veya isimlerini girmeyi unuttunuz. Lütfen %1forma geri dönün%2 ve yazın."
 
 #: ../user/ffmail_form.php:30
 msgid ""
 "This project hasn't created an email message - please notify its "
 "administrators"
-msgstr ""
-"Bu proje bir e-posta mesajı yaratmadı - lütfen yöneticilerini bilgilendirin"
+msgstr "Bu proje bir e-posta mesajı yaratmadı - lütfen yöneticilerini bilgilendirin"
 
 #: ../user/ffmail_form.php:33
 msgid "Tell your friends about %1"
@@ -3615,19 +3412,14 @@ msgstr "Arkadaşlarınıza %1 projesinden bahsedin"
 
 #: ../user/ffmail_form.php:37
 msgid "Help us by telling your friends, family and coworkers about %1"
-msgstr ""
-"Lütfen, arkadaşlarınıza, ailenize ve çalışma arkadaşlarınıza %1 projesini "
-"duyurmamıza yardımcı olun"
+msgstr "Lütfen, arkadaşlarınıza, ailenize ve çalışma arkadaşlarınıza %1 projesini duyurmamıza yardımcı olun"
 
 #: ../user/ffmail_form.php:39
 msgid ""
 "Fill in this form with the names and email addresses of people you think "
 "might be interested in %1. We'll send them an email in your name, and you "
 "can add your own message if you like."
-msgstr ""
-"Lütfen bu formu %1 projesiyle ilgilenebilecek kişilerin isim ve e-posta "
-"adresleriyle doldurun. Bir tanıtım e-postasını sizin isminizle göndereceğiz, "
-"isterseniz siz de özel bir mesaj ekleyebilirsiniz."
+msgstr "Lütfen bu formu %1 projesiyle ilgilenebilecek kişilerin isim ve e-posta adresleriyle doldurun. Bir tanıtım e-postasını sizin isminizle göndereceğiz, isterseniz siz de özel bir mesaj ekleyebilirsiniz."
 
 #: ../user/ffmail_form.php:42
 msgid "Your name:"
@@ -3675,18 +3467,13 @@ 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 kullanıcısını yasaklamak istediğine emin misin?<br/>Bu, %1 kullanıcısının "
-"seçilen zaman aralığında gönderim yapmasını engelleyecektir.<br/>Yasaklama, "
-"%1 gerçekten uygunsuz davranışlarda bulunduysa yapılmalıdır."
+msgstr "%1 kullanıcısını yasaklamak istediğine emin misin?<br/>Bu, %1 kullanıcısının seçilen zaman aralığında gönderim yapmasını engelleyecektir.<br/>Yasaklama, %1 gerçekten uygunsuz davranışlarda bulunduysa yapılmalıdır."
 
 #: ../user/forum_banishment_vote.php:61
 msgid ""
-"Select the reason category, optionally write a longer description of why the "
-"user should be banished."
-msgstr ""
-"Gerekçe kategorisini seçin, tercihen kullanıcının neden yasaklanması "
-"gerektiğini belirten daha uzun bir açıklama yazın."
+"Select the reason category, optionally write a longer description of why the"
+" user should be banished."
+msgstr "Gerekçe kategorisini seçin, tercihen kullanıcının neden yasaklanması gerektiğini belirten daha uzun bir açıklama yazın."
 
 #: ../user/forum_banishment_vote.php:62 ../user/forum_moderate_thread.php:50
 msgid "Category"
@@ -3738,9 +3525,7 @@ msgstr "Bir eylem seçmelisiniz..."
 msgid ""
 "You can no longer edit this post.<br/>Posts can only be edited at most %1 "
 "minutes after they have been created."
-msgstr ""
-"Bu gönderiyi şu anda düzenleyemezsiniz.<br/>Gönderiler oluşturulduktan %1 "
-"dakika sonra düzenlenebilir."
+msgstr "Bu gönderiyi şu anda düzenleyemezsiniz.<br/>Gönderiler oluşturulduktan %1 dakika sonra düzenlenebilir."
 
 #: ../user/forum_edit.php:47
 msgid "You are not authorized to edit this post."
@@ -3854,11 +3639,9 @@ msgstr "Soru ve yanıtlar"
 
 #: ../user/forum_help_desk.php:30
 msgid ""
-"Talk live via Skype with a volunteer, in any of several languages. Go to %"
-"1BOINC Online Help%2."
-msgstr ""
-"Bir gönüllüyle Skype aracılığıyla konuşun. Bir çok dilde mevcuttur. %1BOINC "
-"Online Yardım%2a gidin."
+"Talk live via Skype with a volunteer, in any of several languages. Go to "
+"%1BOINC Online Help%2."
+msgstr "Bir gönüllüyle Skype aracılığıyla konuşun. Bir çok dilde mevcuttur. %1BOINC Online Yardım%2a gidin."
 
 #: ../user/forum_help_desk.php:44 ../user/forum_index.php:92
 msgid "Topic"
@@ -3880,9 +3663,7 @@ msgstr "%1 Mesaj panoları"
 msgid ""
 "If you have a question or problem, please use the %1Questions & Answers%2 "
 "section of the message boards."
-msgstr ""
-"Bir soru ya da probleminiz varsa, lütfen mesaj panolarındaki %1Soru ve "
-"Yanıtlar%2 bölümünü kullanın."
+msgstr "Bir soru ya da probleminiz varsa, lütfen mesaj panolarındaki %1Soru ve Yanıtlar%2 bölümünü kullanın."
 
 #: ../user/forum_index.php:123
 msgid "Subscribed threads"
@@ -3946,8 +3727,7 @@ msgstr "Süresiz"
 
 #: ../user/forum_moderate_post.php:96
 msgid "Optional explanation %1 This is included in email to user.%2"
-msgstr ""
-"İsteğe bağlı açıklama %1 Bu kullanıcıya gönderilecek e-postaya eklenecek.%2"
+msgstr "İsteğe bağlı açıklama %1 Bu kullanıcıya gönderilecek e-postaya eklenecek.%2"
 
 #: ../user/forum_moderate_post.php:101 ../user/forum_moderate_thread.php:91
 #: ../user/forum_post.php:130 ../user/forum_report_post.php:85
@@ -3996,9 +3776,7 @@ msgstr "'%1' konu başlığını denetle"
 msgid ""
 "Select the reason category, or write a longer description of why you're "
 "hiding or locking the thread; then press OK."
-msgstr ""
-"Bir sebep kategorisi seçin ya da konu başlığını neden kilitlediğinize ya da "
-"gizlediğinize ilişkin bir açıklama yazın; ardından Tamam'ı tıklayın."
+msgstr "Bir sebep kategorisi seçin ya da konu başlığını neden kilitlediğinize ya da gizlediğinize ilişkin bir açıklama yazın; ardından Tamam'ı tıklayın."
 
 #: ../user/forum_moderate_thread.php:72
 msgid "Current forum"
@@ -4016,17 +3794,13 @@ msgstr "Yeni başlık:"
 msgid ""
 "Only project admins may create a thread here. However, you may reply to "
 "existing threads."
-msgstr ""
-"Burada yalnızca proje yöneticileri konu başlığı yaratabilir. Bununla "
-"birlikte, mevcut konu başlıklarına yanıt yazabilirsiniz."
+msgstr "Burada yalnızca proje yöneticileri konu başlığı yaratabilir. Bununla birlikte, mevcut konu başlıklarına yanıt yazabilirsiniz."
 
 #: ../user/forum_post.php:60
 msgid ""
 "Your message was flagged as spam by the Akismet anti-spam system. Please "
 "modify your text and try again."
-msgstr ""
-"Mesajınız Akismet anti-spam sistemi tarafından bir saldırı olarak algılandı. "
-" Lütfen yazdığınızı değiştirip, tekrar deneyin."
+msgstr "Mesajınız Akismet anti-spam sistemi tarafından bir saldırı olarak algılandı.  Lütfen yazdığınızı değiştirip, tekrar deneyin."
 
 #: ../user/forum_post.php:70
 msgid "Create new thread"
@@ -4058,9 +3832,7 @@ msgstr "Bu özellik proje tarafından kapatıldı"
 
 #: ../user/forum_rate.php:58
 msgid "You need more average or total credit to rate a post."
-msgstr ""
-"Oylayabilmek için daha fazla ortalama ya da toplam krediye sahip "
-"olmalısınız."
+msgstr "Oylayabilmek için daha fazla ortalama ya da toplam krediye sahip olmalısınız."
 
 #: ../user/forum_rate.php:62
 msgid "You have already rated this post."
@@ -4097,9 +3869,7 @@ msgstr "Oy Gönderme Problemi"
 msgid ""
 "Your post has been flagged as spam by the Akismet anti-spam system. Please "
 "modify your text and try again."
-msgstr ""
-"Gönderiniz Akismet anti-spam sistemi tarafından bir saldırı olarak "
-"algılandı.  Lütfen yazdığınızı değiştirip, tekrar deneyin."
+msgstr "Gönderiniz Akismet anti-spam sistemi tarafından bir saldırı olarak algılandı.  Lütfen yazdığınızı değiştirip, tekrar deneyin."
 
 #: ../user/forum_reply.php:88 ../user/forum_thread.php:158
 #: ../user/forum_thread.php:274
@@ -4124,9 +3894,7 @@ msgstr "İmzamı bu yanıta ekle"
 
 #: ../user/forum_report_post.php:45
 msgid "You need more average or total credit to report a post."
-msgstr ""
-"Gönderi raporlayabilmeniz için daha fazla ortalama ya da toplam krediye "
-"sahip olmalısınız."
+msgstr "Gönderi raporlayabilmeniz için daha fazla ortalama ya da toplam krediye sahip olmalısınız."
 
 #: ../user/forum_report_post.php:65
 msgid "Report Registered"
@@ -4140,9 +3908,7 @@ msgstr "Raporunuz kaydedildi. Çabanız için teşekkürler."
 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 ""
-"Bir yönetici raporunuza bakacak ve ne yapılacağına karar verecek - bu belli "
-"bir süre alabilir, lütfen sabırlı olun"
+msgstr "Bir yönetici raporunuza bakacak ve ne yapılacağına karar verecek - bu belli bir süre alabilir, lütfen sabırlı olun"
 
 #: ../user/forum_report_post.php:71
 msgid "Report a forum post"
@@ -4150,13 +3916,10 @@ msgstr "Bir forum gönderisini raporla"
 
 #: ../user/forum_report_post.php:73
 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 "
+"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 ""
-"Bu gönderiyi raporlamadan önce, +/- oylama sistemini kullanmayı tercih edin. "
-"Eğer yeterli sayıda kullanıcı olumsuz oy kullanırsa, en sonunda gizli hale "
-"gelecek.<br />Oylama sistemini gönderinin altında bulabilirsiniz."
+msgstr "Bu gönderiyi raporlamadan önce, +/- oylama sistemini kullanmayı tercih edin. Eğer yeterli sayıda kullanıcı olumsuz oy kullanırsa, en sonunda gizli hale gelecek.<br />Oylama sistemini gönderinin altında bulabilirsiniz."
 
 #: ../user/forum_report_post.php:80
 msgid "Report post"
@@ -4164,13 +3927,9 @@ msgstr "Gönderiyi raporla"
 
 #: ../user/forum_report_post.php:81
 msgid ""
-"Why do you find the post offensive: %1Please include enough information so "
-"that a person that\n"
+"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 ""
-"Gönderiyi neden saldırgan buldunuz: %1Yeterli bilgi eklemeyi unutmayın. "
-"Böylece konu başlığını\n"
-"henüz okumamış bir kişinin sorunu kısa sürede tespit etmesi mümkün olacak.%2"
+msgstr "Gönderiyi neden saldırgan buldunuz: %1Yeterli bilgi eklemeyi unutmayın. Böylece konu başlığını\nhenüz okumamış bir kişinin sorunu kısa sürede tespit etmesi mümkün olacak.%2"
 
 #: ../user/forum_report_post.php:90
 msgid "Report not registered"
@@ -4182,9 +3941,9 @@ msgstr "Raporunuz kaydedilmedi. Bir süre bekleyip tekrar deneyin."
 
 #: ../user/forum_report_post.php:92
 msgid ""
-"If this is not a temporary error, please report it to the project developers."
-msgstr ""
-"Bu geçici bir sorun değilse, lütfen proje yöneticilerine durumu bildirin."
+"If this is not a temporary error, please report it to the project "
+"developers."
+msgstr "Bu geçici bir sorun değilse, lütfen proje yöneticilerine durumu bildirin."
 
 #: ../user/forum_rss.php:41
 msgid "%1 RSS feed"
@@ -4200,8 +3959,7 @@ msgstr "Seçenekler:"
 
 #: ../user/forum_rss.php:47
 msgid "Include only posts by user ID %1 (default: all users)."
-msgstr ""
-"Yalnızca kullanıcı NO %1 olan mesajları içer (varsayılan: tüm kullanıcılar)."
+msgstr "Yalnızca kullanıcı NO %1 olan mesajları içer (varsayılan: tüm kullanıcılar)."
 
 #: ../user/forum_rss.php:49
 msgid "Include only posts from the last %1 days (default: 30)."
@@ -4209,8 +3967,7 @@ msgstr "Yalnızca son %1 günlük mesajları içer (varsayılan: 30)."
 
 #: ../user/forum_rss.php:51
 msgid "Truncate posts: %1 (Include only first 265 characters of each post)"
-msgstr ""
-"Mesajları kısalt: %1 (her gönderinin sadece ilk 265 karakterlerini içerir)"
+msgstr "Mesajları kısalt: %1 (her gönderinin sadece ilk 265 karakterlerini içerir)"
 
 #: ../user/forum_rss.php:53
 msgid "Threads only: %1 (Include only the first post of every thread)"
@@ -4296,9 +4053,7 @@ msgstr "Aramanızla eşleşen mesajlar:"
 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 ""
-"Üzgüm, arama sorgunuza uyan bir şey bulamadı. Daha az kelime (veya daha az "
-"özgün kelimeler) kullanarak aramanızı genişletmeyi deneyebilirsiniz."
+msgstr "Üzgüm, arama sorgunuza uyan bir şey bulamadı. Daha az kelime (veya daha az özgün kelimeler) kullanarak aramanızı genişletmeyi deneyebilirsiniz."
 
 #: ../user/forum_search_action.php:219
 msgid "You can also %1try the same search on Google.%2"
@@ -4333,10 +4088,9 @@ msgstr "Abonelik iptali başarılı"
 
 #: ../user/forum_subscribe.php:64
 msgid ""
-"You are no longer subscribed to %1. You will no longer receive notifications "
-"for this thread."
-msgstr ""
-"Artık %1 abonesi değilsiniz. Artık bu konu için bildirimler almayacaksınız."
+"You are no longer subscribed to %1. You will no longer receive notifications"
+" for this thread."
+msgstr "Artık %1 abonesi değilsiniz. Artık bu konu için bildirimler almayacaksınız."
 
 #: ../user/forum_subscribe.php:66
 msgid "Unsubscription failed"
@@ -4345,8 +4099,7 @@ msgstr "Abonelik iptali başarısız oldu"
 #: ../user/forum_subscribe.php:67
 msgid ""
 "We are currently unable to unsubscribe you from %1. Please try again later.."
-msgstr ""
-"%1 konusundan aboneliğinizi kaldıramadık. Lütfen daha sonra tekrar deneyin."
+msgstr "%1 konusundan aboneliğinizi kaldıramadık. Lütfen daha sonra tekrar deneyin."
 
 #: ../user/forum_subscribe.php:74
 msgid "Unknown subscription action"
@@ -4390,8 +4143,7 @@ msgstr "Abone ol"
 
 #: ../user/forum_thread.php:179
 msgid "Click to get email when there are new posts in this thread"
-msgstr ""
-"Bu konu başlığına yeni mesajlar yazıldığında e-posta almak için tıklayın"
+msgstr "Bu konu başlığına yeni mesajlar yazıldığında e-posta almak için tıklayın"
 
 #: ../user/forum_thread.php:190
 msgid "Unhide this thread"
@@ -4499,11 +4251,9 @@ msgstr "Arkadaş ekle"
 
 #: ../user/friend.php:74
 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 kullanıcısını arkadaş olarak eklemek istediniz. %2 kullanıcısını "
-"uyaracağız ve isteğinizi yanıtlamasını isteyeceğiz."
+"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 kullanıcısını arkadaş olarak eklemek istediniz. %2 kullanıcısını uyaracağız ve isteğinizi yanıtlamasını isteyeceğiz."
 
 #: ../user/friend.php:77
 msgid "Add an optional message here:"
@@ -4607,42 +4357,33 @@ msgstr "Hesap bilginizi mi unuttunuz?"
 
 #: ../user/get_passwd.php:28
 msgid ""
-"1) If you know your account's email address, and you can receive email there:"
-msgstr ""
-"1) Hesabınızın e-posta adresini biliyorsanız, buradan bir e-posta "
-"alabilirsiniz:"
+"1) If you know your account's email address, and you can receive email "
+"there:"
+msgstr "1) Hesabınızın e-posta adresini biliyorsanız, buradan bir e-posta alabilirsiniz:"
 
 #: ../user/get_passwd.php:29
 msgid ""
 "Enter the email address below, and click OK. You will be sent email "
 "instructions for resetting your password."
-msgstr ""
-"Aşağıya e-posta adresini girin ve Tamam'ı tıklatın. Parolanızı sıfırlamak "
-"için e-posta talimatları gönderilecektir."
+msgstr "Aşağıya e-posta adresini girin ve Tamam'ı tıklatın. Parolanızı sıfırlamak için e-posta talimatları gönderilecektir."
 
 #: ../user/get_passwd.php:46
 msgid ""
 "2) If you forgot your account's email address, or you can't receive email "
 "there:"
-msgstr ""
-"2) Hesabınızın e-posta adresini unuttuysanız, veya buradan e-posta "
-"alamıyorsanız:"
+msgstr "2) Hesabınızın e-posta adresini unuttuysanız, veya buradan e-posta alamıyorsanız:"
 
 #: ../user/get_passwd.php:47
 msgid ""
 "If you have run BOINC under this account, you can still access it. Here's "
 "how:"
-msgstr ""
-"Bu hesap altında BOINC çalıştırıyorsanız, yine de erişebilirsiniz. İşte "
-"nasıl olacağı:"
+msgstr "Bu hesap altında BOINC çalıştırıyorsanız, yine de erişebilirsiniz. İşte nasıl olacağı:"
 
 #: ../user/get_passwd.php:50
 msgid ""
 "Go to the BOINC data directory on your computer (its location is written to "
 "the Event Log at startup)."
-msgstr ""
-"Bilgisayarınızdaki BOINC veri klasörüne gidin (bu klasörün konumu, "
-"başlangıçta Olay Günlüğü'ne yazılır)."
+msgstr "Bilgisayarınızdaki BOINC veri klasörüne gidin (bu klasörün konumu, başlangıçta Olay Günlüğü'ne yazılır)."
 
 #: ../user/get_passwd.php:51
 msgid "Find your account file for this project; it will be named <b>%1</b>."
@@ -4650,15 +4391,12 @@ msgstr "Bu proje için hesap dosyanızı bulun; ismi <b>%1</b> olacaktır."
 
 #: ../user/get_passwd.php:52
 msgid "Open the file in a text editor like Notepad. You'll see something like"
-msgstr ""
-"Not Defteri gibi bir metin düzenleyicisinde dosyayı açın. Şunun gibi bir şey "
-"göreceksiniz"
+msgstr "Not Defteri gibi bir metin düzenleyicisinde dosyayı açın. Şunun gibi bir şey göreceksiniz"
 
 #: ../user/get_passwd.php:62
-msgid "Select and Copy the string between %1 and %2 (%3 in the above example)."
-msgstr ""
-"%1 ve %2 arasında kalan kısımdaki metin dizisini seçip kopyalayın "
-"(yukarıdaki örnekte %3)."
+msgid ""
+"Select and Copy the string between %1 and %2 (%3 in the above example)."
+msgstr "%1 ve %2 arasında kalan kısımdaki metin dizisini seçip kopyalayın (yukarıdaki örnekte %3)."
 
 #: ../user/get_passwd.php:64
 msgid "Paste the string into the field below, and click OK."
@@ -4668,9 +4406,7 @@ msgstr "Metin dizisini aşağıdaki bölüme yapıştırın ve ardından Tamam'a
 msgid ""
 "You will now be logged in to your account; update the email and password of "
 "your account."
-msgstr ""
-"Artık hesabınıza giriş yapmış olacaksınız; hesabınızın e-posta ve şifresini "
-"güncelleyin."
+msgstr "Artık hesabınıza giriş yapmış olacaksınız; hesabınızın e-posta ve şifresini güncelleyin."
 
 #: ../user/get_passwd.php:71
 msgid "Log in with authenticator"
@@ -4684,9 +4420,7 @@ msgstr "GPU işleri raporlanmadı"
 msgid ""
 "The following lists show the most productive GPU models on different "
 "platforms.  Relative speeds are shown in parentheses."
-msgstr ""
-"Aşağıdaki listeler farklı platformlardaki en verimli GPU modellerini "
-"göstermektedir. Göreceli hızları parantez içinde gösterilmiştir."
+msgstr "Aşağıdaki listeler farklı platformlardaki en verimli GPU modellerini göstermektedir. Göreceli hızları parantez içinde gösterilmiştir."
 
 #: ../user/home.php:42
 msgid "Welcome to %1"
@@ -4694,8 +4428,7 @@ msgstr "%1 projesine hoş geldiniz"
 
 #: ../user/home.php:43
 msgid "View and edit your account preferences using the links below."
-msgstr ""
-"Hesap tercihlerinizi aşağıdaki bağlantılardan görüp değiştirebilirsiniz."
+msgstr "Hesap tercihlerinizi aşağıdaki bağlantılardan görüp değiştirebilirsiniz."
 
 #: ../user/home.php:46
 msgid "If you have not already done so, %1download BOINC client software%2."
@@ -4754,10 +4487,7 @@ msgid ""
 "You can not delete our record of this computer because our database still "
 "contains work for it. You must wait a few days until the work for this "
 "computer has been deleted from the project database."
-msgstr ""
-"Veritabanımızda halen bu bilgisayara gönderilen bir iş bulunduğundan, onu "
-"kayıtlarımızdan silemezsiniz. Bu bilgisayara gönderilen iş proje "
-"veritabanından silinene kadar, birkaç gün beklemeniz gerekir."
+msgstr "Veritabanımızda halen bu bilgisayara gönderilen bir iş bulunduğundan, onu kayıtlarımızdan silemezsiniz. Bu bilgisayara gönderilen iş proje veritabanından silinene kadar, birkaç gün beklemeniz gerekir."
 
 #: ../user/host_delete.php:40
 msgid "Delete record of computer"
@@ -4781,11 +4511,9 @@ msgstr "Bilgisayarları birleştir"
 
 #: ../user/host_edit_form.php:38
 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 ""
-"Bazen BOINC yanlışlıkla aynı bilgisayara farklı kimlikler atar. En yenisiyle "
-"eski kimlikleri birleştirerek, bunu düzeltebilirsiniz."
+"Sometimes BOINC assigns separate identities to the same computer by mistake."
+" You can correct this by merging old identities with the newest one."
+msgstr "Bazen BOINC yanlışlıkla aynı bilgisayara farklı kimlikler atar. En yenisiyle eski kimlikleri birleştirerek, bunu düzeltebilirsiniz."
 
 #: ../user/host_edit_form.php:56
 msgid "No hosts are eligible for merging with this one."
@@ -4798,9 +4526,7 @@ msgstr "Detayları görüntüle"
 #: ../user/host_edit_form.php:66
 msgid ""
 "Check the computers that are the same as %1 (created %2, computer ID %3):"
-msgstr ""
-"%1 ile aynı olan bilgisayarları gözden geçirin (oluşturulma %2, bilgisayar "
-"NO %3)"
+msgstr "%1 ile aynı olan bilgisayarları gözden geçirin (oluşturulma %2, bilgisayar NO %3)"
 
 #: ../user/host_edit_form.php:70 ../user/workunit.php:39
 msgid "name"
@@ -4842,9 +4568,7 @@ msgstr "Bu bilgisayarın konumu %1 olarak ayarlandı."
 msgid ""
 "This change will take effect the next time the host communicates with this "
 "project."
-msgstr ""
-"Bu değişiklik, bilgisayarın bu proje ile bir sonraki iletişim kurmasından "
-"itibaren geçerli olacak."
+msgstr "Bu değişiklik, bilgisayarın bu proje ile bir sonraki iletişim kurmasından itibaren geçerli olacak."
 
 #: ../user/host_venue_action.php:50
 msgid "Return to host page"
@@ -4861,8 +4585,7 @@ msgstr "Gizlenen bilgisayarlar"
 #: ../user/hosts_user.php:56
 msgid ""
 "This user has chosen not to show information about his or her computers."
-msgstr ""
-"Bu kullanıcı, bilgisayarları hakkında bilgi gösterilmemesini tercih etti."
+msgstr "Bu kullanıcı, bilgisayarları hakkında bilgi gösterilmemesini tercih etti."
 
 #: ../user/hosts_user.php:64
 msgid "Your computers"
@@ -4902,17 +4625,13 @@ msgstr "önceden biçimlendirilmiş"
 
 #: ../user/html.php:33
 msgid ""
-"image; height cannot exceed 450 pixels. Please do not link to images without "
-"permission of the web site where the image is hosted."
-msgstr ""
-"resim; yüksekliği 450 pikseli geçemez. Lütfen resmi barındıran web sitesinin "
-"izni olmadan, resme bağlantı vermeyin."
+"image; height cannot exceed 450 pixels. Please do not link to images without"
+" permission of the web site where the image is hosted."
+msgstr "resim; yüksekliği 450 pikseli geçemez. Lütfen resmi barındıran web sitesinin izni olmadan, resme bağlantı vermeyin."
 
 #: ../user/html.php:35
 msgid "You can also use ampersand notation for special characters."
-msgstr ""
-"Ayrıca özel karakterler için 've işareti' (ampersand) gösterimi "
-"kullanabilirsiniz."
+msgstr "Ayrıca özel karakterler için 've işareti' (ampersand) gösterimi kullanabilirsiniz."
 
 #: ../user/info.php:35
 msgid "Run %1 only on authorized computers"
@@ -4923,10 +4642,7 @@ msgid ""
 "Run %1 only on computers that you own, or for which you have obtained the "
 "owner's permission. Some companies and schools have policies that prohibit "
 "using their computers for projects such as %1."
-msgstr ""
-"%1 projesini yalnızca kendi bilgisayarınızda ya da sahibinin izin verdiği "
-"bilgisayarlarda çalıştırın. Bazı okul ya da şirketlerin, bilgisayarlarının %"
-"1 gibi projeler için kullanılmaması yönünde politikaları bulunabilir."
+msgstr "%1 projesini yalnızca kendi bilgisayarınızda ya da sahibinin izin verdiği bilgisayarlarda çalıştırın. Bazı okul ya da şirketlerin, bilgisayarlarının %1 gibi projeler için kullanılmaması yönünde politikaları bulunabilir."
 
 #: ../user/info.php:38
 msgid "How %1 will use your computer"
@@ -4937,19 +4653,13 @@ msgid ""
 "When you run %1 on your computer, it will use part of the computer's CPU "
 "power, disk space, and network bandwidth. You can control how much of your "
 "resources are used by %1, and when it uses them."
-msgstr ""
-"Bilgisayarınızda %1 çalıştırdığınızda, CPU (işlemci) gücü, disk alanı ve ağ "
-"bant genişliğinin bir kısmını kullanacak. %1 projesinin bu kaynakları ne "
-"zaman ve ne kadar kullanacağını belirleyebilirsiniz."
+msgstr "Bilgisayarınızda %1 çalıştırdığınızda, CPU (işlemci) gücü, disk alanı ve ağ bant genişliğinin bir kısmını kullanacak. %1 projesinin bu kaynakları ne zaman ve ne kadar kullanacağını belirleyebilirsiniz."
 
 #: ../user/info.php:40
 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 ""
-"Bilgisayarınız, gönderilen işleri %1 projesinin hedefleri doğrultusunda ve "
-"proje sitesinde tanımlandığı şekilde tamamlayacak. Bu kapsamda uygulama "
-"yazılımları zaman zaman değişebilir."
+msgstr "Bilgisayarınız, gönderilen işleri %1 projesinin hedefleri doğrultusunda ve proje sitesinde tanımlandığı şekilde tamamlayacak. Bu kapsamda uygulama yazılımları zaman zaman değişebilir."
 
 #: ../user/info.php:42
 msgid "Privacy policy"
@@ -4957,15 +4667,11 @@ msgstr "Gizlilik politikası"
 
 #: ../user/info.php:43
 msgid ""
-"Your account on %1 is identified by a name that you choose. This name may be "
-"shown on the %1 web site, along with a summary of the work your computer has "
-"done for %1. If you want to be anonymous, choose a name that doesn't reveal "
-"your identity."
-msgstr ""
-"%1 üzerindeki hesabınız, seçeceğiniz bir isimle birlikte tanınır. Bu isim, "
-"bilgisayarınızın %1 için tamamladığı işlerin özetiyle birlikte, %1 sitesinde "
-"gösterilebilir. Eğer anonim kalmak istiyorsanız, gerçek kimliğinizi ortaya "
-"çıkarmayan bir isim seçin."
+"Your account on %1 is identified by a name that you choose. This name may be"
+" shown on the %1 web site, along with a summary of the work your computer "
+"has done for %1. If you want to be anonymous, choose a name that doesn't "
+"reveal your identity."
+msgstr "%1 üzerindeki hesabınız, seçeceğiniz bir isimle birlikte tanınır. Bu isim, bilgisayarınızın %1 için tamamladığı işlerin özetiyle birlikte, %1 sitesinde gösterilebilir. Eğer anonim kalmak istiyorsanız, gerçek kimliğinizi ortaya çıkarmayan bir isim seçin."
 
 #: ../user/info.php:44
 msgid ""
@@ -4974,24 +4680,14 @@ 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 ""
-"Eğer %1 projesine katılırsanız, bilgisayarınız hakkında bilgi (örneğin "
-"işlemci tipi, bellek miktarı vb.) %1 tarafından kaydedilecek ve "
-"bilgisayarınıza ne tip iş gönderileceğinin belirlenmesinde kullanılacak. Bu "
-"bilgi %1 internet sitesinde de gösterilecek. Ancak, bilgisayarınızın "
-"konumuyla ilgili herhangi bir bilgi (örneğin etki alanı adı ya da ağ adresi) "
-"gösterilmeyecek."
+msgstr "Eğer %1 projesine katılırsanız, bilgisayarınız hakkında bilgi (örneğin işlemci tipi, bellek miktarı vb.) %1 tarafından kaydedilecek ve bilgisayarınıza ne tip iş gönderileceğinin belirlenmesinde kullanılacak. Bu bilgi %1 internet sitesinde de gösterilecek. Ancak, bilgisayarınızın konumuyla ilgili herhangi bir bilgi (örneğin etki alanı adı ya da ağ adresi) gösterilmeyecek."
 
 #: ../user/info.php:45
 msgid ""
-"To participate in %1, you must give an address where you receive email. This "
-"address will not be shown on the %1 web site or shared with organizations. %"
-"1 may send you periodic newsletters; however, you can opt out at any time."
-msgstr ""
-"%1 projesine katılmak için, e-postaları alacağınız bir adres vermelisiniz. "
-"Bu adres %1 internet sitesinde gösterilmeyecek ya da başka organizasyonlarla "
-"paylaşılmayacak. %1 size düzenli olarak bilgilendirme e-postaları "
-"gönderebilecek, bununla birlikte, gönderilmemesini de sağlayabilirsiniz."
+"To participate in %1, you must give an address where you receive email. This"
+" address will not be shown on the %1 web site or shared with organizations. "
+"%1 may send you periodic newsletters; however, you can opt out at any time."
+msgstr "%1 projesine katılmak için, e-postaları alacağınız bir adres vermelisiniz. Bu adres %1 internet sitesinde gösterilmeyecek ya da başka organizasyonlarla paylaşılmayacak. %1 size düzenli olarak bilgilendirme e-postaları gönderebilecek, bununla birlikte, gönderilmemesini de sağlayabilirsiniz."
 
 #: ../user/info.php:46
 msgid ""
@@ -5000,25 +4696,15 @@ 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 ""
-"%1 internet sitesinden gönderilen özel mesajları, yalnızca gönderen ve alan "
-"görebilir.  %1 özel mesajların içeriğini gözlemlemez ya da kontrol altında "
-"tutmaz.  Eğer başka bir %1 kullanıcısından istemediğiniz özel mesajlar "
-"alıyorsanız, onu %2mesaj filtrenize%3 ekleyebilirsiniz.  Böylece, bu kişiden "
-"gelen özel ya da herkese açık hiç bir mesajı görmezsiniz."
+msgstr "%1 internet sitesinden gönderilen özel mesajları, yalnızca gönderen ve alan görebilir.  %1 özel mesajların içeriğini gözlemlemez ya da kontrol altında tutmaz.  Eğer başka bir %1 kullanıcısından istemediğiniz özel mesajlar alıyorsanız, onu %2mesaj filtrenize%3 ekleyebilirsiniz.  Böylece, bu kişiden gelen özel ya da herkese açık hiç bir mesajı görmezsiniz."
 
 #: ../user/info.php:47
 msgid ""
 "If you use our web site forums you must follow the %2posting guidelines%3.  "
 "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 ""
-"Eğer internet sitesi forumlarımızı kullanıyorsanız, %2gönderim ilkelerine%3 "
-"uymak zorundasınız.  %1 forumlarına gönderilen mesajlar herkes tarafından "
-"görülebilir, buna üye olmayanlar da dahildir.  Forumlara mesaj göndermekle, "
-"mesajların herhangi biri tarafından görülmesi ve kopyalanmasını kabul etmiş "
-"ve içeriği üzerindeki haklarınızdan vazgeçmiş oluyorsunuz."
+"members.  By posting to the forums, you are granting irrevocable license for"
+" anyone to view and copy your posts."
+msgstr "Eğer internet sitesi forumlarımızı kullanıyorsanız, %2gönderim ilkelerine%3 uymak zorundasınız.  %1 forumlarına gönderilen mesajlar herkes tarafından görülebilir, buna üye olmayanlar da dahildir.  Forumlara mesaj göndermekle, mesajların herhangi biri tarafından görülmesi ve kopyalanmasını kabul etmiş ve içeriği üzerindeki haklarınızdan vazgeçmiş oluyorsunuz."
 
 #: ../user/info.php:48
 msgid "Is it safe to run %1?"
@@ -5028,36 +4714,23 @@ msgstr "%1 çalıştırmak güvenli midir?"
 msgid ""
 "Any time you download a program through the Internet you are taking a "
 "chance: the program might have dangerous errors, or the download server "
-"might have been hacked. %1 has made efforts to minimize these risks. We have "
-"tested our applications carefully. Our servers are behind a firewall and 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 ""
-"İnternetten herhangi bir yazılım indirdiğinizde, bazı olasılıkları göze "
-"almaktasınız: Yazılımın tehlikeli hataları bulunabilir ya da indirme "
-"sunucusu hack'lenmiş olabilir. %1 bu riskleri en aza indirmeye gayret "
-"etmekte. Uygulamalarımızı dikkalice test etmekteyiz. Sunucularımız bir "
-"güvenlik duvarı arkasında bulunuyor ve yüksek güvenlik için "
-"yapılandırılıyor. İndirilen yazılımların doğruluğunu sağlamak için, tüm "
-"çalıştırılabilir dosyalar internete bağlı olmayan güvenli bir bilgisayarda "
-"dijital olarak imzalanıyor."
+"might have been hacked. %1 has made efforts to minimize these risks. We have"
+" tested our applications carefully. Our servers are behind a firewall and "
+"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 "İnternetten herhangi bir yazılım indirdiğinizde, bazı olasılıkları göze almaktasınız: Yazılımın tehlikeli hataları bulunabilir ya da indirme sunucusu hack'lenmiş olabilir. %1 bu riskleri en aza indirmeye gayret etmekte. Uygulamalarımızı dikkalice test etmekteyiz. Sunucularımız bir güvenlik duvarı arkasında bulunuyor ve yüksek güvenlik için yapılandırılıyor. İndirilen yazılımların doğruluğunu sağlamak için, tüm çalıştırılabilir dosyalar internete bağlı olmayan güvenli bir bilgisay [...]
 
 #: ../user/info.php:50
 msgid ""
 "The applications run by %1 may cause some computers to overheat. If this "
 "happens, stop running %1 or use a %2utility program%3 that limits CPU usage."
-msgstr ""
-"%1 tarafından çalıştırılan uygulamalar, bazı bilgisayarların fazla "
-"ısınmasına neden olabilir. Bu gerçekleşirse, %1 kullanmayı durdurun ya da "
-"CPU (işlemci) kullanımını sınırlayan bir %2yardımcı program%3 kullanın."
+msgstr "%1 tarafından çalıştırılan uygulamalar, bazı bilgisayarların fazla ısınmasına neden olabilir. Bu gerçekleşirse, %1 kullanmayı durdurun ya da CPU (işlemci) kullanımını sınırlayan bir %2yardımcı program%3 kullanın."
 
 #: ../user/info.php:51
 msgid ""
 "%1 was developed by %2. BOINC was developed at the University of California."
-msgstr ""
-"%1, %2 tarafından geliştirildi. BOINC, Kaliforniya Üniversitesi'nde "
-"geliştirildi."
+msgstr "%1, %2 tarafından geliştirildi. BOINC, Kaliforniya Üniversitesi'nde geliştirildi."
 
 #: ../user/info.php:53
 msgid "Liability"
@@ -5066,11 +4739,9 @@ msgstr "Sorumluluk"
 #: ../user/info.php:54
 msgid ""
 "%1 and %2 assume no liability for damage to your computer, loss of data, or "
-"any other event or condition that may occur as a result of participating in %"
-"1."
-msgstr ""
-"%1 ve %2, %1 projesine katılmakla bilgisayarınızda oluşabilecek bir hasarı, "
-"veri kaybını ya da oluşabilecek başka olayların sonuçlarını üstlenmez."
+"any other event or condition that may occur as a result of participating in "
+"%1."
+msgstr "%1 ve %2, %1 projesine katılmakla bilgisayarınızda oluşabilecek bir hasarı, veri kaybını ya da oluşabilecek başka olayların sonuçlarını üstlenmez."
 
 #: ../user/info.php:56
 msgid "Other BOINC projects"
@@ -5078,23 +4749,17 @@ msgstr "Diğer BOINC projeleri"
 
 #: ../user/info.php:57
 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 "
+"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 ""
-"Diğer projeler, %1 ile aynı platformu kullanır, yani BOINC'i. Bir ya da daha "
-"fazla projeye daha katılmayı düşünebilirsiniz. Böylece, bilgisayarınız %1 "
-"için bir iş bulunmadığı zamanlarda da faydalı olmayı sürdürebilir."
+msgstr "Diğer projeler, %1 ile aynı platformu kullanır, yani BOINC'i. Bir ya da daha fazla projeye daha katılmayı düşünebilirsiniz. Böylece, bilgisayarınız %1 için bir iş bulunmadığı zamanlarda da faydalı olmayı sürdürebilir."
 
 #: ../user/info.php:58
 msgid ""
 "These other projects are not associated with %1, and we cannot vouch for "
 "their security practices or the nature of their research. Join them at your "
 "own risk."
-msgstr ""
-"Bu diğer projeler, %1 ile ortak değildir ve onların güvenlik yöntemlerine ya "
-"da araştırmalarının doğasına kefil olmayız. Diğer projelere, riski "
-"kendinize ait olmak üzere katılın."
+msgstr "Bu diğer projeler, %1 ile ortak değildir ve onların güvenlik yöntemlerine ya da araştırmalarının doğasına kefil olmayız. Diğer projelere, riski kendinize ait olmak üzere katılın."
 
 #: ../user/language_select.php:47
 msgid "Language selection"
@@ -5104,16 +4769,13 @@ msgstr "Dil seçimi"
 msgid ""
 "This web site is available in several languages. The currently selected "
 "language is %1."
-msgstr ""
-"Bu internet sitesi çeşitli dillerde mevcuttur. Şu anda seçili olan dil: %1."
+msgstr "Bu internet sitesi çeşitli dillerde mevcuttur. Şu anda seçili olan dil: %1."
 
 #: ../user/language_select.php:78
 msgid ""
 "Normally the choice of language is determined by your browser's language "
 "setting, which is: %1.  You can change this setting using:"
-msgstr ""
-"Normalde dil seçimi tarayıcınızın dil ayarlarına bakılarak gerçekleştirilir, "
-"şu anda bulunan ayar: %1.  Bu ayarı şu şekilde değiştirebilirsiniz:"
+msgstr "Normalde dil seçimi tarayıcınızın dil ayarlarına bakılarak gerçekleştirilir, şu anda bulunan ayar: %1.  Bu ayarı şu şekilde değiştirebilirsiniz:"
 
 #: ../user/language_select.php:83
 msgid "Firefox: Tools/Options/General"
@@ -5128,10 +4790,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 ""
-"Ya da aşağıdaki bağlantılardan birisine tıklayarak, istediğiniz dili "
-"seçebilirsiniz.  Bu, tarayıcınıza bir çerez gönderir; tarayıcınızın "
-"sitemizden gelen çerezleri kabul ettiğinden emin olun."
+msgstr "Ya da aşağıdaki bağlantılardan birisine tıklayarak, istediğiniz dili seçebilirsiniz.  Bu, tarayıcınıza bir çerez gönderir; tarayıcınızın sitemizden gelen çerezleri kabul ettiğinden emin olun."
 
 #: ../user/language_select.php:95
 msgid "Language name (click to select)"
@@ -5143,11 +4802,9 @@ msgstr "Tarayıcının dil ayarlarını kullan"
 
 #: ../user/language_select.php:113
 msgid ""
-"Translations are done by volunteers.  If your native language is not here, %"
-"1you can provide a translation%2."
-msgstr ""
-"Çeviriler gönüllüler tarafından yapılır.  Eğer anadiliniz burada mevcut "
-"değilse, %1bir çeviri gerçekleştirebilirsiniz%2."
+"Translations are done by volunteers.  If your native language is not here, "
+"%1you can provide a translation%2."
+msgstr "Çeviriler gönüllüler tarafından yapılır.  Eğer anadiliniz burada mevcut değilse, %1bir çeviri gerçekleştirebilirsiniz%2."
 
 #: ../user/login_form.php:45
 msgid "Email address:"
@@ -5193,13 +4850,7 @@ msgid ""
 "        having that name with the newest computer having that name.\n"
 "        Incompatible computers will not be merged.\n"
 "        <p>"
-msgstr ""
-"Bu işlem, bilgisayarları etki alanı adına göre birleştirir.\n"
-"        <p>\n"
-"        Her etki alanı adı için, bu adı taşıyan yeni bilgisayar ile\n"
-"        bu adı taşıyan tüm eski bilgisayarlar birleştirilecek.\n"
-"        Uyumsuz bilgisayar birleştirilmiş olmayacak.\n"
-"        <p>"
+msgstr "Bu işlem, bilgisayarları etki alanı adına göre birleştirir.\n        <p>\n        Her etki alanı adı için, bu adı taşıyan yeni bilgisayar ile\n        bu adı taşıyan tüm eski bilgisayarlar birleştirilecek.\n        Uyumsuz bilgisayar birleştirilmiş olmayacak.\n        <p>"
 
 #: ../user/merge_by_name.php:82
 msgid "Go ahead and do this"
@@ -5215,11 +4866,7 @@ msgid ""
 "To maximize discussion and flow of information,\n"
 "our message boards are moderated.\n"
 "Message board postings are subject to the following posting rules:\n"
-msgstr ""
-"\n"
-"Bilgi tartışmasını ve akışını maksimize etmek için,\n"
-"mesaj panolarımız yönetilmektedir.\n"
-"Mesaj panosu gönderimleri aşağıdaki kurallara tabidir:\n"
+msgstr "\nBilgi tartışmasını ve akışını maksimize etmek için,\nmesaj panolarımız yönetilmektedir.\nMesaj panosu gönderimleri aşağıdaki kurallara tabidir:\n"
 
 #: ../user/moderation.php:30
 msgid ""
@@ -5228,8 +4875,7 @@ msgid ""
 "Moderators may delete posts that violate any of these rules.\n"
 "The authors of deleted posts will be notified via email.\n"
 "Gross offenders may have their ability to post messages temporarily revoked\n"
-"(though to prevent abuse only project administrators have the ability to do "
-"so).\n"
+"(though to prevent abuse only project administrators have the ability to do so).\n"
 "Additional kinds of bad behavior (\"bugging\" posts to trap the\n"
 "IP addresses of other participants, excessive thread creation to spam\n"
 "the forums, etc.), while not listed in the formal rules, may still\n"
@@ -5258,41 +4904,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>\n"
-"Moderatörler bu kuralların herhangi birini ihlal eden mesajları silebilir.\n"
-"Silinen mesajların yazarları e-posta yoluyla bildirilecektir.\n"
-"Saldırgan suçlular, gönderileri geçici olarak iptal yetkisine sahip olabilir\n"
-"(istismarı önlemek için, sadece proje yöneticileri bunu yapma yetkisine "
-"sahiptir).\n"
-"Kötü davranışın ilave çeşitleri (diğer katılımcıların IP adreslerini "
-"yakalamak için\n"
-"\"gizli dinleme\" mesajları, forumu spamlamak için aşırı miktarda konu açma, "
-"vb.),\n"
-"resmi kurallarda yer almamakla birlikte, yine benzer cezalara yol açabilir.\n"
-"<p>\n"
-"Bir mesajın gönderim kurallarından herhangi birini ihlal ettiğini\n"
-"düşünüyorsanız, yazı üzerindeki kırmızı X işaretini tıklayın ve formu\n"
-"doldurun; moderatörler şikayetinizden haberdar edilecek. Bu butonu\n"
-"sadece açık ihlaller için kullanın - kişisel anlaşmazlıklar için değil.\n"
-"<p>\n"
-"Moderasyon yaparken olabildiğince adil olmaya çalışıyoruz, ama\n"
-"büyük bir kullanıcı topluluğunda, birçok farklı bakış açısı bulunurken,\n"
-"her zaman bazı kişiler ölçülü kararlardan dahi memnun olmayacaktır.\n"
-"Bu gerçekleşirse üzülürüz, ancak lütfen şuna dikkat edin; her zaman\n"
-"herkesi memnun edemeyiz, elimizdeki imkanlarla kararlar alıyoruz ve\n"
-"forumun geneli için en iyisini yapmaya çalışıyoruz.\n"
-"Lütfen forumlarda bizim moderasyon politikalarımızı tartışmayın.\n"
-"Biz ne bir sosyal mühendislik projesiyiz, ne de mükemmel derecede adil\n"
-"bir sistem yaratmak peşindeyiz. Bu yüzden, bu tür tartışmalar verimsiz ve\n"
-"potansiyel olarak kışkırtıcı olma eğilimindedir. Eğer meşru bir iddianız "
-"varsa,\n"
-"aşağıdaki adrese e-posta gönderin.\n"
-"<p>\n"
-"Bu moderasyon politikası %1 tarafından belirlenir.\n"
-"Eğer politika hakkında yorumlarınız varsa, %2 adresine\n"
-"e-posta gönderin.\n"
+msgstr "\n<p>\nModeratörler bu kuralların herhangi birini ihlal eden mesajları silebilir.\nSilinen mesajların yazarları e-posta yoluyla bildirilecektir.\nSaldırgan suçlular, gönderileri geçici olarak iptal yetkisine sahip olabilir\n(istismarı önlemek için, sadece proje yöneticileri bunu yapma yetkisine sahiptir).\nKötü davranışın ilave çeşitleri (diğer katılımcıların IP adreslerini yakalamak için\n\"gizli dinleme\" mesajları, forumu spamlamak için aşırı miktarda konu açma, vb.),\nresmi k [...]
 
 #: ../user/pending.php:66
 msgid "Pending credit"
@@ -5375,10 +4987,7 @@ msgid ""
 "Your message was flagged as spam\n"
 "                by the Akismet anti-spam system.\n"
 "                Please modify your text and try again."
-msgstr ""
-"İlk yanıtınız Akismet anti-spam sistemi\n"
-"                tarafından bir saldırı olarak algılandı.\n"
-"                Lütfen yazdığınızı değiştirip tekrar deneyin."
+msgstr "İlk yanıtınız Akismet anti-spam sistemi\n                tarafından bir saldırı olarak algılandı.\n                Lütfen yazdığınızı değiştirip tekrar deneyin."
 
 #: ../user/pm.php:205
 msgid "Could not find user with id %1"
@@ -5390,9 +4999,7 @@ msgstr "%1 adında bir kullanıcı bulunamadı."
 
 #: ../user/pm.php:212
 msgid "%1 is not a unique username; you will have to use user ID"
-msgstr ""
-"%1 benzersiz bir kullanıcı adı değil; kullanıcının kimlik NO'sunu "
-"kullanmalısınız"
+msgstr "%1 benzersiz bir kullanıcı adı değil; kullanıcının kimlik NO'sunu kullanmalısınız"
 
 #: ../user/pm.php:217
 msgid "User %1 (ID: %2) is not accepting private messages from you."
@@ -5410,9 +5017,7 @@ msgstr "%1 gerçekten engellensin mi?"
 msgid ""
 "Are you really sure you want to block user %1 from sending you private "
 "messages?"
-msgstr ""
-"%1 kullanıcısının size özel mesaj göndermesini engellemek istediğinize emin "
-"misiniz?"
+msgstr "%1 kullanıcısının size özel mesaj göndermesini engellemek istediğinize emin misiniz?"
 
 #: ../user/pm.php:244
 msgid "Please note that you can only block a limited amount of users."
@@ -5422,9 +5027,7 @@ msgstr "Unutmayın ki, yalnızca sınırlı sayıda kullanıcıyı engelleyebili
 msgid ""
 "Once the user has been blocked you can unblock it using forum preferences "
 "page."
-msgstr ""
-"Bir kullanıcı engellendiğinizde, engelini forum tercihleri sayfasından "
-"kaldırabilirsiniz."
+msgstr "Bir kullanıcı engellendiğinizde, engelini forum tercihleri sayfasından kaldırabilirsiniz."
 
 #: ../user/pm.php:252
 msgid "No, cancel"
@@ -5455,21 +5058,14 @@ 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 ""
-"Tercihleriniz güncellendi. Güncel tercihler,\n"
-"          bilgisayarınız %1 ile ilk bağlantı kurduğunda ya da\n"
-"          BOINC Manager'da %2Güncelle%3 komutunu kullandığınızda "
-"kullanılmaya başlanacak."
+msgstr "Tercihleriniz güncellendi. Güncel tercihler,\n          bilgisayarınız %1 ile ilk bağlantı kurduğunda ya da\n          BOINC Manager'da %2Güncelle%3 komutunu kullandığınızda kullanılmaya başlanacak."
 
 #: ../user/prefs.php:41
 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 ""
-"Tercihleriniz varsayılan değerlerine sıfırlandı ve bilgisayarınız\n"
-"          %1 ile iletişim kurduğunda ya da BOINC Manager'dan\n"
-"          %2Güncelle%3 komutu kullanıldığında yürürlüğe girecek."
+msgstr "Tercihleriniz varsayılan değerlerine sıfırlandı ve bilgisayarınız\n          %1 ile iletişim kurduğunda ya da BOINC Manager'dan\n          %2Güncelle%3 komutu kullanıldığında yürürlüğe girecek."
 
 #: ../user/prefs_edit.php:65 ../user/prefs_edit.php:93
 msgid "%1 for %2"
@@ -5499,25 +5095,19 @@ msgstr "İptal"
 msgid ""
 "%1Profiles%2 let individuals share backgrounds and opinions with the %3 "
 "community."
-msgstr ""
-"%1Profilller%2, fikirlerinizi ve özgeçmişinizi %3 topluluğuyla paylaşmanızı "
-"sağlar."
+msgstr "%1Profilller%2, fikirlerinizi ve özgeçmişinizi %3 topluluğuyla paylaşmanızı sağlar."
 
 #: ../user/profile_menu.php:36
 msgid ""
 "Explore the diversity of your fellow volunteers, and contribute your own "
 "views for others to enjoy."
-msgstr ""
-"Sizin gibi düşünen gönüllüleri arayın ve görüşlerinizle diğerlerine katkıda "
-"bulunun."
+msgstr "Sizin gibi düşünen gönüllüleri arayın ve görüşlerinizle diğerlerine katkıda bulunun."
 
 #: ../user/profile_menu.php:37
 msgid ""
 "If you haven't already, you can %1create your own user profile%2 for others "
 "to see!"
-msgstr ""
-"Sahip değilseniz, diğerlerinin görmesi için %1kendi kullanıcı profilinizi "
-"oluşturabilirsiniz%2."
+msgstr "Sahip değilseniz, diğerlerinin görmesi için %1kendi kullanıcı profilinizi oluşturabilirsiniz%2."
 
 #: ../user/profile_menu.php:42
 msgid "User of the Day"
@@ -5539,9 +5129,7 @@ msgstr "Profillere %1ülkelerine göre%2 gözat."
 msgid ""
 "Browse profiles %1at random%2, %3at random with pictures%2, or %4at random "
 "without pictures%2."
-msgstr ""
-"Profillere %1rasgele%2, %3resimlerle rasgele%2 ya da %4resimler olmadan "
-"rasgele%2 gözat."
+msgstr "Profillere %1rasgele%2, %3resimlerle rasgele%2 ya da %4resimler olmadan rasgele%2 gözat."
 
 #: ../user/profile_menu.php:66
 msgid "Alphabetical profile listings:"
@@ -5785,26 +5373,21 @@ msgstr "%1 için istatistikler"
 
 #: ../user/stats.php:37
 msgid ""
-"More detailed statistics for %1 and other BOINC-based projects are available "
-"at several web sites:"
-msgstr ""
-"%1 ve diğer BOINC-tabanlı projeler için daha detaylı istatistikler, çeşitli "
-"internet sitelerinde mevcuttur:"
+"More detailed statistics for %1 and other BOINC-based projects are available"
+" at several web sites:"
+msgstr "%1 ve diğer BOINC-tabanlı projeler için daha detaylı istatistikler, çeşitli internet sitelerinde mevcuttur:"
 
 #: ../user/stats.php:40
 msgid ""
-"You can also get your current statistics in the form of a \"signature image"
-"\":"
-msgstr ""
-"Güncel istatistiklerinizi, bir \"imza resmi\" biçiminde de görebilirsiniz:"
+"You can also get your current statistics in the form of a \"signature "
+"image\":"
+msgstr "Güncel istatistiklerinizi, bir \"imza resmi\" biçiminde de görebilirsiniz:"
 
 #: ../user/stats.php:43
 msgid ""
 "Additionally you can get your individual statistics summed across all BOINC "
 "projects from several sites; see your %1home page%2."
-msgstr ""
-"Ek olarak, tüm BOINC projelerindeki kişisel istatistiklerinizin özetini de "
-"çeşitli sitelerden alabilirsiniz; %1ana sayfanıza%2 bakın."
+msgstr "Ek olarak, tüm BOINC projelerindeki kişisel istatistiklerinizin özetini de çeşitli sitelerden alabilirsiniz; %1ana sayfanıza%2 bakın."
 
 #: ../user/team.php:27
 msgid "%1 participants may form %2teams%3."
@@ -5813,9 +5396,7 @@ msgstr "%1 katılımcıları %2takımlar%3 oluşturabilir."
 #: ../user/team.php:29
 msgid ""
 "You may belong to only one team. You can join or quit a team at any time."
-msgstr ""
-"Aynı anda yalnızca bir takımın üyesi olabilirsiniz. Bir takıma istediğiniz "
-"zaman katılıp ayrılabilirsiniz."
+msgstr "Aynı anda yalnızca bir takımın üyesi olabilirsiniz. Bir takıma istediğiniz zaman katılıp ayrılabilirsiniz."
 
 #: ../user/team.php:31
 msgid "Each team has a %1founder%2 who may:"
@@ -5843,9 +5424,7 @@ msgstr "Üyesi yoksa takımı kaldırma."
 
 #: ../user/team.php:40
 msgid "To join a team, visit its team page and click %1Join this team%2."
-msgstr ""
-"Bir takıma katılmak için, takımın sayfasını ziyaret edin ve %1Bu takıma "
-"katıl%2 bağlantısına tıklayın."
+msgstr "Bir takıma katılmak için, takımın sayfasını ziyaret edin ve %1Bu takıma katıl%2 bağlantısına tıklayın."
 
 #: ../user/team.php:41 ../user/team_search.php:180
 msgid "Find a team"
@@ -5878,9 +5457,7 @@ msgstr "Takım Yöneticileri ekleme ya da çıkarma"
 
 #: ../user/team_admins.php:41
 msgid "You can select team members as 'Team Admins'. Team Admins can:"
-msgstr ""
-"Takımınızın üyelerini 'Takım Yöneticisi' yapabilirsiniz. Takım Yöneticileri "
-"şunları gerçekleştirebilir:"
+msgstr "Takımınızın üyelerini 'Takım Yöneticisi' yapabilirsiniz. Takım Yöneticileri şunları gerçekleştirebilir:"
 
 #: ../user/team_admins.php:43
 msgid "Edit team information (name, URL, description, country)"
@@ -5892,11 +5469,9 @@ msgstr "Takımın katılma/ayrılma geçmişini görüntüleme"
 
 #: ../user/team_admins.php:45
 msgid ""
-"Moderate the team forum, if any (admins get email notification of moderation "
-"events and red X reports)"
-msgstr ""
-"Eğer mevcutsa, takım forumunu yönetme (yöneticiler, moderasyon olayları ve "
-"red X raporları hakkında uyarı e-postaları alır)"
+"Moderate the team forum, if any (admins get email notification of moderation"
+" events and red X reports)"
+msgstr "Eğer mevcutsa, takım forumunu yönetme (yöneticiler, moderasyon olayları ve red X raporları hakkında uyarı e-postaları alır)"
 
 #: ../user/team_admins.php:47
 msgid "Team Admins cannot:"
@@ -5912,16 +5487,13 @@ msgstr "Üyeleri çıkartma"
 
 #: ../user/team_admins.php:53
 msgid "If a Team Admin quits the team, they cease to be a Team Admin."
-msgstr ""
-"Bir Takım Yöneticisi takımdan ayrılırsa, Takım Yöneticiliği de sona erer."
+msgstr "Bir Takım Yöneticisi takımdan ayrılırsa, Takım Yöneticiliği de sona erer."
 
 #: ../user/team_admins.php:54
 msgid ""
 "We recommend that you select only people you know and trust very well as "
 "Team Admins."
-msgstr ""
-"Yalnızca bildiğiniz  ve tamamen güvendiğiniz kişileri Takım Yöneticisi "
-"yapmanızı öneririz."
+msgstr "Yalnızca bildiğiniz  ve tamamen güvendiğiniz kişileri Takım Yöneticisi yapmanızı öneririz."
 
 #: ../user/team_admins.php:59
 msgid "There are currently no Team Admins"
@@ -5991,17 +5563,13 @@ msgstr "%1 takımının kurucusunu değiştir"
 msgid ""
 "Team member %1 requested this team's foundership on %2, but left the team, "
 "thus canceling the request."
-msgstr ""
-"Takım üyesi %1, %2 tarihinde bu takımın yöneticisi olmayı talep etti, ancak "
-"takımdan ayrıldı. Dolayısıyla talep iptal ediliyor."
+msgstr "Takım üyesi %1, %2 tarihinde bu takımın yöneticisi olmayı talep etti, ancak takımdan ayrıldı. Dolayısıyla talep iptal ediliyor."
 
 #: ../user/team_change_founder_form.php:49
 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 ""
-"Takım üyesi %1, bu takımın yöneticisi olmayı talep etti. Bu gerçekleşebilir "
-"çünkü takımdan ayrıldınız ya da takımla uzun süredir irtibat kurmuyorsunuz."
+msgstr "Takım üyesi %1, bu takımın yöneticisi olmayı talep etti. Bu gerçekleşebilir çünkü takımdan ayrıldınız ya da takımla uzun süredir irtibat kurmuyorsunuz."
 
 #: ../user/team_change_founder_form.php:55
 msgid "decline request"
@@ -6009,15 +5577,9 @@ msgstr "isteği reddet"
 
 #: ../user/team_change_founder_form.php:58
 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 tarihine kadar talebi reddetmezseniz, %2 takımın yöneticisi olma "
-"seçeneğine sahip olacak.<br /><br />\n"
-"                  Talebi kabul etmek için, aşağıdaki formu kullanarak %3 "
-"takımına kurucu olarak atayın."
+"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 tarihine kadar talebi reddetmezseniz, %2 takımın yöneticisi olma seçeneğine sahip olacak.<br /><br />\n                  Talebi kabul etmek için, aşağıdaki formu kullanarak %3 takımına kurucu olarak atayın."
 
 #: ../user/team_change_founder_form.php:66
 msgid "No transfer request is pending."
@@ -6027,10 +5589,7 @@ msgstr "Beklemede olan değişim isteği bulunmuyor."
 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 ""
-"Başka bir kullanıcıyı bu takımın kurucusu yapmak için, üye isminin yanındaki "
-"kutucuğu işaretleyin ve aşağıdaki <strong>Kurucuyu değiştir</strong>e "
-"tıklayın."
+msgstr "Başka bir kullanıcıyı bu takımın kurucusu yapmak için, üye isminin yanındaki kutucuğu işaretleyin ve aşağıdaki <strong>Kurucuyu değiştir</strong>e tıklayın."
 
 #: ../user/team_change_founder_form.php:76
 msgid "New founder?"
@@ -6063,9 +5622,7 @@ msgstr "Takım oluştur"
 #: ../user/team_create_form.php:30
 msgid ""
 "You belong to %1. You must %2quit this team%3 before creating a new one."
-msgstr ""
-"%1 üyesisiniz. Yeni bir tane oluşturmadan önce %2bu takımdan ayrılmalısınız%"
-"3."
+msgstr "%1 üyesisiniz. Yeni bir tane oluşturmadan önce %2bu takımdan ayrılmalısınız%3."
 
 #: ../user/team_delta.php:65
 msgid "Not founder or admin"
@@ -6188,10 +5745,7 @@ 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 ""
-"Takımınızın mesaj panosunu kaldırmak istediğinize emin misiniz? Tüm "
-"başlıklar ve gönderiler kalıcı olarak silinecek (Bununla birlikte, daha "
-"sonra yeni bir mesaj panosu oluşturabilirsiniz)."
+msgstr "Takımınızın mesaj panosunu kaldırmak istediğinize emin misiniz? Tüm başlıklar ve gönderiler kalıcı olarak silinecek (Bununla birlikte, daha sonra yeni bir mesaj panosu oluşturabilirsiniz)."
 
 #: ../user/team_forum.php:100
 msgid "Yes - remove message board"
@@ -6203,10 +5757,9 @@ msgstr "Mesaj panosu kaldırıldı"
 
 #: ../user/team_forum.php:124
 msgid ""
-"Your team's message board has been removed. You may now %1create a new one%2."
-msgstr ""
-"Takımınızın mesaj panosu kaldırıldı. Şimdi yeni bir tane %"
-"1oluşturabilirsiniz%2."
+"Your team's message board has been removed. You may now %1create a new "
+"one%2."
+msgstr "Takımınızın mesaj panosu kaldırıldı. Şimdi yeni bir tane %1oluşturabilirsiniz%2."
 
 #: ../user/team_forum.php:143
 msgid "Team Message Board Updated"
@@ -6234,15 +5787,9 @@ msgstr "%1 kurucusu olma talebi gönderiliyor"
 
 #: ../user/team_founder_transfer_action.php:98
 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 ""
-"Mevcut kurucu, talebiniz hakkında e-posta ve özel mesaj yollarıyla "
-"uyarıldı.<br /><br />\n"
-"                       Kurucu 60 gün içerisinde yanıt vermezse, yeni kurucu "
-"olabileceksiniz."
+"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 "Mevcut kurucu, talebiniz hakkında e-posta ve özel mesaj yollarıyla uyarıldı.<br /><br />\n                       Kurucu 60 gün içerisinde yanıt vermezse, yeni kurucu olabileceksiniz."
 
 #: ../user/team_founder_transfer_action.php:102
 #: ../user/team_founder_transfer_action.php:113
@@ -6257,9 +5804,7 @@ msgstr "%1 takımının kuruculuğunu üstlendiniz"
 msgid ""
 "Congratulations, you are now the founder of team %1. Go to %2Your Account "
 "page%3 to find the Team Admin options."
-msgstr ""
-"Tebrikler, %1 takımının kurucusu oldunuz. Takım Yönetimi seçeneklerine "
-"ulaşmak için %2Hesap Sayfanız%3a gidin. <br>"
+msgstr "Tebrikler, %1 takımının kurucusu oldunuz. Takım Yönetimi seçeneklerine ulaşmak için %2Hesap Sayfanız%3a gidin. <br>"
 
 #: ../user/team_founder_transfer_action.php:120
 msgid "Decline founder change request"
@@ -6302,9 +5847,7 @@ msgstr "%2 tarihinde %1 için kurucu olmayı talep ettiniz."
 msgid ""
 "60 days have elapsed since your request, and the founder has not responded. "
 "You may now assume foundership by clicking here:"
-msgstr ""
-"Talebinizden bu yana 60 gün geçti ve kurucu yanıt vermedi. Buraya tıklayarak "
-"kuruculuğu üstlenebilirsiniz:"
+msgstr "Talebinizden bu yana 60 gün geçti ve kurucu yanıt vermedi. Buraya tıklayarak kuruculuğu üstlenebilirsiniz:"
 
 #: ../user/team_founder_transfer_form.php:50
 msgid "Assume foundership"
@@ -6314,26 +5857,13 @@ msgstr "Kuruculuğu üstlen"
 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 ""
-"Kurucu, talebiniz hakkında uyarıldı. Eğer %1 tarihine kadar yanıt vermezse, "
-"kurucu olmak için seçeneğiniz olacak."
+msgstr "Kurucu, talebiniz hakkında uyarıldı. Eğer %1 tarihine kadar yanıt vermezse, kurucu olmak için seçeneğiniz olacak."
 
 #: ../user/team_founder_transfer_form.php:60
 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"
+"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 ""
-"Eğer takım kurucusu aktif değilse ve kuruculuğu üstlenmek istiyorsanız, "
-"aşağıdaki butona tıklayın. Mevcut kurucuya isteğinizle ilgili detaylı bir "
-"e-posta gönderilecek ve kuruculuğu size devretme ya da talebi reddetme "
-"seçenekleri olacak. Kurucu 60 gün içerisinde bir yanıt vermezse, kurucu "
-"olabileceksiniz.<br /><br />\n"
-"                       Kurucu olma talebi göndermek istediğinize emin "
-"misiniz?"
+msgstr "Eğer takım kurucusu aktif değilse ve kuruculuğu üstlenmek istiyorsanız, aşağıdaki butona tıklayın. Mevcut kurucuya isteğinizle ilgili detaylı bir e-posta gönderilecek ve kuruculuğu size devretme ya da talebi reddetme seçenekleri olacak. Kurucu 60 gün içerisinde bir yanıt vermezse, kurucu olabileceksiniz.<br /><br />\n                       Kurucu olma talebi göndermek istediğinize emin misiniz?"
 
 #: ../user/team_founder_transfer_form.php:65
 msgid "Request foundership"
@@ -6347,9 +5877,7 @@ msgstr "Kurucu değişimi, %1 tarafından %2 tarihinde zaten talep edildi."
 msgid ""
 "A foundership change was requested during the last 90 days, so new requests "
 "are not allowed. Please try again later."
-msgstr ""
-"Son 90 gün içerisinde bir kurucu değişimi talebi oldu, bu nedenle yeni "
-"talepler kabul edilmiyor. Lütfen daha sonra tekrar deneyin."
+msgstr "Son 90 gün içerisinde bir kurucu değişimi talebi oldu, bu nedenle yeni talepler kabul edilmiyor. Lütfen daha sonra tekrar deneyin."
 
 #: ../user/team_join.php:32 ../user/team_join_action.php:32
 #: ../user/team_join_form.php:29
@@ -6410,16 +5938,13 @@ msgstr "Bu takımların üyeleri, istatistikleri ve bilgilerini görebilirsiniz.
 
 #: ../user/team_lookup.php:98
 msgid "More than 100 teams match your search. The first 100 are shown."
-msgstr ""
-"Aramanız sonucunda 100'den fazla takım bulundu. İlk 100 takım gösteriliyor."
+msgstr "Aramanız sonucunda 100'den fazla takım bulundu. İlk 100 takım gösteriliyor."
 
 #: ../user/team_lookup.php:104
 msgid ""
-"End of results. %1 If you cannot find the team you are looking for, you may %"
-"2create a team%3 yourself."
-msgstr ""
-"Sonuçların sonu. %1 Eğer istediğiniz gibi bir takım bulamadıysanız, kendiniz "
-"%2bir takım oluşturabilirsiniz%3."
+"End of results. %1 If you cannot find the team you are looking for, you may "
+"%2create a team%3 yourself."
+msgstr "Sonuçların sonu. %1 Eğer istediğiniz gibi bir takım bulamadıysanız, kendiniz %2bir takım oluşturabilirsiniz%3."
 
 #: ../user/team_manage.php:26
 msgid "Team administration for %1"
@@ -6467,9 +5992,7 @@ msgstr "Kurucu değişimi talebine yanıt verin."
 
 #: ../user/team_manage.php:50
 msgid "If you don't respond by %1, %2 may assume foundership of this team."
-msgstr ""
-"Eğer %1 tarihine kadar yanıt vermezseniz, %2 bu takımın kuruculuğunu "
-"üstlenebilir."
+msgstr "Eğer %1 tarihine kadar yanıt vermezseniz, %2 bu takımın kuruculuğunu üstlenebilir."
 
 #: ../user/team_manage.php:55
 msgid "Remove inactive or unwanted members from this team"
@@ -6501,27 +6024,21 @@ msgstr "Takım mesaj panosu oluşturun ya da yönetin."
 
 #: ../user/team_manage.php:71
 msgid ""
-"To have this team created on all BOINC projects (current and future) you can "
-"make it into a %1BOINC-wide team%2."
-msgstr ""
-"Mevcut tüm BOINC projelerinde bu takımın bulunmasını istiyorsanız (şu anda "
-"ve gelecekte), %1BOINC genişletilmiş-takımı%2 haline getirebilirsiniz."
+"To have this team created on all BOINC projects (current and future) you can"
+" make it into a %1BOINC-wide team%2."
+msgstr "Mevcut tüm BOINC projelerinde bu takımın bulunmasını istiyorsanız (şu anda ve gelecekte), %1BOINC genişletilmiş-takımı%2 haline getirebilirsiniz."
 
 #: ../user/team_manage.php:73
 msgid ""
 "Team admins are encouraged to join and participate in the Google %1boinc-"
 "team-founders%2 group."
-msgstr ""
-"Takım yöneticilerini, Google'daki %1boinc-takım-kurucuları%2 grubuna "
-"katılmaya teşvik ediyoruz."
+msgstr "Takım yöneticilerini, Google'daki %1boinc-takım-kurucuları%2 grubuna katılmaya teşvik ediyoruz."
 
 #: ../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 takım yöneticileri için diğer kaynaklar, üçüncü parti bir sitededir: %"
-"1www.boincteams.com%2."
+"Other resources for BOINC team admins are available from a third-party site,"
+" %1www.boincteams.com%2."
+msgstr "BOINC takım yöneticileri için diğer kaynaklar, üçüncü parti bir sitededir: %1www.boincteams.com%2."
 
 #: ../user/team_manage.php:91
 msgid "Can't delete non-empty team"
@@ -6555,19 +6072,10 @@ msgstr "%1 takımından ayrıl"
 msgid ""
 "<strong>Please note before quitting a team:</strong>\n"
 "         <ul>\n"
-"         <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>Takımdan ayrılmadan önce lütfen şunlara dikkat edin:</strong>\n"
-"         <ul>\n"
-"         <li>Takımdan ayrılırsanız, daha sonra yeniden katılabilirsiniz ya "
-"da istediğiniz başka bir takıma katılabilirsiniz\n"
-"         <li>Bir takımdan ayrılmak, kişisel kredi miktarlarınızı herhangi "
-"bir şekilde etkilemez.\n"
+"         <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>Takımdan ayrılmadan önce lütfen şunlara dikkat edin:</strong>\n         <ul>\n         <li>Takımdan ayrılırsanız, daha sonra yeniden katılabilirsiniz ya da istediğiniz başka bir takıma katılabilirsiniz\n         <li>Bir takımdan ayrılmak, kişisel kredi miktarlarınızı herhangi bir şekilde etkilemez.\n         </ul>"
 
 #: ../user/team_quit_form.php:40
 msgid "Quit Team"
@@ -6615,9 +6123,7 @@ msgstr "Takım arama sonuçları"
 
 #: ../user/team_search.php:94
 msgid "No teams were found matching your criteria. Try another search."
-msgstr ""
-"Arama kriterlerinize uygun takım bulunamadı. Lütfen arama kriterlerinizi "
-"değiştirin."
+msgstr "Arama kriterlerinize uygun takım bulunamadı. Lütfen arama kriterlerinizi değiştirin."
 
 #: ../user/team_search.php:96
 msgid "Or you can %1create a new team%2."
@@ -6628,11 +6134,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 ""
-"Aşağıdaki takımlar bir ya da daha fazla arama kriterinize uyuyor.\n"
-"            Bir takıma katılmak için, ismine tıklayın ve takım sayfasına "
-"gidin,\n"
-"               ardından %1Bu takıma katıl%2a tıklayın."
+msgstr "Aşağıdaki takımlar bir ya da daha fazla arama kriterinize uyuyor.\n            Bir takıma katılmak için, ismine tıklayın ve takım sayfasına gidin,\n               ardından %1Bu takıma katıl%2a tıklayın."
 
 #: ../user/team_search.php:107
 msgid "Change your search"
@@ -6642,9 +6144,7 @@ msgstr "Aramanızı değiştirin"
 msgid ""
 "You can team up with other people with similar interests, or from the same "
 "country, company, or school."
-msgstr ""
-"Sizinle benzer ilgilere sahip olan ya da aynı ülke, şirket ya da okuldan "
-"kişilerin bulunduğu takımlara katılabilirsiniz."
+msgstr "Sizinle benzer ilgilere sahip olan ya da aynı ülke, şirket ya da okuldan kişilerin bulunduğu takımlara katılabilirsiniz."
 
 #: ../user/team_search.php:183
 msgid "Use this form to find teams that might be right for you."
@@ -6771,9 +6271,7 @@ msgstr "BOINC e-posta adresini doğrula"
 msgid ""
 "Please visit the following link to validate the email address of your %1 "
 "account:"
-msgstr ""
-"%1 hesabınızın bağlı olduğu e-posta adresini doğrulamak için bu linke "
-"tıklayın:"
+msgstr "%1 hesabınızın bağlı olduğu e-posta adresini doğrulamak için bu linke tıklayın:"
 
 #: ../user/validate_email_addr.php:34
 msgid "Validate email sent"
@@ -6783,9 +6281,7 @@ msgstr "Doğrulama e-postası gönder"
 msgid ""
 "An email has been sent to %1. Visit the link it contains to validate your "
 "email address."
-msgstr ""
-"%1 adresine bir e-posta gönderildi. E-posta adresinizi doğrulamak için, "
-"gelen mesajdaki linke tıklayın."
+msgstr "%1 adresine bir e-posta gönderildi. E-posta adresinizi doğrulamak için, gelen mesajdaki linke tıklayın."
 
 #: ../user/validate_email_addr.php:44
 msgid "No such user."
@@ -6821,15 +6317,10 @@ msgstr "Hesap bilgisi"
 
 #: ../user/weak_auth.php:52
 msgid ""
-"You can access your account either by using your email address and "
-"password,\n"
+"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 ""
-"Hesabınıza e-posta adresinizi ve şifrenizi ya da atanan 'hesap anahtarı'nı "
-"kullanarak\n"
-"    erişebilirsiniz.\n"
-"    Hesap Anahtarınız şudur:"
+msgstr "Hesabınıza e-posta adresinizi ve şifrenizi ya da atanan 'hesap anahtarı'nı kullanarak\n    erişebilirsiniz.\n    Hesap Anahtarınız şudur:"
 
 #: ../user/weak_auth.php:57
 msgid "This key can be used to:"
@@ -6845,11 +6336,7 @@ 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 Manager kullanmadan hesabınıza bir bilgisayar eklemek için.\n"
-"       Bunu yapmak için, BOINC'i kurun,\n"
-"       BOINC veri klasöründe %1 adlı\n"
-"       bir dosya oluşturun ve içeriğini şöyle ayarlayın:"
+msgstr "BOINC Manager kullanmadan hesabınıza bir bilgisayar eklemek için.\n       Bunu yapmak için, BOINC'i kurun,\n       BOINC veri klasöründe %1 adlı\n       bir dosya oluşturun ve içeriğini şöyle ayarlayın:"
 
 #: ../user/weak_auth.php:73
 msgid "Weak account key"
@@ -6858,29 +6345,17 @@ msgstr "Zayıf hesap anahtarı"
 #: ../user/weak_auth.php:74
 msgid ""
 "Your 'weak account key' can be used to attach computers to your account\n"
-"    as described above, but cannot be used to log in to your account or "
-"change it in any way.\n"
+"    as described above, but cannot be used to log in to your account or change it in any way.\n"
 "    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 ""
-"'Zayıf hesabınız anahtarınız' da hesabınıza bilgisayar eklemek için "
-"kullanılabilir.\n"
-"    Yukarıda tarif edildiği gibi yapılır. Ancak hesabınızda oturum açılamaz "
-"veya\n"
-"    herhangi bir şekilde değiştirmek için kullanılamaz.\n"
-"    Hesabınıza güvenilir olmayan veya güveliksiz bir bilgisayar eklemek "
-"istiyorsanız,\n"
-"    bunu zayıf hesap anahtarınızı kullanarak yapabilirsiniz.\n"
-"    Zayıf hesap anahtarınız şudur:"
+msgstr "'Zayıf hesabınız anahtarınız' da hesabınıza bilgisayar eklemek için kullanılabilir.\n    Yukarıda tarif edildiği gibi yapılır. Ancak hesabınızda oturum açılamaz veya\n    herhangi bir şekilde değiştirmek için kullanılamaz.\n    Hesabınıza güvenilir olmayan veya güveliksiz bir bilgisayar eklemek istiyorsanız,\n    bunu zayıf hesap anahtarınızı kullanarak yapabilirsiniz.\n    Zayıf hesap anahtarınız şudur:"
 
 #: ../user/weak_auth.php:81
 msgid ""
 "If you change your password, your weak account key changes, and your "
 "previous weak account key becomes invalid."
-msgstr ""
-"Şifrenizi değiştirirseniz, zayıf hesap anahtarınız da değişir ve önceki "
-"zayıf hesap anahtarınız geçersiz hale gelir."
+msgstr "Şifrenizi değiştirirseniz, zayıf hesap anahtarınız da değişir ve önceki zayıf hesap anahtarınız geçersiz hale gelir."
 
 #: ../user/workunit.php:32
 msgid "can't find workunit"
@@ -6946,9 +6421,7 @@ msgstr "Kişisel geçmişiniz."
 msgid ""
 "Tell us about yourself. You could tell us where you're from, your age, "
 "occupation, hobbies, or anything else about yourself."
-msgstr ""
-"Bize kendinizi anlatın. Örneğin, nereden olduğunuzu, yaşınızı, mesleğinizi, "
-"hobilerinizi ya da kendiniz hakkındaki istediğiniz bir şeyi yazabilirsiniz."
+msgstr "Bize kendinizi anlatın. Örneğin, nereden olduğunuzu, yaşınızı, mesleğinizi, hobilerinizi ya da kendiniz hakkındaki istediğiniz bir şeyi yazabilirsiniz."
 
 #: ../project.sample/project.inc:87
 msgid "Your opinions about %1"
@@ -6961,12 +6434,7 @@ msgid ""
 "    <li>What are your views about the project?\n"
 "    <li>Any suggestions?\n"
 "    </ol>"
-msgstr ""
-"Lütfen bize %1 hakkındaki düşüncelerinizi anlatın<ol>\n"
-"    <li>Neden %1 çalışıtırıyorsunuz?\n"
-"    <li>Proje hakkındaki gözlemleriniz neler\n"
-"    <li>Önerilerileriniz var mı?\n"
-"    </ol>"
+msgstr "Lütfen bize %1 hakkındaki düşüncelerinizi anlatın<ol>\n    <li>Neden %1 çalışıtırıyorsunuz?\n    <li>Proje hakkındaki gözlemleriniz neler\n    <li>Önerilerileriniz var mı?\n    </ol>"
 
 #: ../project.sample/project_specific_prefs.inc:47
 msgid "Color scheme for graphics"
@@ -6984,303 +6452,8 @@ msgstr "Yalnızca seçili uygulamaları çalıştır"
 msgid ""
 "If no work for selected applications is available, accept work from other "
 "applications?"
-msgstr ""
-"Eğer seçili uygulamalar için iş mevcut değilse, diğer uygulamalardan işler "
-"kabul edilsin mi?"
+msgstr "Eğer seçili uygulamalar için iş mevcut değilse, diğer uygulamalardan işler kabul edilsin mi?"
 
 #: ../project.sample/project_specific_prefs.inc:91
 msgid "(all applications)"
 msgstr "(tüm uygulamalar)"
-
-#~ msgid "Error:"
-#~ msgstr "Hata:"
-
-#~ msgid "Account creation is disabled"
-#~ msgstr "Hesap oluşturma devre dışı"
-
-#~ msgid ""
-#~ "Sorry, this project has disabled the creation of new accounts.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Üzgünüm, bu projede yeni hesapların yaratılması devredışı bırakıldı.\n"
-#~ "Lütfen daha sonra yeniden deneyin."
-
-#~ msgid "Account creation is currently disabled. Please try again later."
-#~ msgstr ""
-#~ "Şu anda yeni hesap oluşturma seçeneği mevcut değil. Lütfen daha sonra tekrar "
-#~ "deneyin."
-
-#~ msgid "nvidia GPU"
-#~ msgstr "nvidia GPU"
-
-#~ msgid ""
-#~ "This project hasn\\'t created an email message - please notify its "
-#~ "administrators"
-#~ msgstr ""
-#~ "Bu proje henüz bir e-posta mesajına sahip değil. Lütfen yöneticileri uyarın"
-
-#~ msgid "Use Intel GPU %1 Enforced by version 7.0+ %2"
-#~ msgstr "Intel GPU kullanılsın %1 Sürüm 7.0 ve üzeri için. %2"
-
-#~ msgid ""
-#~ "These apply to all BOINC projects in which you participate.<br>\n"
-#~ "             On computers participating in multiple projects, the most "
-#~ "recently modified preferences will be used."
-#~ msgstr ""
-#~ "Bu ayarlar, eklediğiniz tüm BOINC projelerine uygulanacak.<br>\n"
-#~ "             Birden fazla proje eklediğiniz bilgisayarlarda, en son "
-#~ "güncellenen tercihler kullanılacak."
-
-#~ msgid "Export this news item as a Notice"
-#~ msgstr "Bu haber öğesini bir Bildirim olarak dışa aktar"
-
-#~ msgid ""
-#~ "Go to the BOINC data directory on your computer (on Windows this is "
-#~ "usually <b>C:\\Documents and Settings\\All Users\\Application Data"
-#~ "\\BOINC</b> or <b>C:\\Program Files\\BOINC</b>."
-#~ msgstr ""
-#~ "Bilgisayarınızdaki BOINC veri klasörüne gidin (bu Windows'ta genellikle "
-#~ "<b>C:\\Documents and Settings\\All Users\\Application Data\\BOINC</b> ya "
-#~ "da <b>C:\\Program Files\\BOINC</b> klasörüdür."
-
-#~ msgid "No such task"
-#~ msgstr "Eşleşen iş yok"
-
-#~ msgid ""
-#~ "Computer is connected to the Internet about every %1 Leave blank or 0 if "
-#~ "always connected. %2 BOINC will try to maintain at least this much work "
-#~ "(max 10 days). %3"
-#~ msgstr ""
-#~ "Bilgisayar internete bu kadar sürede bir bağlanır %1 Sürekli bağlıysa 0 "
-#~ "yazın. %2 BOINC, bu süre kadar yeterli olacak iş indirmeyi deneyecek (en "
-#~ "fazla 10 gün). %3"
-
-#~ msgid "Maintain enough work for an additional"
-#~ msgstr "Depolanacak ek iş miktarı"
-
-#~ msgid "Update failed: "
-#~ msgstr "Güncelleme başarısız:"
-
-#~ msgid "Provides %1limited access%2 to your account"
-#~ msgstr "Hesabınıza %1sınırlı erişimi%2 sağlar"
-
-#~ msgid ""
-#~ "Don't use this form. Just run BOINC, select Add Project, and enter an "
-#~ "email address and password."
-#~ msgstr ""
-#~ "Bu formu kullanmayın. Yalnızca BOINC'i çalıştırın, Proje ekle'yi seçin ve "
-#~ "bir e-posta adresi ile parola girin."
-
-#~ msgid "Do not reorder sticky posts"
-#~ msgstr "Sabit gönderileri yeniden düzenleme"
-
-#~ msgid "If a thread contains more than this number of posts"
-#~ msgstr "Eğer bir konu başlığı bundan fazla sayıda gönderi içeriyorsa"
-
-#~ msgid "only display the first one and this many of the last ones"
-#~ msgstr "yalnızca ilkini ve en sondakileri görüntüle"
-
-#~ msgid "Your report has been recorded. Thanks you for your input."
-#~ msgstr "Raporunuz kaydedildi. Çabanız için teşekkürler."
-
-#~ msgid "Search type"
-#~ msgstr "Arama tipi"
-
-#~ msgid "User names starting with"
-#~ msgstr "Bununla başlayan kullanıcı adları:"
-
-#~ msgid ""
-#~ "Your 'weak account key' lets you link a computer to your account without "
-#~ "giving it the ability to log in to your account or to change it in any "
-#~ "way."
-#~ msgstr ""
-#~ "'Zayıf hesap anahtarınız',  bir bilgisayarı hesabınıza bağlamanızı "
-#~ "sağlar, ancak, söz konusu bilgisayarlardan hesabınıza giriş yapılamaz ve "
-#~ "hesabınız değiştirilemez."
-
-#~ msgid ""
-#~ "This mechanism works only with projects that have upgraded their server "
-#~ "software 7 Dec 2007 or later."
-#~ msgstr ""
-#~ "Bu mekanizma, sunucu yazılımlarını 7 Aralık 2007 ya da daha sonraki "
-#~ "tarihli sürüme yükseltmiş projelerde çalışır."
-
-#~ msgid "Your weak account key for this project is:"
-#~ msgstr "Bu proje için zayıf hesap anahtarınız:"
-
-#~ msgid ""
-#~ "To use your weak account key on a given host, find or create the 'account "
-#~ "file' for this project. This file has a name of the form "
-#~ "<b>account_PROJECT_URL.xml</b>. The account file for %1 is <b>%2</b>."
-#~ msgstr ""
-#~ "Bir bilgisayarda zayıf hesap anahtarınızı kullanmak için, bu proje için "
-#~ "'hesap dosyası'nı bulun ya da oluşturun. Söz konusu dosya, "
-#~ "<b>account_PROJE_URL'si.xml</b> biçiminde bir isme sahiptir. %1 için "
-#~ "hesap dosyasının ismi <b>%2</b> biçimindedir."
-
-#~ msgid "Create this file if needed. Set its contents to:"
-#~ msgstr "Mevcut değilse bu dosyayı oluşturun. İçeriğini şu şekilde yapın:"
-
-#~ msgid ""
-#~ "Your weak account key is a function of your password. If you change your "
-#~ "password, your weak account key changes, and your previous weak account "
-#~ "key becomes invalid."
-#~ msgstr ""
-#~ "Zayıf hesap anahtarınız, parolanıza bağlı bir işlevdir. Parolanızı "
-#~ "değiştirirseniz, zayıf hesap anahtarınız da değişir ve önceki zayıf hesap "
-#~ "anahtarınız geçersiz hale gelir."
-
-#~ msgid "Account key"
-#~ msgstr "Hesap anahtarı"
-
-#~ msgid "Provides full access to your account"
-#~ msgstr "Hesabınıza tam erişimi sağlar"
-
-#, fuzzy
-#~ msgid "Export"
-#~ msgstr "Sırala"
-
-#~ msgid "- private message"
-#~ msgstr "- özel mesaj"
-
-#~ msgid "Private message from"
-#~ msgstr "Bu kişiden özel mesaj:"
-
-#~ msgid "Email address verification pending"
-#~ msgstr "E-posta adresi doğrulaması bekleniyor"
-
-#~ msgid "Logged in as %1."
-#~ msgstr "%1 olarak giriş yapıldı."
-
-#~ msgid "Log in as someone else."
-#~ msgstr "Başka bir hesapla giriş yap."
-
-#~ msgid "No thread with id %1. Please check the link and try again."
-#~ msgstr ""
-#~ "%1 nolu bir konu başlığı mevcut değil. Lütfen bağlantıyı kontrol edip "
-#~ "tekrar deneyin."
-
-#~ msgid "Request not found"
-#~ msgstr "İstek bulunamadı"
-
-#~ msgid "%1 has added you as a friend."
-#~ msgstr "%1 sizi arkadaş olarak ekledi."
-
-#~ msgid "Account data for %1"
-#~ msgstr "%1 için hesap bilgisi"
-
-#~ msgid "couldn't create message board"
-#~ msgstr "mesaj panosu oluşturulamadı"
-
-#~ msgid "message board not found"
-#~ msgstr "mesaj panosu bulunamadı"
-
-#~ msgid "no such forum"
-#~ msgstr "eşleşen forum yok"
-
-#~ msgid "unknown command %1"
-#~ msgstr "bilinmeyen komut %1"
-
-#~ msgid "ERROR: %1 does not exist!  Cannot create combo box.<br>"
-#~ msgstr "HATA: %1 mevcut değil!  Giriş kutusu oluşturulamıyor.<br>"
-
-#~ msgid ""
-#~ "To protect the project's webpages from spam, we kindly ask you to type in "
-#~ "the two words shown in the image:<br>\n"
-#~ msgstr ""
-#~ "Projenin sitesini saldırılardan korumak için, resimde görülen iki "
-#~ "kelimeyi girmenizi istemek durumundayız:<br>\n"
-
-#~ msgid "BOINC client version"
-#~ msgstr "BOINC istemcisi sürümü"
-
-#~ msgid "Client detached"
-#~ msgstr "İstemci projeden ayrıldı"
-
-#~ msgid "Maximum daily WU quota per CPU"
-#~ msgstr "CPU başına günlük iş birimi kotası"
-
-#~ msgid "%1/day"
-#~ msgstr "%1/gün"
-
-#~ msgid "Anonymous platform - CPU"
-#~ msgstr "Anonim platform - CPU"
-
-#~ msgid "Anonymous platform - NVIDIA GPU"
-#~ msgstr "Anonim platform - NVIDIA GPU"
-
-#~ msgid "Anonymous platform - ATI GPU"
-#~ msgstr "Anonim platform - ATI GPU"
-
-#~ msgid "Task ID"
-#~ msgstr "İş NO"
-
-#~ msgid "Granted credit"
-#~ msgstr "Alınan kredi"
-
-#~ msgid "Click to"
-#~ msgstr "Tıkla"
-
-#~ msgid "(no restriction if equal)"
-#~ msgstr "(birbirine eşitse, sınırlama yok)"
-
-#~ msgid "percent of CPU time"
-#~ msgstr "% kadarı kullanılsın"
-
-#~ msgid "Leave at least"
-#~ msgstr "En az"
-
-#~ msgid "% of page file (swap space)"
-#~ msgstr "% kadar sayfa dosyası (swap alanı) kullanılsın"
-
-#~ msgid "Use ATI GPU if present %1(enforced by 6.10+ clients)%2"
-#~ msgstr ""
-#~ "Mevcutsa ATI GPU kullanılsın %1(sürüm 6.10 ve üzeri istemciler için)%2"
-
-#~ msgid "KB/s"
-#~ msgstr "KB/sn"
-
-#~ msgid "GB disk space"
-#~ msgstr "GB disk alanı kullanılsın"
-
-#~ msgid "GB disk space free"
-#~ msgstr "GB disk alanı boş kalsın"
-
-#~ msgid "(no restriction)"
-#~ msgstr "(sınırlama yok)"
-
-#~ msgid "%1 GB disk space"
-#~ msgstr "%1 GB disk alanı kullanılsın"
-
-#~ msgid "%1 GB disk space free"
-#~ msgstr "%1 GB disk alanı boş kalsın"
-
-#~ msgid ""
-#~ "Resource share %1If you participate in multiple BOINC projects, this is "
-#~ "the proportion of your resources used by %2%3"
-#~ msgstr ""
-#~ "Kaynak paylaşımı %1Birden fazla BOINC projesine katıldıysanız, bu ayar, "
-#~ "%2 projesinin bilgisayarınızın kaynaklarını ne oranda kullanacağını "
-#~ "belirlemenizi sağlar%3"
-
-#~ msgid "Gbytes"
-#~ msgstr "Gigabayt kullanılsın"
-
-#~ msgid "Resource share"
-#~ msgstr "Kaynak paylaşımı"
-
-#~ msgid "stderr out"
-#~ msgstr "stderr çıktısı"
-
-#~ msgid "<p>"
-#~ msgstr "<p>"
-
-#~ msgid "Last %1"
-#~ msgstr "Son %1"
-
-#~ msgid "CHARSET"
-#~ msgstr "UTF-8"
-
-#, fuzzy
-#~ msgid "preferences"
-#~ msgstr "&Tercihler..."
diff --git a/locale/tr/BOINC-Setup.mo b/locale/tr/BOINC-Setup.mo
index ba87bc6..743f3a9 100644
Binary files a/locale/tr/BOINC-Setup.mo and b/locale/tr/BOINC-Setup.mo differ
diff --git a/locale/tr/BOINC-Setup.po b/locale/tr/BOINC-Setup.po
index 6db7a2e..badbb0a 100644
--- a/locale/tr/BOINC-Setup.po
+++ b/locale/tr/BOINC-Setup.po
@@ -1,40 +1,32 @@
 # 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: BOINC 7.4\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-12 02:05-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: tr\n"
+"PO-Revision-Date: 2015-02-09 01:16+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/boinc/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-Basepath: /Volumes/Cheer/BOINC_GIT/boinc_trunk\n"
-"X-POOTLE-MTIME: 1385326295.0\n"
-"X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: mac_installer\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: Installer.cpp:124
 #, c-format
 msgid "Sorry, this version of %s requires system 10.5 or higher."
 msgstr "Özür dileriz, %s'in bu versiyonu 10.5 veya daha yüksek sistem gerektiriyor."
 
-#: PostInstall.cpp:130
-#: PostInstall.cpp:1136
-#: uninstall.cpp:1618
+#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
 msgid "Yes"
 msgstr "Evet"
 
-#: PostInstall.cpp:131
-#: PostInstall.cpp:1137
-#: uninstall.cpp:1619
+#: PostInstall.cpp:131 PostInstall.cpp:1137 uninstall.cpp:1619
 msgid "No"
 msgstr "Hayır"
 
@@ -48,26 +40,26 @@ 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 ""
+msgstr "Bu bilgisayarı yönetmesine izin verilen kullanıcılar, otomatik olarak %s'i de çalıştırıp kontrol etme yetkisine sahip olur. \n\nBu Mac'de yönetici olmayan kullanıcıların da %s 'i çalıştırıp kontrol edebilmesine izin verilsin mi?"
 
 #: PostInstall.cpp:1444
 #, c-format
 msgid "Do you want to set %s as the screensaver for all %s users on this Mac?"
-msgstr ""
+msgstr "%s'i bu Mac üzerindeki tüm %s kullanıcıları için ekran koruyucu olarak ayarlamak istiyor musunuz?"
 
 #: uninstall.cpp:82
 msgid "OK"
-msgstr ""
+msgstr "Tamam"
 
 #: uninstall.cpp:136
 msgid "Permission error after relaunch"
-msgstr ""
+msgstr "Yeniden çalıştırma sonrası izin hatası"
 
 #: uninstall.cpp:141
 msgid ""
 "Removal may take several minutes.\n"
 "Please be patient."
-msgstr ""
+msgstr "Kaldırma işlemi birkaç dakika sürebilir.\nLütfen sabırlı olun."
 
 #: uninstall.cpp:156
 #, c-format
@@ -75,27 +67,27 @@ 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 ""
+msgstr "%s'i bilgisayarınızdan tamamen kaldırmak istiyor musunuz?\n\nBu işlem çalıştırılabilir dosyaları kaldırır, fakat %s veri dosyalarına dokunmaz."
 
 #: uninstall.cpp:163
 #, c-format
 msgid "Canceled: %s has not been touched."
-msgstr "Durduruldu: %s etkilenmedi."
+msgstr "İptal edildi: %s'e dokunulmadı."
 
 #: uninstall.cpp:174
 #, c-format
 msgid "An error occurred: error code %d"
-msgstr ""
+msgstr "Bir hata oluştu: Hata kodu %d"
 
 #: uninstall.cpp:230
 msgid "name  of user"
-msgstr ""
+msgstr "kullanıcı ismi "
 
 #: uninstall.cpp:272
 msgid ""
 "Do you also want to remove VirtualBox from your computer?\n"
 "(VirtualBox was installed along with BOINC.)"
-msgstr ""
+msgstr "Ayrıca VirtualBox'ı da bilgisayarınızdan kaldırmak istiyor musunuz?\n(VirtualBox, BOINC'le birlikte kurulmuştu.)"
 
 #: uninstall.cpp:312
 #, c-format
@@ -107,20 +99,19 @@ msgid ""
 "\n"
 "for each user, the file\n"
 "\"%s\"."
-msgstr ""
+msgstr "Kaldırma tamamlandı.\n\nAşağıdaki kalan öğeleri Finder kullanarak kaldırmak isteyebilirsiniz: \n\"%s\" klasörü\n\nher kullanıcı için, şu dosya\n\"%s\"."
 
 #: uninstall.cpp:840
 #, c-format
 msgid ""
 "Enter your administrator password to completely remove %s from you computer.\n"
 "\n"
-msgstr ""
+msgstr "%s'i bilgisayarınızdan tamamen kaldırmak için yönetici parolanızı girin.\n\n"
 
 #: uninstall.cpp:1616
 msgid "Cancel"
-msgstr ""
+msgstr "İptal"
 
 #: uninstall.cpp:1617
 msgid "Continue..."
-msgstr ""
-
+msgstr "Devam et..."
diff --git a/locale/tr/BOINC-Web.mo b/locale/tr/BOINC-Web.mo
index c516e6c..5215dd0 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 0126157..9d4f172 100644
--- a/locale/tr/BOINC-Web.po
+++ b/locale/tr/BOINC-Web.po
@@ -1,22 +1,26 @@
 # BOINC web translation
 # Copyright (C) 2008-2009 University of California
+# 
 # This file is distributed under the same license as BOINC.
+# 
 # FileID  : $Id$
+# 
+# Translators:
+# Faruk SARI <faruksari at hotmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC Web Site\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-12 02:05-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: Donanım Haber <bilgi at donanimhaber.com>\n"
-"Language: tr\n"
+"PO-Revision-Date: 2015-02-10 14:33+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1418679006.0\n"
 
 #: docutil.php:21
 msgid "Search"
@@ -32,7 +36,9 @@ msgid "This page is %stranslatable%s."
 msgstr "Bu safya %sçevrilebilir%s."
 
 #: download.php:39
-msgid "We recommend that you also install VirtualBox, so your computer can work on science projects that require it."
+msgid ""
+"We recommend that you also install VirtualBox, so your computer can work on "
+"science projects that require it."
 msgstr "Ayrıca VirtualBox'ı da kurmanızı öneririz, böylece bilgisayarınız onu gerektiren bilimsel projeleri de çalıştırabilir."
 
 #: download.php:41
@@ -43,14 +49,12 @@ msgstr "VirtualBox hakkında daha fazla bilgi edinin."
 msgid "Download BOINC + VirtualBox"
 msgstr "BOINC + VirtualBox'ı indir"
 
-#: download.php:54
-#: download.php:69
+#: download.php:54 download.php:69
 #, php-format
 msgid "for %s"
 msgstr "%s için"
 
-#: download.php:57
-#: download.php:72
+#: download.php:57 download.php:72
 #, php-format
 msgid "BOINC version %s"
 msgstr "BOINC sürümü %s"
@@ -65,19 +69,28 @@ msgid "Download BOINC"
 msgstr "BOINC'i indir"
 
 #: download.php:123
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others."
+msgid ""
+"BOINC is a program that lets you donate your idle computer time to science "
+"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, and many others."
 msgstr "BOINC, bilgisayarınız boş zamanını SETI at home, Climateprediction.net, Rosetta at home, World Community Grid ve daha pek çoğu gibi bilimsel projelere bağışlamanızı sağlayan bir yazılımdır."
 
 #: download.php:125
-msgid "After installing BOINC on your computer, you can connect it to as many of these projects as you like."
+msgid ""
+"After installing BOINC on your computer, you can connect it to as many of "
+"these projects as you like."
 msgstr "BOINC'i bilgisayarınıza kurduktan sonra, onu bunlar gibi istediğiniz pek çok projeye bağlayabilirsiniz."
 
 #: download.php:127
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
+msgid ""
+"You may run this software on a computer only if you own the computer or have"
+" the permission of its owner."
 msgstr "Bu yazılımı, yalnızca kendi bilgisayarınızda ya da sahibinin izin verdiği bilgisayarlarda çalıştırabilirsiniz."
 
 #: download.php:132
-msgid "We recommend that you download BOINC from the Google Play Store or Amazon Appstore, not from here."
+msgid ""
+"We recommend that you download BOINC from the Google Play Store or Amazon "
+"Appstore, not from here."
 msgstr "BOINC'i, Google Play Store ya da Amazon Appstore'dan indirmenizi öneririz, buradan değil."
 
 #: download.php:167
@@ -88,8 +101,7 @@ msgstr "Sistem gereksinimleri"
 msgid "Release notes"
 msgstr "Sürüm notları"
 
-#: download.php:169
-#: index.php:86
+#: download.php:169 index.php:86
 msgid "Help"
 msgstr "Yardım"
 
@@ -111,20 +123,34 @@ msgstr "BOINC: bilim için hesapla"
 
 #: help.php:12
 #, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
+msgid ""
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who"
+" can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"through the process of installing and using BOINC; %s troubleshoot any "
+"problems you might have."
 msgstr "BOINC Online Yardım, uzman BOINC kullanıcılarıyla bire bir konuşmanızı sağlar. Bu kişiler, %s BOINC ve gönüllü hesaplama hakkındaki sorular; %s kurulum sırasındaki işlemler ile adımlar; %s karşılaştığınız sorunların çözümleri konularında yardımcı olabilirler."
 
 #: help.php:21
 #, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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."
+msgid ""
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system."
+" 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."
 
 #: help.php:28
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
+msgid ""
+"The best way to get help is by voice, for which you need either built-in "
+"microphone and speakers or an external headset for your computer.  You can "
+"also use Skype's text-based chat system or regular email (if you don't have "
+"Skype) to communicate with Help Volunteers."
 msgstr "Sesle yardım almak için en iyi yol, bigilsayarınızın dahili mikrofon ve hoparlörünü ya da harici bir kulaklık setini kullanmaktır. Ayrıca gönüllülerle iletişim kurmak için Skype'ın yazı-tabanlı sohbet sistemini ya da normal e-postayı (eğer Skype'a sahip değilseniz) da kullanabilirsiniz."
 
 #: help.php:31
-msgid "Volunteers speaking several languages are available. Please select a language:"
+msgid ""
+"Volunteers speaking several languages are available. Please select a "
+"language:"
 msgstr "Çeşitli dillerde konuşan gönüllüler mevcuttur. Lütfen bir dil seçin:"
 
 #: help.php:47
@@ -133,16 +159,22 @@ msgstr "Bir Yardım Gönüllüsü olun"
 
 #: help.php:50
 #, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
+msgid ""
+"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+"Volunteer%s.  It's a great way to help the cause of scientific research and "
+"volunteer computing - and it's fun!"
 msgstr "Eğer uzman bir BOINC kullanıcısıysanız, sizi bir %sYardım Gönüllüsü%s olmak için cesaretlendirebiliriz. Bu, bilimsel araştırmaları ve gönüllü hesaplamacılığı desteklemenin harika bir yoludur - üstelik eğlencelidir!"
 
 #: help.php:56
 #, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
+msgid ""
+"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
 msgstr "Zaten bir Yardım Günüllüsüyseniz: Ayarlarınızı düzenlemek için, %sburaya tıklayın%s."
 
 #: help_funcs.php:107
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
+msgid ""
+"BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
+"or the University of California."
 msgstr "BOINC yardımcıları ücretsiz çalışan gönüllülerdir.  Yaptıkları tavsiyeler, BOINC ya da California Üniversitesi'ni bağlamaz."
 
 #: help_funcs.php:110
@@ -193,9 +225,7 @@ msgstr "Gönüllü Olun"
 msgid "Download"
 msgstr "İndir"
 
-#: index.php:87
-#: index.php:120
-#: index.php:171
+#: index.php:87 index.php:120 index.php:171
 msgid "Documentation"
 msgstr "Belgeler"
 
@@ -208,7 +238,10 @@ msgid "Links"
 msgstr "Bağlantılar"
 
 #: index.php:94
-msgid "Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:"
+msgid ""
+"Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure"
+" diseases, study global warming, discover pulsars, and do many other types "
+"of scientific research.  It's safe, secure, and easy:"
 msgstr "Bilgisayarınızın boş zamanını (Windows, Mac, Linux ya da Android) hastalıkların tedavisini ya da küresel ısınmayı araştırmak, elektromanyetik yıldızları keşfetmek ve diğer birçok türde bilimsel araştırma için kullanın.  Bu güvenli ve basittir:"
 
 #: index.php:96
@@ -225,7 +258,9 @@ msgstr "Bir e-posta adresi ve parola girin."
 
 #: index.php:102
 #, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
+msgid ""
+"Or, if you run several projects, try an %saccount manager%s such as "
+"%sGridRepublic%s or %sBAM!%s. "
 msgstr "Ya da çeşitli projeler çalıştırıyorsanız, bir %shesap yöneticisi%s deneyin. Örneğin %sGridRepublic%s ya da %sBAM!%s gibi. "
 
 #: index.php:118
@@ -237,16 +272,20 @@ msgid "Software updates"
 msgstr "Yazılım güncellemeleri"
 
 #: index.php:128
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving"
+" you the computing power of thousands of CPUs."
 msgstr "%1Bilim insanları%2: BOINC'i bağışlanan binlerce CPU'nun gücünden yararlanmak için bir %3gönüllü hesaplama projesi%4 yaratmak için kullanın."
 
 #: index.php:132
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
 msgstr "%1Üniversiteler%2: BOINC'i bir %3Sanal Yerleşke Süperbilgisayar Merkezi%4 yaratmak için kullanın."
 
 #: index.php:137
 msgid "%1Companies%2: use BOINC for %3desktop Grid computing%4."
-msgstr "%1Şirketler%2: BOINC'i %3masaüstü Grid hesaplama%4 için kullanın."
+msgstr "%1Şirketler%2: BOINC'i %3masaüstü dağıtık hesaplama%4 için kullanın."
 
 #: index.php:149
 msgid "The BOINC project"
@@ -314,8 +353,9 @@ msgstr "API'ler ve eklenti yazılımları"
 
 #: index.php:217
 #, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
-msgstr "Açık kaynaklı %sgönüllü hesaplama%s ve %sdağınık (grid) hesaplama%s yazılımı."
+msgid ""
+"Open-source software for %svolunteer computing%s and %sgrid computing%s."
+msgstr "Açık kaynaklı %sgönüllü hesaplama%s ve %sdağıtık (grid) hesaplama%s yazılımı."
 
 #: index.php:230
 msgid "BOINC is based at The University of California, Berkeley"
@@ -323,7 +363,7 @@ msgstr "BOINC, Kalifornia Üniversitesi, Berkeley merkezlidir."
 
 #: projects.inc:14
 msgid "Distributed sensing"
-msgstr "Dağınık algılama"
+msgstr "Dağıtılmış algılama"
 
 #: projects.inc:19
 msgid "Stanford University"
@@ -334,7 +374,10 @@ msgid "Seismology"
 msgstr "Deprem bilimi"
 
 #: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
+msgid ""
+"The Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to Internet-connected computers.  You must buy a "
+"sensor to participate."
 msgstr "Quake-Catcher Network, internet bağlantısı olan bilgisayarlara takılı sensörleri kullanarak dünyanın en büyük sismik ağını geliştirmektedir. Katılmak için bir sensör satın almalısınız."
 
 #: projects.inc:27
@@ -346,23 +389,24 @@ msgid "Environmental research"
 msgstr "Çevresel araştırma"
 
 #: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
-msgstr "Bu proje, gönüllülerin bilgisayarlarına bağlı sensörleri kullanarak radyasyon seviyelerinin ücretsiz ve sürekli olarak güncellenen haritasını oluşturmaktadır. Katılmak için bir sensör satın almalısınız."
+msgid ""
+"This project is creating a free and continuously updated map of radiation "
+"levels by using sensors connected to volunteers' computers.  You must buy a "
+"sensor to participate."
+msgstr "Bu proje, gönüllülerin bilgisayarlarına bağlı sensörleri kullanarak, radyasyon seviyelerinin ücretsiz ve sürekli olarak güncellenen haritasını oluşturmaktadır. Katılmak için bir sensör satın almalısınız."
 
 #: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
+msgid ""
+"To participate in these projects you must buy a sensor and attach it to your"
+" computer."
 msgstr "Bu projelere katılmak için bir sensör satın alıp bilgisayarınıza takmanız gerekir."
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
 msgstr "Bilişsel bilim ve yapay zeka"
 
-#: projects.inc:60
-#: projects.inc:364
-#: projects.inc:408
-#: projects.inc:457
-#: projects.inc:464
-#: projects.inc:511
+#: projects.inc:60 projects.inc:364 projects.inc:408 projects.inc:457
+#: projects.inc:464 projects.inc:511
 msgid "Private"
 msgstr "Özel"
 
@@ -371,8 +415,12 @@ msgid "Artificial intelligence"
 msgstr "Yapay zeka"
 
 #: projects.inc:62
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
-msgstr "Konuşmalardaki insan davranışını taklit etmek için anlamsal ağları FreeHAL'de (FreeHAL yapay bir zekadır ve anlamsal ağları, sözcük köklerini, sözcük veritabanlarının parçalarını ve sözcük etiketlerinin parçalarını kullanır) çözümle ve dönüştür.  "
+msgid ""
+"Parse and convert semantic nets for use in FreeHAL, an artificial "
+"intelligence that uses semantic networks, stemmers, part of speech "
+"databases, and part of speech taggers in order to imitate human behavior in "
+"conversations."
+msgstr "Konuşmalardaki insan davranışını taklit etmek için, anlamsal ağları FreeHAL'de çözümleyin ve dönüştürün. FreeHAL yapay bir zekadır ve anlamsal ağları, sözcük köklerini, sözcük veri tabanlarının parçalarını ve sözcük etiketlerinin parçalarını kullanır."
 
 #: projects.inc:69
 msgid "Biology and Medicine"
@@ -380,15 +428,20 @@ msgstr "Biyoloji ve Tıp"
 
 #: projects.inc:82
 msgid "University College Dublin"
-msgstr "University College Dublin"
+msgstr "University College Dublin (İrlanda)"
 
 #: projects.inc:83
 msgid "Antimalarial drug discovery"
 msgstr "Sıtma ilacı keşfi"
 
 #: projects.inc:84
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
-msgstr "Sıtmaya neden olan parazit, mevcut ilaçlara direnç geliştirmeye devam ediyor. Bu sebeple mevcut ilaçların yerine yeni ilaçlar keşfetmek gerekmekte. En önemlisi, bu yeni ilaçların parazitteki YENİ proteinleri hedeflemesi gerekli. FightMalaria at Home projesi, bu yeni hedefleri bulmaya yöneliktir."
+msgid ""
+"The parasite that causes malaria continues to evolve resistance to available"
+" medication. We therefore urgently need to discover new drugs to replace "
+"existing drugs. Importantly, these new drugs need to target NEW proteins in "
+"the parasite. The FightMalaria at Home project is aimed at finding these new "
+"targets."
+msgstr "Sıtmaya neden olan parazit, mevcut ilaçlara direnç geliştirmeye devam ediyor. Bu sebeple acilen mevcut ilaçların yerine yeni ilaçlar keşfetmek gerekmekte. En önemlisi, bu yeni ilaçların parazitteki YENİ proteinleri hedeflemesi gerekli. FightMalaria at Home projesi, bu yeni hedefleri bulmayı amaçlıyor."
 
 #: projects.inc:90
 msgid "University of Karlsruhe (Germany)"
@@ -399,8 +452,13 @@ msgid "Protein structure prediction"
 msgstr "Protein yapısı tahmini"
 
 #: projects.inc:92
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
-msgstr "POEM at HOME  Proteinlerin biyoaktif yapısını belirleyebilmek,  proteinler birbirleriyle etkileştiğinde oluşan sinyalleşme mekanizmasını ve proteinlerde işlev bozukluğu olmasıyla bağlantılı hastalıkları  anlayabilmek ve önemli proteinlerin 3 boyutlu yapısının oluşturulmasıyla yeni ilaçların geliştirilebilmesi için işlemsel bir yöntem kullanır."
+msgid ""
+"POEM at HOME uses a computational approach to predict the biologically active "
+"structure of proteins, to understand the signal-processing mechanisms when "
+"the proteins interact with one another, to understand diseases related to "
+"protein malfunction or aggregation, and to develop new drugs on the basis of"
+" the three-dimensions structure of biologically important proteins."
+msgstr "POEM at HOME, biyolojik olarak aktif protein yapılarını tahmin etmek, proteinler birbirleriyle etkileşirken oluşan sinyalleşme mekanizmasını anlamak, protein bozuklukları ve birikmesine ilişkin hastalıkları anlamak, biyolojik olarak önemli proteinlerin 3 boyutlu yapılarını temel alarak yeni ilaçlar geliştirmek için bilgisayarlı bir yöntem kullanır."
 
 #: projects.inc:98
 msgid "University of Delaware"
@@ -411,8 +469,12 @@ msgid "Study of protein - ligand interactions"
 msgstr "Protein - ligand etkileşimleri araştırması"
 
 #: projects.inc:100
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
-msgstr "Docking at Home projesinin hem biyoloji hemde bilgisayar bilimiyle ilgili hedefleri var. Proje protein-bağlaşma etkileşimlerinin atomik detaylarını hakkında daha fazla bilgi edinmeyi amaçlıyor ve bunu yaparak yeni farmakolojik buluşlara öncül bilgileri edinmeyi hedefliyor."
+msgid ""
+"Docking at Home has both bioscience and computer science goals. The project "
+"aims to further knowledge of the atomic details of protein-ligand "
+"interactions and, by doing so, will search for insights into the discovery "
+"of novel pharmaceuticals."
+msgstr "Docking at Home projesinin hem biyoloji hem de bilgisayar bilimiyle ilgili hedefleri var. Proje protein-ligand (bağ) etkileşimlerinin atomik detayları hakkında daha fazla bilgi edinmeyi amaçlıyor ve bunu yaparak yeni ilaç keşifleri için öncül bilgiler edinmeyi hedefliyor."
 
 #: projects.inc:114
 msgid "Barcelona Biomedical Research Park (PRBB)"
@@ -423,8 +485,12 @@ msgid "Molecular simulations of proteins"
 msgstr "Proteinlerin moleküler simülasyonları"
 
 #: projects.inc:116
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
-msgstr "GPUGrid.net özellikle NVIDIA grafik işlem ünitelerinde (GPU) koşması için optimize edilmiş ilk tam-atom molekül dinamiği kodu (CellMD) sayesinde yeni hesaplamalı senaryolar açar."
+msgid ""
+"GPUGrid.net opens novel computational scenarios by the first full-atom "
+"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
+"New biomedical applications suddenly become possible giving a new role to "
+"computational biology for biomedical research."
+msgstr "GPUGrid.net, özellikle NVIDIA grafik işlem ünitelerinde (GPU) çalışması için optimize edilmiş ilk 'tam-atom molekül dinamikleri kodu' (CellMD) sayesinde, yeni bilgisayarlı senaryolara imkan sağlıyor. Yeni biyomedikal uygulamalar, biyomedikal araştırmalar için bilgisayarlı biyolojiye hızlıca yeni bir rol veriyor."
 
 #: projects.inc:122
 msgid "Technion, Israel"
@@ -435,20 +501,28 @@ msgid "Genetic linkage analysis"
 msgstr "Genetik bağlantı analizi"
 
 #: projects.inc:124
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
-msgstr "Superlink at Technion dünyaki tüm genetik bilimcilere genlerin diyabet, hiper-tansiyon, kanser, şizofreni ve diğer bir sürü hastalığa çare bulmalarına yardım eder."
+msgid ""
+"Superlink at Technion helps geneticists all over the world find disease-"
+"provoking genes causing some types of diabetes, hypertension (high blood "
+"pressure), cancer, schizophrenia and many others."
+msgstr "Superlink at Technion, dünyanın dört bir yanındaki genetik bilimcilere, bazı diyabet türleri, hipertansiyon (yüksek kan basıncı), kanser, şizofreni ve diğer bir çok hastalığa neden olan genleri bulmaları konusunda yardım eder."
 
 #: projects.inc:138
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
-msgstr "Maryland Üniversitesi Biyoenformatik ve Hesaplamalı Biyoloji Merkezi"
+msgid ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
+msgstr "Maryland Üniversitesi Biyoenformatik ve Bilgisayarlı Biyoloji Merkezi"
 
 #: projects.inc:139
 msgid "Life science research"
 msgstr "Canlı bilimleri araştırması"
 
 #: projects.inc:140
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
-msgstr "Lattice Projesi, DNA dizileri verisi; bakteri, plazmit ve virüs protein dizileri; ve doğanın barındırdığı biyolojik farklılıklara dayalı evrimsel bağlantılar üzerinde çalışan Maryland Üniversitesi'ndeki bilim adamlarına hesaplama gücü sağlar. "
+msgid ""
+"The Lattice Project supplies computing power to scientists at the University"
+" of Maryland studying evolutionary relationships based on DNA sequence data;"
+" bacterial, plasmid, and virus protein sequences; and biological diversity "
+"in nature reserves. "
+msgstr "Lattice Projesi, DNA dizileri verisi, bakteri, plazmit ve virüs proteini dizileri ile doğanın barındırdığı biyolojik farklılıklara dayalı evrimsel bağlantılar üzerinde çalışan Maryland Üniversitesi'ndeki bilim insanlarına hesaplama gücü sağlar."
 
 #: projects.inc:146
 msgid "The Swiss Tropical Institute"
@@ -459,29 +533,44 @@ msgid "Epidemiology"
 msgstr "Epidemiyoloji (Salgın hastalıklar bilimi)"
 
 #: projects.inc:148
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
-msgstr "Aktarım dinamiklerinin simülasyon modelleri ve sıtmanın sağlık üzerine etkileri, sıtma kontrolü için önemli bir araçtır. Bunlar, geliştirme ve test aşamasında olan, sineklik, kemoterapi ya da yeni aşıları sunmak için en uygun stratejilerin belirlenmesi için kullanılabilir. Bu modelleme son derece bilgisayar yoğundur, hastalığın dağılımını etkileyen biyolojik ve sosyal faktörlerle ile ilgili bir dizi parametreyi ve büyük insan popülasyonunun simülasyonları gerektirir."
+msgid ""
+"Simulation models of the transmission dynamics and health effects of malaria"
+" are an important tool for malaria control. They can be used to determine "
+"optimal strategies for delivering mosquito nets, chemotherapy, or new "
+"vaccines which are currently under development and testing.  Such modeling "
+"is extremely computer intensive, requiring simulations of large human "
+"populations with a diverse set of parameters related to biological and "
+"social factors that influence the distribution of the disease. "
+msgstr "Sıtmanın yayılma dinamiği ve sağlık etkileriyle ilgili simülasyon modelleri, sıtma kontrolü için önemli birer araçtır. Modellerden, sivrisinek ağlarının, kemoterapinin ya da geliştirme ve test aşamasında olan yeni aşıların dağıtımında kullanılacak en uygun stratejileri belirleme konusunda yararlanılabilir. Bu modelleme son derece bilgisayar yoğundur, hastalığın dağılımını etkileyen biyolojik ve sosyal faktörlerle ilgili bir dizi parametrenin ve büyük insan popülasyonlarının simül [...]
 
 #: projects.inc:170
 msgid "University of Washington"
 msgstr "Washington Üniversitesi"
 
-#: projects.inc:171
-#: projects.inc:179
+#: projects.inc:171 projects.inc:179
 msgid "Biology"
 msgstr "Biyoloji"
 
 #: projects.inc:172
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
-msgstr "Bazı önemli insan hastalıkları için tedavi bulmayı sağlayabilecek araştırmalar için, proteinlerin 3 boyutlu şekillerini tespit edin. Rosetta at home çalıştırarak, yardımınız olmadan hızlandıramayacağımız ve genişletemeyeceğimiz araştırmalarımız konusunda bize katkıda bulunacaksınız. Ayrıca, HIV (AIDS), sıtma, kanser ve Alzheimer gibi hastalıklarla mücadele için yeni proteinler tasarlama çabalarımıza yardımcı olacaksınız."
+msgid ""
+"Determine the 3-dimensional shapes of proteins in research that may "
+"ultimately lead to finding cures for some major human diseases. By running "
+"Rosetta at home you will help us speed up and extend our research in ways we "
+"couldn't possibly attempt without your help. You will also be helping our "
+"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
+"Cancer, and Alzheimer's"
+msgstr "Bazı önemli hastalıklara tedavi bulmayı sağlayabilecek araştırmalar için, proteinlerin 3 boyutlu şekillerini saptayın. Rosetta at home çalıştırarak, yardımınız olmadan hızlandıramayacağımız ve genişletemeyeceğimiz araştırmalarımız konusunda bize katkıda bulunacaksınız. Ayrıca, HIV (AIDS), sıtma, kanser ve Alzheimer gibi hastalıklarla mücadele için yeni proteinler tasarlama çabalarımıza yardımcı olacaksınız."
 
 #: projects.inc:178
 msgid "University of Vienna"
 msgstr "Viyana Üniversitesi"
 
 #: projects.inc:180
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
-msgstr "Proteinler arasındaki benzerlikleri hesaplayın. SIMAP, sonuçta elde edilen verilerle, bir çok biyoenformatik araştırma projesinde anahtar rol oynayan bir kamu veritabanı sağlar."
+msgid ""
+"Calculate similarities between proteins. SIMAP provides a public database of"
+" the resulting data, which plays a key role in many bioinformatics research "
+"projects."
+msgstr "Proteinler arasındaki benzerlikleri hesaplayın. SIMAP, sonuçta elde edilen verilerle, bir çok biyoenformatik araştırma projesinde anahtar rol oynayan bir halka açık veritabanı sağlar."
 
 #: projects.inc:186
 msgid "Earth Sciences"
@@ -496,42 +585,65 @@ msgid "Climate study"
 msgstr "İklim araştırması"
 
 #: projects.inc:200
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
+msgid ""
+"Investigate the approximations that have to be made in state-of-the-art "
+"climate models. By running the model thousands of times we hope to find out "
+"how the model responds to slight tweaks to these approximations - slight "
+"enough to not make the approximations any less realistic. This will allow us"
+" to improve our understanding of how sensitive our models are to small "
+"changes and also to things like changes in carbon dioxide and the sulphur "
+"cycle. This will allow us to explore how climate may change in the next "
+"century under a wide range of different scenarios."
 msgstr "Son teknoloji ürünü iklim modellerinde yapılması gereken tahminleri araştırın. Modeli binlerce kez çalıştırarak, modelin küçük ayarlamalara nasıl yanıt verdiğini bulmayı umuyoruz ve tahminleri gerçeğe daha uygun hale getirmeyi bekliyoruz. Bu bize, modellerimizin küçük değişikliklere karşı ne kadar hassas olduğunu anlamamızı ve aynı zamanda karbondioksit değişiklikleri ve kükürt döngüsü gibi şeyler için anlayışımızı geliştirmemizi sağlayacak. Ayrıca, önümüzdeki yüzyılda iklimin ge [...]
 
 #: projects.inc:207
 msgid "Physical Science"
-msgstr "Fiziksel Bilimi"
+msgstr "Fizik Bilimi"
 
 #: projects.inc:213
 msgid "Mechanical engineering"
 msgstr "Makine mühendisliği"
 
 #: projects.inc:214
-msgid "Currently we are calculating the optimum design of a structure call the 52 bar truss"
+msgid ""
+"Currently we are calculating the optimum design of a structure call the 52 "
+"bar truss"
 msgstr "Şu anda, 52 bar kafese (kirişe) sahip bir yapının optimum tasarımını araştırıyoruz."
 
-#: projects.inc:224
-#: projects.inc:263
-#: projects.inc:271
+#: projects.inc:224 projects.inc:263 projects.inc:271
 msgid "Astronomy"
 msgstr "Astronomi"
 
 #: projects.inc:225
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
+msgid ""
+"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
+"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
+"Universe. We will measure physical parameters (such as stellar mass surface "
+"density, star formation rate surface density, attenuation, and first-order "
+"star formation history) on a resolved pixel-by-pixel basis using spectral "
+"energy distribution (SED) fitting techniques in a distributed computing "
+"mode."
 msgstr "GALEX, Pan-STARRS1 ve WISE'ın tayfsal kapsama alanını, yakın evren için bir 'çok dalga boylu UV-optik-NIR galaksi atlası' oluşturmak amacıyla birleştireceğiz. Bir dağıtık bilgisayar moduyla, piksel-piksele esasına göre tayfsal enerji dağılımı teknikleri kullanılarak çözülmüş fiziksel parametreleri ölçeceğiz (örneğin yıldız kütlesi yüzey yoğunluğu, yıldız oluşumu oranı yüzey yoğunluğu, zayıflama ve birinci dereceden yıldız oluşumu öyküsü gibi)."
 
 #: projects.inc:247
 msgid "University of Texas at Austin"
 msgstr "Austin'deki Texas Üniversitesi"
 
-#: projects.inc:248
-#: projects.inc:279
+#: projects.inc:248 projects.inc:279
 msgid "Chemistry"
 msgstr "Kimya"
 
 #: projects.inc:249
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
+msgid ""
+"A common problem in theoretical chemistry, condensed matter physics and "
+"materials science is the calculation of the time evolution of an atomic "
+"scale system where, for example, chemical reactions and/or diffusion occur. "
+"Generally the events of interest are quite rare (many orders of magnitude "
+"slower than the vibrational movements of the atoms), and therefore direct "
+"simulations, tracking every movement of the atoms, would take thousands of "
+"years of computer calculations on the fastest present day computer before a "
+"single event of interest can be expected to occur.  Our research group is "
+"interested in calculating the long time dynamics of systems."
 msgstr "Teorik kimyanın, yoğun madde fiziğinin ve malzeme biliminin yaygın bir sorunu, atom ölçekli bir sistemin zaman evrimini hesaplamaktır. Örneğin, kimyasal reaksiyonlar ve/veya difüzyonun meydana gelişi gibi. Genellikle ilgili olaylar oldukça nadirdir (birçoğunun büyüklüğü, atomların titreşim hareketlerinden daha yavaştır). Bu nedenle, meydana gelecek tek bir olayı incelemek, doğrudan simülasyonlar ve atomların her hareketini izlemek, bugünün en hızlı bilgisayarlarıyla bile yüzlerce [...]
 
 #: projects.inc:262
@@ -539,7 +651,10 @@ msgid "University of Illinois at Urbana-Champaign"
 msgstr "Urbana-Chamapign'deki Illinois Üniversitesi"
 
 #: projects.inc:264
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
+msgid ""
+"The goal of Cosmology at Home is to search for the model that best describes "
+"our Universe and to find the range of models that agree with the available "
+"astronomical particle physics data."
 msgstr "Cosmology at Home'un temel hedefi, evrenimizi en iyi betimleyen modeli araştırmak ve eldeki astronomik parçacık fiziği verileriyle uyumlu model aralıklarını bulmak."
 
 #: projects.inc:270
@@ -547,7 +662,10 @@ msgid "Rensselaer Polytechnic Institute"
 msgstr "Rensselaer Politeknik Enstitüsü"
 
 #: projects.inc:272
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
+msgid ""
+"The goal of Milkyway at Home is to create a highly accurate three dimensional "
+"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
+"Survey."
 msgstr "Milkyway at Home projesinin amacı, Sloan Sayısal Gökyüzü Araştırması tarafından toplanan verileri kullanarak Samanyolu Galaksisi'nin son derece doğru, üç boyutlu modelini oluşturmaktır."
 
 #: projects.inc:278
@@ -555,7 +673,13 @@ msgid "Leiden University, The Netherlands"
 msgstr "Leiden Üniversitesi, Hollanda"
 
 #: projects.inc:280
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
+msgid ""
+"Surface science calculations using Classical Dynamics.  Leiden Classical "
+"allows volunteers, students and other scientist to submit their personal "
+"calculations to the grid. Each user has his own personal queue for Classical"
+" Dynamics jobs. In this way students have used the grid to simulate liquid "
+"argon, or to test the validity of the ideal gas law by actually doing the "
+"simulations through the grid."
 msgstr "Yüzey bilimi, Klasik Dinamikleri kullanılarak hesaplamalar yapar. Leiden Classic, şebekeye kendi kişisel hesaplamalarını göndermeleri için gönüllüler, öğrenciler ve diğer bilim adamlarına izin verir. Her kullanıcının Klasik Dinamik işleri için kendi kişisel sırası vardır. Bu yolla öğrenciler sıvı argonu simüle etmek için veya şebeke vasıtasıyla simülasyonlar yaparak, ideal gaz yasasının geçerliliğini test etmek için dağıtık hesaplamayı kullanır."
 
 #: projects.inc:294
@@ -567,25 +691,36 @@ msgid "Astrophysics"
 msgstr "Astrofizik"
 
 #: projects.inc:296
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
+msgid ""
+"Search for spinning neutron stars (also called pulsars) using data from the "
+"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
+"observatory.  Einstein at Home is a World Year of Physics 2005 project "
+"supported by the American Physical Society (APS) and by a number of "
+"international organizations."
 msgstr "Çok hızlı dönen nötron yıldızlarını (pulsar olarak da adlandırılır) aramakta kullanılan veriler, LIGO ve GEO kütleçekim dalga detektörleri ile, Arecibo Radyo Gözlemevi'nden gelmektedir. Einstein at Home, bir 2005 Dünya Fizik Yılı projesidir ve Amerikan Fizik Derneği (American Physical Society-APS) ile bir dizi uluslararası kuruluş tarafından desteklenmektedir."
 
-#: projects.inc:310
-#: projects.inc:318
+#: projects.inc:310 projects.inc:318
 msgid "CERN (European Organization for Nuclear Research)"
 msgstr "CERN (Avrupa Nükleer Araştırma Merkezi)"
 
-#: projects.inc:311
-#: projects.inc:319
+#: projects.inc:311 projects.inc:319
 msgid "Physics"
 msgstr "Fizik"
 
 #: projects.inc:312
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
-msgstr "Büyük Hadron Çarpıştırıcısı (LHC), Avrupa Nükleer Araştırma Merkezi CERN'deki dünyanın en büyük  parçacık hızlandırıcısıdır. Bu, şimdiye kadar parçacık davranışlarını araştırmak için yapılmış en güçlü araçtır. LHC at home,  LHC'nin tasarımını ve detektörlerini geliştirmek amacıyla simülasyonlar yürütür."
+msgid ""
+"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
+"European Organization for Nuclear Research, the world's largest particle "
+"physics laboratory.  It is the most powerful instrument ever built to "
+"investigate on particles proprieties. LHC at home runs simulations to improve "
+"the design of LHC and its detectors."
+msgstr "Büyük Hadron Çarpıştırıcısı (LHC), Avrupa Nükleer Araştırma Merkezi CERN'deki dünyanın en büyük  parçacık hızlandırıcısıdır. Bu, şimdiye kadar parçacık davranışlarını araştırmak için yapılmış en güçlü araçtır. LHC at home, LHC'nin tasarımını ve detektörlerini geliştirmek amacıyla simülasyonlar yürütür."
 
 #: projects.inc:320
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
+msgid ""
+"This project uses CERN-developed virtual machine technology for full-fledged"
+" LHC event physics simulation on volunteer computers.  Requires that you "
+"install VirtualBox on your computer"
 msgstr "Bu proje gönüllü bilgisayarlarda, tam teşekküllü Büyük Hadron Çarpıştırıcısı (LHC) olay fizik simülasyonunu gerçekleştirir. Bunun için, Avrupa Nükleer Araştırma Merkezi (CERN) ile geliştirilen sanal makine teknolojisini kullanır.  Bilgisayarınıza VirtualBox yüklemenizi gerektirir."
 
 #: projects.inc:326
@@ -597,7 +732,12 @@ msgid "Astrophysics, astrobiology"
 msgstr "Astrofizik, astrobiyoloji"
 
 #: projects.inc:328
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
+msgid ""
+"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
+"goal is to detect intelligent life outside Earth. One approach, known as "
+"radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
+"signals from space. Such signals are not known to occur naturally, so a "
+"detection would provide evidence of extraterrestrial technology."
 msgstr "SETI (Dünya Dışı Zeka Arayışı), amacı dünyanın dışında akıllı yaşamı algılamak olan bilimsel bir alandır. Yaklaşımlardan birisi, radyo SETI olarak bilinen, uzaydan gelen dar-bant radyo sinyallerini dinlemek için radyo teleskopları kullanmaktır. Böyle sinyallerin doğal olarak oluşmadığı bilinmektedir, bu tür bir sinyalin algılanması, uzayda dünya dışı bir teknolojinin kanıtı olabilir."
 
 #: projects.inc:342
@@ -609,7 +749,11 @@ msgid "Chemical engineering and nanotechnology"
 msgstr "Kimya mühendisliği ve nanoteknoloji"
 
 #: projects.inc:344
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
+msgid ""
+"The study of molecular magnets and controlled nanoscale magnetism.  These "
+"magnetic molecules may be used to develop tiny magnetic switches, with "
+"applications in medicine (such as local tumor chemotherapy) and "
+"biotechnology."
 msgstr "Moleküler mıknatıslar ve kontrollü nano manyetizma çalışması.  Bu manyetik moleküllerle, tıp uygulamaları (örneğin bölgesel tümör kemoterapisi) ve biyoteknolojide kullanılacak küçük manyetik anahtarlar geliştirilebilir."
 
 #: projects.inc:351
@@ -625,7 +769,10 @@ msgid "Physics, biochemistry, and others"
 msgstr "Fizik, biyokimya ve diğerleri"
 
 #: projects.inc:358
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
+msgid ""
+"The objective of CAS at home is to encourage and assist scientists in China to "
+"adopt the technologies of volunteer computing and volunteer thinking for "
+"their research."
 msgstr "CAS at home'un amacı, Çin'deki bilim insanlarını gönüllü bilgisayar teknolojilerini benimsemeleri ve kendi araştırmaları için gönüllülerin yardımını düşünmeleri için teşvik etmek ve yardımcı olmaktır."
 
 #: projects.inc:365
@@ -633,11 +780,12 @@ msgid "Mathematics, physics, evolution"
 msgstr "Matematik, fizik ve evrim"
 
 #: projects.inc:366
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
+msgid ""
+"Yoyo at home is an adapter between BOINC and several existing volunteer "
+"computing projects: ECM, Muon, Evolution at home, and distributed.net"
 msgstr "Yoyo at home, BOINC ve mevcut birkaç gönüllü hesaplama projesi arasında bir köprüdür: ECM, Muon, Evolution at home ve distributed.net"
 
-#: projects.inc:371
-#: projects.inc:527
+#: projects.inc:371 projects.inc:527
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 msgstr "MTA-SZTAKI Paralel ve Dağıtık Sistemler Laboratuvarı (Macaristan)"
 
@@ -646,7 +794,11 @@ msgid "European research projects"
 msgstr "Avrupa araştırma projeleri"
 
 #: projects.inc:373
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
+msgid ""
+"The EDGeS at Home Beta project integrates volunteer computing into the service "
+"grid network of Europe by allowing service grids to send workunits to be "
+"processed by the volunteers of this project. The scientific projects covered"
+" by the project include math, physics, biology, etc."
 msgstr "EDGeS at Home Beta projesi, gönüllü hesaplamacılığı, Avrupa hizmet dağıtık ağına entegre eder. Bunu, Avrupa hizmet dağıtık ağlarının, bu projenin gönüllülerine işlenmeleri için iş birimleri göndermesini sağlayarak gerçekleştirir. EDGeS at Home Beta'nın kapsadığı bilimsel projeler, matematik, fizik, biyoloji ve benzerleri alanlardadır."
 
 #: projects.inc:379
@@ -670,8 +822,12 @@ msgid "Medical, environmental and other humanitarian research"
 msgstr "Tıbbi, çevresel ve diğer insani araştırmalar"
 
 #: projects.inc:389
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
-msgstr "Dünyanın en büyük gönüllü bilgisayar şebekesini oluşturarak, insanlığın en acil sorunlardan bazıları hakkında, kar amacı gütmeyen daha fazla kritik araştırma yapmayı hedefler. Araştırma, HIV-AIDS, kanser, tropikal ve ihmal edilen hastalıklar, güneş enerjisi, temiz su ve daha birçoğunu içerir."
+msgid ""
+"To further critical non-profit research on some of humanity's most pressing "
+"problems by creating the world's largest volunteer computing grid.  Research"
+" includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"clean water and many more."
+msgstr "Dünyanın en büyük gönüllü bilgisayar şebekesini oluşturarak, insanlığın en acil sorunlardan bazıları hakkında, kar amacı gütmeyen daha çok kritik araştırma yapmayı hedefler. Araştırma, HIV-AIDS, kanser, tropikal ve ihmal edilen hastalıklar, güneş enerjisi, temiz su ve daha birçoğunu içerir."
 
 #: projects.inc:395
 msgid "Mathematics, computing, and games"
@@ -689,21 +845,18 @@ msgstr "Matematik, fizik, yapay zeka"
 msgid "Simulation of quantum computing; Goldbach's conjecture."
 msgstr "Kuantum bilgisayar simülasyonu; Goldbach Hipotezi (Varsayımı)."
 
-#: projects.inc:450
-#: projects.inc:458
+#: projects.inc:450 projects.inc:458
 msgid "Cryptography"
 msgstr "Kriptografi"
 
 #: projects.inc:459
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
+msgid ""
+"Attempt to decode 3 original Enigma messages. The signals were intercepted "
+"in the North Atlantic in 1942 and are believed to be unbroken."
 msgstr "Enigma, İkinci Dünya Savaşı sırasında Almanlar tarafından kullanılan şifreleme cihazıdır. Proje, üç orijinal Enigma mesajını çözmek için bir denemedir. Sinyaller 1942 yılında Kuzey Atlantik'te yakalanmıştı ve kırılamamış olduğuna inanılmaktadır."
 
-#: projects.inc:465
-#: projects.inc:504
-#: projects.inc:512
-#: projects.inc:520
-#: projects.inc:528
-#: projects.inc:568
+#: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
+#: projects.inc:528 projects.inc:568
 msgid "Mathematics"
 msgstr "Matematik"
 
@@ -720,11 +873,19 @@ msgid "Factorization of large integers"
 msgstr "Büyük tamsayıların çarpanlarına ayrılması"
 
 #: projects.inc:473
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
+msgid ""
+"NFS at Home is a research project that uses Internet-connected computers to do "
+"the lattice sieving step in the Number Field Sieve factorization of large "
+"integers. As a young school student, you gained your first experience at "
+"breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
+"NFS at Home is a continuation of that experience, only with integers that are "
+"hundreds of digits long."
 msgstr "Sayı Alanı Elemesi (Number Field Sieve-NFS), büyük tamsayıları çarpanlarına ayırmada kullanılan bir yöntemdir. NFS at Home, bu yöntemdeki  dağıtık eleme işlemi adımının, internet bağlantılı bilgisayarlar kullanarak yapıldığı bir araştırma projesidir. Bir genç okul öğrencisiyken, bir tamsayıyı asal çarpanlarına ayırmayı ilk kez deneyimlemiş olmalısınız. Mesela 15 = 3 * 5 ya da 35 = 5 * 7. NFS at Home bu deneyimin bir devamıdır, ancak yüzlerce basamak uzunluğundaki tamsayılar söz konusudur."
 
 #: projects.inc:479
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
+msgid ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
 msgstr "Vilnius Gediminas Teknik Üniversitesi ve Kaunas Teknoloji Üniversitesi (Litvanya)"
 
 #: projects.inc:480
@@ -732,7 +893,11 @@ msgid "Software testing"
 msgstr "Yazılım test etme"
 
 #: projects.inc:481
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
+msgid ""
+"The aim of this project is to provide a powerful distributed computing "
+"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
+"well as others Lithuanian academic institutions.  Current applications "
+"involve the study of Monte-Carlo based software testing."
 msgstr "Bu projenin amacı, Vilnius Gediminas Teknik Üniversitesi (VGTU) bilim insanlarının yanı sıra başka Litvanyalı akademik kurumlar için güçlü bir dağıtık bilgi işlem platformu sağlamaktır. Güncel uygulamalar, Monte-Carlo tabanlı yazılım test çalışmalarını da içermektedir."
 
 #: projects.inc:503
@@ -740,11 +905,20 @@ msgid "Mathematical Institute of Leiden University / Kennislink"
 msgstr "Leiden Üniversitesi Matematik Enstitüsü / Kennislink"
 
 #: projects.inc:505
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
+msgid ""
+"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
+"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
+"product of the distinct prime factors of n. The ABC conjecture says that "
+"there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for "
+"any real h > 1. The ABC conjecture is currently one of the greatest open "
+"problems in mathematics. If it is proven to be true, a lot of other open "
+"problems can be answered directly from it."
 msgstr "'Abc-üçlüsü' arayışı: ABC varsayımı, halen matematikteki büyük süren sorunlardan biridir. Gerçek olduğu kanıtlanırsa, diğer süren bir çok sorun onun sayesinde doğrudan yanıtlanabilir."
 
 #: projects.inc:513
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
+msgid ""
+"Primegrid has multiple projects searching for different forms of very large "
+"prime numbers, including searching for the largest known prime number."
 msgstr "Primegrid, çok büyük asal sayıların farklı formlarını arayan birden fazla projeye sahiptir. Bunlar arasında, bilinen en büyük asal sayıyı bulma projesi de mevcuttur."
 
 #: projects.inc:519
@@ -752,12 +926,16 @@ msgid "Hochschule RheinMain University of Applied Sciences"
 msgstr "Hochschule RheinMain Uygulamalı Bilimler Üniversitesi"
 
 #: projects.inc:521
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
+msgid ""
+"Search for counterexamples to two conjectures related to the identification "
+"of prime numbers"
 msgstr "Asal sayıların tanımlanmasına ilişkin iki varsayım için karşı örnekler arayışı."
 
 #: projects.inc:529
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
-msgstr ""
+msgid ""
+"Find all the generalized binary number systems (in which bases are matrices "
+"and digits are vectors) up to dimension 11."
+msgstr "11 ölçüsüne kadar tüm genelleştirilmiş ikili sayı sistemlerini bul (Hangi bazlar matrisler ve rakam vektörler)."
 
 #: ../html/inc/news.inc:40
 msgid "Comment"
@@ -767,186 +945,3 @@ msgstr "Yorum"
 #, php-format
 msgid "News is available as an %sRSS feed%s"
 msgstr "Haberler bir %sRSS beslemesi%s olarak da sunulmaktadır"
-
-#~ msgid "Astronomy, Physics, and Chemistry"
-#~ msgstr "Astronomi, Fizik ve Kimya"
-#~ msgid "Download BOINC + Virtualbox"
-#~ msgstr "BOINC + Virtualbox'ı indir"
-
-#, php-format
-#~ msgid "%s for %s (%s MB)"
-#~ msgstr "%s sürümü, %s için (%s MB)"
-#~ msgid ""
-#~ "BOINC is a program that lets you donate your idle computer time to science "
-#~ "projects like SETI at home, Climateprediction.net, Rosetta at home, World "
-#~ "Community Grid, and many others. <p> After installing BOINC on your "
-#~ "computer, you can connect it to as many of these projects as you like."
-#~ msgstr ""
-#~ "BOINC, bilgisayarınızın boş zamanını, SETI at home, Climateprediction.net, "
-#~ "Rosetta at home, World Community Grid ve çok daha fazlası gibi bilimsel "
-#~ "projelere bağışlamanızı sağlar. <p> BOINC'i bilgisayarınıza kurduktan sonra, "
-#~ "bunlar gibi istediğiniz pek çok projeye katılabilirsiniz."
-
-#, php-format
-#~ msgid ""
-#~ " Use the idle time on your computer (Windows, Mac, Linux, or Android) to "
-#~ "cure diseases, study global warming, discover pulsars, and do many other "
-#~ "types of scientific research.  It's safe, secure, and easy:  %sChoose%s "
-#~ "projects  %sDownload%s and run BOINC software  %sEnter%s an email address "
-#~ "and password. "
-#~ msgstr ""
-#~ " Bilgisayarınızın boş zamanını (Windows, Mac, Linux ya da Android) "
-#~ "hastalıkların tedavisini ya da küresel ısınmayı araştırmak, elektromanyetik "
-#~ "yıldızları keşfetmek ve diğer birçok türde bilimsel araştırma için kullanın. "
-#~ " Bu güvenli ve basittir:  %sSeçin:%s Projeler arasından istediğinizi seçin "
-#~ " %sİndirin:%s BOINC yazılımını indirin ve çalıştırın  %sYazın:%s Bir "
-#~ "e-posta adresi ve parola yazın. "
-#~ msgid "Browser default"
-#~ msgstr "Tarayıcı varsayılanı"
-
-#, php-format
-#~ msgid ""
-#~ " Use the idle time on your computer (Windows, Mac, or Linux) to cure "
-#~ "diseases, study global warming, discover pulsars, and do many other types of "
-#~ "scientific research.  It's safe, secure, and easy:  %sChoose%s projects  "
-#~ "%sDownload%s and run BOINC software  %sEnter%s an email address and "
-#~ "password. "
-#~ msgstr ""
-#~ " Bilgisayarınızın (Windows, Mac ya da Linux) boş zamanını, hastalıkları "
-#~ "iyileştirmek, küresel ısınmayı araştırmak, elektromanyetik yıldızları "
-#~ "keşfetmek ve çok daha farklı tipte bilimsel araştırmalar için kullanın.  Bu "
-#~ "tehlikesiz, güvenilir ve basittir:  %sSeçin:%s Çeşitli projeler arasından "
-#~ "beğendiğinizi seçin  %sİndirin:%s BOINC yazılımını sitemizden indirin ve "
-#~ "çalıştırın  %sGirin:%s Bir e-posta adresi ve parola girin. "
-#~ msgid "IBM Corporate Community Relations"
-#~ msgstr "IBM Şirketi Toplum İlişkileri"
-#~ msgid "Humanitarian research on disease, natural disasters and hunger."
-#~ msgstr "Hastalıklar, doğal afetler ve açlık üzerine insancıl araştırmalar."
-#~ msgid "FreeHAL"
-#~ msgstr "FreeHAL"
-#~ msgid "private"
-#~ msgstr "Özel"
-#~ msgid "POEM at HOME"
-#~ msgstr "POEM at HOME"
-#~ msgid "Docking at Home"
-#~ msgstr "Docking at Home"
-#~ msgid "GPUGrid.net"
-#~ msgstr "GPUGrid.net"
-#~ msgid "Superlink at Technion"
-#~ msgstr "Superlink at Technion"
-#~ msgid "The Lattice Project"
-#~ msgstr "The Lattice Project"
-#~ msgid "Malariacontrol.net"
-#~ msgstr "Malariacontrol.net"
-#~ msgid "Rosetta at home"
-#~ msgstr "Rosetta at home"
-#~ msgid "SIMAP"
-#~ msgstr "SIMAP"
-#~ msgid "Virtual Prairie"
-#~ msgstr "Virtual Prairie"
-#~ msgid "University of Houston"
-#~ msgstr "Houston Üniversitesi"
-#~ msgid "Study of botanical ecosystems"
-#~ msgstr "Botanik ekosistemler araştırması"
-#~ msgid "Climateprediction.net"
-#~ msgstr "Climateprediction.net"
-#~ msgid "Astronomy/Physics/Chemistry"
-#~ msgstr "Astronomi/Fizik/Kimya"
-#~ msgid "eOn"
-#~ msgstr "eOn"
-#~ msgid "Orbit at home"
-#~ msgstr "Orbit at home"
-#~ msgid "Planetary Science Institute"
-#~ msgstr "Gezegensel Bilim Enstitüsü"
-#~ msgid "Cosmology at Home"
-#~ msgstr "Cosmology at Home"
-#~ msgid "University of Illinois at Urbana-Chamapign"
-#~ msgstr "Urbana-Chamapign'deki Illinois Üniversitesi"
-#~ msgid "Milkyway at home"
-#~ msgstr "Milkyway at home"
-#~ msgid "Leiden Classical"
-#~ msgstr "Leiden Classical"
-#~ msgid "uFluids at home"
-#~ msgstr "uFluids at home"
-#~ msgid "Purdue University"
-#~ msgstr "Purdue Üniversitesi"
-#~ msgid "Physics/Aeronautics"
-#~ msgstr "Fizik/Havacılık"
-#~ msgid "Einstein at home"
-#~ msgstr "Einstein at home"
-#~ msgid "LHC at home"
-#~ msgstr "LHC at home"
-#~ msgid "SETI at home"
-#~ msgstr "SETI at home"
-#~ msgid "Quantum Monte Carlo at Home"
-#~ msgstr "Quantum Monte Carlo at Home"
-#~ msgid "University of Muenster (Germany)"
-#~ msgstr "Muenster Üniversitesi (Almanya)"
-#~ msgid "Spinhenge at home"
-#~ msgstr "Spinhenge at home"
-#~ msgid "CAS at home"
-#~ msgstr "CAS at home"
-#~ msgid "Yoyo at home"
-#~ msgstr "Yoyo at home"
-#~ msgid "EDGeS at Home"
-#~ msgstr "EDGeS at Home"
-#~ msgid "Ibercivis"
-#~ msgstr "Ibercivis"
-#~ msgid "World Community Grid"
-#~ msgstr "World Community Grid"
-#~ msgid "Enigma at Home"
-#~ msgstr "Enigma at Home"
-#~ msgid "Collatz Conjecture"
-#~ msgstr "Collatz Conjecture"
-#~ msgid "NFS at home"
-#~ msgstr "NFS at home"
-#~ msgid "VTU at home"
-#~ msgstr "VTU at home"
-#~ msgid "AQUA at home"
-#~ msgstr "AQUA at home"
-#~ msgid "D-Wave Systems, Inc."
-#~ msgstr "D-Wave Systems Şirketi"
-#~ msgid "Quantum computing"
-#~ msgstr "Kuantum ile hesaplama"
-#~ msgid "ABC at home"
-#~ msgstr "ABC at home"
-#~ msgid "PrimeGrid"
-#~ msgstr "PrimeGrid"
-#~ msgid "primaboinca"
-#~ msgstr "primaboinca"
-#~ msgid "SZTAKI Desktop Grid"
-#~ msgstr "SZTAKI Desktop Grid"
-#~ msgid "Chess960 at home"
-#~ msgstr "Chess960 at home"
-#~ msgid "Chess-960.org"
-#~ msgstr "Chess-960.org"
-#~ msgid "Game-playing"
-#~ msgstr "Oyun oynama"
-#~ msgid "The current release is known to work with these Linux versions:"
-#~ msgstr "Mevcut sürümün bu Linux sürümleriyle çalıştığı biliniyor:"
-#~ msgid ""
-#~ "For other Linux versions, check if a BOINC package is offered by your "
-#~ "Linux distribution."
-#~ msgstr ""
-#~ "Diğer Linux sürümleri için, Linux dağıtımınız tarafından BOINC paketi "
-#~ "sağlanıp sağlanmadığını kontrol edin."
-#~ msgid ""
-#~ "Alternatively, download the %1BOINC client for older Linux versions%2. "
-#~ "This doesn't have a graphical interface, but it should work on all Linux "
-#~ "systems, both x86 and x64."
-#~ msgstr ""
-#~ "Alternatif olarak, %1eski Linux versiyonları için BOINC istemcisi%2ni "
-#~ "indirebilirsiniz. Bu istemci grafiksel arayüze sahip değildir, fakat, x86 "
-#~ "ve x64 tüm Linux sistemlerinde çalışması gerekir."
-#~ msgid ""
-#~ "Note: if your computer is equipped with an Graphics Processing Unit "
-#~ "(GPU), you may be able to %suse it to compute faster%s"
-#~ msgstr ""
-#~ "Not: Eğer bilgisayarınız bir ekran kartına (Graphics Processing Unit-GPU) "
-#~ "sahipse, çok daha hızlı hesaplama yaptırmak için %sonu da "
-#~ "kullanabilirsiniz%s"
-#~ msgid "TeraFLOPS."
-#~ msgstr "TeraFLOP."
-#~ msgid "Conferences"
-#~ msgstr "Konferanslar"
-
diff --git a/locale/txconfig b/locale/txconfig
new file mode 100644
index 0000000..2a40cd3
--- /dev/null
+++ b/locale/txconfig
@@ -0,0 +1,45 @@
+[main]
+host = https://www.transifex.com
+
+[boinc.manager]
+file_filter = locale/<lang>/BOINC-Manager.po
+source_file = locale/templates/BOINC-Manager.pot
+source_lang = en_US
+type = PO
+
+[boinc.client]
+file_filter = locale/<lang>/BOINC-Client.po
+source_file = locale/templates/BOINC-Client.pot
+source_lang = en_US
+type = PO
+
+[boinc.web]
+file_filter = locale/<lang>/BOINC-Web.po
+source_file = locale/templates/BOINC-Web.pot
+source_lang = en_US
+type = PO
+
+[boinc.setup]
+file_filter = locale/<lang>/BOINC-Setup.po
+source_file = locale/templates/BOINC-Setup.pot
+source_lang = en_US
+type = PO
+
+[boinc.project-generic]
+file_filter = locale/<lang>/BOINC-Project-Generic.po
+source_file = locale/templates/BOINC-Project-Generic.pot
+source_lang = en_US
+type = PO
+
+[boinc.drupal]
+file_filter = locale/<lang>/BOINC-Drupal.po
+source_file = locale/templates/BOINC-Drupal.pot
+source_lang = en_US
+type = PO
+
+[boinc.android]
+file_filter = android/BOINC/res/values-<lang>/strings.xml
+source_file = android/BOINC/res/values/strings.xml
+source_lang = en_US
+lang_map = it_IT:it-rIT,pt_BR:pt-rBR,pt_PT:pt-rPT,ru_RU:ru-rRU,sv_SE:sv-rSE,zh_CN:zh-rCN,zh_TW:zh-rTW
+type = ANDROID
diff --git a/locale/uk/BOINC-Client.mo b/locale/uk/BOINC-Client.mo
index 3ef6acf..7a00d77 100644
Binary files a/locale/uk/BOINC-Client.mo and b/locale/uk/BOINC-Client.mo differ
diff --git a/locale/uk/BOINC-Client.po b/locale/uk/BOINC-Client.po
index afc33a4..8677c92 100644
--- a/locale/uk/BOINC-Client.po
+++ b/locale/uk/BOINC-Client.po
@@ -1,24 +1,23 @@
 # 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: BOINC 7.4\n"
+"Project-Id-Version: boinc\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-10-15 22:25-0700\n"
-"PO-Revision-Date: 2015-02-12 02:08-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: uk\n"
+"PO-Revision-Date: 2015-02-09 01:28+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\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"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-POOTLE-MTIME: 1379662526.0\n"
+"Language: uk\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"
 
-#: acct_mgr.cpp:450
-#: acct_mgr.cpp:459
+#: acct_mgr.cpp:450 acct_mgr.cpp:459
 msgid "Message from account manager"
 msgstr "Повідомлення менеджера проектів"
 
@@ -27,7 +26,9 @@ msgid "Message from server"
 msgstr "Повідомлення від сервера"
 
 #: client_state.cpp:258
-msgid "Some tasks need more memory than allowed by your preferences.  Please check the preferences."
+msgid ""
+"Some tasks need more memory than allowed by your preferences.  Please check "
+"the preferences."
 msgstr "Деякі завдання вимагають більше пам'яті, аніж дозволено Вашими налаштуваннями.  Будь-ласка, перевірте налаштування."
 
 #: client_state.cpp:520
@@ -40,11 +41,12 @@ msgstr "HTTP-проксі повинен бути визначений змін
 
 #: cs_scheduler.cpp:613
 #, c-format
-msgid "You used the wrong URL for this project.  When convenient, remove this project, then add %s"
+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
+#: cs_statefile.cpp:828 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
 msgstr "Синтаксична помилка в app_info.xml"
 
@@ -56,18 +58,15 @@ msgstr "Файлу, на який посилається app_info.xml, не іс
 msgid "A new version of BOINC is available."
 msgstr "Доступна нова версія BOINC."
 
-#: current_version.cpp:94
-#: current_version.cpp:102
+#: current_version.cpp:94 current_version.cpp:102
 msgid "Download"
 msgstr "Завантажити"
 
-#: log_flags.cpp:269
-#: log_flags.cpp:449
+#: 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
+#: log_flags.cpp:423 log_flags.cpp:475
 msgid "Unrecognized tag in cc_config.xml"
 msgstr "Нерозпізнаний тег в cc_config.xml"
 
@@ -92,7 +91,9 @@ 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."
+msgid ""
+"The project has changed its security key.  Please remove and add this "
+"project."
 msgstr "Проект змінив свій ключ безпеки.  Будь-ласка, видаліть і знову додайте цей проект."
 
 #: ../sched/handle_request.cpp:943
@@ -104,7 +105,8 @@ msgid "This project doesn't support CPU type"
 msgstr "Цей проект не підтримує тип CPU"
 
 #: ../sched/handle_request.cpp:993
-msgid "Your BOINC client software is too old.  Please install the current version."
+msgid ""
+"Your BOINC client software is too old.  Please install the current version."
 msgstr "У Вас занадто стара версія BOINC-клієнта.  Будь-ласка, встановіть поточну версію."
 
 #: ../sched/handle_request.cpp:1259
@@ -112,18 +114,21 @@ 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"
+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"
+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"
+msgid ""
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to"
+" the current version"
 msgstr "Потрібна новіша версія BOINC для використання вашого графічного процесора NVIDIA; будь-ласка, оновіть програму до поточної версії"
 
-# 94%
 #: ../sched/sched_send.cpp:1146
 #, c-format
 msgid "An %s GPU is required to run tasks for this project"
@@ -143,7 +148,8 @@ msgstr "Потрібна новіша версія BOINC; будь-ласка, 
 
 #: ../sched/sched_send.cpp:1305
 #, c-format
-msgid "Tasks for %s are available, but your preferences are set to not accept them"
+msgid ""
+"Tasks for %s are available, but your preferences are set to not accept them"
 msgstr "Доступні завдання для %s, але у Ваших налаштуваннях вказано не приймати їх"
 
 #: ../sched/sched_types.cpp:254
@@ -153,35 +159,3 @@ 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 не має придатної версії"
-
-#~ msgid "Download it."
-#~ msgstr "Завантажте її."
-#~ msgid "An NVIDIA or ATI GPU is required to run tasks for this project"
-#~ msgstr "Для обробки завдань цього проекту потрібна відеокарта NVIDIA або ATI"
-#~ msgid "An NVIDIA GPU is required to run tasks for this project"
-#~ msgstr "Для обробки завдань цього проекту потрібна відеокарта NVIDIA"
-#~ msgid "An ATI GPU is required to run tasks for this project"
-#~ msgstr "Для обробки завдань цього проекту потрібна відеокарта ATI"
-#~ msgid ""
-#~ "Tasks for NVIDIA GPU are available, but your preferences are set to not "
-#~ "accept them"
-#~ msgstr ""
-#~ "Доступні завдання для ГП NVIDIA, але ваші налаштування не дозволяють "
-#~ "приймати їх"
-#~ msgid ""
-#~ "Tasks for ATI GPU are available, but your preferences are set to not accept "
-#~ "them"
-#~ msgstr ""
-#~ "Доступні завдання для ГП ATI, але ваші налаштування не дозволяють приймати "
-#~ "їх"
-#~ msgid ""
-#~ "Tasks for CPU are available, but your preferences are set to not accept them"
-#~ msgstr ""
-#~ "Доступні завдання для ЦП, але ваші налаштування не дозволяють приймати їх"
-#~ msgid "error"
-#~ msgstr "помилка"
-#~ msgid "Can't resolve hostname in remote_hosts.cfg"
-#~ msgstr "Неможливо визначити назву комп'ютера в remote_hosts.cfg"
-#~ msgid "is not available for"
-#~ msgstr "недоступні для"
-
diff --git a/locale/uk/BOINC-Manager.mo b/locale/uk/BOINC-Manager.mo
index 7129fdf..bedbe38 100644
Binary files a/locale/uk/BOINC-Manager.mo and b/locale/uk/BOINC-Manager.mo differ
diff --git a/locale/uk/BOINC-Manager.po b/locale/uk/BOINC-Manager.po
index 848b493..10dead1 100644
--- a/locale/uk/BOINC-Manager.po
+++ b/locale/uk/BOINC-Manager.po
@@ -1,64 +1,52 @@
 # 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: BOINC 7.4\n"
+"Project-Id-Version: boinc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-15 16:56-0500\n"
-"PO-Revision-Date: 2015-02-12 02: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: uk\n"
+"POT-Creation-Date: 2014-02-02 00:00-0800\n"
+"PO-Revision-Date: 2015-02-09 01:34+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\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"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc_7.4\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1420020876.0\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-SearchPath-0: clientgui\n"
-"X-Poedit-SearchPath-1: clientgui/msw\n"
-"X-Poedit-SearchPath-2: clientgui/mac\n"
-"X-Poedit-SearchPath-3: clientgui/mac\n"
-
-# 81%
-#: clientgui/AccountInfoPage.cpp:387
+"Language: uk\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"
+
+#: AccountInfoPage.cpp:387
 #, c-format
 msgid "Identify your account at %s"
 msgstr "Ідентифікуйте свій обліковий запис у %s"
 
-#: clientgui/AccountInfoPage.cpp:393
+#: AccountInfoPage.cpp:393
 msgid ""
 "Please enter your account information\n"
 "(to create an account, visit the project's web site)"
-msgstr ""
-"Вкажіть дані Вашого облікового запису\n"
-"(обліковий запис створюється на сайті проекту)"
+msgstr "Вкажіть дані Вашого облікового запису\n(обліковий запис створюється на сайті проекту)"
 
-#: clientgui/AccountInfoPage.cpp:397
+#: AccountInfoPage.cpp:397
 msgid ""
 "This project is not currently accepting new accounts.\n"
 "You can add it only if you already have an account."
-msgstr ""
-"Наразі в даному проекті створення нових облікових записів заборонене.\n"
-"Ви можете додати його лише якщо вже зареєстровані тут."
+msgstr "Наразі в даному проекті створення нових облікових записів заборонене.\nВи можете додати його лише якщо вже зареєстровані тут."
 
-#: clientgui/AccountInfoPage.cpp:401
+#: AccountInfoPage.cpp:401
 msgid "Are you already running this project?"
 msgstr "Ви вже зареєстровані в цьому проекті?"
 
-#: clientgui/AccountInfoPage.cpp:405
+#: AccountInfoPage.cpp:405
 msgid "&No, new user"
 msgstr "&Ні, новий користувач"
 
-#: clientgui/AccountInfoPage.cpp:408
+#: AccountInfoPage.cpp:408
 msgid "&Yes, existing user"
 msgstr "&Так, існуючий користувач"
 
-#: clientgui/AccountInfoPage.cpp:413
+#: AccountInfoPage.cpp:413
 msgid ""
 "We were not able to set up your account information\n"
 "automatically.\n"
@@ -66,502 +54,469 @@ msgid ""
 "Please click on the 'Find login information' link\n"
 "below to find out what to put in the email address and\n"
 "password fields."
-msgstr ""
-"Не вдалося встановити дані Вашого облікового запису\n"
-"автоматично.\n"
-"\n"
-"Будь-ласка, перейдіть за посиланням \"Знайти інформацію входу в систему\"\n"
-"що знаходиться нижче для заповнення полів електронної адреси та\n"
-"паролю."
+msgstr "Не вдалося встановити дані Вашого облікового запису\nавтоматично.\n\nБудь-ласка, перейдіть за посиланням \"Знайти інформацію входу в систему\"\nщо знаходиться нижче для заповнення полів електронної адреси та\nпаролю."
 
-#: clientgui/AccountInfoPage.cpp:416
+#: AccountInfoPage.cpp:416
 msgid "Find login information"
 msgstr "Знайти інформацію для входу в систему"
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:649
+#: AccountInfoPage.cpp:436 AccountInfoPage.cpp:641
 msgid "&Password:"
 msgstr "&Пароль:"
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:673
+#: AccountInfoPage.cpp:443 AccountInfoPage.cpp:665
 msgid "Choose a &password:"
 msgstr "Введіть &пароль:"
 
-#: clientgui/AccountInfoPage.cpp:446
+#: AccountInfoPage.cpp:446
 msgid "C&onfirm password:"
 msgstr "П&ідтвердіть пароль:"
 
-#: clientgui/AccountInfoPage.cpp:453
+#: AccountInfoPage.cpp:453
 #, c-format
 msgid "Are you already running %s?"
 msgstr "Ви вже зареєстровані в проекті %s?"
 
-#: clientgui/AccountInfoPage.cpp:482
+#: AccountInfoPage.cpp:482
 msgid "&Username:"
 msgstr "&Користувач:"
 
-#: clientgui/AccountInfoPage.cpp:511
-msgid "&Email address or LDAP ID:"
-msgstr "&Адреса електронної пошти або LDAP ID:"
-
-#: clientgui/AccountInfoPage.cpp:515
+#: AccountInfoPage.cpp:508
 msgid "&Email address:"
-msgstr "&Адреса електронної пошти або LDAP ID:"
+msgstr "&Адреса електронної пошти:"
 
-#: clientgui/AccountInfoPage.cpp:523
+#: AccountInfoPage.cpp:515
 #, c-format
 msgid "minimum length %d"
 msgstr "мінімальна довжина %d"
 
-#: clientgui/AccountInfoPage.cpp:530
+#: AccountInfoPage.cpp:522
 msgid "Forgot your password?"
 msgstr "Забули свій пароль?"
 
-#: clientgui/AccountInfoPage.cpp:537
+#: AccountInfoPage.cpp:529
 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 ""
-"Якщо Ви ще не зареєструвалися в цьому менеджері проектів,\n"
-"будь-ласка, зробіть це перед тим як продовжити.  Перейдіть за посиланням нижче,\n"
-"щоб зареєструватися чи відновити забутий пароль."
+msgstr "Якщо Ви ще не зареєструвалися в цьому менеджері проектів,\nбудь-ласка, зробіть це перед тим як продовжити.  Перейдіть за посиланням нижче,\nщоб зареєструватися чи відновити забутий пароль."
 
-#: clientgui/AccountInfoPage.cpp:540
+#: AccountInfoPage.cpp:532
 msgid "Account manager web site"
 msgstr "Веб-сайт менеджера проектів"
 
-#: clientgui/AccountInfoPage.cpp:582
+#: AccountInfoPage.cpp:574 WelcomePage.cpp:348
 msgid "Add project"
 msgstr "Додати проект"
 
-#: clientgui/AccountInfoPage.cpp:584
+#: AccountInfoPage.cpp:576
 msgid "Update account manager"
 msgstr "Оновлення менеджера проектів"
 
-#: clientgui/AccountInfoPage.cpp:586
+#: AccountInfoPage.cpp:578 WelcomePage.cpp:307 WelcomePage.cpp:321
 msgid "Use account manager"
 msgstr "Використати менеджер проектів"
 
-#: clientgui/AccountInfoPage.cpp:593
+#: AccountInfoPage.cpp:585
 msgid "Please enter a user name."
 msgstr "Будь-ласка, введіть ім’я користувача."
 
-#: clientgui/AccountInfoPage.cpp:595
+#: AccountInfoPage.cpp:587
 msgid "Please enter an email address."
 msgstr "Будь-ласка, вкажіть адресу електронної пошти."
 
-#: clientgui/AccountInfoPage.cpp:605
+#: AccountInfoPage.cpp:597
 #, c-format
 msgid "Please enter a password of at least %d characters."
 msgstr "Будь-ласка, введіть пароль, що складається мінімум з %d символів."
 
-#: clientgui/AccountInfoPage.cpp:615
-msgid "The password and confirmation password do not match. Please type them again."
+#: AccountInfoPage.cpp:607
+msgid ""
+"The password and confirmation password do not match. Please type them again."
 msgstr "Паролі не співпадають. Будь ласка, введіть їх ще раз."
 
-#: clientgui/AccountManagerInfoPage.cpp:272
+#: AccountManagerInfoPage.cpp:272
 msgid "Choose an account manager"
 msgstr "Вибір менеджера проектів"
 
-#: clientgui/AccountManagerInfoPage.cpp:275
+#: AccountManagerInfoPage.cpp:275
 msgid ""
 "To choose an account manager, click its name or \n"
 "type its URL below."
-msgstr ""
-"Для того щоб обрати менеджер проектів, натисніть на його назві або \n"
-"введіть його URL в полі нижче."
+msgstr "Для того щоб обрати менеджер проектів, натисніть на його назві або \nвведіть його URL в полі нижче."
 
-#: clientgui/AccountManagerInfoPage.cpp:279
+#: AccountManagerInfoPage.cpp:279
 msgid "Account manager details:"
 msgstr "Опис менеджера проектів:"
 
-#: clientgui/AccountManagerInfoPage.cpp:283
+#: AccountManagerInfoPage.cpp:283
 msgid "Account manager &URL:"
 msgstr "&URL-адреса менеджера проектів:"
 
-#: clientgui/AccountManagerInfoPage.cpp:287
+#: AccountManagerInfoPage.cpp:287
 msgid "Open web page"
 msgstr "Відкрити веб-сторінку"
 
-#: clientgui/AccountManagerInfoPage.cpp:290
+#: AccountManagerInfoPage.cpp:290
 msgid "Visit this account manager's web site"
 msgstr "Відвідайте веб-сайт менеджера проектів"
 
-#: clientgui/AccountManagerProcessingPage.cpp:186
-#: clientgui/AccountManagerPropertiesPage.cpp:192
+#: AccountManagerProcessingPage.cpp:187 AccountManagerPropertiesPage.cpp:193
 #, c-format
 msgid "Communicating with %s."
 msgstr "Встановлення зв'язку з %s."
 
-#: clientgui/AccountManagerProcessingPage.cpp:193
-#: clientgui/AccountManagerPropertiesPage.cpp:199
+#: AccountManagerProcessingPage.cpp:194 AccountManagerPropertiesPage.cpp:200
 msgid "Communicating with server."
 msgstr "Встановлення зв'язку з сервером."
 
-#: clientgui/AccountManagerProcessingPage.cpp:198
-#: clientgui/AccountManagerPropertiesPage.cpp:204
+#: AccountManagerProcessingPage.cpp:199 AccountManagerPropertiesPage.cpp:205
 msgid "Please wait..."
 msgstr "Зачекайте, будь-ласка..."
 
-#: clientgui/AccountManagerProcessingPage.cpp:325
+#: AccountManagerProcessingPage.cpp:326
 msgid "An internal server error has occurred.\n"
 msgstr "Сталася внутрішня помилка сервера.\n"
 
-#: clientgui/AdvancedFrame.cpp:96
+#: AdvancedFrame.cpp:95
 msgid "Connected"
 msgstr "З'єднання встановлене"
 
-#: clientgui/AdvancedFrame.cpp:104
+#: AdvancedFrame.cpp:103
 msgid "Disconnected"
 msgstr "З’єднання розірване"
 
-#: clientgui/AdvancedFrame.cpp:318
+#: AdvancedFrame.cpp:322 sg_BoincSimpleFrame.cpp:119
 #, c-format
 msgid "Close the %s window"
 msgstr "Закрити вікно %s"
 
-#: clientgui/AdvancedFrame.cpp:321
+#: AdvancedFrame.cpp:325 sg_BoincSimpleFrame.cpp:122
 msgid "&Close Window"
 msgstr "&Закрити вікно"
 
-#: clientgui/AdvancedFrame.cpp:332
-#: clientgui/AdvancedFrame.cpp:339
-#: clientgui/AdvancedFrame.cpp:346
+#: AdvancedFrame.cpp:336 AdvancedFrame.cpp:343 AdvancedFrame.cpp:350
 #, c-format
 msgid "Exit %s"
 msgstr "Вийти з %s"
 
-#: clientgui/AdvancedFrame.cpp:359
-msgid "Preferences..."
-msgstr "Налаштування..."
-
-#: clientgui/AdvancedFrame.cpp:368
+#: AdvancedFrame.cpp:371
 msgid "&Notices\tCtrl+Shift+N"
 msgstr "&Повідомлення\t Ctrl+Shift+N"
 
-#: clientgui/AdvancedFrame.cpp:369
+#: AdvancedFrame.cpp:372
 msgid "Display notices"
 msgstr "Показати повідомлення"
 
-#: clientgui/AdvancedFrame.cpp:374
+#: AdvancedFrame.cpp:377
 msgid "&Projects\tCtrl+Shift+P"
 msgstr "&Проекти\t Ctrl+Shift+P"
 
-#: clientgui/AdvancedFrame.cpp:375
+#: AdvancedFrame.cpp:378
 msgid "Display projects"
 msgstr "Показати проекти"
 
-#: clientgui/AdvancedFrame.cpp:380
+#: AdvancedFrame.cpp:383
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr "&Завдання\t Ctrl+Shift+T"
 
-#: clientgui/AdvancedFrame.cpp:381
+#: AdvancedFrame.cpp:384
 msgid "Display tasks"
 msgstr "Показати завдання"
 
-#: clientgui/AdvancedFrame.cpp:386
+#: AdvancedFrame.cpp:389
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr "Пере&дача\t Ctrl+Shift+X"
 
-#: clientgui/AdvancedFrame.cpp:387
+#: AdvancedFrame.cpp:390
 msgid "Display transfers"
 msgstr "Показати передачу даних"
 
-#: clientgui/AdvancedFrame.cpp:392
+#: AdvancedFrame.cpp:395
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "&Статистика\t Ctrl+Shift+S"
 
-#: clientgui/AdvancedFrame.cpp:393
+#: AdvancedFrame.cpp:396
 msgid "Display statistics"
 msgstr "Показати статистику"
 
-#: clientgui/AdvancedFrame.cpp:398
+#: AdvancedFrame.cpp:401
 msgid "&Disk usage\tCtrl+Shift+D"
 msgstr "&Використання дискового простору\t Ctrl+Shift+D"
 
-#: clientgui/AdvancedFrame.cpp:399
+#: AdvancedFrame.cpp:402
 msgid "Display disk usage"
 msgstr "Показати використання дискового простору"
 
-#: clientgui/AdvancedFrame.cpp:406
+#: AdvancedFrame.cpp:409
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr "Спрощений &Вид...\t Ctrl+Shift+V"
 
-#: clientgui/AdvancedFrame.cpp:407
+#: AdvancedFrame.cpp:410
 msgid "Display the simple graphical interface."
 msgstr "Показати простий графічний інтерфейс."
 
-#: clientgui/AdvancedFrame.cpp:421
+#: AdvancedFrame.cpp:424
 msgid "&Add project or account manager..."
 msgstr "&Додати проект або менеджер проектів..."
 
-#: clientgui/AdvancedFrame.cpp:422
+#: AdvancedFrame.cpp:425 sg_ProjectPanel.cpp:76
 msgid "Volunteer for any or all of 30+ projects in many areas of science"
 msgstr "Стати учасником у будь-кому або в усіх 30+ проектах з багатьох галузей науки"
 
-#: clientgui/AdvancedFrame.cpp:426
+#: AdvancedFrame.cpp:429
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "&Синхронізувати з %s"
 
-#: clientgui/AdvancedFrame.cpp:430
+#: AdvancedFrame.cpp:433
 #, c-format
 msgid "Get current settings from %s"
 msgstr "Отримати поточні налаштування з %s"
 
-#: clientgui/AdvancedFrame.cpp:440
+#: AdvancedFrame.cpp:443
 msgid "&Add project..."
 msgstr "&Додати проект..."
 
-#: clientgui/AdvancedFrame.cpp:441
+#: AdvancedFrame.cpp:444
 msgid "Add a project"
 msgstr "Додати проект"
 
-#: clientgui/AdvancedFrame.cpp:444
+#: AdvancedFrame.cpp:447
 #, c-format
 msgid "S&top using %s..."
 msgstr "В&ід'єднатися від %s..."
 
-#: clientgui/AdvancedFrame.cpp:450
+#: AdvancedFrame.cpp:453
 msgid "Remove this computer from account manager control."
 msgstr "Від'єднати цей комп'ютер від менеджера проектів."
 
-#: clientgui/AdvancedFrame.cpp:455
+#: AdvancedFrame.cpp:458 sg_BoincSimpleFrame.cpp:178
 msgid "&Options..."
 msgstr "&Налаштування..."
 
-#: clientgui/AdvancedFrame.cpp:456
+#: AdvancedFrame.cpp:459 sg_BoincSimpleFrame.cpp:179
 msgid "Configure display options and proxy settings"
 msgstr "Налаштування графічного інтерфейсу та проксі-сервера"
 
-#: clientgui/AdvancedFrame.cpp:460
+#: AdvancedFrame.cpp:463 sg_BoincSimpleFrame.cpp:172
 msgid "Computing &preferences..."
 msgstr "Налаштування &клієнта..."
 
-#: clientgui/AdvancedFrame.cpp:461
+#: AdvancedFrame.cpp:464 sg_BoincSimpleFrame.cpp:173
 msgid "Configure computing preferences"
 msgstr "Змінити налаштування обчислень"
 
-#: clientgui/AdvancedFrame.cpp:469
+#: AdvancedFrame.cpp:472
 msgid "&Run always"
 msgstr "&Постійна обробка"
 
-#: clientgui/AdvancedFrame.cpp:470
+#: AdvancedFrame.cpp:473
 msgid "Allow work regardless of preferences"
 msgstr "Дозволяти обчислення незалежно від налаштувань"
 
-#: clientgui/AdvancedFrame.cpp:474
+#: AdvancedFrame.cpp:477
 msgid "Run based on &preferences"
 msgstr "Графік роботи визначається &налаштуваннями"
 
-#: clientgui/AdvancedFrame.cpp:475
+#: AdvancedFrame.cpp:478
 msgid "Allow work according to preferences"
 msgstr "Обчислення виконуються відповідно до налаштувань"
 
-#: clientgui/AdvancedFrame.cpp:479
+#: AdvancedFrame.cpp:482
 msgid "&Suspend"
 msgstr "&Призупинити"
 
-#: clientgui/AdvancedFrame.cpp:480
+#: AdvancedFrame.cpp:483
 msgid "Stop work regardless of preferences"
 msgstr "Призупиняється обробка всіх завдань в усіх проектах"
 
-#: clientgui/AdvancedFrame.cpp:505
+#: AdvancedFrame.cpp:508
 msgid "Use GPU always"
 msgstr "Завжди використовувати графічний процесор"
 
-#: clientgui/AdvancedFrame.cpp:506
+#: AdvancedFrame.cpp:509
 msgid "Allow GPU work regardless of preferences"
 msgstr "Обчислення за допомогою графічного процесора запущені завжди"
 
-#: clientgui/AdvancedFrame.cpp:510
+#: AdvancedFrame.cpp:513
 msgid "Use GPU based on preferences"
 msgstr "Використовувати графічний процесор відповідно до налаштувань"
 
-#: clientgui/AdvancedFrame.cpp:511
+#: AdvancedFrame.cpp:514
 msgid "Allow GPU work according to preferences"
 msgstr "Обчислювати за допомогою графічного процесора відповідно до налаштувань"
 
-#: clientgui/AdvancedFrame.cpp:515
+#: AdvancedFrame.cpp:518
 msgid "Suspend GPU"
 msgstr "Призупинити використання графічного процесора"
 
-#: clientgui/AdvancedFrame.cpp:516
+#: AdvancedFrame.cpp:519
 msgid "Stop GPU work regardless of preferences"
 msgstr "Зупинити обробку завдань за допомогою графічного процесора незалежно від налаштувань"
 
-#: clientgui/AdvancedFrame.cpp:540
+#: AdvancedFrame.cpp:543
 msgid "Network activity always available"
 msgstr "Підключення до Інтернету доступне завжди"
 
-#: clientgui/AdvancedFrame.cpp:541
+#: AdvancedFrame.cpp:544
 msgid "Allow network activity regardless of preferences"
 msgstr "Дозволити доступ до Інтернету незалежно від налаштувань"
 
-#: clientgui/AdvancedFrame.cpp:545
+#: AdvancedFrame.cpp:548
 msgid "Network activity based on preferences"
 msgstr "Доступ до Інтернету визначається налаштуваннями"
 
-#: clientgui/AdvancedFrame.cpp:546
+#: AdvancedFrame.cpp:549
 msgid "Allow network activity according to preferences"
 msgstr "Дозволити доступ до Інтернету відповідно до налаштувань"
 
-#: clientgui/AdvancedFrame.cpp:550
+#: AdvancedFrame.cpp:553
 msgid "Network activity suspended"
 msgstr "Працювати автономно"
 
-#: clientgui/AdvancedFrame.cpp:551
+#: AdvancedFrame.cpp:554
 msgid "Stop BOINC network activity"
 msgstr "Заборонити BOINC використовувати Інтернет"
 
-#: clientgui/AdvancedFrame.cpp:561
+#: AdvancedFrame.cpp:564
 #, c-format
 msgid "Connect to another computer running %s"
 msgstr "Підключити інший комп’ютер з %s"
 
-#: clientgui/AdvancedFrame.cpp:566
+#: AdvancedFrame.cpp:569
 msgid "Select computer..."
 msgstr "Вибрати комп'ютер..."
 
-#: clientgui/AdvancedFrame.cpp:571
+#: AdvancedFrame.cpp:574
 msgid "Shut down connected client..."
 msgstr "Завершити роботу підключеного клієнта..."
 
-#: clientgui/AdvancedFrame.cpp:572
+#: AdvancedFrame.cpp:575
 msgid "Shut down the currently connected client"
 msgstr "Завершити роботу підключеного клієнта"
 
-#: clientgui/AdvancedFrame.cpp:576
+#: AdvancedFrame.cpp:579
 msgid "Run CPU &benchmarks"
 msgstr "Запустити тест &продуктивності"
 
-#: clientgui/AdvancedFrame.cpp:577
+#: AdvancedFrame.cpp:580
 msgid "Runs BOINC CPU benchmarks"
 msgstr "Запустити тест продуктивності процесора"
 
-#: clientgui/AdvancedFrame.cpp:581
+#: AdvancedFrame.cpp:584
 msgid "Do network communication"
 msgstr "Запустити обмін даними"
 
-#: clientgui/AdvancedFrame.cpp:582
+#: AdvancedFrame.cpp:585
 msgid "Do all pending network communication"
 msgstr "Повторити всі незавершені обміни даними"
 
-# 94%
-#: clientgui/AdvancedFrame.cpp:586
+#: AdvancedFrame.cpp:589
 msgid "Read config files"
 msgstr "Читати файли налаштувань"
 
-#: clientgui/AdvancedFrame.cpp:587
-msgid "Read configuration info from cc_config.xml and any app_config.xml files"
+#: AdvancedFrame.cpp:590
+msgid ""
+"Read configuration info from cc_config.xml and any app_config.xml files"
 msgstr "Переглянути інформацію про налаштування з cc_config.xml і будь-яких файлів app_config.xml"
 
-#: clientgui/AdvancedFrame.cpp:591
+#: AdvancedFrame.cpp:594
 msgid "Read local prefs file"
 msgstr "Читати локальний файл загальних налаштувань"
 
-#: clientgui/AdvancedFrame.cpp:592
+#: AdvancedFrame.cpp:595
 msgid "Read preferences from global_prefs_override.xml."
 msgstr "Читати налаштування з global_prefs_override.xml."
 
-#: clientgui/AdvancedFrame.cpp:597
+#: AdvancedFrame.cpp:600
 #, c-format
 msgid "Launch another instance of %s..."
 msgstr "Запустити інший екземпляр %s..."
 
-#: clientgui/AdvancedFrame.cpp:601
+#: AdvancedFrame.cpp:604
 #, c-format
 msgid "Launch another %s"
 msgstr "Запустити інший %s"
 
-#: clientgui/AdvancedFrame.cpp:611
+#: AdvancedFrame.cpp:614
 msgid "Event Log...\tCtrl+Shift+E"
 msgstr "Перегляд подій...\tCtrl+Shift+E"
 
-#: clientgui/AdvancedFrame.cpp:612
+#: AdvancedFrame.cpp:615
 msgid "Display diagnostic messages."
 msgstr "Показати діагностичні повідомлення."
 
-#: clientgui/AdvancedFrame.cpp:616
-msgid "Event Log Diagnostic Flags...\tCtrl+Shift+F"
-msgstr "Прапорці налагодження протоколу подій...\tCtrl+Shift+F"
-
-#: clientgui/AdvancedFrame.cpp:617
-msgid "Enable or disable various diagnostic messages"
-msgstr "Увімкнути або вимкнути різні діагностичні події"
-
-#: clientgui/AdvancedFrame.cpp:626
+#: AdvancedFrame.cpp:625 sg_BoincSimpleFrame.cpp:188
 #, c-format
 msgid "%s &help"
 msgstr "%s &Довідка"
 
-#: clientgui/AdvancedFrame.cpp:632
+#: AdvancedFrame.cpp:631 sg_BoincSimpleFrame.cpp:194
 #, c-format
 msgid "Show information about %s"
 msgstr "Показати інформацію про %s"
 
-#: clientgui/AdvancedFrame.cpp:644
+#: AdvancedFrame.cpp:643
 #, c-format
 msgid "&%s help"
 msgstr "&%s довідка"
 
-#: clientgui/AdvancedFrame.cpp:650
+#: AdvancedFrame.cpp:649 sg_BoincSimpleFrame.cpp:212
 #, c-format
 msgid "Show information about the %s"
 msgstr "Показати інформацію про %s"
 
-#: clientgui/AdvancedFrame.cpp:662
+#: AdvancedFrame.cpp:661 sg_BoincSimpleFrame.cpp:224
 #, c-format
 msgid "%s &web site"
 msgstr "%s &веб-сайт"
 
-#: clientgui/AdvancedFrame.cpp:668
+#: AdvancedFrame.cpp:667 sg_BoincSimpleFrame.cpp:230
 #, c-format
 msgid "Show information about BOINC and %s"
 msgstr "Показати інформацію про BOINC і %s"
 
-#: clientgui/AdvancedFrame.cpp:680
-#: clientgui/BOINCTaskBar.cpp:544
+#: AdvancedFrame.cpp:679 BOINCTaskBar.cpp:530 sg_BoincSimpleFrame.cpp:242
 #, c-format
 msgid "&About %s..."
 msgstr "&Про %s..."
 
-#: clientgui/AdvancedFrame.cpp:686
+#: AdvancedFrame.cpp:685 sg_BoincSimpleFrame.cpp:248
 msgid "Licensing and copyright information."
 msgstr "Інформація про ліцензію та авторське право."
 
-#: clientgui/AdvancedFrame.cpp:693
+#: AdvancedFrame.cpp:692 sg_BoincSimpleFrame.cpp:255
 msgid "&File"
 msgstr "&Файл"
 
-#: clientgui/AdvancedFrame.cpp:697
+#: AdvancedFrame.cpp:696 sg_BoincSimpleFrame.cpp:259
 msgid "&View"
 msgstr "&Вид"
 
-#: clientgui/AdvancedFrame.cpp:701
+#: AdvancedFrame.cpp:700 sg_BoincSimpleFrame.cpp:263
 msgid "&Tools"
 msgstr "&Інструменти"
 
-#: clientgui/AdvancedFrame.cpp:705
+#: AdvancedFrame.cpp:704
 msgid "&Activity"
 msgstr "&Діяльність"
 
-#: clientgui/AdvancedFrame.cpp:709
+#: AdvancedFrame.cpp:708
 msgid "A&dvanced"
 msgstr "Д&одатково"
 
-#: clientgui/AdvancedFrame.cpp:713
+#: AdvancedFrame.cpp:712 DlgEventLog.cpp:332 sg_BoincSimpleFrame.cpp:267
+#: wizardex.cpp:374 wizardex.cpp:381
 msgid "&Help"
 msgstr "&Довідка"
 
-#: clientgui/AdvancedFrame.cpp:1185
+#: AdvancedFrame.cpp:1199
 #, c-format
 msgid "%s - Stop using %s"
 msgstr "%s - Припинити використання %s"
 
-#: clientgui/AdvancedFrame.cpp:1190
+#: AdvancedFrame.cpp:1204
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -569,256 +524,222 @@ msgid ""
 "but you'll have to manage projects manually.\n"
 "\n"
 "Do you want to stop using %s?"
-msgstr ""
-"Якщо Ви припините використовувати %s,\n"
-"то збережете всі свої поточні проекти,\n"
-"проте Вам доведеться керувати ними вручну.\n"
-"\n"
-"Бажаєте припинити використовувати %s?"
+msgstr "Якщо Ви припините використовувати %s,\nто збережете всі свої поточні проекти,\nпроте Вам доведеться керувати ними вручну.\n\nБажаєте припинити використовувати %s?"
 
-#: clientgui/AdvancedFrame.cpp:1397
+#: AdvancedFrame.cpp:1401
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s - Завершити роботу поточного клієнта..."
 
-#: clientgui/AdvancedFrame.cpp:1406
+#: AdvancedFrame.cpp:1410
 #, c-format
 msgid ""
 "%s will shut down the current client\n"
 "and prompt you for another host to connect to."
-msgstr ""
-"%s вимкне підключений зараз клієнт\n"
-"і запитає у Вас адресу для підключення іншого комп'ютера."
+msgstr "%s вимкне підключений зараз клієнт\nі запитає у Вас адресу для підключення іншого комп'ютера."
 
-#: clientgui/AdvancedFrame.cpp:1806
+#: AdvancedFrame.cpp:1745 DlgAbout.cpp:119
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: clientgui/AdvancedFrame.cpp:1815
+#: AdvancedFrame.cpp:1754
 #, c-format
 msgid "%s has successfully added %s"
 msgstr "%s успішно додав проект %s"
 
-#: clientgui/AdvancedFrame.cpp:1953
+#: AdvancedFrame.cpp:1893
 #, c-format
 msgid "%s - (%s)"
 msgstr "%s - (%s)"
 
-#: clientgui/AdvancedFrame.cpp:1957
+#: AdvancedFrame.cpp:1897
 #, c-format
 msgid "Connecting to %s"
 msgstr "Відбувається підключення до %s"
 
-#: clientgui/AdvancedFrame.cpp:1960
+#: AdvancedFrame.cpp:1900
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "Підключений до %s (%s)"
 
-#: clientgui/AlreadyExistsPage.cpp:184
+#: AlreadyExistsPage.cpp:184
 msgid "Username already in use"
 msgstr "Це ім'я вже використовується"
 
-#: clientgui/AlreadyExistsPage.cpp:187
+#: AlreadyExistsPage.cpp:187
 msgid ""
 "An account with that username already exists and has a\n"
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"Обліковий запис з таким ім’ям вже існує і\n"
-"має відмінний від Вашого пароль.\n"
-"\n"
-"Будь-ласка, відвідайте домашню сторінку проекту для отримання інструкцій."
+msgstr "Обліковий запис з таким ім’ям вже існує і\nмає відмінний від Вашого пароль.\n\nБудь-ласка, відвідайте домашню сторінку проекту для отримання інструкцій."
 
-#: clientgui/AlreadyExistsPage.cpp:191
+#: AlreadyExistsPage.cpp:191
 msgid "Email address already in use"
 msgstr "Ця адреса електронної пошти вже використовується"
 
-#: clientgui/AlreadyExistsPage.cpp:194
+#: AlreadyExistsPage.cpp:194
 msgid ""
 "An account with that email address already exists and has a\n"
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"Обліковий запис з такою адресою електронної пошти вже існує і\n"
-"має відмінний від Вашого пароль.\n"
-"\n"
-"Будь-ласка, відвідайте  домашню сторінку проекту для отримання інструкцій."
+msgstr "Обліковий запис з такою адресою електронної пошти вже існує і\nмає відмінний від Вашого пароль.\n\nБудь-ласка, відвідайте  домашню сторінку проекту для отримання інструкцій."
 
-#: clientgui/AsyncRPC.cpp:1031
+#: AsyncRPC.cpp:1031
 msgid "Communicating with BOINC client.  Please wait ..."
 msgstr "Встановлюється зв'язок з BOINC-клієнтом.  Будь-ласка, зачекайте..."
 
-#: clientgui/AsyncRPC.cpp:1034
+#: AsyncRPC.cpp:1034
 #, c-format
 msgid "&Quit %s"
 msgstr "&Вийти з %s"
 
-#: clientgui/AsyncRPC.cpp:1036
+#: AsyncRPC.cpp:1036
 #, c-format
 msgid "E&xit %s"
 msgstr "В&ийти %s"
 
-#: clientgui/AsyncRPC.cpp:1040
+#: AsyncRPC.cpp:1040
 #, c-format
 msgid "%s - Communication"
 msgstr "%s - Встановлення зв'язку"
 
-#: clientgui/AsyncRPC.cpp:1056
+#: AsyncRPC.cpp:1056 DlgAdvPreferencesBase.cpp:107 sg_DlgPreferences.cpp:433
 msgid "Cancel"
 msgstr "Відмінити"
 
-#: clientgui/BOINCBaseFrame.cpp:504
+#: BOINCBaseFrame.cpp:505
 #, c-format
 msgid "%s - Connection Error"
 msgstr "%s - помилка з'єднання"
 
-#: clientgui/BOINCBaseFrame.cpp:513
+#: BOINCBaseFrame.cpp:514
 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 ""
-"Ви не маєте достатньо прав для управління клієнтом.\n"
-"Буль-ласка, зв’яжіться зі своїм адміністратором для додання Вас до групи користувачів 'boinc_users'."
+msgstr "Ви не маєте достатньо прав для управління клієнтом.\nБуль-ласка, зв’яжіться зі своїм адміністратором для додання Вас до групи користувачів 'boinc_users'."
 
-#: clientgui/BOINCBaseFrame.cpp:522
+#: BOINCBaseFrame.cpp:523
 msgid ""
 "Authorization failed connecting to running client.\n"
 "Make sure you start this program in the same directory as the client."
-msgstr ""
-"Не вдалося підключитися до клієнта через помилку контролю доступу.\n"
-"Переконаєтеся, що програма запускається з тієї ж папки, що і клієнт."
+msgstr "Не вдалося підключитися до клієнта через помилку контролю доступу.\nПереконаєтеся, що програма запускається з тієї ж папки, що і клієнт."
 
-#: clientgui/BOINCBaseFrame.cpp:524
+#: BOINCBaseFrame.cpp:525
 msgid "Authorization failed connecting to running client."
 msgstr "Не вдалося підключитися до клієнта через помилку контролю доступу."
 
-#: clientgui/BOINCBaseFrame.cpp:532
+#: BOINCBaseFrame.cpp:533
 msgid "The password you have provided is incorrect, please try again."
 msgstr "Введено неправильний пароль, спробуйте підключитися ще раз."
 
-#: clientgui/BOINCBaseFrame.cpp:576
+#: BOINCBaseFrame.cpp:577
 #, c-format
 msgid "%s - Connection Failed"
 msgstr "%s - помилка підключення"
 
-#: clientgui/BOINCBaseFrame.cpp:585
+#: BOINCBaseFrame.cpp:586
 #, c-format
 msgid ""
 "%s is not able to connect to a %s client.\n"
 "Would you like to try to connect again?"
-msgstr ""
-"%s не може підключитися до клієнта %s.\n"
-"Спробувати повторити підключення?"
+msgstr "%s не може підключитися до клієнта %s.\nСпробувати повторити підключення?"
 
-#: clientgui/BOINCBaseFrame.cpp:621
+#: BOINCBaseFrame.cpp:622
 #, c-format
 msgid "%s - Daemon Start Failed"
 msgstr "%s - помилка запуску Daemon"
 
-#: clientgui/BOINCBaseFrame.cpp:631
+#: BOINCBaseFrame.cpp:632
 #, 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 не може запустити клієнта %s.\n"
-"Спробуйте запустити службу BOINC ще раз із 'Панель управління/Адміністрування/Служби'."
+msgstr "%s не може запустити клієнта %s.\nСпробуйте запустити службу BOINC ще раз із 'Панель управління/Адміністрування/Служби'."
 
-#: clientgui/BOINCBaseFrame.cpp:637
+#: BOINCBaseFrame.cpp:638
 #, c-format
 msgid ""
 "%s is not able to start a %s client.\n"
 "Please start the daemon and try again."
-msgstr ""
-"%s не може запустити клієнт %s.\n"
-"Будь-ласка, запустіть daemon і спробуйте ще раз."
+msgstr "%s не може запустити клієнт %s.\nБудь-ласка, запустіть daemon і спробуйте ще раз."
 
-#: clientgui/BOINCBaseFrame.cpp:688
+#: BOINCBaseFrame.cpp:689
 #, c-format
 msgid "%s - Connection Status"
 msgstr "%s - стан підключення"
 
-#: clientgui/BOINCBaseFrame.cpp:699
+#: BOINCBaseFrame.cpp:700
 #, 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"
 "To connect up to your local computer please use 'localhost' as the host name."
-msgstr ""
-"%s не підключений до клієнта %s.\n"
-"Для підключення до клієнта %s скористайтеся меню 'Додатково\\Вибрати комп'ютер...'.\n"
-"Для локального комп'ютера, як його назву, використовуйте 'localhost'."
+msgstr "%s не підключений до клієнта %s.\nДля підключення до клієнта %s скористайтеся меню 'Додатково\\Вибрати комп'ютер...'.\nДля локального комп'ютера, як його назву, використовуйте 'localhost'."
 
-#: clientgui/BOINCBaseView.cpp:752
+#: BOINCBaseView.cpp:779
 msgid "Project web pages"
 msgstr "Веб-сторінки проекту"
 
-#: clientgui/BOINCClientManager.cpp:573
+#: BOINCClientManager.cpp:575
 #, c-format
 msgid "%s - Unexpected Exit"
 msgstr "%s - Позаплановий вихід"
 
-#: clientgui/BOINCClientManager.cpp:583
+#: BOINCClientManager.cpp:585
 #, 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 ""
-"Клієнт %s 3 рази за останні %d хвилин завершив роботу позапланово.\n"
-"Бажаєте перезапустити його ще раз?"
+msgstr "Клієнт %s 3 рази за останні %d хвилин завершив роботу позапланово.\nБажаєте перезапустити його ще раз?"
 
-#: clientgui/BOINCDialupManager.cpp:61
+#: BOINCDialupManager.cpp:61
 #, c-format
 msgid "%s - Network Status"
 msgstr "%s - стан мережевого підключення"
 
-#: clientgui/BOINCDialupManager.cpp:241
+#: BOINCDialupManager.cpp:241
 #, c-format
 msgid ""
 "%s needs to connect to the Internet.\n"
 "May it do so now?"
-msgstr ""
-"%s потребує підключення до Інтернету.\n"
-"Підключитися зараз?"
+msgstr "%s потребує підключення до Інтернету.\nПідключитися зараз?"
 
-#: clientgui/BOINCDialupManager.cpp:254
+#: BOINCDialupManager.cpp:254
 #, c-format
 msgid "%s is connecting to the Internet."
 msgstr "%s підключається до Інтернету."
 
-#: clientgui/BOINCDialupManager.cpp:303
+#: BOINCDialupManager.cpp:303
 #, c-format
 msgid "%s has successfully connected to the Internet."
 msgstr "%s встановив підключення до Інтернету."
 
-#: clientgui/BOINCDialupManager.cpp:331
+#: BOINCDialupManager.cpp:331
 #, c-format
 msgid "%s failed to connect to the Internet."
 msgstr "%s не вдалося підключитися до Інтернету."
 
-#: clientgui/BOINCDialupManager.cpp:372
+#: 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 виявив встановлене підключення до Інтернету.\n"
-"Відбувається обмін файлами даних і оновлення інформації про проекти."
+msgstr "%s виявив встановлене підключення до Інтернету.\nВідбувається обмін файлами даних і оновлення інформації про проекти."
 
-#: clientgui/BOINCDialupManager.cpp:417
+#: BOINCDialupManager.cpp:417
 #, c-format
 msgid "%s has successfully disconnected from the Internet."
 msgstr "%s розірвав підключення до Інтернету."
 
-#: clientgui/BOINCDialupManager.cpp:433
+#: BOINCDialupManager.cpp:433
 #, c-format
 msgid "%s failed to disconnected from the Internet."
 msgstr "%s не вдалося розірвати підключення до Інтернету."
 
-#: clientgui/BOINCGUIApp.cpp:595
+#: BOINCGUIApp.cpp:339
 #, c-format
 msgid ""
 "You currently are not authorized to manage the client.\n"
@@ -829,867 +750,798 @@ msgid ""
 " or\n"
 "  - contact your administrator to add you to the 'boinc_master'\n"
 "     user group."
-msgstr ""
-"У Вас недостатньо прав для керування клієнтом.\n"
-"\n"
-"Для запуску %s від імені користувача:\n"
-"  - перевстановіть %s, відповівши \"Так\"на питання проt\n"
-"     користувачів-неадміністраторів\n"
-" або\n"
-"  - зв’яжіться зі своїм адміністратором для додання Вас до групи користувачів\n"
-"     'boinc_master'."
-
-#: clientgui/BOINCGUIApp.cpp:601
+msgstr "У Вас недостатньо прав для керування клієнтом.\n\nДля запуску %s від імені користувача:\n  - перевстановіть %s, відповівши \"Так\"на питання проt\n     користувачів-неадміністраторів\n або\n  - зв’яжіться зі своїм адміністратором для додання Вас до групи користувачів\n     'boinc_master'."
+
+#: BOINCGUIApp.cpp:345
 #, c-format
 msgid ""
 "%s ownership or permissions are not set properly; please reinstall %s.\n"
 "(Error code %d"
-msgstr ""
-"%s відсутній доступ або неправильно встановлені права; перевстановіть, будь-ласка, %s.\n"
-"(Код помилки %d"
+msgstr "%s відсутній доступ або неправильно встановлені права; перевстановіть, будь-ласка, %s.\n(Код помилки %d"
 
-#: clientgui/BOINCGUIApp.cpp:607
+#: BOINCGUIApp.cpp:351
 msgid " at "
 msgstr " на "
 
-#: clientgui/BOINCGUIApp.cpp:610
+#: BOINCGUIApp.cpp:354 MainDocument.cpp:2484 MainDocument.cpp:2534
+#: MainDocument.cpp:2554 ViewTransfers.cpp:803
 msgid ")"
 msgstr ")"
 
-#: clientgui/BOINCGUIApp.cpp:640
+#: BOINCGUIApp.cpp:384
 msgid ""
 "A reboot is required in order for BOINC to run properly.\n"
 "Please reboot your computer and try again."
-msgstr ""
-"Для коректної роботи BOINC необхідне перезавантаження.\n"
-"Перезавантажте, будь-ласка, комп’ютер і спробуйте знову."
+msgstr "Для коректної роботи BOINC необхідне перезавантаження.\nПерезавантажте, будь-ласка, комп’ютер і спробуйте знову."
 
-#: clientgui/BOINCGUIApp.cpp:641
+#: BOINCGUIApp.cpp:385 DlgAbout.cpp:153
 msgid "BOINC Manager"
 msgstr "BOINC менеджер"
 
-#: clientgui/BOINCGUIApp.cpp:902
+#: BOINCGUIApp.cpp:572
 msgid "BOINC Manager was started by the operating system automatically"
 msgstr "BOINC менеджер був автоматично запущений операційною системою"
 
-#: clientgui/BOINCGUIApp.cpp:904
+#: BOINCGUIApp.cpp:574
 msgid "Startup BOINC so only the system tray icon is visible"
 msgstr "Згортати BOINC менеджер в значок на панелі завдань під час запуску"
 
-#: clientgui/BOINCGUIApp.cpp:906
+#: BOINCGUIApp.cpp:576
 msgid "Directory containing the BOINC Client executable"
 msgstr "Каталог, що містить виконавчий файл клієнта BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:907
+#: BOINCGUIApp.cpp:577
 msgid "BOINC data directory"
 msgstr "Папка даних BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:909
+#: BOINCGUIApp.cpp:579
 msgid "Host name or IP address"
 msgstr "Назва або IP -адреса комп'ютера"
 
-#: clientgui/BOINCGUIApp.cpp:910
+#: BOINCGUIApp.cpp:580
 msgid "GUI RPC port number"
 msgstr "Номер порту GUI RPC"
 
-#: clientgui/BOINCGUIApp.cpp:911
+#: BOINCGUIApp.cpp:581
 msgid "Password"
 msgstr "Пароль"
 
-#: clientgui/BOINCGUIApp.cpp:912
+#: BOINCGUIApp.cpp:582
 msgid "Startup BOINC with these optional arguments"
 msgstr "Запускати BOINC з ключами запуску"
 
-#: clientgui/BOINCGUIApp.cpp:913
+#: BOINCGUIApp.cpp:583
 msgid "disable BOINC security users and permissions"
 msgstr "відключити політику безпеки доступу користувачів до BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:914
+#: BOINCGUIApp.cpp:584
 msgid "set skin debugging mode to enable skin manager error messages"
 msgstr "включити режим відлагодження для виводу повідомлень про помилки"
 
-#: clientgui/BOINCGUIApp.cpp:915
+#: BOINCGUIApp.cpp:585
 msgid "multiple instances of BOINC Manager allowed"
 msgstr "дозволено декілька екземплярів менеджера BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:917
+#: BOINCGUIApp.cpp:587
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr "Не використаний: зациклився через баг у XCode 4.2"
 
-#: clientgui/BOINCGUIApp.cpp:1164
+#: BOINCGUIApp.cpp:814
 msgid "(Automatic Detection)"
 msgstr "(Автовизначення)"
 
-#: clientgui/BOINCGUIApp.cpp:1165
+#: BOINCGUIApp.cpp:815
 msgid "(Unknown)"
 msgstr "(Невідомий)"
 
-#: clientgui/BOINCGUIApp.cpp:1166
+#: BOINCGUIApp.cpp:816
 msgid "(User Defined)"
 msgstr "(Користувацький)"
 
-#: clientgui/BOINCTaskBar.cpp:522
+#: BOINCTaskBar.cpp:508
 #, c-format
 msgid "Open %s Web..."
 msgstr "Відвідати веб-сторінку %s..."
 
-#: clientgui/BOINCTaskBar.cpp:529
+#: BOINCTaskBar.cpp:515
 #, c-format
 msgid "Open %s..."
 msgstr "Відкрити %s..."
 
-#: clientgui/BOINCTaskBar.cpp:536
-#: clientgui/BOINCTaskBar.cpp:633
-#: clientgui/BOINCTaskBar.cpp:641
+#: BOINCTaskBar.cpp:522 BOINCTaskBar.cpp:619 BOINCTaskBar.cpp:627
 msgid "Snooze"
 msgstr "Призупинити"
 
-#: clientgui/BOINCTaskBar.cpp:538
-#: clientgui/BOINCTaskBar.cpp:660
-#: clientgui/BOINCTaskBar.cpp:668
+#: BOINCTaskBar.cpp:524 BOINCTaskBar.cpp:646 BOINCTaskBar.cpp:654
 msgid "Snooze GPU"
 msgstr "Призупинити графічний процесор"
 
-#: clientgui/BOINCTaskBar.cpp:556
+#: BOINCTaskBar.cpp:542
 msgid "E&xit"
 msgstr "В&ихід"
 
-#: clientgui/BOINCTaskBar.cpp:626
+#: BOINCTaskBar.cpp:612 ViewProjects.cpp:718 ViewWork.cpp:795
+#: sg_BoincSimpleFrame.cpp:758 sg_ProjectCommandPopup.cpp:110
+#: sg_TaskCommandPopup.cpp:102
 msgid "Resume"
 msgstr "Відновити"
 
-#: clientgui/BOINCTaskBar.cpp:653
+#: BOINCTaskBar.cpp:639
 msgid "Resume GPU"
 msgstr "Відновити обробку графічним процесором"
 
-#: clientgui/BOINCTaskBar.cpp:727
+#: BOINCTaskBar.cpp:713
 msgid "Computing is enabled"
 msgstr "Обробка дозволена"
 
-#: clientgui/BOINCTaskBar.cpp:731
+#: BOINCTaskBar.cpp:717
 msgid "Computing is suspended - "
 msgstr "Обробка призупинена - "
 
-#: clientgui/BOINCTaskBar.cpp:741
+#: BOINCTaskBar.cpp:727
 msgid "GPU computing is enabled"
 msgstr "Обробка за допомогою графічного процесора дозволена"
 
-#: clientgui/BOINCTaskBar.cpp:744
+#: BOINCTaskBar.cpp:730
 msgid "GPU computing is suspended - "
 msgstr "Обробка за допомогою графічного процесора призупинена- "
 
-#: clientgui/BOINCTaskBar.cpp:753
+#: BOINCTaskBar.cpp:739
 msgid "Network is enabled"
 msgstr "Мережа доступна"
 
-#: clientgui/BOINCTaskBar.cpp:756
+#: BOINCTaskBar.cpp:742
 msgid "Network is suspended - "
 msgstr "Доступ до мережі заборонений- "
 
-#: clientgui/BOINCTaskBar.cpp:764
+#: BOINCTaskBar.cpp:750
 msgid "Reconnecting to client."
 msgstr "Повторне підключення до клієнта."
 
-#: clientgui/BOINCTaskBar.cpp:766
+#: BOINCTaskBar.cpp:752
 msgid "Not connected to a client."
 msgstr "Не підключений до клієнта."
 
-#: clientgui/BOINCTaskBar.cpp:819
+#: BOINCTaskBar.cpp:805
 #, c-format
 msgid "%s Notices"
 msgstr "Повідомлення %s"
 
-#: clientgui/BOINCTaskBar.cpp:825
+#: BOINCTaskBar.cpp:811
 msgid "There are new notices - click to view."
 msgstr "Є нові повідомлення - натисніть для перегляду."
 
-#: clientgui/CompletionErrorPage.cpp:199
+#: CompletionErrorPage.cpp:199
 msgid "Failed to add project"
 msgstr "Не вдалося додати проект"
 
-#: clientgui/CompletionErrorPage.cpp:204
+#: CompletionErrorPage.cpp:204
 msgid "Failed to update account manager"
 msgstr "Не вдалося оновити дані менеджера проектів"
 
-#: clientgui/CompletionErrorPage.cpp:208
+#: CompletionErrorPage.cpp:208
 msgid "Failed to remove account manager"
 msgstr "Не вдалося від’єднатися від менеджера проектів"
 
-#: clientgui/CompletionErrorPage.cpp:212
+#: CompletionErrorPage.cpp:212
 msgid "Failed to add account manager"
 msgstr "Не вдалося підключитися до менеджера проектів"
 
-#: clientgui/CompletionErrorPage.cpp:221
+#: CompletionErrorPage.cpp:221
 msgid ""
 "Please try again later.\n"
 "\n"
 "Click Finish to close."
-msgstr ""
-"Будь-ласка, спробуйте ще раз пізніше. \n"
-"\n"
-"Натисніть Готово, щоб закрити."
+msgstr "Будь-ласка, спробуйте ще раз пізніше. \n\nНатисніть Готово, щоб закрити."
 
-#: clientgui/CompletionErrorPage.cpp:225
-#: clientgui/CompletionPage.cpp:222
-#: clientgui/CompletionPage.cpp:242
-#: clientgui/CompletionPage.cpp:273
+#: CompletionErrorPage.cpp:225 CompletionPage.cpp:222 CompletionPage.cpp:242
+#: CompletionPage.cpp:273
 msgid "Click Finish to close."
 msgstr "Натисніть кнопку 'Готово' для виходу."
 
-#: clientgui/CompletionErrorPage.cpp:234
+#: CompletionErrorPage.cpp:234
 msgid "Messages from server:"
 msgstr "Повідомлення від сервера:"
 
-#: clientgui/CompletionPage.cpp:207
+#: CompletionPage.cpp:207
 msgid "Project added"
 msgstr "Проект доданий"
 
-#: clientgui/CompletionPage.cpp:213
+#: CompletionPage.cpp:213
 msgid "This project has been successfully added."
 msgstr "Цей проект був успішно доданий."
 
-#: clientgui/CompletionPage.cpp:218
+#: 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 ""
-"Після натиснення кнопки 'Готово', у вашому браузері автоматично відкриється сторінка, де\n"
-"Ви зможете вказати назву свого облікового запису і змінити його налаштування."
+msgstr "Після натиснення кнопки 'Готово', у вашому браузері автоматично відкриється сторінка, де\nВи зможете вказати назву свого облікового запису і змінити його налаштування."
 
-#: clientgui/CompletionPage.cpp:232
+#: CompletionPage.cpp:232
 #, c-format
 msgid "Update from %s completed."
 msgstr "Оновлення з %s завершене."
 
-#: clientgui/CompletionPage.cpp:236
+#: CompletionPage.cpp:236
 msgid "Update completed."
 msgstr "Оновлення завершене."
 
-#: clientgui/CompletionPage.cpp:247
+#: CompletionPage.cpp:247
 msgid "Now using account manager"
 msgstr "Зараз використовується менеджер проектів"
 
-#: clientgui/CompletionPage.cpp:252
+#: CompletionPage.cpp:252
 #, c-format
 msgid "Welcome to %s!"
 msgstr "Ласкаво просимо до %s!"
 
-#: clientgui/CompletionPage.cpp:263
+#: CompletionPage.cpp:263
 #, c-format
 msgid "You are now using %s to manage accounts."
 msgstr "Ви використовуєте %s для керування проектами."
 
-#: clientgui/CompletionPage.cpp:267
+#: CompletionPage.cpp:267
 msgid "You are now using this account manager."
 msgstr "Зараз Ви використовуєте цей менеджер проектів."
 
-#: clientgui/DlgAbout.cpp:113
+#: DlgAbout.cpp:113 mac/Mac_GUI.cpp:96
 #, c-format
 msgid "About %s"
 msgstr "Про %s"
 
-#: clientgui/DlgAbout.cpp:172
+#: DlgAbout.cpp:172
 msgid "Version:"
 msgstr "Версія:"
 
-#: clientgui/DlgAbout.cpp:180
+#: DlgAbout.cpp:180
 msgid "wxWidgets Version:"
 msgstr "Версія wxWidgets:"
 
-#: clientgui/DlgAbout.cpp:188
+#: DlgAbout.cpp:188
 msgid "Copyright:"
 msgstr "Авторське право:"
 
-# 98%
-#: clientgui/DlgAbout.cpp:192
+#: DlgAbout.cpp:192
 msgid ""
-"(C) 2003-2014 University of California, Berkeley.\n"
+"(C) 2003-2013 University of California, Berkeley.\n"
 "All Rights Reserved."
-msgstr ""
-"(C) 2003-2013 Каліфорнійський університет, Берклі.\n"
-"Усі права захищені."
+msgstr "(C) 2003-2013 Каліфорнійський університет, Берклі.\nУсі права захищені."
 
-#: clientgui/DlgAbout.cpp:196
+#: DlgAbout.cpp:196
 msgid "Berkeley Open Infrastructure for Network Computing"
 msgstr "Відкрита Інфраструктура для Розподілених Обчислень університету Берклі"
 
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:399
-#: clientgui/DlgSelectComputer.cpp:163
+#: DlgAbout.cpp:208 DlgExitMessage.cpp:173 DlgGenericMessage.cpp:120
+#: DlgOptions.cpp:396 DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "&Гаразд"
 
-#: clientgui/DlgAdvPreferences.cpp:602
+#: DlgAdvPreferences.cpp:544
 msgid "invalid number"
 msgstr "неправильний номер"
 
-#: clientgui/DlgAdvPreferences.cpp:603
+#: DlgAdvPreferences.cpp:545
 msgid "invalid time, format is HH:MM"
 msgstr "помилка вводу, формат часу ГГ:ХХ"
 
-#: clientgui/DlgAdvPreferences.cpp:604
+#: DlgAdvPreferences.cpp:546
 msgid "invalid time interval, format is HH:MM-HH:MM"
 msgstr "неправильно задано відрізок часу, правильний формат ГГ:ХХ-ГГ:ХХ"
 
-#: clientgui/DlgAdvPreferences.cpp:817
+#: DlgAdvPreferences.cpp:751
 msgid "invalid input value detected"
 msgstr "виявлене некоректне значення"
 
-#: clientgui/DlgAdvPreferences.cpp:819
+#: DlgAdvPreferences.cpp:753
 msgid "Validation Error"
 msgstr "Помилка перевірки"
 
-#: clientgui/DlgAdvPreferences.cpp:969
-#: clientgui/DlgAdvPreferences.cpp:975
-#: clientgui/DlgAdvPreferences.cpp:981
+#: DlgAdvPreferences.cpp:885 DlgAdvPreferences.cpp:891
+#: DlgAdvPreferences.cpp:897
 msgid "Applications to add"
 msgstr "Вибір додатків"
 
-#: clientgui/DlgAdvPreferences.cpp:998
+#: DlgAdvPreferences.cpp:914
 #, c-format
 msgid "'%s' is not an executable application."
 msgstr "'%s' не є виконуваним додатком."
 
-#: clientgui/DlgAdvPreferences.cpp:999
-#: clientgui/DlgAdvPreferences.cpp:1046
-#: clientgui/DlgAdvPreferences.cpp:1070
+#: DlgAdvPreferences.cpp:915 DlgAdvPreferences.cpp:962
+#: DlgAdvPreferences.cpp:986
 msgid "Add Exclusive App"
 msgstr "Додати виконуваний додаток"
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Name of application to add?"
 msgstr "Назва додатку, що додається?"
 
-#: clientgui/DlgAdvPreferences.cpp:1011
+#: DlgAdvPreferences.cpp:927
 msgid "Add exclusive app"
 msgstr "Додати винятковий додаток"
 
-#: clientgui/DlgAdvPreferences.cpp:1045
+#: DlgAdvPreferences.cpp:961
 #, c-format
 msgid "Application names must end with '%s'"
 msgstr "Назви додатків повинні закінчуватись на '%s'"
 
-#: clientgui/DlgAdvPreferences.cpp:1069
+#: DlgAdvPreferences.cpp:985
 #, c-format
 msgid "'%s' is already in the list."
 msgstr "'%s' вже у списку."
 
-#: clientgui/DlgAdvPreferences.cpp:1161
+#: DlgAdvPreferences.cpp:1077
 msgid ""
 "Do you really want to clear all local preferences?\n"
 "(This will not affect exclusive applications.)"
-msgstr ""
-"Ви справді хочете очистити вісі локальні налаштування?\n"
-"(Дія не вплине на виняткові додатки.)"
+msgstr "Ви справді хочете очистити вісі локальні налаштування?\n(Дія не вплине на виняткові додатки.)"
 
-#: clientgui/DlgAdvPreferences.cpp:1162
+#: DlgAdvPreferences.cpp:1078 sg_DlgPreferences.cpp:1030
 msgid "Confirmation"
 msgstr "Підтвердження"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:49
+#: DlgAdvPreferencesBase.cpp:46 sg_DlgPreferences.cpp:946
 #, c-format
-msgid "%s - Computing preferences"
-msgstr "%s - Налаштування обчислень"
+msgid "%s - Preferences"
+msgstr "%s - Налаштування"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:66
+#: DlgAdvPreferencesBase.cpp:62
 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 ""
-"Цей діалог контролює налаштування лише для даного ком’ютера.\n"
-"Натисніть 'Гаразд' для застосування налаштувань.\n"
-"Натисніть 'Очистити' для відновлення веб-налатувань (крім виняткових додатків)."
+msgstr "Цей діалог контролює налаштування лише для даного ком’ютера.\nНатисніть 'Гаразд' для застосування налаштувань.\nНатисніть 'Очистити' для відновлення веб-налатувань (крім виняткових додатків)."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:69
+#: DlgAdvPreferencesBase.cpp:65 sg_DlgPreferences.cpp:428
 msgid "Clear"
 msgstr "Очистити"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:70
+#: DlgAdvPreferencesBase.cpp:66
 msgid "clear all local preferences and close the dialog"
 msgstr "очистити всі локальні налаштування і закрити діалогове вікно"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:85
+#: DlgAdvPreferencesBase.cpp:81
 msgid "processor usage"
 msgstr "використання процесора"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:88
+#: DlgAdvPreferencesBase.cpp:84
 msgid "network usage"
 msgstr "використання мережі"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:91
+#: DlgAdvPreferencesBase.cpp:87
 msgid "disk and memory usage"
 msgstr "диск і використання пам'яті"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:94
+#: DlgAdvPreferencesBase.cpp:90
 msgid "exclusive applications"
 msgstr "виняткові додатки"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:107
-#: clientgui/DlgDiagnosticLogFlags.cpp:104
+#: DlgAdvPreferencesBase.cpp:102 sg_DlgPreferences.cpp:424
 msgid "OK"
 msgstr "Гаразд"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:108
+#: DlgAdvPreferencesBase.cpp:103
 msgid "save all values and close the dialog"
 msgstr "зберегти усі значення і закрити діалогове вікно"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:114
+#: DlgAdvPreferencesBase.cpp:108
 msgid "close the dialog without saving"
 msgstr "закрити діалогове вікно без збереження змін"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:118
-#: clientgui/Localization.cpp:35
-#: clientgui/Localization.cpp:121
-#: clientgui/Localization.cpp:139
+#: DlgAdvPreferencesBase.cpp:112 Localization.cpp:35 Localization.cpp:121
+#: Localization.cpp:139 sg_BoincSimpleFrame.cpp:794 sg_DlgPreferences.cpp:439
 msgid "Help"
 msgstr "Допомога"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
+#: DlgAdvPreferencesBase.cpp:113
 msgid "shows the preferences web page"
 msgstr "перейти на сторінку з описом налаштувань"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:141
+#: DlgAdvPreferencesBase.cpp:135
 msgid "Computing allowed"
 msgstr "Обчислення дозволені"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
+#: DlgAdvPreferencesBase.cpp:139
 msgid "While computer is on batteries"
 msgstr "При живленні від акумуляторів"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:149
-msgid "check this if you want this computer to do work while it runs on batteries"
+#: DlgAdvPreferencesBase.cpp:142
+msgid ""
+"check this if you want this computer to do work while it runs on batteries"
 msgstr "виберіть цей пункт, якщо хочете обробляти завдання коли комп'ютер живиться від акумуляторів"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:155
+#: DlgAdvPreferencesBase.cpp:148
 msgid "While computer is in use"
 msgstr "Коли комп'ютер використовується для роботи"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:158
-msgid "check this if you want this computer to do work even when you're using it"
+#: DlgAdvPreferencesBase.cpp:151
+msgid ""
+"check this if you want this computer to do work even when you're using it"
 msgstr "виберіть цей пункт, якщо хочете обробляти завдання коли комп'ютер використовується для роботи"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:164
+#: DlgAdvPreferencesBase.cpp:157
 msgid "Use GPU while computer is in use"
 msgstr "Використовувати графічний процесор при використанні комп’ютера для роботи"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:167
-msgid "check this if you want your GPU to do work even when you're using the computer"
+#: DlgAdvPreferencesBase.cpp:160
+msgid ""
+"check this if you want your GPU to do work even when you're using the "
+"computer"
 msgstr "виберіть цей пункт, якщо хочете обробляти завдання за допомогою графічного процесора під час використання комп’ютера для роботи"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:179
+#: DlgAdvPreferencesBase.cpp:172
 msgid "Only after computer has been idle for"
 msgstr "За відсутності активності користувачів більше"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:188
-msgid "do work only after you haven't used the computer for this number of minutes"
+#: DlgAdvPreferencesBase.cpp:182
+msgid ""
+"do work only after you haven't used the computer for this number of minutes"
 msgstr "через скільки хвилин відсутності активності на комп'ютері починати обробляти завдання"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:193
-#: clientgui/DlgAdvPreferencesBase.cpp:342
+#: DlgAdvPreferencesBase.cpp:187 DlgAdvPreferencesBase.cpp:336
+#: sg_DlgPreferences.cpp:417
 msgid "minutes"
 msgstr "хвилин"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:212
+#: DlgAdvPreferencesBase.cpp:206
 msgid "While processor usage is less than"
 msgstr "При використанні процесора менше"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:221
+#: DlgAdvPreferencesBase.cpp:216
 msgid "suspend work if processor usage exceeds this level"
 msgstr "зупинити обробку, якщо використання процесора перевищить цей рівень"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:226
+#: DlgAdvPreferencesBase.cpp:221
 msgid "percent (0 means no restriction)"
 msgstr "відсотків (0 - немає обмежень)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:240
-#: clientgui/DlgAdvPreferencesBase.cpp:506
+#: DlgAdvPreferencesBase.cpp:235 DlgAdvPreferencesBase.cpp:496
 msgid "Every day between hours of"
 msgstr "Щодня між годинами"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: DlgAdvPreferencesBase.cpp:239
 msgid "start work at this time"
 msgstr "запустити обробку в цей час"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:248
-#: clientgui/DlgAdvPreferencesBase.cpp:514
+#: DlgAdvPreferencesBase.cpp:243 DlgAdvPreferencesBase.cpp:504
+#: sg_DlgPreferences.cpp:326 sg_DlgPreferences.cpp:348
 msgid "and"
 msgstr "і"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:252
+#: DlgAdvPreferencesBase.cpp:247
 msgid "stop work at this time"
 msgstr "зупинити обробку в цей час"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
-#: clientgui/DlgAdvPreferencesBase.cpp:522
+#: DlgAdvPreferencesBase.cpp:251 DlgAdvPreferencesBase.cpp:512
 msgid "(no restriction if equal)"
 msgstr "(обмеження не діє при рівності значень)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:261
-#: clientgui/DlgAdvPreferencesBase.cpp:527
+#: DlgAdvPreferencesBase.cpp:256 DlgAdvPreferencesBase.cpp:517
 msgid "Day-of-week override:"
 msgstr "За розкладом:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:266
-#: clientgui/DlgAdvPreferencesBase.cpp:532
+#: DlgAdvPreferencesBase.cpp:261 DlgAdvPreferencesBase.cpp:522
 msgid "check box to specify hours for this day of week"
 msgstr "виберіть день тижня і вкажіть часовий інтервал"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:272
-#: clientgui/DlgAdvPreferencesBase.cpp:538
+#: DlgAdvPreferencesBase.cpp:267 DlgAdvPreferencesBase.cpp:528
 msgid "Monday"
 msgstr "Понеділок"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:279
-#: clientgui/DlgAdvPreferencesBase.cpp:545
+#: DlgAdvPreferencesBase.cpp:274 DlgAdvPreferencesBase.cpp:535
 msgid "Tuesday"
 msgstr "Вівторок"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:286
-#: clientgui/DlgAdvPreferencesBase.cpp:552
+#: DlgAdvPreferencesBase.cpp:281 DlgAdvPreferencesBase.cpp:542
 msgid "Wednesday"
 msgstr "Середа"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:293
-#: clientgui/DlgAdvPreferencesBase.cpp:559
+#: DlgAdvPreferencesBase.cpp:288 DlgAdvPreferencesBase.cpp:549
 msgid "Thursday"
 msgstr "Четвер"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:300
-#: clientgui/DlgAdvPreferencesBase.cpp:566
+#: DlgAdvPreferencesBase.cpp:295 DlgAdvPreferencesBase.cpp:556
 msgid "Friday"
 msgstr "П'ятниця"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:307
-#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: DlgAdvPreferencesBase.cpp:302 DlgAdvPreferencesBase.cpp:563
 msgid "Saturday"
 msgstr "Субота"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:580
+#: DlgAdvPreferencesBase.cpp:309 DlgAdvPreferencesBase.cpp:570
 msgid "Sunday"
 msgstr "Неділя"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:328
+#: DlgAdvPreferencesBase.cpp:323
 msgid "Other options"
 msgstr "Інші параметри"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:336
+#: DlgAdvPreferencesBase.cpp:330
 msgid "Switch between applications every"
 msgstr "Перемикання між додатками кожні"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:345
+#: DlgAdvPreferencesBase.cpp:339
 msgid "On multiprocessor systems, use at most"
 msgstr "У багатопроцесорних системах використовувати щонайбільше"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
+#: DlgAdvPreferencesBase.cpp:346
 #, no-c-format
-msgid "% of the processors (0 means no restriction)"
-msgstr "% процесорів (0 означає відсутність обмежень)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:355
-#: clientgui/DlgAdvPreferencesBase.cpp:618
-#: clientgui/DlgAdvPreferencesBase.cpp:640
-#: clientgui/DlgAdvPreferencesBase.cpp:661
-#: clientgui/DlgAdvPreferencesBase.cpp:683
-#: clientgui/DlgAdvPreferencesBase.cpp:694
+msgid "% of the processors (0 means ignore this setting)"
+msgstr "% процесорів (0 означає ігнорування цього налаштування)"
+
+#: DlgAdvPreferencesBase.cpp:349 DlgAdvPreferencesBase.cpp:605
+#: DlgAdvPreferencesBase.cpp:627 DlgAdvPreferencesBase.cpp:648
+#: DlgAdvPreferencesBase.cpp:669 DlgAdvPreferencesBase.cpp:679
 msgid "Use at most"
 msgstr "Використовувати щонайбільше"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:362
+#: DlgAdvPreferencesBase.cpp:356
 #, no-c-format
-msgid "% of CPU time (0 means no restriction)"
-msgstr "% часу ЦП (0 означає відсутність обмежень)"
+msgid "% CPU time"
+msgstr "% часу процесора"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:386
+#: DlgAdvPreferencesBase.cpp:378
 msgid "General options"
 msgstr "Загальні параметри"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:395
+#: DlgAdvPreferencesBase.cpp:386
 msgid "Maximum download rate"
 msgstr "Максимальна швидкість завантаження"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:401
-#: clientgui/DlgAdvPreferencesBase.cpp:410
-msgid "KBytes/second (0 means no restriction)"
-msgstr "Кбайт/с (0 означає відсутність обмежень)"
+#: DlgAdvPreferencesBase.cpp:392 DlgAdvPreferencesBase.cpp:401
+msgid "KBytes/sec."
+msgstr "КБайт/с."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:404
+#: DlgAdvPreferencesBase.cpp:395
 msgid "Maximum upload rate"
 msgstr "Максимальна швидкість відвантаження"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:417
+#: DlgAdvPreferencesBase.cpp:406
+msgid "Transfer at most"
+msgstr "Передавати не більше"
+
+#: DlgAdvPreferencesBase.cpp:412
+msgid "Mbytes"
+msgstr "Мбайт"
+
+#: DlgAdvPreferencesBase.cpp:415
+msgid "every"
+msgstr "кожні"
+
+#: DlgAdvPreferencesBase.cpp:421 DlgAdvPreferencesBase.cpp:444
+#: DlgAdvPreferencesBase.cpp:463
+msgid "days"
+msgstr "днів"
+
+#: DlgAdvPreferencesBase.cpp:429
 msgid "Minimum work buffer"
 msgstr "Мінімальний робочий буфер"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:425
+#: DlgAdvPreferencesBase.cpp:438
 msgid "Try to maintain enough tasks to keep busy for this many days"
 msgstr "Намагатися підтримувати достатню кількість завдань для забезпечення роботи на всі ці дні"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:431
-#: clientgui/DlgAdvPreferencesBase.cpp:449
-msgid "days (maximum value: 10)"
-msgstr "днів (максимальне значення: 10)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:437
+#: DlgAdvPreferencesBase.cpp:450
 msgid "Max additional work buffer"
 msgstr "Максимальний додатковий робочий буфер"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:445
+#: DlgAdvPreferencesBase.cpp:459
 msgid "In addition, maintain enough tasks for up to this many days"
 msgstr "Додатково, підтримувати достатньо завдань для цих днів"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:454
-msgid "Transfer at most"
-msgstr "Передавати не більше"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:462
-msgid "MBytes every"
-msgstr "Мбайт кожні"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:468
-msgid "days (0 means no restriction)"
-msgstr "днів (0 означає відсутність обмежень)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:476
+#: DlgAdvPreferencesBase.cpp:466
 msgid "Skip image file verification"
 msgstr "Не перевіряти завантажувані файли"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:478
+#: DlgAdvPreferencesBase.cpp:468
 msgid "check this if your Internet provider modifies image files"
 msgstr "виберіть цей пункт, якщо Ваш інтернет провайдер змінює файли, що завантажуються"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:484
+#: DlgAdvPreferencesBase.cpp:476
 msgid "Connect options"
 msgstr "Параметри підключення"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:487
+#: DlgAdvPreferencesBase.cpp:478
 msgid "Confirm before connecting to internet"
 msgstr "Підтверджувати перед підключенням до Інтернету"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
+#: DlgAdvPreferencesBase.cpp:480
+msgid ""
+"if checked, a confirmation dialog will be displayed before trying to connect"
+" to the Internet"
 msgstr "якщо відмічено, перед початком підключення до Інтернету BOINC запитає дозволу"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:493
+#: DlgAdvPreferencesBase.cpp:484
 msgid "Disconnect when done"
 msgstr "Розірвати з'єднання після завершення"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:495
+#: DlgAdvPreferencesBase.cpp:486
 msgid ""
 "if checked, BOINC hangs up when network usage is done\n"
 "(only relevant for dialup-connection)"
-msgstr ""
-"якщо відмічено, після завершення мережевих передач BOINC розірве з’єднання\n"
-"(стосується лише dialup-з’єднання)"
+msgstr "якщо відмічено, після завершення мережевих передач BOINC розірве з’єднання\n(стосується лише dialup-з’єднання)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:501
+#: DlgAdvPreferencesBase.cpp:492
 msgid "Network usage allowed"
 msgstr "Дозволене використання мережі"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:510
+#: DlgAdvPreferencesBase.cpp:500
 msgid "network usage start hour"
 msgstr "дозволити використання мережі, починаючи з"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:518
+#: DlgAdvPreferencesBase.cpp:508
 msgid "network usage stop hour"
 msgstr "заборонити використання мережі, починаючи з"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:610
-#: clientgui/DlgItemProperties.cpp:257
+#: DlgAdvPreferencesBase.cpp:598 DlgItemProperties.cpp:231
 msgid "Disk usage"
 msgstr "Використання диска"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:622
+#: DlgAdvPreferencesBase.cpp:609
 msgid "the maximum disk space used by BOINC (in Gigabytes)"
 msgstr "максимальний дисковий простір для роботи BOINC (у гігабайтах)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:626
-msgid "Gigabytes disk space (0 means no restriction)"
-msgstr "Гігабайт дискового простору (0 означає відсутність обмежень)"
+#: DlgAdvPreferencesBase.cpp:613
+msgid "Gigabytes disk space"
+msgstr "Гігабайт місця на диску"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:629
+#: DlgAdvPreferencesBase.cpp:616
 msgid "Leave at least"
 msgstr "Залишати щонайменше"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:633
+#: DlgAdvPreferencesBase.cpp:620
 msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
 msgstr "мінімальний обсяг дискового простору, який повинен залишатися вільним (в гігабайтах)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:637
+#: DlgAdvPreferencesBase.cpp:624
 msgid "Gigabytes disk space free"
 msgstr "Гігабайт вільного місця на диску"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
+#: DlgAdvPreferencesBase.cpp:631
 msgid "BOINC uses at most this percentage of total disk space"
 msgstr "BOINC використовує щонайбільше цю частку загального дискового простору"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:649
+#: DlgAdvPreferencesBase.cpp:636
 #, no-c-format
 msgid "% of total disk space"
 msgstr "% від загального дискового простору"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:652
+#: DlgAdvPreferencesBase.cpp:639
 msgid "Tasks checkpoint to disk at most every"
 msgstr "Зберігати проміжні результати щонайбільше кожні"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
+#: DlgAdvPreferencesBase.cpp:645
 msgid "seconds"
 msgstr "секунд"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:668
+#: DlgAdvPreferencesBase.cpp:655
 #, no-c-format
 msgid "% of page file (swap space)"
 msgstr "% файлу підкачки"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:675
+#: DlgAdvPreferencesBase.cpp:662
 msgid "Memory usage"
 msgstr "Використання пам’яті"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
+#: DlgAdvPreferencesBase.cpp:676
 #, no-c-format
 msgid "% when computer is in use"
 msgstr "% коли комп'ютер використовується для роботи"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:701
+#: DlgAdvPreferencesBase.cpp:686
 #, no-c-format
 msgid "% when computer is idle"
 msgstr "% коли комп'ютер простоює"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:706
+#: DlgAdvPreferencesBase.cpp:691
 msgid "Leave applications in memory while suspended"
 msgstr "Залишати неактивні додатки в пам'яті"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:708
+#: DlgAdvPreferencesBase.cpp:693
 msgid "if checked, suspended work units are left in memory"
 msgstr "якщо відмічено, призупинені завдання залишатимуться у пам’яті"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:728
-msgid "Suspend processor and network usage when these applications are running:"
+#: DlgAdvPreferencesBase.cpp:713
+msgid ""
+"Suspend processor and network usage when these applications are running:"
 msgstr "Призупинити використання процесора і мережі, коли працюють дані додатки:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:738
+#: DlgAdvPreferencesBase.cpp:722
 msgid "Add..."
 msgstr "Додати..."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:739
+#: DlgAdvPreferencesBase.cpp:723
 msgid "Add an application to this list"
 msgstr "Додати додаток до списку"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:744
+#: DlgAdvPreferencesBase.cpp:728 ViewProjects.cpp:202
+#: sg_ProjectCommandPopup.cpp:85
 msgid "Remove"
 msgstr "Видалити"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:745
+#: DlgAdvPreferencesBase.cpp:729
 msgid "Remove an application from this list"
 msgstr "Видалити додаток зі списку"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:754
+#: DlgAdvPreferencesBase.cpp:738
 msgid "For advanced options, refer to "
 msgstr "Для розширених налаштувань, зверніться до "
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:65
-#, c-format
-msgid "%s Diagnostic Log Flags"
-msgstr "Діагностичні прапорці %s"
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:83
-msgid "These flags enable various types of diagnostic messages in the Event Log."
-msgstr "Ці прапорці включають різні типи діагностичних повідомлень в Перегляді подій."
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:105
-msgid "Save all values and close the dialog"
-msgstr "Зберегти всі значення і закрити вікно"
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:108
-msgid "Defaults"
-msgstr "За замовчуванням"
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:109
-msgid "Restore default settings"
-msgstr "Відновити параметри за замовчуванням"
-
-#: clientgui/DlgDiagnosticLogFlags.cpp:113
-msgid "Close the dialog without saving"
-msgstr "Закрити діалогове вікно без збереження змін"
-
-#: clientgui/DlgEventLog.cpp:226
+#: DlgEventLog.cpp:219
 #, c-format
 msgid "%s - Event Log"
 msgstr "% s - Перегляд подій"
 
-#: clientgui/DlgEventLog.cpp:236
+#: DlgEventLog.cpp:232 ViewMessages.cpp:117 ViewProjects.cpp:219
+#: ViewStatistics.cpp:435 ViewStatistics.cpp:2009 ViewTransfers.cpp:182
+#: ViewWork.cpp:232
 msgid "Project"
 msgstr "Проект"
 
-#: clientgui/DlgEventLog.cpp:237
+#: DlgEventLog.cpp:233 ViewMessages.cpp:118
 msgid "Time"
 msgstr "Час"
 
-#: clientgui/DlgEventLog.cpp:238
+#: DlgEventLog.cpp:234 ViewMessages.cpp:119
 msgid "Message"
 msgstr "Повідомлення"
 
-#: clientgui/DlgEventLog.cpp:300
-#: clientgui/DlgEventLog.cpp:364
+#: DlgEventLog.cpp:290 DlgEventLog.cpp:354
 msgid "&Show only this project"
 msgstr "&Показати тільки цей проект"
 
-#: clientgui/DlgEventLog.cpp:304
+#: DlgEventLog.cpp:294
 msgid "Copy &All"
 msgstr "Копіювати &все"
 
-#: clientgui/DlgEventLog.cpp:306
-#: clientgui/DlgEventLog.cpp:310
+#: DlgEventLog.cpp:296 DlgEventLog.cpp:300 ViewMessages.cpp:89
 msgid "Copy all the messages to the clipboard."
 msgstr "Копіювати всі повідомлення в буфер обміну."
 
-#: clientgui/DlgEventLog.cpp:315
+#: DlgEventLog.cpp:305
 msgid "Copy &Selected"
 msgstr "Копіювати &виділене"
 
-#: clientgui/DlgEventLog.cpp:318
-#: clientgui/DlgEventLog.cpp:326
-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."
+#: DlgEventLog.cpp:308 DlgEventLog.cpp:316 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 "Копіювати виділені повідомлення в буфер обміну. Ви можете вибрати декілька повідомлень, утримуючи SHIFT і CTRL для їх виділення."
 
-#: clientgui/DlgEventLog.cpp:320
-#: clientgui/DlgEventLog.cpp:328
-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."
+#: DlgEventLog.cpp:310 DlgEventLog.cpp:318 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 "Копіювати виділені повідомлення в буфер обміну. Можна використовувати клавіші SHIFT і CTRL для виділення декількох повідомлень."
 
-#: clientgui/DlgEventLog.cpp:335
-#: clientgui/DlgItemProperties.cpp:67
+#: DlgEventLog.cpp:325 DlgItemProperties.cpp:67
 msgid "&Close"
 msgstr "&Закрити"
 
-#: clientgui/DlgEventLog.cpp:344
+#: DlgEventLog.cpp:334 sg_BoincSimpleFrame.cpp:798 sg_DlgPreferences.cpp:442
 #, c-format
 msgid "Get help with %s"
 msgstr "Отримати довідку щодо %s"
 
-#: clientgui/DlgEventLog.cpp:358
+#: DlgEventLog.cpp:348
 msgid "Show all &messages"
 msgstr "Показати всі &повідомлення"
 
-#: clientgui/DlgEventLog.cpp:359
-#: clientgui/DlgEventLog.cpp:361
+#: DlgEventLog.cpp:349 DlgEventLog.cpp:351
 msgid "Show messages for all projects"
 msgstr "Показати повідомлення для всіх проектів"
 
-#: clientgui/DlgEventLog.cpp:365
-#: clientgui/DlgEventLog.cpp:367
+#: DlgEventLog.cpp:355 DlgEventLog.cpp:357
 msgid "Show only the messages for the selected project"
 msgstr "Показувати повідомлення тільки для обраного проекту"
 
-#: clientgui/DlgExitMessage.cpp:82
+#: DlgExitMessage.cpp:82
 #, c-format
 msgid "%s - Exit Confirmation"
 msgstr "%s - Підтвердження виходу"
 
-#: clientgui/DlgExitMessage.cpp:130
+#: DlgExitMessage.cpp:130
 #, c-format
 msgid ""
 "You have requested to exit the %s,\n"
@@ -1698,15 +1550,9 @@ msgid ""
 "\n"
 "If you also want to stop running the tasks,\n"
 "choose from the following options:"
-msgstr ""
-"Ви намагаєтеся здійснити вихід з %s,\n"
-"який дозволяє Вам переглядати і керувати\n"
-"завданнями, що обробляються Вашим комп’ютером.\n"
-"\n"
-"Якщо хочете також зупинити обробку завдань,\n"
-"виберіть наступні параметри:"
+msgstr "Ви намагаєтеся здійснити вихід з %s,\nякий дозволяє Вам переглядати і керувати\nзавданнями, що обробляються Вашим комп’ютером.\n\nЯкщо хочете також зупинити обробку завдань,\nвиберіть наступні параметри:"
 
-#: clientgui/DlgExitMessage.cpp:135
+#: DlgExitMessage.cpp:135
 #, c-format
 msgid ""
 "This will shut down %s and its tasks until either the\n"
@@ -1715,1001 +1561,916 @@ msgid ""
 "In most cases, it is better just to close the %s window\n"
 "rather than to exit the application; that will allow %s to run its\n"
 "tasks at the times you selected in your preferences."
-msgstr ""
-"Завершення роботи %s. Обробка завдань буде зупинена\n"
-"до наступного запуску %s або екранної заставки %s.\n"
-"\n"
-"В більшості випадків краще просто закрити вікно %s.\n"
-"Тоді %s продовжить керувати обробкою завдань\n"
-"у відповідності до визначених Вами налаштувань."
+msgstr "Завершення роботи %s. Обробка завдань буде зупинена\nдо наступного запуску %s або екранної заставки %s.\n\nВ більшості випадків краще просто закрити вікно %s.\nТоді %s продовжить керувати обробкою завдань\nу відповідності до визначених Вами налаштувань."
 
-#: clientgui/DlgExitMessage.cpp:153
+#: DlgExitMessage.cpp:153
 #, c-format
 msgid "Stop running tasks when exiting the %s"
 msgstr "Зупинити обробку завдань при закритті %s"
 
-#: clientgui/DlgExitMessage.cpp:165
+#: DlgExitMessage.cpp:165
 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
+#: DlgExitMessage.cpp:178 DlgGenericMessage.cpp:125 DlgOptions.cpp:401
+#: DlgSelectComputer.cpp:168 wizardex.cpp:378
 msgid "&Cancel"
 msgstr "&Скасувати"
 
-#: clientgui/DlgGenericMessage.cpp:112
+#: DlgGenericMessage.cpp:112
 msgid "Don't show this dialog again."
 msgstr "Більше не показувати цей діалог."
 
-#: clientgui/DlgItemProperties.cpp:194
-#: clientgui/DlgItemProperties.cpp:197
-#: clientgui/DlgItemProperties.cpp:200
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:168 DlgItemProperties.cpp:171
+#: DlgItemProperties.cpp:174 DlgItemProperties.cpp:177
 msgid "Don't fetch tasks for "
 msgstr "Не запитувати завдання для"
 
-#: clientgui/DlgItemProperties.cpp:194
+#: DlgItemProperties.cpp:168
 msgid "Project preference"
 msgstr "Налаштування проекту"
 
-#: clientgui/DlgItemProperties.cpp:197
+#: DlgItemProperties.cpp:171
 msgid "Account manager preference"
 msgstr "Налаштування менеджера проектів"
 
-#: clientgui/DlgItemProperties.cpp:200
+#: DlgItemProperties.cpp:174
 msgid "Project has no apps for "
 msgstr "У проекту немає додатків для "
 
-#: clientgui/DlgItemProperties.cpp:203
+#: DlgItemProperties.cpp:177
 msgid "Client configuration excludes "
 msgstr "Конфігурація клієнта виключає "
 
-#: clientgui/DlgItemProperties.cpp:207
+#: DlgItemProperties.cpp:181
 msgid " work fetch deferred for"
 msgstr "запит завдань  відкладений на"
 
-#: clientgui/DlgItemProperties.cpp:208
+#: DlgItemProperties.cpp:182
 msgid " work fetch deferral interval"
 msgstr " інтервал затримки запиту завдань"
 
-#: clientgui/DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:213
 msgid "Properties of project "
 msgstr "Властивості проекту "
 
-#: clientgui/DlgItemProperties.cpp:243
-#: clientgui/DlgOptions.cpp:221
+#: DlgItemProperties.cpp:217 DlgOptions.cpp:218
 msgid "General"
 msgstr "Загальні"
 
-#: clientgui/DlgItemProperties.cpp:244
+#: DlgItemProperties.cpp:218
 msgid "Master URL"
 msgstr "Адреса для підключення"
 
-#: clientgui/DlgItemProperties.cpp:245
+#: DlgItemProperties.cpp:219
 msgid "User name"
 msgstr "Ім'я користувача"
 
-#: clientgui/DlgItemProperties.cpp:246
+#: DlgItemProperties.cpp:220
 msgid "Team name"
 msgstr "Назва команди"
 
-#: clientgui/DlgItemProperties.cpp:247
+#: DlgItemProperties.cpp:221 ViewProjects.cpp:224
 msgid "Resource share"
 msgstr "Виділено ресурсів"
 
-#: clientgui/DlgItemProperties.cpp:249
+#: DlgItemProperties.cpp:223
 msgid "Scheduler RPC deferred for"
 msgstr "Запит до планувальника відкладений на"
 
-#: clientgui/DlgItemProperties.cpp:252
+#: DlgItemProperties.cpp:226
 msgid "File downloads deferred for"
 msgstr "Завантаження файлів відкладене на"
 
-#: clientgui/DlgItemProperties.cpp:255
+#: DlgItemProperties.cpp:229
 msgid "File uploads deferred for"
 msgstr "Відправлення файлів відкладене на"
 
-#: clientgui/DlgItemProperties.cpp:258
+#: DlgItemProperties.cpp:232
 msgid "Computer ID"
 msgstr "Ідентифікатор комп'ютера"
 
-#: clientgui/DlgItemProperties.cpp:260
+#: DlgItemProperties.cpp:234
 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
+#: DlgItemProperties.cpp:234 DlgItemProperties.cpp:236
+#: DlgItemProperties.cpp:237 DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:242 DlgItemProperties.cpp:251
+#: DlgItemProperties.cpp:254 DlgItemProperties.cpp:257
 msgid "yes"
 msgstr "Так"
 
-#: clientgui/DlgItemProperties.cpp:262
+#: DlgItemProperties.cpp:236
 msgid "Suspended via GUI"
 msgstr "Призупинено вручну"
 
-#: clientgui/DlgItemProperties.cpp:262
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:236 DlgItemProperties.cpp:237
 msgid "no"
 msgstr "ні"
 
-#: clientgui/DlgItemProperties.cpp:263
+#: DlgItemProperties.cpp:237
 msgid "Don't request more work"
 msgstr "Не запитувати завдання"
 
-#: clientgui/DlgItemProperties.cpp:265
+#: DlgItemProperties.cpp:239
 msgid "Scheduler call in progress"
 msgstr "Сеанс зв’язку з планувальником"
 
-#: clientgui/DlgItemProperties.cpp:268
+#: DlgItemProperties.cpp:242
 msgid "Trickle-up pending"
 msgstr "Очікування проміжного відправлення"
 
-#: clientgui/DlgItemProperties.cpp:271
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:245 DlgItemProperties.cpp:247
 msgid "Host location"
 msgstr "Розміщення комп’ютера"
 
-#: clientgui/DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:247
 msgid "default"
 msgstr "за замовчуванням"
 
-#: clientgui/DlgItemProperties.cpp:277
+#: DlgItemProperties.cpp:251
 msgid "Added via account manager"
 msgstr "Доданий менеджером проектів"
 
-#: clientgui/DlgItemProperties.cpp:280
+#: DlgItemProperties.cpp:254
 msgid "Remove when tasks done"
 msgstr "Буде видалений після завершення завдань"
 
-#: clientgui/DlgItemProperties.cpp:283
+#: DlgItemProperties.cpp:257
 msgid "Ended"
 msgstr "Завершений"
 
-#: clientgui/DlgItemProperties.cpp:285
-msgid "Tasks completed"
-msgstr "Завдання завершені"
-
-#: clientgui/DlgItemProperties.cpp:286
-msgid "Tasks failed"
-msgstr "Завдання з помилками"
-
-#: clientgui/DlgItemProperties.cpp:288
+#: DlgItemProperties.cpp:259
 msgid "Credit"
 msgstr "Бали"
 
-#: clientgui/DlgItemProperties.cpp:289
+#: DlgItemProperties.cpp:260
 msgid "User"
 msgstr "Користувач"
 
-#: clientgui/DlgItemProperties.cpp:296
+#: DlgItemProperties.cpp:267
 msgid "Host"
 msgstr "Комп`ютер (хост)"
 
-#: clientgui/DlgItemProperties.cpp:305
+#: DlgItemProperties.cpp:276
 msgid "Scheduling"
 msgstr "Планувальник"
 
-#: clientgui/DlgItemProperties.cpp:306
+#: DlgItemProperties.cpp:277
 msgid "Scheduling priority"
 msgstr "Пріоритет планувальника"
 
-#: clientgui/DlgItemProperties.cpp:307
+#: DlgItemProperties.cpp:278
 msgid "CPU"
 msgstr "процесор"
 
-#: clientgui/DlgItemProperties.cpp:331
+#: DlgItemProperties.cpp:302
 msgid "Duration correction factor"
 msgstr "Поправочний коефіцієнт тривалості"
 
-#: clientgui/DlgItemProperties.cpp:345
+#: DlgItemProperties.cpp:316
 msgid "Properties of task "
 msgstr "Інформація про завдання "
 
-#: clientgui/DlgItemProperties.cpp:357
+#: DlgItemProperties.cpp:328 ViewWork.cpp:238
 msgid "Application"
 msgstr "Додаток"
 
-#: clientgui/DlgItemProperties.cpp:358
+#: DlgItemProperties.cpp:329 ViewWork.cpp:239
 msgid "Name"
 msgstr "Назва"
 
-#: clientgui/DlgItemProperties.cpp:359
+#: DlgItemProperties.cpp:330
 msgid "State"
 msgstr "Стан"
 
-#: clientgui/DlgItemProperties.cpp:362
+#: DlgItemProperties.cpp:333
 msgid "Received"
 msgstr "Отримано"
 
-#: clientgui/DlgItemProperties.cpp:365
+#: DlgItemProperties.cpp:336
 msgid "Report deadline"
 msgstr "Відправити до"
 
-#: clientgui/DlgItemProperties.cpp:367
+#: DlgItemProperties.cpp:338
 msgid "Resources"
 msgstr "Виділено ресурсів"
 
-#: clientgui/DlgItemProperties.cpp:370
+#: DlgItemProperties.cpp:341
 msgid "Estimated computation size"
 msgstr "Очікуваний об’єм обчислень"
 
-#: clientgui/DlgItemProperties.cpp:373
+#: DlgItemProperties.cpp:344
 msgid "CPU time at last checkpoint"
 msgstr "Процесорний час в контрольній точці"
 
-#: clientgui/DlgItemProperties.cpp:374
-#: clientgui/DlgItemProperties.cpp:389
+#: DlgItemProperties.cpp:345 DlgItemProperties.cpp:360
 msgid "CPU time"
 msgstr "Процесорний час"
 
-#: clientgui/DlgItemProperties.cpp:376
-#: clientgui/DlgItemProperties.cpp:390
+#: DlgItemProperties.cpp:347 DlgItemProperties.cpp:361
 msgid "Elapsed time"
 msgstr "Витрачено часу"
 
-#: clientgui/DlgItemProperties.cpp:378
+#: DlgItemProperties.cpp:349
 msgid "Estimated time remaining"
 msgstr "Залишилось до завершення"
 
-#: clientgui/DlgItemProperties.cpp:379
+#: DlgItemProperties.cpp:350
 msgid "Fraction done"
 msgstr "Відсоток виконання"
 
-#: clientgui/DlgItemProperties.cpp:380
+#: DlgItemProperties.cpp:351
 msgid "Virtual memory size"
 msgstr "Обсяг віртуальної пам'яті"
 
-#: clientgui/DlgItemProperties.cpp:381
+#: DlgItemProperties.cpp:352
 msgid "Working set size"
 msgstr "Використання пам'яті"
 
-#: clientgui/DlgItemProperties.cpp:383
+#: DlgItemProperties.cpp:354
 msgid "Directory"
 msgstr "Папка"
 
-#: clientgui/DlgItemProperties.cpp:386
+#: DlgItemProperties.cpp:357
 msgid "Process ID"
 msgstr "ID процесу"
 
-#: clientgui/DlgItemProperties.cpp:456
+#: DlgItemProperties.cpp:427 ViewWork.cpp:1032 sg_TaskPanel.cpp:823
 msgid "Local: "
 msgstr "Локальний: "
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: DlgOptions.cpp:129 DlgOptions.cpp:135
 msgid "Options"
 msgstr "Налаштування"
 
-#: clientgui/DlgOptions.cpp:178
+#: DlgOptions.cpp:175
 msgid "Language:"
 msgstr "Мова:"
 
-#: clientgui/DlgOptions.cpp:185
+#: DlgOptions.cpp:182
 msgid "What language should BOINC use?"
 msgstr "Яку мову повинен використовувати BOINC?"
 
-#: clientgui/DlgOptions.cpp:189
+#: DlgOptions.cpp:186
 msgid "Notice reminder interval:"
 msgstr "Інтервал між нагадуваннями:"
 
-#: clientgui/DlgOptions.cpp:196
+#: DlgOptions.cpp:193
 msgid "How often should BOINC remind you of new notices?"
 msgstr "Як часто BOINC повинен нагадувати про нові повідомлення?"
 
-#: clientgui/DlgOptions.cpp:201
+#: DlgOptions.cpp:198
 msgid "Run Manager at login?"
 msgstr "Автозавантаження BOINC менеджера?"
 
-#: clientgui/DlgOptions.cpp:207
+#: DlgOptions.cpp:204
 msgid "Run the BOINC Manager when you log on."
 msgstr "Запускати BOINC менеджер при вході користувача на комп'ютер."
 
-#: clientgui/DlgOptions.cpp:212
+#: DlgOptions.cpp:209
 msgid "Enable Manager exit dialog?"
 msgstr "Підтвердження при виході з програми?"
 
-#: clientgui/DlgOptions.cpp:218
+#: DlgOptions.cpp:215
 msgid "Display the exit dialog when shutting down the Manager."
 msgstr "Запитувати перед виходом з програми BOINC менеджер."
 
-#: clientgui/DlgOptions.cpp:229
+#: DlgOptions.cpp:226
 msgid "Dial-up and Virtual Private Network settings"
 msgstr "Налаштування модемного з'єднання і VPN"
 
-#: clientgui/DlgOptions.cpp:243
+#: DlgOptions.cpp:240
 msgid "&Set Default"
 msgstr "&Підключення за замовчуванням"
 
-#: clientgui/DlgOptions.cpp:248
+#: DlgOptions.cpp:245
 msgid "&Clear Default"
 msgstr "&Немає підключення за замовчуванням"
 
-#: clientgui/DlgOptions.cpp:255
+#: DlgOptions.cpp:252
 msgid "Default Connection:"
 msgstr "Підключення за замовчуванням:"
 
-#: clientgui/DlgOptions.cpp:262
+#: DlgOptions.cpp:259
 msgid "Connections"
 msgstr "З'єднання"
 
-#: clientgui/DlgOptions.cpp:271
+#: DlgOptions.cpp:268
 msgid "Connect via HTTP proxy server"
 msgstr "З'єднуватися через HTTP проксі сервер"
 
-#: clientgui/DlgOptions.cpp:275
+#: DlgOptions.cpp:272
 msgid "HTTP Proxy Server Configuration"
 msgstr "Параметри HTTP проксі сервера"
 
-#: clientgui/DlgOptions.cpp:283
-#: clientgui/DlgOptions.cpp:347
+#: DlgOptions.cpp:280 DlgOptions.cpp:344
 msgid "Address:"
 msgstr "Адреса:"
 
-#: clientgui/DlgOptions.cpp:291
-#: clientgui/DlgOptions.cpp:355
+#: DlgOptions.cpp:288 DlgOptions.cpp:352 ProxyPage.cpp:340 ProxyPage.cpp:360
 msgid "Port:"
 msgstr "Порт:"
 
-#: clientgui/DlgOptions.cpp:299
-#: clientgui/DlgOptions.cpp:363
+#: DlgOptions.cpp:296 DlgOptions.cpp:360
 msgid "Don't use proxy for:"
 msgstr "Не використовувати проксі для:"
 
-#: clientgui/DlgOptions.cpp:306
-#: clientgui/DlgOptions.cpp:370
+#: DlgOptions.cpp:303 DlgOptions.cpp:367
 msgid "Leave these blank if not needed"
 msgstr "Залишити поля порожніми, якщо не використовуються"
 
-#: clientgui/DlgOptions.cpp:312
-#: clientgui/DlgOptions.cpp:376
+#: DlgOptions.cpp:309 DlgOptions.cpp:373 ProxyPage.cpp:343 ProxyPage.cpp:363
 msgid "User Name:"
 msgstr "Ім'я користувача:"
 
-#: clientgui/DlgOptions.cpp:320
-#: clientgui/DlgOptions.cpp:384
-#: clientgui/DlgSelectComputer.cpp:152
+#: DlgOptions.cpp:317 DlgOptions.cpp:381 DlgSelectComputer.cpp:152
+#: ProxyPage.cpp:346 ProxyPage.cpp:366
 msgid "Password:"
 msgstr "Пароль:"
 
-#: clientgui/DlgOptions.cpp:327
+#: DlgOptions.cpp:324
 msgid "HTTP Proxy"
 msgstr "HTTP проксі"
 
-#: clientgui/DlgOptions.cpp:335
+#: DlgOptions.cpp:332
 msgid "Connect via SOCKS proxy server"
 msgstr "З'єднуватися через SOCKS проксі сервер"
 
-#: clientgui/DlgOptions.cpp:339
+#: DlgOptions.cpp:336
 msgid "SOCKS Proxy Server Configuration"
 msgstr "Параметри SOCKS проксі сервера"
 
-#: clientgui/DlgOptions.cpp:391
+#: DlgOptions.cpp:388
 msgid "SOCKS Proxy"
 msgstr "SOCKS проксі"
 
-#: clientgui/DlgOptions.cpp:589
+#: DlgOptions.cpp:586
 msgid "always"
 msgstr "завжди"
 
-#: clientgui/DlgOptions.cpp:590
+#: DlgOptions.cpp:587
 msgid "1 hour"
 msgstr "1 година"
 
-#: clientgui/DlgOptions.cpp:591
+#: DlgOptions.cpp:588
 msgid "6 hours"
 msgstr "6 годин"
 
-#: clientgui/DlgOptions.cpp:592
+#: DlgOptions.cpp:589
 msgid "1 day"
 msgstr "1 день"
 
-#: clientgui/DlgOptions.cpp:593
+#: DlgOptions.cpp:590
 msgid "1 week"
 msgstr "1 тиждень"
 
-#: clientgui/DlgOptions.cpp:594
+#: DlgOptions.cpp:591
 msgid "never"
 msgstr "ніколи"
 
-#: clientgui/DlgOptions.cpp:691
+#: DlgOptions.cpp:688
 #, c-format
 msgid "%s - Language Selection"
 msgstr "%s - зміна мови"
 
-#: clientgui/DlgOptions.cpp:698
+#: DlgOptions.cpp:695
 #, 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 "Мову інтерфейсу програми %s було змінено, для вступу в силу змін потрібно перезапустити %s."
 
-#: clientgui/DlgSelectComputer.cpp:91
+#: DlgSelectComputer.cpp:91
 #, c-format
 msgid "%s - Select Computer"
 msgstr "%s - Вибір комп'ютера"
 
-#: clientgui/DlgSelectComputer.cpp:125
+#: DlgSelectComputer.cpp:125
 #, c-format
 msgid ""
 "Another instance of %s is already running \n"
 "on this computer.  Please select a client to monitor."
-msgstr ""
-"Інший примірник %s вже працює \n"
-"на даному комп'ютері.  Будь-ласка, виберіть клієнт для моніторингу."
+msgstr "Інший примірник %s вже працює \nна даному комп'ютері.  Будь-ласка, виберіть клієнт для моніторингу."
 
-#: clientgui/DlgSelectComputer.cpp:143
+#: DlgSelectComputer.cpp:143
 msgid "Host name:"
 msgstr "Назва хоста:"
 
-#: clientgui/Localization.cpp:31
-#: clientgui/Localization.cpp:69
+#: Localization.cpp:31 Localization.cpp:69
 msgid "Message boards"
 msgstr "Дошка повідомлень"
 
-#: clientgui/Localization.cpp:33
+#: Localization.cpp:33
 msgid "Correspond with other users on the SETI at home message boards"
 msgstr "Форум для спілкування з іншими користувачами проекту SETI at home"
 
-#: clientgui/Localization.cpp:37
+#: Localization.cpp:37
 msgid "Ask questions and report problems"
 msgstr "Задати питання і повідомити про проблеми"
 
-#: clientgui/Localization.cpp:39
-#: clientgui/Localization.cpp:81
-#: clientgui/Localization.cpp:111
-#: clientgui/Localization.cpp:129
+#: Localization.cpp:39 Localization.cpp:81 Localization.cpp:111
+#: Localization.cpp:129
 msgid "Your account"
 msgstr "Ваш обліковий запис"
 
-#: clientgui/Localization.cpp:41
-#: clientgui/Localization.cpp:87
-#: clientgui/Localization.cpp:113
+#: Localization.cpp:41 Localization.cpp:87 Localization.cpp:113
 msgid "View your account information and credit totals"
 msgstr "Перегляд інформації про Ваш обліковий запис і набрані бали"
 
-#: clientgui/Localization.cpp:43
+#: Localization.cpp:43
 msgid "Your preferences"
 msgstr "Ваші налаштування"
 
-#: clientgui/Localization.cpp:45
+#: Localization.cpp:45
 msgid "View and modify your SETI at home account profile and preferences"
 msgstr "Перегляд і зміна налаштувань Вашого облікового запису і Вашого профілю в проекті SETI at Home"
 
-#: clientgui/Localization.cpp:47
-#: clientgui/Localization.cpp:89
+#: Localization.cpp:47 Localization.cpp:89
 msgid "Your results"
 msgstr "Ваші результати"
 
-#: clientgui/Localization.cpp:49
-#: clientgui/Localization.cpp:91
+#: Localization.cpp:49 Localization.cpp:91
 msgid "View your last week (or more) of computational results and work"
 msgstr "Перегляд інформації про видані завдання (за останні кілька тижнів)"
 
-#: clientgui/Localization.cpp:51
-#: clientgui/Localization.cpp:93
+#: Localization.cpp:51 Localization.cpp:93
 msgid "Your computers"
 msgstr "Ваші комп'ютери"
 
-#: clientgui/Localization.cpp:53
+#: Localization.cpp:53
 msgid "View a listing of all the computers on which you are running SETI at Home"
 msgstr "Перегляд інформації про Ваші комп'ютери,які беруть участь в обробці завдань проекту SETI at Home"
 
-#: clientgui/Localization.cpp:55
-#: clientgui/Localization.cpp:97
+#: Localization.cpp:55 Localization.cpp:97
 msgid "Your team"
 msgstr "Ваша команда"
 
-#: clientgui/Localization.cpp:57
-#: clientgui/Localization.cpp:99
+#: Localization.cpp:57 Localization.cpp:99
 msgid "View information about your team"
 msgstr "Перегляд інформації про Вашу команду"
 
-#: clientgui/Localization.cpp:61
+#: Localization.cpp:61
 msgid "Common questions"
 msgstr "Часті запитання"
 
-#: clientgui/Localization.cpp:63
+#: Localization.cpp:63
 msgid "Read the Einstein at Home Frequently Asked Question list"
 msgstr "Часті запитання з проекту Einstein at Home"
 
-#: clientgui/Localization.cpp:65
+#: Localization.cpp:65
 msgid "Screensaver info"
 msgstr "Інформація про екранну заставку"
 
-#: clientgui/Localization.cpp:67
+#: Localization.cpp:67
 msgid "Read a detailed description of the Einstein at Home screensaver"
 msgstr "Детальний опис екранної заставки проекту Einstein at Home"
 
-#: clientgui/Localization.cpp:71
-msgid "Correspond with admins and other users on the Einstein at Home message boards"
+#: Localization.cpp:71
+msgid ""
+"Correspond with admins and other users on the Einstein at Home message boards"
 msgstr "Форум для спілкування з розробниками та іншими учасниками проекту Einstein at Home"
 
-#: clientgui/Localization.cpp:73
+#: Localization.cpp:73
 msgid "Einstein status"
 msgstr "Стан серверів проекту Einstein at Home"
 
-#: clientgui/Localization.cpp:75
+#: Localization.cpp:75
 msgid "Current status of the Einstein at Home server"
 msgstr "Інформація про поточний стан серверів проекту Einstein at Home"
 
-#: clientgui/Localization.cpp:77
+#: Localization.cpp:77
 msgid "Report problems"
 msgstr "Повідомлення про проблеми"
 
-#: clientgui/Localization.cpp:79
+#: Localization.cpp:79
 msgid "A link to the Einstein at Home problems and bug reports message board"
 msgstr "Форум для обговорення проблем і помилок у роботі програм проекту Einstein at Home"
 
-#: clientgui/Localization.cpp:83
+#: Localization.cpp:83
 msgid "View and modify your Einstein at Home account profile and preferences"
 msgstr "Перегляд і зміна налаштувань Вашого облікового запису і Вашого профілю в проекті Einstein at Home"
 
-#: clientgui/Localization.cpp:85
+#: Localization.cpp:85
 msgid "Account summary"
 msgstr "Обліковий запис (інформація)"
 
-#: clientgui/Localization.cpp:95
-msgid "View a listing of all the computers on which you are running Einstein at Home"
+#: Localization.cpp:95
+msgid ""
+"View a listing of all the computers on which you are running Einstein at Home"
 msgstr "Перегляд інформації про Ваші комп'ютери,які беруть участь в обробці завдань проекту Einstein at Home"
 
-#: clientgui/Localization.cpp:101
+#: Localization.cpp:101
 msgid "LIGO project"
 msgstr "Проект LIGO"
 
-#: clientgui/Localization.cpp:103
-msgid "The home page of the Laser Interferometer Gravitational-wave Observatory (LIGO) project"
+#: Localization.cpp:103
+msgid ""
+"The home page of the Laser Interferometer Gravitational-wave Observatory "
+"(LIGO) project"
 msgstr "Домашня сторінка проекту LIGO (лазерний інтерферометр обсерваторії гравітаційних хвиль)"
 
-#: clientgui/Localization.cpp:105
+#: Localization.cpp:105
 msgid "GEO-600 project"
 msgstr "Проект GEO-600"
 
-#: clientgui/Localization.cpp:107
+#: Localization.cpp:107
 msgid "The home page of the GEO-600 project"
 msgstr "Домашня сторінка проекту GEO-600"
 
-#: clientgui/Localization.cpp:115
-#: clientgui/Localization.cpp:133
+#: Localization.cpp:115 Localization.cpp:133 ViewProjects.cpp:221
+#: ViewStatistics.cpp:465
 msgid "Team"
 msgstr "Команда"
 
-#: clientgui/Localization.cpp:117
+#: Localization.cpp:117
 msgid "Info about your Team"
 msgstr "Інформація про Вашу команду"
 
-#: clientgui/Localization.cpp:123
+#: Localization.cpp:123
 msgid "Get help for climateprediction.net"
 msgstr "Отримати допомогу з проектом climateprediction.net"
 
-#: clientgui/Localization.cpp:125
+#: Localization.cpp:125
 msgid "News"
 msgstr "Новини"
 
-#: clientgui/Localization.cpp:127
+#: Localization.cpp:127
 msgid "climateprediction.net News"
 msgstr "Новини проекту climateprediction.net"
 
-#: clientgui/Localization.cpp:131
+#: Localization.cpp:131
 msgid "View your account information, credits, and trickles"
 msgstr "Перегляд інформації про обліковий запис і отримані бали"
 
-#: clientgui/Localization.cpp:135
+#: Localization.cpp:135
 msgid "Info about your team"
 msgstr "Інформація про Вашу команду"
 
-#: clientgui/Localization.cpp:141
+#: Localization.cpp:141
 msgid "Search for help in our help system"
 msgstr "Пошук допомоги в довідці"
 
-#: clientgui/Localization.cpp:143
+#: Localization.cpp:143
 msgid "Global Statistics"
 msgstr "Загальна статистика"
 
-#: clientgui/Localization.cpp:145
+#: Localization.cpp:145
 msgid "Summary statistics for World Community Grid"
 msgstr "Сумарна статистика для World Community Grid"
 
-#: clientgui/Localization.cpp:147
+#: Localization.cpp:147
 msgid "My Grid"
 msgstr "Мій обліковий запис в Grid"
 
-#: clientgui/Localization.cpp:149
+#: Localization.cpp:149
 msgid "Your statistics and settings"
 msgstr "Ваші статистика та налаштування"
 
-#: clientgui/Localization.cpp:151
+#: Localization.cpp:151
 msgid "Device Profiles"
 msgstr "Налаштування коип’ютера"
 
-#: clientgui/Localization.cpp:153
+#: Localization.cpp:153
 msgid "Update your device settings"
 msgstr "Оновлення налаштувань Ваших комп’ютерів"
 
-#: clientgui/Localization.cpp:155
+#: Localization.cpp:155
 msgid "Research"
 msgstr "Дослідження"
 
-#: clientgui/Localization.cpp:157
+#: Localization.cpp:157
 msgid "Learn about the projects hosted at World Community Grid"
 msgstr "Дізнайтеся про проекти, запущені в рамках World Community Grid"
 
-#: clientgui/MainDocument.cpp:583
+#: MainDocument.cpp:583
 msgid "Starting client"
 msgstr "Запуск клієнта"
 
-#: clientgui/MainDocument.cpp:591
+#: MainDocument.cpp:591
 msgid "Connecting to client"
 msgstr "Підключення до клієнта"
 
-#: clientgui/MainDocument.cpp:1205
+#: MainDocument.cpp:1195
 msgid "Retrieving system state; please wait..."
 msgstr "Оновлюється інформація про стан системи; зачекайте будь-ласка..."
 
-#: clientgui/MainDocument.cpp:1826
+#: MainDocument.cpp:1816
 msgid "Missing application"
 msgstr "Відсутній додаток"
 
-#: clientgui/MainDocument.cpp:1827
-msgid "Please download and install the CoRD application from http://cord.sourceforge.net"
+#: MainDocument.cpp:1817
+msgid ""
+"Please download and install the CoRD application from "
+"http://cord.sourceforge.net"
 msgstr "Будь-ласка, завантажте і встановіть додаток CoRD із сайту http://cord.sourceforge.net"
 
-#: clientgui/MainDocument.cpp:2442
+#: MainDocument.cpp:2432
 msgid "on batteries"
 msgstr "живлення від акумуляторів"
 
-#: clientgui/MainDocument.cpp:2443
+#: MainDocument.cpp:2433
 msgid "computer is in use"
 msgstr "комп'ютер використовується для роботи"
 
-#: clientgui/MainDocument.cpp:2444
+#: MainDocument.cpp:2434
 msgid "user request"
 msgstr "запит користувача"
 
-#: clientgui/MainDocument.cpp:2445
+#: MainDocument.cpp:2435
 msgid "time of day"
 msgstr "в залежності від часу доби"
 
-#: clientgui/MainDocument.cpp:2446
+#: MainDocument.cpp:2436
 msgid "CPU benchmarks in progress"
 msgstr "запущений тест продуктивності процесора"
 
-#: clientgui/MainDocument.cpp:2447
+#: MainDocument.cpp:2437
 msgid "need disk space - check preferences"
 msgstr "необхідний дисковий простір - перевірте налаштування"
 
-#: clientgui/MainDocument.cpp:2448
+#: MainDocument.cpp:2438
 msgid "computer is not in use"
 msgstr "комп'ютер не використовується для роботи"
 
-#: clientgui/MainDocument.cpp:2449
+#: MainDocument.cpp:2439
 msgid "starting up"
 msgstr "запуск"
 
-#: clientgui/MainDocument.cpp:2450
+#: MainDocument.cpp:2440
 msgid "an exclusive app is running"
 msgstr "обробляється винятковий додаток"
 
-#: clientgui/MainDocument.cpp:2451
+#: MainDocument.cpp:2441
 msgid "CPU is busy"
 msgstr "Процесор зайнятий"
 
-#: clientgui/MainDocument.cpp:2452
+#: MainDocument.cpp:2442
 msgid "network bandwidth limit exceeded"
 msgstr "перевищений ліміт використання мережі"
 
-#: clientgui/MainDocument.cpp:2453
+#: MainDocument.cpp:2443
 msgid "requested by operating system"
 msgstr "запитаний операційною системою"
 
-#: clientgui/MainDocument.cpp:2455
+#: MainDocument.cpp:2445
 msgid "unknown reason"
 msgstr "невідома причина"
 
-#: clientgui/MainDocument.cpp:2477
+#: MainDocument.cpp:2467
 msgid "GPU missing, "
 msgstr "Відсутній графічний процесор, "
 
-#: clientgui/MainDocument.cpp:2484
+#: MainDocument.cpp:2474
 msgid "New"
 msgstr "Новий"
 
-#: clientgui/MainDocument.cpp:2488
+#: MainDocument.cpp:2478
 msgid "Download failed"
 msgstr "Помилка завантаження"
 
-#: clientgui/MainDocument.cpp:2490
+#: MainDocument.cpp:2480
 msgid "Downloading"
 msgstr "Завантаження"
 
-#: clientgui/MainDocument.cpp:2492
-#: clientgui/MainDocument.cpp:2557
+#: MainDocument.cpp:2482 MainDocument.cpp:2552
 msgid " (suspended - "
 msgstr " (призупинено - "
 
-#: clientgui/MainDocument.cpp:2500
+#: MainDocument.cpp:2490
 msgid "Project suspended by user"
 msgstr "Проект призупинений користувачем"
 
-#: clientgui/MainDocument.cpp:2502
+#: MainDocument.cpp:2492
 msgid "Task suspended by user"
 msgstr "Обробка завдання призупинена користувачем"
 
-#: clientgui/MainDocument.cpp:2504
+#: MainDocument.cpp:2494
 msgid "Suspended - "
 msgstr "Призупинено - "
 
-# 75%
-#: clientgui/MainDocument.cpp:2510
+#: MainDocument.cpp:2500
 msgid "GPU suspended - "
 msgstr "графічний процесор призупинено- "
 
-#: clientgui/MainDocument.cpp:2517
+#: MainDocument.cpp:2507
 msgid "Waiting for memory"
 msgstr "В очікуванні звільнення оперативної пам'яті"
 
-#: clientgui/MainDocument.cpp:2519
+#: MainDocument.cpp:2509
 msgid "Waiting for shared memory"
 msgstr "В очікуванні звільнення колективної оперативної пам`яті"
 
-#: clientgui/MainDocument.cpp:2521
+#: MainDocument.cpp:2512
+msgid "Running, high priority"
+msgstr "Працює, високий пріоритет"
+
+#: MainDocument.cpp:2514
 msgid "Running"
 msgstr "Працює"
 
-#: clientgui/MainDocument.cpp:2523
+#: MainDocument.cpp:2517
 msgid " (non-CPU-intensive)"
 msgstr " (без використання процесора)"
 
-#: clientgui/MainDocument.cpp:2526
+#: MainDocument.cpp:2520
 msgid "Waiting to run"
 msgstr "В очікуванні обробки"
 
-#: clientgui/MainDocument.cpp:2528
-#: clientgui/MainDocument.cpp:2534
+#: MainDocument.cpp:2522 MainDocument.cpp:2528
 msgid "Ready to start"
 msgstr "Готово до запуску"
 
-#: clientgui/MainDocument.cpp:2538
-msgid "Postponed: "
-msgstr "Відкладено: "
+#: MainDocument.cpp:2532
+msgid " (Scheduler wait: "
+msgstr " (Планувальник очікує: "
 
-#: clientgui/MainDocument.cpp:2541
-msgid "Postponed"
-msgstr "Відкладено"
+#: MainDocument.cpp:2536
+msgid " (Scheduler wait)"
+msgstr " (Планувальник очікує)"
 
-#: clientgui/MainDocument.cpp:2545
-msgid "Waiting for network access"
-msgstr "Очікування доступу до мережі"
+#: MainDocument.cpp:2540
+msgid " (Waiting for network access)"
+msgstr " (Очікування доступу до мережі)"
 
-#: clientgui/MainDocument.cpp:2549
+#: MainDocument.cpp:2544
 msgid "Computation error"
 msgstr "Помилка обчислень"
 
-#: clientgui/MainDocument.cpp:2553
+#: MainDocument.cpp:2548
 msgid "Upload failed"
 msgstr "Збій при відправленні даних"
 
-#: clientgui/MainDocument.cpp:2555
+#: MainDocument.cpp:2550
 msgid "Uploading"
 msgstr "Відправлення даних"
 
-#: clientgui/MainDocument.cpp:2566
+#: MainDocument.cpp:2561
 msgid "Aborted by user"
 msgstr "Перервано користувачем"
 
-#: clientgui/MainDocument.cpp:2569
+#: MainDocument.cpp:2564
 msgid "Aborted by project"
 msgstr "Перервано проектом"
 
-#: clientgui/MainDocument.cpp:2572
+#: MainDocument.cpp:2567
 msgid "Aborted: not started by deadline"
 msgstr "Перервано: не було запущене до крайнього терміну"
 
-#: clientgui/MainDocument.cpp:2575
+#: MainDocument.cpp:2570
 msgid "Aborted: disk limit exceeded"
 msgstr "Перервано: перевищено виділений дисковий простір"
 
-#: clientgui/MainDocument.cpp:2578
+#: MainDocument.cpp:2573
 msgid "Aborted: run time limit exceeded"
 msgstr "Перервано: перевищено границю часу виконання"
 
-#: clientgui/MainDocument.cpp:2581
+#: MainDocument.cpp:2576
 msgid "Aborted: memory limit exceeded"
 msgstr "Перервано: перевищено кількість виділеної пам’яті"
 
-#: clientgui/MainDocument.cpp:2584
+#: MainDocument.cpp:2579
 msgid "Aborted"
 msgstr "Перервано"
 
-#: clientgui/MainDocument.cpp:2589
+#: MainDocument.cpp:2584
 msgid "Acknowledged"
 msgstr "Підтверджено"
 
-#: clientgui/MainDocument.cpp:2591
+#: MainDocument.cpp:2586
 msgid "Ready to report"
 msgstr "Очікується підтвердження про прийом даних"
 
-#: clientgui/MainDocument.cpp:2593
+#: MainDocument.cpp:2588
 #, c-format
 msgid "Error: invalid state '%d'"
 msgstr "Помилка: неприпустимий стан '%d'"
 
-#: clientgui/NoInternetConnectionPage.cpp:179
+#: NoInternetConnectionPage.cpp:179
 msgid "No Internet connection"
 msgstr "Відсутній зв`язок з Інтернетом"
 
-#: clientgui/NoInternetConnectionPage.cpp:182
+#: NoInternetConnectionPage.cpp:182
 msgid "Please connect to the Internet and try again."
 msgstr "Будь ласка, підключіться до Інтернету і повторіть спробу."
 
-#: clientgui/NotDetectedPage.cpp:181
+#: NotDetectedPage.cpp:181
 msgid "Project not found"
 msgstr "Проект не знайдено"
 
-#: clientgui/NotDetectedPage.cpp:184
+#: 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 ""
-"Зазначена адреса не є адресою проекту на базі BOINC.\n"
-"\n"
-"Будь-ласка, уточніть адресу і повторіть спробу."
+msgstr "Зазначена адреса не є адресою проекту на базі BOINC.\n\nБудь-ласка, уточніть адресу і повторіть спробу."
 
-#: clientgui/NotDetectedPage.cpp:188
+#: NotDetectedPage.cpp:188
 msgid "Account manager not found"
 msgstr "Менеджера проектів не знайдено"
 
-#: clientgui/NotDetectedPage.cpp:191
+#: NotDetectedPage.cpp:191
 msgid ""
 "The URL you supplied is not that of a BOINC-based account\n"
 "manager.\n"
 "\n"
 "Please check the URL and try again."
-msgstr ""
-"Зазначена адреса не є адресою менеджера проектів на базі BOINC.\n"
-"\n"
-"Будь-ласка, уточніть адресу і повторіть спробу."
+msgstr "Зазначена адреса не є адресою менеджера проектів на базі BOINC.\n\nБудь-ласка, уточніть адресу і повторіть спробу."
 
-#: clientgui/NotFoundPage.cpp:181
+#: NotFoundPage.cpp:181
 msgid "Login Failed."
 msgstr "Увійти не вдалося."
 
-#: clientgui/NotFoundPage.cpp:185
+#: NotFoundPage.cpp:185
 msgid "Check the username and password, and try again."
 msgstr "Перевірте ім'я користувача та пароль і спробуйте ще раз."
 
-#: clientgui/NotFoundPage.cpp:189
+#: NotFoundPage.cpp:189
 msgid "Check the email address and password, and try again."
 msgstr "Перевірте адресу електронної пошти та пароль і спробуйте ще раз."
 
-#: clientgui/NoticeListCtrl.cpp:229
+#: NoticeListCtrl.cpp:222
 msgid "more..."
 msgstr "більше..."
 
-#: clientgui/ProjectInfoPage.cpp:221
+#: ProjectInfoPage.cpp:477 ProjectInfoPage.cpp:778 ProjectInfoPage.cpp:782
+msgid "All"
+msgstr "Все"
+
+#: ProjectInfoPage.cpp:615
 msgid "Choose a project"
 msgstr "Вибір проекту"
 
-#: clientgui/ProjectInfoPage.cpp:228
+#: ProjectInfoPage.cpp:619
 msgid "To choose a project, click its name or type its URL below."
-msgstr ""
-"Оберіть проект, який Вам сподобався, натиснувши на його\n"
-"назву або введіть його адресу URL в полі ниже."
+msgstr "Оберіть проект, який Вам сподобався, натиснувши на його\nназву або введіть його адресу URL в полі ниже."
 
-#: clientgui/ProjectInfoPage.cpp:246
+#: ProjectInfoPage.cpp:623
 msgid "Categories:"
 msgstr "Категорії:"
 
-#: clientgui/ProjectInfoPage.cpp:267
+#: ProjectInfoPage.cpp:627 sg_ProjectPanel.cpp:89
 msgid "Projects:"
 msgstr "Проекти:"
 
-#: clientgui/ProjectInfoPage.cpp:279
+#: ProjectInfoPage.cpp:631
 msgid "Project details"
 msgstr "Опис проекту:"
 
-#: clientgui/ProjectInfoPage.cpp:291
+#: ProjectInfoPage.cpp:635
 msgid "Research area:"
 msgstr "Галузь науки:"
 
-#: clientgui/ProjectInfoPage.cpp:302
+#: ProjectInfoPage.cpp:639
 msgid "Organization:"
 msgstr "Організація:"
 
-#: clientgui/ProjectInfoPage.cpp:313
+#: ProjectInfoPage.cpp:643
 msgid "Web site:"
 msgstr "Веб-сайт:"
 
-#: clientgui/ProjectInfoPage.cpp:325
+#: ProjectInfoPage.cpp:647
 msgid "Supported systems:"
 msgstr "Платформи, що підтримуються:"
 
-#: clientgui/ProjectInfoPage.cpp:363
+#: ProjectInfoPage.cpp:651
 msgid "Project URL:"
 msgstr "URL-адреса проекту:"
 
-#: clientgui/ProjectInfoPage.cpp:499
-#: clientgui/ProjectInfoPage.cpp:754
-#: clientgui/ProjectInfoPage.cpp:758
-msgid "All"
-msgstr "Все"
-
-#: clientgui/ProjectInfoPage.cpp:802
-msgid "This project may not have work for your type of computer.  Do you want to add it anyway?"
+#: ProjectInfoPage.cpp:826
+msgid ""
+"This project may not have work for your type of computer.  Do you want to "
+"add it anyway?"
 msgstr "Ймовірно даний проект не підтримує тип Вашого комп’ютера або операційну систему.  Ви все таки хочете його додати?"
 
-#: clientgui/ProjectInfoPage.cpp:826
+#: ProjectInfoPage.cpp:850
 msgid "You already added this project. Please choose a different project."
 msgstr "Цей проект вже додано. Виберіть інший."
 
-#: clientgui/ProjectProcessingPage.cpp:321
+#: ProjectProcessingPage.cpp:321
 msgid "Communicating with project."
 msgstr "Встановлення зв’язку з проектом."
 
-#: clientgui/ProjectProcessingPage.cpp:510
+#: ProjectProcessingPage.cpp:509
 msgid "Required files not found on the server."
 msgstr "Необхідні файли на сервері не знайдено."
 
-#: clientgui/ProjectProcessingPage.cpp:513
-#: clientgui/ProjectProcessingPage.cpp:586
+#: ProjectProcessingPage.cpp:512 ProjectProcessingPage.cpp:574
 msgid "An internal server error has occurred."
 msgstr "Сталася внутрішня помилка сервера."
 
-#: clientgui/ProjectPropertiesPage.cpp:334
+#: ProjectPropertiesPage.cpp:334
 msgid ""
 "Communicating with project\n"
 "Please wait..."
-msgstr ""
-"Встановлюється зв’язок із сервером проекту\n"
-"Будь-ласка, зачекайте..."
-
-#: clientgui/ProjectWelcomePage.cpp:251
-#, c-format
-msgid "Welcome to %s."
-msgstr "Ласкаво просимо до %s."
-
-#: clientgui/ProjectWelcomePage.cpp:254
-msgid "You have volunteered to compute for this project:"
-msgstr "Ви добровільно приймаєте участь в обчисленнях для данного проекту:"
-
-#: clientgui/ProjectWelcomePage.cpp:255
-msgid "Name:"
-msgstr "Назва:"
-
-#: clientgui/ProjectWelcomePage.cpp:258
-msgid "Home:"
-msgstr "Домашня:"
+msgstr "Встановлюється зв’язок із сервером проекту\nБудь-ласка, зачекайте..."
 
-#: clientgui/ProjectWelcomePage.cpp:262
-msgid "Description:"
-msgstr "Опис:"
-
-#: clientgui/ProjectWelcomePage.cpp:265
-msgid "URL:"
-msgstr "Посилання (URL):"
-
-#: clientgui/ProjectWelcomePage.cpp:268
-msgid "User:"
-msgstr "Користувач:"
-
-#: clientgui/ProjectWelcomePage.cpp:273
-msgid "WARNING: This project is not registered with BOINC.  Make sure you trust it before continuing."
-msgstr "УВАГА: Цей проект не зареєстрований в BOINC.  Перед тим як продовжити, переконайтесь, що Ви довіряєте йому."
-
-#: clientgui/ProjectWelcomePage.cpp:277
-msgid "To continue, click Next."
-msgstr "Для продовження, натисніть кнопку \"Далі\"."
-
-#: clientgui/ProxyInfoPage.cpp:195
+#: ProxyInfoPage.cpp:195
 msgid "Network communication failure"
 msgstr "Невдача при встановленні з’єднання"
 
-#: clientgui/ProxyInfoPage.cpp:199
+#: ProxyInfoPage.cpp:199
 msgid ""
 "The World Community Grid - BOINC software failed to communicate\n"
 "over the Internet. The most likely reasons are:\n"
@@ -2724,22 +2485,9 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"World Community Grid - BOINC не може підключитися до Інтернету.\n"
-"Можливі причини:\n"
-"1) Проблеми з’єднання.  Перевірте модем або параметри\n"
-"підключення до мережі і коли зв’язок з Інтернетом буде\n"
-"встановлено натисніть '< Назад' і повторіть спробу.\n"
-"\n"
-"2) Ваш брандмауер блокує вихід BOINC в Інтернет.\n"
-"Додайте в налаштуваннях Вашого брандмауера дозвіл\n"
-"на доступ BOINC до Інтернету через порт 80 і 443.\n"
-"Після цього натисніть '< Назад' і повторіть спробу.\n"
-"\n"
-"3) Ви використовуєте проксі сервер для виходу в Інтернет,\n"
-"а BOINC не знає про це."
+msgstr "World Community Grid - BOINC не може підключитися до Інтернету.\nМожливі причини:\n1) Проблеми з’єднання.  Перевірте модем або параметри\nпідключення до мережі і коли зв’язок з Інтернетом буде\nвстановлено натисніть '< Назад' і повторіть спробу.\n\n2) Ваш брандмауер блокує вихід BOINC в Інтернет.\nДодайте в налаштуваннях Вашого брандмауера дозвіл\nна доступ BOINC до Інтернету через порт 80 і 443.\nПісля цього натисніть '< Назад' і повторіть спробу.\n\n3) Ви використовуєте проксі  [...]
 
-#: clientgui/ProxyInfoPage.cpp:203
+#: ProxyInfoPage.cpp:203
 msgid ""
 "BOINC failed to communicate on the Internet.\n"
 "The most likely reasons are:\n"
@@ -2754,1670 +2502,1201 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"BOINC не може підключитися до Інтернету.\n"
-"Можливі причини:\n"
-"1) Проблеми з’єднання.  Перевірте модем або параметри\n"
-"підключення до мережі і коли зв’язок з Інтернетом буде\n"
-"встановлено натисніть '< Назад' і повторіть спробу.\n"
-"\n"
-"2) Ваш брандмауер блокує вихід BOINC в Інтернет.\n"
-"Додайте в налаштуваннях Вашого брандмауера дозвіл\n"
-"на доступ BOINC до Інтернету через порт 80.\n"
-"Після цього натисніть '< Назад' і повторіть спробу.\n"
-"\n"
-"3) Ви використовуєте проксі сервер для виходу в Інтернет,\n"
-"а BOINC не знає про це."
+msgstr "BOINC не може підключитися до Інтернету.\nМожливі причини:\n1) Проблеми з’єднання.  Перевірте модем або параметри\nпідключення до мережі і коли зв’язок з Інтернетом буде\nвстановлено натисніть '< Назад' і повторіть спробу.\n\n2) Ваш брандмауер блокує вихід BOINC в Інтернет.\nДодайте в налаштуваннях Вашого брандмауера дозвіл\nна доступ BOINC до Інтернету через порт 80.\nПісля цього натисніть '< Назад' і повторіть спробу.\n\n3) Ви використовуєте проксі сервер для виходу в Інтернет, [...]
 
-#: clientgui/ProxyPage.cpp:331
+#: ProxyPage.cpp:331
 msgid "Proxy configuration"
 msgstr "Параметри проксі сервера"
 
-#: clientgui/ProxyPage.cpp:334
+#: ProxyPage.cpp:334
 msgid "HTTP proxy"
 msgstr "HTTP проксі"
 
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
+#: ProxyPage.cpp:337 ProxyPage.cpp:357
 msgid "Server:"
 msgstr "Сервер:"
 
-#: clientgui/ProxyPage.cpp:350
+#: ProxyPage.cpp:350
 msgid "Autodetect"
 msgstr "Автовизначення"
 
-#: clientgui/ProxyPage.cpp:354
+#: ProxyPage.cpp:354
 msgid "SOCKS proxy"
 msgstr "SOCKS проксі"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:167
-msgid "Advanced View...\tCtrl+Shift+A"
-msgstr "Розширений вид...\t Ctrl+Shift+A"
+#: TermsOfUsePage.cpp:218
+msgid "Terms of Use"
+msgstr "Умови використання"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:168
-msgid "Display the advanced graphical interface."
-msgstr "Змінити зовнішній вигляд на більш розширений."
+#: TermsOfUsePage.cpp:222
+msgid "Please read the following terms of use:"
+msgstr "Будь ласка, ознайомтеся з наступними умовами використання:"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:175
-msgid "Skin"
-msgstr "Обкладинка"
+#: TermsOfUsePage.cpp:231
+msgid "I agree to the terms of use."
+msgstr "Я згоден з умовами використання."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:177
-msgid "Select the appearance of the user interface."
-msgstr "Виберіть зовнішній вигляд користувацького інтерфейсу."
+#: TermsOfUsePage.cpp:237
+msgid "I do not agree to the terms of use."
+msgstr "Я не згоден з умовами використання."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:224
-#, c-format
-msgid "&%s"
-msgstr "&%s"
+#: UnavailablePage.cpp:183
+msgid "Project temporarily unavailable"
+msgstr "Проект тимчасово недоступний"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:405
-msgid "Default"
-msgstr "За замовчуванням"
+#: UnavailablePage.cpp:186
+msgid ""
+"The project is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "Проект тимчасово недоступний.\n\nБудь ласка, повторіть спробу пізніше."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:848
-msgid "Suspend"
-msgstr "Призупинити"
+#: UnavailablePage.cpp:190
+msgid "Account manager temporarily unavailable"
+msgstr "Менеджер проектів тимчасово недоступний"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:850
-msgid "Suspend Computing"
-msgstr "Призупинити обчислення"
+#: UnavailablePage.cpp:193
+msgid ""
+"The account manager is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "Менеджер проектів тимчасово недоступний.\n\nБудь-ласка, повторіть спробу пізніше."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:851
-msgid "Resume Computing"
-msgstr "Відновити обчислення"
+#: ValidateAccountKey.cpp:68
+msgid "Please specify an account key to continue."
+msgstr "Введіть обліковий ключ для продовження."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:867
-msgid "Notices"
-msgstr "Повідомлення"
+#: ValidateAccountKey.cpp:71
+msgid "Invalid Account Key; please enter a valid Account Key"
+msgstr "Введено неправильний обліковий ключ; будь ласка, повторіть введення ключа"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:868
-msgid "Open a window to view notices from projects or BOINC"
-msgstr "Відкрити вікно перегляду повідомлень проектів і BOINC"
+#: ValidateAccountKey.cpp:82 ValidateEmailAddress.cpp:86
+msgid "Validation conflict"
+msgstr "Помилка перевірки правильності введення даних"
 
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
-msgstr "Отримання повідомлень; зачекайте, будь-ласка..."
+#: ValidateEmailAddress.cpp:72
+msgid "Please specify an email address"
+msgstr "Будь-ласка, вкажіть адресу електронної пошти"
 
-#: clientgui/sg_DlgMessages.cpp:132
-msgid "There are no notices at this time."
-msgstr "Зараз повідомлення відсутні."
+#: ValidateEmailAddress.cpp:75
+msgid "Invalid email address; please enter a valid email address"
+msgstr "Вказана неправильна адреса електронної пошти;\nповторіть спробу"
 
-#: clientgui/sg_DlgMessages.cpp:146
-msgid "Close"
-msgstr "Закрити"
+#: ValidateURL.cpp:69
+msgid "Missing URL"
+msgstr "Не вказана URL-адреса"
 
-#: clientgui/sg_DlgMessages.cpp:394
-#, c-format
-msgid "%s - Notices"
-msgstr "%s - Повідомлення"
+#: 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_DlgPreferences.cpp:270
-msgid "This dialog controls preferences for this computer only."
-msgstr "Це діалогове вікно керує налаштуваннями тільки даного комп’ютера."
+#: ValidateURL.cpp:83 ValidateURL.cpp:87 ValidateURL.cpp:91
+#: ValidateURL.cpp:103 ValidateURL.cpp:107 ValidateURL.cpp:110
+msgid "Invalid URL"
+msgstr "Некоректна URL-адреса"
 
-#: clientgui/sg_DlgPreferences.cpp:275
-msgid "Click OK to set preferences."
-msgstr "Для збереження налаштувань натисніть 'Гаразд'."
+#: ValidateURL.cpp:84 ValidateURL.cpp:88 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_DlgPreferences.cpp:280
-msgid "Click Clear to restore web-based settings for all preferences listed below."
-msgstr "Для відновлення інтернет налаштувань всіх вказаних нижче уподобань натисніть Очистити."
+#: ValidateURL.cpp:104 ValidateURL.cpp:108
+#, c-format
+msgid "'%s' does not contain a valid host name."
+msgstr "Комп'ютер (хост) з назвою: '% s' не знайдений."
 
-#: clientgui/sg_DlgPreferences.cpp:287
-msgid "For additional settings, select Computing Preferences in the Advanced View."
-msgstr "Для додаткових параметрів, виберіть Налаштування клієнта у Розширеному виді."
+#: ValidateURL.cpp:111
+#, c-format
+msgid "'%s' does not contain a valid path."
+msgstr "Вказаного шляху: '% s' не існує."
 
-#: clientgui/sg_DlgPreferences.cpp:315
-msgid "Do work only between:"
-msgstr "Працювати тільки між:"
+#: ViewMessages.cpp:84 ViewProjects.cpp:170 ViewStatistics.cpp:1978
+#: ViewTransfers.cpp:160 ViewWork.cpp:183
+msgid "Commands"
+msgstr "Команди"
 
-#: clientgui/sg_DlgPreferences.cpp:337
-msgid "Connect to internet only between:"
-msgstr "Доступ в інтернет тільки між:"
+#: ViewMessages.cpp:88
+msgid "Copy all messages"
+msgstr "Копіювати всі повідомлення"
 
-#: clientgui/sg_DlgPreferences.cpp:359
-#: clientgui/sg_DlgPreferences.cpp:376
-msgid "Use no more than:"
-msgstr "Використовувати не більше:"
+#: ViewMessages.cpp:95
+msgid "Copy selected messages"
+msgstr "Копіювати вибрані повідомлення"
 
-#: clientgui/sg_DlgPreferences.cpp:372
-msgid "of disk space"
-msgstr "місця на диску"
+#: ViewMessages.cpp:106 ViewMessages.cpp:502
+msgid "Show only this project"
+msgstr "Показати тільки цей проект"
 
-#: clientgui/sg_DlgPreferences.cpp:389
-msgid "of the processor"
-msgstr "процесора"
+#: ViewMessages.cpp:107 ViewMessages.cpp:503
+msgid "Show only the messages for the selected project."
+msgstr "Показати повідомлення тільки вибраного проекту."
 
-#: clientgui/sg_DlgPreferences.cpp:393
-msgid "Do work while on battery?"
-msgstr "Працювати на батареях?"
+#: ViewMessages.cpp:164
+msgid "Messages"
+msgstr "Повідомлення"
 
-#: clientgui/sg_DlgPreferences.cpp:406
-msgid "Do work after idle for:"
-msgstr "Запуск обробки при простої:"
+#: ViewMessages.cpp:187
+msgid "Copying all messages to the clipboard..."
+msgstr "Копіювати всі повідомлення в буфер обміну..."
 
-#: clientgui/sg_DlgPreferences.cpp:431
-msgid "Clear all local preferences listed above and close the dialog"
-msgstr "Очистити всі вказані локальні налаштування і закрити діалогове вікно"
+#: ViewMessages.cpp:223
+msgid "Copying selected messages to the clipboard..."
+msgstr "В буфер обміну копіюються виділені повідомлення..."
 
-#: clientgui/sg_DlgPreferences.cpp:609
-#: clientgui/sg_DlgPreferences.cpp:612
-#: clientgui/sg_DlgPreferences.cpp:688
-#: clientgui/sg_DlgPreferences.cpp:692
-#: clientgui/sg_DlgPreferences.cpp:704
-#: clientgui/sg_DlgPreferences.cpp:708
-#: clientgui/sg_DlgPreferences.cpp:851
-#: clientgui/sg_DlgPreferences.cpp:862
-msgid "Anytime"
-msgstr "Завжди"
+#: ViewMessages.cpp:286
+msgid "Filtering messages..."
+msgstr "Фільтрація повідомлень..."
 
-#: clientgui/sg_DlgPreferences.cpp:645
-msgid "100 MB"
-msgstr "100 Мб"
+#: ViewMessages.cpp:494
+msgid "Show all messages"
+msgstr "Показати всі повідомлення"
 
-#: clientgui/sg_DlgPreferences.cpp:646
-msgid "200 MB"
-msgstr "200 Мб"
+#: ViewMessages.cpp:495
+msgid "Show messages for all projects."
+msgstr "Показати повідомлення для всіх проектів."
 
-#: clientgui/sg_DlgPreferences.cpp:647
-msgid "500 MB"
-msgstr "500 Мб"
+#: ViewNotices.cpp:58 sg_DlgMessages.cpp:124
+msgid "Fetching notices; please wait..."
+msgstr "Отримання повідомлень; зачекайте, будь-ласка..."
 
-#: clientgui/sg_DlgPreferences.cpp:648
-msgid "1 GB"
-msgstr "1 Гб"
+#: ViewNotices.cpp:65 sg_DlgMessages.cpp:132
+msgid "There are no notices at this time."
+msgstr "Зараз повідомлення відсутні."
 
-#: clientgui/sg_DlgPreferences.cpp:649
-msgid "2 GB"
-msgstr "2 Гб"
-
-#: clientgui/sg_DlgPreferences.cpp:650
-msgid "5 GB"
-msgstr "5 Гб"
-
-#: clientgui/sg_DlgPreferences.cpp:651
-msgid "10 GB"
-msgstr "10 Гб"
-
-#: clientgui/sg_DlgPreferences.cpp:652
-msgid "20 GB"
-msgstr "20 Гб"
-
-#: clientgui/sg_DlgPreferences.cpp:653
-msgid "50 GB"
-msgstr "50 Гб"
-
-#: clientgui/sg_DlgPreferences.cpp:654
-msgid "100 GB"
-msgstr "100 Гб"
-
-#: clientgui/sg_DlgPreferences.cpp:724
-#, c-format
-msgid "%d MB"
-msgstr "%d Мб"
-
-#: clientgui/sg_DlgPreferences.cpp:726
-#, c-format
-msgid "%4.2f GB"
-msgstr "%4.2f Гб"
-
-#: clientgui/sg_DlgPreferences.cpp:767
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: clientgui/sg_DlgPreferences.cpp:803
-msgid "0 (Run Always)"
-msgstr "0 (працювати завжди)"
-
-#: clientgui/sg_DlgPreferences.cpp:806
-#, c-format
-msgid "%d"
-msgstr "%d"
-
-#: clientgui/sg_DlgPreferences.cpp:953
-#, c-format
-msgid "%s - Computing Preferences"
-msgstr "%s - Налаштування обчислень"
-
-#: clientgui/sg_DlgPreferences.cpp:1033
-msgid "Do you really want to clear all local preferences?\n"
-msgstr "Ви справді хочете видалити всі налаштування, які зберігаються локально?\n"
+#: ViewNotices.cpp:99 sg_BoincSimpleFrame.cpp:776
+msgid "Notices"
+msgstr "Повідомлення"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:66
-#: clientgui/ViewProjects.cpp:179
+#: ViewProjects.cpp:174 sg_ProjectCommandPopup.cpp:61
 msgid "Update"
 msgstr "Оновити"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:67
-#: clientgui/ViewProjects.cpp:180
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
+#: ViewProjects.cpp:175 sg_ProjectCommandPopup.cpp:62
+msgid ""
+"Report all completed tasks, get latest credit, get latest preferences, and "
+"possibly get more tasks."
 msgstr "Отримати інформацію з сервера проекту: про підтвердження передачі завершених завдань, про кількість набраних балів, про налаштування облікового запису і (можливо) завантажити нові завдання."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:73
-#: clientgui/sg_ProjectCommandPopup.cpp:129
-#: clientgui/ViewProjects.cpp:187
-#: clientgui/ViewProjects.cpp:727
+#: 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
+msgid "Suspend"
+msgstr "Призупинити"
+
+#: ViewProjects.cpp:182 ViewProjects.cpp:722 sg_ProjectCommandPopup.cpp:68
+#: sg_ProjectCommandPopup.cpp:114
 msgid "Suspend tasks for this project."
 msgstr "Призупинити обробку цього проекту."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:78
-#: clientgui/sg_ProjectCommandPopup.cpp:136
-#: clientgui/ViewProjects.cpp:193
-#: clientgui/ViewProjects.cpp:746
+#: ViewProjects.cpp:188 ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:73
+#: sg_ProjectCommandPopup.cpp:121
 msgid "No new tasks"
 msgstr "Не запитувати нових завдань"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:79
-#: clientgui/ViewProjects.cpp:194
+#: ViewProjects.cpp:189 sg_ProjectCommandPopup.cpp:74
 msgid "Don't get new tasks for this project."
 msgstr "Не запитувати нові завдання для цього проекту."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:200
+#: ViewProjects.cpp:195 sg_ProjectCommandPopup.cpp:79
 msgid "Reset project"
 msgstr "Запустити проект"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:85
-#: clientgui/ViewProjects.cpp:201
-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."
+#: ViewProjects.cpp:196 sg_ProjectCommandPopup.cpp:80
+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:208
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
+#: ViewProjects.cpp:203 sg_ProjectCommandPopup.cpp:86
+msgid ""
+"Remove this project.  Tasks in progress will be lost (use 'Update' first to "
+"report any completed tasks)."
 msgstr "Видалити цей проект.  Завдання,які обробляються в даний момент, будуть втрачені (скористайтеся функцією 'Оновити' перед цією операцією для того, щоб відправити всі завершені завдання)."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:96
-#: clientgui/sg_TaskCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:214
+#: ViewProjects.cpp:209 ViewWork.cpp:222 sg_ProjectCommandPopup.cpp:91
+#: sg_TaskCommandPopup.cpp:78
 msgid "Properties"
 msgstr "Властивості"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:97
-#: clientgui/ViewProjects.cpp:215
+#: ViewProjects.cpp:210 sg_ProjectCommandPopup.cpp:92
 msgid "Show project details."
 msgstr "Інформація про проект."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:126
-#: clientgui/ViewProjects.cpp:723
-msgid "Resume tasks for this project."
-msgstr "Підсумкове завдання для цього проекту"
+#: ViewProjects.cpp:220 ViewStatistics.cpp:450
+msgid "Account"
+msgstr "Обліковий запис"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:133
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow new tasks"
-msgstr "Дозволити отримання нових завдань"
+#: ViewProjects.cpp:222
+msgid "Work done"
+msgstr "Виконана робота"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:134
-#: clientgui/ViewProjects.cpp:742
-msgid "Allow fetching new tasks for this project."
-msgstr "Дозволити запитувати нові завдання цього проекту."
+#: ViewProjects.cpp:223
+msgid "Avg. work done"
+msgstr "У середньому за день"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:137
-#: clientgui/ViewProjects.cpp:746
-msgid "Don't fetch new tasks for this project."
-msgstr "Не запитувати нові завдання цього проекту."
+#: ViewProjects.cpp:225 ViewTransfers.cpp:188 ViewWork.cpp:234
+msgid "Status"
+msgstr "Стан"
+
+#: ViewProjects.cpp:250
+msgid "Projects"
+msgstr "Проекти"
+
+#: ViewProjects.cpp:302
+msgid "Updating project..."
+msgstr "Оновлення проекту..."
+
+#: ViewProjects.cpp:344
+msgid "Resuming project..."
+msgstr "Відновлення проекту..."
+
+#: ViewProjects.cpp:348
+msgid "Suspending project..."
+msgstr "Призупинення проекту..."
+
+#: ViewProjects.cpp:385
+msgid "Telling project to allow additional task downloads..."
+msgstr "Передається запит на дозвіл отримання нових завдань для обробки..."
+
+#: ViewProjects.cpp:389
+msgid "Telling project to not fetch any additional tasks..."
+msgstr "Передається запит на заборону отримання нових завдань для обробки..."
+
+#: ViewProjects.cpp:425
+msgid "Resetting project..."
+msgstr "Перезапуск проекту..."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:229
-#: clientgui/ViewProjects.cpp:443
+#: ViewProjects.cpp:438 sg_ProjectCommandPopup.cpp:214
 #, c-format
 msgid "Are you sure you want to reset project '%s'?"
 msgstr "Ви справді хочете перезапустити проект '%s'?"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:235
-#: clientgui/ViewProjects.cpp:449
+#: ViewProjects.cpp:444 sg_ProjectCommandPopup.cpp:220
 msgid "Reset Project"
 msgstr "Перезапуск проекту"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:266
-#: clientgui/ViewProjects.cpp:501
+#: ViewProjects.cpp:483
+msgid "Removing project..."
+msgstr "Видалення проекту..."
+
+#: ViewProjects.cpp:496 sg_ProjectCommandPopup.cpp:251
 #, c-format
 msgid "Are you sure you want to remove project '%s'?"
 msgstr "Ви справді хочете видалити проект '% s'?"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:272
-#: clientgui/ViewProjects.cpp:507
+#: ViewProjects.cpp:502 sg_ProjectCommandPopup.cpp:257
 msgid "Remove Project"
 msgstr "Видалити проект"
 
-#: clientgui/sg_ProjectPanel.cpp:72
-msgid "Add Project"
-msgstr "Додати проект"
+#: ViewProjects.cpp:543 ViewWork.cpp:599
+msgid "Launching browser..."
+msgstr "Запуск браузера..."
 
-#: clientgui/sg_ProjectPanel.cpp:73
-msgid "Synchronize"
-msgstr "Синхронізувати"
+#: ViewProjects.cpp:718 sg_ProjectCommandPopup.cpp:111
+msgid "Resume tasks for this project."
+msgstr "Підсумкове завдання для цього проекту"
 
-#: clientgui/sg_ProjectPanel.cpp:74
-msgid "Work done for this project"
-msgstr "Для цього проекту робота завершена"
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:118
+msgid "Allow new tasks"
+msgstr "Дозволити отримання нових завдань"
 
-#: clientgui/sg_ProjectPanel.cpp:77
-msgid "Synchronize projects with account manager system"
-msgstr "Синхронізація інформації про проекти та налаштування між BOINC клієнтом і менеджером проектів"
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:119
+msgid "Allow fetching new tasks for this project."
+msgstr "Дозволити запитувати нові завдання цього проекту."
 
-#: clientgui/sg_ProjectPanel.cpp:124
-msgid "Select a project to access with the controls below"
-msgstr "Вибрати проект, використовуючи розташовані нижче елементи керування"
+#: ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:122
+msgid "Don't fetch new tasks for this project."
+msgstr "Не запитувати нові завдання цього проекту."
 
-#: clientgui/sg_ProjectPanel.cpp:145
-msgid "Project Web Pages"
-msgstr "Веб-сторінки проекту"
+#: ViewProjects.cpp:1058
+msgid "Requested by user"
+msgstr "За запитом користувача"
 
-#: clientgui/sg_ProjectPanel.cpp:149
-msgid "Project Commands"
-msgstr "Команди проекту"
+#: ViewProjects.cpp:1059
+msgid "To fetch work"
+msgstr "Надіслати запит на завдання"
 
-#: clientgui/sg_ProjectPanel.cpp:276
-#, c-format
-msgid "Pop up a menu of web sites for project %s"
-msgstr "Показати меню веб-сайтів для проекту %s"
+#: ViewProjects.cpp:1060
+msgid "To report completed tasks"
+msgstr "Повідомити про завершені завдання"
 
-#: clientgui/sg_ProjectPanel.cpp:278
-#, c-format
-msgid "Pop up a menu of commands to apply to project %s"
-msgstr "Показати меню команд, застосовних до проекту%s"
+#: ViewProjects.cpp:1061
+msgid "To send trickle-up message"
+msgstr "Надіслати проміжне повідомлення"
 
-#: clientgui/sg_TaskCommandPopup.cpp:66
-msgid "Show graphics"
-msgstr "Показати графіку"
+#: ViewProjects.cpp:1062
+msgid "Requested by account manager"
+msgstr "На запит менеджера проектів"
 
-#: clientgui/sg_TaskCommandPopup.cpp:67
-msgid "Show application graphics in a window."
-msgstr "Показати вікно програми з графічною інформацією."
+#: ViewProjects.cpp:1063
+msgid "Project initialization"
+msgstr "Ініціалізація проекту"
 
-#: clientgui/sg_TaskCommandPopup.cpp:73
-msgid "Suspend this task."
-msgstr "Призупинити це завдання."
+#: ViewProjects.cpp:1064
+msgid "Requested by project"
+msgstr "На запит проекту"
 
-#: clientgui/sg_TaskCommandPopup.cpp:78
-msgid "Abort"
-msgstr "Перервати обробку"
+#: ViewProjects.cpp:1065
+msgid "Unknown reason"
+msgstr "Невідома причина"
 
-#: clientgui/sg_TaskCommandPopup.cpp:79
-msgid "Abandon this task. You will get no credit for it."
-msgstr "Відмовитися від цього завдання. Ви не отримаєте за нього балів."
+#: ViewProjects.cpp:1079
+msgid "Suspended by user"
+msgstr "Призупинено користувачем"
 
-#: clientgui/sg_TaskCommandPopup.cpp:85
-msgid "Show task details."
-msgstr "Інформація про завдання."
+#: ViewProjects.cpp:1082
+msgid "Won't get new tasks"
+msgstr "Не запитувати нові завдання"
 
-#: clientgui/sg_TaskCommandPopup.cpp:119
-msgid "Resume work for this task."
-msgstr "Продовжити обробку цього завдання"
+#: ViewProjects.cpp:1085
+msgid "Project ended - OK to remove"
+msgstr "Проект завершено - можна видаляти"
 
-#: clientgui/sg_TaskCommandPopup.cpp:123
-msgid "Suspend work for this task."
-msgstr "Призупинити обробку цього завдання."
+#: ViewProjects.cpp:1088
+msgid "Will remove when tasks done"
+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)"
+#: ViewProjects.cpp:1091
+msgid "Scheduler request pending"
+msgstr "Запит інформації у планувальника"
 
-#: clientgui/sg_TaskCommandPopup.cpp:272
-msgid "Abort task"
-msgstr "Перервати обробку завдання"
+#: ViewProjects.cpp:1097
+msgid "Scheduler request in progress"
+msgstr "Виконується запит інформації у планувальника"
 
-#: clientgui/sg_TaskPanel.cpp:468
-msgid "You don't have any projects.  Please Add a Project."
-msgstr "BOINC не підключений до жодного проекту."
+#: ViewProjects.cpp:1100
+msgid "Trickle up message pending"
+msgstr "Очікування відправлення проміжного повідомлення"
 
-#: clientgui/sg_TaskPanel.cpp:469
-msgid "Not available"
-msgstr "Недоступно"
+#: ViewProjects.cpp:1106
+msgid "Communication deferred "
+msgstr "Повтор через..."
 
-#: clientgui/sg_TaskPanel.cpp:480
-msgid "Tasks:"
-msgstr "Завдання:"
+#: ViewResources.cpp:62
+msgid "Total disk usage"
+msgstr "Повний обсяг диска"
 
-#: clientgui/sg_TaskPanel.cpp:486
-msgid "Select a task to access"
-msgstr "Вибрати завдання для доступу"
+#: ViewResources.cpp:83
+msgid "Disk usage by BOINC projects"
+msgstr "Зайнято проектами BOINC"
 
-#: clientgui/sg_TaskPanel.cpp:497
-msgid "From:"
-msgstr "Від:"
+#: ViewResources.cpp:116
+msgid "Disk"
+msgstr "Диск"
 
-#: clientgui/sg_TaskPanel.cpp:551
-msgid "This task's progress"
-msgstr "Прогрес цього завдання"
+#: ViewResources.cpp:249
+msgid "no projects: 0 bytes used"
+msgstr "немає проектів: використовується 0 байт"
 
-#: clientgui/sg_TaskPanel.cpp:569
-msgid "Task Commands"
-msgstr "Команди завдання"
+#: ViewResources.cpp:286
+msgid "used by BOINC: "
+msgstr "зайнято BOINC: "
 
-#: clientgui/sg_TaskPanel.cpp:570
-msgid "Pop up a menu of commands to apply to this task"
-msgstr "Показати меню команд, застосовних до цього завдання"
+#: ViewResources.cpp:296
+msgid "free, available to BOINC: "
+msgstr "вільно, доступно для BOINC: "
 
-#: clientgui/sg_TaskPanel.cpp:705
-#, c-format
-msgid "Application: %s"
-msgstr "Додаток: %s"
+#: ViewResources.cpp:306
+msgid "free, not available to BOINC: "
+msgstr "вільно, недоступно для BOINC: "
 
-#: clientgui/sg_TaskPanel.cpp:728
-#, c-format
-msgid "%.3f%%"
-msgstr "%.3f%%"
+#: ViewResources.cpp:316
+msgid "free: "
+msgstr "вільно: "
 
-#: clientgui/sg_TaskPanel.cpp:736
-msgid "Application: Not available"
-msgstr "Додаток: недоступний"
+#: ViewResources.cpp:326
+msgid "used by other programs: "
+msgstr "зайнято іншими програмами: "
 
-#: clientgui/sg_TaskPanel.cpp:836
-msgid "Not Available"
-msgstr "Недоступно"
+#: ViewStatistics.cpp:1205
+msgid "User Total"
+msgstr "Загальна кількість балів учасника"
 
-#: clientgui/sg_TaskPanel.cpp:851
-#, c-format
-msgid "Elapsed: %s"
-msgstr "Витрачено: %s"
+#: ViewStatistics.cpp:1206
+msgid "User Average"
+msgstr "Загальна кількість балів за день"
 
-#: clientgui/sg_TaskPanel.cpp:865
-#, c-format
-msgid "Remaining (estimated): %s"
-msgstr "Залишилось (приблизно): %s"
+#: ViewStatistics.cpp:1207
+msgid "Host Total"
+msgstr "Загальна кількість балів для хосту"
 
-#: clientgui/sg_TaskPanel.cpp:880
+#: ViewStatistics.cpp:1208
+msgid "Host Average"
+msgstr "Середня кількість балів за день для хосту"
+
+#: ViewStatistics.cpp:1355
 #, c-format
-msgid "Status: %s"
-msgstr "Стан: %s"
+msgid "Last update: %.0f days ago"
+msgstr "Останнє оновлення: %.0f днів тому"
 
-#: clientgui/sg_TaskPanel.cpp:1227
-msgid "Retrieving current status."
-msgstr "Перевірка поточного стану."
+#: ViewStatistics.cpp:1982
+msgid "Show user total"
+msgstr "Всього балів користувача"
 
-#: clientgui/sg_TaskPanel.cpp:1233
-msgid "Downloading work from the server."
-msgstr "Завантаження завдань із сервера проекту."
+#: ViewStatistics.cpp:1983
+msgid "Show total credit for user"
+msgstr "Показати загальну кількість балів користувача"
 
-#: clientgui/sg_TaskPanel.cpp:1238
-msgid "Processing Suspended:  Running On Batteries."
-msgstr "Обробка призупинена:  робота комп’ютера від батарей."
+#: ViewStatistics.cpp:1989
+msgid "Show user average"
+msgstr "В середньому за день"
 
-#: clientgui/sg_TaskPanel.cpp:1240
-msgid "Processing Suspended:  User Active."
-msgstr "Обробка призупинена:  працює користувач."
+#: ViewStatistics.cpp:1990
+msgid "Show average credit for user"
+msgstr "Показати середню кількість балів набраних користувачем за день"
 
-#: clientgui/sg_TaskPanel.cpp:1242
-msgid "Processing Suspended:  User paused processing."
-msgstr "Обробка призупинена:  за ініціативи користувача."
+#: ViewStatistics.cpp:1996
+msgid "Show host total"
+msgstr "Всього балів для хосту"
 
-#: clientgui/sg_TaskPanel.cpp:1244
-msgid "Processing Suspended:  Time of Day."
-msgstr "Обробка призупинена:  заборонений час доби."
-
-#: clientgui/sg_TaskPanel.cpp:1246
-msgid "Processing Suspended:  Benchmarks Running."
-msgstr "Обробка призупинена:  запущений тест продуктивності."
-
-#: clientgui/sg_TaskPanel.cpp:1248
-msgid "Processing Suspended."
-msgstr "Обробка призупинена."
-
-#: clientgui/sg_TaskPanel.cpp:1252
-msgid "Waiting to contact project servers."
-msgstr "Зачекайте будь-ласка."
-
-#: clientgui/sg_TaskPanel.cpp:1256
-#: clientgui/sg_TaskPanel.cpp:1265
-msgid "Retrieving current status"
-msgstr "Перевірка поточного стану"
-
-#: clientgui/sg_TaskPanel.cpp:1260
-msgid "No work available to process"
-msgstr "Відсутні завдання для обробки"
-
-#: clientgui/sg_TaskPanel.cpp:1262
-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"
-"Наприклад:\n"
-"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"
-"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
-#: clientgui/ViewProjects.cpp:175
-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:225
-msgid "Account"
-msgstr "Обліковий запис"
-
-#: clientgui/ViewProjects.cpp:227
-msgid "Work done"
-msgstr "Виконана робота"
-
-#: clientgui/ViewProjects.cpp:228
-msgid "Avg. work done"
-msgstr "У середньому за день"
-
-#: clientgui/ViewProjects.cpp:230
-msgid "Status"
-msgstr "Стан"
-
-#: clientgui/ViewProjects.cpp:255
-msgid "Projects"
-msgstr "Проекти"
-
-#: clientgui/ViewProjects.cpp:307
-msgid "Updating project..."
-msgstr "Оновлення проекту..."
-
-#: clientgui/ViewProjects.cpp:349
-msgid "Resuming project..."
-msgstr "Відновлення проекту..."
-
-#: clientgui/ViewProjects.cpp:353
-msgid "Suspending project..."
-msgstr "Призупинення проекту..."
-
-#: clientgui/ViewProjects.cpp:390
-msgid "Telling project to allow additional task downloads..."
-msgstr "Передається запит на дозвіл отримання нових завдань для обробки..."
-
-#: clientgui/ViewProjects.cpp:394
-msgid "Telling project to not fetch any additional tasks..."
-msgstr "Передається запит на заборону отримання нових завдань для обробки..."
-
-#: clientgui/ViewProjects.cpp:430
-msgid "Resetting project..."
-msgstr "Перезапуск проекту..."
-
-#: clientgui/ViewProjects.cpp:488
-msgid "Removing project..."
-msgstr "Видалення проекту..."
-
-#: clientgui/ViewProjects.cpp:548
-msgid "Launching browser..."
-msgstr "Запуск браузера..."
-
-#: clientgui/ViewProjects.cpp:1063
-msgid "Requested by user"
-msgstr "За запитом користувача"
-
-#: clientgui/ViewProjects.cpp:1064
-msgid "To fetch work"
-msgstr "Надіслати запит на завдання"
-
-#: clientgui/ViewProjects.cpp:1065
-msgid "To report completed tasks"
-msgstr "Повідомити про завершені завдання"
-
-#: clientgui/ViewProjects.cpp:1066
-msgid "To send trickle-up message"
-msgstr "Надіслати проміжне повідомлення"
-
-#: clientgui/ViewProjects.cpp:1067
-msgid "Requested by account manager"
-msgstr "На запит менеджера проектів"
-
-#: clientgui/ViewProjects.cpp:1068
-msgid "Project initialization"
-msgstr "Ініціалізація проекту"
-
-#: clientgui/ViewProjects.cpp:1069
-msgid "Requested by project"
-msgstr "На запит проекту"
-
-#: clientgui/ViewProjects.cpp:1070
-msgid "Unknown reason"
-msgstr "Невідома причина"
-
-#: clientgui/ViewProjects.cpp:1084
-msgid "Suspended by user"
-msgstr "Призупинено користувачем"
-
-#: clientgui/ViewProjects.cpp:1087
-msgid "Won't get new tasks"
-msgstr "Не запитувати нові завдання"
-
-#: clientgui/ViewProjects.cpp:1090
-msgid "Project ended - OK to remove"
-msgstr "Проект завершено - можна видаляти"
-
-#: clientgui/ViewProjects.cpp:1093
-msgid "Will remove when tasks done"
-msgstr "Буде видалений після завершення завдань"
-
-#: clientgui/ViewProjects.cpp:1096
-msgid "Scheduler request pending"
-msgstr "Запит інформації у планувальника"
-
-#: clientgui/ViewProjects.cpp:1102
-msgid "Scheduler request in progress"
-msgstr "Виконується запит інформації у планувальника"
-
-#: clientgui/ViewProjects.cpp:1105
-msgid "Trickle up message pending"
-msgstr "Очікування відправлення проміжного повідомлення"
-
-#: clientgui/ViewProjects.cpp:1111
-msgid "Communication deferred "
-msgstr "Повтор через..."
-
-#: clientgui/ViewResources.cpp:62
-msgid "Total disk usage"
-msgstr "Повний обсяг диска"
-
-#: clientgui/ViewResources.cpp:83
-msgid "Disk usage by BOINC projects"
-msgstr "Зайнято проектами BOINC"
-
-#: clientgui/ViewResources.cpp:116
-msgid "Disk"
-msgstr "Диск"
-
-#: clientgui/ViewResources.cpp:225
-msgid "no projects: 0 bytes used"
-msgstr "немає проектів: використовується 0 байт"
-
-#: clientgui/ViewResources.cpp:262
-msgid "used by BOINC: "
-msgstr "зайнято BOINC: "
-
-#: clientgui/ViewResources.cpp:272
-msgid "free, available to BOINC: "
-msgstr "вільно, доступно для BOINC: "
-
-#: clientgui/ViewResources.cpp:282
-msgid "free, not available to BOINC: "
-msgstr "вільно, недоступно для BOINC: "
-
-#: clientgui/ViewResources.cpp:292
-msgid "free: "
-msgstr "вільно: "
-
-#: clientgui/ViewResources.cpp:302
-msgid "used by other programs: "
-msgstr "зайнято іншими програмами: "
-
-#: clientgui/ViewStatistics.cpp:1181
-msgid "User Total"
-msgstr "Загальна кількість балів учасника"
-
-#: clientgui/ViewStatistics.cpp:1182
-msgid "User Average"
-msgstr "Загальна кількість балів за день"
-
-#: clientgui/ViewStatistics.cpp:1183
-msgid "Host Total"
-msgstr "Загальна кількість балів для хосту"
-
-#: clientgui/ViewStatistics.cpp:1184
-msgid "Host Average"
-msgstr "Середня кількість балів за день для хосту"
-
-#: clientgui/ViewStatistics.cpp:1331
-#, c-format
-msgid "Last update: %.0f days ago"
-msgstr "Останнє оновлення: %.0f днів тому"
-
-#: clientgui/ViewStatistics.cpp:1956
-msgid "Show user total"
-msgstr "Всього балів користувача"
-
-#: clientgui/ViewStatistics.cpp:1957
-msgid "Show total credit for user"
-msgstr "Показати загальну кількість балів користувача"
-
-#: clientgui/ViewStatistics.cpp:1963
-msgid "Show user average"
-msgstr "В середньому за день"
-
-#: clientgui/ViewStatistics.cpp:1964
-msgid "Show average credit for user"
-msgstr "Показати середню кількість балів набраних користувачем за день"
-
-#: clientgui/ViewStatistics.cpp:1970
-msgid "Show host total"
-msgstr "Всього балів для хосту"
-
-#: clientgui/ViewStatistics.cpp:1971
+#: ViewStatistics.cpp:1997
 msgid "Show total credit for host"
 msgstr "Показати загальну кількість балів набраних на даному хості"
 
-#: clientgui/ViewStatistics.cpp:1977
+#: ViewStatistics.cpp:2003
 msgid "Show host average"
 msgstr "В середньому для хосту"
 
-#: clientgui/ViewStatistics.cpp:1978
+#: ViewStatistics.cpp:2004
 msgid "Show average credit for host"
 msgstr "Показати середню кількість балів набраних даним хостом за день"
 
-#: clientgui/ViewStatistics.cpp:1987
+#: ViewStatistics.cpp:2013
 msgid "< &Previous project"
 msgstr "< &Попередній проект"
 
-#: clientgui/ViewStatistics.cpp:1988
+#: ViewStatistics.cpp:2014
 msgid "Show chart for previous project"
 msgstr "Показати графік для попереднього проекту"
 
-#: clientgui/ViewStatistics.cpp:1993
+#: ViewStatistics.cpp:2019
 msgid "&Next project >"
 msgstr "&Наступний проект >"
 
-#: clientgui/ViewStatistics.cpp:1994
+#: ViewStatistics.cpp:2020
 msgid "Show chart for next project"
 msgstr "Показати графік на наступний проект"
 
-#: clientgui/ViewStatistics.cpp:2000
-#: clientgui/ViewStatistics.cpp:2390
+#: ViewStatistics.cpp:2026 ViewStatistics.cpp:2416
 msgid "Hide project list"
 msgstr "Приховати список проектів"
 
-#: clientgui/ViewStatistics.cpp:2001
-#: clientgui/ViewStatistics.cpp:2390
+#: ViewStatistics.cpp:2027 ViewStatistics.cpp:2416
 msgid "Use entire area for graphs"
 msgstr "Використовувати всю область для графіків"
 
-#: clientgui/ViewStatistics.cpp:2006
+#: ViewStatistics.cpp:2032
 msgid "Mode view"
 msgstr "Вид графіків"
 
-#: clientgui/ViewStatistics.cpp:2010
+#: ViewStatistics.cpp:2036
 msgid "One project"
 msgstr "Один проект"
 
-#: clientgui/ViewStatistics.cpp:2011
+#: ViewStatistics.cpp:2037
 msgid "Show one chart with selected project"
 msgstr "Показати один обраний проект"
 
-#: clientgui/ViewStatistics.cpp:2017
+#: ViewStatistics.cpp:2043
 msgid "All projects (separate)"
 msgstr "Всі проекти (окремо)"
 
-#: clientgui/ViewStatistics.cpp:2018
+#: ViewStatistics.cpp:2044
 msgid "Show all projects, one chart per project"
 msgstr "Показати всі проекти, кожен проект на окремому графіку"
 
-#: clientgui/ViewStatistics.cpp:2024
+#: ViewStatistics.cpp:2050
 msgid "All projects (together)"
 msgstr "Всі проекти (разом)"
 
-#: clientgui/ViewStatistics.cpp:2025
+#: ViewStatistics.cpp:2051
 msgid "Show one chart with all projects"
 msgstr "Показати всі проекти на одному графіку"
 
-#: clientgui/ViewStatistics.cpp:2031
+#: ViewStatistics.cpp:2057
 msgid "All projects (sum)"
 msgstr "Всі проекти (в сумі)"
 
-#: clientgui/ViewStatistics.cpp:2032
+#: ViewStatistics.cpp:2058
 msgid "Show one chart with sum of projects"
 msgstr "Показати суму за проектами на одному графіку"
 
-#: clientgui/ViewStatistics.cpp:2053
+#: ViewStatistics.cpp:2079
 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
+#: 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
 msgid "Updating charts..."
 msgstr "Оновлення графіку..."
 
-#: clientgui/ViewStatistics.cpp:2394
+#: ViewStatistics.cpp:2420
 msgid "Show project list"
 msgstr "Показати список проектів"
 
-#: clientgui/ViewStatistics.cpp:2394
+#: ViewStatistics.cpp:2420
 msgid "Uses smaller area for graphs"
 msgstr "Використовувати меншу область для графіків"
 
-#: clientgui/ViewTransfers.cpp:169
+#: ViewTransfers.cpp:164
 msgid "Retry Now"
 msgstr "Повторити негайно"
 
-#: clientgui/ViewTransfers.cpp:170
+#: ViewTransfers.cpp:165
 msgid "Retry the file transfer now"
 msgstr "Повторити передачу файлів негайно"
 
-#: clientgui/ViewTransfers.cpp:176
+#: ViewTransfers.cpp:171
 msgid "Abort Transfer"
 msgstr "Відмінити передачу"
 
-#: clientgui/ViewTransfers.cpp:177
+#: ViewTransfers.cpp:172
 msgid "Abort this file transfer.  You won't get credit for the task."
 msgstr "Перервати передачу файлів.  Ви не отримаєте балів за завдання."
 
-#: clientgui/ViewTransfers.cpp:188
+#: ViewTransfers.cpp:183
 msgid "File"
 msgstr "Файл"
 
-#: clientgui/ViewTransfers.cpp:189
-#: clientgui/ViewWork.cpp:238
+#: ViewTransfers.cpp:184 ViewWork.cpp:233
 msgid "Progress"
 msgstr "Прогрес"
 
-#: clientgui/ViewTransfers.cpp:190
+#: ViewTransfers.cpp:185
 msgid "Size"
 msgstr "Розмір"
 
-#: clientgui/ViewTransfers.cpp:191
+#: ViewTransfers.cpp:186
 msgid "Elapsed Time"
 msgstr "Витрачений час"
 
-#: clientgui/ViewTransfers.cpp:192
+#: ViewTransfers.cpp:187
 msgid "Speed"
 msgstr "Швидкість"
 
-#: clientgui/ViewTransfers.cpp:218
+#: ViewTransfers.cpp:213
 msgid "Transfers"
 msgstr "Передача"
 
-#: clientgui/ViewTransfers.cpp:285
+#: ViewTransfers.cpp:280
 msgid "Network activity is suspended - "
 msgstr "Доступ до мережі призупинений - "
 
-#: clientgui/ViewTransfers.cpp:287
+#: ViewTransfers.cpp:282
 msgid ""
 ".\n"
 "You can enable it using the Activity menu."
-msgstr ""
-".\n"
-"Ви можете увімкнути його за допомогою меню Управління."
+msgstr ".\nВи можете увімкнути його за допомогою меню Управління."
 
-#: clientgui/ViewTransfers.cpp:290
+#: ViewTransfers.cpp:285
 msgid "BOINC"
 msgstr "BOINC"
 
-#: clientgui/ViewTransfers.cpp:297
+#: ViewTransfers.cpp:292
 msgid "Retrying transfer now..."
 msgstr "Повторна спроба передачі даних..."
 
-#: clientgui/ViewTransfers.cpp:335
+#: ViewTransfers.cpp:330
 msgid "Aborting transfer..."
 msgstr "Відміна передачі..."
 
-#: clientgui/ViewTransfers.cpp:348
+#: ViewTransfers.cpp:343
 #, 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"
-"з помилкою і бали за нього будуть втрачені."
+msgstr "Ви впевнені, що хочете перервати передачу і видалити файл '%s'?\nУВАГА: завдання, що використовує цей файл, буде завершене\nз помилкою і бали за нього будуть втрачені."
 
-#: clientgui/ViewTransfers.cpp:354
+#: ViewTransfers.cpp:349
 msgid "Abort File Transfer"
 msgstr "Перервати передачу файла"
 
-#: clientgui/ViewTransfers.cpp:785
+#: ViewTransfers.cpp:780
 msgid "Upload"
 msgstr "Відправлення"
 
-#: clientgui/ViewTransfers.cpp:785
+#: ViewTransfers.cpp:780
 msgid "Download"
 msgstr "Завантаження"
 
-#: clientgui/ViewTransfers.cpp:789
+#: ViewTransfers.cpp:784
 msgid "retry in "
 msgstr "повториться через "
 
-#: clientgui/ViewTransfers.cpp:791
+#: ViewTransfers.cpp:786
 msgid "failed"
 msgstr "не вдалася"
 
-#: clientgui/ViewTransfers.cpp:794
+#: ViewTransfers.cpp:789
 msgid "suspended"
 msgstr "призупинена"
 
-#: clientgui/ViewTransfers.cpp:799
+#: ViewTransfers.cpp:794
 msgid "active"
 msgstr "активна"
 
-#: clientgui/ViewTransfers.cpp:801
+#: ViewTransfers.cpp:796
 msgid "pending"
 msgstr "очікує"
 
-#: clientgui/ViewTransfers.cpp:808
+#: ViewTransfers.cpp:803
 msgid " (project backoff: "
 msgstr " (запит до проекту відкладений на: "
 
-#: clientgui/ViewWork.cpp:192
-#: clientgui/ViewWork.cpp:782
+#: ViewWork.cpp:187 ViewWork.cpp:777
 msgid "Show active tasks"
 msgstr "Показати активні завдання"
 
-#: clientgui/ViewWork.cpp:193
-#: clientgui/ViewWork.cpp:783
+#: ViewWork.cpp:188 ViewWork.cpp:778
 msgid "Show only active tasks."
 msgstr "Показати тільки активні завдання."
 
-#: clientgui/ViewWork.cpp:206
-msgid "Show VM Console"
-msgstr "Показати консоль ВМ"
+#: ViewWork.cpp:194 sg_TaskCommandPopup.cpp:60
+msgid "Show graphics"
+msgstr "Показати графіку"
+
+#: ViewWork.cpp:195 sg_TaskCommandPopup.cpp:61
+msgid "Show application graphics in a window."
+msgstr "Показати вікно програми з графічною інформацією."
+
+#: ViewWork.cpp:201
+msgid "Show VM Console"
+msgstr "Показати консоль ВМ"
+
+#: ViewWork.cpp:202
+msgid "Show VM Console in a window."
+msgstr "Показати консоль Віртуальної машини в окремому вікні."
+
+#: ViewWork.cpp:209
+msgid "Suspend work for this result."
+msgstr "Призупинити обробку цього завдання."
+
+#: ViewWork.cpp:215 sg_TaskCommandPopup.cpp:72
+msgid "Abort"
+msgstr "Перервати обробку"
+
+#: ViewWork.cpp:216
+msgid "Abandon work on the result. You will get no credit for it."
+msgstr "Перервати обробку цього завдання (видалити завдання). Бали за перервані завдання не нараховуються."
+
+#: ViewWork.cpp:223 sg_TaskCommandPopup.cpp:79
+msgid "Show task details."
+msgstr "Інформація про завдання."
+
+#: ViewWork.cpp:235
+msgid "Elapsed"
+msgstr "Витрачено"
+
+#: ViewWork.cpp:236
+msgid "Remaining (estimated)"
+msgstr "Залишилось (приблизно)"
+
+#: ViewWork.cpp:237
+msgid "Deadline"
+msgstr "Відправити до"
+
+#: ViewWork.cpp:264
+msgid "Tasks"
+msgstr "Завдання"
+
+#: ViewWork.cpp:357
+msgid "Resuming task..."
+msgstr "Відновлення завдання..."
+
+#: ViewWork.cpp:360
+msgid "Suspending task..."
+msgstr "Призупинення завдання..."
+
+#: ViewWork.cpp:389
+msgid "Showing graphics for task..."
+msgstr "Показує графіки для завдань..."
+
+#: ViewWork.cpp:426
+msgid "Showing VM console for task..."
+msgstr "Показує консоль віртуальної машини..."
+
+#: ViewWork.cpp:479
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %s, Status: %s)"
+msgstr "Ви впевнені, що хочете перервати обробку цього завдання '%s'?\n(Прогрес: %s, Статус: %s)"
+
+#: ViewWork.cpp:485
+#, c-format
+msgid "Are you sure you want to abort these %d tasks?"
+msgstr "Ви впевнені, що хочете перервати обробку цих %d завдань?"
+
+#: ViewWork.cpp:490 sg_TaskCommandPopup.cpp:256
+msgid "Abort task"
+msgstr "Перервати обробку завдання"
+
+#: ViewWork.cpp:499
+msgid "Aborting task..."
+msgstr "Зупинка опрацювання завдання..."
+
+#: ViewWork.cpp:771
+msgid "Show all tasks"
+msgstr "Показати всі завдання"
+
+#: ViewWork.cpp:772
+msgid "Show all tasks."
+msgstr "Показати всі завдання."
+
+#: ViewWork.cpp:796 sg_TaskCommandPopup.cpp:103
+msgid "Resume work for this task."
+msgstr "Продовжити обробку цього завдання"
+
+#: ViewWork.cpp:802 sg_TaskCommandPopup.cpp:107
+msgid "Suspend work for this task."
+msgstr "Призупинити обробку цього завдання."
+
+#: WelcomePage.cpp:284
+msgid "Add project or account manager"
+msgstr "Додати проект або менеджер проектів"
+
+#: WelcomePage.cpp:288
+msgid "Add project or use BOINC Account Manager"
+msgstr "Додайте проект або скористайтеся Менеджером проектів BOINC"
+
+#: 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."
+
+#: 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або використовуючи веб-сайт 'Менеджер проектів'."
+
+#: 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для обрання проекту, який хоче [...]
+
+#: WelcomePage.cpp:339
+msgid "Use a BOINC Account Manager"
+msgstr "Скористатися Менеджером проектів BOINC"
+
+#: WelcomePage.cpp:352
+msgid "To continue, click Next."
+msgstr "Для продовження, натисніть кнопку \"Далі\"."
+
+#: WelcomePage.cpp:358
+msgid "Add or change your World Community Grid projects"
+msgstr "Додати або змінити свої проекти від World Community Grid"
+
+#: WelcomePage.cpp:361
+msgid "Add projects run by other researchers or organizations"
+msgstr "Додати проекти, запущені іншими дослідниками або організаціями"
+
+#: WizardAttach.cpp:634
+msgid "Do you really want to cancel?"
+msgstr "Перервати процес підключення?"
+
+#: WizardAttach.cpp:635
+msgid "Question"
+msgstr "Запитання"
+
+#: sg_BoincSimpleFrame.cpp:149
+msgid "Advanced View...\tCtrl+Shift+A"
+msgstr "Розширений вид...\t Ctrl+Shift+A"
+
+#: sg_BoincSimpleFrame.cpp:150
+msgid "Display the advanced graphical interface."
+msgstr "Змінити зовнішній вигляд на більш розширений."
+
+#: sg_BoincSimpleFrame.cpp:157
+msgid "Skin"
+msgstr "Обкладинка"
+
+#: sg_BoincSimpleFrame.cpp:159
+msgid "Select the appearance of the user interface."
+msgstr "Виберіть зовнішній вигляд користувацького інтерфейсу."
+
+#: sg_BoincSimpleFrame.cpp:206
+#, c-format
+msgid "&%s"
+msgstr "&%s"
+
+#: sg_BoincSimpleFrame.cpp:390
+msgid "Default"
+msgstr "За замовчуванням"
+
+#: sg_BoincSimpleFrame.cpp:759
+msgid "Suspend Computing"
+msgstr "Призупинити обчислення"
+
+#: sg_BoincSimpleFrame.cpp:760
+msgid "Resume Computing"
+msgstr "Відновити обчислення"
+
+#: sg_BoincSimpleFrame.cpp:777
+msgid "Open a window to view notices from projects or BOINC"
+msgstr "Відкрити вікно перегляду повідомлень проектів і BOINC"
+
+#: sg_DlgMessages.cpp:146
+msgid "Close"
+msgstr "Закрити"
+
+#: sg_DlgMessages.cpp:389
+#, c-format
+msgid "%s - Notices"
+msgstr "%s - Повідомлення"
+
+#: sg_DlgPreferences.cpp:268
+msgid "This dialog controls preferences for this computer only."
+msgstr "Це діалогове вікно керує налаштуваннями тільки даного комп’ютера."
+
+#: sg_DlgPreferences.cpp:273
+msgid "Click OK to set preferences."
+msgstr "Для збереження налаштувань натисніть 'Гаразд'."
+
+#: sg_DlgPreferences.cpp:278
+msgid ""
+"Click Clear to restore web-based settings for all preferences listed below."
+msgstr "Для відновлення інтернет налаштувань всіх вказаних нижче уподобань натисніть Очистити."
+
+#: sg_DlgPreferences.cpp:285
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
+msgstr "Для додаткових параметрів, виберіть Налаштування клієнта у Розширеному виді."
+
+#: sg_DlgPreferences.cpp:313
+msgid "Do work only between:"
+msgstr "Працювати тільки між:"
+
+#: sg_DlgPreferences.cpp:335
+msgid "Connect to internet only between:"
+msgstr "Доступ в інтернет тільки між:"
+
+#: sg_DlgPreferences.cpp:357 sg_DlgPreferences.cpp:374
+msgid "Use no more than:"
+msgstr "Використовувати не більше:"
+
+#: sg_DlgPreferences.cpp:370
+msgid "of disk space"
+msgstr "місця на диску"
+
+#: sg_DlgPreferences.cpp:387
+msgid "of the processor"
+msgstr "процесора"
+
+#: sg_DlgPreferences.cpp:391
+msgid "Do work while on battery?"
+msgstr "Працювати на батареях?"
+
+#: sg_DlgPreferences.cpp:404
+msgid "Do work after idle for:"
+msgstr "Запуск обробки при простої:"
+
+#: sg_DlgPreferences.cpp:429
+msgid "Clear all local preferences listed above and close the dialog"
+msgstr "Очистити всі вказані локальні налаштування і закрити діалогове вікно"
+
+#: 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 "Завжди"
+
+#: sg_DlgPreferences.cpp:638
+msgid "100 MB"
+msgstr "100 Мб"
 
-#: clientgui/ViewWork.cpp:207
-msgid "Show VM Console in a window."
-msgstr "Показати консоль Віртуальної машини в окремому вікні."
+#: sg_DlgPreferences.cpp:639
+msgid "200 MB"
+msgstr "200 Мб"
 
-#: clientgui/ViewWork.cpp:214
-msgid "Suspend work for this result."
-msgstr "Призупинити обробку цього завдання."
+#: sg_DlgPreferences.cpp:640
+msgid "500 MB"
+msgstr "500 Мб"
 
-#: clientgui/ViewWork.cpp:221
-msgid "Abandon work on the result. You will get no credit for it."
-msgstr "Перервати обробку цього завдання (видалити завдання). Бали за перервані завдання не нараховуються."
+#: sg_DlgPreferences.cpp:641
+msgid "1 GB"
+msgstr "1 Гб"
 
-#: clientgui/ViewWork.cpp:240
-msgid "Elapsed"
-msgstr "Витрачено"
+#: sg_DlgPreferences.cpp:642
+msgid "2 GB"
+msgstr "2 Гб"
 
-#: clientgui/ViewWork.cpp:241
-msgid "Remaining (estimated)"
-msgstr "Залишилось (приблизно)"
+#: sg_DlgPreferences.cpp:643
+msgid "5 GB"
+msgstr "5 Гб"
 
-#: clientgui/ViewWork.cpp:242
-msgid "Deadline"
-msgstr "Відправити до"
+#: sg_DlgPreferences.cpp:644
+msgid "10 GB"
+msgstr "10 Гб"
 
-#: clientgui/ViewWork.cpp:269
-msgid "Tasks"
-msgstr "Завдання"
+#: sg_DlgPreferences.cpp:645
+msgid "20 GB"
+msgstr "20 Гб"
 
-#: clientgui/ViewWork.cpp:362
-msgid "Resuming task..."
-msgstr "Відновлення завдання..."
+#: sg_DlgPreferences.cpp:646
+msgid "50 GB"
+msgstr "50 Гб"
 
-#: clientgui/ViewWork.cpp:365
-msgid "Suspending task..."
-msgstr "Призупинення завдання..."
+#: sg_DlgPreferences.cpp:647
+msgid "100 GB"
+msgstr "100 Гб"
 
-#: clientgui/ViewWork.cpp:394
-msgid "Showing graphics for task..."
-msgstr "Показує графіки для завдань..."
+#: sg_DlgPreferences.cpp:717
+#, c-format
+msgid "%d MB"
+msgstr "%d Мб"
 
-#: clientgui/ViewWork.cpp:431
-msgid "Showing VM console for task..."
-msgstr "Показує консоль віртуальної машини..."
+#: sg_DlgPreferences.cpp:719
+#, c-format
+msgid "%4.2f GB"
+msgstr "%4.2f Гб"
 
-#: clientgui/ViewWork.cpp:484
+#: sg_DlgPreferences.cpp:760
 #, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %s, Status: %s)"
-msgstr ""
-"Ви впевнені, що хочете перервати обробку цього завдання '%s'?\n"
-"(Прогрес: %s, Статус: %s)"
+msgid "%d%%"
+msgstr "%d%%"
 
-#: clientgui/ViewWork.cpp:490
+#: sg_DlgPreferences.cpp:796
+msgid "0 (Run Always)"
+msgstr "0 (працювати завжди)"
+
+#: sg_DlgPreferences.cpp:799
 #, c-format
-msgid "Are you sure you want to abort these %d tasks?"
-msgstr "Ви впевнені, що хочете перервати обробку цих %d завдань?"
+msgid "%d"
+msgstr "%d"
 
-# 75%
-#: clientgui/ViewWork.cpp:504
-msgid "Aborting task..."
-msgstr "Зупинка опрацювання завдання..."
+#: sg_DlgPreferences.cpp:1029
+msgid "Do you really want to clear all local preferences?\n"
+msgstr "Ви справді хочете видалити всі налаштування, які зберігаються локально?\n"
 
-#: clientgui/ViewWork.cpp:776
-msgid "Show all tasks"
-msgstr "Показати всі завдання"
+#: sg_ProjectPanel.cpp:72
+msgid "Add Project"
+msgstr "Додати проект"
 
-#: clientgui/ViewWork.cpp:777
-msgid "Show all tasks."
-msgstr "Показати всі завдання."
+#: sg_ProjectPanel.cpp:73
+msgid "Synchronize"
+msgstr "Синхронізувати"
 
-#: clientgui/WelcomePage.cpp:284
-msgid "Add project or account manager"
-msgstr "Додати проект або менеджер проектів"
+#: sg_ProjectPanel.cpp:74
+msgid "Work done for this project"
+msgstr "Для цього проекту робота завершена"
 
-#: clientgui/WelcomePage.cpp:288
-msgid "Add project or use BOINC Account Manager"
-msgstr "Додайте проект або скористайтеся Менеджером проектів BOINC"
+#: sg_ProjectPanel.cpp:77
+msgid "Synchronize projects with account manager system"
+msgstr "Синхронізація інформації про проекти та налаштування між BOINC клієнтом і менеджером проектів"
 
-#: 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."
+#: sg_ProjectPanel.cpp:124
+msgid "Select a project to access with the controls below"
+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"
-"або використовуючи веб-сайт 'Менеджер проектів'."
+#: sg_ProjectPanel.cpp:145
+msgid "Project Web Pages"
+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"
+#: sg_ProjectPanel.cpp:149
+msgid "Project Commands"
+msgstr "Команди проекту"
 
-#: clientgui/WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
-msgstr "Скористатися Менеджером проектів BOINC"
+#: sg_ProjectPanel.cpp:267
+#, c-format
+msgid "Pop up a menu of web sites for project %s"
+msgstr "Показати меню веб-сайтів для проекту %s"
 
-#: clientgui/WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
-msgstr "Додати або змінити свої проекти від World Community Grid"
+#: sg_ProjectPanel.cpp:269
+#, c-format
+msgid "Pop up a menu of commands to apply to project %s"
+msgstr "Показати меню команд, застосовних до проекту%s"
 
-#: clientgui/WelcomePage.cpp:361
-msgid "Add projects run by other researchers or organizations"
-msgstr "Додати проекти, запущені іншими дослідниками або організаціями"
+#: sg_TaskCommandPopup.cpp:67
+msgid "Suspend this task."
+msgstr "Призупинити це завдання."
 
-#: clientgui/WizardAttach.cpp:673
-msgid "Do you really want to cancel?"
-msgstr "Перервати процес підключення?"
+#: sg_TaskCommandPopup.cpp:73
+msgid "Abandon this task. You will get no credit for it."
+msgstr "Відмовитися від цього завдання. Ви не отримаєте за нього балів."
 
-#: clientgui/WizardAttach.cpp:674
-msgid "Question"
-msgstr "Запитання"
+#: sg_TaskCommandPopup.cpp:251
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %.1lf%%, Status: %s)"
+msgstr "Ви впевнені, що хочете перервати обробку цього завдання '%s'?\n(Прогрес: %.1lf%%, Стан: %s)"
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
-msgid "&Next >"
-msgstr "&Далі >"
+#: sg_TaskPanel.cpp:464
+msgid "You don't have any projects.  Please Add a Project."
+msgstr "BOINC не підключений до жодного проекту."
 
-#: clientgui/wizardex.cpp:383
-msgid "< &Back"
-msgstr "< &Назад"
+#: sg_TaskPanel.cpp:465
+msgid "Not available"
+msgstr "Недоступно"
 
-#: clientgui/wizardex.cpp:553
-msgid "&Finish"
-msgstr "&Готово"
+#: sg_TaskPanel.cpp:476
+msgid "Tasks:"
+msgstr "Завдання:"
 
-#: clientgui/common/wxPieCtrl.cpp:64
-msgid "Pie Ctrl"
-msgstr "Pie Ctrl"
+#: sg_TaskPanel.cpp:482
+msgid "Select a task to access"
+msgstr "Вибрати завдання для доступу"
 
-#: clientgui/mac/Mac_GUI.cpp:35
-msgid "Services"
-msgstr "Сервіси"
+#: sg_TaskPanel.cpp:493
+msgid "From:"
+msgstr "Від:"
 
-#: clientgui/mac/Mac_GUI.cpp:36
-#, c-format
-msgid "Hide %s"
-msgstr "Приховати %s"
+#: sg_TaskPanel.cpp:547
+msgid "This task's progress"
+msgstr "Прогрес цього завдання"
 
-#: clientgui/mac/Mac_GUI.cpp:37
-msgid "Hide Others"
-msgstr "Приховати інші"
+#: sg_TaskPanel.cpp:565
+msgid "Task Commands"
+msgstr "Команди завдання"
 
-#: clientgui/mac/Mac_GUI.cpp:38
-msgid "Show All"
-msgstr "Показати все"
+#: sg_TaskPanel.cpp:566
+msgid "Pop up a menu of commands to apply to this task"
+msgstr "Показати меню команд, застосовних до цього завдання"
 
-#: clientgui/mac/Mac_GUI.cpp:39
+#: sg_TaskPanel.cpp:701
 #, c-format
-msgid "Quit %s"
-msgstr "Вийти %s"
+msgid "Application: %s"
+msgstr "Додаток: %s"
 
-#: clientgui/DlgAdvPreferences.h:30
-msgid "specify work start and stop hours in format HH:MM-HH:MM"
-msgstr "визначте час початку та призупинення роботи у форматі ГГ:ХХ-ГГ:ХХ"
-
-#: clientgui/DlgAdvPreferences.h:31
-msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
-msgstr "визначте час початку та призупинення роботи з мережею у форматі ГГ:ХХ-ГГ:ХХ"
-
-# 98%
-#~ msgid ""
-#~ "(C) 2003-2013 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2013 Каліфорнійський університет, Берклі.\n"
-#~ "Усі права захищені."
+#: sg_TaskPanel.cpp:724
 #, c-format
-#~ msgid "%s - Preferences"
-#~ msgstr "%s - Налаштування"
+msgid "%.3f%%"
+msgstr "%.3f%%"
 
-#, no-c-format
-#~ msgid "% of the processors (0 means ignore this setting)"
-#~ msgstr "% процесорів (0 означає ігнорування цього налаштування)"
+#: sg_TaskPanel.cpp:732
+msgid "Application: Not available"
+msgstr "Додаток: недоступний"
 
-#, no-c-format
-#~ msgid "% CPU time"
-#~ msgstr "% часу процесора"
-#~ msgid "KBytes/sec."
-#~ msgstr "КБайт/с."
-#~ msgid "Mbytes"
-#~ msgstr "Мбайт"
-#~ msgid "every"
-#~ msgstr "кожні"
-#~ msgid "days"
-#~ msgstr "днів"
-#~ msgid "Gigabytes disk space"
-#~ msgstr "Гігабайт місця на диску"
-#~ msgid "Running, high priority"
-#~ msgstr "Працює, високий пріоритет"
-#~ msgid " (Scheduler wait: "
-#~ msgstr " (Планувальник очікує: "
-#~ msgid " (Scheduler wait)"
-#~ msgstr " (Планувальник очікує)"
-#~ msgid " (Waiting for network access)"
-#~ msgstr " (Очікування доступу до мережі)"
-#~ msgid "Preferences…"
-#~ msgstr "Налаштування..."
-#~ msgid "I do not agree with the terms of use."
-#~ msgstr "Я не згоден з умовами використання."
-#~ msgid "Click Clear to restore web-based settings."
-#~ msgstr "Натисніть 'Очистити' для повернення веб-налаштувань."
-#~ msgid "For additional settings, select Computing Preferences in "
-#~ msgstr "Для додаткових параметрів виберіть 'Налаштування клієнта' у  "
-#~ msgid "the Advanced View."
-#~ msgstr "Розширений вигляд."
-#~ msgid "Workunit name"
-#~ msgstr "Назва завдання"
-#~ msgid "invalid float"
-#~ msgstr "помилкове число"
-#~ msgid "Display the advanced (accessible) graphical interface."
-#~ msgstr "Змінити зовнішній вигляд на розширений."
-#~ msgid "Paused: Other work running"
-#~ msgstr "Пауза: обробляється інше завдання"
-#~ msgid "Paused: User initiated.  Click 'Resume' to continue"
-#~ msgstr ""
-#~ "Пауза: запит користувача.  Натисніть 'Продовжити' для відновлення обробки"
-#~ msgid "Paused: User active"
-#~ msgstr "Пауза: працює користувач"
-#~ msgid "Paused: Computer on battery"
-#~ msgstr "Пауза: робота комп'ютера від батарей"
-#~ msgid "Paused: Time of Day"
-#~ msgstr "Пауза: заборонений час доби"
-#~ msgid "Paused: Benchmarks running"
-#~ msgstr "Пауза: запущено тест продуктивності"
-#~ msgid "Paused"
-#~ msgstr "Пауза"
-#~ msgid "Paused: Application start delayed"
-#~ msgstr "Пауза: запуск додатка відкладений"
-#~ msgid "Click to show project graphics"
-#~ msgstr "Натисніть, щоб показати вікно додатку з графічною інформацією"
-#~ msgid "Open a window to view messages"
-#~ msgstr "Відкрити вікно з повідомленнями"
-#~ msgid "Stop all activity"
-#~ msgstr "Призупинити активність"
-#~ msgid "Resume activity"
-#~ msgstr "Відновити активність"
-#~ msgid "Open a window to set your preferences"
-#~ msgstr "Відкрити вікно налаштувань клієнта"
-#~ msgid "Switch to the BOINC advanced view"
-#~ msgstr "Змінити зовнішній вигляд BOINC менеджера на більш докладний"
-#~ msgid "My Projects:"
-#~ msgstr "Мої проекти:"
+#: sg_TaskPanel.cpp:832
+msgid "Not Available"
+msgstr "Недоступно"
 
+#: sg_TaskPanel.cpp:847
 #, c-format
-#~ msgid "%s. Work done by %s: %0.2f"
-#~ msgstr "% s. Користувачем % s зароблено: %0.2f"
+msgid "Elapsed: %s"
+msgstr "Витрачено: %s"
 
+#: sg_TaskPanel.cpp:861
 #, c-format
-#~ msgid "%.1lf"
-#~ msgstr "%.1lf"
+msgid "Remaining (estimated): %s"
+msgstr "Залишилось (приблизно): %s"
 
+#: sg_TaskPanel.cpp:876
 #, c-format
-#~ msgid "%d hr %d min %d sec"
-#~ msgstr "%d год %d хв %d с"
-#~ msgid "Are you sure you want to display graphics on a remote machine?"
-#~ msgstr ""
-#~ "Ви впевнені, що хочете надати можливість відображення графіки на віддаленому "
-#~ "комп’ютері?"
-#~ msgid "Application: "
-#~ msgstr "Додаток: "
-#~ msgid "Time Remaining: "
-#~ msgstr "Залишилося: "
-#~ msgid "Elapsed Time: "
-#~ msgstr "Витрачено часу: "
-#~ msgid "Account manager website"
-#~ msgstr "Веб-сайт менеджера проектів"
-#~ msgid "Account Manager &URL:"
-#~ msgstr "&URL-адреса менеджера проектів:"
+msgid "Status: %s"
+msgstr "Стан: %s"
 
-#, c-format
-#~ msgid "%s &website"
-#~ msgstr "%s &веб-сайт"
-#~ msgid "Notice List"
-#~ msgstr "Список повідомлень"
+#: sg_TaskPanel.cpp:1223
+msgid "Retrieving current status."
+msgstr "Перевірка поточного стану."
 
-#, c-format
-#~ msgid "%s; received on %s"
-#~ msgstr "%s; отримано на%s"
+#: sg_TaskPanel.cpp:1229
+msgid "Downloading work from the server."
+msgstr "Завантаження завдань із сервера проекту."
 
-#, c-format
-#~ msgid "%s; received from %s; on %s"
-#~ msgstr "% s; отриманий від % s; на%s"
-#~ msgid "Click"
-#~ msgstr "Натиснути"
-#~ msgid "Project List"
-#~ msgstr "Список проектів"
-#~ msgid "Nvidia GPU Supported"
-#~ msgstr "Підтримка графічних процесорів NVIDIA"
-#~ msgid "ATI GPU Supported"
-#~ msgstr "Підтримка графічних процесорів ATI"
-#~ msgid "Project Website"
-#~ msgstr "Веб-сайт проекту"
-#~ msgid "One or more items failed to load from the Internet."
-#~ msgstr "Один або більше пунктів не вдалося завантажити з Інтернету."
-
-# 88%
-#~ msgid "Retry now"
-#~ msgstr "Повторити негайно"
-#~ msgid "10%"
-#~ msgstr "10%"
-#~ msgid "20%"
-#~ msgstr "20%"
-#~ msgid "30%"
-#~ msgstr "30%"
-#~ msgid "40%"
-#~ msgstr "40%"
-#~ msgid "50%"
-#~ msgstr "50%"
-#~ msgid "60%"
-#~ msgstr "60%"
-#~ msgid "70%"
-#~ msgstr "70%"
-#~ msgid "80%"
-#~ msgstr "80%"
-#~ msgid "90%"
-#~ msgstr "90%"
-#~ msgid "100%"
-#~ msgstr "100%"
-#~ msgid "1"
-#~ msgstr "1"
-#~ msgid "3"
-#~ msgstr "3"
-#~ msgid "5"
-#~ msgstr "5"
-#~ msgid "10"
-#~ msgstr "10"
-#~ msgid "15"
-#~ msgstr "15"
-#~ msgid "30"
-#~ msgstr "30"
-#~ msgid "60"
-#~ msgstr "60"
-#, c-format
-#~ msgid "Pop up a menu of websites for project %s"
-#~ msgstr "Показати меню веб-сайтів для проекту %s"
-#~ msgid ""
-#~ "for accessibility support, please select advanced from the view menu or type "
-#~ "command shift a"
-#~ msgstr ""
-#~ "для підтримки спеціальних можливостей, будь ласка виберіть меню \"Розширений "
-#~ "вигляд\" або введіть команду shift a"
-#~ msgid "This panel contains graphs showing user totals for projects"
-#~ msgstr ""
-#~ "Ця панель містить графіки, що показують досягнення користувачів у проектах"
-#~ msgid "list headers"
-#~ msgstr "Список заголовків"
-#~ msgid "list of events"
-#~ msgstr "Список подій"
-#~ msgid "list of events is empty"
-#~ msgstr "Список подій порожній"
+#: sg_TaskPanel.cpp:1234
+msgid "Processing Suspended:  Running On Batteries."
+msgstr "Обробка призупинена:  робота комп’ютера від батарей."
 
-#, c-format
-#~ msgid "list of %s"
-#~ msgstr "список %s"
+#: sg_TaskPanel.cpp:1236
+msgid "Processing Suspended:  User Active."
+msgstr "Обробка призупинена:  працює користувач."
 
-#, c-format
-#~ msgid "list of %s is empty"
-#~ msgstr "список %s порожній"
+#: sg_TaskPanel.cpp:1238
+msgid "Processing Suspended:  User paused processing."
+msgstr "Обробка призупинена:  за ініціативи користувача."
 
-#, c-format
-#~ msgid "; current sort column %d of %d; descending order; "
-#~ msgstr "; поточний стовпець сортування %d з %d; у спадному порядку; "
+#: sg_TaskPanel.cpp:1240
+msgid "Processing Suspended:  Time of Day."
+msgstr "Обробка призупинена:  заборонений час доби."
 
-#, c-format
-#~ msgid "; current sort column %d of %d; ascending order; "
-#~ msgstr "; поточний стовпець сортування %d з %d; в зростаючому порядку; "
+#: sg_TaskPanel.cpp:1242
+msgid "Processing Suspended:  Benchmarks Running."
+msgstr "Обробка призупинена:  запущений тест продуктивності."
 
-#, c-format
-#~ msgid "; column %d of %d; "
-#~ msgstr "; стовпець %d з %d; "
-#~ msgid "list is empty"
-#~ msgstr "список порожній"
+#: sg_TaskPanel.cpp:1244
+msgid "Processing Suspended."
+msgstr "Обробка призупинена."
 
-#, c-format
-#~ msgid "; row %d; "
-#~ msgstr "; рядок %d; "
+#: sg_TaskPanel.cpp:1248
+msgid "Waiting to contact project servers."
+msgstr "Зачекайте будь-ласка."
 
-#, c-format
-#~ msgid "; selected row %d of %d; "
-#~ msgstr "; вибраний рядок %d з %d; "
+#: sg_TaskPanel.cpp:1252 sg_TaskPanel.cpp:1261
+msgid "Retrieving current status"
+msgstr "Перевірка поточного стану"
 
-#, c-format
-#~ msgid "; selected row %d ; "
-#~ msgstr "; вибраний рядок %d; "
+#: sg_TaskPanel.cpp:1256
+msgid "No work available to process"
+msgstr "Відсутні завдання для обробки"
 
-#, c-format
-#~ msgid "; row %d of %d; "
-#~ msgstr "; рядок %d з %d; "
-#~ msgid "blank"
-#~ msgstr "порожньо"
-#~ msgid "list of projects or account managers"
-#~ msgstr "список проектів або менеджерів проектів"
+#: sg_TaskPanel.cpp:1258
+msgid "Unable to connect to the core client"
+msgstr "Не вдалося підключитися до BOINC клієнта"
 
-#, c-format
-#~ msgid "selected row %d of %d; "
-#~ msgstr "вибраний рядок %d із %d; "
+#: wizardex.cpp:377 wizardex.cpp:553
+msgid "&Next >"
+msgstr "&Далі >"
 
-#, c-format
-#~ msgid "row %d of %d; "
-#~ msgstr "рядок %d з %d; "
-#~ msgid "The minimum username length for this project is 1. Please enter a different username."
-#~ msgstr ""
-#~ "Мінімальна довжина імені учасника для даного проекту 1 символ. Будь-ласка, "
-#~ "вкажіть інше ім’я."
-#~ msgid "The minimum username length for this account manager is 1. Please enter a different username."
-#~ msgstr ""
-#~ "Мінімальна довжина імені учасника для даного менеджера проектів 1 символ. "
-#~ "Будь-ласка, вкажіть інше ім’я."
-#~ msgid "The minimum email address length for this project is 1. Please enter a different email address."
-#~ msgstr ""
-#~ "Мінімальна довжина адреси електронної пошти для даного проекту 1 символ. "
-#~ "Будь-ласка, вкажіть іншу адресу."
-#~ msgid "The minimum email address length for this account manager is 1. Please enter a different email address."
-#~ msgstr ""
-#~ "Мінімальна довжина адреси електронної пошти для даного менеджера проектів 1 "
-#~ "символ. Будь-ласка, вкажіть іншу адресу."
+#: wizardex.cpp:383
+msgid "< &Back"
+msgstr "< &Назад"
 
-#, c-format
-#~ msgid "The minimum password length for this project is %d. Please enter a different password."
-#~ msgstr ""
-#~ "Мінімальна довжина паролю для цього проекту становить %d символів. "
-#~ "Будь-ласка, введіть інший пароль."
+#: wizardex.cpp:553
+msgid "&Finish"
+msgstr "&Готово"
 
-#, c-format
-#~ msgid "The minimum password length for this account manager is %d. Please enter a different password."
-#~ msgstr ""
-#~ "Мінімальна довжина паролю для цього менеджера проектів становить %d "
-#~ "символів. Будь-ласка, введіть інший пароль."
-#~ msgid ""
-#~ "An error has occurred;\n"
-#~ "check the Event Log for details.\n"
-#~ "\n"
-#~ "Click Finish to close."
-#~ msgstr ""
-#~ "Сталася помилка;\n"
-#~ "подробиці можна знайти у вікні 'Перегляд подій'.\n"
-#~ "\n"
-#~ "Для завершення натисніть кнопку 'Готово'."
+#: mac/Mac_GUI.cpp:110
+msgid "Preferences…"
+msgstr "Налаштування..."
 
-#, no-c-format
-#~ msgid "% of the processors"
-#~ msgstr "% процесорів"
+#: mac/Mac_GUI.cpp:122
+msgid "Services"
+msgstr "Сервіси"
 
+#: mac/Mac_GUI.cpp:144
 #, c-format
-#~ msgid "New page inserted. Index = %i"
-#~ msgstr "Нова сторінка вставлена. Індекс = %i"
+msgid "Hide %s"
+msgstr "Приховати %s"
 
-#, c-format
-#~ msgid "New page appended. Index = %i"
-#~ msgstr "Нову сторінку додано. Індекс = %i"
+#: mac/Mac_GUI.cpp:158
+msgid "Hide Others"
+msgstr "Приховати інші"
 
-#, c-format
-#~ msgid "Old Page Index = %i"
-#~ msgstr "Індекс старої сторінки = %i"
+#: mac/Mac_GUI.cpp:172
+msgid "Show All"
+msgstr "Показати все"
 
+#: mac/Mac_GUI.cpp:186
 #, c-format
-#~ msgid "OnDropTarget: index by HitTest = %i"
-#~ msgstr "OnDropTarget: індекс за HitTest = %i"
-#~ msgid "Identify your account "
-#~ msgstr "Ідентифікуйте свій обліковий запис "
-#~ msgid "Read config file"
-#~ msgstr "Читати файл налаштувань"
-#~ msgid "Read configuration info from cc_config.xml"
-#~ msgstr "Читати інформацію щодо налаштувань з cc_config.xml"
-#~ msgid ""
-#~ "(C) 2003-2011 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2011 Каліфорнійський університет, Берклі.\n"
-#~ "Усі права захищені."
-#~ msgid "NVIDIA GPU"
-#~ msgstr "графічний процесор NVIDIA"
-#~ msgid "ATI GPU"
-#~ msgstr "графічний процесор ATI"
-#~ msgid "Multicore CPU Supported"
-#~ msgstr "Підтримка багатоядерних процесорів"
-#~ msgid "%s: %.0f"
-#~ msgstr "%s: %.0f"
-#~ msgid "Click 'Retry now' to transfer the file now"
-#~ msgstr "Запустити повторну передачу даних"
-#~ msgid ""
-#~ "Click 'Abort transfer' to delete the file from the transfer queue. This "
-#~ "will prevent you from being granted credit for this result."
-#~ msgstr ""
-#~ "Натисніть 'Перервати передачу' для видалення виділеного файлу з черги "
-#~ "передачі. УВАГА: бали за завдання будуть втрачені."
-#~ msgid "Aborting result..."
-#~ msgstr "Відміна результату..."
-#~ msgid ""
-#~ "You have chosen to add a new BOINC project.  Adding a new\n"
-#~ "project means that you will be connecting your computer to a new "
-#~ "organization.\n"
-#~ "If this is what you wanted to do, please click on\n"
-#~ "the 'Next' button below.\n"
-#~ "\n"
-#~ "Some projects like World Community Grid run multiple research "
-#~ "applications.\n"
-#~ "If you want to change which research applications are sent to your "
-#~ "computer\n"
-#~ "to run, visit the project's website and modify your\n"
-#~ "preferences there.\n"
-#~ "\n"
-#~ "To change which research applications are sent to you from\n"
-#~ "World Community Grid then please click on the following button:"
-#~ msgstr ""
-#~ "Ви вибрали додавання нового проекту BOINC. Додавання нового\n"
-#~ "проекту означає, що Ваш комп'ютер зв'яжеться за допомогою мережі із "
-#~ "сайтом проекту.\n"
-#~ "Якщо Ви згодні з цим,будь ласка натисніть\n"
-#~ "кнопку 'Далі' \n"
-#~ "\n"
-#~ "Деякі проекти, наприклад World Community Grid, використовують декілька "
-#~ "розрахункових додатків.\n"
-#~ "Для вибору конкретних розрахункових додатків, що працюють на Вашому "
-#~ "комп'ютері,\n"
-#~ "необхідна зміна відповідних налаштувань на сайті проекту.\n"
-#~ "\n"
-#~ "Для вибору розрахункових додатків World Community Grid,\n"
-#~ "які працюють на Вашому комп'ютері, натисніть наступну кнопку:"
-#~ msgid "Change Research Applications at World Community Grid"
-#~ msgstr "Вибрати розрахункові додатки для World Community Grid"
-
+msgid "Quit %s"
+msgstr "Вийти %s"
diff --git a/locale/uk/BOINC-Project-Generic.po b/locale/uk/BOINC-Project-Generic.po
index c28eb30..3a9c899 100644
--- a/locale/uk/BOINC-Project-Generic.po
+++ b/locale/uk/BOINC-Project-Generic.po
@@ -1,24 +1,25 @@
 # BOINC web translation
 # Copyright (C) 2008 University of California
+# 
 # This file is distributed under the same license as BOINC.
+# 
 # FileID  : $Id$
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\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: 2014-02-26 13:35+0000\n"
-"Last-Translator: point <Kobzar at icn.od.ua>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: uk\n"
+"PO-Revision-Date: 2015-02-09 01:32+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\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"
 "Content-Transfer-Encoding: 8bit\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"
-"X-Generator: Pootle 2.5.0\n"
+"Language: uk\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"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1393421732.0\n"
 
 msgid "LANG_NAME_NATIVE"
 msgstr "Українська"
@@ -61,9 +62,7 @@ msgstr "Вставлення зображення: [img]http://посиланн
 #: ../inc/bbcode_html.inc:35
 msgid ""
 "Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url]  (alt+w)"
-msgstr ""
-"Вставлення URL-адреси: [url]http://url[/url] або "
-"[url=http://url]URL-текст[/url]  (alt+w)"
+msgstr "Вставлення URL-адреси: [url]http://url[/url] або [url=http://url]URL-текст[/url]  (alt+w)"
 
 #: ../inc/bbcode_html.inc:42
 msgid "Font color"
@@ -72,9 +71,7 @@ msgstr "Колір шрифту"
 #: ../inc/bbcode_html.inc:43
 msgid ""
 "Font color: [color=red]text[/color]  Tip: you can also use color=#FF0000"
-msgstr ""
-"Колір шрифту: [color=red]текст[/color] Підказка: Ви також можете використати "
-"color=#FF0000"
+msgstr "Колір шрифту: [color=red]текст[/color] Підказка: Ви також можете використати color=#FF0000"
 
 #: ../inc/bbcode_html.inc:44 ../inc/bbcode_html.inc:59 ../inc/prefs.inc:638
 msgid "Default"
@@ -273,7 +270,6 @@ msgstr "Повідомлення %1"
 msgid "hidden"
 msgstr "приховане"
 
-# 80%
 #: ../inc/forum.inc:625
 msgid "Posted: %1"
 msgstr "Відправлено: %1"
@@ -296,11 +292,9 @@ msgstr "Остання зміна: %1"
 
 #: ../inc/forum.inc:640
 msgid ""
-"This post is not shown because the sender is on your 'ignore' list.  Click %"
-"1here%2 to view this post"
-msgstr ""
-"Це повідомлення не показується тому, що відправник у Вашому списку "
-"ігнорування.  Натисніть %1тут%2 для того, щоб побачити це повідомлення"
+"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
 msgid "Report this post as offensive"
@@ -378,26 +372,7 @@ msgid ""
 "        <li> No abusive comments involving race, religion,\n"
 "            nationality, gender, class or sexuality.\n"
 "        "
-msgstr ""
-"\n"
-"        <ul>\n"
-"        <li> Повідомлення повинні бути 'дружелюбні до дітей': вони не "
-"повинні містити\n"
-"            контент, який є непристойним, пов’язаним з ненавистю,\n"
-"            виразно сексуальним або навідним.\n"
-"        <li> Не повинно бути комерційної реклами.\n"
-"        <li> Не повинно бути посилань на веб-сайти, пов’язані із сексуальним "
-"вмістом,\n"
-"            азартними іграми або нетерпимістю інших.\n"
-"        <li> Не повинно бути повідомлень, які дратують інших людей чи "
-"протиставлять їх,\n"
-"            або таких, що захоплюють обговорення.\n"
-"        <li> Не повинно бути повідомлень, які є свідомо ворожими або "
-"образливими.\n"
-"        <li> Не повинно бути образливих коментарів, що торкаються питань "
-"раси, релігії,\n"
-"            національності, статі, класу чи сексуальності.\n"
-"        "
+msgstr "\n        <ul>\n        <li> Повідомлення повинні бути 'дружелюбні до дітей': вони не повинні містити\n            контент, який є непристойним, пов’язаним з ненавистю,\n            виразно сексуальним або навідним.\n        <li> Не повинно бути комерційної реклами.\n        <li> Не повинно бути посилань на веб-сайти, пов’язані із сексуальним вмістом,\n            азартними іграми або нетерпимістю інших.\n        <li> Не повинно бути повідомлень, які дратують інших людей чи проти [...]
 
 #: ../inc/forum.inc:780
 msgid "Rules:"
@@ -449,36 +424,26 @@ msgstr "Почати голосування за блокування автор
 
 #: ../inc/forum.inc:1116
 msgid "Only team members can post to the team message board"
-msgstr ""
-"Тільки учасники команди можуть залишати повідомлення на дошці повідомлень "
-"команди"
+msgstr "Тільки учасники команди можуть залишати повідомлення на дошці повідомлень команди"
 
 #: ../inc/forum.inc:1126
 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, у Вас повинна бути певна "
-"кількість балів. Це обмеження повинне попередити і захистити систему проти "
-"зловживань."
+msgstr "Щоб створити нову тему для обговорень в %1, у Вас повинна бути певна кількість балів. Це обмеження повинне попередити і захистити систему проти зловживань."
 
 #: ../inc/forum.inc:1133
 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 ""
-"Прямо зараз Ви не можете створити тему для обговорення. Будь ласка, трохи "
-"почекайте перед повторною спробою. Ця затримка сталася для того, щоб "
-"захистити систему проти зловживань."
+msgstr "Прямо зараз Ви не можете створити тему для обговорення. Будь ласка, трохи почекайте перед повторною спробою. Ця затримка сталася для того, щоб захистити систему проти зловживань."
 
 #: ../inc/forum.inc:1140
 msgid ""
 "This thread is locked. Only forum moderators and administrators are allowed "
 "to post there."
-msgstr ""
-"Це обговорення заблоковане. Тільки модератори форуму і адміністратори можуть "
-"залишати тут повідомлення."
+msgstr "Це обговорення заблоковане. Тільки модератори форуму і адміністратори можуть залишати тут повідомлення."
 
 #: ../inc/forum.inc:1145
 msgid "Can't post to a hidden thread."
@@ -915,7 +880,6 @@ msgstr "Вхідні"
 msgid "Write"
 msgstr "Написати"
 
-# 80%
 #: ../inc/pm.inc:33 ../inc/user.inc:378
 msgid "Send private message"
 msgstr "Відправити приватне повідомлення"
@@ -966,23 +930,16 @@ msgstr "Неможливо створити повідомлення"
 msgid ""
 "You are not allowed to send privates messages so often. Please wait some "
 "time before sending more messages."
-msgstr ""
-"Вам не можна відправляти особисті повідомлення так часто. Будь-ласка, "
-"зачекайте трохи, перш ніж відправити ще."
+msgstr "Вам не можна відправляти особисті повідомлення так часто. Будь-ласка, зачекайте трохи, перш ніж відправити ще."
 
-# 83%
 #: ../inc/pm.inc:176 ../user/forum_forum.php:186
 msgid "unread"
 msgstr "непрочитаних"
 
 #: ../inc/pm.inc:186
 msgid "For email notification, %1edit community prefs%2"
-msgstr ""
-"Для отримання повідомлень електронною поштою %1відредагуйте налаштування "
-"спільноти%2"
+msgstr "Для отримання повідомлень електронною поштою %1відредагуйте налаштування спільноти%2"
 
-# 93%
-# 100%
 #: ../inc/pm.inc:198
 msgid "Private message"
 msgstr "Особисте повідомлення"
@@ -991,9 +948,7 @@ msgstr "Особисте повідомлення"
 msgid ""
 "Suspend work while computer is on battery power? %1 Matters only for "
 "portable computers %2"
-msgstr ""
-"Припиняти обробку, поки комп'ютер живиться від акумуляторів? %1 застосовне "
-"лише для портативних комп'ютерів %2"
+msgstr "Припиняти обробку, поки комп'ютер живиться від акумуляторів? %1 застосовне лише для портативних комп'ютерів %2"
 
 #: ../inc/prefs.inc:85
 msgid "Suspend work while computer is in use?"
@@ -1002,9 +957,7 @@ msgstr "Призупиняти обробку, поки комп'ютер вик
 #: ../inc/prefs.inc:91
 msgid ""
 "Suspend GPU work while computer is in use? %1 Enforced by version 6.6.21+ %2"
-msgstr ""
-"Припиняти обробку за допомогою графічного процесора, поки комп'ютер "
-"використовується? %1 Починаючи з версії 6.6.21+ %2"
+msgstr "Припиняти обробку за допомогою графічного процесора, поки комп'ютер використовується? %1 Починаючи з версії 6.6.21+ %2"
 
 #: ../inc/prefs.inc:99
 msgid "'In use' means mouse/keyboard activity in last"
@@ -1018,32 +971,23 @@ msgstr "хвилин"
 msgid ""
 "Suspend work if no mouse/keyboard activity in last %1 Needed to enter low-"
 "power mode on some computers %2"
-msgstr ""
-"Призупиняти обробку, якщо немає активності миші/клавіатури за останні %1 "
-"Необхідно для входу в режим зниженого споживання енергії на деяких "
-"комп'ютерах %2"
+msgstr "Призупиняти обробку, якщо немає активності миші/клавіатури за останні %1 Необхідно для входу в режим зниженого споживання енергії на деяких комп'ютерах %2"
 
 #: ../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 ""
-"Призупиняти обробку, коли використання процесора решту програмами (крім "
-"BOINC) досягне більше %1 0 - без обмежень<br>Починаючи з версії 6.10.30+ %2"
+msgstr "Призупиняти обробку, коли використання процесора решту програмами (крім BOINC) досягне більше %1 0 - без обмежень<br>Починаючи з версії 6.10.30+ %2"
 
 #: ../inc/prefs.inc:122
 msgid "Do work only between the hours of %1 No restriction if equal %2"
-msgstr ""
-"Запускати обробку тільки між зазначеними годинами %1 без обмежень при "
-"рівності значень %2"
+msgstr "Запускати обробку тільки між зазначеними годинами %1 без обмежень при рівності значень %2"
 
 #: ../inc/prefs.inc:130
 msgid ""
 "Leave tasks in memory while suspended? %1 Suspended tasks will consume swap "
 "space if 'yes' %2"
-msgstr ""
-"Залишати неактивні завдання в пам'яті? %1 якщо \"так\", призупинені завдання "
-"будуть займати місце у віртуальній пам'яті %2"
+msgstr "Залишати неактивні завдання в пам'яті? %1 якщо \"так\", призупинені завдання будуть займати місце у віртуальній пам'яті %2"
 
 #: ../inc/prefs.inc:139
 msgid "Switch between tasks every %1 Recommended: 60 minutes %2"
@@ -1059,9 +1003,7 @@ msgstr "процесорів"
 
 #: ../inc/prefs.inc:153
 msgid "On multiprocessors, use at most %1 Enforced by version 6.1+ %2"
-msgstr ""
-"На мультипроцесорних системах використовувати не більше %1 Починаючи з "
-"версії 6.1+ %2"
+msgstr "На мультипроцесорних системах використовувати не більше %1 Починаючи з версії 6.1+ %2"
 
 #: ../inc/prefs.inc:158
 #, php-format
@@ -1070,9 +1012,7 @@ msgstr "% процесорів"
 
 #: ../inc/prefs.inc:162
 msgid "Use at most %1 Can be used to reduce CPU heat %2"
-msgstr ""
-"Використовувати не більше %1 Можна використати для зменшення перегрівання "
-"процесора %2"
+msgstr "Використовувати не більше %1 Можна використати для зменшення перегрівання процесора %2"
 
 #: ../inc/prefs.inc:167
 #, php-format
@@ -1089,9 +1029,7 @@ msgstr "Гб"
 
 #: ../inc/prefs.inc:180
 msgid "Disk: leave free at least %1 Values smaller than %2 are ignored %3"
-msgstr ""
-"Диск: залишати вільного місця не менше %1 Значення менше %2 будуть "
-"проігноровані %3"
+msgstr "Диск: залишати вільного місця не менше %1 Значення менше %2 будуть проігноровані %3"
 
 #: ../inc/prefs.inc:191 ../inc/prefs.inc:201 ../inc/prefs.inc:206
 #: ../inc/prefs.inc:211
@@ -1121,9 +1059,7 @@ msgstr "Пам'ять: коли комп'ютер не використовує
 
 #: ../inc/prefs.inc:218
 msgid "Maintain enough tasks to keep busy for at least%1(max 10 days).%2"
-msgstr ""
-"Підтримувати достатній запас завдань для забезпечення роботи щонайменше %"
-"1(макс. 10 днів).%2"
+msgstr "Підтримувати достатній запас завдань для забезпечення роботи щонайменше %1(макс. 10 днів).%2"
 
 #: ../inc/prefs.inc:223 ../inc/prefs.inc:228 ../inc/prefs.inc:270
 #: ../inc/util.inc:274
@@ -1138,17 +1074,13 @@ msgstr "... і до додаткових"
 msgid ""
 "Confirm before connecting to Internet? %1 Matters only if you have a modem, "
 "ISDN or VPN connection %2"
-msgstr ""
-"Підтверджувати підключення до Інтернету? %1 використовується тільки при "
-"наявності модемного, ISDN- або VPN-підключення %2"
+msgstr "Підтверджувати підключення до Інтернету? %1 використовується тільки при наявності модемного, ISDN- або VPN-підключення %2"
 
 #: ../inc/prefs.inc:241
 msgid ""
 "Disconnect when done? %1 Matters only if you have a modem, ISDN or VPN "
 "connection %2"
-msgstr ""
-"Розірвати з'єднання після завершення? %1 використовується тільки при "
-"наявності модемного, ISDN- або VPN-підключення %2"
+msgstr "Розірвати з'єднання після завершення? %1 використовується тільки при наявності модемного, ISDN- або VPN-підключення %2"
 
 #: ../inc/prefs.inc:249
 msgid "Maximum download rate:"
@@ -1177,30 +1109,21 @@ msgstr "Мбайт кожні"
 #: ../inc/prefs.inc:274
 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 Позначте ТІЛЬКИ В ТОМУ ВИПАДКУ, "
-"якщо Ваш інтернет-провайдер змінює файли зображень (наприклад, це робить "
-"UMTS). %2 Пропуск перевірки зменшує безпеку BOINC. %3"
+"modifies image files (UMTS does this, for example). %2 Skipping verification"
+" reduces the security of BOINC. %3"
+msgstr "Пропускати перевірку файлів зображень? %1 Позначте ТІЛЬКИ В ТОМУ ВИПАДКУ, якщо Ваш інтернет-провайдер змінює файли зображень (наприклад, це робить UMTS). %2 Пропуск перевірки зменшує безпеку BOINC. %3"
 
 #: ../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 "
+"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 Визначає пропорції ресурсів Вашого комп'ютера, "
-"виділених цьому проекту. Приклад: якщо Ви берете участь у двох проектах "
-"BOINC з частками ресурсів 100 і 200, перший отримає 1/3 Ваших ресурсів, а "
-"другий 2/3. %2"
+msgstr "Виділено ресурсів %1 Визначає пропорції ресурсів Вашого комп'ютера, виділених цьому проекту. Приклад: якщо Ви берете участь у двох проектах BOINC з частками ресурсів 100 і 200, перший отримає 1/3 Ваших ресурсів, а другий 2/3. %2"
 
 #: ../inc/prefs.inc:298
 msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
-msgstr ""
-"Прискорити обробку завдань за допомогою графічного процесора, використовуючи "
-"окремий процесор для кожного завдання?"
+msgstr "Прискорити обробку завдань за допомогою графічного процесора, використовуючи окремий процесор для кожного завдання?"
 
 #: ../inc/prefs.inc:308
 msgid "Use CPU %1 Enforced by version 6.10+ %2"
@@ -1212,8 +1135,7 @@ msgstr "Використовувати графічний процесор ATI %
 
 #: ../inc/prefs.inc:332
 msgid "Use NVIDIA GPU %1 Enforced by version 6.10+ %2"
-msgstr ""
-"Використовувати графічний процесор NVIDIA %1 починаючи з версії 6.10+ %2"
+msgstr "Використовувати графічний процесор NVIDIA %1 починаючи з версії 6.10+ %2"
 
 #: ../inc/prefs.inc:344
 msgid "Use Intel GPU %1 Enforced by version 7.2+ %2"
@@ -1223,16 +1145,13 @@ msgstr "Використовувати графічний процесор Intel
 msgid ""
 "Run test applications? %1 This helps us develop applications, but may cause "
 "jobs to fail on your computer %2"
-msgstr ""
-"Виконувати тестові додатки? %1 Це допоможе нам в їх розробці, але може "
-"привести до помилок в розрахунках завдань на Вашому комп'ютері %2"
+msgstr "Виконувати тестові додатки? %1 Це допоможе нам в їх розробці, але може привести до помилок в розрахунках завдань на Вашому комп'ютері %2"
 
 #: ../inc/prefs.inc:367
 msgid ""
-"Emails will be sent from %1; make sure your spam filter accepts this address."
-msgstr ""
-"Електронні листи будуть відправлені з адреси %1; переконайтеся, що Ваш "
-"фільтр спаму приймає цю адресу."
+"Emails will be sent from %1; make sure your spam filter accepts this "
+"address."
+msgstr "Електронні листи будуть відправлені з адреси %1; переконайтеся, що Ваш фільтр спаму приймає цю адресу."
 
 #: ../inc/prefs.inc:374
 msgid "Is it OK for %1 and your team (if any) to email you?"
@@ -1257,17 +1176,13 @@ msgstr "Використання мережі"
 #: ../inc/prefs.inc:392
 msgid ""
 "These preferences apply to all the BOINC projects in which you participate."
-msgstr ""
-"Ці налаштування застосовуються до всіх проектів BOINC, в яких Ви приймаєте "
-"участь."
+msgstr "Ці налаштування застосовуються до всіх проектів BOINC, в яких Ви приймаєте участь."
 
 #: ../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 Значення, відмічені червоним нижче, поза "
-"діапазоном або нечислові."
+"%1Unable to update preferences.%2 The values marked in red below were out of"
+" range or not numeric."
+msgstr "%1Неможливо оновити налаштування.%2 Значення, відмічені червоним нижче, поза діапазоном або нечислові."
 
 #: ../inc/prefs.inc:445
 msgid "bad venue: %1"
@@ -1340,17 +1255,13 @@ msgstr "Редагувати налаштування %1"
 
 #: ../inc/prefs.inc:885
 msgid "These apply to all BOINC projects in which you participate."
-msgstr ""
-"Ці налаштування поширюються на всі проекти BOINC, в яких Ви приймаєте "
-"участь."
+msgstr "Ці налаштування поширюються на всі проекти BOINC, в яких Ви приймаєте участь."
 
 #: ../inc/prefs.inc:887
 msgid ""
 "On computers participating in multiple projects, the most recently modified "
 "preferences will be used."
-msgstr ""
-"На комп'ютерах, які приймають участь в декількох проектах, будуть "
-"використовуватися налаштування, які змінювались останніми."
+msgstr "На комп'ютерах, які приймають участь в декількох проектах, будуть використовуватися налаштування, які змінювались останніми."
 
 #: ../inc/prefs.inc:889
 msgid "These preferences do not apply to Android devices."
@@ -1380,17 +1291,13 @@ msgstr "і"
 msgid ""
 "Your profile will be made visible to other people as soon as it has been "
 "approved by the project. This may take up to a few days."
-msgstr ""
-"Ваш профіль стане видимим для інших людей коли буде схвалений проектом. На "
-"це може знадобитися кілька днів."
+msgstr "Ваш профіль стане видимим для інших людей коли буде схвалений проектом. На це може знадобитися кілька днів."
 
 #: ../inc/profile.inc:92
 msgid ""
 "Your profile has been marked as unacceptable. It is not visible to other "
 "people. Please change it."
-msgstr ""
-"Ваш профіль був відзначений як неприпустимий. Інші люди його не бачать. "
-"Будь-ласка, змініть його."
+msgstr "Ваш профіль був відзначений як неприпустимий. Інші люди його не бачать. Будь-ласка, змініть його."
 
 #: ../inc/profile.inc:172 ../user/friend.php:105 ../user/friend.php:172
 msgid "Database error"
@@ -1400,10 +1307,7 @@ msgstr "Помилка бази даних"
 msgid ""
 "To prevent spam, profiles of users with an average credit of less than %1 "
 "are displayed only to logged-in users. We apologize for this inconvenience."
-msgstr ""
-"Для того, щоб запобігти спаму, профілі користувачів із середньою кількістю "
-"балів менше %1 показуються тільки користувачам, що увійшли. Ми перепрошуємо "
-"за цю незручність."
+msgstr "Для того, щоб запобігти спаму, профілі користувачів із середньою кількістю балів менше %1 показуються тільки користувачам, що увійшли. Ми перепрошуємо за цю незручність."
 
 #: ../inc/profile.inc:197
 msgid "User is banished"
@@ -1865,14 +1769,10 @@ msgstr "Об'єднана статистика за проектами"
 msgid "Type"
 msgstr "Тип"
 
-# 92%
-# 100%
 #: ../inc/team.inc:127 ../user/team_manage.php:63
 msgid "Message board"
 msgstr "Дошка повідомлень"
 
-# 85%
-# 100%
 #: ../inc/team.inc:128 ../user/forum_forum.php:135 ../user/forum_index.php:93
 msgid "Threads"
 msgstr "Обговорення"
@@ -1885,10 +1785,7 @@ msgstr "Приєднатися до цієї команди"
 msgid ""
 "Note: if 'OK to email' is set in your project preferences, joining a team "
 "gives its founder access to your email address."
-msgstr ""
-"Увага: якщо у Ваших налаштуваннях проекту встановлено 'відправляти "
-"повідомлення електронною поштою', приєднання до команди дає доступ її "
-"засновнику до Вашої адреси електронної пошти."
+msgstr "Увага: якщо у Ваших налаштуваннях проекту встановлено 'відправляти повідомлення електронною поштою', приєднання до команди дає доступ її засновнику до Вашої адреси електронної пошти."
 
 #: ../inc/team.inc:140
 msgid "Not accepting new members"
@@ -1926,8 +1823,6 @@ msgstr "Нові учасники за останній день"
 msgid "Total members"
 msgstr "Всього учасників"
 
-# 80%
-# 75%
 #: ../inc/team.inc:185 ../inc/team.inc:186 ../inc/team.inc:187
 msgid "view"
 msgstr "Перегляд"
@@ -1970,19 +1865,15 @@ msgstr "Ця операція вимагає прав адміністратор
 
 #: ../inc/team.inc:422
 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глобальну команду BOINC%2."
+"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глобальну команду BOINC%2."
 
 #: ../inc/team.inc:428
 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: якщо Ви створите команду, то Ваші налаштування проекту "
-"(частка ресурсів, графічні налаштування) будуть видимі для всіх."
+msgstr "%1Примітка безпеки%2: якщо Ви створите команду, то Ваші налаштування проекту (частка ресурсів, графічні налаштування) будуть видимі для всіх."
 
 #: ../inc/team.inc:432
 msgid "Team name, text version"
@@ -2056,8 +1947,6 @@ msgstr "Обчислення і бали"
 msgid "Computers on this account"
 msgstr "Комп’ютери в цьому обліковому записі"
 
-# 80%
-# 100%
 #: ../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
@@ -2296,9 +2185,7 @@ msgstr "Інформація про стан сервера"
 msgid ""
 "A database error occurred while handling your request; please try again "
 "later."
-msgstr ""
-"Сталася помилка бази даних під час обробки Вашого запиту; будь-ласка, "
-"спробуйте ще раз пізніше."
+msgstr "Сталася помилка бази даних під час обробки Вашого запиту; будь-ласка, спробуйте ще раз пізніше."
 
 #: ../inc/util.inc:257
 msgid "Unable to handle request"
@@ -2317,10 +2204,9 @@ msgid "sec"
 msgstr "секунд"
 
 #: ../inc/util.inc:444
-msgid "Link has timed out. Please click Back, refresh the page, and try again."
-msgstr ""
-"Посилання прострочена. Будь-ласка, натисніть Назад, оновіть сторінку і "
-"спробуйте ще раз."
+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"
@@ -2336,14 +2222,11 @@ msgstr "Проект зупинений для обслуговування"
 
 #: ../inc/util.inc:799
 msgid "%1 is temporarily shut down for maintenance.  Please try again later."
-msgstr ""
-"%1 тимчасово зупинений для обслуговування.  Будь-ласка, спробуйте ще раз "
-"пізніше."
+msgstr "%1 тимчасово зупинений для обслуговування.  Будь-ласка, спробуйте ще раз пізніше."
 
 #: ../inc/util.inc:817
 msgid "Unable to connect to database - please try again later"
-msgstr ""
-"Неможливо підключитися до бази даних - будь-ласка, спробуйте ще раз пізніше"
+msgstr "Неможливо підключитися до бази даних - будь-ласка, спробуйте ще раз пізніше"
 
 #: ../inc/util.inc:821
 msgid "Unable to select database - please try again later"
@@ -2359,9 +2242,7 @@ 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 ""
-"Ідентифікує Вас на нашому веб-сайті. Введіть Ваше справжнє ім’я або "
-"псевдонім."
+msgstr "Ідентифікує Вас на нашому веб-сайті. Введіть Ваше справжнє ім’я або псевдонім."
 
 #: ../user/account_finish.php:45 ../user/create_account_form.php:98
 msgid "Select the country you want to represent, if any."
@@ -2398,11 +2279,7 @@ msgid ""
 "work 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
 msgid "Platform"
@@ -2426,12 +2303,7 @@ msgid ""
 "It's similar to HTML, but simpler. The tags start with a [ (where you would\n"
 "have used %1 in HTML) and end with ] (where you would have used %2 in\n"
 "HTML)."
-msgstr ""
-"Теги BBCode дозволяють Вам форматувати текст у своєму профілі\n"
-"і у повідомленнях форуму. Вони схожі на HTML, тільки простіші. Теги "
-"починаються\n"
-"із символу [ (замість %1 у HTML) і закінчуються символом ] (замість %2 у "
-"HTML)."
+msgstr "Теги BBCode дозволяють Вам форматувати текст у своєму профілі\nі у повідомленнях форуму. Вони схожі на HTML, тільки простіші. Теги починаються\nіз символу [ (замість %1 у HTML) і закінчуються символом ] (замість %2 у HTML)."
 
 #: ../user/bbcode.php:31
 msgid "Examples"
@@ -2491,9 +2363,7 @@ msgstr "Відформатований текст"
 
 #: ../user/bbcode.php:42
 msgid "use to display pre-formatted (usually monospaced) text"
-msgstr ""
-"використовується для показу попередньо відформатованого тексту (зазвичай "
-"моноширинного)"
+msgstr "використовується для показу попередньо відформатованого тексту (зазвичай моноширинного)"
 
 #: ../user/bbcode.php:43
 msgid "Item 1"
@@ -2523,9 +2393,7 @@ msgstr "посилання на SVN-мітку зміни на сайті BOINC"
 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"
-"замість відформатованого тексту буде показаний просто сам тег."
+msgstr "Якщо Ви не закриєте тег або некоректно вкажете параметр,\nзамість відформатованого тексту буде показаний просто сам тег."
 
 #: ../user/bs_sample_index.php:44
 msgid "Participants"
@@ -2607,14 +2475,11 @@ msgstr "Не вдалося створити обліковий запис"
 
 #: ../user/create_account_action.php:29
 msgid "Click your browser's <b>Back</b> button to try again."
-msgstr ""
-"Натисніть кнопку <b>Назад</b> Вашого браузера для того, щоб спробувати ще "
-"раз."
+msgstr "Натисніть кнопку <b>Назад</b> Вашого браузера для того, щоб спробувати ще раз."
 
 #: ../user/create_account_action.php:47
 msgid "Your reCAPTCHA response was not correct. Please try again."
-msgstr ""
-"Ваша відповідь reCAPTCHA була неправильною. Будь-ласка, спробуйте ще раз."
+msgstr "Ваша відповідь reCAPTCHA була неправильною. Будь-ласка, спробуйте ще раз."
 
 #: ../user/create_account_action.php:70
 msgid "You must supply an invitation code to create an account."
@@ -2626,10 +2491,9 @@ msgstr "Вказаний Вами запрошувальний код не ді
 
 #: ../user/create_account_action.php:84
 msgid ""
-"Invalid email address: you must enter a valid address of the form name at domain"
-msgstr ""
-"Неправильна адреса електронної пошти: Ви повинні вказати правильну адресу у "
-"формі name at domain"
+"Invalid email address: you must enter a valid address of the form "
+"name at domain"
+msgstr "Неправильна адреса електронної пошти: Ви повинні вказати правильну адресу у формі name at domain"
 
 #: ../user/create_account_action.php:88
 msgid "There's already an account with that email address."
@@ -2655,18 +2519,13 @@ msgstr "Не вдалося створити обліковий запис"
 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, не використовуйте цю форму. Просто "
-"запустіть BOINC, виберіть Додати проект, і введіть свою адресу електронної "
-"пошти і пароль."
+msgstr "ПРИМІТКА: Якщо у Вас є Менеджер BOINC, не використовуйте цю форму. Просто запустіть BOINC, виберіть Додати проект, і введіть свою адресу електронної пошти і пароль."
 
 #: ../user/create_account_form.php:61
 msgid ""
 "This account will belong to the team %1 and will have the project "
 "preferences of its founder."
-msgstr ""
-"Цей обліковий запис буде відноситися до команди '%1' і буде мати "
-"налаштування проекту як у його засновника."
+msgstr "Цей обліковий запис буде відноситися до команди '%1' і буде мати налаштування проекту як у його засновника."
 
 #: ../user/create_account_form.php:73
 msgid "Invitation Code"
@@ -2714,11 +2573,9 @@ msgstr "%1 Фотографія Вашого профілю показана з
 
 #: ../user/create_profile.php:66
 msgid ""
-"To replace it, click the \"Browse\" button and select a JPEG or PNG file (%1 "
-"or less)."
-msgstr ""
-"Щоб замінити її, натисніть кнопку \"Огляд...\" і виберіть файл формату JPEG "
-"або PNG (розміром %1 або менше)."
+"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
 msgid "To remove it from your profile, check this box:"
@@ -2728,10 +2585,7 @@ msgstr "Щоб видалити її з Вашого профілю, відмі
 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 або менше."
+msgstr "Якщо Ви хочете додати фотографію у свій профіль, натисніть кнопку \"Огляд...\" і виберіть файл формату JPEG або PNG. Будь-ласка, виберіть зображення розміром %1 або менше."
 
 #: ../user/create_profile.php:89
 msgid "Language"
@@ -2761,30 +2615,23 @@ msgstr "Формат Вашого завантаженого зображенн
 msgid ""
 "Your %1profile%2 lets you share your opinions and background with the %3 "
 "community."
-msgstr ""
-"Ваш %1профіль%2 дозволяє Вам ділитися своєю думкою і інформацією про себе зі "
-"спільнотою %3."
+msgstr "Ваш %1профіль%2 дозволяє Вам ділитися своєю думкою і інформацією про себе зі спільнотою %3."
 
 #: ../user/create_profile.php:213
 msgid "Your ReCaptcha response was not correct.  Please try again."
-msgstr ""
-"Ваша відповідь ReCaptcha була неправильною.  Будь-ласка, спробуйте ще раз."
+msgstr "Ваша відповідь ReCaptcha була неправильною.  Будь-ласка, спробуйте ще раз."
 
 #: ../user/create_profile.php:222
 msgid ""
 "Your first response was flagged as spam by the Akismet anti-spam system.  "
 "Please modify your text and try again."
-msgstr ""
-"Ваша перша відповідь була помічена як спам антиспам-системою Akismet.  "
-"Будь-ласка, змініть свій текст і спробуйте ще раз."
+msgstr "Ваша перша відповідь була помічена як спам антиспам-системою Akismet.  Будь-ласка, змініть свій текст і спробуйте ще раз."
 
 #: ../user/create_profile.php:230
 msgid ""
 "Your second response was flagged as spam by the Akismet anti-spam system.  "
 "Please modify your text and try again."
-msgstr ""
-"Ваша друга відповідь була помічена як спам антиспам-системою Akismet.  "
-"Будь-ласка, змініть свій текст і спробуйте ще раз."
+msgstr "Ваша друга відповідь була помічена як спам антиспам-системою Akismet.  Будь-ласка, змініть свій текст і спробуйте ще раз."
 
 #: ../user/create_profile.php:246
 msgid "Your profile submission was empty."
@@ -2817,12 +2664,9 @@ msgstr "Створити профіль"
 
 #: ../user/create_profile.php:343
 msgid ""
-"To prevent spam, an average credit of %1 or greater is required to create or "
-"edit a profile.  We apologize for this inconvenience."
-msgstr ""
-"Для того, щоб створювати або редагувати профіль у Вас повинна бути середня "
-"кількість балів %1 або більше. Це зроблено з метою запобігання спаму.  Ми "
-"просимо вибачення за цю незручність."
+"To prevent spam, an average credit of %1 or greater is required to create or"
+" edit a profile.  We apologize for this inconvenience."
+msgstr "Для того, щоб створювати або редагувати профіль у Вас повинна бути середня кількість балів %1 або більше. Це зроблено з метою запобігання спаму.  Ми просимо вибачення за цю незручність."
 
 #: ../user/delete_account.php:57
 msgid "Couldn't delete account"
@@ -2847,20 +2691,13 @@ msgid ""
 "including your profile and message-board posts.\n"
 "No jobs will be issued to any computers attached\n"
 "to this account."
-msgstr ""
-"При видаленні Вашого облікового запису з наших серверів\n"
-"буде видалена вся Ваша персональна інформація,\n"
-"включаючи Ваш профіль і повідомлення з дошки повідомлень.\n"
-"Комп’ютери, підключені до цього облікового запису,\n"
-"не будуть отримувати нових завдань."
+msgstr "При видаленні Вашого облікового запису з наших серверів\nбуде видалена вся Ваша персональна інформація,\nвключаючи Ваш профіль і повідомлення з дошки повідомлень.\nКомп’ютери, підключені до цього облікового запису,\nне будуть отримувати нових завдань."
 
 #: ../user/delete_account.php:73
 msgid ""
 "This cannot be undone.\n"
 "Once your account has been deleted, you cannot get it back."
-msgstr ""
-"Ця операція не може бути відмінена.\n"
-"Як тільки Ваш обліковий запис буде видалений, Ви не зможете його відновити."
+msgstr "Ця операція не може бути відмінена.\nЯк тільки Ваш обліковий запис буде видалений, Ви не зможете його відновити."
 
 #: ../user/delete_account.php:76
 msgid "Are you sure you want to delete your account?"
@@ -2912,18 +2749,13 @@ 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"
-"якщо Ви захочете в майбутньому зареєструвати інший профіль,\n"
-"Вам доведеться вводити всі дані наново."
+msgstr "Видалені профілі зникають назавжди і їх неможливо відновити --\nякщо Ви захочете в майбутньому зареєструвати інший профіль,\nВам доведеться вводити всі дані наново."
 
 #: ../user/delete_profile.php:48
 msgid ""
 "If you're sure, click 'Yes'\n"
 "to remove your profile from our database."
-msgstr ""
-"Якщо Ви впевнені, натисніть 'так'\n"
-"для видалення Вашого профілю з нашої бази даних."
+msgstr "Якщо Ви впевнені, натисніть 'так'\nдля видалення Вашого профілю з нашої бази даних."
 
 #: ../user/delete_profile.php:52
 msgid "Delete my profile"
@@ -2947,7 +2779,8 @@ msgstr "Ваша пожертва була прийнята."
 
 #: ../user/donated.php:30
 msgid ""
-"Your donation will be added to the progress bar after confirmation by PayPal."
+"Your donation will be added to the progress bar after confirmation by "
+"PayPal."
 msgstr "Ваша пожертва буде додана після підтвердження від PayPal."
 
 #: ../user/donated.php:32
@@ -2966,9 +2799,7 @@ msgstr "Пожертва для %1"
 msgid ""
 "This project is accepting donations via\n"
 "%1."
-msgstr ""
-"Цей проект приймає пожертви через\n"
-"%1."
+msgstr "Цей проект приймає пожертви через\n%1."
 
 #: ../user/donations.php:42
 msgid ""
@@ -2983,19 +2814,7 @@ msgid ""
 "        to see the donation amount equivalent in different currencies\n"
 "        (please note that the rates are only estimates\n"
 "         and the actual amount may differ)."
-msgstr ""
-"Вкажіть в полі нижче величину, яку Ви бажаєте пожертвувати.\n"
-"        PayPal приймає різні валюти\n"
-"        (канадські долари, євро, фунти стерлінгів, долари США,\n"
-"         Єни, австралійські долари, новозеландські долари,\n"
-"        швейцарські франки, гонконзькі долари, сингапурські долари,\n"
-"        данські крони, польські злоті, норвезькі крони,\n"
-"        угорські форинти, чеські крони, шведські крони).\n"
-"        Ви можете використовувати вбудований конвертер валют\n"
-"        для того, щоб побачити еквівалентну кількість пожертв в різних "
-"валютах\n"
-"        (будь-ласка, врахуйте, що курс валют приблизний\n"
-"         і фактичні цифри можуть відрізнятися)."
+msgstr "Вкажіть в полі нижче величину, яку Ви бажаєте пожертвувати.\n        PayPal приймає різні валюти\n        (канадські долари, євро, фунти стерлінгів, долари США,\n         Єни, австралійські долари, новозеландські долари,\n        швейцарські франки, гонконзькі долари, сингапурські долари,\n        данські крони, польські злоті, норвезькі крони,\n        угорські форинти, чеські крони, шведські крони).\n        Ви можете використовувати вбудований конвертер валют\n        для того [...]
 
 #: ../user/donations.php:316
 msgid "Amount you would like to donate"
@@ -3013,16 +2832,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 ""
-"Щоб пожертвувати під своїм обліковим записом, будь-ласка, авторизуйтесь."
+msgstr "Щоб пожертвувати під своїм обліковим записом, будь-ласка, авторизуйтесь."
 
 #: ../user/donations.php:328
 msgid "Proceed"
@@ -3043,20 +2857,14 @@ msgstr "Ви можете завантажити додатки різних к
 #: ../user/download_network.php:31
 msgid ""
 "These applications are not endorsed by %1 and you use them at your own risk."
-msgstr ""
-"Ці додатки не підтверджені %1, і Ви використовуєте їх на свій страх і ризик."
+msgstr "Ці додатки не підтверджені %1, і Ви використовуєте їх на свій страх і ризик."
 
 #: ../user/download_network.php:33
 msgid ""
 "We do not provide instructions for installing these applications.\n"
-"However, the author may have provided some help on installing or "
-"uninstalling the application. \n"
+"However, the author may have provided some help on installing or uninstalling the application. \n"
 "If this is not enough you should contact the author."
-msgstr ""
-"Ми не надаємо інструкцій зі встановлення цих додатків.\n"
-"Однак, автор, можливо, надав деяку допомогу зі встановлення і видалення "
-"додатку.\n"
-"Якщо цього недостатньо, Вам варто зв’язатися з автором."
+msgstr "Ми не надаємо інструкцій зі встановлення цих додатків.\nОднак, автор, можливо, надав деяку допомогу зі встановлення і видалення додатку.\nЯкщо цього недостатньо, Вам варто зв’язатися з автором."
 
 #: ../user/download_network.php:36
 msgid "Instructions for installing and running BOINC are %1here%2."
@@ -3098,9 +2906,7 @@ msgstr "Будь-ласка, %1перевірте цю адресу електр
 msgid ""
 "We can't update your email address due to a database problem.  Please try "
 "again later."
-msgstr ""
-"Неможливо оновити Вашу адресу електронної пошти через проблеми з базою "
-"даних.  Будь-ласка, спробуйте ще раз пізніше."
+msgstr "Неможливо оновити Вашу адресу електронної пошти через проблеми з базою даних.  Будь-ласка, спробуйте ще раз пізніше."
 
 #: ../user/edit_email_form.php:27 ../user/edit_email_form.php:51
 msgid "Change email address"
@@ -3130,9 +2936,7 @@ msgstr "Підтвердьте скидання"
 msgid ""
 "This action will erase any changes you have made in your community "
 "preferences. To cancel, click your browser's Back button."
-msgstr ""
-"Ця дія зітре всі зміни, які Ви зробили у своїх налаштуваннях спільноти. Для "
-"скасування натисніть кнопку Назад у своєму браузері."
+msgstr "Ця дія зітре всі зміни, які Ви зробили у своїх налаштуваннях спільноти. Для скасування натисніть кнопку Назад у своєму браузері."
 
 #: ../user/edit_forum_preferences_action.php:38
 msgid "Reset preferences"
@@ -3144,8 +2948,7 @@ msgstr "Помилка: Неправильний тип файлу, підтри
 
 #: ../user/edit_forum_preferences_action.php:114
 msgid "Your signature was too long, please keep it less than 250 characters."
-msgstr ""
-"Ваш підпис надто довгий, будь-ласка, використовуйте не більше 250 символів."
+msgstr "Ваш підпис надто довгий, будь-ласка, використовуйте не більше 250 символів."
 
 #: ../user/edit_forum_preferences_action.php:132
 #: ../user/edit_forum_preferences_action.php:146
@@ -3156,9 +2959,7 @@ msgstr "Немає такого користувача: %1"
 msgid ""
 "How should we notify you of new private messages, friend requests, posts in "
 "subscribed threads, and other events?"
-msgstr ""
-"Як ми повинні повідомляти Вас про нові приватні повідомлення, запити на "
-"дружбу, повідомлення у підписаних обговореннях і про інші події?"
+msgstr "Як ми повинні повідомляти Вас про нові приватні повідомлення, запити на дружбу, повідомлення у підписаних обговореннях і про інші події?"
 
 #: ../user/edit_forum_preferences_form.php:57
 msgid "On my Account page (no email)"
@@ -3217,10 +3018,7 @@ 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> що показують останню інформацію про Ваші бали, новини проектів, і т.д."
+msgstr "Перевірте %1різні безкоштовні сервіси%2,\n<br> що надають динамічні 'зображення для підпису',\n<br> що показують останню інформацію про Ваші бали, новини проектів, і т.д."
 
 #: ../user/edit_forum_preferences_form.php:104
 msgid "characters remaining"
@@ -3274,14 +3072,10 @@ msgstr "Показати вказану кількість повідомлен
 msgid "How to sort"
 msgstr "Як сортувати"
 
-# 75%
-# 100%
 #: ../user/edit_forum_preferences_form.php:140
 msgid "Threads:"
 msgstr "Обговорення:"
 
-# 83%
-# 100%
 #: ../user/edit_forum_preferences_form.php:140
 msgid "Posts:"
 msgstr "Повідомлення:"
@@ -3304,9 +3098,7 @@ msgstr "Фільтровані користувачі"
 
 #: ../user/edit_forum_preferences_form.php:165
 msgid "Ignore message board posts and private messages from these users."
-msgstr ""
-"Ігнорування повідомлень від цих користувачів як на дошці повідомлень, так і "
-"приватних."
+msgstr "Ігнорування повідомлень від цих користувачів як на дошці повідомлень, так і приватних."
 
 #: ../user/edit_forum_preferences_form.php:167
 msgid "User ID (For instance: 123456789)"
@@ -3327,8 +3119,7 @@ msgstr "Скинути"
 
 #: ../user/edit_forum_preferences_form.php:176
 msgid "Or click here to reset preferences to the defaults"
-msgstr ""
-"Або натисніть тут, щоб скинути налаштування до параметрів за замовчуванням"
+msgstr "Або натисніть тут, щоб скинути налаштування до параметрів за замовчуванням"
 
 #: ../user/edit_passwd_action.php:50
 msgid "Invalid account key"
@@ -3355,9 +3146,7 @@ msgstr "Ваш пароль було змінено"
 msgid ""
 "We can't update your password due to a database problem. Please try again "
 "later."
-msgstr ""
-"Неможливо оновити Ваш пароль через проблеми з базою даних. Будь-ласка, "
-"спробуйте ще раз пізніше."
+msgstr "Неможливо оновити Ваш пароль через проблеми з базою даних. Будь-ласка, спробуйте ще раз пізніше."
 
 #: ../user/edit_passwd_form.php:39
 msgid "You can identify yourself using either"
@@ -3432,17 +3221,13 @@ msgid ""
 "A tasks's <b>server state</b> indicates whether the task has been sent to a "
 "computer, and if so whether the computer has finished it. Possible values "
 "are:"
-msgstr ""
-"Поле завдання <b>стан сервера</b> показує, чи було завдання відправлене на "
-"комп’ютер, і якщо так, чи було воно ним завершене. Можливі значення:"
+msgstr "Поле завдання <b>стан сервера</b> показує, чи було завдання відправлене на комп’ютер, і якщо так, чи було воно ним завершене. Можливі значення:"
 
 #: ../user/explain_state.php:35
 msgid ""
 "The task is not ready to send (for example, because its input files are "
 "unavailable)"
-msgstr ""
-"Завдання не готове до відправлення (наприклад, тому що його вхідні файли "
-"недоступні)"
+msgstr "Завдання не готове до відправлення (наприклад, тому що його вхідні файли недоступні)"
 
 #: ../user/explain_state.php:38
 msgid "The task is ready to send, but hasn't been sent yet."
@@ -3460,9 +3245,7 @@ msgstr "Завдання було відправлене; очікує заве
 msgid ""
 "The task has been sent to a computer and either it has timed out or the "
 "computer has reported its completion."
-msgstr ""
-"Завдання було відправлене на комп’ютер, і або воно було протерміноване, або "
-"комп’ютер повідомив про його завершення."
+msgstr "Завдання було відправлене на комп’ютер, і або воно було протерміноване, або комп’ютер повідомив про його завершення."
 
 #: ../user/explain_state.php:49
 msgid "Outcomes"
@@ -3472,17 +3255,13 @@ msgstr "Результати"
 msgid ""
 "A tasks's <b>outcome</b> is defined if its server state is <b>over</b>. "
 "Possible values are:"
-msgstr ""
-"Поле завдання <b>результат</b> визначене, якщо його стан сервера рівний "
-"<b>завершено</b>. Можливі значення:"
+msgstr "Поле завдання <b>результат</b> визначене, якщо його стан сервера рівний <b>завершено</b>. Можливі значення:"
 
 #: ../user/explain_state.php:57
 msgid ""
 "The task was sent to a computer, but the computer has not yet completed the "
 "work and reported the outcome."
-msgstr ""
-"Завдання було відправлене на комп’ютер, але він ще не завершив роботу і не "
-"повідомив про результат."
+msgstr "Завдання було відправлене на комп’ютер, але він ще не завершив роботу і не повідомив про результат."
 
 #: ../user/explain_state.php:60
 msgid "A computer completed and reported the task successfully."
@@ -3492,9 +3271,7 @@ msgstr "Комп’ютер завершив завдання і повідом
 msgid ""
 "The server wasn't able to send the task to a computer (perhaps because its "
 "resource requirements were too large)"
-msgstr ""
-"Сервер не зміг відправити завдання на комп’ютер (можливо через те, що його "
-"вимоги до ресурсів були надто великими)"
+msgstr "Сервер не зміг відправити завдання на комп’ютер (можливо через те, що його вимоги до ресурсів були надто великими)"
 
 #: ../user/explain_state.php:65
 msgid "Client error"
@@ -3508,25 +3285,19 @@ msgstr "Завдання було відправлене на комп’юте
 msgid ""
 "The task was sent to a computer and no reply was received within the time "
 "limit."
-msgstr ""
-"Завдання було відправлене на комп’ютер і за відведений час не було отримано "
-"відповіді"
+msgstr "Завдання було відправлене на комп’ютер і за відведений час не було отримано відповіді"
 
 #: ../user/explain_state.php:72
 msgid ""
-"The task wasn't sent to a computer because enough other tasks were completed "
-"for this workunit."
-msgstr ""
-"Завдання не було відправлене на комп’ютер, оскільки була завершена достатня "
-"кількість інших завдань для цієї задачі."
+"The task wasn't sent to a computer because enough other tasks were completed"
+" for this workunit."
+msgstr "Завдання не було відправлене на комп’ютер, оскільки була завершена достатня кількість інших завдань для цієї задачі."
 
 #: ../user/explain_state.php:75
 msgid ""
 "The task was reported but could not be validated, typically because the "
 "output files were lost on the server."
-msgstr ""
-"Було повідомлено про завершення завдання, але його не вдалося перевірити, "
-"зазвичай через те, що вхідні файли було втрачено на сервері."
+msgstr "Було повідомлено про завершення завдання, але його не вдалося перевірити, зазвичай через те, що вхідні файли було втрачено на сервері."
 
 #: ../user/explain_state.php:80
 msgid "Client states"
@@ -3534,11 +3305,9 @@ msgstr "Стан клієнта"
 
 #: ../user/explain_state.php:81
 msgid ""
-"A result's <b>client state</b> indicates the stage of processing at which an "
-"error occurred."
-msgstr ""
-"Поле завдання <b>стан клієнта</b> показує стадію обробки, на якій відбулася "
-"помилка."
+"A result's <b>client state</b> indicates the stage of processing at which an"
+" error occurred."
+msgstr "Поле завдання <b>стан клієнта</b> показує стадію обробки, на якій відбулася помилка."
 
 #: ../user/explain_state.php:86
 msgid "The computer has not yet completed the task."
@@ -3568,9 +3337,7 @@ msgstr "Час підтвердження і крайній термін"
 msgid ""
 "A task's <b>Time reported or deadline</b> field depends on whether the task "
 "has been reported yet:"
-msgstr ""
-"Поле завдання <b>Час підтвердження або крайній термін</b> залежить від того, "
-"чи було повідомлено про завершення завдання:"
+msgstr "Поле завдання <b>Час підтвердження або крайній термін</b> залежить від того, чи було повідомлено про завершення завдання:"
 
 #: ../user/explain_state.php:110
 msgid "Already reported"
@@ -3614,9 +3381,7 @@ msgstr "Відправити листа"
 
 #: ../user/ffmail_action.php:59
 msgid "Use your browser's back button to return to message form"
-msgstr ""
-"Використовуйте кнопку Назад Вашого браузера для того, щоб повернутися до "
-"форми повідомлення"
+msgstr "Використовуйте кнопку Назад Вашого браузера для того, щоб повернутися до форми повідомлення"
 
 #: ../user/ffmail_action.php:63
 msgid "Sending emails"
@@ -3636,19 +3401,15 @@ msgstr "Дякуємо, що Ви розповіли своїм друзям п
 
 #: ../user/ffmail_action.php:94
 msgid ""
-"You forgot to enter your friends' names and/or email addresses; Please %"
-"1return to the form%2 and enter them."
-msgstr ""
-"Ви забули ввести імена і/або адреси електронної пошти Ваших друзів; "
-"будь-ласка, %1поверніться у форму%2 і зробіть це."
+"You forgot to enter your friends' names and/or email addresses; Please "
+"%1return to the form%2 and enter them."
+msgstr "Ви забули ввести імена і/або адреси електронної пошти Ваших друзів; будь-ласка, %1поверніться у форму%2 і зробіть це."
 
 #: ../user/ffmail_form.php:30
 msgid ""
 "This project hasn't created an email message - please notify its "
 "administrators"
-msgstr ""
-"Цей проект не створив електронне повідомлення - будь ласка, повідомте своїх "
-"адміністраторів"
+msgstr "Цей проект не створив електронне повідомлення - будь ласка, повідомте своїх адміністраторів"
 
 #: ../user/ffmail_form.php:33
 msgid "Tell your friends about %1"
@@ -3663,10 +3424,7 @@ msgid ""
 "Fill in this form with the names and email addresses of people you think "
 "might be interested in %1. We'll send them an email in your name, and you "
 "can add your own message if you like."
-msgstr ""
-"Заповніть цю форму іменами і адресами електронної пошти людей, які, на Вашу "
-"думку, можуть бути зацікавленими у %1. Ми відправимо їм листа від Вашого "
-"імені, і якщо Ви забажаєте, то можете додати своє повідомлення."
+msgstr "Заповніть цю форму іменами і адресами електронної пошти людей, які, на Вашу думку, можуть бути зацікавленими у %1. Ми відправимо їм листа від Вашого імені, і якщо Ви забажаєте, то можете додати своє повідомлення."
 
 #: ../user/ffmail_form.php:42
 msgid "Your name:"
@@ -3714,18 +3472,13 @@ 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 тільки якщо він(вона) "
-"регулярно поводить себе як троль."
+msgstr "Ви справді хочете заблокувати %1?<br/>%1 не зможе публікувати повідомлення протягом вибраного періоду.<br/>Заблокуйте %1 тільки якщо він(вона) регулярно поводить себе як троль."
 
 #: ../user/forum_banishment_vote.php:61
 msgid ""
-"Select the reason category, optionally write a longer description of why the "
-"user should be banished."
-msgstr ""
-"Виберіть категорію причини, при необхідності напишіть більш детальний опис "
-"того, чому користувач повинен бути заблокований."
+"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
 msgid "Category"
@@ -3777,9 +3530,7 @@ msgstr "Ви повинні вказати дію..."
 msgid ""
 "You can no longer edit this post.<br/>Posts can only be edited at most %1 "
 "minutes after they have been created."
-msgstr ""
-"Ви більше не можете редагувати це повідомлення.<br/>Повідомлення можуть бути "
-"відредаговані максимум %1 хвилин після того, як вони були створені."
+msgstr "Ви більше не можете редагувати це повідомлення.<br/>Повідомлення можуть бути відредаговані максимум %1 хвилин після того, як вони були створені."
 
 #: ../user/forum_edit.php:47
 msgid "You are not authorized to edit this post."
@@ -3789,7 +3540,6 @@ msgstr "У Вас немає прав для редагування цього 
 msgid "Forum"
 msgstr "Форум"
 
-# 76%
 #: ../user/forum_edit.php:110
 msgid "Edit your message"
 msgstr "Редагування повідомлення"
@@ -3888,19 +3638,15 @@ msgstr "Ви читаєте це обговорення"
 msgid "read"
 msgstr "читається"
 
-# 95%
-# 100%
 #: ../user/forum_help_desk.php:27
 msgid "Questions and answers"
 msgstr "Питання і відповіді"
 
 #: ../user/forum_help_desk.php:30
 msgid ""
-"Talk live via Skype with a volunteer, in any of several languages. Go to %"
-"1BOINC Online Help%2."
-msgstr ""
-"Спілкуйтесь з волонтерами напряму через Skype, будь-якою із декількох мов. "
-"Скористайтесь %1гарячою лінією BOINC%2."
+"Talk live via Skype with a volunteer, in any of several languages. Go to "
+"%1BOINC Online Help%2."
+msgstr "Спілкуйтесь з волонтерами напряму через Skype, будь-якою із декількох мов. Скористайтесь %1гарячою лінією BOINC%2."
 
 #: ../user/forum_help_desk.php:44 ../user/forum_index.php:92
 msgid "Topic"
@@ -3914,8 +3660,6 @@ msgstr "Питання"
 msgid "Discussion among members of %1"
 msgstr "Обговорення серед учасників команди %1"
 
-# 88%
-# 100%
 #: ../user/forum_index.php:69
 msgid "%1 Message boards"
 msgstr "Дошка повідомлень %1"
@@ -3924,9 +3668,7 @@ msgstr "Дошка повідомлень %1"
 msgid ""
 "If you have a question or problem, please use the %1Questions & Answers%2 "
 "section of the message boards."
-msgstr ""
-"Якщо у Вас є питання або проблема, будь-ласка, скористайтесь розділом %"
-"1Питання і відповіді%2 цієї дошки повідомлень."
+msgstr "Якщо у Вас є питання або проблема, будь-ласка, скористайтесь розділом %1Питання і відповіді%2 цієї дошки повідомлень."
 
 #: ../user/forum_index.php:123
 msgid "Subscribed threads"
@@ -3990,8 +3732,7 @@ msgstr "Назавжди"
 
 #: ../user/forum_moderate_post.php:96
 msgid "Optional explanation %1 This is included in email to user.%2"
-msgstr ""
-"Додаткове обговорення %1 Буде включене в електронний лист користувачу.%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
@@ -4040,9 +3781,7 @@ msgstr "Модерація обговорення '%1'"
 msgid ""
 "Select the reason category, or write a longer description of why you're "
 "hiding or locking the thread; then press OK."
-msgstr ""
-"Виберіть категорію причини або напишіть детальний опис, чому Ви приховуєте "
-"чи блокуєте це обговорення; потім натисніть Гаразд."
+msgstr "Виберіть категорію причини або напишіть детальний опис, чому Ви приховуєте чи блокуєте це обговорення; потім натисніть Гаразд."
 
 #: ../user/forum_moderate_thread.php:72
 msgid "Current forum"
@@ -4060,17 +3799,13 @@ msgstr "Нова назва:"
 msgid ""
 "Only project admins may create a thread here. However, you may reply to "
 "existing threads."
-msgstr ""
-"Створювати тут обговорення можуть тільки адміністратори проекту. Проте Ви "
-"можете відповідати в існуючих обговореннях."
+msgstr "Створювати тут обговорення можуть тільки адміністратори проекту. Проте Ви можете відповідати в існуючих обговореннях."
 
 #: ../user/forum_post.php:60
 msgid ""
 "Your message was flagged as spam by the Akismet anti-spam system. Please "
 "modify your text and try again."
-msgstr ""
-"Ваше повідомлення було помічене як спам антиспам-системою Akismet. "
-"Будь-ласка, змініть свій текст і спробуйте знову."
+msgstr "Ваше повідомлення було помічене як спам антиспам-системою Akismet. Будь-ласка, змініть свій текст і спробуйте знову."
 
 #: ../user/forum_post.php:70
 msgid "Create new thread"
@@ -4102,9 +3837,7 @@ msgstr "Ця функція відключена проектом"
 
 #: ../user/forum_rate.php:58
 msgid "You need more average or total credit to rate a post."
-msgstr ""
-"Для того, щоб оцінити повідомлення, у Вас повинна бути більшою середня або "
-"загальна кількість балів."
+msgstr "Для того, щоб оцінити повідомлення, у Вас повинна бути більшою середня або загальна кількість балів."
 
 #: ../user/forum_rate.php:62
 msgid "You have already rated this post."
@@ -4141,9 +3874,7 @@ msgstr "Проблема підсистеми голосування"
 msgid ""
 "Your post has been flagged as spam by the Akismet anti-spam system. Please "
 "modify your text and try again."
-msgstr ""
-"Ваше повідомлення було відмічене як спам антиспам-системою Akismet. "
-"Будь-ласка, змініть свій текст і спробуйте ще раз."
+msgstr "Ваше повідомлення було відмічене як спам антиспам-системою Akismet. Будь-ласка, змініть свій текст і спробуйте ще раз."
 
 #: ../user/forum_reply.php:88 ../user/forum_thread.php:158
 #: ../user/forum_thread.php:274
@@ -4168,15 +3899,12 @@ msgstr "Додати мій підпис до цієї відповіді"
 
 #: ../user/forum_report_post.php:45
 msgid "You need more average or total credit to report a post."
-msgstr ""
-"У Вас повинна бути більша середня або загальна кількість балів для того, щоб "
-"поскаржитися на це повідомлення."
+msgstr "У Вас повинна бути більша середня або загальна кількість балів для того, щоб поскаржитися на це повідомлення."
 
 #: ../user/forum_report_post.php:65
 msgid "Report Registered"
 msgstr "Звернення зареєстроване"
 
-# 92%
 #: ../user/forum_report_post.php:66
 msgid "Your report has been recorded. Thanks for your input."
 msgstr "Ваше звернення було записане. Дякуємо за допомогу."
@@ -4185,9 +3913,7 @@ msgstr "Ваше звернення було записане. Дякуємо з
 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 ""
-"Модератор незабаром перегляне Ваше звернення і вирішить, що робити далі - це "
-"може зайняти деякий час, тому будьте терпеливими"
+msgstr "Модератор незабаром перегляне Ваше звернення і вирішить, що робити далі - це може зайняти деякий час, тому будьте терпеливими"
 
 #: ../user/forum_report_post.php:71
 msgid "Report a forum post"
@@ -4195,14 +3921,10 @@ msgstr "Попередити про повідомлення на форумі"
 
 #: ../user/forum_report_post.php:73
 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 "
+"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 />Ви можете знайти систему "
-"оцінок в нижній частині повідомлення."
+msgstr "Перш ніж попередити про це повідомлення, спробуйте замість цього використати +/- систему оцінок. Якщо достатня кількість користувачів негативно оцінить повідомлення, воно зрештою буде приховане.<br />Ви можете знайти систему оцінок в нижній частині повідомлення."
 
 #: ../user/forum_report_post.php:80
 msgid "Report post"
@@ -4210,13 +3932,9 @@ msgstr "Попередити про повідомлення"
 
 #: ../user/forum_report_post.php:81
 msgid ""
-"Why do you find the post offensive: %1Please include enough information so "
-"that a person that\n"
+"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Будь-ласка, подайте достатньо "
-"інформації для того, щоб людина,\n"
-"яка ще не читала дане обговорення, могла швидко виявити проблему.%2"
+msgstr "Чому Ви вважаєте це повідомлення образливим: %1Будь-ласка, подайте достатньо інформації для того, щоб людина,\nяка ще не читала дане обговорення, могла швидко виявити проблему.%2"
 
 #: ../user/forum_report_post.php:90
 msgid "Report not registered"
@@ -4224,16 +3942,13 @@ msgstr "Звернення не зареєстроване"
 
 #: ../user/forum_report_post.php:91
 msgid "Your report could not be recorded. Please wait a while and try again."
-msgstr ""
-"Ваше звернення не вдалося записати. Будь-ласка, зачекайте трохи і спробуйте "
-"ще раз."
+msgstr "Ваше звернення не вдалося записати. Будь-ласка, зачекайте трохи і спробуйте ще раз."
 
 #: ../user/forum_report_post.php:92
 msgid ""
-"If this is not a temporary error, please report it to the project developers."
-msgstr ""
-"Якщо це не тимчасова помилка, будь-ласка, повідомте про неї розробникам "
-"проекту."
+"If this is not a temporary error, please report it to the project "
+"developers."
+msgstr "Якщо це не тимчасова помилка, будь-ласка, повідомте про неї розробникам проекту."
 
 #: ../user/forum_rss.php:41
 msgid "%1 RSS feed"
@@ -4249,9 +3964,7 @@ msgstr "Варіанти:"
 
 #: ../user/forum_rss.php:47
 msgid "Include only posts by user ID %1 (default: all users)."
-msgstr ""
-"Включити тільки повідомлення користувача з ID %1 (за замовчуванням: всі "
-"користувачі)."
+msgstr "Включити тільки повідомлення користувача з ID %1 (за замовчуванням: всі користувачі)."
 
 #: ../user/forum_rss.php:49
 msgid "Include only posts from the last %1 days (default: 30)."
@@ -4259,15 +3972,11 @@ msgstr "Включити тільки повідомлення за останн
 
 #: ../user/forum_rss.php:51
 msgid "Truncate posts: %1 (Include only first 265 characters of each post)"
-msgstr ""
-"Обрізати повідомлення: %1 (Включити тільки перші 265 символів від кожного "
-"повідомлення)"
+msgstr "Обрізати повідомлення: %1 (Включити тільки перші 265 символів від кожного повідомлення)"
 
 #: ../user/forum_rss.php:53
 msgid "Threads only: %1 (Include only the first post of every thread)"
-msgstr ""
-"Тільки обговорення: %1 (Включити тільки перше повідомлення кожного "
-"обговорення)"
+msgstr "Тільки обговорення: %1 (Включити тільки перше повідомлення кожного обговорення)"
 
 #: ../user/forum_search.php:27
 msgid "Forum search"
@@ -4349,10 +4058,7 @@ msgstr "Повідомлення, що відповідають Вашому з
 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 ""
-"Вибачте, нічого, що б відповідало Вашому пошуковому запиту, не знайдено. Ви "
-"можете розширити умови пошуку, використовуючи менше слів (або менш "
-"специфічні слова)."
+msgstr "Вибачте, нічого, що б відповідало Вашому пошуковому запиту, не знайдено. Ви можете розширити умови пошуку, використовуючи менше слів (або менш специфічні слова)."
 
 #: ../user/forum_search_action.php:219
 msgid "You can also %1try the same search on Google.%2"
@@ -4370,9 +4076,7 @@ msgstr "Успішна підписка"
 msgid ""
 "You are now subscribed to %1. You will be notified whenever there is a new "
 "post."
-msgstr ""
-"Ви підписані на %1. Ви отримаєте сповіщення, як тільки там з’явиться нове "
-"повідомлення."
+msgstr "Ви підписані на %1. Ви отримаєте сповіщення, як тільки там з’явиться нове повідомлення."
 
 #: ../user/forum_subscribe.php:51
 msgid "Subscription failed"
@@ -4381,9 +4085,7 @@ msgstr "Підписатися не вдалося"
 #: ../user/forum_subscribe.php:52
 msgid ""
 "We are currently unable to subscribe you to %1. Please try again later.."
-msgstr ""
-"На даний момент не вдалося підписати Вас на %1. Будь-ласка, спробуйте ще раз "
-"дещо пізніше."
+msgstr "На даний момент не вдалося підписати Вас на %1. Будь-ласка, спробуйте ще раз дещо пізніше."
 
 #: ../user/forum_subscribe.php:61
 msgid "Unsubscription successful"
@@ -4391,11 +4093,9 @@ msgstr "Успішне скасування підписки"
 
 #: ../user/forum_subscribe.php:64
 msgid ""
-"You are no longer subscribed to %1. You will no longer receive notifications "
-"for this thread."
-msgstr ""
-"Ви більше не підписані на %1. Ви більше не будете отримувати сповіщення для "
-"цього обговорення."
+"You are no longer subscribed to %1. You will no longer receive notifications"
+" for this thread."
+msgstr "Ви більше не підписані на %1. Ви більше не будете отримувати сповіщення для цього обговорення."
 
 #: ../user/forum_subscribe.php:66
 msgid "Unsubscription failed"
@@ -4404,8 +4104,7 @@ msgstr "Скасувати підписку не вдалося"
 #: ../user/forum_subscribe.php:67
 msgid ""
 "We are currently unable to unsubscribe you from %1. Please try again later.."
-msgstr ""
-"Зараз неможливо скасувати підписку на %1. Будь-ласка, спробуйте пізніше..."
+msgstr "Зараз неможливо скасувати підписку на %1. Будь-ласка, спробуйте пізніше..."
 
 #: ../user/forum_subscribe.php:74
 msgid "Unknown subscription action"
@@ -4441,8 +4140,7 @@ msgstr "Відписатися"
 
 #: ../user/forum_thread.php:172
 msgid "You are subscribed to this thread.  Click here to unsubscribe."
-msgstr ""
-"Ви підписані на це обговорення.  Натисніть тут для того, щоб відписатися."
+msgstr "Ви підписані на це обговорення.  Натисніть тут для того, щоб відписатися."
 
 #: ../user/forum_thread.php:178
 msgid "Subscribe"
@@ -4450,9 +4148,7 @@ msgstr "Підписатися"
 
 #: ../user/forum_thread.php:179
 msgid "Click to get email when there are new posts in this thread"
-msgstr ""
-"Натисніть для того, щоб отримувати сповіщення про нові повідомлення в цьому "
-"обговоренні."
+msgstr "Натисніть для того, щоб отримувати сповіщення про нові повідомлення в цьому обговоренні."
 
 #: ../user/forum_thread.php:190
 msgid "Unhide this thread"
@@ -4560,11 +4256,9 @@ msgstr "Додати друга"
 
 #: ../user/friend.php:74
 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 і попросимо його/її "
-"підтвердити дружбу."
+"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
 msgid "Add an optional message here:"
@@ -4668,57 +4362,45 @@ msgstr "Забули свою облікову інформацію?"
 
 #: ../user/get_passwd.php:28
 msgid ""
-"1) If you know your account's email address, and you can receive email there:"
-msgstr ""
-"1) Якщо Ви знаєте адресу електронної пошти Вашого облікового запису, і Ви "
-"можете отримати листа:"
+"1) If you know your account's email address, and you can receive email "
+"there:"
+msgstr "1) Якщо Ви знаєте адресу електронної пошти Вашого облікового запису, і Ви можете отримати листа:"
 
 #: ../user/get_passwd.php:29
 msgid ""
 "Enter the email address below, and click OK. You will be sent email "
 "instructions for resetting your password."
-msgstr ""
-"Уведіть адресу електронної пошти нижче і натисніть Гаразд. Вам будуть "
-"вислані інструкції для скидання Вашого паролю."
+msgstr "Уведіть адресу електронної пошти нижче і натисніть Гаразд. Вам будуть вислані інструкції для скидання Вашого паролю."
 
 #: ../user/get_passwd.php:46
 msgid ""
 "2) If you forgot your account's email address, or you can't receive email "
 "there:"
-msgstr ""
-"2) Якщо Ви забули адресу електронної пошти Вашого облікового запису або не "
-"можете отримати листа:"
+msgstr "2) Якщо Ви забули адресу електронної пошти Вашого облікового запису або не можете отримати листа:"
 
 #: ../user/get_passwd.php:47
 msgid ""
 "If you have run BOINC under this account, you can still access it. Here's "
 "how:"
-msgstr ""
-"Якщо BOINC запускався під цим Вашим обліковим записом, Ви можете отримати "
-"доступ до нього. Для цього потрібно зробити наступне:"
+msgstr "Якщо BOINC запускався під цим Вашим обліковим записом, Ви можете отримати доступ до нього. Для цього потрібно зробити наступне:"
 
 #: ../user/get_passwd.php:50
 msgid ""
 "Go to the BOINC data directory on your computer (its location is written to "
 "the Event Log at startup)."
-msgstr ""
-"Перейдіть в каталог даних BOINC на своєму комп'ютері (його розташування "
-"записується в журналі подій при запуску)."
+msgstr "Перейдіть в каталог даних BOINC на своєму комп'ютері (його розташування записується в журналі подій при запуску)."
 
 #: ../user/get_passwd.php:51
 msgid "Find your account file for this project; it will be named <b>%1</b>."
-msgstr ""
-"Знайдіть там файл облікового запису для цього проекту; він буде називатися "
-"<b>%1</b>."
+msgstr "Знайдіть там файл облікового запису для цього проекту; він буде називатися <b>%1</b>."
 
 #: ../user/get_passwd.php:52
 msgid "Open the file in a text editor like Notepad. You'll see something like"
-msgstr ""
-"Відкрийте цей файл у текстовому редакторі, наприклад в Блокноті. Ви побачите "
-"щось на кшталт"
+msgstr "Відкрийте цей файл у текстовому редакторі, наприклад в Блокноті. Ви побачите щось на кшталт"
 
 #: ../user/get_passwd.php:62
-msgid "Select and Copy the string between %1 and %2 (%3 in the above example)."
+msgid ""
+"Select and Copy the string between %1 and %2 (%3 in the above example)."
 msgstr "Виберіть і скопіюйте рядок між %1 і %2 (%3 у наведеному вище прикладі)."
 
 #: ../user/get_passwd.php:64
@@ -4729,9 +4411,7 @@ msgstr "Вставте цей рядок у розташоване нижче п
 msgid ""
 "You will now be logged in to your account; update the email and password of "
 "your account."
-msgstr ""
-"Тепер Ви авторизовані; оновіть адресу електронної пошти і пароль для свого "
-"облікового запису."
+msgstr "Тепер Ви авторизовані; оновіть адресу електронної пошти і пароль для свого облікового запису."
 
 #: ../user/get_passwd.php:71
 msgid "Log in with authenticator"
@@ -4745,9 +4425,7 @@ msgstr "Немає повідомлених ГП-задач"
 msgid ""
 "The following lists show the most productive GPU models on different "
 "platforms.  Relative speeds are shown in parentheses."
-msgstr ""
-"Наступні списки показують найпродуктивніші моделі графічних прискорювачів на "
-"різних платформах.  Відносні швидкості вказані в лапках."
+msgstr "Наступні списки показують найпродуктивніші моделі графічних прискорювачів на різних платформах.  Відносні швидкості вказані в лапках."
 
 #: ../user/home.php:42
 msgid "Welcome to %1"
@@ -4755,15 +4433,11 @@ msgstr "Ласкаво просимо у %1"
 
 #: ../user/home.php:43
 msgid "View and edit your account preferences using the links below."
-msgstr ""
-"Для перегляду і редагування налаштувань Вашого облікового запису "
-"використовуйте посилання нижче."
+msgstr "Для перегляду і редагування налаштувань Вашого облікового запису використовуйте посилання нижче."
 
 #: ../user/home.php:46
 msgid "If you have not already done so, %1download BOINC client software%2."
-msgstr ""
-"Якщо Ви цього ще не зробили, %1завантажте клієнтське програмне забезпечення "
-"BOINC%2."
+msgstr "Якщо Ви цього ще не зробили, %1завантажте клієнтське програмне забезпечення BOINC%2."
 
 #: ../user/host_app_versions.php:37
 msgid "Anonymous platform, missing app"
@@ -4818,10 +4492,7 @@ msgid ""
 "You can not delete our record of this computer because our database still "
 "contains work for it. You must wait a few days until the work for this "
 "computer has been deleted from the project database."
-msgstr ""
-"Ви не можете видалити запис про цей комп’ютер, оскільки у базі ще міститься "
-"для нього робота. Ви повинні зачекати декілька днів, поки робота для цього "
-"комп’ютера не буде видалена з бази даних проекту."
+msgstr "Ви не можете видалити запис про цей комп’ютер, оскільки у базі ще міститься для нього робота. Ви повинні зачекати декілька днів, поки робота для цього комп’ютера не буде видалена з бази даних проекту."
 
 #: ../user/host_delete.php:40
 msgid "Delete record of computer"
@@ -4845,12 +4516,9 @@ msgstr "Об’єднання комп’ютерів"
 
 #: ../user/host_edit_form.php:38
 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 помилково призначає різні ідентифікатори одному і тому самому "
-"комп’ютеру. Ви можете виправити це об’єднавши старі ідентифікатори з "
-"найновішими."
+"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 помилково призначає різні ідентифікатори одному і тому самому комп’ютеру. Ви можете виправити це об’єднавши старі ідентифікатори з найновішими."
 
 #: ../user/host_edit_form.php:56
 msgid "No hosts are eligible for merging with this one."
@@ -4905,9 +4573,7 @@ msgstr "Розміщення цього комп’ютера було вста
 msgid ""
 "This change will take effect the next time the host communicates with this "
 "project."
-msgstr ""
-"Ця зміна буде врахована наступного разу, коли комп’ютер зв’яжеться з даним "
-"проектом."
+msgstr "Ця зміна буде врахована наступного разу, коли комп’ютер зв’яжеться з даним проектом."
 
 #: ../user/host_venue_action.php:50
 msgid "Return to host page"
@@ -4964,11 +4630,9 @@ msgstr "попереднє форматування"
 
 #: ../user/html.php:33
 msgid ""
-"image; height cannot exceed 450 pixels. Please do not link to images without "
-"permission of the web site where the image is hosted."
-msgstr ""
-"зображення; висота не повинна перевищувати 450 пікселів. Будь-ласка, не "
-"публікуйте посилання на зображення без дозволу веб-сайту, де воно розміщене."
+"image; height cannot exceed 450 pixels. Please do not link to images without"
+" permission of the web site where the image is hosted."
+msgstr "зображення; висота не повинна перевищувати 450 пікселів. Будь-ласка, не публікуйте посилання на зображення без дозволу веб-сайту, де воно розміщене."
 
 #: ../user/html.php:35
 msgid "You can also use ampersand notation for special characters."
@@ -4983,11 +4647,7 @@ msgid ""
 "Run %1 only on computers that you own, or for which you have obtained the "
 "owner's permission. Some companies and schools have policies that prohibit "
 "using their computers for projects such as %1."
-msgstr ""
-"Запускайте %1 тільки на комп’ютерах, якими Ви володієте, або для яких Ви "
-"отримали права власника. У деяких компаніях і школах (ВУЗах) встановлений "
-"порядок, за яким забороняється використовувати їхні комп’ютери у таких "
-"проектах, як %1."
+msgstr "Запускайте %1 тільки на комп’ютерах, якими Ви володієте, або для яких Ви отримали права власника. У деяких компаніях і школах (ВУЗах) встановлений порядок, за яким забороняється використовувати їхні комп’ютери у таких проектах, як %1."
 
 #: ../user/info.php:38
 msgid "How %1 will use your computer"
@@ -4998,19 +4658,13 @@ msgid ""
 "When you run %1 on your computer, it will use part of the computer's CPU "
 "power, disk space, and network bandwidth. You can control how much of your "
 "resources are used by %1, and when it uses them."
-msgstr ""
-"Коли Ви запускаєте %1 на своєму комп’ютері, він буде використовувати частину "
-"ресурсів процесора, простір на жорсткому диску (вінчестері) і мережевий "
-"трафік. Ви можете контролювати скільки ресурсів Вашого комп’ютера буде "
-"використано для роботи %1, і коли ці ресурси будуть використовуватися."
+msgstr "Коли Ви запускаєте %1 на своєму комп’ютері, він буде використовувати частину ресурсів процесора, простір на жорсткому диску (вінчестері) і мережевий трафік. Ви можете контролювати скільки ресурсів Вашого комп’ютера буде використано для роботи %1, і коли ці ресурси будуть використовуватися."
 
 #: ../user/info.php:40
 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 ""
-"Робота, здійснена Вашим комп’ютером, сприяє вирішенню задач %1, як описано "
-"на веб-сайті проекту. Додатки можуть з часом змінюватися."
+msgstr "Робота, здійснена Вашим комп’ютером, сприяє вирішенню задач %1, як описано на веб-сайті проекту. Додатки можуть з часом змінюватися."
 
 #: ../user/info.php:42
 msgid "Privacy policy"
@@ -5018,15 +4672,11 @@ msgstr "Забезпечення конфіденційності"
 
 #: ../user/info.php:43
 msgid ""
-"Your account on %1 is identified by a name that you choose. This name may be "
-"shown on the %1 web site, along with a summary of the work your computer has "
-"done for %1. If you want to be anonymous, choose a name that doesn't reveal "
-"your identity."
-msgstr ""
-"Ваш обліковий запис на %1 ідентифікується за іменем, яке Ви вказали. Це ім’я "
-"може показуватися на веб-сайті %1, поряд зі зведенням роботи Вашого "
-"комп’ютера, проробленої для %1. Якщо Ви хочете залишитися невідомим, "
-"виберіть ім’я, яке не відповідає Вашому справжньому."
+"Your account on %1 is identified by a name that you choose. This name may be"
+" shown on the %1 web site, along with a summary of the work your computer "
+"has done for %1. If you want to be anonymous, choose a name that doesn't "
+"reveal your identity."
+msgstr "Ваш обліковий запис на %1 ідентифікується за іменем, яке Ви вказали. Це ім’я може показуватися на веб-сайті %1, поряд зі зведенням роботи Вашого комп’ютера, проробленої для %1. Якщо Ви хочете залишитися невідомим, виберіть ім’я, яке не відповідає Вашому справжньому."
 
 #: ../user/info.php:44
 msgid ""
@@ -5035,24 +4685,14 @@ 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 ""
-"Якщо Ви приймаєте участь у %1, інформація про Ваш комп’ютер (така як тип "
-"процесора, об’єм оперативної пам’яті, і т.д.) буде записана проектом %1 і "
-"використана для прийняття рішення про те, який тип роботи призначити Вашому "
-"комп’ютеру. Ця інформація також буде показана на веб-сайті %1. Нічого, що "
-"вказувало б на місцезнаходження Вашого комп’ютера (наприклад, його доменне "
-"або мережеве ім’я), не буде показуватися."
+msgstr "Якщо Ви приймаєте участь у %1, інформація про Ваш комп’ютер (така як тип процесора, об’єм оперативної пам’яті, і т.д.) буде записана проектом %1 і використана для прийняття рішення про те, який тип роботи призначити Вашому комп’ютеру. Ця інформація також буде показана на веб-сайті %1. Нічого, що вказувало б на місцезнаходження Вашого комп’ютера (наприклад, його доменне або мережеве ім’я), не буде показуватися."
 
 #: ../user/info.php:45
 msgid ""
-"To participate in %1, you must give an address where you receive email. This "
-"address will not be shown on the %1 web site or shared with organizations. %"
-"1 may send you periodic newsletters; however, you can opt out at any time."
-msgstr ""
-"Щоб прийняти участь у %1, Ви повинні вказати свою адресу електронної пошти. "
-"Ця адреса не буде показуватися на веб-сайті %1 і не буде доступною іншим "
-"організаціям. %1 може періодично надсилати Вам листи з новинами; проте Ви "
-"можете відмовитися від них у будь-який час."
+"To participate in %1, you must give an address where you receive email. This"
+" address will not be shown on the %1 web site or shared with organizations. "
+"%1 may send you periodic newsletters; however, you can opt out at any time."
+msgstr "Щоб прийняти участь у %1, Ви повинні вказати свою адресу електронної пошти. Ця адреса не буде показуватися на веб-сайті %1 і не буде доступною іншим організаціям. %1 може періодично надсилати Вам листи з новинами; проте Ви можете відмовитися від них у будь-який час."
 
 #: ../user/info.php:46
 msgid ""
@@ -5061,26 +4701,15 @@ 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 ""
-"Приватні повідомлення, які відправляються на веб-сайті %1, видимі тільки "
-"відправнику і отримувачу.  %1 не переглядає і не контролює вміст приватних "
-"повідомлень.  Якщо Ви отримуєте небажані приватні повідомлення від деяких "
-"користувачів %1, Ви можете додати їх у свій %2фільтр повідомлень%3.  Тоді Ви "
-"не побачите жодного загального чи приватного повідомлення від таких "
-"користувачів."
+msgstr "Приватні повідомлення, які відправляються на веб-сайті %1, видимі тільки відправнику і отримувачу.  %1 не переглядає і не контролює вміст приватних повідомлень.  Якщо Ви отримуєте небажані приватні повідомлення від деяких користувачів %1, Ви можете додати їх у свій %2фільтр повідомлень%3.  Тоді Ви не побачите жодного загального чи приватного повідомлення від таких користувачів."
 
 #: ../user/info.php:47
 msgid ""
 "If you use our web site forums you must follow the %2posting guidelines%3.  "
 "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 ""
-"Якщо Ви використовуєте форуми нашого веб-сайту, то повинні керуватися %"
-"2даними рекомендаціями%3.  Повідомлення, що публікуються на форумах %1, "
-"видимі для кожного, в тому числі для осіб, які не є учасниками проекту.  "
-"Публікуючи повідомлення на форумах, Ви надаєте кожному безвідкличну ліцензію "
-"на перегляд і копіювання своїх повідомлень."
+"members.  By posting to the forums, you are granting irrevocable license for"
+" anyone to view and copy your posts."
+msgstr "Якщо Ви використовуєте форуми нашого веб-сайту, то повинні керуватися %2даними рекомендаціями%3.  Повідомлення, що публікуються на форумах %1, видимі для кожного, в тому числі для осіб, які не є учасниками проекту.  Публікуючи повідомлення на форумах, Ви надаєте кожному безвідкличну ліцензію на перегляд і копіювання своїх повідомлень."
 
 #: ../user/info.php:48
 msgid "Is it safe to run %1?"
@@ -5090,35 +4719,23 @@ msgstr "Чи безпечно запускати %1?"
 msgid ""
 "Any time you download a program through the Internet you are taking a "
 "chance: the program might have dangerous errors, or the download server "
-"might have been hacked. %1 has made efforts to minimize these risks. We have "
-"tested our applications carefully. Our servers are behind a firewall and 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 ""
-"Кожного разу при завантаженні програми через Інтернет може статися наступне: "
-"програма може мати небезпечні помилки або сервер може бути зламаний. %1 "
-"приклав зусилля для мінімізації цих ризиків. Ми ретельно протестували наші "
-"додатки. Наші сервери захищені мережевим екраном і налаштовані на високу "
-"безпеку. Щоб впевнитися у цілісності програм для завантаження, всі виконавчі "
-"файли підписані цифровим підписом на захищеному комп’ютері, не підключеному "
-"до мережі Інтернет."
+"might have been hacked. %1 has made efforts to minimize these risks. We have"
+" tested our applications carefully. Our servers are behind a firewall and "
+"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 "Кожного разу при завантаженні програми через Інтернет може статися наступне: програма може мати небезпечні помилки або сервер може бути зламаний. %1 приклав зусилля для мінімізації цих ризиків. Ми ретельно протестували наші додатки. Наші сервери захищені мережевим екраном і налаштовані на високу безпеку. Щоб впевнитися у цілісності програм для завантаження, всі виконавчі файли підписані цифровим підписом на захищеному комп’ютері, не підключеному до мережі Інтернет."
 
 #: ../user/info.php:50
 msgid ""
 "The applications run by %1 may cause some computers to overheat. If this "
 "happens, stop running %1 or use a %2utility program%3 that limits CPU usage."
-msgstr ""
-"Додатки, які запускаються проектом %1, можуть стати причиною перегрівання "
-"деяких комп’ютерів. Якщо таке трапилося, зупиніть роботу %1 або "
-"використовуйте %2утиліти%3, які обмежать використання процесора."
+msgstr "Додатки, які запускаються проектом %1, можуть стати причиною перегрівання деяких комп’ютерів. Якщо таке трапилося, зупиніть роботу %1 або використовуйте %2утиліти%3, які обмежать використання процесора."
 
 #: ../user/info.php:51
 msgid ""
 "%1 was developed by %2. BOINC was developed at the University of California."
-msgstr ""
-"%1 був розроблений %2. BOINC був розроблений в Каліфорнійському "
-"Університеті."
+msgstr "%1 був розроблений %2. BOINC був розроблений в Каліфорнійському Університеті."
 
 #: ../user/info.php:53
 msgid "Liability"
@@ -5127,12 +4744,9 @@ msgstr "Відповідальність"
 #: ../user/info.php:54
 msgid ""
 "%1 and %2 assume no liability for damage to your computer, loss of data, or "
-"any other event or condition that may occur as a result of participating in %"
-"1."
-msgstr ""
-"%1 і %2 не беруть на себе відповідальність за збитки, завдані Вашому "
-"комп’ютеру, втрату даних чи будь-яку іншу подію або інцидент, що може "
-"відбутися в результаті участі у %1."
+"any other event or condition that may occur as a result of participating in "
+"%1."
+msgstr "%1 і %2 не беруть на себе відповідальність за збитки, завдані Вашому комп’ютеру, втрату даних чи будь-яку іншу подію або інцидент, що може відбутися в результаті участі у %1."
 
 #: ../user/info.php:56
 msgid "Other BOINC projects"
@@ -5140,23 +4754,17 @@ msgstr "Інші BOINC-проекти"
 
 #: ../user/info.php:57
 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 "
+"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 ""
-"Інші проекти використовують ту саму платформу, BOINC, що і %1. Ви можете "
-"прийняти участь в одному або декількох із цих проектів. Якщо Ви приєднаєтеся "
-"до декількох проектів, Ваш комп’ютер буде виконувати корисну роботу, навіть "
-"коли у %1 не буде завдань, доступних для обробки."
+msgstr "Інші проекти використовують ту саму платформу, BOINC, що і %1. Ви можете прийняти участь в одному або декількох із цих проектів. Якщо Ви приєднаєтеся до декількох проектів, Ваш комп’ютер буде виконувати корисну роботу, навіть коли у %1 не буде завдань, доступних для обробки."
 
 #: ../user/info.php:58
 msgid ""
 "These other projects are not associated with %1, and we cannot vouch for "
 "their security practices or the nature of their research. Join them at your "
 "own risk."
-msgstr ""
-"Інші проекти не пов’язані з %1, і ми не можемо ручатися за їх безпеку або "
-"природу їхніх досліджень. Приєднуйтесь до них на свій страх і ризик."
+msgstr "Інші проекти не пов’язані з %1, і ми не можемо ручатися за їх безпеку або природу їхніх досліджень. Приєднуйтесь до них на свій страх і ризик."
 
 #: ../user/language_select.php:47
 msgid "Language selection"
@@ -5172,9 +4780,7 @@ msgstr "Цей веб-сайт доступний декількома мова
 msgid ""
 "Normally the choice of language is determined by your browser's language "
 "setting, which is: %1.  You can change this setting using:"
-msgstr ""
-"Зазвичай вибір мови визначається мовними налаштуваннями Вашого браузера, а "
-"саме: %1.  Ви можете змінити цей параметр, використовуючи:"
+msgstr "Зазвичай вибір мови визначається мовними налаштуваннями Вашого браузера, а саме: %1.  Ви можете змінити цей параметр, використовуючи:"
 
 #: ../user/language_select.php:83
 msgid "Firefox: Tools/Options/General"
@@ -5189,10 +4795,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 ""
-"Або ж Ви можете вибрати мову, натиснувши на одне із посилань.  Вашому "
-"браузеру буде відправлений файл 'cookie'; переконайтеся, що Ваш браузер "
-"приймає файли 'cookie' нашого домену."
+msgstr "Або ж Ви можете вибрати мову, натиснувши на одне із посилань.  Вашому браузеру буде відправлений файл 'cookie'; переконайтеся, що Ваш браузер приймає файли 'cookie' нашого домену."
 
 #: ../user/language_select.php:95
 msgid "Language name (click to select)"
@@ -5204,11 +4807,9 @@ msgstr "Використовувати мовні налаштування ог
 
 #: ../user/language_select.php:113
 msgid ""
-"Translations are done by volunteers.  If your native language is not here, %"
-"1you can provide a translation%2."
-msgstr ""
-"Переклади зроблені волонтерами.  Якщо Ваша рідна мова тут відсутня, %1Ви "
-"можете подати переклад%2."
+"Translations are done by volunteers.  If your native language is not here, "
+"%1you can provide a translation%2."
+msgstr "Переклади зроблені волонтерами.  Якщо Ваша рідна мова тут відсутня, %1Ви можете подати переклад%2."
 
 #: ../user/login_form.php:45
 msgid "Email address:"
@@ -5254,14 +4855,7 @@ msgid ""
 "        having that name with the newest computer having that name.\n"
 "        Incompatible computers will not be merged.\n"
 "        <p>"
-msgstr ""
-"Дана операція об’єднує комп’ютери на основі їхніх доменних імен.\n"
-"        <p>\n"
-"        Ця операція для кожного доменного імені об’єднує всі старі "
-"комп’ютери\n"
-"        з таким іменем з найновішим комп’ютером з тим самим іменем.\n"
-"        Несумісні комп’ютери не будуть об’єднані.\n"
-"        <p>"
+msgstr "Дана операція об’єднує комп’ютери на основі їхніх доменних імен.\n        <p>\n        Ця операція для кожного доменного імені об’єднує всі старі комп’ютери\n        з таким іменем з найновішим комп’ютером з тим самим іменем.\n        Несумісні комп’ютери не будуть об’єднані.\n        <p>"
 
 #: ../user/merge_by_name.php:82
 msgid "Go ahead and do this"
@@ -5277,11 +4871,7 @@ msgid ""
 "To maximize discussion and flow of information,\n"
 "our message boards are moderated.\n"
 "Message board postings are subject to the following posting rules:\n"
-msgstr ""
-"\n"
-"Для максимізації обговорення і обміну інформацією,\n"
-"наші дошки повідомлень модеруються.\n"
-"Повідомлення дошки повідомлень підлягають наступним правилам розміщення:\n"
+msgstr "\nДля максимізації обговорення і обміну інформацією,\nнаші дошки повідомлень модеруються.\nПовідомлення дошки повідомлень підлягають наступним правилам розміщення:\n"
 
 #: ../user/moderation.php:30
 msgid ""
@@ -5290,8 +4880,7 @@ msgid ""
 "Moderators may delete posts that violate any of these rules.\n"
 "The authors of deleted posts will be notified via email.\n"
 "Gross offenders may have their ability to post messages temporarily revoked\n"
-"(though to prevent abuse only project administrators have the ability to do "
-"so).\n"
+"(though to prevent abuse only project administrators have the ability to do so).\n"
 "Additional kinds of bad behavior (\"bugging\" posts to trap the\n"
 "IP addresses of other participants, excessive thread creation to spam\n"
 "the forums, etc.), while not listed in the formal rules, may still\n"
@@ -5320,44 +4909,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>\n"
-"Модератори можуть видаляти повідомлення, які порушують будь-які з цих "
-"правил.\n"
-"Автори видалених повідомлень будуть сповіщені електронною поштою.\n"
-"У серйозних порушників може бути тимчасово скасована можливість розміщувати "
-"повідомлення\n"
-"(хоча для запобігання зловживань таку можливість мають тільки адміністратори "
-"проекту).\n"
-"Додаткові види поганої поведінки ('злам' повідомлень для перехоплення\n"
-"IP-адрес інших учасників, надмірне створення спам-обговорень\n"
-"на форумах, і т.д.), хоч і не перечислені у формальних правилах,\n"
-"теж можуть привести до аналогічних заходів покарання.\n"
-"<p>\n"
-"Якщо Ви вважаєте, що повідомлення порушує будь-які правила,\n"
-"натисніть червоний хрестик під повідомленням і заповніть форму;\n"
-"модератори будуть повідомлені про Вашу скаргу.\n"
-"Будь-ласка, використовуйте цю кнопку тільки для відвертих\n"
-"порушень, а не для особистих суперечок.\n"
-"<p>\n"
-"При модерації ми стараємося бути справедливими, наскільки це можливо,\n"
-"але у великій спільноті користувачів, з величезною кількістю різних точок "
-"зору,\n"
-"завжди будуть люди, незадоволені нашими методами модерування.\n"
-"Хоч ми і жалкуємо з цього приводу,\n"
-"потрібно розуміти, що ми не в змозі задовольнити всіх людей в усіх випадках\n"
-"і вимушені приймати рішення, базуючись на наших ресурсах і\n"
-"на тому, що краще для форуму в цілому.\n"
-"Будь-ласка, не треба обговорювати нашу політику модерації на форумах.\n"
-"Ми - не соціально-інженерний проект, і не створюємо досконало\n"
-"справедливу систему. Тому такі дискусії, скоріш за все, будуть\n"
-"контрпродуктивними і потенційно небезпечними. Якщо у Вас є законна вимога,\n"
-"відправте електронного листа за вказаною нижче адресою.\n"
-"<p>\n"
-"Ця політика модерування встановлена в рамках проекту %1.\n"
-"Якщо у Вас є коментарі до неї, відправте листа за адресою %2.\n"
-"\n"
+msgstr "\n<p>\nМодератори можуть видаляти повідомлення, які порушують будь-які з цих правил.\nАвтори видалених повідомлень будуть сповіщені електронною поштою.\nУ серйозних порушників може бути тимчасово скасована можливість розміщувати повідомлення\n(хоча для запобігання зловживань таку можливість мають тільки адміністратори проекту).\nДодаткові види поганої поведінки ('злам' повідомлень для перехоплення\nIP-адрес інших учасників, надмірне створення спам-обговорень\nна форумах, і т.д.), [...]
 
 #: ../user/pending.php:66
 msgid "Pending credit"
@@ -5433,19 +4985,14 @@ msgstr "Дата"
 
 #: ../user/pm.php:185
 msgid "You need to fill all fields to send a private message"
-msgstr ""
-"Для того, щоб відправити приватне повідомлення, Ви повинні заповнити всі "
-"поля"
+msgstr "Для того, щоб відправити приватне повідомлення, Ви повинні заповнити всі поля"
 
 #: ../user/pm.php:188
 msgid ""
 "Your message was flagged as spam\n"
 "                by the Akismet anti-spam system.\n"
 "                Please modify your text and try again."
-msgstr ""
-"Ваше повідомлення було помічене як спам\n"
-"                антиспам-системою Akismet.\n"
-"                Будь-ласка, змінітьсвій текст і спробуйте ще раз."
+msgstr "Ваше повідомлення було помічене як спам\n                антиспам-системою Akismet.\n                Будь-ласка, змінітьсвій текст і спробуйте ще раз."
 
 #: ../user/pm.php:205
 msgid "Could not find user with id %1"
@@ -5457,9 +5004,7 @@ msgstr "Не вдається знайти користувача з імене
 
 #: ../user/pm.php:212
 msgid "%1 is not a unique username; you will have to use user ID"
-msgstr ""
-"%1 - не унікальне ім’я користувача; Ви змушені будете використовувати ID "
-"користувача"
+msgstr "%1 - не унікальне ім’я користувача; Ви змушені будете використовувати ID користувача"
 
 #: ../user/pm.php:217
 msgid "User %1 (ID: %2) is not accepting private messages from you."
@@ -5477,23 +5022,17 @@ msgstr "Точно заблокувати %1?"
 msgid ""
 "Are you really sure you want to block user %1 from sending you private "
 "messages?"
-msgstr ""
-"Ви насправді впевнені, що хочете заблокувати можливість користувача %1 "
-"відправляти Вам приватні повідомлення?"
+msgstr "Ви насправді впевнені, що хочете заблокувати можливість користувача %1 відправляти Вам приватні повідомлення?"
 
 #: ../user/pm.php:244
 msgid "Please note that you can only block a limited amount of users."
-msgstr ""
-"Будь-ласка, зверніть увагу, що Ви можете заблокувати тільки обмежену "
-"кількість користувачів."
+msgstr "Будь-ласка, зверніть увагу, що Ви можете заблокувати тільки обмежену кількість користувачів."
 
 #: ../user/pm.php:245
 msgid ""
 "Once the user has been blocked you can unblock it using forum preferences "
 "page."
-msgstr ""
-"Як тільки користувач був заблокований, Ви можете розблокувати його, "
-"використовуючи сторінку налаштувань форуму."
+msgstr "Як тільки користувач був заблокований, Ви можете розблокувати його, використовуючи сторінку налаштувань форуму."
 
 #: ../user/pm.php:252
 msgid "No, cancel"
@@ -5509,14 +5048,11 @@ msgstr "Користувач %1 заблокований"
 
 #: ../user/pm.php:265
 msgid "User %1 has been blocked from sending you private messages."
-msgstr ""
-"Відправлення приватних повідомлень для Вас від користувача %1 було "
-"заблоковане."
+msgstr "Відправлення приватних повідомлень для Вас від користувача %1 було заблоковане."
 
 #: ../user/pm.php:266
 msgid "To unblock, visit %1message board preferences%2"
-msgstr ""
-"Для того щоб розблокувати, відвідайте %1налаштування дошки повідомлень%2"
+msgstr "Для того щоб розблокувати, відвідайте %1налаштування дошки повідомлень%2"
 
 #: ../user/pm.php:302
 msgid "Unknown action"
@@ -5527,20 +5063,14 @@ 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"
-"          будуть задіяні, коли Ваш комп’ютер зв’яжеться з %1\n"
-"          або Ви виконаєте команду %2Оновити%3 з Менеджера BOINC."
+msgstr "Ваші налаштування оновлені і\n          будуть задіяні, коли Ваш комп’ютер зв’яжеться з %1\n          або Ви виконаєте команду %2Оновити%3 з Менеджера BOINC."
 
 #: ../user/prefs.php:41
 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"
-"          або Ви застосуєте команду %2Оновити%3 з Менеджера BOINC."
+msgstr "Ваші налаштування були скинені до значень за замовчуванням і\n          будуть задіяні, коли Ваш комп’ютер зв’яжеться з %1,\n          або Ви застосуєте команду %2Оновити%3 з Менеджера BOINC."
 
 #: ../user/prefs_edit.php:65 ../user/prefs_edit.php:93
 msgid "%1 for %2"
@@ -5556,9 +5086,7 @@ msgstr "Підтвердження видалення налаштувань"
 
 #: ../user/prefs_remove.php:48
 msgid "Are you sure you want to delete your separate %1 preferences for %2?"
-msgstr ""
-"Ви впевнені, що хочете видалити ваші окремі налаштування %1 для конфігурації "
-"%2?"
+msgstr "Ви впевнені, що хочете видалити ваші окремі налаштування %1 для конфігурації %2?"
 
 #: ../user/prefs_remove.php:52
 msgid "Remove preferences"
@@ -5572,25 +5100,19 @@ msgstr "Скасувати"
 msgid ""
 "%1Profiles%2 let individuals share backgrounds and opinions with the %3 "
 "community."
-msgstr ""
-"%1Профілі%2 дозволяють людям ділитися біографічними даними і особистими "
-"думками зі спільнотою %3."
+msgstr "%1Профілі%2 дозволяють людям ділитися біографічними даними і особистими думками зі спільнотою %3."
 
 #: ../user/profile_menu.php:36
 msgid ""
 "Explore the diversity of your fellow volunteers, and contribute your own "
 "views for others to enjoy."
-msgstr ""
-"Досліджуйте різноманітність Ваших однодумців-волонтерів, і представте свою "
-"власну точку зору іншим."
+msgstr "Досліджуйте різноманітність Ваших однодумців-волонтерів, і представте свою власну точку зору іншим."
 
 #: ../user/profile_menu.php:37
 msgid ""
 "If you haven't already, you can %1create your own user profile%2 for others "
 "to see!"
-msgstr ""
-"Якщо Ви цього ще не зробили, то можете %1створити свій власний профіль "
-"користувача%2 для того, щоб інші могли його побачити!"
+msgstr "Якщо Ви цього ще не зробили, то можете %1створити свій власний профіль користувача%2 для того, щоб інші могли його побачити!"
 
 #: ../user/profile_menu.php:42
 msgid "User of the Day"
@@ -5612,9 +5134,7 @@ msgstr "Переглянути профілі %1за країнами%2."
 msgid ""
 "Browse profiles %1at random%2, %3at random with pictures%2, or %4at random "
 "without pictures%2."
-msgstr ""
-"Переглянути профілі %1випадковим чином%2, %3випадковим чином з картинками%2 "
-"або %4випадковим чином без картинок%2."
+msgstr "Переглянути профілі %1випадковим чином%2, %3випадковим чином з картинками%2 або %4випадковим чином без картинок%2."
 
 #: ../user/profile_menu.php:66
 msgid "Alphabetical profile listings:"
@@ -5858,27 +5378,21 @@ msgstr "Статистика %1"
 
 #: ../user/stats.php:37
 msgid ""
-"More detailed statistics for %1 and other BOINC-based projects are available "
-"at several web sites:"
-msgstr ""
-"Більш детальна статистика %1 та інших BOINC-проектів доступна на декількох "
-"веб-сайтах:"
+"More detailed statistics for %1 and other BOINC-based projects are available"
+" at several web sites:"
+msgstr "Більш детальна статистика %1 та інших BOINC-проектів доступна на декількох веб-сайтах:"
 
 #: ../user/stats.php:40
 msgid ""
-"You can also get your current statistics in the form of a \"signature image"
-"\":"
-msgstr ""
-"Ви також можете покращити свою поточну статистику у вигляді \"зображення для "
-"підпису\":"
+"You can also get your current statistics in the form of a \"signature "
+"image\":"
+msgstr "Ви також можете покращити свою поточну статистику у вигляді \"зображення для підпису\":"
 
 #: ../user/stats.php:43
 msgid ""
 "Additionally you can get your individual statistics summed across all BOINC "
 "projects from several sites; see your %1home page%2."
-msgstr ""
-"Додатково Ви можете покращити свою індивідуальну сумарну статистику за всіма "
-"проектам BOINC з декількох веб-сайтів; дивіться свою %1домашню сторінку%2."
+msgstr "Додатково Ви можете покращити свою індивідуальну сумарну статистику за всіма проектам BOINC з декількох веб-сайтів; дивіться свою %1домашню сторінку%2."
 
 #: ../user/team.php:27
 msgid "%1 participants may form %2teams%3."
@@ -5887,9 +5401,7 @@ msgstr "Учасники %1 можуть об’єднюватися у %2ком
 #: ../user/team.php:29
 msgid ""
 "You may belong to only one team. You can join or quit a team at any time."
-msgstr ""
-"Ви можете бути в складі лише однієї команди. До неї можна приєднатися або "
-"покинути в будь-який час."
+msgstr "Ви можете бути в складі лише однієї команди. До неї можна приєднатися або покинути в будь-який час."
 
 #: ../user/team.php:31
 msgid "Each team has a %1founder%2 who may:"
@@ -5917,9 +5429,7 @@ msgstr "розформувати команду, в якій немає учас
 
 #: ../user/team.php:40
 msgid "To join a team, visit its team page and click %1Join this team%2."
-msgstr ""
-"Щоб приєднатися до команди, відвідайте її сторінку і натисніть %1Приєднатися "
-"до цієї команди%2."
+msgstr "Щоб приєднатися до команди, відвідайте її сторінку і натисніть %1Приєднатися до цієї команди%2."
 
 #: ../user/team.php:41 ../user/team_search.php:180
 msgid "Find a team"
@@ -5940,9 +5450,7 @@ msgstr "Створити нову команду"
 #: ../user/team.php:59
 msgid ""
 "If you cannot find a team that is right for you, you can %1create a team%2."
-msgstr ""
-"Якщо Ви не можете знайти підходящу для Вас команду, то можете %1створити "
-"нову%2."
+msgstr "Якщо Ви не можете знайти підходящу для Вас команду, то можете %1створити нову%2."
 
 #: ../user/team_admins.php:34
 msgid "Remove Team Admin status from this member"
@@ -5954,9 +5462,7 @@ msgstr "Додати або видалити Адміністраторів ко
 
 #: ../user/team_admins.php:41
 msgid "You can select team members as 'Team Admins'. Team Admins can:"
-msgstr ""
-"Ви можете обрати учасників команди та надати їм статус 'Адміністраторів "
-"команди'. Адміністратори команди можуть:"
+msgstr "Ви можете обрати учасників команди та надати їм статус 'Адміністраторів команди'. Адміністратори команди можуть:"
 
 #: ../user/team_admins.php:43
 msgid "Edit team information (name, URL, description, country)"
@@ -5968,11 +5474,9 @@ msgstr "Переглядати історію приєднання/виходу
 
 #: ../user/team_admins.php:45
 msgid ""
-"Moderate the team forum, if any (admins get email notification of moderation "
-"events and red X reports)"
-msgstr ""
-"Модерувати форум команди, якщо є (адміністратори отримують сповіщення "
-"електронною поштою про події модерації і про червоні X-повідомлення)"
+"Moderate the team forum, if any (admins get email notification of moderation"
+" events and red X reports)"
+msgstr "Модерувати форум команди, якщо є (адміністратори отримують сповіщення електронною поштою про події модерації і про червоні X-повідомлення)"
 
 #: ../user/team_admins.php:47
 msgid "Team Admins cannot:"
@@ -5988,17 +5492,13 @@ msgstr "Видалити учасників"
 
 #: ../user/team_admins.php:53
 msgid "If a Team Admin quits the team, they cease to be a Team Admin."
-msgstr ""
-"Якщо Адміністратор команди покидає команду, він перестає бути "
-"Адміністратором."
+msgstr "Якщо Адміністратор команди покидає команду, він перестає бути Адміністратором."
 
 #: ../user/team_admins.php:54
 msgid ""
 "We recommend that you select only people you know and trust very well as "
 "Team Admins."
-msgstr ""
-"Ми рекомендуємо Вам вибирати Адміністраторами команди тільки людей, яких Ви "
-"знаєте і яким довіряєте."
+msgstr "Ми рекомендуємо Вам вибирати Адміністраторами команди тільки людей, яких Ви знаєте і яким довіряєте."
 
 #: ../user/team_admins.php:59
 msgid "There are currently no Team Admins"
@@ -6068,18 +5568,13 @@ msgstr "Зміна засновника команди %1"
 msgid ""
 "Team member %1 requested this team's foundership on %2, but left the team, "
 "thus canceling the request."
-msgstr ""
-"Учасник команди %1 надав запит на повноваження засновника цієї команди %2, "
-"проте покинув команду, таким чином скасувавши запит."
+msgstr "Учасник команди %1 надав запит на повноваження засновника цієї команди %2, проте покинув команду, таким чином скасувавши запит."
 
 #: ../user/team_change_founder_form.php:49
 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 надав запит на повноваження засновника цієї команди. Це, "
-"можливо, відбулося через те, що Ви покинули команду або не контактували з "
-"командою протягом довгого відрізку часу."
+msgstr "Учасник команди %1 надав запит на повноваження засновника цієї команди. Це, можливо, відбулося через те, що Ви покинули команду або не контактували з командою протягом довгого відрізку часу."
 
 #: ../user/team_change_founder_form.php:55
 msgid "decline request"
@@ -6087,15 +5582,9 @@ msgstr "відхилити запит"
 
 #: ../user/team_change_founder_form.php:58
 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, використовуючи форму нижче."
+"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
 msgid "No transfer request is pending."
@@ -6105,9 +5594,7 @@ msgstr "Немає запитів на зміну засновника, які 
 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> внизу."
+msgstr "Щоб надати права засновника цієї команди іншому учаснику, відмітьте учасника і натисніть кнопку <strong>Змінити засновника</strong> внизу."
 
 #: ../user/team_change_founder_form.php:76
 msgid "New founder?"
@@ -6140,9 +5627,7 @@ msgstr "Створити команду"
 #: ../user/team_create_form.php:30
 msgid ""
 "You belong to %1. You must %2quit this team%3 before creating a new one."
-msgstr ""
-"Ви перебуваєте в команді %1. Необхідно %2вийти з цієї команди%3 перед "
-"створенням нової."
+msgstr "Ви перебуваєте в команді %1. Необхідно %2вийти з цієї команди%3 перед створенням нової."
 
 #: ../user/team_delta.php:65
 msgid "Not founder or admin"
@@ -6265,10 +5750,7 @@ 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 ""
-"Ви впевнені, що хочете видалити дошку повідомлень своєї команди? Всі "
-"обговорення і повідомлення будуть безповоротно видалені. (Проте Ви зможете "
-"пізніше створити нову дошку повідомлень)."
+msgstr "Ви впевнені, що хочете видалити дошку повідомлень своєї команди? Всі обговорення і повідомлення будуть безповоротно видалені. (Проте Ви зможете пізніше створити нову дошку повідомлень)."
 
 #: ../user/team_forum.php:100
 msgid "Yes - remove message board"
@@ -6280,10 +5762,9 @@ msgstr "Дошка повідомлень видалена"
 
 #: ../user/team_forum.php:124
 msgid ""
-"Your team's message board has been removed. You may now %1create a new one%2."
-msgstr ""
-"Дошка повідомлень Вашої команди була видалена. Тепер Ви можете %1створити "
-"нову%2."
+"Your team's message board has been removed. You may now %1create a new "
+"one%2."
+msgstr "Дошка повідомлень Вашої команди була видалена. Тепер Ви можете %1створити нову%2."
 
 #: ../user/team_forum.php:143
 msgid "Team Message Board Updated"
@@ -6303,9 +5784,7 @@ msgstr "У команди немає форуму"
 
 #: ../user/team_founder_transfer_action.php:36
 msgid "You must be a member of a team to access this page."
-msgstr ""
-"Для того, щоб отримати доступ до цієї сторінки, Ви повинні бути учасником "
-"команди ."
+msgstr "Для того, щоб отримати доступ до цієї сторінки, Ви повинні бути учасником команди ."
 
 #: ../user/team_founder_transfer_action.php:90
 msgid "Requesting foundership of %1"
@@ -6313,15 +5792,9 @@ msgstr "Запит прав засновника команди %1"
 
 #: ../user/team_founder_transfer_action.php:98
 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 днів, у Вас "
-"буде можливість стати новим засновником."
+"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
@@ -6336,10 +5809,7 @@ msgstr "Прийняття повноважень засновника кома
 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 для того, щоб скористатися можливостями Адміністратора "
-"команди."
+msgstr "Вітаємо, Ви тепер засновник команди %1. Перейдіть на %2сторінку свого облікового запису%3 для того, щоб скористатися можливостями Адміністратора команди."
 
 #: ../user/team_founder_transfer_action.php:120
 msgid "Decline founder change request"
@@ -6364,9 +5834,7 @@ msgstr "Повернутися на сторінку команди"
 
 #: ../user/team_founder_transfer_form.php:28
 msgid "You need to be a member of a team to access this page."
-msgstr ""
-"Для того, щоб отримати доступ до цієї сторінки, Ви повинні бути учасником "
-"команди."
+msgstr "Для того, щоб отримати доступ до цієї сторінки, Ви повинні бути учасником команди."
 
 #: ../user/team_founder_transfer_form.php:31
 msgid "Request foundership of %1"
@@ -6384,9 +5852,7 @@ msgstr "Ви надіслати запит на зміну засновника
 msgid ""
 "60 days have elapsed since your request, and the founder has not responded. "
 "You may now assume foundership by clicking here:"
-msgstr ""
-"60 днів з моменту подачі Вашого запиту пройшли, а засновник так і не "
-"відповів. Тепер Ви можете прийняти повноваження засновника, натиснувши тут:"
+msgstr "60 днів з моменту подачі Вашого запиту пройшли, а засновник так і не відповів. Тепер Ви можете прийняти повноваження засновника, натиснувши тут:"
 
 #: ../user/team_founder_transfer_form.php:50
 msgid "Assume foundership"
@@ -6396,27 +5862,13 @@ msgstr "Прийняти повноваження засновника"
 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, у Вас буде можливість стати засновником."
+msgstr "Засновник був проінформований про Ваш запит. Якщо він/вона не відповість до %1, у Вас буде можливість стати засновником."
 
 #: ../user/team_founder_transfer_form.php:60
 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"
+"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"
-"                        Ви впевнені, що хочете надіслати запит на права "
-"засновника?"
+msgstr "Якщо засновник команди не активний, а Ви хочете прийняти його повноваження, натисніть на кнопку нижче. Поточному засновнику буде відправлено електронного листа з детальною інформацією про Ваш запит і у нього буде можливість передати Вам повноваження або відхилити запит. Якщо засновник не відповість протягом 60 днів, у Вас буде можливість стати засновником.<br /><br />\n                        Ви впевнені, що хочете надіслати запит на права засновника?"
 
 #: ../user/team_founder_transfer_form.php:65
 msgid "Request foundership"
@@ -6430,9 +5882,7 @@ msgstr "%2 користувачем %1 вже був надісланий зап
 msgid ""
 "A foundership change was requested during the last 90 days, so new requests "
 "are not allowed. Please try again later."
-msgstr ""
-"Запит на зміну засновника надсилався протягом останніх 90 днів, тому нові "
-"запити заборонені. Будь-ласка, спробуйте ще раз пізніше."
+msgstr "Запит на зміну засновника надсилався протягом останніх 90 днів, тому нові запити заборонені. Будь-ласка, спробуйте ще раз пізніше."
 
 #: ../user/team_join.php:32 ../user/team_join_action.php:32
 #: ../user/team_join_form.php:29
@@ -6449,8 +5899,7 @@ msgstr "Ви вже учасник команди %1."
 
 #: ../user/team_join.php:42 ../user/team_join_action.php:43
 msgid "Couldn't join team - please try again later."
-msgstr ""
-"Не вдалося приєднатися до команди - будь-ласка, спробуйте ще раз пізніше."
+msgstr "Не вдалося приєднатися до команди - будь-ласка, спробуйте ще раз пізніше."
 
 #: ../user/team_join_action.php:40
 msgid "Joined %1"
@@ -6470,9 +5919,7 @@ msgstr "Будь-ласка, зверніть увагу:"
 
 #: ../user/team_join_form.php:35
 msgid "Joining a team gives its founder access to your email address."
-msgstr ""
-"Приєднання до команди дає доступ її засновнику до Вашої адреси електронної "
-"пошти."
+msgstr "Приєднання до команди дає доступ її засновнику до Вашої адреси електронної пошти."
 
 #: ../user/team_join_form.php:36
 msgid "Joining a team does not affect your account's credit."
@@ -6496,17 +5943,13 @@ msgstr "Ви можете побачити учасників цих коман
 
 #: ../user/team_lookup.php:98
 msgid "More than 100 teams match your search. The first 100 are shown."
-msgstr ""
-"Більше 100 команд задовольняють умови Вашого пошуку. Показані перші 100 "
-"команд."
+msgstr "Більше 100 команд задовольняють умови Вашого пошуку. Показані перші 100 команд."
 
 #: ../user/team_lookup.php:104
 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."
+"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
 msgid "Team administration for %1"
@@ -6554,9 +5997,7 @@ msgstr "Відповісти на запит про зміну засновни
 
 #: ../user/team_manage.php:50
 msgid "If you don't respond by %1, %2 may assume foundership of this team."
-msgstr ""
-"Якщо Ви не відповісте до %1, учасник %2 зможе прийняти повноваження "
-"засновника цієї команди."
+msgstr "Якщо Ви не відповісте до %1, учасник %2 зможе прийняти повноваження засновника цієї команди."
 
 #: ../user/team_manage.php:55
 msgid "Remove inactive or unwanted members from this team"
@@ -6588,27 +6029,21 @@ msgstr "Створення або управління дошкою повідо
 
 #: ../user/team_manage.php:71
 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 (поточних і майбутніх), Ви "
-"можете перетворити її у %1 глобальну команду BOINC%2."
+"To have this team created on all BOINC projects (current and future) you can"
+" make it into a %1BOINC-wide team%2."
+msgstr "Щоб створити цю команду у всіх проектах BOINC (поточних і майбутніх), Ви можете перетворити її у %1 глобальну команду BOINC%2."
 
 #: ../user/team_manage.php:73
 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: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."
+"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"
@@ -6642,19 +6077,10 @@ msgstr "Вихід з команди %1"
 msgid ""
 "<strong>Please note before quitting a team:</strong>\n"
 "         <ul>\n"
-"         <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"
+"         <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>"
 
 #: ../user/team_quit_form.php:40
 msgid "Quit Team"
@@ -6702,8 +6128,7 @@ msgstr "Результати пошуку команд"
 
 #: ../user/team_search.php:94
 msgid "No teams were found matching your criteria. Try another search."
-msgstr ""
-"Не знайдено команд, що задовольняють ваші критерії. Спробуйте інший пошук."
+msgstr "Не знайдено команд, що задовольняють ваші критерії. Спробуйте інший пошук."
 
 #: ../user/team_search.php:96
 msgid "Or you can %1create a new team%2."
@@ -6714,11 +6139,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 ""
-"Наступні команди відповідають одному або декільком критеріям Вашого пошуку.\n"
-"            Щоб приєднатися до команди, натисніть на її назві і перейдіть на "
-"сторінку команди,\n"
-"               потім натисніть %1Приєднатися до цієї команди%2."
+msgstr "Наступні команди відповідають одному або декільком критеріям Вашого пошуку.\n            Щоб приєднатися до команди, натисніть на її назві і перейдіть на сторінку команди,\n               потім натисніть %1Приєднатися до цієї команди%2."
 
 #: ../user/team_search.php:107
 msgid "Change your search"
@@ -6728,9 +6149,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:183
 msgid "Use this form to find teams that might be right for you."
@@ -6857,9 +6276,7 @@ msgstr "Перевірка адреси електронної пошти BOINC"
 msgid ""
 "Please visit the following link to validate the email address of your %1 "
 "account:"
-msgstr ""
-"Будь-ласка, перейдіть за наступним посиланням для того, щоб підтвердити "
-"адресу електронної пошти свого облікового запису у %1:"
+msgstr "Будь-ласка, перейдіть за наступним посиланням для того, щоб підтвердити адресу електронної пошти свого облікового запису у %1:"
 
 #: ../user/validate_email_addr.php:34
 msgid "Validate email sent"
@@ -6869,9 +6286,7 @@ msgstr "Листа для перевірки відправлено"
 msgid ""
 "An email has been sent to %1. Visit the link it contains to validate your "
 "email address."
-msgstr ""
-"Електронного листа відправлено за адресою %1. Перейдіть за посиланням, яке "
-"він містить для того, щоб підтвердити свою адресу електронної пошти."
+msgstr "Електронного листа відправлено за адресою %1. Перейдіть за посиланням, яке він містить для того, щоб підтвердити свою адресу електронної пошти."
 
 #: ../user/validate_email_addr.php:44
 msgid "No such user."
@@ -6883,8 +6298,7 @@ msgstr "Помилка в даних URL - не вдалося перевіри
 
 #: ../user/validate_email_addr.php:54
 msgid "Database update failed - please try again later."
-msgstr ""
-"Невдача при оновленні бази даних - будь-ласка, спробуйте ще раз пізніше."
+msgstr "Невдача при оновленні бази даних - будь-ласка, спробуйте ще раз пізніше."
 
 #: ../user/validate_email_addr.php:57
 msgid "Validate email address"
@@ -6908,15 +6322,10 @@ msgstr "Дані облікового запису"
 
 #: ../user/weak_auth.php:52
 msgid ""
-"You can access your account either by using your email address and "
-"password,\n"
+"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 ""
-"Ви можете отримати доступ до свого облікового запису або з використанням "
-"адреси електронної пошти і паролю,\n"
-"    або використовуючи призначений 'ключ облікового запису'.\n"
-"    Ваш ключ облікового запису:"
+msgstr "Ви можете отримати доступ до свого облікового запису або з використанням адреси електронної пошти і паролю,\n    або використовуючи призначений 'ключ облікового запису'.\n    Ваш ключ облікового запису:"
 
 #: ../user/weak_auth.php:57
 msgid "This key can be used to:"
@@ -6932,12 +6341,7 @@ 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,\n"
-"       створити файл із назвою %1 в каталозі даних BOINC,\n"
-"       і встановити його вміст наступним чином:"
+msgstr "підключення комп’ютера до Вашого облікового запису без використання Менеджера BOINC.\n       Для цього необхідно встановити BOINC,\n       створити файл із назвою %1 в каталозі даних BOINC,\n       і встановити його вміст наступним чином:"
 
 #: ../user/weak_auth.php:73
 msgid "Weak account key"
@@ -6946,28 +6350,17 @@ msgstr "Слабкий ключ облікового запису"
 #: ../user/weak_auth.php:74
 msgid ""
 "Your 'weak account key' can be used to attach computers to your account\n"
-"    as described above, but cannot be used to log in to your account or "
-"change it in any way.\n"
+"    as described above, but cannot be used to log in to your account or change it in any way.\n"
 "    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"
-"    Якщо Ви хочете підключити ненадійні або не надто безпечні комп’ютери до "
-"свого облікового запису,\n"
-"    зробіть це, використовуючи свій слабкий ключ облікового запису.\n"
-"    Ваш слабкий ключ облікового запису:"
+msgstr "Ваш 'слабкий ключ облікового запису' може бути використаний для підключення комп’ютерів до Вашого облікового запису,\n    як описано вище, але він не може використовуватися для входу в нього чи його зміни будь-яким чином.\n    Якщо Ви хочете підключити ненадійні або не надто безпечні комп’ютери до свого облікового запису,\n    зробіть це, використовуючи свій слабкий ключ облікового запису.\n    Ваш слабкий ключ облікового запису:"
 
 #: ../user/weak_auth.php:81
 msgid ""
 "If you change your password, your weak account key changes, and your "
 "previous weak account key becomes invalid."
-msgstr ""
-"Якщо Ви зміните свій пароль, Ваш слабкий ключ облікового запису зміниться, а "
-"попередній стане недійсним."
+msgstr "Якщо Ви зміните свій пароль, Ваш слабкий ключ облікового запису зміниться, а попередній стане недійсним."
 
 #: ../user/workunit.php:32
 msgid "can't find workunit"
@@ -7033,9 +6426,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:87
 msgid "Your opinions about %1"
@@ -7048,12 +6439,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:47
 msgid "Color scheme for graphics"
@@ -7071,148 +6457,8 @@ msgstr "Запускати тільки вибрані додатки"
 msgid ""
 "If no work for selected applications is available, accept work from other "
 "applications?"
-msgstr ""
-"Якщо для вибраних додатків нема роботи, приймати роботу для інших додатків?"
+msgstr "Якщо для вибраних додатків нема роботи, приймати роботу для інших додатків?"
 
 #: ../project.sample/project_specific_prefs.inc:91
 msgid "(all applications)"
 msgstr "(все додатки)"
-
-#~ msgid "Error:"
-#~ msgstr "Помилка:"
-
-#~ msgid "Account creation is disabled"
-#~ msgstr "Створення облікового запису заборонене"
-
-#~ msgid ""
-#~ "Sorry, this project has disabled the creation of new accounts.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Вибачте, але цей проект заборонив створення нових облікових записів.\n"
-#~ "Будь-ласка, спробуйте ще раз пізніше."
-
-#~ msgid "Account creation is currently disabled. Please try again later."
-#~ msgstr ""
-#~ "Створення облікового запису зараз заборонене. Будь-ласка, спробуйте ще раз "
-#~ "пізніше."
-
-#~ msgid "nvidia GPU"
-#~ msgstr "графічний процесор NVIDIA"
-
-#~ msgid ""
-#~ "This project hasn\\'t created an email message - please notify its "
-#~ "administrators"
-#~ msgstr ""
-#~ "Цей проект не створив електронного листа - будь-ласка, повідомте про це "
-#~ "адміністраторів."
-
-#, fuzzy
-#~ msgid "Use Intel GPU %1 Enforced by version 7.0+ %2"
-#~ msgstr "Використовувати графічний процесор ATI %1 починаючи з версії 6.10+ %2"
-
-#~ msgid ""
-#~ "These apply to all BOINC projects in which you participate.<br>\n"
-#~ "             On computers participating in multiple projects, the most "
-#~ "recently modified preferences will be used."
-#~ msgstr ""
-#~ "Вони відносяться до всіх проектів BOINC, в яких Ви приймаєте участь.<br>\n"
-#~ "             На комп'ютерах, що приймають участь в декількох проектах, "
-#~ "будуть використовуватися налаштування, змінені останніми."
-
-#~ msgid "Export this news item as a Notice"
-#~ msgstr "Експортувати цю новину як сповіщення"
-
-#~ msgid ""
-#~ "Go to the BOINC data directory on your computer (on Windows this is usually "
-#~ "<b>C:\\Documents and Settings\\All Users\\Application Data\\BOINC</b> or "
-#~ "<b>C:\\Program Files\\BOINC</b>."
-#~ msgstr ""
-#~ "Перейдіть у папку даних BOINC на своєму комп’ютері (у Windows це "
-#~ "зазвичай<b>C:\\Documents and Settings\\All Users\\Application Data\\BOINC</b> "
-#~ "або <b>C:\\Program Files\\BOINC</b>)."
-
-#~ msgid "No such task"
-#~ msgstr "Немає такого завдання"
-
-#~ msgid ""
-#~ "Computer is connected to the Internet about every %1 Leave blank or 0 if "
-#~ "always connected. %2 BOINC will try to maintain at least this much work (max "
-#~ "10 days). %3"
-#~ msgstr ""
-#~ "Комп’ютер підключений до Інтернету приблизно кожні %1 Залишити пустим або 0 "
-#~ "якщо завжди підключений. %2 BOINC буде намагатися підтримувати щонайменше "
-#~ "такий обсяг роботи (макс. 10 днів). %3"
-
-#~ msgid "Maintain enough work for an additional"
-#~ msgstr "Підтримувати достатній обсяг роботи для додаткових"
-
-#~ msgid "Update failed: "
-#~ msgstr "Невдача при оновленні: "
-
-#~ msgid "Provides %1limited access%2 to your account"
-#~ msgstr "Надає %1обмежений доступ%2 до Вашого облікового запису"
-
-#~ msgid ""
-#~ "Don't use this form. Just run BOINC, select Add Project, and enter an email "
-#~ "address and password."
-#~ msgstr ""
-#~ "Не використовуйте цю форму. Просто запустіть BOINC, виберіть 'Додати проект' "
-#~ "і введіть адресу електронної пошти та пароль."
-
-#~ msgid "Do not reorder sticky posts"
-#~ msgstr "Не перевпорядковувати закріплені повідомлення"
-
-#~ msgid "If a thread contains more than this number of posts"
-#~ msgstr "Якщо обговорення містить більше ніж дана кількість повідомлень"
-
-#~ msgid "only display the first one and this many of the last ones"
-#~ msgstr "показати тільки перше і дану кількість останніх повідомлень"
-
-#~ msgid "Your report has been recorded. Thanks you for your input."
-#~ msgstr "Ваше звернення було записане. Дякуємо за допомогу."
-
-#~ msgid "Search type"
-#~ msgstr "Тип пошуку"
-
-#~ msgid "User names starting with"
-#~ msgstr "Імена користувачів, що починаються з"
-
-#~ msgid ""
-#~ "Your 'weak account key' lets you link a computer to your account without "
-#~ "giving it the ability to log in to your account or to change it in any way."
-#~ msgstr ""
-#~ "Ваш 'слабкий обліковий ключ' дозволяє Вам підключати комп’ютери до свого "
-#~ "облікового запису в цьому проекті, без надання можливості доступу до нього "
-#~ "або його зміни."
-
-#~ msgid ""
-#~ "This mechanism works only with projects that have upgraded their server "
-#~ "software 7 Dec 2007 or later."
-#~ msgstr ""
-#~ "Даний механізм працює тільки у тих проектах, які оновили своє серверне "
-#~ "програмне забезпечення після 7 грудня 2007 року."
-
-#~ msgid "Your weak account key for this project is:"
-#~ msgstr "Ваш слабкий обліковий ключ в цьому проекті:"
-
-#~ msgid ""
-#~ "To use your weak account key on a given host, find or create the 'account "
-#~ "file' for this project. This file has a name of the form "
-#~ "<b>account_PROJECT_URL.xml</b>. The account file for %1 is <b>%2</b>."
-#~ msgstr ""
-#~ "Для використання свого слабкого облікового ключа на заданому комп’ютері "
-#~ "знайдіть або створіть 'обліковий файл' для цього проекту. Назва цього файла "
-#~ "має вигляд: <b>account_PROJECT_URL.xml</b>. Обліковий файл для %1: <b>%"
-#~ "2</b>."
-
-#~ msgid "Create this file if needed. Set its contents to:"
-#~ msgstr "Створіть цей файл, якщо необхідно. Його вміст повинен бути:"
-
-#~ msgid ""
-#~ "Your weak account key is a function of your password. If you change your "
-#~ "password, your weak account key changes, and your previous weak account key "
-#~ "becomes invalid."
-#~ msgstr ""
-#~ "Ваш слабкий обліковий ключ є функцією Вашого паролю. Якщо Ви зміните свій "
-#~ "пароль, Ваш слабкий обліковий ключ зміниться, і Ваш попередній слабкий "
-#~ "обліковий ключ стане недійсним."
diff --git a/locale/uk/BOINC-Setup.mo b/locale/uk/BOINC-Setup.mo
index 82f6905..c1aac21 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 4f05a7d..fa4eedf 100644
--- a/locale/uk/BOINC-Setup.po
+++ b/locale/uk/BOINC-Setup.po
@@ -1,40 +1,32 @@
 # 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: BOINC 7.4\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-12 02:10-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: uk\n"
+"PO-Revision-Date: 2015-02-09 01:30+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\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"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-Basepath: /Volumes/Cheer/BOINC_GIT/boinc_trunk\n"
-"X-POOTLE-MTIME: 1393421762.0\n"
-"X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: mac_installer\n"
+"Language: uk\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"
 
 #: 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
+#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
 msgid "Yes"
 msgstr "Так"
 
-#: PostInstall.cpp:131
-#: PostInstall.cpp:1137
-#: uninstall.cpp:1619
+#: PostInstall.cpp:131 PostInstall.cpp:1137 uninstall.cpp:1619
 msgid "No"
 msgstr "Ні"
 
@@ -48,10 +40,7 @@ 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 на цьому комп’ютері Mac?"
+msgstr "Користувачі з правами адміністратора цього комп’ютера автоматично зможуть запускати і керувати %s.\n\nБажаєте щоб прості користувачі без адміністраторських прав також могли запускати і керувати %s на цьому комп’ютері Mac?"
 
 #: PostInstall.cpp:1444
 #, c-format
@@ -70,9 +59,7 @@ msgstr "Помилка доступу після перезапуску"
 msgid ""
 "Removal may take several minutes.\n"
 "Please be patient."
-msgstr ""
-"Видалення може зайняти декілька хвилин.\n"
-"Будь-ласка, зачекайте."
+msgstr "Видалення може зайняти декілька хвилин.\nБудь-ласка, зачекайте."
 
 #: uninstall.cpp:156
 #, c-format
@@ -80,10 +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 ""
-"Ви впевнені, що хочете повністю видалити %s зі свого комп’ютера?\n"
-"\n"
-"Будуть видалені виконавчі файли, а файли даних %s залишаться."
+msgstr "Ви впевнені, що хочете повністю видалити %s зі свого комп’ютера?\n\nБудуть видалені виконавчі файли, а файли даних %s залишаться."
 
 #: uninstall.cpp:163
 #, c-format
@@ -103,9 +87,7 @@ msgstr "ім’я  користувача"
 msgid ""
 "Do you also want to remove VirtualBox from your computer?\n"
 "(VirtualBox was installed along with BOINC.)"
-msgstr ""
-"Ви також хочете видалити VirtualBox з комп'ютера?\n"
-"(VirtualBox був встановлений разом з BOINC.)"
+msgstr "Ви також хочете видалити VirtualBox з комп'ютера?\n(VirtualBox був встановлений разом з BOINC.)"
 
 #: uninstall.cpp:312
 #, c-format
@@ -117,23 +99,14 @@ msgid ""
 "\n"
 "for each user, the file\n"
 "\"%s\"."
-msgstr ""
-"Видалення завершене.\n"
-"\n"
-" Ви можете видалити наступні об’єкти, що залишилися, за допомогою Пошуковика: \n"
-"каталог \"%s\"\n"
-"\n"
-"для кожного користувача, файл\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"
+msgstr "Для повного видалення %s з Вашого комп’ютера введіть пароль адміністратора.\n\n"
 
 #: uninstall.cpp:1616
 msgid "Cancel"
@@ -142,25 +115,3 @@ msgstr "Скасувати"
 #: uninstall.cpp:1617
 msgid "Continue..."
 msgstr "Продовжити..."
-
-#, c-format
-#~ msgid "Sorry, this version of %s requires system 10.4 or higher."
-#~ msgstr "Вибачте, дана версія %s потребує систему 10.4 або вищу."
-#~ msgid ""
-#~ "Removal completed.\n"
-#~ "\n"
-#~ " You may want to remove the following remaining items using the Finder: \n"
-#~ "\"/Library/Application Support/BOINC Data\" directory\n"
-#~ "\n"
-#~ "for each user, the file\n"
-#~ "\"/Users/[username]/Library/Preferences/BOINC Manager Preferences\"."
-#~ msgstr ""
-#~ "Видалення завершене.\n"
-#~ "\n"
-#~ " Скористайтесь Пошуком, якщо бажаєте видалити наступні залишені "
-#~ "елементи: \n"
-#~ "каталог \"/Library/Application Support/BOINC Data\"\n"
-#~ "\n"
-#~ "для кожного користувача, файл\n"
-#~ "\"/Users/[username]/Library/Preferences/BOINC Manager Preferences\"."
-
diff --git a/locale/uk/BOINC-Web.mo b/locale/uk/BOINC-Web.mo
index ddda1db..b157a0c 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 a8b0e2f..4e1d807 100644
--- a/locale/uk/BOINC-Web.po
+++ b/locale/uk/BOINC-Web.po
@@ -1,22 +1,25 @@
 # BOINC web translation
 # Copyright (C) 2008-2009 University of California
+# 
 # This file is distributed under the same license as BOINC.
+# 
 # FileID  : $Id$
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\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-12 02:11-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: uk\n"
+"PO-Revision-Date: 2015-02-09 01:29+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\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"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
+"Language: uk\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"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1398888418.0\n"
 
 #: docutil.php:21
 msgid "Search"
@@ -32,7 +35,9 @@ msgid "This page is %stranslatable%s."
 msgstr "Цю сторінку можна %sперекласти%s."
 
 #: download.php:39
-msgid "We recommend that you also install VirtualBox, so your computer can work on science projects that require it."
+msgid ""
+"We recommend that you also install VirtualBox, so your computer can work on "
+"science projects that require it."
 msgstr "Ми рекомендуємо Вам також встановити VirtualBox, щоб Ваш комп'ютер міг приймати участь у наукових проектах, які цього вимагають."
 
 #: download.php:41
@@ -43,14 +48,12 @@ msgstr "Дізнатися більше про VirtualBox."
 msgid "Download BOINC + VirtualBox"
 msgstr "Завантажити BOINC + VirtualBox"
 
-#: download.php:54
-#: download.php:69
+#: download.php:54 download.php:69
 #, php-format
 msgid "for %s"
 msgstr "для %s"
 
-#: download.php:57
-#: download.php:72
+#: download.php:57 download.php:72
 #, php-format
 msgid "BOINC version %s"
 msgstr "Версія BOINC: %s"
@@ -65,19 +68,28 @@ msgid "Download BOINC"
 msgstr "Завантажити BOINC"
 
 #: download.php:123
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others."
+msgid ""
+"BOINC is a program that lets you donate your idle computer time to science "
+"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, and many others."
 msgstr "BOINC - це програма, яка дозволяє Вам пожертвувати незадіяні потужності Вашого комп’ютера для наукових проектів, таких як: SETI at home, Climateprediction.net, Rosetta at home, World Community Grid і багатьох інших."
 
 #: download.php:125
-msgid "After installing BOINC on your computer, you can connect it to as many of these projects as you like."
+msgid ""
+"After installing BOINC on your computer, you can connect it to as many of "
+"these projects as you like."
 msgstr "Після встановлення BOINC на свій комп’ютер, Ви зможете приймати участь одночасно у стількох проектах, у скількох забажаєте."
 
 #: download.php:127
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
+msgid ""
+"You may run this software on a computer only if you own the computer or have"
+" the permission of its owner."
 msgstr "Ви можете запустити це програмне забезпечення тільки, якщо це Ваш комп'ютер або якщо Ви маєте дозвіл від власника."
 
 #: download.php:132
-msgid "We recommend that you download BOINC from the Google Play Store or Amazon Appstore, not from here."
+msgid ""
+"We recommend that you download BOINC from the Google Play Store or Amazon "
+"Appstore, not from here."
 msgstr "Ми рекомендуємо Вам завантажити BOINC з Google Play Store або Amazon Appstore, а не звідси."
 
 #: download.php:167
@@ -88,8 +100,7 @@ msgstr "Системні вимоги"
 msgid "Release notes"
 msgstr "Опис останньої версії"
 
-#: download.php:169
-#: index.php:86
+#: download.php:169 index.php:86
 msgid "Help"
 msgstr "Довідка"
 
@@ -111,20 +122,34 @@ msgstr "BOINC: обчислення для науки"
 
 #: help.php:12
 #, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
+msgid ""
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who"
+" can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"through the process of installing and using BOINC; %s troubleshoot any "
+"problems you might have."
 msgstr "За допомогою цієї гарячої лінії BOINC, ви можете задати питання досвідченим користувачам BOINC особисто: %s про те, що таке BOINC і розподілені обчислення; %s про встановлення програмного забезпечення BOINC і процес підключення до проектів; %s про проблеми, що виникли при роботі BOINC."
 
 #: help.php:21
 #, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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."
+msgid ""
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system."
+" 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 побудована на використанні інтернет-телефону %sSkype%s. Skype - це безкоштовна програма, яка дозволяє безплатно телефонувати по всьому світу.   Якщо у Вас ще не встановлений Skype, Ви можете %sзавантажити і встановити%s його, а потім повернутися на цю сторінку для вибору помічника."
 
 #: help.php:28
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
+msgid ""
+"The best way to get help is by voice, for which you need either built-in "
+"microphone and speakers or an external headset for your computer.  You can "
+"also use Skype's text-based chat system or regular email (if you don't have "
+"Skype) to communicate with Help Volunteers."
 msgstr "Найкраще задати питання помічникові особисто, в режимі телефонної розмови, але для цього знадобляться мікрофон і навушники.  В якості альтернативи, в Skype можна скористатися текстовим чатом, у крайньому випадку залиште свою питання і адресу електронної пошти (для того щоб на нього  можна було відповісти)."
 
 #: help.php:31
-msgid "Volunteers speaking several languages are available. Please select a language:"
+msgid ""
+"Volunteers speaking several languages are available. Please select a "
+"language:"
 msgstr "Помічники розмовляють багатьма мовами. Будь-ласка, оберіть свою:"
 
 #: help.php:47
@@ -133,16 +158,22 @@ msgstr "Станьте волонтером"
 
 #: help.php:50
 #, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
+msgid ""
+"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+"Volunteer%s.  It's a great way to help the cause of scientific research and "
+"volunteer computing - and it's fun!"
 msgstr "Якщо Ви досить добре розумієте, що таке BOINC і як він працює, Ви самі %sможете стати помічником%s.  Цим Ви допоможете як новим учасникам BOINC, так і розвитку BOINC і розподілених обчислень."
 
 #: help.php:56
 #, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
+msgid ""
+"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
 msgstr "Якщо Ви вже є помічником: для зміни своїх налаштувань, %sзайдіть сюди%s."
 
 #: help_funcs.php:107
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
+msgid ""
+"BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
+"or the University of California."
 msgstr "Помічники BOINC - це волонтери, які не отримують оплату.  BOINC або Каліфорнійський університет не несуть відповідальності за їхні поради."
 
 #: help_funcs.php:110
@@ -177,7 +208,6 @@ msgstr "комп'ютерів.\n"
 msgid "24-hour average:"
 msgstr "В середньому за 24 години:"
 
-# 80%
 #: index.php:56
 msgid "PetaFLOPS."
 msgstr "петафлопс."
@@ -194,9 +224,7 @@ msgstr "Інформація для учасників"
 msgid "Download"
 msgstr "Завантажити"
 
-#: index.php:87
-#: index.php:120
-#: index.php:171
+#: index.php:87 index.php:120 index.php:171
 msgid "Documentation"
 msgstr "Документація"
 
@@ -209,7 +237,10 @@ msgid "Links"
 msgstr "Посилання"
 
 #: index.php:94
-msgid "Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:"
+msgid ""
+"Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure"
+" diseases, study global warming, discover pulsars, and do many other types "
+"of scientific research.  It's safe, secure, and easy:"
 msgstr "Використовуйте час простою свого комп'ютера (Windows, Mac, Linux чи Android) для того, щоб лікувати хвороби, вивчати глобальне потепління, відкривати пульсари і проводити багато інших типів наукових досліджень. Це безпечно, надійно і просто:"
 
 #: index.php:96
@@ -226,7 +257,9 @@ msgstr "Введіть адресу електронної пошти та па
 
 #: index.php:102
 #, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
+msgid ""
+"Or, if you run several projects, try an %saccount manager%s such as "
+"%sGridRepublic%s or %sBAM!%s. "
 msgstr "За бажання приймати участь одночасно в декількох проектах, можна скористатися сайтами %sменеджерів проектів%s, такими як %sGridRepublic%s або %sBAM!%s. "
 
 #: index.php:118
@@ -238,11 +271,15 @@ msgid "Software updates"
 msgstr "Оновлення програмного забезпечення"
 
 #: index.php:128
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving"
+" you the computing power of thousands of CPUs."
 msgstr "%1Вчені%2: використовуйте BOINC для того, щоб створити %3проект добровільних розподілених обчислень%4, який надасть Вам обчислювальну потужність тисяч процесорів."
 
 #: index.php:132
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
 msgstr "%1Університети%2: використовуйте BOINC для того, щоб створити %3Віртуальний суперкомп'ютерний центр ВНЗ%4."
 
 #: index.php:137
@@ -315,7 +352,8 @@ msgstr "API для програмного забезпечення сторон
 
 #: index.php:217
 #, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
+msgid ""
+"Open-source software for %svolunteer computing%s and %sgrid computing%s."
 msgstr "Програмне забезпечення з відкритим вихідним кодом для організації %sдобровільних розподілених обчислень%s і %sрозподілених обчислень в мережі%s."
 
 #: index.php:230
@@ -326,7 +364,6 @@ msgstr "BOINC створено в Університеті Каліфорнії,
 msgid "Distributed sensing"
 msgstr "Розподілена мережа датчиків"
 
-# 78%
 #: projects.inc:19
 msgid "Stanford University"
 msgstr "Стенфордський університет"
@@ -336,7 +373,10 @@ msgid "Seismology"
 msgstr "Сейсмологія"
 
 #: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
+msgid ""
+"The Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to Internet-connected computers.  You must buy a "
+"sensor to participate."
 msgstr "Quake-Catcher Network розвиває найбільшу у світі сейсмічну мережу, використовуючи датчики, які підключені до комп’ютерів з виходом в Інтернет.  Ви повинні купити датчик для участі в проекті."
 
 #: projects.inc:27
@@ -348,24 +388,24 @@ msgid "Environmental research"
 msgstr "Дослідження навколишнього середовища"
 
 #: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
+msgid ""
+"This project is creating a free and continuously updated map of radiation "
+"levels by using sensors connected to volunteers' computers.  You must buy a "
+"sensor to participate."
 msgstr "Цей проект створює безкоштовну постійно оновлювану карту рівнів радіації, використовуючи датчики, підключені до комп’ютерів добровольців.  Ви повинні купити датчик для участі в проекті."
 
 #: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
+msgid ""
+"To participate in these projects you must buy a sensor and attach it to your"
+" computer."
 msgstr "Для участі в цих проектах Ви повинні купити датчик і підключити його до свого комп’ютера."
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
 msgstr "Когнітивна наука та штучний інтелект"
 
-# 85%
-#: projects.inc:60
-#: projects.inc:364
-#: projects.inc:408
-#: projects.inc:457
-#: projects.inc:464
-#: projects.inc:511
+#: projects.inc:60 projects.inc:364 projects.inc:408 projects.inc:457
+#: projects.inc:464 projects.inc:511
 msgid "Private"
 msgstr "Приватний"
 
@@ -374,7 +414,11 @@ msgid "Artificial intelligence"
 msgstr "Штучний інтелект"
 
 #: projects.inc:62
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
+msgid ""
+"Parse and convert semantic nets for use in FreeHAL, an artificial "
+"intelligence that uses semantic networks, stemmers, part of speech "
+"databases, and part of speech taggers in order to imitate human behavior in "
+"conversations."
 msgstr "Розбір і перетворення семантичних мереж для використання у FreeHAL - штучному інтелекті, який використовує семантичні мережі, алгоритми семантичного пошуку, бази даних частин мови і частини мовних додатків, які не несуть основного змістового навантаження, для імітації поведінки людини під час розмов."
 
 #: projects.inc:69
@@ -390,7 +434,12 @@ msgid "Antimalarial drug discovery"
 msgstr "Пошук ліків від малярії"
 
 #: projects.inc:84
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
+msgid ""
+"The parasite that causes malaria continues to evolve resistance to available"
+" medication. We therefore urgently need to discover new drugs to replace "
+"existing drugs. Importantly, these new drugs need to target NEW proteins in "
+"the parasite. The FightMalaria at Home project is aimed at finding these new "
+"targets."
 msgstr "Паразит, який викликає малярію, продовжує посилювати супротив доступним лікам. Тому нам вкрай необхідно виявити нові ліки для заміни існуючих. Важливо, що ці нові ліки повинні бути націленими на НОВІ білки в паразиті. Проект FightMalaria at Home має за мету відкриття таких нових мішеней."
 
 #: projects.inc:90
@@ -402,7 +451,12 @@ msgid "Protein structure prediction"
 msgstr "Передбачення структури білків"
 
 #: projects.inc:92
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
+msgid ""
+"POEM at HOME uses a computational approach to predict the biologically active "
+"structure of proteins, to understand the signal-processing mechanisms when "
+"the proteins interact with one another, to understand diseases related to "
+"protein malfunction or aggregation, and to develop new drugs on the basis of"
+" the three-dimensions structure of biologically important proteins."
 msgstr "POEM at HOME використовує обчислювальний підхід для прогнозування біологічно активної структури білків, для розуміння механізмів обробки сигналів, коли білки взаємодіють один з одним, для розуміння хвороб, які пов'язані зі збоями або об'єднанням білків, і для розробки нових ліків на основі тривимірної структури біологічно важливих білків."
 
 #: projects.inc:98
@@ -414,7 +468,11 @@ msgid "Study of protein - ligand interactions"
 msgstr "Дослідження білково-лігандних взаємодій"
 
 #: projects.inc:100
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
+msgid ""
+"Docking at Home has both bioscience and computer science goals. The project "
+"aims to further knowledge of the atomic details of protein-ligand "
+"interactions and, by doing so, will search for insights into the discovery "
+"of novel pharmaceuticals."
 msgstr "Метою Docking at Home є як біологія так і інформатика. Проект націлений на отримання знань про взаємодію білок-ліганд на атомарному рівні та, як результат, буде шукати ідеї для відкриття нових медичних препаратів."
 
 #: projects.inc:114
@@ -426,7 +484,11 @@ msgid "Molecular simulations of proteins"
 msgstr "Молекулярне моделювання білків"
 
 #: projects.inc:116
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
+msgid ""
+"GPUGrid.net opens novel computational scenarios by the first full-atom "
+"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
+"New biomedical applications suddenly become possible giving a new role to "
+"computational biology for biomedical research."
 msgstr "GPUGrid.net відкриває нові сценарії обчислень, використовуючи перший повно-атомний молекулярний динамічний код (CellMD), спеціально оптимізований для запуску на графічних процесорах NVIDIA. Нові біомедичні програмні засоби несподівано надали можливість досягнути нових висот у обчислювальній біології для біомедичних наукових досліджень."
 
 #: projects.inc:122
@@ -438,11 +500,15 @@ msgid "Genetic linkage analysis"
 msgstr "Аналіз генетичних зв’язків"
 
 #: projects.inc:124
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
+msgid ""
+"Superlink at Technion helps geneticists all over the world find disease-"
+"provoking genes causing some types of diabetes, hypertension (high blood "
+"pressure), cancer, schizophrenia and many others."
 msgstr "Superlink at Technion допомагає генетикам з усього світу знайти гени, які провокують деякі типи діабету, гіпертонії (високого кров'яного тиску), раку, шизофренії та інших захворювань."
 
 #: projects.inc:138
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
+msgid ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
 msgstr "Центр біоінформатики та обчислювальної біології університету Меріленду."
 
 #: projects.inc:139
@@ -450,7 +516,11 @@ msgid "Life science research"
 msgstr "Дослідження в науці про життя"
 
 #: projects.inc:140
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
+msgid ""
+"The Lattice Project supplies computing power to scientists at the University"
+" of Maryland studying evolutionary relationships based on DNA sequence data;"
+" bacterial, plasmid, and virus protein sequences; and biological diversity "
+"in nature reserves. "
 msgstr "The Lattice Project надає обчислювальні потужності вченим з Університету штату Меріленд, які вивчають еволюційні взаємовідносини на підставі даних послідовності ДНК; бактеріальні, плазмідні та вірусні білкові послідовності; а також біологічну різноманітність у заповідниках. "
 
 #: projects.inc:146
@@ -462,20 +532,32 @@ msgid "Epidemiology"
 msgstr "Епідеміологія"
 
 #: projects.inc:148
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
+msgid ""
+"Simulation models of the transmission dynamics and health effects of malaria"
+" are an important tool for malaria control. They can be used to determine "
+"optimal strategies for delivering mosquito nets, chemotherapy, or new "
+"vaccines which are currently under development and testing.  Such modeling "
+"is extremely computer intensive, requiring simulations of large human "
+"populations with a diverse set of parameters related to biological and "
+"social factors that influence the distribution of the disease. "
 msgstr "Симуляційні моделі динаміки передачі та впливу малярії на здоров`я - важливий інструмент для контролю малярії. Вони можуть бути використані для визначення оптимальної стратегії постачання сіток проти москітів, хіміотерапії чи нових вакцин, які зараз знаходяться у розробці та випробовуються.  Таке моделювання потребує надзвичайних обчислювальних потужностей для симуляції великих груп людей з різноманітним набором параметрів, пов`язаних з біологічними та соціальними факторами, що в [...]
 
 #: projects.inc:170
 msgid "University of Washington"
 msgstr "Університет Вашингтону"
 
-#: projects.inc:171
-#: projects.inc:179
+#: projects.inc:171 projects.inc:179
 msgid "Biology"
 msgstr "Біологія"
 
 #: projects.inc:172
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
+msgid ""
+"Determine the 3-dimensional shapes of proteins in research that may "
+"ultimately lead to finding cures for some major human diseases. By running "
+"Rosetta at home you will help us speed up and extend our research in ways we "
+"couldn't possibly attempt without your help. You will also be helping our "
+"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
+"Cancer, and Alzheimer's"
 msgstr "Визначення тривимірних форм білків у дослідженні, яке може зрештою привести до виявлення ліків для деяких серйозних людських недуг. Запустивши Rosetta at home, Ви допоможете прискорити і розширити наше дослідження способами, якими ми не могли б скористатися без Вашої допомоги. Ви також допоможете нам при проектуванні нових білків для боротьби з хворобами типу ВІЛ, малярія, рак і хвороба Альцгеймера."
 
 #: projects.inc:178
@@ -483,7 +565,10 @@ msgid "University of Vienna"
 msgstr "Університет Відня"
 
 #: projects.inc:180
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
+msgid ""
+"Calculate similarities between proteins. SIMAP provides a public database of"
+" the resulting data, which plays a key role in many bioinformatics research "
+"projects."
 msgstr "Обчислення схожості між білками. SIMAP надає загальнодоступну базу даних результатів, які відіграють ключову роль у багатьох біоінформаційних науково-дослідницьких проектах."
 
 #: projects.inc:186
@@ -499,7 +584,15 @@ msgid "Climate study"
 msgstr "Вивчення клімату"
 
 #: projects.inc:200
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
+msgid ""
+"Investigate the approximations that have to be made in state-of-the-art "
+"climate models. By running the model thousands of times we hope to find out "
+"how the model responds to slight tweaks to these approximations - slight "
+"enough to not make the approximations any less realistic. This will allow us"
+" to improve our understanding of how sensitive our models are to small "
+"changes and also to things like changes in carbon dioxide and the sulphur "
+"cycle. This will allow us to explore how climate may change in the next "
+"century under a wide range of different scenarios."
 msgstr "Дослідження наближень, які повинні бути зроблені у найновіших моделях клімату. Запускаючи модель тисячі разів, ми сподіваємося вияснити, як модель реагує на невеликі зміни цих наближень - достатньо невеликих для того, щоб не зробити наближення менш реалістичними. Це дозволить нам покращити наше розуміння того, наскільки чутливі наші моделі до невеликих змін, а також до таких речей, як зміни кількості вуглекислого газу і круговороту сірки. Цн дозволить нам дослідити, яким чином мо [...]
 
 #: projects.inc:207
@@ -511,39 +604,56 @@ msgid "Mechanical engineering"
 msgstr "Машинобудування"
 
 #: projects.inc:214
-msgid "Currently we are calculating the optimum design of a structure call the 52 bar truss"
+msgid ""
+"Currently we are calculating the optimum design of a structure call the 52 "
+"bar truss"
 msgstr "Зараз ми обчислюємо оптимальне дизайн структури під назвою 52 барні зв'язки."
 
-#: projects.inc:224
-#: projects.inc:263
-#: projects.inc:271
+#: projects.inc:224 projects.inc:263 projects.inc:271
 msgid "Astronomy"
 msgstr "Астрономія"
 
 #: projects.inc:225
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
+msgid ""
+"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
+"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
+"Universe. We will measure physical parameters (such as stellar mass surface "
+"density, star formation rate surface density, attenuation, and first-order "
+"star formation history) on a resolved pixel-by-pixel basis using spectral "
+"energy distribution (SED) fitting techniques in a distributed computing "
+"mode."
 msgstr "Ми об'єднаємо спектральне охоплення телескопів GALEX, Pan-STARRS1 і WISE для створення мультичастотного галактичного атласу найближчих до нас околиць Всесвіту в ультрафіолетовому / оптичному / інфрачервоному спектрах. Ми виміряємо фізичні параметри (такі як зоряна маса галактик, швидкість утворення зірок, поглинання випромінювання пилом і історія формування зірок першого порядку) на основі попіксельного рішення використовуючи методи розподілу спектральної енергії (SED), застосува [...]
 
 #: projects.inc:247
 msgid "University of Texas at Austin"
 msgstr "Університет Техасу в Остіні"
 
-#: projects.inc:248
-#: projects.inc:279
+#: projects.inc:248 projects.inc:279
 msgid "Chemistry"
 msgstr "Хімія"
 
 #: projects.inc:249
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
+msgid ""
+"A common problem in theoretical chemistry, condensed matter physics and "
+"materials science is the calculation of the time evolution of an atomic "
+"scale system where, for example, chemical reactions and/or diffusion occur. "
+"Generally the events of interest are quite rare (many orders of magnitude "
+"slower than the vibrational movements of the atoms), and therefore direct "
+"simulations, tracking every movement of the atoms, would take thousands of "
+"years of computer calculations on the fastest present day computer before a "
+"single event of interest can be expected to occur.  Our research group is "
+"interested in calculating the long time dynamics of systems."
 msgstr "Загальна проблема в теоретичній хімії, фізиці стисненої речовини і матеріалознавстві - обчислення часу розвитку систем атомарного масштабу, де, наприклад, відбуваються хімічні реакції і/або дифузія. В основному події, які цікавлять вчених, трапляються доволі рідко (у багатьох випадках зміни відбуваються повільніше ніж вібрація атомів), і тому пряме моделювання, що відслідковує кожен рух атомів, зайняло б тисячі років комп’ютерних обчислень на найшвидшому сучасному комп’ютері, пер [...]
 
-# 95%
 #: projects.inc:262
 msgid "University of Illinois at Urbana-Champaign"
 msgstr "Іллінойський університет в Урбана-Шампейн"
 
 #: projects.inc:264
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
+msgid ""
+"The goal of Cosmology at Home is to search for the model that best describes "
+"our Universe and to find the range of models that agree with the available "
+"astronomical particle physics data."
 msgstr "Мета проекту Cosmology at Home полягає у пошуку моделі, яка б найкраще описувала наш Всесвіт, і пошуку діапазону моделей, узгоджених із наявними астрономічними даними фізики елементарних частинок."
 
 #: projects.inc:270
@@ -551,7 +661,10 @@ msgid "Rensselaer Polytechnic Institute"
 msgstr "Політехнічний інститут Ренсселера"
 
 #: projects.inc:272
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
+msgid ""
+"The goal of Milkyway at Home is to create a highly accurate three dimensional "
+"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
+"Survey."
 msgstr "Мета Milkyway at Home полягає у створенні високоточної тривимірної моделі Чумацького Шляху з використанням даних, зібраних Слоанівським цифровим оглядом неба."
 
 #: projects.inc:278
@@ -559,7 +672,13 @@ msgid "Leiden University, The Netherlands"
 msgstr "Лейденський університет, Нідерланди"
 
 #: projects.inc:280
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
+msgid ""
+"Surface science calculations using Classical Dynamics.  Leiden Classical "
+"allows volunteers, students and other scientist to submit their personal "
+"calculations to the grid. Each user has his own personal queue for Classical"
+" Dynamics jobs. In this way students have used the grid to simulate liquid "
+"argon, or to test the validity of the ideal gas law by actually doing the "
+"simulations through the grid."
 msgstr "Обчислення в науці поверхонь, використовуючи Classical Dynamics.  Leiden Classical дозволяя волонтерам, студентам і вченим відправляти результати своїх обчислень у мережу. Кожен користувач має свою власну особисту чергу завдань Classical Dynamics. Таким чином, студенти використовують мережу для того, щоб змоделювати рідкий аргон або перевірити обґрунтованість закону ідеального газу, фактично проводячи моделювання за посередництва мережі."
 
 #: projects.inc:294
@@ -571,25 +690,36 @@ msgid "Astrophysics"
 msgstr "Астрофізика"
 
 #: projects.inc:296
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
+msgid ""
+"Search for spinning neutron stars (also called pulsars) using data from the "
+"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
+"observatory.  Einstein at Home is a World Year of Physics 2005 project "
+"supported by the American Physical Society (APS) and by a number of "
+"international organizations."
 msgstr "Пошук нейтронних зірок, що обертаються (ще звуться пульсарами), використовуючи дані детекторів гравітаційних звиль LIGO і GEO, а також радіообсерваторії Аресібо.  Einstein at Home - проект Міжнародного року фізики 2005, підтриманий Американським фізичним товариством і багатьма міжнародними організаціями."
 
-#: projects.inc:310
-#: projects.inc:318
+#: projects.inc:310 projects.inc:318
 msgid "CERN (European Organization for Nuclear Research)"
 msgstr "ЦЕРН (Європейська рада з ядерних досліджень)"
 
-#: projects.inc:311
-#: projects.inc:319
+#: projects.inc:311 projects.inc:319
 msgid "Physics"
 msgstr "Фізика"
 
 #: projects.inc:312
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
+msgid ""
+"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
+"European Organization for Nuclear Research, the world's largest particle "
+"physics laboratory.  It is the most powerful instrument ever built to "
+"investigate on particles proprieties. LHC at home runs simulations to improve "
+"the design of LHC and its detectors."
 msgstr "Великий адронний колайдер (ВАК) - прискорювач частинок у ЦЕРН, Європейській раді з ядерних досліджень, найбільшій у світі лабораторії фізики елементарних частинок.  Це найпотужніший із будь-коли побудованих інструментів для дослідження поведінки елементарних частинок. LHC at home виконує моделювання для покращення проекту ВАК і його датчиків."
 
 #: projects.inc:320
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
+msgid ""
+"This project uses CERN-developed virtual machine technology for full-fledged"
+" LHC event physics simulation on volunteer computers.  Requires that you "
+"install VirtualBox on your computer"
 msgstr "Цей проект використовує технологію віртуальних машин, розроблених у CERN, для моделювання фізики повноцінних подій ВАК на комп’ютерах добровольців.  Необхідне встановлення VirtualBox на Вашому комп’ютері"
 
 #: projects.inc:326
@@ -601,7 +731,12 @@ msgid "Astrophysics, astrobiology"
 msgstr "Астрофізика, астробіологія"
 
 #: projects.inc:328
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
+msgid ""
+"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
+"goal is to detect intelligent life outside Earth. One approach, known as "
+"radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
+"signals from space. Such signals are not known to occur naturally, so a "
+"detection would provide evidence of extraterrestrial technology."
 msgstr "SETI (Search for Extraterrestrial Intelligence, пошук позаземного розуму) - це науковий напрямок, мета якого - виявити розумне життя за межами Землі. На першому етапі, відомому як radio SETI (радіо SETI), використовуються радіотелескопи для слідкування за вуьзкосмуговими радіосигналами космосу. Природні джерела таких сигналів невідомі, тому їх виявлення може надати підтвердження про існування позаземної технології."
 
 #: projects.inc:342
@@ -613,7 +748,11 @@ msgid "Chemical engineering and nanotechnology"
 msgstr "Хімічна технологія і нанотехнологія"
 
 #: projects.inc:344
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
+msgid ""
+"The study of molecular magnets and controlled nanoscale magnetism.  These "
+"magnetic molecules may be used to develop tiny magnetic switches, with "
+"applications in medicine (such as local tumor chemotherapy) and "
+"biotechnology."
 msgstr "Вивчення молекулярних магнітів і керованого нанорозмірного магнетизму.  Такі магнітні молекули можуть використовуватися у розробці дрібних магнітних вимикачів, які використовуватимуться у медицині (наприклад місцева хіміотерапія пухлин) і в біотехнології."
 
 #: projects.inc:351
@@ -629,7 +768,10 @@ msgid "Physics, biochemistry, and others"
 msgstr "Фізика, біохімія та інші"
 
 #: projects.inc:358
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
+msgid ""
+"The objective of CAS at home is to encourage and assist scientists in China to "
+"adopt the technologies of volunteer computing and volunteer thinking for "
+"their research."
 msgstr "Метою CAS at home є рекомендування і допомога вченим Китаю прийняти технології волонтерських обчислень і мислення у їхні дослідження."
 
 #: projects.inc:365
@@ -637,11 +779,12 @@ msgid "Mathematics, physics, evolution"
 msgstr "Математика, фізика, еволюція"
 
 #: projects.inc:366
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
+msgid ""
+"Yoyo at home is an adapter between BOINC and several existing volunteer "
+"computing projects: ECM, Muon, Evolution at home, and distributed.net"
 msgstr "Yoyo at home - адаптер між BOINC і декількома існуючими волонтерськими обчислювальними проектами: ECM, Muon, Evolution at home і distributed.net"
 
-#: projects.inc:371
-#: projects.inc:527
+#: projects.inc:371 projects.inc:527
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 msgstr "Лабораторія паралельних і розподілених систем MTA-SZTAKI (Угорщина)"
 
@@ -650,7 +793,11 @@ msgid "European research projects"
 msgstr "Європейські дослідницькі проекти"
 
 #: projects.inc:373
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
+msgid ""
+"The EDGeS at Home Beta project integrates volunteer computing into the service "
+"grid network of Europe by allowing service grids to send workunits to be "
+"processed by the volunteers of this project. The scientific projects covered"
+" by the project include math, physics, biology, etc."
 msgstr "Бета-проект EDGeS at Home об’єднує волонтерські обчислення у європейську сервісну мережу, дозволяючи сервісній мережі посилати завдання для обробки волонтерами цього проекту. Наукові дослідження, що підтримуються даним проектом, включають в себе математику, фізику, біологію і т.д."
 
 #: projects.inc:379
@@ -674,7 +821,11 @@ msgid "Medical, environmental and other humanitarian research"
 msgstr "Медичні, екологічні та інші гуманітарні дослідження"
 
 #: projects.inc:389
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
+msgid ""
+"To further critical non-profit research on some of humanity's most pressing "
+"problems by creating the world's largest volunteer computing grid.  Research"
+" includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"clean water and many more."
 msgstr "Для подальших критичних некомерційних досліджень деяких з найбільш актуальних проблем людства, створивши найбільшу в світі добровільну обчислювальну мережу.  Дослідження включають в себе ВІЛ-СНІД, рак, тропічні і забуті хвороби, сонячну енергію, чисту воду і багато іншого."
 
 #: projects.inc:395
@@ -693,21 +844,18 @@ msgstr "Математика, фізика, штучний інтелект"
 msgid "Simulation of quantum computing; Goldbach's conjecture."
 msgstr "Моделювання квантових комп’ютерів; гіпотеза Гольдбаха."
 
-#: projects.inc:450
-#: projects.inc:458
+#: projects.inc:450 projects.inc:458
 msgid "Cryptography"
 msgstr "Криптографія"
 
 #: projects.inc:459
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
+msgid ""
+"Attempt to decode 3 original Enigma messages. The signals were intercepted "
+"in the North Atlantic in 1942 and are believed to be unbroken."
 msgstr "Спроба розшифрувати 3 оригінальних повідомлення Енігми. Сигнали були перехоплені у Північноатлантичному океані у 1942 році і вважалось, що їх неможливо зламати."
 
-#: projects.inc:465
-#: projects.inc:504
-#: projects.inc:512
-#: projects.inc:520
-#: projects.inc:528
-#: projects.inc:568
+#: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
+#: projects.inc:528 projects.inc:568
 msgid "Mathematics"
 msgstr "Математика"
 
@@ -724,11 +872,19 @@ msgid "Factorization of large integers"
 msgstr "Розклад великих цілих чисел на множники"
 
 #: projects.inc:473
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
+msgid ""
+"NFS at Home is a research project that uses Internet-connected computers to do "
+"the lattice sieving step in the Number Field Sieve factorization of large "
+"integers. As a young school student, you gained your first experience at "
+"breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
+"NFS at Home is a continuation of that experience, only with integers that are "
+"hundreds of digits long."
 msgstr "NFS at Home - це дослідницький проект, який використовує підключені до Інтернету комп’ютери для того, щоб розрахувати крок решітки просіювання при факторизації великих цілих чисел у Number Field Sieve (NFS). Школярем Ви отримали свій перший досвід у розкладанні цілих чисел на прості, такі як 15 = 3 * 5 або 35 = 5 * 7. NFS at Home є продовженням цього досвіду, тільки з цілими числами, які складаються із сотень цифр."
 
 #: projects.inc:479
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
+msgid ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
 msgstr "Вільнюський технічний університет і Каунаський університет технологій (Литва)"
 
 #: projects.inc:480
@@ -736,7 +892,11 @@ msgid "Software testing"
 msgstr "Тестування програмного забезпечення"
 
 #: projects.inc:481
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
+msgid ""
+"The aim of this project is to provide a powerful distributed computing "
+"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
+"well as others Lithuanian academic institutions.  Current applications "
+"involve the study of Monte-Carlo based software testing."
 msgstr "Метою даного проекту є надання потужної розподіленої обчислювальної платформи для вчених із Вільнюського технічного університету, а також інших литовських наукових закладів.  Поточні додатки включають вивчення тестування програмного забезпечення, заснованого на методі Монте-Карло."
 
 #: projects.inc:503
@@ -744,11 +904,20 @@ msgid "Mathematical Institute of Leiden University / Kennislink"
 msgstr "Математичний інститут Лейденського університету/Кенніслінк"
 
 #: projects.inc:505
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
+msgid ""
+"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
+"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
+"product of the distinct prime factors of n. The ABC conjecture says that "
+"there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for "
+"any real h > 1. The ABC conjecture is currently one of the greatest open "
+"problems in mathematics. If it is proven to be true, a lot of other open "
+"problems can be answered directly from it."
 msgstr "Пошук 'ABC-трійок': додатних цілих чисел a, b, c, таких, що a+b=c, a < b < c, a,b,c не мають загальних дільників і c > rad(abc), де rad(n) - продукт окремих простих факторів n. ABC-гіпотеза говорить, що є тільки кінцева множина a,b,c, таких що log(c)/log(rad(abc)) > h для будь-якого реального h > 1. ABC-гіпотеза - одна із найбільших відкритих проблем у математиці в даний час. Якщо вона буде доведена, безпосередньо через неї може бути вирішено багато інших відкритих проблем."
 
 #: projects.inc:513
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
+msgid ""
+"Primegrid has multiple projects searching for different forms of very large "
+"prime numbers, including searching for the largest known prime number."
 msgstr "Primegri підтримує багато проектів, які шукають різні форми дуже великих простих чисел, включаючи пошук найбільшого відомого простого числа."
 
 #: projects.inc:519
@@ -756,11 +925,15 @@ msgid "Hochschule RheinMain University of Applied Sciences"
 msgstr "Університет Прикладних Наук РейнМейн"
 
 #: projects.inc:521
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
+msgid ""
+"Search for counterexamples to two conjectures related to the identification "
+"of prime numbers"
 msgstr "Пошук контрприкладів до двох теорем, пов’язаних з ідентифікацією головних чисел"
 
 #: projects.inc:529
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
+msgid ""
+"Find all the generalized binary number systems (in which bases are matrices "
+"and digits are vectors) up to dimension 11."
 msgstr "Пошук всіх систем узагальнених двійкових чисел (в яких основи є матрицями, а цифри - векторами) до 11-го виміру."
 
 #: ../html/inc/news.inc:40
@@ -771,136 +944,3 @@ msgstr "Коментар"
 #, php-format
 msgid "News is available as an %sRSS feed%s"
 msgstr "Новини доступні у форматі %sстрічки RSS%s"
-
-# 75%
-#~ msgid "Astronomy, Physics, and Chemistry"
-#~ msgstr "Астрономія, фізика і хімія"
-#, php-format
-#~ msgid "%s for %s (%s MB)"
-#~ msgstr "%s для %s (%s МБайт)"
-#~ msgid ""
-#~ "BOINC is a program that lets you donate your idle computer time to science "
-#~ "projects like SETI at home, Climateprediction.net, Rosetta at home, World "
-#~ "Community Grid, and many others. <p> After installing BOINC on your "
-#~ "computer, you can connect it to as many of these projects as you like."
-#~ msgstr ""
-#~ "BOINC - це програма, що дозволяє Вам віддавати вільний процесорний час свого "
-#~ "комп'ютера для наукових проектів, таких як SETI at home, "
-#~ "Climeteprediction.net, Rosetta at home, World Community Grid, та багатьох "
-#~ "інших. <p> Після встановлення BOINC на свій комп'ютер, Ви зможете взяти "
-#~ "участь у всіх проектах, які Вам подобаються."
-#~ msgid "Browser default"
-#~ msgstr "Як у браузері"
-
-#, php-format
-#~ msgid ""
-#~ " Use the idle time on your computer (Windows, Mac, or Linux) to cure "
-#~ "diseases, study global warming, discover pulsars, and do many other types of "
-#~ "scientific research.  It's safe, secure, and easy:  %sChoose%s projects  "
-#~ "%sDownload%s and run BOINC software  %sEnter%s an email address and "
-#~ "password. "
-#~ msgstr ""
-#~ " Надайте невикористаний час свого комп'ютера (з ОС: Windows, Mac або Linux) "
-#~ "для пошуку ліків і методів лікування, вивчення глобальної зміни клімату, "
-#~ "пульсарів, а також для безлічі інших наукових досліджень.  Зробити це досить "
-#~ "просто і відносно безпечно:  %sВиберіть%s вподобані проекти %sЗавантажте%s "
-#~ "і встановіть програмне забезпечення BOINC  %Зазначте:%s свою адресу "
-#~ "електронної пошти і пароль для свого облікового запису в проекті. "
-#~ msgid "IBM Corporate Community Relations"
-#~ msgstr "IBM Corporate Community Relations"
-#~ msgid "Humanitarian research on disease, natural disasters and hunger."
-#~ msgstr "Гуманітарні дослідження хвороб, стихійних лих і голоду."
-#~ msgid ""
-#~ "To further critical non-profit research on some of humanity's most "
-#~ "pressing problems by creating the world's largest volunteer computing "
-#~ "grid.  Research includes HIV/AIDS, cancer, muscular dystrophy, dengue "
-#~ "fever, and many more."
-#~ msgstr ""
-#~ "Створення найбільшої у світі мережі волонтерських обчислень для "
-#~ "подальшого серйозного некомерційного дослідження деяких найбільш "
-#~ "нагальних проблем людства.  Дослідження охоплюють ВІЛ/СНІД, рак, "
-#~ "дистрофію м'язів, лихоманку денге та чимало інших."
-#~ msgid ""
-#~ "Primegrid is generating a public sequential prime number database, and is "
-#~ "searching for large twin primes of the form k*2<sup>n</sup>+1 and "
-#~ "k*2<sup>n</sup>-1"
-#~ msgstr ""
-#~ "Primegrid формує загальнодоступну послідовну базу даних простих чисел і "
-#~ "шукає великі парні прості числа виду k*2<sup>n</sup>+1 і k*2<sup>n</sup>-1"
-#~ msgid "FreeHAL"
-#~ msgstr "FreeHAL"
-#~ msgid "private"
-#~ msgstr "приватний"
-#~ msgid "POEM at HOME"
-#~ msgstr "POEM at HOME"
-#~ msgid "Docking at Home"
-#~ msgstr "Docking at Home"
-#~ msgid "GPUGrid.net"
-#~ msgstr "GPUGrid.net"
-#~ msgid "Superlink at Technion"
-#~ msgstr "Superlink at Technion"
-#~ msgid "The Lattice Project"
-#~ msgstr "The Lattice Project"
-#~ msgid "Malariacontrol.net"
-#~ msgstr "Malariacontrol.net"
-#~ msgid "Rosetta at home"
-#~ msgstr "Rosetta at home"
-#~ msgid "SIMAP"
-#~ msgstr "SIMAP"
-#~ msgid "Virtual Prairie"
-#~ msgstr "Virtual Prairie"
-#~ msgid "University of Houston"
-#~ msgstr "Університет Х'юстону"
-#~ msgid "Study of botanical ecosystems"
-#~ msgstr "Вивчення ботанічних екосистем"
-#~ msgid ""
-#~ "Provide ecological guidelines on the design of prairies with the best "
-#~ "potential for water purification."
-#~ msgstr ""
-#~ "Забезпечує основні екологічні принципи з проектування прерій з найкращим "
-#~ "потенціалом для очищення води."
-#~ msgid "Climateprediction.net"
-#~ msgstr "Climateprediction.net"
-#~ msgid "Astronomy/Physics/Chemistry"
-#~ msgstr "Астрономія/Фізика/Хімія"
-#~ msgid "eOn"
-#~ msgstr "eOn"
-#~ msgid "Orbit at home"
-#~ msgstr "Orbit at home"
-#~ msgid "Planetary Science Institute"
-#~ msgstr "Інститут планетарної науки"
-#~ msgid "Monitor and study the hazard posed by near-Earth asteroids"
-#~ msgstr "Моніторинг і вивчення небезпеки, яку несуть навколоземні астероїди"
-#~ msgid "Cosmology at Home"
-#~ msgstr "Cosmology at Home"
-#~ msgid "University of Illinois at Urbana-Chamapign"
-#~ msgstr "Іллінойський університет в Урбана-Шампейн"
-#~ msgid "Milkyway at home"
-#~ msgstr "Milkyway at home"
-#~ msgid "Leiden Classical"
-#~ msgstr "Leiden Classical"
-#~ msgid "uFluids at home"
-#~ msgstr "uFluids at home"
-#~ msgid "Purdue University"
-#~ msgstr "Університет Пердью"
-#~ msgid "Physics/Aeronautics"
-#~ msgstr "Фізика/Повітроплавання"
-#~ msgid ""
-#~ "The uFluids project simulates two-phase fluid behavior in microgravity "
-#~ "and microfluidics problems. Our goal is to design better satellite "
-#~ "propellant management devices and address two-phase flow in microchannel "
-#~ "and MEMS devices."
-#~ msgstr ""
-#~ "Проект uFluids моделює двофазну поведінку рідини у мікрогравітаційній і "
-#~ "мікрорідинній проблемах. Наша мета полягає у тому, щоб запроектувати "
-#~ "кращі пристрої управління двигунами супутників і застосувати двофазний "
-#~ "потік у мікроканалі і MEMS-пристроях."
-#~ msgid "Einstein at home"
-#~ msgstr "Einstein at home"
-#~ msgid "LHC at home"
-#~ msgstr "LHC at home"
-#~ msgid "SETI at home"
-#~ msgstr "SETI at home"
-#~ msgid "Quantum Monte Carlo at Home"
-#~ msgstr "Quantum Monte Carlo at Home"
-
diff --git a/locale/updatetrans.sh b/locale/updatetrans.sh
index b79919a..0349aa3 100755
--- a/locale/updatetrans.sh
+++ b/locale/updatetrans.sh
@@ -3,86 +3,108 @@
 # Look for .po files modified later than .mo, and regenerate .mo file
 # Then commit and push changes.
 
-# This is run in the Pootle copy of the source tree (~/pootle/repos/boinctrunk)
-# It's run from pootle/update.sh, which is run from cron every 12 hours.
-#
-projname=boinc74src
-projdir=/home/boincadm/pootle/repos/$projname
+projname=boinc
+projdir=/home/boincadm/rwalton/$projname/locale
 
 cd $projdir
 
-
 for file in `find -name 'BOINC-Manager.po'` ; do
   dir=`dirname $file`
   locale=`basename $dir`
-  template_name=${projdir}/${locale}/BOINC-Manager
+  template_name=BOINC-Manager
+
+  cd $projdir/${locale}
  
-  if test ${template_name}.po -nt ${template_name}.mo
+  if test ${template_name}.po -nt ${template_name}.mo.flag
   then
 
     # Compile the PO file into an MO file.
-    pocompile ${template_name}.po ${template_name}.mo 
+    pocompile ${template_name}.po ${template_name}.mo
+
+	# Add the updated file to git
+	git add ${template_name}.mo
     
     # Touch each file to adjust timestamps
     touch ${template_name}.po
-    touch ${template_name}.mo 
+    touch ${template_name}.mo.flag 
 
   fi  
 done
 
 
+cd $projdir
+
 for file in `find -name 'BOINC-Client.po'` ; do
   dir=`dirname $file`
   locale=`basename $dir`
-  template_name=${projdir}/${locale}/BOINC-Client
+  template_name=BOINC-Client
+
+  cd $projdir/${locale}
  
-  if test ${template_name}.po -nt ${template_name}.mo
+  if test ${template_name}.po -nt ${template_name}.mo.flag
   then
 
     # Compile the PO file into an MO file.
     pocompile ${template_name}.po ${template_name}.mo
+
+	# Add the updated file to git
+	git add ${template_name}.mo
     
     # Touch each file to adjust timestamps
     touch ${template_name}.po
-    touch ${template_name}.mo 
+    touch ${template_name}.mo.flag
 
   fi  
 done
 
 
+cd $projdir
+
 for file in `find -name 'BOINC-Web.po'` ; do
   dir=`dirname $file`
   locale=`basename $dir`
-  template_name=${projdir}/${locale}/BOINC-Web
+  template_name=BOINC-Web
+
+  cd $projdir/${locale}
  
-  if test ${template_name}.po -nt ${template_name}.mo
+  if test ${template_name}.po -nt ${template_name}.mo.flag
   then
 
     # Compile the PO file into an MO file.
     pocompile ${template_name}.po ${template_name}.mo
+
+	# Add the updated file to git
+	git add ${template_name}.mo
     
     # Touch each file to adjust timestamps
     touch ${template_name}.po
-    touch ${template_name}.mo 
+    touch ${template_name}.mo.flag
 
   fi  
 done
 
 
+cd $projdir
+
 for file in `find -name 'BOINC-Setup.po'` ; do
   dir=`dirname $file`
   locale=`basename $dir`
-  template_name=${projdir}/${locale}/BOINC-Setup
+  template_name=BOINC-Setup
+
+  cd $projdir/${locale}
  
-  if test ${template_name}.po -nt ${template_name}.mo
+  if test ${template_name}.po -nt ${template_name}.mo.flag
   then
 
     # Compile the PO file into an MO file.
     pocompile ${template_name}.po ${template_name}.mo
+
+	# Add the updated file to git
+	git add ${template_name}.mo
     
     # Touch each file to adjust timestamps
     touch ${template_name}.po
-    touch ${template_name}.mo 
+    touch ${template_name}.mo.flag
 
   fi  
 done
diff --git a/locale/zh_CN/BOINC-Client.mo b/locale/zh_CN/BOINC-Client.mo
index d259e22..ed05f96 100644
Binary files a/locale/zh_CN/BOINC-Client.mo and b/locale/zh_CN/BOINC-Client.mo differ
diff --git a/locale/zh_CN/BOINC-Client.po b/locale/zh_CN/BOINC-Client.po
index 0b485c8..0f1d570 100644
--- a/locale/zh_CN/BOINC-Client.po
+++ b/locale/zh_CN/BOINC-Client.po
@@ -1,24 +1,23 @@
 # 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: BOINC 7.4\n"
+"Project-Id-Version: boinc\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-10-15 22:25-0700\n"
-"PO-Revision-Date: 2015-02-12 02:11-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: Team China <zenith.yin at gmail.com>\n"
-"Language: zh_CN\n"
+"PO-Revision-Date: 2015-02-09 01:42+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\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"
-"X-Generator: Pootle 2.1.6\n"
-"X-Poedit-Basepath: D:\\Work\\boinc_src\\locale\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: acct_mgr.cpp:450
-#: acct_mgr.cpp:459
+#: acct_mgr.cpp:450 acct_mgr.cpp:459
 msgid "Message from account manager"
 msgstr "来自账户管理器的消息"
 
@@ -27,7 +26,9 @@ msgid "Message from server"
 msgstr "来自服务器的消息"
 
 #: client_state.cpp:258
-msgid "Some tasks need more memory than allowed by your preferences.  Please check the preferences."
+msgid ""
+"Some tasks need more memory than allowed by your preferences.  Please check "
+"the preferences."
 msgstr "部分计算任务所需要的内存超出了你的设定值,请检查参数设置中的相关选项。"
 
 #: client_state.cpp:520
@@ -40,11 +41,12 @@ 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"
+msgid ""
+"You used the wrong URL for this project.  When convenient, remove this "
+"project, then add %s"
 msgstr "你当前使用了错误的项目网址,方便的时候,请移除该项目,然后重新添加 %s"
 
-#: cs_statefile.cpp:828
-#: ../sched/sched_types.cpp:259
+#: cs_statefile.cpp:828 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
 msgstr "app_info.xml 语法错误"
 
@@ -56,18 +58,15 @@ msgstr "app_info.xml 中引用的文件不存在:"
 msgid "A new version of BOINC is available."
 msgstr "检测到新版本的 BOINC。"
 
-#: current_version.cpp:94
-#: current_version.cpp:102
+#: current_version.cpp:94 current_version.cpp:102
 msgid "Download"
 msgstr "下载"
 
-#: log_flags.cpp:269
-#: log_flags.cpp:449
+#: 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
+#: log_flags.cpp:423 log_flags.cpp:475
 msgid "Unrecognized tag in cc_config.xml"
 msgstr "cc_config.xml 中有无法识别的标签"
 
@@ -92,7 +91,9 @@ 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."
+msgid ""
+"The project has changed its security key.  Please remove and add this "
+"project."
 msgstr "该项目已经修改了它的安全密钥,请退出并重新加入该项目以修复这个问题。"
 
 #: ../sched/handle_request.cpp:943
@@ -104,7 +105,8 @@ msgid "This project doesn't support CPU type"
 msgstr "该项目不支持你的中央处理器(CPU)类型"
 
 #: ../sched/handle_request.cpp:993
-msgid "Your BOINC client software is too old.  Please install the current version."
+msgid ""
+"Your BOINC client software is too old.  Please install the current version."
 msgstr "你的 BOINC 客户端软件太旧,请安装当前最新的版本。"
 
 #: ../sched/handle_request.cpp:1259
@@ -112,18 +114,21 @@ 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"
+msgid ""
+"Upgrade to the latest driver to process tasks using your computer's GPU"
 msgstr "将你计算机中 GPU 的驱动升级到最新版本后,才能继续处理计算任务"
 
 #: ../sched/sched_send.cpp:1099
-msgid "Upgrade to the latest driver to use all of this project's GPU applications"
+msgid ""
+"Upgrade to the latest driver to use all of this project's GPU applications"
 msgstr "将你计算机中 GPU 的驱动升级到最新版本后,才能运行该项目的 GPU 计算程序"
 
 #: ../sched/sched_send.cpp:1118
-msgid "A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to the current version"
+msgid ""
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to"
+" the current version"
 msgstr "如果要使用你的 NVIDIA GPU 来进行计算,请将 BOINC 升级至最新的正式版本。"
 
-# 94%
 #: ../sched/sched_send.cpp:1146
 #, c-format
 msgid "An %s GPU is required to run tasks for this project"
@@ -143,7 +148,8 @@ msgstr "要求更新BOINC的版本,请安装当前最新的正式版本"
 
 #: ../sched/sched_send.cpp:1305
 #, c-format
-msgid "Tasks for %s are available, but your preferences are set to not accept them"
+msgid ""
+"Tasks for %s are available, but your preferences are set to not accept them"
 msgstr "%s 目前有可用的任务,但是您的偏好设定禁用了该类任务。"
 
 #: ../sched/sched_types.cpp:254
@@ -153,46 +159,3 @@ 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 文件中未包括可用版本的"
-
-#~ msgid "Download it."
-#~ msgstr "下载它。"
-#~ msgid "An NVIDIA or ATI GPU is required to run tasks for this project"
-#~ msgstr "运行这个项目要求计算机配备一块 NVIDIA 或 ATI 的显卡。"
-#~ msgid "An NVIDIA GPU is required to run tasks for this project"
-#~ msgstr "运行这个项目要求计算机配备一块 NVIDIA 的显卡。"
-#~ msgid "An ATI GPU is required to run tasks for this project"
-#~ msgstr "运行这个项目要求计算机配备一块 ATI 的显卡。"
-#~ msgid ""
-#~ "Tasks for NVIDIA GPU are available, but your preferences are set to not "
-#~ "accept them"
-#~ msgstr "目前还有 NVIDIA GPU 的计算任务,但你在参数设置中选择了不下载该类型的任务"
-#~ msgid ""
-#~ "Tasks for ATI GPU are available, but your preferences are set to not accept "
-#~ "them"
-#~ msgstr "目前还有 ATI GPU 的计算任务,但你在参数设置中选择了不下载该类型的任务"
-#~ msgid ""
-#~ "Tasks for CPU are available, but your preferences are set to not accept them"
-#~ msgstr "目前还有 CPU 的计算任务,但你在参数设置中选择了不下载该类型的任务"
-#~ msgid "error"
-#~ msgstr "错误"
-#~ msgid "Can't resolve hostname in remote_hosts.cfg"
-#~ msgstr "无法解析 remote_hosts.cfg 里的主机名称"
-#~ msgid "is not available for"
-#~ msgstr "对于你的计算机类型不可用:"
-#~ msgid "Notice from BOINC"
-#~ msgstr "BOINC 通知"
-#~ msgid "Message from"
-#~ msgstr "消息来自"
-#~ msgid ""
-#~ "You may have an outdated code signing key.  Try attaching and reattaching "
-#~ "this project."
-#~ msgstr "你的代码签名密钥已经过期,请退出并重新加入该项目。"
-#~ msgid "XML syntax error in"
-#~ msgstr "XML 语法错误"
-#~ msgid "Unparsed tag in"
-#~ msgstr "无法解析的标签"
-#~ msgid ""
-#~ "Your preference for network connection interval is too high for this "
-#~ "project"
-#~ msgstr "你参数设置中关于网络连接间隔的限制对于当前项目来说太高了"
-
diff --git a/locale/zh_CN/BOINC-Manager.mo b/locale/zh_CN/BOINC-Manager.mo
index bbd3a1c..73dccde 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 b11b753..3e4a310 100644
--- a/locale/zh_CN/BOINC-Manager.po
+++ b/locale/zh_CN/BOINC-Manager.po
@@ -1,64 +1,63 @@
 # 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:
+# 周潇波 <zhouxiaobo.500 at gmail.com>, 2015
+# 秦赫阳 <qysnn1 at gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-15 16:56-0500\n"
-"PO-Revision-Date: 2015-02-12 02:12-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: Team China <zenith.yin at gmail.com>\n"
-"Language: zh_CN\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"
+"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"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc_7.4\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1420099617.0\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\n"
+"X-Poedit-Country: UNITED STATES\n"
+"X-Poedit-Language: English\n"
 "X-Poedit-SearchPath-0: clientgui\n"
-"X-Poedit-SearchPath-1: clientgui/msw\n"
-"X-Poedit-SearchPath-2: clientgui/mac\n"
-"X-Poedit-SearchPath-3: clientgui/mac\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"
 
-# 81%
-#: clientgui/AccountInfoPage.cpp:387
+#: clientgui/AccountInfoPage.cpp:361
 #, c-format
 msgid "Identify your account at %s"
 msgstr "确认你在 %s 的帐户"
 
-#: clientgui/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 ""
-"请输入您的帐户信息\n"
-"( 要创建帐户,请访问项目网站 )"
+msgstr "请输入您的帐户信息\n( 要创建帐户,请访问项目网站 )"
 
-#: clientgui/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 ""
-"该项目目前不支持新建帐户。\n"
-"您只能用现有的帐户在客户端加入该项目。"
+msgstr "该项目目前不支持新建帐户。\n您只能用现有的帐户在客户端加入该项目。"
 
-#: clientgui/AccountInfoPage.cpp:401
+#: clientgui/AccountInfoPage.cpp:375
 msgid "Are you already running this project?"
 msgstr "您参加过这个项目吗?"
 
-#: clientgui/AccountInfoPage.cpp:405
+#: clientgui/AccountInfoPage.cpp:379
 msgid "&No, new user"
 msgstr "没有,我是新用户(&N)"
 
-#: clientgui/AccountInfoPage.cpp:408
+#: clientgui/AccountInfoPage.cpp:382
 msgid "&Yes, existing user"
 msgstr "是的,我已经注册过了(&Y)"
 
-#: clientgui/AccountInfoPage.cpp:413
+#: clientgui/AccountInfoPage.cpp:387
 msgid ""
 "We were not able to set up your account information\n"
 "automatically.\n"
@@ -66,122 +65,114 @@ msgid ""
 "Please click on the 'Find login information' link\n"
 "below to find out what to put in the email address and\n"
 "password fields."
-msgstr ""
-"我们无法自动建立您的帐户信息。\n"
-"\n"
-"请点击下方的“寻找登录信息”超链接以查明\n"
-"应该在电子邮件地址和密码栏中填写什么内容。"
+msgstr "我们无法自动建立您的帐户信息。\n\n请点击下方的“寻找登录信息”超链接以查明\n应该在电子邮件地址和密码栏中填写什么内容。"
 
-#: clientgui/AccountInfoPage.cpp:416
+#: clientgui/AccountInfoPage.cpp:390
 msgid "Find login information"
 msgstr "寻找登录信息"
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:649
+#: clientgui/AccountInfoPage.cpp:410 clientgui/AccountInfoPage.cpp:632
 msgid "&Password:"
 msgstr "密码(&P):"
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:673
+#: clientgui/AccountInfoPage.cpp:417 clientgui/AccountInfoPage.cpp:656
 msgid "Choose a &password:"
 msgstr "选择一个密码(&P):"
 
-#: clientgui/AccountInfoPage.cpp:446
+#: clientgui/AccountInfoPage.cpp:420
 msgid "C&onfirm password:"
 msgstr "密码确认(&O):"
 
-#: clientgui/AccountInfoPage.cpp:453
+#: clientgui/AccountInfoPage.cpp:427
 #, c-format
 msgid "Are you already running %s?"
 msgstr "您已经在运行 %s 吗?"
 
-#: clientgui/AccountInfoPage.cpp:482
+#: clientgui/AccountInfoPage.cpp:456
 msgid "&Username:"
 msgstr "用户名(&U):"
 
-#: clientgui/AccountInfoPage.cpp:511
+#: clientgui/AccountInfoPage.cpp:485
 msgid "&Email address or LDAP ID:"
-msgstr "电子邮箱地址或 LDAP ID(&E):"
+msgstr "电子邮件地址或LDAP ID(&E):"
 
-#: clientgui/AccountInfoPage.cpp:515
+#: clientgui/AccountInfoPage.cpp:489
 msgid "&Email address:"
 msgstr "电子邮件地址(&E):"
 
-#: clientgui/AccountInfoPage.cpp:523
+#: clientgui/AccountInfoPage.cpp:497
 #, c-format
 msgid "minimum length %d"
 msgstr "最小长度 %d"
 
-#: clientgui/AccountInfoPage.cpp:530
+#: clientgui/AccountInfoPage.cpp:504
 msgid "Forgot your password?"
 msgstr "忘记您的密码了?"
 
-#: clientgui/AccountInfoPage.cpp:537
+#: 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 ""
-"如果您还没有注册过这个帐户管理器,\n"
-"请在继续之前先注册。点击下方的超链接\n"
-"就可以进行注册或取回您已忘记的密码。"
+msgstr "如果您还没有注册过这个帐户管理器,\n请在继续之前先注册。点击下方的超链接\n就可以进行注册或取回您已忘记的密码。"
 
-#: clientgui/AccountInfoPage.cpp:540
+#: clientgui/AccountInfoPage.cpp:514
 msgid "Account manager web site"
 msgstr "帐户管理器网站"
 
-#: clientgui/AccountInfoPage.cpp:582
+#: clientgui/AccountInfoPage.cpp:556
 msgid "Add project"
 msgstr "增加项目"
 
-#: clientgui/AccountInfoPage.cpp:584
+#: clientgui/AccountInfoPage.cpp:558
 msgid "Update account manager"
 msgstr "更新帐户管理器"
 
-#: clientgui/AccountInfoPage.cpp:586
+#: clientgui/AccountInfoPage.cpp:560
 msgid "Use account manager"
 msgstr "使用帐户管理器"
 
-#: clientgui/AccountInfoPage.cpp:593
+#: clientgui/AccountInfoPage.cpp:567
 msgid "Please enter a user name."
 msgstr "请输入一个用户名。"
 
-#: clientgui/AccountInfoPage.cpp:595
+#: clientgui/AccountInfoPage.cpp:569
 msgid "Please enter an email address."
 msgstr "请指定一个电子邮箱地址。"
 
-#: clientgui/AccountInfoPage.cpp:605
+#: clientgui/AccountInfoPage.cpp:579
 #, c-format
 msgid "Please enter a password of at least %d characters."
 msgstr "请输入长度至少为 %d 的口令。"
 
-#: clientgui/AccountInfoPage.cpp:615
-msgid "The password and confirmation password do not match. Please type them again."
+#: clientgui/AccountInfoPage.cpp:589
+msgid ""
+"The password and confirmation password do not match. Please type them again."
 msgstr "两次输入的密码不匹配,请重新输入。"
 
-#: clientgui/AccountManagerInfoPage.cpp:272
+#: clientgui/AccountManagerInfoPage.cpp:270
 msgid "Choose an account manager"
 msgstr "选择一个帐户管理器"
 
-#: clientgui/AccountManagerInfoPage.cpp:275
+#: clientgui/AccountManagerInfoPage.cpp:273
 msgid ""
 "To choose an account manager, click its name or \n"
 "type its URL below."
 msgstr "要选择一个帐户管理器,请点击它的名称或在下方输入它的网址。"
 
-#: clientgui/AccountManagerInfoPage.cpp:279
+#: clientgui/AccountManagerInfoPage.cpp:277
 msgid "Account manager details:"
 msgstr "帐户管理器详情:"
 
-#: clientgui/AccountManagerInfoPage.cpp:283
+#: clientgui/AccountManagerInfoPage.cpp:281
 msgid "Account manager &URL:"
 msgstr "帐户管理器网址(&URL):"
 
-#: clientgui/AccountManagerInfoPage.cpp:287
+#: clientgui/AccountManagerInfoPage.cpp:285
 msgid "Open web page"
 msgstr "打开网页"
 
-#: clientgui/AccountManagerInfoPage.cpp:290
+#: clientgui/AccountManagerInfoPage.cpp:288
 msgid "Visit this account manager's web site"
 msgstr "访问该账户管理器的网站"
 
@@ -205,321 +196,334 @@ msgstr "请稍候..."
 msgid "An internal server error has occurred.\n"
 msgstr "服务器上产生了一个内部错误。\n"
 
-#: clientgui/AdvancedFrame.cpp:96
+#: clientgui/AdvancedFrame.cpp:99
 msgid "Connected"
 msgstr "已连接"
 
-#: clientgui/AdvancedFrame.cpp:104
+#: clientgui/AdvancedFrame.cpp:107
 msgid "Disconnected"
 msgstr "已断开"
 
-#: clientgui/AdvancedFrame.cpp:318
+#: clientgui/AdvancedFrame.cpp:325
+#, c-format
+msgid "New %s window..."
+msgstr "新建 %s 窗口"
+
+#: clientgui/AdvancedFrame.cpp:329
+#, c-format
+msgid "Open another %s window"
+msgstr "打开另一个 %s 窗口"
+
+#: clientgui/AdvancedFrame.cpp:340
+msgid "Select computer..."
+msgstr "选择计算机..."
+
+#: clientgui/AdvancedFrame.cpp:341
+msgid "Connect to a BOINC client on another computer"
+msgstr "连接到另一台计算机上的 BOINC 客户端"
+
+#: clientgui/AdvancedFrame.cpp:345
+msgid "Shut down connected client..."
+msgstr "关闭当前连接的客户端..."
+
+#: clientgui/AdvancedFrame.cpp:346
+msgid "Shut down the currently connected BOINC client"
+msgstr "关闭当前连接到的 BOINC 客户端"
+
+#: clientgui/AdvancedFrame.cpp:351
 #, c-format
 msgid "Close the %s window"
 msgstr "关闭 %s 窗口"
 
-#: clientgui/AdvancedFrame.cpp:321
-msgid "&Close Window"
+#: clientgui/AdvancedFrame.cpp:354
+msgid "&Close window"
 msgstr "关闭窗口(&C)"
 
-#: clientgui/AdvancedFrame.cpp:332
-#: clientgui/AdvancedFrame.cpp:339
-#: clientgui/AdvancedFrame.cpp:346
+#: clientgui/AdvancedFrame.cpp:363 clientgui/AdvancedFrame.cpp:368
+#: clientgui/AdvancedFrame.cpp:373
 #, c-format
 msgid "Exit %s"
 msgstr "退出 %s"
 
-#: clientgui/AdvancedFrame.cpp:359
-msgid "Preferences..."
+#: clientgui/AdvancedFrame.cpp:386
+msgid "Preferences…"
 msgstr "参数设置..."
 
-#: clientgui/AdvancedFrame.cpp:368
+#: clientgui/AdvancedFrame.cpp:395
 msgid "&Notices\tCtrl+Shift+N"
 msgstr "通知(&N)\tCtrl+Shift+N"
 
-#: clientgui/AdvancedFrame.cpp:369
-msgid "Display notices"
-msgstr "显示通知页"
+#: clientgui/AdvancedFrame.cpp:396
+msgid "Show notices"
+msgstr "显示通知"
 
-#: clientgui/AdvancedFrame.cpp:374
+#: clientgui/AdvancedFrame.cpp:401
 msgid "&Projects\tCtrl+Shift+P"
 msgstr "项目(&P)\tCtrl+Shift+P"
 
-#: clientgui/AdvancedFrame.cpp:375
-msgid "Display projects"
-msgstr "显示项目页"
+#: clientgui/AdvancedFrame.cpp:402
+msgid "Show projects"
+msgstr "显示项目"
 
-#: clientgui/AdvancedFrame.cpp:380
+#: clientgui/AdvancedFrame.cpp:407
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr "任务(&T)\tCtrl+Shift+T"
 
-#: clientgui/AdvancedFrame.cpp:381
-msgid "Display tasks"
-msgstr "显示任务页"
+#: clientgui/AdvancedFrame.cpp:408
+msgid "Show tasks"
+msgstr "显示任务"
 
-#: clientgui/AdvancedFrame.cpp:386
+#: clientgui/AdvancedFrame.cpp:413
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr "网络传输(&F)\tCtrl+Shift+X"
 
-#: clientgui/AdvancedFrame.cpp:387
-msgid "Display transfers"
-msgstr "显示网络传输页"
+#: clientgui/AdvancedFrame.cpp:414
+msgid "Show file transfers"
+msgstr "显示文件传输"
 
-#: clientgui/AdvancedFrame.cpp:392
+#: clientgui/AdvancedFrame.cpp:419
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "统计(&S)\tCtrl+Shift+S"
 
-#: clientgui/AdvancedFrame.cpp:393
-msgid "Display statistics"
-msgstr "显示统计页"
+#: clientgui/AdvancedFrame.cpp:420
+msgid "Show statistics"
+msgstr "显示统计信息"
 
-#: clientgui/AdvancedFrame.cpp:398
-msgid "&Disk usage\tCtrl+Shift+D"
-msgstr "磁盘使用情况(&D)\tCtrl+Shift+D"
+#: clientgui/AdvancedFrame.cpp:425
+msgid "&Disk\tCtrl+Shift+D"
+msgstr "磁盘(&D)\tCtrl+Shift+D"
 
-#: clientgui/AdvancedFrame.cpp:399
-msgid "Display disk usage"
-msgstr "显示磁盘使用情况页"
+#: clientgui/AdvancedFrame.cpp:426
+msgid "Show disk usage"
+msgstr "显示磁盘使用情况"
 
-#: clientgui/AdvancedFrame.cpp:406
+#: 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
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr "简易视图(&V)...\tCtrl+Shift+V"
 
-#: clientgui/AdvancedFrame.cpp:407
-msgid "Display the simple graphical interface."
-msgstr "显示简洁的图形界面。"
+#: clientgui/AdvancedFrame.cpp:440
+msgid "Switch to the Simple View"
+msgstr "切换到简易视图"
 
-#: clientgui/AdvancedFrame.cpp:421
+#: clientgui/AdvancedFrame.cpp:454
 msgid "&Add project or account manager..."
 msgstr "增加项目或帐户管理器(&A)..."
 
-#: clientgui/AdvancedFrame.cpp:422
-msgid "Volunteer for any or all of 30+ projects in many areas of science"
-msgstr "志愿加入到一个或多个分布在许多不同科学领域内的研究项目"
+#: clientgui/AdvancedFrame.cpp:455
+msgid "Add a new science project, or use an account manager"
+msgstr "添加一个新的科学项目,或使用帐户管理器"
 
-#: clientgui/AdvancedFrame.cpp:426
+#: clientgui/AdvancedFrame.cpp:459
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "与 %s 进行同步(&S)"
 
-#: clientgui/AdvancedFrame.cpp:430
+#: clientgui/AdvancedFrame.cpp:463
 #, c-format
 msgid "Get current settings from %s"
 msgstr "从 %s 获取当前的参数设定"
 
-#: clientgui/AdvancedFrame.cpp:440
+#: clientgui/AdvancedFrame.cpp:473
 msgid "&Add project..."
 msgstr "增加项目(&A)..."
 
-#: clientgui/AdvancedFrame.cpp:441
+#: clientgui/AdvancedFrame.cpp:474
 msgid "Add a project"
 msgstr "增加一个项目"
 
-#: clientgui/AdvancedFrame.cpp:444
+#: clientgui/AdvancedFrame.cpp:477
 #, c-format
 msgid "S&top using %s..."
 msgstr "停止使用 %s(&S)"
 
-#: clientgui/AdvancedFrame.cpp:450
+#: clientgui/AdvancedFrame.cpp:483
 msgid "Remove this computer from account manager control."
 msgstr "从帐户管理器中移除当前计算机。"
 
-#: clientgui/AdvancedFrame.cpp:455
-msgid "&Options..."
-msgstr "选项(&O)..."
+#: clientgui/AdvancedFrame.cpp:489
+msgid "Run CPU &benchmarks"
+msgstr "运行 CPU 基准测试(&B)"
 
-#: clientgui/AdvancedFrame.cpp:456
-msgid "Configure display options and proxy settings"
-msgstr "配置界面及代理服务器选项"
+#: clientgui/AdvancedFrame.cpp:490
+msgid "Run tests that measure CPU speed"
+msgstr "运行测试以测量 CPU 速度"
 
-#: clientgui/AdvancedFrame.cpp:460
-msgid "Computing &preferences..."
-msgstr "计算参数设置(&P)..."
+#: clientgui/AdvancedFrame.cpp:494
+msgid "Retry pending transfers"
+msgstr "重新尝试被挂起的传输"
 
-#: clientgui/AdvancedFrame.cpp:461
-msgid "Configure computing preferences"
-msgstr "修改计算参数设置"
+#: clientgui/AdvancedFrame.cpp:495
+msgid "Retry deferred file transfers and task requests"
+msgstr "重新尝试被延迟的文件传输和任务请求"
 
-#: clientgui/AdvancedFrame.cpp:469
+#: clientgui/AdvancedFrame.cpp:503
 msgid "&Run always"
 msgstr "一直运行(&R)"
 
-#: clientgui/AdvancedFrame.cpp:470
+#: clientgui/AdvancedFrame.cpp:504
 msgid "Allow work regardless of preferences"
 msgstr "运行计算程序且不受参数设置的影响"
 
-#: clientgui/AdvancedFrame.cpp:474
+#: clientgui/AdvancedFrame.cpp:508
 msgid "Run based on &preferences"
 msgstr "依照参数运行(&P)"
 
-#: clientgui/AdvancedFrame.cpp:475
+#: clientgui/AdvancedFrame.cpp:509
 msgid "Allow work according to preferences"
 msgstr "运行计算程序且依照用户的参数设置"
 
-#: clientgui/AdvancedFrame.cpp:479
+#: clientgui/AdvancedFrame.cpp:513
 msgid "&Suspend"
 msgstr "暂停(&S)"
 
-#: clientgui/AdvancedFrame.cpp:480
+#: clientgui/AdvancedFrame.cpp:514
 msgid "Stop work regardless of preferences"
 msgstr "暂停计算程序且不受参数设置的影响"
 
-#: clientgui/AdvancedFrame.cpp:505
+#: clientgui/AdvancedFrame.cpp:539
 msgid "Use GPU always"
 msgstr "总是使用 GPU"
 
-#: clientgui/AdvancedFrame.cpp:506
+#: clientgui/AdvancedFrame.cpp:540
 msgid "Allow GPU work regardless of preferences"
 msgstr "使用 GPU 且不受参数设置的影响"
 
-#: clientgui/AdvancedFrame.cpp:510
+#: clientgui/AdvancedFrame.cpp:544
 msgid "Use GPU based on preferences"
 msgstr "依照参数使用 GPU"
 
-#: clientgui/AdvancedFrame.cpp:511
+#: clientgui/AdvancedFrame.cpp:545
 msgid "Allow GPU work according to preferences"
 msgstr "运行 GPU 计算程序且依照用户的参数设置"
 
-#: clientgui/AdvancedFrame.cpp:515
+#: clientgui/AdvancedFrame.cpp:549
 msgid "Suspend GPU"
 msgstr "暂停 GPU"
 
-#: clientgui/AdvancedFrame.cpp:516
+#: clientgui/AdvancedFrame.cpp:550
 msgid "Stop GPU work regardless of preferences"
 msgstr "暂停使用 GPU 且不受参数设置的影响"
 
-#: clientgui/AdvancedFrame.cpp:540
-msgid "Network activity always available"
-msgstr "网络总是可用"
+#: clientgui/AdvancedFrame.cpp:574
+msgid "Network activity always allowed"
+msgstr "总是允许网络活动"
 
-#: clientgui/AdvancedFrame.cpp:541
+#: clientgui/AdvancedFrame.cpp:575
 msgid "Allow network activity regardless of preferences"
 msgstr "允许使用网络且不受参数设置的影响"
 
-#: clientgui/AdvancedFrame.cpp:545
+#: clientgui/AdvancedFrame.cpp:579
 msgid "Network activity based on preferences"
 msgstr "依照参数使用网络"
 
-#: clientgui/AdvancedFrame.cpp:546
+#: clientgui/AdvancedFrame.cpp:580
 msgid "Allow network activity according to preferences"
 msgstr "允许使用网络且依照用户的参数设置"
 
-#: clientgui/AdvancedFrame.cpp:550
+#: clientgui/AdvancedFrame.cpp:584
 msgid "Network activity suspended"
 msgstr "暂停使用网络"
 
-#: clientgui/AdvancedFrame.cpp:551
+#: clientgui/AdvancedFrame.cpp:585
 msgid "Stop BOINC network activity"
 msgstr "暂停使用网络且不受参数设置的影响"
 
-#: clientgui/AdvancedFrame.cpp:561
-#, c-format
-msgid "Connect to another computer running %s"
-msgstr "连接到另外一台运行 %s 的计算机"
+#: clientgui/AdvancedFrame.cpp:594
+msgid "Computing &preferences..."
+msgstr "计算参数设置(&P)..."
 
-#: clientgui/AdvancedFrame.cpp:566
-msgid "Select computer..."
-msgstr "选择计算机..."
+#: clientgui/AdvancedFrame.cpp:595
+msgid "Configure computing preferences"
+msgstr "修改计算参数设置"
 
-#: clientgui/AdvancedFrame.cpp:571
-msgid "Shut down connected client..."
-msgstr "关闭当前连接的客户端..."
+#: clientgui/AdvancedFrame.cpp:600
+msgid "Exclusive applications..."
+msgstr "互斥应用程序..."
 
-#: clientgui/AdvancedFrame.cpp:572
-msgid "Shut down the currently connected client"
-msgstr "关闭当前连接的客户端"
+#: clientgui/AdvancedFrame.cpp:601
+msgid "Configure exclusive applications"
+msgstr "设置互斥应用程序"
 
-#: clientgui/AdvancedFrame.cpp:576
-msgid "Run CPU &benchmarks"
-msgstr "运行 CPU 基准测试(&B)"
+#: clientgui/AdvancedFrame.cpp:606
+msgid "Select columns..."
+msgstr "选择列..."
+
+#: clientgui/AdvancedFrame.cpp:607
+msgid "Select which columns to display"
+msgstr "选择要显示的列"
+
+#: clientgui/AdvancedFrame.cpp:611
+msgid "Event Log options...\tCtrl+Shift+F"
+msgstr "事件日志选项...\tCtrl+Shift+F"
 
-#: clientgui/AdvancedFrame.cpp:577
-msgid "Runs BOINC CPU benchmarks"
-msgstr "运行 BOINC 的 CPU 基准测试"
+#: clientgui/AdvancedFrame.cpp:612
+msgid "Enable or disable various diagnostic messages"
+msgstr "启用或禁用各种诊断信息"
 
-#: clientgui/AdvancedFrame.cpp:581
-msgid "Do network communication"
-msgstr "进行网络通讯"
+#: clientgui/AdvancedFrame.cpp:616
+msgid "&Other options..."
+msgstr "(&O)其他选项..."
 
-#: clientgui/AdvancedFrame.cpp:582
-msgid "Do all pending network communication"
-msgstr "执行所有等待中的网络通讯请求"
+#: clientgui/AdvancedFrame.cpp:617
+msgid "Configure display options and network settings"
+msgstr "设置显示选项和网络设置"
 
-# 94%
-#: clientgui/AdvancedFrame.cpp:586
+#: clientgui/AdvancedFrame.cpp:622
 msgid "Read config files"
 msgstr "读取配置文件"
 
-#: clientgui/AdvancedFrame.cpp:587
-msgid "Read configuration info from cc_config.xml and any app_config.xml files"
+#: clientgui/AdvancedFrame.cpp:623
+msgid ""
+"Read configuration info from cc_config.xml and any app_config.xml files"
 msgstr "从 cc_config.xml 和 app_config.xml 中读取配置信息"
 
-#: clientgui/AdvancedFrame.cpp:591
+#: clientgui/AdvancedFrame.cpp:627
 msgid "Read local prefs file"
 msgstr "读取本地参数设置文件"
 
-#: clientgui/AdvancedFrame.cpp:592
+#: clientgui/AdvancedFrame.cpp:628
 msgid "Read preferences from global_prefs_override.xml."
 msgstr "从 global_prefs_override.xml 中读取本地参数设置。"
 
-#: clientgui/AdvancedFrame.cpp:597
-#, c-format
-msgid "Launch another instance of %s..."
-msgstr "运行另一个 %s 实例..."
-
-#: clientgui/AdvancedFrame.cpp:601
-#, c-format
-msgid "Launch another %s"
-msgstr "启动另一个 %s"
-
-#: clientgui/AdvancedFrame.cpp:611
-msgid "Event Log...\tCtrl+Shift+E"
-msgstr "事件日志...\tCtrl+Shift+E"
-
-#: clientgui/AdvancedFrame.cpp:612
-msgid "Display diagnostic messages."
-msgstr "显示诊断消息。"
-
-#: clientgui/AdvancedFrame.cpp:616
-msgid "Event Log Diagnostic Flags...\tCtrl+Shift+F"
-msgstr "事件日志诊断标志...\tCtrl+Shift+F"
-
-#: clientgui/AdvancedFrame.cpp:617
-msgid "Enable or disable various diagnostic messages"
-msgstr "启用或禁用各类诊断信息"
-
-#: clientgui/AdvancedFrame.cpp:626
+#: clientgui/AdvancedFrame.cpp:636
 #, c-format
 msgid "%s &help"
 msgstr "%s 帮助(&H)"
 
-#: clientgui/AdvancedFrame.cpp:632
+#: clientgui/AdvancedFrame.cpp:640
 #, c-format
 msgid "Show information about %s"
 msgstr "查看 %s 的信息"
 
-#: clientgui/AdvancedFrame.cpp:644
+#: clientgui/AdvancedFrame.cpp:650
 #, c-format
 msgid "&%s help"
 msgstr "%s 帮助"
 
-#: clientgui/AdvancedFrame.cpp:650
+#: clientgui/AdvancedFrame.cpp:654
 #, c-format
 msgid "Show information about the %s"
 msgstr "查看 %s 的信息"
 
-#: clientgui/AdvancedFrame.cpp:662
+#: clientgui/AdvancedFrame.cpp:665
 #, c-format
 msgid "%s &web site"
 msgstr "%s 网站(&W)"
 
-#: clientgui/AdvancedFrame.cpp:668
+#: clientgui/AdvancedFrame.cpp:669
 #, c-format
 msgid "Show information about BOINC and %s"
 msgstr "查看 BOINC 和 %s 的信息"
 
-#: clientgui/AdvancedFrame.cpp:680
-#: clientgui/BOINCTaskBar.cpp:544
+#: clientgui/AdvancedFrame.cpp:680 clientgui/BOINCTaskBar.cpp:544
 #, c-format
 msgid "&About %s..."
 msgstr "关于 %s (&A)..."
@@ -537,27 +541,27 @@ msgid "&View"
 msgstr "视图(&V)"
 
 #: clientgui/AdvancedFrame.cpp:701
-msgid "&Tools"
-msgstr "工具(&T)"
-
-#: clientgui/AdvancedFrame.cpp:705
 msgid "&Activity"
 msgstr "活动(&A)"
 
+#: clientgui/AdvancedFrame.cpp:705
+msgid "&Options"
+msgstr "选项(&O)"
+
 #: clientgui/AdvancedFrame.cpp:709
-msgid "A&dvanced"
-msgstr "高级(&D)"
+msgid "&Tools"
+msgstr "工具(&T)"
 
 #: clientgui/AdvancedFrame.cpp:713
 msgid "&Help"
 msgstr "帮助(&H)"
 
-#: clientgui/AdvancedFrame.cpp:1185
+#: clientgui/AdvancedFrame.cpp:1188
 #, c-format
 msgid "%s - Stop using %s"
 msgstr "%s - 停止使用 %s"
 
-#: clientgui/AdvancedFrame.cpp:1190
+#: clientgui/AdvancedFrame.cpp:1193
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -565,48 +569,41 @@ msgid ""
 "but you'll have to manage projects manually.\n"
 "\n"
 "Do you want to stop using %s?"
-msgstr ""
-"如果您退出 %s,\n"
-"您当前所有的计算项目将会保留,\n"
-"但您将必须手动对它们进行管理。\n"
-"\n"
-"您确定要退出 %s 吗?"
+msgstr "如果您退出 %s,\n您当前所有的计算项目将会保留,\n但您将必须手动对它们进行管理。\n\n您确定要退出 %s 吗?"
 
-#: clientgui/AdvancedFrame.cpp:1397
+#: clientgui/AdvancedFrame.cpp:1420
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s - 关闭当前连接的客户端..."
 
-#: clientgui/AdvancedFrame.cpp:1406
+#: clientgui/AdvancedFrame.cpp:1429
 #, c-format
 msgid ""
 "%s will shut down the current client\n"
 "and prompt you for another host to connect to."
-msgstr ""
-"%s 将要关闭当前连接的客户端,\n"
-"然后会提示您输入想要连接的客户端。"
+msgstr "%s 将要关闭当前连接的客户端,\n然后会提示您输入想要连接的客户端。"
 
-#: clientgui/AdvancedFrame.cpp:1806
+#: clientgui/AdvancedFrame.cpp:1832
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: clientgui/AdvancedFrame.cpp:1815
+#: clientgui/AdvancedFrame.cpp:1841
 #, c-format
 msgid "%s has successfully added %s"
 msgstr "%s 已经成功地加入了 %s"
 
-#: clientgui/AdvancedFrame.cpp:1953
+#: clientgui/AdvancedFrame.cpp:1977
 #, c-format
 msgid "%s - (%s)"
 msgstr "%s - (%s)"
 
-#: clientgui/AdvancedFrame.cpp:1957
+#: clientgui/AdvancedFrame.cpp:1981
 #, c-format
 msgid "Connecting to %s"
 msgstr "正在连接至 %s"
 
-#: clientgui/AdvancedFrame.cpp:1960
+#: clientgui/AdvancedFrame.cpp:1984
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "已连接至 %s ( %s )"
@@ -621,10 +618,7 @@ msgid ""
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"已有一个帐户使用了该用户名并且其密码与您输入的不同。\n"
-"\n"
-"请访问项目网站并按照上面的说明进行操作。"
+msgstr "已有一个帐户使用了该用户名并且其密码与您输入的不同。\n\n请访问项目网站并按照上面的说明进行操作。"
 
 #: clientgui/AlreadyExistsPage.cpp:191
 msgid "Email address already in use"
@@ -636,10 +630,7 @@ msgid ""
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"已有一个帐户使用了该电子邮件地址并且其密码与您输入的不同。\n"
-"\n"
-"请访问项目网站并按照上面的说明进行操作。"
+msgstr "已有一个帐户使用了该电子邮件地址并且其密码与您输入的不同。\n\n请访问项目网站并按照上面的说明进行操作。"
 
 #: clientgui/AsyncRPC.cpp:1031
 msgid "Communicating with BOINC client.  Please wait ..."
@@ -664,89 +655,76 @@ msgstr "%s - 网络通讯"
 msgid "Cancel"
 msgstr "取消"
 
-#: clientgui/BOINCBaseFrame.cpp:504
+#: clientgui/BOINCBaseFrame.cpp:512
 #, c-format
 msgid "%s - Connection Error"
 msgstr "%s - 连接错误"
 
-#: clientgui/BOINCBaseFrame.cpp:513
+#: 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 ""
-"您当前未被授权管理本客户端。\n"
-"请联系系统管理员将您添加到名称为 boinc_users 的本地用户组。"
+msgstr "您当前未被授权管理本客户端。\n请联系系统管理员将您添加到名称为 boinc_users 的本地用户组。"
 
-#: clientgui/BOINCBaseFrame.cpp:522
+#: 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 ""
-"连接运行中的客户端时发生验证错误。\n"
-"请务必在该客户端所在的文件目录中运行本程序。"
+msgstr "连接运行中的客户端时发生验证错误。\n请务必在该客户端所在的文件目录中运行本程序。"
 
-#: clientgui/BOINCBaseFrame.cpp:524
+#: clientgui/BOINCBaseFrame.cpp:532
 msgid "Authorization failed connecting to running client."
 msgstr "连接至已运行的客户端时发生验证错误。"
 
-#: clientgui/BOINCBaseFrame.cpp:532
+#: clientgui/BOINCBaseFrame.cpp:540
 msgid "The password you have provided is incorrect, please try again."
 msgstr "您提供的密码不正确,请重试。"
 
-#: clientgui/BOINCBaseFrame.cpp:576
+#: clientgui/BOINCBaseFrame.cpp:584
 #, c-format
 msgid "%s - Connection Failed"
 msgstr "%s - 连接失败"
 
-#: clientgui/BOINCBaseFrame.cpp:585
+#: 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 无法连接至 %s 客户端。\n"
-"您想再连接一次吗?"
+msgstr "%s 无法连接至 %s 客户端。\n您想再连接一次吗?"
 
-#: clientgui/BOINCBaseFrame.cpp:621
+#: clientgui/BOINCBaseFrame.cpp:629
 #, c-format
 msgid "%s - Daemon Start Failed"
 msgstr "%s - 客户端服务程序启动失败"
 
-#: clientgui/BOINCBaseFrame.cpp:631
+#: 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 无法启动 %s 客户端的服务程序。\n"
-"请依次运行 控制面板->管理工具->服务,并从中启动 BOINC 服务。"
+msgstr "%s 无法启动 %s 客户端的服务程序。\n请依次运行 控制面板->管理工具->服务,并从中启动 BOINC 服务。"
 
-#: clientgui/BOINCBaseFrame.cpp:637
+#: 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 无法启动 %s 客户端的服务程序。\n"
-"请手工启动服务程序后再重试。"
+msgstr "%s 无法启动 %s 客户端的服务程序。\n请手工启动服务程序后再重试。"
 
-#: clientgui/BOINCBaseFrame.cpp:688
+#: clientgui/BOINCBaseFrame.cpp:696
 #, c-format
 msgid "%s - Connection Status"
 msgstr "%s - 连接状态"
 
-#: clientgui/BOINCBaseFrame.cpp:699
+#: clientgui/BOINCBaseFrame.cpp:707
 #, 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"
 "To connect up to your local computer please use 'localhost' as the host name."
-msgstr ""
-"%s 当前未连接至任何 %s 客户端。\n"
-"请使用菜单中的'高级\\选择计算机...'以连接至一个 %s 客户端。\n"
-"如果要连接至您的本地计算机,请在主机名称中填入'localhost'。"
+msgstr "%s 当前未连接至任何 %s 客户端。\n请使用菜单中的'高级\\选择计算机...'以连接至一个 %s 客户端。\n如果要连接至您的本地计算机,请在主机名称中填入'localhost'。"
 
-#: clientgui/BOINCBaseView.cpp:752
+#: clientgui/BOINCBaseView.cpp:790
 msgid "Project web pages"
 msgstr "项目网页"
 
@@ -760,9 +738,7 @@ msgstr "%s - 异常退出"
 msgid ""
 "The %s client has exited unexpectedly 3 times within the last %d minutes.\n"
 "Would you like to restart it again?"
-msgstr ""
-"%s 的客户端在最近的 %d 分钟内已经异常退出三次。\n"
-"您希望再次重启该客户端吗?"
+msgstr "%s 的客户端在最近的 %d 分钟内已经异常退出三次。\n您希望再次重启该客户端吗?"
 
 #: clientgui/BOINCDialupManager.cpp:61
 #, c-format
@@ -774,9 +750,7 @@ msgstr "%s - 网络状态"
 msgid ""
 "%s needs to connect to the Internet.\n"
 "May it do so now?"
-msgstr ""
-"%s 需要连接至互联网。\n"
-"现在就进行连接吗?"
+msgstr "%s 需要连接至互联网。\n现在就进行连接吗?"
 
 #: clientgui/BOINCDialupManager.cpp:254
 #, c-format
@@ -798,9 +772,7 @@ msgstr "%s 连接至互联网失败。"
 msgid ""
 "%s has detected it is now connected to the Internet.\n"
 "Updating all projects and retrying all transfers."
-msgstr ""
-"%s 已经检测到与互联网的连接。\n"
-"请更新所有项目并重试所有网络传输。"
+msgstr "%s 已经检测到与互联网的连接。\n请更新所有项目并重试所有网络传输。"
 
 #: clientgui/BOINCDialupManager.cpp:417
 #, c-format
@@ -812,7 +784,7 @@ msgstr "%s 已经成功地断开至互联网的连接。"
 msgid "%s failed to disconnected from the Internet."
 msgstr "%s 断开至互联网的连接失败。"
 
-#: clientgui/BOINCGUIApp.cpp:595
+#: clientgui/BOINCGUIApp.cpp:597
 #, c-format
 msgid ""
 "You currently are not authorized to manage the client.\n"
@@ -823,99 +795,90 @@ msgid ""
 " or\n"
 "  - contact your administrator to add you to the 'boinc_master'\n"
 "     user group."
-msgstr ""
-"您当前未被授权管理本客户端。\n"
-"\n"
-"要在当前用户下运行 %s,请:\n"
-" - 重新安装 %s,在被问到关于非系统管理员用户的问题时,回答\"是\"\n"
-" - 联系系统管理员将您加入到“boinc_master”用户组。"
+msgstr "您当前未被授权管理本客户端。\n\n要在当前用户下运行 %s,请:\n - 重新安装 %s,在被问到关于非系统管理员用户的问题时,回答\"是\"\n - 联系系统管理员将您加入到“boinc_master”用户组。"
 
-#: clientgui/BOINCGUIApp.cpp:601
+#: clientgui/BOINCGUIApp.cpp:603
 #, c-format
 msgid ""
 "%s ownership or permissions are not set properly; please reinstall %s.\n"
 "(Error code %d"
-msgstr ""
-"%s 相关的本地用户权限设置有误,请重新安装 %s。\n"
-"( 错误代码 %d )"
+msgstr "%s 相关的本地用户权限设置有误,请重新安装 %s。\n( 错误代码 %d )"
 
-#: clientgui/BOINCGUIApp.cpp:607
+#: clientgui/BOINCGUIApp.cpp:609
 msgid " at "
 msgstr " 位置 "
 
-#: clientgui/BOINCGUIApp.cpp:610
+#: clientgui/BOINCGUIApp.cpp:612
 msgid ")"
 msgstr ")"
 
-#: clientgui/BOINCGUIApp.cpp:640
+#: 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 ""
-"BOINC 需要在计算机重新启动后才能正常运行。\n"
-"请您先重启计算机再重试当前的操作。"
+msgstr "BOINC 需要在计算机重新启动后才能正常运行。\n请您先重启计算机再重试当前的操作。"
 
-#: clientgui/BOINCGUIApp.cpp:641
+#: clientgui/BOINCGUIApp.cpp:643
 msgid "BOINC Manager"
 msgstr "BOINC Manager"
 
-#: clientgui/BOINCGUIApp.cpp:902
+#: clientgui/BOINCGUIApp.cpp:904
 msgid "BOINC Manager was started by the operating system automatically"
 msgstr "BOINC Manager 已经由操作系统自动运行"
 
-#: clientgui/BOINCGUIApp.cpp:904
+#: clientgui/BOINCGUIApp.cpp:906
 msgid "Startup BOINC so only the system tray icon is visible"
 msgstr "启动 BOINC 时仅显示在系统托盘区"
 
-#: clientgui/BOINCGUIApp.cpp:906
+#: clientgui/BOINCGUIApp.cpp:908
 msgid "Directory containing the BOINC Client executable"
 msgstr "包含 BOINC 客户端执行程序的目录"
 
-#: clientgui/BOINCGUIApp.cpp:907
+#: clientgui/BOINCGUIApp.cpp:909
 msgid "BOINC data directory"
 msgstr "BOINC 数据目录"
 
-#: clientgui/BOINCGUIApp.cpp:909
+#: clientgui/BOINCGUIApp.cpp:911
 msgid "Host name or IP address"
 msgstr "主机名称或 IP 地址"
 
-#: clientgui/BOINCGUIApp.cpp:910
+#: clientgui/BOINCGUIApp.cpp:912
 msgid "GUI RPC port number"
 msgstr "图形界面 RPC 端口号"
 
-#: clientgui/BOINCGUIApp.cpp:911
+#: clientgui/BOINCGUIApp.cpp:913
 msgid "Password"
 msgstr "用户口令"
 
-#: clientgui/BOINCGUIApp.cpp:912
+#: clientgui/BOINCGUIApp.cpp:914
 msgid "Startup BOINC with these optional arguments"
 msgstr "使用可选参数来启动 BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:913
+#: clientgui/BOINCGUIApp.cpp:915
 msgid "disable BOINC security users and permissions"
 msgstr "禁用 BOINC 中用户和权限相关的安全选项"
 
-#: clientgui/BOINCGUIApp.cpp:914
+#: clientgui/BOINCGUIApp.cpp:916
 msgid "set skin debugging mode to enable skin manager error messages"
 msgstr "设置皮肤调试模式已启用皮肤管理器的错误消息记录"
 
-#: clientgui/BOINCGUIApp.cpp:915
+#: clientgui/BOINCGUIApp.cpp:917
 msgid "multiple instances of BOINC Manager allowed"
 msgstr "允许运行多个 BOINC Manager 的实例"
 
-#: clientgui/BOINCGUIApp.cpp:917
+#: clientgui/BOINCGUIApp.cpp:919
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr "未使用:用于临时修复 XCode 4.2 的错误"
 
-#: clientgui/BOINCGUIApp.cpp:1164
+#: clientgui/BOINCGUIApp.cpp:1166
 msgid "(Automatic Detection)"
 msgstr "( 自动检测 )"
 
-#: clientgui/BOINCGUIApp.cpp:1165
+#: clientgui/BOINCGUIApp.cpp:1167
 msgid "(Unknown)"
 msgstr "( 未知 )"
 
-#: clientgui/BOINCGUIApp.cpp:1166
+#: clientgui/BOINCGUIApp.cpp:1168
 msgid "(User Defined)"
 msgstr "( 用户自定义 )"
 
@@ -929,14 +892,12 @@ msgstr "打开 %s 的网站..."
 msgid "Open %s..."
 msgstr "打开 %s..."
 
-#: clientgui/BOINCTaskBar.cpp:536
-#: clientgui/BOINCTaskBar.cpp:633
+#: clientgui/BOINCTaskBar.cpp:536 clientgui/BOINCTaskBar.cpp:633
 #: clientgui/BOINCTaskBar.cpp:641
 msgid "Snooze"
 msgstr "休息一下"
 
-#: clientgui/BOINCTaskBar.cpp:538
-#: clientgui/BOINCTaskBar.cpp:660
+#: clientgui/BOINCTaskBar.cpp:538 clientgui/BOINCTaskBar.cpp:660
 #: clientgui/BOINCTaskBar.cpp:668
 msgid "Snooze GPU"
 msgstr "让 GPU 休息一下"
@@ -1015,15 +976,10 @@ msgid ""
 "Please try again later.\n"
 "\n"
 "Click Finish to close."
-msgstr ""
-"请稍后重试。\n"
-"\n"
-"点击完成以关闭。"
+msgstr "请稍后重试。\n\n点击完成以关闭。"
 
-#: 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 "点击完成以关闭向导。"
 
@@ -1089,498 +1045,512 @@ msgstr "wxWidgets 版本:"
 msgid "Copyright:"
 msgstr "版权所有:"
 
-# 98%
 #: clientgui/DlgAbout.cpp:192
 msgid ""
-"(C) 2003-2014 University of California, Berkeley.\n"
+"(C) 2003-2015 University of California, Berkeley.\n"
 "All Rights Reserved."
-msgstr ""
-"(C) 2003-2014 加州大学伯克利分校。\n"
-"保留所有权利。\n"
-"\n"
-"( 中文翻译: 2005-2014 Yin Gang @ Team China )\n"
-"( 中文网站: http://www.equn.com )\n"
-"( 中文论坛: http://www.equn.com/forum )\n"
-"( 新浪微博: @志愿计算 )"
+msgstr "(C) 2003-2015 加州大学伯克利分校。 \n保留所有权利。"
 
 #: clientgui/DlgAbout.cpp:196
-msgid "Berkeley Open Infrastructure for Network Computing"
-msgstr "伯克利开放式网络计算平台 ( BOINC )"
+msgid "BOINC is distributed under the GNU Lesser General Public License v3.0."
+msgstr "BOINC以GNU较宽松通用公共许可证 (LGPL) v3.0为授权协议而发布"
 
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:399
+#: clientgui/DlgAbout.cpp:203
+msgid "Visit "
+msgstr "访问"
+
+#: clientgui/DlgAbout.cpp:211
+msgid "for more information."
+msgstr "以获取更多的信息。"
+
+#: clientgui/DlgAbout.cpp:219 clientgui/DlgExitMessage.cpp:173
+#: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:399
 #: clientgui/DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "确定(&O)"
 
-#: clientgui/DlgAdvPreferences.cpp:602
-msgid "invalid number"
+#: clientgui/DlgAdvPreferences.cpp:669
+msgid "Invalid number"
 msgstr "无效的数字"
 
-#: clientgui/DlgAdvPreferences.cpp:603
-msgid "invalid time, format is HH:MM"
-msgstr "错误的时间,正确格式应该是 HH:MM"
+#: clientgui/DlgAdvPreferences.cpp:670
+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
+msgid "Number must be between 0 and 10"
+msgstr "必须是0到10之间的数字"
 
-#: clientgui/DlgAdvPreferences.cpp:604
-msgid "invalid time interval, format is HH:MM-HH:MM"
-msgstr "错误的时间间隔,正确格式应该是 HH:MM-HH:MM"
+#: clientgui/DlgAdvPreferences.cpp:672
+msgid "Number must be between 0 and 100"
+msgstr "数字必须介于 0 和 100 之间"
 
-#: clientgui/DlgAdvPreferences.cpp:817
+#: clientgui/DlgAdvPreferences.cpp:905
 msgid "invalid input value detected"
 msgstr "检测到错误的输入值"
 
-#: clientgui/DlgAdvPreferences.cpp:819
+#: clientgui/DlgAdvPreferences.cpp:907
 msgid "Validation Error"
 msgstr "验证错误"
 
-#: clientgui/DlgAdvPreferences.cpp:969
-#: clientgui/DlgAdvPreferences.cpp:975
-#: clientgui/DlgAdvPreferences.cpp:981
-msgid "Applications to add"
-msgstr "待添加的应用程序"
-
-#: clientgui/DlgAdvPreferences.cpp:998
-#, c-format
-msgid "'%s' is not an executable application."
-msgstr "“%s”不是一个可执行的应用程序。"
+#: clientgui/DlgAdvPreferences.cpp:1119
+msgid "Discard local preferences and use web-based preferences?"
+msgstr "放弃本地首选项并使用网上的首选项吗?"
 
-#: clientgui/DlgAdvPreferences.cpp:999
-#: clientgui/DlgAdvPreferences.cpp:1046
-#: clientgui/DlgAdvPreferences.cpp:1070
-msgid "Add Exclusive App"
-msgstr "添加互斥应用程序"
-
-#: clientgui/DlgAdvPreferences.cpp:1011
-msgid "Name of application to add?"
-msgstr "待添加的应用程序的名称?"
-
-#: clientgui/DlgAdvPreferences.cpp:1011
-msgid "Add exclusive app"
-msgstr "添加互斥应用程序"
-
-#: clientgui/DlgAdvPreferences.cpp:1045
-#, c-format
-msgid "Application names must end with '%s'"
-msgstr "应用程序的名称必须以“%s”结尾"
+#: clientgui/DlgAdvPreferences.cpp:1120
+msgid "Confirmation"
+msgstr "确认"
 
-#: clientgui/DlgAdvPreferences.cpp:1069
+#: clientgui/DlgAdvPreferencesBase.cpp:54
 #, c-format
-msgid "'%s' is already in the list."
-msgstr "“%s”已经在列表内了。"
+msgid "%s - Computing preferences"
+msgstr "%s -计算参数设置"
 
-#: clientgui/DlgAdvPreferences.cpp:1161
+#: clientgui/DlgAdvPreferencesBase.cpp:77
 msgid ""
-"Do you really want to clear all local preferences?\n"
-"(This will not affect exclusive applications.)"
-msgstr ""
-"你确定想要清除所有本地参数设置吗?\n"
-"(不会对互斥应用程序的设置有影响)"
+"Using local preferences.\n"
+"Click \"Use web prefs\" to use web-based preferences from"
+msgstr "使用本地首选项。\n单击\"使用 web 首选项\"可使用来自下列网站的首选项"
 
-#: clientgui/DlgAdvPreferences.cpp:1162
-msgid "Confirmation"
-msgstr "确认"
+#: clientgui/DlgAdvPreferencesBase.cpp:85
+msgid "Using web-based preferences from"
+msgstr "使用来自下列网站的首选项"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:49
-#, c-format
-msgid "%s - Computing preferences"
-msgstr "%s - 计算参数"
+#: clientgui/DlgAdvPreferencesBase.cpp:102
+msgid "Set values and click OK to use local preferences instead."
+msgstr "设置数值,并单击确定以改用本地首选项。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:66
+#: clientgui/DlgAdvPreferencesBase.cpp:111
 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 ""
-"本对话框中的参数设置仅用于本计算机。\n"
-"点击“确定”即可保存并应用对话框中的相关设置。\n"
-"点击“清除”即可恢复使用项目网站上的参数设置(不包括关于互斥应用程序的设置)。"
+"Click Clear to restore web-based settings."
+msgstr "本对话框中的参数设置仅用于本计算机。\n点击“确定”即可保存并应用对话框中的相关设置。\n点击“清除”即可恢复使用项目网站上的参数设置。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:69
+#: clientgui/DlgAdvPreferencesBase.cpp:114
 msgid "Clear"
 msgstr "清除"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:70
-msgid "clear all local preferences and close the dialog"
+#: clientgui/DlgAdvPreferencesBase.cpp:115
+msgid "Clear all local preferences and close the dialog."
 msgstr "清除所有本地的参数设置并关闭对话框"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:85
-msgid "processor usage"
-msgstr "处理器使用"
+#: clientgui/DlgAdvPreferencesBase.cpp:118
+msgid "Use web prefs"
+msgstr "使用项目网站上的设置"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:119
+msgid "Restore web-based preferences and close the dialog."
+msgstr "恢复使用项目网站上的参数设置并关闭对话框"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:143
+#: clientgui/DlgAdvPreferencesBase.cpp:637
+msgid "Computing"
+msgstr "正在计算"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:88
-msgid "network usage"
-msgstr "网络使用"
+#: clientgui/DlgAdvPreferencesBase.cpp:146
+#: clientgui/DlgAdvPreferencesBase.cpp:785
+msgid "Network"
+msgstr "网络"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:91
-msgid "disk and memory usage"
-msgstr "磁盘和内存使用"
+#: clientgui/DlgAdvPreferencesBase.cpp:149
+msgid "Disk and memory"
+msgstr "磁盘和内存"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:94
-msgid "exclusive applications"
-msgstr "互斥应用程序"
+#: clientgui/DlgAdvPreferencesBase.cpp:152
+msgid "Daily schedules"
+msgstr "每日计划"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:107
-#: clientgui/DlgDiagnosticLogFlags.cpp:104
+#: clientgui/DlgAdvPreferencesBase.cpp:165
+#: clientgui/DlgDiagnosticLogFlags.cpp:119 clientgui/DlgExclusiveApps.cpp:146
+#: clientgui/DlgHiddenColumns.cpp:100
 msgid "OK"
 msgstr "确定"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:108
-msgid "save all values and close the dialog"
+#: clientgui/DlgAdvPreferencesBase.cpp:166
+msgid "Save all values and close the dialog."
 msgstr "保存所有参数值并关闭对话框"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:114
-msgid "close the dialog without saving"
-msgstr "关闭对话框且不进行任何保存"
+#: clientgui/DlgAdvPreferencesBase.cpp:172
+msgid "Close the dialog without saving."
+msgstr "放弃更改并关闭对话框"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:118
-#: clientgui/Localization.cpp:35
-#: clientgui/Localization.cpp:121
-#: clientgui/Localization.cpp:139
+#: clientgui/DlgAdvPreferencesBase.cpp:176 clientgui/DlgExclusiveApps.cpp:157
 msgid "Help"
 msgstr "帮助"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
-msgid "shows the preferences web page"
+#: clientgui/DlgAdvPreferencesBase.cpp:177
+msgid "Shows the preferences web page."
 msgstr "显示参数设置网页"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:141
-msgid "Computing allowed"
-msgstr "允许计算的情况"
+#: clientgui/DlgAdvPreferencesBase.cpp:239
+#: clientgui/DlgAdvPreferencesBase.cpp:425
+msgid "Usage limits"
+msgstr "使用率限制"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
-msgid "While computer is on batteries"
-msgstr "电池供电时"
+#: clientgui/DlgAdvPreferencesBase.cpp:244
+#, 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:149
-msgid "check this if you want this computer to do work while it runs on batteries"
-msgstr "如果您希望在电池供电时仍进行计算请选上"
+#: clientgui/DlgAdvPreferencesBase.cpp:246
+#: clientgui/DlgAdvPreferencesBase.cpp:258
+msgid "Use at most"
+msgstr "最多使用"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:155
-msgid "While computer is in use"
-msgstr "使用计算机时"
+#: clientgui/DlgAdvPreferencesBase.cpp:251
+#, no-c-format
+msgid "% of the CPUs"
+msgstr "%的CPU"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:158
-msgid "check this if you want this computer to do work even when you're using it"
-msgstr "如果您希望在您使用计算机的时候仍进行计算请选上"
+#: clientgui/DlgAdvPreferencesBase.cpp:256
+#, 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."
+msgstr "每隔几秒钟就暂停一下然后恢复计算,以降低CPU温度并减少电能使用。比如:75%意味着每计算 3 秒就暂停 1 秒,然后如此重复。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:164
-msgid "Use GPU while computer is in use"
-msgstr "在使用计算机时仍运行 GPU 计算程序"
+#: clientgui/DlgAdvPreferencesBase.cpp:263
+#, no-c-format
+msgid "% of CPU time"
+msgstr "% 的处理器时间"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:167
-msgid "check this if you want your GPU to do work even when you're using the computer"
-msgstr "如果您希望在使用计算机的时候仍运行 GPU 版计算程序请选中此项"
+#: clientgui/DlgAdvPreferencesBase.cpp:270
+msgid "When to suspend"
+msgstr "以下情况暂停计算"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:179
-msgid "Only after computer has been idle for"
-msgstr "仅在计算机空闲多少时间后"
+#: clientgui/DlgAdvPreferencesBase.cpp:276
+msgid "Suspend when computer is on battery"
+msgstr "当计算机正在使用电池供电时暂停计算"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:188
-msgid "do work only after you haven't used the computer for this number of minutes"
-msgstr "仅在您不使用计算机后指定的时间才进行计算"
+#: clientgui/DlgAdvPreferencesBase.cpp:279
+msgid ""
+"Check this to suspend computing on portables when running on battery power."
+msgstr "勾选这个选项以使得笔记本电脑在靠电池电源运行时暂停计算。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:193
-#: clientgui/DlgAdvPreferencesBase.cpp:342
-msgid "minutes"
-msgstr "分钟"
+#: clientgui/DlgAdvPreferencesBase.cpp:285
+msgid "Suspend when computer is in use"
+msgstr "当计算机正在使用时暂停计算"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:212
-msgid "While processor usage is less than"
-msgstr "当处理器的使用率低于百分之"
+#: clientgui/DlgAdvPreferencesBase.cpp:288
+msgid ""
+"Check this to suspend computing and file transfers when you're using the "
+"computer."
+msgstr "勾选这个选项以使得当您使用计算机时暂停计算和文件传输。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:221
-msgid "suspend work if processor usage exceeds this level"
-msgstr "如果处理器使用率超出设置值就暂停计算"
+#: clientgui/DlgAdvPreferencesBase.cpp:294
+msgid "Suspend GPU computing when computer is in use"
+msgstr "当使用计算机时暂停 GPU 计算"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:226
-msgid "percent (0 means no restriction)"
-msgstr "时 (0 表示不限制)"
+#: clientgui/DlgAdvPreferencesBase.cpp:297
+msgid "Check this to suspend GPU computing when you're using the computer."
+msgstr "勾选这个选项以使得当您使用计算机时暂停GPU计算。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:240
-#: clientgui/DlgAdvPreferencesBase.cpp:506
-msgid "Every day between hours of"
-msgstr "每日时间段 从"
+#: clientgui/DlgAdvPreferencesBase.cpp:302
+msgid "This determines when the computer is considered 'in use'."
+msgstr "这将确定在怎样的情况下计算机会被视为“正在使用”。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
-msgid "start work at this time"
-msgstr "开始计算的时间"
+#: clientgui/DlgAdvPreferencesBase.cpp:306
+msgid "'In use' means mouse/keyboard input in last"
+msgstr "如果在最近的多少分钟内有鼠标或键盘操作则认为计算机在使用中"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:248
-#: clientgui/DlgAdvPreferencesBase.cpp:514
-msgid "and"
-msgstr "到"
+#: clientgui/DlgAdvPreferencesBase.cpp:314
+#: clientgui/DlgAdvPreferencesBase.cpp:387
+msgid "minutes"
+msgstr "分钟"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:252
-msgid "stop work at this time"
-msgstr "停止计算的时间"
+#: clientgui/DlgAdvPreferencesBase.cpp:321
+#, c-format
+msgid "Suspend when non-%s CPU usage is above"
+msgstr "当非%s CPU使用率高于多少时暂停"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
-#: clientgui/DlgAdvPreferencesBase.cpp:522
-msgid "(no restriction if equal)"
-msgstr "( 如果相同即表示不进行限制 )"
+#: clientgui/DlgAdvPreferencesBase.cpp:323
+msgid "Suspend computing when your computer is busy running other programs."
+msgstr "当您的计算机正忙于运行其他程序时暂停计算。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:261
-#: clientgui/DlgAdvPreferencesBase.cpp:527
-msgid "Day-of-week override:"
-msgstr "定制每周内各天的可用时间段:"
+#: clientgui/DlgAdvPreferencesBase.cpp:344
+#: clientgui/DlgAdvPreferencesBase.cpp:474
+msgid "Other"
+msgstr "其它"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:266
-#: clientgui/DlgAdvPreferencesBase.cpp:532
-msgid "check box to specify hours for this day of week"
-msgstr "选取以指定每周内的某天以进行可用时间设定"
+#: clientgui/DlgAdvPreferencesBase.cpp:349
+msgid "Store at least enough tasks to keep the computer busy for this long."
+msgstr "存储至少足够使计算机计算如此长时间的任务。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:272
-#: clientgui/DlgAdvPreferencesBase.cpp:538
-msgid "Monday"
-msgstr "周一"
+#: clientgui/DlgAdvPreferencesBase.cpp:352
+msgid "Store at least"
+msgstr "至少存储"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:279
-#: clientgui/DlgAdvPreferencesBase.cpp:545
-msgid "Tuesday"
-msgstr "周二"
+#: clientgui/DlgAdvPreferencesBase.cpp:360
+#: clientgui/DlgAdvPreferencesBase.cpp:376
+msgid "days of work"
+msgstr "天的工作"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:286
-#: clientgui/DlgAdvPreferencesBase.cpp:552
-msgid "Wednesday"
-msgstr "周三"
+#: clientgui/DlgAdvPreferencesBase.cpp:365
+msgid ""
+"Store additional tasks above the minimum level.  Determines how much work is"
+" requested when contacting a project."
+msgstr "在最低限度之上额外存储一些任务。这将决定BOINC客户端在联系一个项目时要求多少新任务。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:293
-#: clientgui/DlgAdvPreferencesBase.cpp:559
-msgid "Thursday"
-msgstr "周四"
+#: clientgui/DlgAdvPreferencesBase.cpp:368
+msgid "Store up to an additional"
+msgstr "额外存储"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:300
-#: clientgui/DlgAdvPreferencesBase.cpp:566
-msgid "Friday"
-msgstr "周五"
+#: clientgui/DlgAdvPreferencesBase.cpp:381
+#, c-format
+msgid "If you run several projects, %s may switch between them this often."
+msgstr "如果您同时运行几个项目,%s 将每隔这么长时间切换一次任务。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:307
-#: clientgui/DlgAdvPreferencesBase.cpp:573
-msgid "Saturday"
-msgstr "周六"
+#: clientgui/DlgAdvPreferencesBase.cpp:383
+msgid "Switch between tasks every"
+msgstr "每隔多少分钟切换任务"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:580
-msgid "Sunday"
-msgstr "周日"
+#: clientgui/DlgAdvPreferencesBase.cpp:391
+msgid ""
+"This controls how often tasks save their state to disk, so that they can be "
+"restarted later."
+msgstr "这个选项决定计算任务向磁盘保存其进度的频繁程度,以便于之后重新启动。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:328
-msgid "Other options"
-msgstr "其它选项"
+#: clientgui/DlgAdvPreferencesBase.cpp:392
+msgid "Request tasks to checkpoint at most every"
+msgstr "要求任务每隔多少分钟储存一次进度"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:336
-msgid "Switch between applications every"
-msgstr "计算程序的切换时间间隔"
+#: clientgui/DlgAdvPreferencesBase.cpp:396
+msgid "seconds"
+msgstr "秒"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:345
-msgid "On multiprocessor systems, use at most"
-msgstr "在多处理器系统上,最多使用"
+#: clientgui/DlgAdvPreferencesBase.cpp:431
+msgid "Limit the download rate of file transfers."
+msgstr "限制文件传输的下载速率。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
-#, no-c-format
-msgid "% of the processors (0 means no restriction)"
-msgstr "% 的处理器(0 表示不限制)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:355
-#: clientgui/DlgAdvPreferencesBase.cpp:618
-#: clientgui/DlgAdvPreferencesBase.cpp:640
-#: clientgui/DlgAdvPreferencesBase.cpp:661
-#: clientgui/DlgAdvPreferencesBase.cpp:683
-#: clientgui/DlgAdvPreferencesBase.cpp:694
-msgid "Use at most"
-msgstr "最多使用"
+#: clientgui/DlgAdvPreferencesBase.cpp:432
+msgid "Limit download rate to"
+msgstr "限制下载速度为"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:362
-#, no-c-format
-msgid "% of CPU time (0 means no restriction)"
-msgstr "% 的 CPU 时间(0表示不限制)"
+#: clientgui/DlgAdvPreferencesBase.cpp:436
+#: clientgui/DlgAdvPreferencesBase.cpp:445
+msgid "KB/second"
+msgstr "KB每秒"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:386
-msgid "General options"
-msgstr "综合选项"
+#: clientgui/DlgAdvPreferencesBase.cpp:440
+msgid "Limit the upload rate of file transfers."
+msgstr "限制文件传输的上传速率。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:395
-msgid "Maximum download rate"
-msgstr "最大下载速率"
+#: clientgui/DlgAdvPreferencesBase.cpp:441
+msgid "Limit upload rate to"
+msgstr "限制上传速率为"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:401
-#: clientgui/DlgAdvPreferencesBase.cpp:410
-msgid "KBytes/second (0 means no restriction)"
-msgstr "KB/秒(0表示不限制)"
+#: clientgui/DlgAdvPreferencesBase.cpp:452
+#, c-format
+msgid "Example: %s should transfer at most 2000 MB of data every 30 days."
+msgstr "例如: 限制%s在30天内最多传输2000 MB数据。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:404
-msgid "Maximum upload rate"
-msgstr "最大上传速率"
+#: clientgui/DlgAdvPreferencesBase.cpp:454
+msgid "Limit usage to"
+msgstr "限制使用量为"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:417
-msgid "Minimum work buffer"
-msgstr "最小任务缓存"
+#: clientgui/DlgAdvPreferencesBase.cpp:458
+msgid "MB every"
+msgstr "MB 每"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:425
-msgid "Try to maintain enough tasks to keep busy for this many days"
-msgstr "至少应保存多少天的计算任务量"
+#: clientgui/DlgAdvPreferencesBase.cpp:462
+msgid "days"
+msgstr "天"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:431
-#: clientgui/DlgAdvPreferencesBase.cpp:449
-msgid "days (maximum value: 10)"
-msgstr "天(最大值:10)"
+#: clientgui/DlgAdvPreferencesBase.cpp:479
+#, 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:437
-msgid "Max additional work buffer"
-msgstr "最大任务缓存"
+#: clientgui/DlgAdvPreferencesBase.cpp:481
+msgid "Skip data verification for image files"
+msgstr "跳过图像文件的数据校验"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:445
-msgid "In addition, maintain enough tasks for up to this many days"
-msgstr "最多应保存多少天的计算任务量"
+#: clientgui/DlgAdvPreferencesBase.cpp:485
+msgid "Confirm before connecting to Internet"
+msgstr "接入互联网前先确认"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:454
-msgid "Transfer at most"
-msgstr "最多传输"
+#: clientgui/DlgAdvPreferencesBase.cpp:486
+#: clientgui/DlgAdvPreferencesBase.cpp:490
+msgid "Useful only if you have a modem, ISDN or VPN connection."
+msgstr "仅 Modem、ISDN 和 VPN 用户需要使用该设置"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:462
-msgid "MBytes every"
-msgstr "MB每"
+#: clientgui/DlgAdvPreferencesBase.cpp:489
+msgid "Disconnect when done"
+msgstr "传输完成后断开连接"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:468
-msgid "days (0 means no restriction)"
-msgstr "天 (0 表示不限制)"
+#: clientgui/DlgAdvPreferencesBase.cpp:516
+msgid "Disk"
+msgstr "磁盘"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:476
-msgid "Skip image file verification"
-msgstr "不对映像文件进行校验"
+#: clientgui/DlgAdvPreferencesBase.cpp:521
+#, c-format
+msgid "%s will use the most restrictive of these settings:"
+msgstr "%s 将使用这些设置中最严格的设置:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:478
-msgid "check this if your Internet provider modifies image files"
-msgstr "如果您的互联网接入服务端修改了镜像文件请选择上"
+#: clientgui/DlgAdvPreferencesBase.cpp:527
+#, c-format
+msgid "Limit the total amount of disk space used by %s."
+msgstr "限制%s使用的磁盘空间总量。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:484
-msgid "Connect options"
-msgstr "网络选项"
+#: clientgui/DlgAdvPreferencesBase.cpp:530
+#: clientgui/DlgAdvPreferencesBase.cpp:554
+msgid "Use no more than"
+msgstr "最多使用"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:487
-msgid "Confirm before connecting to internet"
-msgstr "接入互联网前先确认"
+#: clientgui/DlgAdvPreferencesBase.cpp:534
+msgid "GB"
+msgstr "GB"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
-msgstr "如果选中,在需要连接至互联网时会先显示一个确认对话框"
+#: clientgui/DlgAdvPreferencesBase.cpp:539
+#, c-format
+msgid ""
+"Limit disk usage to leave this much free space on the volume where %s stores"
+" data."
+msgstr "限制%s的磁盘使用,在存储数据的卷上保留如下数量的空闲空间。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:493
-msgid "Disconnect when done"
-msgstr "传输完成后断开连接"
+#: clientgui/DlgAdvPreferencesBase.cpp:542
+msgid "Leave at least"
+msgstr "至少保留"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:495
+#: clientgui/DlgAdvPreferencesBase.cpp:546
+msgid "GB free"
+msgstr "GB可用空间"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:551
+#, c-format
 msgid ""
-"if checked, BOINC hangs up when network usage is done\n"
-"(only relevant for dialup-connection)"
-msgstr "如果选上,BOINC 将在使用完网络后断开连接 ( 仅适用于拨号连接 )"
+"Limit the percentage of disk space used by %s on the volume where it stores "
+"data."
+msgstr "限制%s在存储数据的卷上使用的磁盘空间的百分比。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:501
-msgid "Network usage allowed"
-msgstr "允许使用网络的情况"
+#: clientgui/DlgAdvPreferencesBase.cpp:559
+#, no-c-format
+msgid "% of total"
+msgstr "%"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:510
-msgid "network usage start hour"
-msgstr "开始使用网络的时间"
+#: clientgui/DlgAdvPreferencesBase.cpp:566
+msgid "Memory"
+msgstr "内存(RAM)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:518
-msgid "network usage stop hour"
-msgstr "停止使用网络的时间"
+#: clientgui/DlgAdvPreferencesBase.cpp:571
+#, c-format
+msgid "Limit the memory used by %s when you're using the computer."
+msgstr "限制当您使用计算机时%s 使用的内存。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:610
-#: clientgui/DlgItemProperties.cpp:257
-msgid "Disk usage"
-msgstr "磁盘使用"
+#: clientgui/DlgAdvPreferencesBase.cpp:573
+msgid "When computer is in use, use at most"
+msgstr "当计算机在使用时,最多使用"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:622
-msgid "the maximum disk space used by BOINC (in Gigabytes)"
-msgstr "BOINC 最多可使用的磁盘空间 (GB)"
+#: clientgui/DlgAdvPreferencesBase.cpp:579
+#: clientgui/DlgAdvPreferencesBase.cpp:591
+#: clientgui/DlgAdvPreferencesBase.cpp:607
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:626
-msgid "Gigabytes disk space (0 means no restriction)"
-msgstr "GB磁盘空间 (0表示不限制)"
+#: clientgui/DlgAdvPreferencesBase.cpp:584
+#, c-format
+msgid "Limit the memory used by %s when you're not using the computer."
+msgstr "限制当您未使用计算机时%s 使用的内存。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:629
-msgid "Leave at least"
-msgstr "至少保留"
+#: clientgui/DlgAdvPreferencesBase.cpp:586
+msgid "When computer is not in use, use at most"
+msgstr "当计算机未在使用时,最多使用"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:633
-msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
-msgstr "BOINC 至少需保留的磁盘空余 (GB)"
+#: clientgui/DlgAdvPreferencesBase.cpp:595
+msgid "Leave non-GPU tasks in memory while suspended"
+msgstr "在暂停时将非GPU任务留在内存中"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:637
-msgid "Gigabytes disk space free"
-msgstr "剩余磁盘空间 (GB)"
+#: 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."
+msgstr "如果选中此选项,暂停的任务将会留在内存中,恢复时不会有进度损失。如果未选中,暂停的任务将从内存中被清除,继续计算时从最后一个保存点开始。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
-msgid "BOINC uses at most this percentage of total disk space"
-msgstr "BOINC 最多可使用的磁盘空间比例"
+#: clientgui/DlgAdvPreferencesBase.cpp:600
+#, c-format
+msgid "Limit the swap space (page file) used by %s."
+msgstr "限制 %s 使用的交换空间 (页面文件)大小。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:649
-#, no-c-format
-msgid "% of total disk space"
-msgstr "% 总磁盘空间"
+#: clientgui/DlgAdvPreferencesBase.cpp:602
+msgid "Page/swap file: use at most"
+msgstr "虚拟内存:最多使用"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:652
-msgid "Tasks checkpoint to disk at most every"
-msgstr "任务的最短存盘间隔"
+#: clientgui/DlgAdvPreferencesBase.cpp:627
+msgid "and"
+msgstr "到"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
-msgid "seconds"
-msgstr "秒"
+#: clientgui/DlgAdvPreferencesBase.cpp:628
+msgid "to"
+msgstr "至"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:668
-#, no-c-format
-msgid "% of page file (swap space)"
-msgstr "% 页面文件 ( 交换空间 )"
+#: clientgui/DlgAdvPreferencesBase.cpp:641
+msgid "Compute only during a particular period each day."
+msgstr "仅在每天的特定时间段内计算。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:675
-msgid "Memory usage"
-msgstr "内存使用"
+#: clientgui/DlgAdvPreferencesBase.cpp:644
+msgid "Compute only between"
+msgstr "仅在如下时间段内计算。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
-#, no-c-format
-msgid "% when computer is in use"
-msgstr "% ( 使用计算机时 )"
+#: clientgui/DlgAdvPreferencesBase.cpp:654
+#: clientgui/DlgAdvPreferencesBase.cpp:801
+msgid "Day-of-week override"
+msgstr "自定义每周内各天的可用时间段:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:701
-#, no-c-format
-msgid "% when computer is idle"
-msgstr "% ( 计算机闲置时 )"
+#: clientgui/DlgAdvPreferencesBase.cpp:658
+#: clientgui/DlgAdvPreferencesBase.cpp:805
+msgid "Override the times above on the selected days:"
+msgstr "在一周选定的各天自定义上述时间设置"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:676
+#: clientgui/DlgAdvPreferencesBase.cpp:822
+msgid "Monday"
+msgstr "周一"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:706
-msgid "Leave applications in memory while suspended"
-msgstr "计算程序暂停时驻留在内存"
+#: clientgui/DlgAdvPreferencesBase.cpp:691
+#: clientgui/DlgAdvPreferencesBase.cpp:837
+msgid "Friday"
+msgstr "周五"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:708
-msgid "if checked, suspended work units are left in memory"
-msgstr "如果选中,暂停的计算任务将保留在内存中"
+#: clientgui/DlgAdvPreferencesBase.cpp:704
+#: clientgui/DlgAdvPreferencesBase.cpp:850
+msgid "Tuesday"
+msgstr "周二"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:728
-msgid "Suspend processor and network usage when these applications are running:"
-msgstr "当这些应用程序在运行的时候暂停对处理器和网络的使用:"
+#: clientgui/DlgAdvPreferencesBase.cpp:719
+#: clientgui/DlgAdvPreferencesBase.cpp:865
+msgid "Saturday"
+msgstr "周六"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:738
-msgid "Add..."
-msgstr "添加..."
+#: clientgui/DlgAdvPreferencesBase.cpp:732
+#: clientgui/DlgAdvPreferencesBase.cpp:878
+msgid "Wednesday"
+msgstr "周三"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:739
-msgid "Add an application to this list"
-msgstr "在列表中增加一个应用程序"
+#: clientgui/DlgAdvPreferencesBase.cpp:747
+#: clientgui/DlgAdvPreferencesBase.cpp:893
+msgid "Sunday"
+msgstr "周日"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:744
-msgid "Remove"
-msgstr "删除"
+#: clientgui/DlgAdvPreferencesBase.cpp:760
+#: clientgui/DlgAdvPreferencesBase.cpp:906
+msgid "Thursday"
+msgstr "周四"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:745
-msgid "Remove an application from this list"
-msgstr "从列表中移除一个应用程序"
+#: clientgui/DlgAdvPreferencesBase.cpp:789
+msgid "Transfer files only during a particular period each day."
+msgstr "仅在每天的特定时间段内传输文件。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:754
-msgid "For advanced options, refer to "
-msgstr "要访问更多高级选项,请前往"
+#: clientgui/DlgAdvPreferencesBase.cpp:791
+msgid "Transfer files only between"
+msgstr "传输文件的时间段:"
 
 #: clientgui/DlgDiagnosticLogFlags.cpp:65
 #, c-format
@@ -1588,93 +1558,171 @@ msgid "%s Diagnostic Log Flags"
 msgstr "%s 诊断日志标志"
 
 #: clientgui/DlgDiagnosticLogFlags.cpp:83
-msgid "These flags enable various types of diagnostic messages in the Event Log."
-msgstr "这些标志使不同的诊断信息在事件日志中显示。"
+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:105
+#: clientgui/DlgDiagnosticLogFlags.cpp:120 clientgui/DlgHiddenColumns.cpp:101
 msgid "Save all values and close the dialog"
-msgstr "默认"
+msgstr "保存所有参数值并关闭对话框"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:108
+#: clientgui/DlgDiagnosticLogFlags.cpp:123 clientgui/DlgHiddenColumns.cpp:104
 msgid "Defaults"
 msgstr "默认"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:109
+#: clientgui/DlgDiagnosticLogFlags.cpp:124 clientgui/DlgHiddenColumns.cpp:105
 msgid "Restore default settings"
-msgstr "恢复默认设置"
+msgstr "还原默认设置"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:113
+#: clientgui/DlgDiagnosticLogFlags.cpp:128 clientgui/DlgHiddenColumns.cpp:109
 msgid "Close the dialog without saving"
-msgstr "关闭对话框且不进行任何保存"
+msgstr "放弃更改并关闭对话框"
 
-#: clientgui/DlgEventLog.cpp:226
+#: clientgui/DlgEventLog.cpp:227
 #, c-format
 msgid "%s - Event Log"
 msgstr "%s - 事件日志"
 
-#: clientgui/DlgEventLog.cpp:236
+#: clientgui/DlgEventLog.cpp:237
 msgid "Project"
 msgstr "项目"
 
-#: clientgui/DlgEventLog.cpp:237
-msgid "Time"
-msgstr "时间"
+#: clientgui/DlgEventLog.cpp:238
+msgid "Time"
+msgstr "时间"
+
+#: clientgui/DlgEventLog.cpp:239
+msgid "Message"
+msgstr "消息"
+
+#: clientgui/DlgEventLog.cpp:301 clientgui/DlgEventLog.cpp:351
+msgid "&Show only this project"
+msgstr "仅显示当前项目(&S)"
+
+#: clientgui/DlgEventLog.cpp:305
+msgid "Copy &All"
+msgstr "复制所有的(&A)"
+
+#: clientgui/DlgEventLog.cpp:307 clientgui/DlgEventLog.cpp:311
+msgid "Copy all the messages to the clipboard."
+msgstr "复制所有消息至剪贴板。"
+
+#: clientgui/DlgEventLog.cpp:316
+msgid "Copy &Selected"
+msgstr "复制选中的(&S)"
+
+#: 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."
+msgstr "复制选中的消息至剪贴板。您可以在选择的时候通过按住Shift键或Commandl键来选取多条消息。"
+
+#: 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."
+msgstr "复制选中的消息至剪贴板。您可以在选择的时候通过按住Shift键或Ctrl键来选取多条消息。"
+
+#: clientgui/DlgEventLog.cpp:336 clientgui/DlgItemProperties.cpp:67
+msgid "&Close"
+msgstr "关闭(&C)"
+
+#: clientgui/DlgEventLog.cpp:345
+msgid "Show all &messages"
+msgstr "显示所有消息(&M)"
+
+#: clientgui/DlgEventLog.cpp:346 clientgui/DlgEventLog.cpp:348
+msgid "Show messages for all projects"
+msgstr "显示所有项目的消息"
+
+#: clientgui/DlgEventLog.cpp:352 clientgui/DlgEventLog.cpp:354
+msgid "Show only the messages for the selected project"
+msgstr "仅显示当前选中项目的消息"
+
+#: clientgui/DlgExclusiveApps.cpp:60
+#, c-format
+msgid "%s - Exclusive Applications"
+msgstr "%s-互斥应用程序"
+
+#: clientgui/DlgExclusiveApps.cpp:72
+msgid ""
+"Suspend processor and network usage when these applications are running:"
+msgstr "当这些应用程序在运行的时候暂停对处理器和网络的使用:"
+
+#: clientgui/DlgExclusiveApps.cpp:80 clientgui/DlgExclusiveApps.cpp:104
+msgid "Add..."
+msgstr "添加..."
+
+#: clientgui/DlgExclusiveApps.cpp:81 clientgui/DlgExclusiveApps.cpp:105
+msgid "Add an application to this list"
+msgstr "在列表中增加一个应用程序"
 
-#: clientgui/DlgEventLog.cpp:238
-msgid "Message"
-msgstr "消息"
+#: clientgui/DlgExclusiveApps.cpp:86 clientgui/DlgExclusiveApps.cpp:110
+msgid "Remove"
+msgstr "删除"
 
-#: clientgui/DlgEventLog.cpp:300
-#: clientgui/DlgEventLog.cpp:364
-msgid "&Show only this project"
-msgstr "仅显示当前项目(&S)"
+#: clientgui/DlgExclusiveApps.cpp:87 clientgui/DlgExclusiveApps.cpp:111
+msgid "Remove an application from this list"
+msgstr "从列表中移除一个应用程序"
 
-#: clientgui/DlgEventLog.cpp:304
-msgid "Copy &All"
-msgstr "复制所有的(&A)"
+#: clientgui/DlgExclusiveApps.cpp:96
+msgid "Suspend GPU usage when these applications are running:"
+msgstr "当这些应用程序在运行的时候暂停对GPU的使用:"
 
-#: clientgui/DlgEventLog.cpp:306
-#: clientgui/DlgEventLog.cpp:310
-msgid "Copy all the messages to the clipboard."
-msgstr "复制所有消息至剪贴板。"
+#: clientgui/DlgExclusiveApps.cpp:122
+msgid "For advanced options, refer to "
+msgstr "要访问更多高级选项,请前往"
 
-#: clientgui/DlgEventLog.cpp:315
-msgid "Copy &Selected"
-msgstr "复制选中的(&S)"
+#: clientgui/DlgExclusiveApps.cpp:147
+msgid "save all values and close the dialog"
+msgstr "保存所有参数值并关闭对话框"
 
-#: clientgui/DlgEventLog.cpp:318
-#: clientgui/DlgEventLog.cpp:326
-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 "复制选中的消息至剪贴板。您可以在选择的时候通过按住Shift键或Commandl键来选取多条消息。"
+#: clientgui/DlgExclusiveApps.cpp:153
+msgid "close the dialog without saving"
+msgstr "关闭对话框且不进行任何保存"
 
-#: clientgui/DlgEventLog.cpp:320
-#: clientgui/DlgEventLog.cpp:328
-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 "复制选中的消息至剪贴板。您可以在选择的时候通过按住Shift键或Ctrl键来选取多条消息。"
+#: clientgui/DlgExclusiveApps.cpp:158
+msgid "shows the preferences web page"
+msgstr "显示参数设置网页"
 
-#: clientgui/DlgEventLog.cpp:335
-#: clientgui/DlgItemProperties.cpp:67
-msgid "&Close"
-msgstr "关闭(&C)"
+#: clientgui/DlgExclusiveApps.cpp:303 clientgui/DlgExclusiveApps.cpp:309
+#: clientgui/DlgExclusiveApps.cpp:315
+msgid "Applications to add"
+msgstr "待添加的应用程序"
 
-#: clientgui/DlgEventLog.cpp:344
+#: clientgui/DlgExclusiveApps.cpp:332
 #, c-format
-msgid "Get help with %s"
-msgstr "获取 %s 的帮助信息"
+msgid "'%s' is not an executable application."
+msgstr "“%s”不是一个可执行的应用程序。"
 
-#: clientgui/DlgEventLog.cpp:358
-msgid "Show all &messages"
-msgstr "显示所有消息(&M)"
+#: clientgui/DlgExclusiveApps.cpp:333 clientgui/DlgExclusiveApps.cpp:380
+#: clientgui/DlgExclusiveApps.cpp:404
+msgid "Add Exclusive App"
+msgstr "添加互斥应用程序"
 
-#: clientgui/DlgEventLog.cpp:359
-#: clientgui/DlgEventLog.cpp:361
-msgid "Show messages for all projects"
-msgstr "显示所有项目的消息"
+#: clientgui/DlgExclusiveApps.cpp:345
+msgid "Name of application to add?"
+msgstr "待添加的应用程序的名称?"
 
-#: clientgui/DlgEventLog.cpp:365
-#: clientgui/DlgEventLog.cpp:367
-msgid "Show only the messages for the selected project"
-msgstr "仅显示当前选中项目的消息"
+#: clientgui/DlgExclusiveApps.cpp:345
+msgid "Add exclusive app"
+msgstr "添加互斥应用程序"
+
+#: clientgui/DlgExclusiveApps.cpp:379
+#, c-format
+msgid "Application names must end with '%s'"
+msgstr "应用程序的名称必须以“%s”结尾"
+
+#: clientgui/DlgExclusiveApps.cpp:403
+#, c-format
+msgid "'%s' is already in the list."
+msgstr "“%s”已经在列表内了。"
 
 #: clientgui/DlgExitMessage.cpp:82
 #, c-format
@@ -1690,12 +1738,7 @@ msgid ""
 "\n"
 "If you also want to stop running the tasks,\n"
 "choose from the following options:"
-msgstr ""
-"你刚才请求了退出 %s,\n"
-"它的作用是查看和管理运行在你计算机上的任务。\n"
-"\n"
-"如果你想要停止运行计算任务,\n"
-"请从下列选项中进行选择:"
+msgstr "你刚才请求了退出 %s,\n它的作用是查看和管理运行在你计算机上的任务。\n\n如果你想要停止运行计算任务,\n请从下列选项中进行选择:"
 
 #: clientgui/DlgExitMessage.cpp:135
 #, c-format
@@ -1706,12 +1749,7 @@ msgid ""
 "In most cases, it is better just to close the %s window\n"
 "rather than to exit the application; that will allow %s to run its\n"
 "tasks at the times you selected in your preferences."
-msgstr ""
-"本操作将会退出 %s 及其所有任务直到\n"
-"重新运行 %s 或是重新启动 %s 屏保。\n"
-"\n"
-"一般情况下,建议只关闭 %s 的窗口而不是退出应用程序,\n"
-"这样 %s 将会在您设定的时间段内进行工作。"
+msgstr "本操作将会退出 %s 及其所有任务直到\n重新运行 %s 或是重新启动 %s 屏保。\n\n一般情况下,建议只关闭 %s 的窗口而不是退出应用程序,\n这样 %s 将会在您设定的时间段内进行工作。"
 
 #: clientgui/DlgExitMessage.cpp:153
 #, c-format
@@ -1722,10 +1760,8 @@ msgstr "当退出 %s 的时候停止运行所有计算任务"
 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
 msgid "&Cancel"
 msgstr "取消(&C)"
 
@@ -1733,10 +1769,28 @@ msgstr "取消(&C)"
 msgid "Don't show this dialog again."
 msgstr "不再显示本对话框。"
 
-#: clientgui/DlgItemProperties.cpp:194
-#: clientgui/DlgItemProperties.cpp:197
-#: clientgui/DlgItemProperties.cpp:200
-#: clientgui/DlgItemProperties.cpp:203
+#: clientgui/DlgHiddenColumns.cpp:64
+#, c-format
+msgid "%s Column Selection"
+msgstr "%s 列选择"
+
+#: clientgui/DlgHiddenColumns.cpp:77
+#, c-format
+msgid "Select which columns %s should show."
+msgstr "选择 %s 应显示哪些列。"
+
+#: clientgui/DlgHiddenColumns.cpp:314
+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
 msgid "Don't fetch tasks for "
 msgstr "禁止的任务类型 "
 
@@ -1768,8 +1822,7 @@ msgstr "任务获取延迟间隔"
 msgid "Properties of project "
 msgstr "项目属性"
 
-#: clientgui/DlgItemProperties.cpp:243
-#: clientgui/DlgOptions.cpp:221
+#: clientgui/DlgItemProperties.cpp:243 clientgui/DlgOptions.cpp:221
 msgid "General"
 msgstr "综合"
 
@@ -1801,6 +1854,10 @@ msgstr "文件下载被延迟"
 msgid "File uploads deferred for"
 msgstr "文件上传被延迟"
 
+#: clientgui/DlgItemProperties.cpp:257
+msgid "Disk usage"
+msgstr "磁盘使用"
+
 #: clientgui/DlgItemProperties.cpp:258
 msgid "Computer ID"
 msgstr "计算机编号"
@@ -1809,14 +1866,10 @@ msgstr "计算机编号"
 msgid "Non CPU intensive"
 msgstr "非 CPU 密集"
 
-#: 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 "是"
 
@@ -1824,8 +1877,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 "否"
 
@@ -1841,8 +1893,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 "主机位置"
 
@@ -1864,7 +1915,7 @@ msgstr "已结束"
 
 #: clientgui/DlgItemProperties.cpp:285
 msgid "Tasks completed"
-msgstr "已完成的任务"
+msgstr "任务已完成"
 
 #: clientgui/DlgItemProperties.cpp:286
 msgid "Tasks failed"
@@ -1934,13 +1985,11 @@ msgstr "预计的任务大小"
 msgid "CPU time at last checkpoint"
 msgstr "上次存盘的 CPU 时间"
 
-#: clientgui/DlgItemProperties.cpp:374
-#: clientgui/DlgItemProperties.cpp:389
+#: clientgui/DlgItemProperties.cpp:374 clientgui/DlgItemProperties.cpp:389
 msgid "CPU time"
 msgstr "已用 CPU 时间"
 
-#: clientgui/DlgItemProperties.cpp:376
-#: clientgui/DlgItemProperties.cpp:390
+#: clientgui/DlgItemProperties.cpp:376 clientgui/DlgItemProperties.cpp:390
 msgid "Elapsed time"
 msgstr "已用时间"
 
@@ -1972,8 +2021,7 @@ msgstr "进程标识"
 msgid "Local: "
 msgstr "本地:"
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: clientgui/DlgOptions.cpp:129 clientgui/DlgOptions.cpp:135
 msgid "Options"
 msgstr "选项"
 
@@ -2037,33 +2085,27 @@ msgstr "通过 HTTP 代理连接"
 msgid "HTTP Proxy Server Configuration"
 msgstr "HTTP 代理配置"
 
-#: 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
 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
 msgid "User Name:"
 msgstr "用户名:"
 
-#: clientgui/DlgOptions.cpp:320
-#: clientgui/DlgOptions.cpp:384
+#: clientgui/DlgOptions.cpp:320 clientgui/DlgOptions.cpp:384
 #: clientgui/DlgSelectComputer.cpp:152
 msgid "Password:"
 msgstr "密码:"
@@ -2115,7 +2157,9 @@ msgstr "%s - 语言选择"
 
 #: 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 "%s 的缺省语言已被修改,且必须重启 %s 才能生效。"
 
 #: clientgui/DlgSelectComputer.cpp:91
@@ -2134,8 +2178,7 @@ msgstr "另一个 %s 的实例已经在当前计算上运行,请选择想要
 msgid "Host name:"
 msgstr "主机名:"
 
-#: clientgui/Localization.cpp:31
-#: clientgui/Localization.cpp:69
+#: clientgui/Localization.cpp:31 clientgui/Localization.cpp:69
 msgid "Message boards"
 msgstr "留言板"
 
@@ -2147,15 +2190,12 @@ msgstr "在留言板上可以和其他 SETI at home 用户进行交流"
 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 "查看您的帐户及积分信息"
@@ -2168,18 +2208,15 @@ msgstr "您的参数设置"
 msgid "View and modify your SETI at home account profile and preferences"
 msgstr "查看和修改您的 SETI at home 帐户及参数设置"
 
-#: 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 "您的计算机"
 
@@ -2187,13 +2224,11 @@ msgstr "您的计算机"
 msgid "View a listing of all the computers on which you are running SETI at Home"
 msgstr "查看您用来运行 SETI at home 的计算机列表"
 
-#: 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 "查看您的团队信息"
 
@@ -2214,7 +2249,8 @@ msgid "Read a detailed description of the Einstein at Home screensaver"
 msgstr "阅读 Einstein at Home 屏保的详细信息"
 
 #: 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 "和管理员及其他 Einstein at Home 用户进行交流"
 
 #: clientgui/Localization.cpp:73
@@ -2242,7 +2278,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 "查看您用来运行 Einstein at Home 的计算机列表"
 
 #: clientgui/Localization.cpp:101
@@ -2250,7 +2287,9 @@ msgid "LIGO project"
 msgstr "LIGO 项目"
 
 #: 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 "激光干涉引力波观测站 (LIGO) 项目的主页"
 
 #: clientgui/Localization.cpp:105
@@ -2261,8 +2300,7 @@ msgstr "GEO-600 项目"
 msgid "The home page of the GEO-600 project"
 msgstr "GEO-600 项目的主页"
 
-#: clientgui/Localization.cpp:115
-#: clientgui/Localization.cpp:133
+#: clientgui/Localization.cpp:115 clientgui/Localization.cpp:133
 msgid "Team"
 msgstr "团队"
 
@@ -2343,7 +2381,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 "请从 http://cord.sourceforge.net 下载并安装 CoRD 程序。"
 
 #: clientgui/MainDocument.cpp:2442
@@ -2414,8 +2454,7 @@ msgstr "下载失败"
 msgid "Downloading"
 msgstr "正在下载"
 
-#: clientgui/MainDocument.cpp:2492
-#: clientgui/MainDocument.cpp:2557
+#: clientgui/MainDocument.cpp:2492 clientgui/MainDocument.cpp:2551
 msgid " (suspended - "
 msgstr "(已暂停 - "
 
@@ -2427,101 +2466,99 @@ msgstr "项目已被用户暂停"
 msgid "Task suspended by user"
 msgstr "任务已被用户暂停"
 
-#: clientgui/MainDocument.cpp:2504
+#: clientgui/MainDocument.cpp:2507
 msgid "Suspended - "
 msgstr "已暂停 - "
 
-# 75%
 #: clientgui/MainDocument.cpp:2510
 msgid "GPU suspended - "
 msgstr "GPU 已暂停 - "
 
-#: clientgui/MainDocument.cpp:2517
+#: clientgui/MainDocument.cpp:2514
 msgid "Waiting for memory"
 msgstr "等待足够的内存"
 
-#: clientgui/MainDocument.cpp:2519
+#: clientgui/MainDocument.cpp:2516
 msgid "Waiting for shared memory"
 msgstr "等待足够的共享内存"
 
-#: clientgui/MainDocument.cpp:2521
+#: clientgui/MainDocument.cpp:2518
 msgid "Running"
 msgstr "运行中"
 
-#: clientgui/MainDocument.cpp:2523
+#: clientgui/MainDocument.cpp:2520
 msgid " (non-CPU-intensive)"
-msgstr "( 非 CPU 密集 )"
+msgstr "(非 CPU 密集)"
 
-#: clientgui/MainDocument.cpp:2526
+#: clientgui/MainDocument.cpp:2523
 msgid "Waiting to run"
 msgstr "等待运行"
 
-#: clientgui/MainDocument.cpp:2528
-#: clientgui/MainDocument.cpp:2534
+#: clientgui/MainDocument.cpp:2525 clientgui/MainDocument.cpp:2528
 msgid "Ready to start"
 msgstr "准备运行"
 
-#: clientgui/MainDocument.cpp:2538
+#: clientgui/MainDocument.cpp:2532
 msgid "Postponed: "
-msgstr "延后: "
+msgstr "推迟:"
 
-#: clientgui/MainDocument.cpp:2541
+#: clientgui/MainDocument.cpp:2535
 msgid "Postponed"
-msgstr "延后"
+msgstr "已推迟"
 
-#: clientgui/MainDocument.cpp:2545
+#: clientgui/MainDocument.cpp:2539
 msgid "Waiting for network access"
-msgstr "正等待访问网络"
+msgstr "正在等待访问网络"
 
-#: clientgui/MainDocument.cpp:2549
+#: clientgui/MainDocument.cpp:2543
 msgid "Computation error"
 msgstr "计算错误"
 
-#: clientgui/MainDocument.cpp:2553
+#: clientgui/MainDocument.cpp:2547
 msgid "Upload failed"
 msgstr "上传失败"
 
-#: clientgui/MainDocument.cpp:2555
+#: clientgui/MainDocument.cpp:2549
 msgid "Uploading"
 msgstr "正在上传"
 
-#: clientgui/MainDocument.cpp:2566
+#: clientgui/MainDocument.cpp:2560
 msgid "Aborted by user"
 msgstr "已被用户中止"
 
-#: clientgui/MainDocument.cpp:2569
+#: clientgui/MainDocument.cpp:2563
 msgid "Aborted by project"
 msgstr "已被项目中止"
 
-#: clientgui/MainDocument.cpp:2572
+#: clientgui/MainDocument.cpp:2566
 msgid "Aborted: not started by deadline"
 msgstr "已中止:未在截止日期前开始计算"
 
-#: clientgui/MainDocument.cpp:2575
+#: clientgui/MainDocument.cpp:2569
 msgid "Aborted: disk limit exceeded"
 msgstr "已中止:磁盘使用超出限制"
 
-#: clientgui/MainDocument.cpp:2578
+#: clientgui/MainDocument.cpp:2572
 msgid "Aborted: run time limit exceeded"
 msgstr "已中止:运行时间超出限制"
 
-#: clientgui/MainDocument.cpp:2581
+#: clientgui/MainDocument.cpp:2575
 msgid "Aborted: memory limit exceeded"
 msgstr "已中止:内存使用超出限制"
 
-#: clientgui/MainDocument.cpp:2584
+#: clientgui/MainDocument.cpp:2578
 msgid "Aborted"
 msgstr "已中止"
 
-#: clientgui/MainDocument.cpp:2589
+#: clientgui/MainDocument.cpp:2583
 msgid "Acknowledged"
 msgstr "已被确认"
 
-#: clientgui/MainDocument.cpp:2591
+#: clientgui/MainDocument.cpp:2585
 msgid "Ready to report"
 msgstr "等待上报"
 
-#: clientgui/MainDocument.cpp:2593
+#: clientgui/MainDocument.cpp:2587
 #, c-format
 msgid "Error: invalid state '%d'"
 msgstr "错误:非法状态 '%d'"
@@ -2543,10 +2580,7 @@ msgid ""
 "The URL you supplied is not that of a BOINC-based project.\n"
 "\n"
 "Please check the URL and try again."
-msgstr ""
-"您提供的网址并不属于任何一个 BOINC 项目。\n"
-"\n"
-"请检查该网址并重试。"
+msgstr "您提供的网址并不属于任何一个 BOINC 项目。\n\n请检查该网址并重试。"
 
 #: clientgui/NotDetectedPage.cpp:188
 msgid "Account manager not found"
@@ -2558,10 +2592,7 @@ msgid ""
 "manager.\n"
 "\n"
 "Please check the URL and try again."
-msgstr ""
-"您提供的网址并不属于任何一个基于 BOINC 的帐户管理器。\n"
-"\n"
-"请检查该网址并重试。"
+msgstr "您提供的网址并不属于任何一个基于 BOINC 的帐户管理器。\n\n请检查该网址并重试。"
 
 #: clientgui/NotFoundPage.cpp:181
 msgid "Login Failed."
@@ -2583,53 +2614,54 @@ msgstr "更多..."
 msgid "Choose a project"
 msgstr "选择一个项目"
 
-#: clientgui/ProjectInfoPage.cpp:228
+#: clientgui/ProjectInfoPage.cpp:226
 msgid "To choose a project, click its name or type its URL below."
 msgstr "要选择一个项目,请点击它的项目名称或在下方输入它的项目网址。"
 
-#: clientgui/ProjectInfoPage.cpp:246
+#: clientgui/ProjectInfoPage.cpp:242
 msgid "Categories:"
 msgstr "类别:"
 
-#: clientgui/ProjectInfoPage.cpp:267
+#: clientgui/ProjectInfoPage.cpp:262
 msgid "Projects:"
 msgstr "项目:"
 
-#: clientgui/ProjectInfoPage.cpp:279
+#: clientgui/ProjectInfoPage.cpp:274
 msgid "Project details"
 msgstr "项目简介"
 
-#: clientgui/ProjectInfoPage.cpp:291
+#: clientgui/ProjectInfoPage.cpp:284
 msgid "Research area:"
 msgstr "研究领域:"
 
-#: clientgui/ProjectInfoPage.cpp:302
+#: clientgui/ProjectInfoPage.cpp:294
 msgid "Organization:"
 msgstr "项目组织:"
 
-#: clientgui/ProjectInfoPage.cpp:313
+#: clientgui/ProjectInfoPage.cpp:304
 msgid "Web site:"
 msgstr "网站:"
 
-#: clientgui/ProjectInfoPage.cpp:325
+#: clientgui/ProjectInfoPage.cpp:315
 msgid "Supported systems:"
 msgstr "支持的操作系统:"
 
-#: clientgui/ProjectInfoPage.cpp:363
+#: clientgui/ProjectInfoPage.cpp:352
 msgid "Project URL:"
 msgstr "项目网址:"
 
-#: clientgui/ProjectInfoPage.cpp:499
-#: clientgui/ProjectInfoPage.cpp:754
-#: clientgui/ProjectInfoPage.cpp:758
+#: clientgui/ProjectInfoPage.cpp:486 clientgui/ProjectInfoPage.cpp:686
+#: clientgui/ProjectInfoPage.cpp:690
 msgid "All"
 msgstr "所有"
 
-#: clientgui/ProjectInfoPage.cpp:802
-msgid "This project may not have work for your type of computer.  Do you want to add it anyway?"
+#: clientgui/ProjectInfoPage.cpp:735
+msgid ""
+"This project may not have work for your type of computer.  Do you want to "
+"add it anyway?"
 msgstr "该项目可能没有适合您计算机的任务类型,您确定还要添加它吗?"
 
-#: clientgui/ProjectInfoPage.cpp:826
+#: clientgui/ProjectInfoPage.cpp:767
 msgid "You already added this project. Please choose a different project."
 msgstr "您当前已经加入了这个项目,请选择其它的项目。"
 
@@ -2637,12 +2669,12 @@ msgstr "您当前已经加入了这个项目,请选择其它的项目。"
 msgid "Communicating with project."
 msgstr "正在和项目服务器进行通讯。"
 
-#: clientgui/ProjectProcessingPage.cpp:510
+#: clientgui/ProjectProcessingPage.cpp:509
 msgid "Required files not found on the server."
 msgstr "请求的文件不在服务器上。"
 
-#: clientgui/ProjectProcessingPage.cpp:513
-#: clientgui/ProjectProcessingPage.cpp:586
+#: clientgui/ProjectProcessingPage.cpp:512
+#: clientgui/ProjectProcessingPage.cpp:585
 msgid "An internal server error has occurred."
 msgstr "服务器上产生了一个内部错误。"
 
@@ -2650,9 +2682,7 @@ msgstr "服务器上产生了一个内部错误。"
 msgid ""
 "Communicating with project\n"
 "Please wait..."
-msgstr ""
-"正在与项目通讯。\n"
-"请稍候..."
+msgstr "正在与项目通讯。\n请稍候..."
 
 #: clientgui/ProjectWelcomePage.cpp:251
 #, c-format
@@ -2661,11 +2691,11 @@ msgstr "欢迎来到 %s。"
 
 #: clientgui/ProjectWelcomePage.cpp:254
 msgid "You have volunteered to compute for this project:"
-msgstr "您已志愿参与该项目:"
+msgstr "你已作为志愿者计算这个项目:"
 
 #: clientgui/ProjectWelcomePage.cpp:255
 msgid "Name:"
-msgstr "名称:"
+msgstr "用户名:"
 
 #: clientgui/ProjectWelcomePage.cpp:258
 msgid "Home:"
@@ -2677,15 +2707,17 @@ msgstr "描述:"
 
 #: clientgui/ProjectWelcomePage.cpp:265
 msgid "URL:"
-msgstr "网址:"
+msgstr "URL:"
 
 #: clientgui/ProjectWelcomePage.cpp:268
 msgid "User:"
 msgstr "用户:"
 
 #: clientgui/ProjectWelcomePage.cpp:273
-msgid "WARNING: This project is not registered with BOINC.  Make sure you trust it before continuing."
-msgstr "警告:该项目并未在 BOINC 上注册。  进行下一步操作前请确认您信任该项目。"
+msgid ""
+"WARNING: This project is not registered with BOINC.  Make sure you trust it "
+"before continuing."
+msgstr "警告:此项目未在BOINC注册。请确保您信任它,然后再继续。"
 
 #: clientgui/ProjectWelcomePage.cpp:277
 msgid "To continue, click Next."
@@ -2710,16 +2742,7 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"World Community Grid - BOINC 软件无法在互联网上通讯,可能的原因有:\n"
-"\n"
-"1) 连接问题。请检查您的网络或拨号连接并点击上一步以重试。\n"
-"\n"
-"2) 被个人防火墙阻挡,您必须配置您的防火墙以允许 BOINC 在 80 端口和 443 端口的通讯。\n"
-"配置完成后,请点击上一步进行重试。\n"
-"\n"
-"3) 您正在通过代理服务器接入互联网。\n"
-"请点击下一步以对 BOINC 的代理进行设置。"
+msgstr "World Community Grid - BOINC 软件无法在互联网上通讯,可能的原因有:\n\n1) 连接问题。请检查您的网络或拨号连接并点击上一步以重试。\n\n2) 被个人防火墙阻挡,您必须配置您的防火墙以允许 BOINC 在 80 端口和 443 端口的通讯。\n配置完成后,请点击上一步进行重试。\n\n3) 您正在通过代理服务器接入互联网。\n请点击下一步以对 BOINC 的代理进行设置。"
 
 #: clientgui/ProxyInfoPage.cpp:203
 msgid ""
@@ -2736,16 +2759,7 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"BOINC 无法在互联网上通讯,可能的原因有:\n"
-"\n"
-"1) 连接问题。请检查您的网络或拨号连接并点击上一步以重试。\n"
-"\n"
-"2) 被个人防火墙阻挡,您必须配置您的防火墙以允许 BOINC 在 80 端口的通讯。\n"
-"配置完成后,请点击上一步进行重试。\n"
-"\n"
-"3) 您正在通过代理服务器接入互联网。\n"
-"请点击下一步以对 BOINC 的代理进行设置。"
+msgstr "BOINC 无法在互联网上通讯,可能的原因有:\n\n1) 连接问题。请检查您的网络或拨号连接并点击上一步以重试。\n\n2) 被个人防火墙阻挡,您必须配置您的防火墙以允许 BOINC 在 80 端口的通讯。\n配置完成后,请点击上一步进行重试。\n\n3) 您正在通过代理服务器接入互联网。\n请点击下一步以对 BOINC 的代理进行设置。"
 
 #: clientgui/ProxyPage.cpp:331
 msgid "Proxy configuration"
@@ -2755,8 +2769,7 @@ msgstr "代理配置"
 msgid "HTTP proxy"
 msgstr "HTTP 代理"
 
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
+#: clientgui/ProxyPage.cpp:337 clientgui/ProxyPage.cpp:357
 msgid "Server:"
 msgstr "服务器:"
 
@@ -2768,51 +2781,64 @@ msgstr "自动检测"
 msgid "SOCKS proxy"
 msgstr "SOCKS 代理"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:167
+#: clientgui/sg_BoincSimpleFrame.cpp:166
+msgid "Skin"
+msgstr "皮肤"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:168
+msgid "Select the appearance of the user interface."
+msgstr "选择用户界面的外观。"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:179
+msgid "Display diagnostic messages."
+msgstr "显示诊断消息。"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:184
 msgid "Advanced View...\tCtrl+Shift+A"
 msgstr "高级视图...\tCtrl+Shift+A"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:168
+#: clientgui/sg_BoincSimpleFrame.cpp:185
 msgid "Display the advanced graphical interface."
 msgstr "显示高级图形界面。"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:175
-msgid "Skin"
-msgstr "皮肤"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:177
-msgid "Select the appearance of the user interface."
-msgstr "选择用户界面的外观。"
+#: clientgui/sg_BoincSimpleFrame.cpp:201
+msgid "Configure display options and proxy settings"
+msgstr "配置界面及代理服务器选项"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:224
+#: clientgui/sg_BoincSimpleFrame.cpp:222
 #, c-format
 msgid "&%s"
 msgstr "&%s"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:405
+#: clientgui/sg_BoincSimpleFrame.cpp:396
 msgid "Default"
 msgstr "缺省"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:848
+#: clientgui/sg_BoincSimpleFrame.cpp:838
 msgid "Suspend"
 msgstr "暂停"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:850
+#: clientgui/sg_BoincSimpleFrame.cpp:840
 msgid "Suspend Computing"
 msgstr "暂停计算"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:851
+#: clientgui/sg_BoincSimpleFrame.cpp:841
 msgid "Resume Computing"
 msgstr "继续计算"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:867
+#: clientgui/sg_BoincSimpleFrame.cpp:857
 msgid "Notices"
 msgstr "通知"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:868
+#: clientgui/sg_BoincSimpleFrame.cpp:858
 msgid "Open a window to view notices from projects or BOINC"
 msgstr "打开一个窗口,查看来自计算网站或 BOINC 网站的通知消息。"
 
+#: clientgui/sg_BoincSimpleFrame.cpp:879
+#, c-format
+msgid "Get help with %s"
+msgstr "获取 %s 的帮助信息"
+
 #: clientgui/sg_DlgMessages.cpp:124
 msgid "Fetching notices; please wait..."
 msgstr "获取通知中,请稍候..."
@@ -2830,233 +2856,104 @@ msgstr "关闭"
 msgid "%s - Notices"
 msgstr "%s - 通知"
 
-#: clientgui/sg_DlgPreferences.cpp:270
-msgid "This dialog controls preferences for this computer only."
-msgstr "本对话框中的设置仅对当前计算机有效。"
-
-#: clientgui/sg_DlgPreferences.cpp:275
-msgid "Click OK to set preferences."
-msgstr "点击确定可以保存并应用当前的参数设置。"
-
-#: clientgui/sg_DlgPreferences.cpp:280
-msgid "Click Clear to restore web-based settings for all preferences listed below."
-msgstr "点击清除可将下列所有参数设置恢复到项目网站上的设定。"
-
-#: clientgui/sg_DlgPreferences.cpp:287
-msgid "For additional settings, select Computing Preferences in the Advanced View."
+#: clientgui/sg_DlgPreferences.cpp:187
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
 msgstr "更多的参数设置,请在高级视图下选择“计算参数设置”来查看。"
 
-#: clientgui/sg_DlgPreferences.cpp:315
-msgid "Do work only between:"
-msgstr "计算时间段:"
-
-#: clientgui/sg_DlgPreferences.cpp:337
-msgid "Connect to internet only between:"
-msgstr "连接互联网的时间段:"
-
-#: clientgui/sg_DlgPreferences.cpp:359
-#: clientgui/sg_DlgPreferences.cpp:376
-msgid "Use no more than:"
-msgstr "最多使用:"
-
-#: clientgui/sg_DlgPreferences.cpp:372
-msgid "of disk space"
-msgstr "磁盘空间"
-
-#: clientgui/sg_DlgPreferences.cpp:389
-msgid "of the processor"
-msgstr "处理器"
-
-#: clientgui/sg_DlgPreferences.cpp:393
-msgid "Do work while on battery?"
-msgstr "电池供电时仍然计算?"
-
-#: clientgui/sg_DlgPreferences.cpp:406
-msgid "Do work after idle for:"
-msgstr "闲置一定时间后开始计算:"
-
-#: clientgui/sg_DlgPreferences.cpp:431
-msgid "Clear all local preferences listed above and close the dialog"
-msgstr "清除所有本地的参数设置并关闭对话框"
-
-#: clientgui/sg_DlgPreferences.cpp:609
-#: clientgui/sg_DlgPreferences.cpp:612
-#: clientgui/sg_DlgPreferences.cpp:688
-#: clientgui/sg_DlgPreferences.cpp:692
-#: clientgui/sg_DlgPreferences.cpp:704
-#: clientgui/sg_DlgPreferences.cpp:708
-#: clientgui/sg_DlgPreferences.cpp:851
-#: clientgui/sg_DlgPreferences.cpp:862
-msgid "Anytime"
-msgstr "任何时候"
-
-#: clientgui/sg_DlgPreferences.cpp:645
-msgid "100 MB"
-msgstr "100 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:646
-msgid "200 MB"
-msgstr "200 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:647
-msgid "500 MB"
-msgstr "500 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:648
-msgid "1 GB"
-msgstr "1 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:649
-msgid "2 GB"
-msgstr "2 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:650
-msgid "5 GB"
-msgstr "5 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:651
-msgid "10 GB"
-msgstr "10 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:652
-msgid "20 GB"
-msgstr "20 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:653
-msgid "50 GB"
-msgstr "50 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:654
-msgid "100 GB"
-msgstr "100 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:724
-#, c-format
-msgid "%d MB"
-msgstr "%d MB"
-
-#: clientgui/sg_DlgPreferences.cpp:726
-#, c-format
-msgid "%4.2f GB"
-msgstr "%4.2f GB"
-
-#: clientgui/sg_DlgPreferences.cpp:767
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: clientgui/sg_DlgPreferences.cpp:803
-msgid "0 (Run Always)"
-msgstr "0 ( 一直运行 )"
+#: clientgui/sg_DlgPreferences.cpp:289
+msgid "GB of disk space"
+msgstr "GB 的磁盘空间"
 
-#: clientgui/sg_DlgPreferences.cpp:806
-#, c-format
-msgid "%d"
-msgstr "%d"
-
-#: clientgui/sg_DlgPreferences.cpp:953
+#: clientgui/sg_DlgPreferences.cpp:980
 #, c-format
 msgid "%s - Computing Preferences"
-msgstr "%s - 计算参数"
+msgstr "%s -计算参数设置"
 
-#: clientgui/sg_DlgPreferences.cpp:1033
-msgid "Do you really want to clear all local preferences?\n"
-msgstr "您确定要清除所有的本地参数设置吗?\n"
+#: clientgui/sg_DlgPreferences.cpp:1061
+msgid "Discard all local preferences and use web-based preferences?"
+msgstr "放弃所有本地设置并使用网站上的设置吗?"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:66
-#: clientgui/ViewProjects.cpp:179
 msgid "Update"
 msgstr "更新"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:67
-#: clientgui/ViewProjects.cpp:180
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
+msgid ""
+"Report all completed tasks, get latest credit, get latest preferences, and "
+"possibly get more tasks."
 msgstr "上报所有完成的任务,获取最新的积分及参数设置,可能下载更多的新任务。"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:73
 #: clientgui/sg_ProjectCommandPopup.cpp:129
-#: clientgui/ViewProjects.cpp:187
-#: clientgui/ViewProjects.cpp:727
 msgid "Suspend tasks for this project."
 msgstr "暂停当前项目的所有任务。"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:78
 #: clientgui/sg_ProjectCommandPopup.cpp:136
-#: clientgui/ViewProjects.cpp:193
-#: clientgui/ViewProjects.cpp:746
 msgid "No new tasks"
 msgstr "禁止下载新任务"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:79
-#: clientgui/ViewProjects.cpp:194
 msgid "Don't get new tasks for this project."
 msgstr "该项目不再下载任何新任务。"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:200
 msgid "Reset project"
 msgstr "重置项目"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:85
-#: clientgui/ViewProjects.cpp:201
-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."
+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:208
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
+msgid ""
+"Remove this project.  Tasks in progress will be lost (use 'Update' first to "
+"report any completed tasks)."
 msgstr "删除当前项目。该项目所有正在计算的任务将丢失,您可以先点击“更新”按钮以上报所有已经完成的任务。"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:96
 #: clientgui/sg_TaskCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:214
 msgid "Properties"
 msgstr "属性"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:97
-#: clientgui/ViewProjects.cpp:215
 msgid "Show project details."
 msgstr "显示项目细节。"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:126
-#: clientgui/ViewProjects.cpp:723
 msgid "Resume tasks for this project."
 msgstr "继续当前任务的计算。"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:133
-#: clientgui/ViewProjects.cpp:742
 msgid "Allow new tasks"
 msgstr "允许下载新任务"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:134
-#: clientgui/ViewProjects.cpp:742
 msgid "Allow fetching new tasks for this project."
 msgstr "允许当前项目下载新任务。"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:137
-#: clientgui/ViewProjects.cpp:746
 msgid "Don't fetch new tasks for this project."
 msgstr "禁止当前项目下载新任务。"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:229
-#: clientgui/ViewProjects.cpp:443
 #, c-format
 msgid "Are you sure you want to reset project '%s'?"
 msgstr "您确定要重置'%s'项目吗?"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:235
-#: clientgui/ViewProjects.cpp:449
 msgid "Reset Project"
 msgstr "重置项目"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:266
-#: clientgui/ViewProjects.cpp:501
 #, c-format
 msgid "Are you sure you want to remove project '%s'?"
 msgstr "您确定要删除'%s'项目吗?"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:272
-#: clientgui/ViewProjects.cpp:507
 msgid "Remove Project"
 msgstr "移除项目"
 
@@ -3072,6 +2969,10 @@ msgstr "同步"
 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 "从帐户管理系统同步项目"
@@ -3135,9 +3036,7 @@ msgstr "暂停计算当前任务。"
 msgid ""
 "Are you sure you want to abort this task '%s'?\n"
 "(Progress: %.1lf%%, Status: %s)"
-msgstr ""
-"您确定要中止当前任务'%s'吗?\n"
-"( 进度:%.1lf%%,状态:%s )"
+msgstr "您确定要中止当前任务'%s'吗?\n( 进度:%.1lf%%,状态:%s )"
 
 #: clientgui/sg_TaskCommandPopup.cpp:272
 msgid "Abort task"
@@ -3208,52 +3107,51 @@ msgstr "剩余时间:%s"
 msgid "Status: %s"
 msgstr "状态:%s"
 
-#: clientgui/sg_TaskPanel.cpp:1227
+#: clientgui/sg_TaskPanel.cpp:1228
 msgid "Retrieving current status."
 msgstr "正在获取当前状态。"
 
-#: clientgui/sg_TaskPanel.cpp:1233
+#: clientgui/sg_TaskPanel.cpp:1234
 msgid "Downloading work from the server."
 msgstr "正在从服务器下载任务。"
 
-#: clientgui/sg_TaskPanel.cpp:1238
+#: clientgui/sg_TaskPanel.cpp:1239
 msgid "Processing Suspended:  Running On Batteries."
 msgstr "暂停计算:电池供电。"
 
-#: clientgui/sg_TaskPanel.cpp:1240
+#: clientgui/sg_TaskPanel.cpp:1241
 msgid "Processing Suspended:  User Active."
 msgstr "暂停计算:用户活跃。"
 
-#: clientgui/sg_TaskPanel.cpp:1242
+#: clientgui/sg_TaskPanel.cpp:1243
 msgid "Processing Suspended:  User paused processing."
 msgstr "暂停计算:用户暂停计算。"
 
-#: clientgui/sg_TaskPanel.cpp:1244
+#: clientgui/sg_TaskPanel.cpp:1245
 msgid "Processing Suspended:  Time of Day."
 msgstr "暂停计算: 休息时间段。"
 
-#: clientgui/sg_TaskPanel.cpp:1246
+#: clientgui/sg_TaskPanel.cpp:1247
 msgid "Processing Suspended:  Benchmarks Running."
 msgstr "暂停计算:正在运行基准测试。"
 
-#: clientgui/sg_TaskPanel.cpp:1248
+#: clientgui/sg_TaskPanel.cpp:1249
 msgid "Processing Suspended."
 msgstr "暂停计算。"
 
-#: clientgui/sg_TaskPanel.cpp:1252
+#: clientgui/sg_TaskPanel.cpp:1253
 msgid "Waiting to contact project servers."
 msgstr "正在等待连接项目服务器。"
 
-#: clientgui/sg_TaskPanel.cpp:1256
-#: clientgui/sg_TaskPanel.cpp:1265
+#: clientgui/sg_TaskPanel.cpp:1257 clientgui/sg_TaskPanel.cpp:1266
 msgid "Retrieving current status"
 msgstr "正在获取当前状态"
 
-#: clientgui/sg_TaskPanel.cpp:1260
+#: clientgui/sg_TaskPanel.cpp:1261
 msgid "No work available to process"
 msgstr "无任务可供处理"
 
-#: clientgui/sg_TaskPanel.cpp:1262
+#: clientgui/sg_TaskPanel.cpp:1263
 msgid "Unable to connect to the core client"
 msgstr "无法连接至客户端的核心服务程序"
 
@@ -3282,10 +3180,7 @@ msgid ""
 "The project is temporarily unavailable.\n"
 "\n"
 "Please try again later."
-msgstr ""
-"项目已暂停服务。\n"
-"\n"
-"请稍后重试。"
+msgstr "项目已暂停服务。\n\n请稍后重试。"
 
 #: clientgui/UnavailablePage.cpp:190
 msgid "Account manager temporarily unavailable"
@@ -3296,10 +3191,7 @@ msgid ""
 "The account manager is temporarily unavailable.\n"
 "\n"
 "Please try again later."
-msgstr ""
-"帐户管理器已暂停服务。\n"
-"\n"
-"请稍后重试。"
+msgstr "帐户管理器已暂停服务。\n\n请稍后重试。"
 
 #: clientgui/ValidateAccountKey.cpp:68
 msgid "Please specify an account key to continue."
@@ -3309,8 +3201,7 @@ msgstr "请输入帐户密钥以继续。"
 msgid "Invalid Account Key; please enter a valid Account Key"
 msgstr "此帐户密钥错误;请输入一个正确的帐户密钥"
 
-#: clientgui/ValidateAccountKey.cpp:82
-#: clientgui/ValidateEmailAddress.cpp:86
+#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
 msgid "Validation conflict"
 msgstr "验证冲突"
 
@@ -3331,34 +3222,23 @@ msgid ""
 "Please specify a URL.\n"
 "For example:\n"
 "http://www.example.com/"
-msgstr ""
-"请输入一个网址。\n"
-"例如:\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
+#: clientgui/ValidateURL.cpp:83 clientgui/ValidateURL.cpp:87
+#: clientgui/ValidateURL.cpp:91 clientgui/ValidateURL.cpp:103
+#: clientgui/ValidateURL.cpp:107 clientgui/ValidateURL.cpp:110
 msgid "Invalid URL"
 msgstr "错误的网址"
 
-#: clientgui/ValidateURL.cpp:84
-#: clientgui/ValidateURL.cpp:88
+#: clientgui/ValidateURL.cpp:84 clientgui/ValidateURL.cpp:88
 #: clientgui/ValidateURL.cpp:92
 msgid ""
 "Please specify a valid URL.\n"
 "For example:\n"
 "http://boincproject.example.com"
-msgstr ""
-"请输入一个正确的网址。\n"
-"比如:\n"
-"http://boincproject.example.com/"
+msgstr "请输入一个正确的网址。\n比如:\nhttp://boincproject.example.com/"
 
-#: clientgui/ValidateURL.cpp:104
-#: clientgui/ValidateURL.cpp:108
+#: clientgui/ValidateURL.cpp:104 clientgui/ValidateURL.cpp:108
 #, c-format
 msgid "'%s' does not contain a valid host name."
 msgstr "'%s'中未包含正确的主机名称。"
@@ -3369,7 +3249,6 @@ msgid "'%s' does not contain a valid path."
 msgstr "'%s'中未包含正确的路径。"
 
 #: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:175
 msgid "Commands"
 msgstr "命令"
 
@@ -3381,13 +3260,11 @@ msgstr "复制所有消息"
 msgid "Copy selected messages"
 msgstr "复制选中的消息"
 
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
+#: clientgui/ViewMessages.cpp:106 clientgui/ViewMessages.cpp:502
 msgid "Show only this project"
 msgstr "仅显示当前项目"
 
-#: clientgui/ViewMessages.cpp:107
-#: clientgui/ViewMessages.cpp:503
+#: clientgui/ViewMessages.cpp:107 clientgui/ViewMessages.cpp:503
 msgid "Show only the messages for the selected project."
 msgstr "仅显示当前选中项目的消息。"
 
@@ -3415,119 +3292,120 @@ msgstr "显示所有消息"
 msgid "Show messages for all projects."
 msgstr "显示所有项目的消息。"
 
-#: clientgui/ViewProjects.cpp:225
+#: clientgui/ViewProjects.cpp:246 clientgui/ViewStatistics.cpp:426
 msgid "Account"
 msgstr "帐户"
 
-#: clientgui/ViewProjects.cpp:227
+#: clientgui/ViewProjects.cpp:248
 msgid "Work done"
 msgstr "总积分"
 
-#: clientgui/ViewProjects.cpp:228
+#: clientgui/ViewProjects.cpp:249
 msgid "Avg. work done"
 msgstr "近期平均积分"
 
-#: clientgui/ViewProjects.cpp:230
+#: clientgui/ViewProjects.cpp:251 clientgui/ViewTransfers.cpp:215
+#: clientgui/ViewWork.cpp:262
 msgid "Status"
 msgstr "状态"
 
-#: clientgui/ViewProjects.cpp:255
+#: clientgui/ViewProjects.cpp:330
 msgid "Projects"
 msgstr "项目"
 
-#: clientgui/ViewProjects.cpp:307
+#: clientgui/ViewProjects.cpp:382
 msgid "Updating project..."
 msgstr "正在更新项目..."
 
-#: clientgui/ViewProjects.cpp:349
+#: clientgui/ViewProjects.cpp:424
 msgid "Resuming project..."
 msgstr "正在继续项目..."
 
-#: clientgui/ViewProjects.cpp:353
+#: clientgui/ViewProjects.cpp:428
 msgid "Suspending project..."
 msgstr "正在暂停项目..."
 
-#: clientgui/ViewProjects.cpp:390
+#: clientgui/ViewProjects.cpp:465
 msgid "Telling project to allow additional task downloads..."
 msgstr "允许项目下载更多的任务..."
 
-#: clientgui/ViewProjects.cpp:394
+#: clientgui/ViewProjects.cpp:469
 msgid "Telling project to not fetch any additional tasks..."
 msgstr "禁止项目下载更多的任务..."
 
-#: clientgui/ViewProjects.cpp:430
+#: clientgui/ViewProjects.cpp:505
 msgid "Resetting project..."
 msgstr "正在重置项目..."
 
-#: clientgui/ViewProjects.cpp:488
+#: clientgui/ViewProjects.cpp:563
 msgid "Removing project..."
 msgstr "正在删除项目..."
 
-#: clientgui/ViewProjects.cpp:548
+#: clientgui/ViewProjects.cpp:623 clientgui/ViewWork.cpp:686
 msgid "Launching browser..."
 msgstr "正在启动浏览器..."
 
-#: clientgui/ViewProjects.cpp:1063
+#: clientgui/ViewProjects.cpp:1140
 msgid "Requested by user"
 msgstr "用户发起的请求"
 
-#: clientgui/ViewProjects.cpp:1064
+#: clientgui/ViewProjects.cpp:1141
 msgid "To fetch work"
 msgstr "获取新的任务"
 
-#: clientgui/ViewProjects.cpp:1065
+#: clientgui/ViewProjects.cpp:1142
 msgid "To report completed tasks"
 msgstr "上报已经完成的任务"
 
-#: clientgui/ViewProjects.cpp:1066
+#: clientgui/ViewProjects.cpp:1143
 msgid "To send trickle-up message"
 msgstr "发送上传消息"
 
-#: clientgui/ViewProjects.cpp:1067
+#: clientgui/ViewProjects.cpp:1144
 msgid "Requested by account manager"
 msgstr "帐户管理器发起的请求"
 
-#: clientgui/ViewProjects.cpp:1068
+#: clientgui/ViewProjects.cpp:1145
 msgid "Project initialization"
 msgstr "项目初始化"
 
-#: clientgui/ViewProjects.cpp:1069
+#: clientgui/ViewProjects.cpp:1146
 msgid "Requested by project"
 msgstr "项目发起的请求"
 
-#: clientgui/ViewProjects.cpp:1070
+#: clientgui/ViewProjects.cpp:1147
 msgid "Unknown reason"
 msgstr "未知原因"
 
-#: clientgui/ViewProjects.cpp:1084
+#: clientgui/ViewProjects.cpp:1161
 msgid "Suspended by user"
 msgstr "已被用户暂停"
 
-#: clientgui/ViewProjects.cpp:1087
+#: clientgui/ViewProjects.cpp:1164
 msgid "Won't get new tasks"
 msgstr "禁止下载新任务"
 
-#: clientgui/ViewProjects.cpp:1090
+#: clientgui/ViewProjects.cpp:1167
 msgid "Project ended - OK to remove"
 msgstr "项目已结束 - 可以删除"
 
-#: clientgui/ViewProjects.cpp:1093
+#: clientgui/ViewProjects.cpp:1170
 msgid "Will remove when tasks done"
 msgstr "将在任务完成后删除"
 
-#: clientgui/ViewProjects.cpp:1096
+#: clientgui/ViewProjects.cpp:1173
 msgid "Scheduler request pending"
 msgstr "等待调度请求"
 
-#: clientgui/ViewProjects.cpp:1102
+#: clientgui/ViewProjects.cpp:1179
 msgid "Scheduler request in progress"
 msgstr "正在进行调度请求"
 
-#: clientgui/ViewProjects.cpp:1105
+#: clientgui/ViewProjects.cpp:1182
 msgid "Trickle up message pending"
 msgstr "上传消息等待中"
 
-#: clientgui/ViewProjects.cpp:1111
+#: clientgui/ViewProjects.cpp:1188
 msgid "Communication deferred "
 msgstr "通讯被延迟 "
 
@@ -3539,31 +3417,27 @@ msgstr "总磁盘占用"
 msgid "Disk usage by BOINC projects"
 msgstr "BOINC 项目的磁盘占用"
 
-#: clientgui/ViewResources.cpp:116
-msgid "Disk"
-msgstr "磁盘"
-
 #: clientgui/ViewResources.cpp:225
 msgid "no projects: 0 bytes used"
 msgstr "未加入任何项目:磁盘空间占用为零"
 
-#: clientgui/ViewResources.cpp:262
+#: clientgui/ViewResources.cpp:259
 msgid "used by BOINC: "
 msgstr "BOINC 使用:"
 
-#: clientgui/ViewResources.cpp:272
+#: clientgui/ViewResources.cpp:269
 msgid "free, available to BOINC: "
 msgstr "BOINC 可用的剩余磁盘空间:"
 
-#: clientgui/ViewResources.cpp:282
+#: clientgui/ViewResources.cpp:279
 msgid "free, not available to BOINC: "
 msgstr "BOINC 不可用的剩余磁盘空间:"
 
-#: clientgui/ViewResources.cpp:292
+#: clientgui/ViewResources.cpp:289
 msgid "free: "
 msgstr "可用磁盘空间:"
 
-#: clientgui/ViewResources.cpp:302
+#: clientgui/ViewResources.cpp:299
 msgid "used by other programs: "
 msgstr "其它程序使用:"
 
@@ -3636,13 +3510,11 @@ msgstr "后一项目(&N) >"
 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 "将整块区域用作图形显示"
 
@@ -3686,16 +3558,11 @@ msgstr "在一张图表中显示所有项目"
 msgid "Statistics"
 msgstr "统计"
 
-#: clientgui/ViewStatistics.cpp:2077
-#: clientgui/ViewStatistics.cpp:2098
-#: clientgui/ViewStatistics.cpp:2119
-#: clientgui/ViewStatistics.cpp:2141
-#: clientgui/ViewStatistics.cpp:2162
-#: clientgui/ViewStatistics.cpp:2183
-#: clientgui/ViewStatistics.cpp:2204
-#: clientgui/ViewStatistics.cpp:2225
-#: clientgui/ViewStatistics.cpp:2246
-#: clientgui/ViewStatistics.cpp:2270
+#: clientgui/ViewStatistics.cpp:2077 clientgui/ViewStatistics.cpp:2098
+#: clientgui/ViewStatistics.cpp:2119 clientgui/ViewStatistics.cpp:2141
+#: clientgui/ViewStatistics.cpp:2162 clientgui/ViewStatistics.cpp:2183
+#: clientgui/ViewStatistics.cpp:2204 clientgui/ViewStatistics.cpp:2225
+#: clientgui/ViewStatistics.cpp:2246 clientgui/ViewStatistics.cpp:2270
 msgid "Updating charts..."
 msgstr "正在更新图表..."
 
@@ -3707,199 +3574,185 @@ msgstr "显示项目列表"
 msgid "Uses smaller area for graphs"
 msgstr "使用更小的图表显示区域"
 
-#: clientgui/ViewTransfers.cpp:169
+#: clientgui/ViewTransfers.cpp:187
 msgid "Retry Now"
 msgstr "立即重试"
 
-#: clientgui/ViewTransfers.cpp:170
+#: clientgui/ViewTransfers.cpp:188
 msgid "Retry the file transfer now"
 msgstr "立即重试该文件的传输。"
 
-#: clientgui/ViewTransfers.cpp:176
+#: clientgui/ViewTransfers.cpp:194
 msgid "Abort Transfer"
 msgstr "中断传输"
 
-#: clientgui/ViewTransfers.cpp:177
+#: clientgui/ViewTransfers.cpp:195
 msgid "Abort this file transfer.  You won't get credit for the task."
 msgstr "中止该文件的传输,你将得不到相应的任务积分。"
 
-#: clientgui/ViewTransfers.cpp:188
+#: clientgui/ViewTransfers.cpp:210
 msgid "File"
 msgstr "文件"
 
-#: clientgui/ViewTransfers.cpp:189
-#: clientgui/ViewWork.cpp:238
+#: clientgui/ViewTransfers.cpp:211 clientgui/ViewWork.cpp:261
 msgid "Progress"
 msgstr "进度"
 
-#: clientgui/ViewTransfers.cpp:190
+#: clientgui/ViewTransfers.cpp:212
 msgid "Size"
 msgstr "大小"
 
-#: clientgui/ViewTransfers.cpp:191
-msgid "Elapsed Time"
+#: clientgui/ViewTransfers.cpp:213 clientgui/ViewWork.cpp:263
+msgid "Elapsed"
 msgstr "已用时间"
 
-#: clientgui/ViewTransfers.cpp:192
+#: clientgui/ViewTransfers.cpp:214
 msgid "Speed"
 msgstr "速度"
 
-#: clientgui/ViewTransfers.cpp:218
+#: clientgui/ViewTransfers.cpp:295
 msgid "Transfers"
 msgstr "网络传输"
 
-#: clientgui/ViewTransfers.cpp:285
+#: clientgui/ViewTransfers.cpp:362
 msgid "Network activity is suspended - "
 msgstr "网络被暂停 - "
 
-#: clientgui/ViewTransfers.cpp:287
+#: clientgui/ViewTransfers.cpp:364
 msgid ""
 ".\n"
 "You can enable it using the Activity menu."
-msgstr ""
-"。\n"
-"你可以在“活动”菜单中重新启用它。"
+msgstr "。\n你可以在“活动”菜单中重新启用它。"
 
-#: clientgui/ViewTransfers.cpp:290
+#: clientgui/ViewTransfers.cpp:367
 msgid "BOINC"
 msgstr "BOINC"
 
-#: clientgui/ViewTransfers.cpp:297
+#: clientgui/ViewTransfers.cpp:374
 msgid "Retrying transfer now..."
 msgstr "正在重试传输..."
 
-#: clientgui/ViewTransfers.cpp:335
+#: clientgui/ViewTransfers.cpp:412
 msgid "Aborting transfer..."
 msgstr "中断传输..."
 
-#: clientgui/ViewTransfers.cpp:348
+#: 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"
-"注意:中断传输将标识该任务为无效,您将不能从该任务得到积分。"
+msgstr "您确信要中断文件'%s'的传输吗?\n注意:中断传输将标识该任务为无效,您将不能从该任务得到积分。"
 
-#: clientgui/ViewTransfers.cpp:354
+#: clientgui/ViewTransfers.cpp:431
 msgid "Abort File Transfer"
 msgstr "中断文件传输"
 
-#: clientgui/ViewTransfers.cpp:785
+#: clientgui/ViewTransfers.cpp:864
 msgid "Upload"
 msgstr "上传"
 
-#: clientgui/ViewTransfers.cpp:785
+#: clientgui/ViewTransfers.cpp:864
 msgid "Download"
 msgstr "下载"
 
-#: clientgui/ViewTransfers.cpp:789
+#: clientgui/ViewTransfers.cpp:868
 msgid "retry in "
 msgstr "稍后重试 "
 
-#: clientgui/ViewTransfers.cpp:791
+#: clientgui/ViewTransfers.cpp:870
 msgid "failed"
 msgstr "失败"
 
-#: clientgui/ViewTransfers.cpp:794
+#: clientgui/ViewTransfers.cpp:873
 msgid "suspended"
 msgstr "暂停"
 
-#: clientgui/ViewTransfers.cpp:799
+#: clientgui/ViewTransfers.cpp:878
 msgid "active"
 msgstr "处理中"
 
-#: clientgui/ViewTransfers.cpp:801
+#: clientgui/ViewTransfers.cpp:880
 msgid "pending"
 msgstr "等待中"
 
-#: clientgui/ViewTransfers.cpp:808
+#: clientgui/ViewTransfers.cpp:887
 msgid " (project backoff: "
-msgstr "( 项目延后:"
+msgstr "(项目延后:"
 
-#: clientgui/ViewWork.cpp:192
-#: clientgui/ViewWork.cpp:782
+#: clientgui/ViewWork.cpp:211 clientgui/ViewWork.cpp:864
 msgid "Show active tasks"
 msgstr "显示活动任务"
 
-#: clientgui/ViewWork.cpp:193
-#: clientgui/ViewWork.cpp:783
+#: clientgui/ViewWork.cpp:212 clientgui/ViewWork.cpp:865
 msgid "Show only active tasks."
 msgstr "只显示正在计算过程中的任务。"
 
-#: clientgui/ViewWork.cpp:206
+#: clientgui/ViewWork.cpp:225
 msgid "Show VM Console"
 msgstr "显示虚拟机控制台"
 
-#: clientgui/ViewWork.cpp:207
+#: clientgui/ViewWork.cpp:226
 msgid "Show VM Console in a window."
 msgstr "在窗口里显示虚拟机控制台。"
 
-#: clientgui/ViewWork.cpp:214
+#: clientgui/ViewWork.cpp:233
 msgid "Suspend work for this result."
 msgstr "暂停当前任务。"
 
-#: clientgui/ViewWork.cpp:221
+#: clientgui/ViewWork.cpp:240
 msgid "Abandon work on the result. You will get no credit for it."
 msgstr "中止该任务,您将不能得到它的积分。"
 
-#: clientgui/ViewWork.cpp:240
-msgid "Elapsed"
-msgstr "已用时间"
-
-#: clientgui/ViewWork.cpp:241
+#: clientgui/ViewWork.cpp:264
 msgid "Remaining (estimated)"
 msgstr "剩余时间(估计)"
 
-#: clientgui/ViewWork.cpp:242
+#: clientgui/ViewWork.cpp:265
 msgid "Deadline"
 msgstr "上报期限"
 
-#: clientgui/ViewWork.cpp:269
+#: clientgui/ViewWork.cpp:351
 msgid "Tasks"
 msgstr "任务"
 
-#: clientgui/ViewWork.cpp:362
+#: clientgui/ViewWork.cpp:444
 msgid "Resuming task..."
 msgstr "正在继续该任务..."
 
-#: clientgui/ViewWork.cpp:365
+#: clientgui/ViewWork.cpp:447
 msgid "Suspending task..."
 msgstr "正在暂停该任务..."
 
-#: clientgui/ViewWork.cpp:394
+#: clientgui/ViewWork.cpp:476
 msgid "Showing graphics for task..."
 msgstr "正在显示该任务的图形..."
 
-#: clientgui/ViewWork.cpp:431
+#: clientgui/ViewWork.cpp:513
 msgid "Showing VM console for task..."
 msgstr "显示指定任务的虚拟机控制台..."
 
-#: clientgui/ViewWork.cpp:484
+#: 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 )"
+msgstr "您确定要中止当前任务'%s'吗?\n(进度:%s,状态:%s)"
 
-#: clientgui/ViewWork.cpp:490
+#: clientgui/ViewWork.cpp:572
 #, c-format
 msgid "Are you sure you want to abort these %d tasks?"
 msgstr "您确定想要中止这 %d 个任务吗?"
 
-# 75%
-#: clientgui/ViewWork.cpp:504
+#: clientgui/ViewWork.cpp:586
 msgid "Aborting task..."
 msgstr "中止任务..."
 
-#: clientgui/ViewWork.cpp:776
+#: clientgui/ViewWork.cpp:858
 msgid "Show all tasks"
 msgstr "显示所有任务"
 
-#: clientgui/ViewWork.cpp:777
+#: clientgui/ViewWork.cpp:859
 msgid "Show all tasks."
 msgstr "显示所有的任务。"
 
@@ -3919,10 +3772,7 @@ msgid ""
 "\n"
 "Projects added via this wizard will not be\n"
 "listed on or managed via %s."
-msgstr ""
-"如果可能的话,请在 %s 网站添加项目。\n"
-"\n"
-"通过向导增加的项目将不能在 %s 中显示及进行管理。"
+msgstr "如果可能的话,请在 %s 网站添加项目。\n\n通过向导增加的项目将不能在 %s 中显示及进行管理。"
 
 #: clientgui/WelcomePage.cpp:313
 msgid ""
@@ -3931,10 +3781,7 @@ msgid ""
 "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"
-"你既可以直接加入项目,也可以通过“帐户管理器”网站来选择项目。"
+msgstr "目前有超过 30 个基于 BOINC 的项目,其研究内容涉及多个科学领域,\n你可以根据自己的喜好参加这些项目。\n你既可以直接加入项目,也可以通过“帐户管理器”网站来选择项目。"
 
 #: clientgui/WelcomePage.cpp:325
 msgid ""
@@ -3949,16 +3796,7 @@ msgid ""
 "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"
-"还有一些是由其它的研究人员或机构运营和管理。\n"
-"BOINC 软件允许你基于各种项目组合来分配计算资源。\n"
-"\n"
-"此外,如果你注册了 BOINC 账户管理器,也可以使用它来选择你要支持的项目。\n"
-"\n"
-"请根据你的需要进行选择:\n"
+msgstr "你已经选择添加一个新的志愿计算项目或改变你已经参加的项目。\n\n这其中的一些项目是由 World Community Grid 来运营和管理的,\n还有一些是由其它的研究人员或机构运营和管理。\nBOINC 软件允许你基于各种项目组合来分配计算资源。\n\n此外,如果你注册了 BOINC 账户管理器,也可以使用它来选择你要支持的项目。\n\n请根据你的需要进行选择:\n"
 
 #: clientgui/WelcomePage.cpp:339
 msgid "Use a BOINC Account Manager"
@@ -3972,16 +3810,15 @@ msgstr "添加或改变你在 World Community Grid 上的项目"
 msgid "Add projects run by other researchers or organizations"
 msgstr "添加其它研究人员或机构运营的项目"
 
-#: clientgui/WizardAttach.cpp:673
+#: clientgui/WizardAttach.cpp:560
 msgid "Do you really want to cancel?"
 msgstr "您确定要取消吗?"
 
-#: clientgui/WizardAttach.cpp:674
+#: clientgui/WizardAttach.cpp:561
 msgid "Question"
 msgstr "问题"
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
+#: clientgui/wizardex.cpp:377 clientgui/wizardex.cpp:553
 msgid "&Next >"
 msgstr "下一步(&N) >"
 
@@ -3995,7 +3832,7 @@ msgstr "完成(&F)"
 
 #: clientgui/common/wxPieCtrl.cpp:64
 msgid "Pie Ctrl"
-msgstr "派图"
+msgstr "图表控制"
 
 #: clientgui/mac/Mac_GUI.cpp:35
 msgid "Services"
@@ -4019,772 +3856,10 @@ msgstr "显示所有"
 msgid "Quit %s"
 msgstr "退出 %s"
 
-#: clientgui/DlgAdvPreferences.h:30
-msgid "specify work start and stop hours in format HH:MM-HH:MM"
-msgstr "指定开始和停止计算的时间,格式是 HH:MM-HH:MM"
-
-#: clientgui/DlgAdvPreferences.h:31
-msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
-msgstr "指定开始和停止使用网络的时间,格式是 HH:MM-HH:MM"
-
-# 98%
-#~ msgid ""
-#~ "(C) 2003-2013 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2013 加州大学伯克利分校。\n"
-#~ "保留所有权利。\n"
-#~ "\n"
-#~ "( 中文翻译: 2005-2013 Yin Gang @ Team China )\n"
-#~ "( 中文网站: http://www.equn.com )\n"
-#~ "( 中文论坛: http://www.equn.com/forum )\n"
-#~ "( 新浪微博: @志愿计算 )"
-#, c-format
-#~ msgid "%s - Preferences"
-#~ msgstr "%s - 本地参数设置"
-
-#, no-c-format
-#~ msgid "% of the processors (0 means ignore this setting)"
-#~ msgstr "% 的处理器(0 表示不限制)"
-
-#, no-c-format
-#~ msgid "% CPU time"
-#~ msgstr "% CPU时间"
-#~ msgid "KBytes/sec."
-#~ msgstr "千字节/秒。"
-#~ msgid "Mbytes"
-#~ msgstr "MB"
-#~ msgid "every"
-#~ msgstr "每"
-#~ msgid "days"
-#~ msgstr "天"
-#~ msgid "Gigabytes disk space"
-#~ msgstr "磁盘空间 (GB)"
-#~ msgid "Running, high priority"
-#~ msgstr "运行中,高优先级"
-#~ msgid " (Scheduler wait: "
-#~ msgstr "(调度等待:"
-#~ msgid " (Scheduler wait)"
-#~ msgstr "(调度等待)"
-#~ msgid " (Waiting for network access)"
-#~ msgstr " (正等待访问网络)"
-#~ msgid "Preferences…"
-#~ msgstr "参数设置..."
-#~ msgid "I do not agree with the terms of use."
-#~ msgstr "我不同意该使用协议。"
-#~ msgid "Click Clear to restore web-based settings."
-#~ msgstr "点击取消将恢复使用项目网站上的参数设置。"
-#~ msgid "For additional settings, select Computing Preferences in "
-#~ msgstr "更多的参数设置,请切换至"
-#~ msgid "the Advanced View."
-#~ msgstr "高级视图。"
-#~ msgid "Workunit name"
-#~ msgstr "任务单元名称"
-#~ msgid "invalid float"
-#~ msgstr "非法的浮点数"
-#~ msgid "Display the advanced (accessible) graphical interface."
-#~ msgstr "显示高级图形界面。"
-#~ msgid "Paused: Other work running"
-#~ msgstr "暂停:其它任务在运行"
-#~ msgid "Paused: User initiated.  Click 'Resume' to continue"
-#~ msgstr "已暂停:由用户发起,点击“继续”即可继续"
-#~ msgid "Paused: User active"
-#~ msgstr "暂停:用户活跃"
-#~ msgid "Paused: Computer on battery"
-#~ msgstr "暂停:电池供电"
-#~ msgid "Paused: Time of Day"
-#~ msgstr "暂停:非计算时段"
-#~ msgid "Paused: Benchmarks running"
-#~ msgstr "暂停:正在进行基准测试"
-#~ msgid "Paused"
-#~ msgstr "暂停"
-#~ msgid "Paused: Application start delayed"
-#~ msgstr "暂停:计算程序延迟启动"
-#~ msgid "Click to show project graphics"
-#~ msgstr "点击即可显示项目图形"
-#~ msgid "Open a window to view messages"
-#~ msgstr "打开一个窗口来查看消息"
-#~ msgid "Stop all activity"
-#~ msgstr "暂停所有活动"
-#~ msgid "Resume activity"
-#~ msgstr "继续所有活动"
-#~ msgid "Open a window to set your preferences"
-#~ msgstr "打开一个窗口进行本地参数设置"
-#~ msgid "Switch to the BOINC advanced view"
-#~ msgstr "切换到 BOINC 的高级视图"
-#~ msgid "My Projects:"
-#~ msgstr "我的项目:"
-
-#, c-format
-#~ msgid "%s. Work done by %s: %0.2f"
-#~ msgstr "%s。%s 已经完成的任务:%0.2f"
-
-#, c-format
-#~ msgid "%.1lf"
-#~ msgstr "%.1lf"
-
-#, c-format
-#~ msgid "%d hr %d min %d sec"
-#~ msgstr "%d时%d分%d秒"
-#~ msgid "Are you sure you want to display graphics on a remote machine?"
-#~ msgstr "您确定要在远程计算机上显示图形吗?"
-#~ msgid "Application: "
-#~ msgstr "计算程序:"
-#~ msgid "Time Remaining: "
-#~ msgstr "剩余时间:"
-#~ msgid "Elapsed Time: "
-#~ msgstr "已用时间:"
-#~ msgid "Account manager website"
-#~ msgstr "帐户管理器网站"
-#~ msgid "Account Manager &URL:"
-#~ msgstr "帐户管理器的网址(&U):"
-
-#, c-format
-#~ msgid "%s &website"
-#~ msgstr "%s 网站(&W)"
-#~ msgid "Notice List"
-#~ msgstr "通知列表"
-
-#, c-format
-#~ msgid "%s; received on %s"
-#~ msgstr "%s;接收自 %s"
-
-#, c-format
-#~ msgid "%s; received from %s; on %s"
-#~ msgstr "%s;接收自 %s;时间 %s"
-#~ msgid "Click"
-#~ msgstr "点击"
-#~ msgid "Project List"
-#~ msgstr "项目列表"
-#~ msgid "Nvidia GPU Supported"
-#~ msgstr "已支持 Nvidia GPU"
-#~ msgid "ATI GPU Supported"
-#~ msgstr "已支持 ATI GPU"
-#~ msgid "Project Website"
-#~ msgstr "项目网站"
-#~ msgid "One or more items failed to load from the Internet."
-#~ msgstr "从互联网加载一个或多个项目失败。"
-
-# 88%
-#~ msgid "Retry now"
-#~ msgstr "立即重试"
-#~ msgid "10%"
-#~ msgstr "10%"
-#~ msgid "20%"
-#~ msgstr "20%"
-#~ msgid "30%"
-#~ msgstr "30%"
-#~ msgid "40%"
-#~ msgstr "40%"
-#~ msgid "50%"
-#~ msgstr "50%"
-#~ msgid "60%"
-#~ msgstr "60%"
-#~ msgid "70%"
-#~ msgstr "70%"
-#~ msgid "80%"
-#~ msgstr "80%"
-#~ msgid "90%"
-#~ msgstr "90%"
-#~ msgid "100%"
-#~ msgstr "100%"
-#~ msgid "1"
-#~ msgstr "1"
-#~ msgid "3"
-#~ msgstr "3"
-#~ msgid "5"
-#~ msgstr "5"
-#~ msgid "10"
-#~ msgstr "10"
-#~ msgid "15"
-#~ msgstr "15"
-#~ msgid "30"
-#~ msgstr "30"
-#~ msgid "60"
-#~ msgstr "60"
-#, c-format
-#~ msgid "Pop up a menu of websites for project %s"
-#~ msgstr "弹出一个 %s 项目的网站菜单"
-#~ msgid ""
-#~ "for accessibility support, please select advanced from the view menu or type "
-#~ "command shift a"
-#~ msgstr "要使用辅助功能,请从查看菜单中选择高级或者输入 shift a 命令"
-#~ msgid "This panel contains graphs showing user totals for projects"
-#~ msgstr "该面板用来显示用户在各个项目的统计图表"
-#~ msgid "list headers"
-#~ msgstr "列表头"
-#~ msgid "list of events"
-#~ msgstr "事件列表"
-#~ msgid "list of events is empty"
-#~ msgstr "事件列表为空"
-
-#, c-format
-#~ msgid "list of %s"
-#~ msgstr "%s列表"
-
-#, c-format
-#~ msgid "list of %s is empty"
-#~ msgstr "%s列表为空"
-
-#, c-format
-#~ msgid "; current sort column %d of %d; descending order; "
-#~ msgstr "; 当前排序列 %d / %d; 降序;"
-
-#, c-format
-#~ msgid "; current sort column %d of %d; ascending order; "
-#~ msgstr "; 当前排序列 %d / %d; 升序;"
-
-#, c-format
-#~ msgid "; column %d of %d; "
-#~ msgstr "; 第 %d 列(共 %d 列);"
-#~ msgid "list is empty"
-#~ msgstr "列表为空"
-
-#, c-format
-#~ msgid "; row %d; "
-#~ msgstr "; 第 %d 行;"
-
-#, c-format
-#~ msgid "; selected row %d of %d; "
-#~ msgstr "; 选中行 %d(共 %d 行);"
-
-#, c-format
-#~ msgid "; selected row %d ; "
-#~ msgstr "; 选中行 %d;"
-
-#, c-format
-#~ msgid "; row %d of %d; "
-#~ msgstr "; 第 %d 行(共 %d 行);"
-#~ msgid "blank"
-#~ msgstr "空白"
-#~ msgid "list of projects or account managers"
-#~ msgstr "项目或帐户管理器列表"
-
-#, c-format
-#~ msgid "selected row %d of %d; "
-#~ msgstr "选中行 %d(共 %d 行);"
-
-#, c-format
-#~ msgid "row %d of %d; "
-#~ msgstr "第 %d 行(共 %d 行);"
-#~ msgid "The minimum username length for this project is 1. Please enter a different username."
-#~ msgstr "该项目要求的最小用户名称长度是1,请输入一个不同的名称。"
-#~ msgid "The minimum username length for this account manager is 1. Please enter a different username."
-#~ msgstr "该账户管理器要求的最小用户名称长度是1,请输入一个不同的名称。"
-#~ msgid "The minimum email address length for this project is 1. Please enter a different email address."
-#~ msgstr "该项目要求的最小电子邮箱地址长度是1,请输入一个不同的电子邮箱地址。"
-#~ msgid "The minimum email address length for this account manager is 1. Please enter a different email address."
-#~ msgstr "该项目要求的最小电子邮箱地址长度是1,请输入一个不同的电子邮箱地址。"
-
-#, c-format
-#~ msgid "The minimum password length for this project is %d. Please enter a different password."
-#~ msgstr "该项目要求的最小密码长度为%d,请输入符合要求的密码。"
-
-#, c-format
-#~ msgid "The minimum password length for this account manager is %d. Please enter a different password."
-#~ msgstr "该帐户管理器要求的最小密码长度为%d。请输入符合要求的密码。"
-#~ msgid ""
-#~ "An error has occurred;\n"
-#~ "check the Event Log for details.\n"
-#~ "\n"
-#~ "Click Finish to close."
-#~ msgstr ""
-#~ "发生了一个错误;\n"
-#~ "请检查“事件日志”以了解更多细节。\n"
-#~ "\n"
-#~ "点击完成可关闭本窗口。"
-
-#, no-c-format
-#~ msgid "% of the processors"
-#~ msgstr "% 处理器"
-
-#, c-format
-#~ msgid "New page inserted. Index = %i"
-#~ msgstr "New page inserted. Index = %i"
-
-#, c-format
-#~ msgid "New page appended. Index = %i"
-#~ msgstr "New page appended. Index = %i"
-
-#, c-format
-#~ msgid "Old Page Index = %i"
-#~ msgstr "Old Page Index = %i"
-
-#, c-format
-#~ msgid "OnDropTarget: index by HitTest = %i"
-#~ msgstr "OnDropTarget: index by HitTest = %i"
-#~ msgid "Identify your account "
-#~ msgstr "确认您的帐户"
-#~ msgid "Read config file"
-#~ msgstr "读取客户端核心配置文件"
-#~ msgid "Read configuration info from cc_config.xml"
-#~ msgstr "从 cc-config.xml 中读取配置信息"
-#~ msgid ""
-#~ "(C) 2003-2011 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2012 加州大学伯克利分校。\n"
-#~ "保留所有权利。\n"
-#~ "\n"
-#~ "( 中文翻译: 2005-2012 Yin Gang @ Team China )\n"
-#~ "( 中文网站: http://www.equn.com )\n"
-#~ "( 中文论坛: http://www.equn.com/forum )\n"
-#~ "( 新浪微博: @志愿计算 )"
-#~ msgid "NVIDIA GPU"
-#~ msgstr "NVIDIA GPU"
-#~ msgid "ATI GPU"
-#~ msgstr "ATI GPU"
-#~ msgid "Multicore CPU Supported"
-#~ msgstr "已支持多核 CPU"
-#~ msgid "%s: %.0f"
-#~ msgstr "%s:%.0f"
-#~ msgid "Click 'Retry now' to transfer the file now"
-#~ msgstr "点击“立即重试”,则现在就传输该文件"
-#~ msgid ""
-#~ "Click 'Abort transfer' to delete the file from the transfer queue. This "
-#~ "will prevent you from being granted credit for this result."
-#~ msgstr ""
-#~ "点击“中断传输”以从传输队列中删除该文件,这将导致您无法从该结果获得积分。"
-#~ msgid "Aborting result..."
-#~ msgstr "正在中止任务..."
-#~ msgid ""
-#~ "You have chosen to add a new BOINC project.  Adding a new\n"
-#~ "project means that you will be connecting your computer to a new "
-#~ "organization.\n"
-#~ "If this is what you wanted to do, please click on\n"
-#~ "the 'Next' button below.\n"
-#~ "\n"
-#~ "Some projects like World Community Grid run multiple research "
-#~ "applications.\n"
-#~ "If you want to change which research applications are sent to your "
-#~ "computer\n"
-#~ "to run, visit the project's website and modify your\n"
-#~ "preferences there.\n"
-#~ "\n"
-#~ "To change which research applications are sent to you from\n"
-#~ "World Community Grid then please click on the following button:"
-#~ msgstr ""
-#~ "您已经选择加入了一个新的 BOINC 项目。加入新项目\n"
-#~ "表示您将允许您的计算机连接到一个新的组织。\n"
-#~ "如果这就是您想要做的,请点击下方的“下一步”按钮。\n"
-#~ "\n"
-#~ "有些项目比如 World Community Grid 运行了多个科学计算程序。\n"
-#~ "如果您想要改变发送到您的计算机上的计算程序种类,\n"
-#~ "您应该访问这些项目的项目网站并在那里修改你的参数设置。\n"
-#~ "\n"
-#~ "要设置您希望运行的 World Community Grid 项目计算程序,\n"
-#~ "请点击后面的按钮:"
-#~ msgid "Change Research Applications at World Community Grid"
-#~ msgstr "设定 WCG 项目的科学计算程序"
-#~ msgid "Don't fetch NVIDIA GPU tasks"
-#~ msgstr "禁止下载 NVIDIA GPU 任务"
-#~ msgid "NVIDIA GPU work fetch deferred for"
-#~ msgstr "NVIDIA GPU 任务获取被延迟"
-#~ msgid "NVIDIA GPU work fetch deferral interval"
-#~ msgstr "NVIDIA GPU 任务获取延迟间隔"
-#~ msgid "Don't fetch ATI GPU tasks"
-#~ msgstr "禁止下载 ATI GPU 任务"
-#~ msgid "ATI GPU work fetch deferred for"
-#~ msgstr "ATI GPU 任务获取被延迟"
-#~ msgid "ATI GPU work fetch deferral interval"
-#~ msgstr "ATI GPU 任务获取延迟间隔"
-#~ msgid "Remaining"
-#~ msgstr "剩余时间"
-#~ msgid "Web sites"
-#~ msgstr "网站"
-#~ msgid "Connect about every"
-#~ msgstr "连接网络的间隔"
-#~ msgid ""
-#~ "this computer is connected to the Internet about every X days\n"
-#~ "(0 if it's always connected)"
-#~ msgstr "本台计算机连接互联网的间隔天数 ( 0 表示一直连接 )"
-#~ msgid "days (max. 10)"
-#~ msgstr "天 ( 最多十天 )"
-#~ msgid "%d.%d%%"
-#~ msgstr "%d.%d%%"
-#~ msgid "Display and network &options..."
-#~ msgstr "显示和网络选项(&O)..."
-#~ msgid ""
-#~ "You have requested to exit the %s,\n"
-#~ "which allows you to view and manage\n"
-#~ "the science applications running on your computer.\n"
-#~ "\n"
-#~ "If you also want to stop running the science applications when you\n"
-#~ "exit the Manager, then choose from the following options:"
-#~ msgstr ""
-#~ "您刚请求退出 %s,\n"
-#~ "后者可用来查看和管理您计算机上运行的科学计算程序。\n"
-#~ "\n"
-#~ "如果您想要在退出 BOINC Manager 的同时停止运行\n"
-#~ "所有的科学计算程序,请在下列选项中进行选择:"
-#~ msgid "Stop running science applications when exiting the Manager"
-#~ msgstr "退出 BOINC Manger 的同时停止运行科学计算程序。"
-#~ msgid "CPU work fetch priority"
-#~ msgstr "CPU 任务获取优先级"
-#~ msgid "NVIDIA GPU scheduling priority"
-#~ msgstr "NVIDIA GPU 调度优先级"
-#~ msgid "NVIDIA GPU work fetch priority"
-#~ msgstr "NVIDIA GPU 任务获取优先级"
-#~ msgid "ATI GPU scheduling priority"
-#~ msgstr "ATI GPU 调度优先级"
-#~ msgid "ATI GPU work fetch priority"
-#~ msgstr "ATI GPU 任务获取优先级"
-#~ msgid "Estimated app speed"
-#~ msgstr "预计计算速度"
-#~ msgid "Estimated task size"
-#~ msgstr "预计任务大小"
-#~ msgid "Max RAM usage"
-#~ msgstr "最大内存占用"
-#~ msgid "%s - Options"
-#~ msgstr "%s - 选项"
-#~ msgid "Retrieving host information; please wait..."
-#~ msgstr "正在读取主机信息,请稍候..."
-#~ msgid " (waiting for GPU memory)"
-#~ msgstr "(等待足够的 GPU 内存)"
-#~ msgid "Manager Settings..."
-#~ msgstr "BOINC Manager 设定..."
-#~ msgid "Pause"
-#~ msgstr "暂停"
-#~ msgid "%s - Messages"
-#~ msgstr "%s - 消息"
-#~ msgid "Skin:"
-#~ msgstr "皮肤:"
-#~ msgid "Preferences"
-#~ msgstr "参数设置"
-#~ msgid "I want to customize my preferences for this computer only."
-#~ msgstr "我想定制本台计算机的参数。"
-#~ msgid "Customized Preferences"
-#~ msgstr "定制的参数设置"
-#~ msgid "My total work done this Project"
-#~ msgstr "我为这个项目做出的贡献"
-#~ msgid "My Tasks:"
-#~ msgstr "我的计算任务:"
-#~ msgid "From Project:"
-#~ msgstr "来自项目:"
-#~ msgid "Elapsed Time: %s"
-#~ msgstr "已用时间:%s"
-#~ msgid "Time Remaining: %s"
-#~ msgstr "剩余时间:%s"
-#~ msgid "Upload suspended - "
-#~ msgstr "上传被暂停 - "
-#~ msgid "Download suspended - "
-#~ msgstr "下载被暂停 - "
-#~ msgid "Upload pending"
-#~ msgstr "等待上传"
-#~ msgid "Download pending"
-#~ msgstr "等待下载"
-#~ msgid "New Simple View..."
-#~ msgstr "新简易视图..."
-#~ msgid "Display the new simple graphical interface."
-#~ msgstr "显示新的简洁图形界面。"
-#~ msgid "Old Simple View..."
-#~ msgstr "旧简易视图..."
-#~ msgid "Display the old simple graphical interface."
-#~ msgstr "显示旧的简洁图形界面。"
-#~ msgid "Get help with BOINC"
-#~ msgstr "从 BOINC 得到帮助"
-#~ msgid "Event Log..."
-#~ msgstr "事件日志..."
-#~ msgid "error"
-#~ msgstr "错误"
-#~ msgid "A new version of BOINC is available."
-#~ msgstr "检测到新版本的 BOINC。"
-#~ msgid "Download it."
-#~ msgstr "下载它。"
-#~ msgid "Couldn't write state file; check directory permissions"
-#~ msgstr "无法写入状态文件,请检查目录权限"
-#~ msgid "The HTTP_PROXY environment variable must specify an HTTP proxy"
-#~ msgstr "必须在环境变量 HTTP_PROXY 中指定一个 HTTP 代理服务器"
-#~ msgid "Attaching to project or account manager..."
-#~ msgstr "正在加入项目或帐户管理器..."
-#~ msgid "%s - Detach from %s"
-#~ msgstr "%s - 退出 %s"
-#~ msgid "Retrying communications."
-#~ msgstr "重试通讯。"
-#~ msgid "Failed to attach to project"
-#~ msgstr "加入项目失败"
-#~ msgid "Failed to attach to account manager"
-#~ msgstr "加入帐户管理器失败"
-#~ msgid "Attached to account manager"
-#~ msgstr "已经加入到帐户管理器"
-#~ msgid "You are now successfully attached to the %s system."
-#~ msgstr "您已经成功地加入了 %s 系统。"
-#~ msgid "You are now successfully attached to this account manager."
-#~ msgstr "您已经成功地加入了当前帐户管理器。"
-#~ msgid "News Feeds"
-#~ msgstr "新闻订阅"
-#~ msgid "Display the latest news about BOINC"
-#~ msgstr "显示最新的 BOINC 新闻"
-#~ msgid "not attached to any BOINC project: 0 bytes"
-#~ msgstr "未加入到任何 BOINC 项目: 零字节"
-#~ msgid "All projects"
-#~ msgstr "所有项目"
-#~ msgid "Attach to project"
-#~ msgstr "加入项目"
-#~ msgid "Attach to account manager"
-#~ msgstr "加入帐户管理器"
-#~ msgid "Attach to a project"
-#~ msgstr "加入一个项目"
-#~ msgid "%s needs to connect to the Internet.  Please click to open %s."
-#~ msgstr "%s 需要连接至互联网。请点击打开 %s。"
-#~ msgid ""
-#~ "%s is unable to communicate with a project and needs an Internet "
-#~ "connection.\n"
-#~ "Please connect to the Internet, then select the 'Do network "
-#~ "communications' item from the Advanced menu."
-#~ msgstr ""
-#~ "%s 无法与项目进行通讯,请求接入互联网。\n"
-#~ "请接入互联网并在菜单中依次选择“高级->进行网络通讯”。"
-#~ msgid ""
-#~ "%s couldn't do Internet communication, and no default connection is "
-#~ "selected.\n"
-#~ "Please connect to the Internet, or select a default connection\n"
-#~ "using Advanced/Options/Connections."
-#~ msgstr ""
-#~ "%s 无法在互联网上进行通讯,也没有设定缺省连接。\n"
-#~ "请连接至互联网或者从菜单中选择'高级->选项'然后切换到连接页面以设定一个缺省"
-#~ "连接。"
-#~ msgid "One or more notices are now available for viewing."
-#~ msgstr "当前有一个或多个通知可以查看。"
-#~ msgid "Attached to project"
-#~ msgstr "已加入到项目"
-#~ msgid "You are now successfully attached to this project."
-#~ msgstr "您已经成功加入到这个项目。"
-#~ msgid "Attached to %s"
-#~ msgstr "已经加入了 %s"
-#~ msgid "Detach when done"
-#~ msgstr "计算完成后退出项目"
-#~ msgid "Retrieving notices..."
-#~ msgstr "正在获取通知..."
-#~ msgid "Detach"
-#~ msgstr "退出"
-#~ msgid "Detaching from project..."
-#~ msgstr "正在退出项目..."
-#~ msgid "Are you sure you want to detach from project '%s'?"
-#~ msgstr "您确定要退出'%s'项目吗?"
-#~ msgid "Detach from Project"
-#~ msgstr "退出项目"
-#~ msgid "Message from project server:"
-#~ msgstr "项目服务器发来的消息:"
-#~ msgid "XML syntax error in"
-#~ msgstr "XML 语法错误"
-#~ msgid "Can't resolve hostname in"
-#~ msgstr "无法解析主机名称"
-#~ msgid "Unrecognized tag in"
-#~ msgstr "无法识别的标签"
-#~ msgid "Missing start tag in"
-#~ msgstr "起始标签丢失"
-#~ msgid "Unparsed tag in"
-#~ msgstr "无法解析的标签"
-#~ msgid "Missing end tag in"
-#~ msgstr "结束标签丢失"
-#~ msgid ""
-#~ "BOINC can't access Internet - check network connection or proxy "
-#~ "configuration."
-#~ msgstr "BOINC 无法访问互联网 - 请查看网络连接或者代理服务器的配置。"
-#~ msgid " - user active"
-#~ msgstr " - 用户活跃"
-#~ msgid " - computation suspended"
-#~ msgstr " - 计算被暂停"
-#~ msgid " - need disk space"
-#~ msgstr " - 磁盘空间不足"
-#~ msgid "Attach to an additional project"
-#~ msgstr "加入其它项目"
-#~ msgid "To completion"
-#~ msgstr "剩余时间"
-#~ msgid "Attach to a project to begin processing work"
-#~ msgstr "加入一个项目以开始处理任务"
-#~ msgid "%s: %.2f%% completed."
-#~ msgstr "%s: 已完成 %.2f%%。"
-#~ msgid "%d tasks running."
-#~ msgstr "%d 个任务正在运行。"
-#~ msgid "%s - Can't find web browser"
-#~ msgstr "%s - 无法找到网页浏览器"
-#~ msgid ""
-#~ "%s tried to display the web page\n"
-#~ "\t%s\n"
-#~ "but couldn't find a web browser.\n"
-#~ "To fix this, set the environment variable\n"
-#~ "BROWSER to the path of your web browser,\n"
-#~ "then restart the %s."
-#~ msgstr ""
-#~ "%s 试图显示该网页\n"
-#~ "\t%s\n"
-#~ "但无法找到网络浏览器。\n"
-#~ "请在环境变量中设置您的网络浏览器路径,然后重新运行 %s。"
-#~ msgid "Starting client services; please wait..."
-#~ msgstr "正在启动客户端的服务程序,请稍候..."
-#~ msgid "BOINC Website"
-#~ msgstr "BOINC 网站"
-#~ msgid "Display the latest news about BOINC from the BOINC website"
-#~ msgstr "显示 BOINC 网站上最近关于 BOINC 的新闻"
-#~ msgid "Retrying communications for project(s)..."
-#~ msgstr "正在重试项目的网络通讯..."
-#~ msgid ""
-#~ "Required wizard file(s) are missing from the target server.\n"
-#~ "(lookup_account.php/create_account.php)\n"
-#~ msgstr ""
-#~ "无法从目标服务器获取必须的向导文件。\n"
-#~ "( lookup_account.php/create_account.php )\n"
-#~ msgid "User information"
-#~ msgstr "用户信息"
-#~ msgid "Account Manager URL"
-#~ msgstr "帐户管理器的网址"
-#~ msgid "Enter the URL of the account manager's web site."
-#~ msgstr "请输入帐户管理器的网址。"
-#~ msgid "Close BOINC Manager Window."
-#~ msgstr "关闭 BOINC Manager 的窗口。"
-#~ msgid "Exit the %s"
-#~ msgstr "退出 %s"
-#~ msgid ""
-#~ "Advanced views allow you to sort various columns and displays graphical "
-#~ "progress bars."
-#~ msgstr "高级视图允许用户按表格列进行排序并可显示图形化的进度条。"
-#~ msgid "Attach to &project"
-#~ msgstr "加入项目(&P)"
-#~ msgid "Attaching to project..."
-#~ msgstr "正在加入项目..."
-#~ msgid "Removal from %s completed."
-#~ msgstr "退出 %s 已完成。"
-#~ msgid "Removal succeeded!"
-#~ msgstr "退出成功!"
-#~ msgid "Write to disk at most every"
-#~ msgstr "写磁盘的最小时间间隔"
-#~ msgid "Slot"
-#~ msgstr "槽位"
-#~ msgid "Already Attached to Project"
-#~ msgstr "已加入到该项目"
-#~ msgid "This project may not have work for your type of computer."
-#~ msgstr "该项目可能没有适合您计算机的任务类型。"
-#~ msgid "Click here to go to %s's website."
-#~ msgstr "点击可访问 %s 的项目网站。"
-#~ msgid "ID"
-#~ msgstr "ID"
-#~ msgid "Priority"
-#~ msgstr "优先级"
-#~ msgid "MessagesGrid"
-#~ msgstr "消息网格"
-#~ msgid "Copying selected messages to Clipboard..."
-#~ msgstr "复制选中的消息到剪贴板..."
-#~ msgid "Info"
-#~ msgstr "信息"
-#~ msgid "Warning"
-#~ msgstr "警告"
-#~ msgid "ProjectsGrid"
-#~ msgstr "项目网格"
-#~ msgid "TransfersGrid"
-#~ msgstr "传输网格"
-#~ msgid "Aborting transfer(s)..."
-#~ msgstr "中断传输..."
-#~ msgid ""
-#~ "Are you sure you want to abort this file(s) transfer ?\n"
-#~ "NOTE: Aborting a transfer will invalidate a task and you\n"
-#~ "will not receive credit for it."
-#~ msgstr ""
-#~ "您确信要中断文件'%s'的传输吗?\n"
-#~ "注意:中断传输将标识该任务为无效,您将不能从该任务得到积分。"
-#~ msgid "Abort File Transfer(s)"
-#~ msgstr "中断文件传输"
-#~ msgid "TasksGrid"
-#~ msgstr "任务网格"
-#~ msgid ""
-#~ "We'll now guide you through the process of attaching\n"
-#~ "to a project."
-#~ msgstr "我们将引导您完成加入一个项目的过程。"
-#~ msgid "&Stop using%s"
-#~ msgstr "停止使用 %s(&S)"
-#~ msgid ""
-#~ "We'll now remove this computer from %s.  From now on,\n"
-#~ "attach and detach projects directly from this computer.\n"
-#~ msgstr ""
-#~ "我们将从 %s 中移除当前计算机。\n"
-#~ "从现在开始,请直接在该客户端中加入或退出项目。\n"
-#~ msgid ""
-#~ "We'll now guide you through the process of attaching\n"
-#~ "to an account manager.\n"
-#~ "\n"
-#~ "If you want to attach to a single project, click Cancel,\n"
-#~ "then select the 'Attach to project' menu item instead."
-#~ msgstr ""
-#~ "我们将引导您完成加入一个帐户管理器的过程。\n"
-#~ "\n"
-#~ "如果您只想要加入一个项目,请点击取消,\n"
-#~ "然后选择菜单中的'加入项目'。"
-#~ msgid "Debug Flags"
-#~ msgstr "调试标志位"
-#~ msgid "Project Properties Failure"
-#~ msgstr "项目属性错误"
-#~ msgid "Project Communication Failure"
-#~ msgstr "项目通讯失败"
-#~ msgid "Project Properties URL Failure"
-#~ msgstr "项目网址错误"
-#~ msgid "Account Creation Disabled"
-#~ msgstr "帐户创建已被停用"
-#~ msgid "Account Already Exists"
-#~ msgstr "帐户已存在"
-#~ msgid "Project Already Attached"
-#~ msgstr "项目已被加入"
-#~ msgid "Project Attach Failure"
-#~ msgstr "加入项目失败"
-#~ msgid "Failure Communicating with Reference Site"
-#~ msgstr "参考站点通讯失败"
-#~ msgid "Net Detection Failure"
-#~ msgstr "网络检测失败"
-#~ msgid ""
-#~ "You can copy and paste the URL from your browser's\n"
-#~ "address bar."
-#~ msgstr "您可以从浏览器的地址栏中复制网址(URL)。"
-#~ msgid "For a list of account managers go to:"
-#~ msgstr "查看帐户管理器的列表请到:"
-#~ msgid "&Advanced View"
-#~ msgstr "高级视图(&A)"
-#~ msgid "Already attached to project"
-#~ msgstr "已经加入到项目"
-#~ msgid "You are already attached to this project."
-#~ msgstr "您已经加入到项目。"
-#~ msgid "Static text"
-#~ msgstr "静态文本"
-#~ msgid "Radiobutton"
-#~ msgstr "单选按钮"
-#~ msgid "Short term debt"
-#~ msgstr "短期债项"
-#~ msgid "Long term debt"
-#~ msgstr "长期债项"
-#~ msgid "Test"
-#~ msgstr "测试"
-#~ msgid "Enter account key"
-#~ msgstr "输入帐户密钥"
-#~ msgid ""
-#~ "This project uses an \"account key\" to identify you.\n"
-#~ "\n"
-#~ "Go to the project's web site to create an account. Your account\n"
-#~ "key will be emailed to you."
-#~ msgstr ""
-#~ "该项目通过\"帐户密钥\"来鉴别您的身份。\n"
-#~ "\n"
-#~ "请访问项目网站以创建一个帐户。您的帐户密钥将通过电子邮件发送给您。"
-#~ msgid "An account key looks like:"
-#~ msgstr "帐户密钥看上去就像:"
-#~ msgid "82412313ac88e9a3638f66ea82186948"
-#~ msgstr "82412313ac88e9a3638f66ea82186948"
-#~ msgid "Account key:"
-#~ msgstr "帐户密钥:"
-#~ msgid "Checkpoint CPU time"
-#~ msgstr "上一次进度存储的 CPU 时间"
-#~ msgid "Current CPU time"
-#~ msgstr "当前的 CPU 时间"
-#~ msgid "Language Selection:"
-#~ msgstr "语言选择:"
-#~ msgid "What language should the manager display by default."
-#~ msgstr "BOINC Manager 缺省显示的语言。"
-#~ msgid "Reminder Frequency:"
-#~ msgstr "提醒间隔:"
-#~ msgid ""
-#~ "How often, in minutes, should the manager remind you of possible "
-#~ "connection events."
-#~ msgstr "BOINC Manager 应该隔多久提醒您可能的连接事件。( 以分钟为单位 )"
-#~ msgid "Run BOINC Manager at startup:"
-#~ msgstr "在启动时运行 BOINC Manager:"
-#~ msgid "Enable BOINC Manager exit message:"
-#~ msgstr "启用 BOINC Manager 的退出消息:"
+#: clientgui/DlgAdvPreferencesBase.h:45
+msgid "On this day of the week, compute only during these hours."
+msgstr "在这一周中的此天,只在这些时间内计算。"
 
+#: clientgui/DlgAdvPreferencesBase.h:46
+msgid "On this day of the week, transfer files only during these hours."
+msgstr "在这一周中的此天,只在这些时间内传输文件。"
diff --git a/locale/zh_CN/BOINC-Project-Generic.po b/locale/zh_CN/BOINC-Project-Generic.po
index ae56820..b44c006 100644
--- a/locale/zh_CN/BOINC-Project-Generic.po
+++ b/locale/zh_CN/BOINC-Project-Generic.po
@@ -1,27 +1,25 @@
 # BOINC web translation
 # Copyright (C) 2008 University of California
+# 
 # This file is distributed under the same license as BOINC.
+# 
 # FileID  : $Id$
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: \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: 2014-02-23 02:23+0000\n"
-"Last-Translator: Gang <zenith.yin at gmail.com>\n"
-"Language-Team: Team China <zenith.yin at gmail.com>\n"
-"Language: zh_CN\n"
+"PO-Revision-Date: 2015-02-09 01:44+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\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: Pootle 2.5.0\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-Bookmarks: -1,-1,-1,-1,232,-1,-1,-1,-1,-1\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-SearchPath-0: html\\user\n"
-"X-Poedit-Basepath: D:\\Work\\boinc_src\\html\\user\n"
-"X-POOTLE-MTIME: 1393122217.0\n"
 
 msgid "LANG_NAME_NATIVE"
 msgstr "简体中文"
@@ -294,8 +292,8 @@ msgstr "最近的修改日期:%1"
 
 #: ../inc/forum.inc:640
 msgid ""
-"This post is not shown because the sender is on your 'ignore' list.  Click %"
-"1here%2 to view this post"
+"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
@@ -374,16 +372,7 @@ 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        <li> 帖子内容健康,不包含猥亵的、仇恨的或者与性有关的内容。\n        <li> 禁止商业广告。\n        <li> 禁止链接到与性、赌博等内容有关的网站。\n        <li> 禁止烦扰、敌对其他用户的帖子,禁止破坏主题。\n        <li> 禁止有敌意或侮辱性的帖子。\n        <li> 禁止与种族、宗教、国籍、性别、阶层或性相关的辱骂性评论。\n        "
 
 #: ../inc/forum.inc:780
 msgid "Rules:"
@@ -1120,20 +1109,17 @@ msgstr "MB / 每"
 #: ../inc/prefs.inc:274
 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"
+"modifies image files (UMTS does this, for example). %2 Skipping verification"
+" reduces the security of BOINC. %3"
+msgstr "跳过映像文件验证?%1仅在你的 ISP 会修改映像文件的情况下(比如 UMTS 就会这样)需要选中这个。%2跳过验证会影响 BOINC 的安全性。%3"
 
 #: ../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 "
+"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"
+msgstr "资源分享%1该设置决定你的计算机分配给本项目的资源比例。举例:你参加了两个项目,其资源分享率分别是 100 和 200,则第一个项目将得到 1/3 的计算资源,第二个项目将得到 2/3。%2"
 
 #: ../inc/prefs.inc:298
 msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
@@ -1163,7 +1149,8 @@ msgstr "运行测试用途的计算程序?%1这可以帮助我们开发计算
 
 #: ../inc/prefs.inc:367
 msgid ""
-"Emails will be sent from %1; make sure your spam filter accepts this address."
+"Emails will be sent from %1; make sure your spam filter accepts this "
+"address."
 msgstr "电子邮件将从 %1 发送,请确保你的垃圾邮件过滤器不会过滤这个地址。"
 
 #: ../inc/prefs.inc:374
@@ -1193,8 +1180,8 @@ msgstr "这些参数设置对你参加的所有 BOINC 项目均有效。"
 
 #: ../inc/prefs.inc:395
 msgid ""
-"%1Unable to update preferences.%2 The values marked in red below were out of "
-"range or not numeric."
+"%1Unable to update preferences.%2 The values marked in red below were out of"
+" range or not numeric."
 msgstr "%1无法更新参数设置。%2下面标红的为超出范围的或类型错误的数值。"
 
 #: ../inc/prefs.inc:445
@@ -1878,8 +1865,8 @@ msgstr "本操作需要团队创建人的权限"
 
 #: ../inc/team.inc:422
 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."
+"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
@@ -2044,7 +2031,6 @@ msgstr "用户 ID"
 msgid "Used in community functions"
 msgstr "在社区功能中使用"
 
-# 91%
 #: ../inc/user.inc:216 ../user/weak_auth.php:25
 msgid "Account keys"
 msgstr "帐户密钥"
@@ -2218,7 +2204,8 @@ msgid "sec"
 msgstr "秒"
 
 #: ../inc/util.inc:444
-msgid "Link has timed out. Please click Back, refresh the page, and try again."
+msgid ""
+"Link has timed out. Please click Back, refresh the page, and try again."
 msgstr "链接已经超时,请点击返回并刷新页面后再重试。"
 
 #: ../inc/util.inc:513
@@ -2292,9 +2279,7 @@ msgid ""
 "work 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
 msgid "Platform"
@@ -2318,10 +2303,7 @@ msgid ""
 "It's similar to HTML, but simpler. The tags start with a [ (where you would\n"
 "have used %1 in HTML) and end with ] (where you would have used %2 in\n"
 "HTML)."
-msgstr ""
-"BBCode 标记可以用来对个人档案和留言板帖子内的文本进行格式化。\n"
-"它和 HTML 类似,但更为简单。这些标记一般以 [ 开头\n"
-"(如果在 HTML 中一般是 %1)并且以 ] 结尾(HTML 中则是 %2)。"
+msgstr "BBCode 标记可以用来对个人档案和留言板帖子内的文本进行格式化。\n它和 HTML 类似,但更为简单。这些标记一般以 [ 开头\n(如果在 HTML 中一般是 %1)并且以 ] 结尾(HTML 中则是 %2)。"
 
 #: ../user/bbcode.php:31
 msgid "Examples"
@@ -2411,9 +2393,7 @@ msgstr "用于链接到 BOINC 网站上的 SVN 修改集"
 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"
-"标签自身将被显示出来,而不是预格式的文本。"
+msgstr "如果你没有正确的闭合标签或者指定参数,\n标签自身将被显示出来,而不是预格式的文本。"
 
 #: ../user/bs_sample_index.php:44
 msgid "Participants"
@@ -2511,7 +2491,8 @@ msgstr "你提供的邀请码是错误的。"
 
 #: ../user/create_account_action.php:84
 msgid ""
-"Invalid email address: you must enter a valid address of the form name at domain"
+"Invalid email address: you must enter a valid address of the form "
+"name at domain"
 msgstr "电子邮件地址错误:你必须输入一个合法的地址,形式如 '用户名@域名'"
 
 #: ../user/create_account_action.php:88
@@ -2538,8 +2519,7 @@ msgstr "无法创建帐户"
 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 中选择添加项目并且输入电子邮箱地址和项目口令。"
+msgstr "注意:如果你有 BOINC Manager,可以不使用这个表单。直接在 BOINC Manager 中选择添加项目并且输入电子邮箱地址和项目口令。"
 
 #: ../user/create_account_form.php:61
 msgid ""
@@ -2593,8 +2573,8 @@ msgstr "%1你的用户档案图片将显示在左边"
 
 #: ../user/create_profile.php:66
 msgid ""
-"To replace it, click the \"Browse\" button and select a JPEG or PNG file (%1 "
-"or less)."
+"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
@@ -2684,8 +2664,8 @@ msgstr "创建一个用户档案"
 
 #: ../user/create_profile.php:343
 msgid ""
-"To prevent spam, an average credit of %1 or greater is required to create or "
-"edit a profile.  We apologize for this inconvenience."
+"To prevent spam, an average credit of %1 or greater is required to create or"
+" edit a profile.  We apologize for this inconvenience."
 msgstr "为防止垃圾信息,如果要创建或编译用户档案,近期平均积分不能小于 %1,由此带来的不方便之处我们深感抱歉。"
 
 #: ../user/delete_account.php:57
@@ -2711,18 +2691,13 @@ msgid ""
 "including your profile and message-board posts.\n"
 "No jobs will be issued to any computers attached\n"
 "to this account."
-msgstr ""
-"删除账户操作将从服务器上移除你所有的个人信息,\n"
-"包括你的个人档案和留言板中的发帖。\n"
-"该账户名下的计算机也将不再下载新的计算任务。"
+msgstr "删除账户操作将从服务器上移除你所有的个人信息,\n包括你的个人档案和留言板中的发帖。\n该账户名下的计算机也将不再下载新的计算任务。"
 
 #: ../user/delete_account.php:73
 msgid ""
 "This cannot be undone.\n"
 "Once your account has been deleted, you cannot get it back."
-msgstr ""
-"该操作无法撤销。\n"
-"一旦账户被删除,你将无法再取回。"
+msgstr "该操作无法撤销。\n一旦账户被删除,你将无法再取回。"
 
 #: ../user/delete_account.php:76
 msgid "Are you sure you want to delete your account?"
@@ -2774,17 +2749,13 @@ 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"
-"如果你以后想要重新使用个人档案,必须从头开始创建。"
+msgstr "删除的个人档案将永远无法恢复 --\n如果你以后想要重新使用个人档案,必须从头开始创建。"
 
 #: ../user/delete_profile.php:48
 msgid ""
 "If you're sure, click 'Yes'\n"
 "to remove your profile from our database."
-msgstr ""
-"如果你确定的话,请点击“是”\n"
-"来从我们的数据库中删除你的个人档案。"
+msgstr "如果你确定的话,请点击“是”\n来从我们的数据库中删除你的个人档案。"
 
 #: ../user/delete_profile.php:52
 msgid "Delete my profile"
@@ -2808,7 +2779,8 @@ msgstr "你的捐赠已经完成。"
 
 #: ../user/donated.php:30
 msgid ""
-"Your donation will be added to the progress bar after confirmation by PayPal."
+"Your donation will be added to the progress bar after confirmation by "
+"PayPal."
 msgstr "你的捐赠将在我们收到 PayPal 的确认之后再添加到进度条中。"
 
 #: ../user/donated.php:32
@@ -2827,9 +2799,7 @@ msgstr "%1 捐赠"
 msgid ""
 "This project is accepting donations via\n"
 "%1."
-msgstr ""
-"该项目接受的捐赠方式\n"
-"%1。"
+msgstr "该项目接受的捐赠方式\n%1。"
 
 #: ../user/donations.php:42
 msgid ""
@@ -2844,16 +2814,7 @@ msgid ""
 "        to see the donation amount equivalent in different currencies\n"
 "        (please note that the rates are only estimates\n"
 "         and the actual amount may differ)."
-msgstr ""
-"请在下方的表单中填入你所要捐赠的金额。\n"
-"        PayPal 当前接受多种货币\n"
-"        (加元,欧元,英镑,美元,\n"
-"        日元,澳元,新西兰元,\n"
-"        瑞士法郎,港币,新加坡元,瑞典克朗,\n"
-"        丹麦克朗,波兰兹罗提,挪威克朗,\n"
-"        匈牙利福林,捷克克朗)。\n"
-"        你可以使用汇率转换器来查看不同币种的等值金额\n"
-"        (请注意汇率为估计值,实际汇率可能会稍有不同)"
+msgstr "请在下方的表单中填入你所要捐赠的金额。\n        PayPal 当前接受多种货币\n        (加元,欧元,英镑,美元,\n        日元,澳元,新西兰元,\n        瑞士法郎,港币,新加坡元,瑞典克朗,\n        丹麦克朗,波兰兹罗提,挪威克朗,\n        匈牙利福林,捷克克朗)。\n        你可以使用汇率转换器来查看不同币种的等值金额\n        (请注意汇率为估计值,实际汇率可能会稍有不同)"
 
 #: ../user/donations.php:316
 msgid "Amount you would like to donate"
@@ -2871,9 +2832,7 @@ 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"
-"如果不选中的话,你将被记录为“用户 ID %1”"
+msgstr "如果你不希望将你的名称和计算账户编号显示在捐赠者列表中,请选中此项。\n如果不选中的话,你将被记录为“用户 ID %1”"
 
 #: ../user/donations.php:324
 msgid "To assign the donation with your user ID, please log in."
@@ -2903,13 +2862,9 @@ msgstr "这些应用程序未经过 %1 的仔细检查,若准备使用请自
 #: ../user/download_network.php:33
 msgid ""
 "We do not provide instructions for installing these applications.\n"
-"However, the author may have provided some help on installing or "
-"uninstalling the application. \n"
+"However, the author may have provided some help on installing or uninstalling the application. \n"
 "If this is not enough you should contact the author."
-msgstr ""
-"我们不能提供这些应用程序的安装及使用文档。\n"
-"但应用程序的作者可能提供了安装及卸载相关的帮助文档。\n"
-"如果还需要进一步的文档,请联系相关作者。"
+msgstr "我们不能提供这些应用程序的安装及使用文档。\n但应用程序的作者可能提供了安装及卸载相关的帮助文档。\n如果还需要进一步的文档,请联系相关作者。"
 
 #: ../user/download_network.php:36
 msgid "Instructions for installing and running BOINC are %1here%2."
@@ -3063,10 +3018,7 @@ 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> 显示你最新的积分信息,项目新闻等。"
+msgstr "查看 %1所有的免费服务%2\n<br> 提供动态签名图片\n<br> 显示你最新的积分信息,项目新闻等。"
 
 #: ../user/edit_forum_preferences_form.php:104
 msgid "characters remaining"
@@ -3337,8 +3289,8 @@ msgstr "该任务已分发给一台计算机,但未在指定的期限内收到
 
 #: ../user/explain_state.php:72
 msgid ""
-"The task wasn't sent to a computer because enough other tasks were completed "
-"for this workunit."
+"The task wasn't sent to a computer because enough other tasks were completed"
+" for this workunit."
 msgstr "该任务未分发到计算机,因为所属的任务包已经完成了足够数量的计算任务。"
 
 #: ../user/explain_state.php:75
@@ -3353,8 +3305,8 @@ msgstr "客户端状态"
 
 #: ../user/explain_state.php:81
 msgid ""
-"A result's <b>client state</b> indicates the stage of processing at which an "
-"error occurred."
+"A result's <b>client state</b> indicates the stage of processing at which an"
+" error occurred."
 msgstr "计算结果的<b>客户端状态</b>表示计算任务在计算机上的处理阶段,比如发生错误的时候。"
 
 #: ../user/explain_state.php:86
@@ -3449,8 +3401,8 @@ msgstr "感谢你向好友们介绍了 %1"
 
 #: ../user/ffmail_action.php:94
 msgid ""
-"You forgot to enter your friends' names and/or email addresses; Please %"
-"1return to the form%2 and enter them."
+"You forgot to enter your friends' names and/or email addresses; Please "
+"%1return to the form%2 and enter them."
 msgstr "你没有输入好友的名称和/或电子邮箱地址,请%1回退到表单页面%2并重新输入。"
 
 #: ../user/ffmail_form.php:30
@@ -3524,8 +3476,8 @@ msgstr "你确定要封禁 %1 吗?<br />该操作将在选定的时间期限
 
 #: ../user/forum_banishment_vote.php:61
 msgid ""
-"Select the reason category, optionally write a longer description of why the "
-"user should be banished."
+"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
@@ -3692,8 +3644,8 @@ msgstr "问题和解答"
 
 #: ../user/forum_help_desk.php:30
 msgid ""
-"Talk live via Skype with a volunteer, in any of several languages. Go to %"
-"1BOINC Online Help%2."
+"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
@@ -3953,7 +3905,6 @@ msgstr "你需要更高的平均积分或总积分才能举报一个帖子。"
 msgid "Report Registered"
 msgstr "举报已记录"
 
-# 92%
 #: ../user/forum_report_post.php:66
 msgid "Your report has been recorded. Thanks for your input."
 msgstr "举报已被记录,感谢你的参与。"
@@ -3970,8 +3921,8 @@ msgstr "举报论坛帖子"
 
 #: ../user/forum_report_post.php:73
 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 "
+"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 />你可以在帖子下方找到评分系统。"
 
@@ -3981,8 +3932,7 @@ msgstr "举报帖子"
 
 #: ../user/forum_report_post.php:81
 msgid ""
-"Why do you find the post offensive: %1Please include enough information so "
-"that a person that\n"
+"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"
 
@@ -3996,7 +3946,8 @@ msgstr "你的举报未被记录,请等待片刻后重试。"
 
 #: ../user/forum_report_post.php:92
 msgid ""
-"If this is not a temporary error, please report it to the project developers."
+"If this is not a temporary error, please report it to the project "
+"developers."
 msgstr "如果该故障无法自动恢复,请向项目开发人员报告。"
 
 #: ../user/forum_rss.php:41
@@ -4142,8 +4093,8 @@ msgstr "退订成功"
 
 #: ../user/forum_subscribe.php:64
 msgid ""
-"You are no longer subscribed to %1. You will no longer receive notifications "
-"for this thread."
+"You are no longer subscribed to %1. You will no longer receive notifications"
+" for this thread."
 msgstr "你已经退订了主题 %1,你将不会再收到该主题的通知。"
 
 #: ../user/forum_subscribe.php:66
@@ -4305,8 +4256,8 @@ msgstr "添加好友"
 
 #: ../user/friend.php:74
 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."
+"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
@@ -4411,7 +4362,8 @@ msgstr "忘记了你的账户信息?"
 
 #: ../user/get_passwd.php:28
 msgid ""
-"1) If you know your account's email address, and you can receive email there:"
+"1) If you know your account's email address, and you can receive email "
+"there:"
 msgstr "1) 如果你知道你账户关联的电子邮箱地址,你可以在那里收到电子邮件:"
 
 #: ../user/get_passwd.php:29
@@ -4447,7 +4399,8 @@ msgid "Open the file in a text editor like Notepad. You'll see something like"
 msgstr "用记事本等文本编辑器打开该文件,你将看到类似的如下内容:"
 
 #: ../user/get_passwd.php:62
-msgid "Select and Copy the string between %1 and %2 (%3 in the above example)."
+msgid ""
+"Select and Copy the string between %1 and %2 (%3 in the above example)."
 msgstr "选中并复制 %1 和 %2 之间的内容(上述例子中就应该是 %3)。"
 
 #: ../user/get_passwd.php:64
@@ -4539,8 +4492,7 @@ msgid ""
 "You can not delete our record of this computer because our database still "
 "contains work for it. You must wait a few days until the work for this "
 "computer has been deleted from the project database."
-msgstr ""
-"你当前不能删除该计算机的记录,因为我们数据库中仍有和其相关的计算任务记录。你需要等到所有指定给该计算机的任务记录都从项目数据库中删除,一般可能需要几天。"
+msgstr "你当前不能删除该计算机的记录,因为我们数据库中仍有和其相关的计算任务记录。你需要等到所有指定给该计算机的任务记录都从项目数据库中删除,一般可能需要几天。"
 
 #: ../user/host_delete.php:40
 msgid "Delete record of computer"
@@ -4564,8 +4516,8 @@ msgstr "合并计算机"
 
 #: ../user/host_edit_form.php:38
 msgid ""
-"Sometimes BOINC assigns separate identities to the same computer by mistake. "
-"You can correct this by merging old identities with the newest one."
+"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 会给同一台计算机赋予多个唯一标识,你可以通过将旧标识和新标识合并以纠正该问题。"
 
 #: ../user/host_edit_form.php:56
@@ -4678,8 +4630,8 @@ msgstr "预格式"
 
 #: ../user/html.php:33
 msgid ""
-"image; height cannot exceed 450 pixels. Please do not link to images without "
-"permission of the web site where the image is hosted."
+"image; height cannot exceed 450 pixels. Please do not link to images without"
+" permission of the web site where the image is hosted."
 msgstr "图片,高度不能超出 450 像素,请不要在未经允许的情况下引用其它网站上的图片。"
 
 #: ../user/html.php:35
@@ -4720,13 +4672,11 @@ msgstr "隐私政策"
 
 #: ../user/info.php:43
 msgid ""
-"Your account on %1 is identified by a name that you choose. This name may be "
-"shown on the %1 web site, along with a summary of the work your computer has "
-"done for %1. If you want to be anonymous, choose a name that doesn't reveal "
-"your identity."
-msgstr ""
-"%1 通过你选择的用户名来标识你的帐户。该用户名以及你为 %1 完成的计算任务的摘要将显示在 %1 "
-"的网站上。如果你想要匿名,那请选择一个不会泄漏你身份的用户名。"
+"Your account on %1 is identified by a name that you choose. This name may be"
+" shown on the %1 web site, along with a summary of the work your computer "
+"has done for %1. If you want to be anonymous, choose a name that doesn't "
+"reveal your identity."
+msgstr "%1 通过你选择的用户名来标识你的帐户。该用户名以及你为 %1 完成的计算任务的摘要将显示在 %1 的网站上。如果你想要匿名,那请选择一个不会泄漏你身份的用户名。"
 
 #: ../user/info.php:44
 msgid ""
@@ -4735,18 +4685,14 @@ 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 ""
-"如果你参加了 %1,那你的计算机中的相关信息比如处理器的型号、内存的大小等会被 %1 记录下来,以用来决定什么样的计算任务最适合你的计算机。 "
-"这些信息也会显示在 %1 的网站上,但是请不要担心,我们绝对不会泄漏出你的计算机的位置比如域名、网络地址等。"
+msgstr "如果你参加了 %1,那你的计算机中的相关信息比如处理器的型号、内存的大小等会被 %1 记录下来,以用来决定什么样的计算任务最适合你的计算机。 这些信息也会显示在 %1 的网站上,但是请不要担心,我们绝对不会泄漏出你的计算机的位置比如域名、网络地址等。"
 
 #: ../user/info.php:45
 msgid ""
-"To participate in %1, you must give an address where you receive email. This "
-"address will not be shown on the %1 web site or shared with organizations. %"
-"1 may send you periodic newsletters; however, you can opt out at any time."
-msgstr ""
-"为了参加 %1,你必须提供一个能够接收邮件的电子邮件地址。这个地址不会被显示在 %1 的网站上。%1 可能会定期向你发送项目的新闻快讯; "
-"当然,你随时可以选择退订。"
+"To participate in %1, you must give an address where you receive email. This"
+" address will not be shown on the %1 web site or shared with organizations. "
+"%1 may send you periodic newsletters; however, you can opt out at any time."
+msgstr "为了参加 %1,你必须提供一个能够接收邮件的电子邮件地址。这个地址不会被显示在 %1 的网站上。%1 可能会定期向你发送项目的新闻快讯; 当然,你随时可以选择退订。"
 
 #: ../user/info.php:46
 msgid ""
@@ -4755,19 +4701,15 @@ 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 ""
-"在 %1 网站上发送的私人消息只对发送者和接收者可见。%1 不会检查或审查消息的内容。如果你从 %1 "
-"的用户那收到不希望收到的私人消息,你可以把他们加入到你的 %2消息过滤器%3。这样就可以避免你收到来自那位用户的任何公共或私人消息。"
+msgstr "在 %1 网站上发送的私人消息只对发送者和接收者可见。%1 不会检查或审查消息的内容。如果你从 %1 的用户那收到不希望收到的私人消息,你可以把他们加入到你的 %2消息过滤器%3。这样就可以避免你收到来自那位用户的任何公共或私人消息。"
 
 #: ../user/info.php:47
 msgid ""
 "If you use our web site forums you must follow the %2posting guidelines%3.  "
 "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 ""
-"如果你要使用我们的网站论坛,你必须遵守 %2发贴注意事项%3。发送到 %1 "
-"论坛的帖子对所有人都是可见的,即便不是我们网站的用户也能看到。你的发帖同时表明你允许所有人查看和复制你的帖子。"
+"members.  By posting to the forums, you are granting irrevocable license for"
+" anyone to view and copy your posts."
+msgstr "如果你要使用我们的网站论坛,你必须遵守 %2发贴注意事项%3。发送到 %1 论坛的帖子对所有人都是可见的,即便不是我们网站的用户也能看到。你的发帖同时表明你允许所有人查看和复制你的帖子。"
 
 #: ../user/info.php:48
 msgid "Is it safe to run %1?"
@@ -4777,21 +4719,18 @@ msgstr "运行 %1 安全吗?"
 msgid ""
 "Any time you download a program through the Internet you are taking a "
 "chance: the program might have dangerous errors, or the download server "
-"might have been hacked. %1 has made efforts to minimize these risks. We have "
-"tested our applications carefully. Our servers are behind a firewall and 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 ""
-"只要你从互联网下载程序就有可能碰到有危险错误的程序或者下载服务器已被黑客攻击的情况。%1 已经尽力最小化这方面的风险。我们已经仔细测试了我们的程序。我们"
-"的服务器处于防火墙之后,并且设置了最高的安全级别。为了保证程序下载的正确性,全部的可执行文件会被放置在一台未联网的安全的计算机中进行数字签名。"
+"might have been hacked. %1 has made efforts to minimize these risks. We have"
+" tested our applications carefully. Our servers are behind a firewall and "
+"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 "只要你从互联网下载程序就有可能碰到有危险错误的程序或者下载服务器已被黑客攻击的情况。%1 已经尽力最小化这方面的风险。我们已经仔细测试了我们的程序。我们的服务器处于防火墙之后,并且设置了最高的安全级别。为了保证程序下载的正确性,全部的可执行文件会被放置在一台未联网的安全的计算机中进行数字签名。"
 
 #: ../user/info.php:50
 msgid ""
 "The applications run by %1 may cause some computers to overheat. If this "
 "happens, stop running %1 or use a %2utility program%3 that limits CPU usage."
-msgstr ""
-"%1 的计算程序可能会导致某些计算机温度过高。如果你碰到了这种情形,请停止运行 %1 或者使用 %2某些工具软件%3 来限制计算程序对处理器的使用。"
+msgstr "%1 的计算程序可能会导致某些计算机温度过高。如果你碰到了这种情形,请停止运行 %1 或者使用 %2某些工具软件%3 来限制计算程序对处理器的使用。"
 
 #: ../user/info.php:51
 msgid ""
@@ -4805,8 +4744,8 @@ msgstr "免责申明"
 #: ../user/info.php:54
 msgid ""
 "%1 and %2 assume no liability for damage to your computer, loss of data, or "
-"any other event or condition that may occur as a result of participating in %"
-"1."
+"any other event or condition that may occur as a result of participating in "
+"%1."
 msgstr "%1 和 %2 对于你的计算机损坏、数据丢失或其他任意由于参与 %1 所可能造成的事件没有赔偿责任。"
 
 #: ../user/info.php:56
@@ -4815,12 +4754,10 @@ msgstr "其它 BOINC 项目"
 
 #: ../user/info.php:57
 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 "
+"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 ""
-"除了 %1,还有其它一些项目也使用BOINC平台。你也许会考虑同时参加多个项目,这样当你无法从 %1 "
-"获取计算任务时,你的计算机仍可以处理其它项目的计算任务。"
+msgstr "除了 %1,还有其它一些项目也使用BOINC平台。你也许会考虑同时参加多个项目,这样当你无法从 %1 获取计算任务时,你的计算机仍可以处理其它项目的计算任务。"
 
 #: ../user/info.php:58
 msgid ""
@@ -4870,8 +4807,8 @@ msgstr "使用浏览器的语言设置"
 
 #: ../user/language_select.php:113
 msgid ""
-"Translations are done by volunteers.  If your native language is not here, %"
-"1you can provide a translation%2."
+"Translations are done by volunteers.  If your native language is not here, "
+"%1you can provide a translation%2."
 msgstr "翻译工作都是由志愿者完成的,如果这里没有你的母语,%1你可以自己进行翻译%2。"
 
 #: ../user/login_form.php:45
@@ -4918,12 +4855,7 @@ msgid ""
 "        having that name with the newest computer having that name.\n"
 "        Incompatible computers will not be merged.\n"
 "        <p>"
-msgstr ""
-"该操作基于名称来合并计算机。\n"
-"        <p>\n"
-"        对于每个名称,它会将所有老的计算机合并到最新的计算机上。\n"
-"        软硬件配置不兼容的计算机将不会被合并。\n"
-"        <p>"
+msgstr "该操作基于名称来合并计算机。\n        <p>\n        对于每个名称,它会将所有老的计算机合并到最新的计算机上。\n        软硬件配置不兼容的计算机将不会被合并。\n        <p>"
 
 #: ../user/merge_by_name.php:82
 msgid "Go ahead and do this"
@@ -4939,11 +4871,7 @@ msgid ""
 "To maximize discussion and flow of information,\n"
 "our message boards are moderated.\n"
 "Message board postings are subject to the following posting rules:\n"
-msgstr ""
-"\n"
-"为了让大家的讨论和交流能有效进行,\n"
-"我们为留言板设立了管理协调机制。\n"
-"所有留言板的发帖都必须遵循如下的规则:\n"
+msgstr "\n为了让大家的讨论和交流能有效进行,\n我们为留言板设立了管理协调机制。\n所有留言板的发帖都必须遵循如下的规则:\n"
 
 #: ../user/moderation.php:30
 msgid ""
@@ -4952,8 +4880,7 @@ msgid ""
 "Moderators may delete posts that violate any of these rules.\n"
 "The authors of deleted posts will be notified via email.\n"
 "Gross offenders may have their ability to post messages temporarily revoked\n"
-"(though to prevent abuse only project administrators have the ability to do "
-"so).\n"
+"(though to prevent abuse only project administrators have the ability to do so).\n"
 "Additional kinds of bad behavior (\"bugging\" posts to trap the\n"
 "IP addresses of other participants, excessive thread creation to spam\n"
 "the forums, etc.), while not listed in the formal rules, may still\n"
@@ -4982,24 +4909,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>\n"
-"管理员可能会删除违规的帖子,被删帖的用户将得到电子邮件通知。\n"
-"严重的违规者可能会被临时封禁发帖权限(为防止该操作被滥用,只有项目主管有相关的权限)。\n"
-"其它未列在上述规则中的恶意行为(比如恶意收集其他用户的 IP 地址、或者在论坛中大量发表垃圾内容等)也可能面临类似的处罚。\n"
-"<p>\n"
-"如果你碰到违规的帖子,请点击帖子内的红色小叉并进行相应的说明;管理员将收到通知并进行处理。\n"
-"该功能请务必仅用于处理违规帖子,而不要用于处理个人争端。\n"
-"<p>\n"
-"我们在操作的时候将尽可能地保证公平,但对于如此大的一个网络社区,包含了各种不同的观点,可能仍然会有人对我们的管理决定不满意。\n"
-"对此我们十分抱歉,但请大家多多谅解,我们不可能在所有时候让所有人满意,我们只能根据我们了解的信息、并且从论坛的整体利益出发来作出决定。\n"
-"请不要在论坛讨论我们的管理策略,我们不是在进行一个社会工程项目,也没有试图创建一个完美而公平的系统。\n"
-"因此这样的讨论并不会起到什么积极的作用,而且是潜在有害的。\n"
-"当然,如果你一些合理的想法,请发送电子邮件到下面的地址。\n"
-"<p>\n"
-"本管理规定由 %1 项目设立,如果你有想法要交流,请发送电子邮件到 %2。\n"
-"\n"
+msgstr "\n<p>\n管理员可能会删除违规的帖子,被删帖的用户将得到电子邮件通知。\n严重的违规者可能会被临时封禁发帖权限(为防止该操作被滥用,只有项目主管有相关的权限)。\n其它未列在上述规则中的恶意行为(比如恶意收集其他用户的 IP 地址、或者在论坛中大量发表垃圾内容等)也可能面临类似的处罚。\n<p>\n如果你碰到违规的帖子,请点击帖子内的红色小叉并进行相应的说明;管理员将收到通知并进行处理。\n该功能请务必仅用于处理违规帖子,而不要用于处理个人争端。\n<p>\n我们在操作的时候将尽可能地保证公平,但对于如此大的一个网络社区,包含了各种不同的观点,可能仍然会有人对我们的管理决定不满意。\n对此我们十分抱歉,但请大家多多谅解,我们不可能在所有时候让所有人满意,我们只能根据我们了解的信息、并且从论坛的整体利益出发来作出决定。\n请不要在论坛讨论我们的管理策略,我们不是在进行一个社会工程项目,也没有试图创建一个完美而公平的系统。\n因此这样的讨论并不会起到什么积极的作用,而且是潜在有害的。\n当然,如果你一些合理的想法,请发送电子邮件到下面的地址。\n<p>\ [...]
 
 #: ../user/pending.php:66
 msgid "Pending credit"
@@ -5082,9 +4992,7 @@ 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"
-"标记为垃圾信息,请修改你输入的内容并重试。"
+msgstr "你的消息已被 Akismet 防垃圾信息系统\n标记为垃圾信息,请修改你输入的内容并重试。"
 
 #: ../user/pm.php:205
 msgid "Could not find user with id %1"
@@ -5155,20 +5063,14 @@ 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命令。"
+msgstr "你的参数设置已经更新\n\t      将在你的计算机与%1进行通讯的时候生效\n\t      或者你也可以直接执行 BOINC 客户端里的%2更新%3命令。"
 
 #: ../user/prefs.php:41
 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命令。"
+msgstr "你的偏好设置已经复位为缺省值\n这将在您的计算机与%1通信时生效\n或者你可以直接使用BOINC客户端的%2更新%3命令。"
 
 #: ../user/prefs_edit.php:65 ../user/prefs_edit.php:93
 msgid "%1 for %2"
@@ -5476,14 +5378,14 @@ msgstr "%1 的统计信息"
 
 #: ../user/stats.php:37
 msgid ""
-"More detailed statistics for %1 and other BOINC-based projects are available "
-"at several web sites:"
+"More detailed statistics for %1 and other BOINC-based projects are available"
+" at several web sites:"
 msgstr "下列几个网站可以查询到关于 %1 和其它 BOINC 项目的更详细的统计信息:"
 
 #: ../user/stats.php:40
 msgid ""
-"You can also get your current statistics in the form of a \"signature image"
-"\":"
+"You can also get your current statistics in the form of a \"signature "
+"image\":"
 msgstr "你还可以通过“签名图片”的形式得到你当前的统计信息:"
 
 #: ../user/stats.php:43
@@ -5572,8 +5474,8 @@ msgstr "查看团队的成员加入退出历史"
 
 #: ../user/team_admins.php:45
 msgid ""
-"Moderate the team forum, if any (admins get email notification of moderation "
-"events and red X reports)"
+"Moderate the team forum, if any (admins get email notification of moderation"
+" events and red X reports)"
 msgstr "管理团队论坛(团队管理员会得到管理事件和报告的电子邮件通知)"
 
 #: ../user/team_admins.php:47
@@ -5680,13 +5582,9 @@ msgstr "拒绝请求"
 
 #: ../user/team_change_founder_form.php:58
 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,请使用下面的表单。"
+"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
 msgid "No transfer request is pending."
@@ -5864,7 +5762,8 @@ msgstr "留言板已被移除"
 
 #: ../user/team_forum.php:124
 msgid ""
-"Your team's message board has been removed. You may now %1create a new one%2."
+"Your team's message board has been removed. You may now %1create a new "
+"one%2."
 msgstr "你的团队留言板已被移除,你现在可以%1创建一个新的留言板%2。"
 
 #: ../user/team_forum.php:143
@@ -5893,13 +5792,9 @@ msgstr "正在请求 %1 的创建人资格"
 
 #: ../user/team_founder_transfer_action.php:98
 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 天没有回应,你就可以成为创建人了。"
+"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
@@ -5971,16 +5866,9 @@ msgstr "你的请求已经通知到了创建人,如果他/她到 %1 都没有
 
 #: ../user/team_founder_transfer_form.php:60
 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"
+"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"
-"                      你确定想要请求创建人资格吗?"
+msgstr "如果你将得到团队创建人的资格(因为当前的创建人不活跃等原因),请点击下面的按钮。你的请求将通过电子邮件通知到当前的创建人,他/她可以将创建人资格转移给你或者拒绝你的请求。如果他/她在 60 天内都没有回应,你就可以得到创建人的资格。<br /><br />\n                      你确定想要请求创建人资格吗?"
 
 #: ../user/team_founder_transfer_form.php:65
 msgid "Request foundership"
@@ -6059,8 +5947,8 @@ msgstr "超过 100 个的团队符合你的搜索条件,现在只显示了前
 
 #: ../user/team_lookup.php:104
 msgid ""
-"End of results. %1 If you cannot find the team you are looking for, you may %"
-"2create a team%3 yourself."
+"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
@@ -6141,8 +6029,8 @@ msgstr "创建或管理团队留言板"
 
 #: ../user/team_manage.php:71
 msgid ""
-"To have this team created on all BOINC projects (current and future) you can "
-"make it into a %1BOINC-wide team%2."
+"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
@@ -6153,8 +6041,8 @@ msgstr "建议所有团队管理员都加入和参加到 Google 的 %1boinc-team
 
 #: ../user/team_manage.php:75
 msgid ""
-"Other resources for BOINC team admins are available from a third-party site, "
-"%1www.boincteams.com%2."
+"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
@@ -6189,17 +6077,10 @@ msgstr "退出 %1"
 msgid ""
 "<strong>Please note before quitting a team:</strong>\n"
 "         <ul>\n"
-"         <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"
+"         <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>"
 
 #: ../user/team_quit_form.php:40
 msgid "Quit Team"
@@ -6258,10 +6139,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 ""
-"下面的团队符合一个或多个你的查询条件。\n"
-"            要加入一个团队,点击名称后即可进入团队页面,\n"
-"               然后点击%1加入该团队%2即可。"
+msgstr "下面的团队符合一个或多个你的查询条件。\n            要加入一个团队,点击名称后即可进入团队页面,\n               然后点击%1加入该团队%2即可。"
 
 #: ../user/team_search.php:107
 msgid "Change your search"
@@ -6444,14 +6322,10 @@ msgstr "帐户数据"
 
 #: ../user/weak_auth.php:52
 msgid ""
-"You can access your account either by using your email address and "
-"password,\n"
+"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 ""
-"你可以使用你的电子邮箱地址和口令来访问你的账户,\n"
-"    或者也可以使用一个分配好的“账户密钥”。\n"
-"    你的账户密钥是:"
+msgstr "你可以使用你的电子邮箱地址和口令来访问你的账户,\n    或者也可以使用一个分配好的“账户密钥”。\n    你的账户密钥是:"
 
 #: ../user/weak_auth.php:57
 msgid "This key can be used to:"
@@ -6467,11 +6341,7 @@ 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 Manager 的情况下添加一台计算机到你的账户,方法如下。\n"
-"       先安装 BOINC,\n"
-"       然后在 BOINC 的数据目录下创建名称为 %1 的文件,\n"
-"       然后设置文件的内容为:"
+msgstr "在不借助 BOINC Manager 的情况下添加一台计算机到你的账户,方法如下。\n       先安装 BOINC,\n       然后在 BOINC 的数据目录下创建名称为 %1 的文件,\n       然后设置文件的内容为:"
 
 #: ../user/weak_auth.php:73
 msgid "Weak account key"
@@ -6480,17 +6350,11 @@ msgstr "弱帐户密钥"
 #: ../user/weak_auth.php:74
 msgid ""
 "Your 'weak account key' can be used to attach computers to your account\n"
-"    as described above, but cannot be used to log in to your account or "
-"change it in any way.\n"
+"    as described above, but cannot be used to log in to your account or change it in any way.\n"
 "    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"
-"    如果你想为你的账户添加不被信任的或不安全的计算机,\n"
-"    你就应该使用弱账户密钥。\n"
-"    你的弱账户密钥是:"
+msgstr "你的“弱账户密钥”能用来为你的账户添加计算机\n    但不能被用于登录你在项目网站上的账户或修改该账户。\n    如果你想为你的账户添加不被信任的或不安全的计算机,\n    你就应该使用弱账户密钥。\n    你的弱账户密钥是:"
 
 #: ../user/weak_auth.php:81
 msgid ""
@@ -6575,12 +6439,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:47
 msgid "Color scheme for graphics"
@@ -6603,301 +6462,3 @@ msgstr "如果选中的计算程序暂时没有计算任务,是否从其它计
 #: ../project.sample/project_specific_prefs.inc:91
 msgid "(all applications)"
 msgstr "(所有计算程序)"
-
-#~ msgid "Error:"
-#~ msgstr "错误:"
-
-#~ msgid "Account creation is disabled"
-#~ msgstr "账号创建功能已被禁用"
-
-#~ msgid ""
-#~ "Sorry, this project has disabled the creation of new accounts.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "对不起,该项目当前已经禁止创建新账户。\n"
-#~ "请稍后重试。"
-
-#~ msgid "Account creation is currently disabled. Please try again later."
-#~ msgstr "新帐户创建功能当前已暂停,请以后再试。"
-
-#~ msgid "nvidia GPU"
-#~ msgstr "NVIDIA GPU"
-
-#~ msgid ""
-#~ "This project hasn\\'t created an email message - please notify its "
-#~ "administrators"
-#~ msgstr "该项目尚未创建过电子邮件消息,请联系项目管理员"
-
-#, fuzzy
-#~ msgid "Use Intel GPU %1 Enforced by version 7.0+ %2"
-#~ msgstr "使用 ATI GPU%16.10 之后的版本实现了该设置%2"
-
-#~ msgid ""
-#~ "These apply to all BOINC projects in which you participate.<br>\n"
-#~ "             On computers participating in multiple projects, the most "
-#~ "recently modified preferences will be used."
-#~ msgstr ""
-#~ "此处的参数设置对你参加的所有 BOINC 项目均有效。<br>\n"
-#~ "             如果一台计算机参加了多个项目,以最近修改过的参数设置为准。"
-
-#~ msgid "Export this news item as a Notice"
-#~ msgstr "将该新闻条目导出为通知"
-
-#~ msgid ""
-#~ "Go to the BOINC data directory on your computer (on Windows this is usually "
-#~ "<b>C:\\Documents and Settings\\All Users\\Application Data\\BOINC</b> or "
-#~ "<b>C:\\Program Files\\BOINC</b>."
-#~ msgstr ""
-#~ "访问你计算机上的 BOINC 数据目录(Windows 系统上一般是 <b>C:\\Documents and Settings\\All "
-#~ "Users\\Application Data\\BOINC</b> 或者 <b>C:\\Program Files\\BOINC</b>)。"
-
-#~ msgid "No such task"
-#~ msgstr "没有这个任务"
-
-#~ msgid ""
-#~ "Computer is connected to the Internet about every %1 Leave blank or 0 if "
-#~ "always connected. %2 BOINC will try to maintain at least this much work "
-#~ "(max 10 days). %3"
-#~ msgstr ""
-#~ "计算机连接互联网的时间间隔%1留空或 0 即表示一直在线。%2 BOINC 将根据该设定"
-#~ "值决定在本地缓存多少计算任务(最多十天)。%3"
-
-#~ msgid "Maintain enough work for an additional"
-#~ msgstr "维护足够的任务缓存"
-
-#~ msgid "Update failed: "
-#~ msgstr "更新失败:"
-
-#~ msgid "Provides %1limited access%2 to your account"
-#~ msgstr "仅可以%1部分访问%2你的帐户"
-
-#~ msgid ""
-#~ "Don't use this form. Just run BOINC, select Add Project, and enter an "
-#~ "email address and password."
-#~ msgstr ""
-#~ "请不要使用这个表单。在 BOINC Manager 内选择“加入项目”,然后输入电子邮件地"
-#~ "址并设置一个用户口令就可以了。"
-
-#~ msgid "Do not reorder sticky posts"
-#~ msgstr "不要对置顶的帖子进行重新排序"
-
-#~ msgid "If a thread contains more than this number of posts"
-#~ msgstr "如果主题中包含的帖子数量超过了"
-
-#~ msgid "only display the first one and this many of the last ones"
-#~ msgstr "只显示第一篇和最近的多少篇"
-
-#~ msgid "Your report has been recorded. Thanks you for your input."
-#~ msgstr "举报已经被记录下来,感谢你的参与。"
-
-#~ msgid "Search type"
-#~ msgstr "搜索类型"
-
-#~ msgid "User names starting with"
-#~ msgstr "用户名称以什么开头"
-
-#~ msgid ""
-#~ "Your 'weak account key' lets you link a computer to your account without "
-#~ "giving it the ability to log in to your account or to change it in any "
-#~ "way."
-#~ msgstr ""
-#~ "'弱帐户密钥'仅用于在客户端加入项目,而不能用来登录并修改你在项目网站上的帐"
-#~ "户。"
-
-#~ msgid ""
-#~ "This mechanism works only with projects that have upgraded their server "
-#~ "software 7 Dec 2007 or later."
-#~ msgstr "该机制只对于那些已更新至2007年12月7日版本服务端软件的项目才有效。"
-
-#~ msgid "Your weak account key for this project is:"
-#~ msgstr "你在本项目的弱帐户密钥为:"
-
-#~ msgid ""
-#~ "To use your weak account key on a given host, find or create the 'account "
-#~ "file' for this project. This file has a name of the form "
-#~ "<b>account_PROJECT_URL.xml</b>. The account file for %1 is <b>%2</b>."
-#~ msgstr ""
-#~ "要在指定的主机上使用你的弱帐户密钥,得先找到或创建相应项目的'帐户文件',该"
-#~ "文件的名称类似于 <b>account_项目网址.xml</b>。%1 的帐户文件为 <b>%2</b>。"
-
-#~ msgid "Create this file if needed. Set its contents to:"
-#~ msgstr "根据需要创建该文件,并将其内容设置为:"
-
-#~ msgid ""
-#~ "Your weak account key is a function of your password. If you change your "
-#~ "password, your weak account key changes, and your previous weak account "
-#~ "key becomes invalid."
-#~ msgstr ""
-#~ "弱帐户密钥是根据你的帐户用户口令计算而来。如果你修改了你的帐户用户口令,你"
-#~ "的弱帐户密钥也随之改变,你之前的弱帐户密钥将失效。"
-
-#~ msgid "Account key"
-#~ msgstr "帐户密钥"
-
-#~ msgid "Provides full access to your account"
-#~ msgstr "可用于完全访问你的帐户"
-
-#~ msgid "Export"
-#~ msgstr "导出"
-
-#~ msgid "- private message"
-#~ msgstr "- 私人消息"
-
-#~ msgid "Private message from"
-#~ msgstr "私人消息,来自"
-
-#~ msgid "Email address verification pending"
-#~ msgstr "电子邮件地址验证中"
-
-#~ msgid "Logged in as %1."
-#~ msgstr "已登录为 %1。"
-
-#~ msgid "Log in as someone else."
-#~ msgstr "用其他用户来登录。"
-
-#~ msgid "No thread with id %1. Please check the link and try again."
-#~ msgstr "ID 为 %1 的主题不存在,请检查网址是否正确并重试。"
-
-#~ msgid "Request not found"
-#~ msgstr "无法找到请求"
-
-#~ msgid "%1 has added you as a friend."
-#~ msgstr "%1 想要加你为好友。"
-
-#~ msgid "Account data for %1"
-#~ msgstr "%1 的帐户数据"
-
-#~ msgid "couldn't create message board"
-#~ msgstr "无法创建留言板"
-
-#~ msgid "message board not found"
-#~ msgstr "没找到留言板"
-
-#~ msgid "no such forum"
-#~ msgstr "没有匹配的论坛"
-
-#~ msgid "unknown command %1"
-#~ msgstr "未知命令 %1"
-
-#~ msgid "ERROR: %1 does not exist!  Cannot create combo box.<br>"
-#~ msgstr "错误:%1不存在!不能创建组合框。<br>"
-
-#~ msgid ""
-#~ "To protect the project's webpages from spam, we kindly ask you to type in "
-#~ "the two words shown in the image:<br>\n"
-#~ msgstr ""
-#~ "为保护我们网站不被垃圾信息破坏,我们请求你输入下面图片中的两个单词:<br>\n"
-
-#~ msgid "BOINC client version"
-#~ msgstr "BOINC 客户端版本"
-
-#~ msgid "Client detached"
-#~ msgstr "客户端已退出项目"
-
-#~ msgid "Maximum daily WU quota per CPU"
-#~ msgstr "每 CPU 单日最大任务限额"
-
-#~ msgid "%1/day"
-#~ msgstr "%1/天"
-
-#~ msgid "Anonymous platform - CPU"
-#~ msgstr "匿名平台 - CPU"
-
-#~ msgid "Anonymous platform - NVIDIA GPU"
-#~ msgstr "匿名平台 - NVIDIA CPU"
-
-#~ msgid "Anonymous platform - ATI GPU"
-#~ msgstr "匿名平台 - ATI GPU"
-
-#~ msgid "Task ID"
-#~ msgstr "任务 ID"
-
-#~ msgid "Granted credit"
-#~ msgstr "授予积分"
-
-#~ msgid "Click to"
-#~ msgstr "点击以"
-
-#~ msgid "Do work only between the hours of"
-#~ msgstr "仅在指定的时间段进行计算"
-
-#~ msgid "(no restriction if equal)"
-#~ msgstr "(如果相同则表示不限制)"
-
-#~ msgid "Use at most"
-#~ msgstr "最多使用"
-
-#~ msgid "percent of CPU time"
-#~ msgstr "CPU 时间的百分比"
-
-#~ msgid "Leave at least"
-#~ msgstr "至少保留"
-
-#~ msgid "(Values smaller than %s are ignored)"
-#~ msgstr "(小于 %s 的设定值将被忽略)"
-
-#~ msgid "% of total disk space"
-#~ msgstr "总磁盘空间的百分比"
-
-#~ msgid "% of page file (swap space)"
-#~ msgstr "页面文件(交换空间)的百分比"
-
-#~ msgid "% of memory when computer is in use"
-#~ msgstr "内存的百分比(计算机在使用时)"
-
-#~ msgid "% of memory when computer is not in use"
-#~ msgstr "内存的百分比(计算机未在使用时)"
-
-#~ msgid "Use ATI GPU if present %1(enforced by 6.10+ clients)%2"
-#~ msgstr "使用计算机上的 ATI GPU 进行计算%1(6.10 之后的版本实现了该设置)%2"
-
-#~ msgid "Use NVIDIA GPU if present %1(enforced by 6.10+ clients)%2"
-#~ msgstr ""
-#~ "使用计算机上的 NVIDIA GPU 进行计算%1(6.10 之后的版本实现了该设置)%2"
-
-#~ msgid "Use CPU %1(enforced by 6.10+ clients)%2"
-#~ msgstr "使用计算机上的 CPU 进行计算%1(6.10 之后的版本实现了该设置)%2"
-
-#~ msgid "KB/s"
-#~ msgstr "千字节/秒"
-
-#~ msgid "GB disk space"
-#~ msgstr "GB 磁盘空间"
-
-#~ msgid "GB disk space free"
-#~ msgstr "GB 空闲磁盘空间"
-
-#~ msgid "(no restriction)"
-#~ msgstr "(不限制)"
-
-#~ msgid "%1 GB disk space"
-#~ msgstr "%1 GB 磁盘空间"
-
-#~ msgid "%1 GB disk space free"
-#~ msgstr "%1 GB 空闲磁盘空间"
-
-#~ msgid ""
-#~ "Resource share %1If you participate in multiple BOINC projects, this is "
-#~ "the proportion of your resources used by %2%3"
-#~ msgstr "资源分享%1如果你参加了多个 BOINC 项目,这是 %2%3 可以使用的资源比例"
-
-#~ msgid "Gbytes"
-#~ msgstr "GB"
-
-#~ msgid "Gbytes free"
-#~ msgstr "GB 空闲"
-
-#~ msgid "Resource share"
-#~ msgstr "资源分享"
-
-#~ msgid "stderr out"
-#~ msgstr "标准错误输出"
-
-#~ msgid "This thread has been hidden for administrative purposes"
-#~ msgstr "该主题出于管理目的已被隐藏"
-
-#~ msgid "<p>"
-#~ msgstr "<p>"
-
-#~ msgid "preferences"
-#~ msgstr "参数设置"
diff --git a/locale/zh_CN/BOINC-Setup.mo b/locale/zh_CN/BOINC-Setup.mo
index 1eaaff8..7b6c2b5 100644
Binary files a/locale/zh_CN/BOINC-Setup.mo and b/locale/zh_CN/BOINC-Setup.mo differ
diff --git a/locale/zh_CN/BOINC-Setup.po b/locale/zh_CN/BOINC-Setup.po
index c344191..11c2bae 100644
--- a/locale/zh_CN/BOINC-Setup.po
+++ b/locale/zh_CN/BOINC-Setup.po
@@ -1,40 +1,32 @@
 # 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: BOINC 7.4\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-12 02:12-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: Team China <zenith.yin at gmail.com>\n"
-"Language: zh_CN\n"
+"PO-Revision-Date: 2015-02-09 01:42+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\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"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-Basepath: /Volumes/Cheer/BOINC_GIT/boinc_trunk\n"
-"X-POOTLE-MTIME: 1393130019.0\n"
-"X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: mac_installer\n"
+"Language: zh_CN\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
+#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
 msgid "Yes"
 msgstr "是"
 
-#: PostInstall.cpp:131
-#: PostInstall.cpp:1137
-#: uninstall.cpp:1619
+#: PostInstall.cpp:131 PostInstall.cpp:1137 uninstall.cpp:1619
 msgid "No"
 msgstr "否"
 
@@ -48,10 +40,7 @@ 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"
-"你希望这台 Mac 上的非管理员用户也能运行和控制 %s 吗?"
+msgstr "有管理员权限的用户可以直接运行和控制 %s。\n\n你希望这台 Mac 上的非管理员用户也能运行和控制 %s 吗?"
 
 #: PostInstall.cpp:1444
 #, c-format
@@ -70,9 +59,7 @@ msgstr "重启后出现了权限错误"
 msgid ""
 "Removal may take several minutes.\n"
 "Please be patient."
-msgstr ""
-"卸载可能需要几分钟。\n"
-"请稍等。"
+msgstr "卸载可能需要几分钟。\n请稍等。"
 
 #: uninstall.cpp:156
 #, c-format
@@ -80,10 +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 ""
-"你确定要从计算机上完全移除 %s 吗?\n"
-"\n"
-"本操作将移除所有可执行文件,但不会处理 %s 的数据文件。"
+msgstr "你确定要从计算机上完全移除 %s 吗?\n\n本操作将移除所有可执行文件,但不会处理 %s 的数据文件。"
 
 #: uninstall.cpp:163
 #, c-format
@@ -103,9 +87,7 @@ msgstr "用户名"
 msgid ""
 "Do you also want to remove VirtualBox from your computer?\n"
 "(VirtualBox was installed along with BOINC.)"
-msgstr ""
-"你想要从计算机上卸载 VirtualBox 吗?\n"
-"(VirtualBox 是随 BOINC 一起安装的。)"
+msgstr "你想要从计算机上卸载 VirtualBox 吗?\n(VirtualBox 是随 BOINC 一起安装的。)"
 
 #: uninstall.cpp:312
 #, c-format
@@ -117,23 +99,14 @@ msgid ""
 "\n"
 "for each user, the file\n"
 "\"%s\"."
-msgstr ""
-"删除完成。\n"
-"\n"
-"你也许想要使用 Finder 删除下列项目: \n"
-"目录 \"%s\"\n"
-"\n"
-"对于每位用户,文件\n"
-"\"%s\"."
+msgstr "删除完成。\n\n你也许想要使用 Finder 删除下列项目: \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"
+msgstr "输入你的管理员密码来从你的电脑中移除%s。\n\n"
 
 #: uninstall.cpp:1616
 msgid "Cancel"
@@ -142,24 +115,3 @@ msgstr "取消"
 #: uninstall.cpp:1617
 msgid "Continue..."
 msgstr "继续..."
-
-#, c-format
-#~ msgid "Sorry, this version of %s requires system 10.4 or higher."
-#~ msgstr "对不起,%s 要求 10.4 或更高的操作系统版本。"
-#~ msgid ""
-#~ "Removal completed.\n"
-#~ "\n"
-#~ " You may want to remove the following remaining items using the Finder: \n"
-#~ "\"/Library/Application Support/BOINC Data\" directory\n"
-#~ "\n"
-#~ "for each user, the file\n"
-#~ "\"/Users/[username]/Library/Preferences/BOINC Manager Preferences\"."
-#~ msgstr ""
-#~ "移除操作已完成。\n"
-#~ "\n"
-#~ "你也许还想使用 Finder 将剩余的一些内容也移除:\n"
-#~ "\"/Library/Application Support/BOINC Data\" 目录\n"
-#~ "\n"
-#~ "对于每一位用户,还有如下文件:\n"
-#~ "\"/Users/[username]/Library/Preferences/BOINC Manager Preferences\"."
-
diff --git a/locale/zh_CN/BOINC-Web.mo b/locale/zh_CN/BOINC-Web.mo
index fa9525c..4dbb2c0 100644
Binary files a/locale/zh_CN/BOINC-Web.mo and b/locale/zh_CN/BOINC-Web.mo differ
diff --git a/locale/zh_CN/BOINC-Web.po b/locale/zh_CN/BOINC-Web.po
index 1928f33..32cec00 100644
--- a/locale/zh_CN/BOINC-Web.po
+++ b/locale/zh_CN/BOINC-Web.po
@@ -1,26 +1,25 @@
 # BOINC web translation
 # Copyright (C) 2008-2009 University of California
+# 
 # This file is distributed under the same license as BOINC.
+# 
 # FileID  : $Id$
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\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-12 02:13-0500\n"
-"Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
-"Language-Team: Team China <zenith.yin at gmail.com>\n"
-"Language: zh_CN\n"
+"PO-Revision-Date: 2015-02-09 01:41+0000\n"
+"Last-Translator: Rom Walton <romw at romwnet.org>\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"
-"X-Generator: Pootle 2.5.0\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-Basepath: D:\\Work\\boinc_src\\doc\n"
-"X-POOTLE-MTIME: 1409450318.0\n"
-"X-Poedit-KeywordsList: tra\n"
-"X-Poedit-SearchPath-0: doc\n"
 
 #: docutil.php:21
 msgid "Search"
@@ -36,7 +35,9 @@ msgid "This page is %stranslatable%s."
 msgstr "当前页面%s提供翻译接口%s。"
 
 #: download.php:39
-msgid "We recommend that you also install VirtualBox, so your computer can work on science projects that require it."
+msgid ""
+"We recommend that you also install VirtualBox, so your computer can work on "
+"science projects that require it."
 msgstr "我们建议你同时安装 VirtualBox,这样你的计算机就可以运行那些要求该软件的科学项目了。"
 
 #: download.php:41
@@ -47,14 +48,12 @@ msgstr "更多了解 VirtualBox。"
 msgid "Download BOINC + VirtualBox"
 msgstr "下载 BOINC + VirtualBox"
 
-#: download.php:54
-#: download.php:69
+#: download.php:54 download.php:69
 #, php-format
 msgid "for %s"
 msgstr "用于 %s"
 
-#: download.php:57
-#: download.php:72
+#: download.php:57 download.php:72
 #, php-format
 msgid "BOINC version %s"
 msgstr "BOINC 版本 %s"
@@ -64,29 +63,33 @@ msgstr "BOINC 版本 %s"
 msgid "VirtualBox version %s"
 msgstr "VirtualBox 版本 %s"
 
-# ######################################<br />
-# <br />
-# download.php<br />
-# #######################################<br />
-# download.php
 #: download.php:67
 msgid "Download BOINC"
 msgstr "下载 BOINC"
 
 #: download.php:123
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others."
+msgid ""
+"BOINC is a program that lets you donate your idle computer time to science "
+"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, and many others."
 msgstr "通过 BOINC 你可以将闲置的计算机时间贡献给 SETI at home, Climateprediction.net, Rosetta at home, World Community Grid 等科学研究项目。"
 
 #: download.php:125
-msgid "After installing BOINC on your computer, you can connect it to as many of these projects as you like."
+msgid ""
+"After installing BOINC on your computer, you can connect it to as many of "
+"these projects as you like."
 msgstr "在计算机上安装好 BOINC 之后,你可以加入各式各样你喜欢的项目。"
 
 #: download.php:127
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
+msgid ""
+"You may run this software on a computer only if you own the computer or have"
+" the permission of its owner."
 msgstr "你应该在自己拥有的计算机或得到使用许可的计算机上运行这个软件。"
 
 #: download.php:132
-msgid "We recommend that you download BOINC from the Google Play Store or Amazon Appstore, not from here."
+msgid ""
+"We recommend that you download BOINC from the Google Play Store or Amazon "
+"Appstore, not from here."
 msgstr "我们推荐你从谷歌或亚马逊的应用市场下载 BOINC,而不是这里。"
 
 #: download.php:167
@@ -97,8 +100,7 @@ msgstr "系统需求"
 msgid "Release notes"
 msgstr "发行说明"
 
-#: download.php:169
-#: index.php:86
+#: download.php:169 index.php:86
 msgid "Help"
 msgstr "帮助"
 
@@ -120,20 +122,34 @@ msgstr "BOINC:为科学而计算"
 
 #: help.php:12
 #, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
+msgid ""
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who"
+" can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"through the process of installing and using BOINC; %s troubleshoot any "
+"problems you might have."
 msgstr "BOINC 的在线帮助让您可以一对一地与有经验的 BOINC 用户进行交谈,他们可以:%s回答您关于 BOINC 以及志愿计算的问题;%s带您完成安装及使用 BOINC 的过程;%s解决您可能有的任何问题。"
 
 #: help.php:21
 #, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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."
+msgid ""
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system."
+" 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 的在线帮助基于 %sSkype%s,一个基于互联网的电话系统。Skype 可以免费使用(包括软件本身及使用该软件进行通话)。如果您还没没有 Skype,请 %s现在就下载并安装它%s。当您完成后再回到这个页面。"
 
 #: help.php:28
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
+msgid ""
+"The best way to get help is by voice, for which you need either built-in "
+"microphone and speakers or an external headset for your computer.  You can "
+"also use Skype's text-based chat system or regular email (if you don't have "
+"Skype) to communicate with Help Volunteers."
 msgstr "得到帮助的最好途径是通过声音,您的计算机必须拥有一个内置的麦克和扬声器或外接的耳麦。  您也可以使用 Skype 的文本聊天系统或者普通的电子邮件(如果您不使用 Skype)和志愿帮助者进行交流。"
 
 #: help.php:31
-msgid "Volunteers speaking several languages are available. Please select a language:"
+msgid ""
+"Volunteers speaking several languages are available. Please select a "
+"language:"
 msgstr "志愿帮助者们使用的语言有如下几种,请选择您所希望的一种:"
 
 #: help.php:47
@@ -142,16 +158,22 @@ msgstr "成为一位志愿帮助者"
 
 #: help.php:50
 #, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
+msgid ""
+"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+"Volunteer%s.  It's a great way to help the cause of scientific research and "
+"volunteer computing - and it's fun!"
 msgstr "如果您是一位有经验的 BOINC 用户,我们鼓励您 %s成为一位志愿帮助者%s。这对于科学研究和志愿计算都大有益处 - 而且还很有趣!"
 
 #: help.php:56
 #, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
+msgid ""
+"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
 msgstr "如果您已经是一位志愿帮助者并且想要修改您的参数设置,请 %s点击这里%s。"
 
 #: help_funcs.php:107
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
+msgid ""
+"BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
+"or the University of California."
 msgstr "BOINC 帮助人员都是不收取任何费用的志愿者。他们的建议不代表 BOINC 项目方及加州大学。"
 
 #: help_funcs.php:110
@@ -186,7 +208,6 @@ msgstr "计算机。 \n"
 msgid "24-hour average:"
 msgstr "24 小时平均: "
 
-# 80%
 #: index.php:56
 msgid "PetaFLOPS."
 msgstr "千万亿次浮点运算/秒。 "
@@ -203,9 +224,7 @@ msgstr "志愿者"
 msgid "Download"
 msgstr "下载"
 
-#: index.php:87
-#: index.php:120
-#: index.php:171
+#: index.php:87 index.php:120 index.php:171
 msgid "Documentation"
 msgstr "文档"
 
@@ -218,7 +237,10 @@ msgid "Links"
 msgstr "链接"
 
 #: index.php:94
-msgid "Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:"
+msgid ""
+"Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure"
+" diseases, study global warming, discover pulsars, and do many other types "
+"of scientific research.  It's safe, secure, and easy:"
 msgstr "利用你计算机的闲置时间,不管是 Windows, Mac, Linux 还是 Android,来帮助如疾病治疗、全球变暖、发现脉冲星等多种类型的科学研究。很安全,也很容易:"
 
 #: index.php:96
@@ -235,7 +257,9 @@ msgstr "输入电子邮箱地址及口令。"
 
 #: index.php:102
 #, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
+msgid ""
+"Or, if you run several projects, try an %saccount manager%s such as "
+"%sGridRepublic%s or %sBAM!%s. "
 msgstr "或者,如果您想参加多个研究项目,可以使用 %s帐户管理器%s 来简化您的日常操作,比如 %sGridRepublic%s 或者 %sBAM!%s。"
 
 #: index.php:118
@@ -247,11 +271,15 @@ msgid "Software updates"
 msgstr "软件更新"
 
 #: index.php:128
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving"
+" you the computing power of thousands of CPUs."
 msgstr "%1科研人员%2:使用 BOINC 来创建%3志愿计算项目%4,得到成千上万个处理器的计算能力。"
 
 #: index.php:132
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
 msgstr "%1大学院校%2:使用 BOINC 来创建%3虚拟校园超级计算中心%4。"
 
 #: index.php:137
@@ -324,7 +352,8 @@ msgstr "辅助软件开发接口"
 
 #: index.php:217
 #, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
+msgid ""
+"Open-source software for %svolunteer computing%s and %sgrid computing%s."
 msgstr "用于 %s志愿计算%s 和 %s网格计算%s 的开源软件"
 
 #: index.php:230
@@ -335,7 +364,6 @@ msgstr "BOINC 由加州大学伯克利分校推出。"
 msgid "Distributed sensing"
 msgstr "分布式传感"
 
-# 78%
 #: projects.inc:19
 msgid "Stanford University"
 msgstr "斯坦福大学"
@@ -345,7 +373,10 @@ msgid "Seismology"
 msgstr "地震"
 
 #: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
+msgid ""
+"The Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to Internet-connected computers.  You must buy a "
+"sensor to participate."
 msgstr "Quake-Catcher Network(QCN)项目致力于将互联网上的计算机传感器组合起来以创建世界上最大的地震感知网络。你需要购买一个传感器来加入这个项目。"
 
 #: projects.inc:27
@@ -357,23 +388,24 @@ msgid "Environmental research"
 msgstr "环境科学研究"
 
 #: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
+msgid ""
+"This project is creating a free and continuously updated map of radiation "
+"levels by using sensors connected to volunteers' computers.  You must buy a "
+"sensor to participate."
 msgstr "该项目使用志愿者计算机上的传感器来创建一个免费并持续更新的辐射强度地图。你需要购买一个传感器来加入这个项目。"
 
 #: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
+msgid ""
+"To participate in these projects you must buy a sensor and attach it to your"
+" computer."
 msgstr "想参加这些项目,你必须购买一个传感器并接入到你的计算机上。"
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
 msgstr "认知科学与人工智能"
 
-#: projects.inc:60
-#: projects.inc:364
-#: projects.inc:408
-#: projects.inc:457
-#: projects.inc:464
-#: projects.inc:511
+#: projects.inc:60 projects.inc:364 projects.inc:408 projects.inc:457
+#: projects.inc:464 projects.inc:511
 msgid "Private"
 msgstr "个人项目"
 
@@ -382,7 +414,11 @@ msgid "Artificial intelligence"
 msgstr "人工智能"
 
 #: projects.inc:62
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
+msgid ""
+"Parse and convert semantic nets for use in FreeHAL, an artificial "
+"intelligence that uses semantic networks, stemmers, part of speech "
+"databases, and part of speech taggers in order to imitate human behavior in "
+"conversations."
 msgstr "解析和转换用于 FreeHAL 的语义网,而 FreeHAL 是一个利用语义网络、词干提取、部分语音库、部分语音标签来模仿人类的交谈行为的人工智能。"
 
 #: projects.inc:69
@@ -398,7 +434,12 @@ msgid "Antimalarial drug discovery"
 msgstr "寻找抗疟疾药物"
 
 #: projects.inc:84
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
+msgid ""
+"The parasite that causes malaria continues to evolve resistance to available"
+" medication. We therefore urgently need to discover new drugs to replace "
+"existing drugs. Importantly, these new drugs need to target NEW proteins in "
+"the parasite. The FightMalaria at Home project is aimed at finding these new "
+"targets."
 msgstr "导致疟疾的寄生虫继续对可用药物产生抗药性。因此,我们迫切需要发现新的药物,以取代现有的药物。重要的是,这些新的药物需要针对新的寄生虫中的蛋白质。 FightMalaria@ Home项目的目的是在寻找这些新的靶点。"
 
 #: projects.inc:90
@@ -410,7 +451,12 @@ msgid "Protein structure prediction"
 msgstr "蛋白质结构预测"
 
 #: projects.inc:92
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
+msgid ""
+"POEM at HOME uses a computational approach to predict the biologically active "
+"structure of proteins, to understand the signal-processing mechanisms when "
+"the proteins interact with one another, to understand diseases related to "
+"protein malfunction or aggregation, and to develop new drugs on the basis of"
+" the three-dimensions structure of biologically important proteins."
 msgstr "POEM at HOME 通过计算的途径来预测蛋白质的生物结构、理解蛋白质之间交互的信号传递机制、理解疾病相关的蛋白质变异,并在生物学重要的蛋白质的三维结构的基础上开发新的药物。"
 
 #: projects.inc:98
@@ -422,7 +468,11 @@ msgid "Study of protein - ligand interactions"
 msgstr "研究蛋白质和配体间的相互作用"
 
 #: projects.inc:100
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
+msgid ""
+"Docking at Home has both bioscience and computer science goals. The project "
+"aims to further knowledge of the atomic details of protein-ligand "
+"interactions and, by doing so, will search for insights into the discovery "
+"of novel pharmaceuticals."
 msgstr "Docking at Home 的研究目标既包括生物科学上的,也包括计算机科学上的。该项目试图了解蛋白质配体交互过程中的原子尺度的细节,并以此来寻找新的药物。"
 
 #: projects.inc:114
@@ -434,7 +484,11 @@ msgid "Molecular simulations of proteins"
 msgstr "蛋白质分子模拟"
 
 #: projects.inc:116
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
+msgid ""
+"GPUGrid.net opens novel computational scenarios by the first full-atom "
+"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
+"New biomedical applications suddenly become possible giving a new role to "
+"computational biology for biomedical research."
 msgstr "GPUGrid.net 利用 NVIDIA 的显卡(GPU)来进行全原子的分子动力学模拟。计算生物学的应用给生物医药学带来了新的研究方向。"
 
 #: projects.inc:122
@@ -446,11 +500,15 @@ msgid "Genetic linkage analysis"
 msgstr "遗传连锁分析"
 
 #: projects.inc:124
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
+msgid ""
+"Superlink at Technion helps geneticists all over the world find disease-"
+"provoking genes causing some types of diabetes, hypertension (high blood "
+"pressure), cancer, schizophrenia and many others."
 msgstr "Superlink at Technion 帮助全世界的遗传学家来寻找导致会导致某些类型疾病的基因,比如糖尿病、高血压、癌症、精神分裂等等。"
 
 #: projects.inc:138
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
+msgid ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
 msgstr "美国马里兰大学生物信息学和计算生物学中心"
 
 #: projects.inc:139
@@ -458,7 +516,11 @@ msgid "Life science research"
 msgstr "生命科学研究"
 
 #: projects.inc:140
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
+msgid ""
+"The Lattice Project supplies computing power to scientists at the University"
+" of Maryland studying evolutionary relationships based on DNA sequence data;"
+" bacterial, plasmid, and virus protein sequences; and biological diversity "
+"in nature reserves. "
 msgstr "The Lattice Project 为马里兰大学的科学家们提供计算资源,用于研究基于 DNA 序列数据的进化关系,细菌、病毒蛋白质序列,还有自然界的生物多样性。"
 
 #: projects.inc:146
@@ -470,20 +532,32 @@ msgid "Epidemiology"
 msgstr "流行病学"
 
 #: projects.inc:148
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
+msgid ""
+"Simulation models of the transmission dynamics and health effects of malaria"
+" are an important tool for malaria control. They can be used to determine "
+"optimal strategies for delivering mosquito nets, chemotherapy, or new "
+"vaccines which are currently under development and testing.  Such modeling "
+"is extremely computer intensive, requiring simulations of large human "
+"populations with a diverse set of parameters related to biological and "
+"social factors that influence the distribution of the disease. "
 msgstr "模拟疟疾的传播动力学模型,用于对疟疾的控制,包括如何才能对蚊帐、药物和正在研发测试过程中的疫苗等进行最优化的分发。相关的建模过程非常耗费计算资源,除了需要模拟相当大的人群分布,还要考虑生物学和社会学方面对疾病传播可能有影响的相关因素。"
 
 #: projects.inc:170
 msgid "University of Washington"
 msgstr "美国华盛顿大学"
 
-#: projects.inc:171
-#: projects.inc:179
+#: projects.inc:171 projects.inc:179
 msgid "Biology"
 msgstr "生物学"
 
 #: projects.inc:172
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
+msgid ""
+"Determine the 3-dimensional shapes of proteins in research that may "
+"ultimately lead to finding cures for some major human diseases. By running "
+"Rosetta at home you will help us speed up and extend our research in ways we "
+"couldn't possibly attempt without your help. You will also be helping our "
+"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
+"Cancer, and Alzheimer's"
 msgstr "对蛋白质的三维结构进行预测,可能最终能帮助找到一些重大人类疾病的治疗方法。通过运行 Rosetta at home 你能够帮助我们加速这个进程,并能扩展我们的研究领域,而没有你们的帮助,这都是不可能完成的。除些之外,你还能帮助我们设计新的蛋白质,用来对抗类似爱滋、天花、癌症和老年痴呆症等疾病。"
 
 #: projects.inc:178
@@ -491,7 +565,10 @@ msgid "University of Vienna"
 msgstr "维也纳大学"
 
 #: projects.inc:180
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
+msgid ""
+"Calculate similarities between proteins. SIMAP provides a public database of"
+" the resulting data, which plays a key role in many bioinformatics research "
+"projects."
 msgstr "计算蛋白质结构间的相似性。SIMAP 以公共数据库的形式发布其研究结果,该数据库对很多生物信息学研究项目有重要作用。"
 
 #: projects.inc:186
@@ -507,7 +584,15 @@ msgid "Climate study"
 msgstr "气候研究"
 
 #: projects.inc:200
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
+msgid ""
+"Investigate the approximations that have to be made in state-of-the-art "
+"climate models. By running the model thousands of times we hope to find out "
+"how the model responds to slight tweaks to these approximations - slight "
+"enough to not make the approximations any less realistic. This will allow us"
+" to improve our understanding of how sensitive our models are to small "
+"changes and also to things like changes in carbon dioxide and the sulphur "
+"cycle. This will allow us to explore how climate may change in the next "
+"century under a wide range of different scenarios."
 msgstr "研究最新的气候模型中的近似处理。通过将模型运行数千次,我们希望能研究模型对近似处理的反应,同时还要保证模型不能脱离于实际。这能够帮助我们加深对模型的理解,包括对二氧化碳、硫循环等的敏感程度。更进一步,这能够帮助我们了解下一个世纪的气候变化趋势,包括各种不同的场景。"
 
 #: projects.inc:207
@@ -519,39 +604,56 @@ msgid "Mechanical engineering"
 msgstr "机械工程"
 
 #: projects.inc:214
-msgid "Currently we are calculating the optimum design of a structure call the 52 bar truss"
+msgid ""
+"Currently we are calculating the optimum design of a structure call the 52 "
+"bar truss"
 msgstr "当前我们正在对一个名为 52 bar truss 的结构进行优化设计"
 
-#: projects.inc:224
-#: projects.inc:263
-#: projects.inc:271
+#: projects.inc:224 projects.inc:263 projects.inc:271
 msgid "Astronomy"
 msgstr "天文学"
 
 #: projects.inc:225
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
+msgid ""
+"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
+"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
+"Universe. We will measure physical parameters (such as stellar mass surface "
+"density, star formation rate surface density, attenuation, and first-order "
+"star formation history) on a resolved pixel-by-pixel basis using spectral "
+"energy distribution (SED) fitting techniques in a distributed computing "
+"mode."
 msgstr "我们将结合 GALEX,Pan-STARRS 1 和 WISE 的光谱覆盖范围来生成附近宇宙的从紫外到近红外的多波长的图集。以分布式计算模式为基础,使用光谱能量分布(SED)的拟合技术逐个解析像素,我们将可以测量各种物理参数,比如恒星质量表面密度,恒星形成率表面密度,恒星的衰减和一阶恒星形成历史。                "
 
 #: projects.inc:247
 msgid "University of Texas at Austin"
 msgstr "美国得克萨斯大学奥斯汀分校"
 
-#: projects.inc:248
-#: projects.inc:279
+#: projects.inc:248 projects.inc:279
 msgid "Chemistry"
 msgstr "化学"
 
 #: projects.inc:249
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
+msgid ""
+"A common problem in theoretical chemistry, condensed matter physics and "
+"materials science is the calculation of the time evolution of an atomic "
+"scale system where, for example, chemical reactions and/or diffusion occur. "
+"Generally the events of interest are quite rare (many orders of magnitude "
+"slower than the vibrational movements of the atoms), and therefore direct "
+"simulations, tracking every movement of the atoms, would take thousands of "
+"years of computer calculations on the fastest present day computer before a "
+"single event of interest can be expected to occur.  Our research group is "
+"interested in calculating the long time dynamics of systems."
 msgstr "理论化学、凝集态物理和材料科学中的一个常见问题是对原子尺度系统的时间演化过程(比如化学反应)的计算。一般来说在这些过程中让研究人员感兴趣的事件的发生概述都相当低(比原子的振动要慢好多个数量级),因为即使是在目前最快的计算机上,也需要几千年的计算时间才有可能碰到一次有研究价值的事件。我们的研究组就致力于对这些系统的长时动力学过程进行计算。"
 
-# 95%
 #: projects.inc:262
 msgid "University of Illinois at Urbana-Champaign"
 msgstr "伊利诺伊大学厄本那-香槟分校"
 
 #: projects.inc:264
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
+msgid ""
+"The goal of Cosmology at Home is to search for the model that best describes "
+"our Universe and to find the range of models that agree with the available "
+"astronomical particle physics data."
 msgstr "Cosmology at Home 的目标是搜索可以描述我们宇宙的最适合的模型,并研究能够与天文观测数据相符的模型范围。"
 
 #: projects.inc:270
@@ -559,7 +661,10 @@ msgid "Rensselaer Polytechnic Institute"
 msgstr "伦斯勒理工学院"
 
 #: projects.inc:272
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
+msgid ""
+"The goal of Milkyway at Home is to create a highly accurate three dimensional "
+"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
+"Survey."
 msgstr "Milkeyway at Home 使用 Sloan 数字巡天的数据来对银河系进行高精度的三维建模。"
 
 #: projects.inc:278
@@ -567,7 +672,13 @@ msgid "Leiden University, The Netherlands"
 msgstr "荷兰莱顿大学"
 
 #: projects.inc:280
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
+msgid ""
+"Surface science calculations using Classical Dynamics.  Leiden Classical "
+"allows volunteers, students and other scientist to submit their personal "
+"calculations to the grid. Each user has his own personal queue for Classical"
+" Dynamics jobs. In this way students have used the grid to simulate liquid "
+"argon, or to test the validity of the ideal gas law by actually doing the "
+"simulations through the grid."
 msgstr "使用经典力学进行表面科学的计算。Leiden Classical 允许志愿者、学者和其它科研人员提供他们自己的计算任务,每个用户都有他自己的经典力学任务队列。通过这种方式,学生们可以利用网格来对他们学习到的相关理论进行验证。"
 
 #: projects.inc:294
@@ -579,25 +690,36 @@ msgid "Astrophysics"
 msgstr "天体物理学"
 
 #: projects.inc:296
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
+msgid ""
+"Search for spinning neutron stars (also called pulsars) using data from the "
+"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
+"observatory.  Einstein at Home is a World Year of Physics 2005 project "
+"supported by the American Physical Society (APS) and by a number of "
+"international organizations."
 msgstr "分析 LIGO 和 GEO 引力波探测器以及阿雷西波观测站采集到的数据,以寻找自旋中子星(也称为脉冲星)。Einstein at Home 是 2005 世界物理学年的推介项目,由美国物理学会(APS)和一些相关的国际组织发起。"
 
-#: projects.inc:310
-#: projects.inc:318
+#: projects.inc:310 projects.inc:318
 msgid "CERN (European Organization for Nuclear Research)"
 msgstr "CERN(欧洲核研究组织)"
 
-#: projects.inc:311
-#: projects.inc:319
+#: projects.inc:311 projects.inc:319
 msgid "Physics"
 msgstr "物理学"
 
 #: projects.inc:312
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
+msgid ""
+"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
+"European Organization for Nuclear Research, the world's largest particle "
+"physics laboratory.  It is the most powerful instrument ever built to "
+"investigate on particles proprieties. LHC at home runs simulations to improve "
+"the design of LHC and its detectors."
 msgstr "大型强子对撞机(LHC)是 CERN(欧洲核研究组织)的一个粒子加速器装置,也是世界上最大的粒子物理实验室。它是人类现有的用于研究基本粒子特性的最强大的实验装置。LHC at home 的作用主要是对加速器进行模拟,并帮助改进 LHC 及其探测器的设计。"
 
 #: projects.inc:320
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
+msgid ""
+"This project uses CERN-developed virtual machine technology for full-fledged"
+" LHC event physics simulation on volunteer computers.  Requires that you "
+"install VirtualBox on your computer"
 msgstr "该项目在志愿者的计算机上使用 CERN 开发的虚拟机技术来对 LHC 中发生的物理事件进行模拟。要求在你的计算机上安装 VirtualBox。"
 
 #: projects.inc:326
@@ -609,7 +731,12 @@ msgid "Astrophysics, astrobiology"
 msgstr "天体物理学,天体生物学"
 
 #: projects.inc:328
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
+msgid ""
+"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
+"goal is to detect intelligent life outside Earth. One approach, known as "
+"radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
+"signals from space. Such signals are not known to occur naturally, so a "
+"detection would provide evidence of extraterrestrial technology."
 msgstr "SETI (搜索地外智能)的研究领域是探测地球之外的智慧生命。探测的途径之一,也被称之为射电 SETI,使用射电望远镜来监听太空中的窄波射电信号。因为依照人类目前的认识,这些信号不会自然产生,因此可以作为将其地外技术文明存在的证据。"
 
 #: projects.inc:342
@@ -621,7 +748,11 @@ msgid "Chemical engineering and nanotechnology"
 msgstr "化学工程和纳米技术"
 
 #: projects.inc:344
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
+msgid ""
+"The study of molecular magnets and controlled nanoscale magnetism.  These "
+"magnetic molecules may be used to develop tiny magnetic switches, with "
+"applications in medicine (such as local tumor chemotherapy) and "
+"biotechnology."
 msgstr "研究分子磁体和纳米尺度的磁力学。这些分子磁体可用于研发微型磁性开关,适用于医药(比如肿瘤化疗)和生物技术领域。"
 
 #: projects.inc:351
@@ -637,7 +768,10 @@ msgid "Physics, biochemistry, and others"
 msgstr "物理学、生物化学、其它"
 
 #: projects.inc:358
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
+msgid ""
+"The objective of CAS at home is to encourage and assist scientists in China to "
+"adopt the technologies of volunteer computing and volunteer thinking for "
+"their research."
 msgstr "CAS at home 的目标是鼓励和帮忙中国的科研人员采用志愿计算这种计算技术以及相应的科研思维方式"
 
 #: projects.inc:365
@@ -645,11 +779,12 @@ msgid "Mathematics, physics, evolution"
 msgstr "数学、物理学、进化论"
 
 #: projects.inc:366
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
+msgid ""
+"Yoyo at home is an adapter between BOINC and several existing volunteer "
+"computing projects: ECM, Muon, Evolution at home, and distributed.net"
 msgstr "Yoyo at home 将一些传统的志愿计算项目,包括 ECM、Muon、Evolution at home 和 distributed.net 等,移植到了 BOINC 平台。"
 
-#: projects.inc:371
-#: projects.inc:527
+#: projects.inc:371 projects.inc:527
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 msgstr "匈牙利 MTA-SZTAKI 并行和分布式系统实验室"
 
@@ -658,7 +793,11 @@ msgid "European research projects"
 msgstr "欧盟研究项目"
 
 #: projects.inc:373
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
+msgid ""
+"The EDGeS at Home Beta project integrates volunteer computing into the service "
+"grid network of Europe by allowing service grids to send workunits to be "
+"processed by the volunteers of this project. The scientific projects covered"
+" by the project include math, physics, biology, etc."
 msgstr "EDGes at Home Beta 项目将志愿计算融入到欧洲计算服务网格的网络,允许服务网格将计算任务分发给项目的志愿者们来处理。项目所涉及的科研领域包括数学、物理、生物等等。"
 
 #: projects.inc:379
@@ -682,7 +821,11 @@ msgid "Medical, environmental and other humanitarian research"
 msgstr "医疗,环境和其他人道主义研究"
 
 #: projects.inc:389
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
+msgid ""
+"To further critical non-profit research on some of humanity's most pressing "
+"problems by creating the world's largest volunteer computing grid.  Research"
+" includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"clean water and many more."
 msgstr "通过建立世界上最大的志愿计算网络来推进一些关于人类最紧迫问题的关键的、非赢利性的科学研究。包括艾滋,癌症,登革热以及一些被忽视的疾病,太阳能,清洁水等等。"
 
 #: projects.inc:395
@@ -701,21 +844,18 @@ msgstr "数学、物理、人工智能"
 msgid "Simulation of quantum computing; Goldbach's conjecture."
 msgstr "量子计算模拟、哥德巴赫猜想"
 
-#: projects.inc:450
-#: projects.inc:458
+#: projects.inc:450 projects.inc:458
 msgid "Cryptography"
 msgstr "密码学"
 
 #: projects.inc:459
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
+msgid ""
+"Attempt to decode 3 original Enigma messages. The signals were intercepted "
+"in the North Atlantic in 1942 and are believed to be unbroken."
 msgstr "该项目试图解密三条二战期间的加密电报消息,这些消息于 1942 年在北大西洋截获而且一直被认为是不可破解的。"
 
-#: projects.inc:465
-#: projects.inc:504
-#: projects.inc:512
-#: projects.inc:520
-#: projects.inc:528
-#: projects.inc:568
+#: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
+#: projects.inc:528 projects.inc:568
 msgid "Mathematics"
 msgstr "数学"
 
@@ -732,11 +872,19 @@ msgid "Factorization of large integers"
 msgstr "大数的因式分解"
 
 #: projects.inc:473
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
+msgid ""
+"NFS at Home is a research project that uses Internet-connected computers to do "
+"the lattice sieving step in the Number Field Sieve factorization of large "
+"integers. As a young school student, you gained your first experience at "
+"breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
+"NFS at Home is a continuation of that experience, only with integers that are "
+"hundreds of digits long."
 msgstr "NFS at Home 是一个利用通过互联网连接的计算机来进行大整数数域筛选分解中的格筛步骤的研究项目。当你还是一个年轻的学生时,你应该就有了分解质因数的经历,比如 15=3*5 或者 35=5*7。NFS at Home 正是这一经历的延续,不过却是分解有数百位数字长的大整数。"
 
 #: projects.inc:479
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
+msgid ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
 msgstr "Vilnius Gediminas 理工大学 和 Kaunas 理工大学(立陶宛)"
 
 #: projects.inc:480
@@ -744,7 +892,11 @@ msgid "Software testing"
 msgstr "软件测试"
 
 #: projects.inc:481
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
+msgid ""
+"The aim of this project is to provide a powerful distributed computing "
+"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
+"well as others Lithuanian academic institutions.  Current applications "
+"involve the study of Monte-Carlo based software testing."
 msgstr "本项目的目的是为 Vilnius Gediminas 理工大学(VGTU)和其它立陶宛的科研机构提供一个强大的分布式计算平台。当前的应用主要涉及到基于蒙特卡罗的软件测试研究。"
 
 #: projects.inc:503
@@ -752,11 +904,20 @@ msgid "Mathematical Institute of Leiden University / Kennislink"
 msgstr "莱顿(Leiden)大学数字学院(Kennislink)"
 
 #: projects.inc:505
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
+msgid ""
+"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
+"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
+"product of the distinct prime factors of n. The ABC conjecture says that "
+"there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for "
+"any real h > 1. The ABC conjecture is currently one of the greatest open "
+"problems in mathematics. If it is proven to be true, a lot of other open "
+"problems can be answered directly from it."
 msgstr "寻找满足 ABC 猜想条件的 abc 三元组,条件是:c=a+b, a<b, b<c, rad(ABC)<C,其中 rad(n) 称为 n 的根积,意即 n 的所有质因数的乘积,若有重复的质因数则只取一个。ABC 猜想的具体内容是:对于所有 e>0,存在与 e 有关的常数 C(e),对于所有满足a+b=c,a 与 b 互质的三元整数组 (a,b,c),均成立 c<=C(e)((rad(abc))^(1+e))。ABC 猜想是当前数论中最重要的未解决问题之一,如果它能够被证明,其它不少未解决问题也能得到直接的证明。"
 
 #: projects.inc:513
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
+msgid ""
+"Primegrid has multiple projects searching for different forms of very large "
+"prime numbers, including searching for the largest known prime number."
 msgstr "Primegrid 旗下有多个研究各种类型大质数的项目,其中也包括寻找已知最大质数。"
 
 #: projects.inc:519
@@ -764,11 +925,15 @@ msgid "Hochschule RheinMain University of Applied Sciences"
 msgstr "莱茵曼应用技术大学"
 
 #: projects.inc:521
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
+msgid ""
+"Search for counterexamples to two conjectures related to the identification "
+"of prime numbers"
 msgstr "寻找两个有关质数识别的猜想的反例。"
 
 #: projects.inc:529
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
+msgid ""
+"Find all the generalized binary number systems (in which bases are matrices "
+"and digits are vectors) up to dimension 11."
 msgstr "寻找所有的广义二进制数系(基是矩阵,而位是向量),目前项目正在搜索 12 维的广义二进制数系。"
 
 #: ../html/inc/news.inc:40
@@ -779,418 +944,3 @@ msgstr "备注"
 #, php-format
 msgid "News is available as an %sRSS feed%s"
 msgstr "新闻还可以通过 %sRSS%s 来访问"
-
-# 75%
-#~ msgid "Astronomy, Physics, and Chemistry"
-#~ msgstr "天文、物理和化学"
-#, php-format
-#~ msgid "%s for %s (%s MB)"
-#~ msgstr "%s 用于 %s (%s兆字节)"
-#~ msgid ""
-#~ "BOINC is a program that lets you donate your idle computer time to science "
-#~ "projects like SETI at home, Climateprediction.net, Rosetta at home, World "
-#~ "Community Grid, and many others. <p> After installing BOINC on your "
-#~ "computer, you can connect it to as many of these projects as you like."
-#~ msgstr ""
-#~ "BOINC 使得您可以把计算机的闲置时间捐献给如 "
-#~ "SETI at homeEinstein at home、Climateprediction.net、Rosetta at home、World Commnunity "
-#~ "Grid 等等许多科研项目。<p>在将 BOINC 安装到您的计算机上之后,您可以加入任意多个您喜欢的项目。<p>"
-#~ msgid "Browser default"
-#~ msgstr "浏览器默认"
-
-#, php-format
-#~ msgid ""
-#~ " Use the idle time on your computer (Windows, Mac, or Linux) to cure "
-#~ "diseases, study global warming, discover pulsars, and do many other types of "
-#~ "scientific research.  It's safe, secure, and easy:  %sChoose%s projects  "
-#~ "%sDownload%s and run BOINC software  %sEnter%s an email address and "
-#~ "password. "
-#~ msgstr ""
-#~ " 将您计算机 (包括 Windows、Mac 以及Linux) "
-#~ "的闲置时间利用起来,就可以帮助科学家们治疗疾病、了解全球变暖、发现脉冲星以及其它多种类型的科学研究,而且这还很简单和安全:  %s选择%s 项目  %"
-#~ "s下载%s 并运行 BOINC 软件%s  输入%s 您的电子邮件地址以及项目密码。 "
-#~ msgid "IBM Corporate Community Relations"
-#~ msgstr "IBM 协作社区关系部"
-#~ msgid "Humanitarian research on disease, natural disasters and hunger."
-#~ msgstr "关于疾病、自然灾害、饥饿的人道主义研究。"
-#~ msgid ""
-#~ "To further critical non-profit research on some of humanity's most "
-#~ "pressing problems by creating the world's largest volunteer computing "
-#~ "grid.  Research includes HIV/AIDS, cancer, muscular dystrophy, dengue "
-#~ "fever, and many more."
-#~ msgstr ""
-#~ "创建世界上最大的志愿计算网格,资助非赢利性的关于人类重大疾病的研究。研究内"
-#~ "容包括爱滋、癌症、肌肉萎缩症、登革热等等。"
-#~ msgid ""
-#~ "Primegrid is generating a public sequential prime number database, and is "
-#~ "searching for large twin primes of the form k*2<sup>n</sup>+1 and "
-#~ "k*2<sup>n</sup>-1"
-#~ msgstr ""
-#~ "Primegrid 的目的是构造一个公共的质数序列数据库,当前正在搜寻形式为 "
-#~ "k*2<sup>n</sup>+1 和 k*2<sup>n</sup>-1 的孪生大质数。"
-#~ msgid "FreeHAL"
-#~ msgstr "FreeHAL"
-#~ msgid "private"
-#~ msgstr "个人项目"
-#~ msgid "POEM at HOME"
-#~ msgstr "POEM at HOME"
-#~ msgid "Docking at Home"
-#~ msgstr "Docking at Home"
-#~ msgid "GPUGrid.net"
-#~ msgstr "GPUGrid.net"
-#~ msgid "Superlink at Technion"
-#~ msgstr "Superlink at Technion"
-#~ msgid "The Lattice Project"
-#~ msgstr "The Lattice Project"
-#~ msgid "Malariacontrol.net"
-#~ msgstr "Malariacontrol.net"
-#~ msgid "Rosetta at home"
-#~ msgstr "Rosetta at home"
-#~ msgid "SIMAP"
-#~ msgstr "SIMAP"
-#~ msgid "Virtual Prairie"
-#~ msgstr "Virtual Prairie"
-#~ msgid "University of Houston"
-#~ msgstr "美国休斯顿大学"
-#~ msgid "Study of botanical ecosystems"
-#~ msgstr "植物生态系统研究"
-#~ msgid ""
-#~ "Provide ecological guidelines on the design of prairies with the best "
-#~ "potential for water purification."
-#~ msgstr "为建设可用于水净化的草原设计提供生态学上的指导方针。"
-#~ msgid "Climateprediction.net"
-#~ msgstr "Climateprediction.net (CPDN)"
-#~ msgid "Astronomy/Physics/Chemistry"
-#~ msgstr "天文/物理/化学"
-#~ msgid "eOn"
-#~ msgstr "eOn"
-#~ msgid "Orbit at home"
-#~ msgstr "Orbit at home"
-#~ msgid "Planetary Science Institute"
-#~ msgstr "行星科学研究所"
-#~ msgid "Monitor and study the hazard posed by near-Earth asteroids"
-#~ msgstr "监控并研究近地小行星的危害"
-#~ msgid "Cosmology at Home"
-#~ msgstr "Cosmology at Home"
-#~ msgid "University of Illinois at Urbana-Chamapign"
-#~ msgstr "伊利诺伊大学厄本那-香槟分校"
-#~ msgid "Milkyway at home"
-#~ msgstr "Milkyway at home"
-#~ msgid "Leiden Classical"
-#~ msgstr "Leiden Classical"
-#~ msgid "uFluids at home"
-#~ msgstr "uFluids at home"
-#~ msgid "Purdue University"
-#~ msgstr "美国普度大学"
-#~ msgid "Physics/Aeronautics"
-#~ msgstr "物理学/航空"
-#~ msgid ""
-#~ "The uFluids project simulates two-phase fluid behavior in microgravity "
-#~ "and microfluidics problems. Our goal is to design better satellite "
-#~ "propellant management devices and address two-phase flow in microchannel "
-#~ "and MEMS devices."
-#~ msgstr "uFluids 项目对微重力环境下的两相流体行为进行模拟,研究微流体问题。"
-#~ msgid "Einstein at home"
-#~ msgstr "Einstein at home"
-#~ msgid "LHC at home"
-#~ msgstr "LHC at home"
-#~ msgid "SETI at home"
-#~ msgstr "SETI at home"
-#~ msgid "Quantum Monte Carlo at Home"
-#~ msgstr "QMC at Home"
-#~ msgid "University of Muenster (Germany)"
-#~ msgstr "德国明斯特大学"
-#~ msgid ""
-#~ "Study the structure and reactivity of molecules using Quantum Chemistry."
-#~ msgstr "通过量力化学来研究分子的结构和相互作用。"
-#~ msgid "Spinhenge at home"
-#~ msgstr "Spinhenge at home"
-#~ msgid "CAS at home"
-#~ msgstr "CAS at home"
-#~ msgid "Yoyo at home"
-#~ msgstr "Yoyo at home"
-#~ msgid "EDGeS at Home"
-#~ msgstr "EDGeS at Home"
-#~ msgid "Ibercivis"
-#~ msgstr "Ibercivis"
-#~ msgid "World Community Grid"
-#~ msgstr "World Community Grid (WCG)"
-#~ msgid "Enigma at Home"
-#~ msgstr "Enigma at Home"
-#~ msgid "Collatz Conjecture"
-#~ msgstr "Collatz Conjecture"
-#~ msgid "NFS at home"
-#~ msgstr "NFS at home"
-#~ msgid "VTU at home"
-#~ msgstr "VTU at home"
-#~ msgid "AQUA at home"
-#~ msgstr "AQUA at home"
-#~ msgid "D-Wave Systems, Inc."
-#~ msgstr "D-Wave Systems 公司"
-#~ msgid "Quantum computing"
-#~ msgstr "量子计算"
-#~ msgid ""
-#~ "D-Wave's AQUA (Adiabatic QUantum Algorithms) is a research project whose "
-#~ "goal is to predict the performance of superconducting adiabatic quantum "
-#~ "computers on a variety of hard problems arising in fields ranging from "
-#~ "materials science to machine learning. AQUA at home uses Internet-connected "
-#~ "computers to help design and analyze quantum computing algorithms, using "
-#~ "Quantum Monte Carlo techniques."
-#~ msgstr ""
-#~ "D-Wave 的 AQUA(绝热量子算法)是一个对超导绝热量子计算机在一系列从材料科学"
-#~ "到机器学习等的复杂问题上的处理效率进行预测的研究项目。AQUA at home 使用通过互"
-#~ "联网连接的计算机来帮助设计和分析量子计算算法,使用的是量子蒙特卡罗技术。"
-#~ msgid "ABC at home"
-#~ msgstr "ABC at home"
-#~ msgid "PrimeGrid"
-#~ msgstr "PrimeGrid"
-#~ msgid "primaboinca"
-#~ msgstr "primaboinca"
-#~ msgid "SZTAKI Desktop Grid"
-#~ msgstr "SZTAKI Desktop Grid"
-#~ msgid "Chess960 at home"
-#~ msgstr "Chess960 at home"
-#~ msgid "Chess-960.org"
-#~ msgstr "Chess-960.org"
-#~ msgid "Game-playing"
-#~ msgstr "玩游戏"
-#~ msgid ""
-#~ "This project studies Chess 960, a variant of orthodox chess. In classical "
-#~ "chess the starting position of the game never changes.  In Chess 960, "
-#~ "just before the start of every game, the initial configuration of the "
-#~ "chess pieces is determined randomly."
-#~ msgstr ""
-#~ "该项目研究正统国际象棋的一个变种 Chess 960。普通象棋里开局后棋子的位置总是"
-#~ "固定的,但在 Chess 960 里,每次游戏开始之前,棋子的初始配置都是随机决定"
-#~ "的。"
-#~ msgid "The current release is known to work with these Linux versions:"
-#~ msgstr "当前的发布版本在下列这些 Linux 版本上可以正常工作:"
-#~ msgid ""
-#~ "For other Linux versions, check if a BOINC package is offered by your "
-#~ "Linux distribution."
-#~ msgstr ""
-#~ "对于其它 Linux 版本,请检查您的 Linux 发行本是否直接提供了 BOINC 软件包。"
-#~ msgid ""
-#~ "Alternatively, download the %1BOINC client for older Linux versions%2. "
-#~ "This doesn't have a graphical interface, but it should work on all Linux "
-#~ "systems, both x86 and x64."
-#~ msgstr ""
-#~ "或者您也可以下载%1用于旧版本 Linux 的 BOINC 客户端%2。该版本没有图形界面,"
-#~ "但应该可以在所有 Linux 版本上正常工作,包括 x86 和 x64 平台。"
-#~ msgid ""
-#~ "Note: if your computer is equipped with an Graphics Processing Unit "
-#~ "(GPU), you may be able to %suse it to compute faster%s"
-#~ msgstr ""
-#~ "注意:如果您的计算机配备了 NVIDIA 的显示卡,您 也许可以%s通过它来使计算变"
-#~ "得更快%s。"
-#~ msgid "TeraFLOPS."
-#~ msgstr "万亿次浮点运算/秒。 "
-#~ msgid "Conferences"
-#~ msgstr "会议"
-#~ msgid "[check all that apply]"
-#~ msgstr "[选中所有符合情况的]"
-#~ msgid "Other:"
-#~ msgstr "其它:"
-#~ msgid "Yes - I have been running BOINC on my computer for..."
-#~ msgstr "是的 - 我已经在我的计算机上运行 BOINC ..."
-#~ msgid "less than a week"
-#~ msgstr "不到一个星期"
-#~ msgid "less than a month"
-#~ msgstr "不到一个月"
-#~ msgid "less than a year"
-#~ msgstr "不到一年"
-#~ msgid "more than a year"
-#~ msgstr "超过一年"
-#~ msgid "No - I used to run BOINC, but..."
-#~ msgstr "没有 - 我曾经运行过,但是 ..."
-#~ msgid "I lost interest"
-#~ msgstr "没兴趣了"
-#~ msgid "it was too complicated"
-#~ msgstr "软件太复杂"
-#~ msgid "I stopped it and forgot to start again"
-#~ msgstr "我退出软件之后忘记重新启动了"
-#~ msgid "it caused problems on my computer"
-#~ msgstr "软件让我的机器出毛病了"
-#~ msgid "it used too much electricity"
-#~ msgstr "它太浪费电"
-#~ msgid "I switched to a non-BOINC computing project"
-#~ msgstr "我转向了一个非 BOINC 的计算项目"
-#~ msgid "No - I tried running BOINC, but..."
-#~ msgstr "没有 - 我试图运行 BOINC,但是 ..."
-#~ msgid "the software didn't install correctly"
-#~ msgstr "软件安装时碰到问题"
-#~ msgid "I couldn't figure out how to use the software"
-#~ msgstr "我不知道该怎么使用这个软件"
-#~ msgid "I had network communication problems"
-#~ msgstr "我的网络通讯有问题"
-#~ msgid "I couldn't attach to a project"
-#~ msgstr "我没法加入项目"
-#~ msgid "I attached to a project, but never got any work"
-#~ msgstr "我加入了项目,但总是下载不到任何任务包"
-#~ msgid "No - I never tried running BOINC, because..."
-#~ msgstr "没有 - 我还从来没用过,因为 ..."
-#~ msgid "I was concerned about security"
-#~ msgstr "我担心它的安全性"
-#~ msgid "I wasn't interested in any of the projects"
-#~ msgstr "没有一个项目能引起我的兴趣"
-#~ msgid "I don't have permission to run it on my computer"
-#~ msgstr "我没有获准在我机器上运行这个软件"
-#~ msgid "No version was available for my computer"
-#~ msgstr "没有适合我计算机的版本"
-#~ msgid "What kind of computers do you have running BOINC?"
-#~ msgstr "您在什么计算机上运行 BOINC?"
-#~ msgid "Where are they?"
-#~ msgstr "您使用的计算机在哪里?"
-#~ msgid "Work"
-#~ msgstr "公司"
-#~ msgid "School"
-#~ msgstr "学校"
-#~ msgid "How many computers?"
-#~ msgstr "总共有多少台计算机?"
-#~ msgid "On average, how many hours per day are they powered on?"
-#~ msgstr "平均来说,这些计算机一天开机多少小时?"
-#~ msgid "Age"
-#~ msgstr "年龄"
-#~ msgid "Sex"
-#~ msgstr "性别"
-#~ msgid "Male"
-#~ msgstr "男"
-#~ msgid "Female"
-#~ msgstr "女"
-#~ msgid "Your level of computer expertise"
-#~ msgstr "您的计算机操作水平"
-#~ msgid "Beginner"
-#~ msgstr "初学"
-#~ msgid "Intermediate"
-#~ msgstr "中等"
-#~ msgid "Advanced"
-#~ msgstr "熟练"
-#~ msgid "Where did you learn about BOINC projects?"
-#~ msgstr "您从哪里了解 BOINC 平台上的项目?"
-#~ msgid "TV/radio/newspaper"
-#~ msgstr "电视/广播/报纸"
-#~ msgid "From friends, relatives, or coworkers"
-#~ msgstr "朋友、亲戚或同事"
-#~ msgid "Team message boards or web sites"
-#~ msgstr "计算团队的留言板或网站"
-#~ msgid "The BOINC web site"
-#~ msgstr "BOINC 官方网站"
-#~ msgid "Other web sites"
-#~ msgstr "其它网站"
-#~ msgid ""
-#~ "Which are the most important factors when you decide whether to "
-#~ "participate in a BOINC project?"
-#~ msgstr "在您决定参加某个 BOINC 项目时,哪些因素在您看来最为重要?"
-#~ msgid "Nice-looking screensaver graphics"
-#~ msgstr "好看的屏保"
-#~ msgid "Fair and quick granting of credit for work done"
-#~ msgstr "任务完成后能够公平而且快速地得到积分"
-#~ msgid "Getting more credit from this project than from others"
-#~ msgstr "从这个项目可以得到比其它项目更多的积分"
-#~ msgid "Helpful and friendly message boards"
-#~ msgstr "有帮助的并且友好的项目留言板"
-#~ msgid "Participation by project staff on the message boards"
-#~ msgstr "项目人员积极参与到留言板的讨论中"
-#~ msgid "Informative project web site"
-#~ msgstr "内容丰富的项目网站"
-#~ msgid "The science is important and beneficial"
-#~ msgstr "研究内容重要而且有实用价值"
-#~ msgid "Non-profit, and results are public"
-#~ msgstr "非赢利,研究成果公开"
-#~ msgid "Personal recognition if my computer finds something"
-#~ msgstr "如果从用户那得到了好的研究结果,能对其贡献进行认可"
-#~ msgid "Publication by the project in scientific journals"
-#~ msgstr "项目能在科学刊物上发表文章"
-#~ msgid "Periodic email newsletters from the project"
-#~ msgstr "能定期从项目收到新闻邮件"
-#~ msgid "How many BOINC projects do you participate in?"
-#~ msgstr "您参加了多少个 BOINC 项目?"
-#~ msgid "Do you run BOINC as a screensaver?"
-#~ msgstr "您是通过屏保方式运行 BOINC 吗?"
-#~ msgid "Yes"
-#~ msgstr "是的"
-#~ msgid "No"
-#~ msgstr "不是"
-#~ msgid "Your usage of project messages boards:"
-#~ msgstr "您如何使用项目的留言板:"
-#~ msgid "to read information"
-#~ msgstr "只是阅读"
-#~ msgid "to read and post information"
-#~ msgstr "阅读并发表"
-#~ msgid "None"
-#~ msgstr "不使用"
-#~ msgid ""
-#~ "Where do you get information to help resolve problems with BOINC and/or "
-#~ "BOINC projects?"
-#~ msgstr "如果碰到 BOINC 的或基于 BOINC 的项目的问题,您会去哪寻求帮助?"
-#~ msgid "The project message boards"
-#~ msgstr "项目留言板"
-#~ msgid "The BOINC message boards"
-#~ msgstr "BOINC 官方网站的留言板"
-#~ msgid "BOINC mailing lists"
-#~ msgstr "BOINC 官方邮件列表"
-#~ msgid "The Unofficial BOINC Wiki"
-#~ msgstr "非官方的 BOINC 维基网站"
-#~ msgid "Team web sites"
-#~ msgstr "计算团队网站"
-#~ msgid "Google or other search engines"
-#~ msgstr "Google 或其它搜索引擎"
-#~ msgid "... more"
-#~ msgstr "... 更多"
-#~ msgid "BOINC user survey"
-#~ msgstr "BOINC 用户调查"
-#~ msgid ""
-#~ "Several volunteer computing projects, including Climateprediction.net, "
-#~ "Einstein at home, and SETI at home, use software called BOINC.  If you "
-#~ "participate in projects like this, we request that you answer the "
-#~ "following questions.  This will help BOINC-based projects increase "
-#~ "participation and achieve greater scientific results. <p> Please answer "
-#~ "as many questions as you want, then go to the bottom and click OK. If you "
-#~ "previously completed the survey but your answers have changed, please "
-#~ "complete it again - your new answers will replace the old ones. <p> The "
-#~ "current results of the survey are <a href=poll_results.php>here</a>. "
-#~ msgstr ""
-#~ "包括 Climateprediction.net、Einstein at homeSETI at home 在内的几个志愿计算"
-#~ "项目都使用一个称之为 BOINC 的软件。  如果您参加了这些项目,我们希望您能回"
-#~ "答下面的问题。  这将能帮助所有基于 BOINC 的项目提高它们的用户参与度并得到"
-#~ "更好的科研成果。<p>请尽可能多回答一些问题,然后点击页面最底部的确定按钮。"
-#~ "如果您之前完成过这个调查,但现在有了不同的回答,请重新填写调查 - 您的新回"
-#~ "答将会取代旧的。<p>要查看当前的调查结果请点击 <a href=poll_results.php>这"
-#~ "里</a>。"
-#~ msgid "Do you run BOINC?"
-#~ msgstr "您使用 BOINC 吗?"
-#~ msgid "Your participation"
-#~ msgstr "您的参与情况"
-#~ msgid "Your computers"
-#~ msgstr "您的计算机"
-#~ msgid "You"
-#~ msgstr "关于您自己"
-#~ msgid "Nationality"
-#~ msgstr "国家或地区"
-#~ msgid "Comments"
-#~ msgstr "备注"
-#~ msgid ""
-#~ "Please suggest ways that BOINC, and the projects that use it, could be "
-#~ "improved:"
-#~ msgstr "请对 BOINC 及使用 BOINC 的项目提出您的改进意见:"
-#~ msgid "When done click:"
-#~ msgstr "已完成调查,请点击:"
-#~ msgid "Error - results not recorded"
-#~ msgstr "错误 - 调查结果未保存"
-#~ msgid ""
-#~ "An internal error has prevented us from recording your survey response.  "
-#~ "Please try again later."
-#~ msgstr "一个内部错误导致我们无法保存您的调查结果。  请稍后重试。"
-#~ msgid "Survey response recorded"
-#~ msgstr "调查结果已保存"
-#~ msgid "Thank you for completing the BOINC user survey."
-#~ msgstr "感谢您完成了 BOINC 用户调查。"
-#~ msgid "Survey results"
-#~ msgstr "调查结果"
-#~ msgid ""
-#~ "These are the current results of the <a href=poll.php>BOINC user survey</"
-#~ "a>.  This page is updated every hour."
-#~ msgstr ""
-#~ "下面是 <a href=poll.php>BOINC 用户调查</a> 的当前统计结果。  该页面每小时"
-#~ "更新一次。"
-
diff --git a/locale/zh_TW/BOINC-Client.mo b/locale/zh_TW/BOINC-Client.mo
index ca007bc..a3cd6a5 100644
Binary files a/locale/zh_TW/BOINC-Client.mo and b/locale/zh_TW/BOINC-Client.mo differ
diff --git a/locale/zh_TW/BOINC-Client.po b/locale/zh_TW/BOINC-Client.po
index 4b58b83..1a87ab8 100644
--- a/locale/zh_TW/BOINC-Client.po
+++ b/locale/zh_TW/BOINC-Client.po
@@ -1,24 +1,24 @@
 # 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:
+# willy Wu <df910105 at yahoo.com.tw>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: boinc\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-10-15 22:25-0700\n"
-"PO-Revision-Date: 2015-02-12 02:13-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: zh_TW\n"
+"PO-Revision-Date: 2015-02-16 04:59+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-POOTLE-MTIME: 1422765106.0\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: acct_mgr.cpp:450
-#: acct_mgr.cpp:459
+#: acct_mgr.cpp:450 acct_mgr.cpp:459
 msgid "Message from account manager"
 msgstr "來自於帳戶管理服務的訊息"
 
@@ -27,8 +27,10 @@ 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 "部分工作所需要的記憶體超過您設定允許使用的量。請檢查您的設定值。"
+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"
@@ -36,64 +38,64 @@ msgstr "無法寫入狀態文件,請檢查目錄權限"
 
 #: cs_cmdline.cpp:303
 msgid "The HTTP_PROXY environment variable must specify an HTTP proxy"
-msgstr "在 HTTP_PROXY 中必須指定一個 HTTP 代理伺服器"
+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 "您使用了錯誤的專案網址。若您方便,請移除專案並再一次加入 %s"
+msgid ""
+"You used the wrong URL for this project.  When convenient, remove this "
+"project, then add %s"
+msgstr "您使用了錯誤的專案網址。若您方便,請移除專案並再一次加入%s"
 
-#: cs_statefile.cpp:828
-#: ../sched/sched_types.cpp:259
+#: cs_statefile.cpp:828 ../sched/sched_types.cpp:259
 msgid "Syntax error in app_info.xml"
-msgstr "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 中所引用的檔案並不存在:"
+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
+#: current_version.cpp:94 current_version.cpp:102
 msgid "Download"
 msgstr "下載"
 
-#: log_flags.cpp:269
-#: log_flags.cpp:449
+#: log_flags.cpp:269 log_flags.cpp:449
 msgid "Unexpected text in cc_config.xml"
-msgstr "cc_config.xml 中有異常的文件"
+msgstr "cc_config.xml中有異常的文件"
 
-#: log_flags.cpp:423
-#: log_flags.cpp:475
+#: log_flags.cpp:423 log_flags.cpp:475
 msgid "Unrecognized tag in cc_config.xml"
-msgstr "cc_config.xml 中有無法辨識的標籤"
+msgstr "cc_config.xml中有無法辨識的標籤"
 
 #: log_flags.cpp:440
 msgid "Missing start tag in cc_config.xml"
-msgstr "cc_config.xml 中缺少了起始標籤"
+msgstr "cc_config.xml中缺少了起始標籤"
 
 #: log_flags.cpp:465
 msgid "Error in cc_config.xml options"
-msgstr "cc_config.xml 中有錯誤的設定"
+msgstr "cc_config.xml中有錯誤的設定"
 
 #: log_flags.cpp:483
 msgid "Missing end tag in cc_config.xml"
-msgstr "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 "帳號金鑰無效或不存在。  請移除並重新加入專案以修復這問題。"
+msgstr "Account key無效或不存在。 請移除並再一次的加入專案以修復這問題。"
 
 #: ../sched/handle_request.cpp:849
 msgid "Invalid code signing key.  To fix, remove and add this project."
-msgstr "錯誤的代碼簽名鑰匙。  請移除並重新加入專案以修復這問題。"
+msgstr "錯誤的代碼簽名鑰匙。 請移除並再一次的加入專案以修復這問題。"
 
 #: ../sched/handle_request.cpp:859
-msgid "The project has changed its security key.  Please remove and add this project."
-msgstr "該專案更新了安全金鑰。  請移除並重新加入專案。"
+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"
@@ -101,29 +103,33 @@ msgstr "該專案不支援您的作業系統"
 
 #: ../sched/handle_request.cpp:969
 msgid "This project doesn't support CPU type"
-msgstr "該專案不支援您的 CPU 類型"
+msgstr "該專案不支援您的CPU類型"
 
 #: ../sched/handle_request.cpp:993
-msgid "Your BOINC client software is too old.  Please install the current version."
-msgstr "你的 BOINC 客戶端軟體太舊了。  請安裝更新版本。"
+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 "將您的 GPU 驅動程式升級到最新的版本之後,才可以執行工作"
+msgid ""
+"Upgrade to the latest driver to process tasks using your computer's GPU"
+msgstr "將您的GPU驅動程式升級到最新的版本之後,才可以執行工作"
 
 #: ../sched/sched_send.cpp:1099
-msgid "Upgrade to the latest driver to use all of this project's GPU applications"
-msgstr "將您的 GPU 驅動程式升級到最新的版本之後,才可以執行專案中的 GPU 應用程式"
+msgid ""
+"Upgrade to the latest driver to use all of this project's GPU applications"
+msgstr "將您的GPU驅動程式升級到最新的版本之後,才可以執行專案中的GPU程式"
 
 #: ../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 GPU 來進行運算的時候,請將 BOINC 升級至最新的版本"
+msgid ""
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to"
+" the current version"
+msgstr "當您使用NVIDIA GPU進行運算的時候,請將BOINC升級至最新版本"
 
-# 94%
 #: ../sched/sched_send.cpp:1146
 #, c-format
 msgid "An %s GPU is required to run tasks for this project"
@@ -131,7 +137,7 @@ msgstr "該專案的工作需要%s的GPU才可以執行"
 
 #: ../sched/sched_send.cpp:1262
 msgid "No tasks are available for the applications you have selected."
-msgstr "您目前設定的應用程式類型沒有工作可以運算。"
+msgstr "您目前設定的程式類型沒有工作。"
 
 #: ../sched/sched_send.cpp:1288
 msgid "Your computer type is not supported by this project"
@@ -143,34 +149,14 @@ msgstr "請更新至最新版的 BOINC 軟體"
 
 #: ../sched/sched_send.cpp:1305
 #, c-format
-msgid "Tasks for %s are available, but your preferences are set to not accept them"
+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 中有未知的應用程式名稱"
+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 中沒有可以使用的版本"
-
-#~ msgid "Download it."
-#~ msgstr "下載他。"
-#~ msgid "An NVIDIA or ATI GPU is required to run tasks for this project"
-#~ msgstr "該專案的工作需要 NVIDIA 或 ATI 的 GPU 才可以執行"
-#~ msgid "An NVIDIA GPU is required to run tasks for this project"
-#~ msgstr "該專案的工作需要 NVIDIA 的 GPU 才可以執行"
-#~ msgid "An ATI GPU is required to run tasks for this project"
-#~ msgstr "該專案的工作需要 ATI 的 GPU 才可以執行"
-#~ msgid ""
-#~ "Tasks for NVIDIA GPU are available, but your preferences are set to not "
-#~ "accept them"
-#~ msgstr "目前還有 NVIDIA GPU 的工作,但您的設定中不允許執行"
-#~ msgid ""
-#~ "Tasks for ATI GPU are available, but your preferences are set to not accept "
-#~ "them"
-#~ msgstr "目前還有 ATI GPU 的工作,但您的設定中不允許執行"
-#~ msgid ""
-#~ "Tasks for CPU are available, but your preferences are set to not accept them"
-#~ msgstr "目前還有 CPU 的工作,但您的設定中不允許執行"
-
diff --git a/locale/zh_TW/BOINC-Manager.mo b/locale/zh_TW/BOINC-Manager.mo
index 3024186..c77101b 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 d550986..a1d8d52 100644
--- a/locale/zh_TW/BOINC-Manager.po
+++ b/locale/zh_TW/BOINC-Manager.po
@@ -1,64 +1,64 @@
 # 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:
+# Died <doomdied at gmail.com>, 2015
+# Willy Wu <df910105 at yahoo.com.tw>, 2015
+# Willy Wu <df910105 at yahoo.com.tw>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\n"
+"Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-15 16:56-0500\n"
-"PO-Revision-Date: 2015-02-12 02:15-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: zh_TW\n"
+"POT-Creation-Date: 2015-03-24 13:36-0500\n"
+"PO-Revision-Date: 2015-03-25 06:07+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc_7.4\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1422766089.0\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\n"
+"X-Poedit-Country: UNITED STATES\n"
+"X-Poedit-Language: English\n"
 "X-Poedit-SearchPath-0: clientgui\n"
-"X-Poedit-SearchPath-1: clientgui/msw\n"
-"X-Poedit-SearchPath-2: clientgui/mac\n"
-"X-Poedit-SearchPath-3: clientgui/mac\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"
 
-# 81%
-#: clientgui/AccountInfoPage.cpp:387
+#: clientgui/AccountInfoPage.cpp:361
 #, c-format
 msgid "Identify your account at %s"
-msgstr "確認您的%s帳號"
+msgstr "驗證您的 %s 帳號"
 
-#: clientgui/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 ""
-"請輸入您的帳號資訊\n"
-"(要建立帳號,請前往專案網站)"
+msgstr "請輸入您的帳號資訊\n(欲建立帳號,請前往專案網站)"
 
-#: clientgui/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 ""
-"該計畫暫不接受新帳號註冊,\n"
-"只能加入已存在的帳號。"
+msgstr "該計畫暫不接受新帳號註冊,\n您只能使用已存在的帳號。"
 
-#: clientgui/AccountInfoPage.cpp:401
+#: clientgui/AccountInfoPage.cpp:375
 msgid "Are you already running this project?"
-msgstr "您準備好執行此專案了嗎?"
+msgstr "您準備好執行此專案了嗎?"
 
-#: clientgui/AccountInfoPage.cpp:405
+#: clientgui/AccountInfoPage.cpp:379
 msgid "&No, new user"
 msgstr "否,我是新使用者 (&N)"
 
-#: clientgui/AccountInfoPage.cpp:408
+#: clientgui/AccountInfoPage.cpp:382
 msgid "&Yes, existing user"
 msgstr "是,我是已存在的使用者 (&Y)"
 
-#: clientgui/AccountInfoPage.cpp:413
+#: clientgui/AccountInfoPage.cpp:387
 msgid ""
 "We were not able to set up your account information\n"
 "automatically.\n"
@@ -66,121 +66,114 @@ msgid ""
 "Please click on the 'Find login information' link\n"
 "below to find out what to put in the email address and\n"
 "password fields."
-msgstr ""
-"我們無法自動的建立您的帳號資料。\n"
-"\n"
-"請點選“尋找登入資訊”連結\n"
-"從中找出您的電子信箱地址和密碼。"
+msgstr "我們無法自動的建立您的帳號資料。\n\n請點選“尋找登入資訊”連結\n從中找出您的電子信箱地址和密碼。"
 
-#: clientgui/AccountInfoPage.cpp:416
+#: clientgui/AccountInfoPage.cpp:390
 msgid "Find login information"
 msgstr "尋找登入資訊"
 
-#: clientgui/AccountInfoPage.cpp:436
-#: clientgui/AccountInfoPage.cpp:649
+#: clientgui/AccountInfoPage.cpp:410 clientgui/AccountInfoPage.cpp:632
 msgid "&Password:"
 msgstr "密碼 (&P):"
 
-#: clientgui/AccountInfoPage.cpp:443
-#: clientgui/AccountInfoPage.cpp:673
+#: clientgui/AccountInfoPage.cpp:417 clientgui/AccountInfoPage.cpp:656
 msgid "Choose a &password:"
 msgstr "選擇密碼 (&P):"
 
-#: clientgui/AccountInfoPage.cpp:446
+#: clientgui/AccountInfoPage.cpp:420
 msgid "C&onfirm password:"
 msgstr "確認密碼 (&O):"
 
-#: clientgui/AccountInfoPage.cpp:453
+#: clientgui/AccountInfoPage.cpp:427
 #, c-format
 msgid "Are you already running %s?"
-msgstr "您準備好執行 %s 了嗎?"
+msgstr "您準備好執行 %s 了嗎?"
 
-#: clientgui/AccountInfoPage.cpp:482
+#: clientgui/AccountInfoPage.cpp:456
 msgid "&Username:"
 msgstr "使用者名稱 (&U):"
 
-#: clientgui/AccountInfoPage.cpp:511
+#: clientgui/AccountInfoPage.cpp:485
 msgid "&Email address or LDAP ID:"
-msgstr "電子信箱或LDAP ID (&E):"
+msgstr "電子信箱或LDAP ID (&E):"
 
-#: clientgui/AccountInfoPage.cpp:515
+#: clientgui/AccountInfoPage.cpp:489
 msgid "&Email address:"
 msgstr "電子郵件地址 (&E):"
 
-#: clientgui/AccountInfoPage.cpp:523
+#: clientgui/AccountInfoPage.cpp:497
 #, c-format
 msgid "minimum length %d"
 msgstr "最小字元長度 %d"
 
-#: clientgui/AccountInfoPage.cpp:530
+#: clientgui/AccountInfoPage.cpp:504
 msgid "Forgot your password?"
-msgstr "遺忘您的密嗎?"
+msgstr "忘記密碼?"
 
-#: clientgui/AccountInfoPage.cpp:537
+#: 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 ""
-"如果您尚未註冊帳號管理服務,請先註冊之後再執行。\n"
-"點擊下面的網址前往註冊帳號或是尋回遺忘的密碼。"
+msgstr "如果您尚未註冊帳號管理服務,請先註冊之後再執行。\n點擊下面的網址前往註冊帳號或是尋回遺忘的密碼。"
 
-#: clientgui/AccountInfoPage.cpp:540
+#: clientgui/AccountInfoPage.cpp:514
 msgid "Account manager web site"
 msgstr "帳號管理服務網站"
 
-#: clientgui/AccountInfoPage.cpp:582
+#: clientgui/AccountInfoPage.cpp:556
 msgid "Add project"
 msgstr "新增專案"
 
-#: clientgui/AccountInfoPage.cpp:584
+#: clientgui/AccountInfoPage.cpp:558
 msgid "Update account manager"
 msgstr "更新帳號管理服務"
 
-#: clientgui/AccountInfoPage.cpp:586
+#: clientgui/AccountInfoPage.cpp:560
 msgid "Use account manager"
 msgstr "帳號管理服務"
 
-#: clientgui/AccountInfoPage.cpp:593
+#: clientgui/AccountInfoPage.cpp:567
 msgid "Please enter a user name."
 msgstr "請輸入使用者名稱。"
 
-#: clientgui/AccountInfoPage.cpp:595
+#: clientgui/AccountInfoPage.cpp:569
 msgid "Please enter an email address."
 msgstr "請輸入電子郵件地址。"
 
-#: clientgui/AccountInfoPage.cpp:605
+#: clientgui/AccountInfoPage.cpp:579
 #, c-format
 msgid "Please enter a password of at least %d characters."
 msgstr "請輸入密碼,至少 %d 個字元。"
 
-#: clientgui/AccountInfoPage.cpp:615
-msgid "The password and confirmation password do not match. Please type them again."
+#: clientgui/AccountInfoPage.cpp:589
+msgid ""
+"The password and confirmation password do not match. Please type them again."
 msgstr "「密碼」與「確認密碼」不相符。請再輸入一次。"
 
-#: clientgui/AccountManagerInfoPage.cpp:272
+#: clientgui/AccountManagerInfoPage.cpp:270
 msgid "Choose an account manager"
-msgstr "選擇一個帳號管理服務"
+msgstr "選擇帳號管理服務"
 
-#: clientgui/AccountManagerInfoPage.cpp:275
+#: clientgui/AccountManagerInfoPage.cpp:273
 msgid ""
 "To choose an account manager, click its name or \n"
 "type its URL below."
-msgstr "要選擇一個帳號管理服務,請點選名稱或在下方輸入網址。"
+msgstr "要選擇帳號管理服務,請點選名稱或在下方輸入網址。"
 
-#: clientgui/AccountManagerInfoPage.cpp:279
+#: clientgui/AccountManagerInfoPage.cpp:277
 msgid "Account manager details:"
 msgstr "帳號管理服務細節:"
 
-#: clientgui/AccountManagerInfoPage.cpp:283
+#: clientgui/AccountManagerInfoPage.cpp:281
 msgid "Account manager &URL:"
 msgstr "帳號管理服務 &URL:"
 
-#: clientgui/AccountManagerInfoPage.cpp:287
+#: clientgui/AccountManagerInfoPage.cpp:285
 msgid "Open web page"
 msgstr "開啟網頁"
 
-#: clientgui/AccountManagerInfoPage.cpp:290
+#: clientgui/AccountManagerInfoPage.cpp:288
 msgid "Visit this account manager's web site"
 msgstr "造訪帳號管理服務網站"
 
@@ -202,323 +195,336 @@ msgstr "請稍候..."
 
 #: clientgui/AccountManagerProcessingPage.cpp:325
 msgid "An internal server error has occurred.\n"
-msgstr "內部伺服器發生錯誤。\n"
+msgstr "伺服器內部發生錯誤。\n"
 
-#: clientgui/AdvancedFrame.cpp:96
+#: clientgui/AdvancedFrame.cpp:99
 msgid "Connected"
 msgstr "已連線"
 
-#: clientgui/AdvancedFrame.cpp:104
+#: clientgui/AdvancedFrame.cpp:107
 msgid "Disconnected"
 msgstr "已斷線"
 
-#: clientgui/AdvancedFrame.cpp:318
+#: clientgui/AdvancedFrame.cpp:325
+#, c-format
+msgid "New %s window..."
+msgstr "開新 %s 視窗..."
+
+#: clientgui/AdvancedFrame.cpp:329
+#, c-format
+msgid "Open another %s window"
+msgstr "開啟另一個 %s 視窗"
+
+#: clientgui/AdvancedFrame.cpp:340
+msgid "Select computer..."
+msgstr "選擇電腦..."
+
+#: clientgui/AdvancedFrame.cpp:341
+msgid "Connect to a BOINC client on another computer"
+msgstr "連線到另一台電腦的 BOINC 客戶端"
+
+#: clientgui/AdvancedFrame.cpp:345
+msgid "Shut down connected client..."
+msgstr "關閉已連線的客戶端..."
+
+#: clientgui/AdvancedFrame.cpp:346
+msgid "Shut down the currently connected BOINC client"
+msgstr "關閉目前連線的 BOINC 客戶端"
+
+#: clientgui/AdvancedFrame.cpp:351
 #, c-format
 msgid "Close the %s window"
 msgstr "關閉 %s 視窗"
 
-#: clientgui/AdvancedFrame.cpp:321
-msgid "&Close Window"
+#: clientgui/AdvancedFrame.cpp:354
+msgid "&Close window"
 msgstr "關閉視窗 (&C)"
 
-#: clientgui/AdvancedFrame.cpp:332
-#: clientgui/AdvancedFrame.cpp:339
-#: clientgui/AdvancedFrame.cpp:346
+#: clientgui/AdvancedFrame.cpp:363 clientgui/AdvancedFrame.cpp:368
+#: clientgui/AdvancedFrame.cpp:373
 #, c-format
 msgid "Exit %s"
 msgstr "離開 %s"
 
-#: clientgui/AdvancedFrame.cpp:359
-msgid "Preferences..."
-msgstr "偏好設定…"
+#: clientgui/AdvancedFrame.cpp:386
+msgid "Preferences…"
+msgstr "偏好設定..."
 
-#: clientgui/AdvancedFrame.cpp:368
+#: clientgui/AdvancedFrame.cpp:395
 msgid "&Notices\tCtrl+Shift+N"
 msgstr "訊息 (&N)\tCtrl+Shift+N"
 
-#: clientgui/AdvancedFrame.cpp:369
-msgid "Display notices"
+#: clientgui/AdvancedFrame.cpp:396
+msgid "Show notices"
 msgstr "顯示訊息"
 
-#: clientgui/AdvancedFrame.cpp:374
+#: clientgui/AdvancedFrame.cpp:401
 msgid "&Projects\tCtrl+Shift+P"
 msgstr "專案 (&P)\tCtrl+Shift+P"
 
-#: clientgui/AdvancedFrame.cpp:375
-msgid "Display projects"
+#: clientgui/AdvancedFrame.cpp:402
+msgid "Show projects"
 msgstr "顯示專案"
 
-#: clientgui/AdvancedFrame.cpp:380
+#: clientgui/AdvancedFrame.cpp:407
 msgid "&Tasks\tCtrl+Shift+T"
-msgstr "工作 (&T)\tCtrl+Shift+T"
+msgstr "任務 (&T)\tCtrl+Shift+T"
 
-#: clientgui/AdvancedFrame.cpp:381
-msgid "Display tasks"
-msgstr "顯示工作"
+#: clientgui/AdvancedFrame.cpp:408
+msgid "Show tasks"
+msgstr "顯示任務"
 
-#: clientgui/AdvancedFrame.cpp:386
+#: clientgui/AdvancedFrame.cpp:413
 msgid "Trans&fers\tCtrl+Shift+X"
-msgstr "傳送 (&F)\tCtrl+Shift+X"
+msgstr "傳輸 (&F)\tCtrl+Shift+X"
 
-#: clientgui/AdvancedFrame.cpp:387
-msgid "Display transfers"
-msgstr "顯示傳送"
+#: clientgui/AdvancedFrame.cpp:414
+msgid "Show file transfers"
+msgstr "顯示檔案傳輸"
 
-#: clientgui/AdvancedFrame.cpp:392
+#: clientgui/AdvancedFrame.cpp:419
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "統計 (&S)\tCtrl+Shift+S"
 
-#: clientgui/AdvancedFrame.cpp:393
-msgid "Display statistics"
+#: clientgui/AdvancedFrame.cpp:420
+msgid "Show statistics"
 msgstr "顯示統計"
 
-#: clientgui/AdvancedFrame.cpp:398
-msgid "&Disk usage\tCtrl+Shift+D"
+#: clientgui/AdvancedFrame.cpp:425
+msgid "&Disk\tCtrl+Shift+D"
 msgstr "硬碟空間 (&D)\tCtrl+Shift+D"
 
-#: clientgui/AdvancedFrame.cpp:399
-msgid "Display disk usage"
-msgstr "顯示硬碟使用空間"
+#: clientgui/AdvancedFrame.cpp:426
+msgid "Show disk usage"
+msgstr "顯示硬碟空間"
+
+#: clientgui/AdvancedFrame.cpp:432
+msgid "Event Log...\tCtrl+Shift+E"
+msgstr "事件記錄檔... Ctrl+Shift+E"
+
+#: clientgui/AdvancedFrame.cpp:433
+msgid "Show diagnostic messages"
+msgstr "顯示診斷訊息"
 
-#: clientgui/AdvancedFrame.cpp:406
+#: clientgui/AdvancedFrame.cpp:439
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr "精簡模式 (&V)\tCtrl+Shift+V"
 
-#: clientgui/AdvancedFrame.cpp:407
-msgid "Display the simple graphical interface."
-msgstr "顯示精簡 BOINC 圖形介面。"
+#: clientgui/AdvancedFrame.cpp:440
+msgid "Switch to the Simple View"
+msgstr "切換至精簡模式"
 
-#: clientgui/AdvancedFrame.cpp:421
+#: clientgui/AdvancedFrame.cpp:454
 msgid "&Add project or account manager..."
-msgstr "加入帳號管理服務(&A)..."
+msgstr "加入帳號管理服務 (&A)..."
 
-#: clientgui/AdvancedFrame.cpp:422
-msgid "Volunteer for any or all of 30+ projects in many areas of science"
-msgstr "志願加入到任何或所有高達30+個分佈在許多不同科學領域內的專案"
+#: clientgui/AdvancedFrame.cpp:455
+msgid "Add a new science project, or use an account manager"
+msgstr "新增科學專案或使用帳號管理服務"
 
-#: clientgui/AdvancedFrame.cpp:426
+#: clientgui/AdvancedFrame.cpp:459
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "與 %s 同步 (&S)"
 
-#: clientgui/AdvancedFrame.cpp:430
+#: clientgui/AdvancedFrame.cpp:463
 #, c-format
 msgid "Get current settings from %s"
 msgstr "從 %s 取得現在的設定"
 
-#: clientgui/AdvancedFrame.cpp:440
+#: clientgui/AdvancedFrame.cpp:473
 msgid "&Add project..."
-msgstr "新增專案 (&A)"
+msgstr "新增專案... (&A)"
 
-#: clientgui/AdvancedFrame.cpp:441
+#: clientgui/AdvancedFrame.cpp:474
 msgid "Add a project"
-msgstr "新增一個專案"
+msgstr "新增專案"
 
-#: clientgui/AdvancedFrame.cpp:444
+#: clientgui/AdvancedFrame.cpp:477
 #, c-format
 msgid "S&top using %s..."
-msgstr "停止使用 %s(&S)..."
+msgstr "停止使用 %s (&S)..."
 
-#: clientgui/AdvancedFrame.cpp:450
+#: clientgui/AdvancedFrame.cpp:483
 msgid "Remove this computer from account manager control."
-msgstr "從帳號管理服務中移除用戶端。"
+msgstr "從用戶端中移除帳號管理服務。"
 
-#: clientgui/AdvancedFrame.cpp:455
-msgid "&Options..."
-msgstr "選項 (&O)"
+#: clientgui/AdvancedFrame.cpp:489
+msgid "Run CPU &benchmarks"
+msgstr "執行 CPU 效能測試 (&B)"
 
-#: clientgui/AdvancedFrame.cpp:456
-msgid "Configure display options and proxy settings"
-msgstr "配置顯示選項和 Proxy 設定"
+#: clientgui/AdvancedFrame.cpp:490
+msgid "Run tests that measure CPU speed"
+msgstr "測試 CPU 速度"
 
-#: clientgui/AdvancedFrame.cpp:460
-msgid "Computing &preferences..."
-msgstr "運算偏好設定(&P)..."
+#: clientgui/AdvancedFrame.cpp:494
+msgid "Retry pending transfers"
+msgstr "重試等待中的傳輸"
 
-#: clientgui/AdvancedFrame.cpp:461
-msgid "Configure computing preferences"
-msgstr "配置運算偏好"
+#: clientgui/AdvancedFrame.cpp:495
+msgid "Retry deferred file transfers and task requests"
+msgstr "重試延遲檔案傳輸及任務請求"
 
-#: clientgui/AdvancedFrame.cpp:469
+#: clientgui/AdvancedFrame.cpp:503
 msgid "&Run always"
 msgstr "持續執行 (&R)"
 
-#: clientgui/AdvancedFrame.cpp:470
+#: clientgui/AdvancedFrame.cpp:504
 msgid "Allow work regardless of preferences"
-msgstr "不管偏好設定運行工作"
+msgstr "不管偏好設定執行任務"
 
-#: clientgui/AdvancedFrame.cpp:474
+#: clientgui/AdvancedFrame.cpp:508
 msgid "Run based on &preferences"
 msgstr "依照偏好設定執行(&P)"
 
-#: clientgui/AdvancedFrame.cpp:475
+#: clientgui/AdvancedFrame.cpp:509
 msgid "Allow work according to preferences"
-msgstr "依照您的偏好設定執行工作"
+msgstr "依照您的偏好設定執行任務"
 
-#: clientgui/AdvancedFrame.cpp:479
+#: clientgui/AdvancedFrame.cpp:513
 msgid "&Suspend"
 msgstr "暫停 (&S)"
 
-#: clientgui/AdvancedFrame.cpp:480
+#: clientgui/AdvancedFrame.cpp:514
 msgid "Stop work regardless of preferences"
-msgstr "不管偏好設定停止工作"
+msgstr "不管偏好設定停止任務"
 
-#: clientgui/AdvancedFrame.cpp:505
+#: clientgui/AdvancedFrame.cpp:539
 msgid "Use GPU always"
 msgstr "持續執行 GPU"
 
-#: clientgui/AdvancedFrame.cpp:506
+#: clientgui/AdvancedFrame.cpp:540
 msgid "Allow GPU work regardless of preferences"
-msgstr "不管偏好設定運行工作"
+msgstr "不管偏好設定執行任務"
 
-#: clientgui/AdvancedFrame.cpp:510
+#: clientgui/AdvancedFrame.cpp:544
 msgid "Use GPU based on preferences"
-msgstr "依照偏好設定使用GPU(&P)"
+msgstr "依照偏好設定使用 GPU (&P)"
 
-#: clientgui/AdvancedFrame.cpp:511
+#: clientgui/AdvancedFrame.cpp:545
 msgid "Allow GPU work according to preferences"
-msgstr "依照您的偏好設定運行GPU工作"
+msgstr "依照您的偏好設定執行 GPU 任務"
 
-#: clientgui/AdvancedFrame.cpp:515
+#: clientgui/AdvancedFrame.cpp:549
 msgid "Suspend GPU"
 msgstr "暫停 GPU"
 
-#: clientgui/AdvancedFrame.cpp:516
+#: clientgui/AdvancedFrame.cpp:550
 msgid "Stop GPU work regardless of preferences"
-msgstr "不管偏好設定停止GPU工作"
+msgstr "不管偏好設定停止 GPU 任務"
 
-#: clientgui/AdvancedFrame.cpp:540
-msgid "Network activity always available"
-msgstr "持續進行網路活動"
+#: clientgui/AdvancedFrame.cpp:574
+msgid "Network activity always allowed"
+msgstr "保持網路活動"
 
-#: clientgui/AdvancedFrame.cpp:541
+#: clientgui/AdvancedFrame.cpp:575
 msgid "Allow network activity regardless of preferences"
 msgstr "不管偏好設定進行網路活動"
 
-#: clientgui/AdvancedFrame.cpp:545
+#: clientgui/AdvancedFrame.cpp:579
 msgid "Network activity based on preferences"
 msgstr "依照偏好設定連線網路(&P)"
 
-#: clientgui/AdvancedFrame.cpp:546
+#: clientgui/AdvancedFrame.cpp:580
 msgid "Allow network activity according to preferences"
-msgstr "依照您的偏好設定進行網路活動"
+msgstr "依照您的偏好設定保持網路活動"
 
-#: clientgui/AdvancedFrame.cpp:550
+#: clientgui/AdvancedFrame.cpp:584
 msgid "Network activity suspended"
 msgstr "暫停網路活動"
 
-#: clientgui/AdvancedFrame.cpp:551
+#: clientgui/AdvancedFrame.cpp:585
 msgid "Stop BOINC network activity"
 msgstr "停止 BONIC 的網路活動"
 
-#: clientgui/AdvancedFrame.cpp:561
-#, c-format
-msgid "Connect to another computer running %s"
-msgstr "連線到另一台運行 %s 的電腦"
+#: clientgui/AdvancedFrame.cpp:594
+msgid "Computing &preferences..."
+msgstr "運算偏好設定 (&P)..."
 
-#: clientgui/AdvancedFrame.cpp:566
-msgid "Select computer..."
-msgstr "選擇電腦..."
+#: clientgui/AdvancedFrame.cpp:595
+msgid "Configure computing preferences"
+msgstr "配置運算偏好設定"
 
-#: clientgui/AdvancedFrame.cpp:571
-msgid "Shut down connected client..."
-msgstr "關閉已連線的客戶端..."
+#: clientgui/AdvancedFrame.cpp:600
+msgid "Exclusive applications..."
+msgstr "衝突程式..."
 
-#: clientgui/AdvancedFrame.cpp:572
-msgid "Shut down the currently connected client"
-msgstr "關閉目前連線的客戶端"
+#: clientgui/AdvancedFrame.cpp:601
+msgid "Configure exclusive applications"
+msgstr "配置衝突程式"
 
-#: clientgui/AdvancedFrame.cpp:576
-msgid "Run CPU &benchmarks"
-msgstr "執行 CPU 效能測試 (&B)"
+#: clientgui/AdvancedFrame.cpp:606
+msgid "Select columns..."
+msgstr "選擇欄位..."
 
-#: clientgui/AdvancedFrame.cpp:577
-msgid "Runs BOINC CPU benchmarks"
-msgstr "執行 BONIC 的 CPU 效能測試"
+#: clientgui/AdvancedFrame.cpp:607
+msgid "Select which columns to display"
+msgstr "選擇欲顯示的欄位"
 
-#: clientgui/AdvancedFrame.cpp:581
-msgid "Do network communication"
-msgstr "開始網路通訊"
+#: clientgui/AdvancedFrame.cpp:611
+msgid "Event Log options...\tCtrl+Shift+F"
+msgstr "事件記錄檔選項...\tCtrl+Shift+F"
 
-#: clientgui/AdvancedFrame.cpp:582
-msgid "Do all pending network communication"
-msgstr "開始所有待處理的網路通訊。"
+#: clientgui/AdvancedFrame.cpp:612
+msgid "Enable or disable various diagnostic messages"
+msgstr "啟用或停用各種診斷訊息"
+
+#: clientgui/AdvancedFrame.cpp:616
+msgid "&Other options..."
+msgstr "其他選項... (&O)"
 
-# 94%
-#: clientgui/AdvancedFrame.cpp:586
+#: clientgui/AdvancedFrame.cpp:617
+msgid "Configure display options and network settings"
+msgstr "配置顯示選項和網路設置"
+
+#: clientgui/AdvancedFrame.cpp:622
 msgid "Read config files"
 msgstr "讀取設定資料檔"
 
-#: clientgui/AdvancedFrame.cpp:587
-msgid "Read configuration info from cc_config.xml and any app_config.xml files"
+#: clientgui/AdvancedFrame.cpp:623
+msgid ""
+"Read configuration info from cc_config.xml and any app_config.xml files"
 msgstr "從cc_config.xml和任何app_config.xml檔案讀取配置資訊"
 
-#: clientgui/AdvancedFrame.cpp:591
+#: clientgui/AdvancedFrame.cpp:627
 msgid "Read local prefs file"
 msgstr "讀取本機偏好設定"
 
-#: clientgui/AdvancedFrame.cpp:592
+#: clientgui/AdvancedFrame.cpp:628
 msgid "Read preferences from global_prefs_override.xml."
 msgstr "從 global_prefs_override.xml 讀取偏好設定。"
 
-#: clientgui/AdvancedFrame.cpp:597
-#, c-format
-msgid "Launch another instance of %s..."
-msgstr "執行另外一個 %s"
-
-#: clientgui/AdvancedFrame.cpp:601
-#, c-format
-msgid "Launch another %s"
-msgstr "開啟新的 %s"
-
-#: clientgui/AdvancedFrame.cpp:611
-msgid "Event Log...\tCtrl+Shift+E"
-msgstr "事件記錄檔...\tCtrl+Shift+E"
-
-#: clientgui/AdvancedFrame.cpp:612
-msgid "Display diagnostic messages."
-msgstr "顯示診斷訊息。"
-
-#: clientgui/AdvancedFrame.cpp:616
-msgid "Event Log Diagnostic Flags...\tCtrl+Shift+F"
-msgstr "事件記錄檔診斷標記…\tCtrl+Shift+F"
-
-#: clientgui/AdvancedFrame.cpp:617
-msgid "Enable or disable various diagnostic messages"
-msgstr "啟用或停用各種診斷資訊"
-
-#: clientgui/AdvancedFrame.cpp:626
+#: clientgui/AdvancedFrame.cpp:636
 #, c-format
 msgid "%s &help"
 msgstr "%s 說明 (&H)"
 
-#: clientgui/AdvancedFrame.cpp:632
+#: clientgui/AdvancedFrame.cpp:640
 #, c-format
 msgid "Show information about %s"
 msgstr "顯示關於 %s 的資訊"
 
-#: clientgui/AdvancedFrame.cpp:644
+#: clientgui/AdvancedFrame.cpp:650
 #, c-format
 msgid "&%s help"
 msgstr "說明 (&%s)"
 
-#: clientgui/AdvancedFrame.cpp:650
+#: clientgui/AdvancedFrame.cpp:654
 #, c-format
 msgid "Show information about the %s"
 msgstr "顯示關於 %s 的資訊"
 
-#: clientgui/AdvancedFrame.cpp:662
+#: clientgui/AdvancedFrame.cpp:665
 #, c-format
 msgid "%s &web site"
 msgstr "%s &網站"
 
-#: clientgui/AdvancedFrame.cpp:668
+#: clientgui/AdvancedFrame.cpp:669
 #, c-format
 msgid "Show information about BOINC and %s"
 msgstr "顯示關於 BONIC 及 %s 的資訊"
 
-#: clientgui/AdvancedFrame.cpp:680
-#: clientgui/BOINCTaskBar.cpp:544
+#: clientgui/AdvancedFrame.cpp:680 clientgui/BOINCTaskBar.cpp:544
 #, c-format
 msgid "&About %s..."
 msgstr "關於 %s (&A)"
@@ -536,27 +542,27 @@ msgid "&View"
 msgstr "檢視 (&V)"
 
 #: clientgui/AdvancedFrame.cpp:701
-msgid "&Tools"
-msgstr "工具 (&T)"
-
-#: clientgui/AdvancedFrame.cpp:705
 msgid "&Activity"
 msgstr "活動 (&A)"
 
+#: clientgui/AdvancedFrame.cpp:705
+msgid "&Options"
+msgstr "選項 (&O)"
+
 #: clientgui/AdvancedFrame.cpp:709
-msgid "A&dvanced"
-msgstr "進階 (&D)"
+msgid "&Tools"
+msgstr "工具 (&T)"
 
 #: clientgui/AdvancedFrame.cpp:713
 msgid "&Help"
 msgstr "說明 (&H)"
 
-#: clientgui/AdvancedFrame.cpp:1185
+#: clientgui/AdvancedFrame.cpp:1188
 #, c-format
 msgid "%s - Stop using %s"
 msgstr "%s - 停止使用 %s"
 
-#: clientgui/AdvancedFrame.cpp:1190
+#: clientgui/AdvancedFrame.cpp:1193
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -564,47 +570,41 @@ msgid ""
 "but you'll have to manage projects manually.\n"
 "\n"
 "Do you want to stop using %s?"
-msgstr ""
-"如果您停止使用 %s,你會保留所有目前的計畫,\n"
-"但您必須手動管理計畫。\n"
-"\n"
-"您確定要停止使用 %s 嗎?"
+msgstr "如果您停止使用 %s,你會保留所有目前的計畫,\n但您必須手動管理計畫。\n\n您確定要停止使用 %s 嗎?"
 
-#: clientgui/AdvancedFrame.cpp:1397
+#: clientgui/AdvancedFrame.cpp:1420
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s - 關閉目前客戶端..."
 
-#: clientgui/AdvancedFrame.cpp:1406
+#: clientgui/AdvancedFrame.cpp:1429
 #, c-format
 msgid ""
 "%s will shut down the current client\n"
 "and prompt you for another host to connect to."
-msgstr ""
-"%s 將會關閉目前的客戶端\n"
-"然後提示您輸入想要連結的客戶端。"
+msgstr "%s 將會關閉目前的客戶端\n然後提示您輸入想要連結的客戶端。"
 
-#: clientgui/AdvancedFrame.cpp:1806
+#: clientgui/AdvancedFrame.cpp:1832
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: clientgui/AdvancedFrame.cpp:1815
+#: clientgui/AdvancedFrame.cpp:1841
 #, c-format
 msgid "%s has successfully added %s"
 msgstr "%s 已成功加入 %s 計畫。"
 
-#: clientgui/AdvancedFrame.cpp:1953
+#: clientgui/AdvancedFrame.cpp:1977
 #, c-format
 msgid "%s - (%s)"
 msgstr "%s - (%s)"
 
-#: clientgui/AdvancedFrame.cpp:1957
+#: clientgui/AdvancedFrame.cpp:1981
 #, c-format
 msgid "Connecting to %s"
 msgstr "正在連線到 %s"
 
-#: clientgui/AdvancedFrame.cpp:1960
+#: clientgui/AdvancedFrame.cpp:1984
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "已連線到 %s (%s)"
@@ -619,11 +619,7 @@ msgid ""
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"此使用者名稱已被另一個帳號所使用,\n"
-"而且您輸入的密碼和該帳號並不相同。\n"
-"\n"
-"請拜訪專案網站後,依照專案網站的指示操作。"
+msgstr "此使用者名稱已被另一個帳號所使用,\n而且您輸入的密碼和該帳號並不相同。\n\n請拜訪專案網站後,依照專案網站的指示操作。"
 
 #: clientgui/AlreadyExistsPage.cpp:191
 msgid "Email address already in use"
@@ -635,11 +631,7 @@ msgid ""
 "different password than the one you entered.\n"
 "\n"
 "Please visit the project's web site and follow the instructions there."
-msgstr ""
-"此電子郵件地址已被另一個帳號所使用,\n"
-"而且您輸入的密碼和該帳號並不相同。\n"
-"\n"
-"請拜訪專案網站後,依照專案網站的指示操作。"
+msgstr "此電子郵件地址已被另一個帳號所使用,\n而且您輸入的密碼和該帳號並不相同。\n\n請拜訪專案網站後,依照專案網站的指示操作。"
 
 #: clientgui/AsyncRPC.cpp:1031
 msgid "Communicating with BOINC client.  Please wait ..."
@@ -664,89 +656,76 @@ msgstr "%s - 網路通訊"
 msgid "Cancel"
 msgstr "取消"
 
-#: clientgui/BOINCBaseFrame.cpp:504
+#: clientgui/BOINCBaseFrame.cpp:512
 #, c-format
 msgid "%s - Connection Error"
 msgstr "%s - 連線錯誤"
 
-#: clientgui/BOINCBaseFrame.cpp:513
+#: 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 ""
-"您尚未被授權管理本客戶端。\n"
-"請聯繫系統管理員將您添加到名稱為 'boinc_users' 的用戶群組。"
+msgstr "您尚未被授權管理本客戶端。\n請聯繫系統管理員將您添加到名稱為 'boinc_users' 的用戶群組。"
 
-#: clientgui/BOINCBaseFrame.cpp:522
+#: 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 ""
-"連線到執行中的客戶端認證失敗。\n"
-"請確定您於相同的客戶端目錄啟動了本程式。"
+msgstr "連線到執行中的客戶端認證失敗。\n請確定您於相同的客戶端目錄啟動了本程式。"
 
-#: clientgui/BOINCBaseFrame.cpp:524
+#: clientgui/BOINCBaseFrame.cpp:532
 msgid "Authorization failed connecting to running client."
 msgstr "連接至已運行的客戶端時發生驗證錯誤。"
 
-#: clientgui/BOINCBaseFrame.cpp:532
+#: clientgui/BOINCBaseFrame.cpp:540
 msgid "The password you have provided is incorrect, please try again."
 msgstr "您提供的密碼不正確,請再試一遍。"
 
-#: clientgui/BOINCBaseFrame.cpp:576
+#: clientgui/BOINCBaseFrame.cpp:584
 #, c-format
 msgid "%s - Connection Failed"
 msgstr "%s - 連線失敗"
 
-#: clientgui/BOINCBaseFrame.cpp:585
+#: 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 無法連線到 %s 客戶端。\n"
-"您要再試一次嗎?"
+msgstr "%s 無法連線到 %s 客戶端。\n您要再試一次嗎?"
 
-#: clientgui/BOINCBaseFrame.cpp:621
+#: clientgui/BOINCBaseFrame.cpp:629
 #, c-format
 msgid "%s - Daemon Start Failed"
 msgstr "%s - 客戶端服務啟動失敗"
 
-#: clientgui/BOINCBaseFrame.cpp:631
+#: 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 無法啟動 %s 客戶端的程式。 \n"
-"請依次 控制面板->管理工具->服務,並從中啟動BOINC 服務。"
+msgstr "%s 無法啟動 %s 客戶端的程式。 \n請依次 控制面板->管理工具->服務,並從中啟動BOINC 服務。"
 
-#: clientgui/BOINCBaseFrame.cpp:637
+#: 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 無法啟動 %s 客戶端的應用程式。\n"
-"請手動啟動應用程式後再重試。"
+msgstr "%s 無法啟動 %s 客戶端。\n請手動啟動程式後再重試。"
 
-#: clientgui/BOINCBaseFrame.cpp:688
+#: clientgui/BOINCBaseFrame.cpp:696
 #, c-format
 msgid "%s - Connection Status"
 msgstr "%s - 連線狀態"
 
-#: clientgui/BOINCBaseFrame.cpp:699
+#: clientgui/BOINCBaseFrame.cpp:707
 #, 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"
 "To connect up to your local computer please use 'localhost' as the host name."
-msgstr ""
-"%s 目前未連線到 %s 用戶端。\n"
-"請選擇「檔案」>「選擇電腦...」來連到 %s 用戶端。\n"
-"要連線到本機電腦,請於主機名稱輸入「localhost」。"
+msgstr "%s 目前未連線到 %s 用戶端。\n請選擇「檔案」>「選擇電腦...」來連到 %s 用戶端。\n要連線到本機電腦,請於主機名稱輸入「localhost」。"
 
-#: clientgui/BOINCBaseView.cpp:752
+#: clientgui/BOINCBaseView.cpp:790
 msgid "Project web pages"
 msgstr "專案網站"
 
@@ -760,9 +739,7 @@ msgstr "%s - 關閉確認視窗"
 msgid ""
 "The %s client has exited unexpectedly 3 times within the last %d minutes.\n"
 "Would you like to restart it again?"
-msgstr ""
-"%s 客戶端在 %d 分鐘內已異常結束3次。\n"
-"您要重試一次嗎?"
+msgstr "%s 客戶端在 %d 分鐘內已異常結束3次。\n您要重試一次嗎?"
 
 #: clientgui/BOINCDialupManager.cpp:61
 #, c-format
@@ -796,9 +773,7 @@ msgstr "%s 連線到網路失敗。"
 msgid ""
 "%s has detected it is now connected to the Internet.\n"
 "Updating all projects and retrying all transfers."
-msgstr ""
-"%s 偵測到現在處於連線狀態。\n"
-"正在更新所有專案並重試所有檔案傳送。"
+msgstr "%s 偵測到現在處於連線狀態。\n正在更新所有專案並重試所有檔案傳輸。"
 
 #: clientgui/BOINCDialupManager.cpp:417
 #, c-format
@@ -810,7 +785,7 @@ msgstr "%s 已成功從網路斷線。"
 msgid "%s failed to disconnected from the Internet."
 msgstr "%s 從網路斷線失敗。"
 
-#: clientgui/BOINCGUIApp.cpp:595
+#: clientgui/BOINCGUIApp.cpp:597
 #, c-format
 msgid ""
 "You currently are not authorized to manage the client.\n"
@@ -821,97 +796,90 @@ msgid ""
 " or\n"
 "  - contact your administrator to add you to the 'boinc_master'\n"
 "     user group."
-msgstr ""
-"您目前沒有權限管理本用戶端。\n"
-"\n"
-"要在目前用戶下運行 %s,請:\n"
-"- 重新安裝 %s,在被問到關於非系統管理員用戶的問題時,回答\"是\"\n"
-"- 聯繫系統管理員將您加入到“boinc_master”用戶組。"
+msgstr "您目前沒有權限管理本用戶端。\n\n要在目前用戶下執行 %s,請:\n- 重新安裝 %s,在被問到關於非系統管理員用戶的問題時,回答\"是\"\n- 聯繫系統管理員將您加入到“boinc_master”用戶群組。"
 
-#: clientgui/BOINCGUIApp.cpp:601
+#: clientgui/BOINCGUIApp.cpp:603
 #, c-format
 msgid ""
 "%s ownership or permissions are not set properly; please reinstall %s.\n"
 "(Error code %d"
-msgstr ""
+msgstr "%s的權限設定不當,請重新安裝%s。\n(錯誤代碼 %d"
 
-#: clientgui/BOINCGUIApp.cpp:607
+#: clientgui/BOINCGUIApp.cpp:609
 msgid " at "
 msgstr "最多只使用"
 
-#: clientgui/BOINCGUIApp.cpp:610
+#: clientgui/BOINCGUIApp.cpp:612
 msgid ")"
 msgstr ")"
 
-#: clientgui/BOINCGUIApp.cpp:640
+#: 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 ""
-"BOINC 需要在重新開機後才能運作。\n"
-"請先將電腦重新開機再試。"
+msgstr "BOINC 需要在重新開機後才能運作。\n請先將電腦重新開機再試。"
 
-#: clientgui/BOINCGUIApp.cpp:641
+#: clientgui/BOINCGUIApp.cpp:643
 msgid "BOINC Manager"
 msgstr "BOINC Manager"
 
-#: clientgui/BOINCGUIApp.cpp:902
+#: clientgui/BOINCGUIApp.cpp:904
 msgid "BOINC Manager was started by the operating system automatically"
 msgstr "BOINC Manager 已經由作業系統啟動"
 
-#: clientgui/BOINCGUIApp.cpp:904
+#: clientgui/BOINCGUIApp.cpp:906
 msgid "Startup BOINC so only the system tray icon is visible"
 msgstr "只以系統匣圖示啟動 BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:906
+#: clientgui/BOINCGUIApp.cpp:908
 msgid "Directory containing the BOINC Client executable"
 msgstr "包含 BOINC 客戶端執行的目錄"
 
-#: clientgui/BOINCGUIApp.cpp:907
+#: clientgui/BOINCGUIApp.cpp:909
 msgid "BOINC data directory"
 msgstr "BOINC 數據目錄"
 
-#: clientgui/BOINCGUIApp.cpp:909
+#: clientgui/BOINCGUIApp.cpp:911
 msgid "Host name or IP address"
 msgstr "電腦名稱或 IP 位址"
 
-#: clientgui/BOINCGUIApp.cpp:910
+#: clientgui/BOINCGUIApp.cpp:912
 msgid "GUI RPC port number"
 msgstr "圖形介面 RPC port"
 
-#: clientgui/BOINCGUIApp.cpp:911
+#: clientgui/BOINCGUIApp.cpp:913
 msgid "Password"
 msgstr "密碼"
 
-#: clientgui/BOINCGUIApp.cpp:912
+#: clientgui/BOINCGUIApp.cpp:914
 msgid "Startup BOINC with these optional arguments"
 msgstr "以這些選用參數啟動 BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:913
+#: clientgui/BOINCGUIApp.cpp:915
 msgid "disable BOINC security users and permissions"
 msgstr "停用 BOINC 安全性使用者和權限"
 
-#: clientgui/BOINCGUIApp.cpp:914
+#: clientgui/BOINCGUIApp.cpp:916
 msgid "set skin debugging mode to enable skin manager error messages"
 msgstr "設置介面調試模式已啟用介面管理器的錯誤消息記錄"
 
-#: clientgui/BOINCGUIApp.cpp:915
+#: clientgui/BOINCGUIApp.cpp:917
 msgid "multiple instances of BOINC Manager allowed"
 msgstr "允許執行多個 BOINC Manager"
 
-#: clientgui/BOINCGUIApp.cpp:917
+#: clientgui/BOINCGUIApp.cpp:919
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr "未使用:用於臨時修復 XCode 4.2 的錯誤"
 
-#: clientgui/BOINCGUIApp.cpp:1164
+#: clientgui/BOINCGUIApp.cpp:1166
 msgid "(Automatic Detection)"
 msgstr "(自動偵測)"
 
-#: clientgui/BOINCGUIApp.cpp:1165
+#: clientgui/BOINCGUIApp.cpp:1167
 msgid "(Unknown)"
 msgstr "(未知的語言)"
 
-#: clientgui/BOINCGUIApp.cpp:1166
+#: clientgui/BOINCGUIApp.cpp:1168
 msgid "(User Defined)"
 msgstr "(使用者定義)"
 
@@ -925,14 +893,12 @@ msgstr "開啟 %s 網站..."
 msgid "Open %s..."
 msgstr "開啟 %s..."
 
-#: clientgui/BOINCTaskBar.cpp:536
-#: clientgui/BOINCTaskBar.cpp:633
+#: clientgui/BOINCTaskBar.cpp:536 clientgui/BOINCTaskBar.cpp:633
 #: clientgui/BOINCTaskBar.cpp:641
 msgid "Snooze"
 msgstr "暫停執行"
 
-#: clientgui/BOINCTaskBar.cpp:538
-#: clientgui/BOINCTaskBar.cpp:660
+#: clientgui/BOINCTaskBar.cpp:538 clientgui/BOINCTaskBar.cpp:660
 #: clientgui/BOINCTaskBar.cpp:668
 msgid "Snooze GPU"
 msgstr "暫停執行 GPU"
@@ -1011,21 +977,16 @@ msgid ""
 "Please try again later.\n"
 "\n"
 "Click Finish to close."
-msgstr ""
-"請稍後再嘗試。\n"
-"\n"
-"點擊“完成”關閉。"
+msgstr "請稍後再嘗試。\n\n點擊“完成”關閉。"
 
-#: 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 "按「完成」關閉此視窗。"
 
 #: clientgui/CompletionErrorPage.cpp:234
 msgid "Messages from server:"
-msgstr "伺服器傳來的訊息:"
+msgstr "來自伺服器的訊息:"
 
 #: clientgui/CompletionPage.cpp:207
 msgid "Project added"
@@ -1033,15 +994,13 @@ msgstr "專案已新增"
 
 #: clientgui/CompletionPage.cpp:213
 msgid "This project has been successfully added."
-msgstr "已成功的加入本專案。"
+msgstr "已成功加入本專案。"
 
 #: 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 ""
-"當您按下「完成」後,程式將會啟動瀏覽器並前往設定\n"
-"帳號名稱與偏好設定的網頁。"
+msgstr "當您按下「完成」後,程式將會啟動瀏覽器並前往設定\n帳號名稱與偏好設定的網頁。"
 
 #: clientgui/CompletionPage.cpp:232
 #, c-format
@@ -1087,590 +1046,685 @@ msgstr "wxWidgets 版本:"
 msgid "Copyright:"
 msgstr "版權:"
 
-# 98%
 #: clientgui/DlgAbout.cpp:192
 msgid ""
-"(C) 2003-2014 University of California, Berkeley.\n"
+"(C) 2003-2015 University of California, Berkeley.\n"
 "All Rights Reserved."
-msgstr ""
-"(C) 2003-2014 美國加州大學柏克萊分校\n"
-"保留所有權利。"
+msgstr "(C) 2003-2015 University of California, Berkeley.\nAll Rights Reserved."
 
 #: clientgui/DlgAbout.cpp:196
-msgid "Berkeley Open Infrastructure for Network Computing"
-msgstr "柏克萊開放式網路運算平台"
+msgid "BOINC is distributed under the GNU Lesser General Public License v3.0."
+msgstr "BOINC 是根據 GNU 較寬鬆公共授權條款 3.0 版本發佈。"
+
+#: clientgui/DlgAbout.cpp:203
+msgid "Visit "
+msgstr "造訪"
 
-#: clientgui/DlgAbout.cpp:208
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:399
+#: clientgui/DlgAbout.cpp:211
+msgid "for more information."
+msgstr "了解更多資訊。"
+
+#: clientgui/DlgAbout.cpp:219 clientgui/DlgExitMessage.cpp:173
+#: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:399
 #: clientgui/DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "確定 (&O)"
 
-#: clientgui/DlgAdvPreferences.cpp:602
-msgid "invalid number"
+#: clientgui/DlgAdvPreferences.cpp:669
+msgid "Invalid number"
 msgstr "無效數字"
 
-#: clientgui/DlgAdvPreferences.cpp:603
-msgid "invalid time, format is HH:MM"
-msgstr "無效的時間,格式為 HH:MM"
+#: clientgui/DlgAdvPreferences.cpp:670
+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
+msgid "Number must be between 0 and 10"
+msgstr "數字必須在1到10之間"
 
-#: clientgui/DlgAdvPreferences.cpp:604
-msgid "invalid time interval, format is HH:MM-HH:MM"
-msgstr "無效的時間間隔,格式為 HH:MM-HH:MM"
+#: clientgui/DlgAdvPreferences.cpp:672
+msgid "Number must be between 0 and 100"
+msgstr "數字必須在1到100之間"
 
-#: clientgui/DlgAdvPreferences.cpp:817
+#: clientgui/DlgAdvPreferences.cpp:905
 msgid "invalid input value detected"
 msgstr "偵測到無效的輸入值"
 
-#: clientgui/DlgAdvPreferences.cpp:819
+#: clientgui/DlgAdvPreferences.cpp:907
 msgid "Validation Error"
 msgstr "驗證錯誤"
 
-#: clientgui/DlgAdvPreferences.cpp:969
-#: clientgui/DlgAdvPreferences.cpp:975
-#: clientgui/DlgAdvPreferences.cpp:981
-msgid "Applications to add"
-msgstr "需要新增的應用程式"
-
-#: clientgui/DlgAdvPreferences.cpp:998
-#, c-format
-msgid "'%s' is not an executable application."
-msgstr "'%s' 為一個不可以執行的應用程式"
+#: clientgui/DlgAdvPreferences.cpp:1119
+msgid "Discard local preferences and use web-based preferences?"
+msgstr "放棄本機偏好設定改用網站偏好設定?"
 
-#: clientgui/DlgAdvPreferences.cpp:999
-#: clientgui/DlgAdvPreferences.cpp:1046
-#: clientgui/DlgAdvPreferences.cpp:1070
-msgid "Add Exclusive App"
-msgstr "加入排斥的應用程式"
-
-#: clientgui/DlgAdvPreferences.cpp:1011
-msgid "Name of application to add?"
-msgstr "需要新增的應用程式的名稱?"
-
-#: clientgui/DlgAdvPreferences.cpp:1011
-msgid "Add exclusive app"
-msgstr "加入排斥的應用程式"
-
-#: clientgui/DlgAdvPreferences.cpp:1045
-#, c-format
-msgid "Application names must end with '%s'"
-msgstr "應用程式名稱的結果必須為 '%s'"
-
-#: clientgui/DlgAdvPreferences.cpp:1069
-#, c-format
-msgid "'%s' is already in the list."
-msgstr "'%s' 已經在列表之中。"
-
-#: clientgui/DlgAdvPreferences.cpp:1161
-msgid ""
-"Do you really want to clear all local preferences?\n"
-"(This will not affect exclusive applications.)"
-msgstr ""
-"您確定要清除所有本地偏好設定嗎? \n"
-"(不會對互斥應用程式的設定有影響)"
-
-#: clientgui/DlgAdvPreferences.cpp:1162
+#: clientgui/DlgAdvPreferences.cpp:1120
 msgid "Confirmation"
 msgstr "確認"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:49
+#: clientgui/DlgAdvPreferencesBase.cpp:54
 #, c-format
 msgid "%s - Computing preferences"
 msgstr "%s - 運算偏好設定"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:66
+#: clientgui/DlgAdvPreferencesBase.cpp:77
 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 ""
-"此視窗選擇的偏好設定只對本機生效。\n"
-"按「確定」設定偏好設定。\n"
-"按「清除」回復為網頁上的偏好設定。"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:69
-msgid "Clear"
-msgstr "清除"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:70
-msgid "clear all local preferences and close the dialog"
-msgstr "清除所有本機偏好設定並關閉此視窗"
+"Using local preferences.\n"
+"Click \"Use web prefs\" to use web-based preferences from"
+msgstr "目前正使用本機偏好設定。\n點擊 \"使用網站設定\" 可改用來自下列網站的偏好設定"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:85
-msgid "processor usage"
-msgstr "處理器使用量"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:88
-msgid "network usage"
-msgstr "網路使用量"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:91
-msgid "disk and memory usage"
-msgstr "硬碟及記憶體使用量"
+msgid "Using web-based preferences from"
+msgstr "目前正使用下列網站的偏好設定"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:94
-msgid "exclusive applications"
-msgstr "排斥的應用程式"
+#: clientgui/DlgAdvPreferencesBase.cpp:102
+msgid "Set values and click OK to use local preferences instead."
+msgstr "設定數值後點擊確認可變更套用為本機設定。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:107
-#: clientgui/DlgDiagnosticLogFlags.cpp:104
-msgid "OK"
-msgstr "確定"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:108
-msgid "save all values and close the dialog"
-msgstr "儲存所有值並關閉視窗"
+#: clientgui/DlgAdvPreferencesBase.cpp:111
+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
-msgid "close the dialog without saving"
-msgstr "關閉視窗且不儲存"
+msgid "Clear"
+msgstr "清除"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:115
+msgid "Clear all local preferences and close the dialog."
+msgstr "清除所有本機偏好設定並關閉視窗。"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:118
-#: clientgui/Localization.cpp:35
-#: clientgui/Localization.cpp:121
-#: clientgui/Localization.cpp:139
-msgid "Help"
-msgstr "幫助"
+msgid "Use web prefs"
+msgstr "使用網站設定"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:119
-msgid "shows the preferences web page"
-msgstr "顯示網頁上的偏好設定"
+msgid "Restore web-based preferences and close the dialog."
+msgstr "還原至網站偏好設定並關閉視窗。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:141
-msgid "Computing allowed"
-msgstr "選擇允許運算的情況"
+#: clientgui/DlgAdvPreferencesBase.cpp:143
+#: clientgui/DlgAdvPreferencesBase.cpp:637
+msgid "Computing"
+msgstr "運算設定"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:146
-msgid "While computer is on batteries"
-msgstr "當電腦使用電池電源時"
+#: clientgui/DlgAdvPreferencesBase.cpp:785
+msgid "Network"
+msgstr "網路使用"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:149
-msgid "check this if you want this computer to do work while it runs on batteries"
-msgstr "若您想讓電腦使用電池電源時執行工作,請打勾"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:155
-msgid "While computer is in use"
-msgstr "當電腦正被使用時"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:158
-msgid "check this if you want this computer to do work even when you're using it"
-msgstr "若您想在使用電腦時執行工作,請打勾"
+msgid "Disk and memory"
+msgstr "硬碟和記憶體"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:164
-msgid "Use GPU while computer is in use"
-msgstr "電腦被使用時,啟用 GPU 運算"
+#: clientgui/DlgAdvPreferencesBase.cpp:152
+msgid "Daily schedules"
+msgstr "每日排程"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:167
-msgid "check this if you want your GPU to do work even when you're using the computer"
-msgstr "若您想在使用電腦時執行 GPU 運算,請打勾"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:179
-msgid "Only after computer has been idle for"
-msgstr "電腦閒置幾分鐘後才執行工作: "
-
-#: clientgui/DlgAdvPreferencesBase.cpp:188
-msgid "do work only after you haven't used the computer for this number of minutes"
-msgstr "設定您不使用電腦幾分鐘後才執行工作"
+#: clientgui/DlgAdvPreferencesBase.cpp:165
+#: clientgui/DlgDiagnosticLogFlags.cpp:119 clientgui/DlgExclusiveApps.cpp:146
+#: clientgui/DlgHiddenColumns.cpp:100
+msgid "OK"
+msgstr "確定"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:193
-#: clientgui/DlgAdvPreferencesBase.cpp:342
-msgid "minutes"
-msgstr "分鐘"
+#: clientgui/DlgAdvPreferencesBase.cpp:166
+msgid "Save all values and close the dialog."
+msgstr "儲存並關閉視窗。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:212
-msgid "While processor usage is less than"
-msgstr "當處理器使用率低於"
+#: clientgui/DlgAdvPreferencesBase.cpp:172
+msgid "Close the dialog without saving."
+msgstr "不儲存並關閉視窗"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:221
-msgid "suspend work if processor usage exceeds this level"
-msgstr "如果處理器使用率超過設定就暫停運算"
+#: clientgui/DlgAdvPreferencesBase.cpp:176 clientgui/DlgExclusiveApps.cpp:157
+msgid "Help"
+msgstr "幫助"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:226
-msgid "percent (0 means no restriction)"
-msgstr "% (0表示忽略此設置)"
+#: clientgui/DlgAdvPreferencesBase.cpp:177
+msgid "Shows the preferences web page."
+msgstr "開啟偏好設定網頁。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:240
-#: clientgui/DlgAdvPreferencesBase.cpp:506
-msgid "Every day between hours of"
-msgstr "每天運行時段:"
+#: clientgui/DlgAdvPreferencesBase.cpp:239
+#: clientgui/DlgAdvPreferencesBase.cpp:425
+msgid "Usage limits"
+msgstr "使用限制"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:244
-msgid "start work at this time"
-msgstr "開始執行工作的時間"
+#, 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核心系統中使用6核心運算"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:248
-#: clientgui/DlgAdvPreferencesBase.cpp:514
-msgid "and"
-msgstr "到"
+#: clientgui/DlgAdvPreferencesBase.cpp:246
+#: clientgui/DlgAdvPreferencesBase.cpp:258
+msgid "Use at most"
+msgstr "最多只使用"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:252
-msgid "stop work at this time"
-msgstr "停止執行工作的時間"
+#: clientgui/DlgAdvPreferencesBase.cpp:251
+#, no-c-format
+msgid "% of the CPUs"
+msgstr "% CPU核心"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:256
-#: clientgui/DlgAdvPreferencesBase.cpp:522
-msgid "(no restriction if equal)"
-msgstr "(兩欄都相等表示不設限)"
+#, 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."
+msgstr "週期內自動暫停/繼續運算以達到降低CPU溫度及能源消耗。例如: 75% 表示每運算 3 秒,休息 1 秒,並重複循環。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:261
-#: clientgui/DlgAdvPreferencesBase.cpp:527
-msgid "Day-of-week override:"
-msgstr "每日分別設定:"
+#: clientgui/DlgAdvPreferencesBase.cpp:263
+#, no-c-format
+msgid "% of CPU time"
+msgstr "% CPU時間"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:266
-#: clientgui/DlgAdvPreferencesBase.cpp:532
-msgid "check box to specify hours for this day of week"
-msgstr "打勾可設定該日要運行工作的時間"
+#: clientgui/DlgAdvPreferencesBase.cpp:270
+msgid "When to suspend"
+msgstr "何時暫停"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:272
-#: clientgui/DlgAdvPreferencesBase.cpp:538
-msgid "Monday"
-msgstr "星期一"
+#: clientgui/DlgAdvPreferencesBase.cpp:276
+msgid "Suspend when computer is on battery"
+msgstr "當電腦使用電池時暫停"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:279
-#: clientgui/DlgAdvPreferencesBase.cpp:545
-msgid "Tuesday"
-msgstr "星期二"
+msgid ""
+"Check this to suspend computing on portables when running on battery power."
+msgstr "當筆記型電腦使用電池時暫停運算。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:286
-#: clientgui/DlgAdvPreferencesBase.cpp:552
-msgid "Wednesday"
-msgstr "星期三"
+#: clientgui/DlgAdvPreferencesBase.cpp:285
+msgid "Suspend when computer is in use"
+msgstr "當電腦使用時暫停"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:293
-#: clientgui/DlgAdvPreferencesBase.cpp:559
-msgid "Thursday"
-msgstr "星期四"
+#: clientgui/DlgAdvPreferencesBase.cpp:288
+msgid ""
+"Check this to suspend computing and file transfers when you're using the "
+"computer."
+msgstr "當您正在使用電腦時暫停運算及檔案傳輸。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:300
-#: clientgui/DlgAdvPreferencesBase.cpp:566
-msgid "Friday"
-msgstr "星期五"
+#: clientgui/DlgAdvPreferencesBase.cpp:294
+msgid "Suspend GPU computing when computer is in use"
+msgstr "當電腦使用時暫停GPU運算"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:307
-#: clientgui/DlgAdvPreferencesBase.cpp:573
-msgid "Saturday"
-msgstr "星期六"
+#: clientgui/DlgAdvPreferencesBase.cpp:297
+msgid "Check this to suspend GPU computing when you're using the computer."
+msgstr "當您正在使電腦時暫停GPU運算。"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:302
+msgid "This determines when the computer is considered 'in use'."
+msgstr "用於判斷電腦是否於'使用中'。"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:306
+msgid "'In use' means mouse/keyboard input in last"
+msgstr "'使用中'代表滑鼠/鍵盤在"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:580
-msgid "Sunday"
-msgstr "星期日"
+#: clientgui/DlgAdvPreferencesBase.cpp:387
+msgid "minutes"
+msgstr "分鐘內仍有動作"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:328
-msgid "Other options"
-msgstr "其它選項"
+#: clientgui/DlgAdvPreferencesBase.cpp:321
+#, c-format
+msgid "Suspend when non-%s CPU usage is above"
+msgstr "暫停當非%s的CPU使用率高於"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:336
-msgid "Switch between applications every"
-msgstr "切換應用程式的時間間隔"
+#: clientgui/DlgAdvPreferencesBase.cpp:323
+msgid "Suspend computing when your computer is busy running other programs."
+msgstr "當電腦正忙於其他程式時暫停運算。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:345
-msgid "On multiprocessor systems, use at most"
-msgstr "多核心系統中最多只使用"
+#: clientgui/DlgAdvPreferencesBase.cpp:344
+#: clientgui/DlgAdvPreferencesBase.cpp:474
+msgid "Other"
+msgstr "其他"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:349
+msgid "Store at least enough tasks to keep the computer busy for this long."
+msgstr "預先下載足夠的任務以保持電腦持續運算。"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:352
-#, no-c-format, no-c-format
-msgid "% of the processors (0 means no restriction)"
-msgstr "% 處理器 (0表示忽略此設置)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:355
-#: clientgui/DlgAdvPreferencesBase.cpp:618
-#: clientgui/DlgAdvPreferencesBase.cpp:640
-#: clientgui/DlgAdvPreferencesBase.cpp:661
-#: clientgui/DlgAdvPreferencesBase.cpp:683
-#: clientgui/DlgAdvPreferencesBase.cpp:694
-msgid "Use at most"
-msgstr "最多只使用"
+msgid "Store at least"
+msgstr "儲存至少"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:362
-#, no-c-format
-msgid "% of CPU time (0 means no restriction)"
-msgstr "% CPU時間 (0表示忽略此設置)"
+#: clientgui/DlgAdvPreferencesBase.cpp:360
+#: clientgui/DlgAdvPreferencesBase.cpp:376
+msgid "days of work"
+msgstr "天的任務"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:386
-msgid "General options"
-msgstr "一般選項"
+#: clientgui/DlgAdvPreferencesBase.cpp:365
+msgid ""
+"Store additional tasks above the minimum level.  Determines how much work is"
+" requested when contacting a project."
+msgstr "儲存高於設定最小值的任務。用於判斷每次聯繫專案取得任務的多寡。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:395
-msgid "Maximum download rate"
-msgstr "最大下載速率"
+#: clientgui/DlgAdvPreferencesBase.cpp:368
+msgid "Store up to an additional"
+msgstr "儲存多於"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:381
+#, c-format
+msgid "If you run several projects, %s may switch between them this often."
+msgstr "如果您有參與許多專案,%s可能會切換執行。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:401
-#: clientgui/DlgAdvPreferencesBase.cpp:410
-msgid "KBytes/second (0 means no restriction)"
-msgstr "KB/s (0表示忽略此設置)"
+#: clientgui/DlgAdvPreferencesBase.cpp:383
+msgid "Switch between tasks every"
+msgstr "切換任務於每"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:404
-msgid "Maximum upload rate"
-msgstr "最大上傳速率"
+#: clientgui/DlgAdvPreferencesBase.cpp:391
+msgid ""
+"This controls how often tasks save their state to disk, so that they can be "
+"restarted later."
+msgstr "控制任務寫入狀態到硬碟的次數,使它們可在以後重新啟動。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:417
-msgid "Minimum work buffer"
-msgstr "最少的工作緩衝時間"
+#: clientgui/DlgAdvPreferencesBase.cpp:392
+msgid "Request tasks to checkpoint at most every"
+msgstr "要求任務最多每"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:425
-msgid "Try to maintain enough tasks to keep busy for this many days"
-msgstr "嘗試持有這些天數所需要的工作數量"
+#: clientgui/DlgAdvPreferencesBase.cpp:396
+msgid "seconds"
+msgstr "秒執行檢查點操作"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:431
-#: clientgui/DlgAdvPreferencesBase.cpp:449
-msgid "days (maximum value: 10)"
-msgstr "天 (最大值: 10)"
+msgid "Limit the download rate of file transfers."
+msgstr "限制檔案下載速率。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:437
-msgid "Max additional work buffer"
-msgstr "取得額外工作的緩衝時間"
+#: clientgui/DlgAdvPreferencesBase.cpp:432
+msgid "Limit download rate to"
+msgstr "限制下載速率"
 
+#: clientgui/DlgAdvPreferencesBase.cpp:436
 #: clientgui/DlgAdvPreferencesBase.cpp:445
-msgid "In addition, maintain enough tasks for up to this many days"
-msgstr "額外取得這些天數所需要的工作數量"
+msgid "KB/second"
+msgstr "Kb/s"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:440
+msgid "Limit the upload rate of file transfers."
+msgstr "限制檔案上傳速率。"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:441
+msgid "Limit upload rate to"
+msgstr "限制上傳速率"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:452
+#, c-format
+msgid "Example: %s should transfer at most 2000 MB of data every 30 days."
+msgstr "例如: %s能在每30天傳送2000MB的數據。"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:454
-msgid "Transfer at most"
-msgstr "資料傳輸上限"
+msgid "Limit usage to"
+msgstr "限制傳送數據"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:462
-msgid "MBytes every"
-msgstr "MB每"
+#: clientgui/DlgAdvPreferencesBase.cpp:458
+msgid "MB every"
+msgstr "MB 每"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:468
-msgid "days (0 means no restriction)"
-msgstr "天 (0表示忽略此設置)"
+#: clientgui/DlgAdvPreferencesBase.cpp:462
+msgid "days"
+msgstr "天"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:476
-msgid "Skip image file verification"
-msgstr "略過映像檔驗證"
+#: clientgui/DlgAdvPreferencesBase.cpp:479
+#, 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:478
-msgid "check this if your Internet provider modifies image files"
-msgstr "若您的 ISP 會修改映像檔就打勾"
+#: clientgui/DlgAdvPreferencesBase.cpp:481
+msgid "Skip data verification for image files"
+msgstr "略過圖檔驗證"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:484
-msgid "Connect options"
-msgstr "連線選項"
+#: clientgui/DlgAdvPreferencesBase.cpp:485
+msgid "Confirm before connecting to Internet"
+msgstr "連線前確認"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:487
-msgid "Confirm before connecting to internet"
-msgstr "連線到網路前確認"
+#: clientgui/DlgAdvPreferencesBase.cpp:486
+#: clientgui/DlgAdvPreferencesBase.cpp:490
+msgid "Useful only if you have a modem, ISDN or VPN connection."
+msgstr "適用於數據機, ISDN 或 VPN 連線。"
 
 #: clientgui/DlgAdvPreferencesBase.cpp:489
-msgid "if checked, a confirmation dialog will be displayed before trying to connect to the Internet"
-msgstr "若勾選此方塊,當連線到網路前會先顯示確認視窗"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:493
 msgid "Disconnect when done"
 msgstr "完成後斷線"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:495
-msgid ""
-"if checked, BOINC hangs up when network usage is done\n"
-"(only relevant for dialup-connection)"
-msgstr ""
-"若勾選此方塊,當網路使用結束後 BOINC 會中斷連線\n"
-"(只對撥接連線有效)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:501
-msgid "Network usage allowed"
-msgstr "選擇允許使用網路的情況"
+#: clientgui/DlgAdvPreferencesBase.cpp:516
+msgid "Disk"
+msgstr "硬碟"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:510
-msgid "network usage start hour"
-msgstr "網路使用開始時間"
+#: clientgui/DlgAdvPreferencesBase.cpp:521
+#, c-format
+msgid "%s will use the most restrictive of these settings:"
+msgstr "%s 會嚴格遵守下列設定:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:518
-msgid "network usage stop hour"
-msgstr "網路使用結束時間"
+#: clientgui/DlgAdvPreferencesBase.cpp:527
+#, c-format
+msgid "Limit the total amount of disk space used by %s."
+msgstr "限制%s使用硬碟空間。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:610
-#: clientgui/DlgItemProperties.cpp:257
-msgid "Disk usage"
-msgstr "硬碟用量"
+#: clientgui/DlgAdvPreferencesBase.cpp:530
+#: clientgui/DlgAdvPreferencesBase.cpp:554
+msgid "Use no more than"
+msgstr "使用不會超過"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:622
-msgid "the maximum disk space used by BOINC (in Gigabytes)"
-msgstr "BOINC 能使用的最大硬碟空間 (以 GB 計)"
+#: clientgui/DlgAdvPreferencesBase.cpp:534
+msgid "GB"
+msgstr "GB"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:626
-msgid "Gigabytes disk space (0 means no restriction)"
-msgstr "GB硬碟空間 (0表示忽略此設置)"
+#: clientgui/DlgAdvPreferencesBase.cpp:539
+#, c-format
+msgid ""
+"Limit disk usage to leave this much free space on the volume where %s stores"
+" data."
+msgstr "限制%s儲存資料並保留可用空間。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:629
+#: clientgui/DlgAdvPreferencesBase.cpp:542
 msgid "Leave at least"
-msgstr "留下至少"
+msgstr "保留至少"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:633
-msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
-msgstr "BOINC 要留下多少的可用磁碟空間 (以 GB 計)"
+#: clientgui/DlgAdvPreferencesBase.cpp:546
+msgid "GB free"
+msgstr "GB 可用空間"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:637
-msgid "Gigabytes disk space free"
-msgstr "可用硬碟空間 (GB)"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:644
-msgid "BOINC uses at most this percentage of total disk space"
-msgstr "BOINC 最多可使用的總硬碟空間百分比"
+#: clientgui/DlgAdvPreferencesBase.cpp:551
+#, c-format
+msgid ""
+"Limit the percentage of disk space used by %s on the volume where it stores "
+"data."
+msgstr "限制%s儲存資料所佔用硬碟空間百分比。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:649
+#: clientgui/DlgAdvPreferencesBase.cpp:559
 #, no-c-format
-msgid "% of total disk space"
+msgid "% of total"
 msgstr "% 總硬碟空間"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:652
-msgid "Tasks checkpoint to disk at most every"
-msgstr "工作最短的儲存時間間隔"
+#: clientgui/DlgAdvPreferencesBase.cpp:566
+msgid "Memory"
+msgstr "記憶體"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
-msgid "seconds"
-msgstr "秒"
+#: clientgui/DlgAdvPreferencesBase.cpp:571
+#, c-format
+msgid "Limit the memory used by %s when you're using the computer."
+msgstr "當您使用電腦時限制%s記憶體使用量。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:668
+#: clientgui/DlgAdvPreferencesBase.cpp:573
+msgid "When computer is in use, use at most"
+msgstr "當電腦使用時,最多占用"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:579
+#: clientgui/DlgAdvPreferencesBase.cpp:591
+#: clientgui/DlgAdvPreferencesBase.cpp:607
 #, no-c-format
-msgid "% of page file (swap space)"
-msgstr "% 分頁檔大小 (交換空間)"
+msgid "%"
+msgstr "%記憶體"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:675
-msgid "Memory usage"
-msgstr "記憶體用量"
+#: clientgui/DlgAdvPreferencesBase.cpp:584
+#, c-format
+msgid "Limit the memory used by %s when you're not using the computer."
+msgstr "限制電腦閒置時%s記憶體使用量。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
-#, no-c-format
-msgid "% when computer is in use"
-msgstr "% 於電腦使用中"
+#: clientgui/DlgAdvPreferencesBase.cpp:586
+msgid "When computer is not in use, use at most"
+msgstr "當電腦閒置時,最多占用"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:701
-#, no-c-format
-msgid "% when computer is idle"
-msgstr "% 於電腦閒置中"
+#: clientgui/DlgAdvPreferencesBase.cpp:595
+msgid "Leave non-GPU tasks in memory while suspended"
+msgstr "暫停時保留非 GPU 任務於記憶體中"
+
+#: 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."
+msgstr "勾選後暫停時將保留任務於記憶體中,並不會遺失進度。非勾選則暫停時將會從記憶體消除,只保留進度到最新的檢查點。"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:600
+#, c-format
+msgid "Limit the swap space (page file) used by %s."
+msgstr "限制交換空間(分頁檔)使用為%s"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:706
-msgid "Leave applications in memory while suspended"
-msgstr "暫停時保留應用程式於記憶體中"
+#: clientgui/DlgAdvPreferencesBase.cpp:602
+msgid "Page/swap file: use at most"
+msgstr "分頁/交換檔:最多使用"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:708
-msgid "if checked, suspended work units are left in memory"
-msgstr "若勾選此方塊,暫停的工作會留在記憶體中"
+#: clientgui/DlgAdvPreferencesBase.cpp:627
+msgid "and"
+msgstr "到"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:628
+msgid "to"
+msgstr "到"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:641
+msgid "Compute only during a particular period each day."
+msgstr "僅在每天特定時段運算。"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:644
+msgid "Compute only between"
+msgstr "運算將從"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:654
+#: clientgui/DlgAdvPreferencesBase.cpp:801
+msgid "Day-of-week override"
+msgstr "每日獨立設定"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:658
+#: clientgui/DlgAdvPreferencesBase.cpp:805
+msgid "Override the times above on the selected days:"
+msgstr "選定日將覆蓋上述時段:"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:676
+#: clientgui/DlgAdvPreferencesBase.cpp:822
+msgid "Monday"
+msgstr "星期一"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:691
+#: clientgui/DlgAdvPreferencesBase.cpp:837
+msgid "Friday"
+msgstr "星期五"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:704
+#: clientgui/DlgAdvPreferencesBase.cpp:850
+msgid "Tuesday"
+msgstr "星期二"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:728
-msgid "Suspend processor and network usage when these applications are running:"
-msgstr "當這些應用程式在運行時,暫停處理器與網路的使用"
+#: clientgui/DlgAdvPreferencesBase.cpp:719
+#: clientgui/DlgAdvPreferencesBase.cpp:865
+msgid "Saturday"
+msgstr "星期六"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:738
-msgid "Add..."
-msgstr "加入"
+#: clientgui/DlgAdvPreferencesBase.cpp:732
+#: clientgui/DlgAdvPreferencesBase.cpp:878
+msgid "Wednesday"
+msgstr "星期三"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:739
-msgid "Add an application to this list"
-msgstr "加入一個應用程式到列表中"
+#: clientgui/DlgAdvPreferencesBase.cpp:747
+#: clientgui/DlgAdvPreferencesBase.cpp:893
+msgid "Sunday"
+msgstr "星期日"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:744
-msgid "Remove"
-msgstr "移除"
+#: clientgui/DlgAdvPreferencesBase.cpp:760
+#: clientgui/DlgAdvPreferencesBase.cpp:906
+msgid "Thursday"
+msgstr "星期四"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:745
-msgid "Remove an application from this list"
-msgstr "從列表中移除一個應用程式"
+#: clientgui/DlgAdvPreferencesBase.cpp:789
+msgid "Transfer files only during a particular period each day."
+msgstr "僅在每天特定時段傳輸檔案。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:754
-msgid "For advanced options, refer to "
-msgstr "更多詳細的設定,請前往"
+#: clientgui/DlgAdvPreferencesBase.cpp:791
+msgid "Transfer files only between"
+msgstr "檔案傳輸將從"
 
 #: clientgui/DlgDiagnosticLogFlags.cpp:65
 #, c-format
 msgid "%s Diagnostic Log Flags"
-msgstr "%s 診斷記錄檔標記"
+msgstr "%s 診斷記錄標籤"
 
 #: clientgui/DlgDiagnosticLogFlags.cpp:83
-msgid "These flags enable various types of diagnostic messages in the Event Log."
-msgstr "這些標記可啟用事件記錄檔中各類型的診斷資訊。"
+msgid ""
+"These flags enable various types of diagnostic messages in the Event Log."
+msgstr "這些標籤可以啟用事件紀錄檔中不同類型的診斷資訊。"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:105
+#: clientgui/DlgDiagnosticLogFlags.cpp:99
+msgid "More info ..."
+msgstr "更多資訊..."
+
+#: clientgui/DlgDiagnosticLogFlags.cpp:120 clientgui/DlgHiddenColumns.cpp:101
 msgid "Save all values and close the dialog"
-msgstr "儲存所有值並關閉視窗"
+msgstr "儲存並關閉視窗"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:108
+#: clientgui/DlgDiagnosticLogFlags.cpp:123 clientgui/DlgHiddenColumns.cpp:104
 msgid "Defaults"
-msgstr "預設值"
+msgstr "預設"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:109
+#: clientgui/DlgDiagnosticLogFlags.cpp:124 clientgui/DlgHiddenColumns.cpp:105
 msgid "Restore default settings"
-msgstr "恢復預設值"
+msgstr "還原至預設值"
 
-#: clientgui/DlgDiagnosticLogFlags.cpp:113
+#: clientgui/DlgDiagnosticLogFlags.cpp:128 clientgui/DlgHiddenColumns.cpp:109
 msgid "Close the dialog without saving"
-msgstr "不儲存且關閉視窗"
+msgstr "不儲存並關閉視窗"
 
-#: clientgui/DlgEventLog.cpp:226
+#: clientgui/DlgEventLog.cpp:227
 #, c-format
 msgid "%s - Event Log"
 msgstr "%s - 事件記錄檔"
 
-#: clientgui/DlgEventLog.cpp:236
+#: clientgui/DlgEventLog.cpp:237
 msgid "Project"
 msgstr "專案"
 
-#: clientgui/DlgEventLog.cpp:237
+#: clientgui/DlgEventLog.cpp:238
 msgid "Time"
 msgstr "時間"
 
-#: clientgui/DlgEventLog.cpp:238
+#: clientgui/DlgEventLog.cpp:239
 msgid "Message"
 msgstr "訊息"
 
-#: clientgui/DlgEventLog.cpp:300
-#: clientgui/DlgEventLog.cpp:364
+#: clientgui/DlgEventLog.cpp:301 clientgui/DlgEventLog.cpp:351
 msgid "&Show only this project"
 msgstr "只顯示本專案 (&S)"
 
-#: clientgui/DlgEventLog.cpp:304
+#: clientgui/DlgEventLog.cpp:305
 msgid "Copy &All"
 msgstr "全部複製 (&A)"
 
-#: clientgui/DlgEventLog.cpp:306
-#: clientgui/DlgEventLog.cpp:310
+#: clientgui/DlgEventLog.cpp:307 clientgui/DlgEventLog.cpp:311
 msgid "Copy all the messages to the clipboard."
 msgstr "複製全部訊息到剪貼簿。"
 
-#: clientgui/DlgEventLog.cpp:315
+#: clientgui/DlgEventLog.cpp:316
 msgid "Copy &Selected"
 msgstr "複製所選擇的 (&S)"
 
-#: clientgui/DlgEventLog.cpp:318
-#: clientgui/DlgEventLog.cpp:326
-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
+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 "只複製已選取的訊息到剪貼簿,您可以在選取訊息時按住 Shift 或 Command 鍵以同時選取多個訊息。"
 
-#: clientgui/DlgEventLog.cpp:320
-#: clientgui/DlgEventLog.cpp:328
-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
+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 "只複製已選取的訊息到剪貼簿, 您可以在選取訊息時按住 Shift 或 Ctrl 鍵以同時選取多個訊息。"
 
-#: clientgui/DlgEventLog.cpp:335
-#: clientgui/DlgItemProperties.cpp:67
+#: clientgui/DlgEventLog.cpp:336 clientgui/DlgItemProperties.cpp:67
 msgid "&Close"
 msgstr "關閉 (&C)"
 
-#: clientgui/DlgEventLog.cpp:344
-#, c-format
-msgid "Get help with %s"
-msgstr "取得 %s 的幫助"
-
-#: clientgui/DlgEventLog.cpp:358
+#: clientgui/DlgEventLog.cpp:345
 msgid "Show all &messages"
 msgstr "顯示所有訊息"
 
-#: clientgui/DlgEventLog.cpp:359
-#: clientgui/DlgEventLog.cpp:361
+#: clientgui/DlgEventLog.cpp:346 clientgui/DlgEventLog.cpp:348
 msgid "Show messages for all projects"
 msgstr "顯示所有計畫於同一統計圖"
 
-#: clientgui/DlgEventLog.cpp:365
-#: clientgui/DlgEventLog.cpp:367
+#: clientgui/DlgEventLog.cpp:352 clientgui/DlgEventLog.cpp:354
 msgid "Show only the messages for the selected project"
 msgstr "顯示所選計畫於同一統計圖"
 
+#: clientgui/DlgExclusiveApps.cpp:60
+#, c-format
+msgid "%s - Exclusive Applications"
+msgstr "%s - 衝突程式"
+
+#: clientgui/DlgExclusiveApps.cpp:72
+msgid ""
+"Suspend processor and network usage when these applications are running:"
+msgstr "當這些程式在執行時,暫停運算與網路使用:"
+
+#: clientgui/DlgExclusiveApps.cpp:80 clientgui/DlgExclusiveApps.cpp:104
+msgid "Add..."
+msgstr "加入"
+
+#: clientgui/DlgExclusiveApps.cpp:81 clientgui/DlgExclusiveApps.cpp:105
+msgid "Add an application to this list"
+msgstr "新增程式到列表中"
+
+#: clientgui/DlgExclusiveApps.cpp:86 clientgui/DlgExclusiveApps.cpp:110
+msgid "Remove"
+msgstr "移除"
+
+#: clientgui/DlgExclusiveApps.cpp:87 clientgui/DlgExclusiveApps.cpp:111
+msgid "Remove an application from this list"
+msgstr "從列表中移除程式"
+
+#: clientgui/DlgExclusiveApps.cpp:96
+msgid "Suspend GPU usage when these applications are running:"
+msgstr "當這些程式執行時暫停GPU運算:"
+
+#: clientgui/DlgExclusiveApps.cpp:122
+msgid "For advanced options, refer to "
+msgstr "更多詳細的設定,請前往"
+
+#: clientgui/DlgExclusiveApps.cpp:147
+msgid "save all values and close the dialog"
+msgstr "儲存所有值並關閉視窗"
+
+#: clientgui/DlgExclusiveApps.cpp:153
+msgid "close the dialog without saving"
+msgstr "關閉視窗且不儲存"
+
+#: clientgui/DlgExclusiveApps.cpp:158
+msgid "shows the preferences web page"
+msgstr "顯示網頁上的偏好設定"
+
+#: clientgui/DlgExclusiveApps.cpp:303 clientgui/DlgExclusiveApps.cpp:309
+#: clientgui/DlgExclusiveApps.cpp:315
+msgid "Applications to add"
+msgstr "新增程式"
+
+#: clientgui/DlgExclusiveApps.cpp:332
+#, c-format
+msgid "'%s' is not an executable application."
+msgstr "'%s' 為不可執行的程式"
+
+#: clientgui/DlgExclusiveApps.cpp:333 clientgui/DlgExclusiveApps.cpp:380
+#: clientgui/DlgExclusiveApps.cpp:404
+msgid "Add Exclusive App"
+msgstr "新增衝突程式"
+
+#: clientgui/DlgExclusiveApps.cpp:345
+msgid "Name of application to add?"
+msgstr "新增的程式名稱?"
+
+#: clientgui/DlgExclusiveApps.cpp:345
+msgid "Add exclusive app"
+msgstr "新增衝突程式"
+
+#: clientgui/DlgExclusiveApps.cpp:379
+#, c-format
+msgid "Application names must end with '%s'"
+msgstr "程式必須為 '%s' 檔"
+
+#: clientgui/DlgExclusiveApps.cpp:403
+#, c-format
+msgid "'%s' is already in the list."
+msgstr "'%s' 已經在列表之中。"
+
 #: clientgui/DlgExitMessage.cpp:82
 #, c-format
 msgid "%s - Exit Confirmation"
@@ -1685,12 +1739,7 @@ msgid ""
 "\n"
 "If you also want to stop running the tasks,\n"
 "choose from the following options:"
-msgstr ""
-"您剛才請求關閉 %s,\n"
-"他的用途是查看與管理在您電腦上執行的工作。\n"
-"\n"
-"如果您想要停止執行中的工作,\n"
-"請從下列的選項中選擇:"
+msgstr "您剛才請求關閉 %s,\n他的用途是查看與管理在您電腦上執行的任務。\n\n如果您想要停止執行中的任務,\n請從下列的選項中選擇:"
 
 #: clientgui/DlgExitMessage.cpp:135
 #, c-format
@@ -1701,26 +1750,19 @@ msgid ""
 "In most cases, it is better just to close the %s window\n"
 "rather than to exit the application; that will allow %s to run its\n"
 "tasks at the times you selected in your preferences."
-msgstr ""
-"這會完全關閉 %s 和其運算的工作直到 %s 程式\n"
-"或 %s 螢幕保護程式再次啟動。\n"
-"\n"
-"一般而言只關掉 %s 視窗會比完全離開程式來的好,\n"
-"這樣子可以讓 %s 依照你設置的偏好設定按時執行。"
+msgstr "這會完全關閉 %s 和其運算的任務直到 %s 程式\n或 %s 螢幕保護程式再次啟動。\n\n一般而言只關掉 %s 視窗會比完全離開程式來的好,\n這樣子可以讓 %s 依照你設置的偏好設定按時執行。"
 
 #: clientgui/DlgExitMessage.cpp:153
 #, c-format
 msgid "Stop running tasks when exiting the %s"
-msgstr "當離開 %s 的時候停止所有運算中的工作"
+msgstr "當離開 %s 時停止所有運算中的任務"
 
 #: clientgui/DlgExitMessage.cpp:165
 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
 msgid "&Cancel"
 msgstr "取消 (&C)"
 
@@ -1728,12 +1770,30 @@ msgstr "取消 (&C)"
 msgid "Don't show this dialog again."
 msgstr "不要再顯示這提示訊息。"
 
-#: clientgui/DlgItemProperties.cpp:194
-#: clientgui/DlgItemProperties.cpp:197
-#: clientgui/DlgItemProperties.cpp:200
-#: clientgui/DlgItemProperties.cpp:203
+#: clientgui/DlgHiddenColumns.cpp:64
+#, c-format
+msgid "%s Column Selection"
+msgstr "%s 選擇欄位"
+
+#: clientgui/DlgHiddenColumns.cpp:77
+#, c-format
+msgid "Select which columns %s should show."
+msgstr "選擇想要%s顯示的欄位。"
+
+#: clientgui/DlgHiddenColumns.cpp:314
+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
 msgid "Don't fetch tasks for "
-msgstr "禁止取得新工作"
+msgstr "禁止取得新任務"
 
 #: clientgui/DlgItemProperties.cpp:194
 msgid "Project preference"
@@ -1753,18 +1813,17 @@ msgstr "用戶端帳號建立已停止"
 
 #: clientgui/DlgItemProperties.cpp:207
 msgid " work fetch deferred for"
-msgstr " 閒置多久後執行工作"
+msgstr " 閒置多久後執行任務"
 
 #: clientgui/DlgItemProperties.cpp:208
 msgid " work fetch deferral interval"
-msgstr " 工作的延遲間隔"
+msgstr " 任務的延遲間隔"
 
 #: clientgui/DlgItemProperties.cpp:239
 msgid "Properties of project "
 msgstr "專案細節"
 
-#: clientgui/DlgItemProperties.cpp:243
-#: clientgui/DlgOptions.cpp:221
+#: clientgui/DlgItemProperties.cpp:243 clientgui/DlgOptions.cpp:221
 msgid "General"
 msgstr "一般"
 
@@ -1796,6 +1855,10 @@ msgstr "下載檔案被延遲"
 msgid "File uploads deferred for"
 msgstr "上傳檔案被延遲"
 
+#: clientgui/DlgItemProperties.cpp:257
+msgid "Disk usage"
+msgstr "硬碟用量"
+
 #: clientgui/DlgItemProperties.cpp:258
 msgid "Computer ID"
 msgstr "電腦辨識 ID"
@@ -1804,14 +1867,10 @@ msgstr "電腦辨識 ID"
 msgid "Non CPU intensive"
 msgstr "非 CPU 密集型"
 
-#: 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 "是"
 
@@ -1819,14 +1878,13 @@ 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 "否"
 
 #: clientgui/DlgItemProperties.cpp:263
 msgid "Don't request more work"
-msgstr "不允許新的工作"
+msgstr "不允許新的任務"
 
 #: clientgui/DlgItemProperties.cpp:265
 msgid "Scheduler call in progress"
@@ -1836,8 +1894,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 "此主機總計"
 
@@ -1851,7 +1908,7 @@ msgstr "加入帳號管理服務"
 
 #: clientgui/DlgItemProperties.cpp:280
 msgid "Remove when tasks done"
-msgstr "工作完成後退出"
+msgstr "任務完成後退出"
 
 #: clientgui/DlgItemProperties.cpp:283
 msgid "Ended"
@@ -1895,11 +1952,11 @@ msgstr "時間校正參數"
 
 #: clientgui/DlgItemProperties.cpp:345
 msgid "Properties of task "
-msgstr "工作細節"
+msgstr "任務細節"
 
 #: clientgui/DlgItemProperties.cpp:357
 msgid "Application"
-msgstr "應用程式"
+msgstr "程式"
 
 #: clientgui/DlgItemProperties.cpp:358
 msgid "Name"
@@ -1923,19 +1980,17 @@ msgstr "資源"
 
 #: clientgui/DlgItemProperties.cpp:370
 msgid "Estimated computation size"
-msgstr "預估的工作大小"
+msgstr "預估任務大小"
 
 #: clientgui/DlgItemProperties.cpp:373
 msgid "CPU time at last checkpoint"
 msgstr "上次儲存的 CPU 時間"
 
-#: clientgui/DlgItemProperties.cpp:374
-#: clientgui/DlgItemProperties.cpp:389
+#: clientgui/DlgItemProperties.cpp:374 clientgui/DlgItemProperties.cpp:389
 msgid "CPU time"
 msgstr "CPU 時間"
 
-#: clientgui/DlgItemProperties.cpp:376
-#: clientgui/DlgItemProperties.cpp:390
+#: clientgui/DlgItemProperties.cpp:376 clientgui/DlgItemProperties.cpp:390
 msgid "Elapsed time"
 msgstr "執行時間"
 
@@ -1957,7 +2012,7 @@ msgstr "記憶體大小"
 
 #: clientgui/DlgItemProperties.cpp:383
 msgid "Directory"
-msgstr "工作目錄"
+msgstr "任務目錄"
 
 #: clientgui/DlgItemProperties.cpp:386
 msgid "Process ID"
@@ -1967,8 +2022,7 @@ msgstr "程序 ID"
 msgid "Local: "
 msgstr "本地:"
 
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: clientgui/DlgOptions.cpp:129 clientgui/DlgOptions.cpp:135
 msgid "Options"
 msgstr "基本設定"
 
@@ -2032,33 +2086,27 @@ msgstr "經由 HTTP Proxy 伺服器連線"
 msgid "HTTP Proxy Server Configuration"
 msgstr "HTTP Proxy 伺服器組態設定"
 
-#: 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
 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 "不要使用 Proxy:"
 
-#: 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
 msgid "User Name:"
 msgstr "使用者名稱:"
 
-#: clientgui/DlgOptions.cpp:320
-#: clientgui/DlgOptions.cpp:384
+#: clientgui/DlgOptions.cpp:320 clientgui/DlgOptions.cpp:384
 #: clientgui/DlgSelectComputer.cpp:152
 msgid "Password:"
 msgstr "密碼:"
@@ -2110,7 +2158,9 @@ msgstr "%s - 語言選擇"
 
 #: 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 "%s 的語言已變更 。為了使其生效, 您必須重新啟動 %s。"
 
 #: clientgui/DlgSelectComputer.cpp:91
@@ -2129,8 +2179,7 @@ msgstr "另一個 %s 的案例已經在目前的運算上執行,請選擇想
 msgid "Host name:"
 msgstr "主機名稱:"
 
-#: clientgui/Localization.cpp:31
-#: clientgui/Localization.cpp:69
+#: clientgui/Localization.cpp:31 clientgui/Localization.cpp:69
 msgid "Message boards"
 msgstr "留言板"
 
@@ -2142,15 +2191,12 @@ msgstr "於 SETI at Home 留言板與其他使用者交流"
 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 "檢視您的帳號資訊與總積分"
@@ -2163,32 +2209,27 @@ msgstr "您的偏好設定"
 msgid "View and modify your SETI at home account profile and preferences"
 msgstr "檢視並修改您的 SETI at home 個人資訊與偏好設定"
 
-#: 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 "檢視您上週或更久之前所完成的運算結果與工作"
+msgstr "檢視您上週或更久之前所完成的運算結果"
 
-#: clientgui/Localization.cpp:51
-#: clientgui/Localization.cpp:93
+#: clientgui/Localization.cpp:51 clientgui/Localization.cpp:93
 msgid "Your computers"
 msgstr "您的電腦"
 
 #: clientgui/Localization.cpp:53
 msgid "View a listing of all the computers on which you are running SETI at Home"
-msgstr "檢視所有運行 SETI at Home 的電腦清單"
+msgstr "檢視所有執行 SETI at Home 的電腦清單"
 
-#: 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 "檢視您的團隊資訊"
 
@@ -2209,7 +2250,8 @@ msgid "Read a detailed description of the Einstein at Home screensaver"
 msgstr "閱讀 Einstein at Home 螢幕保護程式的詳細說明"
 
 #: 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 "於 Einstein at Home 留言板與其他使用者交流"
 
 #: clientgui/Localization.cpp:73
@@ -2237,15 +2279,18 @@ msgid "Account summary"
 msgstr "帳號摘要"
 
 #: clientgui/Localization.cpp:95
-msgid "View a listing of all the computers on which you are running Einstein at Home"
-msgstr "檢視您所有正在運行 Einstein at Home 的電腦清單"
+msgid ""
+"View a listing of all the computers on which you are running Einstein at Home"
+msgstr "檢視您所有執行 Einstein at Home 的電腦清單"
 
 #: clientgui/Localization.cpp:101
 msgid "LIGO project"
 msgstr "LIGO 專案"
 
 #: 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 "雷射干涉重力波天文台 (LIGO) 專案首頁"
 
 #: clientgui/Localization.cpp:105
@@ -2256,8 +2301,7 @@ msgstr "GEO-600 專案"
 msgid "The home page of the GEO-600 project"
 msgstr "GEO-600 專案首頁"
 
-#: clientgui/Localization.cpp:115
-#: clientgui/Localization.cpp:133
+#: clientgui/Localization.cpp:115 clientgui/Localization.cpp:133
 msgid "Team"
 msgstr "團隊"
 
@@ -2335,10 +2379,12 @@ msgstr "取回系統狀態中;請稍候..."
 
 #: clientgui/MainDocument.cpp:1826
 msgid "Missing application"
-msgstr "應用程式不存在"
+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 "請從 http://cord.sourceforge.net 下載並安裝 CoRD 程式。"
 
 #: clientgui/MainDocument.cpp:2442
@@ -2375,7 +2421,7 @@ msgstr "正在啟動中"
 
 #: clientgui/MainDocument.cpp:2450
 msgid "an exclusive app is running"
-msgstr "有排斥的應用程式正在執行"
+msgstr "有衝突的程式正在執行"
 
 #: clientgui/MainDocument.cpp:2451
 msgid "CPU is busy"
@@ -2399,7 +2445,7 @@ msgstr "沒有可用的 GPU,"
 
 #: clientgui/MainDocument.cpp:2484
 msgid "New"
-msgstr "新工作"
+msgstr "新任務"
 
 #: clientgui/MainDocument.cpp:2488
 msgid "Download failed"
@@ -2409,8 +2455,7 @@ msgstr "下載失敗"
 msgid "Downloading"
 msgstr "下載中"
 
-#: clientgui/MainDocument.cpp:2492
-#: clientgui/MainDocument.cpp:2557
+#: clientgui/MainDocument.cpp:2492 clientgui/MainDocument.cpp:2551
 msgid " (suspended - "
 msgstr " (已暫停 - "
 
@@ -2422,101 +2467,99 @@ msgstr "專案被使用者暫停"
 msgid "Task suspended by user"
 msgstr "被使用者暫停"
 
-#: clientgui/MainDocument.cpp:2504
+#: clientgui/MainDocument.cpp:2507
 msgid "Suspended - "
 msgstr "已暫停 -"
 
-# 75%
 #: clientgui/MainDocument.cpp:2510
 msgid "GPU suspended - "
-msgstr "GPU 已暫停 - "
+msgstr "GPU 已暫停 -"
 
-#: clientgui/MainDocument.cpp:2517
+#: clientgui/MainDocument.cpp:2514
 msgid "Waiting for memory"
 msgstr "等待記憶體釋放"
 
-#: clientgui/MainDocument.cpp:2519
+#: clientgui/MainDocument.cpp:2516
 msgid "Waiting for shared memory"
 msgstr "等待共享記憶體釋放"
 
-#: clientgui/MainDocument.cpp:2521
+#: clientgui/MainDocument.cpp:2518
 msgid "Running"
-msgstr "運行中"
+msgstr "執行中"
 
-#: clientgui/MainDocument.cpp:2523
+#: clientgui/MainDocument.cpp:2520
 msgid " (non-CPU-intensive)"
 msgstr " (非 CPU 密集型)"
 
-#: clientgui/MainDocument.cpp:2526
+#: clientgui/MainDocument.cpp:2523
 msgid "Waiting to run"
 msgstr "等待執行"
 
-#: clientgui/MainDocument.cpp:2528
-#: clientgui/MainDocument.cpp:2534
+#: clientgui/MainDocument.cpp:2525 clientgui/MainDocument.cpp:2528
 msgid "Ready to start"
 msgstr "準備開始"
 
-#: clientgui/MainDocument.cpp:2538
+#: clientgui/MainDocument.cpp:2532
 msgid "Postponed: "
-msgstr "延後: "
+msgstr "延後:"
 
-#: clientgui/MainDocument.cpp:2541
+#: clientgui/MainDocument.cpp:2535
 msgid "Postponed"
 msgstr "延後"
 
-#: clientgui/MainDocument.cpp:2545
+#: clientgui/MainDocument.cpp:2539
 msgid "Waiting for network access"
-msgstr "正等待網路存取"
+msgstr "等待網路存取中"
 
-#: clientgui/MainDocument.cpp:2549
+#: clientgui/MainDocument.cpp:2543
 msgid "Computation error"
 msgstr "運算錯誤"
 
-#: clientgui/MainDocument.cpp:2553
+#: clientgui/MainDocument.cpp:2547
 msgid "Upload failed"
 msgstr "上傳失敗"
 
-#: clientgui/MainDocument.cpp:2555
+#: clientgui/MainDocument.cpp:2549
 msgid "Uploading"
 msgstr "上傳中"
 
-#: clientgui/MainDocument.cpp:2566
+#: clientgui/MainDocument.cpp:2560
 msgid "Aborted by user"
-msgstr "被使用者中止"
+msgstr "被使用者停止"
 
-#: clientgui/MainDocument.cpp:2569
+#: clientgui/MainDocument.cpp:2563
 msgid "Aborted by project"
-msgstr "被專案中止"
+msgstr "被專案停止"
 
-#: clientgui/MainDocument.cpp:2572
+#: clientgui/MainDocument.cpp:2566
 msgid "Aborted: not started by deadline"
-msgstr "已中止:回報期限前尚未執行"
+msgstr "已停止:回報期限前尚未執行"
 
-#: clientgui/MainDocument.cpp:2575
+#: clientgui/MainDocument.cpp:2569
 msgid "Aborted: disk limit exceeded"
-msgstr "已中止:硬碟配置容量不足"
+msgstr "已停止:硬碟配置容量不足"
 
-#: clientgui/MainDocument.cpp:2578
+#: clientgui/MainDocument.cpp:2572
 msgid "Aborted: run time limit exceeded"
-msgstr "已中止:超過回報期限"
+msgstr "已停止:超過回報期限"
 
-#: clientgui/MainDocument.cpp:2581
+#: clientgui/MainDocument.cpp:2575
 msgid "Aborted: memory limit exceeded"
-msgstr "已中止:記憶體不足"
+msgstr "已停止:記憶體不足"
 
-#: clientgui/MainDocument.cpp:2584
+#: clientgui/MainDocument.cpp:2578
 msgid "Aborted"
-msgstr "已中止"
+msgstr "已停止"
 
-#: clientgui/MainDocument.cpp:2589
+#: clientgui/MainDocument.cpp:2583
 msgid "Acknowledged"
 msgstr "已認可"
 
-#: clientgui/MainDocument.cpp:2591
+#: clientgui/MainDocument.cpp:2585
 msgid "Ready to report"
 msgstr "準備回報"
 
-#: clientgui/MainDocument.cpp:2593
+#: clientgui/MainDocument.cpp:2587
 #, c-format
 msgid "Error: invalid state '%d'"
 msgstr "錯誤: 無效狀態「%d」"
@@ -2538,9 +2581,7 @@ msgid ""
 "The URL you supplied is not that of a BOINC-based project.\n"
 "\n"
 "Please check the URL and try again."
-msgstr ""
-"您所輸入的網址並非基於 BOINC 的專案網站。\n"
-"請檢查網址後再試一次。"
+msgstr "您所輸入的網址並非基於 BOINC 的專案網站。\n請檢查網址後再試一次。"
 
 #: clientgui/NotDetectedPage.cpp:188
 msgid "Account manager not found"
@@ -2552,9 +2593,7 @@ msgid ""
 "manager.\n"
 "\n"
 "Please check the URL and try again."
-msgstr ""
-"您所輸入的網址並非基於 BOINC 的帳號管理員。\n"
-"請檢查網址後再試一次。"
+msgstr "您所輸入的網址並非基於 BOINC 的帳號管理服務。\n請檢查網址後再試一次。"
 
 #: clientgui/NotFoundPage.cpp:181
 msgid "Login Failed."
@@ -2576,66 +2615,67 @@ msgstr "更多。。。"
 msgid "Choose a project"
 msgstr "請選擇專案"
 
-#: clientgui/ProjectInfoPage.cpp:228
+#: clientgui/ProjectInfoPage.cpp:226
 msgid "To choose a project, click its name or type its URL below."
 msgstr "選擇一個專案,點選下面的名稱或在下方輸入專案的網址。"
 
-#: clientgui/ProjectInfoPage.cpp:246
+#: clientgui/ProjectInfoPage.cpp:242
 msgid "Categories:"
 msgstr "分類:"
 
-#: clientgui/ProjectInfoPage.cpp:267
+#: clientgui/ProjectInfoPage.cpp:262
 msgid "Projects:"
 msgstr "專案:"
 
-#: clientgui/ProjectInfoPage.cpp:279
+#: clientgui/ProjectInfoPage.cpp:274
 msgid "Project details"
 msgstr "專案細節"
 
-#: clientgui/ProjectInfoPage.cpp:291
+#: clientgui/ProjectInfoPage.cpp:284
 msgid "Research area:"
 msgstr "研究領域:"
 
-#: clientgui/ProjectInfoPage.cpp:302
+#: clientgui/ProjectInfoPage.cpp:294
 msgid "Organization:"
 msgstr "機構:"
 
-#: clientgui/ProjectInfoPage.cpp:313
+#: clientgui/ProjectInfoPage.cpp:304
 msgid "Web site:"
 msgstr "網站:"
 
-#: clientgui/ProjectInfoPage.cpp:325
+#: clientgui/ProjectInfoPage.cpp:315
 msgid "Supported systems:"
-msgstr "支援的作業系統:"
+msgstr "支援作業系統:"
 
-#: clientgui/ProjectInfoPage.cpp:363
+#: clientgui/ProjectInfoPage.cpp:352
 msgid "Project URL:"
 msgstr "專案網址:"
 
-#: clientgui/ProjectInfoPage.cpp:499
-#: clientgui/ProjectInfoPage.cpp:754
-#: clientgui/ProjectInfoPage.cpp:758
+#: clientgui/ProjectInfoPage.cpp:486 clientgui/ProjectInfoPage.cpp:686
+#: clientgui/ProjectInfoPage.cpp:690
 msgid "All"
 msgstr "全部"
 
-#: clientgui/ProjectInfoPage.cpp:802
-msgid "This project may not have work for your type of computer.  Do you want to add it anyway?"
-msgstr "這個專案可能沒有符合您電腦的工作。您確定要加入嗎?"
+#: clientgui/ProjectInfoPage.cpp:735
+msgid ""
+"This project may not have work for your type of computer.  Do you want to "
+"add it anyway?"
+msgstr "這個專案可能沒有符合您電腦的任務。您確定要加入嗎?"
 
-#: clientgui/ProjectInfoPage.cpp:826
+#: clientgui/ProjectInfoPage.cpp:767
 msgid "You already added this project. Please choose a different project."
 msgstr "您已經加入本專案。請選擇其他的專案。"
 
 #: clientgui/ProjectProcessingPage.cpp:321
 msgid "Communicating with project."
-msgstr "與伺服器通訊中。"
+msgstr "與專案伺服器通訊中。"
 
-#: clientgui/ProjectProcessingPage.cpp:510
+#: clientgui/ProjectProcessingPage.cpp:509
 msgid "Required files not found on the server."
 msgstr "請求的檔案並不存在於伺服器中。"
 
-#: clientgui/ProjectProcessingPage.cpp:513
-#: clientgui/ProjectProcessingPage.cpp:586
+#: clientgui/ProjectProcessingPage.cpp:512
+#: clientgui/ProjectProcessingPage.cpp:585
 msgid "An internal server error has occurred."
 msgstr "內部伺服器發生錯誤。"
 
@@ -2643,9 +2683,7 @@ msgstr "內部伺服器發生錯誤。"
 msgid ""
 "Communicating with project\n"
 "Please wait..."
-msgstr ""
-"與專案通訊中\n"
-"請稍候..."
+msgstr "與專案通訊中\n請稍候..."
 
 #: clientgui/ProjectWelcomePage.cpp:251
 #, c-format
@@ -2654,11 +2692,11 @@ msgstr "歡迎來到%s。"
 
 #: clientgui/ProjectWelcomePage.cpp:254
 msgid "You have volunteered to compute for this project:"
-msgstr "您自願參加此專案:"
+msgstr "你自願成為這個專案的計算者:"
 
 #: clientgui/ProjectWelcomePage.cpp:255
 msgid "Name:"
-msgstr "姓名:"
+msgstr "名稱:"
 
 #: clientgui/ProjectWelcomePage.cpp:258
 msgid "Home:"
@@ -2670,15 +2708,17 @@ msgstr "描述:"
 
 #: clientgui/ProjectWelcomePage.cpp:265
 msgid "URL:"
-msgstr "URL:"
+msgstr "網址:"
 
 #: clientgui/ProjectWelcomePage.cpp:268
 msgid "User:"
-msgstr "使用者:"
+msgstr "用戶:"
 
 #: clientgui/ProjectWelcomePage.cpp:273
-msgid "WARNING: This project is not registered with BOINC.  Make sure you trust it before continuing."
-msgstr "警告: 此專案並未於BOINC註冊。  繼續前請先確認是否信任此專案。"
+msgid ""
+"WARNING: This project is not registered with BOINC.  Make sure you trust it "
+"before continuing."
+msgstr "警告:此專案並未註冊BOINC。請確認後再繼續。"
 
 #: clientgui/ProjectWelcomePage.cpp:277
 msgid "To continue, click Next."
@@ -2703,17 +2743,7 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"BOINC 與網路通訊失敗。可能有幾個原因:\n"
-"\n"
-"1) 通訊問題。\n"
-"請檢查您的網路或數據機連接後按「上一步」\n"
-"重試剛剛的操作。\n"
-"2) 防火牆軟體阻擋了 BOINC 的連線。\n"
-"請設定您的防火牆讓 BOINC 能存取 port 80。\n"
-"然後按「上一步」重試。\n"
-"3) 你正使用 Proxy 伺服器。\n"
-"請按「下一步」設置 BOINC 的 Proxy 設定。"
+msgstr "BOINC 與網路通訊失敗。可能有幾個原因:\n\n1) 通訊問題。\n請檢查您的網路或數據機連接後按「上一步」\n重試剛剛的操作。\n2) 防火牆軟體阻擋了 BOINC 的連線。\n請設定您的防火牆讓 BOINC 能存取 port 80。\n然後按「上一步」重試。\n3) 你正使用 Proxy 伺服器。\n請按「下一步」設置 BOINC 的 Proxy 設定。"
 
 #: clientgui/ProxyInfoPage.cpp:203
 msgid ""
@@ -2730,17 +2760,7 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr ""
-"BOINC 與網路通訊失敗。可能有幾個原因:\n"
-"\n"
-"1) 通訊問題。\n"
-"請檢查您的網路或數據機連接後按「上一步」\n"
-"重試剛剛的操作。\n"
-"2) 防火牆軟體阻擋了 BOINC 的連線。\n"
-"請設定您的防火牆讓 BOINC 能存取 port 80。\n"
-"然後按「上一步」重試。\n"
-"3) 你正使用 Proxy 伺服器。\n"
-"請按「下一步」設置 BOINC 的 Proxy 設定。"
+msgstr "BOINC 與網路通訊失敗。可能有幾個原因:\n\n1) 通訊問題。\n請檢查您的網路或數據機連接後按「上一步」\n重試剛剛的操作。\n2) 防火牆軟體阻擋了 BOINC 的連線。\n請設定您的防火牆讓 BOINC 能存取 port 80。\n然後按「上一步」重試。\n3) 你正使用 Proxy 伺服器。\n請按「下一步」設置 BOINC 的 Proxy 設定。"
 
 #: clientgui/ProxyPage.cpp:331
 msgid "Proxy configuration"
@@ -2750,8 +2770,7 @@ msgstr "Proxy 組態設定"
 msgid "HTTP proxy"
 msgstr "HTTP Proxy"
 
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
+#: clientgui/ProxyPage.cpp:337 clientgui/ProxyPage.cpp:357
 msgid "Server:"
 msgstr "伺服器:"
 
@@ -2763,54 +2782,67 @@ msgstr "自動偵測"
 msgid "SOCKS proxy"
 msgstr "SOCKS Proxy"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:167
+#: clientgui/sg_BoincSimpleFrame.cpp:166
+msgid "Skin"
+msgstr "外觀"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:168
+msgid "Select the appearance of the user interface."
+msgstr "選擇用戶的介面外觀"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:179
+msgid "Display diagnostic messages."
+msgstr "顯示診斷訊息。"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:184
 msgid "Advanced View...\tCtrl+Shift+A"
 msgstr "進階模式...\tCtrl+Shift+A"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:168
+#: clientgui/sg_BoincSimpleFrame.cpp:185
 msgid "Display the advanced graphical interface."
 msgstr "顯示精簡 BOINC 圖形介面。"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:175
-msgid "Skin"
-msgstr "面板"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:177
-msgid "Select the appearance of the user interface."
-msgstr "選擇用戶的介面外觀"
+#: clientgui/sg_BoincSimpleFrame.cpp:201
+msgid "Configure display options and proxy settings"
+msgstr "配置顯示選項和 Proxy 設定"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:224
+#: clientgui/sg_BoincSimpleFrame.cpp:222
 #, c-format
 msgid "&%s"
 msgstr "&%s"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:405
+#: clientgui/sg_BoincSimpleFrame.cpp:396
 msgid "Default"
 msgstr "預設"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:848
+#: clientgui/sg_BoincSimpleFrame.cpp:838
 msgid "Suspend"
 msgstr "暫停"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:850
+#: clientgui/sg_BoincSimpleFrame.cpp:840
 msgid "Suspend Computing"
 msgstr "暫停執行"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:851
+#: clientgui/sg_BoincSimpleFrame.cpp:841
 msgid "Resume Computing"
 msgstr "繼續執行"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:867
+#: clientgui/sg_BoincSimpleFrame.cpp:857
 msgid "Notices"
 msgstr "訊息"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:868
+#: clientgui/sg_BoincSimpleFrame.cpp:858
 msgid "Open a window to view notices from projects or BOINC"
-msgstr "開啟新視窗以觀看來至專案或 BOINC 的訊息"
+msgstr "開啟新視窗觀看來自專案或 BOINC 的訊息"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:879
+#, c-format
+msgid "Get help with %s"
+msgstr "取得 %s 的幫助"
 
 #: clientgui/sg_DlgMessages.cpp:124
 msgid "Fetching notices; please wait..."
-msgstr "取得通知中;請稍後..."
+msgstr "載入訊息中;請稍後..."
 
 #: clientgui/sg_DlgMessages.cpp:132
 msgid "There are no notices at this time."
@@ -2825,233 +2857,104 @@ msgstr "關閉"
 msgid "%s - Notices"
 msgstr "%s - 訊息"
 
-#: clientgui/sg_DlgPreferences.cpp:270
-msgid "This dialog controls preferences for this computer only."
-msgstr "這裡的偏好設定只對本電腦有效。"
-
-#: clientgui/sg_DlgPreferences.cpp:275
-msgid "Click OK to set preferences."
-msgstr "點選 確定 來更新設定"
-
-#: clientgui/sg_DlgPreferences.cpp:280
-msgid "Click Clear to restore web-based settings for all preferences listed below."
-msgstr "點擊清除可將下列網站參數恢復到預設值。"
-
-#: clientgui/sg_DlgPreferences.cpp:287
-msgid "For additional settings, select Computing Preferences in the Advanced View."
-msgstr "更多的偏好設定,請切換至進階模式。"
-
-#: clientgui/sg_DlgPreferences.cpp:315
-msgid "Do work only between:"
-msgstr "只在此時段執行工作:"
-
-#: clientgui/sg_DlgPreferences.cpp:337
-msgid "Connect to internet only between:"
-msgstr "只在此時段連上網路:"
-
-#: clientgui/sg_DlgPreferences.cpp:359
-#: clientgui/sg_DlgPreferences.cpp:376
-msgid "Use no more than:"
-msgstr "資源耗用不超過:"
-
-#: clientgui/sg_DlgPreferences.cpp:372
-msgid "of disk space"
-msgstr "硬碟空間"
-
-#: clientgui/sg_DlgPreferences.cpp:389
-msgid "of the processor"
-msgstr "CPU 使用率"
-
-#: clientgui/sg_DlgPreferences.cpp:393
-msgid "Do work while on battery?"
-msgstr "以電池供電時要執行工作嗎?"
-
-#: clientgui/sg_DlgPreferences.cpp:406
-msgid "Do work after idle for:"
-msgstr "閒置多久後執行工作:"
-
-#: clientgui/sg_DlgPreferences.cpp:431
-msgid "Clear all local preferences listed above and close the dialog"
-msgstr "清除本機所有偏好設定並關閉此視窗"
-
-#: clientgui/sg_DlgPreferences.cpp:609
-#: clientgui/sg_DlgPreferences.cpp:612
-#: clientgui/sg_DlgPreferences.cpp:688
-#: clientgui/sg_DlgPreferences.cpp:692
-#: clientgui/sg_DlgPreferences.cpp:704
-#: clientgui/sg_DlgPreferences.cpp:708
-#: clientgui/sg_DlgPreferences.cpp:851
-#: clientgui/sg_DlgPreferences.cpp:862
-msgid "Anytime"
-msgstr "隨時"
-
-#: clientgui/sg_DlgPreferences.cpp:645
-msgid "100 MB"
-msgstr "100 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:646
-msgid "200 MB"
-msgstr "200 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:647
-msgid "500 MB"
-msgstr "500 MB"
-
-#: clientgui/sg_DlgPreferences.cpp:648
-msgid "1 GB"
-msgstr "1 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:649
-msgid "2 GB"
-msgstr "2 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:650
-msgid "5 GB"
-msgstr "5 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:651
-msgid "10 GB"
-msgstr "10 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:652
-msgid "20 GB"
-msgstr "20 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:653
-msgid "50 GB"
-msgstr "50 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:654
-msgid "100 GB"
-msgstr "100 GB"
-
-#: clientgui/sg_DlgPreferences.cpp:724
-#, c-format
-msgid "%d MB"
-msgstr "%d MB"
-
-#: clientgui/sg_DlgPreferences.cpp:726
-#, c-format
-msgid "%4.2f GB"
-msgstr "%4.2f GB"
-
-#: clientgui/sg_DlgPreferences.cpp:767
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: clientgui/sg_DlgPreferences.cpp:803
-msgid "0 (Run Always)"
-msgstr "0 (持續執行)"
+#: clientgui/sg_DlgPreferences.cpp:187
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
+msgstr "需要更多的偏好設定,請切換至進階模式。"
 
-#: clientgui/sg_DlgPreferences.cpp:806
-#, c-format
-msgid "%d"
-msgstr "%d"
+#: clientgui/sg_DlgPreferences.cpp:289
+msgid "GB of disk space"
+msgstr "GB的硬碟空間"
 
-#: clientgui/sg_DlgPreferences.cpp:953
+#: clientgui/sg_DlgPreferences.cpp:980
 #, c-format
 msgid "%s - Computing Preferences"
 msgstr "%s - 運算偏好設定"
 
-#: clientgui/sg_DlgPreferences.cpp:1033
-msgid "Do you really want to clear all local preferences?\n"
-msgstr "您真的要清除所有本機偏好設定嗎?\n"
+#: clientgui/sg_DlgPreferences.cpp:1061
+msgid "Discard all local preferences and use web-based preferences?"
+msgstr "放棄本機偏好設定改用網站偏好設定?"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:66
-#: clientgui/ViewProjects.cpp:179
 msgid "Update"
 msgstr "更新"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:67
-#: clientgui/ViewProjects.cpp:180
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
-msgstr "回報所有已完成的工作;取得最新的積分與偏好設定資訊且儘可能的取得工作。"
+msgid ""
+"Report all completed tasks, get latest credit, get latest preferences, and "
+"possibly get more tasks."
+msgstr "回報所有已完成的任務;取得最新的積分與偏好設定資訊且儘可能的取得任務。"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:73
 #: clientgui/sg_ProjectCommandPopup.cpp:129
-#: clientgui/ViewProjects.cpp:187
-#: clientgui/ViewProjects.cpp:727
 msgid "Suspend tasks for this project."
-msgstr "暫停此專案的工作。"
+msgstr "暫停此專案的任務。"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:78
 #: clientgui/sg_ProjectCommandPopup.cpp:136
-#: clientgui/ViewProjects.cpp:193
-#: clientgui/ViewProjects.cpp:746
 msgid "No new tasks"
-msgstr "不要新工作"
+msgstr "拒絕新任務"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:79
-#: clientgui/ViewProjects.cpp:194
 msgid "Don't get new tasks for this project."
-msgstr "不要取得新工作給此專案。"
+msgstr "此專案將不會取得新任務。"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:200
 msgid "Reset project"
 msgstr "重新開始專案"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:85
-#: clientgui/ViewProjects.cpp:201
-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 "刪除所有和此專案相關的檔案和工作後取得新的工作。 在重新開始之前您可以先更新專案來回報已完成的工作。"
+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:208
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
-msgstr "從計畫中退出這台電腦。進行中的工作將會遺失。(在退出之前您可以先按一下「更新」來回報已完成的工作。)"
+msgid ""
+"Remove this project.  Tasks in progress will be lost (use 'Update' first to "
+"report any completed tasks)."
+msgstr "移除此專案。進行中的任務將會遺失。(您可以先按一下「更新」來回報已完成的任務。)"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:96
 #: clientgui/sg_TaskCommandPopup.cpp:84
-#: clientgui/ViewProjects.cpp:214
 msgid "Properties"
 msgstr "細節"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:97
-#: clientgui/ViewProjects.cpp:215
 msgid "Show project details."
 msgstr "顯示專案細節"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:126
-#: clientgui/ViewProjects.cpp:723
 msgid "Resume tasks for this project."
-msgstr "繼續此專案的工作。"
+msgstr "繼續此專案的任務。"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:133
-#: clientgui/ViewProjects.cpp:742
 msgid "Allow new tasks"
-msgstr "允許新工作"
+msgstr "允許新任務"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:134
-#: clientgui/ViewProjects.cpp:742
 msgid "Allow fetching new tasks for this project."
-msgstr "允許此專案取得新工作。"
+msgstr "允許此專案取得新任務。"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:137
-#: clientgui/ViewProjects.cpp:746
 msgid "Don't fetch new tasks for this project."
-msgstr "不要取得新工作給此專案。"
+msgstr "此專案將不會取得新任務。"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:229
-#: clientgui/ViewProjects.cpp:443
 #, c-format
 msgid "Are you sure you want to reset project '%s'?"
 msgstr "您確定要重新開始專案「%s」嗎?"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:235
-#: clientgui/ViewProjects.cpp:449
 msgid "Reset Project"
 msgstr "重新開始專案"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:266
-#: clientgui/ViewProjects.cpp:501
 #, c-format
 msgid "Are you sure you want to remove project '%s'?"
 msgstr "您確定要移除「%s」專案嗎?"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:272
-#: clientgui/ViewProjects.cpp:507
 msgid "Remove Project"
 msgstr "移除專案"
 
@@ -3065,7 +2968,11 @@ msgstr "同步"
 
 #: clientgui/sg_ProjectPanel.cpp:74
 msgid "Work done for this project"
-msgstr "已完成該專案工作"
+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"
@@ -3075,7 +2982,6 @@ msgstr "與帳號管理系統同步專案"
 msgid "Select a project to access with the controls below"
 msgstr "選擇一個要管理的專案"
 
-# 88%
 #: clientgui/sg_ProjectPanel.cpp:145
 msgid "Project Web Pages"
 msgstr "專案網站"
@@ -3100,44 +3006,42 @@ msgstr "顯示圖形"
 
 #: clientgui/sg_TaskCommandPopup.cpp:67
 msgid "Show application graphics in a window."
-msgstr "於新視窗中顯示應用程式的圖形。"
+msgstr "於新視窗中顯示程式的圖形。"
 
 #: clientgui/sg_TaskCommandPopup.cpp:73
 msgid "Suspend this task."
-msgstr "暫停此工作。"
+msgstr "已暫停此任務"
 
 #: clientgui/sg_TaskCommandPopup.cpp:78
 msgid "Abort"
-msgstr "中止"
+msgstr "停止"
 
 #: clientgui/sg_TaskCommandPopup.cpp:79
 msgid "Abandon this task. You will get no credit for it."
-msgstr "放棄這個工作。您將不會獲得任何積分。"
+msgstr "放棄此任務。您將不會獲得任何積分。"
 
 #: clientgui/sg_TaskCommandPopup.cpp:85
 msgid "Show task details."
-msgstr "顯示工作細節"
+msgstr "顯示任務細節"
 
 #: clientgui/sg_TaskCommandPopup.cpp:119
 msgid "Resume work for this task."
-msgstr "繼續這個工作的動作。"
+msgstr "繼續此任務。"
 
 #: clientgui/sg_TaskCommandPopup.cpp:123
 msgid "Suspend work for this task."
-msgstr "暫停此工作。"
+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)"
+msgstr "您確定要停止此任務 '%s' 嗎?\n(進度: %.1lf%%,狀態: %s)"
 
 #: clientgui/sg_TaskCommandPopup.cpp:272
 msgid "Abort task"
-msgstr "中止工作"
+msgstr "停止任務"
 
 #: clientgui/sg_TaskPanel.cpp:468
 msgid "You don't have any projects.  Please Add a Project."
@@ -3149,11 +3053,11 @@ msgstr "不可行"
 
 #: clientgui/sg_TaskPanel.cpp:480
 msgid "Tasks:"
-msgstr "工作:"
+msgstr "任務:"
 
 #: clientgui/sg_TaskPanel.cpp:486
 msgid "Select a task to access"
-msgstr "選擇要觀看的工作"
+msgstr "選擇要觀看的任務"
 
 #: clientgui/sg_TaskPanel.cpp:497
 msgid "From:"
@@ -3161,20 +3065,20 @@ msgstr "專案:"
 
 #: clientgui/sg_TaskPanel.cpp:551
 msgid "This task's progress"
-msgstr "本工作的進度"
+msgstr "此任務進度"
 
 #: clientgui/sg_TaskPanel.cpp:569
 msgid "Task Commands"
-msgstr "工作指令"
+msgstr "任務指令"
 
 #: clientgui/sg_TaskPanel.cpp:570
 msgid "Pop up a menu of commands to apply to this task"
-msgstr "跳出一個適用於目前工作的指令選單"
+msgstr "跳出一個適用於目前任務的指令選單"
 
 #: clientgui/sg_TaskPanel.cpp:705
 #, c-format
 msgid "Application: %s"
-msgstr "應用程式: %s"
+msgstr "程式: %s"
 
 #: clientgui/sg_TaskPanel.cpp:728
 #, c-format
@@ -3183,7 +3087,7 @@ msgstr "%.3f%%"
 
 #: clientgui/sg_TaskPanel.cpp:736
 msgid "Application: Not available"
-msgstr "應用程式:不可行"
+msgstr "程式:不可行"
 
 #: clientgui/sg_TaskPanel.cpp:836
 msgid "Not Available"
@@ -3194,7 +3098,6 @@ msgstr "不可行"
 msgid "Elapsed: %s"
 msgstr "執行時間:%s"
 
-# 84%
 #: clientgui/sg_TaskPanel.cpp:865
 #, c-format
 msgid "Remaining (estimated): %s"
@@ -3205,52 +3108,51 @@ msgstr "剩餘時間:%s"
 msgid "Status: %s"
 msgstr "狀態:%s"
 
-#: clientgui/sg_TaskPanel.cpp:1227
+#: clientgui/sg_TaskPanel.cpp:1228
 msgid "Retrieving current status."
 msgstr "取回目前狀態中。"
 
-#: clientgui/sg_TaskPanel.cpp:1233
+#: clientgui/sg_TaskPanel.cpp:1234
 msgid "Downloading work from the server."
-msgstr "正從伺服器下載工作。"
+msgstr "正從伺服器下載任務。"
 
-#: clientgui/sg_TaskPanel.cpp:1238
+#: clientgui/sg_TaskPanel.cpp:1239
 msgid "Processing Suspended:  Running On Batteries."
-msgstr "暫停運算:  正以電池供電。"
+msgstr "處理已暫停: 正以電池供電"
 
-#: clientgui/sg_TaskPanel.cpp:1240
+#: clientgui/sg_TaskPanel.cpp:1241
 msgid "Processing Suspended:  User Active."
-msgstr "暫停運算:  使用者正在操作。"
+msgstr "處理已暫停: 使用者正在操作"
 
-#: clientgui/sg_TaskPanel.cpp:1242
+#: clientgui/sg_TaskPanel.cpp:1243
 msgid "Processing Suspended:  User paused processing."
-msgstr "暫停運算:  使用者暫停運算。"
+msgstr "處理已暫停: 被使用者暫停"
 
-#: clientgui/sg_TaskPanel.cpp:1244
+#: clientgui/sg_TaskPanel.cpp:1245
 msgid "Processing Suspended:  Time of Day."
-msgstr "暫停運算:  不在設定時間內。"
+msgstr "處理已暫停: 不在設定時間內"
 
-#: clientgui/sg_TaskPanel.cpp:1246
+#: clientgui/sg_TaskPanel.cpp:1247
 msgid "Processing Suspended:  Benchmarks Running."
-msgstr "暫停運算:  正在執行效能測試。"
+msgstr "處理已暫停: 正在執行效能測試"
 
-#: clientgui/sg_TaskPanel.cpp:1248
+#: clientgui/sg_TaskPanel.cpp:1249
 msgid "Processing Suspended."
-msgstr "暫停運算。"
+msgstr "已暫停處理。"
 
-#: clientgui/sg_TaskPanel.cpp:1252
+#: clientgui/sg_TaskPanel.cpp:1253
 msgid "Waiting to contact project servers."
 msgstr "正在等待連到專案伺服器。"
 
-#: clientgui/sg_TaskPanel.cpp:1256
-#: clientgui/sg_TaskPanel.cpp:1265
+#: clientgui/sg_TaskPanel.cpp:1257 clientgui/sg_TaskPanel.cpp:1266
 msgid "Retrieving current status"
 msgstr "取回目前狀態中"
 
-#: clientgui/sg_TaskPanel.cpp:1260
+#: clientgui/sg_TaskPanel.cpp:1261
 msgid "No work available to process"
-msgstr "無工作可用"
+msgstr "無任務可執行"
 
-#: clientgui/sg_TaskPanel.cpp:1262
+#: clientgui/sg_TaskPanel.cpp:1263
 msgid "Unable to connect to the core client"
 msgstr "無法連到核心用戶端"
 
@@ -3279,10 +3181,7 @@ msgid ""
 "The project is temporarily unavailable.\n"
 "\n"
 "Please try again later."
-msgstr ""
-"此專案暫時無法使用。\n"
-"\n"
-"請稍後重試。"
+msgstr "此專案暫時無法使用。\n\n請稍後重試。"
 
 #: clientgui/UnavailablePage.cpp:190
 msgid "Account manager temporarily unavailable"
@@ -3293,10 +3192,7 @@ msgid ""
 "The account manager is temporarily unavailable.\n"
 "\n"
 "Please try again later."
-msgstr ""
-"此帳號管理員暫時無法使用。\n"
-"\n"
-"請稍後重試。"
+msgstr "此帳號管理員暫時無法使用。\n\n請稍後重試。"
 
 #: clientgui/ValidateAccountKey.cpp:68
 msgid "Please specify an account key to continue."
@@ -3306,8 +3202,7 @@ msgstr "請輸入帳號金鑰以繼續。"
 msgid "Invalid Account Key; please enter a valid Account Key"
 msgstr "無效的帳號金鑰;請輸入有效的帳號金鑰"
 
-#: clientgui/ValidateAccountKey.cpp:82
-#: clientgui/ValidateEmailAddress.cpp:86
+#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
 msgid "Validation conflict"
 msgstr "驗證衝突"
 
@@ -3328,34 +3223,23 @@ msgid ""
 "Please specify a URL.\n"
 "For example:\n"
 "http://www.example.com/"
-msgstr ""
-"請輸入網址。\n"
-"例如:\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
+#: clientgui/ValidateURL.cpp:83 clientgui/ValidateURL.cpp:87
+#: clientgui/ValidateURL.cpp:91 clientgui/ValidateURL.cpp:103
+#: clientgui/ValidateURL.cpp:107 clientgui/ValidateURL.cpp:110
 msgid "Invalid URL"
 msgstr "無效網址"
 
-#: clientgui/ValidateURL.cpp:84
-#: clientgui/ValidateURL.cpp:88
+#: clientgui/ValidateURL.cpp:84 clientgui/ValidateURL.cpp:88
 #: clientgui/ValidateURL.cpp:92
 msgid ""
 "Please specify a valid URL.\n"
 "For example:\n"
 "http://boincproject.example.com"
-msgstr ""
-"請輸入有效的網址。\n"
-"例如:\n"
-"http://boincproject.example.com"
+msgstr "請輸入有效的網址。\n例如:\nhttp://boincproject.example.com"
 
-#: clientgui/ValidateURL.cpp:104
-#: clientgui/ValidateURL.cpp:108
+#: clientgui/ValidateURL.cpp:104 clientgui/ValidateURL.cpp:108
 #, c-format
 msgid "'%s' does not contain a valid host name."
 msgstr "「%s」不是有效的主機名稱。"
@@ -3366,7 +3250,6 @@ msgid "'%s' does not contain a valid path."
 msgstr "「%s」不是有效的路徑。"
 
 #: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewProjects.cpp:175
 msgid "Commands"
 msgstr "指令"
 
@@ -3378,13 +3261,11 @@ msgstr "複製所有訊息"
 msgid "Copy selected messages"
 msgstr "複製選取的訊息"
 
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
+#: clientgui/ViewMessages.cpp:106 clientgui/ViewMessages.cpp:502
 msgid "Show only this project"
 msgstr "只顯示本專案"
 
-#: clientgui/ViewMessages.cpp:107
-#: clientgui/ViewMessages.cpp:503
+#: clientgui/ViewMessages.cpp:107 clientgui/ViewMessages.cpp:503
 msgid "Show only the messages for the selected project."
 msgstr "僅顯示所選專案的訊息。"
 
@@ -3412,119 +3293,120 @@ msgstr "顯示所有訊息"
 msgid "Show messages for all projects."
 msgstr "顯示所有專案的訊息"
 
-#: clientgui/ViewProjects.cpp:225
+#: clientgui/ViewProjects.cpp:246 clientgui/ViewStatistics.cpp:426
 msgid "Account"
 msgstr "帳號"
 
-#: clientgui/ViewProjects.cpp:227
+#: clientgui/ViewProjects.cpp:248
 msgid "Work done"
 msgstr "總積分"
 
-#: clientgui/ViewProjects.cpp:228
+#: clientgui/ViewProjects.cpp:249
 msgid "Avg. work done"
 msgstr "近期平均積分"
 
-#: clientgui/ViewProjects.cpp:230
+#: clientgui/ViewProjects.cpp:251 clientgui/ViewTransfers.cpp:215
+#: clientgui/ViewWork.cpp:262
 msgid "Status"
 msgstr "狀態"
 
-#: clientgui/ViewProjects.cpp:255
+#: clientgui/ViewProjects.cpp:330
 msgid "Projects"
 msgstr "專案"
 
-#: clientgui/ViewProjects.cpp:307
+#: clientgui/ViewProjects.cpp:382
 msgid "Updating project..."
 msgstr "正在更新專案..."
 
-#: clientgui/ViewProjects.cpp:349
+#: clientgui/ViewProjects.cpp:424
 msgid "Resuming project..."
 msgstr "正在繼續專案..."
 
-#: clientgui/ViewProjects.cpp:353
+#: clientgui/ViewProjects.cpp:428
 msgid "Suspending project..."
 msgstr "正在暫停專案..."
 
-#: clientgui/ViewProjects.cpp:390
+#: clientgui/ViewProjects.cpp:465
 msgid "Telling project to allow additional task downloads..."
-msgstr "通知專案可以下載額外的工作..."
+msgstr "通知專案可以下載額外任務..."
 
-#: clientgui/ViewProjects.cpp:394
+#: clientgui/ViewProjects.cpp:469
 msgid "Telling project to not fetch any additional tasks..."
-msgstr "通知專案不要取得額外的工作..."
+msgstr "通知專案不要取得額外任務..."
 
-#: clientgui/ViewProjects.cpp:430
+#: clientgui/ViewProjects.cpp:505
 msgid "Resetting project..."
 msgstr "正在重新設定專案..."
 
-#: clientgui/ViewProjects.cpp:488
+#: clientgui/ViewProjects.cpp:563
 msgid "Removing project..."
 msgstr "正在移除專案..."
 
-#: clientgui/ViewProjects.cpp:548
+#: clientgui/ViewProjects.cpp:623 clientgui/ViewWork.cpp:686
 msgid "Launching browser..."
 msgstr "啟動瀏覽器..."
 
-#: clientgui/ViewProjects.cpp:1063
+#: clientgui/ViewProjects.cpp:1140
 msgid "Requested by user"
 msgstr "用戶的請求"
 
-#: clientgui/ViewProjects.cpp:1064
+#: clientgui/ViewProjects.cpp:1141
 msgid "To fetch work"
-msgstr "取得工作"
+msgstr "取得任務"
 
-#: clientgui/ViewProjects.cpp:1065
+#: clientgui/ViewProjects.cpp:1142
 msgid "To report completed tasks"
 msgstr "上傳已完成的任務"
 
-#: clientgui/ViewProjects.cpp:1066
+#: clientgui/ViewProjects.cpp:1143
 msgid "To send trickle-up message"
 msgstr "發送上傳訊息"
 
-#: clientgui/ViewProjects.cpp:1067
+#: clientgui/ViewProjects.cpp:1144
 msgid "Requested by account manager"
 msgstr "帳號管理服務的請求"
 
-#: clientgui/ViewProjects.cpp:1068
+#: clientgui/ViewProjects.cpp:1145
 msgid "Project initialization"
 msgstr "專案初始化"
 
-#: clientgui/ViewProjects.cpp:1069
+#: clientgui/ViewProjects.cpp:1146
 msgid "Requested by project"
 msgstr "專案的請求"
 
-#: clientgui/ViewProjects.cpp:1070
+#: clientgui/ViewProjects.cpp:1147
 msgid "Unknown reason"
 msgstr "未知原因"
 
-#: clientgui/ViewProjects.cpp:1084
+#: clientgui/ViewProjects.cpp:1161
 msgid "Suspended by user"
 msgstr "被使用者暫停"
 
-#: clientgui/ViewProjects.cpp:1087
+#: clientgui/ViewProjects.cpp:1164
 msgid "Won't get new tasks"
-msgstr "無法取得新工作"
+msgstr "無法取得新任務"
 
-#: clientgui/ViewProjects.cpp:1090
+#: clientgui/ViewProjects.cpp:1167
 msgid "Project ended - OK to remove"
 msgstr "專案已結束 - 按 OK 移除"
 
-#: clientgui/ViewProjects.cpp:1093
+#: clientgui/ViewProjects.cpp:1170
 msgid "Will remove when tasks done"
-msgstr "工作完成後移除"
+msgstr "任務完成後移除"
 
-#: clientgui/ViewProjects.cpp:1096
+#: clientgui/ViewProjects.cpp:1173
 msgid "Scheduler request pending"
 msgstr "排程器請求中"
 
-#: clientgui/ViewProjects.cpp:1102
+#: clientgui/ViewProjects.cpp:1179
 msgid "Scheduler request in progress"
 msgstr "排程器請求進行中"
 
-#: clientgui/ViewProjects.cpp:1105
+#: clientgui/ViewProjects.cpp:1182
 msgid "Trickle up message pending"
 msgstr "等待上傳訊息中"
 
-#: clientgui/ViewProjects.cpp:1111
+#: clientgui/ViewProjects.cpp:1188
 msgid "Communication deferred "
 msgstr "已擱置通訊 "
 
@@ -3536,31 +3418,27 @@ msgstr "使用的硬碟空間"
 msgid "Disk usage by BOINC projects"
 msgstr "BOINC 專案所用的磁碟空間"
 
-#: clientgui/ViewResources.cpp:116
-msgid "Disk"
-msgstr "硬碟空間"
-
 #: clientgui/ViewResources.cpp:225
 msgid "no projects: 0 bytes used"
 msgstr "沒有任何的專案:硬碟使用量為零"
 
-#: clientgui/ViewResources.cpp:262
+#: clientgui/ViewResources.cpp:259
 msgid "used by BOINC: "
 msgstr "BOINC 使用:"
 
-#: clientgui/ViewResources.cpp:272
+#: clientgui/ViewResources.cpp:269
 msgid "free, available to BOINC: "
 msgstr "BOINC 可使用的閒置空間:"
 
-#: clientgui/ViewResources.cpp:282
+#: clientgui/ViewResources.cpp:279
 msgid "free, not available to BOINC: "
 msgstr "BOINC 不可使用的閒置空間:"
 
-#: clientgui/ViewResources.cpp:292
+#: clientgui/ViewResources.cpp:289
 msgid "free: "
 msgstr "閒置空間:"
 
-#: clientgui/ViewResources.cpp:302
+#: clientgui/ViewResources.cpp:299
 msgid "used by other programs: "
 msgstr "其他程式使用:"
 
@@ -3633,13 +3511,11 @@ msgstr "下一個專案 (&N) >"
 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 "用整個區域用來顯示統計圖"
 
@@ -3683,16 +3559,11 @@ msgstr "顯示所有專案於同一統計圖"
 msgid "Statistics"
 msgstr "統計"
 
-#: clientgui/ViewStatistics.cpp:2077
-#: clientgui/ViewStatistics.cpp:2098
-#: clientgui/ViewStatistics.cpp:2119
-#: clientgui/ViewStatistics.cpp:2141
-#: clientgui/ViewStatistics.cpp:2162
-#: clientgui/ViewStatistics.cpp:2183
-#: clientgui/ViewStatistics.cpp:2204
-#: clientgui/ViewStatistics.cpp:2225
-#: clientgui/ViewStatistics.cpp:2246
-#: clientgui/ViewStatistics.cpp:2270
+#: clientgui/ViewStatistics.cpp:2077 clientgui/ViewStatistics.cpp:2098
+#: clientgui/ViewStatistics.cpp:2119 clientgui/ViewStatistics.cpp:2141
+#: clientgui/ViewStatistics.cpp:2162 clientgui/ViewStatistics.cpp:2183
+#: clientgui/ViewStatistics.cpp:2204 clientgui/ViewStatistics.cpp:2225
+#: clientgui/ViewStatistics.cpp:2246 clientgui/ViewStatistics.cpp:2270
 msgid "Updating charts..."
 msgstr "更新圖表中..."
 
@@ -3704,201 +3575,187 @@ msgstr "顯示專案列表"
 msgid "Uses smaller area for graphs"
 msgstr "用將較小的區域用來顯示統計圖"
 
-#: clientgui/ViewTransfers.cpp:169
+#: clientgui/ViewTransfers.cpp:187
 msgid "Retry Now"
 msgstr "立即重試"
 
-#: clientgui/ViewTransfers.cpp:170
+#: clientgui/ViewTransfers.cpp:188
 msgid "Retry the file transfer now"
-msgstr "立即重試檔案傳送"
+msgstr "立即重試檔案傳輸"
 
-#: clientgui/ViewTransfers.cpp:176
+#: clientgui/ViewTransfers.cpp:194
 msgid "Abort Transfer"
-msgstr "中止檔案傳送"
+msgstr "停止檔案傳輸"
 
-#: clientgui/ViewTransfers.cpp:177
+#: clientgui/ViewTransfers.cpp:195
 msgid "Abort this file transfer.  You won't get credit for the task."
-msgstr "中止檔案傳送。此工作將不會獲得任何積分。"
+msgstr "停止檔案傳輸。此任務將不會獲得任何積分。"
 
-#: clientgui/ViewTransfers.cpp:188
+#: clientgui/ViewTransfers.cpp:210
 msgid "File"
 msgstr "檔案"
 
-#: clientgui/ViewTransfers.cpp:189
-#: clientgui/ViewWork.cpp:238
+#: clientgui/ViewTransfers.cpp:211 clientgui/ViewWork.cpp:261
 msgid "Progress"
 msgstr "進度"
 
-#: clientgui/ViewTransfers.cpp:190
+#: clientgui/ViewTransfers.cpp:212
 msgid "Size"
 msgstr "大小"
 
-#: clientgui/ViewTransfers.cpp:191
-msgid "Elapsed Time"
-msgstr "剩餘時間"
+#: clientgui/ViewTransfers.cpp:213 clientgui/ViewWork.cpp:263
+msgid "Elapsed"
+msgstr "執行時間"
 
-#: clientgui/ViewTransfers.cpp:192
+#: clientgui/ViewTransfers.cpp:214
 msgid "Speed"
 msgstr "速度"
 
-#: clientgui/ViewTransfers.cpp:218
+#: clientgui/ViewTransfers.cpp:295
 msgid "Transfers"
-msgstr "傳送"
+msgstr "傳輸"
 
-#: clientgui/ViewTransfers.cpp:285
+#: clientgui/ViewTransfers.cpp:362
 msgid "Network activity is suspended - "
-msgstr "網路活動已暫停 - "
+msgstr "網路活動已暫停 -"
 
-#: clientgui/ViewTransfers.cpp:287
+#: clientgui/ViewTransfers.cpp:364
 msgid ""
 ".\n"
 "You can enable it using the Activity menu."
-msgstr ""
-".\n"
-"您可以在 活動 選單中啟用他。"
+msgstr ".\n您可以在 活動 選單中啟用他。"
 
-#: clientgui/ViewTransfers.cpp:290
+#: clientgui/ViewTransfers.cpp:367
 msgid "BOINC"
 msgstr "BOINC"
 
-#: clientgui/ViewTransfers.cpp:297
+#: clientgui/ViewTransfers.cpp:374
 msgid "Retrying transfer now..."
-msgstr "立即重試檔案傳送..."
+msgstr "立即重試檔案傳輸..."
 
-#: clientgui/ViewTransfers.cpp:335
+#: clientgui/ViewTransfers.cpp:412
 msgid "Aborting transfer..."
-msgstr "中止檔案傳送中..."
+msgstr "停止檔案傳輸中..."
 
-#: clientgui/ViewTransfers.cpp:348
+#: 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"
-"提示: 終止傳輸會使此工作無效且不會收到任何積分。"
+msgstr "您確定要停止「%s」 的檔案傳輸嗎?\n提示: 終止傳輸會使此任務無效且不會收到任何積分。"
 
-#: clientgui/ViewTransfers.cpp:354
+#: clientgui/ViewTransfers.cpp:431
 msgid "Abort File Transfer"
-msgstr "中止檔案傳送"
+msgstr "停止檔案傳輸"
 
-#: clientgui/ViewTransfers.cpp:785
+#: clientgui/ViewTransfers.cpp:864
 msgid "Upload"
 msgstr "上傳"
 
-#: clientgui/ViewTransfers.cpp:785
+#: clientgui/ViewTransfers.cpp:864
 msgid "Download"
 msgstr "下載"
 
-#: clientgui/ViewTransfers.cpp:789
+#: clientgui/ViewTransfers.cpp:868
 msgid "retry in "
 msgstr "稍後重試於"
 
-#: clientgui/ViewTransfers.cpp:791
+#: clientgui/ViewTransfers.cpp:870
 msgid "failed"
 msgstr "失敗"
 
-#: clientgui/ViewTransfers.cpp:794
+#: clientgui/ViewTransfers.cpp:873
 msgid "suspended"
-msgstr "暫停"
+msgstr "已暫停"
 
-#: clientgui/ViewTransfers.cpp:799
+#: clientgui/ViewTransfers.cpp:878
 msgid "active"
 msgstr "處理中"
 
-#: clientgui/ViewTransfers.cpp:801
+#: clientgui/ViewTransfers.cpp:880
 msgid "pending"
 msgstr "等待中"
 
-#: clientgui/ViewTransfers.cpp:808
+#: clientgui/ViewTransfers.cpp:887
 msgid " (project backoff: "
 msgstr " (專案延後: "
 
-#: clientgui/ViewWork.cpp:192
-#: clientgui/ViewWork.cpp:782
+#: clientgui/ViewWork.cpp:211 clientgui/ViewWork.cpp:864
 msgid "Show active tasks"
-msgstr "顯示運行中"
+msgstr "顯示執行中"
 
-#: clientgui/ViewWork.cpp:193
-#: clientgui/ViewWork.cpp:783
+#: clientgui/ViewWork.cpp:212 clientgui/ViewWork.cpp:865
 msgid "Show only active tasks."
-msgstr "只顯示運行中的工作。"
+msgstr "只顯示執行中的任務。"
 
-#: clientgui/ViewWork.cpp:206
+#: clientgui/ViewWork.cpp:225
 msgid "Show VM Console"
 msgstr "顯示此主機總計"
 
-#: clientgui/ViewWork.cpp:207
+#: clientgui/ViewWork.cpp:226
 msgid "Show VM Console in a window."
-msgstr "於新視窗中顯示應用程式的圖形。"
+msgstr "於新視窗中顯示程式的圖形。"
 
-#: clientgui/ViewWork.cpp:214
+#: clientgui/ViewWork.cpp:233
 msgid "Suspend work for this result."
-msgstr "暫停此工作。"
-
-#: clientgui/ViewWork.cpp:221
-msgid "Abandon work on the result. You will get no credit for it."
-msgstr "放棄這個結果的工作。您將不會取得任何積分。"
+msgstr "暫停此任務。"
 
 #: clientgui/ViewWork.cpp:240
-msgid "Elapsed"
-msgstr "執行時間"
+msgid "Abandon work on the result. You will get no credit for it."
+msgstr "放棄此任務。您將不會取得任何積分。"
 
-#: clientgui/ViewWork.cpp:241
+#: clientgui/ViewWork.cpp:264
 msgid "Remaining (estimated)"
 msgstr "剩餘時間 (預估)"
 
-#: clientgui/ViewWork.cpp:242
+#: clientgui/ViewWork.cpp:265
 msgid "Deadline"
 msgstr "上傳期限"
 
-#: clientgui/ViewWork.cpp:269
+#: clientgui/ViewWork.cpp:351
 msgid "Tasks"
-msgstr "工作"
+msgstr "任務"
 
-#: clientgui/ViewWork.cpp:362
+#: clientgui/ViewWork.cpp:444
 msgid "Resuming task..."
-msgstr "繼續工作中..."
+msgstr "繼續任務中..."
 
-#: clientgui/ViewWork.cpp:365
+#: clientgui/ViewWork.cpp:447
 msgid "Suspending task..."
-msgstr "暫停工作中..."
+msgstr "暫停任務中..."
 
-#: clientgui/ViewWork.cpp:394
+#: clientgui/ViewWork.cpp:476
 msgid "Showing graphics for task..."
-msgstr "顯示此工作圖形..."
+msgstr "顯示此任務圖形..."
 
-#: clientgui/ViewWork.cpp:431
+#: clientgui/ViewWork.cpp:513
 msgid "Showing VM console for task..."
-msgstr "顯示此工作圖形..."
+msgstr "顯示此任務圖形..."
 
-#: clientgui/ViewWork.cpp:484
+#: 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)"
+msgstr "您確定要停止這個任務「%s」嗎?\n(進度: %s,狀態: %s)"
 
-#: clientgui/ViewWork.cpp:490
+#: clientgui/ViewWork.cpp:572
 #, c-format
 msgid "Are you sure you want to abort these %d tasks?"
-msgstr "您確定您要中止 %d 這個工作嗎?"
+msgstr "您確定您要停止 %d 這個任務嗎?"
 
-# 100% !
-#: clientgui/ViewWork.cpp:504
+#: clientgui/ViewWork.cpp:586
 msgid "Aborting task..."
-msgstr "中止檔案傳送中..."
+msgstr "停止任務中..."
 
-#: clientgui/ViewWork.cpp:776
+#: clientgui/ViewWork.cpp:858
 msgid "Show all tasks"
-msgstr "顯示所有工作"
+msgstr "顯示所有任務"
 
-#: clientgui/ViewWork.cpp:777
+#: clientgui/ViewWork.cpp:859
 msgid "Show all tasks."
-msgstr "顯示所有工作。"
+msgstr "顯示所有任務。"
 
 #: clientgui/WelcomePage.cpp:284
 msgid "Add project or account manager"
@@ -3916,10 +3773,7 @@ msgid ""
 "\n"
 "Projects added via this wizard will not be\n"
 "listed on or managed via %s."
-msgstr ""
-"可以的話,加入 %s 網站的專案。\n"
-"\n"
-"透過精靈加入的專案可能不會於 %s 出現或管理。"
+msgstr "可以的話,加入 %s 網站的專案。\n\n透過精靈加入的專案可能不會於 %s 出現或管理。"
 
 #: clientgui/WelcomePage.cpp:313
 msgid ""
@@ -3928,11 +3782,7 @@ msgid ""
 "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"
-"您可以直接加入這些專案,或是利用\"帳戶管理服務\"網站來選擇專案。"
+msgstr "目前有超過 30 個基於 BOINC 的專案,\n其研究內容涉及多個科學領域,\n您可以依照您自己的喜好加入這些專案。\n您可以直接加入這些專案,或是利用\"帳戶管理服務\"網站來選擇專案。"
 
 #: clientgui/WelcomePage.cpp:325
 msgid ""
@@ -3947,17 +3797,7 @@ msgid ""
 "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"
-"而其他大多由研究人員或組織來運行和管理。\n"
-"BOINC 軟體可以在您的空閒運算能力之間的自動分配專案。\n"
-"\n"
-"另外,如果您已經註冊 BOINC 的帳號管理服務,\n"
-"您能用它來選擇想支援哪些專案。\n"
-"\n"
-"你想選擇哪種類型:\n"
+msgstr "您已選擇新增一個新專案或更改專案來做出貢獻。\n\n這些專案其中是由 World Community Grid 運行和管理的,\n而其他大多由研究人員或組織來運行和管理。\nBOINC 軟體可以在您的空閒運算能力之間的自動分配專案。\n\n另外,如果您已經註冊 BOINC 的帳號管理服務,\n您能用它來選擇想支援哪些專案。\n\n你想選擇哪種類型:\n"
 
 #: clientgui/WelcomePage.cpp:339
 msgid "Use a BOINC Account Manager"
@@ -3971,16 +3811,15 @@ msgstr "新增或修改 World Community Grid 專案"
 msgid "Add projects run by other researchers or organizations"
 msgstr "新增其它研究組織的專案"
 
-#: clientgui/WizardAttach.cpp:673
+#: clientgui/WizardAttach.cpp:560
 msgid "Do you really want to cancel?"
 msgstr "您真的要取消嗎?"
 
-#: clientgui/WizardAttach.cpp:674
+#: clientgui/WizardAttach.cpp:561
 msgid "Question"
 msgstr "問題"
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
+#: clientgui/wizardex.cpp:377 clientgui/wizardex.cpp:553
 msgid "&Next >"
 msgstr "下一步 (&N) >"
 
@@ -3994,7 +3833,7 @@ msgstr "完成 (&F)"
 
 #: clientgui/common/wxPieCtrl.cpp:64
 msgid "Pie Ctrl"
-msgstr "Pie Ctrl"
+msgstr "圖表控制"
 
 #: clientgui/mac/Mac_GUI.cpp:35
 msgid "Services"
@@ -4016,638 +3855,12 @@ msgstr "顯示全部"
 #: clientgui/mac/Mac_GUI.cpp:39
 #, c-format
 msgid "Quit %s"
-msgstr "離該 %s"
-
-#: clientgui/DlgAdvPreferences.h:30
-msgid "specify work start and stop hours in format HH:MM-HH:MM"
-msgstr "用 HH:MM-HH:MM 的格式指定工作運行的開始及結束時間"
-
-#: clientgui/DlgAdvPreferences.h:31
-msgid "specify network usage start and stop hours in format HH:MM-HH:MM"
-msgstr "用 HH:MM-HH:MM 的格式指定網路使用的開始及結束時間"
-
-# 98%
-#~ msgid ""
-#~ "(C) 2003-2013 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2013 美國加州大學柏克萊分校\n"
-#~ "保留所有權利。"
-#, c-format
-#~ msgid "%s - Preferences"
-#~ msgstr "%s - 偏好設定"
-
-#, no-c-format
-#~ msgid "% of the processors (0 means ignore this setting)"
-#~ msgstr "% (0表示忽略此設置)"
-
-#, no-c-format
-#~ msgid "% CPU time"
-#~ msgstr "% CPU 時間"
-#~ msgid "KBytes/sec."
-#~ msgstr "KB/秒"
-#~ msgid "Mbytes"
-#~ msgstr "Mbytes"
-#~ msgid "every"
-#~ msgstr "每"
-#~ msgid "days"
-#~ msgstr "天"
-#~ msgid "Gigabytes disk space"
-#~ msgstr "硬碟空間 (GB)"
-#~ msgid "Running, high priority"
-#~ msgstr "執行中,高優先權"
-#~ msgid " (Scheduler wait: "
-#~ msgstr " (排程器等待: "
-#~ msgid " (Scheduler wait)"
-#~ msgstr " (排程器等待)"
-#~ msgid " (Waiting for network access)"
-#~ msgstr " (正等待網存取)"
-#~ msgid "Preferences…"
-#~ msgstr "偏好設定..."
-#~ msgid "I do not agree with the terms of use."
-#~ msgstr "我不同意使用條款"
-#~ msgid "Click Clear to restore web-based settings."
-#~ msgstr "點選 清除 來更新成網路上的設定"
-#~ msgid "For additional settings, select Computing Preferences in "
-#~ msgstr "更多的偏好設定,請切換至"
-#~ msgid "the Advanced View."
-#~ msgstr "進階模式。"
-#~ msgid "Workunit name"
-#~ msgstr "工作名稱"
-#~ msgid "invalid float"
-#~ msgstr "無效的浮點數"
-#~ msgid "Display the advanced (accessible) graphical interface."
-#~ msgstr "顯示精簡 BOINC 圖形介面。"
-#~ msgid "Paused: Other work running"
-#~ msgstr "已暫停: 正運行其他工作"
-#~ msgid "Paused: User initiated.  Click 'Resume' to continue"
-#~ msgstr "已暫停: 由使用者暫止。按「繼續」繼續工作"
-#~ msgid "Paused: User active"
-#~ msgstr "已暫停: 使用者正在操作"
-#~ msgid "Paused: Computer on battery"
-#~ msgstr "已暫停: 電腦以電池供電"
-#~ msgid "Paused: Time of Day"
-#~ msgstr "已暫停: 不在設定時間內"
-#~ msgid "Paused: Benchmarks running"
-#~ msgstr "已暫停: 正在執行效能測試"
-#~ msgid "Paused"
-#~ msgstr "已暫停"
-#~ msgid "Paused: Application start delayed"
-#~ msgstr "暫止:應用程式延遲起動"
-#~ msgid "Click to show project graphics"
-#~ msgstr "按一下顯示專案圖形"
-#~ msgid "Open a window to view messages"
-#~ msgstr "開啟視窗以檢視訊息"
-#~ msgid "Stop all activity"
-#~ msgstr "停止所有活動"
-#~ msgid "Resume activity"
-#~ msgstr "繼續活動"
-#~ msgid "Open a window to set your preferences"
-#~ msgstr "開新視窗設置你的偏好設定"
-#~ msgid "Switch to the BOINC advanced view"
-#~ msgstr "切換到 BOINC 進階介面"
-#~ msgid "My Projects:"
-#~ msgstr "我的專案:"
-
-#, c-format
-#~ msgid "%s. Work done by %s: %0.2f"
-#~ msgstr "%s,%s 已完成: %0.2f"
-
-#, c-format
-#~ msgid "%.1lf"
-#~ msgstr "%.1lf"
-
-#, c-format
-#~ msgid "%d hr %d min %d sec"
-#~ msgstr "%d 時 %d 分 %d 秒"
-#~ msgid "Are you sure you want to display graphics on a remote machine?"
-#~ msgstr "您確定要顯示遠端電腦的圖形嗎?"
-#~ msgid "Application: "
-#~ msgstr "應用程式:"
-#~ msgid "Time Remaining: "
-#~ msgstr "剩餘時間:"
-#~ msgid "Elapsed Time: "
-#~ msgstr "執行時間:"
-#~ msgid "Account manager website"
-#~ msgstr "帳號管理服務網站"
-#~ msgid "Account Manager &URL:"
-#~ msgstr "帳號管理服務網址 (&U):"
-
-#, c-format
-#~ msgid "%s &website"
-#~ msgstr "%s 網站 (&W)"
-#~ msgid "Notice List"
-#~ msgstr "訊息列表"
-
-#, c-format
-#~ msgid "%s; received on %s"
-#~ msgstr "%s; 來至於 %s"
-
-#, c-format
-#~ msgid "%s; received from %s; on %s"
-#~ msgstr "%s; 來至於 %s; 時間 %s"
-#~ msgid "Click"
-#~ msgstr "點選"
-#~ msgid "Project List"
-#~ msgstr "專案列表"
-#~ msgid "Nvidia GPU Supported"
-#~ msgstr "支援 Nvidia GPU"
-#~ msgid "ATI GPU Supported"
-#~ msgstr "支援 ATI GPU"
-#~ msgid "Project Website"
-#~ msgstr "專案網頁"
-#~ msgid "One or more items failed to load from the Internet."
-#~ msgstr "無法從網路讀取一個或多個項目"
-
-# 88%
-#~ msgid "Retry now"
-#~ msgstr "立即重試"
-#~ msgid "10%"
-#~ msgstr "10%"
-#~ msgid "20%"
-#~ msgstr "20%"
-#~ msgid "30%"
-#~ msgstr "30%"
-#~ msgid "40%"
-#~ msgstr "40%"
-#~ msgid "50%"
-#~ msgstr "50%"
-#~ msgid "60%"
-#~ msgstr "60%"
-#~ msgid "70%"
-#~ msgstr "70%"
-#~ msgid "80%"
-#~ msgstr "80%"
-#~ msgid "90%"
-#~ msgstr "90%"
-#~ msgid "100%"
-#~ msgstr "100%"
-#~ msgid "1"
-#~ msgstr "1"
-#~ msgid "3"
-#~ msgstr "3"
-#~ msgid "5"
-#~ msgstr "5"
-#~ msgid "10"
-#~ msgstr "10"
-#~ msgid "15"
-#~ msgstr "15"
-#~ msgid "30"
-#~ msgstr "30"
-#~ msgid "60"
-#~ msgstr "60"
-#, c-format
-#~ msgid "Pop up a menu of websites for project %s"
-#~ msgstr "跳出一個 %s 專案的網頁選單"
-#~ msgid ""
-#~ "for accessibility support, please select advanced from the view menu or type "
-#~ "command shift a"
-#~ msgstr "要使用輔助功能,請從選項中選擇進階或者輸入shift a 指令"
-#~ msgid "This panel contains graphs showing user totals for projects"
-#~ msgstr "該頁面會顯示用戶在各專案的統計圖"
-#~ msgid "list headers"
-#~ msgstr "列表頭"
-#~ msgid "list of events"
-#~ msgstr "事件列表"
-#~ msgid "list of events is empty"
-#~ msgstr "事件列表為空"
-
-#, c-format
-#~ msgid "list of %s"
-#~ msgstr "%s 列表"
-
-#, c-format
-#~ msgid "list of %s is empty"
-#~ msgstr "%s 列表為空"
-
-#, c-format
-#~ msgid "; current sort column %d of %d; descending order; "
-#~ msgstr "; 排序目前列 %d / %d; 降冪排序; "
-
-#, c-format
-#~ msgid "; current sort column %d of %d; ascending order; "
-#~ msgstr "; 排序目前列 %d / %d; 生冪排序; "
-
-#, c-format
-#~ msgid "; column %d of %d; "
-#~ msgstr "; 第 %d 列(共 %d 列); "
-#~ msgid "list is empty"
-#~ msgstr "列表為空"
-
-#, c-format
-#~ msgid "; row %d; "
-#~ msgstr "; 第 %d 行; "
-
-#, c-format
-#~ msgid "; selected row %d of %d; "
-#~ msgstr "; 選取 %d 行(共 %d 行); "
-
-#, c-format
-#~ msgid "; selected row %d ; "
-#~ msgstr "; 選取 %d 行; "
-
-#, c-format
-#~ msgid "; row %d of %d; "
-#~ msgstr "; 第 %d 行(共 %d 行); "
-#~ msgid "blank"
-#~ msgstr "空白"
-#~ msgid "list of projects or account managers"
-#~ msgstr "專案或帳號管理服務列表"
-
-#, c-format
-#~ msgid "selected row %d of %d; "
-#~ msgstr "選取 %d 行(共 %d 行); "
-
-#, c-format
-#~ msgid "row %d of %d; "
-#~ msgstr "第 %d 行(共 %d 行); "
-#~ msgid "The minimum username length for this project is 1. Please enter a different username."
-#~ msgstr "專案限制最短的名稱長度為1。請輸入符合要求的使用者名稱。"
-#~ msgid "The minimum username length for this account manager is 1. Please enter a different username."
-#~ msgstr "帳號管理服務限制最短的名稱長度為1。請輸入符合要求的使用者名稱。"
-#~ msgid "The minimum email address length for this project is 1. Please enter a different email address."
-#~ msgstr "專案限制最短的郵件地址長度為1。請輸入符合要求的電子郵件地址。"
-#~ msgid "The minimum email address length for this account manager is 1. Please enter a different email address."
-#~ msgstr "帳號管理服務限制最短的郵件地址長度為1。請輸入符合要求的電子郵件地址。"
-
-#, c-format
-#~ msgid "The minimum password length for this project is %d. Please enter a different password."
-#~ msgstr "此專案要求的最小密碼長度為 %d,請輸入符合要求的密碼。"
-
-#, c-format
-#~ msgid "The minimum password length for this account manager is %d. Please enter a different password."
-#~ msgstr "此帳號管理服務要求的最小密碼長度為 %d,請輸入符合要求的密碼。"
-#~ msgid ""
-#~ "An error has occurred;\n"
-#~ "check the Event Log for details.\n"
-#~ "\n"
-#~ "Click Finish to close."
-#~ msgstr ""
-#~ "發生錯誤,請檢查訊息分頁取得詳細資訊。\n"
-#~ "按「完成」關閉視窗。"
-
-#, no-c-format
-#~ msgid "% of the processors"
-#~ msgstr "% 的 CPU 核心數量"
-
-#, c-format
-#~ msgid "New page inserted. Index = %i"
-#~ msgstr "已插入新頁面。索引值 = %i"
-
-#, c-format
-#~ msgid "New page appended. Index = %i"
-#~ msgstr "已附加新頁面。索引值 = %i"
-
-#, c-format
-#~ msgid "Old Page Index = %i"
-#~ msgstr "舊頁面索引值 = %i"
+msgstr "離開 %s"
 
-#, c-format
-#~ msgid "OnDropTarget: index by HitTest = %i"
-#~ msgstr "OnDropTarget: index by HitTest = %i"
-#~ msgid "Identify your account "
-#~ msgstr "確認您的帳戶"
-#~ msgid "Read config file"
-#~ msgstr "讀取設定檔"
-#~ msgid "Read configuration info from cc_config.xml"
-#~ msgstr "從 cc-config.xml 讀取設定資訊。"
-#~ msgid ""
-#~ "(C) 2003-2011 University of California, Berkeley.\n"
-#~ "All Rights Reserved."
-#~ msgstr ""
-#~ "(C) 2003-2007 美國加州大學伯克利分校\n"
-#~ "保留所有權利。"
-#~ msgid "NVIDIA GPU"
-#~ msgstr "NVIDIA GPU"
-#~ msgid "ATI GPU"
-#~ msgstr "ATI GPU"
-#~ msgid "Multicore CPU Supported"
-#~ msgstr "支援多核心 CPU"
-#~ msgid "%s: %.0f"
-#~ msgstr "%s: %.0f"
-#~ msgid "Click 'Retry now' to transfer the file now"
-#~ msgstr "按一下「立即重試」可以立即上傳檔案。"
-#~ msgid ""
-#~ "Click 'Abort transfer' to delete the file from the transfer queue. This "
-#~ "will prevent you from being granted credit for this result."
-#~ msgstr ""
-#~ "按一下「中止傳送」可以從上傳佇列中刪除這個檔案。 這個動作會使您無法從這個"
-#~ "運算結果中獲取積分。"
-#~ msgid "Aborting result..."
-#~ msgstr "中止結果中..."
-#~ msgid ""
-#~ "You have chosen to add a new BOINC project.  Adding a new\n"
-#~ "project means that you will be connecting your computer to a new "
-#~ "organization.\n"
-#~ "If this is what you wanted to do, please click on\n"
-#~ "the 'Next' button below.\n"
-#~ "\n"
-#~ "Some projects like World Community Grid run multiple research "
-#~ "applications.\n"
-#~ "If you want to change which research applications are sent to your "
-#~ "computer\n"
-#~ "to run, visit the project's website and modify your\n"
-#~ "preferences there.\n"
-#~ "\n"
-#~ "To change which research applications are sent to you from\n"
-#~ "World Community Grid then please click on the following button:"
-#~ msgstr ""
-#~ "您已經選擇加入了一個新的 BOINC 專案。加入新專案\n"
-#~ "表示您將允許您的電腦連接到一個新的組織。 \n"
-#~ "如果這就是您想要做的,請點擊下方的 “ 下一步 ” 按鈕。 \n"
-#~ "\n"
-#~ "有些項目比如World Community Grid 運行了多個科學應用程式。 \n"
-#~ "如果您想要改變發送到您的電腦上的應用程式種類,\n"
-#~ "您必須訪問這些專案的網站並在那裡修改你的偏好設置。 \n"
-#~ "\n"
-#~ "要設置您希望運行的World Community Grid 專案應用程式,\n"
-#~ "請點擊後面的按鈕:"
-#~ msgid "Change Research Applications at World Community Grid"
-#~ msgstr "設定 WCG 專案的運算程式"
-
-#, fuzzy
-#~ msgid "Don't fetch NVIDIA GPU tasks"
-#~ msgstr "無法取得新工作"
-
-#, fuzzy
-#~ msgid "Don't fetch ATI GPU tasks"
-#~ msgstr "無法取得新工作"
-#~ msgid "Web sites"
-#~ msgstr "網站"
-#~ msgid "Connect about every"
-#~ msgstr "每幾天連線一次: "
-#~ msgid ""
-#~ "this computer is connected to the Internet about every X days\n"
-#~ "(0 if it's always connected)"
-#~ msgstr ""
-#~ "設定此電腦每 X 天連線網路\n"
-#~ "(0 代表一直連線)"
-#~ msgid "days (max. 10)"
-#~ msgstr "天 (最多 10 天)"
-#~ msgid "%s - Options"
-#~ msgstr "%s - 選項"
-#~ msgid "Retrieving host information; please wait..."
-#~ msgstr "取回主機資訊中;請稍候..."
-#~ msgid "%s - Messages"
-#~ msgstr "%s - 訊息"
-#~ msgid "Skin:"
-#~ msgstr "面板:"
-#~ msgid "Preferences"
-#~ msgstr "偏好設定"
-#~ msgid "I want to customize my preferences for this computer only."
-#~ msgstr "我要自訂只適合這台電腦的偏好設定。"
-#~ msgid "Customized Preferences"
-#~ msgstr "本機自訂偏好設定"
-#~ msgid "Upload pending"
-#~ msgstr "上傳資料中"
-#~ msgid "Download pending"
-#~ msgstr "下載資料中"
-#~ msgid "Get help with BOINC"
-#~ msgstr "取得 BOINC 說明"
-#~ msgid "%s - Detach from %s"
-#~ msgstr "%s - 從 %s 退出"
-#~ msgid "Failed to attach to project"
-#~ msgstr "加入計畫失敗"
-#~ msgid "Failed to attach to account manager"
-#~ msgstr "加入帳號管理失敗"
-#~ msgid "Attached to account manager"
-#~ msgstr "加入帳號管理"
-#~ msgid "You are now successfully attached to the %s system."
-#~ msgstr "您已成功加入 %s 系統。"
-#~ msgid "You are now successfully attached to this account manager."
-#~ msgstr "您已成功加入此帳號管理員。"
-#~ msgid "All projects"
-#~ msgstr "所有計畫"
-#~ msgid "Attach to project"
-#~ msgstr "加入計畫"
-#~ msgid "Attach to account manager"
-#~ msgstr "加入帳號管理"
-#~ msgid "Attach to a project"
-#~ msgstr "加入計畫"
-#~ msgid "%s needs to connect to the Internet.  Please click to open %s."
-#~ msgstr "%s 需要連線到網路,請按一下開啟 %s。"
-#~ msgid ""
-#~ "%s is unable to communicate with a project and needs an Internet "
-#~ "connection.\n"
-#~ "Please connect to the Internet, then select the 'Do network "
-#~ "communications' item from the Advanced menu."
-#~ msgstr ""
-#~ "%s 無法與計畫通訊,需要網路連線。\n"
-#~ "請連線到網路後於「進階」選單中選擇「開始網路通訊」。"
-#~ msgid ""
-#~ "%s couldn't do Internet communication, and no default connection is "
-#~ "selected.\n"
-#~ "Please connect to the Internet, or select a default connection\n"
-#~ "using Advanced/Options/Connections."
-#~ msgstr ""
-#~ "%s 無法與網路通訊,沒有選擇預設的連線。\n"
-#~ "請連線到網路後,於「進階>選項>連線」選擇預設連線。"
-#~ msgid "Attached to project"
-#~ msgstr "已加入計畫"
-#~ msgid "You are now successfully attached to this project."
-#~ msgstr "您已成功加入此計畫。"
-#~ msgid "Attached to %s"
-#~ msgstr "已加入 %s"
-#~ msgid "Detach"
-#~ msgstr "退出"
-#~ msgid "Detaching from project..."
-#~ msgstr "正在退出計畫..."
-#~ msgid "Are you sure you want to detach from project '%s'?"
-#~ msgstr "您確定從計畫「%s」中退出嗎?"
-#~ msgid "Detach from Project"
-#~ msgstr "退出計畫"
-#~ msgid " - user active"
-#~ msgstr " - 使用者正在操作"
-#~ msgid " - computation suspended"
-#~ msgstr "- 運算已暫止"
-#~ msgid " - need disk space"
-#~ msgstr " - 需要磁碟空間"
-#~ msgid "Attach to an additional project"
-#~ msgstr "加入其他計畫"
-#~ msgid "To completion"
-#~ msgstr "剩餘時間"
-#~ msgid "Attach to a project to begin processing work"
-#~ msgstr "加入計畫以開始進行工作"
-#~ msgid "%s - Can't find web browser"
-#~ msgstr "%s - 找不到瀏覽器"
-#~ msgid ""
-#~ "%s tried to display the web page\n"
-#~ "\t%s\n"
-#~ "but couldn't find a web browser.\n"
-#~ "To fix this, set the environment variable\n"
-#~ "BROWSER to the path of your web browser,\n"
-#~ "then restart the %s."
-#~ msgstr ""
-#~ "%s 試圖開啟網頁,\n"
-#~ "\t%s\n"
-#~ "但是找不到瀏覽器。\n"
-#~ "要修正這個問題,請將環境變數 BROWSER \n"
-#~ "設為您瀏覽器程式的路徑後重新啟動 %s。"
-#~ msgid "Retrying communications for project(s)..."
-#~ msgstr "重試與計畫的通訊中..."
-#~ msgid ""
-#~ "Required wizard file(s) are missing from the target server.\n"
-#~ "(lookup_account.php/create_account.php)\n"
-#~ msgstr ""
-#~ "此目標伺服器必須的 wizard 檔案遺失。\n"
-#~ "(lookup_account.php/create_account.php)\n"
-#~ msgid "User information"
-#~ msgstr "使用者資訊"
-#~ msgid "Account Manager URL"
-#~ msgstr "帳號管理員網址"
-#~ msgid "Enter the URL of the account manager's web site."
-#~ msgstr "請輸入帳號管理網站的網址。"
-#~ msgid "Close BOINC Manager Window."
-#~ msgstr "關閉 BOINC 管理員"
-#~ msgid "Exit the %s"
-#~ msgstr "離開 %s"
-#~ msgid "Attach to &project"
-#~ msgstr "加入計畫(&A)"
-#~ msgid "Attaching to project..."
-#~ msgstr "正在加入計畫..."
-#~ msgid "Removal from %s completed."
-#~ msgstr "從 %s 移除已完成。"
-#~ msgid "Removal succeeded!"
-#~ msgstr "成功移除!"
-#~ msgid "Write to disk at most every"
-#~ msgstr "寫入磁碟最多每"
-#~ msgid "ID"
-#~ msgstr "ID"
-#~ msgid "Priority"
-#~ msgstr "優先順序"
-#~ msgid "MessagesGrid"
-#~ msgstr "MessagesGrid"
-#~ msgid "Copying selected messages to Clipboard..."
-#~ msgstr "複製所選訊息到剪貼簿..."
-#~ msgid "Info"
-#~ msgstr "資訊"
-#~ msgid "Warning"
-#~ msgstr "警告"
-#~ msgid "ProjectsGrid"
-#~ msgstr "ProjectsGrid"
-#~ msgid "TransfersGrid"
-#~ msgstr "TransfersGrid"
-#~ msgid "Aborting transfer(s)..."
-#~ msgstr "中止檔案傳送中..."
-#~ msgid ""
-#~ "Are you sure you want to abort this file(s) transfer ?\n"
-#~ "NOTE: Aborting a transfer will invalidate a task and you\n"
-#~ "will not receive credit for it."
-#~ msgstr ""
-#~ "您確定要中止「%s」 的檔案傳輸嗎?\n"
-#~ "提示: 終止傳輸會使此工作無效且不會收到任何積分。"
-#~ msgid "Abort File Transfer(s)"
-#~ msgstr "中止檔案傳送"
-#~ msgid "TasksGrid"
-#~ msgstr "TasksGrid"
-#~ msgid ""
-#~ "We'll now guide you through the process of attaching\n"
-#~ "to a project."
-#~ msgstr "現在我們會引導您進行加入計畫的步驟。"
-#~ msgid "&Stop using%s"
-#~ msgstr "停止以 %s(&S)"
-#~ msgid ""
-#~ "We'll now remove this computer from %s.  From now on,\n"
-#~ "attach and detach projects directly from this computer.\n"
-#~ msgstr ""
-#~ "我們會從 %s 移除這台電腦。\n"
-#~ "從現在起,這台電腦能直接加入或退出計畫。\n"
-#~ msgid ""
-#~ "We'll now guide you through the process of attaching\n"
-#~ "to an account manager.\n"
-#~ "\n"
-#~ "If you want to attach to a single project, click Cancel,\n"
-#~ "then select the 'Attach to project' menu item instead."
-#~ msgstr ""
-#~ "現在我們會引導您進行加入帳號管理員的步驟。\n"
-#~ "\n"
-#~ "如果你只想加入單一計畫,請按「取消」,\n"
-#~ "然後從功能表裡選擇「加入計畫」。"
-#~ msgid "Debug Flags"
-#~ msgstr "除錯旗標"
-#~ msgid "Project Properties Failure"
-#~ msgstr "計畫內容失敗"
-#~ msgid "Project Properties URL Failure"
-#~ msgstr "計畫內容網址失敗"
-#~ msgid "Account Creation Disabled"
-#~ msgstr "帳號建立已停止。"
-#~ msgid "Account Already Exists"
-#~ msgstr "帳號已存在。"
-#~ msgid "Project Already Attached"
-#~ msgstr "計畫已加入。"
-#~ msgid "Project Attach Failure"
-#~ msgstr "加入計畫失敗"
-#~ msgid "Net Detection Failure"
-#~ msgstr "網路偵測失敗"
-#~ msgid ""
-#~ "You can copy and paste the URL from your browser's\n"
-#~ "address bar."
-#~ msgstr "您可以從瀏覽器的網址列複製網址後貼上。"
-#~ msgid "You are already attached to this project."
-#~ msgstr "您已加入此計畫。"
-#~ msgid "Enter account key"
-#~ msgstr "輸入帳號金鑰"
-#~ msgid ""
-#~ "This project uses an \"account key\" to identify you.\n"
-#~ "\n"
-#~ "Go to the project's web site to create an account. Your account\n"
-#~ "key will be emailed to you."
-#~ msgstr ""
-#~ "此計畫使用「帳號金鑰」識別您的身份。\n"
-#~ "\n"
-#~ "請前往計畫網站建立新帳號。\n"
-#~ "您的帳號金鑰會寄到您的信箱。"
-#~ msgid "An account key looks like:"
-#~ msgstr "帳號金鑰看起來像:"
-#~ msgid "82412313ac88e9a3638f66ea82186948"
-#~ msgstr "82412313ac88e9a3638f66ea82186948"
-#~ msgid "Account key:"
-#~ msgstr "帳號金鑰:"
-#~ msgid "&Accessible View"
-#~ msgstr "親和力介面(&S)"
-#~ msgid ""
-#~ "Accessible views are compatible with accessibility aids such as screen "
-#~ "readers."
-#~ msgstr "親和力介面能相容於類似螢幕閱讀器等親和力輔助工具。"
-#~ msgid "&Grid View"
-#~ msgstr "格線介面(&V)"
-#~ msgid ""
-#~ "%s is going to shutdown the core client it is currently connected to.\n"
-#~ "NOTE: Choosing 'OK' will cause the select new computer dialog to appear \n"
-#~ "so you can attach to a different core client."
-#~ msgstr ""
-#~ "%s 正準備關閉目前已連線的核心用戶端。\n"
-#~ "提示: 選擇「確定」會出現選擇新電腦的視窗,\n"
-#~ "你可以加入不同的核心用戶端。"
-#~ msgid "processors"
-#~ msgstr "個處理器"
-#~ msgid "Click here to disable displaying this message in the future."
-#~ msgstr "按一下這裡以後不要顯示此訊息。"
-#~ msgid "Language Selection:"
-#~ msgstr "語言選擇:"
-#~ msgid "What language should the manager display by default."
-#~ msgstr "預設要使用何種語言顯示。"
-#~ msgid "Reminder Frequency:"
-#~ msgstr "提示頻率:"
-#~ msgid ""
-#~ "How often, in minutes, should the manager remind you of possible "
-#~ "connection events."
-#~ msgstr "設定 BOINC 管理員要隔多久才提示您重要訊息。(以分鐘計)"
-#~ msgid ""
-#~ "To choose a project, click its name\n"
-#~ "or type its URL below.\n"
-#~ "Click 'www' to visit a project's web site."
-#~ msgstr ""
-#~ "要選擇計畫,請按計畫名稱或在下面輸入其網址。\n"
-#~ "按「www」連到計畫網站。"
-#~ msgid "  "
-#~ msgstr "  "
-#~ msgid "www"
-#~ msgstr "www"
-#~ msgid "Project Comm Failure"
-#~ msgstr "計畫通訊失敗"
-#~ msgid "Google Comm Failure"
-#~ msgstr "Google 通訊失敗"
-#~ msgid "Yahoo Comm Failure"
-#~ msgstr "Yahoo 通訊失敗"
+#: clientgui/DlgAdvPreferencesBase.h:45
+msgid "On this day of the week, compute only during these hours."
+msgstr "僅在本日特定時段運算。"
 
+#: clientgui/DlgAdvPreferencesBase.h:46
+msgid "On this day of the week, transfer files only during these hours."
+msgstr "僅在本日特定時段傳輸檔案。"
diff --git a/locale/zh_TW/BOINC-Project-Generic.po b/locale/zh_TW/BOINC-Project-Generic.po
index 9aee4dd..c4f4c74 100644
--- a/locale/zh_TW/BOINC-Project-Generic.po
+++ b/locale/zh_TW/BOINC-Project-Generic.po
@@ -1,23 +1,26 @@
 # BOINC web translation
 # Copyright (C) 2008 University of California
+# 
 # This file is distributed under the same license as BOINC.
+# 
 # FileID  : $Id$
+# 
+# Translators:
+# willy Wu <df910105 at yahoo.com.tw>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\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-01 04:50+0000\n"
-"Last-Translator: 宇謙 <df910105 at yahoo.com.tw>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: zh_TW\n"
+"PO-Revision-Date: 2015-02-16 05:03+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.5.0\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1422766258.0\n"
 
 msgid "LANG_NAME_NATIVE"
 msgstr "繁體中文 ( 台灣 )"
@@ -27,19 +30,19 @@ msgstr "Traditional Chinese ( Taiwan )"
 
 #: ../inc/bbcode_html.inc:11
 msgid "Bold text: [b]text[/b]  (alt+b)"
-msgstr "粗體:[b]文本[/b] (alt+b)"
+msgstr "粗體:[b]文字[/b] (alt+b)"
 
 #: ../inc/bbcode_html.inc:14
 msgid "Italic text: [i]text[/i]  (alt+i)"
-msgstr "斜體:[i]文本[/i] (alt+i)"
+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 "Quote text: [quote]text[/quote]  (alt+q)"
-msgstr "引用:[quote]文本[/quote] (alt+q)"
+msgstr "引用:[quote]文字[/quote] (alt+q)"
 
 #: ../inc/bbcode_html.inc:23
 msgid "Code display: [code]code[/code]  (alt+c)"
@@ -51,7 +54,7 @@ msgstr "表格:[list]本文[/list] (alt+l)"
 
 #: ../inc/bbcode_html.inc:29
 msgid "Ordered list: [list=]text[/list]  (alt+o)"
-msgstr "排序表格:[list=]文本[/list] (alt+o)"
+msgstr "排序表格:[list=]文字[/list] (alt+o)"
 
 #: ../inc/bbcode_html.inc:32
 msgid "Insert image: [img]http://image_url[/img]  (alt+p)"
@@ -60,7 +63,7 @@ msgstr "插入圖片:[img]圖片網址[/img] (alt+p)"
 #: ../inc/bbcode_html.inc:35
 msgid ""
 "Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url]  (alt+w)"
-msgstr "插入連結:[url]連結[/url] 或 [url=連結]文本[/url] (alt+w)"
+msgstr "插入連結:[url]連結[/url] 或 [url=連結]文字[/url] (alt+w)"
 
 #: ../inc/bbcode_html.inc:42
 msgid "Font color"
@@ -69,7 +72,7 @@ msgstr "字體顏色"
 #: ../inc/bbcode_html.inc:43
 msgid ""
 "Font color: [color=red]text[/color]  Tip: you can also use color=#FF0000"
-msgstr "字體顏色:[color=red]文本[/color] 訣竅:你也可以用 #FF0000 來表示紅色"
+msgstr "字體顏色:[color=red]文字[/color] 訣竅:你也可以用 #FF0000 來表示紅色"
 
 #: ../inc/bbcode_html.inc:44 ../inc/bbcode_html.inc:59 ../inc/prefs.inc:638
 msgid "Default"
@@ -238,7 +241,7 @@ msgstr "傳送私人訊息給 %1"
 
 #: ../inc/forum.inc:581
 msgid "Joined: %1"
-msgstr "以加入:%1"
+msgstr "已加入:%1"
 
 #: ../inc/forum.inc:590
 msgid "Posts: %1"
@@ -290,8 +293,8 @@ msgstr "最近修改日期:%1"
 
 #: ../inc/forum.inc:640
 msgid ""
-"This post is not shown because the sender is on your 'ignore' list.  Click %"
-"1here%2 to view this post"
+"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
@@ -370,21 +373,7 @@ msgid ""
 "        <li> No abusive comments involving race, religion,\n"
 "            nationality, gender, class or sexuality.\n"
 "        "
-msgstr ""
-"\n"
-"        <ul>\n"
-"        <li> 文章內容必須兒童適宜:它們必須不包含\n"
-"            內容有關猥褻或仇恨相關,\n"
-"            色情或性暗示。\n"
-"        <li> 禁止商業廣告。\n"
-"        <li> 禁止連結到網站包含色情內容,\n"
-"            賭博, 或使他人感到不適的內容。\n"
-"        <li> 禁止打擾、挑釁其它用戶,\n"
-"            或破壞主題。\n"
-"        <li> 禁止有敵意或侮辱性的訊息。\n"
-"        <li> 禁止濫用評論涉及種族、宗教、\n"
-"            國籍、性別、階級或性。\n"
-"        "
+msgstr "\n        <ul>\n        <li> 文章內容必須兒童適宜:它們必須不包含\n            內容有關猥褻或仇恨相關,\n            色情或性暗示。\n        <li> 禁止商業廣告。\n        <li> 禁止連結到網站包含色情內容,\n            賭博, 或使他人感到不適的內容。\n        <li> 禁止打擾、挑釁其它用戶,\n            或破壞主題。\n        <li> 禁止有敵意或侮辱性的訊息。\n        <li> 禁止濫用評論涉及種族、宗教、\n            國籍、性別、階級或性。\n        "
 
 #: ../inc/forum.inc:780
 msgid "Rules:"
@@ -514,7 +503,7 @@ msgstr "家庭"
 #: ../inc/host.inc:57 ../inc/prefs.inc:641 ../inc/prefs.inc:1049
 #: ../user/server_status.php:314
 msgid "Work"
-msgstr "工作"
+msgstr "任務"
 
 #: ../inc/host.inc:58 ../inc/prefs.inc:640 ../inc/prefs.inc:1050
 msgid "School"
@@ -539,7 +528,7 @@ msgstr "IP位址"
 
 #: ../inc/host.inc:89
 msgid "(same the last %1 times)"
-msgstr "(與最新的%1次一樣)"
+msgstr "(與最新的%1次一樣)"
 
 #: ../inc/host.inc:91
 msgid "External IP address"
@@ -607,7 +596,7 @@ msgstr "處理器數量"
 
 #: ../inc/host.inc:121
 msgid "Coprocessors"
-msgstr "共處理器"
+msgstr "協同處理器"
 
 #: ../inc/host.inc:123 ../inc/host.inc:687
 msgid "Operating System"
@@ -615,7 +604,7 @@ msgstr "作業系統"
 
 #: ../inc/host.inc:126 ../inc/host.inc:235
 msgid "BOINC version"
-msgstr "Boinc 版本"
+msgstr "BOINC 版本"
 
 #: ../inc/host.inc:130
 msgid "Memory"
@@ -627,7 +616,7 @@ msgstr "%1 MB"
 
 #: ../inc/host.inc:134
 msgid "Cache"
-msgstr "快速緩衝貯存區"
+msgstr "Cache"
 
 #: ../inc/host.inc:134
 msgid "%1 KB"
@@ -667,7 +656,7 @@ msgstr "平均上傳速度"
 
 #: ../inc/host.inc:157 ../inc/host.inc:164
 msgid "%1 KB/sec"
-msgstr "%1 KB/s"
+msgstr "%1 Kb/s"
 
 #: ../inc/host.inc:159 ../inc/host.inc:166 ../inc/result.inc:216
 #: ../inc/result.inc:226 ../inc/result.inc:244 ../inc/result.inc:262
@@ -691,7 +680,7 @@ msgstr "%1 天"
 
 #: ../inc/host.inc:170
 msgid "Application details"
-msgstr "應用程式詳細資料"
+msgstr "程式詳細資料"
 
 #: ../inc/host.inc:171
 msgid "Show"
@@ -710,17 +699,14 @@ msgid "Last time contacted server"
 msgstr "最後一次連接伺服器的時間"
 
 #: ../inc/host.inc:187
-#, php-format
 msgid "% 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:191
-#, php-format
 msgid "While BOINC running, % of time work is allowed"
 msgstr "當 BONC 執行時,允許處理工作的時間比(%)"
 
@@ -882,7 +868,7 @@ msgstr "意見"
 #: ../inc/news.inc:111
 #, php-format
 msgid "News is available as an %sRSS feed%s"
-msgstr "新聞還可以透過 %RSS feed%s 閱讀"
+msgstr "新聞還可以透過 %sRSS feed%s 閱讀"
 
 #: ../inc/pm.inc:25 ../inc/pm.inc:174 ../user/pm.php:69 ../user/pm.php:148
 msgid "Inbox"
@@ -960,16 +946,16 @@ msgstr "私人訊息"
 msgid ""
 "Suspend work while computer is on battery power? %1 Matters only for "
 "portable computers %2"
-msgstr "當電腦透過電池供電時暫停計算? %1只有筆記型電腦需要使用此設定%2"
+msgstr "當電腦透過電池供電時暫停運算? %1只有筆記型電腦需要設定%2"
 
 #: ../inc/prefs.inc:85
 msgid "Suspend work while computer is in use?"
-msgstr "當電腦在使用的時候暫停運算?"
+msgstr "當電腦在使用的時候暫止運算?"
 
 #: ../inc/prefs.inc:91
 msgid ""
 "Suspend GPU work while computer is in use? %1 Enforced by version 6.6.21+ %2"
-msgstr "當電腦在使用的時候暫停 GPU 運算? %1在6.6.21 之後的版本有了此設定%2"
+msgstr "當電腦在使用的時候暫止 GPU 運算? %1 在6.6.21 之後的版本有了此設定%2"
 
 #: ../inc/prefs.inc:99
 msgid "'In use' means mouse/keyboard activity in last"
@@ -983,13 +969,13 @@ msgstr "分鐘"
 msgid ""
 "Suspend work if no mouse/keyboard activity in last %1 Needed to enter low-"
 "power mode on some computers %2"
-msgstr "如果在多少時間內沒有滑鼠或鍵盤操作則暫停運算%1 在某些運算上如果要進入低消耗模式必須設定 %2"
+msgstr "如果在多少時間內沒有滑鼠或鍵盤操作則暫止運算%1 在某些運算上如果要進入低消耗模式必須設定 %2"
 
 #: ../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 "如果非 BOINC 的 CPU 佔用率高於指定值則暫停運算%10 表示不限制<br>6.10.30 之後的版本有了此設定%2"
+msgstr "如果非 BOINC 的 CPU 佔用率高於指定值則暫止運算%10 表示不限制<br>6.10.30 之後的版本有了此設定%2"
 
 #: ../inc/prefs.inc:122
 msgid "Do work only between the hours of %1 No restriction if equal %2"
@@ -999,7 +985,7 @@ msgstr "運算時間段%1如果相同則表示不限制%2"
 msgid ""
 "Leave tasks in memory while suspended? %1 Suspended tasks will consume swap "
 "space if 'yes' %2"
-msgstr "暫停運算時將任務保留於記憶體? %1選擇是的話,暫停的記憶體將佔用交換空間%2"
+msgstr "暫止運算時將任務留在記憶體? %1選擇是的話,暫止的記憶體將佔用交換空間%2"
 
 #: ../inc/prefs.inc:139
 msgid "Switch between tasks every %1 Recommended: 60 minutes %2"
@@ -1018,7 +1004,6 @@ msgid "On multiprocessors, use at most %1 Enforced by version 6.1+ %2"
 msgstr "在多核心的電腦上,最多使用%16.1 之後的版本有了此設定%2"
 
 #: ../inc/prefs.inc:158
-#, php-format
 msgid "% of the processors"
 msgstr "% 的處理器"
 
@@ -1027,7 +1012,6 @@ msgid "Use at most %1 Can be used to reduce CPU heat %2"
 msgstr "最多使用%1可用於減少 CPU 的發熱量%2"
 
 #: ../inc/prefs.inc:167
-#, php-format
 msgid "% of CPU time"
 msgstr "% 的處理器時間"
 
@@ -1045,7 +1029,6 @@ msgstr "硬碟:至少保留%1小於%2 的設定值將被忽略%3"
 
 #: ../inc/prefs.inc:191 ../inc/prefs.inc:201 ../inc/prefs.inc:206
 #: ../inc/prefs.inc:211
-#, php-format
 msgid "% of total"
 msgstr "%"
 
@@ -1112,7 +1095,7 @@ msgstr "允許使用網路的時間"
 
 #: ../inc/prefs.inc:263
 msgid "Transfer at most %1 Enforced by version 6.10.46+ %2"
-msgstr "資料傳輸上限%16.10.46 之後的版本有了此設定%2"
+msgstr "最多傳輸%16.10.46 之後的版本有了此設定%2"
 
 #: ../inc/prefs.inc:269
 msgid "Mbytes every"
@@ -1121,21 +1104,17 @@ msgstr "MB/每"
 #: ../inc/prefs.inc:274
 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"
+"modifies image files (UMTS does this, for example). %2 Skipping verification"
+" reduces the security of BOINC. %3"
+msgstr "跳過映像文件驗證? %1僅在你的 ISP 會修改映像文件的情況下(比如 UMTS 就會這樣)需要選中這個。 %2跳過驗證會影響 BOINC 的安全性。 %3"
 
 #: ../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 "
+"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"
+msgstr "資源分享%1此設定決定你的電腦分配給本專案的資源比例。舉例:你參加了兩個專案,其資源分享率分別是100 和200,則第一個專案將得到 1/3 的運算資源,第二個專案將得到 2/3。 %2"
 
 #: ../inc/prefs.inc:298
 msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
@@ -1161,11 +1140,12 @@ msgstr "使用 Intel GPU%17.2 之後的版本有了此設定%2"
 msgid ""
 "Run test applications? %1 This helps us develop applications, but may cause "
 "jobs to fail on your computer %2"
-msgstr "運行測試用途的應用程式? %1這可以幫助我們開發運算程式,但可能會導致您電腦上的運算任務失敗%2"
+msgstr "執行測試用途的程式? %1這可以幫助我們開發運算程式,但可能會導致您電腦上的任務失敗%2"
 
 #: ../inc/prefs.inc:367
 msgid ""
-"Emails will be sent from %1; make sure your spam filter accepts this address."
+"Emails will be sent from %1; make sure your spam filter accepts this "
+"address."
 msgstr "電子郵件將從 %1 發送,請確保您的垃圾郵件過濾器不會過濾這個地址。"
 
 #: ../inc/prefs.inc:374
@@ -1195,8 +1175,8 @@ msgstr "這些偏好設定對你參加的所有 BOINC 專案均有效。"
 
 #: ../inc/prefs.inc:395
 msgid ""
-"%1Unable to update preferences.%2 The values marked in red below were out of "
-"range or not numeric."
+"%1Unable to update preferences.%2 The values marked in red below were out of"
+" range or not numeric."
 msgstr "%1無法更新偏好設定。 %2下面標紅的為超出範圍的或類型錯誤的數值。"
 
 #: ../inc/prefs.inc:445
@@ -1639,7 +1619,7 @@ msgstr "積分"
 
 #: ../inc/result.inc:380 ../inc/result.inc:724
 msgid "Application"
-msgstr "應用程式"
+msgstr "程式"
 
 #: ../inc/result.inc:629
 msgid "Workunit"
@@ -1683,7 +1663,7 @@ msgstr "驗證狀態"
 
 #: ../inc/result.inc:643
 msgid "Application version"
-msgstr "應用程式版本"
+msgstr "程式版本"
 
 #: ../inc/result.inc:656
 msgid "Output files"
@@ -1880,8 +1860,8 @@ msgstr "本操作需要團隊創始人的權限"
 
 #: ../inc/team.inc:422
 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."
+"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
@@ -2219,7 +2199,8 @@ msgid "sec"
 msgstr "秒"
 
 #: ../inc/util.inc:444
-msgid "Link has timed out. Please click Back, refresh the page, and try again."
+msgid ""
+"Link has timed out. Please click Back, refresh the page, and try again."
 msgstr "連線已超時,請點擊返回並刷新頁面後再重試。"
 
 #: ../inc/util.inc:513
@@ -2228,7 +2209,7 @@ msgstr "查看 %1 的用戶檔案"
 
 #: ../inc/util.inc:569
 msgid "Use BBCode tags to format your text"
-msgstr "用 BBCode 代碼來格式化您的文本"
+msgstr "用 BBCode 代碼來格式化您的文字"
 
 #: ../inc/util.inc:796
 msgid "Project down for maintenance"
@@ -2285,7 +2266,7 @@ msgstr "增加 %1 偏好設定(用於 %2)"
 #: ../user/apps.php:32 ../user/bs_sample_index.php:55
 #: ../user/sample_index.php:120
 msgid "Applications"
-msgstr "應用程式"
+msgstr "程式"
 
 #: ../user/apps.php:33
 msgid ""
@@ -2293,9 +2274,7 @@ msgid ""
 "work 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
 msgid "Platform"
@@ -2319,10 +2298,7 @@ msgid ""
 "It's similar to HTML, but simpler. The tags start with a [ (where you would\n"
 "have used %1 in HTML) and end with ] (where you would have used %2 in\n"
 "HTML)."
-msgstr ""
-"BBCode 語法可以用來對個人檔案和留言板文章內的文本進行格式化。 \n"
-"它和 HTML 類似,但更為簡單。這些標記一般以 [ 開頭\n"
-"(如果在HTML 中一般是 %1)並且以] 結尾(HTML 中則是 %2)。"
+msgstr "BBCode 語法可以用來對個人檔案和留言板文章內的文字進行格式化。 \n它和 HTML 類似,但更為簡單。這些標記一般以 [ 開頭\n(如果在HTML 中一般是 %1)並且以] 結尾(HTML 中則是 %2)。"
 
 #: ../user/bbcode.php:31
 msgid "Examples"
@@ -2362,7 +2338,7 @@ msgstr "引用文"
 
 #: ../user/bbcode.php:39
 msgid "use for quoted blocks of text"
-msgstr "用於文本塊的引用"
+msgstr "用於文字塊的引用"
 
 #: ../user/bbcode.php:40
 msgid "use to display an image"
@@ -2378,11 +2354,11 @@ msgstr "用於顯示一些代碼"
 
 #: ../user/bbcode.php:42
 msgid "Pre-formatted text"
-msgstr "預設文本"
+msgstr "預設文字"
 
 #: ../user/bbcode.php:42
 msgid "use to display pre-formatted (usually monospaced) text"
-msgstr "用於顯示預設文本(一般是等寬字體)"
+msgstr "用於顯示預設文字(一般是等寬字體)"
 
 #: ../user/bbcode.php:43
 msgid "Item 1"
@@ -2412,9 +2388,7 @@ msgstr "用於連接到 BOINC 網站上的 SVN 修改集"
 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"
-"語法自身將被顯示出來,而不是預設的文本。"
+msgstr "如果你沒有正確的關閉語法或者指定參數,\n語法自身將被顯示出來,而不是預設的文字。"
 
 #: ../user/bs_sample_index.php:44
 msgid "Participants"
@@ -2512,7 +2486,8 @@ msgstr "您提供的邀請碼是錯誤的。"
 
 #: ../user/create_account_action.php:84
 msgid ""
-"Invalid email address: you must enter a valid address of the form name at domain"
+"Invalid email address: you must enter a valid address of the form "
+"name at domain"
 msgstr "電子郵件地址錯誤:您必須輸入一個合法的地址,例如 用戶名@域名"
 
 #: ../user/create_account_action.php:88
@@ -2539,7 +2514,7 @@ msgstr "無法建立帳號"
 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管理服務,不要使用此表格。只要運行BOINC,選擇“新增專案”,然後輸入電子郵件地址和密碼。"
+msgstr "注意:如果您使用BOINC管理服務,不要使用此表格。只要執行BOINC,選擇“新增專案”,然後輸入電子郵件地址和密碼。"
 
 #: ../user/create_account_form.php:61
 msgid ""
@@ -2593,8 +2568,8 @@ msgstr "%1您的用戶檔案圖片將顯示在左邊"
 
 #: ../user/create_profile.php:66
 msgid ""
-"To replace it, click the \"Browse\" button and select a JPEG or PNG file (%1 "
-"or less)."
+"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
@@ -2684,8 +2659,8 @@ msgstr "建立一個用戶檔案"
 
 #: ../user/create_profile.php:343
 msgid ""
-"To prevent spam, an average credit of %1 or greater is required to create or "
-"edit a profile.  We apologize for this inconvenience."
+"To prevent spam, an average credit of %1 or greater is required to create or"
+" edit a profile.  We apologize for this inconvenience."
 msgstr "為了防止垃圾郵件,如果要建立或編譯用戶檔案,近期平均積分不能小於 %1,不便之處我們深感抱歉。"
 
 #: ../user/delete_account.php:57
@@ -2711,18 +2686,13 @@ msgid ""
 "including your profile and message-board posts.\n"
 "No jobs will be issued to any computers attached\n"
 "to this account."
-msgstr ""
-"刪除帳號操作將從服務器上移除你所有的個人訊息,\n"
-"包括你的個人檔案和留言板中的文章。 \n"
-"該帳號名下的電腦也將不再下載新的運算任務。"
+msgstr "刪除帳號操作將從服務器上移除你所有的個人訊息,\n包括你的個人檔案和留言板中的文章。 \n該帳號名下的電腦也將不再下載新的運算任務。"
 
 #: ../user/delete_account.php:73
 msgid ""
 "This cannot be undone.\n"
 "Once your account has been deleted, you cannot get it back."
-msgstr ""
-"該操作無法撤銷。 \n"
-"一旦帳號被刪除,將無法還原。"
+msgstr "該操作無法撤銷。 \n一旦帳號被刪除,將無法還原。"
 
 #: ../user/delete_account.php:76
 msgid "Are you sure you want to delete your account?"
@@ -2774,17 +2744,13 @@ 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"
-"如果您以後想要重新使用用戶檔案,必須從頭開始建立。"
+msgstr "刪除的用戶檔案將永遠無法恢復 --\n如果您以後想要重新使用用戶檔案,必須從頭開始建立。"
 
 #: ../user/delete_profile.php:48
 msgid ""
 "If you're sure, click 'Yes'\n"
 "to remove your profile from our database."
-msgstr ""
-"如果您確定的話,請點擊 “ 是 ” \n"
-"從我們的資料庫中刪除你的用戶檔案。"
+msgstr "如果您確定的話,請點擊 “ 是 ” \n從我們的資料庫中刪除你的用戶檔案。"
 
 #: ../user/delete_profile.php:52
 msgid "Delete my profile"
@@ -2808,7 +2774,8 @@ msgstr "您的捐贈已完成。"
 
 #: ../user/donated.php:30
 msgid ""
-"Your donation will be added to the progress bar after confirmation by PayPal."
+"Your donation will be added to the progress bar after confirmation by "
+"PayPal."
 msgstr "您的捐贈將在我們收到 PayPal 的確認後再添加到進度中。"
 
 #: ../user/donated.php:32
@@ -2827,9 +2794,7 @@ msgstr "%1 捐贈"
 msgid ""
 "This project is accepting donations via\n"
 "%1."
-msgstr ""
-"此專案接受的捐贈方式\n"
-"%1。"
+msgstr "此專案接受的捐贈方式\n%1。"
 
 #: ../user/donations.php:42
 msgid ""
@@ -2844,16 +2809,7 @@ msgid ""
 "        to see the donation amount equivalent in different currencies\n"
 "        (please note that the rates are only estimates\n"
 "         and the actual amount may differ)."
-msgstr ""
-"請在下方的表格中填入您所要捐贈的金額。 \n"
-"PayPal 接受多種貨幣\n"
-"(加元,歐元,英鎊,美元,\n"
-"日元,澳元,新西蘭元,\n"
-"瑞士法郎,港幣,新加坡元,瑞典克朗,\n"
-"丹麥克朗,波蘭茲羅提,挪威克朗,\n"
-"匈牙利福林,捷克克朗)。 \n"
-"您可以使用匯率換算器來查看不同幣種的等值金額\n"
-"(請注意匯率為估計值,實際匯率可能會稍有不同)"
+msgstr "請在下方的表格中填入您所要捐贈的金額。 \nPayPal 接受多種貨幣\n(加元,歐元,英鎊,美元,\n日元,澳元,新西蘭元,\n瑞士法郎,港幣,新加坡元,瑞典克朗,\n丹麥克朗,波蘭茲羅提,挪威克朗,\n匈牙利福林,捷克克朗)。 \n您可以使用匯率換算器來查看不同幣種的等值金額\n(請注意匯率為估計值,實際匯率可能會稍有不同)"
 
 #: ../user/donations.php:316
 msgid "Amount you would like to donate"
@@ -2871,9 +2827,7 @@ 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"
-"如果不選擇的話,您將被記錄為 用戶 ID %1"
+msgstr "如果您不希望將您的名稱和帳號顯示在捐贈者列表中,請選擇此項。 \n如果不選擇的話,您將被記錄為 用戶 ID %1"
 
 #: ../user/donations.php:324
 msgid "To assign the donation with your user ID, please log in."
@@ -2893,27 +2847,23 @@ msgstr "下載 BOINC 的輔助軟體"
 
 #: ../user/download_network.php:28
 msgid "You can download applications in several categories."
-msgstr "您可以下載下面幾個類別的應用程式。"
+msgstr "您可以下載下面幾個類別的程式。"
 
 #: ../user/download_network.php:31
 msgid ""
 "These applications are not endorsed by %1 and you use them at your own risk."
-msgstr "這些應用程式未經過 %1 的仔細檢查,若使用請自擔風險。"
+msgstr "這些程式尚未經過 %1 的檢查,若使用請自擔風險。"
 
 #: ../user/download_network.php:33
 msgid ""
 "We do not provide instructions for installing these applications.\n"
-"However, the author may have provided some help on installing or "
-"uninstalling the application. \n"
+"However, the author may have provided some help on installing or uninstalling the application. \n"
 "If this is not enough you should contact the author."
-msgstr ""
-"我們不能提供這些應用程式的安裝及使用說明。 \n"
-"但應用程式的作者可能提供了安裝及卸載相關的幫助說明。 \n"
-"如果還需要進一步的說明,請聯繫相關作者。"
+msgstr "我們無法提供這些程式的安裝及使用說明。 \n但程式的作者可能提供了安裝及卸載相關的幫助說明。 \n如果需要進一步了解,請聯繫相關作者。"
 
 #: ../user/download_network.php:36
 msgid "Instructions for installing and running BOINC are %1here%2."
-msgstr "安裝及運行 BOINC 的說明 請看%1這裡%2"
+msgstr "安裝及執行 BOINC 的說明 請看%1這裡%2"
 
 #: ../user/download_network.php:38
 msgid "This list is managed centrally at %1the BOINC website%2."
@@ -3063,10 +3013,7 @@ 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> 顯示你最新的積分訊息,專案新聞等。"
+msgstr "查看 %1所有的免費服務%2\n<br> 提供動態簽名圖片\n<br> 顯示你最新的積分訊息,專案新聞等。"
 
 #: ../user/edit_forum_preferences_form.php:104
 msgid "characters remaining"
@@ -3337,8 +3284,8 @@ msgstr "該工作已分發給一台電腦,但未在指定的期限內收到回
 
 #: ../user/explain_state.php:72
 msgid ""
-"The task wasn't sent to a computer because enough other tasks were completed "
-"for this workunit."
+"The task wasn't sent to a computer because enough other tasks were completed"
+" for this workunit."
 msgstr "該工作未分發到電腦,因為所屬的工作包已經完成了足夠數量的運算工作。"
 
 #: ../user/explain_state.php:75
@@ -3353,8 +3300,8 @@ msgstr "客戶端狀態"
 
 #: ../user/explain_state.php:81
 msgid ""
-"A result's <b>client state</b> indicates the stage of processing at which an "
-"error occurred."
+"A result's <b>client state</b> indicates the stage of processing at which an"
+" error occurred."
 msgstr "運算結果的<b>客戶端狀態</b>表示運算工作在電腦上的處理階段,例如 發生錯誤的時候。"
 
 #: ../user/explain_state.php:86
@@ -3449,8 +3396,8 @@ msgstr "感謝您向好友們介紹了 %1"
 
 #: ../user/ffmail_action.php:94
 msgid ""
-"You forgot to enter your friends' names and/or email addresses; Please %"
-"1return to the form%2 and enter them."
+"You forgot to enter your friends' names and/or email addresses; Please "
+"%1return to the form%2 and enter them."
 msgstr "您沒有輸入好友的名稱和/或電子郵件地址,請%1回到上一頁%2並重新輸入。"
 
 #: ../user/ffmail_form.php:30
@@ -3524,8 +3471,8 @@ msgstr "您確定要封鎖 %1 嗎?<br/>該操作將在設定的時間期限內
 
 #: ../user/forum_banishment_vote.php:61
 msgid ""
-"Select the reason category, optionally write a longer description of why the "
-"user should be banished."
+"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
@@ -3692,9 +3639,9 @@ msgstr "問與答"
 
 #: ../user/forum_help_desk.php:30
 msgid ""
-"Talk live via Skype with a volunteer, in any of several languages. Go to %"
-"1BOINC Online Help%2."
-msgstr "通過 Skype 和志願者線上交流,支持多種語言,請到 %1BOINC 線上幫助%2。"
+"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
 msgid "Topic"
@@ -3873,7 +3820,7 @@ msgstr "將該項目顯示為 BOINC 客戶端的通知"
 
 #: ../user/forum_post.php:127
 msgid "Do so only for items likely to be of interest to all volunteers."
-msgstr "僅在所有志願者都可能對該項目感興趣的時候使用"
+msgstr "僅在所有參與者都可能對該項目感興趣的時候使用"
 
 #: ../user/forum_rate.php:26
 msgid "Rating offline"
@@ -3953,7 +3900,6 @@ msgstr "您需要更高的平均積分或總積分才能舉報一個文章。"
 msgid "Report Registered"
 msgstr "舉報已記錄"
 
-# 92%
 #: ../user/forum_report_post.php:66
 msgid "Your report has been recorded. Thanks for your input."
 msgstr "您的回報已經記錄,感謝您的幫忙。"
@@ -3970,8 +3916,8 @@ msgstr "舉報論壇文章"
 
 #: ../user/forum_report_post.php:73
 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 "
+"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 />您可以在文章下方找到評分系統。"
 
@@ -3981,8 +3927,7 @@ msgstr "舉報文章"
 
 #: ../user/forum_report_post.php:81
 msgid ""
-"Why do you find the post offensive: %1Please include enough information so "
-"that a person that\n"
+"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"
 
@@ -3996,7 +3941,8 @@ msgstr "您的舉報未被記錄,請等待片刻後重試。"
 
 #: ../user/forum_report_post.php:92
 msgid ""
-"If this is not a temporary error, please report it to the project developers."
+"If this is not a temporary error, please report it to the project "
+"developers."
 msgstr "如果該故障無法自動恢復,請向專案開發人員報告。"
 
 #: ../user/forum_rss.php:41
@@ -4142,8 +4088,8 @@ msgstr "退訂成功"
 
 #: ../user/forum_subscribe.php:64
 msgid ""
-"You are no longer subscribed to %1. You will no longer receive notifications "
-"for this thread."
+"You are no longer subscribed to %1. You will no longer receive notifications"
+" for this thread."
 msgstr "您已經退訂主題%1,您將不會再收到該主題的通知。"
 
 #: ../user/forum_subscribe.php:66
@@ -4305,8 +4251,8 @@ msgstr "新增好友"
 
 #: ../user/friend.php:74
 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."
+"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
@@ -4411,7 +4357,8 @@ msgstr "忘記了你的帳戶資訊?"
 
 #: ../user/get_passwd.php:28
 msgid ""
-"1) If you know your account's email address, and you can receive email there:"
+"1) If you know your account's email address, and you can receive email "
+"there:"
 msgstr "1) 如果你知道你帳戶連結的電子郵件地址,你可以在那裡收到電子郵件:"
 
 #: ../user/get_passwd.php:29
@@ -4430,13 +4377,13 @@ msgstr "2) 如果你已經忘記了你帳戶所連結的電子郵件地址,或
 msgid ""
 "If you have run BOINC under this account, you can still access it. Here's "
 "how:"
-msgstr "如果你仍有 BOINC 客戶端運行在該帳戶下,請按如下操作指導取回你的密碼:"
+msgstr "如果你仍有 BOINC 客戶端執行在該帳戶下,請按如下操作指導取回你的密碼:"
 
 #: ../user/get_passwd.php:50
 msgid ""
 "Go to the BOINC data directory on your computer (its location is written to "
 "the Event Log at startup)."
-msgstr "切換到你電腦上的BOINC資料目錄 (這個目錄在一開始就已經寫到事件記錄檔裡)"
+msgstr "切換到你電腦上的 BOINC 資料目錄 (這個目錄在一開始就已經寫到事件記錄裡頭)"
 
 #: ../user/get_passwd.php:51
 msgid "Find your account file for this project; it will be named <b>%1</b>."
@@ -4447,7 +4394,8 @@ msgid "Open the file in a text editor like Notepad. You'll see something like"
 msgstr "用記事本等文件編輯器打開該文件,你將看到類似的如下內容:"
 
 #: ../user/get_passwd.php:62
-msgid "Select and Copy the string between %1 and %2 (%3 in the above example)."
+msgid ""
+"Select and Copy the string between %1 and %2 (%3 in the above example)."
 msgstr "選取並複製%1 和%2 之間的內容(上述例子中就應該是%3)。"
 
 #: ../user/get_passwd.php:64
@@ -4488,7 +4436,7 @@ msgstr "如果還沒有的話,%1下載 BOINC 的客戶端軟體%2。"
 
 #: ../user/host_app_versions.php:37
 msgid "Anonymous platform, missing app"
-msgstr "匿名平台,未知應用程式"
+msgstr "匿名平台,未知程式"
 
 #: ../user/host_app_versions.php:40
 msgid "anonymous platform"
@@ -4496,11 +4444,11 @@ msgstr "匿名平台"
 
 #: ../user/host_app_versions.php:43
 msgid "Missing app version"
-msgstr "無法辨識的應用程式版本"
+msgstr "無法辨識程式版本"
 
 #: ../user/host_app_versions.php:45
 msgid "Missing app"
-msgstr "未知應用程式"
+msgstr "未知程式"
 
 #: ../user/host_app_versions.php:47
 msgid "Missing platform"
@@ -4539,8 +4487,7 @@ msgid ""
 "You can not delete our record of this computer because our database still "
 "contains work for it. You must wait a few days until the work for this "
 "computer has been deleted from the project database."
-msgstr ""
-"你目前不能刪除該電腦的記錄,因為我們資料庫中仍有和其相關的運算任務記錄。你需要等到所有指定給該電腦的任務記錄都從專案資料庫中刪除,一般可能需要幾天。"
+msgstr "你目前不能刪除該電腦的記錄,因為我們資料庫中仍有和其相關的運算任務記錄。你需要等到所有指定給該電腦的任務記錄都從專案資料庫中刪除,一般可能需要幾天。"
 
 #: ../user/host_delete.php:40
 msgid "Delete record of computer"
@@ -4564,8 +4511,8 @@ msgstr "合併電腦"
 
 #: ../user/host_edit_form.php:38
 msgid ""
-"Sometimes BOINC assigns separate identities to the same computer by mistake. "
-"You can correct this by merging old identities with the newest one."
+"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 會給同一台電腦賦予多個唯一標識,你可以通過將舊標識和新標識合併以糾正該問題。"
 
 #: ../user/host_edit_form.php:56
@@ -4678,8 +4625,8 @@ msgstr "預設格式"
 
 #: ../user/html.php:33
 msgid ""
-"image; height cannot exceed 450 pixels. Please do not link to images without "
-"permission of the web site where the image is hosted."
+"image; height cannot exceed 450 pixels. Please do not link to images without"
+" permission of the web site where the image is hosted."
 msgstr "圖片,高度不能超出 450 像素,請不要在未經允許的情況下引用其它網站上的圖片。"
 
 #: ../user/html.php:35
@@ -4688,14 +4635,14 @@ msgstr "你也可以使用&(和號)開頭的字符實體來表示特殊字
 
 #: ../user/info.php:35
 msgid "Run %1 only on authorized computers"
-msgstr "僅在已授權的電腦上運行 %1"
+msgstr "僅在已授權的電腦上執行 %1"
 
 #: ../user/info.php:36
 msgid ""
 "Run %1 only on computers that you own, or for which you have obtained the "
 "owner's permission. Some companies and schools have policies that prohibit "
 "using their computers for projects such as %1."
-msgstr "僅在你自己的或者已獲准使用的電腦上運行%1。某些企業和學校是禁止在他們的電腦上運行和%1 的類似的專案。"
+msgstr "僅在你自己的或者已獲准使用的電腦上執行 %1。某些企業和學校是禁止在他們的電腦上執行和 %1 的類似的專案。"
 
 #: ../user/info.php:38
 msgid "How %1 will use your computer"
@@ -4706,13 +4653,13 @@ msgid ""
 "When you run %1 on your computer, it will use part of the computer's CPU "
 "power, disk space, and network bandwidth. You can control how much of your "
 "resources are used by %1, and when it uses them."
-msgstr "當你在電腦上運行 %1 時,他會使用你電腦上部分的處理器資源、硬碟空間以及網絡。你可以控制 %1 的資源使用量以及何時可以使用。"
+msgstr "當你在電腦上執行 %1 時,他會使用你電腦上部分的處理器資源、硬碟空間以及網絡。你可以控制 %1 的資源使用量以及何時可以使用。"
 
 #: ../user/info.php:40
 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 "你的電腦所完成的運算任務僅用來幫助 %1 實現其專案網站上所申明的目標。專案應用程式的版本可能會經常改變。"
+msgstr "你的電腦所完成的運算任務僅用來幫助 %1 實現專案的目標。專案程式的版本可能會經常更新。"
 
 #: ../user/info.php:42
 msgid "Privacy policy"
@@ -4720,13 +4667,11 @@ msgstr "隱私政策"
 
 #: ../user/info.php:43
 msgid ""
-"Your account on %1 is identified by a name that you choose. This name may be "
-"shown on the %1 web site, along with a summary of the work your computer has "
-"done for %1. If you want to be anonymous, choose a name that doesn't reveal "
-"your identity."
-msgstr ""
-"%1 通過你選擇的用戶名來標識你的帳戶。該用戶名以及你為%1 完成的運算任務的摘要將顯示在 %1 "
-"的網站上。如果你想要匿名,那請選擇一個不會洩漏你身份的用戶名。"
+"Your account on %1 is identified by a name that you choose. This name may be"
+" shown on the %1 web site, along with a summary of the work your computer "
+"has done for %1. If you want to be anonymous, choose a name that doesn't "
+"reveal your identity."
+msgstr "%1 通過你選擇的用戶名來標識你的帳戶。該用戶名以及你為%1 完成的運算任務的摘要將顯示在 %1 的網站上。如果你想要匿名,那請選擇一個不會洩漏你身份的用戶名。"
 
 #: ../user/info.php:44
 msgid ""
@@ -4735,18 +4680,14 @@ 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 ""
-"如果你參加了%1,那你的電腦中的相關信息比如處理器的型號、記憶體的大小等會被%1 記錄下來,以用來決定什麼樣的運算任務最適合你的電腦。這些信息也會顯示在 "
-"%1 的網站上,但是請不要擔心,我們絕對不會洩漏出你的電腦的位置比如域名、網絡地址等。"
+msgstr "如果你參加了%1,那你的電腦中的相關信息比如處理器的型號、記憶體的大小等會被%1 記錄下來,以用來決定什麼樣的運算任務最適合你的電腦。這些信息也會顯示在 %1 的網站上,但是請不要擔心,我們絕對不會洩漏出你的電腦的位置比如域名、網絡地址等。"
 
 #: ../user/info.php:45
 msgid ""
-"To participate in %1, you must give an address where you receive email. This "
-"address will not be shown on the %1 web site or shared with organizations. %"
-"1 may send you periodic newsletters; however, you can opt out at any time."
-msgstr ""
-"為了參加 %1,你必須提供一個能夠接收郵件的電子郵件地址。這個地址不會被顯示在 %1 的網站上。 %1 可能會定期向你發送專案的新聞快訊; "
-"當然,你隨時可以選擇退訂。"
+"To participate in %1, you must give an address where you receive email. This"
+" address will not be shown on the %1 web site or shared with organizations. "
+"%1 may send you periodic newsletters; however, you can opt out at any time."
+msgstr "為了參加 %1,你必須提供一個能夠接收郵件的電子郵件地址。這個地址不會被顯示在 %1 的網站上。 %1 可能會定期向你發送專案的新聞快訊; 當然,你隨時可以選擇退訂。"
 
 #: ../user/info.php:46
 msgid ""
@@ -4755,43 +4696,36 @@ 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 ""
-"在 %1 網站上發送的私人消息只對發送者和接收者可見。 %1 不會檢查或審查消息的內容。如果你從 %1 "
-"的用戶那收到不希望收到的私人消息,你可以把他們加入到你的 %2消息過濾器%3。這樣就可以避免你收到來自那位用戶的任何公共或私人消息。"
+msgstr "在 %1 網站上發送的私人消息只對發送者和接收者可見。 %1 不會檢查或審查消息的內容。如果你從 %1 的用戶那收到不希望收到的私人消息,你可以把他們加入到你的 %2消息過濾器%3。這樣就可以避免你收到來自那位用戶的任何公共或私人消息。"
 
 #: ../user/info.php:47
 msgid ""
 "If you use our web site forums you must follow the %2posting guidelines%3.  "
 "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 ""
-"如果你要使用我們的網站論壇,你必須遵守 %2發文注意事項%3。發送到 %1 "
-"論壇的文章對所有人都是可見的,即便不是我們網站的用戶也能看到。你的發文同時表明你允許所有人查看和覆製你的文章。"
+"members.  By posting to the forums, you are granting irrevocable license for"
+" anyone to view and copy your posts."
+msgstr "如果你要使用我們的網站論壇,你必須遵守 %2發文注意事項%3。發送到 %1 論壇的文章對所有人都是可見的,即便不是我們網站的用戶也能看到。你的發文同時表明你允許所有人查看和覆製你的文章。"
 
 #: ../user/info.php:48
 msgid "Is it safe to run %1?"
-msgstr "運行 %1 安全嗎?"
+msgstr "執行 %1 安全嗎?"
 
 #: ../user/info.php:49
 msgid ""
 "Any time you download a program through the Internet you are taking a "
 "chance: the program might have dangerous errors, or the download server "
-"might have been hacked. %1 has made efforts to minimize these risks. We have "
-"tested our applications carefully. Our servers are behind a firewall and 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 ""
-"只要你從網路下載程式就有可能碰到有危險錯誤的程式或者下載服務器已被駭客攻擊的情況。 %1 已經盡力最小化這方面的風險。我們已經仔細測試了我們的程式。我們"
-"的伺服器處於防火牆之後,並且設置了最高的安全級別。為了保證程式下載的正確性,全部的可執行文件會被放置在一台未聯網的安全電腦中進行數字簽名。"
+"might have been hacked. %1 has made efforts to minimize these risks. We have"
+" tested our applications carefully. Our servers are behind a firewall and "
+"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 "只要你從網路下載程式就有可能碰到有危險錯誤的程式或者下載服務器已被駭客攻擊的情況。 %1 已經盡力最小化這方面的風險。我們已經仔細測試了我們的程式。我們的伺服器處於防火牆之後,並且設置了最高的安全級別。為了保證程式下載的正確性,全部的可執行文件會被放置在一台未聯網的安全電腦中進行數字簽名。"
 
 #: ../user/info.php:50
 msgid ""
 "The applications run by %1 may cause some computers to overheat. If this "
 "happens, stop running %1 or use a %2utility program%3 that limits CPU usage."
-msgstr ""
-"%1 的應用程式可能會導致某些電腦溫度過高。如果你碰到了這種情形,請停止運行 %1 或者使用 %2某些工具軟體%3 來限制應用程式對處理器的使用。"
+msgstr "%1 的程式可能會導致某些電腦溫度過高。如果你碰到了這種情形,請停止執行 %1 或者使用 %2 某些工具軟體 %3 限制程式對處理器的使用。"
 
 #: ../user/info.php:51
 msgid ""
@@ -4805,8 +4739,8 @@ msgstr "免責申明"
 #: ../user/info.php:54
 msgid ""
 "%1 and %2 assume no liability for damage to your computer, loss of data, or "
-"any other event or condition that may occur as a result of participating in %"
-"1."
+"any other event or condition that may occur as a result of participating in "
+"%1."
 msgstr "%1 和%2 對於你的電腦損壞、資料丟失或其他任意由於參與 %1 所可能造成的事件沒有賠償責任。"
 
 #: ../user/info.php:56
@@ -4815,12 +4749,10 @@ msgstr "其它 BOINC 專案"
 
 #: ../user/info.php:57
 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 "
+"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 ""
-"除了 %1,還有其它一些專案也使用 BOINC 平台。你也許會考慮同時參加多個專案,這樣當你無法從 %1 "
-"獲取運算任務時,你的電腦仍可以處理其它專案的運算任務。"
+msgstr "除了 %1,還有其它一些專案也使用 BOINC 平台。你也許會考慮同時參加多個專案,這樣當你無法從 %1 獲取運算任務時,你的電腦仍可以處理其它專案的運算任務。"
 
 #: ../user/info.php:58
 msgid ""
@@ -4870,9 +4802,9 @@ msgstr "使用瀏覽器的語言設置"
 
 #: ../user/language_select.php:113
 msgid ""
-"Translations are done by volunteers.  If your native language is not here, %"
-"1you can provide a translation%2."
-msgstr "翻譯工作都是由志願者完成的,如果這裡沒有你的母語,%1你可以自己進行翻譯%2。"
+"Translations are done by volunteers.  If your native language is not here, "
+"%1you can provide a translation%2."
+msgstr "翻譯工作都是由志工完成的,如果這裡沒有你的語言,%1你可以自行翻譯%2。"
 
 #: ../user/login_form.php:45
 msgid "Email address:"
@@ -4918,12 +4850,7 @@ msgid ""
 "        having that name with the newest computer having that name.\n"
 "        Incompatible computers will not be merged.\n"
 "        <p>"
-msgstr ""
-"該操作使用名稱來合併電腦。 \n"
-"<p>\n"
-"對於每個名稱,它會將所有老的電腦合併到最新的電腦上。 \n"
-"軟硬件配置不兼容的電腦將不會被合併。 \n"
-"<p>"
+msgstr "該操作使用名稱來合併電腦。 \n<p>\n對於每個名稱,它會將所有老的電腦合併到最新的電腦上。 \n軟硬件配置不兼容的電腦將不會被合併。 \n<p>"
 
 #: ../user/merge_by_name.php:82
 msgid "Go ahead and do this"
@@ -4939,11 +4866,7 @@ msgid ""
 "To maximize discussion and flow of information,\n"
 "our message boards are moderated.\n"
 "Message board postings are subject to the following posting rules:\n"
-msgstr ""
-"\n"
-"為了讓大家的討論和交流能有效進行,\n"
-"我們為留言板設立了管理協調機制。 \n"
-"所有留言板的發帖都必須遵循如下的規則:\n"
+msgstr "\n為了讓大家的討論和交流能有效進行,\n我們為留言板設立了管理協調機制。 \n所有留言板的發帖都必須遵循如下的規則:\n"
 
 #: ../user/moderation.php:30
 msgid ""
@@ -4952,8 +4875,7 @@ msgid ""
 "Moderators may delete posts that violate any of these rules.\n"
 "The authors of deleted posts will be notified via email.\n"
 "Gross offenders may have their ability to post messages temporarily revoked\n"
-"(though to prevent abuse only project administrators have the ability to do "
-"so).\n"
+"(though to prevent abuse only project administrators have the ability to do so).\n"
 "Additional kinds of bad behavior (\"bugging\" posts to trap the\n"
 "IP addresses of other participants, excessive thread creation to spam\n"
 "the forums, etc.), while not listed in the formal rules, may still\n"
@@ -4982,24 +4904,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>\n"
-"管理員可能會刪除違規的文章,被刪文的用戶將得到電子郵件通知。 \n"
-"嚴重的違規者可能會被臨時封鎖發文權限(為防止該操作被濫用,只有專案管理員有相關的權限)。 \n"
-"其它未列在上述規則中的惡意行為(比如惡意收集其他用戶的IP 地址、或者在論壇中大量發表垃圾內容等)也可能面臨類似的處罰。 \n"
-"<p>\n"
-"如果你碰到違規的文章,請點擊文章內的紅色小叉並進行相應的說明;管理員將收到通知並進行處理。 \n"
-"該功能請務必僅用於處理違規文章,而不要用於處理個人爭端。 \n"
-"<p>\n"
-"我們在操作的時候將盡可能地保證公平,但對於如此大的一個網絡社區,包含了各種不同的觀點,可能仍然會有人對我們的管理決定不滿意。 \n"
-"對此我們十分抱歉,但請大家多多諒解,我們不可能在所有時候讓所有人滿意,我們只能根據我們了解的訊息、並且從論壇的整體利益出發來作出決定。 \n"
-"請不要在論壇討論我們的管理策略,我們不是在進行一個社會工程專案,也沒有試圖創建一個完美而公平的系統。 \n"
-"因此這樣的討論並不會起到什麼積極的作用,而且是潛在有害的。 \n"
-"當然,如果你一些合理的想法,請發送電子郵件到下面的地址。 \n"
-"<p>\n"
-"本管理規定由 %1 專案設立,如果你有想法要交流,請發送電子郵件到%2。 \n"
-"\n"
+msgstr "\n<p>\n管理員可能會刪除違規的文章,被刪文的用戶將得到電子郵件通知。 \n嚴重的違規者可能會被臨時封鎖發文權限(為防止該操作被濫用,只有專案管理員有相關的權限)。 \n其它未列在上述規則中的惡意行為(比如惡意收集其他用戶的IP 地址、或者在論壇中大量發表垃圾內容等)也可能面臨類似的處罰。 \n<p>\n如果你碰到違規的文章,請點擊文章內的紅色小叉並進行相應的說明;管理員將收到通知並進行處理。 \n該功能請務必僅用於處理違規文章,而不要用於處理個人爭端。 \n<p>\n我們在操作的時候將盡可能地保證公平,但對於如此大的一個網絡社區,包含了各種不同的觀點,可能仍然會有人對我們的管理決定不滿意。 \n對此我們十分抱歉,但請大家多多諒解,我們不可能在所有時候讓所有人滿意,我們只能根據我們了解的訊息、並且從論壇的整體利益出發來作出決定。 \n請不要在論壇討論我們的管理策略,我們不是在進行一個社會工程專案,也沒有試圖創建一個完美而公平的系統。 \n因此這樣的討論並不會起到什麼積極的作用,而且是潛在有害的。 \n當然,如果你一些合理的想法,請發送電子郵件到下面的 [...]
 
 #: ../user/pending.php:66
 msgid "Pending credit"
@@ -5082,9 +4987,7 @@ 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"
-"標記為垃圾信息,請修改你輸入的內容並重試。"
+msgstr "你的消息已被 Akismet 防垃圾信息系統\n標記為垃圾信息,請修改你輸入的內容並重試。"
 
 #: ../user/pm.php:205
 msgid "Could not find user with id %1"
@@ -5155,20 +5058,14 @@ 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"
-"          將在您的電腦與 %1 進行通訊的時候生效\n"
-"          或者您也可以直接執行 BOINC Manager裡的%2更新%3命令。"
+msgstr "您的偏好設定已經更新\n          將在您的電腦與 %1 進行通訊的時候生效\n          或者您也可以直接執行 BOINC Manager裡的%2更新%3命令。"
 
 #: ../user/prefs.php:41
 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。"
+msgstr "您的偏好設定已還原為預設值\n將在你的電腦與%1進行通訊的時候生效\n或者你也可以直接執行 BOINC 客戶端裡的%2更新%3。"
 
 #: ../user/prefs_edit.php:65 ../user/prefs_edit.php:93
 msgid "%1 for %2"
@@ -5198,13 +5095,13 @@ msgstr "取消"
 msgid ""
 "%1Profiles%2 let individuals share backgrounds and opinions with the %3 "
 "community."
-msgstr "通過 %1用戶檔案%2 志願者可以和 %3 社區分享他的背景和觀點。"
+msgstr "通過%1用戶檔案%2參與者可以和%3社區分享他的背景和觀點。"
 
 #: ../user/profile_menu.php:36
 msgid ""
 "Explore the diversity of your fellow volunteers, and contribute your own "
 "views for others to enjoy."
-msgstr "可以了解其他志願者的想法,也可以讓他人看到你分享的觀點。"
+msgstr "可以了解其他參與者的想法,也可以讓他人看到你分享的觀點。"
 
 #: ../user/profile_menu.php:37
 msgid ""
@@ -5320,11 +5217,11 @@ msgstr "沒有任務可以顯示"
 
 #: ../user/server_status.php:97
 msgid "Running"
-msgstr "運行中"
+msgstr "執行中"
 
 #: ../user/server_status.php:100
 msgid "Not Running"
-msgstr "未運行"
+msgstr "未執行"
 
 #: ../user/server_status.php:103
 msgid "Disabled"
@@ -5360,15 +5257,15 @@ msgstr "調度"
 
 #: ../user/server_status.php:294
 msgid "Running:"
-msgstr "運行中:"
+msgstr "執行中:"
 
 #: ../user/server_status.php:295
 msgid "Program is operating normally"
-msgstr "程式目前運行正常"
+msgstr "程式目前執行正常"
 
 #: ../user/server_status.php:296
 msgid "Not Running:"
-msgstr "未運行:"
+msgstr "未執行:"
 
 #: ../user/server_status.php:297
 msgid "Program failed or the project is down"
@@ -5440,11 +5337,11 @@ msgstr "當前處理能力(GFLOPs)"
 
 #: ../user/server_status.php:420
 msgid "Tasks by application"
-msgstr "按應用程式分類的任務"
+msgstr "按程式分類的任務"
 
 #: ../user/server_status.php:423 ../user/workunit.php:40
 msgid "application"
-msgstr "應用程式"
+msgstr "程式"
 
 #: ../user/server_status.php:424
 msgid "unsent"
@@ -5476,14 +5373,14 @@ msgstr "%1 的統計訊息"
 
 #: ../user/stats.php:37
 msgid ""
-"More detailed statistics for %1 and other BOINC-based projects are available "
-"at several web sites:"
+"More detailed statistics for %1 and other BOINC-based projects are available"
+" at several web sites:"
 msgstr "下列幾個網站可以查詢到關於 %1 和其它 BOINC 專案的更詳細的統計訊息:"
 
 #: ../user/stats.php:40
 msgid ""
-"You can also get your current statistics in the form of a \"signature image"
-"\":"
+"You can also get your current statistics in the form of a \"signature "
+"image\":"
 msgstr "你還可以通過“簽名圖片”的形式得到你當前的統計訊息:"
 
 #: ../user/stats.php:43
@@ -5572,8 +5469,8 @@ msgstr "查看團隊的成員加入/退出歷史"
 
 #: ../user/team_admins.php:45
 msgid ""
-"Moderate the team forum, if any (admins get email notification of moderation "
-"events and red X reports)"
+"Moderate the team forum, if any (admins get email notification of moderation"
+" events and red X reports)"
 msgstr "管理團隊論壇(團隊管理員會得到管理事件和報告的電子郵件通知)"
 
 #: ../user/team_admins.php:47
@@ -5680,13 +5577,9 @@ msgstr "拒絕請求"
 
 #: ../user/team_change_founder_form.php:58
 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,請使用下面的表格。"
+"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
 msgid "No transfer request is pending."
@@ -5864,7 +5757,8 @@ msgstr "留言版已移除"
 
 #: ../user/team_forum.php:124
 msgid ""
-"Your team's message board has been removed. You may now %1create a new one%2."
+"Your team's message board has been removed. You may now %1create a new "
+"one%2."
 msgstr "你的團隊留言板已移除,你現在可以%1建立一個新的留言板%2。"
 
 #: ../user/team_forum.php:143
@@ -5893,13 +5787,9 @@ msgstr "正在請求%1 的創始人資格"
 
 #: ../user/team_founder_transfer_action.php:98
 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 天沒有回應,你就可以成為創始人了。"
+"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
@@ -5971,16 +5861,9 @@ msgstr "你的請求已經通知到了創始人,如果他/她到 %1 都沒有
 
 #: ../user/team_founder_transfer_form.php:60
 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"
+"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"
-"你確定想要請求創始人資格嗎?"
+msgstr "如果你將得到團隊創始人的資格(因為當前的創建人不活躍等原因),請點擊下面的按鈕。你的請求將通過電子郵件通知到當前的創始人,他/她可以將創始人資格轉移給你或者拒絕你的請求。如果他/她在60 天內都沒有回應,你就可以得到創始人的資格。 <br /><br />\n你確定想要請求創始人資格嗎?"
 
 #: ../user/team_founder_transfer_form.php:65
 msgid "Request foundership"
@@ -6059,8 +5942,8 @@ msgstr "超過 100 個的團隊符合你的搜尋條件,現在只顯示了前
 
 #: ../user/team_lookup.php:104
 msgid ""
-"End of results. %1 If you cannot find the team you are looking for, you may %"
-"2create a team%3 yourself."
+"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
@@ -6141,9 +6024,9 @@ msgstr "建立或管理團隊留言板"
 
 #: ../user/team_manage.php:71
 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。"
+"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
 msgid ""
@@ -6153,8 +6036,8 @@ msgstr "建議所有團隊管理員都加入和參加到Google 的 %1boinc-team-
 
 #: ../user/team_manage.php:75
 msgid ""
-"Other resources for BOINC team admins are available from a third-party site, "
-"%1www.boincteams.com%2."
+"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
@@ -6189,17 +6072,10 @@ msgstr "退出 %1"
 msgid ""
 "<strong>Please note before quitting a team:</strong>\n"
 "         <ul>\n"
-"         <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"
+"         <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:40
 msgid "Quit Team"
@@ -6258,10 +6134,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 ""
-"下面的團隊符合一個或多個你的查詢條件。 \n"
-"要加入一個團隊,點擊名稱後即可進入團隊頁面,\n"
-"然後點擊%1加入該團隊%2即可。"
+msgstr "下面的團隊符合一個或多個你的查詢條件。 \n要加入一個團隊,點擊名稱後即可進入團隊頁面,\n然後點擊%1加入該團隊%2即可。"
 
 #: ../user/team_search.php:107
 msgid "Change your search"
@@ -6444,14 +6317,10 @@ msgstr "帳號資料"
 
 #: ../user/weak_auth.php:52
 msgid ""
-"You can access your account either by using your email address and "
-"password,\n"
+"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 ""
-"您現在可使用電子郵箱地址和密碼來登入您的帳號,\n"
-"或者也可以用一個指定的“帳號密鑰”。\n"
-"您的帳號密鑰是:"
+msgstr "您現在可使用電子郵箱地址和密碼來登入您的帳號,\n或者也可以用一個指定的“帳號密鑰”。\n您的帳號密鑰是:"
 
 #: ../user/weak_auth.php:57
 msgid "This key can be used to:"
@@ -6467,11 +6336,7 @@ 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,\n"
-"在BOINC的數據資料夾內建立名為%1的文件,\n"
-"而文件內容為:"
+msgstr "在不借助BOINC經理的情況下新增一台電腦到你的帳號,方法如下。\n先安裝BOINC,\n在BOINC的數據資料夾內建立名為%1的文件,\n而文件內容為:"
 
 #: ../user/weak_auth.php:73
 msgid "Weak account key"
@@ -6480,17 +6345,11 @@ msgstr "帳號密碼太弱"
 #: ../user/weak_auth.php:74
 msgid ""
 "Your 'weak account key' can be used to attach computers to your account\n"
-"    as described above, but cannot be used to log in to your account or "
-"change it in any way.\n"
+"    as described above, but cannot be used to log in to your account or change it in any way.\n"
 "    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"
-"如果您想在你的帳號新增不被信任的或不安全的電腦,\n"
-"您就應該使用弱帳號密碼\n"
-"你的弱帳號密碼是:"
+msgstr "您的“弱帳號密碼”能幫你的帳號新增電腦\n但不能用於登入在專案網站上的帳號或修改該帳號。\n如果您想在你的帳號新增不被信任的或不安全的電腦,\n您就應該使用弱帳號密碼\n你的弱帳號密碼是:"
 
 #: ../user/weak_auth.php:81
 msgid ""
@@ -6575,12 +6434,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:47
 msgid "Color scheme for graphics"
@@ -6592,131 +6446,14 @@ msgstr "顯示圖像時最多可以使用的CPU 資源%10 ... 100%2"
 
 #: ../project.sample/project_specific_prefs.inc:49
 msgid "Run only the selected applications"
-msgstr "僅運行選中的應用程式"
+msgstr "僅執行選中的程式"
 
 #: ../project.sample/project_specific_prefs.inc:50
 msgid ""
 "If no work for selected applications is available, accept work from other "
 "applications?"
-msgstr "如果選中的應用程式暫時沒有運算任務,是否從其它應用程式接收任務?"
+msgstr "如果選中的程式暫時沒有運算任務,是否接收其它程式的任務?"
 
 #: ../project.sample/project_specific_prefs.inc:91
 msgid "(all applications)"
-msgstr "(所有應用程式)"
-
-#~ msgid "Error:"
-#~ msgstr "錯誤:"
-
-#~ msgid "Account creation is disabled"
-#~ msgstr "帳號建立功能已停用"
-
-#~ msgid ""
-#~ "Sorry, this project has disabled the creation of new accounts.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "對不起,該專案已經禁止建立新帳號。 \n"
-#~ "請稍後重試。"
-
-#~ msgid "Account creation is currently disabled. Please try again later."
-#~ msgstr "帳號建立功能目前已暫停,請稍候再試。"
-
-#~ msgid "nvidia GPU"
-#~ msgstr "nvidia GPU"
-
-#~ msgid ""
-#~ "This project hasn\\'t created an email message - please notify its "
-#~ "administrators"
-#~ msgstr "此專案尚未建立電子郵件訊息,請聯繫專案管理員"
-
-#~ msgid "Use Intel GPU %1 Enforced by version 7.0+ %2"
-#~ msgstr "使用 Intel GPU%17.0 之後的版本有了此設定%2"
-
-#~ msgid ""
-#~ "These apply to all BOINC projects in which you participate.<br>\n"
-#~ "             On computers participating in multiple projects, the most "
-#~ "recently modified preferences will be used."
-#~ msgstr ""
-#~ "此處的偏好設定對你參加的所有 BOINC 專案均有效。 <br>\n"
-#~ "如果一台電腦參加了多個專案,以最近修改過的偏好設定為準。"
-
-#~ msgid "Export this news item as a Notice"
-#~ msgstr "將新聞項目匯出通知"
-
-#~ msgid ""
-#~ "Go to the BOINC data directory on your computer (on Windows this is usually "
-#~ "<b>C:\\Documents and Settings\\All Users\\Application Data\\BOINC</b> or "
-#~ "<b>C:\\Program Files\\BOINC</b>."
-#~ msgstr ""
-#~ "訪問你電腦上的 BOINC 資料目錄(Windows 系統上一般是<b>C:\\Documents and Settings\\All "
-#~ "Users\\Application Data\\BOINC</b> 或者<b>C:\\Program Files\\ \\BOINC</b>)。"
-
-#~ msgid "No such task"
-#~ msgstr "沒有這個任務"
-
-#~ msgid ""
-#~ "Computer is connected to the Internet about every %1 Leave blank or 0 if "
-#~ "always connected. %2 BOINC will try to maintain at least this much work (max "
-#~ "10 days). %3"
-#~ msgstr "電腦連結網路的時間間隔%1留空或0 即表示一直連線。 %2 BOINC 將根據此設定值決定在本地多少額外運算任務(最多十天)。 %3"
-
-#~ msgid "Maintain enough work for an additional"
-#~ msgstr "維護足夠的額外任務"
-
-#~ msgid "Update failed: "
-#~ msgstr "更新失敗:"
-
-#~ msgid "Provides %1limited access%2 to your account"
-#~ msgstr "僅可以%1部分查看%2您的帳號"
-
-#~ msgid ""
-#~ "Don't use this form. Just run BOINC, select Add Project, and enter an email "
-#~ "address and password."
-#~ msgstr "請不要使用這個表單。在BOINC Manager 內選擇 “ 新增專案 ”,然後輸入電子郵件地址並設定一個用戶密碼就可以了。"
-
-#~ msgid "Do not reorder sticky posts"
-#~ msgstr "不要對置頂的文章重新排序"
-
-#~ msgid "If a thread contains more than this number of posts"
-#~ msgstr "如果主題中包含的文章數量超過了"
-
-#~ msgid "only display the first one and this many of the last ones"
-#~ msgstr "只顯示第一篇和最近的多少篇"
-
-#~ msgid "Your report has been recorded. Thanks you for your input."
-#~ msgstr "舉報已經被記錄下來,感謝您的參與。"
-
-#~ msgid "Search type"
-#~ msgstr "搜尋類型"
-
-#~ msgid "User names starting with"
-#~ msgstr "用戶名稱以什麼開頭"
-
-#~ msgid ""
-#~ "Your 'weak account key' lets you link a computer to your account without "
-#~ "giving it the ability to log in to your account or to change it in any way."
-#~ msgstr " ‘ 弱帳戶密鑰 ’ 僅用於在客戶端加入專案,而不能用來登入並修改您在專案網站上的帳號。"
-
-#~ msgid ""
-#~ "This mechanism works only with projects that have upgraded their server "
-#~ "software 7 Dec 2007 or later."
-#~ msgstr "此機制只對於那些已更新至2007年12月7日版本服務端軟體的專案才有效。"
-
-#~ msgid "Your weak account key for this project is:"
-#~ msgstr "您的本專案弱帳號密鑰為:"
-
-#~ msgid ""
-#~ "To use your weak account key on a given host, find or create the 'account "
-#~ "file' for this project. This file has a name of the form "
-#~ "<b>account_PROJECT_URL.xml</b>. The account file for %1 is <b>%2</b>."
-#~ msgstr ""
-#~ "要在指定的主機上使用您的弱帳戶密鑰,得先找到或建立相應專案的‘帳號文件’,此文件的名稱類似於<b>account_專案網址.xml</b>。 %1 "
-#~ "的帳號文件為 <b>%2</b>。"
-
-#~ msgid "Create this file if needed. Set its contents to:"
-#~ msgstr "根據需要建立此文件,並將其內容設置為:"
-
-#~ msgid ""
-#~ "Your weak account key is a function of your password. If you change your "
-#~ "password, your weak account key changes, and your previous weak account key "
-#~ "becomes invalid."
-#~ msgstr "弱帳戶密鑰是根據您的密碼計算而來。如果您修改了您的密碼,弱帳戶密鑰也隨之改變,您之前的弱帳戶密鑰將失效。"
+msgstr "(所有程式)"
diff --git a/locale/zh_TW/BOINC-Setup.mo b/locale/zh_TW/BOINC-Setup.mo
index aaa1f90..512b297 100644
Binary files a/locale/zh_TW/BOINC-Setup.mo and b/locale/zh_TW/BOINC-Setup.mo differ
diff --git a/locale/zh_TW/BOINC-Setup.po b/locale/zh_TW/BOINC-Setup.po
index 2b474e6..1a64364 100644
--- a/locale/zh_TW/BOINC-Setup.po
+++ b/locale/zh_TW/BOINC-Setup.po
@@ -1,40 +1,33 @@
 # 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:
+# willy Wu <df910105 at yahoo.com.tw>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\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-12 02:16-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: zh_TW\n"
+"PO-Revision-Date: 2015-02-15 16:35+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-Basepath: /Volumes/Cheer/BOINC_GIT/boinc_trunk\n"
-"X-POOTLE-MTIME: 1391577769.0\n"
-"X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: mac_installer\n"
+"Language: zh_TW\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
+#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
 msgid "Yes"
 msgstr "是"
 
-#: PostInstall.cpp:131
-#: PostInstall.cpp:1137
-#: uninstall.cpp:1619
+#: PostInstall.cpp:131 PostInstall.cpp:1137 uninstall.cpp:1619
 msgid "No"
 msgstr "否"
 
@@ -48,11 +41,7 @@ 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"
-"\n"
-"你希望這台 Mac 上的非管理員也能運行和控制 %s 嗎?"
+msgstr "有管理員權限的使用者可以直接執行和控制 %s。\n\n\n你希望這台 Mac 上的非管理員也能執行和控制 %s 嗎?"
 
 #: PostInstall.cpp:1444
 #, c-format
@@ -71,9 +60,7 @@ msgstr "重新啟動後權限錯誤"
 msgid ""
 "Removal may take several minutes.\n"
 "Please be patient."
-msgstr ""
-"移除可能需要幾分鐘。\n"
-"請耐心等候。"
+msgstr "移除可能需要幾分鐘。\n請耐心等候。"
 
 #: uninstall.cpp:156
 #, c-format
@@ -81,10 +68,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 ""
-"您確定要完全從您的電腦中移除 %s?\n"
-"\n"
-"這將移除執行檔案,但不會影響 %s 的數據文件。"
+msgstr "您確定要完全從您的電腦中移除 %s?\n\n這將移除執行檔案,但不會影響 %s 的數據文件。"
 
 #: uninstall.cpp:163
 #, c-format
@@ -104,9 +88,7 @@ msgstr "使用者名稱"
 msgid ""
 "Do you also want to remove VirtualBox from your computer?\n"
 "(VirtualBox was installed along with BOINC.)"
-msgstr ""
-"請問您想順便從電腦移除VirtualBox?\n"
-"(VirtualBox曾隨著BOINC一起安裝。)"
+msgstr "請問您想順便從電腦移除VirtualBox?\n(VirtualBox曾隨著BOINC一起安裝。)"
 
 #: uninstall.cpp:312
 #, c-format
@@ -118,23 +100,14 @@ msgid ""
 "\n"
 "for each user, the file\n"
 "\"%s\"."
-msgstr ""
-"移除完畢。\n"
-"\n"
-"您可能想使用Finder刪除其餘項目:\n"
-"\"%s\" 目录\n"
-"\n"
-"每個用戶的文件\n"
-"\"%s\"。"
+msgstr "移除完畢。\n\n您可能想使用Finder刪除其餘項目:\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"
+msgstr "為了從您的電腦中完全移除 %s ,請輸入您的管理員密碼。\n\n"
 
 #: uninstall.cpp:1616
 msgid "Cancel"
@@ -143,24 +116,3 @@ msgstr "取消"
 #: uninstall.cpp:1617
 msgid "Continue..."
 msgstr "繼續..."
-
-#, c-format
-#~ msgid "Sorry, this version of %s requires system 10.4 or higher."
-#~ msgstr "抱歉, %s 需要 10.4 或更高的系統版本。"
-#~ msgid ""
-#~ "Removal completed.\n"
-#~ "\n"
-#~ " You may want to remove the following remaining items using the Finder: \n"
-#~ "\"/Library/Application Support/BOINC Data\" directory\n"
-#~ "\n"
-#~ "for each user, the file\n"
-#~ "\"/Users/[username]/Library/Preferences/BOINC Manager Preferences\"."
-#~ msgstr ""
-#~ "移除完畢。\n"
-#~ "\n"
-#~ "您可能想使用Finder刪除其餘項目:\n"
-#~ "\"/Library/Application Support/BOINC Data\"\n"
-#~ "\n"
-#~ "每個用戶的文件\n"
-#~ "\"/Users/[username]/Library/Preferences/BOINC Manager Preferences\"。"
-
diff --git a/locale/zh_TW/BOINC-Web.mo b/locale/zh_TW/BOINC-Web.mo
index 1567621..f8d8961 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 0ba6a0c..fc6d11a 100644
--- a/locale/zh_TW/BOINC-Web.po
+++ b/locale/zh_TW/BOINC-Web.po
@@ -1,26 +1,27 @@
 # BOINC web translation
 # Copyright (C) 2008-2009 University of California
+# 
 # This file is distributed under the same license as BOINC.
+# 
 # FileID  : $Id$
+# 
+# Translators:
+# Willy Wu <df910105 at yahoo.com.tw>, 2015
+# Willy Wu <df910105 at yahoo.com.tw>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC 7.4\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-12 02:17-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: zh_TW\n"
+"PO-Revision-Date: 2015-03-25 06:11+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.5.0\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
-"X-POOTLE-MTIME: 1393334371.0\n"
-"X-Poedit-KeywordsList: tra\n"
-"X-Poedit-SearchPath-0: doc\n"
 
 #: docutil.php:21
 msgid "Search"
@@ -33,11 +34,13 @@ msgstr "回到BOINC首頁"
 #: docutil.php:114
 #, php-format
 msgid "This page is %stranslatable%s."
-msgstr "這個網頁%s可翻譯%s"
+msgstr "網站需要您協助%s翻譯%s。"
 
 #: download.php:39
-msgid "We recommend that you also install VirtualBox, so your computer can work on science projects that require it."
-msgstr "我們建議您安裝VirtualBox,這樣您的電腦就可以在需要它的科學專案上多盡一份力。"
+msgid ""
+"We recommend that you also install VirtualBox, so your computer can work on "
+"science projects that require it."
+msgstr "我們建議您安裝VirtualBox,如此您的電腦就可以在需要它的科學專案上多盡一份力。"
 
 #: download.php:41
 msgid "Learn more about VirtualBox."
@@ -45,16 +48,14 @@ msgstr "了解更多關於VirtualBox。"
 
 #: download.php:51
 msgid "Download BOINC + VirtualBox"
-msgstr "下載 BOINC + Virtualbox"
+msgstr "下載BOINC + VirtualBox"
 
-#: download.php:54
-#: download.php:69
+#: download.php:54 download.php:69
 #, php-format
 msgid "for %s"
 msgstr "適用於 %s"
 
-#: download.php:57
-#: download.php:72
+#: download.php:57 download.php:72
 #, php-format
 msgid "BOINC version %s"
 msgstr "BOINC 版本 %s"
@@ -66,34 +67,42 @@ msgstr "VirtualBox 版本 %s"
 
 #: download.php:67
 msgid "Download BOINC"
-msgstr "下載 BOINC"
+msgstr "下載BOINC"
 
 #: download.php:123
-msgid "BOINC is a program that lets you donate your idle computer time to science projects like SETI at home, Climateprediction.net, Rosetta at home, World Community Grid, and many others."
-msgstr "BOINC是個軟體可以將您電腦的閒置時間貢獻給科學專案,例如SETI at home、Climateprediction.net、Rosetta at home、World Community Grid以及其他專案。"
+msgid ""
+"BOINC is a program that lets you donate your idle computer time to science "
+"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, and many others."
+msgstr "BOINC可以將您電腦的閒置時間貢獻給科學專案,例如SETI at home、Climateprediction.net、Rosetta at home、World Community Grid以及其他專案。"
 
 #: download.php:125
-msgid "After installing BOINC on your computer, you can connect it to as many of these projects as you like."
-msgstr "將電腦安裝BOINC後,您可以連結到您喜歡的專案。"
+msgid ""
+"After installing BOINC on your computer, you can connect it to as many of "
+"these projects as you like."
+msgstr "將電腦安裝BOINC後,您可以參與您喜歡的專案。"
 
 #: download.php:127
-msgid "You may run this software on a computer only if you own the computer or have the permission of its owner."
-msgstr "你應該在自己擁有的電腦或得到使用許可的電腦上執行這個軟體。"
+msgid ""
+"You may run this software on a computer only if you own the computer or have"
+" the permission of its owner."
+msgstr "你必須在自己的電腦或得到使用許可的電腦才能執行這個軟體。"
 
 #: download.php:132
-msgid "We recommend that you download BOINC from the Google Play Store or Amazon Appstore, not from here."
-msgstr "我們建議您使用Google Play Store或Amazon Appstore來下載BOINC,而不是從這裡。"
+msgid ""
+"We recommend that you download BOINC from the Google Play Store or Amazon "
+"Appstore, not from here."
+msgstr "我們建議您使用Google Play Store或Amazon Appstore下載BOINC,而不是從這裡。"
 
 #: download.php:167
 msgid "System requirements"
-msgstr "系統要求"
+msgstr "系統需求"
 
 #: download.php:168
 msgid "Release notes"
 msgstr "版本說明"
 
-#: download.php:169
-#: index.php:86
+#: download.php:169 index.php:86
 msgid "Help"
 msgstr "幫助"
 
@@ -103,7 +112,7 @@ msgstr "所有版本"
 
 #: download.php:171
 msgid "Version history"
-msgstr "歷史版本"
+msgstr "版本歷史"
 
 #: download.php:172
 msgid "GPU computing"
@@ -115,20 +124,34 @@ msgstr "BOINC:用電腦幫助科學"
 
 #: help.php:12
 #, php-format
-msgid "BOINC Online Help lets you talk one-on-one with experienced BOINC users, who can: %s answer questions about BOINC and volunteer computing; %s walk you through the process of installing and using BOINC; %s troubleshoot any problems you might have."
-msgstr "BOINC 的在線幫助讓您可以一對一地與有經驗的 BOINC 用戶進行交談,他們可以:%s回答您關於 BOINC 以及志願運算的問題;%s帶您完成安裝及使用BOINC 的過程;%s解決您可能有的任何問題。"
+msgid ""
+"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who"
+" can: %s answer questions about BOINC and volunteer computing; %s walk you "
+"through the process of installing and using BOINC; %s troubleshoot any "
+"problems you might have."
+msgstr "BOINC的線上幫助讓您可以一對一地與有經驗的BOINC用戶進行交談,他們可以:%s回答您關於BOINC以及志願運算的問題;%s帶您完成安裝及使用BOINC;%s解決您可能有的任何問題。"
 
 #: help.php:21
 #, php-format
-msgid "BOINC Online Help is based on %sSkype%s, an Internet-based telephone system. 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 的在線幫助基於%sSkype%s,一個網路的電話系統。 Skype 可以免費使用(包括軟體本身及使用該軟體進行通話)。如果您還沒有 Skype,請%s現在就下載並安裝它%s。當您完成後再回到這個頁面。"
+msgid ""
+"BOINC Online Help is based on %sSkype%s, an Internet-based telephone system."
+" 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使用%sSkype%s進行線上幫助,這是一個網路電話軟體。Skype可以免費使用(包括軟體本身及使用該軟體進行通話)。如果您還沒有Skype,請%s現在就下載並安裝它%s。當您完成後再回到這個頁面。"
 
 #: help.php:28
-msgid "The best way to get help is by voice, for which you need either built-in microphone and speakers or an external headset for your computer.  You can also use Skype's text-based chat system or regular email (if you don't have Skype) to communicate with Help Volunteers."
-msgstr "得到幫助的最好途徑是通過聲音,您的電腦必須擁有一個內建的麥克風和喇叭或外接的耳麥。您也可以使用 Skype 的聊天系統或者普通的電子郵件(如果您不使用Skype)和志願幫助者進行交流。"
+msgid ""
+"The best way to get help is by voice, for which you need either built-in "
+"microphone and speakers or an external headset for your computer.  You can "
+"also use Skype's text-based chat system or regular email (if you don't have "
+"Skype) to communicate with Help Volunteers."
+msgstr "得到幫助的最好途徑是通過對話,您的電腦必須擁有一個麥克風和喇叭或是耳機。您也可以使用Skype的聊天系統或者一般的電子郵件(如果您不使用Skype)和志願幫助者進行交流。"
 
 #: help.php:31
-msgid "Volunteers speaking several languages are available. Please select a language:"
+msgid ""
+"Volunteers speaking several languages are available. Please select a "
+"language:"
 msgstr "志願幫助者提供數種語言。請選擇語言:"
 
 #: help.php:47
@@ -137,21 +160,27 @@ msgstr "成為志願幫助者"
 
 #: help.php:50
 #, php-format
-msgid "If you're an experienced BOINC user, we encourage you to %sbecome a Help Volunteer%s.  It's a great way to help the cause of scientific research and volunteer computing - and it's fun!"
-msgstr "如果您是一位有經驗的BOINC用戶,我們鼓勵您%s成為一位志願幫助者%s。這對於科學研究和志願計算都大有益處- 而且還很有趣!"
+msgid ""
+"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
+"Volunteer%s.  It's a great way to help the cause of scientific research and "
+"volunteer computing - and it's fun!"
+msgstr "如果您是一位有經驗的BOINC用戶,我們鼓勵您%s成為一位志願幫助者%s。這對於科學研究和志願運算都大有益處 - 而且還很有趣!"
 
 #: help.php:56
 #, php-format
-msgid "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
-msgstr "如果你已經是志願幫助者:按%s這裡%s調整設定"
+msgid ""
+"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
+msgstr "如果你已經是志願幫助者: 按%s這裡%s調整設定。"
 
 #: help_funcs.php:107
-msgid "BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC or the University of California."
-msgstr "BOINC 幫助人員都是不收取任何費用的志願者。他們的建議不代表 BOINC 專案及加州大學。"
+msgid ""
+"BOINC helpers are unpaid volunteers.  Their advice is not endorsed by BOINC "
+"or the University of California."
+msgstr "BOINC幫助人員都是不收取任何費用的志工。他們的建議不代表BOINC專案及加州大學。"
 
 #: help_funcs.php:110
 msgid "%1Never%2 give email address or password information to BOINC helpers."
-msgstr "%1請千萬不要%2將你的電子郵件地址或者密碼提供給 BOINC 幫助人員。"
+msgstr "%1請千萬不要%2將你的電子信箱或者密碼提供給BOINC幫助人員。"
 
 #: index.php:24
 msgid "Computing power"
@@ -159,7 +188,7 @@ msgstr "運算能力"
 
 #: index.php:26
 msgid "Top 100 volunteers"
-msgstr "前 100 名的志願者"
+msgstr "前100名志願者"
 
 #: index.php:27
 msgid "Statistics"
@@ -167,21 +196,20 @@ msgstr "統計"
 
 #: index.php:55
 msgid "Active:"
-msgstr "活躍的:"
+msgstr "活躍志願者:"
 
 #: index.php:55
 msgid "volunteers,"
-msgstr "志願者,"
+msgstr "位,"
 
 #: index.php:55
 msgid "computers.\n"
-msgstr "電腦。\n"
+msgstr "台電腦。\n"
 
 #: index.php:56
 msgid "24-hour average:"
-msgstr "24 小時平均:"
+msgstr "24小時平均:"
 
-# 80%
 #: index.php:56
 msgid "PetaFLOPS."
 msgstr "PFLOPS。"
@@ -198,9 +226,7 @@ msgstr "志願者"
 msgid "Download"
 msgstr "下載"
 
-#: index.php:87
-#: index.php:120
-#: index.php:171
+#: index.php:87 index.php:120 index.php:171
 msgid "Documentation"
 msgstr "文件"
 
@@ -213,8 +239,11 @@ msgid "Links"
 msgstr "連結"
 
 #: index.php:94
-msgid "Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:"
-msgstr "使用您電腦的閒置時間(Windows, Mac, Linux或Android)來治療疾病、研究全球暖化、發現脈衝星,以及許多類型的科學研究。這既安全可靠且容易:"
+msgid ""
+"Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure"
+" diseases, study global warming, discover pulsars, and do many other types "
+"of scientific research.  It's safe, secure, and easy:"
+msgstr "使用您電腦的閒置時間(Windows, Mac, Linux或Android)治療疾病、研究全球暖化、發現脈衝星,以及許多類型的科學研究。這既安全可靠且容易上手:"
 
 #: index.php:96
 msgid "Choose projects"
@@ -226,36 +255,42 @@ msgstr "下載BOINC軟體"
 
 #: index.php:98
 msgid "Enter an email address and password."
-msgstr "輸入電子郵件和密碼。"
+msgstr "輸入電子信箱和密碼。"
 
 #: index.php:102
 #, php-format
-msgid "Or, if you run several projects, try an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
-msgstr "或者,如果您想參加多個研究專案,可以使用 %s帳號管理服務%s 來簡化您的日常操作,比如%sGridRepublic%s 或者%sBAM!%s。"
+msgid ""
+"Or, if you run several projects, try an %saccount manager%s such as "
+"%sGridRepublic%s or %sBAM!%s. "
+msgstr "或者,您如果想參加多個研究專案,可以使用%s帳號管理服務%s,例如%sGridRepublic%s或者%sBAM!%s。"
 
 #: index.php:118
 msgid "Compute with BOINC"
-msgstr "使用 BOINC 來運算"
+msgstr "使用BOINC運算"
 
 #: index.php:121
 msgid "Software updates"
 msgstr "軟體更新"
 
 #: index.php:128
-msgid "%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving you the computing power of thousands of CPUs."
-msgstr "%1科學家%2:使用 BOINC 來建立%3志願計算專案%4,可得到成千上萬個處理器的運算能力。"
+msgid ""
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving"
+" you the computing power of thousands of CPUs."
+msgstr "%1科學家%2:使用BOINC建立%3志願運算專案%4,可得到成千上萬個處理器的運算能力。"
 
 #: index.php:132
-msgid "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing Center%4."
-msgstr "%1大學院校%2:使用 BOINC 來建立%3虛擬校園超級運算中心%4。"
+msgid ""
+"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
+"Center%4."
+msgstr "%1大學院校%2:使用BOINC建立%3虛擬校園超級運算中心%4。"
 
 #: index.php:137
 msgid "%1Companies%2: use BOINC for %3desktop Grid computing%4."
-msgstr "%1公司企業%2:將 BOINC 用於%3桌面網格運算%4。"
+msgstr "%1公司企業%2:將BOINC用於%3桌面網格運算%4。"
 
 #: index.php:149
 msgid "The BOINC project"
-msgstr "BOINC 專案"
+msgstr "BOINC專案"
 
 #: index.php:155
 msgid "Message boards"
@@ -263,15 +298,15 @@ msgstr "留言版"
 
 #: index.php:156
 msgid "Email lists"
-msgstr "電子郵件列表"
+msgstr "電子信箱列表"
 
 #: index.php:157
 msgid "Personnel and contributors"
-msgstr "專案人員與贊助者"
+msgstr "專案人員與貢獻者"
 
 #: index.php:158
 msgid "Events"
-msgstr "事件"
+msgstr "活動"
 
 #: index.php:159
 msgid "Papers and talks"
@@ -283,7 +318,7 @@ msgstr "研究專案"
 
 #: index.php:161
 msgid "Logos and graphics"
-msgstr "標幟與圖表"
+msgstr "標幟和圖片"
 
 #: index.php:162
 msgid "and"
@@ -295,11 +330,11 @@ msgstr "我們需要幫助!"
 
 #: index.php:168
 msgid "Programming"
-msgstr "編寫程式"
+msgstr "撰寫程式"
 
 #: index.php:169
 msgid "Translation"
-msgstr "翻譯"
+msgstr "中文翻譯"
 
 #: index.php:170
 msgid "Testing"
@@ -307,7 +342,7 @@ msgstr "測試"
 
 #: index.php:172
 msgid "Publicity"
-msgstr "宣傳"
+msgstr "宣傳推廣"
 
 #: index.php:174
 msgid "Software development"
@@ -315,12 +350,13 @@ msgstr "軟體開發"
 
 #: index.php:175
 msgid "APIs for add-on software"
-msgstr "APIs 外掛軟體"
+msgstr "APIs外掛軟體"
 
 #: index.php:217
 #, php-format
-msgid "Open-source software for %svolunteer computing%s and %sgrid computing%s."
-msgstr "用於%s志願計算%s 和%s網格計算%s 的開放軟體"
+msgid ""
+"Open-source software for %svolunteer computing%s and %sgrid computing%s."
+msgstr "%s志願運算%s和%s網格運算%s的開放軟體"
 
 #: index.php:230
 msgid "BOINC is based at The University of California, Berkeley"
@@ -330,55 +366,62 @@ msgstr "BOINC 發起於加州大學柏克萊分校"
 msgid "Distributed sensing"
 msgstr "分散式傳感"
 
-# 78%
 #: projects.inc:19
 msgid "Stanford University"
-msgstr "史丹福大學"
+msgstr "Stanford University"
 
 #: projects.inc:20
 msgid "Seismology"
 msgstr "地震"
 
 #: projects.inc:21
-msgid "The Quake-Catcher Network is developing the world's largest seismic network using sensors attached to Internet-connected computers.  You must buy a sensor to participate."
+msgid ""
+"The Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to Internet-connected computers.  You must buy a "
+"sensor to participate."
 msgstr "捕震網(QCN)正在開發世界上最大的地震網路,使用傳感器與網路連接。您必須購買一個傳感器才能參加。"
 
 #: projects.inc:27
 msgid "BOINC Poland Foundation"
-msgstr "BOINC波蘭基金會"
+msgstr "BOINC Poland Foundation"
 
 #: projects.inc:28
 msgid "Environmental research"
 msgstr "環境研究"
 
 #: projects.inc:29
-msgid "This project is creating a free and continuously updated map of radiation levels by using sensors connected to volunteers' computers.  You must buy a sensor to participate."
+msgid ""
+"This project is creating a free and continuously updated map of radiation "
+"levels by using sensors connected to volunteers' computers.  You must buy a "
+"sensor to participate."
 msgstr "此專案正在建立在一個免費和持續更新的輻射水平地圖,透過使用傳感器連接到使用者的電腦。您必須購買一個傳感器才能參加。"
 
 #: projects.inc:33
-msgid "To participate in these projects you must buy a sensor and attach it to your computer."
+msgid ""
+"To participate in these projects you must buy a sensor and attach it to your"
+" computer."
 msgstr "想參加這些專案,您必須購買一個傳感器且與電腦連接"
 
 #: projects.inc:37
 msgid "Cognitive science and artifical intelligence"
 msgstr "科學認知和人工智慧"
 
-#: projects.inc:60
-#: projects.inc:364
-#: projects.inc:408
-#: projects.inc:457
-#: projects.inc:464
-#: projects.inc:511
+#: projects.inc:60 projects.inc:364 projects.inc:408 projects.inc:457
+#: projects.inc:464 projects.inc:511
 msgid "Private"
-msgstr "個人檔案"
+msgstr "Private"
 
 #: projects.inc:61
 msgid "Artificial intelligence"
 msgstr "人工智慧"
 
 #: projects.inc:62
-msgid "Parse and convert semantic nets for use in FreeHAL, an artificial intelligence that uses semantic networks, stemmers, part of speech databases, and part of speech taggers in order to imitate human behavior in conversations."
-msgstr "解析和轉換用於 FreeHAL 的語義網,而FreeHAL 是一個利用語義網絡來模仿人類的交談行為的人工智慧。"
+msgid ""
+"Parse and convert semantic nets for use in FreeHAL, an artificial "
+"intelligence that uses semantic networks, stemmers, part of speech "
+"databases, and part of speech taggers in order to imitate human behavior in "
+"conversations."
+msgstr "解析和轉換用於FreeHAL的語義網,而FreeHAL是一個利用語義網絡模仿人類的交談行為的人工智慧。"
 
 #: projects.inc:69
 msgid "Biology and Medicine"
@@ -386,108 +429,149 @@ msgstr "生物和醫藥"
 
 #: projects.inc:82
 msgid "University College Dublin"
-msgstr "都柏林大學"
+msgstr "University College Dublin"
 
 #: projects.inc:83
 msgid "Antimalarial drug discovery"
 msgstr "發現抗瘧疾藥物"
 
 #: projects.inc:84
-msgid "The parasite that causes malaria continues to evolve resistance to available medication. We therefore urgently need to discover new drugs to replace existing drugs. Importantly, these new drugs need to target NEW proteins in the parasite. The FightMalaria at Home project is aimed at finding these new targets."
+msgid ""
+"The parasite that causes malaria continues to evolve resistance to available"
+" medication. We therefore urgently need to discover new drugs to replace "
+"existing drugs. Importantly, these new drugs need to target NEW proteins in "
+"the parasite. The FightMalaria at Home project is aimed at finding these new "
+"targets."
 msgstr "造成瘧疾的寄生蟲持續對於抵抗藥物治療進化中。我們因此急需發掘新藥以代替現存的藥物。重要的是,這些藥物需要能夠標定寄生蟲體內\"新的\"蛋白質。FightMalaria at Home專案就是以發現這些新的標靶為目標。"
 
 #: projects.inc:90
 msgid "University of Karlsruhe (Germany)"
-msgstr "德國卡爾斯魯厄(Karlsruhe)大學"
+msgstr "University of Karlsruhe (Germany)"
 
 #: projects.inc:91
 msgid "Protein structure prediction"
 msgstr "蛋白質結構預測"
 
 #: projects.inc:92
-msgid "POEM at HOME uses a computational approach to predict the biologically active structure of proteins, to understand the signal-processing mechanisms when the proteins interact with one another, to understand diseases related to protein malfunction or aggregation, and to develop new drugs on the basis of the three-dimensions structure of biologically important proteins."
-msgstr "POEM at HOME 通過計算的途徑來預測蛋白質的生物結構、理解蛋白質之間交互的信號傳遞機制、理解疾病相關的蛋白質變異,並在生物學重要的蛋白質的三維結構的基礎上開發新的藥物。"
+msgid ""
+"POEM at HOME uses a computational approach to predict the biologically active "
+"structure of proteins, to understand the signal-processing mechanisms when "
+"the proteins interact with one another, to understand diseases related to "
+"protein malfunction or aggregation, and to develop new drugs on the basis of"
+" the three-dimensions structure of biologically important proteins."
+msgstr "POEM at HOME通過運算的途徑預測蛋白質的生物結構、理解蛋白質之間交互的信號傳遞機制、理解疾病相關的蛋白質變異,並在生物學重要的蛋白質的3D結構的基礎上開發新的藥物。"
 
 #: projects.inc:98
 msgid "University of Delaware"
-msgstr "美國德拉瓦大學"
+msgstr "University of Delaware"
 
 #: projects.inc:99
 msgid "Study of protein - ligand interactions"
 msgstr "研究蛋白質和配體間的相互作用"
 
 #: projects.inc:100
-msgid "Docking at Home has both bioscience and computer science goals. The project aims to further knowledge of the atomic details of protein-ligand interactions and, by doing so, will search for insights into the discovery of novel pharmaceuticals."
-msgstr "Docking at Home 的研究目標既包括生物科學上的,也包括計算機科學上的。該專案試圖了解蛋白質配體交互過程中的原子尺度的細節,並以此來尋找新的藥物。"
+msgid ""
+"Docking at Home has both bioscience and computer science goals. The project "
+"aims to further knowledge of the atomic details of protein-ligand "
+"interactions and, by doing so, will search for insights into the discovery "
+"of novel pharmaceuticals."
+msgstr "Docking at Home 的研究目標包括生物科學及電腦科學。該專案試圖了解蛋白質配體交互過程中的原子尺度的細節,並以此尋找新的藥物。"
 
 #: projects.inc:114
 msgid "Barcelona Biomedical Research Park (PRBB)"
-msgstr "巴塞羅那生物醫藥研究區(PRBB)"
+msgstr "Barcelona Biomedical Research Park (PRBB)"
 
 #: projects.inc:115
 msgid "Molecular simulations of proteins"
 msgstr "蛋白質分子結構模型"
 
 #: projects.inc:116
-msgid "GPUGrid.net opens novel computational scenarios by the first full-atom molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. New biomedical applications suddenly become possible giving a new role to computational biology for biomedical research."
-msgstr "GPUGrid.net 利用NVIDIA 的GPU 來進行全原子的分子動力學模擬。計算生物學的應用給生物醫藥學帶來了新的研究方向。"
+msgid ""
+"GPUGrid.net opens novel computational scenarios by the first full-atom "
+"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
+"New biomedical applications suddenly become possible giving a new role to "
+"computational biology for biomedical research."
+msgstr "GPUGrid.net利用NVIDIA的GPU進行全原子的分子動力學模擬(CellMD)。運算生物學的應用給生物醫藥學帶來了新的研究方向。"
 
 #: projects.inc:122
 msgid "Technion, Israel"
-msgstr "以色列理工大學"
+msgstr "Technion, Israel"
 
 #: projects.inc:123
 msgid "Genetic linkage analysis"
 msgstr "遺傳分析"
 
 #: projects.inc:124
-msgid "Superlink at Technion helps geneticists all over the world find disease-provoking genes causing some types of diabetes, hypertension (high blood pressure), cancer, schizophrenia and many others."
-msgstr "Superlink at Technion 幫助全世界的遺傳學家來尋找會導致某些類型疾病的基因,例如糖尿病、高血壓、癌症、精神分裂...等等。"
+msgid ""
+"Superlink at Technion helps geneticists all over the world find disease-"
+"provoking genes causing some types of diabetes, hypertension (high blood "
+"pressure), cancer, schizophrenia and many others."
+msgstr "Superlink at Technion幫助全世界的遺傳學家尋找會導致某些類型疾病的基因,例如糖尿病、高血壓、癌症、精神分裂...等等。"
 
 #: projects.inc:138
-msgid "University of Maryland Center for Bioinformatics and Computational Biology"
-msgstr "美國馬里蘭大學生物信息學和計算生物學中心"
+msgid ""
+"University of Maryland Center for Bioinformatics and Computational Biology"
+msgstr "University of Maryland Center for Bioinformatics and Computational Biology"
 
 #: projects.inc:139
 msgid "Life science research"
 msgstr "生命科學研究"
 
 #: projects.inc:140
-msgid "The Lattice Project supplies computing power to scientists at the University of Maryland studying evolutionary relationships based on DNA sequence data; bacterial, plasmid, and virus protein sequences; and biological diversity in nature reserves. "
-msgstr "The Lattice Project 為馬里蘭大學的科學家們提供計算資源,用於研究基於DNA 序列數據的進化關係,細菌、病毒蛋白質序列,還有自然界的生物多樣性。"
+msgid ""
+"The Lattice Project supplies computing power to scientists at the University"
+" of Maryland studying evolutionary relationships based on DNA sequence data;"
+" bacterial, plasmid, and virus protein sequences; and biological diversity "
+"in nature reserves. "
+msgstr "The Lattice Project 為馬里蘭大學的科學家們提供運算資源,用於研究基於DNA 序列數據的進化關係,細菌、病毒蛋白質序列,還有自然界的生物多樣性。"
 
 #: projects.inc:146
 msgid "The Swiss Tropical Institute"
-msgstr "瑞士熱帶研究所"
+msgstr "The Swiss Tropical Institute"
 
 #: projects.inc:147
 msgid "Epidemiology"
 msgstr "流行疾病學"
 
 #: projects.inc:148
-msgid "Simulation models of the transmission dynamics and health effects of malaria are an important tool for malaria control. They can be used to determine optimal strategies for delivering mosquito nets, chemotherapy, or new vaccines which are currently under development and testing.  Such modeling is extremely computer intensive, requiring simulations of large human populations with a diverse set of parameters related to biological and social factors that influence the distribution of [...]
-msgstr "模擬瘧疾的傳播動力學模型,用於對瘧疾的控制,包括如何才能對蚊帳、藥物和正在研發測試過程中的疫苗等進行最優化的分發。相關的建模過程非常耗費計算資源,除了需要模擬相當大的人群分佈,還要考慮生物學和社會學方面對疾病傳播可能有影響的相關因素。"
+msgid ""
+"Simulation models of the transmission dynamics and health effects of malaria"
+" are an important tool for malaria control. They can be used to determine "
+"optimal strategies for delivering mosquito nets, chemotherapy, or new "
+"vaccines which are currently under development and testing.  Such modeling "
+"is extremely computer intensive, requiring simulations of large human "
+"populations with a diverse set of parameters related to biological and "
+"social factors that influence the distribution of the disease. "
+msgstr "模擬瘧疾的傳播動力學模型,用於對瘧疾的控制,包括如何才能對蚊帳、藥物和正在研發測試過程中的疫苗等進行最優化的分發。相關的建模過程非常耗費運算資源,除了需要模擬相當大的人群分佈,還要考慮生物學和社會學方面對疾病傳播可能有影響的相關因素。"
 
 #: projects.inc:170
 msgid "University of Washington"
-msgstr "美國華盛頓大學"
+msgstr "University of Washington"
 
-#: projects.inc:171
-#: projects.inc:179
+#: projects.inc:171 projects.inc:179
 msgid "Biology"
 msgstr "生物學"
 
 #: projects.inc:172
-msgid "Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta at home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimer's"
-msgstr "對蛋白質的三維結構進行預測,可能最終能幫助找到一些重大人類疾病的治療方法。通過運行Rosetta at home 你能夠幫助我們加速這個進程,並能擴展我們的研究領域,而沒有你們的幫助,這都是不可能完成的。除些之外,你還能幫助我們設計新的蛋白質,用來對抗類似愛滋、天花、癌症和老年癡呆症等疾病。"
+msgid ""
+"Determine the 3-dimensional shapes of proteins in research that may "
+"ultimately lead to finding cures for some major human diseases. By running "
+"Rosetta at home you will help us speed up and extend our research in ways we "
+"couldn't possibly attempt without your help. You will also be helping our "
+"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
+"Cancer, and Alzheimer's"
+msgstr "對蛋白質的3D結構進行預測,可能最終能幫助找到一些重大人類疾病的治療方法。通過 Rosetta at home 你能夠幫助我們加速這個過程,並能擴展我們的研究領域,而沒有你們的幫助,這都是不可能完成的。除些之外,你還能幫助我們設計新的蛋白質,用來對抗類似愛滋、天花、癌症和老年癡呆症等疾病"
 
 #: projects.inc:178
 msgid "University of Vienna"
-msgstr "維也納大學"
+msgstr "University of Vienna"
 
 #: projects.inc:180
-msgid "Calculate similarities between proteins. SIMAP provides a public database of the resulting data, which plays a key role in many bioinformatics research projects."
-msgstr "計算蛋白質結構間的相似性。 SIMAP 以公共數據庫的形式發布其研究結果,該資料庫對很多生物信息學研究項目有重要作用。"
+msgid ""
+"Calculate similarities between proteins. SIMAP provides a public database of"
+" the resulting data, which plays a key role in many bioinformatics research "
+"projects."
+msgstr "運算蛋白質結構間的相似性。SIMAP 以公共數據庫的形式發布其研究結果,該資料庫對很多生物資訊學研究項目有重要作用。"
 
 #: projects.inc:186
 msgid "Earth Sciences"
@@ -495,14 +579,22 @@ msgstr "地球科學"
 
 #: projects.inc:198
 msgid "Oxford University"
-msgstr "英國牛津大學"
+msgstr "Oxford University"
 
 #: projects.inc:199
 msgid "Climate study"
 msgstr "氣候研究"
 
 #: projects.inc:200
-msgid "Investigate the approximations that have to be made in state-of-the-art climate models. By running the model thousands of times we hope to find out how the model responds to slight tweaks to these approximations - slight enough to not make the approximations any less realistic. This will allow us to improve our understanding of how sensitive our models are to small changes and also to things like changes in carbon dioxide and the sulphur cycle. This will allow us to explore how cl [...]
+msgid ""
+"Investigate the approximations that have to be made in state-of-the-art "
+"climate models. By running the model thousands of times we hope to find out "
+"how the model responds to slight tweaks to these approximations - slight "
+"enough to not make the approximations any less realistic. This will allow us"
+" to improve our understanding of how sensitive our models are to small "
+"changes and also to things like changes in carbon dioxide and the sulphur "
+"cycle. This will allow us to explore how climate may change in the next "
+"century under a wide range of different scenarios."
 msgstr "研究最新的​​氣候模型中的近似處理。通過將模型運行數千次,我們希望能研究模型對近似處理的反應,同時還要保證模型不能脫離於實際。這能夠幫助我們加深對模型的理解,包括對二氧化碳、硫循環等的敏感程度。更進一步,這能夠幫助我們了解下一個世紀的氣候變化趨勢,包括各種不同的場景。"
 
 #: projects.inc:207
@@ -514,125 +606,174 @@ msgid "Mechanical engineering"
 msgstr "機械工程"
 
 #: projects.inc:214
-msgid "Currently we are calculating the optimum design of a structure call the 52 bar truss"
+msgid ""
+"Currently we are calculating the optimum design of a structure call the 52 "
+"bar truss"
 msgstr "現在我們正在對一個名為52 bar truss的結構進行優化設計。"
 
-#: projects.inc:224
-#: projects.inc:263
-#: projects.inc:271
+#: projects.inc:224 projects.inc:263 projects.inc:271
 msgid "Astronomy"
 msgstr "天文學"
 
 #: projects.inc:225
-msgid "We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."
-msgstr "我們將結合 GALEX、Pan-STARRS1 和 WISE 的光譜覆蓋範圍,來建立鄰近宇宙的多波長紫外線光近紅外星系圖譜。我們將在分散式模型上利用光譜能量分佈擬合技術(SED)解析每個像素來測量物理參數(例如同恆星的表面密度、恆星形成的表面密度、衰減和一級恆星的形成歷史)。"
+msgid ""
+"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
+"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
+"Universe. We will measure physical parameters (such as stellar mass surface "
+"density, star formation rate surface density, attenuation, and first-order "
+"star formation history) on a resolved pixel-by-pixel basis using spectral "
+"energy distribution (SED) fitting techniques in a distributed computing "
+"mode."
+msgstr "我們將結合GALEX、Pan-STARRS1和WISE的光譜覆蓋範圍,建立鄰近宇宙的多波長紫外線光近紅外星系圖譜。我們將在分散式模型上利用光譜能量分佈擬合技術(SED)解析每個像素測量物理參數(例如同恆星的表面密度、恆星形成的表面密度、衰減和一級恆星的形成歷史)。"
 
 #: projects.inc:247
 msgid "University of Texas at Austin"
-msgstr "德克薩斯大學奧斯汀分校"
+msgstr "University of Texas at Austin"
 
-#: projects.inc:248
-#: projects.inc:279
+#: projects.inc:248 projects.inc:279
 msgid "Chemistry"
 msgstr "化學"
 
 #: projects.inc:249
-msgid "A common problem in theoretical chemistry, condensed matter physics and materials science is the calculation of the time evolution of an atomic scale system where, for example, chemical reactions and/or diffusion occur. Generally the events of interest are quite rare (many orders of magnitude slower than the vibrational movements of the atoms), and therefore direct simulations, tracking every movement of the atoms, would take thousands of years of computer calculations on the fast [...]
-msgstr "理論化學、凝集態物理和材料科學中的一個常見問題是對原子尺度系統的時間演化過程(比如化學反應)的計算。一般來說在這些過程中讓研究人員感興趣的事件的發生概述都相當低(比原子的振動要慢好多個數量級),因為即使是在目前最快的計算機上,也需要幾千年的計算時間才有可能碰到一次有研究價值的事件。我們的研究組就致力於對這些系統的長時動力學過程進行計算。"
+msgid ""
+"A common problem in theoretical chemistry, condensed matter physics and "
+"materials science is the calculation of the time evolution of an atomic "
+"scale system where, for example, chemical reactions and/or diffusion occur. "
+"Generally the events of interest are quite rare (many orders of magnitude "
+"slower than the vibrational movements of the atoms), and therefore direct "
+"simulations, tracking every movement of the atoms, would take thousands of "
+"years of computer calculations on the fastest present day computer before a "
+"single event of interest can be expected to occur.  Our research group is "
+"interested in calculating the long time dynamics of systems."
+msgstr "理論化學、凝集態物理和材料科學中的一個常見問題是對原子尺度系統的時間演化過程比如化學反應的運算。一般來說在這些過程中讓研究人員感興趣的事件的發生概述都相當低(比原子的振動要慢好多個等級),因為即使是在目前最快的電腦上,也需要幾千年的運算時間才有可能碰到一次有研究價值的事件。我們的研究團隊就致力於對這些系統的長時動力學過程進行運算。"
 
-# 95%
 #: projects.inc:262
 msgid "University of Illinois at Urbana-Champaign"
-msgstr "伊利諾伊大學厄巴納-香檳分校"
+msgstr "University of Illinois at Urbana-Champaign"
 
 #: projects.inc:264
-msgid "The goal of Cosmology at Home is to search for the model that best describes our Universe and to find the range of models that agree with the available astronomical particle physics data."
+msgid ""
+"The goal of Cosmology at Home is to search for the model that best describes "
+"our Universe and to find the range of models that agree with the available "
+"astronomical particle physics data."
 msgstr "Cosmology at Home 的目標是搜索可以描述我們宇宙的最適合的模型,並研究能夠與天文觀測數據相符的模型範圍。"
 
 #: projects.inc:270
 msgid "Rensselaer Polytechnic Institute"
-msgstr "倫斯勒理工學院"
+msgstr "Rensselaer Polytechnic Institute"
 
 #: projects.inc:272
-msgid "The goal of Milkyway at Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey."
-msgstr "Milkeyway at Home 使用Sloan 數字巡天的數據來對銀河系進行高精度的三維建模。"
+msgid ""
+"The goal of Milkyway at Home is to create a highly accurate three dimensional "
+"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
+"Survey."
+msgstr "Milkeyway at Home使用Sloan Digital Sky Survey的數據對銀河系進行高精度的3D建模。"
 
 #: projects.inc:278
 msgid "Leiden University, The Netherlands"
-msgstr "荷蘭萊頓大學"
+msgstr "Leiden University, The Netherlands"
 
 #: projects.inc:280
-msgid "Surface science calculations using Classical Dynamics.  Leiden Classical allows volunteers, students and other scientist to submit their personal calculations to the grid. Each user has his own personal queue for Classical Dynamics jobs. In this way students have used the grid to simulate liquid argon, or to test the validity of the ideal gas law by actually doing the simulations through the grid."
-msgstr "使用經典力學進行表面科學的計算。 Leiden Classical 允許志願者、學者和其它科研人員提供他們自己的計算任務,每個用戶都有他自己的經典力學任務隊列。通過這種方式,學生們可以利用網格來對他們學習到的相關理論進行驗證。"
+msgid ""
+"Surface science calculations using Classical Dynamics.  Leiden Classical "
+"allows volunteers, students and other scientist to submit their personal "
+"calculations to the grid. Each user has his own personal queue for Classical"
+" Dynamics jobs. In this way students have used the grid to simulate liquid "
+"argon, or to test the validity of the ideal gas law by actually doing the "
+"simulations through the grid."
+msgstr "使用經典力學進行表面科學的運算。Leiden Classical允許參與者、學者和其它科研人員提供他們自己的運算任務,每個用戶都有他自己的經典力學任務隊列。通過這種方式,學生們可以利用網格對他們學習到的相關理論進行驗證。"
 
 #: projects.inc:294
 msgid "Univ. of Wisconsin - Milwaukee, Max Planck Institute"
-msgstr "美國威斯康星大學密爾沃基分校,德國馬克斯普朗克研究所"
+msgstr "Univ. of Wisconsin - Milwaukee, Max Planck Institute"
 
 #: projects.inc:295
 msgid "Astrophysics"
 msgstr "天體物理學"
 
 #: projects.inc:296
-msgid "Search for spinning neutron stars (also called pulsars) using data from the LIGO and GEO gravitational wave detectors, and from the Arecibo radio observatory.  Einstein at Home is a World Year of Physics 2005 project supported by the American Physical Society (APS) and by a number of international organizations."
+msgid ""
+"Search for spinning neutron stars (also called pulsars) using data from the "
+"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
+"observatory.  Einstein at Home is a World Year of Physics 2005 project "
+"supported by the American Physical Society (APS) and by a number of "
+"international organizations."
 msgstr "分析LIGO 和GEO 引力波探測器以及阿雷西波觀測站採集到的數據,以尋找自旋中子星(也稱為脈衝星)。 Einstein at Home 是2005 世界物理學年的推介專案,由美國物理學會(APS)和一些相關的國際組織發起。"
 
-#: projects.inc:310
-#: projects.inc:318
+#: projects.inc:310 projects.inc:318
 msgid "CERN (European Organization for Nuclear Research)"
-msgstr "CERN(歐洲核子研究組織)"
+msgstr "CERN (European Organization for Nuclear Research)"
 
-#: projects.inc:311
-#: projects.inc:319
+#: projects.inc:311 projects.inc:319
 msgid "Physics"
 msgstr "物理學"
 
 #: projects.inc:312
-msgid "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory.  It is the most powerful instrument ever built to investigate on particles proprieties. LHC at home runs simulations to improve the design of LHC and its detectors."
+msgid ""
+"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
+"European Organization for Nuclear Research, the world's largest particle "
+"physics laboratory.  It is the most powerful instrument ever built to "
+"investigate on particles proprieties. LHC at home runs simulations to improve "
+"the design of LHC and its detectors."
 msgstr "大型強子對撞機(LHC)是CERN(歐洲核研究組織)的一個粒子加速器裝置,也是世界上最大的粒子物理實驗室。它是人類現有的用於研究基本粒子特性的最強大的實驗裝置。 LHC at home 的作用主要是對加速器進行模擬,並幫助改進LHC 及其探測器的設計。"
 
 #: projects.inc:320
-msgid "This project uses CERN-developed virtual machine technology for full-fledged LHC event physics simulation on volunteer computers.  Requires that you install VirtualBox on your computer"
-msgstr "這專案在志願者的電腦中使用CERN為了完備的LHC物理模擬試驗而開發的虛擬機器技術。您的電腦需要安裝VirtualBox。"
+msgid ""
+"This project uses CERN-developed virtual machine technology for full-fledged"
+" LHC event physics simulation on volunteer computers.  Requires that you "
+"install VirtualBox on your computer"
+msgstr "這專案在參與者的電腦中使用CERN為了完備的LHC物理模擬試驗而開發的虛擬機器技術。您的電腦需要安裝VirtualBox。"
 
 #: projects.inc:326
 msgid "University of California, Berkeley"
-msgstr "美國加州大學伯克利分校"
+msgstr "University of California, Berkeley"
 
 #: projects.inc:327
 msgid "Astrophysics, astrobiology"
 msgstr "天體物理學,天體生物學"
 
 #: projects.inc:328
-msgid "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose goal is to detect intelligent life outside Earth. One approach, known as radio SETI, uses radio telescopes to listen for narrow-bandwidth radio signals from space. Such signals are not known to occur naturally, so a detection would provide evidence of extraterrestrial technology."
-msgstr "SETI (搜索外星智慧)的研究領域是探測地球之外的智慧生命。探測的途徑之一,也被稱之為射電SETI,使用射電望遠鏡來監聽太空中的窄波射電信號。因為依照人類目前的認識,這些信號不會自然產生,因此可以作為將其地外技術文明存在的證據。"
+msgid ""
+"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
+"goal is to detect intelligent life outside Earth. One approach, known as "
+"radio SETI, uses radio telescopes to listen for narrow-bandwidth radio "
+"signals from space. Such signals are not known to occur naturally, so a "
+"detection would provide evidence of extraterrestrial technology."
+msgstr "SETI(搜索外星智慧)的研究領域是探測地球之外的智慧生命。探測的途徑之一,也被稱之為射電SETI,使用射電望遠鏡監聽太空中的窄波射電信號。因為依照人類目前的認識,這些信號不會自然產生,因此可以作為將其地外技術文明存在的證據。"
 
 #: projects.inc:342
 msgid "Bielefeld University of Applied Sciences"
-msgstr "比勒費爾德應用科技大學"
+msgstr "Bielefeld University of Applied Sciences"
 
 #: projects.inc:343
 msgid "Chemical engineering and nanotechnology"
 msgstr "化學工程與奈米技術"
 
 #: projects.inc:344
-msgid "The study of molecular magnets and controlled nanoscale magnetism.  These magnetic molecules may be used to develop tiny magnetic switches, with applications in medicine (such as local tumor chemotherapy) and biotechnology."
+msgid ""
+"The study of molecular magnets and controlled nanoscale magnetism.  These "
+"magnetic molecules may be used to develop tiny magnetic switches, with "
+"applications in medicine (such as local tumor chemotherapy) and "
+"biotechnology."
 msgstr "研究分子磁體和奈米尺度的磁力學。這些分子磁體可用於研發微型磁性開關,適用於醫藥(比如腫瘤化療)和生物技術領域。"
 
 #: projects.inc:351
 msgid "Multiple applications"
-msgstr "多個應用程式"
+msgstr "複合專案"
 
 #: projects.inc:356
 msgid "Chinese Academy of Sciences"
-msgstr "中國科學院"
+msgstr "Chinese Academy of Sciences"
 
 #: projects.inc:357
 msgid "Physics, biochemistry, and others"
 msgstr "物理,生物化學和其他"
 
 #: projects.inc:358
-msgid "The objective of CAS at home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."
+msgid ""
+"The objective of CAS at home is to encourage and assist scientists in China to "
+"adopt the technologies of volunteer computing and volunteer thinking for "
+"their research."
 msgstr "CAS at home 的目標是鼓勵和幫忙中國的科研人員採用志願運算技術以及相應的科研思維方式"
 
 #: projects.inc:365
@@ -640,21 +781,26 @@ msgid "Mathematics, physics, evolution"
 msgstr "數學,物理學,進化論"
 
 #: projects.inc:366
-msgid "Yoyo at home is an adapter between BOINC and several existing volunteer computing projects: ECM, Muon, Evolution at home, and distributed.net"
-msgstr "Yoyo at home 將一些傳統的志願計算專案,包括ECM、Muon、Evolution at home 和distributed.net 等,移植到了BOINC 平台。"
+msgid ""
+"Yoyo at home is an adapter between BOINC and several existing volunteer "
+"computing projects: ECM, Muon, Evolution at home, and distributed.net"
+msgstr "Yoyo at home 將一些傳統的志願運算專案,包括ECM、Muon、Evolution at home 和distributed.net 等,移植到了BOINC 平台。"
 
-#: projects.inc:371
-#: projects.inc:527
+#: projects.inc:371 projects.inc:527
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
-msgstr "匈牙利 MTA-SZTAKI 並行和分佈式系統實驗室"
+msgstr "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 
 #: projects.inc:372
 msgid "European research projects"
 msgstr "歐盟研究專案"
 
 #: projects.inc:373
-msgid "The EDGeS at Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."
-msgstr "EDGes at Home Beta 專案將志願計算融入到歐洲運算服務網格的網路,允許服務網格將運算任務分發給專案的志願者們來處理。專案所涉及的科研領域包括數學、物理、生物等等。"
+msgid ""
+"The EDGeS at Home Beta project integrates volunteer computing into the service "
+"grid network of Europe by allowing service grids to send workunits to be "
+"processed by the volunteers of this project. The scientific projects covered"
+" by the project include math, physics, biology, etc."
+msgstr "EDGes at Home Beta 專案將志願運算融入到歐洲運算服務網格的網路,允許服務網格將運算任務分發給專案的參與者們處理。專案所涉及的科研領域包括數學、物理、生物等等。"
 
 #: projects.inc:379
 msgid "Spanish universities and research centers"
@@ -670,19 +816,23 @@ msgstr "物理學、材料科學和生物醫藥學方面的研究"
 
 #: projects.inc:387
 msgid "IBM Corporate Citizenship"
-msgstr "IBM企業公民"
+msgstr "IBM Corporate Citizenship"
 
 #: projects.inc:388
 msgid "Medical, environmental and other humanitarian research"
 msgstr "醫療、環境和其他人道主義研究"
 
 #: projects.inc:389
-msgid "To further critical non-profit research on some of humanity's most pressing problems by creating the world's largest volunteer computing grid.  Research includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, clean water and many more."
-msgstr "透過建立世界上最大的志願者網格運算,進一步研究關鍵且非營利對於人類最緊迫的問題。研究包括愛滋病、癌症、熱帶和被忽視的各種疾病、太陽能、乾淨的水…等等。"
+msgid ""
+"To further critical non-profit research on some of humanity's most pressing "
+"problems by creating the world's largest volunteer computing grid.  Research"
+" includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
+"clean water and many more."
+msgstr "透過建立世界上最大的參與者網格運算,進一步研究關鍵且非營利對於人類最緊迫的問題。研究包括愛滋病、癌症、熱帶和被忽視的各種疾病、太陽能、乾淨的水…等等。"
 
 #: projects.inc:395
 msgid "Mathematics, computing, and games"
-msgstr "數學,計算和遊戲"
+msgstr "數學,運算和遊戲"
 
 #: projects.inc:401
 msgid "Computer Science"
@@ -694,23 +844,20 @@ msgstr "數學,物理,人工智慧"
 
 #: projects.inc:410
 msgid "Simulation of quantum computing; Goldbach's conjecture."
-msgstr "模擬量子計算;哥德巴赫猜想"
+msgstr "模擬量子運算;哥德巴赫猜想。"
 
-#: projects.inc:450
-#: projects.inc:458
+#: projects.inc:450 projects.inc:458
 msgid "Cryptography"
 msgstr "密碼學"
 
 #: projects.inc:459
-msgid "Attempt to decode 3 original Enigma messages. The signals were intercepted in the North Atlantic in 1942 and are believed to be unbroken."
+msgid ""
+"Attempt to decode 3 original Enigma messages. The signals were intercepted "
+"in the North Atlantic in 1942 and are believed to be unbroken."
 msgstr "該專案試圖解密三條二戰期間的加密電報消息,這些消息於1942 年在北大西洋截獲而且一直被認為是不可破解的。"
 
-#: projects.inc:465
-#: projects.inc:504
-#: projects.inc:512
-#: projects.inc:520
-#: projects.inc:528
-#: projects.inc:568
+#: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
+#: projects.inc:528 projects.inc:568
 msgid "Mathematics"
 msgstr "數學"
 
@@ -720,50 +867,75 @@ msgstr "研究考拉茲猜想(Collat​​z conje​​cture),一個尚未
 
 #: projects.inc:471
 msgid "California State University Fullerton"
-msgstr "加州大學富爾頓分校"
+msgstr "California State University Fullerton"
 
 #: projects.inc:472
 msgid "Factorization of large integers"
 msgstr "大整數因子分解"
 
 #: projects.inc:473
-msgid "NFS at Home is a research project that uses Internet-connected computers to do the lattice sieving step in the Number Field Sieve factorization of large integers. As a young school student, you gained your first experience at breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. NFS at Home is a continuation of that experience, only with integers that are hundreds of digits long."
-msgstr "NFS at Home 是一個利用通過網路互連的電腦來進行大整數數域篩選分解中的格篩步驟的研究專案。當你還是一個年輕的學生時,你應該就有了分解質因數的經歷,比如15=3*5 或者35=5*7。 NFS at Home 正是這一經歷的延續,不過卻是分解有數百位數字長的大整數。"
+msgid ""
+"NFS at Home is a research project that uses Internet-connected computers to do "
+"the lattice sieving step in the Number Field Sieve factorization of large "
+"integers. As a young school student, you gained your first experience at "
+"breaking an integer into prime factors, such as 15 = 3 * 5 or 35 = 5 * 7. "
+"NFS at Home is a continuation of that experience, only with integers that are "
+"hundreds of digits long."
+msgstr "NFS at Home 是一個利用通過網路互連的電腦進行大整數數域篩選分解中的格篩步驟的研究專案。當你還是一個年輕的學生時,你應該就有了分解質因數的經歷,比如15=3*5 或者35=5*7。 NFS at Home 正是這一經歷的延續,不過卻是分解有數百位數字長的大整數。"
 
 #: projects.inc:479
-msgid "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
-msgstr "Vilnius Gediminas 理工大學和Kaunas 理工大學(立陶宛)"
+msgid ""
+"Vilnius Gediminas Technical University and Kaunas University of Technology "
+"(Lithuania)"
+msgstr "Vilnius Gediminas Technical University and Kaunas University of Technology (Lithuania)"
 
 #: projects.inc:480
 msgid "Software testing"
 msgstr "軟體測試"
 
 #: projects.inc:481
-msgid "The aim of this project is to provide a powerful distributed computing platform for scientists of Vilnius Gediminas Technical University (VGTU) as well as others Lithuanian academic institutions.  Current applications involve the study of Monte-Carlo based software testing."
-msgstr "本專案的目的是為Vilnius Gediminas 理工大學(VGTU)和其它立陶宛的科研機構提供一個強大的分佈式計算平台。當前的應用主要涉及到基於蒙特卡羅的軟體測試研究。"
+msgid ""
+"The aim of this project is to provide a powerful distributed computing "
+"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
+"well as others Lithuanian academic institutions.  Current applications "
+"involve the study of Monte-Carlo based software testing."
+msgstr "本專案的目的是為維爾紐斯格迪米納斯科技大學(VGTU)和其它立陶宛的科研機構提供一個強大的分佈式運算平台。當前的應用主要涉及到基於蒙特卡羅的軟體測試研究。"
 
 #: projects.inc:503
 msgid "Mathematical Institute of Leiden University / Kennislink"
-msgstr "萊頓(Leiden)大學數字學院(Kennislink)"
+msgstr "Mathematical Institute of Leiden University / Kennislink"
 
 #: projects.inc:505
-msgid "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b < c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the product of the distinct prime factors of n. The ABC conjecture says that there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for any real h > 1. The ABC conjecture is currently one of the greatest open problems in mathematics. If it is proven to be true, a lot of other open problems can be answered directly from it."
+msgid ""
+"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
+"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
+"product of the distinct prime factors of n. The ABC conjecture says that "
+"there are only finitely many a,b,c such that log(c)/log(rad(abc)) > h for "
+"any real h > 1. The ABC conjecture is currently one of the greatest open "
+"problems in mathematics. If it is proven to be true, a lot of other open "
+"problems can be answered directly from it."
 msgstr "尋找滿足ABC 猜想條件的abc 三元組,條件是:c=a+b, a<b, b<c, rad(ABC)<C,其中rad(n) 稱為n 的根積,意即n的所有質因數的乘積,若有重複的質因數則只取一個。 ABC 猜想的具體內容是:對於所有e>0,存在與e 有關的常數C(e),對於所有滿足a+b=c,a 與b 互質的三元整數組(a,b,c) ,均成立c<=C(e)((rad(abc))^(1+e))。 ABC 猜想是當前數論中最重要的未解決問題之一,如果它能夠被證明,其它不少未解決問題也能得到直接的證明。"
 
 #: projects.inc:513
-msgid "Primegrid has multiple projects searching for different forms of very large prime numbers, including searching for the largest known prime number."
+msgid ""
+"Primegrid has multiple projects searching for different forms of very large "
+"prime numbers, including searching for the largest known prime number."
 msgstr "Primegrid 有許多子專案,用於尋找非常大且型態不同的質數,包括尋找已知的最大質數。"
 
 #: projects.inc:519
 msgid "Hochschule RheinMain University of Applied Sciences"
-msgstr "萊茵曼應用技術大學"
+msgstr "Hochschule RheinMain University of Applied Sciences"
 
 #: projects.inc:521
-msgid "Search for counterexamples to two conjectures related to the identification of prime numbers"
+msgid ""
+"Search for counterexamples to two conjectures related to the identification "
+"of prime numbers"
 msgstr "尋找兩個有關質數識別的猜想的反例。"
 
 #: projects.inc:529
-msgid "Find all the generalized binary number systems (in which bases are matrices and digits are vectors) up to dimension 11."
+msgid ""
+"Find all the generalized binary number systems (in which bases are matrices "
+"and digits are vectors) up to dimension 11."
 msgstr "尋找所有的廣義二進制數係(基是矩陣,而位是向量),目前項目正在搜索12 維的廣義二進制數係。"
 
 #: ../html/inc/news.inc:40
@@ -773,211 +945,4 @@ msgstr "評論"
 #: ../html/inc/news.inc:111
 #, php-format
 msgid "News is available as an %sRSS feed%s"
-msgstr "可以透過 %sRSS feed%s 來查看新聞"
-
-# 75%
-#~ msgid "Astronomy, Physics, and Chemistry"
-#~ msgstr "天文,物理和化學"
-#~ msgid "Download BOINC + Virtualbox"
-#~ msgstr "下載BOINC + Virtualbox"
-#, php-format
-#~ msgid "%s for %s (%s MB)"
-#~ msgstr "%s版%s(%s MB)"
-#~ msgid ""
-#~ "BOINC is a program that lets you donate your idle computer time to science "
-#~ "projects like SETI at home, Climateprediction.net, Rosetta at home, World "
-#~ "Community Grid, and many others. <p> After installing BOINC on your "
-#~ "computer, you can connect it to as many of these projects as you like."
-#~ msgstr ""
-#~ "BOINC 使得您可以把電腦的閒置時間捐獻給 "
-#~ "SETI at homeEinstein at home、Climateprediction.net、Rosetta at home 和 World "
-#~ "Commnunity Grid 等等許多科研專案。 <p>在將 BOINC 安裝到您的電腦上之後,您可以加入多個您喜歡的專案。 <p>"
-#~ msgid "Browser default"
-#~ msgstr "瀏覽器預設值"
-
-#, php-format
-#~ msgid ""
-#~ " Use the idle time on your computer (Windows, Mac, or Linux) to cure "
-#~ "diseases, study global warming, discover pulsars, and do many other types of "
-#~ "scientific research.  It's safe, secure, and easy:  %sChoose%s projects  "
-#~ "%sDownload%s and run BOINC software  %sEnter%s an email address and "
-#~ "password. "
-#~ msgstr ""
-#~ " 將您電腦(包括 Windows、Mac 以及 Linux) "
-#~ "的閒置時間利用起來,就可以幫助治療疾病、了解全球暖化、發現脈衝星以及其它多種類型的科學研究。而且這還很安全、可靠和簡單: %s選擇%s 專案 %s下載%"
-#~ "s 並執行 BOINC 軟體 %s輸入%s 您的電子郵件地址以及專案密碼。"
-#~ msgid "IBM Corporate Community Relations"
-#~ msgstr "IBM 協作社群關係部"
-#~ msgid "Humanitarian research on disease, natural disasters and hunger."
-#~ msgstr "關於疾病、自然災害、飢餓的人道主義研究。"
-#~ msgid ""
-#~ "To further critical non-profit research on some of humanity's most "
-#~ "pressing problems by creating the world's largest volunteer computing "
-#~ "grid.  Research includes HIV/AIDS, cancer, muscular dystrophy, dengue "
-#~ "fever, and many more."
-#~ msgstr ""
-#~ "創建世界上最大的志願計算網格,資助非贏利性的關於人類重大疾病的研究。研究內"
-#~ "容包括愛滋、癌症、肌肉萎縮症、登革熱等等。"
-#~ msgid ""
-#~ "Primegrid is generating a public sequential prime number database, and is "
-#~ "searching for large twin primes of the form k*2<sup>n</sup>+1 and "
-#~ "k*2<sup>n</sup>-1"
-#~ msgstr ""
-#~ "Primegrid 的目的是構造一個公共的質數序列數據庫,當前正在搜尋形式為"
-#~ "k*2<sup>n</sup>+1 和k*2<sup>n</sup>-1 的孿生大質數。"
-#~ msgid "FreeHAL"
-#~ msgstr "FreeHAL"
-#~ msgid "private"
-#~ msgstr "個人選項"
-#~ msgid "POEM at HOME"
-#~ msgstr "POEM at HOME"
-#~ msgid "Docking at Home"
-#~ msgstr "Docking at Home"
-#~ msgid "GPUGrid.net"
-#~ msgstr "GPUGrid.net"
-#~ msgid "Superlink at Technion"
-#~ msgstr "Superlink at Technion"
-#~ msgid "The Lattice Project"
-#~ msgstr "The Lattice Project"
-#~ msgid "Malariacontrol.net"
-#~ msgstr "Malariacontrol.net"
-#~ msgid "Rosetta at home"
-#~ msgstr "Rosetta at home"
-#~ msgid "SIMAP"
-#~ msgstr "SIMAP"
-#~ msgid "Virtual Prairie"
-#~ msgstr "Virtual Prairie"
-#~ msgid "University of Houston"
-#~ msgstr "美國休士頓大學"
-#~ msgid "Study of botanical ecosystems"
-#~ msgstr "植物生態系統研究"
-#~ msgid ""
-#~ "Provide ecological guidelines on the design of prairies with the best "
-#~ "potential for water purification."
-#~ msgstr "為建設可用於水淨化的草原設計提供生態學上的指導方針。"
-#~ msgid "Climateprediction.net"
-#~ msgstr "Climateprediction.net (CPDN)"
-#~ msgid "Astronomy/Physics/Chemistry"
-#~ msgstr "天文/物理/化學"
-#~ msgid "eOn"
-#~ msgstr "eOn"
-#~ msgid "Orbit at home"
-#~ msgstr "Orbit at home"
-#~ msgid "Planetary Science Institute"
-#~ msgstr "行星科學研究所"
-#~ msgid "Monitor and study the hazard posed by near-Earth asteroids"
-#~ msgstr "監測和研究近地小行星所造成的危害"
-#~ msgid "Cosmology at Home"
-#~ msgstr "Cosmology at Home"
-#~ msgid "University of Illinois at Urbana-Chamapign"
-#~ msgstr "美國伊利諾伊大學厄巴納 - 香檳分校"
-#~ msgid "Milkyway at home"
-#~ msgstr "Milkyway at home"
-#~ msgid "Leiden Classical"
-#~ msgstr "Leiden Classical"
-#~ msgid "uFluids at home"
-#~ msgstr "uFluids at home"
-#~ msgid "Purdue University"
-#~ msgstr "美國普渡大學"
-#~ msgid "Physics/Aeronautics"
-#~ msgstr "物理學/航空"
-#~ msgid ""
-#~ "The uFluids project simulates two-phase fluid behavior in microgravity "
-#~ "and microfluidics problems. Our goal is to design better satellite "
-#~ "propellant management devices and address two-phase flow in microchannel "
-#~ "and MEMS devices."
-#~ msgstr "Fluids 專案對微重力環境下的兩相流體行為進行模擬,研究微流體問題。"
-#~ msgid "Einstein at home"
-#~ msgstr "Einstein at home"
-#~ msgid "LHC at home"
-#~ msgstr "LHC at home"
-#~ msgid "SETI at home"
-#~ msgstr "SETI at home"
-#~ msgid "Quantum Monte Carlo at Home"
-#~ msgstr "QMC at Home"
-#~ msgid "University of Muenster (Germany)"
-#~ msgstr "德國明斯特大學"
-#~ msgid ""
-#~ "Study the structure and reactivity of molecules using Quantum Chemistry."
-#~ msgstr "通過量力化學來研究分子的結構和相互作用。"
-#~ msgid "Spinhenge at home"
-#~ msgstr "Spinhenge at home"
-#~ msgid "CAS at home"
-#~ msgstr "CAS at home"
-#~ msgid "Yoyo at home"
-#~ msgstr "Yoyo at home"
-#~ msgid "EDGeS at Home"
-#~ msgstr "EDGeS at Home"
-#~ msgid "Ibercivis"
-#~ msgstr "Ibercivis"
-#~ msgid "World Community Grid"
-#~ msgstr "World Community Grid (WCG)"
-#~ msgid "Enigma at Home"
-#~ msgstr "Enigma at Home"
-#~ msgid "Collatz Conjecture"
-#~ msgstr "Collatz Conjecture"
-#~ msgid "NFS at home"
-#~ msgstr "NFS at home"
-#~ msgid "VTU at home"
-#~ msgstr "VTU at home"
-#~ msgid "AQUA at home"
-#~ msgstr "AQUA at home"
-#~ msgid "D-Wave Systems, Inc."
-#~ msgstr "D-Wave Systems 公司"
-#~ msgid "Quantum computing"
-#~ msgstr "量子計算"
-#~ msgid ""
-#~ "D-Wave's AQUA (Adiabatic QUantum Algorithms) is a research project whose "
-#~ "goal is to predict the performance of superconducting adiabatic quantum "
-#~ "computers on a variety of hard problems arising in fields ranging from "
-#~ "materials science to machine learning. AQUA at home uses Internet-connected "
-#~ "computers to help design and analyze quantum computing algorithms, using "
-#~ "Quantum Monte Carlo techniques."
-#~ msgstr ""
-#~ "D-Wave 的AQUA(絕熱量子算法)是一個對超導絕熱量子計算機在一系列從材料科學"
-#~ "到機器學習等的複雜問題上的處理效率進行預測的研究專案。 AQUA at home 使用通過"
-#~ "網路連接的電腦來幫助設計和分析量子計算算法,使用的是量子蒙特卡羅技術。"
-#~ msgid "ABC at home"
-#~ msgstr "ABC at home"
-#~ msgid "PrimeGrid"
-#~ msgstr "PrimeGrid"
-#~ msgid "primaboinca"
-#~ msgstr "primaboinca"
-#~ msgid "SZTAKI Desktop Grid"
-#~ msgstr "SZTAKI Desktop Grid"
-#~ msgid "Chess960 at home"
-#~ msgstr "Chess960 at home"
-#~ msgid "Chess-960.org"
-#~ msgstr "Chess-960.org"
-#~ msgid "Game-playing"
-#~ msgstr "玩遊戲"
-#~ msgid ""
-#~ "This project studies Chess 960, a variant of orthodox chess. In classical "
-#~ "chess the starting position of the game never changes.  In Chess 960, "
-#~ "just before the start of every game, the initial configuration of the "
-#~ "chess pieces is determined randomly."
-#~ msgstr ""
-#~ "該專案研究正統國際象棋的一個變種 Chess 960。普通象棋裡開局後棋子的位置總是"
-#~ "固定的,但在Chess 960 裡,每次遊戲開始之前,棋子的初始配置都是隨機決定的。"
-#~ msgid "The current release is known to work with these Linux versions:"
-#~ msgstr "目前這個版本能與下列的 Linux 作業系統運作:"
-#~ msgid ""
-#~ "For other Linux versions, check if a BOINC package is offered by your "
-#~ "Linux distribution."
-#~ msgstr "關於其他版本的 Linux,檢查 BOINC 的檔案是否有提供您的版本"
-#~ msgid ""
-#~ "Alternatively, download the %1BOINC client for older Linux versions%2. "
-#~ "This doesn't have a graphical interface, but it should work on all Linux "
-#~ "systems, both x86 and x64."
-#~ msgstr ""
-#~ "或者您也可以下載%1用於舊版本 Linux 的 BOINC 客戶端%2。此版本沒有圖形界面,"
-#~ "但應該可以在所有 Linux 版本上正常工作,包括 x86 和 x64 平台。"
-#~ msgid ""
-#~ "Note: if your computer is equipped with an Graphics Processing Unit "
-#~ "(GPU), you may be able to %suse it to compute faster%s"
-#~ msgstr ""
-#~ "注意:如果您的電腦配備了 NVIDIA 的顯示卡,您也許可以%s通過它來使運算變得更"
-#~ "快%s。"
-#~ msgid "TeraFLOPS."
-#~ msgstr "TFLOPS。"
-
+msgstr "透過%sRSS feed%s可以查看新聞"
diff --git a/m4/boinc_wxwidgets.m4 b/m4/boinc_wxwidgets.m4
index 174ff1b..527e6d3 100644
--- a/m4/boinc_wxwidgets.m4
+++ b/m4/boinc_wxwidgets.m4
@@ -96,5 +96,24 @@ WARNING: No ${uprf} libraries for wxWidgets are installed.
        AM_PATH_WXCONFIG($1, wxWin=1, wxWin=0, ${ac_cv_wxwidgets_options})
      fi
    fi
+
+   AC_MSG_CHECKING([if wxWidgets uses the GTK+ toolkit])
+   gtkver=none
+   AM_CONDITIONAL([GUI_GTK], echo $wx_default_config | grep -i ^gtk 2>&1 >/dev/null)
+   if echo $wx_default_config | grep -i gtk 2>&1 >/dev/null ; then
+     case ${wx_default_config} in 
+        gtk3-*)  gtkver=gtk+-3.0
+	         ;;
+        gtk2-*)  gtkver=gtk+-2.0
+	         ;;
+        gtk-*)   gtkver=gtk+
+	         ;;
+      esac 
+      GTK_CFLAGS="`pkg-config --cflags $gtkver`"
+      GTK_LIBS="`pkg-config --libs  $gtkver`"
+   fi             
+   AC_SUBST([GTK_CFLAGS])
+   AC_SUBST([GTK_LIBS])
+   AC_MSG_RESULT([$gtkver])
 ])
      
diff --git a/py/Boinc/boinc_db.py b/py/Boinc/boinc_db.py
index 36efe47..0ffc82e 100644
--- a/py/Boinc/boinc_db.py
+++ b/py/Boinc/boinc_db.py
@@ -67,8 +67,12 @@ HTTP_STATUS_CLIENT_ERROR = 400
 HTTP_STATUS_NOT_FOUND = 404
 HTTP_STATUS_PROXY_AUTH_REQ = 407
 HTTP_STATUS_RANGE_REQUEST_ERROR = 416
+HTTP_STATUS_EXPECTATION_FAILED = 417
 HTTP_STATUS_INTERNAL_SERVER_ERROR = 500
+HTTP_STATUS_NOT_IMPLEMENTED = 501
+HTTP_STATUS_BAD_GATEWAY = 502
 HTTP_STATUS_SERVICE_UNAVAILABLE = 503
+HTTP_STATUS_GATEWAY_TIMEOUT = 504
 MODE_UNSUPPORTED = 0
 MODE_HIDE_GRAPHICS = 1
 MODE_WINDOW = 2
@@ -125,3 +129,7 @@ BATCH_STATE_IN_PROGRESS = 1
 BATCH_STATE_COMPLETE = 2
 BATCH_STATE_ABORTED = 3
 BATCH_STATE_RETIRED = 4
+CREDIT_TYPE_FLOPS = 0
+CREDIT_TYPE_STORAGE = 1
+CREDIT_TYPE_NETWORK = 2
+CREDIT_TYPE_PROJECT = 3
diff --git a/py/Boinc/database.py b/py/Boinc/database.py
index 1d791db..f738073 100644
--- a/py/Boinc/database.py
+++ b/py/Boinc/database.py
@@ -255,8 +255,17 @@ def connect(config = None, nodb = False):
         db = config.db_name
     
     host=config.__dict__.get('db_host','')
+    port=""
+    if ':' in host:
+        host,port=config.__dict__.get('db_host','').split(":")
+
+    if port == '':
+        port = 3306
+    else:
+        port = int(port)
     do_connect(db=db,
                host=host,
+               port=port,
                user=config.__dict__.get('db_user',''),
                passwd=config.__dict__.get('db_passwd', ''))
     return 1
diff --git a/py/Boinc/db_base.py b/py/Boinc/db_base.py
index 01c8bbd..432bbc1 100644
--- a/py/Boinc/db_base.py
+++ b/py/Boinc/db_base.py
@@ -488,14 +488,15 @@ class DatabaseObject:
     def _set_dirty(self, value=True):
         self.__dict__['_dirty'] = value
 
-def do_connect(db, user, passwd, host='localhost'):
+def do_connect(db, user, passwd, port, host='localhost'):
     """Takes a database name, a username, and password.  Connects to
     SQL server and makes a new Dbconnection."""
     global dbconnection
     if dbconnection:
         raise 'Already connected'
-    dbconnection = MySQLdb.connect(db=db,host=host,user=user,passwd=passwd,
-                                   cursorclass=MySQLdb.cursors.DictCursor)
+    dbconnection = MySQLdb.connect(db=db, host=host, port=port, user=user,
+        passwd=passwd, cursorclass=MySQLdb.cursors.DictCursor)
+
 def close():
     """Closes the connection to the sql survey and deletes the Dbconnection object."""
     global dbconnection
diff --git a/py/Boinc/setup_project.py b/py/Boinc/setup_project.py
index 9da06e0..58ebcb4 100644
--- a/py/Boinc/setup_project.py
+++ b/py/Boinc/setup_project.py
@@ -395,19 +395,27 @@ sys.path.insert(0, os.path.join('%s', 'py'))
             'file_deleter',
             'get_file',
             'make_work',
+            'pshelper',
             'put_file',
             'pymw_assimilator.py',
             'sample_assimilator',
             'sample_bitwise_validator',
             'sample_dummy_assimilator',
+            'sample_substr_validator',
             'sample_trivial_validator',
             'sample_work_generator',
+            'script_assimilator',
+            'script_validator',
             'show_shmem',
             'single_job_assimilator', 
             'size_regulator', 
             'transitioner',
             'transitioner_catchup.php',
-            'update_stats'
+            'trickle_credit',
+            'trickle_deadline',
+            'trickle_echo',
+            'update_stats',
+            'wu_check'
         ])
     map(lambda (s): install(builddir('vda',s), dir('bin',s)),
         [ 'vda', 'vdad' ])
diff --git a/py/Boinc/tools.py b/py/Boinc/tools.py
index fa06c1d..3600e24 100644
--- a/py/Boinc/tools.py
+++ b/py/Boinc/tools.py
@@ -35,14 +35,14 @@ def make_uuid():
 def md5_file(path):
     """
     Return a 16-digit MD5 hex digest of a file's contents
-    Read the file in chunks 
+    Read the file in chunks
     """
 
     chunk = 8096
 
     try:
         checksum = md5()
-    except NameError:
+    except TypeError:
         checksum = md5.new()
 
     fp = open(path, 'r')
@@ -78,6 +78,9 @@ def get_output_file_path(filename):
     """
     config = configxml.default_config()
     fanout = long(config.config.uldl_dir_fanout)
-    s = md5.new(filename).hexdigest()[1:8]
+    try:
+        s = md5(filename).hexdigest()[1:8]
+    except TypeError:
+        s = md5.new(filename).hexdigest()[1:8]
     x = long(s, 16)
-    return "%s/%x/%s" % (config.config.upload_dir, x % fanout, filename) 
+    return "%s/%x/%s" % (config.config.upload_dir, x % fanout, filename)
diff --git a/samples/Makefile.am b/samples/Makefile.am
new file mode 100644
index 0000000..4536789
--- /dev/null
+++ b/samples/Makefile.am
@@ -0,0 +1,7 @@
+## -*- mode: makefile; tab-width: 4 -*-
+
+include $(top_srcdir)/Makefile.incl
+
+## list the apps that should be build
+SUBDIRS = condor example_app multi_thread sleeper vboxmonitor vboxwrapper worker wrapper
+## NOTE: nvcuda and wrappture need external libraries
diff --git a/samples/condor/boinc_gahp.cpp b/samples/condor/boinc_gahp.cpp
index 552b153..007769c 100644
--- a/samples/condor/boinc_gahp.cpp
+++ b/samples/condor/boinc_gahp.cpp
@@ -159,7 +159,7 @@ int process_input_files(SUBMIT_REQ& req, string& error_msg) {
         retval = compute_md5(s, lf);
         if (retval) return retval;
         local_files.insert(std::pair<string, LOCAL_FILE>(s, lf));
-        iter++;
+        ++iter;
     }
 
     // ask the server which files it doesn't already have.
@@ -172,7 +172,7 @@ int process_input_files(SUBMIT_REQ& req, string& error_msg) {
         LOCAL_FILE lf = map_iter->second;
         paths.push_back(map_iter->first);
         md5s.push_back(lf.md5);
-        map_iter++;
+        ++map_iter;
     }
     retval = query_files(
         project_url,
@@ -667,7 +667,7 @@ void print_version(bool startup) {
 int n_results() {
     int n = 0;
     vector<COMMAND*>::iterator i;
-    for (i = commands.begin(); i != commands.end(); i++) {
+    for (i = commands.begin(); i != commands.end(); ++i) {
         COMMAND *c2 = *i;
         if (c2->out) {
             n++;
@@ -719,7 +719,7 @@ int handle_command(char* p) {
                 i = commands.erase(i);
                 j++;
             } else {
-                i++;
+                ++i;
             }
         }
         wrote_r = false;
diff --git a/samples/gfx_html/browser.cpp b/samples/gfx_html/browser.cpp
new file mode 100644
index 0000000..9eb0c3c
--- /dev/null
+++ b/samples/gfx_html/browser.cpp
@@ -0,0 +1,104 @@
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2014-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/>.
+
+#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
+
+
+#include "version.h"
+#include "boinc_api.h"
+#include "diagnostics.h"
+#include "network.h"
+#include "browserlog.h"
+#include "webserver.h"
+#include "browser.h"
+
+
+static bool s_bFullscreen;
+static bool s_bDebugging;
+static int  s_iWebServerPort;
+
+
+bool is_htmlgfx_in_debug_mode() {
+    return s_bDebugging;
+}
+
+bool is_htmlgfx_in_fullscreen_mode() {
+    return s_bFullscreen;
+}
+
+int get_htmlgfx_webserver_port() {
+    return s_iWebServerPort;
+}
+
+
+int main(int argc, char** argv) {
+    int retval = 0;
+
+    // Initialize diagnostic system
+    //
+    boinc_init_graphics_diagnostics(BOINC_DIAG_DEFAULTS);
+
+    // Parse Command Line
+    //
+    for (int i=1; i<argc; i++) {
+        if (!strcmp(argv[i], "--fullscreen")) {
+            browserlog_msg("Fullscreen mode requested.");
+            s_bFullscreen = true;
+        }
+        if (!strcmp(argv[i], "--debug")) {
+            browserlog_msg("Debug mode requested.");
+            s_bDebugging = true;
+        }
+    }
+#ifdef _DEBUG
+    // Debug Mode is implied
+    browserlog_msg("Debug mode requested.");
+    s_bDebugging = true;
+#endif
+
+    // Log banner
+    //
+    browserlog_msg("htmlgfx (%d.%d.%d): starting", BOINC_MAJOR_VERSION, BOINC_MINOR_VERSION, VBOXWRAPPER_RELEASE);
+
+    // Launch HTTP Server
+    //
+    boinc_get_port(false, s_iWebServerPort);
+    webserver_initialize();
+  
+    // Start UI
+    //
+    retval = run(argc, argv);
+
+    // Shutdown HTTP Server
+    //
+    webserver_destroy();
+
+    return retval;
+}
+
diff --git a/clientgui/res/skins/default/graphic/dialog_background_image.xpm b/samples/gfx_html/browser.h
similarity index 75%
copy from clientgui/res/skins/default/graphic/dialog_background_image.xpm
copy to samples/gfx_html/browser.h
index 29d6c76..e034726 100644
--- a/clientgui/res/skins/default/graphic/dialog_background_image.xpm
+++ b/samples/gfx_html/browser.h
@@ -1,7 +1,6 @@
-/* XPM */
 // This file is part of BOINC.
 // http://boinc.berkeley.edu
-// Copyright (C) 2011 University of California
+// Copyright (C) 2014-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 +14,15 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
-static const char *dialog_background_image_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"1 1 1 1",
-"  c #D3D3D3",
-/* pixels */
-" "
-};
+
+
+#ifndef _BROWSER_H_
+#define _BROWSER_H_
+
+int run(int, char**);
+
+bool is_htmlgfx_in_debug_mode();
+bool is_htmlgfx_in_fullscreen_mode();
+int  get_htmlgfx_webserver_port();
+
+#endif
diff --git a/samples/gfx_html/browser.idl b/samples/gfx_html/browser.idl
new file mode 100644
index 0000000..1c93b42
--- /dev/null
+++ b/samples/gfx_html/browser.idl
@@ -0,0 +1,38 @@
+// browser.idl : IDL source for browser
+//
+
+// This file will be processed by the MIDL tool to
+// produce the type library (browser.tlb) and marshalling code.
+
+#include "olectl.h"
+import "oaidl.idl";
+import "ocidl.idl";
+
+[
+	object,
+	uuid(D9E4A0D0-60F6-444C-93BC-7F3DF3281305),
+	dual,
+	nonextensible,
+	pointer_default(unique)
+]
+interface IHTMLBrowserHost : IDispatch
+{
+};
+
+[
+	uuid(E734A057-9667-44EB-BC7D-313D535BADD5),
+	version(1.0),
+]
+library HTMLGfxLib
+{
+	importlib("stdole2.tlb");
+	[
+		uuid(34357DF4-7921-4B0E-B681-DA2AE2AEE419),		
+		control
+	]
+	coclass HTMLBrowser
+	{
+		[default] interface IHTMLBrowserHost;
+	};
+};
+
diff --git a/samples/gfx_html/browser_win.h b/samples/gfx_html/browser_win.h
new file mode 100644
index 0000000..54628d7
--- /dev/null
+++ b/samples/gfx_html/browser_win.h
@@ -0,0 +1,18 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by browser_win.rc
+//
+
+#define IDI_ICON                        100
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_3D_CONTROLS                     1
+#define _APS_NEXT_RESOURCE_VALUE        109
+#define _APS_NEXT_COMMAND_VALUE         40000
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           102
+#endif
+#endif
diff --git a/samples/gfx_html/browser_win.rc b/samples/gfx_html/browser_win.rc
new file mode 100644
index 0000000..c6bfbf9
--- /dev/null
+++ b/samples/gfx_html/browser_win.rc
@@ -0,0 +1,96 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "browser_win.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winresrc.h"
+#include "version.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Neutral resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
+#ifdef _WIN32
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON                          ICON              "res\\boinc.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+// Helpful macros to convert version to string notation
+#define TOSTR(s) #s
+#define VER_TOSTR(maj,min,rel) TOSTR(maj) "." TOSTR(min) "." TOSTR(rel) "\0"
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,VBOXWRAPPER_RELEASE,0
+ PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,VBOXWRAPPER_RELEASE,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "Space Sciences Laboratory"
+            VALUE "FileDescription", "BOINC HTML Graphics"
+            VALUE "FileVersion", VER_TOSTR(BOINC_MAJOR_VERSION, BOINC_MINOR_VERSION, WRAPPER_RELEASE)
+            VALUE "InternalName", "htmlgfx"
+            VALUE "LegalCopyright", "� 2011-2015 University of California"
+            VALUE "OriginalFilename", "htmlgfx.exe"
+            VALUE "ProductName", "BOINC HTML Graphics"
+            VALUE "ProductVersion", VER_TOSTR(BOINC_MAJOR_VERSION, BOINC_MINOR_VERSION, WRAPPER_RELEASE)
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+#endif
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+1 TYPELIB "browser.tlb"
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
diff --git a/samples/gfx_html/browserctrl_win.cpp b/samples/gfx_html/browserctrl_win.cpp
new file mode 100644
index 0000000..15c6392
--- /dev/null
+++ b/samples/gfx_html/browserctrl_win.cpp
@@ -0,0 +1,290 @@
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2014-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/>.
+
+#define _ATL_FREE_THREADED
+#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS
+#include <AtlBase.h>
+#include <AtlCom.h>
+#include <AtlCtl.h>
+#include <AtlWin.h>
+#include <AtlStr.h>
+#include <AtlFile.h>
+#include <AtlTypes.h>
+#include <exdisp.h>
+#include <exdispid.h>
+#include <mshtml.h>
+#include <urlmon.h>
+#include <string>
+#include "win_util.h"
+#include "version.h"
+#include "boinc_api.h"
+#include "diagnostics.h"
+#include "filesys.h"
+#include "browser_i.h"
+#include "browser_win.h"
+#include "browserlog.h"
+#include "browserctrl_win.h"
+
+
+#ifdef __IDeveloperConsoleMessageReceiver_INTERNAL__
+
+// New for IE10
+#define IDM_ADDCONSOLEMESSAGERECEIVER     3800
+#define IDM_REMOVECONSOLEMESSAGERECEIVER  3801
+
+#endif
+
+
+CWndClassInfo& CHTMLBrowserHost::GetWndClassInfo()
+{
+    static CWndClassInfo wc =
+    {
+        { sizeof(WNDCLASSEX), 0, StartWindowProc, 0, 0, 0, 0, 0, (HBRUSH)(COLOR_WINDOW + 1), 0, NULL, 0 },
+        NULL, NULL, IDC_ARROW, TRUE, 0, _T("")
+    };
+    return wc;
+}
+
+HRESULT CHTMLBrowserHost::FinalConstruct()
+{
+    return S_OK;
+}
+
+void CHTMLBrowserHost::FinalRelease()
+{
+    HRESULT hr;
+
+    // Unregister the developer console message receiver
+    //
+    CComPtr<IUnknown> pBrowser;
+    hr = QueryControl(__uuidof(IWebBrowser2), (void**)&pBrowser);
+    if (SUCCEEDED(hr))
+    {
+        CComPtr<IDispatch> spDocDisp;
+        CComPtr<IWebBrowser2> spWebBrowser;
+        spWebBrowser = pBrowser;
+        hr = spWebBrowser->get_Document(&spDocDisp);
+        if (SUCCEEDED(hr))
+        {
+            CComQIPtr<IOleCommandTarget> spOleCommandTarget(spDocDisp);
+            spOleCommandTarget->Exec(
+                &CGID_MSHTML,
+                IDM_REMOVECONSOLEMESSAGERECEIVER,
+                OLECMDEXECOPT_DODEFAULT,
+                &varConsoleCookie,
+                NULL
+            );
+        }
+    }
+
+	ReleaseAll();
+}
+
+void CHTMLBrowserHost::OnFinalMessage(HWND /*hWnd*/)
+{
+}
+
+HWND CHTMLBrowserHost::Create(
+    HWND hWndParent, _U_RECT rect, LPCTSTR szWindowName, DWORD dwStyle, DWORD dwExStyle, _U_MENUorID MenuOrID, LPVOID lpCreateParam
+){
+    ATOM atom = GetWndClassInfo().Register(&m_pfnSuperWindowProc);
+    if (!atom)
+        return NULL;
+
+    // Allocate the thunk structure here, where we can fail gracefully.
+    BOOL result = m_thunk.Init(NULL,NULL);
+    if (result == FALSE)
+    {
+        SetLastError(ERROR_OUTOFMEMORY);
+        return NULL;
+    }
+
+    _AtlWinModule.AddCreateWndData(&m_thunk.cd, this);
+
+    dwStyle = GetWndStyle(dwStyle);
+    dwExStyle = GetWndExStyle(dwExStyle);
+
+    // Set Caption
+    if (szWindowName == NULL)
+    {
+        szWindowName = GetWndCaption();
+    }
+
+    // Create window
+    return CWindow::Create((LPCTSTR)atom, hWndParent, rect, szWindowName, dwStyle, dwExStyle, MenuOrID, lpCreateParam);
+}
+
+STDMETHODIMP CHTMLBrowserHost::CreateControlEx(
+    LPCOLESTR lpszTricsData, HWND hWnd, IStream* pStream, IUnknown** ppUnk, REFIID iidAdvise, IUnknown* punkSink
+){
+    HRESULT hr = CreateControlLicEx(lpszTricsData, hWnd, pStream, ppUnk, iidAdvise, punkSink, NULL);
+
+    if (SUCCEEDED(hr))
+    {
+        CComPtr<IWebBrowser2> spWebBrowser;
+        CComPtr<IUnknown> pBrowser;
+        hr = QueryControl(__uuidof(IWebBrowser2), (void**)&pBrowser);
+        if (SUCCEEDED(hr) && pBrowser != NULL)
+        {
+            CComVariant v;
+            CComVariant url("about:blank");
+
+            spWebBrowser = pBrowser;
+            spWebBrowser->Navigate2(&url, &v, &v, &v, &v);
+
+            // Register to receive the developer console message receiver events
+            // javascript: 'window.console'
+            //
+            CComPtr<IUnknown> pConsole;
+            hr = QueryInterface(__uuidof(IDeveloperConsoleMessageReceiver), (void**)&pConsole);
+            if (SUCCEEDED(hr))
+            {
+                CComPtr<IDispatch> spDocDisp;
+                CComVariant varListener(pConsole);
+                spWebBrowser = pBrowser;
+                hr = spWebBrowser->get_Document(&spDocDisp);
+                if (SUCCEEDED(hr))
+                {
+                    CComQIPtr<IOleCommandTarget> spOleCommandTarget(spDocDisp);
+                    hr = spOleCommandTarget->Exec(
+                        &CGID_MSHTML,
+                        IDM_ADDCONSOLEMESSAGERECEIVER,
+                        OLECMDEXECOPT_DODEFAULT,
+                        &varListener,
+                        &varConsoleCookie
+                    );
+                }
+            }
+        }
+    }
+
+	return hr;
+}
+
+
+LPCWSTR MapMessageLevel(DEV_CONSOLE_MESSAGE_LEVEL level)
+{
+    switch(level)
+    {
+    case DCML_WARNING: return L"WARNING";
+    case DCML_ERROR: return L"ERROR";
+    case DCML_INFORMATIONAL:
+    default: return L"INFO";
+    }
+}
+
+STDMETHODIMP CHTMLBrowserHost::Write(
+    LPCWSTR source, DEV_CONSOLE_MESSAGE_LEVEL level, int messageId, LPCWSTR messageText
+){
+    return WriteWithUrl(source, level, messageId, messageText, L"");
+}
+
+STDMETHODIMP CHTMLBrowserHost::WriteWithUrl(
+    LPCWSTR source, DEV_CONSOLE_MESSAGE_LEVEL level, int messageId, LPCWSTR messageText, LPCWSTR fileUrl
+){
+    return WriteWithUrlAndLine(source, level, messageId, messageText, fileUrl, 0);
+}
+
+STDMETHODIMP CHTMLBrowserHost::WriteWithUrlAndLine(
+    LPCWSTR source, DEV_CONSOLE_MESSAGE_LEVEL level, int messageId, LPCWSTR messageText, LPCWSTR fileUrl, ULONG line
+){
+    return WriteWithUrlLineAndColumn(source, level, messageId, messageText, fileUrl, line, 0);
+}
+
+STDMETHODIMP CHTMLBrowserHost::WriteWithUrlLineAndColumn(
+    LPCWSTR source, DEV_CONSOLE_MESSAGE_LEVEL level, int messageId, LPCWSTR messageText, LPCWSTR fileUrl, ULONG line, ULONG column
+){
+    if ((CComBSTR("DOM") == CComBSTR(source)) && (7011 == messageId))
+    {
+        // We do not need to worry about forward/backward caching being disabled
+    }
+    else if ((CComBSTR("HTML") == CComBSTR(source)) && (CComBSTR("about:blank") == CComBSTR(fileUrl)))
+    {
+        // We do not need to worry about warnings and errors from a blank page
+    }
+    else
+    {
+        if (wcslen(fileUrl))
+        {
+            browserlog_msg(
+                "Console: (%S) (%S%d) %S\n"
+                "    File: %S, Line: %d, Column: %d",
+                MapMessageLevel(level), source, messageId, messageText, fileUrl, line, column
+            );
+        }
+        else
+        {
+            browserlog_msg(
+                "Console: (%S) (%S%d) %S",
+                MapMessageLevel(level), source, messageId, messageText
+            );
+        }
+    }
+    return S_OK;
+}
+
+STDMETHODIMP CHTMLBrowserHost::ShowMessage(
+    HWND hwnd, LPOLESTR lpstrText, LPOLESTR lpstrCaption, DWORD dwType, LPOLESTR lpstrHelpFile, DWORD dwHelpContext, LRESULT *plResult
+){
+    browserlog_msg(
+        "Show Message:\n"
+        "    Caption: %S\n"
+        "    Text: %S\n",
+        lpstrCaption,
+        lpstrText
+    );
+    return S_OK;
+}
+
+STDMETHODIMP CHTMLBrowserHost::ShowHelp(
+    HWND hwnd, LPOLESTR pszHelpFile, UINT uCommand, DWORD dwData, POINT ptMouse, IDispatch *pDispatchObjectHit
+){
+    return S_OK;
+};
+
+STDMETHODIMP CHTMLBrowserHost::QueryStatus(
+    const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText
+){
+    return E_NOTIMPL;
+}
+
+STDMETHODIMP CHTMLBrowserHost::Exec(
+    const GUID* pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANTARG* pvaIn, VARIANTARG* pvaOut
+){
+    HRESULT hr = S_OK;
+    if (pguidCmdGroup && IsEqualGUID(*pguidCmdGroup, CGID_DocHostCommandHandler))
+    {
+        switch (nCmdID) 
+        {
+            case OLECMDID_SHOWSCRIPTERROR:
+            {
+                // Stop running scripts on the page.
+                (*pvaOut).vt = VT_BOOL;
+                (*pvaOut).boolVal = VARIANT_FALSE;			
+                break;
+            }
+            default:
+                hr = OLECMDERR_E_NOTSUPPORTED;
+                break;
+        }
+    }
+    else
+    {
+        hr = OLECMDERR_E_UNKNOWNGROUP;
+    }
+    return hr;
+}
diff --git a/samples/gfx_html/browserctrl_win.h b/samples/gfx_html/browserctrl_win.h
new file mode 100644
index 0000000..a699c41
--- /dev/null
+++ b/samples/gfx_html/browserctrl_win.h
@@ -0,0 +1,161 @@
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2014-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/>.
+
+#ifndef _BROWSERCTRL_WIN_H_
+#define _BROWSERCTRL_WIN_H_
+
+
+#ifndef __IDeveloperConsoleMessageReceiver_FWD_DEFINED__
+
+#define __IDeveloperConsoleMessageReceiver_FWD_DEFINED__
+#define __IDeveloperConsoleMessageReceiver_INTERFACE_DEFINED__
+#define __IDeveloperConsoleMessageReceiver_INTERNAL__
+
+typedef interface IDeveloperConsoleMessageReceiver IDeveloperConsoleMessageReceiver;
+
+typedef 
+enum _DEV_CONSOLE_MESSAGE_LEVEL
+    {
+        DCML_INFORMATIONAL	= 0,
+        DCML_WARNING	= 0x1,
+        DCML_ERROR	= 0x2,
+        DEV_CONSOLE_MESSAGE_LEVEL_Max	= 2147483647L
+    } 	DEV_CONSOLE_MESSAGE_LEVEL;
+
+/* interface IDeveloperConsoleMessageReceiver */
+/* [local][unique][helpstring][uuid][object] */ 
+EXTERN_C const IID IID_IDeveloperConsoleMessageReceiver;
+
+MIDL_INTERFACE("30510808-98b5-11cf-bb82-00aa00bdce0b")
+IDeveloperConsoleMessageReceiver : public IUnknown
+{
+public:
+    virtual HRESULT STDMETHODCALLTYPE Write( 
+        /* [annotation][in] */ 
+        _In_  LPCWSTR source,
+        /* [annotation][in] */ 
+        _In_  DEV_CONSOLE_MESSAGE_LEVEL level,
+        /* [annotation][in] */ 
+        _In_  int messageId,
+        /* [annotation][in] */ 
+        _In_  LPCWSTR messageText) = 0;
+        
+    virtual HRESULT STDMETHODCALLTYPE WriteWithUrl( 
+        /* [annotation][in] */ 
+        _In_  LPCWSTR source,
+        /* [annotation][in] */ 
+        _In_  DEV_CONSOLE_MESSAGE_LEVEL level,
+        /* [annotation][in] */ 
+        _In_  int messageId,
+        /* [annotation][in] */ 
+        _In_  LPCWSTR messageText,
+        /* [annotation][in] */ 
+        _In_  LPCWSTR fileUrl) = 0;
+        
+    virtual HRESULT STDMETHODCALLTYPE WriteWithUrlAndLine( 
+        /* [annotation][in] */ 
+        _In_  LPCWSTR source,
+        /* [annotation][in] */ 
+        _In_  DEV_CONSOLE_MESSAGE_LEVEL level,
+        /* [annotation][in] */ 
+        _In_  int messageId,
+        /* [annotation][in] */ 
+        _In_  LPCWSTR messageText,
+        /* [annotation][in] */ 
+        _In_  LPCWSTR fileUrl,
+        /* [annotation][in] */ 
+        _In_  ULONG line) = 0;
+        
+    virtual HRESULT STDMETHODCALLTYPE WriteWithUrlLineAndColumn( 
+        /* [annotation][in] */ 
+        _In_  LPCWSTR source,
+        /* [annotation][in] */ 
+        _In_  DEV_CONSOLE_MESSAGE_LEVEL level,
+        /* [annotation][in] */ 
+        _In_  int messageId,
+        /* [annotation][in] */ 
+        _In_  LPCWSTR messageText,
+        /* [annotation][in] */ 
+        _In_  LPCWSTR fileUrl,
+        /* [annotation][in] */ 
+        _In_  ULONG line,
+        /* [annotation][in] */ 
+        _In_  ULONG column) = 0;
+        
+};
+
+#endif 	/* __IDeveloperConsoleMessageReceiver_FWD_DEFINED__ */
+
+
+/////////////////////////////////////////////////////////////////////////////
+// CHTMLBrowserHost class
+
+class ATL_NO_VTABLE CHTMLBrowserHost :
+    public CAxHostWindow,
+	public IDispatchImpl<IHTMLBrowserHost, &IID_IHTMLBrowserHost, &LIBID_HTMLGfxLib, 0xFFFF, 0xFFFF>,
+    public IDocHostShowUI,
+    public IDeveloperConsoleMessageReceiver,
+    public IOleCommandTarget
+{
+public:
+    DECLARE_NO_REGISTRY()
+    DECLARE_POLY_AGGREGATABLE(CHTMLBrowserHost)
+
+    BEGIN_COM_MAP(CHTMLBrowserHost)
+	    COM_INTERFACE_ENTRY(IHTMLBrowserHost)
+        COM_INTERFACE_ENTRY(IDocHostShowUI)
+        COM_INTERFACE_ENTRY(IDeveloperConsoleMessageReceiver)
+        COM_INTERFACE_ENTRY(IOleCommandTarget)
+        COM_INTERFACE_ENTRY_CHAIN(CAxHostWindow)
+    END_COM_MAP()
+
+    static CWndClassInfo& GetWndClassInfo();
+
+
+	HRESULT FinalConstruct();
+	void FinalRelease();
+	virtual void OnFinalMessage(HWND hWnd);
+
+    HWND Create(HWND hWndParent, _U_RECT rect = NULL, LPCTSTR szWindowName = NULL, DWORD dwStyle = 0, DWORD dwExStyle = 0, _U_MENUorID MenuOrID = 0U, LPVOID lpCreateParam = NULL);
+
+    STDMETHOD(CreateControlEx)(LPCOLESTR lpszTricsData, HWND hWnd, IStream* pStream, IUnknown** ppUnk, REFIID iidAdvise, IUnknown* punkSink);
+
+
+    // COM Interface - IDeveloperConsoleMessageReceiver
+    // http://msdn.microsoft.com/en-us/library/jj126732(v=vs.85).aspx
+    //
+    STDMETHOD(Write)(LPCWSTR source, DEV_CONSOLE_MESSAGE_LEVEL level, int messageId, LPCWSTR messageText);
+    STDMETHOD(WriteWithUrl)(LPCWSTR source, DEV_CONSOLE_MESSAGE_LEVEL level, int messageId, LPCWSTR messageText, LPCWSTR fileUrl);
+    STDMETHOD(WriteWithUrlAndLine)(LPCWSTR source, DEV_CONSOLE_MESSAGE_LEVEL level, int messageId, LPCWSTR messageText, LPCWSTR fileUrl, ULONG line);
+    STDMETHOD(WriteWithUrlLineAndColumn)(LPCWSTR source, DEV_CONSOLE_MESSAGE_LEVEL level, int messageId, LPCWSTR messageText, LPCWSTR fileUrl, ULONG line, ULONG column);
+
+    // COM Interface - IDocHostShowUI
+    // http://msdn.microsoft.com/en-us/library/aa770041(v=vs.85).aspx
+    //
+    STDMETHOD(ShowMessage)(HWND hwnd, LPOLESTR lpstrText, LPOLESTR lpstrCaption, DWORD dwType, LPOLESTR lpstrHelpFile, DWORD dwHelpContext, LRESULT *plResult);
+    STDMETHOD(ShowHelp)(HWND hwnd, LPOLESTR pszHelpFile, UINT uCommand, DWORD dwData, POINT ptMouse, IDispatch *pDispatchObjectHit);
+
+    // COM Interface - IOleCommandTarget
+    // http://support.microsoft.com/kb/261003
+    //
+    STDMETHOD(QueryStatus)(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText);
+    STDMETHOD(Exec)(const GUID* pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANTARG* pvaIn, VARIANTARG* pvaOut);
+
+    CComVariant varConsoleCookie;
+};
+
+#endif
\ No newline at end of file
diff --git a/samples/gfx_html/browserlog.cpp b/samples/gfx_html/browserlog.cpp
new file mode 100644
index 0000000..653984b
--- /dev/null
+++ b/samples/gfx_html/browserlog.cpp
@@ -0,0 +1,66 @@
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2014-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/>.
+
+#ifdef _WIN32
+#include "boinc_win.h"
+#include "win_util.h"
+#else
+#include <sys/wait.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <stdio.h>
+#include <cmath>
+#include <string>
+#include <unistd.h>
+#endif
+
+#include "browserlog.h"
+
+
+int browserlog_msg(const char *fmt, ...) {
+    int retval = 0;
+    int n = 0;
+    char buf[256];
+    int pid;
+    struct tm tm;
+    struct tm *tmp = &tm;
+    va_list ap;
+
+    if (fmt == NULL) return 0;
+
+    time_t x = time(0);
+
+#ifdef _WIN32
+    pid = GetCurrentProcessId();
+    localtime_s(&tm, &x);
+#else
+    pid = getpid();
+    localtime_r(&x, &tm);
+#endif
+
+    strftime(buf, sizeof(buf)-1, "%Y-%m-%d %H:%M:%S", &tm);
+    fprintf(stderr, "%s (%d): ", buf, pid);
+
+    va_start(ap, fmt);
+    retval = vfprintf(stderr, fmt, ap);
+    va_end(ap);
+
+    fprintf(stderr, "\n");
+
+    return retval;
+}
+
diff --git a/clientgui/res/skins/default/graphic/dialog_background_image.xpm b/samples/gfx_html/browserlog.h
similarity index 78%
copy from clientgui/res/skins/default/graphic/dialog_background_image.xpm
copy to samples/gfx_html/browserlog.h
index 29d6c76..aa97819 100644
--- a/clientgui/res/skins/default/graphic/dialog_background_image.xpm
+++ b/samples/gfx_html/browserlog.h
@@ -1,7 +1,6 @@
-/* XPM */
 // This file is part of BOINC.
 // http://boinc.berkeley.edu
-// Copyright (C) 2011 University of California
+// Copyright (C) 2014-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 +14,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/>.
-static const char *dialog_background_image_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"1 1 1 1",
-"  c #D3D3D3",
-/* pixels */
-" "
-};
+
+#ifndef _BROWSERLOG_H_
+#define _BROWSERLOG_H_
+
+extern int browserlog_msg(const char *fmt, ...);
+
+#endif
diff --git a/samples/gfx_html/browsermain_win.cpp b/samples/gfx_html/browsermain_win.cpp
new file mode 100644
index 0000000..afffd3c
--- /dev/null
+++ b/samples/gfx_html/browsermain_win.cpp
@@ -0,0 +1,235 @@
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2014-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/>.
+
+#define _ATL_FREE_THREADED
+#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS
+#include <AtlBase.h>
+#include <AtlCom.h>
+#include <AtlCtl.h>
+#include <AtlWin.h>
+#include <AtlStr.h>
+#include <AtlFile.h>
+#include <AtlTypes.h>
+#include <exdisp.h>
+#include <exdispid.h>
+#include <urlmon.h>
+#include <string>
+#include "win_util.h"
+#include "version.h"
+#include "boinc_api.h"
+#include "diagnostics.h"
+#include "filesys.h"
+#include "webserver.h"
+#include "browser.h"
+#include "browser_i.h"
+#include "browser_i.c"
+#include "browser_win.h"
+#include "browserlog.h"
+#include "browserctrl_win.h"
+#include "browserwnd_win.h"
+#include "browsermain_win.h"
+
+
+#ifdef _MSC_VER
+#define snprintf _snprintf
+#endif
+
+
+CBrowserModule _AtlModule;
+
+
+CBrowserModule::CBrowserModule()
+{
+    m_pWnd = NULL;
+}
+
+int CBrowserModule::RegisterWebControlCompatiblity()
+{
+    LONG    lReturnValue;
+    HKEY    hKey;
+    TCHAR   szPath[MAX_PATH-1];
+    LPTSTR  lpszFileName = NULL;
+    DWORD   dwSize = 0;
+
+
+    // Isolate the executable name
+    GetModuleFileName(NULL, szPath, (sizeof(szPath)/sizeof(TCHAR)));
+    lpszFileName = _tcsrchr(szPath, '\\');
+    if (lpszFileName)
+        lpszFileName++;
+    else
+        return ERROR_FILE_NOT_FOUND;
+
+    lReturnValue = RegOpenKeyEx(
+        HKEY_CURRENT_USER,
+        _T("SOFTWARE\\Microsoft\\Internet Explorer\\Main\\FeatureControl\\FEATURE_BROWSER_EMULATION"),
+        0,
+        KEY_WRITE,
+        &hKey
+    );
+    if (lReturnValue == ERROR_SUCCESS) {
+        DWORD dwIE11 = 11001;
+        RegSetValueEx(hKey, lpszFileName, 0, REG_DWORD, (const BYTE *)&dwIE11, sizeof(DWORD));
+        RegCloseKey(hKey);
+    }
+
+
+    return 0;
+}
+
+HRESULT CBrowserModule::InitializeCom() throw()
+{
+    return OleInitialize(NULL);
+}
+
+void CBrowserModule::UninitializeCom() throw()
+{
+    OleUninitialize();
+}
+
+HRESULT CBrowserModule::PreMessageLoop(int nShowCmd) throw()
+{
+    HRESULT hr = 0;
+    RECT rc = {0, 0, 0, 0};
+    DWORD dwExStyle = 0;
+    DWORD dwStyle = 0;
+    APP_INIT_DATA aid;
+    char szWindowTitle[256];
+    char szWindowInfo[256];
+    char szDebuggingInfo[256];
+
+
+	hr = __super::PreMessageLoop(nShowCmd);
+	if (FAILED(hr)) {
+        return hr;
+	}
+
+    // Initialize ATL Window Classes
+    //
+    AtlAxWinInit();
+
+    // Prepare environment for web browser control
+    //
+    RegisterWebControlCompatiblity();
+
+    // Prepare environment for detecting system conditions
+    //
+    boinc_parse_init_data_file();
+    boinc_get_init_data(aid);
+
+    // Create Window Instance
+    //
+    m_pWnd = new CHTMLBrowserWnd();
+	if (m_pWnd == NULL)
+	{
+		__super::PostMessageLoop();
+		return E_OUTOFMEMORY;
+	}
+
+    // Construct the window caption
+    //
+    if (aid.app_version) {
+        snprintf(
+            szWindowInfo, sizeof(szWindowInfo),
+            "%s version %.2f [workunit: %s]",
+            aid.app_name, aid.app_version/100.0, aid.wu_name
+        );
+    } else {
+        snprintf(
+            szWindowInfo, sizeof(szWindowInfo),
+            "%s [workunit: %s]",
+            aid.app_name, aid.wu_name
+        );
+    }
+
+    if (is_htmlgfx_in_debug_mode()) {
+        snprintf(szDebuggingInfo, sizeof(szDebuggingInfo), "[Web Server Port: %d]", get_htmlgfx_webserver_port());
+    } else {
+        strcpy(szDebuggingInfo, "");
+    }
+
+    snprintf(szWindowTitle, sizeof(szWindowTitle)-1, "%s %s", szWindowInfo, szDebuggingInfo);
+
+    // Determine window size and placement
+    if (is_htmlgfx_in_fullscreen_mode()) {
+        HDC dc = GetDC(NULL);
+        rc.left = 0;
+        rc.top = 0;
+        rc.right = GetDeviceCaps(dc, HORZRES);
+        rc.bottom = GetDeviceCaps(dc, VERTRES);
+        ReleaseDC(NULL, dc);
+
+        dwStyle = WS_CLIPSIBLINGS|WS_CLIPCHILDREN|WS_POPUP;
+        dwExStyle = WS_EX_APPWINDOW|WS_EX_TOPMOST;
+        while(ShowCursor(false) >= 0);
+    } else {
+        rc.left = 0;
+        rc.top = 0;
+        rc.right = 1024;
+        rc.bottom = 768;
+
+        dwStyle = WS_CLIPSIBLINGS|WS_CLIPCHILDREN|WS_OVERLAPPEDWINDOW;
+        dwExStyle = WS_EX_APPWINDOW|WS_EX_WINDOWEDGE;
+        while(ShowCursor(true) < 0);
+    }
+
+    // Create Window
+    //
+	m_pWnd->Create(GetDesktopWindow(), rc, szWindowTitle, dwStyle, dwExStyle);
+	m_pWnd->ShowWindow(nShowCmd);
+
+	return S_OK;
+}
+
+HRESULT CBrowserModule::PostMessageLoop() throw()
+{
+    if (m_pWnd)
+    {
+        delete m_pWnd;
+        m_pWnd = NULL;
+    }
+    
+    AtlAxWinTerm();
+
+    return __super::PostMessageLoop();
+}
+
+
+int run(int argc, char** argv) {
+    return _AtlModule.WinMain(SW_SHOWDEFAULT);
+}
+
+
+extern int main(int, char**);
+int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR Args, int WinMode) {
+    LPSTR command_line;
+    char* argv[100];
+    int argc;
+    int retval = 0;
+
+    command_line = GetCommandLine();
+    argc = parse_command_line(command_line, argv);
+
+    WSADATA wsdata;
+    WSAStartup( MAKEWORD( 1, 1 ), &wsdata);
+
+    retval = main(argc, argv);
+
+    WSACleanup();
+
+    return retval;
+}
diff --git a/html/user/host_update_credit.php b/samples/gfx_html/browsermain_win.h
similarity index 56%
copy from html/user/host_update_credit.php
copy to samples/gfx_html/browsermain_win.h
index 4edb2a6..0e977df 100644
--- a/html/user/host_update_credit.php
+++ b/samples/gfx_html/browsermain_win.h
@@ -1,7 +1,6 @@
-<?php
 // This file is part of BOINC.
 // http://boinc.berkeley.edu
-// Copyright (C) 2008 University of California
+// Copyright (C) 2014-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
@@ -16,25 +15,28 @@
 // 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/boinc_db.inc");
-require_once("../inc/util.inc");
-require_once("../inc/host.inc");
+#ifndef _BROWSERMAIN_WIN_H_
+#define _BROWSERMAIN_WIN_H_
 
-check_get_args(array("hostid"));
+class CHTMLBrowserWnd;
 
-$user = get_logged_in_user();
+class CBrowserModule : public ATL::CAtlExeModuleT<CBrowserModule>
+{
+public:
+	DECLARE_LIBID(LIBID_HTMLGfxLib)
 
-page_head(tra("Updating computer credit"));
+	CBrowserModule();
 
-$hostid = get_int("hostid");
+    int RegisterWebControlCompatiblity();
+    static HRESULT InitializeCom() throw();
+    static void UninitializeCom() throw();
 
-$host = BoincHost::lookup_id($hostid);
-if (!$host || $host->userid != $user->id) {
-    error_page(We have no record of that computer");
-}
+	HRESULT PreMessageLoop(int nShowCmd) throw();
+    HRESULT PostMessageLoop() throw();
 
-host_update_credit($hostid);
-echo "<br>".tra("Host credit updated");
-page_tail();
+    CHTMLBrowserWnd* m_pWnd;
+};
 
-?>
+extern CBrowserModule _AtlModule;
+
+#endif
\ No newline at end of file
diff --git a/samples/gfx_html/browserwnd_win.cpp b/samples/gfx_html/browserwnd_win.cpp
new file mode 100644
index 0000000..9f96c43
--- /dev/null
+++ b/samples/gfx_html/browserwnd_win.cpp
@@ -0,0 +1,232 @@
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2014-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/>.
+
+#define _ATL_FREE_THREADED
+#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS
+#include <AtlBase.h>
+#include <AtlCom.h>
+#include <AtlCtl.h>
+#include <AtlWin.h>
+#include <AtlStr.h>
+#include <AtlFile.h>
+#include <AtlTypes.h>
+#include <exdisp.h>
+#include <exdispid.h>
+#include <stdlib.h>
+#include <string>
+#include "browser.h"
+#include "browser_i.h"
+#include "browser_win.h"
+#include "browserlog.h"
+#include "webapi.h"
+#include "browsermain_win.h"
+#include "browserctrl_win.h"
+#include "browserwnd_win.h"
+
+
+CHTMLBrowserWnd::CHTMLBrowserWnd()
+{
+    m_pBrowserHost = NULL;
+    m_hIcon = NULL;
+    m_hIconSmall = NULL;
+    m_bInitializing = false;
+    m_bScreensaverMode = false;
+}
+
+CHTMLBrowserWnd::~CHTMLBrowserWnd()
+{
+    if(m_hIcon)
+    {
+        ::DestroyIcon(m_hIcon);
+        m_hIcon = NULL;
+    }
+
+    if(m_hIconSmall)
+    {
+        ::DestroyIcon(m_hIconSmall);
+        m_hIconSmall = NULL;
+    }
+}
+
+LRESULT CHTMLBrowserWnd::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
+{
+    HRESULT hr;
+	RECT rcClient;
+    TCHAR szExecutable[MAX_PATH];
+    CComPtr<IUnknown> pCtrl;
+
+
+    // Load Icon Resources
+    m_hIcon = (HICON)::LoadImage(
+        _AtlBaseModule.GetResourceInstance(),
+        MAKEINTRESOURCE(IDI_ICON),
+        IMAGE_ICON,
+        0, 0,
+        LR_DEFAULTSIZE | LR_DEFAULTCOLOR);
+    ATLASSERT(m_hIcon);
+
+    m_hIconSmall = (HICON)::LoadImage(
+        _AtlBaseModule.GetResourceInstance(),
+        MAKEINTRESOURCE(IDI_ICON),
+        IMAGE_ICON,
+        GetSystemMetrics(SM_CXSMICON),
+        GetSystemMetrics(SM_CYSMICON),
+        LR_DEFAULTCOLOR);
+    ATLASSERT(m_hIconSmall);
+
+    SetIcon(m_hIcon);
+    SetIcon(m_hIconSmall, FALSE);
+
+    // Create Control Host
+    hr = CComObject<CHTMLBrowserHost>::CreateInstance(&m_pBrowserHost);
+    ATLASSERT(SUCCEEDED(hr));
+
+    // Create Control Window
+	GetClientRect(&rcClient);
+    m_pBrowserHost->Create(m_hWnd, rcClient, NULL, WS_CHILD | WS_VISIBLE);
+    ATLASSERT(m_pBrowserHost->IsWindow());
+
+    // Create Control
+    hr = m_pBrowserHost->CreateControlEx(
+        L"Shell.Explorer",
+        m_pBrowserHost->m_hWnd,
+        NULL,
+        &pCtrl,
+        __uuidof(DWebBrowserEvents2),
+        (IUnknown*)(IDispEventImpl<1, CHTMLBrowserWnd, &__uuidof(DWebBrowserEvents2), &LIBID_SHDocVw, 1, 1>*)this
+    );
+
+    // Get an IWebBrowser2 interface on the control and navigate to a page.
+    m_pBrowserCtrl = pCtrl;
+
+    // Configure the Embedded URL
+    GetModuleFileName(NULL, szExecutable, sizeof(szExecutable));
+    m_strEmbeddedURL += "res://";
+    m_strEmbeddedURL += szExecutable;
+    m_strEmbeddedURL += "/index.html";
+
+    //
+    m_bInitializing = true;
+
+    // Start the timer
+    SetTimer(1, 1000);
+
+    bHandled = TRUE;
+	return 0;
+}
+
+LRESULT CHTMLBrowserWnd::OnClose(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
+{
+    KillTimer(1);
+    DestroyWindow();
+    PostQuitMessage(0);
+	bHandled = TRUE;
+	return 0;
+}
+
+LRESULT CHTMLBrowserWnd::OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
+{
+    m_pBrowserHost->MoveWindow(0, 0, LOWORD(lParam), HIWORD(lParam));
+	bHandled = TRUE;
+	return 0;
+}
+
+LRESULT CHTMLBrowserWnd::OnInputActivity(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
+{
+    if (m_bScreensaverMode)
+    {
+        PostMessage(WM_CLOSE);
+    }
+    else
+    {
+        // Forward event to the browser control
+        MSG msg = { m_hWnd, uMsg, wParam, lParam, 0, { 0, 0 } };
+        SendMessage(m_pBrowserHost->m_hWnd, WM_FORWARDMSG, 0, (LPARAM)&msg);
+    }
+	bHandled = TRUE;
+	return 0;
+}
+
+LRESULT CHTMLBrowserWnd::OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
+{
+    int bIsExiting = FALSE;
+    double dExitTimeout = 0.0;
+
+    bIsExiting = determine_exit_state(dExitTimeout);
+
+    if (bIsExiting && (dExitTimeout > 5.0))
+    {
+        if (!is_htmlgfx_in_debug_mode())
+        {
+            PostMessage(WM_CLOSE);
+        }
+    }
+
+    if (m_bInitializing)
+    {
+        m_bInitializing = false;
+
+        // Forcefully switch to the state URL
+        NavigateToStateURL(true);
+    }
+    else
+    {
+        // Switch to the correct state URL
+        NavigateToStateURL(false);
+    }
+
+	bHandled = TRUE;
+	return 0;
+}
+
+
+STDMETHODIMP_(void) CHTMLBrowserWnd::OnNewProcess(LONG lCauseFlag, IDispatch* pDisp, VARIANT_BOOL* pCancel)
+{
+    *pCancel = TRUE;
+}
+
+STDMETHODIMP_(void) CHTMLBrowserWnd::OnNewWindow2(IDispatch** ppDisp, VARIANT_BOOL* pCancel)
+{
+    *pCancel = TRUE;
+}
+
+STDMETHODIMP_(void) CHTMLBrowserWnd::OnNewWindow3(IDispatch** ppDisp, VARIANT_BOOL* pCancel, DWORD dwFlags, BSTR bstrUrlContext, BSTR bstrUrl)
+{
+    *pCancel = TRUE;
+}
+
+
+void CHTMLBrowserWnd::NavigateToStateURL(bool bForce)
+{
+    std::string strDesiredURL;
+    CComVariant vt;
+    CComVariant vtTargetURL;
+    CComBSTR strTargetURL;
+    
+    determine_state_url(strDesiredURL);
+    strTargetURL = strDesiredURL.c_str();
+
+    // Navigate to URL
+    if ((m_strCurrentURL != strTargetURL) || bForce) {
+        browserlog_msg("State Change Detected (%S).", strTargetURL.m_str);
+
+        m_strCurrentURL = strTargetURL;
+        vtTargetURL = strTargetURL;
+
+        m_pBrowserCtrl->Navigate2(&vtTargetURL, &vt, &vt, &vt, &vt);
+    }
+}
diff --git a/samples/gfx_html/browserwnd_win.h b/samples/gfx_html/browserwnd_win.h
new file mode 100644
index 0000000..4ddb301
--- /dev/null
+++ b/samples/gfx_html/browserwnd_win.h
@@ -0,0 +1,75 @@
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2014-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/>.
+
+#ifndef _BROWSERWND_WIN_H_
+#define _BROWSERWND_WIN_H_
+
+class CHTMLBrowserWnd : 
+    public CWindowImpl<CHTMLBrowserWnd, CWindow, CNullTraits>,
+    public IDispEventImpl<1, CHTMLBrowserWnd, &__uuidof(DWebBrowserEvents2), &LIBID_SHDocVw, 1, 1>
+{
+public:
+	DECLARE_WND_CLASS_EX(_T("BOINC_app"), 0, 0);
+    DECLARE_NO_REGISTRY();
+
+    BEGIN_SINK_MAP(CHTMLBrowserWnd)
+        SINK_ENTRY_EX(1, __uuidof(DWebBrowserEvents2), DISPID_NEWPROCESS, OnNewProcess)
+        SINK_ENTRY_EX(1, __uuidof(DWebBrowserEvents2), DISPID_NEWWINDOW2, OnNewWindow2)
+        SINK_ENTRY_EX(1, __uuidof(DWebBrowserEvents2), DISPID_NEWWINDOW3, OnNewWindow3)
+    END_SINK_MAP()
+
+    BEGIN_MSG_MAP(CHTMLBrowserWnd)
+	    MESSAGE_HANDLER(WM_CREATE, OnCreate)
+	    MESSAGE_HANDLER(WM_CLOSE, OnClose)
+	    MESSAGE_HANDLER(WM_SIZE, OnSize)
+	    MESSAGE_HANDLER(WM_KEYUP, OnInputActivity)
+	    MESSAGE_HANDLER(WM_KEYDOWN, OnInputActivity)
+	    MESSAGE_HANDLER(WM_MOUSEMOVE, OnInputActivity)
+	    MESSAGE_HANDLER(WM_TIMER, OnTimer)
+    END_MSG_MAP()
+
+    CHTMLBrowserWnd();
+    ~CHTMLBrowserWnd();
+
+    // Generic Window Events
+    LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
+    LRESULT OnClose(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
+    LRESULT OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
+    LRESULT OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
+    LRESULT OnInputActivity(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
+
+    // HTML Browser Events
+    STDMETHOD_(void, OnNewProcess)(LONG lCauseFlag, IDispatch* pDisp, VARIANT_BOOL* pCancel);
+    STDMETHOD_(void, OnNewWindow2)(IDispatch** ppDisp, VARIANT_BOOL* pCancel);
+    STDMETHOD_(void, OnNewWindow3)(IDispatch** ppDisp, VARIANT_BOOL* pCancel, DWORD dwFlags, BSTR bstrUrlContext, BSTR bstrUrl);
+
+    //
+    void NavigateToStateURL(bool bForce);
+
+    CComObject<CHTMLBrowserHost>* m_pBrowserHost;
+    CComQIPtr<IWebBrowser2> m_pBrowserCtrl;
+
+    HICON m_hIcon;
+    HICON m_hIconSmall;
+
+    bool m_bInitializing;
+    bool m_bScreensaverMode;
+    CComBSTR m_strCurrentURL;
+    CComBSTR m_strEmbeddedURL;
+};
+
+#endif
\ No newline at end of file
diff --git a/samples/gfx_html/graphics.cpp b/samples/gfx_html/graphics.cpp
new file mode 100644
index 0000000..7ae5c11
--- /dev/null
+++ b/samples/gfx_html/graphics.cpp
@@ -0,0 +1,74 @@
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2014-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/>.
+
+#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
+
+#include "parse.h"
+#include "filesys.h"
+#include "boinc_api.h"
+#include "app_ipc.h"
+#include "browserlog.h"
+#include "graphics.h"
+
+
+#define GRAPHICS_FILENAME "boinc_graphics.xml"
+
+
+int parse_graphics(
+    std::string& default_url, std::string& running_url, std::string& suspended_url, std::string& network_suspended_url, std::string& exiting_url
+){
+    std::string path;
+    MIOFILE mf;
+
+    boinc_resolve_filename_s(GRAPHICS_FILENAME, path);
+    FILE* f = boinc_fopen(path.c_str(), "r");
+    if (!f) {
+        return ERR_FOPEN;
+    }
+    mf.init_file(f);
+    XML_PARSER xp(&mf);
+
+    if (!xp.parse_start("boinc_graphics")) return ERR_XML_PARSE;
+    while (!xp.get_tag()) {
+        if (!xp.is_tag) {
+            continue;
+        }
+        if (xp.match_tag("/boinc_graphics")) {
+            fclose(f);
+            return 0;
+        }
+        else if (xp.parse_string("default_url", default_url)) continue;
+        else if (xp.parse_string("running_url", running_url)) continue;
+        else if (xp.parse_string("suspended_url", suspended_url)) continue;
+        else if (xp.parse_string("network_suspended_url", network_suspended_url)) continue;
+        else if (xp.parse_string("exiting_url", exiting_url)) continue;
+    }
+    fclose(f);
+    return ERR_XML_PARSE;
+}
diff --git a/html/user/rss_main.php b/samples/gfx_html/graphics.h
similarity index 71%
copy from html/user/rss_main.php
copy to samples/gfx_html/graphics.h
index e86fcf0..9e390e5 100644
--- a/html/user/rss_main.php
+++ b/samples/gfx_html/graphics.h
@@ -1,7 +1,6 @@
-<?php
 // This file is part of BOINC.
 // http://boinc.berkeley.edu
-// Copyright (C) 2008 University of California
+// Copyright (C) 2014-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
@@ -16,14 +15,15 @@
 // 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("../project/project.inc");
-require_once("../inc/forum_rss.inc");
-require_once("../inc/news.inc");
+#ifndef _GRAPHICS_H_
+#define _GRAPHICS_H_
 
-$forum = news_forum();
-if (!$forum) {
-    exit;
-}
+int parse_graphics(
+    std::string& default_url,
+    std::string& running_url,
+    std::string& suspended_url,
+    std::string& network_suspended_url,
+    std::string& exiting_url
+);
 
-forum_rss($forum->id, 0, 1, 90);
-?>
+#endif
diff --git a/samples/gfx_html/mongoose.cpp b/samples/gfx_html/mongoose.cpp
new file mode 100644
index 0000000..21b747c
--- /dev/null
+++ b/samples/gfx_html/mongoose.cpp
@@ -0,0 +1,5287 @@
+// Copyright (c) 2004-2013 Sergey Lyubka <valenok at gmail.com>
+// Copyright (c) 2013-2014 Cesanta Software Limited
+// All rights reserved
+//
+// This library is dual-licensed: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License version 2 as
+// published by the Free Software Foundation. For the terms of this
+// license, see <http://www.gnu.org/licenses/>.
+//
+// You are free to use this library under the terms of the GNU General
+// Public License, but WITHOUT ANY WARRANTY; without even the implied
+// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// Alternatively, you can license this library under a commercial
+// license, as set out in <http://cesanta.com/>.
+
+#ifdef NOEMBED_NET_SKELETON
+#include "net_skeleton.h"
+#else
+// net_skeleton start
+// Copyright (c) 2014 Cesanta Software Limited
+// All rights reserved
+//
+// This software is dual-licensed: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License version 2 as
+// published by the Free Software Foundation. For the terms of this
+// license, see <http://www.gnu.org/licenses/>.
+//
+// You are free to use this software under the terms of the GNU General
+// Public License, but WITHOUT ANY WARRANTY; without even the implied
+// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// Alternatively, you can license this software under a commercial
+// license, as set out in <http://cesanta.com/>.
+//
+// $Date: 2014-09-28 05:04:41 UTC $
+
+#ifndef NS_SKELETON_HEADER_INCLUDED
+#define NS_SKELETON_HEADER_INCLUDED
+
+#define NS_SKELETON_VERSION "2.1.0"
+
+#undef UNICODE                  // Use ANSI WinAPI functions
+#undef _UNICODE                 // Use multibyte encoding on Windows
+#define _INTEGRAL_MAX_BITS 64   // Enable _stati64() on Windows
+#undef WIN32_LEAN_AND_MEAN      // Let windows.h always include winsock2.h
+#define _XOPEN_SOURCE 600       // For flockfile() on Linux
+#define __STDC_FORMAT_MACROS    // <inttypes.h> wants this for C++
+#define __STDC_LIMIT_MACROS     // C++ wants that for INT64_MAX
+#ifndef _LARGEFILE_SOURCE
+#define _LARGEFILE_SOURCE       // Enable fseeko() and ftello() functions
+#endif
+#define _FILE_OFFSET_BITS 64    // Enable 64-bit file offsets
+
+#ifdef _MSC_VER
+#pragma warning (disable : 4127)  // FD_SET() emits warning, disable it
+#pragma warning (disable : 4204)  // missing c99 support
+#pragma warning (disable : 4267)  // conversion from 'size_t' to 'int', possible loss of data
+#pragma warning (disable : 4244)  // conversion from '__int64' to 'int', possible loss of data
+#endif
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <assert.h>
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <signal.h>
+
+#ifdef _WIN32
+#ifdef _MSC_VER
+#pragma comment(lib, "ws2_32.lib")    // Linking with winsock library
+#endif
+#include <windows.h>
+#include <process.h>
+#ifndef EINPROGRESS
+#define EINPROGRESS WSAEINPROGRESS
+#endif
+#ifndef EWOULDBLOCK
+#define EWOULDBLOCK WSAEWOULDBLOCK
+#endif
+#ifndef __func__
+#define STRX(x) #x
+#define STR(x) STRX(x)
+#define __func__ __FILE__ ":" STR(__LINE__)
+#endif
+#ifndef va_copy
+#define va_copy(x,y) x = y
+#endif // MINGW #defines va_copy
+#define snprintf _snprintf
+#define vsnprintf _vsnprintf
+#define sleep(x) Sleep((x) * 1000)
+#define to64(x) _atoi64(x)
+typedef int socklen_t;
+typedef unsigned char uint8_t;
+typedef unsigned int uint32_t;
+typedef unsigned short uint16_t;
+typedef unsigned __int64 uint64_t;
+typedef __int64   int64_t;
+typedef SOCKET sock_t;
+typedef struct _stati64 ns_stat_t;
+#ifndef S_ISDIR
+#define S_ISDIR(x) ((x) & _S_IFDIR)
+#endif
+#else
+#include <errno.h>
+#include <fcntl.h>
+#include <netdb.h>
+#include <pthread.h>
+#include <stdarg.h>
+#include <unistd.h>
+#include <arpa/inet.h>  // For inet_pton() when NS_ENABLE_IPV6 is defined
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <sys/select.h>
+#define closesocket(x) close(x)
+#define __cdecl
+#define INVALID_SOCKET (-1)
+#define to64(x) strtoll(x, NULL, 10)
+typedef int sock_t;
+typedef struct stat ns_stat_t;
+#endif
+
+#ifdef NS_ENABLE_DEBUG
+#define DBG(x) do { printf("%-20s ", __func__); printf x; putchar('\n'); \
+  fflush(stdout); } while(0)
+#else
+#define DBG(x)
+#endif
+
+#ifndef ARRAY_SIZE
+#define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0]))
+#endif
+
+#ifdef NS_ENABLE_SSL
+#ifdef __APPLE__
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+#include <openssl/ssl.h>
+#else
+typedef void *SSL;
+typedef void *SSL_CTX;
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+union socket_address {
+  struct sockaddr sa;
+  struct sockaddr_in sin;
+#ifdef NS_ENABLE_IPV6
+  struct sockaddr_in6 sin6;
+#else
+  struct sockaddr sin6;
+#endif
+};
+
+// Describes chunk of memory
+struct ns_str {
+  const char *p;
+  size_t len;
+};
+
+// IO buffers interface
+struct iobuf {
+  char *buf;
+  size_t len;
+  size_t size;
+};
+
+void iobuf_init(struct iobuf *, size_t initial_size);
+void iobuf_free(struct iobuf *);
+size_t iobuf_append(struct iobuf *, const void *data, size_t data_size);
+void iobuf_remove(struct iobuf *, size_t data_size);
+void iobuf_resize(struct iobuf *, size_t new_size);
+
+// Callback function (event handler) prototype, must be defined by user.
+// Net skeleton will call event handler, passing events defined above.
+struct ns_connection;
+typedef void (*ns_callback_t)(struct ns_connection *, int event_num, void *evp);
+
+// Events. Meaning of event parameter (evp) is given in the comment.
+#define NS_POLL    0  // Sent to each connection on each call to ns_mgr_poll()
+#define NS_ACCEPT  1  // New connection accept()-ed. union socket_address *addr
+#define NS_CONNECT 2  // connect() succeeded or failed. int *success_status
+#define NS_RECV    3  // Data has benn received. int *num_bytes
+#define NS_SEND    4  // Data has been written to a socket. int *num_bytes
+#define NS_CLOSE   5  // Connection is closed. NULL
+
+
+struct ns_mgr {
+  struct ns_connection *active_connections;
+  const char *hexdump_file;         // Debug hexdump file path
+  sock_t ctl[2];                    // Socketpair for mg_wakeup()
+  void *user_data;                  // User data
+};
+
+
+struct ns_connection {
+  struct ns_connection *next, *prev;  // ns_mgr::active_connections linkage
+  struct ns_connection *listener;     // Set only for accept()-ed connections
+  struct ns_mgr *mgr;
+
+  sock_t sock;                // Socket
+  union socket_address sa;    // Peer address
+  struct iobuf recv_iobuf;    // Received data
+  struct iobuf send_iobuf;    // Data scheduled for sending
+  SSL *ssl;
+  SSL_CTX *ssl_ctx;
+  void *user_data;            // User-specific data
+  void *proto_data;           // Application protocol-specific data
+  time_t last_io_time;        // Timestamp of the last socket IO
+  ns_callback_t callback;     // Event handler function
+
+  unsigned int flags;
+#define NSF_FINISHED_SENDING_DATA   (1 << 0)
+#define NSF_BUFFER_BUT_DONT_SEND    (1 << 1)
+#define NSF_SSL_HANDSHAKE_DONE      (1 << 2)
+#define NSF_CONNECTING              (1 << 3)
+#define NSF_CLOSE_IMMEDIATELY       (1 << 4)
+#define NSF_WANT_READ               (1 << 5)
+#define NSF_WANT_WRITE              (1 << 6)
+#define NSF_LISTENING               (1 << 7)
+#define NSF_UDP                     (1 << 8)
+
+#define NSF_USER_1                  (1 << 20)
+#define NSF_USER_2                  (1 << 21)
+#define NSF_USER_3                  (1 << 22)
+#define NSF_USER_4                  (1 << 23)
+#define NSF_USER_5                  (1 << 24)
+#define NSF_USER_6                  (1 << 25)
+};
+
+void ns_mgr_init(struct ns_mgr *, void *user_data);
+void ns_mgr_free(struct ns_mgr *);
+time_t ns_mgr_poll(struct ns_mgr *, int milli);
+void ns_broadcast(struct ns_mgr *, ns_callback_t, void *, size_t);
+
+struct ns_connection *ns_next(struct ns_mgr *, struct ns_connection *);
+struct ns_connection *ns_add_sock(struct ns_mgr *, sock_t,
+                                  ns_callback_t, void *);
+struct ns_connection *ns_bind(struct ns_mgr *, const char *,
+                              ns_callback_t, void *);
+struct ns_connection *ns_connect(struct ns_mgr *, const char *,
+                                 ns_callback_t, void *);
+
+int ns_send(struct ns_connection *, const void *buf, int len);
+int ns_printf(struct ns_connection *, const char *fmt, ...);
+int ns_vprintf(struct ns_connection *, const char *fmt, va_list ap);
+
+// Utility functions
+void *ns_start_thread(void *(*f)(void *), void *p);
+int ns_socketpair(sock_t [2]);
+int ns_socketpair2(sock_t [2], int sock_type);  // SOCK_STREAM or SOCK_DGRAM
+void ns_set_close_on_exec(sock_t);
+void ns_sock_to_str(sock_t sock, char *buf, size_t len, int flags);
+int ns_hexdump(const void *buf, int len, char *dst, int dst_len);
+int ns_avprintf(char **buf, size_t size, const char *fmt, va_list ap);
+int ns_resolve(const char *domain_name, char *ip_addr_buf, size_t buf_len);
+
+#ifdef __cplusplus
+}
+#endif // __cplusplus
+
+#endif // NS_SKELETON_HEADER_INCLUDED
+// Copyright (c) 2014 Cesanta Software Limited
+// All rights reserved
+//
+// This software is dual-licensed: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License version 2 as
+// published by the Free Software Foundation. For the terms of this
+// license, see <http://www.gnu.org/licenses/>.
+//
+// You are free to use this software under the terms of the GNU General
+// Public License, but WITHOUT ANY WARRANTY; without even the implied
+// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// Alternatively, you can license this software under a commercial
+// license, as set out in <http://cesanta.com/>.
+//
+// $Date: 2014-09-28 05:04:41 UTC $
+
+
+#ifndef NS_MALLOC
+#define NS_MALLOC malloc
+#endif
+
+#ifndef NS_REALLOC
+#define NS_REALLOC realloc
+#endif
+
+#ifndef NS_FREE
+#define NS_FREE free
+#endif
+
+#ifndef NS_CALLOC
+#define NS_CALLOC calloc
+#endif
+
+#define NS_CTL_MSG_MESSAGE_SIZE     (8 * 1024)
+#define NS_READ_BUFFER_SIZE         2048
+#define NS_UDP_RECEIVE_BUFFER_SIZE  2000
+#define NS_VPRINTF_BUFFER_SIZE      500
+
+struct ctl_msg {
+  ns_callback_t callback;
+  char message[NS_CTL_MSG_MESSAGE_SIZE];
+};
+
+void iobuf_resize(struct iobuf *io, size_t new_size) {
+  char *p;
+  if ((new_size > io->size || (new_size < io->size && new_size >= io->len)) &&
+      (p = (char *) NS_REALLOC(io->buf, new_size)) != NULL) {
+    io->size = new_size;
+    io->buf = p;
+  }
+}
+
+void iobuf_init(struct iobuf *iobuf, size_t initial_size) {
+  iobuf->len = iobuf->size = 0;
+  iobuf->buf = NULL;
+  iobuf_resize(iobuf, initial_size);
+}
+
+void iobuf_free(struct iobuf *iobuf) {
+  if (iobuf != NULL) {
+    if (iobuf->buf != NULL) NS_FREE(iobuf->buf);
+    iobuf_init(iobuf, 0);
+  }
+}
+
+size_t iobuf_append(struct iobuf *io, const void *buf, size_t len) {
+  char *p = NULL;
+
+  assert(io != NULL);
+  assert(io->len <= io->size);
+
+  if (len <= 0) {
+  } else if (io->len + len <= io->size) {
+    memcpy(io->buf + io->len, buf, len);
+    io->len += len;
+  } else if ((p = (char *) NS_REALLOC(io->buf, io->len + len)) != NULL) {
+    io->buf = p;
+    memcpy(io->buf + io->len, buf, len);
+    io->len += len;
+    io->size = io->len;
+  } else {
+    len = 0;
+  }
+
+  return len;
+}
+
+void iobuf_remove(struct iobuf *io, size_t n) {
+  if (n > 0 && n <= io->len) {
+    memmove(io->buf, io->buf + n, io->len - n);
+    io->len -= n;
+  }
+}
+
+static size_t ns_out(struct ns_connection *nc, const void *buf, size_t len) {
+  if (nc->flags & NSF_UDP) {
+    long n = sendto(nc->sock, (const char*)buf, len, 0, &nc->sa.sa, sizeof(nc->sa.sin));
+    DBG(("%p %d send %ld (%d %s)", nc, nc->sock, n, errno, strerror(errno)));
+    return n < 0 ? 0 : n;
+  } else {
+    return iobuf_append(&nc->send_iobuf, buf, len);
+  }
+}
+
+#ifndef NS_DISABLE_THREADS
+void *ns_start_thread(void *(*f)(void *), void *p) {
+#ifdef _WIN32
+  return (void *) _beginthread((void (__cdecl *)(void *)) f, 0, p);
+#else
+  pthread_t thread_id = (pthread_t) 0;
+  pthread_attr_t attr;
+
+  (void) pthread_attr_init(&attr);
+  (void) pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+
+#if defined(NS_STACK_SIZE) && NS_STACK_SIZE > 1
+  (void) pthread_attr_setstacksize(&attr, NS_STACK_SIZE);
+#endif
+
+  pthread_create(&thread_id, &attr, f, p);
+  pthread_attr_destroy(&attr);
+
+  return (void *) thread_id;
+#endif
+}
+#endif  // NS_DISABLE_THREADS
+
+static void ns_add_conn(struct ns_mgr *mgr, struct ns_connection *c) {
+  c->next = mgr->active_connections;
+  mgr->active_connections = c;
+  c->prev = NULL;
+  if (c->next != NULL) c->next->prev = c;
+}
+
+static void ns_remove_conn(struct ns_connection *conn) {
+  if (conn->prev == NULL) conn->mgr->active_connections = conn->next;
+  if (conn->prev) conn->prev->next = conn->next;
+  if (conn->next) conn->next->prev = conn->prev;
+}
+
+// Print message to buffer. If buffer is large enough to hold the message,
+// return buffer. If buffer is to small, allocate large enough buffer on heap,
+// and return allocated buffer.
+int ns_avprintf(char **buf, size_t size, const char *fmt, va_list ap) {
+  va_list ap_copy;
+  int len;
+
+  va_copy(ap_copy, ap);
+  len = vsnprintf(*buf, size, fmt, ap_copy);
+  va_end(ap_copy);
+
+  if (len < 0) {
+    // eCos and Windows are not standard-compliant and return -1 when
+    // the buffer is too small. Keep allocating larger buffers until we
+    // succeed or out of memory.
+    *buf = NULL;
+    while (len < 0) {
+      if (*buf) NS_FREE(*buf);
+      size *= 2;
+      if ((*buf = (char *) NS_MALLOC(size)) == NULL) break;
+      va_copy(ap_copy, ap);
+      len = vsnprintf(*buf, size, fmt, ap_copy);
+      va_end(ap_copy);
+    }
+  } else if (len > (int) size) {
+    // Standard-compliant code path. Allocate a buffer that is large enough.
+    if ((*buf = (char *) NS_MALLOC(len + 1)) == NULL) {
+      len = -1;
+    } else {
+      va_copy(ap_copy, ap);
+      len = vsnprintf(*buf, len + 1, fmt, ap_copy);
+      va_end(ap_copy);
+    }
+  }
+
+  return len;
+}
+
+int ns_vprintf(struct ns_connection *nc, const char *fmt, va_list ap) {
+  char mem[NS_VPRINTF_BUFFER_SIZE], *buf = mem;
+  int len;
+
+  if ((len = ns_avprintf(&buf, sizeof(mem), fmt, ap)) > 0) {
+    ns_out(nc, buf, len);
+  }
+  if (buf != mem && buf != NULL) {
+    NS_FREE(buf);
+  }
+
+  return len;
+}
+
+int ns_printf(struct ns_connection *conn, const char *fmt, ...) {
+  int len;
+  va_list ap;
+  va_start(ap, fmt);
+  len = ns_vprintf(conn, fmt, ap);
+  va_end(ap);
+  return len;
+}
+
+static void hexdump(struct ns_connection *nc, const char *path,
+                    int num_bytes, int ev) {
+  const struct iobuf *io = ev == NS_SEND ? &nc->send_iobuf : &nc->recv_iobuf;
+  FILE *fp;
+  char *buf, src[60], dst[60];
+  int buf_size = num_bytes * 5 + 100;
+
+  if ((fp = fopen(path, "a")) != NULL) {
+    ns_sock_to_str(nc->sock, src, sizeof(src), 3);
+    ns_sock_to_str(nc->sock, dst, sizeof(dst), 7);
+    fprintf(fp, "%lu %p %s %s %s %d\n", (unsigned long) time(NULL),
+            nc->user_data, src,
+            ev == NS_RECV ? "<-" : ev == NS_SEND ? "->" :
+            ev == NS_ACCEPT ? "<A" : ev == NS_CONNECT ? "C>" : "XX",
+            dst, num_bytes);
+    if (num_bytes > 0 && (buf = (char *) NS_MALLOC(buf_size)) != NULL) {
+      ns_hexdump(io->buf + (ev == NS_SEND ? 0 : io->len) -
+        (ev == NS_SEND ? 0 : num_bytes), num_bytes, buf, buf_size);
+      fprintf(fp, "%s", buf);
+      NS_FREE(buf);
+    }
+    fclose(fp);
+  }
+}
+
+static void ns_call(struct ns_connection *nc, int ev, void *p) {
+  if (nc->mgr->hexdump_file != NULL && ev != NS_POLL) {
+    int len = (ev == NS_RECV || ev == NS_SEND) ? * (int *) p : 0;
+    hexdump(nc, nc->mgr->hexdump_file, len, ev);
+  }
+
+  nc->callback(nc, ev, p);
+}
+
+static void ns_destroy_conn(struct ns_connection *conn) {
+  closesocket(conn->sock);
+  iobuf_free(&conn->recv_iobuf);
+  iobuf_free(&conn->send_iobuf);
+#ifdef NS_ENABLE_SSL
+  if (conn->ssl != NULL) {
+    SSL_free(conn->ssl);
+  }
+  if (conn->ssl_ctx != NULL) {
+    SSL_CTX_free(conn->ssl_ctx);
+  }
+#endif
+  NS_FREE(conn);
+}
+
+static void ns_close_conn(struct ns_connection *conn) {
+  DBG(("%p %d", conn, conn->flags));
+  ns_call(conn, NS_CLOSE, NULL);
+  ns_remove_conn(conn);
+  ns_destroy_conn(conn);
+}
+
+void ns_set_close_on_exec(sock_t sock) {
+#ifdef _WIN32
+  (void) SetHandleInformation((HANDLE) sock, HANDLE_FLAG_INHERIT, 0);
+#else
+  fcntl(sock, F_SETFD, FD_CLOEXEC);
+#endif
+}
+
+static void ns_set_non_blocking_mode(sock_t sock) {
+#ifdef _WIN32
+  unsigned long on = 1;
+  ioctlsocket(sock, FIONBIO, &on);
+#else
+  int flags = fcntl(sock, F_GETFL, 0);
+  fcntl(sock, F_SETFL, flags | O_NONBLOCK);
+#endif
+}
+
+#ifndef NS_DISABLE_SOCKETPAIR
+int ns_socketpair2(sock_t sp[2], int sock_type) {
+  union socket_address sa;
+  sock_t sock;
+  socklen_t len = sizeof(sa.sin);
+  int ret = 0;
+
+  sp[0] = sp[1] = INVALID_SOCKET;
+
+  (void) memset(&sa, 0, sizeof(sa));
+  sa.sin.sin_family = AF_INET;
+  sa.sin.sin_port = htons(0);
+  sa.sin.sin_addr.s_addr = htonl(0x7f000001);
+
+  if ((sock = socket(AF_INET, sock_type, 0)) != INVALID_SOCKET &&
+      !bind(sock, &sa.sa, len) &&
+      (sock_type == SOCK_DGRAM || !listen(sock, 1)) &&
+      !getsockname(sock, &sa.sa, &len) &&
+      (sp[0] = socket(AF_INET, sock_type, 0)) != INVALID_SOCKET &&
+      !connect(sp[0], &sa.sa, len) &&
+      (sock_type == SOCK_STREAM ||
+       (!getsockname(sp[0], &sa.sa, &len) && !connect(sock, &sa.sa, len))) &&
+      (sp[1] = (sock_type == SOCK_DGRAM ? sock :
+                accept(sock, &sa.sa, &len))) != INVALID_SOCKET) {
+    ns_set_close_on_exec(sp[0]);
+    ns_set_close_on_exec(sp[1]);
+    ret = 1;
+  } else {
+    if (sp[0] != INVALID_SOCKET) closesocket(sp[0]);
+    if (sp[1] != INVALID_SOCKET) closesocket(sp[1]);
+    sp[0] = sp[1] = INVALID_SOCKET;
+  }
+  if (sock_type != SOCK_DGRAM) closesocket(sock);
+
+  return ret;
+}
+
+int ns_socketpair(sock_t sp[2]) {
+  return ns_socketpair2(sp, SOCK_STREAM);
+}
+#endif  // NS_DISABLE_SOCKETPAIR
+
+// TODO(lsm): use non-blocking resolver
+static int ns_resolve2(const char *host, struct in_addr *ina) {
+  struct hostent *he;
+  if ((he = gethostbyname(host)) == NULL) {
+    DBG(("gethostbyname(%s) failed: %s", host, strerror(errno)));
+  } else {
+    memcpy(ina, he->h_addr_list[0], sizeof(*ina));
+    return 1;
+  }
+  return 0;
+}
+
+// Resolve FDQN "host", store IP address in the "ip".
+// Return > 0 (IP address length) on success.
+int ns_resolve(const char *host, char *buf, size_t n) {
+  struct in_addr ad;
+  return ns_resolve2(host, &ad) ? snprintf(buf, n, "%s", inet_ntoa(ad)) : 0;
+}
+
+// Address format: [PROTO://][IP_ADDRESS:]PORT[:CERT][:CA_CERT]
+static int ns_parse_address(const char *str, union socket_address *sa,
+                            int *proto, int *use_ssl, char *cert, char *ca) {
+  unsigned int a, b, c, d, port;
+  int n = 0, len = 0;
+  char host[200];
+#ifdef NS_ENABLE_IPV6
+  char buf[100];
+#endif
+
+  // MacOS needs that. If we do not zero it, subsequent bind() will fail.
+  // Also, all-zeroes in the socket address means binding to all addresses
+  // for both IPv4 and IPv6 (INADDR_ANY and IN6ADDR_ANY_INIT).
+  memset(sa, 0, sizeof(*sa));
+  sa->sin.sin_family = AF_INET;
+
+  *proto = SOCK_STREAM;
+  *use_ssl = 0;
+  cert[0] = ca[0] = '\0';
+
+  if (memcmp(str, "ssl://", 6) == 0) {
+    str += 6;
+    *use_ssl = 1;
+  } else if (memcmp(str, "udp://", 6) == 0) {
+    str += 6;
+    *proto = SOCK_DGRAM;
+  } else if (memcmp(str, "tcp://", 6) == 0) {
+    str += 6;
+  }
+
+  if (sscanf(str, "%u.%u.%u.%u:%u%n", &a, &b, &c, &d, &port, &len) == 5) {
+    // Bind to a specific IPv4 address, e.g. 192.168.1.5:8080
+    sa->sin.sin_addr.s_addr = htonl((a << 24) | (b << 16) | (c << 8) | d);
+    sa->sin.sin_port = htons((uint16_t) port);
+#ifdef NS_ENABLE_IPV6
+  } else if (sscanf(str, "[%99[^]]]:%u%n", buf, &port, &len) == 2 &&
+             inet_pton(AF_INET6, buf, &sa->sin6.sin6_addr)) {
+    // IPv6 address, e.g. [3ffe:2a00:100:7031::1]:8080
+    sa->sin6.sin6_family = AF_INET6;
+    sa->sin6.sin6_port = htons((uint16_t) port);
+#endif
+  } else if (sscanf(str, "%199[^ :]:%u%n", host, &port, &len) == 2) {
+    sa->sin.sin_port = htons((uint16_t) port);
+    ns_resolve2(host, &sa->sin.sin_addr);
+  } else if (sscanf(str, "%u%n", &port, &len) == 1) {
+    // If only port is specified, bind to IPv4, INADDR_ANY
+    sa->sin.sin_port = htons((uint16_t) port);
+  }
+
+  if (*use_ssl && (sscanf(str + len, ":%99[^:]:%99[^:]%n", cert, ca, &n) == 2 ||
+                   sscanf(str + len, ":%99[^:]%n", cert, &n) == 1)) {
+    len += n;
+  }
+
+  return port < 0xffff && str[len] == '\0' ? len : 0;
+}
+
+// 'sa' must be an initialized address to bind to
+static sock_t ns_open_listening_socket(union socket_address *sa, int proto) {
+  socklen_t sa_len = (sa->sa.sa_family == AF_INET) ?
+    sizeof(sa->sin) : sizeof(sa->sin6);
+  sock_t sock = INVALID_SOCKET;
+#ifndef _WIN32
+  int on = 1;
+#endif
+
+  if ((sock = socket(sa->sa.sa_family, proto, 0)) != INVALID_SOCKET &&
+#ifndef _WIN32
+      // SO_RESUSEADDR is not enabled on Windows because the semantics of
+      // SO_REUSEADDR on UNIX and Windows is different. On Windows,
+      // SO_REUSEADDR allows to bind a socket to a port without error even if
+      // the port is already open by another program. This is not the behavior
+      // SO_REUSEADDR was designed for, and leads to hard-to-track failure
+      // scenarios. Therefore, SO_REUSEADDR was disabled on Windows.
+      !setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *) &on, sizeof(on)) &&
+#endif
+      !bind(sock, &sa->sa, sa_len) &&
+      (proto == SOCK_DGRAM || listen(sock, SOMAXCONN) == 0)) {
+    ns_set_non_blocking_mode(sock);
+    // In case port was set to 0, get the real port number
+    (void) getsockname(sock, &sa->sa, &sa_len);
+  } else if (sock != INVALID_SOCKET) {
+    closesocket(sock);
+    sock = INVALID_SOCKET;
+  }
+
+  return sock;
+}
+
+#ifdef NS_ENABLE_SSL
+// Certificate generation script is at
+// https://github.com/cesanta/net_skeleton/blob/master/scripts/gen_certs.sh
+
+static int ns_use_ca_cert(SSL_CTX *ctx, const char *cert) {
+  if (ctx == NULL) {
+    return -1;
+  } else if (cert == NULL || cert[0] == '\0') {
+    return 0;
+  }
+  SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, 0);
+  return SSL_CTX_load_verify_locations(ctx, cert, NULL) == 1 ? 0 : -2;
+}
+
+static int ns_use_cert(SSL_CTX *ctx, const char *pem_file) {
+  if (ctx == NULL) {
+    return -1;
+  } else if (pem_file == NULL || pem_file[0] == '\0') {
+    return 0;
+  } else if (SSL_CTX_use_certificate_file(ctx, pem_file, 1) == 0 ||
+             SSL_CTX_use_PrivateKey_file(ctx, pem_file, 1) == 0) {
+    return -2;
+  } else {
+    SSL_CTX_set_mode(ctx, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
+    SSL_CTX_use_certificate_chain_file(ctx, pem_file);
+    return 0;
+  }
+}
+#endif  // NS_ENABLE_SSL
+
+struct ns_connection *ns_bind(struct ns_mgr *srv, const char *str,
+                              ns_callback_t callback, void *user_data) {
+  union socket_address sa;
+  struct ns_connection *nc = NULL;
+  int use_ssl, proto;
+  char cert[100], ca_cert[100];
+  sock_t sock;
+
+  ns_parse_address(str, &sa, &proto, &use_ssl, cert, ca_cert);
+  if (use_ssl && cert[0] == '\0') return NULL;
+
+  if ((sock = ns_open_listening_socket(&sa, proto)) == INVALID_SOCKET) {
+  } else if ((nc = ns_add_sock(srv, sock, callback, NULL)) == NULL) {
+    closesocket(sock);
+  } else {
+    nc->sa = sa;
+    nc->flags |= NSF_LISTENING;
+    nc->user_data = user_data;
+    nc->callback = callback;
+
+    if (proto == SOCK_DGRAM) {
+      nc->flags |= NSF_UDP;
+    }
+
+#ifdef NS_ENABLE_SSL
+    if (use_ssl) {
+      nc->ssl_ctx = SSL_CTX_new(SSLv23_server_method());
+      if (ns_use_cert(nc->ssl_ctx, cert) != 0 ||
+          ns_use_ca_cert(nc->ssl_ctx, ca_cert) != 0) {
+        ns_close_conn(nc);
+        nc = NULL;
+      }
+    }
+#endif
+
+    DBG(("%p sock %d/%d ssl %p %p", nc, sock, proto, nc->ssl_ctx, nc->ssl));
+  }
+
+  return nc;
+}
+
+static struct ns_connection *accept_conn(struct ns_connection *ls) {
+  struct ns_connection *c = NULL;
+  union socket_address sa;
+  socklen_t len = sizeof(sa);
+  sock_t sock = INVALID_SOCKET;
+
+  // NOTE(lsm): on Windows, sock is always > FD_SETSIZE
+  if ((sock = accept(ls->sock, &sa.sa, &len)) == INVALID_SOCKET) {
+  } else if ((c = ns_add_sock(ls->mgr, sock, ls->callback,
+              ls->user_data)) == NULL) {
+    closesocket(sock);
+#ifdef NS_ENABLE_SSL
+  } else if (ls->ssl_ctx != NULL &&
+             ((c->ssl = SSL_new(ls->ssl_ctx)) == NULL ||
+              SSL_set_fd(c->ssl, sock) != 1)) {
+    DBG(("SSL error"));
+    ns_close_conn(c);
+    c = NULL;
+#endif
+  } else {
+    c->listener = ls;
+    c->proto_data = ls->proto_data;
+    ns_call(c, NS_ACCEPT, &sa);
+    DBG(("%p %d %p %p", c, c->sock, c->ssl_ctx, c->ssl));
+  }
+
+  return c;
+}
+
+static int ns_is_error(int n) {
+  return n == 0 ||
+    (n < 0 && errno != EINTR && errno != EINPROGRESS &&
+     errno != EAGAIN && errno != EWOULDBLOCK
+#ifdef _WIN32
+     && WSAGetLastError() != WSAEINTR && WSAGetLastError() != WSAEWOULDBLOCK
+#endif
+    );
+}
+
+void ns_sock_to_str(sock_t sock, char *buf, size_t len, int flags) {
+  union socket_address sa;
+  socklen_t slen = sizeof(sa);
+
+  if (buf != NULL && len > 0) {
+    buf[0] = '\0';
+    memset(&sa, 0, sizeof(sa));
+    if (flags & 4) {
+      getpeername(sock, &sa.sa, &slen);
+    } else {
+      getsockname(sock, &sa.sa, &slen);
+    }
+    if (flags & 1) {
+#if defined(NS_ENABLE_IPV6)
+      inet_ntop(sa.sa.sa_family, sa.sa.sa_family == AF_INET ?
+                (void *) &sa.sin.sin_addr :
+                (void *) &sa.sin6.sin6_addr, buf, len);
+#elif defined(_WIN32)
+      // Only Windoze Vista (and newer) have inet_ntop()
+      strncpy(buf, inet_ntoa(sa.sin.sin_addr), len);
+#else
+      inet_ntop(sa.sa.sa_family, (void *) &sa.sin.sin_addr, buf,(socklen_t)len);
+#endif
+    }
+    if (flags & 2) {
+      snprintf(buf + strlen(buf), len - (strlen(buf) + 1), "%s%d",
+               flags & 1 ? ":" : "", (int) ntohs(sa.sin.sin_port));
+    }
+  }
+}
+
+int ns_hexdump(const void *buf, int len, char *dst, int dst_len) {
+  const unsigned char *p = (const unsigned char *) buf;
+  char ascii[17] = "";
+  int i, idx, n = 0;
+
+  for (i = 0; i < len; i++) {
+    idx = i % 16;
+    if (idx == 0) {
+      if (i > 0) n += snprintf(dst + n, dst_len - n, "  %s\n", ascii);
+      n += snprintf(dst + n, dst_len - n, "%04x ", i);
+    }
+    n += snprintf(dst + n, dst_len - n, " %02x", p[i]);
+    ascii[idx] = p[i] < 0x20 || p[i] > 0x7e ? '.' : p[i];
+    ascii[idx + 1] = '\0';
+  }
+
+  while (i++ % 16) n += snprintf(dst + n, dst_len - n, "%s", "   ");
+  n += snprintf(dst + n, dst_len - n, "  %s\n\n", ascii);
+
+  return n;
+}
+
+#ifdef NS_ENABLE_SSL
+static int ns_ssl_err(struct ns_connection *conn, int res) {
+  int ssl_err = SSL_get_error(conn->ssl, res);
+  if (ssl_err == SSL_ERROR_WANT_READ) conn->flags |= NSF_WANT_READ;
+  if (ssl_err == SSL_ERROR_WANT_WRITE) conn->flags |= NSF_WANT_WRITE;
+  return ssl_err;
+}
+#endif
+
+static void ns_read_from_socket(struct ns_connection *conn) {
+  char buf[NS_READ_BUFFER_SIZE];
+  int n = 0;
+
+  if (conn->flags & NSF_CONNECTING) {
+    int ok = 1, ret;
+    socklen_t len = sizeof(ok);
+
+    ret = getsockopt(conn->sock, SOL_SOCKET, SO_ERROR, (char *) &ok, &len);
+    (void) ret;
+#ifdef NS_ENABLE_SSL
+    if (ret == 0 && ok == 0 && conn->ssl != NULL) {
+      int res = SSL_connect(conn->ssl);
+      int ssl_err = ns_ssl_err(conn, res);
+      if (res == 1) {
+        conn->flags |= NSF_SSL_HANDSHAKE_DONE;
+      } else if (ssl_err == SSL_ERROR_WANT_READ ||
+                 ssl_err == SSL_ERROR_WANT_WRITE) {
+        return; // Call us again
+      } else {
+        ok = 1;
+      }
+    }
+#endif
+    conn->flags &= ~NSF_CONNECTING;
+    DBG(("%p ok=%d", conn, ok));
+    if (ok != 0) {
+      conn->flags |= NSF_CLOSE_IMMEDIATELY;
+    }
+    ns_call(conn, NS_CONNECT, &ok);
+    return;
+  }
+
+#ifdef NS_ENABLE_SSL
+  if (conn->ssl != NULL) {
+    if (conn->flags & NSF_SSL_HANDSHAKE_DONE) {
+      // SSL library may have more bytes ready to read then we ask to read.
+      // Therefore, read in a loop until we read everything. Without the loop,
+      // we skip to the next select() cycle which can just timeout.
+      while ((n = SSL_read(conn->ssl, buf, sizeof(buf))) > 0) {
+        DBG(("%p %d <- %d bytes (SSL)", conn, conn->flags, n));
+        iobuf_append(&conn->recv_iobuf, buf, n);
+        ns_call(conn, NS_RECV, &n);
+      }
+      ns_ssl_err(conn, n);
+    } else {
+      int res = SSL_accept(conn->ssl);
+      int ssl_err = ns_ssl_err(conn, res);
+      if (res == 1) {
+        conn->flags |= NSF_SSL_HANDSHAKE_DONE;
+      } else if (ssl_err == SSL_ERROR_WANT_READ ||
+                 ssl_err == SSL_ERROR_WANT_WRITE) {
+        return; // Call us again
+      } else {
+        conn->flags |= NSF_CLOSE_IMMEDIATELY;
+      }
+      return;
+    }
+  } else
+#endif
+  {
+    while ((n = (int) recv(conn->sock, buf, sizeof(buf), 0)) > 0) {
+      DBG(("%p %d <- %d bytes (PLAIN)", conn, conn->flags, n));
+      iobuf_append(&conn->recv_iobuf, buf, n);
+      ns_call(conn, NS_RECV, &n);
+    }
+  }
+
+  if (ns_is_error(n)) {
+    conn->flags |= NSF_CLOSE_IMMEDIATELY;
+  }
+}
+
+static void ns_write_to_socket(struct ns_connection *conn) {
+  struct iobuf *io = &conn->send_iobuf;
+  int n = 0;
+
+#ifdef NS_ENABLE_SSL
+  if (conn->ssl != NULL) {
+    n = SSL_write(conn->ssl, io->buf, io->len);
+    if (n <= 0) {
+      int ssl_err = ns_ssl_err(conn, n);
+      if (ssl_err == SSL_ERROR_WANT_READ || ssl_err == SSL_ERROR_WANT_WRITE) {
+        return; // Call us again
+      } else {
+        conn->flags |= NSF_CLOSE_IMMEDIATELY;
+      }
+    }
+  } else
+#endif
+  { n = (int) send(conn->sock, io->buf, io->len, 0); }
+
+  DBG(("%p %d -> %d bytes", conn, conn->flags, n));
+
+  ns_call(conn, NS_SEND, &n);
+  if (ns_is_error(n)) {
+    conn->flags |= NSF_CLOSE_IMMEDIATELY;
+  } else if (n > 0) {
+    iobuf_remove(io, n);
+  }
+}
+
+int ns_send(struct ns_connection *conn, const void *buf, int len) {
+  return (int) ns_out(conn, buf, len);
+}
+
+static void ns_handle_udp(struct ns_connection *ls) {
+  struct ns_connection nc;
+  char buf[NS_UDP_RECEIVE_BUFFER_SIZE];
+  int n;
+  socklen_t s_len = sizeof(nc.sa);
+
+  memset(&nc, 0, sizeof(nc));
+  n = recvfrom(ls->sock, buf, sizeof(buf), 0, &nc.sa.sa, &s_len);
+  if (n <= 0) {
+    DBG(("%p recvfrom: %s", ls, strerror(errno)));
+  } else {
+    nc.mgr = ls->mgr;
+    nc.recv_iobuf.buf = buf;
+    nc.recv_iobuf.len = nc.recv_iobuf.size = n;
+    nc.sock = ls->sock;
+    nc.callback = ls->callback;
+    nc.user_data = ls->user_data;
+    nc.proto_data = ls->proto_data;
+    nc.mgr = ls->mgr;
+    nc.listener = ls;
+    nc.flags = NSF_UDP;
+    DBG(("%p %d bytes received", ls, n));
+    ns_call(&nc, NS_RECV, &n);
+  }
+}
+
+static void ns_add_to_set(sock_t sock, fd_set *set, sock_t *max_fd) {
+  if (sock != INVALID_SOCKET) {
+    FD_SET(sock, set);
+    if (*max_fd == INVALID_SOCKET || sock > *max_fd) {
+      *max_fd = sock;
+    }
+  }
+}
+
+time_t ns_mgr_poll(struct ns_mgr *mgr, int milli) {
+  struct ns_connection *conn, *tmp_conn;
+  struct timeval tv;
+  fd_set read_set, write_set;
+  sock_t max_fd = INVALID_SOCKET;
+  time_t current_time = time(NULL);
+
+  FD_ZERO(&read_set);
+  FD_ZERO(&write_set);
+  ns_add_to_set(mgr->ctl[1], &read_set, &max_fd);
+
+  for (conn = mgr->active_connections; conn != NULL; conn = tmp_conn) {
+    tmp_conn = conn->next;
+    if (!(conn->flags & (NSF_LISTENING | NSF_CONNECTING))) {
+      ns_call(conn, NS_POLL, &current_time);
+    }
+    if (conn->flags & NSF_CLOSE_IMMEDIATELY) {
+      ns_close_conn(conn);
+    } else {
+      if (!(conn->flags & NSF_WANT_WRITE)) {
+        //DBG(("%p read_set", conn));
+        ns_add_to_set(conn->sock, &read_set, &max_fd);
+      }
+      if (((conn->flags & NSF_CONNECTING) && !(conn->flags & NSF_WANT_READ)) ||
+          (conn->send_iobuf.len > 0 && !(conn->flags & NSF_CONNECTING) &&
+           !(conn->flags & NSF_BUFFER_BUT_DONT_SEND))) {
+        //DBG(("%p write_set", conn));
+        ns_add_to_set(conn->sock, &write_set, &max_fd);
+      }
+    }
+  }
+
+  tv.tv_sec = milli / 1000;
+  tv.tv_usec = (milli % 1000) * 1000;
+
+  if (select((int) max_fd + 1, &read_set, &write_set, NULL, &tv) > 0) {
+    // select() might have been waiting for a long time, reset current_time
+    // now to prevent last_io_time being set to the past.
+    current_time = time(NULL);
+
+    // Read wakeup messages
+    if (mgr->ctl[1] != INVALID_SOCKET &&
+        FD_ISSET(mgr->ctl[1], &read_set)) {
+      struct ctl_msg ctl_msg;
+      int len = (int) recv(mgr->ctl[1], (char *) &ctl_msg, sizeof(ctl_msg), 0);
+      send(mgr->ctl[1], ctl_msg.message, 1, 0);
+      if (len >= (int) sizeof(ctl_msg.callback) && ctl_msg.callback != NULL) {
+        struct ns_connection *c;
+        for (c = ns_next(mgr, NULL); c != NULL; c = ns_next(mgr, c)) {
+          ctl_msg.callback(c, NS_POLL, ctl_msg.message);
+        }
+      }
+    }
+
+    for (conn = mgr->active_connections; conn != NULL; conn = tmp_conn) {
+      tmp_conn = conn->next;
+      if (FD_ISSET(conn->sock, &read_set)) {
+        if (conn->flags & NSF_LISTENING) {
+          if (conn->flags & NSF_UDP) {
+            ns_handle_udp(conn);
+          } else {
+            // We're not looping here, and accepting just one connection at
+            // a time. The reason is that eCos does not respect non-blocking
+            // flag on a listening socket and hangs in a loop.
+            accept_conn(conn);
+          }
+        } else {
+          conn->last_io_time = current_time;
+          ns_read_from_socket(conn);
+        }
+      }
+
+      if (FD_ISSET(conn->sock, &write_set)) {
+        if (conn->flags & NSF_CONNECTING) {
+          ns_read_from_socket(conn);
+        } else if (!(conn->flags & NSF_BUFFER_BUT_DONT_SEND)) {
+          conn->last_io_time = current_time;
+          ns_write_to_socket(conn);
+        }
+      }
+    }
+  }
+
+  for (conn = mgr->active_connections; conn != NULL; conn = tmp_conn) {
+    tmp_conn = conn->next;
+    if ((conn->flags & NSF_CLOSE_IMMEDIATELY) ||
+        (conn->send_iobuf.len == 0 &&
+          (conn->flags & NSF_FINISHED_SENDING_DATA))) {
+      ns_close_conn(conn);
+    }
+  }
+
+  return current_time;
+}
+
+struct ns_connection *ns_connect(struct ns_mgr *mgr, const char *address,
+                                 ns_callback_t callback, void *user_data) {
+  sock_t sock = INVALID_SOCKET;
+  struct ns_connection *nc = NULL;
+  union socket_address sa;
+  char cert[100], ca_cert[100];
+  int rc, use_ssl, proto;
+
+  ns_parse_address(address, &sa, &proto, &use_ssl, cert, ca_cert);
+  if ((sock = socket(AF_INET, proto, 0)) == INVALID_SOCKET) {
+    return NULL;
+  }
+  ns_set_non_blocking_mode(sock);
+  rc = (proto == SOCK_DGRAM) ? 0 : connect(sock, &sa.sa, sizeof(sa.sin));
+
+  if (rc != 0 && ns_is_error(rc)) {
+    closesocket(sock);
+    return NULL;
+  } else if ((nc = ns_add_sock(mgr, sock, callback, user_data)) == NULL) {
+    closesocket(sock);
+    return NULL;
+  }
+
+  nc->sa = sa;   // Important, cause UDP conns will use sendto()
+  nc->flags = (proto == SOCK_DGRAM) ? NSF_UDP : NSF_CONNECTING;
+
+#ifdef NS_ENABLE_SSL
+  if (use_ssl) {
+    if ((nc->ssl_ctx = SSL_CTX_new(SSLv23_client_method())) == NULL ||
+        ns_use_cert(nc->ssl_ctx, cert) != 0 ||
+        ns_use_ca_cert(nc->ssl_ctx, ca_cert) != 0 ||
+        (nc->ssl = SSL_new(nc->ssl_ctx)) == NULL) {
+      ns_close_conn(nc);
+      return NULL;
+    } else {
+      SSL_set_fd(nc->ssl, sock);
+    }
+  }
+#endif
+
+  return nc;
+}
+
+struct ns_connection *ns_add_sock(struct ns_mgr *s, sock_t sock,
+                                  ns_callback_t callback, void *user_data) {
+  struct ns_connection *conn;
+  if ((conn = (struct ns_connection *) NS_MALLOC(sizeof(*conn))) != NULL) {
+    memset(conn, 0, sizeof(*conn));
+    ns_set_non_blocking_mode(sock);
+    ns_set_close_on_exec(sock);
+    conn->sock = sock;
+    conn->user_data = user_data;
+    conn->callback = callback;
+    conn->mgr = s;
+    conn->last_io_time = time(NULL);
+    ns_add_conn(s, conn);
+    DBG(("%p %d", conn, sock));
+  }
+  return conn;
+}
+
+struct ns_connection *ns_next(struct ns_mgr *s, struct ns_connection *conn) {
+  return conn == NULL ? s->active_connections : conn->next;
+}
+
+void ns_broadcast(struct ns_mgr *mgr, ns_callback_t cb,void *data, size_t len) {
+  struct ctl_msg ctl_msg;
+  if (mgr->ctl[0] != INVALID_SOCKET && data != NULL &&
+      len < sizeof(ctl_msg.message)) {
+    ctl_msg.callback = cb;
+    memcpy(ctl_msg.message, data, len);
+    send(mgr->ctl[0], (char *) &ctl_msg,
+         offsetof(struct ctl_msg, message) + len, 0);
+    recv(mgr->ctl[0], (char *) &len, 1, 0);
+  }
+}
+
+void ns_mgr_init(struct ns_mgr *s, void *user_data) {
+  memset(s, 0, sizeof(*s));
+  s->ctl[0] = s->ctl[1] = INVALID_SOCKET;
+  s->user_data = user_data;
+
+#ifdef _WIN32
+  { WSADATA data; WSAStartup(MAKEWORD(2, 2), &data); }
+#else
+  // Ignore SIGPIPE signal, so if client cancels the request, it
+  // won't kill the whole process.
+  signal(SIGPIPE, SIG_IGN);
+#endif
+
+#ifndef NS_DISABLE_SOCKETPAIR
+  do {
+    ns_socketpair2(s->ctl, SOCK_DGRAM);
+  } while (s->ctl[0] == INVALID_SOCKET);
+#endif
+
+#ifdef NS_ENABLE_SSL
+  {static int init_done; if (!init_done) { SSL_library_init(); init_done++; }}
+#endif
+}
+
+void ns_mgr_free(struct ns_mgr *s) {
+  struct ns_connection *conn, *tmp_conn;
+
+  DBG(("%p", s));
+  if (s == NULL) return;
+  // Do one last poll, see https://github.com/cesanta/mongoose/issues/286
+  ns_mgr_poll(s, 0);
+
+  if (s->ctl[0] != INVALID_SOCKET) closesocket(s->ctl[0]);
+  if (s->ctl[1] != INVALID_SOCKET) closesocket(s->ctl[1]);
+  s->ctl[0] = s->ctl[1] = INVALID_SOCKET;
+
+  for (conn = s->active_connections; conn != NULL; conn = tmp_conn) {
+    tmp_conn = conn->next;
+    ns_close_conn(conn);
+  }
+}
+// net_skeleton end
+#endif  // NOEMBED_NET_SKELETON
+
+#include <ctype.h>
+
+#ifdef _WIN32         //////////////// Windows specific defines and includes
+#include <io.h>       // For _lseeki64
+#include <direct.h>   // For _mkdir
+#ifndef S_ISDIR
+#define S_ISDIR(x) ((x) & _S_IFDIR)
+#endif
+#ifdef stat
+#undef stat
+#endif
+#ifdef lseek
+#undef lseek
+#endif
+#ifdef popen
+#undef popen
+#endif
+#ifdef pclose
+#undef pclose
+#endif
+#define stat(x, y) mg_stat((x), (y))
+#define fopen(x, y) mg_fopen((x), (y))
+#define open(x, y, z) mg_open((x), (y), (z))
+#define close(x) _close(x)
+#define fileno(x) _fileno(x)
+#define lseek(x, y, z) _lseeki64((x), (y), (z))
+#define read(x, y, z) _read((x), (y), (z))
+#define write(x, y, z) _write((x), (y), (z))
+#define popen(x, y) _popen((x), (y))
+#define pclose(x) _pclose(x)
+#define mkdir(x, y) _mkdir(x)
+#define rmdir(x) _rmdir(x)
+#define strdup(x) _strdup(x)
+#ifndef __func__
+#define STRX(x) #x
+#define STR(x) STRX(x)
+#define __func__ __FILE__ ":" STR(__LINE__)
+#endif
+/* MINGW has adopted the MSVC formatting for 64-bit ints as of gcc 4.4 till 4.8*/
+#if (defined(__MINGW32__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4 && __GNUC_MINOR__ < 8))) || defined(_MSC_VER)
+#define INT64_FMT   "I64d"
+#else
+#define INT64_FMT   "lld"
+#endif
+#define flockfile(x)      ((void) (x))
+#define funlockfile(x)    ((void) (x))
+typedef struct _stati64 file_stat_t;
+typedef HANDLE process_id_t;
+
+#else                    ////////////// UNIX specific defines and includes
+
+#if !defined(MONGOOSE_NO_FILESYSTEM) &&\
+    (!defined(MONGOOSE_NO_DAV) || !defined(MONGOOSE_NO_DIRECTORY_LISTING))
+#include <dirent.h>
+#endif
+#if !defined(MONGOOSE_NO_FILESYSTEM) && !defined(MONGOOSE_NO_DL)
+#include <dlfcn.h>
+#endif
+#include <inttypes.h>
+#include <pwd.h>
+#if !defined(O_BINARY)
+#define O_BINARY 0
+#endif
+#define INT64_FMT PRId64
+typedef struct stat file_stat_t;
+typedef pid_t process_id_t;
+#endif                  //////// End of platform-specific defines and includes
+
+#include "mongoose.h"
+
+#define MAX_REQUEST_SIZE 16384
+#define IOBUF_SIZE 8192
+#define MAX_PATH_SIZE 8192
+#define DEFAULT_CGI_PATTERN "**.cgi$|**.pl$|**.php$"
+#define CGI_ENVIRONMENT_SIZE 8192
+#define MAX_CGI_ENVIR_VARS 64
+#define ENV_EXPORT_TO_CGI "MONGOOSE_CGI"
+#define PASSWORDS_FILE_NAME ".htpasswd"
+
+#ifndef MONGOOSE_USE_WEBSOCKET_PING_INTERVAL
+#define MONGOOSE_USE_WEBSOCKET_PING_INTERVAL 5
+#endif
+
+// Extra HTTP headers to send in every static file reply
+#if !defined(MONGOOSE_USE_EXTRA_HTTP_HEADERS)
+#define MONGOOSE_USE_EXTRA_HTTP_HEADERS ""
+#endif
+
+#ifndef MONGOOSE_POST_SIZE_LIMIT
+#define MONGOOSE_POST_SIZE_LIMIT 0
+#endif
+
+#ifndef MONGOOSE_IDLE_TIMEOUT_SECONDS
+#define MONGOOSE_IDLE_TIMEOUT_SECONDS 300
+#endif
+
+#if defined(NS_DISABLE_SOCKETPAIR) && !defined(MONGOOSE_NO_CGI)
+#define MONGOOSE_NO_CGI
+#endif
+
+#ifdef MONGOOSE_NO_FILESYSTEM
+#define MONGOOSE_NO_AUTH
+#if !defined(MONGOOSE_NO_CGI)
+#define MONGOOSE_NO_CGI
+#endif
+#define MONGOOSE_NO_DAV
+#define MONGOOSE_NO_DIRECTORY_LISTING
+#define MONGOOSE_NO_LOGGING
+#define MONGOOSE_NO_SSI
+#define MONGOOSE_NO_DL
+#endif
+
+struct vec {
+  const char *ptr;
+  int len;
+};
+
+// For directory listing and WevDAV support
+struct dir_entry {
+  struct connection *conn;
+  char *file_name;
+  file_stat_t st;
+};
+
+// NOTE(lsm): this enum shoulds be in sync with the config_options.
+enum {
+  ACCESS_CONTROL_LIST,
+#ifndef MONGOOSE_NO_FILESYSTEM
+  ACCESS_LOG_FILE,
+#ifndef MONGOOSE_NO_AUTH
+  AUTH_DOMAIN,
+#endif
+#ifndef MONGOOSE_NO_CGI
+  CGI_INTERPRETER,
+  CGI_PATTERN,
+#endif
+  DAV_AUTH_FILE,
+  DOCUMENT_ROOT,
+#ifndef MONGOOSE_NO_DIRECTORY_LISTING
+  ENABLE_DIRECTORY_LISTING,
+#endif
+#endif
+  ENABLE_PROXY,
+  EXTRA_MIME_TYPES,
+#if !defined(MONGOOSE_NO_FILESYSTEM) && !defined(MONGOOSE_NO_AUTH)
+  GLOBAL_AUTH_FILE,
+#endif
+#ifndef MONGOOSE_NO_FILESYSTEM
+  HIDE_FILES_PATTERN,
+  HEXDUMP_FILE,
+  INDEX_FILES,
+#endif
+  LISTENING_PORT,
+#ifndef _WIN32
+  RUN_AS_USER,
+#endif
+#ifndef MONGOOSE_NO_SSI
+  SSI_PATTERN,
+#endif
+  URL_REWRITES,
+  NUM_OPTIONS
+};
+
+static const char *static_config_options[] = {
+  "access_control_list", NULL,
+#ifndef MONGOOSE_NO_FILESYSTEM
+  "access_log_file", NULL,
+#ifndef MONGOOSE_NO_AUTH
+  "auth_domain", "mydomain.com",
+#endif
+#ifndef MONGOOSE_NO_CGI
+  "cgi_interpreter", NULL,
+  "cgi_pattern", DEFAULT_CGI_PATTERN,
+#endif
+  "dav_auth_file", NULL,
+  "document_root",  NULL,
+#ifndef MONGOOSE_NO_DIRECTORY_LISTING
+  "enable_directory_listing", "yes",
+#endif
+#endif
+  "enable_proxy", NULL,
+  "extra_mime_types", NULL,
+#if !defined(MONGOOSE_NO_FILESYSTEM) && !defined(MONGOOSE_NO_AUTH)
+  "global_auth_file", NULL,
+#endif
+#ifndef MONGOOSE_NO_FILESYSTEM
+  "hide_files_patterns", NULL,
+  "hexdump_file", NULL,
+  "index_files","index.html,index.htm,index.shtml,index.cgi,index.php",
+#endif
+  "listening_port", NULL,
+#ifndef _WIN32
+  "run_as_user", NULL,
+#endif
+#ifndef MONGOOSE_NO_SSI
+  "ssi_pattern", "**.shtml$|**.shtm$",
+#endif
+  "url_rewrites", NULL,
+  NULL
+};
+
+struct mg_server {
+  struct ns_mgr ns_mgr;
+  union socket_address lsa;   // Listening socket address
+  mg_handler_t event_handler;
+  char *config_options[NUM_OPTIONS];
+};
+
+// Local endpoint representation
+union endpoint {
+  int fd;                     // Opened regular local file
+  struct ns_connection *nc;   // CGI or proxy->target connection
+};
+
+enum endpoint_type {
+ EP_NONE, EP_FILE, EP_CGI, EP_USER, EP_PUT, EP_CLIENT, EP_PROXY
+};
+
+#define MG_HEADERS_SENT NSF_USER_1
+#define MG_LONG_RUNNING NSF_USER_2
+#define MG_CGI_CONN NSF_USER_3
+#define MG_PROXY_CONN NSF_USER_4
+#define MG_PROXY_DONT_PARSE NSF_USER_5
+
+struct connection {
+  struct ns_connection *ns_conn;  // NOTE(lsm): main.c depends on this order
+  struct mg_connection mg_conn;
+  struct mg_server *server;
+  union endpoint endpoint;
+  enum endpoint_type endpoint_type;
+  char *path_info;
+  char *request;
+  int64_t num_bytes_recv; // Total number of bytes received
+  int64_t cl;             // Reply content length, for Range support
+  int request_len;  // Request length, including last \r\n after last header
+};
+
+#define MG_CONN_2_CONN(c) ((struct connection *) ((char *) (c) - \
+  offsetof(struct connection, mg_conn)))
+
+static void open_local_endpoint(struct connection *conn, int skip_user);
+static void close_local_endpoint(struct connection *conn);
+static void mg_ev_handler(struct ns_connection *nc, int ev, void *p);
+
+static const struct {
+  const char *extension;
+  size_t ext_len;
+  const char *mime_type;
+} static_builtin_mime_types[] = {
+  {".html", 5, "text/html"},
+  {".htm", 4, "text/html"},
+  {".shtm", 5, "text/html"},
+  {".shtml", 6, "text/html"},
+  {".css", 4, "text/css"},
+  {".js",  3, "application/javascript"},
+  {".ico", 4, "image/x-icon"},
+  {".gif", 4, "image/gif"},
+  {".jpg", 4, "image/jpeg"},
+  {".jpeg", 5, "image/jpeg"},
+  {".png", 4, "image/png"},
+  {".svg", 4, "image/svg+xml"},
+  {".txt", 4, "text/plain"},
+  {".torrent", 8, "application/x-bittorrent"},
+  {".wav", 4, "audio/x-wav"},
+  {".mp3", 4, "audio/x-mp3"},
+  {".mid", 4, "audio/mid"},
+  {".m3u", 4, "audio/x-mpegurl"},
+  {".ogg", 4, "application/ogg"},
+  {".ram", 4, "audio/x-pn-realaudio"},
+  {".xml", 4, "text/xml"},
+  {".json",  5, "application/json"},
+  {".xslt", 5, "application/xml"},
+  {".xsl", 4, "application/xml"},
+  {".ra",  3, "audio/x-pn-realaudio"},
+  {".doc", 4, "application/msword"},
+  {".exe", 4, "application/octet-stream"},
+  {".zip", 4, "application/x-zip-compressed"},
+  {".xls", 4, "application/excel"},
+  {".tgz", 4, "application/x-tar-gz"},
+  {".tar", 4, "application/x-tar"},
+  {".gz",  3, "application/x-gunzip"},
+  {".arj", 4, "application/x-arj-compressed"},
+  {".rar", 4, "application/x-rar-compressed"},
+  {".rtf", 4, "application/rtf"},
+  {".pdf", 4, "application/pdf"},
+  {".swf", 4, "application/x-shockwave-flash"},
+  {".mpg", 4, "video/mpeg"},
+  {".webm", 5, "video/webm"},
+  {".mpeg", 5, "video/mpeg"},
+  {".mov", 4, "video/quicktime"},
+  {".mp4", 4, "video/mp4"},
+  {".m4v", 4, "video/x-m4v"},
+  {".asf", 4, "video/x-ms-asf"},
+  {".avi", 4, "video/x-msvideo"},
+  {".bmp", 4, "image/bmp"},
+  {".ttf", 4, "application/x-font-ttf"},
+  {NULL,  0, NULL}
+};
+
+#ifndef MONGOOSE_NO_THREADS
+void *mg_start_thread(void *(*f)(void *), void *p) {
+  return ns_start_thread(f, p);
+}
+#endif  // MONGOOSE_NO_THREADS
+
+#ifndef MONGOOSE_NO_MMAP
+#ifdef _WIN32
+static void *mmap(void *addr, int64_t len, int prot, int flags, int fd,
+                  int offset) {
+  HANDLE fh = (HANDLE) _get_osfhandle(fd);
+  HANDLE mh = CreateFileMapping(fh, 0, PAGE_READONLY, 0, 0, 0);
+  void *p = MapViewOfFile(mh, FILE_MAP_READ, 0, 0, (size_t) len);
+  CloseHandle(mh);
+  return p;
+}
+#define munmap(x, y)  UnmapViewOfFile(x)
+#define MAP_FAILED NULL
+#define MAP_PRIVATE 0
+#define PROT_READ 0
+#else
+#include <sys/mman.h>
+#endif
+
+void *mg_mmap(FILE *fp, size_t size) {
+  void *p = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fileno(fp), 0);
+  return p == MAP_FAILED ? NULL : p;
+}
+
+void mg_munmap(void *p, size_t size) {
+  munmap(p, size);
+}
+#endif  // MONGOOSE_NO_MMAP
+
+#if defined(_WIN32) && !defined(MONGOOSE_NO_FILESYSTEM)
+// Encode 'path' which is assumed UTF-8 string, into UNICODE string.
+// wbuf and wbuf_len is a target buffer and its length.
+static void to_wchar(const char *path, wchar_t *wbuf, size_t wbuf_len) {
+  char buf[MAX_PATH_SIZE * 2], buf2[MAX_PATH_SIZE * 2], *p;
+
+  strncpy(buf, path, sizeof(buf));
+  buf[sizeof(buf) - 1] = '\0';
+
+  // Trim trailing slashes. Leave backslash for paths like "X:\"
+  p = buf + strlen(buf) - 1;
+  while (p > buf && p[-1] != ':' && (p[0] == '\\' || p[0] == '/')) *p-- = '\0';
+
+  // Convert to Unicode and back. If doubly-converted string does not
+  // match the original, something is fishy, reject.
+  memset(wbuf, 0, wbuf_len * sizeof(wchar_t));
+  MultiByteToWideChar(CP_UTF8, 0, buf, -1, wbuf, (int) wbuf_len);
+  WideCharToMultiByte(CP_UTF8, 0, wbuf, (int) wbuf_len, buf2, sizeof(buf2),
+                      NULL, NULL);
+  if (strcmp(buf, buf2) != 0) {
+    wbuf[0] = L'\0';
+  }
+}
+
+static int mg_stat(const char *path, file_stat_t *st) {
+  wchar_t wpath[MAX_PATH_SIZE];
+  to_wchar(path, wpath, ARRAY_SIZE(wpath));
+  DBG(("[%ls] -> %d", wpath, _wstati64(wpath, st)));
+  return _wstati64(wpath, st);
+}
+
+static FILE *mg_fopen(const char *path, const char *mode) {
+  wchar_t wpath[MAX_PATH_SIZE], wmode[10];
+  to_wchar(path, wpath, ARRAY_SIZE(wpath));
+  to_wchar(mode, wmode, ARRAY_SIZE(wmode));
+  return _wfopen(wpath, wmode);
+}
+
+static int mg_open(const char *path, int flag, int mode) {
+  wchar_t wpath[MAX_PATH_SIZE];
+  to_wchar(path, wpath, ARRAY_SIZE(wpath));
+  return _wopen(wpath, flag, mode);
+}
+#endif // _WIN32 && !MONGOOSE_NO_FILESYSTEM
+
+// A helper function for traversing a comma separated list of values.
+// It returns a list pointer shifted to the next value, or NULL if the end
+// of the list found.
+// Value is stored in val vector. If value has form "x=y", then eq_val
+// vector is initialized to point to the "y" part, and val vector length
+// is adjusted to point only to "x".
+static const char *next_option(const char *list, struct vec *val,
+                               struct vec *eq_val) {
+  if (list == NULL || *list == '\0') {
+    // End of the list
+    list = NULL;
+  } else {
+    val->ptr = list;
+    if ((list = strchr(val->ptr, ',')) != NULL) {
+      // Comma found. Store length and shift the list ptr
+      val->len = list - val->ptr;
+      list++;
+    } else {
+      // This value is the last one
+      list = val->ptr + strlen(val->ptr);
+      val->len = list - val->ptr;
+    }
+
+    if (eq_val != NULL) {
+      // Value has form "x=y", adjust pointers and lengths
+      // so that val points to "x", and eq_val points to "y".
+      eq_val->len = 0;
+      eq_val->ptr = (const char *) memchr(val->ptr, '=', val->len);
+      if (eq_val->ptr != NULL) {
+        eq_val->ptr++;  // Skip over '=' character
+        eq_val->len = val->ptr + val->len - eq_val->ptr;
+        val->len = (eq_val->ptr - val->ptr) - 1;
+      }
+    }
+  }
+
+  return list;
+}
+
+// Like snprintf(), but never returns negative value, or a value
+// that is larger than a supplied buffer.
+static int mg_vsnprintf(char *buf, size_t buflen, const char *fmt, va_list ap) {
+  int n;
+  if (buflen < 1) return 0;
+  n = vsnprintf(buf, buflen, fmt, ap);
+  if (n < 0) {
+    n = 0;
+  } else if (n >= (int) buflen) {
+    n = (int) buflen - 1;
+  }
+  buf[n] = '\0';
+  return n;
+}
+
+static int mg_snprintf(char *buf, size_t buflen, const char *fmt, ...) {
+  va_list ap;
+  int n;
+  va_start(ap, fmt);
+  n = mg_vsnprintf(buf, buflen, fmt, ap);
+  va_end(ap);
+  return n;
+}
+
+// Check whether full request is buffered. Return:
+//   -1  if request is malformed
+//    0  if request is not yet fully buffered
+//   >0  actual request length, including last \r\n\r\n
+static int get_request_len(const char *s, int buf_len) {
+  const unsigned char *buf = (unsigned char *) s;
+  int i;
+
+  for (i = 0; i < buf_len; i++) {
+    // Control characters are not allowed but >=128 are.
+    // Abort scan as soon as one malformed character is found.
+    if (!isprint(buf[i]) && buf[i] != '\r' && buf[i] != '\n' && buf[i] < 128) {
+      return -1;
+    } else if (buf[i] == '\n' && i + 1 < buf_len && buf[i + 1] == '\n') {
+      return i + 2;
+    } else if (buf[i] == '\n' && i + 2 < buf_len && buf[i + 1] == '\r' &&
+               buf[i + 2] == '\n') {
+      return i + 3;
+    }
+  }
+
+  return 0;
+}
+
+// Skip the characters until one of the delimiters characters found.
+// 0-terminate resulting word. Skip the rest of the delimiters if any.
+// Advance pointer to buffer to the next word. Return found 0-terminated word.
+static char *skip(char **buf, const char *delimiters) {
+  char *p, *begin_word, *end_word, *end_delimiters;
+
+  begin_word = *buf;
+  end_word = begin_word + strcspn(begin_word, delimiters);
+  end_delimiters = end_word + strspn(end_word, delimiters);
+
+  for (p = end_word; p < end_delimiters; p++) {
+    *p = '\0';
+  }
+
+  *buf = end_delimiters;
+
+  return begin_word;
+}
+
+// Parse HTTP headers from the given buffer, advance buffer to the point
+// where parsing stopped.
+static void parse_http_headers(char **buf, struct mg_connection *ri) {
+  size_t i;
+
+  for (i = 0; i < ARRAY_SIZE(ri->http_headers); i++) {
+    ri->http_headers[i].name = skip(buf, ": ");
+    ri->http_headers[i].value = skip(buf, "\r\n");
+    if (ri->http_headers[i].name[0] == '\0')
+      break;
+    ri->num_headers = i + 1;
+  }
+}
+
+static const char *status_code_to_str(int status_code) {
+  switch (status_code) {
+
+    case 100: return "Continue";
+    case 101: return "Switching Protocols";
+    case 102: return "Processing";
+
+    case 200: return "OK";
+    case 201: return "Created";
+    case 202: return "Accepted";
+    case 203: return "Non-Authoritative Information";
+    case 204: return "No Content";
+    case 205: return "Reset Content";
+    case 206: return "Partial Content";
+    case 207: return "Multi-Status";
+    case 208: return "Already Reported";
+    case 226: return "IM Used";
+
+    case 300: return "Multiple Choices";
+    case 301: return "Moved Permanently";
+    case 302: return "Found";
+    case 303: return "See Other";
+    case 304: return "Not Modified";
+    case 305: return "Use Proxy";
+    case 306: return "Switch Proxy";
+    case 307: return "Temporary Redirect";
+    case 308: return "Permanent Redirect";
+
+    case 400: return "Bad Request";
+    case 401: return "Unauthorized";
+    case 402: return "Payment Required";
+    case 403: return "Forbidden";
+    case 404: return "Not Found";
+    case 405: return "Method Not Allowed";
+    case 406: return "Not Acceptable";
+    case 407: return "Proxy Authentication Required";
+    case 408: return "Request Timeout";
+    case 409: return "Conflict";
+    case 410: return "Gone";
+    case 411: return "Length Required";
+    case 412: return "Precondition Failed";
+    case 413: return "Payload Too Large";
+    case 414: return "URI Too Long";
+    case 415: return "Unsupported Media Type";
+    case 416: return "Requested Range Not Satisfiable";
+    case 417: return "Expectation Failed";
+    case 418: return "I\'m a teapot";
+    case 422: return "Unprocessable Entity";
+    case 423: return "Locked";
+    case 424: return "Failed Dependency";
+    case 426: return "Upgrade Required";
+    case 428: return "Precondition Required";
+    case 429: return "Too Many Requests";
+    case 431: return "Request Header Fields Too Large";
+    case 451: return "Unavailable For Legal Reasons";
+
+    case 500: return "Internal Server Error";
+    case 501: return "Not Implemented";
+    case 502: return "Bad Gateway";
+    case 503: return "Service Unavailable";
+    case 504: return "Gateway Timeout";
+    case 505: return "HTTP Version Not Supported";
+    case 506: return "Variant Also Negotiates";
+    case 507: return "Insufficient Storage";
+    case 508: return "Loop Detected";
+    case 510: return "Not Extended";
+    case 511: return "Network Authentication Required";
+
+    default:  return "Server Error";
+  }
+}
+
+static int call_user(struct connection *conn, enum mg_event ev) {
+  return conn != NULL && conn->server != NULL &&
+    conn->server->event_handler != NULL ?
+    conn->server->event_handler(&conn->mg_conn, ev) : MG_FALSE;
+}
+
+static void send_http_error(struct connection *conn, int code,
+                            const char *fmt, ...) {
+  const char *message = status_code_to_str(code);
+  const char *rewrites = conn->server->config_options[URL_REWRITES];
+  char headers[200], body[200];
+  struct vec a, b;
+  va_list ap;
+  int body_len, headers_len, match_code;
+
+  conn->mg_conn.status_code = code;
+
+  // Invoke error handler if it is set
+  if (call_user(conn, MG_HTTP_ERROR) == MG_TRUE) {
+    close_local_endpoint(conn);
+    return;
+  }
+
+  // Handle error code rewrites
+  while ((rewrites = next_option(rewrites, &a, &b)) != NULL) {
+    if ((match_code = atoi(a.ptr)) > 0 && match_code == code) {
+      struct mg_connection *c = &conn->mg_conn;
+      c->status_code = 302;
+      mg_printf(c, "HTTP/1.1 %d Moved\r\n"
+                "Location: %.*s?code=%d&orig_uri=%s&query_string=%s\r\n\r\n",
+                c->status_code, b.len, b.ptr, code, c->uri,
+                c->query_string == NULL ? "" : c->query_string);
+      close_local_endpoint(conn);
+      return;
+    }
+  }
+
+  body_len = mg_snprintf(body, sizeof(body), "%d %s\n", code, message);
+  if (fmt != NULL) {
+    va_start(ap, fmt);
+    body_len += mg_vsnprintf(body + body_len, sizeof(body) - body_len, fmt, ap);
+    va_end(ap);
+  }
+  if ((code >= 300 && code <= 399) || code == 204) {
+    // 3xx errors do not have body
+    body_len = 0;
+  }
+  headers_len = mg_snprintf(headers, sizeof(headers),
+                            "HTTP/1.1 %d %s\r\nContent-Length: %d\r\n"
+                            "Content-Type: text/plain\r\n\r\n",
+                            code, message, body_len);
+  ns_send(conn->ns_conn, headers, headers_len);
+  ns_send(conn->ns_conn, body, body_len);
+  close_local_endpoint(conn);  // This will write to the log file
+}
+
+static void write_chunk(struct connection *conn, const char *buf, int len) {
+  char chunk_size[50];
+  int n = mg_snprintf(chunk_size, sizeof(chunk_size), "%X\r\n", len);
+  ns_send(conn->ns_conn, chunk_size, n);
+  ns_send(conn->ns_conn, buf, len);
+  ns_send(conn->ns_conn, "\r\n", 2);
+}
+
+size_t mg_printf(struct mg_connection *conn, const char *fmt, ...) {
+  struct connection *c = MG_CONN_2_CONN(conn);
+  va_list ap;
+
+  va_start(ap, fmt);
+  ns_vprintf(c->ns_conn, fmt, ap);
+  va_end(ap);
+
+  return c->ns_conn->send_iobuf.len;
+}
+
+static void ns_forward(struct ns_connection *from, struct ns_connection *to) {
+  DBG(("%p -> %p %lu bytes", from, to, (unsigned long)from->recv_iobuf.len));
+  ns_send(to, from->recv_iobuf.buf, from->recv_iobuf.len);
+  iobuf_remove(&from->recv_iobuf, from->recv_iobuf.len);
+}
+
+#ifndef MONGOOSE_NO_CGI
+#ifdef _WIN32
+struct threadparam {
+  sock_t s;
+  HANDLE hPipe;
+};
+
+static int wait_until_ready(sock_t sock, int for_read) {
+  fd_set set;
+  FD_ZERO(&set);
+  FD_SET(sock, &set);
+  select(sock + 1, for_read ? &set : 0, for_read ? 0 : &set, 0, 0);
+  return 1;
+}
+
+static void *push_to_stdin(void *arg) {
+  struct threadparam *tp = (struct threadparam *)arg;
+  int n, sent, stop = 0;
+  DWORD k;
+  char buf[IOBUF_SIZE];
+
+  while (!stop && wait_until_ready(tp->s, 1) &&
+         (n = recv(tp->s, buf, sizeof(buf), 0)) > 0) {
+    if (n == -1 && GetLastError() == WSAEWOULDBLOCK) continue;
+    for (sent = 0; !stop && sent < n; sent += k) {
+      if (!WriteFile(tp->hPipe, buf + sent, n - sent, &k, 0)) stop = 1;
+    }
+  }
+  DBG(("%s", "FORWARED EVERYTHING TO CGI"));
+  CloseHandle(tp->hPipe);
+  NS_FREE(tp);
+  _endthread();
+  return NULL;
+}
+
+static void *pull_from_stdout(void *arg) {
+  struct threadparam *tp = (struct threadparam *)arg;
+  int k = 0, stop = 0;
+  DWORD n, sent;
+  char buf[IOBUF_SIZE];
+
+  while (!stop && ReadFile(tp->hPipe, buf, sizeof(buf), &n, NULL)) {
+    for (sent = 0; !stop && sent < n; sent += k) {
+      if (wait_until_ready(tp->s, 0) &&
+          (k = send(tp->s, buf + sent, n - sent, 0)) <= 0) stop = 1;
+    }
+  }
+  DBG(("%s", "EOF FROM CGI"));
+  CloseHandle(tp->hPipe);
+  shutdown(tp->s, 2);  // Without this, IO thread may get truncated data
+  closesocket(tp->s);
+  NS_FREE(tp);
+  _endthread();
+  return NULL;
+}
+
+static void spawn_stdio_thread(sock_t sock, HANDLE hPipe,
+                               void *(*func)(void *)) {
+  struct threadparam *tp = (struct threadparam *)NS_MALLOC(sizeof(*tp));
+  if (tp != NULL) {
+    tp->s = sock;
+    tp->hPipe = hPipe;
+    mg_start_thread(func, tp);
+  }
+}
+
+static void abs_path(const char *utf8_path, char *abs_path, size_t len) {
+  wchar_t buf[MAX_PATH_SIZE], buf2[MAX_PATH_SIZE];
+  to_wchar(utf8_path, buf, ARRAY_SIZE(buf));
+  GetFullPathNameW(buf, ARRAY_SIZE(buf2), buf2, NULL);
+  WideCharToMultiByte(CP_UTF8, 0, buf2, wcslen(buf2) + 1, abs_path, len, 0, 0);
+}
+
+static process_id_t start_process(char *interp, const char *cmd,
+                                  const char *env, const char *envp[],
+                                  const char *dir, sock_t sock) {
+  STARTUPINFOW si;
+  PROCESS_INFORMATION pi;
+  HANDLE a[2], b[2], me = GetCurrentProcess();
+  wchar_t wcmd[MAX_PATH_SIZE], full_dir[MAX_PATH_SIZE];
+  char buf[MAX_PATH_SIZE], buf4[MAX_PATH_SIZE], buf5[MAX_PATH_SIZE],
+       cmdline[MAX_PATH_SIZE], *p;
+  DWORD flags = DUPLICATE_CLOSE_SOURCE | DUPLICATE_SAME_ACCESS;
+  FILE *fp;
+
+  memset(&si, 0, sizeof(si));
+  memset(&pi, 0, sizeof(pi));
+
+  si.cb = sizeof(si);
+  si.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW;
+  si.wShowWindow = SW_HIDE;
+  si.hStdError = GetStdHandle(STD_ERROR_HANDLE);
+
+  CreatePipe(&a[0], &a[1], NULL, 0);
+  CreatePipe(&b[0], &b[1], NULL, 0);
+  DuplicateHandle(me, a[0], me, &si.hStdInput, 0, TRUE, flags);
+  DuplicateHandle(me, b[1], me, &si.hStdOutput, 0, TRUE, flags);
+
+  if (interp == NULL && (fp = fopen(cmd, "r")) != NULL) {
+    buf[0] = buf[1] = '\0';
+    fgets(buf, sizeof(buf), fp);
+    buf[sizeof(buf) - 1] = '\0';
+    if (buf[0] == '#' && buf[1] == '!') {
+      interp = buf + 2;
+      for (p = interp + strlen(interp) - 1;
+           isspace(* (uint8_t *) p) && p > interp; p--) *p = '\0';
+    }
+    fclose(fp);
+  }
+
+  if (interp != NULL) {
+    abs_path(interp, buf4, ARRAY_SIZE(buf4));
+    interp = buf4;
+  }
+  abs_path(dir, buf5, ARRAY_SIZE(buf5));
+  to_wchar(dir, full_dir, ARRAY_SIZE(full_dir));
+  mg_snprintf(cmdline, sizeof(cmdline), "%s%s\"%s\"",
+              interp ? interp : "", interp ? " " : "", cmd);
+  to_wchar(cmdline, wcmd, ARRAY_SIZE(wcmd));
+
+  if (CreateProcessW(NULL, wcmd, NULL, NULL, TRUE, CREATE_NEW_PROCESS_GROUP,
+                     (void *) env, full_dir, &si, &pi) != 0) {
+    spawn_stdio_thread(sock, a[1], push_to_stdin);
+    spawn_stdio_thread(sock, b[0], pull_from_stdout);
+  } else {
+    CloseHandle(a[1]);
+    CloseHandle(b[0]);
+    closesocket(sock);
+  }
+  DBG(("CGI command: [%ls] -> %p", wcmd, pi.hProcess));
+
+  // Not closing a[0] and b[1] because we've used DUPLICATE_CLOSE_SOURCE
+  CloseHandle(si.hStdOutput);
+  CloseHandle(si.hStdInput);
+  //CloseHandle(pi.hThread);
+  //CloseHandle(pi.hProcess);
+
+  return pi.hProcess;
+}
+#else
+static process_id_t start_process(const char *interp, const char *cmd,
+                                  const char *env, const char *envp[],
+                                  const char *dir, sock_t sock) {
+  char buf[500];
+  process_id_t pid = fork();
+  (void) env;
+
+  if (pid == 0) {
+    (void) chdir(dir);
+    (void) dup2(sock, 0);
+    (void) dup2(sock, 1);
+    closesocket(sock);
+
+    // After exec, all signal handlers are restored to their default values,
+    // with one exception of SIGCHLD. According to POSIX.1-2001 and Linux's
+    // implementation, SIGCHLD's handler will leave unchanged after exec
+    // if it was set to be ignored. Restore it to default action.
+    signal(SIGCHLD, SIG_DFL);
+
+    if (interp == NULL) {
+      execle(cmd, cmd, (char *) 0, envp); // Using (char *) 0 to avoid warning
+    } else {
+      execle(interp, interp, cmd, (char *) 0, envp);
+    }
+    snprintf(buf, sizeof(buf), "Status: 500\r\n\r\n"
+             "500 Server Error: %s%s%s: %s", interp == NULL ? "" : interp,
+             interp == NULL ? "" : " ", cmd, strerror(errno));
+    send(1, buf, strlen(buf), 0);
+    exit(EXIT_FAILURE);  // exec call failed
+  }
+
+  return pid;
+}
+#endif  // _WIN32
+
+// This structure helps to create an environment for the spawned CGI program.
+// Environment is an array of "VARIABLE=VALUE\0" ASCIIZ strings,
+// last element must be NULL.
+// However, on Windows there is a requirement that all these VARIABLE=VALUE\0
+// strings must reside in a contiguous buffer. The end of the buffer is
+// marked by two '\0' characters.
+// We satisfy both worlds: we create an envp array (which is vars), all
+// entries are actually pointers inside buf.
+struct cgi_env_block {
+  struct mg_connection *conn;
+  char buf[CGI_ENVIRONMENT_SIZE];       // Environment buffer
+  const char *vars[MAX_CGI_ENVIR_VARS]; // char *envp[]
+  int len;                              // Space taken
+  int nvars;                            // Number of variables in envp[]
+};
+
+// Append VARIABLE=VALUE\0 string to the buffer, and add a respective
+// pointer into the vars array.
+static char *addenv(struct cgi_env_block *block, const char *fmt, ...) {
+  int n, space;
+  char *added;
+  va_list ap;
+
+  // Calculate how much space is left in the buffer
+  space = sizeof(block->buf) - block->len - 2;
+  assert(space >= 0);
+
+  // Make a pointer to the free space int the buffer
+  added = block->buf + block->len;
+
+  // Copy VARIABLE=VALUE\0 string into the free space
+  va_start(ap, fmt);
+  n = mg_vsnprintf(added, (size_t) space, fmt, ap);
+  va_end(ap);
+
+  // Make sure we do not overflow buffer and the envp array
+  if (n > 0 && n + 1 < space &&
+      block->nvars < (int) ARRAY_SIZE(block->vars) - 2) {
+    // Append a pointer to the added string into the envp array
+    block->vars[block->nvars++] = added;
+    // Bump up used length counter. Include \0 terminator
+    block->len += n + 1;
+  }
+
+  return added;
+}
+
+static void addenv2(struct cgi_env_block *blk, const char *name) {
+  const char *s;
+  if ((s = getenv(name)) != NULL) addenv(blk, "%s=%s", name, s);
+}
+
+static void prepare_cgi_environment(struct connection *conn,
+                                    const char *prog,
+                                    struct cgi_env_block *blk) {
+  struct mg_connection *ri = &conn->mg_conn;
+  const char *s, *slash;
+  char *p, **opts = conn->server->config_options;
+  int  i;
+
+  blk->len = blk->nvars = 0;
+  blk->conn = ri;
+
+  if ((s = getenv("SERVER_NAME")) != NULL) {
+    addenv(blk, "SERVER_NAME=%s", s);
+  } else {
+    addenv(blk, "SERVER_NAME=%s", ri->local_ip);
+  }
+  addenv(blk, "SERVER_ROOT=%s", opts[DOCUMENT_ROOT]);
+  addenv(blk, "DOCUMENT_ROOT=%s", opts[DOCUMENT_ROOT]);
+  addenv(blk, "SERVER_SOFTWARE=%s/%s", "Mongoose", MONGOOSE_VERSION);
+
+  // Prepare the environment block
+  addenv(blk, "%s", "GATEWAY_INTERFACE=CGI/1.1");
+  addenv(blk, "%s", "SERVER_PROTOCOL=HTTP/1.1");
+  addenv(blk, "%s", "REDIRECT_STATUS=200"); // For PHP
+
+  // TODO(lsm): fix this for IPv6 case
+  //addenv(blk, "SERVER_PORT=%d", ri->remote_port);
+
+  addenv(blk, "REQUEST_METHOD=%s", ri->request_method);
+  addenv(blk, "REMOTE_ADDR=%s", ri->remote_ip);
+  addenv(blk, "REMOTE_PORT=%d", ri->remote_port);
+  addenv(blk, "REQUEST_URI=%s%s%s", ri->uri,
+         ri->query_string == NULL ? "" : "?",
+         ri->query_string == NULL ? "" : ri->query_string);
+
+  // SCRIPT_NAME
+  if (conn->path_info != NULL) {
+    addenv(blk, "SCRIPT_NAME=%.*s",
+           (int) (strlen(ri->uri) - strlen(conn->path_info)), ri->uri);
+    addenv(blk, "PATH_INFO=%s", conn->path_info);
+  } else {
+    s = strrchr(prog, '/');
+    slash = strrchr(ri->uri, '/');
+    addenv(blk, "SCRIPT_NAME=%.*s%s",
+           slash == NULL ? 0 : (int) (slash - ri->uri), ri->uri,
+           s == NULL ? prog : s);
+  }
+
+  addenv(blk, "SCRIPT_FILENAME=%s", prog);
+  addenv(blk, "PATH_TRANSLATED=%s", prog);
+  addenv(blk, "HTTPS=%s", conn->ns_conn->ssl != NULL ? "on" : "off");
+
+  if ((s = mg_get_header(ri, "Content-Type")) != NULL)
+    addenv(blk, "CONTENT_TYPE=%s", s);
+
+  if (ri->query_string != NULL)
+    addenv(blk, "QUERY_STRING=%s", ri->query_string);
+
+  if ((s = mg_get_header(ri, "Content-Length")) != NULL)
+    addenv(blk, "CONTENT_LENGTH=%s", s);
+
+  addenv2(blk, "PATH");
+  addenv2(blk, "TMP");
+  addenv2(blk, "TEMP");
+  addenv2(blk, "TMPDIR");
+  addenv2(blk, "PERLLIB");
+  addenv2(blk, ENV_EXPORT_TO_CGI);
+
+#if defined(_WIN32)
+  addenv2(blk, "COMSPEC");
+  addenv2(blk, "SYSTEMROOT");
+  addenv2(blk, "SystemDrive");
+  addenv2(blk, "ProgramFiles");
+  addenv2(blk, "ProgramFiles(x86)");
+  addenv2(blk, "CommonProgramFiles(x86)");
+#else
+  addenv2(blk, "LD_LIBRARY_PATH");
+#endif // _WIN32
+
+  // Add all headers as HTTP_* variables
+  for (i = 0; i < ri->num_headers; i++) {
+    p = addenv(blk, "HTTP_%s=%s",
+        ri->http_headers[i].name, ri->http_headers[i].value);
+
+    // Convert variable name into uppercase, and change - to _
+    for (; *p != '=' && *p != '\0'; p++) {
+      if (*p == '-')
+        *p = '_';
+      *p = (char) toupper(* (unsigned char *) p);
+    }
+  }
+
+  blk->vars[blk->nvars++] = NULL;
+  blk->buf[blk->len++] = '\0';
+
+  assert(blk->nvars < (int) ARRAY_SIZE(blk->vars));
+  assert(blk->len > 0);
+  assert(blk->len < (int) sizeof(blk->buf));
+}
+
+static const char cgi_status[] = "HTTP/1.1 200 OK\r\n";
+
+static void open_cgi_endpoint(struct connection *conn, const char *prog) {
+  struct cgi_env_block blk;
+  char dir[MAX_PATH_SIZE];
+  const char *p;
+  sock_t fds[2];
+
+  prepare_cgi_environment(conn, prog, &blk);
+  // CGI must be executed in its own directory. 'dir' must point to the
+  // directory containing executable program, 'p' must point to the
+  // executable program name relative to 'dir'.
+  if ((p = strrchr(prog, '/')) == NULL) {
+    mg_snprintf(dir, sizeof(dir), "%s", ".");
+  } else {
+    mg_snprintf(dir, sizeof(dir), "%.*s", (int) (p - prog), prog);
+  }
+
+  // Try to create socketpair in a loop until success. ns_socketpair()
+  // can be interrupted by a signal and fail.
+  // TODO(lsm): use sigaction to restart interrupted syscall
+  do {
+    ns_socketpair(fds);
+  } while (fds[0] == INVALID_SOCKET);
+
+  if (start_process(conn->server->config_options[CGI_INTERPRETER],
+                    prog, blk.buf, blk.vars, dir, fds[1]) != 0) {
+    conn->endpoint_type = EP_CGI;
+    conn->endpoint.nc = ns_add_sock(&conn->server->ns_mgr, fds[0],
+                                    mg_ev_handler, conn);
+    conn->endpoint.nc->flags |= MG_CGI_CONN;
+    ns_send(conn->ns_conn, cgi_status, sizeof(cgi_status) - 1);
+    conn->mg_conn.status_code = 200;
+    conn->ns_conn->flags |= NSF_BUFFER_BUT_DONT_SEND;
+    // Pass POST data to the CGI process
+    conn->endpoint.nc->send_iobuf = conn->ns_conn->recv_iobuf;
+    iobuf_init(&conn->ns_conn->recv_iobuf, 0);
+  } else {
+    closesocket(fds[0]);
+    send_http_error(conn, 500, "start_process(%s) failed", prog);
+  }
+
+#ifndef _WIN32
+  closesocket(fds[1]);  // On Windows, CGI stdio thread closes that socket
+#endif
+}
+
+static void on_cgi_data(struct ns_connection *nc) {
+  struct connection *conn = (struct connection *) nc->user_data;
+  const char *status = "500";
+  struct mg_connection c;
+
+  if (!conn) return;
+
+  // Copy CGI data from CGI socket to the client send buffer
+  ns_forward(nc, conn->ns_conn);
+
+  // If reply has not been parsed yet, parse it
+  if (conn->ns_conn->flags & NSF_BUFFER_BUT_DONT_SEND) {
+    struct iobuf *io = &conn->ns_conn->send_iobuf;
+    int s_len = sizeof(cgi_status) - 1;
+    int len = get_request_len(io->buf + s_len, io->len - s_len);
+    char buf[MAX_REQUEST_SIZE], *s = buf;
+
+    if (len == 0) return;
+
+    if (len < 0 || len > (int) sizeof(buf)) {
+      len = io->len;
+      iobuf_remove(io, io->len);
+      send_http_error(conn, 500, "CGI program sent malformed headers: [%.*s]",
+        len, io->buf);
+    } else {
+      memset(&c, 0, sizeof(c));
+      memcpy(buf, io->buf + s_len, len);
+      buf[len - 1] = '\0';
+      parse_http_headers(&s, &c);
+      if (mg_get_header(&c, "Location") != NULL) {
+        status = "302";
+      } else if ((status = (char *) mg_get_header(&c, "Status")) == NULL) {
+        status = "200";
+      }
+      memcpy(io->buf + 9, status, 3);
+      conn->mg_conn.status_code = atoi(status);
+    }
+    conn->ns_conn->flags &= ~NSF_BUFFER_BUT_DONT_SEND;
+  }
+}
+#endif  // !MONGOOSE_NO_CGI
+
+static char *mg_strdup(const char *str) {
+  char *copy = (char *) NS_MALLOC(strlen(str) + 1);
+  if (copy != NULL) {
+    strcpy(copy, str);
+  }
+  return copy;
+}
+
+static int isbyte(int n) {
+  return n >= 0 && n <= 255;
+}
+
+static int parse_net(const char *spec, uint32_t *net, uint32_t *mask) {
+  int n, a, b, c, d, slash = 32, len = 0;
+
+  if ((sscanf(spec, "%d.%d.%d.%d/%d%n", &a, &b, &c, &d, &slash, &n) == 5 ||
+      sscanf(spec, "%d.%d.%d.%d%n", &a, &b, &c, &d, &n) == 4) &&
+      isbyte(a) && isbyte(b) && isbyte(c) && isbyte(d) &&
+      slash >= 0 && slash < 33) {
+    len = n;
+    *net = ((uint32_t)a << 24) | ((uint32_t)b << 16) | ((uint32_t)c << 8) | d;
+    *mask = slash ? 0xffffffffU << (32 - slash) : 0;
+  }
+
+  return len;
+}
+
+// Verify given socket address against the ACL.
+// Return -1 if ACL is malformed, 0 if address is disallowed, 1 if allowed.
+static int check_acl(const char *acl, uint32_t remote_ip) {
+  int allowed, flag;
+  uint32_t net, mask;
+  struct vec vec;
+
+  // If any ACL is set, deny by default
+  allowed = acl == NULL ? '+' : '-';
+
+  while ((acl = next_option(acl, &vec, NULL)) != NULL) {
+    flag = vec.ptr[0];
+    if ((flag != '+' && flag != '-') ||
+        parse_net(&vec.ptr[1], &net, &mask) == 0) {
+      return -1;
+    }
+
+    if (net == (remote_ip & mask)) {
+      allowed = flag;
+    }
+  }
+
+  return allowed == '+';
+}
+
+// Protect against directory disclosure attack by removing '..',
+// excessive '/' and '\' characters
+static void remove_double_dots_and_double_slashes(char *s) {
+  char *p = s;
+
+  while (*s != '\0') {
+    *p++ = *s++;
+    if (s[-1] == '/' || s[-1] == '\\') {
+      // Skip all following slashes, backslashes and double-dots
+      while (s[0] != '\0') {
+        if (s[0] == '/' || s[0] == '\\') { s++; }
+        else if (s[0] == '.' && s[1] == '.') { s += 2; }
+        else { break; }
+      }
+    }
+  }
+  *p = '\0';
+}
+
+int mg_url_decode(const char *src, int src_len, char *dst,
+                  int dst_len, int is_form_url_encoded) {
+  int i, j, a, b;
+#define HEXTOI(x) (isdigit(x) ? x - '0' : x - 'W')
+
+  for (i = j = 0; i < src_len && j < dst_len - 1; i++, j++) {
+    if (src[i] == '%' && i < src_len - 2 &&
+        isxdigit(* (const unsigned char *) (src + i + 1)) &&
+        isxdigit(* (const unsigned char *) (src + i + 2))) {
+      a = tolower(* (const unsigned char *) (src + i + 1));
+      b = tolower(* (const unsigned char *) (src + i + 2));
+      dst[j] = (char) ((HEXTOI(a) << 4) | HEXTOI(b));
+      i += 2;
+    } else if (is_form_url_encoded && src[i] == '+') {
+      dst[j] = ' ';
+    } else {
+      dst[j] = src[i];
+    }
+  }
+
+  dst[j] = '\0'; // Null-terminate the destination
+
+  return i >= src_len ? j : -1;
+}
+
+static int is_valid_http_method(const char *s) {
+  return !strcmp(s, "GET") || !strcmp(s, "POST") || !strcmp(s, "HEAD") ||
+    !strcmp(s, "CONNECT") || !strcmp(s, "PUT") || !strcmp(s, "DELETE") ||
+    !strcmp(s, "OPTIONS") || !strcmp(s, "PROPFIND") || !strcmp(s, "MKCOL");
+}
+
+// Parse HTTP request, fill in mg_request structure.
+// This function modifies the buffer by NUL-terminating
+// HTTP request components, header names and header values.
+// Note that len must point to the last \n of HTTP headers.
+static int parse_http_message(char *buf, int len, struct mg_connection *ri) {
+  int is_request, n;
+
+  // Reset the connection. Make sure that we don't touch fields that are
+  // set elsewhere: remote_ip, remote_port, server_param
+  ri->request_method = ri->uri = ri->http_version = ri->query_string = NULL;
+  ri->num_headers = ri->status_code = ri->is_websocket = ri->content_len = 0;
+
+  buf[len - 1] = '\0';
+
+  // RFC says that all initial whitespaces should be ingored
+  while (*buf != '\0' && isspace(* (unsigned char *) buf)) {
+    buf++;
+  }
+  ri->request_method = skip(&buf, " ");
+  ri->uri = skip(&buf, " ");
+  ri->http_version = skip(&buf, "\r\n");
+
+  // HTTP message could be either HTTP request or HTTP response, e.g.
+  // "GET / HTTP/1.0 ...." or  "HTTP/1.0 200 OK ..."
+  is_request = is_valid_http_method(ri->request_method);
+  if ((is_request && memcmp(ri->http_version, "HTTP/", 5) != 0) ||
+      (!is_request && memcmp(ri->request_method, "HTTP/", 5) != 0)) {
+    len = -1;
+  } else {
+    if (is_request) {
+      ri->http_version += 5;
+    } else {
+      ri->status_code = atoi(ri->uri);
+    }
+    parse_http_headers(&buf, ri);
+
+    if ((ri->query_string = strchr(ri->uri, '?')) != NULL) {
+      *(char *) ri->query_string++ = '\0';
+    }
+    n = (int) strlen(ri->uri);
+    mg_url_decode(ri->uri, n, (char *) ri->uri, n + 1, 0);
+    if (*ri->uri == '/' || *ri->uri == '.') {
+      remove_double_dots_and_double_slashes((char *) ri->uri);
+    }
+  }
+
+  return len;
+}
+
+static int lowercase(const char *s) {
+  return tolower(* (const unsigned char *) s);
+}
+
+static int mg_strcasecmp(const char *s1, const char *s2) {
+  int diff;
+
+  do {
+    diff = lowercase(s1++) - lowercase(s2++);
+  } while (diff == 0 && s1[-1] != '\0');
+
+  return diff;
+}
+
+static int mg_strncasecmp(const char *s1, const char *s2, size_t len) {
+  int diff = 0;
+
+  if (len > 0)
+    do {
+      diff = lowercase(s1++) - lowercase(s2++);
+    } while (diff == 0 && s1[-1] != '\0' && --len > 0);
+
+  return diff;
+}
+
+// Return HTTP header value, or NULL if not found.
+const char *mg_get_header(const struct mg_connection *ri, const char *s) {
+  int i;
+
+  for (i = 0; i < ri->num_headers; i++)
+    if (!mg_strcasecmp(s, ri->http_headers[i].name))
+      return ri->http_headers[i].value;
+
+  return NULL;
+}
+
+// Perform case-insensitive match of string against pattern
+int mg_match_prefix(const char *pattern, int pattern_len, const char *str) {
+  const char *or_str;
+  int len, res, i = 0, j = 0;
+
+  if ((or_str = (const char *) memchr(pattern, '|', pattern_len)) != NULL) {
+    res = mg_match_prefix(pattern, or_str - pattern, str);
+    return res > 0 ? res : mg_match_prefix(or_str + 1,
+      (pattern + pattern_len) - (or_str + 1), str);
+  }
+
+  for (; i < pattern_len; i++, j++) {
+    if (pattern[i] == '?' && str[j] != '\0') {
+      continue;
+    } else if (pattern[i] == '$') {
+      return str[j] == '\0' ? j : -1;
+    } else if (pattern[i] == '*') {
+      i++;
+      if (pattern[i] == '*') {
+        i++;
+        len = (int) strlen(str + j);
+      } else {
+        len = (int) strcspn(str + j, "/");
+      }
+      if (i == pattern_len) {
+        return j + len;
+      }
+      do {
+        res = mg_match_prefix(pattern + i, pattern_len - i, str + j + len);
+      } while (res == -1 && len-- > 0);
+      return res == -1 ? -1 : j + res + len;
+    } else if (lowercase(&pattern[i]) != lowercase(&str[j])) {
+      return -1;
+    }
+  }
+  return j;
+}
+
+// This function prints HTML pages, and expands "{{something}}" blocks
+// inside HTML by calling appropriate callback functions.
+// Note that {{@path/to/file}} construct outputs embedded file's contents,
+// which provides SSI-like functionality.
+void mg_template(struct mg_connection *conn, const char *s,
+                 struct mg_expansion *expansions) {
+  int i, j, pos = 0, inside_marker = 0;
+
+  for (i = 0; s[i] != '\0'; i++) {
+    if (inside_marker == 0 && !memcmp(&s[i], "{{", 2)) {
+      if (i > pos) {
+        mg_send_data(conn, &s[pos], i - pos);
+      }
+      pos = i;
+      inside_marker = 1;
+    }
+    if (inside_marker == 1 && !memcmp(&s[i], "}}", 2)) {
+      for (j = 0; expansions[j].keyword != NULL; j++) {
+        const char *kw = expansions[j].keyword;
+        if ((int) strlen(kw) == i - (pos + 2) &&
+            memcmp(kw, &s[pos + 2], i - (pos + 2)) == 0) {
+          expansions[j].handler(conn);
+          pos = i + 2;
+          break;
+        }
+      }
+      inside_marker = 0;
+    }
+  }
+  if (i > pos) {
+    mg_send_data(conn, &s[pos], i - pos);
+  }
+}
+
+#ifndef MONGOOSE_NO_FILESYSTEM
+static int must_hide_file(struct connection *conn, const char *path) {
+  const char *pw_pattern = "**" PASSWORDS_FILE_NAME "$";
+  const char *pattern = conn->server->config_options[HIDE_FILES_PATTERN];
+  return mg_match_prefix(pw_pattern, strlen(pw_pattern), path) > 0 ||
+    (pattern != NULL && mg_match_prefix(pattern, strlen(pattern), path) > 0);
+}
+
+// Return 1 if real file has been found, 0 otherwise
+static int convert_uri_to_file_name(struct connection *conn, char *buf,
+                                    size_t buf_len, file_stat_t *st) {
+  struct vec a, b;
+  const char *rewrites = conn->server->config_options[URL_REWRITES];
+  const char *root = conn->server->config_options[DOCUMENT_ROOT];
+#ifndef MONGOOSE_NO_CGI
+  const char *cgi_pat = conn->server->config_options[CGI_PATTERN];
+  char *p;
+#endif
+  const char *uri = conn->mg_conn.uri;
+  const char *domain = mg_get_header(&conn->mg_conn, "Host");
+  int match_len, root_len = root == NULL ? 0 : strlen(root);
+
+  // Perform virtual hosting rewrites
+  if (rewrites != NULL && domain != NULL) {
+    const char *colon = strchr(domain, ':');
+    int domain_len = colon == NULL ? (int) strlen(domain) : colon - domain;
+
+    while ((rewrites = next_option(rewrites, &a, &b)) != NULL) {
+      if (a.len > 1 && a.ptr[0] == '@' && a.len == domain_len + 1 &&
+          mg_strncasecmp(a.ptr + 1, domain, domain_len) == 0) {
+        root = b.ptr;
+        root_len = b.len;
+        break;
+      }
+    }
+  }
+
+  // No filesystem access
+  if (root == NULL || root_len == 0) return 0;
+
+  // Handle URL rewrites
+  mg_snprintf(buf, buf_len, "%.*s%s", root_len, root, uri);
+  rewrites = conn->server->config_options[URL_REWRITES];  // Re-initialize!
+  while ((rewrites = next_option(rewrites, &a, &b)) != NULL) {
+    if ((match_len = mg_match_prefix(a.ptr, a.len, uri)) > 0) {
+      mg_snprintf(buf, buf_len, "%.*s%s", (int) b.len, b.ptr, uri + match_len);
+      break;
+    }
+  }
+
+  if (stat(buf, st) == 0) return 1;
+
+#ifndef MONGOOSE_NO_CGI
+  // Support PATH_INFO for CGI scripts.
+  for (p = buf + strlen(root) + 2; *p != '\0'; p++) {
+    if (*p == '/') {
+      *p = '\0';
+      if (mg_match_prefix(cgi_pat, strlen(cgi_pat), buf) > 0 &&
+          !stat(buf, st)) {
+      DBG(("!!!! [%s]", buf));
+        *p = '/';
+        conn->path_info = mg_strdup(p);
+        *p = '\0';
+        return 1;
+      }
+      *p = '/';
+    }
+  }
+#endif
+
+  return 0;
+}
+#endif  // MONGOOSE_NO_FILESYSTEM
+
+static int should_keep_alive(const struct mg_connection *conn) {
+  struct connection *c = MG_CONN_2_CONN(conn);
+  const char *method = conn->request_method;
+  const char *http_version = conn->http_version;
+  const char *header = mg_get_header(conn, "Connection");
+  return method != NULL &&
+    (!strcmp(method, "GET") || c->endpoint_type == EP_USER) &&
+    ((header != NULL && !mg_strcasecmp(header, "keep-alive")) ||
+     (header == NULL && http_version && !strcmp(http_version, "1.1")));
+}
+
+size_t mg_write(struct mg_connection *c, const void *buf, int len) {
+  struct connection *conn = MG_CONN_2_CONN(c);
+  ns_send(conn->ns_conn, buf, len);
+  return conn->ns_conn->send_iobuf.len;
+}
+
+void mg_send_status(struct mg_connection *c, int status) {
+  if (c->status_code == 0) {
+    c->status_code = status;
+    mg_printf(c, "HTTP/1.1 %d %s\r\n", status, status_code_to_str(status));
+  }
+}
+
+void mg_send_header(struct mg_connection *c, const char *name, const char *v) {
+  if (c->status_code == 0) {
+    c->status_code = 200;
+    mg_printf(c, "HTTP/1.1 %d %s\r\n", 200, status_code_to_str(200));
+  }
+  mg_printf(c, "%s: %s\r\n", name, v);
+}
+
+static void terminate_headers(struct mg_connection *c) {
+  struct connection *conn = MG_CONN_2_CONN(c);
+  if (!(conn->ns_conn->flags & MG_HEADERS_SENT)) {
+    mg_send_header(c, "Transfer-Encoding", "chunked");
+    mg_write(c, "\r\n", 2);
+    conn->ns_conn->flags |= MG_HEADERS_SENT;
+  }
+}
+
+size_t mg_send_data(struct mg_connection *c, const void *data, int data_len) {
+  struct connection *conn = MG_CONN_2_CONN(c);
+  terminate_headers(c);
+  write_chunk(MG_CONN_2_CONN(c), (const char *) data, data_len);
+  return conn->ns_conn->send_iobuf.len;
+}
+
+size_t mg_printf_data(struct mg_connection *c, const char *fmt, ...) {
+  struct connection *conn = MG_CONN_2_CONN(c);
+  va_list ap;
+  int len;
+  char mem[IOBUF_SIZE], *buf = mem;
+
+  terminate_headers(c);
+
+  va_start(ap, fmt);
+  len = ns_avprintf(&buf, sizeof(mem), fmt, ap);
+  va_end(ap);
+
+  if (len >= 0) {
+    write_chunk((struct connection *) conn, buf, len);
+  }
+  if (buf != mem && buf != NULL) {
+    NS_FREE(buf);
+  }
+  return conn->ns_conn->send_iobuf.len;
+}
+
+#if !defined(MONGOOSE_NO_WEBSOCKET) || !defined(MONGOOSE_NO_AUTH)
+static int is_big_endian(void) {
+  static const int n = 1;
+  return ((char *) &n)[0] == 0;
+}
+#endif
+
+#ifndef MONGOOSE_NO_WEBSOCKET
+// START OF SHA-1 code
+// Copyright(c) By Steve Reid <steve at edmweb.com>
+#define SHA1HANDSOFF
+#if defined(__sun)
+#include "solarisfixes.h"
+#endif
+
+union char64long16 { unsigned char c[64]; uint32_t l[16]; };
+
+#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
+
+static uint32_t blk0(union char64long16 *block, int i) {
+  // Forrest: SHA expect BIG_ENDIAN, swap if LITTLE_ENDIAN
+  if (!is_big_endian()) {
+    block->l[i] = (rol(block->l[i], 24) & 0xFF00FF00) |
+      (rol(block->l[i], 8) & 0x00FF00FF);
+  }
+  return block->l[i];
+}
+
+/* Avoid redefine warning (ARM /usr/include/sys/ucontext.h define R0~R4) */
+#undef blk
+#undef R0
+#undef R1
+#undef R2
+#undef R3
+#undef R4
+
+#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
+    ^block->l[(i+2)&15]^block->l[i&15],1))
+#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(block, i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30);
+#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
+#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
+
+typedef struct {
+    uint32_t state[5];
+    uint32_t count[2];
+    unsigned char buffer[64];
+} SHA1_CTX;
+
+static void SHA1Transform(uint32_t state[5], const unsigned char buffer[64]) {
+  uint32_t a, b, c, d, e;
+  union char64long16 block[1];
+
+  memcpy(block, buffer, 64);
+  a = state[0];
+  b = state[1];
+  c = state[2];
+  d = state[3];
+  e = state[4];
+  R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
+  R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
+  R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
+  R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
+  R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
+  R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
+  R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
+  R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
+  R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
+  R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
+  R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
+  R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
+  R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
+  R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
+  R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
+  R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
+  R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
+  R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
+  R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
+  R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
+  state[0] += a;
+  state[1] += b;
+  state[2] += c;
+  state[3] += d;
+  state[4] += e;
+  // Erase working structures. The order of operations is important,
+  // used to ensure that compiler doesn't optimize those out.
+  memset(block, 0, sizeof(block));
+  a = b = c = d = e = 0;
+  (void) a; (void) b; (void) c; (void) d; (void) e;
+}
+
+static void SHA1Init(SHA1_CTX *context) {
+  context->state[0] = 0x67452301;
+  context->state[1] = 0xEFCDAB89;
+  context->state[2] = 0x98BADCFE;
+  context->state[3] = 0x10325476;
+  context->state[4] = 0xC3D2E1F0;
+  context->count[0] = context->count[1] = 0;
+}
+
+static void SHA1Update(SHA1_CTX *context, const unsigned char *data,
+                       uint32_t len) {
+  uint32_t i, j;
+
+  j = context->count[0];
+  if ((context->count[0] += len << 3) < j)
+    context->count[1]++;
+  context->count[1] += (len>>29);
+  j = (j >> 3) & 63;
+  if ((j + len) > 63) {
+    memcpy(&context->buffer[j], data, (i = 64-j));
+    SHA1Transform(context->state, context->buffer);
+    for ( ; i + 63 < len; i += 64) {
+      SHA1Transform(context->state, &data[i]);
+    }
+    j = 0;
+  }
+  else i = 0;
+  memcpy(&context->buffer[j], &data[i], len - i);
+}
+
+static void SHA1Final(unsigned char digest[20], SHA1_CTX *context) {
+  unsigned i;
+  unsigned char finalcount[8], c;
+
+  for (i = 0; i < 8; i++) {
+    finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)]
+                                     >> ((3-(i & 3)) * 8) ) & 255);
+  }
+  c = 0200;
+  SHA1Update(context, &c, 1);
+  while ((context->count[0] & 504) != 448) {
+    c = 0000;
+    SHA1Update(context, &c, 1);
+  }
+  SHA1Update(context, finalcount, 8);
+  for (i = 0; i < 20; i++) {
+    digest[i] = (unsigned char)
+      ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
+  }
+  memset(context, '\0', sizeof(*context));
+  memset(&finalcount, '\0', sizeof(finalcount));
+}
+// END OF SHA1 CODE
+
+static void base64_encode(const unsigned char *src, int src_len, char *dst) {
+  static const char *b64 =
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+  int i, j, a, b, c;
+
+  for (i = j = 0; i < src_len; i += 3) {
+    a = src[i];
+    b = i + 1 >= src_len ? 0 : src[i + 1];
+    c = i + 2 >= src_len ? 0 : src[i + 2];
+
+    dst[j++] = b64[a >> 2];
+    dst[j++] = b64[((a & 3) << 4) | (b >> 4)];
+    if (i + 1 < src_len) {
+      dst[j++] = b64[(b & 15) << 2 | (c >> 6)];
+    }
+    if (i + 2 < src_len) {
+      dst[j++] = b64[c & 63];
+    }
+  }
+  while (j % 4 != 0) {
+    dst[j++] = '=';
+  }
+  dst[j++] = '\0';
+}
+
+static void send_websocket_handshake(struct mg_connection *conn,
+                                     const char *key) {
+  static const char *magic = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
+  char buf[500], sha[20], b64_sha[sizeof(sha) * 2];
+  SHA1_CTX sha_ctx;
+
+  mg_snprintf(buf, sizeof(buf), "%s%s", key, magic);
+  SHA1Init(&sha_ctx);
+  SHA1Update(&sha_ctx, (unsigned char *) buf, strlen(buf));
+  SHA1Final((unsigned char *) sha, &sha_ctx);
+  base64_encode((unsigned char *) sha, sizeof(sha), b64_sha);
+  mg_snprintf(buf, sizeof(buf), "%s%s%s",
+              "HTTP/1.1 101 Switching Protocols\r\n"
+              "Upgrade: websocket\r\n"
+              "Connection: Upgrade\r\n"
+              "Sec-WebSocket-Accept: ", b64_sha, "\r\n\r\n");
+
+  mg_write(conn, buf, strlen(buf));
+}
+
+static int deliver_websocket_frame(struct connection *conn) {
+  // Having buf unsigned char * is important, as it is used below in arithmetic
+  unsigned char *buf = (unsigned char *) conn->ns_conn->recv_iobuf.buf;
+  int i, len, buf_len = conn->ns_conn->recv_iobuf.len, frame_len = 0,
+      mask_len = 0, header_len = 0, data_len = 0, buffered = 0;
+
+  if (buf_len >= 2) {
+    len = buf[1] & 127;
+    mask_len = buf[1] & 128 ? 4 : 0;
+    if (len < 126 && buf_len >= mask_len) {
+      data_len = len;
+      header_len = 2 + mask_len;
+    } else if (len == 126 && buf_len >= 4 + mask_len) {
+      header_len = 4 + mask_len;
+      data_len = ((((int) buf[2]) << 8) + buf[3]);
+    } else if (buf_len >= 10 + mask_len) {
+      header_len = 10 + mask_len;
+      data_len = (int) (((uint64_t) htonl(* (uint32_t *) &buf[2])) << 32) +
+        htonl(* (uint32_t *) &buf[6]);
+    }
+  }
+
+  frame_len = header_len + data_len;
+  buffered = frame_len > 0 && frame_len <= buf_len;
+
+  if (buffered) {
+    conn->mg_conn.content_len = data_len;
+    conn->mg_conn.content = (char *) buf + header_len;
+    conn->mg_conn.wsbits = buf[0];
+
+    // Apply mask if necessary
+    if (mask_len > 0) {
+      for (i = 0; i < data_len; i++) {
+        buf[i + header_len] ^= (buf + header_len - mask_len)[i % 4];
+      }
+    }
+
+    // Call the handler and remove frame from the iobuf
+    if (call_user(conn, MG_REQUEST) == MG_FALSE) {
+      conn->ns_conn->flags |= NSF_FINISHED_SENDING_DATA;
+    }
+    iobuf_remove(&conn->ns_conn->recv_iobuf, frame_len);
+  }
+
+  return buffered;
+}
+
+size_t mg_websocket_write(struct mg_connection *conn, int opcode,
+                       const char *data, size_t data_len) {
+    unsigned char mem[4192], *copy = mem;
+    size_t copy_len = 0;
+
+    if (data_len + 10 > sizeof(mem) &&
+        (copy = (unsigned char *) NS_MALLOC(data_len + 10)) == NULL) {
+      return 0;
+    }
+
+    copy[0] = 0x80 + (opcode & 0x0f);
+
+    // Frame format: http://tools.ietf.org/html/rfc6455#section-5.2
+    if (data_len < 126) {
+      // Inline 7-bit length field
+      copy[1] = data_len;
+      memcpy(copy + 2, data, data_len);
+      copy_len = 2 + data_len;
+    } else if (data_len <= 0xFFFF) {
+      // 16-bit length field
+      copy[1] = 126;
+      * (uint16_t *) (copy + 2) = (uint16_t) htons((uint16_t) data_len);
+      memcpy(copy + 4, data, data_len);
+      copy_len = 4 + data_len;
+    } else {
+      // 64-bit length field
+      copy[1] = 127;
+      const uint32_t hi = htonl((uint32_t) ((uint64_t) data_len >> 32));
+      const uint32_t lo = htonl(data_len & 0xffffffff);
+      memcpy(copy+2,&hi,sizeof(hi));
+      memcpy(copy+6,&lo,sizeof(lo));
+      memcpy(copy + 10, data, data_len);
+      copy_len = 10 + data_len;
+    }
+
+    if (copy_len > 0) {
+      mg_write(conn, copy, copy_len);
+    }
+    if (copy != mem) {
+      NS_FREE(copy);
+    }
+
+    // If we send closing frame, schedule a connection to be closed after
+    // data is drained to the client.
+    if (opcode == WEBSOCKET_OPCODE_CONNECTION_CLOSE) {
+      MG_CONN_2_CONN(conn)->ns_conn->flags |= NSF_FINISHED_SENDING_DATA;
+    }
+
+    return MG_CONN_2_CONN(conn)->ns_conn->send_iobuf.len;
+}
+
+size_t mg_websocket_printf(struct mg_connection *conn, int opcode,
+                           const char *fmt, ...) {
+  char mem[4192], *buf = mem;
+  va_list ap;
+  int len;
+
+  va_start(ap, fmt);
+  if ((len = ns_avprintf(&buf, sizeof(mem), fmt, ap)) > 0) {
+    mg_websocket_write(conn, opcode, buf, len);
+  }
+  va_end(ap);
+
+  if (buf != mem && buf != NULL) {
+    NS_FREE(buf);
+  }
+
+  return MG_CONN_2_CONN(conn)->ns_conn->send_iobuf.len;
+}
+
+static void send_websocket_handshake_if_requested(struct mg_connection *conn) {
+  const char *ver = mg_get_header(conn, "Sec-WebSocket-Version"),
+        *key = mg_get_header(conn, "Sec-WebSocket-Key");
+  if (ver != NULL && key != NULL) {
+    conn->is_websocket = 1;
+    if (call_user(MG_CONN_2_CONN(conn), MG_WS_HANDSHAKE) == MG_FALSE) {
+      send_websocket_handshake(conn, key);
+    }
+    call_user(MG_CONN_2_CONN(conn), MG_WS_CONNECT);
+  }
+}
+
+static void ping_idle_websocket_connection(struct connection *conn, time_t t) {
+  if (t - conn->ns_conn->last_io_time > MONGOOSE_USE_WEBSOCKET_PING_INTERVAL) {
+    mg_websocket_write(&conn->mg_conn, WEBSOCKET_OPCODE_PING, "", 0);
+  }
+}
+#else
+#define ping_idle_websocket_connection(conn, t)
+#endif // !MONGOOSE_NO_WEBSOCKET
+
+static void write_terminating_chunk(struct connection *conn) {
+  mg_write(&conn->mg_conn, "0\r\n\r\n", 5);
+}
+
+static int call_request_handler(struct connection *conn) {
+  int result;
+  conn->mg_conn.content = conn->ns_conn->recv_iobuf.buf;
+  if ((result = call_user(conn, MG_REQUEST)) == MG_TRUE) {
+    if (conn->ns_conn->flags & MG_HEADERS_SENT) {
+      write_terminating_chunk(conn);
+    }
+    close_local_endpoint(conn);
+  }
+  return result;
+}
+
+const char *mg_get_mime_type(const char *path, const char *default_mime_type) {
+  const char *ext;
+  size_t i, path_len;
+
+  path_len = strlen(path);
+
+  for (i = 0; static_builtin_mime_types[i].extension != NULL; i++) {
+    ext = path + (path_len - static_builtin_mime_types[i].ext_len);
+    if (path_len > static_builtin_mime_types[i].ext_len &&
+        mg_strcasecmp(ext, static_builtin_mime_types[i].extension) == 0) {
+      return static_builtin_mime_types[i].mime_type;
+    }
+  }
+
+  return default_mime_type;
+}
+
+#ifndef MONGOOSE_NO_FILESYSTEM
+// Convert month to the month number. Return -1 on error, or month number
+static int get_month_index(const char *s) {
+  static const char *month_names[] = {
+    "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+    "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+  };
+  int i;
+
+  for (i = 0; i < (int) ARRAY_SIZE(month_names); i++)
+    if (!strcmp(s, month_names[i]))
+      return i;
+
+  return -1;
+}
+
+static int num_leap_years(int year) {
+  return year / 4 - year / 100 + year / 400;
+}
+
+// Parse UTC date-time string, and return the corresponding time_t value.
+static time_t parse_date_string(const char *datetime) {
+  static const unsigned short days_before_month[] = {
+    0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334
+  };
+  char month_str[32];
+  int second, minute, hour, day, month, year, leap_days, days;
+  time_t result = (time_t) 0;
+
+  if (((sscanf(datetime, "%d/%3s/%d %d:%d:%d",
+               &day, month_str, &year, &hour, &minute, &second) == 6) ||
+       (sscanf(datetime, "%d %3s %d %d:%d:%d",
+               &day, month_str, &year, &hour, &minute, &second) == 6) ||
+       (sscanf(datetime, "%*3s, %d %3s %d %d:%d:%d",
+               &day, month_str, &year, &hour, &minute, &second) == 6) ||
+       (sscanf(datetime, "%d-%3s-%d %d:%d:%d",
+               &day, month_str, &year, &hour, &minute, &second) == 6)) &&
+      year > 1970 &&
+      (month = get_month_index(month_str)) != -1) {
+    leap_days = num_leap_years(year) - num_leap_years(1970);
+    year -= 1970;
+    days = year * 365 + days_before_month[month] + (day - 1) + leap_days;
+    result = days * 24 * 3600 + hour * 3600 + minute * 60 + second;
+  }
+
+  return result;
+}
+
+// Look at the "path" extension and figure what mime type it has.
+// Store mime type in the vector.
+static void get_mime_type(const struct mg_server *server, const char *path,
+                          struct vec *vec) {
+  struct vec ext_vec, mime_vec;
+  const char *list, *ext;
+  size_t path_len;
+
+  path_len = strlen(path);
+
+  // Scan user-defined mime types first, in case user wants to
+  // override default mime types.
+  list = server->config_options[EXTRA_MIME_TYPES];
+  while ((list = next_option(list, &ext_vec, &mime_vec)) != NULL) {
+    // ext now points to the path suffix
+    ext = path + path_len - ext_vec.len;
+    if (mg_strncasecmp(ext, ext_vec.ptr, ext_vec.len) == 0) {
+      *vec = mime_vec;
+      return;
+    }
+  }
+
+  vec->ptr = mg_get_mime_type(path, "text/plain");
+  vec->len = strlen(vec->ptr);
+}
+
+static const char *suggest_connection_header(const struct mg_connection *conn) {
+  return should_keep_alive(conn) ? "keep-alive" : "close";
+}
+
+static void construct_etag(char *buf, size_t buf_len, const file_stat_t *st) {
+  mg_snprintf(buf, buf_len, "\"%lx.%" INT64_FMT "\"",
+              (unsigned long) st->st_mtime, (int64_t) st->st_size);
+}
+
+// Return True if we should reply 304 Not Modified.
+static int is_not_modified(const struct connection *conn,
+                           const file_stat_t *stp) {
+  char etag[64];
+  const char *ims = mg_get_header(&conn->mg_conn, "If-Modified-Since");
+  const char *inm = mg_get_header(&conn->mg_conn, "If-None-Match");
+  construct_etag(etag, sizeof(etag), stp);
+  return (inm != NULL && !mg_strcasecmp(etag, inm)) ||
+    (ims != NULL && stp->st_mtime <= parse_date_string(ims));
+}
+
+// For given directory path, substitute it to valid index file.
+// Return 0 if index file has been found, -1 if not found.
+// If the file is found, it's stats is returned in stp.
+static int find_index_file(struct connection *conn, char *path,
+                           size_t path_len, file_stat_t *stp) {
+  const char *list = conn->server->config_options[INDEX_FILES];
+  file_stat_t st;
+  struct vec filename_vec;
+  size_t n = strlen(path), found = 0;
+
+  // The 'path' given to us points to the directory. Remove all trailing
+  // directory separator characters from the end of the path, and
+  // then append single directory separator character.
+  while (n > 0 && path[n - 1] == '/') {
+    n--;
+  }
+  path[n] = '/';
+
+  // Traverse index files list. For each entry, append it to the given
+  // path and see if the file exists. If it exists, break the loop
+  while ((list = next_option(list, &filename_vec, NULL)) != NULL) {
+
+    // Ignore too long entries that may overflow path buffer
+    if (filename_vec.len > (int) (path_len - (n + 2)))
+      continue;
+
+    // Prepare full path to the index file
+    strncpy(path + n + 1, filename_vec.ptr, filename_vec.len);
+    path[n + 1 + filename_vec.len] = '\0';
+
+    //DBG(("[%s]", path));
+
+    // Does it exist?
+    if (!stat(path, &st)) {
+      // Yes it does, break the loop
+      *stp = st;
+      found = 1;
+      break;
+    }
+  }
+
+  // If no index file exists, restore directory path
+  if (!found) {
+    path[n] = '\0';
+  }
+
+  return found;
+}
+
+static int parse_range_header(const char *header, int64_t *a, int64_t *b) {
+  return sscanf(header, "bytes=%" INT64_FMT "-%" INT64_FMT, a, b);
+}
+
+static void gmt_time_string(char *buf, size_t buf_len, time_t *t) {
+  strftime(buf, buf_len, "%a, %d %b %Y %H:%M:%S GMT", gmtime(t));
+}
+
+static void open_file_endpoint(struct connection *conn, const char *path,
+                               file_stat_t *st, const char *extra_headers) {
+  char date[64], lm[64], etag[64], range[64], headers[1000];
+  const char *msg = "OK", *hdr;
+  time_t curtime = time(NULL);
+  int64_t r1, r2;
+  struct vec mime_vec;
+  int n;
+
+  conn->endpoint_type = EP_FILE;
+  ns_set_close_on_exec(conn->endpoint.fd);
+  conn->mg_conn.status_code = 200;
+
+  get_mime_type(conn->server, path, &mime_vec);
+  conn->cl = st->st_size;
+  range[0] = '\0';
+
+  // If Range: header specified, act accordingly
+  r1 = r2 = 0;
+  hdr = mg_get_header(&conn->mg_conn, "Range");
+  if (hdr != NULL && (n = parse_range_header(hdr, &r1, &r2)) > 0 &&
+      r1 >= 0 && r2 >= 0) {
+    conn->mg_conn.status_code = 206;
+    conn->cl = n == 2 ? (r2 > conn->cl ? conn->cl : r2) - r1 + 1: conn->cl - r1;
+    mg_snprintf(range, sizeof(range), "Content-Range: bytes "
+                "%" INT64_FMT "-%" INT64_FMT "/%" INT64_FMT "\r\n",
+                r1, r1 + conn->cl - 1, (int64_t) st->st_size);
+    msg = "Partial Content";
+    lseek(conn->endpoint.fd, r1, SEEK_SET);
+  }
+
+  // Prepare Etag, Date, Last-Modified headers. Must be in UTC, according to
+  // http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.3
+  gmt_time_string(date, sizeof(date), &curtime);
+  gmt_time_string(lm, sizeof(lm), &st->st_mtime);
+  construct_etag(etag, sizeof(etag), st);
+
+  n = mg_snprintf(headers, sizeof(headers),
+                  "HTTP/1.1 %d %s\r\n"
+                  "Date: %s\r\n"
+                  "Last-Modified: %s\r\n"
+                  "Etag: %s\r\n"
+                  "Content-Type: %.*s\r\n"
+                  "Content-Length: %" INT64_FMT "\r\n"
+                  "Connection: %s\r\n"
+                  "Accept-Ranges: bytes\r\n"
+                  "%s%s%s\r\n",
+                  conn->mg_conn.status_code, msg, date, lm, etag,
+                  (int) mime_vec.len, mime_vec.ptr, conn->cl,
+                  suggest_connection_header(&conn->mg_conn),
+                  range, extra_headers == NULL ? "" : extra_headers,
+                  MONGOOSE_USE_EXTRA_HTTP_HEADERS);
+  ns_send(conn->ns_conn, headers, n);
+
+  if (!strcmp(conn->mg_conn.request_method, "HEAD")) {
+    conn->ns_conn->flags |= NSF_FINISHED_SENDING_DATA;
+    close(conn->endpoint.fd);
+    conn->endpoint_type = EP_NONE;
+  }
+}
+
+void mg_send_file_data(struct mg_connection *c, int fd) {
+  struct connection *conn = MG_CONN_2_CONN(c);
+  conn->endpoint_type = EP_FILE;
+  conn->endpoint.fd = fd;
+  ns_set_close_on_exec(conn->endpoint.fd);
+}
+#endif  // MONGOOSE_NO_FILESYSTEM
+
+static void call_request_handler_if_data_is_buffered(struct connection *conn) {
+#ifndef MONGOOSE_NO_WEBSOCKET
+  if (conn->mg_conn.is_websocket) {
+    do { } while (deliver_websocket_frame(conn));
+  } else
+#endif
+  if (conn->num_bytes_recv >= (conn->cl + conn->request_len) &&
+      call_request_handler(conn) == MG_FALSE) {
+    open_local_endpoint(conn, 1);
+  }
+}
+
+#if !defined(MONGOOSE_NO_DIRECTORY_LISTING) || !defined(MONGOOSE_NO_DAV)
+
+#ifdef _WIN32
+struct dirent {
+  char d_name[MAX_PATH_SIZE];
+};
+
+typedef struct DIR {
+  HANDLE   handle;
+  WIN32_FIND_DATAW info;
+  struct dirent result;
+} DIR;
+
+// Implementation of POSIX opendir/closedir/readdir for Windows.
+static DIR *opendir(const char *name) {
+  DIR *dir = NULL;
+  wchar_t wpath[MAX_PATH_SIZE];
+  DWORD attrs;
+
+  if (name == NULL) {
+    SetLastError(ERROR_BAD_ARGUMENTS);
+  } else if ((dir = (DIR *) NS_MALLOC(sizeof(*dir))) == NULL) {
+    SetLastError(ERROR_NOT_ENOUGH_MEMORY);
+  } else {
+    to_wchar(name, wpath, ARRAY_SIZE(wpath));
+    attrs = GetFileAttributesW(wpath);
+    if (attrs != 0xFFFFFFFF &&
+        ((attrs & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY)) {
+      (void) wcscat(wpath, L"\\*");
+      dir->handle = FindFirstFileW(wpath, &dir->info);
+      dir->result.d_name[0] = '\0';
+    } else {
+      NS_FREE(dir);
+      dir = NULL;
+    }
+  }
+
+  return dir;
+}
+
+static int closedir(DIR *dir) {
+  int result = 0;
+
+  if (dir != NULL) {
+    if (dir->handle != INVALID_HANDLE_VALUE)
+      result = FindClose(dir->handle) ? 0 : -1;
+
+    NS_FREE(dir);
+  } else {
+    result = -1;
+    SetLastError(ERROR_BAD_ARGUMENTS);
+  }
+
+  return result;
+}
+
+static struct dirent *readdir(DIR *dir) {
+  struct dirent *result = 0;
+
+  if (dir) {
+    if (dir->handle != INVALID_HANDLE_VALUE) {
+      result = &dir->result;
+      (void) WideCharToMultiByte(CP_UTF8, 0,
+          dir->info.cFileName, -1, result->d_name,
+          sizeof(result->d_name), NULL, NULL);
+
+      if (!FindNextFileW(dir->handle, &dir->info)) {
+        (void) FindClose(dir->handle);
+        dir->handle = INVALID_HANDLE_VALUE;
+      }
+
+    } else {
+      SetLastError(ERROR_FILE_NOT_FOUND);
+    }
+  } else {
+    SetLastError(ERROR_BAD_ARGUMENTS);
+  }
+
+  return result;
+}
+#endif // _WIN32  POSIX opendir/closedir/readdir implementation
+
+static int scan_directory(struct connection *conn, const char *dir,
+                          struct dir_entry **arr) {
+  char path[MAX_PATH_SIZE];
+  struct dir_entry *p;
+  struct dirent *dp;
+  int arr_size = 0, arr_ind = 0, inc = 100;
+  DIR *dirp;
+
+  *arr = NULL;
+  if ((dirp = (opendir(dir))) == NULL) return 0;
+
+  while ((dp = readdir(dirp)) != NULL) {
+    // Do not show current dir and hidden files
+    if (!strcmp(dp->d_name, ".") ||
+        !strcmp(dp->d_name, "..") ||
+        must_hide_file(conn, dp->d_name)) {
+      continue;
+    }
+    mg_snprintf(path, sizeof(path), "%s%c%s", dir, '/', dp->d_name);
+
+    // Resize the array if nesessary
+    if (arr_ind >= arr_size) {
+      if ((p = (struct dir_entry *)
+           NS_REALLOC(*arr, (inc + arr_size) * sizeof(**arr))) != NULL) {
+        // Memset new chunk to zero, otherwize st_mtime will have garbage which
+        // can make strftime() segfault, see
+        // http://code.google.com/p/mongoose/issues/detail?id=79
+        memset(p + arr_size, 0, sizeof(**arr) * inc);
+
+        *arr = p;
+        arr_size += inc;
+      }
+    }
+
+    if (arr_ind < arr_size) {
+      (*arr)[arr_ind].conn = conn;
+      (*arr)[arr_ind].file_name = strdup(dp->d_name);
+      stat(path, &(*arr)[arr_ind].st);
+      arr_ind++;
+    }
+  }
+  closedir(dirp);
+
+  return arr_ind;
+}
+
+int mg_url_encode(const char *src, size_t s_len, char *dst, size_t dst_len) {
+  static const char *dont_escape = "._-$,;~()";
+  static const char *hex = "0123456789abcdef";
+  size_t i = 0, j = 0;
+
+  for (i = j = 0; dst_len > 0 && i < s_len && j + 2 < dst_len - 1; i++, j++) {
+    if (isalnum(* (const unsigned char *) (src + i)) ||
+        strchr(dont_escape, * (const unsigned char *) (src + i)) != NULL) {
+      dst[j] = src[i];
+    } else if (j + 3 < dst_len) {
+      dst[j] = '%';
+      dst[j + 1] = hex[(* (const unsigned char *) (src + i)) >> 4];
+      dst[j + 2] = hex[(* (const unsigned char *) (src + i)) & 0xf];
+      j += 2;
+    }
+  }
+
+  dst[j] = '\0';
+  return j;
+}
+#endif  // !NO_DIRECTORY_LISTING || !MONGOOSE_NO_DAV
+
+#ifndef MONGOOSE_NO_DIRECTORY_LISTING
+
+static void print_dir_entry(const struct dir_entry *de) {
+  char size[64], mod[64], href[MAX_PATH_SIZE * 3];
+  int64_t fsize = de->st.st_size;
+  int is_dir = S_ISDIR(de->st.st_mode);
+  const char *slash = is_dir ? "/" : "";
+
+  if (is_dir) {
+    mg_snprintf(size, sizeof(size), "%s", "[DIRECTORY]");
+  } else {
+     // We use (signed) cast below because MSVC 6 compiler cannot
+     // convert unsigned __int64 to double.
+    if (fsize < 1024) {
+      mg_snprintf(size, sizeof(size), "%d", (int) fsize);
+    } else if (fsize < 0x100000) {
+      mg_snprintf(size, sizeof(size), "%.1fk", (double) fsize / 1024.0);
+    } else if (fsize < 0x40000000) {
+      mg_snprintf(size, sizeof(size), "%.1fM", (double) fsize / 1048576);
+    } else {
+      mg_snprintf(size, sizeof(size), "%.1fG", (double) fsize / 1073741824);
+    }
+  }
+  strftime(mod, sizeof(mod), "%d-%b-%Y %H:%M", localtime(&de->st.st_mtime));
+  mg_url_encode(de->file_name, strlen(de->file_name), href, sizeof(href));
+  mg_printf_data(&de->conn->mg_conn,
+                  "<tr><td><a href=\"%s%s\">%s%s</a></td>"
+                  "<td> %s</td><td>  %s</td></tr>\n",
+                  href, slash, de->file_name, slash, mod, size);
+}
+
+// Sort directory entries by size, or name, or modification time.
+// On windows, __cdecl specification is needed in case if project is built
+// with __stdcall convention. qsort always requires __cdels callback.
+static int __cdecl compare_dir_entries(const void *p1, const void *p2) {
+  const struct dir_entry *a = (const struct dir_entry *) p1,
+        *b = (const struct dir_entry *) p2;
+  const char *qs = a->conn->mg_conn.query_string ?
+    a->conn->mg_conn.query_string : "na";
+  int cmp_result = 0;
+
+  if (S_ISDIR(a->st.st_mode) && !S_ISDIR(b->st.st_mode)) {
+    return -1;  // Always put directories on top
+  } else if (!S_ISDIR(a->st.st_mode) && S_ISDIR(b->st.st_mode)) {
+    return 1;   // Always put directories on top
+  } else if (*qs == 'n') {
+    cmp_result = strcmp(a->file_name, b->file_name);
+  } else if (*qs == 's') {
+    cmp_result = a->st.st_size == b->st.st_size ? 0 :
+      a->st.st_size > b->st.st_size ? 1 : -1;
+  } else if (*qs == 'd') {
+    cmp_result = a->st.st_mtime == b->st.st_mtime ? 0 :
+      a->st.st_mtime > b->st.st_mtime ? 1 : -1;
+  }
+
+  return qs[1] == 'd' ? -cmp_result : cmp_result;
+}
+
+static void send_directory_listing(struct connection *conn, const char *dir) {
+  struct dir_entry *arr = NULL;
+  int i, num_entries, sort_direction = conn->mg_conn.query_string != NULL &&
+    conn->mg_conn.query_string[1] == 'd' ? 'a' : 'd';
+
+  mg_send_header(&conn->mg_conn, "Transfer-Encoding", "chunked");
+  mg_send_header(&conn->mg_conn, "Content-Type", "text/html; charset=utf-8");
+
+  mg_printf_data(&conn->mg_conn,
+              "<html><head><title>Index of %s</title>"
+              "<style>th {text-align: left;}</style></head>"
+              "<body><h1>Index of %s</h1><pre><table cellpadding=\"0\">"
+              "<tr><th><a href=\"?n%c\">Name</a></th>"
+              "<th><a href=\"?d%c\">Modified</a></th>"
+              "<th><a href=\"?s%c\">Size</a></th></tr>"
+              "<tr><td colspan=\"3\"><hr></td></tr>",
+              conn->mg_conn.uri, conn->mg_conn.uri,
+              sort_direction, sort_direction, sort_direction);
+
+  num_entries = scan_directory(conn, dir, &arr);
+  qsort(arr, num_entries, sizeof(arr[0]), compare_dir_entries);
+  for (i = 0; i < num_entries; i++) {
+    print_dir_entry(&arr[i]);
+    NS_FREE(arr[i].file_name);
+  }
+  NS_FREE(arr);
+
+  write_terminating_chunk(conn);
+  close_local_endpoint(conn);
+}
+#endif  // MONGOOSE_NO_DIRECTORY_LISTING
+
+#ifndef MONGOOSE_NO_DAV
+static void print_props(struct connection *conn, const char *uri,
+                        file_stat_t *stp) {
+  char mtime[64];
+
+  gmt_time_string(mtime, sizeof(mtime), &stp->st_mtime);
+  mg_printf(&conn->mg_conn,
+      "<d:response>"
+       "<d:href>%s</d:href>"
+       "<d:propstat>"
+        "<d:prop>"
+         "<d:resourcetype>%s</d:resourcetype>"
+         "<d:getcontentlength>%" INT64_FMT "</d:getcontentlength>"
+         "<d:getlastmodified>%s</d:getlastmodified>"
+        "</d:prop>"
+        "<d:status>HTTP/1.1 200 OK</d:status>"
+       "</d:propstat>"
+      "</d:response>\n",
+      uri, S_ISDIR(stp->st_mode) ? "<d:collection/>" : "",
+      (int64_t) stp->st_size, mtime);
+}
+
+static void handle_propfind(struct connection *conn, const char *path,
+                            file_stat_t *stp, int exists) {
+  static const char header[] = "HTTP/1.1 207 Multi-Status\r\n"
+    "Connection: close\r\n"
+    "Content-Type: text/xml; charset=utf-8\r\n\r\n"
+    "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
+    "<d:multistatus xmlns:d='DAV:'>\n";
+  static const char footer[] = "</d:multistatus>";
+  const char *depth = mg_get_header(&conn->mg_conn, "Depth");
+#ifdef MONGOOSE_NO_DIRECTORY_LISTING
+  const char *list_dir = "no";
+#else
+  const char *list_dir = conn->server->config_options[ENABLE_DIRECTORY_LISTING];
+#endif
+
+  conn->mg_conn.status_code = 207;
+
+  // Print properties for the requested resource itself
+  if (!exists) {
+    conn->mg_conn.status_code = 404;
+    mg_printf(&conn->mg_conn, "%s", "HTTP/1.1 404 Not Found\r\n\r\n");
+  } else if (S_ISDIR(stp->st_mode) && mg_strcasecmp(list_dir, "yes") != 0) {
+    conn->mg_conn.status_code = 403;
+    mg_printf(&conn->mg_conn, "%s",
+              "HTTP/1.1 403 Directory Listing Denied\r\n\r\n");
+  } else {
+    ns_send(conn->ns_conn, header, sizeof(header) - 1);
+    print_props(conn, conn->mg_conn.uri, stp);
+
+    if (S_ISDIR(stp->st_mode) &&
+             (depth == NULL || strcmp(depth, "0") != 0)) {
+      struct dir_entry *arr = NULL;
+      int i, num_entries = scan_directory(conn, path, &arr);
+
+      for (i = 0; i < num_entries; i++) {
+        char buf[MAX_PATH_SIZE * 3];
+        struct dir_entry *de = &arr[i];
+        mg_url_encode(de->file_name, strlen(de->file_name), buf, sizeof(buf));
+        print_props(conn, buf, &de->st);
+        NS_FREE(de->file_name);
+      }
+      NS_FREE(arr);
+    }
+    ns_send(conn->ns_conn, footer, sizeof(footer) - 1);
+  }
+
+  close_local_endpoint(conn);
+}
+
+static void handle_mkcol(struct connection *conn, const char *path) {
+  int status_code = 500;
+
+  if (conn->mg_conn.content_len > 0) {
+    status_code = 415;
+  } else if (!mkdir(path, 0755)) {
+    status_code = 201;
+  } else if (errno == EEXIST) {
+    status_code = 405;
+  } else if (errno == EACCES) {
+    status_code = 403;
+  } else if (errno == ENOENT) {
+    status_code = 409;
+  }
+  send_http_error(conn, status_code, NULL);
+}
+
+static int remove_directory(const char *dir) {
+  char path[MAX_PATH_SIZE];
+  struct dirent *dp;
+  file_stat_t st;
+  DIR *dirp;
+
+  if ((dirp = opendir(dir)) == NULL) return 0;
+
+  while ((dp = readdir(dirp)) != NULL) {
+    if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, "..")) continue;
+    mg_snprintf(path, sizeof(path), "%s%c%s", dir, '/', dp->d_name);
+    stat(path, &st);
+    if (S_ISDIR(st.st_mode)) {
+      remove_directory(path);
+    } else {
+      remove(path);
+    }
+  }
+  closedir(dirp);
+  rmdir(dir);
+
+  return 1;
+}
+
+static void handle_delete(struct connection *conn, const char *path) {
+  file_stat_t st;
+
+  if (stat(path, &st) != 0) {
+    send_http_error(conn, 404, NULL);
+  } else if (S_ISDIR(st.st_mode)) {
+    remove_directory(path);
+    send_http_error(conn, 204, NULL);
+  } else if (remove(path) == 0) {
+    send_http_error(conn, 204, NULL);
+  } else {
+    send_http_error(conn, 423, NULL);
+  }
+}
+
+// For a given PUT path, create all intermediate subdirectories
+// for given path. Return 0 if the path itself is a directory,
+// or -1 on error, 1 if OK.
+static int put_dir(const char *path) {
+  char buf[MAX_PATH_SIZE];
+  const char *s, *p;
+  file_stat_t st;
+
+  // Create intermediate directories if they do not exist
+  for (s = p = path + 1; (p = strchr(s, '/')) != NULL; s = ++p) {
+    if (p - path >= (int) sizeof(buf)) return -1; // Buffer overflow
+    memcpy(buf, path, p - path);
+    buf[p - path] = '\0';
+    if (stat(buf, &st) != 0 && mkdir(buf, 0755) != 0) return -1;
+    if (p[1] == '\0') return 0;  // Path is a directory itself
+  }
+
+  return 1;
+}
+
+static void handle_put(struct connection *conn, const char *path) {
+  file_stat_t st;
+  const char *range, *cl_hdr = mg_get_header(&conn->mg_conn, "Content-Length");
+  int64_t r1, r2;
+  int rc;
+
+  conn->mg_conn.status_code = !stat(path, &st) ? 200 : 201;
+  if ((rc = put_dir(path)) == 0) {
+    mg_printf(&conn->mg_conn, "HTTP/1.1 %d OK\r\n\r\n",
+              conn->mg_conn.status_code);
+    close_local_endpoint(conn);
+  } else if (rc == -1) {
+    send_http_error(conn, 500, "put_dir: %s", strerror(errno));
+  } else if (cl_hdr == NULL) {
+    send_http_error(conn, 411, NULL);
+  } else if ((conn->endpoint.fd =
+              open(path, O_RDWR | O_CREAT | O_TRUNC | O_BINARY, 0644)) < 0) {
+    send_http_error(conn, 500, "open(%s): %s", path, strerror(errno));
+  } else {
+    DBG(("PUT [%s] %lu", path, (unsigned long) conn->ns_conn->recv_iobuf.len));
+    conn->endpoint_type = EP_PUT;
+    ns_set_close_on_exec(conn->endpoint.fd);
+    range = mg_get_header(&conn->mg_conn, "Content-Range");
+    conn->cl = to64(cl_hdr);
+    r1 = r2 = 0;
+    if (range != NULL && parse_range_header(range, &r1, &r2) > 0) {
+      conn->mg_conn.status_code = 206;
+      lseek(conn->endpoint.fd, r1, SEEK_SET);
+      conn->cl = r2 > r1 ? r2 - r1 + 1: conn->cl - r1;
+    }
+    mg_printf(&conn->mg_conn, "HTTP/1.1 %d OK\r\nContent-Length: 0\r\n\r\n",
+              conn->mg_conn.status_code);
+  }
+}
+
+static void forward_put_data(struct connection *conn) {
+  struct iobuf *io = &conn->ns_conn->recv_iobuf;
+  size_t k = conn->cl < (int64_t) io->len ? conn->cl : (int64_t) io->len;   // To write
+  int n = write(conn->endpoint.fd, io->buf, k);   // Write them!
+  if (n > 0) {
+    iobuf_remove(io, n);
+    conn->cl -= n;
+  }
+  if (conn->cl <= 0) {
+    close_local_endpoint(conn);
+  }
+}
+#endif //  MONGOOSE_NO_DAV
+
+static void send_options(struct connection *conn) {
+  conn->mg_conn.status_code = 200;
+  mg_printf(&conn->mg_conn, "%s",
+            "HTTP/1.1 200 OK\r\nAllow: GET, POST, HEAD, CONNECT, PUT, "
+            "DELETE, OPTIONS, PROPFIND, MKCOL\r\nDAV: 1\r\n\r\n");
+  close_local_endpoint(conn);
+}
+
+#ifndef MONGOOSE_NO_AUTH
+void mg_send_digest_auth_request(struct mg_connection *c) {
+  struct connection *conn = MG_CONN_2_CONN(c);
+  c->status_code = 401;
+  mg_printf(c,
+            "HTTP/1.1 401 Unauthorized\r\n"
+            "WWW-Authenticate: Digest qop=\"auth\", "
+            "realm=\"%s\", nonce=\"%lu\"\r\n\r\n",
+            conn->server->config_options[AUTH_DOMAIN],
+            (unsigned long) time(NULL));
+  close_local_endpoint(conn);
+}
+
+// Use the global passwords file, if specified by auth_gpass option,
+// or search for .htpasswd in the requested directory.
+static FILE *open_auth_file(struct connection *conn, const char *path,
+                            int is_directory) {
+  char name[MAX_PATH_SIZE];
+  const char *p, *gpass = conn->server->config_options[GLOBAL_AUTH_FILE];
+  FILE *fp = NULL;
+
+  if (gpass != NULL) {
+    // Use global passwords file
+    fp = fopen(gpass, "r");
+  } else if (is_directory) {
+    mg_snprintf(name, sizeof(name), "%s%c%s", path, '/', PASSWORDS_FILE_NAME);
+    fp = fopen(name, "r");
+  } else {
+    // Try to find .htpasswd in requested directory.
+    if ((p = strrchr(path, '/')) == NULL) p = path;
+    mg_snprintf(name, sizeof(name), "%.*s%c%s",
+                (int) (p - path), path, '/', PASSWORDS_FILE_NAME);
+    fp = fopen(name, "r");
+  }
+
+  return fp;
+}
+
+#if !defined(HAVE_MD5) && !defined(MONGOOSE_NO_AUTH)
+/*
+ * This code implements the MD5 message-digest algorithm.
+ * The algorithm is due to Ron Rivest.	This code was
+ * written by Colin Plumb in 1993, no copyright is claimed.
+ * This code is in the public domain; do with it what you wish.
+ *
+ * Equivalent code is available from RSA Data Security, Inc.
+ * This code has been tested against that, and is equivalent,
+ * except that you don't need to include two pages of legalese
+ * with every copy.
+ *
+ * To compute the message digest of a chunk of bytes, declare an
+ * MD5Context structure, pass it to MD5Init, call MD5Update as
+ * needed on buffers full of bytes, and then call MD5Final, which
+ * will fill a supplied 16-byte array with the digest.
+ */
+
+typedef struct MD5Context {
+  uint32_t buf[4];
+  uint32_t bits[2];
+  unsigned char in[64];
+} MD5_CTX;
+
+static void byteReverse(unsigned char *buf, unsigned longs) {
+  uint32_t t;
+
+  // Forrest: MD5 expect LITTLE_ENDIAN, swap if BIG_ENDIAN
+  if (is_big_endian()) {
+    do {
+      t = (uint32_t) ((unsigned) buf[3] << 8 | buf[2]) << 16 |
+        ((unsigned) buf[1] << 8 | buf[0]);
+      * (uint32_t *) buf = t;
+      buf += 4;
+    } while (--longs);
+  }
+}
+
+#define F1(x, y, z) (z ^ (x & (y ^ z)))
+#define F2(x, y, z) F1(z, x, y)
+#define F3(x, y, z) (x ^ y ^ z)
+#define F4(x, y, z) (y ^ (x | ~z))
+
+#define MD5STEP(f, w, x, y, z, data, s) \
+  ( w += f(x, y, z) + data,  w = w<<s | w>>(32-s),  w += x )
+
+// Start MD5 accumulation.  Set bit count to 0 and buffer to mysterious
+// initialization constants.
+static void MD5Init(MD5_CTX *ctx) {
+  ctx->buf[0] = 0x67452301;
+  ctx->buf[1] = 0xefcdab89;
+  ctx->buf[2] = 0x98badcfe;
+  ctx->buf[3] = 0x10325476;
+
+  ctx->bits[0] = 0;
+  ctx->bits[1] = 0;
+}
+
+static void MD5Transform(uint32_t buf[4], uint32_t const in[16]) {
+  register uint32_t a, b, c, d;
+
+  a = buf[0];
+  b = buf[1];
+  c = buf[2];
+  d = buf[3];
+
+  MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
+  MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
+  MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17);
+  MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
+  MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
+  MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12);
+  MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17);
+  MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22);
+  MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7);
+  MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
+  MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
+  MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22);
+  MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7);
+  MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
+  MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
+  MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
+
+  MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5);
+  MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9);
+  MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
+  MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
+  MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5);
+  MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9);
+  MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
+  MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
+  MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
+  MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9);
+  MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
+  MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20);
+  MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
+  MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
+  MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14);
+  MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
+
+  MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4);
+  MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11);
+  MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
+  MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23);
+  MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4);
+  MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
+  MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
+  MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
+  MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
+  MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
+  MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
+  MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23);
+  MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
+  MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
+  MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
+  MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
+
+  MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6);
+  MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10);
+  MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
+  MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21);
+  MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6);
+  MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
+  MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15);
+  MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21);
+  MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
+  MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
+  MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15);
+  MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
+  MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6);
+  MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
+  MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
+  MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
+
+  buf[0] += a;
+  buf[1] += b;
+  buf[2] += c;
+  buf[3] += d;
+}
+
+static void MD5Update(MD5_CTX *ctx, unsigned char const *buf, unsigned len) {
+  uint32_t t;
+
+  t = ctx->bits[0];
+  if ((ctx->bits[0] = t + ((uint32_t) len << 3)) < t)
+    ctx->bits[1]++;
+  ctx->bits[1] += len >> 29;
+
+  t = (t >> 3) & 0x3f;
+
+  if (t) {
+    unsigned char *p = (unsigned char *) ctx->in + t;
+
+    t = 64 - t;
+    if (len < t) {
+      memcpy(p, buf, len);
+      return;
+    }
+    memcpy(p, buf, t);
+    byteReverse(ctx->in, 16);
+    MD5Transform(ctx->buf, (uint32_t *) ctx->in);
+    buf += t;
+    len -= t;
+  }
+
+  while (len >= 64) {
+    memcpy(ctx->in, buf, 64);
+    byteReverse(ctx->in, 16);
+    MD5Transform(ctx->buf, (uint32_t *) ctx->in);
+    buf += 64;
+    len -= 64;
+  }
+
+  memcpy(ctx->in, buf, len);
+}
+
+static void MD5Final(unsigned char digest[16], MD5_CTX *ctx) {
+  unsigned count;
+  unsigned char *p;
+  uint32_t *a;
+
+  count = (ctx->bits[0] >> 3) & 0x3F;
+
+  p = ctx->in + count;
+  *p++ = 0x80;
+  count = 64 - 1 - count;
+  if (count < 8) {
+    memset(p, 0, count);
+    byteReverse(ctx->in, 16);
+    MD5Transform(ctx->buf, (uint32_t *) ctx->in);
+    memset(ctx->in, 0, 56);
+  } else {
+    memset(p, 0, count - 8);
+  }
+  byteReverse(ctx->in, 14);
+
+  a = (uint32_t *)ctx->in;
+  a[14] = ctx->bits[0];
+  a[15] = ctx->bits[1];
+
+  MD5Transform(ctx->buf, (uint32_t *) ctx->in);
+  byteReverse((unsigned char *) ctx->buf, 4);
+  memcpy(digest, ctx->buf, 16);
+  memset((char *) ctx, 0, sizeof(*ctx));
+}
+#endif // !HAVE_MD5
+
+
+
+// Stringify binary data. Output buffer must be twice as big as input,
+// because each byte takes 2 bytes in string representation
+static void bin2str(char *to, const unsigned char *p, size_t len) {
+  static const char *hex = "0123456789abcdef";
+
+  for (; len--; p++) {
+    *to++ = hex[p[0] >> 4];
+    *to++ = hex[p[0] & 0x0f];
+  }
+  *to = '\0';
+}
+
+// Return stringified MD5 hash for list of strings. Buffer must be 33 bytes.
+char *mg_md5(char buf[33], ...) {
+  unsigned char hash[16];
+  const char *p;
+  va_list ap;
+  MD5_CTX ctx;
+
+  MD5Init(&ctx);
+
+  va_start(ap, buf);
+  while ((p = va_arg(ap, const char *)) != NULL) {
+    MD5Update(&ctx, (const unsigned char *) p, (unsigned) strlen(p));
+  }
+  va_end(ap);
+
+  MD5Final(hash, &ctx);
+  bin2str(buf, hash, sizeof(hash));
+  return buf;
+}
+
+// Check the user's password, return 1 if OK
+static int check_password(const char *method, const char *ha1, const char *uri,
+                          const char *nonce, const char *nc, const char *cnonce,
+                          const char *qop, const char *response) {
+  char ha2[32 + 1], expected_response[32 + 1];
+
+#if 0
+  // Check for authentication timeout
+  if ((unsigned long) time(NULL) - (unsigned long) to64(nonce) > 3600 * 2) {
+    return 0;
+  }
+#endif
+
+  mg_md5(ha2, method, ":", uri, NULL);
+  mg_md5(expected_response, ha1, ":", nonce, ":", nc,
+      ":", cnonce, ":", qop, ":", ha2, NULL);
+
+  return mg_strcasecmp(response, expected_response) == 0 ? MG_TRUE : MG_FALSE;
+}
+
+
+// Authorize against the opened passwords file. Return 1 if authorized.
+int mg_authorize_digest(struct mg_connection *c, FILE *fp) {
+  struct connection *conn = MG_CONN_2_CONN(c);
+  const char *hdr;
+  char line[256], f_user[256], ha1[256], f_domain[256], user[100], nonce[100],
+       uri[MAX_REQUEST_SIZE], cnonce[100], resp[100], qop[100], nc[100];
+
+  if (c == NULL || fp == NULL) return 0;
+  if ((hdr = mg_get_header(c, "Authorization")) == NULL ||
+      mg_strncasecmp(hdr, "Digest ", 7) != 0) return 0;
+  if (!mg_parse_header(hdr, "username", user, sizeof(user))) return 0;
+  if (!mg_parse_header(hdr, "cnonce", cnonce, sizeof(cnonce))) return 0;
+  if (!mg_parse_header(hdr, "response", resp, sizeof(resp))) return 0;
+  if (!mg_parse_header(hdr, "uri", uri, sizeof(uri))) return 0;
+  if (!mg_parse_header(hdr, "qop", qop, sizeof(qop))) return 0;
+  if (!mg_parse_header(hdr, "nc", nc, sizeof(nc))) return 0;
+  if (!mg_parse_header(hdr, "nonce", nonce, sizeof(nonce))) return 0;
+
+  while (fgets(line, sizeof(line), fp) != NULL) {
+    if (sscanf(line, "%[^:]:%[^:]:%s", f_user, f_domain, ha1) == 3 &&
+        !strcmp(user, f_user) &&
+        // NOTE(lsm): due to a bug in MSIE, we do not compare URIs
+        !strcmp(conn->server->config_options[AUTH_DOMAIN], f_domain))
+      return check_password(c->request_method, ha1, uri,
+                            nonce, nc, cnonce, qop, resp);
+  }
+  return MG_FALSE;
+}
+
+
+// Return 1 if request is authorised, 0 otherwise.
+static int is_authorized(struct connection *conn, const char *path,
+                         int is_directory) {
+  FILE *fp;
+  int authorized = MG_TRUE;
+
+  if ((fp = open_auth_file(conn, path, is_directory)) != NULL) {
+    authorized = mg_authorize_digest(&conn->mg_conn, fp);
+    fclose(fp);
+  }
+
+  return authorized;
+}
+
+static int is_authorized_for_dav(struct connection *conn) {
+  const char *auth_file = conn->server->config_options[DAV_AUTH_FILE];
+  const char *method = conn->mg_conn.request_method;
+  FILE *fp;
+  int authorized = MG_FALSE;
+
+  // If dav_auth_file is not set, allow non-authorized PROPFIND
+  if (method != NULL && !strcmp(method, "PROPFIND") && auth_file == NULL) {
+    authorized = MG_TRUE;
+  } else if (auth_file != NULL && (fp = fopen(auth_file, "r")) != NULL) {
+    authorized = mg_authorize_digest(&conn->mg_conn, fp);
+    fclose(fp);
+  }
+
+  return authorized;
+}
+
+static int is_dav_request(const struct connection *conn) {
+  const char *s = conn->mg_conn.request_method;
+  return !strcmp(s, "PUT") || !strcmp(s, "DELETE") ||
+    !strcmp(s, "MKCOL") || !strcmp(s, "PROPFIND");
+}
+#endif // MONGOOSE_NO_AUTH
+
+static int parse_header(const char *str, int str_len, const char *var_name,
+                        char *buf, size_t buf_size) {
+  int ch = ' ', ch1 = ',', len = 0, n = strlen(var_name);
+  const char *p, *end = str + str_len, *s = NULL;
+
+  if (buf != NULL && buf_size > 0) buf[0] = '\0';
+
+  // Find where variable starts
+  for (s = str; s != NULL && s + n < end; s++) {
+    if ((s == str || s[-1] == ch || s[-1] == ch1) && s[n] == '=' &&
+        !memcmp(s, var_name, n)) break;
+  }
+
+  if (s != NULL && &s[n + 1] < end) {
+    s += n + 1;
+    if (*s == '"' || *s == '\'') ch = ch1 = *s++;
+    p = s;
+    while (p < end && p[0] != ch && p[0] != ch1 && len < (int) buf_size) {
+      if (ch == ch1 && p[0] == '\\' && p[1] == ch) p++;
+      buf[len++] = *p++;
+    }
+    if (len >= (int) buf_size || (ch != ' ' && *p != ch)) {
+      len = 0;
+    } else {
+      if (len > 0 && s[len - 1] == ',') len--;
+      if (len > 0 && s[len - 1] == ';') len--;
+      buf[len] = '\0';
+    }
+  }
+
+  return len;
+}
+
+int mg_parse_header(const char *s, const char *var_name, char *buf,
+                    size_t buf_size) {
+  return parse_header(s, s == NULL ? 0 : strlen(s), var_name, buf, buf_size);
+}
+
+#ifndef MONGOOSE_NO_SSI
+static void send_ssi_file(struct mg_connection *, const char *, FILE *, int);
+
+static void send_file_data(struct mg_connection *conn, FILE *fp) {
+  char buf[IOBUF_SIZE];
+  int n;
+  while ((n = fread(buf, 1, sizeof(buf), fp)) > 0) {
+    mg_write(conn, buf, n);
+  }
+}
+
+static void do_ssi_include(struct mg_connection *conn, const char *ssi,
+                           char *tag, int include_level) {
+  char file_name[IOBUF_SIZE], path[MAX_PATH_SIZE], *p;
+  char **opts = (MG_CONN_2_CONN(conn))->server->config_options;
+  FILE *fp;
+
+  // sscanf() is safe here, since send_ssi_file() also uses buffer
+  // of size MG_BUF_LEN to get the tag. So strlen(tag) is always < MG_BUF_LEN.
+  if (sscanf(tag, " virtual=\"%[^\"]\"", file_name) == 1) {
+    // File name is relative to the webserver root
+    mg_snprintf(path, sizeof(path), "%s%c%s",
+                opts[DOCUMENT_ROOT], '/', file_name);
+  } else if (sscanf(tag, " abspath=\"%[^\"]\"", file_name) == 1) {
+    // File name is relative to the webserver working directory
+    // or it is absolute system path
+    mg_snprintf(path, sizeof(path), "%s", file_name);
+  } else if (sscanf(tag, " file=\"%[^\"]\"", file_name) == 1 ||
+             sscanf(tag, " \"%[^\"]\"", file_name) == 1) {
+    // File name is relative to the currect document
+    mg_snprintf(path, sizeof(path), "%s", ssi);
+    if ((p = strrchr(path, '/')) != NULL) {
+      p[1] = '\0';
+    }
+    mg_snprintf(path + strlen(path), sizeof(path) - strlen(path), "%s",
+                file_name);
+  } else {
+    mg_printf(conn, "Bad SSI #include: [%s]", tag);
+    return;
+  }
+
+  if ((fp = fopen(path, "rb")) == NULL) {
+    mg_printf(conn, "Cannot open SSI #include: [%s]: fopen(%s): %s",
+              tag, path, strerror(errno));
+  } else {
+    ns_set_close_on_exec(fileno(fp));
+    if (mg_match_prefix(opts[SSI_PATTERN], strlen(opts[SSI_PATTERN]),
+        path) > 0) {
+      send_ssi_file(conn, path, fp, include_level + 1);
+    } else {
+      send_file_data(conn, fp);
+    }
+    fclose(fp);
+  }
+}
+
+#ifndef MONGOOSE_NO_POPEN
+static void do_ssi_exec(struct mg_connection *conn, char *tag) {
+  char cmd[IOBUF_SIZE];
+  FILE *fp;
+
+  if (sscanf(tag, " \"%[^\"]\"", cmd) != 1) {
+    mg_printf(conn, "Bad SSI #exec: [%s]", tag);
+  } else if ((fp = popen(cmd, "r")) == NULL) {
+    mg_printf(conn, "Cannot SSI #exec: [%s]: %s", cmd, strerror(errno));
+  } else {
+    send_file_data(conn, fp);
+    pclose(fp);
+  }
+}
+#endif // !MONGOOSE_NO_POPEN
+
+static void send_ssi_file(struct mg_connection *conn, const char *path,
+                          FILE *fp, int include_level) {
+  char buf[IOBUF_SIZE];
+  int ch, offset, len, in_ssi_tag;
+
+  if (include_level > 10) {
+    mg_printf(conn, "SSI #include level is too deep (%s)", path);
+    return;
+  }
+
+  in_ssi_tag = len = offset = 0;
+  while ((ch = fgetc(fp)) != EOF) {
+    if (in_ssi_tag && ch == '>') {
+      in_ssi_tag = 0;
+      buf[len++] = (char) ch;
+      buf[len] = '\0';
+      assert(len <= (int) sizeof(buf));
+      if (len < 6 || memcmp(buf, "<!--#", 5) != 0) {
+        // Not an SSI tag, pass it
+        (void) mg_write(conn, buf, (size_t) len);
+      } else {
+        if (!memcmp(buf + 5, "include", 7)) {
+          do_ssi_include(conn, path, buf + 12, include_level);
+#if !defined(MONGOOSE_NO_POPEN)
+        } else if (!memcmp(buf + 5, "exec", 4)) {
+          do_ssi_exec(conn, buf + 9);
+#endif // !NO_POPEN
+        } else {
+          mg_printf(conn, "%s: unknown SSI " "command: \"%s\"", path, buf);
+        }
+      }
+      len = 0;
+    } else if (in_ssi_tag) {
+      if (len == 5 && memcmp(buf, "<!--#", 5) != 0) {
+        // Not an SSI tag
+        in_ssi_tag = 0;
+      } else if (len == (int) sizeof(buf) - 2) {
+        mg_printf(conn, "%s: SSI tag is too large", path);
+        len = 0;
+      }
+      buf[len++] = ch & 0xff;
+    } else if (ch == '<') {
+      in_ssi_tag = 1;
+      if (len > 0) {
+        mg_write(conn, buf, (size_t) len);
+      }
+      len = 0;
+      buf[len++] = ch & 0xff;
+    } else {
+      buf[len++] = ch & 0xff;
+      if (len == (int) sizeof(buf)) {
+        mg_write(conn, buf, (size_t) len);
+        len = 0;
+      }
+    }
+  }
+
+  // Send the rest of buffered data
+  if (len > 0) {
+    mg_write(conn, buf, (size_t) len);
+  }
+}
+
+static void handle_ssi_request(struct connection *conn, const char *path) {
+  FILE *fp;
+  struct vec mime_vec;
+
+  if ((fp = fopen(path, "rb")) == NULL) {
+    send_http_error(conn, 500, "fopen(%s): %s", path, strerror(errno));
+  } else {
+    ns_set_close_on_exec(fileno(fp));
+    get_mime_type(conn->server, path, &mime_vec);
+    conn->mg_conn.status_code = 200;
+    mg_printf(&conn->mg_conn,
+              "HTTP/1.1 %d OK\r\n"
+              "Content-Type: %.*s\r\n"
+              "Connection: close\r\n\r\n",
+              conn->mg_conn.status_code, (int) mime_vec.len, mime_vec.ptr);
+    send_ssi_file(&conn->mg_conn, path, fp, 0);
+    fclose(fp);
+    close_local_endpoint(conn);
+  }
+}
+#endif
+
+static void proxy_request(struct ns_connection *pc, struct mg_connection *c) {
+  int i, sent_close_header = 0;
+
+  ns_printf(pc, "%s %s%s%s HTTP/%s\r\n", c->request_method, c->uri,
+            c->query_string ? "?" : "",
+            c->query_string ? c->query_string : "",
+            c->http_version);
+  for (i = 0; i < c->num_headers; i++) {
+    if (mg_strcasecmp(c->http_headers[i].name, "Connection") == 0) {
+      // Force connection close, cause we don't parse proxy replies
+      // therefore we don't know message boundaries
+      ns_printf(pc, "%s: %s\r\n", "Connection", "close");
+      sent_close_header = 1;
+    } else {
+      ns_printf(pc, "%s: %s\r\n", c->http_headers[i].name,
+                c->http_headers[i].value);
+    }
+  }
+  if (!sent_close_header) {
+    ns_printf(pc, "%s: %s\r\n", "Connection", "close");
+  }
+  ns_printf(pc, "%s", "\r\n");
+  ns_send(pc, c->content, c->content_len);
+
+}
+
+#ifdef NS_ENABLE_SSL
+int mg_terminate_ssl(struct mg_connection *c, const char *cert) {
+  static const char ok[] = "HTTP/1.0 200 OK\r\n\r\n";
+  struct connection *conn = MG_CONN_2_CONN(c);
+  SSL_CTX *ctx;
+
+  DBG(("%p MITM", conn));
+  if ((ctx = SSL_CTX_new(SSLv23_server_method())) == NULL) return 0;
+
+  SSL_CTX_use_certificate_file(ctx, cert, 1);
+  SSL_CTX_use_PrivateKey_file(ctx, cert, 1);
+  SSL_CTX_use_certificate_chain_file(ctx, cert);
+
+  // When clear-text reply is pushed to client, switch to SSL mode.
+  // TODO(lsm): check for send() failure
+  send(conn->ns_conn->sock, ok, sizeof(ok) - 1, 0);
+  //DBG(("%p %lu %d SEND", c, (unsigned long) sizeof(ok) - 1, n));
+  conn->ns_conn->send_iobuf.len = 0;
+  conn->endpoint_type = EP_USER;  // To keep-alive in close_local_endpoint()
+  close_local_endpoint(conn);     // Clean up current CONNECT request
+  if ((conn->ns_conn->ssl = SSL_new(ctx)) != NULL) {
+    SSL_set_fd(conn->ns_conn->ssl, conn->ns_conn->sock);
+  }
+  SSL_CTX_free(ctx);
+  return 1;
+}
+#endif
+
+int mg_forward(struct mg_connection *c, const char *addr) {
+  static const char ok[] = "HTTP/1.1 200 OK\r\n\r\n";
+  struct connection *conn = MG_CONN_2_CONN(c);
+  struct ns_connection *pc;
+
+  if ((pc = ns_connect(&conn->server->ns_mgr, addr,
+      mg_ev_handler, conn)) == NULL) {
+    conn->ns_conn->flags |= NSF_CLOSE_IMMEDIATELY;
+    return 0;
+  }
+
+  // Interlink two connections
+  pc->flags |= MG_PROXY_CONN;
+  conn->endpoint_type = EP_PROXY;
+  conn->endpoint.nc = pc;
+  DBG(("%p [%s] [%s] -> %p %p", conn, c->uri, addr, pc, conn->ns_conn->ssl));
+
+  if (strcmp(c->request_method, "CONNECT") == 0) {
+    // For CONNECT request, reply with 200 OK. Tunnel is established.
+    // TODO(lsm): check for send() failure
+    (void) send(conn->ns_conn->sock, ok, sizeof(ok) - 1, 0);
+  } else {
+    // Strip "http://host:port" part from the URI
+    if (memcmp(c->uri, "http://", 7) == 0) c->uri += 7;
+    while (*c->uri != '\0' && *c->uri != '/') c->uri++;
+    proxy_request(pc, c);
+  }
+  return 1;
+}
+
+static void proxify_connection(struct connection *conn) {
+  char proto[10], host[500], cert[500], addr[1000];
+  unsigned short port = 80;
+  struct mg_connection *c = &conn->mg_conn;
+  int n = 0;
+  const char *url = c->uri;
+
+  proto[0] = host[0] = cert[0] = '\0';
+  if (sscanf(url, "%499[^: ]:%hu%n", host, &port, &n) != 2 &&
+      sscanf(url, "%9[a-z]://%499[^: ]:%hu%n", proto, host, &port, &n) != 3 &&
+      sscanf(url, "%9[a-z]://%499[^/ ]%n", proto, host, &n) != 2) {
+    n = 0;
+  }
+
+  snprintf(addr, sizeof(addr), "%s://%s:%hu",
+           conn->ns_conn->ssl != NULL ? "ssl" : "tcp", host, port);
+  if (n <= 0 || !mg_forward(c, addr)) {
+    conn->ns_conn->flags |= NSF_CLOSE_IMMEDIATELY;
+  }
+}
+
+#ifndef MONGOOSE_NO_FILESYSTEM
+void mg_send_file_internal(struct mg_connection *c, const char *file_name,
+                           file_stat_t *st, int exists,
+                           const char *extra_headers) {
+  struct connection *conn = MG_CONN_2_CONN(c);
+  char path[MAX_PATH_SIZE];
+  const int is_directory = S_ISDIR(st->st_mode);
+#ifndef MONGOOSE_NO_CGI
+  const char *cgi_pat = conn->server->config_options[CGI_PATTERN];
+#else
+  const char *cgi_pat = DEFAULT_CGI_PATTERN;
+#endif
+#ifndef MONGOOSE_NO_DIRECTORY_LISTING
+  const char *dir_lst = conn->server->config_options[ENABLE_DIRECTORY_LISTING];
+#else
+  const char *dir_lst = "yes";
+#endif
+
+  mg_snprintf(path, sizeof(path), "%s", file_name);
+
+  if (!exists || must_hide_file(conn, path)) {
+    send_http_error(conn, 404, NULL);
+  } else if (is_directory &&
+             conn->mg_conn.uri[strlen(conn->mg_conn.uri) - 1] != '/') {
+    conn->mg_conn.status_code = 301;
+    mg_printf(&conn->mg_conn, "HTTP/1.1 301 Moved Permanently\r\n"
+              "Location: %s/\r\n\r\n", conn->mg_conn.uri);
+    close_local_endpoint(conn);
+  } else if (is_directory && !find_index_file(conn, path, sizeof(path), st)) {
+    if (!mg_strcasecmp(dir_lst, "yes")) {
+#ifndef MONGOOSE_NO_DIRECTORY_LISTING
+      send_directory_listing(conn, path);
+#else
+      send_http_error(conn, 501, NULL);
+#endif
+    } else {
+      send_http_error(conn, 403, NULL);
+    }
+  } else if (mg_match_prefix(cgi_pat, strlen(cgi_pat), path) > 0) {
+#if !defined(MONGOOSE_NO_CGI)
+    open_cgi_endpoint(conn, path);
+#else
+    send_http_error(conn, 501, NULL);
+#endif // !MONGOOSE_NO_CGI
+#ifndef MONGOOSE_NO_SSI
+  } else if (mg_match_prefix(conn->server->config_options[SSI_PATTERN],
+                             strlen(conn->server->config_options[SSI_PATTERN]),
+                             path) > 0) {
+    handle_ssi_request(conn, path);
+#endif
+  } else if (is_not_modified(conn, st)) {
+    send_http_error(conn, 304, NULL);
+  } else if ((conn->endpoint.fd = open(path, O_RDONLY | O_BINARY, 0)) != -1) {
+    // O_BINARY is required for Windows, otherwise in default text mode
+    // two bytes \r\n will be read as one.
+    open_file_endpoint(conn, path, st, extra_headers);
+  } else {
+    send_http_error(conn, 404, NULL);
+  }
+}
+void mg_send_file(struct mg_connection *c, const char *file_name,
+                  const char *extra_headers) {
+  file_stat_t st;
+  const int exists = stat(file_name, &st) == 0;
+  mg_send_file_internal(c, file_name, &st, exists, extra_headers);
+}
+#endif  // !MONGOOSE_NO_FILESYSTEM
+
+static void open_local_endpoint(struct connection *conn, int skip_user) {
+#ifndef MONGOOSE_NO_FILESYSTEM
+  char path[MAX_PATH_SIZE];
+  file_stat_t st;
+  int exists = 0;
+#endif
+
+  // If EP_USER was set in a prev call, reset it
+  conn->endpoint_type = EP_NONE;
+
+#ifndef MONGOOSE_NO_AUTH
+  if (conn->server->event_handler && call_user(conn, MG_AUTH) == MG_FALSE) {
+    mg_send_digest_auth_request(&conn->mg_conn);
+    return;
+  }
+#endif
+
+  // Call URI handler if one is registered for this URI
+  if (skip_user == 0 && conn->server->event_handler != NULL) {
+    conn->endpoint_type = EP_USER;
+#if MONGOOSE_POST_SIZE_LIMIT > 1
+    {
+      const char *cl = mg_get_header(&conn->mg_conn, "Content-Length");
+      if ((strcmp(conn->mg_conn.request_method, "POST") == 0 ||
+           strcmp(conn->mg_conn.request_method, "PUT") == 0) &&
+          (cl == NULL || to64(cl) > MONGOOSE_POST_SIZE_LIMIT)) {
+        send_http_error(conn, 500, "POST size > %lu",
+                        (unsigned long) MONGOOSE_POST_SIZE_LIMIT);
+      }
+    }
+#endif
+    return;
+  }
+
+  if (strcmp(conn->mg_conn.request_method, "CONNECT") == 0 ||
+      mg_strncasecmp(conn->mg_conn.uri, "http", 4) == 0) {
+    const char *enp = conn->server->config_options[ENABLE_PROXY];
+    if (enp == NULL || strcmp(enp, "yes") != 0) {
+      send_http_error(conn, 405, NULL);
+    } else {
+      proxify_connection(conn);
+    }
+    return;
+  }
+
+  if (!strcmp(conn->mg_conn.request_method, "OPTIONS")) {
+    send_options(conn);
+    return;
+  }
+
+#ifdef MONGOOSE_NO_FILESYSTEM
+  send_http_error(conn, 404, NULL);
+#else
+  exists = convert_uri_to_file_name(conn, path, sizeof(path), &st);
+
+  if (!strcmp(conn->mg_conn.request_method, "OPTIONS")) {
+    send_options(conn);
+  } else if (conn->server->config_options[DOCUMENT_ROOT] == NULL) {
+    send_http_error(conn, 404, NULL);
+#ifndef MONGOOSE_NO_AUTH
+  } else if ((!is_dav_request(conn) && !is_authorized(conn, path,
+               exists && S_ISDIR(st.st_mode))) ||
+             (is_dav_request(conn) && !is_authorized_for_dav(conn))) {
+    mg_send_digest_auth_request(&conn->mg_conn);
+    close_local_endpoint(conn);
+#endif
+#ifndef MONGOOSE_NO_DAV
+  } else if (must_hide_file(conn, path)) {
+    send_http_error(conn, 404, NULL);
+  } else if (!strcmp(conn->mg_conn.request_method, "PROPFIND")) {
+    handle_propfind(conn, path, &st, exists);
+  } else if (!strcmp(conn->mg_conn.request_method, "MKCOL")) {
+    handle_mkcol(conn, path);
+  } else if (!strcmp(conn->mg_conn.request_method, "DELETE")) {
+    handle_delete(conn, path);
+  } else if (!strcmp(conn->mg_conn.request_method, "PUT")) {
+    handle_put(conn, path);
+#endif
+  } else {
+    mg_send_file_internal(&conn->mg_conn, path, &st, exists, NULL);
+  }
+#endif  // MONGOOSE_NO_FILESYSTEM
+}
+
+static void send_continue_if_expected(struct connection *conn) {
+  static const char expect_response[] = "HTTP/1.1 100 Continue\r\n\r\n";
+  const char *expect_hdr = mg_get_header(&conn->mg_conn, "Expect");
+
+  if (expect_hdr != NULL && !mg_strcasecmp(expect_hdr, "100-continue")) {
+    ns_send(conn->ns_conn, expect_response, sizeof(expect_response) - 1);
+  }
+}
+
+// Conform to http://www.w3.org/Protocols/rfc2616/rfc2616-sec5.html#sec5.1.2
+static int is_valid_uri(const char *uri) {
+  unsigned short n;
+  return uri[0] == '/' ||
+    strcmp(uri, "*") == 0 ||            // OPTIONS method can use asterisk URI
+    mg_strncasecmp(uri, "http", 4) == 0 || // Naive check for the absolute URI
+    sscanf(uri, "%*[^ :]:%hu", &n) > 0; // CONNECT method can use host:port
+}
+
+static void try_parse(struct connection *conn) {
+  struct iobuf *io = &conn->ns_conn->recv_iobuf;
+
+  if (conn->request_len == 0 &&
+      (conn->request_len = get_request_len(io->buf, io->len)) > 0) {
+    // If request is buffered in, remove it from the iobuf. This is because
+    // iobuf could be reallocated, and pointers in parsed request could
+    // become invalid.
+    conn->request = (char *) NS_MALLOC(conn->request_len);
+    memcpy(conn->request, io->buf, conn->request_len);
+    //DBG(("%p [%.*s]", conn, conn->request_len, conn->request));
+    iobuf_remove(io, conn->request_len);
+    conn->request_len = parse_http_message(conn->request, conn->request_len,
+                                           &conn->mg_conn);
+    if (conn->request_len > 0) {
+      const char *cl_hdr = mg_get_header(&conn->mg_conn, "Content-Length");
+      conn->cl = cl_hdr == NULL ? 0 : to64(cl_hdr);
+      conn->mg_conn.content_len = (size_t) conn->cl;
+    }
+  }
+}
+
+static void do_proxy(struct connection *conn) {
+  if (0 && conn->request_len == 0) {
+    try_parse(conn);
+    DBG(("%p parsing -> %d", conn, conn->request_len));
+    if (conn->request_len > 0 && call_user(conn, MG_REQUEST) == MG_FALSE) {
+      proxy_request(conn->endpoint.nc, &conn->mg_conn);
+    } else if (conn->request_len < 0) {
+      ns_forward(conn->ns_conn, conn->endpoint.nc);
+    }
+  } else {
+    DBG(("%p forwarding", conn));
+    ns_forward(conn->ns_conn, conn->endpoint.nc);
+  }
+}
+
+static void on_recv_data(struct connection *conn) {
+  struct iobuf *io = &conn->ns_conn->recv_iobuf;
+  int n;
+
+  if (conn->endpoint_type == EP_PROXY) {
+    if (conn->endpoint.nc != NULL) do_proxy(conn);
+    return;
+  }
+
+  try_parse(conn);
+  DBG(("%p %d %lu %d", conn, conn->request_len, (unsigned long)io->len,
+       conn->ns_conn->flags));
+  if (conn->request_len < 0 ||
+      (conn->request_len > 0 && !is_valid_uri(conn->mg_conn.uri))) {
+    send_http_error(conn, 400, NULL);
+  } else if (conn->request_len == 0 && io->len > MAX_REQUEST_SIZE) {
+    send_http_error(conn, 413, NULL);
+  } else if (conn->request_len > 0 &&
+             strcmp(conn->mg_conn.http_version, "1.0") != 0 &&
+             strcmp(conn->mg_conn.http_version, "1.1") != 0) {
+    send_http_error(conn, 505, NULL);
+  } else if (conn->request_len > 0 && conn->endpoint_type == EP_NONE) {
+#ifndef MONGOOSE_NO_WEBSOCKET
+    send_websocket_handshake_if_requested(&conn->mg_conn);
+#endif
+    send_continue_if_expected(conn);
+    open_local_endpoint(conn, 0);
+  }
+
+#ifndef MONGOOSE_NO_CGI
+  if (conn->endpoint_type == EP_CGI && conn->endpoint.nc != NULL) {
+    ns_forward(conn->ns_conn, conn->endpoint.nc);
+  }
+#endif
+  if (conn->endpoint_type == EP_USER) {
+    conn->mg_conn.content = io->buf;
+    conn->mg_conn.content_len = io->len;
+    n = call_user(conn, MG_RECV);
+    if (n < 0) {
+      conn->ns_conn->flags |= NSF_FINISHED_SENDING_DATA;
+    } else if ((size_t) n <= io->len) {
+      iobuf_remove(io, n);
+    }
+    call_request_handler_if_data_is_buffered(conn);
+  }
+#ifndef MONGOOSE_NO_DAV
+  if (conn->endpoint_type == EP_PUT && io->len > 0) {
+    forward_put_data(conn);
+  }
+#endif
+}
+
+static void call_http_client_handler(struct connection *conn) {
+  //conn->mg_conn.status_code = code;
+  // For responses without Content-Lengh, use the whole buffer
+  if (conn->cl == 0) {
+    conn->mg_conn.content_len = conn->ns_conn->recv_iobuf.len;
+  }
+  conn->mg_conn.content = conn->ns_conn->recv_iobuf.buf;
+  if (call_user(conn, MG_REPLY) == MG_FALSE) {
+    conn->ns_conn->flags |= NSF_CLOSE_IMMEDIATELY;
+  }
+  iobuf_remove(&conn->ns_conn->recv_iobuf, conn->mg_conn.content_len);
+  conn->mg_conn.status_code = 0;
+  conn->cl = conn->num_bytes_recv = conn->request_len = 0;
+  NS_FREE(conn->request);
+  conn->request = NULL;
+}
+
+static void process_response(struct connection *conn) {
+  struct iobuf *io = &conn->ns_conn->recv_iobuf;
+
+  try_parse(conn);
+  DBG(("%p %d %lu", conn, conn->request_len, (unsigned long)io->len));
+  if (conn->request_len < 0 ||
+      (conn->request_len == 0 && io->len > MAX_REQUEST_SIZE)) {
+    call_http_client_handler(conn);
+  } else if ((int64_t) io->len >= conn->cl) {
+    call_http_client_handler(conn);
+  }
+}
+
+struct mg_connection *mg_connect(struct mg_server *server, const char *addr) {
+  struct ns_connection *nsconn;
+  struct connection *conn;
+
+  nsconn = ns_connect(&server->ns_mgr, addr, mg_ev_handler, NULL);
+  if (nsconn == NULL) return 0;
+
+  if ((conn = (struct connection *) NS_CALLOC(1, sizeof(*conn))) == NULL) {
+    nsconn->flags |= NSF_CLOSE_IMMEDIATELY;
+    return 0;
+  }
+
+  // Interlink two structs
+  conn->ns_conn = nsconn;
+  nsconn->user_data = conn;
+
+  conn->server = server;
+  conn->endpoint_type = EP_CLIENT;
+  //conn->handler = handler;
+  conn->mg_conn.server_param = server->ns_mgr.user_data;
+  conn->ns_conn->flags = NSF_CONNECTING;
+
+  return &conn->mg_conn;
+}
+
+#ifndef MONGOOSE_NO_LOGGING
+static void log_header(const struct mg_connection *conn, const char *header,
+                       FILE *fp) {
+  const char *header_value;
+
+  if ((header_value = mg_get_header(conn, header)) == NULL) {
+    (void) fprintf(fp, "%s", " -");
+  } else {
+    (void) fprintf(fp, " \"%s\"", header_value);
+  }
+}
+
+static void log_access(const struct connection *conn, const char *path) {
+  const struct mg_connection *c = &conn->mg_conn;
+  FILE *fp = (path == NULL) ?  NULL : fopen(path, "a+");
+  char date[64], user[100];
+  time_t now;
+
+  if (fp == NULL) return;
+  now = time(NULL);
+  strftime(date, sizeof(date), "%d/%b/%Y:%H:%M:%S %z", localtime(&now));
+
+  flockfile(fp);
+  mg_parse_header(mg_get_header(&conn->mg_conn, "Authorization"), "username",
+                  user, sizeof(user));
+  fprintf(fp, "%s - %s [%s] \"%s %s%s%s HTTP/%s\" %d 0",
+          c->remote_ip, user[0] == '\0' ? "-" : user, date,
+          c->request_method ? c->request_method : "-",
+          c->uri ? c->uri : "-", c->query_string ? "?" : "",
+          c->query_string ? c->query_string : "",
+          c->http_version, c->status_code);
+  log_header(c, "Referer", fp);
+  log_header(c, "User-Agent", fp);
+  fputc('\n', fp);
+  fflush(fp);
+
+  funlockfile(fp);
+  fclose(fp);
+}
+#endif
+
+static void close_local_endpoint(struct connection *conn) {
+  struct mg_connection *c = &conn->mg_conn;
+  // Must be done before free()
+  int keep_alive = should_keep_alive(&conn->mg_conn) &&
+    (conn->endpoint_type == EP_FILE || conn->endpoint_type == EP_USER);
+  DBG(("%p %d %d %d", conn, conn->endpoint_type, keep_alive,
+       conn->ns_conn->flags));
+
+  switch (conn->endpoint_type) {
+    case EP_PUT:
+    case EP_FILE:
+      close(conn->endpoint.fd);
+      break;
+    case EP_CGI:
+    case EP_PROXY:
+      if (conn->endpoint.nc != NULL) {
+        DBG(("%p %p %p :-)", conn, conn->ns_conn, conn->endpoint.nc));
+        conn->endpoint.nc->flags |= NSF_CLOSE_IMMEDIATELY;
+        conn->endpoint.nc->user_data = NULL;
+      }
+      break;
+    default: break;
+  }
+
+#ifndef MONGOOSE_NO_LOGGING
+  if (c->status_code > 0 && conn->endpoint_type != EP_CLIENT &&
+      c->status_code != 400) {
+    log_access(conn, conn->server->config_options[ACCESS_LOG_FILE]);
+  }
+#endif
+
+  // Gobble possible POST data sent to the URI handler
+  iobuf_free(&conn->ns_conn->recv_iobuf);
+  NS_FREE(conn->request);
+  NS_FREE(conn->path_info);
+  conn->endpoint.nc = NULL;
+  conn->request = conn->path_info = NULL;
+
+  conn->endpoint_type = EP_NONE;
+  conn->cl = conn->num_bytes_recv = conn->request_len = 0;
+  conn->ns_conn->flags &= ~(NSF_FINISHED_SENDING_DATA |
+                            NSF_BUFFER_BUT_DONT_SEND | NSF_CLOSE_IMMEDIATELY |
+                            MG_HEADERS_SENT | MG_LONG_RUNNING);
+
+  // Do not memset() the whole structure, as some of the fields
+  // (IP addresses & ports, server_param) must survive. Nullify the rest.
+  c->request_method = c->uri = c->http_version = c->query_string = NULL;
+  c->num_headers = c->status_code = c->is_websocket = c->content_len = 0;
+  c->connection_param = c->callback_param = NULL;
+
+  if (keep_alive) {
+    on_recv_data(conn);  // Can call us recursively if pipelining is used
+  } else {
+    conn->ns_conn->flags |= conn->ns_conn->send_iobuf.len == 0 ?
+      NSF_CLOSE_IMMEDIATELY : NSF_FINISHED_SENDING_DATA;
+  }
+}
+
+static void transfer_file_data(struct connection *conn) {
+  char buf[IOBUF_SIZE];
+  int n;
+
+  // If output buffer is too big, don't send anything. Wait until
+  // mongoose drains already buffered data to the client.
+  if (conn->ns_conn->send_iobuf.len > sizeof(buf) * 2) return;
+
+  // Do not send anyt
+  n = read(conn->endpoint.fd, buf, conn->cl < (int64_t) sizeof(buf) ?
+           (int) conn->cl : (int) sizeof(buf));
+
+  if (n <= 0) {
+    close_local_endpoint(conn);
+  } else if (n > 0) {
+    conn->cl -= n;
+    ns_send(conn->ns_conn, buf, n);
+    if (conn->cl <= 0) {
+      close_local_endpoint(conn);
+    }
+  }
+}
+
+int mg_poll_server(struct mg_server *server, int milliseconds) {
+  return ns_mgr_poll(&server->ns_mgr, milliseconds);
+}
+
+void mg_destroy_server(struct mg_server **server) {
+  if (server != NULL && *server != NULL) {
+    struct mg_server *s = *server;
+    int i;
+
+    ns_mgr_free(&s->ns_mgr);
+    for (i = 0; i < (int) ARRAY_SIZE(s->config_options); i++) {
+      NS_FREE(s->config_options[i]);  // It is OK to free(NULL)
+    }
+    NS_FREE(s);
+    *server = NULL;
+  }
+}
+
+struct mg_connection *mg_next(struct mg_server *s, struct mg_connection *c) {
+  struct ns_connection *nc = ns_next(&s->ns_mgr, c == NULL ? NULL :
+                                     MG_CONN_2_CONN(c)->ns_conn);
+  if (nc != NULL && nc->user_data != NULL) {
+    return & ((struct connection *) nc->user_data)->mg_conn;
+  } else {
+    return NULL;
+  }
+}
+
+static int get_var(const char *data, size_t data_len, const char *name,
+                   char *dst, size_t dst_len) {
+  const char *p, *e, *s;
+  size_t name_len;
+  int len;
+
+  if (dst == NULL || dst_len == 0) {
+    len = -2;
+  } else if (data == NULL || name == NULL || data_len == 0) {
+    len = -1;
+    dst[0] = '\0';
+  } else {
+    name_len = strlen(name);
+    e = data + data_len;
+    len = -1;
+    dst[0] = '\0';
+
+    // data is "var1=val1&var2=val2...". Find variable first
+    for (p = data; p + name_len < e; p++) {
+      if ((p == data || p[-1] == '&') && p[name_len] == '=' &&
+          !mg_strncasecmp(name, p, name_len)) {
+
+        // Point p to variable value
+        p += name_len + 1;
+
+        // Point s to the end of the value
+        s = (const char *) memchr(p, '&', (size_t)(e - p));
+        if (s == NULL) {
+          s = e;
+        }
+        assert(s >= p);
+
+        // Decode variable into destination buffer
+        len = mg_url_decode(p, (size_t)(s - p), dst, dst_len, 1);
+
+        // Redirect error code from -1 to -2 (destination buffer too small).
+        if (len == -1) {
+          len = -2;
+        }
+        break;
+      }
+    }
+  }
+
+  return len;
+}
+
+int mg_get_var(const struct mg_connection *conn, const char *name,
+               char *dst, size_t dst_len) {
+  int len = get_var(conn->query_string, conn->query_string == NULL ? 0 :
+                    strlen(conn->query_string), name, dst, dst_len);
+  if (len < 0) {
+    len = get_var(conn->content, conn->content_len, name, dst, dst_len);
+  }
+  return len;
+}
+
+static int get_line_len(const char *buf, int buf_len) {
+  int len = 0;
+  while (len < buf_len && buf[len] != '\n') len++;
+  return buf[len] == '\n' ? len + 1: -1;
+}
+
+int mg_parse_multipart(const char *buf, int buf_len,
+                       char *var_name, int var_name_len,
+                       char *file_name, int file_name_len,
+                       const char **data, int *data_len) {
+  static const char cd[] = "Content-Disposition: ";
+  //struct mg_connection c;
+  int hl, bl, n, ll, pos, cdl = sizeof(cd) - 1;
+  //char *p;
+
+  if (buf == NULL || buf_len <= 0) return 0;
+  if ((hl = get_request_len(buf, buf_len)) <= 0) return 0;
+  if (buf[0] != '-' || buf[1] != '-' || buf[2] == '\n') return 0;
+
+  // Get boundary length
+  bl = get_line_len(buf, buf_len);
+
+  // Loop through headers, fetch variable name and file name
+  var_name[0] = file_name[0] = '\0';
+  for (n = bl; (ll = get_line_len(buf + n, hl - n)) > 0; n += ll) {
+    if (mg_strncasecmp(cd, buf + n, cdl) == 0) {
+      parse_header(buf + n + cdl, ll - (cdl + 2), "name",
+                   var_name, var_name_len);
+      parse_header(buf + n + cdl, ll - (cdl + 2), "filename",
+                   file_name, file_name_len);
+    }
+  }
+
+  // Scan body, search for terminating boundary
+  for (pos = hl; pos + (bl - 2) < buf_len; pos++) {
+    if (buf[pos] == '-' && !memcmp(buf, &buf[pos], bl - 2)) {
+      if (data_len != NULL) *data_len = (pos - 2) - hl;
+      if (data != NULL) *data = buf + hl;
+      return pos;
+    }
+  }
+
+  return 0;
+}
+
+const char **mg_get_valid_option_names(void) {
+  return static_config_options;
+}
+
+void mg_copy_listeners(struct mg_server *s, struct mg_server *to) {
+  struct ns_connection *c;
+  for (c = ns_next(&s->ns_mgr, NULL); c != NULL; c = ns_next(&s->ns_mgr, c)) {
+    struct ns_connection *tmp;
+    if ((c->flags & NSF_LISTENING) &&
+        (tmp = (struct ns_connection *) NS_MALLOC(sizeof(*tmp))) != NULL) {
+      memcpy(tmp, c, sizeof(*tmp));
+      tmp->mgr = &to->ns_mgr;
+      ns_add_conn(tmp->mgr, tmp);
+    }
+  }
+}
+
+static int get_option_index(const char *name) {
+  int i;
+
+  for (i = 0; static_config_options[i * 2] != NULL; i++) {
+    if (strcmp(static_config_options[i * 2], name) == 0) {
+      return i;
+    }
+  }
+  return -1;
+}
+
+static void set_default_option_values(char **opts) {
+  const char *value, **all_opts = mg_get_valid_option_names();
+  int i;
+
+  for (i = 0; all_opts[i * 2] != NULL; i++) {
+    value = all_opts[i * 2 + 1];
+    if (opts[i] == NULL && value != NULL) {
+      opts[i] = mg_strdup(value);
+    }
+  }
+}
+
+const char *mg_set_option(struct mg_server *server, const char *name,
+                          const char *value) {
+  int ind = get_option_index(name);
+  const char *error_msg = NULL;
+  char **v = NULL;
+
+  if (ind < 0) return  "No such option";
+  v = &server->config_options[ind];
+
+  // Return success immediately if setting to the same value
+  if ((*v == NULL && value == NULL) ||
+      (value != NULL && *v != NULL && !strcmp(value, *v))) {
+    return NULL;
+  }
+
+  if (*v != NULL) {
+    NS_FREE(*v);
+    *v = NULL;
+  }
+
+  if (value == NULL || value[0] == '\0') return NULL;
+
+  *v = mg_strdup(value);
+  DBG(("%s [%s]", name, *v));
+
+  if (ind == LISTENING_PORT) {
+    struct vec vec;
+    while ((value = next_option(value, &vec, NULL)) != NULL) {
+      struct ns_connection *c = ns_bind(&server->ns_mgr, vec.ptr,
+                                        mg_ev_handler, NULL);
+      if (c== NULL) {
+        error_msg = "Cannot bind to port";
+        break;
+      } else {
+        char buf[100];
+        ns_sock_to_str(c->sock, buf, sizeof(buf), 2);
+        NS_FREE(*v);
+        *v = mg_strdup(buf);
+      }
+    }
+#ifndef MONGOOSE_NO_FILESYSTEM
+  } else if (ind == HEXDUMP_FILE) {
+    server->ns_mgr.hexdump_file = *v;
+#endif
+#if !defined(_WIN32) && !defined(MONGOOSE_NO_USER)
+  } else if (ind == RUN_AS_USER) {
+    struct passwd *pw;
+    if ((pw = getpwnam(value)) == NULL) {
+      error_msg = "Unknown user";
+    } else if (setgid(pw->pw_gid) != 0) {
+      error_msg = "setgid() failed";
+    } else if (setuid(pw->pw_uid) != 0) {
+      error_msg = "setuid() failed";
+    }
+#endif
+  }
+
+  return error_msg;
+}
+
+static void set_ips(struct ns_connection *nc, int is_rem) {
+  struct connection *conn = (struct connection *) nc->user_data;
+  struct mg_connection *c = &conn->mg_conn;
+  char buf[100];
+
+  ns_sock_to_str(nc->sock, buf, sizeof(buf), is_rem ? 7 : 3);
+  sscanf(buf, "%47[^:]:%hu",
+         is_rem ? c->remote_ip : c->local_ip,
+         is_rem ? &c->remote_port : &c->local_port);
+  //DBG(("%p %s %s", conn, is_rem ? "rem" : "loc", buf));
+}
+
+static void on_accept(struct ns_connection *nc, union socket_address *sa) {
+  struct mg_server *server = (struct mg_server *) nc->mgr;
+  struct connection *conn;
+
+  if (!check_acl(server->config_options[ACCESS_CONTROL_LIST],
+                 ntohl(* (uint32_t *) &sa->sin.sin_addr)) ||
+      (conn = (struct connection *) NS_CALLOC(1, sizeof(*conn))) == NULL) {
+    nc->flags |= NSF_CLOSE_IMMEDIATELY;
+  } else {
+    // Circularly link two connection structures
+    nc->user_data = conn;
+    conn->ns_conn = nc;
+
+    // Initialize the rest of connection attributes
+    conn->server = server;
+    conn->mg_conn.server_param = nc->mgr->user_data;
+    set_ips(nc, 1);
+    set_ips(nc, 0);
+  }
+}
+
+static void process_udp(struct ns_connection *nc) {
+  struct iobuf *io = &nc->recv_iobuf;
+  struct connection conn;
+
+  memset(&conn, 0, sizeof(conn));
+  conn.ns_conn = nc;
+  conn.server = (struct mg_server *) nc->mgr;
+  conn.request_len = parse_http_message(io->buf, io->len, &conn.mg_conn);
+  on_recv_data(&conn);
+  //ns_printf(nc, "%s", "HTTP/1.0 200 OK\r\n\r\n");
+}
+
+static void mg_ev_handler(struct ns_connection *nc, int ev, void *p) {
+  struct connection *conn = (struct connection *) nc->user_data;
+
+  // Send NS event to the handler. Note that call_user won't send an event
+  // if conn == NULL. Therefore, repeat this for NS_ACCEPT event as well.
+#ifdef MONGOOSE_SEND_NS_EVENTS
+  {
+    struct connection *conn = (struct connection *) nc->user_data;
+    void *param[2] = { nc, p };
+    if (conn != NULL) conn->mg_conn.callback_param = param;
+    call_user(conn, (enum mg_event) ev);
+  }
+#endif
+
+  switch (ev) {
+    case NS_ACCEPT:
+      on_accept(nc, (union socket_address *) p);
+#ifdef MONGOOSE_SEND_NS_EVENTS
+      {
+        struct connection *conn = (struct connection *) nc->user_data;
+        void *param[2] = { nc, p };
+        if (conn != NULL) conn->mg_conn.callback_param = param;
+        call_user(conn, (enum mg_event) ev);
+      }
+#endif
+      break;
+
+    case NS_CONNECT:
+      if (nc->user_data != NULL) {
+        set_ips(nc, 1);
+        set_ips(nc, 0);
+      }
+      conn->mg_conn.status_code = * (int *) p;
+      if (conn->mg_conn.status_code != 0 ||
+          (!(nc->flags & MG_PROXY_CONN) &&
+           call_user(conn, MG_CONNECT) == MG_FALSE)) {
+        nc->flags |= NSF_CLOSE_IMMEDIATELY;
+      }
+      break;
+
+    case NS_RECV:
+      if (conn != NULL) {
+        conn->num_bytes_recv += * (int *) p;
+      }
+
+      if (nc->flags & NSF_UDP) {
+        process_udp(nc);
+      } else if (nc->listener != NULL) {
+        on_recv_data(conn);
+#ifndef MONGOOSE_NO_CGI
+      } else if (nc->flags & MG_CGI_CONN) {
+        on_cgi_data(nc);
+#endif
+      } else if (nc->flags & MG_PROXY_CONN) {
+        if (conn != NULL) {
+          ns_forward(nc, conn->ns_conn);
+        }
+      } else {
+        process_response(conn);
+      }
+      break;
+
+    case NS_SEND:
+      break;
+
+    case NS_CLOSE:
+      nc->user_data = NULL;
+      if (nc->flags & (MG_CGI_CONN | MG_PROXY_CONN)) {
+        DBG(("%p %p closing cgi/proxy conn", conn, nc));
+        if (conn && conn->ns_conn) {
+          conn->ns_conn->flags &= ~NSF_BUFFER_BUT_DONT_SEND;
+          conn->ns_conn->flags |= conn->ns_conn->send_iobuf.len > 0 ?
+            NSF_FINISHED_SENDING_DATA : NSF_CLOSE_IMMEDIATELY;
+          conn->endpoint.nc = NULL;
+        }
+      } else if (conn != NULL) {
+        DBG(("%p %p %d closing", conn, nc, conn->endpoint_type));
+
+        if (conn->endpoint_type == EP_CLIENT && nc->recv_iobuf.len > 0) {
+          call_http_client_handler(conn);
+        }
+
+        call_user(conn, MG_CLOSE);
+        close_local_endpoint(conn);
+        conn->ns_conn = NULL;
+        NS_FREE(conn);
+      }
+      break;
+
+    case NS_POLL:
+      if (conn != NULL) {
+        if (call_user(conn, MG_POLL) == MG_TRUE) {
+          if (conn->ns_conn->flags & MG_HEADERS_SENT) {
+            write_terminating_chunk(conn);
+          }
+          close_local_endpoint(conn);
+        }
+
+        if (conn->endpoint_type == EP_FILE) {
+          transfer_file_data(conn);
+        }
+      }
+
+      // Expire idle connections
+      {
+        time_t current_time = * (time_t *) p;
+
+        if (conn != NULL && conn->mg_conn.is_websocket) {
+          ping_idle_websocket_connection(conn, current_time);
+        }
+
+        if (nc->listener != NULL &&
+            nc->last_io_time + MONGOOSE_IDLE_TIMEOUT_SECONDS < current_time) {
+          mg_ev_handler(nc, NS_CLOSE, NULL);
+          nc->flags |= NSF_CLOSE_IMMEDIATELY;
+        }
+      }
+      break;
+
+    default:
+      break;
+  }
+}
+
+static void iter2(struct ns_connection *nc, int ev, void *param) {
+  mg_handler_t func = NULL;
+  struct connection *conn = (struct connection *) nc->user_data;
+  const char *msg = (const char *) param;
+  int n;
+  (void) ev;
+
+  //DBG(("%p [%s]", conn, msg));
+  if (sscanf(msg, "%p %n", &func, &n) && func != NULL && conn != NULL) {
+    conn->mg_conn.callback_param = (void *) (msg + n);
+    func(&conn->mg_conn, MG_POLL);
+  }
+}
+
+void mg_wakeup_server_ex(struct mg_server *server, mg_handler_t cb,
+                         const char *fmt, ...) {
+  va_list ap;
+  char buf[8 * 1024];
+  int len;
+
+  // Encode callback (cb) into a buffer
+  len = snprintf(buf, sizeof(buf), "%p ", cb);
+  va_start(ap, fmt);
+  len += vsnprintf(buf + len, sizeof(buf) - len, fmt, ap);
+  va_end(ap);
+
+  // "len + 1" is to include terminating \0 in the message
+  ns_broadcast(&server->ns_mgr, iter2, buf, len + 1);
+}
+
+void mg_wakeup_server(struct mg_server *server) {
+  ns_broadcast(&server->ns_mgr, NULL, (void *) "", 0);
+}
+
+const char *mg_get_option(const struct mg_server *server, const char *name) {
+  const char **opts = (const char **) server->config_options;
+  int i = get_option_index(name);
+  return i == -1 ? NULL : opts[i] == NULL ? "" : opts[i];
+}
+
+struct mg_server *mg_create_server(void *server_data, mg_handler_t handler) {
+  struct mg_server *server = (struct mg_server *) NS_CALLOC(1, sizeof(*server));
+  ns_mgr_init(&server->ns_mgr, server_data);
+  set_default_option_values(server->config_options);
+  server->event_handler = handler;
+  return server;
+}
diff --git a/samples/gfx_html/mongoose.h b/samples/gfx_html/mongoose.h
new file mode 100644
index 0000000..cfe411e
--- /dev/null
+++ b/samples/gfx_html/mongoose.h
@@ -0,0 +1,151 @@
+// Copyright (c) 2004-2013 Sergey Lyubka <valenok at gmail.com>
+// Copyright (c) 2013-2014 Cesanta Software Limited
+// All rights reserved
+//
+// This software is dual-licensed: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License version 2 as
+// published by the Free Software Foundation. For the terms of this
+// license, see <http://www.gnu.org/licenses/>.
+//
+// You are free to use this software under the terms of the GNU General
+// Public License, but WITHOUT ANY WARRANTY; without even the implied
+// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// Alternatively, you can license this software under a commercial
+// license, as set out in <http://cesanta.com/>.
+
+#ifndef MONGOOSE_HEADER_INCLUDED
+#define  MONGOOSE_HEADER_INCLUDED
+
+#define MONGOOSE_VERSION "5.6"
+
+#include <stdio.h>      // required for FILE
+#include <stddef.h>     // required for size_t
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+// This structure contains information about HTTP request.
+struct mg_connection {
+  const char *request_method; // "GET", "POST", etc
+  const char *uri;            // URL-decoded URI
+  const char *http_version;   // E.g. "1.0", "1.1"
+  const char *query_string;   // URL part after '?', not including '?', or NULL
+
+  char remote_ip[48];         // Max IPv6 string length is 45 characters
+  char local_ip[48];          // Local IP address
+  unsigned short remote_port; // Client's port
+  unsigned short local_port;  // Local port number
+
+  int num_headers;            // Number of HTTP headers
+  struct mg_header {
+    const char *name;         // HTTP header name
+    const char *value;        // HTTP header value
+  } http_headers[30];
+
+  char *content;              // POST (or websocket message) data, or NULL
+  size_t content_len;         // Data length
+
+  int is_websocket;           // Connection is a websocket connection
+  int status_code;            // HTTP status code for HTTP error handler
+  int wsbits;                 // First byte of the websocket frame
+  void *server_param;         // Parameter passed to mg_create_server()
+  void *connection_param;     // Placeholder for connection-specific data
+  void *callback_param;
+};
+
+struct mg_server; // Opaque structure describing server instance
+enum mg_result { MG_FALSE, MG_TRUE, MG_MORE };
+enum mg_event {
+  MG_POLL = 100,  // Callback return value is ignored
+  MG_CONNECT,     // If callback returns MG_FALSE, connect fails
+  MG_AUTH,        // If callback returns MG_FALSE, authentication fails
+  MG_REQUEST,     // If callback returns MG_FALSE, Mongoose continues with req
+  MG_REPLY,       // If callback returns MG_FALSE, Mongoose closes connection
+  MG_RECV,        // Mongoose has received POST data chunk.
+                  // Callback should return a number of bytes to discard from
+                  // the receive buffer, or -1 to close the connection.
+  MG_CLOSE,       // Connection is closed, callback return value is ignored
+  MG_WS_HANDSHAKE,  // New websocket connection, handshake request
+  MG_WS_CONNECT,  // New websocket connection established
+  MG_HTTP_ERROR   // If callback returns MG_FALSE, Mongoose continues with err
+};
+typedef int (*mg_handler_t)(struct mg_connection *, enum mg_event);
+
+// Websocket opcodes, from http://tools.ietf.org/html/rfc6455
+enum {
+  WEBSOCKET_OPCODE_CONTINUATION = 0x0,
+  WEBSOCKET_OPCODE_TEXT = 0x1,
+  WEBSOCKET_OPCODE_BINARY = 0x2,
+  WEBSOCKET_OPCODE_CONNECTION_CLOSE = 0x8,
+  WEBSOCKET_OPCODE_PING = 0x9,
+  WEBSOCKET_OPCODE_PONG = 0xa
+};
+
+// Server management functions
+struct mg_server *mg_create_server(void *server_param, mg_handler_t handler);
+void mg_destroy_server(struct mg_server **);
+const char *mg_set_option(struct mg_server *, const char *opt, const char *val);
+int mg_poll_server(struct mg_server *, int milliseconds);
+const char **mg_get_valid_option_names(void);
+const char *mg_get_option(const struct mg_server *server, const char *name);
+void mg_copy_listeners(struct mg_server *from, struct mg_server *to);
+struct mg_connection *mg_next(struct mg_server *, struct mg_connection *);
+void mg_wakeup_server(struct mg_server *);
+void mg_wakeup_server_ex(struct mg_server *, mg_handler_t, const char *, ...);
+struct mg_connection *mg_connect(struct mg_server *, const char *);
+
+// Connection management functions
+void mg_send_status(struct mg_connection *, int status_code);
+void mg_send_header(struct mg_connection *, const char *name, const char *val);
+size_t mg_send_data(struct mg_connection *, const void *data, int data_len);
+size_t mg_printf_data(struct mg_connection *, const char *format, ...);
+size_t mg_write(struct mg_connection *, const void *buf, int len);
+size_t mg_printf(struct mg_connection *conn, const char *fmt, ...);
+
+size_t mg_websocket_write(struct mg_connection *, int opcode,
+                          const char *data, size_t data_len);
+size_t mg_websocket_printf(struct mg_connection* conn, int opcode,
+                           const char *fmt, ...);
+
+void mg_send_file(struct mg_connection *, const char *path, const char *);
+void mg_send_file_data(struct mg_connection *, int fd);
+
+const char *mg_get_header(const struct mg_connection *, const char *name);
+const char *mg_get_mime_type(const char *name, const char *default_mime_type);
+int mg_get_var(const struct mg_connection *conn, const char *var_name,
+               char *buf, size_t buf_len);
+int mg_parse_header(const char *hdr, const char *var_name, char *buf, size_t);
+int mg_parse_multipart(const char *buf, int buf_len,
+                       char *var_name, int var_name_len,
+                       char *file_name, int file_name_len,
+                       const char **data, int *data_len);
+
+
+// Utility functions
+void *mg_start_thread(void *(*func)(void *), void *param);
+char *mg_md5(char buf[33], ...);
+int mg_authorize_digest(struct mg_connection *c, FILE *fp);
+int mg_url_encode(const char *src, size_t s_len, char *dst, size_t dst_len);
+int mg_url_decode(const char *src, int src_len, char *dst, int dst_len, int);
+int mg_terminate_ssl(struct mg_connection *c, const char *cert);
+int mg_forward(struct mg_connection *c, const char *addr);
+void *mg_mmap(FILE *fp, size_t size);
+void mg_munmap(void *p, size_t size);
+
+
+// Templates support
+struct mg_expansion {
+  const char *keyword;
+  void (*handler)(struct mg_connection *);
+};
+void mg_template(struct mg_connection *, const char *text,
+                 struct mg_expansion *expansions);
+
+#ifdef __cplusplus
+}
+#endif // __cplusplus
+
+#endif // MONGOOSE_HEADER_INCLUDED
diff --git a/samples/gfx_html/res/boinc.ico b/samples/gfx_html/res/boinc.ico
new file mode 100644
index 0000000..c535bce
Binary files /dev/null and b/samples/gfx_html/res/boinc.ico differ
diff --git a/samples/gfx_html/templates/boinc.js b/samples/gfx_html/templates/boinc.js
new file mode 100644
index 0000000..03928f9
--- /dev/null
+++ b/samples/gfx_html/templates/boinc.js
@@ -0,0 +1,234 @@
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+//
+
+var BOINC = function () {
+    var updatedTime;
+    var updatedStateTime;
+    var userName;
+    var teamName;
+    var wuName;
+    var resultName;
+    var authenticator;
+    var userId;
+    var teamId;
+    var hostId;
+    var userCreditTotal;
+    var userCreditAverage;
+    var hostCreditTotal;
+    var hostCreditAverage;
+    var exit;
+    var exit_timeout;
+    var vboxJob;
+    var webAPIPort;
+    var remoteDesktopPort;
+    var elapsedTime;
+    var cpuTime;
+    var fractionDone;
+    var suspended;
+    var networkSuspended;
+    var abortRequested;
+    var quitRequested;
+    var stateFileUpdated;
+
+    this.poll();
+};
+
+BOINC.prototype.createRequest = function () {
+    var xmlHttp = null;
+    var XMLHttpFactories = [
+        function () { return new XMLHttpRequest() },
+        function () { return new ActiveXObject('Msxml2.XMLHTTP') },
+        function () { return new ActiveXObject('Msxml3.XMLHTTP') },
+        function () { return new ActiveXObject('Microsoft.XMLHTTP') }
+    ];
+
+    for (var i = 0; i < XMLHttpFactories.length; i++) {
+        try {
+            xmlHttp = XMLHttpFactories[i]();
+        } catch (e) {
+            continue;
+        }
+        break;
+    }
+    return xmlHttp;
+}
+
+BOINC.prototype.sendRequest = function (url) {
+    var req = this.createRequest();
+    var response = null;
+    req.open('GET', url, false);
+    req.send();
+    response = req.responseXML;
+    req = null;
+    return response;
+}
+
+BOINC.prototype.poll = function () {
+    var xmlGraphicsStatusDoc;
+    var xmlInitDataDoc;
+
+    xmlGraphicsStatusDoc = this.sendRequest('/api/getGraphicsStatus');
+    this.updatedTime = parseFloat(xmlGraphicsStatusDoc.getElementsByTagName('updated_time')[0].childNodes[0].nodeValue);
+    this.fractionDone = parseFloat(xmlGraphicsStatusDoc.getElementsByTagName('fraction_done')[0].childNodes[0].nodeValue);
+    this.elapsedTime = parseFloat(xmlGraphicsStatusDoc.getElementsByTagName('elapsed_time')[0].childNodes[0].nodeValue);
+    this.cpuTime = parseFloat(xmlGraphicsStatusDoc.getElementsByTagName('cpu_time')[0].childNodes[0].nodeValue);
+    this.suspended = parseInt(xmlGraphicsStatusDoc.getElementsByTagName('suspended')[0].childNodes[0].nodeValue);
+    this.networkSuspended = parseInt(xmlGraphicsStatusDoc.getElementsByTagName('network_suspended')[0].childNodes[0].nodeValue);
+    this.abortRequested = parseInt(xmlGraphicsStatusDoc.getElementsByTagName('abort_request')[0].childNodes[0].nodeValue);
+    this.quitRequested = parseInt(xmlGraphicsStatusDoc.getElementsByTagName('quit_request')[0].childNodes[0].nodeValue);
+    this.stateFileUpdated = parseInt(xmlGraphicsStatusDoc.getElementsByTagName('reread_init_data_file')[0].childNodes[0].nodeValue);
+    this.exit = parseInt(xmlGraphicsStatusDoc.getElementsByTagName('suspended')[0].childNodes[0].nodeValue);
+    this.exit_timeout = parseFloat(xmlGraphicsStatusDoc.getElementsByTagName('cpu_time')[0].childNodes[0].nodeValue);
+
+    if (this.stateFileUpdated || (this.updatedStateTime == undefined)) {
+        this.updatedStateTime = this.updatedTime;
+
+        this.vboxJob = parseInt(xmlGraphicsStatusDoc.getElementsByTagName('vbox_job')[0].childNodes[0].nodeValue);
+        this.webAPIPort = parseInt(xmlGraphicsStatusDoc.getElementsByTagName('webapi_port')[0].childNodes[0].nodeValue);
+        this.remoteDesktopPort = parseInt(xmlGraphicsStatusDoc.getElementsByTagName('remote_desktop_port')[0].childNodes[0].nodeValue);
+
+        xmlInitDataDoc = this.sendRequest('/api/getInitData');
+        this.userName = xmlInitDataDoc.getElementsByTagName('user_name')[0].childNodes[0].nodeValue;
+        this.wuName = xmlInitDataDoc.getElementsByTagName('wu_name')[0].childNodes[0].nodeValue;
+        this.resultName = xmlInitDataDoc.getElementsByTagName('result_name')[0].childNodes[0].nodeValue;
+        this.authenticator = xmlInitDataDoc.getElementsByTagName('authenticator')[0].childNodes[0].nodeValue;
+        this.userCreditTotal = parseFloat(xmlInitDataDoc.getElementsByTagName('user_total_credit')[0].childNodes[0].nodeValue);
+        this.userCreditAverage = parseFloat(xmlInitDataDoc.getElementsByTagName('user_expavg_credit')[0].childNodes[0].nodeValue);
+        this.hostCreditTotal = parseFloat(xmlInitDataDoc.getElementsByTagName('host_total_credit')[0].childNodes[0].nodeValue);
+        this.hostCreditAverage = parseFloat(xmlInitDataDoc.getElementsByTagName('host_expavg_credit')[0].childNodes[0].nodeValue);
+
+        // Optional elements
+        //
+        try {
+            this.teamName = xmlInitDataDoc.getElementsByTagName('team_name')[0].childNodes[0].nodeValue;
+        } catch (e) {
+            this.teamName = '';
+        }
+        try {
+            this.userId = parseInt(xmlGraphicsStatusDoc.getElementsByTagName('userid')[0].childNodes[0].nodeValue);
+        } catch (e) {
+            this.userId = 0;
+        }
+        try {
+            this.teamId = parseInt(xmlGraphicsStatusDoc.getElementsByTagName('teamid')[0].childNodes[0].nodeValue);
+        } catch (e) {
+            this.teamId = 0;
+        }
+        try {
+            this.hostId = parseInt(xmlGraphicsStatusDoc.getElementsByTagName('hostid')[0].childNodes[0].nodeValue);
+        } catch (e) {
+            this.hostId = 0;
+        }
+
+        this.sendRequest('/api/resetReadFlag');
+    }
+}
+
+BOINC.prototype.getUpdatedTime = function () {
+    return this.updatedTime;
+}
+
+BOINC.prototype.getUpdatedStateTime = function () {
+    return this.updatedStateTime;
+}
+
+BOINC.prototype.getUserName = function () {
+    return this.userName;
+}
+
+BOINC.prototype.getTeamName = function () {
+    return this.teamName;
+}
+
+BOINC.prototype.getWorkunitName = function () {
+    return this.wuName;
+}
+
+BOINC.prototype.getResultName = function () {
+    return this.resultName;
+}
+
+BOINC.prototype.getAuthenticator = function () {
+    return this.authenticator;
+}
+
+BOINC.prototype.getUserId = function () {
+    return this.userId;
+}
+
+BOINC.prototype.getTeamId = function () {
+    return this.teamId;
+}
+
+BOINC.prototype.getHostId = function () {
+    return this.hostId;
+}
+
+BOINC.prototype.getUserCreditTotal = function () {
+    return this.userCreditTotal;
+}
+
+BOINC.prototype.getUserCreditAverage = function () {
+    return this.userCreditAverage;
+}
+
+BOINC.prototype.getHostCreditTotal = function () {
+    return this.hostCreditTotal;
+}
+
+BOINC.prototype.getHostCreditAverage = function () {
+    return this.hostCreditAverage;
+}
+
+BOINC.prototype.isExiting = function () {
+    return this.exit;
+}
+
+BOINC.prototype.getExitTimeout = function () {
+    return this.exit_timeout;
+}
+
+BOINC.prototype.isVrtualBoxJob = function () {
+    return this.vboxJob;
+}
+
+BOINC.prototype.getWebAPIPort = function () {
+    return this.webAPIPort;
+}
+
+BOINC.prototype.getRemoteDesktopPort = function () {
+    return this.remoteDesktopPort;
+}
+
+BOINC.prototype.getFractionDone = function () {
+    return this.fractionDone;
+}
+
+BOINC.prototype.getElapsedTime = function () {
+    return this.elapsedTime;
+}
+
+BOINC.prototype.getCPUTime = function () {
+    return this.cpuTime;
+}
+
+BOINC.prototype.isSuspended = function () {
+    return this.suspended;
+}
+
+BOINC.prototype.isNetworkSuspended = function () {
+    return this.networkSuspended;
+}
+
+BOINC.prototype.isAbortRequested = function () {
+    return this.abortRequested;
+}
+
+BOINC.prototype.isQuitRequested = function () {
+    return this.quitRequested;
+}
+
+BOINC.prototype.isStateFileUpdated = function () {
+    return this.stateFileUpdated;
+}
diff --git a/samples/gfx_html/templates/boinc.png b/samples/gfx_html/templates/boinc.png
new file mode 100644
index 0000000..8c1c142
Binary files /dev/null and b/samples/gfx_html/templates/boinc.png differ
diff --git a/samples/gfx_html/templates/index.html b/samples/gfx_html/templates/index.html
new file mode 100644
index 0000000..42d0f9b
--- /dev/null
+++ b/samples/gfx_html/templates/index.html
@@ -0,0 +1,140 @@
+<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>
+<html>
+<head>
+    <title></title>
+    <script type='text/javascript' src='boinc.js'></script>
+</head>
+<body style='background-color: Black; overflow: hidden'>
+    <div id='content' style='position: absolute'>
+        <table>
+            <tr>
+                <td style='vertical-align: middle'>
+                    <img alt='' src='boinc.png' />
+                </td>
+                <td style='vertical-align: top; width: 250px'>
+                    <div id='username_container' style='visibility: hidden; color: White'></div>
+                    <div id='teamname_container' style='visibility: hidden; color: White'></div>
+                    <div id='workunitname_container' style='visibility: hidden; color: White'></div>
+                    <div id='progressbar_container' style='visibility: hidden; border: 1px Solid White; width: 245px; height: 23px'>
+                        <div id='progressbar_text' style='z-index: 1; position: absolute; color: White; text-align: center; vertical-align: middle; height: 21px; width: 245px'></div>
+                        <div id='progressbar' style='z-index: 0; position: absolute; height: 21px; width: 0px; background-color: Blue;'></div>
+                    </div>
+                    <div id='message_container' style='text-align: center; color: White'>Initializing...</div>
+                </td>
+            </tr>
+        </table>
+    </div>
+    <script type='text/javascript'>
+        var interval;
+        var step = 5;
+        var delay = 1000;
+        var height = 0;
+        var Hoffset = 0;
+        var Woffset = 0;
+        var yon = 0;
+        var xon = 0;
+        var xPos = 0;
+        var yPos = 0;
+        var boinc = new BOINC();
+
+        function refresh() {
+            boinc.poll();
+            console.log('this is a test');
+
+            var message = '';
+
+            if (boinc.getUserName().length != 0) {
+                document.getElementById('username_container').innerHTML = boinc.getUserName();
+            }
+            if (boinc.getTeamName().length != 0) {
+                document.getElementById('teamname_container').innerHTML = boinc.getTeamName();
+            }
+            if (boinc.getWorkunitName().length != 0) {
+                document.getElementById('workunitname_container').innerHTML = boinc.getWorkunitName();
+            }
+
+            document.getElementById('progressbar').style.width = 
+                String(Math.floor(parseInt(document.getElementById('progressbar_container').style.width) * boinc.getFractionDone()) + 'px');
+            document.getElementById('progressbar_text').innerHTML = 
+                String(Math.floor(100 * boinc.getFractionDone()) + ' %');
+
+            if (boinc.isSuspended()) {
+                message = 'Task is suspended.';
+            } else if (boinc.isNetworkSuspended()) {
+                message = 'Network is suspended.';
+            } else if (boinc.isExiting()) {
+                message = 'Exiting in ' + boinc.getExitTimeout() + ' seconds';
+            }
+
+            if ((document.getElementById('username_container').innerHTML.length == 0) || boinc.isExiting()) {
+                document.getElementById('username_container').style.visibility = 'hidden';
+                document.getElementById('teamname_container').style.visibility = 'hidden';
+                document.getElementById('workunitname_container').style.visibility = 'hidden';
+                document.getElementById('progressbar_container').style.visibility = 'hidden';
+                document.getElementById('message_container').style.visibility = 'visible';
+            } else {
+                document.getElementById('username_container').style.visibility = 'visible';
+                document.getElementById('teamname_container').style.visibility = 'visible';
+                document.getElementById('workunitname_container').style.visibility = 'visible';
+                document.getElementById('progressbar_container').style.visibility = 'visible';
+                document.getElementById('message_container').style.visibility = 'hidden';
+                if (message.length > 0) {
+                    document.getElementById('message_container').innerHTML = message;
+                    document.getElementById('message_container').style.textAlign = 'left';
+                    document.getElementById('message_container').style.visibility = 'visible';
+                } else {
+                    document.getElementById('message_container').innerHTML = '';
+                    document.getElementById('message_container').style.visibility = 'hidden';
+                }
+            }
+
+            update_positions();
+        }
+
+        function update_positions() {
+            if (navigator.appName == "Microsoft Internet Explorer") {
+                width = document.body.clientWidth;
+                height = document.body.clientHeight;
+                document.getElementById('content').style.left = xPos + document.body.scrollLeft;
+                document.getElementById('content').style.top = yPos + document.body.scrollTop;
+            } else {
+                height = window.innerHeight;
+                width = window.innerWidth;
+                document.getElementById('content').style.top = yPos + window.pageYOffset;
+                document.getElementById('content').style.left = xPos + window.pageXOffset;
+            }
+            Hoffset = document.getElementById('content').offsetHeight;
+            Woffset = document.getElementById('content').offsetWidth;
+
+            if (yon) {
+                yPos = yPos + step;
+            } else {
+                yPos = yPos - step;
+            }
+            if (yPos < 0) {
+                yon = 1;
+                yPos = 0;
+            }
+            if (yPos >= (height - Hoffset)) {
+                yon = 0;
+                yPos = (height - Hoffset);
+            }
+            if (xon) {
+                xPos = xPos + step;
+            } else {
+                xPos = xPos - step;
+            }
+            if (xPos < 0) {
+                xon = 1;
+                xPos = 0;
+            }
+            if (xPos >= (width - Woffset)) {
+                xon = 0;
+                xPos = (width - Woffset);
+            }
+        }
+
+        interval = setInterval('refresh()', delay);
+    </script>
+</body>
+</html>
diff --git a/samples/gfx_html/vboxwrapper.cpp b/samples/gfx_html/vboxwrapper.cpp
new file mode 100644
index 0000000..1b5389a
--- /dev/null
+++ b/samples/gfx_html/vboxwrapper.cpp
@@ -0,0 +1,94 @@
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2014-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/>.
+
+#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
+
+#include "parse.h"
+#include "filesys.h"
+#include "boinc_api.h"
+#include "browserlog.h"
+#include "vboxwrapper.h"
+
+
+#define CHECKPOINT_FILENAME "vbox_checkpoint.xml"
+#define WEBAPI_FILENAME "vbox_webapi.xml"
+#define REMOTEDESKTOP_FILENAME "vbox_remote_desktop.xml"
+
+
+bool is_vbox_job() {
+    return 1 == boinc_file_exists(CHECKPOINT_FILENAME);
+}
+
+int parse_vbox_remote_desktop_port(int& remote_desktop_port) {
+    MIOFILE mf;
+    FILE* f = boinc_fopen(REMOTEDESKTOP_FILENAME, "r");
+    if (!f) {
+        return ERR_FOPEN;
+    }
+    mf.init_file(f);
+    XML_PARSER xp(&mf);
+
+    if (!xp.parse_start("remote_desktop")) return ERR_XML_PARSE;
+    while (!xp.get_tag()) {
+        if (!xp.is_tag) {
+            continue;
+        }
+        if (xp.match_tag("/remote_desktop")) {
+            fclose(f);
+            return 0;
+        }
+        else if (xp.parse_int("host_port", remote_desktop_port)) continue;
+    }
+    fclose(f);
+    return ERR_XML_PARSE;
+}
+
+int parse_vbox_webapi_port(int& webapi_port) {
+    MIOFILE mf;
+    FILE* f = boinc_fopen(WEBAPI_FILENAME, "r");
+    if (!f) {
+        return ERR_FOPEN;
+    }
+    mf.init_file(f);
+    XML_PARSER xp(&mf);
+
+    if (!xp.parse_start("webapi")) return ERR_XML_PARSE;
+    while (!xp.get_tag()) {
+        if (!xp.is_tag) {
+            continue;
+        }
+        if (xp.match_tag("/webapi")) {
+            fclose(f);
+            return 0;
+        }
+        else if (xp.parse_int("host_port", webapi_port)) continue;
+    }
+    fclose(f);
+    return ERR_XML_PARSE;
+}
diff --git a/clientgui/res/skins/default/graphic/dialog_background_image.xpm b/samples/gfx_html/vboxwrapper.h
similarity index 74%
copy from clientgui/res/skins/default/graphic/dialog_background_image.xpm
copy to samples/gfx_html/vboxwrapper.h
index 29d6c76..837bef8 100644
--- a/clientgui/res/skins/default/graphic/dialog_background_image.xpm
+++ b/samples/gfx_html/vboxwrapper.h
@@ -1,7 +1,6 @@
-/* XPM */
 // This file is part of BOINC.
 // http://boinc.berkeley.edu
-// Copyright (C) 2011 University of California
+// Copyright (C) 2014-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 +14,12 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
-static const char *dialog_background_image_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"1 1 1 1",
-"  c #D3D3D3",
-/* pixels */
-" "
-};
+
+#ifndef _VBOXWRAPPER_H_
+#define _VBOXWRAPPER_H_
+
+bool is_vbox_job();
+int parse_vbox_remote_desktop_port(int& remote_desktop_port);
+int parse_vbox_webapi_port(int& webapi_port);
+
+#endif
diff --git a/samples/gfx_html/webapi.cpp b/samples/gfx_html/webapi.cpp
new file mode 100644
index 0000000..9f51909
--- /dev/null
+++ b/samples/gfx_html/webapi.cpp
@@ -0,0 +1,316 @@
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2014-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/>.
+
+#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
+
+#include "parse.h"
+#include "filesys.h"
+#include "app_ipc.h"
+#include "util.h"
+#include "boinc_api.h"
+#include "graphics2.h"
+#include "browser.h"
+#include "browserlog.h"
+#include "mongoose.h"
+#include "vboxwrapper.h"
+#include "graphics.h"
+#include "webserver.h"
+#include "webapi.h"
+
+
+bool          g_bWebServerInitialized = false;
+bool          g_bExit;
+double        g_dExitTimeout;
+bool          g_bVboxJob;
+long          g_lRemoteDesktopPort;
+long          g_lWebAPIPort;
+APP_INIT_DATA g_aid;
+BOINC_STATUS  g_status;
+double        g_dUpdateTime;
+double        g_dCPUTime;
+double        g_dElapsedTime;
+double        g_dFractionDone;
+std::string   g_strDefaultURL;
+std::string   g_strRunningURL;
+std::string   g_strSuspendedURL;
+std::string   g_strNetworkSuspendedURL;
+std::string   g_strExitingURL;
+
+
+std::string normalize_url(std::string& url) {
+    std::string normalized;
+    char buf[256];
+
+    if (starts_with(url, "http://") || starts_with(url, "https://")) {
+        normalized = url;
+    } else {
+        // Assume it is a local file
+        _snprintf(buf, sizeof(buf), "http://localhost:%d/", get_htmlgfx_webserver_port());
+        normalized  = buf;
+        normalized += url;
+    }
+
+    return normalized;
+}
+
+int determine_exit_state(double& exit_timeout) {
+    exit_timeout = g_dExitTimeout;
+    return g_bExit;
+}
+
+int determine_state_url(std::string& url) {
+    char buf[256];
+    
+    // Start out with the default URL
+    url = g_strDefaultURL;
+
+    // See if we need to override the default
+    if ((g_status.abort_request || g_status.quit_request || g_status.no_heartbeat) && !g_strExitingURL.empty()) {
+        url = g_strExitingURL;
+    } else if (g_status.suspended && !g_strSuspendedURL.empty()) {
+        url = g_strSuspendedURL;
+    } else if (g_status.network_suspended && !g_strNetworkSuspendedURL.empty()) {
+        url = g_strNetworkSuspendedURL;
+    } else if (!g_strRunningURL.empty()) {
+        url = g_strRunningURL;
+    }
+
+    // Are we running a vbox job?  If so, does it expose a webapi port number?
+    if ((g_bVboxJob && g_lWebAPIPort) && (url.length() == 0)) {
+        _snprintf(buf, sizeof(buf), "http://localhost:%d/", g_lWebAPIPort);
+        url = buf;
+    }
+
+    // If no other URL is selected, use the default HTML page embedded within the
+    // executable
+    if (url.size() == 0) {
+        _snprintf(buf, sizeof(buf), "http://localhost:%d/api/static/index.html", get_htmlgfx_webserver_port());
+        url = buf;
+    }
+
+    return 0;
+}
+
+void handle_poll_server() {
+    int retval = 0;
+    BOINC_STATUS status;
+    std::string strDefaultURL;
+    std::string strRunningURL;
+    std::string strSuspendedURL;
+    std::string strNetworkSuspendedURL;
+    std::string strExitingURL;
+    int temp = 0;
+
+
+    retval = boinc_parse_graphics_status(
+        &g_dUpdateTime,
+        &g_dCPUTime,
+        &g_dElapsedTime,
+        &g_dFractionDone,
+        &status
+    );
+    if (!retval) {
+
+        g_bExit = g_status.abort_request || g_status.no_heartbeat || g_status.quit_request;
+        if (g_bExit && ((dtime() - g_dUpdateTime) > 5.0)) {
+            g_dExitTimeout = dtime() - g_dUpdateTime - 5;
+        } else {
+            g_dExitTimeout = 0.0;
+        }
+
+        // Update status entries sans the reread_init_data_file entry.
+        // Give the HTML Web App time to assimulate the new info
+        g_status.abort_request = status.abort_request;
+        g_status.no_heartbeat = status.no_heartbeat;
+        g_status.quit_request = status.quit_request;
+        g_status.suspended = status.suspended;
+        g_status.network_suspended = status.network_suspended;
+
+        // Check to see if vboxwrapper has logged any Web API port info or 
+        // Remote Desktop port info
+        //
+        if (g_bVboxJob) {
+            if (!g_lRemoteDesktopPort) {
+                if (!parse_vbox_remote_desktop_port(temp)) {
+                    g_lRemoteDesktopPort = temp;
+                    browserlog_msg("Vboxwrapper remote desktop port assignment (%d).", g_lRemoteDesktopPort);
+                }
+            }
+            if (!g_lWebAPIPort) {
+                if (!parse_vbox_webapi_port(temp)) {
+                    g_lWebAPIPort = temp;
+                    browserlog_msg("Vboxwrapper web api port assignment (%d).", g_lWebAPIPort);
+                }
+            }
+        }
+
+        if (status.reread_init_data_file || !g_bWebServerInitialized)
+        {
+            g_bWebServerInitialized = true;
+
+            // Notify the HTML Web application of the possible change in preferences and other
+            // init data.
+            browserlog_msg("Preference change detected.");
+            g_status.reread_init_data_file = 1;
+            g_status.max_working_set_size = 0.0;
+            g_status.working_set_size = 0.0;
+
+            // Get updated state
+            //
+            if (g_aid.project_preferences) {
+                delete g_aid.project_preferences;
+                g_aid.project_preferences = NULL;
+            }
+            boinc_parse_init_data_file();
+            boinc_get_init_data(g_aid);
+
+            // Check for vboxwrapper state
+            //
+            if (is_vbox_job())
+            {
+                g_bVboxJob = true;
+                browserlog_msg("Vboxwrapper task detected.");
+            }
+
+            // Check for project configured state urls
+            //
+            if (!parse_graphics(strDefaultURL, strRunningURL, strSuspendedURL, strNetworkSuspendedURL, strExitingURL))
+            {
+                if (strDefaultURL.size())
+                {
+                    g_strDefaultURL = normalize_url(strDefaultURL);
+                    browserlog_msg("Configured default_url: '%s'.", strDefaultURL.c_str());
+                }
+                if (strRunningURL.size())
+                {
+                    g_strRunningURL = normalize_url(strRunningURL);
+                    browserlog_msg("Configured running_url: '%s'.", strRunningURL.c_str());
+                }
+                if (strSuspendedURL.size())
+                {
+                    g_strSuspendedURL = normalize_url(strSuspendedURL);
+                    browserlog_msg("Configured suspended_url: '%s'.", strSuspendedURL.c_str());
+                }
+                if (strNetworkSuspendedURL.size())
+                {
+                    g_strNetworkSuspendedURL = normalize_url(strNetworkSuspendedURL);
+                    browserlog_msg("Configured network_suspended_url: '%s'.", strNetworkSuspendedURL.c_str());
+                }
+                if (strExitingURL.size())
+                {
+                    g_strExitingURL = normalize_url(strExitingURL);
+                    browserlog_msg("Configured exiting_url: '%s'.", strExitingURL.c_str());
+                }
+            }
+        }
+    }
+}
+
+
+//
+// Web Server Restful APIs
+//
+
+int handle_get_init_data(struct mg_connection *conn) {
+    std::string contents;
+    read_file_string("init_data.xml", contents);
+
+    mg_send_status(conn, 200);
+    mg_send_header(conn, "Content-Type", "text/xml");
+    mg_send_header(conn, "Cache-Control", "max-age=0, post-check=0, pre-check=0, no-store, no-cache, must-revalidate");
+    mg_send_header(conn, "Access-Control-Allow-Origin", "*");
+    mg_printf_data(conn, "%s", contents.c_str());
+    return MG_TRUE;
+}
+
+int handle_get_graphics_status(struct mg_connection *conn) {
+    mg_send_status(conn, 200);
+    mg_send_header(conn, "Content-Type", "text/xml");
+    mg_send_header(conn, "Cache-Control", "max-age=0, post-check=0, pre-check=0, no-store, no-cache, must-revalidate");
+    mg_send_header(conn, "Access-Control-Allow-Origin", "*");
+    mg_printf_data(
+        conn,
+        "<graphics_status>\n"
+        "    <updated_time>%f</updated_time>\n"
+        "    <cpu_time>%f</cpu_time>\n"
+        "    <elapsed_time>%f</elapsed_time>\n"
+        "    <fraction_done>%f</fraction_done>\n"
+        "    <no_heartbeat>%d</no_heartbeat>\n"
+        "    <suspended>%d</suspended>\n"
+        "    <quit_request>%d</quit_request>\n"
+        "    <abort_request>%d</abort_request>\n"
+        "    <network_suspended>%d</network_suspended>\n"
+        "    <reread_init_data_file>%d</reread_init_data_file>\n"
+        "    <exit>%d</exit>\n"
+        "    <exit_timeout>%f</exit_timeout>\n"
+        "    <vbox_job>%d</vbox_job>\n"
+        "    <webapi_port>%d</webapi_port>\n"
+        "    <remote_desktop_port>%d</remote_desktop_port>\n"
+        "</graphics_status>\n",
+        g_dUpdateTime,
+        g_dCPUTime,
+        g_dElapsedTime,
+        g_dFractionDone,
+        g_status.no_heartbeat,
+        g_status.suspended,
+        g_status.quit_request,
+        g_status.abort_request,
+        g_status.network_suspended,
+        g_status.reread_init_data_file,
+        g_bExit,
+        g_dExitTimeout,
+        g_bVboxJob ? 1 : 0,
+        g_lWebAPIPort,
+        g_lRemoteDesktopPort
+    );
+    return MG_TRUE;
+}
+
+int handle_reset_read_flag(struct mg_connection *conn) {
+    g_status.reread_init_data_file = 0;
+
+    mg_send_status(conn, 200);
+    mg_send_header(conn, "Content-Type", "text/xml");
+    mg_send_header(conn, "Cache-Control", "max-age=0, post-check=0, pre-check=0, no-store, no-cache, must-revalidate");
+    mg_send_header(conn, "Access-Control-Allow-Origin", "*");
+    mg_printf_data(conn, "<success/>\n");
+    return MG_TRUE;
+}
+
+int handle_filesystem_request(struct mg_connection *conn) {
+    std::string uri;
+    boinc_resolve_filename_s(conn->uri+1, uri);
+    mg_send_file(
+        conn,
+        uri.c_str(),
+        "Cache-Control: max-age=0, post-check=0, pre-check=0, no-store, no-cache, must-revalidate\r\n"
+        "Access-Control-Allow-Origin: *\r\n"
+    );
+    return MG_MORE; 
+}
diff --git a/html/ops/clear_host.php b/samples/gfx_html/webapi.h
similarity index 60%
copy from html/ops/clear_host.php
copy to samples/gfx_html/webapi.h
index b1b852e..b70c3d4 100644
--- a/html/ops/clear_host.php
+++ b/samples/gfx_html/webapi.h
@@ -1,7 +1,6 @@
-<?php
 // This file is part of BOINC.
 // http://boinc.berkeley.edu
-// Copyright (C) 2008 University of California
+// Copyright (C) 2014-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
@@ -16,18 +15,17 @@
 // 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/util_ops.inc");
+#ifndef _WEBAPI_H_
+#define _WEBAPI_H_
 
-db_init();
-$hostid = $_GET["hostid"];
+int    determine_exit_state(double& exit_timeout);
+int    determine_state_url(std::string& url);
 
-if (!$hostid) {
-    error_page("no host ID\n");
-}
+void   handle_poll_server();
 
-mysql_query("update host set rpc_time=0 where id='$hostid'");
-echo "Host RPC time cleared for host ID: $hostid\n";
+int    handle_get_init_data(struct mg_connection *conn);
+int    handle_get_graphics_status(struct mg_connection *conn);
+int    handle_reset_read_flag(struct mg_connection *conn);
+int    handle_filesystem_request(struct mg_connection *conn);
 
-admin_page_tail();
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
-?>
+#endif
diff --git a/samples/gfx_html/webboincjs.cpp b/samples/gfx_html/webboincjs.cpp
new file mode 100644
index 0000000..76536fa
--- /dev/null
+++ b/samples/gfx_html/webboincjs.cpp
@@ -0,0 +1,230 @@
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2014-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/>.
+
+#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
+
+#include "browserlog.h"
+#include "mongoose.h"
+#include "webstatic.h"
+
+
+static const char* boinc_js =
+    "var BOINC = function () {"
+    "    var updatedTime; var updatedStateTime; var userName; var teamName; var wuName; var resultName;"
+    "    var authenticator; var userId; var teamId; var hostId; var userCreditTotal; var userCreditAverage;"
+    "    var hostCreditTotal; var hostCreditAverage; var exit; var exit_timeout; var vboxJob; var webAPIPort;"
+    "    var remoteDesktopPort; var elapsedTime; var cpuTime; var fractionDone; var suspended;"
+    "    var networkSuspended; var abortRequested; var quitRequested; var stateFileUpdated;"
+    "    this.poll();"
+    "};"
+    ""
+    "BOINC.prototype.createRequest = function () {"
+    "    var xmlHttp = null;"
+    "    var XMLHttpFactories = ["
+    "        function () { return new XMLHttpRequest() },"
+    "        function () { return new ActiveXObject('Msxml2.XMLHTTP') },"
+    "        function () { return new ActiveXObject('Msxml3.XMLHTTP') },"
+    "        function () { return new ActiveXObject('Microsoft.XMLHTTP') }"
+    "    ];"
+    "    for (var i = 0; i < XMLHttpFactories.length; i++) {"
+    "        try {"
+    "            xmlHttp = XMLHttpFactories[i]();"
+    "        } catch (e) {"
+    "            continue;"
+    "        }"
+    "        break;"
+    "    }"
+    "    return xmlHttp;"
+    "};"
+    ""
+    "BOINC.prototype.sendRequest = function (url) {"
+    "    var req = this.createRequest();"
+    "    var response = null;"
+    "    req.open('GET', url, false);"
+    "    req.send();"
+    "    response = req.responseXML;"
+    "    req = null;"
+    "    return response;"
+    "};"
+    ""
+    "BOINC.prototype.poll = function () {"
+    "    var xmlGraphicsStatusDoc;"
+    "    var xmlInitDataDoc;"
+    ""
+    "    xmlGraphicsStatusDoc = this.sendRequest('/api/getGraphicsStatus');"
+    "    this.updatedTime = parseFloat(xmlGraphicsStatusDoc.getElementsByTagName('updated_time')[0].childNodes[0].nodeValue);"
+    "    this.fractionDone = parseFloat(xmlGraphicsStatusDoc.getElementsByTagName('fraction_done')[0].childNodes[0].nodeValue);"
+    "    this.elapsedTime = parseFloat(xmlGraphicsStatusDoc.getElementsByTagName('elapsed_time')[0].childNodes[0].nodeValue);"
+    "    this.cpuTime = parseFloat(xmlGraphicsStatusDoc.getElementsByTagName('cpu_time')[0].childNodes[0].nodeValue);"
+    "    this.suspended = parseInt(xmlGraphicsStatusDoc.getElementsByTagName('suspended')[0].childNodes[0].nodeValue);"
+    "    this.networkSuspended = parseInt(xmlGraphicsStatusDoc.getElementsByTagName('network_suspended')[0].childNodes[0].nodeValue);"
+    "    this.abortRequested = parseInt(xmlGraphicsStatusDoc.getElementsByTagName('abort_request')[0].childNodes[0].nodeValue);"
+    "    this.quitRequested = parseInt(xmlGraphicsStatusDoc.getElementsByTagName('quit_request')[0].childNodes[0].nodeValue);"
+    "    this.stateFileUpdated = parseInt(xmlGraphicsStatusDoc.getElementsByTagName('reread_init_data_file')[0].childNodes[0].nodeValue);"
+    "    this.exit = parseInt(xmlGraphicsStatusDoc.getElementsByTagName('suspended')[0].childNodes[0].nodeValue);"
+    "    this.exit_timeout = parseFloat(xmlGraphicsStatusDoc.getElementsByTagName('cpu_time')[0].childNodes[0].nodeValue);"
+    ""
+    "    if (this.stateFileUpdated || (this.updatedStateTime == undefined)) {"
+    "        this.updatedStateTime = this.updatedTime;"
+    ""
+    "        this.vboxJob = parseInt(xmlGraphicsStatusDoc.getElementsByTagName('vbox_job')[0].childNodes[0].nodeValue);"
+    "        this.webAPIPort = parseInt(xmlGraphicsStatusDoc.getElementsByTagName('webapi_port')[0].childNodes[0].nodeValue);"
+    "        this.remoteDesktopPort = parseInt(xmlGraphicsStatusDoc.getElementsByTagName('remote_desktop_port')[0].childNodes[0].nodeValue);"
+    ""
+    "        xmlInitDataDoc = this.sendRequest('/api/getInitData');"
+    "        this.userName = xmlInitDataDoc.getElementsByTagName('user_name')[0].childNodes[0].nodeValue;"
+    "        this.wuName = xmlInitDataDoc.getElementsByTagName('wu_name')[0].childNodes[0].nodeValue;"
+    "        this.resultName = xmlInitDataDoc.getElementsByTagName('result_name')[0].childNodes[0].nodeValue;"
+    "        this.authenticator = xmlInitDataDoc.getElementsByTagName('authenticator')[0].childNodes[0].nodeValue;"
+    "        this.userCreditTotal = parseFloat(xmlInitDataDoc.getElementsByTagName('user_total_credit')[0].childNodes[0].nodeValue);"
+    "        this.userCreditAverage = parseFloat(xmlInitDataDoc.getElementsByTagName('user_expavg_credit')[0].childNodes[0].nodeValue);"
+    "        this.hostCreditTotal = parseFloat(xmlInitDataDoc.getElementsByTagName('host_total_credit')[0].childNodes[0].nodeValue);"
+    "        this.hostCreditAverage = parseFloat(xmlInitDataDoc.getElementsByTagName('host_expavg_credit')[0].childNodes[0].nodeValue);"
+    ""
+    "        try {"
+    "            this.teamName = xmlInitDataDoc.getElementsByTagName('team_name')[0].childNodes[0].nodeValue;"
+    "        } catch (e) {"
+    "            this.teamName = '';"
+    "        }"
+    "        try {"
+    "            this.userId = parseInt(xmlGraphicsStatusDoc.getElementsByTagName('userid')[0].childNodes[0].nodeValue);"
+    "        } catch (e) {"
+    "            this.userId = 0;"
+    "        }"
+    "        try {"
+    "            this.teamId = parseInt(xmlGraphicsStatusDoc.getElementsByTagName('teamid')[0].childNodes[0].nodeValue);"
+    "        } catch (e) {"
+    "            this.teamId = 0;"
+    "        }"
+    "        try {"
+    "            this.hostId = parseInt(xmlGraphicsStatusDoc.getElementsByTagName('hostid')[0].childNodes[0].nodeValue);"
+    "        } catch (e) {"
+    "            this.hostId = 0;"
+    "        }"
+    ""
+    "        this.sendRequest('/api/resetReadFlag');"
+    "    }"
+    "};"
+    ""
+    "BOINC.prototype.getUpdatedTime = function () {"
+    "    return this.updatedTime;"
+    "};"
+    "BOINC.prototype.getUpdatedStateTime = function () {"
+    "    return this.updatedStateTime;"
+    "};"
+    "BOINC.prototype.getUserName = function () {"
+    "    return this.userName;"
+    "};"
+    "BOINC.prototype.getTeamName = function () {"
+    "    return this.teamName;"
+    "};"
+    "BOINC.prototype.getWorkunitName = function () {"
+    "    return this.wuName;"
+    "};"
+    "BOINC.prototype.getResultName = function () {"
+    "    return this.resultName;"
+    "};"
+    "BOINC.prototype.getAuthenticator = function () {"
+    "    return this.authenticator;"
+    "};"
+    "BOINC.prototype.getUserId = function () {"
+    "    return this.userId;"
+    "};"
+    "BOINC.prototype.getTeamId = function () {"
+    "    return this.teamId;"
+    "};"
+    "BOINC.prototype.getHostId = function () {"
+    "    return this.hostId;"
+    "};"
+    "BOINC.prototype.getUserCreditTotal = function () {"
+    "    return this.userCreditTotal;"
+    "};"
+    "BOINC.prototype.getUserCreditAverage = function () {"
+    "    return this.userCreditAverage;"
+    "};"
+    "BOINC.prototype.getHostCreditTotal = function () {"
+    "    return this.hostCreditTotal;"
+    "};"
+    "BOINC.prototype.getHostCreditAverage = function () {"
+    "    return this.hostCreditAverage;"
+    "};"
+    "BOINC.prototype.isExiting = function () {"
+    "    return this.exit;"
+    "};"
+    "BOINC.prototype.getExitTimeout = function () {"
+    "    return this.exit_timeout;"
+    "};"
+    "BOINC.prototype.isVrtualBoxJob = function () {"
+    "    return this.vboxJob;"
+    "};"
+    "BOINC.prototype.getWebAPIPort = function () {"
+    "    return this.webAPIPort;"
+    "};"
+    "BOINC.prototype.getRemoteDesktopPort = function () {"
+    "    return this.remoteDesktopPort;"
+    "};"
+    "BOINC.prototype.getFractionDone = function () {"
+    "    return this.fractionDone;"
+    "};"
+    "BOINC.prototype.getElapsedTime = function () {"
+    "    return this.elapsedTime;"
+    "};"
+    "BOINC.prototype.getCPUTime = function () {"
+    "    return this.cpuTime;"
+    "};"
+    "BOINC.prototype.isSuspended = function () {"
+    "    return this.suspended;"
+    "};"
+    "BOINC.prototype.isNetworkSuspended = function () {"
+    "    return this.networkSuspended;"
+    "};"
+    "BOINC.prototype.isAbortRequested = function () {"
+    "    return this.abortRequested;"
+    "};"
+    "BOINC.prototype.isQuitRequested = function () {"
+    "    return this.quitRequested;"
+    "};"
+    "BOINC.prototype.isStateFileUpdated = function () {"
+    "    return this.stateFileUpdated;"
+    "};";
+
+
+int handle_static_boinc_js(struct mg_connection *conn) {
+    mg_send_status(conn, 200);
+    mg_send_header(conn, "Content-Type", "text/javascript");
+    mg_send_header(conn, "Cache-Control", "max-age=0, post-check=0, pre-check=0, no-store, no-cache, must-revalidate");
+    mg_send_header(conn, "Access-Control-Allow-Origin", "*");
+    mg_printf_data(
+        conn,
+        "%s",
+        boinc_js
+    );
+    return MG_TRUE;
+}
+
diff --git a/samples/gfx_html/webboincpng.cpp b/samples/gfx_html/webboincpng.cpp
new file mode 100644
index 0000000..7af6388
--- /dev/null
+++ b/samples/gfx_html/webboincpng.cpp
@@ -0,0 +1,133 @@
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2014-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/>.
+
+#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
+
+#include "base64.h"
+#include "browserlog.h"
+#include "mongoose.h"
+#include "webstatic.h"
+
+
+static const char* boinc_png =
+    "iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAAARnQU1BAA"
+    "Cxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAWdEVYdFNvZnR3YXJlAHBhaW50Lm5ldCA0"
+    "LjA76PVpAAAP+klEQVR4Xu1bCVRURxZtYyaZZJzJTAQUHU2MmkzGmMXJHg9BRREwGtAxuKJG1G"
+    "jiLogCQWURRBYR0QCiAqKAiiuyNLIJSKJAq6CAoOyyNmvTDXTNe7+rW5r+H6FBj5wz95x3oP9/"
+    "r+rdV8uvqv8+7//oAkLIG0WPhZ7wdwi9NOAhlUqH5pZWuwCnV+gldoDC69v94xLHLz9Eom8+SA"
+    "PDN+mtAQvgMMznQrpg5AIP4nU+PQw4vkxvKQOj4xBy/fLQefvJmyb7yAhTN3Iq7rYACtCmKgMO"
+    "4PtIt9PJORomLgwnbVN34h+VGQRcB1MVGfCCZ8SNU5rz3RjFN8Fg6PfOZJiJM/G5cCMfChpDVQ"
+    "cMgNNoh8D4PI05TgyXocayIGBPCI677Q/3B8kVX/K7mnlkxEJPJfJD0XC2I9GY40icguJLIAj/"
+    "ZgwGAEQi0Vhbv+hC9J8RJgh7FUF4a/EBEp6U480EISwp23nUEq8n5I2fkGcC8J090Zi1h2zzvl"
+    "IlkUg+pXW8sGhtlb5n4X25BH1G3xVBQOkUhLFmBwk/4+F+nqCgYrXe9qB2vIg3GaUu5DWMdhMN"
+    "w13E3Cmsvq6xUZfW9cKhUSz+YKP7uXL0lfG5myDobw+SFlUKbRjDwnKh6WybEIkyeQcl8poGv4"
+    "LYkvk7j7cUV9YbMYY9BHY1GEKa8FevWSRZm5Nf5shPzT58KV5w7GJ81tH49HsHCkqqrVvE4iWg"
+    "NwnkVWraYzQ1iT9Z4xRahT6irxoGduA3+G4kD4KDgpvh9kBp0eO6bdRUhsr6JsMFe8JalMmDdC"
+    "KvoW9DNGfsJAYbDkuy8ysWUFNW4NwCMvl+QbnbkbCEexucQqS6y2D86VmSYTqbWWXszB3EcI0n"
+    "sdgfLvINS+Q/Kq3eCMH4Jy2SE0Jh8+fL7YJqNWdYy3zkDIIjmb0jqKO8uvEXaqqMhhaJzkqXc/"
+    "VM16fksRCmMEpeczqI3g6is9KjI01QsJqaKgCkh9Q3Nm8IiLieP3fjIaL97RZWsj2RUdO2kRXW"
+    "xzr4aTlnuXpF6eOGyQt3BNSjT4xv4KOGvjXRnKkahHk2we2VdU3m1JQdzRLJfzYeuFTFGMnJz7"
+    "QhGhBdOXlNve1Ec6ol+XShkzQ6NdsS7YD4YGFD80/eIXFVH5vsYiWkjny9yEmSlJlvwjjXBcXl"
+    "dVPmbf2tCX3RnAY+dRMEU9vg9tr6lqXUtHtAtN+38Y0q1jKErg+FMIVNB2HIWzHktaZaEK0p28"
+    "gHxrsIjGOfywmCjG8W72Uloa58scBRzE/PZiV/r7DMYPYv3i3ogyb4ohQEPQwCDgdZEJbsOimp"
+    "EbaYUtOeAYLwlktQXJ4WtD7T9aFQLUoeK8SKtb7dSrTAURzXw/vQ1dlk0rzdonP8W4bUHSU8LK"
+    "1aZLTWs11LZ4vMB/QFfaJB0FIEYSdZtjtY3NDcakxNewfo1sN9ziRnaWNXwkKnyVveggzTRfL9"
+    "S1ouH5nsEh2/mMpKHp4WZt+t9eqQ62IDKIIAfsmCAAL+mu8JaWlqbWMtp8eAIPzjxKX01FEG1k"
+    "zhTCVqkn9HfzuZ88tBssUlVGJ/5FLF/oCo/P3Hogrtj1yu3uxyun2hhS9Zuyeo5ULsLQNavRKy"
+    "88vM9M3dFeQ7i3IQLMgah5AmUVubHjXtG3BmP8PPiBljZCOrpBfkR+tZkFV2J1oDL6ZeEDaIfo"
+    "KhNQHK+zMtWgG4/jeQD0D+Si8p4Vb2I7Mpy11ZyctFS0cWhHWOIQ2watWhpv0DcOzVq9fvnv3X"
+    "7F+ZbsfmQGcZNc2CbN0XVnn3QdlOsO3Ttjo1M/+nyYuduyUvl/VOIXVA/itq2r/AR13CH3mBH5"
+    "nYsVYul+kr3Trif79/EPT/Tk3VBpTxemxqTtRnP9iz1tVZZv/sRSQS6bfU9NkAHHopLavA9QtT"
+    "BymbEyttjtU8rhHqU/V+Adb5oKhqi8nGQ+1sdcrln1O3kXP8DA9q9myRfrtgg85SF6Vuud7pZB"
+    "F09/eoCiekyby/SmN5k8g1nh6J4elK43nj4X/2k5pOqK1vnr3I0q+1c51dBXpfGy7mqMmzhSC3"
+    "aNGMlW4SrHjpdr9K3IrSWyoAgkOkcbx10mu8NCDcRuKhYTvLNZ5QyuedAplKeDzZYQULquoavp"
+    "+19kC3PcH9eAyfqvcP2tvbcZf2Gv2phPziSoPNLqeE5VV1U+glFQBpUyBfQRKAaBJIMsh1lEFU"
+    "6PVEEAgG6PLBZhw1V4Egr9hqwhxbVvIosCKVtrT000SIM7i1V4TofFxGAozFN+hlJYDOMPqvEk"
+    "gobzCQOcS0MBJEsqmwSbwxmJB0lJdlgr/T4HoK3MfgQKDArh6EdS7BOcHvTFIyG3m5+IYnhFD1"
+    "vqGwpGrN2zOsmAnGK5ifAWR7dEhKCG8QtKIf0+pICokj6T/+RMjNV1QFr/8OwZAHAnoDBEAMcw"
+    "TrYgb8mDir04qwq5jt8G8Bnb9RdfXhGcSPkS98hoNs2ReaLxKJ3qG3OQHk1zAtj+SRFJJjI95V"
+    "MBDYI+RBuMarhglzJC1WCQHnkkO7EpfLO/pWpEbY2O2ZxVOBz+B1jifFXVd+y60DyhrF4olUTQ"
+    "XSSJ42ON7AdHts+Z6Sl4s8CDhkcDjweWG0aCWIRG26n87nXh/4hiUGUFX1AF3oqy8X7WVd+Xmc"
+    "iMmG+6yHFOCwM9P1sRVxjLORfJpgELDnQA+CYHZAmRNo8QrgXLDZ+XR5V9/kYul2JoeqqodHZT"
+    "WrhsPamq3wpVZ4tE5Uxied+B4zrY8EuMZ8TwSDh0GU9QJXWoUSDobEBbL5h2Jm5S/maqQeISrl"
+    "rhPustgKX7DtNwKFf0lVFWAWODj28dGGkx4bsZ4KBg+HkGxCFNAqlHBD8GALm38oej/uRx/HUt"
+    "Xe49j5FH+uAPy0G98wqa71wVEzRffv7djvKvJhAL2JeSKwrBbrGpq/xx0nm48fmexCHydT1d7D"
+    "+3R8CFcA4GnQBoUrv2MDwHjdxixoUiEAfen+csHJEJ8k1yAIiTxNWo0C4IPuOIMdrD6Oh+vQA2"
+    "ZQ1d7DO4Q7ABZu4ewB4D/fAIATnAF412hn3wJwLOK6H1cAfnY4id3rhR4CH8/dhQH4hqr2HleS"
+    "7zpyBQCPtlgnwXjeJ89zEiwqq+GcBKebu6GP6r/ZLqqoWcn1GHzPyJpIJO1rqKoCzGPwGmx8nt"
+    "NjsFbY7KKty35Et2zn0Vbopd1nhXQHiN4XXAshlOiUu6wrNOiqe/t1IRTHvhBCgI9ToTeyHs5Y"
+    "uoXfpWrqAQp/ba3DyVauQ1DbgxFNoKNyiAkBGP48lsJyJP6ea/k5ywmV35lkP6qiPjwCY69yBW"
+    "CisR1pbBSxvmiEVlvdL5uhOF4V12aoM5Ju5S2dtsKVOZxBGTvTilTWNP5Ab6uPguJK89HTt6uQ"
+    "l4tXcGwx9hSqrgCzHY7j+TJDAYOgznb4Gq8VyphGi3wqCstqZsIKtQn9MrM62szWO3sNmET+sd"
+    "L2RDPXPPDBnF/Jo5LqvVRdCcyEyOcdVOdAhMQxR2Ssz3Dw6SUgx9ormpsln+FxvG94YhC91Hec"
+    "ibnlM6yblyHmdsfbwCHO42hoxR9AyhhiGAgkyXEkBq0uBd0YIM+5hs+4V2y5ae/p0traxg/pJS"
+    "WAL+NBWO+pBShszH83H1aMLzbxDIp9jBVTExWQC7zXgdg6kBQQlUNRuFYLEgITaLcpOFW19d8Z"
+    "0UNR0y1HhOVVzyll51JClusIjjUBCj6Lj55NfgRBeJeacEIaxfsLs2uMocfi0bzxMGe8RG9zor"
+    "K2ftZCC1+lY3Hj9d6tj0pq+j7ZPQ0w7oZsdg172LnyroJBcD8RU9PW1jadmvULoO5B+cWVG002"
+    "sL8YMVjtIb1fUL6eqj87CHJLfhs5lX3d3VkwraW8Wsieh9NLQI8aF8HPiHzaqzGdpc7kZs6j3d"
+    "Ss/yHIK93zjdk+RVIEmxNyWW4dcBscV9m59QZgPzYlM//g6l0nxD1JvsC1yqemDiT5Vp47PiVo"
+    "MX0Hdj8g7/K1meuTzJBungg/2wffbmyUalFzJQCpt0DegzK5Xo9//rCkaqvPqfgkmHQ7epp1gv"
+    "4wOQvg24S5e0h0anYw1KH+HkAOjKQgr8zjy2VustSTbhIk8Mh8m2voHSDBdmjx58ik20ErbY/D"
+    "BiWAWLmfbbc/crHcxT/yvsvRyDz7I5eqN+49JdVf5U5GTGHffXJJZ/KYGIEpPOPmYN6SIArqVT"
+    "/lH8ln5ZX6fI7k5dlhHCky2FJAIhfIq+T0IfkLcVmRY/S5V5PqClM/Qx6J00QpzGMCX0fPsiMh"
+    "0TfT2RrkqQCnB2fllR39bIWHLNOqmySp4eAAtGIOVDSCmiuA5C8nCCLxJQUbAXVl5FR4HONcpC"
+    "tLielKXpYqZ020jeyI3/m0++Bbz88EwOmXs/LLgyYt82Ry7LpLk9OGHuEZyM8AGw1qrgCSj03N"
+    "juQ6rlJXZq72kFxJFHjsOxadoa0nG5Zs5OUZo1qGdsTtVGKpuCcrQ3D6lcy88tBPVhyQZVd2ky"
+    "g5YoYVORSagF1MJf0Frr0Wn54TiWdybCTUEXjMSWHjFSUWi5lzAfD1Dd+z1+NGGwJRxifwDfxD"
+    "P9FfpvHQd0z1NdpD7PxjMHWGO3sEnH41I78s4sMVB5m8WvZUWVkQRkIF/hEpKWDD+vIRnJscdC"
+    "n19ux1XmQEDBE2Qj0RPOtbYukn9j+TGC6RSr+mxSuAPofzM8PeNbEHv2SJkV3JMzyYrHEHssnr"
+    "sqi5lSVnEFssI6/8ykQg/7Rk6VEwuQRe+R1flXc7w8J9zBCfdDe3xNEjMPbWOvvgNiZZejp3sv"
+    "R4w51MsvRG5xCh98m4i8UVNauhHJXh1Rlwf3DsjfveHy/ep0iN1WTyg5XJyzPFVzifaxc2iFZR"
+    "c4b8X27llsVO+PFQl28FVNPl3zK2J6djM2Kg0tepeY+BAYO6vhGL21fcyS2xjUy+4x4e/cfhs7"
+    "E3va9ev+NSAM9/uD8P5H3Q7fVCJv3OQ9vJq72ksuRoGfmhXcgzH4IYO5P/7g4llbVNNlDPIF5G"
+    "/uPo93/0Yb6iUP1g4kkQxszbS84n3rkCRiqLmBcFOY8qVs3c7NfO1vKyz2acma9ikOt3tqdIpb"
+    "B5Hy+7sMJYZ2ugpLtPZsaZupIrKTkRQL7vq6tnjKKKOuP5tidFbC0vJ//mvP1kqmWQOLdUKNu0"
+    "CQoq53+96VibIgidPpp6d7EH4d/MDwXyT83ielHQ0NKiY+5yto4hz3wio0z+q03HO+4UVionT6"
+    "TdK1vy5fqAjs5B+PdyLxKfWYhvQQcMeTngcfnhVp+rpbKPpJ6Q/2SdnzTtXvEmqqaMuMyHP/5n"
+    "nR8ThImrfEhqdjEmAfTfzuo5A3x/2yE44b7GXFeG/PurjpCkO8Uu9DY74rMK187dHSbNeFDuM5"
+    "DJywEcNA5funnjX+aHSXRG4XH4zZmDqAAo6fZIcYAAuAypqm+2g78Dbig/Y/B4/wMa6F2dR046"
+    "ugAAAABJRU5ErkJggg==";
+
+
+int handle_static_boinc_png(struct mg_connection *conn) {
+    std::string image;
+    image = r_base64_decode(boinc_png, strlen(boinc_png));
+
+    mg_send_status(conn, 200);
+    mg_send_header(conn, "Content-Type", "image/png");
+    mg_send_header(conn, "Cache-Control", "max-age=0, post-check=0, pre-check=0, no-store, no-cache, must-revalidate");
+    mg_send_header(conn, "Access-Control-Allow-Origin", "*");
+    mg_send_data(
+        conn,
+        image.c_str(),
+        image.size()
+    );
+    return MG_TRUE;
+}
+
diff --git a/samples/gfx_html/webindexhtml.cpp b/samples/gfx_html/webindexhtml.cpp
new file mode 100644
index 0000000..eac676a
--- /dev/null
+++ b/samples/gfx_html/webindexhtml.cpp
@@ -0,0 +1,190 @@
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2014-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/>.
+
+#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
+
+#include "browserlog.h"
+#include "mongoose.h"
+#include "webstatic.h"
+
+
+static const char* index_html =
+    "<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>"
+    "<html>"
+    "<head>"
+    "    <title></title>"
+    "    <script type='text/javascript' src='boinc.js'></script>"
+    "</head>"
+    "<body style='background-color: Black; overflow: hidden'>"
+    "    <div id='content' style='position: absolute'>"
+    "        <table>"
+    "            <tr>"
+    "                <td style='vertical-align: middle'>"
+    "                    <img alt='' src='boinc.png' />"
+    "                </td>"
+    "                <td style='vertical-align: top; width: 250px'>"
+    "                    <div id='username_container' style='visibility: hidden; color: White'></div>"
+    "                    <div id='teamname_container' style='visibility: hidden; color: White'></div>"
+    "                    <div id='workunitname_container' style='visibility: hidden; color: White'></div>"
+    "                    <div id='progressbar_container' style='visibility: hidden; border: 1px Solid White; width: 245px; height: 23px'>"
+    "                        <div id='progressbar_text' style='z-index: 1; position: absolute; color: White; text-align: center; vertical-align: middle; height: 21px; width: 245px'></div>"
+    "                        <div id='progressbar' style='z-index: 0; position: absolute; height: 21px; width: 0px; background-color: Blue;'></div>"
+    "                    </div>"
+    "                    <div id='message_container' style='text-align: center; color: White'>Initializing...</div>"
+    "                </td>"
+    "            </tr>"
+    "        </table>"
+    "    </div>"
+    "    <script type='text/javascript'>"
+    "        var interval;"
+    "        var step = 5;"
+    "        var delay = 1000;"
+    "        var height = 0;"
+    "        var Hoffset = 0;"
+    "        var Woffset = 0;"
+    "        var yon = 0;"
+    "        var xon = 0;"
+    "        var xPos = 0;"
+    "        var yPos = 0;"
+    "        var boinc = new BOINC();"
+    ""
+    "        function refresh() {"
+    "            boinc.poll();"
+    ""
+    "            var message = '';"
+    ""
+    "            if (boinc.getUserName().length != 0) {"
+    "                document.getElementById('username_container').innerHTML = boinc.getUserName();"
+    "            }"
+    "            if (boinc.getTeamName().length != 0) {"
+    "                document.getElementById('teamname_container').innerHTML = boinc.getTeamName();"
+    "            }"
+    "            if (boinc.getWorkunitName().length != 0) {"
+    "                document.getElementById('workunitname_container').innerHTML = boinc.getWorkunitName();"
+    "            }"
+    ""
+    "            document.getElementById('progressbar').style.width = "
+    "                String(Math.floor(parseInt(document.getElementById('progressbar_container').style.width) * boinc.getFractionDone()) + 'px');"
+    "            document.getElementById('progressbar_text').innerHTML = "
+    "                String(Math.floor(100 * boinc.getFractionDone()) + ' %');"
+    ""
+    "            if (boinc.isSuspended()) {"
+    "                message = 'Task is suspended.';"
+    "            } else if (boinc.isNetworkSuspended()) {"
+    "                message = 'Network is suspended.';"
+    "            } else if (boinc.isExiting()) {"
+    "                message = 'Exiting in ' + boinc.getExitTimeout() + ' seconds';"
+    "            }"
+    ""
+    "            if ((document.getElementById('username_container').innerHTML.length == 0) || boinc.isExiting()) {"
+    "                document.getElementById('username_container').style.visibility = 'hidden';"
+    "                document.getElementById('teamname_container').style.visibility = 'hidden';"
+    "                document.getElementById('workunitname_container').style.visibility = 'hidden';"
+    "                document.getElementById('progressbar_container').style.visibility = 'hidden';"
+    "                document.getElementById('message_container').style.visibility = 'visible';"
+    "            } else {"
+    "                document.getElementById('username_container').style.visibility = 'visible';"
+    "                document.getElementById('teamname_container').style.visibility = 'visible';"
+    "                document.getElementById('workunitname_container').style.visibility = 'visible';"
+    "                document.getElementById('progressbar_container').style.visibility = 'visible';"
+    "                document.getElementById('message_container').style.visibility = 'hidden';"
+    "                if (message.length > 0) {"
+    "                    document.getElementById('message_container').innerHTML = message;"
+    "                    document.getElementById('message_container').style.textAlign = 'left';"
+    "                    document.getElementById('message_container').style.visibility = 'visible';"
+    "                } else {"
+    "                    document.getElementById('message_container').innerHTML = '';"
+    "                    document.getElementById('message_container').style.visibility = 'hidden';"
+    "                }"
+    "            }"
+    ""
+    "            update_positions();"
+    "        }"
+    ""
+    "        function update_positions() {"
+    "            if (navigator.appName == 'Microsoft Internet Explorer') {"
+    "                width = document.body.clientWidth;"
+    "                height = document.body.clientHeight;"
+    "                document.getElementById('content').style.left = xPos + document.body.scrollLeft;"
+    "                document.getElementById('content').style.top = yPos + document.body.scrollTop;"
+    "            } else {"
+    "                height = window.innerHeight;"
+    "                width = window.innerWidth;"
+    "                document.getElementById('content').style.top = yPos + window.pageYOffset;"
+    "                document.getElementById('content').style.left = xPos + window.pageXOffset;"
+    "            }"
+    "            Hoffset = document.getElementById('content').offsetHeight;"
+    "            Woffset = document.getElementById('content').offsetWidth;"
+    ""
+    "            if (yon) {"
+    "                yPos = yPos + step;"
+    "            } else {"
+    "                yPos = yPos - step;"
+    "            }"
+    "            if (yPos < 0) {"
+    "                yon = 1;"
+    "                yPos = 0;"
+    "            }"
+    "            if (yPos >= (height - Hoffset)) {"
+    "                yon = 0;"
+    "                yPos = (height - Hoffset);"
+    "            }"
+    "            if (xon) {"
+    "                xPos = xPos + step;"
+    "            } else {"
+    "                xPos = xPos - step;"
+    "            }"
+    "            if (xPos < 0) {"
+    "                xon = 1;"
+    "                xPos = 0;"
+    "            }"
+    "            if (xPos >= (width - Woffset)) {"
+    "                xon = 0;"
+    "                xPos = (width - Woffset);"
+    "            }"
+    "        }"
+    ""
+    "        interval = setInterval('refresh()', delay);"
+    "    </script>"
+    "</body>"
+    "</html>";
+
+
+int handle_static_index_html(struct mg_connection *conn) {
+    mg_send_status(conn, 200);
+    mg_send_header(conn, "Content-Type", "text/html");
+    mg_send_header(conn, "Cache-Control", "max-age=0, post-check=0, pre-check=0, no-store, no-cache, must-revalidate");
+    mg_send_header(conn, "Access-Control-Allow-Origin", "*");
+    mg_printf_data(
+        conn,
+        "%s",
+        index_html
+    );
+    return MG_TRUE;
+}
diff --git a/samples/gfx_html/webserver.cpp b/samples/gfx_html/webserver.cpp
new file mode 100644
index 0000000..f007eeb
--- /dev/null
+++ b/samples/gfx_html/webserver.cpp
@@ -0,0 +1,165 @@
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2014-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/>.
+
+#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
+
+#include "parse.h"
+#include "filesys.h"
+#include "boinc_api.h"
+#include "app_ipc.h"
+#include "browser.h"
+#include "browserlog.h"
+#include "mongoose.h"
+#include "webapi.h"
+#include "webstatic.h"
+#include "webserver.h"
+
+#if defined(_MSC_VER)
+#define snprintf    _snprintf
+#define getcwd      _getcwd
+#endif
+
+
+#define WEBSERVER_STATE_UNINIT  0
+#define WEBSERVER_STATE_INIT    1
+#define WEBSERVER_STATE_POLLING 2
+#define WEBSERVER_STATE_EXITING 3
+
+
+struct mg_server* webserver;
+int  webserver_state = WEBSERVER_STATE_UNINIT;
+char webserver_listening[64];
+char webserver_documentroot[64];
+char webserver_domain[64];
+
+
+static int ev_handler(struct mg_connection *conn, enum mg_event ev) {
+    switch (ev) {
+        case MG_REQUEST:
+            if        (!strcmp(conn->uri, "/api/static/index.html")) { 
+                return handle_static_index_html(conn); 
+            } else if (!strcmp(conn->uri, "/api/static/boinc.js")) { 
+                return handle_static_boinc_js(conn); 
+            } else if (!strcmp(conn->uri, "/api/static/boinc.png")) { 
+                return handle_static_boinc_png(conn); 
+            } else if (!strcmp(conn->uri, "/api/getInitData")) { 
+                return handle_get_init_data(conn); 
+            } else if (!strcmp(conn->uri, "/api/getGraphicsStatus")) {
+                return handle_get_graphics_status(conn);
+            } else if (!strcmp(conn->uri, "/api/resetReadFlag")) {
+                return handle_reset_read_flag(conn);
+            } else if (boinc_file_exists(conn->uri+1)) {
+                return handle_filesystem_request(conn);
+            }
+            return MG_FALSE;
+        case MG_AUTH:
+            return MG_TRUE;
+        default:
+            return MG_FALSE;
+    }
+}
+
+
+static int webserver_handler() {
+    int retval = 1;
+
+    switch(webserver_state) {
+        case WEBSERVER_STATE_INIT:
+            webserver = mg_create_server(NULL, ev_handler);
+            mg_set_option(webserver, "listening_port", webserver_listening);
+            mg_set_option(webserver, "document_root", webserver_documentroot);
+            mg_set_option(webserver, "enable_directory_listing", "no");
+            mg_set_option(webserver, "index_files", "");
+            mg_set_option(webserver, "auth_domain", webserver_domain);
+            webserver_state = WEBSERVER_STATE_POLLING;
+            break;
+        case WEBSERVER_STATE_POLLING:
+            handle_poll_server();
+            mg_poll_server(webserver, 1000);
+            break;
+        case WEBSERVER_STATE_EXITING:
+            mg_destroy_server(&webserver);
+            retval = 0;
+        default:
+            assert(false);
+    }
+
+    return retval;
+}
+
+#ifdef _WIN32
+DWORD WINAPI webserver_thread(void*) {
+    while (webserver_handler()) {}
+    return 0;
+}
+#else
+static void* webserver_thread(void*) {
+    while (webserver_handler()) {}
+    return 0;
+}
+#endif
+
+int start_webserver_thread() {
+#ifdef _WIN32
+    if (!CreateThread(NULL, 0, webserver_thread, 0, 0, NULL)) {
+        return GetLastError();
+    }
+#else
+    int retval = pthread_create(NULL, NULL, webserver_thread, NULL);
+    if (retval) {
+        return retval;
+    }
+#endif
+    return 0;
+}
+
+
+int webserver_initialize() {
+    snprintf(
+        webserver_listening, sizeof(webserver_listening)-1,
+        "127.0.0.1:%d",
+        get_htmlgfx_webserver_port()
+    );
+
+    getcwd(webserver_documentroot, sizeof(webserver_documentroot)-1);
+
+    snprintf(
+        webserver_domain, sizeof(webserver_domain)-1,
+        "htmlgfx"
+    );
+
+    webserver_state = WEBSERVER_STATE_INIT;
+    return start_webserver_thread();
+}
+
+int webserver_destroy() {
+    webserver_state = WEBSERVER_STATE_EXITING;
+    return 0;
+}
+
diff --git a/clientgui/res/skins/default/graphic/dialog_background_image.xpm b/samples/gfx_html/webserver.h
similarity index 78%
copy from clientgui/res/skins/default/graphic/dialog_background_image.xpm
copy to samples/gfx_html/webserver.h
index 29d6c76..376d8e1 100644
--- a/clientgui/res/skins/default/graphic/dialog_background_image.xpm
+++ b/samples/gfx_html/webserver.h
@@ -1,7 +1,6 @@
-/* XPM */
 // This file is part of BOINC.
 // http://boinc.berkeley.edu
-// Copyright (C) 2011 University of California
+// Copyright (C) 2014-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 +14,11 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
-static const char *dialog_background_image_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"1 1 1 1",
-"  c #D3D3D3",
-/* pixels */
-" "
-};
+
+#ifndef _WEBSERVER_H_
+#define _WEBSERVER_H_
+
+int webserver_initialize();
+int webserver_destroy();
+
+#endif
diff --git a/html/user/rss_main.php b/samples/gfx_html/webstatic.h
similarity index 72%
copy from html/user/rss_main.php
copy to samples/gfx_html/webstatic.h
index e86fcf0..e18df3b 100644
--- a/html/user/rss_main.php
+++ b/samples/gfx_html/webstatic.h
@@ -1,7 +1,6 @@
-<?php
 // This file is part of BOINC.
 // http://boinc.berkeley.edu
-// Copyright (C) 2008 University of California
+// Copyright (C) 2014-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
@@ -16,14 +15,11 @@
 // 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("../project/project.inc");
-require_once("../inc/forum_rss.inc");
-require_once("../inc/news.inc");
+#ifndef _WEBSTATIC_H_
+#define _WEBSTATIC_H_
 
-$forum = news_forum();
-if (!$forum) {
-    exit;
-}
+int handle_static_index_html(struct mg_connection *conn);
+int handle_static_boinc_png(struct mg_connection *conn);
+int handle_static_boinc_js(struct mg_connection *conn);
 
-forum_rss($forum->id, 0, 1, 90);
-?>
+#endif
diff --git a/samples/vboxmonitor/Makefile b/samples/vboxmonitor/Makefile
index 92b6d63..41b9eaa 100644
--- a/samples/vboxmonitor/Makefile
+++ b/samples/vboxmonitor/Makefile
@@ -26,5 +26,5 @@ clean: distclean
 distclean:
 	/bin/rm -f $(PROGS) *.o libstdc++.a
 
-vboxwrapper: vboxmonitor.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
+vboxmonitor: vboxmonitor.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
 	g++ $(CXXFLAGS) -o vboxmonitor vboxmonitor.o libstdc++.a -pthread -lboinc_api -lboinc
diff --git a/samples/vboxmonitor/vboxmonitor.cpp b/samples/vboxmonitor/vboxmonitor.cpp
index 78a4111..7d50688 100644
--- a/samples/vboxmonitor/vboxmonitor.cpp
+++ b/samples/vboxmonitor/vboxmonitor.cpp
@@ -19,16 +19,13 @@
 // see: http://boinc.berkeley.edu/trac/wiki/VboxApps
 // Options:
 //
-//
 // Duplicate everything sent to stdin to the console and the VM Guest Log.
 //
 // You can see the VM Guest Log on the host machine by executing:
 // vboxmanage showvminfo <vm_name> --log 0
 //
-// As a matter of course, vboxwrapper dumps the last 16k of the guest log to
-// the stderr log which is uploaded to the project server in case of an error.
-//
-//
+// vboxwrapper dumps the last 16k of the guest log to the stderr log
+// which is uploaded to the project server.
 
 #include <stdio.h>
 #include <sys/io.h>
@@ -36,8 +33,7 @@
 #include <iostream>
 #include <string>
 
-void guestlog(int c)
-{
+void guestlog(int c) {
     asm volatile ("out %%al,%%dx\n" : : "a"(c), "d"(0x504));
 }
 
@@ -45,6 +41,7 @@ int main() {
     std::string buffer;
 
     // root access required
+    //
     if (iopl(3)) {
         if (EPERM == errno) {
             printf("vboxmonitor: this application requires root permissions.\n");
@@ -53,9 +50,9 @@ int main() {
         return 1;
     }
 
-    while (getline(std::cin,buffer)) {
-
+    while (getline(std::cin, buffer)) {
         // Write output to stdout as well as VirtualBox's Guest VM Log
+        //
         for (size_t i = 0; i < buffer.size(); ++i) {
             // Virtualbox
             guestlog((int)buffer[i]);
@@ -64,12 +61,12 @@ int main() {
             putc((int)buffer[i], stdout);
         }
 
-        // Force newlines so that the text looks good on the console and causes
+        // Write newlines so that the text looks good on the console and causes
         // the guest additions to actually log the data
+        //
         guestlog('\n');
         putc('\n', stdout);
 
     }
-    
     return 0;
 }
diff --git a/samples/vboxwrapper/Makefile b/samples/vboxwrapper/Makefile
index 4762dfc..61c8028 100644
--- a/samples/vboxwrapper/Makefile
+++ b/samples/vboxwrapper/Makefile
@@ -29,8 +29,26 @@ distclean:
 floppyio.o: floppyio.cpp
 	g++ $(CXXFLAGS) -c floppyio.cpp
 
-vbox.o: vbox.cpp
-	g++ $(CXXFLAGS) -c vbox.cpp
+vbox_common.o: vbox_common.cpp
+	g++ $(CXXFLAGS) -c vbox_common.cpp
 
-vboxwrapper: vboxwrapper.o vbox.o floppyio.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
-	g++ $(CXXFLAGS) -o vboxwrapper vboxwrapper.o vbox.o floppyio.o libstdc++.a -pthread -lboinc_api -lboinc
+vbox_vboxmanage.o: vbox_vboxmanage.cpp
+	g++ $(CXXFLAGS) -c vbox_vboxmanage.cpp
+
+vboxcheckpoint.o: vboxcheckpoint.cpp
+	g++ $(CXXFLAGS) -c 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
diff --git a/samples/vboxwrapper/Makefile_mac b/samples/vboxwrapper/Makefile_mac
index 313ad92..5d05f17 100644
--- a/samples/vboxwrapper/Makefile_mac
+++ b/samples/vboxwrapper/Makefile_mac
@@ -23,7 +23,12 @@ CXXFLAGS = $(VARIANTFLAGS) \
 
 OBJ = \
     floppyio.o \
-    vbox.o \
+    vbox_common.o \
+    vbox_vboxmanage.o \
+    vboxcheckpoint.o \
+    vboxjob.o \
+    vboxlog.o \
+    vboxlogging.o \
     vboxwrapper.o
 
 PROGS = vboxwrapper
@@ -34,10 +39,28 @@ clean:
 	/bin/rm -f $(PROGS) $(OBJ)
 
 floppyio.o: floppyio.cpp
-	$(CXX) $(CXXFLAGS) -c floppyio.cpp
+	g++ $(CXXFLAGS) -c floppyio.cpp
 
-vbox.o: vbox.cpp
-	$(CXX) $(CXXFLAGS) -c vbox.cpp
+vbox_common.o: vbox_common.cpp
+	g++ $(CXXFLAGS) -c vbox_common.cpp
 
-vboxwrapper: vboxwrapper.o vbox.o floppyio.o $(BOINC_BUILD_DIR)/libboinc.a $(BOINC_BUILD_DIR)/libboinc_api.a
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o vboxwrapper vboxwrapper.o vbox.o floppyio.o -pthread -lboinc_api -lboinc
+vbox_vboxmanage.o: vbox_vboxmanage.cpp
+	g++ $(CXXFLAGS) -c vbox_vboxmanage.cpp
+
+vboxcheckpoint.o: vboxcheckpoint.cpp
+	g++ $(CXXFLAGS) -c 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
+	$(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
diff --git a/samples/vboxwrapper/cernvm/cernvmwrapper.cpp b/samples/vboxwrapper/cernvm/cernvmwrapper.cpp
deleted file mode 100644
index 52871bf..0000000
--- a/samples/vboxwrapper/cernvm/cernvmwrapper.cpp
+++ /dev/null
@@ -1,1197 +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/>.
-
-// wrapper.C
-// wrapper program for CernVM - lets you use CernVM on BOINC
-//
-// Handles:
-// - suspend/resume/quit/abort virtual machine 
-//
-// Contributor: Jie Wu <jiewu AT cern DOT ch>
-//
-// Contributor: Daniel Lombraña González <teleyinex AT gmail DOT com>
-
-#include <stdio.h>
-#include <string>
-#include <sstream>
-#include <iostream>
-#include <fstream>
-#include <time.h>
-#include <stdlib.h>
-#include "zlib.h"
-
-#ifdef _WIN32
-#include <windows.h>
-#include <tchar.h>
-#include <shlwapi.h>
-#pragma comment(lib, "shlwapi.lib")
-#include <stdio.h>
-#include <conio.h>
-#include <string.h>
-#pragma hdrstop
-#include "boinc_win.h"
-#include "win_util.h"
-#else
-#include <sys/wait.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include "procinfo.h"
-#endif
-
-#include "boinc_api.h"
-#include "diagnostics.h"
-#include "filesys.h"
-#include "parse.h"
-#include "str_util.h"
-#include "str_replace.h"
-#include "util.h"
-#include "error_numbers.h"
-
-#define VM_NAME "VMName"
-#define CPU_TIME      "CpuTime"
-#define PROGRESS_FN "ProgressFile"
-#define TRICK_PERIOD 45.0*60
-#define CHECK_PERIOD 2.0*60
-#define POLL_PERIOD 1.0
-#define MESSAGE "CPUTIME"
-#define YEAR_SECS 365*24*60*60
-#define BUFSIZE 4096
-
-using std::string;
-
-struct VM {
-    string virtual_machine_name;
-    string disk_name;
-    string disk_path;
-    string name_path;
-
-    double current_period;
-    time_t last_poll_point;
-        
-    bool suspended;
-   
-    VM();
-    void create();
-    void throttle();
-    void start(bool vrde, bool headless);
-    void kill();
-    void pause();
-    void savestate();
-    void resume();
-    void Check();    
-    void remove();
-    void release(); //release the virtual disk
-    int send_cputime_message();
-    void poll();
-};
-
-void write_cputime(double);
-
-APP_INIT_DATA aid;
-
-
-int unzip (const char *infilename, const char *outfilename)
-{
-    gzFile infile = gzopen(infilename, "rb");
-    FILE *outfile = fopen(outfilename, "wb");
-    if (!infile || !outfile) return -1;
-
-    char buffer[128];
-    int num_read = 0;
-
-    while ((num_read = gzread(infile, buffer, sizeof(buffer))) > 0)
-    {
-        fwrite(buffer, 1, num_read, outfile);
-    }
-
-    gzclose(infile);
-    fclose(outfile);
-}
-
-#ifdef _WIN32
-bool IsWinNT()  //check if we're running NT
-{
-  OSVERSIONINFO osv;
-  osv.dwOSVersionInfoSize = sizeof(osv);
-  GetVersionEx(&osv);
-  return (osv.dwPlatformId == VER_PLATFORM_WIN32_NT);
-}
-#endif
-
-bool vbm_popen(string arg_list,
-               char * buffer=NULL, 
-               int nSize=1024,
-               string command="VBoxManage -q "){
-//when buffer is NULL, this function will not return the input of new process.
-//Otherwise, it will not redirect the input of new process to buffer
-#ifdef _WIN32
-    STARTUPINFO si;
-    SECURITY_ATTRIBUTES sa;
-    SECURITY_DESCRIPTOR sd;               //security information for pipes
-    PROCESS_INFORMATION pi;
-    HANDLE newstdout,read_stdout;  //pipe handles
-    unsigned long exit=0;
-    if(buffer!=0){
-        if (IsWinNT())        //initialize security descriptor (Windows NT)
-        {
-        InitializeSecurityDescriptor(&sd,SECURITY_DESCRIPTOR_REVISION);
-        SetSecurityDescriptorDacl(&sd, true, NULL, false);
-        sa.lpSecurityDescriptor = &sd;
-        }
-        else sa.lpSecurityDescriptor = NULL;
-        sa.nLength = sizeof(SECURITY_ATTRIBUTES);
-        sa.bInheritHandle = true;         //allow inheritable handles
-
-        if (!CreatePipe(&read_stdout,&newstdout,&sa,0))  //create stdout pipe
-        {
-            fprintf(stderr,"CreatePipe Failed\n");
-            CloseHandle(newstdout);
-            CloseHandle(read_stdout);
-            return false;
-        }
-    }
-    GetStartupInfo(&si);
-    si.dwFlags = STARTF_USESHOWWINDOW;
-    si.wShowWindow = SW_HIDE;
-    if(buffer!=NULL){
-        si.dwFlags = STARTF_USESTDHANDLES|si.dwFlags;
-        si.hStdOutput = newstdout;
-        si.hStdError = newstdout;   //set the new handles for the child process
-        si.hStdInput = NULL;
-    }
-
-    command+=arg_list;
-    if (!CreateProcess( NULL,
-                        (LPTSTR)command.c_str(),
-                        NULL,
-                        NULL,
-                        TRUE,
-                        CREATE_NO_WINDOW,
-                        NULL,
-                        NULL,
-                        &si,
-                        &pi))
-    {
-        fprintf(stderr,"CreateProcess Failed!");
-        if(buffer!=NULL){
-            CloseHandle(newstdout);
-            CloseHandle(read_stdout);
-        }
-        return false;
-    }
-    //while(1)     
-    //{
-    //    GetExitCodeProcess(pi.hProcess,&exit); //while the process is running
-    //    if (exit != STILL_ACTIVE)
-    //      break;
-    //}
-
-    // Wait until process exists.
-    WaitForSingleObject( pi.hProcess, INFINITE );
-
-    // Close process and thread handles.
-    CloseHandle(pi.hThread);
-    CloseHandle(pi.hProcess);
-
-    if(buffer!=NULL){
-        memset(buffer,0,nSize);
-        DWORD bread;
-        BOOL bSuccess = false;
-
-        for (;;)
-        {
-            ReadFile(read_stdout,buffer,nSize-1,&bread,NULL);
-            if ( ! bSuccess || bread == 0 ) break;
-        }
-//      buffer[bread]=0;
-        CloseHandle(newstdout);
-        CloseHandle(read_stdout);
-    }
-
-    if(exit==0) 
-        return true;
-    else
-        return false;
-#else     //linux
-    FILE* fp;
-    char temp[256];
-    string strTemp="";
-    command+=arg_list;
-    if(buffer==NULL){
-        if(!system(command.c_str()))
-            return true;
-        else return false;
-    }
-
-    fp = popen(command.c_str(),"r");
-    if (fp == NULL){
-        fprintf(stderr,"ERROR: vbm_popen popen failed!\n");
-        return false;
-    }
-    memset(buffer,0,nSize);
-    while (fgets(temp,256,fp) != NULL){
-        strTemp+=temp;
-    }
-    pclose(fp);
-    strncpy(buffer,strTemp.c_str(),nSize-1);
-    return true;
-#endif
-}
-
-VM::VM(){
-    char buffer[256];
-
-    virtual_machine_name="";
-    current_period=0;
-    suspended=false;
-    last_poll_point=0;
-    
-    //boinc_resolve_filename_s("cernvm.vmdk.gz",disk_path);
-//  fprintf(stderr,"%s\n",disk_path.c_str());
-//  relative_to_absolute(buffer,(char*)disk_path.c_str());
-    boinc_getcwd(buffer);
-    disk_name = "cernvm.vmdk";
-    disk_path = "cernvm.vmdk";
-    disk_path="/"+disk_path;
-    disk_path=buffer+disk_path;
-    disk_path="\""+disk_path+"\"";
-//  disk_path=buffer;
-//  fprintf(stderr, "%s\n",disk_path.c_str());
-
-    name_path="";
-    //boinc_get_init_data(aid);
-    //name_path += aid.project_dir;
-    //name_path += "/";
-    name_path += VM_NAME;
-}   
-
-void VM::create() {
-    time_t rawtime;
-    string arg_list;
-    char buffer[256];
-    FILE* fp;
-
-    //rawtime=time(NULL);
-    //strftime ( buffer, 256, "%Y%m%d%H%M%S", localtime (&rawtime) );
-    //virtual_machine_name="";
-    //virtual_machine_name += "BOINC_VM_";
-    //virtual_machine_name += buffer;
-    //
-    //First release old virtual disks
-    //release();
-
-//createvm
-    arg_list="";
-    arg_list="createvm --name "+virtual_machine_name+ \
-            " --ostype Linux26 --register";
-    if(!vbm_popen(arg_list)){
-        fprintf(stderr,"ERROR: Create VM method: createvm failed!\n");
-        fprintf(stderr,"ERROR: %s\n",arg_list.c_str());
-        fprintf(stderr,"INFO: Cleaning registered VM from a failure...\n");
-        remove();
-        fprintf(stderr,"INFO: createvm() Aborting\n");
-        boinc_finish(1);
-    }
-
-//modifyvm
-    arg_list="";
-    arg_list="modifyvm "+virtual_machine_name+ \
-            " --memory 256 --acpi on --ioapic on \
-            --boot1 disk --boot2 none --boot3 none --boot4 none \
-            --nic1 nat \
-            --natdnsproxy1 on";
-
-//CernVM BOINC version doesn't need hostonly network interface
-/*
-#ifdef _WIN32
-    arg_list+="--nic2 hostonly --hostonlyadapter2 \"VirtualBox Host-Only Ethernet Adapter\"";
-#else
-    arg_list+="--nic2 hostonly --hostonlyadapter2 \"vboxnet0\"";
-#endif
-*/
-    vbm_popen(arg_list);
-
-
-//storagectl
-    arg_list="";
-    arg_list="storagectl "+virtual_machine_name+ \
-            " --name \"IDE Controller\" --add ide --controller PIIX4";
-    vbm_popen(arg_list);
-
-
-//openmedium
-//    arg_list="";
-//    arg_list="openmedium disk "+disk_path;
-//    vbm_popen(arg_list);
-
-//storageattach
-    arg_list="";
-    arg_list="storageattach "+virtual_machine_name+ \
-            " --storagectl \"IDE Controller\" \
-            --port 0 --device 0 --type hdd --medium " \
-            +disk_path;
-    if(!vbm_popen(arg_list)){
-        fprintf(stderr,"ERROR: Create storageattach failed!\n");
-        fprintf(stderr,"ERROR: %s\n",arg_list.c_str());
-        fprintf(stderr,"INFO: storageattach() Aborting\n");
-        //DEBUG for knowing which filename is being used
-        //fprintf(stderr,disk_path.c_str());
-        //fprintf(stderr,"\n");
-        remove();
-        boinc_finish(1);
-        exit(0);
-    }
-
-    // Write down the name of the virtual machine in a file called VM_NAME
-    if((fp=fopen(name_path.c_str(),"w"))==NULL){
-        fprintf(stderr,"ERROR: Saving VM name failed. Details: fopen failed!\n");
-        fprintf(stderr,"INFO: VM_NAME Aborting\n");
-        boinc_finish(1);
-    }
-    fputs(virtual_machine_name.c_str(),fp);
-    fclose(fp);
-
-}
-
-void VM::throttle()
-{
-    // Check the BOINC CPU preferences for running the VM accordingly
-    string arg_list = "";
-    boinc_get_init_data(aid);
-    double max_vm_cpu_pct = 100.0;
-    
-    if (aid.project_preferences)
-    {
-        if (!aid.project_preferences) return;
-        if (parse_double(aid.project_preferences, "<max_vm_cpu_pct>", max_vm_cpu_pct)) 
-        {
-            fprintf(stderr,"INFO: Maximum usage of CPU: %f\n", max_vm_cpu_pct);
-            fprintf(stderr,"INFO: Setting how much CPU time the virtual CPU can use: %i\n", int(max_vm_cpu_pct));
-            std::stringstream out;
-            out << int(max_vm_cpu_pct);
-
-            arg_list = " controlvm " + virtual_machine_name + " cpuexecutioncap " + out.str();
-            if (!vbm_popen(arg_list))
-            {
-                fprintf(stderr,"ERROR: Impossible to set up CPU percentage usage limit\n");
-            }
-            else
-            {
-                fprintf(stderr,"INFO: Success!\n");
-            
-            }
-        
-        }
-    
-    }
-}
-
-void VM::start(bool vrde=false, bool headless=false) {
-    // Start the VM in headless mode
-    
-    boinc_begin_critical_section();
-    string arg_list="";
-
-    if (headless) arg_list=" startvm "+ virtual_machine_name + " --type headless";
-    else arg_list = " startvm "+ virtual_machine_name;
-    if (!vbm_popen(arg_list))
-    {
-        fprintf(stderr,"ERROR: Impossible to start the VM\n");
-        fprintf(stderr,"ERROR: %s\n",arg_list.c_str());
-        fprintf(stderr,"INFO: Removing VM...\n");
-        remove();
-        boinc_end_critical_section();
-        boinc_finish(1);
-    }
-    // Enable or disable VRDP for the VM: (by default is disabled)
-    if (vrde)
-    {
-        arg_list = "";
-        arg_list = " controlvm " + virtual_machine_name + " vrde on";
-    }
-    else
-    {
-        arg_list = "";
-        arg_list = " controlvm " + virtual_machine_name + " vrde off";
-    }
-    vbm_popen(arg_list);
-
-    // If not running in Headless mode, don't allow the user to save, shutdown, power off or restore the VM
-    if (!headless)
-    {
-        arg_list = "";
-        // Don't allow the user to save, shutdown, power off or restore the VM
-        arg_list = " setextradata " + virtual_machine_name + " GUI/RestrictedCloseActions SaveState,Shutdown,PowerOff,Restore";
-        vbm_popen(arg_list);
-    }
-
-    throttle();
-
-    boinc_end_critical_section();
-}
-
-void VM::kill() {
-    boinc_begin_critical_section();
-    string arg_list="";
-    arg_list="controlvm "+virtual_machine_name+" poweroff";
-    vbm_popen(arg_list);
-    boinc_end_critical_section();
-}
-
-void VM::pause() {
-    boinc_begin_critical_section();
-    time_t current_time;
-    string arg_list="";
-    arg_list="controlvm "+virtual_machine_name+" pause";
-    if(vbm_popen(arg_list)) {
-        suspended = true;
-        current_time=time(NULL);
-        current_period += difftime (current_time,last_poll_point);
-    }
-    boinc_end_critical_section();
-        
-}
-
-void VM::resume() {
-    boinc_begin_critical_section();
-    string arg_list="";
-    arg_list="controlvm "+virtual_machine_name+" resume";
-    if(vbm_popen(arg_list)) {
-        suspended = false;
-        last_poll_point=time(NULL);
-    
-    }
-    boinc_end_critical_section();
-}
-
-void VM::Check(){
-    boinc_begin_critical_section();
-    string arg_list="";
-    if(suspended){
-        arg_list="controlvm "+virtual_machine_name+" resume";
-        vbm_popen(arg_list);
-    }
-    arg_list="controlvm "+virtual_machine_name+" savestate";
-    vbm_popen(arg_list);
-    boinc_end_critical_section();
-}
-
-void VM::savestate()
-{
-    boinc_begin_critical_section();
-    string arg_list = "";
-    arg_list = "controlvm " + virtual_machine_name + " savestate";
-    if (!vbm_popen(arg_list))
-    {
-        fprintf(stderr,"ERROR: The VM could not be saved.\n");
-    }
-    boinc_end_critical_section();
-
-}
-
-void VM::remove(){
-    boinc_begin_critical_section();
-    string arg_list="",vminfo, vboxfolder, vboxXML, vboxXMLNew, vmfolder, vmdisk, line;
-    char * env;
-    char buffer[4096];
-    size_t found_init, found_end;
-    FILE * fp;
-    bool vmRegistered = false;
-
-
-    arg_list = "";
-    arg_list = " discardstate " + virtual_machine_name;
-    if (vbm_popen(arg_list)) fprintf(stderr,"INFO: VM state discarded!\n");
-    else fprintf(stderr,"WARNING: it was not possible to discard the state of the VM.\n");
-
-    // Unregistervm command with --delete option. VBox 4.1 should work well
-    arg_list = "";
-    arg_list = " unregistervm " + virtual_machine_name + " --delete";
-    if (vbm_popen(arg_list)) fprintf(stderr, "INFO: VM unregistered and deleted via VBoxManage.\n");
-    else fprintf(stderr, "WARNING: The VM could not be removed via VBoxManage.\n");
-    
-    // We test if we can remove the hard disk controller. If the command works, the cernvm.vmdk virtual disk will be also
-    // removed automatically
-
-    arg_list = "";
-    arg_list = " storagectl  " + virtual_machine_name + " --name \"IDE Controller\" --remove";
-    if (vbm_popen(arg_list)) fprintf(stderr, "INFO: Hard disk removed!\n");
-    else  fprintf(stderr,"WARNING: it was not possible to remove the IDE controller.\n");
-
-#ifdef _WIN32
-	env = getenv("HOMEDRIVE");
-	fprintf(stderr,"INFO: I´m running in a Windows system...\n");
-	vboxXML = string(env);
-	env = getenv("HOMEPATH");
-	vboxXML = vboxXML + string(env);
-	vboxfolder = vboxXML + "\\VirtualBox VMs\\";
-	vboxXML = vboxXML + "\\.VirtualBox\\VirtualBox.xml";
-	//fprintf(stderr,"INFO: VirtualBox XML file: %s\n",vboxXML.c_str());
-
-
-#else 
-    // New idea
-    env = getenv("HOME");
-    vboxXML = string(env);
-
-    if (vboxXML.find("Users") == string::npos)
-    {
-        // GNU/Linux
-        vboxXML = vboxXML + "/.VirtualBox/VirtualBox.xml";
-        vboxfolder = string(env) + "/.VirtualBox/";
-        fprintf(stderr,"INFO: I'm running in a GNU/Linux system...\n");
-    }
-    else
-    {
-        // Mac OS X
-        vboxXML = vboxXML + "/Library/VirtualBox/VirtualBox.xml";
-        vboxfolder = string(env) + "/Library/VirtualBox/";
-        fprintf(stderr,"INFO: I'm running in a Mac OS X system...\n");
-    }
-#endif
-
-    std::ifstream in(vboxXML.c_str());
-
-    if (in.is_open())
-    {
-        vboxXMLNew = vboxfolder + "VirtualBox.xmlNew";
-        std::ofstream out(vboxXMLNew.c_str());
-
-        int line_n = 0;
-        while (std::getline(in,line))
-        {
-            found_init = line.find("BOINC_VM");
-            if (found_init == string::npos)
-                out << line + "\n";
-            else
-            {
-                vmRegistered = true; 
-                fprintf(stderr,"INFO: Obtaining the VM folder...\n");
-                found_init = line.find("src=");
-                found_end = line.find(virtual_machine_name + ".vbox");
-                if (found_end != string::npos)
-                    fprintf(stderr,"INFO: .vbox found at line %i in VirtualBox.xml file\n", line_n);
-                vmfolder = line.substr(found_init+5,found_end-(found_init+5));
-                // For debugging, uncomment following line:
-                //fprintf(stderr,"INFO: %s VM folder: %s\n", virtual_machine_name.c_str(),vmfolder.c_str());
-                fprintf(stderr,"INFO: Done!\n");
-            }
-            
-            line_n +=1;
-        }
-        in.close();
-        out.close();
-    }
-
-    // When the project is reset, we have to first unregister the VM, else we will have an error.
-    arg_list="unregistervm "+virtual_machine_name;
-    if(!vbm_popen(arg_list))
-    {
-        fprintf(stderr,"INFO: CernVM does not exist, so it is not necessary to unregister.\n");
-    }
-    else
-    {
-        fprintf(stderr,"INFO: Successfully unregistered the CernVM\n");
-    
-    }
-
-
-    // Delete old VirtualBox.xml and replace with new one
-    std::remove(vboxXML.c_str());
-    std::rename(vboxXMLNew.c_str(),vboxXML.c_str());
-    
-
-    // Remove remaining BOINC_VM folder
-#ifdef _WIN32
-	if (vmRegistered)
-	{
-		vmfolder = "RMDIR \"" + vmfolder + "\" /s /q";
-		if (system(vmfolder.c_str()) == 0)
-			fprintf(stderr,"INFO: VM folder deleted!\n");
-		else
-			fprintf(stderr,"INFO: System was clean, nothing to delete.\n");
-	}
-    else
-    {
-            fprintf(stderr,"INFO: VM was not registered, deleting old VM folders...\n");
-			vmfolder = "RMDIR \"" + vboxfolder + virtual_machine_name + "\" /s /q";
-            if ( system(vmfolder.c_str()) == 0 )
-                fprintf(stderr,"INFO: VM folder deleted!\n");
-            else
-                fprintf(stderr,"INFO: System was clean, nothing to delete.\n");
-    }
-
-#else // GNU/Linux and Mac OS X 
-    // First delete the VM folder obtained in VirtualBox.xml
-    if (vmRegistered)
-    {
-        vmfolder = "rm -rf \"" + vmfolder + "\"";
-        if ( system(vmfolder.c_str()) == 0 )
-            fprintf(stderr,"INFO: VM folder deleted!\n");
-        else
-        {
-            fprintf(stderr,"INFO: System was clean, nothing to delete.\n");
-        }
-    }
-    else
-    {
-            fprintf(stderr,"INFO: VM was not registered, deleting old VM folders...\n");
-            vmfolder = "rm -rf \"" + string(env) + "/VirtualBox VMs/" + virtual_machine_name + "\" ";
-            if ( system(vmfolder.c_str()) == 0 )
-                fprintf(stderr,"INFO: VM folder deleted!\n");
-            else
-                fprintf(stderr,"INFO: System was clean, nothing to delete.\n");
-    }
-#endif
-    boinc_end_critical_section();
-}
-    
-void VM::release(){
-    boinc_begin_critical_section();
-    string arg_list="";
-    arg_list="closemedium disk "+disk_path;
-    if(!vbm_popen(arg_list))
-    {
-        fprintf(stderr,"ERROR: It was impossible to release the virtual hard disk\n");
-    }
-    else
-        fprintf(stderr,"INFO: Virtual Hard disk unregistered\n");
-    boinc_end_critical_section();
-}
-
-int VM::send_cputime_message() {
-    char text[256];
-    int reval;
-    string variety=MESSAGE;
-    sprintf(text,"<run_time>%lf</run_time>",current_period);
-    reval=boinc_send_trickle_up((char *)variety.c_str(), text);
-    current_period=0;
-    write_cputime(0);
-    return reval;
-}
-
-void VM::poll() {
-    boinc_begin_critical_section();
-    FILE* fp;
-    string arg_list, status;
-    char buffer[1024];
-    time_t current_time;
-
-    
-    arg_list="";
-    arg_list="showvminfo "+virtual_machine_name+" --machinereadable" ;
-    if (!vbm_popen(arg_list,buffer,sizeof(buffer))){
-        fprintf(stderr,"ERROR: Get status from VM failed!\n");
-        fprintf(stderr,"INFO: poll() Aborting\n");
-        boinc_end_critical_section();
-        boinc_finish(1);
-    }
-
-    status=buffer;
-    if(status.find("VMState=\"running\"") !=string::npos){
-        if(suspended){
-            suspended=false;
-            last_poll_point=time(NULL);
-        }
-        else{
-            current_time=time(NULL);
-            current_period += difftime (current_time,last_poll_point);
-            last_poll_point=current_time;
-            fprintf(stderr,"INFO: VM poll is running\n");
-        }
-        boinc_end_critical_section();
-        return;
-        fprintf(stderr,"INFO: VM is running!\n");  //testing
-    }
-    if(status.find("VMState=\"paused\"") != string::npos){
-        time_t current_time;
-        if(!suspended){
-            suspended=true;
-                    current_time=time(NULL);
-                    current_period += difftime (current_time,last_poll_point);
-            }
-        fprintf(stderr,"INFO: VM is paused!\n");  //testing
-        boinc_end_critical_section();
-        return;
-    }
-    //if(status.find("VMState=\"poweroff\"") != string::npos 
-    //    ||status.find("VMState=\"saved\"") != string::npos){
-    //    fprintf(stderr,"INFO: VM is powered off or saved!\n"); //testing
-    //    exit(0);
-    //}
-    if (status.find("VMState=\"poweroff\"") != string::npos)
-    {
-        fprintf(stderr, "INFO: VM is powered off and it shouldn't\n");
-        fprintf(stderr, "INFO: Cancelling WU...\n");
-        boinc_end_critical_section();
-        boinc_finish(1);
-        exit(1);
-    }
-    fprintf(stderr,"ERROR: Get cernvm status error!\n");
-    fprintf(stderr,"INFO: cernvm status error Aborting\n");
-    remove();
-    boinc_end_critical_section();
-    boinc_finish(1);
-}
-
-void poll_boinc_messages(VM& vm, BOINC_STATUS &status) {
-
-    if (status.reread_init_data_file)
-    {
-        fprintf(stderr,"INFO: Project preferences changed\n");
-        vm.throttle();
-    }
-
-    if (status.no_heartbeat) {
-    fprintf(stderr,"INFO: BOINC no_heartbeat\n");
-    //vm.Check();
-    vm.savestate();
-        exit(0);
-    }
-    if (status.quit_request) {
-        fprintf(stderr,"INFO: BOINC status quit_request = True\n");
-        //vm.Check();
-        vm.savestate();
-        exit(0);
-    }
-    if (status.abort_request) {
-    fprintf(stderr,"INFO: BOINC status abort_request = True\n");    
-        fprintf(stderr,"INFO: saving state of the vm and removing it...\n");
-        vm.savestate();
-        //vm.send_cputime_message();
-        vm.remove();
-        fprintf(stderr,"INFO: VM removed and task aborted\n");
-        boinc_finish(0);
-    }
-    if (status.suspended) {
-        fprintf(stderr,"INFO: BOINC status suspend = True. Stopping VM\n");
-        if (!vm.suspended) {
-            vm.pause();
-        }
-    } else {
-        fprintf(stderr,"INFO: BOINC status suspend = False. Resuming VM\n");
-        if (vm.suspended) {
-            vm.resume();
-        }
-    }
-}
-
-void write_cputime(double cpu) {
-    // TODO: modify this method to use real CPU usage from VirtualBox API.
-    FILE* f = fopen(CPU_TIME, "w");
-    if (!f) return;
-    fprintf(f, "%lf\n", cpu);
-    fclose(f);
-}
-
-void read_cputime(double& cpu) {
-    long int c;
-    cpu = 0;
-    FILE* f = fopen(CPU_TIME, "r");
-    if (!f) return;
-    int n = fscanf(f, "%ld",&c);
-    fclose(f);
-    if (n != 1) return;
-    cpu = c;
-}
-
-void write_progress(time_t secs)
-{
-    FILE* f = fopen(PROGRESS_FN, "w");
-    fprintf(f,"%ld\n", secs);
-    //Flushing progress file after 5 minutes for not losing work
-    if ((int)boinc_elapsed_time() % (5*60) == 0)
-    {
-#ifdef _WIN32
-        fprintf(stderr,"INFO: Flushing buffers after 5 minutes!\n");
-        fflush(f);
-        _commit(_fileno(f));
-#else
-        fprintf(stderr,"INFO: Flushing buffers after 5 minutes!\n");
-        fsync(fileno(f));
-#endif
-    }
-    fclose(f);
-}   
-
-time_t read_progress() {
-    time_t stored_secs;
-    FILE* f = fopen(PROGRESS_FN, "r");
-    if (!f) return(0);
-    int n = fscanf(f, "%ld",&stored_secs);
-    fclose(f);
-    if (n != 1) return(0);
-    else return(stored_secs);
-}
-
-time_t update_progress(time_t secs) {
-    time_t old_secs;
-
-    old_secs = read_progress();
-    write_progress(old_secs +  secs);
-    return(old_secs + secs);
-    
-}
-
-
-
-int main(int argc, char** argv) {
-    BOINC_OPTIONS options;
-    BOINC_STATUS status;
-    double cpu_time=0, cpu_chkpt_time=0;
-    FILE*fp;
-    char buffer[2048]; // Enough size for the VBoxManage list vms output
-    unsigned int i;
-    bool graphics = false;
-    bool headless = false;
-    bool vrde = false;
-    bool vm_name = false;
-    bool retval = false;
-    // Name for the VM vmdk filename
-    string cernvm = "cernvm.vmdk";
-    string resolved_name;
-    unsigned int output;
-
-
-    // Get BOINC APP INIT DATA
-    //
-    boinc_get_init_data(aid);
-
-
-    // The VM
-    VM vm;
-
-    // Registering time for progress accounting
-    time_t init_secs = time (NULL); 
-    //fprintf(stderr,"INFO: %ld seconds since January 1, 1970\n", init_secs);
-
-
-
-    // Checking command line options
-    for (i=1; i<(unsigned int)argc; i++) 
-    {
-        if (!strcmp(argv[i], "--graphics")) graphics = true;
-        if (!strcmp(argv[i], "--headless")) headless = true;
-        if (!strcmp(argv[i], "--vmname"))
-        {
-            vm.virtual_machine_name = argv[i+1];
-            fprintf(stderr,"INFO: The name of the VM is: %s\n",vm.virtual_machine_name.c_str());
-        
-        }
-    }
-
-    // If the wrapper has not be called with the command line argument --vmname NAME, give a default name to the VM
-    if (vm.virtual_machine_name.empty())
-    {
-        vm.virtual_machine_name = "BOINC_VM";
-    
-    }
-
-    memset(&options, 0, sizeof(options));
-    options.main_program = true;
-    options.check_heartbeat = true;
-    options.handle_process_control = true;
-    options.send_status_msgs = true;
-    
-    if (graphics) {
-    options.backwards_compatible_graphics = true;
-    }
-     boinc_init_options(&options);
-
-    // Setting up the PATH for Windows machines:
-    #ifdef _WIN32
-        // DEBUG information:
-        fprintf(stderr,"\nSetting VirtualBox PATH in Windows...\n");
-
-		// First get the HKEY_LOCAL_MACHINE\SOFTWARE\Oracle\VirtualBox
-        fprintf(stderr,"Trying to grab installation path of VirtualBox from Windows Registry...\n");
-		TCHAR szPath[4096];
-		DWORD dwType;
-		DWORD cbSize = sizeof(szPath) - sizeof(TCHAR); // Leave room for nul terminator
-		if (SHGetValue(HKEY_LOCAL_MACHINE,TEXT("SOFTWARE\\Oracle\\VirtualBox"),TEXT("InstallDir"),&dwType,szPath,&cbSize) == ERROR_SUCCESS)
-		{
-			//szPath[cbSize / sizeof(TCHAR)] = TEXT(´\0´);
-			fprintf(stderr,"Success!!! Installation PATH of VirtualBox is: %s.\n",szPath);
-		}
-		else
-		{
-			fprintf(stderr,"ERROR: Retrieving the HKEY_LOCAL_MACHINE\\SOFTWARE\\Oracle\\VirtualBox\\InstallDir value was impossible\n\n");
-
-            fprintf(stderr,"Trying with VBOX_INSTALL_PATH environment variable...\n");
-            LPTSTR VBoxInsPath;
-            DWORD dwRet, dwErr;
-            BOOL fExist, fSuccess;
-            // Retrieve old PATH variable
-            VBoxInsPath = (LPTSTR) malloc(4096*sizeof(TCHAR));
-                if(NULL == VBoxInsPath)
-                {
-					fprintf(stderr,"ERROR: malloc for VBoxInsPAth variable. Reason: Out of memory\n");
-                    return FALSE;
-                }
-            
-                dwRet = GetEnvironmentVariable("VBOX_INSTALL_PATH", VBoxInsPath, 4096);
-            if(0 == dwRet)
-                {
-                    dwErr = GetLastError();
-                    if( ERROR_ENVVAR_NOT_FOUND == dwErr )
-                    {
-						fprintf(stderr,"ERROR: VBOX_INSTALL_PATH environment variable does not exist.\n");
-						fprintf(stderr,"ERROR: Impossible to set up the VirtualBox PATH. Aborting execution.\n\n");
-                        fExist=FALSE;
-                        boinc_finish(1);
-                    }
-                    else
-                    {
-                        fprintf(stderr,"ERROR: GetLastError ouput for VBOX_INSTALL_PATH environment variable: %u\n", dwErr);
-                        fprintf(stderr,"INFO: GetLastError Aborting\n");
-                        fExist=FALSE;
-                        boinc_finish(1);
-                    
-                    }
-                }
-            free(VBoxInsPath);
-		}
-
-        // New variables for setting the environment variable PATH
-        LPTSTR pszOldVal;
-        LPTSTR newVirtualBoxPath;
-        LPTSTR virtualbox;
-        DWORD dwRet, dwErr;
-        BOOL fExist, fSuccess;
-
-
-
-    
-        // Create the new PATH variable
-        newVirtualBoxPath = (LPTSTR) malloc(4096*sizeof(TCHAR));
-        if(NULL == newVirtualBoxPath)
-            {
-				fprintf(stderr, "ERROR: malloc for newVirtualBoxPath variable. Reason: Out of memory\n");
-                return FALSE;
-            }
-        virtualbox = szPath;
-                
-        // Retrieve old PATH variable
-        pszOldVal = (LPTSTR) malloc(4096*sizeof(TCHAR));
-            if(NULL == pszOldVal)
-            {
-				fprintf(stderr,"ERROR: malloc of pszOldVal variable. Reason: Out of memory\n");
-                return FALSE;
-            }
-        
-            dwRet = GetEnvironmentVariable("PATH", pszOldVal, 4096);
-        if(0 == dwRet)
-            {
-                dwErr = GetLastError();
-                if( ERROR_ENVVAR_NOT_FOUND == dwErr )
-                {
-                    fprintf(stderr,"ERROR: PATH environment variable does not exist.\n");
-                    fExist=FALSE;
-                    exit(1);
-                }
-            }
-        else
-        {
-            // DEBUG: print old PATH enviroment variable
-            fprintf(stderr,"Old PATH environment variable:\n");
-            fprintf(stderr,pszOldVal);
-            fprintf(stderr,"\n");
-            // Set new PATH environment variable
-			lstrcat(pszOldVal,";"); // Concat ; to old PATH
-			// Add VirtualBox path
-			SetEnvironmentVariable("PATH",lstrcat(pszOldVal,virtualbox));
-		    dwRet = GetEnvironmentVariable("PATH", pszOldVal, 4096);
-            fprintf(stderr,"\nAdding VirtualBox to PATH:\n");
-            fprintf(stderr,pszOldVal);
-            fprintf(stderr,"\n");
-        }
-        // Free memory
-        free(pszOldVal);
-        free(newVirtualBoxPath);
-    #endif
-
-    // We check if the VM has already been created and launched
-    if (fp=fopen("VMName","r"))
-    {
-        fclose(fp);
-        vm_name = true;
-    }
-    else
-    {
-        // First remove old versions
-        fprintf(stderr,"INFO: Cleaning old VMs of the project...\n");
-        vm.remove();
-        fprintf(stderr,"INFO: Cleaning completed\n");
-        // Then, Decompress the new VM.gz file
-		fprintf(stderr,"\nInitializing VM...\n");
-        fprintf(stderr,"Decompressing the VM\n");
-        retval = boinc_resolve_filename_s("cernvm.vmdk.gz",resolved_name);
-        if (retval) fprintf(stderr,"can't resolve cernvm.vmdk.gz filename");
-        unzip(resolved_name.c_str(),cernvm.c_str());
-        fprintf(stderr,"Uncompressed finished\n");
-        vm_name= false;
-    }
-
-    if (vm_name)
-    {
-        fprintf(stderr,"VMName exists\n");
-
-        bool VMexist=false;
-        string arg_list;
-        //if((fp=fopen(vm.name_path.c_str(),"r"))==NULL){
-        //    fprintf(stderr,"Main fopen failed\n");
-        //    boinc_finish(1);
-        //}
-        //if(fgets(buffer,256,fp)) vm.virtual_machine_name=buffer;
-        //fclose(fp);
-        fprintf(stderr,"INFO: Virtual machine name %s\n",vm.virtual_machine_name.c_str());
-        
-        // DEBUG for the name of the VM
-        // fprintf(stderr,"Name of the VM:\n");
-        // fprintf(stderr,vm.virtual_machine_name.c_str());
-
-        arg_list="";
-        arg_list=" list vms";
-        if (!vbm_popen(arg_list,buffer,sizeof(buffer))){
-            fprintf(stderr, "CernVMManager list failed!\n");
-            boinc_finish(1);
-        }
-
-        string VMlist=buffer;
-        // DEBUG for the list of running VMs
-        // fprintf(stderr,"List of running VMs:\n");
-        // fprintf(stderr,VMlist.c_str());
-        // fprintf(stderr,"\n");
-        if(VMlist.find(vm.virtual_machine_name.c_str()) != string::npos){
-            VMexist=true;
-        }
-
-        //Maybe voluteers delete CernVM using VB GUI
-
-        if(!VMexist){
-
-            fprintf(stderr,"INFO: VM does not exists.\n");
-            fprintf(stderr,"INFO: Cleaning old instances...\n");
-            vm.remove();
-            fprintf(stderr,"INFO: Done!\n");
-            fprintf(stderr,"INFO: Unzipping image...\n");
-            retval = boinc_resolve_filename_s("cernvm.vmdk.gz",resolved_name);
-            if (retval) fprintf(stderr,"can't resolve cernvm.vmdk.gz filename");
-            unzip(resolved_name.c_str(),cernvm.c_str());
-            fprintf(stderr,"INFO: Uncompressed finished\n");
-		    fprintf(stderr,"Registering a new VM from an unzipped image...\n");
-            vm.create();
-            fprintf(stderr,"Done!\n");
-        }
-
-    }
-    else{       
-        fprintf(stderr,"INFO: Cleaning old instances...\n");
-        vm.remove();
-		fprintf(stderr,"Registering a new VM from unzipped image...\n");
-        vm.create();
-        fprintf(stderr,"Done!\n");
-    }
-
-    time_t elapsed_secs = 0, dif_secs = 0;
-    long int t = 0;
-    double frac_done = 0; 
-
-    read_cputime(cpu_time);
-    cpu_chkpt_time = cpu_time;
-    vm.current_period=cpu_time;
-    vm.start(vrde,headless);
-    vm.last_poll_point = time(NULL);
-    
-
-
-    while (1) {
-        boinc_get_status(&status);
-        poll_boinc_messages(vm, status);
-        
-        // Report progress to BOINC client
-        if (!status.suspended)
-        {
-            vm.poll();
-            if (vm.suspended) 
-            {
-                fprintf(stderr,"WARNING: VM should be running as the WU is not suspended.\n");
-                vm.resume();
-            }
-            //if(vm.current_period >= CHECK_PERIOD)
-            //    write_cputime(vm.current_period);
-            //if(vm.current_period >= TRICK_PERIOD)
-            //vm.send_cputime_message();
-
-            elapsed_secs = time(NULL);
-            dif_secs = update_progress(elapsed_secs - init_secs);
-            // Convert it for Windows machines:
-            t = static_cast<int>(dif_secs);
-            fprintf(stderr,"INFO: Running seconds %ld\n",dif_secs);
-            // For 24 hours:
-            frac_done = floor((t/86400.0)*100.0)/100.0;
-            
-            fprintf(stderr,"INFO: Fraction done %f\n",frac_done);
-            // Checkpoint for reporting correctly the time
-            boinc_time_to_checkpoint();
-            boinc_checkpoint_completed();
-            boinc_fraction_done(frac_done);
-            if (frac_done >= 1.0)
-            {
-                fprintf(stderr,"INFO: Stopping the VM...\n");
-                vm.savestate();
-                fprintf(stderr,"INFO: VM stopped!\n");
-                vm.remove();
-                // Update the ProgressFile for starting from zero next WU
-                write_progress(0);
-                fprintf(stderr,"INFO: Done!! Cleanly exiting.\n");
-                fprintf(stderr,"INFO: Work Unit completed.\n");
-                // Output file:
-                fprintf(stderr,"INFO: Creating output file...\n");
-                FILE* output = fopen("output", "w");
-                fprintf(output, "Work Unit completed!\n");
-                fclose(output);
-                fprintf(stderr,"INFO: Done!\n");
-                boinc_finish(0);
-            }
-            else
-            {
-                init_secs = elapsed_secs;
-                boinc_sleep(POLL_PERIOD);
-            }
-        }
-        else
-        {
-            init_secs = time(NULL);
-            boinc_sleep(POLL_PERIOD);
-        }
-    }
-}
-
-#ifdef _WIN32
-
-int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR Args, int WinMode) {
-    LPSTR command_line;
-    char* argv[100];
-    int argc;
-
-    command_line = GetCommandLine();
-    argc = parse_command_line(command_line, argv);
-    return main(argc, argv);
-}
-#endif
diff --git a/samples/vboxwrapper/deprecated/mscom/VirtualBox.h b/samples/vboxwrapper/deprecated/mscom/VirtualBox.h
deleted file mode 100644
index e451232..0000000
--- a/samples/vboxwrapper/deprecated/mscom/VirtualBox.h
+++ /dev/null
@@ -1,28516 +0,0 @@
-
-
-/* this ALWAYS GENERATED file contains the definitions for the interfaces */
-
-
- /* File created by MIDL compiler version 6.00.0361 */
-/* at Fri Oct  8 15:47:06 2010
- */
-/* Compiler settings for Z:\home\vbox\tinderbox\3.2-sdk\out\linux.amd64\release\bin\sdk\bindings\mscom\idl\VirtualBox.idl:
-    Oicf, W1, Zp8, env=Win32 (32b run)
-    protocol : dce , ms_ext, c_ext, robust
-    error checks: allocation ref bounds_check enum stub_data 
-    VC __declspec() decoration level: 
-         __declspec(uuid()), __declspec(selectany), __declspec(novtable)
-         DECLSPEC_UUID(), MIDL_INTERFACE()
-*/
-//@@MIDL_FILE_HEADING(  )
-
-#pragma warning( disable: 4049 )  /* more than 64k source lines */
-
-
-/* verify that the <rpcndr.h> version is high enough to compile this file*/
-#ifndef __REQUIRED_RPCNDR_H_VERSION__
-#define __REQUIRED_RPCNDR_H_VERSION__ 475
-#endif
-
-#include "rpc.h"
-#include "rpcndr.h"
-
-#ifndef __RPCNDR_H_VERSION__
-#error this stub requires an updated version of <rpcndr.h>
-#endif // __RPCNDR_H_VERSION__
-
-
-#ifndef __VirtualBox_h__
-#define __VirtualBox_h__
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-#pragma once
-#endif
-
-/* Forward Declarations */ 
-
-#ifndef __IVirtualBoxErrorInfo_FWD_DEFINED__
-#define __IVirtualBoxErrorInfo_FWD_DEFINED__
-typedef interface IVirtualBoxErrorInfo IVirtualBoxErrorInfo;
-#endif 	/* __IVirtualBoxErrorInfo_FWD_DEFINED__ */
-
-
-#ifndef __ILocalOwner_FWD_DEFINED__
-#define __ILocalOwner_FWD_DEFINED__
-typedef interface ILocalOwner ILocalOwner;
-#endif 	/* __ILocalOwner_FWD_DEFINED__ */
-
-
-#ifndef __IVirtualBoxCallback_FWD_DEFINED__
-#define __IVirtualBoxCallback_FWD_DEFINED__
-typedef interface IVirtualBoxCallback IVirtualBoxCallback;
-#endif 	/* __IVirtualBoxCallback_FWD_DEFINED__ */
-
-
-#ifndef __IDHCPServer_FWD_DEFINED__
-#define __IDHCPServer_FWD_DEFINED__
-typedef interface IDHCPServer IDHCPServer;
-#endif 	/* __IDHCPServer_FWD_DEFINED__ */
-
-
-#ifndef __IVirtualBox_FWD_DEFINED__
-#define __IVirtualBox_FWD_DEFINED__
-typedef interface IVirtualBox IVirtualBox;
-#endif 	/* __IVirtualBox_FWD_DEFINED__ */
-
-
-#ifndef __IVFSExplorer_FWD_DEFINED__
-#define __IVFSExplorer_FWD_DEFINED__
-typedef interface IVFSExplorer IVFSExplorer;
-#endif 	/* __IVFSExplorer_FWD_DEFINED__ */
-
-
-#ifndef __IAppliance_FWD_DEFINED__
-#define __IAppliance_FWD_DEFINED__
-typedef interface IAppliance IAppliance;
-#endif 	/* __IAppliance_FWD_DEFINED__ */
-
-
-#ifndef __IVirtualSystemDescription_FWD_DEFINED__
-#define __IVirtualSystemDescription_FWD_DEFINED__
-typedef interface IVirtualSystemDescription IVirtualSystemDescription;
-#endif 	/* __IVirtualSystemDescription_FWD_DEFINED__ */
-
-
-#ifndef __IInternalMachineControl_FWD_DEFINED__
-#define __IInternalMachineControl_FWD_DEFINED__
-typedef interface IInternalMachineControl IInternalMachineControl;
-#endif 	/* __IInternalMachineControl_FWD_DEFINED__ */
-
-
-#ifndef __IBIOSSettings_FWD_DEFINED__
-#define __IBIOSSettings_FWD_DEFINED__
-typedef interface IBIOSSettings IBIOSSettings;
-#endif 	/* __IBIOSSettings_FWD_DEFINED__ */
-
-
-#ifndef __IMachine_FWD_DEFINED__
-#define __IMachine_FWD_DEFINED__
-typedef interface IMachine IMachine;
-#endif 	/* __IMachine_FWD_DEFINED__ */
-
-
-#ifndef __IConsoleCallback_FWD_DEFINED__
-#define __IConsoleCallback_FWD_DEFINED__
-typedef interface IConsoleCallback IConsoleCallback;
-#endif 	/* __IConsoleCallback_FWD_DEFINED__ */
-
-
-#ifndef __IRemoteDisplayInfo_FWD_DEFINED__
-#define __IRemoteDisplayInfo_FWD_DEFINED__
-typedef interface IRemoteDisplayInfo IRemoteDisplayInfo;
-#endif 	/* __IRemoteDisplayInfo_FWD_DEFINED__ */
-
-
-#ifndef __IConsole_FWD_DEFINED__
-#define __IConsole_FWD_DEFINED__
-typedef interface IConsole IConsole;
-#endif 	/* __IConsole_FWD_DEFINED__ */
-
-
-#ifndef __IHostNetworkInterface_FWD_DEFINED__
-#define __IHostNetworkInterface_FWD_DEFINED__
-typedef interface IHostNetworkInterface IHostNetworkInterface;
-#endif 	/* __IHostNetworkInterface_FWD_DEFINED__ */
-
-
-#ifndef __IHost_FWD_DEFINED__
-#define __IHost_FWD_DEFINED__
-typedef interface IHost IHost;
-#endif 	/* __IHost_FWD_DEFINED__ */
-
-
-#ifndef __ISystemProperties_FWD_DEFINED__
-#define __ISystemProperties_FWD_DEFINED__
-typedef interface ISystemProperties ISystemProperties;
-#endif 	/* __ISystemProperties_FWD_DEFINED__ */
-
-
-#ifndef __IGuestOSType_FWD_DEFINED__
-#define __IGuestOSType_FWD_DEFINED__
-typedef interface IGuestOSType IGuestOSType;
-#endif 	/* __IGuestOSType_FWD_DEFINED__ */
-
-
-#ifndef __IGuest_FWD_DEFINED__
-#define __IGuest_FWD_DEFINED__
-typedef interface IGuest IGuest;
-#endif 	/* __IGuest_FWD_DEFINED__ */
-
-
-#ifndef __IProgress_FWD_DEFINED__
-#define __IProgress_FWD_DEFINED__
-typedef interface IProgress IProgress;
-#endif 	/* __IProgress_FWD_DEFINED__ */
-
-
-#ifndef __ISnapshot_FWD_DEFINED__
-#define __ISnapshot_FWD_DEFINED__
-typedef interface ISnapshot ISnapshot;
-#endif 	/* __ISnapshot_FWD_DEFINED__ */
-
-
-#ifndef __IMediumAttachment_FWD_DEFINED__
-#define __IMediumAttachment_FWD_DEFINED__
-typedef interface IMediumAttachment IMediumAttachment;
-#endif 	/* __IMediumAttachment_FWD_DEFINED__ */
-
-
-#ifndef __IMedium_FWD_DEFINED__
-#define __IMedium_FWD_DEFINED__
-typedef interface IMedium IMedium;
-#endif 	/* __IMedium_FWD_DEFINED__ */
-
-
-#ifndef __IMediumFormat_FWD_DEFINED__
-#define __IMediumFormat_FWD_DEFINED__
-typedef interface IMediumFormat IMediumFormat;
-#endif 	/* __IMediumFormat_FWD_DEFINED__ */
-
-
-#ifndef __IKeyboard_FWD_DEFINED__
-#define __IKeyboard_FWD_DEFINED__
-typedef interface IKeyboard IKeyboard;
-#endif 	/* __IKeyboard_FWD_DEFINED__ */
-
-
-#ifndef __IMouse_FWD_DEFINED__
-#define __IMouse_FWD_DEFINED__
-typedef interface IMouse IMouse;
-#endif 	/* __IMouse_FWD_DEFINED__ */
-
-
-#ifndef __IFramebuffer_FWD_DEFINED__
-#define __IFramebuffer_FWD_DEFINED__
-typedef interface IFramebuffer IFramebuffer;
-#endif 	/* __IFramebuffer_FWD_DEFINED__ */
-
-
-#ifndef __IFramebufferOverlay_FWD_DEFINED__
-#define __IFramebufferOverlay_FWD_DEFINED__
-typedef interface IFramebufferOverlay IFramebufferOverlay;
-#endif 	/* __IFramebufferOverlay_FWD_DEFINED__ */
-
-
-#ifndef __IDisplay_FWD_DEFINED__
-#define __IDisplay_FWD_DEFINED__
-typedef interface IDisplay IDisplay;
-#endif 	/* __IDisplay_FWD_DEFINED__ */
-
-
-#ifndef __INetworkAdapter_FWD_DEFINED__
-#define __INetworkAdapter_FWD_DEFINED__
-typedef interface INetworkAdapter INetworkAdapter;
-#endif 	/* __INetworkAdapter_FWD_DEFINED__ */
-
-
-#ifndef __ISerialPort_FWD_DEFINED__
-#define __ISerialPort_FWD_DEFINED__
-typedef interface ISerialPort ISerialPort;
-#endif 	/* __ISerialPort_FWD_DEFINED__ */
-
-
-#ifndef __IParallelPort_FWD_DEFINED__
-#define __IParallelPort_FWD_DEFINED__
-typedef interface IParallelPort IParallelPort;
-#endif 	/* __IParallelPort_FWD_DEFINED__ */
-
-
-#ifndef __IMachineDebugger_FWD_DEFINED__
-#define __IMachineDebugger_FWD_DEFINED__
-typedef interface IMachineDebugger IMachineDebugger;
-#endif 	/* __IMachineDebugger_FWD_DEFINED__ */
-
-
-#ifndef __IUSBController_FWD_DEFINED__
-#define __IUSBController_FWD_DEFINED__
-typedef interface IUSBController IUSBController;
-#endif 	/* __IUSBController_FWD_DEFINED__ */
-
-
-#ifndef __IUSBDevice_FWD_DEFINED__
-#define __IUSBDevice_FWD_DEFINED__
-typedef interface IUSBDevice IUSBDevice;
-#endif 	/* __IUSBDevice_FWD_DEFINED__ */
-
-
-#ifndef __IUSBDeviceFilter_FWD_DEFINED__
-#define __IUSBDeviceFilter_FWD_DEFINED__
-typedef interface IUSBDeviceFilter IUSBDeviceFilter;
-#endif 	/* __IUSBDeviceFilter_FWD_DEFINED__ */
-
-
-#ifndef __IHostUSBDevice_FWD_DEFINED__
-#define __IHostUSBDevice_FWD_DEFINED__
-typedef interface IHostUSBDevice IHostUSBDevice;
-#endif 	/* __IHostUSBDevice_FWD_DEFINED__ */
-
-
-#ifndef __IHostUSBDeviceFilter_FWD_DEFINED__
-#define __IHostUSBDeviceFilter_FWD_DEFINED__
-typedef interface IHostUSBDeviceFilter IHostUSBDeviceFilter;
-#endif 	/* __IHostUSBDeviceFilter_FWD_DEFINED__ */
-
-
-#ifndef __IAudioAdapter_FWD_DEFINED__
-#define __IAudioAdapter_FWD_DEFINED__
-typedef interface IAudioAdapter IAudioAdapter;
-#endif 	/* __IAudioAdapter_FWD_DEFINED__ */
-
-
-#ifndef __IVRDPServer_FWD_DEFINED__
-#define __IVRDPServer_FWD_DEFINED__
-typedef interface IVRDPServer IVRDPServer;
-#endif 	/* __IVRDPServer_FWD_DEFINED__ */
-
-
-#ifndef __ISharedFolder_FWD_DEFINED__
-#define __ISharedFolder_FWD_DEFINED__
-typedef interface ISharedFolder ISharedFolder;
-#endif 	/* __ISharedFolder_FWD_DEFINED__ */
-
-
-#ifndef __IInternalSessionControl_FWD_DEFINED__
-#define __IInternalSessionControl_FWD_DEFINED__
-typedef interface IInternalSessionControl IInternalSessionControl;
-#endif 	/* __IInternalSessionControl_FWD_DEFINED__ */
-
-
-#ifndef __ISession_FWD_DEFINED__
-#define __ISession_FWD_DEFINED__
-typedef interface ISession ISession;
-#endif 	/* __ISession_FWD_DEFINED__ */
-
-
-#ifndef __IStorageController_FWD_DEFINED__
-#define __IStorageController_FWD_DEFINED__
-typedef interface IStorageController IStorageController;
-#endif 	/* __IStorageController_FWD_DEFINED__ */
-
-
-#ifndef __IPerformanceMetric_FWD_DEFINED__
-#define __IPerformanceMetric_FWD_DEFINED__
-typedef interface IPerformanceMetric IPerformanceMetric;
-#endif 	/* __IPerformanceMetric_FWD_DEFINED__ */
-
-
-#ifndef __IPerformanceCollector_FWD_DEFINED__
-#define __IPerformanceCollector_FWD_DEFINED__
-typedef interface IPerformanceCollector IPerformanceCollector;
-#endif 	/* __IPerformanceCollector_FWD_DEFINED__ */
-
-
-#ifndef __INATEngine_FWD_DEFINED__
-#define __INATEngine_FWD_DEFINED__
-typedef interface INATEngine INATEngine;
-#endif 	/* __INATEngine_FWD_DEFINED__ */
-
-
-#ifndef __VirtualBox_FWD_DEFINED__
-#define __VirtualBox_FWD_DEFINED__
-
-#ifdef __cplusplus
-typedef class VirtualBox VirtualBox;
-#else
-typedef struct VirtualBox VirtualBox;
-#endif /* __cplusplus */
-
-#endif 	/* __VirtualBox_FWD_DEFINED__ */
-
-
-#ifndef __Session_FWD_DEFINED__
-#define __Session_FWD_DEFINED__
-
-#ifdef __cplusplus
-typedef class Session Session;
-#else
-typedef struct Session Session;
-#endif /* __cplusplus */
-
-#endif 	/* __Session_FWD_DEFINED__ */
-
-
-#ifndef __CallbackWrapper_FWD_DEFINED__
-#define __CallbackWrapper_FWD_DEFINED__
-
-#ifdef __cplusplus
-typedef class CallbackWrapper CallbackWrapper;
-#else
-typedef struct CallbackWrapper CallbackWrapper;
-#endif /* __cplusplus */
-
-#endif 	/* __CallbackWrapper_FWD_DEFINED__ */
-
-
-/* header files for imported files */
-#include "unknwn.h"
-
-#ifdef __cplusplus
-extern "C"{
-#endif 
-
-void * __RPC_USER MIDL_user_allocate(size_t);
-void __RPC_USER MIDL_user_free( void * ); 
-
-/* interface __MIDL_itf_VirtualBox_0000 */
-/* [local] */ 
-
-enum {
-    kTypeLibraryMajorVersion = 1,
-    kTypeLibraryMinorVersion = 0
-};
-
-
-extern RPC_IF_HANDLE __MIDL_itf_VirtualBox_0000_v0_0_c_ifspec;
-extern RPC_IF_HANDLE __MIDL_itf_VirtualBox_0000_v0_0_s_ifspec;
-
-
-#ifndef __VirtualBox_LIBRARY_DEFINED__
-#define __VirtualBox_LIBRARY_DEFINED__
-
-/* library VirtualBox */
-/* [helpstring][version][uuid] */ 
-
-#define VBOX_E_OBJECT_NOT_FOUND 0x80BB0001
-#define VBOX_E_INVALID_VM_STATE 0x80BB0002
-#define VBOX_E_VM_ERROR 0x80BB0003
-#define VBOX_E_FILE_ERROR 0x80BB0004
-#define VBOX_E_IPRT_ERROR 0x80BB0005
-#define VBOX_E_PDM_ERROR 0x80BB0006
-#define VBOX_E_INVALID_OBJECT_STATE 0x80BB0007
-#define VBOX_E_HOST_ERROR 0x80BB0008
-#define VBOX_E_NOT_SUPPORTED 0x80BB0009
-#define VBOX_E_XML_ERROR 0x80BB000A
-#define VBOX_E_INVALID_SESSION_STATE 0x80BB000B
-#define VBOX_E_OBJECT_IN_USE 0x80BB000C
-#define VBOX_E_DONT_CALL_AGAIN 0x80BB000D
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-typedef /* [public][v1_enum][uuid] */  DECLSPEC_UUID("52bd6f5f-1adb-4493-975d-581a9c4b803f") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0001
-    {	SettingsVersion_Null	= 0,
-	SettingsVersion_v1_0	= 1,
-	SettingsVersion_v1_1	= 2,
-	SettingsVersion_v1_2	= 3,
-	SettingsVersion_v1_3pre	= 4,
-	SettingsVersion_v1_3	= 5,
-	SettingsVersion_v1_4	= 6,
-	SettingsVersion_v1_5	= 7,
-	SettingsVersion_v1_6	= 8,
-	SettingsVersion_v1_7	= 9,
-	SettingsVersion_v1_8	= 10,
-	SettingsVersion_v1_9	= 11,
-	SettingsVersion_v1_10	= 12,
-	SettingsVersion_Future	= 13
-    } 	SettingsVersion;
-
-#define SettingsVersion_T SettingsVersion
-typedef /* [public][public][v1_enum][uuid] */  DECLSPEC_UUID("1da0007c-ddf7-4be8-bcac-d84a1558785f") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0002
-    {	AccessMode_ReadOnly	= 1,
-	AccessMode_ReadWrite	= 2
-    } 	AccessMode;
-
-#define AccessMode_T AccessMode
-typedef /* [public][public][public][public][public][public][public][public][public][v1_enum][uuid] */  DECLSPEC_UUID("e998d075-543a-41fc-8aa9-5ca3e92393fd") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0003
-    {	MachineState_Null	= 0,
-	MachineState_PoweredOff	= 1,
-	MachineState_Saved	= 2,
-	MachineState_Teleported	= 3,
-	MachineState_Aborted	= 4,
-	MachineState_Running	= 5,
-	MachineState_Paused	= 6,
-	MachineState_Stuck	= 7,
-	MachineState_Teleporting	= 8,
-	MachineState_LiveSnapshotting	= 9,
-	MachineState_Starting	= 10,
-	MachineState_Stopping	= 11,
-	MachineState_Saving	= 12,
-	MachineState_Restoring	= 13,
-	MachineState_TeleportingPausedVM	= 14,
-	MachineState_TeleportingIn	= 15,
-	MachineState_DeletingSnapshotOnline	= 16,
-	MachineState_DeletingSnapshotPaused	= 17,
-	MachineState_RestoringSnapshot	= 18,
-	MachineState_DeletingSnapshot	= 19,
-	MachineState_SettingUp	= 20,
-	MachineState_FirstOnline	= 5,
-	MachineState_LastOnline	= 17,
-	MachineState_FirstTransient	= 8,
-	MachineState_LastTransient	= 20
-    } 	MachineState;
-
-#define MachineState_T MachineState
-typedef /* [public][public][public][public][v1_enum][uuid] */  DECLSPEC_UUID("cf2700c0-ea4b-47ae-9725-7810114b94d8") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0004
-    {	SessionState_Null	= 0,
-	SessionState_Closed	= 1,
-	SessionState_Open	= 2,
-	SessionState_Spawning	= 3,
-	SessionState_Closing	= 4
-    } 	SessionState;
-
-#define SessionState_T SessionState
-typedef /* [public][public][public][v1_enum][uuid] */  DECLSPEC_UUID("24d356a6-2f45-4abd-b977-1cbe9c4701f5") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0005
-    {	CPUPropertyType_Null	= 0,
-	CPUPropertyType_PAE	= 1,
-	CPUPropertyType_Synthetic	= 2
-    } 	CPUPropertyType;
-
-#define CPUPropertyType_T CPUPropertyType
-typedef /* [public][public][public][v1_enum][uuid] */  DECLSPEC_UUID("ce81dfdd-d2b8-4a90-bbea-40ee8b7ffcee") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0006
-    {	HWVirtExPropertyType_Null	= 0,
-	HWVirtExPropertyType_Enabled	= 1,
-	HWVirtExPropertyType_Exclusive	= 2,
-	HWVirtExPropertyType_VPID	= 3,
-	HWVirtExPropertyType_NestedPaging	= 4,
-	HWVirtExPropertyType_LargePages	= 5,
-	HWVirtExPropertyType_Force	= 6
-    } 	HWVirtExPropertyType;
-
-#define HWVirtExPropertyType_T HWVirtExPropertyType
-typedef /* [public][public][v1_enum][uuid] */  DECLSPEC_UUID("A13C02CB-0C2C-421E-8317-AC0E8AAA153A") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0007
-    {	SessionType_Null	= 0,
-	SessionType_Direct	= 1,
-	SessionType_Remote	= 2,
-	SessionType_Existing	= 3
-    } 	SessionType;
-
-#define SessionType_T SessionType
-typedef /* [public][public][public][public][public][public][public][public][public][v1_enum][uuid] */  DECLSPEC_UUID("6d9420f7-0b56-4636-99f9-7346f1b01e57") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0008
-    {	DeviceType_Null	= 0,
-	DeviceType_Floppy	= 1,
-	DeviceType_DVD	= 2,
-	DeviceType_HardDisk	= 3,
-	DeviceType_Network	= 4,
-	DeviceType_USB	= 5,
-	DeviceType_SharedFolder	= 6
-    } 	DeviceType;
-
-#define DeviceType_T DeviceType
-typedef /* [public][public][v1_enum][uuid] */  DECLSPEC_UUID("6FC8AEAA-130A-4eb5-8954-3F921422D707") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0009
-    {	DeviceActivity_Null	= 0,
-	DeviceActivity_Idle	= 1,
-	DeviceActivity_Reading	= 2,
-	DeviceActivity_Writing	= 3
-    } 	DeviceActivity;
-
-#define DeviceActivity_T DeviceActivity
-typedef /* [public][public][public][v1_enum][uuid] */  DECLSPEC_UUID("33364716-4008-4701-8f14-be0fa3d62950") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0010
-    {	ClipboardMode_Disabled	= 0,
-	ClipboardMode_HostToGuest	= 1,
-	ClipboardMode_GuestToHost	= 2,
-	ClipboardMode_Bidirectional	= 3
-    } 	ClipboardMode;
-
-#define ClipboardMode_T ClipboardMode
-typedef /* [public][public][v1_enum][uuid] */  DECLSPEC_UUID("7c91096e-499e-4eca-9f9b-9001438d7855") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0011
-    {	Scope_Global	= 0,
-	Scope_Machine	= 1,
-	Scope_Session	= 2
-    } 	Scope;
-
-#define Scope_T Scope
-typedef /* [public][public][public][v1_enum][uuid] */  DECLSPEC_UUID("ae4fb9f7-29d2-45b4-b2c7-d579603135d5") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0012
-    {	BIOSBootMenuMode_Disabled	= 0,
-	BIOSBootMenuMode_MenuOnly	= 1,
-	BIOSBootMenuMode_MessageAndMenu	= 2
-    } 	BIOSBootMenuMode;
-
-#define BIOSBootMenuMode_T BIOSBootMenuMode
-typedef /* [public][public][v1_enum][uuid] */  DECLSPEC_UUID("64c38e6b-8bcf-45ad-ac03-9b406287c5bf") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0013
-    {	ProcessorFeature_HWVirtEx	= 0,
-	ProcessorFeature_PAE	= 1,
-	ProcessorFeature_LongMode	= 2,
-	ProcessorFeature_NestedPaging	= 3
-    } 	ProcessorFeature;
-
-#define ProcessorFeature_T ProcessorFeature
-typedef /* [public][public][public][public][public][v1_enum][uuid] */  DECLSPEC_UUID("b903f264-c230-483e-ac74-2b37ce60d371") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0014
-    {	FirmwareType_BIOS	= 1,
-	FirmwareType_EFI	= 2,
-	FirmwareType_EFI32	= 3,
-	FirmwareType_EFI64	= 4,
-	FirmwareType_EFIDUAL	= 5
-    } 	FirmwareType;
-
-#define FirmwareType_T FirmwareType
-typedef /* [public][public][public][v1_enum][uuid] */  DECLSPEC_UUID("0d3c17a2-821a-4b2e-ae41-890c6c60aa97") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0015
-    {	PointingHidType_None	= 1,
-	PointingHidType_PS2Mouse	= 2,
-	PointingHidType_USBMouse	= 3,
-	PointingHidType_USBTablet	= 4,
-	PointingHidType_ComboMouse	= 5
-    } 	PointingHidType;
-
-#define PointingHidType_T PointingHidType
-typedef /* [public][public][public][v1_enum][uuid] */  DECLSPEC_UUID("5a5b0996-3a3e-44bb-9019-56979812cbcc") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0016
-    {	KeyboardHidType_None	= 1,
-	KeyboardHidType_PS2Keyboard	= 2,
-	KeyboardHidType_USBKeyboard	= 3,
-	KeyboardHidType_ComboKeyboard	= 4
-    } 	KeyboardHidType;
-
-#define KeyboardHidType_T KeyboardHidType
-typedef /* [public][public][v1_enum][uuid] */  DECLSPEC_UUID("813999ba-b949-48a8-9230-aadc6285e2f2") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0017
-    {	VFSType_File	= 1,
-	VFSType_Cloud	= 2,
-	VFSType_S3	= 3,
-	VFSType_WebDav	= 4
-    } 	VFSType;
-
-#define VFSType_T VFSType
-typedef /* [public][v1_enum][uuid] */  DECLSPEC_UUID("714333cd-44e2-415f-a245-d378fa9b1242") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0018
-    {	VFSFileType_Unknown	= 1,
-	VFSFileType_Fifo	= 2,
-	VFSFileType_DevChar	= 3,
-	VFSFileType_Directory	= 4,
-	VFSFileType_DevBlock	= 5,
-	VFSFileType_File	= 6,
-	VFSFileType_SymLink	= 7,
-	VFSFileType_Socket	= 8,
-	VFSFileType_WhiteOut	= 9
-    } 	VFSFileType;
-
-#define VFSFileType_T VFSFileType
-typedef /* [public][public][public][public][public][public][v1_enum][uuid] */  DECLSPEC_UUID("c0f8f135-3a1d-417d-afa6-b38b95a91f90") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0019
-    {	VirtualSystemDescriptionType_Ignore	= 1,
-	VirtualSystemDescriptionType_OS	= 2,
-	VirtualSystemDescriptionType_Name	= 3,
-	VirtualSystemDescriptionType_Product	= 4,
-	VirtualSystemDescriptionType_Vendor	= 5,
-	VirtualSystemDescriptionType_Version	= 6,
-	VirtualSystemDescriptionType_ProductUrl	= 7,
-	VirtualSystemDescriptionType_VendorUrl	= 8,
-	VirtualSystemDescriptionType_Description	= 9,
-	VirtualSystemDescriptionType_License	= 10,
-	VirtualSystemDescriptionType_Miscellaneous	= 11,
-	VirtualSystemDescriptionType_CPU	= 12,
-	VirtualSystemDescriptionType_Memory	= 13,
-	VirtualSystemDescriptionType_HardDiskControllerIDE	= 14,
-	VirtualSystemDescriptionType_HardDiskControllerSATA	= 15,
-	VirtualSystemDescriptionType_HardDiskControllerSCSI	= 16,
-	VirtualSystemDescriptionType_HardDiskControllerSAS	= 17,
-	VirtualSystemDescriptionType_HardDiskImage	= 18,
-	VirtualSystemDescriptionType_Floppy	= 19,
-	VirtualSystemDescriptionType_CDROM	= 20,
-	VirtualSystemDescriptionType_NetworkAdapter	= 21,
-	VirtualSystemDescriptionType_USBController	= 22,
-	VirtualSystemDescriptionType_SoundCard	= 23
-    } 	VirtualSystemDescriptionType;
-
-#define VirtualSystemDescriptionType_T VirtualSystemDescriptionType
-typedef /* [public][public][v1_enum][uuid] */  DECLSPEC_UUID("56d9403f-3425-4118-9919-36f2a9b8c77c") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0020
-    {	VirtualSystemDescriptionValueType_Reference	= 1,
-	VirtualSystemDescriptionValueType_Original	= 2,
-	VirtualSystemDescriptionValueType_Auto	= 3,
-	VirtualSystemDescriptionValueType_ExtraConfig	= 4
-    } 	VirtualSystemDescriptionValueType;
-
-#define VirtualSystemDescriptionValueType_T VirtualSystemDescriptionValueType
-typedef /* [public][public][v1_enum][uuid] */  DECLSPEC_UUID("1aa54aaf-2497-45a2-bfb1-8eb225e93d5b") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0021
-    {	HostNetworkInterfaceMediumType_Unknown	= 0,
-	HostNetworkInterfaceMediumType_Ethernet	= 1,
-	HostNetworkInterfaceMediumType_PPP	= 2,
-	HostNetworkInterfaceMediumType_SLIP	= 3
-    } 	HostNetworkInterfaceMediumType;
-
-#define HostNetworkInterfaceMediumType_T HostNetworkInterfaceMediumType
-typedef /* [public][public][v1_enum][uuid] */  DECLSPEC_UUID("CC474A69-2710-434B-8D99-C38E5D5A6F41") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0022
-    {	HostNetworkInterfaceStatus_Unknown	= 0,
-	HostNetworkInterfaceStatus_Up	= 1,
-	HostNetworkInterfaceStatus_Down	= 2
-    } 	HostNetworkInterfaceStatus;
-
-#define HostNetworkInterfaceStatus_T HostNetworkInterfaceStatus
-typedef /* [public][public][public][v1_enum][uuid] */  DECLSPEC_UUID("67431b00-9946-48a2-bc02-b25c5919f4f3") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0023
-    {	HostNetworkInterfaceType_Bridged	= 1,
-	HostNetworkInterfaceType_HostOnly	= 2
-    } 	HostNetworkInterfaceType;
-
-#define HostNetworkInterfaceType_T HostNetworkInterfaceType
-typedef /* [public][public][public][public][public][public][public][v1_enum][uuid] */  DECLSPEC_UUID("ef41e980-e012-43cd-9dea-479d4ef14d13") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0024
-    {	MediumState_NotCreated	= 0,
-	MediumState_Created	= 1,
-	MediumState_LockedRead	= 2,
-	MediumState_LockedWrite	= 3,
-	MediumState_Inaccessible	= 4,
-	MediumState_Creating	= 5,
-	MediumState_Deleting	= 6
-    } 	MediumState;
-
-#define MediumState_T MediumState
-typedef /* [public][public][public][v1_enum][uuid] */  DECLSPEC_UUID("46bf1fd4-ad86-4ded-8c49-28bd2d148e5a") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0025
-    {	MediumType_Normal	= 0,
-	MediumType_Immutable	= 1,
-	MediumType_Writethrough	= 2,
-	MediumType_Shareable	= 3
-    } 	MediumType;
-
-#define MediumType_T MediumType
-typedef /* [public][public][public][public][v1_enum][uuid] */  DECLSPEC_UUID("584ea502-143b-4ab0-ad14-d1028fdf0316") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0026
-    {	MediumVariant_Standard	= 0,
-	MediumVariant_VmdkSplit2G	= 0x1,
-	MediumVariant_VmdkStreamOptimized	= 0x4,
-	MediumVariant_VmdkESX	= 0x8,
-	MediumVariant_Fixed	= 0x10000,
-	MediumVariant_Diff	= 0x20000
-    } 	MediumVariant;
-
-#define MediumVariant_T MediumVariant
-typedef /* [public][public][v1_enum][uuid] */  DECLSPEC_UUID("d90ea51e-a3f1-4a01-beb1-c1723c0d3ba7") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0027
-    {	DataType_Int32	= 0,
-	DataType_Int8	= 1,
-	DataType_String	= 2
-    } 	DataType;
-
-#define DataType_T DataType
-typedef /* [public][v1_enum][uuid] */  DECLSPEC_UUID("86884dcf-1d6b-4f1b-b4bf-f5aa44959d60") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0028
-    {	DataFlags_None	= 0,
-	DataFlags_Mandatory	= 0x1,
-	DataFlags_Expert	= 0x2,
-	DataFlags_Array	= 0x4,
-	DataFlags_FlagMask	= 0x7
-    } 	DataFlags;
-
-#define DataFlags_T DataFlags
-typedef /* [public][v1_enum][uuid] */  DECLSPEC_UUID("70fcf810-99e8-4edc-aee4-7f51d489e657") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0029
-    {	MediumFormatCapabilities_Uuid	= 0x1,
-	MediumFormatCapabilities_CreateFixed	= 0x2,
-	MediumFormatCapabilities_CreateDynamic	= 0x4,
-	MediumFormatCapabilities_CreateSplit2G	= 0x8,
-	MediumFormatCapabilities_Differencing	= 0x10,
-	MediumFormatCapabilities_Asynchronous	= 0x20,
-	MediumFormatCapabilities_File	= 0x40,
-	MediumFormatCapabilities_Properties	= 0x80,
-	MediumFormatCapabilities_CapabilityMask	= 0xff
-    } 	MediumFormatCapabilities;
-
-#define MediumFormatCapabilities_T MediumFormatCapabilities
-typedef /* [public][v1_enum][uuid] */  DECLSPEC_UUID("9ee094b8-b28a-4d56-a166-973cb588d7f8") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0030
-    {	MouseButtonState_LeftButton	= 0x1,
-	MouseButtonState_RightButton	= 0x2,
-	MouseButtonState_MiddleButton	= 0x4,
-	MouseButtonState_WheelUp	= 0x8,
-	MouseButtonState_WheelDown	= 0x10,
-	MouseButtonState_XButton1	= 0x20,
-	MouseButtonState_XButton2	= 0x40,
-	MouseButtonState_MouseStateMask	= 0x7f
-    } 	MouseButtonState;
-
-#define MouseButtonState_T MouseButtonState
-typedef /* [public][v1_enum][uuid] */  DECLSPEC_UUID("7acfd5ed-29e3-45e3-8136-73c9224f3d2d") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0031
-    {	FramebufferPixelFormat_Opaque	= 0,
-	FramebufferPixelFormat_FOURCC_RGB	= 0x32424752
-    } 	FramebufferPixelFormat;
-
-#define FramebufferPixelFormat_T FramebufferPixelFormat
-typedef /* [public][public][v1_enum][uuid] */  DECLSPEC_UUID("44bce1ee-99f7-4e8e-89fc-80597fd9eeaf") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0032
-    {	NetworkAttachmentType_Null	= 0,
-	NetworkAttachmentType_NAT	= 1,
-	NetworkAttachmentType_Bridged	= 2,
-	NetworkAttachmentType_Internal	= 3,
-	NetworkAttachmentType_HostOnly	= 4,
-	NetworkAttachmentType_VDE	= 5
-    } 	NetworkAttachmentType;
-
-#define NetworkAttachmentType_T NetworkAttachmentType
-typedef /* [public][public][public][public][v1_enum][uuid] */  DECLSPEC_UUID("3c2281e4-d952-4e87-8c7d-24379cb6a81c") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0033
-    {	NetworkAdapterType_Null	= 0,
-	NetworkAdapterType_Am79C970A	= 1,
-	NetworkAdapterType_Am79C973	= 2,
-	NetworkAdapterType_I82540EM	= 3,
-	NetworkAdapterType_I82543GC	= 4,
-	NetworkAdapterType_I82545EM	= 5,
-	NetworkAdapterType_Virtio	= 6
-    } 	NetworkAdapterType;
-
-#define NetworkAdapterType_T NetworkAdapterType
-typedef /* [public][public][public][v1_enum][uuid] */  DECLSPEC_UUID("533b5fe3-0185-4197-86a7-17e37dd39d76") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0034
-    {	PortMode_Disconnected	= 0,
-	PortMode_HostPipe	= 1,
-	PortMode_HostDevice	= 2,
-	PortMode_RawFile	= 3
-    } 	PortMode;
-
-#define PortMode_T PortMode
-typedef /* [public][public][v1_enum][uuid] */  DECLSPEC_UUID("b99a2e65-67fb-4882-82fd-f3e5e8193ab4") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0035
-    {	USBDeviceState_NotSupported	= 0,
-	USBDeviceState_Unavailable	= 1,
-	USBDeviceState_Busy	= 2,
-	USBDeviceState_Available	= 3,
-	USBDeviceState_Held	= 4,
-	USBDeviceState_Captured	= 5
-    } 	USBDeviceState;
-
-#define USBDeviceState_T USBDeviceState
-typedef /* [public][public][public][v1_enum][uuid] */  DECLSPEC_UUID("cbc30a49-2f4e-43b5-9da6-121320475933") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0036
-    {	USBDeviceFilterAction_Null	= 0,
-	USBDeviceFilterAction_Ignore	= 1,
-	USBDeviceFilterAction_Hold	= 2
-    } 	USBDeviceFilterAction;
-
-#define USBDeviceFilterAction_T USBDeviceFilterAction
-typedef /* [public][public][public][public][v1_enum][uuid] */  DECLSPEC_UUID("4bcc3d73-c2fe-40db-b72f-0c2ca9d68496") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0037
-    {	AudioDriverType_Null	= 0,
-	AudioDriverType_WinMM	= 1,
-	AudioDriverType_OSS	= 2,
-	AudioDriverType_ALSA	= 3,
-	AudioDriverType_DirectSound	= 4,
-	AudioDriverType_CoreAudio	= 5,
-	AudioDriverType_MMPM	= 6,
-	AudioDriverType_Pulse	= 7,
-	AudioDriverType_SolAudio	= 8
-    } 	AudioDriverType;
-
-#define AudioDriverType_T AudioDriverType
-typedef /* [public][public][public][v1_enum][uuid] */  DECLSPEC_UUID("7afd395c-42c3-444e-8788-3ce80292f36c") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0038
-    {	AudioControllerType_AC97	= 0,
-	AudioControllerType_SB16	= 1
-    } 	AudioControllerType;
-
-#define AudioControllerType_T AudioControllerType
-typedef /* [public][public][public][v1_enum][uuid] */  DECLSPEC_UUID("3d91887a-b67f-4b33-85bf-2da7ab1ea83a") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0039
-    {	VRDPAuthType_Null	= 0,
-	VRDPAuthType_External	= 1,
-	VRDPAuthType_Guest	= 2
-    } 	VRDPAuthType;
-
-#define VRDPAuthType_T VRDPAuthType
-typedef /* [public][public][public][public][public][public][public][public][public][public][v1_enum][uuid] */  DECLSPEC_UUID("eee67ab3-668d-4ef5-91e0-7025fe4a0d7a") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0040
-    {	StorageBus_Null	= 0,
-	StorageBus_IDE	= 1,
-	StorageBus_SATA	= 2,
-	StorageBus_SCSI	= 3,
-	StorageBus_Floppy	= 4,
-	StorageBus_SAS	= 5
-    } 	StorageBus;
-
-#define StorageBus_T StorageBus
-typedef /* [public][public][public][public][public][v1_enum][uuid] */  DECLSPEC_UUID("8a412b8a-f43e-4456-bd37-b474f0879a58") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0041
-    {	StorageControllerType_Null	= 0,
-	StorageControllerType_LsiLogic	= 1,
-	StorageControllerType_BusLogic	= 2,
-	StorageControllerType_IntelAhci	= 3,
-	StorageControllerType_PIIX3	= 4,
-	StorageControllerType_PIIX4	= 5,
-	StorageControllerType_ICH6	= 6,
-	StorageControllerType_I82078	= 7,
-	StorageControllerType_LsiLogicSas	= 8
-    } 	StorageControllerType;
-
-#define StorageControllerType_T StorageControllerType
-typedef /* [public][v1_enum][uuid] */  DECLSPEC_UUID("67772168-50d9-11df-9669-7fb714ee4fa1") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0042
-    {	NATAliasMode_AliasLog	= 0x1,
-	NATAliasMode_AliasProxyOnly	= 0x2,
-	NATAliasMode_AliasUseSamePorts	= 0x4
-    } 	NATAliasMode;
-
-#define NATAliasMode_T NATAliasMode
-typedef /* [public][public][v1_enum][uuid] */  DECLSPEC_UUID("e90164be-eb03-11de-94af-fff9b1c1b19f") 
-enum __MIDL___MIDL_itf_VirtualBox_0000_0043
-    {	NATProtocol_UDP	= 0,
-	NATProtocol_TCP	= 1
-    } 	NATProtocol;
-
-#define NATProtocol_T NATProtocol
-#define COM_FORWARD_IVirtualBoxErrorInfo_GETTER_ResultCode_TO(smth) HRESULT STDMETHODCALLTYPE get_ResultCode (LONG * aResultCode) { return smth get_ResultCode (aResultCode); }
-#define COM_FORWARD_IVirtualBoxErrorInfo_GETTER_ResultCode_TO_OBJ(obj) COM_FORWARD_IVirtualBoxErrorInfo_GETTER_ResultCode_TO ((obj)->)
-#define COM_FORWARD_IVirtualBoxErrorInfo_GETTER_ResultCode_TO_BASE(base) COM_FORWARD_IVirtualBoxErrorInfo_GETTER_ResultCode_TO (base::)
-#define COM_FORWARD_IVirtualBoxErrorInfo_GETTER_InterfaceID_TO(smth) HRESULT STDMETHODCALLTYPE get_InterfaceID (BSTR * aInterfaceID) { return smth get_InterfaceID (aInterfaceID); }
-#define COM_FORWARD_IVirtualBoxErrorInfo_GETTER_InterfaceID_TO_OBJ(obj) COM_FORWARD_IVirtualBoxErrorInfo_GETTER_InterfaceID_TO ((obj)->)
-#define COM_FORWARD_IVirtualBoxErrorInfo_GETTER_InterfaceID_TO_BASE(base) COM_FORWARD_IVirtualBoxErrorInfo_GETTER_InterfaceID_TO (base::)
-#define COM_FORWARD_IVirtualBoxErrorInfo_GETTER_Component_TO(smth) HRESULT STDMETHODCALLTYPE get_Component (BSTR * aComponent) { return smth get_Component (aComponent); }
-#define COM_FORWARD_IVirtualBoxErrorInfo_GETTER_Component_TO_OBJ(obj) COM_FORWARD_IVirtualBoxErrorInfo_GETTER_Component_TO ((obj)->)
-#define COM_FORWARD_IVirtualBoxErrorInfo_GETTER_Component_TO_BASE(base) COM_FORWARD_IVirtualBoxErrorInfo_GETTER_Component_TO (base::)
-#define COM_FORWARD_IVirtualBoxErrorInfo_GETTER_Text_TO(smth) HRESULT STDMETHODCALLTYPE get_Text (BSTR * aText) { return smth get_Text (aText); }
-#define COM_FORWARD_IVirtualBoxErrorInfo_GETTER_Text_TO_OBJ(obj) COM_FORWARD_IVirtualBoxErrorInfo_GETTER_Text_TO ((obj)->)
-#define COM_FORWARD_IVirtualBoxErrorInfo_GETTER_Text_TO_BASE(base) COM_FORWARD_IVirtualBoxErrorInfo_GETTER_Text_TO (base::)
-#define COM_FORWARD_IVirtualBoxErrorInfo_GETTER_Next_TO(smth) HRESULT STDMETHODCALLTYPE get_Next (IVirtualBoxErrorInfo * * aNext) { return smth get_Next (aNext); }
-#define COM_FORWARD_IVirtualBoxErrorInfo_GETTER_Next_TO_OBJ(obj) COM_FORWARD_IVirtualBoxErrorInfo_GETTER_Next_TO ((obj)->)
-#define COM_FORWARD_IVirtualBoxErrorInfo_GETTER_Next_TO_BASE(base) COM_FORWARD_IVirtualBoxErrorInfo_GETTER_Next_TO (base::)
-#define COM_FORWARD_IVirtualBoxErrorInfo_TO(smth) COM_FORWARD_IVirtualBoxErrorInfo_GETTER_ResultCode_TO (smth) COM_FORWARD_IVirtualBoxErrorInfo_GETTER_InterfaceID_TO (smth) COM_FORWARD_IVirtualBoxErrorInfo_GETTER_Component_TO (smth) COM_FORWARD_IVirtualBoxErrorInfo_GETTER_Text_TO (smth) COM_FORWARD_IVirtualBoxErrorInfo_GETTER_Next_TO (smth) 
-#define COM_FORWARD_IVirtualBoxErrorInfo_TO_OBJ(obj) COM_FORWARD_IVirtualBoxErrorInfo_TO ((obj)->)
-#define COM_FORWARD_IVirtualBoxErrorInfo_TO_BASE(base) COM_FORWARD_IVirtualBoxErrorInfo_TO (base::)
-#define COM_FORWARD_ILocalOwner_SetLocalObject_TO(smth) HRESULT STDMETHODCALLTYPE SetLocalObject (IUnknown * aObject) { return smth SetLocalObject (aObject); }
-#define COM_FORWARD_ILocalOwner_SetLocalObject_TO_OBJ(obj) COM_FORWARD_ILocalOwner_SetLocalObject_TO ((obj)->)
-#define COM_FORWARD_ILocalOwner_SetLocalObject_TO_BASE(base) COM_FORWARD_ILocalOwner_SetLocalObject_TO (base::)
-#define COM_FORWARD_ILocalOwner_TO(smth) COM_FORWARD_ILocalOwner_SetLocalObject_TO (smth) 
-#define COM_FORWARD_ILocalOwner_TO_OBJ(obj) COM_FORWARD_ILocalOwner_TO ((obj)->)
-#define COM_FORWARD_ILocalOwner_TO_BASE(base) COM_FORWARD_ILocalOwner_TO (base::)
-#define COM_FORWARD_IVirtualBoxCallback_OnMachineStateChange_TO(smth) HRESULT STDMETHODCALLTYPE OnMachineStateChange (BSTR aMachineId, MachineState aState) { return smth OnMachineStateChange (aMachineId, aState); }
-#define COM_FORWARD_IVirtualBoxCallback_OnMachineStateChange_TO_OBJ(obj) COM_FORWARD_IVirtualBoxCallback_OnMachineStateChange_TO ((obj)->)
-#define COM_FORWARD_IVirtualBoxCallback_OnMachineStateChange_TO_BASE(base) COM_FORWARD_IVirtualBoxCallback_OnMachineStateChange_TO (base::)
-#define COM_FORWARD_IVirtualBoxCallback_OnMachineDataChange_TO(smth) HRESULT STDMETHODCALLTYPE OnMachineDataChange (BSTR aMachineId) { return smth OnMachineDataChange (aMachineId); }
-#define COM_FORWARD_IVirtualBoxCallback_OnMachineDataChange_TO_OBJ(obj) COM_FORWARD_IVirtualBoxCallback_OnMachineDataChange_TO ((obj)->)
-#define COM_FORWARD_IVirtualBoxCallback_OnMachineDataChange_TO_BASE(base) COM_FORWARD_IVirtualBoxCallback_OnMachineDataChange_TO (base::)
-#define COM_FORWARD_IVirtualBoxCallback_OnExtraDataCanChange_TO(smth) HRESULT STDMETHODCALLTYPE OnExtraDataCanChange (BSTR aMachineId, BSTR aKey, BSTR aValue, BSTR * aError, BOOL * aAllowChange) { return smth OnExtraDataCanChange (aMachineId, aKey, aValue, aError, aAllowChange); }
-#define COM_FORWARD_IVirtualBoxCallback_OnExtraDataCanChange_TO_OBJ(obj) COM_FORWARD_IVirtualBoxCallback_OnExtraDataCanChange_TO ((obj)->)
-#define COM_FORWARD_IVirtualBoxCallback_OnExtraDataCanChange_TO_BASE(base) COM_FORWARD_IVirtualBoxCallback_OnExtraDataCanChange_TO (base::)
-#define COM_FORWARD_IVirtualBoxCallback_OnExtraDataChange_TO(smth) HRESULT STDMETHODCALLTYPE OnExtraDataChange (BSTR aMachineId, BSTR aKey, BSTR aValue) { return smth OnExtraDataChange (aMachineId, aKey, aValue); }
-#define COM_FORWARD_IVirtualBoxCallback_OnExtraDataChange_TO_OBJ(obj) COM_FORWARD_IVirtualBoxCallback_OnExtraDataChange_TO ((obj)->)
-#define COM_FORWARD_IVirtualBoxCallback_OnExtraDataChange_TO_BASE(base) COM_FORWARD_IVirtualBoxCallback_OnExtraDataChange_TO (base::)
-#define COM_FORWARD_IVirtualBoxCallback_OnMediumRegistered_TO(smth) HRESULT STDMETHODCALLTYPE OnMediumRegistered (BSTR aMediumId, DeviceType aMediumType, BOOL aRegistered) { return smth OnMediumRegistered (aMediumId, aMediumType, aRegistered); }
-#define COM_FORWARD_IVirtualBoxCallback_OnMediumRegistered_TO_OBJ(obj) COM_FORWARD_IVirtualBoxCallback_OnMediumRegistered_TO ((obj)->)
-#define COM_FORWARD_IVirtualBoxCallback_OnMediumRegistered_TO_BASE(base) COM_FORWARD_IVirtualBoxCallback_OnMediumRegistered_TO (base::)
-#define COM_FORWARD_IVirtualBoxCallback_OnMachineRegistered_TO(smth) HRESULT STDMETHODCALLTYPE OnMachineRegistered (BSTR aMachineId, BOOL aRegistered) { return smth OnMachineRegistered (aMachineId, aRegistered); }
-#define COM_FORWARD_IVirtualBoxCallback_OnMachineRegistered_TO_OBJ(obj) COM_FORWARD_IVirtualBoxCallback_OnMachineRegistered_TO ((obj)->)
-#define COM_FORWARD_IVirtualBoxCallback_OnMachineRegistered_TO_BASE(base) COM_FORWARD_IVirtualBoxCallback_OnMachineRegistered_TO (base::)
-#define COM_FORWARD_IVirtualBoxCallback_OnSessionStateChange_TO(smth) HRESULT STDMETHODCALLTYPE OnSessionStateChange (BSTR aMachineId, SessionState aState) { return smth OnSessionStateChange (aMachineId, aState); }
-#define COM_FORWARD_IVirtualBoxCallback_OnSessionStateChange_TO_OBJ(obj) COM_FORWARD_IVirtualBoxCallback_OnSessionStateChange_TO ((obj)->)
-#define COM_FORWARD_IVirtualBoxCallback_OnSessionStateChange_TO_BASE(base) COM_FORWARD_IVirtualBoxCallback_OnSessionStateChange_TO (base::)
-#define COM_FORWARD_IVirtualBoxCallback_OnSnapshotTaken_TO(smth) HRESULT STDMETHODCALLTYPE OnSnapshotTaken (BSTR aMachineId, BSTR aSnapshotId) { return smth OnSnapshotTaken (aMachineId, aSnapshotId); }
-#define COM_FORWARD_IVirtualBoxCallback_OnSnapshotTaken_TO_OBJ(obj) COM_FORWARD_IVirtualBoxCallback_OnSnapshotTaken_TO ((obj)->)
-#define COM_FORWARD_IVirtualBoxCallback_OnSnapshotTaken_TO_BASE(base) COM_FORWARD_IVirtualBoxCallback_OnSnapshotTaken_TO (base::)
-#define COM_FORWARD_IVirtualBoxCallback_OnSnapshotDeleted_TO(smth) HRESULT STDMETHODCALLTYPE OnSnapshotDeleted (BSTR aMachineId, BSTR aSnapshotId) { return smth OnSnapshotDeleted (aMachineId, aSnapshotId); }
-#define COM_FORWARD_IVirtualBoxCallback_OnSnapshotDeleted_TO_OBJ(obj) COM_FORWARD_IVirtualBoxCallback_OnSnapshotDeleted_TO ((obj)->)
-#define COM_FORWARD_IVirtualBoxCallback_OnSnapshotDeleted_TO_BASE(base) COM_FORWARD_IVirtualBoxCallback_OnSnapshotDeleted_TO (base::)
-#define COM_FORWARD_IVirtualBoxCallback_OnSnapshotChange_TO(smth) HRESULT STDMETHODCALLTYPE OnSnapshotChange (BSTR aMachineId, BSTR aSnapshotId) { return smth OnSnapshotChange (aMachineId, aSnapshotId); }
-#define COM_FORWARD_IVirtualBoxCallback_OnSnapshotChange_TO_OBJ(obj) COM_FORWARD_IVirtualBoxCallback_OnSnapshotChange_TO ((obj)->)
-#define COM_FORWARD_IVirtualBoxCallback_OnSnapshotChange_TO_BASE(base) COM_FORWARD_IVirtualBoxCallback_OnSnapshotChange_TO (base::)
-#define COM_FORWARD_IVirtualBoxCallback_OnGuestPropertyChange_TO(smth) HRESULT STDMETHODCALLTYPE OnGuestPropertyChange (BSTR aMachineId, BSTR aName, BSTR aValue, BSTR aFlags) { return smth OnGuestPropertyChange (aMachineId, aName, aValue, aFlags); }
-#define COM_FORWARD_IVirtualBoxCallback_OnGuestPropertyChange_TO_OBJ(obj) COM_FORWARD_IVirtualBoxCallback_OnGuestPropertyChange_TO ((obj)->)
-#define COM_FORWARD_IVirtualBoxCallback_OnGuestPropertyChange_TO_BASE(base) COM_FORWARD_IVirtualBoxCallback_OnGuestPropertyChange_TO (base::)
-#define COM_FORWARD_IVirtualBoxCallback_TO(smth) COM_FORWARD_IVirtualBoxCallback_OnMachineStateChange_TO (smth) COM_FORWARD_IVirtualBoxCallback_OnMachineDataChange_TO (smth) COM_FORWARD_IVirtualBoxCallback_OnExtraDataCanChange_TO (smth) COM_FORWARD_IVirtualBoxCallback_OnExtraDataChange_TO (smth) COM_FORWARD_IVirtualBoxCallback_OnMediumRegistered_TO (smth) COM_FORWARD_IVirtualBoxCallback_OnMachineRegistered_TO (smth) COM_FORWARD_IVirtualBoxCallback_OnSessionStateChange_TO (smth) COM_FORWA [...]
-#define COM_FORWARD_IVirtualBoxCallback_TO_OBJ(obj) COM_FORWARD_IVirtualBoxCallback_TO ((obj)->)
-#define COM_FORWARD_IVirtualBoxCallback_TO_BASE(base) COM_FORWARD_IVirtualBoxCallback_TO (base::)
-#define COM_FORWARD_IDHCPServer_GETTER_Enabled_TO(smth) HRESULT STDMETHODCALLTYPE get_Enabled (BOOL * aEnabled) { return smth get_Enabled (aEnabled); }
-#define COM_FORWARD_IDHCPServer_GETTER_Enabled_TO_OBJ(obj) COM_FORWARD_IDHCPServer_GETTER_Enabled_TO ((obj)->)
-#define COM_FORWARD_IDHCPServer_GETTER_Enabled_TO_BASE(base) COM_FORWARD_IDHCPServer_GETTER_Enabled_TO (base::)
-#define COM_FORWARD_IDHCPServer_SETTER_Enabled_TO(smth) HRESULT STDMETHODCALLTYPE put_Enabled (BOOL aEnabled) { return smth put_Enabled (aEnabled); }
-#define COM_FORWARD_IDHCPServer_SETTER_Enabled_TO_OBJ(obj) COM_FORWARD_IDHCPServer_SETTER_Enabled_TO ((obj)->)
-#define COM_FORWARD_IDHCPServer_SETTER_Enabled_TO_BASE(base) COM_FORWARD_IDHCPServer_SETTER_Enabled_TO (base::)
-#define COM_FORWARD_IDHCPServer_GETTER_IPAddress_TO(smth) HRESULT STDMETHODCALLTYPE get_IPAddress (BSTR * aIPAddress) { return smth get_IPAddress (aIPAddress); }
-#define COM_FORWARD_IDHCPServer_GETTER_IPAddress_TO_OBJ(obj) COM_FORWARD_IDHCPServer_GETTER_IPAddress_TO ((obj)->)
-#define COM_FORWARD_IDHCPServer_GETTER_IPAddress_TO_BASE(base) COM_FORWARD_IDHCPServer_GETTER_IPAddress_TO (base::)
-#define COM_FORWARD_IDHCPServer_GETTER_NetworkMask_TO(smth) HRESULT STDMETHODCALLTYPE get_NetworkMask (BSTR * aNetworkMask) { return smth get_NetworkMask (aNetworkMask); }
-#define COM_FORWARD_IDHCPServer_GETTER_NetworkMask_TO_OBJ(obj) COM_FORWARD_IDHCPServer_GETTER_NetworkMask_TO ((obj)->)
-#define COM_FORWARD_IDHCPServer_GETTER_NetworkMask_TO_BASE(base) COM_FORWARD_IDHCPServer_GETTER_NetworkMask_TO (base::)
-#define COM_FORWARD_IDHCPServer_GETTER_NetworkName_TO(smth) HRESULT STDMETHODCALLTYPE get_NetworkName (BSTR * aNetworkName) { return smth get_NetworkName (aNetworkName); }
-#define COM_FORWARD_IDHCPServer_GETTER_NetworkName_TO_OBJ(obj) COM_FORWARD_IDHCPServer_GETTER_NetworkName_TO ((obj)->)
-#define COM_FORWARD_IDHCPServer_GETTER_NetworkName_TO_BASE(base) COM_FORWARD_IDHCPServer_GETTER_NetworkName_TO (base::)
-#define COM_FORWARD_IDHCPServer_GETTER_LowerIP_TO(smth) HRESULT STDMETHODCALLTYPE get_LowerIP (BSTR * aLowerIP) { return smth get_LowerIP (aLowerIP); }
-#define COM_FORWARD_IDHCPServer_GETTER_LowerIP_TO_OBJ(obj) COM_FORWARD_IDHCPServer_GETTER_LowerIP_TO ((obj)->)
-#define COM_FORWARD_IDHCPServer_GETTER_LowerIP_TO_BASE(base) COM_FORWARD_IDHCPServer_GETTER_LowerIP_TO (base::)
-#define COM_FORWARD_IDHCPServer_GETTER_UpperIP_TO(smth) HRESULT STDMETHODCALLTYPE get_UpperIP (BSTR * aUpperIP) { return smth get_UpperIP (aUpperIP); }
-#define COM_FORWARD_IDHCPServer_GETTER_UpperIP_TO_OBJ(obj) COM_FORWARD_IDHCPServer_GETTER_UpperIP_TO ((obj)->)
-#define COM_FORWARD_IDHCPServer_GETTER_UpperIP_TO_BASE(base) COM_FORWARD_IDHCPServer_GETTER_UpperIP_TO (base::)
-#define COM_FORWARD_IDHCPServer_SetConfiguration_TO(smth) HRESULT STDMETHODCALLTYPE SetConfiguration (BSTR aIPAddress, BSTR aNetworkMask, BSTR aFromIPAddress, BSTR aToIPAddress) { return smth SetConfiguration (aIPAddress, aNetworkMask, aFromIPAddress, aToIPAddress); }
-#define COM_FORWARD_IDHCPServer_SetConfiguration_TO_OBJ(obj) COM_FORWARD_IDHCPServer_SetConfiguration_TO ((obj)->)
-#define COM_FORWARD_IDHCPServer_SetConfiguration_TO_BASE(base) COM_FORWARD_IDHCPServer_SetConfiguration_TO (base::)
-#define COM_FORWARD_IDHCPServer_Start_TO(smth) HRESULT STDMETHODCALLTYPE Start (BSTR aNetworkName, BSTR aTrunkName, BSTR aTrunkType) { return smth Start (aNetworkName, aTrunkName, aTrunkType); }
-#define COM_FORWARD_IDHCPServer_Start_TO_OBJ(obj) COM_FORWARD_IDHCPServer_Start_TO ((obj)->)
-#define COM_FORWARD_IDHCPServer_Start_TO_BASE(base) COM_FORWARD_IDHCPServer_Start_TO (base::)
-#define COM_FORWARD_IDHCPServer_Stop_TO(smth) HRESULT STDMETHODCALLTYPE Stop() { return smth Stop(); }
-#define COM_FORWARD_IDHCPServer_Stop_TO_OBJ(obj) COM_FORWARD_IDHCPServer_Stop_TO ((obj)->)
-#define COM_FORWARD_IDHCPServer_Stop_TO_BASE(base) COM_FORWARD_IDHCPServer_Stop_TO (base::)
-#define COM_FORWARD_IDHCPServer_TO(smth) COM_FORWARD_IDHCPServer_GETTER_Enabled_TO (smth) COM_FORWARD_IDHCPServer_SETTER_Enabled_TO (smth) COM_FORWARD_IDHCPServer_GETTER_IPAddress_TO (smth) COM_FORWARD_IDHCPServer_GETTER_NetworkMask_TO (smth) COM_FORWARD_IDHCPServer_GETTER_NetworkName_TO (smth) COM_FORWARD_IDHCPServer_GETTER_LowerIP_TO (smth) COM_FORWARD_IDHCPServer_GETTER_UpperIP_TO (smth) COM_FORWARD_IDHCPServer_SetConfiguration_TO (smth) COM_FORWARD_IDHCPServer_Start_TO (smth) COM_FOR [...]
-#define COM_FORWARD_IDHCPServer_TO_OBJ(obj) COM_FORWARD_IDHCPServer_TO ((obj)->)
-#define COM_FORWARD_IDHCPServer_TO_BASE(base) COM_FORWARD_IDHCPServer_TO (base::)
-#define COM_FORWARD_IVirtualBox_GETTER_Version_TO(smth) HRESULT STDMETHODCALLTYPE get_Version (BSTR * aVersion) { return smth get_Version (aVersion); }
-#define COM_FORWARD_IVirtualBox_GETTER_Version_TO_OBJ(obj) COM_FORWARD_IVirtualBox_GETTER_Version_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_GETTER_Version_TO_BASE(base) COM_FORWARD_IVirtualBox_GETTER_Version_TO (base::)
-#define COM_FORWARD_IVirtualBox_GETTER_Revision_TO(smth) HRESULT STDMETHODCALLTYPE get_Revision (ULONG * aRevision) { return smth get_Revision (aRevision); }
-#define COM_FORWARD_IVirtualBox_GETTER_Revision_TO_OBJ(obj) COM_FORWARD_IVirtualBox_GETTER_Revision_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_GETTER_Revision_TO_BASE(base) COM_FORWARD_IVirtualBox_GETTER_Revision_TO (base::)
-#define COM_FORWARD_IVirtualBox_GETTER_PackageType_TO(smth) HRESULT STDMETHODCALLTYPE get_PackageType (BSTR * aPackageType) { return smth get_PackageType (aPackageType); }
-#define COM_FORWARD_IVirtualBox_GETTER_PackageType_TO_OBJ(obj) COM_FORWARD_IVirtualBox_GETTER_PackageType_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_GETTER_PackageType_TO_BASE(base) COM_FORWARD_IVirtualBox_GETTER_PackageType_TO (base::)
-#define COM_FORWARD_IVirtualBox_GETTER_HomeFolder_TO(smth) HRESULT STDMETHODCALLTYPE get_HomeFolder (BSTR * aHomeFolder) { return smth get_HomeFolder (aHomeFolder); }
-#define COM_FORWARD_IVirtualBox_GETTER_HomeFolder_TO_OBJ(obj) COM_FORWARD_IVirtualBox_GETTER_HomeFolder_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_GETTER_HomeFolder_TO_BASE(base) COM_FORWARD_IVirtualBox_GETTER_HomeFolder_TO (base::)
-#define COM_FORWARD_IVirtualBox_GETTER_SettingsFilePath_TO(smth) HRESULT STDMETHODCALLTYPE get_SettingsFilePath (BSTR * aSettingsFilePath) { return smth get_SettingsFilePath (aSettingsFilePath); }
-#define COM_FORWARD_IVirtualBox_GETTER_SettingsFilePath_TO_OBJ(obj) COM_FORWARD_IVirtualBox_GETTER_SettingsFilePath_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_GETTER_SettingsFilePath_TO_BASE(base) COM_FORWARD_IVirtualBox_GETTER_SettingsFilePath_TO (base::)
-#define COM_FORWARD_IVirtualBox_GETTER_Host_TO(smth) HRESULT STDMETHODCALLTYPE get_Host (IHost * * aHost) { return smth get_Host (aHost); }
-#define COM_FORWARD_IVirtualBox_GETTER_Host_TO_OBJ(obj) COM_FORWARD_IVirtualBox_GETTER_Host_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_GETTER_Host_TO_BASE(base) COM_FORWARD_IVirtualBox_GETTER_Host_TO (base::)
-#define COM_FORWARD_IVirtualBox_GETTER_SystemProperties_TO(smth) HRESULT STDMETHODCALLTYPE get_SystemProperties (ISystemProperties * * aSystemProperties) { return smth get_SystemProperties (aSystemProperties); }
-#define COM_FORWARD_IVirtualBox_GETTER_SystemProperties_TO_OBJ(obj) COM_FORWARD_IVirtualBox_GETTER_SystemProperties_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_GETTER_SystemProperties_TO_BASE(base) COM_FORWARD_IVirtualBox_GETTER_SystemProperties_TO (base::)
-#define COM_FORWARD_IVirtualBox_GETTER_Machines_TO(smth) HRESULT STDMETHODCALLTYPE get_Machines (SAFEARRAY * * aMachines) { return smth get_Machines (aMachines); }
-#define COM_FORWARD_IVirtualBox_GETTER_Machines_TO_OBJ(obj) COM_FORWARD_IVirtualBox_GETTER_Machines_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_GETTER_Machines_TO_BASE(base) COM_FORWARD_IVirtualBox_GETTER_Machines_TO (base::)
-#define COM_FORWARD_IVirtualBox_GETTER_HardDisks_TO(smth) HRESULT STDMETHODCALLTYPE get_HardDisks (SAFEARRAY * * aHardDisks) { return smth get_HardDisks (aHardDisks); }
-#define COM_FORWARD_IVirtualBox_GETTER_HardDisks_TO_OBJ(obj) COM_FORWARD_IVirtualBox_GETTER_HardDisks_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_GETTER_HardDisks_TO_BASE(base) COM_FORWARD_IVirtualBox_GETTER_HardDisks_TO (base::)
-#define COM_FORWARD_IVirtualBox_GETTER_DVDImages_TO(smth) HRESULT STDMETHODCALLTYPE get_DVDImages (SAFEARRAY * * aDVDImages) { return smth get_DVDImages (aDVDImages); }
-#define COM_FORWARD_IVirtualBox_GETTER_DVDImages_TO_OBJ(obj) COM_FORWARD_IVirtualBox_GETTER_DVDImages_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_GETTER_DVDImages_TO_BASE(base) COM_FORWARD_IVirtualBox_GETTER_DVDImages_TO (base::)
-#define COM_FORWARD_IVirtualBox_GETTER_FloppyImages_TO(smth) HRESULT STDMETHODCALLTYPE get_FloppyImages (SAFEARRAY * * aFloppyImages) { return smth get_FloppyImages (aFloppyImages); }
-#define COM_FORWARD_IVirtualBox_GETTER_FloppyImages_TO_OBJ(obj) COM_FORWARD_IVirtualBox_GETTER_FloppyImages_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_GETTER_FloppyImages_TO_BASE(base) COM_FORWARD_IVirtualBox_GETTER_FloppyImages_TO (base::)
-#define COM_FORWARD_IVirtualBox_GETTER_ProgressOperations_TO(smth) HRESULT STDMETHODCALLTYPE get_ProgressOperations (SAFEARRAY * * aProgressOperations) { return smth get_ProgressOperations (aProgressOperations); }
-#define COM_FORWARD_IVirtualBox_GETTER_ProgressOperations_TO_OBJ(obj) COM_FORWARD_IVirtualBox_GETTER_ProgressOperations_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_GETTER_ProgressOperations_TO_BASE(base) COM_FORWARD_IVirtualBox_GETTER_ProgressOperations_TO (base::)
-#define COM_FORWARD_IVirtualBox_GETTER_GuestOSTypes_TO(smth) HRESULT STDMETHODCALLTYPE get_GuestOSTypes (SAFEARRAY * * aGuestOSTypes) { return smth get_GuestOSTypes (aGuestOSTypes); }
-#define COM_FORWARD_IVirtualBox_GETTER_GuestOSTypes_TO_OBJ(obj) COM_FORWARD_IVirtualBox_GETTER_GuestOSTypes_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_GETTER_GuestOSTypes_TO_BASE(base) COM_FORWARD_IVirtualBox_GETTER_GuestOSTypes_TO (base::)
-#define COM_FORWARD_IVirtualBox_GETTER_SharedFolders_TO(smth) HRESULT STDMETHODCALLTYPE get_SharedFolders (SAFEARRAY * * aSharedFolders) { return smth get_SharedFolders (aSharedFolders); }
-#define COM_FORWARD_IVirtualBox_GETTER_SharedFolders_TO_OBJ(obj) COM_FORWARD_IVirtualBox_GETTER_SharedFolders_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_GETTER_SharedFolders_TO_BASE(base) COM_FORWARD_IVirtualBox_GETTER_SharedFolders_TO (base::)
-#define COM_FORWARD_IVirtualBox_GETTER_PerformanceCollector_TO(smth) HRESULT STDMETHODCALLTYPE get_PerformanceCollector (IPerformanceCollector * * aPerformanceCollector) { return smth get_PerformanceCollector (aPerformanceCollector); }
-#define COM_FORWARD_IVirtualBox_GETTER_PerformanceCollector_TO_OBJ(obj) COM_FORWARD_IVirtualBox_GETTER_PerformanceCollector_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_GETTER_PerformanceCollector_TO_BASE(base) COM_FORWARD_IVirtualBox_GETTER_PerformanceCollector_TO (base::)
-#define COM_FORWARD_IVirtualBox_GETTER_DHCPServers_TO(smth) HRESULT STDMETHODCALLTYPE get_DHCPServers (SAFEARRAY * * aDHCPServers) { return smth get_DHCPServers (aDHCPServers); }
-#define COM_FORWARD_IVirtualBox_GETTER_DHCPServers_TO_OBJ(obj) COM_FORWARD_IVirtualBox_GETTER_DHCPServers_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_GETTER_DHCPServers_TO_BASE(base) COM_FORWARD_IVirtualBox_GETTER_DHCPServers_TO (base::)
-#define COM_FORWARD_IVirtualBox_CreateMachine_TO(smth) HRESULT STDMETHODCALLTYPE CreateMachine (BSTR aName, BSTR aOsTypeId, BSTR aBaseFolder, BSTR aId, BOOL aOverride, IMachine * * aMachine) { return smth CreateMachine (aName, aOsTypeId, aBaseFolder, aId, aOverride, aMachine); }
-#define COM_FORWARD_IVirtualBox_CreateMachine_TO_OBJ(obj) COM_FORWARD_IVirtualBox_CreateMachine_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_CreateMachine_TO_BASE(base) COM_FORWARD_IVirtualBox_CreateMachine_TO (base::)
-#define COM_FORWARD_IVirtualBox_CreateLegacyMachine_TO(smth) HRESULT STDMETHODCALLTYPE CreateLegacyMachine (BSTR aName, BSTR aOsTypeId, BSTR aSettingsFile, BSTR aId, IMachine * * aMachine) { return smth CreateLegacyMachine (aName, aOsTypeId, aSettingsFile, aId, aMachine); }
-#define COM_FORWARD_IVirtualBox_CreateLegacyMachine_TO_OBJ(obj) COM_FORWARD_IVirtualBox_CreateLegacyMachine_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_CreateLegacyMachine_TO_BASE(base) COM_FORWARD_IVirtualBox_CreateLegacyMachine_TO (base::)
-#define COM_FORWARD_IVirtualBox_OpenMachine_TO(smth) HRESULT STDMETHODCALLTYPE OpenMachine (BSTR aSettingsFile, IMachine * * aMachine) { return smth OpenMachine (aSettingsFile, aMachine); }
-#define COM_FORWARD_IVirtualBox_OpenMachine_TO_OBJ(obj) COM_FORWARD_IVirtualBox_OpenMachine_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_OpenMachine_TO_BASE(base) COM_FORWARD_IVirtualBox_OpenMachine_TO (base::)
-#define COM_FORWARD_IVirtualBox_RegisterMachine_TO(smth) HRESULT STDMETHODCALLTYPE RegisterMachine (IMachine * aMachine) { return smth RegisterMachine (aMachine); }
-#define COM_FORWARD_IVirtualBox_RegisterMachine_TO_OBJ(obj) COM_FORWARD_IVirtualBox_RegisterMachine_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_RegisterMachine_TO_BASE(base) COM_FORWARD_IVirtualBox_RegisterMachine_TO (base::)
-#define COM_FORWARD_IVirtualBox_GetMachine_TO(smth) HRESULT STDMETHODCALLTYPE GetMachine (BSTR aId, IMachine * * aMachine) { return smth GetMachine (aId, aMachine); }
-#define COM_FORWARD_IVirtualBox_GetMachine_TO_OBJ(obj) COM_FORWARD_IVirtualBox_GetMachine_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_GetMachine_TO_BASE(base) COM_FORWARD_IVirtualBox_GetMachine_TO (base::)
-#define COM_FORWARD_IVirtualBox_FindMachine_TO(smth) HRESULT STDMETHODCALLTYPE FindMachine (BSTR aName, IMachine * * aMachine) { return smth FindMachine (aName, aMachine); }
-#define COM_FORWARD_IVirtualBox_FindMachine_TO_OBJ(obj) COM_FORWARD_IVirtualBox_FindMachine_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_FindMachine_TO_BASE(base) COM_FORWARD_IVirtualBox_FindMachine_TO (base::)
-#define COM_FORWARD_IVirtualBox_UnregisterMachine_TO(smth) HRESULT STDMETHODCALLTYPE UnregisterMachine (BSTR aId, IMachine * * aMachine) { return smth UnregisterMachine (aId, aMachine); }
-#define COM_FORWARD_IVirtualBox_UnregisterMachine_TO_OBJ(obj) COM_FORWARD_IVirtualBox_UnregisterMachine_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_UnregisterMachine_TO_BASE(base) COM_FORWARD_IVirtualBox_UnregisterMachine_TO (base::)
-#define COM_FORWARD_IVirtualBox_CreateAppliance_TO(smth) HRESULT STDMETHODCALLTYPE CreateAppliance (IAppliance * * aAppliance) { return smth CreateAppliance (aAppliance); }
-#define COM_FORWARD_IVirtualBox_CreateAppliance_TO_OBJ(obj) COM_FORWARD_IVirtualBox_CreateAppliance_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_CreateAppliance_TO_BASE(base) COM_FORWARD_IVirtualBox_CreateAppliance_TO (base::)
-#define COM_FORWARD_IVirtualBox_CreateHardDisk_TO(smth) HRESULT STDMETHODCALLTYPE CreateHardDisk (BSTR aFormat, BSTR aLocation, IMedium * * aMedium) { return smth CreateHardDisk (aFormat, aLocation, aMedium); }
-#define COM_FORWARD_IVirtualBox_CreateHardDisk_TO_OBJ(obj) COM_FORWARD_IVirtualBox_CreateHardDisk_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_CreateHardDisk_TO_BASE(base) COM_FORWARD_IVirtualBox_CreateHardDisk_TO (base::)
-#define COM_FORWARD_IVirtualBox_OpenHardDisk_TO(smth) HRESULT STDMETHODCALLTYPE OpenHardDisk (BSTR aLocation, AccessMode aAccessMode, BOOL aSetImageId, BSTR aImageId, BOOL aSetParentId, BSTR aParentId, IMedium * * aMedium) { return smth OpenHardDisk (aLocation, aAccessMode, aSetImageId, aImageId, aSetParentId, aParentId, aMedium); }
-#define COM_FORWARD_IVirtualBox_OpenHardDisk_TO_OBJ(obj) COM_FORWARD_IVirtualBox_OpenHardDisk_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_OpenHardDisk_TO_BASE(base) COM_FORWARD_IVirtualBox_OpenHardDisk_TO (base::)
-#define COM_FORWARD_IVirtualBox_GetHardDisk_TO(smth) HRESULT STDMETHODCALLTYPE GetHardDisk (BSTR aId, IMedium * * aMedium) { return smth GetHardDisk (aId, aMedium); }
-#define COM_FORWARD_IVirtualBox_GetHardDisk_TO_OBJ(obj) COM_FORWARD_IVirtualBox_GetHardDisk_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_GetHardDisk_TO_BASE(base) COM_FORWARD_IVirtualBox_GetHardDisk_TO (base::)
-#define COM_FORWARD_IVirtualBox_FindHardDisk_TO(smth) HRESULT STDMETHODCALLTYPE FindHardDisk (BSTR aLocation, IMedium * * aMedium) { return smth FindHardDisk (aLocation, aMedium); }
-#define COM_FORWARD_IVirtualBox_FindHardDisk_TO_OBJ(obj) COM_FORWARD_IVirtualBox_FindHardDisk_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_FindHardDisk_TO_BASE(base) COM_FORWARD_IVirtualBox_FindHardDisk_TO (base::)
-#define COM_FORWARD_IVirtualBox_OpenDVDImage_TO(smth) HRESULT STDMETHODCALLTYPE OpenDVDImage (BSTR aLocation, BSTR aId, IMedium * * aImage) { return smth OpenDVDImage (aLocation, aId, aImage); }
-#define COM_FORWARD_IVirtualBox_OpenDVDImage_TO_OBJ(obj) COM_FORWARD_IVirtualBox_OpenDVDImage_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_OpenDVDImage_TO_BASE(base) COM_FORWARD_IVirtualBox_OpenDVDImage_TO (base::)
-#define COM_FORWARD_IVirtualBox_GetDVDImage_TO(smth) HRESULT STDMETHODCALLTYPE GetDVDImage (BSTR aId, IMedium * * aImage) { return smth GetDVDImage (aId, aImage); }
-#define COM_FORWARD_IVirtualBox_GetDVDImage_TO_OBJ(obj) COM_FORWARD_IVirtualBox_GetDVDImage_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_GetDVDImage_TO_BASE(base) COM_FORWARD_IVirtualBox_GetDVDImage_TO (base::)
-#define COM_FORWARD_IVirtualBox_FindDVDImage_TO(smth) HRESULT STDMETHODCALLTYPE FindDVDImage (BSTR aLocation, IMedium * * aImage) { return smth FindDVDImage (aLocation, aImage); }
-#define COM_FORWARD_IVirtualBox_FindDVDImage_TO_OBJ(obj) COM_FORWARD_IVirtualBox_FindDVDImage_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_FindDVDImage_TO_BASE(base) COM_FORWARD_IVirtualBox_FindDVDImage_TO (base::)
-#define COM_FORWARD_IVirtualBox_OpenFloppyImage_TO(smth) HRESULT STDMETHODCALLTYPE OpenFloppyImage (BSTR aLocation, BSTR aId, IMedium * * aImage) { return smth OpenFloppyImage (aLocation, aId, aImage); }
-#define COM_FORWARD_IVirtualBox_OpenFloppyImage_TO_OBJ(obj) COM_FORWARD_IVirtualBox_OpenFloppyImage_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_OpenFloppyImage_TO_BASE(base) COM_FORWARD_IVirtualBox_OpenFloppyImage_TO (base::)
-#define COM_FORWARD_IVirtualBox_GetFloppyImage_TO(smth) HRESULT STDMETHODCALLTYPE GetFloppyImage (BSTR aId, IMedium * * aImage) { return smth GetFloppyImage (aId, aImage); }
-#define COM_FORWARD_IVirtualBox_GetFloppyImage_TO_OBJ(obj) COM_FORWARD_IVirtualBox_GetFloppyImage_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_GetFloppyImage_TO_BASE(base) COM_FORWARD_IVirtualBox_GetFloppyImage_TO (base::)
-#define COM_FORWARD_IVirtualBox_FindFloppyImage_TO(smth) HRESULT STDMETHODCALLTYPE FindFloppyImage (BSTR aLocation, IMedium * * aImage) { return smth FindFloppyImage (aLocation, aImage); }
-#define COM_FORWARD_IVirtualBox_FindFloppyImage_TO_OBJ(obj) COM_FORWARD_IVirtualBox_FindFloppyImage_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_FindFloppyImage_TO_BASE(base) COM_FORWARD_IVirtualBox_FindFloppyImage_TO (base::)
-#define COM_FORWARD_IVirtualBox_GetGuestOSType_TO(smth) HRESULT STDMETHODCALLTYPE GetGuestOSType (BSTR aId, IGuestOSType * * aType) { return smth GetGuestOSType (aId, aType); }
-#define COM_FORWARD_IVirtualBox_GetGuestOSType_TO_OBJ(obj) COM_FORWARD_IVirtualBox_GetGuestOSType_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_GetGuestOSType_TO_BASE(base) COM_FORWARD_IVirtualBox_GetGuestOSType_TO (base::)
-#define COM_FORWARD_IVirtualBox_CreateSharedFolder_TO(smth) HRESULT STDMETHODCALLTYPE CreateSharedFolder (BSTR aName, BSTR aHostPath, BOOL aWritable) { return smth CreateSharedFolder (aName, aHostPath, aWritable); }
-#define COM_FORWARD_IVirtualBox_CreateSharedFolder_TO_OBJ(obj) COM_FORWARD_IVirtualBox_CreateSharedFolder_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_CreateSharedFolder_TO_BASE(base) COM_FORWARD_IVirtualBox_CreateSharedFolder_TO (base::)
-#define COM_FORWARD_IVirtualBox_RemoveSharedFolder_TO(smth) HRESULT STDMETHODCALLTYPE RemoveSharedFolder (BSTR aName) { return smth RemoveSharedFolder (aName); }
-#define COM_FORWARD_IVirtualBox_RemoveSharedFolder_TO_OBJ(obj) COM_FORWARD_IVirtualBox_RemoveSharedFolder_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_RemoveSharedFolder_TO_BASE(base) COM_FORWARD_IVirtualBox_RemoveSharedFolder_TO (base::)
-#define COM_FORWARD_IVirtualBox_GetExtraDataKeys_TO(smth) HRESULT STDMETHODCALLTYPE GetExtraDataKeys (SAFEARRAY * * aValue) { return smth GetExtraDataKeys (aValue); }
-#define COM_FORWARD_IVirtualBox_GetExtraDataKeys_TO_OBJ(obj) COM_FORWARD_IVirtualBox_GetExtraDataKeys_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_GetExtraDataKeys_TO_BASE(base) COM_FORWARD_IVirtualBox_GetExtraDataKeys_TO (base::)
-#define COM_FORWARD_IVirtualBox_GetExtraData_TO(smth) HRESULT STDMETHODCALLTYPE GetExtraData (BSTR aKey, BSTR * aValue) { return smth GetExtraData (aKey, aValue); }
-#define COM_FORWARD_IVirtualBox_GetExtraData_TO_OBJ(obj) COM_FORWARD_IVirtualBox_GetExtraData_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_GetExtraData_TO_BASE(base) COM_FORWARD_IVirtualBox_GetExtraData_TO (base::)
-#define COM_FORWARD_IVirtualBox_SetExtraData_TO(smth) HRESULT STDMETHODCALLTYPE SetExtraData (BSTR aKey, BSTR aValue) { return smth SetExtraData (aKey, aValue); }
-#define COM_FORWARD_IVirtualBox_SetExtraData_TO_OBJ(obj) COM_FORWARD_IVirtualBox_SetExtraData_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_SetExtraData_TO_BASE(base) COM_FORWARD_IVirtualBox_SetExtraData_TO (base::)
-#define COM_FORWARD_IVirtualBox_OpenSession_TO(smth) HRESULT STDMETHODCALLTYPE OpenSession (ISession * aSession, BSTR aMachineId) { return smth OpenSession (aSession, aMachineId); }
-#define COM_FORWARD_IVirtualBox_OpenSession_TO_OBJ(obj) COM_FORWARD_IVirtualBox_OpenSession_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_OpenSession_TO_BASE(base) COM_FORWARD_IVirtualBox_OpenSession_TO (base::)
-#define COM_FORWARD_IVirtualBox_OpenRemoteSession_TO(smth) HRESULT STDMETHODCALLTYPE OpenRemoteSession (ISession * aSession, BSTR aMachineId, BSTR aType, BSTR aEnvironment, IProgress * * aProgress) { return smth OpenRemoteSession (aSession, aMachineId, aType, aEnvironment, aProgress); }
-#define COM_FORWARD_IVirtualBox_OpenRemoteSession_TO_OBJ(obj) COM_FORWARD_IVirtualBox_OpenRemoteSession_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_OpenRemoteSession_TO_BASE(base) COM_FORWARD_IVirtualBox_OpenRemoteSession_TO (base::)
-#define COM_FORWARD_IVirtualBox_OpenExistingSession_TO(smth) HRESULT STDMETHODCALLTYPE OpenExistingSession (ISession * aSession, BSTR aMachineId) { return smth OpenExistingSession (aSession, aMachineId); }
-#define COM_FORWARD_IVirtualBox_OpenExistingSession_TO_OBJ(obj) COM_FORWARD_IVirtualBox_OpenExistingSession_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_OpenExistingSession_TO_BASE(base) COM_FORWARD_IVirtualBox_OpenExistingSession_TO (base::)
-#define COM_FORWARD_IVirtualBox_RegisterCallback_TO(smth) HRESULT STDMETHODCALLTYPE RegisterCallback (IVirtualBoxCallback * aCallback) { return smth RegisterCallback (aCallback); }
-#define COM_FORWARD_IVirtualBox_RegisterCallback_TO_OBJ(obj) COM_FORWARD_IVirtualBox_RegisterCallback_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_RegisterCallback_TO_BASE(base) COM_FORWARD_IVirtualBox_RegisterCallback_TO (base::)
-#define COM_FORWARD_IVirtualBox_UnregisterCallback_TO(smth) HRESULT STDMETHODCALLTYPE UnregisterCallback (IVirtualBoxCallback * aCallback) { return smth UnregisterCallback (aCallback); }
-#define COM_FORWARD_IVirtualBox_UnregisterCallback_TO_OBJ(obj) COM_FORWARD_IVirtualBox_UnregisterCallback_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_UnregisterCallback_TO_BASE(base) COM_FORWARD_IVirtualBox_UnregisterCallback_TO (base::)
-#define COM_FORWARD_IVirtualBox_WaitForPropertyChange_TO(smth) HRESULT STDMETHODCALLTYPE WaitForPropertyChange (BSTR aWhat, ULONG aTimeout, BSTR * aChanged, BSTR * aValues) { return smth WaitForPropertyChange (aWhat, aTimeout, aChanged, aValues); }
-#define COM_FORWARD_IVirtualBox_WaitForPropertyChange_TO_OBJ(obj) COM_FORWARD_IVirtualBox_WaitForPropertyChange_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_WaitForPropertyChange_TO_BASE(base) COM_FORWARD_IVirtualBox_WaitForPropertyChange_TO (base::)
-#define COM_FORWARD_IVirtualBox_CreateDHCPServer_TO(smth) HRESULT STDMETHODCALLTYPE CreateDHCPServer (BSTR aName, IDHCPServer * * aServer) { return smth CreateDHCPServer (aName, aServer); }
-#define COM_FORWARD_IVirtualBox_CreateDHCPServer_TO_OBJ(obj) COM_FORWARD_IVirtualBox_CreateDHCPServer_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_CreateDHCPServer_TO_BASE(base) COM_FORWARD_IVirtualBox_CreateDHCPServer_TO (base::)
-#define COM_FORWARD_IVirtualBox_FindDHCPServerByNetworkName_TO(smth) HRESULT STDMETHODCALLTYPE FindDHCPServerByNetworkName (BSTR aName, IDHCPServer * * aServer) { return smth FindDHCPServerByNetworkName (aName, aServer); }
-#define COM_FORWARD_IVirtualBox_FindDHCPServerByNetworkName_TO_OBJ(obj) COM_FORWARD_IVirtualBox_FindDHCPServerByNetworkName_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_FindDHCPServerByNetworkName_TO_BASE(base) COM_FORWARD_IVirtualBox_FindDHCPServerByNetworkName_TO (base::)
-#define COM_FORWARD_IVirtualBox_RemoveDHCPServer_TO(smth) HRESULT STDMETHODCALLTYPE RemoveDHCPServer (IDHCPServer * aServer) { return smth RemoveDHCPServer (aServer); }
-#define COM_FORWARD_IVirtualBox_RemoveDHCPServer_TO_OBJ(obj) COM_FORWARD_IVirtualBox_RemoveDHCPServer_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_RemoveDHCPServer_TO_BASE(base) COM_FORWARD_IVirtualBox_RemoveDHCPServer_TO (base::)
-#define COM_FORWARD_IVirtualBox_CheckFirmwarePresent_TO(smth) HRESULT STDMETHODCALLTYPE CheckFirmwarePresent (FirmwareType aFirmwareType, BSTR aVersion, BSTR * aUrl, BSTR * aFile, BOOL * aResult) { return smth CheckFirmwarePresent (aFirmwareType, aVersion, aUrl, aFile, aResult); }
-#define COM_FORWARD_IVirtualBox_CheckFirmwarePresent_TO_OBJ(obj) COM_FORWARD_IVirtualBox_CheckFirmwarePresent_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_CheckFirmwarePresent_TO_BASE(base) COM_FORWARD_IVirtualBox_CheckFirmwarePresent_TO (base::)
-#define COM_FORWARD_IVirtualBox_TO(smth) COM_FORWARD_IVirtualBox_GETTER_Version_TO (smth) COM_FORWARD_IVirtualBox_GETTER_Revision_TO (smth) COM_FORWARD_IVirtualBox_GETTER_PackageType_TO (smth) COM_FORWARD_IVirtualBox_GETTER_HomeFolder_TO (smth) COM_FORWARD_IVirtualBox_GETTER_SettingsFilePath_TO (smth) COM_FORWARD_IVirtualBox_GETTER_Host_TO (smth) COM_FORWARD_IVirtualBox_GETTER_SystemProperties_TO (smth) COM_FORWARD_IVirtualBox_GETTER_Machines_TO (smth) COM_FORWARD_IVirtualBox_GETTER_Hard [...]
-#define COM_FORWARD_IVirtualBox_TO_OBJ(obj) COM_FORWARD_IVirtualBox_TO ((obj)->)
-#define COM_FORWARD_IVirtualBox_TO_BASE(base) COM_FORWARD_IVirtualBox_TO (base::)
-#define COM_FORWARD_IVFSExplorer_GETTER_Path_TO(smth) HRESULT STDMETHODCALLTYPE get_Path (BSTR * aPath) { return smth get_Path (aPath); }
-#define COM_FORWARD_IVFSExplorer_GETTER_Path_TO_OBJ(obj) COM_FORWARD_IVFSExplorer_GETTER_Path_TO ((obj)->)
-#define COM_FORWARD_IVFSExplorer_GETTER_Path_TO_BASE(base) COM_FORWARD_IVFSExplorer_GETTER_Path_TO (base::)
-#define COM_FORWARD_IVFSExplorer_GETTER_Type_TO(smth) HRESULT STDMETHODCALLTYPE get_Type (VFSType * aType) { return smth get_Type (aType); }
-#define COM_FORWARD_IVFSExplorer_GETTER_Type_TO_OBJ(obj) COM_FORWARD_IVFSExplorer_GETTER_Type_TO ((obj)->)
-#define COM_FORWARD_IVFSExplorer_GETTER_Type_TO_BASE(base) COM_FORWARD_IVFSExplorer_GETTER_Type_TO (base::)
-#define COM_FORWARD_IVFSExplorer_Update_TO(smth) HRESULT STDMETHODCALLTYPE Update (IProgress * * aAProgress) { return smth Update (aAProgress); }
-#define COM_FORWARD_IVFSExplorer_Update_TO_OBJ(obj) COM_FORWARD_IVFSExplorer_Update_TO ((obj)->)
-#define COM_FORWARD_IVFSExplorer_Update_TO_BASE(base) COM_FORWARD_IVFSExplorer_Update_TO (base::)
-#define COM_FORWARD_IVFSExplorer_Cd_TO(smth) HRESULT STDMETHODCALLTYPE Cd (BSTR aADir, IProgress * * aAProgress) { return smth Cd (aADir, aAProgress); }
-#define COM_FORWARD_IVFSExplorer_Cd_TO_OBJ(obj) COM_FORWARD_IVFSExplorer_Cd_TO ((obj)->)
-#define COM_FORWARD_IVFSExplorer_Cd_TO_BASE(base) COM_FORWARD_IVFSExplorer_Cd_TO (base::)
-#define COM_FORWARD_IVFSExplorer_CdUp_TO(smth) HRESULT STDMETHODCALLTYPE CdUp (IProgress * * aAProgress) { return smth CdUp (aAProgress); }
-#define COM_FORWARD_IVFSExplorer_CdUp_TO_OBJ(obj) COM_FORWARD_IVFSExplorer_CdUp_TO ((obj)->)
-#define COM_FORWARD_IVFSExplorer_CdUp_TO_BASE(base) COM_FORWARD_IVFSExplorer_CdUp_TO (base::)
-#define COM_FORWARD_IVFSExplorer_EntryList_TO(smth) HRESULT STDMETHODCALLTYPE EntryList (SAFEARRAY * * aANames, SAFEARRAY * * aATypes) { return smth EntryList (aANames, aATypes); }
-#define COM_FORWARD_IVFSExplorer_EntryList_TO_OBJ(obj) COM_FORWARD_IVFSExplorer_EntryList_TO ((obj)->)
-#define COM_FORWARD_IVFSExplorer_EntryList_TO_BASE(base) COM_FORWARD_IVFSExplorer_EntryList_TO (base::)
-#define COM_FORWARD_IVFSExplorer_Exists_TO(smth) HRESULT STDMETHODCALLTYPE Exists (SAFEARRAY * * aANames, SAFEARRAY * * aAExists) { return smth Exists (aANames, aAExists); }
-#define COM_FORWARD_IVFSExplorer_Exists_TO_OBJ(obj) COM_FORWARD_IVFSExplorer_Exists_TO ((obj)->)
-#define COM_FORWARD_IVFSExplorer_Exists_TO_BASE(base) COM_FORWARD_IVFSExplorer_Exists_TO (base::)
-#define COM_FORWARD_IVFSExplorer_Remove_TO(smth) HRESULT STDMETHODCALLTYPE Remove (SAFEARRAY * * aANames, IProgress * * aAProgress) { return smth Remove (aANames, aAProgress); }
-#define COM_FORWARD_IVFSExplorer_Remove_TO_OBJ(obj) COM_FORWARD_IVFSExplorer_Remove_TO ((obj)->)
-#define COM_FORWARD_IVFSExplorer_Remove_TO_BASE(base) COM_FORWARD_IVFSExplorer_Remove_TO (base::)
-#define COM_FORWARD_IVFSExplorer_TO(smth) COM_FORWARD_IVFSExplorer_GETTER_Path_TO (smth) COM_FORWARD_IVFSExplorer_GETTER_Type_TO (smth) COM_FORWARD_IVFSExplorer_Update_TO (smth) COM_FORWARD_IVFSExplorer_Cd_TO (smth) COM_FORWARD_IVFSExplorer_CdUp_TO (smth) COM_FORWARD_IVFSExplorer_EntryList_TO (smth) COM_FORWARD_IVFSExplorer_Exists_TO (smth) COM_FORWARD_IVFSExplorer_Remove_TO (smth) 
-#define COM_FORWARD_IVFSExplorer_TO_OBJ(obj) COM_FORWARD_IVFSExplorer_TO ((obj)->)
-#define COM_FORWARD_IVFSExplorer_TO_BASE(base) COM_FORWARD_IVFSExplorer_TO (base::)
-#define COM_FORWARD_IAppliance_GETTER_Path_TO(smth) HRESULT STDMETHODCALLTYPE get_Path (BSTR * aPath) { return smth get_Path (aPath); }
-#define COM_FORWARD_IAppliance_GETTER_Path_TO_OBJ(obj) COM_FORWARD_IAppliance_GETTER_Path_TO ((obj)->)
-#define COM_FORWARD_IAppliance_GETTER_Path_TO_BASE(base) COM_FORWARD_IAppliance_GETTER_Path_TO (base::)
-#define COM_FORWARD_IAppliance_GETTER_Disks_TO(smth) HRESULT STDMETHODCALLTYPE get_Disks (SAFEARRAY * * aDisks) { return smth get_Disks (aDisks); }
-#define COM_FORWARD_IAppliance_GETTER_Disks_TO_OBJ(obj) COM_FORWARD_IAppliance_GETTER_Disks_TO ((obj)->)
-#define COM_FORWARD_IAppliance_GETTER_Disks_TO_BASE(base) COM_FORWARD_IAppliance_GETTER_Disks_TO (base::)
-#define COM_FORWARD_IAppliance_GETTER_VirtualSystemDescriptions_TO(smth) HRESULT STDMETHODCALLTYPE get_VirtualSystemDescriptions (SAFEARRAY * * aVirtualSystemDescriptions) { return smth get_VirtualSystemDescriptions (aVirtualSystemDescriptions); }
-#define COM_FORWARD_IAppliance_GETTER_VirtualSystemDescriptions_TO_OBJ(obj) COM_FORWARD_IAppliance_GETTER_VirtualSystemDescriptions_TO ((obj)->)
-#define COM_FORWARD_IAppliance_GETTER_VirtualSystemDescriptions_TO_BASE(base) COM_FORWARD_IAppliance_GETTER_VirtualSystemDescriptions_TO (base::)
-#define COM_FORWARD_IAppliance_Read_TO(smth) HRESULT STDMETHODCALLTYPE Read (BSTR aFile, IProgress * * aAProgress) { return smth Read (aFile, aAProgress); }
-#define COM_FORWARD_IAppliance_Read_TO_OBJ(obj) COM_FORWARD_IAppliance_Read_TO ((obj)->)
-#define COM_FORWARD_IAppliance_Read_TO_BASE(base) COM_FORWARD_IAppliance_Read_TO (base::)
-#define COM_FORWARD_IAppliance_Interpret_TO(smth) HRESULT STDMETHODCALLTYPE Interpret() { return smth Interpret(); }
-#define COM_FORWARD_IAppliance_Interpret_TO_OBJ(obj) COM_FORWARD_IAppliance_Interpret_TO ((obj)->)
-#define COM_FORWARD_IAppliance_Interpret_TO_BASE(base) COM_FORWARD_IAppliance_Interpret_TO (base::)
-#define COM_FORWARD_IAppliance_ImportMachines_TO(smth) HRESULT STDMETHODCALLTYPE ImportMachines (IProgress * * aAProgress) { return smth ImportMachines (aAProgress); }
-#define COM_FORWARD_IAppliance_ImportMachines_TO_OBJ(obj) COM_FORWARD_IAppliance_ImportMachines_TO ((obj)->)
-#define COM_FORWARD_IAppliance_ImportMachines_TO_BASE(base) COM_FORWARD_IAppliance_ImportMachines_TO (base::)
-#define COM_FORWARD_IAppliance_CreateVFSExplorer_TO(smth) HRESULT STDMETHODCALLTYPE CreateVFSExplorer (BSTR aAUri, IVFSExplorer * * aAExplorer) { return smth CreateVFSExplorer (aAUri, aAExplorer); }
-#define COM_FORWARD_IAppliance_CreateVFSExplorer_TO_OBJ(obj) COM_FORWARD_IAppliance_CreateVFSExplorer_TO ((obj)->)
-#define COM_FORWARD_IAppliance_CreateVFSExplorer_TO_BASE(base) COM_FORWARD_IAppliance_CreateVFSExplorer_TO (base::)
-#define COM_FORWARD_IAppliance_Write_TO(smth) HRESULT STDMETHODCALLTYPE Write (BSTR aFormat, BSTR aPath, IProgress * * aAProgress) { return smth Write (aFormat, aPath, aAProgress); }
-#define COM_FORWARD_IAppliance_Write_TO_OBJ(obj) COM_FORWARD_IAppliance_Write_TO ((obj)->)
-#define COM_FORWARD_IAppliance_Write_TO_BASE(base) COM_FORWARD_IAppliance_Write_TO (base::)
-#define COM_FORWARD_IAppliance_GetWarnings_TO(smth) HRESULT STDMETHODCALLTYPE GetWarnings (SAFEARRAY * * aAWarnings) { return smth GetWarnings (aAWarnings); }
-#define COM_FORWARD_IAppliance_GetWarnings_TO_OBJ(obj) COM_FORWARD_IAppliance_GetWarnings_TO ((obj)->)
-#define COM_FORWARD_IAppliance_GetWarnings_TO_BASE(base) COM_FORWARD_IAppliance_GetWarnings_TO (base::)
-#define COM_FORWARD_IAppliance_TO(smth) COM_FORWARD_IAppliance_GETTER_Path_TO (smth) COM_FORWARD_IAppliance_GETTER_Disks_TO (smth) COM_FORWARD_IAppliance_GETTER_VirtualSystemDescriptions_TO (smth) COM_FORWARD_IAppliance_Read_TO (smth) COM_FORWARD_IAppliance_Interpret_TO (smth) COM_FORWARD_IAppliance_ImportMachines_TO (smth) COM_FORWARD_IAppliance_CreateVFSExplorer_TO (smth) COM_FORWARD_IAppliance_Write_TO (smth) COM_FORWARD_IAppliance_GetWarnings_TO (smth) 
-#define COM_FORWARD_IAppliance_TO_OBJ(obj) COM_FORWARD_IAppliance_TO ((obj)->)
-#define COM_FORWARD_IAppliance_TO_BASE(base) COM_FORWARD_IAppliance_TO (base::)
-#define COM_FORWARD_IVirtualSystemDescription_GETTER_Count_TO(smth) HRESULT STDMETHODCALLTYPE get_Count (ULONG * aCount) { return smth get_Count (aCount); }
-#define COM_FORWARD_IVirtualSystemDescription_GETTER_Count_TO_OBJ(obj) COM_FORWARD_IVirtualSystemDescription_GETTER_Count_TO ((obj)->)
-#define COM_FORWARD_IVirtualSystemDescription_GETTER_Count_TO_BASE(base) COM_FORWARD_IVirtualSystemDescription_GETTER_Count_TO (base::)
-#define COM_FORWARD_IVirtualSystemDescription_GetDescription_TO(smth) HRESULT STDMETHODCALLTYPE GetDescription (SAFEARRAY * * aATypes, SAFEARRAY * * aARefs, SAFEARRAY * * aAOvfValues, SAFEARRAY * * aAVBoxValues, SAFEARRAY * * aAExtraConfigValues) { return smth GetDescription (aATypes, aARefs, aAOvfValues, aAVBoxValues, aAExtraConfigValues); }
-#define COM_FORWARD_IVirtualSystemDescription_GetDescription_TO_OBJ(obj) COM_FORWARD_IVirtualSystemDescription_GetDescription_TO ((obj)->)
-#define COM_FORWARD_IVirtualSystemDescription_GetDescription_TO_BASE(base) COM_FORWARD_IVirtualSystemDescription_GetDescription_TO (base::)
-#define COM_FORWARD_IVirtualSystemDescription_GetDescriptionByType_TO(smth) HRESULT STDMETHODCALLTYPE GetDescriptionByType (VirtualSystemDescriptionType aAType, SAFEARRAY * * aATypes, SAFEARRAY * * aARefs, SAFEARRAY * * aAOvfValues, SAFEARRAY * * aAVBoxValues, SAFEARRAY * * aAExtraConfigValues) { return smth GetDescriptionByType (aAType, aATypes, aARefs, aAOvfValues, aAVBoxValues, aAExtraConfigValues); }
-#define COM_FORWARD_IVirtualSystemDescription_GetDescriptionByType_TO_OBJ(obj) COM_FORWARD_IVirtualSystemDescription_GetDescriptionByType_TO ((obj)->)
-#define COM_FORWARD_IVirtualSystemDescription_GetDescriptionByType_TO_BASE(base) COM_FORWARD_IVirtualSystemDescription_GetDescriptionByType_TO (base::)
-#define COM_FORWARD_IVirtualSystemDescription_GetValuesByType_TO(smth) HRESULT STDMETHODCALLTYPE GetValuesByType (VirtualSystemDescriptionType aAType, VirtualSystemDescriptionValueType aAWhich, SAFEARRAY * * aAValues) { return smth GetValuesByType (aAType, aAWhich, aAValues); }
-#define COM_FORWARD_IVirtualSystemDescription_GetValuesByType_TO_OBJ(obj) COM_FORWARD_IVirtualSystemDescription_GetValuesByType_TO ((obj)->)
-#define COM_FORWARD_IVirtualSystemDescription_GetValuesByType_TO_BASE(base) COM_FORWARD_IVirtualSystemDescription_GetValuesByType_TO (base::)
-#define COM_FORWARD_IVirtualSystemDescription_SetFinalValues_TO(smth) HRESULT STDMETHODCALLTYPE SetFinalValues (SAFEARRAY * * aAEnabled, SAFEARRAY * * aAVBoxValues, SAFEARRAY * * aAExtraConfigValues) { return smth SetFinalValues (aAEnabled, aAVBoxValues, aAExtraConfigValues); }
-#define COM_FORWARD_IVirtualSystemDescription_SetFinalValues_TO_OBJ(obj) COM_FORWARD_IVirtualSystemDescription_SetFinalValues_TO ((obj)->)
-#define COM_FORWARD_IVirtualSystemDescription_SetFinalValues_TO_BASE(base) COM_FORWARD_IVirtualSystemDescription_SetFinalValues_TO (base::)
-#define COM_FORWARD_IVirtualSystemDescription_AddDescription_TO(smth) HRESULT STDMETHODCALLTYPE AddDescription (VirtualSystemDescriptionType aAType, BSTR aAVBoxValue, BSTR aAExtraConfigValue) { return smth AddDescription (aAType, aAVBoxValue, aAExtraConfigValue); }
-#define COM_FORWARD_IVirtualSystemDescription_AddDescription_TO_OBJ(obj) COM_FORWARD_IVirtualSystemDescription_AddDescription_TO ((obj)->)
-#define COM_FORWARD_IVirtualSystemDescription_AddDescription_TO_BASE(base) COM_FORWARD_IVirtualSystemDescription_AddDescription_TO (base::)
-#define COM_FORWARD_IVirtualSystemDescription_TO(smth) COM_FORWARD_IVirtualSystemDescription_GETTER_Count_TO (smth) COM_FORWARD_IVirtualSystemDescription_GetDescription_TO (smth) COM_FORWARD_IVirtualSystemDescription_GetDescriptionByType_TO (smth) COM_FORWARD_IVirtualSystemDescription_GetValuesByType_TO (smth) COM_FORWARD_IVirtualSystemDescription_SetFinalValues_TO (smth) COM_FORWARD_IVirtualSystemDescription_AddDescription_TO (smth) 
-#define COM_FORWARD_IVirtualSystemDescription_TO_OBJ(obj) COM_FORWARD_IVirtualSystemDescription_TO ((obj)->)
-#define COM_FORWARD_IVirtualSystemDescription_TO_BASE(base) COM_FORWARD_IVirtualSystemDescription_TO (base::)
-#define COM_FORWARD_IInternalMachineControl_SetRemoveSavedState_TO(smth) HRESULT STDMETHODCALLTYPE SetRemoveSavedState (BOOL aARemove) { return smth SetRemoveSavedState (aARemove); }
-#define COM_FORWARD_IInternalMachineControl_SetRemoveSavedState_TO_OBJ(obj) COM_FORWARD_IInternalMachineControl_SetRemoveSavedState_TO ((obj)->)
-#define COM_FORWARD_IInternalMachineControl_SetRemoveSavedState_TO_BASE(base) COM_FORWARD_IInternalMachineControl_SetRemoveSavedState_TO (base::)
-#define COM_FORWARD_IInternalMachineControl_UpdateState_TO(smth) HRESULT STDMETHODCALLTYPE UpdateState (MachineState aState) { return smth UpdateState (aState); }
-#define COM_FORWARD_IInternalMachineControl_UpdateState_TO_OBJ(obj) COM_FORWARD_IInternalMachineControl_UpdateState_TO ((obj)->)
-#define COM_FORWARD_IInternalMachineControl_UpdateState_TO_BASE(base) COM_FORWARD_IInternalMachineControl_UpdateState_TO (base::)
-#define COM_FORWARD_IInternalMachineControl_GetIPCId_TO(smth) HRESULT STDMETHODCALLTYPE GetIPCId (BSTR * aId) { return smth GetIPCId (aId); }
-#define COM_FORWARD_IInternalMachineControl_GetIPCId_TO_OBJ(obj) COM_FORWARD_IInternalMachineControl_GetIPCId_TO ((obj)->)
-#define COM_FORWARD_IInternalMachineControl_GetIPCId_TO_BASE(base) COM_FORWARD_IInternalMachineControl_GetIPCId_TO (base::)
-#define COM_FORWARD_IInternalMachineControl_BeginPowerUp_TO(smth) HRESULT STDMETHODCALLTYPE BeginPowerUp (IProgress * aProgress) { return smth BeginPowerUp (aProgress); }
-#define COM_FORWARD_IInternalMachineControl_BeginPowerUp_TO_OBJ(obj) COM_FORWARD_IInternalMachineControl_BeginPowerUp_TO ((obj)->)
-#define COM_FORWARD_IInternalMachineControl_BeginPowerUp_TO_BASE(base) COM_FORWARD_IInternalMachineControl_BeginPowerUp_TO (base::)
-#define COM_FORWARD_IInternalMachineControl_EndPowerUp_TO(smth) HRESULT STDMETHODCALLTYPE EndPowerUp (LONG aResult) { return smth EndPowerUp (aResult); }
-#define COM_FORWARD_IInternalMachineControl_EndPowerUp_TO_OBJ(obj) COM_FORWARD_IInternalMachineControl_EndPowerUp_TO ((obj)->)
-#define COM_FORWARD_IInternalMachineControl_EndPowerUp_TO_BASE(base) COM_FORWARD_IInternalMachineControl_EndPowerUp_TO (base::)
-#define COM_FORWARD_IInternalMachineControl_RunUSBDeviceFilters_TO(smth) HRESULT STDMETHODCALLTYPE RunUSBDeviceFilters (IUSBDevice * aDevice, BOOL * aMatched, ULONG * aMaskedInterfaces) { return smth RunUSBDeviceFilters (aDevice, aMatched, aMaskedInterfaces); }
-#define COM_FORWARD_IInternalMachineControl_RunUSBDeviceFilters_TO_OBJ(obj) COM_FORWARD_IInternalMachineControl_RunUSBDeviceFilters_TO ((obj)->)
-#define COM_FORWARD_IInternalMachineControl_RunUSBDeviceFilters_TO_BASE(base) COM_FORWARD_IInternalMachineControl_RunUSBDeviceFilters_TO (base::)
-#define COM_FORWARD_IInternalMachineControl_CaptureUSBDevice_TO(smth) HRESULT STDMETHODCALLTYPE CaptureUSBDevice (BSTR aId) { return smth CaptureUSBDevice (aId); }
-#define COM_FORWARD_IInternalMachineControl_CaptureUSBDevice_TO_OBJ(obj) COM_FORWARD_IInternalMachineControl_CaptureUSBDevice_TO ((obj)->)
-#define COM_FORWARD_IInternalMachineControl_CaptureUSBDevice_TO_BASE(base) COM_FORWARD_IInternalMachineControl_CaptureUSBDevice_TO (base::)
-#define COM_FORWARD_IInternalMachineControl_DetachUSBDevice_TO(smth) HRESULT STDMETHODCALLTYPE DetachUSBDevice (BSTR aId, BOOL aDone) { return smth DetachUSBDevice (aId, aDone); }
-#define COM_FORWARD_IInternalMachineControl_DetachUSBDevice_TO_OBJ(obj) COM_FORWARD_IInternalMachineControl_DetachUSBDevice_TO ((obj)->)
-#define COM_FORWARD_IInternalMachineControl_DetachUSBDevice_TO_BASE(base) COM_FORWARD_IInternalMachineControl_DetachUSBDevice_TO (base::)
-#define COM_FORWARD_IInternalMachineControl_AutoCaptureUSBDevices_TO(smth) HRESULT STDMETHODCALLTYPE AutoCaptureUSBDevices() { return smth AutoCaptureUSBDevices(); }
-#define COM_FORWARD_IInternalMachineControl_AutoCaptureUSBDevices_TO_OBJ(obj) COM_FORWARD_IInternalMachineControl_AutoCaptureUSBDevices_TO ((obj)->)
-#define COM_FORWARD_IInternalMachineControl_AutoCaptureUSBDevices_TO_BASE(base) COM_FORWARD_IInternalMachineControl_AutoCaptureUSBDevices_TO (base::)
-#define COM_FORWARD_IInternalMachineControl_DetachAllUSBDevices_TO(smth) HRESULT STDMETHODCALLTYPE DetachAllUSBDevices (BOOL aDone) { return smth DetachAllUSBDevices (aDone); }
-#define COM_FORWARD_IInternalMachineControl_DetachAllUSBDevices_TO_OBJ(obj) COM_FORWARD_IInternalMachineControl_DetachAllUSBDevices_TO ((obj)->)
-#define COM_FORWARD_IInternalMachineControl_DetachAllUSBDevices_TO_BASE(base) COM_FORWARD_IInternalMachineControl_DetachAllUSBDevices_TO (base::)
-#define COM_FORWARD_IInternalMachineControl_OnSessionEnd_TO(smth) HRESULT STDMETHODCALLTYPE OnSessionEnd (ISession * aSession, IProgress * * aProgress) { return smth OnSessionEnd (aSession, aProgress); }
-#define COM_FORWARD_IInternalMachineControl_OnSessionEnd_TO_OBJ(obj) COM_FORWARD_IInternalMachineControl_OnSessionEnd_TO ((obj)->)
-#define COM_FORWARD_IInternalMachineControl_OnSessionEnd_TO_BASE(base) COM_FORWARD_IInternalMachineControl_OnSessionEnd_TO (base::)
-#define COM_FORWARD_IInternalMachineControl_BeginSavingState_TO(smth) HRESULT STDMETHODCALLTYPE BeginSavingState (IProgress * aProgress, BSTR * aStateFilePath) { return smth BeginSavingState (aProgress, aStateFilePath); }
-#define COM_FORWARD_IInternalMachineControl_BeginSavingState_TO_OBJ(obj) COM_FORWARD_IInternalMachineControl_BeginSavingState_TO ((obj)->)
-#define COM_FORWARD_IInternalMachineControl_BeginSavingState_TO_BASE(base) COM_FORWARD_IInternalMachineControl_BeginSavingState_TO (base::)
-#define COM_FORWARD_IInternalMachineControl_EndSavingState_TO(smth) HRESULT STDMETHODCALLTYPE EndSavingState (BOOL aSuccess) { return smth EndSavingState (aSuccess); }
-#define COM_FORWARD_IInternalMachineControl_EndSavingState_TO_OBJ(obj) COM_FORWARD_IInternalMachineControl_EndSavingState_TO ((obj)->)
-#define COM_FORWARD_IInternalMachineControl_EndSavingState_TO_BASE(base) COM_FORWARD_IInternalMachineControl_EndSavingState_TO (base::)
-#define COM_FORWARD_IInternalMachineControl_AdoptSavedState_TO(smth) HRESULT STDMETHODCALLTYPE AdoptSavedState (BSTR aSavedStateFile) { return smth AdoptSavedState (aSavedStateFile); }
-#define COM_FORWARD_IInternalMachineControl_AdoptSavedState_TO_OBJ(obj) COM_FORWARD_IInternalMachineControl_AdoptSavedState_TO ((obj)->)
-#define COM_FORWARD_IInternalMachineControl_AdoptSavedState_TO_BASE(base) COM_FORWARD_IInternalMachineControl_AdoptSavedState_TO (base::)
-#define COM_FORWARD_IInternalMachineControl_BeginTakingSnapshot_TO(smth) HRESULT STDMETHODCALLTYPE BeginTakingSnapshot (IConsole * aInitiator, BSTR aName, BSTR aDescription, IProgress * aConsoleProgress, BOOL aFTakingSnapshotOnline, BSTR * aStateFilePath) { return smth BeginTakingSnapshot (aInitiator, aName, aDescription, aConsoleProgress, aFTakingSnapshotOnline, aStateFilePath); }
-#define COM_FORWARD_IInternalMachineControl_BeginTakingSnapshot_TO_OBJ(obj) COM_FORWARD_IInternalMachineControl_BeginTakingSnapshot_TO ((obj)->)
-#define COM_FORWARD_IInternalMachineControl_BeginTakingSnapshot_TO_BASE(base) COM_FORWARD_IInternalMachineControl_BeginTakingSnapshot_TO (base::)
-#define COM_FORWARD_IInternalMachineControl_EndTakingSnapshot_TO(smth) HRESULT STDMETHODCALLTYPE EndTakingSnapshot (BOOL aSuccess) { return smth EndTakingSnapshot (aSuccess); }
-#define COM_FORWARD_IInternalMachineControl_EndTakingSnapshot_TO_OBJ(obj) COM_FORWARD_IInternalMachineControl_EndTakingSnapshot_TO ((obj)->)
-#define COM_FORWARD_IInternalMachineControl_EndTakingSnapshot_TO_BASE(base) COM_FORWARD_IInternalMachineControl_EndTakingSnapshot_TO (base::)
-#define COM_FORWARD_IInternalMachineControl_DeleteSnapshot_TO(smth) HRESULT STDMETHODCALLTYPE DeleteSnapshot (IConsole * aInitiator, BSTR aId, MachineState * aMachineState, IProgress * * aProgress) { return smth DeleteSnapshot (aInitiator, aId, aMachineState, aProgress); }
-#define COM_FORWARD_IInternalMachineControl_DeleteSnapshot_TO_OBJ(obj) COM_FORWARD_IInternalMachineControl_DeleteSnapshot_TO ((obj)->)
-#define COM_FORWARD_IInternalMachineControl_DeleteSnapshot_TO_BASE(base) COM_FORWARD_IInternalMachineControl_DeleteSnapshot_TO (base::)
-#define COM_FORWARD_IInternalMachineControl_FinishOnlineMergeMedium_TO(smth) HRESULT STDMETHODCALLTYPE FinishOnlineMergeMedium (IMediumAttachment * aMediumAttachment, IMedium * aSource, IMedium * aTarget, BOOL aMergeForward, IMedium * aParentForTarget, SAFEARRAY * * aChildrenToReparent) { return smth FinishOnlineMergeMedium (aMediumAttachment, aSource, aTarget, aMergeForward, aParentForTarget, aChildrenToReparent); }
-#define COM_FORWARD_IInternalMachineControl_FinishOnlineMergeMedium_TO_OBJ(obj) COM_FORWARD_IInternalMachineControl_FinishOnlineMergeMedium_TO ((obj)->)
-#define COM_FORWARD_IInternalMachineControl_FinishOnlineMergeMedium_TO_BASE(base) COM_FORWARD_IInternalMachineControl_FinishOnlineMergeMedium_TO (base::)
-#define COM_FORWARD_IInternalMachineControl_RestoreSnapshot_TO(smth) HRESULT STDMETHODCALLTYPE RestoreSnapshot (IConsole * aInitiator, ISnapshot * aSnapshot, MachineState * aMachineState, IProgress * * aProgress) { return smth RestoreSnapshot (aInitiator, aSnapshot, aMachineState, aProgress); }
-#define COM_FORWARD_IInternalMachineControl_RestoreSnapshot_TO_OBJ(obj) COM_FORWARD_IInternalMachineControl_RestoreSnapshot_TO ((obj)->)
-#define COM_FORWARD_IInternalMachineControl_RestoreSnapshot_TO_BASE(base) COM_FORWARD_IInternalMachineControl_RestoreSnapshot_TO (base::)
-#define COM_FORWARD_IInternalMachineControl_PullGuestProperties_TO(smth) HRESULT STDMETHODCALLTYPE PullGuestProperties (SAFEARRAY * * aName, SAFEARRAY * * aValue, SAFEARRAY * * aTimestamp, SAFEARRAY * * aFlags) { return smth PullGuestProperties (aName, aValue, aTimestamp, aFlags); }
-#define COM_FORWARD_IInternalMachineControl_PullGuestProperties_TO_OBJ(obj) COM_FORWARD_IInternalMachineControl_PullGuestProperties_TO ((obj)->)
-#define COM_FORWARD_IInternalMachineControl_PullGuestProperties_TO_BASE(base) COM_FORWARD_IInternalMachineControl_PullGuestProperties_TO (base::)
-#define COM_FORWARD_IInternalMachineControl_PushGuestProperty_TO(smth) HRESULT STDMETHODCALLTYPE PushGuestProperty (BSTR aName, BSTR aValue, ULONG64 aTimestamp, BSTR aFlags) { return smth PushGuestProperty (aName, aValue, aTimestamp, aFlags); }
-#define COM_FORWARD_IInternalMachineControl_PushGuestProperty_TO_OBJ(obj) COM_FORWARD_IInternalMachineControl_PushGuestProperty_TO ((obj)->)
-#define COM_FORWARD_IInternalMachineControl_PushGuestProperty_TO_BASE(base) COM_FORWARD_IInternalMachineControl_PushGuestProperty_TO (base::)
-#define COM_FORWARD_IInternalMachineControl_LockMedia_TO(smth) HRESULT STDMETHODCALLTYPE LockMedia() { return smth LockMedia(); }
-#define COM_FORWARD_IInternalMachineControl_LockMedia_TO_OBJ(obj) COM_FORWARD_IInternalMachineControl_LockMedia_TO ((obj)->)
-#define COM_FORWARD_IInternalMachineControl_LockMedia_TO_BASE(base) COM_FORWARD_IInternalMachineControl_LockMedia_TO (base::)
-#define COM_FORWARD_IInternalMachineControl_UnlockMedia_TO(smth) HRESULT STDMETHODCALLTYPE UnlockMedia() { return smth UnlockMedia(); }
-#define COM_FORWARD_IInternalMachineControl_UnlockMedia_TO_OBJ(obj) COM_FORWARD_IInternalMachineControl_UnlockMedia_TO ((obj)->)
-#define COM_FORWARD_IInternalMachineControl_UnlockMedia_TO_BASE(base) COM_FORWARD_IInternalMachineControl_UnlockMedia_TO (base::)
-#define COM_FORWARD_IInternalMachineControl_TO(smth) COM_FORWARD_IInternalMachineControl_SetRemoveSavedState_TO (smth) COM_FORWARD_IInternalMachineControl_UpdateState_TO (smth) COM_FORWARD_IInternalMachineControl_GetIPCId_TO (smth) COM_FORWARD_IInternalMachineControl_BeginPowerUp_TO (smth) COM_FORWARD_IInternalMachineControl_EndPowerUp_TO (smth) COM_FORWARD_IInternalMachineControl_RunUSBDeviceFilters_TO (smth) COM_FORWARD_IInternalMachineControl_CaptureUSBDevice_TO (smth) COM_FORWARD_IIn [...]
-#define COM_FORWARD_IInternalMachineControl_TO_OBJ(obj) COM_FORWARD_IInternalMachineControl_TO ((obj)->)
-#define COM_FORWARD_IInternalMachineControl_TO_BASE(base) COM_FORWARD_IInternalMachineControl_TO (base::)
-#define COM_FORWARD_IBIOSSettings_GETTER_LogoFadeIn_TO(smth) HRESULT STDMETHODCALLTYPE get_LogoFadeIn (BOOL * aLogoFadeIn) { return smth get_LogoFadeIn (aLogoFadeIn); }
-#define COM_FORWARD_IBIOSSettings_GETTER_LogoFadeIn_TO_OBJ(obj) COM_FORWARD_IBIOSSettings_GETTER_LogoFadeIn_TO ((obj)->)
-#define COM_FORWARD_IBIOSSettings_GETTER_LogoFadeIn_TO_BASE(base) COM_FORWARD_IBIOSSettings_GETTER_LogoFadeIn_TO (base::)
-#define COM_FORWARD_IBIOSSettings_SETTER_LogoFadeIn_TO(smth) HRESULT STDMETHODCALLTYPE put_LogoFadeIn (BOOL aLogoFadeIn) { return smth put_LogoFadeIn (aLogoFadeIn); }
-#define COM_FORWARD_IBIOSSettings_SETTER_LogoFadeIn_TO_OBJ(obj) COM_FORWARD_IBIOSSettings_SETTER_LogoFadeIn_TO ((obj)->)
-#define COM_FORWARD_IBIOSSettings_SETTER_LogoFadeIn_TO_BASE(base) COM_FORWARD_IBIOSSettings_SETTER_LogoFadeIn_TO (base::)
-#define COM_FORWARD_IBIOSSettings_GETTER_LogoFadeOut_TO(smth) HRESULT STDMETHODCALLTYPE get_LogoFadeOut (BOOL * aLogoFadeOut) { return smth get_LogoFadeOut (aLogoFadeOut); }
-#define COM_FORWARD_IBIOSSettings_GETTER_LogoFadeOut_TO_OBJ(obj) COM_FORWARD_IBIOSSettings_GETTER_LogoFadeOut_TO ((obj)->)
-#define COM_FORWARD_IBIOSSettings_GETTER_LogoFadeOut_TO_BASE(base) COM_FORWARD_IBIOSSettings_GETTER_LogoFadeOut_TO (base::)
-#define COM_FORWARD_IBIOSSettings_SETTER_LogoFadeOut_TO(smth) HRESULT STDMETHODCALLTYPE put_LogoFadeOut (BOOL aLogoFadeOut) { return smth put_LogoFadeOut (aLogoFadeOut); }
-#define COM_FORWARD_IBIOSSettings_SETTER_LogoFadeOut_TO_OBJ(obj) COM_FORWARD_IBIOSSettings_SETTER_LogoFadeOut_TO ((obj)->)
-#define COM_FORWARD_IBIOSSettings_SETTER_LogoFadeOut_TO_BASE(base) COM_FORWARD_IBIOSSettings_SETTER_LogoFadeOut_TO (base::)
-#define COM_FORWARD_IBIOSSettings_GETTER_LogoDisplayTime_TO(smth) HRESULT STDMETHODCALLTYPE get_LogoDisplayTime (ULONG * aLogoDisplayTime) { return smth get_LogoDisplayTime (aLogoDisplayTime); }
-#define COM_FORWARD_IBIOSSettings_GETTER_LogoDisplayTime_TO_OBJ(obj) COM_FORWARD_IBIOSSettings_GETTER_LogoDisplayTime_TO ((obj)->)
-#define COM_FORWARD_IBIOSSettings_GETTER_LogoDisplayTime_TO_BASE(base) COM_FORWARD_IBIOSSettings_GETTER_LogoDisplayTime_TO (base::)
-#define COM_FORWARD_IBIOSSettings_SETTER_LogoDisplayTime_TO(smth) HRESULT STDMETHODCALLTYPE put_LogoDisplayTime (ULONG aLogoDisplayTime) { return smth put_LogoDisplayTime (aLogoDisplayTime); }
-#define COM_FORWARD_IBIOSSettings_SETTER_LogoDisplayTime_TO_OBJ(obj) COM_FORWARD_IBIOSSettings_SETTER_LogoDisplayTime_TO ((obj)->)
-#define COM_FORWARD_IBIOSSettings_SETTER_LogoDisplayTime_TO_BASE(base) COM_FORWARD_IBIOSSettings_SETTER_LogoDisplayTime_TO (base::)
-#define COM_FORWARD_IBIOSSettings_GETTER_LogoImagePath_TO(smth) HRESULT STDMETHODCALLTYPE get_LogoImagePath (BSTR * aLogoImagePath) { return smth get_LogoImagePath (aLogoImagePath); }
-#define COM_FORWARD_IBIOSSettings_GETTER_LogoImagePath_TO_OBJ(obj) COM_FORWARD_IBIOSSettings_GETTER_LogoImagePath_TO ((obj)->)
-#define COM_FORWARD_IBIOSSettings_GETTER_LogoImagePath_TO_BASE(base) COM_FORWARD_IBIOSSettings_GETTER_LogoImagePath_TO (base::)
-#define COM_FORWARD_IBIOSSettings_SETTER_LogoImagePath_TO(smth) HRESULT STDMETHODCALLTYPE put_LogoImagePath (BSTR aLogoImagePath) { return smth put_LogoImagePath (aLogoImagePath); }
-#define COM_FORWARD_IBIOSSettings_SETTER_LogoImagePath_TO_OBJ(obj) COM_FORWARD_IBIOSSettings_SETTER_LogoImagePath_TO ((obj)->)
-#define COM_FORWARD_IBIOSSettings_SETTER_LogoImagePath_TO_BASE(base) COM_FORWARD_IBIOSSettings_SETTER_LogoImagePath_TO (base::)
-#define COM_FORWARD_IBIOSSettings_GETTER_BootMenuMode_TO(smth) HRESULT STDMETHODCALLTYPE get_BootMenuMode (BIOSBootMenuMode * aBootMenuMode) { return smth get_BootMenuMode (aBootMenuMode); }
-#define COM_FORWARD_IBIOSSettings_GETTER_BootMenuMode_TO_OBJ(obj) COM_FORWARD_IBIOSSettings_GETTER_BootMenuMode_TO ((obj)->)
-#define COM_FORWARD_IBIOSSettings_GETTER_BootMenuMode_TO_BASE(base) COM_FORWARD_IBIOSSettings_GETTER_BootMenuMode_TO (base::)
-#define COM_FORWARD_IBIOSSettings_SETTER_BootMenuMode_TO(smth) HRESULT STDMETHODCALLTYPE put_BootMenuMode (BIOSBootMenuMode aBootMenuMode) { return smth put_BootMenuMode (aBootMenuMode); }
-#define COM_FORWARD_IBIOSSettings_SETTER_BootMenuMode_TO_OBJ(obj) COM_FORWARD_IBIOSSettings_SETTER_BootMenuMode_TO ((obj)->)
-#define COM_FORWARD_IBIOSSettings_SETTER_BootMenuMode_TO_BASE(base) COM_FORWARD_IBIOSSettings_SETTER_BootMenuMode_TO (base::)
-#define COM_FORWARD_IBIOSSettings_GETTER_ACPIEnabled_TO(smth) HRESULT STDMETHODCALLTYPE get_ACPIEnabled (BOOL * aACPIEnabled) { return smth get_ACPIEnabled (aACPIEnabled); }
-#define COM_FORWARD_IBIOSSettings_GETTER_ACPIEnabled_TO_OBJ(obj) COM_FORWARD_IBIOSSettings_GETTER_ACPIEnabled_TO ((obj)->)
-#define COM_FORWARD_IBIOSSettings_GETTER_ACPIEnabled_TO_BASE(base) COM_FORWARD_IBIOSSettings_GETTER_ACPIEnabled_TO (base::)
-#define COM_FORWARD_IBIOSSettings_SETTER_ACPIEnabled_TO(smth) HRESULT STDMETHODCALLTYPE put_ACPIEnabled (BOOL aACPIEnabled) { return smth put_ACPIEnabled (aACPIEnabled); }
-#define COM_FORWARD_IBIOSSettings_SETTER_ACPIEnabled_TO_OBJ(obj) COM_FORWARD_IBIOSSettings_SETTER_ACPIEnabled_TO ((obj)->)
-#define COM_FORWARD_IBIOSSettings_SETTER_ACPIEnabled_TO_BASE(base) COM_FORWARD_IBIOSSettings_SETTER_ACPIEnabled_TO (base::)
-#define COM_FORWARD_IBIOSSettings_GETTER_IOAPICEnabled_TO(smth) HRESULT STDMETHODCALLTYPE get_IOAPICEnabled (BOOL * aIOAPICEnabled) { return smth get_IOAPICEnabled (aIOAPICEnabled); }
-#define COM_FORWARD_IBIOSSettings_GETTER_IOAPICEnabled_TO_OBJ(obj) COM_FORWARD_IBIOSSettings_GETTER_IOAPICEnabled_TO ((obj)->)
-#define COM_FORWARD_IBIOSSettings_GETTER_IOAPICEnabled_TO_BASE(base) COM_FORWARD_IBIOSSettings_GETTER_IOAPICEnabled_TO (base::)
-#define COM_FORWARD_IBIOSSettings_SETTER_IOAPICEnabled_TO(smth) HRESULT STDMETHODCALLTYPE put_IOAPICEnabled (BOOL aIOAPICEnabled) { return smth put_IOAPICEnabled (aIOAPICEnabled); }
-#define COM_FORWARD_IBIOSSettings_SETTER_IOAPICEnabled_TO_OBJ(obj) COM_FORWARD_IBIOSSettings_SETTER_IOAPICEnabled_TO ((obj)->)
-#define COM_FORWARD_IBIOSSettings_SETTER_IOAPICEnabled_TO_BASE(base) COM_FORWARD_IBIOSSettings_SETTER_IOAPICEnabled_TO (base::)
-#define COM_FORWARD_IBIOSSettings_GETTER_TimeOffset_TO(smth) HRESULT STDMETHODCALLTYPE get_TimeOffset (LONG64 * aTimeOffset) { return smth get_TimeOffset (aTimeOffset); }
-#define COM_FORWARD_IBIOSSettings_GETTER_TimeOffset_TO_OBJ(obj) COM_FORWARD_IBIOSSettings_GETTER_TimeOffset_TO ((obj)->)
-#define COM_FORWARD_IBIOSSettings_GETTER_TimeOffset_TO_BASE(base) COM_FORWARD_IBIOSSettings_GETTER_TimeOffset_TO (base::)
-#define COM_FORWARD_IBIOSSettings_SETTER_TimeOffset_TO(smth) HRESULT STDMETHODCALLTYPE put_TimeOffset (LONG64 aTimeOffset) { return smth put_TimeOffset (aTimeOffset); }
-#define COM_FORWARD_IBIOSSettings_SETTER_TimeOffset_TO_OBJ(obj) COM_FORWARD_IBIOSSettings_SETTER_TimeOffset_TO ((obj)->)
-#define COM_FORWARD_IBIOSSettings_SETTER_TimeOffset_TO_BASE(base) COM_FORWARD_IBIOSSettings_SETTER_TimeOffset_TO (base::)
-#define COM_FORWARD_IBIOSSettings_GETTER_PXEDebugEnabled_TO(smth) HRESULT STDMETHODCALLTYPE get_PXEDebugEnabled (BOOL * aPXEDebugEnabled) { return smth get_PXEDebugEnabled (aPXEDebugEnabled); }
-#define COM_FORWARD_IBIOSSettings_GETTER_PXEDebugEnabled_TO_OBJ(obj) COM_FORWARD_IBIOSSettings_GETTER_PXEDebugEnabled_TO ((obj)->)
-#define COM_FORWARD_IBIOSSettings_GETTER_PXEDebugEnabled_TO_BASE(base) COM_FORWARD_IBIOSSettings_GETTER_PXEDebugEnabled_TO (base::)
-#define COM_FORWARD_IBIOSSettings_SETTER_PXEDebugEnabled_TO(smth) HRESULT STDMETHODCALLTYPE put_PXEDebugEnabled (BOOL aPXEDebugEnabled) { return smth put_PXEDebugEnabled (aPXEDebugEnabled); }
-#define COM_FORWARD_IBIOSSettings_SETTER_PXEDebugEnabled_TO_OBJ(obj) COM_FORWARD_IBIOSSettings_SETTER_PXEDebugEnabled_TO ((obj)->)
-#define COM_FORWARD_IBIOSSettings_SETTER_PXEDebugEnabled_TO_BASE(base) COM_FORWARD_IBIOSSettings_SETTER_PXEDebugEnabled_TO (base::)
-#define COM_FORWARD_IBIOSSettings_TO(smth) COM_FORWARD_IBIOSSettings_GETTER_LogoFadeIn_TO (smth) COM_FORWARD_IBIOSSettings_SETTER_LogoFadeIn_TO (smth) COM_FORWARD_IBIOSSettings_GETTER_LogoFadeOut_TO (smth) COM_FORWARD_IBIOSSettings_SETTER_LogoFadeOut_TO (smth) COM_FORWARD_IBIOSSettings_GETTER_LogoDisplayTime_TO (smth) COM_FORWARD_IBIOSSettings_SETTER_LogoDisplayTime_TO (smth) COM_FORWARD_IBIOSSettings_GETTER_LogoImagePath_TO (smth) COM_FORWARD_IBIOSSettings_SETTER_LogoImagePath_TO (smth) [...]
-#define COM_FORWARD_IBIOSSettings_TO_OBJ(obj) COM_FORWARD_IBIOSSettings_TO ((obj)->)
-#define COM_FORWARD_IBIOSSettings_TO_BASE(base) COM_FORWARD_IBIOSSettings_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_Parent_TO(smth) HRESULT STDMETHODCALLTYPE get_Parent (IVirtualBox * * aParent) { return smth get_Parent (aParent); }
-#define COM_FORWARD_IMachine_GETTER_Parent_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_Parent_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_Parent_TO_BASE(base) COM_FORWARD_IMachine_GETTER_Parent_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_Accessible_TO(smth) HRESULT STDMETHODCALLTYPE get_Accessible (BOOL * aAccessible) { return smth get_Accessible (aAccessible); }
-#define COM_FORWARD_IMachine_GETTER_Accessible_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_Accessible_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_Accessible_TO_BASE(base) COM_FORWARD_IMachine_GETTER_Accessible_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_AccessError_TO(smth) HRESULT STDMETHODCALLTYPE get_AccessError (IVirtualBoxErrorInfo * * aAccessError) { return smth get_AccessError (aAccessError); }
-#define COM_FORWARD_IMachine_GETTER_AccessError_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_AccessError_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_AccessError_TO_BASE(base) COM_FORWARD_IMachine_GETTER_AccessError_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_Name_TO(smth) HRESULT STDMETHODCALLTYPE get_Name (BSTR * aName) { return smth get_Name (aName); }
-#define COM_FORWARD_IMachine_GETTER_Name_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_Name_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_Name_TO_BASE(base) COM_FORWARD_IMachine_GETTER_Name_TO (base::)
-#define COM_FORWARD_IMachine_SETTER_Name_TO(smth) HRESULT STDMETHODCALLTYPE put_Name (BSTR aName) { return smth put_Name (aName); }
-#define COM_FORWARD_IMachine_SETTER_Name_TO_OBJ(obj) COM_FORWARD_IMachine_SETTER_Name_TO ((obj)->)
-#define COM_FORWARD_IMachine_SETTER_Name_TO_BASE(base) COM_FORWARD_IMachine_SETTER_Name_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_Description_TO(smth) HRESULT STDMETHODCALLTYPE get_Description (BSTR * aDescription) { return smth get_Description (aDescription); }
-#define COM_FORWARD_IMachine_GETTER_Description_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_Description_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_Description_TO_BASE(base) COM_FORWARD_IMachine_GETTER_Description_TO (base::)
-#define COM_FORWARD_IMachine_SETTER_Description_TO(smth) HRESULT STDMETHODCALLTYPE put_Description (BSTR aDescription) { return smth put_Description (aDescription); }
-#define COM_FORWARD_IMachine_SETTER_Description_TO_OBJ(obj) COM_FORWARD_IMachine_SETTER_Description_TO ((obj)->)
-#define COM_FORWARD_IMachine_SETTER_Description_TO_BASE(base) COM_FORWARD_IMachine_SETTER_Description_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_Id_TO(smth) HRESULT STDMETHODCALLTYPE get_Id (BSTR * aId) { return smth get_Id (aId); }
-#define COM_FORWARD_IMachine_GETTER_Id_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_Id_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_Id_TO_BASE(base) COM_FORWARD_IMachine_GETTER_Id_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_OSTypeId_TO(smth) HRESULT STDMETHODCALLTYPE get_OSTypeId (BSTR * aOSTypeId) { return smth get_OSTypeId (aOSTypeId); }
-#define COM_FORWARD_IMachine_GETTER_OSTypeId_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_OSTypeId_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_OSTypeId_TO_BASE(base) COM_FORWARD_IMachine_GETTER_OSTypeId_TO (base::)
-#define COM_FORWARD_IMachine_SETTER_OSTypeId_TO(smth) HRESULT STDMETHODCALLTYPE put_OSTypeId (BSTR aOSTypeId) { return smth put_OSTypeId (aOSTypeId); }
-#define COM_FORWARD_IMachine_SETTER_OSTypeId_TO_OBJ(obj) COM_FORWARD_IMachine_SETTER_OSTypeId_TO ((obj)->)
-#define COM_FORWARD_IMachine_SETTER_OSTypeId_TO_BASE(base) COM_FORWARD_IMachine_SETTER_OSTypeId_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_HardwareVersion_TO(smth) HRESULT STDMETHODCALLTYPE get_HardwareVersion (BSTR * aHardwareVersion) { return smth get_HardwareVersion (aHardwareVersion); }
-#define COM_FORWARD_IMachine_GETTER_HardwareVersion_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_HardwareVersion_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_HardwareVersion_TO_BASE(base) COM_FORWARD_IMachine_GETTER_HardwareVersion_TO (base::)
-#define COM_FORWARD_IMachine_SETTER_HardwareVersion_TO(smth) HRESULT STDMETHODCALLTYPE put_HardwareVersion (BSTR aHardwareVersion) { return smth put_HardwareVersion (aHardwareVersion); }
-#define COM_FORWARD_IMachine_SETTER_HardwareVersion_TO_OBJ(obj) COM_FORWARD_IMachine_SETTER_HardwareVersion_TO ((obj)->)
-#define COM_FORWARD_IMachine_SETTER_HardwareVersion_TO_BASE(base) COM_FORWARD_IMachine_SETTER_HardwareVersion_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_HardwareUUID_TO(smth) HRESULT STDMETHODCALLTYPE get_HardwareUUID (BSTR * aHardwareUUID) { return smth get_HardwareUUID (aHardwareUUID); }
-#define COM_FORWARD_IMachine_GETTER_HardwareUUID_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_HardwareUUID_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_HardwareUUID_TO_BASE(base) COM_FORWARD_IMachine_GETTER_HardwareUUID_TO (base::)
-#define COM_FORWARD_IMachine_SETTER_HardwareUUID_TO(smth) HRESULT STDMETHODCALLTYPE put_HardwareUUID (BSTR aHardwareUUID) { return smth put_HardwareUUID (aHardwareUUID); }
-#define COM_FORWARD_IMachine_SETTER_HardwareUUID_TO_OBJ(obj) COM_FORWARD_IMachine_SETTER_HardwareUUID_TO ((obj)->)
-#define COM_FORWARD_IMachine_SETTER_HardwareUUID_TO_BASE(base) COM_FORWARD_IMachine_SETTER_HardwareUUID_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_CPUCount_TO(smth) HRESULT STDMETHODCALLTYPE get_CPUCount (ULONG * aCPUCount) { return smth get_CPUCount (aCPUCount); }
-#define COM_FORWARD_IMachine_GETTER_CPUCount_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_CPUCount_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_CPUCount_TO_BASE(base) COM_FORWARD_IMachine_GETTER_CPUCount_TO (base::)
-#define COM_FORWARD_IMachine_SETTER_CPUCount_TO(smth) HRESULT STDMETHODCALLTYPE put_CPUCount (ULONG aCPUCount) { return smth put_CPUCount (aCPUCount); }
-#define COM_FORWARD_IMachine_SETTER_CPUCount_TO_OBJ(obj) COM_FORWARD_IMachine_SETTER_CPUCount_TO ((obj)->)
-#define COM_FORWARD_IMachine_SETTER_CPUCount_TO_BASE(base) COM_FORWARD_IMachine_SETTER_CPUCount_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_CPUHotPlugEnabled_TO(smth) HRESULT STDMETHODCALLTYPE get_CPUHotPlugEnabled (BOOL * aCPUHotPlugEnabled) { return smth get_CPUHotPlugEnabled (aCPUHotPlugEnabled); }
-#define COM_FORWARD_IMachine_GETTER_CPUHotPlugEnabled_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_CPUHotPlugEnabled_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_CPUHotPlugEnabled_TO_BASE(base) COM_FORWARD_IMachine_GETTER_CPUHotPlugEnabled_TO (base::)
-#define COM_FORWARD_IMachine_SETTER_CPUHotPlugEnabled_TO(smth) HRESULT STDMETHODCALLTYPE put_CPUHotPlugEnabled (BOOL aCPUHotPlugEnabled) { return smth put_CPUHotPlugEnabled (aCPUHotPlugEnabled); }
-#define COM_FORWARD_IMachine_SETTER_CPUHotPlugEnabled_TO_OBJ(obj) COM_FORWARD_IMachine_SETTER_CPUHotPlugEnabled_TO ((obj)->)
-#define COM_FORWARD_IMachine_SETTER_CPUHotPlugEnabled_TO_BASE(base) COM_FORWARD_IMachine_SETTER_CPUHotPlugEnabled_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_MemorySize_TO(smth) HRESULT STDMETHODCALLTYPE get_MemorySize (ULONG * aMemorySize) { return smth get_MemorySize (aMemorySize); }
-#define COM_FORWARD_IMachine_GETTER_MemorySize_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_MemorySize_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_MemorySize_TO_BASE(base) COM_FORWARD_IMachine_GETTER_MemorySize_TO (base::)
-#define COM_FORWARD_IMachine_SETTER_MemorySize_TO(smth) HRESULT STDMETHODCALLTYPE put_MemorySize (ULONG aMemorySize) { return smth put_MemorySize (aMemorySize); }
-#define COM_FORWARD_IMachine_SETTER_MemorySize_TO_OBJ(obj) COM_FORWARD_IMachine_SETTER_MemorySize_TO ((obj)->)
-#define COM_FORWARD_IMachine_SETTER_MemorySize_TO_BASE(base) COM_FORWARD_IMachine_SETTER_MemorySize_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_MemoryBalloonSize_TO(smth) HRESULT STDMETHODCALLTYPE get_MemoryBalloonSize (ULONG * aMemoryBalloonSize) { return smth get_MemoryBalloonSize (aMemoryBalloonSize); }
-#define COM_FORWARD_IMachine_GETTER_MemoryBalloonSize_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_MemoryBalloonSize_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_MemoryBalloonSize_TO_BASE(base) COM_FORWARD_IMachine_GETTER_MemoryBalloonSize_TO (base::)
-#define COM_FORWARD_IMachine_SETTER_MemoryBalloonSize_TO(smth) HRESULT STDMETHODCALLTYPE put_MemoryBalloonSize (ULONG aMemoryBalloonSize) { return smth put_MemoryBalloonSize (aMemoryBalloonSize); }
-#define COM_FORWARD_IMachine_SETTER_MemoryBalloonSize_TO_OBJ(obj) COM_FORWARD_IMachine_SETTER_MemoryBalloonSize_TO ((obj)->)
-#define COM_FORWARD_IMachine_SETTER_MemoryBalloonSize_TO_BASE(base) COM_FORWARD_IMachine_SETTER_MemoryBalloonSize_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_PageFusionEnabled_TO(smth) HRESULT STDMETHODCALLTYPE get_PageFusionEnabled (BOOL * aPageFusionEnabled) { return smth get_PageFusionEnabled (aPageFusionEnabled); }
-#define COM_FORWARD_IMachine_GETTER_PageFusionEnabled_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_PageFusionEnabled_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_PageFusionEnabled_TO_BASE(base) COM_FORWARD_IMachine_GETTER_PageFusionEnabled_TO (base::)
-#define COM_FORWARD_IMachine_SETTER_PageFusionEnabled_TO(smth) HRESULT STDMETHODCALLTYPE put_PageFusionEnabled (BOOL aPageFusionEnabled) { return smth put_PageFusionEnabled (aPageFusionEnabled); }
-#define COM_FORWARD_IMachine_SETTER_PageFusionEnabled_TO_OBJ(obj) COM_FORWARD_IMachine_SETTER_PageFusionEnabled_TO ((obj)->)
-#define COM_FORWARD_IMachine_SETTER_PageFusionEnabled_TO_BASE(base) COM_FORWARD_IMachine_SETTER_PageFusionEnabled_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_VRAMSize_TO(smth) HRESULT STDMETHODCALLTYPE get_VRAMSize (ULONG * aVRAMSize) { return smth get_VRAMSize (aVRAMSize); }
-#define COM_FORWARD_IMachine_GETTER_VRAMSize_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_VRAMSize_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_VRAMSize_TO_BASE(base) COM_FORWARD_IMachine_GETTER_VRAMSize_TO (base::)
-#define COM_FORWARD_IMachine_SETTER_VRAMSize_TO(smth) HRESULT STDMETHODCALLTYPE put_VRAMSize (ULONG aVRAMSize) { return smth put_VRAMSize (aVRAMSize); }
-#define COM_FORWARD_IMachine_SETTER_VRAMSize_TO_OBJ(obj) COM_FORWARD_IMachine_SETTER_VRAMSize_TO ((obj)->)
-#define COM_FORWARD_IMachine_SETTER_VRAMSize_TO_BASE(base) COM_FORWARD_IMachine_SETTER_VRAMSize_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_Accelerate3DEnabled_TO(smth) HRESULT STDMETHODCALLTYPE get_Accelerate3DEnabled (BOOL * aAccelerate3DEnabled) { return smth get_Accelerate3DEnabled (aAccelerate3DEnabled); }
-#define COM_FORWARD_IMachine_GETTER_Accelerate3DEnabled_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_Accelerate3DEnabled_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_Accelerate3DEnabled_TO_BASE(base) COM_FORWARD_IMachine_GETTER_Accelerate3DEnabled_TO (base::)
-#define COM_FORWARD_IMachine_SETTER_Accelerate3DEnabled_TO(smth) HRESULT STDMETHODCALLTYPE put_Accelerate3DEnabled (BOOL aAccelerate3DEnabled) { return smth put_Accelerate3DEnabled (aAccelerate3DEnabled); }
-#define COM_FORWARD_IMachine_SETTER_Accelerate3DEnabled_TO_OBJ(obj) COM_FORWARD_IMachine_SETTER_Accelerate3DEnabled_TO ((obj)->)
-#define COM_FORWARD_IMachine_SETTER_Accelerate3DEnabled_TO_BASE(base) COM_FORWARD_IMachine_SETTER_Accelerate3DEnabled_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_Accelerate2DVideoEnabled_TO(smth) HRESULT STDMETHODCALLTYPE get_Accelerate2DVideoEnabled (BOOL * aAccelerate2DVideoEnabled) { return smth get_Accelerate2DVideoEnabled (aAccelerate2DVideoEnabled); }
-#define COM_FORWARD_IMachine_GETTER_Accelerate2DVideoEnabled_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_Accelerate2DVideoEnabled_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_Accelerate2DVideoEnabled_TO_BASE(base) COM_FORWARD_IMachine_GETTER_Accelerate2DVideoEnabled_TO (base::)
-#define COM_FORWARD_IMachine_SETTER_Accelerate2DVideoEnabled_TO(smth) HRESULT STDMETHODCALLTYPE put_Accelerate2DVideoEnabled (BOOL aAccelerate2DVideoEnabled) { return smth put_Accelerate2DVideoEnabled (aAccelerate2DVideoEnabled); }
-#define COM_FORWARD_IMachine_SETTER_Accelerate2DVideoEnabled_TO_OBJ(obj) COM_FORWARD_IMachine_SETTER_Accelerate2DVideoEnabled_TO ((obj)->)
-#define COM_FORWARD_IMachine_SETTER_Accelerate2DVideoEnabled_TO_BASE(base) COM_FORWARD_IMachine_SETTER_Accelerate2DVideoEnabled_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_MonitorCount_TO(smth) HRESULT STDMETHODCALLTYPE get_MonitorCount (ULONG * aMonitorCount) { return smth get_MonitorCount (aMonitorCount); }
-#define COM_FORWARD_IMachine_GETTER_MonitorCount_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_MonitorCount_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_MonitorCount_TO_BASE(base) COM_FORWARD_IMachine_GETTER_MonitorCount_TO (base::)
-#define COM_FORWARD_IMachine_SETTER_MonitorCount_TO(smth) HRESULT STDMETHODCALLTYPE put_MonitorCount (ULONG aMonitorCount) { return smth put_MonitorCount (aMonitorCount); }
-#define COM_FORWARD_IMachine_SETTER_MonitorCount_TO_OBJ(obj) COM_FORWARD_IMachine_SETTER_MonitorCount_TO ((obj)->)
-#define COM_FORWARD_IMachine_SETTER_MonitorCount_TO_BASE(base) COM_FORWARD_IMachine_SETTER_MonitorCount_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_BIOSSettings_TO(smth) HRESULT STDMETHODCALLTYPE get_BIOSSettings (IBIOSSettings * * aBIOSSettings) { return smth get_BIOSSettings (aBIOSSettings); }
-#define COM_FORWARD_IMachine_GETTER_BIOSSettings_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_BIOSSettings_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_BIOSSettings_TO_BASE(base) COM_FORWARD_IMachine_GETTER_BIOSSettings_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_FirmwareType_TO(smth) HRESULT STDMETHODCALLTYPE get_FirmwareType (FirmwareType * aFirmwareType) { return smth get_FirmwareType (aFirmwareType); }
-#define COM_FORWARD_IMachine_GETTER_FirmwareType_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_FirmwareType_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_FirmwareType_TO_BASE(base) COM_FORWARD_IMachine_GETTER_FirmwareType_TO (base::)
-#define COM_FORWARD_IMachine_SETTER_FirmwareType_TO(smth) HRESULT STDMETHODCALLTYPE put_FirmwareType (FirmwareType aFirmwareType) { return smth put_FirmwareType (aFirmwareType); }
-#define COM_FORWARD_IMachine_SETTER_FirmwareType_TO_OBJ(obj) COM_FORWARD_IMachine_SETTER_FirmwareType_TO ((obj)->)
-#define COM_FORWARD_IMachine_SETTER_FirmwareType_TO_BASE(base) COM_FORWARD_IMachine_SETTER_FirmwareType_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_PointingHidType_TO(smth) HRESULT STDMETHODCALLTYPE get_PointingHidType (PointingHidType * aPointingHidType) { return smth get_PointingHidType (aPointingHidType); }
-#define COM_FORWARD_IMachine_GETTER_PointingHidType_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_PointingHidType_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_PointingHidType_TO_BASE(base) COM_FORWARD_IMachine_GETTER_PointingHidType_TO (base::)
-#define COM_FORWARD_IMachine_SETTER_PointingHidType_TO(smth) HRESULT STDMETHODCALLTYPE put_PointingHidType (PointingHidType aPointingHidType) { return smth put_PointingHidType (aPointingHidType); }
-#define COM_FORWARD_IMachine_SETTER_PointingHidType_TO_OBJ(obj) COM_FORWARD_IMachine_SETTER_PointingHidType_TO ((obj)->)
-#define COM_FORWARD_IMachine_SETTER_PointingHidType_TO_BASE(base) COM_FORWARD_IMachine_SETTER_PointingHidType_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_KeyboardHidType_TO(smth) HRESULT STDMETHODCALLTYPE get_KeyboardHidType (KeyboardHidType * aKeyboardHidType) { return smth get_KeyboardHidType (aKeyboardHidType); }
-#define COM_FORWARD_IMachine_GETTER_KeyboardHidType_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_KeyboardHidType_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_KeyboardHidType_TO_BASE(base) COM_FORWARD_IMachine_GETTER_KeyboardHidType_TO (base::)
-#define COM_FORWARD_IMachine_SETTER_KeyboardHidType_TO(smth) HRESULT STDMETHODCALLTYPE put_KeyboardHidType (KeyboardHidType aKeyboardHidType) { return smth put_KeyboardHidType (aKeyboardHidType); }
-#define COM_FORWARD_IMachine_SETTER_KeyboardHidType_TO_OBJ(obj) COM_FORWARD_IMachine_SETTER_KeyboardHidType_TO ((obj)->)
-#define COM_FORWARD_IMachine_SETTER_KeyboardHidType_TO_BASE(base) COM_FORWARD_IMachine_SETTER_KeyboardHidType_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_HpetEnabled_TO(smth) HRESULT STDMETHODCALLTYPE get_HpetEnabled (BOOL * aHpetEnabled) { return smth get_HpetEnabled (aHpetEnabled); }
-#define COM_FORWARD_IMachine_GETTER_HpetEnabled_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_HpetEnabled_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_HpetEnabled_TO_BASE(base) COM_FORWARD_IMachine_GETTER_HpetEnabled_TO (base::)
-#define COM_FORWARD_IMachine_SETTER_HpetEnabled_TO(smth) HRESULT STDMETHODCALLTYPE put_HpetEnabled (BOOL aHpetEnabled) { return smth put_HpetEnabled (aHpetEnabled); }
-#define COM_FORWARD_IMachine_SETTER_HpetEnabled_TO_OBJ(obj) COM_FORWARD_IMachine_SETTER_HpetEnabled_TO ((obj)->)
-#define COM_FORWARD_IMachine_SETTER_HpetEnabled_TO_BASE(base) COM_FORWARD_IMachine_SETTER_HpetEnabled_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_SnapshotFolder_TO(smth) HRESULT STDMETHODCALLTYPE get_SnapshotFolder (BSTR * aSnapshotFolder) { return smth get_SnapshotFolder (aSnapshotFolder); }
-#define COM_FORWARD_IMachine_GETTER_SnapshotFolder_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_SnapshotFolder_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_SnapshotFolder_TO_BASE(base) COM_FORWARD_IMachine_GETTER_SnapshotFolder_TO (base::)
-#define COM_FORWARD_IMachine_SETTER_SnapshotFolder_TO(smth) HRESULT STDMETHODCALLTYPE put_SnapshotFolder (BSTR aSnapshotFolder) { return smth put_SnapshotFolder (aSnapshotFolder); }
-#define COM_FORWARD_IMachine_SETTER_SnapshotFolder_TO_OBJ(obj) COM_FORWARD_IMachine_SETTER_SnapshotFolder_TO ((obj)->)
-#define COM_FORWARD_IMachine_SETTER_SnapshotFolder_TO_BASE(base) COM_FORWARD_IMachine_SETTER_SnapshotFolder_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_VRDPServer_TO(smth) HRESULT STDMETHODCALLTYPE get_VRDPServer (IVRDPServer * * aVRDPServer) { return smth get_VRDPServer (aVRDPServer); }
-#define COM_FORWARD_IMachine_GETTER_VRDPServer_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_VRDPServer_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_VRDPServer_TO_BASE(base) COM_FORWARD_IMachine_GETTER_VRDPServer_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_MediumAttachments_TO(smth) HRESULT STDMETHODCALLTYPE get_MediumAttachments (SAFEARRAY * * aMediumAttachments) { return smth get_MediumAttachments (aMediumAttachments); }
-#define COM_FORWARD_IMachine_GETTER_MediumAttachments_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_MediumAttachments_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_MediumAttachments_TO_BASE(base) COM_FORWARD_IMachine_GETTER_MediumAttachments_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_USBController_TO(smth) HRESULT STDMETHODCALLTYPE get_USBController (IUSBController * * aUSBController) { return smth get_USBController (aUSBController); }
-#define COM_FORWARD_IMachine_GETTER_USBController_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_USBController_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_USBController_TO_BASE(base) COM_FORWARD_IMachine_GETTER_USBController_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_AudioAdapter_TO(smth) HRESULT STDMETHODCALLTYPE get_AudioAdapter (IAudioAdapter * * aAudioAdapter) { return smth get_AudioAdapter (aAudioAdapter); }
-#define COM_FORWARD_IMachine_GETTER_AudioAdapter_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_AudioAdapter_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_AudioAdapter_TO_BASE(base) COM_FORWARD_IMachine_GETTER_AudioAdapter_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_StorageControllers_TO(smth) HRESULT STDMETHODCALLTYPE get_StorageControllers (SAFEARRAY * * aStorageControllers) { return smth get_StorageControllers (aStorageControllers); }
-#define COM_FORWARD_IMachine_GETTER_StorageControllers_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_StorageControllers_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_StorageControllers_TO_BASE(base) COM_FORWARD_IMachine_GETTER_StorageControllers_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_SettingsFilePath_TO(smth) HRESULT STDMETHODCALLTYPE get_SettingsFilePath (BSTR * aSettingsFilePath) { return smth get_SettingsFilePath (aSettingsFilePath); }
-#define COM_FORWARD_IMachine_GETTER_SettingsFilePath_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_SettingsFilePath_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_SettingsFilePath_TO_BASE(base) COM_FORWARD_IMachine_GETTER_SettingsFilePath_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_SettingsModified_TO(smth) HRESULT STDMETHODCALLTYPE get_SettingsModified (BOOL * aSettingsModified) { return smth get_SettingsModified (aSettingsModified); }
-#define COM_FORWARD_IMachine_GETTER_SettingsModified_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_SettingsModified_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_SettingsModified_TO_BASE(base) COM_FORWARD_IMachine_GETTER_SettingsModified_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_SessionState_TO(smth) HRESULT STDMETHODCALLTYPE get_SessionState (SessionState * aSessionState) { return smth get_SessionState (aSessionState); }
-#define COM_FORWARD_IMachine_GETTER_SessionState_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_SessionState_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_SessionState_TO_BASE(base) COM_FORWARD_IMachine_GETTER_SessionState_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_SessionType_TO(smth) HRESULT STDMETHODCALLTYPE get_SessionType (BSTR * aSessionType) { return smth get_SessionType (aSessionType); }
-#define COM_FORWARD_IMachine_GETTER_SessionType_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_SessionType_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_SessionType_TO_BASE(base) COM_FORWARD_IMachine_GETTER_SessionType_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_SessionPid_TO(smth) HRESULT STDMETHODCALLTYPE get_SessionPid (ULONG * aSessionPid) { return smth get_SessionPid (aSessionPid); }
-#define COM_FORWARD_IMachine_GETTER_SessionPid_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_SessionPid_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_SessionPid_TO_BASE(base) COM_FORWARD_IMachine_GETTER_SessionPid_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_State_TO(smth) HRESULT STDMETHODCALLTYPE get_State (MachineState * aState) { return smth get_State (aState); }
-#define COM_FORWARD_IMachine_GETTER_State_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_State_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_State_TO_BASE(base) COM_FORWARD_IMachine_GETTER_State_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_LastStateChange_TO(smth) HRESULT STDMETHODCALLTYPE get_LastStateChange (LONG64 * aLastStateChange) { return smth get_LastStateChange (aLastStateChange); }
-#define COM_FORWARD_IMachine_GETTER_LastStateChange_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_LastStateChange_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_LastStateChange_TO_BASE(base) COM_FORWARD_IMachine_GETTER_LastStateChange_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_StateFilePath_TO(smth) HRESULT STDMETHODCALLTYPE get_StateFilePath (BSTR * aStateFilePath) { return smth get_StateFilePath (aStateFilePath); }
-#define COM_FORWARD_IMachine_GETTER_StateFilePath_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_StateFilePath_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_StateFilePath_TO_BASE(base) COM_FORWARD_IMachine_GETTER_StateFilePath_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_LogFolder_TO(smth) HRESULT STDMETHODCALLTYPE get_LogFolder (BSTR * aLogFolder) { return smth get_LogFolder (aLogFolder); }
-#define COM_FORWARD_IMachine_GETTER_LogFolder_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_LogFolder_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_LogFolder_TO_BASE(base) COM_FORWARD_IMachine_GETTER_LogFolder_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_CurrentSnapshot_TO(smth) HRESULT STDMETHODCALLTYPE get_CurrentSnapshot (ISnapshot * * aCurrentSnapshot) { return smth get_CurrentSnapshot (aCurrentSnapshot); }
-#define COM_FORWARD_IMachine_GETTER_CurrentSnapshot_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_CurrentSnapshot_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_CurrentSnapshot_TO_BASE(base) COM_FORWARD_IMachine_GETTER_CurrentSnapshot_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_SnapshotCount_TO(smth) HRESULT STDMETHODCALLTYPE get_SnapshotCount (ULONG * aSnapshotCount) { return smth get_SnapshotCount (aSnapshotCount); }
-#define COM_FORWARD_IMachine_GETTER_SnapshotCount_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_SnapshotCount_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_SnapshotCount_TO_BASE(base) COM_FORWARD_IMachine_GETTER_SnapshotCount_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_CurrentStateModified_TO(smth) HRESULT STDMETHODCALLTYPE get_CurrentStateModified (BOOL * aCurrentStateModified) { return smth get_CurrentStateModified (aCurrentStateModified); }
-#define COM_FORWARD_IMachine_GETTER_CurrentStateModified_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_CurrentStateModified_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_CurrentStateModified_TO_BASE(base) COM_FORWARD_IMachine_GETTER_CurrentStateModified_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_SharedFolders_TO(smth) HRESULT STDMETHODCALLTYPE get_SharedFolders (SAFEARRAY * * aSharedFolders) { return smth get_SharedFolders (aSharedFolders); }
-#define COM_FORWARD_IMachine_GETTER_SharedFolders_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_SharedFolders_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_SharedFolders_TO_BASE(base) COM_FORWARD_IMachine_GETTER_SharedFolders_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_ClipboardMode_TO(smth) HRESULT STDMETHODCALLTYPE get_ClipboardMode (ClipboardMode * aClipboardMode) { return smth get_ClipboardMode (aClipboardMode); }
-#define COM_FORWARD_IMachine_GETTER_ClipboardMode_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_ClipboardMode_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_ClipboardMode_TO_BASE(base) COM_FORWARD_IMachine_GETTER_ClipboardMode_TO (base::)
-#define COM_FORWARD_IMachine_SETTER_ClipboardMode_TO(smth) HRESULT STDMETHODCALLTYPE put_ClipboardMode (ClipboardMode aClipboardMode) { return smth put_ClipboardMode (aClipboardMode); }
-#define COM_FORWARD_IMachine_SETTER_ClipboardMode_TO_OBJ(obj) COM_FORWARD_IMachine_SETTER_ClipboardMode_TO ((obj)->)
-#define COM_FORWARD_IMachine_SETTER_ClipboardMode_TO_BASE(base) COM_FORWARD_IMachine_SETTER_ClipboardMode_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_GuestPropertyNotificationPatterns_TO(smth) HRESULT STDMETHODCALLTYPE get_GuestPropertyNotificationPatterns (BSTR * aGuestPropertyNotificationPatterns) { return smth get_GuestPropertyNotificationPatterns (aGuestPropertyNotificationPatterns); }
-#define COM_FORWARD_IMachine_GETTER_GuestPropertyNotificationPatterns_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_GuestPropertyNotificationPatterns_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_GuestPropertyNotificationPatterns_TO_BASE(base) COM_FORWARD_IMachine_GETTER_GuestPropertyNotificationPatterns_TO (base::)
-#define COM_FORWARD_IMachine_SETTER_GuestPropertyNotificationPatterns_TO(smth) HRESULT STDMETHODCALLTYPE put_GuestPropertyNotificationPatterns (BSTR aGuestPropertyNotificationPatterns) { return smth put_GuestPropertyNotificationPatterns (aGuestPropertyNotificationPatterns); }
-#define COM_FORWARD_IMachine_SETTER_GuestPropertyNotificationPatterns_TO_OBJ(obj) COM_FORWARD_IMachine_SETTER_GuestPropertyNotificationPatterns_TO ((obj)->)
-#define COM_FORWARD_IMachine_SETTER_GuestPropertyNotificationPatterns_TO_BASE(base) COM_FORWARD_IMachine_SETTER_GuestPropertyNotificationPatterns_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_TeleporterEnabled_TO(smth) HRESULT STDMETHODCALLTYPE get_TeleporterEnabled (BOOL * aTeleporterEnabled) { return smth get_TeleporterEnabled (aTeleporterEnabled); }
-#define COM_FORWARD_IMachine_GETTER_TeleporterEnabled_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_TeleporterEnabled_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_TeleporterEnabled_TO_BASE(base) COM_FORWARD_IMachine_GETTER_TeleporterEnabled_TO (base::)
-#define COM_FORWARD_IMachine_SETTER_TeleporterEnabled_TO(smth) HRESULT STDMETHODCALLTYPE put_TeleporterEnabled (BOOL aTeleporterEnabled) { return smth put_TeleporterEnabled (aTeleporterEnabled); }
-#define COM_FORWARD_IMachine_SETTER_TeleporterEnabled_TO_OBJ(obj) COM_FORWARD_IMachine_SETTER_TeleporterEnabled_TO ((obj)->)
-#define COM_FORWARD_IMachine_SETTER_TeleporterEnabled_TO_BASE(base) COM_FORWARD_IMachine_SETTER_TeleporterEnabled_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_TeleporterPort_TO(smth) HRESULT STDMETHODCALLTYPE get_TeleporterPort (ULONG * aTeleporterPort) { return smth get_TeleporterPort (aTeleporterPort); }
-#define COM_FORWARD_IMachine_GETTER_TeleporterPort_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_TeleporterPort_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_TeleporterPort_TO_BASE(base) COM_FORWARD_IMachine_GETTER_TeleporterPort_TO (base::)
-#define COM_FORWARD_IMachine_SETTER_TeleporterPort_TO(smth) HRESULT STDMETHODCALLTYPE put_TeleporterPort (ULONG aTeleporterPort) { return smth put_TeleporterPort (aTeleporterPort); }
-#define COM_FORWARD_IMachine_SETTER_TeleporterPort_TO_OBJ(obj) COM_FORWARD_IMachine_SETTER_TeleporterPort_TO ((obj)->)
-#define COM_FORWARD_IMachine_SETTER_TeleporterPort_TO_BASE(base) COM_FORWARD_IMachine_SETTER_TeleporterPort_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_TeleporterAddress_TO(smth) HRESULT STDMETHODCALLTYPE get_TeleporterAddress (BSTR * aTeleporterAddress) { return smth get_TeleporterAddress (aTeleporterAddress); }
-#define COM_FORWARD_IMachine_GETTER_TeleporterAddress_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_TeleporterAddress_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_TeleporterAddress_TO_BASE(base) COM_FORWARD_IMachine_GETTER_TeleporterAddress_TO (base::)
-#define COM_FORWARD_IMachine_SETTER_TeleporterAddress_TO(smth) HRESULT STDMETHODCALLTYPE put_TeleporterAddress (BSTR aTeleporterAddress) { return smth put_TeleporterAddress (aTeleporterAddress); }
-#define COM_FORWARD_IMachine_SETTER_TeleporterAddress_TO_OBJ(obj) COM_FORWARD_IMachine_SETTER_TeleporterAddress_TO ((obj)->)
-#define COM_FORWARD_IMachine_SETTER_TeleporterAddress_TO_BASE(base) COM_FORWARD_IMachine_SETTER_TeleporterAddress_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_TeleporterPassword_TO(smth) HRESULT STDMETHODCALLTYPE get_TeleporterPassword (BSTR * aTeleporterPassword) { return smth get_TeleporterPassword (aTeleporterPassword); }
-#define COM_FORWARD_IMachine_GETTER_TeleporterPassword_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_TeleporterPassword_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_TeleporterPassword_TO_BASE(base) COM_FORWARD_IMachine_GETTER_TeleporterPassword_TO (base::)
-#define COM_FORWARD_IMachine_SETTER_TeleporterPassword_TO(smth) HRESULT STDMETHODCALLTYPE put_TeleporterPassword (BSTR aTeleporterPassword) { return smth put_TeleporterPassword (aTeleporterPassword); }
-#define COM_FORWARD_IMachine_SETTER_TeleporterPassword_TO_OBJ(obj) COM_FORWARD_IMachine_SETTER_TeleporterPassword_TO ((obj)->)
-#define COM_FORWARD_IMachine_SETTER_TeleporterPassword_TO_BASE(base) COM_FORWARD_IMachine_SETTER_TeleporterPassword_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_RTCUseUTC_TO(smth) HRESULT STDMETHODCALLTYPE get_RTCUseUTC (BOOL * aRTCUseUTC) { return smth get_RTCUseUTC (aRTCUseUTC); }
-#define COM_FORWARD_IMachine_GETTER_RTCUseUTC_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_RTCUseUTC_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_RTCUseUTC_TO_BASE(base) COM_FORWARD_IMachine_GETTER_RTCUseUTC_TO (base::)
-#define COM_FORWARD_IMachine_SETTER_RTCUseUTC_TO(smth) HRESULT STDMETHODCALLTYPE put_RTCUseUTC (BOOL aRTCUseUTC) { return smth put_RTCUseUTC (aRTCUseUTC); }
-#define COM_FORWARD_IMachine_SETTER_RTCUseUTC_TO_OBJ(obj) COM_FORWARD_IMachine_SETTER_RTCUseUTC_TO ((obj)->)
-#define COM_FORWARD_IMachine_SETTER_RTCUseUTC_TO_BASE(base) COM_FORWARD_IMachine_SETTER_RTCUseUTC_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_IoCacheEnabled_TO(smth) HRESULT STDMETHODCALLTYPE get_IoCacheEnabled (BOOL * aIoCacheEnabled) { return smth get_IoCacheEnabled (aIoCacheEnabled); }
-#define COM_FORWARD_IMachine_GETTER_IoCacheEnabled_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_IoCacheEnabled_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_IoCacheEnabled_TO_BASE(base) COM_FORWARD_IMachine_GETTER_IoCacheEnabled_TO (base::)
-#define COM_FORWARD_IMachine_SETTER_IoCacheEnabled_TO(smth) HRESULT STDMETHODCALLTYPE put_IoCacheEnabled (BOOL aIoCacheEnabled) { return smth put_IoCacheEnabled (aIoCacheEnabled); }
-#define COM_FORWARD_IMachine_SETTER_IoCacheEnabled_TO_OBJ(obj) COM_FORWARD_IMachine_SETTER_IoCacheEnabled_TO ((obj)->)
-#define COM_FORWARD_IMachine_SETTER_IoCacheEnabled_TO_BASE(base) COM_FORWARD_IMachine_SETTER_IoCacheEnabled_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_IoCacheSize_TO(smth) HRESULT STDMETHODCALLTYPE get_IoCacheSize (ULONG * aIoCacheSize) { return smth get_IoCacheSize (aIoCacheSize); }
-#define COM_FORWARD_IMachine_GETTER_IoCacheSize_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_IoCacheSize_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_IoCacheSize_TO_BASE(base) COM_FORWARD_IMachine_GETTER_IoCacheSize_TO (base::)
-#define COM_FORWARD_IMachine_SETTER_IoCacheSize_TO(smth) HRESULT STDMETHODCALLTYPE put_IoCacheSize (ULONG aIoCacheSize) { return smth put_IoCacheSize (aIoCacheSize); }
-#define COM_FORWARD_IMachine_SETTER_IoCacheSize_TO_OBJ(obj) COM_FORWARD_IMachine_SETTER_IoCacheSize_TO ((obj)->)
-#define COM_FORWARD_IMachine_SETTER_IoCacheSize_TO_BASE(base) COM_FORWARD_IMachine_SETTER_IoCacheSize_TO (base::)
-#define COM_FORWARD_IMachine_GETTER_IoBandwidthMax_TO(smth) HRESULT STDMETHODCALLTYPE get_IoBandwidthMax (ULONG * aIoBandwidthMax) { return smth get_IoBandwidthMax (aIoBandwidthMax); }
-#define COM_FORWARD_IMachine_GETTER_IoBandwidthMax_TO_OBJ(obj) COM_FORWARD_IMachine_GETTER_IoBandwidthMax_TO ((obj)->)
-#define COM_FORWARD_IMachine_GETTER_IoBandwidthMax_TO_BASE(base) COM_FORWARD_IMachine_GETTER_IoBandwidthMax_TO (base::)
-#define COM_FORWARD_IMachine_SETTER_IoBandwidthMax_TO(smth) HRESULT STDMETHODCALLTYPE put_IoBandwidthMax (ULONG aIoBandwidthMax) { return smth put_IoBandwidthMax (aIoBandwidthMax); }
-#define COM_FORWARD_IMachine_SETTER_IoBandwidthMax_TO_OBJ(obj) COM_FORWARD_IMachine_SETTER_IoBandwidthMax_TO ((obj)->)
-#define COM_FORWARD_IMachine_SETTER_IoBandwidthMax_TO_BASE(base) COM_FORWARD_IMachine_SETTER_IoBandwidthMax_TO (base::)
-#define COM_FORWARD_IMachine_SetBootOrder_TO(smth) HRESULT STDMETHODCALLTYPE SetBootOrder (ULONG aPosition, DeviceType aDevice) { return smth SetBootOrder (aPosition, aDevice); }
-#define COM_FORWARD_IMachine_SetBootOrder_TO_OBJ(obj) COM_FORWARD_IMachine_SetBootOrder_TO ((obj)->)
-#define COM_FORWARD_IMachine_SetBootOrder_TO_BASE(base) COM_FORWARD_IMachine_SetBootOrder_TO (base::)
-#define COM_FORWARD_IMachine_GetBootOrder_TO(smth) HRESULT STDMETHODCALLTYPE GetBootOrder (ULONG aPosition, DeviceType * aDevice) { return smth GetBootOrder (aPosition, aDevice); }
-#define COM_FORWARD_IMachine_GetBootOrder_TO_OBJ(obj) COM_FORWARD_IMachine_GetBootOrder_TO ((obj)->)
-#define COM_FORWARD_IMachine_GetBootOrder_TO_BASE(base) COM_FORWARD_IMachine_GetBootOrder_TO (base::)
-#define COM_FORWARD_IMachine_AttachDevice_TO(smth) HRESULT STDMETHODCALLTYPE AttachDevice (BSTR aName, LONG aControllerPort, LONG aDevice, DeviceType aType, BSTR aId) { return smth AttachDevice (aName, aControllerPort, aDevice, aType, aId); }
-#define COM_FORWARD_IMachine_AttachDevice_TO_OBJ(obj) COM_FORWARD_IMachine_AttachDevice_TO ((obj)->)
-#define COM_FORWARD_IMachine_AttachDevice_TO_BASE(base) COM_FORWARD_IMachine_AttachDevice_TO (base::)
-#define COM_FORWARD_IMachine_DetachDevice_TO(smth) HRESULT STDMETHODCALLTYPE DetachDevice (BSTR aName, LONG aControllerPort, LONG aDevice) { return smth DetachDevice (aName, aControllerPort, aDevice); }
-#define COM_FORWARD_IMachine_DetachDevice_TO_OBJ(obj) COM_FORWARD_IMachine_DetachDevice_TO ((obj)->)
-#define COM_FORWARD_IMachine_DetachDevice_TO_BASE(base) COM_FORWARD_IMachine_DetachDevice_TO (base::)
-#define COM_FORWARD_IMachine_PassthroughDevice_TO(smth) HRESULT STDMETHODCALLTYPE PassthroughDevice (BSTR aName, LONG aControllerPort, LONG aDevice, BOOL aPassthrough) { return smth PassthroughDevice (aName, aControllerPort, aDevice, aPassthrough); }
-#define COM_FORWARD_IMachine_PassthroughDevice_TO_OBJ(obj) COM_FORWARD_IMachine_PassthroughDevice_TO ((obj)->)
-#define COM_FORWARD_IMachine_PassthroughDevice_TO_BASE(base) COM_FORWARD_IMachine_PassthroughDevice_TO (base::)
-#define COM_FORWARD_IMachine_MountMedium_TO(smth) HRESULT STDMETHODCALLTYPE MountMedium (BSTR aName, LONG aControllerPort, LONG aDevice, BSTR aMedium, BOOL aForce) { return smth MountMedium (aName, aControllerPort, aDevice, aMedium, aForce); }
-#define COM_FORWARD_IMachine_MountMedium_TO_OBJ(obj) COM_FORWARD_IMachine_MountMedium_TO ((obj)->)
-#define COM_FORWARD_IMachine_MountMedium_TO_BASE(base) COM_FORWARD_IMachine_MountMedium_TO (base::)
-#define COM_FORWARD_IMachine_GetMedium_TO(smth) HRESULT STDMETHODCALLTYPE GetMedium (BSTR aName, LONG aControllerPort, LONG aDevice, IMedium * * aMedium) { return smth GetMedium (aName, aControllerPort, aDevice, aMedium); }
-#define COM_FORWARD_IMachine_GetMedium_TO_OBJ(obj) COM_FORWARD_IMachine_GetMedium_TO ((obj)->)
-#define COM_FORWARD_IMachine_GetMedium_TO_BASE(base) COM_FORWARD_IMachine_GetMedium_TO (base::)
-#define COM_FORWARD_IMachine_GetMediumAttachmentsOfController_TO(smth) HRESULT STDMETHODCALLTYPE GetMediumAttachmentsOfController (BSTR aName, SAFEARRAY * * aMediumAttachments) { return smth GetMediumAttachmentsOfController (aName, aMediumAttachments); }
-#define COM_FORWARD_IMachine_GetMediumAttachmentsOfController_TO_OBJ(obj) COM_FORWARD_IMachine_GetMediumAttachmentsOfController_TO ((obj)->)
-#define COM_FORWARD_IMachine_GetMediumAttachmentsOfController_TO_BASE(base) COM_FORWARD_IMachine_GetMediumAttachmentsOfController_TO (base::)
-#define COM_FORWARD_IMachine_GetMediumAttachment_TO(smth) HRESULT STDMETHODCALLTYPE GetMediumAttachment (BSTR aName, LONG aControllerPort, LONG aDevice, IMediumAttachment * * aAttachment) { return smth GetMediumAttachment (aName, aControllerPort, aDevice, aAttachment); }
-#define COM_FORWARD_IMachine_GetMediumAttachment_TO_OBJ(obj) COM_FORWARD_IMachine_GetMediumAttachment_TO ((obj)->)
-#define COM_FORWARD_IMachine_GetMediumAttachment_TO_BASE(base) COM_FORWARD_IMachine_GetMediumAttachment_TO (base::)
-#define COM_FORWARD_IMachine_GetNetworkAdapter_TO(smth) HRESULT STDMETHODCALLTYPE GetNetworkAdapter (ULONG aSlot, INetworkAdapter * * aAdapter) { return smth GetNetworkAdapter (aSlot, aAdapter); }
-#define COM_FORWARD_IMachine_GetNetworkAdapter_TO_OBJ(obj) COM_FORWARD_IMachine_GetNetworkAdapter_TO ((obj)->)
-#define COM_FORWARD_IMachine_GetNetworkAdapter_TO_BASE(base) COM_FORWARD_IMachine_GetNetworkAdapter_TO (base::)
-#define COM_FORWARD_IMachine_AddStorageController_TO(smth) HRESULT STDMETHODCALLTYPE AddStorageController (BSTR aName, StorageBus aConnectionType, IStorageController * * aController) { return smth AddStorageController (aName, aConnectionType, aController); }
-#define COM_FORWARD_IMachine_AddStorageController_TO_OBJ(obj) COM_FORWARD_IMachine_AddStorageController_TO ((obj)->)
-#define COM_FORWARD_IMachine_AddStorageController_TO_BASE(base) COM_FORWARD_IMachine_AddStorageController_TO (base::)
-#define COM_FORWARD_IMachine_GetStorageControllerByName_TO(smth) HRESULT STDMETHODCALLTYPE GetStorageControllerByName (BSTR aName, IStorageController * * aStorageController) { return smth GetStorageControllerByName (aName, aStorageController); }
-#define COM_FORWARD_IMachine_GetStorageControllerByName_TO_OBJ(obj) COM_FORWARD_IMachine_GetStorageControllerByName_TO ((obj)->)
-#define COM_FORWARD_IMachine_GetStorageControllerByName_TO_BASE(base) COM_FORWARD_IMachine_GetStorageControllerByName_TO (base::)
-#define COM_FORWARD_IMachine_GetStorageControllerByInstance_TO(smth) HRESULT STDMETHODCALLTYPE GetStorageControllerByInstance (ULONG aInstance, IStorageController * * aStorageController) { return smth GetStorageControllerByInstance (aInstance, aStorageController); }
-#define COM_FORWARD_IMachine_GetStorageControllerByInstance_TO_OBJ(obj) COM_FORWARD_IMachine_GetStorageControllerByInstance_TO ((obj)->)
-#define COM_FORWARD_IMachine_GetStorageControllerByInstance_TO_BASE(base) COM_FORWARD_IMachine_GetStorageControllerByInstance_TO (base::)
-#define COM_FORWARD_IMachine_RemoveStorageController_TO(smth) HRESULT STDMETHODCALLTYPE RemoveStorageController (BSTR aName) { return smth RemoveStorageController (aName); }
-#define COM_FORWARD_IMachine_RemoveStorageController_TO_OBJ(obj) COM_FORWARD_IMachine_RemoveStorageController_TO ((obj)->)
-#define COM_FORWARD_IMachine_RemoveStorageController_TO_BASE(base) COM_FORWARD_IMachine_RemoveStorageController_TO (base::)
-#define COM_FORWARD_IMachine_GetSerialPort_TO(smth) HRESULT STDMETHODCALLTYPE GetSerialPort (ULONG aSlot, ISerialPort * * aPort) { return smth GetSerialPort (aSlot, aPort); }
-#define COM_FORWARD_IMachine_GetSerialPort_TO_OBJ(obj) COM_FORWARD_IMachine_GetSerialPort_TO ((obj)->)
-#define COM_FORWARD_IMachine_GetSerialPort_TO_BASE(base) COM_FORWARD_IMachine_GetSerialPort_TO (base::)
-#define COM_FORWARD_IMachine_GetParallelPort_TO(smth) HRESULT STDMETHODCALLTYPE GetParallelPort (ULONG aSlot, IParallelPort * * aPort) { return smth GetParallelPort (aSlot, aPort); }
-#define COM_FORWARD_IMachine_GetParallelPort_TO_OBJ(obj) COM_FORWARD_IMachine_GetParallelPort_TO ((obj)->)
-#define COM_FORWARD_IMachine_GetParallelPort_TO_BASE(base) COM_FORWARD_IMachine_GetParallelPort_TO (base::)
-#define COM_FORWARD_IMachine_GetExtraDataKeys_TO(smth) HRESULT STDMETHODCALLTYPE GetExtraDataKeys (SAFEARRAY * * aValue) { return smth GetExtraDataKeys (aValue); }
-#define COM_FORWARD_IMachine_GetExtraDataKeys_TO_OBJ(obj) COM_FORWARD_IMachine_GetExtraDataKeys_TO ((obj)->)
-#define COM_FORWARD_IMachine_GetExtraDataKeys_TO_BASE(base) COM_FORWARD_IMachine_GetExtraDataKeys_TO (base::)
-#define COM_FORWARD_IMachine_GetExtraData_TO(smth) HRESULT STDMETHODCALLTYPE GetExtraData (BSTR aKey, BSTR * aValue) { return smth GetExtraData (aKey, aValue); }
-#define COM_FORWARD_IMachine_GetExtraData_TO_OBJ(obj) COM_FORWARD_IMachine_GetExtraData_TO ((obj)->)
-#define COM_FORWARD_IMachine_GetExtraData_TO_BASE(base) COM_FORWARD_IMachine_GetExtraData_TO (base::)
-#define COM_FORWARD_IMachine_SetExtraData_TO(smth) HRESULT STDMETHODCALLTYPE SetExtraData (BSTR aKey, BSTR aValue) { return smth SetExtraData (aKey, aValue); }
-#define COM_FORWARD_IMachine_SetExtraData_TO_OBJ(obj) COM_FORWARD_IMachine_SetExtraData_TO ((obj)->)
-#define COM_FORWARD_IMachine_SetExtraData_TO_BASE(base) COM_FORWARD_IMachine_SetExtraData_TO (base::)
-#define COM_FORWARD_IMachine_GetCPUProperty_TO(smth) HRESULT STDMETHODCALLTYPE GetCPUProperty (CPUPropertyType aProperty, BOOL * aValue) { return smth GetCPUProperty (aProperty, aValue); }
-#define COM_FORWARD_IMachine_GetCPUProperty_TO_OBJ(obj) COM_FORWARD_IMachine_GetCPUProperty_TO ((obj)->)
-#define COM_FORWARD_IMachine_GetCPUProperty_TO_BASE(base) COM_FORWARD_IMachine_GetCPUProperty_TO (base::)
-#define COM_FORWARD_IMachine_SetCPUProperty_TO(smth) HRESULT STDMETHODCALLTYPE SetCPUProperty (CPUPropertyType aProperty, BOOL aValue) { return smth SetCPUProperty (aProperty, aValue); }
-#define COM_FORWARD_IMachine_SetCPUProperty_TO_OBJ(obj) COM_FORWARD_IMachine_SetCPUProperty_TO ((obj)->)
-#define COM_FORWARD_IMachine_SetCPUProperty_TO_BASE(base) COM_FORWARD_IMachine_SetCPUProperty_TO (base::)
-#define COM_FORWARD_IMachine_GetCPUIDLeaf_TO(smth) HRESULT STDMETHODCALLTYPE GetCPUIDLeaf (ULONG aId, ULONG * aValEax, ULONG * aValEbx, ULONG * aValEcx, ULONG * aValEdx) { return smth GetCPUIDLeaf (aId, aValEax, aValEbx, aValEcx, aValEdx); }
-#define COM_FORWARD_IMachine_GetCPUIDLeaf_TO_OBJ(obj) COM_FORWARD_IMachine_GetCPUIDLeaf_TO ((obj)->)
-#define COM_FORWARD_IMachine_GetCPUIDLeaf_TO_BASE(base) COM_FORWARD_IMachine_GetCPUIDLeaf_TO (base::)
-#define COM_FORWARD_IMachine_SetCPUIDLeaf_TO(smth) HRESULT STDMETHODCALLTYPE SetCPUIDLeaf (ULONG aId, ULONG aValEax, ULONG aValEbx, ULONG aValEcx, ULONG aValEdx) { return smth SetCPUIDLeaf (aId, aValEax, aValEbx, aValEcx, aValEdx); }
-#define COM_FORWARD_IMachine_SetCPUIDLeaf_TO_OBJ(obj) COM_FORWARD_IMachine_SetCPUIDLeaf_TO ((obj)->)
-#define COM_FORWARD_IMachine_SetCPUIDLeaf_TO_BASE(base) COM_FORWARD_IMachine_SetCPUIDLeaf_TO (base::)
-#define COM_FORWARD_IMachine_RemoveCPUIDLeaf_TO(smth) HRESULT STDMETHODCALLTYPE RemoveCPUIDLeaf (ULONG aId) { return smth RemoveCPUIDLeaf (aId); }
-#define COM_FORWARD_IMachine_RemoveCPUIDLeaf_TO_OBJ(obj) COM_FORWARD_IMachine_RemoveCPUIDLeaf_TO ((obj)->)
-#define COM_FORWARD_IMachine_RemoveCPUIDLeaf_TO_BASE(base) COM_FORWARD_IMachine_RemoveCPUIDLeaf_TO (base::)
-#define COM_FORWARD_IMachine_RemoveAllCPUIDLeaves_TO(smth) HRESULT STDMETHODCALLTYPE RemoveAllCPUIDLeaves() { return smth RemoveAllCPUIDLeaves(); }
-#define COM_FORWARD_IMachine_RemoveAllCPUIDLeaves_TO_OBJ(obj) COM_FORWARD_IMachine_RemoveAllCPUIDLeaves_TO ((obj)->)
-#define COM_FORWARD_IMachine_RemoveAllCPUIDLeaves_TO_BASE(base) COM_FORWARD_IMachine_RemoveAllCPUIDLeaves_TO (base::)
-#define COM_FORWARD_IMachine_GetHWVirtExProperty_TO(smth) HRESULT STDMETHODCALLTYPE GetHWVirtExProperty (HWVirtExPropertyType aProperty, BOOL * aValue) { return smth GetHWVirtExProperty (aProperty, aValue); }
-#define COM_FORWARD_IMachine_GetHWVirtExProperty_TO_OBJ(obj) COM_FORWARD_IMachine_GetHWVirtExProperty_TO ((obj)->)
-#define COM_FORWARD_IMachine_GetHWVirtExProperty_TO_BASE(base) COM_FORWARD_IMachine_GetHWVirtExProperty_TO (base::)
-#define COM_FORWARD_IMachine_SetHWVirtExProperty_TO(smth) HRESULT STDMETHODCALLTYPE SetHWVirtExProperty (HWVirtExPropertyType aProperty, BOOL aValue) { return smth SetHWVirtExProperty (aProperty, aValue); }
-#define COM_FORWARD_IMachine_SetHWVirtExProperty_TO_OBJ(obj) COM_FORWARD_IMachine_SetHWVirtExProperty_TO ((obj)->)
-#define COM_FORWARD_IMachine_SetHWVirtExProperty_TO_BASE(base) COM_FORWARD_IMachine_SetHWVirtExProperty_TO (base::)
-#define COM_FORWARD_IMachine_SaveSettings_TO(smth) HRESULT STDMETHODCALLTYPE SaveSettings() { return smth SaveSettings(); }
-#define COM_FORWARD_IMachine_SaveSettings_TO_OBJ(obj) COM_FORWARD_IMachine_SaveSettings_TO ((obj)->)
-#define COM_FORWARD_IMachine_SaveSettings_TO_BASE(base) COM_FORWARD_IMachine_SaveSettings_TO (base::)
-#define COM_FORWARD_IMachine_DiscardSettings_TO(smth) HRESULT STDMETHODCALLTYPE DiscardSettings() { return smth DiscardSettings(); }
-#define COM_FORWARD_IMachine_DiscardSettings_TO_OBJ(obj) COM_FORWARD_IMachine_DiscardSettings_TO ((obj)->)
-#define COM_FORWARD_IMachine_DiscardSettings_TO_BASE(base) COM_FORWARD_IMachine_DiscardSettings_TO (base::)
-#define COM_FORWARD_IMachine_DeleteSettings_TO(smth) HRESULT STDMETHODCALLTYPE DeleteSettings() { return smth DeleteSettings(); }
-#define COM_FORWARD_IMachine_DeleteSettings_TO_OBJ(obj) COM_FORWARD_IMachine_DeleteSettings_TO ((obj)->)
-#define COM_FORWARD_IMachine_DeleteSettings_TO_BASE(base) COM_FORWARD_IMachine_DeleteSettings_TO (base::)
-#define COM_FORWARD_IMachine_Export_TO(smth) HRESULT STDMETHODCALLTYPE Export (IAppliance * aAAppliance, IVirtualSystemDescription * * aADescription) { return smth Export (aAAppliance, aADescription); }
-#define COM_FORWARD_IMachine_Export_TO_OBJ(obj) COM_FORWARD_IMachine_Export_TO ((obj)->)
-#define COM_FORWARD_IMachine_Export_TO_BASE(base) COM_FORWARD_IMachine_Export_TO (base::)
-#define COM_FORWARD_IMachine_GetSnapshot_TO(smth) HRESULT STDMETHODCALLTYPE GetSnapshot (BSTR aId, ISnapshot * * aSnapshot) { return smth GetSnapshot (aId, aSnapshot); }
-#define COM_FORWARD_IMachine_GetSnapshot_TO_OBJ(obj) COM_FORWARD_IMachine_GetSnapshot_TO ((obj)->)
-#define COM_FORWARD_IMachine_GetSnapshot_TO_BASE(base) COM_FORWARD_IMachine_GetSnapshot_TO (base::)
-#define COM_FORWARD_IMachine_FindSnapshot_TO(smth) HRESULT STDMETHODCALLTYPE FindSnapshot (BSTR aName, ISnapshot * * aSnapshot) { return smth FindSnapshot (aName, aSnapshot); }
-#define COM_FORWARD_IMachine_FindSnapshot_TO_OBJ(obj) COM_FORWARD_IMachine_FindSnapshot_TO ((obj)->)
-#define COM_FORWARD_IMachine_FindSnapshot_TO_BASE(base) COM_FORWARD_IMachine_FindSnapshot_TO (base::)
-#define COM_FORWARD_IMachine_SetCurrentSnapshot_TO(smth) HRESULT STDMETHODCALLTYPE SetCurrentSnapshot (BSTR aId) { return smth SetCurrentSnapshot (aId); }
-#define COM_FORWARD_IMachine_SetCurrentSnapshot_TO_OBJ(obj) COM_FORWARD_IMachine_SetCurrentSnapshot_TO ((obj)->)
-#define COM_FORWARD_IMachine_SetCurrentSnapshot_TO_BASE(base) COM_FORWARD_IMachine_SetCurrentSnapshot_TO (base::)
-#define COM_FORWARD_IMachine_CreateSharedFolder_TO(smth) HRESULT STDMETHODCALLTYPE CreateSharedFolder (BSTR aName, BSTR aHostPath, BOOL aWritable) { return smth CreateSharedFolder (aName, aHostPath, aWritable); }
-#define COM_FORWARD_IMachine_CreateSharedFolder_TO_OBJ(obj) COM_FORWARD_IMachine_CreateSharedFolder_TO ((obj)->)
-#define COM_FORWARD_IMachine_CreateSharedFolder_TO_BASE(base) COM_FORWARD_IMachine_CreateSharedFolder_TO (base::)
-#define COM_FORWARD_IMachine_RemoveSharedFolder_TO(smth) HRESULT STDMETHODCALLTYPE RemoveSharedFolder (BSTR aName) { return smth RemoveSharedFolder (aName); }
-#define COM_FORWARD_IMachine_RemoveSharedFolder_TO_OBJ(obj) COM_FORWARD_IMachine_RemoveSharedFolder_TO ((obj)->)
-#define COM_FORWARD_IMachine_RemoveSharedFolder_TO_BASE(base) COM_FORWARD_IMachine_RemoveSharedFolder_TO (base::)
-#define COM_FORWARD_IMachine_CanShowConsoleWindow_TO(smth) HRESULT STDMETHODCALLTYPE CanShowConsoleWindow (BOOL * aCanShow) { return smth CanShowConsoleWindow (aCanShow); }
-#define COM_FORWARD_IMachine_CanShowConsoleWindow_TO_OBJ(obj) COM_FORWARD_IMachine_CanShowConsoleWindow_TO ((obj)->)
-#define COM_FORWARD_IMachine_CanShowConsoleWindow_TO_BASE(base) COM_FORWARD_IMachine_CanShowConsoleWindow_TO (base::)
-#define COM_FORWARD_IMachine_ShowConsoleWindow_TO(smth) HRESULT STDMETHODCALLTYPE ShowConsoleWindow (ULONG64 * aWinId) { return smth ShowConsoleWindow (aWinId); }
-#define COM_FORWARD_IMachine_ShowConsoleWindow_TO_OBJ(obj) COM_FORWARD_IMachine_ShowConsoleWindow_TO ((obj)->)
-#define COM_FORWARD_IMachine_ShowConsoleWindow_TO_BASE(base) COM_FORWARD_IMachine_ShowConsoleWindow_TO (base::)
-#define COM_FORWARD_IMachine_GetGuestProperty_TO(smth) HRESULT STDMETHODCALLTYPE GetGuestProperty (BSTR aName, BSTR * aValue, ULONG64 * aTimestamp, BSTR * aFlags) { return smth GetGuestProperty (aName, aValue, aTimestamp, aFlags); }
-#define COM_FORWARD_IMachine_GetGuestProperty_TO_OBJ(obj) COM_FORWARD_IMachine_GetGuestProperty_TO ((obj)->)
-#define COM_FORWARD_IMachine_GetGuestProperty_TO_BASE(base) COM_FORWARD_IMachine_GetGuestProperty_TO (base::)
-#define COM_FORWARD_IMachine_GetGuestPropertyValue_TO(smth) HRESULT STDMETHODCALLTYPE GetGuestPropertyValue (BSTR aProperty, BSTR * aValue) { return smth GetGuestPropertyValue (aProperty, aValue); }
-#define COM_FORWARD_IMachine_GetGuestPropertyValue_TO_OBJ(obj) COM_FORWARD_IMachine_GetGuestPropertyValue_TO ((obj)->)
-#define COM_FORWARD_IMachine_GetGuestPropertyValue_TO_BASE(base) COM_FORWARD_IMachine_GetGuestPropertyValue_TO (base::)
-#define COM_FORWARD_IMachine_GetGuestPropertyTimestamp_TO(smth) HRESULT STDMETHODCALLTYPE GetGuestPropertyTimestamp (BSTR aProperty, ULONG64 * aValue) { return smth GetGuestPropertyTimestamp (aProperty, aValue); }
-#define COM_FORWARD_IMachine_GetGuestPropertyTimestamp_TO_OBJ(obj) COM_FORWARD_IMachine_GetGuestPropertyTimestamp_TO ((obj)->)
-#define COM_FORWARD_IMachine_GetGuestPropertyTimestamp_TO_BASE(base) COM_FORWARD_IMachine_GetGuestPropertyTimestamp_TO (base::)
-#define COM_FORWARD_IMachine_SetGuestProperty_TO(smth) HRESULT STDMETHODCALLTYPE SetGuestProperty (BSTR aProperty, BSTR aValue, BSTR aFlags) { return smth SetGuestProperty (aProperty, aValue, aFlags); }
-#define COM_FORWARD_IMachine_SetGuestProperty_TO_OBJ(obj) COM_FORWARD_IMachine_SetGuestProperty_TO ((obj)->)
-#define COM_FORWARD_IMachine_SetGuestProperty_TO_BASE(base) COM_FORWARD_IMachine_SetGuestProperty_TO (base::)
-#define COM_FORWARD_IMachine_SetGuestPropertyValue_TO(smth) HRESULT STDMETHODCALLTYPE SetGuestPropertyValue (BSTR aProperty, BSTR aValue) { return smth SetGuestPropertyValue (aProperty, aValue); }
-#define COM_FORWARD_IMachine_SetGuestPropertyValue_TO_OBJ(obj) COM_FORWARD_IMachine_SetGuestPropertyValue_TO ((obj)->)
-#define COM_FORWARD_IMachine_SetGuestPropertyValue_TO_BASE(base) COM_FORWARD_IMachine_SetGuestPropertyValue_TO (base::)
-#define COM_FORWARD_IMachine_EnumerateGuestProperties_TO(smth) HRESULT STDMETHODCALLTYPE EnumerateGuestProperties (BSTR aPatterns, SAFEARRAY * * aName, SAFEARRAY * * aValue, SAFEARRAY * * aTimestamp, SAFEARRAY * * aFlags) { return smth EnumerateGuestProperties (aPatterns, aName, aValue, aTimestamp, aFlags); }
-#define COM_FORWARD_IMachine_EnumerateGuestProperties_TO_OBJ(obj) COM_FORWARD_IMachine_EnumerateGuestProperties_TO ((obj)->)
-#define COM_FORWARD_IMachine_EnumerateGuestProperties_TO_BASE(base) COM_FORWARD_IMachine_EnumerateGuestProperties_TO (base::)
-#define COM_FORWARD_IMachine_QuerySavedThumbnailSize_TO(smth) HRESULT STDMETHODCALLTYPE QuerySavedThumbnailSize (ULONG aScreenId, ULONG * aSize, ULONG * aWidth, ULONG * aHeight) { return smth QuerySavedThumbnailSize (aScreenId, aSize, aWidth, aHeight); }
-#define COM_FORWARD_IMachine_QuerySavedThumbnailSize_TO_OBJ(obj) COM_FORWARD_IMachine_QuerySavedThumbnailSize_TO ((obj)->)
-#define COM_FORWARD_IMachine_QuerySavedThumbnailSize_TO_BASE(base) COM_FORWARD_IMachine_QuerySavedThumbnailSize_TO (base::)
-#define COM_FORWARD_IMachine_ReadSavedThumbnailToArray_TO(smth) HRESULT STDMETHODCALLTYPE ReadSavedThumbnailToArray (ULONG aScreenId, BOOL aBGR, ULONG * aWidth, ULONG * aHeight, SAFEARRAY * * aData) { return smth ReadSavedThumbnailToArray (aScreenId, aBGR, aWidth, aHeight, aData); }
-#define COM_FORWARD_IMachine_ReadSavedThumbnailToArray_TO_OBJ(obj) COM_FORWARD_IMachine_ReadSavedThumbnailToArray_TO ((obj)->)
-#define COM_FORWARD_IMachine_ReadSavedThumbnailToArray_TO_BASE(base) COM_FORWARD_IMachine_ReadSavedThumbnailToArray_TO (base::)
-#define COM_FORWARD_IMachine_QuerySavedScreenshotPNGSize_TO(smth) HRESULT STDMETHODCALLTYPE QuerySavedScreenshotPNGSize (ULONG aScreenId, ULONG * aSize, ULONG * aWidth, ULONG * aHeight) { return smth QuerySavedScreenshotPNGSize (aScreenId, aSize, aWidth, aHeight); }
-#define COM_FORWARD_IMachine_QuerySavedScreenshotPNGSize_TO_OBJ(obj) COM_FORWARD_IMachine_QuerySavedScreenshotPNGSize_TO ((obj)->)
-#define COM_FORWARD_IMachine_QuerySavedScreenshotPNGSize_TO_BASE(base) COM_FORWARD_IMachine_QuerySavedScreenshotPNGSize_TO (base::)
-#define COM_FORWARD_IMachine_ReadSavedScreenshotPNGToArray_TO(smth) HRESULT STDMETHODCALLTYPE ReadSavedScreenshotPNGToArray (ULONG aScreenId, ULONG * aWidth, ULONG * aHeight, SAFEARRAY * * aData) { return smth ReadSavedScreenshotPNGToArray (aScreenId, aWidth, aHeight, aData); }
-#define COM_FORWARD_IMachine_ReadSavedScreenshotPNGToArray_TO_OBJ(obj) COM_FORWARD_IMachine_ReadSavedScreenshotPNGToArray_TO ((obj)->)
-#define COM_FORWARD_IMachine_ReadSavedScreenshotPNGToArray_TO_BASE(base) COM_FORWARD_IMachine_ReadSavedScreenshotPNGToArray_TO (base::)
-#define COM_FORWARD_IMachine_HotPlugCPU_TO(smth) HRESULT STDMETHODCALLTYPE HotPlugCPU (ULONG aCpu) { return smth HotPlugCPU (aCpu); }
-#define COM_FORWARD_IMachine_HotPlugCPU_TO_OBJ(obj) COM_FORWARD_IMachine_HotPlugCPU_TO ((obj)->)
-#define COM_FORWARD_IMachine_HotPlugCPU_TO_BASE(base) COM_FORWARD_IMachine_HotPlugCPU_TO (base::)
-#define COM_FORWARD_IMachine_HotUnplugCPU_TO(smth) HRESULT STDMETHODCALLTYPE HotUnplugCPU (ULONG aCpu) { return smth HotUnplugCPU (aCpu); }
-#define COM_FORWARD_IMachine_HotUnplugCPU_TO_OBJ(obj) COM_FORWARD_IMachine_HotUnplugCPU_TO ((obj)->)
-#define COM_FORWARD_IMachine_HotUnplugCPU_TO_BASE(base) COM_FORWARD_IMachine_HotUnplugCPU_TO (base::)
-#define COM_FORWARD_IMachine_GetCPUStatus_TO(smth) HRESULT STDMETHODCALLTYPE GetCPUStatus (ULONG aCpu, BOOL * aAttached) { return smth GetCPUStatus (aCpu, aAttached); }
-#define COM_FORWARD_IMachine_GetCPUStatus_TO_OBJ(obj) COM_FORWARD_IMachine_GetCPUStatus_TO ((obj)->)
-#define COM_FORWARD_IMachine_GetCPUStatus_TO_BASE(base) COM_FORWARD_IMachine_GetCPUStatus_TO (base::)
-#define COM_FORWARD_IMachine_QueryLogFilename_TO(smth) HRESULT STDMETHODCALLTYPE QueryLogFilename (ULONG aIdx, BSTR * aFilename) { return smth QueryLogFilename (aIdx, aFilename); }
-#define COM_FORWARD_IMachine_QueryLogFilename_TO_OBJ(obj) COM_FORWARD_IMachine_QueryLogFilename_TO ((obj)->)
-#define COM_FORWARD_IMachine_QueryLogFilename_TO_BASE(base) COM_FORWARD_IMachine_QueryLogFilename_TO (base::)
-#define COM_FORWARD_IMachine_ReadLog_TO(smth) HRESULT STDMETHODCALLTYPE ReadLog (ULONG aIdx, ULONG64 aOffset, ULONG64 aSize, SAFEARRAY * * aData) { return smth ReadLog (aIdx, aOffset, aSize, aData); }
-#define COM_FORWARD_IMachine_ReadLog_TO_OBJ(obj) COM_FORWARD_IMachine_ReadLog_TO ((obj)->)
-#define COM_FORWARD_IMachine_ReadLog_TO_BASE(base) COM_FORWARD_IMachine_ReadLog_TO (base::)
-#define COM_FORWARD_IMachine_TO(smth) COM_FORWARD_IMachine_GETTER_Parent_TO (smth) COM_FORWARD_IMachine_GETTER_Accessible_TO (smth) COM_FORWARD_IMachine_GETTER_AccessError_TO (smth) COM_FORWARD_IMachine_GETTER_Name_TO (smth) COM_FORWARD_IMachine_SETTER_Name_TO (smth) COM_FORWARD_IMachine_GETTER_Description_TO (smth) COM_FORWARD_IMachine_SETTER_Description_TO (smth) COM_FORWARD_IMachine_GETTER_Id_TO (smth) COM_FORWARD_IMachine_GETTER_OSTypeId_TO (smth) COM_FORWARD_IMachine_SETTER_OSTypeId [...]
-#define COM_FORWARD_IMachine_TO_OBJ(obj) COM_FORWARD_IMachine_TO ((obj)->)
-#define COM_FORWARD_IMachine_TO_BASE(base) COM_FORWARD_IMachine_TO (base::)
-#define COM_FORWARD_IConsoleCallback_OnMousePointerShapeChange_TO(smth) HRESULT STDMETHODCALLTYPE OnMousePointerShapeChange (BOOL aVisible, BOOL aAlpha, ULONG aXHot, ULONG aYHot, ULONG aWidth, ULONG aHeight, SAFEARRAY * * aShape) { return smth OnMousePointerShapeChange (aVisible, aAlpha, aXHot, aYHot, aWidth, aHeight, aShape); }
-#define COM_FORWARD_IConsoleCallback_OnMousePointerShapeChange_TO_OBJ(obj) COM_FORWARD_IConsoleCallback_OnMousePointerShapeChange_TO ((obj)->)
-#define COM_FORWARD_IConsoleCallback_OnMousePointerShapeChange_TO_BASE(base) COM_FORWARD_IConsoleCallback_OnMousePointerShapeChange_TO (base::)
-#define COM_FORWARD_IConsoleCallback_OnMouseCapabilityChange_TO(smth) HRESULT STDMETHODCALLTYPE OnMouseCapabilityChange (BOOL aSupportsAbsolute, BOOL aSupportsRelative, BOOL aNeedsHostCursor) { return smth OnMouseCapabilityChange (aSupportsAbsolute, aSupportsRelative, aNeedsHostCursor); }
-#define COM_FORWARD_IConsoleCallback_OnMouseCapabilityChange_TO_OBJ(obj) COM_FORWARD_IConsoleCallback_OnMouseCapabilityChange_TO ((obj)->)
-#define COM_FORWARD_IConsoleCallback_OnMouseCapabilityChange_TO_BASE(base) COM_FORWARD_IConsoleCallback_OnMouseCapabilityChange_TO (base::)
-#define COM_FORWARD_IConsoleCallback_OnKeyboardLedsChange_TO(smth) HRESULT STDMETHODCALLTYPE OnKeyboardLedsChange (BOOL aNumLock, BOOL aCapsLock, BOOL aScrollLock) { return smth OnKeyboardLedsChange (aNumLock, aCapsLock, aScrollLock); }
-#define COM_FORWARD_IConsoleCallback_OnKeyboardLedsChange_TO_OBJ(obj) COM_FORWARD_IConsoleCallback_OnKeyboardLedsChange_TO ((obj)->)
-#define COM_FORWARD_IConsoleCallback_OnKeyboardLedsChange_TO_BASE(base) COM_FORWARD_IConsoleCallback_OnKeyboardLedsChange_TO (base::)
-#define COM_FORWARD_IConsoleCallback_OnStateChange_TO(smth) HRESULT STDMETHODCALLTYPE OnStateChange (MachineState aState) { return smth OnStateChange (aState); }
-#define COM_FORWARD_IConsoleCallback_OnStateChange_TO_OBJ(obj) COM_FORWARD_IConsoleCallback_OnStateChange_TO ((obj)->)
-#define COM_FORWARD_IConsoleCallback_OnStateChange_TO_BASE(base) COM_FORWARD_IConsoleCallback_OnStateChange_TO (base::)
-#define COM_FORWARD_IConsoleCallback_OnAdditionsStateChange_TO(smth) HRESULT STDMETHODCALLTYPE OnAdditionsStateChange() { return smth OnAdditionsStateChange(); }
-#define COM_FORWARD_IConsoleCallback_OnAdditionsStateChange_TO_OBJ(obj) COM_FORWARD_IConsoleCallback_OnAdditionsStateChange_TO ((obj)->)
-#define COM_FORWARD_IConsoleCallback_OnAdditionsStateChange_TO_BASE(base) COM_FORWARD_IConsoleCallback_OnAdditionsStateChange_TO (base::)
-#define COM_FORWARD_IConsoleCallback_OnNetworkAdapterChange_TO(smth) HRESULT STDMETHODCALLTYPE OnNetworkAdapterChange (INetworkAdapter * aNetworkAdapter) { return smth OnNetworkAdapterChange (aNetworkAdapter); }
-#define COM_FORWARD_IConsoleCallback_OnNetworkAdapterChange_TO_OBJ(obj) COM_FORWARD_IConsoleCallback_OnNetworkAdapterChange_TO ((obj)->)
-#define COM_FORWARD_IConsoleCallback_OnNetworkAdapterChange_TO_BASE(base) COM_FORWARD_IConsoleCallback_OnNetworkAdapterChange_TO (base::)
-#define COM_FORWARD_IConsoleCallback_OnSerialPortChange_TO(smth) HRESULT STDMETHODCALLTYPE OnSerialPortChange (ISerialPort * aSerialPort) { return smth OnSerialPortChange (aSerialPort); }
-#define COM_FORWARD_IConsoleCallback_OnSerialPortChange_TO_OBJ(obj) COM_FORWARD_IConsoleCallback_OnSerialPortChange_TO ((obj)->)
-#define COM_FORWARD_IConsoleCallback_OnSerialPortChange_TO_BASE(base) COM_FORWARD_IConsoleCallback_OnSerialPortChange_TO (base::)
-#define COM_FORWARD_IConsoleCallback_OnParallelPortChange_TO(smth) HRESULT STDMETHODCALLTYPE OnParallelPortChange (IParallelPort * aParallelPort) { return smth OnParallelPortChange (aParallelPort); }
-#define COM_FORWARD_IConsoleCallback_OnParallelPortChange_TO_OBJ(obj) COM_FORWARD_IConsoleCallback_OnParallelPortChange_TO ((obj)->)
-#define COM_FORWARD_IConsoleCallback_OnParallelPortChange_TO_BASE(base) COM_FORWARD_IConsoleCallback_OnParallelPortChange_TO (base::)
-#define COM_FORWARD_IConsoleCallback_OnStorageControllerChange_TO(smth) HRESULT STDMETHODCALLTYPE OnStorageControllerChange() { return smth OnStorageControllerChange(); }
-#define COM_FORWARD_IConsoleCallback_OnStorageControllerChange_TO_OBJ(obj) COM_FORWARD_IConsoleCallback_OnStorageControllerChange_TO ((obj)->)
-#define COM_FORWARD_IConsoleCallback_OnStorageControllerChange_TO_BASE(base) COM_FORWARD_IConsoleCallback_OnStorageControllerChange_TO (base::)
-#define COM_FORWARD_IConsoleCallback_OnMediumChange_TO(smth) HRESULT STDMETHODCALLTYPE OnMediumChange (IMediumAttachment * aMediumAttachment) { return smth OnMediumChange (aMediumAttachment); }
-#define COM_FORWARD_IConsoleCallback_OnMediumChange_TO_OBJ(obj) COM_FORWARD_IConsoleCallback_OnMediumChange_TO ((obj)->)
-#define COM_FORWARD_IConsoleCallback_OnMediumChange_TO_BASE(base) COM_FORWARD_IConsoleCallback_OnMediumChange_TO (base::)
-#define COM_FORWARD_IConsoleCallback_OnCPUChange_TO(smth) HRESULT STDMETHODCALLTYPE OnCPUChange (ULONG aCpu, BOOL aAdd) { return smth OnCPUChange (aCpu, aAdd); }
-#define COM_FORWARD_IConsoleCallback_OnCPUChange_TO_OBJ(obj) COM_FORWARD_IConsoleCallback_OnCPUChange_TO ((obj)->)
-#define COM_FORWARD_IConsoleCallback_OnCPUChange_TO_BASE(base) COM_FORWARD_IConsoleCallback_OnCPUChange_TO (base::)
-#define COM_FORWARD_IConsoleCallback_OnVRDPServerChange_TO(smth) HRESULT STDMETHODCALLTYPE OnVRDPServerChange() { return smth OnVRDPServerChange(); }
-#define COM_FORWARD_IConsoleCallback_OnVRDPServerChange_TO_OBJ(obj) COM_FORWARD_IConsoleCallback_OnVRDPServerChange_TO ((obj)->)
-#define COM_FORWARD_IConsoleCallback_OnVRDPServerChange_TO_BASE(base) COM_FORWARD_IConsoleCallback_OnVRDPServerChange_TO (base::)
-#define COM_FORWARD_IConsoleCallback_OnRemoteDisplayInfoChange_TO(smth) HRESULT STDMETHODCALLTYPE OnRemoteDisplayInfoChange() { return smth OnRemoteDisplayInfoChange(); }
-#define COM_FORWARD_IConsoleCallback_OnRemoteDisplayInfoChange_TO_OBJ(obj) COM_FORWARD_IConsoleCallback_OnRemoteDisplayInfoChange_TO ((obj)->)
-#define COM_FORWARD_IConsoleCallback_OnRemoteDisplayInfoChange_TO_BASE(base) COM_FORWARD_IConsoleCallback_OnRemoteDisplayInfoChange_TO (base::)
-#define COM_FORWARD_IConsoleCallback_OnUSBControllerChange_TO(smth) HRESULT STDMETHODCALLTYPE OnUSBControllerChange() { return smth OnUSBControllerChange(); }
-#define COM_FORWARD_IConsoleCallback_OnUSBControllerChange_TO_OBJ(obj) COM_FORWARD_IConsoleCallback_OnUSBControllerChange_TO ((obj)->)
-#define COM_FORWARD_IConsoleCallback_OnUSBControllerChange_TO_BASE(base) COM_FORWARD_IConsoleCallback_OnUSBControllerChange_TO (base::)
-#define COM_FORWARD_IConsoleCallback_OnUSBDeviceStateChange_TO(smth) HRESULT STDMETHODCALLTYPE OnUSBDeviceStateChange (IUSBDevice * aDevice, BOOL aAttached, IVirtualBoxErrorInfo * aError) { return smth OnUSBDeviceStateChange (aDevice, aAttached, aError); }
-#define COM_FORWARD_IConsoleCallback_OnUSBDeviceStateChange_TO_OBJ(obj) COM_FORWARD_IConsoleCallback_OnUSBDeviceStateChange_TO ((obj)->)
-#define COM_FORWARD_IConsoleCallback_OnUSBDeviceStateChange_TO_BASE(base) COM_FORWARD_IConsoleCallback_OnUSBDeviceStateChange_TO (base::)
-#define COM_FORWARD_IConsoleCallback_OnSharedFolderChange_TO(smth) HRESULT STDMETHODCALLTYPE OnSharedFolderChange (Scope aScope) { return smth OnSharedFolderChange (aScope); }
-#define COM_FORWARD_IConsoleCallback_OnSharedFolderChange_TO_OBJ(obj) COM_FORWARD_IConsoleCallback_OnSharedFolderChange_TO ((obj)->)
-#define COM_FORWARD_IConsoleCallback_OnSharedFolderChange_TO_BASE(base) COM_FORWARD_IConsoleCallback_OnSharedFolderChange_TO (base::)
-#define COM_FORWARD_IConsoleCallback_OnRuntimeError_TO(smth) HRESULT STDMETHODCALLTYPE OnRuntimeError (BOOL aFatal, BSTR aId, BSTR aMessage) { return smth OnRuntimeError (aFatal, aId, aMessage); }
-#define COM_FORWARD_IConsoleCallback_OnRuntimeError_TO_OBJ(obj) COM_FORWARD_IConsoleCallback_OnRuntimeError_TO ((obj)->)
-#define COM_FORWARD_IConsoleCallback_OnRuntimeError_TO_BASE(base) COM_FORWARD_IConsoleCallback_OnRuntimeError_TO (base::)
-#define COM_FORWARD_IConsoleCallback_OnCanShowWindow_TO(smth) HRESULT STDMETHODCALLTYPE OnCanShowWindow (BOOL * aCanShow) { return smth OnCanShowWindow (aCanShow); }
-#define COM_FORWARD_IConsoleCallback_OnCanShowWindow_TO_OBJ(obj) COM_FORWARD_IConsoleCallback_OnCanShowWindow_TO ((obj)->)
-#define COM_FORWARD_IConsoleCallback_OnCanShowWindow_TO_BASE(base) COM_FORWARD_IConsoleCallback_OnCanShowWindow_TO (base::)
-#define COM_FORWARD_IConsoleCallback_OnShowWindow_TO(smth) HRESULT STDMETHODCALLTYPE OnShowWindow (ULONG64 * aWinId) { return smth OnShowWindow (aWinId); }
-#define COM_FORWARD_IConsoleCallback_OnShowWindow_TO_OBJ(obj) COM_FORWARD_IConsoleCallback_OnShowWindow_TO ((obj)->)
-#define COM_FORWARD_IConsoleCallback_OnShowWindow_TO_BASE(base) COM_FORWARD_IConsoleCallback_OnShowWindow_TO (base::)
-#define COM_FORWARD_IConsoleCallback_TO(smth) COM_FORWARD_IConsoleCallback_OnMousePointerShapeChange_TO (smth) COM_FORWARD_IConsoleCallback_OnMouseCapabilityChange_TO (smth) COM_FORWARD_IConsoleCallback_OnKeyboardLedsChange_TO (smth) COM_FORWARD_IConsoleCallback_OnStateChange_TO (smth) COM_FORWARD_IConsoleCallback_OnAdditionsStateChange_TO (smth) COM_FORWARD_IConsoleCallback_OnNetworkAdapterChange_TO (smth) COM_FORWARD_IConsoleCallback_OnSerialPortChange_TO (smth) COM_FORWARD_IConsoleCal [...]
-#define COM_FORWARD_IConsoleCallback_TO_OBJ(obj) COM_FORWARD_IConsoleCallback_TO ((obj)->)
-#define COM_FORWARD_IConsoleCallback_TO_BASE(base) COM_FORWARD_IConsoleCallback_TO (base::)
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_Active_TO(smth) HRESULT STDMETHODCALLTYPE get_Active (BOOL * aActive) { return smth get_Active (aActive); }
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_Active_TO_OBJ(obj) COM_FORWARD_IRemoteDisplayInfo_GETTER_Active_TO ((obj)->)
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_Active_TO_BASE(base) COM_FORWARD_IRemoteDisplayInfo_GETTER_Active_TO (base::)
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_Port_TO(smth) HRESULT STDMETHODCALLTYPE get_Port (LONG * aPort) { return smth get_Port (aPort); }
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_Port_TO_OBJ(obj) COM_FORWARD_IRemoteDisplayInfo_GETTER_Port_TO ((obj)->)
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_Port_TO_BASE(base) COM_FORWARD_IRemoteDisplayInfo_GETTER_Port_TO (base::)
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_NumberOfClients_TO(smth) HRESULT STDMETHODCALLTYPE get_NumberOfClients (ULONG * aNumberOfClients) { return smth get_NumberOfClients (aNumberOfClients); }
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_NumberOfClients_TO_OBJ(obj) COM_FORWARD_IRemoteDisplayInfo_GETTER_NumberOfClients_TO ((obj)->)
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_NumberOfClients_TO_BASE(base) COM_FORWARD_IRemoteDisplayInfo_GETTER_NumberOfClients_TO (base::)
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_BeginTime_TO(smth) HRESULT STDMETHODCALLTYPE get_BeginTime (LONG64 * aBeginTime) { return smth get_BeginTime (aBeginTime); }
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_BeginTime_TO_OBJ(obj) COM_FORWARD_IRemoteDisplayInfo_GETTER_BeginTime_TO ((obj)->)
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_BeginTime_TO_BASE(base) COM_FORWARD_IRemoteDisplayInfo_GETTER_BeginTime_TO (base::)
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_EndTime_TO(smth) HRESULT STDMETHODCALLTYPE get_EndTime (LONG64 * aEndTime) { return smth get_EndTime (aEndTime); }
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_EndTime_TO_OBJ(obj) COM_FORWARD_IRemoteDisplayInfo_GETTER_EndTime_TO ((obj)->)
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_EndTime_TO_BASE(base) COM_FORWARD_IRemoteDisplayInfo_GETTER_EndTime_TO (base::)
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_BytesSent_TO(smth) HRESULT STDMETHODCALLTYPE get_BytesSent (ULONG64 * aBytesSent) { return smth get_BytesSent (aBytesSent); }
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_BytesSent_TO_OBJ(obj) COM_FORWARD_IRemoteDisplayInfo_GETTER_BytesSent_TO ((obj)->)
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_BytesSent_TO_BASE(base) COM_FORWARD_IRemoteDisplayInfo_GETTER_BytesSent_TO (base::)
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_BytesSentTotal_TO(smth) HRESULT STDMETHODCALLTYPE get_BytesSentTotal (ULONG64 * aBytesSentTotal) { return smth get_BytesSentTotal (aBytesSentTotal); }
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_BytesSentTotal_TO_OBJ(obj) COM_FORWARD_IRemoteDisplayInfo_GETTER_BytesSentTotal_TO ((obj)->)
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_BytesSentTotal_TO_BASE(base) COM_FORWARD_IRemoteDisplayInfo_GETTER_BytesSentTotal_TO (base::)
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_BytesReceived_TO(smth) HRESULT STDMETHODCALLTYPE get_BytesReceived (ULONG64 * aBytesReceived) { return smth get_BytesReceived (aBytesReceived); }
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_BytesReceived_TO_OBJ(obj) COM_FORWARD_IRemoteDisplayInfo_GETTER_BytesReceived_TO ((obj)->)
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_BytesReceived_TO_BASE(base) COM_FORWARD_IRemoteDisplayInfo_GETTER_BytesReceived_TO (base::)
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_BytesReceivedTotal_TO(smth) HRESULT STDMETHODCALLTYPE get_BytesReceivedTotal (ULONG64 * aBytesReceivedTotal) { return smth get_BytesReceivedTotal (aBytesReceivedTotal); }
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_BytesReceivedTotal_TO_OBJ(obj) COM_FORWARD_IRemoteDisplayInfo_GETTER_BytesReceivedTotal_TO ((obj)->)
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_BytesReceivedTotal_TO_BASE(base) COM_FORWARD_IRemoteDisplayInfo_GETTER_BytesReceivedTotal_TO (base::)
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_User_TO(smth) HRESULT STDMETHODCALLTYPE get_User (BSTR * aUser) { return smth get_User (aUser); }
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_User_TO_OBJ(obj) COM_FORWARD_IRemoteDisplayInfo_GETTER_User_TO ((obj)->)
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_User_TO_BASE(base) COM_FORWARD_IRemoteDisplayInfo_GETTER_User_TO (base::)
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_Domain_TO(smth) HRESULT STDMETHODCALLTYPE get_Domain (BSTR * aDomain) { return smth get_Domain (aDomain); }
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_Domain_TO_OBJ(obj) COM_FORWARD_IRemoteDisplayInfo_GETTER_Domain_TO ((obj)->)
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_Domain_TO_BASE(base) COM_FORWARD_IRemoteDisplayInfo_GETTER_Domain_TO (base::)
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_ClientName_TO(smth) HRESULT STDMETHODCALLTYPE get_ClientName (BSTR * aClientName) { return smth get_ClientName (aClientName); }
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_ClientName_TO_OBJ(obj) COM_FORWARD_IRemoteDisplayInfo_GETTER_ClientName_TO ((obj)->)
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_ClientName_TO_BASE(base) COM_FORWARD_IRemoteDisplayInfo_GETTER_ClientName_TO (base::)
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_ClientIP_TO(smth) HRESULT STDMETHODCALLTYPE get_ClientIP (BSTR * aClientIP) { return smth get_ClientIP (aClientIP); }
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_ClientIP_TO_OBJ(obj) COM_FORWARD_IRemoteDisplayInfo_GETTER_ClientIP_TO ((obj)->)
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_ClientIP_TO_BASE(base) COM_FORWARD_IRemoteDisplayInfo_GETTER_ClientIP_TO (base::)
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_ClientVersion_TO(smth) HRESULT STDMETHODCALLTYPE get_ClientVersion (ULONG * aClientVersion) { return smth get_ClientVersion (aClientVersion); }
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_ClientVersion_TO_OBJ(obj) COM_FORWARD_IRemoteDisplayInfo_GETTER_ClientVersion_TO ((obj)->)
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_ClientVersion_TO_BASE(base) COM_FORWARD_IRemoteDisplayInfo_GETTER_ClientVersion_TO (base::)
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_EncryptionStyle_TO(smth) HRESULT STDMETHODCALLTYPE get_EncryptionStyle (ULONG * aEncryptionStyle) { return smth get_EncryptionStyle (aEncryptionStyle); }
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_EncryptionStyle_TO_OBJ(obj) COM_FORWARD_IRemoteDisplayInfo_GETTER_EncryptionStyle_TO ((obj)->)
-#define COM_FORWARD_IRemoteDisplayInfo_GETTER_EncryptionStyle_TO_BASE(base) COM_FORWARD_IRemoteDisplayInfo_GETTER_EncryptionStyle_TO (base::)
-#define COM_FORWARD_IRemoteDisplayInfo_TO(smth) COM_FORWARD_IRemoteDisplayInfo_GETTER_Active_TO (smth) COM_FORWARD_IRemoteDisplayInfo_GETTER_Port_TO (smth) COM_FORWARD_IRemoteDisplayInfo_GETTER_NumberOfClients_TO (smth) COM_FORWARD_IRemoteDisplayInfo_GETTER_BeginTime_TO (smth) COM_FORWARD_IRemoteDisplayInfo_GETTER_EndTime_TO (smth) COM_FORWARD_IRemoteDisplayInfo_GETTER_BytesSent_TO (smth) COM_FORWARD_IRemoteDisplayInfo_GETTER_BytesSentTotal_TO (smth) COM_FORWARD_IRemoteDisplayInfo_GETTER [...]
-#define COM_FORWARD_IRemoteDisplayInfo_TO_OBJ(obj) COM_FORWARD_IRemoteDisplayInfo_TO ((obj)->)
-#define COM_FORWARD_IRemoteDisplayInfo_TO_BASE(base) COM_FORWARD_IRemoteDisplayInfo_TO (base::)
-#define COM_FORWARD_IConsole_GETTER_Machine_TO(smth) HRESULT STDMETHODCALLTYPE get_Machine (IMachine * * aMachine) { return smth get_Machine (aMachine); }
-#define COM_FORWARD_IConsole_GETTER_Machine_TO_OBJ(obj) COM_FORWARD_IConsole_GETTER_Machine_TO ((obj)->)
-#define COM_FORWARD_IConsole_GETTER_Machine_TO_BASE(base) COM_FORWARD_IConsole_GETTER_Machine_TO (base::)
-#define COM_FORWARD_IConsole_GETTER_State_TO(smth) HRESULT STDMETHODCALLTYPE get_State (MachineState * aState) { return smth get_State (aState); }
-#define COM_FORWARD_IConsole_GETTER_State_TO_OBJ(obj) COM_FORWARD_IConsole_GETTER_State_TO ((obj)->)
-#define COM_FORWARD_IConsole_GETTER_State_TO_BASE(base) COM_FORWARD_IConsole_GETTER_State_TO (base::)
-#define COM_FORWARD_IConsole_GETTER_Guest_TO(smth) HRESULT STDMETHODCALLTYPE get_Guest (IGuest * * aGuest) { return smth get_Guest (aGuest); }
-#define COM_FORWARD_IConsole_GETTER_Guest_TO_OBJ(obj) COM_FORWARD_IConsole_GETTER_Guest_TO ((obj)->)
-#define COM_FORWARD_IConsole_GETTER_Guest_TO_BASE(base) COM_FORWARD_IConsole_GETTER_Guest_TO (base::)
-#define COM_FORWARD_IConsole_GETTER_Keyboard_TO(smth) HRESULT STDMETHODCALLTYPE get_Keyboard (IKeyboard * * aKeyboard) { return smth get_Keyboard (aKeyboard); }
-#define COM_FORWARD_IConsole_GETTER_Keyboard_TO_OBJ(obj) COM_FORWARD_IConsole_GETTER_Keyboard_TO ((obj)->)
-#define COM_FORWARD_IConsole_GETTER_Keyboard_TO_BASE(base) COM_FORWARD_IConsole_GETTER_Keyboard_TO (base::)
-#define COM_FORWARD_IConsole_GETTER_Mouse_TO(smth) HRESULT STDMETHODCALLTYPE get_Mouse (IMouse * * aMouse) { return smth get_Mouse (aMouse); }
-#define COM_FORWARD_IConsole_GETTER_Mouse_TO_OBJ(obj) COM_FORWARD_IConsole_GETTER_Mouse_TO ((obj)->)
-#define COM_FORWARD_IConsole_GETTER_Mouse_TO_BASE(base) COM_FORWARD_IConsole_GETTER_Mouse_TO (base::)
-#define COM_FORWARD_IConsole_GETTER_Display_TO(smth) HRESULT STDMETHODCALLTYPE get_Display (IDisplay * * aDisplay) { return smth get_Display (aDisplay); }
-#define COM_FORWARD_IConsole_GETTER_Display_TO_OBJ(obj) COM_FORWARD_IConsole_GETTER_Display_TO ((obj)->)
-#define COM_FORWARD_IConsole_GETTER_Display_TO_BASE(base) COM_FORWARD_IConsole_GETTER_Display_TO (base::)
-#define COM_FORWARD_IConsole_GETTER_Debugger_TO(smth) HRESULT STDMETHODCALLTYPE get_Debugger (IMachineDebugger * * aDebugger) { return smth get_Debugger (aDebugger); }
-#define COM_FORWARD_IConsole_GETTER_Debugger_TO_OBJ(obj) COM_FORWARD_IConsole_GETTER_Debugger_TO ((obj)->)
-#define COM_FORWARD_IConsole_GETTER_Debugger_TO_BASE(base) COM_FORWARD_IConsole_GETTER_Debugger_TO (base::)
-#define COM_FORWARD_IConsole_GETTER_USBDevices_TO(smth) HRESULT STDMETHODCALLTYPE get_USBDevices (SAFEARRAY * * aUSBDevices) { return smth get_USBDevices (aUSBDevices); }
-#define COM_FORWARD_IConsole_GETTER_USBDevices_TO_OBJ(obj) COM_FORWARD_IConsole_GETTER_USBDevices_TO ((obj)->)
-#define COM_FORWARD_IConsole_GETTER_USBDevices_TO_BASE(base) COM_FORWARD_IConsole_GETTER_USBDevices_TO (base::)
-#define COM_FORWARD_IConsole_GETTER_RemoteUSBDevices_TO(smth) HRESULT STDMETHODCALLTYPE get_RemoteUSBDevices (SAFEARRAY * * aRemoteUSBDevices) { return smth get_RemoteUSBDevices (aRemoteUSBDevices); }
-#define COM_FORWARD_IConsole_GETTER_RemoteUSBDevices_TO_OBJ(obj) COM_FORWARD_IConsole_GETTER_RemoteUSBDevices_TO ((obj)->)
-#define COM_FORWARD_IConsole_GETTER_RemoteUSBDevices_TO_BASE(base) COM_FORWARD_IConsole_GETTER_RemoteUSBDevices_TO (base::)
-#define COM_FORWARD_IConsole_GETTER_SharedFolders_TO(smth) HRESULT STDMETHODCALLTYPE get_SharedFolders (SAFEARRAY * * aSharedFolders) { return smth get_SharedFolders (aSharedFolders); }
-#define COM_FORWARD_IConsole_GETTER_SharedFolders_TO_OBJ(obj) COM_FORWARD_IConsole_GETTER_SharedFolders_TO ((obj)->)
-#define COM_FORWARD_IConsole_GETTER_SharedFolders_TO_BASE(base) COM_FORWARD_IConsole_GETTER_SharedFolders_TO (base::)
-#define COM_FORWARD_IConsole_GETTER_RemoteDisplayInfo_TO(smth) HRESULT STDMETHODCALLTYPE get_RemoteDisplayInfo (IRemoteDisplayInfo * * aRemoteDisplayInfo) { return smth get_RemoteDisplayInfo (aRemoteDisplayInfo); }
-#define COM_FORWARD_IConsole_GETTER_RemoteDisplayInfo_TO_OBJ(obj) COM_FORWARD_IConsole_GETTER_RemoteDisplayInfo_TO ((obj)->)
-#define COM_FORWARD_IConsole_GETTER_RemoteDisplayInfo_TO_BASE(base) COM_FORWARD_IConsole_GETTER_RemoteDisplayInfo_TO (base::)
-#define COM_FORWARD_IConsole_PowerUp_TO(smth) HRESULT STDMETHODCALLTYPE PowerUp (IProgress * * aProgress) { return smth PowerUp (aProgress); }
-#define COM_FORWARD_IConsole_PowerUp_TO_OBJ(obj) COM_FORWARD_IConsole_PowerUp_TO ((obj)->)
-#define COM_FORWARD_IConsole_PowerUp_TO_BASE(base) COM_FORWARD_IConsole_PowerUp_TO (base::)
-#define COM_FORWARD_IConsole_PowerUpPaused_TO(smth) HRESULT STDMETHODCALLTYPE PowerUpPaused (IProgress * * aProgress) { return smth PowerUpPaused (aProgress); }
-#define COM_FORWARD_IConsole_PowerUpPaused_TO_OBJ(obj) COM_FORWARD_IConsole_PowerUpPaused_TO ((obj)->)
-#define COM_FORWARD_IConsole_PowerUpPaused_TO_BASE(base) COM_FORWARD_IConsole_PowerUpPaused_TO (base::)
-#define COM_FORWARD_IConsole_PowerDown_TO(smth) HRESULT STDMETHODCALLTYPE PowerDown (IProgress * * aProgress) { return smth PowerDown (aProgress); }
-#define COM_FORWARD_IConsole_PowerDown_TO_OBJ(obj) COM_FORWARD_IConsole_PowerDown_TO ((obj)->)
-#define COM_FORWARD_IConsole_PowerDown_TO_BASE(base) COM_FORWARD_IConsole_PowerDown_TO (base::)
-#define COM_FORWARD_IConsole_Reset_TO(smth) HRESULT STDMETHODCALLTYPE Reset() { return smth Reset(); }
-#define COM_FORWARD_IConsole_Reset_TO_OBJ(obj) COM_FORWARD_IConsole_Reset_TO ((obj)->)
-#define COM_FORWARD_IConsole_Reset_TO_BASE(base) COM_FORWARD_IConsole_Reset_TO (base::)
-#define COM_FORWARD_IConsole_Pause_TO(smth) HRESULT STDMETHODCALLTYPE Pause() { return smth Pause(); }
-#define COM_FORWARD_IConsole_Pause_TO_OBJ(obj) COM_FORWARD_IConsole_Pause_TO ((obj)->)
-#define COM_FORWARD_IConsole_Pause_TO_BASE(base) COM_FORWARD_IConsole_Pause_TO (base::)
-#define COM_FORWARD_IConsole_Resume_TO(smth) HRESULT STDMETHODCALLTYPE Resume() { return smth Resume(); }
-#define COM_FORWARD_IConsole_Resume_TO_OBJ(obj) COM_FORWARD_IConsole_Resume_TO ((obj)->)
-#define COM_FORWARD_IConsole_Resume_TO_BASE(base) COM_FORWARD_IConsole_Resume_TO (base::)
-#define COM_FORWARD_IConsole_PowerButton_TO(smth) HRESULT STDMETHODCALLTYPE PowerButton() { return smth PowerButton(); }
-#define COM_FORWARD_IConsole_PowerButton_TO_OBJ(obj) COM_FORWARD_IConsole_PowerButton_TO ((obj)->)
-#define COM_FORWARD_IConsole_PowerButton_TO_BASE(base) COM_FORWARD_IConsole_PowerButton_TO (base::)
-#define COM_FORWARD_IConsole_SleepButton_TO(smth) HRESULT STDMETHODCALLTYPE SleepButton() { return smth SleepButton(); }
-#define COM_FORWARD_IConsole_SleepButton_TO_OBJ(obj) COM_FORWARD_IConsole_SleepButton_TO ((obj)->)
-#define COM_FORWARD_IConsole_SleepButton_TO_BASE(base) COM_FORWARD_IConsole_SleepButton_TO (base::)
-#define COM_FORWARD_IConsole_GetPowerButtonHandled_TO(smth) HRESULT STDMETHODCALLTYPE GetPowerButtonHandled (BOOL * aHandled) { return smth GetPowerButtonHandled (aHandled); }
-#define COM_FORWARD_IConsole_GetPowerButtonHandled_TO_OBJ(obj) COM_FORWARD_IConsole_GetPowerButtonHandled_TO ((obj)->)
-#define COM_FORWARD_IConsole_GetPowerButtonHandled_TO_BASE(base) COM_FORWARD_IConsole_GetPowerButtonHandled_TO (base::)
-#define COM_FORWARD_IConsole_GetGuestEnteredACPIMode_TO(smth) HRESULT STDMETHODCALLTYPE GetGuestEnteredACPIMode (BOOL * aEntered) { return smth GetGuestEnteredACPIMode (aEntered); }
-#define COM_FORWARD_IConsole_GetGuestEnteredACPIMode_TO_OBJ(obj) COM_FORWARD_IConsole_GetGuestEnteredACPIMode_TO ((obj)->)
-#define COM_FORWARD_IConsole_GetGuestEnteredACPIMode_TO_BASE(base) COM_FORWARD_IConsole_GetGuestEnteredACPIMode_TO (base::)
-#define COM_FORWARD_IConsole_SaveState_TO(smth) HRESULT STDMETHODCALLTYPE SaveState (IProgress * * aProgress) { return smth SaveState (aProgress); }
-#define COM_FORWARD_IConsole_SaveState_TO_OBJ(obj) COM_FORWARD_IConsole_SaveState_TO ((obj)->)
-#define COM_FORWARD_IConsole_SaveState_TO_BASE(base) COM_FORWARD_IConsole_SaveState_TO (base::)
-#define COM_FORWARD_IConsole_AdoptSavedState_TO(smth) HRESULT STDMETHODCALLTYPE AdoptSavedState (BSTR aSavedStateFile) { return smth AdoptSavedState (aSavedStateFile); }
-#define COM_FORWARD_IConsole_AdoptSavedState_TO_OBJ(obj) COM_FORWARD_IConsole_AdoptSavedState_TO ((obj)->)
-#define COM_FORWARD_IConsole_AdoptSavedState_TO_BASE(base) COM_FORWARD_IConsole_AdoptSavedState_TO (base::)
-#define COM_FORWARD_IConsole_ForgetSavedState_TO(smth) HRESULT STDMETHODCALLTYPE ForgetSavedState (BOOL aRemove) { return smth ForgetSavedState (aRemove); }
-#define COM_FORWARD_IConsole_ForgetSavedState_TO_OBJ(obj) COM_FORWARD_IConsole_ForgetSavedState_TO ((obj)->)
-#define COM_FORWARD_IConsole_ForgetSavedState_TO_BASE(base) COM_FORWARD_IConsole_ForgetSavedState_TO (base::)
-#define COM_FORWARD_IConsole_GetDeviceActivity_TO(smth) HRESULT STDMETHODCALLTYPE GetDeviceActivity (DeviceType aType, DeviceActivity * aActivity) { return smth GetDeviceActivity (aType, aActivity); }
-#define COM_FORWARD_IConsole_GetDeviceActivity_TO_OBJ(obj) COM_FORWARD_IConsole_GetDeviceActivity_TO ((obj)->)
-#define COM_FORWARD_IConsole_GetDeviceActivity_TO_BASE(base) COM_FORWARD_IConsole_GetDeviceActivity_TO (base::)
-#define COM_FORWARD_IConsole_AttachUSBDevice_TO(smth) HRESULT STDMETHODCALLTYPE AttachUSBDevice (BSTR aId) { return smth AttachUSBDevice (aId); }
-#define COM_FORWARD_IConsole_AttachUSBDevice_TO_OBJ(obj) COM_FORWARD_IConsole_AttachUSBDevice_TO ((obj)->)
-#define COM_FORWARD_IConsole_AttachUSBDevice_TO_BASE(base) COM_FORWARD_IConsole_AttachUSBDevice_TO (base::)
-#define COM_FORWARD_IConsole_DetachUSBDevice_TO(smth) HRESULT STDMETHODCALLTYPE DetachUSBDevice (BSTR aId, IUSBDevice * * aDevice) { return smth DetachUSBDevice (aId, aDevice); }
-#define COM_FORWARD_IConsole_DetachUSBDevice_TO_OBJ(obj) COM_FORWARD_IConsole_DetachUSBDevice_TO ((obj)->)
-#define COM_FORWARD_IConsole_DetachUSBDevice_TO_BASE(base) COM_FORWARD_IConsole_DetachUSBDevice_TO (base::)
-#define COM_FORWARD_IConsole_FindUSBDeviceByAddress_TO(smth) HRESULT STDMETHODCALLTYPE FindUSBDeviceByAddress (BSTR aName, IUSBDevice * * aDevice) { return smth FindUSBDeviceByAddress (aName, aDevice); }
-#define COM_FORWARD_IConsole_FindUSBDeviceByAddress_TO_OBJ(obj) COM_FORWARD_IConsole_FindUSBDeviceByAddress_TO ((obj)->)
-#define COM_FORWARD_IConsole_FindUSBDeviceByAddress_TO_BASE(base) COM_FORWARD_IConsole_FindUSBDeviceByAddress_TO (base::)
-#define COM_FORWARD_IConsole_FindUSBDeviceById_TO(smth) HRESULT STDMETHODCALLTYPE FindUSBDeviceById (BSTR aId, IUSBDevice * * aDevice) { return smth FindUSBDeviceById (aId, aDevice); }
-#define COM_FORWARD_IConsole_FindUSBDeviceById_TO_OBJ(obj) COM_FORWARD_IConsole_FindUSBDeviceById_TO ((obj)->)
-#define COM_FORWARD_IConsole_FindUSBDeviceById_TO_BASE(base) COM_FORWARD_IConsole_FindUSBDeviceById_TO (base::)
-#define COM_FORWARD_IConsole_CreateSharedFolder_TO(smth) HRESULT STDMETHODCALLTYPE CreateSharedFolder (BSTR aName, BSTR aHostPath, BOOL aWritable) { return smth CreateSharedFolder (aName, aHostPath, aWritable); }
-#define COM_FORWARD_IConsole_CreateSharedFolder_TO_OBJ(obj) COM_FORWARD_IConsole_CreateSharedFolder_TO ((obj)->)
-#define COM_FORWARD_IConsole_CreateSharedFolder_TO_BASE(base) COM_FORWARD_IConsole_CreateSharedFolder_TO (base::)
-#define COM_FORWARD_IConsole_RemoveSharedFolder_TO(smth) HRESULT STDMETHODCALLTYPE RemoveSharedFolder (BSTR aName) { return smth RemoveSharedFolder (aName); }
-#define COM_FORWARD_IConsole_RemoveSharedFolder_TO_OBJ(obj) COM_FORWARD_IConsole_RemoveSharedFolder_TO ((obj)->)
-#define COM_FORWARD_IConsole_RemoveSharedFolder_TO_BASE(base) COM_FORWARD_IConsole_RemoveSharedFolder_TO (base::)
-#define COM_FORWARD_IConsole_TakeSnapshot_TO(smth) HRESULT STDMETHODCALLTYPE TakeSnapshot (BSTR aName, BSTR aDescription, IProgress * * aProgress) { return smth TakeSnapshot (aName, aDescription, aProgress); }
-#define COM_FORWARD_IConsole_TakeSnapshot_TO_OBJ(obj) COM_FORWARD_IConsole_TakeSnapshot_TO ((obj)->)
-#define COM_FORWARD_IConsole_TakeSnapshot_TO_BASE(base) COM_FORWARD_IConsole_TakeSnapshot_TO (base::)
-#define COM_FORWARD_IConsole_DeleteSnapshot_TO(smth) HRESULT STDMETHODCALLTYPE DeleteSnapshot (BSTR aId, IProgress * * aProgress) { return smth DeleteSnapshot (aId, aProgress); }
-#define COM_FORWARD_IConsole_DeleteSnapshot_TO_OBJ(obj) COM_FORWARD_IConsole_DeleteSnapshot_TO ((obj)->)
-#define COM_FORWARD_IConsole_DeleteSnapshot_TO_BASE(base) COM_FORWARD_IConsole_DeleteSnapshot_TO (base::)
-#define COM_FORWARD_IConsole_RestoreSnapshot_TO(smth) HRESULT STDMETHODCALLTYPE RestoreSnapshot (ISnapshot * aSnapshot, IProgress * * aProgress) { return smth RestoreSnapshot (aSnapshot, aProgress); }
-#define COM_FORWARD_IConsole_RestoreSnapshot_TO_OBJ(obj) COM_FORWARD_IConsole_RestoreSnapshot_TO ((obj)->)
-#define COM_FORWARD_IConsole_RestoreSnapshot_TO_BASE(base) COM_FORWARD_IConsole_RestoreSnapshot_TO (base::)
-#define COM_FORWARD_IConsole_Teleport_TO(smth) HRESULT STDMETHODCALLTYPE Teleport (BSTR aHostname, ULONG aTcpport, BSTR aPassword, ULONG aMaxDowntime, IProgress * * aProgress) { return smth Teleport (aHostname, aTcpport, aPassword, aMaxDowntime, aProgress); }
-#define COM_FORWARD_IConsole_Teleport_TO_OBJ(obj) COM_FORWARD_IConsole_Teleport_TO ((obj)->)
-#define COM_FORWARD_IConsole_Teleport_TO_BASE(base) COM_FORWARD_IConsole_Teleport_TO (base::)
-#define COM_FORWARD_IConsole_RegisterCallback_TO(smth) HRESULT STDMETHODCALLTYPE RegisterCallback (IConsoleCallback * aCallback) { return smth RegisterCallback (aCallback); }
-#define COM_FORWARD_IConsole_RegisterCallback_TO_OBJ(obj) COM_FORWARD_IConsole_RegisterCallback_TO ((obj)->)
-#define COM_FORWARD_IConsole_RegisterCallback_TO_BASE(base) COM_FORWARD_IConsole_RegisterCallback_TO (base::)
-#define COM_FORWARD_IConsole_UnregisterCallback_TO(smth) HRESULT STDMETHODCALLTYPE UnregisterCallback (IConsoleCallback * aCallback) { return smth UnregisterCallback (aCallback); }
-#define COM_FORWARD_IConsole_UnregisterCallback_TO_OBJ(obj) COM_FORWARD_IConsole_UnregisterCallback_TO ((obj)->)
-#define COM_FORWARD_IConsole_UnregisterCallback_TO_BASE(base) COM_FORWARD_IConsole_UnregisterCallback_TO (base::)
-#define COM_FORWARD_IConsole_TO(smth) COM_FORWARD_IConsole_GETTER_Machine_TO (smth) COM_FORWARD_IConsole_GETTER_State_TO (smth) COM_FORWARD_IConsole_GETTER_Guest_TO (smth) COM_FORWARD_IConsole_GETTER_Keyboard_TO (smth) COM_FORWARD_IConsole_GETTER_Mouse_TO (smth) COM_FORWARD_IConsole_GETTER_Display_TO (smth) COM_FORWARD_IConsole_GETTER_Debugger_TO (smth) COM_FORWARD_IConsole_GETTER_USBDevices_TO (smth) COM_FORWARD_IConsole_GETTER_RemoteUSBDevices_TO (smth) COM_FORWARD_IConsole_GETTER_Shar [...]
-#define COM_FORWARD_IConsole_TO_OBJ(obj) COM_FORWARD_IConsole_TO ((obj)->)
-#define COM_FORWARD_IConsole_TO_BASE(base) COM_FORWARD_IConsole_TO (base::)
-#define COM_FORWARD_IHostNetworkInterface_GETTER_Name_TO(smth) HRESULT STDMETHODCALLTYPE get_Name (BSTR * aName) { return smth get_Name (aName); }
-#define COM_FORWARD_IHostNetworkInterface_GETTER_Name_TO_OBJ(obj) COM_FORWARD_IHostNetworkInterface_GETTER_Name_TO ((obj)->)
-#define COM_FORWARD_IHostNetworkInterface_GETTER_Name_TO_BASE(base) COM_FORWARD_IHostNetworkInterface_GETTER_Name_TO (base::)
-#define COM_FORWARD_IHostNetworkInterface_GETTER_Id_TO(smth) HRESULT STDMETHODCALLTYPE get_Id (BSTR * aId) { return smth get_Id (aId); }
-#define COM_FORWARD_IHostNetworkInterface_GETTER_Id_TO_OBJ(obj) COM_FORWARD_IHostNetworkInterface_GETTER_Id_TO ((obj)->)
-#define COM_FORWARD_IHostNetworkInterface_GETTER_Id_TO_BASE(base) COM_FORWARD_IHostNetworkInterface_GETTER_Id_TO (base::)
-#define COM_FORWARD_IHostNetworkInterface_GETTER_NetworkName_TO(smth) HRESULT STDMETHODCALLTYPE get_NetworkName (BSTR * aNetworkName) { return smth get_NetworkName (aNetworkName); }
-#define COM_FORWARD_IHostNetworkInterface_GETTER_NetworkName_TO_OBJ(obj) COM_FORWARD_IHostNetworkInterface_GETTER_NetworkName_TO ((obj)->)
-#define COM_FORWARD_IHostNetworkInterface_GETTER_NetworkName_TO_BASE(base) COM_FORWARD_IHostNetworkInterface_GETTER_NetworkName_TO (base::)
-#define COM_FORWARD_IHostNetworkInterface_GETTER_DhcpEnabled_TO(smth) HRESULT STDMETHODCALLTYPE get_DhcpEnabled (BOOL * aDhcpEnabled) { return smth get_DhcpEnabled (aDhcpEnabled); }
-#define COM_FORWARD_IHostNetworkInterface_GETTER_DhcpEnabled_TO_OBJ(obj) COM_FORWARD_IHostNetworkInterface_GETTER_DhcpEnabled_TO ((obj)->)
-#define COM_FORWARD_IHostNetworkInterface_GETTER_DhcpEnabled_TO_BASE(base) COM_FORWARD_IHostNetworkInterface_GETTER_DhcpEnabled_TO (base::)
-#define COM_FORWARD_IHostNetworkInterface_GETTER_IPAddress_TO(smth) HRESULT STDMETHODCALLTYPE get_IPAddress (BSTR * aIPAddress) { return smth get_IPAddress (aIPAddress); }
-#define COM_FORWARD_IHostNetworkInterface_GETTER_IPAddress_TO_OBJ(obj) COM_FORWARD_IHostNetworkInterface_GETTER_IPAddress_TO ((obj)->)
-#define COM_FORWARD_IHostNetworkInterface_GETTER_IPAddress_TO_BASE(base) COM_FORWARD_IHostNetworkInterface_GETTER_IPAddress_TO (base::)
-#define COM_FORWARD_IHostNetworkInterface_GETTER_NetworkMask_TO(smth) HRESULT STDMETHODCALLTYPE get_NetworkMask (BSTR * aNetworkMask) { return smth get_NetworkMask (aNetworkMask); }
-#define COM_FORWARD_IHostNetworkInterface_GETTER_NetworkMask_TO_OBJ(obj) COM_FORWARD_IHostNetworkInterface_GETTER_NetworkMask_TO ((obj)->)
-#define COM_FORWARD_IHostNetworkInterface_GETTER_NetworkMask_TO_BASE(base) COM_FORWARD_IHostNetworkInterface_GETTER_NetworkMask_TO (base::)
-#define COM_FORWARD_IHostNetworkInterface_GETTER_IPV6Supported_TO(smth) HRESULT STDMETHODCALLTYPE get_IPV6Supported (BOOL * aIPV6Supported) { return smth get_IPV6Supported (aIPV6Supported); }
-#define COM_FORWARD_IHostNetworkInterface_GETTER_IPV6Supported_TO_OBJ(obj) COM_FORWARD_IHostNetworkInterface_GETTER_IPV6Supported_TO ((obj)->)
-#define COM_FORWARD_IHostNetworkInterface_GETTER_IPV6Supported_TO_BASE(base) COM_FORWARD_IHostNetworkInterface_GETTER_IPV6Supported_TO (base::)
-#define COM_FORWARD_IHostNetworkInterface_GETTER_IPV6Address_TO(smth) HRESULT STDMETHODCALLTYPE get_IPV6Address (BSTR * aIPV6Address) { return smth get_IPV6Address (aIPV6Address); }
-#define COM_FORWARD_IHostNetworkInterface_GETTER_IPV6Address_TO_OBJ(obj) COM_FORWARD_IHostNetworkInterface_GETTER_IPV6Address_TO ((obj)->)
-#define COM_FORWARD_IHostNetworkInterface_GETTER_IPV6Address_TO_BASE(base) COM_FORWARD_IHostNetworkInterface_GETTER_IPV6Address_TO (base::)
-#define COM_FORWARD_IHostNetworkInterface_GETTER_IPV6NetworkMaskPrefixLength_TO(smth) HRESULT STDMETHODCALLTYPE get_IPV6NetworkMaskPrefixLength (ULONG * aIPV6NetworkMaskPrefixLength) { return smth get_IPV6NetworkMaskPrefixLength (aIPV6NetworkMaskPrefixLength); }
-#define COM_FORWARD_IHostNetworkInterface_GETTER_IPV6NetworkMaskPrefixLength_TO_OBJ(obj) COM_FORWARD_IHostNetworkInterface_GETTER_IPV6NetworkMaskPrefixLength_TO ((obj)->)
-#define COM_FORWARD_IHostNetworkInterface_GETTER_IPV6NetworkMaskPrefixLength_TO_BASE(base) COM_FORWARD_IHostNetworkInterface_GETTER_IPV6NetworkMaskPrefixLength_TO (base::)
-#define COM_FORWARD_IHostNetworkInterface_GETTER_HardwareAddress_TO(smth) HRESULT STDMETHODCALLTYPE get_HardwareAddress (BSTR * aHardwareAddress) { return smth get_HardwareAddress (aHardwareAddress); }
-#define COM_FORWARD_IHostNetworkInterface_GETTER_HardwareAddress_TO_OBJ(obj) COM_FORWARD_IHostNetworkInterface_GETTER_HardwareAddress_TO ((obj)->)
-#define COM_FORWARD_IHostNetworkInterface_GETTER_HardwareAddress_TO_BASE(base) COM_FORWARD_IHostNetworkInterface_GETTER_HardwareAddress_TO (base::)
-#define COM_FORWARD_IHostNetworkInterface_GETTER_MediumType_TO(smth) HRESULT STDMETHODCALLTYPE get_MediumType (HostNetworkInterfaceMediumType * aMediumType) { return smth get_MediumType (aMediumType); }
-#define COM_FORWARD_IHostNetworkInterface_GETTER_MediumType_TO_OBJ(obj) COM_FORWARD_IHostNetworkInterface_GETTER_MediumType_TO ((obj)->)
-#define COM_FORWARD_IHostNetworkInterface_GETTER_MediumType_TO_BASE(base) COM_FORWARD_IHostNetworkInterface_GETTER_MediumType_TO (base::)
-#define COM_FORWARD_IHostNetworkInterface_GETTER_Status_TO(smth) HRESULT STDMETHODCALLTYPE get_Status (HostNetworkInterfaceStatus * aStatus) { return smth get_Status (aStatus); }
-#define COM_FORWARD_IHostNetworkInterface_GETTER_Status_TO_OBJ(obj) COM_FORWARD_IHostNetworkInterface_GETTER_Status_TO ((obj)->)
-#define COM_FORWARD_IHostNetworkInterface_GETTER_Status_TO_BASE(base) COM_FORWARD_IHostNetworkInterface_GETTER_Status_TO (base::)
-#define COM_FORWARD_IHostNetworkInterface_GETTER_InterfaceType_TO(smth) HRESULT STDMETHODCALLTYPE get_InterfaceType (HostNetworkInterfaceType * aInterfaceType) { return smth get_InterfaceType (aInterfaceType); }
-#define COM_FORWARD_IHostNetworkInterface_GETTER_InterfaceType_TO_OBJ(obj) COM_FORWARD_IHostNetworkInterface_GETTER_InterfaceType_TO ((obj)->)
-#define COM_FORWARD_IHostNetworkInterface_GETTER_InterfaceType_TO_BASE(base) COM_FORWARD_IHostNetworkInterface_GETTER_InterfaceType_TO (base::)
-#define COM_FORWARD_IHostNetworkInterface_EnableStaticIpConfig_TO(smth) HRESULT STDMETHODCALLTYPE EnableStaticIpConfig (BSTR aIPAddress, BSTR aNetworkMask) { return smth EnableStaticIpConfig (aIPAddress, aNetworkMask); }
-#define COM_FORWARD_IHostNetworkInterface_EnableStaticIpConfig_TO_OBJ(obj) COM_FORWARD_IHostNetworkInterface_EnableStaticIpConfig_TO ((obj)->)
-#define COM_FORWARD_IHostNetworkInterface_EnableStaticIpConfig_TO_BASE(base) COM_FORWARD_IHostNetworkInterface_EnableStaticIpConfig_TO (base::)
-#define COM_FORWARD_IHostNetworkInterface_EnableStaticIpConfigV6_TO(smth) HRESULT STDMETHODCALLTYPE EnableStaticIpConfigV6 (BSTR aIPV6Address, ULONG aIPV6NetworkMaskPrefixLength) { return smth EnableStaticIpConfigV6 (aIPV6Address, aIPV6NetworkMaskPrefixLength); }
-#define COM_FORWARD_IHostNetworkInterface_EnableStaticIpConfigV6_TO_OBJ(obj) COM_FORWARD_IHostNetworkInterface_EnableStaticIpConfigV6_TO ((obj)->)
-#define COM_FORWARD_IHostNetworkInterface_EnableStaticIpConfigV6_TO_BASE(base) COM_FORWARD_IHostNetworkInterface_EnableStaticIpConfigV6_TO (base::)
-#define COM_FORWARD_IHostNetworkInterface_EnableDynamicIpConfig_TO(smth) HRESULT STDMETHODCALLTYPE EnableDynamicIpConfig() { return smth EnableDynamicIpConfig(); }
-#define COM_FORWARD_IHostNetworkInterface_EnableDynamicIpConfig_TO_OBJ(obj) COM_FORWARD_IHostNetworkInterface_EnableDynamicIpConfig_TO ((obj)->)
-#define COM_FORWARD_IHostNetworkInterface_EnableDynamicIpConfig_TO_BASE(base) COM_FORWARD_IHostNetworkInterface_EnableDynamicIpConfig_TO (base::)
-#define COM_FORWARD_IHostNetworkInterface_DhcpRediscover_TO(smth) HRESULT STDMETHODCALLTYPE DhcpRediscover() { return smth DhcpRediscover(); }
-#define COM_FORWARD_IHostNetworkInterface_DhcpRediscover_TO_OBJ(obj) COM_FORWARD_IHostNetworkInterface_DhcpRediscover_TO ((obj)->)
-#define COM_FORWARD_IHostNetworkInterface_DhcpRediscover_TO_BASE(base) COM_FORWARD_IHostNetworkInterface_DhcpRediscover_TO (base::)
-#define COM_FORWARD_IHostNetworkInterface_TO(smth) COM_FORWARD_IHostNetworkInterface_GETTER_Name_TO (smth) COM_FORWARD_IHostNetworkInterface_GETTER_Id_TO (smth) COM_FORWARD_IHostNetworkInterface_GETTER_NetworkName_TO (smth) COM_FORWARD_IHostNetworkInterface_GETTER_DhcpEnabled_TO (smth) COM_FORWARD_IHostNetworkInterface_GETTER_IPAddress_TO (smth) COM_FORWARD_IHostNetworkInterface_GETTER_NetworkMask_TO (smth) COM_FORWARD_IHostNetworkInterface_GETTER_IPV6Supported_TO (smth) COM_FORWARD_IHos [...]
-#define COM_FORWARD_IHostNetworkInterface_TO_OBJ(obj) COM_FORWARD_IHostNetworkInterface_TO ((obj)->)
-#define COM_FORWARD_IHostNetworkInterface_TO_BASE(base) COM_FORWARD_IHostNetworkInterface_TO (base::)
-#define COM_FORWARD_IHost_GETTER_DVDDrives_TO(smth) HRESULT STDMETHODCALLTYPE get_DVDDrives (SAFEARRAY * * aDVDDrives) { return smth get_DVDDrives (aDVDDrives); }
-#define COM_FORWARD_IHost_GETTER_DVDDrives_TO_OBJ(obj) COM_FORWARD_IHost_GETTER_DVDDrives_TO ((obj)->)
-#define COM_FORWARD_IHost_GETTER_DVDDrives_TO_BASE(base) COM_FORWARD_IHost_GETTER_DVDDrives_TO (base::)
-#define COM_FORWARD_IHost_GETTER_FloppyDrives_TO(smth) HRESULT STDMETHODCALLTYPE get_FloppyDrives (SAFEARRAY * * aFloppyDrives) { return smth get_FloppyDrives (aFloppyDrives); }
-#define COM_FORWARD_IHost_GETTER_FloppyDrives_TO_OBJ(obj) COM_FORWARD_IHost_GETTER_FloppyDrives_TO ((obj)->)
-#define COM_FORWARD_IHost_GETTER_FloppyDrives_TO_BASE(base) COM_FORWARD_IHost_GETTER_FloppyDrives_TO (base::)
-#define COM_FORWARD_IHost_GETTER_USBDevices_TO(smth) HRESULT STDMETHODCALLTYPE get_USBDevices (SAFEARRAY * * aUSBDevices) { return smth get_USBDevices (aUSBDevices); }
-#define COM_FORWARD_IHost_GETTER_USBDevices_TO_OBJ(obj) COM_FORWARD_IHost_GETTER_USBDevices_TO ((obj)->)
-#define COM_FORWARD_IHost_GETTER_USBDevices_TO_BASE(base) COM_FORWARD_IHost_GETTER_USBDevices_TO (base::)
-#define COM_FORWARD_IHost_GETTER_USBDeviceFilters_TO(smth) HRESULT STDMETHODCALLTYPE get_USBDeviceFilters (SAFEARRAY * * aUSBDeviceFilters) { return smth get_USBDeviceFilters (aUSBDeviceFilters); }
-#define COM_FORWARD_IHost_GETTER_USBDeviceFilters_TO_OBJ(obj) COM_FORWARD_IHost_GETTER_USBDeviceFilters_TO ((obj)->)
-#define COM_FORWARD_IHost_GETTER_USBDeviceFilters_TO_BASE(base) COM_FORWARD_IHost_GETTER_USBDeviceFilters_TO (base::)
-#define COM_FORWARD_IHost_GETTER_NetworkInterfaces_TO(smth) HRESULT STDMETHODCALLTYPE get_NetworkInterfaces (SAFEARRAY * * aNetworkInterfaces) { return smth get_NetworkInterfaces (aNetworkInterfaces); }
-#define COM_FORWARD_IHost_GETTER_NetworkInterfaces_TO_OBJ(obj) COM_FORWARD_IHost_GETTER_NetworkInterfaces_TO ((obj)->)
-#define COM_FORWARD_IHost_GETTER_NetworkInterfaces_TO_BASE(base) COM_FORWARD_IHost_GETTER_NetworkInterfaces_TO (base::)
-#define COM_FORWARD_IHost_GETTER_ProcessorCount_TO(smth) HRESULT STDMETHODCALLTYPE get_ProcessorCount (ULONG * aProcessorCount) { return smth get_ProcessorCount (aProcessorCount); }
-#define COM_FORWARD_IHost_GETTER_ProcessorCount_TO_OBJ(obj) COM_FORWARD_IHost_GETTER_ProcessorCount_TO ((obj)->)
-#define COM_FORWARD_IHost_GETTER_ProcessorCount_TO_BASE(base) COM_FORWARD_IHost_GETTER_ProcessorCount_TO (base::)
-#define COM_FORWARD_IHost_GETTER_ProcessorOnlineCount_TO(smth) HRESULT STDMETHODCALLTYPE get_ProcessorOnlineCount (ULONG * aProcessorOnlineCount) { return smth get_ProcessorOnlineCount (aProcessorOnlineCount); }
-#define COM_FORWARD_IHost_GETTER_ProcessorOnlineCount_TO_OBJ(obj) COM_FORWARD_IHost_GETTER_ProcessorOnlineCount_TO ((obj)->)
-#define COM_FORWARD_IHost_GETTER_ProcessorOnlineCount_TO_BASE(base) COM_FORWARD_IHost_GETTER_ProcessorOnlineCount_TO (base::)
-#define COM_FORWARD_IHost_GETTER_ProcessorCoreCount_TO(smth) HRESULT STDMETHODCALLTYPE get_ProcessorCoreCount (ULONG * aProcessorCoreCount) { return smth get_ProcessorCoreCount (aProcessorCoreCount); }
-#define COM_FORWARD_IHost_GETTER_ProcessorCoreCount_TO_OBJ(obj) COM_FORWARD_IHost_GETTER_ProcessorCoreCount_TO ((obj)->)
-#define COM_FORWARD_IHost_GETTER_ProcessorCoreCount_TO_BASE(base) COM_FORWARD_IHost_GETTER_ProcessorCoreCount_TO (base::)
-#define COM_FORWARD_IHost_GETTER_MemorySize_TO(smth) HRESULT STDMETHODCALLTYPE get_MemorySize (ULONG * aMemorySize) { return smth get_MemorySize (aMemorySize); }
-#define COM_FORWARD_IHost_GETTER_MemorySize_TO_OBJ(obj) COM_FORWARD_IHost_GETTER_MemorySize_TO ((obj)->)
-#define COM_FORWARD_IHost_GETTER_MemorySize_TO_BASE(base) COM_FORWARD_IHost_GETTER_MemorySize_TO (base::)
-#define COM_FORWARD_IHost_GETTER_MemoryAvailable_TO(smth) HRESULT STDMETHODCALLTYPE get_MemoryAvailable (ULONG * aMemoryAvailable) { return smth get_MemoryAvailable (aMemoryAvailable); }
-#define COM_FORWARD_IHost_GETTER_MemoryAvailable_TO_OBJ(obj) COM_FORWARD_IHost_GETTER_MemoryAvailable_TO ((obj)->)
-#define COM_FORWARD_IHost_GETTER_MemoryAvailable_TO_BASE(base) COM_FORWARD_IHost_GETTER_MemoryAvailable_TO (base::)
-#define COM_FORWARD_IHost_GETTER_OperatingSystem_TO(smth) HRESULT STDMETHODCALLTYPE get_OperatingSystem (BSTR * aOperatingSystem) { return smth get_OperatingSystem (aOperatingSystem); }
-#define COM_FORWARD_IHost_GETTER_OperatingSystem_TO_OBJ(obj) COM_FORWARD_IHost_GETTER_OperatingSystem_TO ((obj)->)
-#define COM_FORWARD_IHost_GETTER_OperatingSystem_TO_BASE(base) COM_FORWARD_IHost_GETTER_OperatingSystem_TO (base::)
-#define COM_FORWARD_IHost_GETTER_OSVersion_TO(smth) HRESULT STDMETHODCALLTYPE get_OSVersion (BSTR * aOSVersion) { return smth get_OSVersion (aOSVersion); }
-#define COM_FORWARD_IHost_GETTER_OSVersion_TO_OBJ(obj) COM_FORWARD_IHost_GETTER_OSVersion_TO ((obj)->)
-#define COM_FORWARD_IHost_GETTER_OSVersion_TO_BASE(base) COM_FORWARD_IHost_GETTER_OSVersion_TO (base::)
-#define COM_FORWARD_IHost_GETTER_UTCTime_TO(smth) HRESULT STDMETHODCALLTYPE get_UTCTime (LONG64 * aUTCTime) { return smth get_UTCTime (aUTCTime); }
-#define COM_FORWARD_IHost_GETTER_UTCTime_TO_OBJ(obj) COM_FORWARD_IHost_GETTER_UTCTime_TO ((obj)->)
-#define COM_FORWARD_IHost_GETTER_UTCTime_TO_BASE(base) COM_FORWARD_IHost_GETTER_UTCTime_TO (base::)
-#define COM_FORWARD_IHost_GETTER_Acceleration3DAvailable_TO(smth) HRESULT STDMETHODCALLTYPE get_Acceleration3DAvailable (BOOL * aAcceleration3DAvailable) { return smth get_Acceleration3DAvailable (aAcceleration3DAvailable); }
-#define COM_FORWARD_IHost_GETTER_Acceleration3DAvailable_TO_OBJ(obj) COM_FORWARD_IHost_GETTER_Acceleration3DAvailable_TO ((obj)->)
-#define COM_FORWARD_IHost_GETTER_Acceleration3DAvailable_TO_BASE(base) COM_FORWARD_IHost_GETTER_Acceleration3DAvailable_TO (base::)
-#define COM_FORWARD_IHost_GetProcessorSpeed_TO(smth) HRESULT STDMETHODCALLTYPE GetProcessorSpeed (ULONG aCpuId, ULONG * aSpeed) { return smth GetProcessorSpeed (aCpuId, aSpeed); }
-#define COM_FORWARD_IHost_GetProcessorSpeed_TO_OBJ(obj) COM_FORWARD_IHost_GetProcessorSpeed_TO ((obj)->)
-#define COM_FORWARD_IHost_GetProcessorSpeed_TO_BASE(base) COM_FORWARD_IHost_GetProcessorSpeed_TO (base::)
-#define COM_FORWARD_IHost_GetProcessorFeature_TO(smth) HRESULT STDMETHODCALLTYPE GetProcessorFeature (ProcessorFeature aFeature, BOOL * aSupported) { return smth GetProcessorFeature (aFeature, aSupported); }
-#define COM_FORWARD_IHost_GetProcessorFeature_TO_OBJ(obj) COM_FORWARD_IHost_GetProcessorFeature_TO ((obj)->)
-#define COM_FORWARD_IHost_GetProcessorFeature_TO_BASE(base) COM_FORWARD_IHost_GetProcessorFeature_TO (base::)
-#define COM_FORWARD_IHost_GetProcessorDescription_TO(smth) HRESULT STDMETHODCALLTYPE GetProcessorDescription (ULONG aCpuId, BSTR * aDescription) { return smth GetProcessorDescription (aCpuId, aDescription); }
-#define COM_FORWARD_IHost_GetProcessorDescription_TO_OBJ(obj) COM_FORWARD_IHost_GetProcessorDescription_TO ((obj)->)
-#define COM_FORWARD_IHost_GetProcessorDescription_TO_BASE(base) COM_FORWARD_IHost_GetProcessorDescription_TO (base::)
-#define COM_FORWARD_IHost_GetProcessorCPUIDLeaf_TO(smth) HRESULT STDMETHODCALLTYPE GetProcessorCPUIDLeaf (ULONG aCpuId, ULONG aLeaf, ULONG aSubLeaf, ULONG * aValEax, ULONG * aValEbx, ULONG * aValEcx, ULONG * aValEdx) { return smth GetProcessorCPUIDLeaf (aCpuId, aLeaf, aSubLeaf, aValEax, aValEbx, aValEcx, aValEdx); }
-#define COM_FORWARD_IHost_GetProcessorCPUIDLeaf_TO_OBJ(obj) COM_FORWARD_IHost_GetProcessorCPUIDLeaf_TO ((obj)->)
-#define COM_FORWARD_IHost_GetProcessorCPUIDLeaf_TO_BASE(base) COM_FORWARD_IHost_GetProcessorCPUIDLeaf_TO (base::)
-#define COM_FORWARD_IHost_CreateHostOnlyNetworkInterface_TO(smth) HRESULT STDMETHODCALLTYPE CreateHostOnlyNetworkInterface (IHostNetworkInterface * * aHostInterface, IProgress * * aProgress) { return smth CreateHostOnlyNetworkInterface (aHostInterface, aProgress); }
-#define COM_FORWARD_IHost_CreateHostOnlyNetworkInterface_TO_OBJ(obj) COM_FORWARD_IHost_CreateHostOnlyNetworkInterface_TO ((obj)->)
-#define COM_FORWARD_IHost_CreateHostOnlyNetworkInterface_TO_BASE(base) COM_FORWARD_IHost_CreateHostOnlyNetworkInterface_TO (base::)
-#define COM_FORWARD_IHost_RemoveHostOnlyNetworkInterface_TO(smth) HRESULT STDMETHODCALLTYPE RemoveHostOnlyNetworkInterface (BSTR aId, IProgress * * aProgress) { return smth RemoveHostOnlyNetworkInterface (aId, aProgress); }
-#define COM_FORWARD_IHost_RemoveHostOnlyNetworkInterface_TO_OBJ(obj) COM_FORWARD_IHost_RemoveHostOnlyNetworkInterface_TO ((obj)->)
-#define COM_FORWARD_IHost_RemoveHostOnlyNetworkInterface_TO_BASE(base) COM_FORWARD_IHost_RemoveHostOnlyNetworkInterface_TO (base::)
-#define COM_FORWARD_IHost_CreateUSBDeviceFilter_TO(smth) HRESULT STDMETHODCALLTYPE CreateUSBDeviceFilter (BSTR aName, IHostUSBDeviceFilter * * aFilter) { return smth CreateUSBDeviceFilter (aName, aFilter); }
-#define COM_FORWARD_IHost_CreateUSBDeviceFilter_TO_OBJ(obj) COM_FORWARD_IHost_CreateUSBDeviceFilter_TO ((obj)->)
-#define COM_FORWARD_IHost_CreateUSBDeviceFilter_TO_BASE(base) COM_FORWARD_IHost_CreateUSBDeviceFilter_TO (base::)
-#define COM_FORWARD_IHost_InsertUSBDeviceFilter_TO(smth) HRESULT STDMETHODCALLTYPE InsertUSBDeviceFilter (ULONG aPosition, IHostUSBDeviceFilter * aFilter) { return smth InsertUSBDeviceFilter (aPosition, aFilter); }
-#define COM_FORWARD_IHost_InsertUSBDeviceFilter_TO_OBJ(obj) COM_FORWARD_IHost_InsertUSBDeviceFilter_TO ((obj)->)
-#define COM_FORWARD_IHost_InsertUSBDeviceFilter_TO_BASE(base) COM_FORWARD_IHost_InsertUSBDeviceFilter_TO (base::)
-#define COM_FORWARD_IHost_RemoveUSBDeviceFilter_TO(smth) HRESULT STDMETHODCALLTYPE RemoveUSBDeviceFilter (ULONG aPosition) { return smth RemoveUSBDeviceFilter (aPosition); }
-#define COM_FORWARD_IHost_RemoveUSBDeviceFilter_TO_OBJ(obj) COM_FORWARD_IHost_RemoveUSBDeviceFilter_TO ((obj)->)
-#define COM_FORWARD_IHost_RemoveUSBDeviceFilter_TO_BASE(base) COM_FORWARD_IHost_RemoveUSBDeviceFilter_TO (base::)
-#define COM_FORWARD_IHost_FindHostDVDDrive_TO(smth) HRESULT STDMETHODCALLTYPE FindHostDVDDrive (BSTR aName, IMedium * * aDrive) { return smth FindHostDVDDrive (aName, aDrive); }
-#define COM_FORWARD_IHost_FindHostDVDDrive_TO_OBJ(obj) COM_FORWARD_IHost_FindHostDVDDrive_TO ((obj)->)
-#define COM_FORWARD_IHost_FindHostDVDDrive_TO_BASE(base) COM_FORWARD_IHost_FindHostDVDDrive_TO (base::)
-#define COM_FORWARD_IHost_FindHostFloppyDrive_TO(smth) HRESULT STDMETHODCALLTYPE FindHostFloppyDrive (BSTR aName, IMedium * * aDrive) { return smth FindHostFloppyDrive (aName, aDrive); }
-#define COM_FORWARD_IHost_FindHostFloppyDrive_TO_OBJ(obj) COM_FORWARD_IHost_FindHostFloppyDrive_TO ((obj)->)
-#define COM_FORWARD_IHost_FindHostFloppyDrive_TO_BASE(base) COM_FORWARD_IHost_FindHostFloppyDrive_TO (base::)
-#define COM_FORWARD_IHost_FindHostNetworkInterfaceByName_TO(smth) HRESULT STDMETHODCALLTYPE FindHostNetworkInterfaceByName (BSTR aName, IHostNetworkInterface * * aNetworkInterface) { return smth FindHostNetworkInterfaceByName (aName, aNetworkInterface); }
-#define COM_FORWARD_IHost_FindHostNetworkInterfaceByName_TO_OBJ(obj) COM_FORWARD_IHost_FindHostNetworkInterfaceByName_TO ((obj)->)
-#define COM_FORWARD_IHost_FindHostNetworkInterfaceByName_TO_BASE(base) COM_FORWARD_IHost_FindHostNetworkInterfaceByName_TO (base::)
-#define COM_FORWARD_IHost_FindHostNetworkInterfaceById_TO(smth) HRESULT STDMETHODCALLTYPE FindHostNetworkInterfaceById (BSTR aId, IHostNetworkInterface * * aNetworkInterface) { return smth FindHostNetworkInterfaceById (aId, aNetworkInterface); }
-#define COM_FORWARD_IHost_FindHostNetworkInterfaceById_TO_OBJ(obj) COM_FORWARD_IHost_FindHostNetworkInterfaceById_TO ((obj)->)
-#define COM_FORWARD_IHost_FindHostNetworkInterfaceById_TO_BASE(base) COM_FORWARD_IHost_FindHostNetworkInterfaceById_TO (base::)
-#define COM_FORWARD_IHost_FindHostNetworkInterfacesOfType_TO(smth) HRESULT STDMETHODCALLTYPE FindHostNetworkInterfacesOfType (HostNetworkInterfaceType aType, SAFEARRAY * * aNetworkInterfaces) { return smth FindHostNetworkInterfacesOfType (aType, aNetworkInterfaces); }
-#define COM_FORWARD_IHost_FindHostNetworkInterfacesOfType_TO_OBJ(obj) COM_FORWARD_IHost_FindHostNetworkInterfacesOfType_TO ((obj)->)
-#define COM_FORWARD_IHost_FindHostNetworkInterfacesOfType_TO_BASE(base) COM_FORWARD_IHost_FindHostNetworkInterfacesOfType_TO (base::)
-#define COM_FORWARD_IHost_FindUSBDeviceById_TO(smth) HRESULT STDMETHODCALLTYPE FindUSBDeviceById (BSTR aId, IHostUSBDevice * * aDevice) { return smth FindUSBDeviceById (aId, aDevice); }
-#define COM_FORWARD_IHost_FindUSBDeviceById_TO_OBJ(obj) COM_FORWARD_IHost_FindUSBDeviceById_TO ((obj)->)
-#define COM_FORWARD_IHost_FindUSBDeviceById_TO_BASE(base) COM_FORWARD_IHost_FindUSBDeviceById_TO (base::)
-#define COM_FORWARD_IHost_FindUSBDeviceByAddress_TO(smth) HRESULT STDMETHODCALLTYPE FindUSBDeviceByAddress (BSTR aName, IHostUSBDevice * * aDevice) { return smth FindUSBDeviceByAddress (aName, aDevice); }
-#define COM_FORWARD_IHost_FindUSBDeviceByAddress_TO_OBJ(obj) COM_FORWARD_IHost_FindUSBDeviceByAddress_TO ((obj)->)
-#define COM_FORWARD_IHost_FindUSBDeviceByAddress_TO_BASE(base) COM_FORWARD_IHost_FindUSBDeviceByAddress_TO (base::)
-#define COM_FORWARD_IHost_TO(smth) COM_FORWARD_IHost_GETTER_DVDDrives_TO (smth) COM_FORWARD_IHost_GETTER_FloppyDrives_TO (smth) COM_FORWARD_IHost_GETTER_USBDevices_TO (smth) COM_FORWARD_IHost_GETTER_USBDeviceFilters_TO (smth) COM_FORWARD_IHost_GETTER_NetworkInterfaces_TO (smth) COM_FORWARD_IHost_GETTER_ProcessorCount_TO (smth) COM_FORWARD_IHost_GETTER_ProcessorOnlineCount_TO (smth) COM_FORWARD_IHost_GETTER_ProcessorCoreCount_TO (smth) COM_FORWARD_IHost_GETTER_MemorySize_TO (smth) COM_FOR [...]
-#define COM_FORWARD_IHost_TO_OBJ(obj) COM_FORWARD_IHost_TO ((obj)->)
-#define COM_FORWARD_IHost_TO_BASE(base) COM_FORWARD_IHost_TO (base::)
-#define COM_FORWARD_ISystemProperties_GETTER_MinGuestRAM_TO(smth) HRESULT STDMETHODCALLTYPE get_MinGuestRAM (ULONG * aMinGuestRAM) { return smth get_MinGuestRAM (aMinGuestRAM); }
-#define COM_FORWARD_ISystemProperties_GETTER_MinGuestRAM_TO_OBJ(obj) COM_FORWARD_ISystemProperties_GETTER_MinGuestRAM_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_GETTER_MinGuestRAM_TO_BASE(base) COM_FORWARD_ISystemProperties_GETTER_MinGuestRAM_TO (base::)
-#define COM_FORWARD_ISystemProperties_GETTER_MaxGuestRAM_TO(smth) HRESULT STDMETHODCALLTYPE get_MaxGuestRAM (ULONG * aMaxGuestRAM) { return smth get_MaxGuestRAM (aMaxGuestRAM); }
-#define COM_FORWARD_ISystemProperties_GETTER_MaxGuestRAM_TO_OBJ(obj) COM_FORWARD_ISystemProperties_GETTER_MaxGuestRAM_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_GETTER_MaxGuestRAM_TO_BASE(base) COM_FORWARD_ISystemProperties_GETTER_MaxGuestRAM_TO (base::)
-#define COM_FORWARD_ISystemProperties_GETTER_MinGuestVRAM_TO(smth) HRESULT STDMETHODCALLTYPE get_MinGuestVRAM (ULONG * aMinGuestVRAM) { return smth get_MinGuestVRAM (aMinGuestVRAM); }
-#define COM_FORWARD_ISystemProperties_GETTER_MinGuestVRAM_TO_OBJ(obj) COM_FORWARD_ISystemProperties_GETTER_MinGuestVRAM_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_GETTER_MinGuestVRAM_TO_BASE(base) COM_FORWARD_ISystemProperties_GETTER_MinGuestVRAM_TO (base::)
-#define COM_FORWARD_ISystemProperties_GETTER_MaxGuestVRAM_TO(smth) HRESULT STDMETHODCALLTYPE get_MaxGuestVRAM (ULONG * aMaxGuestVRAM) { return smth get_MaxGuestVRAM (aMaxGuestVRAM); }
-#define COM_FORWARD_ISystemProperties_GETTER_MaxGuestVRAM_TO_OBJ(obj) COM_FORWARD_ISystemProperties_GETTER_MaxGuestVRAM_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_GETTER_MaxGuestVRAM_TO_BASE(base) COM_FORWARD_ISystemProperties_GETTER_MaxGuestVRAM_TO (base::)
-#define COM_FORWARD_ISystemProperties_GETTER_MinGuestCPUCount_TO(smth) HRESULT STDMETHODCALLTYPE get_MinGuestCPUCount (ULONG * aMinGuestCPUCount) { return smth get_MinGuestCPUCount (aMinGuestCPUCount); }
-#define COM_FORWARD_ISystemProperties_GETTER_MinGuestCPUCount_TO_OBJ(obj) COM_FORWARD_ISystemProperties_GETTER_MinGuestCPUCount_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_GETTER_MinGuestCPUCount_TO_BASE(base) COM_FORWARD_ISystemProperties_GETTER_MinGuestCPUCount_TO (base::)
-#define COM_FORWARD_ISystemProperties_GETTER_MaxGuestCPUCount_TO(smth) HRESULT STDMETHODCALLTYPE get_MaxGuestCPUCount (ULONG * aMaxGuestCPUCount) { return smth get_MaxGuestCPUCount (aMaxGuestCPUCount); }
-#define COM_FORWARD_ISystemProperties_GETTER_MaxGuestCPUCount_TO_OBJ(obj) COM_FORWARD_ISystemProperties_GETTER_MaxGuestCPUCount_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_GETTER_MaxGuestCPUCount_TO_BASE(base) COM_FORWARD_ISystemProperties_GETTER_MaxGuestCPUCount_TO (base::)
-#define COM_FORWARD_ISystemProperties_GETTER_MaxGuestMonitors_TO(smth) HRESULT STDMETHODCALLTYPE get_MaxGuestMonitors (ULONG * aMaxGuestMonitors) { return smth get_MaxGuestMonitors (aMaxGuestMonitors); }
-#define COM_FORWARD_ISystemProperties_GETTER_MaxGuestMonitors_TO_OBJ(obj) COM_FORWARD_ISystemProperties_GETTER_MaxGuestMonitors_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_GETTER_MaxGuestMonitors_TO_BASE(base) COM_FORWARD_ISystemProperties_GETTER_MaxGuestMonitors_TO (base::)
-#define COM_FORWARD_ISystemProperties_GETTER_MaxVDISize_TO(smth) HRESULT STDMETHODCALLTYPE get_MaxVDISize (ULONG64 * aMaxVDISize) { return smth get_MaxVDISize (aMaxVDISize); }
-#define COM_FORWARD_ISystemProperties_GETTER_MaxVDISize_TO_OBJ(obj) COM_FORWARD_ISystemProperties_GETTER_MaxVDISize_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_GETTER_MaxVDISize_TO_BASE(base) COM_FORWARD_ISystemProperties_GETTER_MaxVDISize_TO (base::)
-#define COM_FORWARD_ISystemProperties_GETTER_NetworkAdapterCount_TO(smth) HRESULT STDMETHODCALLTYPE get_NetworkAdapterCount (ULONG * aNetworkAdapterCount) { return smth get_NetworkAdapterCount (aNetworkAdapterCount); }
-#define COM_FORWARD_ISystemProperties_GETTER_NetworkAdapterCount_TO_OBJ(obj) COM_FORWARD_ISystemProperties_GETTER_NetworkAdapterCount_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_GETTER_NetworkAdapterCount_TO_BASE(base) COM_FORWARD_ISystemProperties_GETTER_NetworkAdapterCount_TO (base::)
-#define COM_FORWARD_ISystemProperties_GETTER_SerialPortCount_TO(smth) HRESULT STDMETHODCALLTYPE get_SerialPortCount (ULONG * aSerialPortCount) { return smth get_SerialPortCount (aSerialPortCount); }
-#define COM_FORWARD_ISystemProperties_GETTER_SerialPortCount_TO_OBJ(obj) COM_FORWARD_ISystemProperties_GETTER_SerialPortCount_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_GETTER_SerialPortCount_TO_BASE(base) COM_FORWARD_ISystemProperties_GETTER_SerialPortCount_TO (base::)
-#define COM_FORWARD_ISystemProperties_GETTER_ParallelPortCount_TO(smth) HRESULT STDMETHODCALLTYPE get_ParallelPortCount (ULONG * aParallelPortCount) { return smth get_ParallelPortCount (aParallelPortCount); }
-#define COM_FORWARD_ISystemProperties_GETTER_ParallelPortCount_TO_OBJ(obj) COM_FORWARD_ISystemProperties_GETTER_ParallelPortCount_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_GETTER_ParallelPortCount_TO_BASE(base) COM_FORWARD_ISystemProperties_GETTER_ParallelPortCount_TO (base::)
-#define COM_FORWARD_ISystemProperties_GETTER_MaxBootPosition_TO(smth) HRESULT STDMETHODCALLTYPE get_MaxBootPosition (ULONG * aMaxBootPosition) { return smth get_MaxBootPosition (aMaxBootPosition); }
-#define COM_FORWARD_ISystemProperties_GETTER_MaxBootPosition_TO_OBJ(obj) COM_FORWARD_ISystemProperties_GETTER_MaxBootPosition_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_GETTER_MaxBootPosition_TO_BASE(base) COM_FORWARD_ISystemProperties_GETTER_MaxBootPosition_TO (base::)
-#define COM_FORWARD_ISystemProperties_GETTER_DefaultMachineFolder_TO(smth) HRESULT STDMETHODCALLTYPE get_DefaultMachineFolder (BSTR * aDefaultMachineFolder) { return smth get_DefaultMachineFolder (aDefaultMachineFolder); }
-#define COM_FORWARD_ISystemProperties_GETTER_DefaultMachineFolder_TO_OBJ(obj) COM_FORWARD_ISystemProperties_GETTER_DefaultMachineFolder_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_GETTER_DefaultMachineFolder_TO_BASE(base) COM_FORWARD_ISystemProperties_GETTER_DefaultMachineFolder_TO (base::)
-#define COM_FORWARD_ISystemProperties_SETTER_DefaultMachineFolder_TO(smth) HRESULT STDMETHODCALLTYPE put_DefaultMachineFolder (BSTR aDefaultMachineFolder) { return smth put_DefaultMachineFolder (aDefaultMachineFolder); }
-#define COM_FORWARD_ISystemProperties_SETTER_DefaultMachineFolder_TO_OBJ(obj) COM_FORWARD_ISystemProperties_SETTER_DefaultMachineFolder_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_SETTER_DefaultMachineFolder_TO_BASE(base) COM_FORWARD_ISystemProperties_SETTER_DefaultMachineFolder_TO (base::)
-#define COM_FORWARD_ISystemProperties_GETTER_DefaultHardDiskFolder_TO(smth) HRESULT STDMETHODCALLTYPE get_DefaultHardDiskFolder (BSTR * aDefaultHardDiskFolder) { return smth get_DefaultHardDiskFolder (aDefaultHardDiskFolder); }
-#define COM_FORWARD_ISystemProperties_GETTER_DefaultHardDiskFolder_TO_OBJ(obj) COM_FORWARD_ISystemProperties_GETTER_DefaultHardDiskFolder_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_GETTER_DefaultHardDiskFolder_TO_BASE(base) COM_FORWARD_ISystemProperties_GETTER_DefaultHardDiskFolder_TO (base::)
-#define COM_FORWARD_ISystemProperties_SETTER_DefaultHardDiskFolder_TO(smth) HRESULT STDMETHODCALLTYPE put_DefaultHardDiskFolder (BSTR aDefaultHardDiskFolder) { return smth put_DefaultHardDiskFolder (aDefaultHardDiskFolder); }
-#define COM_FORWARD_ISystemProperties_SETTER_DefaultHardDiskFolder_TO_OBJ(obj) COM_FORWARD_ISystemProperties_SETTER_DefaultHardDiskFolder_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_SETTER_DefaultHardDiskFolder_TO_BASE(base) COM_FORWARD_ISystemProperties_SETTER_DefaultHardDiskFolder_TO (base::)
-#define COM_FORWARD_ISystemProperties_GETTER_MediumFormats_TO(smth) HRESULT STDMETHODCALLTYPE get_MediumFormats (SAFEARRAY * * aMediumFormats) { return smth get_MediumFormats (aMediumFormats); }
-#define COM_FORWARD_ISystemProperties_GETTER_MediumFormats_TO_OBJ(obj) COM_FORWARD_ISystemProperties_GETTER_MediumFormats_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_GETTER_MediumFormats_TO_BASE(base) COM_FORWARD_ISystemProperties_GETTER_MediumFormats_TO (base::)
-#define COM_FORWARD_ISystemProperties_GETTER_DefaultHardDiskFormat_TO(smth) HRESULT STDMETHODCALLTYPE get_DefaultHardDiskFormat (BSTR * aDefaultHardDiskFormat) { return smth get_DefaultHardDiskFormat (aDefaultHardDiskFormat); }
-#define COM_FORWARD_ISystemProperties_GETTER_DefaultHardDiskFormat_TO_OBJ(obj) COM_FORWARD_ISystemProperties_GETTER_DefaultHardDiskFormat_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_GETTER_DefaultHardDiskFormat_TO_BASE(base) COM_FORWARD_ISystemProperties_GETTER_DefaultHardDiskFormat_TO (base::)
-#define COM_FORWARD_ISystemProperties_SETTER_DefaultHardDiskFormat_TO(smth) HRESULT STDMETHODCALLTYPE put_DefaultHardDiskFormat (BSTR aDefaultHardDiskFormat) { return smth put_DefaultHardDiskFormat (aDefaultHardDiskFormat); }
-#define COM_FORWARD_ISystemProperties_SETTER_DefaultHardDiskFormat_TO_OBJ(obj) COM_FORWARD_ISystemProperties_SETTER_DefaultHardDiskFormat_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_SETTER_DefaultHardDiskFormat_TO_BASE(base) COM_FORWARD_ISystemProperties_SETTER_DefaultHardDiskFormat_TO (base::)
-#define COM_FORWARD_ISystemProperties_GETTER_FreeDiskSpaceWarning_TO(smth) HRESULT STDMETHODCALLTYPE get_FreeDiskSpaceWarning (ULONG64 * aFreeDiskSpaceWarning) { return smth get_FreeDiskSpaceWarning (aFreeDiskSpaceWarning); }
-#define COM_FORWARD_ISystemProperties_GETTER_FreeDiskSpaceWarning_TO_OBJ(obj) COM_FORWARD_ISystemProperties_GETTER_FreeDiskSpaceWarning_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_GETTER_FreeDiskSpaceWarning_TO_BASE(base) COM_FORWARD_ISystemProperties_GETTER_FreeDiskSpaceWarning_TO (base::)
-#define COM_FORWARD_ISystemProperties_SETTER_FreeDiskSpaceWarning_TO(smth) HRESULT STDMETHODCALLTYPE put_FreeDiskSpaceWarning (ULONG64 aFreeDiskSpaceWarning) { return smth put_FreeDiskSpaceWarning (aFreeDiskSpaceWarning); }
-#define COM_FORWARD_ISystemProperties_SETTER_FreeDiskSpaceWarning_TO_OBJ(obj) COM_FORWARD_ISystemProperties_SETTER_FreeDiskSpaceWarning_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_SETTER_FreeDiskSpaceWarning_TO_BASE(base) COM_FORWARD_ISystemProperties_SETTER_FreeDiskSpaceWarning_TO (base::)
-#define COM_FORWARD_ISystemProperties_GETTER_FreeDiskSpacePercentWarning_TO(smth) HRESULT STDMETHODCALLTYPE get_FreeDiskSpacePercentWarning (ULONG * aFreeDiskSpacePercentWarning) { return smth get_FreeDiskSpacePercentWarning (aFreeDiskSpacePercentWarning); }
-#define COM_FORWARD_ISystemProperties_GETTER_FreeDiskSpacePercentWarning_TO_OBJ(obj) COM_FORWARD_ISystemProperties_GETTER_FreeDiskSpacePercentWarning_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_GETTER_FreeDiskSpacePercentWarning_TO_BASE(base) COM_FORWARD_ISystemProperties_GETTER_FreeDiskSpacePercentWarning_TO (base::)
-#define COM_FORWARD_ISystemProperties_SETTER_FreeDiskSpacePercentWarning_TO(smth) HRESULT STDMETHODCALLTYPE put_FreeDiskSpacePercentWarning (ULONG aFreeDiskSpacePercentWarning) { return smth put_FreeDiskSpacePercentWarning (aFreeDiskSpacePercentWarning); }
-#define COM_FORWARD_ISystemProperties_SETTER_FreeDiskSpacePercentWarning_TO_OBJ(obj) COM_FORWARD_ISystemProperties_SETTER_FreeDiskSpacePercentWarning_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_SETTER_FreeDiskSpacePercentWarning_TO_BASE(base) COM_FORWARD_ISystemProperties_SETTER_FreeDiskSpacePercentWarning_TO (base::)
-#define COM_FORWARD_ISystemProperties_GETTER_FreeDiskSpaceError_TO(smth) HRESULT STDMETHODCALLTYPE get_FreeDiskSpaceError (ULONG64 * aFreeDiskSpaceError) { return smth get_FreeDiskSpaceError (aFreeDiskSpaceError); }
-#define COM_FORWARD_ISystemProperties_GETTER_FreeDiskSpaceError_TO_OBJ(obj) COM_FORWARD_ISystemProperties_GETTER_FreeDiskSpaceError_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_GETTER_FreeDiskSpaceError_TO_BASE(base) COM_FORWARD_ISystemProperties_GETTER_FreeDiskSpaceError_TO (base::)
-#define COM_FORWARD_ISystemProperties_SETTER_FreeDiskSpaceError_TO(smth) HRESULT STDMETHODCALLTYPE put_FreeDiskSpaceError (ULONG64 aFreeDiskSpaceError) { return smth put_FreeDiskSpaceError (aFreeDiskSpaceError); }
-#define COM_FORWARD_ISystemProperties_SETTER_FreeDiskSpaceError_TO_OBJ(obj) COM_FORWARD_ISystemProperties_SETTER_FreeDiskSpaceError_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_SETTER_FreeDiskSpaceError_TO_BASE(base) COM_FORWARD_ISystemProperties_SETTER_FreeDiskSpaceError_TO (base::)
-#define COM_FORWARD_ISystemProperties_GETTER_FreeDiskSpacePercentError_TO(smth) HRESULT STDMETHODCALLTYPE get_FreeDiskSpacePercentError (ULONG * aFreeDiskSpacePercentError) { return smth get_FreeDiskSpacePercentError (aFreeDiskSpacePercentError); }
-#define COM_FORWARD_ISystemProperties_GETTER_FreeDiskSpacePercentError_TO_OBJ(obj) COM_FORWARD_ISystemProperties_GETTER_FreeDiskSpacePercentError_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_GETTER_FreeDiskSpacePercentError_TO_BASE(base) COM_FORWARD_ISystemProperties_GETTER_FreeDiskSpacePercentError_TO (base::)
-#define COM_FORWARD_ISystemProperties_SETTER_FreeDiskSpacePercentError_TO(smth) HRESULT STDMETHODCALLTYPE put_FreeDiskSpacePercentError (ULONG aFreeDiskSpacePercentError) { return smth put_FreeDiskSpacePercentError (aFreeDiskSpacePercentError); }
-#define COM_FORWARD_ISystemProperties_SETTER_FreeDiskSpacePercentError_TO_OBJ(obj) COM_FORWARD_ISystemProperties_SETTER_FreeDiskSpacePercentError_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_SETTER_FreeDiskSpacePercentError_TO_BASE(base) COM_FORWARD_ISystemProperties_SETTER_FreeDiskSpacePercentError_TO (base::)
-#define COM_FORWARD_ISystemProperties_GETTER_RemoteDisplayAuthLibrary_TO(smth) HRESULT STDMETHODCALLTYPE get_RemoteDisplayAuthLibrary (BSTR * aRemoteDisplayAuthLibrary) { return smth get_RemoteDisplayAuthLibrary (aRemoteDisplayAuthLibrary); }
-#define COM_FORWARD_ISystemProperties_GETTER_RemoteDisplayAuthLibrary_TO_OBJ(obj) COM_FORWARD_ISystemProperties_GETTER_RemoteDisplayAuthLibrary_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_GETTER_RemoteDisplayAuthLibrary_TO_BASE(base) COM_FORWARD_ISystemProperties_GETTER_RemoteDisplayAuthLibrary_TO (base::)
-#define COM_FORWARD_ISystemProperties_SETTER_RemoteDisplayAuthLibrary_TO(smth) HRESULT STDMETHODCALLTYPE put_RemoteDisplayAuthLibrary (BSTR aRemoteDisplayAuthLibrary) { return smth put_RemoteDisplayAuthLibrary (aRemoteDisplayAuthLibrary); }
-#define COM_FORWARD_ISystemProperties_SETTER_RemoteDisplayAuthLibrary_TO_OBJ(obj) COM_FORWARD_ISystemProperties_SETTER_RemoteDisplayAuthLibrary_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_SETTER_RemoteDisplayAuthLibrary_TO_BASE(base) COM_FORWARD_ISystemProperties_SETTER_RemoteDisplayAuthLibrary_TO (base::)
-#define COM_FORWARD_ISystemProperties_GETTER_WebServiceAuthLibrary_TO(smth) HRESULT STDMETHODCALLTYPE get_WebServiceAuthLibrary (BSTR * aWebServiceAuthLibrary) { return smth get_WebServiceAuthLibrary (aWebServiceAuthLibrary); }
-#define COM_FORWARD_ISystemProperties_GETTER_WebServiceAuthLibrary_TO_OBJ(obj) COM_FORWARD_ISystemProperties_GETTER_WebServiceAuthLibrary_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_GETTER_WebServiceAuthLibrary_TO_BASE(base) COM_FORWARD_ISystemProperties_GETTER_WebServiceAuthLibrary_TO (base::)
-#define COM_FORWARD_ISystemProperties_SETTER_WebServiceAuthLibrary_TO(smth) HRESULT STDMETHODCALLTYPE put_WebServiceAuthLibrary (BSTR aWebServiceAuthLibrary) { return smth put_WebServiceAuthLibrary (aWebServiceAuthLibrary); }
-#define COM_FORWARD_ISystemProperties_SETTER_WebServiceAuthLibrary_TO_OBJ(obj) COM_FORWARD_ISystemProperties_SETTER_WebServiceAuthLibrary_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_SETTER_WebServiceAuthLibrary_TO_BASE(base) COM_FORWARD_ISystemProperties_SETTER_WebServiceAuthLibrary_TO (base::)
-#define COM_FORWARD_ISystemProperties_GETTER_LogHistoryCount_TO(smth) HRESULT STDMETHODCALLTYPE get_LogHistoryCount (ULONG * aLogHistoryCount) { return smth get_LogHistoryCount (aLogHistoryCount); }
-#define COM_FORWARD_ISystemProperties_GETTER_LogHistoryCount_TO_OBJ(obj) COM_FORWARD_ISystemProperties_GETTER_LogHistoryCount_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_GETTER_LogHistoryCount_TO_BASE(base) COM_FORWARD_ISystemProperties_GETTER_LogHistoryCount_TO (base::)
-#define COM_FORWARD_ISystemProperties_SETTER_LogHistoryCount_TO(smth) HRESULT STDMETHODCALLTYPE put_LogHistoryCount (ULONG aLogHistoryCount) { return smth put_LogHistoryCount (aLogHistoryCount); }
-#define COM_FORWARD_ISystemProperties_SETTER_LogHistoryCount_TO_OBJ(obj) COM_FORWARD_ISystemProperties_SETTER_LogHistoryCount_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_SETTER_LogHistoryCount_TO_BASE(base) COM_FORWARD_ISystemProperties_SETTER_LogHistoryCount_TO (base::)
-#define COM_FORWARD_ISystemProperties_GETTER_DefaultAudioDriver_TO(smth) HRESULT STDMETHODCALLTYPE get_DefaultAudioDriver (AudioDriverType * aDefaultAudioDriver) { return smth get_DefaultAudioDriver (aDefaultAudioDriver); }
-#define COM_FORWARD_ISystemProperties_GETTER_DefaultAudioDriver_TO_OBJ(obj) COM_FORWARD_ISystemProperties_GETTER_DefaultAudioDriver_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_GETTER_DefaultAudioDriver_TO_BASE(base) COM_FORWARD_ISystemProperties_GETTER_DefaultAudioDriver_TO (base::)
-#define COM_FORWARD_ISystemProperties_GetMaxDevicesPerPortForStorageBus_TO(smth) HRESULT STDMETHODCALLTYPE GetMaxDevicesPerPortForStorageBus (StorageBus aBus, ULONG * aMaxDevicesPerPort) { return smth GetMaxDevicesPerPortForStorageBus (aBus, aMaxDevicesPerPort); }
-#define COM_FORWARD_ISystemProperties_GetMaxDevicesPerPortForStorageBus_TO_OBJ(obj) COM_FORWARD_ISystemProperties_GetMaxDevicesPerPortForStorageBus_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_GetMaxDevicesPerPortForStorageBus_TO_BASE(base) COM_FORWARD_ISystemProperties_GetMaxDevicesPerPortForStorageBus_TO (base::)
-#define COM_FORWARD_ISystemProperties_GetMinPortCountForStorageBus_TO(smth) HRESULT STDMETHODCALLTYPE GetMinPortCountForStorageBus (StorageBus aBus, ULONG * aMinPortCount) { return smth GetMinPortCountForStorageBus (aBus, aMinPortCount); }
-#define COM_FORWARD_ISystemProperties_GetMinPortCountForStorageBus_TO_OBJ(obj) COM_FORWARD_ISystemProperties_GetMinPortCountForStorageBus_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_GetMinPortCountForStorageBus_TO_BASE(base) COM_FORWARD_ISystemProperties_GetMinPortCountForStorageBus_TO (base::)
-#define COM_FORWARD_ISystemProperties_GetMaxPortCountForStorageBus_TO(smth) HRESULT STDMETHODCALLTYPE GetMaxPortCountForStorageBus (StorageBus aBus, ULONG * aMaxPortCount) { return smth GetMaxPortCountForStorageBus (aBus, aMaxPortCount); }
-#define COM_FORWARD_ISystemProperties_GetMaxPortCountForStorageBus_TO_OBJ(obj) COM_FORWARD_ISystemProperties_GetMaxPortCountForStorageBus_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_GetMaxPortCountForStorageBus_TO_BASE(base) COM_FORWARD_ISystemProperties_GetMaxPortCountForStorageBus_TO (base::)
-#define COM_FORWARD_ISystemProperties_GetMaxInstancesOfStorageBus_TO(smth) HRESULT STDMETHODCALLTYPE GetMaxInstancesOfStorageBus (StorageBus aBus, ULONG * aMaxInstances) { return smth GetMaxInstancesOfStorageBus (aBus, aMaxInstances); }
-#define COM_FORWARD_ISystemProperties_GetMaxInstancesOfStorageBus_TO_OBJ(obj) COM_FORWARD_ISystemProperties_GetMaxInstancesOfStorageBus_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_GetMaxInstancesOfStorageBus_TO_BASE(base) COM_FORWARD_ISystemProperties_GetMaxInstancesOfStorageBus_TO (base::)
-#define COM_FORWARD_ISystemProperties_GetDeviceTypesForStorageBus_TO(smth) HRESULT STDMETHODCALLTYPE GetDeviceTypesForStorageBus (StorageBus aBus, SAFEARRAY * * aDeviceTypes) { return smth GetDeviceTypesForStorageBus (aBus, aDeviceTypes); }
-#define COM_FORWARD_ISystemProperties_GetDeviceTypesForStorageBus_TO_OBJ(obj) COM_FORWARD_ISystemProperties_GetDeviceTypesForStorageBus_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_GetDeviceTypesForStorageBus_TO_BASE(base) COM_FORWARD_ISystemProperties_GetDeviceTypesForStorageBus_TO (base::)
-#define COM_FORWARD_ISystemProperties_TO(smth) COM_FORWARD_ISystemProperties_GETTER_MinGuestRAM_TO (smth) COM_FORWARD_ISystemProperties_GETTER_MaxGuestRAM_TO (smth) COM_FORWARD_ISystemProperties_GETTER_MinGuestVRAM_TO (smth) COM_FORWARD_ISystemProperties_GETTER_MaxGuestVRAM_TO (smth) COM_FORWARD_ISystemProperties_GETTER_MinGuestCPUCount_TO (smth) COM_FORWARD_ISystemProperties_GETTER_MaxGuestCPUCount_TO (smth) COM_FORWARD_ISystemProperties_GETTER_MaxGuestMonitors_TO (smth) COM_FORWARD_ISy [...]
-#define COM_FORWARD_ISystemProperties_TO_OBJ(obj) COM_FORWARD_ISystemProperties_TO ((obj)->)
-#define COM_FORWARD_ISystemProperties_TO_BASE(base) COM_FORWARD_ISystemProperties_TO (base::)
-#define COM_FORWARD_IGuestOSType_GETTER_FamilyId_TO(smth) HRESULT STDMETHODCALLTYPE get_FamilyId (BSTR * aFamilyId) { return smth get_FamilyId (aFamilyId); }
-#define COM_FORWARD_IGuestOSType_GETTER_FamilyId_TO_OBJ(obj) COM_FORWARD_IGuestOSType_GETTER_FamilyId_TO ((obj)->)
-#define COM_FORWARD_IGuestOSType_GETTER_FamilyId_TO_BASE(base) COM_FORWARD_IGuestOSType_GETTER_FamilyId_TO (base::)
-#define COM_FORWARD_IGuestOSType_GETTER_FamilyDescription_TO(smth) HRESULT STDMETHODCALLTYPE get_FamilyDescription (BSTR * aFamilyDescription) { return smth get_FamilyDescription (aFamilyDescription); }
-#define COM_FORWARD_IGuestOSType_GETTER_FamilyDescription_TO_OBJ(obj) COM_FORWARD_IGuestOSType_GETTER_FamilyDescription_TO ((obj)->)
-#define COM_FORWARD_IGuestOSType_GETTER_FamilyDescription_TO_BASE(base) COM_FORWARD_IGuestOSType_GETTER_FamilyDescription_TO (base::)
-#define COM_FORWARD_IGuestOSType_GETTER_Id_TO(smth) HRESULT STDMETHODCALLTYPE get_Id (BSTR * aId) { return smth get_Id (aId); }
-#define COM_FORWARD_IGuestOSType_GETTER_Id_TO_OBJ(obj) COM_FORWARD_IGuestOSType_GETTER_Id_TO ((obj)->)
-#define COM_FORWARD_IGuestOSType_GETTER_Id_TO_BASE(base) COM_FORWARD_IGuestOSType_GETTER_Id_TO (base::)
-#define COM_FORWARD_IGuestOSType_GETTER_Description_TO(smth) HRESULT STDMETHODCALLTYPE get_Description (BSTR * aDescription) { return smth get_Description (aDescription); }
-#define COM_FORWARD_IGuestOSType_GETTER_Description_TO_OBJ(obj) COM_FORWARD_IGuestOSType_GETTER_Description_TO ((obj)->)
-#define COM_FORWARD_IGuestOSType_GETTER_Description_TO_BASE(base) COM_FORWARD_IGuestOSType_GETTER_Description_TO (base::)
-#define COM_FORWARD_IGuestOSType_GETTER_Is64Bit_TO(smth) HRESULT STDMETHODCALLTYPE get_Is64Bit (BOOL * aIs64Bit) { return smth get_Is64Bit (aIs64Bit); }
-#define COM_FORWARD_IGuestOSType_GETTER_Is64Bit_TO_OBJ(obj) COM_FORWARD_IGuestOSType_GETTER_Is64Bit_TO ((obj)->)
-#define COM_FORWARD_IGuestOSType_GETTER_Is64Bit_TO_BASE(base) COM_FORWARD_IGuestOSType_GETTER_Is64Bit_TO (base::)
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedIOAPIC_TO(smth) HRESULT STDMETHODCALLTYPE get_RecommendedIOAPIC (BOOL * aRecommendedIOAPIC) { return smth get_RecommendedIOAPIC (aRecommendedIOAPIC); }
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedIOAPIC_TO_OBJ(obj) COM_FORWARD_IGuestOSType_GETTER_RecommendedIOAPIC_TO ((obj)->)
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedIOAPIC_TO_BASE(base) COM_FORWARD_IGuestOSType_GETTER_RecommendedIOAPIC_TO (base::)
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedVirtEx_TO(smth) HRESULT STDMETHODCALLTYPE get_RecommendedVirtEx (BOOL * aRecommendedVirtEx) { return smth get_RecommendedVirtEx (aRecommendedVirtEx); }
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedVirtEx_TO_OBJ(obj) COM_FORWARD_IGuestOSType_GETTER_RecommendedVirtEx_TO ((obj)->)
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedVirtEx_TO_BASE(base) COM_FORWARD_IGuestOSType_GETTER_RecommendedVirtEx_TO (base::)
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedRAM_TO(smth) HRESULT STDMETHODCALLTYPE get_RecommendedRAM (ULONG * aRecommendedRAM) { return smth get_RecommendedRAM (aRecommendedRAM); }
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedRAM_TO_OBJ(obj) COM_FORWARD_IGuestOSType_GETTER_RecommendedRAM_TO ((obj)->)
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedRAM_TO_BASE(base) COM_FORWARD_IGuestOSType_GETTER_RecommendedRAM_TO (base::)
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedVRAM_TO(smth) HRESULT STDMETHODCALLTYPE get_RecommendedVRAM (ULONG * aRecommendedVRAM) { return smth get_RecommendedVRAM (aRecommendedVRAM); }
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedVRAM_TO_OBJ(obj) COM_FORWARD_IGuestOSType_GETTER_RecommendedVRAM_TO ((obj)->)
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedVRAM_TO_BASE(base) COM_FORWARD_IGuestOSType_GETTER_RecommendedVRAM_TO (base::)
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedHDD_TO(smth) HRESULT STDMETHODCALLTYPE get_RecommendedHDD (ULONG * aRecommendedHDD) { return smth get_RecommendedHDD (aRecommendedHDD); }
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedHDD_TO_OBJ(obj) COM_FORWARD_IGuestOSType_GETTER_RecommendedHDD_TO ((obj)->)
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedHDD_TO_BASE(base) COM_FORWARD_IGuestOSType_GETTER_RecommendedHDD_TO (base::)
-#define COM_FORWARD_IGuestOSType_GETTER_AdapterType_TO(smth) HRESULT STDMETHODCALLTYPE get_AdapterType (NetworkAdapterType * aAdapterType) { return smth get_AdapterType (aAdapterType); }
-#define COM_FORWARD_IGuestOSType_GETTER_AdapterType_TO_OBJ(obj) COM_FORWARD_IGuestOSType_GETTER_AdapterType_TO ((obj)->)
-#define COM_FORWARD_IGuestOSType_GETTER_AdapterType_TO_BASE(base) COM_FORWARD_IGuestOSType_GETTER_AdapterType_TO (base::)
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedPae_TO(smth) HRESULT STDMETHODCALLTYPE get_RecommendedPae (BOOL * aRecommendedPae) { return smth get_RecommendedPae (aRecommendedPae); }
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedPae_TO_OBJ(obj) COM_FORWARD_IGuestOSType_GETTER_RecommendedPae_TO ((obj)->)
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedPae_TO_BASE(base) COM_FORWARD_IGuestOSType_GETTER_RecommendedPae_TO (base::)
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedDvdStorageController_TO(smth) HRESULT STDMETHODCALLTYPE get_RecommendedDvdStorageController (StorageControllerType * aRecommendedDvdStorageController) { return smth get_RecommendedDvdStorageController (aRecommendedDvdStorageController); }
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedDvdStorageController_TO_OBJ(obj) COM_FORWARD_IGuestOSType_GETTER_RecommendedDvdStorageController_TO ((obj)->)
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedDvdStorageController_TO_BASE(base) COM_FORWARD_IGuestOSType_GETTER_RecommendedDvdStorageController_TO (base::)
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedDvdStorageBus_TO(smth) HRESULT STDMETHODCALLTYPE get_RecommendedDvdStorageBus (StorageBus * aRecommendedDvdStorageBus) { return smth get_RecommendedDvdStorageBus (aRecommendedDvdStorageBus); }
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedDvdStorageBus_TO_OBJ(obj) COM_FORWARD_IGuestOSType_GETTER_RecommendedDvdStorageBus_TO ((obj)->)
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedDvdStorageBus_TO_BASE(base) COM_FORWARD_IGuestOSType_GETTER_RecommendedDvdStorageBus_TO (base::)
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedHdStorageController_TO(smth) HRESULT STDMETHODCALLTYPE get_RecommendedHdStorageController (StorageControllerType * aRecommendedHdStorageController) { return smth get_RecommendedHdStorageController (aRecommendedHdStorageController); }
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedHdStorageController_TO_OBJ(obj) COM_FORWARD_IGuestOSType_GETTER_RecommendedHdStorageController_TO ((obj)->)
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedHdStorageController_TO_BASE(base) COM_FORWARD_IGuestOSType_GETTER_RecommendedHdStorageController_TO (base::)
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedHdStorageBus_TO(smth) HRESULT STDMETHODCALLTYPE get_RecommendedHdStorageBus (StorageBus * aRecommendedHdStorageBus) { return smth get_RecommendedHdStorageBus (aRecommendedHdStorageBus); }
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedHdStorageBus_TO_OBJ(obj) COM_FORWARD_IGuestOSType_GETTER_RecommendedHdStorageBus_TO ((obj)->)
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedHdStorageBus_TO_BASE(base) COM_FORWARD_IGuestOSType_GETTER_RecommendedHdStorageBus_TO (base::)
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedFirmware_TO(smth) HRESULT STDMETHODCALLTYPE get_RecommendedFirmware (FirmwareType * aRecommendedFirmware) { return smth get_RecommendedFirmware (aRecommendedFirmware); }
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedFirmware_TO_OBJ(obj) COM_FORWARD_IGuestOSType_GETTER_RecommendedFirmware_TO ((obj)->)
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedFirmware_TO_BASE(base) COM_FORWARD_IGuestOSType_GETTER_RecommendedFirmware_TO (base::)
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedUsbHid_TO(smth) HRESULT STDMETHODCALLTYPE get_RecommendedUsbHid (BOOL * aRecommendedUsbHid) { return smth get_RecommendedUsbHid (aRecommendedUsbHid); }
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedUsbHid_TO_OBJ(obj) COM_FORWARD_IGuestOSType_GETTER_RecommendedUsbHid_TO ((obj)->)
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedUsbHid_TO_BASE(base) COM_FORWARD_IGuestOSType_GETTER_RecommendedUsbHid_TO (base::)
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedHpet_TO(smth) HRESULT STDMETHODCALLTYPE get_RecommendedHpet (BOOL * aRecommendedHpet) { return smth get_RecommendedHpet (aRecommendedHpet); }
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedHpet_TO_OBJ(obj) COM_FORWARD_IGuestOSType_GETTER_RecommendedHpet_TO ((obj)->)
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedHpet_TO_BASE(base) COM_FORWARD_IGuestOSType_GETTER_RecommendedHpet_TO (base::)
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedUsbTablet_TO(smth) HRESULT STDMETHODCALLTYPE get_RecommendedUsbTablet (BOOL * aRecommendedUsbTablet) { return smth get_RecommendedUsbTablet (aRecommendedUsbTablet); }
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedUsbTablet_TO_OBJ(obj) COM_FORWARD_IGuestOSType_GETTER_RecommendedUsbTablet_TO ((obj)->)
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedUsbTablet_TO_BASE(base) COM_FORWARD_IGuestOSType_GETTER_RecommendedUsbTablet_TO (base::)
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedRtcUseUtc_TO(smth) HRESULT STDMETHODCALLTYPE get_RecommendedRtcUseUtc (BOOL * aRecommendedRtcUseUtc) { return smth get_RecommendedRtcUseUtc (aRecommendedRtcUseUtc); }
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedRtcUseUtc_TO_OBJ(obj) COM_FORWARD_IGuestOSType_GETTER_RecommendedRtcUseUtc_TO ((obj)->)
-#define COM_FORWARD_IGuestOSType_GETTER_RecommendedRtcUseUtc_TO_BASE(base) COM_FORWARD_IGuestOSType_GETTER_RecommendedRtcUseUtc_TO (base::)
-#define COM_FORWARD_IGuestOSType_TO(smth) COM_FORWARD_IGuestOSType_GETTER_FamilyId_TO (smth) COM_FORWARD_IGuestOSType_GETTER_FamilyDescription_TO (smth) COM_FORWARD_IGuestOSType_GETTER_Id_TO (smth) COM_FORWARD_IGuestOSType_GETTER_Description_TO (smth) COM_FORWARD_IGuestOSType_GETTER_Is64Bit_TO (smth) COM_FORWARD_IGuestOSType_GETTER_RecommendedIOAPIC_TO (smth) COM_FORWARD_IGuestOSType_GETTER_RecommendedVirtEx_TO (smth) COM_FORWARD_IGuestOSType_GETTER_RecommendedRAM_TO (smth) COM_FORWARD_I [...]
-#define COM_FORWARD_IGuestOSType_TO_OBJ(obj) COM_FORWARD_IGuestOSType_TO ((obj)->)
-#define COM_FORWARD_IGuestOSType_TO_BASE(base) COM_FORWARD_IGuestOSType_TO (base::)
-#define COM_FORWARD_IGuest_GETTER_OSTypeId_TO(smth) HRESULT STDMETHODCALLTYPE get_OSTypeId (BSTR * aOSTypeId) { return smth get_OSTypeId (aOSTypeId); }
-#define COM_FORWARD_IGuest_GETTER_OSTypeId_TO_OBJ(obj) COM_FORWARD_IGuest_GETTER_OSTypeId_TO ((obj)->)
-#define COM_FORWARD_IGuest_GETTER_OSTypeId_TO_BASE(base) COM_FORWARD_IGuest_GETTER_OSTypeId_TO (base::)
-#define COM_FORWARD_IGuest_GETTER_AdditionsActive_TO(smth) HRESULT STDMETHODCALLTYPE get_AdditionsActive (BOOL * aAdditionsActive) { return smth get_AdditionsActive (aAdditionsActive); }
-#define COM_FORWARD_IGuest_GETTER_AdditionsActive_TO_OBJ(obj) COM_FORWARD_IGuest_GETTER_AdditionsActive_TO ((obj)->)
-#define COM_FORWARD_IGuest_GETTER_AdditionsActive_TO_BASE(base) COM_FORWARD_IGuest_GETTER_AdditionsActive_TO (base::)
-#define COM_FORWARD_IGuest_GETTER_AdditionsVersion_TO(smth) HRESULT STDMETHODCALLTYPE get_AdditionsVersion (BSTR * aAdditionsVersion) { return smth get_AdditionsVersion (aAdditionsVersion); }
-#define COM_FORWARD_IGuest_GETTER_AdditionsVersion_TO_OBJ(obj) COM_FORWARD_IGuest_GETTER_AdditionsVersion_TO ((obj)->)
-#define COM_FORWARD_IGuest_GETTER_AdditionsVersion_TO_BASE(base) COM_FORWARD_IGuest_GETTER_AdditionsVersion_TO (base::)
-#define COM_FORWARD_IGuest_GETTER_SupportsSeamless_TO(smth) HRESULT STDMETHODCALLTYPE get_SupportsSeamless (BOOL * aSupportsSeamless) { return smth get_SupportsSeamless (aSupportsSeamless); }
-#define COM_FORWARD_IGuest_GETTER_SupportsSeamless_TO_OBJ(obj) COM_FORWARD_IGuest_GETTER_SupportsSeamless_TO ((obj)->)
-#define COM_FORWARD_IGuest_GETTER_SupportsSeamless_TO_BASE(base) COM_FORWARD_IGuest_GETTER_SupportsSeamless_TO (base::)
-#define COM_FORWARD_IGuest_GETTER_SupportsGraphics_TO(smth) HRESULT STDMETHODCALLTYPE get_SupportsGraphics (BOOL * aSupportsGraphics) { return smth get_SupportsGraphics (aSupportsGraphics); }
-#define COM_FORWARD_IGuest_GETTER_SupportsGraphics_TO_OBJ(obj) COM_FORWARD_IGuest_GETTER_SupportsGraphics_TO ((obj)->)
-#define COM_FORWARD_IGuest_GETTER_SupportsGraphics_TO_BASE(base) COM_FORWARD_IGuest_GETTER_SupportsGraphics_TO (base::)
-#define COM_FORWARD_IGuest_GETTER_MemoryBalloonSize_TO(smth) HRESULT STDMETHODCALLTYPE get_MemoryBalloonSize (ULONG * aMemoryBalloonSize) { return smth get_MemoryBalloonSize (aMemoryBalloonSize); }
-#define COM_FORWARD_IGuest_GETTER_MemoryBalloonSize_TO_OBJ(obj) COM_FORWARD_IGuest_GETTER_MemoryBalloonSize_TO ((obj)->)
-#define COM_FORWARD_IGuest_GETTER_MemoryBalloonSize_TO_BASE(base) COM_FORWARD_IGuest_GETTER_MemoryBalloonSize_TO (base::)
-#define COM_FORWARD_IGuest_SETTER_MemoryBalloonSize_TO(smth) HRESULT STDMETHODCALLTYPE put_MemoryBalloonSize (ULONG aMemoryBalloonSize) { return smth put_MemoryBalloonSize (aMemoryBalloonSize); }
-#define COM_FORWARD_IGuest_SETTER_MemoryBalloonSize_TO_OBJ(obj) COM_FORWARD_IGuest_SETTER_MemoryBalloonSize_TO ((obj)->)
-#define COM_FORWARD_IGuest_SETTER_MemoryBalloonSize_TO_BASE(base) COM_FORWARD_IGuest_SETTER_MemoryBalloonSize_TO (base::)
-#define COM_FORWARD_IGuest_GETTER_PageFusionEnabled_TO(smth) HRESULT STDMETHODCALLTYPE get_PageFusionEnabled (BOOL * aPageFusionEnabled) { return smth get_PageFusionEnabled (aPageFusionEnabled); }
-#define COM_FORWARD_IGuest_GETTER_PageFusionEnabled_TO_OBJ(obj) COM_FORWARD_IGuest_GETTER_PageFusionEnabled_TO ((obj)->)
-#define COM_FORWARD_IGuest_GETTER_PageFusionEnabled_TO_BASE(base) COM_FORWARD_IGuest_GETTER_PageFusionEnabled_TO (base::)
-#define COM_FORWARD_IGuest_SETTER_PageFusionEnabled_TO(smth) HRESULT STDMETHODCALLTYPE put_PageFusionEnabled (BOOL aPageFusionEnabled) { return smth put_PageFusionEnabled (aPageFusionEnabled); }
-#define COM_FORWARD_IGuest_SETTER_PageFusionEnabled_TO_OBJ(obj) COM_FORWARD_IGuest_SETTER_PageFusionEnabled_TO ((obj)->)
-#define COM_FORWARD_IGuest_SETTER_PageFusionEnabled_TO_BASE(base) COM_FORWARD_IGuest_SETTER_PageFusionEnabled_TO (base::)
-#define COM_FORWARD_IGuest_GETTER_StatisticsUpdateInterval_TO(smth) HRESULT STDMETHODCALLTYPE get_StatisticsUpdateInterval (ULONG * aStatisticsUpdateInterval) { return smth get_StatisticsUpdateInterval (aStatisticsUpdateInterval); }
-#define COM_FORWARD_IGuest_GETTER_StatisticsUpdateInterval_TO_OBJ(obj) COM_FORWARD_IGuest_GETTER_StatisticsUpdateInterval_TO ((obj)->)
-#define COM_FORWARD_IGuest_GETTER_StatisticsUpdateInterval_TO_BASE(base) COM_FORWARD_IGuest_GETTER_StatisticsUpdateInterval_TO (base::)
-#define COM_FORWARD_IGuest_SETTER_StatisticsUpdateInterval_TO(smth) HRESULT STDMETHODCALLTYPE put_StatisticsUpdateInterval (ULONG aStatisticsUpdateInterval) { return smth put_StatisticsUpdateInterval (aStatisticsUpdateInterval); }
-#define COM_FORWARD_IGuest_SETTER_StatisticsUpdateInterval_TO_OBJ(obj) COM_FORWARD_IGuest_SETTER_StatisticsUpdateInterval_TO ((obj)->)
-#define COM_FORWARD_IGuest_SETTER_StatisticsUpdateInterval_TO_BASE(base) COM_FORWARD_IGuest_SETTER_StatisticsUpdateInterval_TO (base::)
-#define COM_FORWARD_IGuest_InternalGetStatistics_TO(smth) HRESULT STDMETHODCALLTYPE InternalGetStatistics (ULONG * aCpuUser, ULONG * aCpuKernel, ULONG * aCpuIdle, ULONG * aMemTotal, ULONG * aMemFree, ULONG * aMemBalloon, ULONG * aMemShared, ULONG * aMemCache, ULONG * aPagedTotal, ULONG * aMemAllocTotal, ULONG * aMemFreeTotal, ULONG * aMemBalloonTotal, ULONG * aMemSharedTotal) { return smth InternalGetStatistics (aCpuUser, aCpuKernel, aCpuIdle, aMemTotal, aMemFree, aMemBalloon, aMemShared [...]
-#define COM_FORWARD_IGuest_InternalGetStatistics_TO_OBJ(obj) COM_FORWARD_IGuest_InternalGetStatistics_TO ((obj)->)
-#define COM_FORWARD_IGuest_InternalGetStatistics_TO_BASE(base) COM_FORWARD_IGuest_InternalGetStatistics_TO (base::)
-#define COM_FORWARD_IGuest_SetCredentials_TO(smth) HRESULT STDMETHODCALLTYPE SetCredentials (BSTR aUserName, BSTR aPassword, BSTR aDomain, BOOL aAllowInteractiveLogon) { return smth SetCredentials (aUserName, aPassword, aDomain, aAllowInteractiveLogon); }
-#define COM_FORWARD_IGuest_SetCredentials_TO_OBJ(obj) COM_FORWARD_IGuest_SetCredentials_TO ((obj)->)
-#define COM_FORWARD_IGuest_SetCredentials_TO_BASE(base) COM_FORWARD_IGuest_SetCredentials_TO (base::)
-#define COM_FORWARD_IGuest_ExecuteProcess_TO(smth) HRESULT STDMETHODCALLTYPE ExecuteProcess (BSTR aExecName, ULONG aFlags, SAFEARRAY * * aArguments, SAFEARRAY * * aEnvironment, BSTR aUserName, BSTR aPassword, ULONG aTimeoutMS, ULONG * aPid, IProgress * * aProgress) { return smth ExecuteProcess (aExecName, aFlags, aArguments, aEnvironment, aUserName, aPassword, aTimeoutMS, aPid, aProgress); }
-#define COM_FORWARD_IGuest_ExecuteProcess_TO_OBJ(obj) COM_FORWARD_IGuest_ExecuteProcess_TO ((obj)->)
-#define COM_FORWARD_IGuest_ExecuteProcess_TO_BASE(base) COM_FORWARD_IGuest_ExecuteProcess_TO (base::)
-#define COM_FORWARD_IGuest_GetProcessOutput_TO(smth) HRESULT STDMETHODCALLTYPE GetProcessOutput (ULONG aPid, ULONG aFlags, ULONG aTimeoutMS, ULONG64 aSize, SAFEARRAY * * aData) { return smth GetProcessOutput (aPid, aFlags, aTimeoutMS, aSize, aData); }
-#define COM_FORWARD_IGuest_GetProcessOutput_TO_OBJ(obj) COM_FORWARD_IGuest_GetProcessOutput_TO ((obj)->)
-#define COM_FORWARD_IGuest_GetProcessOutput_TO_BASE(base) COM_FORWARD_IGuest_GetProcessOutput_TO (base::)
-#define COM_FORWARD_IGuest_GetProcessStatus_TO(smth) HRESULT STDMETHODCALLTYPE GetProcessStatus (ULONG aPid, ULONG * aExitcode, ULONG * aFlags, ULONG * aReason) { return smth GetProcessStatus (aPid, aExitcode, aFlags, aReason); }
-#define COM_FORWARD_IGuest_GetProcessStatus_TO_OBJ(obj) COM_FORWARD_IGuest_GetProcessStatus_TO ((obj)->)
-#define COM_FORWARD_IGuest_GetProcessStatus_TO_BASE(base) COM_FORWARD_IGuest_GetProcessStatus_TO (base::)
-#define COM_FORWARD_IGuest_TO(smth) COM_FORWARD_IGuest_GETTER_OSTypeId_TO (smth) COM_FORWARD_IGuest_GETTER_AdditionsActive_TO (smth) COM_FORWARD_IGuest_GETTER_AdditionsVersion_TO (smth) COM_FORWARD_IGuest_GETTER_SupportsSeamless_TO (smth) COM_FORWARD_IGuest_GETTER_SupportsGraphics_TO (smth) COM_FORWARD_IGuest_GETTER_MemoryBalloonSize_TO (smth) COM_FORWARD_IGuest_SETTER_MemoryBalloonSize_TO (smth) COM_FORWARD_IGuest_GETTER_PageFusionEnabled_TO (smth) COM_FORWARD_IGuest_SETTER_PageFusionEn [...]
-#define COM_FORWARD_IGuest_TO_OBJ(obj) COM_FORWARD_IGuest_TO ((obj)->)
-#define COM_FORWARD_IGuest_TO_BASE(base) COM_FORWARD_IGuest_TO (base::)
-#define COM_FORWARD_IProgress_GETTER_Id_TO(smth) HRESULT STDMETHODCALLTYPE get_Id (BSTR * aId) { return smth get_Id (aId); }
-#define COM_FORWARD_IProgress_GETTER_Id_TO_OBJ(obj) COM_FORWARD_IProgress_GETTER_Id_TO ((obj)->)
-#define COM_FORWARD_IProgress_GETTER_Id_TO_BASE(base) COM_FORWARD_IProgress_GETTER_Id_TO (base::)
-#define COM_FORWARD_IProgress_GETTER_Description_TO(smth) HRESULT STDMETHODCALLTYPE get_Description (BSTR * aDescription) { return smth get_Description (aDescription); }
-#define COM_FORWARD_IProgress_GETTER_Description_TO_OBJ(obj) COM_FORWARD_IProgress_GETTER_Description_TO ((obj)->)
-#define COM_FORWARD_IProgress_GETTER_Description_TO_BASE(base) COM_FORWARD_IProgress_GETTER_Description_TO (base::)
-#define COM_FORWARD_IProgress_GETTER_Initiator_TO(smth) HRESULT STDMETHODCALLTYPE get_Initiator (IUnknown * * aInitiator) { return smth get_Initiator (aInitiator); }
-#define COM_FORWARD_IProgress_GETTER_Initiator_TO_OBJ(obj) COM_FORWARD_IProgress_GETTER_Initiator_TO ((obj)->)
-#define COM_FORWARD_IProgress_GETTER_Initiator_TO_BASE(base) COM_FORWARD_IProgress_GETTER_Initiator_TO (base::)
-#define COM_FORWARD_IProgress_GETTER_Cancelable_TO(smth) HRESULT STDMETHODCALLTYPE get_Cancelable (BOOL * aCancelable) { return smth get_Cancelable (aCancelable); }
-#define COM_FORWARD_IProgress_GETTER_Cancelable_TO_OBJ(obj) COM_FORWARD_IProgress_GETTER_Cancelable_TO ((obj)->)
-#define COM_FORWARD_IProgress_GETTER_Cancelable_TO_BASE(base) COM_FORWARD_IProgress_GETTER_Cancelable_TO (base::)
-#define COM_FORWARD_IProgress_GETTER_Percent_TO(smth) HRESULT STDMETHODCALLTYPE get_Percent (ULONG * aPercent) { return smth get_Percent (aPercent); }
-#define COM_FORWARD_IProgress_GETTER_Percent_TO_OBJ(obj) COM_FORWARD_IProgress_GETTER_Percent_TO ((obj)->)
-#define COM_FORWARD_IProgress_GETTER_Percent_TO_BASE(base) COM_FORWARD_IProgress_GETTER_Percent_TO (base::)
-#define COM_FORWARD_IProgress_GETTER_TimeRemaining_TO(smth) HRESULT STDMETHODCALLTYPE get_TimeRemaining (LONG * aTimeRemaining) { return smth get_TimeRemaining (aTimeRemaining); }
-#define COM_FORWARD_IProgress_GETTER_TimeRemaining_TO_OBJ(obj) COM_FORWARD_IProgress_GETTER_TimeRemaining_TO ((obj)->)
-#define COM_FORWARD_IProgress_GETTER_TimeRemaining_TO_BASE(base) COM_FORWARD_IProgress_GETTER_TimeRemaining_TO (base::)
-#define COM_FORWARD_IProgress_GETTER_Completed_TO(smth) HRESULT STDMETHODCALLTYPE get_Completed (BOOL * aCompleted) { return smth get_Completed (aCompleted); }
-#define COM_FORWARD_IProgress_GETTER_Completed_TO_OBJ(obj) COM_FORWARD_IProgress_GETTER_Completed_TO ((obj)->)
-#define COM_FORWARD_IProgress_GETTER_Completed_TO_BASE(base) COM_FORWARD_IProgress_GETTER_Completed_TO (base::)
-#define COM_FORWARD_IProgress_GETTER_Canceled_TO(smth) HRESULT STDMETHODCALLTYPE get_Canceled (BOOL * aCanceled) { return smth get_Canceled (aCanceled); }
-#define COM_FORWARD_IProgress_GETTER_Canceled_TO_OBJ(obj) COM_FORWARD_IProgress_GETTER_Canceled_TO ((obj)->)
-#define COM_FORWARD_IProgress_GETTER_Canceled_TO_BASE(base) COM_FORWARD_IProgress_GETTER_Canceled_TO (base::)
-#define COM_FORWARD_IProgress_GETTER_ResultCode_TO(smth) HRESULT STDMETHODCALLTYPE get_ResultCode (LONG * aResultCode) { return smth get_ResultCode (aResultCode); }
-#define COM_FORWARD_IProgress_GETTER_ResultCode_TO_OBJ(obj) COM_FORWARD_IProgress_GETTER_ResultCode_TO ((obj)->)
-#define COM_FORWARD_IProgress_GETTER_ResultCode_TO_BASE(base) COM_FORWARD_IProgress_GETTER_ResultCode_TO (base::)
-#define COM_FORWARD_IProgress_GETTER_ErrorInfo_TO(smth) HRESULT STDMETHODCALLTYPE get_ErrorInfo (IVirtualBoxErrorInfo * * aErrorInfo) { return smth get_ErrorInfo (aErrorInfo); }
-#define COM_FORWARD_IProgress_GETTER_ErrorInfo_TO_OBJ(obj) COM_FORWARD_IProgress_GETTER_ErrorInfo_TO ((obj)->)
-#define COM_FORWARD_IProgress_GETTER_ErrorInfo_TO_BASE(base) COM_FORWARD_IProgress_GETTER_ErrorInfo_TO (base::)
-#define COM_FORWARD_IProgress_GETTER_OperationCount_TO(smth) HRESULT STDMETHODCALLTYPE get_OperationCount (ULONG * aOperationCount) { return smth get_OperationCount (aOperationCount); }
-#define COM_FORWARD_IProgress_GETTER_OperationCount_TO_OBJ(obj) COM_FORWARD_IProgress_GETTER_OperationCount_TO ((obj)->)
-#define COM_FORWARD_IProgress_GETTER_OperationCount_TO_BASE(base) COM_FORWARD_IProgress_GETTER_OperationCount_TO (base::)
-#define COM_FORWARD_IProgress_GETTER_Operation_TO(smth) HRESULT STDMETHODCALLTYPE get_Operation (ULONG * aOperation) { return smth get_Operation (aOperation); }
-#define COM_FORWARD_IProgress_GETTER_Operation_TO_OBJ(obj) COM_FORWARD_IProgress_GETTER_Operation_TO ((obj)->)
-#define COM_FORWARD_IProgress_GETTER_Operation_TO_BASE(base) COM_FORWARD_IProgress_GETTER_Operation_TO (base::)
-#define COM_FORWARD_IProgress_GETTER_OperationDescription_TO(smth) HRESULT STDMETHODCALLTYPE get_OperationDescription (BSTR * aOperationDescription) { return smth get_OperationDescription (aOperationDescription); }
-#define COM_FORWARD_IProgress_GETTER_OperationDescription_TO_OBJ(obj) COM_FORWARD_IProgress_GETTER_OperationDescription_TO ((obj)->)
-#define COM_FORWARD_IProgress_GETTER_OperationDescription_TO_BASE(base) COM_FORWARD_IProgress_GETTER_OperationDescription_TO (base::)
-#define COM_FORWARD_IProgress_GETTER_OperationPercent_TO(smth) HRESULT STDMETHODCALLTYPE get_OperationPercent (ULONG * aOperationPercent) { return smth get_OperationPercent (aOperationPercent); }
-#define COM_FORWARD_IProgress_GETTER_OperationPercent_TO_OBJ(obj) COM_FORWARD_IProgress_GETTER_OperationPercent_TO ((obj)->)
-#define COM_FORWARD_IProgress_GETTER_OperationPercent_TO_BASE(base) COM_FORWARD_IProgress_GETTER_OperationPercent_TO (base::)
-#define COM_FORWARD_IProgress_GETTER_Timeout_TO(smth) HRESULT STDMETHODCALLTYPE get_Timeout (ULONG * aTimeout) { return smth get_Timeout (aTimeout); }
-#define COM_FORWARD_IProgress_GETTER_Timeout_TO_OBJ(obj) COM_FORWARD_IProgress_GETTER_Timeout_TO ((obj)->)
-#define COM_FORWARD_IProgress_GETTER_Timeout_TO_BASE(base) COM_FORWARD_IProgress_GETTER_Timeout_TO (base::)
-#define COM_FORWARD_IProgress_SETTER_Timeout_TO(smth) HRESULT STDMETHODCALLTYPE put_Timeout (ULONG aTimeout) { return smth put_Timeout (aTimeout); }
-#define COM_FORWARD_IProgress_SETTER_Timeout_TO_OBJ(obj) COM_FORWARD_IProgress_SETTER_Timeout_TO ((obj)->)
-#define COM_FORWARD_IProgress_SETTER_Timeout_TO_BASE(base) COM_FORWARD_IProgress_SETTER_Timeout_TO (base::)
-#define COM_FORWARD_IProgress_SetCurrentOperationProgress_TO(smth) HRESULT STDMETHODCALLTYPE SetCurrentOperationProgress (ULONG aPercent) { return smth SetCurrentOperationProgress (aPercent); }
-#define COM_FORWARD_IProgress_SetCurrentOperationProgress_TO_OBJ(obj) COM_FORWARD_IProgress_SetCurrentOperationProgress_TO ((obj)->)
-#define COM_FORWARD_IProgress_SetCurrentOperationProgress_TO_BASE(base) COM_FORWARD_IProgress_SetCurrentOperationProgress_TO (base::)
-#define COM_FORWARD_IProgress_SetNextOperation_TO(smth) HRESULT STDMETHODCALLTYPE SetNextOperation (BSTR aNextOperationDescription, ULONG aNextOperationsWeight) { return smth SetNextOperation (aNextOperationDescription, aNextOperationsWeight); }
-#define COM_FORWARD_IProgress_SetNextOperation_TO_OBJ(obj) COM_FORWARD_IProgress_SetNextOperation_TO ((obj)->)
-#define COM_FORWARD_IProgress_SetNextOperation_TO_BASE(base) COM_FORWARD_IProgress_SetNextOperation_TO (base::)
-#define COM_FORWARD_IProgress_WaitForCompletion_TO(smth) HRESULT STDMETHODCALLTYPE WaitForCompletion (LONG aTimeout) { return smth WaitForCompletion (aTimeout); }
-#define COM_FORWARD_IProgress_WaitForCompletion_TO_OBJ(obj) COM_FORWARD_IProgress_WaitForCompletion_TO ((obj)->)
-#define COM_FORWARD_IProgress_WaitForCompletion_TO_BASE(base) COM_FORWARD_IProgress_WaitForCompletion_TO (base::)
-#define COM_FORWARD_IProgress_WaitForOperationCompletion_TO(smth) HRESULT STDMETHODCALLTYPE WaitForOperationCompletion (ULONG aOperation, LONG aTimeout) { return smth WaitForOperationCompletion (aOperation, aTimeout); }
-#define COM_FORWARD_IProgress_WaitForOperationCompletion_TO_OBJ(obj) COM_FORWARD_IProgress_WaitForOperationCompletion_TO ((obj)->)
-#define COM_FORWARD_IProgress_WaitForOperationCompletion_TO_BASE(base) COM_FORWARD_IProgress_WaitForOperationCompletion_TO (base::)
-#define COM_FORWARD_IProgress_Cancel_TO(smth) HRESULT STDMETHODCALLTYPE Cancel() { return smth Cancel(); }
-#define COM_FORWARD_IProgress_Cancel_TO_OBJ(obj) COM_FORWARD_IProgress_Cancel_TO ((obj)->)
-#define COM_FORWARD_IProgress_Cancel_TO_BASE(base) COM_FORWARD_IProgress_Cancel_TO (base::)
-#define COM_FORWARD_IProgress_TO(smth) COM_FORWARD_IProgress_GETTER_Id_TO (smth) COM_FORWARD_IProgress_GETTER_Description_TO (smth) COM_FORWARD_IProgress_GETTER_Initiator_TO (smth) COM_FORWARD_IProgress_GETTER_Cancelable_TO (smth) COM_FORWARD_IProgress_GETTER_Percent_TO (smth) COM_FORWARD_IProgress_GETTER_TimeRemaining_TO (smth) COM_FORWARD_IProgress_GETTER_Completed_TO (smth) COM_FORWARD_IProgress_GETTER_Canceled_TO (smth) COM_FORWARD_IProgress_GETTER_ResultCode_TO (smth) COM_FORWARD_IP [...]
-#define COM_FORWARD_IProgress_TO_OBJ(obj) COM_FORWARD_IProgress_TO ((obj)->)
-#define COM_FORWARD_IProgress_TO_BASE(base) COM_FORWARD_IProgress_TO (base::)
-#define COM_FORWARD_ISnapshot_GETTER_Id_TO(smth) HRESULT STDMETHODCALLTYPE get_Id (BSTR * aId) { return smth get_Id (aId); }
-#define COM_FORWARD_ISnapshot_GETTER_Id_TO_OBJ(obj) COM_FORWARD_ISnapshot_GETTER_Id_TO ((obj)->)
-#define COM_FORWARD_ISnapshot_GETTER_Id_TO_BASE(base) COM_FORWARD_ISnapshot_GETTER_Id_TO (base::)
-#define COM_FORWARD_ISnapshot_GETTER_Name_TO(smth) HRESULT STDMETHODCALLTYPE get_Name (BSTR * aName) { return smth get_Name (aName); }
-#define COM_FORWARD_ISnapshot_GETTER_Name_TO_OBJ(obj) COM_FORWARD_ISnapshot_GETTER_Name_TO ((obj)->)
-#define COM_FORWARD_ISnapshot_GETTER_Name_TO_BASE(base) COM_FORWARD_ISnapshot_GETTER_Name_TO (base::)
-#define COM_FORWARD_ISnapshot_SETTER_Name_TO(smth) HRESULT STDMETHODCALLTYPE put_Name (BSTR aName) { return smth put_Name (aName); }
-#define COM_FORWARD_ISnapshot_SETTER_Name_TO_OBJ(obj) COM_FORWARD_ISnapshot_SETTER_Name_TO ((obj)->)
-#define COM_FORWARD_ISnapshot_SETTER_Name_TO_BASE(base) COM_FORWARD_ISnapshot_SETTER_Name_TO (base::)
-#define COM_FORWARD_ISnapshot_GETTER_Description_TO(smth) HRESULT STDMETHODCALLTYPE get_Description (BSTR * aDescription) { return smth get_Description (aDescription); }
-#define COM_FORWARD_ISnapshot_GETTER_Description_TO_OBJ(obj) COM_FORWARD_ISnapshot_GETTER_Description_TO ((obj)->)
-#define COM_FORWARD_ISnapshot_GETTER_Description_TO_BASE(base) COM_FORWARD_ISnapshot_GETTER_Description_TO (base::)
-#define COM_FORWARD_ISnapshot_SETTER_Description_TO(smth) HRESULT STDMETHODCALLTYPE put_Description (BSTR aDescription) { return smth put_Description (aDescription); }
-#define COM_FORWARD_ISnapshot_SETTER_Description_TO_OBJ(obj) COM_FORWARD_ISnapshot_SETTER_Description_TO ((obj)->)
-#define COM_FORWARD_ISnapshot_SETTER_Description_TO_BASE(base) COM_FORWARD_ISnapshot_SETTER_Description_TO (base::)
-#define COM_FORWARD_ISnapshot_GETTER_TimeStamp_TO(smth) HRESULT STDMETHODCALLTYPE get_TimeStamp (LONG64 * aTimeStamp) { return smth get_TimeStamp (aTimeStamp); }
-#define COM_FORWARD_ISnapshot_GETTER_TimeStamp_TO_OBJ(obj) COM_FORWARD_ISnapshot_GETTER_TimeStamp_TO ((obj)->)
-#define COM_FORWARD_ISnapshot_GETTER_TimeStamp_TO_BASE(base) COM_FORWARD_ISnapshot_GETTER_TimeStamp_TO (base::)
-#define COM_FORWARD_ISnapshot_GETTER_Online_TO(smth) HRESULT STDMETHODCALLTYPE get_Online (BOOL * aOnline) { return smth get_Online (aOnline); }
-#define COM_FORWARD_ISnapshot_GETTER_Online_TO_OBJ(obj) COM_FORWARD_ISnapshot_GETTER_Online_TO ((obj)->)
-#define COM_FORWARD_ISnapshot_GETTER_Online_TO_BASE(base) COM_FORWARD_ISnapshot_GETTER_Online_TO (base::)
-#define COM_FORWARD_ISnapshot_GETTER_Machine_TO(smth) HRESULT STDMETHODCALLTYPE get_Machine (IMachine * * aMachine) { return smth get_Machine (aMachine); }
-#define COM_FORWARD_ISnapshot_GETTER_Machine_TO_OBJ(obj) COM_FORWARD_ISnapshot_GETTER_Machine_TO ((obj)->)
-#define COM_FORWARD_ISnapshot_GETTER_Machine_TO_BASE(base) COM_FORWARD_ISnapshot_GETTER_Machine_TO (base::)
-#define COM_FORWARD_ISnapshot_GETTER_Parent_TO(smth) HRESULT STDMETHODCALLTYPE get_Parent (ISnapshot * * aParent) { return smth get_Parent (aParent); }
-#define COM_FORWARD_ISnapshot_GETTER_Parent_TO_OBJ(obj) COM_FORWARD_ISnapshot_GETTER_Parent_TO ((obj)->)
-#define COM_FORWARD_ISnapshot_GETTER_Parent_TO_BASE(base) COM_FORWARD_ISnapshot_GETTER_Parent_TO (base::)
-#define COM_FORWARD_ISnapshot_GETTER_Children_TO(smth) HRESULT STDMETHODCALLTYPE get_Children (SAFEARRAY * * aChildren) { return smth get_Children (aChildren); }
-#define COM_FORWARD_ISnapshot_GETTER_Children_TO_OBJ(obj) COM_FORWARD_ISnapshot_GETTER_Children_TO ((obj)->)
-#define COM_FORWARD_ISnapshot_GETTER_Children_TO_BASE(base) COM_FORWARD_ISnapshot_GETTER_Children_TO (base::)
-#define COM_FORWARD_ISnapshot_TO(smth) COM_FORWARD_ISnapshot_GETTER_Id_TO (smth) COM_FORWARD_ISnapshot_GETTER_Name_TO (smth) COM_FORWARD_ISnapshot_SETTER_Name_TO (smth) COM_FORWARD_ISnapshot_GETTER_Description_TO (smth) COM_FORWARD_ISnapshot_SETTER_Description_TO (smth) COM_FORWARD_ISnapshot_GETTER_TimeStamp_TO (smth) COM_FORWARD_ISnapshot_GETTER_Online_TO (smth) COM_FORWARD_ISnapshot_GETTER_Machine_TO (smth) COM_FORWARD_ISnapshot_GETTER_Parent_TO (smth) COM_FORWARD_ISnapshot_GETTER_Chil [...]
-#define COM_FORWARD_ISnapshot_TO_OBJ(obj) COM_FORWARD_ISnapshot_TO ((obj)->)
-#define COM_FORWARD_ISnapshot_TO_BASE(base) COM_FORWARD_ISnapshot_TO (base::)
-#define COM_FORWARD_IMediumAttachment_GETTER_Medium_TO(smth) HRESULT STDMETHODCALLTYPE get_Medium (IMedium * * aMedium) { return smth get_Medium (aMedium); }
-#define COM_FORWARD_IMediumAttachment_GETTER_Medium_TO_OBJ(obj) COM_FORWARD_IMediumAttachment_GETTER_Medium_TO ((obj)->)
-#define COM_FORWARD_IMediumAttachment_GETTER_Medium_TO_BASE(base) COM_FORWARD_IMediumAttachment_GETTER_Medium_TO (base::)
-#define COM_FORWARD_IMediumAttachment_GETTER_Controller_TO(smth) HRESULT STDMETHODCALLTYPE get_Controller (BSTR * aController) { return smth get_Controller (aController); }
-#define COM_FORWARD_IMediumAttachment_GETTER_Controller_TO_OBJ(obj) COM_FORWARD_IMediumAttachment_GETTER_Controller_TO ((obj)->)
-#define COM_FORWARD_IMediumAttachment_GETTER_Controller_TO_BASE(base) COM_FORWARD_IMediumAttachment_GETTER_Controller_TO (base::)
-#define COM_FORWARD_IMediumAttachment_GETTER_Port_TO(smth) HRESULT STDMETHODCALLTYPE get_Port (LONG * aPort) { return smth get_Port (aPort); }
-#define COM_FORWARD_IMediumAttachment_GETTER_Port_TO_OBJ(obj) COM_FORWARD_IMediumAttachment_GETTER_Port_TO ((obj)->)
-#define COM_FORWARD_IMediumAttachment_GETTER_Port_TO_BASE(base) COM_FORWARD_IMediumAttachment_GETTER_Port_TO (base::)
-#define COM_FORWARD_IMediumAttachment_GETTER_Device_TO(smth) HRESULT STDMETHODCALLTYPE get_Device (LONG * aDevice) { return smth get_Device (aDevice); }
-#define COM_FORWARD_IMediumAttachment_GETTER_Device_TO_OBJ(obj) COM_FORWARD_IMediumAttachment_GETTER_Device_TO ((obj)->)
-#define COM_FORWARD_IMediumAttachment_GETTER_Device_TO_BASE(base) COM_FORWARD_IMediumAttachment_GETTER_Device_TO (base::)
-#define COM_FORWARD_IMediumAttachment_GETTER_Type_TO(smth) HRESULT STDMETHODCALLTYPE get_Type (DeviceType * aType) { return smth get_Type (aType); }
-#define COM_FORWARD_IMediumAttachment_GETTER_Type_TO_OBJ(obj) COM_FORWARD_IMediumAttachment_GETTER_Type_TO ((obj)->)
-#define COM_FORWARD_IMediumAttachment_GETTER_Type_TO_BASE(base) COM_FORWARD_IMediumAttachment_GETTER_Type_TO (base::)
-#define COM_FORWARD_IMediumAttachment_GETTER_Passthrough_TO(smth) HRESULT STDMETHODCALLTYPE get_Passthrough (BOOL * aPassthrough) { return smth get_Passthrough (aPassthrough); }
-#define COM_FORWARD_IMediumAttachment_GETTER_Passthrough_TO_OBJ(obj) COM_FORWARD_IMediumAttachment_GETTER_Passthrough_TO ((obj)->)
-#define COM_FORWARD_IMediumAttachment_GETTER_Passthrough_TO_BASE(base) COM_FORWARD_IMediumAttachment_GETTER_Passthrough_TO (base::)
-#define COM_FORWARD_IMediumAttachment_TO(smth) COM_FORWARD_IMediumAttachment_GETTER_Medium_TO (smth) COM_FORWARD_IMediumAttachment_GETTER_Controller_TO (smth) COM_FORWARD_IMediumAttachment_GETTER_Port_TO (smth) COM_FORWARD_IMediumAttachment_GETTER_Device_TO (smth) COM_FORWARD_IMediumAttachment_GETTER_Type_TO (smth) COM_FORWARD_IMediumAttachment_GETTER_Passthrough_TO (smth) 
-#define COM_FORWARD_IMediumAttachment_TO_OBJ(obj) COM_FORWARD_IMediumAttachment_TO ((obj)->)
-#define COM_FORWARD_IMediumAttachment_TO_BASE(base) COM_FORWARD_IMediumAttachment_TO (base::)
-#define COM_FORWARD_IMedium_GETTER_Id_TO(smth) HRESULT STDMETHODCALLTYPE get_Id (BSTR * aId) { return smth get_Id (aId); }
-#define COM_FORWARD_IMedium_GETTER_Id_TO_OBJ(obj) COM_FORWARD_IMedium_GETTER_Id_TO ((obj)->)
-#define COM_FORWARD_IMedium_GETTER_Id_TO_BASE(base) COM_FORWARD_IMedium_GETTER_Id_TO (base::)
-#define COM_FORWARD_IMedium_GETTER_Description_TO(smth) HRESULT STDMETHODCALLTYPE get_Description (BSTR * aDescription) { return smth get_Description (aDescription); }
-#define COM_FORWARD_IMedium_GETTER_Description_TO_OBJ(obj) COM_FORWARD_IMedium_GETTER_Description_TO ((obj)->)
-#define COM_FORWARD_IMedium_GETTER_Description_TO_BASE(base) COM_FORWARD_IMedium_GETTER_Description_TO (base::)
-#define COM_FORWARD_IMedium_SETTER_Description_TO(smth) HRESULT STDMETHODCALLTYPE put_Description (BSTR aDescription) { return smth put_Description (aDescription); }
-#define COM_FORWARD_IMedium_SETTER_Description_TO_OBJ(obj) COM_FORWARD_IMedium_SETTER_Description_TO ((obj)->)
-#define COM_FORWARD_IMedium_SETTER_Description_TO_BASE(base) COM_FORWARD_IMedium_SETTER_Description_TO (base::)
-#define COM_FORWARD_IMedium_GETTER_State_TO(smth) HRESULT STDMETHODCALLTYPE get_State (MediumState * aState) { return smth get_State (aState); }
-#define COM_FORWARD_IMedium_GETTER_State_TO_OBJ(obj) COM_FORWARD_IMedium_GETTER_State_TO ((obj)->)
-#define COM_FORWARD_IMedium_GETTER_State_TO_BASE(base) COM_FORWARD_IMedium_GETTER_State_TO (base::)
-#define COM_FORWARD_IMedium_GETTER_Location_TO(smth) HRESULT STDMETHODCALLTYPE get_Location (BSTR * aLocation) { return smth get_Location (aLocation); }
-#define COM_FORWARD_IMedium_GETTER_Location_TO_OBJ(obj) COM_FORWARD_IMedium_GETTER_Location_TO ((obj)->)
-#define COM_FORWARD_IMedium_GETTER_Location_TO_BASE(base) COM_FORWARD_IMedium_GETTER_Location_TO (base::)
-#define COM_FORWARD_IMedium_SETTER_Location_TO(smth) HRESULT STDMETHODCALLTYPE put_Location (BSTR aLocation) { return smth put_Location (aLocation); }
-#define COM_FORWARD_IMedium_SETTER_Location_TO_OBJ(obj) COM_FORWARD_IMedium_SETTER_Location_TO ((obj)->)
-#define COM_FORWARD_IMedium_SETTER_Location_TO_BASE(base) COM_FORWARD_IMedium_SETTER_Location_TO (base::)
-#define COM_FORWARD_IMedium_GETTER_Name_TO(smth) HRESULT STDMETHODCALLTYPE get_Name (BSTR * aName) { return smth get_Name (aName); }
-#define COM_FORWARD_IMedium_GETTER_Name_TO_OBJ(obj) COM_FORWARD_IMedium_GETTER_Name_TO ((obj)->)
-#define COM_FORWARD_IMedium_GETTER_Name_TO_BASE(base) COM_FORWARD_IMedium_GETTER_Name_TO (base::)
-#define COM_FORWARD_IMedium_GETTER_DeviceType_TO(smth) HRESULT STDMETHODCALLTYPE get_DeviceType (DeviceType * aDeviceType) { return smth get_DeviceType (aDeviceType); }
-#define COM_FORWARD_IMedium_GETTER_DeviceType_TO_OBJ(obj) COM_FORWARD_IMedium_GETTER_DeviceType_TO ((obj)->)
-#define COM_FORWARD_IMedium_GETTER_DeviceType_TO_BASE(base) COM_FORWARD_IMedium_GETTER_DeviceType_TO (base::)
-#define COM_FORWARD_IMedium_GETTER_HostDrive_TO(smth) HRESULT STDMETHODCALLTYPE get_HostDrive (BOOL * aHostDrive) { return smth get_HostDrive (aHostDrive); }
-#define COM_FORWARD_IMedium_GETTER_HostDrive_TO_OBJ(obj) COM_FORWARD_IMedium_GETTER_HostDrive_TO ((obj)->)
-#define COM_FORWARD_IMedium_GETTER_HostDrive_TO_BASE(base) COM_FORWARD_IMedium_GETTER_HostDrive_TO (base::)
-#define COM_FORWARD_IMedium_GETTER_Size_TO(smth) HRESULT STDMETHODCALLTYPE get_Size (ULONG64 * aSize) { return smth get_Size (aSize); }
-#define COM_FORWARD_IMedium_GETTER_Size_TO_OBJ(obj) COM_FORWARD_IMedium_GETTER_Size_TO ((obj)->)
-#define COM_FORWARD_IMedium_GETTER_Size_TO_BASE(base) COM_FORWARD_IMedium_GETTER_Size_TO (base::)
-#define COM_FORWARD_IMedium_GETTER_Format_TO(smth) HRESULT STDMETHODCALLTYPE get_Format (BSTR * aFormat) { return smth get_Format (aFormat); }
-#define COM_FORWARD_IMedium_GETTER_Format_TO_OBJ(obj) COM_FORWARD_IMedium_GETTER_Format_TO ((obj)->)
-#define COM_FORWARD_IMedium_GETTER_Format_TO_BASE(base) COM_FORWARD_IMedium_GETTER_Format_TO (base::)
-#define COM_FORWARD_IMedium_GETTER_MediumFormat_TO(smth) HRESULT STDMETHODCALLTYPE get_MediumFormat (IMediumFormat * * aMediumFormat) { return smth get_MediumFormat (aMediumFormat); }
-#define COM_FORWARD_IMedium_GETTER_MediumFormat_TO_OBJ(obj) COM_FORWARD_IMedium_GETTER_MediumFormat_TO ((obj)->)
-#define COM_FORWARD_IMedium_GETTER_MediumFormat_TO_BASE(base) COM_FORWARD_IMedium_GETTER_MediumFormat_TO (base::)
-#define COM_FORWARD_IMedium_GETTER_Type_TO(smth) HRESULT STDMETHODCALLTYPE get_Type (MediumType * aType) { return smth get_Type (aType); }
-#define COM_FORWARD_IMedium_GETTER_Type_TO_OBJ(obj) COM_FORWARD_IMedium_GETTER_Type_TO ((obj)->)
-#define COM_FORWARD_IMedium_GETTER_Type_TO_BASE(base) COM_FORWARD_IMedium_GETTER_Type_TO (base::)
-#define COM_FORWARD_IMedium_SETTER_Type_TO(smth) HRESULT STDMETHODCALLTYPE put_Type (MediumType aType) { return smth put_Type (aType); }
-#define COM_FORWARD_IMedium_SETTER_Type_TO_OBJ(obj) COM_FORWARD_IMedium_SETTER_Type_TO ((obj)->)
-#define COM_FORWARD_IMedium_SETTER_Type_TO_BASE(base) COM_FORWARD_IMedium_SETTER_Type_TO (base::)
-#define COM_FORWARD_IMedium_GETTER_Parent_TO(smth) HRESULT STDMETHODCALLTYPE get_Parent (IMedium * * aParent) { return smth get_Parent (aParent); }
-#define COM_FORWARD_IMedium_GETTER_Parent_TO_OBJ(obj) COM_FORWARD_IMedium_GETTER_Parent_TO ((obj)->)
-#define COM_FORWARD_IMedium_GETTER_Parent_TO_BASE(base) COM_FORWARD_IMedium_GETTER_Parent_TO (base::)
-#define COM_FORWARD_IMedium_GETTER_Children_TO(smth) HRESULT STDMETHODCALLTYPE get_Children (SAFEARRAY * * aChildren) { return smth get_Children (aChildren); }
-#define COM_FORWARD_IMedium_GETTER_Children_TO_OBJ(obj) COM_FORWARD_IMedium_GETTER_Children_TO ((obj)->)
-#define COM_FORWARD_IMedium_GETTER_Children_TO_BASE(base) COM_FORWARD_IMedium_GETTER_Children_TO (base::)
-#define COM_FORWARD_IMedium_GETTER_Base_TO(smth) HRESULT STDMETHODCALLTYPE get_Base (IMedium * * aBase) { return smth get_Base (aBase); }
-#define COM_FORWARD_IMedium_GETTER_Base_TO_OBJ(obj) COM_FORWARD_IMedium_GETTER_Base_TO ((obj)->)
-#define COM_FORWARD_IMedium_GETTER_Base_TO_BASE(base) COM_FORWARD_IMedium_GETTER_Base_TO (base::)
-#define COM_FORWARD_IMedium_GETTER_ReadOnly_TO(smth) HRESULT STDMETHODCALLTYPE get_ReadOnly (BOOL * aReadOnly) { return smth get_ReadOnly (aReadOnly); }
-#define COM_FORWARD_IMedium_GETTER_ReadOnly_TO_OBJ(obj) COM_FORWARD_IMedium_GETTER_ReadOnly_TO ((obj)->)
-#define COM_FORWARD_IMedium_GETTER_ReadOnly_TO_BASE(base) COM_FORWARD_IMedium_GETTER_ReadOnly_TO (base::)
-#define COM_FORWARD_IMedium_GETTER_LogicalSize_TO(smth) HRESULT STDMETHODCALLTYPE get_LogicalSize (ULONG64 * aLogicalSize) { return smth get_LogicalSize (aLogicalSize); }
-#define COM_FORWARD_IMedium_GETTER_LogicalSize_TO_OBJ(obj) COM_FORWARD_IMedium_GETTER_LogicalSize_TO ((obj)->)
-#define COM_FORWARD_IMedium_GETTER_LogicalSize_TO_BASE(base) COM_FORWARD_IMedium_GETTER_LogicalSize_TO (base::)
-#define COM_FORWARD_IMedium_GETTER_AutoReset_TO(smth) HRESULT STDMETHODCALLTYPE get_AutoReset (BOOL * aAutoReset) { return smth get_AutoReset (aAutoReset); }
-#define COM_FORWARD_IMedium_GETTER_AutoReset_TO_OBJ(obj) COM_FORWARD_IMedium_GETTER_AutoReset_TO ((obj)->)
-#define COM_FORWARD_IMedium_GETTER_AutoReset_TO_BASE(base) COM_FORWARD_IMedium_GETTER_AutoReset_TO (base::)
-#define COM_FORWARD_IMedium_SETTER_AutoReset_TO(smth) HRESULT STDMETHODCALLTYPE put_AutoReset (BOOL aAutoReset) { return smth put_AutoReset (aAutoReset); }
-#define COM_FORWARD_IMedium_SETTER_AutoReset_TO_OBJ(obj) COM_FORWARD_IMedium_SETTER_AutoReset_TO ((obj)->)
-#define COM_FORWARD_IMedium_SETTER_AutoReset_TO_BASE(base) COM_FORWARD_IMedium_SETTER_AutoReset_TO (base::)
-#define COM_FORWARD_IMedium_GETTER_LastAccessError_TO(smth) HRESULT STDMETHODCALLTYPE get_LastAccessError (BSTR * aLastAccessError) { return smth get_LastAccessError (aLastAccessError); }
-#define COM_FORWARD_IMedium_GETTER_LastAccessError_TO_OBJ(obj) COM_FORWARD_IMedium_GETTER_LastAccessError_TO ((obj)->)
-#define COM_FORWARD_IMedium_GETTER_LastAccessError_TO_BASE(base) COM_FORWARD_IMedium_GETTER_LastAccessError_TO (base::)
-#define COM_FORWARD_IMedium_GETTER_MachineIds_TO(smth) HRESULT STDMETHODCALLTYPE get_MachineIds (SAFEARRAY * * aMachineIds) { return smth get_MachineIds (aMachineIds); }
-#define COM_FORWARD_IMedium_GETTER_MachineIds_TO_OBJ(obj) COM_FORWARD_IMedium_GETTER_MachineIds_TO ((obj)->)
-#define COM_FORWARD_IMedium_GETTER_MachineIds_TO_BASE(base) COM_FORWARD_IMedium_GETTER_MachineIds_TO (base::)
-#define COM_FORWARD_IMedium_RefreshState_TO(smth) HRESULT STDMETHODCALLTYPE RefreshState (MediumState * aState) { return smth RefreshState (aState); }
-#define COM_FORWARD_IMedium_RefreshState_TO_OBJ(obj) COM_FORWARD_IMedium_RefreshState_TO ((obj)->)
-#define COM_FORWARD_IMedium_RefreshState_TO_BASE(base) COM_FORWARD_IMedium_RefreshState_TO (base::)
-#define COM_FORWARD_IMedium_GetSnapshotIds_TO(smth) HRESULT STDMETHODCALLTYPE GetSnapshotIds (BSTR aMachineId, SAFEARRAY * * aSnapshotIds) { return smth GetSnapshotIds (aMachineId, aSnapshotIds); }
-#define COM_FORWARD_IMedium_GetSnapshotIds_TO_OBJ(obj) COM_FORWARD_IMedium_GetSnapshotIds_TO ((obj)->)
-#define COM_FORWARD_IMedium_GetSnapshotIds_TO_BASE(base) COM_FORWARD_IMedium_GetSnapshotIds_TO (base::)
-#define COM_FORWARD_IMedium_LockRead_TO(smth) HRESULT STDMETHODCALLTYPE LockRead (MediumState * aState) { return smth LockRead (aState); }
-#define COM_FORWARD_IMedium_LockRead_TO_OBJ(obj) COM_FORWARD_IMedium_LockRead_TO ((obj)->)
-#define COM_FORWARD_IMedium_LockRead_TO_BASE(base) COM_FORWARD_IMedium_LockRead_TO (base::)
-#define COM_FORWARD_IMedium_UnlockRead_TO(smth) HRESULT STDMETHODCALLTYPE UnlockRead (MediumState * aState) { return smth UnlockRead (aState); }
-#define COM_FORWARD_IMedium_UnlockRead_TO_OBJ(obj) COM_FORWARD_IMedium_UnlockRead_TO ((obj)->)
-#define COM_FORWARD_IMedium_UnlockRead_TO_BASE(base) COM_FORWARD_IMedium_UnlockRead_TO (base::)
-#define COM_FORWARD_IMedium_LockWrite_TO(smth) HRESULT STDMETHODCALLTYPE LockWrite (MediumState * aState) { return smth LockWrite (aState); }
-#define COM_FORWARD_IMedium_LockWrite_TO_OBJ(obj) COM_FORWARD_IMedium_LockWrite_TO ((obj)->)
-#define COM_FORWARD_IMedium_LockWrite_TO_BASE(base) COM_FORWARD_IMedium_LockWrite_TO (base::)
-#define COM_FORWARD_IMedium_UnlockWrite_TO(smth) HRESULT STDMETHODCALLTYPE UnlockWrite (MediumState * aState) { return smth UnlockWrite (aState); }
-#define COM_FORWARD_IMedium_UnlockWrite_TO_OBJ(obj) COM_FORWARD_IMedium_UnlockWrite_TO ((obj)->)
-#define COM_FORWARD_IMedium_UnlockWrite_TO_BASE(base) COM_FORWARD_IMedium_UnlockWrite_TO (base::)
-#define COM_FORWARD_IMedium_Close_TO(smth) HRESULT STDMETHODCALLTYPE Close() { return smth Close(); }
-#define COM_FORWARD_IMedium_Close_TO_OBJ(obj) COM_FORWARD_IMedium_Close_TO ((obj)->)
-#define COM_FORWARD_IMedium_Close_TO_BASE(base) COM_FORWARD_IMedium_Close_TO (base::)
-#define COM_FORWARD_IMedium_GetProperty_TO(smth) HRESULT STDMETHODCALLTYPE GetProperty (BSTR aName, BSTR * aValue) { return smth GetProperty (aName, aValue); }
-#define COM_FORWARD_IMedium_GetProperty_TO_OBJ(obj) COM_FORWARD_IMedium_GetProperty_TO ((obj)->)
-#define COM_FORWARD_IMedium_GetProperty_TO_BASE(base) COM_FORWARD_IMedium_GetProperty_TO (base::)
-#define COM_FORWARD_IMedium_SetProperty_TO(smth) HRESULT STDMETHODCALLTYPE SetProperty (BSTR aName, BSTR aValue) { return smth SetProperty (aName, aValue); }
-#define COM_FORWARD_IMedium_SetProperty_TO_OBJ(obj) COM_FORWARD_IMedium_SetProperty_TO ((obj)->)
-#define COM_FORWARD_IMedium_SetProperty_TO_BASE(base) COM_FORWARD_IMedium_SetProperty_TO (base::)
-#define COM_FORWARD_IMedium_GetProperties_TO(smth) HRESULT STDMETHODCALLTYPE GetProperties (BSTR aNames, SAFEARRAY * * aReturnNames, SAFEARRAY * * aReturnValues) { return smth GetProperties (aNames, aReturnNames, aReturnValues); }
-#define COM_FORWARD_IMedium_GetProperties_TO_OBJ(obj) COM_FORWARD_IMedium_GetProperties_TO ((obj)->)
-#define COM_FORWARD_IMedium_GetProperties_TO_BASE(base) COM_FORWARD_IMedium_GetProperties_TO (base::)
-#define COM_FORWARD_IMedium_SetProperties_TO(smth) HRESULT STDMETHODCALLTYPE SetProperties (SAFEARRAY * * aNames, SAFEARRAY * * aValues) { return smth SetProperties (aNames, aValues); }
-#define COM_FORWARD_IMedium_SetProperties_TO_OBJ(obj) COM_FORWARD_IMedium_SetProperties_TO ((obj)->)
-#define COM_FORWARD_IMedium_SetProperties_TO_BASE(base) COM_FORWARD_IMedium_SetProperties_TO (base::)
-#define COM_FORWARD_IMedium_CreateBaseStorage_TO(smth) HRESULT STDMETHODCALLTYPE CreateBaseStorage (ULONG64 aLogicalSize, MediumVariant aVariant, IProgress * * aProgress) { return smth CreateBaseStorage (aLogicalSize, aVariant, aProgress); }
-#define COM_FORWARD_IMedium_CreateBaseStorage_TO_OBJ(obj) COM_FORWARD_IMedium_CreateBaseStorage_TO ((obj)->)
-#define COM_FORWARD_IMedium_CreateBaseStorage_TO_BASE(base) COM_FORWARD_IMedium_CreateBaseStorage_TO (base::)
-#define COM_FORWARD_IMedium_DeleteStorage_TO(smth) HRESULT STDMETHODCALLTYPE DeleteStorage (IProgress * * aProgress) { return smth DeleteStorage (aProgress); }
-#define COM_FORWARD_IMedium_DeleteStorage_TO_OBJ(obj) COM_FORWARD_IMedium_DeleteStorage_TO ((obj)->)
-#define COM_FORWARD_IMedium_DeleteStorage_TO_BASE(base) COM_FORWARD_IMedium_DeleteStorage_TO (base::)
-#define COM_FORWARD_IMedium_CreateDiffStorage_TO(smth) HRESULT STDMETHODCALLTYPE CreateDiffStorage (IMedium * aTarget, MediumVariant aVariant, IProgress * * aProgress) { return smth CreateDiffStorage (aTarget, aVariant, aProgress); }
-#define COM_FORWARD_IMedium_CreateDiffStorage_TO_OBJ(obj) COM_FORWARD_IMedium_CreateDiffStorage_TO ((obj)->)
-#define COM_FORWARD_IMedium_CreateDiffStorage_TO_BASE(base) COM_FORWARD_IMedium_CreateDiffStorage_TO (base::)
-#define COM_FORWARD_IMedium_MergeTo_TO(smth) HRESULT STDMETHODCALLTYPE MergeTo (IMedium * aTarget, IProgress * * aProgress) { return smth MergeTo (aTarget, aProgress); }
-#define COM_FORWARD_IMedium_MergeTo_TO_OBJ(obj) COM_FORWARD_IMedium_MergeTo_TO ((obj)->)
-#define COM_FORWARD_IMedium_MergeTo_TO_BASE(base) COM_FORWARD_IMedium_MergeTo_TO (base::)
-#define COM_FORWARD_IMedium_CloneTo_TO(smth) HRESULT STDMETHODCALLTYPE CloneTo (IMedium * aTarget, MediumVariant aVariant, IMedium * aParent, IProgress * * aProgress) { return smth CloneTo (aTarget, aVariant, aParent, aProgress); }
-#define COM_FORWARD_IMedium_CloneTo_TO_OBJ(obj) COM_FORWARD_IMedium_CloneTo_TO ((obj)->)
-#define COM_FORWARD_IMedium_CloneTo_TO_BASE(base) COM_FORWARD_IMedium_CloneTo_TO (base::)
-#define COM_FORWARD_IMedium_Compact_TO(smth) HRESULT STDMETHODCALLTYPE Compact (IProgress * * aProgress) { return smth Compact (aProgress); }
-#define COM_FORWARD_IMedium_Compact_TO_OBJ(obj) COM_FORWARD_IMedium_Compact_TO ((obj)->)
-#define COM_FORWARD_IMedium_Compact_TO_BASE(base) COM_FORWARD_IMedium_Compact_TO (base::)
-#define COM_FORWARD_IMedium_Resize_TO(smth) HRESULT STDMETHODCALLTYPE Resize (ULONG64 aLogicalSize, IProgress * * aProgress) { return smth Resize (aLogicalSize, aProgress); }
-#define COM_FORWARD_IMedium_Resize_TO_OBJ(obj) COM_FORWARD_IMedium_Resize_TO ((obj)->)
-#define COM_FORWARD_IMedium_Resize_TO_BASE(base) COM_FORWARD_IMedium_Resize_TO (base::)
-#define COM_FORWARD_IMedium_Reset_TO(smth) HRESULT STDMETHODCALLTYPE Reset (IProgress * * aProgress) { return smth Reset (aProgress); }
-#define COM_FORWARD_IMedium_Reset_TO_OBJ(obj) COM_FORWARD_IMedium_Reset_TO ((obj)->)
-#define COM_FORWARD_IMedium_Reset_TO_BASE(base) COM_FORWARD_IMedium_Reset_TO (base::)
-#define COM_FORWARD_IMedium_TO(smth) COM_FORWARD_IMedium_GETTER_Id_TO (smth) COM_FORWARD_IMedium_GETTER_Description_TO (smth) COM_FORWARD_IMedium_SETTER_Description_TO (smth) COM_FORWARD_IMedium_GETTER_State_TO (smth) COM_FORWARD_IMedium_GETTER_Location_TO (smth) COM_FORWARD_IMedium_SETTER_Location_TO (smth) COM_FORWARD_IMedium_GETTER_Name_TO (smth) COM_FORWARD_IMedium_GETTER_DeviceType_TO (smth) COM_FORWARD_IMedium_GETTER_HostDrive_TO (smth) COM_FORWARD_IMedium_GETTER_Size_TO (smth) COM [...]
-#define COM_FORWARD_IMedium_TO_OBJ(obj) COM_FORWARD_IMedium_TO ((obj)->)
-#define COM_FORWARD_IMedium_TO_BASE(base) COM_FORWARD_IMedium_TO (base::)
-#define COM_FORWARD_IMediumFormat_GETTER_Id_TO(smth) HRESULT STDMETHODCALLTYPE get_Id (BSTR * aId) { return smth get_Id (aId); }
-#define COM_FORWARD_IMediumFormat_GETTER_Id_TO_OBJ(obj) COM_FORWARD_IMediumFormat_GETTER_Id_TO ((obj)->)
-#define COM_FORWARD_IMediumFormat_GETTER_Id_TO_BASE(base) COM_FORWARD_IMediumFormat_GETTER_Id_TO (base::)
-#define COM_FORWARD_IMediumFormat_GETTER_Name_TO(smth) HRESULT STDMETHODCALLTYPE get_Name (BSTR * aName) { return smth get_Name (aName); }
-#define COM_FORWARD_IMediumFormat_GETTER_Name_TO_OBJ(obj) COM_FORWARD_IMediumFormat_GETTER_Name_TO ((obj)->)
-#define COM_FORWARD_IMediumFormat_GETTER_Name_TO_BASE(base) COM_FORWARD_IMediumFormat_GETTER_Name_TO (base::)
-#define COM_FORWARD_IMediumFormat_GETTER_FileExtensions_TO(smth) HRESULT STDMETHODCALLTYPE get_FileExtensions (SAFEARRAY * * aFileExtensions) { return smth get_FileExtensions (aFileExtensions); }
-#define COM_FORWARD_IMediumFormat_GETTER_FileExtensions_TO_OBJ(obj) COM_FORWARD_IMediumFormat_GETTER_FileExtensions_TO ((obj)->)
-#define COM_FORWARD_IMediumFormat_GETTER_FileExtensions_TO_BASE(base) COM_FORWARD_IMediumFormat_GETTER_FileExtensions_TO (base::)
-#define COM_FORWARD_IMediumFormat_GETTER_Capabilities_TO(smth) HRESULT STDMETHODCALLTYPE get_Capabilities (ULONG * aCapabilities) { return smth get_Capabilities (aCapabilities); }
-#define COM_FORWARD_IMediumFormat_GETTER_Capabilities_TO_OBJ(obj) COM_FORWARD_IMediumFormat_GETTER_Capabilities_TO ((obj)->)
-#define COM_FORWARD_IMediumFormat_GETTER_Capabilities_TO_BASE(base) COM_FORWARD_IMediumFormat_GETTER_Capabilities_TO (base::)
-#define COM_FORWARD_IMediumFormat_DescribeProperties_TO(smth) HRESULT STDMETHODCALLTYPE DescribeProperties (SAFEARRAY * * aNames, SAFEARRAY * * aDescription, SAFEARRAY * * aTypes, SAFEARRAY * * aFlags, SAFEARRAY * * aDefaults) { return smth DescribeProperties (aNames, aDescription, aTypes, aFlags, aDefaults); }
-#define COM_FORWARD_IMediumFormat_DescribeProperties_TO_OBJ(obj) COM_FORWARD_IMediumFormat_DescribeProperties_TO ((obj)->)
-#define COM_FORWARD_IMediumFormat_DescribeProperties_TO_BASE(base) COM_FORWARD_IMediumFormat_DescribeProperties_TO (base::)
-#define COM_FORWARD_IMediumFormat_TO(smth) COM_FORWARD_IMediumFormat_GETTER_Id_TO (smth) COM_FORWARD_IMediumFormat_GETTER_Name_TO (smth) COM_FORWARD_IMediumFormat_GETTER_FileExtensions_TO (smth) COM_FORWARD_IMediumFormat_GETTER_Capabilities_TO (smth) COM_FORWARD_IMediumFormat_DescribeProperties_TO (smth) 
-#define COM_FORWARD_IMediumFormat_TO_OBJ(obj) COM_FORWARD_IMediumFormat_TO ((obj)->)
-#define COM_FORWARD_IMediumFormat_TO_BASE(base) COM_FORWARD_IMediumFormat_TO (base::)
-#define COM_FORWARD_IKeyboard_PutScancode_TO(smth) HRESULT STDMETHODCALLTYPE PutScancode (LONG aScancode) { return smth PutScancode (aScancode); }
-#define COM_FORWARD_IKeyboard_PutScancode_TO_OBJ(obj) COM_FORWARD_IKeyboard_PutScancode_TO ((obj)->)
-#define COM_FORWARD_IKeyboard_PutScancode_TO_BASE(base) COM_FORWARD_IKeyboard_PutScancode_TO (base::)
-#define COM_FORWARD_IKeyboard_PutScancodes_TO(smth) HRESULT STDMETHODCALLTYPE PutScancodes (SAFEARRAY * * aScancodes, ULONG * aCodesStored) { return smth PutScancodes (aScancodes, aCodesStored); }
-#define COM_FORWARD_IKeyboard_PutScancodes_TO_OBJ(obj) COM_FORWARD_IKeyboard_PutScancodes_TO ((obj)->)
-#define COM_FORWARD_IKeyboard_PutScancodes_TO_BASE(base) COM_FORWARD_IKeyboard_PutScancodes_TO (base::)
-#define COM_FORWARD_IKeyboard_PutCAD_TO(smth) HRESULT STDMETHODCALLTYPE PutCAD() { return smth PutCAD(); }
-#define COM_FORWARD_IKeyboard_PutCAD_TO_OBJ(obj) COM_FORWARD_IKeyboard_PutCAD_TO ((obj)->)
-#define COM_FORWARD_IKeyboard_PutCAD_TO_BASE(base) COM_FORWARD_IKeyboard_PutCAD_TO (base::)
-#define COM_FORWARD_IKeyboard_TO(smth) COM_FORWARD_IKeyboard_PutScancode_TO (smth) COM_FORWARD_IKeyboard_PutScancodes_TO (smth) COM_FORWARD_IKeyboard_PutCAD_TO (smth) 
-#define COM_FORWARD_IKeyboard_TO_OBJ(obj) COM_FORWARD_IKeyboard_TO ((obj)->)
-#define COM_FORWARD_IKeyboard_TO_BASE(base) COM_FORWARD_IKeyboard_TO (base::)
-#define COM_FORWARD_IMouse_GETTER_AbsoluteSupported_TO(smth) HRESULT STDMETHODCALLTYPE get_AbsoluteSupported (BOOL * aAbsoluteSupported) { return smth get_AbsoluteSupported (aAbsoluteSupported); }
-#define COM_FORWARD_IMouse_GETTER_AbsoluteSupported_TO_OBJ(obj) COM_FORWARD_IMouse_GETTER_AbsoluteSupported_TO ((obj)->)
-#define COM_FORWARD_IMouse_GETTER_AbsoluteSupported_TO_BASE(base) COM_FORWARD_IMouse_GETTER_AbsoluteSupported_TO (base::)
-#define COM_FORWARD_IMouse_GETTER_RelativeSupported_TO(smth) HRESULT STDMETHODCALLTYPE get_RelativeSupported (BOOL * aRelativeSupported) { return smth get_RelativeSupported (aRelativeSupported); }
-#define COM_FORWARD_IMouse_GETTER_RelativeSupported_TO_OBJ(obj) COM_FORWARD_IMouse_GETTER_RelativeSupported_TO ((obj)->)
-#define COM_FORWARD_IMouse_GETTER_RelativeSupported_TO_BASE(base) COM_FORWARD_IMouse_GETTER_RelativeSupported_TO (base::)
-#define COM_FORWARD_IMouse_GETTER_NeedsHostCursor_TO(smth) HRESULT STDMETHODCALLTYPE get_NeedsHostCursor (BOOL * aNeedsHostCursor) { return smth get_NeedsHostCursor (aNeedsHostCursor); }
-#define COM_FORWARD_IMouse_GETTER_NeedsHostCursor_TO_OBJ(obj) COM_FORWARD_IMouse_GETTER_NeedsHostCursor_TO ((obj)->)
-#define COM_FORWARD_IMouse_GETTER_NeedsHostCursor_TO_BASE(base) COM_FORWARD_IMouse_GETTER_NeedsHostCursor_TO (base::)
-#define COM_FORWARD_IMouse_PutMouseEvent_TO(smth) HRESULT STDMETHODCALLTYPE PutMouseEvent (LONG aDx, LONG aDy, LONG aDz, LONG aDw, LONG aButtonState) { return smth PutMouseEvent (aDx, aDy, aDz, aDw, aButtonState); }
-#define COM_FORWARD_IMouse_PutMouseEvent_TO_OBJ(obj) COM_FORWARD_IMouse_PutMouseEvent_TO ((obj)->)
-#define COM_FORWARD_IMouse_PutMouseEvent_TO_BASE(base) COM_FORWARD_IMouse_PutMouseEvent_TO (base::)
-#define COM_FORWARD_IMouse_PutMouseEventAbsolute_TO(smth) HRESULT STDMETHODCALLTYPE PutMouseEventAbsolute (LONG aX, LONG aY, LONG aDz, LONG aDw, LONG aButtonState) { return smth PutMouseEventAbsolute (aX, aY, aDz, aDw, aButtonState); }
-#define COM_FORWARD_IMouse_PutMouseEventAbsolute_TO_OBJ(obj) COM_FORWARD_IMouse_PutMouseEventAbsolute_TO ((obj)->)
-#define COM_FORWARD_IMouse_PutMouseEventAbsolute_TO_BASE(base) COM_FORWARD_IMouse_PutMouseEventAbsolute_TO (base::)
-#define COM_FORWARD_IMouse_TO(smth) COM_FORWARD_IMouse_GETTER_AbsoluteSupported_TO (smth) COM_FORWARD_IMouse_GETTER_RelativeSupported_TO (smth) COM_FORWARD_IMouse_GETTER_NeedsHostCursor_TO (smth) COM_FORWARD_IMouse_PutMouseEvent_TO (smth) COM_FORWARD_IMouse_PutMouseEventAbsolute_TO (smth) 
-#define COM_FORWARD_IMouse_TO_OBJ(obj) COM_FORWARD_IMouse_TO ((obj)->)
-#define COM_FORWARD_IMouse_TO_BASE(base) COM_FORWARD_IMouse_TO (base::)
-#define COM_FORWARD_IFramebuffer_GETTER_Address_TO(smth) HRESULT STDMETHODCALLTYPE get_Address (BYTE * * aAddress) { return smth get_Address (aAddress); }
-#define COM_FORWARD_IFramebuffer_GETTER_Address_TO_OBJ(obj) COM_FORWARD_IFramebuffer_GETTER_Address_TO ((obj)->)
-#define COM_FORWARD_IFramebuffer_GETTER_Address_TO_BASE(base) COM_FORWARD_IFramebuffer_GETTER_Address_TO (base::)
-#define COM_FORWARD_IFramebuffer_GETTER_Width_TO(smth) HRESULT STDMETHODCALLTYPE get_Width (ULONG * aWidth) { return smth get_Width (aWidth); }
-#define COM_FORWARD_IFramebuffer_GETTER_Width_TO_OBJ(obj) COM_FORWARD_IFramebuffer_GETTER_Width_TO ((obj)->)
-#define COM_FORWARD_IFramebuffer_GETTER_Width_TO_BASE(base) COM_FORWARD_IFramebuffer_GETTER_Width_TO (base::)
-#define COM_FORWARD_IFramebuffer_GETTER_Height_TO(smth) HRESULT STDMETHODCALLTYPE get_Height (ULONG * aHeight) { return smth get_Height (aHeight); }
-#define COM_FORWARD_IFramebuffer_GETTER_Height_TO_OBJ(obj) COM_FORWARD_IFramebuffer_GETTER_Height_TO ((obj)->)
-#define COM_FORWARD_IFramebuffer_GETTER_Height_TO_BASE(base) COM_FORWARD_IFramebuffer_GETTER_Height_TO (base::)
-#define COM_FORWARD_IFramebuffer_GETTER_BitsPerPixel_TO(smth) HRESULT STDMETHODCALLTYPE get_BitsPerPixel (ULONG * aBitsPerPixel) { return smth get_BitsPerPixel (aBitsPerPixel); }
-#define COM_FORWARD_IFramebuffer_GETTER_BitsPerPixel_TO_OBJ(obj) COM_FORWARD_IFramebuffer_GETTER_BitsPerPixel_TO ((obj)->)
-#define COM_FORWARD_IFramebuffer_GETTER_BitsPerPixel_TO_BASE(base) COM_FORWARD_IFramebuffer_GETTER_BitsPerPixel_TO (base::)
-#define COM_FORWARD_IFramebuffer_GETTER_BytesPerLine_TO(smth) HRESULT STDMETHODCALLTYPE get_BytesPerLine (ULONG * aBytesPerLine) { return smth get_BytesPerLine (aBytesPerLine); }
-#define COM_FORWARD_IFramebuffer_GETTER_BytesPerLine_TO_OBJ(obj) COM_FORWARD_IFramebuffer_GETTER_BytesPerLine_TO ((obj)->)
-#define COM_FORWARD_IFramebuffer_GETTER_BytesPerLine_TO_BASE(base) COM_FORWARD_IFramebuffer_GETTER_BytesPerLine_TO (base::)
-#define COM_FORWARD_IFramebuffer_GETTER_PixelFormat_TO(smth) HRESULT STDMETHODCALLTYPE get_PixelFormat (ULONG * aPixelFormat) { return smth get_PixelFormat (aPixelFormat); }
-#define COM_FORWARD_IFramebuffer_GETTER_PixelFormat_TO_OBJ(obj) COM_FORWARD_IFramebuffer_GETTER_PixelFormat_TO ((obj)->)
-#define COM_FORWARD_IFramebuffer_GETTER_PixelFormat_TO_BASE(base) COM_FORWARD_IFramebuffer_GETTER_PixelFormat_TO (base::)
-#define COM_FORWARD_IFramebuffer_GETTER_UsesGuestVRAM_TO(smth) HRESULT STDMETHODCALLTYPE get_UsesGuestVRAM (BOOL * aUsesGuestVRAM) { return smth get_UsesGuestVRAM (aUsesGuestVRAM); }
-#define COM_FORWARD_IFramebuffer_GETTER_UsesGuestVRAM_TO_OBJ(obj) COM_FORWARD_IFramebuffer_GETTER_UsesGuestVRAM_TO ((obj)->)
-#define COM_FORWARD_IFramebuffer_GETTER_UsesGuestVRAM_TO_BASE(base) COM_FORWARD_IFramebuffer_GETTER_UsesGuestVRAM_TO (base::)
-#define COM_FORWARD_IFramebuffer_GETTER_HeightReduction_TO(smth) HRESULT STDMETHODCALLTYPE get_HeightReduction (ULONG * aHeightReduction) { return smth get_HeightReduction (aHeightReduction); }
-#define COM_FORWARD_IFramebuffer_GETTER_HeightReduction_TO_OBJ(obj) COM_FORWARD_IFramebuffer_GETTER_HeightReduction_TO ((obj)->)
-#define COM_FORWARD_IFramebuffer_GETTER_HeightReduction_TO_BASE(base) COM_FORWARD_IFramebuffer_GETTER_HeightReduction_TO (base::)
-#define COM_FORWARD_IFramebuffer_GETTER_Overlay_TO(smth) HRESULT STDMETHODCALLTYPE get_Overlay (IFramebufferOverlay * * aOverlay) { return smth get_Overlay (aOverlay); }
-#define COM_FORWARD_IFramebuffer_GETTER_Overlay_TO_OBJ(obj) COM_FORWARD_IFramebuffer_GETTER_Overlay_TO ((obj)->)
-#define COM_FORWARD_IFramebuffer_GETTER_Overlay_TO_BASE(base) COM_FORWARD_IFramebuffer_GETTER_Overlay_TO (base::)
-#define COM_FORWARD_IFramebuffer_GETTER_WinId_TO(smth) HRESULT STDMETHODCALLTYPE get_WinId (ULONG64 * aWinId) { return smth get_WinId (aWinId); }
-#define COM_FORWARD_IFramebuffer_GETTER_WinId_TO_OBJ(obj) COM_FORWARD_IFramebuffer_GETTER_WinId_TO ((obj)->)
-#define COM_FORWARD_IFramebuffer_GETTER_WinId_TO_BASE(base) COM_FORWARD_IFramebuffer_GETTER_WinId_TO (base::)
-#define COM_FORWARD_IFramebuffer_Lock_TO(smth) HRESULT STDMETHODCALLTYPE Lock() { return smth Lock(); }
-#define COM_FORWARD_IFramebuffer_Lock_TO_OBJ(obj) COM_FORWARD_IFramebuffer_Lock_TO ((obj)->)
-#define COM_FORWARD_IFramebuffer_Lock_TO_BASE(base) COM_FORWARD_IFramebuffer_Lock_TO (base::)
-#define COM_FORWARD_IFramebuffer_Unlock_TO(smth) HRESULT STDMETHODCALLTYPE Unlock() { return smth Unlock(); }
-#define COM_FORWARD_IFramebuffer_Unlock_TO_OBJ(obj) COM_FORWARD_IFramebuffer_Unlock_TO ((obj)->)
-#define COM_FORWARD_IFramebuffer_Unlock_TO_BASE(base) COM_FORWARD_IFramebuffer_Unlock_TO (base::)
-#define COM_FORWARD_IFramebuffer_NotifyUpdate_TO(smth) HRESULT STDMETHODCALLTYPE NotifyUpdate (ULONG aX, ULONG aY, ULONG aWidth, ULONG aHeight) { return smth NotifyUpdate (aX, aY, aWidth, aHeight); }
-#define COM_FORWARD_IFramebuffer_NotifyUpdate_TO_OBJ(obj) COM_FORWARD_IFramebuffer_NotifyUpdate_TO ((obj)->)
-#define COM_FORWARD_IFramebuffer_NotifyUpdate_TO_BASE(base) COM_FORWARD_IFramebuffer_NotifyUpdate_TO (base::)
-#define COM_FORWARD_IFramebuffer_RequestResize_TO(smth) HRESULT STDMETHODCALLTYPE RequestResize (ULONG aScreenId, ULONG aPixelFormat, BYTE * aVRAM, ULONG aBitsPerPixel, ULONG aBytesPerLine, ULONG aWidth, ULONG aHeight, BOOL * aFinished) { return smth RequestResize (aScreenId, aPixelFormat, aVRAM, aBitsPerPixel, aBytesPerLine, aWidth, aHeight, aFinished); }
-#define COM_FORWARD_IFramebuffer_RequestResize_TO_OBJ(obj) COM_FORWARD_IFramebuffer_RequestResize_TO ((obj)->)
-#define COM_FORWARD_IFramebuffer_RequestResize_TO_BASE(base) COM_FORWARD_IFramebuffer_RequestResize_TO (base::)
-#define COM_FORWARD_IFramebuffer_VideoModeSupported_TO(smth) HRESULT STDMETHODCALLTYPE VideoModeSupported (ULONG aWidth, ULONG aHeight, ULONG aBpp, BOOL * aSupported) { return smth VideoModeSupported (aWidth, aHeight, aBpp, aSupported); }
-#define COM_FORWARD_IFramebuffer_VideoModeSupported_TO_OBJ(obj) COM_FORWARD_IFramebuffer_VideoModeSupported_TO ((obj)->)
-#define COM_FORWARD_IFramebuffer_VideoModeSupported_TO_BASE(base) COM_FORWARD_IFramebuffer_VideoModeSupported_TO (base::)
-#define COM_FORWARD_IFramebuffer_GetVisibleRegion_TO(smth) HRESULT STDMETHODCALLTYPE GetVisibleRegion (BYTE * aRectangles, ULONG aCount, ULONG * aCountCopied) { return smth GetVisibleRegion (aRectangles, aCount, aCountCopied); }
-#define COM_FORWARD_IFramebuffer_GetVisibleRegion_TO_OBJ(obj) COM_FORWARD_IFramebuffer_GetVisibleRegion_TO ((obj)->)
-#define COM_FORWARD_IFramebuffer_GetVisibleRegion_TO_BASE(base) COM_FORWARD_IFramebuffer_GetVisibleRegion_TO (base::)
-#define COM_FORWARD_IFramebuffer_SetVisibleRegion_TO(smth) HRESULT STDMETHODCALLTYPE SetVisibleRegion (BYTE * aRectangles, ULONG aCount) { return smth SetVisibleRegion (aRectangles, aCount); }
-#define COM_FORWARD_IFramebuffer_SetVisibleRegion_TO_OBJ(obj) COM_FORWARD_IFramebuffer_SetVisibleRegion_TO ((obj)->)
-#define COM_FORWARD_IFramebuffer_SetVisibleRegion_TO_BASE(base) COM_FORWARD_IFramebuffer_SetVisibleRegion_TO (base::)
-#define COM_FORWARD_IFramebuffer_ProcessVHWACommand_TO(smth) HRESULT STDMETHODCALLTYPE ProcessVHWACommand (BYTE * aCommand) { return smth ProcessVHWACommand (aCommand); }
-#define COM_FORWARD_IFramebuffer_ProcessVHWACommand_TO_OBJ(obj) COM_FORWARD_IFramebuffer_ProcessVHWACommand_TO ((obj)->)
-#define COM_FORWARD_IFramebuffer_ProcessVHWACommand_TO_BASE(base) COM_FORWARD_IFramebuffer_ProcessVHWACommand_TO (base::)
-#define COM_FORWARD_IFramebuffer_TO(smth) COM_FORWARD_IFramebuffer_GETTER_Address_TO (smth) COM_FORWARD_IFramebuffer_GETTER_Width_TO (smth) COM_FORWARD_IFramebuffer_GETTER_Height_TO (smth) COM_FORWARD_IFramebuffer_GETTER_BitsPerPixel_TO (smth) COM_FORWARD_IFramebuffer_GETTER_BytesPerLine_TO (smth) COM_FORWARD_IFramebuffer_GETTER_PixelFormat_TO (smth) COM_FORWARD_IFramebuffer_GETTER_UsesGuestVRAM_TO (smth) COM_FORWARD_IFramebuffer_GETTER_HeightReduction_TO (smth) COM_FORWARD_IFramebuffer_ [...]
-#define COM_FORWARD_IFramebuffer_TO_OBJ(obj) COM_FORWARD_IFramebuffer_TO ((obj)->)
-#define COM_FORWARD_IFramebuffer_TO_BASE(base) COM_FORWARD_IFramebuffer_TO (base::)
-#define COM_FORWARD_IFramebufferOverlay_GETTER_X_TO(smth) HRESULT STDMETHODCALLTYPE get_X (ULONG * aX) { return smth get_X (aX); }
-#define COM_FORWARD_IFramebufferOverlay_GETTER_X_TO_OBJ(obj) COM_FORWARD_IFramebufferOverlay_GETTER_X_TO ((obj)->)
-#define COM_FORWARD_IFramebufferOverlay_GETTER_X_TO_BASE(base) COM_FORWARD_IFramebufferOverlay_GETTER_X_TO (base::)
-#define COM_FORWARD_IFramebufferOverlay_GETTER_Y_TO(smth) HRESULT STDMETHODCALLTYPE get_Y (ULONG * aY) { return smth get_Y (aY); }
-#define COM_FORWARD_IFramebufferOverlay_GETTER_Y_TO_OBJ(obj) COM_FORWARD_IFramebufferOverlay_GETTER_Y_TO ((obj)->)
-#define COM_FORWARD_IFramebufferOverlay_GETTER_Y_TO_BASE(base) COM_FORWARD_IFramebufferOverlay_GETTER_Y_TO (base::)
-#define COM_FORWARD_IFramebufferOverlay_GETTER_Visible_TO(smth) HRESULT STDMETHODCALLTYPE get_Visible (BOOL * aVisible) { return smth get_Visible (aVisible); }
-#define COM_FORWARD_IFramebufferOverlay_GETTER_Visible_TO_OBJ(obj) COM_FORWARD_IFramebufferOverlay_GETTER_Visible_TO ((obj)->)
-#define COM_FORWARD_IFramebufferOverlay_GETTER_Visible_TO_BASE(base) COM_FORWARD_IFramebufferOverlay_GETTER_Visible_TO (base::)
-#define COM_FORWARD_IFramebufferOverlay_SETTER_Visible_TO(smth) HRESULT STDMETHODCALLTYPE put_Visible (BOOL aVisible) { return smth put_Visible (aVisible); }
-#define COM_FORWARD_IFramebufferOverlay_SETTER_Visible_TO_OBJ(obj) COM_FORWARD_IFramebufferOverlay_SETTER_Visible_TO ((obj)->)
-#define COM_FORWARD_IFramebufferOverlay_SETTER_Visible_TO_BASE(base) COM_FORWARD_IFramebufferOverlay_SETTER_Visible_TO (base::)
-#define COM_FORWARD_IFramebufferOverlay_GETTER_Alpha_TO(smth) HRESULT STDMETHODCALLTYPE get_Alpha (ULONG * aAlpha) { return smth get_Alpha (aAlpha); }
-#define COM_FORWARD_IFramebufferOverlay_GETTER_Alpha_TO_OBJ(obj) COM_FORWARD_IFramebufferOverlay_GETTER_Alpha_TO ((obj)->)
-#define COM_FORWARD_IFramebufferOverlay_GETTER_Alpha_TO_BASE(base) COM_FORWARD_IFramebufferOverlay_GETTER_Alpha_TO (base::)
-#define COM_FORWARD_IFramebufferOverlay_SETTER_Alpha_TO(smth) HRESULT STDMETHODCALLTYPE put_Alpha (ULONG aAlpha) { return smth put_Alpha (aAlpha); }
-#define COM_FORWARD_IFramebufferOverlay_SETTER_Alpha_TO_OBJ(obj) COM_FORWARD_IFramebufferOverlay_SETTER_Alpha_TO ((obj)->)
-#define COM_FORWARD_IFramebufferOverlay_SETTER_Alpha_TO_BASE(base) COM_FORWARD_IFramebufferOverlay_SETTER_Alpha_TO (base::)
-#define COM_FORWARD_IFramebufferOverlay_Move_TO(smth) HRESULT STDMETHODCALLTYPE Move (ULONG aX, ULONG aY) { return smth Move (aX, aY); }
-#define COM_FORWARD_IFramebufferOverlay_Move_TO_OBJ(obj) COM_FORWARD_IFramebufferOverlay_Move_TO ((obj)->)
-#define COM_FORWARD_IFramebufferOverlay_Move_TO_BASE(base) COM_FORWARD_IFramebufferOverlay_Move_TO (base::)
-#define COM_FORWARD_IFramebufferOverlay_TO(smth) COM_FORWARD_IFramebufferOverlay_GETTER_X_TO (smth) COM_FORWARD_IFramebufferOverlay_GETTER_Y_TO (smth) COM_FORWARD_IFramebufferOverlay_GETTER_Visible_TO (smth) COM_FORWARD_IFramebufferOverlay_SETTER_Visible_TO (smth) COM_FORWARD_IFramebufferOverlay_GETTER_Alpha_TO (smth) COM_FORWARD_IFramebufferOverlay_SETTER_Alpha_TO (smth) COM_FORWARD_IFramebufferOverlay_Move_TO (smth) 
-#define COM_FORWARD_IFramebufferOverlay_TO_OBJ(obj) COM_FORWARD_IFramebufferOverlay_TO ((obj)->)
-#define COM_FORWARD_IFramebufferOverlay_TO_BASE(base) COM_FORWARD_IFramebufferOverlay_TO (base::)
-#define COM_FORWARD_IDisplay_GetScreenResolution_TO(smth) HRESULT STDMETHODCALLTYPE GetScreenResolution (ULONG aScreenId, ULONG * aWidth, ULONG * aHeight, ULONG * aBitsPerPixel) { return smth GetScreenResolution (aScreenId, aWidth, aHeight, aBitsPerPixel); }
-#define COM_FORWARD_IDisplay_GetScreenResolution_TO_OBJ(obj) COM_FORWARD_IDisplay_GetScreenResolution_TO ((obj)->)
-#define COM_FORWARD_IDisplay_GetScreenResolution_TO_BASE(base) COM_FORWARD_IDisplay_GetScreenResolution_TO (base::)
-#define COM_FORWARD_IDisplay_SetFramebuffer_TO(smth) HRESULT STDMETHODCALLTYPE SetFramebuffer (ULONG aScreenId, IFramebuffer * aFramebuffer) { return smth SetFramebuffer (aScreenId, aFramebuffer); }
-#define COM_FORWARD_IDisplay_SetFramebuffer_TO_OBJ(obj) COM_FORWARD_IDisplay_SetFramebuffer_TO ((obj)->)
-#define COM_FORWARD_IDisplay_SetFramebuffer_TO_BASE(base) COM_FORWARD_IDisplay_SetFramebuffer_TO (base::)
-#define COM_FORWARD_IDisplay_GetFramebuffer_TO(smth) HRESULT STDMETHODCALLTYPE GetFramebuffer (ULONG aScreenId, IFramebuffer * * aFramebuffer, LONG * aXOrigin, LONG * aYOrigin) { return smth GetFramebuffer (aScreenId, aFramebuffer, aXOrigin, aYOrigin); }
-#define COM_FORWARD_IDisplay_GetFramebuffer_TO_OBJ(obj) COM_FORWARD_IDisplay_GetFramebuffer_TO ((obj)->)
-#define COM_FORWARD_IDisplay_GetFramebuffer_TO_BASE(base) COM_FORWARD_IDisplay_GetFramebuffer_TO (base::)
-#define COM_FORWARD_IDisplay_SetVideoModeHint_TO(smth) HRESULT STDMETHODCALLTYPE SetVideoModeHint (ULONG aWidth, ULONG aHeight, ULONG aBitsPerPixel, ULONG aDisplay) { return smth SetVideoModeHint (aWidth, aHeight, aBitsPerPixel, aDisplay); }
-#define COM_FORWARD_IDisplay_SetVideoModeHint_TO_OBJ(obj) COM_FORWARD_IDisplay_SetVideoModeHint_TO ((obj)->)
-#define COM_FORWARD_IDisplay_SetVideoModeHint_TO_BASE(base) COM_FORWARD_IDisplay_SetVideoModeHint_TO (base::)
-#define COM_FORWARD_IDisplay_SetSeamlessMode_TO(smth) HRESULT STDMETHODCALLTYPE SetSeamlessMode (BOOL aEnabled) { return smth SetSeamlessMode (aEnabled); }
-#define COM_FORWARD_IDisplay_SetSeamlessMode_TO_OBJ(obj) COM_FORWARD_IDisplay_SetSeamlessMode_TO ((obj)->)
-#define COM_FORWARD_IDisplay_SetSeamlessMode_TO_BASE(base) COM_FORWARD_IDisplay_SetSeamlessMode_TO (base::)
-#define COM_FORWARD_IDisplay_TakeScreenShot_TO(smth) HRESULT STDMETHODCALLTYPE TakeScreenShot (ULONG aScreenId, BYTE * aAddress, ULONG aWidth, ULONG aHeight) { return smth TakeScreenShot (aScreenId, aAddress, aWidth, aHeight); }
-#define COM_FORWARD_IDisplay_TakeScreenShot_TO_OBJ(obj) COM_FORWARD_IDisplay_TakeScreenShot_TO ((obj)->)
-#define COM_FORWARD_IDisplay_TakeScreenShot_TO_BASE(base) COM_FORWARD_IDisplay_TakeScreenShot_TO (base::)
-#define COM_FORWARD_IDisplay_TakeScreenShotToArray_TO(smth) HRESULT STDMETHODCALLTYPE TakeScreenShotToArray (ULONG aScreenId, ULONG aWidth, ULONG aHeight, SAFEARRAY * * aScreenData) { return smth TakeScreenShotToArray (aScreenId, aWidth, aHeight, aScreenData); }
-#define COM_FORWARD_IDisplay_TakeScreenShotToArray_TO_OBJ(obj) COM_FORWARD_IDisplay_TakeScreenShotToArray_TO ((obj)->)
-#define COM_FORWARD_IDisplay_TakeScreenShotToArray_TO_BASE(base) COM_FORWARD_IDisplay_TakeScreenShotToArray_TO (base::)
-#define COM_FORWARD_IDisplay_DrawToScreen_TO(smth) HRESULT STDMETHODCALLTYPE DrawToScreen (ULONG aScreenId, BYTE * aAddress, ULONG aX, ULONG aY, ULONG aWidth, ULONG aHeight) { return smth DrawToScreen (aScreenId, aAddress, aX, aY, aWidth, aHeight); }
-#define COM_FORWARD_IDisplay_DrawToScreen_TO_OBJ(obj) COM_FORWARD_IDisplay_DrawToScreen_TO ((obj)->)
-#define COM_FORWARD_IDisplay_DrawToScreen_TO_BASE(base) COM_FORWARD_IDisplay_DrawToScreen_TO (base::)
-#define COM_FORWARD_IDisplay_InvalidateAndUpdate_TO(smth) HRESULT STDMETHODCALLTYPE InvalidateAndUpdate() { return smth InvalidateAndUpdate(); }
-#define COM_FORWARD_IDisplay_InvalidateAndUpdate_TO_OBJ(obj) COM_FORWARD_IDisplay_InvalidateAndUpdate_TO ((obj)->)
-#define COM_FORWARD_IDisplay_InvalidateAndUpdate_TO_BASE(base) COM_FORWARD_IDisplay_InvalidateAndUpdate_TO (base::)
-#define COM_FORWARD_IDisplay_ResizeCompleted_TO(smth) HRESULT STDMETHODCALLTYPE ResizeCompleted (ULONG aScreenId) { return smth ResizeCompleted (aScreenId); }
-#define COM_FORWARD_IDisplay_ResizeCompleted_TO_OBJ(obj) COM_FORWARD_IDisplay_ResizeCompleted_TO ((obj)->)
-#define COM_FORWARD_IDisplay_ResizeCompleted_TO_BASE(base) COM_FORWARD_IDisplay_ResizeCompleted_TO (base::)
-#define COM_FORWARD_IDisplay_CompleteVHWACommand_TO(smth) HRESULT STDMETHODCALLTYPE CompleteVHWACommand (BYTE * aCommand) { return smth CompleteVHWACommand (aCommand); }
-#define COM_FORWARD_IDisplay_CompleteVHWACommand_TO_OBJ(obj) COM_FORWARD_IDisplay_CompleteVHWACommand_TO ((obj)->)
-#define COM_FORWARD_IDisplay_CompleteVHWACommand_TO_BASE(base) COM_FORWARD_IDisplay_CompleteVHWACommand_TO (base::)
-#define COM_FORWARD_IDisplay_TO(smth) COM_FORWARD_IDisplay_GetScreenResolution_TO (smth) COM_FORWARD_IDisplay_SetFramebuffer_TO (smth) COM_FORWARD_IDisplay_GetFramebuffer_TO (smth) COM_FORWARD_IDisplay_SetVideoModeHint_TO (smth) COM_FORWARD_IDisplay_SetSeamlessMode_TO (smth) COM_FORWARD_IDisplay_TakeScreenShot_TO (smth) COM_FORWARD_IDisplay_TakeScreenShotToArray_TO (smth) COM_FORWARD_IDisplay_DrawToScreen_TO (smth) COM_FORWARD_IDisplay_InvalidateAndUpdate_TO (smth) COM_FORWARD_IDisplay_R [...]
-#define COM_FORWARD_IDisplay_TO_OBJ(obj) COM_FORWARD_IDisplay_TO ((obj)->)
-#define COM_FORWARD_IDisplay_TO_BASE(base) COM_FORWARD_IDisplay_TO (base::)
-#define COM_FORWARD_INetworkAdapter_GETTER_AdapterType_TO(smth) HRESULT STDMETHODCALLTYPE get_AdapterType (NetworkAdapterType * aAdapterType) { return smth get_AdapterType (aAdapterType); }
-#define COM_FORWARD_INetworkAdapter_GETTER_AdapterType_TO_OBJ(obj) COM_FORWARD_INetworkAdapter_GETTER_AdapterType_TO ((obj)->)
-#define COM_FORWARD_INetworkAdapter_GETTER_AdapterType_TO_BASE(base) COM_FORWARD_INetworkAdapter_GETTER_AdapterType_TO (base::)
-#define COM_FORWARD_INetworkAdapter_SETTER_AdapterType_TO(smth) HRESULT STDMETHODCALLTYPE put_AdapterType (NetworkAdapterType aAdapterType) { return smth put_AdapterType (aAdapterType); }
-#define COM_FORWARD_INetworkAdapter_SETTER_AdapterType_TO_OBJ(obj) COM_FORWARD_INetworkAdapter_SETTER_AdapterType_TO ((obj)->)
-#define COM_FORWARD_INetworkAdapter_SETTER_AdapterType_TO_BASE(base) COM_FORWARD_INetworkAdapter_SETTER_AdapterType_TO (base::)
-#define COM_FORWARD_INetworkAdapter_GETTER_Slot_TO(smth) HRESULT STDMETHODCALLTYPE get_Slot (ULONG * aSlot) { return smth get_Slot (aSlot); }
-#define COM_FORWARD_INetworkAdapter_GETTER_Slot_TO_OBJ(obj) COM_FORWARD_INetworkAdapter_GETTER_Slot_TO ((obj)->)
-#define COM_FORWARD_INetworkAdapter_GETTER_Slot_TO_BASE(base) COM_FORWARD_INetworkAdapter_GETTER_Slot_TO (base::)
-#define COM_FORWARD_INetworkAdapter_GETTER_Enabled_TO(smth) HRESULT STDMETHODCALLTYPE get_Enabled (BOOL * aEnabled) { return smth get_Enabled (aEnabled); }
-#define COM_FORWARD_INetworkAdapter_GETTER_Enabled_TO_OBJ(obj) COM_FORWARD_INetworkAdapter_GETTER_Enabled_TO ((obj)->)
-#define COM_FORWARD_INetworkAdapter_GETTER_Enabled_TO_BASE(base) COM_FORWARD_INetworkAdapter_GETTER_Enabled_TO (base::)
-#define COM_FORWARD_INetworkAdapter_SETTER_Enabled_TO(smth) HRESULT STDMETHODCALLTYPE put_Enabled (BOOL aEnabled) { return smth put_Enabled (aEnabled); }
-#define COM_FORWARD_INetworkAdapter_SETTER_Enabled_TO_OBJ(obj) COM_FORWARD_INetworkAdapter_SETTER_Enabled_TO ((obj)->)
-#define COM_FORWARD_INetworkAdapter_SETTER_Enabled_TO_BASE(base) COM_FORWARD_INetworkAdapter_SETTER_Enabled_TO (base::)
-#define COM_FORWARD_INetworkAdapter_GETTER_MACAddress_TO(smth) HRESULT STDMETHODCALLTYPE get_MACAddress (BSTR * aMACAddress) { return smth get_MACAddress (aMACAddress); }
-#define COM_FORWARD_INetworkAdapter_GETTER_MACAddress_TO_OBJ(obj) COM_FORWARD_INetworkAdapter_GETTER_MACAddress_TO ((obj)->)
-#define COM_FORWARD_INetworkAdapter_GETTER_MACAddress_TO_BASE(base) COM_FORWARD_INetworkAdapter_GETTER_MACAddress_TO (base::)
-#define COM_FORWARD_INetworkAdapter_SETTER_MACAddress_TO(smth) HRESULT STDMETHODCALLTYPE put_MACAddress (BSTR aMACAddress) { return smth put_MACAddress (aMACAddress); }
-#define COM_FORWARD_INetworkAdapter_SETTER_MACAddress_TO_OBJ(obj) COM_FORWARD_INetworkAdapter_SETTER_MACAddress_TO ((obj)->)
-#define COM_FORWARD_INetworkAdapter_SETTER_MACAddress_TO_BASE(base) COM_FORWARD_INetworkAdapter_SETTER_MACAddress_TO (base::)
-#define COM_FORWARD_INetworkAdapter_GETTER_AttachmentType_TO(smth) HRESULT STDMETHODCALLTYPE get_AttachmentType (NetworkAttachmentType * aAttachmentType) { return smth get_AttachmentType (aAttachmentType); }
-#define COM_FORWARD_INetworkAdapter_GETTER_AttachmentType_TO_OBJ(obj) COM_FORWARD_INetworkAdapter_GETTER_AttachmentType_TO ((obj)->)
-#define COM_FORWARD_INetworkAdapter_GETTER_AttachmentType_TO_BASE(base) COM_FORWARD_INetworkAdapter_GETTER_AttachmentType_TO (base::)
-#define COM_FORWARD_INetworkAdapter_GETTER_HostInterface_TO(smth) HRESULT STDMETHODCALLTYPE get_HostInterface (BSTR * aHostInterface) { return smth get_HostInterface (aHostInterface); }
-#define COM_FORWARD_INetworkAdapter_GETTER_HostInterface_TO_OBJ(obj) COM_FORWARD_INetworkAdapter_GETTER_HostInterface_TO ((obj)->)
-#define COM_FORWARD_INetworkAdapter_GETTER_HostInterface_TO_BASE(base) COM_FORWARD_INetworkAdapter_GETTER_HostInterface_TO (base::)
-#define COM_FORWARD_INetworkAdapter_SETTER_HostInterface_TO(smth) HRESULT STDMETHODCALLTYPE put_HostInterface (BSTR aHostInterface) { return smth put_HostInterface (aHostInterface); }
-#define COM_FORWARD_INetworkAdapter_SETTER_HostInterface_TO_OBJ(obj) COM_FORWARD_INetworkAdapter_SETTER_HostInterface_TO ((obj)->)
-#define COM_FORWARD_INetworkAdapter_SETTER_HostInterface_TO_BASE(base) COM_FORWARD_INetworkAdapter_SETTER_HostInterface_TO (base::)
-#define COM_FORWARD_INetworkAdapter_GETTER_InternalNetwork_TO(smth) HRESULT STDMETHODCALLTYPE get_InternalNetwork (BSTR * aInternalNetwork) { return smth get_InternalNetwork (aInternalNetwork); }
-#define COM_FORWARD_INetworkAdapter_GETTER_InternalNetwork_TO_OBJ(obj) COM_FORWARD_INetworkAdapter_GETTER_InternalNetwork_TO ((obj)->)
-#define COM_FORWARD_INetworkAdapter_GETTER_InternalNetwork_TO_BASE(base) COM_FORWARD_INetworkAdapter_GETTER_InternalNetwork_TO (base::)
-#define COM_FORWARD_INetworkAdapter_SETTER_InternalNetwork_TO(smth) HRESULT STDMETHODCALLTYPE put_InternalNetwork (BSTR aInternalNetwork) { return smth put_InternalNetwork (aInternalNetwork); }
-#define COM_FORWARD_INetworkAdapter_SETTER_InternalNetwork_TO_OBJ(obj) COM_FORWARD_INetworkAdapter_SETTER_InternalNetwork_TO ((obj)->)
-#define COM_FORWARD_INetworkAdapter_SETTER_InternalNetwork_TO_BASE(base) COM_FORWARD_INetworkAdapter_SETTER_InternalNetwork_TO (base::)
-#define COM_FORWARD_INetworkAdapter_GETTER_NATNetwork_TO(smth) HRESULT STDMETHODCALLTYPE get_NATNetwork (BSTR * aNATNetwork) { return smth get_NATNetwork (aNATNetwork); }
-#define COM_FORWARD_INetworkAdapter_GETTER_NATNetwork_TO_OBJ(obj) COM_FORWARD_INetworkAdapter_GETTER_NATNetwork_TO ((obj)->)
-#define COM_FORWARD_INetworkAdapter_GETTER_NATNetwork_TO_BASE(base) COM_FORWARD_INetworkAdapter_GETTER_NATNetwork_TO (base::)
-#define COM_FORWARD_INetworkAdapter_SETTER_NATNetwork_TO(smth) HRESULT STDMETHODCALLTYPE put_NATNetwork (BSTR aNATNetwork) { return smth put_NATNetwork (aNATNetwork); }
-#define COM_FORWARD_INetworkAdapter_SETTER_NATNetwork_TO_OBJ(obj) COM_FORWARD_INetworkAdapter_SETTER_NATNetwork_TO ((obj)->)
-#define COM_FORWARD_INetworkAdapter_SETTER_NATNetwork_TO_BASE(base) COM_FORWARD_INetworkAdapter_SETTER_NATNetwork_TO (base::)
-#define COM_FORWARD_INetworkAdapter_GETTER_VDENetwork_TO(smth) HRESULT STDMETHODCALLTYPE get_VDENetwork (BSTR * aVDENetwork) { return smth get_VDENetwork (aVDENetwork); }
-#define COM_FORWARD_INetworkAdapter_GETTER_VDENetwork_TO_OBJ(obj) COM_FORWARD_INetworkAdapter_GETTER_VDENetwork_TO ((obj)->)
-#define COM_FORWARD_INetworkAdapter_GETTER_VDENetwork_TO_BASE(base) COM_FORWARD_INetworkAdapter_GETTER_VDENetwork_TO (base::)
-#define COM_FORWARD_INetworkAdapter_SETTER_VDENetwork_TO(smth) HRESULT STDMETHODCALLTYPE put_VDENetwork (BSTR aVDENetwork) { return smth put_VDENetwork (aVDENetwork); }
-#define COM_FORWARD_INetworkAdapter_SETTER_VDENetwork_TO_OBJ(obj) COM_FORWARD_INetworkAdapter_SETTER_VDENetwork_TO ((obj)->)
-#define COM_FORWARD_INetworkAdapter_SETTER_VDENetwork_TO_BASE(base) COM_FORWARD_INetworkAdapter_SETTER_VDENetwork_TO (base::)
-#define COM_FORWARD_INetworkAdapter_GETTER_CableConnected_TO(smth) HRESULT STDMETHODCALLTYPE get_CableConnected (BOOL * aCableConnected) { return smth get_CableConnected (aCableConnected); }
-#define COM_FORWARD_INetworkAdapter_GETTER_CableConnected_TO_OBJ(obj) COM_FORWARD_INetworkAdapter_GETTER_CableConnected_TO ((obj)->)
-#define COM_FORWARD_INetworkAdapter_GETTER_CableConnected_TO_BASE(base) COM_FORWARD_INetworkAdapter_GETTER_CableConnected_TO (base::)
-#define COM_FORWARD_INetworkAdapter_SETTER_CableConnected_TO(smth) HRESULT STDMETHODCALLTYPE put_CableConnected (BOOL aCableConnected) { return smth put_CableConnected (aCableConnected); }
-#define COM_FORWARD_INetworkAdapter_SETTER_CableConnected_TO_OBJ(obj) COM_FORWARD_INetworkAdapter_SETTER_CableConnected_TO ((obj)->)
-#define COM_FORWARD_INetworkAdapter_SETTER_CableConnected_TO_BASE(base) COM_FORWARD_INetworkAdapter_SETTER_CableConnected_TO (base::)
-#define COM_FORWARD_INetworkAdapter_GETTER_LineSpeed_TO(smth) HRESULT STDMETHODCALLTYPE get_LineSpeed (ULONG * aLineSpeed) { return smth get_LineSpeed (aLineSpeed); }
-#define COM_FORWARD_INetworkAdapter_GETTER_LineSpeed_TO_OBJ(obj) COM_FORWARD_INetworkAdapter_GETTER_LineSpeed_TO ((obj)->)
-#define COM_FORWARD_INetworkAdapter_GETTER_LineSpeed_TO_BASE(base) COM_FORWARD_INetworkAdapter_GETTER_LineSpeed_TO (base::)
-#define COM_FORWARD_INetworkAdapter_SETTER_LineSpeed_TO(smth) HRESULT STDMETHODCALLTYPE put_LineSpeed (ULONG aLineSpeed) { return smth put_LineSpeed (aLineSpeed); }
-#define COM_FORWARD_INetworkAdapter_SETTER_LineSpeed_TO_OBJ(obj) COM_FORWARD_INetworkAdapter_SETTER_LineSpeed_TO ((obj)->)
-#define COM_FORWARD_INetworkAdapter_SETTER_LineSpeed_TO_BASE(base) COM_FORWARD_INetworkAdapter_SETTER_LineSpeed_TO (base::)
-#define COM_FORWARD_INetworkAdapter_GETTER_TraceEnabled_TO(smth) HRESULT STDMETHODCALLTYPE get_TraceEnabled (BOOL * aTraceEnabled) { return smth get_TraceEnabled (aTraceEnabled); }
-#define COM_FORWARD_INetworkAdapter_GETTER_TraceEnabled_TO_OBJ(obj) COM_FORWARD_INetworkAdapter_GETTER_TraceEnabled_TO ((obj)->)
-#define COM_FORWARD_INetworkAdapter_GETTER_TraceEnabled_TO_BASE(base) COM_FORWARD_INetworkAdapter_GETTER_TraceEnabled_TO (base::)
-#define COM_FORWARD_INetworkAdapter_SETTER_TraceEnabled_TO(smth) HRESULT STDMETHODCALLTYPE put_TraceEnabled (BOOL aTraceEnabled) { return smth put_TraceEnabled (aTraceEnabled); }
-#define COM_FORWARD_INetworkAdapter_SETTER_TraceEnabled_TO_OBJ(obj) COM_FORWARD_INetworkAdapter_SETTER_TraceEnabled_TO ((obj)->)
-#define COM_FORWARD_INetworkAdapter_SETTER_TraceEnabled_TO_BASE(base) COM_FORWARD_INetworkAdapter_SETTER_TraceEnabled_TO (base::)
-#define COM_FORWARD_INetworkAdapter_GETTER_TraceFile_TO(smth) HRESULT STDMETHODCALLTYPE get_TraceFile (BSTR * aTraceFile) { return smth get_TraceFile (aTraceFile); }
-#define COM_FORWARD_INetworkAdapter_GETTER_TraceFile_TO_OBJ(obj) COM_FORWARD_INetworkAdapter_GETTER_TraceFile_TO ((obj)->)
-#define COM_FORWARD_INetworkAdapter_GETTER_TraceFile_TO_BASE(base) COM_FORWARD_INetworkAdapter_GETTER_TraceFile_TO (base::)
-#define COM_FORWARD_INetworkAdapter_SETTER_TraceFile_TO(smth) HRESULT STDMETHODCALLTYPE put_TraceFile (BSTR aTraceFile) { return smth put_TraceFile (aTraceFile); }
-#define COM_FORWARD_INetworkAdapter_SETTER_TraceFile_TO_OBJ(obj) COM_FORWARD_INetworkAdapter_SETTER_TraceFile_TO ((obj)->)
-#define COM_FORWARD_INetworkAdapter_SETTER_TraceFile_TO_BASE(base) COM_FORWARD_INetworkAdapter_SETTER_TraceFile_TO (base::)
-#define COM_FORWARD_INetworkAdapter_GETTER_NatDriver_TO(smth) HRESULT STDMETHODCALLTYPE get_NatDriver (INATEngine * * aNatDriver) { return smth get_NatDriver (aNatDriver); }
-#define COM_FORWARD_INetworkAdapter_GETTER_NatDriver_TO_OBJ(obj) COM_FORWARD_INetworkAdapter_GETTER_NatDriver_TO ((obj)->)
-#define COM_FORWARD_INetworkAdapter_GETTER_NatDriver_TO_BASE(base) COM_FORWARD_INetworkAdapter_GETTER_NatDriver_TO (base::)
-#define COM_FORWARD_INetworkAdapter_GETTER_BootPriority_TO(smth) HRESULT STDMETHODCALLTYPE get_BootPriority (ULONG * aBootPriority) { return smth get_BootPriority (aBootPriority); }
-#define COM_FORWARD_INetworkAdapter_GETTER_BootPriority_TO_OBJ(obj) COM_FORWARD_INetworkAdapter_GETTER_BootPriority_TO ((obj)->)
-#define COM_FORWARD_INetworkAdapter_GETTER_BootPriority_TO_BASE(base) COM_FORWARD_INetworkAdapter_GETTER_BootPriority_TO (base::)
-#define COM_FORWARD_INetworkAdapter_SETTER_BootPriority_TO(smth) HRESULT STDMETHODCALLTYPE put_BootPriority (ULONG aBootPriority) { return smth put_BootPriority (aBootPriority); }
-#define COM_FORWARD_INetworkAdapter_SETTER_BootPriority_TO_OBJ(obj) COM_FORWARD_INetworkAdapter_SETTER_BootPriority_TO ((obj)->)
-#define COM_FORWARD_INetworkAdapter_SETTER_BootPriority_TO_BASE(base) COM_FORWARD_INetworkAdapter_SETTER_BootPriority_TO (base::)
-#define COM_FORWARD_INetworkAdapter_AttachToNAT_TO(smth) HRESULT STDMETHODCALLTYPE AttachToNAT() { return smth AttachToNAT(); }
-#define COM_FORWARD_INetworkAdapter_AttachToNAT_TO_OBJ(obj) COM_FORWARD_INetworkAdapter_AttachToNAT_TO ((obj)->)
-#define COM_FORWARD_INetworkAdapter_AttachToNAT_TO_BASE(base) COM_FORWARD_INetworkAdapter_AttachToNAT_TO (base::)
-#define COM_FORWARD_INetworkAdapter_AttachToBridgedInterface_TO(smth) HRESULT STDMETHODCALLTYPE AttachToBridgedInterface() { return smth AttachToBridgedInterface(); }
-#define COM_FORWARD_INetworkAdapter_AttachToBridgedInterface_TO_OBJ(obj) COM_FORWARD_INetworkAdapter_AttachToBridgedInterface_TO ((obj)->)
-#define COM_FORWARD_INetworkAdapter_AttachToBridgedInterface_TO_BASE(base) COM_FORWARD_INetworkAdapter_AttachToBridgedInterface_TO (base::)
-#define COM_FORWARD_INetworkAdapter_AttachToInternalNetwork_TO(smth) HRESULT STDMETHODCALLTYPE AttachToInternalNetwork() { return smth AttachToInternalNetwork(); }
-#define COM_FORWARD_INetworkAdapter_AttachToInternalNetwork_TO_OBJ(obj) COM_FORWARD_INetworkAdapter_AttachToInternalNetwork_TO ((obj)->)
-#define COM_FORWARD_INetworkAdapter_AttachToInternalNetwork_TO_BASE(base) COM_FORWARD_INetworkAdapter_AttachToInternalNetwork_TO (base::)
-#define COM_FORWARD_INetworkAdapter_AttachToHostOnlyInterface_TO(smth) HRESULT STDMETHODCALLTYPE AttachToHostOnlyInterface() { return smth AttachToHostOnlyInterface(); }
-#define COM_FORWARD_INetworkAdapter_AttachToHostOnlyInterface_TO_OBJ(obj) COM_FORWARD_INetworkAdapter_AttachToHostOnlyInterface_TO ((obj)->)
-#define COM_FORWARD_INetworkAdapter_AttachToHostOnlyInterface_TO_BASE(base) COM_FORWARD_INetworkAdapter_AttachToHostOnlyInterface_TO (base::)
-#define COM_FORWARD_INetworkAdapter_AttachToVDE_TO(smth) HRESULT STDMETHODCALLTYPE AttachToVDE() { return smth AttachToVDE(); }
-#define COM_FORWARD_INetworkAdapter_AttachToVDE_TO_OBJ(obj) COM_FORWARD_INetworkAdapter_AttachToVDE_TO ((obj)->)
-#define COM_FORWARD_INetworkAdapter_AttachToVDE_TO_BASE(base) COM_FORWARD_INetworkAdapter_AttachToVDE_TO (base::)
-#define COM_FORWARD_INetworkAdapter_Detach_TO(smth) HRESULT STDMETHODCALLTYPE Detach() { return smth Detach(); }
-#define COM_FORWARD_INetworkAdapter_Detach_TO_OBJ(obj) COM_FORWARD_INetworkAdapter_Detach_TO ((obj)->)
-#define COM_FORWARD_INetworkAdapter_Detach_TO_BASE(base) COM_FORWARD_INetworkAdapter_Detach_TO (base::)
-#define COM_FORWARD_INetworkAdapter_TO(smth) COM_FORWARD_INetworkAdapter_GETTER_AdapterType_TO (smth) COM_FORWARD_INetworkAdapter_SETTER_AdapterType_TO (smth) COM_FORWARD_INetworkAdapter_GETTER_Slot_TO (smth) COM_FORWARD_INetworkAdapter_GETTER_Enabled_TO (smth) COM_FORWARD_INetworkAdapter_SETTER_Enabled_TO (smth) COM_FORWARD_INetworkAdapter_GETTER_MACAddress_TO (smth) COM_FORWARD_INetworkAdapter_SETTER_MACAddress_TO (smth) COM_FORWARD_INetworkAdapter_GETTER_AttachmentType_TO (smth) COM_F [...]
-#define COM_FORWARD_INetworkAdapter_TO_OBJ(obj) COM_FORWARD_INetworkAdapter_TO ((obj)->)
-#define COM_FORWARD_INetworkAdapter_TO_BASE(base) COM_FORWARD_INetworkAdapter_TO (base::)
-#define COM_FORWARD_ISerialPort_GETTER_Slot_TO(smth) HRESULT STDMETHODCALLTYPE get_Slot (ULONG * aSlot) { return smth get_Slot (aSlot); }
-#define COM_FORWARD_ISerialPort_GETTER_Slot_TO_OBJ(obj) COM_FORWARD_ISerialPort_GETTER_Slot_TO ((obj)->)
-#define COM_FORWARD_ISerialPort_GETTER_Slot_TO_BASE(base) COM_FORWARD_ISerialPort_GETTER_Slot_TO (base::)
-#define COM_FORWARD_ISerialPort_GETTER_Enabled_TO(smth) HRESULT STDMETHODCALLTYPE get_Enabled (BOOL * aEnabled) { return smth get_Enabled (aEnabled); }
-#define COM_FORWARD_ISerialPort_GETTER_Enabled_TO_OBJ(obj) COM_FORWARD_ISerialPort_GETTER_Enabled_TO ((obj)->)
-#define COM_FORWARD_ISerialPort_GETTER_Enabled_TO_BASE(base) COM_FORWARD_ISerialPort_GETTER_Enabled_TO (base::)
-#define COM_FORWARD_ISerialPort_SETTER_Enabled_TO(smth) HRESULT STDMETHODCALLTYPE put_Enabled (BOOL aEnabled) { return smth put_Enabled (aEnabled); }
-#define COM_FORWARD_ISerialPort_SETTER_Enabled_TO_OBJ(obj) COM_FORWARD_ISerialPort_SETTER_Enabled_TO ((obj)->)
-#define COM_FORWARD_ISerialPort_SETTER_Enabled_TO_BASE(base) COM_FORWARD_ISerialPort_SETTER_Enabled_TO (base::)
-#define COM_FORWARD_ISerialPort_GETTER_IOBase_TO(smth) HRESULT STDMETHODCALLTYPE get_IOBase (ULONG * aIOBase) { return smth get_IOBase (aIOBase); }
-#define COM_FORWARD_ISerialPort_GETTER_IOBase_TO_OBJ(obj) COM_FORWARD_ISerialPort_GETTER_IOBase_TO ((obj)->)
-#define COM_FORWARD_ISerialPort_GETTER_IOBase_TO_BASE(base) COM_FORWARD_ISerialPort_GETTER_IOBase_TO (base::)
-#define COM_FORWARD_ISerialPort_SETTER_IOBase_TO(smth) HRESULT STDMETHODCALLTYPE put_IOBase (ULONG aIOBase) { return smth put_IOBase (aIOBase); }
-#define COM_FORWARD_ISerialPort_SETTER_IOBase_TO_OBJ(obj) COM_FORWARD_ISerialPort_SETTER_IOBase_TO ((obj)->)
-#define COM_FORWARD_ISerialPort_SETTER_IOBase_TO_BASE(base) COM_FORWARD_ISerialPort_SETTER_IOBase_TO (base::)
-#define COM_FORWARD_ISerialPort_GETTER_IRQ_TO(smth) HRESULT STDMETHODCALLTYPE get_IRQ (ULONG * aIRQ) { return smth get_IRQ (aIRQ); }
-#define COM_FORWARD_ISerialPort_GETTER_IRQ_TO_OBJ(obj) COM_FORWARD_ISerialPort_GETTER_IRQ_TO ((obj)->)
-#define COM_FORWARD_ISerialPort_GETTER_IRQ_TO_BASE(base) COM_FORWARD_ISerialPort_GETTER_IRQ_TO (base::)
-#define COM_FORWARD_ISerialPort_SETTER_IRQ_TO(smth) HRESULT STDMETHODCALLTYPE put_IRQ (ULONG aIRQ) { return smth put_IRQ (aIRQ); }
-#define COM_FORWARD_ISerialPort_SETTER_IRQ_TO_OBJ(obj) COM_FORWARD_ISerialPort_SETTER_IRQ_TO ((obj)->)
-#define COM_FORWARD_ISerialPort_SETTER_IRQ_TO_BASE(base) COM_FORWARD_ISerialPort_SETTER_IRQ_TO (base::)
-#define COM_FORWARD_ISerialPort_GETTER_HostMode_TO(smth) HRESULT STDMETHODCALLTYPE get_HostMode (PortMode * aHostMode) { return smth get_HostMode (aHostMode); }
-#define COM_FORWARD_ISerialPort_GETTER_HostMode_TO_OBJ(obj) COM_FORWARD_ISerialPort_GETTER_HostMode_TO ((obj)->)
-#define COM_FORWARD_ISerialPort_GETTER_HostMode_TO_BASE(base) COM_FORWARD_ISerialPort_GETTER_HostMode_TO (base::)
-#define COM_FORWARD_ISerialPort_SETTER_HostMode_TO(smth) HRESULT STDMETHODCALLTYPE put_HostMode (PortMode aHostMode) { return smth put_HostMode (aHostMode); }
-#define COM_FORWARD_ISerialPort_SETTER_HostMode_TO_OBJ(obj) COM_FORWARD_ISerialPort_SETTER_HostMode_TO ((obj)->)
-#define COM_FORWARD_ISerialPort_SETTER_HostMode_TO_BASE(base) COM_FORWARD_ISerialPort_SETTER_HostMode_TO (base::)
-#define COM_FORWARD_ISerialPort_GETTER_Server_TO(smth) HRESULT STDMETHODCALLTYPE get_Server (BOOL * aServer) { return smth get_Server (aServer); }
-#define COM_FORWARD_ISerialPort_GETTER_Server_TO_OBJ(obj) COM_FORWARD_ISerialPort_GETTER_Server_TO ((obj)->)
-#define COM_FORWARD_ISerialPort_GETTER_Server_TO_BASE(base) COM_FORWARD_ISerialPort_GETTER_Server_TO (base::)
-#define COM_FORWARD_ISerialPort_SETTER_Server_TO(smth) HRESULT STDMETHODCALLTYPE put_Server (BOOL aServer) { return smth put_Server (aServer); }
-#define COM_FORWARD_ISerialPort_SETTER_Server_TO_OBJ(obj) COM_FORWARD_ISerialPort_SETTER_Server_TO ((obj)->)
-#define COM_FORWARD_ISerialPort_SETTER_Server_TO_BASE(base) COM_FORWARD_ISerialPort_SETTER_Server_TO (base::)
-#define COM_FORWARD_ISerialPort_GETTER_Path_TO(smth) HRESULT STDMETHODCALLTYPE get_Path (BSTR * aPath) { return smth get_Path (aPath); }
-#define COM_FORWARD_ISerialPort_GETTER_Path_TO_OBJ(obj) COM_FORWARD_ISerialPort_GETTER_Path_TO ((obj)->)
-#define COM_FORWARD_ISerialPort_GETTER_Path_TO_BASE(base) COM_FORWARD_ISerialPort_GETTER_Path_TO (base::)
-#define COM_FORWARD_ISerialPort_SETTER_Path_TO(smth) HRESULT STDMETHODCALLTYPE put_Path (BSTR aPath) { return smth put_Path (aPath); }
-#define COM_FORWARD_ISerialPort_SETTER_Path_TO_OBJ(obj) COM_FORWARD_ISerialPort_SETTER_Path_TO ((obj)->)
-#define COM_FORWARD_ISerialPort_SETTER_Path_TO_BASE(base) COM_FORWARD_ISerialPort_SETTER_Path_TO (base::)
-#define COM_FORWARD_ISerialPort_TO(smth) COM_FORWARD_ISerialPort_GETTER_Slot_TO (smth) COM_FORWARD_ISerialPort_GETTER_Enabled_TO (smth) COM_FORWARD_ISerialPort_SETTER_Enabled_TO (smth) COM_FORWARD_ISerialPort_GETTER_IOBase_TO (smth) COM_FORWARD_ISerialPort_SETTER_IOBase_TO (smth) COM_FORWARD_ISerialPort_GETTER_IRQ_TO (smth) COM_FORWARD_ISerialPort_SETTER_IRQ_TO (smth) COM_FORWARD_ISerialPort_GETTER_HostMode_TO (smth) COM_FORWARD_ISerialPort_SETTER_HostMode_TO (smth) COM_FORWARD_ISerialPo [...]
-#define COM_FORWARD_ISerialPort_TO_OBJ(obj) COM_FORWARD_ISerialPort_TO ((obj)->)
-#define COM_FORWARD_ISerialPort_TO_BASE(base) COM_FORWARD_ISerialPort_TO (base::)
-#define COM_FORWARD_IParallelPort_GETTER_Slot_TO(smth) HRESULT STDMETHODCALLTYPE get_Slot (ULONG * aSlot) { return smth get_Slot (aSlot); }
-#define COM_FORWARD_IParallelPort_GETTER_Slot_TO_OBJ(obj) COM_FORWARD_IParallelPort_GETTER_Slot_TO ((obj)->)
-#define COM_FORWARD_IParallelPort_GETTER_Slot_TO_BASE(base) COM_FORWARD_IParallelPort_GETTER_Slot_TO (base::)
-#define COM_FORWARD_IParallelPort_GETTER_Enabled_TO(smth) HRESULT STDMETHODCALLTYPE get_Enabled (BOOL * aEnabled) { return smth get_Enabled (aEnabled); }
-#define COM_FORWARD_IParallelPort_GETTER_Enabled_TO_OBJ(obj) COM_FORWARD_IParallelPort_GETTER_Enabled_TO ((obj)->)
-#define COM_FORWARD_IParallelPort_GETTER_Enabled_TO_BASE(base) COM_FORWARD_IParallelPort_GETTER_Enabled_TO (base::)
-#define COM_FORWARD_IParallelPort_SETTER_Enabled_TO(smth) HRESULT STDMETHODCALLTYPE put_Enabled (BOOL aEnabled) { return smth put_Enabled (aEnabled); }
-#define COM_FORWARD_IParallelPort_SETTER_Enabled_TO_OBJ(obj) COM_FORWARD_IParallelPort_SETTER_Enabled_TO ((obj)->)
-#define COM_FORWARD_IParallelPort_SETTER_Enabled_TO_BASE(base) COM_FORWARD_IParallelPort_SETTER_Enabled_TO (base::)
-#define COM_FORWARD_IParallelPort_GETTER_IOBase_TO(smth) HRESULT STDMETHODCALLTYPE get_IOBase (ULONG * aIOBase) { return smth get_IOBase (aIOBase); }
-#define COM_FORWARD_IParallelPort_GETTER_IOBase_TO_OBJ(obj) COM_FORWARD_IParallelPort_GETTER_IOBase_TO ((obj)->)
-#define COM_FORWARD_IParallelPort_GETTER_IOBase_TO_BASE(base) COM_FORWARD_IParallelPort_GETTER_IOBase_TO (base::)
-#define COM_FORWARD_IParallelPort_SETTER_IOBase_TO(smth) HRESULT STDMETHODCALLTYPE put_IOBase (ULONG aIOBase) { return smth put_IOBase (aIOBase); }
-#define COM_FORWARD_IParallelPort_SETTER_IOBase_TO_OBJ(obj) COM_FORWARD_IParallelPort_SETTER_IOBase_TO ((obj)->)
-#define COM_FORWARD_IParallelPort_SETTER_IOBase_TO_BASE(base) COM_FORWARD_IParallelPort_SETTER_IOBase_TO (base::)
-#define COM_FORWARD_IParallelPort_GETTER_IRQ_TO(smth) HRESULT STDMETHODCALLTYPE get_IRQ (ULONG * aIRQ) { return smth get_IRQ (aIRQ); }
-#define COM_FORWARD_IParallelPort_GETTER_IRQ_TO_OBJ(obj) COM_FORWARD_IParallelPort_GETTER_IRQ_TO ((obj)->)
-#define COM_FORWARD_IParallelPort_GETTER_IRQ_TO_BASE(base) COM_FORWARD_IParallelPort_GETTER_IRQ_TO (base::)
-#define COM_FORWARD_IParallelPort_SETTER_IRQ_TO(smth) HRESULT STDMETHODCALLTYPE put_IRQ (ULONG aIRQ) { return smth put_IRQ (aIRQ); }
-#define COM_FORWARD_IParallelPort_SETTER_IRQ_TO_OBJ(obj) COM_FORWARD_IParallelPort_SETTER_IRQ_TO ((obj)->)
-#define COM_FORWARD_IParallelPort_SETTER_IRQ_TO_BASE(base) COM_FORWARD_IParallelPort_SETTER_IRQ_TO (base::)
-#define COM_FORWARD_IParallelPort_GETTER_Path_TO(smth) HRESULT STDMETHODCALLTYPE get_Path (BSTR * aPath) { return smth get_Path (aPath); }
-#define COM_FORWARD_IParallelPort_GETTER_Path_TO_OBJ(obj) COM_FORWARD_IParallelPort_GETTER_Path_TO ((obj)->)
-#define COM_FORWARD_IParallelPort_GETTER_Path_TO_BASE(base) COM_FORWARD_IParallelPort_GETTER_Path_TO (base::)
-#define COM_FORWARD_IParallelPort_SETTER_Path_TO(smth) HRESULT STDMETHODCALLTYPE put_Path (BSTR aPath) { return smth put_Path (aPath); }
-#define COM_FORWARD_IParallelPort_SETTER_Path_TO_OBJ(obj) COM_FORWARD_IParallelPort_SETTER_Path_TO ((obj)->)
-#define COM_FORWARD_IParallelPort_SETTER_Path_TO_BASE(base) COM_FORWARD_IParallelPort_SETTER_Path_TO (base::)
-#define COM_FORWARD_IParallelPort_TO(smth) COM_FORWARD_IParallelPort_GETTER_Slot_TO (smth) COM_FORWARD_IParallelPort_GETTER_Enabled_TO (smth) COM_FORWARD_IParallelPort_SETTER_Enabled_TO (smth) COM_FORWARD_IParallelPort_GETTER_IOBase_TO (smth) COM_FORWARD_IParallelPort_SETTER_IOBase_TO (smth) COM_FORWARD_IParallelPort_GETTER_IRQ_TO (smth) COM_FORWARD_IParallelPort_SETTER_IRQ_TO (smth) COM_FORWARD_IParallelPort_GETTER_Path_TO (smth) COM_FORWARD_IParallelPort_SETTER_Path_TO (smth) 
-#define COM_FORWARD_IParallelPort_TO_OBJ(obj) COM_FORWARD_IParallelPort_TO ((obj)->)
-#define COM_FORWARD_IParallelPort_TO_BASE(base) COM_FORWARD_IParallelPort_TO (base::)
-#define COM_FORWARD_IMachineDebugger_GETTER_Singlestep_TO(smth) HRESULT STDMETHODCALLTYPE get_Singlestep (BOOL * aSinglestep) { return smth get_Singlestep (aSinglestep); }
-#define COM_FORWARD_IMachineDebugger_GETTER_Singlestep_TO_OBJ(obj) COM_FORWARD_IMachineDebugger_GETTER_Singlestep_TO ((obj)->)
-#define COM_FORWARD_IMachineDebugger_GETTER_Singlestep_TO_BASE(base) COM_FORWARD_IMachineDebugger_GETTER_Singlestep_TO (base::)
-#define COM_FORWARD_IMachineDebugger_SETTER_Singlestep_TO(smth) HRESULT STDMETHODCALLTYPE put_Singlestep (BOOL aSinglestep) { return smth put_Singlestep (aSinglestep); }
-#define COM_FORWARD_IMachineDebugger_SETTER_Singlestep_TO_OBJ(obj) COM_FORWARD_IMachineDebugger_SETTER_Singlestep_TO ((obj)->)
-#define COM_FORWARD_IMachineDebugger_SETTER_Singlestep_TO_BASE(base) COM_FORWARD_IMachineDebugger_SETTER_Singlestep_TO (base::)
-#define COM_FORWARD_IMachineDebugger_GETTER_RecompileUser_TO(smth) HRESULT STDMETHODCALLTYPE get_RecompileUser (BOOL * aRecompileUser) { return smth get_RecompileUser (aRecompileUser); }
-#define COM_FORWARD_IMachineDebugger_GETTER_RecompileUser_TO_OBJ(obj) COM_FORWARD_IMachineDebugger_GETTER_RecompileUser_TO ((obj)->)
-#define COM_FORWARD_IMachineDebugger_GETTER_RecompileUser_TO_BASE(base) COM_FORWARD_IMachineDebugger_GETTER_RecompileUser_TO (base::)
-#define COM_FORWARD_IMachineDebugger_SETTER_RecompileUser_TO(smth) HRESULT STDMETHODCALLTYPE put_RecompileUser (BOOL aRecompileUser) { return smth put_RecompileUser (aRecompileUser); }
-#define COM_FORWARD_IMachineDebugger_SETTER_RecompileUser_TO_OBJ(obj) COM_FORWARD_IMachineDebugger_SETTER_RecompileUser_TO ((obj)->)
-#define COM_FORWARD_IMachineDebugger_SETTER_RecompileUser_TO_BASE(base) COM_FORWARD_IMachineDebugger_SETTER_RecompileUser_TO (base::)
-#define COM_FORWARD_IMachineDebugger_GETTER_RecompileSupervisor_TO(smth) HRESULT STDMETHODCALLTYPE get_RecompileSupervisor (BOOL * aRecompileSupervisor) { return smth get_RecompileSupervisor (aRecompileSupervisor); }
-#define COM_FORWARD_IMachineDebugger_GETTER_RecompileSupervisor_TO_OBJ(obj) COM_FORWARD_IMachineDebugger_GETTER_RecompileSupervisor_TO ((obj)->)
-#define COM_FORWARD_IMachineDebugger_GETTER_RecompileSupervisor_TO_BASE(base) COM_FORWARD_IMachineDebugger_GETTER_RecompileSupervisor_TO (base::)
-#define COM_FORWARD_IMachineDebugger_SETTER_RecompileSupervisor_TO(smth) HRESULT STDMETHODCALLTYPE put_RecompileSupervisor (BOOL aRecompileSupervisor) { return smth put_RecompileSupervisor (aRecompileSupervisor); }
-#define COM_FORWARD_IMachineDebugger_SETTER_RecompileSupervisor_TO_OBJ(obj) COM_FORWARD_IMachineDebugger_SETTER_RecompileSupervisor_TO ((obj)->)
-#define COM_FORWARD_IMachineDebugger_SETTER_RecompileSupervisor_TO_BASE(base) COM_FORWARD_IMachineDebugger_SETTER_RecompileSupervisor_TO (base::)
-#define COM_FORWARD_IMachineDebugger_GETTER_PATMEnabled_TO(smth) HRESULT STDMETHODCALLTYPE get_PATMEnabled (BOOL * aPATMEnabled) { return smth get_PATMEnabled (aPATMEnabled); }
-#define COM_FORWARD_IMachineDebugger_GETTER_PATMEnabled_TO_OBJ(obj) COM_FORWARD_IMachineDebugger_GETTER_PATMEnabled_TO ((obj)->)
-#define COM_FORWARD_IMachineDebugger_GETTER_PATMEnabled_TO_BASE(base) COM_FORWARD_IMachineDebugger_GETTER_PATMEnabled_TO (base::)
-#define COM_FORWARD_IMachineDebugger_SETTER_PATMEnabled_TO(smth) HRESULT STDMETHODCALLTYPE put_PATMEnabled (BOOL aPATMEnabled) { return smth put_PATMEnabled (aPATMEnabled); }
-#define COM_FORWARD_IMachineDebugger_SETTER_PATMEnabled_TO_OBJ(obj) COM_FORWARD_IMachineDebugger_SETTER_PATMEnabled_TO ((obj)->)
-#define COM_FORWARD_IMachineDebugger_SETTER_PATMEnabled_TO_BASE(base) COM_FORWARD_IMachineDebugger_SETTER_PATMEnabled_TO (base::)
-#define COM_FORWARD_IMachineDebugger_GETTER_CSAMEnabled_TO(smth) HRESULT STDMETHODCALLTYPE get_CSAMEnabled (BOOL * aCSAMEnabled) { return smth get_CSAMEnabled (aCSAMEnabled); }
-#define COM_FORWARD_IMachineDebugger_GETTER_CSAMEnabled_TO_OBJ(obj) COM_FORWARD_IMachineDebugger_GETTER_CSAMEnabled_TO ((obj)->)
-#define COM_FORWARD_IMachineDebugger_GETTER_CSAMEnabled_TO_BASE(base) COM_FORWARD_IMachineDebugger_GETTER_CSAMEnabled_TO (base::)
-#define COM_FORWARD_IMachineDebugger_SETTER_CSAMEnabled_TO(smth) HRESULT STDMETHODCALLTYPE put_CSAMEnabled (BOOL aCSAMEnabled) { return smth put_CSAMEnabled (aCSAMEnabled); }
-#define COM_FORWARD_IMachineDebugger_SETTER_CSAMEnabled_TO_OBJ(obj) COM_FORWARD_IMachineDebugger_SETTER_CSAMEnabled_TO ((obj)->)
-#define COM_FORWARD_IMachineDebugger_SETTER_CSAMEnabled_TO_BASE(base) COM_FORWARD_IMachineDebugger_SETTER_CSAMEnabled_TO (base::)
-#define COM_FORWARD_IMachineDebugger_GETTER_LogEnabled_TO(smth) HRESULT STDMETHODCALLTYPE get_LogEnabled (BOOL * aLogEnabled) { return smth get_LogEnabled (aLogEnabled); }
-#define COM_FORWARD_IMachineDebugger_GETTER_LogEnabled_TO_OBJ(obj) COM_FORWARD_IMachineDebugger_GETTER_LogEnabled_TO ((obj)->)
-#define COM_FORWARD_IMachineDebugger_GETTER_LogEnabled_TO_BASE(base) COM_FORWARD_IMachineDebugger_GETTER_LogEnabled_TO (base::)
-#define COM_FORWARD_IMachineDebugger_SETTER_LogEnabled_TO(smth) HRESULT STDMETHODCALLTYPE put_LogEnabled (BOOL aLogEnabled) { return smth put_LogEnabled (aLogEnabled); }
-#define COM_FORWARD_IMachineDebugger_SETTER_LogEnabled_TO_OBJ(obj) COM_FORWARD_IMachineDebugger_SETTER_LogEnabled_TO ((obj)->)
-#define COM_FORWARD_IMachineDebugger_SETTER_LogEnabled_TO_BASE(base) COM_FORWARD_IMachineDebugger_SETTER_LogEnabled_TO (base::)
-#define COM_FORWARD_IMachineDebugger_GETTER_HWVirtExEnabled_TO(smth) HRESULT STDMETHODCALLTYPE get_HWVirtExEnabled (BOOL * aHWVirtExEnabled) { return smth get_HWVirtExEnabled (aHWVirtExEnabled); }
-#define COM_FORWARD_IMachineDebugger_GETTER_HWVirtExEnabled_TO_OBJ(obj) COM_FORWARD_IMachineDebugger_GETTER_HWVirtExEnabled_TO ((obj)->)
-#define COM_FORWARD_IMachineDebugger_GETTER_HWVirtExEnabled_TO_BASE(base) COM_FORWARD_IMachineDebugger_GETTER_HWVirtExEnabled_TO (base::)
-#define COM_FORWARD_IMachineDebugger_GETTER_HWVirtExNestedPagingEnabled_TO(smth) HRESULT STDMETHODCALLTYPE get_HWVirtExNestedPagingEnabled (BOOL * aHWVirtExNestedPagingEnabled) { return smth get_HWVirtExNestedPagingEnabled (aHWVirtExNestedPagingEnabled); }
-#define COM_FORWARD_IMachineDebugger_GETTER_HWVirtExNestedPagingEnabled_TO_OBJ(obj) COM_FORWARD_IMachineDebugger_GETTER_HWVirtExNestedPagingEnabled_TO ((obj)->)
-#define COM_FORWARD_IMachineDebugger_GETTER_HWVirtExNestedPagingEnabled_TO_BASE(base) COM_FORWARD_IMachineDebugger_GETTER_HWVirtExNestedPagingEnabled_TO (base::)
-#define COM_FORWARD_IMachineDebugger_GETTER_HWVirtExVPIDEnabled_TO(smth) HRESULT STDMETHODCALLTYPE get_HWVirtExVPIDEnabled (BOOL * aHWVirtExVPIDEnabled) { return smth get_HWVirtExVPIDEnabled (aHWVirtExVPIDEnabled); }
-#define COM_FORWARD_IMachineDebugger_GETTER_HWVirtExVPIDEnabled_TO_OBJ(obj) COM_FORWARD_IMachineDebugger_GETTER_HWVirtExVPIDEnabled_TO ((obj)->)
-#define COM_FORWARD_IMachineDebugger_GETTER_HWVirtExVPIDEnabled_TO_BASE(base) COM_FORWARD_IMachineDebugger_GETTER_HWVirtExVPIDEnabled_TO (base::)
-#define COM_FORWARD_IMachineDebugger_GETTER_PAEEnabled_TO(smth) HRESULT STDMETHODCALLTYPE get_PAEEnabled (BOOL * aPAEEnabled) { return smth get_PAEEnabled (aPAEEnabled); }
-#define COM_FORWARD_IMachineDebugger_GETTER_PAEEnabled_TO_OBJ(obj) COM_FORWARD_IMachineDebugger_GETTER_PAEEnabled_TO ((obj)->)
-#define COM_FORWARD_IMachineDebugger_GETTER_PAEEnabled_TO_BASE(base) COM_FORWARD_IMachineDebugger_GETTER_PAEEnabled_TO (base::)
-#define COM_FORWARD_IMachineDebugger_GETTER_VirtualTimeRate_TO(smth) HRESULT STDMETHODCALLTYPE get_VirtualTimeRate (ULONG * aVirtualTimeRate) { return smth get_VirtualTimeRate (aVirtualTimeRate); }
-#define COM_FORWARD_IMachineDebugger_GETTER_VirtualTimeRate_TO_OBJ(obj) COM_FORWARD_IMachineDebugger_GETTER_VirtualTimeRate_TO ((obj)->)
-#define COM_FORWARD_IMachineDebugger_GETTER_VirtualTimeRate_TO_BASE(base) COM_FORWARD_IMachineDebugger_GETTER_VirtualTimeRate_TO (base::)
-#define COM_FORWARD_IMachineDebugger_SETTER_VirtualTimeRate_TO(smth) HRESULT STDMETHODCALLTYPE put_VirtualTimeRate (ULONG aVirtualTimeRate) { return smth put_VirtualTimeRate (aVirtualTimeRate); }
-#define COM_FORWARD_IMachineDebugger_SETTER_VirtualTimeRate_TO_OBJ(obj) COM_FORWARD_IMachineDebugger_SETTER_VirtualTimeRate_TO ((obj)->)
-#define COM_FORWARD_IMachineDebugger_SETTER_VirtualTimeRate_TO_BASE(base) COM_FORWARD_IMachineDebugger_SETTER_VirtualTimeRate_TO (base::)
-#define COM_FORWARD_IMachineDebugger_GETTER_VM_TO(smth) HRESULT STDMETHODCALLTYPE get_VM (ULONG64 * aVM) { return smth get_VM (aVM); }
-#define COM_FORWARD_IMachineDebugger_GETTER_VM_TO_OBJ(obj) COM_FORWARD_IMachineDebugger_GETTER_VM_TO ((obj)->)
-#define COM_FORWARD_IMachineDebugger_GETTER_VM_TO_BASE(base) COM_FORWARD_IMachineDebugger_GETTER_VM_TO (base::)
-#define COM_FORWARD_IMachineDebugger_ResetStats_TO(smth) HRESULT STDMETHODCALLTYPE ResetStats (BSTR aPattern) { return smth ResetStats (aPattern); }
-#define COM_FORWARD_IMachineDebugger_ResetStats_TO_OBJ(obj) COM_FORWARD_IMachineDebugger_ResetStats_TO ((obj)->)
-#define COM_FORWARD_IMachineDebugger_ResetStats_TO_BASE(base) COM_FORWARD_IMachineDebugger_ResetStats_TO (base::)
-#define COM_FORWARD_IMachineDebugger_DumpStats_TO(smth) HRESULT STDMETHODCALLTYPE DumpStats (BSTR aPattern) { return smth DumpStats (aPattern); }
-#define COM_FORWARD_IMachineDebugger_DumpStats_TO_OBJ(obj) COM_FORWARD_IMachineDebugger_DumpStats_TO ((obj)->)
-#define COM_FORWARD_IMachineDebugger_DumpStats_TO_BASE(base) COM_FORWARD_IMachineDebugger_DumpStats_TO (base::)
-#define COM_FORWARD_IMachineDebugger_GetStats_TO(smth) HRESULT STDMETHODCALLTYPE GetStats (BSTR aPattern, BOOL aWithDescriptions, BSTR * aStats) { return smth GetStats (aPattern, aWithDescriptions, aStats); }
-#define COM_FORWARD_IMachineDebugger_GetStats_TO_OBJ(obj) COM_FORWARD_IMachineDebugger_GetStats_TO ((obj)->)
-#define COM_FORWARD_IMachineDebugger_GetStats_TO_BASE(base) COM_FORWARD_IMachineDebugger_GetStats_TO (base::)
-#define COM_FORWARD_IMachineDebugger_InjectNMI_TO(smth) HRESULT STDMETHODCALLTYPE InjectNMI() { return smth InjectNMI(); }
-#define COM_FORWARD_IMachineDebugger_InjectNMI_TO_OBJ(obj) COM_FORWARD_IMachineDebugger_InjectNMI_TO ((obj)->)
-#define COM_FORWARD_IMachineDebugger_InjectNMI_TO_BASE(base) COM_FORWARD_IMachineDebugger_InjectNMI_TO (base::)
-#define COM_FORWARD_IMachineDebugger_TO(smth) COM_FORWARD_IMachineDebugger_GETTER_Singlestep_TO (smth) COM_FORWARD_IMachineDebugger_SETTER_Singlestep_TO (smth) COM_FORWARD_IMachineDebugger_GETTER_RecompileUser_TO (smth) COM_FORWARD_IMachineDebugger_SETTER_RecompileUser_TO (smth) COM_FORWARD_IMachineDebugger_GETTER_RecompileSupervisor_TO (smth) COM_FORWARD_IMachineDebugger_SETTER_RecompileSupervisor_TO (smth) COM_FORWARD_IMachineDebugger_GETTER_PATMEnabled_TO (smth) COM_FORWARD_IMachineDe [...]
-#define COM_FORWARD_IMachineDebugger_TO_OBJ(obj) COM_FORWARD_IMachineDebugger_TO ((obj)->)
-#define COM_FORWARD_IMachineDebugger_TO_BASE(base) COM_FORWARD_IMachineDebugger_TO (base::)
-#define COM_FORWARD_IUSBController_GETTER_Enabled_TO(smth) HRESULT STDMETHODCALLTYPE get_Enabled (BOOL * aEnabled) { return smth get_Enabled (aEnabled); }
-#define COM_FORWARD_IUSBController_GETTER_Enabled_TO_OBJ(obj) COM_FORWARD_IUSBController_GETTER_Enabled_TO ((obj)->)
-#define COM_FORWARD_IUSBController_GETTER_Enabled_TO_BASE(base) COM_FORWARD_IUSBController_GETTER_Enabled_TO (base::)
-#define COM_FORWARD_IUSBController_SETTER_Enabled_TO(smth) HRESULT STDMETHODCALLTYPE put_Enabled (BOOL aEnabled) { return smth put_Enabled (aEnabled); }
-#define COM_FORWARD_IUSBController_SETTER_Enabled_TO_OBJ(obj) COM_FORWARD_IUSBController_SETTER_Enabled_TO ((obj)->)
-#define COM_FORWARD_IUSBController_SETTER_Enabled_TO_BASE(base) COM_FORWARD_IUSBController_SETTER_Enabled_TO (base::)
-#define COM_FORWARD_IUSBController_GETTER_EnabledEhci_TO(smth) HRESULT STDMETHODCALLTYPE get_EnabledEhci (BOOL * aEnabledEhci) { return smth get_EnabledEhci (aEnabledEhci); }
-#define COM_FORWARD_IUSBController_GETTER_EnabledEhci_TO_OBJ(obj) COM_FORWARD_IUSBController_GETTER_EnabledEhci_TO ((obj)->)
-#define COM_FORWARD_IUSBController_GETTER_EnabledEhci_TO_BASE(base) COM_FORWARD_IUSBController_GETTER_EnabledEhci_TO (base::)
-#define COM_FORWARD_IUSBController_SETTER_EnabledEhci_TO(smth) HRESULT STDMETHODCALLTYPE put_EnabledEhci (BOOL aEnabledEhci) { return smth put_EnabledEhci (aEnabledEhci); }
-#define COM_FORWARD_IUSBController_SETTER_EnabledEhci_TO_OBJ(obj) COM_FORWARD_IUSBController_SETTER_EnabledEhci_TO ((obj)->)
-#define COM_FORWARD_IUSBController_SETTER_EnabledEhci_TO_BASE(base) COM_FORWARD_IUSBController_SETTER_EnabledEhci_TO (base::)
-#define COM_FORWARD_IUSBController_GETTER_ProxyAvailable_TO(smth) HRESULT STDMETHODCALLTYPE get_ProxyAvailable (BOOL * aProxyAvailable) { return smth get_ProxyAvailable (aProxyAvailable); }
-#define COM_FORWARD_IUSBController_GETTER_ProxyAvailable_TO_OBJ(obj) COM_FORWARD_IUSBController_GETTER_ProxyAvailable_TO ((obj)->)
-#define COM_FORWARD_IUSBController_GETTER_ProxyAvailable_TO_BASE(base) COM_FORWARD_IUSBController_GETTER_ProxyAvailable_TO (base::)
-#define COM_FORWARD_IUSBController_GETTER_USBStandard_TO(smth) HRESULT STDMETHODCALLTYPE get_USBStandard (USHORT * aUSBStandard) { return smth get_USBStandard (aUSBStandard); }
-#define COM_FORWARD_IUSBController_GETTER_USBStandard_TO_OBJ(obj) COM_FORWARD_IUSBController_GETTER_USBStandard_TO ((obj)->)
-#define COM_FORWARD_IUSBController_GETTER_USBStandard_TO_BASE(base) COM_FORWARD_IUSBController_GETTER_USBStandard_TO (base::)
-#define COM_FORWARD_IUSBController_GETTER_DeviceFilters_TO(smth) HRESULT STDMETHODCALLTYPE get_DeviceFilters (SAFEARRAY * * aDeviceFilters) { return smth get_DeviceFilters (aDeviceFilters); }
-#define COM_FORWARD_IUSBController_GETTER_DeviceFilters_TO_OBJ(obj) COM_FORWARD_IUSBController_GETTER_DeviceFilters_TO ((obj)->)
-#define COM_FORWARD_IUSBController_GETTER_DeviceFilters_TO_BASE(base) COM_FORWARD_IUSBController_GETTER_DeviceFilters_TO (base::)
-#define COM_FORWARD_IUSBController_CreateDeviceFilter_TO(smth) HRESULT STDMETHODCALLTYPE CreateDeviceFilter (BSTR aName, IUSBDeviceFilter * * aFilter) { return smth CreateDeviceFilter (aName, aFilter); }
-#define COM_FORWARD_IUSBController_CreateDeviceFilter_TO_OBJ(obj) COM_FORWARD_IUSBController_CreateDeviceFilter_TO ((obj)->)
-#define COM_FORWARD_IUSBController_CreateDeviceFilter_TO_BASE(base) COM_FORWARD_IUSBController_CreateDeviceFilter_TO (base::)
-#define COM_FORWARD_IUSBController_InsertDeviceFilter_TO(smth) HRESULT STDMETHODCALLTYPE InsertDeviceFilter (ULONG aPosition, IUSBDeviceFilter * aFilter) { return smth InsertDeviceFilter (aPosition, aFilter); }
-#define COM_FORWARD_IUSBController_InsertDeviceFilter_TO_OBJ(obj) COM_FORWARD_IUSBController_InsertDeviceFilter_TO ((obj)->)
-#define COM_FORWARD_IUSBController_InsertDeviceFilter_TO_BASE(base) COM_FORWARD_IUSBController_InsertDeviceFilter_TO (base::)
-#define COM_FORWARD_IUSBController_RemoveDeviceFilter_TO(smth) HRESULT STDMETHODCALLTYPE RemoveDeviceFilter (ULONG aPosition, IUSBDeviceFilter * * aFilter) { return smth RemoveDeviceFilter (aPosition, aFilter); }
-#define COM_FORWARD_IUSBController_RemoveDeviceFilter_TO_OBJ(obj) COM_FORWARD_IUSBController_RemoveDeviceFilter_TO ((obj)->)
-#define COM_FORWARD_IUSBController_RemoveDeviceFilter_TO_BASE(base) COM_FORWARD_IUSBController_RemoveDeviceFilter_TO (base::)
-#define COM_FORWARD_IUSBController_TO(smth) COM_FORWARD_IUSBController_GETTER_Enabled_TO (smth) COM_FORWARD_IUSBController_SETTER_Enabled_TO (smth) COM_FORWARD_IUSBController_GETTER_EnabledEhci_TO (smth) COM_FORWARD_IUSBController_SETTER_EnabledEhci_TO (smth) COM_FORWARD_IUSBController_GETTER_ProxyAvailable_TO (smth) COM_FORWARD_IUSBController_GETTER_USBStandard_TO (smth) COM_FORWARD_IUSBController_GETTER_DeviceFilters_TO (smth) COM_FORWARD_IUSBController_CreateDeviceFilter_TO (smth) COM [...]
-#define COM_FORWARD_IUSBController_TO_OBJ(obj) COM_FORWARD_IUSBController_TO ((obj)->)
-#define COM_FORWARD_IUSBController_TO_BASE(base) COM_FORWARD_IUSBController_TO (base::)
-#define COM_FORWARD_IUSBDevice_GETTER_Id_TO(smth) HRESULT STDMETHODCALLTYPE get_Id (BSTR * aId) { return smth get_Id (aId); }
-#define COM_FORWARD_IUSBDevice_GETTER_Id_TO_OBJ(obj) COM_FORWARD_IUSBDevice_GETTER_Id_TO ((obj)->)
-#define COM_FORWARD_IUSBDevice_GETTER_Id_TO_BASE(base) COM_FORWARD_IUSBDevice_GETTER_Id_TO (base::)
-#define COM_FORWARD_IUSBDevice_GETTER_VendorId_TO(smth) HRESULT STDMETHODCALLTYPE get_VendorId (USHORT * aVendorId) { return smth get_VendorId (aVendorId); }
-#define COM_FORWARD_IUSBDevice_GETTER_VendorId_TO_OBJ(obj) COM_FORWARD_IUSBDevice_GETTER_VendorId_TO ((obj)->)
-#define COM_FORWARD_IUSBDevice_GETTER_VendorId_TO_BASE(base) COM_FORWARD_IUSBDevice_GETTER_VendorId_TO (base::)
-#define COM_FORWARD_IUSBDevice_GETTER_ProductId_TO(smth) HRESULT STDMETHODCALLTYPE get_ProductId (USHORT * aProductId) { return smth get_ProductId (aProductId); }
-#define COM_FORWARD_IUSBDevice_GETTER_ProductId_TO_OBJ(obj) COM_FORWARD_IUSBDevice_GETTER_ProductId_TO ((obj)->)
-#define COM_FORWARD_IUSBDevice_GETTER_ProductId_TO_BASE(base) COM_FORWARD_IUSBDevice_GETTER_ProductId_TO (base::)
-#define COM_FORWARD_IUSBDevice_GETTER_Revision_TO(smth) HRESULT STDMETHODCALLTYPE get_Revision (USHORT * aRevision) { return smth get_Revision (aRevision); }
-#define COM_FORWARD_IUSBDevice_GETTER_Revision_TO_OBJ(obj) COM_FORWARD_IUSBDevice_GETTER_Revision_TO ((obj)->)
-#define COM_FORWARD_IUSBDevice_GETTER_Revision_TO_BASE(base) COM_FORWARD_IUSBDevice_GETTER_Revision_TO (base::)
-#define COM_FORWARD_IUSBDevice_GETTER_Manufacturer_TO(smth) HRESULT STDMETHODCALLTYPE get_Manufacturer (BSTR * aManufacturer) { return smth get_Manufacturer (aManufacturer); }
-#define COM_FORWARD_IUSBDevice_GETTER_Manufacturer_TO_OBJ(obj) COM_FORWARD_IUSBDevice_GETTER_Manufacturer_TO ((obj)->)
-#define COM_FORWARD_IUSBDevice_GETTER_Manufacturer_TO_BASE(base) COM_FORWARD_IUSBDevice_GETTER_Manufacturer_TO (base::)
-#define COM_FORWARD_IUSBDevice_GETTER_Product_TO(smth) HRESULT STDMETHODCALLTYPE get_Product (BSTR * aProduct) { return smth get_Product (aProduct); }
-#define COM_FORWARD_IUSBDevice_GETTER_Product_TO_OBJ(obj) COM_FORWARD_IUSBDevice_GETTER_Product_TO ((obj)->)
-#define COM_FORWARD_IUSBDevice_GETTER_Product_TO_BASE(base) COM_FORWARD_IUSBDevice_GETTER_Product_TO (base::)
-#define COM_FORWARD_IUSBDevice_GETTER_SerialNumber_TO(smth) HRESULT STDMETHODCALLTYPE get_SerialNumber (BSTR * aSerialNumber) { return smth get_SerialNumber (aSerialNumber); }
-#define COM_FORWARD_IUSBDevice_GETTER_SerialNumber_TO_OBJ(obj) COM_FORWARD_IUSBDevice_GETTER_SerialNumber_TO ((obj)->)
-#define COM_FORWARD_IUSBDevice_GETTER_SerialNumber_TO_BASE(base) COM_FORWARD_IUSBDevice_GETTER_SerialNumber_TO (base::)
-#define COM_FORWARD_IUSBDevice_GETTER_Address_TO(smth) HRESULT STDMETHODCALLTYPE get_Address (BSTR * aAddress) { return smth get_Address (aAddress); }
-#define COM_FORWARD_IUSBDevice_GETTER_Address_TO_OBJ(obj) COM_FORWARD_IUSBDevice_GETTER_Address_TO ((obj)->)
-#define COM_FORWARD_IUSBDevice_GETTER_Address_TO_BASE(base) COM_FORWARD_IUSBDevice_GETTER_Address_TO (base::)
-#define COM_FORWARD_IUSBDevice_GETTER_Port_TO(smth) HRESULT STDMETHODCALLTYPE get_Port (USHORT * aPort) { return smth get_Port (aPort); }
-#define COM_FORWARD_IUSBDevice_GETTER_Port_TO_OBJ(obj) COM_FORWARD_IUSBDevice_GETTER_Port_TO ((obj)->)
-#define COM_FORWARD_IUSBDevice_GETTER_Port_TO_BASE(base) COM_FORWARD_IUSBDevice_GETTER_Port_TO (base::)
-#define COM_FORWARD_IUSBDevice_GETTER_Version_TO(smth) HRESULT STDMETHODCALLTYPE get_Version (USHORT * aVersion) { return smth get_Version (aVersion); }
-#define COM_FORWARD_IUSBDevice_GETTER_Version_TO_OBJ(obj) COM_FORWARD_IUSBDevice_GETTER_Version_TO ((obj)->)
-#define COM_FORWARD_IUSBDevice_GETTER_Version_TO_BASE(base) COM_FORWARD_IUSBDevice_GETTER_Version_TO (base::)
-#define COM_FORWARD_IUSBDevice_GETTER_PortVersion_TO(smth) HRESULT STDMETHODCALLTYPE get_PortVersion (USHORT * aPortVersion) { return smth get_PortVersion (aPortVersion); }
-#define COM_FORWARD_IUSBDevice_GETTER_PortVersion_TO_OBJ(obj) COM_FORWARD_IUSBDevice_GETTER_PortVersion_TO ((obj)->)
-#define COM_FORWARD_IUSBDevice_GETTER_PortVersion_TO_BASE(base) COM_FORWARD_IUSBDevice_GETTER_PortVersion_TO (base::)
-#define COM_FORWARD_IUSBDevice_GETTER_Remote_TO(smth) HRESULT STDMETHODCALLTYPE get_Remote (BOOL * aRemote) { return smth get_Remote (aRemote); }
-#define COM_FORWARD_IUSBDevice_GETTER_Remote_TO_OBJ(obj) COM_FORWARD_IUSBDevice_GETTER_Remote_TO ((obj)->)
-#define COM_FORWARD_IUSBDevice_GETTER_Remote_TO_BASE(base) COM_FORWARD_IUSBDevice_GETTER_Remote_TO (base::)
-#define COM_FORWARD_IUSBDevice_TO(smth) COM_FORWARD_IUSBDevice_GETTER_Id_TO (smth) COM_FORWARD_IUSBDevice_GETTER_VendorId_TO (smth) COM_FORWARD_IUSBDevice_GETTER_ProductId_TO (smth) COM_FORWARD_IUSBDevice_GETTER_Revision_TO (smth) COM_FORWARD_IUSBDevice_GETTER_Manufacturer_TO (smth) COM_FORWARD_IUSBDevice_GETTER_Product_TO (smth) COM_FORWARD_IUSBDevice_GETTER_SerialNumber_TO (smth) COM_FORWARD_IUSBDevice_GETTER_Address_TO (smth) COM_FORWARD_IUSBDevice_GETTER_Port_TO (smth) COM_FORWARD_IU [...]
-#define COM_FORWARD_IUSBDevice_TO_OBJ(obj) COM_FORWARD_IUSBDevice_TO ((obj)->)
-#define COM_FORWARD_IUSBDevice_TO_BASE(base) COM_FORWARD_IUSBDevice_TO (base::)
-#define COM_FORWARD_IUSBDeviceFilter_GETTER_Name_TO(smth) HRESULT STDMETHODCALLTYPE get_Name (BSTR * aName) { return smth get_Name (aName); }
-#define COM_FORWARD_IUSBDeviceFilter_GETTER_Name_TO_OBJ(obj) COM_FORWARD_IUSBDeviceFilter_GETTER_Name_TO ((obj)->)
-#define COM_FORWARD_IUSBDeviceFilter_GETTER_Name_TO_BASE(base) COM_FORWARD_IUSBDeviceFilter_GETTER_Name_TO (base::)
-#define COM_FORWARD_IUSBDeviceFilter_SETTER_Name_TO(smth) HRESULT STDMETHODCALLTYPE put_Name (BSTR aName) { return smth put_Name (aName); }
-#define COM_FORWARD_IUSBDeviceFilter_SETTER_Name_TO_OBJ(obj) COM_FORWARD_IUSBDeviceFilter_SETTER_Name_TO ((obj)->)
-#define COM_FORWARD_IUSBDeviceFilter_SETTER_Name_TO_BASE(base) COM_FORWARD_IUSBDeviceFilter_SETTER_Name_TO (base::)
-#define COM_FORWARD_IUSBDeviceFilter_GETTER_Active_TO(smth) HRESULT STDMETHODCALLTYPE get_Active (BOOL * aActive) { return smth get_Active (aActive); }
-#define COM_FORWARD_IUSBDeviceFilter_GETTER_Active_TO_OBJ(obj) COM_FORWARD_IUSBDeviceFilter_GETTER_Active_TO ((obj)->)
-#define COM_FORWARD_IUSBDeviceFilter_GETTER_Active_TO_BASE(base) COM_FORWARD_IUSBDeviceFilter_GETTER_Active_TO (base::)
-#define COM_FORWARD_IUSBDeviceFilter_SETTER_Active_TO(smth) HRESULT STDMETHODCALLTYPE put_Active (BOOL aActive) { return smth put_Active (aActive); }
-#define COM_FORWARD_IUSBDeviceFilter_SETTER_Active_TO_OBJ(obj) COM_FORWARD_IUSBDeviceFilter_SETTER_Active_TO ((obj)->)
-#define COM_FORWARD_IUSBDeviceFilter_SETTER_Active_TO_BASE(base) COM_FORWARD_IUSBDeviceFilter_SETTER_Active_TO (base::)
-#define COM_FORWARD_IUSBDeviceFilter_GETTER_VendorId_TO(smth) HRESULT STDMETHODCALLTYPE get_VendorId (BSTR * aVendorId) { return smth get_VendorId (aVendorId); }
-#define COM_FORWARD_IUSBDeviceFilter_GETTER_VendorId_TO_OBJ(obj) COM_FORWARD_IUSBDeviceFilter_GETTER_VendorId_TO ((obj)->)
-#define COM_FORWARD_IUSBDeviceFilter_GETTER_VendorId_TO_BASE(base) COM_FORWARD_IUSBDeviceFilter_GETTER_VendorId_TO (base::)
-#define COM_FORWARD_IUSBDeviceFilter_SETTER_VendorId_TO(smth) HRESULT STDMETHODCALLTYPE put_VendorId (BSTR aVendorId) { return smth put_VendorId (aVendorId); }
-#define COM_FORWARD_IUSBDeviceFilter_SETTER_VendorId_TO_OBJ(obj) COM_FORWARD_IUSBDeviceFilter_SETTER_VendorId_TO ((obj)->)
-#define COM_FORWARD_IUSBDeviceFilter_SETTER_VendorId_TO_BASE(base) COM_FORWARD_IUSBDeviceFilter_SETTER_VendorId_TO (base::)
-#define COM_FORWARD_IUSBDeviceFilter_GETTER_ProductId_TO(smth) HRESULT STDMETHODCALLTYPE get_ProductId (BSTR * aProductId) { return smth get_ProductId (aProductId); }
-#define COM_FORWARD_IUSBDeviceFilter_GETTER_ProductId_TO_OBJ(obj) COM_FORWARD_IUSBDeviceFilter_GETTER_ProductId_TO ((obj)->)
-#define COM_FORWARD_IUSBDeviceFilter_GETTER_ProductId_TO_BASE(base) COM_FORWARD_IUSBDeviceFilter_GETTER_ProductId_TO (base::)
-#define COM_FORWARD_IUSBDeviceFilter_SETTER_ProductId_TO(smth) HRESULT STDMETHODCALLTYPE put_ProductId (BSTR aProductId) { return smth put_ProductId (aProductId); }
-#define COM_FORWARD_IUSBDeviceFilter_SETTER_ProductId_TO_OBJ(obj) COM_FORWARD_IUSBDeviceFilter_SETTER_ProductId_TO ((obj)->)
-#define COM_FORWARD_IUSBDeviceFilter_SETTER_ProductId_TO_BASE(base) COM_FORWARD_IUSBDeviceFilter_SETTER_ProductId_TO (base::)
-#define COM_FORWARD_IUSBDeviceFilter_GETTER_Revision_TO(smth) HRESULT STDMETHODCALLTYPE get_Revision (BSTR * aRevision) { return smth get_Revision (aRevision); }
-#define COM_FORWARD_IUSBDeviceFilter_GETTER_Revision_TO_OBJ(obj) COM_FORWARD_IUSBDeviceFilter_GETTER_Revision_TO ((obj)->)
-#define COM_FORWARD_IUSBDeviceFilter_GETTER_Revision_TO_BASE(base) COM_FORWARD_IUSBDeviceFilter_GETTER_Revision_TO (base::)
-#define COM_FORWARD_IUSBDeviceFilter_SETTER_Revision_TO(smth) HRESULT STDMETHODCALLTYPE put_Revision (BSTR aRevision) { return smth put_Revision (aRevision); }
-#define COM_FORWARD_IUSBDeviceFilter_SETTER_Revision_TO_OBJ(obj) COM_FORWARD_IUSBDeviceFilter_SETTER_Revision_TO ((obj)->)
-#define COM_FORWARD_IUSBDeviceFilter_SETTER_Revision_TO_BASE(base) COM_FORWARD_IUSBDeviceFilter_SETTER_Revision_TO (base::)
-#define COM_FORWARD_IUSBDeviceFilter_GETTER_Manufacturer_TO(smth) HRESULT STDMETHODCALLTYPE get_Manufacturer (BSTR * aManufacturer) { return smth get_Manufacturer (aManufacturer); }
-#define COM_FORWARD_IUSBDeviceFilter_GETTER_Manufacturer_TO_OBJ(obj) COM_FORWARD_IUSBDeviceFilter_GETTER_Manufacturer_TO ((obj)->)
-#define COM_FORWARD_IUSBDeviceFilter_GETTER_Manufacturer_TO_BASE(base) COM_FORWARD_IUSBDeviceFilter_GETTER_Manufacturer_TO (base::)
-#define COM_FORWARD_IUSBDeviceFilter_SETTER_Manufacturer_TO(smth) HRESULT STDMETHODCALLTYPE put_Manufacturer (BSTR aManufacturer) { return smth put_Manufacturer (aManufacturer); }
-#define COM_FORWARD_IUSBDeviceFilter_SETTER_Manufacturer_TO_OBJ(obj) COM_FORWARD_IUSBDeviceFilter_SETTER_Manufacturer_TO ((obj)->)
-#define COM_FORWARD_IUSBDeviceFilter_SETTER_Manufacturer_TO_BASE(base) COM_FORWARD_IUSBDeviceFilter_SETTER_Manufacturer_TO (base::)
-#define COM_FORWARD_IUSBDeviceFilter_GETTER_Product_TO(smth) HRESULT STDMETHODCALLTYPE get_Product (BSTR * aProduct) { return smth get_Product (aProduct); }
-#define COM_FORWARD_IUSBDeviceFilter_GETTER_Product_TO_OBJ(obj) COM_FORWARD_IUSBDeviceFilter_GETTER_Product_TO ((obj)->)
-#define COM_FORWARD_IUSBDeviceFilter_GETTER_Product_TO_BASE(base) COM_FORWARD_IUSBDeviceFilter_GETTER_Product_TO (base::)
-#define COM_FORWARD_IUSBDeviceFilter_SETTER_Product_TO(smth) HRESULT STDMETHODCALLTYPE put_Product (BSTR aProduct) { return smth put_Product (aProduct); }
-#define COM_FORWARD_IUSBDeviceFilter_SETTER_Product_TO_OBJ(obj) COM_FORWARD_IUSBDeviceFilter_SETTER_Product_TO ((obj)->)
-#define COM_FORWARD_IUSBDeviceFilter_SETTER_Product_TO_BASE(base) COM_FORWARD_IUSBDeviceFilter_SETTER_Product_TO (base::)
-#define COM_FORWARD_IUSBDeviceFilter_GETTER_SerialNumber_TO(smth) HRESULT STDMETHODCALLTYPE get_SerialNumber (BSTR * aSerialNumber) { return smth get_SerialNumber (aSerialNumber); }
-#define COM_FORWARD_IUSBDeviceFilter_GETTER_SerialNumber_TO_OBJ(obj) COM_FORWARD_IUSBDeviceFilter_GETTER_SerialNumber_TO ((obj)->)
-#define COM_FORWARD_IUSBDeviceFilter_GETTER_SerialNumber_TO_BASE(base) COM_FORWARD_IUSBDeviceFilter_GETTER_SerialNumber_TO (base::)
-#define COM_FORWARD_IUSBDeviceFilter_SETTER_SerialNumber_TO(smth) HRESULT STDMETHODCALLTYPE put_SerialNumber (BSTR aSerialNumber) { return smth put_SerialNumber (aSerialNumber); }
-#define COM_FORWARD_IUSBDeviceFilter_SETTER_SerialNumber_TO_OBJ(obj) COM_FORWARD_IUSBDeviceFilter_SETTER_SerialNumber_TO ((obj)->)
-#define COM_FORWARD_IUSBDeviceFilter_SETTER_SerialNumber_TO_BASE(base) COM_FORWARD_IUSBDeviceFilter_SETTER_SerialNumber_TO (base::)
-#define COM_FORWARD_IUSBDeviceFilter_GETTER_Port_TO(smth) HRESULT STDMETHODCALLTYPE get_Port (BSTR * aPort) { return smth get_Port (aPort); }
-#define COM_FORWARD_IUSBDeviceFilter_GETTER_Port_TO_OBJ(obj) COM_FORWARD_IUSBDeviceFilter_GETTER_Port_TO ((obj)->)
-#define COM_FORWARD_IUSBDeviceFilter_GETTER_Port_TO_BASE(base) COM_FORWARD_IUSBDeviceFilter_GETTER_Port_TO (base::)
-#define COM_FORWARD_IUSBDeviceFilter_SETTER_Port_TO(smth) HRESULT STDMETHODCALLTYPE put_Port (BSTR aPort) { return smth put_Port (aPort); }
-#define COM_FORWARD_IUSBDeviceFilter_SETTER_Port_TO_OBJ(obj) COM_FORWARD_IUSBDeviceFilter_SETTER_Port_TO ((obj)->)
-#define COM_FORWARD_IUSBDeviceFilter_SETTER_Port_TO_BASE(base) COM_FORWARD_IUSBDeviceFilter_SETTER_Port_TO (base::)
-#define COM_FORWARD_IUSBDeviceFilter_GETTER_Remote_TO(smth) HRESULT STDMETHODCALLTYPE get_Remote (BSTR * aRemote) { return smth get_Remote (aRemote); }
-#define COM_FORWARD_IUSBDeviceFilter_GETTER_Remote_TO_OBJ(obj) COM_FORWARD_IUSBDeviceFilter_GETTER_Remote_TO ((obj)->)
-#define COM_FORWARD_IUSBDeviceFilter_GETTER_Remote_TO_BASE(base) COM_FORWARD_IUSBDeviceFilter_GETTER_Remote_TO (base::)
-#define COM_FORWARD_IUSBDeviceFilter_SETTER_Remote_TO(smth) HRESULT STDMETHODCALLTYPE put_Remote (BSTR aRemote) { return smth put_Remote (aRemote); }
-#define COM_FORWARD_IUSBDeviceFilter_SETTER_Remote_TO_OBJ(obj) COM_FORWARD_IUSBDeviceFilter_SETTER_Remote_TO ((obj)->)
-#define COM_FORWARD_IUSBDeviceFilter_SETTER_Remote_TO_BASE(base) COM_FORWARD_IUSBDeviceFilter_SETTER_Remote_TO (base::)
-#define COM_FORWARD_IUSBDeviceFilter_GETTER_MaskedInterfaces_TO(smth) HRESULT STDMETHODCALLTYPE get_MaskedInterfaces (ULONG * aMaskedInterfaces) { return smth get_MaskedInterfaces (aMaskedInterfaces); }
-#define COM_FORWARD_IUSBDeviceFilter_GETTER_MaskedInterfaces_TO_OBJ(obj) COM_FORWARD_IUSBDeviceFilter_GETTER_MaskedInterfaces_TO ((obj)->)
-#define COM_FORWARD_IUSBDeviceFilter_GETTER_MaskedInterfaces_TO_BASE(base) COM_FORWARD_IUSBDeviceFilter_GETTER_MaskedInterfaces_TO (base::)
-#define COM_FORWARD_IUSBDeviceFilter_SETTER_MaskedInterfaces_TO(smth) HRESULT STDMETHODCALLTYPE put_MaskedInterfaces (ULONG aMaskedInterfaces) { return smth put_MaskedInterfaces (aMaskedInterfaces); }
-#define COM_FORWARD_IUSBDeviceFilter_SETTER_MaskedInterfaces_TO_OBJ(obj) COM_FORWARD_IUSBDeviceFilter_SETTER_MaskedInterfaces_TO ((obj)->)
-#define COM_FORWARD_IUSBDeviceFilter_SETTER_MaskedInterfaces_TO_BASE(base) COM_FORWARD_IUSBDeviceFilter_SETTER_MaskedInterfaces_TO (base::)
-#define COM_FORWARD_IUSBDeviceFilter_TO(smth) COM_FORWARD_IUSBDeviceFilter_GETTER_Name_TO (smth) COM_FORWARD_IUSBDeviceFilter_SETTER_Name_TO (smth) COM_FORWARD_IUSBDeviceFilter_GETTER_Active_TO (smth) COM_FORWARD_IUSBDeviceFilter_SETTER_Active_TO (smth) COM_FORWARD_IUSBDeviceFilter_GETTER_VendorId_TO (smth) COM_FORWARD_IUSBDeviceFilter_SETTER_VendorId_TO (smth) COM_FORWARD_IUSBDeviceFilter_GETTER_ProductId_TO (smth) COM_FORWARD_IUSBDeviceFilter_SETTER_ProductId_TO (smth) COM_FORWARD_IUSB [...]
-#define COM_FORWARD_IUSBDeviceFilter_TO_OBJ(obj) COM_FORWARD_IUSBDeviceFilter_TO ((obj)->)
-#define COM_FORWARD_IUSBDeviceFilter_TO_BASE(base) COM_FORWARD_IUSBDeviceFilter_TO (base::)
-#define COM_FORWARD_IHostUSBDevice_GETTER_State_TO(smth) HRESULT STDMETHODCALLTYPE get_State (USBDeviceState * aState) { return smth get_State (aState); }
-#define COM_FORWARD_IHostUSBDevice_GETTER_State_TO_OBJ(obj) COM_FORWARD_IHostUSBDevice_GETTER_State_TO ((obj)->)
-#define COM_FORWARD_IHostUSBDevice_GETTER_State_TO_BASE(base) COM_FORWARD_IHostUSBDevice_GETTER_State_TO (base::)
-#define COM_FORWARD_IHostUSBDevice_TO(smth) COM_FORWARD_IHostUSBDevice_GETTER_State_TO (smth) 
-#define COM_FORWARD_IHostUSBDevice_TO_OBJ(obj) COM_FORWARD_IHostUSBDevice_TO ((obj)->)
-#define COM_FORWARD_IHostUSBDevice_TO_BASE(base) COM_FORWARD_IHostUSBDevice_TO (base::)
-#define COM_FORWARD_IHostUSBDeviceFilter_GETTER_Action_TO(smth) HRESULT STDMETHODCALLTYPE get_Action (USBDeviceFilterAction * aAction) { return smth get_Action (aAction); }
-#define COM_FORWARD_IHostUSBDeviceFilter_GETTER_Action_TO_OBJ(obj) COM_FORWARD_IHostUSBDeviceFilter_GETTER_Action_TO ((obj)->)
-#define COM_FORWARD_IHostUSBDeviceFilter_GETTER_Action_TO_BASE(base) COM_FORWARD_IHostUSBDeviceFilter_GETTER_Action_TO (base::)
-#define COM_FORWARD_IHostUSBDeviceFilter_SETTER_Action_TO(smth) HRESULT STDMETHODCALLTYPE put_Action (USBDeviceFilterAction aAction) { return smth put_Action (aAction); }
-#define COM_FORWARD_IHostUSBDeviceFilter_SETTER_Action_TO_OBJ(obj) COM_FORWARD_IHostUSBDeviceFilter_SETTER_Action_TO ((obj)->)
-#define COM_FORWARD_IHostUSBDeviceFilter_SETTER_Action_TO_BASE(base) COM_FORWARD_IHostUSBDeviceFilter_SETTER_Action_TO (base::)
-#define COM_FORWARD_IHostUSBDeviceFilter_TO(smth) COM_FORWARD_IHostUSBDeviceFilter_GETTER_Action_TO (smth) COM_FORWARD_IHostUSBDeviceFilter_SETTER_Action_TO (smth) 
-#define COM_FORWARD_IHostUSBDeviceFilter_TO_OBJ(obj) COM_FORWARD_IHostUSBDeviceFilter_TO ((obj)->)
-#define COM_FORWARD_IHostUSBDeviceFilter_TO_BASE(base) COM_FORWARD_IHostUSBDeviceFilter_TO (base::)
-#define COM_FORWARD_IAudioAdapter_GETTER_Enabled_TO(smth) HRESULT STDMETHODCALLTYPE get_Enabled (BOOL * aEnabled) { return smth get_Enabled (aEnabled); }
-#define COM_FORWARD_IAudioAdapter_GETTER_Enabled_TO_OBJ(obj) COM_FORWARD_IAudioAdapter_GETTER_Enabled_TO ((obj)->)
-#define COM_FORWARD_IAudioAdapter_GETTER_Enabled_TO_BASE(base) COM_FORWARD_IAudioAdapter_GETTER_Enabled_TO (base::)
-#define COM_FORWARD_IAudioAdapter_SETTER_Enabled_TO(smth) HRESULT STDMETHODCALLTYPE put_Enabled (BOOL aEnabled) { return smth put_Enabled (aEnabled); }
-#define COM_FORWARD_IAudioAdapter_SETTER_Enabled_TO_OBJ(obj) COM_FORWARD_IAudioAdapter_SETTER_Enabled_TO ((obj)->)
-#define COM_FORWARD_IAudioAdapter_SETTER_Enabled_TO_BASE(base) COM_FORWARD_IAudioAdapter_SETTER_Enabled_TO (base::)
-#define COM_FORWARD_IAudioAdapter_GETTER_AudioController_TO(smth) HRESULT STDMETHODCALLTYPE get_AudioController (AudioControllerType * aAudioController) { return smth get_AudioController (aAudioController); }
-#define COM_FORWARD_IAudioAdapter_GETTER_AudioController_TO_OBJ(obj) COM_FORWARD_IAudioAdapter_GETTER_AudioController_TO ((obj)->)
-#define COM_FORWARD_IAudioAdapter_GETTER_AudioController_TO_BASE(base) COM_FORWARD_IAudioAdapter_GETTER_AudioController_TO (base::)
-#define COM_FORWARD_IAudioAdapter_SETTER_AudioController_TO(smth) HRESULT STDMETHODCALLTYPE put_AudioController (AudioControllerType aAudioController) { return smth put_AudioController (aAudioController); }
-#define COM_FORWARD_IAudioAdapter_SETTER_AudioController_TO_OBJ(obj) COM_FORWARD_IAudioAdapter_SETTER_AudioController_TO ((obj)->)
-#define COM_FORWARD_IAudioAdapter_SETTER_AudioController_TO_BASE(base) COM_FORWARD_IAudioAdapter_SETTER_AudioController_TO (base::)
-#define COM_FORWARD_IAudioAdapter_GETTER_AudioDriver_TO(smth) HRESULT STDMETHODCALLTYPE get_AudioDriver (AudioDriverType * aAudioDriver) { return smth get_AudioDriver (aAudioDriver); }
-#define COM_FORWARD_IAudioAdapter_GETTER_AudioDriver_TO_OBJ(obj) COM_FORWARD_IAudioAdapter_GETTER_AudioDriver_TO ((obj)->)
-#define COM_FORWARD_IAudioAdapter_GETTER_AudioDriver_TO_BASE(base) COM_FORWARD_IAudioAdapter_GETTER_AudioDriver_TO (base::)
-#define COM_FORWARD_IAudioAdapter_SETTER_AudioDriver_TO(smth) HRESULT STDMETHODCALLTYPE put_AudioDriver (AudioDriverType aAudioDriver) { return smth put_AudioDriver (aAudioDriver); }
-#define COM_FORWARD_IAudioAdapter_SETTER_AudioDriver_TO_OBJ(obj) COM_FORWARD_IAudioAdapter_SETTER_AudioDriver_TO ((obj)->)
-#define COM_FORWARD_IAudioAdapter_SETTER_AudioDriver_TO_BASE(base) COM_FORWARD_IAudioAdapter_SETTER_AudioDriver_TO (base::)
-#define COM_FORWARD_IAudioAdapter_TO(smth) COM_FORWARD_IAudioAdapter_GETTER_Enabled_TO (smth) COM_FORWARD_IAudioAdapter_SETTER_Enabled_TO (smth) COM_FORWARD_IAudioAdapter_GETTER_AudioController_TO (smth) COM_FORWARD_IAudioAdapter_SETTER_AudioController_TO (smth) COM_FORWARD_IAudioAdapter_GETTER_AudioDriver_TO (smth) COM_FORWARD_IAudioAdapter_SETTER_AudioDriver_TO (smth) 
-#define COM_FORWARD_IAudioAdapter_TO_OBJ(obj) COM_FORWARD_IAudioAdapter_TO ((obj)->)
-#define COM_FORWARD_IAudioAdapter_TO_BASE(base) COM_FORWARD_IAudioAdapter_TO (base::)
-#define COM_FORWARD_IVRDPServer_GETTER_Enabled_TO(smth) HRESULT STDMETHODCALLTYPE get_Enabled (BOOL * aEnabled) { return smth get_Enabled (aEnabled); }
-#define COM_FORWARD_IVRDPServer_GETTER_Enabled_TO_OBJ(obj) COM_FORWARD_IVRDPServer_GETTER_Enabled_TO ((obj)->)
-#define COM_FORWARD_IVRDPServer_GETTER_Enabled_TO_BASE(base) COM_FORWARD_IVRDPServer_GETTER_Enabled_TO (base::)
-#define COM_FORWARD_IVRDPServer_SETTER_Enabled_TO(smth) HRESULT STDMETHODCALLTYPE put_Enabled (BOOL aEnabled) { return smth put_Enabled (aEnabled); }
-#define COM_FORWARD_IVRDPServer_SETTER_Enabled_TO_OBJ(obj) COM_FORWARD_IVRDPServer_SETTER_Enabled_TO ((obj)->)
-#define COM_FORWARD_IVRDPServer_SETTER_Enabled_TO_BASE(base) COM_FORWARD_IVRDPServer_SETTER_Enabled_TO (base::)
-#define COM_FORWARD_IVRDPServer_GETTER_Ports_TO(smth) HRESULT STDMETHODCALLTYPE get_Ports (BSTR * aPorts) { return smth get_Ports (aPorts); }
-#define COM_FORWARD_IVRDPServer_GETTER_Ports_TO_OBJ(obj) COM_FORWARD_IVRDPServer_GETTER_Ports_TO ((obj)->)
-#define COM_FORWARD_IVRDPServer_GETTER_Ports_TO_BASE(base) COM_FORWARD_IVRDPServer_GETTER_Ports_TO (base::)
-#define COM_FORWARD_IVRDPServer_SETTER_Ports_TO(smth) HRESULT STDMETHODCALLTYPE put_Ports (BSTR aPorts) { return smth put_Ports (aPorts); }
-#define COM_FORWARD_IVRDPServer_SETTER_Ports_TO_OBJ(obj) COM_FORWARD_IVRDPServer_SETTER_Ports_TO ((obj)->)
-#define COM_FORWARD_IVRDPServer_SETTER_Ports_TO_BASE(base) COM_FORWARD_IVRDPServer_SETTER_Ports_TO (base::)
-#define COM_FORWARD_IVRDPServer_GETTER_NetAddress_TO(smth) HRESULT STDMETHODCALLTYPE get_NetAddress (BSTR * aNetAddress) { return smth get_NetAddress (aNetAddress); }
-#define COM_FORWARD_IVRDPServer_GETTER_NetAddress_TO_OBJ(obj) COM_FORWARD_IVRDPServer_GETTER_NetAddress_TO ((obj)->)
-#define COM_FORWARD_IVRDPServer_GETTER_NetAddress_TO_BASE(base) COM_FORWARD_IVRDPServer_GETTER_NetAddress_TO (base::)
-#define COM_FORWARD_IVRDPServer_SETTER_NetAddress_TO(smth) HRESULT STDMETHODCALLTYPE put_NetAddress (BSTR aNetAddress) { return smth put_NetAddress (aNetAddress); }
-#define COM_FORWARD_IVRDPServer_SETTER_NetAddress_TO_OBJ(obj) COM_FORWARD_IVRDPServer_SETTER_NetAddress_TO ((obj)->)
-#define COM_FORWARD_IVRDPServer_SETTER_NetAddress_TO_BASE(base) COM_FORWARD_IVRDPServer_SETTER_NetAddress_TO (base::)
-#define COM_FORWARD_IVRDPServer_GETTER_AuthType_TO(smth) HRESULT STDMETHODCALLTYPE get_AuthType (VRDPAuthType * aAuthType) { return smth get_AuthType (aAuthType); }
-#define COM_FORWARD_IVRDPServer_GETTER_AuthType_TO_OBJ(obj) COM_FORWARD_IVRDPServer_GETTER_AuthType_TO ((obj)->)
-#define COM_FORWARD_IVRDPServer_GETTER_AuthType_TO_BASE(base) COM_FORWARD_IVRDPServer_GETTER_AuthType_TO (base::)
-#define COM_FORWARD_IVRDPServer_SETTER_AuthType_TO(smth) HRESULT STDMETHODCALLTYPE put_AuthType (VRDPAuthType aAuthType) { return smth put_AuthType (aAuthType); }
-#define COM_FORWARD_IVRDPServer_SETTER_AuthType_TO_OBJ(obj) COM_FORWARD_IVRDPServer_SETTER_AuthType_TO ((obj)->)
-#define COM_FORWARD_IVRDPServer_SETTER_AuthType_TO_BASE(base) COM_FORWARD_IVRDPServer_SETTER_AuthType_TO (base::)
-#define COM_FORWARD_IVRDPServer_GETTER_AuthTimeout_TO(smth) HRESULT STDMETHODCALLTYPE get_AuthTimeout (ULONG * aAuthTimeout) { return smth get_AuthTimeout (aAuthTimeout); }
-#define COM_FORWARD_IVRDPServer_GETTER_AuthTimeout_TO_OBJ(obj) COM_FORWARD_IVRDPServer_GETTER_AuthTimeout_TO ((obj)->)
-#define COM_FORWARD_IVRDPServer_GETTER_AuthTimeout_TO_BASE(base) COM_FORWARD_IVRDPServer_GETTER_AuthTimeout_TO (base::)
-#define COM_FORWARD_IVRDPServer_SETTER_AuthTimeout_TO(smth) HRESULT STDMETHODCALLTYPE put_AuthTimeout (ULONG aAuthTimeout) { return smth put_AuthTimeout (aAuthTimeout); }
-#define COM_FORWARD_IVRDPServer_SETTER_AuthTimeout_TO_OBJ(obj) COM_FORWARD_IVRDPServer_SETTER_AuthTimeout_TO ((obj)->)
-#define COM_FORWARD_IVRDPServer_SETTER_AuthTimeout_TO_BASE(base) COM_FORWARD_IVRDPServer_SETTER_AuthTimeout_TO (base::)
-#define COM_FORWARD_IVRDPServer_GETTER_AllowMultiConnection_TO(smth) HRESULT STDMETHODCALLTYPE get_AllowMultiConnection (BOOL * aAllowMultiConnection) { return smth get_AllowMultiConnection (aAllowMultiConnection); }
-#define COM_FORWARD_IVRDPServer_GETTER_AllowMultiConnection_TO_OBJ(obj) COM_FORWARD_IVRDPServer_GETTER_AllowMultiConnection_TO ((obj)->)
-#define COM_FORWARD_IVRDPServer_GETTER_AllowMultiConnection_TO_BASE(base) COM_FORWARD_IVRDPServer_GETTER_AllowMultiConnection_TO (base::)
-#define COM_FORWARD_IVRDPServer_SETTER_AllowMultiConnection_TO(smth) HRESULT STDMETHODCALLTYPE put_AllowMultiConnection (BOOL aAllowMultiConnection) { return smth put_AllowMultiConnection (aAllowMultiConnection); }
-#define COM_FORWARD_IVRDPServer_SETTER_AllowMultiConnection_TO_OBJ(obj) COM_FORWARD_IVRDPServer_SETTER_AllowMultiConnection_TO ((obj)->)
-#define COM_FORWARD_IVRDPServer_SETTER_AllowMultiConnection_TO_BASE(base) COM_FORWARD_IVRDPServer_SETTER_AllowMultiConnection_TO (base::)
-#define COM_FORWARD_IVRDPServer_GETTER_ReuseSingleConnection_TO(smth) HRESULT STDMETHODCALLTYPE get_ReuseSingleConnection (BOOL * aReuseSingleConnection) { return smth get_ReuseSingleConnection (aReuseSingleConnection); }
-#define COM_FORWARD_IVRDPServer_GETTER_ReuseSingleConnection_TO_OBJ(obj) COM_FORWARD_IVRDPServer_GETTER_ReuseSingleConnection_TO ((obj)->)
-#define COM_FORWARD_IVRDPServer_GETTER_ReuseSingleConnection_TO_BASE(base) COM_FORWARD_IVRDPServer_GETTER_ReuseSingleConnection_TO (base::)
-#define COM_FORWARD_IVRDPServer_SETTER_ReuseSingleConnection_TO(smth) HRESULT STDMETHODCALLTYPE put_ReuseSingleConnection (BOOL aReuseSingleConnection) { return smth put_ReuseSingleConnection (aReuseSingleConnection); }
-#define COM_FORWARD_IVRDPServer_SETTER_ReuseSingleConnection_TO_OBJ(obj) COM_FORWARD_IVRDPServer_SETTER_ReuseSingleConnection_TO ((obj)->)
-#define COM_FORWARD_IVRDPServer_SETTER_ReuseSingleConnection_TO_BASE(base) COM_FORWARD_IVRDPServer_SETTER_ReuseSingleConnection_TO (base::)
-#define COM_FORWARD_IVRDPServer_GETTER_VideoChannel_TO(smth) HRESULT STDMETHODCALLTYPE get_VideoChannel (BOOL * aVideoChannel) { return smth get_VideoChannel (aVideoChannel); }
-#define COM_FORWARD_IVRDPServer_GETTER_VideoChannel_TO_OBJ(obj) COM_FORWARD_IVRDPServer_GETTER_VideoChannel_TO ((obj)->)
-#define COM_FORWARD_IVRDPServer_GETTER_VideoChannel_TO_BASE(base) COM_FORWARD_IVRDPServer_GETTER_VideoChannel_TO (base::)
-#define COM_FORWARD_IVRDPServer_SETTER_VideoChannel_TO(smth) HRESULT STDMETHODCALLTYPE put_VideoChannel (BOOL aVideoChannel) { return smth put_VideoChannel (aVideoChannel); }
-#define COM_FORWARD_IVRDPServer_SETTER_VideoChannel_TO_OBJ(obj) COM_FORWARD_IVRDPServer_SETTER_VideoChannel_TO ((obj)->)
-#define COM_FORWARD_IVRDPServer_SETTER_VideoChannel_TO_BASE(base) COM_FORWARD_IVRDPServer_SETTER_VideoChannel_TO (base::)
-#define COM_FORWARD_IVRDPServer_GETTER_VideoChannelQuality_TO(smth) HRESULT STDMETHODCALLTYPE get_VideoChannelQuality (ULONG * aVideoChannelQuality) { return smth get_VideoChannelQuality (aVideoChannelQuality); }
-#define COM_FORWARD_IVRDPServer_GETTER_VideoChannelQuality_TO_OBJ(obj) COM_FORWARD_IVRDPServer_GETTER_VideoChannelQuality_TO ((obj)->)
-#define COM_FORWARD_IVRDPServer_GETTER_VideoChannelQuality_TO_BASE(base) COM_FORWARD_IVRDPServer_GETTER_VideoChannelQuality_TO (base::)
-#define COM_FORWARD_IVRDPServer_SETTER_VideoChannelQuality_TO(smth) HRESULT STDMETHODCALLTYPE put_VideoChannelQuality (ULONG aVideoChannelQuality) { return smth put_VideoChannelQuality (aVideoChannelQuality); }
-#define COM_FORWARD_IVRDPServer_SETTER_VideoChannelQuality_TO_OBJ(obj) COM_FORWARD_IVRDPServer_SETTER_VideoChannelQuality_TO ((obj)->)
-#define COM_FORWARD_IVRDPServer_SETTER_VideoChannelQuality_TO_BASE(base) COM_FORWARD_IVRDPServer_SETTER_VideoChannelQuality_TO (base::)
-#define COM_FORWARD_IVRDPServer_TO(smth) COM_FORWARD_IVRDPServer_GETTER_Enabled_TO (smth) COM_FORWARD_IVRDPServer_SETTER_Enabled_TO (smth) COM_FORWARD_IVRDPServer_GETTER_Ports_TO (smth) COM_FORWARD_IVRDPServer_SETTER_Ports_TO (smth) COM_FORWARD_IVRDPServer_GETTER_NetAddress_TO (smth) COM_FORWARD_IVRDPServer_SETTER_NetAddress_TO (smth) COM_FORWARD_IVRDPServer_GETTER_AuthType_TO (smth) COM_FORWARD_IVRDPServer_SETTER_AuthType_TO (smth) COM_FORWARD_IVRDPServer_GETTER_AuthTimeout_TO (smth) CO [...]
-#define COM_FORWARD_IVRDPServer_TO_OBJ(obj) COM_FORWARD_IVRDPServer_TO ((obj)->)
-#define COM_FORWARD_IVRDPServer_TO_BASE(base) COM_FORWARD_IVRDPServer_TO (base::)
-#define COM_FORWARD_ISharedFolder_GETTER_Name_TO(smth) HRESULT STDMETHODCALLTYPE get_Name (BSTR * aName) { return smth get_Name (aName); }
-#define COM_FORWARD_ISharedFolder_GETTER_Name_TO_OBJ(obj) COM_FORWARD_ISharedFolder_GETTER_Name_TO ((obj)->)
-#define COM_FORWARD_ISharedFolder_GETTER_Name_TO_BASE(base) COM_FORWARD_ISharedFolder_GETTER_Name_TO (base::)
-#define COM_FORWARD_ISharedFolder_GETTER_HostPath_TO(smth) HRESULT STDMETHODCALLTYPE get_HostPath (BSTR * aHostPath) { return smth get_HostPath (aHostPath); }
-#define COM_FORWARD_ISharedFolder_GETTER_HostPath_TO_OBJ(obj) COM_FORWARD_ISharedFolder_GETTER_HostPath_TO ((obj)->)
-#define COM_FORWARD_ISharedFolder_GETTER_HostPath_TO_BASE(base) COM_FORWARD_ISharedFolder_GETTER_HostPath_TO (base::)
-#define COM_FORWARD_ISharedFolder_GETTER_Accessible_TO(smth) HRESULT STDMETHODCALLTYPE get_Accessible (BOOL * aAccessible) { return smth get_Accessible (aAccessible); }
-#define COM_FORWARD_ISharedFolder_GETTER_Accessible_TO_OBJ(obj) COM_FORWARD_ISharedFolder_GETTER_Accessible_TO ((obj)->)
-#define COM_FORWARD_ISharedFolder_GETTER_Accessible_TO_BASE(base) COM_FORWARD_ISharedFolder_GETTER_Accessible_TO (base::)
-#define COM_FORWARD_ISharedFolder_GETTER_Writable_TO(smth) HRESULT STDMETHODCALLTYPE get_Writable (BOOL * aWritable) { return smth get_Writable (aWritable); }
-#define COM_FORWARD_ISharedFolder_GETTER_Writable_TO_OBJ(obj) COM_FORWARD_ISharedFolder_GETTER_Writable_TO ((obj)->)
-#define COM_FORWARD_ISharedFolder_GETTER_Writable_TO_BASE(base) COM_FORWARD_ISharedFolder_GETTER_Writable_TO (base::)
-#define COM_FORWARD_ISharedFolder_GETTER_LastAccessError_TO(smth) HRESULT STDMETHODCALLTYPE get_LastAccessError (BSTR * aLastAccessError) { return smth get_LastAccessError (aLastAccessError); }
-#define COM_FORWARD_ISharedFolder_GETTER_LastAccessError_TO_OBJ(obj) COM_FORWARD_ISharedFolder_GETTER_LastAccessError_TO ((obj)->)
-#define COM_FORWARD_ISharedFolder_GETTER_LastAccessError_TO_BASE(base) COM_FORWARD_ISharedFolder_GETTER_LastAccessError_TO (base::)
-#define COM_FORWARD_ISharedFolder_TO(smth) COM_FORWARD_ISharedFolder_GETTER_Name_TO (smth) COM_FORWARD_ISharedFolder_GETTER_HostPath_TO (smth) COM_FORWARD_ISharedFolder_GETTER_Accessible_TO (smth) COM_FORWARD_ISharedFolder_GETTER_Writable_TO (smth) COM_FORWARD_ISharedFolder_GETTER_LastAccessError_TO (smth) 
-#define COM_FORWARD_ISharedFolder_TO_OBJ(obj) COM_FORWARD_ISharedFolder_TO ((obj)->)
-#define COM_FORWARD_ISharedFolder_TO_BASE(base) COM_FORWARD_ISharedFolder_TO (base::)
-#define COM_FORWARD_IInternalSessionControl_GetPID_TO(smth) HRESULT STDMETHODCALLTYPE GetPID (ULONG * aPid) { return smth GetPID (aPid); }
-#define COM_FORWARD_IInternalSessionControl_GetPID_TO_OBJ(obj) COM_FORWARD_IInternalSessionControl_GetPID_TO ((obj)->)
-#define COM_FORWARD_IInternalSessionControl_GetPID_TO_BASE(base) COM_FORWARD_IInternalSessionControl_GetPID_TO (base::)
-#define COM_FORWARD_IInternalSessionControl_GetRemoteConsole_TO(smth) HRESULT STDMETHODCALLTYPE GetRemoteConsole (IConsole * * aConsole) { return smth GetRemoteConsole (aConsole); }
-#define COM_FORWARD_IInternalSessionControl_GetRemoteConsole_TO_OBJ(obj) COM_FORWARD_IInternalSessionControl_GetRemoteConsole_TO ((obj)->)
-#define COM_FORWARD_IInternalSessionControl_GetRemoteConsole_TO_BASE(base) COM_FORWARD_IInternalSessionControl_GetRemoteConsole_TO (base::)
-#define COM_FORWARD_IInternalSessionControl_AssignMachine_TO(smth) HRESULT STDMETHODCALLTYPE AssignMachine (IMachine * aMachine) { return smth AssignMachine (aMachine); }
-#define COM_FORWARD_IInternalSessionControl_AssignMachine_TO_OBJ(obj) COM_FORWARD_IInternalSessionControl_AssignMachine_TO ((obj)->)
-#define COM_FORWARD_IInternalSessionControl_AssignMachine_TO_BASE(base) COM_FORWARD_IInternalSessionControl_AssignMachine_TO (base::)
-#define COM_FORWARD_IInternalSessionControl_AssignRemoteMachine_TO(smth) HRESULT STDMETHODCALLTYPE AssignRemoteMachine (IMachine * aMachine, IConsole * aConsole) { return smth AssignRemoteMachine (aMachine, aConsole); }
-#define COM_FORWARD_IInternalSessionControl_AssignRemoteMachine_TO_OBJ(obj) COM_FORWARD_IInternalSessionControl_AssignRemoteMachine_TO ((obj)->)
-#define COM_FORWARD_IInternalSessionControl_AssignRemoteMachine_TO_BASE(base) COM_FORWARD_IInternalSessionControl_AssignRemoteMachine_TO (base::)
-#define COM_FORWARD_IInternalSessionControl_UpdateMachineState_TO(smth) HRESULT STDMETHODCALLTYPE UpdateMachineState (MachineState aAMachineState) { return smth UpdateMachineState (aAMachineState); }
-#define COM_FORWARD_IInternalSessionControl_UpdateMachineState_TO_OBJ(obj) COM_FORWARD_IInternalSessionControl_UpdateMachineState_TO ((obj)->)
-#define COM_FORWARD_IInternalSessionControl_UpdateMachineState_TO_BASE(base) COM_FORWARD_IInternalSessionControl_UpdateMachineState_TO (base::)
-#define COM_FORWARD_IInternalSessionControl_Uninitialize_TO(smth) HRESULT STDMETHODCALLTYPE Uninitialize() { return smth Uninitialize(); }
-#define COM_FORWARD_IInternalSessionControl_Uninitialize_TO_OBJ(obj) COM_FORWARD_IInternalSessionControl_Uninitialize_TO ((obj)->)
-#define COM_FORWARD_IInternalSessionControl_Uninitialize_TO_BASE(base) COM_FORWARD_IInternalSessionControl_Uninitialize_TO (base::)
-#define COM_FORWARD_IInternalSessionControl_OnNetworkAdapterChange_TO(smth) HRESULT STDMETHODCALLTYPE OnNetworkAdapterChange (INetworkAdapter * aNetworkAdapter, BOOL aChangeAdapter) { return smth OnNetworkAdapterChange (aNetworkAdapter, aChangeAdapter); }
-#define COM_FORWARD_IInternalSessionControl_OnNetworkAdapterChange_TO_OBJ(obj) COM_FORWARD_IInternalSessionControl_OnNetworkAdapterChange_TO ((obj)->)
-#define COM_FORWARD_IInternalSessionControl_OnNetworkAdapterChange_TO_BASE(base) COM_FORWARD_IInternalSessionControl_OnNetworkAdapterChange_TO (base::)
-#define COM_FORWARD_IInternalSessionControl_OnSerialPortChange_TO(smth) HRESULT STDMETHODCALLTYPE OnSerialPortChange (ISerialPort * aSerialPort) { return smth OnSerialPortChange (aSerialPort); }
-#define COM_FORWARD_IInternalSessionControl_OnSerialPortChange_TO_OBJ(obj) COM_FORWARD_IInternalSessionControl_OnSerialPortChange_TO ((obj)->)
-#define COM_FORWARD_IInternalSessionControl_OnSerialPortChange_TO_BASE(base) COM_FORWARD_IInternalSessionControl_OnSerialPortChange_TO (base::)
-#define COM_FORWARD_IInternalSessionControl_OnParallelPortChange_TO(smth) HRESULT STDMETHODCALLTYPE OnParallelPortChange (IParallelPort * aParallelPort) { return smth OnParallelPortChange (aParallelPort); }
-#define COM_FORWARD_IInternalSessionControl_OnParallelPortChange_TO_OBJ(obj) COM_FORWARD_IInternalSessionControl_OnParallelPortChange_TO ((obj)->)
-#define COM_FORWARD_IInternalSessionControl_OnParallelPortChange_TO_BASE(base) COM_FORWARD_IInternalSessionControl_OnParallelPortChange_TO (base::)
-#define COM_FORWARD_IInternalSessionControl_OnStorageControllerChange_TO(smth) HRESULT STDMETHODCALLTYPE OnStorageControllerChange() { return smth OnStorageControllerChange(); }
-#define COM_FORWARD_IInternalSessionControl_OnStorageControllerChange_TO_OBJ(obj) COM_FORWARD_IInternalSessionControl_OnStorageControllerChange_TO ((obj)->)
-#define COM_FORWARD_IInternalSessionControl_OnStorageControllerChange_TO_BASE(base) COM_FORWARD_IInternalSessionControl_OnStorageControllerChange_TO (base::)
-#define COM_FORWARD_IInternalSessionControl_OnMediumChange_TO(smth) HRESULT STDMETHODCALLTYPE OnMediumChange (IMediumAttachment * aMediumAttachment, BOOL aForce) { return smth OnMediumChange (aMediumAttachment, aForce); }
-#define COM_FORWARD_IInternalSessionControl_OnMediumChange_TO_OBJ(obj) COM_FORWARD_IInternalSessionControl_OnMediumChange_TO ((obj)->)
-#define COM_FORWARD_IInternalSessionControl_OnMediumChange_TO_BASE(base) COM_FORWARD_IInternalSessionControl_OnMediumChange_TO (base::)
-#define COM_FORWARD_IInternalSessionControl_OnCPUChange_TO(smth) HRESULT STDMETHODCALLTYPE OnCPUChange (ULONG aCpu, BOOL aAdd) { return smth OnCPUChange (aCpu, aAdd); }
-#define COM_FORWARD_IInternalSessionControl_OnCPUChange_TO_OBJ(obj) COM_FORWARD_IInternalSessionControl_OnCPUChange_TO ((obj)->)
-#define COM_FORWARD_IInternalSessionControl_OnCPUChange_TO_BASE(base) COM_FORWARD_IInternalSessionControl_OnCPUChange_TO (base::)
-#define COM_FORWARD_IInternalSessionControl_OnVRDPServerChange_TO(smth) HRESULT STDMETHODCALLTYPE OnVRDPServerChange (BOOL aRestart) { return smth OnVRDPServerChange (aRestart); }
-#define COM_FORWARD_IInternalSessionControl_OnVRDPServerChange_TO_OBJ(obj) COM_FORWARD_IInternalSessionControl_OnVRDPServerChange_TO ((obj)->)
-#define COM_FORWARD_IInternalSessionControl_OnVRDPServerChange_TO_BASE(base) COM_FORWARD_IInternalSessionControl_OnVRDPServerChange_TO (base::)
-#define COM_FORWARD_IInternalSessionControl_OnUSBControllerChange_TO(smth) HRESULT STDMETHODCALLTYPE OnUSBControllerChange() { return smth OnUSBControllerChange(); }
-#define COM_FORWARD_IInternalSessionControl_OnUSBControllerChange_TO_OBJ(obj) COM_FORWARD_IInternalSessionControl_OnUSBControllerChange_TO ((obj)->)
-#define COM_FORWARD_IInternalSessionControl_OnUSBControllerChange_TO_BASE(base) COM_FORWARD_IInternalSessionControl_OnUSBControllerChange_TO (base::)
-#define COM_FORWARD_IInternalSessionControl_OnSharedFolderChange_TO(smth) HRESULT STDMETHODCALLTYPE OnSharedFolderChange (BOOL aGlobal) { return smth OnSharedFolderChange (aGlobal); }
-#define COM_FORWARD_IInternalSessionControl_OnSharedFolderChange_TO_OBJ(obj) COM_FORWARD_IInternalSessionControl_OnSharedFolderChange_TO ((obj)->)
-#define COM_FORWARD_IInternalSessionControl_OnSharedFolderChange_TO_BASE(base) COM_FORWARD_IInternalSessionControl_OnSharedFolderChange_TO (base::)
-#define COM_FORWARD_IInternalSessionControl_OnUSBDeviceAttach_TO(smth) HRESULT STDMETHODCALLTYPE OnUSBDeviceAttach (IUSBDevice * aDevice, IVirtualBoxErrorInfo * aError, ULONG aMaskedInterfaces) { return smth OnUSBDeviceAttach (aDevice, aError, aMaskedInterfaces); }
-#define COM_FORWARD_IInternalSessionControl_OnUSBDeviceAttach_TO_OBJ(obj) COM_FORWARD_IInternalSessionControl_OnUSBDeviceAttach_TO ((obj)->)
-#define COM_FORWARD_IInternalSessionControl_OnUSBDeviceAttach_TO_BASE(base) COM_FORWARD_IInternalSessionControl_OnUSBDeviceAttach_TO (base::)
-#define COM_FORWARD_IInternalSessionControl_OnUSBDeviceDetach_TO(smth) HRESULT STDMETHODCALLTYPE OnUSBDeviceDetach (BSTR aId, IVirtualBoxErrorInfo * aError) { return smth OnUSBDeviceDetach (aId, aError); }
-#define COM_FORWARD_IInternalSessionControl_OnUSBDeviceDetach_TO_OBJ(obj) COM_FORWARD_IInternalSessionControl_OnUSBDeviceDetach_TO ((obj)->)
-#define COM_FORWARD_IInternalSessionControl_OnUSBDeviceDetach_TO_BASE(base) COM_FORWARD_IInternalSessionControl_OnUSBDeviceDetach_TO (base::)
-#define COM_FORWARD_IInternalSessionControl_OnShowWindow_TO(smth) HRESULT STDMETHODCALLTYPE OnShowWindow (BOOL aCheck, BOOL * aCanShow, ULONG64 * aWinId) { return smth OnShowWindow (aCheck, aCanShow, aWinId); }
-#define COM_FORWARD_IInternalSessionControl_OnShowWindow_TO_OBJ(obj) COM_FORWARD_IInternalSessionControl_OnShowWindow_TO ((obj)->)
-#define COM_FORWARD_IInternalSessionControl_OnShowWindow_TO_BASE(base) COM_FORWARD_IInternalSessionControl_OnShowWindow_TO (base::)
-#define COM_FORWARD_IInternalSessionControl_AccessGuestProperty_TO(smth) HRESULT STDMETHODCALLTYPE AccessGuestProperty (BSTR aName, BSTR aValue, BSTR aFlags, BOOL aIsSetter, BSTR * aRetValue, ULONG64 * aRetTimestamp, BSTR * aRetFlags) { return smth AccessGuestProperty (aName, aValue, aFlags, aIsSetter, aRetValue, aRetTimestamp, aRetFlags); }
-#define COM_FORWARD_IInternalSessionControl_AccessGuestProperty_TO_OBJ(obj) COM_FORWARD_IInternalSessionControl_AccessGuestProperty_TO ((obj)->)
-#define COM_FORWARD_IInternalSessionControl_AccessGuestProperty_TO_BASE(base) COM_FORWARD_IInternalSessionControl_AccessGuestProperty_TO (base::)
-#define COM_FORWARD_IInternalSessionControl_EnumerateGuestProperties_TO(smth) HRESULT STDMETHODCALLTYPE EnumerateGuestProperties (BSTR aPatterns, SAFEARRAY * * aKey, SAFEARRAY * * aValue, SAFEARRAY * * aTimestamp, SAFEARRAY * * aFlags) { return smth EnumerateGuestProperties (aPatterns, aKey, aValue, aTimestamp, aFlags); }
-#define COM_FORWARD_IInternalSessionControl_EnumerateGuestProperties_TO_OBJ(obj) COM_FORWARD_IInternalSessionControl_EnumerateGuestProperties_TO ((obj)->)
-#define COM_FORWARD_IInternalSessionControl_EnumerateGuestProperties_TO_BASE(base) COM_FORWARD_IInternalSessionControl_EnumerateGuestProperties_TO (base::)
-#define COM_FORWARD_IInternalSessionControl_OnlineMergeMedium_TO(smth) HRESULT STDMETHODCALLTYPE OnlineMergeMedium (IMediumAttachment * aMediumAttachment, ULONG aSourceIdx, ULONG aTargetIdx, IMedium * aSource, IMedium * aTarget, BOOL aMergeForward, IMedium * aParentForTarget, SAFEARRAY * * aChildrenToReparent, IProgress * aProgress) { return smth OnlineMergeMedium (aMediumAttachment, aSourceIdx, aTargetIdx, aSource, aTarget, aMergeForward, aParentForTarget, aChildrenToReparent, aProgress); }
-#define COM_FORWARD_IInternalSessionControl_OnlineMergeMedium_TO_OBJ(obj) COM_FORWARD_IInternalSessionControl_OnlineMergeMedium_TO ((obj)->)
-#define COM_FORWARD_IInternalSessionControl_OnlineMergeMedium_TO_BASE(base) COM_FORWARD_IInternalSessionControl_OnlineMergeMedium_TO (base::)
-#define COM_FORWARD_IInternalSessionControl_TO(smth) COM_FORWARD_IInternalSessionControl_GetPID_TO (smth) COM_FORWARD_IInternalSessionControl_GetRemoteConsole_TO (smth) COM_FORWARD_IInternalSessionControl_AssignMachine_TO (smth) COM_FORWARD_IInternalSessionControl_AssignRemoteMachine_TO (smth) COM_FORWARD_IInternalSessionControl_UpdateMachineState_TO (smth) COM_FORWARD_IInternalSessionControl_Uninitialize_TO (smth) COM_FORWARD_IInternalSessionControl_OnNetworkAdapterChange_TO (smth) COM_ [...]
-#define COM_FORWARD_IInternalSessionControl_TO_OBJ(obj) COM_FORWARD_IInternalSessionControl_TO ((obj)->)
-#define COM_FORWARD_IInternalSessionControl_TO_BASE(base) COM_FORWARD_IInternalSessionControl_TO (base::)
-#define COM_FORWARD_ISession_GETTER_State_TO(smth) HRESULT STDMETHODCALLTYPE get_State (SessionState * aState) { return smth get_State (aState); }
-#define COM_FORWARD_ISession_GETTER_State_TO_OBJ(obj) COM_FORWARD_ISession_GETTER_State_TO ((obj)->)
-#define COM_FORWARD_ISession_GETTER_State_TO_BASE(base) COM_FORWARD_ISession_GETTER_State_TO (base::)
-#define COM_FORWARD_ISession_GETTER_Type_TO(smth) HRESULT STDMETHODCALLTYPE get_Type (SessionType * aType) { return smth get_Type (aType); }
-#define COM_FORWARD_ISession_GETTER_Type_TO_OBJ(obj) COM_FORWARD_ISession_GETTER_Type_TO ((obj)->)
-#define COM_FORWARD_ISession_GETTER_Type_TO_BASE(base) COM_FORWARD_ISession_GETTER_Type_TO (base::)
-#define COM_FORWARD_ISession_GETTER_Machine_TO(smth) HRESULT STDMETHODCALLTYPE get_Machine (IMachine * * aMachine) { return smth get_Machine (aMachine); }
-#define COM_FORWARD_ISession_GETTER_Machine_TO_OBJ(obj) COM_FORWARD_ISession_GETTER_Machine_TO ((obj)->)
-#define COM_FORWARD_ISession_GETTER_Machine_TO_BASE(base) COM_FORWARD_ISession_GETTER_Machine_TO (base::)
-#define COM_FORWARD_ISession_GETTER_Console_TO(smth) HRESULT STDMETHODCALLTYPE get_Console (IConsole * * aConsole) { return smth get_Console (aConsole); }
-#define COM_FORWARD_ISession_GETTER_Console_TO_OBJ(obj) COM_FORWARD_ISession_GETTER_Console_TO ((obj)->)
-#define COM_FORWARD_ISession_GETTER_Console_TO_BASE(base) COM_FORWARD_ISession_GETTER_Console_TO (base::)
-#define COM_FORWARD_ISession_Close_TO(smth) HRESULT STDMETHODCALLTYPE Close() { return smth Close(); }
-#define COM_FORWARD_ISession_Close_TO_OBJ(obj) COM_FORWARD_ISession_Close_TO ((obj)->)
-#define COM_FORWARD_ISession_Close_TO_BASE(base) COM_FORWARD_ISession_Close_TO (base::)
-#define COM_FORWARD_ISession_TO(smth) COM_FORWARD_ISession_GETTER_State_TO (smth) COM_FORWARD_ISession_GETTER_Type_TO (smth) COM_FORWARD_ISession_GETTER_Machine_TO (smth) COM_FORWARD_ISession_GETTER_Console_TO (smth) COM_FORWARD_ISession_Close_TO (smth) 
-#define COM_FORWARD_ISession_TO_OBJ(obj) COM_FORWARD_ISession_TO ((obj)->)
-#define COM_FORWARD_ISession_TO_BASE(base) COM_FORWARD_ISession_TO (base::)
-#define COM_FORWARD_IStorageController_GETTER_Name_TO(smth) HRESULT STDMETHODCALLTYPE get_Name (BSTR * aName) { return smth get_Name (aName); }
-#define COM_FORWARD_IStorageController_GETTER_Name_TO_OBJ(obj) COM_FORWARD_IStorageController_GETTER_Name_TO ((obj)->)
-#define COM_FORWARD_IStorageController_GETTER_Name_TO_BASE(base) COM_FORWARD_IStorageController_GETTER_Name_TO (base::)
-#define COM_FORWARD_IStorageController_GETTER_MaxDevicesPerPortCount_TO(smth) HRESULT STDMETHODCALLTYPE get_MaxDevicesPerPortCount (ULONG * aMaxDevicesPerPortCount) { return smth get_MaxDevicesPerPortCount (aMaxDevicesPerPortCount); }
-#define COM_FORWARD_IStorageController_GETTER_MaxDevicesPerPortCount_TO_OBJ(obj) COM_FORWARD_IStorageController_GETTER_MaxDevicesPerPortCount_TO ((obj)->)
-#define COM_FORWARD_IStorageController_GETTER_MaxDevicesPerPortCount_TO_BASE(base) COM_FORWARD_IStorageController_GETTER_MaxDevicesPerPortCount_TO (base::)
-#define COM_FORWARD_IStorageController_GETTER_MinPortCount_TO(smth) HRESULT STDMETHODCALLTYPE get_MinPortCount (ULONG * aMinPortCount) { return smth get_MinPortCount (aMinPortCount); }
-#define COM_FORWARD_IStorageController_GETTER_MinPortCount_TO_OBJ(obj) COM_FORWARD_IStorageController_GETTER_MinPortCount_TO ((obj)->)
-#define COM_FORWARD_IStorageController_GETTER_MinPortCount_TO_BASE(base) COM_FORWARD_IStorageController_GETTER_MinPortCount_TO (base::)
-#define COM_FORWARD_IStorageController_GETTER_MaxPortCount_TO(smth) HRESULT STDMETHODCALLTYPE get_MaxPortCount (ULONG * aMaxPortCount) { return smth get_MaxPortCount (aMaxPortCount); }
-#define COM_FORWARD_IStorageController_GETTER_MaxPortCount_TO_OBJ(obj) COM_FORWARD_IStorageController_GETTER_MaxPortCount_TO ((obj)->)
-#define COM_FORWARD_IStorageController_GETTER_MaxPortCount_TO_BASE(base) COM_FORWARD_IStorageController_GETTER_MaxPortCount_TO (base::)
-#define COM_FORWARD_IStorageController_GETTER_Instance_TO(smth) HRESULT STDMETHODCALLTYPE get_Instance (ULONG * aInstance) { return smth get_Instance (aInstance); }
-#define COM_FORWARD_IStorageController_GETTER_Instance_TO_OBJ(obj) COM_FORWARD_IStorageController_GETTER_Instance_TO ((obj)->)
-#define COM_FORWARD_IStorageController_GETTER_Instance_TO_BASE(base) COM_FORWARD_IStorageController_GETTER_Instance_TO (base::)
-#define COM_FORWARD_IStorageController_SETTER_Instance_TO(smth) HRESULT STDMETHODCALLTYPE put_Instance (ULONG aInstance) { return smth put_Instance (aInstance); }
-#define COM_FORWARD_IStorageController_SETTER_Instance_TO_OBJ(obj) COM_FORWARD_IStorageController_SETTER_Instance_TO ((obj)->)
-#define COM_FORWARD_IStorageController_SETTER_Instance_TO_BASE(base) COM_FORWARD_IStorageController_SETTER_Instance_TO (base::)
-#define COM_FORWARD_IStorageController_GETTER_PortCount_TO(smth) HRESULT STDMETHODCALLTYPE get_PortCount (ULONG * aPortCount) { return smth get_PortCount (aPortCount); }
-#define COM_FORWARD_IStorageController_GETTER_PortCount_TO_OBJ(obj) COM_FORWARD_IStorageController_GETTER_PortCount_TO ((obj)->)
-#define COM_FORWARD_IStorageController_GETTER_PortCount_TO_BASE(base) COM_FORWARD_IStorageController_GETTER_PortCount_TO (base::)
-#define COM_FORWARD_IStorageController_SETTER_PortCount_TO(smth) HRESULT STDMETHODCALLTYPE put_PortCount (ULONG aPortCount) { return smth put_PortCount (aPortCount); }
-#define COM_FORWARD_IStorageController_SETTER_PortCount_TO_OBJ(obj) COM_FORWARD_IStorageController_SETTER_PortCount_TO ((obj)->)
-#define COM_FORWARD_IStorageController_SETTER_PortCount_TO_BASE(base) COM_FORWARD_IStorageController_SETTER_PortCount_TO (base::)
-#define COM_FORWARD_IStorageController_GETTER_Bus_TO(smth) HRESULT STDMETHODCALLTYPE get_Bus (StorageBus * aBus) { return smth get_Bus (aBus); }
-#define COM_FORWARD_IStorageController_GETTER_Bus_TO_OBJ(obj) COM_FORWARD_IStorageController_GETTER_Bus_TO ((obj)->)
-#define COM_FORWARD_IStorageController_GETTER_Bus_TO_BASE(base) COM_FORWARD_IStorageController_GETTER_Bus_TO (base::)
-#define COM_FORWARD_IStorageController_GETTER_ControllerType_TO(smth) HRESULT STDMETHODCALLTYPE get_ControllerType (StorageControllerType * aControllerType) { return smth get_ControllerType (aControllerType); }
-#define COM_FORWARD_IStorageController_GETTER_ControllerType_TO_OBJ(obj) COM_FORWARD_IStorageController_GETTER_ControllerType_TO ((obj)->)
-#define COM_FORWARD_IStorageController_GETTER_ControllerType_TO_BASE(base) COM_FORWARD_IStorageController_GETTER_ControllerType_TO (base::)
-#define COM_FORWARD_IStorageController_SETTER_ControllerType_TO(smth) HRESULT STDMETHODCALLTYPE put_ControllerType (StorageControllerType aControllerType) { return smth put_ControllerType (aControllerType); }
-#define COM_FORWARD_IStorageController_SETTER_ControllerType_TO_OBJ(obj) COM_FORWARD_IStorageController_SETTER_ControllerType_TO ((obj)->)
-#define COM_FORWARD_IStorageController_SETTER_ControllerType_TO_BASE(base) COM_FORWARD_IStorageController_SETTER_ControllerType_TO (base::)
-#define COM_FORWARD_IStorageController_GETTER_UseHostIOCache_TO(smth) HRESULT STDMETHODCALLTYPE get_UseHostIOCache (BOOL * aUseHostIOCache) { return smth get_UseHostIOCache (aUseHostIOCache); }
-#define COM_FORWARD_IStorageController_GETTER_UseHostIOCache_TO_OBJ(obj) COM_FORWARD_IStorageController_GETTER_UseHostIOCache_TO ((obj)->)
-#define COM_FORWARD_IStorageController_GETTER_UseHostIOCache_TO_BASE(base) COM_FORWARD_IStorageController_GETTER_UseHostIOCache_TO (base::)
-#define COM_FORWARD_IStorageController_SETTER_UseHostIOCache_TO(smth) HRESULT STDMETHODCALLTYPE put_UseHostIOCache (BOOL aUseHostIOCache) { return smth put_UseHostIOCache (aUseHostIOCache); }
-#define COM_FORWARD_IStorageController_SETTER_UseHostIOCache_TO_OBJ(obj) COM_FORWARD_IStorageController_SETTER_UseHostIOCache_TO ((obj)->)
-#define COM_FORWARD_IStorageController_SETTER_UseHostIOCache_TO_BASE(base) COM_FORWARD_IStorageController_SETTER_UseHostIOCache_TO (base::)
-#define COM_FORWARD_IStorageController_GetIDEEmulationPort_TO(smth) HRESULT STDMETHODCALLTYPE GetIDEEmulationPort (LONG aDevicePosition, LONG * aPortNumber) { return smth GetIDEEmulationPort (aDevicePosition, aPortNumber); }
-#define COM_FORWARD_IStorageController_GetIDEEmulationPort_TO_OBJ(obj) COM_FORWARD_IStorageController_GetIDEEmulationPort_TO ((obj)->)
-#define COM_FORWARD_IStorageController_GetIDEEmulationPort_TO_BASE(base) COM_FORWARD_IStorageController_GetIDEEmulationPort_TO (base::)
-#define COM_FORWARD_IStorageController_SetIDEEmulationPort_TO(smth) HRESULT STDMETHODCALLTYPE SetIDEEmulationPort (LONG aDevicePosition, LONG aPortNumber) { return smth SetIDEEmulationPort (aDevicePosition, aPortNumber); }
-#define COM_FORWARD_IStorageController_SetIDEEmulationPort_TO_OBJ(obj) COM_FORWARD_IStorageController_SetIDEEmulationPort_TO ((obj)->)
-#define COM_FORWARD_IStorageController_SetIDEEmulationPort_TO_BASE(base) COM_FORWARD_IStorageController_SetIDEEmulationPort_TO (base::)
-#define COM_FORWARD_IStorageController_TO(smth) COM_FORWARD_IStorageController_GETTER_Name_TO (smth) COM_FORWARD_IStorageController_GETTER_MaxDevicesPerPortCount_TO (smth) COM_FORWARD_IStorageController_GETTER_MinPortCount_TO (smth) COM_FORWARD_IStorageController_GETTER_MaxPortCount_TO (smth) COM_FORWARD_IStorageController_GETTER_Instance_TO (smth) COM_FORWARD_IStorageController_SETTER_Instance_TO (smth) COM_FORWARD_IStorageController_GETTER_PortCount_TO (smth) COM_FORWARD_IStorageContro [...]
-#define COM_FORWARD_IStorageController_TO_OBJ(obj) COM_FORWARD_IStorageController_TO ((obj)->)
-#define COM_FORWARD_IStorageController_TO_BASE(base) COM_FORWARD_IStorageController_TO (base::)
-#define COM_FORWARD_IPerformanceMetric_GETTER_MetricName_TO(smth) HRESULT STDMETHODCALLTYPE get_MetricName (BSTR * aMetricName) { return smth get_MetricName (aMetricName); }
-#define COM_FORWARD_IPerformanceMetric_GETTER_MetricName_TO_OBJ(obj) COM_FORWARD_IPerformanceMetric_GETTER_MetricName_TO ((obj)->)
-#define COM_FORWARD_IPerformanceMetric_GETTER_MetricName_TO_BASE(base) COM_FORWARD_IPerformanceMetric_GETTER_MetricName_TO (base::)
-#define COM_FORWARD_IPerformanceMetric_GETTER_Object_TO(smth) HRESULT STDMETHODCALLTYPE get_Object (IUnknown * * aObject) { return smth get_Object (aObject); }
-#define COM_FORWARD_IPerformanceMetric_GETTER_Object_TO_OBJ(obj) COM_FORWARD_IPerformanceMetric_GETTER_Object_TO ((obj)->)
-#define COM_FORWARD_IPerformanceMetric_GETTER_Object_TO_BASE(base) COM_FORWARD_IPerformanceMetric_GETTER_Object_TO (base::)
-#define COM_FORWARD_IPerformanceMetric_GETTER_Description_TO(smth) HRESULT STDMETHODCALLTYPE get_Description (BSTR * aDescription) { return smth get_Description (aDescription); }
-#define COM_FORWARD_IPerformanceMetric_GETTER_Description_TO_OBJ(obj) COM_FORWARD_IPerformanceMetric_GETTER_Description_TO ((obj)->)
-#define COM_FORWARD_IPerformanceMetric_GETTER_Description_TO_BASE(base) COM_FORWARD_IPerformanceMetric_GETTER_Description_TO (base::)
-#define COM_FORWARD_IPerformanceMetric_GETTER_Period_TO(smth) HRESULT STDMETHODCALLTYPE get_Period (ULONG * aPeriod) { return smth get_Period (aPeriod); }
-#define COM_FORWARD_IPerformanceMetric_GETTER_Period_TO_OBJ(obj) COM_FORWARD_IPerformanceMetric_GETTER_Period_TO ((obj)->)
-#define COM_FORWARD_IPerformanceMetric_GETTER_Period_TO_BASE(base) COM_FORWARD_IPerformanceMetric_GETTER_Period_TO (base::)
-#define COM_FORWARD_IPerformanceMetric_GETTER_Count_TO(smth) HRESULT STDMETHODCALLTYPE get_Count (ULONG * aCount) { return smth get_Count (aCount); }
-#define COM_FORWARD_IPerformanceMetric_GETTER_Count_TO_OBJ(obj) COM_FORWARD_IPerformanceMetric_GETTER_Count_TO ((obj)->)
-#define COM_FORWARD_IPerformanceMetric_GETTER_Count_TO_BASE(base) COM_FORWARD_IPerformanceMetric_GETTER_Count_TO (base::)
-#define COM_FORWARD_IPerformanceMetric_GETTER_Unit_TO(smth) HRESULT STDMETHODCALLTYPE get_Unit (BSTR * aUnit) { return smth get_Unit (aUnit); }
-#define COM_FORWARD_IPerformanceMetric_GETTER_Unit_TO_OBJ(obj) COM_FORWARD_IPerformanceMetric_GETTER_Unit_TO ((obj)->)
-#define COM_FORWARD_IPerformanceMetric_GETTER_Unit_TO_BASE(base) COM_FORWARD_IPerformanceMetric_GETTER_Unit_TO (base::)
-#define COM_FORWARD_IPerformanceMetric_GETTER_MinimumValue_TO(smth) HRESULT STDMETHODCALLTYPE get_MinimumValue (LONG * aMinimumValue) { return smth get_MinimumValue (aMinimumValue); }
-#define COM_FORWARD_IPerformanceMetric_GETTER_MinimumValue_TO_OBJ(obj) COM_FORWARD_IPerformanceMetric_GETTER_MinimumValue_TO ((obj)->)
-#define COM_FORWARD_IPerformanceMetric_GETTER_MinimumValue_TO_BASE(base) COM_FORWARD_IPerformanceMetric_GETTER_MinimumValue_TO (base::)
-#define COM_FORWARD_IPerformanceMetric_GETTER_MaximumValue_TO(smth) HRESULT STDMETHODCALLTYPE get_MaximumValue (LONG * aMaximumValue) { return smth get_MaximumValue (aMaximumValue); }
-#define COM_FORWARD_IPerformanceMetric_GETTER_MaximumValue_TO_OBJ(obj) COM_FORWARD_IPerformanceMetric_GETTER_MaximumValue_TO ((obj)->)
-#define COM_FORWARD_IPerformanceMetric_GETTER_MaximumValue_TO_BASE(base) COM_FORWARD_IPerformanceMetric_GETTER_MaximumValue_TO (base::)
-#define COM_FORWARD_IPerformanceMetric_TO(smth) COM_FORWARD_IPerformanceMetric_GETTER_MetricName_TO (smth) COM_FORWARD_IPerformanceMetric_GETTER_Object_TO (smth) COM_FORWARD_IPerformanceMetric_GETTER_Description_TO (smth) COM_FORWARD_IPerformanceMetric_GETTER_Period_TO (smth) COM_FORWARD_IPerformanceMetric_GETTER_Count_TO (smth) COM_FORWARD_IPerformanceMetric_GETTER_Unit_TO (smth) COM_FORWARD_IPerformanceMetric_GETTER_MinimumValue_TO (smth) COM_FORWARD_IPerformanceMetric_GETTER_MaximumVa [...]
-#define COM_FORWARD_IPerformanceMetric_TO_OBJ(obj) COM_FORWARD_IPerformanceMetric_TO ((obj)->)
-#define COM_FORWARD_IPerformanceMetric_TO_BASE(base) COM_FORWARD_IPerformanceMetric_TO (base::)
-#define COM_FORWARD_IPerformanceCollector_GETTER_MetricNames_TO(smth) HRESULT STDMETHODCALLTYPE get_MetricNames (SAFEARRAY * * aMetricNames) { return smth get_MetricNames (aMetricNames); }
-#define COM_FORWARD_IPerformanceCollector_GETTER_MetricNames_TO_OBJ(obj) COM_FORWARD_IPerformanceCollector_GETTER_MetricNames_TO ((obj)->)
-#define COM_FORWARD_IPerformanceCollector_GETTER_MetricNames_TO_BASE(base) COM_FORWARD_IPerformanceCollector_GETTER_MetricNames_TO (base::)
-#define COM_FORWARD_IPerformanceCollector_GetMetrics_TO(smth) HRESULT STDMETHODCALLTYPE GetMetrics (SAFEARRAY * * aMetricNames, SAFEARRAY * * aObjects, SAFEARRAY * * aMetrics) { return smth GetMetrics (aMetricNames, aObjects, aMetrics); }
-#define COM_FORWARD_IPerformanceCollector_GetMetrics_TO_OBJ(obj) COM_FORWARD_IPerformanceCollector_GetMetrics_TO ((obj)->)
-#define COM_FORWARD_IPerformanceCollector_GetMetrics_TO_BASE(base) COM_FORWARD_IPerformanceCollector_GetMetrics_TO (base::)
-#define COM_FORWARD_IPerformanceCollector_SetupMetrics_TO(smth) HRESULT STDMETHODCALLTYPE SetupMetrics (SAFEARRAY * * aMetricNames, SAFEARRAY * * aObjects, ULONG aPeriod, ULONG aCount, SAFEARRAY * * aAffectedMetrics) { return smth SetupMetrics (aMetricNames, aObjects, aPeriod, aCount, aAffectedMetrics); }
-#define COM_FORWARD_IPerformanceCollector_SetupMetrics_TO_OBJ(obj) COM_FORWARD_IPerformanceCollector_SetupMetrics_TO ((obj)->)
-#define COM_FORWARD_IPerformanceCollector_SetupMetrics_TO_BASE(base) COM_FORWARD_IPerformanceCollector_SetupMetrics_TO (base::)
-#define COM_FORWARD_IPerformanceCollector_EnableMetrics_TO(smth) HRESULT STDMETHODCALLTYPE EnableMetrics (SAFEARRAY * * aMetricNames, SAFEARRAY * * aObjects, SAFEARRAY * * aAffectedMetrics) { return smth EnableMetrics (aMetricNames, aObjects, aAffectedMetrics); }
-#define COM_FORWARD_IPerformanceCollector_EnableMetrics_TO_OBJ(obj) COM_FORWARD_IPerformanceCollector_EnableMetrics_TO ((obj)->)
-#define COM_FORWARD_IPerformanceCollector_EnableMetrics_TO_BASE(base) COM_FORWARD_IPerformanceCollector_EnableMetrics_TO (base::)
-#define COM_FORWARD_IPerformanceCollector_DisableMetrics_TO(smth) HRESULT STDMETHODCALLTYPE DisableMetrics (SAFEARRAY * * aMetricNames, SAFEARRAY * * aObjects, SAFEARRAY * * aAffectedMetrics) { return smth DisableMetrics (aMetricNames, aObjects, aAffectedMetrics); }
-#define COM_FORWARD_IPerformanceCollector_DisableMetrics_TO_OBJ(obj) COM_FORWARD_IPerformanceCollector_DisableMetrics_TO ((obj)->)
-#define COM_FORWARD_IPerformanceCollector_DisableMetrics_TO_BASE(base) COM_FORWARD_IPerformanceCollector_DisableMetrics_TO (base::)
-#define COM_FORWARD_IPerformanceCollector_QueryMetricsData_TO(smth) HRESULT STDMETHODCALLTYPE QueryMetricsData (SAFEARRAY * * aMetricNames, SAFEARRAY * * aObjects, SAFEARRAY * * aReturnMetricNames, SAFEARRAY * * aReturnObjects, SAFEARRAY * * aReturnUnits, SAFEARRAY * * aReturnScales, SAFEARRAY * * aReturnSequenceNumbers, SAFEARRAY * * aReturnDataIndices, SAFEARRAY * * aReturnDataLengths, SAFEARRAY * * aReturnData) { return smth QueryMetricsData (aMetricNames, aObjects, aReturnMetricNames [...]
-#define COM_FORWARD_IPerformanceCollector_QueryMetricsData_TO_OBJ(obj) COM_FORWARD_IPerformanceCollector_QueryMetricsData_TO ((obj)->)
-#define COM_FORWARD_IPerformanceCollector_QueryMetricsData_TO_BASE(base) COM_FORWARD_IPerformanceCollector_QueryMetricsData_TO (base::)
-#define COM_FORWARD_IPerformanceCollector_TO(smth) COM_FORWARD_IPerformanceCollector_GETTER_MetricNames_TO (smth) COM_FORWARD_IPerformanceCollector_GetMetrics_TO (smth) COM_FORWARD_IPerformanceCollector_SetupMetrics_TO (smth) COM_FORWARD_IPerformanceCollector_EnableMetrics_TO (smth) COM_FORWARD_IPerformanceCollector_DisableMetrics_TO (smth) COM_FORWARD_IPerformanceCollector_QueryMetricsData_TO (smth) 
-#define COM_FORWARD_IPerformanceCollector_TO_OBJ(obj) COM_FORWARD_IPerformanceCollector_TO ((obj)->)
-#define COM_FORWARD_IPerformanceCollector_TO_BASE(base) COM_FORWARD_IPerformanceCollector_TO (base::)
-#define COM_FORWARD_INATEngine_GETTER_Network_TO(smth) HRESULT STDMETHODCALLTYPE get_Network (BSTR * aNetwork) { return smth get_Network (aNetwork); }
-#define COM_FORWARD_INATEngine_GETTER_Network_TO_OBJ(obj) COM_FORWARD_INATEngine_GETTER_Network_TO ((obj)->)
-#define COM_FORWARD_INATEngine_GETTER_Network_TO_BASE(base) COM_FORWARD_INATEngine_GETTER_Network_TO (base::)
-#define COM_FORWARD_INATEngine_SETTER_Network_TO(smth) HRESULT STDMETHODCALLTYPE put_Network (BSTR aNetwork) { return smth put_Network (aNetwork); }
-#define COM_FORWARD_INATEngine_SETTER_Network_TO_OBJ(obj) COM_FORWARD_INATEngine_SETTER_Network_TO ((obj)->)
-#define COM_FORWARD_INATEngine_SETTER_Network_TO_BASE(base) COM_FORWARD_INATEngine_SETTER_Network_TO (base::)
-#define COM_FORWARD_INATEngine_GETTER_HostIP_TO(smth) HRESULT STDMETHODCALLTYPE get_HostIP (BSTR * aHostIP) { return smth get_HostIP (aHostIP); }
-#define COM_FORWARD_INATEngine_GETTER_HostIP_TO_OBJ(obj) COM_FORWARD_INATEngine_GETTER_HostIP_TO ((obj)->)
-#define COM_FORWARD_INATEngine_GETTER_HostIP_TO_BASE(base) COM_FORWARD_INATEngine_GETTER_HostIP_TO (base::)
-#define COM_FORWARD_INATEngine_SETTER_HostIP_TO(smth) HRESULT STDMETHODCALLTYPE put_HostIP (BSTR aHostIP) { return smth put_HostIP (aHostIP); }
-#define COM_FORWARD_INATEngine_SETTER_HostIP_TO_OBJ(obj) COM_FORWARD_INATEngine_SETTER_HostIP_TO ((obj)->)
-#define COM_FORWARD_INATEngine_SETTER_HostIP_TO_BASE(base) COM_FORWARD_INATEngine_SETTER_HostIP_TO (base::)
-#define COM_FORWARD_INATEngine_GETTER_TftpPrefix_TO(smth) HRESULT STDMETHODCALLTYPE get_TftpPrefix (BSTR * aTftpPrefix) { return smth get_TftpPrefix (aTftpPrefix); }
-#define COM_FORWARD_INATEngine_GETTER_TftpPrefix_TO_OBJ(obj) COM_FORWARD_INATEngine_GETTER_TftpPrefix_TO ((obj)->)
-#define COM_FORWARD_INATEngine_GETTER_TftpPrefix_TO_BASE(base) COM_FORWARD_INATEngine_GETTER_TftpPrefix_TO (base::)
-#define COM_FORWARD_INATEngine_SETTER_TftpPrefix_TO(smth) HRESULT STDMETHODCALLTYPE put_TftpPrefix (BSTR aTftpPrefix) { return smth put_TftpPrefix (aTftpPrefix); }
-#define COM_FORWARD_INATEngine_SETTER_TftpPrefix_TO_OBJ(obj) COM_FORWARD_INATEngine_SETTER_TftpPrefix_TO ((obj)->)
-#define COM_FORWARD_INATEngine_SETTER_TftpPrefix_TO_BASE(base) COM_FORWARD_INATEngine_SETTER_TftpPrefix_TO (base::)
-#define COM_FORWARD_INATEngine_GETTER_TftpBootFile_TO(smth) HRESULT STDMETHODCALLTYPE get_TftpBootFile (BSTR * aTftpBootFile) { return smth get_TftpBootFile (aTftpBootFile); }
-#define COM_FORWARD_INATEngine_GETTER_TftpBootFile_TO_OBJ(obj) COM_FORWARD_INATEngine_GETTER_TftpBootFile_TO ((obj)->)
-#define COM_FORWARD_INATEngine_GETTER_TftpBootFile_TO_BASE(base) COM_FORWARD_INATEngine_GETTER_TftpBootFile_TO (base::)
-#define COM_FORWARD_INATEngine_SETTER_TftpBootFile_TO(smth) HRESULT STDMETHODCALLTYPE put_TftpBootFile (BSTR aTftpBootFile) { return smth put_TftpBootFile (aTftpBootFile); }
-#define COM_FORWARD_INATEngine_SETTER_TftpBootFile_TO_OBJ(obj) COM_FORWARD_INATEngine_SETTER_TftpBootFile_TO ((obj)->)
-#define COM_FORWARD_INATEngine_SETTER_TftpBootFile_TO_BASE(base) COM_FORWARD_INATEngine_SETTER_TftpBootFile_TO (base::)
-#define COM_FORWARD_INATEngine_GETTER_TftpNextServer_TO(smth) HRESULT STDMETHODCALLTYPE get_TftpNextServer (BSTR * aTftpNextServer) { return smth get_TftpNextServer (aTftpNextServer); }
-#define COM_FORWARD_INATEngine_GETTER_TftpNextServer_TO_OBJ(obj) COM_FORWARD_INATEngine_GETTER_TftpNextServer_TO ((obj)->)
-#define COM_FORWARD_INATEngine_GETTER_TftpNextServer_TO_BASE(base) COM_FORWARD_INATEngine_GETTER_TftpNextServer_TO (base::)
-#define COM_FORWARD_INATEngine_SETTER_TftpNextServer_TO(smth) HRESULT STDMETHODCALLTYPE put_TftpNextServer (BSTR aTftpNextServer) { return smth put_TftpNextServer (aTftpNextServer); }
-#define COM_FORWARD_INATEngine_SETTER_TftpNextServer_TO_OBJ(obj) COM_FORWARD_INATEngine_SETTER_TftpNextServer_TO ((obj)->)
-#define COM_FORWARD_INATEngine_SETTER_TftpNextServer_TO_BASE(base) COM_FORWARD_INATEngine_SETTER_TftpNextServer_TO (base::)
-#define COM_FORWARD_INATEngine_GETTER_AliasMode_TO(smth) HRESULT STDMETHODCALLTYPE get_AliasMode (ULONG * aAliasMode) { return smth get_AliasMode (aAliasMode); }
-#define COM_FORWARD_INATEngine_GETTER_AliasMode_TO_OBJ(obj) COM_FORWARD_INATEngine_GETTER_AliasMode_TO ((obj)->)
-#define COM_FORWARD_INATEngine_GETTER_AliasMode_TO_BASE(base) COM_FORWARD_INATEngine_GETTER_AliasMode_TO (base::)
-#define COM_FORWARD_INATEngine_SETTER_AliasMode_TO(smth) HRESULT STDMETHODCALLTYPE put_AliasMode (ULONG aAliasMode) { return smth put_AliasMode (aAliasMode); }
-#define COM_FORWARD_INATEngine_SETTER_AliasMode_TO_OBJ(obj) COM_FORWARD_INATEngine_SETTER_AliasMode_TO ((obj)->)
-#define COM_FORWARD_INATEngine_SETTER_AliasMode_TO_BASE(base) COM_FORWARD_INATEngine_SETTER_AliasMode_TO (base::)
-#define COM_FORWARD_INATEngine_GETTER_DnsPassDomain_TO(smth) HRESULT STDMETHODCALLTYPE get_DnsPassDomain (BOOL * aDnsPassDomain) { return smth get_DnsPassDomain (aDnsPassDomain); }
-#define COM_FORWARD_INATEngine_GETTER_DnsPassDomain_TO_OBJ(obj) COM_FORWARD_INATEngine_GETTER_DnsPassDomain_TO ((obj)->)
-#define COM_FORWARD_INATEngine_GETTER_DnsPassDomain_TO_BASE(base) COM_FORWARD_INATEngine_GETTER_DnsPassDomain_TO (base::)
-#define COM_FORWARD_INATEngine_SETTER_DnsPassDomain_TO(smth) HRESULT STDMETHODCALLTYPE put_DnsPassDomain (BOOL aDnsPassDomain) { return smth put_DnsPassDomain (aDnsPassDomain); }
-#define COM_FORWARD_INATEngine_SETTER_DnsPassDomain_TO_OBJ(obj) COM_FORWARD_INATEngine_SETTER_DnsPassDomain_TO ((obj)->)
-#define COM_FORWARD_INATEngine_SETTER_DnsPassDomain_TO_BASE(base) COM_FORWARD_INATEngine_SETTER_DnsPassDomain_TO (base::)
-#define COM_FORWARD_INATEngine_GETTER_DnsProxy_TO(smth) HRESULT STDMETHODCALLTYPE get_DnsProxy (BOOL * aDnsProxy) { return smth get_DnsProxy (aDnsProxy); }
-#define COM_FORWARD_INATEngine_GETTER_DnsProxy_TO_OBJ(obj) COM_FORWARD_INATEngine_GETTER_DnsProxy_TO ((obj)->)
-#define COM_FORWARD_INATEngine_GETTER_DnsProxy_TO_BASE(base) COM_FORWARD_INATEngine_GETTER_DnsProxy_TO (base::)
-#define COM_FORWARD_INATEngine_SETTER_DnsProxy_TO(smth) HRESULT STDMETHODCALLTYPE put_DnsProxy (BOOL aDnsProxy) { return smth put_DnsProxy (aDnsProxy); }
-#define COM_FORWARD_INATEngine_SETTER_DnsProxy_TO_OBJ(obj) COM_FORWARD_INATEngine_SETTER_DnsProxy_TO ((obj)->)
-#define COM_FORWARD_INATEngine_SETTER_DnsProxy_TO_BASE(base) COM_FORWARD_INATEngine_SETTER_DnsProxy_TO (base::)
-#define COM_FORWARD_INATEngine_GETTER_DnsUseHostResolver_TO(smth) HRESULT STDMETHODCALLTYPE get_DnsUseHostResolver (BOOL * aDnsUseHostResolver) { return smth get_DnsUseHostResolver (aDnsUseHostResolver); }
-#define COM_FORWARD_INATEngine_GETTER_DnsUseHostResolver_TO_OBJ(obj) COM_FORWARD_INATEngine_GETTER_DnsUseHostResolver_TO ((obj)->)
-#define COM_FORWARD_INATEngine_GETTER_DnsUseHostResolver_TO_BASE(base) COM_FORWARD_INATEngine_GETTER_DnsUseHostResolver_TO (base::)
-#define COM_FORWARD_INATEngine_SETTER_DnsUseHostResolver_TO(smth) HRESULT STDMETHODCALLTYPE put_DnsUseHostResolver (BOOL aDnsUseHostResolver) { return smth put_DnsUseHostResolver (aDnsUseHostResolver); }
-#define COM_FORWARD_INATEngine_SETTER_DnsUseHostResolver_TO_OBJ(obj) COM_FORWARD_INATEngine_SETTER_DnsUseHostResolver_TO ((obj)->)
-#define COM_FORWARD_INATEngine_SETTER_DnsUseHostResolver_TO_BASE(base) COM_FORWARD_INATEngine_SETTER_DnsUseHostResolver_TO (base::)
-#define COM_FORWARD_INATEngine_GETTER_Redirects_TO(smth) HRESULT STDMETHODCALLTYPE get_Redirects (SAFEARRAY * * aRedirects) { return smth get_Redirects (aRedirects); }
-#define COM_FORWARD_INATEngine_GETTER_Redirects_TO_OBJ(obj) COM_FORWARD_INATEngine_GETTER_Redirects_TO ((obj)->)
-#define COM_FORWARD_INATEngine_GETTER_Redirects_TO_BASE(base) COM_FORWARD_INATEngine_GETTER_Redirects_TO (base::)
-#define COM_FORWARD_INATEngine_SetNetworkSettings_TO(smth) HRESULT STDMETHODCALLTYPE SetNetworkSettings (ULONG aMtu, ULONG aSockSnd, ULONG aSockRcv, ULONG aTcpWndSnd, ULONG aTcpWndRcv) { return smth SetNetworkSettings (aMtu, aSockSnd, aSockRcv, aTcpWndSnd, aTcpWndRcv); }
-#define COM_FORWARD_INATEngine_SetNetworkSettings_TO_OBJ(obj) COM_FORWARD_INATEngine_SetNetworkSettings_TO ((obj)->)
-#define COM_FORWARD_INATEngine_SetNetworkSettings_TO_BASE(base) COM_FORWARD_INATEngine_SetNetworkSettings_TO (base::)
-#define COM_FORWARD_INATEngine_GetNetworkSettings_TO(smth) HRESULT STDMETHODCALLTYPE GetNetworkSettings (ULONG * aMtu, ULONG * aSockSnd, ULONG * aSockRcv, ULONG * aTcpWndSnd, ULONG * aTcpWndRcv) { return smth GetNetworkSettings (aMtu, aSockSnd, aSockRcv, aTcpWndSnd, aTcpWndRcv); }
-#define COM_FORWARD_INATEngine_GetNetworkSettings_TO_OBJ(obj) COM_FORWARD_INATEngine_GetNetworkSettings_TO ((obj)->)
-#define COM_FORWARD_INATEngine_GetNetworkSettings_TO_BASE(base) COM_FORWARD_INATEngine_GetNetworkSettings_TO (base::)
-#define COM_FORWARD_INATEngine_AddRedirect_TO(smth) HRESULT STDMETHODCALLTYPE AddRedirect (BSTR aName, NATProtocol aProto, BSTR aHostIp, USHORT aHostPort, BSTR aGuestIp, USHORT aGuestPort) { return smth AddRedirect (aName, aProto, aHostIp, aHostPort, aGuestIp, aGuestPort); }
-#define COM_FORWARD_INATEngine_AddRedirect_TO_OBJ(obj) COM_FORWARD_INATEngine_AddRedirect_TO ((obj)->)
-#define COM_FORWARD_INATEngine_AddRedirect_TO_BASE(base) COM_FORWARD_INATEngine_AddRedirect_TO (base::)
-#define COM_FORWARD_INATEngine_RemoveRedirect_TO(smth) HRESULT STDMETHODCALLTYPE RemoveRedirect (BSTR aName) { return smth RemoveRedirect (aName); }
-#define COM_FORWARD_INATEngine_RemoveRedirect_TO_OBJ(obj) COM_FORWARD_INATEngine_RemoveRedirect_TO ((obj)->)
-#define COM_FORWARD_INATEngine_RemoveRedirect_TO_BASE(base) COM_FORWARD_INATEngine_RemoveRedirect_TO (base::)
-#define COM_FORWARD_INATEngine_TO(smth) COM_FORWARD_INATEngine_GETTER_Network_TO (smth) COM_FORWARD_INATEngine_SETTER_Network_TO (smth) COM_FORWARD_INATEngine_GETTER_HostIP_TO (smth) COM_FORWARD_INATEngine_SETTER_HostIP_TO (smth) COM_FORWARD_INATEngine_GETTER_TftpPrefix_TO (smth) COM_FORWARD_INATEngine_SETTER_TftpPrefix_TO (smth) COM_FORWARD_INATEngine_GETTER_TftpBootFile_TO (smth) COM_FORWARD_INATEngine_SETTER_TftpBootFile_TO (smth) COM_FORWARD_INATEngine_GETTER_TftpNextServer_TO (smth) [...]
-#define COM_FORWARD_INATEngine_TO_OBJ(obj) COM_FORWARD_INATEngine_TO ((obj)->)
-#define COM_FORWARD_INATEngine_TO_BASE(base) COM_FORWARD_INATEngine_TO (base::)
-
-EXTERN_C const IID LIBID_VirtualBox;
-
-#ifndef __IVirtualBoxErrorInfo_INTERFACE_DEFINED__
-#define __IVirtualBoxErrorInfo_INTERFACE_DEFINED__
-
-/* interface IVirtualBoxErrorInfo */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IVirtualBoxErrorInfo;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("4b86d186-407e-4f9e-8be8-e50061be8725")
-    IVirtualBoxErrorInfo : public IErrorInfo
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_ResultCode( 
-            /* [retval][out] */ LONG *aResultCode) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_InterfaceID( 
-            /* [retval][out] */ BSTR *aInterfaceID) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Component( 
-            /* [retval][out] */ BSTR *aComponent) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Text( 
-            /* [retval][out] */ BSTR *aText) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Next( 
-            /* [retval][out] */ IVirtualBoxErrorInfo **aNext) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IVirtualBoxErrorInfoVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IVirtualBoxErrorInfo * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IVirtualBoxErrorInfo * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IVirtualBoxErrorInfo * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetGUID )( 
-            IVirtualBoxErrorInfo * This,
-            /* [out] */ GUID *pGUID);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetSource )( 
-            IVirtualBoxErrorInfo * This,
-            /* [out] */ BSTR *pBstrSource);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetDescription )( 
-            IVirtualBoxErrorInfo * This,
-            /* [out] */ BSTR *pBstrDescription);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetHelpFile )( 
-            IVirtualBoxErrorInfo * This,
-            /* [out] */ BSTR *pBstrHelpFile);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetHelpContext )( 
-            IVirtualBoxErrorInfo * This,
-            /* [out] */ DWORD *pdwHelpContext);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_ResultCode )( 
-            IVirtualBoxErrorInfo * This,
-            /* [retval][out] */ LONG *aResultCode);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_InterfaceID )( 
-            IVirtualBoxErrorInfo * This,
-            /* [retval][out] */ BSTR *aInterfaceID);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Component )( 
-            IVirtualBoxErrorInfo * This,
-            /* [retval][out] */ BSTR *aComponent);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Text )( 
-            IVirtualBoxErrorInfo * This,
-            /* [retval][out] */ BSTR *aText);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Next )( 
-            IVirtualBoxErrorInfo * This,
-            /* [retval][out] */ IVirtualBoxErrorInfo **aNext);
-        
-        END_INTERFACE
-    } IVirtualBoxErrorInfoVtbl;
-
-    interface IVirtualBoxErrorInfo
-    {
-        CONST_VTBL struct IVirtualBoxErrorInfoVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IVirtualBoxErrorInfo_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IVirtualBoxErrorInfo_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IVirtualBoxErrorInfo_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IVirtualBoxErrorInfo_GetGUID(This,pGUID)	\
-    (This)->lpVtbl -> GetGUID(This,pGUID)
-
-#define IVirtualBoxErrorInfo_GetSource(This,pBstrSource)	\
-    (This)->lpVtbl -> GetSource(This,pBstrSource)
-
-#define IVirtualBoxErrorInfo_GetDescription(This,pBstrDescription)	\
-    (This)->lpVtbl -> GetDescription(This,pBstrDescription)
-
-#define IVirtualBoxErrorInfo_GetHelpFile(This,pBstrHelpFile)	\
-    (This)->lpVtbl -> GetHelpFile(This,pBstrHelpFile)
-
-#define IVirtualBoxErrorInfo_GetHelpContext(This,pdwHelpContext)	\
-    (This)->lpVtbl -> GetHelpContext(This,pdwHelpContext)
-
-
-#define IVirtualBoxErrorInfo_get_ResultCode(This,aResultCode)	\
-    (This)->lpVtbl -> get_ResultCode(This,aResultCode)
-
-#define IVirtualBoxErrorInfo_get_InterfaceID(This,aInterfaceID)	\
-    (This)->lpVtbl -> get_InterfaceID(This,aInterfaceID)
-
-#define IVirtualBoxErrorInfo_get_Component(This,aComponent)	\
-    (This)->lpVtbl -> get_Component(This,aComponent)
-
-#define IVirtualBoxErrorInfo_get_Text(This,aText)	\
-    (This)->lpVtbl -> get_Text(This,aText)
-
-#define IVirtualBoxErrorInfo_get_Next(This,aNext)	\
-    (This)->lpVtbl -> get_Next(This,aNext)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IVirtualBoxErrorInfo_get_ResultCode_Proxy( 
-    IVirtualBoxErrorInfo * This,
-    /* [retval][out] */ LONG *aResultCode);
-
-
-void __RPC_STUB IVirtualBoxErrorInfo_get_ResultCode_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IVirtualBoxErrorInfo_get_InterfaceID_Proxy( 
-    IVirtualBoxErrorInfo * This,
-    /* [retval][out] */ BSTR *aInterfaceID);
-
-
-void __RPC_STUB IVirtualBoxErrorInfo_get_InterfaceID_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IVirtualBoxErrorInfo_get_Component_Proxy( 
-    IVirtualBoxErrorInfo * This,
-    /* [retval][out] */ BSTR *aComponent);
-
-
-void __RPC_STUB IVirtualBoxErrorInfo_get_Component_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IVirtualBoxErrorInfo_get_Text_Proxy( 
-    IVirtualBoxErrorInfo * This,
-    /* [retval][out] */ BSTR *aText);
-
-
-void __RPC_STUB IVirtualBoxErrorInfo_get_Text_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IVirtualBoxErrorInfo_get_Next_Proxy( 
-    IVirtualBoxErrorInfo * This,
-    /* [retval][out] */ IVirtualBoxErrorInfo **aNext);
-
-
-void __RPC_STUB IVirtualBoxErrorInfo_get_Next_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IVirtualBoxErrorInfo_INTERFACE_DEFINED__ */
-
-
-#ifndef __ILocalOwner_INTERFACE_DEFINED__
-#define __ILocalOwner_INTERFACE_DEFINED__
-
-/* interface ILocalOwner */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_ILocalOwner;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("308FF42A-DC45-49D4-A950-B1EEE5E00BB5")
-    ILocalOwner : public IDispatch
-    {
-    public:
-        virtual HRESULT STDMETHODCALLTYPE SetLocalObject( 
-            /* [in] */ IUnknown *aObject) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct ILocalOwnerVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            ILocalOwner * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            ILocalOwner * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            ILocalOwner * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            ILocalOwner * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            ILocalOwner * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            ILocalOwner * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            ILocalOwner * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetLocalObject )( 
-            ILocalOwner * This,
-            /* [in] */ IUnknown *aObject);
-        
-        END_INTERFACE
-    } ILocalOwnerVtbl;
-
-    interface ILocalOwner
-    {
-        CONST_VTBL struct ILocalOwnerVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define ILocalOwner_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define ILocalOwner_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define ILocalOwner_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define ILocalOwner_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define ILocalOwner_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define ILocalOwner_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define ILocalOwner_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define ILocalOwner_SetLocalObject(This,aObject)	\
-    (This)->lpVtbl -> SetLocalObject(This,aObject)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-HRESULT STDMETHODCALLTYPE ILocalOwner_SetLocalObject_Proxy( 
-    ILocalOwner * This,
-    /* [in] */ IUnknown *aObject);
-
-
-void __RPC_STUB ILocalOwner_SetLocalObject_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __ILocalOwner_INTERFACE_DEFINED__ */
-
-
-#ifndef __IVirtualBoxCallback_INTERFACE_DEFINED__
-#define __IVirtualBoxCallback_INTERFACE_DEFINED__
-
-/* interface IVirtualBoxCallback */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IVirtualBoxCallback;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("7f6a65b6-ad5d-4a67-8872-0b11cb7ea95c")
-    IVirtualBoxCallback : public IDispatch
-    {
-    public:
-        virtual HRESULT STDMETHODCALLTYPE OnMachineStateChange( 
-            /* [in] */ BSTR aMachineId,
-            /* [in] */ MachineState aState) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnMachineDataChange( 
-            /* [in] */ BSTR aMachineId) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnExtraDataCanChange( 
-            /* [in] */ BSTR aMachineId,
-            /* [in] */ BSTR aKey,
-            /* [in] */ BSTR aValue,
-            /* [out] */ BSTR *aError,
-            /* [retval][out] */ BOOL *aAllowChange) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnExtraDataChange( 
-            /* [in] */ BSTR aMachineId,
-            /* [in] */ BSTR aKey,
-            /* [in] */ BSTR aValue) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnMediumRegistered( 
-            /* [in] */ BSTR aMediumId,
-            /* [in] */ DeviceType aMediumType,
-            /* [in] */ BOOL aRegistered) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnMachineRegistered( 
-            /* [in] */ BSTR aMachineId,
-            /* [in] */ BOOL aRegistered) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnSessionStateChange( 
-            /* [in] */ BSTR aMachineId,
-            /* [in] */ SessionState aState) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnSnapshotTaken( 
-            /* [in] */ BSTR aMachineId,
-            /* [in] */ BSTR aSnapshotId) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnSnapshotDeleted( 
-            /* [in] */ BSTR aMachineId,
-            /* [in] */ BSTR aSnapshotId) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnSnapshotChange( 
-            /* [in] */ BSTR aMachineId,
-            /* [in] */ BSTR aSnapshotId) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnGuestPropertyChange( 
-            /* [in] */ BSTR aMachineId,
-            /* [in] */ BSTR aName,
-            /* [in] */ BSTR aValue,
-            /* [in] */ BSTR aFlags) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IVirtualBoxCallbackVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IVirtualBoxCallback * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IVirtualBoxCallback * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IVirtualBoxCallback * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IVirtualBoxCallback * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IVirtualBoxCallback * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IVirtualBoxCallback * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IVirtualBoxCallback * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnMachineStateChange )( 
-            IVirtualBoxCallback * This,
-            /* [in] */ BSTR aMachineId,
-            /* [in] */ MachineState aState);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnMachineDataChange )( 
-            IVirtualBoxCallback * This,
-            /* [in] */ BSTR aMachineId);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnExtraDataCanChange )( 
-            IVirtualBoxCallback * This,
-            /* [in] */ BSTR aMachineId,
-            /* [in] */ BSTR aKey,
-            /* [in] */ BSTR aValue,
-            /* [out] */ BSTR *aError,
-            /* [retval][out] */ BOOL *aAllowChange);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnExtraDataChange )( 
-            IVirtualBoxCallback * This,
-            /* [in] */ BSTR aMachineId,
-            /* [in] */ BSTR aKey,
-            /* [in] */ BSTR aValue);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnMediumRegistered )( 
-            IVirtualBoxCallback * This,
-            /* [in] */ BSTR aMediumId,
-            /* [in] */ DeviceType aMediumType,
-            /* [in] */ BOOL aRegistered);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnMachineRegistered )( 
-            IVirtualBoxCallback * This,
-            /* [in] */ BSTR aMachineId,
-            /* [in] */ BOOL aRegistered);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnSessionStateChange )( 
-            IVirtualBoxCallback * This,
-            /* [in] */ BSTR aMachineId,
-            /* [in] */ SessionState aState);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnSnapshotTaken )( 
-            IVirtualBoxCallback * This,
-            /* [in] */ BSTR aMachineId,
-            /* [in] */ BSTR aSnapshotId);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnSnapshotDeleted )( 
-            IVirtualBoxCallback * This,
-            /* [in] */ BSTR aMachineId,
-            /* [in] */ BSTR aSnapshotId);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnSnapshotChange )( 
-            IVirtualBoxCallback * This,
-            /* [in] */ BSTR aMachineId,
-            /* [in] */ BSTR aSnapshotId);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnGuestPropertyChange )( 
-            IVirtualBoxCallback * This,
-            /* [in] */ BSTR aMachineId,
-            /* [in] */ BSTR aName,
-            /* [in] */ BSTR aValue,
-            /* [in] */ BSTR aFlags);
-        
-        END_INTERFACE
-    } IVirtualBoxCallbackVtbl;
-
-    interface IVirtualBoxCallback
-    {
-        CONST_VTBL struct IVirtualBoxCallbackVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IVirtualBoxCallback_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IVirtualBoxCallback_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IVirtualBoxCallback_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IVirtualBoxCallback_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IVirtualBoxCallback_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IVirtualBoxCallback_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IVirtualBoxCallback_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IVirtualBoxCallback_OnMachineStateChange(This,aMachineId,aState)	\
-    (This)->lpVtbl -> OnMachineStateChange(This,aMachineId,aState)
-
-#define IVirtualBoxCallback_OnMachineDataChange(This,aMachineId)	\
-    (This)->lpVtbl -> OnMachineDataChange(This,aMachineId)
-
-#define IVirtualBoxCallback_OnExtraDataCanChange(This,aMachineId,aKey,aValue,aError,aAllowChange)	\
-    (This)->lpVtbl -> OnExtraDataCanChange(This,aMachineId,aKey,aValue,aError,aAllowChange)
-
-#define IVirtualBoxCallback_OnExtraDataChange(This,aMachineId,aKey,aValue)	\
-    (This)->lpVtbl -> OnExtraDataChange(This,aMachineId,aKey,aValue)
-
-#define IVirtualBoxCallback_OnMediumRegistered(This,aMediumId,aMediumType,aRegistered)	\
-    (This)->lpVtbl -> OnMediumRegistered(This,aMediumId,aMediumType,aRegistered)
-
-#define IVirtualBoxCallback_OnMachineRegistered(This,aMachineId,aRegistered)	\
-    (This)->lpVtbl -> OnMachineRegistered(This,aMachineId,aRegistered)
-
-#define IVirtualBoxCallback_OnSessionStateChange(This,aMachineId,aState)	\
-    (This)->lpVtbl -> OnSessionStateChange(This,aMachineId,aState)
-
-#define IVirtualBoxCallback_OnSnapshotTaken(This,aMachineId,aSnapshotId)	\
-    (This)->lpVtbl -> OnSnapshotTaken(This,aMachineId,aSnapshotId)
-
-#define IVirtualBoxCallback_OnSnapshotDeleted(This,aMachineId,aSnapshotId)	\
-    (This)->lpVtbl -> OnSnapshotDeleted(This,aMachineId,aSnapshotId)
-
-#define IVirtualBoxCallback_OnSnapshotChange(This,aMachineId,aSnapshotId)	\
-    (This)->lpVtbl -> OnSnapshotChange(This,aMachineId,aSnapshotId)
-
-#define IVirtualBoxCallback_OnGuestPropertyChange(This,aMachineId,aName,aValue,aFlags)	\
-    (This)->lpVtbl -> OnGuestPropertyChange(This,aMachineId,aName,aValue,aFlags)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBoxCallback_OnMachineStateChange_Proxy( 
-    IVirtualBoxCallback * This,
-    /* [in] */ BSTR aMachineId,
-    /* [in] */ MachineState aState);
-
-
-void __RPC_STUB IVirtualBoxCallback_OnMachineStateChange_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBoxCallback_OnMachineDataChange_Proxy( 
-    IVirtualBoxCallback * This,
-    /* [in] */ BSTR aMachineId);
-
-
-void __RPC_STUB IVirtualBoxCallback_OnMachineDataChange_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBoxCallback_OnExtraDataCanChange_Proxy( 
-    IVirtualBoxCallback * This,
-    /* [in] */ BSTR aMachineId,
-    /* [in] */ BSTR aKey,
-    /* [in] */ BSTR aValue,
-    /* [out] */ BSTR *aError,
-    /* [retval][out] */ BOOL *aAllowChange);
-
-
-void __RPC_STUB IVirtualBoxCallback_OnExtraDataCanChange_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBoxCallback_OnExtraDataChange_Proxy( 
-    IVirtualBoxCallback * This,
-    /* [in] */ BSTR aMachineId,
-    /* [in] */ BSTR aKey,
-    /* [in] */ BSTR aValue);
-
-
-void __RPC_STUB IVirtualBoxCallback_OnExtraDataChange_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBoxCallback_OnMediumRegistered_Proxy( 
-    IVirtualBoxCallback * This,
-    /* [in] */ BSTR aMediumId,
-    /* [in] */ DeviceType aMediumType,
-    /* [in] */ BOOL aRegistered);
-
-
-void __RPC_STUB IVirtualBoxCallback_OnMediumRegistered_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBoxCallback_OnMachineRegistered_Proxy( 
-    IVirtualBoxCallback * This,
-    /* [in] */ BSTR aMachineId,
-    /* [in] */ BOOL aRegistered);
-
-
-void __RPC_STUB IVirtualBoxCallback_OnMachineRegistered_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBoxCallback_OnSessionStateChange_Proxy( 
-    IVirtualBoxCallback * This,
-    /* [in] */ BSTR aMachineId,
-    /* [in] */ SessionState aState);
-
-
-void __RPC_STUB IVirtualBoxCallback_OnSessionStateChange_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBoxCallback_OnSnapshotTaken_Proxy( 
-    IVirtualBoxCallback * This,
-    /* [in] */ BSTR aMachineId,
-    /* [in] */ BSTR aSnapshotId);
-
-
-void __RPC_STUB IVirtualBoxCallback_OnSnapshotTaken_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBoxCallback_OnSnapshotDeleted_Proxy( 
-    IVirtualBoxCallback * This,
-    /* [in] */ BSTR aMachineId,
-    /* [in] */ BSTR aSnapshotId);
-
-
-void __RPC_STUB IVirtualBoxCallback_OnSnapshotDeleted_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBoxCallback_OnSnapshotChange_Proxy( 
-    IVirtualBoxCallback * This,
-    /* [in] */ BSTR aMachineId,
-    /* [in] */ BSTR aSnapshotId);
-
-
-void __RPC_STUB IVirtualBoxCallback_OnSnapshotChange_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBoxCallback_OnGuestPropertyChange_Proxy( 
-    IVirtualBoxCallback * This,
-    /* [in] */ BSTR aMachineId,
-    /* [in] */ BSTR aName,
-    /* [in] */ BSTR aValue,
-    /* [in] */ BSTR aFlags);
-
-
-void __RPC_STUB IVirtualBoxCallback_OnGuestPropertyChange_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IVirtualBoxCallback_INTERFACE_DEFINED__ */
-
-
-#ifndef __IDHCPServer_INTERFACE_DEFINED__
-#define __IDHCPServer_INTERFACE_DEFINED__
-
-/* interface IDHCPServer */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IDHCPServer;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("6cfe387c-74fb-4ca7-bff6-973bec8af7a3")
-    IDHCPServer : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Enabled( 
-            /* [retval][out] */ BOOL *aEnabled) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_Enabled( 
-            /* [in] */ BOOL aEnabled) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_IPAddress( 
-            /* [retval][out] */ BSTR *aIPAddress) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_NetworkMask( 
-            /* [retval][out] */ BSTR *aNetworkMask) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_NetworkName( 
-            /* [retval][out] */ BSTR *aNetworkName) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_LowerIP( 
-            /* [retval][out] */ BSTR *aLowerIP) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_UpperIP( 
-            /* [retval][out] */ BSTR *aUpperIP) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetConfiguration( 
-            /* [in] */ BSTR aIPAddress,
-            /* [in] */ BSTR aNetworkMask,
-            /* [in] */ BSTR aFromIPAddress,
-            /* [in] */ BSTR aToIPAddress) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE Start( 
-            /* [in] */ BSTR aNetworkName,
-            /* [in] */ BSTR aTrunkName,
-            /* [in] */ BSTR aTrunkType) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE Stop( void) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IDHCPServerVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IDHCPServer * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IDHCPServer * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IDHCPServer * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IDHCPServer * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IDHCPServer * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IDHCPServer * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IDHCPServer * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Enabled )( 
-            IDHCPServer * This,
-            /* [retval][out] */ BOOL *aEnabled);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Enabled )( 
-            IDHCPServer * This,
-            /* [in] */ BOOL aEnabled);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_IPAddress )( 
-            IDHCPServer * This,
-            /* [retval][out] */ BSTR *aIPAddress);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_NetworkMask )( 
-            IDHCPServer * This,
-            /* [retval][out] */ BSTR *aNetworkMask);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_NetworkName )( 
-            IDHCPServer * This,
-            /* [retval][out] */ BSTR *aNetworkName);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_LowerIP )( 
-            IDHCPServer * This,
-            /* [retval][out] */ BSTR *aLowerIP);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_UpperIP )( 
-            IDHCPServer * This,
-            /* [retval][out] */ BSTR *aUpperIP);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetConfiguration )( 
-            IDHCPServer * This,
-            /* [in] */ BSTR aIPAddress,
-            /* [in] */ BSTR aNetworkMask,
-            /* [in] */ BSTR aFromIPAddress,
-            /* [in] */ BSTR aToIPAddress);
-        
-        HRESULT ( STDMETHODCALLTYPE *Start )( 
-            IDHCPServer * This,
-            /* [in] */ BSTR aNetworkName,
-            /* [in] */ BSTR aTrunkName,
-            /* [in] */ BSTR aTrunkType);
-        
-        HRESULT ( STDMETHODCALLTYPE *Stop )( 
-            IDHCPServer * This);
-        
-        END_INTERFACE
-    } IDHCPServerVtbl;
-
-    interface IDHCPServer
-    {
-        CONST_VTBL struct IDHCPServerVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IDHCPServer_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IDHCPServer_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IDHCPServer_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IDHCPServer_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IDHCPServer_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IDHCPServer_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IDHCPServer_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IDHCPServer_get_Enabled(This,aEnabled)	\
-    (This)->lpVtbl -> get_Enabled(This,aEnabled)
-
-#define IDHCPServer_put_Enabled(This,aEnabled)	\
-    (This)->lpVtbl -> put_Enabled(This,aEnabled)
-
-#define IDHCPServer_get_IPAddress(This,aIPAddress)	\
-    (This)->lpVtbl -> get_IPAddress(This,aIPAddress)
-
-#define IDHCPServer_get_NetworkMask(This,aNetworkMask)	\
-    (This)->lpVtbl -> get_NetworkMask(This,aNetworkMask)
-
-#define IDHCPServer_get_NetworkName(This,aNetworkName)	\
-    (This)->lpVtbl -> get_NetworkName(This,aNetworkName)
-
-#define IDHCPServer_get_LowerIP(This,aLowerIP)	\
-    (This)->lpVtbl -> get_LowerIP(This,aLowerIP)
-
-#define IDHCPServer_get_UpperIP(This,aUpperIP)	\
-    (This)->lpVtbl -> get_UpperIP(This,aUpperIP)
-
-#define IDHCPServer_SetConfiguration(This,aIPAddress,aNetworkMask,aFromIPAddress,aToIPAddress)	\
-    (This)->lpVtbl -> SetConfiguration(This,aIPAddress,aNetworkMask,aFromIPAddress,aToIPAddress)
-
-#define IDHCPServer_Start(This,aNetworkName,aTrunkName,aTrunkType)	\
-    (This)->lpVtbl -> Start(This,aNetworkName,aTrunkName,aTrunkType)
-
-#define IDHCPServer_Stop(This)	\
-    (This)->lpVtbl -> Stop(This)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IDHCPServer_get_Enabled_Proxy( 
-    IDHCPServer * This,
-    /* [retval][out] */ BOOL *aEnabled);
-
-
-void __RPC_STUB IDHCPServer_get_Enabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IDHCPServer_put_Enabled_Proxy( 
-    IDHCPServer * This,
-    /* [in] */ BOOL aEnabled);
-
-
-void __RPC_STUB IDHCPServer_put_Enabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IDHCPServer_get_IPAddress_Proxy( 
-    IDHCPServer * This,
-    /* [retval][out] */ BSTR *aIPAddress);
-
-
-void __RPC_STUB IDHCPServer_get_IPAddress_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IDHCPServer_get_NetworkMask_Proxy( 
-    IDHCPServer * This,
-    /* [retval][out] */ BSTR *aNetworkMask);
-
-
-void __RPC_STUB IDHCPServer_get_NetworkMask_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IDHCPServer_get_NetworkName_Proxy( 
-    IDHCPServer * This,
-    /* [retval][out] */ BSTR *aNetworkName);
-
-
-void __RPC_STUB IDHCPServer_get_NetworkName_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IDHCPServer_get_LowerIP_Proxy( 
-    IDHCPServer * This,
-    /* [retval][out] */ BSTR *aLowerIP);
-
-
-void __RPC_STUB IDHCPServer_get_LowerIP_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IDHCPServer_get_UpperIP_Proxy( 
-    IDHCPServer * This,
-    /* [retval][out] */ BSTR *aUpperIP);
-
-
-void __RPC_STUB IDHCPServer_get_UpperIP_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IDHCPServer_SetConfiguration_Proxy( 
-    IDHCPServer * This,
-    /* [in] */ BSTR aIPAddress,
-    /* [in] */ BSTR aNetworkMask,
-    /* [in] */ BSTR aFromIPAddress,
-    /* [in] */ BSTR aToIPAddress);
-
-
-void __RPC_STUB IDHCPServer_SetConfiguration_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IDHCPServer_Start_Proxy( 
-    IDHCPServer * This,
-    /* [in] */ BSTR aNetworkName,
-    /* [in] */ BSTR aTrunkName,
-    /* [in] */ BSTR aTrunkType);
-
-
-void __RPC_STUB IDHCPServer_Start_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IDHCPServer_Stop_Proxy( 
-    IDHCPServer * This);
-
-
-void __RPC_STUB IDHCPServer_Stop_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IDHCPServer_INTERFACE_DEFINED__ */
-
-
-#ifndef __IVirtualBox_INTERFACE_DEFINED__
-#define __IVirtualBox_INTERFACE_DEFINED__
-
-/* interface IVirtualBox */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IVirtualBox;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("3f36e024-7fed-4f20-a02c-9158a82b44e6")
-    IVirtualBox : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Version( 
-            /* [retval][out] */ BSTR *aVersion) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Revision( 
-            /* [retval][out] */ ULONG *aRevision) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_PackageType( 
-            /* [retval][out] */ BSTR *aPackageType) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_HomeFolder( 
-            /* [retval][out] */ BSTR *aHomeFolder) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_SettingsFilePath( 
-            /* [retval][out] */ BSTR *aSettingsFilePath) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Host( 
-            /* [retval][out] */ IHost **aHost) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_SystemProperties( 
-            /* [retval][out] */ ISystemProperties **aSystemProperties) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Machines( 
-            /* [retval][out] */ SAFEARRAY * *aMachines) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_HardDisks( 
-            /* [retval][out] */ SAFEARRAY * *aHardDisks) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_DVDImages( 
-            /* [retval][out] */ SAFEARRAY * *aDVDImages) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_FloppyImages( 
-            /* [retval][out] */ SAFEARRAY * *aFloppyImages) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_ProgressOperations( 
-            /* [retval][out] */ SAFEARRAY * *aProgressOperations) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_GuestOSTypes( 
-            /* [retval][out] */ SAFEARRAY * *aGuestOSTypes) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_SharedFolders( 
-            /* [retval][out] */ SAFEARRAY * *aSharedFolders) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_PerformanceCollector( 
-            /* [retval][out] */ IPerformanceCollector **aPerformanceCollector) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_DHCPServers( 
-            /* [retval][out] */ SAFEARRAY * *aDHCPServers) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateMachine( 
-            /* [in] */ BSTR aName,
-            /* [in] */ BSTR aOsTypeId,
-            /* [in] */ BSTR aBaseFolder,
-            /* [in] */ BSTR aId,
-            /* [in] */ BOOL aOverride,
-            /* [retval][out] */ IMachine **aMachine) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateLegacyMachine( 
-            /* [in] */ BSTR aName,
-            /* [in] */ BSTR aOsTypeId,
-            /* [in] */ BSTR aSettingsFile,
-            /* [in] */ BSTR aId,
-            /* [retval][out] */ IMachine **aMachine) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OpenMachine( 
-            /* [in] */ BSTR aSettingsFile,
-            /* [retval][out] */ IMachine **aMachine) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE RegisterMachine( 
-            /* [in] */ IMachine *aMachine) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetMachine( 
-            /* [in] */ BSTR aId,
-            /* [retval][out] */ IMachine **aMachine) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE FindMachine( 
-            /* [in] */ BSTR aName,
-            /* [retval][out] */ IMachine **aMachine) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE UnregisterMachine( 
-            /* [in] */ BSTR aId,
-            /* [retval][out] */ IMachine **aMachine) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateAppliance( 
-            /* [retval][out] */ IAppliance **aAppliance) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateHardDisk( 
-            /* [in] */ BSTR aFormat,
-            /* [in] */ BSTR aLocation,
-            /* [retval][out] */ IMedium **aMedium) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OpenHardDisk( 
-            /* [in] */ BSTR aLocation,
-            /* [in] */ AccessMode aAccessMode,
-            /* [in] */ BOOL aSetImageId,
-            /* [in] */ BSTR aImageId,
-            /* [in] */ BOOL aSetParentId,
-            /* [in] */ BSTR aParentId,
-            /* [retval][out] */ IMedium **aMedium) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetHardDisk( 
-            /* [in] */ BSTR aId,
-            /* [retval][out] */ IMedium **aMedium) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE FindHardDisk( 
-            /* [in] */ BSTR aLocation,
-            /* [retval][out] */ IMedium **aMedium) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OpenDVDImage( 
-            /* [in] */ BSTR aLocation,
-            /* [in] */ BSTR aId,
-            /* [retval][out] */ IMedium **aImage) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetDVDImage( 
-            /* [in] */ BSTR aId,
-            /* [retval][out] */ IMedium **aImage) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE FindDVDImage( 
-            /* [in] */ BSTR aLocation,
-            /* [retval][out] */ IMedium **aImage) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OpenFloppyImage( 
-            /* [in] */ BSTR aLocation,
-            /* [in] */ BSTR aId,
-            /* [retval][out] */ IMedium **aImage) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetFloppyImage( 
-            /* [in] */ BSTR aId,
-            /* [retval][out] */ IMedium **aImage) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE FindFloppyImage( 
-            /* [in] */ BSTR aLocation,
-            /* [retval][out] */ IMedium **aImage) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetGuestOSType( 
-            /* [in] */ BSTR aId,
-            /* [retval][out] */ IGuestOSType **aType) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateSharedFolder( 
-            /* [in] */ BSTR aName,
-            /* [in] */ BSTR aHostPath,
-            /* [in] */ BOOL aWritable) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE RemoveSharedFolder( 
-            /* [in] */ BSTR aName) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetExtraDataKeys( 
-            /* [retval][out] */ SAFEARRAY * *aValue) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetExtraData( 
-            /* [in] */ BSTR aKey,
-            /* [retval][out] */ BSTR *aValue) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetExtraData( 
-            /* [in] */ BSTR aKey,
-            /* [in] */ BSTR aValue) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OpenSession( 
-            /* [in] */ ISession *aSession,
-            /* [in] */ BSTR aMachineId) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OpenRemoteSession( 
-            /* [in] */ ISession *aSession,
-            /* [in] */ BSTR aMachineId,
-            /* [in] */ BSTR aType,
-            /* [in] */ BSTR aEnvironment,
-            /* [retval][out] */ IProgress **aProgress) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OpenExistingSession( 
-            /* [in] */ ISession *aSession,
-            /* [in] */ BSTR aMachineId) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE RegisterCallback( 
-            /* [in] */ IVirtualBoxCallback *aCallback) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE UnregisterCallback( 
-            /* [in] */ IVirtualBoxCallback *aCallback) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE WaitForPropertyChange( 
-            /* [in] */ BSTR aWhat,
-            /* [in] */ ULONG aTimeout,
-            /* [out] */ BSTR *aChanged,
-            /* [out] */ BSTR *aValues) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateDHCPServer( 
-            /* [in] */ BSTR aName,
-            /* [retval][out] */ IDHCPServer **aServer) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE FindDHCPServerByNetworkName( 
-            /* [in] */ BSTR aName,
-            /* [retval][out] */ IDHCPServer **aServer) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE RemoveDHCPServer( 
-            /* [in] */ IDHCPServer *aServer) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CheckFirmwarePresent( 
-            /* [in] */ FirmwareType aFirmwareType,
-            /* [in] */ BSTR aVersion,
-            /* [out] */ BSTR *aUrl,
-            /* [out] */ BSTR *aFile,
-            /* [retval][out] */ BOOL *aResult) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IVirtualBoxVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IVirtualBox * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IVirtualBox * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IVirtualBox * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IVirtualBox * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IVirtualBox * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IVirtualBox * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IVirtualBox * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Version )( 
-            IVirtualBox * This,
-            /* [retval][out] */ BSTR *aVersion);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Revision )( 
-            IVirtualBox * This,
-            /* [retval][out] */ ULONG *aRevision);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_PackageType )( 
-            IVirtualBox * This,
-            /* [retval][out] */ BSTR *aPackageType);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_HomeFolder )( 
-            IVirtualBox * This,
-            /* [retval][out] */ BSTR *aHomeFolder);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_SettingsFilePath )( 
-            IVirtualBox * This,
-            /* [retval][out] */ BSTR *aSettingsFilePath);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Host )( 
-            IVirtualBox * This,
-            /* [retval][out] */ IHost **aHost);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_SystemProperties )( 
-            IVirtualBox * This,
-            /* [retval][out] */ ISystemProperties **aSystemProperties);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Machines )( 
-            IVirtualBox * This,
-            /* [retval][out] */ SAFEARRAY * *aMachines);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_HardDisks )( 
-            IVirtualBox * This,
-            /* [retval][out] */ SAFEARRAY * *aHardDisks);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_DVDImages )( 
-            IVirtualBox * This,
-            /* [retval][out] */ SAFEARRAY * *aDVDImages);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_FloppyImages )( 
-            IVirtualBox * This,
-            /* [retval][out] */ SAFEARRAY * *aFloppyImages);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_ProgressOperations )( 
-            IVirtualBox * This,
-            /* [retval][out] */ SAFEARRAY * *aProgressOperations);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_GuestOSTypes )( 
-            IVirtualBox * This,
-            /* [retval][out] */ SAFEARRAY * *aGuestOSTypes);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_SharedFolders )( 
-            IVirtualBox * This,
-            /* [retval][out] */ SAFEARRAY * *aSharedFolders);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_PerformanceCollector )( 
-            IVirtualBox * This,
-            /* [retval][out] */ IPerformanceCollector **aPerformanceCollector);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_DHCPServers )( 
-            IVirtualBox * This,
-            /* [retval][out] */ SAFEARRAY * *aDHCPServers);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateMachine )( 
-            IVirtualBox * This,
-            /* [in] */ BSTR aName,
-            /* [in] */ BSTR aOsTypeId,
-            /* [in] */ BSTR aBaseFolder,
-            /* [in] */ BSTR aId,
-            /* [in] */ BOOL aOverride,
-            /* [retval][out] */ IMachine **aMachine);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateLegacyMachine )( 
-            IVirtualBox * This,
-            /* [in] */ BSTR aName,
-            /* [in] */ BSTR aOsTypeId,
-            /* [in] */ BSTR aSettingsFile,
-            /* [in] */ BSTR aId,
-            /* [retval][out] */ IMachine **aMachine);
-        
-        HRESULT ( STDMETHODCALLTYPE *OpenMachine )( 
-            IVirtualBox * This,
-            /* [in] */ BSTR aSettingsFile,
-            /* [retval][out] */ IMachine **aMachine);
-        
-        HRESULT ( STDMETHODCALLTYPE *RegisterMachine )( 
-            IVirtualBox * This,
-            /* [in] */ IMachine *aMachine);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetMachine )( 
-            IVirtualBox * This,
-            /* [in] */ BSTR aId,
-            /* [retval][out] */ IMachine **aMachine);
-        
-        HRESULT ( STDMETHODCALLTYPE *FindMachine )( 
-            IVirtualBox * This,
-            /* [in] */ BSTR aName,
-            /* [retval][out] */ IMachine **aMachine);
-        
-        HRESULT ( STDMETHODCALLTYPE *UnregisterMachine )( 
-            IVirtualBox * This,
-            /* [in] */ BSTR aId,
-            /* [retval][out] */ IMachine **aMachine);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateAppliance )( 
-            IVirtualBox * This,
-            /* [retval][out] */ IAppliance **aAppliance);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateHardDisk )( 
-            IVirtualBox * This,
-            /* [in] */ BSTR aFormat,
-            /* [in] */ BSTR aLocation,
-            /* [retval][out] */ IMedium **aMedium);
-        
-        HRESULT ( STDMETHODCALLTYPE *OpenHardDisk )( 
-            IVirtualBox * This,
-            /* [in] */ BSTR aLocation,
-            /* [in] */ AccessMode aAccessMode,
-            /* [in] */ BOOL aSetImageId,
-            /* [in] */ BSTR aImageId,
-            /* [in] */ BOOL aSetParentId,
-            /* [in] */ BSTR aParentId,
-            /* [retval][out] */ IMedium **aMedium);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetHardDisk )( 
-            IVirtualBox * This,
-            /* [in] */ BSTR aId,
-            /* [retval][out] */ IMedium **aMedium);
-        
-        HRESULT ( STDMETHODCALLTYPE *FindHardDisk )( 
-            IVirtualBox * This,
-            /* [in] */ BSTR aLocation,
-            /* [retval][out] */ IMedium **aMedium);
-        
-        HRESULT ( STDMETHODCALLTYPE *OpenDVDImage )( 
-            IVirtualBox * This,
-            /* [in] */ BSTR aLocation,
-            /* [in] */ BSTR aId,
-            /* [retval][out] */ IMedium **aImage);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetDVDImage )( 
-            IVirtualBox * This,
-            /* [in] */ BSTR aId,
-            /* [retval][out] */ IMedium **aImage);
-        
-        HRESULT ( STDMETHODCALLTYPE *FindDVDImage )( 
-            IVirtualBox * This,
-            /* [in] */ BSTR aLocation,
-            /* [retval][out] */ IMedium **aImage);
-        
-        HRESULT ( STDMETHODCALLTYPE *OpenFloppyImage )( 
-            IVirtualBox * This,
-            /* [in] */ BSTR aLocation,
-            /* [in] */ BSTR aId,
-            /* [retval][out] */ IMedium **aImage);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetFloppyImage )( 
-            IVirtualBox * This,
-            /* [in] */ BSTR aId,
-            /* [retval][out] */ IMedium **aImage);
-        
-        HRESULT ( STDMETHODCALLTYPE *FindFloppyImage )( 
-            IVirtualBox * This,
-            /* [in] */ BSTR aLocation,
-            /* [retval][out] */ IMedium **aImage);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetGuestOSType )( 
-            IVirtualBox * This,
-            /* [in] */ BSTR aId,
-            /* [retval][out] */ IGuestOSType **aType);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateSharedFolder )( 
-            IVirtualBox * This,
-            /* [in] */ BSTR aName,
-            /* [in] */ BSTR aHostPath,
-            /* [in] */ BOOL aWritable);
-        
-        HRESULT ( STDMETHODCALLTYPE *RemoveSharedFolder )( 
-            IVirtualBox * This,
-            /* [in] */ BSTR aName);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetExtraDataKeys )( 
-            IVirtualBox * This,
-            /* [retval][out] */ SAFEARRAY * *aValue);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetExtraData )( 
-            IVirtualBox * This,
-            /* [in] */ BSTR aKey,
-            /* [retval][out] */ BSTR *aValue);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetExtraData )( 
-            IVirtualBox * This,
-            /* [in] */ BSTR aKey,
-            /* [in] */ BSTR aValue);
-        
-        HRESULT ( STDMETHODCALLTYPE *OpenSession )( 
-            IVirtualBox * This,
-            /* [in] */ ISession *aSession,
-            /* [in] */ BSTR aMachineId);
-        
-        HRESULT ( STDMETHODCALLTYPE *OpenRemoteSession )( 
-            IVirtualBox * This,
-            /* [in] */ ISession *aSession,
-            /* [in] */ BSTR aMachineId,
-            /* [in] */ BSTR aType,
-            /* [in] */ BSTR aEnvironment,
-            /* [retval][out] */ IProgress **aProgress);
-        
-        HRESULT ( STDMETHODCALLTYPE *OpenExistingSession )( 
-            IVirtualBox * This,
-            /* [in] */ ISession *aSession,
-            /* [in] */ BSTR aMachineId);
-        
-        HRESULT ( STDMETHODCALLTYPE *RegisterCallback )( 
-            IVirtualBox * This,
-            /* [in] */ IVirtualBoxCallback *aCallback);
-        
-        HRESULT ( STDMETHODCALLTYPE *UnregisterCallback )( 
-            IVirtualBox * This,
-            /* [in] */ IVirtualBoxCallback *aCallback);
-        
-        HRESULT ( STDMETHODCALLTYPE *WaitForPropertyChange )( 
-            IVirtualBox * This,
-            /* [in] */ BSTR aWhat,
-            /* [in] */ ULONG aTimeout,
-            /* [out] */ BSTR *aChanged,
-            /* [out] */ BSTR *aValues);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateDHCPServer )( 
-            IVirtualBox * This,
-            /* [in] */ BSTR aName,
-            /* [retval][out] */ IDHCPServer **aServer);
-        
-        HRESULT ( STDMETHODCALLTYPE *FindDHCPServerByNetworkName )( 
-            IVirtualBox * This,
-            /* [in] */ BSTR aName,
-            /* [retval][out] */ IDHCPServer **aServer);
-        
-        HRESULT ( STDMETHODCALLTYPE *RemoveDHCPServer )( 
-            IVirtualBox * This,
-            /* [in] */ IDHCPServer *aServer);
-        
-        HRESULT ( STDMETHODCALLTYPE *CheckFirmwarePresent )( 
-            IVirtualBox * This,
-            /* [in] */ FirmwareType aFirmwareType,
-            /* [in] */ BSTR aVersion,
-            /* [out] */ BSTR *aUrl,
-            /* [out] */ BSTR *aFile,
-            /* [retval][out] */ BOOL *aResult);
-        
-        END_INTERFACE
-    } IVirtualBoxVtbl;
-
-    interface IVirtualBox
-    {
-        CONST_VTBL struct IVirtualBoxVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IVirtualBox_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IVirtualBox_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IVirtualBox_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IVirtualBox_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IVirtualBox_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IVirtualBox_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IVirtualBox_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IVirtualBox_get_Version(This,aVersion)	\
-    (This)->lpVtbl -> get_Version(This,aVersion)
-
-#define IVirtualBox_get_Revision(This,aRevision)	\
-    (This)->lpVtbl -> get_Revision(This,aRevision)
-
-#define IVirtualBox_get_PackageType(This,aPackageType)	\
-    (This)->lpVtbl -> get_PackageType(This,aPackageType)
-
-#define IVirtualBox_get_HomeFolder(This,aHomeFolder)	\
-    (This)->lpVtbl -> get_HomeFolder(This,aHomeFolder)
-
-#define IVirtualBox_get_SettingsFilePath(This,aSettingsFilePath)	\
-    (This)->lpVtbl -> get_SettingsFilePath(This,aSettingsFilePath)
-
-#define IVirtualBox_get_Host(This,aHost)	\
-    (This)->lpVtbl -> get_Host(This,aHost)
-
-#define IVirtualBox_get_SystemProperties(This,aSystemProperties)	\
-    (This)->lpVtbl -> get_SystemProperties(This,aSystemProperties)
-
-#define IVirtualBox_get_Machines(This,aMachines)	\
-    (This)->lpVtbl -> get_Machines(This,aMachines)
-
-#define IVirtualBox_get_HardDisks(This,aHardDisks)	\
-    (This)->lpVtbl -> get_HardDisks(This,aHardDisks)
-
-#define IVirtualBox_get_DVDImages(This,aDVDImages)	\
-    (This)->lpVtbl -> get_DVDImages(This,aDVDImages)
-
-#define IVirtualBox_get_FloppyImages(This,aFloppyImages)	\
-    (This)->lpVtbl -> get_FloppyImages(This,aFloppyImages)
-
-#define IVirtualBox_get_ProgressOperations(This,aProgressOperations)	\
-    (This)->lpVtbl -> get_ProgressOperations(This,aProgressOperations)
-
-#define IVirtualBox_get_GuestOSTypes(This,aGuestOSTypes)	\
-    (This)->lpVtbl -> get_GuestOSTypes(This,aGuestOSTypes)
-
-#define IVirtualBox_get_SharedFolders(This,aSharedFolders)	\
-    (This)->lpVtbl -> get_SharedFolders(This,aSharedFolders)
-
-#define IVirtualBox_get_PerformanceCollector(This,aPerformanceCollector)	\
-    (This)->lpVtbl -> get_PerformanceCollector(This,aPerformanceCollector)
-
-#define IVirtualBox_get_DHCPServers(This,aDHCPServers)	\
-    (This)->lpVtbl -> get_DHCPServers(This,aDHCPServers)
-
-#define IVirtualBox_CreateMachine(This,aName,aOsTypeId,aBaseFolder,aId,aOverride,aMachine)	\
-    (This)->lpVtbl -> CreateMachine(This,aName,aOsTypeId,aBaseFolder,aId,aOverride,aMachine)
-
-#define IVirtualBox_CreateLegacyMachine(This,aName,aOsTypeId,aSettingsFile,aId,aMachine)	\
-    (This)->lpVtbl -> CreateLegacyMachine(This,aName,aOsTypeId,aSettingsFile,aId,aMachine)
-
-#define IVirtualBox_OpenMachine(This,aSettingsFile,aMachine)	\
-    (This)->lpVtbl -> OpenMachine(This,aSettingsFile,aMachine)
-
-#define IVirtualBox_RegisterMachine(This,aMachine)	\
-    (This)->lpVtbl -> RegisterMachine(This,aMachine)
-
-#define IVirtualBox_GetMachine(This,aId,aMachine)	\
-    (This)->lpVtbl -> GetMachine(This,aId,aMachine)
-
-#define IVirtualBox_FindMachine(This,aName,aMachine)	\
-    (This)->lpVtbl -> FindMachine(This,aName,aMachine)
-
-#define IVirtualBox_UnregisterMachine(This,aId,aMachine)	\
-    (This)->lpVtbl -> UnregisterMachine(This,aId,aMachine)
-
-#define IVirtualBox_CreateAppliance(This,aAppliance)	\
-    (This)->lpVtbl -> CreateAppliance(This,aAppliance)
-
-#define IVirtualBox_CreateHardDisk(This,aFormat,aLocation,aMedium)	\
-    (This)->lpVtbl -> CreateHardDisk(This,aFormat,aLocation,aMedium)
-
-#define IVirtualBox_OpenHardDisk(This,aLocation,aAccessMode,aSetImageId,aImageId,aSetParentId,aParentId,aMedium)	\
-    (This)->lpVtbl -> OpenHardDisk(This,aLocation,aAccessMode,aSetImageId,aImageId,aSetParentId,aParentId,aMedium)
-
-#define IVirtualBox_GetHardDisk(This,aId,aMedium)	\
-    (This)->lpVtbl -> GetHardDisk(This,aId,aMedium)
-
-#define IVirtualBox_FindHardDisk(This,aLocation,aMedium)	\
-    (This)->lpVtbl -> FindHardDisk(This,aLocation,aMedium)
-
-#define IVirtualBox_OpenDVDImage(This,aLocation,aId,aImage)	\
-    (This)->lpVtbl -> OpenDVDImage(This,aLocation,aId,aImage)
-
-#define IVirtualBox_GetDVDImage(This,aId,aImage)	\
-    (This)->lpVtbl -> GetDVDImage(This,aId,aImage)
-
-#define IVirtualBox_FindDVDImage(This,aLocation,aImage)	\
-    (This)->lpVtbl -> FindDVDImage(This,aLocation,aImage)
-
-#define IVirtualBox_OpenFloppyImage(This,aLocation,aId,aImage)	\
-    (This)->lpVtbl -> OpenFloppyImage(This,aLocation,aId,aImage)
-
-#define IVirtualBox_GetFloppyImage(This,aId,aImage)	\
-    (This)->lpVtbl -> GetFloppyImage(This,aId,aImage)
-
-#define IVirtualBox_FindFloppyImage(This,aLocation,aImage)	\
-    (This)->lpVtbl -> FindFloppyImage(This,aLocation,aImage)
-
-#define IVirtualBox_GetGuestOSType(This,aId,aType)	\
-    (This)->lpVtbl -> GetGuestOSType(This,aId,aType)
-
-#define IVirtualBox_CreateSharedFolder(This,aName,aHostPath,aWritable)	\
-    (This)->lpVtbl -> CreateSharedFolder(This,aName,aHostPath,aWritable)
-
-#define IVirtualBox_RemoveSharedFolder(This,aName)	\
-    (This)->lpVtbl -> RemoveSharedFolder(This,aName)
-
-#define IVirtualBox_GetExtraDataKeys(This,aValue)	\
-    (This)->lpVtbl -> GetExtraDataKeys(This,aValue)
-
-#define IVirtualBox_GetExtraData(This,aKey,aValue)	\
-    (This)->lpVtbl -> GetExtraData(This,aKey,aValue)
-
-#define IVirtualBox_SetExtraData(This,aKey,aValue)	\
-    (This)->lpVtbl -> SetExtraData(This,aKey,aValue)
-
-#define IVirtualBox_OpenSession(This,aSession,aMachineId)	\
-    (This)->lpVtbl -> OpenSession(This,aSession,aMachineId)
-
-#define IVirtualBox_OpenRemoteSession(This,aSession,aMachineId,aType,aEnvironment,aProgress)	\
-    (This)->lpVtbl -> OpenRemoteSession(This,aSession,aMachineId,aType,aEnvironment,aProgress)
-
-#define IVirtualBox_OpenExistingSession(This,aSession,aMachineId)	\
-    (This)->lpVtbl -> OpenExistingSession(This,aSession,aMachineId)
-
-#define IVirtualBox_RegisterCallback(This,aCallback)	\
-    (This)->lpVtbl -> RegisterCallback(This,aCallback)
-
-#define IVirtualBox_UnregisterCallback(This,aCallback)	\
-    (This)->lpVtbl -> UnregisterCallback(This,aCallback)
-
-#define IVirtualBox_WaitForPropertyChange(This,aWhat,aTimeout,aChanged,aValues)	\
-    (This)->lpVtbl -> WaitForPropertyChange(This,aWhat,aTimeout,aChanged,aValues)
-
-#define IVirtualBox_CreateDHCPServer(This,aName,aServer)	\
-    (This)->lpVtbl -> CreateDHCPServer(This,aName,aServer)
-
-#define IVirtualBox_FindDHCPServerByNetworkName(This,aName,aServer)	\
-    (This)->lpVtbl -> FindDHCPServerByNetworkName(This,aName,aServer)
-
-#define IVirtualBox_RemoveDHCPServer(This,aServer)	\
-    (This)->lpVtbl -> RemoveDHCPServer(This,aServer)
-
-#define IVirtualBox_CheckFirmwarePresent(This,aFirmwareType,aVersion,aUrl,aFile,aResult)	\
-    (This)->lpVtbl -> CheckFirmwarePresent(This,aFirmwareType,aVersion,aUrl,aFile,aResult)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IVirtualBox_get_Version_Proxy( 
-    IVirtualBox * This,
-    /* [retval][out] */ BSTR *aVersion);
-
-
-void __RPC_STUB IVirtualBox_get_Version_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IVirtualBox_get_Revision_Proxy( 
-    IVirtualBox * This,
-    /* [retval][out] */ ULONG *aRevision);
-
-
-void __RPC_STUB IVirtualBox_get_Revision_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IVirtualBox_get_PackageType_Proxy( 
-    IVirtualBox * This,
-    /* [retval][out] */ BSTR *aPackageType);
-
-
-void __RPC_STUB IVirtualBox_get_PackageType_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IVirtualBox_get_HomeFolder_Proxy( 
-    IVirtualBox * This,
-    /* [retval][out] */ BSTR *aHomeFolder);
-
-
-void __RPC_STUB IVirtualBox_get_HomeFolder_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IVirtualBox_get_SettingsFilePath_Proxy( 
-    IVirtualBox * This,
-    /* [retval][out] */ BSTR *aSettingsFilePath);
-
-
-void __RPC_STUB IVirtualBox_get_SettingsFilePath_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IVirtualBox_get_Host_Proxy( 
-    IVirtualBox * This,
-    /* [retval][out] */ IHost **aHost);
-
-
-void __RPC_STUB IVirtualBox_get_Host_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IVirtualBox_get_SystemProperties_Proxy( 
-    IVirtualBox * This,
-    /* [retval][out] */ ISystemProperties **aSystemProperties);
-
-
-void __RPC_STUB IVirtualBox_get_SystemProperties_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IVirtualBox_get_Machines_Proxy( 
-    IVirtualBox * This,
-    /* [retval][out] */ SAFEARRAY * *aMachines);
-
-
-void __RPC_STUB IVirtualBox_get_Machines_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IVirtualBox_get_HardDisks_Proxy( 
-    IVirtualBox * This,
-    /* [retval][out] */ SAFEARRAY * *aHardDisks);
-
-
-void __RPC_STUB IVirtualBox_get_HardDisks_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IVirtualBox_get_DVDImages_Proxy( 
-    IVirtualBox * This,
-    /* [retval][out] */ SAFEARRAY * *aDVDImages);
-
-
-void __RPC_STUB IVirtualBox_get_DVDImages_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IVirtualBox_get_FloppyImages_Proxy( 
-    IVirtualBox * This,
-    /* [retval][out] */ SAFEARRAY * *aFloppyImages);
-
-
-void __RPC_STUB IVirtualBox_get_FloppyImages_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IVirtualBox_get_ProgressOperations_Proxy( 
-    IVirtualBox * This,
-    /* [retval][out] */ SAFEARRAY * *aProgressOperations);
-
-
-void __RPC_STUB IVirtualBox_get_ProgressOperations_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IVirtualBox_get_GuestOSTypes_Proxy( 
-    IVirtualBox * This,
-    /* [retval][out] */ SAFEARRAY * *aGuestOSTypes);
-
-
-void __RPC_STUB IVirtualBox_get_GuestOSTypes_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IVirtualBox_get_SharedFolders_Proxy( 
-    IVirtualBox * This,
-    /* [retval][out] */ SAFEARRAY * *aSharedFolders);
-
-
-void __RPC_STUB IVirtualBox_get_SharedFolders_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IVirtualBox_get_PerformanceCollector_Proxy( 
-    IVirtualBox * This,
-    /* [retval][out] */ IPerformanceCollector **aPerformanceCollector);
-
-
-void __RPC_STUB IVirtualBox_get_PerformanceCollector_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IVirtualBox_get_DHCPServers_Proxy( 
-    IVirtualBox * This,
-    /* [retval][out] */ SAFEARRAY * *aDHCPServers);
-
-
-void __RPC_STUB IVirtualBox_get_DHCPServers_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBox_CreateMachine_Proxy( 
-    IVirtualBox * This,
-    /* [in] */ BSTR aName,
-    /* [in] */ BSTR aOsTypeId,
-    /* [in] */ BSTR aBaseFolder,
-    /* [in] */ BSTR aId,
-    /* [in] */ BOOL aOverride,
-    /* [retval][out] */ IMachine **aMachine);
-
-
-void __RPC_STUB IVirtualBox_CreateMachine_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBox_CreateLegacyMachine_Proxy( 
-    IVirtualBox * This,
-    /* [in] */ BSTR aName,
-    /* [in] */ BSTR aOsTypeId,
-    /* [in] */ BSTR aSettingsFile,
-    /* [in] */ BSTR aId,
-    /* [retval][out] */ IMachine **aMachine);
-
-
-void __RPC_STUB IVirtualBox_CreateLegacyMachine_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBox_OpenMachine_Proxy( 
-    IVirtualBox * This,
-    /* [in] */ BSTR aSettingsFile,
-    /* [retval][out] */ IMachine **aMachine);
-
-
-void __RPC_STUB IVirtualBox_OpenMachine_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBox_RegisterMachine_Proxy( 
-    IVirtualBox * This,
-    /* [in] */ IMachine *aMachine);
-
-
-void __RPC_STUB IVirtualBox_RegisterMachine_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBox_GetMachine_Proxy( 
-    IVirtualBox * This,
-    /* [in] */ BSTR aId,
-    /* [retval][out] */ IMachine **aMachine);
-
-
-void __RPC_STUB IVirtualBox_GetMachine_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBox_FindMachine_Proxy( 
-    IVirtualBox * This,
-    /* [in] */ BSTR aName,
-    /* [retval][out] */ IMachine **aMachine);
-
-
-void __RPC_STUB IVirtualBox_FindMachine_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBox_UnregisterMachine_Proxy( 
-    IVirtualBox * This,
-    /* [in] */ BSTR aId,
-    /* [retval][out] */ IMachine **aMachine);
-
-
-void __RPC_STUB IVirtualBox_UnregisterMachine_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBox_CreateAppliance_Proxy( 
-    IVirtualBox * This,
-    /* [retval][out] */ IAppliance **aAppliance);
-
-
-void __RPC_STUB IVirtualBox_CreateAppliance_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBox_CreateHardDisk_Proxy( 
-    IVirtualBox * This,
-    /* [in] */ BSTR aFormat,
-    /* [in] */ BSTR aLocation,
-    /* [retval][out] */ IMedium **aMedium);
-
-
-void __RPC_STUB IVirtualBox_CreateHardDisk_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBox_OpenHardDisk_Proxy( 
-    IVirtualBox * This,
-    /* [in] */ BSTR aLocation,
-    /* [in] */ AccessMode aAccessMode,
-    /* [in] */ BOOL aSetImageId,
-    /* [in] */ BSTR aImageId,
-    /* [in] */ BOOL aSetParentId,
-    /* [in] */ BSTR aParentId,
-    /* [retval][out] */ IMedium **aMedium);
-
-
-void __RPC_STUB IVirtualBox_OpenHardDisk_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBox_GetHardDisk_Proxy( 
-    IVirtualBox * This,
-    /* [in] */ BSTR aId,
-    /* [retval][out] */ IMedium **aMedium);
-
-
-void __RPC_STUB IVirtualBox_GetHardDisk_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBox_FindHardDisk_Proxy( 
-    IVirtualBox * This,
-    /* [in] */ BSTR aLocation,
-    /* [retval][out] */ IMedium **aMedium);
-
-
-void __RPC_STUB IVirtualBox_FindHardDisk_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBox_OpenDVDImage_Proxy( 
-    IVirtualBox * This,
-    /* [in] */ BSTR aLocation,
-    /* [in] */ BSTR aId,
-    /* [retval][out] */ IMedium **aImage);
-
-
-void __RPC_STUB IVirtualBox_OpenDVDImage_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBox_GetDVDImage_Proxy( 
-    IVirtualBox * This,
-    /* [in] */ BSTR aId,
-    /* [retval][out] */ IMedium **aImage);
-
-
-void __RPC_STUB IVirtualBox_GetDVDImage_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBox_FindDVDImage_Proxy( 
-    IVirtualBox * This,
-    /* [in] */ BSTR aLocation,
-    /* [retval][out] */ IMedium **aImage);
-
-
-void __RPC_STUB IVirtualBox_FindDVDImage_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBox_OpenFloppyImage_Proxy( 
-    IVirtualBox * This,
-    /* [in] */ BSTR aLocation,
-    /* [in] */ BSTR aId,
-    /* [retval][out] */ IMedium **aImage);
-
-
-void __RPC_STUB IVirtualBox_OpenFloppyImage_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBox_GetFloppyImage_Proxy( 
-    IVirtualBox * This,
-    /* [in] */ BSTR aId,
-    /* [retval][out] */ IMedium **aImage);
-
-
-void __RPC_STUB IVirtualBox_GetFloppyImage_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBox_FindFloppyImage_Proxy( 
-    IVirtualBox * This,
-    /* [in] */ BSTR aLocation,
-    /* [retval][out] */ IMedium **aImage);
-
-
-void __RPC_STUB IVirtualBox_FindFloppyImage_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBox_GetGuestOSType_Proxy( 
-    IVirtualBox * This,
-    /* [in] */ BSTR aId,
-    /* [retval][out] */ IGuestOSType **aType);
-
-
-void __RPC_STUB IVirtualBox_GetGuestOSType_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBox_CreateSharedFolder_Proxy( 
-    IVirtualBox * This,
-    /* [in] */ BSTR aName,
-    /* [in] */ BSTR aHostPath,
-    /* [in] */ BOOL aWritable);
-
-
-void __RPC_STUB IVirtualBox_CreateSharedFolder_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBox_RemoveSharedFolder_Proxy( 
-    IVirtualBox * This,
-    /* [in] */ BSTR aName);
-
-
-void __RPC_STUB IVirtualBox_RemoveSharedFolder_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBox_GetExtraDataKeys_Proxy( 
-    IVirtualBox * This,
-    /* [retval][out] */ SAFEARRAY * *aValue);
-
-
-void __RPC_STUB IVirtualBox_GetExtraDataKeys_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBox_GetExtraData_Proxy( 
-    IVirtualBox * This,
-    /* [in] */ BSTR aKey,
-    /* [retval][out] */ BSTR *aValue);
-
-
-void __RPC_STUB IVirtualBox_GetExtraData_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBox_SetExtraData_Proxy( 
-    IVirtualBox * This,
-    /* [in] */ BSTR aKey,
-    /* [in] */ BSTR aValue);
-
-
-void __RPC_STUB IVirtualBox_SetExtraData_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBox_OpenSession_Proxy( 
-    IVirtualBox * This,
-    /* [in] */ ISession *aSession,
-    /* [in] */ BSTR aMachineId);
-
-
-void __RPC_STUB IVirtualBox_OpenSession_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBox_OpenRemoteSession_Proxy( 
-    IVirtualBox * This,
-    /* [in] */ ISession *aSession,
-    /* [in] */ BSTR aMachineId,
-    /* [in] */ BSTR aType,
-    /* [in] */ BSTR aEnvironment,
-    /* [retval][out] */ IProgress **aProgress);
-
-
-void __RPC_STUB IVirtualBox_OpenRemoteSession_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBox_OpenExistingSession_Proxy( 
-    IVirtualBox * This,
-    /* [in] */ ISession *aSession,
-    /* [in] */ BSTR aMachineId);
-
-
-void __RPC_STUB IVirtualBox_OpenExistingSession_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBox_RegisterCallback_Proxy( 
-    IVirtualBox * This,
-    /* [in] */ IVirtualBoxCallback *aCallback);
-
-
-void __RPC_STUB IVirtualBox_RegisterCallback_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBox_UnregisterCallback_Proxy( 
-    IVirtualBox * This,
-    /* [in] */ IVirtualBoxCallback *aCallback);
-
-
-void __RPC_STUB IVirtualBox_UnregisterCallback_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBox_WaitForPropertyChange_Proxy( 
-    IVirtualBox * This,
-    /* [in] */ BSTR aWhat,
-    /* [in] */ ULONG aTimeout,
-    /* [out] */ BSTR *aChanged,
-    /* [out] */ BSTR *aValues);
-
-
-void __RPC_STUB IVirtualBox_WaitForPropertyChange_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBox_CreateDHCPServer_Proxy( 
-    IVirtualBox * This,
-    /* [in] */ BSTR aName,
-    /* [retval][out] */ IDHCPServer **aServer);
-
-
-void __RPC_STUB IVirtualBox_CreateDHCPServer_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBox_FindDHCPServerByNetworkName_Proxy( 
-    IVirtualBox * This,
-    /* [in] */ BSTR aName,
-    /* [retval][out] */ IDHCPServer **aServer);
-
-
-void __RPC_STUB IVirtualBox_FindDHCPServerByNetworkName_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBox_RemoveDHCPServer_Proxy( 
-    IVirtualBox * This,
-    /* [in] */ IDHCPServer *aServer);
-
-
-void __RPC_STUB IVirtualBox_RemoveDHCPServer_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualBox_CheckFirmwarePresent_Proxy( 
-    IVirtualBox * This,
-    /* [in] */ FirmwareType aFirmwareType,
-    /* [in] */ BSTR aVersion,
-    /* [out] */ BSTR *aUrl,
-    /* [out] */ BSTR *aFile,
-    /* [retval][out] */ BOOL *aResult);
-
-
-void __RPC_STUB IVirtualBox_CheckFirmwarePresent_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IVirtualBox_INTERFACE_DEFINED__ */
-
-
-#ifndef __IVFSExplorer_INTERFACE_DEFINED__
-#define __IVFSExplorer_INTERFACE_DEFINED__
-
-/* interface IVFSExplorer */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IVFSExplorer;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("2bb864a1-02a3-4474-a1d4-fb5f23b742e1")
-    IVFSExplorer : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Path( 
-            /* [retval][out] */ BSTR *aPath) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Type( 
-            /* [retval][out] */ VFSType *aType) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE Update( 
-            /* [retval][out] */ IProgress **aAProgress) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE Cd( 
-            /* [in] */ BSTR aADir,
-            /* [retval][out] */ IProgress **aAProgress) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CdUp( 
-            /* [retval][out] */ IProgress **aAProgress) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE EntryList( 
-            /* [out] */ SAFEARRAY * *aANames,
-            /* [out] */ SAFEARRAY * *aATypes) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE Exists( 
-            /* [out][in] */ SAFEARRAY * *aANames,
-            /* [retval][out] */ SAFEARRAY * *aAExists) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE Remove( 
-            /* [out][in] */ SAFEARRAY * *aANames,
-            /* [retval][out] */ IProgress **aAProgress) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IVFSExplorerVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IVFSExplorer * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IVFSExplorer * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IVFSExplorer * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IVFSExplorer * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IVFSExplorer * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IVFSExplorer * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IVFSExplorer * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Path )( 
-            IVFSExplorer * This,
-            /* [retval][out] */ BSTR *aPath);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Type )( 
-            IVFSExplorer * This,
-            /* [retval][out] */ VFSType *aType);
-        
-        HRESULT ( STDMETHODCALLTYPE *Update )( 
-            IVFSExplorer * This,
-            /* [retval][out] */ IProgress **aAProgress);
-        
-        HRESULT ( STDMETHODCALLTYPE *Cd )( 
-            IVFSExplorer * This,
-            /* [in] */ BSTR aADir,
-            /* [retval][out] */ IProgress **aAProgress);
-        
-        HRESULT ( STDMETHODCALLTYPE *CdUp )( 
-            IVFSExplorer * This,
-            /* [retval][out] */ IProgress **aAProgress);
-        
-        HRESULT ( STDMETHODCALLTYPE *EntryList )( 
-            IVFSExplorer * This,
-            /* [out] */ SAFEARRAY * *aANames,
-            /* [out] */ SAFEARRAY * *aATypes);
-        
-        HRESULT ( STDMETHODCALLTYPE *Exists )( 
-            IVFSExplorer * This,
-            /* [out][in] */ SAFEARRAY * *aANames,
-            /* [retval][out] */ SAFEARRAY * *aAExists);
-        
-        HRESULT ( STDMETHODCALLTYPE *Remove )( 
-            IVFSExplorer * This,
-            /* [out][in] */ SAFEARRAY * *aANames,
-            /* [retval][out] */ IProgress **aAProgress);
-        
-        END_INTERFACE
-    } IVFSExplorerVtbl;
-
-    interface IVFSExplorer
-    {
-        CONST_VTBL struct IVFSExplorerVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IVFSExplorer_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IVFSExplorer_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IVFSExplorer_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IVFSExplorer_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IVFSExplorer_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IVFSExplorer_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IVFSExplorer_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IVFSExplorer_get_Path(This,aPath)	\
-    (This)->lpVtbl -> get_Path(This,aPath)
-
-#define IVFSExplorer_get_Type(This,aType)	\
-    (This)->lpVtbl -> get_Type(This,aType)
-
-#define IVFSExplorer_Update(This,aAProgress)	\
-    (This)->lpVtbl -> Update(This,aAProgress)
-
-#define IVFSExplorer_Cd(This,aADir,aAProgress)	\
-    (This)->lpVtbl -> Cd(This,aADir,aAProgress)
-
-#define IVFSExplorer_CdUp(This,aAProgress)	\
-    (This)->lpVtbl -> CdUp(This,aAProgress)
-
-#define IVFSExplorer_EntryList(This,aANames,aATypes)	\
-    (This)->lpVtbl -> EntryList(This,aANames,aATypes)
-
-#define IVFSExplorer_Exists(This,aANames,aAExists)	\
-    (This)->lpVtbl -> Exists(This,aANames,aAExists)
-
-#define IVFSExplorer_Remove(This,aANames,aAProgress)	\
-    (This)->lpVtbl -> Remove(This,aANames,aAProgress)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IVFSExplorer_get_Path_Proxy( 
-    IVFSExplorer * This,
-    /* [retval][out] */ BSTR *aPath);
-
-
-void __RPC_STUB IVFSExplorer_get_Path_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IVFSExplorer_get_Type_Proxy( 
-    IVFSExplorer * This,
-    /* [retval][out] */ VFSType *aType);
-
-
-void __RPC_STUB IVFSExplorer_get_Type_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVFSExplorer_Update_Proxy( 
-    IVFSExplorer * This,
-    /* [retval][out] */ IProgress **aAProgress);
-
-
-void __RPC_STUB IVFSExplorer_Update_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVFSExplorer_Cd_Proxy( 
-    IVFSExplorer * This,
-    /* [in] */ BSTR aADir,
-    /* [retval][out] */ IProgress **aAProgress);
-
-
-void __RPC_STUB IVFSExplorer_Cd_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVFSExplorer_CdUp_Proxy( 
-    IVFSExplorer * This,
-    /* [retval][out] */ IProgress **aAProgress);
-
-
-void __RPC_STUB IVFSExplorer_CdUp_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVFSExplorer_EntryList_Proxy( 
-    IVFSExplorer * This,
-    /* [out] */ SAFEARRAY * *aANames,
-    /* [out] */ SAFEARRAY * *aATypes);
-
-
-void __RPC_STUB IVFSExplorer_EntryList_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVFSExplorer_Exists_Proxy( 
-    IVFSExplorer * This,
-    /* [out][in] */ SAFEARRAY * *aANames,
-    /* [retval][out] */ SAFEARRAY * *aAExists);
-
-
-void __RPC_STUB IVFSExplorer_Exists_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVFSExplorer_Remove_Proxy( 
-    IVFSExplorer * This,
-    /* [out][in] */ SAFEARRAY * *aANames,
-    /* [retval][out] */ IProgress **aAProgress);
-
-
-void __RPC_STUB IVFSExplorer_Remove_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IVFSExplorer_INTERFACE_DEFINED__ */
-
-
-#ifndef __IAppliance_INTERFACE_DEFINED__
-#define __IAppliance_INTERFACE_DEFINED__
-
-/* interface IAppliance */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IAppliance;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("e3ba9ab9-ac2c-4266-8bd2-91c4bf721ceb")
-    IAppliance : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Path( 
-            /* [retval][out] */ BSTR *aPath) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Disks( 
-            /* [retval][out] */ SAFEARRAY * *aDisks) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_VirtualSystemDescriptions( 
-            /* [retval][out] */ SAFEARRAY * *aVirtualSystemDescriptions) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE Read( 
-            /* [in] */ BSTR aFile,
-            /* [retval][out] */ IProgress **aAProgress) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE Interpret( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE ImportMachines( 
-            /* [retval][out] */ IProgress **aAProgress) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateVFSExplorer( 
-            /* [in] */ BSTR aAUri,
-            /* [retval][out] */ IVFSExplorer **aAExplorer) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE Write( 
-            /* [in] */ BSTR aFormat,
-            /* [in] */ BSTR aPath,
-            /* [retval][out] */ IProgress **aAProgress) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetWarnings( 
-            /* [retval][out] */ SAFEARRAY * *aAWarnings) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IApplianceVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IAppliance * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IAppliance * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IAppliance * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IAppliance * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IAppliance * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IAppliance * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IAppliance * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Path )( 
-            IAppliance * This,
-            /* [retval][out] */ BSTR *aPath);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Disks )( 
-            IAppliance * This,
-            /* [retval][out] */ SAFEARRAY * *aDisks);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_VirtualSystemDescriptions )( 
-            IAppliance * This,
-            /* [retval][out] */ SAFEARRAY * *aVirtualSystemDescriptions);
-        
-        HRESULT ( STDMETHODCALLTYPE *Read )( 
-            IAppliance * This,
-            /* [in] */ BSTR aFile,
-            /* [retval][out] */ IProgress **aAProgress);
-        
-        HRESULT ( STDMETHODCALLTYPE *Interpret )( 
-            IAppliance * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *ImportMachines )( 
-            IAppliance * This,
-            /* [retval][out] */ IProgress **aAProgress);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateVFSExplorer )( 
-            IAppliance * This,
-            /* [in] */ BSTR aAUri,
-            /* [retval][out] */ IVFSExplorer **aAExplorer);
-        
-        HRESULT ( STDMETHODCALLTYPE *Write )( 
-            IAppliance * This,
-            /* [in] */ BSTR aFormat,
-            /* [in] */ BSTR aPath,
-            /* [retval][out] */ IProgress **aAProgress);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetWarnings )( 
-            IAppliance * This,
-            /* [retval][out] */ SAFEARRAY * *aAWarnings);
-        
-        END_INTERFACE
-    } IApplianceVtbl;
-
-    interface IAppliance
-    {
-        CONST_VTBL struct IApplianceVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IAppliance_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IAppliance_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IAppliance_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IAppliance_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IAppliance_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IAppliance_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IAppliance_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IAppliance_get_Path(This,aPath)	\
-    (This)->lpVtbl -> get_Path(This,aPath)
-
-#define IAppliance_get_Disks(This,aDisks)	\
-    (This)->lpVtbl -> get_Disks(This,aDisks)
-
-#define IAppliance_get_VirtualSystemDescriptions(This,aVirtualSystemDescriptions)	\
-    (This)->lpVtbl -> get_VirtualSystemDescriptions(This,aVirtualSystemDescriptions)
-
-#define IAppliance_Read(This,aFile,aAProgress)	\
-    (This)->lpVtbl -> Read(This,aFile,aAProgress)
-
-#define IAppliance_Interpret(This)	\
-    (This)->lpVtbl -> Interpret(This)
-
-#define IAppliance_ImportMachines(This,aAProgress)	\
-    (This)->lpVtbl -> ImportMachines(This,aAProgress)
-
-#define IAppliance_CreateVFSExplorer(This,aAUri,aAExplorer)	\
-    (This)->lpVtbl -> CreateVFSExplorer(This,aAUri,aAExplorer)
-
-#define IAppliance_Write(This,aFormat,aPath,aAProgress)	\
-    (This)->lpVtbl -> Write(This,aFormat,aPath,aAProgress)
-
-#define IAppliance_GetWarnings(This,aAWarnings)	\
-    (This)->lpVtbl -> GetWarnings(This,aAWarnings)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IAppliance_get_Path_Proxy( 
-    IAppliance * This,
-    /* [retval][out] */ BSTR *aPath);
-
-
-void __RPC_STUB IAppliance_get_Path_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IAppliance_get_Disks_Proxy( 
-    IAppliance * This,
-    /* [retval][out] */ SAFEARRAY * *aDisks);
-
-
-void __RPC_STUB IAppliance_get_Disks_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IAppliance_get_VirtualSystemDescriptions_Proxy( 
-    IAppliance * This,
-    /* [retval][out] */ SAFEARRAY * *aVirtualSystemDescriptions);
-
-
-void __RPC_STUB IAppliance_get_VirtualSystemDescriptions_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IAppliance_Read_Proxy( 
-    IAppliance * This,
-    /* [in] */ BSTR aFile,
-    /* [retval][out] */ IProgress **aAProgress);
-
-
-void __RPC_STUB IAppliance_Read_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IAppliance_Interpret_Proxy( 
-    IAppliance * This);
-
-
-void __RPC_STUB IAppliance_Interpret_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IAppliance_ImportMachines_Proxy( 
-    IAppliance * This,
-    /* [retval][out] */ IProgress **aAProgress);
-
-
-void __RPC_STUB IAppliance_ImportMachines_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IAppliance_CreateVFSExplorer_Proxy( 
-    IAppliance * This,
-    /* [in] */ BSTR aAUri,
-    /* [retval][out] */ IVFSExplorer **aAExplorer);
-
-
-void __RPC_STUB IAppliance_CreateVFSExplorer_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IAppliance_Write_Proxy( 
-    IAppliance * This,
-    /* [in] */ BSTR aFormat,
-    /* [in] */ BSTR aPath,
-    /* [retval][out] */ IProgress **aAProgress);
-
-
-void __RPC_STUB IAppliance_Write_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IAppliance_GetWarnings_Proxy( 
-    IAppliance * This,
-    /* [retval][out] */ SAFEARRAY * *aAWarnings);
-
-
-void __RPC_STUB IAppliance_GetWarnings_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IAppliance_INTERFACE_DEFINED__ */
-
-
-#ifndef __IVirtualSystemDescription_INTERFACE_DEFINED__
-#define __IVirtualSystemDescription_INTERFACE_DEFINED__
-
-/* interface IVirtualSystemDescription */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IVirtualSystemDescription;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("d7525e6c-531a-4c51-8e04-41235083a3d8")
-    IVirtualSystemDescription : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Count( 
-            /* [retval][out] */ ULONG *aCount) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetDescription( 
-            /* [out] */ SAFEARRAY * *aATypes,
-            /* [out] */ SAFEARRAY * *aARefs,
-            /* [out] */ SAFEARRAY * *aAOvfValues,
-            /* [out] */ SAFEARRAY * *aAVBoxValues,
-            /* [out] */ SAFEARRAY * *aAExtraConfigValues) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetDescriptionByType( 
-            /* [in] */ VirtualSystemDescriptionType aAType,
-            /* [out] */ SAFEARRAY * *aATypes,
-            /* [out] */ SAFEARRAY * *aARefs,
-            /* [out] */ SAFEARRAY * *aAOvfValues,
-            /* [out] */ SAFEARRAY * *aAVBoxValues,
-            /* [out] */ SAFEARRAY * *aAExtraConfigValues) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetValuesByType( 
-            /* [in] */ VirtualSystemDescriptionType aAType,
-            /* [in] */ VirtualSystemDescriptionValueType aAWhich,
-            /* [retval][out] */ SAFEARRAY * *aAValues) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetFinalValues( 
-            /* [out][in] */ SAFEARRAY * *aAEnabled,
-            /* [out][in] */ SAFEARRAY * *aAVBoxValues,
-            /* [out][in] */ SAFEARRAY * *aAExtraConfigValues) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE AddDescription( 
-            /* [in] */ VirtualSystemDescriptionType aAType,
-            /* [in] */ BSTR aAVBoxValue,
-            /* [in] */ BSTR aAExtraConfigValue) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IVirtualSystemDescriptionVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IVirtualSystemDescription * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IVirtualSystemDescription * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IVirtualSystemDescription * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IVirtualSystemDescription * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IVirtualSystemDescription * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IVirtualSystemDescription * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IVirtualSystemDescription * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Count )( 
-            IVirtualSystemDescription * This,
-            /* [retval][out] */ ULONG *aCount);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetDescription )( 
-            IVirtualSystemDescription * This,
-            /* [out] */ SAFEARRAY * *aATypes,
-            /* [out] */ SAFEARRAY * *aARefs,
-            /* [out] */ SAFEARRAY * *aAOvfValues,
-            /* [out] */ SAFEARRAY * *aAVBoxValues,
-            /* [out] */ SAFEARRAY * *aAExtraConfigValues);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetDescriptionByType )( 
-            IVirtualSystemDescription * This,
-            /* [in] */ VirtualSystemDescriptionType aAType,
-            /* [out] */ SAFEARRAY * *aATypes,
-            /* [out] */ SAFEARRAY * *aARefs,
-            /* [out] */ SAFEARRAY * *aAOvfValues,
-            /* [out] */ SAFEARRAY * *aAVBoxValues,
-            /* [out] */ SAFEARRAY * *aAExtraConfigValues);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetValuesByType )( 
-            IVirtualSystemDescription * This,
-            /* [in] */ VirtualSystemDescriptionType aAType,
-            /* [in] */ VirtualSystemDescriptionValueType aAWhich,
-            /* [retval][out] */ SAFEARRAY * *aAValues);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetFinalValues )( 
-            IVirtualSystemDescription * This,
-            /* [out][in] */ SAFEARRAY * *aAEnabled,
-            /* [out][in] */ SAFEARRAY * *aAVBoxValues,
-            /* [out][in] */ SAFEARRAY * *aAExtraConfigValues);
-        
-        HRESULT ( STDMETHODCALLTYPE *AddDescription )( 
-            IVirtualSystemDescription * This,
-            /* [in] */ VirtualSystemDescriptionType aAType,
-            /* [in] */ BSTR aAVBoxValue,
-            /* [in] */ BSTR aAExtraConfigValue);
-        
-        END_INTERFACE
-    } IVirtualSystemDescriptionVtbl;
-
-    interface IVirtualSystemDescription
-    {
-        CONST_VTBL struct IVirtualSystemDescriptionVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IVirtualSystemDescription_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IVirtualSystemDescription_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IVirtualSystemDescription_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IVirtualSystemDescription_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IVirtualSystemDescription_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IVirtualSystemDescription_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IVirtualSystemDescription_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IVirtualSystemDescription_get_Count(This,aCount)	\
-    (This)->lpVtbl -> get_Count(This,aCount)
-
-#define IVirtualSystemDescription_GetDescription(This,aATypes,aARefs,aAOvfValues,aAVBoxValues,aAExtraConfigValues)	\
-    (This)->lpVtbl -> GetDescription(This,aATypes,aARefs,aAOvfValues,aAVBoxValues,aAExtraConfigValues)
-
-#define IVirtualSystemDescription_GetDescriptionByType(This,aAType,aATypes,aARefs,aAOvfValues,aAVBoxValues,aAExtraConfigValues)	\
-    (This)->lpVtbl -> GetDescriptionByType(This,aAType,aATypes,aARefs,aAOvfValues,aAVBoxValues,aAExtraConfigValues)
-
-#define IVirtualSystemDescription_GetValuesByType(This,aAType,aAWhich,aAValues)	\
-    (This)->lpVtbl -> GetValuesByType(This,aAType,aAWhich,aAValues)
-
-#define IVirtualSystemDescription_SetFinalValues(This,aAEnabled,aAVBoxValues,aAExtraConfigValues)	\
-    (This)->lpVtbl -> SetFinalValues(This,aAEnabled,aAVBoxValues,aAExtraConfigValues)
-
-#define IVirtualSystemDescription_AddDescription(This,aAType,aAVBoxValue,aAExtraConfigValue)	\
-    (This)->lpVtbl -> AddDescription(This,aAType,aAVBoxValue,aAExtraConfigValue)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IVirtualSystemDescription_get_Count_Proxy( 
-    IVirtualSystemDescription * This,
-    /* [retval][out] */ ULONG *aCount);
-
-
-void __RPC_STUB IVirtualSystemDescription_get_Count_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualSystemDescription_GetDescription_Proxy( 
-    IVirtualSystemDescription * This,
-    /* [out] */ SAFEARRAY * *aATypes,
-    /* [out] */ SAFEARRAY * *aARefs,
-    /* [out] */ SAFEARRAY * *aAOvfValues,
-    /* [out] */ SAFEARRAY * *aAVBoxValues,
-    /* [out] */ SAFEARRAY * *aAExtraConfigValues);
-
-
-void __RPC_STUB IVirtualSystemDescription_GetDescription_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualSystemDescription_GetDescriptionByType_Proxy( 
-    IVirtualSystemDescription * This,
-    /* [in] */ VirtualSystemDescriptionType aAType,
-    /* [out] */ SAFEARRAY * *aATypes,
-    /* [out] */ SAFEARRAY * *aARefs,
-    /* [out] */ SAFEARRAY * *aAOvfValues,
-    /* [out] */ SAFEARRAY * *aAVBoxValues,
-    /* [out] */ SAFEARRAY * *aAExtraConfigValues);
-
-
-void __RPC_STUB IVirtualSystemDescription_GetDescriptionByType_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualSystemDescription_GetValuesByType_Proxy( 
-    IVirtualSystemDescription * This,
-    /* [in] */ VirtualSystemDescriptionType aAType,
-    /* [in] */ VirtualSystemDescriptionValueType aAWhich,
-    /* [retval][out] */ SAFEARRAY * *aAValues);
-
-
-void __RPC_STUB IVirtualSystemDescription_GetValuesByType_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualSystemDescription_SetFinalValues_Proxy( 
-    IVirtualSystemDescription * This,
-    /* [out][in] */ SAFEARRAY * *aAEnabled,
-    /* [out][in] */ SAFEARRAY * *aAVBoxValues,
-    /* [out][in] */ SAFEARRAY * *aAExtraConfigValues);
-
-
-void __RPC_STUB IVirtualSystemDescription_SetFinalValues_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IVirtualSystemDescription_AddDescription_Proxy( 
-    IVirtualSystemDescription * This,
-    /* [in] */ VirtualSystemDescriptionType aAType,
-    /* [in] */ BSTR aAVBoxValue,
-    /* [in] */ BSTR aAExtraConfigValue);
-
-
-void __RPC_STUB IVirtualSystemDescription_AddDescription_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IVirtualSystemDescription_INTERFACE_DEFINED__ */
-
-
-#ifndef __IInternalMachineControl_INTERFACE_DEFINED__
-#define __IInternalMachineControl_INTERFACE_DEFINED__
-
-/* interface IInternalMachineControl */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IInternalMachineControl;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("26604a54-8628-491b-a0ea-e1392a16d13b")
-    IInternalMachineControl : public IDispatch
-    {
-    public:
-        virtual HRESULT STDMETHODCALLTYPE SetRemoveSavedState( 
-            /* [in] */ BOOL aARemove) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE UpdateState( 
-            /* [in] */ MachineState aState) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetIPCId( 
-            /* [retval][out] */ BSTR *aId) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE BeginPowerUp( 
-            /* [in] */ IProgress *aProgress) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE EndPowerUp( 
-            /* [in] */ LONG aResult) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE RunUSBDeviceFilters( 
-            /* [in] */ IUSBDevice *aDevice,
-            /* [out] */ BOOL *aMatched,
-            /* [out] */ ULONG *aMaskedInterfaces) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CaptureUSBDevice( 
-            /* [in] */ BSTR aId) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE DetachUSBDevice( 
-            /* [in] */ BSTR aId,
-            /* [in] */ BOOL aDone) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE AutoCaptureUSBDevices( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE DetachAllUSBDevices( 
-            /* [in] */ BOOL aDone) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnSessionEnd( 
-            /* [in] */ ISession *aSession,
-            /* [retval][out] */ IProgress **aProgress) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE BeginSavingState( 
-            /* [in] */ IProgress *aProgress,
-            /* [out] */ BSTR *aStateFilePath) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE EndSavingState( 
-            /* [in] */ BOOL aSuccess) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE AdoptSavedState( 
-            /* [in] */ BSTR aSavedStateFile) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE BeginTakingSnapshot( 
-            /* [in] */ IConsole *aInitiator,
-            /* [in] */ BSTR aName,
-            /* [in] */ BSTR aDescription,
-            /* [in] */ IProgress *aConsoleProgress,
-            /* [in] */ BOOL aFTakingSnapshotOnline,
-            /* [out] */ BSTR *aStateFilePath) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE EndTakingSnapshot( 
-            /* [in] */ BOOL aSuccess) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE DeleteSnapshot( 
-            /* [in] */ IConsole *aInitiator,
-            /* [in] */ BSTR aId,
-            /* [out] */ MachineState *aMachineState,
-            /* [retval][out] */ IProgress **aProgress) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE FinishOnlineMergeMedium( 
-            /* [in] */ IMediumAttachment *aMediumAttachment,
-            /* [in] */ IMedium *aSource,
-            /* [in] */ IMedium *aTarget,
-            /* [in] */ BOOL aMergeForward,
-            /* [in] */ IMedium *aParentForTarget,
-            /* [out][in] */ SAFEARRAY * *aChildrenToReparent) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE RestoreSnapshot( 
-            /* [in] */ IConsole *aInitiator,
-            /* [in] */ ISnapshot *aSnapshot,
-            /* [out] */ MachineState *aMachineState,
-            /* [retval][out] */ IProgress **aProgress) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE PullGuestProperties( 
-            /* [out] */ SAFEARRAY * *aName,
-            /* [out] */ SAFEARRAY * *aValue,
-            /* [out] */ SAFEARRAY * *aTimestamp,
-            /* [out] */ SAFEARRAY * *aFlags) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE PushGuestProperty( 
-            /* [in] */ BSTR aName,
-            /* [in] */ BSTR aValue,
-            /* [in] */ ULONG64 aTimestamp,
-            /* [in] */ BSTR aFlags) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE LockMedia( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE UnlockMedia( void) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IInternalMachineControlVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IInternalMachineControl * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IInternalMachineControl * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IInternalMachineControl * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IInternalMachineControl * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IInternalMachineControl * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IInternalMachineControl * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IInternalMachineControl * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetRemoveSavedState )( 
-            IInternalMachineControl * This,
-            /* [in] */ BOOL aARemove);
-        
-        HRESULT ( STDMETHODCALLTYPE *UpdateState )( 
-            IInternalMachineControl * This,
-            /* [in] */ MachineState aState);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIPCId )( 
-            IInternalMachineControl * This,
-            /* [retval][out] */ BSTR *aId);
-        
-        HRESULT ( STDMETHODCALLTYPE *BeginPowerUp )( 
-            IInternalMachineControl * This,
-            /* [in] */ IProgress *aProgress);
-        
-        HRESULT ( STDMETHODCALLTYPE *EndPowerUp )( 
-            IInternalMachineControl * This,
-            /* [in] */ LONG aResult);
-        
-        HRESULT ( STDMETHODCALLTYPE *RunUSBDeviceFilters )( 
-            IInternalMachineControl * This,
-            /* [in] */ IUSBDevice *aDevice,
-            /* [out] */ BOOL *aMatched,
-            /* [out] */ ULONG *aMaskedInterfaces);
-        
-        HRESULT ( STDMETHODCALLTYPE *CaptureUSBDevice )( 
-            IInternalMachineControl * This,
-            /* [in] */ BSTR aId);
-        
-        HRESULT ( STDMETHODCALLTYPE *DetachUSBDevice )( 
-            IInternalMachineControl * This,
-            /* [in] */ BSTR aId,
-            /* [in] */ BOOL aDone);
-        
-        HRESULT ( STDMETHODCALLTYPE *AutoCaptureUSBDevices )( 
-            IInternalMachineControl * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *DetachAllUSBDevices )( 
-            IInternalMachineControl * This,
-            /* [in] */ BOOL aDone);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnSessionEnd )( 
-            IInternalMachineControl * This,
-            /* [in] */ ISession *aSession,
-            /* [retval][out] */ IProgress **aProgress);
-        
-        HRESULT ( STDMETHODCALLTYPE *BeginSavingState )( 
-            IInternalMachineControl * This,
-            /* [in] */ IProgress *aProgress,
-            /* [out] */ BSTR *aStateFilePath);
-        
-        HRESULT ( STDMETHODCALLTYPE *EndSavingState )( 
-            IInternalMachineControl * This,
-            /* [in] */ BOOL aSuccess);
-        
-        HRESULT ( STDMETHODCALLTYPE *AdoptSavedState )( 
-            IInternalMachineControl * This,
-            /* [in] */ BSTR aSavedStateFile);
-        
-        HRESULT ( STDMETHODCALLTYPE *BeginTakingSnapshot )( 
-            IInternalMachineControl * This,
-            /* [in] */ IConsole *aInitiator,
-            /* [in] */ BSTR aName,
-            /* [in] */ BSTR aDescription,
-            /* [in] */ IProgress *aConsoleProgress,
-            /* [in] */ BOOL aFTakingSnapshotOnline,
-            /* [out] */ BSTR *aStateFilePath);
-        
-        HRESULT ( STDMETHODCALLTYPE *EndTakingSnapshot )( 
-            IInternalMachineControl * This,
-            /* [in] */ BOOL aSuccess);
-        
-        HRESULT ( STDMETHODCALLTYPE *DeleteSnapshot )( 
-            IInternalMachineControl * This,
-            /* [in] */ IConsole *aInitiator,
-            /* [in] */ BSTR aId,
-            /* [out] */ MachineState *aMachineState,
-            /* [retval][out] */ IProgress **aProgress);
-        
-        HRESULT ( STDMETHODCALLTYPE *FinishOnlineMergeMedium )( 
-            IInternalMachineControl * This,
-            /* [in] */ IMediumAttachment *aMediumAttachment,
-            /* [in] */ IMedium *aSource,
-            /* [in] */ IMedium *aTarget,
-            /* [in] */ BOOL aMergeForward,
-            /* [in] */ IMedium *aParentForTarget,
-            /* [out][in] */ SAFEARRAY * *aChildrenToReparent);
-        
-        HRESULT ( STDMETHODCALLTYPE *RestoreSnapshot )( 
-            IInternalMachineControl * This,
-            /* [in] */ IConsole *aInitiator,
-            /* [in] */ ISnapshot *aSnapshot,
-            /* [out] */ MachineState *aMachineState,
-            /* [retval][out] */ IProgress **aProgress);
-        
-        HRESULT ( STDMETHODCALLTYPE *PullGuestProperties )( 
-            IInternalMachineControl * This,
-            /* [out] */ SAFEARRAY * *aName,
-            /* [out] */ SAFEARRAY * *aValue,
-            /* [out] */ SAFEARRAY * *aTimestamp,
-            /* [out] */ SAFEARRAY * *aFlags);
-        
-        HRESULT ( STDMETHODCALLTYPE *PushGuestProperty )( 
-            IInternalMachineControl * This,
-            /* [in] */ BSTR aName,
-            /* [in] */ BSTR aValue,
-            /* [in] */ ULONG64 aTimestamp,
-            /* [in] */ BSTR aFlags);
-        
-        HRESULT ( STDMETHODCALLTYPE *LockMedia )( 
-            IInternalMachineControl * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *UnlockMedia )( 
-            IInternalMachineControl * This);
-        
-        END_INTERFACE
-    } IInternalMachineControlVtbl;
-
-    interface IInternalMachineControl
-    {
-        CONST_VTBL struct IInternalMachineControlVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IInternalMachineControl_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IInternalMachineControl_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IInternalMachineControl_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IInternalMachineControl_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IInternalMachineControl_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IInternalMachineControl_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IInternalMachineControl_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IInternalMachineControl_SetRemoveSavedState(This,aARemove)	\
-    (This)->lpVtbl -> SetRemoveSavedState(This,aARemove)
-
-#define IInternalMachineControl_UpdateState(This,aState)	\
-    (This)->lpVtbl -> UpdateState(This,aState)
-
-#define IInternalMachineControl_GetIPCId(This,aId)	\
-    (This)->lpVtbl -> GetIPCId(This,aId)
-
-#define IInternalMachineControl_BeginPowerUp(This,aProgress)	\
-    (This)->lpVtbl -> BeginPowerUp(This,aProgress)
-
-#define IInternalMachineControl_EndPowerUp(This,aResult)	\
-    (This)->lpVtbl -> EndPowerUp(This,aResult)
-
-#define IInternalMachineControl_RunUSBDeviceFilters(This,aDevice,aMatched,aMaskedInterfaces)	\
-    (This)->lpVtbl -> RunUSBDeviceFilters(This,aDevice,aMatched,aMaskedInterfaces)
-
-#define IInternalMachineControl_CaptureUSBDevice(This,aId)	\
-    (This)->lpVtbl -> CaptureUSBDevice(This,aId)
-
-#define IInternalMachineControl_DetachUSBDevice(This,aId,aDone)	\
-    (This)->lpVtbl -> DetachUSBDevice(This,aId,aDone)
-
-#define IInternalMachineControl_AutoCaptureUSBDevices(This)	\
-    (This)->lpVtbl -> AutoCaptureUSBDevices(This)
-
-#define IInternalMachineControl_DetachAllUSBDevices(This,aDone)	\
-    (This)->lpVtbl -> DetachAllUSBDevices(This,aDone)
-
-#define IInternalMachineControl_OnSessionEnd(This,aSession,aProgress)	\
-    (This)->lpVtbl -> OnSessionEnd(This,aSession,aProgress)
-
-#define IInternalMachineControl_BeginSavingState(This,aProgress,aStateFilePath)	\
-    (This)->lpVtbl -> BeginSavingState(This,aProgress,aStateFilePath)
-
-#define IInternalMachineControl_EndSavingState(This,aSuccess)	\
-    (This)->lpVtbl -> EndSavingState(This,aSuccess)
-
-#define IInternalMachineControl_AdoptSavedState(This,aSavedStateFile)	\
-    (This)->lpVtbl -> AdoptSavedState(This,aSavedStateFile)
-
-#define IInternalMachineControl_BeginTakingSnapshot(This,aInitiator,aName,aDescription,aConsoleProgress,aFTakingSnapshotOnline,aStateFilePath)	\
-    (This)->lpVtbl -> BeginTakingSnapshot(This,aInitiator,aName,aDescription,aConsoleProgress,aFTakingSnapshotOnline,aStateFilePath)
-
-#define IInternalMachineControl_EndTakingSnapshot(This,aSuccess)	\
-    (This)->lpVtbl -> EndTakingSnapshot(This,aSuccess)
-
-#define IInternalMachineControl_DeleteSnapshot(This,aInitiator,aId,aMachineState,aProgress)	\
-    (This)->lpVtbl -> DeleteSnapshot(This,aInitiator,aId,aMachineState,aProgress)
-
-#define IInternalMachineControl_FinishOnlineMergeMedium(This,aMediumAttachment,aSource,aTarget,aMergeForward,aParentForTarget,aChildrenToReparent)	\
-    (This)->lpVtbl -> FinishOnlineMergeMedium(This,aMediumAttachment,aSource,aTarget,aMergeForward,aParentForTarget,aChildrenToReparent)
-
-#define IInternalMachineControl_RestoreSnapshot(This,aInitiator,aSnapshot,aMachineState,aProgress)	\
-    (This)->lpVtbl -> RestoreSnapshot(This,aInitiator,aSnapshot,aMachineState,aProgress)
-
-#define IInternalMachineControl_PullGuestProperties(This,aName,aValue,aTimestamp,aFlags)	\
-    (This)->lpVtbl -> PullGuestProperties(This,aName,aValue,aTimestamp,aFlags)
-
-#define IInternalMachineControl_PushGuestProperty(This,aName,aValue,aTimestamp,aFlags)	\
-    (This)->lpVtbl -> PushGuestProperty(This,aName,aValue,aTimestamp,aFlags)
-
-#define IInternalMachineControl_LockMedia(This)	\
-    (This)->lpVtbl -> LockMedia(This)
-
-#define IInternalMachineControl_UnlockMedia(This)	\
-    (This)->lpVtbl -> UnlockMedia(This)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-HRESULT STDMETHODCALLTYPE IInternalMachineControl_SetRemoveSavedState_Proxy( 
-    IInternalMachineControl * This,
-    /* [in] */ BOOL aARemove);
-
-
-void __RPC_STUB IInternalMachineControl_SetRemoveSavedState_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalMachineControl_UpdateState_Proxy( 
-    IInternalMachineControl * This,
-    /* [in] */ MachineState aState);
-
-
-void __RPC_STUB IInternalMachineControl_UpdateState_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalMachineControl_GetIPCId_Proxy( 
-    IInternalMachineControl * This,
-    /* [retval][out] */ BSTR *aId);
-
-
-void __RPC_STUB IInternalMachineControl_GetIPCId_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalMachineControl_BeginPowerUp_Proxy( 
-    IInternalMachineControl * This,
-    /* [in] */ IProgress *aProgress);
-
-
-void __RPC_STUB IInternalMachineControl_BeginPowerUp_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalMachineControl_EndPowerUp_Proxy( 
-    IInternalMachineControl * This,
-    /* [in] */ LONG aResult);
-
-
-void __RPC_STUB IInternalMachineControl_EndPowerUp_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalMachineControl_RunUSBDeviceFilters_Proxy( 
-    IInternalMachineControl * This,
-    /* [in] */ IUSBDevice *aDevice,
-    /* [out] */ BOOL *aMatched,
-    /* [out] */ ULONG *aMaskedInterfaces);
-
-
-void __RPC_STUB IInternalMachineControl_RunUSBDeviceFilters_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalMachineControl_CaptureUSBDevice_Proxy( 
-    IInternalMachineControl * This,
-    /* [in] */ BSTR aId);
-
-
-void __RPC_STUB IInternalMachineControl_CaptureUSBDevice_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalMachineControl_DetachUSBDevice_Proxy( 
-    IInternalMachineControl * This,
-    /* [in] */ BSTR aId,
-    /* [in] */ BOOL aDone);
-
-
-void __RPC_STUB IInternalMachineControl_DetachUSBDevice_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalMachineControl_AutoCaptureUSBDevices_Proxy( 
-    IInternalMachineControl * This);
-
-
-void __RPC_STUB IInternalMachineControl_AutoCaptureUSBDevices_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalMachineControl_DetachAllUSBDevices_Proxy( 
-    IInternalMachineControl * This,
-    /* [in] */ BOOL aDone);
-
-
-void __RPC_STUB IInternalMachineControl_DetachAllUSBDevices_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalMachineControl_OnSessionEnd_Proxy( 
-    IInternalMachineControl * This,
-    /* [in] */ ISession *aSession,
-    /* [retval][out] */ IProgress **aProgress);
-
-
-void __RPC_STUB IInternalMachineControl_OnSessionEnd_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalMachineControl_BeginSavingState_Proxy( 
-    IInternalMachineControl * This,
-    /* [in] */ IProgress *aProgress,
-    /* [out] */ BSTR *aStateFilePath);
-
-
-void __RPC_STUB IInternalMachineControl_BeginSavingState_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalMachineControl_EndSavingState_Proxy( 
-    IInternalMachineControl * This,
-    /* [in] */ BOOL aSuccess);
-
-
-void __RPC_STUB IInternalMachineControl_EndSavingState_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalMachineControl_AdoptSavedState_Proxy( 
-    IInternalMachineControl * This,
-    /* [in] */ BSTR aSavedStateFile);
-
-
-void __RPC_STUB IInternalMachineControl_AdoptSavedState_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalMachineControl_BeginTakingSnapshot_Proxy( 
-    IInternalMachineControl * This,
-    /* [in] */ IConsole *aInitiator,
-    /* [in] */ BSTR aName,
-    /* [in] */ BSTR aDescription,
-    /* [in] */ IProgress *aConsoleProgress,
-    /* [in] */ BOOL aFTakingSnapshotOnline,
-    /* [out] */ BSTR *aStateFilePath);
-
-
-void __RPC_STUB IInternalMachineControl_BeginTakingSnapshot_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalMachineControl_EndTakingSnapshot_Proxy( 
-    IInternalMachineControl * This,
-    /* [in] */ BOOL aSuccess);
-
-
-void __RPC_STUB IInternalMachineControl_EndTakingSnapshot_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalMachineControl_DeleteSnapshot_Proxy( 
-    IInternalMachineControl * This,
-    /* [in] */ IConsole *aInitiator,
-    /* [in] */ BSTR aId,
-    /* [out] */ MachineState *aMachineState,
-    /* [retval][out] */ IProgress **aProgress);
-
-
-void __RPC_STUB IInternalMachineControl_DeleteSnapshot_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalMachineControl_FinishOnlineMergeMedium_Proxy( 
-    IInternalMachineControl * This,
-    /* [in] */ IMediumAttachment *aMediumAttachment,
-    /* [in] */ IMedium *aSource,
-    /* [in] */ IMedium *aTarget,
-    /* [in] */ BOOL aMergeForward,
-    /* [in] */ IMedium *aParentForTarget,
-    /* [out][in] */ SAFEARRAY * *aChildrenToReparent);
-
-
-void __RPC_STUB IInternalMachineControl_FinishOnlineMergeMedium_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalMachineControl_RestoreSnapshot_Proxy( 
-    IInternalMachineControl * This,
-    /* [in] */ IConsole *aInitiator,
-    /* [in] */ ISnapshot *aSnapshot,
-    /* [out] */ MachineState *aMachineState,
-    /* [retval][out] */ IProgress **aProgress);
-
-
-void __RPC_STUB IInternalMachineControl_RestoreSnapshot_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalMachineControl_PullGuestProperties_Proxy( 
-    IInternalMachineControl * This,
-    /* [out] */ SAFEARRAY * *aName,
-    /* [out] */ SAFEARRAY * *aValue,
-    /* [out] */ SAFEARRAY * *aTimestamp,
-    /* [out] */ SAFEARRAY * *aFlags);
-
-
-void __RPC_STUB IInternalMachineControl_PullGuestProperties_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalMachineControl_PushGuestProperty_Proxy( 
-    IInternalMachineControl * This,
-    /* [in] */ BSTR aName,
-    /* [in] */ BSTR aValue,
-    /* [in] */ ULONG64 aTimestamp,
-    /* [in] */ BSTR aFlags);
-
-
-void __RPC_STUB IInternalMachineControl_PushGuestProperty_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalMachineControl_LockMedia_Proxy( 
-    IInternalMachineControl * This);
-
-
-void __RPC_STUB IInternalMachineControl_LockMedia_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalMachineControl_UnlockMedia_Proxy( 
-    IInternalMachineControl * This);
-
-
-void __RPC_STUB IInternalMachineControl_UnlockMedia_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IInternalMachineControl_INTERFACE_DEFINED__ */
-
-
-#ifndef __IBIOSSettings_INTERFACE_DEFINED__
-#define __IBIOSSettings_INTERFACE_DEFINED__
-
-/* interface IBIOSSettings */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IBIOSSettings;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("38b54279-dc35-4f5e-a431-835b867c6b5e")
-    IBIOSSettings : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_LogoFadeIn( 
-            /* [retval][out] */ BOOL *aLogoFadeIn) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_LogoFadeIn( 
-            /* [in] */ BOOL aLogoFadeIn) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_LogoFadeOut( 
-            /* [retval][out] */ BOOL *aLogoFadeOut) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_LogoFadeOut( 
-            /* [in] */ BOOL aLogoFadeOut) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_LogoDisplayTime( 
-            /* [retval][out] */ ULONG *aLogoDisplayTime) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_LogoDisplayTime( 
-            /* [in] */ ULONG aLogoDisplayTime) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_LogoImagePath( 
-            /* [retval][out] */ BSTR *aLogoImagePath) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_LogoImagePath( 
-            /* [in] */ BSTR aLogoImagePath) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_BootMenuMode( 
-            /* [retval][out] */ BIOSBootMenuMode *aBootMenuMode) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_BootMenuMode( 
-            /* [in] */ BIOSBootMenuMode aBootMenuMode) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_ACPIEnabled( 
-            /* [retval][out] */ BOOL *aACPIEnabled) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_ACPIEnabled( 
-            /* [in] */ BOOL aACPIEnabled) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_IOAPICEnabled( 
-            /* [retval][out] */ BOOL *aIOAPICEnabled) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_IOAPICEnabled( 
-            /* [in] */ BOOL aIOAPICEnabled) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_TimeOffset( 
-            /* [retval][out] */ LONG64 *aTimeOffset) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_TimeOffset( 
-            /* [in] */ LONG64 aTimeOffset) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_PXEDebugEnabled( 
-            /* [retval][out] */ BOOL *aPXEDebugEnabled) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_PXEDebugEnabled( 
-            /* [in] */ BOOL aPXEDebugEnabled) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IBIOSSettingsVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IBIOSSettings * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IBIOSSettings * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IBIOSSettings * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IBIOSSettings * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IBIOSSettings * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IBIOSSettings * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IBIOSSettings * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_LogoFadeIn )( 
-            IBIOSSettings * This,
-            /* [retval][out] */ BOOL *aLogoFadeIn);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_LogoFadeIn )( 
-            IBIOSSettings * This,
-            /* [in] */ BOOL aLogoFadeIn);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_LogoFadeOut )( 
-            IBIOSSettings * This,
-            /* [retval][out] */ BOOL *aLogoFadeOut);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_LogoFadeOut )( 
-            IBIOSSettings * This,
-            /* [in] */ BOOL aLogoFadeOut);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_LogoDisplayTime )( 
-            IBIOSSettings * This,
-            /* [retval][out] */ ULONG *aLogoDisplayTime);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_LogoDisplayTime )( 
-            IBIOSSettings * This,
-            /* [in] */ ULONG aLogoDisplayTime);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_LogoImagePath )( 
-            IBIOSSettings * This,
-            /* [retval][out] */ BSTR *aLogoImagePath);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_LogoImagePath )( 
-            IBIOSSettings * This,
-            /* [in] */ BSTR aLogoImagePath);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_BootMenuMode )( 
-            IBIOSSettings * This,
-            /* [retval][out] */ BIOSBootMenuMode *aBootMenuMode);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_BootMenuMode )( 
-            IBIOSSettings * This,
-            /* [in] */ BIOSBootMenuMode aBootMenuMode);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_ACPIEnabled )( 
-            IBIOSSettings * This,
-            /* [retval][out] */ BOOL *aACPIEnabled);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_ACPIEnabled )( 
-            IBIOSSettings * This,
-            /* [in] */ BOOL aACPIEnabled);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_IOAPICEnabled )( 
-            IBIOSSettings * This,
-            /* [retval][out] */ BOOL *aIOAPICEnabled);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_IOAPICEnabled )( 
-            IBIOSSettings * This,
-            /* [in] */ BOOL aIOAPICEnabled);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_TimeOffset )( 
-            IBIOSSettings * This,
-            /* [retval][out] */ LONG64 *aTimeOffset);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_TimeOffset )( 
-            IBIOSSettings * This,
-            /* [in] */ LONG64 aTimeOffset);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_PXEDebugEnabled )( 
-            IBIOSSettings * This,
-            /* [retval][out] */ BOOL *aPXEDebugEnabled);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_PXEDebugEnabled )( 
-            IBIOSSettings * This,
-            /* [in] */ BOOL aPXEDebugEnabled);
-        
-        END_INTERFACE
-    } IBIOSSettingsVtbl;
-
-    interface IBIOSSettings
-    {
-        CONST_VTBL struct IBIOSSettingsVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IBIOSSettings_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IBIOSSettings_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IBIOSSettings_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IBIOSSettings_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IBIOSSettings_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IBIOSSettings_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IBIOSSettings_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IBIOSSettings_get_LogoFadeIn(This,aLogoFadeIn)	\
-    (This)->lpVtbl -> get_LogoFadeIn(This,aLogoFadeIn)
-
-#define IBIOSSettings_put_LogoFadeIn(This,aLogoFadeIn)	\
-    (This)->lpVtbl -> put_LogoFadeIn(This,aLogoFadeIn)
-
-#define IBIOSSettings_get_LogoFadeOut(This,aLogoFadeOut)	\
-    (This)->lpVtbl -> get_LogoFadeOut(This,aLogoFadeOut)
-
-#define IBIOSSettings_put_LogoFadeOut(This,aLogoFadeOut)	\
-    (This)->lpVtbl -> put_LogoFadeOut(This,aLogoFadeOut)
-
-#define IBIOSSettings_get_LogoDisplayTime(This,aLogoDisplayTime)	\
-    (This)->lpVtbl -> get_LogoDisplayTime(This,aLogoDisplayTime)
-
-#define IBIOSSettings_put_LogoDisplayTime(This,aLogoDisplayTime)	\
-    (This)->lpVtbl -> put_LogoDisplayTime(This,aLogoDisplayTime)
-
-#define IBIOSSettings_get_LogoImagePath(This,aLogoImagePath)	\
-    (This)->lpVtbl -> get_LogoImagePath(This,aLogoImagePath)
-
-#define IBIOSSettings_put_LogoImagePath(This,aLogoImagePath)	\
-    (This)->lpVtbl -> put_LogoImagePath(This,aLogoImagePath)
-
-#define IBIOSSettings_get_BootMenuMode(This,aBootMenuMode)	\
-    (This)->lpVtbl -> get_BootMenuMode(This,aBootMenuMode)
-
-#define IBIOSSettings_put_BootMenuMode(This,aBootMenuMode)	\
-    (This)->lpVtbl -> put_BootMenuMode(This,aBootMenuMode)
-
-#define IBIOSSettings_get_ACPIEnabled(This,aACPIEnabled)	\
-    (This)->lpVtbl -> get_ACPIEnabled(This,aACPIEnabled)
-
-#define IBIOSSettings_put_ACPIEnabled(This,aACPIEnabled)	\
-    (This)->lpVtbl -> put_ACPIEnabled(This,aACPIEnabled)
-
-#define IBIOSSettings_get_IOAPICEnabled(This,aIOAPICEnabled)	\
-    (This)->lpVtbl -> get_IOAPICEnabled(This,aIOAPICEnabled)
-
-#define IBIOSSettings_put_IOAPICEnabled(This,aIOAPICEnabled)	\
-    (This)->lpVtbl -> put_IOAPICEnabled(This,aIOAPICEnabled)
-
-#define IBIOSSettings_get_TimeOffset(This,aTimeOffset)	\
-    (This)->lpVtbl -> get_TimeOffset(This,aTimeOffset)
-
-#define IBIOSSettings_put_TimeOffset(This,aTimeOffset)	\
-    (This)->lpVtbl -> put_TimeOffset(This,aTimeOffset)
-
-#define IBIOSSettings_get_PXEDebugEnabled(This,aPXEDebugEnabled)	\
-    (This)->lpVtbl -> get_PXEDebugEnabled(This,aPXEDebugEnabled)
-
-#define IBIOSSettings_put_PXEDebugEnabled(This,aPXEDebugEnabled)	\
-    (This)->lpVtbl -> put_PXEDebugEnabled(This,aPXEDebugEnabled)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IBIOSSettings_get_LogoFadeIn_Proxy( 
-    IBIOSSettings * This,
-    /* [retval][out] */ BOOL *aLogoFadeIn);
-
-
-void __RPC_STUB IBIOSSettings_get_LogoFadeIn_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IBIOSSettings_put_LogoFadeIn_Proxy( 
-    IBIOSSettings * This,
-    /* [in] */ BOOL aLogoFadeIn);
-
-
-void __RPC_STUB IBIOSSettings_put_LogoFadeIn_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IBIOSSettings_get_LogoFadeOut_Proxy( 
-    IBIOSSettings * This,
-    /* [retval][out] */ BOOL *aLogoFadeOut);
-
-
-void __RPC_STUB IBIOSSettings_get_LogoFadeOut_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IBIOSSettings_put_LogoFadeOut_Proxy( 
-    IBIOSSettings * This,
-    /* [in] */ BOOL aLogoFadeOut);
-
-
-void __RPC_STUB IBIOSSettings_put_LogoFadeOut_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IBIOSSettings_get_LogoDisplayTime_Proxy( 
-    IBIOSSettings * This,
-    /* [retval][out] */ ULONG *aLogoDisplayTime);
-
-
-void __RPC_STUB IBIOSSettings_get_LogoDisplayTime_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IBIOSSettings_put_LogoDisplayTime_Proxy( 
-    IBIOSSettings * This,
-    /* [in] */ ULONG aLogoDisplayTime);
-
-
-void __RPC_STUB IBIOSSettings_put_LogoDisplayTime_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IBIOSSettings_get_LogoImagePath_Proxy( 
-    IBIOSSettings * This,
-    /* [retval][out] */ BSTR *aLogoImagePath);
-
-
-void __RPC_STUB IBIOSSettings_get_LogoImagePath_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IBIOSSettings_put_LogoImagePath_Proxy( 
-    IBIOSSettings * This,
-    /* [in] */ BSTR aLogoImagePath);
-
-
-void __RPC_STUB IBIOSSettings_put_LogoImagePath_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IBIOSSettings_get_BootMenuMode_Proxy( 
-    IBIOSSettings * This,
-    /* [retval][out] */ BIOSBootMenuMode *aBootMenuMode);
-
-
-void __RPC_STUB IBIOSSettings_get_BootMenuMode_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IBIOSSettings_put_BootMenuMode_Proxy( 
-    IBIOSSettings * This,
-    /* [in] */ BIOSBootMenuMode aBootMenuMode);
-
-
-void __RPC_STUB IBIOSSettings_put_BootMenuMode_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IBIOSSettings_get_ACPIEnabled_Proxy( 
-    IBIOSSettings * This,
-    /* [retval][out] */ BOOL *aACPIEnabled);
-
-
-void __RPC_STUB IBIOSSettings_get_ACPIEnabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IBIOSSettings_put_ACPIEnabled_Proxy( 
-    IBIOSSettings * This,
-    /* [in] */ BOOL aACPIEnabled);
-
-
-void __RPC_STUB IBIOSSettings_put_ACPIEnabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IBIOSSettings_get_IOAPICEnabled_Proxy( 
-    IBIOSSettings * This,
-    /* [retval][out] */ BOOL *aIOAPICEnabled);
-
-
-void __RPC_STUB IBIOSSettings_get_IOAPICEnabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IBIOSSettings_put_IOAPICEnabled_Proxy( 
-    IBIOSSettings * This,
-    /* [in] */ BOOL aIOAPICEnabled);
-
-
-void __RPC_STUB IBIOSSettings_put_IOAPICEnabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IBIOSSettings_get_TimeOffset_Proxy( 
-    IBIOSSettings * This,
-    /* [retval][out] */ LONG64 *aTimeOffset);
-
-
-void __RPC_STUB IBIOSSettings_get_TimeOffset_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IBIOSSettings_put_TimeOffset_Proxy( 
-    IBIOSSettings * This,
-    /* [in] */ LONG64 aTimeOffset);
-
-
-void __RPC_STUB IBIOSSettings_put_TimeOffset_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IBIOSSettings_get_PXEDebugEnabled_Proxy( 
-    IBIOSSettings * This,
-    /* [retval][out] */ BOOL *aPXEDebugEnabled);
-
-
-void __RPC_STUB IBIOSSettings_get_PXEDebugEnabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IBIOSSettings_put_PXEDebugEnabled_Proxy( 
-    IBIOSSettings * This,
-    /* [in] */ BOOL aPXEDebugEnabled);
-
-
-void __RPC_STUB IBIOSSettings_put_PXEDebugEnabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IBIOSSettings_INTERFACE_DEFINED__ */
-
-
-#ifndef __IMachine_INTERFACE_DEFINED__
-#define __IMachine_INTERFACE_DEFINED__
-
-/* interface IMachine */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IMachine;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("6d9212cb-a5c0-48b7-bbc1-3fa2ba2ee6d2")
-    IMachine : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Parent( 
-            /* [retval][out] */ IVirtualBox **aParent) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Accessible( 
-            /* [retval][out] */ BOOL *aAccessible) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_AccessError( 
-            /* [retval][out] */ IVirtualBoxErrorInfo **aAccessError) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Name( 
-            /* [retval][out] */ BSTR *aName) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_Name( 
-            /* [in] */ BSTR aName) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Description( 
-            /* [retval][out] */ BSTR *aDescription) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_Description( 
-            /* [in] */ BSTR aDescription) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Id( 
-            /* [retval][out] */ BSTR *aId) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_OSTypeId( 
-            /* [retval][out] */ BSTR *aOSTypeId) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_OSTypeId( 
-            /* [in] */ BSTR aOSTypeId) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_HardwareVersion( 
-            /* [retval][out] */ BSTR *aHardwareVersion) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_HardwareVersion( 
-            /* [in] */ BSTR aHardwareVersion) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_HardwareUUID( 
-            /* [retval][out] */ BSTR *aHardwareUUID) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_HardwareUUID( 
-            /* [in] */ BSTR aHardwareUUID) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_CPUCount( 
-            /* [retval][out] */ ULONG *aCPUCount) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_CPUCount( 
-            /* [in] */ ULONG aCPUCount) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_CPUHotPlugEnabled( 
-            /* [retval][out] */ BOOL *aCPUHotPlugEnabled) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_CPUHotPlugEnabled( 
-            /* [in] */ BOOL aCPUHotPlugEnabled) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_MemorySize( 
-            /* [retval][out] */ ULONG *aMemorySize) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_MemorySize( 
-            /* [in] */ ULONG aMemorySize) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_MemoryBalloonSize( 
-            /* [retval][out] */ ULONG *aMemoryBalloonSize) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_MemoryBalloonSize( 
-            /* [in] */ ULONG aMemoryBalloonSize) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_PageFusionEnabled( 
-            /* [retval][out] */ BOOL *aPageFusionEnabled) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_PageFusionEnabled( 
-            /* [in] */ BOOL aPageFusionEnabled) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_VRAMSize( 
-            /* [retval][out] */ ULONG *aVRAMSize) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_VRAMSize( 
-            /* [in] */ ULONG aVRAMSize) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Accelerate3DEnabled( 
-            /* [retval][out] */ BOOL *aAccelerate3DEnabled) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_Accelerate3DEnabled( 
-            /* [in] */ BOOL aAccelerate3DEnabled) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Accelerate2DVideoEnabled( 
-            /* [retval][out] */ BOOL *aAccelerate2DVideoEnabled) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_Accelerate2DVideoEnabled( 
-            /* [in] */ BOOL aAccelerate2DVideoEnabled) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_MonitorCount( 
-            /* [retval][out] */ ULONG *aMonitorCount) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_MonitorCount( 
-            /* [in] */ ULONG aMonitorCount) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_BIOSSettings( 
-            /* [retval][out] */ IBIOSSettings **aBIOSSettings) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_FirmwareType( 
-            /* [retval][out] */ FirmwareType *aFirmwareType) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_FirmwareType( 
-            /* [in] */ FirmwareType aFirmwareType) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_PointingHidType( 
-            /* [retval][out] */ PointingHidType *aPointingHidType) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_PointingHidType( 
-            /* [in] */ PointingHidType aPointingHidType) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_KeyboardHidType( 
-            /* [retval][out] */ KeyboardHidType *aKeyboardHidType) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_KeyboardHidType( 
-            /* [in] */ KeyboardHidType aKeyboardHidType) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_HpetEnabled( 
-            /* [retval][out] */ BOOL *aHpetEnabled) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_HpetEnabled( 
-            /* [in] */ BOOL aHpetEnabled) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_SnapshotFolder( 
-            /* [retval][out] */ BSTR *aSnapshotFolder) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_SnapshotFolder( 
-            /* [in] */ BSTR aSnapshotFolder) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_VRDPServer( 
-            /* [retval][out] */ IVRDPServer **aVRDPServer) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_MediumAttachments( 
-            /* [retval][out] */ SAFEARRAY * *aMediumAttachments) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_USBController( 
-            /* [retval][out] */ IUSBController **aUSBController) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_AudioAdapter( 
-            /* [retval][out] */ IAudioAdapter **aAudioAdapter) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_StorageControllers( 
-            /* [retval][out] */ SAFEARRAY * *aStorageControllers) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_SettingsFilePath( 
-            /* [retval][out] */ BSTR *aSettingsFilePath) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_SettingsModified( 
-            /* [retval][out] */ BOOL *aSettingsModified) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_SessionState( 
-            /* [retval][out] */ SessionState *aSessionState) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_SessionType( 
-            /* [retval][out] */ BSTR *aSessionType) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_SessionPid( 
-            /* [retval][out] */ ULONG *aSessionPid) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_State( 
-            /* [retval][out] */ MachineState *aState) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_LastStateChange( 
-            /* [retval][out] */ LONG64 *aLastStateChange) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_StateFilePath( 
-            /* [retval][out] */ BSTR *aStateFilePath) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_LogFolder( 
-            /* [retval][out] */ BSTR *aLogFolder) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_CurrentSnapshot( 
-            /* [retval][out] */ ISnapshot **aCurrentSnapshot) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_SnapshotCount( 
-            /* [retval][out] */ ULONG *aSnapshotCount) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_CurrentStateModified( 
-            /* [retval][out] */ BOOL *aCurrentStateModified) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_SharedFolders( 
-            /* [retval][out] */ SAFEARRAY * *aSharedFolders) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_ClipboardMode( 
-            /* [retval][out] */ ClipboardMode *aClipboardMode) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_ClipboardMode( 
-            /* [in] */ ClipboardMode aClipboardMode) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_GuestPropertyNotificationPatterns( 
-            /* [retval][out] */ BSTR *aGuestPropertyNotificationPatterns) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_GuestPropertyNotificationPatterns( 
-            /* [in] */ BSTR aGuestPropertyNotificationPatterns) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_TeleporterEnabled( 
-            /* [retval][out] */ BOOL *aTeleporterEnabled) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_TeleporterEnabled( 
-            /* [in] */ BOOL aTeleporterEnabled) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_TeleporterPort( 
-            /* [retval][out] */ ULONG *aTeleporterPort) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_TeleporterPort( 
-            /* [in] */ ULONG aTeleporterPort) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_TeleporterAddress( 
-            /* [retval][out] */ BSTR *aTeleporterAddress) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_TeleporterAddress( 
-            /* [in] */ BSTR aTeleporterAddress) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_TeleporterPassword( 
-            /* [retval][out] */ BSTR *aTeleporterPassword) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_TeleporterPassword( 
-            /* [in] */ BSTR aTeleporterPassword) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_RTCUseUTC( 
-            /* [retval][out] */ BOOL *aRTCUseUTC) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_RTCUseUTC( 
-            /* [in] */ BOOL aRTCUseUTC) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_IoCacheEnabled( 
-            /* [retval][out] */ BOOL *aIoCacheEnabled) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_IoCacheEnabled( 
-            /* [in] */ BOOL aIoCacheEnabled) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_IoCacheSize( 
-            /* [retval][out] */ ULONG *aIoCacheSize) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_IoCacheSize( 
-            /* [in] */ ULONG aIoCacheSize) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_IoBandwidthMax( 
-            /* [retval][out] */ ULONG *aIoBandwidthMax) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_IoBandwidthMax( 
-            /* [in] */ ULONG aIoBandwidthMax) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetBootOrder( 
-            /* [in] */ ULONG aPosition,
-            /* [in] */ DeviceType aDevice) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetBootOrder( 
-            /* [in] */ ULONG aPosition,
-            /* [retval][out] */ DeviceType *aDevice) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE AttachDevice( 
-            /* [in] */ BSTR aName,
-            /* [in] */ LONG aControllerPort,
-            /* [in] */ LONG aDevice,
-            /* [in] */ DeviceType aType,
-            /* [in] */ BSTR aId) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE DetachDevice( 
-            /* [in] */ BSTR aName,
-            /* [in] */ LONG aControllerPort,
-            /* [in] */ LONG aDevice) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE PassthroughDevice( 
-            /* [in] */ BSTR aName,
-            /* [in] */ LONG aControllerPort,
-            /* [in] */ LONG aDevice,
-            /* [in] */ BOOL aPassthrough) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE MountMedium( 
-            /* [in] */ BSTR aName,
-            /* [in] */ LONG aControllerPort,
-            /* [in] */ LONG aDevice,
-            /* [in] */ BSTR aMedium,
-            /* [in] */ BOOL aForce) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetMedium( 
-            /* [in] */ BSTR aName,
-            /* [in] */ LONG aControllerPort,
-            /* [in] */ LONG aDevice,
-            /* [retval][out] */ IMedium **aMedium) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetMediumAttachmentsOfController( 
-            /* [in] */ BSTR aName,
-            /* [retval][out] */ SAFEARRAY * *aMediumAttachments) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetMediumAttachment( 
-            /* [in] */ BSTR aName,
-            /* [in] */ LONG aControllerPort,
-            /* [in] */ LONG aDevice,
-            /* [retval][out] */ IMediumAttachment **aAttachment) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetNetworkAdapter( 
-            /* [in] */ ULONG aSlot,
-            /* [retval][out] */ INetworkAdapter **aAdapter) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE AddStorageController( 
-            /* [in] */ BSTR aName,
-            /* [in] */ StorageBus aConnectionType,
-            /* [retval][out] */ IStorageController **aController) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetStorageControllerByName( 
-            /* [in] */ BSTR aName,
-            /* [retval][out] */ IStorageController **aStorageController) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetStorageControllerByInstance( 
-            /* [in] */ ULONG aInstance,
-            /* [retval][out] */ IStorageController **aStorageController) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE RemoveStorageController( 
-            /* [in] */ BSTR aName) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetSerialPort( 
-            /* [in] */ ULONG aSlot,
-            /* [retval][out] */ ISerialPort **aPort) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetParallelPort( 
-            /* [in] */ ULONG aSlot,
-            /* [retval][out] */ IParallelPort **aPort) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetExtraDataKeys( 
-            /* [retval][out] */ SAFEARRAY * *aValue) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetExtraData( 
-            /* [in] */ BSTR aKey,
-            /* [retval][out] */ BSTR *aValue) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetExtraData( 
-            /* [in] */ BSTR aKey,
-            /* [in] */ BSTR aValue) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetCPUProperty( 
-            /* [in] */ CPUPropertyType aProperty,
-            /* [retval][out] */ BOOL *aValue) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetCPUProperty( 
-            /* [in] */ CPUPropertyType aProperty,
-            /* [in] */ BOOL aValue) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetCPUIDLeaf( 
-            /* [in] */ ULONG aId,
-            /* [out] */ ULONG *aValEax,
-            /* [out] */ ULONG *aValEbx,
-            /* [out] */ ULONG *aValEcx,
-            /* [out] */ ULONG *aValEdx) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetCPUIDLeaf( 
-            /* [in] */ ULONG aId,
-            /* [in] */ ULONG aValEax,
-            /* [in] */ ULONG aValEbx,
-            /* [in] */ ULONG aValEcx,
-            /* [in] */ ULONG aValEdx) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE RemoveCPUIDLeaf( 
-            /* [in] */ ULONG aId) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE RemoveAllCPUIDLeaves( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetHWVirtExProperty( 
-            /* [in] */ HWVirtExPropertyType aProperty,
-            /* [retval][out] */ BOOL *aValue) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetHWVirtExProperty( 
-            /* [in] */ HWVirtExPropertyType aProperty,
-            /* [in] */ BOOL aValue) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SaveSettings( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE DiscardSettings( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE DeleteSettings( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE Export( 
-            /* [in] */ IAppliance *aAAppliance,
-            /* [retval][out] */ IVirtualSystemDescription **aADescription) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetSnapshot( 
-            /* [in] */ BSTR aId,
-            /* [retval][out] */ ISnapshot **aSnapshot) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE FindSnapshot( 
-            /* [in] */ BSTR aName,
-            /* [retval][out] */ ISnapshot **aSnapshot) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetCurrentSnapshot( 
-            /* [in] */ BSTR aId) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateSharedFolder( 
-            /* [in] */ BSTR aName,
-            /* [in] */ BSTR aHostPath,
-            /* [in] */ BOOL aWritable) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE RemoveSharedFolder( 
-            /* [in] */ BSTR aName) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CanShowConsoleWindow( 
-            /* [retval][out] */ BOOL *aCanShow) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE ShowConsoleWindow( 
-            /* [retval][out] */ ULONG64 *aWinId) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetGuestProperty( 
-            /* [in] */ BSTR aName,
-            /* [out] */ BSTR *aValue,
-            /* [out] */ ULONG64 *aTimestamp,
-            /* [out] */ BSTR *aFlags) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetGuestPropertyValue( 
-            /* [in] */ BSTR aProperty,
-            /* [retval][out] */ BSTR *aValue) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetGuestPropertyTimestamp( 
-            /* [in] */ BSTR aProperty,
-            /* [retval][out] */ ULONG64 *aValue) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetGuestProperty( 
-            /* [in] */ BSTR aProperty,
-            /* [in] */ BSTR aValue,
-            /* [in] */ BSTR aFlags) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetGuestPropertyValue( 
-            /* [in] */ BSTR aProperty,
-            /* [in] */ BSTR aValue) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE EnumerateGuestProperties( 
-            /* [in] */ BSTR aPatterns,
-            /* [out] */ SAFEARRAY * *aName,
-            /* [out] */ SAFEARRAY * *aValue,
-            /* [out] */ SAFEARRAY * *aTimestamp,
-            /* [out] */ SAFEARRAY * *aFlags) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE QuerySavedThumbnailSize( 
-            /* [in] */ ULONG aScreenId,
-            /* [out] */ ULONG *aSize,
-            /* [out] */ ULONG *aWidth,
-            /* [out] */ ULONG *aHeight) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE ReadSavedThumbnailToArray( 
-            /* [in] */ ULONG aScreenId,
-            /* [in] */ BOOL aBGR,
-            /* [out] */ ULONG *aWidth,
-            /* [out] */ ULONG *aHeight,
-            /* [retval][out] */ SAFEARRAY * *aData) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE QuerySavedScreenshotPNGSize( 
-            /* [in] */ ULONG aScreenId,
-            /* [out] */ ULONG *aSize,
-            /* [out] */ ULONG *aWidth,
-            /* [out] */ ULONG *aHeight) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE ReadSavedScreenshotPNGToArray( 
-            /* [in] */ ULONG aScreenId,
-            /* [out] */ ULONG *aWidth,
-            /* [out] */ ULONG *aHeight,
-            /* [retval][out] */ SAFEARRAY * *aData) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE HotPlugCPU( 
-            /* [in] */ ULONG aCpu) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE HotUnplugCPU( 
-            /* [in] */ ULONG aCpu) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetCPUStatus( 
-            /* [in] */ ULONG aCpu,
-            /* [retval][out] */ BOOL *aAttached) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE QueryLogFilename( 
-            /* [in] */ ULONG aIdx,
-            /* [retval][out] */ BSTR *aFilename) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE ReadLog( 
-            /* [in] */ ULONG aIdx,
-            /* [in] */ ULONG64 aOffset,
-            /* [in] */ ULONG64 aSize,
-            /* [retval][out] */ SAFEARRAY * *aData) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IMachineVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IMachine * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IMachine * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IMachine * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IMachine * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IMachine * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IMachine * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IMachine * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Parent )( 
-            IMachine * This,
-            /* [retval][out] */ IVirtualBox **aParent);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Accessible )( 
-            IMachine * This,
-            /* [retval][out] */ BOOL *aAccessible);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_AccessError )( 
-            IMachine * This,
-            /* [retval][out] */ IVirtualBoxErrorInfo **aAccessError);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Name )( 
-            IMachine * This,
-            /* [retval][out] */ BSTR *aName);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Name )( 
-            IMachine * This,
-            /* [in] */ BSTR aName);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Description )( 
-            IMachine * This,
-            /* [retval][out] */ BSTR *aDescription);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Description )( 
-            IMachine * This,
-            /* [in] */ BSTR aDescription);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Id )( 
-            IMachine * This,
-            /* [retval][out] */ BSTR *aId);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_OSTypeId )( 
-            IMachine * This,
-            /* [retval][out] */ BSTR *aOSTypeId);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_OSTypeId )( 
-            IMachine * This,
-            /* [in] */ BSTR aOSTypeId);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_HardwareVersion )( 
-            IMachine * This,
-            /* [retval][out] */ BSTR *aHardwareVersion);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_HardwareVersion )( 
-            IMachine * This,
-            /* [in] */ BSTR aHardwareVersion);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_HardwareUUID )( 
-            IMachine * This,
-            /* [retval][out] */ BSTR *aHardwareUUID);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_HardwareUUID )( 
-            IMachine * This,
-            /* [in] */ BSTR aHardwareUUID);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_CPUCount )( 
-            IMachine * This,
-            /* [retval][out] */ ULONG *aCPUCount);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_CPUCount )( 
-            IMachine * This,
-            /* [in] */ ULONG aCPUCount);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_CPUHotPlugEnabled )( 
-            IMachine * This,
-            /* [retval][out] */ BOOL *aCPUHotPlugEnabled);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_CPUHotPlugEnabled )( 
-            IMachine * This,
-            /* [in] */ BOOL aCPUHotPlugEnabled);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_MemorySize )( 
-            IMachine * This,
-            /* [retval][out] */ ULONG *aMemorySize);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_MemorySize )( 
-            IMachine * This,
-            /* [in] */ ULONG aMemorySize);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_MemoryBalloonSize )( 
-            IMachine * This,
-            /* [retval][out] */ ULONG *aMemoryBalloonSize);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_MemoryBalloonSize )( 
-            IMachine * This,
-            /* [in] */ ULONG aMemoryBalloonSize);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_PageFusionEnabled )( 
-            IMachine * This,
-            /* [retval][out] */ BOOL *aPageFusionEnabled);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_PageFusionEnabled )( 
-            IMachine * This,
-            /* [in] */ BOOL aPageFusionEnabled);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_VRAMSize )( 
-            IMachine * This,
-            /* [retval][out] */ ULONG *aVRAMSize);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_VRAMSize )( 
-            IMachine * This,
-            /* [in] */ ULONG aVRAMSize);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Accelerate3DEnabled )( 
-            IMachine * This,
-            /* [retval][out] */ BOOL *aAccelerate3DEnabled);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Accelerate3DEnabled )( 
-            IMachine * This,
-            /* [in] */ BOOL aAccelerate3DEnabled);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Accelerate2DVideoEnabled )( 
-            IMachine * This,
-            /* [retval][out] */ BOOL *aAccelerate2DVideoEnabled);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Accelerate2DVideoEnabled )( 
-            IMachine * This,
-            /* [in] */ BOOL aAccelerate2DVideoEnabled);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_MonitorCount )( 
-            IMachine * This,
-            /* [retval][out] */ ULONG *aMonitorCount);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_MonitorCount )( 
-            IMachine * This,
-            /* [in] */ ULONG aMonitorCount);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_BIOSSettings )( 
-            IMachine * This,
-            /* [retval][out] */ IBIOSSettings **aBIOSSettings);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_FirmwareType )( 
-            IMachine * This,
-            /* [retval][out] */ FirmwareType *aFirmwareType);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_FirmwareType )( 
-            IMachine * This,
-            /* [in] */ FirmwareType aFirmwareType);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_PointingHidType )( 
-            IMachine * This,
-            /* [retval][out] */ PointingHidType *aPointingHidType);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_PointingHidType )( 
-            IMachine * This,
-            /* [in] */ PointingHidType aPointingHidType);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_KeyboardHidType )( 
-            IMachine * This,
-            /* [retval][out] */ KeyboardHidType *aKeyboardHidType);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_KeyboardHidType )( 
-            IMachine * This,
-            /* [in] */ KeyboardHidType aKeyboardHidType);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_HpetEnabled )( 
-            IMachine * This,
-            /* [retval][out] */ BOOL *aHpetEnabled);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_HpetEnabled )( 
-            IMachine * This,
-            /* [in] */ BOOL aHpetEnabled);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_SnapshotFolder )( 
-            IMachine * This,
-            /* [retval][out] */ BSTR *aSnapshotFolder);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_SnapshotFolder )( 
-            IMachine * This,
-            /* [in] */ BSTR aSnapshotFolder);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_VRDPServer )( 
-            IMachine * This,
-            /* [retval][out] */ IVRDPServer **aVRDPServer);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_MediumAttachments )( 
-            IMachine * This,
-            /* [retval][out] */ SAFEARRAY * *aMediumAttachments);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_USBController )( 
-            IMachine * This,
-            /* [retval][out] */ IUSBController **aUSBController);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_AudioAdapter )( 
-            IMachine * This,
-            /* [retval][out] */ IAudioAdapter **aAudioAdapter);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_StorageControllers )( 
-            IMachine * This,
-            /* [retval][out] */ SAFEARRAY * *aStorageControllers);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_SettingsFilePath )( 
-            IMachine * This,
-            /* [retval][out] */ BSTR *aSettingsFilePath);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_SettingsModified )( 
-            IMachine * This,
-            /* [retval][out] */ BOOL *aSettingsModified);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_SessionState )( 
-            IMachine * This,
-            /* [retval][out] */ SessionState *aSessionState);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_SessionType )( 
-            IMachine * This,
-            /* [retval][out] */ BSTR *aSessionType);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_SessionPid )( 
-            IMachine * This,
-            /* [retval][out] */ ULONG *aSessionPid);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_State )( 
-            IMachine * This,
-            /* [retval][out] */ MachineState *aState);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_LastStateChange )( 
-            IMachine * This,
-            /* [retval][out] */ LONG64 *aLastStateChange);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_StateFilePath )( 
-            IMachine * This,
-            /* [retval][out] */ BSTR *aStateFilePath);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_LogFolder )( 
-            IMachine * This,
-            /* [retval][out] */ BSTR *aLogFolder);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_CurrentSnapshot )( 
-            IMachine * This,
-            /* [retval][out] */ ISnapshot **aCurrentSnapshot);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_SnapshotCount )( 
-            IMachine * This,
-            /* [retval][out] */ ULONG *aSnapshotCount);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_CurrentStateModified )( 
-            IMachine * This,
-            /* [retval][out] */ BOOL *aCurrentStateModified);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_SharedFolders )( 
-            IMachine * This,
-            /* [retval][out] */ SAFEARRAY * *aSharedFolders);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_ClipboardMode )( 
-            IMachine * This,
-            /* [retval][out] */ ClipboardMode *aClipboardMode);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_ClipboardMode )( 
-            IMachine * This,
-            /* [in] */ ClipboardMode aClipboardMode);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_GuestPropertyNotificationPatterns )( 
-            IMachine * This,
-            /* [retval][out] */ BSTR *aGuestPropertyNotificationPatterns);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_GuestPropertyNotificationPatterns )( 
-            IMachine * This,
-            /* [in] */ BSTR aGuestPropertyNotificationPatterns);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_TeleporterEnabled )( 
-            IMachine * This,
-            /* [retval][out] */ BOOL *aTeleporterEnabled);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_TeleporterEnabled )( 
-            IMachine * This,
-            /* [in] */ BOOL aTeleporterEnabled);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_TeleporterPort )( 
-            IMachine * This,
-            /* [retval][out] */ ULONG *aTeleporterPort);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_TeleporterPort )( 
-            IMachine * This,
-            /* [in] */ ULONG aTeleporterPort);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_TeleporterAddress )( 
-            IMachine * This,
-            /* [retval][out] */ BSTR *aTeleporterAddress);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_TeleporterAddress )( 
-            IMachine * This,
-            /* [in] */ BSTR aTeleporterAddress);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_TeleporterPassword )( 
-            IMachine * This,
-            /* [retval][out] */ BSTR *aTeleporterPassword);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_TeleporterPassword )( 
-            IMachine * This,
-            /* [in] */ BSTR aTeleporterPassword);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_RTCUseUTC )( 
-            IMachine * This,
-            /* [retval][out] */ BOOL *aRTCUseUTC);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_RTCUseUTC )( 
-            IMachine * This,
-            /* [in] */ BOOL aRTCUseUTC);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_IoCacheEnabled )( 
-            IMachine * This,
-            /* [retval][out] */ BOOL *aIoCacheEnabled);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_IoCacheEnabled )( 
-            IMachine * This,
-            /* [in] */ BOOL aIoCacheEnabled);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_IoCacheSize )( 
-            IMachine * This,
-            /* [retval][out] */ ULONG *aIoCacheSize);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_IoCacheSize )( 
-            IMachine * This,
-            /* [in] */ ULONG aIoCacheSize);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_IoBandwidthMax )( 
-            IMachine * This,
-            /* [retval][out] */ ULONG *aIoBandwidthMax);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_IoBandwidthMax )( 
-            IMachine * This,
-            /* [in] */ ULONG aIoBandwidthMax);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetBootOrder )( 
-            IMachine * This,
-            /* [in] */ ULONG aPosition,
-            /* [in] */ DeviceType aDevice);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetBootOrder )( 
-            IMachine * This,
-            /* [in] */ ULONG aPosition,
-            /* [retval][out] */ DeviceType *aDevice);
-        
-        HRESULT ( STDMETHODCALLTYPE *AttachDevice )( 
-            IMachine * This,
-            /* [in] */ BSTR aName,
-            /* [in] */ LONG aControllerPort,
-            /* [in] */ LONG aDevice,
-            /* [in] */ DeviceType aType,
-            /* [in] */ BSTR aId);
-        
-        HRESULT ( STDMETHODCALLTYPE *DetachDevice )( 
-            IMachine * This,
-            /* [in] */ BSTR aName,
-            /* [in] */ LONG aControllerPort,
-            /* [in] */ LONG aDevice);
-        
-        HRESULT ( STDMETHODCALLTYPE *PassthroughDevice )( 
-            IMachine * This,
-            /* [in] */ BSTR aName,
-            /* [in] */ LONG aControllerPort,
-            /* [in] */ LONG aDevice,
-            /* [in] */ BOOL aPassthrough);
-        
-        HRESULT ( STDMETHODCALLTYPE *MountMedium )( 
-            IMachine * This,
-            /* [in] */ BSTR aName,
-            /* [in] */ LONG aControllerPort,
-            /* [in] */ LONG aDevice,
-            /* [in] */ BSTR aMedium,
-            /* [in] */ BOOL aForce);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetMedium )( 
-            IMachine * This,
-            /* [in] */ BSTR aName,
-            /* [in] */ LONG aControllerPort,
-            /* [in] */ LONG aDevice,
-            /* [retval][out] */ IMedium **aMedium);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetMediumAttachmentsOfController )( 
-            IMachine * This,
-            /* [in] */ BSTR aName,
-            /* [retval][out] */ SAFEARRAY * *aMediumAttachments);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetMediumAttachment )( 
-            IMachine * This,
-            /* [in] */ BSTR aName,
-            /* [in] */ LONG aControllerPort,
-            /* [in] */ LONG aDevice,
-            /* [retval][out] */ IMediumAttachment **aAttachment);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetNetworkAdapter )( 
-            IMachine * This,
-            /* [in] */ ULONG aSlot,
-            /* [retval][out] */ INetworkAdapter **aAdapter);
-        
-        HRESULT ( STDMETHODCALLTYPE *AddStorageController )( 
-            IMachine * This,
-            /* [in] */ BSTR aName,
-            /* [in] */ StorageBus aConnectionType,
-            /* [retval][out] */ IStorageController **aController);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetStorageControllerByName )( 
-            IMachine * This,
-            /* [in] */ BSTR aName,
-            /* [retval][out] */ IStorageController **aStorageController);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetStorageControllerByInstance )( 
-            IMachine * This,
-            /* [in] */ ULONG aInstance,
-            /* [retval][out] */ IStorageController **aStorageController);
-        
-        HRESULT ( STDMETHODCALLTYPE *RemoveStorageController )( 
-            IMachine * This,
-            /* [in] */ BSTR aName);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetSerialPort )( 
-            IMachine * This,
-            /* [in] */ ULONG aSlot,
-            /* [retval][out] */ ISerialPort **aPort);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetParallelPort )( 
-            IMachine * This,
-            /* [in] */ ULONG aSlot,
-            /* [retval][out] */ IParallelPort **aPort);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetExtraDataKeys )( 
-            IMachine * This,
-            /* [retval][out] */ SAFEARRAY * *aValue);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetExtraData )( 
-            IMachine * This,
-            /* [in] */ BSTR aKey,
-            /* [retval][out] */ BSTR *aValue);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetExtraData )( 
-            IMachine * This,
-            /* [in] */ BSTR aKey,
-            /* [in] */ BSTR aValue);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetCPUProperty )( 
-            IMachine * This,
-            /* [in] */ CPUPropertyType aProperty,
-            /* [retval][out] */ BOOL *aValue);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetCPUProperty )( 
-            IMachine * This,
-            /* [in] */ CPUPropertyType aProperty,
-            /* [in] */ BOOL aValue);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetCPUIDLeaf )( 
-            IMachine * This,
-            /* [in] */ ULONG aId,
-            /* [out] */ ULONG *aValEax,
-            /* [out] */ ULONG *aValEbx,
-            /* [out] */ ULONG *aValEcx,
-            /* [out] */ ULONG *aValEdx);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetCPUIDLeaf )( 
-            IMachine * This,
-            /* [in] */ ULONG aId,
-            /* [in] */ ULONG aValEax,
-            /* [in] */ ULONG aValEbx,
-            /* [in] */ ULONG aValEcx,
-            /* [in] */ ULONG aValEdx);
-        
-        HRESULT ( STDMETHODCALLTYPE *RemoveCPUIDLeaf )( 
-            IMachine * This,
-            /* [in] */ ULONG aId);
-        
-        HRESULT ( STDMETHODCALLTYPE *RemoveAllCPUIDLeaves )( 
-            IMachine * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetHWVirtExProperty )( 
-            IMachine * This,
-            /* [in] */ HWVirtExPropertyType aProperty,
-            /* [retval][out] */ BOOL *aValue);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetHWVirtExProperty )( 
-            IMachine * This,
-            /* [in] */ HWVirtExPropertyType aProperty,
-            /* [in] */ BOOL aValue);
-        
-        HRESULT ( STDMETHODCALLTYPE *SaveSettings )( 
-            IMachine * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *DiscardSettings )( 
-            IMachine * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *DeleteSettings )( 
-            IMachine * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *Export )( 
-            IMachine * This,
-            /* [in] */ IAppliance *aAAppliance,
-            /* [retval][out] */ IVirtualSystemDescription **aADescription);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetSnapshot )( 
-            IMachine * This,
-            /* [in] */ BSTR aId,
-            /* [retval][out] */ ISnapshot **aSnapshot);
-        
-        HRESULT ( STDMETHODCALLTYPE *FindSnapshot )( 
-            IMachine * This,
-            /* [in] */ BSTR aName,
-            /* [retval][out] */ ISnapshot **aSnapshot);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetCurrentSnapshot )( 
-            IMachine * This,
-            /* [in] */ BSTR aId);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateSharedFolder )( 
-            IMachine * This,
-            /* [in] */ BSTR aName,
-            /* [in] */ BSTR aHostPath,
-            /* [in] */ BOOL aWritable);
-        
-        HRESULT ( STDMETHODCALLTYPE *RemoveSharedFolder )( 
-            IMachine * This,
-            /* [in] */ BSTR aName);
-        
-        HRESULT ( STDMETHODCALLTYPE *CanShowConsoleWindow )( 
-            IMachine * This,
-            /* [retval][out] */ BOOL *aCanShow);
-        
-        HRESULT ( STDMETHODCALLTYPE *ShowConsoleWindow )( 
-            IMachine * This,
-            /* [retval][out] */ ULONG64 *aWinId);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetGuestProperty )( 
-            IMachine * This,
-            /* [in] */ BSTR aName,
-            /* [out] */ BSTR *aValue,
-            /* [out] */ ULONG64 *aTimestamp,
-            /* [out] */ BSTR *aFlags);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetGuestPropertyValue )( 
-            IMachine * This,
-            /* [in] */ BSTR aProperty,
-            /* [retval][out] */ BSTR *aValue);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetGuestPropertyTimestamp )( 
-            IMachine * This,
-            /* [in] */ BSTR aProperty,
-            /* [retval][out] */ ULONG64 *aValue);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetGuestProperty )( 
-            IMachine * This,
-            /* [in] */ BSTR aProperty,
-            /* [in] */ BSTR aValue,
-            /* [in] */ BSTR aFlags);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetGuestPropertyValue )( 
-            IMachine * This,
-            /* [in] */ BSTR aProperty,
-            /* [in] */ BSTR aValue);
-        
-        HRESULT ( STDMETHODCALLTYPE *EnumerateGuestProperties )( 
-            IMachine * This,
-            /* [in] */ BSTR aPatterns,
-            /* [out] */ SAFEARRAY * *aName,
-            /* [out] */ SAFEARRAY * *aValue,
-            /* [out] */ SAFEARRAY * *aTimestamp,
-            /* [out] */ SAFEARRAY * *aFlags);
-        
-        HRESULT ( STDMETHODCALLTYPE *QuerySavedThumbnailSize )( 
-            IMachine * This,
-            /* [in] */ ULONG aScreenId,
-            /* [out] */ ULONG *aSize,
-            /* [out] */ ULONG *aWidth,
-            /* [out] */ ULONG *aHeight);
-        
-        HRESULT ( STDMETHODCALLTYPE *ReadSavedThumbnailToArray )( 
-            IMachine * This,
-            /* [in] */ ULONG aScreenId,
-            /* [in] */ BOOL aBGR,
-            /* [out] */ ULONG *aWidth,
-            /* [out] */ ULONG *aHeight,
-            /* [retval][out] */ SAFEARRAY * *aData);
-        
-        HRESULT ( STDMETHODCALLTYPE *QuerySavedScreenshotPNGSize )( 
-            IMachine * This,
-            /* [in] */ ULONG aScreenId,
-            /* [out] */ ULONG *aSize,
-            /* [out] */ ULONG *aWidth,
-            /* [out] */ ULONG *aHeight);
-        
-        HRESULT ( STDMETHODCALLTYPE *ReadSavedScreenshotPNGToArray )( 
-            IMachine * This,
-            /* [in] */ ULONG aScreenId,
-            /* [out] */ ULONG *aWidth,
-            /* [out] */ ULONG *aHeight,
-            /* [retval][out] */ SAFEARRAY * *aData);
-        
-        HRESULT ( STDMETHODCALLTYPE *HotPlugCPU )( 
-            IMachine * This,
-            /* [in] */ ULONG aCpu);
-        
-        HRESULT ( STDMETHODCALLTYPE *HotUnplugCPU )( 
-            IMachine * This,
-            /* [in] */ ULONG aCpu);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetCPUStatus )( 
-            IMachine * This,
-            /* [in] */ ULONG aCpu,
-            /* [retval][out] */ BOOL *aAttached);
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryLogFilename )( 
-            IMachine * This,
-            /* [in] */ ULONG aIdx,
-            /* [retval][out] */ BSTR *aFilename);
-        
-        HRESULT ( STDMETHODCALLTYPE *ReadLog )( 
-            IMachine * This,
-            /* [in] */ ULONG aIdx,
-            /* [in] */ ULONG64 aOffset,
-            /* [in] */ ULONG64 aSize,
-            /* [retval][out] */ SAFEARRAY * *aData);
-        
-        END_INTERFACE
-    } IMachineVtbl;
-
-    interface IMachine
-    {
-        CONST_VTBL struct IMachineVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IMachine_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IMachine_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IMachine_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IMachine_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IMachine_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IMachine_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IMachine_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IMachine_get_Parent(This,aParent)	\
-    (This)->lpVtbl -> get_Parent(This,aParent)
-
-#define IMachine_get_Accessible(This,aAccessible)	\
-    (This)->lpVtbl -> get_Accessible(This,aAccessible)
-
-#define IMachine_get_AccessError(This,aAccessError)	\
-    (This)->lpVtbl -> get_AccessError(This,aAccessError)
-
-#define IMachine_get_Name(This,aName)	\
-    (This)->lpVtbl -> get_Name(This,aName)
-
-#define IMachine_put_Name(This,aName)	\
-    (This)->lpVtbl -> put_Name(This,aName)
-
-#define IMachine_get_Description(This,aDescription)	\
-    (This)->lpVtbl -> get_Description(This,aDescription)
-
-#define IMachine_put_Description(This,aDescription)	\
-    (This)->lpVtbl -> put_Description(This,aDescription)
-
-#define IMachine_get_Id(This,aId)	\
-    (This)->lpVtbl -> get_Id(This,aId)
-
-#define IMachine_get_OSTypeId(This,aOSTypeId)	\
-    (This)->lpVtbl -> get_OSTypeId(This,aOSTypeId)
-
-#define IMachine_put_OSTypeId(This,aOSTypeId)	\
-    (This)->lpVtbl -> put_OSTypeId(This,aOSTypeId)
-
-#define IMachine_get_HardwareVersion(This,aHardwareVersion)	\
-    (This)->lpVtbl -> get_HardwareVersion(This,aHardwareVersion)
-
-#define IMachine_put_HardwareVersion(This,aHardwareVersion)	\
-    (This)->lpVtbl -> put_HardwareVersion(This,aHardwareVersion)
-
-#define IMachine_get_HardwareUUID(This,aHardwareUUID)	\
-    (This)->lpVtbl -> get_HardwareUUID(This,aHardwareUUID)
-
-#define IMachine_put_HardwareUUID(This,aHardwareUUID)	\
-    (This)->lpVtbl -> put_HardwareUUID(This,aHardwareUUID)
-
-#define IMachine_get_CPUCount(This,aCPUCount)	\
-    (This)->lpVtbl -> get_CPUCount(This,aCPUCount)
-
-#define IMachine_put_CPUCount(This,aCPUCount)	\
-    (This)->lpVtbl -> put_CPUCount(This,aCPUCount)
-
-#define IMachine_get_CPUHotPlugEnabled(This,aCPUHotPlugEnabled)	\
-    (This)->lpVtbl -> get_CPUHotPlugEnabled(This,aCPUHotPlugEnabled)
-
-#define IMachine_put_CPUHotPlugEnabled(This,aCPUHotPlugEnabled)	\
-    (This)->lpVtbl -> put_CPUHotPlugEnabled(This,aCPUHotPlugEnabled)
-
-#define IMachine_get_MemorySize(This,aMemorySize)	\
-    (This)->lpVtbl -> get_MemorySize(This,aMemorySize)
-
-#define IMachine_put_MemorySize(This,aMemorySize)	\
-    (This)->lpVtbl -> put_MemorySize(This,aMemorySize)
-
-#define IMachine_get_MemoryBalloonSize(This,aMemoryBalloonSize)	\
-    (This)->lpVtbl -> get_MemoryBalloonSize(This,aMemoryBalloonSize)
-
-#define IMachine_put_MemoryBalloonSize(This,aMemoryBalloonSize)	\
-    (This)->lpVtbl -> put_MemoryBalloonSize(This,aMemoryBalloonSize)
-
-#define IMachine_get_PageFusionEnabled(This,aPageFusionEnabled)	\
-    (This)->lpVtbl -> get_PageFusionEnabled(This,aPageFusionEnabled)
-
-#define IMachine_put_PageFusionEnabled(This,aPageFusionEnabled)	\
-    (This)->lpVtbl -> put_PageFusionEnabled(This,aPageFusionEnabled)
-
-#define IMachine_get_VRAMSize(This,aVRAMSize)	\
-    (This)->lpVtbl -> get_VRAMSize(This,aVRAMSize)
-
-#define IMachine_put_VRAMSize(This,aVRAMSize)	\
-    (This)->lpVtbl -> put_VRAMSize(This,aVRAMSize)
-
-#define IMachine_get_Accelerate3DEnabled(This,aAccelerate3DEnabled)	\
-    (This)->lpVtbl -> get_Accelerate3DEnabled(This,aAccelerate3DEnabled)
-
-#define IMachine_put_Accelerate3DEnabled(This,aAccelerate3DEnabled)	\
-    (This)->lpVtbl -> put_Accelerate3DEnabled(This,aAccelerate3DEnabled)
-
-#define IMachine_get_Accelerate2DVideoEnabled(This,aAccelerate2DVideoEnabled)	\
-    (This)->lpVtbl -> get_Accelerate2DVideoEnabled(This,aAccelerate2DVideoEnabled)
-
-#define IMachine_put_Accelerate2DVideoEnabled(This,aAccelerate2DVideoEnabled)	\
-    (This)->lpVtbl -> put_Accelerate2DVideoEnabled(This,aAccelerate2DVideoEnabled)
-
-#define IMachine_get_MonitorCount(This,aMonitorCount)	\
-    (This)->lpVtbl -> get_MonitorCount(This,aMonitorCount)
-
-#define IMachine_put_MonitorCount(This,aMonitorCount)	\
-    (This)->lpVtbl -> put_MonitorCount(This,aMonitorCount)
-
-#define IMachine_get_BIOSSettings(This,aBIOSSettings)	\
-    (This)->lpVtbl -> get_BIOSSettings(This,aBIOSSettings)
-
-#define IMachine_get_FirmwareType(This,aFirmwareType)	\
-    (This)->lpVtbl -> get_FirmwareType(This,aFirmwareType)
-
-#define IMachine_put_FirmwareType(This,aFirmwareType)	\
-    (This)->lpVtbl -> put_FirmwareType(This,aFirmwareType)
-
-#define IMachine_get_PointingHidType(This,aPointingHidType)	\
-    (This)->lpVtbl -> get_PointingHidType(This,aPointingHidType)
-
-#define IMachine_put_PointingHidType(This,aPointingHidType)	\
-    (This)->lpVtbl -> put_PointingHidType(This,aPointingHidType)
-
-#define IMachine_get_KeyboardHidType(This,aKeyboardHidType)	\
-    (This)->lpVtbl -> get_KeyboardHidType(This,aKeyboardHidType)
-
-#define IMachine_put_KeyboardHidType(This,aKeyboardHidType)	\
-    (This)->lpVtbl -> put_KeyboardHidType(This,aKeyboardHidType)
-
-#define IMachine_get_HpetEnabled(This,aHpetEnabled)	\
-    (This)->lpVtbl -> get_HpetEnabled(This,aHpetEnabled)
-
-#define IMachine_put_HpetEnabled(This,aHpetEnabled)	\
-    (This)->lpVtbl -> put_HpetEnabled(This,aHpetEnabled)
-
-#define IMachine_get_SnapshotFolder(This,aSnapshotFolder)	\
-    (This)->lpVtbl -> get_SnapshotFolder(This,aSnapshotFolder)
-
-#define IMachine_put_SnapshotFolder(This,aSnapshotFolder)	\
-    (This)->lpVtbl -> put_SnapshotFolder(This,aSnapshotFolder)
-
-#define IMachine_get_VRDPServer(This,aVRDPServer)	\
-    (This)->lpVtbl -> get_VRDPServer(This,aVRDPServer)
-
-#define IMachine_get_MediumAttachments(This,aMediumAttachments)	\
-    (This)->lpVtbl -> get_MediumAttachments(This,aMediumAttachments)
-
-#define IMachine_get_USBController(This,aUSBController)	\
-    (This)->lpVtbl -> get_USBController(This,aUSBController)
-
-#define IMachine_get_AudioAdapter(This,aAudioAdapter)	\
-    (This)->lpVtbl -> get_AudioAdapter(This,aAudioAdapter)
-
-#define IMachine_get_StorageControllers(This,aStorageControllers)	\
-    (This)->lpVtbl -> get_StorageControllers(This,aStorageControllers)
-
-#define IMachine_get_SettingsFilePath(This,aSettingsFilePath)	\
-    (This)->lpVtbl -> get_SettingsFilePath(This,aSettingsFilePath)
-
-#define IMachine_get_SettingsModified(This,aSettingsModified)	\
-    (This)->lpVtbl -> get_SettingsModified(This,aSettingsModified)
-
-#define IMachine_get_SessionState(This,aSessionState)	\
-    (This)->lpVtbl -> get_SessionState(This,aSessionState)
-
-#define IMachine_get_SessionType(This,aSessionType)	\
-    (This)->lpVtbl -> get_SessionType(This,aSessionType)
-
-#define IMachine_get_SessionPid(This,aSessionPid)	\
-    (This)->lpVtbl -> get_SessionPid(This,aSessionPid)
-
-#define IMachine_get_State(This,aState)	\
-    (This)->lpVtbl -> get_State(This,aState)
-
-#define IMachine_get_LastStateChange(This,aLastStateChange)	\
-    (This)->lpVtbl -> get_LastStateChange(This,aLastStateChange)
-
-#define IMachine_get_StateFilePath(This,aStateFilePath)	\
-    (This)->lpVtbl -> get_StateFilePath(This,aStateFilePath)
-
-#define IMachine_get_LogFolder(This,aLogFolder)	\
-    (This)->lpVtbl -> get_LogFolder(This,aLogFolder)
-
-#define IMachine_get_CurrentSnapshot(This,aCurrentSnapshot)	\
-    (This)->lpVtbl -> get_CurrentSnapshot(This,aCurrentSnapshot)
-
-#define IMachine_get_SnapshotCount(This,aSnapshotCount)	\
-    (This)->lpVtbl -> get_SnapshotCount(This,aSnapshotCount)
-
-#define IMachine_get_CurrentStateModified(This,aCurrentStateModified)	\
-    (This)->lpVtbl -> get_CurrentStateModified(This,aCurrentStateModified)
-
-#define IMachine_get_SharedFolders(This,aSharedFolders)	\
-    (This)->lpVtbl -> get_SharedFolders(This,aSharedFolders)
-
-#define IMachine_get_ClipboardMode(This,aClipboardMode)	\
-    (This)->lpVtbl -> get_ClipboardMode(This,aClipboardMode)
-
-#define IMachine_put_ClipboardMode(This,aClipboardMode)	\
-    (This)->lpVtbl -> put_ClipboardMode(This,aClipboardMode)
-
-#define IMachine_get_GuestPropertyNotificationPatterns(This,aGuestPropertyNotificationPatterns)	\
-    (This)->lpVtbl -> get_GuestPropertyNotificationPatterns(This,aGuestPropertyNotificationPatterns)
-
-#define IMachine_put_GuestPropertyNotificationPatterns(This,aGuestPropertyNotificationPatterns)	\
-    (This)->lpVtbl -> put_GuestPropertyNotificationPatterns(This,aGuestPropertyNotificationPatterns)
-
-#define IMachine_get_TeleporterEnabled(This,aTeleporterEnabled)	\
-    (This)->lpVtbl -> get_TeleporterEnabled(This,aTeleporterEnabled)
-
-#define IMachine_put_TeleporterEnabled(This,aTeleporterEnabled)	\
-    (This)->lpVtbl -> put_TeleporterEnabled(This,aTeleporterEnabled)
-
-#define IMachine_get_TeleporterPort(This,aTeleporterPort)	\
-    (This)->lpVtbl -> get_TeleporterPort(This,aTeleporterPort)
-
-#define IMachine_put_TeleporterPort(This,aTeleporterPort)	\
-    (This)->lpVtbl -> put_TeleporterPort(This,aTeleporterPort)
-
-#define IMachine_get_TeleporterAddress(This,aTeleporterAddress)	\
-    (This)->lpVtbl -> get_TeleporterAddress(This,aTeleporterAddress)
-
-#define IMachine_put_TeleporterAddress(This,aTeleporterAddress)	\
-    (This)->lpVtbl -> put_TeleporterAddress(This,aTeleporterAddress)
-
-#define IMachine_get_TeleporterPassword(This,aTeleporterPassword)	\
-    (This)->lpVtbl -> get_TeleporterPassword(This,aTeleporterPassword)
-
-#define IMachine_put_TeleporterPassword(This,aTeleporterPassword)	\
-    (This)->lpVtbl -> put_TeleporterPassword(This,aTeleporterPassword)
-
-#define IMachine_get_RTCUseUTC(This,aRTCUseUTC)	\
-    (This)->lpVtbl -> get_RTCUseUTC(This,aRTCUseUTC)
-
-#define IMachine_put_RTCUseUTC(This,aRTCUseUTC)	\
-    (This)->lpVtbl -> put_RTCUseUTC(This,aRTCUseUTC)
-
-#define IMachine_get_IoCacheEnabled(This,aIoCacheEnabled)	\
-    (This)->lpVtbl -> get_IoCacheEnabled(This,aIoCacheEnabled)
-
-#define IMachine_put_IoCacheEnabled(This,aIoCacheEnabled)	\
-    (This)->lpVtbl -> put_IoCacheEnabled(This,aIoCacheEnabled)
-
-#define IMachine_get_IoCacheSize(This,aIoCacheSize)	\
-    (This)->lpVtbl -> get_IoCacheSize(This,aIoCacheSize)
-
-#define IMachine_put_IoCacheSize(This,aIoCacheSize)	\
-    (This)->lpVtbl -> put_IoCacheSize(This,aIoCacheSize)
-
-#define IMachine_get_IoBandwidthMax(This,aIoBandwidthMax)	\
-    (This)->lpVtbl -> get_IoBandwidthMax(This,aIoBandwidthMax)
-
-#define IMachine_put_IoBandwidthMax(This,aIoBandwidthMax)	\
-    (This)->lpVtbl -> put_IoBandwidthMax(This,aIoBandwidthMax)
-
-#define IMachine_SetBootOrder(This,aPosition,aDevice)	\
-    (This)->lpVtbl -> SetBootOrder(This,aPosition,aDevice)
-
-#define IMachine_GetBootOrder(This,aPosition,aDevice)	\
-    (This)->lpVtbl -> GetBootOrder(This,aPosition,aDevice)
-
-#define IMachine_AttachDevice(This,aName,aControllerPort,aDevice,aType,aId)	\
-    (This)->lpVtbl -> AttachDevice(This,aName,aControllerPort,aDevice,aType,aId)
-
-#define IMachine_DetachDevice(This,aName,aControllerPort,aDevice)	\
-    (This)->lpVtbl -> DetachDevice(This,aName,aControllerPort,aDevice)
-
-#define IMachine_PassthroughDevice(This,aName,aControllerPort,aDevice,aPassthrough)	\
-    (This)->lpVtbl -> PassthroughDevice(This,aName,aControllerPort,aDevice,aPassthrough)
-
-#define IMachine_MountMedium(This,aName,aControllerPort,aDevice,aMedium,aForce)	\
-    (This)->lpVtbl -> MountMedium(This,aName,aControllerPort,aDevice,aMedium,aForce)
-
-#define IMachine_GetMedium(This,aName,aControllerPort,aDevice,aMedium)	\
-    (This)->lpVtbl -> GetMedium(This,aName,aControllerPort,aDevice,aMedium)
-
-#define IMachine_GetMediumAttachmentsOfController(This,aName,aMediumAttachments)	\
-    (This)->lpVtbl -> GetMediumAttachmentsOfController(This,aName,aMediumAttachments)
-
-#define IMachine_GetMediumAttachment(This,aName,aControllerPort,aDevice,aAttachment)	\
-    (This)->lpVtbl -> GetMediumAttachment(This,aName,aControllerPort,aDevice,aAttachment)
-
-#define IMachine_GetNetworkAdapter(This,aSlot,aAdapter)	\
-    (This)->lpVtbl -> GetNetworkAdapter(This,aSlot,aAdapter)
-
-#define IMachine_AddStorageController(This,aName,aConnectionType,aController)	\
-    (This)->lpVtbl -> AddStorageController(This,aName,aConnectionType,aController)
-
-#define IMachine_GetStorageControllerByName(This,aName,aStorageController)	\
-    (This)->lpVtbl -> GetStorageControllerByName(This,aName,aStorageController)
-
-#define IMachine_GetStorageControllerByInstance(This,aInstance,aStorageController)	\
-    (This)->lpVtbl -> GetStorageControllerByInstance(This,aInstance,aStorageController)
-
-#define IMachine_RemoveStorageController(This,aName)	\
-    (This)->lpVtbl -> RemoveStorageController(This,aName)
-
-#define IMachine_GetSerialPort(This,aSlot,aPort)	\
-    (This)->lpVtbl -> GetSerialPort(This,aSlot,aPort)
-
-#define IMachine_GetParallelPort(This,aSlot,aPort)	\
-    (This)->lpVtbl -> GetParallelPort(This,aSlot,aPort)
-
-#define IMachine_GetExtraDataKeys(This,aValue)	\
-    (This)->lpVtbl -> GetExtraDataKeys(This,aValue)
-
-#define IMachine_GetExtraData(This,aKey,aValue)	\
-    (This)->lpVtbl -> GetExtraData(This,aKey,aValue)
-
-#define IMachine_SetExtraData(This,aKey,aValue)	\
-    (This)->lpVtbl -> SetExtraData(This,aKey,aValue)
-
-#define IMachine_GetCPUProperty(This,aProperty,aValue)	\
-    (This)->lpVtbl -> GetCPUProperty(This,aProperty,aValue)
-
-#define IMachine_SetCPUProperty(This,aProperty,aValue)	\
-    (This)->lpVtbl -> SetCPUProperty(This,aProperty,aValue)
-
-#define IMachine_GetCPUIDLeaf(This,aId,aValEax,aValEbx,aValEcx,aValEdx)	\
-    (This)->lpVtbl -> GetCPUIDLeaf(This,aId,aValEax,aValEbx,aValEcx,aValEdx)
-
-#define IMachine_SetCPUIDLeaf(This,aId,aValEax,aValEbx,aValEcx,aValEdx)	\
-    (This)->lpVtbl -> SetCPUIDLeaf(This,aId,aValEax,aValEbx,aValEcx,aValEdx)
-
-#define IMachine_RemoveCPUIDLeaf(This,aId)	\
-    (This)->lpVtbl -> RemoveCPUIDLeaf(This,aId)
-
-#define IMachine_RemoveAllCPUIDLeaves(This)	\
-    (This)->lpVtbl -> RemoveAllCPUIDLeaves(This)
-
-#define IMachine_GetHWVirtExProperty(This,aProperty,aValue)	\
-    (This)->lpVtbl -> GetHWVirtExProperty(This,aProperty,aValue)
-
-#define IMachine_SetHWVirtExProperty(This,aProperty,aValue)	\
-    (This)->lpVtbl -> SetHWVirtExProperty(This,aProperty,aValue)
-
-#define IMachine_SaveSettings(This)	\
-    (This)->lpVtbl -> SaveSettings(This)
-
-#define IMachine_DiscardSettings(This)	\
-    (This)->lpVtbl -> DiscardSettings(This)
-
-#define IMachine_DeleteSettings(This)	\
-    (This)->lpVtbl -> DeleteSettings(This)
-
-#define IMachine_Export(This,aAAppliance,aADescription)	\
-    (This)->lpVtbl -> Export(This,aAAppliance,aADescription)
-
-#define IMachine_GetSnapshot(This,aId,aSnapshot)	\
-    (This)->lpVtbl -> GetSnapshot(This,aId,aSnapshot)
-
-#define IMachine_FindSnapshot(This,aName,aSnapshot)	\
-    (This)->lpVtbl -> FindSnapshot(This,aName,aSnapshot)
-
-#define IMachine_SetCurrentSnapshot(This,aId)	\
-    (This)->lpVtbl -> SetCurrentSnapshot(This,aId)
-
-#define IMachine_CreateSharedFolder(This,aName,aHostPath,aWritable)	\
-    (This)->lpVtbl -> CreateSharedFolder(This,aName,aHostPath,aWritable)
-
-#define IMachine_RemoveSharedFolder(This,aName)	\
-    (This)->lpVtbl -> RemoveSharedFolder(This,aName)
-
-#define IMachine_CanShowConsoleWindow(This,aCanShow)	\
-    (This)->lpVtbl -> CanShowConsoleWindow(This,aCanShow)
-
-#define IMachine_ShowConsoleWindow(This,aWinId)	\
-    (This)->lpVtbl -> ShowConsoleWindow(This,aWinId)
-
-#define IMachine_GetGuestProperty(This,aName,aValue,aTimestamp,aFlags)	\
-    (This)->lpVtbl -> GetGuestProperty(This,aName,aValue,aTimestamp,aFlags)
-
-#define IMachine_GetGuestPropertyValue(This,aProperty,aValue)	\
-    (This)->lpVtbl -> GetGuestPropertyValue(This,aProperty,aValue)
-
-#define IMachine_GetGuestPropertyTimestamp(This,aProperty,aValue)	\
-    (This)->lpVtbl -> GetGuestPropertyTimestamp(This,aProperty,aValue)
-
-#define IMachine_SetGuestProperty(This,aProperty,aValue,aFlags)	\
-    (This)->lpVtbl -> SetGuestProperty(This,aProperty,aValue,aFlags)
-
-#define IMachine_SetGuestPropertyValue(This,aProperty,aValue)	\
-    (This)->lpVtbl -> SetGuestPropertyValue(This,aProperty,aValue)
-
-#define IMachine_EnumerateGuestProperties(This,aPatterns,aName,aValue,aTimestamp,aFlags)	\
-    (This)->lpVtbl -> EnumerateGuestProperties(This,aPatterns,aName,aValue,aTimestamp,aFlags)
-
-#define IMachine_QuerySavedThumbnailSize(This,aScreenId,aSize,aWidth,aHeight)	\
-    (This)->lpVtbl -> QuerySavedThumbnailSize(This,aScreenId,aSize,aWidth,aHeight)
-
-#define IMachine_ReadSavedThumbnailToArray(This,aScreenId,aBGR,aWidth,aHeight,aData)	\
-    (This)->lpVtbl -> ReadSavedThumbnailToArray(This,aScreenId,aBGR,aWidth,aHeight,aData)
-
-#define IMachine_QuerySavedScreenshotPNGSize(This,aScreenId,aSize,aWidth,aHeight)	\
-    (This)->lpVtbl -> QuerySavedScreenshotPNGSize(This,aScreenId,aSize,aWidth,aHeight)
-
-#define IMachine_ReadSavedScreenshotPNGToArray(This,aScreenId,aWidth,aHeight,aData)	\
-    (This)->lpVtbl -> ReadSavedScreenshotPNGToArray(This,aScreenId,aWidth,aHeight,aData)
-
-#define IMachine_HotPlugCPU(This,aCpu)	\
-    (This)->lpVtbl -> HotPlugCPU(This,aCpu)
-
-#define IMachine_HotUnplugCPU(This,aCpu)	\
-    (This)->lpVtbl -> HotUnplugCPU(This,aCpu)
-
-#define IMachine_GetCPUStatus(This,aCpu,aAttached)	\
-    (This)->lpVtbl -> GetCPUStatus(This,aCpu,aAttached)
-
-#define IMachine_QueryLogFilename(This,aIdx,aFilename)	\
-    (This)->lpVtbl -> QueryLogFilename(This,aIdx,aFilename)
-
-#define IMachine_ReadLog(This,aIdx,aOffset,aSize,aData)	\
-    (This)->lpVtbl -> ReadLog(This,aIdx,aOffset,aSize,aData)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_Parent_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ IVirtualBox **aParent);
-
-
-void __RPC_STUB IMachine_get_Parent_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_Accessible_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ BOOL *aAccessible);
-
-
-void __RPC_STUB IMachine_get_Accessible_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_AccessError_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ IVirtualBoxErrorInfo **aAccessError);
-
-
-void __RPC_STUB IMachine_get_AccessError_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_Name_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ BSTR *aName);
-
-
-void __RPC_STUB IMachine_get_Name_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachine_put_Name_Proxy( 
-    IMachine * This,
-    /* [in] */ BSTR aName);
-
-
-void __RPC_STUB IMachine_put_Name_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_Description_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ BSTR *aDescription);
-
-
-void __RPC_STUB IMachine_get_Description_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachine_put_Description_Proxy( 
-    IMachine * This,
-    /* [in] */ BSTR aDescription);
-
-
-void __RPC_STUB IMachine_put_Description_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_Id_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ BSTR *aId);
-
-
-void __RPC_STUB IMachine_get_Id_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_OSTypeId_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ BSTR *aOSTypeId);
-
-
-void __RPC_STUB IMachine_get_OSTypeId_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachine_put_OSTypeId_Proxy( 
-    IMachine * This,
-    /* [in] */ BSTR aOSTypeId);
-
-
-void __RPC_STUB IMachine_put_OSTypeId_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_HardwareVersion_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ BSTR *aHardwareVersion);
-
-
-void __RPC_STUB IMachine_get_HardwareVersion_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachine_put_HardwareVersion_Proxy( 
-    IMachine * This,
-    /* [in] */ BSTR aHardwareVersion);
-
-
-void __RPC_STUB IMachine_put_HardwareVersion_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_HardwareUUID_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ BSTR *aHardwareUUID);
-
-
-void __RPC_STUB IMachine_get_HardwareUUID_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachine_put_HardwareUUID_Proxy( 
-    IMachine * This,
-    /* [in] */ BSTR aHardwareUUID);
-
-
-void __RPC_STUB IMachine_put_HardwareUUID_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_CPUCount_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ ULONG *aCPUCount);
-
-
-void __RPC_STUB IMachine_get_CPUCount_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachine_put_CPUCount_Proxy( 
-    IMachine * This,
-    /* [in] */ ULONG aCPUCount);
-
-
-void __RPC_STUB IMachine_put_CPUCount_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_CPUHotPlugEnabled_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ BOOL *aCPUHotPlugEnabled);
-
-
-void __RPC_STUB IMachine_get_CPUHotPlugEnabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachine_put_CPUHotPlugEnabled_Proxy( 
-    IMachine * This,
-    /* [in] */ BOOL aCPUHotPlugEnabled);
-
-
-void __RPC_STUB IMachine_put_CPUHotPlugEnabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_MemorySize_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ ULONG *aMemorySize);
-
-
-void __RPC_STUB IMachine_get_MemorySize_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachine_put_MemorySize_Proxy( 
-    IMachine * This,
-    /* [in] */ ULONG aMemorySize);
-
-
-void __RPC_STUB IMachine_put_MemorySize_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_MemoryBalloonSize_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ ULONG *aMemoryBalloonSize);
-
-
-void __RPC_STUB IMachine_get_MemoryBalloonSize_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachine_put_MemoryBalloonSize_Proxy( 
-    IMachine * This,
-    /* [in] */ ULONG aMemoryBalloonSize);
-
-
-void __RPC_STUB IMachine_put_MemoryBalloonSize_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_PageFusionEnabled_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ BOOL *aPageFusionEnabled);
-
-
-void __RPC_STUB IMachine_get_PageFusionEnabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachine_put_PageFusionEnabled_Proxy( 
-    IMachine * This,
-    /* [in] */ BOOL aPageFusionEnabled);
-
-
-void __RPC_STUB IMachine_put_PageFusionEnabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_VRAMSize_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ ULONG *aVRAMSize);
-
-
-void __RPC_STUB IMachine_get_VRAMSize_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachine_put_VRAMSize_Proxy( 
-    IMachine * This,
-    /* [in] */ ULONG aVRAMSize);
-
-
-void __RPC_STUB IMachine_put_VRAMSize_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_Accelerate3DEnabled_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ BOOL *aAccelerate3DEnabled);
-
-
-void __RPC_STUB IMachine_get_Accelerate3DEnabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachine_put_Accelerate3DEnabled_Proxy( 
-    IMachine * This,
-    /* [in] */ BOOL aAccelerate3DEnabled);
-
-
-void __RPC_STUB IMachine_put_Accelerate3DEnabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_Accelerate2DVideoEnabled_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ BOOL *aAccelerate2DVideoEnabled);
-
-
-void __RPC_STUB IMachine_get_Accelerate2DVideoEnabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachine_put_Accelerate2DVideoEnabled_Proxy( 
-    IMachine * This,
-    /* [in] */ BOOL aAccelerate2DVideoEnabled);
-
-
-void __RPC_STUB IMachine_put_Accelerate2DVideoEnabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_MonitorCount_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ ULONG *aMonitorCount);
-
-
-void __RPC_STUB IMachine_get_MonitorCount_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachine_put_MonitorCount_Proxy( 
-    IMachine * This,
-    /* [in] */ ULONG aMonitorCount);
-
-
-void __RPC_STUB IMachine_put_MonitorCount_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_BIOSSettings_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ IBIOSSettings **aBIOSSettings);
-
-
-void __RPC_STUB IMachine_get_BIOSSettings_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_FirmwareType_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ FirmwareType *aFirmwareType);
-
-
-void __RPC_STUB IMachine_get_FirmwareType_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachine_put_FirmwareType_Proxy( 
-    IMachine * This,
-    /* [in] */ FirmwareType aFirmwareType);
-
-
-void __RPC_STUB IMachine_put_FirmwareType_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_PointingHidType_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ PointingHidType *aPointingHidType);
-
-
-void __RPC_STUB IMachine_get_PointingHidType_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachine_put_PointingHidType_Proxy( 
-    IMachine * This,
-    /* [in] */ PointingHidType aPointingHidType);
-
-
-void __RPC_STUB IMachine_put_PointingHidType_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_KeyboardHidType_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ KeyboardHidType *aKeyboardHidType);
-
-
-void __RPC_STUB IMachine_get_KeyboardHidType_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachine_put_KeyboardHidType_Proxy( 
-    IMachine * This,
-    /* [in] */ KeyboardHidType aKeyboardHidType);
-
-
-void __RPC_STUB IMachine_put_KeyboardHidType_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_HpetEnabled_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ BOOL *aHpetEnabled);
-
-
-void __RPC_STUB IMachine_get_HpetEnabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachine_put_HpetEnabled_Proxy( 
-    IMachine * This,
-    /* [in] */ BOOL aHpetEnabled);
-
-
-void __RPC_STUB IMachine_put_HpetEnabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_SnapshotFolder_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ BSTR *aSnapshotFolder);
-
-
-void __RPC_STUB IMachine_get_SnapshotFolder_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachine_put_SnapshotFolder_Proxy( 
-    IMachine * This,
-    /* [in] */ BSTR aSnapshotFolder);
-
-
-void __RPC_STUB IMachine_put_SnapshotFolder_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_VRDPServer_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ IVRDPServer **aVRDPServer);
-
-
-void __RPC_STUB IMachine_get_VRDPServer_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_MediumAttachments_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ SAFEARRAY * *aMediumAttachments);
-
-
-void __RPC_STUB IMachine_get_MediumAttachments_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_USBController_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ IUSBController **aUSBController);
-
-
-void __RPC_STUB IMachine_get_USBController_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_AudioAdapter_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ IAudioAdapter **aAudioAdapter);
-
-
-void __RPC_STUB IMachine_get_AudioAdapter_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_StorageControllers_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ SAFEARRAY * *aStorageControllers);
-
-
-void __RPC_STUB IMachine_get_StorageControllers_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_SettingsFilePath_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ BSTR *aSettingsFilePath);
-
-
-void __RPC_STUB IMachine_get_SettingsFilePath_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_SettingsModified_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ BOOL *aSettingsModified);
-
-
-void __RPC_STUB IMachine_get_SettingsModified_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_SessionState_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ SessionState *aSessionState);
-
-
-void __RPC_STUB IMachine_get_SessionState_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_SessionType_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ BSTR *aSessionType);
-
-
-void __RPC_STUB IMachine_get_SessionType_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_SessionPid_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ ULONG *aSessionPid);
-
-
-void __RPC_STUB IMachine_get_SessionPid_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_State_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ MachineState *aState);
-
-
-void __RPC_STUB IMachine_get_State_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_LastStateChange_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ LONG64 *aLastStateChange);
-
-
-void __RPC_STUB IMachine_get_LastStateChange_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_StateFilePath_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ BSTR *aStateFilePath);
-
-
-void __RPC_STUB IMachine_get_StateFilePath_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_LogFolder_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ BSTR *aLogFolder);
-
-
-void __RPC_STUB IMachine_get_LogFolder_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_CurrentSnapshot_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ ISnapshot **aCurrentSnapshot);
-
-
-void __RPC_STUB IMachine_get_CurrentSnapshot_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_SnapshotCount_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ ULONG *aSnapshotCount);
-
-
-void __RPC_STUB IMachine_get_SnapshotCount_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_CurrentStateModified_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ BOOL *aCurrentStateModified);
-
-
-void __RPC_STUB IMachine_get_CurrentStateModified_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_SharedFolders_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ SAFEARRAY * *aSharedFolders);
-
-
-void __RPC_STUB IMachine_get_SharedFolders_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_ClipboardMode_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ ClipboardMode *aClipboardMode);
-
-
-void __RPC_STUB IMachine_get_ClipboardMode_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachine_put_ClipboardMode_Proxy( 
-    IMachine * This,
-    /* [in] */ ClipboardMode aClipboardMode);
-
-
-void __RPC_STUB IMachine_put_ClipboardMode_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_GuestPropertyNotificationPatterns_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ BSTR *aGuestPropertyNotificationPatterns);
-
-
-void __RPC_STUB IMachine_get_GuestPropertyNotificationPatterns_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachine_put_GuestPropertyNotificationPatterns_Proxy( 
-    IMachine * This,
-    /* [in] */ BSTR aGuestPropertyNotificationPatterns);
-
-
-void __RPC_STUB IMachine_put_GuestPropertyNotificationPatterns_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_TeleporterEnabled_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ BOOL *aTeleporterEnabled);
-
-
-void __RPC_STUB IMachine_get_TeleporterEnabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachine_put_TeleporterEnabled_Proxy( 
-    IMachine * This,
-    /* [in] */ BOOL aTeleporterEnabled);
-
-
-void __RPC_STUB IMachine_put_TeleporterEnabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_TeleporterPort_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ ULONG *aTeleporterPort);
-
-
-void __RPC_STUB IMachine_get_TeleporterPort_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachine_put_TeleporterPort_Proxy( 
-    IMachine * This,
-    /* [in] */ ULONG aTeleporterPort);
-
-
-void __RPC_STUB IMachine_put_TeleporterPort_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_TeleporterAddress_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ BSTR *aTeleporterAddress);
-
-
-void __RPC_STUB IMachine_get_TeleporterAddress_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachine_put_TeleporterAddress_Proxy( 
-    IMachine * This,
-    /* [in] */ BSTR aTeleporterAddress);
-
-
-void __RPC_STUB IMachine_put_TeleporterAddress_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_TeleporterPassword_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ BSTR *aTeleporterPassword);
-
-
-void __RPC_STUB IMachine_get_TeleporterPassword_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachine_put_TeleporterPassword_Proxy( 
-    IMachine * This,
-    /* [in] */ BSTR aTeleporterPassword);
-
-
-void __RPC_STUB IMachine_put_TeleporterPassword_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_RTCUseUTC_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ BOOL *aRTCUseUTC);
-
-
-void __RPC_STUB IMachine_get_RTCUseUTC_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachine_put_RTCUseUTC_Proxy( 
-    IMachine * This,
-    /* [in] */ BOOL aRTCUseUTC);
-
-
-void __RPC_STUB IMachine_put_RTCUseUTC_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_IoCacheEnabled_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ BOOL *aIoCacheEnabled);
-
-
-void __RPC_STUB IMachine_get_IoCacheEnabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachine_put_IoCacheEnabled_Proxy( 
-    IMachine * This,
-    /* [in] */ BOOL aIoCacheEnabled);
-
-
-void __RPC_STUB IMachine_put_IoCacheEnabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_IoCacheSize_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ ULONG *aIoCacheSize);
-
-
-void __RPC_STUB IMachine_get_IoCacheSize_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachine_put_IoCacheSize_Proxy( 
-    IMachine * This,
-    /* [in] */ ULONG aIoCacheSize);
-
-
-void __RPC_STUB IMachine_put_IoCacheSize_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachine_get_IoBandwidthMax_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ ULONG *aIoBandwidthMax);
-
-
-void __RPC_STUB IMachine_get_IoBandwidthMax_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachine_put_IoBandwidthMax_Proxy( 
-    IMachine * This,
-    /* [in] */ ULONG aIoBandwidthMax);
-
-
-void __RPC_STUB IMachine_put_IoBandwidthMax_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_SetBootOrder_Proxy( 
-    IMachine * This,
-    /* [in] */ ULONG aPosition,
-    /* [in] */ DeviceType aDevice);
-
-
-void __RPC_STUB IMachine_SetBootOrder_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_GetBootOrder_Proxy( 
-    IMachine * This,
-    /* [in] */ ULONG aPosition,
-    /* [retval][out] */ DeviceType *aDevice);
-
-
-void __RPC_STUB IMachine_GetBootOrder_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_AttachDevice_Proxy( 
-    IMachine * This,
-    /* [in] */ BSTR aName,
-    /* [in] */ LONG aControllerPort,
-    /* [in] */ LONG aDevice,
-    /* [in] */ DeviceType aType,
-    /* [in] */ BSTR aId);
-
-
-void __RPC_STUB IMachine_AttachDevice_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_DetachDevice_Proxy( 
-    IMachine * This,
-    /* [in] */ BSTR aName,
-    /* [in] */ LONG aControllerPort,
-    /* [in] */ LONG aDevice);
-
-
-void __RPC_STUB IMachine_DetachDevice_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_PassthroughDevice_Proxy( 
-    IMachine * This,
-    /* [in] */ BSTR aName,
-    /* [in] */ LONG aControllerPort,
-    /* [in] */ LONG aDevice,
-    /* [in] */ BOOL aPassthrough);
-
-
-void __RPC_STUB IMachine_PassthroughDevice_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_MountMedium_Proxy( 
-    IMachine * This,
-    /* [in] */ BSTR aName,
-    /* [in] */ LONG aControllerPort,
-    /* [in] */ LONG aDevice,
-    /* [in] */ BSTR aMedium,
-    /* [in] */ BOOL aForce);
-
-
-void __RPC_STUB IMachine_MountMedium_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_GetMedium_Proxy( 
-    IMachine * This,
-    /* [in] */ BSTR aName,
-    /* [in] */ LONG aControllerPort,
-    /* [in] */ LONG aDevice,
-    /* [retval][out] */ IMedium **aMedium);
-
-
-void __RPC_STUB IMachine_GetMedium_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_GetMediumAttachmentsOfController_Proxy( 
-    IMachine * This,
-    /* [in] */ BSTR aName,
-    /* [retval][out] */ SAFEARRAY * *aMediumAttachments);
-
-
-void __RPC_STUB IMachine_GetMediumAttachmentsOfController_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_GetMediumAttachment_Proxy( 
-    IMachine * This,
-    /* [in] */ BSTR aName,
-    /* [in] */ LONG aControllerPort,
-    /* [in] */ LONG aDevice,
-    /* [retval][out] */ IMediumAttachment **aAttachment);
-
-
-void __RPC_STUB IMachine_GetMediumAttachment_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_GetNetworkAdapter_Proxy( 
-    IMachine * This,
-    /* [in] */ ULONG aSlot,
-    /* [retval][out] */ INetworkAdapter **aAdapter);
-
-
-void __RPC_STUB IMachine_GetNetworkAdapter_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_AddStorageController_Proxy( 
-    IMachine * This,
-    /* [in] */ BSTR aName,
-    /* [in] */ StorageBus aConnectionType,
-    /* [retval][out] */ IStorageController **aController);
-
-
-void __RPC_STUB IMachine_AddStorageController_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_GetStorageControllerByName_Proxy( 
-    IMachine * This,
-    /* [in] */ BSTR aName,
-    /* [retval][out] */ IStorageController **aStorageController);
-
-
-void __RPC_STUB IMachine_GetStorageControllerByName_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_GetStorageControllerByInstance_Proxy( 
-    IMachine * This,
-    /* [in] */ ULONG aInstance,
-    /* [retval][out] */ IStorageController **aStorageController);
-
-
-void __RPC_STUB IMachine_GetStorageControllerByInstance_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_RemoveStorageController_Proxy( 
-    IMachine * This,
-    /* [in] */ BSTR aName);
-
-
-void __RPC_STUB IMachine_RemoveStorageController_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_GetSerialPort_Proxy( 
-    IMachine * This,
-    /* [in] */ ULONG aSlot,
-    /* [retval][out] */ ISerialPort **aPort);
-
-
-void __RPC_STUB IMachine_GetSerialPort_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_GetParallelPort_Proxy( 
-    IMachine * This,
-    /* [in] */ ULONG aSlot,
-    /* [retval][out] */ IParallelPort **aPort);
-
-
-void __RPC_STUB IMachine_GetParallelPort_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_GetExtraDataKeys_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ SAFEARRAY * *aValue);
-
-
-void __RPC_STUB IMachine_GetExtraDataKeys_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_GetExtraData_Proxy( 
-    IMachine * This,
-    /* [in] */ BSTR aKey,
-    /* [retval][out] */ BSTR *aValue);
-
-
-void __RPC_STUB IMachine_GetExtraData_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_SetExtraData_Proxy( 
-    IMachine * This,
-    /* [in] */ BSTR aKey,
-    /* [in] */ BSTR aValue);
-
-
-void __RPC_STUB IMachine_SetExtraData_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_GetCPUProperty_Proxy( 
-    IMachine * This,
-    /* [in] */ CPUPropertyType aProperty,
-    /* [retval][out] */ BOOL *aValue);
-
-
-void __RPC_STUB IMachine_GetCPUProperty_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_SetCPUProperty_Proxy( 
-    IMachine * This,
-    /* [in] */ CPUPropertyType aProperty,
-    /* [in] */ BOOL aValue);
-
-
-void __RPC_STUB IMachine_SetCPUProperty_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_GetCPUIDLeaf_Proxy( 
-    IMachine * This,
-    /* [in] */ ULONG aId,
-    /* [out] */ ULONG *aValEax,
-    /* [out] */ ULONG *aValEbx,
-    /* [out] */ ULONG *aValEcx,
-    /* [out] */ ULONG *aValEdx);
-
-
-void __RPC_STUB IMachine_GetCPUIDLeaf_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_SetCPUIDLeaf_Proxy( 
-    IMachine * This,
-    /* [in] */ ULONG aId,
-    /* [in] */ ULONG aValEax,
-    /* [in] */ ULONG aValEbx,
-    /* [in] */ ULONG aValEcx,
-    /* [in] */ ULONG aValEdx);
-
-
-void __RPC_STUB IMachine_SetCPUIDLeaf_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_RemoveCPUIDLeaf_Proxy( 
-    IMachine * This,
-    /* [in] */ ULONG aId);
-
-
-void __RPC_STUB IMachine_RemoveCPUIDLeaf_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_RemoveAllCPUIDLeaves_Proxy( 
-    IMachine * This);
-
-
-void __RPC_STUB IMachine_RemoveAllCPUIDLeaves_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_GetHWVirtExProperty_Proxy( 
-    IMachine * This,
-    /* [in] */ HWVirtExPropertyType aProperty,
-    /* [retval][out] */ BOOL *aValue);
-
-
-void __RPC_STUB IMachine_GetHWVirtExProperty_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_SetHWVirtExProperty_Proxy( 
-    IMachine * This,
-    /* [in] */ HWVirtExPropertyType aProperty,
-    /* [in] */ BOOL aValue);
-
-
-void __RPC_STUB IMachine_SetHWVirtExProperty_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_SaveSettings_Proxy( 
-    IMachine * This);
-
-
-void __RPC_STUB IMachine_SaveSettings_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_DiscardSettings_Proxy( 
-    IMachine * This);
-
-
-void __RPC_STUB IMachine_DiscardSettings_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_DeleteSettings_Proxy( 
-    IMachine * This);
-
-
-void __RPC_STUB IMachine_DeleteSettings_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_Export_Proxy( 
-    IMachine * This,
-    /* [in] */ IAppliance *aAAppliance,
-    /* [retval][out] */ IVirtualSystemDescription **aADescription);
-
-
-void __RPC_STUB IMachine_Export_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_GetSnapshot_Proxy( 
-    IMachine * This,
-    /* [in] */ BSTR aId,
-    /* [retval][out] */ ISnapshot **aSnapshot);
-
-
-void __RPC_STUB IMachine_GetSnapshot_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_FindSnapshot_Proxy( 
-    IMachine * This,
-    /* [in] */ BSTR aName,
-    /* [retval][out] */ ISnapshot **aSnapshot);
-
-
-void __RPC_STUB IMachine_FindSnapshot_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_SetCurrentSnapshot_Proxy( 
-    IMachine * This,
-    /* [in] */ BSTR aId);
-
-
-void __RPC_STUB IMachine_SetCurrentSnapshot_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_CreateSharedFolder_Proxy( 
-    IMachine * This,
-    /* [in] */ BSTR aName,
-    /* [in] */ BSTR aHostPath,
-    /* [in] */ BOOL aWritable);
-
-
-void __RPC_STUB IMachine_CreateSharedFolder_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_RemoveSharedFolder_Proxy( 
-    IMachine * This,
-    /* [in] */ BSTR aName);
-
-
-void __RPC_STUB IMachine_RemoveSharedFolder_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_CanShowConsoleWindow_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ BOOL *aCanShow);
-
-
-void __RPC_STUB IMachine_CanShowConsoleWindow_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_ShowConsoleWindow_Proxy( 
-    IMachine * This,
-    /* [retval][out] */ ULONG64 *aWinId);
-
-
-void __RPC_STUB IMachine_ShowConsoleWindow_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_GetGuestProperty_Proxy( 
-    IMachine * This,
-    /* [in] */ BSTR aName,
-    /* [out] */ BSTR *aValue,
-    /* [out] */ ULONG64 *aTimestamp,
-    /* [out] */ BSTR *aFlags);
-
-
-void __RPC_STUB IMachine_GetGuestProperty_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_GetGuestPropertyValue_Proxy( 
-    IMachine * This,
-    /* [in] */ BSTR aProperty,
-    /* [retval][out] */ BSTR *aValue);
-
-
-void __RPC_STUB IMachine_GetGuestPropertyValue_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_GetGuestPropertyTimestamp_Proxy( 
-    IMachine * This,
-    /* [in] */ BSTR aProperty,
-    /* [retval][out] */ ULONG64 *aValue);
-
-
-void __RPC_STUB IMachine_GetGuestPropertyTimestamp_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_SetGuestProperty_Proxy( 
-    IMachine * This,
-    /* [in] */ BSTR aProperty,
-    /* [in] */ BSTR aValue,
-    /* [in] */ BSTR aFlags);
-
-
-void __RPC_STUB IMachine_SetGuestProperty_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_SetGuestPropertyValue_Proxy( 
-    IMachine * This,
-    /* [in] */ BSTR aProperty,
-    /* [in] */ BSTR aValue);
-
-
-void __RPC_STUB IMachine_SetGuestPropertyValue_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_EnumerateGuestProperties_Proxy( 
-    IMachine * This,
-    /* [in] */ BSTR aPatterns,
-    /* [out] */ SAFEARRAY * *aName,
-    /* [out] */ SAFEARRAY * *aValue,
-    /* [out] */ SAFEARRAY * *aTimestamp,
-    /* [out] */ SAFEARRAY * *aFlags);
-
-
-void __RPC_STUB IMachine_EnumerateGuestProperties_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_QuerySavedThumbnailSize_Proxy( 
-    IMachine * This,
-    /* [in] */ ULONG aScreenId,
-    /* [out] */ ULONG *aSize,
-    /* [out] */ ULONG *aWidth,
-    /* [out] */ ULONG *aHeight);
-
-
-void __RPC_STUB IMachine_QuerySavedThumbnailSize_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_ReadSavedThumbnailToArray_Proxy( 
-    IMachine * This,
-    /* [in] */ ULONG aScreenId,
-    /* [in] */ BOOL aBGR,
-    /* [out] */ ULONG *aWidth,
-    /* [out] */ ULONG *aHeight,
-    /* [retval][out] */ SAFEARRAY * *aData);
-
-
-void __RPC_STUB IMachine_ReadSavedThumbnailToArray_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_QuerySavedScreenshotPNGSize_Proxy( 
-    IMachine * This,
-    /* [in] */ ULONG aScreenId,
-    /* [out] */ ULONG *aSize,
-    /* [out] */ ULONG *aWidth,
-    /* [out] */ ULONG *aHeight);
-
-
-void __RPC_STUB IMachine_QuerySavedScreenshotPNGSize_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_ReadSavedScreenshotPNGToArray_Proxy( 
-    IMachine * This,
-    /* [in] */ ULONG aScreenId,
-    /* [out] */ ULONG *aWidth,
-    /* [out] */ ULONG *aHeight,
-    /* [retval][out] */ SAFEARRAY * *aData);
-
-
-void __RPC_STUB IMachine_ReadSavedScreenshotPNGToArray_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_HotPlugCPU_Proxy( 
-    IMachine * This,
-    /* [in] */ ULONG aCpu);
-
-
-void __RPC_STUB IMachine_HotPlugCPU_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_HotUnplugCPU_Proxy( 
-    IMachine * This,
-    /* [in] */ ULONG aCpu);
-
-
-void __RPC_STUB IMachine_HotUnplugCPU_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_GetCPUStatus_Proxy( 
-    IMachine * This,
-    /* [in] */ ULONG aCpu,
-    /* [retval][out] */ BOOL *aAttached);
-
-
-void __RPC_STUB IMachine_GetCPUStatus_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_QueryLogFilename_Proxy( 
-    IMachine * This,
-    /* [in] */ ULONG aIdx,
-    /* [retval][out] */ BSTR *aFilename);
-
-
-void __RPC_STUB IMachine_QueryLogFilename_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachine_ReadLog_Proxy( 
-    IMachine * This,
-    /* [in] */ ULONG aIdx,
-    /* [in] */ ULONG64 aOffset,
-    /* [in] */ ULONG64 aSize,
-    /* [retval][out] */ SAFEARRAY * *aData);
-
-
-void __RPC_STUB IMachine_ReadLog_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IMachine_INTERFACE_DEFINED__ */
-
-
-#ifndef __IConsoleCallback_INTERFACE_DEFINED__
-#define __IConsoleCallback_INTERFACE_DEFINED__
-
-/* interface IConsoleCallback */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IConsoleCallback;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("60703f8d-81e4-4b45-a147-dcfd07692b19")
-    IConsoleCallback : public IDispatch
-    {
-    public:
-        virtual HRESULT STDMETHODCALLTYPE OnMousePointerShapeChange( 
-            /* [in] */ BOOL aVisible,
-            /* [in] */ BOOL aAlpha,
-            /* [in] */ ULONG aXHot,
-            /* [in] */ ULONG aYHot,
-            /* [in] */ ULONG aWidth,
-            /* [in] */ ULONG aHeight,
-            /* [out][in] */ SAFEARRAY * *aShape) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnMouseCapabilityChange( 
-            /* [in] */ BOOL aSupportsAbsolute,
-            /* [in] */ BOOL aSupportsRelative,
-            /* [in] */ BOOL aNeedsHostCursor) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnKeyboardLedsChange( 
-            /* [in] */ BOOL aNumLock,
-            /* [in] */ BOOL aCapsLock,
-            /* [in] */ BOOL aScrollLock) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnStateChange( 
-            /* [in] */ MachineState aState) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnAdditionsStateChange( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnNetworkAdapterChange( 
-            /* [in] */ INetworkAdapter *aNetworkAdapter) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnSerialPortChange( 
-            /* [in] */ ISerialPort *aSerialPort) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnParallelPortChange( 
-            /* [in] */ IParallelPort *aParallelPort) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnStorageControllerChange( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnMediumChange( 
-            /* [in] */ IMediumAttachment *aMediumAttachment) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnCPUChange( 
-            /* [in] */ ULONG aCpu,
-            /* [in] */ BOOL aAdd) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnVRDPServerChange( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnRemoteDisplayInfoChange( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnUSBControllerChange( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnUSBDeviceStateChange( 
-            /* [in] */ IUSBDevice *aDevice,
-            /* [in] */ BOOL aAttached,
-            /* [in] */ IVirtualBoxErrorInfo *aError) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnSharedFolderChange( 
-            /* [in] */ Scope aScope) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnRuntimeError( 
-            /* [in] */ BOOL aFatal,
-            /* [in] */ BSTR aId,
-            /* [in] */ BSTR aMessage) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnCanShowWindow( 
-            /* [retval][out] */ BOOL *aCanShow) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnShowWindow( 
-            /* [retval][out] */ ULONG64 *aWinId) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IConsoleCallbackVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IConsoleCallback * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IConsoleCallback * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IConsoleCallback * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IConsoleCallback * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IConsoleCallback * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IConsoleCallback * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IConsoleCallback * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnMousePointerShapeChange )( 
-            IConsoleCallback * This,
-            /* [in] */ BOOL aVisible,
-            /* [in] */ BOOL aAlpha,
-            /* [in] */ ULONG aXHot,
-            /* [in] */ ULONG aYHot,
-            /* [in] */ ULONG aWidth,
-            /* [in] */ ULONG aHeight,
-            /* [out][in] */ SAFEARRAY * *aShape);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnMouseCapabilityChange )( 
-            IConsoleCallback * This,
-            /* [in] */ BOOL aSupportsAbsolute,
-            /* [in] */ BOOL aSupportsRelative,
-            /* [in] */ BOOL aNeedsHostCursor);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnKeyboardLedsChange )( 
-            IConsoleCallback * This,
-            /* [in] */ BOOL aNumLock,
-            /* [in] */ BOOL aCapsLock,
-            /* [in] */ BOOL aScrollLock);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnStateChange )( 
-            IConsoleCallback * This,
-            /* [in] */ MachineState aState);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnAdditionsStateChange )( 
-            IConsoleCallback * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnNetworkAdapterChange )( 
-            IConsoleCallback * This,
-            /* [in] */ INetworkAdapter *aNetworkAdapter);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnSerialPortChange )( 
-            IConsoleCallback * This,
-            /* [in] */ ISerialPort *aSerialPort);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnParallelPortChange )( 
-            IConsoleCallback * This,
-            /* [in] */ IParallelPort *aParallelPort);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnStorageControllerChange )( 
-            IConsoleCallback * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnMediumChange )( 
-            IConsoleCallback * This,
-            /* [in] */ IMediumAttachment *aMediumAttachment);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnCPUChange )( 
-            IConsoleCallback * This,
-            /* [in] */ ULONG aCpu,
-            /* [in] */ BOOL aAdd);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnVRDPServerChange )( 
-            IConsoleCallback * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnRemoteDisplayInfoChange )( 
-            IConsoleCallback * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnUSBControllerChange )( 
-            IConsoleCallback * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnUSBDeviceStateChange )( 
-            IConsoleCallback * This,
-            /* [in] */ IUSBDevice *aDevice,
-            /* [in] */ BOOL aAttached,
-            /* [in] */ IVirtualBoxErrorInfo *aError);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnSharedFolderChange )( 
-            IConsoleCallback * This,
-            /* [in] */ Scope aScope);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnRuntimeError )( 
-            IConsoleCallback * This,
-            /* [in] */ BOOL aFatal,
-            /* [in] */ BSTR aId,
-            /* [in] */ BSTR aMessage);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnCanShowWindow )( 
-            IConsoleCallback * This,
-            /* [retval][out] */ BOOL *aCanShow);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnShowWindow )( 
-            IConsoleCallback * This,
-            /* [retval][out] */ ULONG64 *aWinId);
-        
-        END_INTERFACE
-    } IConsoleCallbackVtbl;
-
-    interface IConsoleCallback
-    {
-        CONST_VTBL struct IConsoleCallbackVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IConsoleCallback_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IConsoleCallback_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IConsoleCallback_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IConsoleCallback_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IConsoleCallback_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IConsoleCallback_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IConsoleCallback_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IConsoleCallback_OnMousePointerShapeChange(This,aVisible,aAlpha,aXHot,aYHot,aWidth,aHeight,aShape)	\
-    (This)->lpVtbl -> OnMousePointerShapeChange(This,aVisible,aAlpha,aXHot,aYHot,aWidth,aHeight,aShape)
-
-#define IConsoleCallback_OnMouseCapabilityChange(This,aSupportsAbsolute,aSupportsRelative,aNeedsHostCursor)	\
-    (This)->lpVtbl -> OnMouseCapabilityChange(This,aSupportsAbsolute,aSupportsRelative,aNeedsHostCursor)
-
-#define IConsoleCallback_OnKeyboardLedsChange(This,aNumLock,aCapsLock,aScrollLock)	\
-    (This)->lpVtbl -> OnKeyboardLedsChange(This,aNumLock,aCapsLock,aScrollLock)
-
-#define IConsoleCallback_OnStateChange(This,aState)	\
-    (This)->lpVtbl -> OnStateChange(This,aState)
-
-#define IConsoleCallback_OnAdditionsStateChange(This)	\
-    (This)->lpVtbl -> OnAdditionsStateChange(This)
-
-#define IConsoleCallback_OnNetworkAdapterChange(This,aNetworkAdapter)	\
-    (This)->lpVtbl -> OnNetworkAdapterChange(This,aNetworkAdapter)
-
-#define IConsoleCallback_OnSerialPortChange(This,aSerialPort)	\
-    (This)->lpVtbl -> OnSerialPortChange(This,aSerialPort)
-
-#define IConsoleCallback_OnParallelPortChange(This,aParallelPort)	\
-    (This)->lpVtbl -> OnParallelPortChange(This,aParallelPort)
-
-#define IConsoleCallback_OnStorageControllerChange(This)	\
-    (This)->lpVtbl -> OnStorageControllerChange(This)
-
-#define IConsoleCallback_OnMediumChange(This,aMediumAttachment)	\
-    (This)->lpVtbl -> OnMediumChange(This,aMediumAttachment)
-
-#define IConsoleCallback_OnCPUChange(This,aCpu,aAdd)	\
-    (This)->lpVtbl -> OnCPUChange(This,aCpu,aAdd)
-
-#define IConsoleCallback_OnVRDPServerChange(This)	\
-    (This)->lpVtbl -> OnVRDPServerChange(This)
-
-#define IConsoleCallback_OnRemoteDisplayInfoChange(This)	\
-    (This)->lpVtbl -> OnRemoteDisplayInfoChange(This)
-
-#define IConsoleCallback_OnUSBControllerChange(This)	\
-    (This)->lpVtbl -> OnUSBControllerChange(This)
-
-#define IConsoleCallback_OnUSBDeviceStateChange(This,aDevice,aAttached,aError)	\
-    (This)->lpVtbl -> OnUSBDeviceStateChange(This,aDevice,aAttached,aError)
-
-#define IConsoleCallback_OnSharedFolderChange(This,aScope)	\
-    (This)->lpVtbl -> OnSharedFolderChange(This,aScope)
-
-#define IConsoleCallback_OnRuntimeError(This,aFatal,aId,aMessage)	\
-    (This)->lpVtbl -> OnRuntimeError(This,aFatal,aId,aMessage)
-
-#define IConsoleCallback_OnCanShowWindow(This,aCanShow)	\
-    (This)->lpVtbl -> OnCanShowWindow(This,aCanShow)
-
-#define IConsoleCallback_OnShowWindow(This,aWinId)	\
-    (This)->lpVtbl -> OnShowWindow(This,aWinId)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-HRESULT STDMETHODCALLTYPE IConsoleCallback_OnMousePointerShapeChange_Proxy( 
-    IConsoleCallback * This,
-    /* [in] */ BOOL aVisible,
-    /* [in] */ BOOL aAlpha,
-    /* [in] */ ULONG aXHot,
-    /* [in] */ ULONG aYHot,
-    /* [in] */ ULONG aWidth,
-    /* [in] */ ULONG aHeight,
-    /* [out][in] */ SAFEARRAY * *aShape);
-
-
-void __RPC_STUB IConsoleCallback_OnMousePointerShapeChange_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsoleCallback_OnMouseCapabilityChange_Proxy( 
-    IConsoleCallback * This,
-    /* [in] */ BOOL aSupportsAbsolute,
-    /* [in] */ BOOL aSupportsRelative,
-    /* [in] */ BOOL aNeedsHostCursor);
-
-
-void __RPC_STUB IConsoleCallback_OnMouseCapabilityChange_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsoleCallback_OnKeyboardLedsChange_Proxy( 
-    IConsoleCallback * This,
-    /* [in] */ BOOL aNumLock,
-    /* [in] */ BOOL aCapsLock,
-    /* [in] */ BOOL aScrollLock);
-
-
-void __RPC_STUB IConsoleCallback_OnKeyboardLedsChange_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsoleCallback_OnStateChange_Proxy( 
-    IConsoleCallback * This,
-    /* [in] */ MachineState aState);
-
-
-void __RPC_STUB IConsoleCallback_OnStateChange_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsoleCallback_OnAdditionsStateChange_Proxy( 
-    IConsoleCallback * This);
-
-
-void __RPC_STUB IConsoleCallback_OnAdditionsStateChange_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsoleCallback_OnNetworkAdapterChange_Proxy( 
-    IConsoleCallback * This,
-    /* [in] */ INetworkAdapter *aNetworkAdapter);
-
-
-void __RPC_STUB IConsoleCallback_OnNetworkAdapterChange_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsoleCallback_OnSerialPortChange_Proxy( 
-    IConsoleCallback * This,
-    /* [in] */ ISerialPort *aSerialPort);
-
-
-void __RPC_STUB IConsoleCallback_OnSerialPortChange_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsoleCallback_OnParallelPortChange_Proxy( 
-    IConsoleCallback * This,
-    /* [in] */ IParallelPort *aParallelPort);
-
-
-void __RPC_STUB IConsoleCallback_OnParallelPortChange_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsoleCallback_OnStorageControllerChange_Proxy( 
-    IConsoleCallback * This);
-
-
-void __RPC_STUB IConsoleCallback_OnStorageControllerChange_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsoleCallback_OnMediumChange_Proxy( 
-    IConsoleCallback * This,
-    /* [in] */ IMediumAttachment *aMediumAttachment);
-
-
-void __RPC_STUB IConsoleCallback_OnMediumChange_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsoleCallback_OnCPUChange_Proxy( 
-    IConsoleCallback * This,
-    /* [in] */ ULONG aCpu,
-    /* [in] */ BOOL aAdd);
-
-
-void __RPC_STUB IConsoleCallback_OnCPUChange_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsoleCallback_OnVRDPServerChange_Proxy( 
-    IConsoleCallback * This);
-
-
-void __RPC_STUB IConsoleCallback_OnVRDPServerChange_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsoleCallback_OnRemoteDisplayInfoChange_Proxy( 
-    IConsoleCallback * This);
-
-
-void __RPC_STUB IConsoleCallback_OnRemoteDisplayInfoChange_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsoleCallback_OnUSBControllerChange_Proxy( 
-    IConsoleCallback * This);
-
-
-void __RPC_STUB IConsoleCallback_OnUSBControllerChange_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsoleCallback_OnUSBDeviceStateChange_Proxy( 
-    IConsoleCallback * This,
-    /* [in] */ IUSBDevice *aDevice,
-    /* [in] */ BOOL aAttached,
-    /* [in] */ IVirtualBoxErrorInfo *aError);
-
-
-void __RPC_STUB IConsoleCallback_OnUSBDeviceStateChange_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsoleCallback_OnSharedFolderChange_Proxy( 
-    IConsoleCallback * This,
-    /* [in] */ Scope aScope);
-
-
-void __RPC_STUB IConsoleCallback_OnSharedFolderChange_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsoleCallback_OnRuntimeError_Proxy( 
-    IConsoleCallback * This,
-    /* [in] */ BOOL aFatal,
-    /* [in] */ BSTR aId,
-    /* [in] */ BSTR aMessage);
-
-
-void __RPC_STUB IConsoleCallback_OnRuntimeError_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsoleCallback_OnCanShowWindow_Proxy( 
-    IConsoleCallback * This,
-    /* [retval][out] */ BOOL *aCanShow);
-
-
-void __RPC_STUB IConsoleCallback_OnCanShowWindow_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsoleCallback_OnShowWindow_Proxy( 
-    IConsoleCallback * This,
-    /* [retval][out] */ ULONG64 *aWinId);
-
-
-void __RPC_STUB IConsoleCallback_OnShowWindow_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IConsoleCallback_INTERFACE_DEFINED__ */
-
-
-#ifndef __IRemoteDisplayInfo_INTERFACE_DEFINED__
-#define __IRemoteDisplayInfo_INTERFACE_DEFINED__
-
-/* interface IRemoteDisplayInfo */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IRemoteDisplayInfo;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("b3741084-806f-4c3b-8c42-ebad1a81e45a")
-    IRemoteDisplayInfo : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Active( 
-            /* [retval][out] */ BOOL *aActive) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Port( 
-            /* [retval][out] */ LONG *aPort) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_NumberOfClients( 
-            /* [retval][out] */ ULONG *aNumberOfClients) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_BeginTime( 
-            /* [retval][out] */ LONG64 *aBeginTime) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_EndTime( 
-            /* [retval][out] */ LONG64 *aEndTime) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_BytesSent( 
-            /* [retval][out] */ ULONG64 *aBytesSent) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_BytesSentTotal( 
-            /* [retval][out] */ ULONG64 *aBytesSentTotal) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_BytesReceived( 
-            /* [retval][out] */ ULONG64 *aBytesReceived) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_BytesReceivedTotal( 
-            /* [retval][out] */ ULONG64 *aBytesReceivedTotal) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_User( 
-            /* [retval][out] */ BSTR *aUser) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Domain( 
-            /* [retval][out] */ BSTR *aDomain) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_ClientName( 
-            /* [retval][out] */ BSTR *aClientName) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_ClientIP( 
-            /* [retval][out] */ BSTR *aClientIP) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_ClientVersion( 
-            /* [retval][out] */ ULONG *aClientVersion) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_EncryptionStyle( 
-            /* [retval][out] */ ULONG *aEncryptionStyle) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IRemoteDisplayInfoVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IRemoteDisplayInfo * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IRemoteDisplayInfo * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IRemoteDisplayInfo * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IRemoteDisplayInfo * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IRemoteDisplayInfo * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IRemoteDisplayInfo * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IRemoteDisplayInfo * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Active )( 
-            IRemoteDisplayInfo * This,
-            /* [retval][out] */ BOOL *aActive);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Port )( 
-            IRemoteDisplayInfo * This,
-            /* [retval][out] */ LONG *aPort);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_NumberOfClients )( 
-            IRemoteDisplayInfo * This,
-            /* [retval][out] */ ULONG *aNumberOfClients);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_BeginTime )( 
-            IRemoteDisplayInfo * This,
-            /* [retval][out] */ LONG64 *aBeginTime);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_EndTime )( 
-            IRemoteDisplayInfo * This,
-            /* [retval][out] */ LONG64 *aEndTime);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_BytesSent )( 
-            IRemoteDisplayInfo * This,
-            /* [retval][out] */ ULONG64 *aBytesSent);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_BytesSentTotal )( 
-            IRemoteDisplayInfo * This,
-            /* [retval][out] */ ULONG64 *aBytesSentTotal);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_BytesReceived )( 
-            IRemoteDisplayInfo * This,
-            /* [retval][out] */ ULONG64 *aBytesReceived);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_BytesReceivedTotal )( 
-            IRemoteDisplayInfo * This,
-            /* [retval][out] */ ULONG64 *aBytesReceivedTotal);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_User )( 
-            IRemoteDisplayInfo * This,
-            /* [retval][out] */ BSTR *aUser);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Domain )( 
-            IRemoteDisplayInfo * This,
-            /* [retval][out] */ BSTR *aDomain);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_ClientName )( 
-            IRemoteDisplayInfo * This,
-            /* [retval][out] */ BSTR *aClientName);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_ClientIP )( 
-            IRemoteDisplayInfo * This,
-            /* [retval][out] */ BSTR *aClientIP);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_ClientVersion )( 
-            IRemoteDisplayInfo * This,
-            /* [retval][out] */ ULONG *aClientVersion);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_EncryptionStyle )( 
-            IRemoteDisplayInfo * This,
-            /* [retval][out] */ ULONG *aEncryptionStyle);
-        
-        END_INTERFACE
-    } IRemoteDisplayInfoVtbl;
-
-    interface IRemoteDisplayInfo
-    {
-        CONST_VTBL struct IRemoteDisplayInfoVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IRemoteDisplayInfo_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IRemoteDisplayInfo_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IRemoteDisplayInfo_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IRemoteDisplayInfo_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IRemoteDisplayInfo_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IRemoteDisplayInfo_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IRemoteDisplayInfo_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IRemoteDisplayInfo_get_Active(This,aActive)	\
-    (This)->lpVtbl -> get_Active(This,aActive)
-
-#define IRemoteDisplayInfo_get_Port(This,aPort)	\
-    (This)->lpVtbl -> get_Port(This,aPort)
-
-#define IRemoteDisplayInfo_get_NumberOfClients(This,aNumberOfClients)	\
-    (This)->lpVtbl -> get_NumberOfClients(This,aNumberOfClients)
-
-#define IRemoteDisplayInfo_get_BeginTime(This,aBeginTime)	\
-    (This)->lpVtbl -> get_BeginTime(This,aBeginTime)
-
-#define IRemoteDisplayInfo_get_EndTime(This,aEndTime)	\
-    (This)->lpVtbl -> get_EndTime(This,aEndTime)
-
-#define IRemoteDisplayInfo_get_BytesSent(This,aBytesSent)	\
-    (This)->lpVtbl -> get_BytesSent(This,aBytesSent)
-
-#define IRemoteDisplayInfo_get_BytesSentTotal(This,aBytesSentTotal)	\
-    (This)->lpVtbl -> get_BytesSentTotal(This,aBytesSentTotal)
-
-#define IRemoteDisplayInfo_get_BytesReceived(This,aBytesReceived)	\
-    (This)->lpVtbl -> get_BytesReceived(This,aBytesReceived)
-
-#define IRemoteDisplayInfo_get_BytesReceivedTotal(This,aBytesReceivedTotal)	\
-    (This)->lpVtbl -> get_BytesReceivedTotal(This,aBytesReceivedTotal)
-
-#define IRemoteDisplayInfo_get_User(This,aUser)	\
-    (This)->lpVtbl -> get_User(This,aUser)
-
-#define IRemoteDisplayInfo_get_Domain(This,aDomain)	\
-    (This)->lpVtbl -> get_Domain(This,aDomain)
-
-#define IRemoteDisplayInfo_get_ClientName(This,aClientName)	\
-    (This)->lpVtbl -> get_ClientName(This,aClientName)
-
-#define IRemoteDisplayInfo_get_ClientIP(This,aClientIP)	\
-    (This)->lpVtbl -> get_ClientIP(This,aClientIP)
-
-#define IRemoteDisplayInfo_get_ClientVersion(This,aClientVersion)	\
-    (This)->lpVtbl -> get_ClientVersion(This,aClientVersion)
-
-#define IRemoteDisplayInfo_get_EncryptionStyle(This,aEncryptionStyle)	\
-    (This)->lpVtbl -> get_EncryptionStyle(This,aEncryptionStyle)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IRemoteDisplayInfo_get_Active_Proxy( 
-    IRemoteDisplayInfo * This,
-    /* [retval][out] */ BOOL *aActive);
-
-
-void __RPC_STUB IRemoteDisplayInfo_get_Active_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IRemoteDisplayInfo_get_Port_Proxy( 
-    IRemoteDisplayInfo * This,
-    /* [retval][out] */ LONG *aPort);
-
-
-void __RPC_STUB IRemoteDisplayInfo_get_Port_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IRemoteDisplayInfo_get_NumberOfClients_Proxy( 
-    IRemoteDisplayInfo * This,
-    /* [retval][out] */ ULONG *aNumberOfClients);
-
-
-void __RPC_STUB IRemoteDisplayInfo_get_NumberOfClients_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IRemoteDisplayInfo_get_BeginTime_Proxy( 
-    IRemoteDisplayInfo * This,
-    /* [retval][out] */ LONG64 *aBeginTime);
-
-
-void __RPC_STUB IRemoteDisplayInfo_get_BeginTime_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IRemoteDisplayInfo_get_EndTime_Proxy( 
-    IRemoteDisplayInfo * This,
-    /* [retval][out] */ LONG64 *aEndTime);
-
-
-void __RPC_STUB IRemoteDisplayInfo_get_EndTime_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IRemoteDisplayInfo_get_BytesSent_Proxy( 
-    IRemoteDisplayInfo * This,
-    /* [retval][out] */ ULONG64 *aBytesSent);
-
-
-void __RPC_STUB IRemoteDisplayInfo_get_BytesSent_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IRemoteDisplayInfo_get_BytesSentTotal_Proxy( 
-    IRemoteDisplayInfo * This,
-    /* [retval][out] */ ULONG64 *aBytesSentTotal);
-
-
-void __RPC_STUB IRemoteDisplayInfo_get_BytesSentTotal_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IRemoteDisplayInfo_get_BytesReceived_Proxy( 
-    IRemoteDisplayInfo * This,
-    /* [retval][out] */ ULONG64 *aBytesReceived);
-
-
-void __RPC_STUB IRemoteDisplayInfo_get_BytesReceived_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IRemoteDisplayInfo_get_BytesReceivedTotal_Proxy( 
-    IRemoteDisplayInfo * This,
-    /* [retval][out] */ ULONG64 *aBytesReceivedTotal);
-
-
-void __RPC_STUB IRemoteDisplayInfo_get_BytesReceivedTotal_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IRemoteDisplayInfo_get_User_Proxy( 
-    IRemoteDisplayInfo * This,
-    /* [retval][out] */ BSTR *aUser);
-
-
-void __RPC_STUB IRemoteDisplayInfo_get_User_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IRemoteDisplayInfo_get_Domain_Proxy( 
-    IRemoteDisplayInfo * This,
-    /* [retval][out] */ BSTR *aDomain);
-
-
-void __RPC_STUB IRemoteDisplayInfo_get_Domain_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IRemoteDisplayInfo_get_ClientName_Proxy( 
-    IRemoteDisplayInfo * This,
-    /* [retval][out] */ BSTR *aClientName);
-
-
-void __RPC_STUB IRemoteDisplayInfo_get_ClientName_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IRemoteDisplayInfo_get_ClientIP_Proxy( 
-    IRemoteDisplayInfo * This,
-    /* [retval][out] */ BSTR *aClientIP);
-
-
-void __RPC_STUB IRemoteDisplayInfo_get_ClientIP_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IRemoteDisplayInfo_get_ClientVersion_Proxy( 
-    IRemoteDisplayInfo * This,
-    /* [retval][out] */ ULONG *aClientVersion);
-
-
-void __RPC_STUB IRemoteDisplayInfo_get_ClientVersion_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IRemoteDisplayInfo_get_EncryptionStyle_Proxy( 
-    IRemoteDisplayInfo * This,
-    /* [retval][out] */ ULONG *aEncryptionStyle);
-
-
-void __RPC_STUB IRemoteDisplayInfo_get_EncryptionStyle_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IRemoteDisplayInfo_INTERFACE_DEFINED__ */
-
-
-#ifndef __IConsole_INTERFACE_DEFINED__
-#define __IConsole_INTERFACE_DEFINED__
-
-/* interface IConsole */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IConsole;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("6375231a-c17c-464b-92cb-ae9e128d71c3")
-    IConsole : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Machine( 
-            /* [retval][out] */ IMachine **aMachine) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_State( 
-            /* [retval][out] */ MachineState *aState) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Guest( 
-            /* [retval][out] */ IGuest **aGuest) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Keyboard( 
-            /* [retval][out] */ IKeyboard **aKeyboard) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Mouse( 
-            /* [retval][out] */ IMouse **aMouse) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Display( 
-            /* [retval][out] */ IDisplay **aDisplay) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Debugger( 
-            /* [retval][out] */ IMachineDebugger **aDebugger) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_USBDevices( 
-            /* [retval][out] */ SAFEARRAY * *aUSBDevices) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_RemoteUSBDevices( 
-            /* [retval][out] */ SAFEARRAY * *aRemoteUSBDevices) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_SharedFolders( 
-            /* [retval][out] */ SAFEARRAY * *aSharedFolders) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_RemoteDisplayInfo( 
-            /* [retval][out] */ IRemoteDisplayInfo **aRemoteDisplayInfo) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE PowerUp( 
-            /* [retval][out] */ IProgress **aProgress) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE PowerUpPaused( 
-            /* [retval][out] */ IProgress **aProgress) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE PowerDown( 
-            /* [retval][out] */ IProgress **aProgress) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE Reset( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE Pause( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE Resume( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE PowerButton( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SleepButton( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetPowerButtonHandled( 
-            /* [retval][out] */ BOOL *aHandled) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetGuestEnteredACPIMode( 
-            /* [retval][out] */ BOOL *aEntered) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SaveState( 
-            /* [retval][out] */ IProgress **aProgress) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE AdoptSavedState( 
-            /* [in] */ BSTR aSavedStateFile) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE ForgetSavedState( 
-            /* [in] */ BOOL aRemove) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetDeviceActivity( 
-            /* [in] */ DeviceType aType,
-            /* [retval][out] */ DeviceActivity *aActivity) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE AttachUSBDevice( 
-            /* [in] */ BSTR aId) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE DetachUSBDevice( 
-            /* [in] */ BSTR aId,
-            /* [retval][out] */ IUSBDevice **aDevice) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE FindUSBDeviceByAddress( 
-            /* [in] */ BSTR aName,
-            /* [retval][out] */ IUSBDevice **aDevice) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE FindUSBDeviceById( 
-            /* [in] */ BSTR aId,
-            /* [retval][out] */ IUSBDevice **aDevice) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateSharedFolder( 
-            /* [in] */ BSTR aName,
-            /* [in] */ BSTR aHostPath,
-            /* [in] */ BOOL aWritable) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE RemoveSharedFolder( 
-            /* [in] */ BSTR aName) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE TakeSnapshot( 
-            /* [in] */ BSTR aName,
-            /* [in] */ BSTR aDescription,
-            /* [retval][out] */ IProgress **aProgress) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE DeleteSnapshot( 
-            /* [in] */ BSTR aId,
-            /* [retval][out] */ IProgress **aProgress) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE RestoreSnapshot( 
-            /* [in] */ ISnapshot *aSnapshot,
-            /* [retval][out] */ IProgress **aProgress) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE Teleport( 
-            /* [in] */ BSTR aHostname,
-            /* [in] */ ULONG aTcpport,
-            /* [in] */ BSTR aPassword,
-            /* [in] */ ULONG aMaxDowntime,
-            /* [retval][out] */ IProgress **aProgress) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE RegisterCallback( 
-            /* [in] */ IConsoleCallback *aCallback) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE UnregisterCallback( 
-            /* [in] */ IConsoleCallback *aCallback) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IConsoleVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IConsole * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IConsole * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IConsole * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IConsole * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IConsole * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IConsole * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IConsole * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Machine )( 
-            IConsole * This,
-            /* [retval][out] */ IMachine **aMachine);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_State )( 
-            IConsole * This,
-            /* [retval][out] */ MachineState *aState);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Guest )( 
-            IConsole * This,
-            /* [retval][out] */ IGuest **aGuest);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Keyboard )( 
-            IConsole * This,
-            /* [retval][out] */ IKeyboard **aKeyboard);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Mouse )( 
-            IConsole * This,
-            /* [retval][out] */ IMouse **aMouse);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Display )( 
-            IConsole * This,
-            /* [retval][out] */ IDisplay **aDisplay);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Debugger )( 
-            IConsole * This,
-            /* [retval][out] */ IMachineDebugger **aDebugger);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_USBDevices )( 
-            IConsole * This,
-            /* [retval][out] */ SAFEARRAY * *aUSBDevices);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_RemoteUSBDevices )( 
-            IConsole * This,
-            /* [retval][out] */ SAFEARRAY * *aRemoteUSBDevices);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_SharedFolders )( 
-            IConsole * This,
-            /* [retval][out] */ SAFEARRAY * *aSharedFolders);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_RemoteDisplayInfo )( 
-            IConsole * This,
-            /* [retval][out] */ IRemoteDisplayInfo **aRemoteDisplayInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *PowerUp )( 
-            IConsole * This,
-            /* [retval][out] */ IProgress **aProgress);
-        
-        HRESULT ( STDMETHODCALLTYPE *PowerUpPaused )( 
-            IConsole * This,
-            /* [retval][out] */ IProgress **aProgress);
-        
-        HRESULT ( STDMETHODCALLTYPE *PowerDown )( 
-            IConsole * This,
-            /* [retval][out] */ IProgress **aProgress);
-        
-        HRESULT ( STDMETHODCALLTYPE *Reset )( 
-            IConsole * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *Pause )( 
-            IConsole * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *Resume )( 
-            IConsole * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *PowerButton )( 
-            IConsole * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *SleepButton )( 
-            IConsole * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPowerButtonHandled )( 
-            IConsole * This,
-            /* [retval][out] */ BOOL *aHandled);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetGuestEnteredACPIMode )( 
-            IConsole * This,
-            /* [retval][out] */ BOOL *aEntered);
-        
-        HRESULT ( STDMETHODCALLTYPE *SaveState )( 
-            IConsole * This,
-            /* [retval][out] */ IProgress **aProgress);
-        
-        HRESULT ( STDMETHODCALLTYPE *AdoptSavedState )( 
-            IConsole * This,
-            /* [in] */ BSTR aSavedStateFile);
-        
-        HRESULT ( STDMETHODCALLTYPE *ForgetSavedState )( 
-            IConsole * This,
-            /* [in] */ BOOL aRemove);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetDeviceActivity )( 
-            IConsole * This,
-            /* [in] */ DeviceType aType,
-            /* [retval][out] */ DeviceActivity *aActivity);
-        
-        HRESULT ( STDMETHODCALLTYPE *AttachUSBDevice )( 
-            IConsole * This,
-            /* [in] */ BSTR aId);
-        
-        HRESULT ( STDMETHODCALLTYPE *DetachUSBDevice )( 
-            IConsole * This,
-            /* [in] */ BSTR aId,
-            /* [retval][out] */ IUSBDevice **aDevice);
-        
-        HRESULT ( STDMETHODCALLTYPE *FindUSBDeviceByAddress )( 
-            IConsole * This,
-            /* [in] */ BSTR aName,
-            /* [retval][out] */ IUSBDevice **aDevice);
-        
-        HRESULT ( STDMETHODCALLTYPE *FindUSBDeviceById )( 
-            IConsole * This,
-            /* [in] */ BSTR aId,
-            /* [retval][out] */ IUSBDevice **aDevice);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateSharedFolder )( 
-            IConsole * This,
-            /* [in] */ BSTR aName,
-            /* [in] */ BSTR aHostPath,
-            /* [in] */ BOOL aWritable);
-        
-        HRESULT ( STDMETHODCALLTYPE *RemoveSharedFolder )( 
-            IConsole * This,
-            /* [in] */ BSTR aName);
-        
-        HRESULT ( STDMETHODCALLTYPE *TakeSnapshot )( 
-            IConsole * This,
-            /* [in] */ BSTR aName,
-            /* [in] */ BSTR aDescription,
-            /* [retval][out] */ IProgress **aProgress);
-        
-        HRESULT ( STDMETHODCALLTYPE *DeleteSnapshot )( 
-            IConsole * This,
-            /* [in] */ BSTR aId,
-            /* [retval][out] */ IProgress **aProgress);
-        
-        HRESULT ( STDMETHODCALLTYPE *RestoreSnapshot )( 
-            IConsole * This,
-            /* [in] */ ISnapshot *aSnapshot,
-            /* [retval][out] */ IProgress **aProgress);
-        
-        HRESULT ( STDMETHODCALLTYPE *Teleport )( 
-            IConsole * This,
-            /* [in] */ BSTR aHostname,
-            /* [in] */ ULONG aTcpport,
-            /* [in] */ BSTR aPassword,
-            /* [in] */ ULONG aMaxDowntime,
-            /* [retval][out] */ IProgress **aProgress);
-        
-        HRESULT ( STDMETHODCALLTYPE *RegisterCallback )( 
-            IConsole * This,
-            /* [in] */ IConsoleCallback *aCallback);
-        
-        HRESULT ( STDMETHODCALLTYPE *UnregisterCallback )( 
-            IConsole * This,
-            /* [in] */ IConsoleCallback *aCallback);
-        
-        END_INTERFACE
-    } IConsoleVtbl;
-
-    interface IConsole
-    {
-        CONST_VTBL struct IConsoleVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IConsole_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IConsole_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IConsole_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IConsole_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IConsole_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IConsole_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IConsole_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IConsole_get_Machine(This,aMachine)	\
-    (This)->lpVtbl -> get_Machine(This,aMachine)
-
-#define IConsole_get_State(This,aState)	\
-    (This)->lpVtbl -> get_State(This,aState)
-
-#define IConsole_get_Guest(This,aGuest)	\
-    (This)->lpVtbl -> get_Guest(This,aGuest)
-
-#define IConsole_get_Keyboard(This,aKeyboard)	\
-    (This)->lpVtbl -> get_Keyboard(This,aKeyboard)
-
-#define IConsole_get_Mouse(This,aMouse)	\
-    (This)->lpVtbl -> get_Mouse(This,aMouse)
-
-#define IConsole_get_Display(This,aDisplay)	\
-    (This)->lpVtbl -> get_Display(This,aDisplay)
-
-#define IConsole_get_Debugger(This,aDebugger)	\
-    (This)->lpVtbl -> get_Debugger(This,aDebugger)
-
-#define IConsole_get_USBDevices(This,aUSBDevices)	\
-    (This)->lpVtbl -> get_USBDevices(This,aUSBDevices)
-
-#define IConsole_get_RemoteUSBDevices(This,aRemoteUSBDevices)	\
-    (This)->lpVtbl -> get_RemoteUSBDevices(This,aRemoteUSBDevices)
-
-#define IConsole_get_SharedFolders(This,aSharedFolders)	\
-    (This)->lpVtbl -> get_SharedFolders(This,aSharedFolders)
-
-#define IConsole_get_RemoteDisplayInfo(This,aRemoteDisplayInfo)	\
-    (This)->lpVtbl -> get_RemoteDisplayInfo(This,aRemoteDisplayInfo)
-
-#define IConsole_PowerUp(This,aProgress)	\
-    (This)->lpVtbl -> PowerUp(This,aProgress)
-
-#define IConsole_PowerUpPaused(This,aProgress)	\
-    (This)->lpVtbl -> PowerUpPaused(This,aProgress)
-
-#define IConsole_PowerDown(This,aProgress)	\
-    (This)->lpVtbl -> PowerDown(This,aProgress)
-
-#define IConsole_Reset(This)	\
-    (This)->lpVtbl -> Reset(This)
-
-#define IConsole_Pause(This)	\
-    (This)->lpVtbl -> Pause(This)
-
-#define IConsole_Resume(This)	\
-    (This)->lpVtbl -> Resume(This)
-
-#define IConsole_PowerButton(This)	\
-    (This)->lpVtbl -> PowerButton(This)
-
-#define IConsole_SleepButton(This)	\
-    (This)->lpVtbl -> SleepButton(This)
-
-#define IConsole_GetPowerButtonHandled(This,aHandled)	\
-    (This)->lpVtbl -> GetPowerButtonHandled(This,aHandled)
-
-#define IConsole_GetGuestEnteredACPIMode(This,aEntered)	\
-    (This)->lpVtbl -> GetGuestEnteredACPIMode(This,aEntered)
-
-#define IConsole_SaveState(This,aProgress)	\
-    (This)->lpVtbl -> SaveState(This,aProgress)
-
-#define IConsole_AdoptSavedState(This,aSavedStateFile)	\
-    (This)->lpVtbl -> AdoptSavedState(This,aSavedStateFile)
-
-#define IConsole_ForgetSavedState(This,aRemove)	\
-    (This)->lpVtbl -> ForgetSavedState(This,aRemove)
-
-#define IConsole_GetDeviceActivity(This,aType,aActivity)	\
-    (This)->lpVtbl -> GetDeviceActivity(This,aType,aActivity)
-
-#define IConsole_AttachUSBDevice(This,aId)	\
-    (This)->lpVtbl -> AttachUSBDevice(This,aId)
-
-#define IConsole_DetachUSBDevice(This,aId,aDevice)	\
-    (This)->lpVtbl -> DetachUSBDevice(This,aId,aDevice)
-
-#define IConsole_FindUSBDeviceByAddress(This,aName,aDevice)	\
-    (This)->lpVtbl -> FindUSBDeviceByAddress(This,aName,aDevice)
-
-#define IConsole_FindUSBDeviceById(This,aId,aDevice)	\
-    (This)->lpVtbl -> FindUSBDeviceById(This,aId,aDevice)
-
-#define IConsole_CreateSharedFolder(This,aName,aHostPath,aWritable)	\
-    (This)->lpVtbl -> CreateSharedFolder(This,aName,aHostPath,aWritable)
-
-#define IConsole_RemoveSharedFolder(This,aName)	\
-    (This)->lpVtbl -> RemoveSharedFolder(This,aName)
-
-#define IConsole_TakeSnapshot(This,aName,aDescription,aProgress)	\
-    (This)->lpVtbl -> TakeSnapshot(This,aName,aDescription,aProgress)
-
-#define IConsole_DeleteSnapshot(This,aId,aProgress)	\
-    (This)->lpVtbl -> DeleteSnapshot(This,aId,aProgress)
-
-#define IConsole_RestoreSnapshot(This,aSnapshot,aProgress)	\
-    (This)->lpVtbl -> RestoreSnapshot(This,aSnapshot,aProgress)
-
-#define IConsole_Teleport(This,aHostname,aTcpport,aPassword,aMaxDowntime,aProgress)	\
-    (This)->lpVtbl -> Teleport(This,aHostname,aTcpport,aPassword,aMaxDowntime,aProgress)
-
-#define IConsole_RegisterCallback(This,aCallback)	\
-    (This)->lpVtbl -> RegisterCallback(This,aCallback)
-
-#define IConsole_UnregisterCallback(This,aCallback)	\
-    (This)->lpVtbl -> UnregisterCallback(This,aCallback)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IConsole_get_Machine_Proxy( 
-    IConsole * This,
-    /* [retval][out] */ IMachine **aMachine);
-
-
-void __RPC_STUB IConsole_get_Machine_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IConsole_get_State_Proxy( 
-    IConsole * This,
-    /* [retval][out] */ MachineState *aState);
-
-
-void __RPC_STUB IConsole_get_State_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IConsole_get_Guest_Proxy( 
-    IConsole * This,
-    /* [retval][out] */ IGuest **aGuest);
-
-
-void __RPC_STUB IConsole_get_Guest_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IConsole_get_Keyboard_Proxy( 
-    IConsole * This,
-    /* [retval][out] */ IKeyboard **aKeyboard);
-
-
-void __RPC_STUB IConsole_get_Keyboard_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IConsole_get_Mouse_Proxy( 
-    IConsole * This,
-    /* [retval][out] */ IMouse **aMouse);
-
-
-void __RPC_STUB IConsole_get_Mouse_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IConsole_get_Display_Proxy( 
-    IConsole * This,
-    /* [retval][out] */ IDisplay **aDisplay);
-
-
-void __RPC_STUB IConsole_get_Display_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IConsole_get_Debugger_Proxy( 
-    IConsole * This,
-    /* [retval][out] */ IMachineDebugger **aDebugger);
-
-
-void __RPC_STUB IConsole_get_Debugger_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IConsole_get_USBDevices_Proxy( 
-    IConsole * This,
-    /* [retval][out] */ SAFEARRAY * *aUSBDevices);
-
-
-void __RPC_STUB IConsole_get_USBDevices_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IConsole_get_RemoteUSBDevices_Proxy( 
-    IConsole * This,
-    /* [retval][out] */ SAFEARRAY * *aRemoteUSBDevices);
-
-
-void __RPC_STUB IConsole_get_RemoteUSBDevices_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IConsole_get_SharedFolders_Proxy( 
-    IConsole * This,
-    /* [retval][out] */ SAFEARRAY * *aSharedFolders);
-
-
-void __RPC_STUB IConsole_get_SharedFolders_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IConsole_get_RemoteDisplayInfo_Proxy( 
-    IConsole * This,
-    /* [retval][out] */ IRemoteDisplayInfo **aRemoteDisplayInfo);
-
-
-void __RPC_STUB IConsole_get_RemoteDisplayInfo_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsole_PowerUp_Proxy( 
-    IConsole * This,
-    /* [retval][out] */ IProgress **aProgress);
-
-
-void __RPC_STUB IConsole_PowerUp_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsole_PowerUpPaused_Proxy( 
-    IConsole * This,
-    /* [retval][out] */ IProgress **aProgress);
-
-
-void __RPC_STUB IConsole_PowerUpPaused_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsole_PowerDown_Proxy( 
-    IConsole * This,
-    /* [retval][out] */ IProgress **aProgress);
-
-
-void __RPC_STUB IConsole_PowerDown_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsole_Reset_Proxy( 
-    IConsole * This);
-
-
-void __RPC_STUB IConsole_Reset_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsole_Pause_Proxy( 
-    IConsole * This);
-
-
-void __RPC_STUB IConsole_Pause_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsole_Resume_Proxy( 
-    IConsole * This);
-
-
-void __RPC_STUB IConsole_Resume_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsole_PowerButton_Proxy( 
-    IConsole * This);
-
-
-void __RPC_STUB IConsole_PowerButton_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsole_SleepButton_Proxy( 
-    IConsole * This);
-
-
-void __RPC_STUB IConsole_SleepButton_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsole_GetPowerButtonHandled_Proxy( 
-    IConsole * This,
-    /* [retval][out] */ BOOL *aHandled);
-
-
-void __RPC_STUB IConsole_GetPowerButtonHandled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsole_GetGuestEnteredACPIMode_Proxy( 
-    IConsole * This,
-    /* [retval][out] */ BOOL *aEntered);
-
-
-void __RPC_STUB IConsole_GetGuestEnteredACPIMode_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsole_SaveState_Proxy( 
-    IConsole * This,
-    /* [retval][out] */ IProgress **aProgress);
-
-
-void __RPC_STUB IConsole_SaveState_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsole_AdoptSavedState_Proxy( 
-    IConsole * This,
-    /* [in] */ BSTR aSavedStateFile);
-
-
-void __RPC_STUB IConsole_AdoptSavedState_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsole_ForgetSavedState_Proxy( 
-    IConsole * This,
-    /* [in] */ BOOL aRemove);
-
-
-void __RPC_STUB IConsole_ForgetSavedState_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsole_GetDeviceActivity_Proxy( 
-    IConsole * This,
-    /* [in] */ DeviceType aType,
-    /* [retval][out] */ DeviceActivity *aActivity);
-
-
-void __RPC_STUB IConsole_GetDeviceActivity_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsole_AttachUSBDevice_Proxy( 
-    IConsole * This,
-    /* [in] */ BSTR aId);
-
-
-void __RPC_STUB IConsole_AttachUSBDevice_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsole_DetachUSBDevice_Proxy( 
-    IConsole * This,
-    /* [in] */ BSTR aId,
-    /* [retval][out] */ IUSBDevice **aDevice);
-
-
-void __RPC_STUB IConsole_DetachUSBDevice_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsole_FindUSBDeviceByAddress_Proxy( 
-    IConsole * This,
-    /* [in] */ BSTR aName,
-    /* [retval][out] */ IUSBDevice **aDevice);
-
-
-void __RPC_STUB IConsole_FindUSBDeviceByAddress_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsole_FindUSBDeviceById_Proxy( 
-    IConsole * This,
-    /* [in] */ BSTR aId,
-    /* [retval][out] */ IUSBDevice **aDevice);
-
-
-void __RPC_STUB IConsole_FindUSBDeviceById_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsole_CreateSharedFolder_Proxy( 
-    IConsole * This,
-    /* [in] */ BSTR aName,
-    /* [in] */ BSTR aHostPath,
-    /* [in] */ BOOL aWritable);
-
-
-void __RPC_STUB IConsole_CreateSharedFolder_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsole_RemoveSharedFolder_Proxy( 
-    IConsole * This,
-    /* [in] */ BSTR aName);
-
-
-void __RPC_STUB IConsole_RemoveSharedFolder_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsole_TakeSnapshot_Proxy( 
-    IConsole * This,
-    /* [in] */ BSTR aName,
-    /* [in] */ BSTR aDescription,
-    /* [retval][out] */ IProgress **aProgress);
-
-
-void __RPC_STUB IConsole_TakeSnapshot_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsole_DeleteSnapshot_Proxy( 
-    IConsole * This,
-    /* [in] */ BSTR aId,
-    /* [retval][out] */ IProgress **aProgress);
-
-
-void __RPC_STUB IConsole_DeleteSnapshot_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsole_RestoreSnapshot_Proxy( 
-    IConsole * This,
-    /* [in] */ ISnapshot *aSnapshot,
-    /* [retval][out] */ IProgress **aProgress);
-
-
-void __RPC_STUB IConsole_RestoreSnapshot_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsole_Teleport_Proxy( 
-    IConsole * This,
-    /* [in] */ BSTR aHostname,
-    /* [in] */ ULONG aTcpport,
-    /* [in] */ BSTR aPassword,
-    /* [in] */ ULONG aMaxDowntime,
-    /* [retval][out] */ IProgress **aProgress);
-
-
-void __RPC_STUB IConsole_Teleport_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsole_RegisterCallback_Proxy( 
-    IConsole * This,
-    /* [in] */ IConsoleCallback *aCallback);
-
-
-void __RPC_STUB IConsole_RegisterCallback_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IConsole_UnregisterCallback_Proxy( 
-    IConsole * This,
-    /* [in] */ IConsoleCallback *aCallback);
-
-
-void __RPC_STUB IConsole_UnregisterCallback_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IConsole_INTERFACE_DEFINED__ */
-
-
-#ifndef __IHostNetworkInterface_INTERFACE_DEFINED__
-#define __IHostNetworkInterface_INTERFACE_DEFINED__
-
-/* interface IHostNetworkInterface */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IHostNetworkInterface;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("ce6fae58-7642-4102-b5db-c9005c2320a8")
-    IHostNetworkInterface : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Name( 
-            /* [retval][out] */ BSTR *aName) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Id( 
-            /* [retval][out] */ BSTR *aId) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_NetworkName( 
-            /* [retval][out] */ BSTR *aNetworkName) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_DhcpEnabled( 
-            /* [retval][out] */ BOOL *aDhcpEnabled) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_IPAddress( 
-            /* [retval][out] */ BSTR *aIPAddress) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_NetworkMask( 
-            /* [retval][out] */ BSTR *aNetworkMask) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_IPV6Supported( 
-            /* [retval][out] */ BOOL *aIPV6Supported) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_IPV6Address( 
-            /* [retval][out] */ BSTR *aIPV6Address) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_IPV6NetworkMaskPrefixLength( 
-            /* [retval][out] */ ULONG *aIPV6NetworkMaskPrefixLength) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_HardwareAddress( 
-            /* [retval][out] */ BSTR *aHardwareAddress) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_MediumType( 
-            /* [retval][out] */ HostNetworkInterfaceMediumType *aMediumType) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Status( 
-            /* [retval][out] */ HostNetworkInterfaceStatus *aStatus) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_InterfaceType( 
-            /* [retval][out] */ HostNetworkInterfaceType *aInterfaceType) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE EnableStaticIpConfig( 
-            /* [in] */ BSTR aIPAddress,
-            /* [in] */ BSTR aNetworkMask) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE EnableStaticIpConfigV6( 
-            /* [in] */ BSTR aIPV6Address,
-            /* [in] */ ULONG aIPV6NetworkMaskPrefixLength) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE EnableDynamicIpConfig( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE DhcpRediscover( void) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IHostNetworkInterfaceVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IHostNetworkInterface * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IHostNetworkInterface * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IHostNetworkInterface * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IHostNetworkInterface * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IHostNetworkInterface * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IHostNetworkInterface * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IHostNetworkInterface * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Name )( 
-            IHostNetworkInterface * This,
-            /* [retval][out] */ BSTR *aName);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Id )( 
-            IHostNetworkInterface * This,
-            /* [retval][out] */ BSTR *aId);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_NetworkName )( 
-            IHostNetworkInterface * This,
-            /* [retval][out] */ BSTR *aNetworkName);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_DhcpEnabled )( 
-            IHostNetworkInterface * This,
-            /* [retval][out] */ BOOL *aDhcpEnabled);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_IPAddress )( 
-            IHostNetworkInterface * This,
-            /* [retval][out] */ BSTR *aIPAddress);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_NetworkMask )( 
-            IHostNetworkInterface * This,
-            /* [retval][out] */ BSTR *aNetworkMask);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_IPV6Supported )( 
-            IHostNetworkInterface * This,
-            /* [retval][out] */ BOOL *aIPV6Supported);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_IPV6Address )( 
-            IHostNetworkInterface * This,
-            /* [retval][out] */ BSTR *aIPV6Address);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_IPV6NetworkMaskPrefixLength )( 
-            IHostNetworkInterface * This,
-            /* [retval][out] */ ULONG *aIPV6NetworkMaskPrefixLength);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_HardwareAddress )( 
-            IHostNetworkInterface * This,
-            /* [retval][out] */ BSTR *aHardwareAddress);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_MediumType )( 
-            IHostNetworkInterface * This,
-            /* [retval][out] */ HostNetworkInterfaceMediumType *aMediumType);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Status )( 
-            IHostNetworkInterface * This,
-            /* [retval][out] */ HostNetworkInterfaceStatus *aStatus);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_InterfaceType )( 
-            IHostNetworkInterface * This,
-            /* [retval][out] */ HostNetworkInterfaceType *aInterfaceType);
-        
-        HRESULT ( STDMETHODCALLTYPE *EnableStaticIpConfig )( 
-            IHostNetworkInterface * This,
-            /* [in] */ BSTR aIPAddress,
-            /* [in] */ BSTR aNetworkMask);
-        
-        HRESULT ( STDMETHODCALLTYPE *EnableStaticIpConfigV6 )( 
-            IHostNetworkInterface * This,
-            /* [in] */ BSTR aIPV6Address,
-            /* [in] */ ULONG aIPV6NetworkMaskPrefixLength);
-        
-        HRESULT ( STDMETHODCALLTYPE *EnableDynamicIpConfig )( 
-            IHostNetworkInterface * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *DhcpRediscover )( 
-            IHostNetworkInterface * This);
-        
-        END_INTERFACE
-    } IHostNetworkInterfaceVtbl;
-
-    interface IHostNetworkInterface
-    {
-        CONST_VTBL struct IHostNetworkInterfaceVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IHostNetworkInterface_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IHostNetworkInterface_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IHostNetworkInterface_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IHostNetworkInterface_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IHostNetworkInterface_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IHostNetworkInterface_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IHostNetworkInterface_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IHostNetworkInterface_get_Name(This,aName)	\
-    (This)->lpVtbl -> get_Name(This,aName)
-
-#define IHostNetworkInterface_get_Id(This,aId)	\
-    (This)->lpVtbl -> get_Id(This,aId)
-
-#define IHostNetworkInterface_get_NetworkName(This,aNetworkName)	\
-    (This)->lpVtbl -> get_NetworkName(This,aNetworkName)
-
-#define IHostNetworkInterface_get_DhcpEnabled(This,aDhcpEnabled)	\
-    (This)->lpVtbl -> get_DhcpEnabled(This,aDhcpEnabled)
-
-#define IHostNetworkInterface_get_IPAddress(This,aIPAddress)	\
-    (This)->lpVtbl -> get_IPAddress(This,aIPAddress)
-
-#define IHostNetworkInterface_get_NetworkMask(This,aNetworkMask)	\
-    (This)->lpVtbl -> get_NetworkMask(This,aNetworkMask)
-
-#define IHostNetworkInterface_get_IPV6Supported(This,aIPV6Supported)	\
-    (This)->lpVtbl -> get_IPV6Supported(This,aIPV6Supported)
-
-#define IHostNetworkInterface_get_IPV6Address(This,aIPV6Address)	\
-    (This)->lpVtbl -> get_IPV6Address(This,aIPV6Address)
-
-#define IHostNetworkInterface_get_IPV6NetworkMaskPrefixLength(This,aIPV6NetworkMaskPrefixLength)	\
-    (This)->lpVtbl -> get_IPV6NetworkMaskPrefixLength(This,aIPV6NetworkMaskPrefixLength)
-
-#define IHostNetworkInterface_get_HardwareAddress(This,aHardwareAddress)	\
-    (This)->lpVtbl -> get_HardwareAddress(This,aHardwareAddress)
-
-#define IHostNetworkInterface_get_MediumType(This,aMediumType)	\
-    (This)->lpVtbl -> get_MediumType(This,aMediumType)
-
-#define IHostNetworkInterface_get_Status(This,aStatus)	\
-    (This)->lpVtbl -> get_Status(This,aStatus)
-
-#define IHostNetworkInterface_get_InterfaceType(This,aInterfaceType)	\
-    (This)->lpVtbl -> get_InterfaceType(This,aInterfaceType)
-
-#define IHostNetworkInterface_EnableStaticIpConfig(This,aIPAddress,aNetworkMask)	\
-    (This)->lpVtbl -> EnableStaticIpConfig(This,aIPAddress,aNetworkMask)
-
-#define IHostNetworkInterface_EnableStaticIpConfigV6(This,aIPV6Address,aIPV6NetworkMaskPrefixLength)	\
-    (This)->lpVtbl -> EnableStaticIpConfigV6(This,aIPV6Address,aIPV6NetworkMaskPrefixLength)
-
-#define IHostNetworkInterface_EnableDynamicIpConfig(This)	\
-    (This)->lpVtbl -> EnableDynamicIpConfig(This)
-
-#define IHostNetworkInterface_DhcpRediscover(This)	\
-    (This)->lpVtbl -> DhcpRediscover(This)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IHostNetworkInterface_get_Name_Proxy( 
-    IHostNetworkInterface * This,
-    /* [retval][out] */ BSTR *aName);
-
-
-void __RPC_STUB IHostNetworkInterface_get_Name_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IHostNetworkInterface_get_Id_Proxy( 
-    IHostNetworkInterface * This,
-    /* [retval][out] */ BSTR *aId);
-
-
-void __RPC_STUB IHostNetworkInterface_get_Id_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IHostNetworkInterface_get_NetworkName_Proxy( 
-    IHostNetworkInterface * This,
-    /* [retval][out] */ BSTR *aNetworkName);
-
-
-void __RPC_STUB IHostNetworkInterface_get_NetworkName_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IHostNetworkInterface_get_DhcpEnabled_Proxy( 
-    IHostNetworkInterface * This,
-    /* [retval][out] */ BOOL *aDhcpEnabled);
-
-
-void __RPC_STUB IHostNetworkInterface_get_DhcpEnabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IHostNetworkInterface_get_IPAddress_Proxy( 
-    IHostNetworkInterface * This,
-    /* [retval][out] */ BSTR *aIPAddress);
-
-
-void __RPC_STUB IHostNetworkInterface_get_IPAddress_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IHostNetworkInterface_get_NetworkMask_Proxy( 
-    IHostNetworkInterface * This,
-    /* [retval][out] */ BSTR *aNetworkMask);
-
-
-void __RPC_STUB IHostNetworkInterface_get_NetworkMask_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IHostNetworkInterface_get_IPV6Supported_Proxy( 
-    IHostNetworkInterface * This,
-    /* [retval][out] */ BOOL *aIPV6Supported);
-
-
-void __RPC_STUB IHostNetworkInterface_get_IPV6Supported_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IHostNetworkInterface_get_IPV6Address_Proxy( 
-    IHostNetworkInterface * This,
-    /* [retval][out] */ BSTR *aIPV6Address);
-
-
-void __RPC_STUB IHostNetworkInterface_get_IPV6Address_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IHostNetworkInterface_get_IPV6NetworkMaskPrefixLength_Proxy( 
-    IHostNetworkInterface * This,
-    /* [retval][out] */ ULONG *aIPV6NetworkMaskPrefixLength);
-
-
-void __RPC_STUB IHostNetworkInterface_get_IPV6NetworkMaskPrefixLength_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IHostNetworkInterface_get_HardwareAddress_Proxy( 
-    IHostNetworkInterface * This,
-    /* [retval][out] */ BSTR *aHardwareAddress);
-
-
-void __RPC_STUB IHostNetworkInterface_get_HardwareAddress_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IHostNetworkInterface_get_MediumType_Proxy( 
-    IHostNetworkInterface * This,
-    /* [retval][out] */ HostNetworkInterfaceMediumType *aMediumType);
-
-
-void __RPC_STUB IHostNetworkInterface_get_MediumType_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IHostNetworkInterface_get_Status_Proxy( 
-    IHostNetworkInterface * This,
-    /* [retval][out] */ HostNetworkInterfaceStatus *aStatus);
-
-
-void __RPC_STUB IHostNetworkInterface_get_Status_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IHostNetworkInterface_get_InterfaceType_Proxy( 
-    IHostNetworkInterface * This,
-    /* [retval][out] */ HostNetworkInterfaceType *aInterfaceType);
-
-
-void __RPC_STUB IHostNetworkInterface_get_InterfaceType_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IHostNetworkInterface_EnableStaticIpConfig_Proxy( 
-    IHostNetworkInterface * This,
-    /* [in] */ BSTR aIPAddress,
-    /* [in] */ BSTR aNetworkMask);
-
-
-void __RPC_STUB IHostNetworkInterface_EnableStaticIpConfig_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IHostNetworkInterface_EnableStaticIpConfigV6_Proxy( 
-    IHostNetworkInterface * This,
-    /* [in] */ BSTR aIPV6Address,
-    /* [in] */ ULONG aIPV6NetworkMaskPrefixLength);
-
-
-void __RPC_STUB IHostNetworkInterface_EnableStaticIpConfigV6_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IHostNetworkInterface_EnableDynamicIpConfig_Proxy( 
-    IHostNetworkInterface * This);
-
-
-void __RPC_STUB IHostNetworkInterface_EnableDynamicIpConfig_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IHostNetworkInterface_DhcpRediscover_Proxy( 
-    IHostNetworkInterface * This);
-
-
-void __RPC_STUB IHostNetworkInterface_DhcpRediscover_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IHostNetworkInterface_INTERFACE_DEFINED__ */
-
-
-#ifndef __IHost_INTERFACE_DEFINED__
-#define __IHost_INTERFACE_DEFINED__
-
-/* interface IHost */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IHost;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("35b004f4-7806-4009-bfa8-d1308adba7e5")
-    IHost : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_DVDDrives( 
-            /* [retval][out] */ SAFEARRAY * *aDVDDrives) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_FloppyDrives( 
-            /* [retval][out] */ SAFEARRAY * *aFloppyDrives) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_USBDevices( 
-            /* [retval][out] */ SAFEARRAY * *aUSBDevices) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_USBDeviceFilters( 
-            /* [retval][out] */ SAFEARRAY * *aUSBDeviceFilters) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_NetworkInterfaces( 
-            /* [retval][out] */ SAFEARRAY * *aNetworkInterfaces) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_ProcessorCount( 
-            /* [retval][out] */ ULONG *aProcessorCount) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_ProcessorOnlineCount( 
-            /* [retval][out] */ ULONG *aProcessorOnlineCount) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_ProcessorCoreCount( 
-            /* [retval][out] */ ULONG *aProcessorCoreCount) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_MemorySize( 
-            /* [retval][out] */ ULONG *aMemorySize) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_MemoryAvailable( 
-            /* [retval][out] */ ULONG *aMemoryAvailable) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_OperatingSystem( 
-            /* [retval][out] */ BSTR *aOperatingSystem) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_OSVersion( 
-            /* [retval][out] */ BSTR *aOSVersion) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_UTCTime( 
-            /* [retval][out] */ LONG64 *aUTCTime) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Acceleration3DAvailable( 
-            /* [retval][out] */ BOOL *aAcceleration3DAvailable) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetProcessorSpeed( 
-            /* [in] */ ULONG aCpuId,
-            /* [retval][out] */ ULONG *aSpeed) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetProcessorFeature( 
-            /* [in] */ ProcessorFeature aFeature,
-            /* [retval][out] */ BOOL *aSupported) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetProcessorDescription( 
-            /* [in] */ ULONG aCpuId,
-            /* [retval][out] */ BSTR *aDescription) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetProcessorCPUIDLeaf( 
-            /* [in] */ ULONG aCpuId,
-            /* [in] */ ULONG aLeaf,
-            /* [in] */ ULONG aSubLeaf,
-            /* [out] */ ULONG *aValEax,
-            /* [out] */ ULONG *aValEbx,
-            /* [out] */ ULONG *aValEcx,
-            /* [out] */ ULONG *aValEdx) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateHostOnlyNetworkInterface( 
-            /* [out] */ IHostNetworkInterface **aHostInterface,
-            /* [retval][out] */ IProgress **aProgress) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE RemoveHostOnlyNetworkInterface( 
-            /* [in] */ BSTR aId,
-            /* [retval][out] */ IProgress **aProgress) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateUSBDeviceFilter( 
-            /* [in] */ BSTR aName,
-            /* [retval][out] */ IHostUSBDeviceFilter **aFilter) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE InsertUSBDeviceFilter( 
-            /* [in] */ ULONG aPosition,
-            /* [in] */ IHostUSBDeviceFilter *aFilter) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE RemoveUSBDeviceFilter( 
-            /* [in] */ ULONG aPosition) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE FindHostDVDDrive( 
-            /* [in] */ BSTR aName,
-            /* [retval][out] */ IMedium **aDrive) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE FindHostFloppyDrive( 
-            /* [in] */ BSTR aName,
-            /* [retval][out] */ IMedium **aDrive) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE FindHostNetworkInterfaceByName( 
-            /* [in] */ BSTR aName,
-            /* [retval][out] */ IHostNetworkInterface **aNetworkInterface) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE FindHostNetworkInterfaceById( 
-            /* [in] */ BSTR aId,
-            /* [retval][out] */ IHostNetworkInterface **aNetworkInterface) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE FindHostNetworkInterfacesOfType( 
-            /* [in] */ HostNetworkInterfaceType aType,
-            /* [retval][out] */ SAFEARRAY * *aNetworkInterfaces) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE FindUSBDeviceById( 
-            /* [in] */ BSTR aId,
-            /* [retval][out] */ IHostUSBDevice **aDevice) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE FindUSBDeviceByAddress( 
-            /* [in] */ BSTR aName,
-            /* [retval][out] */ IHostUSBDevice **aDevice) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IHostVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IHost * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IHost * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IHost * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IHost * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IHost * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IHost * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IHost * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_DVDDrives )( 
-            IHost * This,
-            /* [retval][out] */ SAFEARRAY * *aDVDDrives);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_FloppyDrives )( 
-            IHost * This,
-            /* [retval][out] */ SAFEARRAY * *aFloppyDrives);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_USBDevices )( 
-            IHost * This,
-            /* [retval][out] */ SAFEARRAY * *aUSBDevices);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_USBDeviceFilters )( 
-            IHost * This,
-            /* [retval][out] */ SAFEARRAY * *aUSBDeviceFilters);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_NetworkInterfaces )( 
-            IHost * This,
-            /* [retval][out] */ SAFEARRAY * *aNetworkInterfaces);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_ProcessorCount )( 
-            IHost * This,
-            /* [retval][out] */ ULONG *aProcessorCount);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_ProcessorOnlineCount )( 
-            IHost * This,
-            /* [retval][out] */ ULONG *aProcessorOnlineCount);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_ProcessorCoreCount )( 
-            IHost * This,
-            /* [retval][out] */ ULONG *aProcessorCoreCount);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_MemorySize )( 
-            IHost * This,
-            /* [retval][out] */ ULONG *aMemorySize);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_MemoryAvailable )( 
-            IHost * This,
-            /* [retval][out] */ ULONG *aMemoryAvailable);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_OperatingSystem )( 
-            IHost * This,
-            /* [retval][out] */ BSTR *aOperatingSystem);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_OSVersion )( 
-            IHost * This,
-            /* [retval][out] */ BSTR *aOSVersion);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_UTCTime )( 
-            IHost * This,
-            /* [retval][out] */ LONG64 *aUTCTime);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Acceleration3DAvailable )( 
-            IHost * This,
-            /* [retval][out] */ BOOL *aAcceleration3DAvailable);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetProcessorSpeed )( 
-            IHost * This,
-            /* [in] */ ULONG aCpuId,
-            /* [retval][out] */ ULONG *aSpeed);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetProcessorFeature )( 
-            IHost * This,
-            /* [in] */ ProcessorFeature aFeature,
-            /* [retval][out] */ BOOL *aSupported);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetProcessorDescription )( 
-            IHost * This,
-            /* [in] */ ULONG aCpuId,
-            /* [retval][out] */ BSTR *aDescription);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetProcessorCPUIDLeaf )( 
-            IHost * This,
-            /* [in] */ ULONG aCpuId,
-            /* [in] */ ULONG aLeaf,
-            /* [in] */ ULONG aSubLeaf,
-            /* [out] */ ULONG *aValEax,
-            /* [out] */ ULONG *aValEbx,
-            /* [out] */ ULONG *aValEcx,
-            /* [out] */ ULONG *aValEdx);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateHostOnlyNetworkInterface )( 
-            IHost * This,
-            /* [out] */ IHostNetworkInterface **aHostInterface,
-            /* [retval][out] */ IProgress **aProgress);
-        
-        HRESULT ( STDMETHODCALLTYPE *RemoveHostOnlyNetworkInterface )( 
-            IHost * This,
-            /* [in] */ BSTR aId,
-            /* [retval][out] */ IProgress **aProgress);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateUSBDeviceFilter )( 
-            IHost * This,
-            /* [in] */ BSTR aName,
-            /* [retval][out] */ IHostUSBDeviceFilter **aFilter);
-        
-        HRESULT ( STDMETHODCALLTYPE *InsertUSBDeviceFilter )( 
-            IHost * This,
-            /* [in] */ ULONG aPosition,
-            /* [in] */ IHostUSBDeviceFilter *aFilter);
-        
-        HRESULT ( STDMETHODCALLTYPE *RemoveUSBDeviceFilter )( 
-            IHost * This,
-            /* [in] */ ULONG aPosition);
-        
-        HRESULT ( STDMETHODCALLTYPE *FindHostDVDDrive )( 
-            IHost * This,
-            /* [in] */ BSTR aName,
-            /* [retval][out] */ IMedium **aDrive);
-        
-        HRESULT ( STDMETHODCALLTYPE *FindHostFloppyDrive )( 
-            IHost * This,
-            /* [in] */ BSTR aName,
-            /* [retval][out] */ IMedium **aDrive);
-        
-        HRESULT ( STDMETHODCALLTYPE *FindHostNetworkInterfaceByName )( 
-            IHost * This,
-            /* [in] */ BSTR aName,
-            /* [retval][out] */ IHostNetworkInterface **aNetworkInterface);
-        
-        HRESULT ( STDMETHODCALLTYPE *FindHostNetworkInterfaceById )( 
-            IHost * This,
-            /* [in] */ BSTR aId,
-            /* [retval][out] */ IHostNetworkInterface **aNetworkInterface);
-        
-        HRESULT ( STDMETHODCALLTYPE *FindHostNetworkInterfacesOfType )( 
-            IHost * This,
-            /* [in] */ HostNetworkInterfaceType aType,
-            /* [retval][out] */ SAFEARRAY * *aNetworkInterfaces);
-        
-        HRESULT ( STDMETHODCALLTYPE *FindUSBDeviceById )( 
-            IHost * This,
-            /* [in] */ BSTR aId,
-            /* [retval][out] */ IHostUSBDevice **aDevice);
-        
-        HRESULT ( STDMETHODCALLTYPE *FindUSBDeviceByAddress )( 
-            IHost * This,
-            /* [in] */ BSTR aName,
-            /* [retval][out] */ IHostUSBDevice **aDevice);
-        
-        END_INTERFACE
-    } IHostVtbl;
-
-    interface IHost
-    {
-        CONST_VTBL struct IHostVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IHost_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IHost_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IHost_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IHost_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IHost_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IHost_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IHost_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IHost_get_DVDDrives(This,aDVDDrives)	\
-    (This)->lpVtbl -> get_DVDDrives(This,aDVDDrives)
-
-#define IHost_get_FloppyDrives(This,aFloppyDrives)	\
-    (This)->lpVtbl -> get_FloppyDrives(This,aFloppyDrives)
-
-#define IHost_get_USBDevices(This,aUSBDevices)	\
-    (This)->lpVtbl -> get_USBDevices(This,aUSBDevices)
-
-#define IHost_get_USBDeviceFilters(This,aUSBDeviceFilters)	\
-    (This)->lpVtbl -> get_USBDeviceFilters(This,aUSBDeviceFilters)
-
-#define IHost_get_NetworkInterfaces(This,aNetworkInterfaces)	\
-    (This)->lpVtbl -> get_NetworkInterfaces(This,aNetworkInterfaces)
-
-#define IHost_get_ProcessorCount(This,aProcessorCount)	\
-    (This)->lpVtbl -> get_ProcessorCount(This,aProcessorCount)
-
-#define IHost_get_ProcessorOnlineCount(This,aProcessorOnlineCount)	\
-    (This)->lpVtbl -> get_ProcessorOnlineCount(This,aProcessorOnlineCount)
-
-#define IHost_get_ProcessorCoreCount(This,aProcessorCoreCount)	\
-    (This)->lpVtbl -> get_ProcessorCoreCount(This,aProcessorCoreCount)
-
-#define IHost_get_MemorySize(This,aMemorySize)	\
-    (This)->lpVtbl -> get_MemorySize(This,aMemorySize)
-
-#define IHost_get_MemoryAvailable(This,aMemoryAvailable)	\
-    (This)->lpVtbl -> get_MemoryAvailable(This,aMemoryAvailable)
-
-#define IHost_get_OperatingSystem(This,aOperatingSystem)	\
-    (This)->lpVtbl -> get_OperatingSystem(This,aOperatingSystem)
-
-#define IHost_get_OSVersion(This,aOSVersion)	\
-    (This)->lpVtbl -> get_OSVersion(This,aOSVersion)
-
-#define IHost_get_UTCTime(This,aUTCTime)	\
-    (This)->lpVtbl -> get_UTCTime(This,aUTCTime)
-
-#define IHost_get_Acceleration3DAvailable(This,aAcceleration3DAvailable)	\
-    (This)->lpVtbl -> get_Acceleration3DAvailable(This,aAcceleration3DAvailable)
-
-#define IHost_GetProcessorSpeed(This,aCpuId,aSpeed)	\
-    (This)->lpVtbl -> GetProcessorSpeed(This,aCpuId,aSpeed)
-
-#define IHost_GetProcessorFeature(This,aFeature,aSupported)	\
-    (This)->lpVtbl -> GetProcessorFeature(This,aFeature,aSupported)
-
-#define IHost_GetProcessorDescription(This,aCpuId,aDescription)	\
-    (This)->lpVtbl -> GetProcessorDescription(This,aCpuId,aDescription)
-
-#define IHost_GetProcessorCPUIDLeaf(This,aCpuId,aLeaf,aSubLeaf,aValEax,aValEbx,aValEcx,aValEdx)	\
-    (This)->lpVtbl -> GetProcessorCPUIDLeaf(This,aCpuId,aLeaf,aSubLeaf,aValEax,aValEbx,aValEcx,aValEdx)
-
-#define IHost_CreateHostOnlyNetworkInterface(This,aHostInterface,aProgress)	\
-    (This)->lpVtbl -> CreateHostOnlyNetworkInterface(This,aHostInterface,aProgress)
-
-#define IHost_RemoveHostOnlyNetworkInterface(This,aId,aProgress)	\
-    (This)->lpVtbl -> RemoveHostOnlyNetworkInterface(This,aId,aProgress)
-
-#define IHost_CreateUSBDeviceFilter(This,aName,aFilter)	\
-    (This)->lpVtbl -> CreateUSBDeviceFilter(This,aName,aFilter)
-
-#define IHost_InsertUSBDeviceFilter(This,aPosition,aFilter)	\
-    (This)->lpVtbl -> InsertUSBDeviceFilter(This,aPosition,aFilter)
-
-#define IHost_RemoveUSBDeviceFilter(This,aPosition)	\
-    (This)->lpVtbl -> RemoveUSBDeviceFilter(This,aPosition)
-
-#define IHost_FindHostDVDDrive(This,aName,aDrive)	\
-    (This)->lpVtbl -> FindHostDVDDrive(This,aName,aDrive)
-
-#define IHost_FindHostFloppyDrive(This,aName,aDrive)	\
-    (This)->lpVtbl -> FindHostFloppyDrive(This,aName,aDrive)
-
-#define IHost_FindHostNetworkInterfaceByName(This,aName,aNetworkInterface)	\
-    (This)->lpVtbl -> FindHostNetworkInterfaceByName(This,aName,aNetworkInterface)
-
-#define IHost_FindHostNetworkInterfaceById(This,aId,aNetworkInterface)	\
-    (This)->lpVtbl -> FindHostNetworkInterfaceById(This,aId,aNetworkInterface)
-
-#define IHost_FindHostNetworkInterfacesOfType(This,aType,aNetworkInterfaces)	\
-    (This)->lpVtbl -> FindHostNetworkInterfacesOfType(This,aType,aNetworkInterfaces)
-
-#define IHost_FindUSBDeviceById(This,aId,aDevice)	\
-    (This)->lpVtbl -> FindUSBDeviceById(This,aId,aDevice)
-
-#define IHost_FindUSBDeviceByAddress(This,aName,aDevice)	\
-    (This)->lpVtbl -> FindUSBDeviceByAddress(This,aName,aDevice)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IHost_get_DVDDrives_Proxy( 
-    IHost * This,
-    /* [retval][out] */ SAFEARRAY * *aDVDDrives);
-
-
-void __RPC_STUB IHost_get_DVDDrives_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IHost_get_FloppyDrives_Proxy( 
-    IHost * This,
-    /* [retval][out] */ SAFEARRAY * *aFloppyDrives);
-
-
-void __RPC_STUB IHost_get_FloppyDrives_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IHost_get_USBDevices_Proxy( 
-    IHost * This,
-    /* [retval][out] */ SAFEARRAY * *aUSBDevices);
-
-
-void __RPC_STUB IHost_get_USBDevices_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IHost_get_USBDeviceFilters_Proxy( 
-    IHost * This,
-    /* [retval][out] */ SAFEARRAY * *aUSBDeviceFilters);
-
-
-void __RPC_STUB IHost_get_USBDeviceFilters_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IHost_get_NetworkInterfaces_Proxy( 
-    IHost * This,
-    /* [retval][out] */ SAFEARRAY * *aNetworkInterfaces);
-
-
-void __RPC_STUB IHost_get_NetworkInterfaces_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IHost_get_ProcessorCount_Proxy( 
-    IHost * This,
-    /* [retval][out] */ ULONG *aProcessorCount);
-
-
-void __RPC_STUB IHost_get_ProcessorCount_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IHost_get_ProcessorOnlineCount_Proxy( 
-    IHost * This,
-    /* [retval][out] */ ULONG *aProcessorOnlineCount);
-
-
-void __RPC_STUB IHost_get_ProcessorOnlineCount_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IHost_get_ProcessorCoreCount_Proxy( 
-    IHost * This,
-    /* [retval][out] */ ULONG *aProcessorCoreCount);
-
-
-void __RPC_STUB IHost_get_ProcessorCoreCount_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IHost_get_MemorySize_Proxy( 
-    IHost * This,
-    /* [retval][out] */ ULONG *aMemorySize);
-
-
-void __RPC_STUB IHost_get_MemorySize_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IHost_get_MemoryAvailable_Proxy( 
-    IHost * This,
-    /* [retval][out] */ ULONG *aMemoryAvailable);
-
-
-void __RPC_STUB IHost_get_MemoryAvailable_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IHost_get_OperatingSystem_Proxy( 
-    IHost * This,
-    /* [retval][out] */ BSTR *aOperatingSystem);
-
-
-void __RPC_STUB IHost_get_OperatingSystem_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IHost_get_OSVersion_Proxy( 
-    IHost * This,
-    /* [retval][out] */ BSTR *aOSVersion);
-
-
-void __RPC_STUB IHost_get_OSVersion_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IHost_get_UTCTime_Proxy( 
-    IHost * This,
-    /* [retval][out] */ LONG64 *aUTCTime);
-
-
-void __RPC_STUB IHost_get_UTCTime_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IHost_get_Acceleration3DAvailable_Proxy( 
-    IHost * This,
-    /* [retval][out] */ BOOL *aAcceleration3DAvailable);
-
-
-void __RPC_STUB IHost_get_Acceleration3DAvailable_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IHost_GetProcessorSpeed_Proxy( 
-    IHost * This,
-    /* [in] */ ULONG aCpuId,
-    /* [retval][out] */ ULONG *aSpeed);
-
-
-void __RPC_STUB IHost_GetProcessorSpeed_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IHost_GetProcessorFeature_Proxy( 
-    IHost * This,
-    /* [in] */ ProcessorFeature aFeature,
-    /* [retval][out] */ BOOL *aSupported);
-
-
-void __RPC_STUB IHost_GetProcessorFeature_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IHost_GetProcessorDescription_Proxy( 
-    IHost * This,
-    /* [in] */ ULONG aCpuId,
-    /* [retval][out] */ BSTR *aDescription);
-
-
-void __RPC_STUB IHost_GetProcessorDescription_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IHost_GetProcessorCPUIDLeaf_Proxy( 
-    IHost * This,
-    /* [in] */ ULONG aCpuId,
-    /* [in] */ ULONG aLeaf,
-    /* [in] */ ULONG aSubLeaf,
-    /* [out] */ ULONG *aValEax,
-    /* [out] */ ULONG *aValEbx,
-    /* [out] */ ULONG *aValEcx,
-    /* [out] */ ULONG *aValEdx);
-
-
-void __RPC_STUB IHost_GetProcessorCPUIDLeaf_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IHost_CreateHostOnlyNetworkInterface_Proxy( 
-    IHost * This,
-    /* [out] */ IHostNetworkInterface **aHostInterface,
-    /* [retval][out] */ IProgress **aProgress);
-
-
-void __RPC_STUB IHost_CreateHostOnlyNetworkInterface_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IHost_RemoveHostOnlyNetworkInterface_Proxy( 
-    IHost * This,
-    /* [in] */ BSTR aId,
-    /* [retval][out] */ IProgress **aProgress);
-
-
-void __RPC_STUB IHost_RemoveHostOnlyNetworkInterface_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IHost_CreateUSBDeviceFilter_Proxy( 
-    IHost * This,
-    /* [in] */ BSTR aName,
-    /* [retval][out] */ IHostUSBDeviceFilter **aFilter);
-
-
-void __RPC_STUB IHost_CreateUSBDeviceFilter_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IHost_InsertUSBDeviceFilter_Proxy( 
-    IHost * This,
-    /* [in] */ ULONG aPosition,
-    /* [in] */ IHostUSBDeviceFilter *aFilter);
-
-
-void __RPC_STUB IHost_InsertUSBDeviceFilter_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IHost_RemoveUSBDeviceFilter_Proxy( 
-    IHost * This,
-    /* [in] */ ULONG aPosition);
-
-
-void __RPC_STUB IHost_RemoveUSBDeviceFilter_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IHost_FindHostDVDDrive_Proxy( 
-    IHost * This,
-    /* [in] */ BSTR aName,
-    /* [retval][out] */ IMedium **aDrive);
-
-
-void __RPC_STUB IHost_FindHostDVDDrive_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IHost_FindHostFloppyDrive_Proxy( 
-    IHost * This,
-    /* [in] */ BSTR aName,
-    /* [retval][out] */ IMedium **aDrive);
-
-
-void __RPC_STUB IHost_FindHostFloppyDrive_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IHost_FindHostNetworkInterfaceByName_Proxy( 
-    IHost * This,
-    /* [in] */ BSTR aName,
-    /* [retval][out] */ IHostNetworkInterface **aNetworkInterface);
-
-
-void __RPC_STUB IHost_FindHostNetworkInterfaceByName_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IHost_FindHostNetworkInterfaceById_Proxy( 
-    IHost * This,
-    /* [in] */ BSTR aId,
-    /* [retval][out] */ IHostNetworkInterface **aNetworkInterface);
-
-
-void __RPC_STUB IHost_FindHostNetworkInterfaceById_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IHost_FindHostNetworkInterfacesOfType_Proxy( 
-    IHost * This,
-    /* [in] */ HostNetworkInterfaceType aType,
-    /* [retval][out] */ SAFEARRAY * *aNetworkInterfaces);
-
-
-void __RPC_STUB IHost_FindHostNetworkInterfacesOfType_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IHost_FindUSBDeviceById_Proxy( 
-    IHost * This,
-    /* [in] */ BSTR aId,
-    /* [retval][out] */ IHostUSBDevice **aDevice);
-
-
-void __RPC_STUB IHost_FindUSBDeviceById_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IHost_FindUSBDeviceByAddress_Proxy( 
-    IHost * This,
-    /* [in] */ BSTR aName,
-    /* [retval][out] */ IHostUSBDevice **aDevice);
-
-
-void __RPC_STUB IHost_FindUSBDeviceByAddress_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IHost_INTERFACE_DEFINED__ */
-
-
-#ifndef __ISystemProperties_INTERFACE_DEFINED__
-#define __ISystemProperties_INTERFACE_DEFINED__
-
-/* interface ISystemProperties */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_ISystemProperties;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("07c3ffd8-8f59-49cc-b608-53a332e85cc3")
-    ISystemProperties : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_MinGuestRAM( 
-            /* [retval][out] */ ULONG *aMinGuestRAM) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_MaxGuestRAM( 
-            /* [retval][out] */ ULONG *aMaxGuestRAM) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_MinGuestVRAM( 
-            /* [retval][out] */ ULONG *aMinGuestVRAM) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_MaxGuestVRAM( 
-            /* [retval][out] */ ULONG *aMaxGuestVRAM) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_MinGuestCPUCount( 
-            /* [retval][out] */ ULONG *aMinGuestCPUCount) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_MaxGuestCPUCount( 
-            /* [retval][out] */ ULONG *aMaxGuestCPUCount) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_MaxGuestMonitors( 
-            /* [retval][out] */ ULONG *aMaxGuestMonitors) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_MaxVDISize( 
-            /* [retval][out] */ ULONG64 *aMaxVDISize) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_NetworkAdapterCount( 
-            /* [retval][out] */ ULONG *aNetworkAdapterCount) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_SerialPortCount( 
-            /* [retval][out] */ ULONG *aSerialPortCount) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_ParallelPortCount( 
-            /* [retval][out] */ ULONG *aParallelPortCount) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_MaxBootPosition( 
-            /* [retval][out] */ ULONG *aMaxBootPosition) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_DefaultMachineFolder( 
-            /* [retval][out] */ BSTR *aDefaultMachineFolder) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_DefaultMachineFolder( 
-            /* [in] */ BSTR aDefaultMachineFolder) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_DefaultHardDiskFolder( 
-            /* [retval][out] */ BSTR *aDefaultHardDiskFolder) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_DefaultHardDiskFolder( 
-            /* [in] */ BSTR aDefaultHardDiskFolder) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_MediumFormats( 
-            /* [retval][out] */ SAFEARRAY * *aMediumFormats) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_DefaultHardDiskFormat( 
-            /* [retval][out] */ BSTR *aDefaultHardDiskFormat) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_DefaultHardDiskFormat( 
-            /* [in] */ BSTR aDefaultHardDiskFormat) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_FreeDiskSpaceWarning( 
-            /* [retval][out] */ ULONG64 *aFreeDiskSpaceWarning) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_FreeDiskSpaceWarning( 
-            /* [in] */ ULONG64 aFreeDiskSpaceWarning) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_FreeDiskSpacePercentWarning( 
-            /* [retval][out] */ ULONG *aFreeDiskSpacePercentWarning) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_FreeDiskSpacePercentWarning( 
-            /* [in] */ ULONG aFreeDiskSpacePercentWarning) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_FreeDiskSpaceError( 
-            /* [retval][out] */ ULONG64 *aFreeDiskSpaceError) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_FreeDiskSpaceError( 
-            /* [in] */ ULONG64 aFreeDiskSpaceError) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_FreeDiskSpacePercentError( 
-            /* [retval][out] */ ULONG *aFreeDiskSpacePercentError) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_FreeDiskSpacePercentError( 
-            /* [in] */ ULONG aFreeDiskSpacePercentError) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_RemoteDisplayAuthLibrary( 
-            /* [retval][out] */ BSTR *aRemoteDisplayAuthLibrary) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_RemoteDisplayAuthLibrary( 
-            /* [in] */ BSTR aRemoteDisplayAuthLibrary) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_WebServiceAuthLibrary( 
-            /* [retval][out] */ BSTR *aWebServiceAuthLibrary) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_WebServiceAuthLibrary( 
-            /* [in] */ BSTR aWebServiceAuthLibrary) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_LogHistoryCount( 
-            /* [retval][out] */ ULONG *aLogHistoryCount) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_LogHistoryCount( 
-            /* [in] */ ULONG aLogHistoryCount) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_DefaultAudioDriver( 
-            /* [retval][out] */ AudioDriverType *aDefaultAudioDriver) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetMaxDevicesPerPortForStorageBus( 
-            /* [in] */ StorageBus aBus,
-            /* [retval][out] */ ULONG *aMaxDevicesPerPort) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetMinPortCountForStorageBus( 
-            /* [in] */ StorageBus aBus,
-            /* [retval][out] */ ULONG *aMinPortCount) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetMaxPortCountForStorageBus( 
-            /* [in] */ StorageBus aBus,
-            /* [retval][out] */ ULONG *aMaxPortCount) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetMaxInstancesOfStorageBus( 
-            /* [in] */ StorageBus aBus,
-            /* [retval][out] */ ULONG *aMaxInstances) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetDeviceTypesForStorageBus( 
-            /* [in] */ StorageBus aBus,
-            /* [retval][out] */ SAFEARRAY * *aDeviceTypes) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct ISystemPropertiesVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            ISystemProperties * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            ISystemProperties * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            ISystemProperties * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            ISystemProperties * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            ISystemProperties * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            ISystemProperties * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            ISystemProperties * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_MinGuestRAM )( 
-            ISystemProperties * This,
-            /* [retval][out] */ ULONG *aMinGuestRAM);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_MaxGuestRAM )( 
-            ISystemProperties * This,
-            /* [retval][out] */ ULONG *aMaxGuestRAM);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_MinGuestVRAM )( 
-            ISystemProperties * This,
-            /* [retval][out] */ ULONG *aMinGuestVRAM);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_MaxGuestVRAM )( 
-            ISystemProperties * This,
-            /* [retval][out] */ ULONG *aMaxGuestVRAM);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_MinGuestCPUCount )( 
-            ISystemProperties * This,
-            /* [retval][out] */ ULONG *aMinGuestCPUCount);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_MaxGuestCPUCount )( 
-            ISystemProperties * This,
-            /* [retval][out] */ ULONG *aMaxGuestCPUCount);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_MaxGuestMonitors )( 
-            ISystemProperties * This,
-            /* [retval][out] */ ULONG *aMaxGuestMonitors);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_MaxVDISize )( 
-            ISystemProperties * This,
-            /* [retval][out] */ ULONG64 *aMaxVDISize);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_NetworkAdapterCount )( 
-            ISystemProperties * This,
-            /* [retval][out] */ ULONG *aNetworkAdapterCount);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_SerialPortCount )( 
-            ISystemProperties * This,
-            /* [retval][out] */ ULONG *aSerialPortCount);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_ParallelPortCount )( 
-            ISystemProperties * This,
-            /* [retval][out] */ ULONG *aParallelPortCount);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_MaxBootPosition )( 
-            ISystemProperties * This,
-            /* [retval][out] */ ULONG *aMaxBootPosition);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_DefaultMachineFolder )( 
-            ISystemProperties * This,
-            /* [retval][out] */ BSTR *aDefaultMachineFolder);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_DefaultMachineFolder )( 
-            ISystemProperties * This,
-            /* [in] */ BSTR aDefaultMachineFolder);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_DefaultHardDiskFolder )( 
-            ISystemProperties * This,
-            /* [retval][out] */ BSTR *aDefaultHardDiskFolder);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_DefaultHardDiskFolder )( 
-            ISystemProperties * This,
-            /* [in] */ BSTR aDefaultHardDiskFolder);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_MediumFormats )( 
-            ISystemProperties * This,
-            /* [retval][out] */ SAFEARRAY * *aMediumFormats);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_DefaultHardDiskFormat )( 
-            ISystemProperties * This,
-            /* [retval][out] */ BSTR *aDefaultHardDiskFormat);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_DefaultHardDiskFormat )( 
-            ISystemProperties * This,
-            /* [in] */ BSTR aDefaultHardDiskFormat);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_FreeDiskSpaceWarning )( 
-            ISystemProperties * This,
-            /* [retval][out] */ ULONG64 *aFreeDiskSpaceWarning);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_FreeDiskSpaceWarning )( 
-            ISystemProperties * This,
-            /* [in] */ ULONG64 aFreeDiskSpaceWarning);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_FreeDiskSpacePercentWarning )( 
-            ISystemProperties * This,
-            /* [retval][out] */ ULONG *aFreeDiskSpacePercentWarning);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_FreeDiskSpacePercentWarning )( 
-            ISystemProperties * This,
-            /* [in] */ ULONG aFreeDiskSpacePercentWarning);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_FreeDiskSpaceError )( 
-            ISystemProperties * This,
-            /* [retval][out] */ ULONG64 *aFreeDiskSpaceError);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_FreeDiskSpaceError )( 
-            ISystemProperties * This,
-            /* [in] */ ULONG64 aFreeDiskSpaceError);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_FreeDiskSpacePercentError )( 
-            ISystemProperties * This,
-            /* [retval][out] */ ULONG *aFreeDiskSpacePercentError);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_FreeDiskSpacePercentError )( 
-            ISystemProperties * This,
-            /* [in] */ ULONG aFreeDiskSpacePercentError);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_RemoteDisplayAuthLibrary )( 
-            ISystemProperties * This,
-            /* [retval][out] */ BSTR *aRemoteDisplayAuthLibrary);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_RemoteDisplayAuthLibrary )( 
-            ISystemProperties * This,
-            /* [in] */ BSTR aRemoteDisplayAuthLibrary);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_WebServiceAuthLibrary )( 
-            ISystemProperties * This,
-            /* [retval][out] */ BSTR *aWebServiceAuthLibrary);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_WebServiceAuthLibrary )( 
-            ISystemProperties * This,
-            /* [in] */ BSTR aWebServiceAuthLibrary);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_LogHistoryCount )( 
-            ISystemProperties * This,
-            /* [retval][out] */ ULONG *aLogHistoryCount);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_LogHistoryCount )( 
-            ISystemProperties * This,
-            /* [in] */ ULONG aLogHistoryCount);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_DefaultAudioDriver )( 
-            ISystemProperties * This,
-            /* [retval][out] */ AudioDriverType *aDefaultAudioDriver);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetMaxDevicesPerPortForStorageBus )( 
-            ISystemProperties * This,
-            /* [in] */ StorageBus aBus,
-            /* [retval][out] */ ULONG *aMaxDevicesPerPort);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetMinPortCountForStorageBus )( 
-            ISystemProperties * This,
-            /* [in] */ StorageBus aBus,
-            /* [retval][out] */ ULONG *aMinPortCount);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetMaxPortCountForStorageBus )( 
-            ISystemProperties * This,
-            /* [in] */ StorageBus aBus,
-            /* [retval][out] */ ULONG *aMaxPortCount);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetMaxInstancesOfStorageBus )( 
-            ISystemProperties * This,
-            /* [in] */ StorageBus aBus,
-            /* [retval][out] */ ULONG *aMaxInstances);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetDeviceTypesForStorageBus )( 
-            ISystemProperties * This,
-            /* [in] */ StorageBus aBus,
-            /* [retval][out] */ SAFEARRAY * *aDeviceTypes);
-        
-        END_INTERFACE
-    } ISystemPropertiesVtbl;
-
-    interface ISystemProperties
-    {
-        CONST_VTBL struct ISystemPropertiesVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define ISystemProperties_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define ISystemProperties_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define ISystemProperties_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define ISystemProperties_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define ISystemProperties_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define ISystemProperties_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define ISystemProperties_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define ISystemProperties_get_MinGuestRAM(This,aMinGuestRAM)	\
-    (This)->lpVtbl -> get_MinGuestRAM(This,aMinGuestRAM)
-
-#define ISystemProperties_get_MaxGuestRAM(This,aMaxGuestRAM)	\
-    (This)->lpVtbl -> get_MaxGuestRAM(This,aMaxGuestRAM)
-
-#define ISystemProperties_get_MinGuestVRAM(This,aMinGuestVRAM)	\
-    (This)->lpVtbl -> get_MinGuestVRAM(This,aMinGuestVRAM)
-
-#define ISystemProperties_get_MaxGuestVRAM(This,aMaxGuestVRAM)	\
-    (This)->lpVtbl -> get_MaxGuestVRAM(This,aMaxGuestVRAM)
-
-#define ISystemProperties_get_MinGuestCPUCount(This,aMinGuestCPUCount)	\
-    (This)->lpVtbl -> get_MinGuestCPUCount(This,aMinGuestCPUCount)
-
-#define ISystemProperties_get_MaxGuestCPUCount(This,aMaxGuestCPUCount)	\
-    (This)->lpVtbl -> get_MaxGuestCPUCount(This,aMaxGuestCPUCount)
-
-#define ISystemProperties_get_MaxGuestMonitors(This,aMaxGuestMonitors)	\
-    (This)->lpVtbl -> get_MaxGuestMonitors(This,aMaxGuestMonitors)
-
-#define ISystemProperties_get_MaxVDISize(This,aMaxVDISize)	\
-    (This)->lpVtbl -> get_MaxVDISize(This,aMaxVDISize)
-
-#define ISystemProperties_get_NetworkAdapterCount(This,aNetworkAdapterCount)	\
-    (This)->lpVtbl -> get_NetworkAdapterCount(This,aNetworkAdapterCount)
-
-#define ISystemProperties_get_SerialPortCount(This,aSerialPortCount)	\
-    (This)->lpVtbl -> get_SerialPortCount(This,aSerialPortCount)
-
-#define ISystemProperties_get_ParallelPortCount(This,aParallelPortCount)	\
-    (This)->lpVtbl -> get_ParallelPortCount(This,aParallelPortCount)
-
-#define ISystemProperties_get_MaxBootPosition(This,aMaxBootPosition)	\
-    (This)->lpVtbl -> get_MaxBootPosition(This,aMaxBootPosition)
-
-#define ISystemProperties_get_DefaultMachineFolder(This,aDefaultMachineFolder)	\
-    (This)->lpVtbl -> get_DefaultMachineFolder(This,aDefaultMachineFolder)
-
-#define ISystemProperties_put_DefaultMachineFolder(This,aDefaultMachineFolder)	\
-    (This)->lpVtbl -> put_DefaultMachineFolder(This,aDefaultMachineFolder)
-
-#define ISystemProperties_get_DefaultHardDiskFolder(This,aDefaultHardDiskFolder)	\
-    (This)->lpVtbl -> get_DefaultHardDiskFolder(This,aDefaultHardDiskFolder)
-
-#define ISystemProperties_put_DefaultHardDiskFolder(This,aDefaultHardDiskFolder)	\
-    (This)->lpVtbl -> put_DefaultHardDiskFolder(This,aDefaultHardDiskFolder)
-
-#define ISystemProperties_get_MediumFormats(This,aMediumFormats)	\
-    (This)->lpVtbl -> get_MediumFormats(This,aMediumFormats)
-
-#define ISystemProperties_get_DefaultHardDiskFormat(This,aDefaultHardDiskFormat)	\
-    (This)->lpVtbl -> get_DefaultHardDiskFormat(This,aDefaultHardDiskFormat)
-
-#define ISystemProperties_put_DefaultHardDiskFormat(This,aDefaultHardDiskFormat)	\
-    (This)->lpVtbl -> put_DefaultHardDiskFormat(This,aDefaultHardDiskFormat)
-
-#define ISystemProperties_get_FreeDiskSpaceWarning(This,aFreeDiskSpaceWarning)	\
-    (This)->lpVtbl -> get_FreeDiskSpaceWarning(This,aFreeDiskSpaceWarning)
-
-#define ISystemProperties_put_FreeDiskSpaceWarning(This,aFreeDiskSpaceWarning)	\
-    (This)->lpVtbl -> put_FreeDiskSpaceWarning(This,aFreeDiskSpaceWarning)
-
-#define ISystemProperties_get_FreeDiskSpacePercentWarning(This,aFreeDiskSpacePercentWarning)	\
-    (This)->lpVtbl -> get_FreeDiskSpacePercentWarning(This,aFreeDiskSpacePercentWarning)
-
-#define ISystemProperties_put_FreeDiskSpacePercentWarning(This,aFreeDiskSpacePercentWarning)	\
-    (This)->lpVtbl -> put_FreeDiskSpacePercentWarning(This,aFreeDiskSpacePercentWarning)
-
-#define ISystemProperties_get_FreeDiskSpaceError(This,aFreeDiskSpaceError)	\
-    (This)->lpVtbl -> get_FreeDiskSpaceError(This,aFreeDiskSpaceError)
-
-#define ISystemProperties_put_FreeDiskSpaceError(This,aFreeDiskSpaceError)	\
-    (This)->lpVtbl -> put_FreeDiskSpaceError(This,aFreeDiskSpaceError)
-
-#define ISystemProperties_get_FreeDiskSpacePercentError(This,aFreeDiskSpacePercentError)	\
-    (This)->lpVtbl -> get_FreeDiskSpacePercentError(This,aFreeDiskSpacePercentError)
-
-#define ISystemProperties_put_FreeDiskSpacePercentError(This,aFreeDiskSpacePercentError)	\
-    (This)->lpVtbl -> put_FreeDiskSpacePercentError(This,aFreeDiskSpacePercentError)
-
-#define ISystemProperties_get_RemoteDisplayAuthLibrary(This,aRemoteDisplayAuthLibrary)	\
-    (This)->lpVtbl -> get_RemoteDisplayAuthLibrary(This,aRemoteDisplayAuthLibrary)
-
-#define ISystemProperties_put_RemoteDisplayAuthLibrary(This,aRemoteDisplayAuthLibrary)	\
-    (This)->lpVtbl -> put_RemoteDisplayAuthLibrary(This,aRemoteDisplayAuthLibrary)
-
-#define ISystemProperties_get_WebServiceAuthLibrary(This,aWebServiceAuthLibrary)	\
-    (This)->lpVtbl -> get_WebServiceAuthLibrary(This,aWebServiceAuthLibrary)
-
-#define ISystemProperties_put_WebServiceAuthLibrary(This,aWebServiceAuthLibrary)	\
-    (This)->lpVtbl -> put_WebServiceAuthLibrary(This,aWebServiceAuthLibrary)
-
-#define ISystemProperties_get_LogHistoryCount(This,aLogHistoryCount)	\
-    (This)->lpVtbl -> get_LogHistoryCount(This,aLogHistoryCount)
-
-#define ISystemProperties_put_LogHistoryCount(This,aLogHistoryCount)	\
-    (This)->lpVtbl -> put_LogHistoryCount(This,aLogHistoryCount)
-
-#define ISystemProperties_get_DefaultAudioDriver(This,aDefaultAudioDriver)	\
-    (This)->lpVtbl -> get_DefaultAudioDriver(This,aDefaultAudioDriver)
-
-#define ISystemProperties_GetMaxDevicesPerPortForStorageBus(This,aBus,aMaxDevicesPerPort)	\
-    (This)->lpVtbl -> GetMaxDevicesPerPortForStorageBus(This,aBus,aMaxDevicesPerPort)
-
-#define ISystemProperties_GetMinPortCountForStorageBus(This,aBus,aMinPortCount)	\
-    (This)->lpVtbl -> GetMinPortCountForStorageBus(This,aBus,aMinPortCount)
-
-#define ISystemProperties_GetMaxPortCountForStorageBus(This,aBus,aMaxPortCount)	\
-    (This)->lpVtbl -> GetMaxPortCountForStorageBus(This,aBus,aMaxPortCount)
-
-#define ISystemProperties_GetMaxInstancesOfStorageBus(This,aBus,aMaxInstances)	\
-    (This)->lpVtbl -> GetMaxInstancesOfStorageBus(This,aBus,aMaxInstances)
-
-#define ISystemProperties_GetDeviceTypesForStorageBus(This,aBus,aDeviceTypes)	\
-    (This)->lpVtbl -> GetDeviceTypesForStorageBus(This,aBus,aDeviceTypes)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISystemProperties_get_MinGuestRAM_Proxy( 
-    ISystemProperties * This,
-    /* [retval][out] */ ULONG *aMinGuestRAM);
-
-
-void __RPC_STUB ISystemProperties_get_MinGuestRAM_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISystemProperties_get_MaxGuestRAM_Proxy( 
-    ISystemProperties * This,
-    /* [retval][out] */ ULONG *aMaxGuestRAM);
-
-
-void __RPC_STUB ISystemProperties_get_MaxGuestRAM_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISystemProperties_get_MinGuestVRAM_Proxy( 
-    ISystemProperties * This,
-    /* [retval][out] */ ULONG *aMinGuestVRAM);
-
-
-void __RPC_STUB ISystemProperties_get_MinGuestVRAM_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISystemProperties_get_MaxGuestVRAM_Proxy( 
-    ISystemProperties * This,
-    /* [retval][out] */ ULONG *aMaxGuestVRAM);
-
-
-void __RPC_STUB ISystemProperties_get_MaxGuestVRAM_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISystemProperties_get_MinGuestCPUCount_Proxy( 
-    ISystemProperties * This,
-    /* [retval][out] */ ULONG *aMinGuestCPUCount);
-
-
-void __RPC_STUB ISystemProperties_get_MinGuestCPUCount_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISystemProperties_get_MaxGuestCPUCount_Proxy( 
-    ISystemProperties * This,
-    /* [retval][out] */ ULONG *aMaxGuestCPUCount);
-
-
-void __RPC_STUB ISystemProperties_get_MaxGuestCPUCount_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISystemProperties_get_MaxGuestMonitors_Proxy( 
-    ISystemProperties * This,
-    /* [retval][out] */ ULONG *aMaxGuestMonitors);
-
-
-void __RPC_STUB ISystemProperties_get_MaxGuestMonitors_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISystemProperties_get_MaxVDISize_Proxy( 
-    ISystemProperties * This,
-    /* [retval][out] */ ULONG64 *aMaxVDISize);
-
-
-void __RPC_STUB ISystemProperties_get_MaxVDISize_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISystemProperties_get_NetworkAdapterCount_Proxy( 
-    ISystemProperties * This,
-    /* [retval][out] */ ULONG *aNetworkAdapterCount);
-
-
-void __RPC_STUB ISystemProperties_get_NetworkAdapterCount_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISystemProperties_get_SerialPortCount_Proxy( 
-    ISystemProperties * This,
-    /* [retval][out] */ ULONG *aSerialPortCount);
-
-
-void __RPC_STUB ISystemProperties_get_SerialPortCount_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISystemProperties_get_ParallelPortCount_Proxy( 
-    ISystemProperties * This,
-    /* [retval][out] */ ULONG *aParallelPortCount);
-
-
-void __RPC_STUB ISystemProperties_get_ParallelPortCount_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISystemProperties_get_MaxBootPosition_Proxy( 
-    ISystemProperties * This,
-    /* [retval][out] */ ULONG *aMaxBootPosition);
-
-
-void __RPC_STUB ISystemProperties_get_MaxBootPosition_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISystemProperties_get_DefaultMachineFolder_Proxy( 
-    ISystemProperties * This,
-    /* [retval][out] */ BSTR *aDefaultMachineFolder);
-
-
-void __RPC_STUB ISystemProperties_get_DefaultMachineFolder_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE ISystemProperties_put_DefaultMachineFolder_Proxy( 
-    ISystemProperties * This,
-    /* [in] */ BSTR aDefaultMachineFolder);
-
-
-void __RPC_STUB ISystemProperties_put_DefaultMachineFolder_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISystemProperties_get_DefaultHardDiskFolder_Proxy( 
-    ISystemProperties * This,
-    /* [retval][out] */ BSTR *aDefaultHardDiskFolder);
-
-
-void __RPC_STUB ISystemProperties_get_DefaultHardDiskFolder_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE ISystemProperties_put_DefaultHardDiskFolder_Proxy( 
-    ISystemProperties * This,
-    /* [in] */ BSTR aDefaultHardDiskFolder);
-
-
-void __RPC_STUB ISystemProperties_put_DefaultHardDiskFolder_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISystemProperties_get_MediumFormats_Proxy( 
-    ISystemProperties * This,
-    /* [retval][out] */ SAFEARRAY * *aMediumFormats);
-
-
-void __RPC_STUB ISystemProperties_get_MediumFormats_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISystemProperties_get_DefaultHardDiskFormat_Proxy( 
-    ISystemProperties * This,
-    /* [retval][out] */ BSTR *aDefaultHardDiskFormat);
-
-
-void __RPC_STUB ISystemProperties_get_DefaultHardDiskFormat_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE ISystemProperties_put_DefaultHardDiskFormat_Proxy( 
-    ISystemProperties * This,
-    /* [in] */ BSTR aDefaultHardDiskFormat);
-
-
-void __RPC_STUB ISystemProperties_put_DefaultHardDiskFormat_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISystemProperties_get_FreeDiskSpaceWarning_Proxy( 
-    ISystemProperties * This,
-    /* [retval][out] */ ULONG64 *aFreeDiskSpaceWarning);
-
-
-void __RPC_STUB ISystemProperties_get_FreeDiskSpaceWarning_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE ISystemProperties_put_FreeDiskSpaceWarning_Proxy( 
-    ISystemProperties * This,
-    /* [in] */ ULONG64 aFreeDiskSpaceWarning);
-
-
-void __RPC_STUB ISystemProperties_put_FreeDiskSpaceWarning_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISystemProperties_get_FreeDiskSpacePercentWarning_Proxy( 
-    ISystemProperties * This,
-    /* [retval][out] */ ULONG *aFreeDiskSpacePercentWarning);
-
-
-void __RPC_STUB ISystemProperties_get_FreeDiskSpacePercentWarning_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE ISystemProperties_put_FreeDiskSpacePercentWarning_Proxy( 
-    ISystemProperties * This,
-    /* [in] */ ULONG aFreeDiskSpacePercentWarning);
-
-
-void __RPC_STUB ISystemProperties_put_FreeDiskSpacePercentWarning_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISystemProperties_get_FreeDiskSpaceError_Proxy( 
-    ISystemProperties * This,
-    /* [retval][out] */ ULONG64 *aFreeDiskSpaceError);
-
-
-void __RPC_STUB ISystemProperties_get_FreeDiskSpaceError_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE ISystemProperties_put_FreeDiskSpaceError_Proxy( 
-    ISystemProperties * This,
-    /* [in] */ ULONG64 aFreeDiskSpaceError);
-
-
-void __RPC_STUB ISystemProperties_put_FreeDiskSpaceError_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISystemProperties_get_FreeDiskSpacePercentError_Proxy( 
-    ISystemProperties * This,
-    /* [retval][out] */ ULONG *aFreeDiskSpacePercentError);
-
-
-void __RPC_STUB ISystemProperties_get_FreeDiskSpacePercentError_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE ISystemProperties_put_FreeDiskSpacePercentError_Proxy( 
-    ISystemProperties * This,
-    /* [in] */ ULONG aFreeDiskSpacePercentError);
-
-
-void __RPC_STUB ISystemProperties_put_FreeDiskSpacePercentError_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISystemProperties_get_RemoteDisplayAuthLibrary_Proxy( 
-    ISystemProperties * This,
-    /* [retval][out] */ BSTR *aRemoteDisplayAuthLibrary);
-
-
-void __RPC_STUB ISystemProperties_get_RemoteDisplayAuthLibrary_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE ISystemProperties_put_RemoteDisplayAuthLibrary_Proxy( 
-    ISystemProperties * This,
-    /* [in] */ BSTR aRemoteDisplayAuthLibrary);
-
-
-void __RPC_STUB ISystemProperties_put_RemoteDisplayAuthLibrary_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISystemProperties_get_WebServiceAuthLibrary_Proxy( 
-    ISystemProperties * This,
-    /* [retval][out] */ BSTR *aWebServiceAuthLibrary);
-
-
-void __RPC_STUB ISystemProperties_get_WebServiceAuthLibrary_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE ISystemProperties_put_WebServiceAuthLibrary_Proxy( 
-    ISystemProperties * This,
-    /* [in] */ BSTR aWebServiceAuthLibrary);
-
-
-void __RPC_STUB ISystemProperties_put_WebServiceAuthLibrary_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISystemProperties_get_LogHistoryCount_Proxy( 
-    ISystemProperties * This,
-    /* [retval][out] */ ULONG *aLogHistoryCount);
-
-
-void __RPC_STUB ISystemProperties_get_LogHistoryCount_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE ISystemProperties_put_LogHistoryCount_Proxy( 
-    ISystemProperties * This,
-    /* [in] */ ULONG aLogHistoryCount);
-
-
-void __RPC_STUB ISystemProperties_put_LogHistoryCount_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISystemProperties_get_DefaultAudioDriver_Proxy( 
-    ISystemProperties * This,
-    /* [retval][out] */ AudioDriverType *aDefaultAudioDriver);
-
-
-void __RPC_STUB ISystemProperties_get_DefaultAudioDriver_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE ISystemProperties_GetMaxDevicesPerPortForStorageBus_Proxy( 
-    ISystemProperties * This,
-    /* [in] */ StorageBus aBus,
-    /* [retval][out] */ ULONG *aMaxDevicesPerPort);
-
-
-void __RPC_STUB ISystemProperties_GetMaxDevicesPerPortForStorageBus_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE ISystemProperties_GetMinPortCountForStorageBus_Proxy( 
-    ISystemProperties * This,
-    /* [in] */ StorageBus aBus,
-    /* [retval][out] */ ULONG *aMinPortCount);
-
-
-void __RPC_STUB ISystemProperties_GetMinPortCountForStorageBus_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE ISystemProperties_GetMaxPortCountForStorageBus_Proxy( 
-    ISystemProperties * This,
-    /* [in] */ StorageBus aBus,
-    /* [retval][out] */ ULONG *aMaxPortCount);
-
-
-void __RPC_STUB ISystemProperties_GetMaxPortCountForStorageBus_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE ISystemProperties_GetMaxInstancesOfStorageBus_Proxy( 
-    ISystemProperties * This,
-    /* [in] */ StorageBus aBus,
-    /* [retval][out] */ ULONG *aMaxInstances);
-
-
-void __RPC_STUB ISystemProperties_GetMaxInstancesOfStorageBus_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE ISystemProperties_GetDeviceTypesForStorageBus_Proxy( 
-    ISystemProperties * This,
-    /* [in] */ StorageBus aBus,
-    /* [retval][out] */ SAFEARRAY * *aDeviceTypes);
-
-
-void __RPC_STUB ISystemProperties_GetDeviceTypesForStorageBus_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __ISystemProperties_INTERFACE_DEFINED__ */
-
-
-#ifndef __IGuestOSType_INTERFACE_DEFINED__
-#define __IGuestOSType_INTERFACE_DEFINED__
-
-/* interface IGuestOSType */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IGuestOSType;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("e3f6727e-a09b-41ea-a824-864a176472f3")
-    IGuestOSType : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_FamilyId( 
-            /* [retval][out] */ BSTR *aFamilyId) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_FamilyDescription( 
-            /* [retval][out] */ BSTR *aFamilyDescription) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Id( 
-            /* [retval][out] */ BSTR *aId) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Description( 
-            /* [retval][out] */ BSTR *aDescription) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Is64Bit( 
-            /* [retval][out] */ BOOL *aIs64Bit) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_RecommendedIOAPIC( 
-            /* [retval][out] */ BOOL *aRecommendedIOAPIC) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_RecommendedVirtEx( 
-            /* [retval][out] */ BOOL *aRecommendedVirtEx) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_RecommendedRAM( 
-            /* [retval][out] */ ULONG *aRecommendedRAM) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_RecommendedVRAM( 
-            /* [retval][out] */ ULONG *aRecommendedVRAM) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_RecommendedHDD( 
-            /* [retval][out] */ ULONG *aRecommendedHDD) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_AdapterType( 
-            /* [retval][out] */ NetworkAdapterType *aAdapterType) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_RecommendedPae( 
-            /* [retval][out] */ BOOL *aRecommendedPae) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_RecommendedDvdStorageController( 
-            /* [retval][out] */ StorageControllerType *aRecommendedDvdStorageController) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_RecommendedDvdStorageBus( 
-            /* [retval][out] */ StorageBus *aRecommendedDvdStorageBus) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_RecommendedHdStorageController( 
-            /* [retval][out] */ StorageControllerType *aRecommendedHdStorageController) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_RecommendedHdStorageBus( 
-            /* [retval][out] */ StorageBus *aRecommendedHdStorageBus) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_RecommendedFirmware( 
-            /* [retval][out] */ FirmwareType *aRecommendedFirmware) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_RecommendedUsbHid( 
-            /* [retval][out] */ BOOL *aRecommendedUsbHid) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_RecommendedHpet( 
-            /* [retval][out] */ BOOL *aRecommendedHpet) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_RecommendedUsbTablet( 
-            /* [retval][out] */ BOOL *aRecommendedUsbTablet) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_RecommendedRtcUseUtc( 
-            /* [retval][out] */ BOOL *aRecommendedRtcUseUtc) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IGuestOSTypeVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IGuestOSType * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IGuestOSType * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IGuestOSType * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IGuestOSType * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IGuestOSType * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IGuestOSType * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IGuestOSType * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_FamilyId )( 
-            IGuestOSType * This,
-            /* [retval][out] */ BSTR *aFamilyId);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_FamilyDescription )( 
-            IGuestOSType * This,
-            /* [retval][out] */ BSTR *aFamilyDescription);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Id )( 
-            IGuestOSType * This,
-            /* [retval][out] */ BSTR *aId);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Description )( 
-            IGuestOSType * This,
-            /* [retval][out] */ BSTR *aDescription);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Is64Bit )( 
-            IGuestOSType * This,
-            /* [retval][out] */ BOOL *aIs64Bit);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_RecommendedIOAPIC )( 
-            IGuestOSType * This,
-            /* [retval][out] */ BOOL *aRecommendedIOAPIC);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_RecommendedVirtEx )( 
-            IGuestOSType * This,
-            /* [retval][out] */ BOOL *aRecommendedVirtEx);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_RecommendedRAM )( 
-            IGuestOSType * This,
-            /* [retval][out] */ ULONG *aRecommendedRAM);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_RecommendedVRAM )( 
-            IGuestOSType * This,
-            /* [retval][out] */ ULONG *aRecommendedVRAM);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_RecommendedHDD )( 
-            IGuestOSType * This,
-            /* [retval][out] */ ULONG *aRecommendedHDD);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_AdapterType )( 
-            IGuestOSType * This,
-            /* [retval][out] */ NetworkAdapterType *aAdapterType);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_RecommendedPae )( 
-            IGuestOSType * This,
-            /* [retval][out] */ BOOL *aRecommendedPae);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_RecommendedDvdStorageController )( 
-            IGuestOSType * This,
-            /* [retval][out] */ StorageControllerType *aRecommendedDvdStorageController);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_RecommendedDvdStorageBus )( 
-            IGuestOSType * This,
-            /* [retval][out] */ StorageBus *aRecommendedDvdStorageBus);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_RecommendedHdStorageController )( 
-            IGuestOSType * This,
-            /* [retval][out] */ StorageControllerType *aRecommendedHdStorageController);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_RecommendedHdStorageBus )( 
-            IGuestOSType * This,
-            /* [retval][out] */ StorageBus *aRecommendedHdStorageBus);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_RecommendedFirmware )( 
-            IGuestOSType * This,
-            /* [retval][out] */ FirmwareType *aRecommendedFirmware);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_RecommendedUsbHid )( 
-            IGuestOSType * This,
-            /* [retval][out] */ BOOL *aRecommendedUsbHid);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_RecommendedHpet )( 
-            IGuestOSType * This,
-            /* [retval][out] */ BOOL *aRecommendedHpet);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_RecommendedUsbTablet )( 
-            IGuestOSType * This,
-            /* [retval][out] */ BOOL *aRecommendedUsbTablet);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_RecommendedRtcUseUtc )( 
-            IGuestOSType * This,
-            /* [retval][out] */ BOOL *aRecommendedRtcUseUtc);
-        
-        END_INTERFACE
-    } IGuestOSTypeVtbl;
-
-    interface IGuestOSType
-    {
-        CONST_VTBL struct IGuestOSTypeVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IGuestOSType_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IGuestOSType_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IGuestOSType_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IGuestOSType_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IGuestOSType_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IGuestOSType_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IGuestOSType_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IGuestOSType_get_FamilyId(This,aFamilyId)	\
-    (This)->lpVtbl -> get_FamilyId(This,aFamilyId)
-
-#define IGuestOSType_get_FamilyDescription(This,aFamilyDescription)	\
-    (This)->lpVtbl -> get_FamilyDescription(This,aFamilyDescription)
-
-#define IGuestOSType_get_Id(This,aId)	\
-    (This)->lpVtbl -> get_Id(This,aId)
-
-#define IGuestOSType_get_Description(This,aDescription)	\
-    (This)->lpVtbl -> get_Description(This,aDescription)
-
-#define IGuestOSType_get_Is64Bit(This,aIs64Bit)	\
-    (This)->lpVtbl -> get_Is64Bit(This,aIs64Bit)
-
-#define IGuestOSType_get_RecommendedIOAPIC(This,aRecommendedIOAPIC)	\
-    (This)->lpVtbl -> get_RecommendedIOAPIC(This,aRecommendedIOAPIC)
-
-#define IGuestOSType_get_RecommendedVirtEx(This,aRecommendedVirtEx)	\
-    (This)->lpVtbl -> get_RecommendedVirtEx(This,aRecommendedVirtEx)
-
-#define IGuestOSType_get_RecommendedRAM(This,aRecommendedRAM)	\
-    (This)->lpVtbl -> get_RecommendedRAM(This,aRecommendedRAM)
-
-#define IGuestOSType_get_RecommendedVRAM(This,aRecommendedVRAM)	\
-    (This)->lpVtbl -> get_RecommendedVRAM(This,aRecommendedVRAM)
-
-#define IGuestOSType_get_RecommendedHDD(This,aRecommendedHDD)	\
-    (This)->lpVtbl -> get_RecommendedHDD(This,aRecommendedHDD)
-
-#define IGuestOSType_get_AdapterType(This,aAdapterType)	\
-    (This)->lpVtbl -> get_AdapterType(This,aAdapterType)
-
-#define IGuestOSType_get_RecommendedPae(This,aRecommendedPae)	\
-    (This)->lpVtbl -> get_RecommendedPae(This,aRecommendedPae)
-
-#define IGuestOSType_get_RecommendedDvdStorageController(This,aRecommendedDvdStorageController)	\
-    (This)->lpVtbl -> get_RecommendedDvdStorageController(This,aRecommendedDvdStorageController)
-
-#define IGuestOSType_get_RecommendedDvdStorageBus(This,aRecommendedDvdStorageBus)	\
-    (This)->lpVtbl -> get_RecommendedDvdStorageBus(This,aRecommendedDvdStorageBus)
-
-#define IGuestOSType_get_RecommendedHdStorageController(This,aRecommendedHdStorageController)	\
-    (This)->lpVtbl -> get_RecommendedHdStorageController(This,aRecommendedHdStorageController)
-
-#define IGuestOSType_get_RecommendedHdStorageBus(This,aRecommendedHdStorageBus)	\
-    (This)->lpVtbl -> get_RecommendedHdStorageBus(This,aRecommendedHdStorageBus)
-
-#define IGuestOSType_get_RecommendedFirmware(This,aRecommendedFirmware)	\
-    (This)->lpVtbl -> get_RecommendedFirmware(This,aRecommendedFirmware)
-
-#define IGuestOSType_get_RecommendedUsbHid(This,aRecommendedUsbHid)	\
-    (This)->lpVtbl -> get_RecommendedUsbHid(This,aRecommendedUsbHid)
-
-#define IGuestOSType_get_RecommendedHpet(This,aRecommendedHpet)	\
-    (This)->lpVtbl -> get_RecommendedHpet(This,aRecommendedHpet)
-
-#define IGuestOSType_get_RecommendedUsbTablet(This,aRecommendedUsbTablet)	\
-    (This)->lpVtbl -> get_RecommendedUsbTablet(This,aRecommendedUsbTablet)
-
-#define IGuestOSType_get_RecommendedRtcUseUtc(This,aRecommendedRtcUseUtc)	\
-    (This)->lpVtbl -> get_RecommendedRtcUseUtc(This,aRecommendedRtcUseUtc)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IGuestOSType_get_FamilyId_Proxy( 
-    IGuestOSType * This,
-    /* [retval][out] */ BSTR *aFamilyId);
-
-
-void __RPC_STUB IGuestOSType_get_FamilyId_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IGuestOSType_get_FamilyDescription_Proxy( 
-    IGuestOSType * This,
-    /* [retval][out] */ BSTR *aFamilyDescription);
-
-
-void __RPC_STUB IGuestOSType_get_FamilyDescription_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IGuestOSType_get_Id_Proxy( 
-    IGuestOSType * This,
-    /* [retval][out] */ BSTR *aId);
-
-
-void __RPC_STUB IGuestOSType_get_Id_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IGuestOSType_get_Description_Proxy( 
-    IGuestOSType * This,
-    /* [retval][out] */ BSTR *aDescription);
-
-
-void __RPC_STUB IGuestOSType_get_Description_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IGuestOSType_get_Is64Bit_Proxy( 
-    IGuestOSType * This,
-    /* [retval][out] */ BOOL *aIs64Bit);
-
-
-void __RPC_STUB IGuestOSType_get_Is64Bit_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IGuestOSType_get_RecommendedIOAPIC_Proxy( 
-    IGuestOSType * This,
-    /* [retval][out] */ BOOL *aRecommendedIOAPIC);
-
-
-void __RPC_STUB IGuestOSType_get_RecommendedIOAPIC_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IGuestOSType_get_RecommendedVirtEx_Proxy( 
-    IGuestOSType * This,
-    /* [retval][out] */ BOOL *aRecommendedVirtEx);
-
-
-void __RPC_STUB IGuestOSType_get_RecommendedVirtEx_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IGuestOSType_get_RecommendedRAM_Proxy( 
-    IGuestOSType * This,
-    /* [retval][out] */ ULONG *aRecommendedRAM);
-
-
-void __RPC_STUB IGuestOSType_get_RecommendedRAM_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IGuestOSType_get_RecommendedVRAM_Proxy( 
-    IGuestOSType * This,
-    /* [retval][out] */ ULONG *aRecommendedVRAM);
-
-
-void __RPC_STUB IGuestOSType_get_RecommendedVRAM_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IGuestOSType_get_RecommendedHDD_Proxy( 
-    IGuestOSType * This,
-    /* [retval][out] */ ULONG *aRecommendedHDD);
-
-
-void __RPC_STUB IGuestOSType_get_RecommendedHDD_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IGuestOSType_get_AdapterType_Proxy( 
-    IGuestOSType * This,
-    /* [retval][out] */ NetworkAdapterType *aAdapterType);
-
-
-void __RPC_STUB IGuestOSType_get_AdapterType_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IGuestOSType_get_RecommendedPae_Proxy( 
-    IGuestOSType * This,
-    /* [retval][out] */ BOOL *aRecommendedPae);
-
-
-void __RPC_STUB IGuestOSType_get_RecommendedPae_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IGuestOSType_get_RecommendedDvdStorageController_Proxy( 
-    IGuestOSType * This,
-    /* [retval][out] */ StorageControllerType *aRecommendedDvdStorageController);
-
-
-void __RPC_STUB IGuestOSType_get_RecommendedDvdStorageController_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IGuestOSType_get_RecommendedDvdStorageBus_Proxy( 
-    IGuestOSType * This,
-    /* [retval][out] */ StorageBus *aRecommendedDvdStorageBus);
-
-
-void __RPC_STUB IGuestOSType_get_RecommendedDvdStorageBus_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IGuestOSType_get_RecommendedHdStorageController_Proxy( 
-    IGuestOSType * This,
-    /* [retval][out] */ StorageControllerType *aRecommendedHdStorageController);
-
-
-void __RPC_STUB IGuestOSType_get_RecommendedHdStorageController_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IGuestOSType_get_RecommendedHdStorageBus_Proxy( 
-    IGuestOSType * This,
-    /* [retval][out] */ StorageBus *aRecommendedHdStorageBus);
-
-
-void __RPC_STUB IGuestOSType_get_RecommendedHdStorageBus_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IGuestOSType_get_RecommendedFirmware_Proxy( 
-    IGuestOSType * This,
-    /* [retval][out] */ FirmwareType *aRecommendedFirmware);
-
-
-void __RPC_STUB IGuestOSType_get_RecommendedFirmware_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IGuestOSType_get_RecommendedUsbHid_Proxy( 
-    IGuestOSType * This,
-    /* [retval][out] */ BOOL *aRecommendedUsbHid);
-
-
-void __RPC_STUB IGuestOSType_get_RecommendedUsbHid_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IGuestOSType_get_RecommendedHpet_Proxy( 
-    IGuestOSType * This,
-    /* [retval][out] */ BOOL *aRecommendedHpet);
-
-
-void __RPC_STUB IGuestOSType_get_RecommendedHpet_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IGuestOSType_get_RecommendedUsbTablet_Proxy( 
-    IGuestOSType * This,
-    /* [retval][out] */ BOOL *aRecommendedUsbTablet);
-
-
-void __RPC_STUB IGuestOSType_get_RecommendedUsbTablet_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IGuestOSType_get_RecommendedRtcUseUtc_Proxy( 
-    IGuestOSType * This,
-    /* [retval][out] */ BOOL *aRecommendedRtcUseUtc);
-
-
-void __RPC_STUB IGuestOSType_get_RecommendedRtcUseUtc_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IGuestOSType_INTERFACE_DEFINED__ */
-
-
-#ifndef __IGuest_INTERFACE_DEFINED__
-#define __IGuest_INTERFACE_DEFINED__
-
-/* interface IGuest */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IGuest;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("d915dff1-ed38-495a-91f1-ab6c53932468")
-    IGuest : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_OSTypeId( 
-            /* [retval][out] */ BSTR *aOSTypeId) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_AdditionsActive( 
-            /* [retval][out] */ BOOL *aAdditionsActive) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_AdditionsVersion( 
-            /* [retval][out] */ BSTR *aAdditionsVersion) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_SupportsSeamless( 
-            /* [retval][out] */ BOOL *aSupportsSeamless) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_SupportsGraphics( 
-            /* [retval][out] */ BOOL *aSupportsGraphics) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_MemoryBalloonSize( 
-            /* [retval][out] */ ULONG *aMemoryBalloonSize) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_MemoryBalloonSize( 
-            /* [in] */ ULONG aMemoryBalloonSize) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_PageFusionEnabled( 
-            /* [retval][out] */ BOOL *aPageFusionEnabled) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_PageFusionEnabled( 
-            /* [in] */ BOOL aPageFusionEnabled) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_StatisticsUpdateInterval( 
-            /* [retval][out] */ ULONG *aStatisticsUpdateInterval) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_StatisticsUpdateInterval( 
-            /* [in] */ ULONG aStatisticsUpdateInterval) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE InternalGetStatistics( 
-            /* [out] */ ULONG *aCpuUser,
-            /* [out] */ ULONG *aCpuKernel,
-            /* [out] */ ULONG *aCpuIdle,
-            /* [out] */ ULONG *aMemTotal,
-            /* [out] */ ULONG *aMemFree,
-            /* [out] */ ULONG *aMemBalloon,
-            /* [out] */ ULONG *aMemShared,
-            /* [out] */ ULONG *aMemCache,
-            /* [out] */ ULONG *aPagedTotal,
-            /* [out] */ ULONG *aMemAllocTotal,
-            /* [out] */ ULONG *aMemFreeTotal,
-            /* [out] */ ULONG *aMemBalloonTotal,
-            /* [out] */ ULONG *aMemSharedTotal) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetCredentials( 
-            /* [in] */ BSTR aUserName,
-            /* [in] */ BSTR aPassword,
-            /* [in] */ BSTR aDomain,
-            /* [in] */ BOOL aAllowInteractiveLogon) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE ExecuteProcess( 
-            /* [in] */ BSTR aExecName,
-            /* [in] */ ULONG aFlags,
-            /* [out][in] */ SAFEARRAY * *aArguments,
-            /* [out][in] */ SAFEARRAY * *aEnvironment,
-            /* [in] */ BSTR aUserName,
-            /* [in] */ BSTR aPassword,
-            /* [in] */ ULONG aTimeoutMS,
-            /* [out] */ ULONG *aPid,
-            /* [retval][out] */ IProgress **aProgress) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetProcessOutput( 
-            /* [in] */ ULONG aPid,
-            /* [in] */ ULONG aFlags,
-            /* [in] */ ULONG aTimeoutMS,
-            /* [in] */ ULONG64 aSize,
-            /* [retval][out] */ SAFEARRAY * *aData) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetProcessStatus( 
-            /* [in] */ ULONG aPid,
-            /* [out] */ ULONG *aExitcode,
-            /* [out] */ ULONG *aFlags,
-            /* [retval][out] */ ULONG *aReason) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IGuestVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IGuest * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IGuest * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IGuest * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IGuest * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IGuest * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IGuest * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IGuest * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_OSTypeId )( 
-            IGuest * This,
-            /* [retval][out] */ BSTR *aOSTypeId);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_AdditionsActive )( 
-            IGuest * This,
-            /* [retval][out] */ BOOL *aAdditionsActive);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_AdditionsVersion )( 
-            IGuest * This,
-            /* [retval][out] */ BSTR *aAdditionsVersion);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_SupportsSeamless )( 
-            IGuest * This,
-            /* [retval][out] */ BOOL *aSupportsSeamless);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_SupportsGraphics )( 
-            IGuest * This,
-            /* [retval][out] */ BOOL *aSupportsGraphics);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_MemoryBalloonSize )( 
-            IGuest * This,
-            /* [retval][out] */ ULONG *aMemoryBalloonSize);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_MemoryBalloonSize )( 
-            IGuest * This,
-            /* [in] */ ULONG aMemoryBalloonSize);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_PageFusionEnabled )( 
-            IGuest * This,
-            /* [retval][out] */ BOOL *aPageFusionEnabled);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_PageFusionEnabled )( 
-            IGuest * This,
-            /* [in] */ BOOL aPageFusionEnabled);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_StatisticsUpdateInterval )( 
-            IGuest * This,
-            /* [retval][out] */ ULONG *aStatisticsUpdateInterval);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_StatisticsUpdateInterval )( 
-            IGuest * This,
-            /* [in] */ ULONG aStatisticsUpdateInterval);
-        
-        HRESULT ( STDMETHODCALLTYPE *InternalGetStatistics )( 
-            IGuest * This,
-            /* [out] */ ULONG *aCpuUser,
-            /* [out] */ ULONG *aCpuKernel,
-            /* [out] */ ULONG *aCpuIdle,
-            /* [out] */ ULONG *aMemTotal,
-            /* [out] */ ULONG *aMemFree,
-            /* [out] */ ULONG *aMemBalloon,
-            /* [out] */ ULONG *aMemShared,
-            /* [out] */ ULONG *aMemCache,
-            /* [out] */ ULONG *aPagedTotal,
-            /* [out] */ ULONG *aMemAllocTotal,
-            /* [out] */ ULONG *aMemFreeTotal,
-            /* [out] */ ULONG *aMemBalloonTotal,
-            /* [out] */ ULONG *aMemSharedTotal);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetCredentials )( 
-            IGuest * This,
-            /* [in] */ BSTR aUserName,
-            /* [in] */ BSTR aPassword,
-            /* [in] */ BSTR aDomain,
-            /* [in] */ BOOL aAllowInteractiveLogon);
-        
-        HRESULT ( STDMETHODCALLTYPE *ExecuteProcess )( 
-            IGuest * This,
-            /* [in] */ BSTR aExecName,
-            /* [in] */ ULONG aFlags,
-            /* [out][in] */ SAFEARRAY * *aArguments,
-            /* [out][in] */ SAFEARRAY * *aEnvironment,
-            /* [in] */ BSTR aUserName,
-            /* [in] */ BSTR aPassword,
-            /* [in] */ ULONG aTimeoutMS,
-            /* [out] */ ULONG *aPid,
-            /* [retval][out] */ IProgress **aProgress);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetProcessOutput )( 
-            IGuest * This,
-            /* [in] */ ULONG aPid,
-            /* [in] */ ULONG aFlags,
-            /* [in] */ ULONG aTimeoutMS,
-            /* [in] */ ULONG64 aSize,
-            /* [retval][out] */ SAFEARRAY * *aData);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetProcessStatus )( 
-            IGuest * This,
-            /* [in] */ ULONG aPid,
-            /* [out] */ ULONG *aExitcode,
-            /* [out] */ ULONG *aFlags,
-            /* [retval][out] */ ULONG *aReason);
-        
-        END_INTERFACE
-    } IGuestVtbl;
-
-    interface IGuest
-    {
-        CONST_VTBL struct IGuestVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IGuest_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IGuest_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IGuest_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IGuest_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IGuest_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IGuest_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IGuest_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IGuest_get_OSTypeId(This,aOSTypeId)	\
-    (This)->lpVtbl -> get_OSTypeId(This,aOSTypeId)
-
-#define IGuest_get_AdditionsActive(This,aAdditionsActive)	\
-    (This)->lpVtbl -> get_AdditionsActive(This,aAdditionsActive)
-
-#define IGuest_get_AdditionsVersion(This,aAdditionsVersion)	\
-    (This)->lpVtbl -> get_AdditionsVersion(This,aAdditionsVersion)
-
-#define IGuest_get_SupportsSeamless(This,aSupportsSeamless)	\
-    (This)->lpVtbl -> get_SupportsSeamless(This,aSupportsSeamless)
-
-#define IGuest_get_SupportsGraphics(This,aSupportsGraphics)	\
-    (This)->lpVtbl -> get_SupportsGraphics(This,aSupportsGraphics)
-
-#define IGuest_get_MemoryBalloonSize(This,aMemoryBalloonSize)	\
-    (This)->lpVtbl -> get_MemoryBalloonSize(This,aMemoryBalloonSize)
-
-#define IGuest_put_MemoryBalloonSize(This,aMemoryBalloonSize)	\
-    (This)->lpVtbl -> put_MemoryBalloonSize(This,aMemoryBalloonSize)
-
-#define IGuest_get_PageFusionEnabled(This,aPageFusionEnabled)	\
-    (This)->lpVtbl -> get_PageFusionEnabled(This,aPageFusionEnabled)
-
-#define IGuest_put_PageFusionEnabled(This,aPageFusionEnabled)	\
-    (This)->lpVtbl -> put_PageFusionEnabled(This,aPageFusionEnabled)
-
-#define IGuest_get_StatisticsUpdateInterval(This,aStatisticsUpdateInterval)	\
-    (This)->lpVtbl -> get_StatisticsUpdateInterval(This,aStatisticsUpdateInterval)
-
-#define IGuest_put_StatisticsUpdateInterval(This,aStatisticsUpdateInterval)	\
-    (This)->lpVtbl -> put_StatisticsUpdateInterval(This,aStatisticsUpdateInterval)
-
-#define IGuest_InternalGetStatistics(This,aCpuUser,aCpuKernel,aCpuIdle,aMemTotal,aMemFree,aMemBalloon,aMemShared,aMemCache,aPagedTotal,aMemAllocTotal,aMemFreeTotal,aMemBalloonTotal,aMemSharedTotal)	\
-    (This)->lpVtbl -> InternalGetStatistics(This,aCpuUser,aCpuKernel,aCpuIdle,aMemTotal,aMemFree,aMemBalloon,aMemShared,aMemCache,aPagedTotal,aMemAllocTotal,aMemFreeTotal,aMemBalloonTotal,aMemSharedTotal)
-
-#define IGuest_SetCredentials(This,aUserName,aPassword,aDomain,aAllowInteractiveLogon)	\
-    (This)->lpVtbl -> SetCredentials(This,aUserName,aPassword,aDomain,aAllowInteractiveLogon)
-
-#define IGuest_ExecuteProcess(This,aExecName,aFlags,aArguments,aEnvironment,aUserName,aPassword,aTimeoutMS,aPid,aProgress)	\
-    (This)->lpVtbl -> ExecuteProcess(This,aExecName,aFlags,aArguments,aEnvironment,aUserName,aPassword,aTimeoutMS,aPid,aProgress)
-
-#define IGuest_GetProcessOutput(This,aPid,aFlags,aTimeoutMS,aSize,aData)	\
-    (This)->lpVtbl -> GetProcessOutput(This,aPid,aFlags,aTimeoutMS,aSize,aData)
-
-#define IGuest_GetProcessStatus(This,aPid,aExitcode,aFlags,aReason)	\
-    (This)->lpVtbl -> GetProcessStatus(This,aPid,aExitcode,aFlags,aReason)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IGuest_get_OSTypeId_Proxy( 
-    IGuest * This,
-    /* [retval][out] */ BSTR *aOSTypeId);
-
-
-void __RPC_STUB IGuest_get_OSTypeId_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IGuest_get_AdditionsActive_Proxy( 
-    IGuest * This,
-    /* [retval][out] */ BOOL *aAdditionsActive);
-
-
-void __RPC_STUB IGuest_get_AdditionsActive_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IGuest_get_AdditionsVersion_Proxy( 
-    IGuest * This,
-    /* [retval][out] */ BSTR *aAdditionsVersion);
-
-
-void __RPC_STUB IGuest_get_AdditionsVersion_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IGuest_get_SupportsSeamless_Proxy( 
-    IGuest * This,
-    /* [retval][out] */ BOOL *aSupportsSeamless);
-
-
-void __RPC_STUB IGuest_get_SupportsSeamless_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IGuest_get_SupportsGraphics_Proxy( 
-    IGuest * This,
-    /* [retval][out] */ BOOL *aSupportsGraphics);
-
-
-void __RPC_STUB IGuest_get_SupportsGraphics_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IGuest_get_MemoryBalloonSize_Proxy( 
-    IGuest * This,
-    /* [retval][out] */ ULONG *aMemoryBalloonSize);
-
-
-void __RPC_STUB IGuest_get_MemoryBalloonSize_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IGuest_put_MemoryBalloonSize_Proxy( 
-    IGuest * This,
-    /* [in] */ ULONG aMemoryBalloonSize);
-
-
-void __RPC_STUB IGuest_put_MemoryBalloonSize_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IGuest_get_PageFusionEnabled_Proxy( 
-    IGuest * This,
-    /* [retval][out] */ BOOL *aPageFusionEnabled);
-
-
-void __RPC_STUB IGuest_get_PageFusionEnabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IGuest_put_PageFusionEnabled_Proxy( 
-    IGuest * This,
-    /* [in] */ BOOL aPageFusionEnabled);
-
-
-void __RPC_STUB IGuest_put_PageFusionEnabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IGuest_get_StatisticsUpdateInterval_Proxy( 
-    IGuest * This,
-    /* [retval][out] */ ULONG *aStatisticsUpdateInterval);
-
-
-void __RPC_STUB IGuest_get_StatisticsUpdateInterval_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IGuest_put_StatisticsUpdateInterval_Proxy( 
-    IGuest * This,
-    /* [in] */ ULONG aStatisticsUpdateInterval);
-
-
-void __RPC_STUB IGuest_put_StatisticsUpdateInterval_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IGuest_InternalGetStatistics_Proxy( 
-    IGuest * This,
-    /* [out] */ ULONG *aCpuUser,
-    /* [out] */ ULONG *aCpuKernel,
-    /* [out] */ ULONG *aCpuIdle,
-    /* [out] */ ULONG *aMemTotal,
-    /* [out] */ ULONG *aMemFree,
-    /* [out] */ ULONG *aMemBalloon,
-    /* [out] */ ULONG *aMemShared,
-    /* [out] */ ULONG *aMemCache,
-    /* [out] */ ULONG *aPagedTotal,
-    /* [out] */ ULONG *aMemAllocTotal,
-    /* [out] */ ULONG *aMemFreeTotal,
-    /* [out] */ ULONG *aMemBalloonTotal,
-    /* [out] */ ULONG *aMemSharedTotal);
-
-
-void __RPC_STUB IGuest_InternalGetStatistics_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IGuest_SetCredentials_Proxy( 
-    IGuest * This,
-    /* [in] */ BSTR aUserName,
-    /* [in] */ BSTR aPassword,
-    /* [in] */ BSTR aDomain,
-    /* [in] */ BOOL aAllowInteractiveLogon);
-
-
-void __RPC_STUB IGuest_SetCredentials_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IGuest_ExecuteProcess_Proxy( 
-    IGuest * This,
-    /* [in] */ BSTR aExecName,
-    /* [in] */ ULONG aFlags,
-    /* [out][in] */ SAFEARRAY * *aArguments,
-    /* [out][in] */ SAFEARRAY * *aEnvironment,
-    /* [in] */ BSTR aUserName,
-    /* [in] */ BSTR aPassword,
-    /* [in] */ ULONG aTimeoutMS,
-    /* [out] */ ULONG *aPid,
-    /* [retval][out] */ IProgress **aProgress);
-
-
-void __RPC_STUB IGuest_ExecuteProcess_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IGuest_GetProcessOutput_Proxy( 
-    IGuest * This,
-    /* [in] */ ULONG aPid,
-    /* [in] */ ULONG aFlags,
-    /* [in] */ ULONG aTimeoutMS,
-    /* [in] */ ULONG64 aSize,
-    /* [retval][out] */ SAFEARRAY * *aData);
-
-
-void __RPC_STUB IGuest_GetProcessOutput_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IGuest_GetProcessStatus_Proxy( 
-    IGuest * This,
-    /* [in] */ ULONG aPid,
-    /* [out] */ ULONG *aExitcode,
-    /* [out] */ ULONG *aFlags,
-    /* [retval][out] */ ULONG *aReason);
-
-
-void __RPC_STUB IGuest_GetProcessStatus_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IGuest_INTERFACE_DEFINED__ */
-
-
-#ifndef __IProgress_INTERFACE_DEFINED__
-#define __IProgress_INTERFACE_DEFINED__
-
-/* interface IProgress */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IProgress;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("856aa038-853f-42e2-acf7-6e7b02dbe294")
-    IProgress : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Id( 
-            /* [retval][out] */ BSTR *aId) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Description( 
-            /* [retval][out] */ BSTR *aDescription) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Initiator( 
-            /* [retval][out] */ IUnknown **aInitiator) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Cancelable( 
-            /* [retval][out] */ BOOL *aCancelable) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Percent( 
-            /* [retval][out] */ ULONG *aPercent) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_TimeRemaining( 
-            /* [retval][out] */ LONG *aTimeRemaining) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Completed( 
-            /* [retval][out] */ BOOL *aCompleted) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Canceled( 
-            /* [retval][out] */ BOOL *aCanceled) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_ResultCode( 
-            /* [retval][out] */ LONG *aResultCode) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_ErrorInfo( 
-            /* [retval][out] */ IVirtualBoxErrorInfo **aErrorInfo) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_OperationCount( 
-            /* [retval][out] */ ULONG *aOperationCount) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Operation( 
-            /* [retval][out] */ ULONG *aOperation) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_OperationDescription( 
-            /* [retval][out] */ BSTR *aOperationDescription) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_OperationPercent( 
-            /* [retval][out] */ ULONG *aOperationPercent) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Timeout( 
-            /* [retval][out] */ ULONG *aTimeout) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_Timeout( 
-            /* [in] */ ULONG aTimeout) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetCurrentOperationProgress( 
-            /* [in] */ ULONG aPercent) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetNextOperation( 
-            /* [in] */ BSTR aNextOperationDescription,
-            /* [in] */ ULONG aNextOperationsWeight) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE WaitForCompletion( 
-            /* [in] */ LONG aTimeout) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE WaitForOperationCompletion( 
-            /* [in] */ ULONG aOperation,
-            /* [in] */ LONG aTimeout) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE Cancel( void) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IProgressVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IProgress * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IProgress * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IProgress * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IProgress * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IProgress * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IProgress * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IProgress * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Id )( 
-            IProgress * This,
-            /* [retval][out] */ BSTR *aId);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Description )( 
-            IProgress * This,
-            /* [retval][out] */ BSTR *aDescription);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Initiator )( 
-            IProgress * This,
-            /* [retval][out] */ IUnknown **aInitiator);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Cancelable )( 
-            IProgress * This,
-            /* [retval][out] */ BOOL *aCancelable);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Percent )( 
-            IProgress * This,
-            /* [retval][out] */ ULONG *aPercent);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_TimeRemaining )( 
-            IProgress * This,
-            /* [retval][out] */ LONG *aTimeRemaining);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Completed )( 
-            IProgress * This,
-            /* [retval][out] */ BOOL *aCompleted);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Canceled )( 
-            IProgress * This,
-            /* [retval][out] */ BOOL *aCanceled);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_ResultCode )( 
-            IProgress * This,
-            /* [retval][out] */ LONG *aResultCode);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_ErrorInfo )( 
-            IProgress * This,
-            /* [retval][out] */ IVirtualBoxErrorInfo **aErrorInfo);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_OperationCount )( 
-            IProgress * This,
-            /* [retval][out] */ ULONG *aOperationCount);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Operation )( 
-            IProgress * This,
-            /* [retval][out] */ ULONG *aOperation);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_OperationDescription )( 
-            IProgress * This,
-            /* [retval][out] */ BSTR *aOperationDescription);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_OperationPercent )( 
-            IProgress * This,
-            /* [retval][out] */ ULONG *aOperationPercent);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Timeout )( 
-            IProgress * This,
-            /* [retval][out] */ ULONG *aTimeout);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Timeout )( 
-            IProgress * This,
-            /* [in] */ ULONG aTimeout);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetCurrentOperationProgress )( 
-            IProgress * This,
-            /* [in] */ ULONG aPercent);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetNextOperation )( 
-            IProgress * This,
-            /* [in] */ BSTR aNextOperationDescription,
-            /* [in] */ ULONG aNextOperationsWeight);
-        
-        HRESULT ( STDMETHODCALLTYPE *WaitForCompletion )( 
-            IProgress * This,
-            /* [in] */ LONG aTimeout);
-        
-        HRESULT ( STDMETHODCALLTYPE *WaitForOperationCompletion )( 
-            IProgress * This,
-            /* [in] */ ULONG aOperation,
-            /* [in] */ LONG aTimeout);
-        
-        HRESULT ( STDMETHODCALLTYPE *Cancel )( 
-            IProgress * This);
-        
-        END_INTERFACE
-    } IProgressVtbl;
-
-    interface IProgress
-    {
-        CONST_VTBL struct IProgressVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IProgress_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IProgress_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IProgress_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IProgress_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IProgress_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IProgress_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IProgress_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IProgress_get_Id(This,aId)	\
-    (This)->lpVtbl -> get_Id(This,aId)
-
-#define IProgress_get_Description(This,aDescription)	\
-    (This)->lpVtbl -> get_Description(This,aDescription)
-
-#define IProgress_get_Initiator(This,aInitiator)	\
-    (This)->lpVtbl -> get_Initiator(This,aInitiator)
-
-#define IProgress_get_Cancelable(This,aCancelable)	\
-    (This)->lpVtbl -> get_Cancelable(This,aCancelable)
-
-#define IProgress_get_Percent(This,aPercent)	\
-    (This)->lpVtbl -> get_Percent(This,aPercent)
-
-#define IProgress_get_TimeRemaining(This,aTimeRemaining)	\
-    (This)->lpVtbl -> get_TimeRemaining(This,aTimeRemaining)
-
-#define IProgress_get_Completed(This,aCompleted)	\
-    (This)->lpVtbl -> get_Completed(This,aCompleted)
-
-#define IProgress_get_Canceled(This,aCanceled)	\
-    (This)->lpVtbl -> get_Canceled(This,aCanceled)
-
-#define IProgress_get_ResultCode(This,aResultCode)	\
-    (This)->lpVtbl -> get_ResultCode(This,aResultCode)
-
-#define IProgress_get_ErrorInfo(This,aErrorInfo)	\
-    (This)->lpVtbl -> get_ErrorInfo(This,aErrorInfo)
-
-#define IProgress_get_OperationCount(This,aOperationCount)	\
-    (This)->lpVtbl -> get_OperationCount(This,aOperationCount)
-
-#define IProgress_get_Operation(This,aOperation)	\
-    (This)->lpVtbl -> get_Operation(This,aOperation)
-
-#define IProgress_get_OperationDescription(This,aOperationDescription)	\
-    (This)->lpVtbl -> get_OperationDescription(This,aOperationDescription)
-
-#define IProgress_get_OperationPercent(This,aOperationPercent)	\
-    (This)->lpVtbl -> get_OperationPercent(This,aOperationPercent)
-
-#define IProgress_get_Timeout(This,aTimeout)	\
-    (This)->lpVtbl -> get_Timeout(This,aTimeout)
-
-#define IProgress_put_Timeout(This,aTimeout)	\
-    (This)->lpVtbl -> put_Timeout(This,aTimeout)
-
-#define IProgress_SetCurrentOperationProgress(This,aPercent)	\
-    (This)->lpVtbl -> SetCurrentOperationProgress(This,aPercent)
-
-#define IProgress_SetNextOperation(This,aNextOperationDescription,aNextOperationsWeight)	\
-    (This)->lpVtbl -> SetNextOperation(This,aNextOperationDescription,aNextOperationsWeight)
-
-#define IProgress_WaitForCompletion(This,aTimeout)	\
-    (This)->lpVtbl -> WaitForCompletion(This,aTimeout)
-
-#define IProgress_WaitForOperationCompletion(This,aOperation,aTimeout)	\
-    (This)->lpVtbl -> WaitForOperationCompletion(This,aOperation,aTimeout)
-
-#define IProgress_Cancel(This)	\
-    (This)->lpVtbl -> Cancel(This)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IProgress_get_Id_Proxy( 
-    IProgress * This,
-    /* [retval][out] */ BSTR *aId);
-
-
-void __RPC_STUB IProgress_get_Id_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IProgress_get_Description_Proxy( 
-    IProgress * This,
-    /* [retval][out] */ BSTR *aDescription);
-
-
-void __RPC_STUB IProgress_get_Description_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IProgress_get_Initiator_Proxy( 
-    IProgress * This,
-    /* [retval][out] */ IUnknown **aInitiator);
-
-
-void __RPC_STUB IProgress_get_Initiator_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IProgress_get_Cancelable_Proxy( 
-    IProgress * This,
-    /* [retval][out] */ BOOL *aCancelable);
-
-
-void __RPC_STUB IProgress_get_Cancelable_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IProgress_get_Percent_Proxy( 
-    IProgress * This,
-    /* [retval][out] */ ULONG *aPercent);
-
-
-void __RPC_STUB IProgress_get_Percent_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IProgress_get_TimeRemaining_Proxy( 
-    IProgress * This,
-    /* [retval][out] */ LONG *aTimeRemaining);
-
-
-void __RPC_STUB IProgress_get_TimeRemaining_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IProgress_get_Completed_Proxy( 
-    IProgress * This,
-    /* [retval][out] */ BOOL *aCompleted);
-
-
-void __RPC_STUB IProgress_get_Completed_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IProgress_get_Canceled_Proxy( 
-    IProgress * This,
-    /* [retval][out] */ BOOL *aCanceled);
-
-
-void __RPC_STUB IProgress_get_Canceled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IProgress_get_ResultCode_Proxy( 
-    IProgress * This,
-    /* [retval][out] */ LONG *aResultCode);
-
-
-void __RPC_STUB IProgress_get_ResultCode_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IProgress_get_ErrorInfo_Proxy( 
-    IProgress * This,
-    /* [retval][out] */ IVirtualBoxErrorInfo **aErrorInfo);
-
-
-void __RPC_STUB IProgress_get_ErrorInfo_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IProgress_get_OperationCount_Proxy( 
-    IProgress * This,
-    /* [retval][out] */ ULONG *aOperationCount);
-
-
-void __RPC_STUB IProgress_get_OperationCount_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IProgress_get_Operation_Proxy( 
-    IProgress * This,
-    /* [retval][out] */ ULONG *aOperation);
-
-
-void __RPC_STUB IProgress_get_Operation_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IProgress_get_OperationDescription_Proxy( 
-    IProgress * This,
-    /* [retval][out] */ BSTR *aOperationDescription);
-
-
-void __RPC_STUB IProgress_get_OperationDescription_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IProgress_get_OperationPercent_Proxy( 
-    IProgress * This,
-    /* [retval][out] */ ULONG *aOperationPercent);
-
-
-void __RPC_STUB IProgress_get_OperationPercent_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IProgress_get_Timeout_Proxy( 
-    IProgress * This,
-    /* [retval][out] */ ULONG *aTimeout);
-
-
-void __RPC_STUB IProgress_get_Timeout_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IProgress_put_Timeout_Proxy( 
-    IProgress * This,
-    /* [in] */ ULONG aTimeout);
-
-
-void __RPC_STUB IProgress_put_Timeout_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IProgress_SetCurrentOperationProgress_Proxy( 
-    IProgress * This,
-    /* [in] */ ULONG aPercent);
-
-
-void __RPC_STUB IProgress_SetCurrentOperationProgress_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IProgress_SetNextOperation_Proxy( 
-    IProgress * This,
-    /* [in] */ BSTR aNextOperationDescription,
-    /* [in] */ ULONG aNextOperationsWeight);
-
-
-void __RPC_STUB IProgress_SetNextOperation_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IProgress_WaitForCompletion_Proxy( 
-    IProgress * This,
-    /* [in] */ LONG aTimeout);
-
-
-void __RPC_STUB IProgress_WaitForCompletion_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IProgress_WaitForOperationCompletion_Proxy( 
-    IProgress * This,
-    /* [in] */ ULONG aOperation,
-    /* [in] */ LONG aTimeout);
-
-
-void __RPC_STUB IProgress_WaitForOperationCompletion_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IProgress_Cancel_Proxy( 
-    IProgress * This);
-
-
-void __RPC_STUB IProgress_Cancel_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IProgress_INTERFACE_DEFINED__ */
-
-
-#ifndef __ISnapshot_INTERFACE_DEFINED__
-#define __ISnapshot_INTERFACE_DEFINED__
-
-/* interface ISnapshot */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_ISnapshot;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("1a2d0551-58a4-4107-857e-ef414fc42ffc")
-    ISnapshot : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Id( 
-            /* [retval][out] */ BSTR *aId) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Name( 
-            /* [retval][out] */ BSTR *aName) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_Name( 
-            /* [in] */ BSTR aName) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Description( 
-            /* [retval][out] */ BSTR *aDescription) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_Description( 
-            /* [in] */ BSTR aDescription) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_TimeStamp( 
-            /* [retval][out] */ LONG64 *aTimeStamp) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Online( 
-            /* [retval][out] */ BOOL *aOnline) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Machine( 
-            /* [retval][out] */ IMachine **aMachine) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Parent( 
-            /* [retval][out] */ ISnapshot **aParent) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Children( 
-            /* [retval][out] */ SAFEARRAY * *aChildren) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct ISnapshotVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            ISnapshot * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            ISnapshot * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            ISnapshot * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            ISnapshot * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            ISnapshot * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            ISnapshot * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            ISnapshot * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Id )( 
-            ISnapshot * This,
-            /* [retval][out] */ BSTR *aId);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Name )( 
-            ISnapshot * This,
-            /* [retval][out] */ BSTR *aName);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Name )( 
-            ISnapshot * This,
-            /* [in] */ BSTR aName);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Description )( 
-            ISnapshot * This,
-            /* [retval][out] */ BSTR *aDescription);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Description )( 
-            ISnapshot * This,
-            /* [in] */ BSTR aDescription);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_TimeStamp )( 
-            ISnapshot * This,
-            /* [retval][out] */ LONG64 *aTimeStamp);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Online )( 
-            ISnapshot * This,
-            /* [retval][out] */ BOOL *aOnline);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Machine )( 
-            ISnapshot * This,
-            /* [retval][out] */ IMachine **aMachine);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Parent )( 
-            ISnapshot * This,
-            /* [retval][out] */ ISnapshot **aParent);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Children )( 
-            ISnapshot * This,
-            /* [retval][out] */ SAFEARRAY * *aChildren);
-        
-        END_INTERFACE
-    } ISnapshotVtbl;
-
-    interface ISnapshot
-    {
-        CONST_VTBL struct ISnapshotVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define ISnapshot_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define ISnapshot_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define ISnapshot_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define ISnapshot_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define ISnapshot_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define ISnapshot_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define ISnapshot_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define ISnapshot_get_Id(This,aId)	\
-    (This)->lpVtbl -> get_Id(This,aId)
-
-#define ISnapshot_get_Name(This,aName)	\
-    (This)->lpVtbl -> get_Name(This,aName)
-
-#define ISnapshot_put_Name(This,aName)	\
-    (This)->lpVtbl -> put_Name(This,aName)
-
-#define ISnapshot_get_Description(This,aDescription)	\
-    (This)->lpVtbl -> get_Description(This,aDescription)
-
-#define ISnapshot_put_Description(This,aDescription)	\
-    (This)->lpVtbl -> put_Description(This,aDescription)
-
-#define ISnapshot_get_TimeStamp(This,aTimeStamp)	\
-    (This)->lpVtbl -> get_TimeStamp(This,aTimeStamp)
-
-#define ISnapshot_get_Online(This,aOnline)	\
-    (This)->lpVtbl -> get_Online(This,aOnline)
-
-#define ISnapshot_get_Machine(This,aMachine)	\
-    (This)->lpVtbl -> get_Machine(This,aMachine)
-
-#define ISnapshot_get_Parent(This,aParent)	\
-    (This)->lpVtbl -> get_Parent(This,aParent)
-
-#define ISnapshot_get_Children(This,aChildren)	\
-    (This)->lpVtbl -> get_Children(This,aChildren)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISnapshot_get_Id_Proxy( 
-    ISnapshot * This,
-    /* [retval][out] */ BSTR *aId);
-
-
-void __RPC_STUB ISnapshot_get_Id_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISnapshot_get_Name_Proxy( 
-    ISnapshot * This,
-    /* [retval][out] */ BSTR *aName);
-
-
-void __RPC_STUB ISnapshot_get_Name_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE ISnapshot_put_Name_Proxy( 
-    ISnapshot * This,
-    /* [in] */ BSTR aName);
-
-
-void __RPC_STUB ISnapshot_put_Name_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISnapshot_get_Description_Proxy( 
-    ISnapshot * This,
-    /* [retval][out] */ BSTR *aDescription);
-
-
-void __RPC_STUB ISnapshot_get_Description_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE ISnapshot_put_Description_Proxy( 
-    ISnapshot * This,
-    /* [in] */ BSTR aDescription);
-
-
-void __RPC_STUB ISnapshot_put_Description_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISnapshot_get_TimeStamp_Proxy( 
-    ISnapshot * This,
-    /* [retval][out] */ LONG64 *aTimeStamp);
-
-
-void __RPC_STUB ISnapshot_get_TimeStamp_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISnapshot_get_Online_Proxy( 
-    ISnapshot * This,
-    /* [retval][out] */ BOOL *aOnline);
-
-
-void __RPC_STUB ISnapshot_get_Online_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISnapshot_get_Machine_Proxy( 
-    ISnapshot * This,
-    /* [retval][out] */ IMachine **aMachine);
-
-
-void __RPC_STUB ISnapshot_get_Machine_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISnapshot_get_Parent_Proxy( 
-    ISnapshot * This,
-    /* [retval][out] */ ISnapshot **aParent);
-
-
-void __RPC_STUB ISnapshot_get_Parent_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISnapshot_get_Children_Proxy( 
-    ISnapshot * This,
-    /* [retval][out] */ SAFEARRAY * *aChildren);
-
-
-void __RPC_STUB ISnapshot_get_Children_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __ISnapshot_INTERFACE_DEFINED__ */
-
-
-#ifndef __IMediumAttachment_INTERFACE_DEFINED__
-#define __IMediumAttachment_INTERFACE_DEFINED__
-
-/* interface IMediumAttachment */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IMediumAttachment;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("e58eb3eb-8627-428b-bdf8-34487c848de5")
-    IMediumAttachment : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Medium( 
-            /* [retval][out] */ IMedium **aMedium) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Controller( 
-            /* [retval][out] */ BSTR *aController) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Port( 
-            /* [retval][out] */ LONG *aPort) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Device( 
-            /* [retval][out] */ LONG *aDevice) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Type( 
-            /* [retval][out] */ DeviceType *aType) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Passthrough( 
-            /* [retval][out] */ BOOL *aPassthrough) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IMediumAttachmentVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IMediumAttachment * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IMediumAttachment * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IMediumAttachment * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IMediumAttachment * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IMediumAttachment * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IMediumAttachment * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IMediumAttachment * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Medium )( 
-            IMediumAttachment * This,
-            /* [retval][out] */ IMedium **aMedium);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Controller )( 
-            IMediumAttachment * This,
-            /* [retval][out] */ BSTR *aController);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Port )( 
-            IMediumAttachment * This,
-            /* [retval][out] */ LONG *aPort);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Device )( 
-            IMediumAttachment * This,
-            /* [retval][out] */ LONG *aDevice);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Type )( 
-            IMediumAttachment * This,
-            /* [retval][out] */ DeviceType *aType);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Passthrough )( 
-            IMediumAttachment * This,
-            /* [retval][out] */ BOOL *aPassthrough);
-        
-        END_INTERFACE
-    } IMediumAttachmentVtbl;
-
-    interface IMediumAttachment
-    {
-        CONST_VTBL struct IMediumAttachmentVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IMediumAttachment_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IMediumAttachment_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IMediumAttachment_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IMediumAttachment_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IMediumAttachment_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IMediumAttachment_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IMediumAttachment_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IMediumAttachment_get_Medium(This,aMedium)	\
-    (This)->lpVtbl -> get_Medium(This,aMedium)
-
-#define IMediumAttachment_get_Controller(This,aController)	\
-    (This)->lpVtbl -> get_Controller(This,aController)
-
-#define IMediumAttachment_get_Port(This,aPort)	\
-    (This)->lpVtbl -> get_Port(This,aPort)
-
-#define IMediumAttachment_get_Device(This,aDevice)	\
-    (This)->lpVtbl -> get_Device(This,aDevice)
-
-#define IMediumAttachment_get_Type(This,aType)	\
-    (This)->lpVtbl -> get_Type(This,aType)
-
-#define IMediumAttachment_get_Passthrough(This,aPassthrough)	\
-    (This)->lpVtbl -> get_Passthrough(This,aPassthrough)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMediumAttachment_get_Medium_Proxy( 
-    IMediumAttachment * This,
-    /* [retval][out] */ IMedium **aMedium);
-
-
-void __RPC_STUB IMediumAttachment_get_Medium_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMediumAttachment_get_Controller_Proxy( 
-    IMediumAttachment * This,
-    /* [retval][out] */ BSTR *aController);
-
-
-void __RPC_STUB IMediumAttachment_get_Controller_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMediumAttachment_get_Port_Proxy( 
-    IMediumAttachment * This,
-    /* [retval][out] */ LONG *aPort);
-
-
-void __RPC_STUB IMediumAttachment_get_Port_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMediumAttachment_get_Device_Proxy( 
-    IMediumAttachment * This,
-    /* [retval][out] */ LONG *aDevice);
-
-
-void __RPC_STUB IMediumAttachment_get_Device_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMediumAttachment_get_Type_Proxy( 
-    IMediumAttachment * This,
-    /* [retval][out] */ DeviceType *aType);
-
-
-void __RPC_STUB IMediumAttachment_get_Type_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMediumAttachment_get_Passthrough_Proxy( 
-    IMediumAttachment * This,
-    /* [retval][out] */ BOOL *aPassthrough);
-
-
-void __RPC_STUB IMediumAttachment_get_Passthrough_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IMediumAttachment_INTERFACE_DEFINED__ */
-
-
-#ifndef __IMedium_INTERFACE_DEFINED__
-#define __IMedium_INTERFACE_DEFINED__
-
-/* interface IMedium */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IMedium;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("1d578f43-5ef1-4415-b556-7592d3ccdc8f")
-    IMedium : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Id( 
-            /* [retval][out] */ BSTR *aId) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Description( 
-            /* [retval][out] */ BSTR *aDescription) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_Description( 
-            /* [in] */ BSTR aDescription) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_State( 
-            /* [retval][out] */ MediumState *aState) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Location( 
-            /* [retval][out] */ BSTR *aLocation) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_Location( 
-            /* [in] */ BSTR aLocation) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Name( 
-            /* [retval][out] */ BSTR *aName) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_DeviceType( 
-            /* [retval][out] */ DeviceType *aDeviceType) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_HostDrive( 
-            /* [retval][out] */ BOOL *aHostDrive) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Size( 
-            /* [retval][out] */ ULONG64 *aSize) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Format( 
-            /* [retval][out] */ BSTR *aFormat) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_MediumFormat( 
-            /* [retval][out] */ IMediumFormat **aMediumFormat) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Type( 
-            /* [retval][out] */ MediumType *aType) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_Type( 
-            /* [in] */ MediumType aType) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Parent( 
-            /* [retval][out] */ IMedium **aParent) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Children( 
-            /* [retval][out] */ SAFEARRAY * *aChildren) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Base( 
-            /* [retval][out] */ IMedium **aBase) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_ReadOnly( 
-            /* [retval][out] */ BOOL *aReadOnly) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_LogicalSize( 
-            /* [retval][out] */ ULONG64 *aLogicalSize) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_AutoReset( 
-            /* [retval][out] */ BOOL *aAutoReset) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_AutoReset( 
-            /* [in] */ BOOL aAutoReset) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_LastAccessError( 
-            /* [retval][out] */ BSTR *aLastAccessError) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_MachineIds( 
-            /* [retval][out] */ SAFEARRAY * *aMachineIds) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE RefreshState( 
-            /* [retval][out] */ MediumState *aState) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetSnapshotIds( 
-            /* [in] */ BSTR aMachineId,
-            /* [retval][out] */ SAFEARRAY * *aSnapshotIds) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE LockRead( 
-            /* [retval][out] */ MediumState *aState) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE UnlockRead( 
-            /* [retval][out] */ MediumState *aState) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE LockWrite( 
-            /* [retval][out] */ MediumState *aState) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE UnlockWrite( 
-            /* [retval][out] */ MediumState *aState) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE Close( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetProperty( 
-            /* [in] */ BSTR aName,
-            /* [retval][out] */ BSTR *aValue) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetProperty( 
-            /* [in] */ BSTR aName,
-            /* [in] */ BSTR aValue) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetProperties( 
-            /* [in] */ BSTR aNames,
-            /* [out] */ SAFEARRAY * *aReturnNames,
-            /* [retval][out] */ SAFEARRAY * *aReturnValues) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetProperties( 
-            /* [out][in] */ SAFEARRAY * *aNames,
-            /* [out][in] */ SAFEARRAY * *aValues) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateBaseStorage( 
-            /* [in] */ ULONG64 aLogicalSize,
-            /* [in] */ MediumVariant aVariant,
-            /* [retval][out] */ IProgress **aProgress) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE DeleteStorage( 
-            /* [retval][out] */ IProgress **aProgress) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateDiffStorage( 
-            /* [in] */ IMedium *aTarget,
-            /* [in] */ MediumVariant aVariant,
-            /* [retval][out] */ IProgress **aProgress) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE MergeTo( 
-            /* [in] */ IMedium *aTarget,
-            /* [retval][out] */ IProgress **aProgress) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CloneTo( 
-            /* [in] */ IMedium *aTarget,
-            /* [in] */ MediumVariant aVariant,
-            /* [in] */ IMedium *aParent,
-            /* [retval][out] */ IProgress **aProgress) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE Compact( 
-            /* [retval][out] */ IProgress **aProgress) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE Resize( 
-            /* [in] */ ULONG64 aLogicalSize,
-            /* [retval][out] */ IProgress **aProgress) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE Reset( 
-            /* [retval][out] */ IProgress **aProgress) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IMediumVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IMedium * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IMedium * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IMedium * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IMedium * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IMedium * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IMedium * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IMedium * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Id )( 
-            IMedium * This,
-            /* [retval][out] */ BSTR *aId);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Description )( 
-            IMedium * This,
-            /* [retval][out] */ BSTR *aDescription);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Description )( 
-            IMedium * This,
-            /* [in] */ BSTR aDescription);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_State )( 
-            IMedium * This,
-            /* [retval][out] */ MediumState *aState);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Location )( 
-            IMedium * This,
-            /* [retval][out] */ BSTR *aLocation);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Location )( 
-            IMedium * This,
-            /* [in] */ BSTR aLocation);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Name )( 
-            IMedium * This,
-            /* [retval][out] */ BSTR *aName);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_DeviceType )( 
-            IMedium * This,
-            /* [retval][out] */ DeviceType *aDeviceType);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_HostDrive )( 
-            IMedium * This,
-            /* [retval][out] */ BOOL *aHostDrive);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Size )( 
-            IMedium * This,
-            /* [retval][out] */ ULONG64 *aSize);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Format )( 
-            IMedium * This,
-            /* [retval][out] */ BSTR *aFormat);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_MediumFormat )( 
-            IMedium * This,
-            /* [retval][out] */ IMediumFormat **aMediumFormat);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Type )( 
-            IMedium * This,
-            /* [retval][out] */ MediumType *aType);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Type )( 
-            IMedium * This,
-            /* [in] */ MediumType aType);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Parent )( 
-            IMedium * This,
-            /* [retval][out] */ IMedium **aParent);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Children )( 
-            IMedium * This,
-            /* [retval][out] */ SAFEARRAY * *aChildren);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Base )( 
-            IMedium * This,
-            /* [retval][out] */ IMedium **aBase);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_ReadOnly )( 
-            IMedium * This,
-            /* [retval][out] */ BOOL *aReadOnly);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_LogicalSize )( 
-            IMedium * This,
-            /* [retval][out] */ ULONG64 *aLogicalSize);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_AutoReset )( 
-            IMedium * This,
-            /* [retval][out] */ BOOL *aAutoReset);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_AutoReset )( 
-            IMedium * This,
-            /* [in] */ BOOL aAutoReset);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_LastAccessError )( 
-            IMedium * This,
-            /* [retval][out] */ BSTR *aLastAccessError);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_MachineIds )( 
-            IMedium * This,
-            /* [retval][out] */ SAFEARRAY * *aMachineIds);
-        
-        HRESULT ( STDMETHODCALLTYPE *RefreshState )( 
-            IMedium * This,
-            /* [retval][out] */ MediumState *aState);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetSnapshotIds )( 
-            IMedium * This,
-            /* [in] */ BSTR aMachineId,
-            /* [retval][out] */ SAFEARRAY * *aSnapshotIds);
-        
-        HRESULT ( STDMETHODCALLTYPE *LockRead )( 
-            IMedium * This,
-            /* [retval][out] */ MediumState *aState);
-        
-        HRESULT ( STDMETHODCALLTYPE *UnlockRead )( 
-            IMedium * This,
-            /* [retval][out] */ MediumState *aState);
-        
-        HRESULT ( STDMETHODCALLTYPE *LockWrite )( 
-            IMedium * This,
-            /* [retval][out] */ MediumState *aState);
-        
-        HRESULT ( STDMETHODCALLTYPE *UnlockWrite )( 
-            IMedium * This,
-            /* [retval][out] */ MediumState *aState);
-        
-        HRESULT ( STDMETHODCALLTYPE *Close )( 
-            IMedium * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetProperty )( 
-            IMedium * This,
-            /* [in] */ BSTR aName,
-            /* [retval][out] */ BSTR *aValue);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetProperty )( 
-            IMedium * This,
-            /* [in] */ BSTR aName,
-            /* [in] */ BSTR aValue);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetProperties )( 
-            IMedium * This,
-            /* [in] */ BSTR aNames,
-            /* [out] */ SAFEARRAY * *aReturnNames,
-            /* [retval][out] */ SAFEARRAY * *aReturnValues);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetProperties )( 
-            IMedium * This,
-            /* [out][in] */ SAFEARRAY * *aNames,
-            /* [out][in] */ SAFEARRAY * *aValues);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateBaseStorage )( 
-            IMedium * This,
-            /* [in] */ ULONG64 aLogicalSize,
-            /* [in] */ MediumVariant aVariant,
-            /* [retval][out] */ IProgress **aProgress);
-        
-        HRESULT ( STDMETHODCALLTYPE *DeleteStorage )( 
-            IMedium * This,
-            /* [retval][out] */ IProgress **aProgress);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateDiffStorage )( 
-            IMedium * This,
-            /* [in] */ IMedium *aTarget,
-            /* [in] */ MediumVariant aVariant,
-            /* [retval][out] */ IProgress **aProgress);
-        
-        HRESULT ( STDMETHODCALLTYPE *MergeTo )( 
-            IMedium * This,
-            /* [in] */ IMedium *aTarget,
-            /* [retval][out] */ IProgress **aProgress);
-        
-        HRESULT ( STDMETHODCALLTYPE *CloneTo )( 
-            IMedium * This,
-            /* [in] */ IMedium *aTarget,
-            /* [in] */ MediumVariant aVariant,
-            /* [in] */ IMedium *aParent,
-            /* [retval][out] */ IProgress **aProgress);
-        
-        HRESULT ( STDMETHODCALLTYPE *Compact )( 
-            IMedium * This,
-            /* [retval][out] */ IProgress **aProgress);
-        
-        HRESULT ( STDMETHODCALLTYPE *Resize )( 
-            IMedium * This,
-            /* [in] */ ULONG64 aLogicalSize,
-            /* [retval][out] */ IProgress **aProgress);
-        
-        HRESULT ( STDMETHODCALLTYPE *Reset )( 
-            IMedium * This,
-            /* [retval][out] */ IProgress **aProgress);
-        
-        END_INTERFACE
-    } IMediumVtbl;
-
-    interface IMedium
-    {
-        CONST_VTBL struct IMediumVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IMedium_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IMedium_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IMedium_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IMedium_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IMedium_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IMedium_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IMedium_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IMedium_get_Id(This,aId)	\
-    (This)->lpVtbl -> get_Id(This,aId)
-
-#define IMedium_get_Description(This,aDescription)	\
-    (This)->lpVtbl -> get_Description(This,aDescription)
-
-#define IMedium_put_Description(This,aDescription)	\
-    (This)->lpVtbl -> put_Description(This,aDescription)
-
-#define IMedium_get_State(This,aState)	\
-    (This)->lpVtbl -> get_State(This,aState)
-
-#define IMedium_get_Location(This,aLocation)	\
-    (This)->lpVtbl -> get_Location(This,aLocation)
-
-#define IMedium_put_Location(This,aLocation)	\
-    (This)->lpVtbl -> put_Location(This,aLocation)
-
-#define IMedium_get_Name(This,aName)	\
-    (This)->lpVtbl -> get_Name(This,aName)
-
-#define IMedium_get_DeviceType(This,aDeviceType)	\
-    (This)->lpVtbl -> get_DeviceType(This,aDeviceType)
-
-#define IMedium_get_HostDrive(This,aHostDrive)	\
-    (This)->lpVtbl -> get_HostDrive(This,aHostDrive)
-
-#define IMedium_get_Size(This,aSize)	\
-    (This)->lpVtbl -> get_Size(This,aSize)
-
-#define IMedium_get_Format(This,aFormat)	\
-    (This)->lpVtbl -> get_Format(This,aFormat)
-
-#define IMedium_get_MediumFormat(This,aMediumFormat)	\
-    (This)->lpVtbl -> get_MediumFormat(This,aMediumFormat)
-
-#define IMedium_get_Type(This,aType)	\
-    (This)->lpVtbl -> get_Type(This,aType)
-
-#define IMedium_put_Type(This,aType)	\
-    (This)->lpVtbl -> put_Type(This,aType)
-
-#define IMedium_get_Parent(This,aParent)	\
-    (This)->lpVtbl -> get_Parent(This,aParent)
-
-#define IMedium_get_Children(This,aChildren)	\
-    (This)->lpVtbl -> get_Children(This,aChildren)
-
-#define IMedium_get_Base(This,aBase)	\
-    (This)->lpVtbl -> get_Base(This,aBase)
-
-#define IMedium_get_ReadOnly(This,aReadOnly)	\
-    (This)->lpVtbl -> get_ReadOnly(This,aReadOnly)
-
-#define IMedium_get_LogicalSize(This,aLogicalSize)	\
-    (This)->lpVtbl -> get_LogicalSize(This,aLogicalSize)
-
-#define IMedium_get_AutoReset(This,aAutoReset)	\
-    (This)->lpVtbl -> get_AutoReset(This,aAutoReset)
-
-#define IMedium_put_AutoReset(This,aAutoReset)	\
-    (This)->lpVtbl -> put_AutoReset(This,aAutoReset)
-
-#define IMedium_get_LastAccessError(This,aLastAccessError)	\
-    (This)->lpVtbl -> get_LastAccessError(This,aLastAccessError)
-
-#define IMedium_get_MachineIds(This,aMachineIds)	\
-    (This)->lpVtbl -> get_MachineIds(This,aMachineIds)
-
-#define IMedium_RefreshState(This,aState)	\
-    (This)->lpVtbl -> RefreshState(This,aState)
-
-#define IMedium_GetSnapshotIds(This,aMachineId,aSnapshotIds)	\
-    (This)->lpVtbl -> GetSnapshotIds(This,aMachineId,aSnapshotIds)
-
-#define IMedium_LockRead(This,aState)	\
-    (This)->lpVtbl -> LockRead(This,aState)
-
-#define IMedium_UnlockRead(This,aState)	\
-    (This)->lpVtbl -> UnlockRead(This,aState)
-
-#define IMedium_LockWrite(This,aState)	\
-    (This)->lpVtbl -> LockWrite(This,aState)
-
-#define IMedium_UnlockWrite(This,aState)	\
-    (This)->lpVtbl -> UnlockWrite(This,aState)
-
-#define IMedium_Close(This)	\
-    (This)->lpVtbl -> Close(This)
-
-#define IMedium_GetProperty(This,aName,aValue)	\
-    (This)->lpVtbl -> GetProperty(This,aName,aValue)
-
-#define IMedium_SetProperty(This,aName,aValue)	\
-    (This)->lpVtbl -> SetProperty(This,aName,aValue)
-
-#define IMedium_GetProperties(This,aNames,aReturnNames,aReturnValues)	\
-    (This)->lpVtbl -> GetProperties(This,aNames,aReturnNames,aReturnValues)
-
-#define IMedium_SetProperties(This,aNames,aValues)	\
-    (This)->lpVtbl -> SetProperties(This,aNames,aValues)
-
-#define IMedium_CreateBaseStorage(This,aLogicalSize,aVariant,aProgress)	\
-    (This)->lpVtbl -> CreateBaseStorage(This,aLogicalSize,aVariant,aProgress)
-
-#define IMedium_DeleteStorage(This,aProgress)	\
-    (This)->lpVtbl -> DeleteStorage(This,aProgress)
-
-#define IMedium_CreateDiffStorage(This,aTarget,aVariant,aProgress)	\
-    (This)->lpVtbl -> CreateDiffStorage(This,aTarget,aVariant,aProgress)
-
-#define IMedium_MergeTo(This,aTarget,aProgress)	\
-    (This)->lpVtbl -> MergeTo(This,aTarget,aProgress)
-
-#define IMedium_CloneTo(This,aTarget,aVariant,aParent,aProgress)	\
-    (This)->lpVtbl -> CloneTo(This,aTarget,aVariant,aParent,aProgress)
-
-#define IMedium_Compact(This,aProgress)	\
-    (This)->lpVtbl -> Compact(This,aProgress)
-
-#define IMedium_Resize(This,aLogicalSize,aProgress)	\
-    (This)->lpVtbl -> Resize(This,aLogicalSize,aProgress)
-
-#define IMedium_Reset(This,aProgress)	\
-    (This)->lpVtbl -> Reset(This,aProgress)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMedium_get_Id_Proxy( 
-    IMedium * This,
-    /* [retval][out] */ BSTR *aId);
-
-
-void __RPC_STUB IMedium_get_Id_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMedium_get_Description_Proxy( 
-    IMedium * This,
-    /* [retval][out] */ BSTR *aDescription);
-
-
-void __RPC_STUB IMedium_get_Description_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMedium_put_Description_Proxy( 
-    IMedium * This,
-    /* [in] */ BSTR aDescription);
-
-
-void __RPC_STUB IMedium_put_Description_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMedium_get_State_Proxy( 
-    IMedium * This,
-    /* [retval][out] */ MediumState *aState);
-
-
-void __RPC_STUB IMedium_get_State_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMedium_get_Location_Proxy( 
-    IMedium * This,
-    /* [retval][out] */ BSTR *aLocation);
-
-
-void __RPC_STUB IMedium_get_Location_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMedium_put_Location_Proxy( 
-    IMedium * This,
-    /* [in] */ BSTR aLocation);
-
-
-void __RPC_STUB IMedium_put_Location_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMedium_get_Name_Proxy( 
-    IMedium * This,
-    /* [retval][out] */ BSTR *aName);
-
-
-void __RPC_STUB IMedium_get_Name_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMedium_get_DeviceType_Proxy( 
-    IMedium * This,
-    /* [retval][out] */ DeviceType *aDeviceType);
-
-
-void __RPC_STUB IMedium_get_DeviceType_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMedium_get_HostDrive_Proxy( 
-    IMedium * This,
-    /* [retval][out] */ BOOL *aHostDrive);
-
-
-void __RPC_STUB IMedium_get_HostDrive_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMedium_get_Size_Proxy( 
-    IMedium * This,
-    /* [retval][out] */ ULONG64 *aSize);
-
-
-void __RPC_STUB IMedium_get_Size_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMedium_get_Format_Proxy( 
-    IMedium * This,
-    /* [retval][out] */ BSTR *aFormat);
-
-
-void __RPC_STUB IMedium_get_Format_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMedium_get_MediumFormat_Proxy( 
-    IMedium * This,
-    /* [retval][out] */ IMediumFormat **aMediumFormat);
-
-
-void __RPC_STUB IMedium_get_MediumFormat_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMedium_get_Type_Proxy( 
-    IMedium * This,
-    /* [retval][out] */ MediumType *aType);
-
-
-void __RPC_STUB IMedium_get_Type_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMedium_put_Type_Proxy( 
-    IMedium * This,
-    /* [in] */ MediumType aType);
-
-
-void __RPC_STUB IMedium_put_Type_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMedium_get_Parent_Proxy( 
-    IMedium * This,
-    /* [retval][out] */ IMedium **aParent);
-
-
-void __RPC_STUB IMedium_get_Parent_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMedium_get_Children_Proxy( 
-    IMedium * This,
-    /* [retval][out] */ SAFEARRAY * *aChildren);
-
-
-void __RPC_STUB IMedium_get_Children_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMedium_get_Base_Proxy( 
-    IMedium * This,
-    /* [retval][out] */ IMedium **aBase);
-
-
-void __RPC_STUB IMedium_get_Base_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMedium_get_ReadOnly_Proxy( 
-    IMedium * This,
-    /* [retval][out] */ BOOL *aReadOnly);
-
-
-void __RPC_STUB IMedium_get_ReadOnly_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMedium_get_LogicalSize_Proxy( 
-    IMedium * This,
-    /* [retval][out] */ ULONG64 *aLogicalSize);
-
-
-void __RPC_STUB IMedium_get_LogicalSize_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMedium_get_AutoReset_Proxy( 
-    IMedium * This,
-    /* [retval][out] */ BOOL *aAutoReset);
-
-
-void __RPC_STUB IMedium_get_AutoReset_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMedium_put_AutoReset_Proxy( 
-    IMedium * This,
-    /* [in] */ BOOL aAutoReset);
-
-
-void __RPC_STUB IMedium_put_AutoReset_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMedium_get_LastAccessError_Proxy( 
-    IMedium * This,
-    /* [retval][out] */ BSTR *aLastAccessError);
-
-
-void __RPC_STUB IMedium_get_LastAccessError_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMedium_get_MachineIds_Proxy( 
-    IMedium * This,
-    /* [retval][out] */ SAFEARRAY * *aMachineIds);
-
-
-void __RPC_STUB IMedium_get_MachineIds_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMedium_RefreshState_Proxy( 
-    IMedium * This,
-    /* [retval][out] */ MediumState *aState);
-
-
-void __RPC_STUB IMedium_RefreshState_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMedium_GetSnapshotIds_Proxy( 
-    IMedium * This,
-    /* [in] */ BSTR aMachineId,
-    /* [retval][out] */ SAFEARRAY * *aSnapshotIds);
-
-
-void __RPC_STUB IMedium_GetSnapshotIds_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMedium_LockRead_Proxy( 
-    IMedium * This,
-    /* [retval][out] */ MediumState *aState);
-
-
-void __RPC_STUB IMedium_LockRead_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMedium_UnlockRead_Proxy( 
-    IMedium * This,
-    /* [retval][out] */ MediumState *aState);
-
-
-void __RPC_STUB IMedium_UnlockRead_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMedium_LockWrite_Proxy( 
-    IMedium * This,
-    /* [retval][out] */ MediumState *aState);
-
-
-void __RPC_STUB IMedium_LockWrite_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMedium_UnlockWrite_Proxy( 
-    IMedium * This,
-    /* [retval][out] */ MediumState *aState);
-
-
-void __RPC_STUB IMedium_UnlockWrite_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMedium_Close_Proxy( 
-    IMedium * This);
-
-
-void __RPC_STUB IMedium_Close_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMedium_GetProperty_Proxy( 
-    IMedium * This,
-    /* [in] */ BSTR aName,
-    /* [retval][out] */ BSTR *aValue);
-
-
-void __RPC_STUB IMedium_GetProperty_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMedium_SetProperty_Proxy( 
-    IMedium * This,
-    /* [in] */ BSTR aName,
-    /* [in] */ BSTR aValue);
-
-
-void __RPC_STUB IMedium_SetProperty_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMedium_GetProperties_Proxy( 
-    IMedium * This,
-    /* [in] */ BSTR aNames,
-    /* [out] */ SAFEARRAY * *aReturnNames,
-    /* [retval][out] */ SAFEARRAY * *aReturnValues);
-
-
-void __RPC_STUB IMedium_GetProperties_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMedium_SetProperties_Proxy( 
-    IMedium * This,
-    /* [out][in] */ SAFEARRAY * *aNames,
-    /* [out][in] */ SAFEARRAY * *aValues);
-
-
-void __RPC_STUB IMedium_SetProperties_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMedium_CreateBaseStorage_Proxy( 
-    IMedium * This,
-    /* [in] */ ULONG64 aLogicalSize,
-    /* [in] */ MediumVariant aVariant,
-    /* [retval][out] */ IProgress **aProgress);
-
-
-void __RPC_STUB IMedium_CreateBaseStorage_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMedium_DeleteStorage_Proxy( 
-    IMedium * This,
-    /* [retval][out] */ IProgress **aProgress);
-
-
-void __RPC_STUB IMedium_DeleteStorage_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMedium_CreateDiffStorage_Proxy( 
-    IMedium * This,
-    /* [in] */ IMedium *aTarget,
-    /* [in] */ MediumVariant aVariant,
-    /* [retval][out] */ IProgress **aProgress);
-
-
-void __RPC_STUB IMedium_CreateDiffStorage_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMedium_MergeTo_Proxy( 
-    IMedium * This,
-    /* [in] */ IMedium *aTarget,
-    /* [retval][out] */ IProgress **aProgress);
-
-
-void __RPC_STUB IMedium_MergeTo_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMedium_CloneTo_Proxy( 
-    IMedium * This,
-    /* [in] */ IMedium *aTarget,
-    /* [in] */ MediumVariant aVariant,
-    /* [in] */ IMedium *aParent,
-    /* [retval][out] */ IProgress **aProgress);
-
-
-void __RPC_STUB IMedium_CloneTo_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMedium_Compact_Proxy( 
-    IMedium * This,
-    /* [retval][out] */ IProgress **aProgress);
-
-
-void __RPC_STUB IMedium_Compact_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMedium_Resize_Proxy( 
-    IMedium * This,
-    /* [in] */ ULONG64 aLogicalSize,
-    /* [retval][out] */ IProgress **aProgress);
-
-
-void __RPC_STUB IMedium_Resize_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMedium_Reset_Proxy( 
-    IMedium * This,
-    /* [retval][out] */ IProgress **aProgress);
-
-
-void __RPC_STUB IMedium_Reset_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IMedium_INTERFACE_DEFINED__ */
-
-
-#ifndef __IMediumFormat_INTERFACE_DEFINED__
-#define __IMediumFormat_INTERFACE_DEFINED__
-
-/* interface IMediumFormat */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IMediumFormat;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("89f52554-d469-4799-9fad-1705e86a08b1")
-    IMediumFormat : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Id( 
-            /* [retval][out] */ BSTR *aId) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Name( 
-            /* [retval][out] */ BSTR *aName) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_FileExtensions( 
-            /* [retval][out] */ SAFEARRAY * *aFileExtensions) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Capabilities( 
-            /* [retval][out] */ ULONG *aCapabilities) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE DescribeProperties( 
-            /* [out] */ SAFEARRAY * *aNames,
-            /* [out] */ SAFEARRAY * *aDescription,
-            /* [out] */ SAFEARRAY * *aTypes,
-            /* [out] */ SAFEARRAY * *aFlags,
-            /* [out] */ SAFEARRAY * *aDefaults) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IMediumFormatVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IMediumFormat * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IMediumFormat * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IMediumFormat * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IMediumFormat * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IMediumFormat * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IMediumFormat * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IMediumFormat * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Id )( 
-            IMediumFormat * This,
-            /* [retval][out] */ BSTR *aId);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Name )( 
-            IMediumFormat * This,
-            /* [retval][out] */ BSTR *aName);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_FileExtensions )( 
-            IMediumFormat * This,
-            /* [retval][out] */ SAFEARRAY * *aFileExtensions);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Capabilities )( 
-            IMediumFormat * This,
-            /* [retval][out] */ ULONG *aCapabilities);
-        
-        HRESULT ( STDMETHODCALLTYPE *DescribeProperties )( 
-            IMediumFormat * This,
-            /* [out] */ SAFEARRAY * *aNames,
-            /* [out] */ SAFEARRAY * *aDescription,
-            /* [out] */ SAFEARRAY * *aTypes,
-            /* [out] */ SAFEARRAY * *aFlags,
-            /* [out] */ SAFEARRAY * *aDefaults);
-        
-        END_INTERFACE
-    } IMediumFormatVtbl;
-
-    interface IMediumFormat
-    {
-        CONST_VTBL struct IMediumFormatVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IMediumFormat_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IMediumFormat_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IMediumFormat_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IMediumFormat_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IMediumFormat_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IMediumFormat_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IMediumFormat_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IMediumFormat_get_Id(This,aId)	\
-    (This)->lpVtbl -> get_Id(This,aId)
-
-#define IMediumFormat_get_Name(This,aName)	\
-    (This)->lpVtbl -> get_Name(This,aName)
-
-#define IMediumFormat_get_FileExtensions(This,aFileExtensions)	\
-    (This)->lpVtbl -> get_FileExtensions(This,aFileExtensions)
-
-#define IMediumFormat_get_Capabilities(This,aCapabilities)	\
-    (This)->lpVtbl -> get_Capabilities(This,aCapabilities)
-
-#define IMediumFormat_DescribeProperties(This,aNames,aDescription,aTypes,aFlags,aDefaults)	\
-    (This)->lpVtbl -> DescribeProperties(This,aNames,aDescription,aTypes,aFlags,aDefaults)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMediumFormat_get_Id_Proxy( 
-    IMediumFormat * This,
-    /* [retval][out] */ BSTR *aId);
-
-
-void __RPC_STUB IMediumFormat_get_Id_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMediumFormat_get_Name_Proxy( 
-    IMediumFormat * This,
-    /* [retval][out] */ BSTR *aName);
-
-
-void __RPC_STUB IMediumFormat_get_Name_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMediumFormat_get_FileExtensions_Proxy( 
-    IMediumFormat * This,
-    /* [retval][out] */ SAFEARRAY * *aFileExtensions);
-
-
-void __RPC_STUB IMediumFormat_get_FileExtensions_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMediumFormat_get_Capabilities_Proxy( 
-    IMediumFormat * This,
-    /* [retval][out] */ ULONG *aCapabilities);
-
-
-void __RPC_STUB IMediumFormat_get_Capabilities_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMediumFormat_DescribeProperties_Proxy( 
-    IMediumFormat * This,
-    /* [out] */ SAFEARRAY * *aNames,
-    /* [out] */ SAFEARRAY * *aDescription,
-    /* [out] */ SAFEARRAY * *aTypes,
-    /* [out] */ SAFEARRAY * *aFlags,
-    /* [out] */ SAFEARRAY * *aDefaults);
-
-
-void __RPC_STUB IMediumFormat_DescribeProperties_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IMediumFormat_INTERFACE_DEFINED__ */
-
-
-#ifndef __IKeyboard_INTERFACE_DEFINED__
-#define __IKeyboard_INTERFACE_DEFINED__
-
-/* interface IKeyboard */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IKeyboard;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("2d1a531b-4c6e-49cc-8af6-5c857b78b5d7")
-    IKeyboard : public IDispatch
-    {
-    public:
-        virtual HRESULT STDMETHODCALLTYPE PutScancode( 
-            /* [in] */ LONG aScancode) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE PutScancodes( 
-            /* [out][in] */ SAFEARRAY * *aScancodes,
-            /* [retval][out] */ ULONG *aCodesStored) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE PutCAD( void) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IKeyboardVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IKeyboard * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IKeyboard * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IKeyboard * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IKeyboard * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IKeyboard * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IKeyboard * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IKeyboard * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        HRESULT ( STDMETHODCALLTYPE *PutScancode )( 
-            IKeyboard * This,
-            /* [in] */ LONG aScancode);
-        
-        HRESULT ( STDMETHODCALLTYPE *PutScancodes )( 
-            IKeyboard * This,
-            /* [out][in] */ SAFEARRAY * *aScancodes,
-            /* [retval][out] */ ULONG *aCodesStored);
-        
-        HRESULT ( STDMETHODCALLTYPE *PutCAD )( 
-            IKeyboard * This);
-        
-        END_INTERFACE
-    } IKeyboardVtbl;
-
-    interface IKeyboard
-    {
-        CONST_VTBL struct IKeyboardVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IKeyboard_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IKeyboard_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IKeyboard_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IKeyboard_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IKeyboard_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IKeyboard_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IKeyboard_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IKeyboard_PutScancode(This,aScancode)	\
-    (This)->lpVtbl -> PutScancode(This,aScancode)
-
-#define IKeyboard_PutScancodes(This,aScancodes,aCodesStored)	\
-    (This)->lpVtbl -> PutScancodes(This,aScancodes,aCodesStored)
-
-#define IKeyboard_PutCAD(This)	\
-    (This)->lpVtbl -> PutCAD(This)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-HRESULT STDMETHODCALLTYPE IKeyboard_PutScancode_Proxy( 
-    IKeyboard * This,
-    /* [in] */ LONG aScancode);
-
-
-void __RPC_STUB IKeyboard_PutScancode_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IKeyboard_PutScancodes_Proxy( 
-    IKeyboard * This,
-    /* [out][in] */ SAFEARRAY * *aScancodes,
-    /* [retval][out] */ ULONG *aCodesStored);
-
-
-void __RPC_STUB IKeyboard_PutScancodes_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IKeyboard_PutCAD_Proxy( 
-    IKeyboard * This);
-
-
-void __RPC_STUB IKeyboard_PutCAD_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IKeyboard_INTERFACE_DEFINED__ */
-
-
-#ifndef __IMouse_INTERFACE_DEFINED__
-#define __IMouse_INTERFACE_DEFINED__
-
-/* interface IMouse */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IMouse;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("7c0f2eae-f92d-498c-b802-e1a3763774dc")
-    IMouse : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_AbsoluteSupported( 
-            /* [retval][out] */ BOOL *aAbsoluteSupported) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_RelativeSupported( 
-            /* [retval][out] */ BOOL *aRelativeSupported) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_NeedsHostCursor( 
-            /* [retval][out] */ BOOL *aNeedsHostCursor) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE PutMouseEvent( 
-            /* [in] */ LONG aDx,
-            /* [in] */ LONG aDy,
-            /* [in] */ LONG aDz,
-            /* [in] */ LONG aDw,
-            /* [in] */ LONG aButtonState) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE PutMouseEventAbsolute( 
-            /* [in] */ LONG aX,
-            /* [in] */ LONG aY,
-            /* [in] */ LONG aDz,
-            /* [in] */ LONG aDw,
-            /* [in] */ LONG aButtonState) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IMouseVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IMouse * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IMouse * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IMouse * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IMouse * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IMouse * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IMouse * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IMouse * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_AbsoluteSupported )( 
-            IMouse * This,
-            /* [retval][out] */ BOOL *aAbsoluteSupported);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_RelativeSupported )( 
-            IMouse * This,
-            /* [retval][out] */ BOOL *aRelativeSupported);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_NeedsHostCursor )( 
-            IMouse * This,
-            /* [retval][out] */ BOOL *aNeedsHostCursor);
-        
-        HRESULT ( STDMETHODCALLTYPE *PutMouseEvent )( 
-            IMouse * This,
-            /* [in] */ LONG aDx,
-            /* [in] */ LONG aDy,
-            /* [in] */ LONG aDz,
-            /* [in] */ LONG aDw,
-            /* [in] */ LONG aButtonState);
-        
-        HRESULT ( STDMETHODCALLTYPE *PutMouseEventAbsolute )( 
-            IMouse * This,
-            /* [in] */ LONG aX,
-            /* [in] */ LONG aY,
-            /* [in] */ LONG aDz,
-            /* [in] */ LONG aDw,
-            /* [in] */ LONG aButtonState);
-        
-        END_INTERFACE
-    } IMouseVtbl;
-
-    interface IMouse
-    {
-        CONST_VTBL struct IMouseVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IMouse_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IMouse_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IMouse_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IMouse_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IMouse_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IMouse_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IMouse_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IMouse_get_AbsoluteSupported(This,aAbsoluteSupported)	\
-    (This)->lpVtbl -> get_AbsoluteSupported(This,aAbsoluteSupported)
-
-#define IMouse_get_RelativeSupported(This,aRelativeSupported)	\
-    (This)->lpVtbl -> get_RelativeSupported(This,aRelativeSupported)
-
-#define IMouse_get_NeedsHostCursor(This,aNeedsHostCursor)	\
-    (This)->lpVtbl -> get_NeedsHostCursor(This,aNeedsHostCursor)
-
-#define IMouse_PutMouseEvent(This,aDx,aDy,aDz,aDw,aButtonState)	\
-    (This)->lpVtbl -> PutMouseEvent(This,aDx,aDy,aDz,aDw,aButtonState)
-
-#define IMouse_PutMouseEventAbsolute(This,aX,aY,aDz,aDw,aButtonState)	\
-    (This)->lpVtbl -> PutMouseEventAbsolute(This,aX,aY,aDz,aDw,aButtonState)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMouse_get_AbsoluteSupported_Proxy( 
-    IMouse * This,
-    /* [retval][out] */ BOOL *aAbsoluteSupported);
-
-
-void __RPC_STUB IMouse_get_AbsoluteSupported_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMouse_get_RelativeSupported_Proxy( 
-    IMouse * This,
-    /* [retval][out] */ BOOL *aRelativeSupported);
-
-
-void __RPC_STUB IMouse_get_RelativeSupported_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMouse_get_NeedsHostCursor_Proxy( 
-    IMouse * This,
-    /* [retval][out] */ BOOL *aNeedsHostCursor);
-
-
-void __RPC_STUB IMouse_get_NeedsHostCursor_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMouse_PutMouseEvent_Proxy( 
-    IMouse * This,
-    /* [in] */ LONG aDx,
-    /* [in] */ LONG aDy,
-    /* [in] */ LONG aDz,
-    /* [in] */ LONG aDw,
-    /* [in] */ LONG aButtonState);
-
-
-void __RPC_STUB IMouse_PutMouseEvent_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMouse_PutMouseEventAbsolute_Proxy( 
-    IMouse * This,
-    /* [in] */ LONG aX,
-    /* [in] */ LONG aY,
-    /* [in] */ LONG aDz,
-    /* [in] */ LONG aDw,
-    /* [in] */ LONG aButtonState);
-
-
-void __RPC_STUB IMouse_PutMouseEventAbsolute_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IMouse_INTERFACE_DEFINED__ */
-
-
-#ifndef __IFramebuffer_INTERFACE_DEFINED__
-#define __IFramebuffer_INTERFACE_DEFINED__
-
-/* interface IFramebuffer */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IFramebuffer;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("b7ed347a-5765-40a0-ae1c-f543eb4ddeaf")
-    IFramebuffer : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Address( 
-            /* [retval][out] */ BYTE **aAddress) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Width( 
-            /* [retval][out] */ ULONG *aWidth) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Height( 
-            /* [retval][out] */ ULONG *aHeight) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_BitsPerPixel( 
-            /* [retval][out] */ ULONG *aBitsPerPixel) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_BytesPerLine( 
-            /* [retval][out] */ ULONG *aBytesPerLine) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_PixelFormat( 
-            /* [retval][out] */ ULONG *aPixelFormat) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_UsesGuestVRAM( 
-            /* [retval][out] */ BOOL *aUsesGuestVRAM) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_HeightReduction( 
-            /* [retval][out] */ ULONG *aHeightReduction) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Overlay( 
-            /* [retval][out] */ IFramebufferOverlay **aOverlay) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_WinId( 
-            /* [retval][out] */ ULONG64 *aWinId) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE Lock( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE Unlock( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE NotifyUpdate( 
-            /* [in] */ ULONG aX,
-            /* [in] */ ULONG aY,
-            /* [in] */ ULONG aWidth,
-            /* [in] */ ULONG aHeight) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE RequestResize( 
-            /* [in] */ ULONG aScreenId,
-            /* [in] */ ULONG aPixelFormat,
-            /* [in] */ BYTE *aVRAM,
-            /* [in] */ ULONG aBitsPerPixel,
-            /* [in] */ ULONG aBytesPerLine,
-            /* [in] */ ULONG aWidth,
-            /* [in] */ ULONG aHeight,
-            /* [retval][out] */ BOOL *aFinished) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE VideoModeSupported( 
-            /* [in] */ ULONG aWidth,
-            /* [in] */ ULONG aHeight,
-            /* [in] */ ULONG aBpp,
-            /* [retval][out] */ BOOL *aSupported) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetVisibleRegion( 
-            /* [in] */ BYTE *aRectangles,
-            /* [in] */ ULONG aCount,
-            /* [retval][out] */ ULONG *aCountCopied) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetVisibleRegion( 
-            /* [in] */ BYTE *aRectangles,
-            /* [in] */ ULONG aCount) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE ProcessVHWACommand( 
-            /* [in] */ BYTE *aCommand) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IFramebufferVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IFramebuffer * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IFramebuffer * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IFramebuffer * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IFramebuffer * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IFramebuffer * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IFramebuffer * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IFramebuffer * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Address )( 
-            IFramebuffer * This,
-            /* [retval][out] */ BYTE **aAddress);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Width )( 
-            IFramebuffer * This,
-            /* [retval][out] */ ULONG *aWidth);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Height )( 
-            IFramebuffer * This,
-            /* [retval][out] */ ULONG *aHeight);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_BitsPerPixel )( 
-            IFramebuffer * This,
-            /* [retval][out] */ ULONG *aBitsPerPixel);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_BytesPerLine )( 
-            IFramebuffer * This,
-            /* [retval][out] */ ULONG *aBytesPerLine);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_PixelFormat )( 
-            IFramebuffer * This,
-            /* [retval][out] */ ULONG *aPixelFormat);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_UsesGuestVRAM )( 
-            IFramebuffer * This,
-            /* [retval][out] */ BOOL *aUsesGuestVRAM);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_HeightReduction )( 
-            IFramebuffer * This,
-            /* [retval][out] */ ULONG *aHeightReduction);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Overlay )( 
-            IFramebuffer * This,
-            /* [retval][out] */ IFramebufferOverlay **aOverlay);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_WinId )( 
-            IFramebuffer * This,
-            /* [retval][out] */ ULONG64 *aWinId);
-        
-        HRESULT ( STDMETHODCALLTYPE *Lock )( 
-            IFramebuffer * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *Unlock )( 
-            IFramebuffer * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *NotifyUpdate )( 
-            IFramebuffer * This,
-            /* [in] */ ULONG aX,
-            /* [in] */ ULONG aY,
-            /* [in] */ ULONG aWidth,
-            /* [in] */ ULONG aHeight);
-        
-        HRESULT ( STDMETHODCALLTYPE *RequestResize )( 
-            IFramebuffer * This,
-            /* [in] */ ULONG aScreenId,
-            /* [in] */ ULONG aPixelFormat,
-            /* [in] */ BYTE *aVRAM,
-            /* [in] */ ULONG aBitsPerPixel,
-            /* [in] */ ULONG aBytesPerLine,
-            /* [in] */ ULONG aWidth,
-            /* [in] */ ULONG aHeight,
-            /* [retval][out] */ BOOL *aFinished);
-        
-        HRESULT ( STDMETHODCALLTYPE *VideoModeSupported )( 
-            IFramebuffer * This,
-            /* [in] */ ULONG aWidth,
-            /* [in] */ ULONG aHeight,
-            /* [in] */ ULONG aBpp,
-            /* [retval][out] */ BOOL *aSupported);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetVisibleRegion )( 
-            IFramebuffer * This,
-            /* [in] */ BYTE *aRectangles,
-            /* [in] */ ULONG aCount,
-            /* [retval][out] */ ULONG *aCountCopied);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetVisibleRegion )( 
-            IFramebuffer * This,
-            /* [in] */ BYTE *aRectangles,
-            /* [in] */ ULONG aCount);
-        
-        HRESULT ( STDMETHODCALLTYPE *ProcessVHWACommand )( 
-            IFramebuffer * This,
-            /* [in] */ BYTE *aCommand);
-        
-        END_INTERFACE
-    } IFramebufferVtbl;
-
-    interface IFramebuffer
-    {
-        CONST_VTBL struct IFramebufferVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IFramebuffer_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IFramebuffer_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IFramebuffer_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IFramebuffer_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IFramebuffer_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IFramebuffer_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IFramebuffer_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IFramebuffer_get_Address(This,aAddress)	\
-    (This)->lpVtbl -> get_Address(This,aAddress)
-
-#define IFramebuffer_get_Width(This,aWidth)	\
-    (This)->lpVtbl -> get_Width(This,aWidth)
-
-#define IFramebuffer_get_Height(This,aHeight)	\
-    (This)->lpVtbl -> get_Height(This,aHeight)
-
-#define IFramebuffer_get_BitsPerPixel(This,aBitsPerPixel)	\
-    (This)->lpVtbl -> get_BitsPerPixel(This,aBitsPerPixel)
-
-#define IFramebuffer_get_BytesPerLine(This,aBytesPerLine)	\
-    (This)->lpVtbl -> get_BytesPerLine(This,aBytesPerLine)
-
-#define IFramebuffer_get_PixelFormat(This,aPixelFormat)	\
-    (This)->lpVtbl -> get_PixelFormat(This,aPixelFormat)
-
-#define IFramebuffer_get_UsesGuestVRAM(This,aUsesGuestVRAM)	\
-    (This)->lpVtbl -> get_UsesGuestVRAM(This,aUsesGuestVRAM)
-
-#define IFramebuffer_get_HeightReduction(This,aHeightReduction)	\
-    (This)->lpVtbl -> get_HeightReduction(This,aHeightReduction)
-
-#define IFramebuffer_get_Overlay(This,aOverlay)	\
-    (This)->lpVtbl -> get_Overlay(This,aOverlay)
-
-#define IFramebuffer_get_WinId(This,aWinId)	\
-    (This)->lpVtbl -> get_WinId(This,aWinId)
-
-#define IFramebuffer_Lock(This)	\
-    (This)->lpVtbl -> Lock(This)
-
-#define IFramebuffer_Unlock(This)	\
-    (This)->lpVtbl -> Unlock(This)
-
-#define IFramebuffer_NotifyUpdate(This,aX,aY,aWidth,aHeight)	\
-    (This)->lpVtbl -> NotifyUpdate(This,aX,aY,aWidth,aHeight)
-
-#define IFramebuffer_RequestResize(This,aScreenId,aPixelFormat,aVRAM,aBitsPerPixel,aBytesPerLine,aWidth,aHeight,aFinished)	\
-    (This)->lpVtbl -> RequestResize(This,aScreenId,aPixelFormat,aVRAM,aBitsPerPixel,aBytesPerLine,aWidth,aHeight,aFinished)
-
-#define IFramebuffer_VideoModeSupported(This,aWidth,aHeight,aBpp,aSupported)	\
-    (This)->lpVtbl -> VideoModeSupported(This,aWidth,aHeight,aBpp,aSupported)
-
-#define IFramebuffer_GetVisibleRegion(This,aRectangles,aCount,aCountCopied)	\
-    (This)->lpVtbl -> GetVisibleRegion(This,aRectangles,aCount,aCountCopied)
-
-#define IFramebuffer_SetVisibleRegion(This,aRectangles,aCount)	\
-    (This)->lpVtbl -> SetVisibleRegion(This,aRectangles,aCount)
-
-#define IFramebuffer_ProcessVHWACommand(This,aCommand)	\
-    (This)->lpVtbl -> ProcessVHWACommand(This,aCommand)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IFramebuffer_get_Address_Proxy( 
-    IFramebuffer * This,
-    /* [retval][out] */ BYTE **aAddress);
-
-
-void __RPC_STUB IFramebuffer_get_Address_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IFramebuffer_get_Width_Proxy( 
-    IFramebuffer * This,
-    /* [retval][out] */ ULONG *aWidth);
-
-
-void __RPC_STUB IFramebuffer_get_Width_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IFramebuffer_get_Height_Proxy( 
-    IFramebuffer * This,
-    /* [retval][out] */ ULONG *aHeight);
-
-
-void __RPC_STUB IFramebuffer_get_Height_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IFramebuffer_get_BitsPerPixel_Proxy( 
-    IFramebuffer * This,
-    /* [retval][out] */ ULONG *aBitsPerPixel);
-
-
-void __RPC_STUB IFramebuffer_get_BitsPerPixel_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IFramebuffer_get_BytesPerLine_Proxy( 
-    IFramebuffer * This,
-    /* [retval][out] */ ULONG *aBytesPerLine);
-
-
-void __RPC_STUB IFramebuffer_get_BytesPerLine_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IFramebuffer_get_PixelFormat_Proxy( 
-    IFramebuffer * This,
-    /* [retval][out] */ ULONG *aPixelFormat);
-
-
-void __RPC_STUB IFramebuffer_get_PixelFormat_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IFramebuffer_get_UsesGuestVRAM_Proxy( 
-    IFramebuffer * This,
-    /* [retval][out] */ BOOL *aUsesGuestVRAM);
-
-
-void __RPC_STUB IFramebuffer_get_UsesGuestVRAM_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IFramebuffer_get_HeightReduction_Proxy( 
-    IFramebuffer * This,
-    /* [retval][out] */ ULONG *aHeightReduction);
-
-
-void __RPC_STUB IFramebuffer_get_HeightReduction_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IFramebuffer_get_Overlay_Proxy( 
-    IFramebuffer * This,
-    /* [retval][out] */ IFramebufferOverlay **aOverlay);
-
-
-void __RPC_STUB IFramebuffer_get_Overlay_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IFramebuffer_get_WinId_Proxy( 
-    IFramebuffer * This,
-    /* [retval][out] */ ULONG64 *aWinId);
-
-
-void __RPC_STUB IFramebuffer_get_WinId_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IFramebuffer_Lock_Proxy( 
-    IFramebuffer * This);
-
-
-void __RPC_STUB IFramebuffer_Lock_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IFramebuffer_Unlock_Proxy( 
-    IFramebuffer * This);
-
-
-void __RPC_STUB IFramebuffer_Unlock_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IFramebuffer_NotifyUpdate_Proxy( 
-    IFramebuffer * This,
-    /* [in] */ ULONG aX,
-    /* [in] */ ULONG aY,
-    /* [in] */ ULONG aWidth,
-    /* [in] */ ULONG aHeight);
-
-
-void __RPC_STUB IFramebuffer_NotifyUpdate_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IFramebuffer_RequestResize_Proxy( 
-    IFramebuffer * This,
-    /* [in] */ ULONG aScreenId,
-    /* [in] */ ULONG aPixelFormat,
-    /* [in] */ BYTE *aVRAM,
-    /* [in] */ ULONG aBitsPerPixel,
-    /* [in] */ ULONG aBytesPerLine,
-    /* [in] */ ULONG aWidth,
-    /* [in] */ ULONG aHeight,
-    /* [retval][out] */ BOOL *aFinished);
-
-
-void __RPC_STUB IFramebuffer_RequestResize_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IFramebuffer_VideoModeSupported_Proxy( 
-    IFramebuffer * This,
-    /* [in] */ ULONG aWidth,
-    /* [in] */ ULONG aHeight,
-    /* [in] */ ULONG aBpp,
-    /* [retval][out] */ BOOL *aSupported);
-
-
-void __RPC_STUB IFramebuffer_VideoModeSupported_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IFramebuffer_GetVisibleRegion_Proxy( 
-    IFramebuffer * This,
-    /* [in] */ BYTE *aRectangles,
-    /* [in] */ ULONG aCount,
-    /* [retval][out] */ ULONG *aCountCopied);
-
-
-void __RPC_STUB IFramebuffer_GetVisibleRegion_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IFramebuffer_SetVisibleRegion_Proxy( 
-    IFramebuffer * This,
-    /* [in] */ BYTE *aRectangles,
-    /* [in] */ ULONG aCount);
-
-
-void __RPC_STUB IFramebuffer_SetVisibleRegion_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IFramebuffer_ProcessVHWACommand_Proxy( 
-    IFramebuffer * This,
-    /* [in] */ BYTE *aCommand);
-
-
-void __RPC_STUB IFramebuffer_ProcessVHWACommand_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IFramebuffer_INTERFACE_DEFINED__ */
-
-
-#ifndef __IFramebufferOverlay_INTERFACE_DEFINED__
-#define __IFramebufferOverlay_INTERFACE_DEFINED__
-
-/* interface IFramebufferOverlay */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IFramebufferOverlay;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("0bcc1c7e-e415-47d2-bfdb-e4c705fb0f47")
-    IFramebufferOverlay : public IFramebuffer
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_X( 
-            /* [retval][out] */ ULONG *aX) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Y( 
-            /* [retval][out] */ ULONG *aY) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Visible( 
-            /* [retval][out] */ BOOL *aVisible) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_Visible( 
-            /* [in] */ BOOL aVisible) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Alpha( 
-            /* [retval][out] */ ULONG *aAlpha) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_Alpha( 
-            /* [in] */ ULONG aAlpha) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE Move( 
-            /* [in] */ ULONG aX,
-            /* [in] */ ULONG aY) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IFramebufferOverlayVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IFramebufferOverlay * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IFramebufferOverlay * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IFramebufferOverlay * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IFramebufferOverlay * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IFramebufferOverlay * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IFramebufferOverlay * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IFramebufferOverlay * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Address )( 
-            IFramebufferOverlay * This,
-            /* [retval][out] */ BYTE **aAddress);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Width )( 
-            IFramebufferOverlay * This,
-            /* [retval][out] */ ULONG *aWidth);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Height )( 
-            IFramebufferOverlay * This,
-            /* [retval][out] */ ULONG *aHeight);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_BitsPerPixel )( 
-            IFramebufferOverlay * This,
-            /* [retval][out] */ ULONG *aBitsPerPixel);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_BytesPerLine )( 
-            IFramebufferOverlay * This,
-            /* [retval][out] */ ULONG *aBytesPerLine);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_PixelFormat )( 
-            IFramebufferOverlay * This,
-            /* [retval][out] */ ULONG *aPixelFormat);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_UsesGuestVRAM )( 
-            IFramebufferOverlay * This,
-            /* [retval][out] */ BOOL *aUsesGuestVRAM);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_HeightReduction )( 
-            IFramebufferOverlay * This,
-            /* [retval][out] */ ULONG *aHeightReduction);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Overlay )( 
-            IFramebufferOverlay * This,
-            /* [retval][out] */ IFramebufferOverlay **aOverlay);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_WinId )( 
-            IFramebufferOverlay * This,
-            /* [retval][out] */ ULONG64 *aWinId);
-        
-        HRESULT ( STDMETHODCALLTYPE *Lock )( 
-            IFramebufferOverlay * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *Unlock )( 
-            IFramebufferOverlay * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *NotifyUpdate )( 
-            IFramebufferOverlay * This,
-            /* [in] */ ULONG aX,
-            /* [in] */ ULONG aY,
-            /* [in] */ ULONG aWidth,
-            /* [in] */ ULONG aHeight);
-        
-        HRESULT ( STDMETHODCALLTYPE *RequestResize )( 
-            IFramebufferOverlay * This,
-            /* [in] */ ULONG aScreenId,
-            /* [in] */ ULONG aPixelFormat,
-            /* [in] */ BYTE *aVRAM,
-            /* [in] */ ULONG aBitsPerPixel,
-            /* [in] */ ULONG aBytesPerLine,
-            /* [in] */ ULONG aWidth,
-            /* [in] */ ULONG aHeight,
-            /* [retval][out] */ BOOL *aFinished);
-        
-        HRESULT ( STDMETHODCALLTYPE *VideoModeSupported )( 
-            IFramebufferOverlay * This,
-            /* [in] */ ULONG aWidth,
-            /* [in] */ ULONG aHeight,
-            /* [in] */ ULONG aBpp,
-            /* [retval][out] */ BOOL *aSupported);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetVisibleRegion )( 
-            IFramebufferOverlay * This,
-            /* [in] */ BYTE *aRectangles,
-            /* [in] */ ULONG aCount,
-            /* [retval][out] */ ULONG *aCountCopied);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetVisibleRegion )( 
-            IFramebufferOverlay * This,
-            /* [in] */ BYTE *aRectangles,
-            /* [in] */ ULONG aCount);
-        
-        HRESULT ( STDMETHODCALLTYPE *ProcessVHWACommand )( 
-            IFramebufferOverlay * This,
-            /* [in] */ BYTE *aCommand);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_X )( 
-            IFramebufferOverlay * This,
-            /* [retval][out] */ ULONG *aX);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Y )( 
-            IFramebufferOverlay * This,
-            /* [retval][out] */ ULONG *aY);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Visible )( 
-            IFramebufferOverlay * This,
-            /* [retval][out] */ BOOL *aVisible);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Visible )( 
-            IFramebufferOverlay * This,
-            /* [in] */ BOOL aVisible);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Alpha )( 
-            IFramebufferOverlay * This,
-            /* [retval][out] */ ULONG *aAlpha);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Alpha )( 
-            IFramebufferOverlay * This,
-            /* [in] */ ULONG aAlpha);
-        
-        HRESULT ( STDMETHODCALLTYPE *Move )( 
-            IFramebufferOverlay * This,
-            /* [in] */ ULONG aX,
-            /* [in] */ ULONG aY);
-        
-        END_INTERFACE
-    } IFramebufferOverlayVtbl;
-
-    interface IFramebufferOverlay
-    {
-        CONST_VTBL struct IFramebufferOverlayVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IFramebufferOverlay_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IFramebufferOverlay_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IFramebufferOverlay_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IFramebufferOverlay_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IFramebufferOverlay_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IFramebufferOverlay_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IFramebufferOverlay_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IFramebufferOverlay_get_Address(This,aAddress)	\
-    (This)->lpVtbl -> get_Address(This,aAddress)
-
-#define IFramebufferOverlay_get_Width(This,aWidth)	\
-    (This)->lpVtbl -> get_Width(This,aWidth)
-
-#define IFramebufferOverlay_get_Height(This,aHeight)	\
-    (This)->lpVtbl -> get_Height(This,aHeight)
-
-#define IFramebufferOverlay_get_BitsPerPixel(This,aBitsPerPixel)	\
-    (This)->lpVtbl -> get_BitsPerPixel(This,aBitsPerPixel)
-
-#define IFramebufferOverlay_get_BytesPerLine(This,aBytesPerLine)	\
-    (This)->lpVtbl -> get_BytesPerLine(This,aBytesPerLine)
-
-#define IFramebufferOverlay_get_PixelFormat(This,aPixelFormat)	\
-    (This)->lpVtbl -> get_PixelFormat(This,aPixelFormat)
-
-#define IFramebufferOverlay_get_UsesGuestVRAM(This,aUsesGuestVRAM)	\
-    (This)->lpVtbl -> get_UsesGuestVRAM(This,aUsesGuestVRAM)
-
-#define IFramebufferOverlay_get_HeightReduction(This,aHeightReduction)	\
-    (This)->lpVtbl -> get_HeightReduction(This,aHeightReduction)
-
-#define IFramebufferOverlay_get_Overlay(This,aOverlay)	\
-    (This)->lpVtbl -> get_Overlay(This,aOverlay)
-
-#define IFramebufferOverlay_get_WinId(This,aWinId)	\
-    (This)->lpVtbl -> get_WinId(This,aWinId)
-
-#define IFramebufferOverlay_Lock(This)	\
-    (This)->lpVtbl -> Lock(This)
-
-#define IFramebufferOverlay_Unlock(This)	\
-    (This)->lpVtbl -> Unlock(This)
-
-#define IFramebufferOverlay_NotifyUpdate(This,aX,aY,aWidth,aHeight)	\
-    (This)->lpVtbl -> NotifyUpdate(This,aX,aY,aWidth,aHeight)
-
-#define IFramebufferOverlay_RequestResize(This,aScreenId,aPixelFormat,aVRAM,aBitsPerPixel,aBytesPerLine,aWidth,aHeight,aFinished)	\
-    (This)->lpVtbl -> RequestResize(This,aScreenId,aPixelFormat,aVRAM,aBitsPerPixel,aBytesPerLine,aWidth,aHeight,aFinished)
-
-#define IFramebufferOverlay_VideoModeSupported(This,aWidth,aHeight,aBpp,aSupported)	\
-    (This)->lpVtbl -> VideoModeSupported(This,aWidth,aHeight,aBpp,aSupported)
-
-#define IFramebufferOverlay_GetVisibleRegion(This,aRectangles,aCount,aCountCopied)	\
-    (This)->lpVtbl -> GetVisibleRegion(This,aRectangles,aCount,aCountCopied)
-
-#define IFramebufferOverlay_SetVisibleRegion(This,aRectangles,aCount)	\
-    (This)->lpVtbl -> SetVisibleRegion(This,aRectangles,aCount)
-
-#define IFramebufferOverlay_ProcessVHWACommand(This,aCommand)	\
-    (This)->lpVtbl -> ProcessVHWACommand(This,aCommand)
-
-
-#define IFramebufferOverlay_get_X(This,aX)	\
-    (This)->lpVtbl -> get_X(This,aX)
-
-#define IFramebufferOverlay_get_Y(This,aY)	\
-    (This)->lpVtbl -> get_Y(This,aY)
-
-#define IFramebufferOverlay_get_Visible(This,aVisible)	\
-    (This)->lpVtbl -> get_Visible(This,aVisible)
-
-#define IFramebufferOverlay_put_Visible(This,aVisible)	\
-    (This)->lpVtbl -> put_Visible(This,aVisible)
-
-#define IFramebufferOverlay_get_Alpha(This,aAlpha)	\
-    (This)->lpVtbl -> get_Alpha(This,aAlpha)
-
-#define IFramebufferOverlay_put_Alpha(This,aAlpha)	\
-    (This)->lpVtbl -> put_Alpha(This,aAlpha)
-
-#define IFramebufferOverlay_Move(This,aX,aY)	\
-    (This)->lpVtbl -> Move(This,aX,aY)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IFramebufferOverlay_get_X_Proxy( 
-    IFramebufferOverlay * This,
-    /* [retval][out] */ ULONG *aX);
-
-
-void __RPC_STUB IFramebufferOverlay_get_X_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IFramebufferOverlay_get_Y_Proxy( 
-    IFramebufferOverlay * This,
-    /* [retval][out] */ ULONG *aY);
-
-
-void __RPC_STUB IFramebufferOverlay_get_Y_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IFramebufferOverlay_get_Visible_Proxy( 
-    IFramebufferOverlay * This,
-    /* [retval][out] */ BOOL *aVisible);
-
-
-void __RPC_STUB IFramebufferOverlay_get_Visible_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IFramebufferOverlay_put_Visible_Proxy( 
-    IFramebufferOverlay * This,
-    /* [in] */ BOOL aVisible);
-
-
-void __RPC_STUB IFramebufferOverlay_put_Visible_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IFramebufferOverlay_get_Alpha_Proxy( 
-    IFramebufferOverlay * This,
-    /* [retval][out] */ ULONG *aAlpha);
-
-
-void __RPC_STUB IFramebufferOverlay_get_Alpha_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IFramebufferOverlay_put_Alpha_Proxy( 
-    IFramebufferOverlay * This,
-    /* [in] */ ULONG aAlpha);
-
-
-void __RPC_STUB IFramebufferOverlay_put_Alpha_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IFramebufferOverlay_Move_Proxy( 
-    IFramebufferOverlay * This,
-    /* [in] */ ULONG aX,
-    /* [in] */ ULONG aY);
-
-
-void __RPC_STUB IFramebufferOverlay_Move_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IFramebufferOverlay_INTERFACE_DEFINED__ */
-
-
-#ifndef __IDisplay_INTERFACE_DEFINED__
-#define __IDisplay_INTERFACE_DEFINED__
-
-/* interface IDisplay */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IDisplay;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("1fa79e39-0cc9-4ab3-9df3-ed3e96b42496")
-    IDisplay : public IDispatch
-    {
-    public:
-        virtual HRESULT STDMETHODCALLTYPE GetScreenResolution( 
-            /* [in] */ ULONG aScreenId,
-            /* [out] */ ULONG *aWidth,
-            /* [out] */ ULONG *aHeight,
-            /* [out] */ ULONG *aBitsPerPixel) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetFramebuffer( 
-            /* [in] */ ULONG aScreenId,
-            /* [in] */ IFramebuffer *aFramebuffer) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetFramebuffer( 
-            /* [in] */ ULONG aScreenId,
-            /* [out] */ IFramebuffer **aFramebuffer,
-            /* [out] */ LONG *aXOrigin,
-            /* [out] */ LONG *aYOrigin) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetVideoModeHint( 
-            /* [in] */ ULONG aWidth,
-            /* [in] */ ULONG aHeight,
-            /* [in] */ ULONG aBitsPerPixel,
-            /* [in] */ ULONG aDisplay) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetSeamlessMode( 
-            /* [in] */ BOOL aEnabled) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE TakeScreenShot( 
-            /* [in] */ ULONG aScreenId,
-            /* [in] */ BYTE *aAddress,
-            /* [in] */ ULONG aWidth,
-            /* [in] */ ULONG aHeight) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE TakeScreenShotToArray( 
-            /* [in] */ ULONG aScreenId,
-            /* [in] */ ULONG aWidth,
-            /* [in] */ ULONG aHeight,
-            /* [retval][out] */ SAFEARRAY * *aScreenData) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE DrawToScreen( 
-            /* [in] */ ULONG aScreenId,
-            /* [in] */ BYTE *aAddress,
-            /* [in] */ ULONG aX,
-            /* [in] */ ULONG aY,
-            /* [in] */ ULONG aWidth,
-            /* [in] */ ULONG aHeight) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE InvalidateAndUpdate( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE ResizeCompleted( 
-            /* [in] */ ULONG aScreenId) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CompleteVHWACommand( 
-            /* [in] */ BYTE *aCommand) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IDisplayVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IDisplay * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IDisplay * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IDisplay * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IDisplay * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IDisplay * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IDisplay * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IDisplay * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetScreenResolution )( 
-            IDisplay * This,
-            /* [in] */ ULONG aScreenId,
-            /* [out] */ ULONG *aWidth,
-            /* [out] */ ULONG *aHeight,
-            /* [out] */ ULONG *aBitsPerPixel);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetFramebuffer )( 
-            IDisplay * This,
-            /* [in] */ ULONG aScreenId,
-            /* [in] */ IFramebuffer *aFramebuffer);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetFramebuffer )( 
-            IDisplay * This,
-            /* [in] */ ULONG aScreenId,
-            /* [out] */ IFramebuffer **aFramebuffer,
-            /* [out] */ LONG *aXOrigin,
-            /* [out] */ LONG *aYOrigin);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetVideoModeHint )( 
-            IDisplay * This,
-            /* [in] */ ULONG aWidth,
-            /* [in] */ ULONG aHeight,
-            /* [in] */ ULONG aBitsPerPixel,
-            /* [in] */ ULONG aDisplay);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetSeamlessMode )( 
-            IDisplay * This,
-            /* [in] */ BOOL aEnabled);
-        
-        HRESULT ( STDMETHODCALLTYPE *TakeScreenShot )( 
-            IDisplay * This,
-            /* [in] */ ULONG aScreenId,
-            /* [in] */ BYTE *aAddress,
-            /* [in] */ ULONG aWidth,
-            /* [in] */ ULONG aHeight);
-        
-        HRESULT ( STDMETHODCALLTYPE *TakeScreenShotToArray )( 
-            IDisplay * This,
-            /* [in] */ ULONG aScreenId,
-            /* [in] */ ULONG aWidth,
-            /* [in] */ ULONG aHeight,
-            /* [retval][out] */ SAFEARRAY * *aScreenData);
-        
-        HRESULT ( STDMETHODCALLTYPE *DrawToScreen )( 
-            IDisplay * This,
-            /* [in] */ ULONG aScreenId,
-            /* [in] */ BYTE *aAddress,
-            /* [in] */ ULONG aX,
-            /* [in] */ ULONG aY,
-            /* [in] */ ULONG aWidth,
-            /* [in] */ ULONG aHeight);
-        
-        HRESULT ( STDMETHODCALLTYPE *InvalidateAndUpdate )( 
-            IDisplay * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *ResizeCompleted )( 
-            IDisplay * This,
-            /* [in] */ ULONG aScreenId);
-        
-        HRESULT ( STDMETHODCALLTYPE *CompleteVHWACommand )( 
-            IDisplay * This,
-            /* [in] */ BYTE *aCommand);
-        
-        END_INTERFACE
-    } IDisplayVtbl;
-
-    interface IDisplay
-    {
-        CONST_VTBL struct IDisplayVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IDisplay_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IDisplay_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IDisplay_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IDisplay_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IDisplay_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IDisplay_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IDisplay_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IDisplay_GetScreenResolution(This,aScreenId,aWidth,aHeight,aBitsPerPixel)	\
-    (This)->lpVtbl -> GetScreenResolution(This,aScreenId,aWidth,aHeight,aBitsPerPixel)
-
-#define IDisplay_SetFramebuffer(This,aScreenId,aFramebuffer)	\
-    (This)->lpVtbl -> SetFramebuffer(This,aScreenId,aFramebuffer)
-
-#define IDisplay_GetFramebuffer(This,aScreenId,aFramebuffer,aXOrigin,aYOrigin)	\
-    (This)->lpVtbl -> GetFramebuffer(This,aScreenId,aFramebuffer,aXOrigin,aYOrigin)
-
-#define IDisplay_SetVideoModeHint(This,aWidth,aHeight,aBitsPerPixel,aDisplay)	\
-    (This)->lpVtbl -> SetVideoModeHint(This,aWidth,aHeight,aBitsPerPixel,aDisplay)
-
-#define IDisplay_SetSeamlessMode(This,aEnabled)	\
-    (This)->lpVtbl -> SetSeamlessMode(This,aEnabled)
-
-#define IDisplay_TakeScreenShot(This,aScreenId,aAddress,aWidth,aHeight)	\
-    (This)->lpVtbl -> TakeScreenShot(This,aScreenId,aAddress,aWidth,aHeight)
-
-#define IDisplay_TakeScreenShotToArray(This,aScreenId,aWidth,aHeight,aScreenData)	\
-    (This)->lpVtbl -> TakeScreenShotToArray(This,aScreenId,aWidth,aHeight,aScreenData)
-
-#define IDisplay_DrawToScreen(This,aScreenId,aAddress,aX,aY,aWidth,aHeight)	\
-    (This)->lpVtbl -> DrawToScreen(This,aScreenId,aAddress,aX,aY,aWidth,aHeight)
-
-#define IDisplay_InvalidateAndUpdate(This)	\
-    (This)->lpVtbl -> InvalidateAndUpdate(This)
-
-#define IDisplay_ResizeCompleted(This,aScreenId)	\
-    (This)->lpVtbl -> ResizeCompleted(This,aScreenId)
-
-#define IDisplay_CompleteVHWACommand(This,aCommand)	\
-    (This)->lpVtbl -> CompleteVHWACommand(This,aCommand)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-HRESULT STDMETHODCALLTYPE IDisplay_GetScreenResolution_Proxy( 
-    IDisplay * This,
-    /* [in] */ ULONG aScreenId,
-    /* [out] */ ULONG *aWidth,
-    /* [out] */ ULONG *aHeight,
-    /* [out] */ ULONG *aBitsPerPixel);
-
-
-void __RPC_STUB IDisplay_GetScreenResolution_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IDisplay_SetFramebuffer_Proxy( 
-    IDisplay * This,
-    /* [in] */ ULONG aScreenId,
-    /* [in] */ IFramebuffer *aFramebuffer);
-
-
-void __RPC_STUB IDisplay_SetFramebuffer_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IDisplay_GetFramebuffer_Proxy( 
-    IDisplay * This,
-    /* [in] */ ULONG aScreenId,
-    /* [out] */ IFramebuffer **aFramebuffer,
-    /* [out] */ LONG *aXOrigin,
-    /* [out] */ LONG *aYOrigin);
-
-
-void __RPC_STUB IDisplay_GetFramebuffer_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IDisplay_SetVideoModeHint_Proxy( 
-    IDisplay * This,
-    /* [in] */ ULONG aWidth,
-    /* [in] */ ULONG aHeight,
-    /* [in] */ ULONG aBitsPerPixel,
-    /* [in] */ ULONG aDisplay);
-
-
-void __RPC_STUB IDisplay_SetVideoModeHint_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IDisplay_SetSeamlessMode_Proxy( 
-    IDisplay * This,
-    /* [in] */ BOOL aEnabled);
-
-
-void __RPC_STUB IDisplay_SetSeamlessMode_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IDisplay_TakeScreenShot_Proxy( 
-    IDisplay * This,
-    /* [in] */ ULONG aScreenId,
-    /* [in] */ BYTE *aAddress,
-    /* [in] */ ULONG aWidth,
-    /* [in] */ ULONG aHeight);
-
-
-void __RPC_STUB IDisplay_TakeScreenShot_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IDisplay_TakeScreenShotToArray_Proxy( 
-    IDisplay * This,
-    /* [in] */ ULONG aScreenId,
-    /* [in] */ ULONG aWidth,
-    /* [in] */ ULONG aHeight,
-    /* [retval][out] */ SAFEARRAY * *aScreenData);
-
-
-void __RPC_STUB IDisplay_TakeScreenShotToArray_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IDisplay_DrawToScreen_Proxy( 
-    IDisplay * This,
-    /* [in] */ ULONG aScreenId,
-    /* [in] */ BYTE *aAddress,
-    /* [in] */ ULONG aX,
-    /* [in] */ ULONG aY,
-    /* [in] */ ULONG aWidth,
-    /* [in] */ ULONG aHeight);
-
-
-void __RPC_STUB IDisplay_DrawToScreen_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IDisplay_InvalidateAndUpdate_Proxy( 
-    IDisplay * This);
-
-
-void __RPC_STUB IDisplay_InvalidateAndUpdate_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IDisplay_ResizeCompleted_Proxy( 
-    IDisplay * This,
-    /* [in] */ ULONG aScreenId);
-
-
-void __RPC_STUB IDisplay_ResizeCompleted_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IDisplay_CompleteVHWACommand_Proxy( 
-    IDisplay * This,
-    /* [in] */ BYTE *aCommand);
-
-
-void __RPC_STUB IDisplay_CompleteVHWACommand_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IDisplay_INTERFACE_DEFINED__ */
-
-
-#ifndef __INetworkAdapter_INTERFACE_DEFINED__
-#define __INetworkAdapter_INTERFACE_DEFINED__
-
-/* interface INetworkAdapter */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_INetworkAdapter;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("5bdb9df8-a5e1-4322-a139-b7a4a734c790")
-    INetworkAdapter : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_AdapterType( 
-            /* [retval][out] */ NetworkAdapterType *aAdapterType) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_AdapterType( 
-            /* [in] */ NetworkAdapterType aAdapterType) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Slot( 
-            /* [retval][out] */ ULONG *aSlot) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Enabled( 
-            /* [retval][out] */ BOOL *aEnabled) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_Enabled( 
-            /* [in] */ BOOL aEnabled) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_MACAddress( 
-            /* [retval][out] */ BSTR *aMACAddress) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_MACAddress( 
-            /* [in] */ BSTR aMACAddress) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_AttachmentType( 
-            /* [retval][out] */ NetworkAttachmentType *aAttachmentType) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_HostInterface( 
-            /* [retval][out] */ BSTR *aHostInterface) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_HostInterface( 
-            /* [in] */ BSTR aHostInterface) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_InternalNetwork( 
-            /* [retval][out] */ BSTR *aInternalNetwork) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_InternalNetwork( 
-            /* [in] */ BSTR aInternalNetwork) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_NATNetwork( 
-            /* [retval][out] */ BSTR *aNATNetwork) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_NATNetwork( 
-            /* [in] */ BSTR aNATNetwork) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_VDENetwork( 
-            /* [retval][out] */ BSTR *aVDENetwork) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_VDENetwork( 
-            /* [in] */ BSTR aVDENetwork) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_CableConnected( 
-            /* [retval][out] */ BOOL *aCableConnected) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_CableConnected( 
-            /* [in] */ BOOL aCableConnected) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_LineSpeed( 
-            /* [retval][out] */ ULONG *aLineSpeed) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_LineSpeed( 
-            /* [in] */ ULONG aLineSpeed) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_TraceEnabled( 
-            /* [retval][out] */ BOOL *aTraceEnabled) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_TraceEnabled( 
-            /* [in] */ BOOL aTraceEnabled) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_TraceFile( 
-            /* [retval][out] */ BSTR *aTraceFile) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_TraceFile( 
-            /* [in] */ BSTR aTraceFile) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_NatDriver( 
-            /* [retval][out] */ INATEngine **aNatDriver) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_BootPriority( 
-            /* [retval][out] */ ULONG *aBootPriority) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_BootPriority( 
-            /* [in] */ ULONG aBootPriority) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE AttachToNAT( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE AttachToBridgedInterface( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE AttachToInternalNetwork( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE AttachToHostOnlyInterface( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE AttachToVDE( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE Detach( void) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct INetworkAdapterVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            INetworkAdapter * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            INetworkAdapter * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            INetworkAdapter * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            INetworkAdapter * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            INetworkAdapter * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            INetworkAdapter * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            INetworkAdapter * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_AdapterType )( 
-            INetworkAdapter * This,
-            /* [retval][out] */ NetworkAdapterType *aAdapterType);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_AdapterType )( 
-            INetworkAdapter * This,
-            /* [in] */ NetworkAdapterType aAdapterType);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Slot )( 
-            INetworkAdapter * This,
-            /* [retval][out] */ ULONG *aSlot);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Enabled )( 
-            INetworkAdapter * This,
-            /* [retval][out] */ BOOL *aEnabled);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Enabled )( 
-            INetworkAdapter * This,
-            /* [in] */ BOOL aEnabled);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_MACAddress )( 
-            INetworkAdapter * This,
-            /* [retval][out] */ BSTR *aMACAddress);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_MACAddress )( 
-            INetworkAdapter * This,
-            /* [in] */ BSTR aMACAddress);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_AttachmentType )( 
-            INetworkAdapter * This,
-            /* [retval][out] */ NetworkAttachmentType *aAttachmentType);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_HostInterface )( 
-            INetworkAdapter * This,
-            /* [retval][out] */ BSTR *aHostInterface);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_HostInterface )( 
-            INetworkAdapter * This,
-            /* [in] */ BSTR aHostInterface);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_InternalNetwork )( 
-            INetworkAdapter * This,
-            /* [retval][out] */ BSTR *aInternalNetwork);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_InternalNetwork )( 
-            INetworkAdapter * This,
-            /* [in] */ BSTR aInternalNetwork);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_NATNetwork )( 
-            INetworkAdapter * This,
-            /* [retval][out] */ BSTR *aNATNetwork);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_NATNetwork )( 
-            INetworkAdapter * This,
-            /* [in] */ BSTR aNATNetwork);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_VDENetwork )( 
-            INetworkAdapter * This,
-            /* [retval][out] */ BSTR *aVDENetwork);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_VDENetwork )( 
-            INetworkAdapter * This,
-            /* [in] */ BSTR aVDENetwork);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_CableConnected )( 
-            INetworkAdapter * This,
-            /* [retval][out] */ BOOL *aCableConnected);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_CableConnected )( 
-            INetworkAdapter * This,
-            /* [in] */ BOOL aCableConnected);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_LineSpeed )( 
-            INetworkAdapter * This,
-            /* [retval][out] */ ULONG *aLineSpeed);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_LineSpeed )( 
-            INetworkAdapter * This,
-            /* [in] */ ULONG aLineSpeed);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_TraceEnabled )( 
-            INetworkAdapter * This,
-            /* [retval][out] */ BOOL *aTraceEnabled);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_TraceEnabled )( 
-            INetworkAdapter * This,
-            /* [in] */ BOOL aTraceEnabled);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_TraceFile )( 
-            INetworkAdapter * This,
-            /* [retval][out] */ BSTR *aTraceFile);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_TraceFile )( 
-            INetworkAdapter * This,
-            /* [in] */ BSTR aTraceFile);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_NatDriver )( 
-            INetworkAdapter * This,
-            /* [retval][out] */ INATEngine **aNatDriver);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_BootPriority )( 
-            INetworkAdapter * This,
-            /* [retval][out] */ ULONG *aBootPriority);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_BootPriority )( 
-            INetworkAdapter * This,
-            /* [in] */ ULONG aBootPriority);
-        
-        HRESULT ( STDMETHODCALLTYPE *AttachToNAT )( 
-            INetworkAdapter * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *AttachToBridgedInterface )( 
-            INetworkAdapter * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *AttachToInternalNetwork )( 
-            INetworkAdapter * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *AttachToHostOnlyInterface )( 
-            INetworkAdapter * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *AttachToVDE )( 
-            INetworkAdapter * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *Detach )( 
-            INetworkAdapter * This);
-        
-        END_INTERFACE
-    } INetworkAdapterVtbl;
-
-    interface INetworkAdapter
-    {
-        CONST_VTBL struct INetworkAdapterVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define INetworkAdapter_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define INetworkAdapter_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define INetworkAdapter_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define INetworkAdapter_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define INetworkAdapter_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define INetworkAdapter_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define INetworkAdapter_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define INetworkAdapter_get_AdapterType(This,aAdapterType)	\
-    (This)->lpVtbl -> get_AdapterType(This,aAdapterType)
-
-#define INetworkAdapter_put_AdapterType(This,aAdapterType)	\
-    (This)->lpVtbl -> put_AdapterType(This,aAdapterType)
-
-#define INetworkAdapter_get_Slot(This,aSlot)	\
-    (This)->lpVtbl -> get_Slot(This,aSlot)
-
-#define INetworkAdapter_get_Enabled(This,aEnabled)	\
-    (This)->lpVtbl -> get_Enabled(This,aEnabled)
-
-#define INetworkAdapter_put_Enabled(This,aEnabled)	\
-    (This)->lpVtbl -> put_Enabled(This,aEnabled)
-
-#define INetworkAdapter_get_MACAddress(This,aMACAddress)	\
-    (This)->lpVtbl -> get_MACAddress(This,aMACAddress)
-
-#define INetworkAdapter_put_MACAddress(This,aMACAddress)	\
-    (This)->lpVtbl -> put_MACAddress(This,aMACAddress)
-
-#define INetworkAdapter_get_AttachmentType(This,aAttachmentType)	\
-    (This)->lpVtbl -> get_AttachmentType(This,aAttachmentType)
-
-#define INetworkAdapter_get_HostInterface(This,aHostInterface)	\
-    (This)->lpVtbl -> get_HostInterface(This,aHostInterface)
-
-#define INetworkAdapter_put_HostInterface(This,aHostInterface)	\
-    (This)->lpVtbl -> put_HostInterface(This,aHostInterface)
-
-#define INetworkAdapter_get_InternalNetwork(This,aInternalNetwork)	\
-    (This)->lpVtbl -> get_InternalNetwork(This,aInternalNetwork)
-
-#define INetworkAdapter_put_InternalNetwork(This,aInternalNetwork)	\
-    (This)->lpVtbl -> put_InternalNetwork(This,aInternalNetwork)
-
-#define INetworkAdapter_get_NATNetwork(This,aNATNetwork)	\
-    (This)->lpVtbl -> get_NATNetwork(This,aNATNetwork)
-
-#define INetworkAdapter_put_NATNetwork(This,aNATNetwork)	\
-    (This)->lpVtbl -> put_NATNetwork(This,aNATNetwork)
-
-#define INetworkAdapter_get_VDENetwork(This,aVDENetwork)	\
-    (This)->lpVtbl -> get_VDENetwork(This,aVDENetwork)
-
-#define INetworkAdapter_put_VDENetwork(This,aVDENetwork)	\
-    (This)->lpVtbl -> put_VDENetwork(This,aVDENetwork)
-
-#define INetworkAdapter_get_CableConnected(This,aCableConnected)	\
-    (This)->lpVtbl -> get_CableConnected(This,aCableConnected)
-
-#define INetworkAdapter_put_CableConnected(This,aCableConnected)	\
-    (This)->lpVtbl -> put_CableConnected(This,aCableConnected)
-
-#define INetworkAdapter_get_LineSpeed(This,aLineSpeed)	\
-    (This)->lpVtbl -> get_LineSpeed(This,aLineSpeed)
-
-#define INetworkAdapter_put_LineSpeed(This,aLineSpeed)	\
-    (This)->lpVtbl -> put_LineSpeed(This,aLineSpeed)
-
-#define INetworkAdapter_get_TraceEnabled(This,aTraceEnabled)	\
-    (This)->lpVtbl -> get_TraceEnabled(This,aTraceEnabled)
-
-#define INetworkAdapter_put_TraceEnabled(This,aTraceEnabled)	\
-    (This)->lpVtbl -> put_TraceEnabled(This,aTraceEnabled)
-
-#define INetworkAdapter_get_TraceFile(This,aTraceFile)	\
-    (This)->lpVtbl -> get_TraceFile(This,aTraceFile)
-
-#define INetworkAdapter_put_TraceFile(This,aTraceFile)	\
-    (This)->lpVtbl -> put_TraceFile(This,aTraceFile)
-
-#define INetworkAdapter_get_NatDriver(This,aNatDriver)	\
-    (This)->lpVtbl -> get_NatDriver(This,aNatDriver)
-
-#define INetworkAdapter_get_BootPriority(This,aBootPriority)	\
-    (This)->lpVtbl -> get_BootPriority(This,aBootPriority)
-
-#define INetworkAdapter_put_BootPriority(This,aBootPriority)	\
-    (This)->lpVtbl -> put_BootPriority(This,aBootPriority)
-
-#define INetworkAdapter_AttachToNAT(This)	\
-    (This)->lpVtbl -> AttachToNAT(This)
-
-#define INetworkAdapter_AttachToBridgedInterface(This)	\
-    (This)->lpVtbl -> AttachToBridgedInterface(This)
-
-#define INetworkAdapter_AttachToInternalNetwork(This)	\
-    (This)->lpVtbl -> AttachToInternalNetwork(This)
-
-#define INetworkAdapter_AttachToHostOnlyInterface(This)	\
-    (This)->lpVtbl -> AttachToHostOnlyInterface(This)
-
-#define INetworkAdapter_AttachToVDE(This)	\
-    (This)->lpVtbl -> AttachToVDE(This)
-
-#define INetworkAdapter_Detach(This)	\
-    (This)->lpVtbl -> Detach(This)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE INetworkAdapter_get_AdapterType_Proxy( 
-    INetworkAdapter * This,
-    /* [retval][out] */ NetworkAdapterType *aAdapterType);
-
-
-void __RPC_STUB INetworkAdapter_get_AdapterType_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE INetworkAdapter_put_AdapterType_Proxy( 
-    INetworkAdapter * This,
-    /* [in] */ NetworkAdapterType aAdapterType);
-
-
-void __RPC_STUB INetworkAdapter_put_AdapterType_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE INetworkAdapter_get_Slot_Proxy( 
-    INetworkAdapter * This,
-    /* [retval][out] */ ULONG *aSlot);
-
-
-void __RPC_STUB INetworkAdapter_get_Slot_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE INetworkAdapter_get_Enabled_Proxy( 
-    INetworkAdapter * This,
-    /* [retval][out] */ BOOL *aEnabled);
-
-
-void __RPC_STUB INetworkAdapter_get_Enabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE INetworkAdapter_put_Enabled_Proxy( 
-    INetworkAdapter * This,
-    /* [in] */ BOOL aEnabled);
-
-
-void __RPC_STUB INetworkAdapter_put_Enabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE INetworkAdapter_get_MACAddress_Proxy( 
-    INetworkAdapter * This,
-    /* [retval][out] */ BSTR *aMACAddress);
-
-
-void __RPC_STUB INetworkAdapter_get_MACAddress_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE INetworkAdapter_put_MACAddress_Proxy( 
-    INetworkAdapter * This,
-    /* [in] */ BSTR aMACAddress);
-
-
-void __RPC_STUB INetworkAdapter_put_MACAddress_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE INetworkAdapter_get_AttachmentType_Proxy( 
-    INetworkAdapter * This,
-    /* [retval][out] */ NetworkAttachmentType *aAttachmentType);
-
-
-void __RPC_STUB INetworkAdapter_get_AttachmentType_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE INetworkAdapter_get_HostInterface_Proxy( 
-    INetworkAdapter * This,
-    /* [retval][out] */ BSTR *aHostInterface);
-
-
-void __RPC_STUB INetworkAdapter_get_HostInterface_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE INetworkAdapter_put_HostInterface_Proxy( 
-    INetworkAdapter * This,
-    /* [in] */ BSTR aHostInterface);
-
-
-void __RPC_STUB INetworkAdapter_put_HostInterface_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE INetworkAdapter_get_InternalNetwork_Proxy( 
-    INetworkAdapter * This,
-    /* [retval][out] */ BSTR *aInternalNetwork);
-
-
-void __RPC_STUB INetworkAdapter_get_InternalNetwork_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE INetworkAdapter_put_InternalNetwork_Proxy( 
-    INetworkAdapter * This,
-    /* [in] */ BSTR aInternalNetwork);
-
-
-void __RPC_STUB INetworkAdapter_put_InternalNetwork_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE INetworkAdapter_get_NATNetwork_Proxy( 
-    INetworkAdapter * This,
-    /* [retval][out] */ BSTR *aNATNetwork);
-
-
-void __RPC_STUB INetworkAdapter_get_NATNetwork_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE INetworkAdapter_put_NATNetwork_Proxy( 
-    INetworkAdapter * This,
-    /* [in] */ BSTR aNATNetwork);
-
-
-void __RPC_STUB INetworkAdapter_put_NATNetwork_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE INetworkAdapter_get_VDENetwork_Proxy( 
-    INetworkAdapter * This,
-    /* [retval][out] */ BSTR *aVDENetwork);
-
-
-void __RPC_STUB INetworkAdapter_get_VDENetwork_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE INetworkAdapter_put_VDENetwork_Proxy( 
-    INetworkAdapter * This,
-    /* [in] */ BSTR aVDENetwork);
-
-
-void __RPC_STUB INetworkAdapter_put_VDENetwork_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE INetworkAdapter_get_CableConnected_Proxy( 
-    INetworkAdapter * This,
-    /* [retval][out] */ BOOL *aCableConnected);
-
-
-void __RPC_STUB INetworkAdapter_get_CableConnected_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE INetworkAdapter_put_CableConnected_Proxy( 
-    INetworkAdapter * This,
-    /* [in] */ BOOL aCableConnected);
-
-
-void __RPC_STUB INetworkAdapter_put_CableConnected_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE INetworkAdapter_get_LineSpeed_Proxy( 
-    INetworkAdapter * This,
-    /* [retval][out] */ ULONG *aLineSpeed);
-
-
-void __RPC_STUB INetworkAdapter_get_LineSpeed_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE INetworkAdapter_put_LineSpeed_Proxy( 
-    INetworkAdapter * This,
-    /* [in] */ ULONG aLineSpeed);
-
-
-void __RPC_STUB INetworkAdapter_put_LineSpeed_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE INetworkAdapter_get_TraceEnabled_Proxy( 
-    INetworkAdapter * This,
-    /* [retval][out] */ BOOL *aTraceEnabled);
-
-
-void __RPC_STUB INetworkAdapter_get_TraceEnabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE INetworkAdapter_put_TraceEnabled_Proxy( 
-    INetworkAdapter * This,
-    /* [in] */ BOOL aTraceEnabled);
-
-
-void __RPC_STUB INetworkAdapter_put_TraceEnabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE INetworkAdapter_get_TraceFile_Proxy( 
-    INetworkAdapter * This,
-    /* [retval][out] */ BSTR *aTraceFile);
-
-
-void __RPC_STUB INetworkAdapter_get_TraceFile_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE INetworkAdapter_put_TraceFile_Proxy( 
-    INetworkAdapter * This,
-    /* [in] */ BSTR aTraceFile);
-
-
-void __RPC_STUB INetworkAdapter_put_TraceFile_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE INetworkAdapter_get_NatDriver_Proxy( 
-    INetworkAdapter * This,
-    /* [retval][out] */ INATEngine **aNatDriver);
-
-
-void __RPC_STUB INetworkAdapter_get_NatDriver_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE INetworkAdapter_get_BootPriority_Proxy( 
-    INetworkAdapter * This,
-    /* [retval][out] */ ULONG *aBootPriority);
-
-
-void __RPC_STUB INetworkAdapter_get_BootPriority_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE INetworkAdapter_put_BootPriority_Proxy( 
-    INetworkAdapter * This,
-    /* [in] */ ULONG aBootPriority);
-
-
-void __RPC_STUB INetworkAdapter_put_BootPriority_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE INetworkAdapter_AttachToNAT_Proxy( 
-    INetworkAdapter * This);
-
-
-void __RPC_STUB INetworkAdapter_AttachToNAT_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE INetworkAdapter_AttachToBridgedInterface_Proxy( 
-    INetworkAdapter * This);
-
-
-void __RPC_STUB INetworkAdapter_AttachToBridgedInterface_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE INetworkAdapter_AttachToInternalNetwork_Proxy( 
-    INetworkAdapter * This);
-
-
-void __RPC_STUB INetworkAdapter_AttachToInternalNetwork_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE INetworkAdapter_AttachToHostOnlyInterface_Proxy( 
-    INetworkAdapter * This);
-
-
-void __RPC_STUB INetworkAdapter_AttachToHostOnlyInterface_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE INetworkAdapter_AttachToVDE_Proxy( 
-    INetworkAdapter * This);
-
-
-void __RPC_STUB INetworkAdapter_AttachToVDE_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE INetworkAdapter_Detach_Proxy( 
-    INetworkAdapter * This);
-
-
-void __RPC_STUB INetworkAdapter_Detach_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __INetworkAdapter_INTERFACE_DEFINED__ */
-
-
-#ifndef __ISerialPort_INTERFACE_DEFINED__
-#define __ISerialPort_INTERFACE_DEFINED__
-
-/* interface ISerialPort */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_ISerialPort;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("937f6970-5103-4745-b78e-d28dcf1479a8")
-    ISerialPort : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Slot( 
-            /* [retval][out] */ ULONG *aSlot) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Enabled( 
-            /* [retval][out] */ BOOL *aEnabled) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_Enabled( 
-            /* [in] */ BOOL aEnabled) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_IOBase( 
-            /* [retval][out] */ ULONG *aIOBase) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_IOBase( 
-            /* [in] */ ULONG aIOBase) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_IRQ( 
-            /* [retval][out] */ ULONG *aIRQ) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_IRQ( 
-            /* [in] */ ULONG aIRQ) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_HostMode( 
-            /* [retval][out] */ PortMode *aHostMode) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_HostMode( 
-            /* [in] */ PortMode aHostMode) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Server( 
-            /* [retval][out] */ BOOL *aServer) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_Server( 
-            /* [in] */ BOOL aServer) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Path( 
-            /* [retval][out] */ BSTR *aPath) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_Path( 
-            /* [in] */ BSTR aPath) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct ISerialPortVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            ISerialPort * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            ISerialPort * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            ISerialPort * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            ISerialPort * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            ISerialPort * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            ISerialPort * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            ISerialPort * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Slot )( 
-            ISerialPort * This,
-            /* [retval][out] */ ULONG *aSlot);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Enabled )( 
-            ISerialPort * This,
-            /* [retval][out] */ BOOL *aEnabled);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Enabled )( 
-            ISerialPort * This,
-            /* [in] */ BOOL aEnabled);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_IOBase )( 
-            ISerialPort * This,
-            /* [retval][out] */ ULONG *aIOBase);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_IOBase )( 
-            ISerialPort * This,
-            /* [in] */ ULONG aIOBase);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_IRQ )( 
-            ISerialPort * This,
-            /* [retval][out] */ ULONG *aIRQ);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_IRQ )( 
-            ISerialPort * This,
-            /* [in] */ ULONG aIRQ);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_HostMode )( 
-            ISerialPort * This,
-            /* [retval][out] */ PortMode *aHostMode);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_HostMode )( 
-            ISerialPort * This,
-            /* [in] */ PortMode aHostMode);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Server )( 
-            ISerialPort * This,
-            /* [retval][out] */ BOOL *aServer);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Server )( 
-            ISerialPort * This,
-            /* [in] */ BOOL aServer);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Path )( 
-            ISerialPort * This,
-            /* [retval][out] */ BSTR *aPath);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Path )( 
-            ISerialPort * This,
-            /* [in] */ BSTR aPath);
-        
-        END_INTERFACE
-    } ISerialPortVtbl;
-
-    interface ISerialPort
-    {
-        CONST_VTBL struct ISerialPortVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define ISerialPort_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define ISerialPort_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define ISerialPort_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define ISerialPort_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define ISerialPort_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define ISerialPort_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define ISerialPort_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define ISerialPort_get_Slot(This,aSlot)	\
-    (This)->lpVtbl -> get_Slot(This,aSlot)
-
-#define ISerialPort_get_Enabled(This,aEnabled)	\
-    (This)->lpVtbl -> get_Enabled(This,aEnabled)
-
-#define ISerialPort_put_Enabled(This,aEnabled)	\
-    (This)->lpVtbl -> put_Enabled(This,aEnabled)
-
-#define ISerialPort_get_IOBase(This,aIOBase)	\
-    (This)->lpVtbl -> get_IOBase(This,aIOBase)
-
-#define ISerialPort_put_IOBase(This,aIOBase)	\
-    (This)->lpVtbl -> put_IOBase(This,aIOBase)
-
-#define ISerialPort_get_IRQ(This,aIRQ)	\
-    (This)->lpVtbl -> get_IRQ(This,aIRQ)
-
-#define ISerialPort_put_IRQ(This,aIRQ)	\
-    (This)->lpVtbl -> put_IRQ(This,aIRQ)
-
-#define ISerialPort_get_HostMode(This,aHostMode)	\
-    (This)->lpVtbl -> get_HostMode(This,aHostMode)
-
-#define ISerialPort_put_HostMode(This,aHostMode)	\
-    (This)->lpVtbl -> put_HostMode(This,aHostMode)
-
-#define ISerialPort_get_Server(This,aServer)	\
-    (This)->lpVtbl -> get_Server(This,aServer)
-
-#define ISerialPort_put_Server(This,aServer)	\
-    (This)->lpVtbl -> put_Server(This,aServer)
-
-#define ISerialPort_get_Path(This,aPath)	\
-    (This)->lpVtbl -> get_Path(This,aPath)
-
-#define ISerialPort_put_Path(This,aPath)	\
-    (This)->lpVtbl -> put_Path(This,aPath)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISerialPort_get_Slot_Proxy( 
-    ISerialPort * This,
-    /* [retval][out] */ ULONG *aSlot);
-
-
-void __RPC_STUB ISerialPort_get_Slot_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISerialPort_get_Enabled_Proxy( 
-    ISerialPort * This,
-    /* [retval][out] */ BOOL *aEnabled);
-
-
-void __RPC_STUB ISerialPort_get_Enabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE ISerialPort_put_Enabled_Proxy( 
-    ISerialPort * This,
-    /* [in] */ BOOL aEnabled);
-
-
-void __RPC_STUB ISerialPort_put_Enabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISerialPort_get_IOBase_Proxy( 
-    ISerialPort * This,
-    /* [retval][out] */ ULONG *aIOBase);
-
-
-void __RPC_STUB ISerialPort_get_IOBase_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE ISerialPort_put_IOBase_Proxy( 
-    ISerialPort * This,
-    /* [in] */ ULONG aIOBase);
-
-
-void __RPC_STUB ISerialPort_put_IOBase_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISerialPort_get_IRQ_Proxy( 
-    ISerialPort * This,
-    /* [retval][out] */ ULONG *aIRQ);
-
-
-void __RPC_STUB ISerialPort_get_IRQ_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE ISerialPort_put_IRQ_Proxy( 
-    ISerialPort * This,
-    /* [in] */ ULONG aIRQ);
-
-
-void __RPC_STUB ISerialPort_put_IRQ_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISerialPort_get_HostMode_Proxy( 
-    ISerialPort * This,
-    /* [retval][out] */ PortMode *aHostMode);
-
-
-void __RPC_STUB ISerialPort_get_HostMode_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE ISerialPort_put_HostMode_Proxy( 
-    ISerialPort * This,
-    /* [in] */ PortMode aHostMode);
-
-
-void __RPC_STUB ISerialPort_put_HostMode_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISerialPort_get_Server_Proxy( 
-    ISerialPort * This,
-    /* [retval][out] */ BOOL *aServer);
-
-
-void __RPC_STUB ISerialPort_get_Server_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE ISerialPort_put_Server_Proxy( 
-    ISerialPort * This,
-    /* [in] */ BOOL aServer);
-
-
-void __RPC_STUB ISerialPort_put_Server_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISerialPort_get_Path_Proxy( 
-    ISerialPort * This,
-    /* [retval][out] */ BSTR *aPath);
-
-
-void __RPC_STUB ISerialPort_get_Path_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE ISerialPort_put_Path_Proxy( 
-    ISerialPort * This,
-    /* [in] */ BSTR aPath);
-
-
-void __RPC_STUB ISerialPort_put_Path_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __ISerialPort_INTERFACE_DEFINED__ */
-
-
-#ifndef __IParallelPort_INTERFACE_DEFINED__
-#define __IParallelPort_INTERFACE_DEFINED__
-
-/* interface IParallelPort */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IParallelPort;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("0c925f06-dd10-4b77-8de8-294d738c3214")
-    IParallelPort : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Slot( 
-            /* [retval][out] */ ULONG *aSlot) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Enabled( 
-            /* [retval][out] */ BOOL *aEnabled) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_Enabled( 
-            /* [in] */ BOOL aEnabled) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_IOBase( 
-            /* [retval][out] */ ULONG *aIOBase) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_IOBase( 
-            /* [in] */ ULONG aIOBase) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_IRQ( 
-            /* [retval][out] */ ULONG *aIRQ) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_IRQ( 
-            /* [in] */ ULONG aIRQ) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Path( 
-            /* [retval][out] */ BSTR *aPath) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_Path( 
-            /* [in] */ BSTR aPath) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IParallelPortVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IParallelPort * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IParallelPort * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IParallelPort * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IParallelPort * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IParallelPort * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IParallelPort * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IParallelPort * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Slot )( 
-            IParallelPort * This,
-            /* [retval][out] */ ULONG *aSlot);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Enabled )( 
-            IParallelPort * This,
-            /* [retval][out] */ BOOL *aEnabled);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Enabled )( 
-            IParallelPort * This,
-            /* [in] */ BOOL aEnabled);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_IOBase )( 
-            IParallelPort * This,
-            /* [retval][out] */ ULONG *aIOBase);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_IOBase )( 
-            IParallelPort * This,
-            /* [in] */ ULONG aIOBase);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_IRQ )( 
-            IParallelPort * This,
-            /* [retval][out] */ ULONG *aIRQ);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_IRQ )( 
-            IParallelPort * This,
-            /* [in] */ ULONG aIRQ);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Path )( 
-            IParallelPort * This,
-            /* [retval][out] */ BSTR *aPath);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Path )( 
-            IParallelPort * This,
-            /* [in] */ BSTR aPath);
-        
-        END_INTERFACE
-    } IParallelPortVtbl;
-
-    interface IParallelPort
-    {
-        CONST_VTBL struct IParallelPortVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IParallelPort_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IParallelPort_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IParallelPort_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IParallelPort_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IParallelPort_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IParallelPort_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IParallelPort_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IParallelPort_get_Slot(This,aSlot)	\
-    (This)->lpVtbl -> get_Slot(This,aSlot)
-
-#define IParallelPort_get_Enabled(This,aEnabled)	\
-    (This)->lpVtbl -> get_Enabled(This,aEnabled)
-
-#define IParallelPort_put_Enabled(This,aEnabled)	\
-    (This)->lpVtbl -> put_Enabled(This,aEnabled)
-
-#define IParallelPort_get_IOBase(This,aIOBase)	\
-    (This)->lpVtbl -> get_IOBase(This,aIOBase)
-
-#define IParallelPort_put_IOBase(This,aIOBase)	\
-    (This)->lpVtbl -> put_IOBase(This,aIOBase)
-
-#define IParallelPort_get_IRQ(This,aIRQ)	\
-    (This)->lpVtbl -> get_IRQ(This,aIRQ)
-
-#define IParallelPort_put_IRQ(This,aIRQ)	\
-    (This)->lpVtbl -> put_IRQ(This,aIRQ)
-
-#define IParallelPort_get_Path(This,aPath)	\
-    (This)->lpVtbl -> get_Path(This,aPath)
-
-#define IParallelPort_put_Path(This,aPath)	\
-    (This)->lpVtbl -> put_Path(This,aPath)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IParallelPort_get_Slot_Proxy( 
-    IParallelPort * This,
-    /* [retval][out] */ ULONG *aSlot);
-
-
-void __RPC_STUB IParallelPort_get_Slot_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IParallelPort_get_Enabled_Proxy( 
-    IParallelPort * This,
-    /* [retval][out] */ BOOL *aEnabled);
-
-
-void __RPC_STUB IParallelPort_get_Enabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IParallelPort_put_Enabled_Proxy( 
-    IParallelPort * This,
-    /* [in] */ BOOL aEnabled);
-
-
-void __RPC_STUB IParallelPort_put_Enabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IParallelPort_get_IOBase_Proxy( 
-    IParallelPort * This,
-    /* [retval][out] */ ULONG *aIOBase);
-
-
-void __RPC_STUB IParallelPort_get_IOBase_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IParallelPort_put_IOBase_Proxy( 
-    IParallelPort * This,
-    /* [in] */ ULONG aIOBase);
-
-
-void __RPC_STUB IParallelPort_put_IOBase_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IParallelPort_get_IRQ_Proxy( 
-    IParallelPort * This,
-    /* [retval][out] */ ULONG *aIRQ);
-
-
-void __RPC_STUB IParallelPort_get_IRQ_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IParallelPort_put_IRQ_Proxy( 
-    IParallelPort * This,
-    /* [in] */ ULONG aIRQ);
-
-
-void __RPC_STUB IParallelPort_put_IRQ_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IParallelPort_get_Path_Proxy( 
-    IParallelPort * This,
-    /* [retval][out] */ BSTR *aPath);
-
-
-void __RPC_STUB IParallelPort_get_Path_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IParallelPort_put_Path_Proxy( 
-    IParallelPort * This,
-    /* [in] */ BSTR aPath);
-
-
-void __RPC_STUB IParallelPort_put_Path_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IParallelPort_INTERFACE_DEFINED__ */
-
-
-#ifndef __IMachineDebugger_INTERFACE_DEFINED__
-#define __IMachineDebugger_INTERFACE_DEFINED__
-
-/* interface IMachineDebugger */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IMachineDebugger;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("b0b2a2dd-0627-4502-91c2-ddc5e77609e0")
-    IMachineDebugger : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Singlestep( 
-            /* [retval][out] */ BOOL *aSinglestep) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_Singlestep( 
-            /* [in] */ BOOL aSinglestep) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_RecompileUser( 
-            /* [retval][out] */ BOOL *aRecompileUser) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_RecompileUser( 
-            /* [in] */ BOOL aRecompileUser) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_RecompileSupervisor( 
-            /* [retval][out] */ BOOL *aRecompileSupervisor) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_RecompileSupervisor( 
-            /* [in] */ BOOL aRecompileSupervisor) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_PATMEnabled( 
-            /* [retval][out] */ BOOL *aPATMEnabled) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_PATMEnabled( 
-            /* [in] */ BOOL aPATMEnabled) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_CSAMEnabled( 
-            /* [retval][out] */ BOOL *aCSAMEnabled) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_CSAMEnabled( 
-            /* [in] */ BOOL aCSAMEnabled) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_LogEnabled( 
-            /* [retval][out] */ BOOL *aLogEnabled) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_LogEnabled( 
-            /* [in] */ BOOL aLogEnabled) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_HWVirtExEnabled( 
-            /* [retval][out] */ BOOL *aHWVirtExEnabled) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_HWVirtExNestedPagingEnabled( 
-            /* [retval][out] */ BOOL *aHWVirtExNestedPagingEnabled) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_HWVirtExVPIDEnabled( 
-            /* [retval][out] */ BOOL *aHWVirtExVPIDEnabled) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_PAEEnabled( 
-            /* [retval][out] */ BOOL *aPAEEnabled) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_VirtualTimeRate( 
-            /* [retval][out] */ ULONG *aVirtualTimeRate) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_VirtualTimeRate( 
-            /* [in] */ ULONG aVirtualTimeRate) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_VM( 
-            /* [retval][out] */ ULONG64 *aVM) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE ResetStats( 
-            /* [in] */ BSTR aPattern) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE DumpStats( 
-            /* [in] */ BSTR aPattern) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetStats( 
-            /* [in] */ BSTR aPattern,
-            /* [in] */ BOOL aWithDescriptions,
-            /* [out] */ BSTR *aStats) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE InjectNMI( void) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IMachineDebuggerVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IMachineDebugger * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IMachineDebugger * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IMachineDebugger * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IMachineDebugger * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IMachineDebugger * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IMachineDebugger * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IMachineDebugger * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Singlestep )( 
-            IMachineDebugger * This,
-            /* [retval][out] */ BOOL *aSinglestep);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Singlestep )( 
-            IMachineDebugger * This,
-            /* [in] */ BOOL aSinglestep);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_RecompileUser )( 
-            IMachineDebugger * This,
-            /* [retval][out] */ BOOL *aRecompileUser);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_RecompileUser )( 
-            IMachineDebugger * This,
-            /* [in] */ BOOL aRecompileUser);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_RecompileSupervisor )( 
-            IMachineDebugger * This,
-            /* [retval][out] */ BOOL *aRecompileSupervisor);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_RecompileSupervisor )( 
-            IMachineDebugger * This,
-            /* [in] */ BOOL aRecompileSupervisor);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_PATMEnabled )( 
-            IMachineDebugger * This,
-            /* [retval][out] */ BOOL *aPATMEnabled);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_PATMEnabled )( 
-            IMachineDebugger * This,
-            /* [in] */ BOOL aPATMEnabled);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_CSAMEnabled )( 
-            IMachineDebugger * This,
-            /* [retval][out] */ BOOL *aCSAMEnabled);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_CSAMEnabled )( 
-            IMachineDebugger * This,
-            /* [in] */ BOOL aCSAMEnabled);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_LogEnabled )( 
-            IMachineDebugger * This,
-            /* [retval][out] */ BOOL *aLogEnabled);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_LogEnabled )( 
-            IMachineDebugger * This,
-            /* [in] */ BOOL aLogEnabled);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_HWVirtExEnabled )( 
-            IMachineDebugger * This,
-            /* [retval][out] */ BOOL *aHWVirtExEnabled);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_HWVirtExNestedPagingEnabled )( 
-            IMachineDebugger * This,
-            /* [retval][out] */ BOOL *aHWVirtExNestedPagingEnabled);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_HWVirtExVPIDEnabled )( 
-            IMachineDebugger * This,
-            /* [retval][out] */ BOOL *aHWVirtExVPIDEnabled);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_PAEEnabled )( 
-            IMachineDebugger * This,
-            /* [retval][out] */ BOOL *aPAEEnabled);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_VirtualTimeRate )( 
-            IMachineDebugger * This,
-            /* [retval][out] */ ULONG *aVirtualTimeRate);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_VirtualTimeRate )( 
-            IMachineDebugger * This,
-            /* [in] */ ULONG aVirtualTimeRate);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_VM )( 
-            IMachineDebugger * This,
-            /* [retval][out] */ ULONG64 *aVM);
-        
-        HRESULT ( STDMETHODCALLTYPE *ResetStats )( 
-            IMachineDebugger * This,
-            /* [in] */ BSTR aPattern);
-        
-        HRESULT ( STDMETHODCALLTYPE *DumpStats )( 
-            IMachineDebugger * This,
-            /* [in] */ BSTR aPattern);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetStats )( 
-            IMachineDebugger * This,
-            /* [in] */ BSTR aPattern,
-            /* [in] */ BOOL aWithDescriptions,
-            /* [out] */ BSTR *aStats);
-        
-        HRESULT ( STDMETHODCALLTYPE *InjectNMI )( 
-            IMachineDebugger * This);
-        
-        END_INTERFACE
-    } IMachineDebuggerVtbl;
-
-    interface IMachineDebugger
-    {
-        CONST_VTBL struct IMachineDebuggerVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IMachineDebugger_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IMachineDebugger_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IMachineDebugger_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IMachineDebugger_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IMachineDebugger_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IMachineDebugger_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IMachineDebugger_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IMachineDebugger_get_Singlestep(This,aSinglestep)	\
-    (This)->lpVtbl -> get_Singlestep(This,aSinglestep)
-
-#define IMachineDebugger_put_Singlestep(This,aSinglestep)	\
-    (This)->lpVtbl -> put_Singlestep(This,aSinglestep)
-
-#define IMachineDebugger_get_RecompileUser(This,aRecompileUser)	\
-    (This)->lpVtbl -> get_RecompileUser(This,aRecompileUser)
-
-#define IMachineDebugger_put_RecompileUser(This,aRecompileUser)	\
-    (This)->lpVtbl -> put_RecompileUser(This,aRecompileUser)
-
-#define IMachineDebugger_get_RecompileSupervisor(This,aRecompileSupervisor)	\
-    (This)->lpVtbl -> get_RecompileSupervisor(This,aRecompileSupervisor)
-
-#define IMachineDebugger_put_RecompileSupervisor(This,aRecompileSupervisor)	\
-    (This)->lpVtbl -> put_RecompileSupervisor(This,aRecompileSupervisor)
-
-#define IMachineDebugger_get_PATMEnabled(This,aPATMEnabled)	\
-    (This)->lpVtbl -> get_PATMEnabled(This,aPATMEnabled)
-
-#define IMachineDebugger_put_PATMEnabled(This,aPATMEnabled)	\
-    (This)->lpVtbl -> put_PATMEnabled(This,aPATMEnabled)
-
-#define IMachineDebugger_get_CSAMEnabled(This,aCSAMEnabled)	\
-    (This)->lpVtbl -> get_CSAMEnabled(This,aCSAMEnabled)
-
-#define IMachineDebugger_put_CSAMEnabled(This,aCSAMEnabled)	\
-    (This)->lpVtbl -> put_CSAMEnabled(This,aCSAMEnabled)
-
-#define IMachineDebugger_get_LogEnabled(This,aLogEnabled)	\
-    (This)->lpVtbl -> get_LogEnabled(This,aLogEnabled)
-
-#define IMachineDebugger_put_LogEnabled(This,aLogEnabled)	\
-    (This)->lpVtbl -> put_LogEnabled(This,aLogEnabled)
-
-#define IMachineDebugger_get_HWVirtExEnabled(This,aHWVirtExEnabled)	\
-    (This)->lpVtbl -> get_HWVirtExEnabled(This,aHWVirtExEnabled)
-
-#define IMachineDebugger_get_HWVirtExNestedPagingEnabled(This,aHWVirtExNestedPagingEnabled)	\
-    (This)->lpVtbl -> get_HWVirtExNestedPagingEnabled(This,aHWVirtExNestedPagingEnabled)
-
-#define IMachineDebugger_get_HWVirtExVPIDEnabled(This,aHWVirtExVPIDEnabled)	\
-    (This)->lpVtbl -> get_HWVirtExVPIDEnabled(This,aHWVirtExVPIDEnabled)
-
-#define IMachineDebugger_get_PAEEnabled(This,aPAEEnabled)	\
-    (This)->lpVtbl -> get_PAEEnabled(This,aPAEEnabled)
-
-#define IMachineDebugger_get_VirtualTimeRate(This,aVirtualTimeRate)	\
-    (This)->lpVtbl -> get_VirtualTimeRate(This,aVirtualTimeRate)
-
-#define IMachineDebugger_put_VirtualTimeRate(This,aVirtualTimeRate)	\
-    (This)->lpVtbl -> put_VirtualTimeRate(This,aVirtualTimeRate)
-
-#define IMachineDebugger_get_VM(This,aVM)	\
-    (This)->lpVtbl -> get_VM(This,aVM)
-
-#define IMachineDebugger_ResetStats(This,aPattern)	\
-    (This)->lpVtbl -> ResetStats(This,aPattern)
-
-#define IMachineDebugger_DumpStats(This,aPattern)	\
-    (This)->lpVtbl -> DumpStats(This,aPattern)
-
-#define IMachineDebugger_GetStats(This,aPattern,aWithDescriptions,aStats)	\
-    (This)->lpVtbl -> GetStats(This,aPattern,aWithDescriptions,aStats)
-
-#define IMachineDebugger_InjectNMI(This)	\
-    (This)->lpVtbl -> InjectNMI(This)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachineDebugger_get_Singlestep_Proxy( 
-    IMachineDebugger * This,
-    /* [retval][out] */ BOOL *aSinglestep);
-
-
-void __RPC_STUB IMachineDebugger_get_Singlestep_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachineDebugger_put_Singlestep_Proxy( 
-    IMachineDebugger * This,
-    /* [in] */ BOOL aSinglestep);
-
-
-void __RPC_STUB IMachineDebugger_put_Singlestep_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachineDebugger_get_RecompileUser_Proxy( 
-    IMachineDebugger * This,
-    /* [retval][out] */ BOOL *aRecompileUser);
-
-
-void __RPC_STUB IMachineDebugger_get_RecompileUser_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachineDebugger_put_RecompileUser_Proxy( 
-    IMachineDebugger * This,
-    /* [in] */ BOOL aRecompileUser);
-
-
-void __RPC_STUB IMachineDebugger_put_RecompileUser_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachineDebugger_get_RecompileSupervisor_Proxy( 
-    IMachineDebugger * This,
-    /* [retval][out] */ BOOL *aRecompileSupervisor);
-
-
-void __RPC_STUB IMachineDebugger_get_RecompileSupervisor_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachineDebugger_put_RecompileSupervisor_Proxy( 
-    IMachineDebugger * This,
-    /* [in] */ BOOL aRecompileSupervisor);
-
-
-void __RPC_STUB IMachineDebugger_put_RecompileSupervisor_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachineDebugger_get_PATMEnabled_Proxy( 
-    IMachineDebugger * This,
-    /* [retval][out] */ BOOL *aPATMEnabled);
-
-
-void __RPC_STUB IMachineDebugger_get_PATMEnabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachineDebugger_put_PATMEnabled_Proxy( 
-    IMachineDebugger * This,
-    /* [in] */ BOOL aPATMEnabled);
-
-
-void __RPC_STUB IMachineDebugger_put_PATMEnabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachineDebugger_get_CSAMEnabled_Proxy( 
-    IMachineDebugger * This,
-    /* [retval][out] */ BOOL *aCSAMEnabled);
-
-
-void __RPC_STUB IMachineDebugger_get_CSAMEnabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachineDebugger_put_CSAMEnabled_Proxy( 
-    IMachineDebugger * This,
-    /* [in] */ BOOL aCSAMEnabled);
-
-
-void __RPC_STUB IMachineDebugger_put_CSAMEnabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachineDebugger_get_LogEnabled_Proxy( 
-    IMachineDebugger * This,
-    /* [retval][out] */ BOOL *aLogEnabled);
-
-
-void __RPC_STUB IMachineDebugger_get_LogEnabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachineDebugger_put_LogEnabled_Proxy( 
-    IMachineDebugger * This,
-    /* [in] */ BOOL aLogEnabled);
-
-
-void __RPC_STUB IMachineDebugger_put_LogEnabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachineDebugger_get_HWVirtExEnabled_Proxy( 
-    IMachineDebugger * This,
-    /* [retval][out] */ BOOL *aHWVirtExEnabled);
-
-
-void __RPC_STUB IMachineDebugger_get_HWVirtExEnabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachineDebugger_get_HWVirtExNestedPagingEnabled_Proxy( 
-    IMachineDebugger * This,
-    /* [retval][out] */ BOOL *aHWVirtExNestedPagingEnabled);
-
-
-void __RPC_STUB IMachineDebugger_get_HWVirtExNestedPagingEnabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachineDebugger_get_HWVirtExVPIDEnabled_Proxy( 
-    IMachineDebugger * This,
-    /* [retval][out] */ BOOL *aHWVirtExVPIDEnabled);
-
-
-void __RPC_STUB IMachineDebugger_get_HWVirtExVPIDEnabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachineDebugger_get_PAEEnabled_Proxy( 
-    IMachineDebugger * This,
-    /* [retval][out] */ BOOL *aPAEEnabled);
-
-
-void __RPC_STUB IMachineDebugger_get_PAEEnabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachineDebugger_get_VirtualTimeRate_Proxy( 
-    IMachineDebugger * This,
-    /* [retval][out] */ ULONG *aVirtualTimeRate);
-
-
-void __RPC_STUB IMachineDebugger_get_VirtualTimeRate_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IMachineDebugger_put_VirtualTimeRate_Proxy( 
-    IMachineDebugger * This,
-    /* [in] */ ULONG aVirtualTimeRate);
-
-
-void __RPC_STUB IMachineDebugger_put_VirtualTimeRate_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IMachineDebugger_get_VM_Proxy( 
-    IMachineDebugger * This,
-    /* [retval][out] */ ULONG64 *aVM);
-
-
-void __RPC_STUB IMachineDebugger_get_VM_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachineDebugger_ResetStats_Proxy( 
-    IMachineDebugger * This,
-    /* [in] */ BSTR aPattern);
-
-
-void __RPC_STUB IMachineDebugger_ResetStats_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachineDebugger_DumpStats_Proxy( 
-    IMachineDebugger * This,
-    /* [in] */ BSTR aPattern);
-
-
-void __RPC_STUB IMachineDebugger_DumpStats_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachineDebugger_GetStats_Proxy( 
-    IMachineDebugger * This,
-    /* [in] */ BSTR aPattern,
-    /* [in] */ BOOL aWithDescriptions,
-    /* [out] */ BSTR *aStats);
-
-
-void __RPC_STUB IMachineDebugger_GetStats_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IMachineDebugger_InjectNMI_Proxy( 
-    IMachineDebugger * This);
-
-
-void __RPC_STUB IMachineDebugger_InjectNMI_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IMachineDebugger_INTERFACE_DEFINED__ */
-
-
-#ifndef __IUSBController_INTERFACE_DEFINED__
-#define __IUSBController_INTERFACE_DEFINED__
-
-/* interface IUSBController */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IUSBController;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("6fdcccc5-abd3-4fec-9387-2ad3914fc4a8")
-    IUSBController : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Enabled( 
-            /* [retval][out] */ BOOL *aEnabled) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_Enabled( 
-            /* [in] */ BOOL aEnabled) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_EnabledEhci( 
-            /* [retval][out] */ BOOL *aEnabledEhci) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_EnabledEhci( 
-            /* [in] */ BOOL aEnabledEhci) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_ProxyAvailable( 
-            /* [retval][out] */ BOOL *aProxyAvailable) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_USBStandard( 
-            /* [retval][out] */ USHORT *aUSBStandard) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_DeviceFilters( 
-            /* [retval][out] */ SAFEARRAY * *aDeviceFilters) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateDeviceFilter( 
-            /* [in] */ BSTR aName,
-            /* [retval][out] */ IUSBDeviceFilter **aFilter) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE InsertDeviceFilter( 
-            /* [in] */ ULONG aPosition,
-            /* [in] */ IUSBDeviceFilter *aFilter) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE RemoveDeviceFilter( 
-            /* [in] */ ULONG aPosition,
-            /* [retval][out] */ IUSBDeviceFilter **aFilter) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IUSBControllerVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IUSBController * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IUSBController * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IUSBController * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IUSBController * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IUSBController * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IUSBController * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IUSBController * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Enabled )( 
-            IUSBController * This,
-            /* [retval][out] */ BOOL *aEnabled);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Enabled )( 
-            IUSBController * This,
-            /* [in] */ BOOL aEnabled);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_EnabledEhci )( 
-            IUSBController * This,
-            /* [retval][out] */ BOOL *aEnabledEhci);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_EnabledEhci )( 
-            IUSBController * This,
-            /* [in] */ BOOL aEnabledEhci);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_ProxyAvailable )( 
-            IUSBController * This,
-            /* [retval][out] */ BOOL *aProxyAvailable);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_USBStandard )( 
-            IUSBController * This,
-            /* [retval][out] */ USHORT *aUSBStandard);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_DeviceFilters )( 
-            IUSBController * This,
-            /* [retval][out] */ SAFEARRAY * *aDeviceFilters);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateDeviceFilter )( 
-            IUSBController * This,
-            /* [in] */ BSTR aName,
-            /* [retval][out] */ IUSBDeviceFilter **aFilter);
-        
-        HRESULT ( STDMETHODCALLTYPE *InsertDeviceFilter )( 
-            IUSBController * This,
-            /* [in] */ ULONG aPosition,
-            /* [in] */ IUSBDeviceFilter *aFilter);
-        
-        HRESULT ( STDMETHODCALLTYPE *RemoveDeviceFilter )( 
-            IUSBController * This,
-            /* [in] */ ULONG aPosition,
-            /* [retval][out] */ IUSBDeviceFilter **aFilter);
-        
-        END_INTERFACE
-    } IUSBControllerVtbl;
-
-    interface IUSBController
-    {
-        CONST_VTBL struct IUSBControllerVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IUSBController_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IUSBController_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IUSBController_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IUSBController_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IUSBController_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IUSBController_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IUSBController_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IUSBController_get_Enabled(This,aEnabled)	\
-    (This)->lpVtbl -> get_Enabled(This,aEnabled)
-
-#define IUSBController_put_Enabled(This,aEnabled)	\
-    (This)->lpVtbl -> put_Enabled(This,aEnabled)
-
-#define IUSBController_get_EnabledEhci(This,aEnabledEhci)	\
-    (This)->lpVtbl -> get_EnabledEhci(This,aEnabledEhci)
-
-#define IUSBController_put_EnabledEhci(This,aEnabledEhci)	\
-    (This)->lpVtbl -> put_EnabledEhci(This,aEnabledEhci)
-
-#define IUSBController_get_ProxyAvailable(This,aProxyAvailable)	\
-    (This)->lpVtbl -> get_ProxyAvailable(This,aProxyAvailable)
-
-#define IUSBController_get_USBStandard(This,aUSBStandard)	\
-    (This)->lpVtbl -> get_USBStandard(This,aUSBStandard)
-
-#define IUSBController_get_DeviceFilters(This,aDeviceFilters)	\
-    (This)->lpVtbl -> get_DeviceFilters(This,aDeviceFilters)
-
-#define IUSBController_CreateDeviceFilter(This,aName,aFilter)	\
-    (This)->lpVtbl -> CreateDeviceFilter(This,aName,aFilter)
-
-#define IUSBController_InsertDeviceFilter(This,aPosition,aFilter)	\
-    (This)->lpVtbl -> InsertDeviceFilter(This,aPosition,aFilter)
-
-#define IUSBController_RemoveDeviceFilter(This,aPosition,aFilter)	\
-    (This)->lpVtbl -> RemoveDeviceFilter(This,aPosition,aFilter)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IUSBController_get_Enabled_Proxy( 
-    IUSBController * This,
-    /* [retval][out] */ BOOL *aEnabled);
-
-
-void __RPC_STUB IUSBController_get_Enabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IUSBController_put_Enabled_Proxy( 
-    IUSBController * This,
-    /* [in] */ BOOL aEnabled);
-
-
-void __RPC_STUB IUSBController_put_Enabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IUSBController_get_EnabledEhci_Proxy( 
-    IUSBController * This,
-    /* [retval][out] */ BOOL *aEnabledEhci);
-
-
-void __RPC_STUB IUSBController_get_EnabledEhci_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IUSBController_put_EnabledEhci_Proxy( 
-    IUSBController * This,
-    /* [in] */ BOOL aEnabledEhci);
-
-
-void __RPC_STUB IUSBController_put_EnabledEhci_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IUSBController_get_ProxyAvailable_Proxy( 
-    IUSBController * This,
-    /* [retval][out] */ BOOL *aProxyAvailable);
-
-
-void __RPC_STUB IUSBController_get_ProxyAvailable_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IUSBController_get_USBStandard_Proxy( 
-    IUSBController * This,
-    /* [retval][out] */ USHORT *aUSBStandard);
-
-
-void __RPC_STUB IUSBController_get_USBStandard_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IUSBController_get_DeviceFilters_Proxy( 
-    IUSBController * This,
-    /* [retval][out] */ SAFEARRAY * *aDeviceFilters);
-
-
-void __RPC_STUB IUSBController_get_DeviceFilters_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IUSBController_CreateDeviceFilter_Proxy( 
-    IUSBController * This,
-    /* [in] */ BSTR aName,
-    /* [retval][out] */ IUSBDeviceFilter **aFilter);
-
-
-void __RPC_STUB IUSBController_CreateDeviceFilter_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IUSBController_InsertDeviceFilter_Proxy( 
-    IUSBController * This,
-    /* [in] */ ULONG aPosition,
-    /* [in] */ IUSBDeviceFilter *aFilter);
-
-
-void __RPC_STUB IUSBController_InsertDeviceFilter_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IUSBController_RemoveDeviceFilter_Proxy( 
-    IUSBController * This,
-    /* [in] */ ULONG aPosition,
-    /* [retval][out] */ IUSBDeviceFilter **aFilter);
-
-
-void __RPC_STUB IUSBController_RemoveDeviceFilter_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IUSBController_INTERFACE_DEFINED__ */
-
-
-#ifndef __IUSBDevice_INTERFACE_DEFINED__
-#define __IUSBDevice_INTERFACE_DEFINED__
-
-/* interface IUSBDevice */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IUSBDevice;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("f8967b0b-4483-400f-92b5-8b675d98a85b")
-    IUSBDevice : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Id( 
-            /* [retval][out] */ BSTR *aId) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_VendorId( 
-            /* [retval][out] */ USHORT *aVendorId) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_ProductId( 
-            /* [retval][out] */ USHORT *aProductId) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Revision( 
-            /* [retval][out] */ USHORT *aRevision) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Manufacturer( 
-            /* [retval][out] */ BSTR *aManufacturer) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Product( 
-            /* [retval][out] */ BSTR *aProduct) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_SerialNumber( 
-            /* [retval][out] */ BSTR *aSerialNumber) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Address( 
-            /* [retval][out] */ BSTR *aAddress) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Port( 
-            /* [retval][out] */ USHORT *aPort) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Version( 
-            /* [retval][out] */ USHORT *aVersion) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_PortVersion( 
-            /* [retval][out] */ USHORT *aPortVersion) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Remote( 
-            /* [retval][out] */ BOOL *aRemote) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IUSBDeviceVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IUSBDevice * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IUSBDevice * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IUSBDevice * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IUSBDevice * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IUSBDevice * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IUSBDevice * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IUSBDevice * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Id )( 
-            IUSBDevice * This,
-            /* [retval][out] */ BSTR *aId);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_VendorId )( 
-            IUSBDevice * This,
-            /* [retval][out] */ USHORT *aVendorId);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_ProductId )( 
-            IUSBDevice * This,
-            /* [retval][out] */ USHORT *aProductId);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Revision )( 
-            IUSBDevice * This,
-            /* [retval][out] */ USHORT *aRevision);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Manufacturer )( 
-            IUSBDevice * This,
-            /* [retval][out] */ BSTR *aManufacturer);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Product )( 
-            IUSBDevice * This,
-            /* [retval][out] */ BSTR *aProduct);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_SerialNumber )( 
-            IUSBDevice * This,
-            /* [retval][out] */ BSTR *aSerialNumber);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Address )( 
-            IUSBDevice * This,
-            /* [retval][out] */ BSTR *aAddress);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Port )( 
-            IUSBDevice * This,
-            /* [retval][out] */ USHORT *aPort);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Version )( 
-            IUSBDevice * This,
-            /* [retval][out] */ USHORT *aVersion);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_PortVersion )( 
-            IUSBDevice * This,
-            /* [retval][out] */ USHORT *aPortVersion);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Remote )( 
-            IUSBDevice * This,
-            /* [retval][out] */ BOOL *aRemote);
-        
-        END_INTERFACE
-    } IUSBDeviceVtbl;
-
-    interface IUSBDevice
-    {
-        CONST_VTBL struct IUSBDeviceVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IUSBDevice_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IUSBDevice_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IUSBDevice_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IUSBDevice_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IUSBDevice_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IUSBDevice_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IUSBDevice_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IUSBDevice_get_Id(This,aId)	\
-    (This)->lpVtbl -> get_Id(This,aId)
-
-#define IUSBDevice_get_VendorId(This,aVendorId)	\
-    (This)->lpVtbl -> get_VendorId(This,aVendorId)
-
-#define IUSBDevice_get_ProductId(This,aProductId)	\
-    (This)->lpVtbl -> get_ProductId(This,aProductId)
-
-#define IUSBDevice_get_Revision(This,aRevision)	\
-    (This)->lpVtbl -> get_Revision(This,aRevision)
-
-#define IUSBDevice_get_Manufacturer(This,aManufacturer)	\
-    (This)->lpVtbl -> get_Manufacturer(This,aManufacturer)
-
-#define IUSBDevice_get_Product(This,aProduct)	\
-    (This)->lpVtbl -> get_Product(This,aProduct)
-
-#define IUSBDevice_get_SerialNumber(This,aSerialNumber)	\
-    (This)->lpVtbl -> get_SerialNumber(This,aSerialNumber)
-
-#define IUSBDevice_get_Address(This,aAddress)	\
-    (This)->lpVtbl -> get_Address(This,aAddress)
-
-#define IUSBDevice_get_Port(This,aPort)	\
-    (This)->lpVtbl -> get_Port(This,aPort)
-
-#define IUSBDevice_get_Version(This,aVersion)	\
-    (This)->lpVtbl -> get_Version(This,aVersion)
-
-#define IUSBDevice_get_PortVersion(This,aPortVersion)	\
-    (This)->lpVtbl -> get_PortVersion(This,aPortVersion)
-
-#define IUSBDevice_get_Remote(This,aRemote)	\
-    (This)->lpVtbl -> get_Remote(This,aRemote)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IUSBDevice_get_Id_Proxy( 
-    IUSBDevice * This,
-    /* [retval][out] */ BSTR *aId);
-
-
-void __RPC_STUB IUSBDevice_get_Id_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IUSBDevice_get_VendorId_Proxy( 
-    IUSBDevice * This,
-    /* [retval][out] */ USHORT *aVendorId);
-
-
-void __RPC_STUB IUSBDevice_get_VendorId_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IUSBDevice_get_ProductId_Proxy( 
-    IUSBDevice * This,
-    /* [retval][out] */ USHORT *aProductId);
-
-
-void __RPC_STUB IUSBDevice_get_ProductId_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IUSBDevice_get_Revision_Proxy( 
-    IUSBDevice * This,
-    /* [retval][out] */ USHORT *aRevision);
-
-
-void __RPC_STUB IUSBDevice_get_Revision_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IUSBDevice_get_Manufacturer_Proxy( 
-    IUSBDevice * This,
-    /* [retval][out] */ BSTR *aManufacturer);
-
-
-void __RPC_STUB IUSBDevice_get_Manufacturer_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IUSBDevice_get_Product_Proxy( 
-    IUSBDevice * This,
-    /* [retval][out] */ BSTR *aProduct);
-
-
-void __RPC_STUB IUSBDevice_get_Product_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IUSBDevice_get_SerialNumber_Proxy( 
-    IUSBDevice * This,
-    /* [retval][out] */ BSTR *aSerialNumber);
-
-
-void __RPC_STUB IUSBDevice_get_SerialNumber_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IUSBDevice_get_Address_Proxy( 
-    IUSBDevice * This,
-    /* [retval][out] */ BSTR *aAddress);
-
-
-void __RPC_STUB IUSBDevice_get_Address_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IUSBDevice_get_Port_Proxy( 
-    IUSBDevice * This,
-    /* [retval][out] */ USHORT *aPort);
-
-
-void __RPC_STUB IUSBDevice_get_Port_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IUSBDevice_get_Version_Proxy( 
-    IUSBDevice * This,
-    /* [retval][out] */ USHORT *aVersion);
-
-
-void __RPC_STUB IUSBDevice_get_Version_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IUSBDevice_get_PortVersion_Proxy( 
-    IUSBDevice * This,
-    /* [retval][out] */ USHORT *aPortVersion);
-
-
-void __RPC_STUB IUSBDevice_get_PortVersion_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IUSBDevice_get_Remote_Proxy( 
-    IUSBDevice * This,
-    /* [retval][out] */ BOOL *aRemote);
-
-
-void __RPC_STUB IUSBDevice_get_Remote_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IUSBDevice_INTERFACE_DEFINED__ */
-
-
-#ifndef __IUSBDeviceFilter_INTERFACE_DEFINED__
-#define __IUSBDeviceFilter_INTERFACE_DEFINED__
-
-/* interface IUSBDeviceFilter */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IUSBDeviceFilter;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("d6831fb4-1a94-4c2c-96ef-8d0d6192066d")
-    IUSBDeviceFilter : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Name( 
-            /* [retval][out] */ BSTR *aName) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_Name( 
-            /* [in] */ BSTR aName) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Active( 
-            /* [retval][out] */ BOOL *aActive) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_Active( 
-            /* [in] */ BOOL aActive) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_VendorId( 
-            /* [retval][out] */ BSTR *aVendorId) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_VendorId( 
-            /* [in] */ BSTR aVendorId) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_ProductId( 
-            /* [retval][out] */ BSTR *aProductId) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_ProductId( 
-            /* [in] */ BSTR aProductId) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Revision( 
-            /* [retval][out] */ BSTR *aRevision) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_Revision( 
-            /* [in] */ BSTR aRevision) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Manufacturer( 
-            /* [retval][out] */ BSTR *aManufacturer) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_Manufacturer( 
-            /* [in] */ BSTR aManufacturer) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Product( 
-            /* [retval][out] */ BSTR *aProduct) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_Product( 
-            /* [in] */ BSTR aProduct) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_SerialNumber( 
-            /* [retval][out] */ BSTR *aSerialNumber) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_SerialNumber( 
-            /* [in] */ BSTR aSerialNumber) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Port( 
-            /* [retval][out] */ BSTR *aPort) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_Port( 
-            /* [in] */ BSTR aPort) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Remote( 
-            /* [retval][out] */ BSTR *aRemote) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_Remote( 
-            /* [in] */ BSTR aRemote) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_MaskedInterfaces( 
-            /* [retval][out] */ ULONG *aMaskedInterfaces) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_MaskedInterfaces( 
-            /* [in] */ ULONG aMaskedInterfaces) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IUSBDeviceFilterVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IUSBDeviceFilter * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IUSBDeviceFilter * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IUSBDeviceFilter * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IUSBDeviceFilter * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IUSBDeviceFilter * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IUSBDeviceFilter * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IUSBDeviceFilter * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Name )( 
-            IUSBDeviceFilter * This,
-            /* [retval][out] */ BSTR *aName);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Name )( 
-            IUSBDeviceFilter * This,
-            /* [in] */ BSTR aName);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Active )( 
-            IUSBDeviceFilter * This,
-            /* [retval][out] */ BOOL *aActive);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Active )( 
-            IUSBDeviceFilter * This,
-            /* [in] */ BOOL aActive);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_VendorId )( 
-            IUSBDeviceFilter * This,
-            /* [retval][out] */ BSTR *aVendorId);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_VendorId )( 
-            IUSBDeviceFilter * This,
-            /* [in] */ BSTR aVendorId);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_ProductId )( 
-            IUSBDeviceFilter * This,
-            /* [retval][out] */ BSTR *aProductId);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_ProductId )( 
-            IUSBDeviceFilter * This,
-            /* [in] */ BSTR aProductId);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Revision )( 
-            IUSBDeviceFilter * This,
-            /* [retval][out] */ BSTR *aRevision);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Revision )( 
-            IUSBDeviceFilter * This,
-            /* [in] */ BSTR aRevision);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Manufacturer )( 
-            IUSBDeviceFilter * This,
-            /* [retval][out] */ BSTR *aManufacturer);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Manufacturer )( 
-            IUSBDeviceFilter * This,
-            /* [in] */ BSTR aManufacturer);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Product )( 
-            IUSBDeviceFilter * This,
-            /* [retval][out] */ BSTR *aProduct);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Product )( 
-            IUSBDeviceFilter * This,
-            /* [in] */ BSTR aProduct);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_SerialNumber )( 
-            IUSBDeviceFilter * This,
-            /* [retval][out] */ BSTR *aSerialNumber);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_SerialNumber )( 
-            IUSBDeviceFilter * This,
-            /* [in] */ BSTR aSerialNumber);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Port )( 
-            IUSBDeviceFilter * This,
-            /* [retval][out] */ BSTR *aPort);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Port )( 
-            IUSBDeviceFilter * This,
-            /* [in] */ BSTR aPort);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Remote )( 
-            IUSBDeviceFilter * This,
-            /* [retval][out] */ BSTR *aRemote);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Remote )( 
-            IUSBDeviceFilter * This,
-            /* [in] */ BSTR aRemote);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_MaskedInterfaces )( 
-            IUSBDeviceFilter * This,
-            /* [retval][out] */ ULONG *aMaskedInterfaces);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_MaskedInterfaces )( 
-            IUSBDeviceFilter * This,
-            /* [in] */ ULONG aMaskedInterfaces);
-        
-        END_INTERFACE
-    } IUSBDeviceFilterVtbl;
-
-    interface IUSBDeviceFilter
-    {
-        CONST_VTBL struct IUSBDeviceFilterVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IUSBDeviceFilter_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IUSBDeviceFilter_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IUSBDeviceFilter_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IUSBDeviceFilter_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IUSBDeviceFilter_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IUSBDeviceFilter_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IUSBDeviceFilter_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IUSBDeviceFilter_get_Name(This,aName)	\
-    (This)->lpVtbl -> get_Name(This,aName)
-
-#define IUSBDeviceFilter_put_Name(This,aName)	\
-    (This)->lpVtbl -> put_Name(This,aName)
-
-#define IUSBDeviceFilter_get_Active(This,aActive)	\
-    (This)->lpVtbl -> get_Active(This,aActive)
-
-#define IUSBDeviceFilter_put_Active(This,aActive)	\
-    (This)->lpVtbl -> put_Active(This,aActive)
-
-#define IUSBDeviceFilter_get_VendorId(This,aVendorId)	\
-    (This)->lpVtbl -> get_VendorId(This,aVendorId)
-
-#define IUSBDeviceFilter_put_VendorId(This,aVendorId)	\
-    (This)->lpVtbl -> put_VendorId(This,aVendorId)
-
-#define IUSBDeviceFilter_get_ProductId(This,aProductId)	\
-    (This)->lpVtbl -> get_ProductId(This,aProductId)
-
-#define IUSBDeviceFilter_put_ProductId(This,aProductId)	\
-    (This)->lpVtbl -> put_ProductId(This,aProductId)
-
-#define IUSBDeviceFilter_get_Revision(This,aRevision)	\
-    (This)->lpVtbl -> get_Revision(This,aRevision)
-
-#define IUSBDeviceFilter_put_Revision(This,aRevision)	\
-    (This)->lpVtbl -> put_Revision(This,aRevision)
-
-#define IUSBDeviceFilter_get_Manufacturer(This,aManufacturer)	\
-    (This)->lpVtbl -> get_Manufacturer(This,aManufacturer)
-
-#define IUSBDeviceFilter_put_Manufacturer(This,aManufacturer)	\
-    (This)->lpVtbl -> put_Manufacturer(This,aManufacturer)
-
-#define IUSBDeviceFilter_get_Product(This,aProduct)	\
-    (This)->lpVtbl -> get_Product(This,aProduct)
-
-#define IUSBDeviceFilter_put_Product(This,aProduct)	\
-    (This)->lpVtbl -> put_Product(This,aProduct)
-
-#define IUSBDeviceFilter_get_SerialNumber(This,aSerialNumber)	\
-    (This)->lpVtbl -> get_SerialNumber(This,aSerialNumber)
-
-#define IUSBDeviceFilter_put_SerialNumber(This,aSerialNumber)	\
-    (This)->lpVtbl -> put_SerialNumber(This,aSerialNumber)
-
-#define IUSBDeviceFilter_get_Port(This,aPort)	\
-    (This)->lpVtbl -> get_Port(This,aPort)
-
-#define IUSBDeviceFilter_put_Port(This,aPort)	\
-    (This)->lpVtbl -> put_Port(This,aPort)
-
-#define IUSBDeviceFilter_get_Remote(This,aRemote)	\
-    (This)->lpVtbl -> get_Remote(This,aRemote)
-
-#define IUSBDeviceFilter_put_Remote(This,aRemote)	\
-    (This)->lpVtbl -> put_Remote(This,aRemote)
-
-#define IUSBDeviceFilter_get_MaskedInterfaces(This,aMaskedInterfaces)	\
-    (This)->lpVtbl -> get_MaskedInterfaces(This,aMaskedInterfaces)
-
-#define IUSBDeviceFilter_put_MaskedInterfaces(This,aMaskedInterfaces)	\
-    (This)->lpVtbl -> put_MaskedInterfaces(This,aMaskedInterfaces)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IUSBDeviceFilter_get_Name_Proxy( 
-    IUSBDeviceFilter * This,
-    /* [retval][out] */ BSTR *aName);
-
-
-void __RPC_STUB IUSBDeviceFilter_get_Name_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IUSBDeviceFilter_put_Name_Proxy( 
-    IUSBDeviceFilter * This,
-    /* [in] */ BSTR aName);
-
-
-void __RPC_STUB IUSBDeviceFilter_put_Name_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IUSBDeviceFilter_get_Active_Proxy( 
-    IUSBDeviceFilter * This,
-    /* [retval][out] */ BOOL *aActive);
-
-
-void __RPC_STUB IUSBDeviceFilter_get_Active_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IUSBDeviceFilter_put_Active_Proxy( 
-    IUSBDeviceFilter * This,
-    /* [in] */ BOOL aActive);
-
-
-void __RPC_STUB IUSBDeviceFilter_put_Active_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IUSBDeviceFilter_get_VendorId_Proxy( 
-    IUSBDeviceFilter * This,
-    /* [retval][out] */ BSTR *aVendorId);
-
-
-void __RPC_STUB IUSBDeviceFilter_get_VendorId_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IUSBDeviceFilter_put_VendorId_Proxy( 
-    IUSBDeviceFilter * This,
-    /* [in] */ BSTR aVendorId);
-
-
-void __RPC_STUB IUSBDeviceFilter_put_VendorId_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IUSBDeviceFilter_get_ProductId_Proxy( 
-    IUSBDeviceFilter * This,
-    /* [retval][out] */ BSTR *aProductId);
-
-
-void __RPC_STUB IUSBDeviceFilter_get_ProductId_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IUSBDeviceFilter_put_ProductId_Proxy( 
-    IUSBDeviceFilter * This,
-    /* [in] */ BSTR aProductId);
-
-
-void __RPC_STUB IUSBDeviceFilter_put_ProductId_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IUSBDeviceFilter_get_Revision_Proxy( 
-    IUSBDeviceFilter * This,
-    /* [retval][out] */ BSTR *aRevision);
-
-
-void __RPC_STUB IUSBDeviceFilter_get_Revision_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IUSBDeviceFilter_put_Revision_Proxy( 
-    IUSBDeviceFilter * This,
-    /* [in] */ BSTR aRevision);
-
-
-void __RPC_STUB IUSBDeviceFilter_put_Revision_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IUSBDeviceFilter_get_Manufacturer_Proxy( 
-    IUSBDeviceFilter * This,
-    /* [retval][out] */ BSTR *aManufacturer);
-
-
-void __RPC_STUB IUSBDeviceFilter_get_Manufacturer_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IUSBDeviceFilter_put_Manufacturer_Proxy( 
-    IUSBDeviceFilter * This,
-    /* [in] */ BSTR aManufacturer);
-
-
-void __RPC_STUB IUSBDeviceFilter_put_Manufacturer_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IUSBDeviceFilter_get_Product_Proxy( 
-    IUSBDeviceFilter * This,
-    /* [retval][out] */ BSTR *aProduct);
-
-
-void __RPC_STUB IUSBDeviceFilter_get_Product_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IUSBDeviceFilter_put_Product_Proxy( 
-    IUSBDeviceFilter * This,
-    /* [in] */ BSTR aProduct);
-
-
-void __RPC_STUB IUSBDeviceFilter_put_Product_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IUSBDeviceFilter_get_SerialNumber_Proxy( 
-    IUSBDeviceFilter * This,
-    /* [retval][out] */ BSTR *aSerialNumber);
-
-
-void __RPC_STUB IUSBDeviceFilter_get_SerialNumber_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IUSBDeviceFilter_put_SerialNumber_Proxy( 
-    IUSBDeviceFilter * This,
-    /* [in] */ BSTR aSerialNumber);
-
-
-void __RPC_STUB IUSBDeviceFilter_put_SerialNumber_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IUSBDeviceFilter_get_Port_Proxy( 
-    IUSBDeviceFilter * This,
-    /* [retval][out] */ BSTR *aPort);
-
-
-void __RPC_STUB IUSBDeviceFilter_get_Port_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IUSBDeviceFilter_put_Port_Proxy( 
-    IUSBDeviceFilter * This,
-    /* [in] */ BSTR aPort);
-
-
-void __RPC_STUB IUSBDeviceFilter_put_Port_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IUSBDeviceFilter_get_Remote_Proxy( 
-    IUSBDeviceFilter * This,
-    /* [retval][out] */ BSTR *aRemote);
-
-
-void __RPC_STUB IUSBDeviceFilter_get_Remote_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IUSBDeviceFilter_put_Remote_Proxy( 
-    IUSBDeviceFilter * This,
-    /* [in] */ BSTR aRemote);
-
-
-void __RPC_STUB IUSBDeviceFilter_put_Remote_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IUSBDeviceFilter_get_MaskedInterfaces_Proxy( 
-    IUSBDeviceFilter * This,
-    /* [retval][out] */ ULONG *aMaskedInterfaces);
-
-
-void __RPC_STUB IUSBDeviceFilter_get_MaskedInterfaces_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IUSBDeviceFilter_put_MaskedInterfaces_Proxy( 
-    IUSBDeviceFilter * This,
-    /* [in] */ ULONG aMaskedInterfaces);
-
-
-void __RPC_STUB IUSBDeviceFilter_put_MaskedInterfaces_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IUSBDeviceFilter_INTERFACE_DEFINED__ */
-
-
-#ifndef __IHostUSBDevice_INTERFACE_DEFINED__
-#define __IHostUSBDevice_INTERFACE_DEFINED__
-
-/* interface IHostUSBDevice */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IHostUSBDevice;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("173b4b44-d268-4334-a00d-b6521c9a740a")
-    IHostUSBDevice : public IUSBDevice
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_State( 
-            /* [retval][out] */ USBDeviceState *aState) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IHostUSBDeviceVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IHostUSBDevice * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IHostUSBDevice * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IHostUSBDevice * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IHostUSBDevice * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IHostUSBDevice * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IHostUSBDevice * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IHostUSBDevice * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Id )( 
-            IHostUSBDevice * This,
-            /* [retval][out] */ BSTR *aId);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_VendorId )( 
-            IHostUSBDevice * This,
-            /* [retval][out] */ USHORT *aVendorId);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_ProductId )( 
-            IHostUSBDevice * This,
-            /* [retval][out] */ USHORT *aProductId);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Revision )( 
-            IHostUSBDevice * This,
-            /* [retval][out] */ USHORT *aRevision);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Manufacturer )( 
-            IHostUSBDevice * This,
-            /* [retval][out] */ BSTR *aManufacturer);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Product )( 
-            IHostUSBDevice * This,
-            /* [retval][out] */ BSTR *aProduct);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_SerialNumber )( 
-            IHostUSBDevice * This,
-            /* [retval][out] */ BSTR *aSerialNumber);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Address )( 
-            IHostUSBDevice * This,
-            /* [retval][out] */ BSTR *aAddress);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Port )( 
-            IHostUSBDevice * This,
-            /* [retval][out] */ USHORT *aPort);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Version )( 
-            IHostUSBDevice * This,
-            /* [retval][out] */ USHORT *aVersion);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_PortVersion )( 
-            IHostUSBDevice * This,
-            /* [retval][out] */ USHORT *aPortVersion);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Remote )( 
-            IHostUSBDevice * This,
-            /* [retval][out] */ BOOL *aRemote);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_State )( 
-            IHostUSBDevice * This,
-            /* [retval][out] */ USBDeviceState *aState);
-        
-        END_INTERFACE
-    } IHostUSBDeviceVtbl;
-
-    interface IHostUSBDevice
-    {
-        CONST_VTBL struct IHostUSBDeviceVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IHostUSBDevice_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IHostUSBDevice_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IHostUSBDevice_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IHostUSBDevice_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IHostUSBDevice_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IHostUSBDevice_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IHostUSBDevice_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IHostUSBDevice_get_Id(This,aId)	\
-    (This)->lpVtbl -> get_Id(This,aId)
-
-#define IHostUSBDevice_get_VendorId(This,aVendorId)	\
-    (This)->lpVtbl -> get_VendorId(This,aVendorId)
-
-#define IHostUSBDevice_get_ProductId(This,aProductId)	\
-    (This)->lpVtbl -> get_ProductId(This,aProductId)
-
-#define IHostUSBDevice_get_Revision(This,aRevision)	\
-    (This)->lpVtbl -> get_Revision(This,aRevision)
-
-#define IHostUSBDevice_get_Manufacturer(This,aManufacturer)	\
-    (This)->lpVtbl -> get_Manufacturer(This,aManufacturer)
-
-#define IHostUSBDevice_get_Product(This,aProduct)	\
-    (This)->lpVtbl -> get_Product(This,aProduct)
-
-#define IHostUSBDevice_get_SerialNumber(This,aSerialNumber)	\
-    (This)->lpVtbl -> get_SerialNumber(This,aSerialNumber)
-
-#define IHostUSBDevice_get_Address(This,aAddress)	\
-    (This)->lpVtbl -> get_Address(This,aAddress)
-
-#define IHostUSBDevice_get_Port(This,aPort)	\
-    (This)->lpVtbl -> get_Port(This,aPort)
-
-#define IHostUSBDevice_get_Version(This,aVersion)	\
-    (This)->lpVtbl -> get_Version(This,aVersion)
-
-#define IHostUSBDevice_get_PortVersion(This,aPortVersion)	\
-    (This)->lpVtbl -> get_PortVersion(This,aPortVersion)
-
-#define IHostUSBDevice_get_Remote(This,aRemote)	\
-    (This)->lpVtbl -> get_Remote(This,aRemote)
-
-
-#define IHostUSBDevice_get_State(This,aState)	\
-    (This)->lpVtbl -> get_State(This,aState)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IHostUSBDevice_get_State_Proxy( 
-    IHostUSBDevice * This,
-    /* [retval][out] */ USBDeviceState *aState);
-
-
-void __RPC_STUB IHostUSBDevice_get_State_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IHostUSBDevice_INTERFACE_DEFINED__ */
-
-
-#ifndef __IHostUSBDeviceFilter_INTERFACE_DEFINED__
-#define __IHostUSBDeviceFilter_INTERFACE_DEFINED__
-
-/* interface IHostUSBDeviceFilter */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IHostUSBDeviceFilter;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("4cc70246-d74a-400f-8222-3900489c0374")
-    IHostUSBDeviceFilter : public IUSBDeviceFilter
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Action( 
-            /* [retval][out] */ USBDeviceFilterAction *aAction) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_Action( 
-            /* [in] */ USBDeviceFilterAction aAction) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IHostUSBDeviceFilterVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IHostUSBDeviceFilter * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IHostUSBDeviceFilter * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IHostUSBDeviceFilter * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IHostUSBDeviceFilter * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IHostUSBDeviceFilter * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IHostUSBDeviceFilter * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IHostUSBDeviceFilter * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Name )( 
-            IHostUSBDeviceFilter * This,
-            /* [retval][out] */ BSTR *aName);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Name )( 
-            IHostUSBDeviceFilter * This,
-            /* [in] */ BSTR aName);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Active )( 
-            IHostUSBDeviceFilter * This,
-            /* [retval][out] */ BOOL *aActive);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Active )( 
-            IHostUSBDeviceFilter * This,
-            /* [in] */ BOOL aActive);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_VendorId )( 
-            IHostUSBDeviceFilter * This,
-            /* [retval][out] */ BSTR *aVendorId);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_VendorId )( 
-            IHostUSBDeviceFilter * This,
-            /* [in] */ BSTR aVendorId);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_ProductId )( 
-            IHostUSBDeviceFilter * This,
-            /* [retval][out] */ BSTR *aProductId);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_ProductId )( 
-            IHostUSBDeviceFilter * This,
-            /* [in] */ BSTR aProductId);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Revision )( 
-            IHostUSBDeviceFilter * This,
-            /* [retval][out] */ BSTR *aRevision);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Revision )( 
-            IHostUSBDeviceFilter * This,
-            /* [in] */ BSTR aRevision);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Manufacturer )( 
-            IHostUSBDeviceFilter * This,
-            /* [retval][out] */ BSTR *aManufacturer);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Manufacturer )( 
-            IHostUSBDeviceFilter * This,
-            /* [in] */ BSTR aManufacturer);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Product )( 
-            IHostUSBDeviceFilter * This,
-            /* [retval][out] */ BSTR *aProduct);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Product )( 
-            IHostUSBDeviceFilter * This,
-            /* [in] */ BSTR aProduct);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_SerialNumber )( 
-            IHostUSBDeviceFilter * This,
-            /* [retval][out] */ BSTR *aSerialNumber);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_SerialNumber )( 
-            IHostUSBDeviceFilter * This,
-            /* [in] */ BSTR aSerialNumber);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Port )( 
-            IHostUSBDeviceFilter * This,
-            /* [retval][out] */ BSTR *aPort);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Port )( 
-            IHostUSBDeviceFilter * This,
-            /* [in] */ BSTR aPort);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Remote )( 
-            IHostUSBDeviceFilter * This,
-            /* [retval][out] */ BSTR *aRemote);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Remote )( 
-            IHostUSBDeviceFilter * This,
-            /* [in] */ BSTR aRemote);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_MaskedInterfaces )( 
-            IHostUSBDeviceFilter * This,
-            /* [retval][out] */ ULONG *aMaskedInterfaces);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_MaskedInterfaces )( 
-            IHostUSBDeviceFilter * This,
-            /* [in] */ ULONG aMaskedInterfaces);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Action )( 
-            IHostUSBDeviceFilter * This,
-            /* [retval][out] */ USBDeviceFilterAction *aAction);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Action )( 
-            IHostUSBDeviceFilter * This,
-            /* [in] */ USBDeviceFilterAction aAction);
-        
-        END_INTERFACE
-    } IHostUSBDeviceFilterVtbl;
-
-    interface IHostUSBDeviceFilter
-    {
-        CONST_VTBL struct IHostUSBDeviceFilterVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IHostUSBDeviceFilter_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IHostUSBDeviceFilter_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IHostUSBDeviceFilter_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IHostUSBDeviceFilter_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IHostUSBDeviceFilter_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IHostUSBDeviceFilter_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IHostUSBDeviceFilter_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IHostUSBDeviceFilter_get_Name(This,aName)	\
-    (This)->lpVtbl -> get_Name(This,aName)
-
-#define IHostUSBDeviceFilter_put_Name(This,aName)	\
-    (This)->lpVtbl -> put_Name(This,aName)
-
-#define IHostUSBDeviceFilter_get_Active(This,aActive)	\
-    (This)->lpVtbl -> get_Active(This,aActive)
-
-#define IHostUSBDeviceFilter_put_Active(This,aActive)	\
-    (This)->lpVtbl -> put_Active(This,aActive)
-
-#define IHostUSBDeviceFilter_get_VendorId(This,aVendorId)	\
-    (This)->lpVtbl -> get_VendorId(This,aVendorId)
-
-#define IHostUSBDeviceFilter_put_VendorId(This,aVendorId)	\
-    (This)->lpVtbl -> put_VendorId(This,aVendorId)
-
-#define IHostUSBDeviceFilter_get_ProductId(This,aProductId)	\
-    (This)->lpVtbl -> get_ProductId(This,aProductId)
-
-#define IHostUSBDeviceFilter_put_ProductId(This,aProductId)	\
-    (This)->lpVtbl -> put_ProductId(This,aProductId)
-
-#define IHostUSBDeviceFilter_get_Revision(This,aRevision)	\
-    (This)->lpVtbl -> get_Revision(This,aRevision)
-
-#define IHostUSBDeviceFilter_put_Revision(This,aRevision)	\
-    (This)->lpVtbl -> put_Revision(This,aRevision)
-
-#define IHostUSBDeviceFilter_get_Manufacturer(This,aManufacturer)	\
-    (This)->lpVtbl -> get_Manufacturer(This,aManufacturer)
-
-#define IHostUSBDeviceFilter_put_Manufacturer(This,aManufacturer)	\
-    (This)->lpVtbl -> put_Manufacturer(This,aManufacturer)
-
-#define IHostUSBDeviceFilter_get_Product(This,aProduct)	\
-    (This)->lpVtbl -> get_Product(This,aProduct)
-
-#define IHostUSBDeviceFilter_put_Product(This,aProduct)	\
-    (This)->lpVtbl -> put_Product(This,aProduct)
-
-#define IHostUSBDeviceFilter_get_SerialNumber(This,aSerialNumber)	\
-    (This)->lpVtbl -> get_SerialNumber(This,aSerialNumber)
-
-#define IHostUSBDeviceFilter_put_SerialNumber(This,aSerialNumber)	\
-    (This)->lpVtbl -> put_SerialNumber(This,aSerialNumber)
-
-#define IHostUSBDeviceFilter_get_Port(This,aPort)	\
-    (This)->lpVtbl -> get_Port(This,aPort)
-
-#define IHostUSBDeviceFilter_put_Port(This,aPort)	\
-    (This)->lpVtbl -> put_Port(This,aPort)
-
-#define IHostUSBDeviceFilter_get_Remote(This,aRemote)	\
-    (This)->lpVtbl -> get_Remote(This,aRemote)
-
-#define IHostUSBDeviceFilter_put_Remote(This,aRemote)	\
-    (This)->lpVtbl -> put_Remote(This,aRemote)
-
-#define IHostUSBDeviceFilter_get_MaskedInterfaces(This,aMaskedInterfaces)	\
-    (This)->lpVtbl -> get_MaskedInterfaces(This,aMaskedInterfaces)
-
-#define IHostUSBDeviceFilter_put_MaskedInterfaces(This,aMaskedInterfaces)	\
-    (This)->lpVtbl -> put_MaskedInterfaces(This,aMaskedInterfaces)
-
-
-#define IHostUSBDeviceFilter_get_Action(This,aAction)	\
-    (This)->lpVtbl -> get_Action(This,aAction)
-
-#define IHostUSBDeviceFilter_put_Action(This,aAction)	\
-    (This)->lpVtbl -> put_Action(This,aAction)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IHostUSBDeviceFilter_get_Action_Proxy( 
-    IHostUSBDeviceFilter * This,
-    /* [retval][out] */ USBDeviceFilterAction *aAction);
-
-
-void __RPC_STUB IHostUSBDeviceFilter_get_Action_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IHostUSBDeviceFilter_put_Action_Proxy( 
-    IHostUSBDeviceFilter * This,
-    /* [in] */ USBDeviceFilterAction aAction);
-
-
-void __RPC_STUB IHostUSBDeviceFilter_put_Action_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IHostUSBDeviceFilter_INTERFACE_DEFINED__ */
-
-
-#ifndef __IAudioAdapter_INTERFACE_DEFINED__
-#define __IAudioAdapter_INTERFACE_DEFINED__
-
-/* interface IAudioAdapter */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IAudioAdapter;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("921873db-5f3f-4b69-91f9-7be9e535a2cb")
-    IAudioAdapter : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Enabled( 
-            /* [retval][out] */ BOOL *aEnabled) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_Enabled( 
-            /* [in] */ BOOL aEnabled) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_AudioController( 
-            /* [retval][out] */ AudioControllerType *aAudioController) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_AudioController( 
-            /* [in] */ AudioControllerType aAudioController) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_AudioDriver( 
-            /* [retval][out] */ AudioDriverType *aAudioDriver) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_AudioDriver( 
-            /* [in] */ AudioDriverType aAudioDriver) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IAudioAdapterVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IAudioAdapter * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IAudioAdapter * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IAudioAdapter * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IAudioAdapter * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IAudioAdapter * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IAudioAdapter * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IAudioAdapter * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Enabled )( 
-            IAudioAdapter * This,
-            /* [retval][out] */ BOOL *aEnabled);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Enabled )( 
-            IAudioAdapter * This,
-            /* [in] */ BOOL aEnabled);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_AudioController )( 
-            IAudioAdapter * This,
-            /* [retval][out] */ AudioControllerType *aAudioController);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_AudioController )( 
-            IAudioAdapter * This,
-            /* [in] */ AudioControllerType aAudioController);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_AudioDriver )( 
-            IAudioAdapter * This,
-            /* [retval][out] */ AudioDriverType *aAudioDriver);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_AudioDriver )( 
-            IAudioAdapter * This,
-            /* [in] */ AudioDriverType aAudioDriver);
-        
-        END_INTERFACE
-    } IAudioAdapterVtbl;
-
-    interface IAudioAdapter
-    {
-        CONST_VTBL struct IAudioAdapterVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IAudioAdapter_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IAudioAdapter_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IAudioAdapter_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IAudioAdapter_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IAudioAdapter_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IAudioAdapter_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IAudioAdapter_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IAudioAdapter_get_Enabled(This,aEnabled)	\
-    (This)->lpVtbl -> get_Enabled(This,aEnabled)
-
-#define IAudioAdapter_put_Enabled(This,aEnabled)	\
-    (This)->lpVtbl -> put_Enabled(This,aEnabled)
-
-#define IAudioAdapter_get_AudioController(This,aAudioController)	\
-    (This)->lpVtbl -> get_AudioController(This,aAudioController)
-
-#define IAudioAdapter_put_AudioController(This,aAudioController)	\
-    (This)->lpVtbl -> put_AudioController(This,aAudioController)
-
-#define IAudioAdapter_get_AudioDriver(This,aAudioDriver)	\
-    (This)->lpVtbl -> get_AudioDriver(This,aAudioDriver)
-
-#define IAudioAdapter_put_AudioDriver(This,aAudioDriver)	\
-    (This)->lpVtbl -> put_AudioDriver(This,aAudioDriver)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IAudioAdapter_get_Enabled_Proxy( 
-    IAudioAdapter * This,
-    /* [retval][out] */ BOOL *aEnabled);
-
-
-void __RPC_STUB IAudioAdapter_get_Enabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IAudioAdapter_put_Enabled_Proxy( 
-    IAudioAdapter * This,
-    /* [in] */ BOOL aEnabled);
-
-
-void __RPC_STUB IAudioAdapter_put_Enabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IAudioAdapter_get_AudioController_Proxy( 
-    IAudioAdapter * This,
-    /* [retval][out] */ AudioControllerType *aAudioController);
-
-
-void __RPC_STUB IAudioAdapter_get_AudioController_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IAudioAdapter_put_AudioController_Proxy( 
-    IAudioAdapter * This,
-    /* [in] */ AudioControllerType aAudioController);
-
-
-void __RPC_STUB IAudioAdapter_put_AudioController_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IAudioAdapter_get_AudioDriver_Proxy( 
-    IAudioAdapter * This,
-    /* [retval][out] */ AudioDriverType *aAudioDriver);
-
-
-void __RPC_STUB IAudioAdapter_get_AudioDriver_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IAudioAdapter_put_AudioDriver_Proxy( 
-    IAudioAdapter * This,
-    /* [in] */ AudioDriverType aAudioDriver);
-
-
-void __RPC_STUB IAudioAdapter_put_AudioDriver_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IAudioAdapter_INTERFACE_DEFINED__ */
-
-
-#ifndef __IVRDPServer_INTERFACE_DEFINED__
-#define __IVRDPServer_INTERFACE_DEFINED__
-
-/* interface IVRDPServer */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IVRDPServer;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("7aeeb530-0b08-41fe-835d-9be9ec1dbe5c")
-    IVRDPServer : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Enabled( 
-            /* [retval][out] */ BOOL *aEnabled) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_Enabled( 
-            /* [in] */ BOOL aEnabled) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Ports( 
-            /* [retval][out] */ BSTR *aPorts) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_Ports( 
-            /* [in] */ BSTR aPorts) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_NetAddress( 
-            /* [retval][out] */ BSTR *aNetAddress) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_NetAddress( 
-            /* [in] */ BSTR aNetAddress) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_AuthType( 
-            /* [retval][out] */ VRDPAuthType *aAuthType) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_AuthType( 
-            /* [in] */ VRDPAuthType aAuthType) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_AuthTimeout( 
-            /* [retval][out] */ ULONG *aAuthTimeout) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_AuthTimeout( 
-            /* [in] */ ULONG aAuthTimeout) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_AllowMultiConnection( 
-            /* [retval][out] */ BOOL *aAllowMultiConnection) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_AllowMultiConnection( 
-            /* [in] */ BOOL aAllowMultiConnection) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_ReuseSingleConnection( 
-            /* [retval][out] */ BOOL *aReuseSingleConnection) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_ReuseSingleConnection( 
-            /* [in] */ BOOL aReuseSingleConnection) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_VideoChannel( 
-            /* [retval][out] */ BOOL *aVideoChannel) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_VideoChannel( 
-            /* [in] */ BOOL aVideoChannel) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_VideoChannelQuality( 
-            /* [retval][out] */ ULONG *aVideoChannelQuality) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_VideoChannelQuality( 
-            /* [in] */ ULONG aVideoChannelQuality) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IVRDPServerVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IVRDPServer * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IVRDPServer * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IVRDPServer * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IVRDPServer * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IVRDPServer * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IVRDPServer * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IVRDPServer * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Enabled )( 
-            IVRDPServer * This,
-            /* [retval][out] */ BOOL *aEnabled);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Enabled )( 
-            IVRDPServer * This,
-            /* [in] */ BOOL aEnabled);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Ports )( 
-            IVRDPServer * This,
-            /* [retval][out] */ BSTR *aPorts);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Ports )( 
-            IVRDPServer * This,
-            /* [in] */ BSTR aPorts);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_NetAddress )( 
-            IVRDPServer * This,
-            /* [retval][out] */ BSTR *aNetAddress);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_NetAddress )( 
-            IVRDPServer * This,
-            /* [in] */ BSTR aNetAddress);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_AuthType )( 
-            IVRDPServer * This,
-            /* [retval][out] */ VRDPAuthType *aAuthType);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_AuthType )( 
-            IVRDPServer * This,
-            /* [in] */ VRDPAuthType aAuthType);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_AuthTimeout )( 
-            IVRDPServer * This,
-            /* [retval][out] */ ULONG *aAuthTimeout);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_AuthTimeout )( 
-            IVRDPServer * This,
-            /* [in] */ ULONG aAuthTimeout);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_AllowMultiConnection )( 
-            IVRDPServer * This,
-            /* [retval][out] */ BOOL *aAllowMultiConnection);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_AllowMultiConnection )( 
-            IVRDPServer * This,
-            /* [in] */ BOOL aAllowMultiConnection);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_ReuseSingleConnection )( 
-            IVRDPServer * This,
-            /* [retval][out] */ BOOL *aReuseSingleConnection);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_ReuseSingleConnection )( 
-            IVRDPServer * This,
-            /* [in] */ BOOL aReuseSingleConnection);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_VideoChannel )( 
-            IVRDPServer * This,
-            /* [retval][out] */ BOOL *aVideoChannel);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_VideoChannel )( 
-            IVRDPServer * This,
-            /* [in] */ BOOL aVideoChannel);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_VideoChannelQuality )( 
-            IVRDPServer * This,
-            /* [retval][out] */ ULONG *aVideoChannelQuality);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_VideoChannelQuality )( 
-            IVRDPServer * This,
-            /* [in] */ ULONG aVideoChannelQuality);
-        
-        END_INTERFACE
-    } IVRDPServerVtbl;
-
-    interface IVRDPServer
-    {
-        CONST_VTBL struct IVRDPServerVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IVRDPServer_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IVRDPServer_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IVRDPServer_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IVRDPServer_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IVRDPServer_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IVRDPServer_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IVRDPServer_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IVRDPServer_get_Enabled(This,aEnabled)	\
-    (This)->lpVtbl -> get_Enabled(This,aEnabled)
-
-#define IVRDPServer_put_Enabled(This,aEnabled)	\
-    (This)->lpVtbl -> put_Enabled(This,aEnabled)
-
-#define IVRDPServer_get_Ports(This,aPorts)	\
-    (This)->lpVtbl -> get_Ports(This,aPorts)
-
-#define IVRDPServer_put_Ports(This,aPorts)	\
-    (This)->lpVtbl -> put_Ports(This,aPorts)
-
-#define IVRDPServer_get_NetAddress(This,aNetAddress)	\
-    (This)->lpVtbl -> get_NetAddress(This,aNetAddress)
-
-#define IVRDPServer_put_NetAddress(This,aNetAddress)	\
-    (This)->lpVtbl -> put_NetAddress(This,aNetAddress)
-
-#define IVRDPServer_get_AuthType(This,aAuthType)	\
-    (This)->lpVtbl -> get_AuthType(This,aAuthType)
-
-#define IVRDPServer_put_AuthType(This,aAuthType)	\
-    (This)->lpVtbl -> put_AuthType(This,aAuthType)
-
-#define IVRDPServer_get_AuthTimeout(This,aAuthTimeout)	\
-    (This)->lpVtbl -> get_AuthTimeout(This,aAuthTimeout)
-
-#define IVRDPServer_put_AuthTimeout(This,aAuthTimeout)	\
-    (This)->lpVtbl -> put_AuthTimeout(This,aAuthTimeout)
-
-#define IVRDPServer_get_AllowMultiConnection(This,aAllowMultiConnection)	\
-    (This)->lpVtbl -> get_AllowMultiConnection(This,aAllowMultiConnection)
-
-#define IVRDPServer_put_AllowMultiConnection(This,aAllowMultiConnection)	\
-    (This)->lpVtbl -> put_AllowMultiConnection(This,aAllowMultiConnection)
-
-#define IVRDPServer_get_ReuseSingleConnection(This,aReuseSingleConnection)	\
-    (This)->lpVtbl -> get_ReuseSingleConnection(This,aReuseSingleConnection)
-
-#define IVRDPServer_put_ReuseSingleConnection(This,aReuseSingleConnection)	\
-    (This)->lpVtbl -> put_ReuseSingleConnection(This,aReuseSingleConnection)
-
-#define IVRDPServer_get_VideoChannel(This,aVideoChannel)	\
-    (This)->lpVtbl -> get_VideoChannel(This,aVideoChannel)
-
-#define IVRDPServer_put_VideoChannel(This,aVideoChannel)	\
-    (This)->lpVtbl -> put_VideoChannel(This,aVideoChannel)
-
-#define IVRDPServer_get_VideoChannelQuality(This,aVideoChannelQuality)	\
-    (This)->lpVtbl -> get_VideoChannelQuality(This,aVideoChannelQuality)
-
-#define IVRDPServer_put_VideoChannelQuality(This,aVideoChannelQuality)	\
-    (This)->lpVtbl -> put_VideoChannelQuality(This,aVideoChannelQuality)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IVRDPServer_get_Enabled_Proxy( 
-    IVRDPServer * This,
-    /* [retval][out] */ BOOL *aEnabled);
-
-
-void __RPC_STUB IVRDPServer_get_Enabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IVRDPServer_put_Enabled_Proxy( 
-    IVRDPServer * This,
-    /* [in] */ BOOL aEnabled);
-
-
-void __RPC_STUB IVRDPServer_put_Enabled_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IVRDPServer_get_Ports_Proxy( 
-    IVRDPServer * This,
-    /* [retval][out] */ BSTR *aPorts);
-
-
-void __RPC_STUB IVRDPServer_get_Ports_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IVRDPServer_put_Ports_Proxy( 
-    IVRDPServer * This,
-    /* [in] */ BSTR aPorts);
-
-
-void __RPC_STUB IVRDPServer_put_Ports_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IVRDPServer_get_NetAddress_Proxy( 
-    IVRDPServer * This,
-    /* [retval][out] */ BSTR *aNetAddress);
-
-
-void __RPC_STUB IVRDPServer_get_NetAddress_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IVRDPServer_put_NetAddress_Proxy( 
-    IVRDPServer * This,
-    /* [in] */ BSTR aNetAddress);
-
-
-void __RPC_STUB IVRDPServer_put_NetAddress_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IVRDPServer_get_AuthType_Proxy( 
-    IVRDPServer * This,
-    /* [retval][out] */ VRDPAuthType *aAuthType);
-
-
-void __RPC_STUB IVRDPServer_get_AuthType_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IVRDPServer_put_AuthType_Proxy( 
-    IVRDPServer * This,
-    /* [in] */ VRDPAuthType aAuthType);
-
-
-void __RPC_STUB IVRDPServer_put_AuthType_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IVRDPServer_get_AuthTimeout_Proxy( 
-    IVRDPServer * This,
-    /* [retval][out] */ ULONG *aAuthTimeout);
-
-
-void __RPC_STUB IVRDPServer_get_AuthTimeout_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IVRDPServer_put_AuthTimeout_Proxy( 
-    IVRDPServer * This,
-    /* [in] */ ULONG aAuthTimeout);
-
-
-void __RPC_STUB IVRDPServer_put_AuthTimeout_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IVRDPServer_get_AllowMultiConnection_Proxy( 
-    IVRDPServer * This,
-    /* [retval][out] */ BOOL *aAllowMultiConnection);
-
-
-void __RPC_STUB IVRDPServer_get_AllowMultiConnection_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IVRDPServer_put_AllowMultiConnection_Proxy( 
-    IVRDPServer * This,
-    /* [in] */ BOOL aAllowMultiConnection);
-
-
-void __RPC_STUB IVRDPServer_put_AllowMultiConnection_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IVRDPServer_get_ReuseSingleConnection_Proxy( 
-    IVRDPServer * This,
-    /* [retval][out] */ BOOL *aReuseSingleConnection);
-
-
-void __RPC_STUB IVRDPServer_get_ReuseSingleConnection_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IVRDPServer_put_ReuseSingleConnection_Proxy( 
-    IVRDPServer * This,
-    /* [in] */ BOOL aReuseSingleConnection);
-
-
-void __RPC_STUB IVRDPServer_put_ReuseSingleConnection_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IVRDPServer_get_VideoChannel_Proxy( 
-    IVRDPServer * This,
-    /* [retval][out] */ BOOL *aVideoChannel);
-
-
-void __RPC_STUB IVRDPServer_get_VideoChannel_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IVRDPServer_put_VideoChannel_Proxy( 
-    IVRDPServer * This,
-    /* [in] */ BOOL aVideoChannel);
-
-
-void __RPC_STUB IVRDPServer_put_VideoChannel_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IVRDPServer_get_VideoChannelQuality_Proxy( 
-    IVRDPServer * This,
-    /* [retval][out] */ ULONG *aVideoChannelQuality);
-
-
-void __RPC_STUB IVRDPServer_get_VideoChannelQuality_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IVRDPServer_put_VideoChannelQuality_Proxy( 
-    IVRDPServer * This,
-    /* [in] */ ULONG aVideoChannelQuality);
-
-
-void __RPC_STUB IVRDPServer_put_VideoChannelQuality_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IVRDPServer_INTERFACE_DEFINED__ */
-
-
-#ifndef __ISharedFolder_INTERFACE_DEFINED__
-#define __ISharedFolder_INTERFACE_DEFINED__
-
-/* interface ISharedFolder */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_ISharedFolder;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("64637bb2-9e17-471c-b8f3-f8968dd9884e")
-    ISharedFolder : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Name( 
-            /* [retval][out] */ BSTR *aName) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_HostPath( 
-            /* [retval][out] */ BSTR *aHostPath) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Accessible( 
-            /* [retval][out] */ BOOL *aAccessible) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Writable( 
-            /* [retval][out] */ BOOL *aWritable) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_LastAccessError( 
-            /* [retval][out] */ BSTR *aLastAccessError) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct ISharedFolderVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            ISharedFolder * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            ISharedFolder * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            ISharedFolder * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            ISharedFolder * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            ISharedFolder * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            ISharedFolder * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            ISharedFolder * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Name )( 
-            ISharedFolder * This,
-            /* [retval][out] */ BSTR *aName);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_HostPath )( 
-            ISharedFolder * This,
-            /* [retval][out] */ BSTR *aHostPath);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Accessible )( 
-            ISharedFolder * This,
-            /* [retval][out] */ BOOL *aAccessible);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Writable )( 
-            ISharedFolder * This,
-            /* [retval][out] */ BOOL *aWritable);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_LastAccessError )( 
-            ISharedFolder * This,
-            /* [retval][out] */ BSTR *aLastAccessError);
-        
-        END_INTERFACE
-    } ISharedFolderVtbl;
-
-    interface ISharedFolder
-    {
-        CONST_VTBL struct ISharedFolderVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define ISharedFolder_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define ISharedFolder_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define ISharedFolder_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define ISharedFolder_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define ISharedFolder_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define ISharedFolder_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define ISharedFolder_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define ISharedFolder_get_Name(This,aName)	\
-    (This)->lpVtbl -> get_Name(This,aName)
-
-#define ISharedFolder_get_HostPath(This,aHostPath)	\
-    (This)->lpVtbl -> get_HostPath(This,aHostPath)
-
-#define ISharedFolder_get_Accessible(This,aAccessible)	\
-    (This)->lpVtbl -> get_Accessible(This,aAccessible)
-
-#define ISharedFolder_get_Writable(This,aWritable)	\
-    (This)->lpVtbl -> get_Writable(This,aWritable)
-
-#define ISharedFolder_get_LastAccessError(This,aLastAccessError)	\
-    (This)->lpVtbl -> get_LastAccessError(This,aLastAccessError)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISharedFolder_get_Name_Proxy( 
-    ISharedFolder * This,
-    /* [retval][out] */ BSTR *aName);
-
-
-void __RPC_STUB ISharedFolder_get_Name_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISharedFolder_get_HostPath_Proxy( 
-    ISharedFolder * This,
-    /* [retval][out] */ BSTR *aHostPath);
-
-
-void __RPC_STUB ISharedFolder_get_HostPath_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISharedFolder_get_Accessible_Proxy( 
-    ISharedFolder * This,
-    /* [retval][out] */ BOOL *aAccessible);
-
-
-void __RPC_STUB ISharedFolder_get_Accessible_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISharedFolder_get_Writable_Proxy( 
-    ISharedFolder * This,
-    /* [retval][out] */ BOOL *aWritable);
-
-
-void __RPC_STUB ISharedFolder_get_Writable_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISharedFolder_get_LastAccessError_Proxy( 
-    ISharedFolder * This,
-    /* [retval][out] */ BSTR *aLastAccessError);
-
-
-void __RPC_STUB ISharedFolder_get_LastAccessError_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __ISharedFolder_INTERFACE_DEFINED__ */
-
-
-#ifndef __IInternalSessionControl_INTERFACE_DEFINED__
-#define __IInternalSessionControl_INTERFACE_DEFINED__
-
-/* interface IInternalSessionControl */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IInternalSessionControl;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("ab161f72-e4b3-44e6-a919-2256474bda66")
-    IInternalSessionControl : public IDispatch
-    {
-    public:
-        virtual HRESULT STDMETHODCALLTYPE GetPID( 
-            /* [retval][out] */ ULONG *aPid) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetRemoteConsole( 
-            /* [retval][out] */ IConsole **aConsole) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE AssignMachine( 
-            /* [in] */ IMachine *aMachine) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE AssignRemoteMachine( 
-            /* [in] */ IMachine *aMachine,
-            /* [in] */ IConsole *aConsole) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE UpdateMachineState( 
-            /* [in] */ MachineState aAMachineState) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE Uninitialize( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnNetworkAdapterChange( 
-            /* [in] */ INetworkAdapter *aNetworkAdapter,
-            /* [in] */ BOOL aChangeAdapter) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnSerialPortChange( 
-            /* [in] */ ISerialPort *aSerialPort) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnParallelPortChange( 
-            /* [in] */ IParallelPort *aParallelPort) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnStorageControllerChange( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnMediumChange( 
-            /* [in] */ IMediumAttachment *aMediumAttachment,
-            /* [in] */ BOOL aForce) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnCPUChange( 
-            /* [in] */ ULONG aCpu,
-            /* [in] */ BOOL aAdd) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnVRDPServerChange( 
-            /* [in] */ BOOL aRestart) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnUSBControllerChange( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnSharedFolderChange( 
-            /* [in] */ BOOL aGlobal) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnUSBDeviceAttach( 
-            /* [in] */ IUSBDevice *aDevice,
-            /* [in] */ IVirtualBoxErrorInfo *aError,
-            /* [in] */ ULONG aMaskedInterfaces) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnUSBDeviceDetach( 
-            /* [in] */ BSTR aId,
-            /* [in] */ IVirtualBoxErrorInfo *aError) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnShowWindow( 
-            /* [in] */ BOOL aCheck,
-            /* [out] */ BOOL *aCanShow,
-            /* [out] */ ULONG64 *aWinId) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE AccessGuestProperty( 
-            /* [in] */ BSTR aName,
-            /* [in] */ BSTR aValue,
-            /* [in] */ BSTR aFlags,
-            /* [in] */ BOOL aIsSetter,
-            /* [out] */ BSTR *aRetValue,
-            /* [out] */ ULONG64 *aRetTimestamp,
-            /* [out] */ BSTR *aRetFlags) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE EnumerateGuestProperties( 
-            /* [in] */ BSTR aPatterns,
-            /* [out] */ SAFEARRAY * *aKey,
-            /* [out] */ SAFEARRAY * *aValue,
-            /* [out] */ SAFEARRAY * *aTimestamp,
-            /* [out] */ SAFEARRAY * *aFlags) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE OnlineMergeMedium( 
-            /* [in] */ IMediumAttachment *aMediumAttachment,
-            /* [in] */ ULONG aSourceIdx,
-            /* [in] */ ULONG aTargetIdx,
-            /* [in] */ IMedium *aSource,
-            /* [in] */ IMedium *aTarget,
-            /* [in] */ BOOL aMergeForward,
-            /* [in] */ IMedium *aParentForTarget,
-            /* [out][in] */ SAFEARRAY * *aChildrenToReparent,
-            /* [in] */ IProgress *aProgress) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IInternalSessionControlVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IInternalSessionControl * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IInternalSessionControl * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IInternalSessionControl * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IInternalSessionControl * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IInternalSessionControl * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IInternalSessionControl * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IInternalSessionControl * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPID )( 
-            IInternalSessionControl * This,
-            /* [retval][out] */ ULONG *aPid);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetRemoteConsole )( 
-            IInternalSessionControl * This,
-            /* [retval][out] */ IConsole **aConsole);
-        
-        HRESULT ( STDMETHODCALLTYPE *AssignMachine )( 
-            IInternalSessionControl * This,
-            /* [in] */ IMachine *aMachine);
-        
-        HRESULT ( STDMETHODCALLTYPE *AssignRemoteMachine )( 
-            IInternalSessionControl * This,
-            /* [in] */ IMachine *aMachine,
-            /* [in] */ IConsole *aConsole);
-        
-        HRESULT ( STDMETHODCALLTYPE *UpdateMachineState )( 
-            IInternalSessionControl * This,
-            /* [in] */ MachineState aAMachineState);
-        
-        HRESULT ( STDMETHODCALLTYPE *Uninitialize )( 
-            IInternalSessionControl * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnNetworkAdapterChange )( 
-            IInternalSessionControl * This,
-            /* [in] */ INetworkAdapter *aNetworkAdapter,
-            /* [in] */ BOOL aChangeAdapter);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnSerialPortChange )( 
-            IInternalSessionControl * This,
-            /* [in] */ ISerialPort *aSerialPort);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnParallelPortChange )( 
-            IInternalSessionControl * This,
-            /* [in] */ IParallelPort *aParallelPort);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnStorageControllerChange )( 
-            IInternalSessionControl * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnMediumChange )( 
-            IInternalSessionControl * This,
-            /* [in] */ IMediumAttachment *aMediumAttachment,
-            /* [in] */ BOOL aForce);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnCPUChange )( 
-            IInternalSessionControl * This,
-            /* [in] */ ULONG aCpu,
-            /* [in] */ BOOL aAdd);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnVRDPServerChange )( 
-            IInternalSessionControl * This,
-            /* [in] */ BOOL aRestart);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnUSBControllerChange )( 
-            IInternalSessionControl * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnSharedFolderChange )( 
-            IInternalSessionControl * This,
-            /* [in] */ BOOL aGlobal);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnUSBDeviceAttach )( 
-            IInternalSessionControl * This,
-            /* [in] */ IUSBDevice *aDevice,
-            /* [in] */ IVirtualBoxErrorInfo *aError,
-            /* [in] */ ULONG aMaskedInterfaces);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnUSBDeviceDetach )( 
-            IInternalSessionControl * This,
-            /* [in] */ BSTR aId,
-            /* [in] */ IVirtualBoxErrorInfo *aError);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnShowWindow )( 
-            IInternalSessionControl * This,
-            /* [in] */ BOOL aCheck,
-            /* [out] */ BOOL *aCanShow,
-            /* [out] */ ULONG64 *aWinId);
-        
-        HRESULT ( STDMETHODCALLTYPE *AccessGuestProperty )( 
-            IInternalSessionControl * This,
-            /* [in] */ BSTR aName,
-            /* [in] */ BSTR aValue,
-            /* [in] */ BSTR aFlags,
-            /* [in] */ BOOL aIsSetter,
-            /* [out] */ BSTR *aRetValue,
-            /* [out] */ ULONG64 *aRetTimestamp,
-            /* [out] */ BSTR *aRetFlags);
-        
-        HRESULT ( STDMETHODCALLTYPE *EnumerateGuestProperties )( 
-            IInternalSessionControl * This,
-            /* [in] */ BSTR aPatterns,
-            /* [out] */ SAFEARRAY * *aKey,
-            /* [out] */ SAFEARRAY * *aValue,
-            /* [out] */ SAFEARRAY * *aTimestamp,
-            /* [out] */ SAFEARRAY * *aFlags);
-        
-        HRESULT ( STDMETHODCALLTYPE *OnlineMergeMedium )( 
-            IInternalSessionControl * This,
-            /* [in] */ IMediumAttachment *aMediumAttachment,
-            /* [in] */ ULONG aSourceIdx,
-            /* [in] */ ULONG aTargetIdx,
-            /* [in] */ IMedium *aSource,
-            /* [in] */ IMedium *aTarget,
-            /* [in] */ BOOL aMergeForward,
-            /* [in] */ IMedium *aParentForTarget,
-            /* [out][in] */ SAFEARRAY * *aChildrenToReparent,
-            /* [in] */ IProgress *aProgress);
-        
-        END_INTERFACE
-    } IInternalSessionControlVtbl;
-
-    interface IInternalSessionControl
-    {
-        CONST_VTBL struct IInternalSessionControlVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IInternalSessionControl_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IInternalSessionControl_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IInternalSessionControl_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IInternalSessionControl_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IInternalSessionControl_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IInternalSessionControl_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IInternalSessionControl_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IInternalSessionControl_GetPID(This,aPid)	\
-    (This)->lpVtbl -> GetPID(This,aPid)
-
-#define IInternalSessionControl_GetRemoteConsole(This,aConsole)	\
-    (This)->lpVtbl -> GetRemoteConsole(This,aConsole)
-
-#define IInternalSessionControl_AssignMachine(This,aMachine)	\
-    (This)->lpVtbl -> AssignMachine(This,aMachine)
-
-#define IInternalSessionControl_AssignRemoteMachine(This,aMachine,aConsole)	\
-    (This)->lpVtbl -> AssignRemoteMachine(This,aMachine,aConsole)
-
-#define IInternalSessionControl_UpdateMachineState(This,aAMachineState)	\
-    (This)->lpVtbl -> UpdateMachineState(This,aAMachineState)
-
-#define IInternalSessionControl_Uninitialize(This)	\
-    (This)->lpVtbl -> Uninitialize(This)
-
-#define IInternalSessionControl_OnNetworkAdapterChange(This,aNetworkAdapter,aChangeAdapter)	\
-    (This)->lpVtbl -> OnNetworkAdapterChange(This,aNetworkAdapter,aChangeAdapter)
-
-#define IInternalSessionControl_OnSerialPortChange(This,aSerialPort)	\
-    (This)->lpVtbl -> OnSerialPortChange(This,aSerialPort)
-
-#define IInternalSessionControl_OnParallelPortChange(This,aParallelPort)	\
-    (This)->lpVtbl -> OnParallelPortChange(This,aParallelPort)
-
-#define IInternalSessionControl_OnStorageControllerChange(This)	\
-    (This)->lpVtbl -> OnStorageControllerChange(This)
-
-#define IInternalSessionControl_OnMediumChange(This,aMediumAttachment,aForce)	\
-    (This)->lpVtbl -> OnMediumChange(This,aMediumAttachment,aForce)
-
-#define IInternalSessionControl_OnCPUChange(This,aCpu,aAdd)	\
-    (This)->lpVtbl -> OnCPUChange(This,aCpu,aAdd)
-
-#define IInternalSessionControl_OnVRDPServerChange(This,aRestart)	\
-    (This)->lpVtbl -> OnVRDPServerChange(This,aRestart)
-
-#define IInternalSessionControl_OnUSBControllerChange(This)	\
-    (This)->lpVtbl -> OnUSBControllerChange(This)
-
-#define IInternalSessionControl_OnSharedFolderChange(This,aGlobal)	\
-    (This)->lpVtbl -> OnSharedFolderChange(This,aGlobal)
-
-#define IInternalSessionControl_OnUSBDeviceAttach(This,aDevice,aError,aMaskedInterfaces)	\
-    (This)->lpVtbl -> OnUSBDeviceAttach(This,aDevice,aError,aMaskedInterfaces)
-
-#define IInternalSessionControl_OnUSBDeviceDetach(This,aId,aError)	\
-    (This)->lpVtbl -> OnUSBDeviceDetach(This,aId,aError)
-
-#define IInternalSessionControl_OnShowWindow(This,aCheck,aCanShow,aWinId)	\
-    (This)->lpVtbl -> OnShowWindow(This,aCheck,aCanShow,aWinId)
-
-#define IInternalSessionControl_AccessGuestProperty(This,aName,aValue,aFlags,aIsSetter,aRetValue,aRetTimestamp,aRetFlags)	\
-    (This)->lpVtbl -> AccessGuestProperty(This,aName,aValue,aFlags,aIsSetter,aRetValue,aRetTimestamp,aRetFlags)
-
-#define IInternalSessionControl_EnumerateGuestProperties(This,aPatterns,aKey,aValue,aTimestamp,aFlags)	\
-    (This)->lpVtbl -> EnumerateGuestProperties(This,aPatterns,aKey,aValue,aTimestamp,aFlags)
-
-#define IInternalSessionControl_OnlineMergeMedium(This,aMediumAttachment,aSourceIdx,aTargetIdx,aSource,aTarget,aMergeForward,aParentForTarget,aChildrenToReparent,aProgress)	\
-    (This)->lpVtbl -> OnlineMergeMedium(This,aMediumAttachment,aSourceIdx,aTargetIdx,aSource,aTarget,aMergeForward,aParentForTarget,aChildrenToReparent,aProgress)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-HRESULT STDMETHODCALLTYPE IInternalSessionControl_GetPID_Proxy( 
-    IInternalSessionControl * This,
-    /* [retval][out] */ ULONG *aPid);
-
-
-void __RPC_STUB IInternalSessionControl_GetPID_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalSessionControl_GetRemoteConsole_Proxy( 
-    IInternalSessionControl * This,
-    /* [retval][out] */ IConsole **aConsole);
-
-
-void __RPC_STUB IInternalSessionControl_GetRemoteConsole_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalSessionControl_AssignMachine_Proxy( 
-    IInternalSessionControl * This,
-    /* [in] */ IMachine *aMachine);
-
-
-void __RPC_STUB IInternalSessionControl_AssignMachine_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalSessionControl_AssignRemoteMachine_Proxy( 
-    IInternalSessionControl * This,
-    /* [in] */ IMachine *aMachine,
-    /* [in] */ IConsole *aConsole);
-
-
-void __RPC_STUB IInternalSessionControl_AssignRemoteMachine_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalSessionControl_UpdateMachineState_Proxy( 
-    IInternalSessionControl * This,
-    /* [in] */ MachineState aAMachineState);
-
-
-void __RPC_STUB IInternalSessionControl_UpdateMachineState_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalSessionControl_Uninitialize_Proxy( 
-    IInternalSessionControl * This);
-
-
-void __RPC_STUB IInternalSessionControl_Uninitialize_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalSessionControl_OnNetworkAdapterChange_Proxy( 
-    IInternalSessionControl * This,
-    /* [in] */ INetworkAdapter *aNetworkAdapter,
-    /* [in] */ BOOL aChangeAdapter);
-
-
-void __RPC_STUB IInternalSessionControl_OnNetworkAdapterChange_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalSessionControl_OnSerialPortChange_Proxy( 
-    IInternalSessionControl * This,
-    /* [in] */ ISerialPort *aSerialPort);
-
-
-void __RPC_STUB IInternalSessionControl_OnSerialPortChange_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalSessionControl_OnParallelPortChange_Proxy( 
-    IInternalSessionControl * This,
-    /* [in] */ IParallelPort *aParallelPort);
-
-
-void __RPC_STUB IInternalSessionControl_OnParallelPortChange_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalSessionControl_OnStorageControllerChange_Proxy( 
-    IInternalSessionControl * This);
-
-
-void __RPC_STUB IInternalSessionControl_OnStorageControllerChange_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalSessionControl_OnMediumChange_Proxy( 
-    IInternalSessionControl * This,
-    /* [in] */ IMediumAttachment *aMediumAttachment,
-    /* [in] */ BOOL aForce);
-
-
-void __RPC_STUB IInternalSessionControl_OnMediumChange_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalSessionControl_OnCPUChange_Proxy( 
-    IInternalSessionControl * This,
-    /* [in] */ ULONG aCpu,
-    /* [in] */ BOOL aAdd);
-
-
-void __RPC_STUB IInternalSessionControl_OnCPUChange_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalSessionControl_OnVRDPServerChange_Proxy( 
-    IInternalSessionControl * This,
-    /* [in] */ BOOL aRestart);
-
-
-void __RPC_STUB IInternalSessionControl_OnVRDPServerChange_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalSessionControl_OnUSBControllerChange_Proxy( 
-    IInternalSessionControl * This);
-
-
-void __RPC_STUB IInternalSessionControl_OnUSBControllerChange_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalSessionControl_OnSharedFolderChange_Proxy( 
-    IInternalSessionControl * This,
-    /* [in] */ BOOL aGlobal);
-
-
-void __RPC_STUB IInternalSessionControl_OnSharedFolderChange_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalSessionControl_OnUSBDeviceAttach_Proxy( 
-    IInternalSessionControl * This,
-    /* [in] */ IUSBDevice *aDevice,
-    /* [in] */ IVirtualBoxErrorInfo *aError,
-    /* [in] */ ULONG aMaskedInterfaces);
-
-
-void __RPC_STUB IInternalSessionControl_OnUSBDeviceAttach_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalSessionControl_OnUSBDeviceDetach_Proxy( 
-    IInternalSessionControl * This,
-    /* [in] */ BSTR aId,
-    /* [in] */ IVirtualBoxErrorInfo *aError);
-
-
-void __RPC_STUB IInternalSessionControl_OnUSBDeviceDetach_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalSessionControl_OnShowWindow_Proxy( 
-    IInternalSessionControl * This,
-    /* [in] */ BOOL aCheck,
-    /* [out] */ BOOL *aCanShow,
-    /* [out] */ ULONG64 *aWinId);
-
-
-void __RPC_STUB IInternalSessionControl_OnShowWindow_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalSessionControl_AccessGuestProperty_Proxy( 
-    IInternalSessionControl * This,
-    /* [in] */ BSTR aName,
-    /* [in] */ BSTR aValue,
-    /* [in] */ BSTR aFlags,
-    /* [in] */ BOOL aIsSetter,
-    /* [out] */ BSTR *aRetValue,
-    /* [out] */ ULONG64 *aRetTimestamp,
-    /* [out] */ BSTR *aRetFlags);
-
-
-void __RPC_STUB IInternalSessionControl_AccessGuestProperty_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalSessionControl_EnumerateGuestProperties_Proxy( 
-    IInternalSessionControl * This,
-    /* [in] */ BSTR aPatterns,
-    /* [out] */ SAFEARRAY * *aKey,
-    /* [out] */ SAFEARRAY * *aValue,
-    /* [out] */ SAFEARRAY * *aTimestamp,
-    /* [out] */ SAFEARRAY * *aFlags);
-
-
-void __RPC_STUB IInternalSessionControl_EnumerateGuestProperties_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IInternalSessionControl_OnlineMergeMedium_Proxy( 
-    IInternalSessionControl * This,
-    /* [in] */ IMediumAttachment *aMediumAttachment,
-    /* [in] */ ULONG aSourceIdx,
-    /* [in] */ ULONG aTargetIdx,
-    /* [in] */ IMedium *aSource,
-    /* [in] */ IMedium *aTarget,
-    /* [in] */ BOOL aMergeForward,
-    /* [in] */ IMedium *aParentForTarget,
-    /* [out][in] */ SAFEARRAY * *aChildrenToReparent,
-    /* [in] */ IProgress *aProgress);
-
-
-void __RPC_STUB IInternalSessionControl_OnlineMergeMedium_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IInternalSessionControl_INTERFACE_DEFINED__ */
-
-
-#ifndef __ISession_INTERFACE_DEFINED__
-#define __ISession_INTERFACE_DEFINED__
-
-/* interface ISession */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_ISession;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("12F4DCDB-12B2-4EC1-B7CD-DDD9F6C5BF4D")
-    ISession : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_State( 
-            /* [retval][out] */ SessionState *aState) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Type( 
-            /* [retval][out] */ SessionType *aType) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Machine( 
-            /* [retval][out] */ IMachine **aMachine) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Console( 
-            /* [retval][out] */ IConsole **aConsole) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE Close( void) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct ISessionVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            ISession * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            ISession * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            ISession * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            ISession * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            ISession * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            ISession * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            ISession * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_State )( 
-            ISession * This,
-            /* [retval][out] */ SessionState *aState);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Type )( 
-            ISession * This,
-            /* [retval][out] */ SessionType *aType);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Machine )( 
-            ISession * This,
-            /* [retval][out] */ IMachine **aMachine);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Console )( 
-            ISession * This,
-            /* [retval][out] */ IConsole **aConsole);
-        
-        HRESULT ( STDMETHODCALLTYPE *Close )( 
-            ISession * This);
-        
-        END_INTERFACE
-    } ISessionVtbl;
-
-    interface ISession
-    {
-        CONST_VTBL struct ISessionVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define ISession_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define ISession_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define ISession_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define ISession_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define ISession_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define ISession_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define ISession_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define ISession_get_State(This,aState)	\
-    (This)->lpVtbl -> get_State(This,aState)
-
-#define ISession_get_Type(This,aType)	\
-    (This)->lpVtbl -> get_Type(This,aType)
-
-#define ISession_get_Machine(This,aMachine)	\
-    (This)->lpVtbl -> get_Machine(This,aMachine)
-
-#define ISession_get_Console(This,aConsole)	\
-    (This)->lpVtbl -> get_Console(This,aConsole)
-
-#define ISession_Close(This)	\
-    (This)->lpVtbl -> Close(This)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISession_get_State_Proxy( 
-    ISession * This,
-    /* [retval][out] */ SessionState *aState);
-
-
-void __RPC_STUB ISession_get_State_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISession_get_Type_Proxy( 
-    ISession * This,
-    /* [retval][out] */ SessionType *aType);
-
-
-void __RPC_STUB ISession_get_Type_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISession_get_Machine_Proxy( 
-    ISession * This,
-    /* [retval][out] */ IMachine **aMachine);
-
-
-void __RPC_STUB ISession_get_Machine_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE ISession_get_Console_Proxy( 
-    ISession * This,
-    /* [retval][out] */ IConsole **aConsole);
-
-
-void __RPC_STUB ISession_get_Console_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE ISession_Close_Proxy( 
-    ISession * This);
-
-
-void __RPC_STUB ISession_Close_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __ISession_INTERFACE_DEFINED__ */
-
-
-#ifndef __IStorageController_INTERFACE_DEFINED__
-#define __IStorageController_INTERFACE_DEFINED__
-
-/* interface IStorageController */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IStorageController;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("fd93adc0-bbaa-4256-9e6e-00e29f9151c9")
-    IStorageController : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Name( 
-            /* [retval][out] */ BSTR *aName) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_MaxDevicesPerPortCount( 
-            /* [retval][out] */ ULONG *aMaxDevicesPerPortCount) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_MinPortCount( 
-            /* [retval][out] */ ULONG *aMinPortCount) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_MaxPortCount( 
-            /* [retval][out] */ ULONG *aMaxPortCount) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Instance( 
-            /* [retval][out] */ ULONG *aInstance) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_Instance( 
-            /* [in] */ ULONG aInstance) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_PortCount( 
-            /* [retval][out] */ ULONG *aPortCount) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_PortCount( 
-            /* [in] */ ULONG aPortCount) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Bus( 
-            /* [retval][out] */ StorageBus *aBus) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_ControllerType( 
-            /* [retval][out] */ StorageControllerType *aControllerType) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_ControllerType( 
-            /* [in] */ StorageControllerType aControllerType) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_UseHostIOCache( 
-            /* [retval][out] */ BOOL *aUseHostIOCache) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_UseHostIOCache( 
-            /* [in] */ BOOL aUseHostIOCache) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetIDEEmulationPort( 
-            /* [in] */ LONG aDevicePosition,
-            /* [retval][out] */ LONG *aPortNumber) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetIDEEmulationPort( 
-            /* [in] */ LONG aDevicePosition,
-            /* [in] */ LONG aPortNumber) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IStorageControllerVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IStorageController * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IStorageController * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IStorageController * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IStorageController * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IStorageController * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IStorageController * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IStorageController * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Name )( 
-            IStorageController * This,
-            /* [retval][out] */ BSTR *aName);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_MaxDevicesPerPortCount )( 
-            IStorageController * This,
-            /* [retval][out] */ ULONG *aMaxDevicesPerPortCount);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_MinPortCount )( 
-            IStorageController * This,
-            /* [retval][out] */ ULONG *aMinPortCount);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_MaxPortCount )( 
-            IStorageController * This,
-            /* [retval][out] */ ULONG *aMaxPortCount);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Instance )( 
-            IStorageController * This,
-            /* [retval][out] */ ULONG *aInstance);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Instance )( 
-            IStorageController * This,
-            /* [in] */ ULONG aInstance);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_PortCount )( 
-            IStorageController * This,
-            /* [retval][out] */ ULONG *aPortCount);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_PortCount )( 
-            IStorageController * This,
-            /* [in] */ ULONG aPortCount);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Bus )( 
-            IStorageController * This,
-            /* [retval][out] */ StorageBus *aBus);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_ControllerType )( 
-            IStorageController * This,
-            /* [retval][out] */ StorageControllerType *aControllerType);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_ControllerType )( 
-            IStorageController * This,
-            /* [in] */ StorageControllerType aControllerType);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_UseHostIOCache )( 
-            IStorageController * This,
-            /* [retval][out] */ BOOL *aUseHostIOCache);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_UseHostIOCache )( 
-            IStorageController * This,
-            /* [in] */ BOOL aUseHostIOCache);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDEEmulationPort )( 
-            IStorageController * This,
-            /* [in] */ LONG aDevicePosition,
-            /* [retval][out] */ LONG *aPortNumber);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetIDEEmulationPort )( 
-            IStorageController * This,
-            /* [in] */ LONG aDevicePosition,
-            /* [in] */ LONG aPortNumber);
-        
-        END_INTERFACE
-    } IStorageControllerVtbl;
-
-    interface IStorageController
-    {
-        CONST_VTBL struct IStorageControllerVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IStorageController_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IStorageController_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IStorageController_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IStorageController_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IStorageController_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IStorageController_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IStorageController_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IStorageController_get_Name(This,aName)	\
-    (This)->lpVtbl -> get_Name(This,aName)
-
-#define IStorageController_get_MaxDevicesPerPortCount(This,aMaxDevicesPerPortCount)	\
-    (This)->lpVtbl -> get_MaxDevicesPerPortCount(This,aMaxDevicesPerPortCount)
-
-#define IStorageController_get_MinPortCount(This,aMinPortCount)	\
-    (This)->lpVtbl -> get_MinPortCount(This,aMinPortCount)
-
-#define IStorageController_get_MaxPortCount(This,aMaxPortCount)	\
-    (This)->lpVtbl -> get_MaxPortCount(This,aMaxPortCount)
-
-#define IStorageController_get_Instance(This,aInstance)	\
-    (This)->lpVtbl -> get_Instance(This,aInstance)
-
-#define IStorageController_put_Instance(This,aInstance)	\
-    (This)->lpVtbl -> put_Instance(This,aInstance)
-
-#define IStorageController_get_PortCount(This,aPortCount)	\
-    (This)->lpVtbl -> get_PortCount(This,aPortCount)
-
-#define IStorageController_put_PortCount(This,aPortCount)	\
-    (This)->lpVtbl -> put_PortCount(This,aPortCount)
-
-#define IStorageController_get_Bus(This,aBus)	\
-    (This)->lpVtbl -> get_Bus(This,aBus)
-
-#define IStorageController_get_ControllerType(This,aControllerType)	\
-    (This)->lpVtbl -> get_ControllerType(This,aControllerType)
-
-#define IStorageController_put_ControllerType(This,aControllerType)	\
-    (This)->lpVtbl -> put_ControllerType(This,aControllerType)
-
-#define IStorageController_get_UseHostIOCache(This,aUseHostIOCache)	\
-    (This)->lpVtbl -> get_UseHostIOCache(This,aUseHostIOCache)
-
-#define IStorageController_put_UseHostIOCache(This,aUseHostIOCache)	\
-    (This)->lpVtbl -> put_UseHostIOCache(This,aUseHostIOCache)
-
-#define IStorageController_GetIDEEmulationPort(This,aDevicePosition,aPortNumber)	\
-    (This)->lpVtbl -> GetIDEEmulationPort(This,aDevicePosition,aPortNumber)
-
-#define IStorageController_SetIDEEmulationPort(This,aDevicePosition,aPortNumber)	\
-    (This)->lpVtbl -> SetIDEEmulationPort(This,aDevicePosition,aPortNumber)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IStorageController_get_Name_Proxy( 
-    IStorageController * This,
-    /* [retval][out] */ BSTR *aName);
-
-
-void __RPC_STUB IStorageController_get_Name_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IStorageController_get_MaxDevicesPerPortCount_Proxy( 
-    IStorageController * This,
-    /* [retval][out] */ ULONG *aMaxDevicesPerPortCount);
-
-
-void __RPC_STUB IStorageController_get_MaxDevicesPerPortCount_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IStorageController_get_MinPortCount_Proxy( 
-    IStorageController * This,
-    /* [retval][out] */ ULONG *aMinPortCount);
-
-
-void __RPC_STUB IStorageController_get_MinPortCount_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IStorageController_get_MaxPortCount_Proxy( 
-    IStorageController * This,
-    /* [retval][out] */ ULONG *aMaxPortCount);
-
-
-void __RPC_STUB IStorageController_get_MaxPortCount_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IStorageController_get_Instance_Proxy( 
-    IStorageController * This,
-    /* [retval][out] */ ULONG *aInstance);
-
-
-void __RPC_STUB IStorageController_get_Instance_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IStorageController_put_Instance_Proxy( 
-    IStorageController * This,
-    /* [in] */ ULONG aInstance);
-
-
-void __RPC_STUB IStorageController_put_Instance_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IStorageController_get_PortCount_Proxy( 
-    IStorageController * This,
-    /* [retval][out] */ ULONG *aPortCount);
-
-
-void __RPC_STUB IStorageController_get_PortCount_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IStorageController_put_PortCount_Proxy( 
-    IStorageController * This,
-    /* [in] */ ULONG aPortCount);
-
-
-void __RPC_STUB IStorageController_put_PortCount_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IStorageController_get_Bus_Proxy( 
-    IStorageController * This,
-    /* [retval][out] */ StorageBus *aBus);
-
-
-void __RPC_STUB IStorageController_get_Bus_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IStorageController_get_ControllerType_Proxy( 
-    IStorageController * This,
-    /* [retval][out] */ StorageControllerType *aControllerType);
-
-
-void __RPC_STUB IStorageController_get_ControllerType_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IStorageController_put_ControllerType_Proxy( 
-    IStorageController * This,
-    /* [in] */ StorageControllerType aControllerType);
-
-
-void __RPC_STUB IStorageController_put_ControllerType_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IStorageController_get_UseHostIOCache_Proxy( 
-    IStorageController * This,
-    /* [retval][out] */ BOOL *aUseHostIOCache);
-
-
-void __RPC_STUB IStorageController_get_UseHostIOCache_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE IStorageController_put_UseHostIOCache_Proxy( 
-    IStorageController * This,
-    /* [in] */ BOOL aUseHostIOCache);
-
-
-void __RPC_STUB IStorageController_put_UseHostIOCache_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IStorageController_GetIDEEmulationPort_Proxy( 
-    IStorageController * This,
-    /* [in] */ LONG aDevicePosition,
-    /* [retval][out] */ LONG *aPortNumber);
-
-
-void __RPC_STUB IStorageController_GetIDEEmulationPort_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IStorageController_SetIDEEmulationPort_Proxy( 
-    IStorageController * This,
-    /* [in] */ LONG aDevicePosition,
-    /* [in] */ LONG aPortNumber);
-
-
-void __RPC_STUB IStorageController_SetIDEEmulationPort_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IStorageController_INTERFACE_DEFINED__ */
-
-
-#ifndef __IPerformanceMetric_INTERFACE_DEFINED__
-#define __IPerformanceMetric_INTERFACE_DEFINED__
-
-/* interface IPerformanceMetric */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IPerformanceMetric;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("2a1a60ae-9345-4019-ad53-d34ba41cbfe9")
-    IPerformanceMetric : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_MetricName( 
-            /* [retval][out] */ BSTR *aMetricName) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Object( 
-            /* [retval][out] */ IUnknown **aObject) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Description( 
-            /* [retval][out] */ BSTR *aDescription) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Period( 
-            /* [retval][out] */ ULONG *aPeriod) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Count( 
-            /* [retval][out] */ ULONG *aCount) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Unit( 
-            /* [retval][out] */ BSTR *aUnit) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_MinimumValue( 
-            /* [retval][out] */ LONG *aMinimumValue) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_MaximumValue( 
-            /* [retval][out] */ LONG *aMaximumValue) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IPerformanceMetricVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IPerformanceMetric * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IPerformanceMetric * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IPerformanceMetric * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IPerformanceMetric * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IPerformanceMetric * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IPerformanceMetric * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IPerformanceMetric * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_MetricName )( 
-            IPerformanceMetric * This,
-            /* [retval][out] */ BSTR *aMetricName);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Object )( 
-            IPerformanceMetric * This,
-            /* [retval][out] */ IUnknown **aObject);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Description )( 
-            IPerformanceMetric * This,
-            /* [retval][out] */ BSTR *aDescription);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Period )( 
-            IPerformanceMetric * This,
-            /* [retval][out] */ ULONG *aPeriod);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Count )( 
-            IPerformanceMetric * This,
-            /* [retval][out] */ ULONG *aCount);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Unit )( 
-            IPerformanceMetric * This,
-            /* [retval][out] */ BSTR *aUnit);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_MinimumValue )( 
-            IPerformanceMetric * This,
-            /* [retval][out] */ LONG *aMinimumValue);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_MaximumValue )( 
-            IPerformanceMetric * This,
-            /* [retval][out] */ LONG *aMaximumValue);
-        
-        END_INTERFACE
-    } IPerformanceMetricVtbl;
-
-    interface IPerformanceMetric
-    {
-        CONST_VTBL struct IPerformanceMetricVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IPerformanceMetric_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IPerformanceMetric_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IPerformanceMetric_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IPerformanceMetric_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IPerformanceMetric_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IPerformanceMetric_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IPerformanceMetric_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IPerformanceMetric_get_MetricName(This,aMetricName)	\
-    (This)->lpVtbl -> get_MetricName(This,aMetricName)
-
-#define IPerformanceMetric_get_Object(This,aObject)	\
-    (This)->lpVtbl -> get_Object(This,aObject)
-
-#define IPerformanceMetric_get_Description(This,aDescription)	\
-    (This)->lpVtbl -> get_Description(This,aDescription)
-
-#define IPerformanceMetric_get_Period(This,aPeriod)	\
-    (This)->lpVtbl -> get_Period(This,aPeriod)
-
-#define IPerformanceMetric_get_Count(This,aCount)	\
-    (This)->lpVtbl -> get_Count(This,aCount)
-
-#define IPerformanceMetric_get_Unit(This,aUnit)	\
-    (This)->lpVtbl -> get_Unit(This,aUnit)
-
-#define IPerformanceMetric_get_MinimumValue(This,aMinimumValue)	\
-    (This)->lpVtbl -> get_MinimumValue(This,aMinimumValue)
-
-#define IPerformanceMetric_get_MaximumValue(This,aMaximumValue)	\
-    (This)->lpVtbl -> get_MaximumValue(This,aMaximumValue)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IPerformanceMetric_get_MetricName_Proxy( 
-    IPerformanceMetric * This,
-    /* [retval][out] */ BSTR *aMetricName);
-
-
-void __RPC_STUB IPerformanceMetric_get_MetricName_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IPerformanceMetric_get_Object_Proxy( 
-    IPerformanceMetric * This,
-    /* [retval][out] */ IUnknown **aObject);
-
-
-void __RPC_STUB IPerformanceMetric_get_Object_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IPerformanceMetric_get_Description_Proxy( 
-    IPerformanceMetric * This,
-    /* [retval][out] */ BSTR *aDescription);
-
-
-void __RPC_STUB IPerformanceMetric_get_Description_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IPerformanceMetric_get_Period_Proxy( 
-    IPerformanceMetric * This,
-    /* [retval][out] */ ULONG *aPeriod);
-
-
-void __RPC_STUB IPerformanceMetric_get_Period_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IPerformanceMetric_get_Count_Proxy( 
-    IPerformanceMetric * This,
-    /* [retval][out] */ ULONG *aCount);
-
-
-void __RPC_STUB IPerformanceMetric_get_Count_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IPerformanceMetric_get_Unit_Proxy( 
-    IPerformanceMetric * This,
-    /* [retval][out] */ BSTR *aUnit);
-
-
-void __RPC_STUB IPerformanceMetric_get_Unit_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IPerformanceMetric_get_MinimumValue_Proxy( 
-    IPerformanceMetric * This,
-    /* [retval][out] */ LONG *aMinimumValue);
-
-
-void __RPC_STUB IPerformanceMetric_get_MinimumValue_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IPerformanceMetric_get_MaximumValue_Proxy( 
-    IPerformanceMetric * This,
-    /* [retval][out] */ LONG *aMaximumValue);
-
-
-void __RPC_STUB IPerformanceMetric_get_MaximumValue_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IPerformanceMetric_INTERFACE_DEFINED__ */
-
-
-#ifndef __IPerformanceCollector_INTERFACE_DEFINED__
-#define __IPerformanceCollector_INTERFACE_DEFINED__
-
-/* interface IPerformanceCollector */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_IPerformanceCollector;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("e22e1acb-ac4a-43bb-a31c-17321659b0c6")
-    IPerformanceCollector : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_MetricNames( 
-            /* [retval][out] */ SAFEARRAY * *aMetricNames) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetMetrics( 
-            /* [out][in] */ SAFEARRAY * *aMetricNames,
-            /* [out][in] */ SAFEARRAY * *aObjects,
-            /* [retval][out] */ SAFEARRAY * *aMetrics) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetupMetrics( 
-            /* [out][in] */ SAFEARRAY * *aMetricNames,
-            /* [out][in] */ SAFEARRAY * *aObjects,
-            /* [in] */ ULONG aPeriod,
-            /* [in] */ ULONG aCount,
-            /* [retval][out] */ SAFEARRAY * *aAffectedMetrics) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE EnableMetrics( 
-            /* [out][in] */ SAFEARRAY * *aMetricNames,
-            /* [out][in] */ SAFEARRAY * *aObjects,
-            /* [retval][out] */ SAFEARRAY * *aAffectedMetrics) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE DisableMetrics( 
-            /* [out][in] */ SAFEARRAY * *aMetricNames,
-            /* [out][in] */ SAFEARRAY * *aObjects,
-            /* [retval][out] */ SAFEARRAY * *aAffectedMetrics) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE QueryMetricsData( 
-            /* [out][in] */ SAFEARRAY * *aMetricNames,
-            /* [out][in] */ SAFEARRAY * *aObjects,
-            /* [out] */ SAFEARRAY * *aReturnMetricNames,
-            /* [out] */ SAFEARRAY * *aReturnObjects,
-            /* [out] */ SAFEARRAY * *aReturnUnits,
-            /* [out] */ SAFEARRAY * *aReturnScales,
-            /* [out] */ SAFEARRAY * *aReturnSequenceNumbers,
-            /* [out] */ SAFEARRAY * *aReturnDataIndices,
-            /* [out] */ SAFEARRAY * *aReturnDataLengths,
-            /* [retval][out] */ SAFEARRAY * *aReturnData) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct IPerformanceCollectorVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IPerformanceCollector * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IPerformanceCollector * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IPerformanceCollector * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            IPerformanceCollector * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            IPerformanceCollector * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            IPerformanceCollector * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            IPerformanceCollector * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_MetricNames )( 
-            IPerformanceCollector * This,
-            /* [retval][out] */ SAFEARRAY * *aMetricNames);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetMetrics )( 
-            IPerformanceCollector * This,
-            /* [out][in] */ SAFEARRAY * *aMetricNames,
-            /* [out][in] */ SAFEARRAY * *aObjects,
-            /* [retval][out] */ SAFEARRAY * *aMetrics);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetupMetrics )( 
-            IPerformanceCollector * This,
-            /* [out][in] */ SAFEARRAY * *aMetricNames,
-            /* [out][in] */ SAFEARRAY * *aObjects,
-            /* [in] */ ULONG aPeriod,
-            /* [in] */ ULONG aCount,
-            /* [retval][out] */ SAFEARRAY * *aAffectedMetrics);
-        
-        HRESULT ( STDMETHODCALLTYPE *EnableMetrics )( 
-            IPerformanceCollector * This,
-            /* [out][in] */ SAFEARRAY * *aMetricNames,
-            /* [out][in] */ SAFEARRAY * *aObjects,
-            /* [retval][out] */ SAFEARRAY * *aAffectedMetrics);
-        
-        HRESULT ( STDMETHODCALLTYPE *DisableMetrics )( 
-            IPerformanceCollector * This,
-            /* [out][in] */ SAFEARRAY * *aMetricNames,
-            /* [out][in] */ SAFEARRAY * *aObjects,
-            /* [retval][out] */ SAFEARRAY * *aAffectedMetrics);
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryMetricsData )( 
-            IPerformanceCollector * This,
-            /* [out][in] */ SAFEARRAY * *aMetricNames,
-            /* [out][in] */ SAFEARRAY * *aObjects,
-            /* [out] */ SAFEARRAY * *aReturnMetricNames,
-            /* [out] */ SAFEARRAY * *aReturnObjects,
-            /* [out] */ SAFEARRAY * *aReturnUnits,
-            /* [out] */ SAFEARRAY * *aReturnScales,
-            /* [out] */ SAFEARRAY * *aReturnSequenceNumbers,
-            /* [out] */ SAFEARRAY * *aReturnDataIndices,
-            /* [out] */ SAFEARRAY * *aReturnDataLengths,
-            /* [retval][out] */ SAFEARRAY * *aReturnData);
-        
-        END_INTERFACE
-    } IPerformanceCollectorVtbl;
-
-    interface IPerformanceCollector
-    {
-        CONST_VTBL struct IPerformanceCollectorVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IPerformanceCollector_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IPerformanceCollector_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IPerformanceCollector_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IPerformanceCollector_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IPerformanceCollector_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IPerformanceCollector_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IPerformanceCollector_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IPerformanceCollector_get_MetricNames(This,aMetricNames)	\
-    (This)->lpVtbl -> get_MetricNames(This,aMetricNames)
-
-#define IPerformanceCollector_GetMetrics(This,aMetricNames,aObjects,aMetrics)	\
-    (This)->lpVtbl -> GetMetrics(This,aMetricNames,aObjects,aMetrics)
-
-#define IPerformanceCollector_SetupMetrics(This,aMetricNames,aObjects,aPeriod,aCount,aAffectedMetrics)	\
-    (This)->lpVtbl -> SetupMetrics(This,aMetricNames,aObjects,aPeriod,aCount,aAffectedMetrics)
-
-#define IPerformanceCollector_EnableMetrics(This,aMetricNames,aObjects,aAffectedMetrics)	\
-    (This)->lpVtbl -> EnableMetrics(This,aMetricNames,aObjects,aAffectedMetrics)
-
-#define IPerformanceCollector_DisableMetrics(This,aMetricNames,aObjects,aAffectedMetrics)	\
-    (This)->lpVtbl -> DisableMetrics(This,aMetricNames,aObjects,aAffectedMetrics)
-
-#define IPerformanceCollector_QueryMetricsData(This,aMetricNames,aObjects,aReturnMetricNames,aReturnObjects,aReturnUnits,aReturnScales,aReturnSequenceNumbers,aReturnDataIndices,aReturnDataLengths,aReturnData)	\
-    (This)->lpVtbl -> QueryMetricsData(This,aMetricNames,aObjects,aReturnMetricNames,aReturnObjects,aReturnUnits,aReturnScales,aReturnSequenceNumbers,aReturnDataIndices,aReturnDataLengths,aReturnData)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE IPerformanceCollector_get_MetricNames_Proxy( 
-    IPerformanceCollector * This,
-    /* [retval][out] */ SAFEARRAY * *aMetricNames);
-
-
-void __RPC_STUB IPerformanceCollector_get_MetricNames_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IPerformanceCollector_GetMetrics_Proxy( 
-    IPerformanceCollector * This,
-    /* [out][in] */ SAFEARRAY * *aMetricNames,
-    /* [out][in] */ SAFEARRAY * *aObjects,
-    /* [retval][out] */ SAFEARRAY * *aMetrics);
-
-
-void __RPC_STUB IPerformanceCollector_GetMetrics_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IPerformanceCollector_SetupMetrics_Proxy( 
-    IPerformanceCollector * This,
-    /* [out][in] */ SAFEARRAY * *aMetricNames,
-    /* [out][in] */ SAFEARRAY * *aObjects,
-    /* [in] */ ULONG aPeriod,
-    /* [in] */ ULONG aCount,
-    /* [retval][out] */ SAFEARRAY * *aAffectedMetrics);
-
-
-void __RPC_STUB IPerformanceCollector_SetupMetrics_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IPerformanceCollector_EnableMetrics_Proxy( 
-    IPerformanceCollector * This,
-    /* [out][in] */ SAFEARRAY * *aMetricNames,
-    /* [out][in] */ SAFEARRAY * *aObjects,
-    /* [retval][out] */ SAFEARRAY * *aAffectedMetrics);
-
-
-void __RPC_STUB IPerformanceCollector_EnableMetrics_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IPerformanceCollector_DisableMetrics_Proxy( 
-    IPerformanceCollector * This,
-    /* [out][in] */ SAFEARRAY * *aMetricNames,
-    /* [out][in] */ SAFEARRAY * *aObjects,
-    /* [retval][out] */ SAFEARRAY * *aAffectedMetrics);
-
-
-void __RPC_STUB IPerformanceCollector_DisableMetrics_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE IPerformanceCollector_QueryMetricsData_Proxy( 
-    IPerformanceCollector * This,
-    /* [out][in] */ SAFEARRAY * *aMetricNames,
-    /* [out][in] */ SAFEARRAY * *aObjects,
-    /* [out] */ SAFEARRAY * *aReturnMetricNames,
-    /* [out] */ SAFEARRAY * *aReturnObjects,
-    /* [out] */ SAFEARRAY * *aReturnUnits,
-    /* [out] */ SAFEARRAY * *aReturnScales,
-    /* [out] */ SAFEARRAY * *aReturnSequenceNumbers,
-    /* [out] */ SAFEARRAY * *aReturnDataIndices,
-    /* [out] */ SAFEARRAY * *aReturnDataLengths,
-    /* [retval][out] */ SAFEARRAY * *aReturnData);
-
-
-void __RPC_STUB IPerformanceCollector_QueryMetricsData_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IPerformanceCollector_INTERFACE_DEFINED__ */
-
-
-#ifndef __INATEngine_INTERFACE_DEFINED__
-#define __INATEngine_INTERFACE_DEFINED__
-
-/* interface INATEngine */
-/* [oleautomation][dual][object][uuid] */ 
-
-
-EXTERN_C const IID IID_INATEngine;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("4b286616-eb03-11de-b0fb-1701eca42246")
-    INATEngine : public IDispatch
-    {
-    public:
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Network( 
-            /* [retval][out] */ BSTR *aNetwork) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_Network( 
-            /* [in] */ BSTR aNetwork) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_HostIP( 
-            /* [retval][out] */ BSTR *aHostIP) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_HostIP( 
-            /* [in] */ BSTR aHostIP) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_TftpPrefix( 
-            /* [retval][out] */ BSTR *aTftpPrefix) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_TftpPrefix( 
-            /* [in] */ BSTR aTftpPrefix) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_TftpBootFile( 
-            /* [retval][out] */ BSTR *aTftpBootFile) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_TftpBootFile( 
-            /* [in] */ BSTR aTftpBootFile) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_TftpNextServer( 
-            /* [retval][out] */ BSTR *aTftpNextServer) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_TftpNextServer( 
-            /* [in] */ BSTR aTftpNextServer) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_AliasMode( 
-            /* [retval][out] */ ULONG *aAliasMode) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_AliasMode( 
-            /* [in] */ ULONG aAliasMode) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_DnsPassDomain( 
-            /* [retval][out] */ BOOL *aDnsPassDomain) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_DnsPassDomain( 
-            /* [in] */ BOOL aDnsPassDomain) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_DnsProxy( 
-            /* [retval][out] */ BOOL *aDnsProxy) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_DnsProxy( 
-            /* [in] */ BOOL aDnsProxy) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_DnsUseHostResolver( 
-            /* [retval][out] */ BOOL *aDnsUseHostResolver) = 0;
-        
-        virtual /* [propput] */ HRESULT STDMETHODCALLTYPE put_DnsUseHostResolver( 
-            /* [in] */ BOOL aDnsUseHostResolver) = 0;
-        
-        virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_Redirects( 
-            /* [retval][out] */ SAFEARRAY * *aRedirects) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetNetworkSettings( 
-            /* [in] */ ULONG aMtu,
-            /* [in] */ ULONG aSockSnd,
-            /* [in] */ ULONG aSockRcv,
-            /* [in] */ ULONG aTcpWndSnd,
-            /* [in] */ ULONG aTcpWndRcv) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetNetworkSettings( 
-            /* [out] */ ULONG *aMtu,
-            /* [out] */ ULONG *aSockSnd,
-            /* [out] */ ULONG *aSockRcv,
-            /* [out] */ ULONG *aTcpWndSnd,
-            /* [out] */ ULONG *aTcpWndRcv) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE AddRedirect( 
-            /* [in] */ BSTR aName,
-            /* [in] */ NATProtocol aProto,
-            /* [in] */ BSTR aHostIp,
-            /* [in] */ USHORT aHostPort,
-            /* [in] */ BSTR aGuestIp,
-            /* [in] */ USHORT aGuestPort) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE RemoveRedirect( 
-            /* [in] */ BSTR aName) = 0;
-        
-    };
-    
-#else 	/* C style interface */
-
-    typedef struct INATEngineVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            INATEngine * This,
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            INATEngine * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            INATEngine * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
-            INATEngine * This,
-            /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
-            INATEngine * This,
-            /* [in] */ UINT iTInfo,
-            /* [in] */ LCID lcid,
-            /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
-            INATEngine * This,
-            /* [in] */ REFIID riid,
-            /* [size_is][in] */ LPOLESTR *rgszNames,
-            /* [in] */ UINT cNames,
-            /* [in] */ LCID lcid,
-            /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
-            INATEngine * This,
-            /* [in] */ DISPID dispIdMember,
-            /* [in] */ REFIID riid,
-            /* [in] */ LCID lcid,
-            /* [in] */ WORD wFlags,
-            /* [out][in] */ DISPPARAMS *pDispParams,
-            /* [out] */ VARIANT *pVarResult,
-            /* [out] */ EXCEPINFO *pExcepInfo,
-            /* [out] */ UINT *puArgErr);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Network )( 
-            INATEngine * This,
-            /* [retval][out] */ BSTR *aNetwork);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_Network )( 
-            INATEngine * This,
-            /* [in] */ BSTR aNetwork);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_HostIP )( 
-            INATEngine * This,
-            /* [retval][out] */ BSTR *aHostIP);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_HostIP )( 
-            INATEngine * This,
-            /* [in] */ BSTR aHostIP);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_TftpPrefix )( 
-            INATEngine * This,
-            /* [retval][out] */ BSTR *aTftpPrefix);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_TftpPrefix )( 
-            INATEngine * This,
-            /* [in] */ BSTR aTftpPrefix);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_TftpBootFile )( 
-            INATEngine * This,
-            /* [retval][out] */ BSTR *aTftpBootFile);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_TftpBootFile )( 
-            INATEngine * This,
-            /* [in] */ BSTR aTftpBootFile);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_TftpNextServer )( 
-            INATEngine * This,
-            /* [retval][out] */ BSTR *aTftpNextServer);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_TftpNextServer )( 
-            INATEngine * This,
-            /* [in] */ BSTR aTftpNextServer);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_AliasMode )( 
-            INATEngine * This,
-            /* [retval][out] */ ULONG *aAliasMode);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_AliasMode )( 
-            INATEngine * This,
-            /* [in] */ ULONG aAliasMode);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_DnsPassDomain )( 
-            INATEngine * This,
-            /* [retval][out] */ BOOL *aDnsPassDomain);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_DnsPassDomain )( 
-            INATEngine * This,
-            /* [in] */ BOOL aDnsPassDomain);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_DnsProxy )( 
-            INATEngine * This,
-            /* [retval][out] */ BOOL *aDnsProxy);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_DnsProxy )( 
-            INATEngine * This,
-            /* [in] */ BOOL aDnsProxy);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_DnsUseHostResolver )( 
-            INATEngine * This,
-            /* [retval][out] */ BOOL *aDnsUseHostResolver);
-        
-        /* [propput] */ HRESULT ( STDMETHODCALLTYPE *put_DnsUseHostResolver )( 
-            INATEngine * This,
-            /* [in] */ BOOL aDnsUseHostResolver);
-        
-        /* [propget] */ HRESULT ( STDMETHODCALLTYPE *get_Redirects )( 
-            INATEngine * This,
-            /* [retval][out] */ SAFEARRAY * *aRedirects);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetNetworkSettings )( 
-            INATEngine * This,
-            /* [in] */ ULONG aMtu,
-            /* [in] */ ULONG aSockSnd,
-            /* [in] */ ULONG aSockRcv,
-            /* [in] */ ULONG aTcpWndSnd,
-            /* [in] */ ULONG aTcpWndRcv);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetNetworkSettings )( 
-            INATEngine * This,
-            /* [out] */ ULONG *aMtu,
-            /* [out] */ ULONG *aSockSnd,
-            /* [out] */ ULONG *aSockRcv,
-            /* [out] */ ULONG *aTcpWndSnd,
-            /* [out] */ ULONG *aTcpWndRcv);
-        
-        HRESULT ( STDMETHODCALLTYPE *AddRedirect )( 
-            INATEngine * This,
-            /* [in] */ BSTR aName,
-            /* [in] */ NATProtocol aProto,
-            /* [in] */ BSTR aHostIp,
-            /* [in] */ USHORT aHostPort,
-            /* [in] */ BSTR aGuestIp,
-            /* [in] */ USHORT aGuestPort);
-        
-        HRESULT ( STDMETHODCALLTYPE *RemoveRedirect )( 
-            INATEngine * This,
-            /* [in] */ BSTR aName);
-        
-        END_INTERFACE
-    } INATEngineVtbl;
-
-    interface INATEngine
-    {
-        CONST_VTBL struct INATEngineVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define INATEngine_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define INATEngine_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define INATEngine_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define INATEngine_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define INATEngine_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define INATEngine_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define INATEngine_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define INATEngine_get_Network(This,aNetwork)	\
-    (This)->lpVtbl -> get_Network(This,aNetwork)
-
-#define INATEngine_put_Network(This,aNetwork)	\
-    (This)->lpVtbl -> put_Network(This,aNetwork)
-
-#define INATEngine_get_HostIP(This,aHostIP)	\
-    (This)->lpVtbl -> get_HostIP(This,aHostIP)
-
-#define INATEngine_put_HostIP(This,aHostIP)	\
-    (This)->lpVtbl -> put_HostIP(This,aHostIP)
-
-#define INATEngine_get_TftpPrefix(This,aTftpPrefix)	\
-    (This)->lpVtbl -> get_TftpPrefix(This,aTftpPrefix)
-
-#define INATEngine_put_TftpPrefix(This,aTftpPrefix)	\
-    (This)->lpVtbl -> put_TftpPrefix(This,aTftpPrefix)
-
-#define INATEngine_get_TftpBootFile(This,aTftpBootFile)	\
-    (This)->lpVtbl -> get_TftpBootFile(This,aTftpBootFile)
-
-#define INATEngine_put_TftpBootFile(This,aTftpBootFile)	\
-    (This)->lpVtbl -> put_TftpBootFile(This,aTftpBootFile)
-
-#define INATEngine_get_TftpNextServer(This,aTftpNextServer)	\
-    (This)->lpVtbl -> get_TftpNextServer(This,aTftpNextServer)
-
-#define INATEngine_put_TftpNextServer(This,aTftpNextServer)	\
-    (This)->lpVtbl -> put_TftpNextServer(This,aTftpNextServer)
-
-#define INATEngine_get_AliasMode(This,aAliasMode)	\
-    (This)->lpVtbl -> get_AliasMode(This,aAliasMode)
-
-#define INATEngine_put_AliasMode(This,aAliasMode)	\
-    (This)->lpVtbl -> put_AliasMode(This,aAliasMode)
-
-#define INATEngine_get_DnsPassDomain(This,aDnsPassDomain)	\
-    (This)->lpVtbl -> get_DnsPassDomain(This,aDnsPassDomain)
-
-#define INATEngine_put_DnsPassDomain(This,aDnsPassDomain)	\
-    (This)->lpVtbl -> put_DnsPassDomain(This,aDnsPassDomain)
-
-#define INATEngine_get_DnsProxy(This,aDnsProxy)	\
-    (This)->lpVtbl -> get_DnsProxy(This,aDnsProxy)
-
-#define INATEngine_put_DnsProxy(This,aDnsProxy)	\
-    (This)->lpVtbl -> put_DnsProxy(This,aDnsProxy)
-
-#define INATEngine_get_DnsUseHostResolver(This,aDnsUseHostResolver)	\
-    (This)->lpVtbl -> get_DnsUseHostResolver(This,aDnsUseHostResolver)
-
-#define INATEngine_put_DnsUseHostResolver(This,aDnsUseHostResolver)	\
-    (This)->lpVtbl -> put_DnsUseHostResolver(This,aDnsUseHostResolver)
-
-#define INATEngine_get_Redirects(This,aRedirects)	\
-    (This)->lpVtbl -> get_Redirects(This,aRedirects)
-
-#define INATEngine_SetNetworkSettings(This,aMtu,aSockSnd,aSockRcv,aTcpWndSnd,aTcpWndRcv)	\
-    (This)->lpVtbl -> SetNetworkSettings(This,aMtu,aSockSnd,aSockRcv,aTcpWndSnd,aTcpWndRcv)
-
-#define INATEngine_GetNetworkSettings(This,aMtu,aSockSnd,aSockRcv,aTcpWndSnd,aTcpWndRcv)	\
-    (This)->lpVtbl -> GetNetworkSettings(This,aMtu,aSockSnd,aSockRcv,aTcpWndSnd,aTcpWndRcv)
-
-#define INATEngine_AddRedirect(This,aName,aProto,aHostIp,aHostPort,aGuestIp,aGuestPort)	\
-    (This)->lpVtbl -> AddRedirect(This,aName,aProto,aHostIp,aHostPort,aGuestIp,aGuestPort)
-
-#define INATEngine_RemoveRedirect(This,aName)	\
-    (This)->lpVtbl -> RemoveRedirect(This,aName)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE INATEngine_get_Network_Proxy( 
-    INATEngine * This,
-    /* [retval][out] */ BSTR *aNetwork);
-
-
-void __RPC_STUB INATEngine_get_Network_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE INATEngine_put_Network_Proxy( 
-    INATEngine * This,
-    /* [in] */ BSTR aNetwork);
-
-
-void __RPC_STUB INATEngine_put_Network_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE INATEngine_get_HostIP_Proxy( 
-    INATEngine * This,
-    /* [retval][out] */ BSTR *aHostIP);
-
-
-void __RPC_STUB INATEngine_get_HostIP_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE INATEngine_put_HostIP_Proxy( 
-    INATEngine * This,
-    /* [in] */ BSTR aHostIP);
-
-
-void __RPC_STUB INATEngine_put_HostIP_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE INATEngine_get_TftpPrefix_Proxy( 
-    INATEngine * This,
-    /* [retval][out] */ BSTR *aTftpPrefix);
-
-
-void __RPC_STUB INATEngine_get_TftpPrefix_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE INATEngine_put_TftpPrefix_Proxy( 
-    INATEngine * This,
-    /* [in] */ BSTR aTftpPrefix);
-
-
-void __RPC_STUB INATEngine_put_TftpPrefix_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE INATEngine_get_TftpBootFile_Proxy( 
-    INATEngine * This,
-    /* [retval][out] */ BSTR *aTftpBootFile);
-
-
-void __RPC_STUB INATEngine_get_TftpBootFile_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE INATEngine_put_TftpBootFile_Proxy( 
-    INATEngine * This,
-    /* [in] */ BSTR aTftpBootFile);
-
-
-void __RPC_STUB INATEngine_put_TftpBootFile_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE INATEngine_get_TftpNextServer_Proxy( 
-    INATEngine * This,
-    /* [retval][out] */ BSTR *aTftpNextServer);
-
-
-void __RPC_STUB INATEngine_get_TftpNextServer_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE INATEngine_put_TftpNextServer_Proxy( 
-    INATEngine * This,
-    /* [in] */ BSTR aTftpNextServer);
-
-
-void __RPC_STUB INATEngine_put_TftpNextServer_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE INATEngine_get_AliasMode_Proxy( 
-    INATEngine * This,
-    /* [retval][out] */ ULONG *aAliasMode);
-
-
-void __RPC_STUB INATEngine_get_AliasMode_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE INATEngine_put_AliasMode_Proxy( 
-    INATEngine * This,
-    /* [in] */ ULONG aAliasMode);
-
-
-void __RPC_STUB INATEngine_put_AliasMode_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE INATEngine_get_DnsPassDomain_Proxy( 
-    INATEngine * This,
-    /* [retval][out] */ BOOL *aDnsPassDomain);
-
-
-void __RPC_STUB INATEngine_get_DnsPassDomain_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE INATEngine_put_DnsPassDomain_Proxy( 
-    INATEngine * This,
-    /* [in] */ BOOL aDnsPassDomain);
-
-
-void __RPC_STUB INATEngine_put_DnsPassDomain_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE INATEngine_get_DnsProxy_Proxy( 
-    INATEngine * This,
-    /* [retval][out] */ BOOL *aDnsProxy);
-
-
-void __RPC_STUB INATEngine_get_DnsProxy_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE INATEngine_put_DnsProxy_Proxy( 
-    INATEngine * This,
-    /* [in] */ BOOL aDnsProxy);
-
-
-void __RPC_STUB INATEngine_put_DnsProxy_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE INATEngine_get_DnsUseHostResolver_Proxy( 
-    INATEngine * This,
-    /* [retval][out] */ BOOL *aDnsUseHostResolver);
-
-
-void __RPC_STUB INATEngine_get_DnsUseHostResolver_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propput] */ HRESULT STDMETHODCALLTYPE INATEngine_put_DnsUseHostResolver_Proxy( 
-    INATEngine * This,
-    /* [in] */ BOOL aDnsUseHostResolver);
-
-
-void __RPC_STUB INATEngine_put_DnsUseHostResolver_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* [propget] */ HRESULT STDMETHODCALLTYPE INATEngine_get_Redirects_Proxy( 
-    INATEngine * This,
-    /* [retval][out] */ SAFEARRAY * *aRedirects);
-
-
-void __RPC_STUB INATEngine_get_Redirects_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE INATEngine_SetNetworkSettings_Proxy( 
-    INATEngine * This,
-    /* [in] */ ULONG aMtu,
-    /* [in] */ ULONG aSockSnd,
-    /* [in] */ ULONG aSockRcv,
-    /* [in] */ ULONG aTcpWndSnd,
-    /* [in] */ ULONG aTcpWndRcv);
-
-
-void __RPC_STUB INATEngine_SetNetworkSettings_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE INATEngine_GetNetworkSettings_Proxy( 
-    INATEngine * This,
-    /* [out] */ ULONG *aMtu,
-    /* [out] */ ULONG *aSockSnd,
-    /* [out] */ ULONG *aSockRcv,
-    /* [out] */ ULONG *aTcpWndSnd,
-    /* [out] */ ULONG *aTcpWndRcv);
-
-
-void __RPC_STUB INATEngine_GetNetworkSettings_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE INATEngine_AddRedirect_Proxy( 
-    INATEngine * This,
-    /* [in] */ BSTR aName,
-    /* [in] */ NATProtocol aProto,
-    /* [in] */ BSTR aHostIp,
-    /* [in] */ USHORT aHostPort,
-    /* [in] */ BSTR aGuestIp,
-    /* [in] */ USHORT aGuestPort);
-
-
-void __RPC_STUB INATEngine_AddRedirect_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-HRESULT STDMETHODCALLTYPE INATEngine_RemoveRedirect_Proxy( 
-    INATEngine * This,
-    /* [in] */ BSTR aName);
-
-
-void __RPC_STUB INATEngine_RemoveRedirect_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __INATEngine_INTERFACE_DEFINED__ */
-
-
-EXTERN_C const CLSID CLSID_VirtualBox;
-
-#ifdef __cplusplus
-
-class DECLSPEC_UUID("B1A7A4F2-47B9-4A1E-82B2-07CCD5323C3F")
-VirtualBox;
-#endif
-
-EXTERN_C const CLSID CLSID_Session;
-
-#ifdef __cplusplus
-
-class DECLSPEC_UUID("3C02F46D-C9D2-4F11-A384-53F0CF917214")
-Session;
-#endif
-
-EXTERN_C const CLSID CLSID_CallbackWrapper;
-
-#ifdef __cplusplus
-
-class DECLSPEC_UUID("49EE8561-5563-4715-B18C-A4B1A490DAFE")
-CallbackWrapper;
-#endif
-#endif /* __VirtualBox_LIBRARY_DEFINED__ */
-
-/* Additional Prototypes for ALL interfaces */
-
-/* end of Additional Prototypes */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-
diff --git a/samples/vboxwrapper/deprecated/mscom/VirtualBox.tlb b/samples/vboxwrapper/deprecated/mscom/VirtualBox.tlb
deleted file mode 100644
index 84638ab..0000000
Binary files a/samples/vboxwrapper/deprecated/mscom/VirtualBox.tlb and /dev/null differ
diff --git a/samples/vboxwrapper/deprecated/mscom/VirtualBox_i.c b/samples/vboxwrapper/deprecated/mscom/VirtualBox_i.c
deleted file mode 100644
index 4db9b6b..0000000
--- a/samples/vboxwrapper/deprecated/mscom/VirtualBox_i.c
+++ /dev/null
@@ -1,468 +0,0 @@
-
-
-/* this ALWAYS GENERATED file contains the IIDs and CLSIDs */
-
-/* link this file in with the server and any clients */
-
-
- /* File created by MIDL compiler version 6.00.0361 */
-/* at Fri Oct  8 15:47:06 2010
- */
-/* Compiler settings for Z:\home\vbox\tinderbox\3.2-sdk\out\linux.amd64\release\bin\sdk\bindings\mscom\idl\VirtualBox.idl:
-    Oicf, W1, Zp8, env=Win32 (32b run)
-    protocol : dce , ms_ext, c_ext, robust
-    error checks: allocation ref bounds_check enum stub_data 
-    VC __declspec() decoration level: 
-         __declspec(uuid()), __declspec(selectany), __declspec(novtable)
-         DECLSPEC_UUID(), MIDL_INTERFACE()
-*/
-//@@MIDL_FILE_HEADING(  )
-
-#if !defined(_M_IA64) && !defined(_M_AMD64)
-
-
-#pragma warning( disable: 4049 )  /* more than 64k source lines */
-
-
-#ifdef __cplusplus
-extern "C"{
-#endif 
-
-
-#include <rpc.h>
-#include <rpcndr.h>
-
-#ifdef _MIDL_USE_GUIDDEF_
-
-#ifndef INITGUID
-#define INITGUID
-#include <guiddef.h>
-#undef INITGUID
-#else
-#include <guiddef.h>
-#endif
-
-#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
-        DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8)
-
-#else // !_MIDL_USE_GUIDDEF_
-
-#ifndef __IID_DEFINED__
-#define __IID_DEFINED__
-
-typedef struct _IID
-{
-    unsigned long x;
-    unsigned short s1;
-    unsigned short s2;
-    unsigned char  c[8];
-} IID;
-
-#endif // __IID_DEFINED__
-
-#ifndef CLSID_DEFINED
-#define CLSID_DEFINED
-typedef IID CLSID;
-#endif // CLSID_DEFINED
-
-#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
-        const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
-
-#endif !_MIDL_USE_GUIDDEF_
-
-MIDL_DEFINE_GUID(IID, LIBID_VirtualBox,0x46137EEC,0x703B,0x4fe5,0xAF,0xD4,0x7C,0x9B,0xBB,0xBA,0x02,0x59);
-
-
-MIDL_DEFINE_GUID(IID, IID_IVirtualBoxErrorInfo,0x4b86d186,0x407e,0x4f9e,0x8b,0xe8,0xe5,0x00,0x61,0xbe,0x87,0x25);
-
-
-MIDL_DEFINE_GUID(IID, IID_ILocalOwner,0x308FF42A,0xDC45,0x49D4,0xA9,0x50,0xB1,0xEE,0xE5,0xE0,0x0B,0xB5);
-
-
-MIDL_DEFINE_GUID(IID, IID_IVirtualBoxCallback,0x7f6a65b6,0xad5d,0x4a67,0x88,0x72,0x0b,0x11,0xcb,0x7e,0xa9,0x5c);
-
-
-MIDL_DEFINE_GUID(IID, IID_IDHCPServer,0x6cfe387c,0x74fb,0x4ca7,0xbf,0xf6,0x97,0x3b,0xec,0x8a,0xf7,0xa3);
-
-
-MIDL_DEFINE_GUID(IID, IID_IVirtualBox,0x3f36e024,0x7fed,0x4f20,0xa0,0x2c,0x91,0x58,0xa8,0x2b,0x44,0xe6);
-
-
-MIDL_DEFINE_GUID(IID, IID_IVFSExplorer,0x2bb864a1,0x02a3,0x4474,0xa1,0xd4,0xfb,0x5f,0x23,0xb7,0x42,0xe1);
-
-
-MIDL_DEFINE_GUID(IID, IID_IAppliance,0xe3ba9ab9,0xac2c,0x4266,0x8b,0xd2,0x91,0xc4,0xbf,0x72,0x1c,0xeb);
-
-
-MIDL_DEFINE_GUID(IID, IID_IVirtualSystemDescription,0xd7525e6c,0x531a,0x4c51,0x8e,0x04,0x41,0x23,0x50,0x83,0xa3,0xd8);
-
-
-MIDL_DEFINE_GUID(IID, IID_IInternalMachineControl,0x26604a54,0x8628,0x491b,0xa0,0xea,0xe1,0x39,0x2a,0x16,0xd1,0x3b);
-
-
-MIDL_DEFINE_GUID(IID, IID_IBIOSSettings,0x38b54279,0xdc35,0x4f5e,0xa4,0x31,0x83,0x5b,0x86,0x7c,0x6b,0x5e);
-
-
-MIDL_DEFINE_GUID(IID, IID_IMachine,0x6d9212cb,0xa5c0,0x48b7,0xbb,0xc1,0x3f,0xa2,0xba,0x2e,0xe6,0xd2);
-
-
-MIDL_DEFINE_GUID(IID, IID_IConsoleCallback,0x60703f8d,0x81e4,0x4b45,0xa1,0x47,0xdc,0xfd,0x07,0x69,0x2b,0x19);
-
-
-MIDL_DEFINE_GUID(IID, IID_IRemoteDisplayInfo,0xb3741084,0x806f,0x4c3b,0x8c,0x42,0xeb,0xad,0x1a,0x81,0xe4,0x5a);
-
-
-MIDL_DEFINE_GUID(IID, IID_IConsole,0x6375231a,0xc17c,0x464b,0x92,0xcb,0xae,0x9e,0x12,0x8d,0x71,0xc3);
-
-
-MIDL_DEFINE_GUID(IID, IID_IHostNetworkInterface,0xce6fae58,0x7642,0x4102,0xb5,0xdb,0xc9,0x00,0x5c,0x23,0x20,0xa8);
-
-
-MIDL_DEFINE_GUID(IID, IID_IHost,0x35b004f4,0x7806,0x4009,0xbf,0xa8,0xd1,0x30,0x8a,0xdb,0xa7,0xe5);
-
-
-MIDL_DEFINE_GUID(IID, IID_ISystemProperties,0x07c3ffd8,0x8f59,0x49cc,0xb6,0x08,0x53,0xa3,0x32,0xe8,0x5c,0xc3);
-
-
-MIDL_DEFINE_GUID(IID, IID_IGuestOSType,0xe3f6727e,0xa09b,0x41ea,0xa8,0x24,0x86,0x4a,0x17,0x64,0x72,0xf3);
-
-
-MIDL_DEFINE_GUID(IID, IID_IGuest,0xd915dff1,0xed38,0x495a,0x91,0xf1,0xab,0x6c,0x53,0x93,0x24,0x68);
-
-
-MIDL_DEFINE_GUID(IID, IID_IProgress,0x856aa038,0x853f,0x42e2,0xac,0xf7,0x6e,0x7b,0x02,0xdb,0xe2,0x94);
-
-
-MIDL_DEFINE_GUID(IID, IID_ISnapshot,0x1a2d0551,0x58a4,0x4107,0x85,0x7e,0xef,0x41,0x4f,0xc4,0x2f,0xfc);
-
-
-MIDL_DEFINE_GUID(IID, IID_IMediumAttachment,0xe58eb3eb,0x8627,0x428b,0xbd,0xf8,0x34,0x48,0x7c,0x84,0x8d,0xe5);
-
-
-MIDL_DEFINE_GUID(IID, IID_IMedium,0x1d578f43,0x5ef1,0x4415,0xb5,0x56,0x75,0x92,0xd3,0xcc,0xdc,0x8f);
-
-
-MIDL_DEFINE_GUID(IID, IID_IMediumFormat,0x89f52554,0xd469,0x4799,0x9f,0xad,0x17,0x05,0xe8,0x6a,0x08,0xb1);
-
-
-MIDL_DEFINE_GUID(IID, IID_IKeyboard,0x2d1a531b,0x4c6e,0x49cc,0x8a,0xf6,0x5c,0x85,0x7b,0x78,0xb5,0xd7);
-
-
-MIDL_DEFINE_GUID(IID, IID_IMouse,0x7c0f2eae,0xf92d,0x498c,0xb8,0x02,0xe1,0xa3,0x76,0x37,0x74,0xdc);
-
-
-MIDL_DEFINE_GUID(IID, IID_IFramebuffer,0xb7ed347a,0x5765,0x40a0,0xae,0x1c,0xf5,0x43,0xeb,0x4d,0xde,0xaf);
-
-
-MIDL_DEFINE_GUID(IID, IID_IFramebufferOverlay,0x0bcc1c7e,0xe415,0x47d2,0xbf,0xdb,0xe4,0xc7,0x05,0xfb,0x0f,0x47);
-
-
-MIDL_DEFINE_GUID(IID, IID_IDisplay,0x1fa79e39,0x0cc9,0x4ab3,0x9d,0xf3,0xed,0x3e,0x96,0xb4,0x24,0x96);
-
-
-MIDL_DEFINE_GUID(IID, IID_INetworkAdapter,0x5bdb9df8,0xa5e1,0x4322,0xa1,0x39,0xb7,0xa4,0xa7,0x34,0xc7,0x90);
-
-
-MIDL_DEFINE_GUID(IID, IID_ISerialPort,0x937f6970,0x5103,0x4745,0xb7,0x8e,0xd2,0x8d,0xcf,0x14,0x79,0xa8);
-
-
-MIDL_DEFINE_GUID(IID, IID_IParallelPort,0x0c925f06,0xdd10,0x4b77,0x8d,0xe8,0x29,0x4d,0x73,0x8c,0x32,0x14);
-
-
-MIDL_DEFINE_GUID(IID, IID_IMachineDebugger,0xb0b2a2dd,0x0627,0x4502,0x91,0xc2,0xdd,0xc5,0xe7,0x76,0x09,0xe0);
-
-
-MIDL_DEFINE_GUID(IID, IID_IUSBController,0x6fdcccc5,0xabd3,0x4fec,0x93,0x87,0x2a,0xd3,0x91,0x4f,0xc4,0xa8);
-
-
-MIDL_DEFINE_GUID(IID, IID_IUSBDevice,0xf8967b0b,0x4483,0x400f,0x92,0xb5,0x8b,0x67,0x5d,0x98,0xa8,0x5b);
-
-
-MIDL_DEFINE_GUID(IID, IID_IUSBDeviceFilter,0xd6831fb4,0x1a94,0x4c2c,0x96,0xef,0x8d,0x0d,0x61,0x92,0x06,0x6d);
-
-
-MIDL_DEFINE_GUID(IID, IID_IHostUSBDevice,0x173b4b44,0xd268,0x4334,0xa0,0x0d,0xb6,0x52,0x1c,0x9a,0x74,0x0a);
-
-
-MIDL_DEFINE_GUID(IID, IID_IHostUSBDeviceFilter,0x4cc70246,0xd74a,0x400f,0x82,0x22,0x39,0x00,0x48,0x9c,0x03,0x74);
-
-
-MIDL_DEFINE_GUID(IID, IID_IAudioAdapter,0x921873db,0x5f3f,0x4b69,0x91,0xf9,0x7b,0xe9,0xe5,0x35,0xa2,0xcb);
-
-
-MIDL_DEFINE_GUID(IID, IID_IVRDPServer,0x7aeeb530,0x0b08,0x41fe,0x83,0x5d,0x9b,0xe9,0xec,0x1d,0xbe,0x5c);
-
-
-MIDL_DEFINE_GUID(IID, IID_ISharedFolder,0x64637bb2,0x9e17,0x471c,0xb8,0xf3,0xf8,0x96,0x8d,0xd9,0x88,0x4e);
-
-
-MIDL_DEFINE_GUID(IID, IID_IInternalSessionControl,0xab161f72,0xe4b3,0x44e6,0xa9,0x19,0x22,0x56,0x47,0x4b,0xda,0x66);
-
-
-MIDL_DEFINE_GUID(IID, IID_ISession,0x12F4DCDB,0x12B2,0x4EC1,0xB7,0xCD,0xDD,0xD9,0xF6,0xC5,0xBF,0x4D);
-
-
-MIDL_DEFINE_GUID(IID, IID_IStorageController,0xfd93adc0,0xbbaa,0x4256,0x9e,0x6e,0x00,0xe2,0x9f,0x91,0x51,0xc9);
-
-
-MIDL_DEFINE_GUID(IID, IID_IPerformanceMetric,0x2a1a60ae,0x9345,0x4019,0xad,0x53,0xd3,0x4b,0xa4,0x1c,0xbf,0xe9);
-
-
-MIDL_DEFINE_GUID(IID, IID_IPerformanceCollector,0xe22e1acb,0xac4a,0x43bb,0xa3,0x1c,0x17,0x32,0x16,0x59,0xb0,0xc6);
-
-
-MIDL_DEFINE_GUID(IID, IID_INATEngine,0x4b286616,0xeb03,0x11de,0xb0,0xfb,0x17,0x01,0xec,0xa4,0x22,0x46);
-
-
-MIDL_DEFINE_GUID(CLSID, CLSID_VirtualBox,0xB1A7A4F2,0x47B9,0x4A1E,0x82,0xB2,0x07,0xCC,0xD5,0x32,0x3C,0x3F);
-
-
-MIDL_DEFINE_GUID(CLSID, CLSID_Session,0x3C02F46D,0xC9D2,0x4F11,0xA3,0x84,0x53,0xF0,0xCF,0x91,0x72,0x14);
-
-
-MIDL_DEFINE_GUID(CLSID, CLSID_CallbackWrapper,0x49EE8561,0x5563,0x4715,0xB1,0x8C,0xA4,0xB1,0xA4,0x90,0xDA,0xFE);
-
-#undef MIDL_DEFINE_GUID
-
-#ifdef __cplusplus
-}
-#endif
-
-
-
-#endif /* !defined(_M_IA64) && !defined(_M_AMD64)*/
-
-
-
-/* this ALWAYS GENERATED file contains the IIDs and CLSIDs */
-
-/* link this file in with the server and any clients */
-
-
- /* File created by MIDL compiler version 6.00.0361 */
-/* at Fri Oct  8 15:47:06 2010
- */
-/* Compiler settings for Z:\home\vbox\tinderbox\3.2-sdk\out\linux.amd64\release\bin\sdk\bindings\mscom\idl\VirtualBox.idl:
-    Oicf, W1, Zp8, env=Win64 (32b run,appending)
-    protocol : dce , ms_ext, c_ext, robust
-    error checks: allocation ref bounds_check enum stub_data 
-    VC __declspec() decoration level: 
-         __declspec(uuid()), __declspec(selectany), __declspec(novtable)
-         DECLSPEC_UUID(), MIDL_INTERFACE()
-*/
-//@@MIDL_FILE_HEADING(  )
-
-#if defined(_M_IA64) || defined(_M_AMD64)
-
-
-#pragma warning( disable: 4049 )  /* more than 64k source lines */
-
-
-#ifdef __cplusplus
-extern "C"{
-#endif 
-
-
-#include <rpc.h>
-#include <rpcndr.h>
-
-#ifdef _MIDL_USE_GUIDDEF_
-
-#ifndef INITGUID
-#define INITGUID
-#include <guiddef.h>
-#undef INITGUID
-#else
-#include <guiddef.h>
-#endif
-
-#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
-        DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8)
-
-#else // !_MIDL_USE_GUIDDEF_
-
-#ifndef __IID_DEFINED__
-#define __IID_DEFINED__
-
-typedef struct _IID
-{
-    unsigned long x;
-    unsigned short s1;
-    unsigned short s2;
-    unsigned char  c[8];
-} IID;
-
-#endif // __IID_DEFINED__
-
-#ifndef CLSID_DEFINED
-#define CLSID_DEFINED
-typedef IID CLSID;
-#endif // CLSID_DEFINED
-
-#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
-        const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
-
-#endif !_MIDL_USE_GUIDDEF_
-
-MIDL_DEFINE_GUID(IID, LIBID_VirtualBox,0x46137EEC,0x703B,0x4fe5,0xAF,0xD4,0x7C,0x9B,0xBB,0xBA,0x02,0x59);
-
-
-MIDL_DEFINE_GUID(IID, IID_IVirtualBoxErrorInfo,0x4b86d186,0x407e,0x4f9e,0x8b,0xe8,0xe5,0x00,0x61,0xbe,0x87,0x25);
-
-
-MIDL_DEFINE_GUID(IID, IID_ILocalOwner,0x308FF42A,0xDC45,0x49D4,0xA9,0x50,0xB1,0xEE,0xE5,0xE0,0x0B,0xB5);
-
-
-MIDL_DEFINE_GUID(IID, IID_IVirtualBoxCallback,0x7f6a65b6,0xad5d,0x4a67,0x88,0x72,0x0b,0x11,0xcb,0x7e,0xa9,0x5c);
-
-
-MIDL_DEFINE_GUID(IID, IID_IDHCPServer,0x6cfe387c,0x74fb,0x4ca7,0xbf,0xf6,0x97,0x3b,0xec,0x8a,0xf7,0xa3);
-
-
-MIDL_DEFINE_GUID(IID, IID_IVirtualBox,0x3f36e024,0x7fed,0x4f20,0xa0,0x2c,0x91,0x58,0xa8,0x2b,0x44,0xe6);
-
-
-MIDL_DEFINE_GUID(IID, IID_IVFSExplorer,0x2bb864a1,0x02a3,0x4474,0xa1,0xd4,0xfb,0x5f,0x23,0xb7,0x42,0xe1);
-
-
-MIDL_DEFINE_GUID(IID, IID_IAppliance,0xe3ba9ab9,0xac2c,0x4266,0x8b,0xd2,0x91,0xc4,0xbf,0x72,0x1c,0xeb);
-
-
-MIDL_DEFINE_GUID(IID, IID_IVirtualSystemDescription,0xd7525e6c,0x531a,0x4c51,0x8e,0x04,0x41,0x23,0x50,0x83,0xa3,0xd8);
-
-
-MIDL_DEFINE_GUID(IID, IID_IInternalMachineControl,0x26604a54,0x8628,0x491b,0xa0,0xea,0xe1,0x39,0x2a,0x16,0xd1,0x3b);
-
-
-MIDL_DEFINE_GUID(IID, IID_IBIOSSettings,0x38b54279,0xdc35,0x4f5e,0xa4,0x31,0x83,0x5b,0x86,0x7c,0x6b,0x5e);
-
-
-MIDL_DEFINE_GUID(IID, IID_IMachine,0x6d9212cb,0xa5c0,0x48b7,0xbb,0xc1,0x3f,0xa2,0xba,0x2e,0xe6,0xd2);
-
-
-MIDL_DEFINE_GUID(IID, IID_IConsoleCallback,0x60703f8d,0x81e4,0x4b45,0xa1,0x47,0xdc,0xfd,0x07,0x69,0x2b,0x19);
-
-
-MIDL_DEFINE_GUID(IID, IID_IRemoteDisplayInfo,0xb3741084,0x806f,0x4c3b,0x8c,0x42,0xeb,0xad,0x1a,0x81,0xe4,0x5a);
-
-
-MIDL_DEFINE_GUID(IID, IID_IConsole,0x6375231a,0xc17c,0x464b,0x92,0xcb,0xae,0x9e,0x12,0x8d,0x71,0xc3);
-
-
-MIDL_DEFINE_GUID(IID, IID_IHostNetworkInterface,0xce6fae58,0x7642,0x4102,0xb5,0xdb,0xc9,0x00,0x5c,0x23,0x20,0xa8);
-
-
-MIDL_DEFINE_GUID(IID, IID_IHost,0x35b004f4,0x7806,0x4009,0xbf,0xa8,0xd1,0x30,0x8a,0xdb,0xa7,0xe5);
-
-
-MIDL_DEFINE_GUID(IID, IID_ISystemProperties,0x07c3ffd8,0x8f59,0x49cc,0xb6,0x08,0x53,0xa3,0x32,0xe8,0x5c,0xc3);
-
-
-MIDL_DEFINE_GUID(IID, IID_IGuestOSType,0xe3f6727e,0xa09b,0x41ea,0xa8,0x24,0x86,0x4a,0x17,0x64,0x72,0xf3);
-
-
-MIDL_DEFINE_GUID(IID, IID_IGuest,0xd915dff1,0xed38,0x495a,0x91,0xf1,0xab,0x6c,0x53,0x93,0x24,0x68);
-
-
-MIDL_DEFINE_GUID(IID, IID_IProgress,0x856aa038,0x853f,0x42e2,0xac,0xf7,0x6e,0x7b,0x02,0xdb,0xe2,0x94);
-
-
-MIDL_DEFINE_GUID(IID, IID_ISnapshot,0x1a2d0551,0x58a4,0x4107,0x85,0x7e,0xef,0x41,0x4f,0xc4,0x2f,0xfc);
-
-
-MIDL_DEFINE_GUID(IID, IID_IMediumAttachment,0xe58eb3eb,0x8627,0x428b,0xbd,0xf8,0x34,0x48,0x7c,0x84,0x8d,0xe5);
-
-
-MIDL_DEFINE_GUID(IID, IID_IMedium,0x1d578f43,0x5ef1,0x4415,0xb5,0x56,0x75,0x92,0xd3,0xcc,0xdc,0x8f);
-
-
-MIDL_DEFINE_GUID(IID, IID_IMediumFormat,0x89f52554,0xd469,0x4799,0x9f,0xad,0x17,0x05,0xe8,0x6a,0x08,0xb1);
-
-
-MIDL_DEFINE_GUID(IID, IID_IKeyboard,0x2d1a531b,0x4c6e,0x49cc,0x8a,0xf6,0x5c,0x85,0x7b,0x78,0xb5,0xd7);
-
-
-MIDL_DEFINE_GUID(IID, IID_IMouse,0x7c0f2eae,0xf92d,0x498c,0xb8,0x02,0xe1,0xa3,0x76,0x37,0x74,0xdc);
-
-
-MIDL_DEFINE_GUID(IID, IID_IFramebuffer,0xb7ed347a,0x5765,0x40a0,0xae,0x1c,0xf5,0x43,0xeb,0x4d,0xde,0xaf);
-
-
-MIDL_DEFINE_GUID(IID, IID_IFramebufferOverlay,0x0bcc1c7e,0xe415,0x47d2,0xbf,0xdb,0xe4,0xc7,0x05,0xfb,0x0f,0x47);
-
-
-MIDL_DEFINE_GUID(IID, IID_IDisplay,0x1fa79e39,0x0cc9,0x4ab3,0x9d,0xf3,0xed,0x3e,0x96,0xb4,0x24,0x96);
-
-
-MIDL_DEFINE_GUID(IID, IID_INetworkAdapter,0x5bdb9df8,0xa5e1,0x4322,0xa1,0x39,0xb7,0xa4,0xa7,0x34,0xc7,0x90);
-
-
-MIDL_DEFINE_GUID(IID, IID_ISerialPort,0x937f6970,0x5103,0x4745,0xb7,0x8e,0xd2,0x8d,0xcf,0x14,0x79,0xa8);
-
-
-MIDL_DEFINE_GUID(IID, IID_IParallelPort,0x0c925f06,0xdd10,0x4b77,0x8d,0xe8,0x29,0x4d,0x73,0x8c,0x32,0x14);
-
-
-MIDL_DEFINE_GUID(IID, IID_IMachineDebugger,0xb0b2a2dd,0x0627,0x4502,0x91,0xc2,0xdd,0xc5,0xe7,0x76,0x09,0xe0);
-
-
-MIDL_DEFINE_GUID(IID, IID_IUSBController,0x6fdcccc5,0xabd3,0x4fec,0x93,0x87,0x2a,0xd3,0x91,0x4f,0xc4,0xa8);
-
-
-MIDL_DEFINE_GUID(IID, IID_IUSBDevice,0xf8967b0b,0x4483,0x400f,0x92,0xb5,0x8b,0x67,0x5d,0x98,0xa8,0x5b);
-
-
-MIDL_DEFINE_GUID(IID, IID_IUSBDeviceFilter,0xd6831fb4,0x1a94,0x4c2c,0x96,0xef,0x8d,0x0d,0x61,0x92,0x06,0x6d);
-
-
-MIDL_DEFINE_GUID(IID, IID_IHostUSBDevice,0x173b4b44,0xd268,0x4334,0xa0,0x0d,0xb6,0x52,0x1c,0x9a,0x74,0x0a);
-
-
-MIDL_DEFINE_GUID(IID, IID_IHostUSBDeviceFilter,0x4cc70246,0xd74a,0x400f,0x82,0x22,0x39,0x00,0x48,0x9c,0x03,0x74);
-
-
-MIDL_DEFINE_GUID(IID, IID_IAudioAdapter,0x921873db,0x5f3f,0x4b69,0x91,0xf9,0x7b,0xe9,0xe5,0x35,0xa2,0xcb);
-
-
-MIDL_DEFINE_GUID(IID, IID_IVRDPServer,0x7aeeb530,0x0b08,0x41fe,0x83,0x5d,0x9b,0xe9,0xec,0x1d,0xbe,0x5c);
-
-
-MIDL_DEFINE_GUID(IID, IID_ISharedFolder,0x64637bb2,0x9e17,0x471c,0xb8,0xf3,0xf8,0x96,0x8d,0xd9,0x88,0x4e);
-
-
-MIDL_DEFINE_GUID(IID, IID_IInternalSessionControl,0xab161f72,0xe4b3,0x44e6,0xa9,0x19,0x22,0x56,0x47,0x4b,0xda,0x66);
-
-
-MIDL_DEFINE_GUID(IID, IID_ISession,0x12F4DCDB,0x12B2,0x4EC1,0xB7,0xCD,0xDD,0xD9,0xF6,0xC5,0xBF,0x4D);
-
-
-MIDL_DEFINE_GUID(IID, IID_IStorageController,0xfd93adc0,0xbbaa,0x4256,0x9e,0x6e,0x00,0xe2,0x9f,0x91,0x51,0xc9);
-
-
-MIDL_DEFINE_GUID(IID, IID_IPerformanceMetric,0x2a1a60ae,0x9345,0x4019,0xad,0x53,0xd3,0x4b,0xa4,0x1c,0xbf,0xe9);
-
-
-MIDL_DEFINE_GUID(IID, IID_IPerformanceCollector,0xe22e1acb,0xac4a,0x43bb,0xa3,0x1c,0x17,0x32,0x16,0x59,0xb0,0xc6);
-
-
-MIDL_DEFINE_GUID(IID, IID_INATEngine,0x4b286616,0xeb03,0x11de,0xb0,0xfb,0x17,0x01,0xec,0xa4,0x22,0x46);
-
-
-MIDL_DEFINE_GUID(CLSID, CLSID_VirtualBox,0xB1A7A4F2,0x47B9,0x4A1E,0x82,0xB2,0x07,0xCC,0xD5,0x32,0x3C,0x3F);
-
-
-MIDL_DEFINE_GUID(CLSID, CLSID_Session,0x3C02F46D,0xC9D2,0x4F11,0xA3,0x84,0x53,0xF0,0xCF,0x91,0x72,0x14);
-
-
-MIDL_DEFINE_GUID(CLSID, CLSID_CallbackWrapper,0x49EE8561,0x5563,0x4715,0xB1,0x8C,0xA4,0xB1,0xA4,0x90,0xDA,0xFE);
-
-#undef MIDL_DEFINE_GUID
-
-#ifdef __cplusplus
-}
-#endif
-
-
-
-#endif /* defined(_M_IA64) || defined(_M_AMD64)*/
-
diff --git a/samples/vboxwrapper/deprecated/vbox.cpp b/samples/vboxwrapper/deprecated/vbox.cpp
deleted file mode 100644
index 8279005..0000000
--- a/samples/vboxwrapper/deprecated/vbox.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-// This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2010 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 <sys/wait.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <vector>
-#include <string>
-#include <unistd.h>
-#endif
-
-#include "diagnostics.h"
-#include "filesys.h"
-#include "parse.h"
-#include "str_util.h"
-#include "str_replace.h"
-#include "util.h"
-#include "error_numbers.h"
-#include "procinfo.h"
-#include "boinc_api.h"
-#include "vbox.h"
-
-
-// returns the current directory in which the executable resides.
-//
-int virtualbox_generate_vm_root_dir( std::string& dir ) {
-    TCHAR root_dir[256];
-
-#ifdef _WIN32
-    _getcwd(root_dir, (sizeof(root_dir)*sizeof(TCHAR)));
-#else
-    getcwd(root_dir, (sizeof(root_dir)*sizeof(TCHAR)));
-#endif
-
-    dir = root_dir;
-
-    if (!dir.empty()) {
-        return 1;
-    }
-    return 0;
-}
-
-
-// Generate a unique virtual machine name for a given task instance
-// Rules:
-//   1. Must be unique
-//   2. Must identifity itself as being part of BOINC
-//   3. Must be file system compatible
-//
-int virtualbox_generate_vm_name( std::string& name ) {
-    APP_INIT_DATA aid;
-    boinc_get_init_data_p( &aid );
-
-    name.empty();
-    name = "boinc_";
-
-    if (boinc_is_standalone()) {
-        name += "standalone";
-    } else {
-        name += aid.wu_name;
-    }
-
-    if (!name.empty()) {
-        return 1;
-    }
-    return 0;
-}
-
-
-// Generate a deterministic yet unique UUID for a given medium (hard drive,
-//   cd drive, hard drive image)
-// Rules:
-//   1. Must be unique
-//   2. Must identifity itself as being part of BOINC
-//   3. Must be based on the slot directory id
-//   4. Must be in the form of a GUID
-//      00000000-0000-0000-0000-000000000000
-//
-// Form/Meaning
-//   A        B    C    D    E
-//   00000000-0000-0000-0000-000000000000
-//
-//   A = Drive ID
-//   B = Slot ID
-//   C = Standalone Flag
-//   D = Reserved
-//   E = 'BOINC' ASCII converted to Hex
-//
-int virtualbox_generate_medium_uuid(  int drive_id, std::string& uuid ) {
-    APP_INIT_DATA aid;
-    TCHAR medium_uuid[256];
-
-    boinc_get_init_data_p( &aid );
-
-    sprintf(
-        medium_uuid,        
-        _T("%08d-%04d-%04d-0000-00424F494E43"),
-        drive_id,
-        aid.slot,
-        boinc_is_standalone()
-    );
-
-    uuid = medium_uuid;
-
-    if (!uuid.empty()) {
-        return 1;
-    }
-    return 0;
-}
-
diff --git a/samples/vboxwrapper/deprecated/vbox.h b/samples/vboxwrapper/deprecated/vbox.h
deleted file mode 100644
index e6dadee..0000000
--- a/samples/vboxwrapper/deprecated/vbox.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2010 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/>.
-
-
-// Provide cross-platform interfaces for making changes to VirtualBox
-
-#ifndef _VBOX_H_
-#define _VBOX_H_
-
-extern int virtualbox_generate_vm_root_dir( std::string& dir );
-extern int virtualbox_generate_vm_name( std::string& name );
-extern int virtualbox_generate_medium_uuid( int drive_id, std::string& uuid );
-
-extern bool virtualbox_vm_is_registered();
-extern bool virtualbox_vm_is_running();
-
-extern int virtualbox_initialize();
-extern int virtualbox_register_vm();
-extern int virtualbox_deregister_vm();
-extern int virtualbox_cleanup();
-
-extern int virtualbox_startvm();
-extern int virtualbox_stopvm();
-extern int virtualbox_pausevm();
-extern int virtualbox_resumevm();
-
-extern int virtualbox_monitor();
-
-#endif
diff --git a/samples/vboxwrapper/deprecated/vbox_win.cpp b/samples/vboxwrapper/deprecated/vbox_win.cpp
deleted file mode 100644
index 78d9d97..0000000
--- a/samples/vboxwrapper/deprecated/vbox_win.cpp
+++ /dev/null
@@ -1,952 +0,0 @@
-// This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2010 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 <sys/wait.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <vector>
-#include <string>
-#include <unistd.h>
-#endif
-
-#include "diagnostics.h"
-#include "filesys.h"
-#include "parse.h"
-#include "str_util.h"
-#include "str_replace.h"
-#include "util.h"
-#include "win_util.h"
-#include "error_numbers.h"
-#include "procinfo.h"
-#include "boinc_api.h"
-#include "vbox.h"
-#include "vm.h"
-#include "mscom/VirtualBox.h"
-
-
-IVirtualBox*    pVirtualBox;
-ISession*       pSession;
-
-
-//
-// Helper function to print MSCOM exception information set on the current
-// thread after a failed MSCOM method call. This function will also print
-// extended VirtualBox error info if it is available.
-//
-void virtualbox_dump_error() {
-    HRESULT rc;
-    BSTR strDescription = NULL;
-    char buf[256];
-    IErrorInfo* pErrorInfo;
-
-    rc = GetErrorInfo(0, &pErrorInfo);
-
-    if (FAILED(rc)) {
-        fprintf(
-            stderr,
-            "%s Error: getting error info! rc = 0x%x\n",
-            boinc_msg_prefix(buf, sizeof(buf)),
-            rc
-        );
-    } else {
-        rc = pErrorInfo->GetDescription(&strDescription);
-        if (FAILED(rc) || !strDescription) {
-            fprintf(
-                stderr,
-                "%s Error: getting error description! rc = 0x%x\n",
-                boinc_msg_prefix(buf, sizeof(buf)),
-                rc
-            );
-        } else {
-            fprintf(
-                stderr,
-                "%s Error description: %S\n",
-                boinc_msg_prefix(buf, sizeof(buf)),
-                strDescription
-            );
-            SysFreeString(strDescription);
-        }
-        pErrorInfo->Release();
-    }
-}
-
-
-bool virtualbox_vm_is_registered() {
-    bool retval = false;
-    HRESULT rc;
-    std::string name;
-    BSTR vm_name;
-    IMachine* pMachine = NULL;
-
-    virtualbox_generate_vm_name(name);
-    vm_name = SysAllocString(A2W(name).c_str());
-
-    rc = pVirtualBox->FindMachine(vm_name, &pMachine);
-    if (VBOX_E_OBJECT_NOT_FOUND != rc) {
-        retval = true;
-    }
-
-    SysFreeString(vm_name);
-    return retval;
-}
-
-
-bool virtualbox_vm_is_running() {
-    bool retval = false;
-    HRESULT rc;
-    MachineState machine_state;
-    IMachine* pMachine = NULL;
-
-    rc = pSession->get_Machine(&pMachine);
-    if (FAILED(rc)) goto CLEANUP;
-    rc = pMachine->get_State(&machine_state);
-    if (FAILED(rc)) goto CLEANUP;
-
-    if ((machine_state >= MachineState_FirstOnline) &&
-        (machine_state <= MachineState_LastOnline)
-    ) {
-        retval = true;
-    } 
-
-CLEANUP:
-    if (pMachine) {
-        pMachine->Release();
-        pMachine = NULL;
-    }
-    return retval;
-}
-
-
-int virtualbox_initialize() {
-    int retval = 0;
-    HRESULT rc;
-    char buf[256];
-
-    pVirtualBox = NULL;
-    pSession = NULL;
-
-    // Initialize the COM subsystem.
-    CoInitialize(NULL);
-
-    // Instantiate the VirtualBox root object.
-    rc = CoCreateInstance(CLSID_VirtualBox,       /* the VirtualBox base object */
-                          NULL,                   /* no aggregation */
-                          CLSCTX_LOCAL_SERVER,    /* the object lives in a server process on this machine */
-                          IID_IVirtualBox,        /* IID of the interface */
-                          (void**)&pVirtualBox);
-    if (!SUCCEEDED(rc))
-    {
-        fprintf(
-            stderr,
-            "%s Error creating VirtualBox instance! rc = 0x%x\n",
-            boinc_msg_prefix(buf, sizeof(buf)),
-            rc
-        );
-        retval = rc;
-        goto CLEANUP;
-    }
-
-    // Create the session object.
-    rc = CoCreateInstance(CLSID_Session,        /* the Session base object */
-                          NULL,                 /* no aggregation */
-                          CLSCTX_INPROC_SERVER, /* the object lives in the current process on this machine */
-                          IID_ISession,         /* IID of the interface */
-                          (void**)&pSession);
-    if (!SUCCEEDED(rc))
-    {
-        fprintf(
-            stderr,
-            "%s Error creating Session instance! rc = 0x%x\n",
-            boinc_msg_prefix(buf, sizeof(buf)),
-            rc
-        );
-        retval = rc;
-        goto CLEANUP;
-    }
-
-    // Cleanup
-CLEANUP:
-    return retval;
-}
-
-
-int virtualbox_register_vm() {
-    int retval = 0;
-    HRESULT rc;
-    std::string name;
-    std::string harddisk_uuid;
-    std::string root_dir;
-    BSTR vm_root_dir;
-    BSTR vm_name;
-    BSTR vm_os_name;
-    BSTR vm_os_version;
-    BSTR vm_disk_image_name;
-    BSTR vm_disk_image_type;
-    BSTR vm_shared_folder_name;
-    BSTR vm_shared_folder_dir_name;
-    BSTR vm_machine_uuid;
-    BSTR vm_harddisk_uuid;
-    BSTR strIDEController = SysAllocString(A2W(_T("IDE Controller")).c_str());
-    BSTR strEmpty = SysAllocString(A2W(_T("")).c_str());
-    char buf[256];
-    IMachine* pMachine = NULL;
-    IStorageController* pStorageController = NULL;
-    INetworkAdapter* pNetworkInterface = NULL;
-    IMedium* pHardDisk = NULL;
-
-
-    fprintf(
-        stderr,
-        "%s Registering virtual machine.\n",
-        boinc_msg_prefix(buf, sizeof(buf))
-    );
-
-
-    virtualbox_generate_vm_root_dir(root_dir);
-
-    virtualbox_generate_vm_name(name);
-    virtualbox_generate_medium_uuid(0, harddisk_uuid);
-
-    vm_root_dir = SysAllocString(A2W(root_dir).c_str());
-    vm_name = SysAllocString(A2W(name).c_str());
-    vm_os_name = SysAllocString(A2W(vm.vm_os_name).c_str());
-    vm_os_version = SysAllocString(A2W(vm.vm_os_version).c_str());
-    vm_disk_image_type = SysAllocString(A2W(vm.vm_disk_image_type).c_str());
-    vm_shared_folder_name = SysAllocString(A2W(vm.vm_shared_folder_name).c_str());
-    vm_harddisk_uuid = SysAllocString(A2W(harddisk_uuid).c_str());
-
-    // VirtualBox likes to see both the hard disk image and shared folder paths
-    // in absolute terms.  So prefix the VM root directory to the job description
-    // entry.
-    vm_disk_image_name = SysAllocString(A2W(root_dir + std::string("/") + vm.vm_disk_image_name).c_str());
-    vm_shared_folder_dir_name = SysAllocString(A2W(root_dir + std::string("/") + vm.vm_shared_folder_dir_name).c_str());
-
-
-    // First create a unnamed new VM. It will be unconfigured and not be saved
-    // in the configuration until we explicitely choose to do so.
-    rc = pVirtualBox->CreateMachine(vm_name, vm_os_name, vm_root_dir, NULL, false, &pMachine);
-    if (FAILED(rc)) {
-        fprintf(
-            stderr,
-            "%s Error creating virtual machine instance! rc = 0x%x\n",
-            boinc_msg_prefix(buf, sizeof(buf)),
-            rc
-        );
-        virtualbox_dump_error();
-        retval = rc;
-        goto CLEANUP;
-    }
-
-
-    // Set some properties
-    pMachine->put_MemorySize(vm.vm_memory_size);
-    pMachine->SetCPUProperty(CPUPropertyType_PAE, TRUE);
-
-
-    // Register the VM. Note that this call also saves the VM config
-    // to disk. It is also possible to save the VM settings but not
-    // register the VM.
-    //
-    // Also note that due to current VirtualBox limitations, the machine
-    // must be registered *before* we can attach hard disks to it.
-    //
-    rc = pVirtualBox->RegisterMachine(pMachine);
-    if (FAILED(rc)) {
-        fprintf(
-            stderr,
-            "%s Error registering virtual machine! rc = 0x%x\n",
-            boinc_msg_prefix(buf, sizeof(buf)),
-            rc
-        );
-        virtualbox_dump_error();
-        retval = rc;
-        goto CLEANUP;
-    }
-
-
-    //
-    // In order to manipulate the registered machine, we must open a session
-    // for that machine. Do it now.
-    //
-    pMachine->get_Id(&vm_machine_uuid);
-    rc = pVirtualBox->OpenSession(pSession, vm_machine_uuid);
-    if (FAILED(rc)) {
-        fprintf(
-            stderr,
-            "%s Error could not open session! rc = 0x%x\n",
-            boinc_msg_prefix(buf, sizeof(buf)),
-            rc
-        );
-        virtualbox_dump_error();
-        retval = rc;
-        goto CLEANUP;
-    }
-
-
-    //
-    // After the machine is registered, the initial machine object becomes
-    // immutable. In order to get a mutable machine object, we must query
-    // it from the opened session object.
-    //
-    rc = pSession->get_Machine(&pMachine);
-    if (FAILED(rc)) {
-        fprintf(
-            stderr,
-            "%s Error could not get sessioned machine! rc = 0x%x\n",
-            boinc_msg_prefix(buf, sizeof(buf)),
-            rc
-        );
-        virtualbox_dump_error();
-        retval = rc;
-        goto CLEANUP;
-    }
-
-
-    //
-    // Open a virtual harddisk
-    //
-    rc = pVirtualBox->OpenHardDisk(
-        vm_disk_image_name,
-        AccessMode_ReadWrite,
-        TRUE,
-        vm_harddisk_uuid,
-        FALSE,
-        strEmpty,
-        &pHardDisk
-    );
-    if (FAILED(rc)) {
-        fprintf(
-            stderr,
-            "%s Error could not open virtual disk image! rc = 0x%x\n",
-            boinc_msg_prefix(buf, sizeof(buf)),
-            rc
-        );
-        virtualbox_dump_error();
-        retval = rc;
-        goto CLEANUP;
-    }
-
-
-    //
-    // Add storage controller
-    //
-    rc = pMachine->AddStorageController(
-        strIDEController,                 // controller identifier
-        StorageBus_SATA,
-        &pStorageController
-    );
-    if (FAILED(rc)) {
-        fprintf(
-            stderr,
-            "%s Error could not add a storage controller! rc = 0x%x\n",
-            boinc_msg_prefix(buf, sizeof(buf)),
-            rc
-        );
-        virtualbox_dump_error();
-        retval = rc;
-        goto CLEANUP;
-    }
-
-
-    //
-    // Now that it's created, we can assign it to the VM.
-    //
-    rc = pMachine->AttachDevice(
-        strIDEController,               // controller identifier
-        0,                              // channel number on the controller
-        0,                              // device number on the controller
-        DeviceType_HardDisk,
-        vm_harddisk_uuid
-    );
-    if (FAILED(rc)) {
-        fprintf(
-            stderr,
-            "%s Error could not attach virtual disk image! rc = 0x%x\n",
-            boinc_msg_prefix(buf, sizeof(buf)),
-            rc
-        );
-        virtualbox_dump_error();
-        retval = rc;
-        goto CLEANUP;
-    }
-
-
-    //
-    // By default VMs are created with a network interface, so we need to check if it should
-    // be disabled/deleted.
-    //
-    if (!vm.enable_network) {
-        rc = pMachine->GetNetworkAdapter(0, &pNetworkInterface);
-        if (SUCCEEDED(rc)) {
-            pNetworkInterface->Detach();
-            if (FAILED(rc))
-            {
-                fprintf(
-                    stderr,
-                    "%s Error could not remove network interface! rc = 0x%x\n",
-                    boinc_msg_prefix(buf, sizeof(buf)),
-                    rc
-                );
-                virtualbox_dump_error();
-                retval = rc;
-                goto CLEANUP;
-            }
-        }
-    }
-
-
-    //
-    // Create shared folder
-    //
-    if (vm.enable_shared_directory) {
-        rc = pMachine->CreateSharedFolder(
-            vm_shared_folder_name,
-            vm_shared_folder_dir_name,
-            TRUE
-        );
-        if (FAILED(rc)) {
-            fprintf(
-                stderr,
-                "%s Error could not create shared folder! rc = 0x%x\n",
-                boinc_msg_prefix(buf, sizeof(buf)),
-                rc
-            );
-            virtualbox_dump_error();
-            retval = rc;
-            goto CLEANUP;
-        }
-    }
-    
-
-    //
-    // Save all changes we've just made.
-    //
-    rc = pMachine->SaveSettings();
-    if (FAILED(rc)) {
-        fprintf(
-            stderr,
-            "%s Error not save machine settings! rc = 0x%x\n",
-            boinc_msg_prefix(buf, sizeof(buf)),
-            rc
-        );
-        virtualbox_dump_error();
-        retval = rc;
-        goto CLEANUP;
-    }
-
-CLEANUP:
-    if (vm_name) SysFreeString(vm_name);
-    if (vm_os_name) SysFreeString(vm_os_name);
-    if (vm_os_version) SysFreeString(vm_os_version);
-    if (vm_disk_image_name) SysFreeString(vm_disk_image_name);
-    if (vm_shared_folder_name) SysFreeString(vm_shared_folder_name);
-    if (vm_shared_folder_dir_name) SysFreeString(vm_shared_folder_dir_name);
-    if (vm_machine_uuid) SysFreeString(vm_machine_uuid);
-    if (vm_harddisk_uuid) SysFreeString(vm_harddisk_uuid);
-    if (strIDEController) SysFreeString(strIDEController);
-    if (strEmpty) SysFreeString(strEmpty);
-
-    if (pHardDisk) {
-        pHardDisk->Release();
-        pHardDisk = NULL;
-    }
-    if (pNetworkInterface) {
-        pNetworkInterface->Release();
-        pNetworkInterface = NULL;
-    }
-    if (pStorageController) {
-        pStorageController->Release();
-        pStorageController = NULL;
-    }
-    if (pMachine) {
-        pMachine->Release();
-        pMachine = NULL;
-    }
-    if (pSession) {
-        pSession->Close();
-    }
-
-    // If we failed in any part of the registration process, unregister and cleanup
-    // whatever is left over.
-    if (FAILED(rc)) virtualbox_deregister_vm();
-
-    return retval;
-}
-
-
-int virtualbox_deregister_vm() {
-    int retval = 0;
-    HRESULT rc;
-    std::string name;
-    std::string harddisk_uuid;
-    BSTR vm_name;
-    BSTR vm_machine_uuid;
-    BSTR vm_harddisk_uuid;
-    BSTR strIDEController = SysAllocString(A2W(_T("IDE Controller")).c_str());
-    char buf[256];
-    IMachine* pMachine = NULL;
-    IMedium* pHardDisk = NULL;
-
-
-    fprintf(
-        stderr,
-        "%s Deregistering virtual machine.\n",
-        boinc_msg_prefix(buf, sizeof(buf))
-    );
-
-
-    virtualbox_generate_vm_name(name);
-    virtualbox_generate_medium_uuid(0, harddisk_uuid);
-
-    vm_name = SysAllocString(A2W(name).c_str());
-    vm_harddisk_uuid = SysAllocString(A2W(harddisk_uuid).c_str());
-
-    rc = pVirtualBox->FindMachine(vm_name, &pMachine);
-    if (SUCCEEDED(rc)) {
-
-        //
-        // In order to manipulate the registered machine, we must open a session
-        // for that machine. Do it now.
-        //
-        pMachine->get_Id(&vm_machine_uuid);
-        rc = pVirtualBox->OpenSession(pSession, vm_machine_uuid);
-        if (FAILED(rc)) {
-            fprintf(
-                stderr,
-                "%s Error could not open session! rc = 0x%x\n",
-                boinc_msg_prefix(buf, sizeof(buf)),
-                rc
-            );
-            virtualbox_dump_error();
-            retval = rc;
-            goto CLEANUP;
-        }
-
-
-        //
-        // After the machine is registered, the initial machine object becomes
-        // immutable. In order to get a mutable machine object, we must query
-        // it from the opened session object.
-        //
-        rc = pSession->get_Machine(&pMachine);
-        if (FAILED(rc)) {
-            fprintf(
-                stderr,
-                "%s Error could not get sessioned machine! rc = 0x%x\n",
-                boinc_msg_prefix(buf, sizeof(buf)),
-                rc
-            );
-            virtualbox_dump_error();
-            retval = rc;
-            goto CLEANUP;
-        }
-
-    
-        //
-        // Next we need to detach the storage controller
-        //
-        pMachine->DetachDevice(strIDEController, 0, 0);
-        if (FAILED(rc)) {
-            fprintf(
-                stderr,
-                "%s Error could not detach storage controller! rc = 0x%x\n",
-                boinc_msg_prefix(buf, sizeof(buf)),
-                rc
-            );
-            virtualbox_dump_error();
-            retval = rc;
-            goto CLEANUP;
-        }
-
-
-        //
-        // Save all changes we've just made.
-        //
-        rc = pMachine->SaveSettings();
-        if (FAILED(rc)) {
-            fprintf(
-                stderr,
-                "%s Error not save machine settings! rc = 0x%x\n",
-                boinc_msg_prefix(buf, sizeof(buf)),
-                rc
-            );
-            virtualbox_dump_error();
-            retval = rc;
-            goto CLEANUP;
-        }
-
-
-        //
-        // Close the session so we can unregister the virtual machine.
-        //
-        pSession->Close();
-
-    
-        //
-        // In order to delete the registered machine, we must unregister it first
-        //
-        rc = pVirtualBox->UnregisterMachine(vm_machine_uuid, &pMachine);
-        if (FAILED(rc)) {
-            fprintf(
-                stderr,
-                "%s Error could not unregister virtual machine! rc = 0x%x\n",
-                boinc_msg_prefix(buf, sizeof(buf)),
-                rc
-            );
-            virtualbox_dump_error();
-            retval = rc;
-            goto CLEANUP;
-        }
-
-        rc = pMachine->DeleteSettings();
-        if (FAILED(rc)) {
-            fprintf(
-                stderr,
-                "%s Error could not delete virtual machine! rc = 0x%x\n",
-                boinc_msg_prefix(buf, sizeof(buf)),
-                rc
-            );
-            virtualbox_dump_error();
-            retval = rc;
-            goto CLEANUP;
-        }
-
-
-        //
-        // Cleanup virtual disk image if it exists
-        //
-        rc = pVirtualBox->GetHardDisk(vm_harddisk_uuid, &pHardDisk);
-        if (SUCCEEDED(rc)) {
-            pHardDisk->Close();
-        }
-    }
-
-CLEANUP:
-    if (vm_name) SysFreeString(vm_name);
-    if (vm_machine_uuid) SysFreeString(vm_machine_uuid);
-    if (vm_harddisk_uuid) SysFreeString(vm_harddisk_uuid);
-    if (strIDEController) SysFreeString(strIDEController);
-
-    if (pHardDisk) {
-        pHardDisk->Release();
-        pHardDisk = NULL;
-    }
-    if (pMachine) {
-        pMachine->Release();
-        pMachine = NULL;
-    }
-
-    return retval;
-}
-
-
-int virtualbox_cleanup() {
-
-    if (pSession) {
-        pSession->Close();
-        pSession->Release();
-        pSession = NULL;
-    }
-
-    if (pVirtualBox) {
-        pVirtualBox->Release();
-        pVirtualBox = NULL;
-    }
-
-    CoUninitialize();
-
-    return 0;
-}
-
-
-int virtualbox_startvm() {
-    int retval = 0;
-    HRESULT rc;
-    std::string name;
-    BSTR vm_name;
-    BSTR vm_machine_uuid;
-    BSTR pSessionType = SysAllocString(L"vrdp");
-    char buf[256];
-    IMachine* pMachine = NULL;
-    IProgress* pProgress = NULL;
-
-
-    fprintf(
-        stderr,
-        "%s Starting virtual machine.\n",
-        boinc_msg_prefix(buf, sizeof(buf))
-    );
-
-
-    virtualbox_generate_vm_name(name);
-    vm_name = SysAllocString(A2W(name).c_str());
-
-    rc = pVirtualBox->FindMachine(vm_name, &pMachine);
-    if (SUCCEEDED(rc)) {
-
-        // Get the VM UUID
-        rc = pMachine->get_Id(&vm_machine_uuid);
-        if (FAILED(rc)) {
-            fprintf(
-                stderr,
-                "%s Error retrieving machine ID! rc = 0x%x\n",
-                boinc_msg_prefix(buf, sizeof(buf)),
-                rc
-            );
-            virtualbox_dump_error();
-            retval = rc;
-            goto CLEANUP;
-        }
-
-
-        // Start a VM session
-        rc = pVirtualBox->OpenRemoteSession(pSession, vm_machine_uuid, pSessionType, NULL, &pProgress);
-        if (FAILED(rc)) {
-            fprintf(
-                stderr,
-                "%s Error could not open remote session! rc = 0x%x\n",
-                boinc_msg_prefix(buf, sizeof(buf)),
-                rc
-            );
-            virtualbox_dump_error();
-            retval = rc;
-            goto CLEANUP;
-        }
-
-        // Wait until VM is running.
-        rc = pProgress->WaitForCompletion(-1);
-        if (FAILED(rc)) {
-            fprintf(
-                stderr,
-                "%s Error could not wait for VM start completion! rc = 0x%x\n",
-                boinc_msg_prefix(buf, sizeof(buf)),
-                rc
-            );
-            virtualbox_dump_error();
-            retval = rc;
-            goto CLEANUP;
-        }
-    }
-
-CLEANUP:
-    if (vm_machine_uuid) SysFreeString(vm_machine_uuid);
-    if (pSessionType) SysFreeString(pSessionType);
-
-    if (pProgress) {
-        pProgress->Release();
-        pProgress = NULL;
-    }
-
-    if (pMachine) {
-        pMachine->Release();
-        pMachine = NULL;
-    }
-
-    return retval;
-}
-
-
-int virtualbox_stopvm() {
-    int retval = 0;
-    HRESULT rc;
-    char buf[256];
-    IConsole* pConsole = NULL;
-    IProgress* pProgress = NULL;
-
-
-    fprintf(
-        stderr,
-        "%s Stopping virtual machine.\n",
-        boinc_msg_prefix(buf, sizeof(buf))
-    );
-
-
-    // Get console object. 
-    rc = pSession->get_Console(&pConsole);
-    if (0x8000ffff == rc) {
-        // The session state has been closed, the VM has shutdown on its own.
-        goto CLEANUP;
-    }
-    if (FAILED(rc)) {
-        fprintf(
-            stderr,
-            "%s Error retrieving console object! rc = 0x%x\n",
-            boinc_msg_prefix(buf, sizeof(buf)),
-            rc
-        );
-        virtualbox_dump_error();
-        retval = rc;
-        goto CLEANUP;
-    }
-
-    // Save the state of the machine.
-    rc = pConsole->SaveState(&pProgress);
-    if (FAILED(rc)) {
-        fprintf(
-            stderr,
-            "%s Error could not save the state of the VM! rc = 0x%x\n",
-            boinc_msg_prefix(buf, sizeof(buf)),
-            rc
-        );
-        virtualbox_dump_error();
-        retval = rc;
-        goto CLEANUP;
-    }
-
-    // Wait until VM is powered down.
-    rc = pProgress->WaitForCompletion(-1);
-    if (FAILED(rc)) {
-        fprintf(
-            stderr,
-            "%s Error could not wait for VM save state completion! rc = 0x%x\n",
-            boinc_msg_prefix(buf, sizeof(buf)),
-            rc
-        );
-        virtualbox_dump_error();
-        retval = rc;
-        goto CLEANUP;
-    }
-
-CLEANUP:
-    if (pProgress) {
-        pProgress->Release();
-        pProgress = NULL;
-    }
-    if (pConsole) {
-        pConsole->Release();
-        pConsole = NULL;
-    }
-    if (pSession) {
-        pSession->Close();
-    }
-    return retval;
-}
-
-
-int virtualbox_pausevm() {
-    int retval = 0;
-    HRESULT rc;
-    char buf[256];
-    IConsole* pConsole = NULL;
-
-
-    fprintf(
-        stderr,
-        "%s Pausing virtual machine.\n",
-        boinc_msg_prefix(buf, sizeof(buf))
-    );
-
-
-    // Get console object. 
-    rc = pSession->get_Console(&pConsole);
-    if (FAILED(rc))
-    {
-        fprintf(
-            stderr,
-            "%s Error retrieving console object! rc = 0x%x\n",
-            boinc_msg_prefix(buf, sizeof(buf)),
-            rc
-        );
-        virtualbox_dump_error();
-        retval = rc;
-        goto CLEANUP;
-    }
-
-    // Pause the machine.
-    rc = pConsole->Pause();
-    if (FAILED(rc))
-    {
-        fprintf(
-            stderr,
-            "%s Error could not pause VM! rc = 0x%x\n",
-            boinc_msg_prefix(buf, sizeof(buf)),
-            rc
-        );
-        virtualbox_dump_error();
-        retval = rc;
-        goto CLEANUP;
-    }
-
-CLEANUP:
-    if (pConsole) {
-        pConsole->Release();
-        pConsole = NULL;
-    }
-    return retval;
-}
-
-
-int virtualbox_resumevm() {
-    int retval = 0;
-    HRESULT rc;
-    char buf[256];
-    IConsole* pConsole = NULL;
-
-
-    fprintf(
-        stderr,
-        "%s Resuming virtual machine.\n",
-        boinc_msg_prefix(buf, sizeof(buf))
-    );
-
-
-    // Get console object. 
-    rc = pSession->get_Console(&pConsole);
-    if (FAILED(rc)) {
-        fprintf(
-            stderr,
-            "%s Error retrieving console object! rc = 0x%x\n",
-            boinc_msg_prefix(buf, sizeof(buf)),
-            rc
-        );
-        virtualbox_dump_error();
-        retval = rc;
-        goto CLEANUP;
-    }
-
-    // Resume the machine.
-    rc = pConsole->Resume();
-    if (FAILED(rc)) {
-        fprintf(
-            stderr,
-            "%s Error could not resume VM! rc = 0x%x\n",
-            boinc_msg_prefix(buf, sizeof(buf)),
-            rc
-        );
-        virtualbox_dump_error();
-        retval = rc;
-        goto CLEANUP;
-    }
-
-CLEANUP:
-    if (pConsole) {
-        pConsole->Release();
-        pConsole = NULL;
-    }
-    return retval;
-}
-
-
-int virtualbox_monitor() {
-    return 0;
-}
-
diff --git a/samples/vboxwrapper/deprecated/vboxwrapper.cpp b/samples/vboxwrapper/deprecated/vboxwrapper.cpp
deleted file mode 100644
index 9b7e408..0000000
--- a/samples/vboxwrapper/deprecated/vboxwrapper.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-// This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2010 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/>.
-
-// vboxwrapper.cpp
-// vboxwrapper program - lets you use VirtualBox VMs with BOINC
-//
-// Handles:
-// - suspend/resume/quit/abort
-// - reporting CPU time
-// - loss of heartbeat from core client
-// - checkpointing
-//      (at the level of task; or potentially within task)
-//
-// See http://boinc.berkeley.edu/wrapper.php for details
-// Contributor: Andrew J. Younge (ajy4490 at umiacs.umd.edu)
-
-#ifdef _WIN32
-#include "boinc_win.h"
-#include "win_util.h"
-#else
-#include <sys/wait.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <vector>
-#include <string>
-#include <unistd.h>
-#endif
-
-#include "boinc_api.h"
-#include "diagnostics.h"
-#include "filesys.h"
-#include "parse.h"
-#include "str_util.h"
-#include "str_replace.h"
-#include "util.h"
-#include "error_numbers.h"
-#include "procinfo.h"
-#include "vm.h"
-#include "vbox.h"
-
-#define JOB_FILENAME "job.xml"
-#define POLL_PERIOD 1.0
-
-int parse_job_file() {
-    MIOFILE mf;
-    char tag[1024], buf[256], buf2[256];
-    bool is_tag;
-
-    boinc_resolve_filename(JOB_FILENAME, buf, 1024);
-    FILE* f = boinc_fopen(buf, "r");
-    if (!f) {
-        fprintf(stderr,
-            "%s can't open job file %s\n",
-            boinc_msg_prefix(buf2, sizeof(buf2)), buf
-        );
-        return ERR_FOPEN;
-    }
-    mf.init_file(f);
-    XML_PARSER xp(&mf);
-
-    if (!xp.parse_start("job_desc")) return ERR_XML_PARSE;
-    while (!xp.get(tag, sizeof(tag), is_tag)) {
-        if (!is_tag) {
-            fprintf(stderr,
-                "%s SCHED_CONFIG::parse(): unexpected text %s\n",
-                boinc_msg_prefix(buf2, sizeof(buf2)), tag
-            );
-            continue;
-        }
-        if (!strcmp(tag, "/job_desc")) {
-            fclose(f);
-            return 0;
-        }
-        if (!strcmp(tag, "vm")) {
-            vm.parse(xp);
-        }
-    }
-    fclose(f);
-    return ERR_XML_PARSE;
-}
-
-int main(int argc, char** argv) {
-    BOINC_OPTIONS boinc_options;
-    BOINC_STATUS boinc_status;
-    char buf[256];
-    int retval;
-
-    memset(&boinc_options, 0, sizeof(boinc_options));
-    boinc_options.main_program = true;
-    boinc_options.check_heartbeat = true;
-    boinc_options.handle_process_control = true;
-    boinc_init_options(&boinc_options);
-
-    fprintf(
-        stderr,
-        "%s vboxwrapper: starting\n",
-        boinc_msg_prefix(buf, sizeof(buf))
-    );
-
-    retval = parse_job_file();
-    if (retval) {
-        fprintf(
-            stderr,
-            "%s can't parse job file: %d\n",
-            boinc_msg_prefix(buf, sizeof(buf)),
-            retval
-        );
-        boinc_finish(retval);
-    }
-
-    retval = vm.run();
-    if (retval) {
-        boinc_finish(retval);
-    }
-
-    while (1) {
-        vm.poll();
-        boinc_get_status(&boinc_status);
-        if (boinc_status.no_heartbeat || boinc_status.quit_request) {
-            vm.stop();
-            boinc_temporary_exit(0);
-        }
-        if (boinc_status.abort_request) {
-            vm.cleanup();
-            boinc_finish(EXIT_ABORTED_BY_CLIENT);
-        }
-        if (!vm.is_running()) {
-            vm.cleanup();
-            boinc_finish(0);
-        }
-        if (boinc_status.suspended) {
-            if (!vm.suspended) {
-                vm.pause();
-            }
-        } else {
-            if (vm.suspended) {
-                vm.resume();
-            }
-        }
-        boinc_sleep(POLL_PERIOD);
-    }
-    
-    return 0;
-}
-
-#ifdef _WIN32
-
-int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR Args, int WinMode) {
-    LPSTR command_line;
-    char* argv[100];
-    int argc;
-
-    command_line = GetCommandLine();
-    argc = parse_command_line(command_line, argv);
-    return main(argc, argv);
-}
-
-#endif
diff --git a/samples/vboxwrapper/deprecated/vm.cpp b/samples/vboxwrapper/deprecated/vm.cpp
deleted file mode 100644
index 570fb75..0000000
--- a/samples/vboxwrapper/deprecated/vm.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-// This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2010 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 <sys/wait.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <vector>
-#include <string>
-#include <unistd.h>
-#endif
-
-#include "diagnostics.h"
-#include "filesys.h"
-#include "parse.h"
-#include "str_util.h"
-#include "str_replace.h"
-#include "util.h"
-#include "error_numbers.h"
-#include "procinfo.h"
-#include "boinc_api.h"
-#include "vbox.h"
-#include "vm.h"
-
-VM vm;
-
-VM::VM() {
-    stdin_filename.clear();
-    stdout_filename.clear();
-    stderr_filename.clear();
-    vm_os_name.clear();
-    vm_os_version.clear();
-    vm_memory_size = 0;
-    vm_disk_image_name.clear();
-    vm_disk_image_type.clear();
-    vm_shared_folder_name.clear();
-    vm_shared_folder_dir_name.clear();
-    suspended = false;
-    enable_network = false;
-    enable_shared_directory = false;
-}
-
-VM::~VM() {
-}
-
-int VM::parse(XML_PARSER& xp) {
-    char tag[1024], buf[8192];
-    bool is_tag;
-
-    while (!xp.get(tag, sizeof(tag), is_tag)) {
-        if (!is_tag) {
-            fprintf(stderr, "%s VM::parse(): unexpected text %s\n",
-                boinc_msg_prefix(buf, sizeof(buf)), tag
-            );
-            continue;
-        }
-        if (!strcmp(tag, "/vm")) {
-            return 0;
-        }
-        else if (xp.parse_string(tag, "stdin_filename", stdin_filename)) continue;
-        else if (xp.parse_string(tag, "stdout_filename", stdout_filename)) continue;
-        else if (xp.parse_string(tag, "stderr_filename", stderr_filename)) continue;
-        else if (xp.parse_string(tag, "vm_os_name", vm_os_name)) continue;
-        else if (xp.parse_string(tag, "vm_os_version", vm_os_version)) continue;
-        else if (xp.parse_int(tag, "vm_memory_size", vm_memory_size)) continue;
-        else if (xp.parse_string(tag, "vm_disk_image_name", vm_disk_image_name)) continue;
-        else if (xp.parse_string(tag, "vm_disk_image_type", vm_disk_image_type)) continue;
-        else if (xp.parse_string(tag, "vm_shared_folder_name", vm_shared_folder_name)) continue;
-        else if (xp.parse_string(tag, "vm_shared_folder_dir_name", vm_shared_folder_dir_name)) continue;
-        else if (xp.parse_bool(tag, "enable_network", enable_network)) continue;
-        else if (xp.parse_bool(tag, "enable_shared_directory", enable_shared_directory)) continue;
-    }
-    return ERR_XML_PARSE;
-}
-
-int VM::run() {
-    int retval;
-
-    retval = virtualbox_initialize();
-    if (retval) return retval;
-
-    if (!virtualbox_vm_is_registered()) {
-        retval = virtualbox_register_vm();
-        if (retval) return retval;
-    }
-
-    retval = virtualbox_startvm();
-    if (retval) return retval;
-
-    return 0;
-}
-
-void VM::poll() {
-    virtualbox_monitor();
-}
-
-void VM::stop() {
-    virtualbox_stopvm();
-    virtualbox_cleanup();
-}
-
-void VM::pause() {
-    virtualbox_pausevm();
-    suspended = true;
-}
-
-void VM::resume() {
-    virtualbox_resumevm();
-    suspended = false;
-}
-
-void VM::cleanup() {
-    virtualbox_stopvm();
-    virtualbox_deregister_vm();
-    virtualbox_cleanup();
-
-    // Give time enough for external processes to finish the cleanup process
-    boinc_sleep(5.0);
-}
-
-bool VM::is_running() {
-    return (bool)virtualbox_vm_is_running();
-}
diff --git a/samples/vboxwrapper/deprecated/vm.h b/samples/vboxwrapper/deprecated/vm.h
deleted file mode 100644
index cfb5ea1..0000000
--- a/samples/vboxwrapper/deprecated/vm.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2010 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/>.
-
-
-// Provide cross-platform interfaces for making changes to VirtualBox
-
-#ifndef _VM_H_
-#define _VM_H_
-
-class VM {
-public:
-    VM();
-    ~VM();
-
-    std::string stdin_filename;
-    std::string stdout_filename;
-    std::string stderr_filename;
-    // name of the OS the VM runs
-    std::string vm_os_name;
-    // name of the version of the VM the OS runs
-    std::string vm_os_version;
-    // size of the memory allocation for the VM
-    int vm_memory_size;
-    // name of the virtual machine disk image file
-    std::string vm_disk_image_name;
-    // name of the virtual machine disk image type
-    std::string vm_disk_image_type;
-    // name of shared folder
-    std::string vm_shared_folder_name;
-    // shared folder directory name
-    std::string vm_shared_folder_dir_name;
-    bool suspended;
-    bool enable_network;
-    bool enable_shared_directory;
-
-    int parse( XML_PARSER& );
-    void poll();
-    int run();
-    void stop();
-    void pause();
-    void resume();
-    void cleanup();
-    bool is_running();
-};
-
-extern VM vm;
-
-#endif
diff --git a/samples/vboxwrapper/floppyio.cpp b/samples/vboxwrapper/floppyio.cpp
index 3e666b3..129222e 100644
--- a/samples/vboxwrapper/floppyio.cpp
+++ b/samples/vboxwrapper/floppyio.cpp
@@ -51,6 +51,7 @@
 #include "floppyio.h"
 
 using namespace std;
+using namespace FloppyIONS;
 
 // FloppyIO Exception singleton
 static FloppyIOException   __FloppyIOExceptionSingleton;
diff --git a/samples/vboxwrapper/floppyio.h b/samples/vboxwrapper/floppyio.h
index f3cc7b3..4bdc7b3 100644
--- a/samples/vboxwrapper/floppyio.h
+++ b/samples/vboxwrapper/floppyio.h
@@ -40,145 +40,149 @@
 #ifndef FLOPPYIO_H
 #define	FLOPPYIO_H
 
-// Do not initialize (reset) floppy disk image at open.
-// (Flag used by the FloppyIO constructor)
-#define F_NOINIT 1
-
-// Do not create the filename (assume it exists)
-// (Flag used by the FloppyIO constructor)
-#define F_NOCREATE 2
-
-// Synchronize I/O.
-// This flag will block the script until the guest has read/written the data.
-// (Flag used by the FloppyIO constructor)
-#define F_SYNCHRONIZED 4
-
-// Use exceptions instead of error codes
-// (Flag used by the FloppyIO constructor)
-#define F_EXCEPTIONS 8
-
-// Initialize FloppyIO in client mode.
-// This flag will swap the input/output buffers, making the script usable from
-// within the virtual machine.
-// (Flag used by the FloppyIO constructor)
-#define F_CLIENT 16
-
-//
-// Error code constants
-//
-#define FPIO_NOERR          0  // No error occured
-#define FPIO_ERR_IO        -1  // There was an I/O error on the strea,
-#define FPIO_ERR_TIMEOUT   -2  // The operation timed out
-#define FPIO_ERR_CREATE    -3  // Unable to freate the floppy file
-#define FPIO_ERR_NOTREADY  -4  // The I/O object is not ready
-
-//
-// Structure of the synchronization control byte.
-//
-// This byte usually resides at the beginning of the
-// floppy file for the receive buffer and at the end
-// of the file for the sending buffer.
-//
-// It's purpose is to force the entire floppy image
-// to be re-written/re-read by the hypervisor/guest OS and
-// to synchronize the I/O in case of large ammount of
-// data being exchanged.
-//
-typedef struct fpio_ctlbyte {
-    unsigned short bDataPresent  : 1;
-    unsigned short bReserved     : 7;
-} fpio_ctlbytex;
-
-// Default floppy disk size (In bytes)
-// 
-// VirtualBox complains if bigger than 28K
-// It's supposed to go till 1474560 however (1.44 Mb)
-
-#define DEFAULT_FIO_FLOPPY_SIZE 28672
-
-// Default synchronization timeout (seconds).
-// This constant defines how long we should wait for synchronization
-// feedback from the guest before aborting.
-
-#define DEFAULT_FIO_SYNC_TIMEOUT 5
-
-//
-// Floppy I/O Communication class
-//
-class FloppyIO {
-public:
+namespace FloppyIONS {
+
+    // Do not initialize (reset) floppy disk image at open.
+    // (Flag used by the FloppyIO constructor)
+    #define F_NOINIT 1
+
+    // Do not create the filename (assume it exists)
+    // (Flag used by the FloppyIO constructor)
+    #define F_NOCREATE 2
+
+    // Synchronize I/O.
+    // This flag will block the script until the guest has read/written the data.
+    // (Flag used by the FloppyIO constructor)
+    #define F_SYNCHRONIZED 4
+
+    // Use exceptions instead of error codes
+    // (Flag used by the FloppyIO constructor)
+    #define F_EXCEPTIONS 8
+
+    // Initialize FloppyIO in client mode.
+    // This flag will swap the input/output buffers, making the script usable from
+    // within the virtual machine.
+    // (Flag used by the FloppyIO constructor)
+    #define F_CLIENT 16
+
+    //
+    // Error code constants
+    //
+    #define FPIO_NOERR          0  // No error occured
+    #define FPIO_ERR_IO        -1  // There was an I/O error on the strea,
+    #define FPIO_ERR_TIMEOUT   -2  // The operation timed out
+    #define FPIO_ERR_CREATE    -3  // Unable to freate the floppy file
+    #define FPIO_ERR_NOTREADY  -4  // The I/O object is not ready
+
+    //
+    // Structure of the synchronization control byte.
+    //
+    // This byte usually resides at the beginning of the
+    // floppy file for the receive buffer and at the end
+    // of the file for the sending buffer.
+    //
+    // It's purpose is to force the entire floppy image
+    // to be re-written/re-read by the hypervisor/guest OS and
+    // to synchronize the I/O in case of large ammount of
+    // data being exchanged.
+    //
+    typedef struct fpio_ctlbyte {
+        unsigned short bDataPresent  : 1;
+        unsigned short bReserved     : 7;
+    } fpio_ctlbytex;
+
+    // Default floppy disk size (In bytes)
+    // 
+    // VirtualBox complains if bigger than 28K
+    // It's supposed to go till 1474560 however (1.44 Mb)
+
+    #define DEFAULT_FIO_FLOPPY_SIZE 28672
+
+    // Default synchronization timeout (seconds).
+    // This constant defines how long we should wait for synchronization
+    // feedback from the guest before aborting.
+
+    #define DEFAULT_FIO_SYNC_TIMEOUT 5
+
+    //
+    // Floppy I/O Communication class
+    //
+    class FloppyIO {
+    public:
     
-    // Construcors
-    FloppyIO(const char * filename, int flags = 0);
-    virtual ~FloppyIO();
+        // Construcors
+        FloppyIO(const char * filename, int flags = 0);
+        virtual ~FloppyIO();
     
-    // Functions
-    void        reset();
-    int         send(std::string strData);
-    std::string receive();
-    int         receive(std::string* strBuffer);
+        // Functions
+        void        reset();
+        int         send(std::string strData);
+        std::string receive();
+        int         receive(std::string* strBuffer);
     
-    // Topology info
-    int         ofsInput;   // Input buffer offset & size
-    int         szInput;
-    int         ofsOutput;  // Output buffer offset & size
-    int         szOutput;
+        // Topology info
+        int         ofsInput;   // Input buffer offset & size
+        int         szInput;
+        int         ofsOutput;  // Output buffer offset & size
+        int         szOutput;
     
-    int         ofsCtrlByteIn;  // Control byte offset for input
-    int         ofsCtrlByteOut; // Control byte offset for output
+        int         ofsCtrlByteIn;  // Control byte offset for input
+        int         ofsCtrlByteOut; // Control byte offset for output
 
-    // Synchronization stuff
-    bool        synchronized;   // The read/writes are synchronized
-    int         syncTimeout;    // For how long should we wait
+        // Synchronization stuff
+        bool        synchronized;   // The read/writes are synchronized
+        int         syncTimeout;    // For how long should we wait
 
-    // Error reporting and checking
-    int         error;
-    std::string errorStr;
-    bool        useExceptions;  // If TRUE errors will raise exceptions
+        // Error reporting and checking
+        int         error;
+        std::string errorStr;
+        bool        useExceptions;  // If TRUE errors will raise exceptions
     
-    void        clear();        // Clear errors
-    bool        ready();        // Returns TRUE if there are no errors
+        void        clear();        // Clear errors
+        bool        ready();        // Returns TRUE if there are no errors
 
-private:
+    private:
 
-    // Floppy Info
-    std::fstream* fIO;
-    int         szFloppy;
+        // Floppy Info
+        std::fstream* fIO;
+        int         szFloppy;
 
-    // Functions
-    int         waitForSync(int controlByteOffset, char state, int timeout);
-    int         setError(int code, std::string message);
+        // Functions
+        int         waitForSync(int controlByteOffset, char state, int timeout);
+        int         setError(int code, std::string message);
     
-};
-
-//
-// Floppy I/O Exceptions
-//
-class FloppyIOException: public std::exception {
-public:
-
-    int         code;
-    std::string message;
-
-    // Default constructor/destructor
-    FloppyIOException() { this->code=0; this->message=""; };
-    virtual ~FloppyIOException() throw() { };
-
-    // Get description
-    virtual const char* what() const throw() {
-        static std::ostringstream oss (std::ostringstream::out);
-        oss << this->message << ". Error code = " << this->code;
-        return oss.str().c_str();
-    }
-
-    // Change the message and return my instance
-    // (Used for singleton format)
-    FloppyIOException * set(int _code, std::string _message) {
-        this->code = _code;
-        this->message = _message;
-        return this;
-    }
+    };
+
+    //
+    // Floppy I/O Exceptions
+    //
+    class FloppyIOException: public std::exception {
+    public:
+
+        int         code;
+        std::string message;
+
+        // Default constructor/destructor
+        FloppyIOException() { this->code=0; this->message=""; };
+        virtual ~FloppyIOException() throw() { };
+
+        // Get description
+        virtual const char* what() const throw() {
+            static std::ostringstream oss (std::ostringstream::out);
+            oss << this->message << ". Error code = " << this->code;
+            return oss.str().c_str();
+        }
+
+        // Change the message and return my instance
+        // (Used for singleton format)
+        FloppyIOException * set(int _code, std::string _message) {
+            this->code = _code;
+            this->message = _message;
+            return this;
+        }
     
+    };
+
 };
 
 #endif	// FLOPPYIO_H 
diff --git a/samples/vboxwrapper/gbac.cpp b/samples/vboxwrapper/gbac.cpp
new file mode 100644
index 0000000..84399e7
--- /dev/null
+++ b/samples/vboxwrapper/gbac.cpp
@@ -0,0 +1,605 @@
+
+#ifdef _WIN32
+#include "boinc_win.h"
+#include "win_util.h"
+#else
+#include <stdio.h>
+#endif
+
+#include <iostream>
+#include <fstream>
+
+
+#include "filesys.h"
+#include "str_replace.h"
+#include "util.h"
+#include "parse.h"
+#include "gbac.h"
+#include "boinc_api.h"
+
+#define GBAC_EXEC_LOG  "gbac-exec.log"
+#define GBAC_VAUNZIP_STATUS "gbac-va-unzipped.status"
+
+static const char* dc_files[] = 
+{
+    "dc_stdout.txt",
+    "dc_stderr.txt",
+    "dc_clientlog.txt",
+    "dc_ckpt_out",
+    NULL
+};
+
+static const char* log_files[] =
+{
+    "shared/guest-tools-exec.log",
+    "shared/gbac-app.stdout",
+    "shared/gbac-app.stderr",
+    "shared/gbac_job.xml",
+    "shared/gbac_exit_status",
+    "shared/gbac_command_line.xml",
+    "shared/stdout.txt",
+    "shared/stderr.txt",
+    "shared/gbac-execution.stdout",
+    "shared/gbac-execution.stderr",
+    "shared/shared-dir-contents.log",
+    "shared/dc_clientlog.txt",
+    "shared/dc_stdout.txt",
+    "shared/dc_stderr.txt",
+    NULL
+};
+
+
+GBAC gbac;
+
+
+GBAC::GBAC() 
+{
+    this->environment.clear();
+}
+
+
+GBAC::~GBAC() 
+{
+    free(this->hostdir);
+    free(this->dirsep);
+}
+
+
+int GBAC::init(int argc_, char **argv_)
+{
+    char resolved_buffer[2048];
+    char msg_buf[256];
+
+    this->argc = argc_;
+    this->argv = argv_;
+
+    this->hostdir = strdup("shared");
+    if (this->hostdir == NULL)
+        return EXIT_FAILURE;
+
+    #ifdef _WIN32
+        this->dirsep = strdup("\\");
+    #else
+        this->dirsep = strdup("/");
+    #endif    
+    if (this->dirsep == NULL)
+        return EXIT_FAILURE;
+
+    // need to create various files expected by DC-API
+    // in case the application fails, DC-API still expects them
+    FILE* f;
+    for (int i=0; dc_files[i] != NULL; i++) 
+    {
+        boinc_resolve_filename(dc_files[i], resolved_buffer, 
+                               sizeof(resolved_buffer));
+       
+       
+        f = fopen(resolved_buffer, "w");
+        if (f) {
+            fclose(f);
+        } else {
+            fprintf(stderr, 
+                    "%s failed to create DC-API file '%s'\n", 
+                    boinc_msg_prefix(msg_buf, sizeof(msg_buf)),
+                    dc_files[i]);
+            return EXIT_FAILURE;
+        }
+    }
+   return 0;
+}
+
+
+int GBAC::prepareHostSharedDir() 
+{   
+    DIRREF mydir;
+    char msg_buf[256];
+    char buffer[1024];
+    char dest_buffer[2048];
+    char resolved_buffer[2048];
+
+    if (!boinc_file_exists(this->hostdir))
+    { 
+        fprintf(stderr,
+                "%s creating host shared directory.\n",
+                boinc_msg_prefix(msg_buf, sizeof(msg_buf)));
+        if (boinc_mkdir(this->hostdir) != 0) 
+        {
+            fprintf(stderr,
+                   "%s could not create host shared directory"\
+                   ": %s\n", 
+                   boinc_msg_prefix(msg_buf, sizeof(msg_buf)),
+                   this->hostdir);
+            return EXIT_FAILURE;
+        }
+    } 
+    else if (is_file(this->hostdir))
+    {
+        fprintf(stderr,
+                "%s there is a file with the same name as "\
+                "the host share dir in the slot directory.\n",
+                boinc_msg_prefix(msg_buf, sizeof(msg_buf)));
+        return EXIT_FAILURE;
+    }
+   
+    fprintf(stderr,
+            "%s === copying files to host directory ===\n", 
+            boinc_msg_prefix(msg_buf, sizeof(msg_buf)));
+    mydir = dir_open(".");
+    while (dir_scan(buffer, mydir, sizeof(buffer))==0)
+    {
+        if (strstr(buffer, ".vdi") == NULL &&
+            strcmp(buffer, "vbox_job.xml") &&
+            strcmp(buffer, "boinc_lockfile") &&
+            strcmp(buffer, "stderr.txt") &&
+            strcmp(buffer, "boinc_finish_called") &&
+//            strcmp(buffer, "gbac_job.xml") &&
+            strcmp(buffer, "init_data.xml") &&
+            strcmp(buffer, "boinc_task_state.xml") &&
+            strcmp(buffer, "vbox_checkpoint.txt") &&
+            strcmp(buffer, this->argv[0]) &&
+            !is_dir(buffer)) 
+        {
+                if (boinc_resolve_filename(buffer, 
+                                           resolved_buffer,
+                                           sizeof(resolved_buffer)) != 0)
+                {
+                    fprintf(stderr,
+                            "%s cannot resolve filename: '%s'",
+                            boinc_msg_prefix(msg_buf, sizeof(msg_buf)),
+                            buffer);
+                    continue;
+                }
+                    
+                snprintf(dest_buffer, sizeof(dest_buffer), 
+                         "%s%s%s",
+                         this->hostdir, this->dirsep, buffer);
+                boinc_copy(resolved_buffer, dest_buffer); 
+                fprintf(stderr,
+                        "%s          '%s'  ->  '%s'\n", 
+                        boinc_msg_prefix(msg_buf, sizeof(msg_buf)),
+                        resolved_buffer, dest_buffer);
+        }
+    }
+    dir_close(mydir); 
+
+    // create gbac_command_line.xml file
+    int i;
+    char arg_buffer[4096];
+    FILE *cl_file;
+    char cl_file_buffer[1024];
+
+    string arguments = "";
+   
+    memset(arg_buffer, 0, sizeof(arg_buffer));
+ 
+    for (i=1; i<this->argc; i++)
+    {
+        arguments.append(" ");
+        arguments.append(this->argv[i]);
+    }
+    
+    fprintf(stderr,
+            "%s command line is: '%s'\n", 
+            boinc_msg_prefix(msg_buf, sizeof(msg_buf)),
+            arguments.c_str());
+    snprintf(arg_buffer, sizeof(arg_buffer),
+             "<gbac_command_line>\n"\
+             "        <command_line>%s</command_line>\n"\
+             "</gbac_command_line>\n",
+             arguments.c_str());
+    snprintf(cl_file_buffer, sizeof(cl_file_buffer), "%s%s%s",
+             this->hostdir, this->dirsep, "gbac_command_line.xml");
+   
+    cl_file = fopen(cl_file_buffer, "w+");
+    if (cl_file == NULL)
+    {
+        fprintf(stderr,
+                "%s cannot create command line file: '%s'\n", 
+                boinc_msg_prefix(msg_buf, sizeof(msg_buf)),
+                cl_file_buffer);
+        return EXIT_FAILURE;
+    }
+    fputs(arg_buffer, cl_file); 
+    fclose(cl_file);
+    return 0;
+}
+
+
+int GBAC::copyOutputFiles()
+{
+    DIRREF mydir;
+    char msg_buf[256];
+    char buffer[1024];
+    char src_buffer[2048];
+    char resolved_buffer[2048];
+
+    if (!boinc_file_exists(this->hostdir))
+    { 
+        fprintf(stderr,
+                "%s host shared directory does not exist.\n",
+                boinc_msg_prefix(msg_buf, sizeof(msg_buf)));
+        return EXIT_FAILURE;
+    } 
+    fprintf(stderr,
+            "%s === copying files back to project/slot directory ===\n", 
+            boinc_msg_prefix(msg_buf, sizeof(msg_buf)));
+    
+    mydir = dir_open(this->hostdir);
+    while (dir_scan(buffer, mydir, sizeof(buffer))==0)
+    {
+        if (strcmp(buffer, "boinc_finish_called") &&
+            strcmp(buffer, "boinc_lockfile") &&
+            strcmp(buffer, "stderr.txt") &&
+            strcmp(buffer, "stdout.txt") &&
+            strcmp(buffer, "gbac-execution.log") &&
+            strcmp(buffer, "gbac-execution.stderr") &&
+            strcmp(buffer, "gbac-execution.stdout") &&
+            strcmp(buffer, "gbac_command_line.xml") &&
+            strcmp(buffer, "gbac_exit_status") &&
+            strcmp(buffer, "gbac_job.xml"))
+        {
+            snprintf(src_buffer, sizeof(src_buffer), 
+                     "%s%s%s",
+                     this->hostdir, this->dirsep, buffer);
+            if (is_dir(src_buffer))
+                continue;
+            if (boinc_resolve_filename(buffer, 
+                                       resolved_buffer,
+                                       sizeof(resolved_buffer)) != 0)
+            {
+                printf("cannot resolve '%s'\n", buffer);
+                continue;
+            }
+            boinc_copy(src_buffer, resolved_buffer); 
+            fprintf(stderr,
+                    "%s          '%s'  ->  '%s'\n", 
+                    boinc_msg_prefix(msg_buf, sizeof(msg_buf)),
+                    src_buffer, resolved_buffer);
+        }
+      
+    }
+    return 0;
+}
+
+
+int GBAC::copyLogFiles()
+{
+    ofstream output_file;
+    ifstream input_file; 
+    string line;
+    char msg_buf[8192];
+
+    fprintf(stderr,
+            "%s Appending all output files to this logfile:\n",
+            boinc_msg_prefix(msg_buf, sizeof(msg_buf)));
+      
+    for (int i=0; log_files[i] != NULL; i++) 
+    {
+        input_file.open(log_files[i], ios::in | ios::binary);
+        if (!input_file.is_open())
+        {
+            // for gbac_job.xml we give just a notice
+            if (!strcmp(log_files[i], "shared/gbac_job.xml")) 
+            {
+                fprintf(stderr,
+                        "%s NOTICE: Cannot open output file '%s' "
+                        "for reading\n",
+                        boinc_msg_prefix(msg_buf, sizeof(msg_buf)),
+                        log_files[i]);                                
+            } else {
+                fprintf(stderr,
+                        "%s Cannot open output file '%s' for reading\n",
+                        boinc_msg_prefix(msg_buf, sizeof(msg_buf)),
+                        log_files[i]);                
+            }
+            continue;
+        }
+        fprintf(stderr,
+                "%s >>>>>>>>>>  %s starts here  >>>>>>>>>>\n\n",
+                boinc_msg_prefix(msg_buf, sizeof(msg_buf)),
+                log_files[i]);
+        output_file.open("stderr.txt", ios::out | ios::app);
+        if (!output_file.is_open())
+        {
+            fprintf(stderr,
+                    "%s Cannot open output file 'stderr.txt' for writing\n",
+                    boinc_msg_prefix(msg_buf, sizeof(msg_buf)));
+            continue;
+        }
+        output_file.flush();
+        output_file.seekp(0, ios_base::end);
+
+        while (input_file.good())
+        {
+           getline(input_file, line);
+           output_file << "  > " << line << endl;
+        }
+        input_file.close();       
+        output_file.flush();
+        output_file.close();
+        fprintf(stderr,
+                "\n%s <<<<<<<<<<  %s ends here  <<<<<<<<<<\n",
+                boinc_msg_prefix(msg_buf, sizeof(msg_buf)),
+                log_files[i]);
+    }
+
+    fprintf(stderr,
+            "%s Done appending all output files to this logfile.\n",
+            boinc_msg_prefix(msg_buf, sizeof(msg_buf)));
+    
+    //
+    // check if stderr.txt and stdout.txt are requested as output files, and copy
+    // the content of the gbac-app.stdout and gbac-app.stderr local files 
+    // (in the slot directory) to the output files (in the project directory).
+    // 
+    // These files contain the stdout and stderr of the application run in the VM.
+    std::string file_stderr;
+    std::string file_stdout; 
+    
+    boinc_resolve_filename_s(STDERR_FILE, file_stderr);
+    boinc_resolve_filename_s(STDOUT_FILE, file_stdout);
+    
+    int cmpresult = 0;
+    cmpresult = file_stdout.compare(STDOUT_FILE);
+    if (cmpresult != 0) {
+    	fprintf(stderr, "%s '%s' is requested as output file, copying "
+  		    "contents of standard output of the application "
+  		    "(gbac-app.stdout) to this file.\n", 
+		    boinc_msg_prefix(msg_buf, sizeof(msg_buf)), STDOUT_FILE);
+        std::ifstream ifs("gbac-app.stdout", std::ios::binary);
+        std::ofstream ofs(file_stdout.c_str(), std::ios::binary);
+        ofs << ifs.rdbuf();
+        ifs.close();
+        ofs.close();
+    } else {
+    	fprintf(stderr, "%s '%s' is NOT requested as output file.\n",
+  		    boinc_msg_prefix(msg_buf, sizeof(msg_buf)), STDOUT_FILE);
+    	fprintf(stderr, "%s ('%s'.compare('%s') == %d)\n",
+  		    boinc_msg_prefix(msg_buf, sizeof(msg_buf)), STDOUT_FILE, 
+  		    file_stdout.c_str(), cmpresult);
+    }
+    cmpresult = file_stderr.compare(STDERR_FILE);
+    if (cmpresult != 0) {
+    	fprintf(stderr, "%s '%s' is requested as output file, copying "
+  		    "contents of standard error of the application "
+  		    "(gbac-app.stderr) to this file.\n", 
+  		    boinc_msg_prefix(msg_buf, sizeof(msg_buf)), STDERR_FILE);
+      	std::ifstream ifs("gbac-app.stderr", std::ios::binary);
+      	std::ofstream ofs(file_stderr.c_str(), std::ios::binary);
+      	ofs << ifs.rdbuf();
+        ifs.close();
+        ofs.close();
+    } else {
+    	fprintf(stderr, "%s '%s' is NOT requested as output file.\n",
+  		    boinc_msg_prefix(msg_buf, sizeof(msg_buf)), STDERR_FILE);
+    	fprintf(stderr, "%s ('%s'.compare('%s') == %d)\n",
+  		    boinc_msg_prefix(msg_buf, sizeof(msg_buf)), STDERR_FILE, 
+  		    file_stderr.c_str(), cmpresult);
+    }
+   
+    return 0;
+}
+
+
+int GBAC::copyDebugLog()
+{
+    // Copy the contents of the BOINC stderr to a special log file
+    // (GBAC_EXEC_LOG) if requested. This serves better debugging 
+    // when submitting jobs from other DCI's, e.g., gLite.
+    //
+    // This method should be called right before boinc_finish().
+
+    std::string file_debuglog;
+    char msg_buf[8192];
+    
+    boinc_resolve_filename_s(GBAC_EXEC_LOG, file_debuglog);
+    int cmpresult = 0;
+    cmpresult = file_debuglog.compare(GBAC_EXEC_LOG);
+    if (cmpresult != 0) {
+        fprintf(stderr, "%s '%s' is requested as output file, copying "
+  		    "contents of standard error of BOINC (contains all logs) "
+  		    "to this file.\n", 
+  		    boinc_msg_prefix(msg_buf, sizeof(msg_buf)), GBAC_EXEC_LOG);
+        fflush(stderr);
+      	std::ifstream ifs(STDERR_FILE, std::ios::binary);
+      	std::ofstream ofs(file_debuglog.c_str(), std::ios::binary);
+      	ofs << ifs.rdbuf();
+        ifs.close();
+        ofs.close();        
+    } else {
+    	fprintf(stderr, "%s '%s' is NOT requested as output file.\n",
+  		    boinc_msg_prefix(msg_buf, sizeof(msg_buf)), STDERR_FILE);
+    	fprintf(stderr, "%s ('%s'.compare('%s') == %d)\n",
+  		    boinc_msg_prefix(msg_buf, sizeof(msg_buf)), STDERR_FILE, 
+  		    file_debuglog.c_str(), cmpresult);
+    }
+    
+    return 0;
+}
+
+
+int GBAC::parse(const char* file)
+{
+   return 0;
+}
+
+
+int GBAC::getExitStatus(int &status)
+{
+    ifstream input_file;
+    string line;
+    char msg_buf[1024];
+
+    input_file.open("shared/gbac_exit_status", ios::in | ios::binary);
+    if (input_file.is_open()) 
+    {
+        getline(input_file, line);
+        fprintf(stderr,
+                "%s getExitStatus(): Content of shared/gbac_exit_status "
+                "is '%s'.\n",
+                boinc_msg_prefix(msg_buf, sizeof(msg_buf)),
+                line.c_str());
+        input_file.close();       
+        status = strtol(line.c_str(), 0, 0);
+        if (errno == ERANGE) 
+        {
+            fprintf(stderr,
+                    "%s getExitStatus(): Cannot convert value '%s'.\n",
+                    boinc_msg_prefix(msg_buf, sizeof(msg_buf)),
+                    line.c_str());
+            return 1;
+        }
+    } else {
+        fprintf(stderr,
+                "%s getExitStatus(): Cannot open 'shared/gbac_exit_status' "
+                "for reading.\n",
+                boinc_msg_prefix(msg_buf, sizeof(msg_buf)));
+        return 1;
+    }
+    return 0;
+}
+
+int GBAC::doGunzip(const char* strGZ, const char* strInput, bool bKeep) {
+    unsigned char buf[1024];
+    char msg_buf[MSG_CHANNEL_SIZE];
+    long lRead = 0, 
+         lWrite = 0;
+    int iGZErr = 0;
+    // take an input file (strInput) and turn it into a compressed file (strGZ)
+    // get rid of the input file after
+    //s.quit_request = 0;
+    //checkBOINCStatus();
+    FILE* fIn = boinc_fopen(strInput, "wb");
+    if (!fIn) { 
+        fprintf(stderr,
+                "%s ERROR: doGunzip(): Error opening '%s'.\n",
+                boinc_msg_prefix(msg_buf, sizeof(msg_buf)),
+                strInput);
+        return false; //error
+    }
+    gzFile fOut = gzopen(strGZ, "rb");
+    if (!fOut) {
+        fprintf(stderr,
+                "%s ERROR: doGunzip(): Error opening '%s'.\n",
+                boinc_msg_prefix(msg_buf, sizeof(msg_buf)),
+                strGZ);
+        return false; //error
+    }
+    fseek(fIn, 0, SEEK_SET);  // go to the top of the files
+    gzseek(fOut, 0, SEEK_SET);
+    while (!gzeof(fOut)) { // read 1KB at a time until end of file
+        memset(buf, 0x00, 1024);
+        lRead = 0;
+        lWrite = 0;
+        lRead = (long) gzread(fOut, buf, 1024);
+        if (lRead < 0) {
+            fprintf(stderr,
+                    "%s ERROR: doGunzip(): gzread() encountered an error: %s.\n",
+                    boinc_msg_prefix(msg_buf, sizeof(msg_buf)),
+                    gzerror(fOut, &iGZErr));
+            break;
+        }
+        lWrite = (long) fwrite(buf, 1, lRead, fIn);
+        if (lRead != lWrite) { //error -- read bytes != written bytes
+            fprintf(stderr,
+                    "%s ERROR: doGunzip(): Write error gunzipping '%s': read %ld bytes, "
+                    "but written %ld bytes.\n",
+                    boinc_msg_prefix(msg_buf, sizeof(msg_buf)),
+                    strGZ, lRead, lWrite);
+            break;
+        }
+        //boinc_get_status(&s);
+        //if (s.quit_request || s.abort_request || s.no_heartbeat) break;
+    }
+    gzclose(fOut);
+    fclose(fIn);
+    //checkBOINCStatus();
+    if (lRead != lWrite) {
+        return false;
+    }
+    // if we made it here, it compressed OK, can erase strInput and leave
+    if (!bKeep) {
+        boinc_delete_file(strGZ);
+    }
+    return true;
+}
+
+
+int GBAC::prepareVa(std::string &strVaFilename) {
+    char msg_buf[MSG_CHANNEL_SIZE];
+    std::string strVaUngzippedname;
+    std::ofstream outfile;
+    if (!access(GBAC_VAUNZIP_STATUS, R_OK)) { // returns zero on success
+        fprintf(stderr,
+                "%s INFO: prepareVa(): VA '%s' is already uncompressed\n",
+                boinc_msg_prefix(msg_buf, sizeof(msg_buf)),
+                strVaFilename.c_str());        
+        return 0;
+    }
+    if (!hasEnding(strVaFilename, ".gz")) {
+        fprintf(stderr,
+                "%s INFO: prepareVa(): VA '%s' is propably not compressed. Filename should end with '.gz'.\n",
+                boinc_msg_prefix(msg_buf, sizeof(msg_buf)),
+                strVaFilename.c_str());
+        return 1; // do nothing, filename should end with .gz
+    }
+    // remove '.gz' from the end
+    strVaUngzippedname = strVaFilename.substr(0, strVaFilename.size() - 3);    
+    if (access(strVaFilename.c_str(), R_OK) == -1) {
+        fprintf(stderr,
+                "%s ERROR: prepareVa(): Cannot access VA '%s'.\n",
+                boinc_msg_prefix(msg_buf, sizeof(msg_buf)),
+                strVaFilename.c_str());
+        return 1; // error - file access
+    }
+    fprintf(stderr,
+            "%s prepareVa(): Uncompressing VA '%s'.\n",
+            boinc_msg_prefix(msg_buf, sizeof(msg_buf)),
+            strVaFilename.c_str());
+    if (!doGunzip(strVaFilename.c_str(), strVaUngzippedname.c_str(), true)) {
+        return 1;        
+    } else {
+        outfile.open(GBAC_VAUNZIP_STATUS, ios::out | ios::trunc);
+        outfile << "va unzipped" << std::endl;
+        outfile.close();
+        strVaFilename = strVaUngzippedname;
+        return 0;
+    }
+}
+
+
+int GBAC::hasEnding(std::string const &fullString, std::string const &ending) {
+    if (fullString.length() >= ending.length()) {
+        return (0 == fullString.compare(fullString.length() - ending.length(), ending.length(), ending));
+    } else {
+        return true;
+    }
+}
+
+int GBAC::printVersion() {
+    char buf[256];
+   
+    fprintf(stderr, "%s GBAC %s (build date: %s)\n", 
+        boinc_msg_prefix(buf, sizeof(buf)), SVNREV, __DATE__);
+    return 0;
+}
diff --git a/samples/vboxwrapper/gbac.h b/samples/vboxwrapper/gbac.h
new file mode 100644
index 0000000..0b658a1
--- /dev/null
+++ b/samples/vboxwrapper/gbac.h
@@ -0,0 +1,39 @@
+
+#ifndef _GBAC_H_
+#define _GBAC_H_
+
+#include <vector>
+#include <string>
+#include <zlib.h>
+
+using namespace std;
+
+class GBAC 
+{
+ private:
+    char *hostdir;
+    // TODO: this is actually not needed, '/' works on windows as well
+    char *dirsep;
+    vector<string> environment;
+    char **argv;
+    int argc;
+    int doGunzip(const char* strGZ, const char* strInput, bool bKeep = true);
+    int hasEnding(std::string const &fullString, std::string const &ending);
+    
+ public:    
+    GBAC();
+    ~GBAC();
+    int init(int argc_, char **argv_);
+    int parse(const char* file);
+    int prepareHostSharedDir();
+    int copyOutputFiles();
+    int copyLogFiles();
+	int copyDebugLog();
+    int getExitStatus(int &status);
+    int prepareVa(std::string &strVaFilename);
+    int printVersion();
+};
+
+extern GBAC gbac;
+
+#endif
diff --git a/samples/vboxwrapper/vbox.cpp b/samples/vboxwrapper/vbox.cpp
deleted file mode 100644
index 9fa5745..0000000
--- a/samples/vboxwrapper/vbox.cpp
+++ /dev/null
@@ -1,3024 +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 <sys/wait.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <vector>
-#include <string>
-#include <fstream>
-#include <sstream>
-#include <stdexcept>
-#include <unistd.h>
-#endif
-
-using std::string;
-
-#if defined(_MSC_VER)
-#define getcwd      _getcwd
-#define stricmp     _stricmp
-#endif
-
-#include "diagnostics.h"
-#include "filesys.h"
-#include "parse.h"
-#include "str_util.h"
-#include "str_replace.h"
-#include "util.h"
-#include "error_numbers.h"
-#include "procinfo.h"
-#include "network.h"
-#include "boinc_api.h"
-#include "floppyio.h"
-#include "vboxwrapper.h"
-#include "vbox.h"
-
-//#define NEW_EXECUTION_PATH 1
-
-VBOX_VM::VBOX_VM() {
-    virtualbox_home_directory.clear();
-    virtualbox_install_directory.clear();
-    virtualbox_version.clear();
-    pFloppy = NULL;
-    vm_log.clear();
-    vm_log_timestamp.hours = 0;
-    vm_log_timestamp.minutes = 0;
-    vm_log_timestamp.seconds = 0;
-    vm_log_timestamp.milliseconds = 0;
-    vm_master_name.clear();
-    vm_master_description.clear();
-    vm_name.clear();
-    vm_cpu_count.clear();
-    vm_disk_controller_type.clear();
-    vm_disk_controller_model.clear();
-    os_name.clear();
-    memory_size_mb.clear();
-    image_filename.clear();
-    floppy_image_filename.clear();
-    job_duration = 0.0;
-    current_cpu_time = 0.0;
-    minimum_checkpoint_interval = 600.0;
-    fraction_done_filename.clear();
-    suspended = false;
-    network_suspended = false;
-    online = false;
-    saving = false;
-    restoring = false;
-    crashed = false;
-    enable_cern_dataformat = false;
-    enable_shared_directory = false;
-    enable_floppyio = false;
-    enable_remotedesktop = false;
-    register_only = false;
-    enable_network = false;
-    pf_guest_port = 0;
-    pf_host_port = 0;
-    headless = true;
-    vm_pid = 0;
-    vboxsvc_pid = 0;
-#ifdef _WIN32
-    vm_pid_handle = 0;
-    vboxsvc_pid_handle = 0;
-#endif
-
-    // Initialize default values
-    vm_disk_controller_type = "ide";
-    vm_disk_controller_model = "PIIX4";
-}
-
-VBOX_VM::~VBOX_VM() {
-    if (pFloppy) {
-        delete pFloppy;
-        pFloppy = NULL;
-    }
-#ifdef _WIN32
-    if (vm_pid_handle) {
-        CloseHandle(vm_pid_handle);
-        vm_pid_handle = NULL;
-    }
-    if (vboxsvc_pid_handle) {
-        CloseHandle(vboxsvc_pid_handle);
-        vboxsvc_pid_handle = NULL;
-    }
-#endif
-}
-
-int VBOX_VM::initialize() {
-    int rc = 0;
-    string old_path;
-    string new_path;
-    string command;
-    string output;
-    APP_INIT_DATA aid;
-    bool force_sandbox = false;
-    char buf[256];
-
-    boinc_get_init_data_p(&aid);
-    get_install_directory(virtualbox_install_directory);
-
-    // Prep the environment so we can execute the vboxmanage application
-    //
-    // TODO: Fix for non-Windows environments if we ever find another platform
-    // where vboxmanage is not already in the search path
-#ifdef _WIN32
-    if (!virtualbox_install_directory.empty())
-    {
-        old_path = getenv("PATH");
-        new_path = virtualbox_install_directory + ";" + old_path;
-
-        if (!SetEnvironmentVariable("PATH", const_cast<char*>(new_path.c_str()))) {
-            fprintf(
-                stderr,
-                "%s Failed to modify the search path.\n",
-                vboxwrapper_msg_prefix(buf, sizeof(buf))
-            );
-        }
-    }
-#endif
-
-    // Determine the VirtualBox home directory.  Overwrite as needed.
-    //
-    if (getenv("VBOX_USER_HOME")) {
-        virtualbox_home_directory = getenv("VBOX_USER_HOME");
-    } else {
-        // If the override environment variable isn't specified then
-        // it is based of the current users HOME directory.
-#ifdef _WIN32
-        virtualbox_home_directory = getenv("USERPROFILE");
-#else
-        virtualbox_home_directory = getenv("HOME");
-#endif
-        virtualbox_home_directory += "/.VirtualBox";
-    }
-
-    // On *nix style systems, VirtualBox expects that there is a home directory specified
-    // by environment variable.  When it doesn't exist it attempts to store logging information
-    // in root's home directory.  Bad things happen if the process isn't owned by root.
-    //
-    // if the HOME environment variable is missing force VirtualBox to use a directory it
-    // has a reasonable chance of writing log files too.
-#ifndef _WIN32
-    if (NULL == getenv("HOME")) {
-        force_sandbox = true;
-    }
-#endif
-
-    // Set the location in which the VirtualBox Configuration files can be
-    // stored for this instance.
-    if (aid.using_sandbox || force_sandbox) {
-        virtualbox_home_directory = aid.project_dir;
-        virtualbox_home_directory += "/../virtualbox";
-
-        if (!boinc_file_exists(virtualbox_home_directory.c_str())) boinc_mkdir(virtualbox_home_directory.c_str());
-
-#ifdef _WIN32
-        if (!SetEnvironmentVariable("VBOX_USER_HOME", const_cast<char*>(virtualbox_home_directory.c_str()))) {
-            fprintf(
-                stderr,
-                "%s Failed to modify the search path.\n",
-                vboxwrapper_msg_prefix(buf, sizeof(buf))
-            );
-        }
-#else
-        // putenv does not copy its input buffer, so we must use setenv
-        if (setenv("VBOX_USER_HOME", const_cast<char*>(virtualbox_home_directory.c_str()), 1)) {
-            fprintf(
-                stderr,
-                "%s Failed to modify the VBOX_USER_HOME path.\n",
-                vboxwrapper_msg_prefix(buf, sizeof(buf))
-            );
-        }
-#endif
-    }
-
-    // Record the VirtualBox version information for later use.
-    command = "--version ";
-    rc = vbm_popen(command, output, "version check");
-
-    // Remove \r or \n from the output spew
-    string::iterator iter = output.begin();
-    while (iter != output.end()) {
-        if (*iter == '\r' || *iter == '\n') {
-            iter = output.erase(iter);
-        } else {
-            ++iter;
-        }
-    }
-
-    virtualbox_version = output;
-
-    return rc;
-}
-
-void VBOX_VM::poll(bool log_state) {
-    char buf[256];
-    APP_INIT_DATA aid;
-    string command;
-    string output;
-    string::iterator iter;
-    string vmstate;
-    static string vmstate_old = "poweroff";
-    size_t vmstate_start;
-    size_t vmstate_end;
-
-    boinc_get_init_data_p(&aid);
-
-    //
-    // Is our environment still sane?
-    //
-#ifdef _WIN32
-    if (aid.using_sandbox && vboxsvc_pid_handle && !process_exists(vboxsvc_pid_handle)) {
-        fprintf(
-            stderr,
-            "%s Status Report: vboxsvc.exe is no longer running.\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf))
-        );
-    }
-    if (vm_pid_handle && !process_exists(vm_pid_handle)) {
-        fprintf(
-            stderr,
-            "%s Status Report: virtualbox.exe/vboxheadless.exe is no longer running.\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf))
-        );
-    }
-#else
-    if (vm_pid && !process_exists(vm_pid)) {
-        fprintf(
-            stderr,
-            "%s Status Report: virtualbox/vboxheadless is no longer running.\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf))
-        );
-    }
-#endif
-
-    //
-    // What state is the VM in?
-    //
-
-    command  = "showvminfo \"" + vm_name + "\" ";
-    command += "--machinereadable ";
-
-    if (vbm_popen(command, output, "VM state", false, false, 45, false) == 0) {
-        vmstate_start = output.find("VMState=\"");
-        if (vmstate_start != string::npos) {
-            vmstate_start += 9;
-            vmstate_end = output.find("\"", vmstate_start);
-            vmstate = output.substr(vmstate_start, vmstate_end - vmstate_start);
-
-            // VirtualBox Documentation suggests that that a VM is running when its
-            // machine state is between MachineState_FirstOnline and MachineState_LastOnline
-            // which as of this writing is 5 and 17.
-            //
-            // VboxManage's source shows more than that though:
-            // see: http://www.virtualbox.org/browser/trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp
-            //
-            // So for now, go with what VboxManage is reporting.
-            //
-            if (vmstate == "running") {
-                online = true;
-                saving = false;
-                restoring = false;
-                suspended = false;
-                crashed = false;
-            } else if (vmstate == "paused") {
-                online = true;
-                saving = false;
-                restoring = false;
-                suspended = true;
-                crashed = false;
-            } else if (vmstate == "starting") {
-                online = true;
-                saving = false;
-                restoring = false;
-                suspended = false;
-                crashed = false;
-            } else if (vmstate == "stopping") {
-                online = true;
-                saving = false;
-                restoring = false;
-                suspended = false;
-                crashed = false;
-            } else if (vmstate == "saving") {
-                online = true;
-                saving = true;
-                restoring = false;
-                suspended = false;
-                crashed = false;
-            } else if (vmstate == "restoring") {
-                online = true;
-                saving = false;
-                restoring = true;
-                suspended = false;
-                crashed = false;
-            } else if (vmstate == "livesnapshotting") {
-                online = true;
-                saving = false;
-                restoring = false;
-                suspended = false;
-                crashed = false;
-            } else if (vmstate == "deletingsnapshotlive") {
-                online = true;
-                saving = false;
-                restoring = false;
-                suspended = false;
-                crashed = false;
-            } else if (vmstate == "deletingsnapshotlivepaused") {
-                online = true;
-                saving = false;
-                restoring = false;
-                suspended = false;
-                crashed = false;
-            } else if (vmstate == "aborted") {
-                online = false;
-                saving = false;
-                restoring = false;
-                suspended = false;
-                crashed = true;
-            } else if (vmstate == "gurumeditation") {
-                online = false;
-                saving = false;
-                restoring = false;
-                suspended = false;
-                crashed = true;
-            } else {
-                online = false;
-                saving = false;
-                restoring = false;
-                suspended = false;
-                crashed = false;
-                if (log_state) {
-                    fprintf(
-                        stderr,
-                        "%s VM is no longer is a running state. It is in '%s'.\n",
-                        vboxwrapper_msg_prefix(buf, sizeof(buf)),
-                        vmstate.c_str()
-                    );
-                }
-            }
-            if (log_state && (vmstate_old != vmstate)) {
-                fprintf(
-                    stderr,
-                    "%s VM state change detected. (old = '%s', new = '%s')\n",
-                    vboxwrapper_msg_prefix(buf, sizeof(buf)),
-                    vmstate_old.c_str(),
-                    vmstate.c_str()
-                );
-                vmstate_old = vmstate;
-            }
-        }
-    }
-
-    //
-    // Grab a snapshot of the latest log file.  Avoids multiple queries across several
-    // functions.
-    //
-    get_vm_log(vm_log);
-
-    //
-    // Dump any new VM Guest Log entries
-    //
-    dumpvmguestlogentries();
-}
-
-int VBOX_VM::create_vm() {
-    string command;
-    string output;
-    string virtual_machine_slot_directory;
-    APP_INIT_DATA aid;
-    bool disable_acceleration = false;
-    char buf[256];
-    int retval;
-
-    boinc_get_init_data_p(&aid);
-    get_slot_directory(virtual_machine_slot_directory);
-
-
-    // Reset VM name in case it was changed while deregistering a stale VM
-    //
-    vm_name = vm_master_name;
-
-
-    fprintf(
-        stderr,
-        "%s Create VM. (%s, slot#%d) \n",
-        vboxwrapper_msg_prefix(buf, sizeof(buf)),
-        vm_name.c_str(),
-        aid.slot
-    );
-
-
-    // Create and register the VM
-    //
-    command  = "createvm ";
-    command += "--name \"" + vm_name + "\" ";
-    command += "--basefolder \"" + virtual_machine_slot_directory + "\" ";
-    command += "--ostype \"" + os_name + "\" ";
-    command += "--register";
-    
-    retval = vbm_popen(command, output, "create");
-    if (retval) return retval;
-
-    // Tweak the VM's Description
-    //
-    command  = "modifyvm \"" + vm_name + "\" ";
-    command += "--description \"" + vm_master_description + "\" ";
-
-    vbm_popen(command, output, "modifydescription", false, false);
-
-    // Tweak the VM's CPU Count
-    //
-    fprintf(
-        stderr,
-        "%s Setting CPU Count for VM. (%s)\n",
-        vboxwrapper_msg_prefix(buf, sizeof(buf)),
-        vm_cpu_count.c_str()
-    );
-    command  = "modifyvm \"" + vm_name + "\" ";
-    command += "--cpus " + vm_cpu_count + " ";
-
-    retval = vbm_popen(command, output, "modifycpu");
-    if (retval) return retval;
-
-    // Tweak the VM's Memory Size
-    //
-    fprintf(
-        stderr,
-        "%s Setting Memory Size for VM. (%sMB)\n",
-        vboxwrapper_msg_prefix(buf, sizeof(buf)),
-        memory_size_mb.c_str()
-    );
-    command  = "modifyvm \"" + vm_name + "\" ";
-    command += "--memory " + memory_size_mb + " ";
-
-    retval = vbm_popen(command, output, "modifymem");
-    if (retval) return retval;
-
-    // Tweak the VM's Chipset Options
-    //
-    fprintf(
-        stderr,
-        "%s Setting Chipset Options for VM.\n",
-        vboxwrapper_msg_prefix(buf, sizeof(buf))
-    );
-    command  = "modifyvm \"" + vm_name + "\" ";
-    command += "--acpi on ";
-    command += "--ioapic on ";
-
-    retval = vbm_popen(command, output, "modifychipset");
-    if (retval) return retval;
-
-    // Tweak the VM's Boot Options
-    //
-    fprintf(
-        stderr,
-        "%s Setting Boot Options for VM.\n",
-        vboxwrapper_msg_prefix(buf, sizeof(buf))
-    );
-    command  = "modifyvm \"" + vm_name + "\" ";
-    command += "--boot1 disk ";
-    command += "--boot2 none ";
-    command += "--boot3 none ";
-    command += "--boot4 none ";
-
-    retval = vbm_popen(command, output, "modifyboot");
-    if (retval) return retval;
-
-    // Tweak the VM's Network Configuration
-    //
-    fprintf(
-        stderr,
-        "%s Setting Network Configuration for VM.\n",
-        vboxwrapper_msg_prefix(buf, sizeof(buf))
-    );
-    command  = "modifyvm \"" + vm_name + "\" ";
-    command += "--nic1 nat ";
-    command += "--natdnsproxy1 on ";
-    command += "--cableconnected1 off ";
-
-    retval = vbm_popen(command, output, "modifynetwork");
-    if (retval) return retval;
-
-    // Tweak the VM's USB Configuration
-    //
-    fprintf(
-        stderr,
-        "%s Disabling USB Support for VM.\n",
-        vboxwrapper_msg_prefix(buf, sizeof(buf))
-    );
-    command  = "modifyvm \"" + vm_name + "\" ";
-    command += "--usb off ";
-
-    vbm_popen(command, output, "modifyusb", false, false);
-
-    // Tweak the VM's COM Port Support
-    //
-    fprintf(
-        stderr,
-        "%s Disabling COM Port Support for VM.\n",
-        vboxwrapper_msg_prefix(buf, sizeof(buf))
-    );
-    command  = "modifyvm \"" + vm_name + "\" ";
-    command += "--uart1 off ";
-    command += "--uart2 off ";
-
-    vbm_popen(command, output, "modifycom", false, false);
-
-    // Tweak the VM's LPT Port Support
-    //
-    fprintf(
-        stderr,
-        "%s Disabling LPT Port Support for VM.\n",
-        vboxwrapper_msg_prefix(buf, sizeof(buf))
-    );
-    command  = "modifyvm \"" + vm_name + "\" ";
-    command += "--lpt1 off ";
-    command += "--lpt2 off ";
-
-    vbm_popen(command, output, "modifylpt", false, false);
-
-    // Tweak the VM's Audio Support
-    //
-    fprintf(
-        stderr,
-        "%s Disabling Audio Support for VM.\n",
-        vboxwrapper_msg_prefix(buf, sizeof(buf))
-    );
-    command  = "modifyvm \"" + vm_name + "\" ";
-    command += "--audio none ";
-
-    vbm_popen(command, output, "modifyaudio", false, false);
-
-    // Tweak the VM's Clipboard Support
-    //
-    fprintf(
-        stderr,
-        "%s Disabling Clipboard Support for VM.\n",
-        vboxwrapper_msg_prefix(buf, sizeof(buf))
-    );
-    command  = "modifyvm \"" + vm_name + "\" ";
-    command += "--clipboard disabled ";
-
-    vbm_popen(command, output, "modifyclipboard", false, false);
-
-    // Tweak the VM's Drag & Drop Support
-    //
-    fprintf(
-        stderr,
-        "%s Disabling Drag and Drop Support for VM.\n",
-        vboxwrapper_msg_prefix(buf, sizeof(buf))
-    );
-    command  = "modifyvm \"" + vm_name + "\" ";
-    command += "--draganddrop disabled ";
-
-    vbm_popen(command, output, "modifydragdrop", false, false);
-
-    // Check to see if the processor supports hardware acceleration for virtualization
-    // If it doesn't, disable the use of it in VirtualBox. Multi-core jobs require hardware
-    // acceleration and actually override this setting.
-    //
-    if (!strstr(aid.host_info.p_features, "vmx") && !strstr(aid.host_info.p_features, "svm")) {
-        fprintf(
-            stderr,
-            "%s Hardware acceleration CPU extensions not detected. Disabling VirtualBox hardware acceleration support.\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf))
-        );
-        disable_acceleration = true;
-    }
-    if (strstr(aid.host_info.p_features, "hypervisor")) {
-        fprintf(
-            stderr,
-            "%s Running under Hypervisor. Disabling VirtualBox hardware acceleration support.\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf))
-        );
-        disable_acceleration = true;
-    }
-    if (is_boinc_client_version_newer(aid, 7, 2, 16)) {
-        if (aid.vm_extensions_disabled) {
-            fprintf(
-                stderr,
-                "%s Hardware acceleration failed with previous execution. Disabling VirtualBox hardware acceleration support.\n",
-                vboxwrapper_msg_prefix(buf, sizeof(buf))
-            );
-            disable_acceleration = true;
-        }
-    } else {
-        if (vm_cpu_count == "1") {
-            // Keep this around for older clients.  Removing this for older clients might
-            // lead to a machine that will only return crashed VM reports.
-            vboxwrapper_msg_prefix(buf, sizeof(buf));
-            fprintf(
-                stderr,
-                "%s Legacy fallback configuration detected. Disabling VirtualBox hardware acceleration support.\n"
-                "%s NOTE: Upgrading to BOINC 7.2.16 or better may re-enable hardware acceleration.\n",
-                buf,
-                buf
-            );
-            disable_acceleration = true;
-        }
-    }
-
-    // Only allow disabling of hardware acceleration on 32-bit VM types, 64-bit VM types require it.
-    //
-    if (os_name.find("_64") == std::string::npos) {
-        if (disable_acceleration) {
-            fprintf(
-                stderr,
-                "%s Disabling hardware acceleration support for virtualization.\n",
-                vboxwrapper_msg_prefix(buf, sizeof(buf))
-            );
-            command  = "modifyvm \"" + vm_name + "\" ";
-            command += "--hwvirtex off ";
-
-            retval = vbm_popen(command, output, "VT-x/AMD-V support");
-            if (retval) return retval;
-        }
-    } else if (os_name.find("_64") != std::string::npos) {
-        if (disable_acceleration) {
-            fprintf(
-                stderr,
-                "%s ERROR: Invalid configuration.  VM type requires acceleration but the current configuration cannot support it.\n",
-                vboxwrapper_msg_prefix(buf, sizeof(buf))
-            );
-            return ERR_INVALID_PARAM;
-        }
-    }
-
-    // Add storage controller to VM
-    // See: http://www.virtualbox.org/manual/ch08.html#vboxmanage-storagectl
-    // See: http://www.virtualbox.org/manual/ch05.html#iocaching
-    //
-    fprintf(
-        stderr,
-        "%s Adding storage controller to VM.\n",
-        vboxwrapper_msg_prefix(buf, sizeof(buf))
-    );
-    command  = "storagectl \"" + vm_name + "\" ";
-    command += "--name \"Hard Disk Controller\" ";
-    command += "--add \"" + vm_disk_controller_type + "\" ";
-    command += "--controller \"" + vm_disk_controller_model + "\" ";
-    command += "--hostiocache off ";
-    if ((vm_disk_controller_type == "sata") || (vm_disk_controller_type == "SATA")) {
-        command += "--sataportcount 1 ";
-    }
-
-    retval = vbm_popen(command, output, "add storage controller (fixed disk)");
-    if (retval) return retval;
-
-    // Add storage controller for a floppy device if desired
-    //
-    if (enable_floppyio) {
-        command  = "storagectl \"" + vm_name + "\" ";
-        command += "--name \"Floppy Controller\" ";
-        command += "--add floppy ";
-
-        retval = vbm_popen(command, output, "add storage controller (floppy)");
-        if (retval) return retval;
-    }
-
-    // Adding virtual hard drive to VM
-    //
-    fprintf(
-        stderr,
-        "%s Adding virtual disk drive to VM. (%s)\n",
-        vboxwrapper_msg_prefix(buf, sizeof(buf)),
-		image_filename.c_str()
-    );
-    command  = "storageattach \"" + vm_name + "\" ";
-    command += "--storagectl \"Hard Disk Controller\" ";
-    command += "--port 0 ";
-    command += "--device 0 ";
-    command += "--type hdd ";
-    command += "--setuuid \"\" ";
-    command += "--medium \"" + virtual_machine_slot_directory + "/" + image_filename + "\" ";
-
-    retval = vbm_popen(command, output, "storage attach (fixed disk)");
-    if (retval) return retval;
-
-    // Add network bandwidth throttle group
-    //
-    if (is_virtualbox_version_newer(4, 2, 0)) {
-        fprintf(
-            stderr,
-            "%s Adding network bandwidth throttle group to VM. (Defaulting to 1024GB)\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf))
-        );
-        command  = "bandwidthctl \"" + vm_name + "\" ";
-        command += "add \"" + vm_name + "_net\" ";
-        command += "--type network ";
-        command += "--limit 1024G";
-        command += " ";
-
-        retval = vbm_popen(command, output, "network throttle group (add)");
-        if (retval) return retval;
-    }
-
-    // Adding virtual floppy disk drive to VM
-    //
-    if (enable_floppyio) {
-
-        // Put in place the FloppyIO abstraction
-        //
-        // NOTE: This creates the floppy.img file at runtime for use by the VM.
-        //
-        pFloppy = new FloppyIO(floppy_image_filename.c_str());
-        if (!pFloppy->ready()) {
-            fprintf(
-                stderr,
-                "%s Creating virtual floppy image failed.\n"
-                "%s Error Code '%d' Error Message '%s'\n",
-                vboxwrapper_msg_prefix(buf, sizeof(buf)),
-                vboxwrapper_msg_prefix(buf, sizeof(buf)),
-                pFloppy->error,
-                pFloppy->errorStr.c_str()
-            );
-            return ERR_FWRITE;
-        }
-
-        fprintf(
-            stderr,
-            "%s Adding virtual floppy disk drive to VM.\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf))
-        );
-        command  = "storageattach \"" + vm_name + "\" ";
-        command += "--storagectl \"Floppy Controller\" ";
-        command += "--port 0 ";
-        command += "--device 0 ";
-        command += "--medium \"" + virtual_machine_slot_directory + "/" + floppy_image_filename + "\" ";
-
-        retval = vbm_popen(command, output, "storage attach (floppy disk)");
-        if (retval) return retval;
-
-    }
-
-    // Enable the network adapter if a network connection is required.
-    //
-    if (enable_network) {
-        set_network_access(true);
-
-        // If the VM wants to open up a port through the VirtualBox virtual
-        // network firewall/nat do that here.
-        //
-        if (pf_guest_port) {
-            if (!pf_host_port) {
-                retval = get_port_forwarding_port();
-                if (retval) return retval;
-            }
-
-            fprintf(
-                stderr,
-                "%s Enabling VM firewall rules.\n",
-                vboxwrapper_msg_prefix(buf, sizeof(buf))
-            );
-
-            // Add new firewall rule
-            //
-            sprintf(buf, "vboxwrapper,tcp,127.0.0.1,%d,,%d", pf_host_port, pf_guest_port);
-            command  = "modifyvm \"" + vm_name + "\" ";
-            command += "--natpf1 \"" + string(buf) + "\" ";
-
-            retval = vbm_popen(command, output, "add updated port forwarding rule");
-            if(retval) return retval;
-        }
-    }
-
-    // If the VM wants to enable remote desktop for the VM do it here
-    //
-    if (enable_remotedesktop) {
-        fprintf(
-            stderr,
-            "%s Enabling remote desktop for VM.\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf))
-        );
-        if (!is_extpack_installed()) {
-            fprintf(
-                stderr,
-                "%s Required extension pack not installed, remote desktop not enabled.\n",
-                vboxwrapper_msg_prefix(buf, sizeof(buf))
-            );
-        } else {
-            retval = get_remote_desktop_port();
-            if (retval) return retval;
-
-            sprintf(buf, "%d", rd_host_port);
-            command  = "modifyvm \"" + vm_name + "\" ";
-            command += "--vrde on ";
-            command += "--vrdeextpack default ";
-            command += "--vrdeauthlibrary default ";
-            command += "--vrdeauthtype null ";
-            command += "--vrdeport " + string(buf) + " ";
-
-            retval = vbm_popen(command, output, "remote desktop");
-            if(retval) return retval;
-        }
-    }
-
-    // Enable the shared folder if a shared folder is specified.
-    //
-    if (enable_shared_directory) {
-        fprintf(
-            stderr,
-            "%s Enabling shared directory for VM.\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf))
-        );
-        command  = "sharedfolder add \"" + vm_name + "\" ";
-        command += "--name \"shared\" ";
-        command += "--hostpath \"" + virtual_machine_slot_directory + "/shared\"";
-
-        retval = vbm_popen(command, output, "enable shared dir");
-        if (retval) return retval;
-    }
-
-    return 0;
-}
-
-int VBOX_VM::register_vm() {
-    string command;
-    string output;
-    string virtual_machine_slot_directory;
-    APP_INIT_DATA aid;
-    char buf[256];
-    int retval;
-
-    boinc_get_init_data_p(&aid);
-    get_slot_directory(virtual_machine_slot_directory);
-
-
-    // Reset VM name in case it was changed while deregistering a stale VM
-    //
-    vm_name = vm_master_name;
-
-
-    fprintf(
-        stderr,
-        "%s Register VM. (%s, slot#%d) \n",
-        vboxwrapper_msg_prefix(buf, sizeof(buf)),
-        vm_name.c_str(),
-        aid.slot
-    );
-
-
-    // Register the VM
-    //
-    command  = "registervm ";
-    command += "\"" + virtual_machine_slot_directory + "/" + vm_name + "/" + vm_name + ".vbox\" ";
-    
-    retval = vbm_popen(command, output, "register");
-    if (retval) return retval;
-
-    return 0;
-}
-
-int VBOX_VM::deregister_vm(bool delete_media) {
-    string command;
-    string output;
-    string virtual_machine_slot_directory;
-    char buf[256];
-
-    get_slot_directory(virtual_machine_slot_directory);
-
-    fprintf(
-        stderr,
-        "%s Deregistering VM.\n",
-        vboxwrapper_msg_prefix(buf, sizeof(buf))
-    );
-
-
-    // Cleanup any left-over snapshots
-    //
-    cleanupsnapshots(true);
-
-    // Delete network bandwidth throttle group
-    //
-    if (is_virtualbox_version_newer(4, 2, 0)) {
-        fprintf(
-            stderr,
-            "%s Removing network bandwidth throttle group from VM.\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf))
-        );
-        command  = "bandwidthctl \"" + vm_name + "\" ";
-        command += "remove \"" + vm_name + "_net\" ";
-
-        vbm_popen(command, output, "network throttle group (remove)", false, false);
-    }
-
-    // Delete its storage controller(s)
-    //
-    fprintf(
-        stderr,
-        "%s Removing storage controller(s) from VM.\n",
-        vboxwrapper_msg_prefix(buf, sizeof(buf))
-    );
-    command  = "storagectl \"" + vm_name + "\" ";
-    command += "--name \"IDE Controller\" ";
-    command += "--remove ";
-
-    vbm_popen(command, output, "deregister storage controller (fixed disk)", false, false);
-
-    if (enable_floppyio) {
-        command  = "storagectl \"" + vm_name + "\" ";
-        command += "--name \"Floppy Controller\" ";
-        command += "--remove ";
-
-        vbm_popen(command, output, "deregister storage controller (floppy disk)", false, false);
-    }
-
-    // Next, delete VM
-    //
-    fprintf(
-        stderr,
-        "%s Removing VM from VirtualBox.\n",
-        vboxwrapper_msg_prefix(buf, sizeof(buf))
-    );
-    command  = "unregistervm \"" + vm_name + "\" ";
-    command += "--delete ";
-
-    vbm_popen(command, output, "delete VM", false, false);
-
-    // Lastly delete medium(s) from Virtual Box Media Registry
-    //
-    fprintf(
-        stderr,
-        "%s Removing virtual disk drive from VirtualBox.\n",
-        vboxwrapper_msg_prefix(buf, sizeof(buf))
-    );
-    command  = "closemedium disk \"" + virtual_machine_slot_directory + "/" + image_filename + "\" ";
-    if (delete_media) {
-        command += "--delete ";
-    }
-
-    vbm_popen(command, output, "remove virtual disk", false, false);
-
-    if (enable_floppyio) {
-        fprintf(
-            stderr,
-            "%s Removing virtual floppy disk from VirtualBox.\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf))
-        );
-        command  = "closemedium floppy \"" + virtual_machine_slot_directory + "/" + floppy_image_filename + "\" ";
-        if (delete_media) {
-            command += "--delete ";
-        }
-
-        vbm_popen(command, output, "remove virtual floppy disk", false, false);
-    }
-
-    return 0;
-}
-
-int VBOX_VM::deregister_stale_vm() {
-    string command;
-    string output;
-    string virtual_machine_slot_directory;
-    size_t uuid_start;
-    size_t uuid_end;
-    int retval;
-
-    get_slot_directory(virtual_machine_slot_directory);
-
-    // We need to determine what the name or uuid is of the previous VM which owns
-    // this virtual disk
-    //
-    command  = "showhdinfo \"" + virtual_machine_slot_directory + "/" + image_filename + "\" ";
-
-    retval = vbm_popen(command, output, "get HDD info");
-    if (retval) return retval;
-
-    // Output should look a little like this:
-    //   UUID:                 c119acaf-636c-41f6-86c9-38e639a31339
-    //   Accessible:           yes
-    //   Logical size:         10240 MBytes
-    //   Current size on disk: 0 MBytes
-    //   Type:                 normal (base)
-    //   Storage format:       VDI
-    //   Format variant:       dynamic default
-    //   In use by VMs:        test2 (UUID: 000ab2be-1254-4c6a-9fdc-1536a478f601)
-    //   Location:             C:\Users\romw\VirtualBox VMs\test2\test2.vdi
-    //
-    uuid_start = output.find("(UUID: ");
-    if (uuid_start != string::npos) {
-        // We can parse the virtual machine ID from the output
-        uuid_start += 7;
-        uuid_end = output.find(")", uuid_start);
-        vm_name = output.substr(uuid_start, uuid_end - uuid_start);
-
-        // Deregister stale VM by UUID
-        return deregister_vm(false);
-    } else {
-        // Did the user delete the VM in VirtualBox and not the medium?  If so,
-        // just remove the medium.
-        command  = "closemedium disk \"" + virtual_machine_slot_directory + "/" + image_filename + "\" ";
-        vbm_popen(command, output, "remove virtual disk", false, false);
-        if (enable_floppyio) {
-            command  = "closemedium floppy \"" + virtual_machine_slot_directory + "/" + floppy_image_filename + "\" ";
-            vbm_popen(command, output, "remove virtual floppy disk", false, false);
-        }
-    }
-    return 0;
-}
-
-int VBOX_VM::run(bool restore_snapshot) {
-    int retval;
-
-    retval = is_registered();
-    if (ERR_TIMEOUT == retval) {
-
-        return VBOXWRAPPER_ERR_RECOVERABLE;
-
-    } else if (ERR_NOT_FOUND == retval) {
-
-        if (is_vm_machine_configuration_available()) {
-            retval = register_vm();
-            if (retval) return retval;
-        } else {
-            if (is_hdd_registered()) {
-                // Handle the case where a previous instance of the same projects VM
-                // was already initialized for the current slot directory but aborted
-                // while the task was suspended and unloaded from memory.
-                retval = deregister_stale_vm();
-                if (retval) return retval;
-            }
-            retval = create_vm();
-            if (retval) return retval;
-        }
-
-    }
-
-    // The user has requested that we exit after registering the VM, so return an
-    // error to stop further processing.
-    if (register_only) return ERR_FOPEN;
-
-    // If we are restarting an already registered VM, then the vm_name variable
-    // will be empty right now, so populate it with the master name so all of the
-    // various other functions will work.
-    vm_name = vm_master_name;
-
-    // Check to see if the VM is already in a running state, if so, poweroff.
-    poll(false);
-    if (online) {
-        retval = poweroff();
-        if (retval) return ERR_NOT_EXITED;
-    }
-
-    // If our last checkpoint time is greater than 0, restore from the previously
-    // saved snapshot
-    if (restore_snapshot) {
-        retval = restoresnapshot();
-        if (retval) return retval;
-    }
-
-    // Start the VM
-    retval = start();
-    if (retval) return retval;
-
-    return 0;
-}
-
-void VBOX_VM::cleanup() {
-    poweroff();
-    deregister_vm(true);
-
-    // Give time enough for external processes to finish the cleanup process
-    boinc_sleep(5.0);
-}
-
-int VBOX_VM::start() {
-    char buf[256];
-    int retval;
-
-    fprintf(
-        stderr,
-        "%s Starting VM.\n",
-        vboxwrapper_msg_prefix(buf, sizeof(buf))
-    );
-
-#ifdef NEW_EXECUTION_PATH
-    retval = launch_vboxvm();
-#else
-    string command;
-    string output;
-    int timeout = 0;
-
-    command = "startvm \"" + vm_name + "\"";
-    if (headless) {
-        command += " --type headless";
-    }
-    retval = vbm_popen(command, output, "start VM", true, false, 0);
-
-    // Get the VM pid as soon as possible
-    while (!retval) {
-        boinc_sleep(1.0);
-        timeout += 1;
-
-        get_vm_process_id();
-
-#ifdef _WIN32
-        if (vm_pid && vm_pid_handle) break;
-#else
-        if (vm_pid) break;
-#endif
-
-        if (timeout > 45) {
-            retval = ERR_TIMEOUT;
-            break;
-        }
-    }
-#endif
-
-    if (BOINC_SUCCESS == retval) {
-        fprintf(
-            stderr,
-            "%s Successfully started VM. (PID = '%d')\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf)),
-            vm_pid
-        );
-    } else {
-        fprintf(
-            stderr,
-            "%s VM failed to start.\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf))
-        );
-    }
-
-    return retval;
-}
-
-int VBOX_VM::stop() {
-    string command;
-    string output;
-    double timeout;
-    char buf[256];
-    int retval = 0;
-
-    fprintf(
-        stderr,
-        "%s Stopping VM.\n",
-        vboxwrapper_msg_prefix(buf, sizeof(buf))
-    );
-    if (online) {
-        command = "controlvm \"" + vm_name + "\" savestate";
-        retval = vbm_popen(command, output, "stop VM", true, false);
-
-        // Wait for up to 5 minutes for the VM to switch states.  A system
-        // under load can take a while.  Since the poll function can wait for up
-        // to 45 seconds to execute a command we need to make this time based instead
-        // of iteration based.
-        if (!retval) {
-            timeout = dtime() + 300;
-            do {
-                poll(false);
-                if (!online && !saving) break;
-                boinc_sleep(1.0);
-            } while (timeout >= dtime());
-        }
-
-        if (!online) {
-            fprintf(
-                stderr,
-                "%s Successfully stopped VM.\n",
-                vboxwrapper_msg_prefix(buf, sizeof(buf))
-            );
-            retval = BOINC_SUCCESS;
-        } else {
-            fprintf(
-                stderr,
-                "%s VM did not stop when requested.\n",
-                vboxwrapper_msg_prefix(buf, sizeof(buf))
-            );
-            retval = ERR_EXEC;
-        }
-    }
-
-    return retval;
-}
-
-int VBOX_VM::poweroff() {
-    string command;
-    string output;
-    double timeout;
-    char buf[256];
-    int retval = 0;
-
-    fprintf(
-        stderr,
-        "%s Powering off VM.\n",
-        vboxwrapper_msg_prefix(buf, sizeof(buf))
-    );
-    if (online) {
-        command = "controlvm \"" + vm_name + "\" poweroff";
-        retval = vbm_popen(command, output, "poweroff VM", true, false);
-
-        // Wait for up to 5 minutes for the VM to switch states.  A system
-        // under load can take a while.  Since the poll function can wait for up
-        // to 45 seconds to execute a command we need to make this time based instead
-        // of iteration based.
-        if (!retval) {
-            timeout = dtime() + 300;
-            do {
-                poll(false);
-                if (!online && !saving) break;
-                boinc_sleep(1.0);
-            } while (timeout >= dtime());
-        }
-
-        if (!online) {
-            fprintf(
-                stderr,
-                "%s Successfully powered off VM.\n",
-                vboxwrapper_msg_prefix(buf, sizeof(buf))
-            );
-            retval = BOINC_SUCCESS;
-        } else {
-            fprintf(
-                stderr,
-                "%s VM did not power off when requested.\n",
-                vboxwrapper_msg_prefix(buf, sizeof(buf))
-            );
-            retval = ERR_EXEC;
-        }
-    }
-
-    return retval;
-}
-
-int VBOX_VM::pause() {
-    string command;
-    string output;
-    int retval;
-
-    // Restore the process priority back to the default process priority
-    // to speed up the last minute maintenance tasks before the VirtualBox
-    // VM goes to sleep
-    //
-    reset_vm_process_priority();
-
-    command = "controlvm \"" + vm_name + "\" pause";
-    retval = vbm_popen(command, output, "pause VM");
-    if (retval) return retval;
-    suspended = true;
-    return 0;
-}
-
-int VBOX_VM::resume() {
-    string command;
-    string output;
-    int retval;
-
-    // Set the process priority back to the lowest level before resuming
-    // execution
-    //
-    lower_vm_process_priority();
-
-    command = "controlvm \"" + vm_name + "\" resume";
-    retval = vbm_popen(command, output, "resume VM");
-    if (retval) return retval;
-    suspended = false;
-    return 0;
-}
-
-int VBOX_VM::createsnapshot(double elapsed_time) {
-    string command;
-    string output;
-    char buf[256];
-    int retval;
-
-    fprintf(
-        stderr,
-        "%s Creating new snapshot for VM.\n",
-        vboxwrapper_msg_prefix(buf, sizeof(buf))
-    );
-
-    // Pause VM - Try and avoid the live snapshot and trigger an online
-    // snapshot instead.
-    pause();
-
-    // Create new snapshot
-    sprintf(buf, "%d", (int)elapsed_time);
-    command = "snapshot \"" + vm_name + "\" ";
-    command += "take boinc_";
-    command += buf;
-    retval = vbm_popen(command, output, "create new snapshot", true, true, 0);
-    if (retval) return retval;
-
-    // Resume VM
-    resume();
-
-    // Set the suspended flag back to false before deleting the stale
-    // snapshot
-    poll(false);
-
-    // Delete stale snapshot(s), if one exists
-    retval = cleanupsnapshots(false);
-    if (retval) return retval;
-
-    fprintf(
-        stderr,
-        "%s Checkpoint completed.\n",
-        vboxwrapper_msg_prefix(buf, sizeof(buf))
-    );
-
-    return 0;
-}
-
-int VBOX_VM::cleanupsnapshots(bool delete_active) {
-    string command;
-    string output;
-    string snapshotlist;
-    string line;
-    string uuid;
-    size_t eol_pos;
-    size_t eol_prev_pos;
-    size_t uuid_start;
-    size_t uuid_end;
-    char buf[256];
-    int retval;
-
-
-    // Enumerate snapshot(s)
-    command = "snapshot \"" + vm_name + "\" ";
-    command += "list ";
-
-    // Only log the error if we are not attempting to deregister the VM.
-    // delete_active is only set to true when we are deregistering the VM.
-    retval = vbm_popen(command, snapshotlist, "enumerate snapshot(s)", !delete_active, false, 0);
-    if (retval) return retval;
-
-    // Output should look a little like this:
-    //   Name: Snapshot 2 (UUID: 1751e9a6-49e7-4dcc-ab23-08428b665ddf)
-    //      Name: Snapshot 3 (UUID: 92fa8b35-873a-4197-9d54-7b6b746b2c58)
-    //         Name: Snapshot 4 (UUID: c049023a-5132-45d5-987d-a9cfadb09664) *
-    //
-    // Traverse the list from newest to oldest.  Otherwise we end up with an error:
-    //   VBoxManage.exe: error: Snapshot operation failed
-    //   VBoxManage.exe: error: Hard disk 'C:\ProgramData\BOINC\slots\23\vm_image.vdi' has 
-    //     more than one child hard disk (2)
-    //
-
-    // Prepend a space and line feed to the output since we are going to traverse it backwards
-    snapshotlist = " \n" + snapshotlist;
-
-    eol_prev_pos = snapshotlist.rfind("\n");
-    eol_pos = snapshotlist.rfind("\n", eol_prev_pos - 1);
-    while (eol_pos != string::npos) {
-        line = snapshotlist.substr(eol_pos, eol_prev_pos - eol_pos);
-
-        // Find the previous line to use in the next iteration
-        eol_prev_pos = eol_pos;
-        eol_pos = snapshotlist.rfind("\n", eol_prev_pos - 1);
-
-        // This VM does not yet have any snapshots
-        if (line.find("does not have any snapshots") != string::npos) break;
-
-        // The * signifies that it is the active snapshot and one we do not want to delete
-        if (!delete_active && (line.rfind("*") != string::npos)) continue;
-
-        uuid_start = line.find("(UUID: ");
-        if (uuid_start != string::npos) {
-            // We can parse the virtual machine ID from the line
-            uuid_start += 7;
-            uuid_end = line.find(")", uuid_start);
-            uuid = line.substr(uuid_start, uuid_end - uuid_start);
-
-            fprintf(
-                stderr,
-                "%s Deleting stale snapshot.\n",
-                vboxwrapper_msg_prefix(buf, sizeof(buf))
-            );
-
-            // Delete stale snapshot, if one exists
-            command = "snapshot \"" + vm_name + "\" ";
-            command += "delete \"";
-            command += uuid;
-            command += "\" ";
-            
-            // Only log the error if we are not attempting to deregister the VM.
-            // delete_active is only set to true when we are deregistering the VM.
-            retval = vbm_popen(command, output, "delete stale snapshot", !delete_active, false, 0);
-            if (retval) return retval;
-        }
-    }
-
-    return 0;
-}
-
-int VBOX_VM::restoresnapshot() {
-    string command;
-    string output;
-    char buf[256];
-    int retval = BOINC_SUCCESS;
-
-    fprintf(
-        stderr,
-        "%s Restore from previously saved snapshot.\n",
-        vboxwrapper_msg_prefix(buf, sizeof(buf))
-    );
-
-    command = "snapshot \"" + vm_name + "\" ";
-    command += "restorecurrent ";
-    retval = vbm_popen(command, output, "restore current snapshot", true, false, 0);
-    if (retval) return retval;
-
-    fprintf(
-        stderr,
-        "%s Restore completed.\n",
-        vboxwrapper_msg_prefix(buf, sizeof(buf))
-    );
-
-    return retval;
-}
-
-void VBOX_VM::dumphypervisorlogs(bool include_error_logs) {
-    string local_system_log;
-    string local_vm_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_vm_exit_code(vm_exit_code);
-
-    if (include_error_logs) {
-        fprintf(
-            stderr,
-            "\n"
-            "    Hypervisor System Log:\n\n"
-            "%s\n"
-            "    VM Execution Log:\n\n"
-            "%s\n"
-            "    VM Trace Log:\n\n"
-            "%s",
-            local_system_log.c_str(),
-            local_vm_log.c_str(),
-            local_trace_log.c_str()
-        );
-    }
-
-    if (vm_exit_code) {
-        fprintf(
-            stderr,
-            "\n"
-            "    VM Exit Code: %d (0x%x)\n\n",
-            (unsigned int)vm_exit_code,
-            (unsigned int)vm_exit_code
-        );
-    }
-}
-
-void VBOX_VM::dumphypervisorstatusreports() {
-
-#ifdef _WIN32
-    char buf[256];
-    SIZE_T ulMinimumWorkingSetSize;
-    SIZE_T ulMaximumWorkingSetSize;
-
-    if (
-        GetProcessWorkingSetSize(
-            vboxsvc_pid_handle,
-            &ulMinimumWorkingSetSize,
-            &ulMaximumWorkingSetSize)
-    ) {
-        fprintf(
-            stderr,
-            "%s Status Report (VirtualBox VboxSvc.exe): Minimum WSS: '%dKB', Maximum WSS: '%dKB'\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf)),
-            ulMinimumWorkingSetSize/1024,
-            ulMaximumWorkingSetSize/1024
-        );
-    }
-
-    if (
-        GetProcessWorkingSetSize(
-            vm_pid_handle,
-            &ulMinimumWorkingSetSize,
-            &ulMaximumWorkingSetSize)
-    ) {
-        fprintf(
-            stderr,
-            "%s Status Report (VirtualBox Vboxheadless.exe/VirtualBox.exe): Minimum WSS: '%dKB', Maximum WSS: '%dKB'\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf)),
-            ulMinimumWorkingSetSize/1024,
-            ulMaximumWorkingSetSize/1024
-        );
-    }
-#endif
-}
-
-// t1 > t2
-static bool is_timestamp_newer(VBOX_TIMESTAMP& t1, VBOX_TIMESTAMP& t2) {
-    if (t1.hours > t2.hours) return true;
-    if (t1.hours < t2.hours) return false;
-    if (t1.minutes > t2.minutes) return true;
-    if (t1.minutes < t2.minutes) return false;
-    if (t1.seconds > t2.seconds) return true;
-    if (t1.seconds < t2.seconds) return false;
-    if (t1.milliseconds > t2.milliseconds) return true;
-    return false;
-}
-
-// Dump any new guest log messages which are generated by applications running within
-// the guest VM.
-void VBOX_VM::dumpvmguestlogentries() {
-    string line;
-    size_t eol_pos;
-    size_t eol_prev_pos;
-    size_t line_pos;
-    VBOX_TIMESTAMP current_timestamp;
-    string msg;
-    char buf[256];
-    
-    eol_prev_pos = 0;
-    eol_pos = vm_log.find("\n");
-    while (eol_pos != string::npos) {
-        line = vm_log.substr(eol_prev_pos, eol_pos - eol_prev_pos);
-
-        line_pos = line.find("Guest Log:");
-        if (line_pos != string::npos) {
-            sscanf(
-                line.c_str(),
-                "%d:%d:%d.%d",
-                &current_timestamp.hours, &current_timestamp.minutes,
-                &current_timestamp.seconds, &current_timestamp.milliseconds
-            );
-
-            if (is_timestamp_newer(current_timestamp, vm_log_timestamp)) {
-                vm_log_timestamp = current_timestamp;
-                msg = line.substr(line_pos, line.size() - line_pos);
-
-                fprintf(
-                    stderr,
-                    "%s %s\n",
-                    vboxwrapper_msg_prefix(buf, sizeof(buf)),
-                    msg.c_str()
-                );
-            }
-        }
-
-        eol_prev_pos = eol_pos + 1;
-        eol_pos = vm_log.find("\n", eol_prev_pos);
-    }
-}
-
-int VBOX_VM::is_registered() {
-    string command;
-    string output;
-    string needle;
-    char buf[256];
-    int retval;
-
-    command  = "showvminfo \"" + vm_master_name + "\" ";
-    command += "--machinereadable ";
-
-    // Look for this string in the output
-    //
-    needle = "name=\"" + vm_master_name + "\"";
-
-    retval = vbm_popen(command, output, "registration detection", false, false);
-
-    // Handle explicit cases first
-    if (ERR_TIMEOUT == retval) {
-        return ERR_TIMEOUT;
-    }
-    if (output.find("VBOX_E_OBJECT_NOT_FOUND") != string::npos) {
-        return ERR_NOT_FOUND;
-    }
-    if (!retval && output.find(needle.c_str()) != string::npos) {
-        return BOINC_SUCCESS;
-    }
-
-    // Something unexpected has happened.  Dump diagnostic output.
-    fprintf(
-        stderr,
-        "%s Error in registration for VM: %d\nArguments:\n%s\nOutput:\n%s\n",
-        vboxwrapper_msg_prefix(buf, sizeof(buf)),
-        retval,
-        command.c_str(),
-        output.c_str()
-    );
-
-    return retval;
-}
-
-// Attempt to detect any condition that would prevent VirtualBox from running a VM properly, like:
-// 1. The DCOM service not being started on Windows
-// 2. Vboxmanage not being able to communicate with vboxsvc for some reason
-// 3. VirtualBox driver not loaded for the current Linux kernel.
-//
-// Luckly both of the above conditions can be detected by attempting to detect the host information
-// via vboxmanage and it is cross platform.
-//
-bool VBOX_VM::is_system_ready(std::string& message) {
-    string command;
-    string output;
-    char buf[256];
-    int retval;
-    bool rc = false;
-
-    command  = "list hostinfo ";
-    retval = vbm_popen(command, output, "host info");
-    if (BOINC_SUCCESS == retval) {
-        rc = true;
-    }
-
-    if (output.size() == 0) {
-        fprintf(
-            stderr,
-            "%s WARNING: Communication with VM Hypervisor failed. (Possibly Out of Memory).\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf))
-        );
-        message = "Communication with VM Hypervisor failed. (Possibly Out of Memory).";
-        rc = false;
-    }
-
-    if (output.find("Processor count:") == string::npos) {
-        fprintf(
-            stderr,
-            "%s WARNING: Communication with VM Hypervisor failed.\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf))
-        );
-        message = "Communication with VM Hypervisor failed.";
-        rc = false;
-    }
-
-    if (output.find("WARNING: The vboxdrv kernel module is not loaded.") != string::npos) {
-        vboxwrapper_msg_prefix(buf, sizeof(buf));
-        fprintf(
-            stderr,
-            "%s WARNING: The vboxdrv kernel module is not loaded.\n"
-            "%s WARNING: Please update/recompile VirtualBox kernel drivers.\n",
-            buf,
-            buf
-        );
-        message = "Please update/recompile VirtualBox kernel drivers.";
-        rc = false;
-    }
-
-    return rc;
-}
-
-bool VBOX_VM::is_vm_machine_configuration_available() {
-    string virtual_machine_slot_directory;
-    string vm_machine_configuration_file;
-    APP_INIT_DATA aid;
-
-    boinc_get_init_data_p(&aid);
-    get_slot_directory(virtual_machine_slot_directory);
-
-    vm_machine_configuration_file = virtual_machine_slot_directory + "/" + vm_master_name + "/" + vm_master_name + ".vbox";
-    if (boinc_file_exists(vm_machine_configuration_file.c_str())) {
-        return true;
-    }
-    return false;
-}
-
-bool VBOX_VM::is_hdd_registered() {
-    string command;
-    string output;
-    string virtual_machine_root_dir;
-
-    get_slot_directory(virtual_machine_root_dir);
-
-    command = "showhdinfo \"" + virtual_machine_root_dir + "/" + image_filename + "\" ";
-
-    if (vbm_popen(command, output, "hdd registration", false, false) == 0) {
-        if ((output.find("VBOX_E_FILE_ERROR") == string::npos) && 
-            (output.find("VBOX_E_OBJECT_NOT_FOUND") == string::npos) &&
-            (output.find("does not match the value") == string::npos)
-        ) {
-            // Error message not found in text
-            return true;
-        }
-    }
-    return false;
-}
-
-bool VBOX_VM::is_extpack_installed() {
-    string command;
-    string output;
-
-    command = "list extpacks";
-
-    if (vbm_popen(command, output, "extpack detection", false, false) == 0) {
-        if ((output.find("Oracle VM VirtualBox Extension Pack") != string::npos) && (output.find("VBoxVRDP") != string::npos)) {
-            return true;
-        }
-    }
-    return false;
-}
-
-bool VBOX_VM::is_logged_failure_vm_extensions_disabled() {
-    if (vm_log.find("VERR_VMX_MSR_LOCKED_OR_DISABLED") != string::npos) return true;
-    if (vm_log.find("VERR_SVM_DISABLED") != string::npos) return true;
-
-    // VirtualBox 4.3.x or better
-    if (vm_log.find("VERR_VMX_MSR_VMXON_DISABLED") != string::npos) return true;
-    if (vm_log.find("VERR_VMX_MSR_SMX_VMXON_DISABLED") != string::npos) return true;
-
-    return false;
-}
-
-bool VBOX_VM::is_logged_failure_vm_extensions_in_use() {
-    if (vm_log.find("VERR_VMX_IN_VMX_ROOT_MODE") != string::npos) return true;
-    if (vm_log.find("VERR_SVM_IN_USE") != string::npos) return true;
-    return false;
-}
-
-bool VBOX_VM::is_logged_failure_vm_extensions_not_supported() {
-    if (vm_log.find("VERR_VMX_NO_VMX") != string::npos) return true;
-    if (vm_log.find("VERR_SVM_NO_SVM") != string::npos) return true;
-    return false;
-}
-
-bool VBOX_VM::is_logged_failure_host_out_of_memory() {
-    if (vm_log.find("VERR_EM_NO_MEMORY") != string::npos) return true;
-    if (vm_log.find("VERR_NO_MEMORY") != string::npos) return true;
-    return false;
-}
-
-bool VBOX_VM::is_logged_failure_guest_job_out_of_memory() {
-    if (vm_log.find("EXIT_OUT_OF_MEMORY") != string::npos) return true;
-    return false;
-}
-
-bool VBOX_VM::is_virtualbox_version_newer(int maj, int min, int rel) {
-    int vbox_major = 0, vbox_minor = 0, vbox_release = 0;
-    if (3 == sscanf(virtualbox_version.c_str(), "%d.%d.%d", &vbox_major, &vbox_minor, &vbox_release)) {
-        if (maj < vbox_major) return true;
-        if (maj > vbox_major) return false;
-        if (min < vbox_minor) return true;
-        if (min > vbox_minor) return false;
-        if (rel < vbox_release) return true;
-    }
-    return false;
-}
-
-bool VBOX_VM::is_virtualbox_error_recoverable(int retval) {
-    // See comments for VBOX_VM::vbm_popen about session lock issues.
-    if (VBOX_E_INVALID_OBJECT_STATE == (unsigned int)retval) return true;
-    return false;
-}
-
-int VBOX_VM::get_install_directory(string& install_directory ) {
-#ifdef _WIN32
-    LONG    lReturnValue;
-    HKEY    hkSetupHive;
-    LPTSTR  lpszRegistryValue = NULL;
-    DWORD   dwSize = 0;
-
-    // change the current directory to the boinc data directory if it exists
-    lReturnValue = RegOpenKeyEx(
-        HKEY_LOCAL_MACHINE, 
-        _T("SOFTWARE\\Oracle\\VirtualBox"),  
-        0, 
-        KEY_READ,
-        &hkSetupHive
-    );
-    if (lReturnValue == ERROR_SUCCESS) {
-        // How large does our buffer need to be?
-        lReturnValue = RegQueryValueEx(
-            hkSetupHive,
-            _T("InstallDir"),
-            NULL,
-            NULL,
-            NULL,
-            &dwSize
-        );
-        if (lReturnValue != ERROR_FILE_NOT_FOUND) {
-            // Allocate the buffer space.
-            lpszRegistryValue = (LPTSTR) malloc(dwSize);
-            (*lpszRegistryValue) = NULL;
-
-            // Now get the data
-            lReturnValue = RegQueryValueEx( 
-                hkSetupHive,
-                _T("InstallDir"),
-                NULL,
-                NULL,
-                (LPBYTE)lpszRegistryValue,
-                &dwSize
-            );
-
-            install_directory = lpszRegistryValue;
-        }
-    }
-
-    if (hkSetupHive) RegCloseKey(hkSetupHive);
-    if (lpszRegistryValue) free(lpszRegistryValue);
-    if (install_directory.empty()) {
-        return 1;
-    }
-    return 0;
-#else
-    install_directory = "";
-    return 0;
-#endif
-}
-
-// Returns the current directory in which the executable resides.
-//
-int VBOX_VM::get_slot_directory(string& dir) {
-    char slot_dir[256];
-
-    getcwd(slot_dir, sizeof(slot_dir));
-    dir = slot_dir;
-
-    if (!dir.empty()) {
-        return 1;
-    }
-    return 0;
-}
-
-int VBOX_VM::get_vm_network_bytes_sent(double& sent) {
-    string command;
-    string output;
-    string counter_value;
-    size_t counter_start;
-    size_t counter_end;
-    int retval;
-
-    command  = "debugvm \"" + vm_name + "\" ";
-    command += "statistics --pattern \"/Devices/*/TransmitBytes\" ";
-
-    retval = vbm_popen(command, output, "get bytes sent");
-    if (retval) return retval;
-
-    // Output should look like this:
-    // <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-    // <Statistics>
-    // <Counter c="397229" unit="bytes" name="/Devices/PCNet0/TransmitBytes"/>
-    // <Counter c="256" unit="bytes" name="/Devices/PCNet1/TransmitBytes"/>
-    // </Statistics>
-
-    // add up the counter(s)
-    //
-    sent = 0;
-    counter_start = output.find("c=\"");
-    while (counter_start != string::npos) {
-        counter_start += 3;
-        counter_end = output.find("\"", counter_start);
-        counter_value = output.substr(counter_start, counter_end - counter_start);
-        sent += atof(counter_value.c_str());
-        counter_start = output.find("c=\"", counter_start);
-    }
-    return 0;
-}
-
-int VBOX_VM::get_vm_network_bytes_received(double& received) {
-    string command;
-    string output;
-    string counter_value;
-    size_t counter_start;
-    size_t counter_end;
-    int retval;
-
-    command  = "debugvm \"" + vm_name + "\" ";
-    command += "statistics --pattern \"/Devices/*/ReceiveBytes\" ";
-
-    retval = vbm_popen(command, output, "get bytes received");
-    if (retval) return retval;
-
-    // Output should look like this:
-    // <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-    // <Statistics>
-    // <Counter c="9423150" unit="bytes" name="/Devices/PCNet0/ReceiveBytes"/>
-    // <Counter c="256" unit="bytes" name="/Devices/PCNet1/ReceiveBytes"/>
-    // </Statistics>
-
-    // add up the counter(s)
-    //
-    received = 0;
-    counter_start = output.find("c=\"");
-    while (counter_start != string::npos) {
-        counter_start += 3;
-        counter_end = output.find("\"", counter_start);
-        counter_value = output.substr(counter_start, counter_end - counter_start);
-        received += atof(counter_value.c_str());
-        counter_start = output.find("c=\"", counter_start);
-    }
-
-    return 0;
-}
-
-int VBOX_VM::get_vm_process_id() {
-    string output;
-    string pid;
-    size_t pid_start;
-    size_t pid_end;
-    int retval;
-
-    retval = get_vm_log(output, false);
-    if (retval) return retval;
-
-    // Output should look like this:
-    // VirtualBox 4.1.0 r73009 win.amd64 (Jul 19 2011 13:05:53) release log
-    // 00:00:06.008 Log opened 2011-09-01T23:00:59.829170900Z
-    // 00:00:06.008 OS Product: Windows 7
-    // 00:00:06.009 OS Release: 6.1.7601
-    // 00:00:06.009 OS Service Pack: 1
-    // 00:00:06.015 Host RAM: 4094MB RAM, available: 876MB
-    // 00:00:06.015 Executable: C:\Program Files\Oracle\VirtualBox\VirtualBox.exe
-    // 00:00:06.015 Process ID: 6128
-    // 00:00:06.015 Package type: WINDOWS_64BITS_GENERIC
-    // 00:00:06.015 Installed Extension Packs:
-    // 00:00:06.015   None installed!
-    //
-    pid_start = output.find("Process ID: ");
-    if (pid_start == string::npos) {
-        return ERR_NOT_FOUND;
-    }
-    pid_start += 12;
-    pid_end = output.find("\n", pid_start);
-    pid = output.substr(pid_start, pid_end - pid_start);
-    if (pid.size() <= 0) {
-        return ERR_NOT_FOUND;
-    }
-
-    vm_pid = atol(pid.c_str());
-
-#ifdef _WIN32
-    vm_pid_handle = OpenProcess(
-        PROCESS_QUERY_INFORMATION | PROCESS_SET_INFORMATION,
-        FALSE,
-        vm_pid
-    );
-#endif
-
-    return 0;
-}
-
-int VBOX_VM::get_vm_exit_code(unsigned long& exit_code) {
-#ifndef _WIN32
-    int ec = 0;
-    waitpid(vm_pid, &ec, WNOHANG);
-    exit_code = ec;
-#else
-    GetExitCodeProcess(vm_pid_handle, &exit_code);
-#endif
-    return 0;
-}
-
-double VBOX_VM::get_vm_cpu_time() {
-    double x = process_tree_cpu_time(vm_pid);
-    if (x > current_cpu_time) {
-        current_cpu_time = x;
-    }
-    return current_cpu_time;
-}
-
-int VBOX_VM::get_port_forwarding_port() {
-    sockaddr_in addr;
-    BOINC_SOCKLEN_T addrsize;
-    int sock;
-    int retval;
-
-    addrsize = sizeof(sockaddr_in);
-
-    memset(&addr, 0, sizeof(sockaddr_in));
-    addr.sin_family = AF_INET;
-    addr.sin_port = htons(pf_host_port);
-    addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-
-    retval = boinc_socket(sock);
-    if (retval) return retval;
- 
-    retval = bind(sock, (const sockaddr*)&addr, addrsize);
-    if (retval < 0) {
-        boinc_close_socket(sock);
-
-        // Lets see if we can get anything useable at this point
-        memset(&addr, 0, sizeof(sockaddr_in));
-        addr.sin_family = AF_INET;
-        addr.sin_port = htons(0);
-        addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-
-        retval = boinc_socket(sock);
-        if (retval) return retval;
-     
-        retval = bind(sock, (const sockaddr*)&addr, addrsize);
-        if (retval < 0) {
-            boinc_close_socket(sock);
-            return ERR_BIND;
-        }
-    }
-
-    getsockname(sock, (sockaddr*)&addr, &addrsize);
-    pf_host_port = ntohs(addr.sin_port);
-
-    boinc_close_socket(sock);
-    return 0;
-}
-
-int VBOX_VM::get_remote_desktop_port() {
-    sockaddr_in addr;
-    BOINC_SOCKLEN_T addrsize;
-    int sock;
-    int retval;
-
-    addrsize = sizeof(sockaddr_in);
-
-    memset(&addr, 0, sizeof(sockaddr_in));
-    addr.sin_family = AF_INET;
-    addr.sin_port = htons(0);
-    addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-
-    retval = boinc_socket(sock);
-    if (retval) return retval;
- 
-    retval = bind(sock, (const sockaddr*)&addr, addrsize);
-    if (retval < 0) {
-        boinc_close_socket(sock);
-        return ERR_BIND;
-    }
-
-    getsockname(sock, (sockaddr*)&addr, &addrsize);
-    rd_host_port = ntohs(addr.sin_port);
-
-    boinc_close_socket(sock);
-    return 0;
-}
-
-int VBOX_VM::get_system_log(string& log, bool tail_only) {
-    string slot_directory;
-    string virtualbox_system_log_src;
-    string virtualbox_system_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_system_log_src = virtualbox_home_directory + "/VBoxSVC.log";
-    virtualbox_system_log_dst = slot_directory + "/VBoxSVC.log";
-
-    if (boinc_file_exists(virtualbox_system_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_system_log_src.c_str(), virtualbox_system_log_dst.c_str());
-
-        if (tail_only) {
-            // Keep only the last 8k if it is larger than that.
-            read_file_string(virtualbox_system_log_dst.c_str(), log, 8192, true);
-        } else {
-            read_file_string(virtualbox_system_log_dst.c_str(), log);
-        }
-
-        sanitize_output(log);
-
-        if (tail_only) {
-            if (log.size() >= 8000) {
-                // 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);
-                }
-            }
-        }
-    } else {
-        retval = ERR_NOT_FOUND;
-    }
-
-    return retval;
-}
-
-int VBOX_VM::get_vm_log(string& log, bool tail_only) {
-    string slot_directory;
-    string virtualbox_vm_log_src;
-    string virtualbox_vm_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_vm_log_src = vm_master_name + "/Logs/VBox.log";
-    virtualbox_vm_log_dst = slot_directory + "/VBox.log";
-
-    if (boinc_file_exists(virtualbox_vm_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_vm_log_src.c_str(), virtualbox_vm_log_dst.c_str());
-
-        if (tail_only) {
-            // Keep only the last 8k if it is larger than that.
-            read_file_string(virtualbox_vm_log_dst.c_str(), log, 8192, true);
-        } else {
-            read_file_string(virtualbox_vm_log_dst.c_str(), log);
-        }
-
-        sanitize_output(log);
-
-        if (tail_only) {
-            if (log.size() >= 8000) {
-                // 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);
-                }
-            }
-        }
-
-    } else {
-        retval = ERR_NOT_FOUND;
-    }
-
-    return retval;
-}
-
-int VBOX_VM::get_trace_log(string& log, bool tail_only) {
-    string slot_directory;
-    string vm_trace_log;
-    string::iterator iter;
-    int retval = BOINC_SUCCESS;
-
-    // Where should we copy temp files to?
-    get_slot_directory(slot_directory);
-
-    // Locate and read log file
-    vm_trace_log = slot_directory + "/" + TRACELOG_FILENAME;
-
-    if (boinc_file_exists(vm_trace_log.c_str())) {
-        if (tail_only) {
-            // Keep only the last 8k if it is larger than that.
-            read_file_string(vm_trace_log.c_str(), log, 8192, true);
-        } else {
-            read_file_string(vm_trace_log.c_str(), log);
-        }
-
-        sanitize_output(log);
-
-        if (tail_only) {
-            if (log.size() >= 8000) {
-                // 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);
-                }
-            }
-        }
-
-    } else {
-        retval = ERR_NOT_FOUND;
-    }
-
-    return retval;
-}
-
-// Enable the network adapter if a network connection is required.
-// NOTE: Network access should never be allowed if the code running in a 
-//   shared directory or the VM image itself is NOT signed.  Doing so
-//   opens up the network behind the company firewall to attack.
-//
-//   Imagine a doomsday scenario where a project has been compromised and
-//   an unsigned executable/VM image has been tampered with.  Volunteer
-//   downloads compromised code and executes it on a company machine.
-//   Now the compromised VM starts attacking other machines on the company
-//   network.  The company firewall cannot help because the attacking
-//   machine is already behind the company firewall.
-//
-int VBOX_VM::set_network_access(bool enabled) {
-    string command;
-    string output;
-    char buf[256];
-    int retval;
-
-    network_suspended = !enabled;
-
-    if (enabled) {
-        fprintf(
-            stderr,
-            "%s Enabling network access for VM.\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf))
-        );
-        command  = "modifyvm \"" + vm_name + "\" ";
-        command += "--cableconnected1 on ";
-
-        retval = vbm_popen(command, output, "enable network");
-        if (retval) return retval;
-    } else {
-        fprintf(
-            stderr,
-            "%s Disabling network access for VM.\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf))
-        );
-        command  = "modifyvm \"" + vm_name + "\" ";
-        command += "--cableconnected1 off ";
-
-        retval = vbm_popen(command, output, "disable network");
-        if (retval) return retval;
-    }
-    return 0;
-}
-
-int VBOX_VM::set_cpu_usage(int percentage) {
-    string command;
-    string output;
-    char buf[256];
-    int retval;
-
-    // the arg to controlvm is percentage
-    //
-    fprintf(
-        stderr,
-        "%s Setting CPU throttle for VM. (%d%%)\n",
-        vboxwrapper_msg_prefix(buf, sizeof(buf)),
-        percentage
-    );
-    sprintf(buf, "%d", percentage);
-    command  = "controlvm \"" + vm_name + "\" ";
-    command += "cpuexecutioncap ";
-    command += buf;
-    command += " ";
-
-    retval = vbm_popen(command, output, "CPU throttle");
-    if (retval) return retval;
-    return 0;
-}
-
-int VBOX_VM::set_network_usage(int kilobytes) {
-    string command;
-    string output;
-    char buf[256];
-    int retval;
-
-    // the argument to modifyvm is in KB
-    //
-    if (kilobytes == 0) {
-        fprintf(
-            stderr,
-            "%s Setting network throttle for VM. (1024GB)\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf))
-        );
-    } else {
-        fprintf(
-            stderr,
-            "%s Setting network throttle for VM. (%dKB)\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf)),
-            kilobytes
-        );
-    }
-
-    if (is_virtualbox_version_newer(4, 2, 0)) {
-
-        // Update bandwidth group limits
-        //
-        if (kilobytes == 0) {
-            command  = "bandwidthctl \"" + vm_name + "\" ";
-            command += "set \"" + vm_name + "_net\" ";
-            command += "--limit 1024G ";
-
-            retval = vbm_popen(command, output, "network throttle (set default value)");
-            if (retval) return retval;
-        } else {
-            sprintf(buf, "%d", kilobytes);
-            command  = "bandwidthctl \"" + vm_name + "\" ";
-            command += "set \"" + vm_name + "_net\" ";
-            command += "--limit ";
-            command += buf;
-            command += "K ";
-
-            retval = vbm_popen(command, output, "network throttle (set)");
-            if (retval) return retval;
-        }
-
-    } else {
-
-        sprintf(buf, "%d", kilobytes);
-        command  = "modifyvm \"" + vm_name + "\" ";
-        command += "--nicspeed1 ";
-        command += buf;
-        command += " ";
-
-        retval = vbm_popen(command, output, "network throttle");
-        if (retval) return retval;
-
-    }
-
-    return 0;
-}
-
-int VBOX_VM::read_floppy(std::string& data) {
-    if (enable_floppyio && pFloppy) {
-        data = pFloppy->receive();
-        return 0;
-    }
-    return 1;
-}
-
-int VBOX_VM::write_floppy(std::string& data) {
-    if (enable_floppyio && pFloppy) {
-        pFloppy->send(data);
-        return 0;
-    }
-    return 1;
-}
-
-void VBOX_VM::lower_vm_process_priority() {
-    char buf[256];
-#ifdef _WIN32
-    if (vm_pid_handle) {
-        SetPriorityClass(vm_pid_handle, BELOW_NORMAL_PRIORITY_CLASS);
-        fprintf(
-            stderr,
-            "%s Lowering VM Process priority.\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf))
-        );
-    }
-#else
-    if (vm_pid) {
-        setpriority(PRIO_PROCESS, vm_pid, PROCESS_MEDIUM_PRIORITY);
-        fprintf(
-            stderr,
-            "%s Lowering VM Process priority.\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf))
-        );
-    }
-#endif
-}
-
-void VBOX_VM::reset_vm_process_priority() {
-    char buf[256];
-#ifdef _WIN32
-    if (vm_pid_handle) {
-        SetPriorityClass(vm_pid_handle, NORMAL_PRIORITY_CLASS);
-        fprintf(
-            stderr,
-            "%s Restoring VM Process priority.\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf))
-        );
-    }
-#else
-    if (vm_pid) {
-        setpriority(PRIO_PROCESS, vm_pid, PROCESS_NORMAL_PRIORITY);
-        fprintf(
-            stderr,
-            "%s Restoring VM Process priority.\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf))
-        );
-    }
-#endif
-}
-
-// Launch VboxSVC.exe before going any further. if we don't, it'll be launched by
-// svchost.exe with its environment block which will not contain the reference
-// to VBOX_USER_HOME which is required for running in the BOINC account-based
-// sandbox on Windows.
-int VBOX_VM::launch_vboxsvc() {
-    APP_INIT_DATA aid;
-    PROC_MAP pm;
-    PROCINFO p;
-    string command;
-    int retval = ERR_EXEC;
-
-#ifdef _WIN32
-    char buf[256];
-    STARTUPINFO si;
-    PROCESS_INFORMATION pi;
-    int pidVboxSvc = 0;
-    HANDLE hVboxSvc = NULL;
-
-    memset(&si, 0, sizeof(si));
-    memset(&pi, 0, sizeof(pi));
-
-    boinc_get_init_data_p(&aid);
-
-    if (aid.using_sandbox) {
-
-        if (!vboxsvc_pid_handle || !process_exists(vboxsvc_pid_handle)) {
-
-            if (vboxsvc_pid_handle) CloseHandle(vboxsvc_pid_handle);
-
-            procinfo_setup(pm);
-            for (PROC_MAP::iterator i = pm.begin(); i != pm.end(); ++i) {
-                p = i->second;
-
-                // We are only looking for vboxsvc
-                if (0 != stricmp(p.command, "vboxsvc.exe")) continue;
-
-                // Store process id for later use
-                pidVboxSvc = p.id;
-
-                // Is this the vboxsvc for the current user?
-                // Non-service install it would be the current username
-                // Service install it would be boinc_project
-                hVboxSvc = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, p.id);
-                if (hVboxSvc) break;
-            }
-            
-            if (pidVboxSvc && hVboxSvc) {
-                
-                fprintf(
-                    stderr,
-                    "%s Status Report: Detected vboxsvc.exe. (PID = '%d')\n",
-                    vboxwrapper_msg_prefix(buf, sizeof(buf)),
-                    pidVboxSvc
-                );
-                vboxsvc_pid = pidVboxSvc;
-                vboxsvc_pid_handle = hVboxSvc;
-                retval = BOINC_SUCCESS;
-
-            } else {
-
-                si.cb = sizeof(STARTUPINFO);
-                si.dwFlags |= STARTF_FORCEOFFFEEDBACK | STARTF_USESHOWWINDOW;
-                si.wShowWindow = SW_HIDE;
-
-                command = "\"VBoxSVC.exe\" --logrotate 1";
-
-                CreateProcess(NULL, (LPTSTR)command.c_str(), NULL, NULL, TRUE, CREATE_NO_WINDOW, NULL, NULL, &si, &pi);
-
-                if (pi.hThread) CloseHandle(pi.hThread);
-                if (pi.hProcess) {
-                    fprintf(
-                        stderr,
-                        "%s Status Report: Launching vboxsvc.exe. (PID = '%d')\n",
-                        vboxwrapper_msg_prefix(buf, sizeof(buf)),
-                        pi.dwProcessId
-                    );
-                    vboxsvc_pid = pi.dwProcessId;
-                    vboxsvc_pid_handle = pi.hProcess;
-                    retval = BOINC_SUCCESS;
-                } else {
-                    fprintf(
-                        stderr,
-                        "%s Status Report: Launching vboxsvc.exe failed!.\n"
-                        "           Error: %s",
-                        vboxwrapper_msg_prefix(buf, sizeof(buf)),
-                        windows_format_error_string(GetLastError(), buf, sizeof(buf))
-                    );
-                }
-
-                vbm_trace(command, std::string(""), retval);
-            }
-        }
-    }
-#endif
-
-    return retval;
-}
-
-// Launch the VM.
-int VBOX_VM::launch_vboxvm() {
-    char buf[256];
-    char cmdline[1024];
-    char* argv[5];
-    int argc;
-    std::string output;
-    int retval = ERR_EXEC;
-
-    // Construct the command line parameters
-    //
-    if (headless) {
-        argv[0] = const_cast<char*>("VboxHeadless.exe");
-    } else {
-        argv[0] = const_cast<char*>("VirtualBox.exe");
-    }
-    argv[1] = const_cast<char*>("--startvm");
-    argv[2] = const_cast<char*>(vm_name.c_str());
-    if (headless) {
-        argv[3] = const_cast<char*>("--vrde config");
-    } else {
-        argv[3] = const_cast<char*>("--no-startvm-errormsgbox");
-    }
-    argv[4] = NULL;
-    argc = 4;
-
-    strcpy(cmdline, "");
-    for (int i=0; i<argc; i++) {
-        strcat(cmdline, argv[i]);
-        if (i<argc-1) {
-            strcat(cmdline, " ");
-        }
-    }
-
-#ifdef _WIN32
-    char error_msg[256];
-    STARTUPINFO si;
-    PROCESS_INFORMATION pi;
-    SECURITY_ATTRIBUTES sa;
-    SECURITY_DESCRIPTOR sd;
-    HANDLE hReadPipe = NULL, hWritePipe = NULL;
-    void* pBuf = NULL;
-    DWORD dwCount = 0;
-    unsigned long ulExitCode = 0;
-    unsigned long ulExitTimeout = 0;
-
-    memset(&si, 0, sizeof(si));
-    memset(&pi, 0, sizeof(pi));
-    memset(&sa, 0, sizeof(sa));
-    memset(&sd, 0, sizeof(sd));
-
-    InitializeSecurityDescriptor(&sd, SECURITY_DESCRIPTOR_REVISION);
-    SetSecurityDescriptorDacl(&sd, true, NULL, false);
-
-    sa.nLength = sizeof(SECURITY_ATTRIBUTES);
-    sa.bInheritHandle = TRUE;
-    sa.lpSecurityDescriptor = &sd;
-
-    if (!CreatePipe(&hReadPipe, &hWritePipe, &sa, NULL)) {
-        fprintf(
-            stderr,
-            "%s CreatePipe failed! (%d).\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf)),
-            GetLastError()
-        );
-        goto CLEANUP;
-    }
-    SetHandleInformation(hReadPipe, HANDLE_FLAG_INHERIT, 0);
-
-    si.cb = sizeof(STARTUPINFO);
-    si.dwFlags |= STARTF_FORCEOFFFEEDBACK | STARTF_USESHOWWINDOW | STARTF_USESTDHANDLES;
-    si.wShowWindow = SW_HIDE;
-    si.hStdOutput = hWritePipe;
-    si.hStdError = hWritePipe;
-    si.hStdInput = NULL;
-
-    // Execute command
-    if (!CreateProcess(
-        NULL, 
-        cmdline,
-        NULL,
-        NULL,
-        TRUE,
-        CREATE_NO_WINDOW,
-        NULL,
-        NULL,
-        &si,
-        &pi
-    )) {
-        vboxwrapper_msg_prefix(buf, sizeof(buf)),
-        fprintf(
-            stderr,
-            "%s Status Report: Launching virtualbox.exe/vboxheadless.exe failed!.\n"
-            "%s         Error: %s (%d)\n",
-            buf,
-            buf,
-            windows_format_error_string(GetLastError(), error_msg, sizeof(error_msg)),
-            GetLastError()
-        );
-        goto CLEANUP;
-    } 
-
-    while(1) {
-        GetExitCodeProcess(pi.hProcess, &ulExitCode);
-
-        // Copy stdout/stderr to output buffer, handle in the loop so that we can
-        // copy the pipe as it is populated and prevent the child process from blocking
-        // in case the output is bigger than pipe buffer.
-        PeekNamedPipe(hReadPipe, NULL, NULL, NULL, &dwCount, NULL);
-        if (dwCount) {
-            pBuf = malloc(dwCount+1);
-            memset(pBuf, 0, dwCount+1);
-
-            if (ReadFile(hReadPipe, pBuf, dwCount, &dwCount, NULL)) {
-                output += (char*)pBuf;
-            }
-
-            free(pBuf);
-        }
-
-        if ((ulExitCode != STILL_ACTIVE) || (ulExitTimeout >= 1000)) break;
-
-        Sleep(250);
-        ulExitTimeout += 250;
-    }
-
-    if (ulExitCode != STILL_ACTIVE) {
-        sanitize_output(output);
-        vboxwrapper_msg_prefix(buf, sizeof(buf)),
-        fprintf(
-            stderr,
-            "%s Status Report: Virtualbox.exe/Vboxheadless.exe exited prematurely!.\n"
-            "%s        Exit Code: %d\n"
-            "%s        Output:\n"
-            "%s\n",
-            buf,
-            buf,
-            ulExitCode,
-            buf,
-            output.c_str()
-        );
-    }
-
-    if (pi.hProcess && (ulExitCode == STILL_ACTIVE)) {
-        vm_pid = pi.dwProcessId;
-        vm_pid_handle = pi.hProcess;
-        retval = BOINC_SUCCESS;
-    }
-
-CLEANUP:
-    if (pi.hThread) CloseHandle(pi.hThread);
-    if (hReadPipe) CloseHandle(hReadPipe);
-    if (hWritePipe) CloseHandle(hWritePipe);
-
-#else
-    int pid = fork();
-    if (-1 == pid) {
-        output = strerror(errno);
-        fprintf(
-            stderr,
-            "%s Status Report: Launching virtualbox.exe/vboxheadless.exe failed!.\n"
-            "           Error: %s",
-            vboxwrapper_msg_prefix(buf, sizeof(buf)),
-            output.c_str()
-        );
-        retval = ERR_FORK;
-    } else if (0 == pid) {
-        if (-1 == execv(argv[0], argv)) {
-            _exit(errno);
-        }
-    } else {
-        vm_pid = pid;
-        retval = BOINC_SUCCESS;
-    }
-#endif
-
-    string cmd_line = cmdline;
-    vbm_trace(cmd_line, output, retval);
-
-    return retval;
-}
-
-void VBOX_VM::sanitize_output(std::string& output) {
-#ifdef _WIN32
-    // Remove \r from the log spew
-    string::iterator iter = output.begin();
-    while (iter != output.end()) {
-        if (*iter == '\r') {
-            iter = output.erase(iter);
-        } else {
-            ++iter;
-        }
-    }
-#endif
-}
-
-// If there are errors we can recover from, process them here.
-//
-int VBOX_VM::vbm_popen(string& command, string& output, const char* item, bool log_error, bool retry_failures, unsigned int timeout, bool log_trace) {
-    int retval = 0;
-    int retry_count = 0;
-    double sleep_interval = 1.0;
-    char buf[256];
-    string retry_notes;
-
-    // Initialize command line
-    command = "VBoxManage -q " + command;
-
-    do {
-        retval = vbm_popen_raw(command, output, timeout);
-        sanitize_output(command);
-        sanitize_output(output);
-
-        if (log_trace) {
-            vbm_trace(command, output, retval);
-        }
-
-        if (retval) {
-
-            // VirtualBox designed the concept of sessions to prevent multiple applications using
-            // the VirtualBox COM API (virtualbox.exe, vboxmanage.exe) from modifying the same VM
-            // at the same time.
-            //
-            // The problem here is that vboxwrapper uses vboxmanage.exe to modify and control the
-            // VM.  Vboxmanage.exe can only maintain the session lock for as long as it takes it
-            // to run.  So that means 99% of the time that a VM is running under BOINC technology
-            // it is running without a session lock.
-            //
-            // If a volunteer opens another VirtualBox management application and goes poking around
-            // that application can aquire the session lock and not give it up for some time.
-            //
-            // If we detect that condition retry the desired command.
-            //
-            // Experiments performed by jujube suggest changing the sleep interval to an exponential
-            // style backoff would increase our chances of success in situations where the previous
-            // lock is held by a previous instance of vboxmanage whos instance data hasn't been
-            // cleaned up within vboxsvc yet.
-            //
-            // Error Code: VBOX_E_INVALID_OBJECT_STATE (0x80bb0007) 
-            //
-            if (VBOX_E_INVALID_OBJECT_STATE == (unsigned int)retval) {
-                if (retry_notes.find("Another VirtualBox management") == string::npos) {
-                    retry_notes += "Another VirtualBox management application has locked the session for\n";
-                    retry_notes += "this VM. BOINC cannot properly monitor this VM\n";
-                    retry_notes += "and so this job will be aborted.\n\n";
-                }
-                if (retry_count) {
-                    sleep_interval *= 2;
-                }
-            }
-
-            // VboxManage has to be able to communicate with vboxsvc in order to actually issue a
-            // command.  In cases where we detect CO_E_SERVER_EXEC_FAILURE, we should just automatically
-            // try the command again.  Vboxmanage wasn't even able to issue the desired command
-            // anyway.
-            //
-            // Experiments performed by jujube suggest changing the sleep interval to an exponential
-            // style backoff would increase our chances of success.
-            //
-            // Error Code: CO_E_SERVER_EXEC_FAILURE (0x80080005) 
-            //
-            if (CO_E_SERVER_EXEC_FAILURE == (unsigned int)retval) {
-                if (retry_notes.find("Unable to communicate with VirtualBox") == string::npos) {
-                    retry_notes += "Unable to communicate with VirtualBox.  VirtualBox may need to\n";
-                    retry_notes += "be reinstalled.\n\n";
-                }
-                if (retry_count) {
-                    sleep_interval *= 2;
-                }
-            }
-            
-            // Retry?
-            if (!retry_failures && 
-                (VBOX_E_INVALID_OBJECT_STATE != (unsigned int)retval) && 
-                (CO_E_SERVER_EXEC_FAILURE != (unsigned int)retval)
-            ) {
-                break;
-            }
-
-            // Timeout?
-            if (retry_count >= 5) break;
-
-            retry_count++;
-            boinc_sleep(sleep_interval);
-        }
-    }
-    while (retval);
-
-    // Add all relivent notes to the output string and log errors
-    //
-    if (retval && log_error) {
-        if (!retry_notes.empty()) {
-            output += "\nNotes:\n\n" + retry_notes;
-        }
-
-        fprintf(
-            stderr,
-            "%s Error in %s for VM: %d\nCommand:\n%s\nOutput:\n%s\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf)),
-            item,
-            retval,
-            command.c_str(),
-            output.c_str()
-        );
-    }
-
-    return retval;
-}
-
-// Execute the vbox manage application and copy the output to the buffer.
-//
-int VBOX_VM::vbm_popen_raw(string& command, string& output, unsigned int timeout) {
-    char buf[256];
-    size_t errcode_start;
-    size_t errcode_end;
-    string errcode;
-    int retval = BOINC_SUCCESS;
-
-    // Launch vboxsvc in case it was shutdown for being idle
-    launch_vboxsvc();
-
-    // Reset output buffer
-    output.clear();
-
-#ifdef _WIN32
-
-    STARTUPINFO si;
-    PROCESS_INFORMATION pi;
-    SECURITY_ATTRIBUTES sa;
-    SECURITY_DESCRIPTOR sd;
-    HANDLE hReadPipe = NULL, hWritePipe = NULL;
-    void* pBuf = NULL;
-    DWORD dwCount = 0;
-    unsigned long ulExitCode = 0;
-    unsigned long ulExitTimeout = 0;
-
-    memset(&si, 0, sizeof(si));
-    memset(&pi, 0, sizeof(pi));
-    memset(&sa, 0, sizeof(sa));
-    memset(&sd, 0, sizeof(sd));
-
-    InitializeSecurityDescriptor(&sd, SECURITY_DESCRIPTOR_REVISION);
-    SetSecurityDescriptorDacl(&sd, true, NULL, false);
-
-    sa.nLength = sizeof(SECURITY_ATTRIBUTES);
-    sa.bInheritHandle = TRUE;
-    sa.lpSecurityDescriptor = &sd;
-
-    if (!CreatePipe(&hReadPipe, &hWritePipe, &sa, NULL)) {
-        fprintf(
-            stderr,
-            "%s CreatePipe failed! (%d).\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf)),
-            GetLastError()
-        );
-        goto CLEANUP;
-    }
-    SetHandleInformation(hReadPipe, HANDLE_FLAG_INHERIT, 0);
-
-    si.cb = sizeof(STARTUPINFO);
-    si.dwFlags |= STARTF_FORCEOFFFEEDBACK | STARTF_USESHOWWINDOW | STARTF_USESTDHANDLES;
-    si.wShowWindow = SW_HIDE;
-    si.hStdOutput = hWritePipe;
-    si.hStdError = hWritePipe;
-    si.hStdInput = NULL;
-
-    // Execute command
-    if (!CreateProcess(
-        NULL, 
-        (LPTSTR)command.c_str(),
-        NULL,
-        NULL,
-        TRUE,
-        CREATE_NO_WINDOW,
-        NULL,
-        NULL,
-        &si,
-        &pi
-    )) {
-        fprintf(
-            stderr,
-            "%s CreateProcess failed! (%d).\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf)),
-            GetLastError()
-        );
-        goto CLEANUP;
-    }
-
-    // Wait until process has completed
-    while(1) {
-        if (timeout == 0) {
-            WaitForSingleObject(pi.hProcess, INFINITE);
-        }
-
-        GetExitCodeProcess(pi.hProcess, &ulExitCode);
-
-        // Copy stdout/stderr to output buffer, handle in the loop so that we can
-        // copy the pipe as it is populated and prevent the child process from blocking
-        // in case the output is bigger than pipe buffer.
-        PeekNamedPipe(hReadPipe, NULL, NULL, NULL, &dwCount, NULL);
-        if (dwCount) {
-            pBuf = malloc(dwCount+1);
-            memset(pBuf, 0, dwCount+1);
-
-            if (ReadFile(hReadPipe, pBuf, dwCount, &dwCount, NULL)) {
-                output += (char*)pBuf;
-            }
-
-            free(pBuf);
-        }
-
-        if (ulExitCode != STILL_ACTIVE) break;
-
-        // Timeout?
-        if (ulExitTimeout >= (timeout * 1000)) {
-            if (!TerminateProcess(pi.hProcess, EXIT_FAILURE)) {
-                fprintf(
-                    stderr,
-                    "%s TerminateProcess failed! (%d).\n",
-                    vboxwrapper_msg_prefix(buf, sizeof(buf)),
-                    GetLastError()
-                );
-            }
-            ulExitCode = 0;
-            retval = ERR_TIMEOUT;
-            Sleep(1000);
-        }
-
-        Sleep(250);
-        ulExitTimeout += 250;
-    }
-
-CLEANUP:
-    if (pi.hThread) CloseHandle(pi.hThread);
-    if (pi.hProcess) CloseHandle(pi.hProcess);
-    if (hReadPipe) CloseHandle(hReadPipe);
-    if (hWritePipe) CloseHandle(hWritePipe);
-
-    if ((ulExitCode != 0) || (!pi.hProcess)) {
-
-        // Determine the real error code by parsing the output
-        errcode_start = output.find("(0x");
-        if (errcode_start != string::npos) {
-            errcode_start += 1;
-            errcode_end = output.find(")", errcode_start);
-            errcode = output.substr(errcode_start, errcode_end - errcode_start);
-
-            sscanf(errcode.c_str(), "%x", &retval);
-        }
-
-        // If something couldn't be found, just return ERR_FOPEN
-        if (!retval) retval = ERR_FOPEN;
-
-    }
-
-#else
-
-    FILE* fp;
-
-    // redirect stderr to stdout for the child process so we can trap it with popen.
-    string modified_command = command + " 2>&1";
-
-    // Execute command
-    fp = popen(modified_command.c_str(), "r");
-    if (fp == NULL){
-        fprintf(
-            stderr,
-            "%s vbm_popen popen failed! errno = %d\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf)),
-            errno
-        );
-        retval = ERR_FOPEN;
-    } else {
-        // Copy output to buffer
-        while (fgets(buf, 256, fp)) {
-            output += buf;
-        }
-
-        // Close stream
-        pclose(fp);
-
-        // Determine the real error code by parsing the output
-        errcode_start = output.find("(0x");
-        if (errcode_start != string::npos) {
-            errcode_start += 1;
-            errcode_end = output.find(")", errcode_start);
-            errcode = output.substr(errcode_start, errcode_end - errcode_start);
-
-            sscanf(errcode.c_str(), "%x", &retval);
-        }
-    }
-
-#endif
-
-    // Is this a RPC_S_SERVER_UNAVAILABLE returned by vboxmanage?
-    if (output.find("RPC_S_SERVER_UNAVAILABLE") != string::npos) {
-        retval = RPC_S_SERVER_UNAVAILABLE;
-    }
-
-    return retval;
-}
-
-void VBOX_VM::vbm_replay(std::string& command) {
-    FILE* f = fopen(REPLAYLOG_FILENAME, "a");
-    if (f) {
-        fprintf(f, "%s\n", command.c_str());
-        fclose(f);
-    }
-}
-
-void VBOX_VM::vbm_trace(std::string& command, std::string& output, int retval) {
-    vbm_replay(command);
-
-    char buf[256];
-    FILE* f = fopen(TRACELOG_FILENAME, "a");
-    if (f) {
-        fprintf(
-            f,
-            "%s\nCommand: %s\nExit Code: %d\nOutput:\n%s\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf)),
-            command.c_str(),
-            retval,
-            output.c_str()
-        );
-        fclose(f);
-    }
-}
-
diff --git a/samples/vboxwrapper/vbox.h b/samples/vboxwrapper/vbox.h
deleted file mode 100644
index b856ab9..0000000
--- a/samples/vboxwrapper/vbox.h
+++ /dev/null
@@ -1,235 +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/>.
-
-
-// Provide cross-platform interfaces for making changes to VirtualBox
-
-#ifndef _VBOX_H_
-#define _VBOX_H_
-
-// Known VirtualBox/COM error codes
-//
-#ifndef CO_E_SERVER_EXEC_FAILURE
-#define CO_E_SERVER_EXEC_FAILURE        0x80080005
-#endif
-#ifndef RPC_S_SERVER_UNAVAILABLE
-#define RPC_S_SERVER_UNAVAILABLE        0x800706ba
-#endif
-#ifndef VBOX_E_INVALID_OBJECT_STATE
-#define VBOX_E_INVALID_OBJECT_STATE     0x80bb0007
-#endif
-
-// Vboxwrapper errors
-//
-#define VBOXWRAPPER_ERR_RECOVERABLE     -1000
-
-// Vboxwrapper diagnostics
-//
-#define REPLAYLOG_FILENAME "vbox_replay.txt"
-#define TRACELOG_FILENAME "vbox_trace.txt"
-
-
-// raw floppy drive device
-class FloppyIO;
-
-// represents a VirtualBox Guest Log Timestamp
-class VBOX_TIMESTAMP {
-public:
-    int hours;
-    int minutes;
-    int seconds;
-    int milliseconds;
-};
-
-// represents a VirtualBox VM
-class VBOX_VM {
-public:
-    VBOX_VM();
-    ~VBOX_VM();
-
-    // Virtualbox Home Directory
-    std::string virtualbox_home_directory;
-    // Virtualbox Install Directory
-    std::string virtualbox_install_directory;
-    // Virtualbox Version Information
-    std::string virtualbox_version;
-
-    // Floppy IO abstraction
-    FloppyIO* pFloppy;
-
-    // last polled copy of the log file
-    std::string vm_log;
-    // last VM guest log entry detected
-    VBOX_TIMESTAMP vm_log_timestamp;
-    // unique name for the VM
-    std::string vm_master_name;
-    // unique description for the VM
-    std::string vm_master_description;
-    // unique name for the VM or UUID of a stale VM if deregistering a stale VM
-    std::string vm_name;
-    // required CPU core count
-    std::string vm_cpu_count;
-    // the type of disk controller to emulate
-    std::string vm_disk_controller_type;
-    // the disk controller model to emulate
-    std::string vm_disk_controller_model;
-    // name of the OS the VM runs
-    std::string os_name;
-    // size of the memory allocation for the VM, in megabytes
-    std::string memory_size_mb;
-    // name of the virtual machine disk image file
-    std::string image_filename;
-    // name of the virtual machine floppy disk image file
-    std::string floppy_image_filename;
-    // maximum amount of wall-clock time this VM is allowed to run before
-    // considering itself done.
-    double job_duration;
-    // amount of CPU time consumed by the VM (note: use get_vm_cpu_time())
-    double current_cpu_time;
-    // minimum amount of time between checkpoints
-    double minimum_checkpoint_interval;
-    // name of file where app will write its fraction done
-    std::string fraction_done_filename;
-    // is the VM suspended?
-    bool suspended;
-    // is network access temporarily suspended?
-    bool network_suspended;
-    // is VM even online?
-    bool online;
-    // Is VM saving/restoring from checkpoint?
-    bool saving;
-    bool restoring;
-    // Has the VM crashed?
-    bool crashed;
-    // whether to use CERN specific data structures
-    bool enable_cern_dataformat;
-    // whether to use shared directory infrastructure at all
-    bool enable_shared_directory;
-    // whether to use floppy io infrastructure at all
-    bool enable_floppyio;
-    // whether to enable remote desktop functionality
-    bool enable_remotedesktop;
-    // whether to allow network access at all
-    bool enable_network;
-    // whether we were instructed to only register the VM.
-    // useful for debugging VMs.
-    bool register_only;
-    // the following for optional port forwarding
-    int pf_host_port;
-        // specified in config file
-    int pf_guest_port;
-        // specified in config file
-    // the following for optional remote desktop
-    int rd_host_port;
-        // dynamically assigned
-    bool headless;
-
-    int vm_pid;
-    int vboxsvc_pid;
-#ifdef _WIN32
-    // the handle to the process for the VM
-    // NOTE: we get a handle to the pid right after we parse it from the
-    //   log files so we can adjust the process priority and retrieve the process
-    //   exit code in case it crashed or was terminated.  Without an outstanding
-    //   handle to the process, the OS is free to reuse the pid for some other
-    //   executable.
-    HANDLE vm_pid_handle;
-
-    // the handle to the vboxsvc process created by us in the sandbox'ed environment
-    HANDLE vboxsvc_pid_handle;
-#endif
-
-    int initialize();
-    void poll(bool log_state = true);
-
-    int create_vm();
-    int register_vm();
-    int deregister_vm(bool delete_media);
-    int deregister_stale_vm();
-
-    int run(bool restore_snapshot);
-    void cleanup();
-
-    int start();
-    int stop();
-    int poweroff();
-    int pause();
-    int resume();
-    int createsnapshot(double elapsed_time);
-    int cleanupsnapshots(bool delete_active);
-    int restoresnapshot();
-    void dumphypervisorlogs(bool include_error_logs);
-    void dumphypervisorstatusreports();
-    void dumpvmguestlogentries();
-
-    int is_registered();
-    bool is_system_ready(std::string& message);
-    bool is_vm_machine_configuration_available();
-    bool is_hdd_registered();
-    bool is_extpack_installed();
-    bool is_logged_failure_vm_extensions_disabled();
-    bool is_logged_failure_vm_extensions_in_use();
-    bool is_logged_failure_vm_extensions_not_supported();
-    bool is_logged_failure_host_out_of_memory();
-    bool is_logged_failure_guest_job_out_of_memory();
-    bool is_virtualbox_version_newer(int maj, int min, int rel);
-    bool is_virtualbox_error_recoverable(int retval);
-
-    int get_install_directory(std::string& dir);
-    int get_slot_directory(std::string& dir);
-    int get_port_forwarding_port();
-    int get_remote_desktop_port();
-    int get_vm_network_bytes_sent(double& sent);
-    int get_vm_network_bytes_received(double& received);
-    int get_vm_process_id();
-    int get_vm_exit_code(unsigned long& exit_code);
-    double get_vm_cpu_time();
-
-    int get_system_log(std::string& log, bool tail_only = true);
-    int get_vm_log(std::string& log, bool tail_only = true);
-    int get_trace_log(std::string& log, bool tail_only = true);
-
-    int set_network_access(bool enabled);
-    int set_cpu_usage(int percentage);
-    int set_network_usage(int kilobytes);
-
-    int read_floppy(std::string& data);
-    int write_floppy(std::string& data);
-
-    void lower_vm_process_priority();
-    void reset_vm_process_priority();
-
-    int launch_vboxsvc();
-    int launch_vboxvm();
-
-    void sanitize_output(std::string& output);
-
-    int vbm_popen(
-        std::string& command, std::string& output, const char* item, bool log_error = true, bool retry_failures = true, unsigned int timeout = 45, bool log_trace = true
-    );
-    int vbm_popen_raw(
-        std::string& command, std::string& output, unsigned int timeout
-    );
-    void vbm_replay(
-        std::string& command
-    );
-    void vbm_trace(
-        std::string& command, std::string& ouput, int retval
-    );
-};
-
-#endif
diff --git a/samples/vboxwrapper/vbox42.tlb b/samples/vboxwrapper/vbox42.tlb
new file mode 100644
index 0000000..4e48763
Binary files /dev/null and b/samples/vboxwrapper/vbox42.tlb differ
diff --git a/samples/vboxwrapper/vbox43.tlb b/samples/vboxwrapper/vbox43.tlb
new file mode 100644
index 0000000..0258eaa
Binary files /dev/null and b/samples/vboxwrapper/vbox43.tlb differ
diff --git a/samples/vboxwrapper/vbox50.tlb b/samples/vboxwrapper/vbox50.tlb
new file mode 100644
index 0000000..2e8ce57
Binary files /dev/null and b/samples/vboxwrapper/vbox50.tlb differ
diff --git a/samples/vboxwrapper/vbox_common.cpp b/samples/vboxwrapper/vbox_common.cpp
new file mode 100644
index 0000000..d2f0820
--- /dev/null
+++ b/samples/vboxwrapper/vbox_common.cpp
@@ -0,0 +1,1143 @@
+// 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"
+
+#if defined(_MSC_VER)
+#define getcwd      _getcwd
+#define stricmp     _stricmp
+#endif
+
+#else
+#include <sys/wait.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <vector>
+#include <string>
+#include <fstream>
+#include <sstream>
+#include <stdexcept>
+#include <unistd.h>
+#endif
+
+using std::string;
+
+#include "diagnostics.h"
+#include "filesys.h"
+#include "parse.h"
+#include "str_util.h"
+#include "str_replace.h"
+#include "util.h"
+#include "error_numbers.h"
+#include "procinfo.h"
+#include "network.h"
+#include "boinc_api.h"
+#include "floppyio.h"
+#include "vboxlogging.h"
+#include "vboxwrapper.h"
+#include "vbox_common.h"
+
+
+bool is_boinc_client_version_newer(APP_INIT_DATA& aid, int maj, int min, int rel) {
+    if (maj < aid.major_version) return true;
+    if (maj > aid.major_version) return false;
+    if (min < aid.minor_version) return true;
+    if (min > aid.minor_version) return false;
+    if (rel < aid.release) return true;
+    return false;
+}
+
+// t1 > t2
+static bool is_timestamp_newer(VBOX_TIMESTAMP& t1, VBOX_TIMESTAMP& t2) {
+    if (t1.hours > t2.hours) return true;
+    if (t1.hours < t2.hours) return false;
+    if (t1.minutes > t2.minutes) return true;
+    if (t1.minutes < t2.minutes) return false;
+    if (t1.seconds > t2.seconds) return true;
+    if (t1.seconds < t2.seconds) return false;
+    if (t1.milliseconds > t2.milliseconds) return true;
+    return false;
+}
+
+
+VBOX_BASE::VBOX_BASE() : VBOX_JOB() {
+    VBOX_JOB::clear();
+    virtualbox_home_directory.clear();
+    virtualbox_install_directory.clear();
+    virtualbox_guest_additions.clear();
+    virtualbox_version.clear();
+    pFloppy = NULL;
+    vm_log.clear();
+    vm_log_timestamp.hours = 0;
+    vm_log_timestamp.minutes = 0;
+    vm_log_timestamp.seconds = 0;
+    vm_log_timestamp.milliseconds = 0;
+    vm_master_name.clear();
+    vm_master_description.clear();
+    vm_name.clear();
+    vm_cpu_count.clear();
+    image_filename.clear();
+    iso_image_filename.clear();
+    cache_disk_filename.clear();
+    floppy_image_filename.clear();
+    current_cpu_time = 0.0;
+    suspended = false;
+    network_suspended = false;
+    online = false;
+    saving = false;
+    restoring = false;
+    crashed = false;
+    register_only = false;
+    rd_host_port = 0;
+    headless = true;
+    vm_pid = 0;
+    vboxsvc_pid = 0;
+#ifdef _WIN32
+    vm_pid_handle = 0;
+    vboxsvc_pid_handle = 0;
+#endif
+}
+
+VBOX_BASE::~VBOX_BASE() {
+    if (pFloppy) {
+        delete pFloppy;
+        pFloppy = NULL;
+    }
+
+#ifdef _WIN32
+    if (vm_pid_handle) {
+        CloseHandle(vm_pid_handle);
+        vm_pid_handle = NULL;
+    }
+    if (vboxsvc_pid_handle) {
+        CloseHandle(vboxsvc_pid_handle);
+        vboxsvc_pid_handle = NULL;
+    }
+#endif
+}
+
+int VBOX_BASE::run(bool do_restore_snapshot) {
+    int retval;
+
+    retval = is_registered();
+    if (ERR_TIMEOUT == retval) {
+
+        return VBOXWRAPPER_ERR_RECOVERABLE;
+
+    } else if (ERR_NOT_FOUND == retval) {
+
+        if (is_vm_machine_configuration_available()) {
+            retval = register_vm();
+            if (retval) return retval;
+        } else {
+            if (is_disk_image_registered()) {
+                // Handle the case where a previous instance of the same projects VM
+                // was already initialized for the current slot directory but aborted
+                // while the task was suspended and unloaded from memory.
+                retval = deregister_stale_vm();
+                if (retval) return retval;
+            }
+            retval = create_vm();
+            if (retval) return retval;
+        }
+
+    }
+
+    // The user has requested that we exit after registering the VM, so return an
+    // error to stop further processing.
+    if (register_only) return ERR_FOPEN;
+
+    // If we are restarting an already registered VM, then the vm_name variable
+    // will be empty right now, so populate it with the master name so all of the
+    // various other functions will work.
+    vm_name = vm_master_name;
+
+    // Check to see if the VM is already in a running state, if so, poweroff.
+    poll(false);
+    if (online) {
+        retval = poweroff();
+        if (retval) return ERR_NOT_EXITED;
+    }
+
+    // If our last checkpoint time is greater than 0, restore from the previously
+    // saved snapshot
+    if (do_restore_snapshot) {
+        retval = restore_snapshot();
+        if (retval) return retval;
+    }
+
+    // Has BOINC signaled that we should quit?
+    // Try to prevent starting the VM in an environment where we might be terminated any
+    // second.  This can happen if BOINC has been told to shutdown or the volunteer has 
+    // told BOINC to switch to a different project.
+    //
+    if (boinc_status.no_heartbeat || boinc_status.quit_request) {
+        return VBOXWRAPPER_ERR_RECOVERABLE;
+    }
+
+    // Start the VM
+    retval = start();
+    if (retval) return retval;
+
+    return 0;
+}
+
+void VBOX_BASE::cleanup() {
+    poweroff();
+    deregister_vm(true);
+
+    // Give time enough for external processes to finish the cleanup process
+    boinc_sleep(5.0);
+}
+
+void VBOX_BASE::dump_hypervisor_logs(bool include_error_logs) {
+    string local_system_log;
+    string local_vm_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_vm_exit_code(vm_exit_code);
+
+    if (include_error_logs) {
+        fprintf(
+            stderr,
+            "\n"
+            "    Hypervisor System Log:\n\n"
+            "%s\n"
+            "    VM Execution Log:\n\n"
+            "%s\n"
+            "    VM Trace Log:\n\n"
+            "%s",
+            local_system_log.c_str(),
+            local_vm_log.c_str(),
+            local_trace_log.c_str()
+        );
+    }
+
+    if (vm_exit_code) {
+        fprintf(
+            stderr,
+            "\n"
+            "    VM Exit Code: %d (0x%x)\n\n",
+            (unsigned int)vm_exit_code,
+            (unsigned int)vm_exit_code
+        );
+    }
+}
+
+// Dump any new guest log messages which are generated by applications running within
+// the guest VM.
+void VBOX_BASE::dump_vmguestlog_entries() {
+    string local_vm_log;
+    string line;
+    size_t eol_pos;
+    size_t eol_prev_pos;
+    size_t line_pos;
+    VBOX_TIMESTAMP current_timestamp;
+    string msg;
+
+    get_vm_log(local_vm_log, true, 16*1024);
+
+    eol_prev_pos = 0;
+    eol_pos = local_vm_log.find("\n");
+    while (eol_pos != string::npos) {
+        line = local_vm_log.substr(eol_prev_pos, eol_pos - eol_prev_pos);
+
+        line_pos = line.find("Guest Log:");
+        if (line_pos != string::npos) {
+            sscanf(
+                line.c_str(),
+                "%d:%d:%d.%d",
+                &current_timestamp.hours, &current_timestamp.minutes,
+                &current_timestamp.seconds, &current_timestamp.milliseconds
+            );
+
+            if (is_timestamp_newer(current_timestamp, vm_log_timestamp)) {
+                vm_log_timestamp = current_timestamp;
+                msg = line.substr(line_pos, line.size() - line_pos);
+
+                vboxlog_msg(msg.c_str());
+            }
+        }
+
+        eol_prev_pos = eol_pos + 1;
+        eol_pos = local_vm_log.find("\n", eol_prev_pos);
+    }
+}
+
+bool VBOX_BASE::is_vm_machine_configuration_available() {
+    string virtual_machine_slot_directory;
+    string vm_machine_configuration_file;
+    APP_INIT_DATA aid;
+
+    boinc_get_init_data_p(&aid);
+    get_slot_directory(virtual_machine_slot_directory);
+
+    vm_machine_configuration_file = virtual_machine_slot_directory + "/" + vm_master_name + "/" + vm_master_name + ".vbox";
+    if (boinc_file_exists(vm_machine_configuration_file.c_str())) {
+        return true;
+    }
+    return false;
+}
+
+bool VBOX_BASE::is_logged_failure_vm_extensions_disabled() {
+    if (vm_log.find("VERR_VMX_MSR_LOCKED_OR_DISABLED") != string::npos) return true;
+    if (vm_log.find("VERR_SVM_DISABLED") != string::npos) return true;
+
+    // VirtualBox 4.3.x or better
+    if (vm_log.find("VERR_VMX_MSR_VMXON_DISABLED") != string::npos) return true;
+    if (vm_log.find("VERR_VMX_MSR_SMX_VMXON_DISABLED") != string::npos) return true;
+
+    return false;
+}
+
+bool VBOX_BASE::is_logged_failure_vm_extensions_in_use() {
+    if (vm_log.find("VERR_VMX_IN_VMX_ROOT_MODE") != string::npos) return true;
+    if (vm_log.find("VERR_SVM_IN_USE") != string::npos) return true;
+    return false;
+}
+
+bool VBOX_BASE::is_logged_failure_vm_extensions_not_supported() {
+    if (vm_log.find("VERR_VMX_NO_VMX") != string::npos) return true;
+    if (vm_log.find("VERR_SVM_NO_SVM") != string::npos) return true;
+    return false;
+}
+
+bool VBOX_BASE::is_logged_failure_vm_powerup() {
+    if (vm_log.find("Power up failed (vrc=VINF_SUCCESS, rc=E_FAIL (0X80004005))") != string::npos) return true;
+    return false;
+}
+
+bool VBOX_BASE::is_logged_failure_host_out_of_memory() {
+    if (vm_log.find("VERR_EM_NO_MEMORY") != string::npos) return true;
+    if (vm_log.find("VERR_NO_MEMORY") != string::npos) return true;
+    return false;
+}
+
+bool VBOX_BASE::is_logged_failure_guest_job_out_of_memory() {
+    if (vm_log.find("EXIT_OUT_OF_MEMORY") != string::npos) return true;
+    return false;
+}
+
+bool VBOX_BASE::is_virtualbox_version_newer(int maj, int min, int rel) {
+    int vbox_major = 0, vbox_minor = 0, vbox_release = 0;
+    if (3 == sscanf(virtualbox_version.c_str(), "%d.%d.%d", &vbox_major, &vbox_minor, &vbox_release)) {
+        if (maj < vbox_major) return true;
+        if (maj > vbox_major) return false;
+        if (min < vbox_minor) return true;
+        if (min > vbox_minor) return false;
+        if (rel < vbox_release) return true;
+    }
+    return false;
+}
+
+// Returns the current directory in which the executable resides.
+//
+int VBOX_BASE::get_slot_directory(string& dir) {
+    char slot_dir[256];
+
+    getcwd(slot_dir, sizeof(slot_dir));
+    dir = slot_dir;
+
+    if (!dir.empty()) {
+        return 1;
+    }
+    return 0;
+}
+
+int VBOX_BASE::get_system_log(string& log, bool tail_only, unsigned int buffer_size) {
+    string slot_directory;
+    string virtualbox_system_log_src;
+    string virtualbox_system_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_system_log_src = virtualbox_home_directory + "/VBoxSVC.log";
+    virtualbox_system_log_dst = slot_directory + "/VBoxSVC.log";
+
+    if (boinc_file_exists(virtualbox_system_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_system_log_src.c_str(), virtualbox_system_log_dst.c_str());
+    }
+
+    if (boinc_file_exists(virtualbox_system_log_dst.c_str())) {
+        if (tail_only) {
+            // Keep only the last 8k if it is larger than that.
+            read_file_string(virtualbox_system_log_dst.c_str(), log, buffer_size, true);
+        } else {
+            read_file_string(virtualbox_system_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::get_vm_log(string& log, bool tail_only, unsigned int buffer_size) {
+    string slot_directory;
+    string virtualbox_vm_log_src;
+    string virtualbox_vm_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_vm_log_src = vm_master_name + "/Logs/VBox.log";
+    virtualbox_vm_log_dst = slot_directory + "/VBox.log";
+
+    if (boinc_file_exists(virtualbox_vm_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_vm_log_src.c_str(), virtualbox_vm_log_dst.c_str());
+    }
+
+    if (boinc_file_exists(virtualbox_vm_log_dst.c_str())) {
+        if (tail_only) {
+            // Keep only the last 8k if it is larger than that.
+            read_file_string(virtualbox_vm_log_dst.c_str(), log, buffer_size, true);
+        } else {
+            read_file_string(virtualbox_vm_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::get_trace_log(string& log, bool tail_only, unsigned int buffer_size) {
+    string slot_directory;
+    string vm_trace_log;
+    string::iterator iter;
+    int retval = BOINC_SUCCESS;
+
+    // Where should we copy temp files to?
+    get_slot_directory(slot_directory);
+
+    // Locate and read log file
+    vm_trace_log = slot_directory + "/" + TRACELOG_FILENAME;
+
+    if (boinc_file_exists(vm_trace_log.c_str())) {
+        if (tail_only) {
+            // Keep only the last 8k if it is larger than that.
+            read_file_string(vm_trace_log.c_str(), log, buffer_size, true);
+        } else {
+            read_file_string(vm_trace_log.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);
+                }
+            }
+        }
+
+    } else {
+        retval = ERR_NOT_FOUND;
+    }
+
+    return retval;
+}
+
+int VBOX_BASE::read_floppy(std::string& data) {
+    if (enable_floppyio && pFloppy) {
+        data = pFloppy->receive();
+        return 0;
+    }
+    return 1;
+}
+
+int VBOX_BASE::write_floppy(std::string& data) {
+    if (enable_floppyio && pFloppy) {
+        pFloppy->send(data);
+        return 0;
+    }
+    return 1;
+}
+
+void VBOX_BASE::sanitize_output(std::string& output) {
+#ifdef _WIN32
+    // Remove \r from the log spew
+    string::iterator iter = output.begin();
+    while (iter != output.end()) {
+        if (*iter == '\r') {
+            iter = output.erase(iter);
+        } else {
+            ++iter;
+        }
+    }
+#endif
+}
+
+// Launch VboxSVC.exe before going any further. if we don't, it'll be launched by
+// svchost.exe with its environment block which will not contain the reference
+// to VBOX_USER_HOME which is required for running in the BOINC account-based
+// sandbox on Windows.
+int VBOX_BASE::launch_vboxsvc() {
+    APP_INIT_DATA aid;
+    PROC_MAP pm;
+    PROCINFO p;
+    string command;
+    int retval = ERR_EXEC;
+
+#ifdef _WIN32
+    char buf[256];
+    STARTUPINFO si;
+    PROCESS_INFORMATION pi;
+    int pidVboxSvc = 0;
+    HANDLE hVboxSvc = NULL;
+
+    memset(&si, 0, sizeof(si));
+    memset(&pi, 0, sizeof(pi));
+
+    boinc_get_init_data_p(&aid);
+
+    if (aid.using_sandbox) {
+
+        if (!vboxsvc_pid_handle || !process_exists(vboxsvc_pid_handle)) {
+
+            if (vboxsvc_pid_handle) CloseHandle(vboxsvc_pid_handle);
+
+            procinfo_setup(pm);
+            for (PROC_MAP::iterator i = pm.begin(); i != pm.end(); ++i) {
+                p = i->second;
+
+                // We are only looking for vboxsvc
+                if (0 != stricmp(p.command, "vboxsvc.exe")) continue;
+
+                // Store process id for later use
+                pidVboxSvc = p.id;
+
+                // Is this the vboxsvc for the current user?
+                // Non-service install it would be the current username
+                // Service install it would be boinc_project
+                hVboxSvc = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, p.id);
+                if (hVboxSvc) break;
+            }
+            
+            if (pidVboxSvc && hVboxSvc) {
+                vboxlog_msg("Status Report: Detected vboxsvc.exe. (PID = '%d')", pidVboxSvc);
+                vboxsvc_pid = pidVboxSvc;
+                vboxsvc_pid_handle = hVboxSvc;
+                retval = BOINC_SUCCESS;
+
+            } else {
+
+                si.cb = sizeof(STARTUPINFO);
+                si.dwFlags |= STARTF_FORCEOFFFEEDBACK | STARTF_USESHOWWINDOW;
+                si.wShowWindow = SW_HIDE;
+
+                command = "\"VBoxSVC.exe\" --logrotate 1";
+
+                CreateProcess(
+                    NULL,
+                    (LPTSTR)command.c_str(),
+                    NULL,
+                    NULL,
+                    TRUE,
+                    CREATE_NO_WINDOW,
+                    NULL,
+                    (LPTSTR)virtualbox_home_directory.c_str(),
+                    &si,
+                    &pi
+                );
+
+                if (pi.hThread) CloseHandle(pi.hThread);
+                if (pi.hProcess) {
+                    vboxlog_msg("Status Report: Launching vboxsvc.exe. (PID = '%d')", pi.dwProcessId);
+                    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)));
+#ifdef _DEBUG
+                    vboxlog_msg("Vbox Version: '%s'", virtualbox_version.c_str());
+                    vboxlog_msg("Vbox Install Directory: '%s'", virtualbox_install_directory.c_str());
+                    vboxlog_msg("Vbox Home Directory: '%s'", virtualbox_home_directory.c_str());
+#endif
+                }
+
+                vbm_trace(command, std::string(""), retval);
+            }
+        }
+    }
+#endif
+
+    return retval;
+}
+
+// Launch the VM.
+int VBOX_BASE::launch_vboxvm() {
+    char buf[256];
+    char cmdline[1024];
+    char* argv[5];
+    int argc;
+    std::string output;
+    int retval = ERR_EXEC;
+
+    // Construct the command line parameters
+    //
+    if (headless) {
+        argv[0] = const_cast<char*>("VboxHeadless.exe");
+    } else {
+        argv[0] = const_cast<char*>("VirtualBox.exe");
+    }
+    argv[1] = const_cast<char*>("--startvm");
+    argv[2] = const_cast<char*>(vm_name.c_str());
+    if (headless) {
+        argv[3] = const_cast<char*>("--vrde config");
+    } else {
+        argv[3] = const_cast<char*>("--no-startvm-errormsgbox");
+    }
+    argv[4] = NULL;
+    argc = 4;
+
+    strcpy(cmdline, "");
+    for (int i=0; i<argc; i++) {
+        strcat(cmdline, argv[i]);
+        if (i<argc-1) {
+            strcat(cmdline, " ");
+        }
+    }
+
+#ifdef _WIN32
+    STARTUPINFO si;
+    PROCESS_INFORMATION pi;
+    SECURITY_ATTRIBUTES sa;
+    SECURITY_DESCRIPTOR sd;
+    HANDLE hReadPipe = NULL, hWritePipe = NULL;
+    void* pBuf = NULL;
+    DWORD dwCount = 0;
+    unsigned long ulExitCode = 0;
+    unsigned long ulExitTimeout = 0;
+
+    memset(&si, 0, sizeof(si));
+    memset(&pi, 0, sizeof(pi));
+    memset(&sa, 0, sizeof(sa));
+    memset(&sd, 0, sizeof(sd));
+
+    InitializeSecurityDescriptor(&sd, SECURITY_DESCRIPTOR_REVISION);
+    SetSecurityDescriptorDacl(&sd, true, NULL, false);
+
+    sa.nLength = sizeof(SECURITY_ATTRIBUTES);
+    sa.bInheritHandle = TRUE;
+    sa.lpSecurityDescriptor = &sd;
+
+    if (!CreatePipe(&hReadPipe, &hWritePipe, &sa, NULL)) {
+        vboxlog_msg("CreatePipe failed! (%d).", GetLastError());
+        goto CLEANUP;
+    }
+    SetHandleInformation(hReadPipe, HANDLE_FLAG_INHERIT, 0);
+
+    si.cb = sizeof(STARTUPINFO);
+    si.dwFlags |= STARTF_FORCEOFFFEEDBACK | STARTF_USESHOWWINDOW | STARTF_USESTDHANDLES;
+    si.wShowWindow = SW_HIDE;
+    si.hStdOutput = hWritePipe;
+    si.hStdError = hWritePipe;
+    si.hStdInput = NULL;
+
+    // Execute command
+    if (!CreateProcess(
+        NULL, 
+        cmdline,
+        NULL,
+        NULL,
+        TRUE,
+        CREATE_NO_WINDOW,
+        NULL,
+        NULL,
+        &si,
+        &pi
+    )) {
+        vboxlog_msg(
+            "Status Report: Launching virtualbox.exe/vboxheadless.exe failed!."
+        );
+        vboxlog_msg(
+            "        Error: %s (%d)",
+            windows_format_error_string(GetLastError(), buf, sizeof(buf)),
+            GetLastError()
+        );
+        goto CLEANUP;
+    } 
+
+    while(1) {
+        GetExitCodeProcess(pi.hProcess, &ulExitCode);
+
+        // Copy stdout/stderr to output buffer, handle in the loop so that we can
+        // copy the pipe as it is populated and prevent the child process from blocking
+        // in case the output is bigger than pipe buffer.
+        PeekNamedPipe(hReadPipe, NULL, NULL, NULL, &dwCount, NULL);
+        if (dwCount) {
+            pBuf = malloc(dwCount+1);
+            memset(pBuf, 0, dwCount+1);
+
+            if (ReadFile(hReadPipe, pBuf, dwCount, &dwCount, NULL)) {
+                output += (char*)pBuf;
+            }
+
+            free(pBuf);
+        }
+
+        if ((ulExitCode != STILL_ACTIVE) || (ulExitTimeout >= 1000)) break;
+
+        Sleep(250);
+        ulExitTimeout += 250;
+    }
+
+    if (ulExitCode != STILL_ACTIVE) {
+        sanitize_output(output);
+        vboxlog_msg(
+            "Status Report: Virtualbox.exe/Vboxheadless.exe exited prematurely!."
+        );
+        vboxlog_msg(
+            "    Exit Code: %d",
+            ulExitCode
+        );
+        vboxlog_msg(
+            "       Output: %s",
+            output.c_str()
+        );
+    }
+
+    if (pi.hProcess && (ulExitCode == STILL_ACTIVE)) {
+        vm_pid = pi.dwProcessId;
+        vm_pid_handle = pi.hProcess;
+        retval = BOINC_SUCCESS;
+    }
+
+CLEANUP:
+    if (pi.hThread) CloseHandle(pi.hThread);
+    if (hReadPipe) CloseHandle(hReadPipe);
+    if (hWritePipe) CloseHandle(hWritePipe);
+
+#else
+    int pid = fork();
+    if (-1 == pid) {
+        vboxlog_msg(
+            "Status Report: Launching virtualbox/vboxheadless failed!."
+        );
+        vboxlog_msg(
+            "        Error: %s (%d)",
+            strerror(errno),
+            errno
+        );
+        retval = ERR_FORK;
+    } else if (0 == pid) {
+        if (-1 == execv(argv[0], argv)) {
+            _exit(errno);
+        }
+    } else {
+        vm_pid = pid;
+        retval = BOINC_SUCCESS;
+    }
+#endif
+
+    string cmd_line = cmdline;
+    vbm_trace(cmd_line, output, retval);
+
+    return retval;
+}
+
+// If there are errors we can recover from, process them here.
+//
+int VBOX_BASE::vbm_popen(string& command, string& output, const char* item, bool log_error, bool retry_failures, unsigned int timeout, bool log_trace) {
+    int retval = 0;
+    int retry_count = 0;
+    double sleep_interval = 1.0;
+    string retry_notes;
+
+    // Initialize command line
+    command = "VBoxManage -q " + command;
+
+    do {
+        retval = vbm_popen_raw(command, output, timeout);
+        sanitize_output(command);
+        sanitize_output(output);
+
+        if (log_trace) {
+            vbm_trace(command, output, retval);
+        }
+
+        if (retval) {
+
+            // VirtualBox designed the concept of sessions to prevent multiple applications using
+            // the VirtualBox COM API (virtualbox.exe, vboxmanage.exe) from modifying the same VM
+            // at the same time.
+            //
+            // The problem here is that vboxwrapper uses vboxmanage.exe to modify and control the
+            // VM.  Vboxmanage.exe can only maintain the session lock for as long as it takes it
+            // to run.  So that means 99% of the time that a VM is running under BOINC technology
+            // it is running without a session lock.
+            //
+            // If a volunteer opens another VirtualBox management application and goes poking around
+            // that application can aquire the session lock and not give it up for some time.
+            //
+            // If we detect that condition retry the desired command.
+            //
+            // Experiments performed by jujube suggest changing the sleep interval to an exponential
+            // style backoff would increase our chances of success in situations where the previous
+            // lock is held by a previous instance of vboxmanage whos instance data hasn't been
+            // cleaned up within vboxsvc yet.
+            //
+            // Error Code: VBOX_E_INVALID_OBJECT_STATE (0x80bb0007) 
+            //
+            if (VBOX_E_INVALID_OBJECT_STATE == (unsigned int)retval) {
+                if (retry_notes.find("Another VirtualBox management") == string::npos) {
+                    retry_notes += "Another VirtualBox management application has locked the session for\n";
+                    retry_notes += "this VM. BOINC cannot properly monitor this VM\n";
+                    retry_notes += "and so this job will be aborted.\n\n";
+                }
+                if (retry_count) {
+                    sleep_interval *= 2;
+                }
+            }
+
+            // VboxManage has to be able to communicate with vboxsvc in order to actually issue a
+            // command.  In cases where we detect CO_E_SERVER_EXEC_FAILURE, we should just automatically
+            // try the command again.  Vboxmanage wasn't even able to issue the desired command
+            // anyway.
+            //
+            // Experiments performed by jujube suggest changing the sleep interval to an exponential
+            // style backoff would increase our chances of success.
+            //
+            // Error Code: CO_E_SERVER_EXEC_FAILURE (0x80080005) 
+            //
+            if (CO_E_SERVER_EXEC_FAILURE == (unsigned int)retval) {
+                if (retry_notes.find("Unable to communicate with VirtualBox") == string::npos) {
+                    retry_notes += "Unable to communicate with VirtualBox.  VirtualBox may need to\n";
+                    retry_notes += "be reinstalled.\n\n";
+                }
+                if (retry_count) {
+                    sleep_interval *= 2;
+                }
+            }
+            
+            // Retry?
+            if (!retry_failures && 
+                (VBOX_E_INVALID_OBJECT_STATE != (unsigned int)retval) && 
+                (CO_E_SERVER_EXEC_FAILURE != (unsigned int)retval)
+            ) {
+                break;
+            }
+
+            // Timeout?
+            if (retry_count >= 5) break;
+
+            retry_count++;
+            boinc_sleep(sleep_interval);
+        }
+    }
+    while (retval);
+
+    // Add all relivent notes to the output string and log errors
+    //
+    if (retval && log_error) {
+        if (!retry_notes.empty()) {
+            output += "\nNotes:\n\n" + retry_notes;
+        }
+        vboxlog_msg(
+            "Error in %s for VM: %d\nCommand:\n%s\nOutput:\n%s",
+            item,
+            retval,
+            command.c_str(),
+            output.c_str()
+        );
+    }
+
+    return retval;
+}
+
+// Execute the vbox manage application and copy the output to the buffer.
+//
+int VBOX_BASE::vbm_popen_raw(string& command, string& output, unsigned int timeout) {
+    size_t errcode_start;
+    size_t errcode_end;
+    string errcode;
+    int retval = BOINC_SUCCESS;
+
+    // Reset output buffer
+    output.clear();
+
+#ifdef _WIN32
+
+    STARTUPINFO si;
+    PROCESS_INFORMATION pi;
+    SECURITY_ATTRIBUTES sa;
+    SECURITY_DESCRIPTOR sd;
+    HANDLE hReadPipe = NULL, hWritePipe = NULL;
+    void* pBuf = NULL;
+    DWORD dwCount = 0;
+    unsigned long ulExitCode = 0;
+    unsigned long ulExitTimeout = 0;
+
+    memset(&si, 0, sizeof(si));
+    memset(&pi, 0, sizeof(pi));
+    memset(&sa, 0, sizeof(sa));
+    memset(&sd, 0, sizeof(sd));
+
+    InitializeSecurityDescriptor(&sd, SECURITY_DESCRIPTOR_REVISION);
+    SetSecurityDescriptorDacl(&sd, true, NULL, false);
+
+    sa.nLength = sizeof(SECURITY_ATTRIBUTES);
+    sa.bInheritHandle = TRUE;
+    sa.lpSecurityDescriptor = &sd;
+
+    if (!CreatePipe(&hReadPipe, &hWritePipe, &sa, NULL)) {
+        vboxlog_msg("CreatePipe failed! (%d).", GetLastError());
+        goto CLEANUP;
+    }
+    SetHandleInformation(hReadPipe, HANDLE_FLAG_INHERIT, 0);
+
+    si.cb = sizeof(STARTUPINFO);
+    si.dwFlags |= STARTF_FORCEOFFFEEDBACK | STARTF_USESHOWWINDOW | STARTF_USESTDHANDLES;
+    si.wShowWindow = SW_HIDE;
+    si.hStdOutput = hWritePipe;
+    si.hStdError = hWritePipe;
+    si.hStdInput = NULL;
+
+    // Execute command
+    if (!CreateProcess(
+        NULL, 
+        (LPTSTR)command.c_str(),
+        NULL,
+        NULL,
+        TRUE,
+        CREATE_NO_WINDOW,
+        NULL,
+        NULL,
+        &si,
+        &pi
+    )) {
+        vboxlog_msg("CreateProcess failed! (%d).", GetLastError());
+        goto CLEANUP;
+    }
+
+    // Wait until process has completed
+    while(1) {
+        if (timeout == 0) {
+            WaitForSingleObject(pi.hProcess, INFINITE);
+        }
+
+        GetExitCodeProcess(pi.hProcess, &ulExitCode);
+
+        // Copy stdout/stderr to output buffer, handle in the loop so that we can
+        // copy the pipe as it is populated and prevent the child process from blocking
+        // in case the output is bigger than pipe buffer.
+        PeekNamedPipe(hReadPipe, NULL, NULL, NULL, &dwCount, NULL);
+        if (dwCount) {
+            pBuf = malloc(dwCount+1);
+            memset(pBuf, 0, dwCount+1);
+
+            if (ReadFile(hReadPipe, pBuf, dwCount, &dwCount, NULL)) {
+                output += (char*)pBuf;
+            }
+
+            free(pBuf);
+        }
+
+        if (ulExitCode != STILL_ACTIVE) break;
+
+        // Timeout?
+        if (ulExitTimeout >= (timeout * 1000)) {
+            if (!TerminateProcess(pi.hProcess, EXIT_FAILURE)) {
+                vboxlog_msg("TerminateProcess failed! (%d).", GetLastError());
+            }
+            ulExitCode = 0;
+            retval = ERR_TIMEOUT;
+            Sleep(1000);
+        }
+
+        Sleep(250);
+        ulExitTimeout += 250;
+    }
+
+CLEANUP:
+    if (pi.hThread) CloseHandle(pi.hThread);
+    if (pi.hProcess) CloseHandle(pi.hProcess);
+    if (hReadPipe) CloseHandle(hReadPipe);
+    if (hWritePipe) CloseHandle(hWritePipe);
+
+    if ((ulExitCode != 0) || (!pi.hProcess)) {
+
+        // Determine the real error code by parsing the output
+        errcode_start = output.find("(0x");
+        if (errcode_start != string::npos) {
+            errcode_start += 1;
+            errcode_end = output.find(")", errcode_start);
+            errcode = output.substr(errcode_start, errcode_end - errcode_start);
+
+            sscanf(errcode.c_str(), "%x", &retval);
+        }
+
+        // If something couldn't be found, just return ERR_FOPEN
+        if (!retval) retval = ERR_FOPEN;
+
+    }
+
+#else
+
+    char buf[256];
+    FILE* fp;
+
+    // redirect stderr to stdout for the child process so we can trap it with popen.
+    string modified_command = command + " 2>&1";
+
+    // Execute command
+    fp = popen(modified_command.c_str(), "r");
+    if (fp == NULL){
+        vboxlog_msg("vbm_popen popen failed! (%d).", errno);
+        retval = ERR_FOPEN;
+    } else {
+        // Copy output to buffer
+        while (fgets(buf, 256, fp)) {
+            output += buf;
+        }
+
+        // Close stream
+        pclose(fp);
+
+        // Determine the real error code by parsing the output
+        errcode_start = output.find("(0x");
+        if (errcode_start != string::npos) {
+            errcode_start += 1;
+            errcode_end = output.find(")", errcode_start);
+            errcode = output.substr(errcode_start, errcode_end - errcode_start);
+
+            sscanf(errcode.c_str(), "%x", &retval);
+        }
+    }
+
+#endif
+
+    // Is this a RPC_S_SERVER_UNAVAILABLE returned by vboxmanage?
+    if (output.find("RPC_S_SERVER_UNAVAILABLE") != string::npos) {
+        retval = RPC_S_SERVER_UNAVAILABLE;
+    }
+
+    return retval;
+}
+
+void VBOX_BASE::vbm_replay(std::string& command) {
+    FILE* f = fopen(REPLAYLOG_FILENAME, "a");
+    if (f) {
+        fprintf(f, "%s\n", command.c_str());
+        fclose(f);
+    }
+}
+
+void VBOX_BASE::vbm_trace(std::string& command, std::string& output, int retval) {
+    char buf[256];
+    int pid;
+    struct tm tm;
+    struct tm *tmp = &tm;
+
+    vbm_replay(command);
+
+    time_t x = time(0);
+#ifdef _WIN32
+    pid = GetCurrentProcessId();
+    localtime_s(&tm, &x);
+#else
+    pid = getpid();
+    localtime_r(&x, &tm);
+#endif
+
+    strftime(buf, sizeof(buf)-1, "%Y-%m-%d %H:%M:%S", &tm);
+
+    FILE* f = fopen(TRACELOG_FILENAME, "a");
+    if (f) {
+        fprintf(
+            f,
+            "%s (%d): ",
+            buf,
+            pid
+        );
+        fprintf(
+            f,
+            "\nCommand: %s\nExit Code: %d\nOutput:\n%s\n",
+            command.c_str(),
+            retval,
+            output.c_str()
+        );
+        fclose(f);
+    }
+}
+
+VBOX_VM::VBOX_VM() {
+}
+
+VBOX_VM::~VBOX_VM() {
+}
diff --git a/samples/vboxwrapper/vbox_common.h b/samples/vboxwrapper/vbox_common.h
new file mode 100644
index 0000000..373283b
--- /dev/null
+++ b/samples/vboxwrapper/vbox_common.h
@@ -0,0 +1,246 @@
+// 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/>.
+
+
+// Provide cross-platform interfaces for making changes to VirtualBox
+
+#ifndef _VBOX_COMMON_H_
+#define _VBOX_COMMON_H_
+
+#include "vboxjob.h"
+
+
+// Known VirtualBox/COM error codes
+//
+#ifndef CO_E_SERVER_EXEC_FAILURE
+#define CO_E_SERVER_EXEC_FAILURE        0x80080005
+#endif
+#ifndef RPC_S_SERVER_UNAVAILABLE
+#define RPC_S_SERVER_UNAVAILABLE        0x800706BA
+#endif
+#ifndef VBOX_E_OBJECT_NOT_FOUND
+#define VBOX_E_OBJECT_NOT_FOUND         0x80BB0001
+#endif
+#ifndef VBOX_E_INVALID_VM_STATE
+#define VBOX_E_INVALID_VM_STATE         0x80BB0002
+#endif
+#ifndef VBOX_E_VM_ERROR
+#define VBOX_E_VM_ERROR                 0x80BB0003
+#endif
+#ifndef VBOX_E_FILE_ERROR
+#define VBOX_E_FILE_ERROR               0x80BB0004
+#endif
+#ifndef VBOX_E_IPRT_ERROR
+#define VBOX_E_IPRT_ERROR               0x80BB0005
+#endif
+#ifndef VBOX_E_PDM_ERROR
+#define VBOX_E_PDM_ERROR                0x80BB0006
+#endif
+#ifndef VBOX_E_INVALID_OBJECT_STATE
+#define VBOX_E_INVALID_OBJECT_STATE     0x80BB0007
+#endif
+#ifndef VBOX_E_HOST_ERROR
+#define VBOX_E_HOST_ERROR               0x80BB0008
+#endif
+#ifndef VBOX_E_NOT_SUPPORTED
+#define VBOX_E_NOT_SUPPORTED            0x80BB0009
+#endif
+#ifndef VBOX_E_XML_ERROR
+#define VBOX_E_XML_ERROR                0x80BB000A
+#endif
+#ifndef VBOX_E_INVALID_SESSION_STATE
+#define VBOX_E_INVALID_SESSION_STATE    0x80BB000B
+#endif
+#ifndef VBOX_E_OBJECT_IN_USE
+#define VBOX_E_OBJECT_IN_USE            0x80BB000B
+#endif
+
+
+// Vboxwrapper errors
+//
+#define VBOXWRAPPER_ERR_RECOVERABLE     -1000
+
+
+// Vboxwrapper diagnostics
+//
+#define REPLAYLOG_FILENAME "vbox_replay.txt"
+#define TRACELOG_FILENAME "vbox_trace.txt"
+
+
+//
+//
+extern bool is_boinc_client_version_newer(APP_INIT_DATA& aid, int maj, int min, int rel);
+
+
+// represents a VirtualBox Guest Log Timestamp
+struct VBOX_TIMESTAMP {
+    int hours;
+    int minutes;
+    int seconds;
+    int milliseconds;
+};
+
+
+class VBOX_BASE : public VBOX_JOB {
+public:
+    VBOX_BASE();
+    virtual ~VBOX_BASE();
+
+    std::string virtualbox_home_directory;
+    std::string virtualbox_install_directory;
+    std::string virtualbox_guest_additions;
+    std::string virtualbox_version;
+
+    FloppyIONS::FloppyIO* pFloppy;
+
+    std::string vm_log;
+        // last polled copy of the log file
+    VBOX_TIMESTAMP vm_log_timestamp;
+        // last VM guest log entry detected
+    std::string vm_master_name;
+        // unique name for the VM
+    std::string vm_master_description;
+        // unique description for the VM
+    std::string vm_name;
+        // unique name for the VM or UUID of a stale VM if deregistering it
+    std::string vm_cpu_count;
+        // required CPU core count
+    std::string image_filename;
+        // name of the virtual machine disk image file
+    std::string iso_image_filename;
+        // name of the virtual machine iso9660 disk image file
+    std::string cache_disk_filename;
+        // name of the virtual machine cache disk image file
+    std::string floppy_image_filename;
+        // name of the virtual machine floppy disk image file
+    double current_cpu_time;
+        // amount of CPU time consumed by the VM (note: use get_vm_cpu_time())
+    bool suspended;
+        // is the VM suspended?
+    bool network_suspended;
+        // is network access temporarily suspended?
+    bool online;
+        // is VM even online?
+    bool saving;
+        // Is VM saving from checkpoint?
+    bool restoring;
+        // Is VM restoring from checkpoint?
+    bool crashed;
+        // Has the VM crashed?
+    bool register_only;
+        // whether we were instructed to only register the VM.
+        // useful for debugging VMs.
+    int rd_host_port;
+        // for optional remote desktop; dynamically assigned
+    bool headless;
+
+    int vm_pid;
+    int vboxsvc_pid;
+#ifdef _WIN32
+    // the handle to the process for the VM
+    // NOTE: we get a handle to the pid right after we parse it from the
+    //   log files so we can adjust the process priority and retrieve the process
+    //   exit code in case it crashed or was terminated.  Without an outstanding
+    //   handle to the process, the OS is free to reuse the pid for some other
+    //   executable.
+    HANDLE vm_pid_handle;
+
+    // the handle to the vboxsvc process created by us in the sandbox'ed environment
+    HANDLE vboxsvc_pid_handle;
+#endif
+
+    virtual int initialize() = 0;
+    virtual int create_vm() = 0;
+    virtual int register_vm() = 0;
+    virtual int deregister_vm(bool delete_media) = 0;
+    virtual int deregister_stale_vm() = 0;
+    virtual int poll(bool log_state = true) = 0;
+    virtual int start() = 0;
+    virtual int stop() = 0;
+    virtual int poweroff() = 0;
+    virtual int pause() = 0;
+    virtual int resume() = 0;
+    virtual int create_snapshot(double elapsed_time) = 0;
+    virtual int cleanup_snapshots(bool delete_active) = 0;
+    virtual int restore_snapshot() = 0;
+
+    virtual int run(bool do_restore_snapshot);
+    virtual void cleanup();
+
+    virtual void dump_hypervisor_logs(bool include_error_logs);
+    virtual void dump_hypervisor_status_reports() = 0;
+    virtual void dump_vmguestlog_entries();
+
+    virtual int is_registered() = 0;
+    virtual bool is_system_ready(std::string& message) = 0;
+    virtual bool is_vm_machine_configuration_available();
+    virtual bool is_disk_image_registered() = 0;
+    virtual bool is_extpack_installed() = 0;
+    virtual bool is_logged_failure_vm_extensions_disabled();
+    virtual bool is_logged_failure_vm_extensions_in_use();
+    virtual bool is_logged_failure_vm_extensions_not_supported();
+    virtual bool is_logged_failure_vm_powerup();
+    virtual bool is_logged_failure_host_out_of_memory();
+    virtual bool is_logged_failure_guest_job_out_of_memory();
+    virtual bool is_virtualbox_version_newer(int maj, int min, int rel);
+
+    static int get_install_directory(std::string& dir);
+    static int get_version_information(std::string& version);
+    virtual int get_guest_additions(std::string& dir) = 0;
+    virtual int get_slot_directory(std::string& dir);
+    virtual int get_default_network_interface(std::string& iface) = 0;
+    virtual int get_vm_network_bytes_sent(double& sent) = 0;
+    virtual int get_vm_network_bytes_received(double& received) = 0;
+    virtual int get_vm_process_id() = 0;
+    virtual int get_vm_exit_code(unsigned long& exit_code) = 0;
+    virtual double get_vm_cpu_time() = 0;
+
+    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 set_network_access(bool enabled) = 0;
+    virtual int set_cpu_usage(int percentage) = 0;
+    virtual int set_network_usage(int kilobytes) = 0;
+
+    virtual int read_floppy(std::string& data);
+    virtual int write_floppy(std::string& data);
+
+    virtual void lower_vm_process_priority() = 0;
+    virtual void reset_vm_process_priority() = 0;
+
+    static void sanitize_output(std::string& output);
+
+    virtual int launch_vboxsvc();
+    virtual int launch_vboxvm();
+
+    int vbm_popen(
+        std::string& command, std::string& output, const char* item, bool log_error = true, bool retry_failures = true, unsigned int timeout = 45, bool log_trace = true
+    );
+    int vbm_popen_raw(
+        std::string& command, std::string& output, unsigned int timeout
+    );
+    static void vbm_replay(std::string& command);
+    static void vbm_trace(std::string& command, std::string& ouput, int retval);
+};
+
+class VBOX_VM : public VBOX_BASE {
+    VBOX_VM();
+    ~VBOX_VM();
+};
+
+#endif
diff --git a/samples/vboxwrapper/vbox_mscom42.cpp b/samples/vboxwrapper/vbox_mscom42.cpp
new file mode 100644
index 0000000..d7dcc48
--- /dev/null
+++ b/samples/vboxwrapper/vbox_mscom42.cpp
@@ -0,0 +1,67 @@
+// 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/>.
+
+#define _VIRTUALBOX42_
+#define _VIRTUALBOX_IMPORT_FUNCTIONS_
+
+#include "boinc_win.h"
+#include "atlcomcli.h"
+#include "atlsafe.h"
+#include "atlcoll.h"
+#include "atlstr.h"
+#include "win_util.h"
+#include "diagnostics.h"
+#include "filesys.h"
+#include "parse.h"
+#include "str_util.h"
+#include "str_replace.h"
+#include "util.h"
+#include "error_numbers.h"
+#include "procinfo.h"
+#include "network.h"
+#include "boinc_api.h"
+#include "floppyio.h"
+#include "vboxlogging.h"
+#include "vboxwrapper.h"
+#include "vbox_mscom42.h"
+
+
+#if defined(_MSC_VER) || defined(__MINGW32__)
+#define stricmp     _stricmp
+#endif
+
+#import "file:vbox42.tlb" rename_namespace("vbox42"), named_guids, raw_interfaces_only
+
+using std::string;
+using namespace vbox42;
+
+namespace vbox42 {
+
+    class VBOX_PRIV {
+    public:
+        VBOX_PRIV() {};
+        ~VBOX_PRIV() {};
+
+        IVirtualBoxPtr m_pVirtualBox;
+        ISessionPtr m_pSession;
+        IMachinePtr m_pMachine;
+    };
+
+#include "vbox_mscom_impl.cpp"
+
+}
+
diff --git a/clientgui/res/skins/default/graphic/dialog_background_image.xpm b/samples/vboxwrapper/vbox_mscom42.h
similarity index 76%
copy from clientgui/res/skins/default/graphic/dialog_background_image.xpm
copy to samples/vboxwrapper/vbox_mscom42.h
index 29d6c76..985fe08 100644
--- a/clientgui/res/skins/default/graphic/dialog_background_image.xpm
+++ b/samples/vboxwrapper/vbox_mscom42.h
@@ -1,7 +1,6 @@
-/* XPM */
 // This file is part of BOINC.
 // http://boinc.berkeley.edu
-// Copyright (C) 2011 University of California
+// 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
@@ -15,10 +14,18 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
-static const char *dialog_background_image_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"1 1 1 1",
-"  c #D3D3D3",
-/* pixels */
-" "
-};
+
+
+#ifndef _VBOX_MSCOM42_H_
+#define _VBOX_MSCOM42_H_
+
+#include "floppyio.h"
+#include "vbox_common.h"
+
+namespace vbox42 {
+
+#include "vbox_mscom_impl.h"
+
+}
+
+#endif
diff --git a/samples/vboxwrapper/vbox_mscom43.cpp b/samples/vboxwrapper/vbox_mscom43.cpp
new file mode 100644
index 0000000..4cc7774
--- /dev/null
+++ b/samples/vboxwrapper/vbox_mscom43.cpp
@@ -0,0 +1,68 @@
+// 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/>.
+
+#define _VIRTUALBOX43_
+#define _VIRTUALBOX_IMPORT_FUNCTIONS_
+
+#include "boinc_win.h"
+#include "atlcomcli.h"
+#include "atlsafe.h"
+#include "atlcoll.h"
+#include "atlstr.h"
+#include "win_util.h"
+#include "diagnostics.h"
+#include "filesys.h"
+#include "parse.h"
+#include "str_util.h"
+#include "str_replace.h"
+#include "util.h"
+#include "error_numbers.h"
+#include "procinfo.h"
+#include "network.h"
+#include "boinc_api.h"
+#include "floppyio.h"
+#include "vboxlogging.h"
+#include "vboxwrapper.h"
+#include "vbox_mscom43.h"
+
+
+#if defined(_MSC_VER) || defined(__MINGW32__)
+#define stricmp     _stricmp
+#endif
+
+#import "file:vbox43.tlb" rename_namespace("vbox43"), named_guids, raw_interfaces_only
+
+using std::string;
+using namespace vbox43;
+
+namespace vbox43 {
+
+    class VBOX_PRIV {
+    public:
+        VBOX_PRIV() {};
+        ~VBOX_PRIV() {};
+
+        IVirtualBoxPtr m_pVirtualBox;
+        ISessionPtr m_pSession;
+        IMachinePtr m_pMachine;
+    };
+
+#include "vbox_mscom_impl.cpp"
+
+}
+
+
diff --git a/clientgui/res/skins/default/graphic/dialog_background_image.xpm b/samples/vboxwrapper/vbox_mscom43.h
similarity index 76%
copy from clientgui/res/skins/default/graphic/dialog_background_image.xpm
copy to samples/vboxwrapper/vbox_mscom43.h
index 29d6c76..1c55576 100644
--- a/clientgui/res/skins/default/graphic/dialog_background_image.xpm
+++ b/samples/vboxwrapper/vbox_mscom43.h
@@ -1,7 +1,6 @@
-/* XPM */
 // This file is part of BOINC.
 // http://boinc.berkeley.edu
-// Copyright (C) 2011 University of California
+// 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
@@ -15,10 +14,18 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
-static const char *dialog_background_image_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"1 1 1 1",
-"  c #D3D3D3",
-/* pixels */
-" "
-};
+
+
+#ifndef _VBOX_MSCOM43_H_
+#define _VBOX_MSCOM43_H_
+
+#include "floppyio.h"
+#include "vbox_common.h"
+
+namespace vbox43 {
+
+#include "vbox_mscom_impl.h"
+
+}
+
+#endif
diff --git a/samples/vboxwrapper/vbox_mscom50.cpp b/samples/vboxwrapper/vbox_mscom50.cpp
new file mode 100644
index 0000000..1795d60
--- /dev/null
+++ b/samples/vboxwrapper/vbox_mscom50.cpp
@@ -0,0 +1,68 @@
+// 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/>.
+
+#define _VIRTUALBOX50_
+#define _VIRTUALBOX_IMPORT_FUNCTIONS_
+
+#include "boinc_win.h"
+#include "atlcomcli.h"
+#include "atlsafe.h"
+#include "atlcoll.h"
+#include "atlstr.h"
+#include "win_util.h"
+#include "diagnostics.h"
+#include "filesys.h"
+#include "parse.h"
+#include "str_util.h"
+#include "str_replace.h"
+#include "util.h"
+#include "error_numbers.h"
+#include "procinfo.h"
+#include "network.h"
+#include "boinc_api.h"
+#include "floppyio.h"
+#include "vboxlogging.h"
+#include "vboxwrapper.h"
+#include "vbox_mscom50.h"
+
+
+#if defined(_MSC_VER) || defined(__MINGW32__)
+#define stricmp     _stricmp
+#endif
+
+#import "file:vbox50.tlb" rename_namespace("vbox50"), named_guids, raw_interfaces_only
+
+using std::string;
+using namespace vbox50;
+
+namespace vbox50 {
+
+    class VBOX_PRIV {
+    public:
+        VBOX_PRIV() {};
+        ~VBOX_PRIV() {};
+
+        IVirtualBoxPtr m_pVirtualBox;
+        ISessionPtr m_pSession;
+        IMachinePtr m_pMachine;
+    };
+
+#include "vbox_mscom_impl.cpp"
+
+}
+
+
diff --git a/clientgui/res/skins/default/graphic/dialog_background_image.xpm b/samples/vboxwrapper/vbox_mscom50.h
similarity index 76%
copy from clientgui/res/skins/default/graphic/dialog_background_image.xpm
copy to samples/vboxwrapper/vbox_mscom50.h
index 29d6c76..1685863 100644
--- a/clientgui/res/skins/default/graphic/dialog_background_image.xpm
+++ b/samples/vboxwrapper/vbox_mscom50.h
@@ -1,7 +1,6 @@
-/* XPM */
 // This file is part of BOINC.
 // http://boinc.berkeley.edu
-// Copyright (C) 2011 University of California
+// 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
@@ -15,10 +14,18 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
-static const char *dialog_background_image_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"1 1 1 1",
-"  c #D3D3D3",
-/* pixels */
-" "
-};
+
+
+#ifndef _VBOX_MSCOM50_H_
+#define _VBOX_MSCOM50_H_
+
+#include "floppyio.h"
+#include "vbox_common.h"
+
+namespace vbox50 {
+
+#include "vbox_mscom_impl.h"
+
+}
+
+#endif
diff --git a/samples/vboxwrapper/vbox_mscom_impl.cpp b/samples/vboxwrapper/vbox_mscom_impl.cpp
new file mode 100644
index 0000000..ae73642
--- /dev/null
+++ b/samples/vboxwrapper/vbox_mscom_impl.cpp
@@ -0,0 +1,2417 @@
+// 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 _VIRTUALBOX_IMPORT_FUNCTIONS_
+
+const char *MachineStateToName(MachineState State) 
+{ 
+    switch (State) 
+    { 
+        case MachineState_PoweredOff: 
+            return "poweroff"; 
+        case MachineState_Saved: 
+            return "saved"; 
+        case MachineState_Aborted: 
+            return "aborted"; 
+        case MachineState_Teleported: 
+            return "teleported"; 
+        case MachineState_Running: 
+            return "running"; 
+        case MachineState_Paused: 
+            return "paused"; 
+        case MachineState_Stuck: 
+            return "gurumeditation"; 
+        case MachineState_LiveSnapshotting: 
+            return "livesnapshotting"; 
+        case MachineState_Teleporting: 
+            return "teleporting"; 
+        case MachineState_Starting: 
+            return "starting"; 
+        case MachineState_Stopping: 
+            return "stopping"; 
+        case MachineState_Saving: 
+            return "saving"; 
+        case MachineState_Restoring: 
+            return "restoring"; 
+        case MachineState_TeleportingPausedVM: 
+            return "teleportingpausedvm"; 
+        case MachineState_TeleportingIn: 
+            return "teleportingin"; 
+        case MachineState_RestoringSnapshot: 
+            return "restoringsnapshot"; 
+        case MachineState_DeletingSnapshot: 
+            return "deletingsnapshot"; 
+        case MachineState_DeletingSnapshotOnline: 
+            return "deletingsnapshotlive"; 
+        case MachineState_DeletingSnapshotPaused: 
+            return "deletingsnapshotlivepaused"; 
+        case MachineState_SettingUp: 
+            return "settingup"; 
+        default: 
+            break; 
+    } 
+    return "unknown"; 
+} 
+
+
+// Helper function to print MSCOM exception information set on the current
+// thread after a failed MSCOM method call. This function will also print
+// extended VirtualBox error info if it is available.
+//
+#define CHECK_ERROR(rc) \
+    retval = virtualbox_check_error(rc, __FUNCTION__, __FILE__, __LINE__)
+
+int virtualbox_check_error(HRESULT rc, char* szFunction, char* szFile, int iLine) {
+    HRESULT hr;
+    CComPtr<IErrorInfo> pErrorInfo;
+    CComBSTR strSource;
+    CComBSTR strDescription;
+
+    if (FAILED(rc)) {
+        vboxlog_msg("Error 0x%x in %s (%s:%d)", rc, szFunction, szFile, iLine);
+        hr = ::GetErrorInfo(0, &pErrorInfo);
+        if (SUCCEEDED(hr) && pErrorInfo) {
+            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);
+            }
+        } else {
+            vboxlog_msg("Error: Getting Error Info! hr = 0x%x", hr);
+        }
+    }
+    return rc;
+}
+
+
+// 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.
+//
+void TraverseSnapshots(std::string& current_snapshot_id, std::vector<std::string>& snapshots, ISnapshot* pSnapshot) {
+    HRESULT rc;
+    SAFEARRAY* pSnapshots = NULL;
+    CComSafeArray<LPDISPATCH> aSnapshots;
+    CComBSTR tmp;
+    ULONG lCount;
+    std::string snapshot_id;
+
+    // Check to see if we have any children
+    //
+    rc = pSnapshot->GetChildrenCount(&lCount);
+    if (SUCCEEDED(rc) && lCount) {
+        rc = pSnapshot->get_Children(&pSnapshots);
+        if (SUCCEEDED(rc)) {
+            aSnapshots.Attach(pSnapshots);
+            if (aSnapshots.GetCount() > 0) {
+                for (int i = 0; i < (int)aSnapshots.GetCount(); i++) {
+                    TraverseSnapshots(current_snapshot_id, snapshots, (ISnapshot*)(LPDISPATCH)aSnapshots[i]);
+                }
+            }
+        }
+    }
+
+    // Check to see if we are the most recent snapshot.
+    // if not, add the snapshot id to the list of snapshots to be deleted.
+    //
+    pSnapshot->get_Id(&tmp);
+    if (SUCCEEDED(rc)) {
+        snapshot_id = CW2A(tmp);
+        if (current_snapshot_id == snapshot_id) {
+            return;
+        } else {
+            snapshots.push_back(snapshot_id);
+        }
+    }
+}
+
+
+// We want to recurisively walk the medium tree so that we can get the most recent children first.
+//
+void TraverseMediums(std::vector<CComPtr<IMedium>>& mediums, IMedium* pMedium) {
+    HRESULT rc;
+    SAFEARRAY* pMediums = NULL;
+    CComSafeArray<LPDISPATCH> aMediums;
+
+    // Check to see if we have any children
+    //
+    rc = pMedium->get_Children(&pMediums);
+    if (SUCCEEDED(rc)) {
+        aMediums.Attach(pMediums);
+        if (aMediums.GetCount() > 0) {
+            for (int i = 0; i < (int)aMediums.GetCount(); i++) {
+                TraverseMediums(mediums, (IMedium*)(LPDISPATCH)aMediums[i]);
+            }
+        }
+    }
+
+    mediums.push_back(CComPtr<IMedium>(pMedium));
+}
+
+
+VBOX_VM::VBOX_VM() {
+    m_pPrivate = new VBOX_PRIV();
+}
+
+VBOX_VM::~VBOX_VM() {
+    if (m_pPrivate) {
+        delete m_pPrivate;
+        m_pPrivate = NULL;
+    }
+}
+
+int VBOX_VM::initialize() {
+    int rc = BOINC_SUCCESS;
+    string old_path;
+    string new_path;
+    string version;
+    APP_INIT_DATA aid;
+    bool force_sandbox = false;
+
+    boinc_get_init_data_p(&aid);
+    get_install_directory(virtualbox_install_directory);
+
+    // Prep the environment so we can execute the vboxmanage application
+    //
+    // TODO: Fix for non-Windows environments if we ever find another platform
+    // where vboxmanage is not already in the search path
+    if (!virtualbox_install_directory.empty())
+    {
+        old_path = getenv("PATH");
+        new_path = virtualbox_install_directory + ";" + old_path;
+
+        if (!SetEnvironmentVariable("PATH", const_cast<char*>(new_path.c_str()))) {
+            vboxlog_msg("Failed to modify the search path");
+        }
+    }
+
+    // Determine the VirtualBox home directory.  Overwrite as needed.
+    //
+    if (getenv("VBOX_USER_HOME")) {
+        virtualbox_home_directory = getenv("VBOX_USER_HOME");
+    } else {
+        // If the override environment variable isn't specified then
+        // it is based of the current users HOME directory.
+        virtualbox_home_directory = getenv("USERPROFILE");
+        virtualbox_home_directory += "/.VirtualBox";
+    }
+
+    // Set the location in which the VirtualBox Configuration files can be
+    // stored for this instance.
+    if (aid.using_sandbox || force_sandbox) {
+        virtualbox_home_directory = aid.project_dir;
+        virtualbox_home_directory += "/../virtualbox";
+
+        if (!boinc_file_exists(virtualbox_home_directory.c_str())) {
+            boinc_mkdir(virtualbox_home_directory.c_str());
+        }
+
+        if (!SetEnvironmentVariable("VBOX_USER_HOME", const_cast<char*>(virtualbox_home_directory.c_str()))) {
+            vboxlog_msg("Failed to modify the search path");
+        }
+    }
+
+    // Launch vboxsvc manually so that the DCOM subsystem won't be able too.  Our version
+    // will have permission and direction to write its state information to the BOINC
+    // data directory.
+    //
+    launch_vboxsvc();
+
+    // Instantiate the VirtualBox root object.
+    rc = m_pPrivate->m_pVirtualBox.CreateInstance(CLSID_VirtualBox);
+    if (FAILED(rc)) {
+        vboxlog_msg("Error creating VirtualBox instance! rc = 0x%x", rc);
+        return rc;
+    }
+
+    // Create the session object.
+    rc = m_pPrivate->m_pSession.CreateInstance(CLSID_Session);
+    if (FAILED(rc)) {
+        vboxlog_msg("Error creating Session instance! rc = 0x%x", rc);
+        return rc;
+    }
+
+    rc = get_version_information(version);
+    if (rc) return rc;
+
+    // Fix-up version string
+    virtualbox_version = "VirtualBox COM Interface (Version: " + version + ")";
+
+    // Get the guest addition information
+    get_guest_additions(virtualbox_guest_additions);
+
+    return rc;
+}
+
+int VBOX_VM::create_vm() {
+    int retval = ERR_EXEC;
+    HRESULT rc;
+    char buf[256];
+    APP_INIT_DATA aid;
+    CComBSTR vm_machine_uuid;
+    CComPtr<IMachine> pMachineRO;
+    CComPtr<IMachine> pMachine;
+    CComPtr<ISession> pSession;
+    CComPtr<IBIOSSettings> pBIOSSettings;
+    CComPtr<INetworkAdapter> pNetworkAdapter;
+    CComPtr<INATEngine> pNATEngine;
+    CComPtr<IUSBController> pUSBContoller;
+    CComPtr<ISerialPort> pSerialPort1;
+    CComPtr<ISerialPort> pSerialPort2;
+    CComPtr<IParallelPort> pParallelPort1;
+    CComPtr<IParallelPort> pParallelPort2;
+    CComPtr<IAudioAdapter> pAudioAdapter;
+    CComPtr<IStorageController> pDiskController;
+    CComPtr<IStorageController> pFloppyController;
+    CComPtr<IBandwidthControl> pBandwidthControl;
+    CComPtr<IVRDEServer> pVRDEServer;
+    ULONG lOHCICtrls = 0;
+    bool disable_acceleration = false;
+    string virtual_machine_slot_directory;
+    string default_interface;
+
+    boinc_get_init_data_p(&aid);
+    get_slot_directory(virtual_machine_slot_directory);
+
+
+    rc = pSession.CoCreateInstance(CLSID_Session);
+    if (CHECK_ERROR(rc)) goto CLEANUP;
+
+
+    vboxlog_msg("Create VM. (%s, slot#%d)", vm_master_name.c_str(), aid.slot);
+
+
+    // Reset VM name in case it was changed while deregistering a stale VM
+    //
+    vm_name = vm_master_name;
+
+    // Fixup chipset and drive controller information for known configurations
+    //
+    if (enable_isocontextualization) {
+        if ("PIIX4" == vm_disk_controller_model) {
+            vboxlog_msg("Updating drive controller type and model for desired configuration.");
+            vm_disk_controller_type = "sata";
+            vm_disk_controller_model = "IntelAHCI";
+        }
+    }
+
+    // Start the VM creation process
+    //
+    rc = m_pPrivate->m_pVirtualBox->CreateMachine(
+        CComBSTR(string(virtual_machine_slot_directory + "\\" + vm_name + "\\" + vm_name + ".vbox").c_str()),
+        CComBSTR(vm_name.c_str()),
+        NULL,
+        CComBSTR(os_name.c_str()),
+        CComBSTR(""),
+        &pMachineRO
+    );
+    if (CHECK_ERROR(rc)) goto CLEANUP;
+
+    // Register the VM. Note that this call also saves the VM config
+    // to disk. It is also possible to save the VM settings but not
+    // register the VM.
+    //
+    // Also note that due to current VirtualBox limitations, the machine
+    // must be registered *before* we can attach hard disks to it.
+    //
+    rc = m_pPrivate->m_pVirtualBox->RegisterMachine(pMachineRO);
+    if (CHECK_ERROR(rc)) goto CLEANUP;
+    
+    rc = pMachineRO->LockMachine(pSession, LockType_Write);
+    if (CHECK_ERROR(rc)) goto CLEANUP;
+
+    rc = pSession->get_Machine(&pMachine);
+    if (CHECK_ERROR(rc)) goto CLEANUP;
+
+    rc = pMachine->get_BIOSSettings(&pBIOSSettings);
+    if (CHECK_ERROR(rc)) goto CLEANUP;
+
+    rc = pMachine->get_BandwidthControl(&pBandwidthControl);
+    if (CHECK_ERROR(rc)) goto CLEANUP;
+
+    rc = pMachine->get_VRDEServer(&pVRDEServer);
+    if (CHECK_ERROR(rc)) goto CLEANUP;
+
+    rc = pMachine->GetNetworkAdapter(0, &pNetworkAdapter);
+    if (CHECK_ERROR(rc)) goto CLEANUP;
+
+    rc = pNetworkAdapter->get_NATEngine(&pNATEngine);
+    if (CHECK_ERROR(rc)) goto CLEANUP;
+
+    rc = pMachine->get_AudioAdapter(&pAudioAdapter);
+    if (CHECK_ERROR(rc)) goto CLEANUP;
+
+    // Set some properties
+    //
+    pMachine->put_Description(CComBSTR(vm_master_description.c_str()));
+
+    // Tweak the VM's Memory Size
+    //
+    vboxlog_msg("Setting Memory Size for VM. (%dMB)", (int)memory_size_mb);
+    rc = pMachine->put_MemorySize((int)(memory_size_mb));
+    if (CHECK_ERROR(rc)) goto CLEANUP;
+
+    // Tweak the VM's CPU Count
+    //
+    vboxlog_msg("Setting CPU Count for VM. (%s)", vm_cpu_count.c_str());
+    rc = pMachine->put_CPUCount((int)atoi(vm_cpu_count.c_str()));
+    if (CHECK_ERROR(rc)) goto CLEANUP;
+
+    // Tweak the VM's Chipset Options
+    //
+    vboxlog_msg("Setting Chipset Options for VM.");
+    rc = pBIOSSettings->put_ACPIEnabled(TRUE);
+    if (CHECK_ERROR(rc)) goto CLEANUP;
+
+    rc = pBIOSSettings->put_IOAPICEnabled(TRUE);
+    if (CHECK_ERROR(rc)) goto CLEANUP;
+
+    // Tweak the VM's Boot Options
+    //
+    vboxlog_msg("Setting Boot Options for VM.");
+    rc = pMachine->SetBootOrder(1, DeviceType_HardDisk);
+    if (CHECK_ERROR(rc)) goto CLEANUP;
+    
+    rc = pMachine->SetBootOrder(2, DeviceType_DVD);
+    if (CHECK_ERROR(rc)) goto CLEANUP;
+
+    pMachine->SetBootOrder(3, DeviceType_Null);
+    pMachine->SetBootOrder(4, DeviceType_Null);
+
+    // Tweak the VM's Network Configuration
+    //
+    if (enable_network) {
+        vboxlog_msg("Enabling VM Network Access.");
+        rc = pNetworkAdapter->put_Enabled(TRUE);
+        if (CHECK_ERROR(rc)) goto CLEANUP;
+    } else {
+        vboxlog_msg("Disabling VM Network Access.");
+        rc = pNetworkAdapter->put_Enabled(FALSE);
+        if (CHECK_ERROR(rc)) goto CLEANUP;
+    }
+
+    if (network_bridged_mode) {
+        vboxlog_msg("Setting Network Configuration for Bridged Mode.");
+        rc = pNetworkAdapter->put_AttachmentType(NetworkAttachmentType_Bridged);
+        if (CHECK_ERROR(rc)) goto CLEANUP;
+
+        get_default_network_interface(default_interface);
+
+        vboxlog_msg("Setting Bridged Interface. (%s)", default_interface.c_str());
+        rc = pNetworkAdapter->put_BridgedInterface(CComBSTR(CA2W(default_interface.c_str())));
+        if (CHECK_ERROR(rc)) goto CLEANUP;
+    } else {
+        vboxlog_msg("Setting Network Configuration for NAT.");
+        rc = pNetworkAdapter->put_AttachmentType(NetworkAttachmentType_NAT);
+        if (CHECK_ERROR(rc)) goto CLEANUP;
+
+        rc = pNATEngine->put_DNSProxy(TRUE);
+        if (CHECK_ERROR(rc)) goto CLEANUP;
+    }
+
+    // Tweak the VM's USB Configuration
+    //
+    vboxlog_msg("Disabling USB Support for VM.");
+#ifdef _VIRTUALBOX42_
+    rc = pMachine->get_USBController(&pUSBContoller);
+    if (SUCCEEDED(rc)) {
+        pUSBContoller->put_Enabled(FALSE);
+    }
+#else
+    rc = pMachine->GetUSBControllerCountByType(USBControllerType_OHCI, &lOHCICtrls);
+    if (SUCCEEDED(rc) && lOHCICtrls) {
+        pMachine->RemoveUSBController(CComBSTR("OHCI"));
+    }
+#endif
+
+    // Tweak the VM's COM Port Support
+    //
+    vboxlog_msg("Disabling COM Port Support for VM.");
+    rc = pMachine->GetSerialPort(0, &pSerialPort1);
+    if (SUCCEEDED(rc)) {
+        pSerialPort1->put_Enabled(FALSE);
+    }
+    rc = pMachine->GetSerialPort(1, &pSerialPort2);
+    if (SUCCEEDED(rc)) {
+        pSerialPort2->put_Enabled(FALSE);
+    }
+
+    // Tweak the VM's LPT Port Support
+    //
+    vboxlog_msg("Disabling LPT Port Support for VM.");
+    rc = pMachine->GetParallelPort(0, &pParallelPort1);
+    if (SUCCEEDED(rc)) {
+        pParallelPort1->put_Enabled(FALSE);
+    }
+    rc = pMachine->GetParallelPort(1, &pParallelPort2);
+    if (SUCCEEDED(rc)) {
+        pParallelPort2->put_Enabled(FALSE);
+    }
+
+    // Tweak the VM's Audio Support
+    //
+    vboxlog_msg("Disabling Audio Support for VM.");
+    pAudioAdapter->put_Enabled(FALSE);
+
+    // Tweak the VM's Clipboard Support
+    //
+    vboxlog_msg("Disabling Clipboard Support for VM.");
+    pMachine->put_ClipboardMode(ClipboardMode_Disabled);
+
+    // Tweak the VM's Drag & Drop Support
+    //
+    vboxlog_msg("Disabling Drag and Drop Support for VM.");
+#if defined(_VIRTUALBOX42_) || defined (_VIRTUALBOX43_)
+    pMachine->put_DragAndDropMode(DragAndDropMode_Disabled);
+#else
+    pMachine->put_DnDMode(DnDMode_Disabled);
+#endif
+
+    // Check to see if the processor supports hardware acceleration for virtualization
+    // If it doesn't, disable the use of it in VirtualBox. Multi-core jobs require hardware
+    // acceleration and actually override this setting.
+    //
+    if (!strstr(aid.host_info.p_features, "vmx") && !strstr(aid.host_info.p_features, "svm")) {
+        vboxlog_msg("Hardware acceleration CPU extensions not detected. Disabling VirtualBox hardware acceleration support.");
+        disable_acceleration = true;
+    }
+    if (strstr(aid.host_info.p_features, "hypervisor")) {
+        vboxlog_msg("Running under Hypervisor. Disabling VirtualBox hardware acceleration support.");
+        disable_acceleration = true;
+    }
+    if (is_boinc_client_version_newer(aid, 7, 2, 16)) {
+        if (aid.vm_extensions_disabled) {
+            vboxlog_msg("Hardware acceleration failed with previous execution. Disabling VirtualBox hardware acceleration support.");
+            disable_acceleration = true;
+        }
+    } else {
+        if (vm_cpu_count == "1") {
+            // Keep this around for older clients.  Removing this for older clients might
+            // lead to a machine that will only return crashed VM reports.
+            vboxlog_msg("Legacy fallback configuration detected. Disabling VirtualBox hardware acceleration support.");
+            vboxlog_msg("NOTE: Upgrading to BOINC 7.2.16 or better may re-enable hardware acceleration.");
+            disable_acceleration = true;
+        }
+    }
+
+    // Only allow disabling of hardware acceleration on 32-bit VM types, 64-bit VM types require it.
+    //
+    if (os_name.find("_64") == std::string::npos) {
+        if (disable_acceleration) {
+            vboxlog_msg("Disabling hardware acceleration support for virtualization.");
+            rc = pMachine->SetHWVirtExProperty(HWVirtExPropertyType_Enabled, FALSE);
+            if (CHECK_ERROR(rc)) goto CLEANUP;
+        }
+    } else if (os_name.find("_64") != std::string::npos) {
+        if (disable_acceleration) {
+            vboxlog_msg("ERROR: Invalid configuration.  VM type requires acceleration but the current configuration cannot support it.");
+            retval = ERR_INVALID_PARAM;
+            goto CLEANUP;
+        }
+    }
+
+    // Add storage controller to VM
+    // See: http://www.virtualbox.org/manual/ch08.html#vboxmanage-storagectl
+    // See: http://www.virtualbox.org/manual/ch05.html#iocaching
+    //
+    vboxlog_msg("Adding storage controller(s) to VM.");
+    if (0 == stricmp(vm_disk_controller_type.c_str(), "ide")) {
+        rc = pMachine->AddStorageController(CComBSTR("Hard Disk Controller"), StorageBus_IDE, &pDiskController);
+        if (CHECK_ERROR(rc)) goto CLEANUP;
+    }
+    if (0 == stricmp(vm_disk_controller_type.c_str(), "sata")) {
+        rc = pMachine->AddStorageController(CComBSTR("Hard Disk Controller"), StorageBus_SATA, &pDiskController);
+        if (CHECK_ERROR(rc)) goto CLEANUP;
+
+        pDiskController->put_UseHostIOCache(FALSE);
+        pDiskController->put_PortCount(3);
+    }
+    if (0 == stricmp(vm_disk_controller_type.c_str(), "sas")) {
+        rc = pMachine->AddStorageController(CComBSTR("Hard Disk Controller"), StorageBus_SAS, &pDiskController);
+        if (CHECK_ERROR(rc)) goto CLEANUP;
+
+        pDiskController->put_UseHostIOCache(FALSE);
+    }
+    if (0 == stricmp(vm_disk_controller_type.c_str(), "scsi")) {
+        rc = pMachine->AddStorageController(CComBSTR("Hard Disk Controller"), StorageBus_SCSI, &pDiskController);
+        if (CHECK_ERROR(rc)) goto CLEANUP;
+
+        pDiskController->put_UseHostIOCache(FALSE);
+    }
+
+    if (0 == stricmp(vm_disk_controller_model.c_str(), "lsilogic")) {
+        pDiskController->put_ControllerType(StorageControllerType_LsiLogic);
+    } else if (0 == stricmp(vm_disk_controller_model.c_str(), "buslogic")) {
+        pDiskController->put_ControllerType(StorageControllerType_BusLogic);
+    } else if (0 == stricmp(vm_disk_controller_model.c_str(), "intelahci")) {
+        pDiskController->put_ControllerType(StorageControllerType_IntelAhci);
+    } else if (0 == stricmp(vm_disk_controller_model.c_str(), "piix3")) {
+        pDiskController->put_ControllerType(StorageControllerType_PIIX3);
+    } else if (0 == stricmp(vm_disk_controller_model.c_str(), "piix4")) {
+        pDiskController->put_ControllerType(StorageControllerType_PIIX4);
+    } else if (0 == stricmp(vm_disk_controller_model.c_str(), "ich6")) {
+        pDiskController->put_ControllerType(StorageControllerType_ICH6);
+    } else if (0 == stricmp(vm_disk_controller_model.c_str(), "i82078")) {
+        pDiskController->put_ControllerType(StorageControllerType_I82078);
+    } else if (0 == stricmp(vm_disk_controller_model.c_str(), "lsilogicsas")) {
+        pDiskController->put_ControllerType(StorageControllerType_LsiLogicSas);
+    }
+
+    // Add storage controller for a floppy device if desired
+    //
+    if (enable_floppyio) {
+        rc = pMachine->AddStorageController(CComBSTR("Floppy Controller"), StorageBus_Floppy, &pFloppyController);
+        if (CHECK_ERROR(rc)) goto CLEANUP;
+    }
+
+    if (enable_isocontextualization) {
+        // Add virtual ISO 9660 disk drive to VM
+        //
+        vboxlog_msg("Adding virtual ISO 9660 disk drive to VM. (%s)", iso_image_filename.c_str());
+        CComPtr<IMedium> pISOImage;
+        rc = m_pPrivate->m_pVirtualBox->OpenMedium(
+            CComBSTR(string(virtual_machine_slot_directory + "\\" + iso_image_filename).c_str()),
+            DeviceType_DVD,
+            AccessMode_ReadOnly,
+            TRUE,
+            &pISOImage
+        );
+        if (CHECK_ERROR(rc)) goto CLEANUP;
+
+        rc = pMachine->AttachDevice(
+            CComBSTR("Hard Disk Controller"),
+            0,
+            0,
+            DeviceType_DVD,
+            pISOImage
+        );
+        if (CHECK_ERROR(rc)) goto CLEANUP;
+
+        // 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;
+
+        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
+        //
+        if (enable_cache_disk){
+            vboxlog_msg("Adding virtual cache disk drive to VM. (%s)", cache_disk_filename.c_str());
+            CComPtr<IMedium> pCacheImage;
+            rc = m_pPrivate->m_pVirtualBox->OpenMedium(
+                CComBSTR(string(virtual_machine_slot_directory + "\\" + cache_disk_filename).c_str()),
+                DeviceType_HardDisk,
+                AccessMode_ReadWrite,
+                TRUE,
+                &pCacheImage
+            );
+            if (CHECK_ERROR(rc)) goto CLEANUP;
+
+            rc = pMachine->AttachDevice(
+                CComBSTR("Hard Disk Controller"),
+                1,
+                0,
+                DeviceType_HardDisk,
+                pCacheImage
+            );
+            if (CHECK_ERROR(rc)) goto CLEANUP;
+        }
+    } else {
+        // Adding virtual hard drive to VM
+        //
+        vboxlog_msg("Adding virtual disk drive to VM. (%s)", image_filename.c_str());
+        CComPtr<IMedium> pDiskImage;
+        rc = m_pPrivate->m_pVirtualBox->OpenMedium(
+            CComBSTR(string(virtual_machine_slot_directory + "\\" + image_filename).c_str()),
+            DeviceType_HardDisk,
+            AccessMode_ReadWrite,
+            TRUE,
+            &pDiskImage
+        );
+        if (CHECK_ERROR(rc)) goto CLEANUP;
+
+        rc = pMachine->AttachDevice(
+            CComBSTR("Hard Disk Controller"),
+            0,
+            0,
+            DeviceType_HardDisk,
+            pDiskImage
+        );
+        if (CHECK_ERROR(rc)) goto CLEANUP;
+
+        // 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;
+
+        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
+    //
+    if (enable_floppyio) {
+        // Put in place the FloppyIO abstraction
+        //
+        // NOTE: This creates the floppy.img file at runtime for use by the VM.
+        //
+        pFloppy = new FloppyIONS::FloppyIO(floppy_image_filename.c_str());
+        if (!pFloppy->ready()) {
+            vboxlog_msg("Creating virtual floppy image failed.");
+            vboxlog_msg("Error Code '%d' Error Message '%s'", pFloppy->error, pFloppy->errorStr.c_str());
+            retval = ERR_FWRITE;
+            goto CLEANUP;
+        }
+
+        vboxlog_msg("Adding virtual floppy disk drive to VM.");
+        CComPtr<IMedium> pFloppyImage;
+        rc = m_pPrivate->m_pVirtualBox->OpenMedium(
+            CComBSTR(string(virtual_machine_slot_directory + "\\" + floppy_image_filename).c_str()),
+            DeviceType_Floppy,
+            AccessMode_ReadWrite,
+            TRUE,
+            &pFloppyImage
+        );
+        if (CHECK_ERROR(rc)) goto CLEANUP;
+
+        rc = pMachine->AttachDevice(
+            CComBSTR("Floppy Controller"),
+            0,
+            0,
+            DeviceType_Floppy,
+            pFloppyImage
+        );
+        if (CHECK_ERROR(rc)) goto CLEANUP;
+    }
+
+    // Add network bandwidth throttle group
+    //
+    vboxlog_msg("Adding network bandwidth throttle group to VM. (Defaulting to 1024GB)");
+    rc = pBandwidthControl->CreateBandwidthGroup(
+        CComBSTR(string(vm_name + "_net").c_str()),
+        BandwidthGroupType_Network,
+        (LONG64)1024*1024*1024*1024
+    );
+    if (CHECK_ERROR(rc)) goto CLEANUP;
+
+    // Configure port forwarding
+    //
+    if (enable_network) {
+        if (pf_guest_port) {
+            VBOX_PORT_FORWARD pf;
+            pf.guest_port = pf_guest_port;
+            pf.host_port = pf_host_port;
+            if (!pf_host_port) {
+                retval = boinc_get_port(false, pf.host_port);
+                if (retval) return retval;
+                pf_host_port = pf.host_port;
+            }
+            port_forwards.push_back(pf);
+        }
+        for (unsigned int i=0; i<port_forwards.size(); i++) {
+            VBOX_PORT_FORWARD& pf = port_forwards[i];
+
+            vboxlog_msg("forwarding host port %d to guest port %d", pf.host_port, pf.guest_port);
+
+            // Add new firewall rule
+            //
+            rc = pNATEngine->AddRedirect(
+                CComBSTR(""),
+                NATProtocol_TCP,
+                pf.is_remote?CComBSTR(""):CComBSTR("127.0.0.1"),
+                pf.host_port,
+                CComBSTR(""),
+                pf.guest_port
+            );
+            if (CHECK_ERROR(rc)) goto CLEANUP;
+        }
+    }
+
+    // If the VM wants to enable remote desktop for the VM do it here
+    //
+    if (enable_remotedesktop) {
+        vboxlog_msg("Enabling remote desktop for VM.");
+        if (!is_extpack_installed()) {
+            vboxlog_msg("Required extension pack not installed, remote desktop not enabled.");
+        } else {
+            retval = boinc_get_port(false, rd_host_port);
+            if (retval) goto CLEANUP;
+
+            sprintf(buf, "%d", rd_host_port);
+
+            pVRDEServer->put_Enabled(TRUE);
+            pVRDEServer->put_VRDEExtPack(CComBSTR(""));
+            pVRDEServer->put_AuthLibrary(CComBSTR(""));
+            pVRDEServer->put_AuthType(AuthType_Null);
+            pVRDEServer->SetVRDEProperty(CComBSTR("TCP/Ports"), CComBSTR(buf));
+        }
+    }
+
+    // Enable the shared folder if a shared folder is specified.
+    //
+    if (enable_shared_directory) {
+        vboxlog_msg("Enabling shared directory for VM.");
+        rc = pMachine->CreateSharedFolder(
+            CComBSTR("shared"),
+            CComBSTR(string(virtual_machine_slot_directory + "\\shared").c_str()),
+            TRUE,
+            TRUE
+        );
+        if (CHECK_ERROR(rc)) goto CLEANUP;
+    }
+
+CLEANUP:
+    if (pMachine) {
+        pMachine->SaveSettings();
+    }
+    if (pSession) {
+        pSession->UnlockMachine();
+    }
+
+    return retval;
+}
+
+int VBOX_VM::register_vm() {
+    int retval = ERR_EXEC;
+    HRESULT rc;
+    string virtual_machine_slot_directory;
+    APP_INIT_DATA aid;
+    CComPtr<IMachine> pMachine;
+
+    boinc_get_init_data_p(&aid);
+    get_slot_directory(virtual_machine_slot_directory);
+
+
+    vboxlog_msg("Register VM. (%s, slot#%d)", vm_master_name.c_str(), aid.slot);
+
+
+    // Reset VM name in case it was changed while deregistering a stale VM
+    //
+    vm_name = vm_master_name;
+
+    rc = m_pPrivate->m_pVirtualBox->OpenMachine(
+        CComBSTR(string(virtual_machine_slot_directory + "\\" + vm_name + "\\" + vm_name + ".vbox").c_str()),
+        &pMachine
+    );
+    if (CHECK_ERROR(rc)) goto CLEANUP;
+
+    rc = m_pPrivate->m_pVirtualBox->RegisterMachine(pMachine);
+    if (CHECK_ERROR(rc)) goto CLEANUP;
+
+CLEANUP:
+    return retval;
+}
+
+int VBOX_VM::deregister_vm(bool delete_media) {
+    int retval = ERR_EXEC;
+    HRESULT rc;
+    SAFEARRAY* pHardDisks = NULL;
+    SAFEARRAY* pEmptyHardDisks = NULL;
+    SAFEARRAY* pMediumAttachments = NULL;
+    CComSafeArray<LPDISPATCH> aMediumAttachments;
+    CComSafeArray<LPDISPATCH> aHardDisks;
+    CComPtr<ISession> pSession;
+    CComPtr<IConsole> pConsole;
+    CComPtr<IMachine> pMachineRO;
+    CComPtr<IMachine> pMachine;
+    CComPtr<IProgress> pProgress;
+    CComPtr<IBandwidthControl> pBandwidthControl;
+    CComPtr<ISnapshot> pRootSnapshot;
+    std::vector<CComPtr<IMedium>> clean_mediums;
+    std::vector<CComPtr<IMedium>> mediums;
+    std::vector<std::string> snapshots;
+    DeviceType device_type; 
+    LONG lDevice;
+    LONG lPort;
+    string virtual_machine_slot_directory;
+    APP_INIT_DATA aid;
+
+
+    boinc_get_init_data_p(&aid);
+    get_slot_directory(virtual_machine_slot_directory);
+
+
+    vboxlog_msg("Deregistering VM. (%s, slot#%d)", vm_name.c_str(), aid.slot);
+
+
+    rc = m_pPrivate->m_pVirtualBox->FindMachine(CComBSTR(vm_name.c_str()), &pMachineRO);
+    if (SUCCEEDED(rc)) {
+        if (delete_media) {
+            rc = pSession.CoCreateInstance(CLSID_Session);
+            if (CHECK_ERROR(rc)) goto CLEANUP;
+
+            rc = pMachineRO->LockMachine(pSession, LockType_Write);
+            if (CHECK_ERROR(rc)) goto CLEANUP;
+
+            rc = pSession->get_Console(&pConsole);
+            if (CHECK_ERROR(rc)) goto CLEANUP;
+
+            rc = pSession->get_Machine(&pMachine);
+            if (CHECK_ERROR(rc)) goto CLEANUP;
+
+
+            // Delete snapshots
+            //
+            rc = pMachine->FindSnapshot(CComBSTR(""), &pRootSnapshot);
+            if (SUCCEEDED(rc) && pRootSnapshot) {
+                TraverseSnapshots(string(""), snapshots, pRootSnapshot);
+            }
+            if (snapshots.size()) {
+                for (size_t i = 0; i < snapshots.size(); i++) {
+                    CComPtr<IProgress> pProgress;
+                    rc = pConsole->DeleteSnapshot(CComBSTR(snapshots[i].c_str()), &pProgress);
+                    if (SUCCEEDED(rc)) {
+                        pProgress->WaitForCompletion(-1);
+                    } else {
+                        CHECK_ERROR(rc);
+                    }
+                }
+            }
+
+            // Close Hard Disk, DVD, and floppy mediums
+            //
+           vboxlog_msg("Removing virtual disk drive(s) from VM.");
+            rc = pMachine->get_MediumAttachments(&pMediumAttachments);
+            if (SUCCEEDED(rc)) {
+                aMediumAttachments.Attach(pMediumAttachments);
+                for (int i = 0; i < (int)aMediumAttachments.GetCount(); i++) {
+                    CComPtr<IMediumAttachment> pMediumAttachment((IMediumAttachment*)(LPDISPATCH)aMediumAttachments[i]);
+                    rc = pMediumAttachment->get_Type(&device_type);
+                    if (SUCCEEDED(rc) && 
+                       ((DeviceType_HardDisk == device_type) ||
+                        (DeviceType_DVD == device_type) ||
+                        (DeviceType_Floppy == device_type))
+                    ) {
+                        CComPtr<IMedium> pMedium;
+                        CComBSTR strController;
+
+                        if ((DeviceType_HardDisk == device_type) || (DeviceType_DVD == device_type)) {
+                            strController = "Hard Disk Controller";
+                        } else {
+                            strController = "Floppy Controller";
+                        }
+
+                        pMediumAttachment->get_Device(&lDevice);
+                        pMediumAttachment->get_Port(&lPort);
+                        pMediumAttachment->get_Medium(&pMedium);
+                        
+                        // If the device in question is a DVD/CD-ROM drive, the medium may have been ejected.
+                        // If so, pMedium will be NULL.
+                        if (pMedium) {
+                            mediums.push_back(CComPtr<IMedium>(pMedium));
+                        }
+                        
+                        rc = pMachine->DetachDevice(strController, lPort, lDevice);
+                        CHECK_ERROR(rc);
+                    }
+                }
+            }
+
+            // Delete network bandwidth throttle group
+            //
+            vboxlog_msg("Removing network bandwidth throttle group from VM.");
+            rc = pMachine->get_BandwidthControl(&pBandwidthControl);
+            if (SUCCEEDED(rc)) {
+                pBandwidthControl->DeleteBandwidthGroup(CComBSTR(string(vm_name + "_net").c_str()));
+            }
+
+            // Delete its storage controller(s)
+            //
+            vboxlog_msg("Removing storage controller(s) from VM.");
+            pMachine->RemoveStorageController(CComBSTR("Hard Disk Controller"));
+            if (enable_floppyio) {
+                pMachine->RemoveStorageController(CComBSTR("Floppy Controller"));
+            }
+
+            // Save the VM Settings so the state is stored
+            //
+            rc = pMachine->SaveSettings();
+            CHECK_ERROR(rc);
+
+            // Now it should be safe to close down the mediums we detached.
+            //
+            for (int i = 0; i < (int)mediums.size(); i++) {
+                mediums[i]->Close();
+            }
+
+            // Now free the session lock
+            //
+            rc = pSession->UnlockMachine();
+            CHECK_ERROR(rc);
+        }
+
+        // Next, delete VM
+        //
+        vboxlog_msg("Removing VM from VirtualBox.");
+        rc = pMachineRO->Unregister(CleanupMode_Full, &pHardDisks);
+        if (SUCCEEDED(rc)) {
+
+            // We only want to close(remove from media registry) the hard disks
+            // instead of deleting them, order them by most recent image first
+            // and then walk back to the root.
+            //
+            aHardDisks.Attach(pHardDisks);
+            for (int i = 0; i < (int)aHardDisks.GetCount(); i++) {
+                CComPtr<IMedium> pMedium((IMedium*)(LPDISPATCH)aHardDisks[i]);
+                TraverseMediums(mediums, pMedium);
+            }
+            for (int i = 0; i < (int)mediums.size(); i++) {
+                CComPtr<IMedium> pMedium(mediums[i]);
+                pMedium->Close();
+            }
+
+#ifdef _VIRTUALBOX42_
+            pMachineRO->Delete(pEmptyHardDisks, &pProgress);
+            if (SUCCEEDED(rc)) {
+                pProgress->WaitForCompletion(-1);
+            } else {
+                CHECK_ERROR(rc);
+            }
+#else
+            pMachineRO->DeleteConfig(pEmptyHardDisks, &pProgress);
+            if (SUCCEEDED(rc)) {
+                pProgress->WaitForCompletion(-1);
+            } else {
+                CHECK_ERROR(rc);
+            }
+#endif
+
+        } else {
+            CHECK_ERROR(rc);
+        }
+    }
+
+CLEANUP:
+    return 0;
+}
+
+int VBOX_VM::deregister_stale_vm() {
+    HRESULT rc;
+    SAFEARRAY* pHardDisks = NULL;
+    SAFEARRAY* pISOImages = NULL;
+    SAFEARRAY* pCacheDisks = NULL;
+    SAFEARRAY* pMachines = NULL;
+    SAFEARRAY* pISOMachines = NULL;
+    SAFEARRAY* pCacheMachines = NULL;
+    CComSafeArray<LPDISPATCH> aHardDisks;
+    CComSafeArray<LPDISPATCH> aISOImages;
+    CComSafeArray<LPDISPATCH> aCacheDisks;
+    CComSafeArray<BSTR> aMachines;
+    CComSafeArray<BSTR> aISOMachines;
+    CComSafeArray<BSTR> aCacheMachines;
+    CComPtr<IMedium> pHardDisk;
+    CComPtr<IMedium> pISOImage;
+    CComPtr<IMedium> pCacheDisk;
+    CComPtr<IMachine> pMachine;
+    CComBSTR strLocation;
+    CComBSTR strMachineId;
+    string virtual_machine_root_dir;
+    string hdd_image_location;
+    string iso_image_location;
+    string cache_image_location;
+
+    get_slot_directory(virtual_machine_root_dir);
+
+    hdd_image_location = string(virtual_machine_root_dir + "\\" + image_filename);
+    rc = m_pPrivate->m_pVirtualBox->get_HardDisks(&pHardDisks);
+    if (SUCCEEDED(rc)) {
+        aHardDisks.Attach(pHardDisks);
+        for (int i = 0; i < (int)aHardDisks.GetCount(); i++) {
+            pHardDisk = aHardDisks[i];
+            pHardDisk->get_Location(&strLocation);
+            if (0 == stricmp(hdd_image_location.c_str(), CW2A(strLocation))) {
+
+                // Disk found
+                //
+                rc = pHardDisk->get_MachineIds(&pMachines);
+                if (SUCCEEDED(rc) && pMachines) {
+                    aMachines.Attach(pMachines);
+                    // Delete all registered VMs attached to this disk image
+                    //
+                    for (int j = 0; j < (int)aMachines.GetCount(); j++) {
+                        strMachineId = aMachines[j];
+                        vm_name = CW2A(strMachineId);
+                        deregister_vm(false);
+                    }
+                } else {
+                    // Disk is in the Media Registry but now currently attached
+                    // to a VM.  Close it.
+                    pHardDisk->Close();
+                }
+            }
+        }
+    }
+
+    if (enable_isocontextualization) {
+        iso_image_location = string(virtual_machine_root_dir + "\\" + iso_image_filename);
+        rc = m_pPrivate->m_pVirtualBox->get_DVDImages(&pISOImages);
+        if (SUCCEEDED(rc)) {
+            aISOImages.Attach(pISOImages);
+            for (int i = 0; i < (int)aISOImages.GetCount(); i++) {
+                pISOImage = aISOImages[i];
+                pISOImage->get_Location(&strLocation);
+                if (0 == stricmp(iso_image_location.c_str(), CW2A(strLocation))) {
+
+                    // Image found
+                    //
+                    rc = pISOImage->get_MachineIds(&pISOMachines);
+                    if (SUCCEEDED(rc) && pISOMachines) {
+                        aISOMachines.Attach(pISOMachines);
+
+                        // Delete all registered VMs attached to this disk image
+                        //
+                        for (int j = 0; j < (int)aISOMachines.GetCount(); j++) {
+                            strMachineId = aISOMachines[j];
+                            vm_name = CW2A(strMachineId);
+                            deregister_vm(false);
+                        }
+                    } else {
+                        // Disk is in the Media Registry but now currently attached
+                        // to a VM.  Close it.
+                        pISOImage->Close();
+                    }
+                }
+            }
+        }
+    }
+
+    if (enable_isocontextualization && enable_cache_disk) {
+        cache_image_location = string(virtual_machine_root_dir + "\\" + cache_disk_filename);
+        rc = m_pPrivate->m_pVirtualBox->get_HardDisks(&pCacheDisks);
+        if (SUCCEEDED(rc)) {
+            aCacheDisks.Attach(pCacheDisks);
+            for (int i = 0; i < (int)aCacheDisks.GetCount(); i++) {
+                pCacheDisk = aCacheDisks[i];
+                pCacheDisk->get_Location(&strLocation);
+                if (0 == stricmp(cache_image_location.c_str(), CW2A(strLocation))) {
+
+                    // Disk found
+                    //
+                    rc = pCacheDisk->get_MachineIds(&pCacheMachines);
+                    if (SUCCEEDED(rc) && pCacheMachines) {
+                        aCacheMachines.Attach(pCacheMachines);
+
+                        // Delete all registered VMs attached to this disk image
+                        //
+                        for (int j = 0; j < (int)aCacheMachines.GetCount(); j++) {
+                            strMachineId = aCacheMachines[j];
+                            vm_name = CW2A(strMachineId);
+                            deregister_vm(false);
+                        }
+                    } else {
+                        // Disk is in the Media Registry but now currently attached
+                        // to a VM.  Close it.
+                        pCacheDisk->Close();
+                    }
+                }
+            }
+        }
+    }
+
+    return 0;
+}
+
+int VBOX_VM::poll(bool log_state) {
+    int retval = ERR_EXEC;
+    APP_INIT_DATA aid;
+    HRESULT rc;
+    CComPtr<IMachine> pMachine;
+    MachineState vmstate;
+    static MachineState vmstate_old = MachineState_PoweredOff;
+
+    boinc_get_init_data_p(&aid);
+
+    //
+    // Is our environment still sane?
+    //
+    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)) {
+        vboxlog_msg("Status Report: virtualbox.exe/vboxheadless.exe is no longer running.");
+    }
+
+    //
+    // What state is the VM in?
+    //
+    rc = m_pPrivate->m_pVirtualBox->FindMachine(CComBSTR(vm_master_name.c_str()), &pMachine);
+    if (SUCCEEDED(rc) && pMachine) {
+        rc = pMachine->get_State(&vmstate);
+        if (SUCCEEDED(rc)) {
+            // VirtualBox Documentation suggests that that a VM is running when its
+            // machine state is between MachineState_FirstOnline and MachineState_LastOnline
+            // which as of this writing is 5 and 17.
+            //
+            // VboxManage's source shows more than that though:
+            // see: http://www.virtualbox.org/browser/trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp
+            //
+            // So for now, go with what VboxManage is reporting.
+            //
+            switch(vmstate)
+            {
+                case MachineState_Running:
+                    online = true;
+                    saving = false;
+                    restoring = false;
+                    suspended = false;
+                    crashed = false;
+                    break;
+                case MachineState_Paused:
+                    online = true;
+                    saving = false;
+                    restoring = false;
+                    suspended = true;
+                    crashed = false;
+                    break;
+                case MachineState_Starting:
+                    online = true;
+                    saving = false;
+                    restoring = false;
+                    suspended = false;
+                    crashed = false;
+                    break;
+                case MachineState_Stopping:
+                    online = true;
+                    saving = false;
+                    restoring = false;
+                    suspended = false;
+                    crashed = false;
+                    break;
+                case MachineState_Saving:
+                    online = true;
+                    saving = true;
+                    restoring = false;
+                    suspended = false;
+                    crashed = false;
+                    break;
+                case MachineState_Restoring:
+                    online = true;
+                    saving = false;
+                    restoring = true;
+                    suspended = false;
+                    crashed = false;
+                    break;
+                case MachineState_LiveSnapshotting:
+                    online = true;
+                    saving = false;
+                    restoring = false;
+                    suspended = false;
+                    crashed = false;
+                    break;
+                case MachineState_DeletingSnapshotOnline:
+                    online = true;
+                    saving = false;
+                    restoring = false;
+                    suspended = false;
+                    crashed = false;
+                    break;
+                case MachineState_DeletingSnapshotPaused:
+                    online = true;
+                    saving = false;
+                    restoring = false;
+                    suspended = false;
+                    crashed = false;
+                    break;
+                case MachineState_Aborted:
+                    online = false;
+                    saving = false;
+                    restoring = false;
+                    suspended = false;
+                    crashed = true;
+                    break;
+                case MachineState_Stuck:
+                    online = false;
+                    saving = false;
+                    restoring = false;
+                    suspended = false;
+                    crashed = true;
+                    break;
+                default:
+                    online = false;
+                    saving = false;
+                    restoring = false;
+                    suspended = false;
+                    crashed = false;
+                    if (log_state) {
+                        vboxlog_msg("VM is no longer is a running state. It is in '%s'.", MachineStateToName(vmstate));
+                    }
+                    break;
+            }
+            if (log_state && (vmstate_old != vmstate)) {
+                vboxlog_msg(
+                    "VM state change detected. (old = '%s', new = '%s')",
+                    MachineStateToName(vmstate_old),
+                    MachineStateToName(vmstate)
+                );
+                vmstate_old = vmstate;
+            }
+
+            retval = BOINC_SUCCESS;
+        }
+    }
+
+    //
+    // Grab a snapshot of the latest log file.  Avoids multiple queries across several
+    // functions.
+    //
+    if (online) {
+        get_vm_log(vm_log);
+    }
+
+    //
+    // Dump any new VM Guest Log entries
+    //
+    dump_vmguestlog_entries();
+
+    return retval;
+}
+
+int VBOX_VM::start() {
+    int retval = ERR_EXEC;
+    HRESULT rc;
+    CComBSTR session_type;
+    CComPtr<IMachine> pMachineRO;
+    CComPtr<IProgress> pProgress;
+    APP_INIT_DATA aid;
+    long bCompleted = 0;
+    double timeout;
+
+    boinc_get_init_data_p(&aid);
+
+
+    vboxlog_msg("Starting VM. (%s, slot#%d)", vm_name.c_str(), aid.slot);
+
+
+    if (!headless) {
+        session_type = _T("gui");
+    } else {
+        session_type = _T("headless");
+    }
+
+    rc = m_pPrivate->m_pVirtualBox->FindMachine(CComBSTR(vm_master_name.c_str()), &pMachineRO);
+    if (SUCCEEDED(rc)) {
+
+        // Start a VM session
+        rc = pMachineRO->LaunchVMProcess(m_pPrivate->m_pSession, session_type, NULL, &pProgress);
+        if (CHECK_ERROR(rc)) goto CLEANUP;
+
+        // Wait until VM is running.
+        rc = pProgress->WaitForCompletion(-1);
+        if (CHECK_ERROR(rc)) goto CLEANUP;
+
+        pProgress->get_Completed(&bCompleted);
+        if (bCompleted) {
+
+            // We should now own what goes on with the VM.
+            //
+            pMachineRO->LockMachine(m_pPrivate->m_pSession, LockType_Write);
+            m_pPrivate->m_pSession->get_Machine(&m_pPrivate->m_pMachine);
+
+            rc = m_pPrivate->m_pMachine->get_SessionPID((ULONG*)&vm_pid);
+            if (CHECK_ERROR(rc)) goto CLEANUP;
+
+            vm_pid_handle = OpenProcess(
+                PROCESS_QUERY_INFORMATION | PROCESS_SET_INFORMATION,
+                FALSE,
+                vm_pid
+            );
+
+            // Make sure we are in a running state before proceeding
+            //
+            timeout = dtime() + 300;
+            do {
+                poll(false);
+                if (online) break;
+                boinc_sleep(1.0);
+            } while (timeout >= dtime());
+
+            vboxlog_msg("Successfully started VM. (PID = '%d')", vm_pid);
+            retval = BOINC_SUCCESS;
+        } else {
+            vboxlog_msg("VM failed to start.");
+        }
+    }
+
+CLEANUP:
+    return retval;
+}
+
+int VBOX_VM::stop() {
+    int retval = ERR_EXEC;
+    HRESULT rc;
+    double timeout;
+    CComPtr<IConsole> pConsole;
+    CComPtr<IProgress> pProgress;
+
+
+    vboxlog_msg("Stopping VM.");
+    if (online) {
+        // Get console object. 
+        rc = m_pPrivate->m_pSession->get_Console(&pConsole);
+        if (CHECK_ERROR(rc)) goto CLEANUP;
+
+        // Save the state of the machine.
+        rc = pConsole->SaveState(&pProgress);
+        if (CHECK_ERROR(rc)) goto CLEANUP;
+
+        // Wait until VM is powered down.
+        rc = pProgress->WaitForCompletion(-1);
+        if (CHECK_ERROR(rc)) goto CLEANUP;
+
+        // Wait for up to 5 minutes for the VM to switch states.  A system
+        // under load can take a while.  Since the poll function can wait for up
+        // to 45 seconds to execute a command we need to make this time based instead
+        // of iteration based.
+        timeout = dtime() + 300;
+        do {
+            poll(false);
+            if (!online && !saving) break;
+            boinc_sleep(1.0);
+        } while (timeout >= dtime());
+
+        if (!online) {
+            vboxlog_msg("Successfully stopped VM.");
+            retval = BOINC_SUCCESS;
+        } else {
+            vboxlog_msg("VM did not stop when requested.");
+
+            // Attempt to terminate the VM
+            retval = kill_program(vm_pid);
+            if (retval) {
+                vboxlog_msg("VM was NOT successfully terminated.");
+            } else {
+                vboxlog_msg("VM was successfully terminated.");
+            }
+        }
+
+        m_pPrivate->m_pSession->UnlockMachine();
+        boinc_sleep(5.0);
+    }
+
+CLEANUP:
+    return retval;
+}
+
+int VBOX_VM::poweroff() {
+    int retval = ERR_EXEC;
+    HRESULT rc;
+    double timeout;
+    CComPtr<IConsole> pConsole;
+    CComPtr<IProgress> pProgress;
+
+
+    vboxlog_msg("Powering off VM.");
+    if (online) {
+        // Get console object. 
+        rc = m_pPrivate->m_pSession->get_Console(&pConsole);
+        if (CHECK_ERROR(rc)) goto CLEANUP;
+
+        // Power down the VM as quickly as possible.
+        rc = pConsole->PowerDown(&pProgress);
+        if (CHECK_ERROR(rc)) goto CLEANUP;
+
+        // Wait until VM is powered down.
+        rc = pProgress->WaitForCompletion(-1);
+        if (CHECK_ERROR(rc)) goto CLEANUP;
+
+        // Wait for up to 5 minutes for the VM to switch states.  A system
+        // under load can take a while.  Since the poll function can wait for up
+        // to 45 seconds to execute a command we need to make this time based instead
+        // of iteration based.
+        timeout = dtime() + 300;
+        do {
+            poll(false);
+            if (!online && !saving) break;
+            boinc_sleep(1.0);
+        } while (timeout >= dtime());
+
+        if (!online) {
+            vboxlog_msg("Successfully stopped VM.");
+            retval = BOINC_SUCCESS;
+        } else {
+            vboxlog_msg("VM did not power off when requested.");
+
+            // Attempt to terminate the VM
+            retval = kill_program(vm_pid);
+            if (retval) {
+                vboxlog_msg("VM was NOT successfully terminated.");
+            } else {
+                vboxlog_msg("VM was successfully terminated.");
+            }
+        }
+
+        m_pPrivate->m_pSession->UnlockMachine();
+        boinc_sleep(5.0);
+    }
+
+CLEANUP:
+    return retval;
+}
+
+int VBOX_VM::pause() {
+    int retval = ERR_EXEC;
+    HRESULT rc;
+    CComPtr<IConsole> pConsole;
+
+
+    // Restore the process priority back to the default process priority
+    // to speed up the last minute maintenance tasks before the VirtualBox
+    // VM goes to sleep
+    //
+    reset_vm_process_priority();
+
+
+    // Get console object. 
+    rc = m_pPrivate->m_pSession->get_Console(&pConsole);
+    if (CHECK_ERROR(rc)) goto CLEANUP;
+
+    // Pause the machine.
+    rc = pConsole->Pause();
+    if (CHECK_ERROR(rc)) goto CLEANUP;
+
+    retval = BOINC_SUCCESS;
+
+CLEANUP:
+    return retval;
+}
+
+
+int VBOX_VM::resume() {
+    int retval = ERR_EXEC;
+    HRESULT rc;
+    CComPtr<IConsole> pConsole;
+
+
+    // Set the process priority back to the lowest level before resuming
+    // execution
+    //
+    lower_vm_process_priority();
+
+
+    // Get console object. 
+    rc = m_pPrivate->m_pSession->get_Console(&pConsole);
+    if (CHECK_ERROR(rc)) goto CLEANUP;
+
+    // Resume the machine.
+    rc = pConsole->Resume();
+    if (CHECK_ERROR(rc)) goto CLEANUP;
+
+    retval = BOINC_SUCCESS;
+
+CLEANUP:
+    return retval;
+}
+
+int VBOX_VM::create_snapshot(double elapsed_time) {
+    int retval = ERR_EXEC;
+    char buf[256];
+    HRESULT rc;
+    CComPtr<IConsole> pConsole;
+    CComPtr<IProgress> pProgress;
+
+    if (disable_automatic_checkpoints) return BOINC_SUCCESS;
+
+    vboxlog_msg("Creating new snapshot for VM.");
+
+    // Pause VM - Try and avoid the live snapshot and trigger an online
+    // snapshot instead.
+    pause();
+
+    // Create new snapshot
+    rc = m_pPrivate->m_pSession->get_Console(&pConsole);
+    if (CHECK_ERROR(rc)) {
+    } else {
+        sprintf(buf, "%d", (int)elapsed_time);
+        rc = pConsole->TakeSnapshot(CComBSTR(string(string("boinc_") + buf).c_str()), CComBSTR(""), &pProgress);
+        if (CHECK_ERROR(rc)) {
+        } else {
+            rc = pProgress->WaitForCompletion(-1);
+            if (CHECK_ERROR(rc)) {
+            }
+        }
+    }
+
+    // Resume VM
+    resume();
+
+    // Set the suspended flag back to false before deleting the stale
+    // snapshot
+    poll(false);
+
+    // Delete stale snapshot(s), if one exists
+    cleanup_snapshots(false);
+
+    if (BOINC_SUCCESS == retval) {
+        vboxlog_msg("Checkpoint completed.");
+    }
+
+    return retval;
+}
+
+int VBOX_VM::cleanup_snapshots(bool delete_active) {
+    int retval = ERR_EXEC;
+    HRESULT rc;
+    CComPtr<IConsole> pConsole;
+    CComPtr<ISnapshot> pCurrentSnapshot;
+    CComPtr<ISnapshot> pRootSnapshot;
+    CComBSTR tmp;
+    std::string current_snapshot_id;
+    std::vector<std::string> snapshots;
+
+    rc = m_pPrivate->m_pSession->get_Console(&pConsole);
+    if (CHECK_ERROR(rc)) goto CLEANUP;
+
+    // Get the current snapshot, if we do not need to delete the active snapshot
+    //
+    if (!delete_active) {
+        rc = m_pPrivate->m_pMachine->get_CurrentSnapshot(&pCurrentSnapshot);
+        if (SUCCEEDED(rc) && pCurrentSnapshot) {
+            rc = pCurrentSnapshot->get_Id(&tmp);
+            if (SUCCEEDED(rc)) {
+                current_snapshot_id = CW2A(tmp);
+            }
+        }
+    }
+
+    // Get the root snapshot and traverse the tree
+    //
+    rc = m_pPrivate->m_pMachine->FindSnapshot(CComBSTR(""), &pRootSnapshot);
+    if (SUCCEEDED(rc) && pRootSnapshot) {
+        TraverseSnapshots(current_snapshot_id, snapshots, pRootSnapshot);
+    }
+
+    // Delete stale snapshots
+    //
+    if (snapshots.size()) {
+        for (size_t i = 0; i < snapshots.size(); i++) {
+            CComPtr<IProgress> pProgress;
+
+            vboxlog_msg("Deleting stale snapshot.");
+
+            rc = pConsole->DeleteSnapshot(CComBSTR(snapshots[i].c_str()), &pProgress);
+            if (SUCCEEDED(rc)) {
+                pProgress->WaitForCompletion(-1);
+            } else {
+                CHECK_ERROR(rc);
+            }
+        }
+    }
+
+    retval = BOINC_SUCCESS;
+
+CLEANUP:
+    return retval;
+}
+
+int VBOX_VM::restore_snapshot() {
+    int retval = ERR_EXEC;
+    HRESULT rc;
+    CComPtr<ISession> pSession;
+    CComPtr<IMachine> pMachineRO;
+    CComPtr<IMachine> pMachine;
+    CComPtr<IConsole> pConsole;
+    CComPtr<ISnapshot> pSnapshot;
+    CComPtr<IProgress> pProgress;
+
+    if (disable_automatic_checkpoints) return BOINC_SUCCESS;
+
+    rc = m_pPrivate->m_pVirtualBox->FindMachine(CComBSTR(vm_name.c_str()), &pMachineRO);
+    if (SUCCEEDED(rc)) {
+        rc = pSession.CoCreateInstance(CLSID_Session);
+        if (CHECK_ERROR(rc)) goto CLEANUP;
+
+        rc = pMachineRO->LockMachine(pSession, LockType_Write);
+        if (CHECK_ERROR(rc)) goto CLEANUP;
+
+        rc = pSession->get_Machine(&pMachine);
+        if (CHECK_ERROR(rc)) goto CLEANUP;
+
+        rc = pSession->get_Console(&pConsole);
+        if (CHECK_ERROR(rc)) goto CLEANUP;
+
+        rc = pMachine->get_CurrentSnapshot(&pSnapshot);
+        if (SUCCEEDED(rc)) {
+            vboxlog_msg("Restore from previously saved snapshot.");
+            rc = pConsole->RestoreSnapshot(pSnapshot, &pProgress);
+            if (CHECK_ERROR(rc)) goto CLEANUP;
+
+            rc = pProgress->WaitForCompletion(-1);
+            if (CHECK_ERROR(rc)) goto CLEANUP;
+
+            vboxlog_msg("Restore completed.");
+        }
+
+        retval = BOINC_SUCCESS;
+    }
+
+CLEANUP:
+    if (pMachine) {
+        pMachine->SaveSettings();
+    }
+    if (pSession) {
+        pSession->UnlockMachine();
+    }
+
+    return retval;
+}
+
+void VBOX_VM::dump_hypervisor_status_reports() {
+    SIZE_T ulMinimumWorkingSetSize;
+    SIZE_T ulMaximumWorkingSetSize;
+
+    if (
+        GetProcessWorkingSetSize(
+            vboxsvc_pid_handle,
+            &ulMinimumWorkingSetSize,
+            &ulMaximumWorkingSetSize)
+    ) {
+        vboxlog_msg(
+            "Status Report (VirtualBox VboxSvc.exe): Minimum WSS: '%dKB', Maximum WSS: '%dKB'",
+            ulMinimumWorkingSetSize/1024,
+            ulMaximumWorkingSetSize/1024
+        );
+    }
+
+    if (
+        GetProcessWorkingSetSize(
+            vm_pid_handle,
+            &ulMinimumWorkingSetSize,
+            &ulMaximumWorkingSetSize)
+    ) {
+        vboxlog_msg(
+            "Status Report (VirtualBox Vboxheadless.exe/VirtualBox.exe): Minimum WSS: '%dKB', Maximum WSS: '%dKB'",
+            ulMinimumWorkingSetSize/1024,
+            ulMaximumWorkingSetSize/1024
+        );
+    }
+}
+
+int VBOX_VM::is_registered() {
+    int retval = ERR_NOT_FOUND;
+    HRESULT rc;
+    CComPtr<IMachine> pMachine;
+
+    rc = m_pPrivate->m_pVirtualBox->FindMachine(CComBSTR(vm_master_name.c_str()), &pMachine);
+    if (VBOX_E_OBJECT_NOT_FOUND != rc) {
+        retval = BOINC_SUCCESS;
+    }
+
+    return retval;
+}
+
+bool VBOX_VM::is_system_ready(std::string& message) {
+    return true;
+}
+
+bool VBOX_VM::is_disk_image_registered() {
+    HRESULT rc;
+    SAFEARRAY* pHardDisks = NULL;
+    SAFEARRAY* pISOImages = NULL;
+    SAFEARRAY* pCacheDisks = NULL;
+    CComSafeArray<LPDISPATCH> aHardDisks;
+    CComSafeArray<LPDISPATCH> aISOImages;
+    CComSafeArray<LPDISPATCH> aCacheDisks;
+    CComBSTR tmp;
+    IMedium* pHardDisk;
+    IMedium* pISOImage;
+    IMedium* pCacheDisk;
+    string virtual_machine_root_dir;
+    string hdd_image_location;
+    string iso_image_location;
+    string cache_image_location;
+
+    get_slot_directory(virtual_machine_root_dir);
+
+    hdd_image_location = string(virtual_machine_root_dir + "\\" + image_filename);
+    rc = m_pPrivate->m_pVirtualBox->get_HardDisks(&pHardDisks);
+    if (SUCCEEDED(rc)) {
+        aHardDisks.Attach(pHardDisks);
+        for (int i = 0; i < (int)aHardDisks.GetCount(); i++) {
+            pHardDisk = (IMedium*)(LPDISPATCH)aHardDisks[i];
+            pHardDisk->get_Location(&tmp);
+            if (0 == stricmp(hdd_image_location.c_str(), CW2A(tmp))) {
+                return true;
+            }
+        }
+    }
+
+    if (enable_isocontextualization) {
+        iso_image_location = string(virtual_machine_root_dir + "\\" + iso_image_filename);
+        rc = m_pPrivate->m_pVirtualBox->get_DVDImages(&pISOImages);
+        if (SUCCEEDED(rc)) {
+            aISOImages.Attach(pISOImages);
+            for (int i = 0; i < (int)aISOImages.GetCount(); i++) {
+                pISOImage = (IMedium*)(LPDISPATCH)aISOImages[i];
+                pISOImage->get_Location(&tmp);
+                if (0 == stricmp(iso_image_location.c_str(), CW2A(tmp))) {
+                    return true;
+                }
+            }
+        }
+    }
+
+    if (enable_isocontextualization && enable_cache_disk) {
+        cache_image_location = string(virtual_machine_root_dir + "\\" + cache_disk_filename);
+        rc = m_pPrivate->m_pVirtualBox->get_HardDisks(&pCacheDisks);
+        if (SUCCEEDED(rc)) {
+            aCacheDisks.Attach(pHardDisks);
+            for (int i = 0; i < (int)aCacheDisks.GetCount(); i++) {
+                pCacheDisk = (IMedium*)(LPDISPATCH)aCacheDisks[i];
+                pCacheDisk->get_Location(&tmp);
+                if (0 == stricmp(cache_image_location.c_str(), CW2A(tmp))) {
+                    return true;
+                }
+            }
+        }
+    }
+
+    return false;
+}
+
+bool VBOX_VM::is_extpack_installed() {
+    CComPtr<IExtPackManager> pExtPackManager;
+    CComPtr<IExtPack> pExtPack;
+    long bUsable = 0;
+    HRESULT rc;
+
+    rc = m_pPrivate->m_pVirtualBox->get_ExtensionPackManager(&pExtPackManager);
+    if (SUCCEEDED(rc)) {
+        rc = pExtPackManager->IsExtPackUsable(CComBSTR("Oracle VM VirtualBox Extension Pack"), &bUsable);
+        if (SUCCEEDED(rc)) {
+            if (bUsable) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+int VBOX_VM::get_install_directory(string& install_directory ) {
+    LONG    lReturnValue;
+    HKEY    hkSetupHive;
+    LPTSTR  lpszRegistryValue = NULL;
+    DWORD   dwSize = 0;
+
+    // change the current directory to the boinc data directory if it exists
+    lReturnValue = RegOpenKeyEx(
+        HKEY_LOCAL_MACHINE, 
+        _T("SOFTWARE\\Oracle\\VirtualBox"),  
+        0, 
+        KEY_READ,
+        &hkSetupHive
+    );
+    if (lReturnValue == ERROR_SUCCESS) {
+        // How large does our buffer need to be?
+        lReturnValue = RegQueryValueEx(
+            hkSetupHive,
+            _T("InstallDir"),
+            NULL,
+            NULL,
+            NULL,
+            &dwSize
+        );
+        if (lReturnValue != ERROR_FILE_NOT_FOUND) {
+            // Allocate the buffer space.
+            lpszRegistryValue = (LPTSTR) malloc(dwSize);
+            (*lpszRegistryValue) = NULL;
+
+            // Now get the data
+            lReturnValue = RegQueryValueEx( 
+                hkSetupHive,
+                _T("InstallDir"),
+                NULL,
+                NULL,
+                (LPBYTE)lpszRegistryValue,
+                &dwSize
+            );
+
+            install_directory = lpszRegistryValue;
+        }
+    }
+
+    if (hkSetupHive) RegCloseKey(hkSetupHive);
+    if (lpszRegistryValue) free(lpszRegistryValue);
+    if (install_directory.empty()) {
+        return ERR_FREAD;
+    }
+    return BOINC_SUCCESS;
+}
+
+int VBOX_VM::get_version_information(string& version) {
+    LONG    lReturnValue;
+    HKEY    hkSetupHive;
+    LPTSTR  lpszRegistryValue = NULL;
+    DWORD   dwSize = 0;
+
+    // change the current directory to the boinc data directory if it exists
+    lReturnValue = RegOpenKeyEx(
+        HKEY_LOCAL_MACHINE, 
+        _T("SOFTWARE\\Oracle\\VirtualBox"),  
+        0, 
+        KEY_READ,
+        &hkSetupHive
+    );
+    if (lReturnValue == ERROR_SUCCESS) {
+        // How large does our buffer need to be?
+        lReturnValue = RegQueryValueEx(
+            hkSetupHive,
+            _T("VersionExt"),
+            NULL,
+            NULL,
+            NULL,
+            &dwSize
+        );
+        if (lReturnValue != ERROR_FILE_NOT_FOUND) {
+            // Allocate the buffer space.
+            lpszRegistryValue = (LPTSTR) malloc(dwSize);
+            (*lpszRegistryValue) = NULL;
+
+            // Now get the data
+            lReturnValue = RegQueryValueEx( 
+                hkSetupHive,
+                _T("VersionExt"),
+                NULL,
+                NULL,
+                (LPBYTE)lpszRegistryValue,
+                &dwSize
+            );
+
+            version = lpszRegistryValue;
+        }
+    }
+
+    if (hkSetupHive) RegCloseKey(hkSetupHive);
+    if (lpszRegistryValue) free(lpszRegistryValue);
+    if (version.empty()) {
+        return ERR_FREAD;
+    }
+    return BOINC_SUCCESS;
+}
+
+int VBOX_VM::get_guest_additions(string& guest_additions) {
+    int retval = ERR_EXEC;
+    HRESULT rc;
+    CComPtr<ISystemProperties> properties;
+    CComBSTR tmp;
+
+    rc = m_pPrivate->m_pVirtualBox->get_SystemProperties(&properties);
+    if (SUCCEEDED(rc)) {
+        rc = properties->get_DefaultAdditionsISO(&tmp);
+        if (SUCCEEDED(rc)) {
+            guest_additions = CW2A(tmp);
+            retval = BOINC_SUCCESS;
+        }
+    }
+
+    return retval;
+}
+
+int VBOX_VM::get_default_network_interface(string& iface) {
+    int retval = ERR_EXEC;
+    HRESULT rc;
+    SAFEARRAY* pNICS = NULL;
+    CComSafeArray<LPDISPATCH> aNICS;
+    CComPtr<IHost> pHost;
+    CComBSTR tmp;
+    IHostNetworkInterface* pNIC;
+
+    rc = m_pPrivate->m_pVirtualBox->get_Host(&pHost);
+    if (SUCCEEDED(rc)) {
+        rc = pHost->FindHostNetworkInterfacesOfType(HostNetworkInterfaceType_Bridged, &pNICS);
+        if (SUCCEEDED(rc)) {
+            // Automatically clean up array after use
+            aNICS.Attach(pNICS);
+
+            // We only need the 'default' nic, which is usally the first one.
+            pNIC = (IHostNetworkInterface*)((LPDISPATCH)aNICS[0]);
+
+            // Get the name for future use
+            rc = pNIC->get_Name(&tmp);
+            if (SUCCEEDED(rc)) {
+                iface = CW2A(tmp);
+                retval = BOINC_SUCCESS;
+            }
+        }
+    }
+
+    return retval;
+}
+
+int VBOX_VM::get_vm_network_bytes_sent(double& sent) {
+    int retval = ERR_EXEC;
+    HRESULT rc;
+    CComPtr<IConsole> pConsole;
+    CComPtr<IMachineDebugger> pDebugger;
+    CComBSTR strPattern("/Devices/*/TransmitBytes");
+    CComBSTR strOutput;
+    string output;
+    string counter_value;
+    size_t counter_start;
+    size_t counter_end;
+
+    // Get console object. 
+    rc = m_pPrivate->m_pSession->get_Console(&pConsole);
+    if (CHECK_ERROR(rc)) goto CLEANUP;
+
+    // Get debugger object
+    rc = pConsole->get_Debugger(&pDebugger);
+    if (SUCCEEDED(rc)) {
+        rc = pDebugger->GetStats(strPattern, false, &strOutput);
+        if (SUCCEEDED(rc)) {
+            output = CW2A(strOutput);
+
+            // Output should look like this:
+            // <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+            // <Statistics>
+            // <Counter c="397229" unit="bytes" name="/Devices/PCNet0/TransmitBytes"/>
+            // <Counter c="256" unit="bytes" name="/Devices/PCNet1/TransmitBytes"/>
+            // </Statistics>
+
+            // add up the counter(s)
+            //
+            sent = 0;
+            counter_start = output.find("c=\"");
+            while (counter_start != string::npos) {
+                counter_start += 3;
+                counter_end = output.find("\"", counter_start);
+                counter_value = output.substr(counter_start, counter_end - counter_start);
+                sent += atof(counter_value.c_str());
+                counter_start = output.find("c=\"", counter_start);
+            }
+
+            retval = BOINC_SUCCESS;
+        }
+    }
+
+CLEANUP:
+    return retval;
+}
+
+int VBOX_VM::get_vm_network_bytes_received(double& received) {
+    int retval = ERR_EXEC;
+    HRESULT rc;
+    CComPtr<IConsole> pConsole;
+    CComPtr<IMachineDebugger> pDebugger;
+    CComBSTR strPattern("/Devices/*/ReceiveBytes");
+    CComBSTR strOutput;
+    string output;
+    string counter_value;
+    size_t counter_start;
+    size_t counter_end;
+
+    // Get console object. 
+    rc = m_pPrivate->m_pSession->get_Console(&pConsole);
+    if (CHECK_ERROR(rc)) goto CLEANUP;
+
+    // Get debugger object
+    rc = pConsole->get_Debugger(&pDebugger);
+    if (SUCCEEDED(rc)) {
+        rc = pDebugger->GetStats(strPattern, false, &strOutput);
+        if (SUCCEEDED(rc)) {
+            output = CW2A(strOutput);
+
+            // Output should look like this:
+            // <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+            // <Statistics>
+            // <Counter c="9423150" unit="bytes" name="/Devices/PCNet0/ReceiveBytes"/>
+            // <Counter c="256" unit="bytes" name="/Devices/PCNet1/ReceiveBytes"/>
+            // </Statistics>
+
+            // add up the counter(s)
+            //
+            received = 0;
+            counter_start = output.find("c=\"");
+            while (counter_start != string::npos) {
+                counter_start += 3;
+                counter_end = output.find("\"", counter_start);
+                counter_value = output.substr(counter_start, counter_end - counter_start);
+                received += atof(counter_value.c_str());
+                counter_start = output.find("c=\"", counter_start);
+            }
+
+            retval = BOINC_SUCCESS;
+        }
+    }
+
+CLEANUP:
+    return retval;
+}
+
+int VBOX_VM::get_vm_process_id() {
+    return vm_pid;
+}
+
+int VBOX_VM::get_vm_exit_code(unsigned long& exit_code) {
+    if (vm_pid_handle) {
+        GetExitCodeProcess(vm_pid_handle, &exit_code);
+    }
+    return 0;
+}
+
+double VBOX_VM::get_vm_cpu_time() {
+    double x = process_tree_cpu_time(vm_pid);
+    if (x > current_cpu_time) {
+        current_cpu_time = x;
+    }
+    return current_cpu_time;
+}
+
+// Enable the network adapter if a network connection is required.
+// NOTE: Network access should never be allowed if the code running in a 
+//   shared directory or the VM image itself is NOT signed.  Doing so
+//   opens up the network behind the company firewall to attack.
+//
+//   Imagine a doomsday scenario where a project has been compromised and
+//   an unsigned executable/VM image has been tampered with.  Volunteer
+//   downloads compromised code and executes it on a company machine.
+//   Now the compromised VM starts attacking other machines on the company
+//   network.  The company firewall cannot help because the attacking
+//   machine is already behind the company firewall.
+//
+int VBOX_VM::set_network_access(bool enabled) {
+    int retval = ERR_EXEC;
+    HRESULT rc;
+    CComPtr<INetworkAdapter> pNetworkAdapter;
+
+    network_suspended = !enabled;
+
+    if (enabled) {
+        vboxlog_msg("Enabling network access for VM.");
+        rc = m_pPrivate->m_pMachine->GetNetworkAdapter(0, &pNetworkAdapter);
+        if (CHECK_ERROR(rc)) {
+        } else {
+            rc = pNetworkAdapter->put_Enabled(TRUE);
+            if (SUCCEEDED(rc)) {
+                retval = BOINC_SUCCESS;
+            }
+        }
+    } else {
+        vboxlog_msg("Disabling network access for VM.");
+        rc = m_pPrivate->m_pMachine->GetNetworkAdapter(0, &pNetworkAdapter);
+        if (CHECK_ERROR(rc)) {
+        } else {
+            rc = pNetworkAdapter->put_Enabled(FALSE);
+            if (SUCCEEDED(rc)) {
+                retval = BOINC_SUCCESS;
+            }
+        }
+    }
+
+    return retval;
+}
+
+int VBOX_VM::set_cpu_usage(int percentage) {
+    vboxlog_msg("Setting CPU throttle for VM. (%d%%)", percentage);
+    m_pPrivate->m_pMachine->put_CPUExecutionCap(percentage);
+    return BOINC_SUCCESS;
+}
+
+int VBOX_VM::set_network_usage(int kilobytes) {
+    int retval = ERR_EXEC;
+    HRESULT rc;
+    CComPtr<IBandwidthControl> pBandwidthControl;
+    CComPtr<IBandwidthGroup> pBandwidthGroup;
+
+    rc = m_pPrivate->m_pMachine->get_BandwidthControl(&pBandwidthControl);
+    if (SUCCEEDED(rc)) {
+        rc = pBandwidthControl->GetBandwidthGroup(CComBSTR(string(vm_name + "_net").c_str()), &pBandwidthGroup);
+        if (SUCCEEDED(rc)) {
+            if (kilobytes == 0) {
+                vboxlog_msg("Setting network throttle for VM. (1024GB)");
+                rc = pBandwidthGroup->put_MaxBytesPerSec((LONG64)1024*1024*1024*1024);
+            } else {
+                vboxlog_msg("Setting network throttle for VM. (%dKB)", kilobytes);
+                rc = pBandwidthGroup->put_MaxBytesPerSec((LONG64)kilobytes*1024);
+            }
+            if (CHECK_ERROR(rc)) {
+            } else {
+                retval = BOINC_SUCCESS;
+            }
+        }
+    }
+
+    return retval;
+}
+
+void VBOX_VM::lower_vm_process_priority() {
+    if (vm_pid_handle) {
+        SetPriorityClass(vm_pid_handle, BELOW_NORMAL_PRIORITY_CLASS);
+    }
+}
+
+void VBOX_VM::reset_vm_process_priority() {
+    if (vm_pid_handle) {
+        SetPriorityClass(vm_pid_handle, NORMAL_PRIORITY_CLASS);
+    }
+}
+
+// Launch VboxSVC.exe before going any further. if we don't, it'll be launched by
+// svchost.exe with its environment block which will not contain the reference
+// to VBOX_USER_HOME which is required for running in the BOINC account-based
+// sandbox on Windows.
+int VBOX_VM::launch_vboxsvc() {
+    APP_INIT_DATA aid;
+    PROC_MAP pm;
+    PROCINFO p;
+    string command;
+    int retval = ERR_EXEC;
+    char buf[256];
+    STARTUPINFO si;
+    PROCESS_INFORMATION pi;
+    int pidVboxSvc = 0;
+    HANDLE hVboxSvc = NULL;
+
+    memset(&si, 0, sizeof(si));
+    memset(&pi, 0, sizeof(pi));
+
+    boinc_get_init_data_p(&aid);
+
+    if (aid.using_sandbox) {
+
+        if (!vboxsvc_pid_handle || !process_exists(vboxsvc_pid_handle)) {
+
+            if (vboxsvc_pid_handle) CloseHandle(vboxsvc_pid_handle);
+
+            procinfo_setup(pm);
+            for (PROC_MAP::iterator i = pm.begin(); i != pm.end(); ++i) {
+                p = i->second;
+
+                // We are only looking for vboxsvc
+                if (0 != stricmp(p.command, "vboxsvc.exe")) continue;
+
+                // Store process id for later use
+                pidVboxSvc = p.id;
+
+                // Is this the vboxsvc for the current user?
+                // Non-service install it would be the current username
+                // Service install it would be boinc_project
+                hVboxSvc = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, p.id);
+                if (hVboxSvc) break;
+            }
+            
+            if (pidVboxSvc && hVboxSvc) {
+                vboxlog_msg("Status Report: Detected vboxsvc.exe. (PID = '%d')", pidVboxSvc);
+                vboxsvc_pid = pidVboxSvc;
+                vboxsvc_pid_handle = hVboxSvc;
+                retval = BOINC_SUCCESS;
+
+            } else {
+
+                si.cb = sizeof(STARTUPINFO);
+                si.dwFlags |= STARTF_FORCEOFFFEEDBACK | STARTF_USESHOWWINDOW;
+                si.wShowWindow = SW_HIDE;
+
+                command = "\"VBoxSVC.exe\" --logrotate 1";
+
+                CreateProcess(NULL, (LPTSTR)command.c_str(), NULL, NULL, TRUE, CREATE_NO_WINDOW, NULL, NULL, &si, &pi);
+
+                if (pi.hThread) CloseHandle(pi.hThread);
+                if (pi.hProcess) {
+                    vboxlog_msg("Status Report: Launching vboxsvc.exe. (PID = '%d')", pi.dwProcessId);
+                    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)));
+                }
+            }
+        }
+    }
+
+    return retval;
+}
+
+// Launch the VM.
+int VBOX_VM::launch_vboxvm() {
+    char cmdline[1024];
+    char* argv[5];
+    int argc;
+    std::string output;
+    int retval = ERR_EXEC;
+    char buf[256];
+    STARTUPINFO si;
+    PROCESS_INFORMATION pi;
+    SECURITY_ATTRIBUTES sa;
+    SECURITY_DESCRIPTOR sd;
+    HANDLE hReadPipe = NULL, hWritePipe = NULL;
+    void* pBuf = NULL;
+    DWORD dwCount = 0;
+    unsigned long ulExitCode = 0;
+    unsigned long ulExitTimeout = 0;
+
+
+    memset(&si, 0, sizeof(si));
+    memset(&pi, 0, sizeof(pi));
+    memset(&sa, 0, sizeof(sa));
+    memset(&sd, 0, sizeof(sd));
+
+
+    // Construct the command line parameters
+    //
+    if (headless) {
+        argv[0] = const_cast<char*>("VboxHeadless.exe");
+    } else {
+        argv[0] = const_cast<char*>("VirtualBox.exe");
+    }
+    argv[1] = const_cast<char*>("--startvm");
+    argv[2] = const_cast<char*>(vm_name.c_str());
+    if (headless) {
+        argv[3] = const_cast<char*>("--vrde config");
+    } else {
+        argv[3] = const_cast<char*>("--no-startvm-errormsgbox");
+    }
+    argv[4] = NULL;
+    argc = 4;
+
+    strcpy(cmdline, "");
+    for (int i=0; i<argc; i++) {
+        strcat(cmdline, argv[i]);
+        if (i<argc-1) {
+            strcat(cmdline, " ");
+        }
+    }
+
+    InitializeSecurityDescriptor(&sd, SECURITY_DESCRIPTOR_REVISION);
+    SetSecurityDescriptorDacl(&sd, true, NULL, false);
+
+    sa.nLength = sizeof(SECURITY_ATTRIBUTES);
+    sa.bInheritHandle = TRUE;
+    sa.lpSecurityDescriptor = &sd;
+
+    if (!CreatePipe(&hReadPipe, &hWritePipe, &sa, NULL)) {
+        vboxlog_msg("CreatePipe failed! (%d).", GetLastError());
+        goto CLEANUP;
+    }
+    SetHandleInformation(hReadPipe, HANDLE_FLAG_INHERIT, 0);
+
+    si.cb = sizeof(STARTUPINFO);
+    si.dwFlags |= STARTF_FORCEOFFFEEDBACK | STARTF_USESHOWWINDOW | STARTF_USESTDHANDLES;
+    si.wShowWindow = SW_HIDE;
+    si.hStdOutput = hWritePipe;
+    si.hStdError = hWritePipe;
+    si.hStdInput = NULL;
+
+    // Execute command
+    if (!CreateProcess(
+        NULL, 
+        cmdline,
+        NULL,
+        NULL,
+        TRUE,
+        CREATE_NO_WINDOW,
+        NULL,
+        NULL,
+        &si,
+        &pi
+    )) {
+        vboxlog_msg(
+            "Status Report: Launching virtualbox.exe/vboxheadless.exe failed!."
+        );
+        vboxlog_msg(
+            "        Error: %s (%d)",
+            windows_format_error_string(GetLastError(), buf, sizeof(buf)),
+            GetLastError()
+        );
+        goto CLEANUP;
+    } 
+
+    while(1) {
+        GetExitCodeProcess(pi.hProcess, &ulExitCode);
+
+        // Copy stdout/stderr to output buffer, handle in the loop so that we can
+        // copy the pipe as it is populated and prevent the child process from blocking
+        // in case the output is bigger than pipe buffer.
+        PeekNamedPipe(hReadPipe, NULL, NULL, NULL, &dwCount, NULL);
+        if (dwCount) {
+            pBuf = malloc(dwCount+1);
+            memset(pBuf, 0, dwCount+1);
+
+            if (ReadFile(hReadPipe, pBuf, dwCount, &dwCount, NULL)) {
+                output += (char*)pBuf;
+            }
+
+            free(pBuf);
+        }
+
+        if ((ulExitCode != STILL_ACTIVE) || (ulExitTimeout >= 1000)) break;
+
+        Sleep(250);
+        ulExitTimeout += 250;
+    }
+
+    if (ulExitCode != STILL_ACTIVE) {
+        vboxlog_msg(
+            "Status Report: Virtualbox.exe/Vboxheadless.exe exited prematurely!."
+        );
+        vboxlog_msg(
+            "    Exit Code: %d",
+            ulExitCode
+        );
+        vboxlog_msg(
+            "       Output: %s",
+            output.c_str()
+        );
+    }
+
+    if (pi.hProcess && (ulExitCode == STILL_ACTIVE)) {
+        vm_pid = pi.dwProcessId;
+        vm_pid_handle = pi.hProcess;
+        retval = BOINC_SUCCESS;
+    }
+
+CLEANUP:
+    if (pi.hThread) CloseHandle(pi.hThread);
+    if (hReadPipe) CloseHandle(hReadPipe);
+    if (hWritePipe) CloseHandle(hWritePipe);
+
+    return retval;
+}
+
+#endif
diff --git a/samples/vboxwrapper/vbox_mscom_impl.h b/samples/vboxwrapper/vbox_mscom_impl.h
new file mode 100644
index 0000000..de2d8e3
--- /dev/null
+++ b/samples/vboxwrapper/vbox_mscom_impl.h
@@ -0,0 +1,68 @@
+// 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/>.
+
+class VBOX_PRIV;
+
+class VBOX_VM : public VBOX_BASE {
+public:
+    VBOX_VM();
+    ~VBOX_VM();
+
+    int initialize();
+    int create_vm();
+    int register_vm();
+    int deregister_vm(bool delete_media);
+    int deregister_stale_vm();
+    int poll(bool log_state = true);
+    int start();
+    int stop();
+    int poweroff();
+    int pause();
+    int resume();
+    int create_snapshot(double elapsed_time);
+    int cleanup_snapshots(bool delete_active);
+    int restore_snapshot();
+
+    void dump_hypervisor_status_reports();
+
+    int is_registered();
+    bool is_system_ready(std::string& message);
+    bool is_disk_image_registered();
+    bool is_extpack_installed();
+
+    static int get_install_directory(std::string& dir);
+    static int get_version_information(std::string& version);
+    int get_guest_additions(std::string& dir);
+    int get_default_network_interface(std::string& iface);
+    int get_vm_network_bytes_sent(double& sent);
+    int get_vm_network_bytes_received(double& received);
+    int get_vm_process_id();
+    int get_vm_exit_code(unsigned long& exit_code);
+    double get_vm_cpu_time();
+
+    int set_network_access(bool enabled);
+    int set_cpu_usage(int percentage);
+    int set_network_usage(int kilobytes);
+
+    void lower_vm_process_priority();
+    void reset_vm_process_priority();
+
+    int launch_vboxsvc();
+    int launch_vboxvm();
+
+    VBOX_PRIV* m_pPrivate;
+};
diff --git a/samples/vboxwrapper/vbox_vboxmanage.cpp b/samples/vboxwrapper/vbox_vboxmanage.cpp
new file mode 100644
index 0000000..4b60982
--- /dev/null
+++ b/samples/vboxwrapper/vbox_vboxmanage.cpp
@@ -0,0 +1,1827 @@
+// 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 <sys/wait.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <vector>
+#include <string>
+#include <fstream>
+#include <sstream>
+#include <stdexcept>
+#include <unistd.h>
+#endif
+
+using std::string;
+
+#if defined(_MSC_VER)
+#define getcwd      _getcwd
+#define stricmp     _stricmp
+#endif
+
+#include "diagnostics.h"
+#include "filesys.h"
+#include "parse.h"
+#include "str_util.h"
+#include "str_replace.h"
+#include "util.h"
+#include "error_numbers.h"
+#include "procinfo.h"
+#include "network.h"
+#include "boinc_api.h"
+#include "floppyio.h"
+#include "vboxlogging.h"
+#include "vboxwrapper.h"
+#include "vbox_common.h"
+#include "vbox_vboxmanage.h"
+
+
+namespace vboxmanage {
+
+VBOX_VM::VBOX_VM() {
+}
+
+VBOX_VM::~VBOX_VM() {
+}
+
+
+int VBOX_VM::initialize() {
+    int rc = 0;
+    string old_path;
+    string new_path;
+    string command;
+    string output;
+    APP_INIT_DATA aid;
+    bool force_sandbox = false;
+
+    boinc_get_init_data_p(&aid);
+    get_install_directory(virtualbox_install_directory);
+
+    // Prep the environment so we can execute the vboxmanage application
+    //
+    // TODO: Fix for non-Windows environments if we ever find another platform
+    // where vboxmanage is not already in the search path
+#ifdef _WIN32
+    if (!virtualbox_install_directory.empty())
+    {
+        old_path = getenv("PATH");
+        new_path = virtualbox_install_directory + ";" + old_path;
+
+        if (!SetEnvironmentVariable("PATH", const_cast<char*>(new_path.c_str()))) {
+            vboxlog_msg("Failed to modify the search path.");
+        }
+    }
+#endif
+
+    // Determine the VirtualBox home directory.  Overwrite as needed.
+    //
+    if (getenv("VBOX_USER_HOME")) {
+        virtualbox_home_directory = getenv("VBOX_USER_HOME");
+    } else {
+        // If the override environment variable isn't specified then
+        // it is based of the current users HOME directory.
+#ifdef _WIN32
+        virtualbox_home_directory = getenv("USERPROFILE");
+#else
+        virtualbox_home_directory = getenv("HOME");
+#endif
+        virtualbox_home_directory += "/.VirtualBox";
+    }
+
+    // On *nix style systems, VirtualBox expects that there is a home directory specified
+    // by environment variable.  When it doesn't exist it attempts to store logging information
+    // in root's home directory.  Bad things happen if the process attempts to use root's home
+    // directory.
+    //
+    // if the HOME environment variable is missing force VirtualBox to use a directory it
+    // has a reasonable chance of writing log files too.
+#ifndef _WIN32
+    if (NULL == getenv("HOME")) {
+        force_sandbox = true;
+    }
+#endif
+
+    // Set the location in which the VirtualBox Configuration files can be
+    // stored for this instance.
+    if (aid.using_sandbox || force_sandbox) {
+        virtualbox_home_directory = aid.project_dir;
+        virtualbox_home_directory += "/../virtualbox";
+
+        if (!boinc_file_exists(virtualbox_home_directory.c_str())) boinc_mkdir(virtualbox_home_directory.c_str());
+
+#ifdef _WIN32
+        if (!SetEnvironmentVariable("VBOX_USER_HOME", const_cast<char*>(virtualbox_home_directory.c_str()))) {
+            vboxlog_msg("Failed to modify the search path.");
+        }
+#else
+        // putenv does not copy its input buffer, so we must use setenv
+        if (setenv("VBOX_USER_HOME", const_cast<char*>(virtualbox_home_directory.c_str()), 1)) {
+            vboxlog_msg("Failed to modify the VBOX_USER_HOME path.");
+        }
+#endif
+    }
+
+#ifdef _WIN32
+    // Launch vboxsvc manually so that the DCOM subsystem won't be able too.  Our version
+    // will have permission and direction to write its state information to the BOINC
+    // data directory.
+    //
+    launch_vboxsvc();
+#endif
+
+    rc = get_version_information(virtualbox_version);
+    if (rc) return rc;
+
+    get_guest_additions(virtualbox_guest_additions);
+
+    return 0;
+}
+
+int VBOX_VM::create_vm() {
+    string command;
+    string output;
+    string virtual_machine_slot_directory;
+    string default_interface;
+    APP_INIT_DATA aid;
+    bool disable_acceleration = false;
+    char buf[256];
+    int retval;
+
+    boinc_get_init_data_p(&aid);
+    get_slot_directory(virtual_machine_slot_directory);
+
+
+    vboxlog_msg("Create VM. (%s, slot#%d)", vm_master_name.c_str(), aid.slot);
+
+
+    // Reset VM name in case it was changed while deregistering a stale VM
+    //
+    vm_name = vm_master_name;
+
+    // Fixup chipset and drive controller information for known configurations
+    //
+    if (enable_isocontextualization) {
+        if ("PIIX4" == vm_disk_controller_model) {
+            vboxlog_msg("Updating drive controller type and model for desired configuration.");
+            vm_disk_controller_type = "sata";
+            vm_disk_controller_model = "IntelAHCI";
+        }
+    }
+
+    // Create and register the VM
+    //
+    command  = "createvm ";
+    command += "--name \"" + vm_name + "\" ";
+    command += "--basefolder \"" + virtual_machine_slot_directory + "\" ";
+    command += "--ostype \"" + os_name + "\" ";
+    command += "--register";
+    
+    retval = vbm_popen(command, output, "create");
+    if (retval) return retval;
+
+    // Tweak the VM's Description
+    //
+    command  = "modifyvm \"" + vm_name + "\" ";
+    command += "--description \"" + vm_master_description + "\" ";
+
+    vbm_popen(command, output, "modifydescription", false, false);
+
+    // Tweak the VM's Memory Size
+    //
+    vboxlog_msg("Setting Memory Size for VM. (%dMB)", (int)memory_size_mb);
+    sprintf(buf, "%d", (int)memory_size_mb);
+    command  = "modifyvm \"" + vm_name + "\" ";
+    command += "--memory " + string(buf) + " ";
+
+    retval = vbm_popen(command, output, "modifymem");
+    if (retval) return retval;
+
+    // Tweak the VM's CPU Count
+    //
+    vboxlog_msg("Setting CPU Count for VM. (%s)", vm_cpu_count.c_str());
+    command  = "modifyvm \"" + vm_name + "\" ";
+    command += "--cpus " + vm_cpu_count + " ";
+
+    retval = vbm_popen(command, output, "modifycpu");
+    if (retval) return retval;
+
+    // Tweak the VM's Chipset Options
+    //
+    vboxlog_msg("Setting Chipset Options for VM.");
+    command  = "modifyvm \"" + vm_name + "\" ";
+    command += "--acpi on ";
+    command += "--ioapic on ";
+
+    retval = vbm_popen(command, output, "modifychipset");
+    if (retval) return retval;
+
+    // Tweak the VM's Boot Options
+    //
+    vboxlog_msg("Setting Boot Options for VM.");
+    command  = "modifyvm \"" + vm_name + "\" ";
+    command += "--boot1 disk ";
+    command += "--boot2 dvd ";
+    command += "--boot3 none ";
+    command += "--boot4 none ";
+
+    retval = vbm_popen(command, output, "modifyboot");
+    if (retval) return retval;
+
+    // Tweak the VM's Network Configuration
+    //
+    if (network_bridged_mode) {
+        vboxlog_msg("Setting Network Configuration for Bridged Mode.");
+        command  = "modifyvm \"" + vm_name + "\" ";
+        command += "--nic1 bridged ";
+        command += "--cableconnected1 off ";
+
+        retval = vbm_popen(command, output, "set bridged mode");
+        if (retval) return retval;
+
+        get_default_network_interface(default_interface);
+
+        vboxlog_msg("Setting Bridged Interface. (%s)", default_interface.c_str());
+        command  = "modifyvm \"" + vm_name + "\" ";
+        command += "--bridgeadapter1 \"";
+        command += default_interface;
+        command += "\" ";
+
+        retval = vbm_popen(command, output, "set bridged interface");
+        if (retval) return retval;
+    } else {
+        vboxlog_msg("Setting Network Configuration for NAT.");
+        command  = "modifyvm \"" + vm_name + "\" ";
+        command += "--nic1 nat ";
+        command += "--natdnsproxy1 on ";
+        command += "--cableconnected1 off ";
+
+        retval = vbm_popen(command, output, "set nat mode");
+        if (retval) return retval;
+    }
+
+    if (enable_network) {
+        vboxlog_msg("Enabling VM Network Access.");
+        command  = "modifyvm \"" + vm_name + "\" ";
+        command += "--cableconnected1 on ";
+        retval = vbm_popen(command, output, "enable network");
+        if (retval) return retval;
+    } else {
+        vboxlog_msg("Disabling VM Network Access.");
+        command  = "modifyvm \"" + vm_name + "\" ";
+        command += "--cableconnected1 off ";
+        retval = vbm_popen(command, output, "disable network");
+        if (retval) return retval;
+    }
+
+    // Tweak the VM's USB Configuration
+    //
+    vboxlog_msg("Disabling USB Support for VM.");
+    command  = "modifyvm \"" + vm_name + "\" ";
+    command += "--usb off ";
+
+    vbm_popen(command, output, "modifyusb", false, false);
+
+    // Tweak the VM's COM Port Support
+    //
+    vboxlog_msg("Disabling COM Port Support for VM.");
+    command  = "modifyvm \"" + vm_name + "\" ";
+    command += "--uart1 off ";
+    command += "--uart2 off ";
+
+    vbm_popen(command, output, "modifycom", false, false);
+
+    // Tweak the VM's LPT Port Support
+    //
+    vboxlog_msg("Disabling LPT Port Support for VM.");
+    command  = "modifyvm \"" + vm_name + "\" ";
+    command += "--lpt1 off ";
+    command += "--lpt2 off ";
+
+    vbm_popen(command, output, "modifylpt", false, false);
+
+    // Tweak the VM's Audio Support
+    //
+    vboxlog_msg("Disabling Audio Support for VM.");
+    command  = "modifyvm \"" + vm_name + "\" ";
+    command += "--audio none ";
+
+    vbm_popen(command, output, "modifyaudio", false, false);
+
+    // Tweak the VM's Clipboard Support
+    //
+    vboxlog_msg("Disabling Clipboard Support for VM.");
+    command  = "modifyvm \"" + vm_name + "\" ";
+    command += "--clipboard disabled ";
+
+    vbm_popen(command, output, "modifyclipboard", false, false);
+
+    // Tweak the VM's Drag & Drop Support
+    //
+    vboxlog_msg("Disabling Drag and Drop Support for VM.");
+    command  = "modifyvm \"" + vm_name + "\" ";
+    command += "--draganddrop disabled ";
+
+    vbm_popen(command, output, "modifydragdrop", false, false);
+
+    // Check to see if the processor supports hardware acceleration for virtualization
+    // If it doesn't, disable the use of it in VirtualBox. Multi-core jobs require hardware
+    // acceleration and actually override this setting.
+    //
+    if (!strstr(aid.host_info.p_features, "vmx") && !strstr(aid.host_info.p_features, "svm")) {
+        vboxlog_msg("Hardware acceleration CPU extensions not detected. Disabling VirtualBox hardware acceleration support.");
+        disable_acceleration = true;
+    }
+    if (strstr(aid.host_info.p_features, "hypervisor")) {
+        vboxlog_msg("Running under Hypervisor. Disabling VirtualBox hardware acceleration support.");
+        disable_acceleration = true;
+    }
+    if (is_boinc_client_version_newer(aid, 7, 2, 16)) {
+        if (aid.vm_extensions_disabled) {
+            vboxlog_msg("Hardware acceleration failed with previous execution. Disabling VirtualBox hardware acceleration support.");
+            disable_acceleration = true;
+        }
+    } else {
+        if (vm_cpu_count == "1") {
+            // Keep this around for older clients.  Removing this for older clients might
+            // lead to a machine that will only return crashed VM reports.
+            vboxlog_msg("Legacy fallback configuration detected. Disabling VirtualBox hardware acceleration support.");
+            vboxlog_msg("NOTE: Upgrading to BOINC 7.2.16 or better may re-enable hardware acceleration.");
+            disable_acceleration = true;
+        }
+    }
+
+    // Only allow disabling of hardware acceleration on 32-bit VM types, 64-bit VM types require it.
+    //
+    if (os_name.find("_64") == std::string::npos) {
+        if (disable_acceleration) {
+            vboxlog_msg("Disabling hardware acceleration support for virtualization.");
+            command  = "modifyvm \"" + vm_name + "\" ";
+            command += "--hwvirtex off ";
+
+            retval = vbm_popen(command, output, "VT-x/AMD-V support");
+            if (retval) return retval;
+        }
+    } else if (os_name.find("_64") != std::string::npos) {
+        if (disable_acceleration) {
+            vboxlog_msg("ERROR: Invalid configuration.  VM type requires acceleration but the current configuration cannot support it.");
+            return ERR_INVALID_PARAM;
+        }
+    }
+
+    // Add storage controller to VM
+    // See: http://www.virtualbox.org/manual/ch08.html#vboxmanage-storagectl
+    // See: http://www.virtualbox.org/manual/ch05.html#iocaching
+    //
+    vboxlog_msg("Adding storage controller(s) to VM.");
+    command  = "storagectl \"" + vm_name + "\" ";
+    command += "--name \"Hard Disk Controller\" ";
+    command += "--add \"" + vm_disk_controller_type + "\" ";
+    command += "--controller \"" + vm_disk_controller_model + "\" ";
+    if (
+         (vm_disk_controller_type == "sata") || (vm_disk_controller_type == "SATA") ||
+         (vm_disk_controller_type == "scsi") || (vm_disk_controller_type == "SCSI") ||
+         (vm_disk_controller_type == "sas") || (vm_disk_controller_type == "SAS")
+    ) {
+        command += "--hostiocache off ";
+    }
+    if ((vm_disk_controller_type == "sata") || (vm_disk_controller_type == "SATA")) {
+        if (is_virtualbox_version_newer(4, 3, 0)) {
+            command += "--portcount 3";
+        } else {
+            command += "--sataportcount 3";
+        }
+    }
+
+    retval = vbm_popen(command, output, "add storage controller (fixed disk)");
+    if (retval) return retval;
+
+    // Add storage controller for a floppy device if desired
+    //
+    if (enable_floppyio) {
+        command  = "storagectl \"" + vm_name + "\" ";
+        command += "--name \"Floppy Controller\" ";
+        command += "--add floppy ";
+
+        retval = vbm_popen(command, output, "add storage controller (floppy)");
+        if (retval) return retval;
+    }
+
+    if (enable_isocontextualization) {
+
+        // Add virtual ISO 9660 disk drive to VM
+        //
+        vboxlog_msg("Adding virtual ISO 9660 disk drive to VM. (%s)", iso_image_filename.c_str());
+        command  = "storageattach \"" + vm_name + "\" ";
+        command += "--storagectl \"Hard Disk Controller\" ";
+        command += "--port 0 ";
+        command += "--device 0 ";
+        command += "--type dvddrive ";
+        command += "--medium \"" + virtual_machine_slot_directory + "/" + iso_image_filename + "\" ";
+
+        retval = vbm_popen(command, output, "storage attach (ISO 9660 image)");
+        if (retval) return retval;
+
+        // 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 + "\" ";
+
+        retval = vbm_popen(command, output, "storage attach (guest additions image)");
+        if (retval) return retval;
+
+        // Add a virtual cache disk drive to VM
+        //
+        if (enable_cache_disk){
+            vboxlog_msg("Adding virtual cache disk drive to VM. (%s)", cache_disk_filename.c_str());
+            command  = "storageattach \"" + vm_name + "\" ";
+            command += "--storagectl \"Hard Disk Controller\" ";
+            command += "--port 1 ";
+            command += "--device 0 ";
+            command += "--type hdd ";
+            command += "--setuuid \"\" ";
+            command += "--medium \"" + virtual_machine_slot_directory + "/" + cache_disk_filename + "\" ";
+
+            retval = vbm_popen(command, output, "storage attach (cached disk)");
+            if (retval) return retval;
+        }
+
+    } else {
+
+        // Adding virtual hard drive to VM
+        //
+        vboxlog_msg("Adding virtual disk drive to VM. (%s)", image_filename.c_str());
+        command  = "storageattach \"" + vm_name + "\" ";
+        command += "--storagectl \"Hard Disk Controller\" ";
+        command += "--port 0 ";
+        command += "--device 0 ";
+        command += "--type hdd ";
+        command += "--setuuid \"\" ";
+        command += "--medium \"" + virtual_machine_slot_directory + "/" + image_filename + "\" ";
+
+        retval = vbm_popen(command, output, "storage attach (fixed disk)");
+        if (retval) return retval;
+
+        // 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 + "\" ";
+
+        retval = vbm_popen(command, output, "storage attach (guest additions image)");
+        if (retval) return retval;
+
+    }
+
+    // Adding virtual floppy disk drive to VM
+    //
+    if (enable_floppyio) {
+
+        // Put in place the FloppyIO abstraction
+        //
+        // NOTE: This creates the floppy.img file at runtime for use by the VM.
+        //
+        pFloppy = new FloppyIONS::FloppyIO(floppy_image_filename.c_str());
+        if (!pFloppy->ready()) {
+            vboxlog_msg("Creating virtual floppy image failed.");
+            vboxlog_msg("Error Code '%d' Error Message '%s'", pFloppy->error, pFloppy->errorStr.c_str());
+            return ERR_FWRITE;
+        }
+
+        vboxlog_msg("Adding virtual floppy disk drive to VM.");
+        command  = "storageattach \"" + vm_name + "\" ";
+        command += "--storagectl \"Floppy Controller\" ";
+        command += "--port 0 ";
+        command += "--device 0 ";
+        command += "--medium \"" + virtual_machine_slot_directory + "/" + floppy_image_filename + "\" ";
+
+        retval = vbm_popen(command, output, "storage attach (floppy disk)");
+        if (retval) return retval;
+
+    }
+
+    // Add network bandwidth throttle group
+    //
+    if (is_virtualbox_version_newer(4, 2, 0)) {
+        vboxlog_msg("Adding network bandwidth throttle group to VM. (Defaulting to 1024GB)");
+        command  = "bandwidthctl \"" + vm_name + "\" ";
+        command += "add \"" + vm_name + "_net\" ";
+        command += "--type network ";
+        command += "--limit 1024G";
+        command += " ";
+
+        retval = vbm_popen(command, output, "network throttle group (add)");
+        if (retval) return retval;
+    }
+
+    // Enable the network adapter if a network connection is required.
+    //
+    if (enable_network) {
+        // set up port forwarding
+        //
+        if (pf_guest_port) {
+            VBOX_PORT_FORWARD pf;
+            pf.guest_port = pf_guest_port;
+            pf.host_port = pf_host_port;
+            if (!pf_host_port) {
+                retval = boinc_get_port(false, pf.host_port);
+                if (retval) return retval;
+                pf_host_port = pf.host_port;
+            }
+            port_forwards.push_back(pf);
+        }
+        for (unsigned int i=0; i<port_forwards.size(); i++) {
+            VBOX_PORT_FORWARD& pf = port_forwards[i];
+
+            vboxlog_msg("forwarding host port %d to guest port %d", pf.host_port, pf.guest_port);
+
+            // Add new firewall rule
+            //
+            sprintf(buf, ",tcp,%s,%d,,%d",
+                pf.is_remote?"":"127.0.0.1",
+                pf.host_port, pf.guest_port
+            );
+            command  = "modifyvm \"" + vm_name + "\" ";
+            command += "--natpf1 \"" + string(buf) + "\" ";
+
+            retval = vbm_popen(command, output, "add updated port forwarding rule");
+            if (retval) return retval;
+        }
+    }
+
+    // If the VM wants to enable remote desktop for the VM do it here
+    //
+    if (enable_remotedesktop) {
+        vboxlog_msg("Enabling remote desktop for VM.");
+        if (!is_extpack_installed()) {
+            vboxlog_msg("Required extension pack not installed, remote desktop not enabled.");
+        } else {
+            retval = boinc_get_port(false, rd_host_port);
+            if (retval) return retval;
+
+            sprintf(buf, "%d", rd_host_port);
+            command  = "modifyvm \"" + vm_name + "\" ";
+            command += "--vrde on ";
+            command += "--vrdeextpack default ";
+            command += "--vrdeauthlibrary default ";
+            command += "--vrdeauthtype null ";
+            command += "--vrdeport " + string(buf) + " ";
+
+            retval = vbm_popen(command, output, "remote desktop");
+            if(retval) return retval;
+        }
+    }
+
+    // Enable the shared folder if a shared folder is specified.
+    //
+    if (enable_shared_directory) {
+        vboxlog_msg("Enabling shared directory for VM.");
+        command  = "sharedfolder add \"" + vm_name + "\" ";
+        command += "--name \"shared\" ";
+        command += "--hostpath \"" + virtual_machine_slot_directory + "/shared\"";
+
+        retval = vbm_popen(command, output, "enable shared dir");
+        if (retval) return retval;
+    }
+
+    return 0;
+}
+
+int VBOX_VM::register_vm() {
+    string command;
+    string output;
+    string virtual_machine_slot_directory;
+    APP_INIT_DATA aid;
+    int retval;
+
+    boinc_get_init_data_p(&aid);
+    get_slot_directory(virtual_machine_slot_directory);
+
+
+    vboxlog_msg("Register VM. (%s, slot#%d)", vm_master_name.c_str(), aid.slot);
+
+
+    // Reset VM name in case it was changed while deregistering a stale VM
+    //
+    vm_name = vm_master_name;
+
+    // Register the VM
+    //
+    command  = "registervm ";
+    command += "\"" + virtual_machine_slot_directory + "/" + vm_name + "/" + vm_name + ".vbox\" ";
+    
+    retval = vbm_popen(command, output, "register");
+    if (retval) return retval;
+
+    return 0;
+}
+
+int VBOX_VM::deregister_vm(bool delete_media) {
+    string command;
+    string output;
+    string virtual_machine_slot_directory;
+    APP_INIT_DATA aid;
+
+
+    boinc_get_init_data_p(&aid);
+    get_slot_directory(virtual_machine_slot_directory);
+
+
+    vboxlog_msg("Deregistering VM. (%s, slot#%d)", vm_name.c_str(), aid.slot);
+
+
+    // Cleanup any left-over snapshots
+    //
+    cleanup_snapshots(true);
+
+    // Delete network bandwidth throttle group
+    //
+    if (is_virtualbox_version_newer(4, 2, 0)) {
+        vboxlog_msg("Removing network bandwidth throttle group from VM.");
+        command  = "bandwidthctl \"" + vm_name + "\" ";
+        command += "remove \"" + vm_name + "_net\" ";
+
+        vbm_popen(command, output, "network throttle group (remove)", false, false);
+    }
+
+    // Delete its storage controller(s)
+    //
+    vboxlog_msg("Removing storage controller(s) from VM.");
+    command  = "storagectl \"" + vm_name + "\" ";
+    command += "--name \"Hard Disk Controller\" ";
+    command += "--remove ";
+
+    vbm_popen(command, output, "deregister storage controller (fixed disk)", false, false);
+
+    if (enable_floppyio) {
+        command  = "storagectl \"" + vm_name + "\" ";
+        command += "--name \"Floppy Controller\" ";
+        command += "--remove ";
+
+        vbm_popen(command, output, "deregister storage controller (floppy disk)", false, false);
+    }
+
+    // Next, delete VM
+    //
+    vboxlog_msg("Removing VM from VirtualBox.");
+    command  = "unregistervm \"" + vm_name + "\" ";
+    command += "--delete ";
+
+    vbm_popen(command, output, "delete VM", false, false);
+
+    // Lastly delete medium(s) from Virtual Box Media Registry
+    //
+    if (enable_isocontextualization) {
+        vboxlog_msg("Removing virtual ISO 9660 disk from VirtualBox.");
+        command  = "closemedium dvd \"" + virtual_machine_slot_directory + "/" + iso_image_filename + "\" ";
+        if (delete_media) {
+            command += "--delete ";
+        }
+        vbm_popen(command, output, "remove virtual ISO 9660 disk", false, false);
+
+        if (enable_cache_disk) {
+            vboxlog_msg("Removing virtual cache disk from VirtualBox.");
+            command  = "closemedium disk \"" + virtual_machine_slot_directory + "/" + cache_disk_filename + "\" ";
+            if (delete_media) {
+                command += "--delete ";
+            }
+
+            vbm_popen(command, output, "remove virtual cache disk", false, false);
+        }
+    } else {
+        vboxlog_msg("Removing virtual disk drive from VirtualBox.");
+        command  = "closemedium disk \"" + virtual_machine_slot_directory + "/" + image_filename + "\" ";
+        if (delete_media) {
+            command += "--delete ";
+        }
+        vbm_popen(command, output, "remove virtual disk", false, false);
+    }
+
+    if (enable_floppyio) {
+        vboxlog_msg("Removing virtual floppy disk from VirtualBox.");
+        command  = "closemedium floppy \"" + virtual_machine_slot_directory + "/" + floppy_image_filename + "\" ";
+        if (delete_media) {
+            command += "--delete ";
+        }
+
+        vbm_popen(command, output, "remove virtual floppy disk", false, false);
+    }
+
+    return 0;
+}
+
+int VBOX_VM::deregister_stale_vm() {
+    string command;
+    string output;
+    string virtual_machine_slot_directory;
+    size_t uuid_start;
+    size_t uuid_end;
+    int retval;
+
+    get_slot_directory(virtual_machine_slot_directory);
+
+    command  = "showhdinfo \"" + virtual_machine_slot_directory + "/" + image_filename + "\" ";
+    retval = vbm_popen(command, output, "get HDD info");
+    if (retval) return retval;
+
+    // Output should look a little like this:
+    //   UUID:                 c119acaf-636c-41f6-86c9-38e639a31339
+    //   Accessible:           yes
+    //   Logical size:         10240 MBytes
+    //   Current size on disk: 0 MBytes
+    //   Type:                 normal (base)
+    //   Storage format:       VDI
+    //   Format variant:       dynamic default
+    //   In use by VMs:        test2 (UUID: 000ab2be-1254-4c6a-9fdc-1536a478f601)
+    //   Location:             C:\Users\romw\VirtualBox VMs\test2\test2.vdi
+    //
+    uuid_start = output.find("(UUID: ");
+    if (uuid_start != string::npos) {
+        // We can parse the virtual machine ID from the output
+        uuid_start += 7;
+        uuid_end = output.find(")", uuid_start);
+        vm_name = output.substr(uuid_start, uuid_end - uuid_start);
+
+        // Deregister stale VM by UUID
+        return deregister_vm(false);
+    } else if (enable_isocontextualization && enable_isocontextualization) {
+        command  = "showhdinfo \"" + virtual_machine_slot_directory + "/" + cache_disk_filename + "\" ";
+        retval = vbm_popen(command, output, "get HDD info");
+        if (retval) return retval;
+
+        // Output should look a little like this:
+        //   UUID:                 c119acaf-636c-41f6-86c9-38e639a31339
+        //   Accessible:           yes
+        //   Logical size:         10240 MBytes
+        //   Current size on disk: 0 MBytes
+        //   Type:                 normal (base)
+        //   Storage format:       VDI
+        //   Format variant:       dynamic default
+        //   In use by VMs:        test2 (UUID: 000ab2be-1254-4c6a-9fdc-1536a478f601)
+        //   Location:             C:\Users\romw\VirtualBox VMs\test2\test2.vdi
+        //
+        uuid_start = output.find("(UUID: ");
+        if (uuid_start != string::npos) {
+            // We can parse the virtual machine ID from the output
+            uuid_start += 7;
+            uuid_end = output.find(")", uuid_start);
+            vm_name = output.substr(uuid_start, uuid_end - uuid_start);
+
+            // Deregister stale VM by UUID
+            return deregister_vm(false);
+        }
+    } else {
+        // Did the user delete the VM in VirtualBox and not the medium?  If so,
+        // just remove the medium.
+        command  = "closemedium disk \"" + virtual_machine_slot_directory + "/" + image_filename + "\" ";
+        vbm_popen(command, output, "remove virtual disk", false, false);
+        if (enable_floppyio) {
+            command  = "closemedium floppy \"" + virtual_machine_slot_directory + "/" + floppy_image_filename + "\" ";
+            vbm_popen(command, output, "remove virtual floppy disk", false, false);
+        }
+        if (enable_isocontextualization) {
+            command  = "closemedium dvd \"" + virtual_machine_slot_directory + "/" + iso_image_filename + "\" ";
+            vbm_popen(command, output, "remove virtual ISO 9660 disk", false);
+            if (enable_cache_disk) {
+                command  = "closemedium disk \"" + virtual_machine_slot_directory + "/" + cache_disk_filename + "\" ";
+                vbm_popen(command, output, "remove virtual cache disk", false);
+            }
+        }
+    }
+    return 0;
+}
+
+int VBOX_VM::poll(bool log_state) {
+    int retval = ERR_EXEC;
+    APP_INIT_DATA aid;
+    string command;
+    string output;
+    string::iterator iter;
+    string vmstate;
+    static string vmstate_old = "poweroff";
+    size_t vmstate_start;
+    size_t vmstate_end;
+
+    boinc_get_init_data_p(&aid);
+
+    //
+    // Is our environment still sane?
+    //
+#ifdef _WIN32
+    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)) {
+        vboxlog_msg("Status Report: virtualbox.exe/vboxheadless.exe is no longer running.");
+    }
+#else
+    if (vm_pid && !process_exists(vm_pid)) {
+        vboxlog_msg("Status Report: virtualbox/vboxheadless is no longer running.");
+    }
+#endif
+
+    //
+    // What state is the VM in?
+    //
+
+    command  = "showvminfo \"" + vm_name + "\" ";
+    command += "--machinereadable ";
+
+    if (vbm_popen(command, output, "VM state", false, false, 45, false) == 0) {
+        vmstate_start = output.find("VMState=\"");
+        if (vmstate_start != string::npos) {
+            vmstate_start += 9;
+            vmstate_end = output.find("\"", vmstate_start);
+            vmstate = output.substr(vmstate_start, vmstate_end - vmstate_start);
+
+            // VirtualBox Documentation suggests that that a VM is running when its
+            // machine state is between MachineState_FirstOnline and MachineState_LastOnline
+            // which as of this writing is 5 and 17.
+            //
+            // VboxManage's source shows more than that though:
+            // see: http://www.virtualbox.org/browser/trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp
+            //
+            // So for now, go with what VboxManage is reporting.
+            //
+            if (vmstate == "running") {
+                online = true;
+                saving = false;
+                restoring = false;
+                suspended = false;
+                crashed = false;
+            } else if (vmstate == "paused") {
+                online = true;
+                saving = false;
+                restoring = false;
+                suspended = true;
+                crashed = false;
+            } else if (vmstate == "starting") {
+                online = true;
+                saving = false;
+                restoring = false;
+                suspended = false;
+                crashed = false;
+            } else if (vmstate == "stopping") {
+                online = true;
+                saving = false;
+                restoring = false;
+                suspended = false;
+                crashed = false;
+            } else if (vmstate == "saving") {
+                online = true;
+                saving = true;
+                restoring = false;
+                suspended = false;
+                crashed = false;
+            } else if (vmstate == "restoring") {
+                online = true;
+                saving = false;
+                restoring = true;
+                suspended = false;
+                crashed = false;
+            } else if (vmstate == "livesnapshotting") {
+                online = true;
+                saving = false;
+                restoring = false;
+                suspended = false;
+                crashed = false;
+            } else if (vmstate == "deletingsnapshotlive") {
+                online = true;
+                saving = false;
+                restoring = false;
+                suspended = false;
+                crashed = false;
+            } else if (vmstate == "deletingsnapshotlivepaused") {
+                online = true;
+                saving = false;
+                restoring = false;
+                suspended = false;
+                crashed = false;
+            } else if (vmstate == "aborted") {
+                online = false;
+                saving = false;
+                restoring = false;
+                suspended = false;
+                crashed = true;
+            } else if (vmstate == "gurumeditation") {
+                online = false;
+                saving = false;
+                restoring = false;
+                suspended = false;
+                crashed = true;
+            } else {
+                online = false;
+                saving = false;
+                restoring = false;
+                suspended = false;
+                crashed = false;
+                if (log_state) {
+                    vboxlog_msg("VM is no longer is a running state. It is in '%s'.", vmstate.c_str());
+                }
+            }
+            if (log_state && (vmstate_old != vmstate)) {
+                vboxlog_msg("VM state change detected. (old = '%s', new = '%s')", vmstate_old.c_str(), vmstate.c_str());
+                vmstate_old = vmstate;
+            }
+
+            retval = BOINC_SUCCESS;
+        }
+    }
+
+    //
+    // Grab a snapshot of the latest log file.  Avoids multiple queries across several
+    // functions.
+    //
+    if (online) {
+        get_vm_log(vm_log);
+    }
+
+    //
+    // Dump any new VM Guest Log entries
+    //
+    dump_vmguestlog_entries();
+
+    return retval;
+}
+
+int VBOX_VM::start() {
+    int retval;
+    APP_INIT_DATA aid;
+    string command;
+    string output;
+    int timeout = 0;
+
+    boinc_get_init_data_p(&aid);
+
+
+    vboxlog_msg("Starting VM. (%s, slot#%d)", vm_name.c_str(), aid.slot);
+
+
+    command = "startvm \"" + vm_name + "\"";
+    if (headless) {
+        command += " --type headless";
+    }
+    retval = vbm_popen(command, output, "start VM", true, false, 0);
+
+    // Get the VM pid as soon as possible
+    while (!retval) {
+        boinc_sleep(1.0);
+        timeout += 1;
+
+        get_vm_process_id();
+
+        if (vm_pid) break;
+
+        if (timeout > 45) {
+            retval = ERR_TIMEOUT;
+            break;
+        }
+    }
+
+    if (BOINC_SUCCESS == retval) {
+        vboxlog_msg("Successfully started VM. (PID = '%d')", vm_pid);
+    } else {
+        vboxlog_msg("VM failed to start.");
+    }
+
+    return retval;
+}
+
+int VBOX_VM::stop() {
+    string command;
+    string output;
+    double timeout;
+    int retval = 0;
+
+    vboxlog_msg("Stopping VM.");
+    if (online) {
+        command = "controlvm \"" + vm_name + "\" savestate";
+        retval = vbm_popen(command, output, "stop VM", true, false);
+
+        // Wait for up to 5 minutes for the VM to switch states.  A system
+        // under load can take a while.  Since the poll function can wait for up
+        // to 45 seconds to execute a command we need to make this time based instead
+        // of iteration based.
+        if (!retval) {
+            timeout = dtime() + 300;
+            do {
+                poll(false);
+                if (!online && !saving) break;
+                boinc_sleep(1.0);
+            } while (timeout >= dtime());
+        }
+
+        if (!online) {
+            vboxlog_msg("Successfully stopped VM.");
+            retval = BOINC_SUCCESS;
+        } else {
+            vboxlog_msg("VM did not stop when requested.");
+
+            // Attempt to terminate the VM
+            retval = kill_program(vm_pid);
+            if (retval) {
+                vboxlog_msg("VM was NOT successfully terminated.");
+            } else {
+                vboxlog_msg("VM was successfully terminated.");
+            }
+        }
+    }
+
+    return retval;
+}
+
+int VBOX_VM::poweroff() {
+    string command;
+    string output;
+    double timeout;
+    int retval = 0;
+
+    vboxlog_msg("Powering off VM.");
+    if (online) {
+        command = "controlvm \"" + vm_name + "\" poweroff";
+        retval = vbm_popen(command, output, "poweroff VM", true, false);
+
+        // Wait for up to 5 minutes for the VM to switch states.  A system
+        // under load can take a while.  Since the poll function can wait for up
+        // to 45 seconds to execute a command we need to make this time based instead
+        // of iteration based.
+        if (!retval) {
+            timeout = dtime() + 300;
+            do {
+                poll(false);
+                if (!online && !saving) break;
+                boinc_sleep(1.0);
+            } while (timeout >= dtime());
+        }
+
+        if (!online) {
+            vboxlog_msg("Successfully stopped VM.");
+            retval = BOINC_SUCCESS;
+        } else {
+            vboxlog_msg("VM did not power off when requested.");
+
+            // Attempt to terminate the VM
+            retval = kill_program(vm_pid);
+            if (retval) {
+                vboxlog_msg("VM was NOT successfully terminated.");
+            } else {
+                vboxlog_msg("VM was successfully terminated.");
+            }
+        }
+    }
+
+    return retval;
+}
+
+int VBOX_VM::pause() {
+    string command;
+    string output;
+    int retval;
+
+    // Restore the process priority back to the default process priority
+    // to speed up the last minute maintenance tasks before the VirtualBox
+    // VM goes to sleep
+    //
+    reset_vm_process_priority();
+
+    command = "controlvm \"" + vm_name + "\" pause";
+    retval = vbm_popen(command, output, "pause VM");
+    if (retval) return retval;
+    suspended = true;
+    return 0;
+}
+
+int VBOX_VM::resume() {
+    string command;
+    string output;
+    int retval;
+
+    // Set the process priority back to the lowest level before resuming
+    // execution
+    //
+    lower_vm_process_priority();
+
+    command = "controlvm \"" + vm_name + "\" resume";
+    retval = vbm_popen(command, output, "resume VM");
+    if (retval) return retval;
+    suspended = false;
+    return 0;
+}
+
+int VBOX_VM::create_snapshot(double elapsed_time) {
+    string command;
+    string output;
+    char buf[256];
+    int retval = BOINC_SUCCESS;
+
+    if (disable_automatic_checkpoints) return BOINC_SUCCESS;
+
+    vboxlog_msg("Creating new snapshot for VM.");
+
+    // Pause VM - Try and avoid the live snapshot and trigger an online
+    // snapshot instead.
+    pause();
+
+    // Create new snapshot
+    sprintf(buf, "%d", (int)elapsed_time);
+    command = "snapshot \"" + vm_name + "\" ";
+    command += "take boinc_";
+    command += buf;
+    retval = vbm_popen(command, output, "create new snapshot", true, true, 0);
+    if (retval) return retval;
+
+    // Resume VM
+    resume();
+
+    // Set the suspended flag back to false before deleting the stale
+    // snapshot
+    poll(false);
+
+    // Delete stale snapshot(s), if one exists
+    retval = cleanup_snapshots(false);
+    if (retval) return retval;
+
+    vboxlog_msg("Checkpoint completed.");
+
+    return 0;
+}
+
+int VBOX_VM::cleanup_snapshots(bool delete_active) {
+    string command;
+    string output;
+    string snapshotlist;
+    string line;
+    string uuid;
+    size_t eol_pos;
+    size_t eol_prev_pos;
+    size_t uuid_start;
+    size_t uuid_end;
+    int retval;
+
+
+    // Enumerate snapshot(s)
+    command = "snapshot \"" + vm_name + "\" ";
+    command += "list ";
+
+    // Only log the error if we are not attempting to deregister the VM.
+    // delete_active is only set to true when we are deregistering the VM.
+    retval = vbm_popen(command, snapshotlist, "enumerate snapshot(s)", !delete_active, false, 0);
+    if (retval) return retval;
+
+    // Output should look a little like this:
+    //   Name: Snapshot 2 (UUID: 1751e9a6-49e7-4dcc-ab23-08428b665ddf)
+    //      Name: Snapshot 3 (UUID: 92fa8b35-873a-4197-9d54-7b6b746b2c58)
+    //         Name: Snapshot 4 (UUID: c049023a-5132-45d5-987d-a9cfadb09664) *
+    //
+    // Traverse the list from newest to oldest.  Otherwise we end up with an error:
+    //   VBoxManage.exe: error: Snapshot operation failed
+    //   VBoxManage.exe: error: Hard disk 'C:\ProgramData\BOINC\slots\23\vm_image.vdi' has 
+    //     more than one child hard disk (2)
+    //
+
+    // Prepend a space and line feed to the output since we are going to traverse it backwards
+    snapshotlist = " \n" + snapshotlist;
+
+    eol_prev_pos = snapshotlist.rfind("\n");
+    eol_pos = snapshotlist.rfind("\n", eol_prev_pos - 1);
+    while (eol_pos != string::npos) {
+        line = snapshotlist.substr(eol_pos, eol_prev_pos - eol_pos);
+
+        // Find the previous line to use in the next iteration
+        eol_prev_pos = eol_pos;
+        eol_pos = snapshotlist.rfind("\n", eol_prev_pos - 1);
+
+        // This VM does not yet have any snapshots
+        if (line.find("does not have any snapshots") != string::npos) break;
+
+        // The * signifies that it is the active snapshot and one we do not want to delete
+        if (!delete_active && (line.rfind("*") != string::npos)) continue;
+
+        uuid_start = line.find("(UUID: ");
+        if (uuid_start != string::npos) {
+            // We can parse the virtual machine ID from the line
+            uuid_start += 7;
+            uuid_end = line.find(")", uuid_start);
+            uuid = line.substr(uuid_start, uuid_end - uuid_start);
+
+            vboxlog_msg("Deleting stale snapshot.");
+
+            // Delete stale snapshot, if one exists
+            command = "snapshot \"" + vm_name + "\" ";
+            command += "delete \"";
+            command += uuid;
+            command += "\" ";
+            
+            // Only log the error if we are not attempting to deregister the VM.
+            // delete_active is only set to true when we are deregistering the VM.
+            retval = vbm_popen(command, output, "delete stale snapshot", !delete_active, false, 0);
+            if (retval) return retval;
+        }
+    }
+
+    return 0;
+}
+
+int VBOX_VM::restore_snapshot() {
+    string command;
+    string output;
+    int retval = BOINC_SUCCESS;
+
+    if (disable_automatic_checkpoints) return BOINC_SUCCESS;
+
+    vboxlog_msg("Restore from previously saved snapshot.");
+
+    command = "snapshot \"" + vm_name + "\" ";
+    command += "restorecurrent ";
+    retval = vbm_popen(command, output, "restore current snapshot", true, false, 0);
+    if (retval) return retval;
+
+    vboxlog_msg("Restore completed.");
+
+    return retval;
+}
+
+void VBOX_VM::dump_hypervisor_status_reports() {
+}
+
+int VBOX_VM::is_registered() {
+    string command;
+    string output;
+    string needle;
+    int retval;
+
+    command  = "showvminfo \"" + vm_master_name + "\" ";
+    command += "--machinereadable ";
+
+    // Look for this string in the output
+    //
+    needle = "name=\"" + vm_master_name + "\"";
+
+    retval = vbm_popen(command, output, "registration detection", false, false);
+
+    // Handle explicit cases first
+    if (ERR_TIMEOUT == retval) {
+        return ERR_TIMEOUT;
+    }
+    if (output.find("VBOX_E_OBJECT_NOT_FOUND") != string::npos) {
+        return ERR_NOT_FOUND;
+    }
+    if (!retval && output.find(needle.c_str()) != string::npos) {
+        return BOINC_SUCCESS;
+    }
+
+    // Something unexpected has happened.  Dump diagnostic output.
+    vboxlog_msg(
+        "Error in registration for VM: %d\nArguments:\n%s\nOutput:\n%s",
+        retval,
+        command.c_str(),
+        output.c_str()
+    );
+
+    return retval;
+}
+
+// Attempt to detect any condition that would prevent VirtualBox from running a VM properly, like:
+// 1. The DCOM service not being started on Windows
+// 2. Vboxmanage not being able to communicate with vboxsvc for some reason
+// 3. VirtualBox driver not loaded for the current Linux kernel.
+//
+// Luckly both of the above conditions can be detected by attempting to detect the host information
+// via vboxmanage and it is cross platform.
+//
+bool VBOX_VM::is_system_ready(std::string& message) {
+    string command;
+    string output;
+    int retval;
+    bool rc = false;
+
+    command  = "list hostinfo ";
+    retval = vbm_popen(command, output, "host info");
+    if (BOINC_SUCCESS == retval) {
+        rc = true;
+    }
+
+    if (output.size() == 0) {
+        vboxlog_msg("WARNING: Communication with VM Hypervisor failed. (Possibly Out of Memory).");
+        message = "Communication with VM Hypervisor failed. (Possibly Out of Memory).";
+        rc = false;
+    }
+
+    if (output.find("Processor count:") == string::npos) {
+        vboxlog_msg("WARNING: Communication with VM Hypervisor failed.");
+        message = "Communication with VM Hypervisor failed.";
+        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.");
+        vboxlog_msg("WARNING: Please update/recompile VirtualBox kernel drivers.");
+        message = "Please update/recompile VirtualBox kernel drivers.";
+        rc = false;
+    }
+
+    return rc;
+}
+
+bool VBOX_VM::is_disk_image_registered() {
+    string command;
+    string output;
+    string virtual_machine_root_dir;
+
+    get_slot_directory(virtual_machine_root_dir);
+
+    command = "showhdinfo \"" + virtual_machine_root_dir + "/" + image_filename + "\" ";
+    if (vbm_popen(command, output, "hdd registration", false, false) == 0) {
+        if ((output.find("VBOX_E_FILE_ERROR") == string::npos) && 
+            (output.find("VBOX_E_OBJECT_NOT_FOUND") == string::npos) &&
+            (output.find("does not match the value") == string::npos)
+        ) {
+            // Error message not found in text
+            return true;
+        }
+    }
+
+    if (enable_isocontextualization && enable_cache_disk) {
+        command = "showhdinfo \"" + virtual_machine_root_dir + "/" + cache_disk_filename + "\" ";
+        if (vbm_popen(command, output, "hdd registration", false, false) == 0) {
+            if ((output.find("VBOX_E_FILE_ERROR") == string::npos) && 
+                (output.find("VBOX_E_OBJECT_NOT_FOUND") == string::npos) &&
+                (output.find("does not match the value") == string::npos)
+            ) {
+                // Error message not found in text
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+bool VBOX_VM::is_extpack_installed() {
+    string command;
+    string output;
+
+    command = "list extpacks";
+
+    if (vbm_popen(command, output, "extpack detection", false, false) == 0) {
+        if ((output.find("Oracle VM VirtualBox Extension Pack") != string::npos) && (output.find("VBoxVRDP") != string::npos)) {
+            return true;
+        }
+    }
+    return false;
+}
+
+int VBOX_VM::get_install_directory(string& install_directory) {
+#ifdef _WIN32
+    LONG    lReturnValue;
+    HKEY    hkSetupHive;
+    LPTSTR  lpszRegistryValue = NULL;
+    DWORD   dwSize = 0;
+
+    // change the current directory to the boinc data directory if it exists
+    lReturnValue = RegOpenKeyEx(
+        HKEY_LOCAL_MACHINE, 
+        _T("SOFTWARE\\Oracle\\VirtualBox"),  
+        0, 
+        KEY_READ,
+        &hkSetupHive
+    );
+    if (lReturnValue == ERROR_SUCCESS) {
+        // How large does our buffer need to be?
+        lReturnValue = RegQueryValueEx(
+            hkSetupHive,
+            _T("InstallDir"),
+            NULL,
+            NULL,
+            NULL,
+            &dwSize
+        );
+        if (lReturnValue != ERROR_FILE_NOT_FOUND) {
+            // Allocate the buffer space.
+            lpszRegistryValue = (LPTSTR) malloc(dwSize);
+            (*lpszRegistryValue) = NULL;
+
+            // Now get the data
+            lReturnValue = RegQueryValueEx( 
+                hkSetupHive,
+                _T("InstallDir"),
+                NULL,
+                NULL,
+                (LPBYTE)lpszRegistryValue,
+                &dwSize
+            );
+
+            install_directory = lpszRegistryValue;
+        }
+    }
+
+    if (hkSetupHive) RegCloseKey(hkSetupHive);
+    if (lpszRegistryValue) free(lpszRegistryValue);
+    if (install_directory.empty()) {
+        return ERR_FREAD;
+    }
+    return BOINC_SUCCESS;
+#else
+    install_directory = "";
+    return 0;
+#endif
+}
+
+int VBOX_VM::get_version_information(string& version) {
+    string command;
+    string output;
+    int retval;
+
+    // Record the VirtualBox version information for later use.
+    command = "--version ";
+    retval = vbm_popen(command, output, "version check");
+
+    if (!retval) {
+        // Remove \r or \n from the output spew
+        string::iterator iter = output.begin();
+        while (iter != output.end()) {
+            if (*iter == '\r' || *iter == '\n') {
+                iter = output.erase(iter);
+            } else {
+                ++iter;
+            }
+        }
+        version = string("VirtualBox VboxManage Interface (Version: ") + output + string(")");
+    }
+
+    return retval;
+}
+
+int VBOX_VM::get_guest_additions(string& guest_additions) {
+    string command;
+    string output;
+    size_t ga_start;
+    size_t ga_end;
+    int retval;
+
+    // Get the location of where the guest additions are
+    command = "list systemproperties";
+    retval = vbm_popen(command, output, "guest additions");
+
+    // Output should look like this:
+    // API version:                     4_3
+    // Minimum guest RAM size:          4 Megabytes
+    // Maximum guest RAM size:          2097152 Megabytes
+    // Minimum video RAM size:          1 Megabytes
+    // Maximum video RAM size:          256 Megabytes
+    // ...
+    // Default Guest Additions ISO:     C:\Program Files\Oracle\VirtualBox/VBoxGuestAdditions.iso
+    //
+
+    ga_start = output.find("Default Guest Additions ISO:");
+    if (ga_start == string::npos) {
+        return ERR_NOT_FOUND;
+    }
+    ga_start += strlen("Default Guest Additions ISO:");
+    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;
+    }
+
+    return retval;
+}
+
+int VBOX_VM::get_default_network_interface(string& iface) {
+    string command;
+    string output;
+    size_t if_start;
+    size_t if_end;
+    int retval;
+
+    // Get the location of where the guest additions are
+    command = "list bridgedifs";
+    retval = vbm_popen(command, output, "default interface");
+
+    // Output should look like this:
+    // Name:            Intel(R) Ethernet Connection I217-V
+    // GUID:            4b8796d6-a4ed-4752-8e8e-bf23984fd93c
+    // DHCP:            Enabled
+    // IPAddress:       192.168.1.19
+    // NetworkMask:     255.255.255.0
+    // IPV6Address:     fe80:0000:0000:0000:31c2:0053:4f50:4e64
+    // IPV6NetworkMaskPrefixLength: 64
+    // HardwareAddress: bc:5f:f4:ba:cc:16
+    // MediumType:      Ethernet
+    // Status:          Up
+    // VBoxNetworkName: HostInterfaceNetworking-Intel(R) Ethernet Connection I217-V
+
+    if_start = output.find("Name:");
+    if (if_start == string::npos) {
+        return ERR_NOT_FOUND;
+    }
+    if_start += strlen("Name:");
+    if_end = output.find("\n", if_start);
+    iface = output.substr(if_start, if_end - if_start);
+    strip_whitespace(iface);
+    if (iface.size() <= 0) {
+        return ERR_NOT_FOUND;
+    }
+
+    return retval;
+}
+
+int VBOX_VM::get_vm_network_bytes_sent(double& sent) {
+    string command;
+    string output;
+    string counter_value;
+    size_t counter_start;
+    size_t counter_end;
+    int retval;
+
+    command  = "debugvm \"" + vm_name + "\" ";
+    command += "statistics --pattern \"/Devices/*/TransmitBytes\" ";
+
+    retval = vbm_popen(command, output, "get bytes sent");
+    if (retval) return retval;
+
+    // Output should look like this:
+    // <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+    // <Statistics>
+    // <Counter c="397229" unit="bytes" name="/Devices/PCNet0/TransmitBytes"/>
+    // <Counter c="256" unit="bytes" name="/Devices/PCNet1/TransmitBytes"/>
+    // </Statistics>
+
+    // add up the counter(s)
+    //
+    sent = 0;
+    counter_start = output.find("c=\"");
+    while (counter_start != string::npos) {
+        counter_start += 3;
+        counter_end = output.find("\"", counter_start);
+        counter_value = output.substr(counter_start, counter_end - counter_start);
+        sent += atof(counter_value.c_str());
+        counter_start = output.find("c=\"", counter_start);
+    }
+    return 0;
+}
+
+int VBOX_VM::get_vm_network_bytes_received(double& received) {
+    string command;
+    string output;
+    string counter_value;
+    size_t counter_start;
+    size_t counter_end;
+    int retval;
+
+    command  = "debugvm \"" + vm_name + "\" ";
+    command += "statistics --pattern \"/Devices/*/ReceiveBytes\" ";
+
+    retval = vbm_popen(command, output, "get bytes received");
+    if (retval) return retval;
+
+    // Output should look like this:
+    // <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+    // <Statistics>
+    // <Counter c="9423150" unit="bytes" name="/Devices/PCNet0/ReceiveBytes"/>
+    // <Counter c="256" unit="bytes" name="/Devices/PCNet1/ReceiveBytes"/>
+    // </Statistics>
+
+    // add up the counter(s)
+    //
+    received = 0;
+    counter_start = output.find("c=\"");
+    while (counter_start != string::npos) {
+        counter_start += 3;
+        counter_end = output.find("\"", counter_start);
+        counter_value = output.substr(counter_start, counter_end - counter_start);
+        received += atof(counter_value.c_str());
+        counter_start = output.find("c=\"", counter_start);
+    }
+
+    return 0;
+}
+
+int VBOX_VM::get_vm_process_id() {
+    string output;
+    string pid;
+    size_t pid_start;
+    size_t pid_end;
+
+    get_vm_log(output, false);
+
+    // Output should look like this:
+    // VirtualBox 4.1.0 r73009 win.amd64 (Jul 19 2011 13:05:53) release log
+    // 00:00:06.008 Log opened 2011-09-01T23:00:59.829170900Z
+    // 00:00:06.008 OS Product: Windows 7
+    // 00:00:06.009 OS Release: 6.1.7601
+    // 00:00:06.009 OS Service Pack: 1
+    // 00:00:06.015 Host RAM: 4094MB RAM, available: 876MB
+    // 00:00:06.015 Executable: C:\Program Files\Oracle\VirtualBox\VirtualBox.exe
+    // 00:00:06.015 Process ID: 6128
+    // 00:00:06.015 Package type: WINDOWS_64BITS_GENERIC
+    // 00:00:06.015 Installed Extension Packs:
+    // 00:00:06.015   None installed!
+    //
+    pid_start = output.find("Process ID: ");
+    if (pid_start == string::npos) {
+        return ERR_NOT_FOUND;
+    }
+    pid_start += strlen("Process ID: ");
+    pid_end = output.find("\n", pid_start);
+    pid = output.substr(pid_start, pid_end - pid_start);
+    strip_whitespace(pid);
+    if (pid.size() <= 0) {
+        return ERR_NOT_FOUND;
+    }
+
+    vm_pid = atol(pid.c_str());
+
+    return 0;
+}
+
+int VBOX_VM::get_vm_exit_code(unsigned long& exit_code) {
+#ifdef _WIN32
+    if (vm_pid_handle) {
+        GetExitCodeProcess(vm_pid_handle, &exit_code);
+    }
+#else
+    int ec = 0;
+    waitpid(vm_pid, &ec, WNOHANG);
+    exit_code = ec;
+#endif
+    return 0;
+}
+
+double VBOX_VM::get_vm_cpu_time() {
+    double x = process_tree_cpu_time(vm_pid);
+    if (x > current_cpu_time) {
+        current_cpu_time = x;
+    }
+    return current_cpu_time;
+}
+
+// Enable the network adapter if a network connection is required.
+// NOTE: Network access should never be allowed if the code running in a 
+//   shared directory or the VM image itself is NOT signed.  Doing so
+//   opens up the network behind the company firewall to attack.
+//
+//   Imagine a doomsday scenario where a project has been compromised and
+//   an unsigned executable/VM image has been tampered with.  Volunteer
+//   downloads compromised code and executes it on a company machine.
+//   Now the compromised VM starts attacking other machines on the company
+//   network.  The company firewall cannot help because the attacking
+//   machine is already behind the company firewall.
+//
+int VBOX_VM::set_network_access(bool enabled) {
+    string command;
+    string output;
+    int retval;
+
+    network_suspended = !enabled;
+
+    if (enabled) {
+        vboxlog_msg("Enabling network access for VM.");
+        command  = "modifyvm \"" + vm_name + "\" ";
+        command += "--cableconnected1 on ";
+
+        retval = vbm_popen(command, output, "enable network");
+        if (retval) return retval;
+    } else {
+        vboxlog_msg("Disabling network access for VM.");
+        command  = "modifyvm \"" + vm_name + "\" ";
+        command += "--cableconnected1 off ";
+
+        retval = vbm_popen(command, output, "disable network");
+        if (retval) return retval;
+    }
+    return 0;
+}
+
+int VBOX_VM::set_cpu_usage(int percentage) {
+    string command;
+    string output;
+    char buf[256];
+    int retval;
+
+    // the arg to controlvm is percentage
+    //
+    vboxlog_msg("Setting CPU throttle for VM. (%d%%)", percentage);
+    sprintf(buf, "%d", percentage);
+    command  = "controlvm \"" + vm_name + "\" ";
+    command += "cpuexecutioncap ";
+    command += buf;
+    command += " ";
+
+    retval = vbm_popen(command, output, "CPU throttle");
+    if (retval) return retval;
+    return 0;
+}
+
+int VBOX_VM::set_network_usage(int kilobytes) {
+    string command;
+    string output;
+    char buf[256];
+    int retval;
+
+    // the argument to modifyvm is in KB
+    //
+    if (kilobytes == 0) {
+        vboxlog_msg("Setting network throttle for VM. (1024GB)");
+    } else {
+        vboxlog_msg("Setting network throttle for VM. (%dKB)", kilobytes);
+    }
+
+    if (is_virtualbox_version_newer(4, 2, 0)) {
+
+        // Update bandwidth group limits
+        //
+        if (kilobytes == 0) {
+            command  = "bandwidthctl \"" + vm_name + "\" ";
+            command += "set \"" + vm_name + "_net\" ";
+            command += "--limit 1024G ";
+
+            retval = vbm_popen(command, output, "network throttle (set default value)");
+            if (retval) return retval;
+        } else {
+            sprintf(buf, "%d", kilobytes);
+            command  = "bandwidthctl \"" + vm_name + "\" ";
+            command += "set \"" + vm_name + "_net\" ";
+            command += "--limit ";
+            command += buf;
+            command += "K ";
+
+            retval = vbm_popen(command, output, "network throttle (set)");
+            if (retval) return retval;
+        }
+
+    } else {
+
+        sprintf(buf, "%d", kilobytes);
+        command  = "modifyvm \"" + vm_name + "\" ";
+        command += "--nicspeed1 ";
+        command += buf;
+        command += " ";
+
+        retval = vbm_popen(command, output, "network throttle");
+        if (retval) return retval;
+
+    }
+
+    return 0;
+}
+
+void VBOX_VM::lower_vm_process_priority() {
+#ifdef _WIN32
+    if (vm_pid_handle) {
+        SetPriorityClass(vm_pid_handle, BELOW_NORMAL_PRIORITY_CLASS);
+    }
+#else
+    if (vm_pid) {
+        setpriority(PRIO_PROCESS, vm_pid, PROCESS_MEDIUM_PRIORITY);
+    }
+#endif
+}
+
+void VBOX_VM::reset_vm_process_priority() {
+#ifdef _WIN32
+    if (vm_pid_handle) {
+        SetPriorityClass(vm_pid_handle, NORMAL_PRIORITY_CLASS);
+    }
+#else
+    if (vm_pid) {
+        setpriority(PRIO_PROCESS, vm_pid, PROCESS_NORMAL_PRIORITY);
+    }
+#endif
+}
+
+}
diff --git a/samples/vboxwrapper/vbox_vboxmanage.h b/samples/vboxwrapper/vbox_vboxmanage.h
new file mode 100644
index 0000000..fcd1707
--- /dev/null
+++ b/samples/vboxwrapper/vbox_vboxmanage.h
@@ -0,0 +1,74 @@
+// 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/>.
+
+
+// Provide cross-platform interfaces for making changes to VirtualBox
+
+#ifndef _VBOX_VBOXMANAGE_H_
+#define _VBOX_VBOXMANAGE_H_
+
+namespace vboxmanage {
+
+    class VBOX_VM : public VBOX_BASE {
+    public:
+        VBOX_VM();
+        ~VBOX_VM();
+
+        int initialize();
+        int create_vm();
+        int register_vm();
+        int deregister_vm(bool delete_media);
+        int deregister_stale_vm();
+        int poll(bool log_state = true);
+        int start();
+        int stop();
+        int poweroff();
+        int pause();
+        int resume();
+        int create_snapshot(double elapsed_time);
+        int cleanup_snapshots(bool delete_active);
+        int restore_snapshot();
+
+        void dump_hypervisor_status_reports();
+
+        int is_registered();
+        bool is_system_ready(std::string& message);
+        bool is_disk_image_registered();
+        bool is_extpack_installed();
+        bool is_virtualbox_installed();
+
+        int get_install_directory(std::string& dir);
+        int get_version_information(std::string& version);
+        int get_guest_additions(std::string& dir);
+        int get_default_network_interface(std::string& iface);
+        int get_vm_network_bytes_sent(double& sent);
+        int get_vm_network_bytes_received(double& received);
+        int get_vm_process_id();
+        int get_vm_exit_code(unsigned long& exit_code);
+        double get_vm_cpu_time();
+
+        int set_network_access(bool enabled);
+        int set_cpu_usage(int percentage);
+        int set_network_usage(int kilobytes);
+
+        void lower_vm_process_priority();
+        void reset_vm_process_priority();
+    };
+
+};
+
+#endif
diff --git a/samples/vboxwrapper/vboxcheckpoint.cpp b/samples/vboxwrapper/vboxcheckpoint.cpp
new file mode 100644
index 0000000..8f2ab75
--- /dev/null
+++ b/samples/vboxwrapper/vboxcheckpoint.cpp
@@ -0,0 +1,145 @@
+// 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
+
+#include "parse.h"
+#include "filesys.h"
+#include "boinc_api.h"
+#include "vboxlogging.h"
+#include "vboxcheckpoint.h"
+
+
+VBOX_CHECKPOINT::VBOX_CHECKPOINT() {
+    clear();
+}
+
+VBOX_CHECKPOINT::~VBOX_CHECKPOINT() {
+    clear();
+}
+
+void VBOX_CHECKPOINT::clear() {
+    elapsed_time = 0.0;
+    cpu_time = 0.0;
+    webapi_port = 0;
+    remote_desktop_port = 0;
+}
+
+int VBOX_CHECKPOINT::parse() {
+    MIOFILE mf;
+
+    FILE* f = boinc_fopen(CHECKPOINT_FILENAME, "r");
+    if (!f) {
+        return ERR_FOPEN;
+    }
+    mf.init_file(f);
+    XML_PARSER xp(&mf);
+
+    if (!xp.parse_start("vbox_checkpoint")) return ERR_XML_PARSE;
+    while (!xp.get_tag()) {
+        if (!xp.is_tag) {
+            vboxlog_msg("VBOX_CHECKPOINT::parse(): unexpected text %s", xp.parsed_tag);
+            continue;
+        }
+        if (xp.match_tag("/vbox_checkpoint")) {
+            fclose(f);
+            return 0;
+        }
+        else if (xp.parse_double("elapsed_time", elapsed_time)) continue;
+        else if (xp.parse_double("cpu_time", cpu_time)) continue;
+        else if (xp.parse_int("webapi_port", webapi_port)) continue;
+        else if (xp.parse_int("remote_desktop_port", remote_desktop_port)) continue;
+        else {
+            vboxlog_msg("VBOX_CHECKPOINT::parse(): unexpected text %s", xp.parsed_tag);
+        }
+    }
+    fclose(f);
+    return ERR_XML_PARSE;
+}
+
+int VBOX_CHECKPOINT::write() {
+    MIOFILE mf;
+    FILE* f;
+
+    // Write checkpoint info to disk
+    //
+    f = boinc_fopen(CHECKPOINT_FILENAME, "w");
+    mf.init_file(f);
+
+    mf.printf(
+        "<vbox_checkpoint>\n"
+        "    <elapsed_time>%f</elapsed_time>\n"
+        "    <cpu_time>%f</cpu_time>\n"
+        "    <webapi_port>%d</webapi_port>\n"
+        "    <remote_desktop_port>%d</remote_desktop_port>\n"
+        "</vbox_checkpoint>\n",
+        elapsed_time,
+        cpu_time,
+        webapi_port,
+        remote_desktop_port
+    );
+
+    fclose(f);
+
+    // Write webapi info to disk
+    //
+    if (!boinc_file_exists(WEBAPI_FILENAME)) {
+        f = boinc_fopen(WEBAPI_FILENAME, "w");
+        mf.init_file(f);
+        mf.printf(
+            "<webapi>\n"
+            "  <host_port>%d</host_port>\n"
+            "</webapi>\n",
+            webapi_port
+        );
+        fclose(f);
+    }
+
+    // Write remote desktop info to disk
+    //
+    if (!boinc_file_exists(REMOTEDESKTOP_FILENAME)) {
+        f = boinc_fopen(REMOTEDESKTOP_FILENAME, "w");
+        mf.init_file(f);
+        mf.printf(
+            "<remote_desktop>\n"
+            "  <host_port>%d</host_port>\n"
+            "</remote_desktop>\n",
+            remote_desktop_port
+        );
+        fclose(f);
+    }
+
+    return 0;
+}
+
+int VBOX_CHECKPOINT::update(double _elapsed_time, double _cpu_time) {
+    elapsed_time = _elapsed_time;
+    cpu_time = _cpu_time;
+    return write();
+}
diff --git a/samples/vboxwrapper/vboxwrapper.h b/samples/vboxwrapper/vboxcheckpoint.h
similarity index 56%
copy from samples/vboxwrapper/vboxwrapper.h
copy to samples/vboxwrapper/vboxcheckpoint.h
index b90a39d..ed56313 100644
--- a/samples/vboxwrapper/vboxwrapper.h
+++ b/samples/vboxwrapper/vboxcheckpoint.h
@@ -15,24 +15,29 @@
 // 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 _VBOXCHECKPOINT_H_
+#define _VBOXCHECKPOINT_H_
 
-// Provide cross-platform interfaces for making changes to VirtualBox
 
-#ifndef _VBOXWRAPPER_H_
-#define _VBOXWRAPPER_H_
-
-#define IMAGE_FILENAME_COMPLETE "vm_image.vdi"
-#define IMAGE_FILENAME "vm_image"
-#define IMAGE_FILENAME_EXTENSION "vdi"
-#define FLOPPY_IMAGE_FILENAME "vm_floppy"
-#define FLOPPY_IMAGE_FILENAME_EXTENSION "img"
-#define JOB_FILENAME "vbox_job.xml"
-#define CHECKPOINT_FILENAME "vbox_checkpoint.txt"
-#define PORTFORWARD_FILENAME "vbox_port_forward.xml"
+#define CHECKPOINT_FILENAME "vbox_checkpoint.xml"
+#define WEBAPI_FILENAME "vbox_webapi.xml"
 #define REMOTEDESKTOP_FILENAME "vbox_remote_desktop.xml"
-#define POLL_PERIOD 1.0
 
-extern bool is_boinc_client_version_newer(APP_INIT_DATA& aid, int maj, int min, int rel);
-extern char* vboxwrapper_msg_prefix(char*, int);
+
+class VBOX_CHECKPOINT {
+public:
+    VBOX_CHECKPOINT();
+    ~VBOX_CHECKPOINT();
+
+    void clear();
+    int parse();
+    int write();
+    int update(double elapsed_time, double cpu_time);
+
+    double elapsed_time;
+    double cpu_time;
+    int webapi_port;
+    int remote_desktop_port;
+};
 
 #endif
diff --git a/samples/vboxwrapper/vboxjob.cpp b/samples/vboxwrapper/vboxjob.cpp
new file mode 100644
index 0000000..156d5a7
--- /dev/null
+++ b/samples/vboxwrapper/vboxjob.cpp
@@ -0,0 +1,222 @@
+// 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
+
+#include "parse.h"
+#include "filesys.h"
+#include "boinc_api.h"
+#include "vboxlogging.h"
+#include "vboxjob.h"
+
+
+VBOX_INTERMEDIATE_UPLOAD::VBOX_INTERMEDIATE_UPLOAD() {
+    clear();
+}
+
+VBOX_INTERMEDIATE_UPLOAD::~VBOX_INTERMEDIATE_UPLOAD() {
+    clear();
+}
+
+void VBOX_INTERMEDIATE_UPLOAD::clear() {
+    file = "";
+    reported = false;
+    ignore = false;
+}
+
+
+VBOX_PORT_FORWARD::VBOX_PORT_FORWARD() {
+    clear();
+}
+
+VBOX_PORT_FORWARD::~VBOX_PORT_FORWARD() {
+    clear();
+}
+
+void VBOX_PORT_FORWARD::clear() {
+    host_port = 0;
+    guest_port = 0;
+    is_remote = false;
+    nports = 0;
+}
+
+int VBOX_PORT_FORWARD::parse(XML_PARSER& xp) {
+    while (!xp.get_tag()) {
+        if (xp.match_tag("/port_forward")) {
+            if (!host_port) {
+                vboxlog_msg("VBOX_PORT_FORWARD::parse(): unspecified host port");
+                return ERR_XML_PARSE;
+            }
+            if (!guest_port) {
+                vboxlog_msg("VBOX_PORT_FORWARD::parse(): unspecified guest port");
+                return ERR_XML_PARSE;
+            }
+            return 0;
+        }
+        else if (xp.parse_bool("is_remote", is_remote)) continue;
+        else if (xp.parse_int("host_port", host_port)) continue;
+        else if (xp.parse_int("guest_port", guest_port)) continue;
+        else if (xp.parse_int("nports", nports)) continue;
+        else {
+            vboxlog_msg("VBOX_PORT_FORWARD::parse(): unexpected text %s", xp.parsed_tag);
+        }
+    }
+    return ERR_XML_PARSE;
+}
+
+
+VBOX_JOB::VBOX_JOB() {
+    clear();
+}
+
+VBOX_JOB::~VBOX_JOB() {
+    clear();
+}
+
+void VBOX_JOB::clear() {
+    os_name.clear();
+    memory_size_mb = 0.0;
+    job_duration = 0.0;
+    minimum_checkpoint_interval = 600.0;
+    fraction_done_filename.clear();
+    completion_trigger_file.clear();
+    temporary_exit_trigger_file.clear();
+    enable_cern_dataformat = false;
+    enable_shared_directory = false;
+    enable_floppyio = false;
+    enable_cache_disk = false;
+    enable_isocontextualization = false;
+    enable_network = false;
+    network_bridged_mode = false;
+    enable_remotedesktop = false;
+    enable_gbac = false;
+    enable_graphics_support = false;
+    enable_vm_savestate_usage = false;
+    disable_automatic_checkpoints = false;
+    pf_guest_port = 0;
+    pf_host_port = 0;
+    port_forwards.clear();
+    intermediate_upload_files.clear();
+
+    // Initialize default values
+    vm_disk_controller_type = "ide";
+    vm_disk_controller_model = "PIIX4";
+}
+
+int VBOX_JOB::parse() {
+    MIOFILE mf;
+    std::string str;
+    char buf[1024];
+
+    boinc_resolve_filename(JOB_FILENAME, buf, sizeof(buf));
+    FILE* f = boinc_fopen(buf, "r");
+    if (!f) {
+        vboxlog_msg("VBOX_JOB::parse(): can't open job file %s", buf);
+        return ERR_FOPEN;
+    }
+    mf.init_file(f);
+    XML_PARSER xp(&mf);
+
+    if (!xp.parse_start("vbox_job")) return ERR_XML_PARSE;
+    while (!xp.get_tag()) {
+        if (!xp.is_tag) {
+            vboxlog_msg("VBOX_JOB::parse(): unexpected text %s", xp.parsed_tag);
+            continue;
+        }
+        if (xp.match_tag("/vbox_job")) {
+            fclose(f);
+            return 0;
+        }
+        else if (xp.parse_string("vm_disk_controller_type", vm_disk_controller_type)) continue;
+        else if (xp.parse_string("vm_disk_controller_model", vm_disk_controller_model)) continue;
+        else if (xp.parse_string("os_name", os_name)) continue;
+        else if (xp.parse_double("memory_size_mb", memory_size_mb)) continue;
+        else if (xp.parse_double("job_duration", job_duration)) continue;
+        else if (xp.parse_double("minimum_checkpoint_interval", minimum_checkpoint_interval)) continue;
+        else if (xp.parse_string("fraction_done_filename", fraction_done_filename)) continue;
+        else if (xp.parse_bool("enable_cern_dataformat", enable_cern_dataformat)) continue;
+        else if (xp.parse_bool("enable_network", enable_network)) continue;
+        else if (xp.parse_bool("network_bridged_mode", network_bridged_mode)) continue;
+        else if (xp.parse_bool("enable_shared_directory", enable_shared_directory)) continue;
+        else if (xp.parse_bool("enable_floppyio", enable_floppyio)) continue;
+        else if (xp.parse_bool("enable_cache_disk", enable_cache_disk)) continue;
+        else if (xp.parse_bool("enable_isocontextualization", enable_isocontextualization)) continue;
+        else if (xp.parse_bool("enable_remotedesktop", enable_remotedesktop)) continue;
+        else if (xp.parse_bool("enable_gbac", enable_gbac)) continue;
+        else if (xp.parse_bool("enable_graphics_support", enable_graphics_support)) continue;
+        else if (xp.parse_bool("enable_vm_savestate_usage", enable_vm_savestate_usage)) continue;
+        else if (xp.parse_bool("disable_automatic_checkpoints", disable_automatic_checkpoints)) continue;
+        else if (xp.parse_int("pf_guest_port", pf_guest_port)) continue;
+        else if (xp.parse_int("pf_host_port", pf_host_port)) continue;
+        else if (xp.parse_string("copy_to_shared", str)) {
+            copy_to_shared.push_back(str);
+            continue;
+        }
+        else if (xp.parse_string("trickle_trigger_file", str)) {
+            trickle_trigger_files.push_back(str);
+            continue;
+        }
+        else if (xp.parse_string("completion_trigger_file", str)) {
+            completion_trigger_file = str;
+            continue;
+        }
+        else if (xp.parse_string("temporary_exit_trigger_file", str)) {
+            temporary_exit_trigger_file = str;
+            continue;
+        }
+        else if (xp.parse_string("intermediate_upload_file", str)) {
+            VBOX_INTERMEDIATE_UPLOAD iu;
+            iu.clear();
+            iu.file = str;
+            intermediate_upload_files.push_back(iu);
+            continue;
+        }
+        else if (xp.match_tag("port_forward")) {
+            VBOX_PORT_FORWARD pf;
+            pf.clear();
+            pf.parse(xp);
+            if (pf.nports) {
+                VBOX_PORT_FORWARD pf_range;
+                pf_range = pf;
+                pf_range.nports = 0;
+                for (int i = 0; i < pf.nports; ++i) {
+                    port_forwards.push_back(pf_range);
+                    pf_range.host_port++;
+                    pf_range.guest_port++;
+                }
+            } else {
+                port_forwards.push_back(pf);
+            }
+        }
+        vboxlog_msg("VBOX_JOB::parse(): unexpected text %s", xp.parsed_tag);
+    }
+    fclose(f);
+    return ERR_XML_PARSE;
+}
+
diff --git a/samples/vboxwrapper/vboxjob.h b/samples/vboxwrapper/vboxjob.h
new file mode 100644
index 0000000..ff9d690
--- /dev/null
+++ b/samples/vboxwrapper/vboxjob.h
@@ -0,0 +1,152 @@
+// 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 _VBOXJOB_H_
+#define _VBOXJOB_H_
+
+
+#define JOB_FILENAME "vbox_job.xml"
+
+
+// Represents the state of a intermediate upload
+class VBOX_INTERMEDIATE_UPLOAD {
+public:
+    VBOX_INTERMEDIATE_UPLOAD();
+    ~VBOX_INTERMEDIATE_UPLOAD();
+
+    void clear();
+
+    std::string file;
+    bool reported;
+    bool ignore;
+};
+
+
+class VBOX_PORT_FORWARD {
+public:
+    VBOX_PORT_FORWARD();
+    ~VBOX_PORT_FORWARD();
+
+    void clear();
+    int parse(XML_PARSER& xp);
+
+    int host_port;          // 0 means assign dynamically
+    int guest_port;
+    bool is_remote;
+    int nports;
+};
+
+
+class VBOX_JOB {
+public:
+    VBOX_JOB();
+    ~VBOX_JOB();
+
+    void clear();
+    int parse();
+
+    // name of the OS the VM runs
+    std::string os_name;
+
+    // the type of disk controller to emulate
+    std::string vm_disk_controller_type;
+
+    // the disk controller model to emulate
+    std::string vm_disk_controller_model;
+
+    // size of the memory allocation for the VM, in megabytes
+    double memory_size_mb;
+
+    // whether to use CERN specific data structures
+    bool enable_cern_dataformat;
+
+    // whether to use an iso9660 image to implement VM contextualization (e.g. uCernVM)
+    bool enable_isocontextualization;
+
+    // whether to add an extra cache disk for systems like uCernVM
+    bool enable_cache_disk;
+
+    // whether to allow network access
+    bool enable_network;
+
+    // use bridged mode for network
+    bool network_bridged_mode;
+
+    // whether to use shared directory infrastructure
+    bool enable_shared_directory;
+
+    // whether to use floppy io infrastructure
+    bool enable_floppyio;
+
+    // whether to enable remote desktop functionality
+    bool enable_remotedesktop;
+
+    // whether to enable GBAC functionality
+    bool enable_gbac;
+
+    // whether to enable graphics support by way of
+    // http://boinc.berkeley.edu/trac/wiki/GraphicsApi#File
+    bool enable_graphics_support;
+
+    // whether to use savestate instead of poweroff on exit
+    bool enable_vm_savestate_usage;
+
+    // whether to disable automatic checkpoint support
+    bool disable_automatic_checkpoints;
+
+    // maximum amount of wall-clock time this VM is allowed to run before
+    // considering itself done.
+    double job_duration;
+
+    // name of file where app will write its fraction done
+    std::string fraction_done_filename;
+
+    // if nonzero, do port forwarding for Web GUI
+    int pf_guest_port;      
+    int pf_host_port;
+
+    std::vector<VBOX_PORT_FORWARD> port_forwards;
+
+    // minimum time between checkpoints
+    double minimum_checkpoint_interval;
+
+    // list of files to copy from slot dir to shared/
+    std::vector<std::string> copy_to_shared;
+
+    // if find file of this name in shared/, send trickle-up message
+    // with variety = filename, contents = file contents
+    std::vector<std::string> trickle_trigger_files;
+
+    // if find file of this name in shared/, send specified file
+    std::vector<VBOX_INTERMEDIATE_UPLOAD> intermediate_upload_files;
+
+    // if find this file in shared/, task is over.
+    // File can optionally contain exit code (first line)
+    // File can optionally contain is_notice bool (second line)
+    // and stderr text (subsequent lines).
+    // Addresses a problem where VM doesn't shut down properly
+    std::string completion_trigger_file;
+
+    // if find this file in shared/, task is restarted at a later date.
+    // File can optionally contain restart delay (first line)
+    // File can optionally contain is_notice bool (second line)
+    // and stderr text (subsequent lines).
+    // Addresses a problem where VM doesn't shut down properly
+    std::string temporary_exit_trigger_file;
+};
+
+#endif
diff --git a/html/user/rss_main.php b/samples/vboxwrapper/vboxlog.cpp
similarity index 71%
copy from html/user/rss_main.php
copy to samples/vboxwrapper/vboxlog.cpp
index e86fcf0..faa6f71 100644
--- a/html/user/rss_main.php
+++ b/samples/vboxwrapper/vboxlog.cpp
@@ -1,7 +1,6 @@
-<?php
 // This file is part of BOINC.
 // http://boinc.berkeley.edu
-// Copyright (C) 2008 University of California
+// 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
@@ -16,14 +15,17 @@
 // 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("../project/project.inc");
-require_once("../inc/forum_rss.inc");
-require_once("../inc/news.inc");
+#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
 
-$forum = news_forum();
-if (!$forum) {
-    exit;
-}
-
-forum_rss($forum->id, 0, 1, 90);
-?>
diff --git a/clientgui/res/skins/default/graphic/dialog_background_image.xpm b/samples/vboxwrapper/vboxlog.h
similarity index 78%
copy from clientgui/res/skins/default/graphic/dialog_background_image.xpm
copy to samples/vboxwrapper/vboxlog.h
index 29d6c76..8ba5c73 100644
--- a/clientgui/res/skins/default/graphic/dialog_background_image.xpm
+++ b/samples/vboxwrapper/vboxlog.h
@@ -1,7 +1,6 @@
-/* XPM */
 // This file is part of BOINC.
 // http://boinc.berkeley.edu
-// Copyright (C) 2011 University of California
+// 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
@@ -15,10 +14,8 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
-static const char *dialog_background_image_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"1 1 1 1",
-"  c #D3D3D3",
-/* pixels */
-" "
-};
+
+#ifndef _VBOXLOG_H_
+#define _VBOXLOG_H_
+
+#endif
diff --git a/samples/vboxwrapper/vboxlogging.cpp b/samples/vboxwrapper/vboxlogging.cpp
new file mode 100644
index 0000000..35c92fc
--- /dev/null
+++ b/samples/vboxwrapper/vboxlogging.cpp
@@ -0,0 +1,67 @@
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2010-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/>.
+
+#ifdef _WIN32
+#include "boinc_win.h"
+#include "win_util.h"
+#else
+#include <sys/wait.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <stdio.h>
+#include <stdarg.h> 
+#include <cmath>
+#include <string>
+#include <unistd.h>
+#endif
+
+#include "vboxlogging.h"
+
+
+int vboxlog_msg(const char *fmt, ...) {
+    int retval = 0;
+    int n = 0;
+    char buf[256];
+    int pid;
+    struct tm tm;
+    struct tm *tmp = &tm;
+    va_list ap;
+
+    if (fmt == NULL) return 0;
+
+    time_t x = time(0);
+
+#ifdef _WIN32
+    pid = GetCurrentProcessId();
+    localtime_s(&tm, &x);
+#else
+    pid = getpid();
+    localtime_r(&x, &tm);
+#endif
+
+    strftime(buf, sizeof(buf)-1, "%Y-%m-%d %H:%M:%S", &tm);
+    fprintf(stderr, "%s (%d): ", buf, pid);
+
+    va_start(ap, fmt);
+    retval = vfprintf(stderr, fmt, ap);
+    va_end(ap);
+
+    fprintf(stderr, "\n");
+
+    return retval;
+}
+
diff --git a/clientgui/res/skins/default/graphic/dialog_background_image.xpm b/samples/vboxwrapper/vboxlogging.h
similarity index 78%
copy from clientgui/res/skins/default/graphic/dialog_background_image.xpm
copy to samples/vboxwrapper/vboxlogging.h
index 29d6c76..489ba75 100644
--- a/clientgui/res/skins/default/graphic/dialog_background_image.xpm
+++ b/samples/vboxwrapper/vboxlogging.h
@@ -1,7 +1,6 @@
-/* XPM */
 // This file is part of BOINC.
 // http://boinc.berkeley.edu
-// Copyright (C) 2011 University of California
+// 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
@@ -15,10 +14,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/>.
-static const char *dialog_background_image_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"1 1 1 1",
-"  c #D3D3D3",
-/* pixels */
-" "
-};
+
+#ifndef _VBOXLOG_H_
+#define _VBOXLOG_H_
+
+extern int vboxlog_msg(const char *fmt, ...);
+
+#endif
diff --git a/samples/vboxwrapper/vboxwrapper.cpp b/samples/vboxwrapper/vboxwrapper.cpp
index 224b7ab..e937e53 100644
--- a/samples/vboxwrapper/vboxwrapper.cpp
+++ b/samples/vboxwrapper/vboxwrapper.cpp
@@ -20,11 +20,11 @@
 //
 // usage: vboxwrapper [options]
 //
-// --trickle X      send a trickle message reporting elapsed time every X secs
+// --trickle X      send a trickle-up message reporting elapsed time every X sec
 //                  (use this for credit granting if your app does its
 //                  own job management, like CernVM).
 // --nthreads N     create a VM with N threads.
-// --vmimage file   Use "file" as the VM image.
+// --vmimage N      Use "vm_image_N" as the VM image.
 //                  This lets you create an app version with several images,
 //                  and the app_plan function can decide which one to use
 //                  for the particular host.
@@ -39,11 +39,11 @@
 // - a bunch of other stuff; see the wiki page
 //
 // Contributors:
+// Rom Walton
+// David Anderson
 // Andrew J. Younge (ajy4490 AT umiacs DOT umd DOT edu)
 // Jie Wu <jiewu AT cern DOT ch>
 // Daniel Lombraña González <teleyinex AT gmail DOT com>
-// Rom Walton
-// David Anderson
 
 #ifdef _WIN32
 #include "boinc_win.h"
@@ -56,11 +56,13 @@
 #include <stdio.h>
 #include <cmath>
 #include <string>
+#include <sstream>
 #include <unistd.h>
 #endif
 
 #include "version.h"
 #include "boinc_api.h"
+#include "graphics2.h"
 #include "diagnostics.h"
 #include "filesys.h"
 #include "md5_file.h"
@@ -70,147 +72,29 @@
 #include "util.h"
 #include "error_numbers.h"
 #include "procinfo.h"
+#include "floppyio.h"
+#include "vboxlogging.h"
+#include "vboxcheckpoint.h"
 #include "vboxwrapper.h"
-#include "vbox.h"
-
-using std::vector;
-using std::string;
-
-
-bool is_boinc_client_version_newer(APP_INIT_DATA& aid, int maj, int min, int rel) {
-    if (maj < aid.major_version) return true;
-    if (maj > aid.major_version) return false;
-    if (min < aid.minor_version) return true;
-    if (min > aid.minor_version) return false;
-    if (rel < aid.release) return true;
-    return false;
-}
-
-char* vboxwrapper_msg_prefix(char* sbuf, int len) {
-    char buf[256];
-    struct tm tm;
-    struct tm *tmp = &tm;
-    int n;
-
-    time_t x = time(0);
-#ifdef _WIN32
-#ifdef __MINGW32__
-    if ((tmp = localtime(&x)) == NULL)
-#else
-    if (localtime_s(&tm, &x) == EINVAL)
-#endif
-#else
-    if (localtime_r(&x, &tm) == NULL)
-#endif
-    {
-        strcpy(sbuf, "localtime() failed");
-        return sbuf;
-    }
-    if (strftime(buf, sizeof(buf)-1, "%Y-%m-%d %H:%M:%S", tmp) == 0) {
-        strcpy(sbuf, "strftime() failed");
-        return sbuf;
-    }
+#include "vbox_common.h"
 #ifdef _WIN32
-    n = _snprintf(sbuf, len, "%s (%d):", buf, GetCurrentProcessId());
-#else
-    n = snprintf(sbuf, len, "%s (%d):", buf, getpid());
+#include "vbox_mscom42.h"
+#include "vbox_mscom43.h"
 #endif
-    if (n < 0) {
-        strcpy(sbuf, "sprintf() failed");
-        return sbuf;
-    }
-    sbuf[len-1] = 0;    // just in case
-    return sbuf;
-}
+#include "vbox_vboxmanage.h"
 
 
-int parse_job_file(VBOX_VM& vm, vector<string>& copy_to_shared) {
-    MIOFILE mf;
-    string str;
-    char buf[1024], buf2[256];
-
-    boinc_resolve_filename(JOB_FILENAME, buf, sizeof(buf));
-    FILE* f = boinc_fopen(buf, "r");
-    if (!f) {
-        fprintf(stderr,
-            "%s can't open job file %s\n",
-            vboxwrapper_msg_prefix(buf2, sizeof(buf2)), buf
-        );
-        return ERR_FOPEN;
-    }
-    mf.init_file(f);
-    XML_PARSER xp(&mf);
-
-    if (!xp.parse_start("vbox_job")) return ERR_XML_PARSE;
-    while (!xp.get_tag()) {
-        if (!xp.is_tag) {
-            fprintf(stderr, "%s parse_job_file(): unexpected text %s\n",
-                vboxwrapper_msg_prefix(buf, sizeof(buf)), xp.parsed_tag
-            );
-            continue;
-        }
-        if (xp.match_tag("/vbox_job")) {
-            fclose(f);
-            return 0;
-        }
-        else if (xp.parse_string("vm_disk_controller_type", vm.vm_disk_controller_type)) continue;
-        else if (xp.parse_string("vm_disk_controller_model", vm.vm_disk_controller_model)) continue;
-        else if (xp.parse_string("os_name", vm.os_name)) continue;
-        else if (xp.parse_string("memory_size_mb", vm.memory_size_mb)) continue;
-        else if (xp.parse_double("job_duration", vm.job_duration)) continue;
-        else if (xp.parse_double("minimum_checkpoint_interval", vm.minimum_checkpoint_interval)) continue;
-        else if (xp.parse_string("fraction_done_filename", vm.fraction_done_filename)) continue;
-        else if (xp.parse_bool("enable_cern_dataformat", vm.enable_cern_dataformat)) continue;
-        else if (xp.parse_bool("enable_network", vm.enable_network)) continue;
-        else if (xp.parse_bool("enable_shared_directory", vm.enable_shared_directory)) continue;
-        else if (xp.parse_bool("enable_floppyio", vm.enable_floppyio)) continue;
-        else if (xp.parse_bool("enable_remotedesktop", vm.enable_remotedesktop)) continue;
-        else if (xp.parse_int("pf_guest_port", vm.pf_guest_port)) continue;
-        else if (xp.parse_int("pf_host_port", vm.pf_host_port)) continue;
-        else if (xp.parse_string("copy_to_shared", str)) {
-            copy_to_shared.push_back(str);
-            continue;
-        }
-        fprintf(stderr, "%s parse_job_file(): unexpected tag %s\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf)), xp.parsed_tag
-        );
-    }
-    fclose(f);
-    return ERR_XML_PARSE;
-}
-
-void write_checkpoint(double elapsed, double cpu, VBOX_VM& vm) {
-    FILE* f = fopen(CHECKPOINT_FILENAME, "w");
-    if (!f) return;
-    fprintf(f, "%f %f %d %d\n", elapsed, cpu, vm.pf_host_port, vm.rd_host_port);
-    fclose(f);
-}
+using std::vector;
+using std::string;
 
-void read_checkpoint(double& elapsed, double& cpu, VBOX_VM& vm) {
-    double c;
-    double e;
-    int pf_host;
-    int rd_host;
-    elapsed = 0.0;
-    cpu = 0.0;
-    vm.pf_host_port = 0;
-    vm.rd_host_port = 0;
-    FILE* f = fopen(CHECKPOINT_FILENAME, "r");
-    if (!f) return;
-    int n = fscanf(f, "%lf %lf %d %d", &e, &c, &pf_host, &rd_host);
-    fclose(f);
-    if (n != 4) return;
-    elapsed = e;
-    cpu = c;
-    vm.pf_host_port = pf_host;
-    vm.rd_host_port = rd_host;
-}
 
 void read_fraction_done(double& frac_done, VBOX_VM& vm) {
+    char path[MAXPATHLEN];
     char buf[256];
     double temp, frac = 0;
 
-    FILE* f = fopen(vm.fraction_done_filename.c_str(), "r");
+    sprintf(path, "shared/%s", vm.fraction_done_filename.c_str());
+    FILE* f = fopen(path, "r");
     if (!f) return;
 
     // read the last line of the file
@@ -234,6 +118,72 @@ void read_fraction_done(double& frac_done, VBOX_VM& vm) {
     frac_done = frac;
 }
 
+bool completion_file_exists(VBOX_VM& vm) {
+    char path[MAXPATHLEN];
+    sprintf(path, "shared/%s", vm.completion_trigger_file.c_str());
+    if (vm.completion_trigger_file.size() && boinc_file_exists(path)) return true;
+    return false;
+}
+
+void read_completion_file_info(unsigned long& exit_code, bool& is_notice, string& message, VBOX_VM& vm) {
+    char path[MAXPATHLEN];
+    char buf[1024];
+
+    exit_code = 0;
+    message = "";
+
+    sprintf(path, "shared/%s", vm.completion_trigger_file.c_str());
+    FILE* f = fopen(path, "r");
+    if (f) {
+        if (fgets(buf, 1024, f) != NULL) {
+            exit_code = atoi(buf) != 0;
+        }
+        if (fgets(buf, 1024, f) != NULL) {
+            is_notice = atoi(buf) != 0;
+        }
+        while (fgets(buf, 1024, f) != NULL) {
+            message += buf;
+        }
+        fclose(f);
+    }
+}
+
+bool temporary_exit_file_exists(VBOX_VM& vm) {
+    char path[MAXPATHLEN];
+    sprintf(path, "shared/%s", vm.temporary_exit_trigger_file.c_str());
+    if (vm.temporary_exit_trigger_file.size() && boinc_file_exists(path)) return true;
+    return false;
+}
+
+void read_temporary_exit_file_info(int& temp_delay, bool& is_notice, string& message, VBOX_VM& vm) {
+    char path[MAXPATHLEN];
+    char buf[1024];
+
+    temp_delay = 0;
+    message = "";
+
+    sprintf(path, "shared/%s", vm.temporary_exit_trigger_file.c_str());
+    FILE* f = fopen(path, "r");
+    if (f) {
+        if (fgets(buf, 1024, f) != NULL) {
+            temp_delay = atoi(buf);
+        }
+        if (fgets(buf, 1024, f) != NULL) {
+            is_notice = atoi(buf) != 0;
+        }
+        while (fgets(buf, 1024, f) != NULL) {
+            message += buf;
+        }
+        fclose(f);
+    }
+}
+
+void delete_temporary_exit_trigger_file(VBOX_VM& vm) {
+    char path[MAXPATHLEN];
+    sprintf(path, "shared/%s", vm.temporary_exit_trigger_file.c_str());
+    boinc_delete_file(path);
+}
+
 // set CPU and network throttling if needed
 //
 void set_throttles(APP_INIT_DATA& aid, VBOX_VM& vm) {
@@ -287,10 +237,7 @@ void set_floppy_image(APP_INIT_DATA& aid, VBOX_VM& vm) {
         if (!vm.enable_cern_dataformat) {
             retval = read_file_string(INIT_DATA_FILE, scratch);
             if (retval) {
-                fprintf(stderr,
-                    "%s can't write init_data.xml to floppy abstration device\n",
-                    vboxwrapper_msg_prefix(buf, sizeof(buf))
-                );
+                vboxlog_msg("WARNING: Cannot write init_data.xml to floppy abstration device");
             }
         } else {
             // Per: https://github.com/stig/json-framework/issues/48
@@ -316,77 +263,120 @@ void set_floppy_image(APP_INIT_DATA& aid, VBOX_VM& vm) {
     }
 }
 
-// set port forwarding information if needed
+// if there's a port for web graphics, tell the client about it
 //
-void set_port_forwarding_info(APP_INIT_DATA& /* aid */, VBOX_VM& vm) {
+void report_web_graphics_url(VBOX_VM& vm) {
     char buf[256];
-
-    if (vm.pf_guest_port && vm.pf_host_port) {
-        // Write info to disk
-        //
-        MIOFILE mf;
-        FILE* f = boinc_fopen(PORTFORWARD_FILENAME, "w");
-        mf.init_file(f);
-
-        mf.printf(
-            "<port_forwarding>\n"
-            "  <rule>\n"
-            "    <host_port>%d</host_port>\n"
-            "    <guest_port>%d</guest_port>\n"
-            "  </rule>\n"
-            "</port_forwarding>\n",
-            vm.pf_host_port,
-            vm.pf_guest_port
-        );
-
-        fclose(f);
-
+    if (vm.pf_host_port && !boinc_file_exists("graphics_app")) {
         sprintf(buf, "http://localhost:%d", vm.pf_host_port);
+        vboxlog_msg("Detected: Web Application Enabled (%s)", buf);
         boinc_web_graphics_url(buf);
     }
 }
 
 // set remote desktop information if needed
 //
-void set_remote_desktop_info(APP_INIT_DATA& /* aid */, VBOX_VM& vm) {
+void report_remote_desktop_info(VBOX_VM& vm) {
     char buf[256];
-
     if (vm.rd_host_port) {
-        // Write info to disk
-        //
-        MIOFILE mf;
-        FILE* f = boinc_fopen(REMOTEDESKTOP_FILENAME, "w");
-        mf.init_file(f);
-
-        mf.printf(
-            "<remote_desktop>\n"
-            "  <host_port>%d</host_port>\n"
-            "</remote_desktop>\n",
-            vm.rd_host_port
-        );
-
-        fclose(f);
-
         sprintf(buf, "localhost:%d", vm.rd_host_port);
+        vboxlog_msg("Detected: Remote Desktop Enabled (%s)", buf);
         boinc_remote_desktop_addr(buf);
     }
 }
 
-int main(int argc, char** argv) {
+// check for trickle trigger files, and send trickles if find them.
+//
+void check_trickle_triggers(VBOX_VM& vm) {
+    int retval;
+    char filename[256], path[MAXPATHLEN];
+    std::string text;
+    for (unsigned int i=0; i<vm.trickle_trigger_files.size(); i++) {
+        strcpy(filename, vm.trickle_trigger_files[i].c_str());
+        sprintf(path, "shared/%s", filename);
+        if (!boinc_file_exists(path)) continue;
+        vboxlog_msg("Reporting a trickle. (%s)", filename);
+        retval = read_file_string(path, text);
+        if (retval) {
+            vboxlog_msg("ERROR: can't read trickle trigger file %s", filename);
+        } else {
+            retval = boinc_send_trickle_up(
+                filename, const_cast<char*>(text.c_str())
+            );
+            if (retval) {
+                vboxlog_msg("boinc_send_trickle_up() failed: %s (%d)", boincerror(retval), retval);
+            }
+        }
+        boinc_delete_file(path);
+    }
+}
+
+// check for intermediate upload files, and send them if found.
+//
+void check_intermediate_uploads(VBOX_VM& vm) {
     int retval;
-    int loop_iteraction = 0;
+    char filename[256], path[MAXPATHLEN];
+    for (unsigned int i=0; i<vm.intermediate_upload_files.size(); i++) {
+        strcpy(filename, vm.intermediate_upload_files[i].file.c_str());
+        sprintf(path, "shared/%s", filename);
+        if (!boinc_file_exists(path)) continue;
+        if (!vm.intermediate_upload_files[i].reported && !vm.intermediate_upload_files[i].ignore) {
+            vboxlog_msg("Reporting an intermediate file. (%s)", vm.intermediate_upload_files[i].file.c_str());
+            retval = boinc_upload_file(vm.intermediate_upload_files[i].file);
+            if (retval) {
+                vboxlog_msg("boinc_upload_file() failed: %s", boincerror(retval));
+                vm.intermediate_upload_files[i].ignore = true;
+            } else {
+                vm.intermediate_upload_files[i].reported = true;
+            }
+        } else if (vm.intermediate_upload_files[i].reported && !vm.intermediate_upload_files[i].ignore) {
+            retval = boinc_upload_status(vm.intermediate_upload_files[i].file);
+            if (!retval) {
+                vboxlog_msg("Intermediate file uploaded. (%s)", vm.intermediate_upload_files[i].file.c_str());
+                vm.intermediate_upload_files[i].ignore = true;
+            }
+        }
+    }
+}
+
+// see if it's time to send trickle-up reporting elapsed time
+//
+void check_trickle_period(double& elapsed_time, double& trickle_period) {
+    char buf[256];
+    static double last_trickle_report_time = 0;
+
+    if ((elapsed_time - last_trickle_report_time) < trickle_period) {
+        return;
+    }
+    last_trickle_report_time = elapsed_time;
+    vboxlog_msg("Status Report: Trickle-Up Event.");
+    sprintf(buf,
+        "<cpu_time>%f</cpu_time>", last_trickle_report_time
+    );
+    int retval = boinc_send_trickle_up(
+        const_cast<char*>("cpu_time"), buf
+    );
+    if (retval) {
+        vboxlog_msg("Sending Trickle-Up Event failed (%d).", retval);
+    }
+}
+
+int main(int argc, char** argv) {
+    int retval = 0;
+    int loop_iteration = 0;
     BOINC_OPTIONS boinc_options;
-    VBOX_VM vm;
     APP_INIT_DATA aid;
+    VBOX_VM* pVM = NULL;
+    VBOX_CHECKPOINT checkpoint;
     double random_checkpoint_factor = 0;
     double elapsed_time = 0;
-    double trickle_period = 0;
     double fraction_done = 0;
+    double trickle_period = 0;
     double current_cpu_time = 0;
     double starting_cpu_time = 0;
-    double last_checkpoint_time = 0;
+    double last_checkpoint_cpu_time = 0;
+    double last_checkpoint_elapsed_time = 0;
     double last_status_report_time = 0;
-    double last_trickle_report_time = 0;
     double stopwatch_starttime = 0;
     double stopwatch_endtime = 0;
     double stopwatch_elapsedtime = 0;
@@ -394,57 +384,103 @@ int main(int argc, char** argv) {
     double bytes_sent = 0;
     double bytes_received = 0;
     double ncpus = 0;
+    double memory_size_mb = 0;
     double timeout = 0.0;
     bool report_net_usage = false;
     double net_usage_timer = 600;
 	int vm_image = 0;
     unsigned long vm_exit_code = 0;
+    bool is_notice = false;
+    int temp_delay = 86400;
     string message;
-    vector<string> copy_to_shared;
     char buf[256];
 
 
-    for (int i=1; i<argc; i++) {
-        if (!strcmp(argv[i], "--trickle")) {
-            trickle_period = atof(argv[++i]);
-        }
-        if (!strcmp(argv[i], "--nthreads")) {
-            ncpus = atof(argv[++i]);
-        }
-        if (!strcmp(argv[i], "--vmimage")) {
-            vm_image = atoi(argv[++i]);
-        }
-        if (!strcmp(argv[i], "--register_only")) {
-            vm.register_only = true;
-        }
-    }
+    // Initialize diagnostics system
+    //
+    boinc_init_diagnostics(BOINC_DIAG_DEFAULTS);
 
+    // Configure BOINC Runtime System environment
+    //
     memset(&boinc_options, 0, sizeof(boinc_options));
     boinc_options.main_program = true;
     boinc_options.check_heartbeat = true;
     boinc_options.handle_process_control = true;
-    if (trickle_period > 0.0) {
-        boinc_options.handle_trickle_ups = true;
-    }
     boinc_init_options(&boinc_options);
 
+    // Log banner
+    //
+    vboxlog_msg("vboxwrapper (%d.%d.%d): starting", BOINC_MAJOR_VERSION, BOINC_MINOR_VERSION, VBOXWRAPPER_RELEASE);
+
+    // Initialize system services
+    // 
+#ifdef _WIN32
+    CoInitialize(NULL);
+#ifdef USE_WINSOCK
+    WSADATA wsdata;
+    retval = WSAStartup( MAKEWORD( 1, 1 ), &wsdata);
+    if (retval) {
+        vboxlog_msg("ERROR: Cannot initialize winsock: %d", retval);
+        boinc_finish(retval);
+    }
+#endif
+#endif
+
     // Prepare environment for detecting system conditions
     //
-    boinc_get_init_data_p(&aid);
+    boinc_parse_init_data_file();
+    boinc_get_init_data(aid);
 
-    // Log banner
+#ifdef _WIN32
+    // Determine what version of VirtualBox we are using via the registry. Use a
+    // namespace specific version of the function because VirtualBox has been known
+    // to change the registry location from time to time.
     //
-    fprintf(
-        stderr,
-        "%s vboxwrapper (%d.%d.%d): starting\n",
-        vboxwrapper_msg_prefix(buf, sizeof(buf)),
-        BOINC_MAJOR_VERSION,
-        BOINC_MINOR_VERSION,
-        VBOXWRAPPER_RELEASE
-    );
+    // NOTE: We cannot use COM to automatically detect which interfaces are installed
+    //       on the machine because it will attempt to launch the 'vboxsvc' process
+    //       without out environment variable changes and muck everything up.
+    //
+    string vbox_version;
+    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 (!vbox_version.empty()) {
+        sscanf(vbox_version.c_str(), "%d.%d", &vbox_major, &vbox_minor);
+        if ((4 == vbox_major) && (2 == vbox_minor)) {
+            pVM = (VBOX_VM*) new vbox42::VBOX_VM();
+        }
+        if ((4 == vbox_major) && (3 == vbox_minor)) {
+            pVM = (VBOX_VM*) new vbox43::VBOX_VM();
+        }
+    }
+    if (!pVM) {
+        pVM = (VBOX_VM*) new vboxmanage::VBOX_VM();
+    }
+#else
+    pVM = (VBOX_VM*) new vboxmanage::VBOX_VM();
+#endif
 
-    // Log important information
+    // Parse command line parameters
     //
+    for (int i=1; i<argc; i++) {
+        if (!strcmp(argv[i], "--trickle")) {
+            trickle_period = atof(argv[++i]);
+        }
+        if (!strcmp(argv[i], "--ncpus")) {
+            ncpus = atof(argv[++i]);
+        }
+        if (!strcmp(argv[i], "--memory_size_mb")) {
+            memory_size_mb = atof(argv[++i]);
+        }
+        if (!strcmp(argv[i], "--vmimage")) {
+            vm_image = atoi(argv[++i]);
+        }
+        if (!strcmp(argv[i], "--register_only")) {
+            pVM->register_only = true;
+        }
+    }
 
     // Choose a random interleave value for checkpoint intervals to stagger disk I/O.
     // 
@@ -455,117 +491,61 @@ int main(int argc, char** argv) {
         srand((int)(vm_image_stat.st_mtime * time(NULL)));
     }
     random_checkpoint_factor = (double)(((int)(drand() * 100000.0)) % 600);
-    fprintf(
-        stderr,
-        "%s Feature: Checkpoint interval offset (%d seconds)\n",
-        vboxwrapper_msg_prefix(buf, sizeof(buf)),
-        (int)random_checkpoint_factor
-    );
+    vboxlog_msg("Feature: Checkpoint interval offset (%d seconds)", (int)random_checkpoint_factor);
 
     // Display trickle value if specified
     //
     if (trickle_period > 0.0) {
-        fprintf(
-            stderr,
-            "%s Feature: Enabling trickle-ups (Interval: %f)\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf)), trickle_period
-        );
-    }
-
-    // Initialize system services
-    // 
-#if defined(_WIN32) && defined(USE_WINSOCK)
-    WSADATA wsdata;
-    retval = WSAStartup( MAKEWORD( 1, 1 ), &wsdata);
-    if (retval) {
-        fprintf(
-            stderr,
-            "%s can't initialize winsock: %d\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf)),
-            retval
-        );
-        boinc_finish(retval);
+        vboxlog_msg("Feature: Enabling trickle-ups (Interval: %f)", trickle_period);
     }
-#endif
 
     // Check for architecture incompatibilities
     // 
 #if defined(_WIN32) && defined(_M_IX86)
     if (strstr(aid.host_info.os_version, "x64")) {
-        fprintf(
-            stderr,
-            "%s 64-bit version of BOINC is required, please upgrade. Rescheduling execution for a later date.\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf))
-        );
+        vboxlog_msg("64-bit version of BOINC is required, please upgrade. Rescheduling execution for a later date.");
         boinc_temporary_exit(86400, "Architecture incompatibility detected.");
     }
 #endif
 
     // Initialize VM Hypervisor
     //
-    retval = vm.initialize();
+    retval = pVM->initialize();
     if (retval) {
-        fprintf(
-            stderr,
-            "%s Could not detect VM Hypervisor. Rescheduling execution for a later date.\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf))
-        );
+        vboxlog_msg("Could not detect VM Hypervisor. Rescheduling execution for a later date.");
         boinc_temporary_exit(86400, "Detection of VM Hypervisor failed.");
     }
 
     // Record what version of VirtualBox was used.
     // 
-    if (!vm.virtualbox_version.empty()) {
-        fprintf(
-            stderr,
-            "%s Detected: VirtualBox %s\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf)),
-            vm.virtualbox_version.c_str()
-        );
+    if (!pVM->virtualbox_version.empty()) {
+        vboxlog_msg("Detected: %s", pVM->virtualbox_version.c_str());
     }
 
     // Record if anonymous platform was used.
     // 
     if (boinc_file_exists((std::string(aid.project_dir) + std::string("/app_info.xml")).c_str())) {
-        fprintf(
-            stderr,
-            "%s Detected: Anonymous Platform Enabled\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf))
-        );
+        vboxlog_msg("Detected: Anonymous Platform Enabled");
     }
 
     // Record if the sandboxed configuration is going to be used.
     //
     if (aid.using_sandbox) {
-        fprintf(
-            stderr,
-            "%s Detected: Sandbox Configuration Enabled\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf))
-        );
+        vboxlog_msg("Detected: Sandbox Configuration Enabled");
     }
 
     // Record which mode VirtualBox should be started in.
     //
     if (aid.vbox_window || boinc_is_standalone()) {
-        fprintf(
-            stderr,
-            "%s Detected: Headless Mode Disabled\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf))
-        );
-        vm.headless = false;
+        vboxlog_msg("Detected: Headless Mode Disabled");
+        pVM->headless = false;
     }
 
     // Check for invalid confgiurations.
     //
     if (aid.using_sandbox && aid.vbox_window) {
-        vboxwrapper_msg_prefix(buf, sizeof(buf));
-        fprintf(
-            stderr,
-            "%s Invalid configuration detected.\n"
-            "%s NOTE: BOINC cannot be installed as a service and run VirtualBox in headfull mode at the same time.\n",
-            buf,
-            buf
-        );
+        vboxlog_msg("Invalid configuration detected.");
+        vboxlog_msg("NOTE: BOINC cannot be installed as a service and run VirtualBox in headfull mode at the same time.");
         boinc_temporary_exit(86400, "Incompatible configuration detected.");
     }
 
@@ -573,14 +553,10 @@ int main(int argc, char** argv) {
     // VirtualBox 4.2.6 crashes during snapshot operations
     // and 4.2.18 fails to restore from snapshots properly.
     //
-    if ((vm.virtualbox_version.find("4.2.6") != std::string::npos) || 
-        (vm.virtualbox_version.find("4.2.18") != std::string::npos) || 
-        (vm.virtualbox_version.find("4.3.0") != std::string::npos) ) {
-        fprintf(
-            stderr,
-            "%s Incompatible version of VirtualBox detected. Please upgrade to a later version.\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf))
-        );
+    if ((pVM->virtualbox_version.find("4.2.6") != std::string::npos) || 
+        (pVM->virtualbox_version.find("4.2.18") != std::string::npos) || 
+        (pVM->virtualbox_version.find("4.3.0") != std::string::npos) ) {
+        vboxlog_msg("Incompatible version of VirtualBox detected. Please upgrade to a later version.");
         boinc_temporary_exit(86400,
             "Incompatible version of VirtualBox detected; please upgrade.",
             true
@@ -591,79 +567,49 @@ int main(int argc, char** argv) {
     // VirtualBox successfully.  Sometimes the system is in a wierd state after a
     // reboot and the system needs a little bit of time.
     //
-    if (!vm.is_system_ready(message)) {
-        fprintf(
-            stderr,
-            "%s Could not communicate with VM Hypervisor. Rescheduling execution for a later date.\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf))
-        );
+    if (!pVM->is_system_ready(message)) {
+        vboxlog_msg("Could not communicate with VM Hypervisor. Rescheduling execution for a later date.");
         boinc_temporary_exit(86400, message.c_str());
     }
 
     // Parse Job File
     //
-    retval = parse_job_file(vm, copy_to_shared);
+    retval = pVM->parse();
     if (retval) {
-        fprintf(
-            stderr,
-            "%s can't parse job file: %d\n",
-            vboxwrapper_msg_prefix(buf, sizeof(buf)),
-            retval
-        );
+        vboxlog_msg("ERROR: Cannot parse job file: %d", retval);
         boinc_finish(retval);
     }
 
-    // Record which mode VirtualBox should be started in.
+    // Record what the minimum checkpoint interval is.
     //
-    fprintf(
-        stderr,
-        "%s Detected: Minimum checkpoint interval (%f seconds)\n",
-        vboxwrapper_msg_prefix(buf, sizeof(buf)),
-        vm.minimum_checkpoint_interval
-    );
+    vboxlog_msg("Detected: Minimum checkpoint interval (%f seconds)", pVM->minimum_checkpoint_interval);
 
     // Validate whatever configuration options we can
     //
-    if (vm.enable_shared_directory) {
+    if (pVM->enable_shared_directory) {
         if (boinc_file_exists("shared")) {
             if (!is_dir("shared")) {
-                fprintf(
-                    stderr,
-                    "%s 'shared' exists but is not a directory.\n",
-                    vboxwrapper_msg_prefix(buf, sizeof(buf))
-                );
+                vboxlog_msg("ERROR: 'shared' exists but is not a directory.");
             }
         } else {
             retval = boinc_mkdir("shared");
             if (retval) {
-                fprintf(stderr,
-                    "%s couldn't created shared directory: %s.\n",
-                    vboxwrapper_msg_prefix(buf, sizeof(buf)),
-                    boincerror(retval)
-                );
+                vboxlog_msg("ERROR: couldn't created shared directory: %s.", boincerror(retval));
             }
         }
     }
 
     // Copy files to the shared directory
     //
-    if (vm.enable_shared_directory && copy_to_shared.size()) {
-        for (vector<string>::iterator iter = copy_to_shared.begin(); iter != copy_to_shared.end(); iter++) {
+    if (pVM->enable_shared_directory && pVM->copy_to_shared.size()) {
+        for (vector<string>::iterator iter = pVM->copy_to_shared.begin(); iter != pVM->copy_to_shared.end(); ++iter) {
             string source = *iter;
             string destination = string("shared/") + *iter;
             if (!boinc_file_exists(destination.c_str())) {
                 if (!boinc_copy(source.c_str(), destination.c_str())) {
-                    fprintf(stderr,
-                        "%s successfully copied '%s' to the shared directory.\n",
-                        vboxwrapper_msg_prefix(buf, sizeof(buf)),
-                        source.c_str()
-                    );
+                    vboxlog_msg("Successfully copied '%s' to the shared directory.", source.c_str());
                 } else {
-                    fprintf(stderr,
-                        "%s failed to copy '%s' to the shared directory.\n",
-                        vboxwrapper_msg_prefix(buf, sizeof(buf)),
-                        source.c_str()
-                    );
+                    vboxlog_msg("Failed to copy '%s' to the shared directory.", source.c_str());
                 }
             }
         }
@@ -671,70 +617,86 @@ int main(int argc, char** argv) {
 
     // Configure Instance specific VM Parameters
     //
-    vm.vm_master_name = "boinc_";
-    vm.image_filename = IMAGE_FILENAME_COMPLETE;
+    pVM->vm_master_name = "boinc_";
+    pVM->image_filename = IMAGE_FILENAME_COMPLETE;
     if (boinc_is_standalone()) {
-        vm.vm_master_name += "standalone";
-        vm.vm_master_description = "standalone";
-        if (vm.enable_floppyio) {
+        pVM->vm_master_name += "standalone";
+        pVM->vm_master_description = "standalone";
+        if (pVM->enable_floppyio) {
             sprintf(buf, "%s.%s",
                 FLOPPY_IMAGE_FILENAME, FLOPPY_IMAGE_FILENAME_EXTENSION
             );
-            vm.floppy_image_filename = buf;
+            pVM->floppy_image_filename = buf;
         }
     } else {
-        vm.vm_master_name += md5_string(std::string(aid.result_name)).substr(0, 16);
-        vm.vm_master_description = aid.result_name;
+        pVM->vm_master_name += md5_string(std::string(aid.result_name)).substr(0, 16);
+        pVM->vm_master_description = aid.result_name;
 		if (vm_image) {
             sprintf(buf, "%s_%d.%s",
                 IMAGE_FILENAME, vm_image, IMAGE_FILENAME_EXTENSION
             );
-            vm.image_filename = buf;
+            pVM->image_filename = buf;
 		}
-        if (vm.enable_floppyio) {
+        if (pVM->enable_floppyio) {
             sprintf(buf, "%s_%d.%s",
                 FLOPPY_IMAGE_FILENAME, aid.slot,
                 FLOPPY_IMAGE_FILENAME_EXTENSION
             );
-            vm.floppy_image_filename = buf;
+            pVM->floppy_image_filename = buf;
         }
     }
+    if (pVM->enable_cache_disk) {
+        pVM->cache_disk_filename = CACHE_DISK_FILENAME;
+    }
+    if (pVM->enable_isocontextualization) {
+        pVM->iso_image_filename = ISO_IMAGE_FILENAME;
+    }
     if (aid.ncpus > 1.0 || ncpus > 1.0) {
         if (ncpus) {
             sprintf(buf, "%d", (int)ceil(ncpus));
         } else {
             sprintf(buf, "%d", (int)ceil(aid.ncpus));
         }
-        vm.vm_cpu_count = buf;
+        pVM->vm_cpu_count = buf;
     } else {
-        vm.vm_cpu_count = "1";
+        pVM->vm_cpu_count = "1";
+    }
+    if (pVM->memory_size_mb > 1.0 || memory_size_mb > 1.0) {
+        if (memory_size_mb) {
+            sprintf(buf, "%d", (int)ceil(memory_size_mb));
+        } else {
+            sprintf(buf, "%d", (int)ceil(pVM->memory_size_mb));
+        }
     }
-
     if (aid.vbox_window && !aid.using_sandbox) {
-        vm.headless = false;
+        pVM->headless = false;
     }
 
     // Restore from checkpoint
     //
-    read_checkpoint(elapsed_time, current_cpu_time, vm);
+    checkpoint.parse();
+    elapsed_time = checkpoint.elapsed_time;
+    current_cpu_time = checkpoint.cpu_time;
+    pVM->pf_host_port = checkpoint.webapi_port;
+    pVM->rd_host_port = checkpoint.remote_desktop_port;
+    last_checkpoint_elapsed_time = elapsed_time;
     starting_cpu_time = current_cpu_time;
-    last_checkpoint_time = current_cpu_time;
+    last_checkpoint_cpu_time = current_cpu_time;
 
     // Should we even try to start things up?
     //
-    if (vm.job_duration && (elapsed_time > vm.job_duration)) {
+    if (pVM->job_duration && (elapsed_time > pVM->job_duration)) {
         return EXIT_TIME_LIMIT_EXCEEDED;
     }
 
-    retval = vm.run((current_cpu_time > 0));
+    retval = pVM->run(current_cpu_time > 0);
     if (retval) {
         // All 'failure to start' errors are unrecoverable by default
         bool   unrecoverable_error = true;
         bool   skip_cleanup = false;
-        bool   dump_hypervisor_logs = false;
+        bool   do_dump_hypervisor_logs = false;
         string error_reason;
         const char*  temp_reason = "";
-        int    temp_delay = 86400;
 
         if (VBOXWRAPPER_ERR_RECOVERABLE == retval) {
             error_reason =
@@ -759,7 +721,14 @@ int main(int argc, char** argv) {
                 "    operation and this job cannot be recovered.\n";
             skip_cleanup = true;
             retval = ERR_EXEC;
-        } else if (vm.is_logged_failure_vm_extensions_disabled()) {
+        } else if (retval == (int)VBOX_E_INVALID_OBJECT_STATE) {
+            error_reason =
+                "   NOTE: VM session lock error encountered.\n"
+                "    BOINC will be notified that it needs to clean up the environment.\n"
+                "    This might be a temporary problem and so this job will be rescheduled for another time.\n";
+            unrecoverable_error = false;
+            temp_reason = "VM environment needed to be cleaned up.";
+        } else if (pVM->is_logged_failure_vm_extensions_disabled()) {
             error_reason =
                 "   NOTE: BOINC has detected that your computer's processor supports hardware acceleration for\n"
                 "    virtual machines but the hypervisor failed to successfully launch with this feature enabled.\n"
@@ -770,54 +739,42 @@ int main(int argc, char** argv) {
                 "    More information can be found here: http://en.wikipedia.org/wiki/X86_virtualization\n"
                 "    Error Code: ERR_CPU_VM_EXTENSIONS_DISABLED\n";
             retval = ERR_EXEC;
-        } else if (vm.is_logged_failure_vm_extensions_not_supported()) {
+        } else if (pVM->is_logged_failure_vm_extensions_not_supported()) {
             error_reason =
                 "   NOTE: VirtualBox has reported an improperly configured virtual machine. It was configured to require\n"
                 "    hardware acceleration for virtual machines, but your processor does not support the required feature.\n"
                 "    Please report this issue to the project so that it can be addresssed.\n";
-        } else if (vm.is_logged_failure_vm_extensions_in_use()) {
+        } else if (pVM->is_logged_failure_vm_extensions_in_use()) {
             error_reason =
                 "   NOTE: VirtualBox hypervisor reports that another hypervisor has locked the hardware acceleration\n"
                 "    for virtual machines feature in exclusive mode.\n";
             unrecoverable_error = false;
             temp_reason = "Forign VM Hypervisor locked hardware acceleration features.";
             temp_delay = 86400;
-        } else if (vm.is_logged_failure_host_out_of_memory()) {
+        } else if (pVM->is_logged_failure_host_out_of_memory()) {
             error_reason =
                 "   NOTE: VirtualBox has failed to allocate enough memory to start the configured virtual machine.\n"
                 "    This might be a temporary problem and so this job will be rescheduled for another time.\n";
             unrecoverable_error = false;
             temp_reason = "VM Hypervisor was unable to allocate enough memory to start VM.";
-        } else if (vm.is_virtualbox_error_recoverable(retval)) {
-            error_reason =
-                "   NOTE: VM session lock error encountered.\n"
-                "    BOINC will be notified that it needs to clean up the environment.\n"
-                "    This might be a temporary problem and so this job will be rescheduled for another time.\n";
-            unrecoverable_error = false;
-            temp_reason = "VM environment needed to be cleaned up.";
         } else {
-            dump_hypervisor_logs = true;
+            do_dump_hypervisor_logs = true;
         }
 
         if (unrecoverable_error) {
             // Attempt to cleanup the VM and exit.
             if (!skip_cleanup) {
-                vm.cleanup();
+                pVM->cleanup();
             }
-            write_checkpoint(elapsed_time, current_cpu_time, vm);
+
+            checkpoint.update(elapsed_time, current_cpu_time);
 
             if (error_reason.size()) {
-                fprintf(
-                    stderr,
-                    "%s\n"
-                    "%s",
-                    vboxwrapper_msg_prefix(buf, sizeof(buf)),
-                    error_reason.c_str()
-                );
+                vboxlog_msg("\n%s", error_reason.c_str());
             }
 
-            if (dump_hypervisor_logs) {
-                vm.dumphypervisorlogs(true);
+            if (do_dump_hypervisor_logs) {
+                pVM->dump_hypervisor_logs(true);
             }
 
             boinc_finish(retval);
@@ -825,12 +782,12 @@ int main(int argc, char** argv) {
             // if the VM is already running notify BOINC about the process ID so it can
             // clean up the environment.  We should be safe to run after that.
             //
-            if (vm.vm_pid) {
+            if (pVM->vm_pid) {
                 retval = boinc_report_app_status_aux(
                     current_cpu_time,
-                    last_checkpoint_time,
+                    last_checkpoint_cpu_time,
                     fraction_done,
-                    vm.vm_pid,
+                    pVM->vm_pid,
                     bytes_sent,
                     bytes_received
                 );
@@ -841,13 +798,7 @@ int main(int argc, char** argv) {
             boinc_sleep(5.0);
 
             if (error_reason.size()) {
-                fprintf(
-                    stderr,
-                    "%s\n"
-                    "%s",
-                    vboxwrapper_msg_prefix(buf, sizeof(buf)),
-                    error_reason.c_str()
-                );
+                vboxlog_msg("\n%s", error_reason.c_str());
             }
 
             // Exit and let BOINC clean up the rest.
@@ -858,17 +809,12 @@ int main(int argc, char** argv) {
 
     // Report the VM pid to BOINC so BOINC can deal with it when needed.
     //
-    vboxwrapper_msg_prefix(buf, sizeof(buf));
-    fprintf(
-        stderr,
-        "%s Reporting VM Process ID to BOINC.\n",
-        buf
-    );
+    vboxlog_msg("Reporting VM Process ID to BOINC.");
     retval = boinc_report_app_status_aux(
         current_cpu_time,
-        last_checkpoint_time,
+        last_checkpoint_cpu_time,
         fraction_done,
-        vm.vm_pid,
+        pVM->vm_pid,
         bytes_sent,
         bytes_received
     );
@@ -881,39 +827,36 @@ int main(int argc, char** argv) {
     //
     timeout = dtime() + 300;
     do {
-        vm.poll(false);
-        if (vm.online && !vm.restoring) break;
+        pVM->poll(false);
+        if (pVM->online && !pVM->restoring) break;
         boinc_sleep(1.0);
     } while (timeout >= dtime());
 
     // Lower the VM process priority after it has successfully brought itself online.
     //
-    vm.lower_vm_process_priority();
+    pVM->lower_vm_process_priority();
 
     // Log our current state 
-    vm.poll(true);
+    pVM->poll(true);
 
     // Did we timeout?
-    if (timeout <= dtime()) {
-        vboxwrapper_msg_prefix(buf, sizeof(buf));
-        fprintf(
-            stderr,
-            "%s NOTE: VM failed to enter an online state within the timeout period.\n"
-            "%s   This might be a temporary problem and so this job will be rescheduled for another time.\n",
-            buf,
-            buf
-        );
-        vm.reset_vm_process_priority();
-        vm.poweroff();
+    if (!pVM->online && (timeout <= dtime())) {
+        vboxlog_msg("NOTE: VM failed to enter an online state within the timeout period.");
+        vboxlog_msg("  This might be a temporary problem and so this job will be rescheduled for another time.");
+        pVM->reset_vm_process_priority();
+        pVM->poweroff();
+        pVM->dump_hypervisor_logs(true);
         boinc_temporary_exit(86400,
             "VM Hypervisor failed to enter an online state in a timely fashion."
         );
     }
 
-    set_floppy_image(aid, vm);
-    set_port_forwarding_info(aid, vm);
-    set_remote_desktop_info(aid, vm);
-    write_checkpoint(elapsed_time, current_cpu_time, vm);
+    set_floppy_image(aid, *pVM);
+    report_web_graphics_url(*pVM);
+    report_remote_desktop_info(*pVM);
+    checkpoint.webapi_port = pVM->pf_host_port;
+    checkpoint.remote_desktop_port = pVM->rd_host_port;
+    checkpoint.update(elapsed_time, current_cpu_time);
 
     // Force throttling on our first pass through the loop
     boinc_status.reread_init_data_file = true;
@@ -921,252 +864,226 @@ int main(int argc, char** argv) {
     while (1) {
         // Begin stopwatch timer
         stopwatch_starttime = dtime();
-        loop_iteraction += 1;
+        loop_iteration += 1;
 
         // Discover the VM's current state
-        vm.poll();
+        retval = pVM->poll();
+        if (retval) {
+            vboxlog_msg("ERROR: Vboxwrapper lost communication with VirtualBox, rescheduling task for a later time.");
+            pVM->reset_vm_process_priority();
+            pVM->poweroff();
+            boinc_temporary_exit(86400, "VM job unmanageable, restarting later.");
+        }
+
+        // Write updates for the graphics application's use
+        if (pVM->enable_graphics_support) {
+            boinc_write_graphics_status(current_cpu_time, elapsed_time, fraction_done);
+        }
 
         if (boinc_status.no_heartbeat || boinc_status.quit_request) {
-            vm.reset_vm_process_priority();
-            vm.poweroff();
+            pVM->reset_vm_process_priority();
+            if (pVM->enable_vm_savestate_usage) {
+                retval = pVM->create_snapshot(elapsed_time);
+                if (!retval) {
+                    checkpoint.update(elapsed_time, current_cpu_time);
+                    boinc_checkpoint_completed();
+                }
+                pVM->stop();
+            } else {
+                pVM->poweroff();
+            }
             boinc_temporary_exit(86400);
         }
         if (boinc_status.abort_request) {
-            vm.reset_vm_process_priority();
-            vm.cleanup();
-            vm.dumphypervisorlogs(true);
+            pVM->reset_vm_process_priority();
+            pVM->cleanup();
+            pVM->dump_hypervisor_logs(true);
             boinc_finish(EXIT_ABORTED_BY_CLIENT);
         }
-        if (!vm.online) {
+        if (completion_file_exists(*pVM)) {
+            vboxlog_msg("VM Completion File Detected.");
+            read_completion_file_info(vm_exit_code, is_notice, message, *pVM);
+            if (message.size()) {
+                vboxlog_msg("VM Completion Message: %s.", message.c_str());
+            }
+            pVM->reset_vm_process_priority();
+            pVM->cleanup();
+            if (is_notice) {
+                boinc_finish_message(vm_exit_code, message.c_str(), is_notice);
+            } else {
+                boinc_finish(vm_exit_code);
+            }
+        }
+        if (temporary_exit_file_exists(*pVM)) {
+            vboxlog_msg("VM Temporary Exit File Detected.");
+            read_temporary_exit_file_info(temp_delay, is_notice, message, *pVM);
+            if (message.size()) {
+                vboxlog_msg("VM Temporary Exit Message: %s.", message.c_str());
+            }
+            delete_temporary_exit_trigger_file(*pVM);
+            pVM->reset_vm_process_priority();
+            retval = pVM->create_snapshot(elapsed_time);
+            if (!retval) {
+                checkpoint.update(elapsed_time, current_cpu_time);
+                boinc_checkpoint_completed();
+            }
+            pVM->poweroff();
+            if (is_notice) {
+                boinc_temporary_exit(temp_delay, message.c_str(), is_notice);
+            } else {
+                boinc_temporary_exit(temp_delay);
+            }
+        }
+        if (!pVM->online) {
             // Is this a type of event we can recover from?
-            if (vm.is_logged_failure_host_out_of_memory()) {
-                vboxwrapper_msg_prefix(buf, sizeof(buf));
-                fprintf(
-                    stderr,
-                    "%s NOTE: VirtualBox has failed to allocate enough memory to continue.\n"
-                    "%s   This might be a temporary problem and so this job will be rescheduled for another time.\n",
-                    buf,
-                    buf
-                );
-                vm.reset_vm_process_priority();
-                vm.poweroff();
+            if (pVM->is_logged_failure_host_out_of_memory()) {
+                vboxlog_msg("NOTE: VirtualBox has failed to allocate enough memory to continue.");
+                vboxlog_msg("  This might be a temporary problem and so this job will be rescheduled for another time.");
+                pVM->reset_vm_process_priority();
+                pVM->poweroff();
                 boinc_temporary_exit(86400, "VM Hypervisor was unable to allocate enough memory.");
             } else {
-                vm.cleanup();
-                if (vm.crashed || (elapsed_time < vm.job_duration)) {
-                    fprintf(
-                        stderr,
-                        "%s VM Premature Shutdown Detected.\n",
-                        vboxwrapper_msg_prefix(buf, sizeof(buf))
-                    );
-                    vm.dumphypervisorlogs(true);
-                    vm.get_vm_exit_code(vm_exit_code);
+                pVM->cleanup();
+                if (pVM->crashed || (elapsed_time < pVM->job_duration)) {
+                    vboxlog_msg("VM Premature Shutdown Detected.");
+                    pVM->dump_hypervisor_logs(true);
+                    pVM->get_vm_exit_code(vm_exit_code);
                     if (vm_exit_code) {
                         boinc_finish(vm_exit_code);
                     } else {
                         boinc_finish(EXIT_ABORTED_BY_CLIENT);
                     }
                 } else {
-                    fprintf(
-                        stderr,
-                        "%s Virtual machine exited.\n",
-                        vboxwrapper_msg_prefix(buf, sizeof(buf))
-                    );
-                    vm.dumphypervisorlogs(false);
+                    vboxlog_msg("Virtual machine exited.");
+                    pVM->dump_hypervisor_logs(false);
                     boinc_finish(0);
                 }
             }
         } else {
             // Check to see if the guest VM has any log messages that indicate that we need need
             // to take action.
-            if (vm.is_logged_failure_guest_job_out_of_memory()) {
-                fprintf(
-                    stderr,
-                    "%s ERROR: VM reports there is not enough memory to finish the task.\n",
-                    vboxwrapper_msg_prefix(buf, sizeof(buf))
-                );
-                vm.reset_vm_process_priority();
-                vm.dumphypervisorlogs(true);
-                vm.poweroff();
+            if (pVM->is_logged_failure_guest_job_out_of_memory()) {
+                vboxlog_msg("ERROR: VM reports there is not enough memory to finish the task.");
+                pVM->reset_vm_process_priority();
+                pVM->dump_hypervisor_logs(true);
+                pVM->poweroff();
                 boinc_finish(EXIT_OUT_OF_MEMORY);
             }
         }
         if (boinc_status.suspended) {
-            if (!vm.suspended) {
-                retval = vm.pause();
-                if (retval && vm.is_virtualbox_error_recoverable(retval)) {
-                    fprintf(
-                        stderr,
-                        "%s ERROR: VM task failed to pause, rescheduling task for a later time.\n",
-                        vboxwrapper_msg_prefix(buf, sizeof(buf))
-                    );
-                    vm.poweroff();
+            if (!pVM->suspended) {
+                retval = pVM->pause();
+                if (retval && (VBOX_E_INVALID_OBJECT_STATE == retval)) {
+                    vboxlog_msg("ERROR: VM task failed to pause, rescheduling task for a later time.");
+                    pVM->poweroff();
                     boinc_temporary_exit(86400, "VM job unmanageable, restarting later.");
                }
             }
         } else {
-            if (vm.suspended) {
-                retval = vm.resume();
-                if (retval && vm.is_virtualbox_error_recoverable(retval)) {
-                    fprintf(
-                        stderr,
-                        "%s ERROR: VM task failed to resume, rescheduling task for a later time.\n",
-                        vboxwrapper_msg_prefix(buf, sizeof(buf))
-                    );
-                    vm.poweroff();
+            if (pVM->suspended) {
+                retval = pVM->resume();
+                if (retval && (VBOX_E_INVALID_OBJECT_STATE == retval)) {
+                    vboxlog_msg("ERROR: VM task failed to resume, rescheduling task for a later time.");
+                    pVM->poweroff();
                     boinc_temporary_exit(86400, "VM job unmanageable, restarting later.");
                }
             }
 
-            // Basic bookkeeping
+            // stuff to do every 10 secs (everything else is 1/sec)
             //
-            if ((loop_iteraction % 10) == 0) {
-                current_cpu_time = starting_cpu_time + vm.get_vm_cpu_time();
+            if ((loop_iteration % 10) == 0) {
+                current_cpu_time = starting_cpu_time + pVM->get_vm_cpu_time();
+                check_trickle_triggers(*pVM);
+                check_intermediate_uploads(*pVM);
             }
-            if (vm.job_duration) {
-                fraction_done = elapsed_time / vm.job_duration;
-            } else if (vm.fraction_done_filename.size() > 0) {
-                read_fraction_done(fraction_done, vm);
+
+            if (pVM->job_duration) {
+                fraction_done = elapsed_time / pVM->job_duration;
+            } else if (pVM->fraction_done_filename.size() > 0) {
+                read_fraction_done(fraction_done, *pVM);
             }
             if (fraction_done > 1.0) {
                 fraction_done = 1.0;
             }
             boinc_report_app_status(
                 current_cpu_time,
-                last_checkpoint_time,
+                last_checkpoint_cpu_time,
                 fraction_done
             );
 
-            // Dump a status report at regular intervals
+            // write status report to stderr at regular intervals
             //
             if ((elapsed_time - last_status_report_time) >= 6000.0) {
                 last_status_report_time = elapsed_time;
-                if (vm.job_duration) {
-                    fprintf(
-                        stderr,
-                        "%s Status Report: Job Duration: '%f'\n",
-                        vboxwrapper_msg_prefix(buf, sizeof(buf)),
-                        vm.job_duration
-                    );
+                if (pVM->job_duration) {
+                    vboxlog_msg("Status Report: Job Duration: '%f'", pVM->job_duration);
                 }
                 if (elapsed_time) {
-                    fprintf(
-                        stderr,
-                        "%s Status Report: Elapsed Time: '%f'\n",
-                        vboxwrapper_msg_prefix(buf, sizeof(buf)),
-                        elapsed_time
-                    );
+                    vboxlog_msg("Status Report: Elapsed Time: '%f'", elapsed_time);
                 }
-                fprintf(
-                    stderr,
-                    "%s Status Report: CPU Time: '%f'\n",
-                    vboxwrapper_msg_prefix(buf, sizeof(buf)),
-                    current_cpu_time
-                );
+                vboxlog_msg("Status Report: CPU Time: '%f'", current_cpu_time);
                 if (aid.global_prefs.daily_xfer_limit_mb) {
-                    fprintf(
-                        stderr,
-                        "%s Status Report: Network Bytes Sent (Total): '%f'\n",
-                        vboxwrapper_msg_prefix(buf, sizeof(buf)),
-                        bytes_sent
-                    );
-                    fprintf(
-                        stderr,
-                        "%s Status Report: Network Bytes Received (Total): '%f'\n",
-                        vboxwrapper_msg_prefix(buf, sizeof(buf)),
-                        bytes_received
-                    );
+                    vboxlog_msg("Status Report: Network Bytes Sent (Total): '%f'", bytes_sent);
+                    vboxlog_msg("Status Report: Network Bytes Received (Total): '%f'", bytes_received);
                 }
 
-                vm.dumphypervisorstatusreports();
+                pVM->dump_hypervisor_status_reports();
             }
 
             if (boinc_time_to_checkpoint()) {
                 // Only peform a VM checkpoint every ten minutes or so.
                 //
-                if (elapsed_time >= last_checkpoint_time + vm.minimum_checkpoint_interval + random_checkpoint_factor) {
+                if (elapsed_time >= last_checkpoint_elapsed_time + pVM->minimum_checkpoint_interval + random_checkpoint_factor) {
                     // Basic interleave factor is only needed once.
                     if (random_checkpoint_factor > 0) {
                         random_checkpoint_factor = 0.0;
                     }
 
                     // Checkpoint
-                    retval = vm.createsnapshot(elapsed_time);
+                    retval = pVM->create_snapshot(elapsed_time);
                     if (retval) {
                         // Let BOINC clean-up the environment which should release any file/mutex locks and then attempt
                         // to resume from a previous snapshot.
                         //
-                        fprintf(
-                            stderr,
-                            "%s ERROR: Checkpoint maintenance failed, rescheduling task for a later time. (%d)\n",
-                            vboxwrapper_msg_prefix(buf, sizeof(buf)),
-                            retval
-                        );
-                        vm.poweroff();
+                        vboxlog_msg("ERROR: Checkpoint maintenance failed, rescheduling task for a later time. (%d)", retval);
+                        pVM->poweroff();
                         boinc_temporary_exit(86400, "VM job unmanageable, restarting later.");
                     } else {
                         // tell BOINC we've successfully created a checkpoint.
                         //
-                        last_checkpoint_time = elapsed_time;
-                        write_checkpoint(elapsed_time, current_cpu_time, vm);
+                        checkpoint.update(elapsed_time, current_cpu_time);
+                        last_checkpoint_elapsed_time = elapsed_time;
+                        last_checkpoint_cpu_time = current_cpu_time;
                         boinc_checkpoint_completed();
                     }
                 }
             }
 
+            // send elapsed-time trickle message if needed
+            //
             if (trickle_period) {
-                if ((elapsed_time - last_trickle_report_time) >= trickle_period) {
-                    last_trickle_report_time = elapsed_time;
-                    fprintf(
-                        stderr,
-                        "%s Status Report: Trickle-Up Event.\n",
-                        vboxwrapper_msg_prefix(buf, sizeof(buf))
-                    );
-                    sprintf(buf,
-                        "<cpu_time>%f</cpu_time>", last_trickle_report_time
-                    );
-                    retval = boinc_send_trickle_up(
-                        const_cast<char*>("cpu_time"), buf
-                    );
-                    if (retval) {
-                        fprintf(
-                            stderr,
-                            "%s Sending Trickle-Up Event failed (%d).\n",
-                            vboxwrapper_msg_prefix(buf, sizeof(buf)),
-                            retval
-                        );
-                    }
-                }
+                check_trickle_period(elapsed_time, trickle_period);
             }
 
             if (boinc_status.reread_init_data_file) {
                 boinc_status.reread_init_data_file = false;
 
-                fprintf(
-                    stderr,
-                    "%s Preference change detected\n",
-                    vboxwrapper_msg_prefix(buf, sizeof(buf))
-                );
+                vboxlog_msg("Preference change detected");
 
                 boinc_parse_init_data_file();
                 boinc_get_init_data_p(&aid);
-                set_throttles(aid, vm);
+                set_throttles(aid, *pVM);
 
-                fprintf(
-                    stderr,
-                    "%s Checkpoint Interval is now %d seconds.\n",
-                    vboxwrapper_msg_prefix(buf, sizeof(buf)),
-                    (int)aid.checkpoint_period
-                );
+                vboxlog_msg("Checkpoint Interval is now %d seconds.", (int)aid.checkpoint_period);
             }
 
             // if the VM has a maximum amount of time it is allowed to run,
             // shut it down gacefully and exit.
             //
-            if (vm.job_duration && (elapsed_time > vm.job_duration)) {
-                vm.cleanup();
+            if (pVM->job_duration && (elapsed_time > pVM->job_duration)) {
+                pVM->cleanup();
 
-                if (vm.enable_cern_dataformat) {
+                if (pVM->enable_cern_dataformat) {
                     FILE* output = fopen("output", "w");
                     if (output) {
                         fprintf(
@@ -1181,14 +1098,14 @@ int main(int argc, char** argv) {
             }
         }
 
-        if (vm.enable_network) {
+        if (pVM->enable_network) {
             if (boinc_status.network_suspended) {
-                if (!vm.network_suspended) {
-                    vm.set_network_access(false);
+                if (!pVM->network_suspended) {
+                    pVM->set_network_access(false);
                 }
             } else {
-                if (vm.network_suspended) {
-                    vm.set_network_access(true);
+                if (pVM->network_suspended) {
+                    pVM->set_network_access(true);
                 }
             }
         }
@@ -1196,19 +1113,19 @@ int main(int argc, char** argv) {
         // report network usage every 10 min so the client can enforce quota
         //
         if (aid.global_prefs.daily_xfer_limit_mb
-            && vm.enable_network
-            && !vm.suspended
+            && pVM->enable_network
+            && !pVM->suspended
         ) {
             net_usage_timer -= POLL_PERIOD;
             if (net_usage_timer <= 0) {
                 net_usage_timer = 600;
                 double sent, received;
-                retval = vm.get_vm_network_bytes_sent(sent);
+                retval = pVM->get_vm_network_bytes_sent(sent);
                 if (!retval && (sent != bytes_sent)) {
                     bytes_sent = sent;
                     report_net_usage = true;
                 }
-                retval = vm.get_vm_network_bytes_received(received);
+                retval = pVM->get_vm_network_bytes_received(received);
                 if (!retval && (received != bytes_received)) {
                     bytes_received = received;
                     report_net_usage = true;
@@ -1219,9 +1136,9 @@ int main(int argc, char** argv) {
         if (report_net_usage) {
             retval = boinc_report_app_status_aux(
                 elapsed_time,
-                last_checkpoint_time,
+                last_checkpoint_cpu_time,
                 fraction_done,
-                vm.vm_pid,
+                pVM->vm_pid,
                 bytes_sent,
                 bytes_received
             );
@@ -1251,7 +1168,7 @@ int main(int argc, char** argv) {
 
         // if VM is running, increment elapsed time
         //
-        if (!boinc_status.suspended && !vm.suspended) {
+        if (!boinc_status.suspended && !pVM->suspended) {
             if (sleep_time > 0) {
                 elapsed_time += POLL_PERIOD;
             } else {
@@ -1260,9 +1177,14 @@ int main(int argc, char** argv) {
         }
     }
 
-#if defined(_WIN32) && defined(USE_WINSOCK)
+#ifdef _WIN32
+    CoUninitialize();
+#ifdef USE_WINSOCK
     WSACleanup();
 #endif
+#endif
+
+    return 0;
 }
 
 #ifdef _WIN32
diff --git a/samples/vboxwrapper/vboxwrapper.h b/samples/vboxwrapper/vboxwrapper.h
index b90a39d..393f121 100644
--- a/samples/vboxwrapper/vboxwrapper.h
+++ b/samples/vboxwrapper/vboxwrapper.h
@@ -26,13 +26,8 @@
 #define IMAGE_FILENAME_EXTENSION "vdi"
 #define FLOPPY_IMAGE_FILENAME "vm_floppy"
 #define FLOPPY_IMAGE_FILENAME_EXTENSION "img"
-#define JOB_FILENAME "vbox_job.xml"
-#define CHECKPOINT_FILENAME "vbox_checkpoint.txt"
-#define PORTFORWARD_FILENAME "vbox_port_forward.xml"
-#define REMOTEDESKTOP_FILENAME "vbox_remote_desktop.xml"
+#define CACHE_DISK_FILENAME "vm_cache.vdi"
+#define ISO_IMAGE_FILENAME "vm_isocontext.iso"
 #define POLL_PERIOD 1.0
 
-extern bool is_boinc_client_version_newer(APP_INIT_DATA& aid, int maj, int min, int rel);
-extern char* vboxwrapper_msg_prefix(char*, int);
-
 #endif
diff --git a/samples/vboxwrapper/vboxwrapper.xcodeproj/project.pbxproj b/samples/vboxwrapper/vboxwrapper.xcodeproj/project.pbxproj
index 1dc0e1c..f30a1ba 100644
--- a/samples/vboxwrapper/vboxwrapper.xcodeproj/project.pbxproj
+++ b/samples/vboxwrapper/vboxwrapper.xcodeproj/project.pbxproj
@@ -22,12 +22,22 @@
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
-		DD3B677B140CF9470088683F /* vbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD90CE9E140CAB3D0074CF46 /* vbox.cpp */; };
 		DD3B677C140CF9470088683F /* vboxwrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD90CEA0140CAB3D0074CF46 /* vboxwrapper.cpp */; };
 		DD52C39614A2D73900FC2A32 /* floppyio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD52C39414A2D73900FC2A32 /* floppyio.cpp */; };
 		DD52C39814A2D75900FC2A32 /* floppyio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD52C39414A2D73900FC2A32 /* floppyio.cpp */; };
-		DD90CEA1140CAB3D0074CF46 /* vbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD90CE9E140CAB3D0074CF46 /* vbox.cpp */; };
 		DD90CEA2140CAB3D0074CF46 /* vboxwrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD90CEA0140CAB3D0074CF46 /* vboxwrapper.cpp */; };
+		DDC81AEF1A688808000D8CEA /* vbox_common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDC81AED1A688808000D8CEA /* vbox_common.cpp */; };
+		DDC81AF01A688808000D8CEA /* vbox_common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDC81AED1A688808000D8CEA /* vbox_common.cpp */; };
+		DDC81AF51A68884B000D8CEA /* vboxjob.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDC81AF11A68884B000D8CEA /* vboxjob.cpp */; };
+		DDC81AF61A68884B000D8CEA /* vboxjob.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDC81AF11A68884B000D8CEA /* vboxjob.cpp */; };
+		DDC81AF71A68884B000D8CEA /* vboxcheckpoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDC81AF31A68884B000D8CEA /* vboxcheckpoint.cpp */; };
+		DDC81AF81A68884B000D8CEA /* vboxcheckpoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDC81AF31A68884B000D8CEA /* vboxcheckpoint.cpp */; };
+		DDC81AFA1A6888A7000D8CEA /* vbox_vboxmanage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDC81AF91A6888A7000D8CEA /* vbox_vboxmanage.cpp */; };
+		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 */
@@ -52,9 +62,20 @@
 		DD3B6783140CF9470088683F /* vboxwrapper_x86_64 */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = vboxwrapper_x86_64; sourceTree = BUILT_PRODUCTS_DIR; };
 		DD52C39414A2D73900FC2A32 /* floppyio.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = floppyio.cpp; sourceTree = "<group>"; };
 		DD52C39514A2D73900FC2A32 /* floppyio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = floppyio.h; sourceTree = "<group>"; };
-		DD90CE9E140CAB3D0074CF46 /* vbox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vbox.cpp; sourceTree = SOURCE_ROOT; };
-		DD90CE9F140CAB3D0074CF46 /* vbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vbox.h; sourceTree = SOURCE_ROOT; };
 		DD90CEA0140CAB3D0074CF46 /* vboxwrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vboxwrapper.cpp; sourceTree = SOURCE_ROOT; };
+		DDC81AED1A688808000D8CEA /* vbox_common.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vbox_common.cpp; sourceTree = "<group>"; };
+		DDC81AEE1A688808000D8CEA /* vbox_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vbox_common.h; sourceTree = "<group>"; };
+		DDC81AF11A68884B000D8CEA /* vboxjob.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vboxjob.cpp; sourceTree = "<group>"; };
+		DDC81AF21A68884B000D8CEA /* vboxjob.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vboxjob.h; sourceTree = "<group>"; };
+		DDC81AF31A68884B000D8CEA /* vboxcheckpoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vboxcheckpoint.cpp; sourceTree = "<group>"; };
+		DDC81AF41A68884B000D8CEA /* vboxcheckpoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vboxcheckpoint.h; sourceTree = "<group>"; };
+		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 */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -87,11 +108,22 @@
 		08FB7795FE84155DC02AAC07 /* Source */ = {
 			isa = PBXGroup;
 			children = (
+				DD90CEA0140CAB3D0074CF46 /* vboxwrapper.cpp */,
+				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 */,
+				DDC81AF21A68884B000D8CEA /* vboxjob.h */,
+				DDC81AF31A68884B000D8CEA /* vboxcheckpoint.cpp */,
+				DDC81AF41A68884B000D8CEA /* vboxcheckpoint.h */,
+				DDC81AED1A688808000D8CEA /* vbox_common.cpp */,
+				DDC81AEE1A688808000D8CEA /* vbox_common.h */,
 				DD52C39414A2D73900FC2A32 /* floppyio.cpp */,
 				DD52C39514A2D73900FC2A32 /* floppyio.h */,
-				DD90CE9E140CAB3D0074CF46 /* vbox.cpp */,
-				DD90CE9F140CAB3D0074CF46 /* vbox.h */,
-				DD90CEA0140CAB3D0074CF46 /* vboxwrapper.cpp */,
 			);
 			name = Source;
 			sourceTree = "<group>";
@@ -149,6 +181,8 @@
 /* Begin PBXProject section */
 		08FB7793FE84155DC02AAC07 /* Project object */ = {
 			isa = PBXProject;
+			attributes = {
+			};
 			buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "vboxwrapper" */;
 			compatibilityVersion = "Xcode 3.1";
 			developmentRegion = English;
@@ -204,9 +238,14 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				DD90CEA1140CAB3D0074CF46 /* vbox.cpp in Sources */,
 				DD90CEA2140CAB3D0074CF46 /* vboxwrapper.cpp in Sources */,
 				DD52C39614A2D73900FC2A32 /* floppyio.cpp in Sources */,
+				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 */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -214,9 +253,14 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				DD3B677B140CF9470088683F /* vbox.cpp in Sources */,
 				DD3B677C140CF9470088683F /* vboxwrapper.cpp in Sources */,
 				DD52C39814A2D75900FC2A32 /* floppyio.cpp in Sources */,
+				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 */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -262,7 +306,7 @@
 				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
-				GCC_VERSION = com.apple.compilers.llvmgcc42;
+				GCC_VERSION = "";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
@@ -283,7 +327,7 @@
 				);
 				PREBINDING = NO;
 				PRODUCT_NAME = vboxwrapper;
-				SDKROOT = macosx10.7;
+				SDKROOT = macosx;
 				STRIP_INSTALLED_PRODUCT = NO;
 			};
 			name = Debug;
@@ -298,7 +342,7 @@
 				GCC_ENABLE_SYMBOL_SEPARATION = NO;
 				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
 				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
-				GCC_VERSION = com.apple.compilers.llvmgcc42;
+				GCC_VERSION = "";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
@@ -320,7 +364,7 @@
 				PREBINDING = NO;
 				PRIVATE_HEADERS_FOLDER_PATH = "";
 				PRODUCT_NAME = vboxwrapper;
-				SDKROOT = macosx10.7;
+				SDKROOT = macosx;
 				STRIP_INSTALLED_PRODUCT = YES;
 			};
 			name = Release;
diff --git a/samples/wrapper/wrapper.cpp b/samples/wrapper/wrapper.cpp
index 42ff04c..67fb2a7 100644
--- a/samples/wrapper/wrapper.cpp
+++ b/samples/wrapper/wrapper.cpp
@@ -1,6 +1,6 @@
 // This file is part of BOINC.
 // http://boinc.berkeley.edu
-// Copyright (C) 2008 University of California
+// Copyright (C) 2014 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,8 +15,17 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
-// wrapper.C
-// wrapper program - lets you use non-BOINC apps with BOINC
+// BOINC wrapper - lets you use non-BOINC apps with BOINC
+// See http://boinc.berkeley.edu/trac/wiki/WrapperApp
+//
+// cmdline options:
+// --device N       macro-substitute N for $GPU_DEVICE_NUM
+//                  in worker cmdlines and env values
+// --nthreads X     macro-substitute X for $NTHREADS
+//                  in worker cmdlines and env values
+// --trickle X      send a trickle-up message reporting runtime every X sec
+//                  of runtime (use this for credit granting
+//                  if your app does its own job management)
 //
 // Handles:
 // - suspend/resume/quit/abort
@@ -25,7 +34,6 @@
 // - checkpointing
 //      (at the level of task; or potentially within task)
 //
-// See http://boinc.berkeley.edu/trac/wiki/WrapperApp for details
 // Contributor: Andrew J. Younge (ajy4490 at umiacs.umd.edu)
 
 #ifndef _WIN32
@@ -54,6 +62,7 @@
 
 #include "version.h"
 #include "boinc_api.h"
+#include "graphics2.h"
 #include "boinc_zip.h"
 #include "diagnostics.h"
 #include "error_numbers.h"
@@ -67,6 +76,9 @@
 
 #include "regexp.h"
 
+using std::vector;
+using std::string;
+
 //#define DEBUG
 #if 1
 #define debug_msg(x)
@@ -81,16 +93,22 @@ inline void debug_msg(const char* x) {
 
 #define POLL_PERIOD 1.0
 
-using std::vector;
-using std::string;
 int nthreads = 1;
 int gpu_device_num = -1;
+double runtime = 0;
+    // run time this session
+double trickle_period = 0;
+bool enable_graphics_support = false;
+vector<string> unzip_filenames;
+string zip_filename;
+vector<regexp*> zip_patterns;
+APP_INIT_DATA aid;
 
 struct TASK {
     string application;
     string exec_dir;
         // optional execution directory;
-        // macro-substituted for $PROJECT_DIR and $NTHREADS
+        // macro-substituted
     vector<string> vsetenv;
         // vector of strings for environment variables 
         // macro-substituted
@@ -108,6 +126,8 @@ struct TASK {
     bool is_daemon;
     bool append_cmdline_args;
     bool multi_process;
+    double time_limit;
+    int priority;
 
     // dynamic stuff follows
     double current_cpu_time;
@@ -117,12 +137,10 @@ struct TASK {
     double starting_cpu;
         // how much CPU time was used by tasks before this one
     bool suspended;
-    double time_limit;
     double elapsed_time;
 #ifdef _WIN32
     HANDLE pid_handle;
     DWORD pid;
-    HANDLE thread_handle;
     struct _stat last_stat;     // mod time of checkpoint file
 #else
     int pid;
@@ -182,7 +200,7 @@ struct TASK {
         int bufsize = 0;
         int len = 0;
         for (int j = 0; j < nvars; j++) {
-             bufsize += (1 + vsetenv[j].length());
+             bufsize += (1 + (int)vsetenv[j].length());
         }
         bufsize++; // add a final byte for array null ptr
         *env_vars = new char[bufsize];
@@ -191,10 +209,10 @@ struct TASK {
         // copy each env string to a buffer for the process
         for (vector<string>::iterator it = vsetenv.begin();
             it != vsetenv.end() && len < bufsize-1;
-            it++
+            ++it
         ) {
             strncpy(p, it->c_str(), it->length());
-            len = strlen(p);
+            len = (int)strlen(p);
             p += len + 1; // move pointer ahead
         }
     }
@@ -213,10 +231,6 @@ struct TASK {
 
 vector<TASK> tasks;
 vector<TASK> daemons;
-vector<string> unzip_filenames;
-string zip_filename;
-vector<regexp*> zip_patterns;
-APP_INIT_DATA aid;
 
 // replace s1 with s2
 //
@@ -369,6 +383,7 @@ int TASK::parse(XML_PARSER& xp) {
     multi_process = false;
     append_cmdline_args = false;
     time_limit = 0;
+    priority = PROCESS_PRIORITY_LOWEST;
 
     while (!xp.get_tag()) {
         if (!xp.is_tag) {
@@ -406,6 +421,7 @@ int TASK::parse(XML_PARSER& xp) {
         else if (xp.parse_bool("multi_process", multi_process)) continue;
         else if (xp.parse_bool("append_cmdline_args", append_cmdline_args)) continue;
         else if (xp.parse_double("time_limit", time_limit)) continue;
+        else if (xp.parse_int("priority", priority)) continue;
     }
     return ERR_XML_PARSE;
 }
@@ -505,6 +521,7 @@ int parse_job_file() {
             parse_zip_output(xp);
             continue;
         }
+        if (xp.parse_bool("enable_graphics_support", enable_graphics_support)) continue;
         fprintf(stderr,
             "%s unexpected tag in job.xml: %s\n",
             boinc_msg_prefix(buf2, sizeof(buf2)), xp.parsed_tag
@@ -670,7 +687,7 @@ int TASK::run(int argct, char** argvt) {
 
     // setup environment vars if needed
     //
-    int nvars = vsetenv.size();
+    int nvars = (int)vsetenv.size();
     char* env_vars = NULL;
     if (nvars > 0) {
         set_up_env_vars(&env_vars, nvars);
@@ -683,7 +700,7 @@ int TASK::run(int argct, char** argvt) {
         NULL,
         NULL,
         TRUE,        // bInheritHandles
-        CREATE_NO_WINDOW|IDLE_PRIORITY_CLASS,
+        CREATE_NO_WINDOW|process_priority_value(priority),
         (LPVOID) env_vars,
         exec_dir.empty()?NULL:exec_dir.c_str(),
         &startup_info,
@@ -703,8 +720,6 @@ int TASK::run(int argct, char** argvt) {
     if (env_vars) delete [] env_vars;
     pid_handle = process_info.hProcess;
     pid = process_info.dwProcessId;
-    thread_handle = process_info.hThread;
-    SetThreadPriority(thread_handle, THREAD_PRIORITY_IDLE);
 #else
     int retval;
     char* argv[256];
@@ -760,7 +775,7 @@ int TASK::run(int argct, char** argvt) {
         argv[0] = app_path;
         strlcpy(arglist, command_line.c_str(), sizeof(arglist));
         parse_command_line(arglist, argv+1);
-        setpriority(PRIO_PROCESS, 0, PROCESS_IDLE_PRIORITY);
+        setpriority(PRIO_PROCESS, 0, process_priority_value(priority));
         if (!exec_dir.empty()) {
             retval = chdir(exec_dir.c_str());
             if (!retval) {
@@ -924,32 +939,51 @@ void poll_boinc_messages(TASK& task) {
     }
 }
 
+// see if it's time to send trickle-up reporting elapsed time
+//
+void check_trickle_period() {
+    char buf[256];
+    static double last_trickle_report_time = 0;
+
+    if ((runtime - last_trickle_report_time) < trickle_period) {
+        return;
+    }
+    last_trickle_report_time = runtime;
+    sprintf(buf,
+        "<cpu_time>%f</cpu_time>", last_trickle_report_time
+    );
+    boinc_send_trickle_up(
+        const_cast<char*>("cpu_time"), buf
+    );
+}
+
 // Support for multiple tasks.
 // We keep a checkpoint file that says how many tasks we've completed
-// and how much CPU time has been used so far
+// and how much CPU time and runtime has been used so far
 //
-void write_checkpoint(int ntasks_completed, double cpu) {
+void write_checkpoint(int ntasks_completed, double cpu, double rt) {
     boinc_begin_critical_section();
     FILE* f = fopen(CHECKPOINT_FILENAME, "w");
     if (!f) return;
-    fprintf(f, "%d %f\n", ntasks_completed, cpu);
+    fprintf(f, "%d %f %f\n", ntasks_completed, cpu, rt);
     fclose(f);
     boinc_checkpoint_completed();
 }
 
-int read_checkpoint(int& ntasks_completed, double& cpu) {
+int read_checkpoint(int& ntasks_completed, double& cpu, double& rt) {
     int nt;
-    double c;
+    double c, r;
 
     ntasks_completed = 0;
     cpu = 0;
     FILE* f = fopen(CHECKPOINT_FILENAME, "r");
     if (!f) return ERR_FOPEN;
-    int n = fscanf(f, "%d %lf", &nt, &c);
+    int n = fscanf(f, "%d %lf %lf", &nt, &c, &r);
     fclose(f);
     if (n != 2) return 0;
     ntasks_completed = nt;
     cpu = c;
+    rt = r;
     return 0;
 }
 
@@ -971,6 +1005,8 @@ int main(int argc, char** argv) {
             nthreads = atoi(argv[++j]);
         } else if (!strcmp(argv[j], "--device")) {
             gpu_device_num = atoi(argv[++j]);
+        } else if (!strcmp(argv[j], "--trickle")) {
+            trickle_period = atof(argv[++j]);
         }
     }
 
@@ -985,14 +1021,14 @@ int main(int argc, char** argv) {
 
     do_unzip_inputs();
 
-    retval = read_checkpoint(ntasks_completed, checkpoint_cpu_time);
+    retval = read_checkpoint(ntasks_completed, checkpoint_cpu_time, runtime);
     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.
         //
-        write_checkpoint(0, 0);
+        write_checkpoint(0, 0, 0);
         get_initial_file_list();
     }
 
@@ -1102,11 +1138,25 @@ int main(int argc, char** argv) {
             if (task.has_checkpointed()) {
                 cpu_time = task.cpu_time();
                 checkpoint_cpu_time = task.starting_cpu + cpu_time;
-                write_checkpoint(i, checkpoint_cpu_time);
+                write_checkpoint(i, checkpoint_cpu_time, runtime);
+            }
+
+            if (trickle_period) {
+                check_trickle_period();
             }
+
+            if (enable_graphics_support) {
+                boinc_write_graphics_status(
+                    task.starting_cpu + cpu_time,
+                    checkpoint_cpu_time + task.elapsed_time,
+                    frac_done + task.weight/total_weight
+                );
+            }
+
             boinc_sleep(POLL_PERIOD);
             if (!task.suspended) {
                 task.elapsed_time += POLL_PERIOD;
+                runtime += POLL_PERIOD;
             }
             counter++;
         }
@@ -1124,7 +1174,7 @@ int main(int argc, char** argv) {
             checkpoint_cpu_time,
             frac_done + task.weight/total_weight
         );
-        write_checkpoint(i+1, checkpoint_cpu_time);
+        write_checkpoint(i+1, checkpoint_cpu_time, runtime);
         weight_completed += task.weight;
     }
     kill_daemons();
diff --git a/sched/Makefile.am b/sched/Makefile.am
index c023eb2..babc7b3 100644
--- a/sched/Makefile.am
+++ b/sched/Makefile.am
@@ -97,26 +97,28 @@ schedbin_PROGRAMS = \
     delete_file \
     get_file \
     make_work \
-    sched_driver \
     put_file \
+    sched_driver \
     show_shmem \
     wu_check
 
 schedshare_PROGRAMS = \
+    antique_file_deleter \
     census \
     credit_test \
     db_dump \
     db_purge \
     feeder \
     file_deleter \
-    antique_file_deleter \
     message_handler \
     sample_assimilator \
-    sample_dummy_assimilator \
     sample_bitwise_validator \
+    sample_dummy_assimilator \
     sample_substr_validator \
     sample_trivial_validator \
     sample_work_generator \
+	script_assimilator \
+	script_validator \
     single_job_assimilator \
     size_regulator \
     transitioner \
@@ -249,6 +251,14 @@ single_job_assimilator_LDADD = $(SERVERLIBS)
 sample_work_generator_SOURCES = sample_work_generator.cpp
 sample_work_generator_LDADD = $(SERVERLIBS)
 
+script_assimilator_SOURCES = $(ASSIMILATOR_SOURCES) \
+	script_assimilator.cpp
+script_assimilator_LDADD = $(SERVERLIBS)
+
+script_validator_SOURCES = $(VALIDATOR_SOURCES) \
+	script_validator.cpp
+script_validator_LDADD = $(SERVERLIBS)
+
 db_dump_SOURCES = db_dump.cpp
 db_dump_LDADD = $(SERVERLIBS)
 
diff --git a/sched/antique_file_deleter.cpp b/sched/antique_file_deleter.cpp
index 6fbc99d..ce259c3 100644
--- a/sched/antique_file_deleter.cpp
+++ b/sched/antique_file_deleter.cpp
@@ -18,7 +18,7 @@
 
 // antique_file deleter
 // removes files from the upload/download hierarchies that are
-// older than any WU
+// older than any WU (except "no_delete" WUs)
 // See usage() below for usage.
 
 // how long to wait until delete antiques, and how often to do it
@@ -237,7 +237,7 @@ static int delete_antiques() {
 
     // t = min (create_time_of_oldest_wu, 31days_ago)
     t = time(0) - 32*86400;
-    if (!wu.enumerate("order by id limit 1") && (t > wu.create_time)) {
+    if (!wu.enumerate("where name not like '%nodelete%' order by id limit 1") && (t > wu.create_time)) {
         t = wu.create_time - 86400;
     }
 
diff --git a/sched/assimilator.cpp b/sched/assimilator.cpp
index 27c8a0a..1d551e1 100644
--- a/sched/assimilator.cpp
+++ b/sched/assimilator.cpp
@@ -1,6 +1,6 @@
 // This file is part of BOINC.
 // http://boinc.berkeley.edu
-// Copyright (C) 2008 University of California
+// Copyright (C) 2014 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,11 +15,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/>.
 
-// This is a framework for an assimilator.
-// You need to link this with an (application-specific) function
-// assimilate_handler()
-// in order to make a complete program.
-//
+// Main program for an assimilator.
+// Link this with an application-specific function assimilate_handler()
+// See http://boinc.berkeley.edu/trac/wiki/AssimilateIntro
 
 #include "config.h"
 #include <cstring>
@@ -258,8 +256,8 @@ int main(int argc, char** argv) {
         } else if (is_arg(argv[i], "transcripts_prefix")) {
             transcripts_prefix=argv[++i];
         } else {
-            log_messages.printf(MSG_CRITICAL, "Unrecognized arg: %s\n", argv[i]);
-            usage(argv);
+            // project-specific part might parse extra args
+            //log_messages.printf(MSG_CRITICAL, "Unrecognized arg: %s\n", argv[i]);
         }
     }
 
diff --git a/sched/credit.cpp b/sched/credit.cpp
index 93c554e..fb905bc 100644
--- a/sched/credit.cpp
+++ b/sched/credit.cpp
@@ -124,6 +124,68 @@ int grant_credit(DB_HOST &host, double start_time, double credit) {
     return 0;
 }
 
+int grant_credit_by_app(RESULT& result, double credit) {
+    DB_CREDIT_USER cu;
+    char clause1[1024], clause2[1024];
+    double now = dtime();
+
+    sprintf(clause1, "where userid=%d and appid=%d", result.userid, result.appid);
+    int retval = cu.lookup(clause1);
+    if (retval) {
+        cu.clear();
+        cu.userid = result.userid;
+        cu.appid = result.appid;
+        cu.expavg_time = dtime();
+        retval = cu.insert();
+        if (retval) return retval;
+    }
+    update_average(
+        now,
+        result.sent_time,
+        credit, CREDIT_HALF_LIFE,
+        cu.expavg, cu.expavg_time
+    );
+    sprintf(clause1,
+        "total=total+%.15e, expavg=%.15e, expavg_time=%.15e, njobs=njobs+1",
+        credit, cu.expavg, cu.expavg_time
+    );
+    sprintf(clause2,
+        "userid=%d and appid=%d", result.userid, result.appid
+    );
+    retval = cu.update_fields_noid(clause1, clause2);
+    if (retval) return retval;
+
+    // team.  keep track of credit for zero (no team) also
+    //
+    DB_CREDIT_TEAM ct;
+    sprintf(clause1, "where teamid=%d and appid=%d", result.teamid, result.appid);
+    retval = ct.lookup(clause1);
+    if (retval) {
+        ct.clear();
+        ct.teamid = result.teamid;
+        ct.appid = result.appid;
+        ct.expavg_time = dtime();
+        retval = ct.insert();
+        if (retval) return retval;
+    }
+    update_average(
+        now,
+        result.sent_time,
+        credit, CREDIT_HALF_LIFE,
+        ct.expavg, ct.expavg_time
+    );
+    sprintf(clause1,
+        "total=total+%.15e, expavg=%.15e, expavg_time=%.15e, njobs=njobs+1",
+        credit, ct.expavg, ct.expavg_time
+    );
+    sprintf(clause2,
+        "teamid=%d and appid=%d", result.teamid, result.appid
+    );
+    retval = ct.update_fields_noid(clause1, clause2);
+    if (retval) return retval;
+    return 0;
+}
+
 ///////////////////// V2 CREDIT STUFF STARTS HERE ///////////////////
 
 // levels of confidence in a credit value
diff --git a/sched/credit.h b/sched/credit.h
index 623eb46..e185d5b 100644
--- a/sched/credit.h
+++ b/sched/credit.h
@@ -63,3 +63,5 @@ extern int hav_lookup(DB_HOST_APP_VERSION& hav, int hostid, int avid);
 extern int write_modified_app_versions(
     std::vector<DB_APP_VERSION_VAL>& app_versions
 );
+
+extern int grant_credit_by_app(RESULT& result, double credit);
diff --git a/sched/db_dump.cpp b/sched/db_dump.cpp
index 9eca767..97c8dd8 100644
--- a/sched/db_dump.cpp
+++ b/sched/db_dump.cpp
@@ -345,14 +345,30 @@ void write_host(HOST& host, FILE* f, bool detail) {
     );
 
     // host.serialnum stores coprocessor description
+    // and client and vbox versions.
     //
-    if (strlen(host.serialnum)) {
-        char serialnum[1024];
-        xml_escape(host.serialnum, serialnum, sizeof(serialnum));
+    char boinc[256], vbox[256], coprocs[256];
+    char buf[1024];
+    parse_serialnum(host.serialnum, boinc, vbox, coprocs);
+    if (strlen(boinc)) {
+        xml_escape(boinc, buf, sizeof(buf));
+        fprintf(f,
+            "    <boinc_version>%s</boinc_version>\n", buf
+        );
+    }
+    if (strlen(vbox)) {
+        xml_escape(vbox, buf, sizeof(buf));
+        fprintf(f,
+            "    <vbox_version>%s</vbox_version>\n", buf
+        );
+    }
+    if (strlen(coprocs)) {
+        xml_escape(coprocs, buf, sizeof(buf));
         fprintf(f,
-            "    <coprocs>%s</coprocs>\n", serialnum
+            "    <coprocs>%s</coprocs>\n", buf
         );
     }
+
     if (detail) {
         fprintf(f,
             "  <create_time>%d</create_time>\n"
@@ -672,6 +688,9 @@ int tables_file(char* dir) {
         "    <update_time>%d</update_time>\n",
         (int)time(0)
     );
+    if (config.credit_by_app) {
+        fprintf(f.f, "    <credit_by_app/>\n");
+    }
     if (nusers) fprintf(f.f, "    <nusers_total>%d</nusers_total>\n", nusers);
     if (nteams) fprintf(f.f, "    <nteams_total>%d</nteams_total>\n", nteams);
     if (nhosts) fprintf(f.f, "    <nhosts_total>%d</nhosts_total>\n", nhosts);
@@ -833,6 +852,7 @@ int main(int argc, char** argv) {
     check_stop_daemons();
     setbuf(stderr, 0);
 
+    retval = system("cd ../html/ops; echo 2");
     log_messages.printf(MSG_NORMAL, "db_dump starting\n");
     strcpy(spec_filename, "");
     for (i=1; i<argc; i++) {
@@ -944,14 +964,25 @@ int main(int argc, char** argv) {
 
     boinc_mkdir(spec.output_dir);
 
-    tables_file(spec.output_dir);
-
     unsigned int j;
     for (j=0; j<spec.enumerations.size(); j++) {
         ENUMERATION& e = spec.enumerations[j];
         e.make_it_happen(spec.output_dir);
     }
 
+    if (config.credit_by_app) {
+        retval = system("cd ../html/ops ; ./export_credit_by_app.php ../stats_tmp");
+        if (retval) {
+            log_messages.printf(MSG_CRITICAL,
+                "export_credit_by_app.php failed: %d\n", WEXITSTATUS(retval)
+            );
+        }
+    }
+
+    // this must follow the above loop, to get tables counts
+    //
+    tables_file(spec.output_dir);
+
     if (have_badges) {
         write_badge_user(spec.output_dir);
         write_badge_team(spec.output_dir);
diff --git a/sched/db_purge.cpp b/sched/db_purge.cpp
index 9a443aa..0bb2e31 100644
--- a/sched/db_purge.cpp
+++ b/sched/db_purge.cpp
@@ -90,6 +90,8 @@ int wu_stored_in_file = 0;
     // keep track of how many WU archived in file so far
 int id_modulus=0, id_remainder=0;
     // allow more than one to run - doesn't work if archiving is enabled
+char app_name[256];
+DB_APP app;
 
 bool time_to_quit() {
     if (max_number_workunits_to_purge) {
@@ -492,34 +494,27 @@ bool do_pass() {
 
     bool did_something = false;
     DB_WORKUNIT wu;
-    char buf[256];
+    char buf[256], buf2[256];
 
+    sprintf(buf, "where file_delete_state=%d", FILE_DELETE_DONE);
     if (min_age_days) {
-        min_age_seconds = (int) min_age_days*86400;
-        if (id_modulus) {
-            sprintf(buf,
-                "where file_delete_state=%d and mod_time<current_timestamp() - interval %d second and id %% %d = %d limit %d",
-                FILE_DELETE_DONE, min_age_seconds, id_modulus, id_remainder, DB_QUERY_LIMIT
-            );
-        } else {
-            sprintf(buf,
-                "where file_delete_state=%d and mod_time<current_timestamp() - interval %d second limit %d",
-                FILE_DELETE_DONE, min_age_seconds, DB_QUERY_LIMIT
-            );
-        }
-    } else {
-        if (id_modulus) {
-            sprintf(buf,
-                "where file_delete_state=%d and id %% %d = %d limit %d",
-                FILE_DELETE_DONE, id_modulus, id_remainder, DB_QUERY_LIMIT
-            );
-        } else {
-            sprintf(buf,
-                "where file_delete_state=%d limit %d",
-                FILE_DELETE_DONE, DB_QUERY_LIMIT
-            );
-        }
+        min_age_seconds = (int) (min_age_days*86400);
+        sprintf(buf2,
+            " and mod_time<current_timestamp() - interval %d second",
+            min_age_seconds
+        );
+        strcat(buf, buf2);
+    }
+    if (id_modulus) {
+        sprintf(buf2, " and id %% %d = %d", id_modulus, id_remainder);
+        strcat(buf, buf2);
+    }
+    if (strlen(app_name)) {
+        sprintf(buf2, " and appid=%d", app.id);
+        strcat(buf, buf2);
     }
+    sprintf(buf2, " limit %d", DB_QUERY_LIMIT);
+    strcat(buf, buf2);
 
     int n=0;
     while (1) {
@@ -584,7 +579,6 @@ bool do_pass() {
 
         if (config.enable_assignment) {
             DB_ASSIGNMENT asg;
-            char buf2[256];
             sprintf(buf2, "workunitid=%d", wu.id);
             asg.delete_from_db_multi(buf2);
         }
@@ -660,6 +654,7 @@ int main(int argc, char** argv) {
     int i;
     int sleep_sec = 600;
     check_stop_daemons();
+    char buf[256];
 
     for (i=1; i<argc; i++) {
         if (is_arg(argv[i], "one_pass")) {
@@ -704,7 +699,7 @@ int main(int argc, char** argv) {
             max_wu_per_file = atoi(argv[i]);
         } else if (is_arg(argv[i], "no_archive")) {
             no_archive = true;
-        } else if (is_arg(argv[i], "-sleep")) {
+        } else if (is_arg(argv[i], "sleep")) {
             if(!argv[++i]) {
                 log_messages.printf(MSG_CRITICAL, "%s requires an argument\n\n", argv[--i]);
                 usage(argv[0]);
@@ -735,6 +730,8 @@ int main(int argc, char** argv) {
             }
             id_modulus   = atoi(argv[++i]);
             id_remainder = atoi(argv[++i]);
+        } else if (is_arg(argv[i], "app")) {
+            strcpy(app_name, argv[++i]);
         } else {
             log_messages.printf(MSG_CRITICAL,
                 "unknown command line argument: %s\n\n", argv[i]
@@ -779,6 +776,15 @@ int main(int argc, char** argv) {
     atexit(close_db_exit_handler);
     atexit(close_all_archives);
 
+    if (strlen(app_name)) {
+        sprintf(buf, "where name='%s'", app_name);
+        retval = app.lookup(buf);
+        if (retval) {
+            log_messages.printf(MSG_CRITICAL, "Can't find app %s\n", app_name);
+            exit(1);
+        }
+    }
+
     while (1) {
         if (time_to_quit()) {
             break;
diff --git a/sched/handle_request.cpp b/sched/handle_request.cpp
index d357791..6d7f5ce 100644
--- a/sched/handle_request.cpp
+++ b/sched/handle_request.cpp
@@ -505,9 +505,9 @@ static int modify_host_struct(HOST& host) {
         g_request->core_client_minor_version,
         g_request->core_client_release
     );
-    if (strlen(host.client_brand)) {
+    if (strlen(g_request->client_brand)) {
         strcat(buf, "|");
-        strcat(buf, host.client_brand);
+        strcat(buf, g_request->client_brand);
     }
     strcat(buf, "]");
     g_request->coprocs.summary_string(buf2, sizeof(buf2));
@@ -833,51 +833,88 @@ int handle_global_prefs() {
 
 // if the client has an old code sign public key,
 // send it the new one, with a signature based on the old one.
-// If they don't have a code sign key, send them one
+// If they don't have a code sign key, send them one.
+// Return false if they have a key we don't recognize
+// (in which case we won't send them work).
 //
 bool send_code_sign_key(char* code_sign_key) {
     char* oldkey, *signature;
     int i, retval;
     char path[MAXPATHLEN];
 
-    if (strlen(g_request->code_sign_key)) {
-        if (strcmp(g_request->code_sign_key, code_sign_key)) {
-            log_messages.printf(MSG_NORMAL, "received old code sign key\n");
+    if (!strlen(g_request->code_sign_key)) {
+        safe_strcpy(g_reply->code_sign_key, code_sign_key);
+        return true;
+    }
+    if (!strcmp(g_request->code_sign_key, code_sign_key)) {
+        return true;
+    }
 
-            // look for a signature file
+    log_messages.printf(MSG_NORMAL, "received old code sign key\n");
+
+    // look for a signature file for the client's key.
+    // These are in pairs of files (N = 0, 1, ...)
+    // old_key_N: contains an old key
+    // signature_N: contains a signature for new key,
+    // based on the old key
+    // signature_stripped_N: signature for new key w/ trailing \n removed
+    // (needed for 7.0+ clients, which strip trailing whitespace)
+    //
+    // A project can have several of these if it wants,
+    // e.g. if it changes keys a lot.
+    //
+    for (i=0; ; i++) {
+        sprintf(path, "%s/old_key_%d", config.key_dir, i);
+        retval = read_file_malloc(path, oldkey);
+        if (retval) {
+            // we've scanned all the signature files and
+            // didn't find one that worked.
+            // User must reattach.
             //
-            for (i=0; ; i++) {
-                sprintf(path, "%s/old_key_%d", config.key_dir, i);
-                retval = read_file_malloc(path, oldkey);
-                if (retval) {
-                    g_reply->insert_message(
-                       _("Invalid code signing key.  To fix, remove and add this project."),
-                       "notice"
-                    );
-                    return false;
-                }
-                if (!strcmp(oldkey, g_request->code_sign_key)) {
-                    sprintf(path, "%s/signature_%d", config.key_dir, i);
-                    retval = read_file_malloc(path, signature);
-                    if (retval) {
-                        g_reply->insert_message(
-                           _("The project has changed its security key.  Please remove and add this project."),
-                           "notice"
-                        );
-                    } else {
-                        safe_strcpy(g_reply->code_sign_key, code_sign_key);
-                        safe_strcpy(g_reply->code_sign_key_signature, signature);
-                        free(signature);
-                    }
-                }
+            log_messages.printf(MSG_CRITICAL,
+                "scanned old_key_i files, can find client's key\n"
+            );
+            break;
+        }
+        strip_whitespace(oldkey);
+        if (!strcmp(oldkey, g_request->code_sign_key)) {
+            // We've found the client's key.
+            // Get the signature for the new key.
+            //
+            if (g_request->core_client_major_version < 7) {
+                sprintf(path, "%s/signature_%d", config.key_dir, i);
+            } else {
+                sprintf(path, "%s/signature_stripped_%d", config.key_dir, i);
+            }
+            retval = read_file_malloc(path, signature);
+            if (retval) {
+                // project is missing the signature file.
+                // Tell the user to reattach.
+                //
+                log_messages.printf(MSG_CRITICAL,
+                    "Missing signature file for old key %d\n", i
+                );
+                free(oldkey);
+                break;
+            } else {
+                log_messages.printf(MSG_NORMAL,
+                    "sending new code sign key and signature\n"
+                );
+                safe_strcpy(g_reply->code_sign_key, code_sign_key);
+                safe_strcpy(g_reply->code_sign_key_signature, signature);
+                free(signature);
                 free(oldkey);
-                return false;
+                return true;
             }
         }
-    } else {
-        safe_strcpy(g_reply->code_sign_key, code_sign_key);
+        free(oldkey);
     }
-    return true;
+
+    g_reply->insert_message(
+       _("The project has changed its security key.  Please remove and add this project."),
+       "notice"
+    );
+    return false;
 }
 
 // If <min_core_client_version_announced> is set,
@@ -892,7 +929,7 @@ void warn_user_if_core_client_upgrade_scheduled() {
         int remaining = config.min_core_client_upgrade_deadline-time(0);
         remaining /= 3600;
 
-        if (0 < remaining) {
+        if (remaining > 0) {
 
             char msg[512];
             int days  = remaining / 24;
@@ -1088,11 +1125,13 @@ bool bad_install_type() {
 }
 
 static inline bool requesting_work() {
+    if (g_request->dont_send_work) return false;
     if (g_request->work_req_seconds > 0) return true;
     if (g_request->cpu_req_secs > 0) return true;
-    if (g_request->coprocs.nvidia.count && g_request->coprocs.nvidia.req_secs) return true;
-    if (g_request->coprocs.ati.count && g_request->coprocs.ati.req_secs) return true;
-    if (g_request->coprocs.intel_gpu.count && g_request->coprocs.intel_gpu.req_secs) return true;
+    for (int i=1; i<NPROC_TYPES; i++) {
+        COPROC* cp = g_request->coprocs.proc_type_to_coproc(i);
+        if (cp && cp->count && cp->req_secs) return true;
+    }
     if (ssp->have_nci_app) return true;
     return false;
 }
@@ -1132,6 +1171,7 @@ void process_request(char* code_sign_key) {
 
     warn_user_if_core_client_upgrade_scheduled();
 
+    g_wreq->no_jobs_available = false;
     if (requesting_work()) {
         if (config.locality_scheduling || config.locality_scheduler_fraction || config.enable_assignment) {
             have_no_work = false;
@@ -1175,7 +1215,7 @@ void process_request(char* code_sign_key) {
 
     retval = open_database();
     if (retval) {
-        send_error_message("Server can't open database", 3600);
+        send_error_message("Server can't open database", config.maintenance_delay);
         g_reply->project_is_down = true;
         goto leave;
     }
diff --git a/sched/makefile_validator_test b/sched/makefile_validator_test
index f6910b8..863b7b6 100644
--- a/sched/makefile_validator_test
+++ b/sched/makefile_validator_test
@@ -1,8 +1,11 @@
-# the compiled file containing result_init() etc
-VALIDATOR_OBJ = sample_bitwise_validator.o
+# makefile for building a validator test program; see
+# http://boinc.berkeley.edu/trac/wiki/ValidationSimple
+
+# the object file containing result_init() etc. - replace with your own
+VALIDATOR_SRC = sample_bitwise_validator.cpp
 
 # where libmysqlclient is
 MYSQL_LIB_DIR = /usr/lib64/mysql
 
-validator_test: validator_test.cpp $(VALIDATOR_OBJ)
-	g++ -g -I.. -I../lib -I../db -o validator_test validator_test.cpp $(VALIDATOR_OBJ) validate_util.o -L . -lsched -L ../lib -lboinc -L $(MYSQL_LIB_DIR) -lmysqlclient
+validator_test: validator_test.cpp $(VALIDATOR_SRC)
+	g++ -g -I.. -I../lib -I../db -o validator_test validator_test.cpp $(VALIDATOR_SRC) validate_util.o -L . -lsched -L ../lib -lboinc -L $(MYSQL_LIB_DIR) -lmysqlclient
diff --git a/sched/plan_class_spec.cpp b/sched/plan_class_spec.cpp
index 0370914..26bb20d 100644
--- a/sched/plan_class_spec.cpp
+++ b/sched/plan_class_spec.cpp
@@ -15,6 +15,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/>.
 
+// Support for plan classes defined using an XML file.
+// See http://boinc.berkeley.edu/trac/wiki/AppPlanSpec
+
 #include <cmath>
 
 #include "util.h"
@@ -28,25 +31,50 @@ using std::string;
 
 
 // this returns a numerical OS version for Darwin/OSX and Windows,
-// allowing to define a numerical _range_ for these OS versions
+// letting us define numerical ranges for these OS versions
+//
 static double os_version_num(HOST h) {
+    unsigned int a, b, c, d;
     if (strstr(h.os_name, "Darwin")) {
-        unsigned int a,b,c;
         if (sscanf(h.os_version, "%u.%u.%u", &a, &b, &c) == 3) {
             return 10000.0*a + 100.0*b + c;
         }
     } else if (strstr(h.os_name, "Windows")) {
-        unsigned int a,b,c,d;
         // example: "Enterprise Server Edition, Service Pack 1, (06.01.7601.00)"
-        char*p = strrchr(h.os_version,'(');
+        //
+        char *p = strrchr(h.os_version,'(');
         if (p && (sscanf(p, "(%u.%u.%u.%u)", &a, &b, &c, &d) == 4)) {
             return 100000000.0*a + 1000000.0*b + 100.0*c +d;
         }
+    } else if (strstr(h.os_name, "Android") || strstr(h.os_name, "Linux")) {
+        // example: 3.0.31-g6fb96c9
+        //
+        if (sscanf(h.os_version, "%u.%u.%u", &a, &b, &c) == 3) {
+            return 10000.*a + 100.*b + c;
+        }
     }
     // could not determine numerical OS version
-    return 0.0;
+    //
+    return 0;
 }
 
+// parse "Android 4.3.1" or "Android 4.3"
+//
+static int android_version_num(HOST h) {
+    int maj, min, rel;
+    char* p = strstr(h.os_version, "(Android ");
+    if (!p) return 0;
+    p += strlen("(Android ");
+    int n = sscanf(p, "%d.%d.%d", &maj, &min, &rel);
+    if (n == 3) {
+        return maj*10000 + min*100 + rel;
+    }
+    n = sscanf(p, "%d.%d", &maj, &min);
+    if (n == 2) {
+        return maj*10000 + min*100;
+    }
+    return 0;
+}
 
 int PLAN_CLASS_SPECS::parse_file(const char* path) {
 #ifndef _USING_FCGI_
@@ -108,6 +136,16 @@ bool PLAN_CLASS_SPEC::opencl_check(OPENCL_DEVICE_PROP& opencl_prop) {
         }
         return false;
     }
+
+    if (double_precision_fp && (opencl_prop.double_fp_config == 0)) {
+        if (config.debug_version_select) {
+            log_messages.printf(MSG_NORMAL,
+                "[version] device (or driver) doesn't support double precision fp math\n"
+            );
+        }
+        return false;
+    }
+
     return true;
 }
 
@@ -220,6 +258,49 @@ bool PLAN_CLASS_SPEC::check(SCHEDULER_REQUEST& sreq, HOST_USAGE& hu) {
             return false;
         }
     }
+    if (min_android_version || max_android_version) {
+        if (strcasecmp(sreq.host.os_name, "android")) return false;
+        int host_android_version = android_version_num(sreq.host);
+        if (!host_android_version) {
+            if (config.debug_version_select) {
+                log_messages.printf(MSG_NORMAL,
+                    "[version] plan_class_spec: Can't determine numerical Android version '%s'\n",
+                    sreq.host.os_version
+                );
+            }
+            return false;
+        }
+        if (min_android_version && (host_android_version < min_android_version)) {
+            if (config.debug_version_select) {
+                log_messages.printf(MSG_NORMAL,
+                    "[version] plan_class_spec: Android version '%s' too low (%d / %d)\n",
+                    sreq.host.os_version, host_android_version, min_android_version
+                );
+            }
+            return false;
+        }
+        if (max_android_version && (host_android_version > max_android_version)) {
+            if (config.debug_version_select) {
+                log_messages.printf(MSG_NORMAL,
+                    "[version] plan_class_spec: Android version '%s' too high (%d / %d)\n",
+                    sreq.host.os_version, host_android_version, max_android_version
+                );
+            }
+            return false;
+        }
+    }
+
+    // CPU vendor
+    //
+    if (have_cpu_vendor_regex && regexec(&(cpu_vendor_regex), sreq.host.p_vendor, 0, NULL, 0)) {
+        if (config.debug_version_select) {
+            log_messages.printf(MSG_NORMAL,
+                "[version] plan_class_spec: CPU vendor '%s' didn't match regexp\n",
+                sreq.host.p_vendor
+            );
+        }
+        return false;
+    }
 
     // BOINC versions
     //
@@ -287,6 +368,14 @@ bool PLAN_CLASS_SPEC::check(SCHEDULER_REQUEST& sreq, HOST_USAGE& hu) {
             }
             return false;
         }
+        if (in_vector(v, exclude_vbox_version)) {
+            if (config.debug_version_select) {
+                log_messages.printf(MSG_NORMAL,
+                    "[version] plan_class_spec: vbox version %d excluded\n", v
+                );
+            }
+            return false;
+        }
 
         if (vm_accel_required) {
             if ((!strstr(sreq.host.p_features, "vmx") && !strstr(sreq.host.p_features, "svm"))
@@ -540,14 +629,14 @@ bool PLAN_CLASS_SPEC::check(SCHEDULER_REQUEST& sreq, HOST_USAGE& hu) {
 
     // Intel GPU
     //
-    } else if (strstr(gpu_type, "intel")==gpu_type) {
+    } else if (strstr(gpu_type, "intel") == gpu_type) {
         COPROC& cp = sreq.coprocs.intel_gpu;
         cpp = &cp;
 
         if (!cp.count) {
             if (config.debug_version_select) {
                 log_messages.printf(MSG_NORMAL,
-                    "[version] [version] No Intel GPUs found\n"
+                    "[version] plan_class_spec: No Intel GPUs found\n"
                 );
             }
             return false;
@@ -555,6 +644,24 @@ bool PLAN_CLASS_SPEC::check(SCHEDULER_REQUEST& sreq, HOST_USAGE& hu) {
         if (min_gpu_ram_mb) {
             gpu_requirements[PROC_TYPE_INTEL_GPU].update(0, min_gpu_ram_mb * MEGA);
         }
+
+    // custom GPU type
+    //
+    } else if (strlen(gpu_type)) {
+        cpp = sreq.coprocs.lookup_type(gpu_type);
+        if (!cpp) {
+            if (config.debug_version_select) {
+                log_messages.printf(MSG_NORMAL,
+                    "[version] plan_class_spec: No %s found\n", gpu_type
+                );
+            }
+            return false;
+        }
+        if (config.debug_version_select) {
+            log_messages.printf(MSG_NORMAL,
+                "[version] plan_class_spec: Custom coproc %s found\n", gpu_type
+            );
+        }
     }
 
     if (opencl) {
@@ -652,21 +759,29 @@ bool PLAN_CLASS_SPEC::check(SCHEDULER_REQUEST& sreq, HOST_USAGE& hu) {
             gpu_usage = gpu_utilization;
         }
 
-        coproc_perf(
-            capped_host_fpops(),
-            gpu_peak_flops_scale * gpu_usage * cpp->peak_flops,
-            cpu_frac,
-            hu.projected_flops,
-            hu.avg_ncpus
-        );
-        if (avg_ncpus) {
-            hu.avg_ncpus = avg_ncpus;
-        }
-        // I believe the first term here is just hu.projected_flops,
-        // but I'm leaving it spelled out to match GPU scheduling 
-        // code in sched_customize.cpp
+        // if we don't know GPU peak flops, treat it like a CPU app
         //
-        hu.peak_flops = gpu_peak_flops_scale*gpu_usage*cpp->peak_flops + hu.avg_ncpus*capped_host_fpops();
+        if (cpp->peak_flops == 0) {
+            strcpy(hu.custom_coproc_type, gpu_type);
+            hu.avg_ncpus = cpu_frac;
+            hu.gpu_usage = gpu_usage;
+        } else {
+            coproc_perf(
+                capped_host_fpops(),
+                gpu_peak_flops_scale * gpu_usage * cpp->peak_flops,
+                cpu_frac,
+                hu.projected_flops,
+                hu.avg_ncpus
+            );
+            if (avg_ncpus) {
+                hu.avg_ncpus = avg_ncpus;
+            }
+            // I believe the first term here is just hu.projected_flops,
+            // but I'm leaving it spelled out to match GPU scheduling 
+            // code in sched_customize.cpp
+            //
+            hu.peak_flops = gpu_peak_flops_scale*gpu_usage*cpp->peak_flops + hu.avg_ncpus*capped_host_fpops();
+        }
 
         if (!strcmp(gpu_type, "amd") || !strcmp(gpu_type, "ati")) {
             hu.proc_type = PROC_TYPE_AMD_GPU;
@@ -677,6 +792,9 @@ bool PLAN_CLASS_SPEC::check(SCHEDULER_REQUEST& sreq, HOST_USAGE& hu) {
         } else if (strstr(gpu_type, "intel")==gpu_type) {
             hu.proc_type = PROC_TYPE_INTEL_GPU;
             hu.gpu_usage = gpu_usage;
+        } else if (!strcmp(gpu_type, "miner_asic")) {
+            hu.proc_type = PROC_TYPE_MINER_ASIC;
+            hu.gpu_usage = gpu_usage;
         } else {
             if (config.debug_version_select) {
                 log_messages.printf(MSG_NORMAL,
@@ -701,6 +819,9 @@ bool PLAN_CLASS_SPEC::check(SCHEDULER_REQUEST& sreq, HOST_USAGE& hu) {
                 hu.avg_ncpus = 1;
             }
         }
+        if (nthreads_cmdline) {
+            sprintf(hu.cmdline, "--nthreads %d", (int)hu.avg_ncpus);
+        }
 
         hu.peak_flops = capped_host_fpops() * hu.avg_ncpus;
         hu.projected_flops = capped_host_fpops() * hu.avg_ncpus * projected_flops_scale;
@@ -736,6 +857,7 @@ bool PLAN_CLASS_SPECS::check(
 
 int PLAN_CLASS_SPEC::parse(XML_PARSER& xp) {
     char buf[256];
+    int i;
     while (!xp.get_tag()) {
         if (xp.match_tag("/plan_class")) {
             return 0;
@@ -755,18 +877,27 @@ int PLAN_CLASS_SPEC::parse(XML_PARSER& xp) {
         }
         if (xp.parse_double("min_ncpus", min_ncpus)) continue;
         if (xp.parse_int("max_threads", max_threads)) continue;
+        if (xp.parse_bool("nthreads_cmdline", nthreads_cmdline)) continue;
         if (xp.parse_double("projected_flops_scale", projected_flops_scale)) continue;
         if (xp.parse_str("os_regex", buf, sizeof(buf))) {
             if (regcomp(&(os_regex), buf, REG_EXTENDED|REG_NOSUB) ) {
-                log_messages.printf(MSG_CRITICAL, "BAD REGEXP: %s\n", buf);
+                log_messages.printf(MSG_CRITICAL, "BAD OS REGEXP: %s\n", buf);
                 return ERR_XML_PARSE;
             }
             have_os_regex = true;
             continue;
         }
+        if (xp.parse_str("cpu_vendor_regex", buf, sizeof(buf))) {
+            if (regcomp(&(cpu_vendor_regex), buf, REG_EXTENDED|REG_NOSUB) ) {
+                log_messages.printf(MSG_CRITICAL, "BAD CPU VENDOR REGEXP: %s\n", buf);
+                return ERR_XML_PARSE;
+            }
+            have_cpu_vendor_regex = true;
+            continue;
+        }
         if (xp.parse_str("host_summary_regex", buf, sizeof(buf))) {
             if (regcomp(&(host_summary_regex), buf, REG_EXTENDED|REG_NOSUB) ) {
-                log_messages.printf(MSG_CRITICAL, "BAD REGEXP: %s\n", buf);
+                log_messages.printf(MSG_CRITICAL, "BAD HOST SUMMARY REGEXP: %s\n", buf);
                 return ERR_XML_PARSE;
             }
             have_host_summary_regex = true;
@@ -774,10 +905,12 @@ int PLAN_CLASS_SPEC::parse(XML_PARSER& xp) {
         }
         if (xp.parse_double("min_os_version", min_os_version)) continue;
         if (xp.parse_double("max_os_version", max_os_version)) continue;
+        if (xp.parse_int("min_android_version", min_android_version)) continue;
+        if (xp.parse_int("max_android_version", max_android_version)) continue;
         if (xp.parse_str("project_prefs_tag", project_prefs_tag, sizeof(project_prefs_tag))) continue;
         if (xp.parse_str("project_prefs_regex", buf, sizeof(buf))) {
             if (regcomp(&(project_prefs_regex), buf, REG_EXTENDED|REG_NOSUB) ) {
-                log_messages.printf(MSG_CRITICAL, "BAD REGEXP: %s\n", buf);
+                log_messages.printf(MSG_CRITICAL, "BAD PROJECT PREFS REGEXP: %s\n", buf);
                 return ERR_XML_PARSE;
             }
             have_project_prefs_regex = true;
@@ -812,9 +945,14 @@ int PLAN_CLASS_SPEC::parse(XML_PARSER& xp) {
 
         if (xp.parse_int("min_opencl_driver_revision", min_opencl_driver_revision)) continue;
         if (xp.parse_int("max_opencl_driver_revision", max_opencl_driver_revision)) continue;
+        if (xp.parse_bool("double_precision_fp", double_precision_fp)) continue;
 
         if (xp.parse_int("min_vbox_version", min_vbox_version)) continue;
         if (xp.parse_int("max_vbox_version", max_vbox_version)) continue;
+        if (xp.parse_int("exclude_vbox_version", i)) {
+            exclude_vbox_version.push_back(i);
+            continue;
+        }
         if (xp.parse_bool("vm_accel_required", vm_accel_required)) continue;
     }
     return ERR_XML_PARSE;
@@ -854,10 +992,14 @@ PLAN_CLASS_SPEC::PLAN_CLASS_SPEC() {
     is64bit = false;
     min_ncpus = 0;
     max_threads = 1;
+    nthreads_cmdline = false;
     projected_flops_scale = 1;
     have_os_regex = false;
+    have_cpu_vendor_regex = false;
     min_os_version = 0;
     max_os_version = 0;
+    min_android_version = 0;
+    max_android_version = 0;
     strcpy(project_prefs_tag, "");
     have_project_prefs_regex = false;
     project_prefs_default_true = false;
@@ -890,6 +1032,7 @@ PLAN_CLASS_SPEC::PLAN_CLASS_SPEC() {
     max_opencl_version = 0;
     min_opencl_driver_revision = 0;
     max_opencl_driver_revision = 0;
+    double_precision_fp = false;
 
     min_vbox_version = 0;
     max_vbox_version = 0;
diff --git a/sched/plan_class_spec.h b/sched/plan_class_spec.h
index d2ce867..6fa9cd5 100644
--- a/sched/plan_class_spec.h
+++ b/sched/plan_class_spec.h
@@ -23,6 +23,8 @@
 #include <vector>
 #include <regex.h>
 
+// if you add anything here, initialize if in the constructor
+//
 struct PLAN_CLASS_SPEC {
     char name[256];
     char gpu_type[256];
@@ -34,11 +36,17 @@ struct PLAN_CLASS_SPEC {
     std::vector<std::string> cpu_features;
     double min_ncpus;
     int max_threads;
+    bool nthreads_cmdline;
     double projected_flops_scale;
     bool have_os_regex;
     regex_t os_regex;
+    bool have_cpu_vendor_regex;
+    regex_t cpu_vendor_regex;
     double min_os_version;
+        // Win versions can be 9 digits; may as well be safe
     double max_os_version;
+    int min_android_version;
+    int max_android_version;
     char project_prefs_tag[256];
     bool have_project_prefs_regex;
     regex_t project_prefs_regex;
@@ -88,11 +96,13 @@ struct PLAN_CLASS_SPEC {
     int max_opencl_version;
     int min_opencl_driver_revision;
     int max_opencl_driver_revision;
+    bool double_precision_fp;
 
     // VirtualBox apps
     //
     int min_vbox_version;
     int max_vbox_version;
+    vector<int> exclude_vbox_version;
     bool vm_accel_required;
 
     int parse(XML_PARSER&);
diff --git a/sched/sample_substr_validator.cpp b/sched/sample_substr_validator.cpp
index dff553c..d7c7387 100644
--- a/sched/sample_substr_validator.cpp
+++ b/sched/sample_substr_validator.cpp
@@ -16,9 +16,11 @@
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
 // A sample validator that accepts results whose stderr output
-// contains a given string.
+// contains or doesn't contain a given string.
 // Usage:
-// sample_substr_validator --stderr_string xxx [other options]
+// sample_substr_validator --stderr_string xxx [--reject_if_present]] [other options]
+// --reject_if_present: reject (invalidate) the result if the string is present
+// (default: accept it if the string is present)
 
 #include "sched_msgs.h"
 #include "validate_util2.h"
@@ -26,18 +28,25 @@
 
 bool first = true;
 char* stderr_string;
+bool reject_if_present = false;
 
 void parse_cmdline() {
+    bool found = false;
     for (int i=1; i<g_argc; i++) {
         if (!strcmp(g_argv[i], "--stderr_string")) {
             stderr_string = g_argv[++i];
-            return;
+            found = true;
         }
+        if (!strcmp(g_argv[i], "--reject_if_present")) {
+            reject_if_present = true;
+        }
+    }
+    if (!found) {
+        log_messages.printf(MSG_CRITICAL,
+            "--stderr_string missing from command line\n"
+        );
+        exit(1);
     }
-    log_messages.printf(MSG_CRITICAL,
-        "--stderr_string missing from command line\n"
-    );
-    exit(1);
 }
 
 int init_result(RESULT& r, void*&) {
@@ -46,9 +55,9 @@ int init_result(RESULT& r, void*&) {
         first = false;
     }
     if (strstr(r.stderr_out, stderr_string)) {
-        return 0;
+        return reject_if_present?-1:0;
     } else {
-        return -1;
+        return reject_if_present?0:-1;
     }
 }
 
diff --git a/sched/sched_array.cpp b/sched/sched_array.cpp
index faedf2a..b4a5a16 100644
--- a/sched/sched_array.cpp
+++ b/sched/sched_array.cpp
@@ -55,30 +55,28 @@ static bool quick_check(
 ) {
     int retval;
 
-    g_wreq->no_jobs_available = false;
-
     // If we're looking for beta jobs and this isn't one, skip it
     //
     if (g_wreq->beta_only) {
         if (!app->beta) {
-            if (config.debug_array_detail) {
+            if (config.debug_send_job) {
                 log_messages.printf(MSG_NORMAL,
-                    "[array_detail] job is not from beta app; skipping\n"
+                    "[send_job] job is not from beta app; skipping\n"
                 );
             }
             return false;
         }
-        if (config.debug_send) {
+        if (config.debug_send_job) {
             log_messages.printf(MSG_NORMAL,
-                "[send] [HOST#%d] beta work found: [RESULT#%u]\n",
+                "[send_job] [HOST#%d] beta work found: [RESULT#%u]\n",
                 g_reply->host.id, wu_result.resultid
             );
         }
     } else {
         if (app->beta) {
-            if (config.debug_array_detail) {
+            if (config.debug_send_job) {
                 log_messages.printf(MSG_NORMAL,
-                    "[array_detail] job is from beta app; skipping\n"
+                    "[send_job] job is from beta app; skipping\n"
                 );
             }
             return false;
@@ -91,16 +89,16 @@ static bool quick_check(
     //
     if (!app->beta) {
         if (g_wreq->reliable_only && (!wu_result.need_reliable)) {
-            if (config.debug_array_detail) {
+            if (config.debug_send_job) {
                 log_messages.printf(MSG_NORMAL,
-                    "[array_detail] job doesn't need reliable host; skipping\n"
+                    "[send_job] job doesn't need reliable host; skipping\n"
                 );
             }
             return false;
         } else if (!g_wreq->reliable_only && wu_result.need_reliable) {
-            if (config.debug_array_detail) {
+            if (config.debug_send_job) {
                 log_messages.printf(MSG_NORMAL,
-                    "[array_detail] job needs reliable host; skipping\n"
+                    "[send_job] job needs reliable host; skipping\n"
                 );
             }
             return false;
@@ -111,9 +109,9 @@ static bool quick_check(
     // and the result is not infeasible
     //
     if (g_wreq->infeasible_only && (wu_result.infeasible_count==0)) {
-        if (config.debug_array_detail) {
+        if (config.debug_send_job) {
             log_messages.printf(MSG_NORMAL,
-                "[array_detail] job is not infeasible; skipping\n"
+                "[send_job] job is not infeasible; skipping\n"
             );
         }
         return false;
@@ -151,9 +149,9 @@ static bool quick_check(
     //
     bavp = get_app_version(wu, true, g_wreq->reliable_only);
     if (!bavp) {
-        if (config.debug_array_detail) {
+        if (config.debug_send_job) {
             log_messages.printf(MSG_NORMAL,
-                "[array_detail] No app version for job; skipping\n"
+                "[send_job] No app version for job; skipping\n"
             );
         }
         return false;
@@ -168,9 +166,9 @@ static bool quick_check(
     ) {
         if (app_not_selected(app->id)) {
             g_wreq->no_allowed_apps_available = true;
-            if (config.debug_array_detail) {
+            if (config.debug_send_job) {
                 log_messages.printf(MSG_NORMAL,
-                    "[array_detail] [USER#%d] [WU#%u] user doesn't want work for app %s\n",
+                    "[send_job] [USER#%d] [WU#%u] user doesn't want work for app %s\n",
                     g_reply->user.id, wu.id, app->name
                 );
             }
@@ -188,16 +186,16 @@ static bool quick_check(
         *app, *bavp
     );
     if (retval) {
-        if (retval != last_retval && config.debug_send) {
+        if (retval != last_retval && config.debug_send_job) {
             log_messages.printf(MSG_NORMAL,
-                "[send] [HOST#%d] [WU#%u %s] WU is infeasible: %s\n",
+                "[send_job] [HOST#%d] [WU#%u %s] WU is infeasible: %s\n",
                 g_reply->host.id, wu.id, wu.name, infeasible_string(retval)
             );
         }
         last_retval = retval;
-        if (config.debug_array_detail) {
+        if (config.debug_send_job) {
             log_messages.printf(MSG_NORMAL,
-                "[array_detail] is_infeasible_fast() failed; skipping\n"
+                "[send_job] is_infeasible_fast() failed; skipping\n"
             );
         }
         return false;
@@ -242,9 +240,9 @@ static bool scan_work_array() {
 
         WU_RESULT& wu_result = ssp->wu_results[i];
 
-        if (config.debug_array_detail) {
+        if (config.debug_send_job) {
             log_messages.printf(MSG_NORMAL,
-                "[array_detail] scanning slot %d\n", i
+                "[send_job] scanning slot %d\n", i
             );
         }
 
@@ -273,9 +271,9 @@ recheck:
         // This may modify wu.rsc_fpops_est
         //
         if (!quick_check(wu_result, wu, bavp, app, last_retval)) {
-            if (config.debug_array_detail) {
+            if (config.debug_send_job) {
                 log_messages.printf(MSG_NORMAL,
-                    "[array_detail] slot %d failed quick check\n", i
+                    "[send_job] slot %d failed quick check\n", i
                 );
             }
             continue;
@@ -363,18 +361,18 @@ void send_work_old() {
     //
     if (g_wreq->has_reliable_version) {
         g_wreq->reliable_only = true;
-        if (config.debug_array) {
+        if (config.debug_send_scan) {
             log_messages.printf(MSG_NORMAL,
-                "[array] scanning for jobs that need reliable host\n"
+                "[send_scan] scanning for jobs that need reliable host\n"
             );
         }
         if (scan_work_array()) return;
         g_wreq->reliable_only = false;
         g_wreq->best_app_versions.clear();
     } else {
-        if (config.debug_array) {
+        if (config.debug_send_scan) {
             log_messages.printf(MSG_NORMAL,
-                "[array] host has no reliable app versions; skipping scan\n"
+                "[send_scan] host has no reliable app versions; skipping scan\n"
             );
         }
     }
@@ -385,9 +383,9 @@ void send_work_old() {
     //
     if (g_wreq->allow_beta_work) {
         g_wreq->beta_only = true;
-        if (config.debug_array) {
+        if (config.debug_send_scan) {
             log_messages.printf(MSG_NORMAL,
-                "[array] host will accept beta jobs.  Scanning for them.\n"
+                "[send_scan] host will accept beta jobs.  Scanning for them.\n"
             );
         }
         if (scan_work_array()) return;
@@ -397,9 +395,9 @@ void send_work_old() {
     // give next priority to results that were infeasible for some other host
     //
     g_wreq->infeasible_only = true;
-    if (config.debug_array) {
+    if (config.debug_send_scan) {
         log_messages.printf(MSG_NORMAL,
-            "[array] Scanning for jobs that were infeasible for another host.\n"
+            "[send_scan] Scanning for jobs that were infeasible for another host.\n"
         );
     }
     if (scan_work_array()) return;
@@ -409,9 +407,9 @@ void send_work_old() {
     // make a pass accepting only jobs for which the client has a file
     //
     if (ssp->locality_sched_lite) {
-        if (config.debug_array) {
+        if (config.debug_send_scan) {
             log_messages.printf(MSG_NORMAL,
-                "[array] Scanning for locality sched Lite jobs.\n"
+                "[send_scan] Scanning for locality sched Lite jobs.\n"
             );
         }
         g_wreq->locality_sched_lite = true;
@@ -421,9 +419,9 @@ void send_work_old() {
 
     // end of high-priority cases.  Now do general scan.
     //
-    if (config.debug_array) {
+    if (config.debug_send_scan) {
         log_messages.printf(MSG_NORMAL,
-            "[array] Scanning: general case.\n"
+            "[send_scan] Scanning: general case.\n"
         );
     }
     if (scan_work_array()) return;
@@ -434,9 +432,9 @@ void send_work_old() {
     if (!g_wreq->njobs_sent && g_wreq->allow_non_preferred_apps ) {
         g_wreq->user_apps_only = false;
         preferred_app_message_index = g_wreq->no_work_messages.size();
-        if (config.debug_array) {
+        if (config.debug_send_scan) {
             log_messages.printf(MSG_NORMAL,
-                "[array] scanning for jobs from non-preferred applications\n"
+                "[send_scan] scanning for jobs from non-preferred applications\n"
             );
         }
         scan_work_array();
diff --git a/sched/sched_check.cpp b/sched/sched_check.cpp
index bf0af60..fef19b3 100644
--- a/sched/sched_check.cpp
+++ b/sched/sched_check.cpp
@@ -71,9 +71,9 @@ static inline int check_memory(WORKUNIT& wu) {
         );
         add_no_work_message(message);
 
-        if (config.debug_send) {
+        if (config.debug_send_job) {
             log_messages.printf(MSG_NORMAL,
-                "[send] [WU#%u %s] needs %0.2fMB RAM; [HOST#%d] has %0.2fMB, %0.2fMB usable\n",
+                "[send_job] [WU#%u %s] needs %0.2fMB RAM; [HOST#%d] has %0.2fMB, %0.2fMB usable\n",
                 wu.id, wu.name, wu.rsc_memory_bound/MEGA,
                 g_reply->host.id, g_wreq->ram/MEGA, g_wreq->usable_ram/MEGA
             );
@@ -140,7 +140,7 @@ static inline double get_estimated_delay(BEST_APP_VERSION& bav) {
     if (pt == PROC_TYPE_CPU) {
         return g_request->cpu_estimated_delay;
     }
-    COPROC* cp = g_request->coprocs.type_to_coproc(pt);
+    COPROC* cp = g_request->coprocs.proc_type_to_coproc(pt);
     return cp->estimated_delay;
 }
 
@@ -208,9 +208,10 @@ static inline int check_deadline(
     // (i.e. everyone gets one result, no matter how slow they are)
     //
     if (get_estimated_delay(bav) == 0 && !hard_app(app)) {
-        if (config.debug_send) {
+        if (config.debug_send_job) {
             log_messages.printf(MSG_NORMAL,
-                "[send] est delay 0, skipping deadline check\n"
+                "[send_job] [WU#%u] est delay 0, skipping deadline check\n",
+                wu.id
             );
         }
         return 0;
@@ -246,18 +247,18 @@ static inline int check_deadline(
         double est_report_delay = get_estimated_delay(bav) + ewd;
         double diff = est_report_delay - wu.delay_bound;
         if (diff > 0) {
-            if (config.debug_send) {
+            if (config.debug_send_job) {
                 log_messages.printf(MSG_NORMAL,
-                    "[send] [WU#%u] deadline miss %d > %d\n",
+                    "[send_job] [WU#%u] deadline miss %d > %d\n",
                     wu.id, (int)est_report_delay, wu.delay_bound
                 );
             }
             g_reply->wreq.speed.set_insufficient(diff);
             return INFEASIBLE_CPU;
         } else {
-            if (config.debug_send) {
+            if (config.debug_send_job) {
                 log_messages.printf(MSG_NORMAL,
-                    "[send] [WU#%u] meets deadline: %.2f + %.2f < %d\n",
+                    "[send_job] [WU#%u] meets deadline: %.2f + %.2f < %d\n",
                     wu.id, get_estimated_delay(bav), ewd, wu.delay_bound
                 );
             }
@@ -302,18 +303,18 @@ int wu_is_infeasible_fast(
     //
     if (app_hr_type(app)) {
         if (hr_unknown_class(g_reply->host, app_hr_type(app))) {
-            if (config.debug_send) {
+            if (config.debug_send_job) {
                 log_messages.printf(MSG_NORMAL,
-                    "[send] [HOST#%d] [WU#%u %s] host is of unknown class in HR type %d\n",
+                    "[send_job] [HOST#%d] [WU#%u %s] host is of unknown class in HR type %d\n",
                     g_reply->host.id, wu.id, wu.name, app_hr_type(app)
                 );
             }
             return INFEASIBLE_HR;
         }
         if (already_sent_to_different_hr_class(wu, app)) {
-            if (config.debug_send) {
+            if (config.debug_send_job) {
                 log_messages.printf(MSG_NORMAL,
-                    "[send] [HOST#%d] [WU#%u %s] failed quick HR check: WU is class %d, host is class %d\n",
+                    "[send_job] [HOST#%d] [WU#%u %s] failed quick HR check: WU is class %d, host is class %d\n",
                     g_reply->host.id, wu.id, wu.name, wu.hr_class, hr_class(g_request->host, app_hr_type(app))
                 );
             }
@@ -326,9 +327,9 @@ int wu_is_infeasible_fast(
     if (app.homogeneous_app_version) {
         int avid = wu.app_version_id;
         if (avid && bav.avp->id != avid) {
-            if (config.debug_send) {
+            if (config.debug_send_job) {
                 log_messages.printf(MSG_NORMAL,
-                    "[send] [HOST#%d] [WU#%u %s] failed homogeneous app version check: %d %d\n",
+                    "[send_job] [HOST#%d] [WU#%u %s] failed homogeneous app version check: %d %d\n",
                     g_reply->host.id, wu.id, wu.name, avid, bav.avp->id
                 );
             }
@@ -403,9 +404,9 @@ int slow_check(
             return 1;
         } else {
             if (n>0) {
-                if (config.debug_send) {
+                if (config.debug_send_job) {
                     log_messages.printf(MSG_NORMAL,
-                        "[send] [USER#%d] already has %d result(s) for [WU#%u]\n",
+                        "[send_job] [USER#%d] already has %d result(s) for [WU#%u]\n",
                         g_reply->user.id, n, wu.id
                     );
                 }
@@ -427,9 +428,9 @@ int slow_check(
             return 1;
         } else {
             if (n>0) {
-                if (config.debug_send) {
+                if (config.debug_send_job) {
                     log_messages.printf(MSG_NORMAL,
-                        "[send] [HOST#%d] already has %d result(s) for [WU#%u]\n",
+                        "[send_job] [HOST#%d] already has %d result(s) for [WU#%u]\n",
                         g_reply->host.id, n, wu.id
                     );
                 }
@@ -464,9 +465,9 @@ int slow_check(
         if (app_hr_type(*app)) {
             wu.hr_class = vals[0];
             if (already_sent_to_different_hr_class(wu, *app)) {
-                if (config.debug_send) {
+                if (config.debug_send_job) {
                     log_messages.printf(MSG_NORMAL,
-                        "[send] [HOST#%d] [WU#%u %s] is assigned to different HR class\n",
+                        "[send_job] [HOST#%d] [WU#%u %s] is assigned to different HR class\n",
                         g_reply->host.id, wu.id, wu.name
                     );
                 }
@@ -482,9 +483,9 @@ int slow_check(
             int wu_avid = vals[1];
             wu.app_version_id = wu_avid;
             if (wu_avid && wu_avid != bavp->avp->id) {
-                if (config.debug_send) {
+                if (config.debug_send_job) {
                     log_messages.printf(MSG_NORMAL,
-                        "[send] [HOST#%d] [WU#%u %s] is assigned to different app version\n",
+                        "[send_job] [HOST#%d] [WU#%u %s] is assigned to different app version\n",
                         g_reply->host.id, wu.id, wu.name
                     );
                 }
diff --git a/sched/sched_config.cpp b/sched/sched_config.cpp
index 6a826f3..0a2870e 100644
--- a/sched/sched_config.cpp
+++ b/sched/sched_config.cpp
@@ -92,6 +92,7 @@ int SCHED_CONFIG::parse(FILE* f) {
     max_ncpus = MAX_NCPUS;
     scheduler_log_buffer = 32768;
     version_select_random_factor = 1.;
+    maintenance_delay = 3600;
 
     if (!xp.parse_start("boinc")) return ERR_XML_PARSE;
     if (!xp.parse_start("config")) return ERR_XML_PARSE;
@@ -141,6 +142,7 @@ int SCHED_CONFIG::parse(FILE* f) {
         if (xp.parse_bool("non_cpu_intensive", non_cpu_intensive)) continue;
         if (xp.parse_bool("verify_files_on_app_start", verify_files_on_app_start)) continue;
         if (xp.parse_int("homogeneous_redundancy", homogeneous_redundancy)) continue;
+        if (xp.parse_bool("hr_class_static", hr_class_static)) continue;
         if (xp.parse_bool("hr_allocate_slots", hr_allocate_slots)) continue;
         if (xp.parse_bool("msg_to_host", msg_to_host)) continue;
         if (xp.parse_bool("ignore_upload_certificates", ignore_upload_certificates)) continue;
@@ -228,7 +230,7 @@ int SCHED_CONFIG::parse(FILE* f) {
             }
             continue;
         }
-        if (xp.parse_bool("matchmaker", matchmaker)) continue;
+        if (xp.parse_bool("sched_old", sched_old)) continue;
         if (xp.parse_int("max_ncpus", max_ncpus)) continue;
         if (xp.parse_int("max_wus_in_progress", itemp)) {
             max_jobs_in_progress.project_limits.proc_type_limits[PROC_TYPE_CPU].base_limit = itemp;
@@ -264,8 +266,6 @@ int SCHED_CONFIG::parse(FILE* f) {
         }
         if (xp.parse_int("min_core_client_upgrade_deadline", min_core_client_upgrade_deadline)) continue;
         if (xp.parse_int("min_sendwork_interval", min_sendwork_interval)) continue;
-        if (xp.parse_int("mm_min_slots", mm_min_slots)) continue;
-        if (xp.parse_int("mm_max_slots", mm_max_slots)) continue;
         if (xp.parse_double("next_rpc_delay", next_rpc_delay)) continue;
         if (xp.parse_bool("no_amd_k6", no_amd_k6)) {
             if (no_amd_k6) {
@@ -296,11 +296,11 @@ int SCHED_CONFIG::parse(FILE* f) {
         if (xp.parse_bool("workload_sim", workload_sim)) continue;
         if (xp.parse_bool("prefer_primary_platform", prefer_primary_platform)) continue;
         if (xp.parse_double("version_select_random_factor", version_select_random_factor)) continue;
+        if (xp.parse_double("maintenance_delay", maintenance_delay)) continue;
+        if (xp.parse_bool("credit_by_app", credit_by_app)) continue;
 
         //////////// SCHEDULER LOG FLAGS /////////
 
-        if (xp.parse_bool("debug_array", debug_array)) continue;
-        if (xp.parse_bool("debug_array_detail", debug_array_detail)) continue;
         if (xp.parse_bool("debug_assignment", debug_assignment)) continue;
         if (xp.parse_bool("debug_client_files", debug_client_files)) continue;
         if (xp.parse_bool("debug_credit", debug_credit)) continue;
@@ -316,6 +316,8 @@ int SCHED_CONFIG::parse(FILE* f) {
         if (xp.parse_bool("debug_request_headers", debug_request_headers)) continue;
         if (xp.parse_bool("debug_resend", debug_resend)) continue;
         if (xp.parse_bool("debug_send", debug_send)) continue;
+        if (xp.parse_bool("debug_send_job", debug_send_job)) continue;
+        if (xp.parse_bool("debug_send_scan", debug_send_scan)) continue;
         if (xp.parse_bool("debug_user_messages", debug_user_messages)) continue;
         if (xp.parse_bool("debug_vda", debug_vda)) continue;
         if (xp.parse_bool("debug_version_select", debug_version_select)) continue;
diff --git a/sched/sched_config.h b/sched/sched_config.h
index 63979a4..04cacb7 100644
--- a/sched/sched_config.h
+++ b/sched/sched_config.h
@@ -67,6 +67,7 @@ struct SCHED_CONFIG {
     bool verify_files_on_app_start;
     int homogeneous_redundancy;
     bool hr_allocate_slots;
+    bool hr_class_static;
     bool ignore_upload_certificates;
     bool dont_generate_upload_certificates;
     int uldl_dir_fanout;        // fanout of ul/dl dirs; 0 if none
@@ -122,7 +123,7 @@ struct SCHED_CONFIG {
     int locality_scheduling_send_timeout;
     vector<regex_t> *locality_scheduling_workunit_file;
     vector<regex_t> *locality_scheduling_sticky_file;
-    bool matchmaker;
+    bool sched_old;
     int max_download_urls_per_file;
     int max_ncpus;
     JOB_LIMITS max_jobs_in_progress;
@@ -136,8 +137,6 @@ struct SCHED_CONFIG {
     int min_core_client_version_announced;
     int min_core_client_upgrade_deadline;
     int min_sendwork_interval;
-    int mm_min_slots;
-    int mm_max_slots;
     double next_rpc_delay;
     bool no_amd_k6;
         // don't allow AMD K6 CPUs
@@ -179,11 +178,15 @@ struct SCHED_CONFIG {
     bool estimate_flops_from_hav_pfc;
         // Use host_app_version peak flop count rather than elapsed time 
         // to calculate projected_flops when choosing version.
+    bool credit_by_app;
+        // store per-app credit info in credit_user and credit_team
+
+    // time intervals
+    double maintenance_delay;
+        // if stop_sched is set, tell clients to delay this much
 
     // scheduler log flags
     //
-    bool debug_array;               // debug job-cache scheduling
-    bool debug_array_detail;        // show slot-level info
     bool debug_assignment;
     bool debug_credit;
     bool debug_edf_sim_detail;      // show details of EDF sim
@@ -199,6 +202,11 @@ struct SCHED_CONFIG {
     bool debug_request_headers;
     bool debug_resend;
     bool debug_send;
+        // job dispatch, high-level stuff, e.g. request params and jobs sent
+    bool debug_send_scan;
+        // job dispatch at the level of scans through array
+    bool debug_send_job;
+        // job dispatch: why individual jobs weren't sent (most verbose)
     bool debug_user_messages;
     bool debug_vda;
     bool debug_version_select;
diff --git a/sched/sched_customize.cpp b/sched/sched_customize.cpp
index c540640..36487b8 100644
--- a/sched/sched_customize.cpp
+++ b/sched/sched_customize.cpp
@@ -37,10 +37,6 @@
 // app_plan_uses_gpu():
 //      Which plan classes use GPUs
 //
-// JOB::get_score():
-//      Determine the value of sending a particular job to host;
-//      (used only by "matchmaker" scheduling)
-//
 // WARNING: if you modify this file, you must prevent it from
 // being overwritten the next time you update BOINC source code.
 // You can either:
@@ -100,7 +96,7 @@ GPU_REQUIREMENTS gpu_requirements[NPROC_TYPES];
 
 bool wu_is_infeasible_custom(WORKUNIT& wu, APP& app, BEST_APP_VERSION& bav) {
 #if 0
-    // example: if WU name contains "_v1", don't use GPU apps.
+    // example 1: if WU name contains "_v1", don't use GPU apps.
     // Note: this is slightly suboptimal.
     // If the host is able to accept both GPU and CPU jobs,
     // we'll skip this job rather than send it for the CPU.
@@ -111,7 +107,7 @@ bool wu_is_infeasible_custom(WORKUNIT& wu, APP& app, BEST_APP_VERSION& bav) {
     }
 #endif
 #if 0
-    // example: for NVIDIA GPU app,
+    // example 2: for NVIDIA GPU app,
     // wu.batch is the minimum number of GPU processors.
     // Don't send if #procs is less than this.
     //
@@ -122,68 +118,12 @@ bool wu_is_infeasible_custom(WORKUNIT& wu, APP& app, BEST_APP_VERSION& bav) {
         }
     }
 #endif
-#if defined(SETIATHOME)
-    bool infeasible=false;
-    static bool send_vlar_to_gpu=false;
-    static bool sah_config_checked=false;
-    char buff[256];
-
-    // check the projects app config whether to send vlar wus to gpus 
-    if (!sah_config_checked) {
-        MIOFILE mf;
-        XML_PARSER xp(&mf);
-#ifndef _USING_FCGI_
-        FILE *f=fopen(config.project_path("sah_config.xml"),"r");
-#else
-        FCGI_FILE *f=FCGI::fopen(config.project_path("sah_config.xml"),"r");
-#endif
-        if (f) {
-            mf.init_file(f);
-            if (xp.parse_start("sah") && xp.parse_start("config")) {
-                while (!xp.get_tag()) {
-                   if (!xp.is_tag) continue;
-                   if (xp.parse_bool("send_vlar_to_gpu",send_vlar_to_gpu)) continue;
-                   if (xp.match_tag("/config")) break;
-                   xp.skip_unexpected(false, "wu_is_infeasible_custom");
-                }
-            }
-            fclose(f);
-        }
-        sah_config_checked=true;
-    } 
-    // example: if CUDA app and WU name contains ".vlar", don't send
-    // to NVIDIA, INTEL or older ATI cards
+#if 0
+    // example 3: require that wu.opaque = user.donated
     //
-    if (bav.host_usage.uses_gpu() && strstr(wu.name, ".vlar")) {
-        if (send_vlar_to_gpu) {
-            if (bav.host_usage.proc_type == PROC_TYPE_AMD_GPU) {
-                // ATI GPUs older than HD7870
-                COPROC_ATI &cp = g_request->coprocs.ati;
-                if (cp.count && (cp.attribs.target < 15)) {
-                  infeasible=true;
-                }
-            } else if (bav.host_usage.proc_type == PROC_TYPE_NVIDIA_GPU)  {
-                COPROC_NVIDIA &cp = g_request->coprocs.nvidia;
-                if (cp.count) {
-                    int v = (cp.prop.major)*100 + cp.prop.minor;
-                    if (v < 300) {
-                        infeasible=true;
-                    }
-                }
-            } else {   
-              // all other GPUS
-              infeasible=true;
-            }
-        } else {
-            infeasible=true;
-        }
-    }
-    if (infeasible && config.debug_version_select) {
-        log_messages.printf(MSG_NORMAL,
-            "[version] [setiathome] VLAR workunit is infeasible on this GPU\n"
-        );
+    if (wu.opaque && wu.opaque != g_reply->user.donated) {
+        return true;
     }
-    return infeasible;
 #endif
     return false;
 }
diff --git a/sched/sched_locality.cpp b/sched/sched_locality.cpp
index 7fa829d..ef74ae6 100644
--- a/sched/sched_locality.cpp
+++ b/sched/sched_locality.cpp
@@ -48,6 +48,8 @@
 
 #define VERBOSE_DEBUG
 
+#define EINSTEIN_AT_HOME
+
 // get filename from result name
 //
 
@@ -1193,6 +1195,11 @@ void send_work_locality() {
     if (config.locality_scheduling_send_timeout && g_request->host.n_bwdown>100000) {
         int until=time(0)-config.locality_scheduling_send_timeout;
         int retval_sow=send_old_work(INT_MIN, until);
+        if (retval_sow) {
+            log_messages.printf(MSG_NORMAL,
+                "[locality] send_old_work() returned %d\n", retval_sow
+            );
+        }
         if (!work_needed(true)) return;
     }
 
diff --git a/sched/sched_main.cpp b/sched/sched_main.cpp
index 9649fa1..45a539f 100644
--- a/sched/sched_main.cpp
+++ b/sched/sched_main.cpp
@@ -304,7 +304,7 @@ void attach_to_feeder_shmem() {
             getuid(), geteuid(), getgid(), getegid()
         );
         send_message(
-            "Server error: feeder not running", 3600
+            "Server error: feeder not running", config.maintenance_delay
         );
         exit(0);
     } else {
@@ -314,7 +314,7 @@ void attach_to_feeder_shmem() {
             log_messages.printf(MSG_CRITICAL,
                 "shmem has wrong struct sizes - recompile\n"
             );
-            send_message("Server error: recompile needed", 3600);
+            send_message("Server error: recompile needed", config.maintenance_delay);
             exit(0);
         }
 
@@ -330,7 +330,7 @@ void attach_to_feeder_shmem() {
                 "feeder doesn't seem to be running\n"
             );
             send_message(
-                "Server error: feeder not running", 3600
+                "Server error: feeder not running", config.maintenance_delay
             );
             exit(0);
         }
@@ -429,7 +429,7 @@ int main(int argc, char** argv) {
         if (!freopen(path, "a", stderr)) {
             fprintf(stderr, "Can't redirect stderr\n");
             sprintf(buf, "Server can't open log file (%s)", path);
-            send_message(buf, 3600);
+            send_message(buf, config.maintenance_delay);
             exit(1);
         }
 #else
@@ -440,7 +440,7 @@ int main(int argc, char** argv) {
             char buf[256];
             fprintf(stderr, "Can't redirect FCGI log messages\n");
             sprintf(buf, "Server can't open log file for FCGI (%s)", path);
-            send_message(buf, 3600);
+            send_message(buf, config.maintenance_delay);
             exit(1);
         }
 #endif
@@ -486,7 +486,7 @@ int main(int argc, char** argv) {
         log_messages.printf(MSG_CRITICAL,
             "Can't parse config.xml: %s\n", boincerror(retval)
         );
-        send_message("Server can't parse configuration file", 3600);
+        send_message("Server can't parse configuration file", config.maintenance_delay);
         exit(0);
     }
 
@@ -503,7 +503,7 @@ int main(int argc, char** argv) {
         log_messages.printf(MSG_CRITICAL,
             "Can't read code sign key file (%s)\n", path
         );
-        send_message("Server can't find key file", 3600);
+        send_message("Server can't find key file", config.maintenance_delay);
         exit(0);
     }
     strip_whitespace(code_sign_key);
@@ -521,7 +521,10 @@ int main(int argc, char** argv) {
     }
 
     if (!debug_log && check_stop_sched()) {
-        send_message("Project is temporarily shut down for maintenance", 3600);
+        send_message(
+            "Project is temporarily shut down for maintenance",
+            config.maintenance_delay
+        );
         goto done;
     }
 
@@ -529,7 +532,7 @@ int main(int argc, char** argv) {
         attach_to_feeder_shmem();
     }
     if (!ssp) {
-        send_message("Server error: can't attach shared memory", 3600);
+        send_message("Server error: can't attach shared memory", config.maintenance_delay);
         goto done;
     }
 
@@ -557,7 +560,7 @@ int main(int argc, char** argv) {
 #endif
         if (!fout) {
             log_messages.printf(MSG_CRITICAL,
-                "can't write client  file\n"
+                "can't write client log file %s\n", log_path
             );
             exit(1);
         }
@@ -656,8 +659,8 @@ done:
             log_messages.printf(MSG_NORMAL,
                 "FCGI: counter: %d\n", counter
             );
-            log_messages.flush();
         }
+        log_messages.flush();
     }   // do()
     if (counter == MAX_FCGI_COUNT) {
         fprintf(stderr, "FCGI: counter passed MAX_FCGI_COUNT - exiting..\n");
diff --git a/sched/sched_nci.cpp b/sched/sched_nci.cpp
index 34e29f6..e14d66a 100644
--- a/sched/sched_nci.cpp
+++ b/sched/sched_nci.cpp
@@ -34,9 +34,10 @@ static bool can_send_nci(
 ) {
     bavp = get_app_version(wu, true, false);
     if (!bavp) {
-        if (config.debug_send) {
+        if (config.debug_send_job) {
             log_messages.printf(MSG_NORMAL,
-                "[send] No app version for NCI job; skipping\n"
+                "[send_job] [WU#%u] No app version for NCI job; skipping\n",
+                wu.id
             );
         }
         return false;
@@ -48,9 +49,10 @@ static bool can_send_nci(
         *app, *bavp
     );
     if (retval) {
-        if (config.debug_send) {
+        if (config.debug_send_job) {
             log_messages.printf(MSG_NORMAL,
-                "[send] wu_is_infeasible_fast() failed for NCI job; skipping\n"
+                "[send_job] [WU#%u] wu_is_infeasible_fast() failed for NCI job; skipping\n",
+                wu.id
             );
         }
         return false;
diff --git a/sched/sched_result.cpp b/sched/sched_result.cpp
index 8e50f85..55f5ab9 100644
--- a/sched/sched_result.cpp
+++ b/sched/sched_result.cpp
@@ -305,21 +305,28 @@ int handle_results() {
         srip->peak_swap_size = rp->peak_swap_size;
         srip->peak_disk_usage = rp->peak_disk_usage;
 
-        // Some buggy clients sporadically report very low elapsed time
-        // but actual CPU time.
-        // Try to fix the elapsed time, since it's critical to credit
+        // elapsed time is used to compute credit.
+        // do various sanity checks on it.
+
+        // 1) Some buggy clients report very low elapsed time
+        // but actual CPU time;
+        // if it's a single-thread app, set ET = CPU
         //
         if (srip->elapsed_time < srip->cpu_time) {
             int avid = srip->app_version_id;
             if (avid > 0) {
                 APP_VERSION* avp = ssp->lookup_app_version(avid);
                 if (avp && !avp->is_multithread()) {
+                    log_messages.printf(MSG_NORMAL,
+                        "[HOST#%d] [RESULT#%u] elapsed time %f < CPU %f for seq app; setting to CPU\n",
+                        srip->hostid, srip->id, srip->elapsed_time, srip->cpu_time
+                    );
                     srip->elapsed_time = srip->cpu_time;
                 }
             }
         }
 
-        // check for impossible elapsed time
+        // 2) If it's negative, set to zero
         //
         if (srip->elapsed_time < 0) {
             log_messages.printf(MSG_NORMAL,
@@ -329,6 +336,19 @@ int handle_results() {
             );
             srip->elapsed_time = 0;
         }
+
+        // 3) If it's zero, set to CPU time.
+        //
+        if (srip->elapsed_time == 0 && srip->cpu_time > 0) {
+            srip->elapsed_time = srip->cpu_time;
+            log_messages.printf(MSG_NORMAL,
+                "[HOST#%d] [RESULT#%u] elapsed time is zero; setting to CPU time %f\n",
+                srip->hostid, srip->id, srip->cpu_time
+            );
+        }
+
+        // 4) If it's greater than turnaround time, set to turnaround time
+        //
         double turnaround_time = srip->received_time - srip->sent_time;
         if (turnaround_time < 0) {
             log_messages.printf(MSG_CRITICAL,
@@ -346,7 +366,7 @@ int handle_results() {
             }
         }
 
-        // check for impossible CPU time
+        // Now do sanity check on CPU time
         //
         if (srip->cpu_time > srip->elapsed_time*g_reply->host.p_ncpus) {
             log_messages.printf(MSG_NORMAL,
diff --git a/sched/sched_score.cpp b/sched/sched_score.cpp
index ce4668b..09ca239 100644
--- a/sched/sched_score.cpp
+++ b/sched/sched_score.cpp
@@ -67,9 +67,9 @@ bool JOB::get_score(WU_RESULT& wu_result) {
         if (g_wreq->allow_beta_work) {
             score += 1;
         } else {
-            if (config.debug_send) {
+            if (config.debug_send_job) {
                 log_messages.printf(MSG_NORMAL,
-                    "[send] can't send job %d for beta app to non-beta user\n",
+                    "[send_job] can't send job %d for beta app to non-beta user\n",
                     wu_result.workunit.id
                 );
             }
@@ -81,6 +81,12 @@ bool JOB::get_score(WU_RESULT& wu_result) {
         if (g_wreq->allow_non_preferred_apps) {
             score -= 1;
         } else {
+            if (config.debug_send_job) {
+                log_messages.printf(MSG_NORMAL,
+                    "[send_job] app not selected for job %d\n",
+                    wu_result.workunit.id
+                );
+            }
             return false;
         }
     }
@@ -107,9 +113,9 @@ bool JOB::get_score(WU_RESULT& wu_result) {
     if (app->n_size_classes > 1) {
         double effective_speed = bavp->host_usage.projected_flops * available_frac(*bavp);
         int target_size = get_size_class(*app, effective_speed);
-        if (config.debug_send) {
+        if (config.debug_send_job) {
             log_messages.printf(MSG_NORMAL,
-                "[send] size: host %d job %d speed %f\n",
+                "[send_job] size: host %d job %d speed %f\n",
                 target_size, wu_result.workunit.size_class, effective_speed
             );
         }
@@ -121,9 +127,9 @@ bool JOB::get_score(WU_RESULT& wu_result) {
             score -= 1;
         }
     }
-    if (config.debug_send) {
+    if (config.debug_send_job) {
         log_messages.printf(MSG_NORMAL,
-            "[send]: score %f for result %d\n", score, wu_result.resultid
+            "[send_job]: score %f for result %d\n", score, wu_result.resultid
         );
     }
 
@@ -160,35 +166,67 @@ static void restore_others(int rt) {
 void send_work_score_type(int rt) {
     vector<JOB> jobs;
 
-    if (config.debug_send) {
+    if (config.debug_send_scan) {
         log_messages.printf(MSG_NORMAL,
-            "[send] scanning for %s jobs\n", proc_type_name(rt)
+            "[send_scan] scanning for %s jobs\n", proc_type_name(rt)
         );
     }
 
     clear_others(rt);
 
-    int nscan = config.mm_max_slots;
-    if (!nscan) nscan = ssp->max_wu_results;
+    int nscan = ssp->max_wu_results;
     int rnd_off = rand() % ssp->max_wu_results;
+    if (config.debug_send_scan) {
+        log_messages.printf(MSG_NORMAL,
+            "[send_scan] scanning %d slots starting at %d\n", nscan, rnd_off
+        );
+    }
     for (int j=0; j<nscan; j++) {
         int i = (j+rnd_off) % ssp->max_wu_results;
         WU_RESULT& wu_result = ssp->wu_results[i];
-        if (wu_result.state != WR_STATE_PRESENT) {
+        if (wu_result.state != WR_STATE_PRESENT  && wu_result.state != g_pid) {
             continue;
         }
         WORKUNIT wu = wu_result.workunit;
         JOB job;
         job.app = ssp->lookup_app(wu.appid);
-        if (job.app->non_cpu_intensive) continue;
+        if (job.app->non_cpu_intensive) {
+            if (config.debug_send_job) {
+                log_messages.printf(MSG_NORMAL,
+                    "[send_job] [RESULT#%u] app is non compute intensive\n",
+                    wu_result.resultid
+                );
+            }
+            continue;
+        }
         job.bavp = get_app_version(wu, true, false);
-        if (!job.bavp) continue;
+        if (!job.bavp) {
+            if (config.debug_send_job) {
+                log_messages.printf(MSG_NORMAL,
+                    "[send_job] [RESULT#%u] no app version available\n",
+                    wu_result.resultid
+                );
+            }
+            continue;
+        }
 
         job.index = i;
         job.result_id = wu_result.resultid;
         if (!job.get_score(wu_result)) {
+            if (config.debug_send_job) {
+                log_messages.printf(MSG_NORMAL,
+                    "[send_job] [RESULT#%u] get_score() returned false\n",
+                    wu_result.resultid
+                );
+            }
             continue;
         }
+        if (config.debug_send_job) {
+            log_messages.printf(MSG_NORMAL,
+                "[send_job] [RESULT#%u] score: %f\n",
+                wu_result.resultid, job.score
+            );
+        }
         jobs.push_back(job);
     }
 
@@ -196,13 +234,31 @@ void send_work_score_type(int rt) {
 
     bool sema_locked = false;
     for (unsigned int i=0; i<jobs.size(); i++) {
+
+        // check limit on total jobs
+        //
         if (!work_needed(false)) {
             break;
         }
+
+        // check limit on jobs for this processor type
+        //
         if (!g_wreq->need_proc_type(rt)) {
             break;
         }
         JOB& job = jobs[i];
+
+        // check limits on jobs for this (app, processor type)
+        //
+        if (config.max_jobs_in_progress.exceeded(job.app, job.bavp->host_usage.proc_type)) {
+            if (config.debug_quota) {
+                log_messages.printf(MSG_NORMAL,
+                    "[quota] limit for app/proctype exceeded\n"
+                );
+            }
+            continue;
+        }
+
         if (!sema_locked) {
             lock_sema();
             sema_locked = true;
@@ -212,7 +268,7 @@ void send_work_score_type(int rt) {
         // array is locked at this point.
         //
         WU_RESULT& wu_result = ssp->wu_results[job.index];
-        if (wu_result.state != WR_STATE_PRESENT) {
+        if (wu_result.state != WR_STATE_PRESENT  && wu_result.state != g_pid) {
             continue;
         }
         if (wu_result.resultid != job.result_id) {
@@ -285,7 +341,7 @@ void send_work_score_type(int rt) {
 }
 
 void send_work_score() {
-    for (int i=0; i<NPROC_TYPES; i++) {
+    for (int i=NPROC_TYPES-1; i>= 0; i--) {
         if (g_wreq->need_proc_type(i)) {
             send_work_score_type(i);
         }
diff --git a/sched/sched_send.cpp b/sched/sched_send.cpp
index bda585f..adbc27a 100644
--- a/sched/sched_send.cpp
+++ b/sched/sched_send.cpp
@@ -151,7 +151,7 @@ void WORK_REQ_BASE::get_job_limits() {
     for (i=1; i<g_request->coprocs.n_rsc; i++) {
         COPROC& cp = g_request->coprocs.coprocs[i];
         int proc_type = coproc_type_name_to_num(cp.type);
-        if (!proc_type) continue;
+        if (proc_type < 0) continue;
         n = cp.count;
         if (n > MAX_GPUS) n = MAX_GPUS;
         ninstances[proc_type] = n;
@@ -265,7 +265,7 @@ void get_reliability_version(HOST_APP_VERSION& hav, double multiplier) {
         if (hav.max_jobs_per_day < config.daily_result_quota) {
             if (config.debug_send) {
                 log_messages.printf(MSG_NORMAL,
-                    "[send] [AV#%d] not reliable; max_jobs_per_day %d>%d\n",
+                    "[send] [AV#%d] not reliable; max_jobs_per_day %d<%d\n",
                     hav.app_version_id,
                     hav.max_jobs_per_day,
                     config.daily_result_quota
@@ -472,9 +472,9 @@ double available_frac(BEST_APP_VERSION& bav) {
 double estimate_duration(WORKUNIT& wu, BEST_APP_VERSION& bav) {
     double edu = estimate_duration_unscaled(wu, bav);
     double ed = edu/available_frac(bav);
-    if (config.debug_send) {
+    if (config.debug_send_job) {
         log_messages.printf(MSG_NORMAL,
-            "[send] est. duration for WU %d: unscaled %.2f scaled %.2f\n",
+            "[send_job] est. duration for WU %d: unscaled %.2f scaled %.2f\n",
             wu.id, edu, ed
         );
     }
@@ -546,7 +546,7 @@ static inline void update_estimated_delay(BEST_APP_VERSION& bav, double dt) {
     if (pt == PROC_TYPE_CPU) {
         g_request->cpu_estimated_delay += dt*bav.host_usage.avg_ncpus/g_request->host.p_ncpus;
     } else {
-        COPROC* cp = g_request->coprocs.type_to_coproc(pt);
+        COPROC* cp = g_request->coprocs.proc_type_to_coproc(pt);
         cp->estimated_delay += dt*bav.host_usage.gpu_usage/cp->count;
     }
 }
@@ -1167,14 +1167,20 @@ void send_gpu_messages() {
     // GPU-only project, client lacks GPU
     //
     bool usable_gpu = false;
+    bool have_gpu_apps = false;
     for (int i=1; i<NPROC_TYPES; i++) {
-        COPROC* cp = g_request->coprocs.type_to_coproc(i);
-        if (ssp->have_apps_for_proc_type[i] && cp->count) {
-            usable_gpu = true;
-            break;
+        if (ssp->have_apps_for_proc_type[i]) {
+            have_gpu_apps = true;
+            COPROC* cp = g_request->coprocs.proc_type_to_coproc(i);
+            if (cp && cp->count) {
+                usable_gpu = true;
+            }
         }
     }
-    if (!ssp->have_apps_for_proc_type[PROC_TYPE_CPU] && !usable_gpu) {
+    if (!ssp->have_apps_for_proc_type[PROC_TYPE_CPU]
+        && have_gpu_apps
+        && !usable_gpu
+    ) {
         char buf[256];
         strcpy(buf, "");
         for (int i=1; i<NPROC_TYPES; i++) {
@@ -1234,7 +1240,7 @@ static void send_user_messages() {
     // If work was sent from apps the user did not select, explain.
     // NOTE: this will have to be done differently with matchmaker scheduling
     //
-    if (!config.locality_scheduling && !config.locality_scheduler_fraction && !config.matchmaker) {
+    if (!config.locality_scheduling && !config.locality_scheduler_fraction && config.sched_old) {
         if (g_wreq->njobs_sent && !g_wreq->user_apps_only) {
             g_reply->insert_message(
                 "No tasks are available for the applications you have selected",
@@ -1423,8 +1429,8 @@ void send_work_setup() {
     // do sanity checking on GPU scheduling parameters
     //
     for (i=1; i<NPROC_TYPES; i++) {
-        COPROC* cp = g_request->coprocs.type_to_coproc(i);
-        if (cp->count) {
+        COPROC* cp = g_request->coprocs.proc_type_to_coproc(i);
+        if (cp && cp->count) {
             g_wreq->req_secs[i] = clamp_req_sec(cp->req_secs);
             g_wreq->req_instances[i] = cp->req_instances;
             if (cp->estimated_delay < 0) {
@@ -1473,8 +1479,8 @@ void send_work_setup() {
     }
     if (config.debug_send) {
         log_messages.printf(MSG_NORMAL,
-            "[send] %s matchmaker scheduling; %s EDF sim\n",
-            config.matchmaker?"Using":"Not using",
+            "[send] %s old scheduling; %s EDF sim\n",
+            config.sched_old?"Using":"Not using",
             config.workload_sim?"Using":"Not using"
         );
         log_messages.printf(MSG_NORMAL,
@@ -1484,8 +1490,8 @@ void send_work_setup() {
             g_request->cpu_estimated_delay
         );
         for (i=1; i<NPROC_TYPES; i++) {
-            COPROC* cp = g_request->coprocs.type_to_coproc(i);
-            if (cp->count) {
+            COPROC* cp = g_request->coprocs.proc_type_to_coproc(i);
+            if (cp && cp->count) {
                 log_messages.printf(MSG_NORMAL,
                     "[send] %s: req %.2f sec, %.2f instances; est delay %.2f\n",
                     proc_type_name(i),
@@ -1604,8 +1610,6 @@ int update_host_app_versions(vector<SCHED_DB_RESULT>& results, int hostid) {
 void send_work() {
     int retval;
 
-    g_wreq->no_jobs_available = true;
-
     if (all_apps_use_hr && hr_unknown_platform(g_request->host)) {
         log_messages.printf(MSG_NORMAL,
             "Not sending work because unknown HR class\n"
@@ -1645,7 +1649,7 @@ void send_work() {
 
     // send non-CPU-intensive jobs if needed
     //
-    if (ssp->have_nci_app && g_request->work_req_seconds > 0) {
+    if (ssp->have_nci_app) {
         send_nci();
     }
 
@@ -1723,10 +1727,10 @@ void send_work() {
         }
     } else if (config.locality_scheduling) {
         send_work_locality();
-    } else if (config.matchmaker) {
-        send_work_score();
-    } else {
+    } else if (config.sched_old) {
         send_work_old();
+    } else {
+        send_work_score();
     }
 
 done:
diff --git a/sched/sched_shmem.cpp b/sched/sched_shmem.cpp
index 84409a4..29fa8a6 100644
--- a/sched/sched_shmem.cpp
+++ b/sched/sched_shmem.cpp
@@ -61,23 +61,43 @@ void SCHED_SHMEM::init(int nwu_results) {
     max_wu_results = nwu_results;
 }
 
-static int error_return(const char* p) {
-    fprintf(stderr, "Error in structure: %s\n", p);
+static int error_return(const char* p, int expe, int got) {
+    fprintf(stderr, "shmem: size mismatch in %s: expected %d, got %d\n", p, expe, got);
     return ERR_SCHED_SHMEM;
 }
 
 int SCHED_SHMEM::verify() {
+    if (platform_size != sizeof(PLATFORM)) {
+        return error_return("platform", sizeof(PLATFORM), platform_size);
+    }
+    if (app_size != sizeof(APP)) {
+        return error_return("app", sizeof(APP), app_size);
+    }
+    if (app_version_size != sizeof(APP_VERSION)) {
+        return error_return("app_version", sizeof(APP_VERSION), app_version_size);
+    }
+    if (assignment_size != sizeof(ASSIGNMENT)) {
+        return error_return("assignment", sizeof(ASSIGNMENT), assignment_size);
+    }
+    if (wu_result_size != sizeof(WU_RESULT)) {
+        return error_return("wu_result", sizeof(WU_RESULT), wu_result_size);
+    }
+    if (max_platforms != MAX_PLATFORMS) {
+        return error_return("max platform", MAX_PLATFORMS, max_platforms);
+    }
+    if (max_apps != MAX_APPS) {
+        return error_return("max apps", MAX_APPS, max_apps);
+    }
+    if (max_app_versions != MAX_APP_VERSIONS) {
+        return error_return("max app versions", MAX_APP_VERSIONS, max_app_versions);
+    }
+    if (max_assignments != MAX_ASSIGNMENTS) {
+        return error_return("max assignments", MAX_ASSIGNMENTS, max_assignments);
+    }
     int size = sizeof(SCHED_SHMEM) + max_wu_results*sizeof(WU_RESULT);
-    if (ss_size != size) return error_return("shmem");
-    if (platform_size != sizeof(PLATFORM)) return error_return("platform");
-    if (app_size != sizeof(APP)) return error_return("app");
-    if (app_version_size != sizeof(APP_VERSION)) return error_return("app_version");
-    if (assignment_size != sizeof(ASSIGNMENT)) return error_return("assignment");
-    if (wu_result_size != sizeof(WU_RESULT)) return error_return("wu_result");
-    if (max_platforms != MAX_PLATFORMS) return error_return("max platform");
-    if (max_apps != MAX_APPS) return error_return("max apps");
-    if (max_app_versions != MAX_APP_VERSIONS) return error_return("max app versions");
-    if (max_assignments != MAX_ASSIGNMENTS) return error_return("max assignments");
+    if (ss_size != size) {
+        return error_return("shmem segment", size, ss_size);
+    }
     return 0;
 }
 
@@ -213,15 +233,14 @@ int SCHED_SHMEM::scan_tables() {
     }
     for (i=0; i<napp_versions; i++) {
         APP_VERSION& av = app_versions[i];
-        if (strstr(av.plan_class, "cuda") || strstr(av.plan_class, "nvidia")) {
-            have_apps_for_proc_type[PROC_TYPE_NVIDIA_GPU] = true;
-        } else if (strstr(av.plan_class, "ati")) {
-            have_apps_for_proc_type[PROC_TYPE_AMD_GPU] = true;
-        } else if (strstr(av.plan_class, "intel_gpu")) {
-            have_apps_for_proc_type[PROC_TYPE_INTEL_GPU] = true;
-        } else {
-            have_apps_for_proc_type[PROC_TYPE_CPU] = true;
-        }
+        int rt = plan_class_to_proc_type(av.plan_class);
+        have_apps_for_proc_type[rt] = true;
+    }
+    for (i=0; i<NPROC_TYPES; i++) {
+        fprintf(stderr, "have apps for %s: %s\n",
+            proc_type_name(i),
+            have_apps_for_proc_type[i]?"yes":"no"
+        );
     }
 
     n = 0;
diff --git a/sched/sched_types.cpp b/sched/sched_types.cpp
index 2a8e64a..d133929 100644
--- a/sched/sched_types.cpp
+++ b/sched/sched_types.cpp
@@ -71,8 +71,10 @@ int CLIENT_APP_VERSION::parse(XML_PARSER& xp) {
 
             double pf = host_usage.avg_ncpus * g_reply->host.p_fpops;
             if (host_usage.proc_type != PROC_TYPE_CPU) {
-                COPROC* cp = g_request->coprocs.type_to_coproc(host_usage.proc_type);
-                pf += host_usage.gpu_usage*cp->peak_flops;
+                COPROC* cp = g_request->coprocs.proc_type_to_coproc(host_usage.proc_type);
+                if (cp) {
+                    pf += host_usage.gpu_usage*cp->peak_flops;
+                }
             }
             host_usage.peak_flops = pf;
             return 0;
@@ -94,7 +96,7 @@ int CLIENT_APP_VERSION::parse(XML_PARSER& xp) {
             int retval = coproc_req.parse(xp);
             if (!retval) {
                 int rt = coproc_type_name_to_num(coproc_req.type);
-                if (!rt) {
+                if (rt <= 0) {
                     log_messages.printf(MSG_NORMAL,
                         "UNKNOWN COPROC TYPE %s\n", coproc_req.type
                     );
@@ -184,6 +186,7 @@ const char* SCHEDULER_REQUEST::parse(XML_PARSER& xp) {
     strcpy(authenticator, "");
     strcpy(platform.name, "");
     strcpy(cross_project_id, "");
+    strcpy(client_brand, "");
     hostid = 0;
     core_client_major_version = 0;
     core_client_minor_version = 0;
@@ -200,6 +203,7 @@ const char* SCHEDULER_REQUEST::parse(XML_PARSER& xp) {
     strcpy(global_prefs_xml, "");
     strcpy(working_global_prefs_xml, "");
     strcpy(code_sign_key, "");
+    dont_send_work = false;
     memset(&global_prefs, 0, sizeof(global_prefs));
     memset(&host, 0, sizeof(host));
     have_other_results_list = false;
@@ -287,6 +291,7 @@ const char* SCHEDULER_REQUEST::parse(XML_PARSER& xp) {
         if (xp.parse_double("prrs_fraction", prrs_fraction)) continue;
         if (xp.parse_double("estimated_delay", cpu_estimated_delay)) continue;
         if (xp.parse_double("duration_correction_factor", host.duration_correction_factor)) continue;
+        if (xp.parse_bool("dont_send_work", dont_send_work)) continue;
         if (xp.match_tag("global_preferences")) {
             safe_strcpy(global_prefs_xml, "<global_preferences>\n");
             char buf[BLOB_SIZE];
@@ -421,6 +426,9 @@ const char* SCHEDULER_REQUEST::parse(XML_PARSER& xp) {
         if (xp.parse_int("sandbox", sandbox)) continue;
         if (xp.parse_int("allow_multiple_clients", allow_multiple_clients)) continue;
         if (xp.parse_string("client_opaque", client_opaque)) continue;
+        if (xp.parse_str("client_brand", client_brand, sizeof(client_brand))) continue;
+
+        // unused or deprecated stuff follows
 
         if (xp.match_tag("active_task_set")) continue;
         if (xp.match_tag("app")) continue;
@@ -589,6 +597,7 @@ int MSG_FROM_HOST_DESC::parse(XML_PARSER& xp) {
     char buf[256];
 
     msg_text = "";
+    strcpy(variety, "");
     MIOFILE& in = *(xp.f);
     while (in.fgets(buf, sizeof(buf))) {
         if (match_tag(buf, "</msg_from_host>")) return 0;
@@ -619,8 +628,8 @@ static bool have_apps_for_client() {
     for (int i=0; i<NPROC_TYPES; i++) {
         if (ssp->have_apps_for_proc_type[i]) {
             if (!i) return true;
-            COPROC* cp = g_request->coprocs.type_to_coproc(i);
-            if (cp->count) return true;
+            COPROC* cp = g_request->coprocs.proc_type_to_coproc(i);
+            if (cp && cp->count) return true;
         }
     }
     return false;
@@ -935,7 +944,16 @@ int SCHEDULER_REPLY::write(FILE* fout, SCHEDULER_REQUEST& sreq) {
                 ssp->have_apps_for_proc_type[PROC_TYPE_AMD_GPU]?0:1
             );
         }
+
+        // write modern form.
+        //
         for (i=0; i<NPROC_TYPES; i++) {
+            if (i>0) {
+                // skip types that the client doesn't have
+                //
+                COPROC* cp = g_request->coprocs.proc_type_to_coproc(i);
+                if (!cp || !cp->count) continue;
+            }
             if (!ssp->have_apps_for_proc_type[i]) {
                 fprintf(fout,
                     "<no_rsc_apps>%s</no_rsc_apps>\n",
@@ -1094,6 +1112,16 @@ int APP_VERSION::write(FILE* fout) {
             bavp->host_usage.gpu_usage
         );
     }
+    if (strlen(bavp->host_usage.custom_coproc_type)) {
+        fprintf(fout,
+            "    <coproc>\n"
+            "        <type>%s</type>\n"
+            "        <count>%f</count>\n"
+            "    </coproc>\n",
+            bavp->host_usage.custom_coproc_type,
+            bavp->host_usage.gpu_usage
+        );
+    }
     if (bavp->host_usage.gpu_ram) {
         fprintf(fout,
             "    <gpu_ram>%f</gpu_ram>\n",
@@ -1253,7 +1281,6 @@ int HOST::parse(XML_PARSER& xp) {
         if (xp.parse_double("n_bwdown", n_bwdown)) continue;
         if (xp.parse_str("p_features", p_features, sizeof(p_features))) continue;
         if (xp.parse_str("virtualbox_version", virtualbox_version, sizeof(virtualbox_version))) continue;
-        if (xp.parse_str("client_brand", client_brand, sizeof(client_brand))) continue;
         if (xp.parse_bool("p_vm_extensions_disabled", p_vm_extensions_disabled)) continue;
         if (xp.match_tag("opencl_cpu_prop")) {
             int retval = opencl_cpu_prop[num_opencl_cpu_platforms].parse(xp);
diff --git a/sched/sched_types.h b/sched/sched_types.h
index 6dee1aa..55350ab 100644
--- a/sched/sched_types.h
+++ b/sched/sched_types.h
@@ -73,6 +73,9 @@ struct HOST_USAGE {
     double peak_flops;
         // stored in result.flops_estimate, and used for credit calculations
     char cmdline[256];
+    char custom_coproc_type[256];
+        // if we're using a custom GPU type, it's name
+        // TODO: get rid of PROC_TYPE_*, and this
 
     HOST_USAGE() {
         proc_type = PROC_TYPE_CPU;
@@ -83,6 +86,7 @@ struct HOST_USAGE {
         projected_flops = 0;
         peak_flops = 0;
         strcpy(cmdline, "");
+        strcpy(custom_coproc_type, "");
     }
     void sequential_app(double flops) {
         proc_type = PROC_TYPE_CPU;
@@ -286,6 +290,9 @@ struct SCHEDULER_REQUEST {
     char global_prefs_xml[BLOB_SIZE];
     char working_global_prefs_xml[BLOB_SIZE];
     char code_sign_key[4096];
+    bool dont_send_work;
+    char client_brand[256];
+        // as specified in client_brand.txt config file on client
 
     std::vector<CLIENT_APP_VERSION> client_app_versions;
 
@@ -391,9 +398,6 @@ struct WORK_REQ_BASE {
         // instance-seconds requested
     double req_instances[NPROC_TYPES];
         // number of idle instances, use if possible
-    inline bool need_proc_type(int t) {
-        return (req_secs[t]>0) || (req_instances[t]>0);
-    }
     inline void clear_req(int proc_type) {
         req_secs[proc_type] = 0;
         req_instances[proc_type] = 0;
@@ -407,6 +411,13 @@ struct WORK_REQ_BASE {
     //
     bool rsc_spec_request;
 
+    inline bool need_proc_type(int t) {
+        if (rsc_spec_request) {
+            return (req_secs[t]>0) || (req_instances[t]>0);
+        }
+        return seconds_to_fill > 0;
+    }
+
     double disk_available;
     double ram, usable_ram;
     double cpu_available_frac;
diff --git a/sched/sched_util.cpp b/sched/sched_util.cpp
index 38dc8e0..2dd0423 100644
--- a/sched/sched_util.cpp
+++ b/sched/sched_util.cpp
@@ -74,11 +74,11 @@ int count_unsent_results(int& n, int appid, int size_class) {
 }
 
 // Arrange that further results for this workunit
-// will be sent only to hosts with the given user ID.
+// will be sent only to the specific host(s).
 // This could be used, for example, so that late workunits
 // are sent only to cloud or cluster resources
 //
-int restrict_wu_to_user(WORKUNIT& _wu, int userid) {
+static int restrict_wu(WORKUNIT& _wu, int id, int assign_type) {
     DB_RESULT result;
     DB_ASSIGNMENT asg;
     DB_WORKUNIT wu;
@@ -110,14 +110,22 @@ int restrict_wu_to_user(WORKUNIT& _wu, int userid) {
     //
     asg.clear();
     asg.create_time = time(0);
-    asg.target_id = userid;
-    asg.target_type = ASSIGN_USER;
+    asg.target_id = id;
+    asg.target_type = assign_type;
     asg.multi = 0;
     asg.workunitid = wu.id;
     retval = asg.insert();
     return retval;
 }
 
+int restrict_wu_to_user(WORKUNIT& wu, int userid) {
+    return restrict_wu(wu, userid, ASSIGN_USER);
+}
+
+int restrict_wu_to_host(WORKUNIT& wu, int hostid) {
+    return restrict_wu(wu, hostid, ASSIGN_HOST);
+}
+
 // return the min transition time.
 // This lets you check if the transitioner is backed up.
 //
diff --git a/sched/sched_util.h b/sched/sched_util.h
index e47f934..6c2f6fd 100644
--- a/sched/sched_util.h
+++ b/sched/sched_util.h
@@ -51,6 +51,7 @@ inline int generalized_app_version_id(int avid, int appid) {
 extern int count_workunits(int&, const char* query);
 extern int count_unsent_results(int&, int appid, int size_class=-1);
 extern int restrict_wu_to_user(WORKUNIT& wu, int userid);
+extern int restrict_wu_to_host(WORKUNIT& wu, int hostid);
 extern int min_transition_time(double&);
 
 #endif
diff --git a/sched/sched_util_basic.cpp b/sched/sched_util_basic.cpp
index 9b20b57..2381677 100644
--- a/sched/sched_util_basic.cpp
+++ b/sched/sched_util_basic.cpp
@@ -243,9 +243,10 @@ bool is_arg(const char* x, const char* y) {
     return false;
 }
 
-// the following is used, among other things,
-// to enforce limits on in-progress jobs
-// for GPUs and CPUs (see handle_request.cpp)
+// the following is used:
+// - to enforce limits on in-progress jobs for GPUs and CPUs
+//   (see handle_request.cpp)
+// - to determine what resources the project has apps for (sched_shmem.cpp)
 //
 int plan_class_to_proc_type(const char* plan_class) {
     if (strstr(plan_class, "cuda")) {
@@ -260,6 +261,9 @@ int plan_class_to_proc_type(const char* plan_class) {
     if (strstr(plan_class, "intel_gpu")) {
         return PROC_TYPE_INTEL_GPU;
     }
+    if (strstr(plan_class, "miner_asic")) {
+        return PROC_TYPE_MINER_ASIC;
+    }
     return PROC_TYPE_CPU;
 }
 
diff --git a/sched/sched_version.cpp b/sched/sched_version.cpp
index 2d7d4a0..a7bd76d 100644
--- a/sched/sched_version.cpp
+++ b/sched/sched_version.cpp
@@ -94,7 +94,7 @@ inline int scaled_max_jobs_per_day(DB_HOST_APP_VERSION& hav, HOST_USAGE& hu) {
             n *= g_reply->host.p_ncpus;
         }
     } else {
-        COPROC* cp = g_request->coprocs.type_to_coproc(hu.proc_type);
+        COPROC* cp = g_request->coprocs.proc_type_to_coproc(hu.proc_type);
         if (cp->count) {
             n *= cp->count;
         }
@@ -321,7 +321,9 @@ void estimate_flops_anon_platform() {
     }
 }
 
-// compute HOST_USAGE::projected_flops as best we can:
+// compute HOST_USAGE::projected_flops, which is used to estimate job runtime:
+//   est. runtime = wu.rsc_fpops_est / projected_flops
+// so project_flops must reflect systematic errors in rsc_fpops_est
 // 
 // 1) if we have statistics for (host, app version) and
 //    <estimate_flops_from_hav_pfc> is not set use elapsed time,
@@ -626,7 +628,7 @@ BEST_APP_VERSION* get_app_version(
             }
             return bavp;
         }
-        bavi++;
+        ++bavi;
     }
 
     // here if app was not in memoized array,
diff --git a/sched/script_assimilator.cpp b/sched/script_assimilator.cpp
new file mode 100644
index 0000000..035f4dd
--- /dev/null
+++ b/sched/script_assimilator.cpp
@@ -0,0 +1,118 @@
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2014 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/>.
+
+// An assimilator that runs a script to handle completed jobs,
+// so that you can do assimilation in Python, PHP, Perl, bash, etc.
+//
+// cmdline args to this program:
+// --script "scriptname arg1 ... argn"
+//
+// The script assimilates a completed job.
+//
+// arg1 ... argn represent cmdline args to be passed to the script.
+// the options are:
+//
+// files        list of output files of the job's canonical result
+// wu_id        workunit ID
+// result_id    ID of the canonical result
+// runtime      runtime of the canonical result
+//
+// if no args are specified, the script is invoked as
+// scriptname wu_id files
+//
+// If the workunit has no canonical result (i.e. it failed)
+// the script is invoked as
+// scriptname --error N wu_id
+// where N is an integer encoding the reasons for the job's failure
+// (see WU_ERROR_* in html/inc/common_defs.inc)
+
+#include <vector>
+#include <string>
+#include <sys/param.h>
+
+#include "boinc_db.h"
+#include "error_numbers.h"
+#include "sched_msgs.h"
+#include "validate_util.h"
+#include "validator.h"
+#include "sched_config.h"
+
+using std::vector;
+using std::string;
+
+bool first = true;
+vector<string> script;
+
+void parse_cmdline() {
+    for (int i=1; i<g_argc; i++) {
+        if (!strcmp(g_argv[i], "--script")) {
+            script = split(g_argv[++i], ' ');
+            if (script.size() == 1) {
+                script.push_back("wu_id");
+                script.push_back("files");
+            }
+        }
+    }
+    if (!script.size()) {
+        log_messages.printf(MSG_CRITICAL,
+            "script name missing from command line\n"
+        );
+        exit(1);
+    }
+}
+
+int assimilate_handler(
+    WORKUNIT& wu, vector<RESULT>& /*results*/, RESULT& canonical_result
+) {
+    int retval;
+    char cmd[4096], buf[256];
+    unsigned int i, j;
+
+    if (first) {
+        parse_cmdline();
+        first = false;
+    }
+
+    if (wu.canonical_resultid) {
+        sprintf(cmd, "../bin/%s", script[0].c_str());
+        vector<string> paths;
+        retval = get_output_file_paths(canonical_result, paths);
+        if (retval) return retval;
+        for (i=1; i<script.size(); i++) {
+            string& s = script[i];
+            if (s == "files") {
+                for (j=0; j<paths.size(); j++) {
+                    strcat(cmd, " ");
+                    strcat(cmd, paths[j].c_str());
+                }
+            } else if (s == "wu_id") {
+                sprintf(buf, " %d", wu.id);
+                strcat(cmd, buf);
+            } else if (s == "runtime") {
+                sprintf(buf, " %f", canonical_result.elapsed_time);
+                strcat(cmd, buf);
+            }
+        }
+    } else {
+        sprintf(cmd, "../bin/%s --error %d %d",
+            script[0].c_str(), wu.error_mask, wu.id
+        );
+    }
+    retval = system(cmd);
+    if (retval) return retval;
+    return 0;
+}
diff --git a/sched/script_validator.cpp b/sched/script_validator.cpp
index 43b80de..5ee0c65 100644
--- a/sched/script_validator.cpp
+++ b/sched/script_validator.cpp
@@ -15,21 +15,34 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
-// A validator that runs scripts to check and compare results
-// cmdline args:
-// --init_script scriptname
-// --compare_script scriptname
+// A validator that runs scripts to check and compare results,
+// so that you can do your validation in Python, PHP, Perl, bash, etc.
 //
-// the init script is called as
-// scriptname f1 ... fn
-// where f1 ... fn are the output files of a job (there may be just one)
+// cmdline args to this program:
+// --init_script "scriptname arg1 ... argn"
+// --compare_script "scriptname arg1 ... argn"
+//
+// The init script checks the validity of a result,
+// e.g. that the output files have the proper format.
 // It returns zero if the files are valid
 //
-// the compare script is called as
-// scriptname f1 ... fn g1 ... gn
-// where f1 ... fn are the output files of one job,
-// and g1 ... gn are the output files are another job.
-// It returns zero if the files are equivalent.
+// The compare script compares two results.
+// If returns zero if the output files are equivalent.
+//
+// arg1 ... argn represent cmdline args to be passed to the scripts.
+// The options for init_script are:
+//
+// files        list of paths of output files of the result
+// result_id    result ID
+// runtime      task runtime
+//
+// Additional options for compare_script, for the second result:
+// files2       list of paths of output files
+// result_id2   result ID
+// runtime2     task runtime
+//
+// "arg1 ... argn" can be omitted,
+// in which case only the output file paths are passed to the scripts.
 
 #include <sys/param.h>
 
@@ -44,19 +57,25 @@ using std::string;
 using std::vector;
 
 bool first = true;
-char init_script[MAXPATHLEN], compare_script[MAXPATHLEN];
+vector<string> init_script, compare_script;
+    // first element is script path, other elements are args
 
 void parse_cmdline() {
-    strcpy(init_script, "");
-    strcpy(compare_script, "");
     for (int i=1; i<g_argc; i++) {
         if (!strcmp(g_argv[i], "--init_script")) {
-            sprintf(init_script, "../bin/%s", g_argv[++i]);
+            init_script = split(g_argv[++i], ' ');
+            if (init_script.size() == 1) {
+                init_script.push_back(string("files"));
+            }
         } else if (!strcmp(g_argv[i], "--compare_script")) {
-            sprintf(compare_script, "../bin/%s", g_argv[++i]);
+            compare_script = split(g_argv[++i], ' ');
+            if (compare_script.size() == 1) {
+                compare_script.push_back("files");
+                compare_script.push_back("files2");
+            }
         }
     }
-    if (!strlen(init_script) && !strlen(compare_script)) {
+    if (!init_script.size() && !compare_script.size()) {
         log_messages.printf(MSG_CRITICAL,
             "script names missing from command line\n"
         );
@@ -65,7 +84,14 @@ void parse_cmdline() {
 }
 
 int init_result(RESULT& result, void*&) {
-    if (!strlen(init_script)) return 0;
+    unsigned int i, j;
+    char buf[256];
+
+    if (first) {
+        parse_cmdline();
+        first = false;
+    }
+    if (!init_script.size()) return 0;
     vector<string> paths;
     int retval;
     retval = get_output_file_paths(result, paths);
@@ -74,10 +100,21 @@ int init_result(RESULT& result, void*&) {
         return retval;
     }
     char cmd[4096];
-    strcpy(cmd, init_script);
-    for (unsigned int i=0; i<paths.size(); i++) {
-        strcat(cmd, " ");
-        strcat(cmd, paths[i].c_str());
+    sprintf(cmd, "../bin/%s", init_script[0].c_str());
+    for (i=1; i<init_script.size(); i++) {
+        string& s = init_script[i];
+        if (s == "files") {
+            for (j=0; j<paths.size(); j++) {
+                strcat(cmd, " ");
+                strcat(cmd, paths[j].c_str());
+            }
+        } else if (s == "runtime") {
+            sprintf(buf, " %f", result.elapsed_time);
+            strcat(cmd, buf);
+        } else if (s == "result_id") {
+            sprintf(buf, " %d", result.id);
+            strcat(cmd, buf);
+        }
     }
     retval = system(cmd);
     if (retval) {
@@ -87,7 +124,14 @@ int init_result(RESULT& result, void*&) {
 }
 
 int compare_results(RESULT& r1, void*, RESULT const& r2, void*, bool& match) {
-    if (!strlen(compare_script)) {
+    unsigned int i, j;
+    char buf[256];
+
+    if (first) {
+        parse_cmdline();
+        first = false;
+    }
+    if (!compare_script.size()) {
         match = true;
         return 0;
     }
@@ -104,14 +148,32 @@ int compare_results(RESULT& r1, void*, RESULT const& r2, void*, bool& match) {
         return retval;
     }
     char cmd[4096];
-    strcpy(cmd, compare_script);
-    for (unsigned int i=0; i<paths1.size(); i++) {
-        strcat(cmd, " ");
-        strcat(cmd, paths1[i].c_str());
-    }
-    for (unsigned int i=0; i<paths2.size(); i++) {
-        strcat(cmd, " ");
-        strcat(cmd, paths2[i].c_str());
+    sprintf(cmd, "../bin/%s", compare_script[0].c_str());
+    for (i=1; i<compare_script.size(); i++) {
+        string& s = compare_script[i];
+        if (s == "files") {
+            for (j=0; j<paths1.size(); j++) {
+                strcat(cmd, " ");
+                strcat(cmd, paths1[j].c_str());
+            }
+        } else if (s == "files2") {
+            for (j=0; j<paths2.size(); j++) {
+                strcat(cmd, " ");
+                strcat(cmd, paths2[j].c_str());
+            }
+        } else if (s == "runtime") {
+            sprintf(buf, " %f", r1.elapsed_time);
+            strcat(cmd, buf);
+        } else if (s == "result_id") {
+            sprintf(buf, " %d", r1.id);
+            strcat(cmd, buf);
+        } else if (s == "runtime2") {
+            sprintf(buf, " %f", r2.elapsed_time);
+            strcat(cmd, buf);
+        } else if (s == "result_id2") {
+            sprintf(buf, " %d", r2.id);
+            strcat(cmd, buf);
+        }
     }
     retval = system(cmd);
     if (retval) {
diff --git a/sched/start b/sched/start
index 3179bf2..c75fb89 100755
--- a/sched/start
+++ b/sched/start
@@ -151,7 +151,10 @@ def is_daemon(task):
     return task._name == 'daemon'
 
 def get_task_command_basename(task):
-    return os.path.basename(task.cmd.split()[0])
+    x = task.cmd.split()[0]
+    if x == 'run_in_ops':
+        x = task.cmd.split()[1]
+    return os.path.basename(x)
 
 def get_task_output_name(task):
     return os.path.join(log_dir,
diff --git a/sched/transitioner.cpp b/sched/transitioner.cpp
index 55591ac..14ee3cc 100644
--- a/sched/transitioner.cpp
+++ b/sched/transitioner.cpp
@@ -25,6 +25,7 @@
 //   [ --d x ]               debug level x
 //   [ --mod n i ]           process only WUs with (id mod n) == i
 //   [ --sleep_interval x ]  sleep x seconds if nothing to do
+//   [ --wu_id n ]           transition WU n (debugging)
 
 #include "config.h"
 #include <vector>
@@ -67,6 +68,7 @@ int mod_n, mod_i;
 bool do_mod = false;
 bool one_pass = false;
 int sleep_interval = DEFAULT_SLEEP_INTERVAL;
+int wu_id = 0;
 
 void signal_handler(int) {
     log_messages.printf(MSG_NORMAL, "Signaled by simulator\n");
@@ -94,7 +96,7 @@ static int result_timed_out(
         log_messages.printf(MSG_NORMAL,
             "result_timed_out(): hav_lookup failed: %s\n", boincerror(retval)
         );
-        return retval;
+        return 0;
     }
     hav.turnaround.update_var(
         (double)wu_item.delay_bound,
@@ -349,8 +351,10 @@ int handle_wu(
     // also reset app version ID if using HAV
     //
     if (nerrors && !(nsuccess || ninprogress || nno_reply)) {
-        wu_item.hr_class = 0;
-        wu_item.app_version_id = 0;
+        if (!config.hr_class_static) {
+            wu_item.hr_class = 0;
+            wu_item.app_version_id = 0;
+        }
     }
 
     if (nerrors > wu_item.max_error_results) {
@@ -690,6 +694,11 @@ bool do_pass() {
     // loop over entries that are due to be checked
     //
     while (1) {
+        if (wu_id) {
+            // kludge to tell enumerate to return a given WU
+            mod_n = 1;
+            mod_i = wu_id;
+        }
         retval = transitioner.enumerate(
             (int)time(0), SELECT_LIMIT, mod_n, mod_i, items
         );
@@ -714,6 +723,7 @@ bool do_pass() {
         }
 
         if (!one_pass) check_stop_daemons();
+        if (wu_id) break;
     }
     return did_something;
 }
@@ -731,8 +741,10 @@ void main_loop() {
 
     while (1) {
         log_messages.printf(MSG_DEBUG, "doing a pass\n");
-        if (!do_pass()) {
+        if (1) {
+            bool did_something = do_pass();
             if (one_pass) break;
+            if (did_something) continue;
 #ifdef GCL_SIMULATOR
             continue_simulation("transitioner");
             signal(SIGUSR2, simulator_signal_handler);
@@ -802,6 +814,9 @@ int main(int argc, char** argv) {
         } else if (is_arg(argv[i], "v") || is_arg(argv[i], "version")) {
             printf("%s\n", SVN_VERSION);
             exit(0);
+        } else if (is_arg(argv[i], "wu_id")) {
+            wu_id = atoi(argv[++i]);
+            one_pass = true;
         } else {
             log_messages.printf(MSG_CRITICAL, "unknown command line argument: %s\n\n", argv[i]);
             usage(argv[0]);
diff --git a/sched/transitioner_catchup.php b/sched/transitioner_catchup.php
index 1f3282c..be47094 100755
--- a/sched/transitioner_catchup.php
+++ b/sched/transitioner_catchup.php
@@ -27,7 +27,7 @@ function catchup() {
         $now = time();
         $wus = BoincWorkunit::enum("transition_time<$now limit 1");
         if (count($wus) == 0) break;
-        echo "There are ".count($wus)." WUs needing transition.\n";
+        echo "Some WUs need transition - running transitioner.\n";
         system("bin/transitioner --one_pass");
     }
     echo "Transitioner is caught up.\n";
diff --git a/sched/update_stats.cpp b/sched/update_stats.cpp
index 9b806b3..04bc714 100644
--- a/sched/update_stats.cpp
+++ b/sched/update_stats.cpp
@@ -17,7 +17,7 @@
 
 // update_stats:
 // Update average credit for idle users, hosts and teams.
-// These fields are updates as new credit is granted;
+// These fields are updated as new credit is granted;
 // the purpose of this program is to decay credit of entities
 // that are inactive for long periods.
 // Run it about once a day.
diff --git a/sched/validate_util.cpp b/sched/validate_util.cpp
index 1794f05..3ff52cc 100644
--- a/sched/validate_util.cpp
+++ b/sched/validate_util.cpp
@@ -61,7 +61,7 @@ int OUTPUT_FILE_INFO::parse(XML_PARSER& xp) {
     return ERR_XML_PARSE;
 }
 
-int get_output_file_info(RESULT& result, OUTPUT_FILE_INFO& fi) {
+int get_output_file_info(RESULT const& result, OUTPUT_FILE_INFO& fi) {
     char path[MAXPATHLEN];
     string name;
     MIOFILE mf;
@@ -87,7 +87,7 @@ int get_output_file_info(RESULT& result, OUTPUT_FILE_INFO& fi) {
     return ERR_XML_PARSE;
 }
 
-int get_output_file_infos(RESULT& result, vector<OUTPUT_FILE_INFO>& fis) {
+int get_output_file_infos(RESULT const& result, vector<OUTPUT_FILE_INFO>& fis) {
     char path[MAXPATHLEN];
     MIOFILE mf;
     string name;
@@ -115,7 +115,7 @@ int get_output_file_infos(RESULT& result, vector<OUTPUT_FILE_INFO>& fis) {
     return 0;
 }
 
-int get_output_file_path(RESULT& result, string& path) {
+int get_output_file_path(RESULT const& result, string& path) {
     OUTPUT_FILE_INFO fi;
     int retval = get_output_file_info(result, fi);
     if (retval) return retval;
@@ -123,7 +123,7 @@ int get_output_file_path(RESULT& result, string& path) {
     return 0;
 }
 
-int get_output_file_paths(RESULT& result, vector<string>& paths) {
+int get_output_file_paths(RESULT const& result, vector<string>& paths) {
     vector<OUTPUT_FILE_INFO> fis;
     int retval = get_output_file_infos(result, fis);
     if (retval) return retval;
diff --git a/sched/validate_util.h b/sched/validate_util.h
index 14ccc0a..157ad06 100644
--- a/sched/validate_util.h
+++ b/sched/validate_util.h
@@ -30,15 +30,17 @@ struct OUTPUT_FILE_INFO {
     std::string name;
     std::string path;
     bool optional;
+        // sample_bitwise_validator: not an error if this file is missing
     bool no_validate;
+        // sample_bitwise_validator: don't compare this file
 
     int parse(XML_PARSER&);
 };
 
-extern int get_output_file_info(RESULT& result, OUTPUT_FILE_INFO&);
-extern int get_output_file_infos(RESULT& result, std::vector<OUTPUT_FILE_INFO>&);
-extern int get_output_file_path(RESULT& result, std::string&);
-extern int get_output_file_paths(RESULT& result, std::vector<std::string>&);
+extern int get_output_file_info(RESULT const& result, OUTPUT_FILE_INFO&);
+extern int get_output_file_infos(RESULT const& result, std::vector<OUTPUT_FILE_INFO>&);
+extern int get_output_file_path(RESULT const& result, std::string&);
+extern int get_output_file_paths(RESULT const& result, std::vector<std::string>&);
 extern int get_logical_name(
     RESULT& result, std::string& path, std::string& name
 );
@@ -46,4 +48,7 @@ extern int get_logical_name(
 extern int get_credit_from_wu(WORKUNIT&, std::vector<RESULT>& results, double&);
 
 extern bool standalone;
+    // if set, look for output files in the current directory,
+    // not the upload hierarchy.
+    // used by validator_test.
 #endif
diff --git a/sched/validator.cpp b/sched/validator.cpp
index 5915e73..04c5374 100644
--- a/sched/validator.cpp
+++ b/sched/validator.cpp
@@ -308,6 +308,9 @@ int handle_wu(
                 if (!no_credit) {
                     result.granted_credit = canonical_result.granted_credit;
                     grant_credit(host, result.sent_time, result.granted_credit);
+                    if (config.credit_by_app) {
+                        grant_credit_by_app(result, result.granted_credit);
+                    }
                 }
                 break;
             case VALIDATE_STATE_INVALID:
@@ -534,6 +537,9 @@ int handle_wu(
                             result.id, result.name, result.granted_credit,
                             result.hostid
                         );
+                        if (config.credit_by_app) {
+                            grant_credit_by_app(result, credit);
+                        }
                     }
                     break;
                 case VALIDATE_STATE_INVALID:
diff --git a/sched/validator_test.cpp b/sched/validator_test.cpp
index d957719..497682a 100644
--- a/sched/validator_test.cpp
+++ b/sched/validator_test.cpp
@@ -26,9 +26,14 @@
 // and it will compare those two output files
 // (this only works if your functions expect 1 file per result)
 
+#include <stdio.h>
+
 #include "validate_util.h"
 #include "validate_util2.h"
 
+int g_argc;
+char **g_argv;
+
 void usage(char* prog) {
     fprintf(stderr,
         "usage: %s file1 file2\n", prog
@@ -59,27 +64,29 @@ int main(int argc, char** argv) {
         fprintf(stderr, "init_result(r1) returned %d\n", retval);
         exit(1);
     }
+    printf("init_result(r1) succeeded\n");
     retval = init_result(r2, data2);
     if (retval) {
         fprintf(stderr, "init_result(r2) returned %d\n", retval);
         exit(1);
     }
+    printf("init_result(r2) succeeded\n");
     retval = compare_results(r1, data1, r2, data2, match);
     if (retval) {
         fprintf(stderr, "compare_results() returned %d\n", retval);
         exit(1);
     }
+    printf("compare_results returned %s\n", match?"true - result match":"false - results don't match");
     retval = cleanup_result(r1, data1);
     if (retval) {
         fprintf(stderr, "cleanup_result(r1) returned %d\n", retval);
         exit(1);
     }
+    printf("cleanup_result(r1) succeeded\n");
     retval = cleanup_result(r2, data2);
     if (retval) {
         fprintf(stderr, "cleanup_result(r2) returned %d\n", retval);
         exit(1);
     }
-
-    printf("compare_results returned %s\n", match?"true":"false");
-
+    printf("cleanup_result(r2) succeeded\n");
 }
diff --git a/tools/create_work.cpp b/tools/create_work.cpp
index bf8ec8e..f9ce672 100644
--- a/tools/create_work.cpp
+++ b/tools/create_work.cpp
@@ -1,6 +1,6 @@
 // This file is part of BOINC.
 // http://boinc.berkeley.edu
-// Copyright (C) 2014 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
@@ -41,6 +41,9 @@
 
 using std::string;
 
+bool verbose = false;
+bool continue_on_error = false;
+
 void usage() {
     fprintf(stderr,
         "usage: create_work [options] infile1 infile2 ...\n"
@@ -56,6 +59,7 @@ void usage() {
         "   [ --config_dir path ]\n"
         "   [ -d n ]\n"
         "   [ --delay_bound x ]\n"
+        "   [ --hr_class n ]\n"
         "   [ --max_error_results n ]\n"
         "   [ --max_success_results n ]\n"
         "   [ --max_total_results n ]\n"
@@ -72,6 +76,7 @@ void usage() {
         "   [ --target_nresults n ]\n"
         "   [ --target_team ID ]\n"
         "   [ --target_user ID ]\n"
+        "   [ --verbose ]\n"
         "   [ --wu_id ID ]   ID of existing workunit record (used by boinc_submit)\n"
         "   [ --wu_name name ]              default: generate a name based on app name\n"
         "   [ --wu_template filename ]      default: appname_in\n"
@@ -88,6 +93,15 @@ bool arg(char** argv, int i, const char* name) {
     return false;
 }
 
+void check_assign_id(int x) {
+    if (x == 0) {
+        fprintf(stderr,
+            "you must specify a nonzero database ID for assigning jobs to users, teams, or hosts.\n"
+        );
+        exit(1);
+    }
+}
+
 struct JOB_DESC {
     DB_WORKUNIT wu;
     char wu_template[BLOB_SIZE];
@@ -145,6 +159,16 @@ void JOB_DESC::parse_cmdline(int argc, char** argv) {
             id.nbytes = atof(argv[++i]);
             strcpy(id.md5, argv[++i]);
             infiles.push_back(id);
+        } else if (arg(argv, i, "target_host")) {
+            assign_flag = true;
+            assign_type = ASSIGN_HOST;
+            assign_id = atoi(argv[++i]);
+            check_assign_id(assign_id);
+        } else if (arg(argv, i, "target_user")) {
+            assign_flag = true;
+            assign_type = ASSIGN_USER;
+            assign_id = atoi(argv[++i]);
+            check_assign_id(assign_id);
         } else {
             if (!strncmp("-", argv[i], 1)) {
                 fprintf(stderr, "create_work: bad stdin argument '%s'\n", argv[i]);
@@ -158,15 +182,6 @@ void JOB_DESC::parse_cmdline(int argc, char** argv) {
     }
 }
 
-void check_assign_id(int x) {
-    if (x == 0) {
-        fprintf(stderr,
-            "you must specify a nonzero database ID for assigning jobs to users, teams, or hosts.\n"
-        );
-        exit(1);
-    }
-}
-
 int main(int argc, char** argv) {
     DB_APP app;
     int retval;
@@ -217,6 +232,8 @@ int main(int argc, char** argv) {
             jd.wu.rsc_disk_bound = atof(argv[++i]);
         } else if (arg(argv, i, "delay_bound")) {
             jd.wu.delay_bound = atoi(argv[++i]);
+        } else if (arg(argv, i, "hr_class")) {
+            jd.wu.hr_class = atoi(argv[++i]);
         } else if (arg(argv, i, "min_quorum")) {
             jd.wu.min_quorum = atoi(argv[++i]);
         } else if (arg(argv, i, "target_nresults")) {
@@ -278,6 +295,10 @@ int main(int argc, char** argv) {
             id.nbytes = atof(argv[++i]);
             strcpy(id.md5, argv[++i]);
             jd.infiles.push_back(id);
+        } else if (arg(argv, i, "verbose")) {
+            verbose = true;
+        } else if (arg(argv, i, "continue_on_error")) {
+            continue_on_error = true;
         } else {
             if (!strncmp("-", argv[i], 1)) {
                 fprintf(stderr, "create_work: bad argument '%s'\n", argv[i]);
@@ -379,6 +400,16 @@ int main(int argc, char** argv) {
                 if (!strlen(jd2.wu.name)) {
                     sprintf(jd2.wu.name, "%s_%d", jd.wu.name, j);
                 }
+                // if the stdin line specified assignment,
+                // create the job individually
+                //
+                if (jd2.assign_flag) {
+                    jd2.create();
+                    continue;
+                }
+                // otherwise accumulate a SQL query so that we can
+                // create jobs en masse
+                //
                 retval = create_work2(
                     jd2.wu,
                     jd2.wu_template,
@@ -392,7 +423,11 @@ int main(int argc, char** argv) {
                 );
                 if (retval) {
                     fprintf(stderr, "create_work() failed: %d\n", retval);
-                    exit(1);
+                    if (continue_on_error) {
+                        continue;
+                    } else {
+                        exit(1);
+                    }
                 }
                 if (values.size()) {
                     values += ",";
@@ -451,6 +486,9 @@ void JOB_DESC::create() {
         fprintf(stderr, "create_work: %s\n", boincerror(retval));
         exit(1);
     }
+    if (verbose) {
+        fprintf(stderr, "created workunit; name %s, ID %u\n", wu.name, wu.id);
+    }
     if (assign_flag) {
         DB_ASSIGNMENT assignment;
         assignment.clear();
diff --git a/tools/make_project b/tools/make_project
index 357f7ea..4156e33 100755
--- a/tools/make_project
+++ b/tools/make_project
@@ -324,6 +324,9 @@ 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
+
     <Directory "%(proot)s/html">
         Options Indexes FollowSymlinks MultiViews
         AllowOverride AuthConfig
diff --git a/tools/stage_file b/tools/stage_file
index a1f0410..7701e52 100755
--- a/tools/stage_file
+++ b/tools/stage_file
@@ -24,11 +24,14 @@
 //
 // Usage (from project dir):
 //
-// bin/stage_file [--gzip] [--copy] file
+// bin/stage_file [--gzip] [--copy] path
 //
 // --gzip       Make a gzipped version of the file.
 //              Use this if you specify <gzip> in the <file_info>
 // --copy       Copy the file (default is to move it)
+//
+// path         The file to be staged.
+//              If it's a directory, stage all the files in that dir
 
 function error_exit($msg) {
     echo $msg;
@@ -45,17 +48,100 @@ require_once("html/inc/dir_hier.inc");
 require_once("html/inc/util_basic.inc");
 
 function usage() {
-    error_exit("usage: stage_file [--gzip] [--copy] file
+    error_exit("usage: stage_file [--gzip] [--copy] path
     --gzip      make a gzipped version of file for compressed download
                 (use with <gzip/> in the input template)
     --copy      copy the file (default is to move it)
+    --verbose   verbose output
+    path        The file to stage; if directory, stage all files in that dir
+");
+}
+
+function stage_file($path) {
+    global $download_dir, $fanout, $copy, $gzip, $verbose;
+
+    if (!file_exists($path)) error_exit("no such file: $path\n");
+    $file = basename($path);
+    $dl_path = dir_hier_path($file, $download_dir, $fanout);
+    $dl_md5_path = "$dl_path.md5";
+
+    if ($verbose) {
+        echo "staging $file to $dl_path\n";
+    }
+
+    // compute the file's MD5
+    //
+    $md5 = md5_file($path);
+    $file_size = filesize($path);
+
+    // if file is already in download dir, make sure it's the same file
+    //
+    if (file_exists($dl_path)) {
+        if (file_exists($dl_md5_path)) {
+            $x = file_get_contents($dl_md5_path);
+            $x = explode(" ", $x);
+            $dl_md5 = $x[0];
+        } else {
+            $dl_md5 = md5_file($dl_path);
+        }
+        if ($md5 != $dl_md5) {
+            error_exit("
+There is already a file in your project's download directory with that name,
+but with different contents.
+This is not allowed by BOINC, which requires that files be immutable.
+Please use a different file name.
 ");
+        }
+        if ($verbose) {
+            echo "    file already exists as $dl_path\n";
+        }
+    } else {
+        // move or copy the file
+        //
+        if ($copy) {
+            $ret = copy($path, $dl_path);
+            if (!$ret) error_exit("    copy failed\n");
+            if ($verbose) echo "    copied file\n";
+        } else {
+            $ret = rename($path, $dl_path);
+            if (!$ret) error_exit("    copy failed\n");
+            if ($verbose) echo "    moved file\n";
+        }
+        @unlink($dl_md5_path);
+    }
+
+    // make MD5 file if needed
+    //
+    if (!file_exists($dl_md5_path)) {
+        $x = $md5." ".$file_size."\n";
+        $ret = file_put_contents($dl_md5_path, $x);
+        if (!$ret) error_exit("failed to create MD5 file $dl_md5_path\n");
+        if ($verbose) echo "    created MD5 file $dl_md5_path\n";
+    }
+
+    // make gzipped version if needed
+    //
+    if ($gzip) {
+        $dl_gzip_path = "$dl_path.gz";
+        if (!file_exists($dl_gzip_path)) {
+            $output = system("gzip -c $dl_path > $dl_gzip_path", $retval);
+            if ($retval) {
+                error_exit("failed to gzip file: $output\n");
+            }
+            if ($verbose) echo "    created .gzip file $dl_gzip_path\n";
+        }
+    }
 }
 
+$fanout = parse_config(get_config(), "<uldl_dir_fanout>");
+if (!$fanout) error_exit("can't find <uldl_dir_fanout> in config.xml");
+$download_dir = parse_config(get_config(), "<download_dir>");
+if (!$download_dir) error_exit("can't find <download_dir> in config.xml");
 if ($argc < 2) usage();
 
 $gzip = false;
 $copy = false;
+$verbose = false;
 
 for ($i=1; $i<$argc-1; $i++) {
     switch($argv[$i]) {
@@ -65,73 +151,24 @@ for ($i=1; $i<$argc-1; $i++) {
     case "--copy":
         $copy = true;
         break;
+    case "--verbose":
+        $verbose = true;
+        break;
     default:
         usage();
     }
 }
 
 $path = $argv[$argc-1];
-if (!file_exists($path)) error_exit("no such file: $path\n");
-$file = basename($path);
-
-$fanout = parse_config(get_config(), "<uldl_dir_fanout>");
-if (!$fanout) error_exit("can't find <uldl_dir_fanout> in config.xml");
-$download_dir = parse_config(get_config(), "<download_dir>");
-if (!$download_dir) error_exit("can't find <download_dir> in config.xml");
-
-$dl_path = dir_hier_path($file, $download_dir, $fanout);
-$dl_md5_path = "$dl_path.md5";
-
-// compute the file's MD5
-//
-$md5 = md5_file($path);
-$file_size = filesize($path);
-
-// if file is already in download dir, make sure it's the same
-//
-if (file_exists($dl_path)) {
-    if (file_exists($dl_md5_path)) {
-        $x = file_get_contents($dl_md5_path);
-        $x = explode(" ", $x);
-        $dl_md5 = $x[0];
-    } else {
-        $dl_md5 = md5_file($dl_path);
-    }
-    if ($md5 != $dl_md5) {
-        error_exit("There is already a file in your project's download directory
-with that name, but different contents.
-This is not allowed by BOINC, which requires that files are 'immutable'.
-Please use a different file name.
-");
+if (is_dir($path)) {
+    $d = opendir($path);
+    while ($f = readdir($d)) {
+        $p = "$path/$f";
+        if (!is_file($p)) continue;
+        stage_file($p);
     }
 } else {
-    // move or copy the file
-    //
-    if ($copy) {
-        copy($path, $dl_path);
-    } else {
-        rename($path, $dl_path);
-    }
-    @unlink($dl_md5_path);
-}
-
-// make MD5 file if needed
-//
-if (!file_exists($dl_md5_path)) {
-    $x = $md5." ".$file_size."\n";
-    file_put_contents($dl_md5_path, $x);
-}
-
-// make gzipped version if needed
-//
-if ($gzip) {
-    $dl_gzip_path = "$dl_path.gz";
-    if (!file_exists($dl_gzip_path)) {
-        $output = system("gzip -c $dl_path > $dl_gzip_path", $retval);
-        if ($retval) {
-            error_exit("failed to gzip file: $output\n");
-        }
-    }
+    stage_file($path);
 }
 
 ?>
diff --git a/tools/update_versions b/tools/update_versions
index eaf1f09..786df1d 100755
--- a/tools/update_versions
+++ b/tools/update_versions
@@ -19,13 +19,19 @@
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
 
-// script to create application versions,
+// script to create app versions,
 // and stage their files in the download dir.
 // See http://boinc.berkeley.edu/trac/wiki/AppVersionNew
 
 
-require_once("html/inc/boinc_db.inc");
-require_once("html/inc/util_basic.inc");
+error_reporting(E_ALL);
+ini_set('display_errors', true);
+ini_set('display_startup_errors', true);
+
+chdir("html/inc");
+require_once("boinc_db.inc");
+require_once("util_basic.inc");
+chdir ("../..");
 
 $apps = BoincApp::enum("");
 $platforms = BoincPlatform::enum("");
@@ -36,8 +42,6 @@ $download_url = parse_element($config, "<download_url>");
 if (!$download_url) die("<download_url> not found in config.xml\n");
 $download_dir = parse_element($config, "<download_dir>");
 if (!$download_dir) die("<download_dir> not found in config.xml\n");
-$fanout = parse_element($config, "<uldl_dir_fanout>");
-if (!$fanout) die("<fanout> not found in config.xml\n");
 $key_dir = parse_element($config, "<key_dir>");
 if (!$key_dir) die("<key_dir> not found in config.xml\n");
 
@@ -87,6 +91,9 @@ function file_info_xml($fd) {
     if (is_array($fd->url)) {
         foreach ($fd->url as $url) {
             $xml .= "    <url>$url</url>\n";
+            if ($fd->gzip) {
+                $xml .= "    <gzipped_url>$url.gz</gzipped_url>\n";
+            }
         }
     } else {
         $xml .= "    <url>$fd->url</url>\n";
@@ -168,7 +175,9 @@ function stage_file($a, $v, $p, $fd) {
         system("cp $path $dl_path");
     }
     
-    $fd->url = "$download_url/$name";
+    if (!sizeof($fd->url)) {
+        $fd->url = "$download_url/$name";
+    }
     if ($fd->gzip) {
         if (!file_exists("$dl_path.gz")) {
             $tmp = "$dl_path.tmp";
@@ -254,9 +263,7 @@ function process_file($a, $v, $p, $name, $fds) {
         }
     }
 
-    if (!sizeof($fd->url)) {
-        $fd = stage_file($a, $v, $p, $fd);
-    }
+    $fd = stage_file($a, $v, $p, $fd);
 
     if (!isset($fd->executable)) {
         $perms = fileperms($path);
@@ -341,7 +348,7 @@ function check_main_program($fds) {
     return 0;
 }
 
-function confirm($fds) {
+function confirm($fds, $v) {
     echo "    Files:\n";
     foreach ($fds as $fd) {
         echo "        $fd->physical_name";
@@ -350,7 +357,14 @@ function confirm($fds) {
         }
         echo "\n";
     }
-    echo "    Do you want to add this application version (y/n)? ";
+    echo "    Flags:\n";
+    if ($v->dont_throttle) echo "        don't throttle\n";
+    if ($v->needs_network) echo "        needs network\n";
+    if ($v->is_wrapper) echo "        is wrapper\n";
+    if ($v->beta) echo "        beta\n";
+    if ($v->file_prefix) echo "        file prefix: $v->file_prefix\n";
+    echo "        API version: $v->api_version\n";
+    echo "    Do you want to add this app version (y/n)? ";
     $x = trim(fgets(STDIN));
     return ($x == "y");
 }
@@ -392,15 +406,16 @@ function convert_simplexml($x) {
     $v->is_wrapper = get_bool($x, "is_wrapper");
     $v->file_prefix = (string)$x->file_prefix;
     $v->beta = get_bool($x, "beta");
+    $v->api_version = (string)$x->api_version;
     return $v;
 }
 
 function process_version($a, $v, $p) {
-    echo "Found application version: $a $v $p\n";
+    echo "Found app version directory for: $a $v $p\n";
     $app = lookup_app($a);
     parse_platform_name($p, $platform, $plan_class);
     if (already_exists($a, $v, $platform, $plan_class)) {
-        echo "  This app version already exists\n";
+        echo "  (already exists in database)\n";
         return;
     }
     $vfile = "apps/$a/$v/$p/version.xml";
@@ -429,9 +444,15 @@ function process_version($a, $v, $p) {
     if (check_main_program($fds)) {
         return;
     }
-    $api_version = get_api_version($a, $v, $p, $fds);
 
-    if (!confirm($fds)) {
+    // if API version isn't specified in version.xml,
+    // try to find it embedded in the executable
+    //
+    if (!strlen($vers->api_version)) {
+        $vers->api_version = get_api_version($a, $v, $p, $fds);
+    }
+
+    if (!confirm($fds, $vers)) {
         return;
     }
 
@@ -442,9 +463,13 @@ function process_version($a, $v, $p) {
     $xml .=
         "<app_version>\n".
         "    <app_name>".$app->name."</app_name>\n".
-        "    <version_num>".parse_version($v)."</version_num>\n".
-        "    <api_version>$api_version</api_version>\n"
+        "    <version_num>".parse_version($v)."</version_num>\n"
     ;
+    if (strlen($vers->api_version)) {
+        $xml .=
+            "    <api_version>$vers->api_version</api_version>\n"
+        ;
+    }
     foreach ($fds as $fd) {
         $xml .= file_ref_xml($fd);
     }
@@ -470,9 +495,9 @@ function process_version($a, $v, $p) {
 
     $id = BoincAppVersion::insert($query);
     if ($id) {
-        echo "    Application version added successfully; ID=$id\n";
+        echo "    App version added successfully; ID=$id\n";
     } else {
-        echo "    Error; application version not added\n";
+        echo "    Error; app version not added\n";
     }
 }
 
diff --git a/vda/des.h b/vda/des.h
index 9215678..777d413 100644
--- a/vda/des.h
+++ b/vda/des.h
@@ -57,7 +57,7 @@ struct SIMULATOR {
     void remove(EVENT* e) {
         vector<EVENT*>::iterator i;
         //printf("removing %x\n", e);
-        for (i=events.begin(); i!=events.end(); i++) {
+        for (i=events.begin(); i!=events.end(); ++i) {
             if (*i == e) {
                 events.erase(i);
                 make_heap(events.begin(), events.end(), compare);
diff --git a/vda/sched_vda.cpp b/vda/sched_vda.cpp
index b02393f..388d202 100644
--- a/vda/sched_vda.cpp
+++ b/vda/sched_vda.cpp
@@ -327,7 +327,7 @@ static void process_chunk_present_on_client(FILE_INFO& fi, CHUNK_LIST& chunks) {
 //
 static int process_chunks_missing_on_client(CHUNK_LIST& chunks) {
     CHUNK_LIST::iterator it;
-    for (it = chunks.begin(); it != chunks.end(); it++) {
+    for (it = chunks.begin(); it != chunks.end(); ++it) {
         DB_VDA_CHUNK_HOST& ch = it->second;
         if (!ch.present_on_host && ch.transfer_in_progress) continue;
         if (!ch.found) {
@@ -382,7 +382,7 @@ static int enforce_quota(CHUNK_LIST& chunks) {
         vf.lookup_id(ch.vda_file_id);
         x -= vf.chunk_size;
         g_reply->file_deletes.push_back(fi);
-        it++;
+        ++it;
     }
     return 0;
 }
@@ -407,7 +407,7 @@ static int issue_transfer_commands(CHUNK_LIST& chunks) {
     char url[1024], buf[1024];
 
     CHUNK_LIST::iterator it;
-    for (it = chunks.begin(); it != chunks.end(); it++) {
+    for (it = chunks.begin(); it != chunks.end(); ++it) {
         vector<const char*> urls;
         DB_VDA_CHUNK_HOST& ch = it->second;
         if (!ch.transfer_in_progress) continue;
diff --git a/vda/ssim.cpp b/vda/ssim.cpp
index 9ab5ceb..09f7b17 100644
--- a/vda/ssim.cpp
+++ b/vda/ssim.cpp
@@ -415,7 +415,7 @@ void SIM_HOST::handle() {
         printf("%s: host %d failed\n", now_str(), id);
     }
     set<CHUNK_ON_HOST*>::iterator p;
-    for (p = chunks.begin(); p != chunks.end(); p++) {
+    for (p = chunks.begin(); p != chunks.end(); ++p) {
         CHUNK_ON_HOST* c = *p;
         c->chunk->host_failed(c);
         c->remove();
@@ -473,7 +473,7 @@ int CHUNK::start_upload() {
     // since this is only called if chunk is not present on server
     //
     set<VDA_CHUNK_HOST*>::iterator i;
-    for (i=hosts.begin(); i!=hosts.end(); i++) {
+    for (i=hosts.begin(); i!=hosts.end(); ++i) {
         CHUNK_ON_HOST* c = (CHUNK_ON_HOST*)*i;
         if (c->transfer_in_progress) return 0;
     }
diff --git a/vda/vda.cpp b/vda/vda.cpp
index 4db7017..d484573 100644
--- a/vda/vda.cpp
+++ b/vda/vda.cpp
@@ -71,7 +71,7 @@ void CHUNK::print_status(int level) {
         indent(level), present_on_server?"yes":"no"
     );
     set<VDA_CHUNK_HOST*>::iterator i;
-    for (i=hosts.begin(); i!=hosts.end(); i++) {
+    for (i=hosts.begin(); i!=hosts.end(); ++i) {
         VDA_CHUNK_HOST* ch = *i;
         ch->print_status(level);
     }
diff --git a/vda/vda_lib.cpp b/vda/vda_lib.cpp
index 8bc99cd..122007f 100644
--- a/vda/vda_lib.cpp
+++ b/vda/vda_lib.cpp
@@ -456,7 +456,7 @@ void CHUNK::recovery_plan() {
     if (present_on_server) {
         status = PRESENT;
         cost = 0;
-    } else if (hosts.size() > 0) {
+    } else if (!hosts.empty()) {
         // if file is not present on server, assume that it's present
         // on all hosts (otherwise we wouldn't have downloaded it).
         //
@@ -480,7 +480,7 @@ int CHUNK::compute_min_failures() {
     }
     int nreplicas = 0;
     set<VDA_CHUNK_HOST*>::iterator i;
-    for (i=hosts.begin(); i!=hosts.end(); i++) {
+    for (i=hosts.begin(); i!=hosts.end(); ++i) {
         VDA_CHUNK_HOST* ch = *i;
         if (ch->present_on_host) {
             nreplicas++;
@@ -492,7 +492,7 @@ int CHUNK::compute_min_failures() {
 
 bool CHUNK::download_in_progress() {
     set<VDA_CHUNK_HOST*>::iterator i;
-    for (i=hosts.begin(); i!=hosts.end(); i++) {
+    for (i=hosts.begin(); i!=hosts.end(); ++i) {
         VDA_CHUNK_HOST* ch = *i;
         if (ch->download_in_progress()) return true;
     }
diff --git a/vda/vda_lib2.cpp b/vda/vda_lib2.cpp
index 8156b94..fc4bee4 100644
--- a/vda/vda_lib2.cpp
+++ b/vda/vda_lib2.cpp
@@ -442,7 +442,7 @@ int CHUNK::start_upload_from_host(VDA_CHUNK_HOST& ch) {
 int CHUNK::start_upload() {
     VDA_CHUNK_HOST* chp;
     set<VDA_CHUNK_HOST*>::iterator i;
-    for (i=hosts.begin(); i!=hosts.end(); i++) {
+    for (i=hosts.begin(); i!=hosts.end(); ++i) {
         chp = *i;
         if (chp->transfer_in_progress) return 0;
     }
@@ -458,7 +458,7 @@ int CHUNK::upload_all() {
 
     VDA_CHUNK_HOST* chp;
     set<VDA_CHUNK_HOST*>::iterator i;
-    for (i=hosts.begin(); i!=hosts.end(); i++) {
+    for (i=hosts.begin(); i!=hosts.end(); ++i) {
         chp = *i;
         if (chp->transfer_in_progress) continue;
         int retval = start_upload_from_host(*chp);
diff --git a/version.h.in b/version.h.in
index feefc44..bc0e367 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/version.log b/version.log
index 584410f..18bb418 100644
--- a/version.log
+++ b/version.log
@@ -1 +1 @@
-7.4.42
+7.5.0
diff --git a/xcompile/xcompile.MinGW32_on_cygwin.sh b/xcompile/xcompile.MinGW32_on_cygwin.sh
index d74ccf1..6d767eb 100755
--- a/xcompile/xcompile.MinGW32_on_cygwin.sh
+++ b/xcompile/xcompile.MinGW32_on_cygwin.sh
@@ -8,14 +8,16 @@ case $1 in
               export TARGET_HOST=$1
               ;;
 esac
+echo -n Checking for cross compiling environment ...
 for target_host in ${TARGET_HOST} i686-w64-mingw32 i686-pc-mingw32 x86_64-w64-mingw32 x86_64-pc-mingw32 none ; do
    if test ${target_host} = none ; then
+     echo ${target_host}
      echo Cross compiling environment not found in /usr
      exit 1
    fi
-   echo Checking for cross compiling environment in /usr/${target_host}
    if test -d /usr/${target_host}; then
      export TARGET_HOST=${target_host}
+     echo /usr/${target_host}
      break
    fi
 done
@@ -28,7 +30,7 @@ case $TARGET_HOST in
 esac
 
 build_manager=no
-build_client=no
+build_client=yes
 build_libs=yes
 build_server=no
 
@@ -123,36 +125,76 @@ if test $build_client != no -o $build_manager != no ; then
   fi
 fi
 
-if test $build_manager != no ; then
-  if ! test -f ${XCOMPILE_ROOT}/lib/libwxbase30u.a ; then
-    z7=`which 7z`
-    if test "x${z7}" = x ; then
-       echo you must install 7z in the path in order to install wxwidgets
-       exit 1
+if test $build_client != no ; then
+  thisdir=`pwd`
+  if ! test -f ${XCOMPILE_ROOT}/include/nvapi.h ; then
+    rsync -va ../coprocs/NVIDIA/include/* ${XCOMPILE_ROOT}/include
+  fi
+  nvdir=
+  if ! test -f ${XCOMPILE_ROOT}/lib/libnvapi.a ; then
+    mkdir NVIDIA
+    case $target_host in 
+    	i[56]86-*)  nvdir=../coprocs/NVIDIA/mswin/Win32/Release/lib
+	            ;;
+        x86*|x64*)  nvdir=../coprocs/NVIDIA/mswin/x64/Release/lib
+	            ;;
+    esac
+    if test x$nvdir != x ; then 
+      rsync -va $nvdir/* NVIDIA
+      cd NVIDIA
+      obj=`ar t nvapi.lib | head -1`
+      objdir=`dirname $obj`
+      mkdir -p $objdir
+      ar x nvapi.lib
+      cd $objdir
+      ar cr libnvapi.a *.obj
+      mv *.a ${XCOMPILE_ROOT}/lib
     fi
+  fi
+  cd $thisdir
+  rm -rf NVIDIA
+fi
+
+if test $build_manager != no ; then
+  if ! test -f ${XCOMPILE_ROOT}/lib/libwx_baseu_net-3.0-i686-w64-mingw32.dll.a ; then
     wxver=3.0.0
-    gccver=481
-    filename=wxMSW-${wxver}_gcc${gccver}TDM_Dev.7z
-    mkdir wxdist
-    cd wxdist
-    wget http://sourceforge.net/projects/wxwindows/files/3.0.0/binaries/$filename/download
-    mv download $filename
-    7z x $filename
-    rm $filename
-    rsync lib/gcc${gccver}TDM_dll/*.a ${XCOMPILE_ROOT}/lib
-    rsync lib/gcc${gccver}TDM_dll/*.dll ${XCOMPILE_ROOT}/bin
-    filename=wxWidgets-${wxver}_headers.7z
+    filename=wxWidgets-${wxver}.tar.bz2
     wget http://sourceforge.net/projects/wxwindows/files/3.0.0/$filename/download
     mv download $filename
-    7z x $filename
-    rm $filename
-    rsync -va include/wx ${XCOMPILE_ROOT}/include
-    rsync -va lib/gcc${gccver}TDM_dll/mswu/wx ${XCOMPILE_ROOT}/include
+    tar jxf $filename
+#    rm -f $filename
+    cd wxWidgets-${wxver}
+    enables="--with-msw  --with-libpng --with-libjpeg --with-libtiff --with-opengl --with-zlib  --enable-toolbar --enable-statusbar --enable-statbmp --enable-intl --enable-accessibility --enable-catch_segvs --enable-std_containers --enable-std_iostreams --enable-std_string --enable-std_string_conv_in_wxstring --enable-permissive  --enable-xlocale --enable-config --enable-protocols --enable-ftp --enable-http --enable-fileproto --enable-sockets --enable-ole --enable-dataobj --enable-ipc -- [...]
+    ./configure -C --host=$TARGET_HOST --build=$BUILD_HOST ${enables} --with-libcurl=${XCOMPILE_ROOT} --with-ssl=${XCOMPILE_ROOT} --with-winsock --prefix=${XCOMPILE_ROOT} 
+    make all
+    make install 
+    /bin/cp lib/*.a ${XCOMPILE_ROOT}/lib
+    /bin/cp lib/*.dll ${XCOMPILE_ROOT}/bin
+    /bin/mv -f ${XCOMPILE_ROOT}/lib/wx*.dll ${XCOMPILE_ROOT}/bin
     cd ..
-    rm -rf wxdist
+    rm -rf wxWidgets-${wxver}
   fi
 fi
 
+if test $build_manager != no ; then
+  if ! test -f ${XCOMPILE_ROOT}/lib/libsqlite3.a ; then
+    sqlite_year=2014
+    sqlite_ver=3080403
+    filename=sqlite-autoconf-${sqlite_ver}.tar.gz
+    wget http://www.sqlite.org/${sqlite_year}/$filename
+    tar zxf $filename
+    cd sqlite-autoconf-${sqlite_ver}
+    ./configure -C --host=$TARGET_HOST --build=$BUILD_HOST --prefix=${XCOMPILE_ROOT} --with-sysroot=${XCOMPILE_ROOT} 
+    make all
+    make install
+    cd ..
+    /bin/rm -f $filename
+    /bin/rm -rf sqlite-autoconf-${sqlite_ver}
+  fi
+fi
+
+  
+
 if test $build_manager != no -o $build_libs != no ; then
   if ! test -f ${XCOMPILE_ROOT}/include/GL/glut.h -a -f ${XCOMPILE_ROOT}/lib/libfreeglut_static.a  ; then
     svn co http://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut freeglut
@@ -197,4 +239,4 @@ fi
 
 ../configure -C --host=$TARGET_HOST --build=$BUILD_HOST ${enables} --with-libcurl=${XCOMPILE_ROOT} --with-ssl=${XCOMPILE_ROOT} --with-winsock --prefix=${XCOMPILE_ROOT}
 make -j 4 all
-exit 0
+#exit 0

-- 
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